From fedora-extras-commits at redhat.com Sat Mar 1 00:05:19 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 1 Mar 2008 00:05:19 GMT Subject: rpms/kdegraphics/devel kdegraphics.spec,1.135,1.136 Message-ID: <200803010005.m2105JMu005282@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdegraphics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5209/devel Modified Files: kdegraphics.spec Log Message: * Sat Mar 01 2008 Kevin Kofler 4.0.2-2 - package new FindOkular.cmake (in -devel) Index: kdegraphics.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- kdegraphics.spec 29 Feb 2008 23:39:13 -0000 1.135 +++ kdegraphics.spec 1 Mar 2008 00:04:36 -0000 1.136 @@ -1,7 +1,7 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdegraphics Obsoletes: kdegraphics4 < %{version}-%{release} @@ -155,9 +155,13 @@ %defattr(-,root,root,-) %{_kde4_includedir}/okular/ %{_kde4_libdir}/lib*.so +%{_kde4_appsdir}/cmake/modules/FindOkular.cmake %changelog +* Sat Mar 01 2008 Kevin Kofler 4.0.2-2 +- package new FindOkular.cmake (in -devel) + * Thu Feb 28 2008 Than Ngo 4.0.2-1 - 4.0.2 From fedora-extras-commits at redhat.com Sat Mar 1 00:16:32 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Sat, 1 Mar 2008 00:16:32 GMT Subject: rpms/gcc/devel .cvsignore, 1.226, 1.227 gcc43-baselist-update.patch, 1.1, 1.2 gcc43.spec, 1.19, 1.20 sources, 1.228, 1.229 Message-ID: <200803010016.m210GWAu005743@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5714 Modified Files: .cvsignore gcc43-baselist-update.patch gcc43.spec sources Log Message: 4.3.0-0.13 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- .cvsignore 28 Feb 2008 11:29:03 -0000 1.226 +++ .cvsignore 1 Mar 2008 00:15:53 -0000 1.227 @@ -1,2 +1,2 @@ -gcc-4.3.0-20080228.tar.bz2 +gcc-4.3.0-20080229.tar.bz2 fastjar-0.95.tar.gz gcc43-baselist-update.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 gcc43-baselist-update.patch Index: gcc43-baselist-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43-baselist-update.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc43-baselist-update.patch 28 Feb 2008 11:29:03 -0000 1.1 +++ gcc43-baselist-update.patch 1 Mar 2008 00:15:53 -0000 1.2 @@ -1,4 +1,15 @@ ---- libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt (revision 131826) +2008-02-29 Jakub Jelinek + + * config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt: Update. + * config/abi/post/x86_64-linux-gnu/baseline_symbols.txt: Likewise. + * config/abi/post/powerpc-linux-gnu/baseline_symbols.txt: Likewise. + * config/abi/post/i386-linux-gnu/baseline_symbols.txt: Likewise. + * config/abi/post/powerpc64-linux-gnu/32/baseline_symbols.txt: + Likewise. + * config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt: Likewise. + * config/abi/post/i486-linux-gnu/baseline_symbols.txt: Likewise. + +--- libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt (revision 132774) +++ libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt (working copy) @@ -33,19 +33,51 @@ FUNC:_ZN10__gnu_norm15_List_node_base4sw FUNC:_ZN10__gnu_norm15_List_node_base6unhookEv@@GLIBCXX_3.4 @@ -84,7 +95,7 @@ FUNC:_ZNKSt13basic_filebufIcSt11char_traitsIcEE7is_openEv@@GLIBCXX_3.4 FUNC:_ZNKSt13basic_filebufIwSt11char_traitsIwEE7is_openEv@@GLIBCXX_3.4 FUNC:_ZNKSt13basic_fstreamIcSt11char_traitsIcEE5rdbufEv@@GLIBCXX_3.4 -@@ -353,6 +389,17 @@ FUNC:_ZNKSt19basic_ostringstreamIcSt11ch +@@ -353,6 +389,16 @@ FUNC:_ZNKSt19basic_ostringstreamIcSt11ch FUNC:_ZNKSt19basic_ostringstreamIcSt11char_traitsIcESaIcEE5rdbufEv@@GLIBCXX_3.4 FUNC:_ZNKSt19basic_ostringstreamIwSt11char_traitsIwESaIwEE3strEv@@GLIBCXX_3.4 FUNC:_ZNKSt19basic_ostringstreamIwSt11char_traitsIwESaIwEE5rdbufEv@@GLIBCXX_3.4 @@ -97,12 +108,11 @@ +FUNC:_ZNKSt4hashIRKSsEclES1_@@GLIBCXX_3.4.10 +FUNC:_ZNKSt4hashISbIwSt11char_traitsIwESaIwEEEclES3_@@GLIBCXX_3.4.10 +FUNC:_ZNKSt4hashISsEclESs@@GLIBCXX_3.4.10 -+FUNC:_ZNKSt4hashISt10error_codeEclES0_@@GLIBCXX_3.4.10 +FUNC:_ZNKSt4hashIeEclEe@@GLIBCXX_3.4.10 FUNC:_ZNKSt5ctypeIcE10do_tolowerEPcPKc@@GLIBCXX_3.4 FUNC:_ZNKSt5ctypeIcE10do_tolowerEc@@GLIBCXX_3.4 FUNC:_ZNKSt5ctypeIcE10do_toupperEPcPKc@@GLIBCXX_3.4 -@@ -515,6 +562,7 @@ FUNC:_ZNKSt7num_putIwSt19ostreambuf_iter +@@ -515,6 +561,7 @@ FUNC:_ZNKSt7num_putIwSt19ostreambuf_iter FUNC:_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewm@@GLIBCXX_3.4 FUNC:_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewx@@GLIBCXX_3.4 FUNC:_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewy@@GLIBCXX_3.4 @@ -110,7 +120,7 @@ FUNC:_ZNKSt8ios_base7failure4whatEv@@GLIBCXX_3.4 FUNC:_ZNKSt8messagesIcE18_M_convert_to_charERKSs@@GLIBCXX_3.4 FUNC:_ZNKSt8messagesIcE20_M_convert_from_charEPc@@GLIBCXX_3.4 -@@ -591,6 +639,7 @@ FUNC:_ZNKSt8time_putIwSt19ostreambuf_ite +@@ -591,6 +638,7 @@ FUNC:_ZNKSt8time_putIwSt19ostreambuf_ite FUNC:_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPK2tmcc@@GLIBCXX_3.4 FUNC:_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewPK2tmcc@@GLIBCXX_3.4 FUNC:_ZNKSt8valarrayIjE4sizeEv@@GLIBCXX_3.4 @@ -118,7 +128,7 @@ FUNC:_ZNKSt9basic_iosIcSt11char_traitsIcEE10exceptionsEv@@GLIBCXX_3.4 FUNC:_ZNKSt9basic_iosIcSt11char_traitsIcEE3badEv@@GLIBCXX_3.4 FUNC:_ZNKSt9basic_iosIcSt11char_traitsIcEE3eofEv@@GLIBCXX_3.4 -@@ -774,6 +823,17 @@ FUNC:_ZNSdC2Ev@@GLIBCXX_3.4 +@@ -774,6 +822,17 @@ FUNC:_ZNSdC2Ev@@GLIBCXX_3.4 FUNC:_ZNSdD0Ev@@GLIBCXX_3.4 FUNC:_ZNSdD1Ev@@GLIBCXX_3.4 FUNC:_ZNSdD2Ev@@GLIBCXX_3.4 @@ -136,7 +146,7 @@ FUNC:_ZNSi3getEPci@@GLIBCXX_3.4 FUNC:_ZNSi3getEPcic@@GLIBCXX_3.4 FUNC:_ZNSi3getERSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4 -@@ -833,6 +893,14 @@ FUNC:_ZNSo6sentryC2ERSo@@GLIBCXX_3.4 +@@ -833,6 +892,14 @@ FUNC:_ZNSo6sentryC2ERSo@@GLIBCXX_3.4 FUNC:_ZNSo6sentryD1Ev@@GLIBCXX_3.4 FUNC:_ZNSo6sentryD2Ev@@GLIBCXX_3.4 FUNC:_ZNSo8_M_writeEPKci@@GLIBCXX_3.4 @@ -151,17 +161,7 @@ FUNC:_ZNSoC1EPSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4 FUNC:_ZNSoC1Ev@@GLIBCXX_3.4 FUNC:_ZNSoC2EPSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4 -@@ -1131,6 +1199,9 @@ FUNC:_ZNSt12strstreambufC2Ei@@GLIBCXX_3. - FUNC:_ZNSt12strstreambufD0Ev@@GLIBCXX_3.4 - FUNC:_ZNSt12strstreambufD1Ev@@GLIBCXX_3.4 - FUNC:_ZNSt12strstreambufD2Ev@@GLIBCXX_3.4 -+FUNC:_ZNSt12system_errorD0Ev@@GLIBCXX_3.4.10 -+FUNC:_ZNSt12system_errorD1Ev@@GLIBCXX_3.4.10 -+FUNC:_ZNSt12system_errorD2Ev@@GLIBCXX_3.4.10 - FUNC:_ZNSt13bad_exceptionD0Ev@@GLIBCXX_3.4 - FUNC:_ZNSt13bad_exceptionD1Ev@@GLIBCXX_3.4 - FUNC:_ZNSt13bad_exceptionD2Ev@@GLIBCXX_3.4 -@@ -1206,6 +1277,17 @@ FUNC:_ZNSt13basic_fstreamIwSt11char_trai +@@ -1206,6 +1273,17 @@ FUNC:_ZNSt13basic_fstreamIwSt11char_trai FUNC:_ZNSt13basic_fstreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4 FUNC:_ZNSt13basic_fstreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4 FUNC:_ZNSt13basic_fstreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4 @@ -179,7 +179,7 @@ FUNC:_ZNSt13basic_istreamIwSt11char_traitsIwEE3getEPwi@@GLIBCXX_3.4 FUNC:_ZNSt13basic_istreamIwSt11char_traitsIwEE3getEPwiw@@GLIBCXX_3.4 FUNC:_ZNSt13basic_istreamIwSt11char_traitsIwEE3getERSt15basic_streambufIwS1_E@@GLIBCXX_3.4 -@@ -1265,6 +1347,14 @@ FUNC:_ZNSt13basic_ostreamIwSt11char_trai +@@ -1265,6 +1343,14 @@ FUNC:_ZNSt13basic_ostreamIwSt11char_trai FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEE6sentryD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEE6sentryD2Ev@@GLIBCXX_3.4 FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEE8_M_writeEPKwi@@GLIBCXX_3.4 @@ -194,7 +194,7 @@ FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4 FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4 FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEEC2EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4 -@@ -1386,6 +1476,7 @@ FUNC:_ZNSt15basic_streambufIcSt11char_tr +@@ -1386,6 +1472,7 @@ FUNC:_ZNSt15basic_streambufIcSt11char_tr FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE6sbumpcEv@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE6setbufEPci@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE6snextcEv@@GLIBCXX_3.4 @@ -202,7 +202,7 @@ FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE6xsgetnEPci@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE6xsputnEPKci@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE7pubsyncEv@@GLIBCXX_3.4 -@@ -1424,6 +1515,7 @@ FUNC:_ZNSt15basic_streambufIwSt11char_tr +@@ -1424,6 +1511,7 @@ FUNC:_ZNSt15basic_streambufIwSt11char_tr FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE6sbumpcEv@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE6setbufEPwi@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE6snextcEv@@GLIBCXX_3.4 @@ -210,7 +210,7 @@ FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE6xsgetnEPwi@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE6xsputnEPKwi@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE7pubsyncEv@@GLIBCXX_3.4 -@@ -1455,6 +1547,7 @@ FUNC:_ZNSt15basic_stringbufIcSt11char_tr +@@ -1455,6 +1543,7 @@ FUNC:_ZNSt15basic_stringbufIcSt11char_tr FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE7seekposESt4fposI11__mbstate_tESt13_Ios_Openmode@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE8overflowEi@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE9pbackfailEi@@GLIBCXX_3.4 @@ -218,7 +218,7 @@ FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE9underflowEv@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4 -@@ -1471,6 +1564,7 @@ FUNC:_ZNSt15basic_stringbufIwSt11char_tr +@@ -1471,6 +1560,7 @@ FUNC:_ZNSt15basic_stringbufIwSt11char_tr FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE7seekposESt4fposI11__mbstate_tESt13_Ios_Openmode@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE8overflowEj@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE9pbackfailEj@@GLIBCXX_3.4 @@ -226,7 +226,7 @@ FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE9underflowEv@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4 -@@ -1660,10 +1754,16 @@ FUNC:_ZNSt5ctypeIwEC2Ej@@GLIBCXX_3.4 +@@ -1660,10 +1750,16 @@ FUNC:_ZNSt5ctypeIwEC2Ej@@GLIBCXX_3.4 FUNC:_ZNSt5ctypeIwED0Ev@@GLIBCXX_3.4 FUNC:_ZNSt5ctypeIwED1Ev@@GLIBCXX_3.4 FUNC:_ZNSt5ctypeIwED2Ev@@GLIBCXX_3.4 @@ -243,7 +243,7 @@ FUNC:_ZNSt6locale5_Impl16_M_install_facetEPKNS_2idEPKNS_5facetE@@GLIBCXX_3.4 FUNC:_ZNSt6locale5_Impl16_M_replace_facetEPKS0_PKNS_2idE@@GLIBCXX_3.4 FUNC:_ZNSt6locale5_Impl19_M_replace_categoryEPKS0_PKPKNS_2idE@@GLIBCXX_3.4 -@@ -1676,6 +1776,7 @@ FUNC:_ZNSt6locale5_ImplC2ERKS0_j@@GLIBCX +@@ -1676,6 +1772,7 @@ FUNC:_ZNSt6locale5_ImplC2ERKS0_j@@GLIBCX FUNC:_ZNSt6locale5_ImplC2Ej@@GLIBCXX_3.4 FUNC:_ZNSt6locale5_ImplD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt6locale5_ImplD2Ev@@GLIBCXX_3.4 @@ -251,7 +251,7 @@ FUNC:_ZNSt6locale5facet15_S_get_c_localeEv@@GLIBCXX_3.4 FUNC:_ZNSt6locale5facet17_S_clone_c_localeERP15__locale_struct@@GLIBCXX_3.4 FUNC:_ZNSt6locale5facet18_S_create_c_localeERP15__locale_structPKcS2_@@GLIBCXX_3.4 -@@ -1753,7 +1854,9 @@ FUNC:_ZNSt8bad_castD1Ev@@GLIBCXX_3.4 +@@ -1753,7 +1850,9 @@ FUNC:_ZNSt8bad_castD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt8bad_castD2Ev@@GLIBCXX_3.4 FUNC:_ZNSt8ios_base13_M_grow_wordsEib@@GLIBCXX_3.4 FUNC:_ZNSt8ios_base15sync_with_stdioEb@@GLIBCXX_3.4 @@ -261,7 +261,7 @@ FUNC:_ZNSt8ios_base4InitC1Ev@@GLIBCXX_3.4 FUNC:_ZNSt8ios_base4InitC2Ev@@GLIBCXX_3.4 FUNC:_ZNSt8ios_base4InitD1Ev@@GLIBCXX_3.4 -@@ -1832,6 +1935,11 @@ FUNC:_ZNSt8valarrayIjEC2Ej@@GLIBCXX_3.4 +@@ -1832,6 +1931,11 @@ FUNC:_ZNSt8valarrayIjEC2Ej@@GLIBCXX_3.4 FUNC:_ZNSt8valarrayIjED1Ev@@GLIBCXX_3.4 FUNC:_ZNSt8valarrayIjED2Ev@@GLIBCXX_3.4 FUNC:_ZNSt8valarrayIjEixEj@@GLIBCXX_3.4 @@ -273,7 +273,7 @@ FUNC:_ZNSt9bad_allocD0Ev@@GLIBCXX_3.4 FUNC:_ZNSt9bad_allocD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt9bad_allocD2Ev@@GLIBCXX_3.4 -@@ -1913,8 +2021,13 @@ FUNC:_ZSt14__convert_to_vIeEvPKcRT_RSt12 +@@ -1913,8 +2017,13 @@ FUNC:_ZSt14__convert_to_vIeEvPKcRT_RSt12 FUNC:_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct@@GLIBCXX_3.4 FUNC:_ZSt14set_unexpectedPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15set_new_handlerPFvvE@@GLIBCXX_3.4 @@ -287,7 +287,7 @@ FUNC:_ZSt18_Rb_tree_decrementPKSt18_Rb_tree_node_base@@GLIBCXX_3.4 FUNC:_ZSt18_Rb_tree_decrementPSt18_Rb_tree_node_base@@GLIBCXX_3.4 FUNC:_ZSt18_Rb_tree_incrementPKSt18_Rb_tree_node_base@@GLIBCXX_3.4 -@@ -1930,6 +2043,8 @@ FUNC:_ZSt20__throw_domain_errorPKc@@GLIB +@@ -1930,6 +2039,8 @@ FUNC:_ZSt20__throw_domain_errorPKc@@GLIB FUNC:_ZSt20__throw_length_errorPKc@@GLIBCXX_3.4 FUNC:_ZSt20__throw_out_of_rangePKc@@GLIBCXX_3.4 FUNC:_ZSt21_Rb_tree_rotate_rightPSt18_Rb_tree_node_baseRS0_@@GLIBCXX_3.4 @@ -296,7 +296,7 @@ FUNC:_ZSt21__throw_bad_exceptionv@@GLIBCXX_3.4 FUNC:_ZSt21__throw_runtime_errorPKc@@GLIBCXX_3.4 FUNC:_ZSt22__throw_overflow_errorPKc@@GLIBCXX_3.4 -@@ -2164,12 +2279,20 @@ FUNC:__dynamic_cast@@CXXABI_1.3 +@@ -2164,12 +2275,20 @@ FUNC:__dynamic_cast@@CXXABI_1.3 FUNC:__gxx_personality_v0@@CXXABI_1.3 [...2050 lines suppressed...] FUNC:_ZNSi3getEPcic@@GLIBCXX_3.4 FUNC:_ZNSi3getERSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4 -@@ -833,6 +893,14 @@ FUNC:_ZNSo6sentryC2ERSo@@GLIBCXX_3.4 +@@ -833,6 +892,14 @@ FUNC:_ZNSo6sentryC2ERSo@@GLIBCXX_3.4 FUNC:_ZNSo6sentryD1Ev@@GLIBCXX_3.4 FUNC:_ZNSo6sentryD2Ev@@GLIBCXX_3.4 FUNC:_ZNSo8_M_writeEPKci@@GLIBCXX_3.4 @@ -3956,17 +3593,7 @@ FUNC:_ZNSoC1EPSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4 FUNC:_ZNSoC1Ev@@GLIBCXX_3.4 FUNC:_ZNSoC2EPSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4 -@@ -1131,6 +1199,9 @@ FUNC:_ZNSt12strstreambufC2Ei@@GLIBCXX_3. - FUNC:_ZNSt12strstreambufD0Ev@@GLIBCXX_3.4 - FUNC:_ZNSt12strstreambufD1Ev@@GLIBCXX_3.4 - FUNC:_ZNSt12strstreambufD2Ev@@GLIBCXX_3.4 -+FUNC:_ZNSt12system_errorD0Ev@@GLIBCXX_3.4.10 -+FUNC:_ZNSt12system_errorD1Ev@@GLIBCXX_3.4.10 -+FUNC:_ZNSt12system_errorD2Ev@@GLIBCXX_3.4.10 - FUNC:_ZNSt13bad_exceptionD0Ev@@GLIBCXX_3.4 - FUNC:_ZNSt13bad_exceptionD1Ev@@GLIBCXX_3.4 - FUNC:_ZNSt13bad_exceptionD2Ev@@GLIBCXX_3.4 -@@ -1206,6 +1277,17 @@ FUNC:_ZNSt13basic_fstreamIwSt11char_trai +@@ -1206,6 +1273,17 @@ FUNC:_ZNSt13basic_fstreamIwSt11char_trai FUNC:_ZNSt13basic_fstreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4 FUNC:_ZNSt13basic_fstreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4 FUNC:_ZNSt13basic_fstreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4 @@ -3984,7 +3611,7 @@ FUNC:_ZNSt13basic_istreamIwSt11char_traitsIwEE3getEPwi@@GLIBCXX_3.4 FUNC:_ZNSt13basic_istreamIwSt11char_traitsIwEE3getEPwiw@@GLIBCXX_3.4 FUNC:_ZNSt13basic_istreamIwSt11char_traitsIwEE3getERSt15basic_streambufIwS1_E@@GLIBCXX_3.4 -@@ -1265,6 +1347,14 @@ FUNC:_ZNSt13basic_ostreamIwSt11char_trai +@@ -1265,6 +1343,14 @@ FUNC:_ZNSt13basic_ostreamIwSt11char_trai FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEE6sentryD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEE6sentryD2Ev@@GLIBCXX_3.4 FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEE8_M_writeEPKwi@@GLIBCXX_3.4 @@ -3999,7 +3626,7 @@ FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4 FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4 FUNC:_ZNSt13basic_ostreamIwSt11char_traitsIwEEC2EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4 -@@ -1386,6 +1476,7 @@ FUNC:_ZNSt15basic_streambufIcSt11char_tr +@@ -1386,6 +1472,7 @@ FUNC:_ZNSt15basic_streambufIcSt11char_tr FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE6sbumpcEv@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE6setbufEPci@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE6snextcEv@@GLIBCXX_3.4 @@ -4007,7 +3634,7 @@ FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE6xsgetnEPci@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE6xsputnEPKci@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE7pubsyncEv@@GLIBCXX_3.4 -@@ -1424,6 +1515,7 @@ FUNC:_ZNSt15basic_streambufIwSt11char_tr +@@ -1424,6 +1511,7 @@ FUNC:_ZNSt15basic_streambufIwSt11char_tr FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE6sbumpcEv@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE6setbufEPwi@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE6snextcEv@@GLIBCXX_3.4 @@ -4015,7 +3642,7 @@ FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE6xsgetnEPwi@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE6xsputnEPKwi@@GLIBCXX_3.4 FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE7pubsyncEv@@GLIBCXX_3.4 -@@ -1455,6 +1547,7 @@ FUNC:_ZNSt15basic_stringbufIcSt11char_tr +@@ -1455,6 +1543,7 @@ FUNC:_ZNSt15basic_stringbufIcSt11char_tr FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE7seekposESt4fposI11__mbstate_tESt13_Ios_Openmode@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE8overflowEi@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE9pbackfailEi@@GLIBCXX_3.4 @@ -4023,7 +3650,7 @@ FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE9underflowEv@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4 -@@ -1471,6 +1564,7 @@ FUNC:_ZNSt15basic_stringbufIwSt11char_tr +@@ -1471,6 +1560,7 @@ FUNC:_ZNSt15basic_stringbufIwSt11char_tr FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE7seekposESt4fposI11__mbstate_tESt13_Ios_Openmode@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE8overflowEj@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE9pbackfailEj@@GLIBCXX_3.4 @@ -4031,7 +3658,7 @@ FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE9underflowEv@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4 FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4 -@@ -1660,10 +1754,16 @@ FUNC:_ZNSt5ctypeIwEC2Ej@@GLIBCXX_3.4 +@@ -1660,10 +1750,16 @@ FUNC:_ZNSt5ctypeIwEC2Ej@@GLIBCXX_3.4 FUNC:_ZNSt5ctypeIwED0Ev@@GLIBCXX_3.4 FUNC:_ZNSt5ctypeIwED1Ev@@GLIBCXX_3.4 FUNC:_ZNSt5ctypeIwED2Ev@@GLIBCXX_3.4 @@ -4048,7 +3675,7 @@ FUNC:_ZNSt6locale5_Impl16_M_install_facetEPKNS_2idEPKNS_5facetE@@GLIBCXX_3.4 FUNC:_ZNSt6locale5_Impl16_M_replace_facetEPKS0_PKNS_2idE@@GLIBCXX_3.4 FUNC:_ZNSt6locale5_Impl19_M_replace_categoryEPKS0_PKPKNS_2idE@@GLIBCXX_3.4 -@@ -1676,6 +1776,7 @@ FUNC:_ZNSt6locale5_ImplC2ERKS0_j@@GLIBCX +@@ -1676,6 +1772,7 @@ FUNC:_ZNSt6locale5_ImplC2ERKS0_j@@GLIBCX FUNC:_ZNSt6locale5_ImplC2Ej@@GLIBCXX_3.4 FUNC:_ZNSt6locale5_ImplD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt6locale5_ImplD2Ev@@GLIBCXX_3.4 @@ -4056,7 +3683,7 @@ FUNC:_ZNSt6locale5facet15_S_get_c_localeEv@@GLIBCXX_3.4 FUNC:_ZNSt6locale5facet17_S_clone_c_localeERP15__locale_struct@@GLIBCXX_3.4 FUNC:_ZNSt6locale5facet18_S_create_c_localeERP15__locale_structPKcS2_@@GLIBCXX_3.4 -@@ -1753,7 +1854,9 @@ FUNC:_ZNSt8bad_castD1Ev@@GLIBCXX_3.4 +@@ -1753,7 +1850,9 @@ FUNC:_ZNSt8bad_castD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt8bad_castD2Ev@@GLIBCXX_3.4 FUNC:_ZNSt8ios_base13_M_grow_wordsEib@@GLIBCXX_3.4 FUNC:_ZNSt8ios_base15sync_with_stdioEb@@GLIBCXX_3.4 @@ -4066,7 +3693,7 @@ FUNC:_ZNSt8ios_base4InitC1Ev@@GLIBCXX_3.4 FUNC:_ZNSt8ios_base4InitC2Ev@@GLIBCXX_3.4 FUNC:_ZNSt8ios_base4InitD1Ev@@GLIBCXX_3.4 -@@ -1832,6 +1935,11 @@ FUNC:_ZNSt8valarrayIjEC2Ej@@GLIBCXX_3.4 +@@ -1832,6 +1931,11 @@ FUNC:_ZNSt8valarrayIjEC2Ej@@GLIBCXX_3.4 FUNC:_ZNSt8valarrayIjED1Ev@@GLIBCXX_3.4 FUNC:_ZNSt8valarrayIjED2Ev@@GLIBCXX_3.4 FUNC:_ZNSt8valarrayIjEixEj@@GLIBCXX_3.4 @@ -4078,7 +3705,7 @@ FUNC:_ZNSt9bad_allocD0Ev@@GLIBCXX_3.4 FUNC:_ZNSt9bad_allocD1Ev@@GLIBCXX_3.4 FUNC:_ZNSt9bad_allocD2Ev@@GLIBCXX_3.4 -@@ -1913,8 +2021,13 @@ FUNC:_ZSt14__convert_to_vIeEvPKcRT_RSt12 +@@ -1913,8 +2017,13 @@ FUNC:_ZSt14__convert_to_vIeEvPKcRT_RSt12 FUNC:_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct@@GLIBCXX_3.4 FUNC:_ZSt14set_unexpectedPFvvE@@GLIBCXX_3.4 FUNC:_ZSt15set_new_handlerPFvvE@@GLIBCXX_3.4 @@ -4092,7 +3719,7 @@ FUNC:_ZSt18_Rb_tree_decrementPKSt18_Rb_tree_node_base@@GLIBCXX_3.4 FUNC:_ZSt18_Rb_tree_decrementPSt18_Rb_tree_node_base@@GLIBCXX_3.4 FUNC:_ZSt18_Rb_tree_incrementPKSt18_Rb_tree_node_base@@GLIBCXX_3.4 -@@ -1930,6 +2043,8 @@ FUNC:_ZSt20__throw_domain_errorPKc@@GLIB +@@ -1930,6 +2039,8 @@ FUNC:_ZSt20__throw_domain_errorPKc@@GLIB FUNC:_ZSt20__throw_length_errorPKc@@GLIBCXX_3.4 FUNC:_ZSt20__throw_out_of_rangePKc@@GLIBCXX_3.4 FUNC:_ZSt21_Rb_tree_rotate_rightPSt18_Rb_tree_node_baseRS0_@@GLIBCXX_3.4 @@ -4101,7 +3728,7 @@ FUNC:_ZSt21__throw_bad_exceptionv@@GLIBCXX_3.4 FUNC:_ZSt21__throw_runtime_errorPKc@@GLIBCXX_3.4 FUNC:_ZSt22__throw_overflow_errorPKc@@GLIBCXX_3.4 -@@ -2164,12 +2279,20 @@ FUNC:__dynamic_cast@@CXXABI_1.3 +@@ -2164,12 +2275,20 @@ FUNC:__dynamic_cast@@CXXABI_1.3 FUNC:__gxx_personality_v0@@CXXABI_1.3 OBJECT:0:CXXABI_1.3 OBJECT:0:CXXABI_1.3.1 @@ -4122,54 +3749,7 @@ OBJECT:12:_ZTIN10__cxxabiv116__enum_type_infoE@@CXXABI_1.3 OBJECT:12:_ZTIN10__cxxabiv117__array_type_infoE@@CXXABI_1.3 OBJECT:12:_ZTIN10__cxxabiv117__class_type_infoE@@CXXABI_1.3 -@@ -2198,6 +2321,7 @@ OBJECT:12:_ZTISt12domain_error@@GLIBCXX_ - OBJECT:12:_ZTISt12length_error@@GLIBCXX_3.4 - OBJECT:12:_ZTISt12out_of_range@@GLIBCXX_3.4 - OBJECT:12:_ZTISt12strstreambuf@@GLIBCXX_3.4 -+OBJECT:12:_ZTISt12system_error@@GLIBCXX_3.4.10 - OBJECT:12:_ZTISt13bad_exception@@GLIBCXX_3.4 - OBJECT:12:_ZTISt13basic_filebufIcSt11char_traitsIcEE@@GLIBCXX_3.4 - OBJECT:12:_ZTISt13basic_filebufIwSt11char_traitsIwEE@@GLIBCXX_3.4 -@@ -2336,6 +2460,7 @@ OBJECT:16:_ZTTSt19basic_ostringstreamIwS - OBJECT:16:_ZTVNSt6locale5facetE@@GLIBCXX_3.4 - OBJECT:16:_ZTVSt11__timepunctIcE@@GLIBCXX_3.4 - OBJECT:16:_ZTVSt11__timepunctIwE@@GLIBCXX_3.4 -+OBJECT:16:_ZTVSt14error_category@@GLIBCXX_3.4.10 - OBJECT:16:_ZTVSt8ios_base@@GLIBCXX_3.4 - OBJECT:16:_ZTVSt9basic_iosIcSt11char_traitsIcEE@@GLIBCXX_3.4 - OBJECT:16:_ZTVSt9basic_iosIwSt11char_traitsIwEE@@GLIBCXX_3.4 -@@ -2344,12 +2469,14 @@ OBJECT:17:_ZTSSt12domain_error@@GLIBCXX_ - OBJECT:17:_ZTSSt12length_error@@GLIBCXX_3.4 - OBJECT:17:_ZTSSt12out_of_range@@GLIBCXX_3.4 - OBJECT:17:_ZTSSt12strstreambuf@@GLIBCXX_3.4 -+OBJECT:17:_ZTSSt12system_error@@GLIBCXX_3.4.10 - OBJECT:18:_ZTSNSt6locale5facetE@@GLIBCXX_3.4 - OBJECT:18:_ZTSSt13bad_exception@@GLIBCXX_3.4 - OBJECT:18:_ZTSSt13messages_base@@GLIBCXX_3.4 - OBJECT:18:_ZTSSt13runtime_error@@GLIBCXX_3.4 - OBJECT:19:_ZTSSt11__timepunctIcE@@GLIBCXX_3.4 - OBJECT:19:_ZTSSt11__timepunctIwE@@GLIBCXX_3.4 -+OBJECT:19:_ZTSSt14error_category@@GLIBCXX_3.4.10 - OBJECT:19:_ZTSSt14overflow_error@@GLIBCXX_3.4 - OBJECT:1:_ZNSs4_Rep11_S_terminalE@@GLIBCXX_3.4 - OBJECT:1:_ZNSt10moneypunctIcLb0EE4intlE@@GLIBCXX_3.4 -@@ -2592,6 +2719,7 @@ OBJECT:20:_ZTVSt11range_error@@GLIBCXX_3 - OBJECT:20:_ZTVSt12domain_error@@GLIBCXX_3.4 - OBJECT:20:_ZTVSt12length_error@@GLIBCXX_3.4 - OBJECT:20:_ZTVSt12out_of_range@@GLIBCXX_3.4 -+OBJECT:20:_ZTVSt12system_error@@GLIBCXX_3.4.10 - OBJECT:20:_ZTVSt13bad_exception@@GLIBCXX_3.4 - OBJECT:20:_ZTVSt13runtime_error@@GLIBCXX_3.4 - OBJECT:20:_ZTVSt14overflow_error@@GLIBCXX_3.4 -@@ -3018,6 +3146,7 @@ OBJECT:4:_ZNSt9money_getIcSt19istreambuf - OBJECT:4:_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 - OBJECT:4:_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4 - OBJECT:4:_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 -+OBJECT:4:_ZSt15system_category@@GLIBCXX_3.4.10 - OBJECT:4:_ZTSPKa@@CXXABI_1.3 - OBJECT:4:_ZTSPKb@@CXXABI_1.3 - OBJECT:4:_ZTSPKc@@CXXABI_1.3 -@@ -3113,11 +3242,14 @@ OBJECT:8:_ZGVNSt9money_getIcSt19istreamb +@@ -3113,6 +3232,8 @@ OBJECT:8:_ZGVNSt9money_getIcSt19istreamb OBJECT:8:_ZGVNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 OBJECT:8:_ZGVNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4 OBJECT:8:_ZGVNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4 @@ -4178,9 +3758,3 @@ OBJECT:8:_ZTINSt6locale5facetE@@GLIBCXX_3.4 OBJECT:8:_ZTISt10ctype_base@@GLIBCXX_3.4 OBJECT:8:_ZTISt10money_base@@GLIBCXX_3.4 - OBJECT:8:_ZTISt12codecvt_base@@GLIBCXX_3.4 - OBJECT:8:_ZTISt13messages_base@@GLIBCXX_3.4 -+OBJECT:8:_ZTISt14error_category@@GLIBCXX_3.4.10 - OBJECT:8:_ZTISt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4 - OBJECT:8:_ZTISt15basic_streambufIwSt11char_traitsIwEE@@GLIBCXX_3.4 - OBJECT:8:_ZTISt8ios_base@@GLIBCXX_3.4 Index: gcc43.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gcc43.spec 28 Feb 2008 11:29:03 -0000 1.19 +++ gcc43.spec 1 Mar 2008 00:15:53 -0000 1.20 @@ -1,6 +1,6 @@ -%define DATE 20080228 +%define DATE 20080229 %define gcc_version 4.3.0 -%define gcc_release 0.12 +%define gcc_release 0.13 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -467,19 +467,19 @@ ./contrib/gcc_update --touch %ifarch ppc -if [ -d libstdc++-v3/config/abi/powerpc64-linux-gnu ]; then - mkdir -p libstdc++-v3/config/abi/powerpc64-linux-gnu/64 - mv libstdc++-v3/config/abi/powerpc64-linux-gnu/{,64/}baseline_symbols.txt - mv libstdc++-v3/config/abi/powerpc64-linux-gnu/{32/,}baseline_symbols.txt - rm -rf libstdc++-v3/config/abi/powerpc64-linux-gnu/32 +if [ -d libstdc++-v3/config/abi/post/powerpc64-linux-gnu ]; then + mkdir -p libstdc++-v3/config/abi/post/powerpc64-linux-gnu/64 + mv libstdc++-v3/config/abi/post/powerpc64-linux-gnu/{,64/}baseline_symbols.txt + mv libstdc++-v3/config/abi/post/powerpc64-linux-gnu/{32/,}baseline_symbols.txt + rm -rf libstdc++-v3/config/abi/post/powerpc64-linux-gnu/32 fi %endif %ifarch sparc -if [ -d libstdc++-v3/config/abi/sparc64-linux-gnu ]; then - mkdir -p libstdc++-v3/config/abi/sparc64-linux-gnu/64 - mv libstdc++-v3/config/abi/sparc64-linux-gnu/{,64/}baseline_symbols.txt - mv libstdc++-v3/config/abi/sparc64-linux-gnu/{32/,}baseline_symbols.txt - rm -rf libstdc++-v3/config/abi/sparc64-linux-gnu/32 +if [ -d libstdc++-v3/config/abi/post/sparc64-linux-gnu ]; then + mkdir -p libstdc++-v3/config/abi/post/sparc64-linux-gnu/64 + mv libstdc++-v3/config/abi/post/sparc64-linux-gnu/{,64/}baseline_symbols.txt + mv libstdc++-v3/config/abi/post/sparc64-linux-gnu/{32/,}baseline_symbols.txt + rm -rf libstdc++-v3/config/abi/post/sparc64-linux-gnu/32 fi %endif @@ -1657,6 +1657,12 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Fri Feb 29 2008 Jakub Jelinek 4.3.0-0.13 +- update from gcc-4_3-branch + - PRs middle-end/19984, target/25477 + - remove , fix ppc/ppc64 + std::{,tr1::}hash::operator() ABI + * Thu Feb 28 2008 Jakub Jelinek 4.3.0-0.12 - update from gcc-4_3-branch - PRs c++/34715, c++/35368, libfortran/24685, middle-end/34971, Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- sources 28 Feb 2008 11:29:03 -0000 1.228 +++ sources 1 Mar 2008 00:15:53 -0000 1.229 @@ -1,2 +1,2 @@ -3682a2c410180b135804cc1097f9204c gcc-4.3.0-20080228.tar.bz2 +d482ca8757d55c91ea709bce300a1d59 gcc-4.3.0-20080229.tar.bz2 92a70f9e56223b653bce0f58f90cf950 fastjar-0.95.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 02:26:38 2008 From: fedora-extras-commits at redhat.com (Hans Ulrich Niedermann (ndim)) Date: Sat, 1 Mar 2008 02:26:38 GMT Subject: rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 xorg-x11-drv-radeonhd-README.fedora, 1.19, 1.20 xorg-x11-drv-radeonhd.spec, 1.25, 1.26 Message-ID: <200803010226.m212QcUE021309@cvs-int.fedora.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21280 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd.spec Log Message: * Sat Mar 01 2008 Hans Ulrich Niedermann - 1.1.0-0.7.20080301git - Add dependency on xorg server on F9 to prevent ABI compatibility issues (#431176) - Reflect R5xx partial 2D acceleration support in README.fedora - New snapshot (upstream commit 8c6d1b46b70ae19fafb5484c238a74cca18d5990): - 8c6d1b46: conntest: add new ids. - 294cf1f6: Fix test for RS6XX in RHDMCSetup(). - 1b3f3c9c: Add connector table flag for X1400 (0x7145, 0x1297, 0x3058). - a23b1123: Loop over all CRTCs when shutting down memory access. - 8432cb08: Add quirk table entry for Diamond Viper Radeon X1650 Pro - 5ba5f4b5: Include description for acceleration options. - eee9b718: Fix typo in patch adding DradonFlyBSD support. - f89bac58: Add support for DragonFlyBSD. - 1223e40a: Add debugging to rhd_conntest.c - 1e8637b1: Changing R6XX_MC_VM_MISC_OFFSET to R6XX_HDP_NONSURFACE_BASE. - 854ce3b2: Make DDC for panels work on MacBook Pro's. - 247d4263: Set up GPIO pin HW access for DDC testing in rhd_conntest. - 23a47ec0: Restore VGA after restoring the CRTCs. - 74eacf3e: Make sure GRAPH and CRTC engine are disabled before changing surface. - 2b16734b: Set GPIO pins to be HW driven on R5xx for HW controlled I2C. - 2feff5cb: Add wait for memory idle state. - e0d58784: Handle LVTMA_TRANSMITTER_ENABLE identically on R5/6xx. - 1849092e: Add connector information for a Sapphire Radeon HD 2600 PRO AGP (PnPID: 0x9587:0x1002:0x0028). - 7527df07: Revert "PATCH: Report PANEL as disconnected when no modes are available" - 3d29d4ce: PATCH: Report PANEL as disconnected when no modes are available - cd6a4b89: typo fix in DPI guessing code - 1a503c59: Update ObjectID.h - 8640be8e: Update atombios.h Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 16 Feb 2008 19:10:49 -0000 1.21 +++ .cvsignore 1 Mar 2008 02:26:01 -0000 1.22 @@ -1 +1 @@ -xf86-video-radeonhd-1.1.0-20080216git.tar.bz2 +xf86-video-radeonhd-1.1.0-20080301git.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 16 Feb 2008 19:10:49 -0000 1.21 +++ sources 1 Mar 2008 02:26:01 -0000 1.22 @@ -1 +1 @@ -37fecb842c9e031035944a7dd4435d02 xf86-video-radeonhd-1.1.0-20080216git.tar.bz2 +29c34c2a698adb5d47a256b5d9efb58d xf86-video-radeonhd-1.1.0-20080301git.tar.bz2 Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xorg-x11-drv-radeonhd-README.fedora 16 Feb 2008 19:10:49 -0000 1.19 +++ xorg-x11-drv-radeonhd-README.fedora 1 Mar 2008 02:26:01 -0000 1.20 @@ -11,7 +11,7 @@ we are packaging development snapshots of upstream's git repository here. -Latest upstream commit: a9af866ae712a0048d374dc640e482d1f4ce8859 +Latest upstream commit: 8c6d1b46b70ae19fafb5484c238a74cca18d5990 Contents @@ -43,17 +43,19 @@ =========== * Non-accelerated 2D graphics. + * Accelerated 2D graphics for some chip series (R5xx). + R6xx chips do not have the 2D functions on the chip, so on these + chips 2D acceleration will have to wait for working 3D acceleration. 4. Known Issues =============== - * XVideo: Not supported (yet). - Possibly relatively soon for YUV and scaling limited to x1 and x2. + * XVideo and other 2D acceleration: Only supported on R5xx series chips. * 3D acceleration: Not supported (yet). - * ThinkPad backlight brightness control: Not yet. + * Laptop backlight brightness control: Not yet. Workaround: Switch to text console, change brightness, switch back to X11. Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xorg-x11-drv-radeonhd.spec 16 Feb 2008 19:10:49 -0000 1.25 +++ xorg-x11-drv-radeonhd.spec 1 Mar 2008 02:26:01 -0000 1.26 @@ -20,8 +20,8 @@ %endif %if 0%{snapshot} -%define date 20080216 -%define git_commit a9af866ae712a0048d374dc640e482d1f4ce8859 +%define date 20080301 +%define git_commit 8c6d1b46b70ae19fafb5484c238a74cca18d5990 %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %else @@ -31,7 +31,7 @@ Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets Name: xorg-x11-drv-radeonhd Version: 1.1.0 -Release: 0.6%{?alphatag}%{?dist} +Release: 0.7%{?alphatag}%{?dist} License: MIT Group: User Interface/X Hardware Support @@ -79,6 +79,15 @@ Requires: xorg-x11-server-utils >= 7.3-2 %endif +# Avoid ABI issue in Fedora 9 and later +%if 0%{?fedora} >= 9 +BuildRequires: xorg-x11-server-sdk >= 1.4.99.1 +Requires: xorg-x11-server-Xorg >= 1.4.99.1 +%else +BuildRequires: xorg-x11-server-sdk < 1.4.99.1 +Requires: xorg-x11-server-Xorg < 1.4.99.1 +%endif + %description X.org X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets. %if 0%{snapshot} @@ -140,6 +149,34 @@ %endif %changelog +* Sat Mar 01 2008 Hans Ulrich Niedermann - 1.1.0-0.7.20080301git +- Add dependency on xorg server on F9 to prevent ABI compatibility issues (#431176) +- Reflect R5xx partial 2D acceleration support in README.fedora +- New snapshot (upstream commit 8c6d1b46b70ae19fafb5484c238a74cca18d5990): + - 8c6d1b46: conntest: add new ids. + - 294cf1f6: Fix test for RS6XX in RHDMCSetup(). + - 1b3f3c9c: Add connector table flag for X1400 (0x7145, 0x1297, 0x3058). + - a23b1123: Loop over all CRTCs when shutting down memory access. + - 8432cb08: Add quirk table entry for Diamond Viper Radeon X1650 Pro + - 5ba5f4b5: Include description for acceleration options. + - eee9b718: Fix typo in patch adding DradonFlyBSD support. + - f89bac58: Add support for DragonFlyBSD. + - 1223e40a: Add debugging to rhd_conntest.c + - 1e8637b1: Changing R6XX_MC_VM_MISC_OFFSET to R6XX_HDP_NONSURFACE_BASE. + - 854ce3b2: Make DDC for panels work on MacBook Pro's. + - 247d4263: Set up GPIO pin HW access for DDC testing in rhd_conntest. + - 23a47ec0: Restore VGA after restoring the CRTCs. + - 74eacf3e: Make sure GRAPH and CRTC engine are disabled before changing surface. + - 2b16734b: Set GPIO pins to be HW driven on R5xx for HW controlled I2C. + - 2feff5cb: Add wait for memory idle state. + - e0d58784: Handle LVTMA_TRANSMITTER_ENABLE identically on R5/6xx. + - 1849092e: Add connector information for a Sapphire Radeon HD 2600 PRO AGP (PnPID: 0x9587:0x1002:0x0028). + - 7527df07: Revert "PATCH: Report PANEL as disconnected when no modes are available" + - 3d29d4ce: PATCH: Report PANEL as disconnected when no modes are available + - cd6a4b89: typo fix in DPI guessing code + - 1a503c59: Update ObjectID.h + - 8640be8e: Update atombios.h + * Sat Feb 16 2008 Hans Ulrich Niedermann - 1.1.0-0.6.20080216git - New snapshot (upstream commit a9af866ae712a0048d374dc640e482d1f4ce8859): - a9af866a: Prevent endless loop in connector table parser. From fedora-extras-commits at redhat.com Sat Mar 1 02:29:08 2008 From: fedora-extras-commits at redhat.com (Hans Ulrich Niedermann (ndim)) Date: Sat, 1 Mar 2008 02:29:08 GMT Subject: rpms/xorg-x11-drv-radeonhd/F-8 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 xorg-x11-drv-radeonhd-README.fedora, 1.12, 1.13 xorg-x11-drv-radeonhd.spec, 1.14, 1.15 Message-ID: <200803010229.m212T80x021405@cvs-int.fedora.redhat.com> Author: ndim Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21372 Modified Files: .cvsignore sources xorg-x11-drv-radeonhd-README.fedora xorg-x11-drv-radeonhd.spec Log Message: * Sat Mar 01 2008 Hans Ulrich Niedermann - 1.1.0-0.7.20080301git - Add dependency on xorg server on F9 to prevent ABI compatibility issues (#431176) - Reflect R5xx partial 2D acceleration support in README.fedora - New snapshot (upstream commit 8c6d1b46b70ae19fafb5484c238a74cca18d5990): - 8c6d1b46: conntest: add new ids. - 294cf1f6: Fix test for RS6XX in RHDMCSetup(). - 1b3f3c9c: Add connector table flag for X1400 (0x7145, 0x1297, 0x3058). - a23b1123: Loop over all CRTCs when shutting down memory access. - 8432cb08: Add quirk table entry for Diamond Viper Radeon X1650 Pro - 5ba5f4b5: Include description for acceleration options. - eee9b718: Fix typo in patch adding DradonFlyBSD support. - f89bac58: Add support for DragonFlyBSD. - 1223e40a: Add debugging to rhd_conntest.c - 1e8637b1: Changing R6XX_MC_VM_MISC_OFFSET to R6XX_HDP_NONSURFACE_BASE. - 854ce3b2: Make DDC for panels work on MacBook Pro's. - 247d4263: Set up GPIO pin HW access for DDC testing in rhd_conntest. - 23a47ec0: Restore VGA after restoring the CRTCs. - 74eacf3e: Make sure GRAPH and CRTC engine are disabled before changing surface. - 2b16734b: Set GPIO pins to be HW driven on R5xx for HW controlled I2C. - 2feff5cb: Add wait for memory idle state. - e0d58784: Handle LVTMA_TRANSMITTER_ENABLE identically on R5/6xx. - 1849092e: Add connector information for a Sapphire Radeon HD 2600 PRO AGP (PnPID: 0x9587:0x1002:0x0028). - 7527df07: Revert "PATCH: Report PANEL as disconnected when no modes are available" - 3d29d4ce: PATCH: Report PANEL as disconnected when no modes are available - cd6a4b89: typo fix in DPI guessing code - 1a503c59: Update ObjectID.h - 8640be8e: Update atombios.h Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-8/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 16 Feb 2008 19:14:40 -0000 1.15 +++ .cvsignore 1 Mar 2008 02:28:29 -0000 1.16 @@ -1 +1 @@ -xf86-video-radeonhd-1.1.0-20080216git.tar.bz2 +xf86-video-radeonhd-1.1.0-20080301git.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-8/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 16 Feb 2008 19:14:40 -0000 1.15 +++ sources 1 Mar 2008 02:28:29 -0000 1.16 @@ -1 +1 @@ -37fecb842c9e031035944a7dd4435d02 xf86-video-radeonhd-1.1.0-20080216git.tar.bz2 +29c34c2a698adb5d47a256b5d9efb58d xf86-video-radeonhd-1.1.0-20080301git.tar.bz2 Index: xorg-x11-drv-radeonhd-README.fedora =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-8/xorg-x11-drv-radeonhd-README.fedora,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xorg-x11-drv-radeonhd-README.fedora 16 Feb 2008 19:14:40 -0000 1.12 +++ xorg-x11-drv-radeonhd-README.fedora 1 Mar 2008 02:28:29 -0000 1.13 @@ -11,7 +11,7 @@ we are packaging development snapshots of upstream's git repository here. -Latest upstream commit: a9af866ae712a0048d374dc640e482d1f4ce8859 +Latest upstream commit: 8c6d1b46b70ae19fafb5484c238a74cca18d5990 Contents @@ -43,17 +43,19 @@ =========== * Non-accelerated 2D graphics. + * Accelerated 2D graphics for some chip series (R5xx). + R6xx chips do not have the 2D functions on the chip, so on these + chips 2D acceleration will have to wait for working 3D acceleration. 4. Known Issues =============== - * XVideo: Not supported (yet). - Possibly relatively soon for YUV and scaling limited to x1 and x2. + * XVideo and other 2D acceleration: Only supported on R5xx series chips. * 3D acceleration: Not supported (yet). - * ThinkPad backlight brightness control: Not yet. + * Laptop backlight brightness control: Not yet. Workaround: Switch to text console, change brightness, switch back to X11. Index: xorg-x11-drv-radeonhd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-8/xorg-x11-drv-radeonhd.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xorg-x11-drv-radeonhd.spec 16 Feb 2008 19:14:40 -0000 1.14 +++ xorg-x11-drv-radeonhd.spec 1 Mar 2008 02:28:29 -0000 1.15 @@ -20,8 +20,8 @@ %endif %if 0%{snapshot} -%define date 20080216 -%define git_commit a9af866ae712a0048d374dc640e482d1f4ce8859 +%define date 20080301 +%define git_commit 8c6d1b46b70ae19fafb5484c238a74cca18d5990 %define alphatag .%{date}git %define tarball %{tarname}-%{version}-%{date}git %else @@ -31,7 +31,7 @@ Summary: Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets Name: xorg-x11-drv-radeonhd Version: 1.1.0 -Release: 0.6%{?alphatag}%{?dist} +Release: 0.7%{?alphatag}%{?dist} License: MIT Group: User Interface/X Hardware Support @@ -79,6 +79,15 @@ Requires: xorg-x11-server-utils >= 7.3-2 %endif +# Avoid ABI issue in Fedora 9 and later +%if 0%{?fedora} >= 9 +BuildRequires: xorg-x11-server-sdk >= 1.4.99.1 +Requires: xorg-x11-server-Xorg >= 1.4.99.1 +%else +BuildRequires: xorg-x11-server-sdk < 1.4.99.1 +Requires: xorg-x11-server-Xorg < 1.4.99.1 +%endif + %description X.org X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets. %if 0%{snapshot} @@ -140,6 +149,34 @@ %endif %changelog +* Sat Mar 01 2008 Hans Ulrich Niedermann - 1.1.0-0.7.20080301git +- Add dependency on xorg server on F9 to prevent ABI compatibility issues (#431176) +- Reflect R5xx partial 2D acceleration support in README.fedora +- New snapshot (upstream commit 8c6d1b46b70ae19fafb5484c238a74cca18d5990): + - 8c6d1b46: conntest: add new ids. + - 294cf1f6: Fix test for RS6XX in RHDMCSetup(). + - 1b3f3c9c: Add connector table flag for X1400 (0x7145, 0x1297, 0x3058). + - a23b1123: Loop over all CRTCs when shutting down memory access. + - 8432cb08: Add quirk table entry for Diamond Viper Radeon X1650 Pro + - 5ba5f4b5: Include description for acceleration options. + - eee9b718: Fix typo in patch adding DradonFlyBSD support. + - f89bac58: Add support for DragonFlyBSD. + - 1223e40a: Add debugging to rhd_conntest.c + - 1e8637b1: Changing R6XX_MC_VM_MISC_OFFSET to R6XX_HDP_NONSURFACE_BASE. + - 854ce3b2: Make DDC for panels work on MacBook Pro's. + - 247d4263: Set up GPIO pin HW access for DDC testing in rhd_conntest. + - 23a47ec0: Restore VGA after restoring the CRTCs. + - 74eacf3e: Make sure GRAPH and CRTC engine are disabled before changing surface. + - 2b16734b: Set GPIO pins to be HW driven on R5xx for HW controlled I2C. + - 2feff5cb: Add wait for memory idle state. + - e0d58784: Handle LVTMA_TRANSMITTER_ENABLE identically on R5/6xx. + - 1849092e: Add connector information for a Sapphire Radeon HD 2600 PRO AGP (PnPID: 0x9587:0x1002:0x0028). + - 7527df07: Revert "PATCH: Report PANEL as disconnected when no modes are available" + - 3d29d4ce: PATCH: Report PANEL as disconnected when no modes are available + - cd6a4b89: typo fix in DPI guessing code + - 1a503c59: Update ObjectID.h + - 8640be8e: Update atombios.h + * Sat Feb 16 2008 Hans Ulrich Niedermann - 1.1.0-0.6.20080216git - New snapshot (upstream commit a9af866ae712a0048d374dc640e482d1f4ce8859): - a9af866a: Prevent endless loop in connector table parser. From fedora-extras-commits at redhat.com Sat Mar 1 02:31:58 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 1 Mar 2008 02:31:58 GMT Subject: rpms/gpgme/devel gpgme.spec,1.30,1.31 Message-ID: <200803010231.m212VwG0021500@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21473 Modified Files: gpgme.spec Log Message: --disable-gpg-test when also using gpg2 (some tests are gpg(1)-specific) Index: gpgme.spec =================================================================== RCS file: /cvs/pkgs/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gpgme.spec 17 Feb 2008 21:50:01 -0000 1.30 +++ gpgme.spec 1 Mar 2008 02:31:17 -0000 1.31 @@ -56,7 +56,7 @@ %build %configure \ --disable-static \ - --with-gpg=%{_bindir}/gpg2 + --with-gpg=%{_bindir}/gpg2 --disable-gpg-test make %{?_smp_mflags} @@ -75,7 +75,7 @@ %check || : # expect 1(+?) errors with gnupg < 1.2.4 # gpgme-1.1.6 includes one known failure (FAIL: t-sign) -make check ||: +make -C tests check ||: %clean From fedora-extras-commits at redhat.com Sat Mar 1 03:06:42 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 1 Mar 2008 03:06:42 GMT Subject: rpms/gnupg2/devel gnupg2.spec,1.82,1.83 Message-ID: <200803010306.m2136g1O029121@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29098 Modified Files: gnupg2.spec Log Message: libgcrypt-devel >= 1.4.0 is preferred, see http://bugzilla.redhat.com/435320 Index: gnupg2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- gnupg2.spec 8 Feb 2008 21:22:15 -0000 1.82 +++ gnupg2.spec 1 Mar 2008 03:06:01 -0000 1.83 @@ -18,6 +18,9 @@ BuildRequires: docbook-utils BuildRequires: gettext BuildRequires: libassuan-devel >= 1.0.4 +# libgcrypt-devel >= 1.4.0 is preferred, see http://bugzilla.redhat.com/435320 +#BuildRequires: libgcrypt-devel >= 1.4.0 +#Requires(hint): libgcrypt >= 1.4.0 BuildRequires: libgcrypt-devel => 1.2.2 BuildRequires: libgpg-error-devel => 1.4 BuildRequires: libksba-devel >= 1.0.2 @@ -33,7 +36,7 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info Requires(hint): dirmngr -Requires: pinentry +Requires(hint): pinentry # ancient, deprecated #Obsoletes: newpg < 0.9.5 From fedora-extras-commits at redhat.com Sat Mar 1 03:40:45 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 1 Mar 2008 03:40:45 GMT Subject: rpms/kipi-plugins/devel .cvsignore, 1.16, 1.17 kipi-plugins.spec, 1.49, 1.50 sources, 1.15, 1.16 kipi-plugins-0.1.5-rc2-libXrandr.patch, 1.1, NONE Message-ID: <200803010340.m213ej4n029543@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kipi-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29509 Modified Files: .cvsignore kipi-plugins.spec sources Removed Files: kipi-plugins-0.1.5-rc2-libXrandr.patch Log Message: * Fri Feb 29 2008 Rex Dieter 0.1.5-1 - kipi-plugins-0.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 2 Feb 2008 13:52:11 -0000 1.16 +++ .cvsignore 1 Mar 2008 03:40:10 -0000 1.17 @@ -1,4 +1 @@ -clog -kipi-plugins-0.1.4.tar.bz2 -kipi-plugins-0.1.5-rc1.tar.bz2 -kipi-plugins-0.1.5-rc2.tar.bz2 +kipi-plugins-0.1.5.tar.bz2 Index: kipi-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- kipi-plugins.spec 21 Feb 2008 20:26:19 -0000 1.49 +++ kipi-plugins.spec 1 Mar 2008 03:40:10 -0000 1.50 @@ -1,23 +1,20 @@ # Fedora review: http://bugzilla.redhat.com/171504 -%define beta rc2 +#define beta rc2 Name: kipi-plugins Summary: Plugins to use with Kipi Version: 0.1.5 -Release: 0.6.%{beta}%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia Url: http://www.kipi-plugins.org/ -Source0: http://downloads.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2 +#Source0: http://downloads.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2 +Source0: http://www.valeriofuoglio.it/kipi/kipi-plugins-0.1.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# upstreamed: http://bugs.kde.org/158176 -Patch1: kipi-plugins-0.1.5-rc2-libXrandr.patch - -BuildRequires: automake libtool BuildRequires: gettext BuildRequires: kdelibs3-devel BuildRequires: libkipi-devel >= 0.1.5 @@ -104,10 +101,6 @@ %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} -%patch1 -p1 -b .libXrandr - -make -f admin/Makefile.common - %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -180,6 +173,9 @@ %changelog +* Fri Feb 29 2008 Rex Dieter 0.1.5-1 +- kipi-plugins-0.1.5 + * Thu Feb 21 2008 Rex Dieter 0.1.5-0.6.rc2 - libXrandr patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 2 Feb 2008 13:52:11 -0000 1.15 +++ sources 1 Mar 2008 03:40:10 -0000 1.16 @@ -1 +1 @@ -f590ce0d7c39ba5b0cd4857e9fc21f9e kipi-plugins-0.1.5-rc2.tar.bz2 +7b40af3d27afcd29e4cd2c23ccf0bbfe kipi-plugins-0.1.5.tar.bz2 --- kipi-plugins-0.1.5-rc2-libXrandr.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 1 03:56:00 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 1 Mar 2008 03:56:00 GMT Subject: rpms/xulrunner/devel .cvsignore, 1.29, 1.30 sources, 1.30, 1.31 xulrunner.spec, 1.80, 1.81 Message-ID: <200803010356.m213u0RH029814@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29770 Modified Files: .cvsignore sources xulrunner.spec Log Message: * Fri Feb 29 2008 Christopher Aillon 1.9-0.beta3.31 - Update to latest trunk (2008-02-29) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 29 Feb 2008 04:02:38 -0000 1.29 +++ .cvsignore 1 Mar 2008 03:55:20 -0000 1.30 @@ -1 +1 @@ -mozilla-20080228.tar.bz2 +mozilla-20080229.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 29 Feb 2008 04:02:38 -0000 1.30 +++ sources 1 Mar 2008 03:55:20 -0000 1.31 @@ -1 +1 @@ -614237a030f97b3ec538798def079c6b mozilla-20080228.tar.bz2 +5d815e7932fe7b668793fd1742ac3963 mozilla-20080229.tar.bz2 Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- xulrunner.spec 29 Feb 2008 04:02:38 -0000 1.80 +++ xulrunner.spec 1 Mar 2008 03:55:20 -0000 1.81 @@ -7,14 +7,14 @@ %define version_internal 1.9pre %if ! %{official_branding} -%define cvsdate 20080228 +%define cvsdate 20080229 %define nightly .nightly%{cvsdate} %endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.beta3.30%{?nightly}%{?dist} +Release: 0.beta3.31%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -400,6 +400,9 @@ #--------------------------------------------------------------------- %changelog +* Fri Feb 29 2008 Christopher Aillon 1.9-0.beta3.31 +- Update to latest trunk (2008-02-29) + * Thu Feb 28 2008 Christopher Aillon 1.9-0.beta3.30 - Update to latest trunk (2008-02-28) From fedora-extras-commits at redhat.com Sat Mar 1 03:56:49 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 1 Mar 2008 03:56:49 GMT Subject: rpms/firefox/devel .cvsignore, 1.59, 1.60 firefox.spec, 1.263, 1.264 sources, 1.70, 1.71 Message-ID: <200803010356.m213unln029877@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29793 Modified Files: .cvsignore firefox.spec sources Log Message: * Fri Feb 29 2008 Christopher Aillon 3.0-0.beta3.31 - Update to latest trunk (2008-02-29) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 29 Feb 2008 04:02:51 -0000 1.59 +++ .cvsignore 1 Mar 2008 03:55:34 -0000 1.60 @@ -1,2 +1 @@ -firefox-langpacks-20080104.tar.bz2 -mozilla-20080228.tar.bz2 +mozilla-20080229.tar.bz2 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- firefox.spec 29 Feb 2008 04:02:51 -0000 1.263 +++ firefox.spec 1 Mar 2008 03:55:34 -0000 1.264 @@ -7,20 +7,20 @@ %define mozappdir %{_libdir}/%{name}-%{version_internal} %define gecko_version 1.9 -%define xulrunner_version 1.9-0.beta3.30 +%define xulrunner_version 1.9-0.beta3.31 %define official_branding 0 %define build_langpacks 0 %if ! %{official_branding} -%define cvsdate 20080228 +%define cvsdate 20080229 %define nightly .nightly%{cvsdate} %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.beta3.30%{?nightly}%{?dist} +Release: 0.beta3.31%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -30,7 +30,7 @@ %define tarball mozilla-%{cvsdate}.tar.bz2 %endif Source0: %{tarball} -Source2: firefox-langpacks-20080104.tar.bz2 +#Source2: firefox-langpacks-20080104.tar.bz2 Source10: firefox-mozconfig Source11: firefox-mozconfig-branded Source12: firefox-redhat-default-prefs.js @@ -315,6 +315,9 @@ #--------------------------------------------------------------------- %changelog +* Fri Feb 29 2008 Christopher Aillon 3.0-0.beta3.31 +- Update to latest trunk (2008-02-29) + * Thu Feb 28 2008 Christopher Aillon 3.0-0.beta3.30 - Update to latest trunk (2008-02-28) Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- sources 29 Feb 2008 04:02:51 -0000 1.70 +++ sources 1 Mar 2008 03:55:34 -0000 1.71 @@ -1,2 +1 @@ -d04a2981b603b9abbc8a5e0525759c4b firefox-langpacks-20080104.tar.bz2 -614237a030f97b3ec538798def079c6b mozilla-20080228.tar.bz2 +5d815e7932fe7b668793fd1742ac3963 mozilla-20080229.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 04:04:52 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 1 Mar 2008 04:04:52 GMT Subject: rpms/TurboGears/devel TurboGears-1.0.4.3-setuptools.patch, 1.1, 1.2 TurboGears.spec, 1.33, 1.34 Message-ID: <200803010404.m2144q41006088@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/TurboGears/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063 Modified Files: TurboGears-1.0.4.3-setuptools.patch TurboGears.spec Log Message: Require python-paste-script >= 1.6.2 (Bug #435525) TurboGears-1.0.4.3-setuptools.patch: Index: TurboGears-1.0.4.3-setuptools.patch =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.4.3-setuptools.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TurboGears-1.0.4.3-setuptools.patch 1 Feb 2008 16:56:19 -0000 1.1 +++ TurboGears-1.0.4.3-setuptools.patch 1 Mar 2008 04:04:15 -0000 1.2 @@ -1,15 +1,17 @@ ---- setup.py.orig 2008-01-23 10:50:49.000000000 -0500 -+++ setup.py 2008-01-23 10:51:26.000000000 -0500 -@@ -14,9 +14,7 @@ +--- setup.py.orig 2008-02-29 21:57:04.000000000 -0500 ++++ setup.py 2008-02-29 22:07:38.000000000 -0500 +@@ -14,10 +14,8 @@ # setup params install_requires = [ "CherryPy >= 2.3.0,<3.0.0alpha", - "ConfigObj >= 4.3.2", "DecoratorTools >= 1.4", - "FormEncode >= 0.7.1", - "PasteScript >= 0.9.7,<1.6", +- "PasteScript >= 0.9.7,<1.6", ++ "PasteScript >= 1.6.2", "RuleDispatch >= 0.5a0.dev-r2303", "setuptools >= 0.6c2", + "simplejson >= 1.3", @@ -57,10 +55,6 @@ # python 2.5 compatible list Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- TurboGears.spec 22 Feb 2008 18:45:57 -0000 1.33 +++ TurboGears.spec 1 Mar 2008 04:04:15 -0000 1.34 @@ -3,7 +3,7 @@ Name: TurboGears Version: 1.0.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages @@ -41,7 +41,7 @@ Requires: python-turbokid >= 1.0.4 Requires: python-tgfastdata Requires: python-simplejson >= 1.3 -Requires: python-paste-script >= 0.9.7 +Requires: python-paste-script >= 1.6.2 Requires: python-configobj >= 4.3.2 Requires: python-ruledispatch Requires: python-nose >= 0.9.1 @@ -89,6 +89,9 @@ %{python_sitelib}/turbogears/ %changelog +* Fri Feb 29 2008 Luke Macken 1.0.4.3-3 +- Require python-paste-script >= 1.6.2 (Bug #435525) + * Thu Feb 21 2008 Toshio Kuratomi 1.0.4.3-2 - Fixes for SQLAlchemy-0.4 and exceptions. Upstream Bug #1721. From fedora-extras-commits at redhat.com Sat Mar 1 04:10:35 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sat, 1 Mar 2008 04:10:35 GMT Subject: comps comps-f9.xml.in,1.283,1.284 Message-ID: <200803010410.m214AZfO006245@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6223 Modified Files: comps-f9.xml.in Log Message: Make gnome-volume-manager optional Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.283 retrieving revision 1.284 diff -u -r1.283 -r1.284 --- comps-f9.xml.in 29 Feb 2008 05:15:12 -0000 1.283 +++ comps-f9.xml.in 1 Mar 2008 04:10:05 -0000 1.284 @@ -1740,7 +1740,6 @@ gnome-utils gnome-vfs2-obexftp gnome-vfs2-smb - gnome-volume-manager gok gthumb gtk2-engines @@ -1783,6 +1782,7 @@ gnome-pilot-conduits gnome-schedule gnome-theme-curvylooks + gnome-volume-manager gnotime gonvert grsync From fedora-extras-commits at redhat.com Sat Mar 1 04:25:06 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Sat, 1 Mar 2008 04:25:06 GMT Subject: rpms/paraview/devel paraview-3.2.1-gcc43.patch,1.1,1.2 Message-ID: <200803010425.m214P6vU006441@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/paraview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6418 Modified Files: paraview-3.2.1-gcc43.patch Log Message: Update XdfmArray.h to include paraview-3.2.1-gcc43.patch: Index: paraview-3.2.1-gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/paraview/devel/paraview-3.2.1-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- paraview-3.2.1-gcc43.patch 18 Feb 2008 20:14:53 -0000 1.1 +++ paraview-3.2.1-gcc43.patch 1 Mar 2008 04:24:51 -0000 1.2 @@ -85,16 +85,6 @@ #include #if (METAIO_USE_NAMESPACE) ---- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h.gcc43 2007-11-07 13:51:40.000000000 -0700 -+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-02-18 11:36:36.000000000 -0700 -@@ -26,6 +26,7 @@ - #define __XdmfArray_h - - #include "XdmfDataDesc.h" -+#include - - #define XDMF_LONGEST_LENGTH (XdmfInt64)~0 - #define XDMF_ARRAY_TAG_LENGTH 80 --- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfLightData.h.gcc43 2007-11-07 13:51:40.000000000 -0700 +++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfLightData.h 2008-02-18 11:38:06.000000000 -0700 @@ -26,7 +26,7 @@ @@ -136,3 +126,14 @@ XdmfRoot::XdmfRoot() { this->SetElementName("Xdmf"); +--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h.gcc43 2007-11-07 13:51:40.000000000 -0700 ++++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-02-29 21:23:35.000000000 -0700 +@@ -26,6 +26,8 @@ + #define __XdmfArray_h + + #include "XdmfDataDesc.h" ++#include ++#include + + #define XDMF_LONGEST_LENGTH (XdmfInt64)~0 + #define XDMF_ARRAY_TAG_LENGTH 80 From fedora-extras-commits at redhat.com Sat Mar 1 04:43:44 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Sat, 1 Mar 2008 04:43:44 GMT Subject: rpms/control-center/devel broken-schema-translations.patch, NONE, 1.1 control-center.spec, 1.344, 1.345 Message-ID: <200803010443.m214hiiL007664@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7545 Modified Files: control-center.spec Added Files: broken-schema-translations.patch Log Message: fix broken schema translations broken-schema-translations.patch: --- NEW FILE broken-schema-translations.patch --- diff -up gnome-control-center-2.21.92/po/as.po.broken-schema-translations gnome-control-center-2.21.92/po/as.po --- gnome-control-center-2.21.92/po/as.po.broken-schema-translations 2008-02-29 23:40:36.000000000 -0500 +++ gnome-control-center-2.21.92/po/as.po 2008-02-29 23:40:58.000000000 -0500 @@ -3101,7 +3101,7 @@ msgstr "?????????????????? ????????? ??? msgid "" "[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-" "applications.desktop,Add Printer;gnome-cups-manager.desktop]" -msgstr "????????? ??????????????????????????? ?????????????????? ????????? ????????? ???????????????????????????" +msgstr "" #: ../shell/control-center.schemas.in.h:14 msgid "if true, the control-center will close when a \"Common Task\" is activated" diff -up gnome-control-center-2.21.92/po/fi.po.broken-schema-translations gnome-control-center-2.21.92/po/fi.po --- gnome-control-center-2.21.92/po/fi.po.broken-schema-translations 2008-02-29 23:32:18.000000000 -0500 +++ gnome-control-center-2.21.92/po/fi.po 2008-02-29 23:32:35.000000000 -0500 @@ -3142,7 +3142,7 @@ msgid "" "[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-" "applications.desktop,Add Printer;gnome-cups-manager.desktop]" msgstr "" -"Vaihda teemaa;gtk-theme-selector.desktop,Aseta ensisijaiset sovellukset;" +"[Vaihda teemaa;gtk-theme-selector.desktop,Aseta ensisijaiset sovellukset;" "default-applications.desktop, Lis???? tulostin;gnome-cups-manager.desktop]" #: ../shell/control-center.schemas.in.h:14 Index: control-center.spec =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v retrieving revision 1.344 retrieving revision 1.345 diff -u -r1.344 -r1.345 --- control-center.spec 28 Feb 2008 04:14:30 -0000 1.344 +++ control-center.spec 1 Mar 2008 04:43:08 -0000 1.345 @@ -22,7 +22,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.21.92 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -36,6 +36,10 @@ # Fix some useless warnings in libslab # http://bugzilla.gnome.org/show_bug.cgi?id=439398 Patch6: gnome-control-center-2.19.90-no-warnings.patch + +# sent to gnome-i18n at gnome.org +Patch7: broken-schema-translations.patch + # call the Fedora/RHEL graphical passwd changing apps Patch95: control-center-2.21.92-passwd.patch Patch96: gnome-control-center-2.21.92-gecos.patch @@ -164,6 +168,7 @@ pushd libslab %patch6 -p0 -b .warnings popd +%patch7 -p1 -b .broken-schema-translations # vendor configuration patches %patch95 -p1 -b .passwd @@ -348,6 +353,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Fri Feb 29 2008 Matthias Clasen - 2.21.92-2 +- Fix broken schema translations + * Tue Feb 26 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 From fedora-extras-commits at redhat.com Sat Mar 1 07:29:15 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 07:29:15 GMT Subject: rpms/ocaml-findlib/devel ocaml-findlib.spec,1.10,1.11 Message-ID: <200803010729.m217TFlt008516@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-findlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8488 Modified Files: ocaml-findlib.spec Log Message: Experimental rebuild for ppc64. Index: ocaml-findlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ocaml-findlib.spec 12 Feb 2008 22:10:02 -0000 1.10 +++ ocaml-findlib.spec 1 Mar 2008 07:28:37 -0000 1.11 @@ -3,7 +3,7 @@ Name: ocaml-findlib Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective CAML package manager and build helper Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://www.ocaml-programming.de/packages/ Source0: http://www.ocaml-programming.de/packages/findlib-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-camlp4-devel @@ -107,6 +106,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 1.2.1-2 +- Experimental rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 1.2.1-1 - New upstream version 1.2.1. From fedora-extras-commits at redhat.com Sat Mar 1 07:50:37 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 07:50:37 GMT Subject: rpms/ocaml-lablgl/devel ocaml-lablgl.spec,1.7,1.8 Message-ID: <200803010750.m217ob47009063@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-lablgl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9026 Modified Files: ocaml-lablgl.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 1.03-2 - Rebuild for ppc64. Index: ocaml-lablgl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lablgl/devel/ocaml-lablgl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ocaml-lablgl.spec 13 Feb 2008 00:32:54 -0000 1.7 +++ ocaml-lablgl.spec 1 Mar 2008 07:49:59 -0000 1.8 @@ -2,7 +2,7 @@ Name: ocaml-lablgl Version: 1.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml @@ -30,7 +30,6 @@ BuildRequires: mesa-libGLU-devel BuildRequires: ocaml-labltk-devel BuildRequires: ocaml-camlp4-devel -ExcludeArch: ppc64 %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh @@ -151,6 +150,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 1.03-2 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 1.03-1 - New upstream version 1.03. - Fix for Tk 8.5. From fedora-extras-commits at redhat.com Sat Mar 1 07:55:08 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 07:55:08 GMT Subject: rpms/ocaml-SDL/devel ocaml-SDL.spec,1.6,1.7 Message-ID: <200803010755.m217t8we009393@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-SDL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9352 Modified Files: ocaml-SDL.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones 0.7.2-10 - Rebuild for ppc64. Index: ocaml-SDL.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-SDL/devel/ocaml-SDL.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ocaml-SDL.spec 13 Feb 2008 11:28:32 -0000 1.6 +++ ocaml-SDL.spec 1 Mar 2008 07:54:33 -0000 1.7 @@ -3,7 +3,7 @@ Name: ocaml-SDL Version: 0.7.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: OCaml bindings for SDL Group: Development/Libraries @@ -13,9 +13,6 @@ Source1: ocamlsdl-0.7.2-htmlref.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Excluding on ppc64 due to missing dependencies (Bug #239517) -ExcludeArch: ppc64 - BuildRequires: lablgl SDL_ttf-devel SDL_mixer-devel SDL_image-devel BuildRequires: ocaml Requires: ocaml @@ -81,6 +78,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones 0.7.2-10 +- Rebuild for ppc64. + * Wed Feb 13 2008 Richard W.M. Jones 0.7.2-9 - *.so.owner files aren't being generated by this ocamlfind. From fedora-extras-commits at redhat.com Sat Mar 1 07:55:44 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sat, 1 Mar 2008 07:55:44 GMT Subject: rpms/aprsd/devel INIT.TNC, NONE, 1.1 RESTORE.TNC, NONE, 1.1 aprsd-2.2.5-15-compile.patch, NONE, 1.1 aprsd-2.2.5-15-gcc43-port.patch, NONE, 1.1 aprsd-2.2.5-15-sysconfdir.patch, NONE, 1.1 aprsd.conf, NONE, 1.1 aprsd.init, NONE, 1.1 aprsd.spec, NONE, 1.1 user.deny, NONE, 1.1 welcome.txt, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803010755.m217tiZs009480@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/aprsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9385/devel Modified Files: .cvsignore sources Added Files: INIT.TNC RESTORE.TNC aprsd-2.2.5-15-compile.patch aprsd-2.2.5-15-gcc43-port.patch aprsd-2.2.5-15-sysconfdir.patch aprsd.conf aprsd.init aprsd.spec user.deny welcome.txt Log Message: initial import --- NEW FILE INIT.TNC --- # These TNC cmds will be executed each time you start aprsd. # Modify the MYCALL and BTEXT lines with your data. # Add/delete any other commands your TNC needs for configuration. # The last command "K" puts the TNC in communication mode and must be present. # These sample commands are for a Kantronics KPC-3 # A ctrl-C is sent to the TNC from the server just before these commands are issued. # Note: The TNCs user interface must have already been set for 9600 baud. # # INTFACE TERMINAL ECHO OFF MCOM OFF MSTAMP OFF PASSALL OFF MRPT ON XMITOK ON FILTER ON CD SOFTWARE NEWMODE OFF #MYCALL must match MyCall in aprsd.conf MYCALL KG4IJB-3 #You may turn off BTEXT here and use the "tncbeacon" command in aprsd.conf instead. #BTEXT _0000.00NI00000.00W& APRS Linux Internet Server BEACON EVERY 10 #Note: The "APRS" in the next line will be overwritten by APDxxx where xxx is the version number. # So, it matters not what you put there. UNPROTO APRS VIA WIDE,WIDE HEADERLN OFF DIGI OFF HID OFF PACLEN 0 SCREENL 0 Monitor ON K # # end of file --- NEW FILE RESTORE.TNC --- # Place here any TNC commands you want restored after aprsd quits. MONITOR OFF NEWMODE ON ECHO ON FLOW ON BK ON AX ON aprsd-2.2.5-15-compile.patch: --- NEW FILE aprsd-2.2.5-15-compile.patch --- diff -Naur aprsd-2.2.5-15/aprsd.spec aprsd-compile/aprsd.spec --- aprsd-2.2.5-15/aprsd.spec 1970-01-01 02:00:00.000000000 +0200 +++ aprsd-compile/aprsd.spec 2008-02-21 19:21:49.000000000 +0200 @@ -0,0 +1,62 @@ +%define rel 15 +Name: aprsd +Summary: aprsd is a server daemon that provides Internet gateway and client access to amateur radio APRS packet data. +Version: 2.2.5 +Release: %{rel}.1%{?dist} +Group: Applications/Internet +License: GPLv2+ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{rel}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://aprsd.sourceforge.net/ + +BuildRequires: gettext + +%description +APRSd is an APRS server program that uses amateur radio and internet# +services to convey GPS mapping, weather, and positional data. +It has been developed by and for amateur radio enthusiasts to provide +real-time data in an easy to use package. + +%prep +%setup -q -n %{name}-%{version}-%{rel} + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR="%{buildroot}" +find %{buildroot} -name \*\.la -print | xargs rm -f +%find_lang %{name} + +%clean +rm -rf %{buildroot} + +%post +/sbin/ldconfig + +%preun +/sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root,-) +%{_datadir}/evolution/*/images/spam.gif +%{_datadir}/evolution/*/images/nspam.gif +%{_sysconfdir}/gconf/schemas/rspam.schemas +%{_datadir}/evolution/*/errors/org-gnome-sa-rspam.error +%{_libdir}/evolution/*/plugins/org-gnome-sa-rspam.eplug +%{_libdir}/evolution/*/plugins/liborg-gnome-sa-rspam.so +%doc AUTHORS +%doc COPYING +%doc ChangeLog +%doc NEWS +%doc README +%doc TODO + +%changelog +* Thu Feb 21 2008 Lucian Langa - 2.2.5-15-1 +- Initial spec file created + diff -Naur aprsd-2.2.5-15/src/aprsd.cpp aprsd-compile/src/aprsd.cpp --- aprsd-2.2.5-15/src/aprsd.cpp 2003-05-29 06:09:39.000000000 +0300 +++ aprsd-compile/src/aprsd.cpp 2008-02-21 19:36:31.000000000 +0200 @@ -53,13 +53,14 @@ #include #include -#include +//#include #include #include #ifdef linux #include -#include +//#include +//#include #endif #include diff -Naur aprsd-2.2.5-15/src/aprsString.h aprsd-compile/src/aprsString.h --- aprsd-2.2.5-15/src/aprsString.h 2003-10-01 19:58:27.000000000 +0300 +++ aprsd-compile/src/aprsString.h 2008-02-21 19:37:40.000000000 +0200 @@ -196,7 +196,7 @@ void parseLogon(void); bool parseCommand(void); bool parsePortFilter(void); - void aprsString::getMsgText(string& msg); + void getMsgText(string& msg); void print(ostream& os); string getAX25Source(void); string getAX25Dest(void); diff -Naur aprsd-2.2.5-15/src/servers.cpp aprsd-compile/src/servers.cpp --- aprsd-2.2.5-15/src/servers.cpp 2003-10-01 19:58:27.000000000 +0300 +++ aprsd-compile/src/servers.cpp 2008-02-22 08:01:57.000000000 +0200 @@ -46,7 +46,7 @@ #ifdef linux #include -#include +//#include #endif #include @@ -3277,7 +3277,7 @@ //---------------------------------------------------------------------- -inline string convertUpTime(int dTime) +string convertUpTime(int dTime) { std::ostringstream ostr; int x; aprsd-2.2.5-15-gcc43-port.patch: --- NEW FILE aprsd-2.2.5-15-gcc43-port.patch --- diff -Naur aprsd-2.2.5-15/src/aprsString.cpp aprsd-gcc-43-port/src/aprsString.cpp --- aprsd-2.2.5-15/src/aprsString.cpp 2003-05-29 14:26:33.000000000 -0400 +++ aprsd-gcc-43-port/src/aprsString.cpp 2008-02-22 08:22:00.000000000 -0500 @@ -31,6 +31,7 @@ #include #include #include +#include #include "aprsString.h" #include "aprsd.h" diff -Naur aprsd-2.2.5-15/src/aprsd.cpp aprsd-gcc-43-port/src/aprsd.cpp --- aprsd-2.2.5-15/src/aprsd.cpp 2008-02-22 08:34:43.000000000 -0500 +++ aprsd-gcc-43-port/src/aprsd.cpp 2008-02-22 08:13:51.000000000 -0500 @@ -28,6 +28,7 @@ #include #include #include +#include #if TIME_WITH_SYS_TIME # include diff -Naur aprsd-2.2.5-15/src/aprsdexception.cpp aprsd-gcc-43-port/src/aprsdexception.cpp --- aprsd-2.2.5-15/src/aprsdexception.cpp 2003-04-20 14:34:47.000000000 -0400 +++ aprsd-gcc-43-port/src/aprsdexception.cpp 2008-02-22 08:24:53.000000000 -0500 @@ -22,6 +22,7 @@ * Look at the README for more information on the program. */ +#include #include "aprsdexception.h" namespace aprsd diff -Naur aprsd-2.2.5-15/src/cpqueue.cpp aprsd-gcc-43-port/src/cpqueue.cpp --- aprsd-2.2.5-15/src/cpqueue.cpp 2003-03-30 23:47:54.000000000 -0500 +++ aprsd-gcc-43-port/src/cpqueue.cpp 2008-02-22 08:22:56.000000000 -0500 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff -Naur aprsd-2.2.5-15/src/dupCheck.cpp aprsd-gcc-43-port/src/dupCheck.cpp --- aprsd-2.2.5-15/src/dupCheck.cpp 2003-03-30 23:48:18.000000000 -0500 +++ aprsd-gcc-43-port/src/dupCheck.cpp 2008-02-22 08:23:15.000000000 -0500 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff -Naur aprsd-2.2.5-15/src/exceptionguard.cpp aprsd-gcc-43-port/src/exceptionguard.cpp --- aprsd-2.2.5-15/src/exceptionguard.cpp 2003-03-30 23:48:33.000000000 -0500 +++ aprsd-gcc-43-port/src/exceptionguard.cpp 2008-02-22 08:25:21.000000000 -0500 @@ -22,6 +22,7 @@ * Look at the README for more information on the program. */ +#include #include "exceptionguard.h" namespace aprsd diff -Naur aprsd-2.2.5-15/src/history.cpp aprsd-gcc-43-port/src/history.cpp --- aprsd-2.2.5-15/src/history.cpp 2003-05-29 14:26:33.000000000 -0400 +++ aprsd-gcc-43-port/src/history.cpp 2008-02-22 08:25:44.000000000 -0500 @@ -36,6 +36,7 @@ //#include #include #include +#include #include #include #include diff -Naur aprsd-2.2.5-15/src/httpserver.cpp aprsd-gcc-43-port/src/httpserver.cpp --- aprsd-2.2.5-15/src/httpserver.cpp 2003-05-11 00:38:34.000000000 -0400 +++ aprsd-gcc-43-port/src/httpserver.cpp 2008-02-22 08:29:13.000000000 -0500 @@ -28,7 +28,9 @@ #include // close() #include +#include #include +#include #include #include diff -Naur aprsd-2.2.5-15/src/mutex.cpp aprsd-gcc-43-port/src/mutex.cpp --- aprsd-2.2.5-15/src/mutex.cpp 2003-04-20 14:34:47.000000000 -0400 +++ aprsd-gcc-43-port/src/mutex.cpp 2008-02-22 08:29:51.000000000 -0500 @@ -23,6 +23,7 @@ */ +#include #include "aprsdassert.h" #include "aprsdexception.h" #include "mutex.h" diff -Naur aprsd-2.2.5-15/src/osdep.h aprsd-gcc-43-port/src/osdep.h --- aprsd-2.2.5-15/src/osdep.h 2003-04-20 14:34:47.000000000 -0400 +++ aprsd-gcc-43-port/src/osdep.h 2008-02-22 08:30:08.000000000 -0500 @@ -27,6 +27,7 @@ #define OSDEP_H #include "config.h" +#include #include extern "C" diff -Naur aprsd-2.2.5-15/src/validate.cpp aprsd-gcc-43-port/src/validate.cpp --- aprsd-2.2.5-15/src/validate.cpp 2003-03-30 23:49:41.000000000 -0500 +++ aprsd-gcc-43-port/src/validate.cpp 2008-02-22 08:30:43.000000000 -0500 @@ -34,6 +34,7 @@ #include #include #include +#include using namespace std; aprsd-2.2.5-15-sysconfdir.patch: --- NEW FILE aprsd-2.2.5-15-sysconfdir.patch --- --- aprsd-2.2.5-15/src/aprsd.cpp 2003-05-29 06:09:39.000000000 +0300 +++ aprsd-home/src/aprsd.cpp 2008-02-22 16:25:22.000000000 +0200 @@ -97,7 +97,7 @@ string szAprsPath; int msgsn; -const string HOMEDIR("/home/aprsd2"); +const string HOMEDIR("/etc/aprsd"); const string CONFPATH(""); const string CONFFILE("aprsd.conf"); const string MAINLOG("aprsd.log"); --- NEW FILE aprsd.conf --- # $Id: aprsd.conf,v 1.15 2003/10/01 16:57:16 kg4ijb Exp $ #aprsd 2.2.5 server configuration file # #This file is read ONCE on server startup. #You must restart aprsd for changes to take effect. #eg: /etc/rc.d/init.d/aprsd.init stop (then start) # #Lines starting with "#" are comments and are ignored #Key words such as "mycall" and "maxusers" are NOT case sensitive. #MyCall is the same as mycall. # #*** There is no error checking so be careful ****** # # #Servercall is the ax25 source call used in packets #sent from the server to Internet users. (9 chars max) #Note: Does not go out on the air. # servercall testCHO # #MyCall will be over written by the MYCALL string in INIT.TNC #if "tncport" has been defined. # MyCall NOCALL # MyLocation Charlottesville_VA # #This email address will be sent in replies to ?IGATE? queries. # Also, it will be on the status web pages on port 14501. MyEmail you at yourdomain.com # #Set MaxUsers and MaxLoad to values that your Internet connection can support. # Set MaxLoad in bytes/sec. If either value is exceeded # new users can't connect. MaxUsers 150 MaxLoad 100000000000 # # #Define beacon text. The server will supply the ax25 path header. #The first number after "NetBeacon" is the time interval in minutes. #Comment out the line or set time interval to 0 to disable beacon. #The rest of the line can be any aprs protocol conforming packet. # NetBeacon 10 !3802.21NI07830.61W& APRS Server # #Define the TNC beacon. The TNC will supply the ax25 path header. #It's optional and you may use the TNC BTEXT in the INIT.TNC file instead. # TncBeacon 10 !3802.21N/07830.61W& Linux APRS Server # # #Send 2 extra message acks is addition to each received ack to TNC #Range 0 to 9 ackrepeats 2 # #Send extra acks at 5 second intervals #Range 1 to 30 seconds ackrepeattime 5 # #Set history list items to expire in 35 minutes expire 35 # #Define the TNC serial port and baud rate. #Note: This device must have write permissions #If undefined all TNC related functions are disabled. #Permissable baud rates are 1200,2400,4800,9600 and 19200. # #tncport /dev/ttyS0 #tncport radio #tncbaud 1200 #Define the path for transmitted packets #This is only used when using Linux sockets, not the TNC. #For the TNC, set this in INIT.TNC. Note the format is #slightly different to the TNC command. aprspath APRS v WIDE # # Allow Internet to RF message passing. rf-allow no # #Set filterNoGate "yes" to block RFONLY and NOGATE packets filterNoGate yes # #Set history-allow to NO if you do not want users to get history dumps. history-allow no # #TRACE causes the server to append its own callsign to the end #of the AX25 path of every packet processed. #To conserver bandwidth this should only be #done for short periods to track sources of problems. # Trace no # #Set this to 'yes' if you want to log ALL PACKETS heard on RF to /home/aprsd2/rf.log #If 'no' then only packets with your callsign will be logged. logAllRF no # # Allow the insecure aprs passcodes to be used # Note: "no" means all users need Linux user names and passwords # and aprsd must be run as root for that to work. aprsPass yes # #Set the minimum time between TNC transmit packets in milliseconds TncPktSpacing 1500 # # Disallow packets transmitted from our own TNC from # being igated back to the Internet after being digipeated. igateMyCall no # #This determines if Mic-E packets are converted to classic APRS packets. #Put 'no' unless you have a very good reason to do conversions. #This option must also be enabled in the SOURCE CODE. To turn it on #you must edit "constant.h" and change CONVERT_MIC_E from FALSE to TRUE. #then recompile aprsd. ConvertMicE no # # #The PASS command. The callsign supplied in MyCall and this # passcode allow you to send data to distant servers. # PASS can be computed from MYCALL with the aprspass program. # Note: This example is invalid. Use your passcode. # pass 99999 # #------------------------------- #Server connection definitions # #usage: < host port> # #The TYPE-DIR field sets the connecton type and data flow. # TYPE is either "SERVER" or "HUB" # SERVER connections attempts to maintain a connection to the designated host # HUB connections maintain a connection to only ONE hub and rotate to the next # if the connectin fails. # DIR is either "RO" or "SR" RO is Receive Only. SR is Send and Receive. #Eamples: HUB-RO HUB-SR SERVER-RO SERVER-SR # If you select -SR to send data you must also supply a passcode # using the "PASS" command. See above. # #These commands are NOT case sensitive. # ** Defaults to Server-RO if TYPE-DIR not specified. ** # # #Example send-receive HUB connections #Hub is like Server except only ONE hub connection is active at a time. #If the hub connection fails the next hub is tried in rotation until one accepts a connection. # #Server second.aprs.net 23 hub-sr Server first.aprs.net 23 hub-sr #Server 128.143.202.191 23 hub-sr #Server third.aprs.net 23 hub-sr #Server rotate.aprs.net 23 hub-sr # # #Example Receive-Only HUB connecton #Server first.aprs.net 23 hub-ro # #Example Send-Receive SERVER connection. The SERVER type maintains a connection to #the specified server. No rotation. #Server first.aprs.net 23 server-sr # #Example of OmniPort connection to receive the local stream (tnc). #Note: OmniPort is currently available only on aprsd 2.1.5 # #Server atlanta.aprs.net 14600 server-ro portfilter(local) # #Receive the full stream. #Server atlanta.aprs.net 14600 server-ro portfilter(full) # # #These servers are provided as a reference. Some may no longer be active. #You really only need the two or three HUB connections above unless # you are doing something unusual. # #server second.aprs.net 1313 server-ro #server third.aprs.net 1313 server-ro #server socal-igate.aprs.claremont.edu 1313 server-ro #server first.aprs.net 23 #server atlanta.aprs.net 1313 server-ro #server aprsdkw.dyndns.org 1313 #server aprs.k9iu.ampr.org 1313 #server atlanta.aprs.net 1313 #server baltimore.aprs.net 1313 #server calgary.aprs.net 1313 #server concord.aprs.net 1313 #server cosprings.aprs.net 1313 #server dayton.aprs.net 14439 #server elansing.aprs.net 1313 #server gw.officine.it 1313 #server hamgate.cs.usu.edu 1313 #server kb2ear.aprs.net 1313 #server kd6wxd.dynip.com 10148 #server marconi.ece.cmu.edu 14579 #server michigan.aprs.net 1313 #server milwaukee.aprs.net 1313 #server montreal.aprs.net 1313 #server mulvey.dyndns.com 1313 #server netherlands.aprs.net 1313 #server newyork.aprs.net 1313 #server ontario.aprs.net 1313 #server orlando.aprs.net 1313 #server radio.artsfac.csuohio.edu 1313 #server radio-active.net.au 1313 #server sandiego.aprs.net 1313 #server santabarbara.aprs.net 1313 #server saopaulo.aprs.net 1313 #server swiss.aprs.net 14579 #server temple.aprs.net 1313 #server tucson.aprs.net 1313 #server wv.aprs.net 1313 #--------------------------------- # #Define server listen ports #Read ports.html for more info. # rawtncport 14580 localport 14579 mainport 10151 mainport-nh 10152 linkport 1313 msgport 1314 udpport 1315 sysopPort 14500 httpport 14501 ipwatchport 14502 errorport 14503 omniport 14600 # #define trusted users of the UDP port. #usage: trust #trust 208.148.145.151 #trust 208.148.145.144 255.255.255.240 # #Selected call signs which are always gated to RF #if they are not seen locally. All packets from #these are gated in real time. Do not use unless #you really need real time data. Consider posit2rf below. #They are case sensitive! Use upper case. Up to 64 may be defined. #As of version 2.1.5 the * wild card character is supported. #All characters beyond the * are ignored. #ie: WA4* would match ALL call signs beginning with "WA4" # # This has been enhanced in 2.2.5-15 to include # # Instead of only having "*" you can use # # $ ??for one single alpha character # # ??for one single numeric character # . ??for one single punctation character # ? ??for one single alphanumeric character # * ??for any number and kind of characters (like before) # # Example: # Patterns like ??"D$#$*" only allow german callsigns (starting with D, # followed by 1 alpha, 1 num, 1 alpha and anything else) but it does not # match "DALLAS" or something like that which occurs without this change # when configuring just "D*" # #gate2rf K4HG-8 N4NEQ* # #Call signs of stations whose posits are gated #to RF every 15 minutes. Only posit packets are #gated. Posits are taken from the history list. #They are case sensitive! Use upper case. # #posit2rf K4HG-8 # #Define a list of message destination call signs or aliases #to gate to RF full time. Note: the CQGA example #below is CQ GA (Georgia). Edit to suite your locale. #Up to 64 of these may be defined. They are case sensitive. # msgdest2rf SCOUTS KIDS CQGA # #end --- NEW FILE aprsd.init --- #!/bin/bash # # aprsd.init for version 2.2.5. starts or stops aprsd server. # This file should be placed in /etc/rc.d/init.d/ # # chkconfig: - 60 50 # description: APRSd is an APRS server program that uses amateur radio and internet# # services to convey GPS mapping, weather, and positional data. # It has been developed by and for amateur radio enthusiasts to provide # real-time data in an easy to use package. # processname: aprsd # config: /etc/aprsd/aprsd.conf # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 [ -x /usr/bin/aprsd ] || exit 0 RETVAL=0 prog="aprsd" start() { # Start daemons. if [ -d /etc/aprsd ] ; then echo -n $"Starting $prog: " daemon /usr/bin/aprsd -d RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog echo else RETVAL=1 fi return $RETVAL } stop() { # Stop daemons. echo -n $"Shutting down $prog: " killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog return $RETVAL } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart|reload) stop start RETVAL=$? ;; condrestart) if [ -f /var/lock/subsys/$prog ]; then stop start RETVAL=$? fi ;; status) status $prog RETVAL=$? ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac exit $RETVAL --- NEW FILE aprsd.spec --- %define uprel 15 Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 Release: %{uprel}.2%{?dist} Group: Applications/Internet License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz Source1: aprsd.conf Source2: aprsd.init Source3: INIT.TNC Source4: user.deny Source5: welcome.txt Source6: RESTORE.TNC Patch0: aprsd-2.2.5-15-compile.patch Patch1: aprsd-2.2.5-15-gcc43-port.patch Patch2: aprsd-2.2.5-15-sysconfdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://sourceforge.net/projects/aprsd/ Requires (preun): /sbin/chkconfig Requires (preun): /sbin/service Requires (post): /sbin/chkconfig %description APRSd is an APRS server program that uses amateur radio and internet services to convey GPS mapping, weather, and positional data. It has been developed by and for amateur radio enthusiasts to provide real-time data in an easy to use package. %prep %setup -q -n %{name}-%{version}-%{uprel} %patch0 -p1 -b compile %patch1 -p1 -b gccport %patch2 -p1 -b sysconfdir %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR="%{buildroot}" INSTALL="install -p" mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/{aprsd,rc.d/init.d} install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/aprsd/aprsd.conf install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/aprsd install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/aprsd/INIT.TNC install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/aprsd/user.deny install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/aprsd/welcome.txt install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/aprsd/RESTORE.TNC %clean rm -rf %{buildroot} %post /sbin/chkconfig --add aprsd %preun if [ $1 = 0 ]; then /sbin/service aprsd stop > /dev/null 2>&1 /sbin/chkconfig --del aprsd fi %files %defattr(-,root,root,-) %{_bindir}/aprsd %{_bindir}/aprspass %{_sysconfdir}/rc.d/init.d/aprsd %dir %{_sysconfdir}/aprsd %config(noreplace) %{_sysconfdir}/aprsd/* %doc AUTHORS %doc COPYING %doc ChangeLog %doc README %doc doc/aprsddoc.html %doc doc/ports.html %doc doc/q.html %doc doc/qalgorithm.html %changelog * Fri Feb 22 2008 Lucian Langa - 2.2.5-15.2 - Patched homedir to obey default sysconfdir - Patched to compile for gcc-4.3 - Misc cleanups * Thu Feb 21 2008 Lucian Langa - 2.2.5-15.1 - Initial spec file created --- NEW FILE user.deny --- #user.deny #format: user R|L #use "L" to deny login and RF access #use "R" to deny RF access but allow login #ssid is ignored, eg: W4EVIL and W4EVIL-7 are the same. N0CALL L --- NEW FILE welcome.txt --- # Welcome to first.aprs.net (aprs core server). # Direct comments to cbyam at virginia.edu . Type ctrl-D to disconnect. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/aprsd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2008 19:55:25 -0000 1.1 +++ .cvsignore 1 Mar 2008 07:55:06 -0000 1.2 @@ -0,0 +1 @@ +aprsd-2.2.5-15.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/aprsd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2008 19:55:25 -0000 1.1 +++ sources 1 Mar 2008 07:55:06 -0000 1.2 @@ -0,0 +1 @@ +c380ecc57c573f1db79ced0b73e0d644 aprsd-2.2.5-15.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 08:02:28 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sat, 1 Mar 2008 08:02:28 GMT Subject: rpms/aprsd/F-7 INIT.TNC, NONE, 1.1 RESTORE.TNC, NONE, 1.1 aprsd-2.2.5-15-compile.patch, NONE, 1.1 aprsd-2.2.5-15-gcc43-port.patch, NONE, 1.1 aprsd-2.2.5-15-sysconfdir.patch, NONE, 1.1 aprsd.conf, NONE, 1.1 aprsd.init, NONE, 1.1 aprsd.spec, NONE, 1.1 user.deny, NONE, 1.1 welcome.txt, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803010802.m2182SIb016779@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/aprsd/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16713/F-7 Modified Files: .cvsignore sources Added Files: INIT.TNC RESTORE.TNC aprsd-2.2.5-15-compile.patch aprsd-2.2.5-15-gcc43-port.patch aprsd-2.2.5-15-sysconfdir.patch aprsd.conf aprsd.init aprsd.spec user.deny welcome.txt Log Message: initial import for F-7 branch --- NEW FILE INIT.TNC --- # These TNC cmds will be executed each time you start aprsd. # Modify the MYCALL and BTEXT lines with your data. # Add/delete any other commands your TNC needs for configuration. # The last command "K" puts the TNC in communication mode and must be present. # These sample commands are for a Kantronics KPC-3 # A ctrl-C is sent to the TNC from the server just before these commands are issued. # Note: The TNCs user interface must have already been set for 9600 baud. # # INTFACE TERMINAL ECHO OFF MCOM OFF MSTAMP OFF PASSALL OFF MRPT ON XMITOK ON FILTER ON CD SOFTWARE NEWMODE OFF #MYCALL must match MyCall in aprsd.conf MYCALL KG4IJB-3 #You may turn off BTEXT here and use the "tncbeacon" command in aprsd.conf instead. #BTEXT _0000.00NI00000.00W& APRS Linux Internet Server BEACON EVERY 10 #Note: The "APRS" in the next line will be overwritten by APDxxx where xxx is the version number. # So, it matters not what you put there. UNPROTO APRS VIA WIDE,WIDE HEADERLN OFF DIGI OFF HID OFF PACLEN 0 SCREENL 0 Monitor ON K # # end of file --- NEW FILE RESTORE.TNC --- # Place here any TNC commands you want restored after aprsd quits. MONITOR OFF NEWMODE ON ECHO ON FLOW ON BK ON AX ON aprsd-2.2.5-15-compile.patch: --- NEW FILE aprsd-2.2.5-15-compile.patch --- diff -Naur aprsd-2.2.5-15/aprsd.spec aprsd-compile/aprsd.spec --- aprsd-2.2.5-15/aprsd.spec 1970-01-01 02:00:00.000000000 +0200 +++ aprsd-compile/aprsd.spec 2008-02-21 19:21:49.000000000 +0200 @@ -0,0 +1,62 @@ +%define rel 15 +Name: aprsd +Summary: aprsd is a server daemon that provides Internet gateway and client access to amateur radio APRS packet data. +Version: 2.2.5 +Release: %{rel}.1%{?dist} +Group: Applications/Internet +License: GPLv2+ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{rel}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://aprsd.sourceforge.net/ + +BuildRequires: gettext + +%description +APRSd is an APRS server program that uses amateur radio and internet# +services to convey GPS mapping, weather, and positional data. +It has been developed by and for amateur radio enthusiasts to provide +real-time data in an easy to use package. + +%prep +%setup -q -n %{name}-%{version}-%{rel} + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR="%{buildroot}" +find %{buildroot} -name \*\.la -print | xargs rm -f +%find_lang %{name} + +%clean +rm -rf %{buildroot} + +%post +/sbin/ldconfig + +%preun +/sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root,-) +%{_datadir}/evolution/*/images/spam.gif +%{_datadir}/evolution/*/images/nspam.gif +%{_sysconfdir}/gconf/schemas/rspam.schemas +%{_datadir}/evolution/*/errors/org-gnome-sa-rspam.error +%{_libdir}/evolution/*/plugins/org-gnome-sa-rspam.eplug +%{_libdir}/evolution/*/plugins/liborg-gnome-sa-rspam.so +%doc AUTHORS +%doc COPYING +%doc ChangeLog +%doc NEWS +%doc README +%doc TODO + +%changelog +* Thu Feb 21 2008 Lucian Langa - 2.2.5-15-1 +- Initial spec file created + diff -Naur aprsd-2.2.5-15/src/aprsd.cpp aprsd-compile/src/aprsd.cpp --- aprsd-2.2.5-15/src/aprsd.cpp 2003-05-29 06:09:39.000000000 +0300 +++ aprsd-compile/src/aprsd.cpp 2008-02-21 19:36:31.000000000 +0200 @@ -53,13 +53,14 @@ #include #include -#include +//#include #include #include #ifdef linux #include -#include +//#include +//#include #endif #include diff -Naur aprsd-2.2.5-15/src/aprsString.h aprsd-compile/src/aprsString.h --- aprsd-2.2.5-15/src/aprsString.h 2003-10-01 19:58:27.000000000 +0300 +++ aprsd-compile/src/aprsString.h 2008-02-21 19:37:40.000000000 +0200 @@ -196,7 +196,7 @@ void parseLogon(void); bool parseCommand(void); bool parsePortFilter(void); - void aprsString::getMsgText(string& msg); + void getMsgText(string& msg); void print(ostream& os); string getAX25Source(void); string getAX25Dest(void); diff -Naur aprsd-2.2.5-15/src/servers.cpp aprsd-compile/src/servers.cpp --- aprsd-2.2.5-15/src/servers.cpp 2003-10-01 19:58:27.000000000 +0300 +++ aprsd-compile/src/servers.cpp 2008-02-22 08:01:57.000000000 +0200 @@ -46,7 +46,7 @@ #ifdef linux #include -#include +//#include #endif #include @@ -3277,7 +3277,7 @@ //---------------------------------------------------------------------- -inline string convertUpTime(int dTime) +string convertUpTime(int dTime) { std::ostringstream ostr; int x; aprsd-2.2.5-15-gcc43-port.patch: --- NEW FILE aprsd-2.2.5-15-gcc43-port.patch --- diff -Naur aprsd-2.2.5-15/src/aprsString.cpp aprsd-gcc-43-port/src/aprsString.cpp --- aprsd-2.2.5-15/src/aprsString.cpp 2003-05-29 14:26:33.000000000 -0400 +++ aprsd-gcc-43-port/src/aprsString.cpp 2008-02-22 08:22:00.000000000 -0500 @@ -31,6 +31,7 @@ #include #include #include +#include #include "aprsString.h" #include "aprsd.h" diff -Naur aprsd-2.2.5-15/src/aprsd.cpp aprsd-gcc-43-port/src/aprsd.cpp --- aprsd-2.2.5-15/src/aprsd.cpp 2008-02-22 08:34:43.000000000 -0500 +++ aprsd-gcc-43-port/src/aprsd.cpp 2008-02-22 08:13:51.000000000 -0500 @@ -28,6 +28,7 @@ #include #include #include +#include #if TIME_WITH_SYS_TIME # include diff -Naur aprsd-2.2.5-15/src/aprsdexception.cpp aprsd-gcc-43-port/src/aprsdexception.cpp --- aprsd-2.2.5-15/src/aprsdexception.cpp 2003-04-20 14:34:47.000000000 -0400 +++ aprsd-gcc-43-port/src/aprsdexception.cpp 2008-02-22 08:24:53.000000000 -0500 @@ -22,6 +22,7 @@ * Look at the README for more information on the program. */ +#include #include "aprsdexception.h" namespace aprsd diff -Naur aprsd-2.2.5-15/src/cpqueue.cpp aprsd-gcc-43-port/src/cpqueue.cpp --- aprsd-2.2.5-15/src/cpqueue.cpp 2003-03-30 23:47:54.000000000 -0500 +++ aprsd-gcc-43-port/src/cpqueue.cpp 2008-02-22 08:22:56.000000000 -0500 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff -Naur aprsd-2.2.5-15/src/dupCheck.cpp aprsd-gcc-43-port/src/dupCheck.cpp --- aprsd-2.2.5-15/src/dupCheck.cpp 2003-03-30 23:48:18.000000000 -0500 +++ aprsd-gcc-43-port/src/dupCheck.cpp 2008-02-22 08:23:15.000000000 -0500 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff -Naur aprsd-2.2.5-15/src/exceptionguard.cpp aprsd-gcc-43-port/src/exceptionguard.cpp --- aprsd-2.2.5-15/src/exceptionguard.cpp 2003-03-30 23:48:33.000000000 -0500 +++ aprsd-gcc-43-port/src/exceptionguard.cpp 2008-02-22 08:25:21.000000000 -0500 @@ -22,6 +22,7 @@ * Look at the README for more information on the program. */ +#include #include "exceptionguard.h" namespace aprsd diff -Naur aprsd-2.2.5-15/src/history.cpp aprsd-gcc-43-port/src/history.cpp --- aprsd-2.2.5-15/src/history.cpp 2003-05-29 14:26:33.000000000 -0400 +++ aprsd-gcc-43-port/src/history.cpp 2008-02-22 08:25:44.000000000 -0500 @@ -36,6 +36,7 @@ //#include #include #include +#include #include #include #include diff -Naur aprsd-2.2.5-15/src/httpserver.cpp aprsd-gcc-43-port/src/httpserver.cpp --- aprsd-2.2.5-15/src/httpserver.cpp 2003-05-11 00:38:34.000000000 -0400 +++ aprsd-gcc-43-port/src/httpserver.cpp 2008-02-22 08:29:13.000000000 -0500 @@ -28,7 +28,9 @@ #include // close() #include +#include #include +#include #include #include diff -Naur aprsd-2.2.5-15/src/mutex.cpp aprsd-gcc-43-port/src/mutex.cpp --- aprsd-2.2.5-15/src/mutex.cpp 2003-04-20 14:34:47.000000000 -0400 +++ aprsd-gcc-43-port/src/mutex.cpp 2008-02-22 08:29:51.000000000 -0500 @@ -23,6 +23,7 @@ */ +#include #include "aprsdassert.h" #include "aprsdexception.h" #include "mutex.h" diff -Naur aprsd-2.2.5-15/src/osdep.h aprsd-gcc-43-port/src/osdep.h --- aprsd-2.2.5-15/src/osdep.h 2003-04-20 14:34:47.000000000 -0400 +++ aprsd-gcc-43-port/src/osdep.h 2008-02-22 08:30:08.000000000 -0500 @@ -27,6 +27,7 @@ #define OSDEP_H #include "config.h" +#include #include extern "C" diff -Naur aprsd-2.2.5-15/src/validate.cpp aprsd-gcc-43-port/src/validate.cpp --- aprsd-2.2.5-15/src/validate.cpp 2003-03-30 23:49:41.000000000 -0500 +++ aprsd-gcc-43-port/src/validate.cpp 2008-02-22 08:30:43.000000000 -0500 @@ -34,6 +34,7 @@ #include #include #include +#include using namespace std; aprsd-2.2.5-15-sysconfdir.patch: --- NEW FILE aprsd-2.2.5-15-sysconfdir.patch --- --- aprsd-2.2.5-15/src/aprsd.cpp 2003-05-29 06:09:39.000000000 +0300 +++ aprsd-home/src/aprsd.cpp 2008-02-22 16:25:22.000000000 +0200 @@ -97,7 +97,7 @@ string szAprsPath; int msgsn; -const string HOMEDIR("/home/aprsd2"); +const string HOMEDIR("/etc/aprsd"); const string CONFPATH(""); const string CONFFILE("aprsd.conf"); const string MAINLOG("aprsd.log"); --- NEW FILE aprsd.conf --- # $Id: aprsd.conf,v 1.15 2003/10/01 16:57:16 kg4ijb Exp $ #aprsd 2.2.5 server configuration file # #This file is read ONCE on server startup. #You must restart aprsd for changes to take effect. #eg: /etc/rc.d/init.d/aprsd.init stop (then start) # #Lines starting with "#" are comments and are ignored #Key words such as "mycall" and "maxusers" are NOT case sensitive. #MyCall is the same as mycall. # #*** There is no error checking so be careful ****** # # #Servercall is the ax25 source call used in packets #sent from the server to Internet users. (9 chars max) #Note: Does not go out on the air. # servercall testCHO # #MyCall will be over written by the MYCALL string in INIT.TNC #if "tncport" has been defined. # MyCall NOCALL # MyLocation Charlottesville_VA # #This email address will be sent in replies to ?IGATE? queries. # Also, it will be on the status web pages on port 14501. MyEmail you at yourdomain.com # #Set MaxUsers and MaxLoad to values that your Internet connection can support. # Set MaxLoad in bytes/sec. If either value is exceeded # new users can't connect. MaxUsers 150 MaxLoad 100000000000 # # #Define beacon text. The server will supply the ax25 path header. #The first number after "NetBeacon" is the time interval in minutes. #Comment out the line or set time interval to 0 to disable beacon. #The rest of the line can be any aprs protocol conforming packet. # NetBeacon 10 !3802.21NI07830.61W& APRS Server # #Define the TNC beacon. The TNC will supply the ax25 path header. #It's optional and you may use the TNC BTEXT in the INIT.TNC file instead. # TncBeacon 10 !3802.21N/07830.61W& Linux APRS Server # # #Send 2 extra message acks is addition to each received ack to TNC #Range 0 to 9 ackrepeats 2 # #Send extra acks at 5 second intervals #Range 1 to 30 seconds ackrepeattime 5 # #Set history list items to expire in 35 minutes expire 35 # #Define the TNC serial port and baud rate. #Note: This device must have write permissions #If undefined all TNC related functions are disabled. #Permissable baud rates are 1200,2400,4800,9600 and 19200. # #tncport /dev/ttyS0 #tncport radio #tncbaud 1200 #Define the path for transmitted packets #This is only used when using Linux sockets, not the TNC. #For the TNC, set this in INIT.TNC. Note the format is #slightly different to the TNC command. aprspath APRS v WIDE # # Allow Internet to RF message passing. rf-allow no # #Set filterNoGate "yes" to block RFONLY and NOGATE packets filterNoGate yes # #Set history-allow to NO if you do not want users to get history dumps. history-allow no # #TRACE causes the server to append its own callsign to the end #of the AX25 path of every packet processed. #To conserver bandwidth this should only be #done for short periods to track sources of problems. # Trace no # #Set this to 'yes' if you want to log ALL PACKETS heard on RF to /home/aprsd2/rf.log #If 'no' then only packets with your callsign will be logged. logAllRF no # # Allow the insecure aprs passcodes to be used # Note: "no" means all users need Linux user names and passwords # and aprsd must be run as root for that to work. aprsPass yes # #Set the minimum time between TNC transmit packets in milliseconds TncPktSpacing 1500 # # Disallow packets transmitted from our own TNC from # being igated back to the Internet after being digipeated. igateMyCall no # #This determines if Mic-E packets are converted to classic APRS packets. #Put 'no' unless you have a very good reason to do conversions. #This option must also be enabled in the SOURCE CODE. To turn it on #you must edit "constant.h" and change CONVERT_MIC_E from FALSE to TRUE. #then recompile aprsd. ConvertMicE no # # #The PASS command. The callsign supplied in MyCall and this # passcode allow you to send data to distant servers. # PASS can be computed from MYCALL with the aprspass program. # Note: This example is invalid. Use your passcode. # pass 99999 # #------------------------------- #Server connection definitions # #usage: < host port> # #The TYPE-DIR field sets the connecton type and data flow. # TYPE is either "SERVER" or "HUB" # SERVER connections attempts to maintain a connection to the designated host # HUB connections maintain a connection to only ONE hub and rotate to the next # if the connectin fails. # DIR is either "RO" or "SR" RO is Receive Only. SR is Send and Receive. #Eamples: HUB-RO HUB-SR SERVER-RO SERVER-SR # If you select -SR to send data you must also supply a passcode # using the "PASS" command. See above. # #These commands are NOT case sensitive. # ** Defaults to Server-RO if TYPE-DIR not specified. ** # # #Example send-receive HUB connections #Hub is like Server except only ONE hub connection is active at a time. #If the hub connection fails the next hub is tried in rotation until one accepts a connection. # #Server second.aprs.net 23 hub-sr Server first.aprs.net 23 hub-sr #Server 128.143.202.191 23 hub-sr #Server third.aprs.net 23 hub-sr #Server rotate.aprs.net 23 hub-sr # # #Example Receive-Only HUB connecton #Server first.aprs.net 23 hub-ro # #Example Send-Receive SERVER connection. The SERVER type maintains a connection to #the specified server. No rotation. #Server first.aprs.net 23 server-sr # #Example of OmniPort connection to receive the local stream (tnc). #Note: OmniPort is currently available only on aprsd 2.1.5 # #Server atlanta.aprs.net 14600 server-ro portfilter(local) # #Receive the full stream. #Server atlanta.aprs.net 14600 server-ro portfilter(full) # # #These servers are provided as a reference. Some may no longer be active. #You really only need the two or three HUB connections above unless # you are doing something unusual. # #server second.aprs.net 1313 server-ro #server third.aprs.net 1313 server-ro #server socal-igate.aprs.claremont.edu 1313 server-ro #server first.aprs.net 23 #server atlanta.aprs.net 1313 server-ro #server aprsdkw.dyndns.org 1313 #server aprs.k9iu.ampr.org 1313 #server atlanta.aprs.net 1313 #server baltimore.aprs.net 1313 #server calgary.aprs.net 1313 #server concord.aprs.net 1313 #server cosprings.aprs.net 1313 #server dayton.aprs.net 14439 #server elansing.aprs.net 1313 #server gw.officine.it 1313 #server hamgate.cs.usu.edu 1313 #server kb2ear.aprs.net 1313 #server kd6wxd.dynip.com 10148 #server marconi.ece.cmu.edu 14579 #server michigan.aprs.net 1313 #server milwaukee.aprs.net 1313 #server montreal.aprs.net 1313 #server mulvey.dyndns.com 1313 #server netherlands.aprs.net 1313 #server newyork.aprs.net 1313 #server ontario.aprs.net 1313 #server orlando.aprs.net 1313 #server radio.artsfac.csuohio.edu 1313 #server radio-active.net.au 1313 #server sandiego.aprs.net 1313 #server santabarbara.aprs.net 1313 #server saopaulo.aprs.net 1313 #server swiss.aprs.net 14579 #server temple.aprs.net 1313 #server tucson.aprs.net 1313 #server wv.aprs.net 1313 #--------------------------------- # #Define server listen ports #Read ports.html for more info. # rawtncport 14580 localport 14579 mainport 10151 mainport-nh 10152 linkport 1313 msgport 1314 udpport 1315 sysopPort 14500 httpport 14501 ipwatchport 14502 errorport 14503 omniport 14600 # #define trusted users of the UDP port. #usage: trust #trust 208.148.145.151 #trust 208.148.145.144 255.255.255.240 # #Selected call signs which are always gated to RF #if they are not seen locally. All packets from #these are gated in real time. Do not use unless #you really need real time data. Consider posit2rf below. #They are case sensitive! Use upper case. Up to 64 may be defined. #As of version 2.1.5 the * wild card character is supported. #All characters beyond the * are ignored. #ie: WA4* would match ALL call signs beginning with "WA4" # # This has been enhanced in 2.2.5-15 to include # # Instead of only having "*" you can use # # $ ??for one single alpha character # # ??for one single numeric character # . ??for one single punctation character # ? ??for one single alphanumeric character # * ??for any number and kind of characters (like before) # # Example: # Patterns like ??"D$#$*" only allow german callsigns (starting with D, # followed by 1 alpha, 1 num, 1 alpha and anything else) but it does not # match "DALLAS" or something like that which occurs without this change # when configuring just "D*" # #gate2rf K4HG-8 N4NEQ* # #Call signs of stations whose posits are gated #to RF every 15 minutes. Only posit packets are #gated. Posits are taken from the history list. #They are case sensitive! Use upper case. # #posit2rf K4HG-8 # #Define a list of message destination call signs or aliases #to gate to RF full time. Note: the CQGA example #below is CQ GA (Georgia). Edit to suite your locale. #Up to 64 of these may be defined. They are case sensitive. # msgdest2rf SCOUTS KIDS CQGA # #end --- NEW FILE aprsd.init --- #!/bin/bash # # aprsd.init for version 2.2.5. starts or stops aprsd server. # This file should be placed in /etc/rc.d/init.d/ # # chkconfig: - 60 50 # description: APRSd is an APRS server program that uses amateur radio and internet# # services to convey GPS mapping, weather, and positional data. # It has been developed by and for amateur radio enthusiasts to provide # real-time data in an easy to use package. # processname: aprsd # config: /etc/aprsd/aprsd.conf # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 [ -x /usr/bin/aprsd ] || exit 0 RETVAL=0 prog="aprsd" start() { # Start daemons. if [ -d /etc/aprsd ] ; then echo -n $"Starting $prog: " daemon /usr/bin/aprsd -d RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog echo else RETVAL=1 fi return $RETVAL } stop() { # Stop daemons. echo -n $"Shutting down $prog: " killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog return $RETVAL } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart|reload) stop start RETVAL=$? ;; condrestart) if [ -f /var/lock/subsys/$prog ]; then stop start RETVAL=$? fi ;; status) status $prog RETVAL=$? ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac exit $RETVAL --- NEW FILE aprsd.spec --- %define uprel 15 Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 Release: %{uprel}.2%{?dist} Group: Applications/Internet License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz Source1: aprsd.conf Source2: aprsd.init Source3: INIT.TNC Source4: user.deny Source5: welcome.txt Source6: RESTORE.TNC Patch0: aprsd-2.2.5-15-compile.patch Patch1: aprsd-2.2.5-15-gcc43-port.patch Patch2: aprsd-2.2.5-15-sysconfdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://sourceforge.net/projects/aprsd/ Requires (preun): /sbin/chkconfig Requires (preun): /sbin/service Requires (post): /sbin/chkconfig %description APRSd is an APRS server program that uses amateur radio and internet services to convey GPS mapping, weather, and positional data. It has been developed by and for amateur radio enthusiasts to provide real-time data in an easy to use package. %prep %setup -q -n %{name}-%{version}-%{uprel} %patch0 -p1 -b compile %patch1 -p1 -b gccport %patch2 -p1 -b sysconfdir %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR="%{buildroot}" INSTALL="install -p" mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/{aprsd,rc.d/init.d} install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/aprsd/aprsd.conf install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/aprsd install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/aprsd/INIT.TNC install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/aprsd/user.deny install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/aprsd/welcome.txt install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/aprsd/RESTORE.TNC %clean rm -rf %{buildroot} %post /sbin/chkconfig --add aprsd %preun if [ $1 = 0 ]; then /sbin/service aprsd stop > /dev/null 2>&1 /sbin/chkconfig --del aprsd fi %files %defattr(-,root,root,-) %{_bindir}/aprsd %{_bindir}/aprspass %{_sysconfdir}/rc.d/init.d/aprsd %dir %{_sysconfdir}/aprsd %config(noreplace) %{_sysconfdir}/aprsd/* %doc AUTHORS %doc COPYING %doc ChangeLog %doc README %doc doc/aprsddoc.html %doc doc/ports.html %doc doc/q.html %doc doc/qalgorithm.html %changelog * Fri Feb 22 2008 Lucian Langa - 2.2.5-15.2 - Patched homedir to obey default sysconfdir - Patched to compile for gcc-4.3 - Misc cleanups * Thu Feb 21 2008 Lucian Langa - 2.2.5-15.1 - Initial spec file created --- NEW FILE user.deny --- #user.deny #format: user R|L #use "L" to deny login and RF access #use "R" to deny RF access but allow login #ssid is ignored, eg: W4EVIL and W4EVIL-7 are the same. N0CALL L --- NEW FILE welcome.txt --- # Welcome to first.aprs.net (aprs core server). # Direct comments to cbyam at virginia.edu . Type ctrl-D to disconnect. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/aprsd/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2008 19:55:25 -0000 1.1 +++ .cvsignore 1 Mar 2008 08:01:50 -0000 1.2 @@ -0,0 +1 @@ +aprsd-2.2.5-15.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/aprsd/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2008 19:55:25 -0000 1.1 +++ sources 1 Mar 2008 08:01:50 -0000 1.2 @@ -0,0 +1 @@ +c380ecc57c573f1db79ced0b73e0d644 aprsd-2.2.5-15.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 08:02:32 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Sat, 1 Mar 2008 08:02:32 GMT Subject: rpms/gdb/devel gdbcompare,1.4,1.5 Message-ID: <200803010802.m2182WJD016784@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16703 Modified Files: gdbcompare Log Message: Update for the new multitestsuite layout since gdb-6.7.1-15.fc9. Index: gdbcompare =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdbcompare,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gdbcompare 22 Apr 2007 08:52:09 -0000 1.4 +++ gdbcompare 1 Mar 2008 08:01:57 -0000 1.5 @@ -14,7 +14,8 @@ opendir DIR,"tests" or die "opendir: $!"; my %arch; for my $name (sort readdir(DIR)) { - next if $name!~/^gdb-.*[-.]([^-.]+)[.]$suffix$/o; + # next if $name!~/^gdb-.*[-.]([^-.]+)[.]$suffix$/o; + next if $name!~/^\d+-(.*)[.]$suffix$/o; push @{$arch{$1}},$name; } closedir DIR or die "closedir: $!"; @@ -29,12 +30,13 @@ for my $arch (sort keys(%arch)) { next if 2!=@{$arch{$arch}}; - sub trans { return {"."=>0,"-"=>1}->{($_[0]=~/([-.])[^-.]+[.]\w+$/)[0]}.$_[0]; }; - my @sorted=sort { my $a1=trans $a; my $b1=trans $b; ($b1 cmp $a1) * ($reverse ? -1 : 1); } @{$arch{$arch}}; - do { system $_ and die $_; } for "diff -u tests/'".$sorted[1]."' tests/'".$sorted[0]."' >tests/gdbcompare-'$arch'.diff;true"; + # sub trans { return {"."=>0,"-"=>1}->{($_[0]=~/([-.])[^-.]+[.]\w+$/)[0]}.$_[0]; }; + sub trans { return $_[0]; }; + my @sorted=sort { my $a1=trans $a; my $b1=trans $b; ($b1 cmp $a1) * ($reverse ? -1 : +1); } @{$arch{$arch}}; + do { system $_ and die $_; } for "diff -u tests/'".$sorted[1]."' tests/'".$sorted[0]."' >tests/gdbcompare-'$arch'.'$suffix'.diff;true"; } -system("vim tests/gdbcompare-*.diff"); +system("vim tests/gdbcompare-*.'$suffix'.diff"); __END__; From fedora-extras-commits at redhat.com Sat Mar 1 08:04:14 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Sat, 1 Mar 2008 08:04:14 GMT Subject: rpms/gdb/devel gdb.spec,1.270,1.271 Message-ID: <200803010804.m2184EkT016918@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16863 Modified Files: gdb.spec Log Message: * Sat Mar 1 2008 Jan Kratochvil - 6.7.1-16 - Run the full testsuite also in the `-fPIE -pie' mode. Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- gdb.spec 25 Feb 2008 09:25:51 -0000 1.270 +++ gdb.spec 1 Mar 2008 08:03:38 -0000 1.271 @@ -11,7 +11,7 @@ Version: 6.7.1 # The release always contains a leading reserved number, start it at 1. -Release: 15%{?dist} +Release: 16%{?dist} License: GPL Group: Development/Debuggers @@ -661,6 +661,9 @@ mv -f ../../gdb/testsuite/$test ../gdb/testsuite/$test-DISABLED || : done + # Run all the scheduled testsuite runs also in the PIE mode. + CHECK="$(echo $CHECK|sed 's#check//unix/[^ ]*#& &/-fPIE/-pie#g')" + for CURRENT in $CHECK do ./orphanripper make -k $CURRENT || : @@ -760,6 +763,9 @@ %{_mandir}/*/gdbserver.1* %changelog +* Sat Mar 1 2008 Jan Kratochvil - 6.7.1-16 +- Run the full testsuite also in the `-fPIE -pie' mode. + * Mon Feb 25 2008 Jan Kratochvil - 6.7.1-15 - New --with parameters `testsuite' and `debug'. - Testsuite is now run during the build only on explicit `--with testsuite'. From fedora-extras-commits at redhat.com Sat Mar 1 08:05:19 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sat, 1 Mar 2008 08:05:19 GMT Subject: rpms/aprsd/F-8 INIT.TNC, NONE, 1.1 RESTORE.TNC, NONE, 1.1 aprsd-2.2.5-15-compile.patch, NONE, 1.1 aprsd-2.2.5-15-gcc43-port.patch, NONE, 1.1 aprsd-2.2.5-15-sysconfdir.patch, NONE, 1.1 aprsd.conf, NONE, 1.1 aprsd.init, NONE, 1.1 aprsd.spec, NONE, 1.1 user.deny, NONE, 1.1 welcome.txt, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803010805.m2185JTp017024@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/aprsd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16973/F-8 Modified Files: .cvsignore sources Added Files: INIT.TNC RESTORE.TNC aprsd-2.2.5-15-compile.patch aprsd-2.2.5-15-gcc43-port.patch aprsd-2.2.5-15-sysconfdir.patch aprsd.conf aprsd.init aprsd.spec user.deny welcome.txt Log Message: initial import for F-8 --- NEW FILE INIT.TNC --- # These TNC cmds will be executed each time you start aprsd. # Modify the MYCALL and BTEXT lines with your data. # Add/delete any other commands your TNC needs for configuration. # The last command "K" puts the TNC in communication mode and must be present. # These sample commands are for a Kantronics KPC-3 # A ctrl-C is sent to the TNC from the server just before these commands are issued. # Note: The TNCs user interface must have already been set for 9600 baud. # # INTFACE TERMINAL ECHO OFF MCOM OFF MSTAMP OFF PASSALL OFF MRPT ON XMITOK ON FILTER ON CD SOFTWARE NEWMODE OFF #MYCALL must match MyCall in aprsd.conf MYCALL KG4IJB-3 #You may turn off BTEXT here and use the "tncbeacon" command in aprsd.conf instead. #BTEXT _0000.00NI00000.00W& APRS Linux Internet Server BEACON EVERY 10 #Note: The "APRS" in the next line will be overwritten by APDxxx where xxx is the version number. # So, it matters not what you put there. UNPROTO APRS VIA WIDE,WIDE HEADERLN OFF DIGI OFF HID OFF PACLEN 0 SCREENL 0 Monitor ON K # # end of file --- NEW FILE RESTORE.TNC --- # Place here any TNC commands you want restored after aprsd quits. MONITOR OFF NEWMODE ON ECHO ON FLOW ON BK ON AX ON aprsd-2.2.5-15-compile.patch: --- NEW FILE aprsd-2.2.5-15-compile.patch --- diff -Naur aprsd-2.2.5-15/aprsd.spec aprsd-compile/aprsd.spec --- aprsd-2.2.5-15/aprsd.spec 1970-01-01 02:00:00.000000000 +0200 +++ aprsd-compile/aprsd.spec 2008-02-21 19:21:49.000000000 +0200 @@ -0,0 +1,62 @@ +%define rel 15 +Name: aprsd +Summary: aprsd is a server daemon that provides Internet gateway and client access to amateur radio APRS packet data. +Version: 2.2.5 +Release: %{rel}.1%{?dist} +Group: Applications/Internet +License: GPLv2+ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{rel}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://aprsd.sourceforge.net/ + +BuildRequires: gettext + +%description +APRSd is an APRS server program that uses amateur radio and internet# +services to convey GPS mapping, weather, and positional data. +It has been developed by and for amateur radio enthusiasts to provide +real-time data in an easy to use package. + +%prep +%setup -q -n %{name}-%{version}-%{rel} + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR="%{buildroot}" +find %{buildroot} -name \*\.la -print | xargs rm -f +%find_lang %{name} + +%clean +rm -rf %{buildroot} + +%post +/sbin/ldconfig + +%preun +/sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root,-) +%{_datadir}/evolution/*/images/spam.gif +%{_datadir}/evolution/*/images/nspam.gif +%{_sysconfdir}/gconf/schemas/rspam.schemas +%{_datadir}/evolution/*/errors/org-gnome-sa-rspam.error +%{_libdir}/evolution/*/plugins/org-gnome-sa-rspam.eplug +%{_libdir}/evolution/*/plugins/liborg-gnome-sa-rspam.so +%doc AUTHORS +%doc COPYING +%doc ChangeLog +%doc NEWS +%doc README +%doc TODO + +%changelog +* Thu Feb 21 2008 Lucian Langa - 2.2.5-15-1 +- Initial spec file created + diff -Naur aprsd-2.2.5-15/src/aprsd.cpp aprsd-compile/src/aprsd.cpp --- aprsd-2.2.5-15/src/aprsd.cpp 2003-05-29 06:09:39.000000000 +0300 +++ aprsd-compile/src/aprsd.cpp 2008-02-21 19:36:31.000000000 +0200 @@ -53,13 +53,14 @@ #include #include -#include +//#include #include #include #ifdef linux #include -#include +//#include +//#include #endif #include diff -Naur aprsd-2.2.5-15/src/aprsString.h aprsd-compile/src/aprsString.h --- aprsd-2.2.5-15/src/aprsString.h 2003-10-01 19:58:27.000000000 +0300 +++ aprsd-compile/src/aprsString.h 2008-02-21 19:37:40.000000000 +0200 @@ -196,7 +196,7 @@ void parseLogon(void); bool parseCommand(void); bool parsePortFilter(void); - void aprsString::getMsgText(string& msg); + void getMsgText(string& msg); void print(ostream& os); string getAX25Source(void); string getAX25Dest(void); diff -Naur aprsd-2.2.5-15/src/servers.cpp aprsd-compile/src/servers.cpp --- aprsd-2.2.5-15/src/servers.cpp 2003-10-01 19:58:27.000000000 +0300 +++ aprsd-compile/src/servers.cpp 2008-02-22 08:01:57.000000000 +0200 @@ -46,7 +46,7 @@ #ifdef linux #include -#include +//#include #endif #include @@ -3277,7 +3277,7 @@ //---------------------------------------------------------------------- -inline string convertUpTime(int dTime) +string convertUpTime(int dTime) { std::ostringstream ostr; int x; aprsd-2.2.5-15-gcc43-port.patch: --- NEW FILE aprsd-2.2.5-15-gcc43-port.patch --- diff -Naur aprsd-2.2.5-15/src/aprsString.cpp aprsd-gcc-43-port/src/aprsString.cpp --- aprsd-2.2.5-15/src/aprsString.cpp 2003-05-29 14:26:33.000000000 -0400 +++ aprsd-gcc-43-port/src/aprsString.cpp 2008-02-22 08:22:00.000000000 -0500 @@ -31,6 +31,7 @@ #include #include #include +#include #include "aprsString.h" #include "aprsd.h" diff -Naur aprsd-2.2.5-15/src/aprsd.cpp aprsd-gcc-43-port/src/aprsd.cpp --- aprsd-2.2.5-15/src/aprsd.cpp 2008-02-22 08:34:43.000000000 -0500 +++ aprsd-gcc-43-port/src/aprsd.cpp 2008-02-22 08:13:51.000000000 -0500 @@ -28,6 +28,7 @@ #include #include #include +#include #if TIME_WITH_SYS_TIME # include diff -Naur aprsd-2.2.5-15/src/aprsdexception.cpp aprsd-gcc-43-port/src/aprsdexception.cpp --- aprsd-2.2.5-15/src/aprsdexception.cpp 2003-04-20 14:34:47.000000000 -0400 +++ aprsd-gcc-43-port/src/aprsdexception.cpp 2008-02-22 08:24:53.000000000 -0500 @@ -22,6 +22,7 @@ * Look at the README for more information on the program. */ +#include #include "aprsdexception.h" namespace aprsd diff -Naur aprsd-2.2.5-15/src/cpqueue.cpp aprsd-gcc-43-port/src/cpqueue.cpp --- aprsd-2.2.5-15/src/cpqueue.cpp 2003-03-30 23:47:54.000000000 -0500 +++ aprsd-gcc-43-port/src/cpqueue.cpp 2008-02-22 08:22:56.000000000 -0500 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff -Naur aprsd-2.2.5-15/src/dupCheck.cpp aprsd-gcc-43-port/src/dupCheck.cpp --- aprsd-2.2.5-15/src/dupCheck.cpp 2003-03-30 23:48:18.000000000 -0500 +++ aprsd-gcc-43-port/src/dupCheck.cpp 2008-02-22 08:23:15.000000000 -0500 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff -Naur aprsd-2.2.5-15/src/exceptionguard.cpp aprsd-gcc-43-port/src/exceptionguard.cpp --- aprsd-2.2.5-15/src/exceptionguard.cpp 2003-03-30 23:48:33.000000000 -0500 +++ aprsd-gcc-43-port/src/exceptionguard.cpp 2008-02-22 08:25:21.000000000 -0500 @@ -22,6 +22,7 @@ * Look at the README for more information on the program. */ +#include #include "exceptionguard.h" namespace aprsd diff -Naur aprsd-2.2.5-15/src/history.cpp aprsd-gcc-43-port/src/history.cpp --- aprsd-2.2.5-15/src/history.cpp 2003-05-29 14:26:33.000000000 -0400 +++ aprsd-gcc-43-port/src/history.cpp 2008-02-22 08:25:44.000000000 -0500 @@ -36,6 +36,7 @@ //#include #include #include +#include #include #include #include diff -Naur aprsd-2.2.5-15/src/httpserver.cpp aprsd-gcc-43-port/src/httpserver.cpp --- aprsd-2.2.5-15/src/httpserver.cpp 2003-05-11 00:38:34.000000000 -0400 +++ aprsd-gcc-43-port/src/httpserver.cpp 2008-02-22 08:29:13.000000000 -0500 @@ -28,7 +28,9 @@ #include // close() #include +#include #include +#include #include #include diff -Naur aprsd-2.2.5-15/src/mutex.cpp aprsd-gcc-43-port/src/mutex.cpp --- aprsd-2.2.5-15/src/mutex.cpp 2003-04-20 14:34:47.000000000 -0400 +++ aprsd-gcc-43-port/src/mutex.cpp 2008-02-22 08:29:51.000000000 -0500 @@ -23,6 +23,7 @@ */ +#include #include "aprsdassert.h" #include "aprsdexception.h" #include "mutex.h" diff -Naur aprsd-2.2.5-15/src/osdep.h aprsd-gcc-43-port/src/osdep.h --- aprsd-2.2.5-15/src/osdep.h 2003-04-20 14:34:47.000000000 -0400 +++ aprsd-gcc-43-port/src/osdep.h 2008-02-22 08:30:08.000000000 -0500 @@ -27,6 +27,7 @@ #define OSDEP_H #include "config.h" +#include #include extern "C" diff -Naur aprsd-2.2.5-15/src/validate.cpp aprsd-gcc-43-port/src/validate.cpp --- aprsd-2.2.5-15/src/validate.cpp 2003-03-30 23:49:41.000000000 -0500 +++ aprsd-gcc-43-port/src/validate.cpp 2008-02-22 08:30:43.000000000 -0500 @@ -34,6 +34,7 @@ #include #include #include +#include using namespace std; aprsd-2.2.5-15-sysconfdir.patch: --- NEW FILE aprsd-2.2.5-15-sysconfdir.patch --- --- aprsd-2.2.5-15/src/aprsd.cpp 2003-05-29 06:09:39.000000000 +0300 +++ aprsd-home/src/aprsd.cpp 2008-02-22 16:25:22.000000000 +0200 @@ -97,7 +97,7 @@ string szAprsPath; int msgsn; -const string HOMEDIR("/home/aprsd2"); +const string HOMEDIR("/etc/aprsd"); const string CONFPATH(""); const string CONFFILE("aprsd.conf"); const string MAINLOG("aprsd.log"); --- NEW FILE aprsd.conf --- # $Id: aprsd.conf,v 1.15 2003/10/01 16:57:16 kg4ijb Exp $ #aprsd 2.2.5 server configuration file # #This file is read ONCE on server startup. #You must restart aprsd for changes to take effect. #eg: /etc/rc.d/init.d/aprsd.init stop (then start) # #Lines starting with "#" are comments and are ignored #Key words such as "mycall" and "maxusers" are NOT case sensitive. #MyCall is the same as mycall. # #*** There is no error checking so be careful ****** # # #Servercall is the ax25 source call used in packets #sent from the server to Internet users. (9 chars max) #Note: Does not go out on the air. # servercall testCHO # #MyCall will be over written by the MYCALL string in INIT.TNC #if "tncport" has been defined. # MyCall NOCALL # MyLocation Charlottesville_VA # #This email address will be sent in replies to ?IGATE? queries. # Also, it will be on the status web pages on port 14501. MyEmail you at yourdomain.com # #Set MaxUsers and MaxLoad to values that your Internet connection can support. # Set MaxLoad in bytes/sec. If either value is exceeded # new users can't connect. MaxUsers 150 MaxLoad 100000000000 # # #Define beacon text. The server will supply the ax25 path header. #The first number after "NetBeacon" is the time interval in minutes. #Comment out the line or set time interval to 0 to disable beacon. #The rest of the line can be any aprs protocol conforming packet. # NetBeacon 10 !3802.21NI07830.61W& APRS Server # #Define the TNC beacon. The TNC will supply the ax25 path header. #It's optional and you may use the TNC BTEXT in the INIT.TNC file instead. # TncBeacon 10 !3802.21N/07830.61W& Linux APRS Server # # #Send 2 extra message acks is addition to each received ack to TNC #Range 0 to 9 ackrepeats 2 # #Send extra acks at 5 second intervals #Range 1 to 30 seconds ackrepeattime 5 # #Set history list items to expire in 35 minutes expire 35 # #Define the TNC serial port and baud rate. #Note: This device must have write permissions #If undefined all TNC related functions are disabled. #Permissable baud rates are 1200,2400,4800,9600 and 19200. # #tncport /dev/ttyS0 #tncport radio #tncbaud 1200 #Define the path for transmitted packets #This is only used when using Linux sockets, not the TNC. #For the TNC, set this in INIT.TNC. Note the format is #slightly different to the TNC command. aprspath APRS v WIDE # # Allow Internet to RF message passing. rf-allow no # #Set filterNoGate "yes" to block RFONLY and NOGATE packets filterNoGate yes # #Set history-allow to NO if you do not want users to get history dumps. history-allow no # #TRACE causes the server to append its own callsign to the end #of the AX25 path of every packet processed. #To conserver bandwidth this should only be #done for short periods to track sources of problems. # Trace no # #Set this to 'yes' if you want to log ALL PACKETS heard on RF to /home/aprsd2/rf.log #If 'no' then only packets with your callsign will be logged. logAllRF no # # Allow the insecure aprs passcodes to be used # Note: "no" means all users need Linux user names and passwords # and aprsd must be run as root for that to work. aprsPass yes # #Set the minimum time between TNC transmit packets in milliseconds TncPktSpacing 1500 # # Disallow packets transmitted from our own TNC from # being igated back to the Internet after being digipeated. igateMyCall no # #This determines if Mic-E packets are converted to classic APRS packets. #Put 'no' unless you have a very good reason to do conversions. #This option must also be enabled in the SOURCE CODE. To turn it on #you must edit "constant.h" and change CONVERT_MIC_E from FALSE to TRUE. #then recompile aprsd. ConvertMicE no # # #The PASS command. The callsign supplied in MyCall and this # passcode allow you to send data to distant servers. # PASS can be computed from MYCALL with the aprspass program. # Note: This example is invalid. Use your passcode. # pass 99999 # #------------------------------- #Server connection definitions # #usage: < host port> # #The TYPE-DIR field sets the connecton type and data flow. # TYPE is either "SERVER" or "HUB" # SERVER connections attempts to maintain a connection to the designated host # HUB connections maintain a connection to only ONE hub and rotate to the next # if the connectin fails. # DIR is either "RO" or "SR" RO is Receive Only. SR is Send and Receive. #Eamples: HUB-RO HUB-SR SERVER-RO SERVER-SR # If you select -SR to send data you must also supply a passcode # using the "PASS" command. See above. # #These commands are NOT case sensitive. # ** Defaults to Server-RO if TYPE-DIR not specified. ** # # #Example send-receive HUB connections #Hub is like Server except only ONE hub connection is active at a time. #If the hub connection fails the next hub is tried in rotation until one accepts a connection. # #Server second.aprs.net 23 hub-sr Server first.aprs.net 23 hub-sr #Server 128.143.202.191 23 hub-sr #Server third.aprs.net 23 hub-sr #Server rotate.aprs.net 23 hub-sr # # #Example Receive-Only HUB connecton #Server first.aprs.net 23 hub-ro # #Example Send-Receive SERVER connection. The SERVER type maintains a connection to #the specified server. No rotation. #Server first.aprs.net 23 server-sr # #Example of OmniPort connection to receive the local stream (tnc). #Note: OmniPort is currently available only on aprsd 2.1.5 # #Server atlanta.aprs.net 14600 server-ro portfilter(local) # #Receive the full stream. #Server atlanta.aprs.net 14600 server-ro portfilter(full) # # #These servers are provided as a reference. Some may no longer be active. #You really only need the two or three HUB connections above unless # you are doing something unusual. # #server second.aprs.net 1313 server-ro #server third.aprs.net 1313 server-ro #server socal-igate.aprs.claremont.edu 1313 server-ro #server first.aprs.net 23 #server atlanta.aprs.net 1313 server-ro #server aprsdkw.dyndns.org 1313 #server aprs.k9iu.ampr.org 1313 #server atlanta.aprs.net 1313 #server baltimore.aprs.net 1313 #server calgary.aprs.net 1313 #server concord.aprs.net 1313 #server cosprings.aprs.net 1313 #server dayton.aprs.net 14439 #server elansing.aprs.net 1313 #server gw.officine.it 1313 #server hamgate.cs.usu.edu 1313 #server kb2ear.aprs.net 1313 #server kd6wxd.dynip.com 10148 #server marconi.ece.cmu.edu 14579 #server michigan.aprs.net 1313 #server milwaukee.aprs.net 1313 #server montreal.aprs.net 1313 #server mulvey.dyndns.com 1313 #server netherlands.aprs.net 1313 #server newyork.aprs.net 1313 #server ontario.aprs.net 1313 #server orlando.aprs.net 1313 #server radio.artsfac.csuohio.edu 1313 #server radio-active.net.au 1313 #server sandiego.aprs.net 1313 #server santabarbara.aprs.net 1313 #server saopaulo.aprs.net 1313 #server swiss.aprs.net 14579 #server temple.aprs.net 1313 #server tucson.aprs.net 1313 #server wv.aprs.net 1313 #--------------------------------- # #Define server listen ports #Read ports.html for more info. # rawtncport 14580 localport 14579 mainport 10151 mainport-nh 10152 linkport 1313 msgport 1314 udpport 1315 sysopPort 14500 httpport 14501 ipwatchport 14502 errorport 14503 omniport 14600 # #define trusted users of the UDP port. #usage: trust #trust 208.148.145.151 #trust 208.148.145.144 255.255.255.240 # #Selected call signs which are always gated to RF #if they are not seen locally. All packets from #these are gated in real time. Do not use unless #you really need real time data. Consider posit2rf below. #They are case sensitive! Use upper case. Up to 64 may be defined. #As of version 2.1.5 the * wild card character is supported. #All characters beyond the * are ignored. #ie: WA4* would match ALL call signs beginning with "WA4" # # This has been enhanced in 2.2.5-15 to include # # Instead of only having "*" you can use # # $ ??for one single alpha character # # ??for one single numeric character # . ??for one single punctation character # ? ??for one single alphanumeric character # * ??for any number and kind of characters (like before) # # Example: # Patterns like ??"D$#$*" only allow german callsigns (starting with D, # followed by 1 alpha, 1 num, 1 alpha and anything else) but it does not # match "DALLAS" or something like that which occurs without this change # when configuring just "D*" # #gate2rf K4HG-8 N4NEQ* # #Call signs of stations whose posits are gated #to RF every 15 minutes. Only posit packets are #gated. Posits are taken from the history list. #They are case sensitive! Use upper case. # #posit2rf K4HG-8 # #Define a list of message destination call signs or aliases #to gate to RF full time. Note: the CQGA example #below is CQ GA (Georgia). Edit to suite your locale. #Up to 64 of these may be defined. They are case sensitive. # msgdest2rf SCOUTS KIDS CQGA # #end --- NEW FILE aprsd.init --- #!/bin/bash # # aprsd.init for version 2.2.5. starts or stops aprsd server. # This file should be placed in /etc/rc.d/init.d/ # # chkconfig: - 60 50 # description: APRSd is an APRS server program that uses amateur radio and internet# # services to convey GPS mapping, weather, and positional data. # It has been developed by and for amateur radio enthusiasts to provide # real-time data in an easy to use package. # processname: aprsd # config: /etc/aprsd/aprsd.conf # Source function library. . /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 [ -x /usr/bin/aprsd ] || exit 0 RETVAL=0 prog="aprsd" start() { # Start daemons. if [ -d /etc/aprsd ] ; then echo -n $"Starting $prog: " daemon /usr/bin/aprsd -d RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog echo else RETVAL=1 fi return $RETVAL } stop() { # Stop daemons. echo -n $"Shutting down $prog: " killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog return $RETVAL } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart|reload) stop start RETVAL=$? ;; condrestart) if [ -f /var/lock/subsys/$prog ]; then stop start RETVAL=$? fi ;; status) status $prog RETVAL=$? ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac exit $RETVAL --- NEW FILE aprsd.spec --- %define uprel 15 Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 Release: %{uprel}.2%{?dist} Group: Applications/Internet License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz Source1: aprsd.conf Source2: aprsd.init Source3: INIT.TNC Source4: user.deny Source5: welcome.txt Source6: RESTORE.TNC Patch0: aprsd-2.2.5-15-compile.patch Patch1: aprsd-2.2.5-15-gcc43-port.patch Patch2: aprsd-2.2.5-15-sysconfdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://sourceforge.net/projects/aprsd/ Requires (preun): /sbin/chkconfig Requires (preun): /sbin/service Requires (post): /sbin/chkconfig %description APRSd is an APRS server program that uses amateur radio and internet services to convey GPS mapping, weather, and positional data. It has been developed by and for amateur radio enthusiasts to provide real-time data in an easy to use package. %prep %setup -q -n %{name}-%{version}-%{uprel} %patch0 -p1 -b compile %patch1 -p1 -b gccport %patch2 -p1 -b sysconfdir %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR="%{buildroot}" INSTALL="install -p" mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/{aprsd,rc.d/init.d} install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/aprsd/aprsd.conf install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/aprsd install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/aprsd/INIT.TNC install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/aprsd/user.deny install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/aprsd/welcome.txt install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/aprsd/RESTORE.TNC %clean rm -rf %{buildroot} %post /sbin/chkconfig --add aprsd %preun if [ $1 = 0 ]; then /sbin/service aprsd stop > /dev/null 2>&1 /sbin/chkconfig --del aprsd fi %files %defattr(-,root,root,-) %{_bindir}/aprsd %{_bindir}/aprspass %{_sysconfdir}/rc.d/init.d/aprsd %dir %{_sysconfdir}/aprsd %config(noreplace) %{_sysconfdir}/aprsd/* %doc AUTHORS %doc COPYING %doc ChangeLog %doc README %doc doc/aprsddoc.html %doc doc/ports.html %doc doc/q.html %doc doc/qalgorithm.html %changelog * Fri Feb 22 2008 Lucian Langa - 2.2.5-15.2 - Patched homedir to obey default sysconfdir - Patched to compile for gcc-4.3 - Misc cleanups * Thu Feb 21 2008 Lucian Langa - 2.2.5-15.1 - Initial spec file created --- NEW FILE user.deny --- #user.deny #format: user R|L #use "L" to deny login and RF access #use "R" to deny RF access but allow login #ssid is ignored, eg: W4EVIL and W4EVIL-7 are the same. N0CALL L --- NEW FILE welcome.txt --- # Welcome to first.aprs.net (aprs core server). # Direct comments to cbyam at virginia.edu . Type ctrl-D to disconnect. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/aprsd/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2008 19:55:25 -0000 1.1 +++ .cvsignore 1 Mar 2008 08:04:44 -0000 1.2 @@ -0,0 +1 @@ +aprsd-2.2.5-15.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/aprsd/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2008 19:55:25 -0000 1.1 +++ sources 1 Mar 2008 08:04:44 -0000 1.2 @@ -0,0 +1 @@ +c380ecc57c573f1db79ced0b73e0d644 aprsd-2.2.5-15.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 08:07:56 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 1 Mar 2008 08:07:56 GMT Subject: rpms/WebKit/devel WebKit-gcc43.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 WebKit.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200803010807.m2187uED017162@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17124 Modified Files: .cvsignore WebKit.spec sources Added Files: WebKit-gcc43.patch Log Message: Update to SVN 30667, add GCC 4.3 patch WebKit-gcc43.patch: --- NEW FILE WebKit-gcc43.patch --- diff -up ./WebCore/dom/Position.cpp.old ./WebCore/dom/Position.cpp --- ./WebCore/dom/Position.cpp.old 2008-02-16 19:13:45.000000000 -0800 +++ ./WebCore/dom/Position.cpp 2008-02-16 19:18:59.000000000 -0800 @@ -23,6 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "config.h" #include "Position.h" diff -up ./WebCore/editing/SelectionController.cpp.old ./WebCore/editing/SelectionController.cpp --- ./WebCore/editing/SelectionController.cpp.old 2008-02-16 19:38:08.000000000 -0800 +++ ./WebCore/editing/SelectionController.cpp 2008-02-16 19:40:00.000000000 -0800 @@ -22,7 +22,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "config.h" #include "SelectionController.h" diff -up ./WebCore/editing/Selection.cpp.old ./WebCore/editing/Selection.cpp --- ./WebCore/editing/Selection.cpp.old 2008-02-16 21:01:15.000000000 -0800 +++ ./WebCore/editing/Selection.cpp 2008-02-16 21:01:29.000000000 -0800 @@ -23,6 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "config.h" #include "Selection.h" diff -up ./WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp.old ./WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp --- ./WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp.old 2008-02-29 14:04:05.000000000 -0800 +++ ./WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp 2008-02-29 14:04:47.000000000 -0800 @@ -22,6 +22,7 @@ #include #include +#include // Returns a newly allocated UTF-8 character buffer which must be freed with g_free() static gchar* JSStringCopyUTF8CString(JSStringRef jsString) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Jan 2008 09:03:16 -0000 1.3 +++ .cvsignore 1 Mar 2008 08:07:18 -0000 1.4 @@ -1 +1 @@ -WebKit-r29336.tar.bz2 +WebKit-r30667.tar.bz2 Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- WebKit.spec 19 Feb 2008 19:14:12 -0000 1.3 +++ WebKit.spec 1 Mar 2008 08:07:18 -0000 1.4 @@ -3,7 +3,7 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \ echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list -%define svn_revision 29336 +%define svn_revision 30667 Name: WebKit Version: 1.0.0 @@ -16,6 +16,8 @@ Source0: http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2 +Patch0: %{name}-gcc43.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison @@ -30,7 +32,7 @@ BuildRequires: sqlite-devel %description -WebKit is an open source web browser engine. +WebKit is an open source web browser engine. %package gtk Summary: GTK+ port of WebKit @@ -93,6 +95,7 @@ %prep %setup -qn "%{name}-r%{svn_revision}" +%patch0 -b .gcc43 %build @@ -172,7 +175,6 @@ %add_to_doc_files WebCore/icu/LICENSE %add_to_doc_files JavaScriptCore/icu/README -%add_to_doc_files WebCore/README %add_to_doc_files WebCore/icu/README %add_to_doc_files JavaScriptCore/AUTHORS @@ -230,6 +232,11 @@ %changelog +* Fri Feb 29 2008 Peter Gordon 1.0.0-0.5.svn30667 +- Update to new upstream snapshot (SVN 30667) +- Add some build fixes for GCC 4.3: + + gcc43.patch + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.0-0.5.svn29336 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jan 2008 09:03:16 -0000 1.3 +++ sources 1 Mar 2008 08:07:18 -0000 1.4 @@ -1 +1 @@ -a7fa1198a4ab67be0b8140b562ceb489 WebKit-r29336.tar.bz2 +d5047727add37bdbba6a4642b0a9c0f4 WebKit-r30667.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 08:14:15 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:14:15 GMT Subject: rpms/ocaml-curl/devel ocaml-curl.spec,1.4,1.5 Message-ID: <200803010814.m218EF0R017317@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-curl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17283 Modified Files: ocaml-curl.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 0.2.1-7 - Rebuild for ppc64. Index: ocaml-curl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-curl/devel/ocaml-curl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ocaml-curl.spec 13 Feb 2008 00:19:16 -0000 1.4 +++ ocaml-curl.spec 1 Mar 2008 08:13:34 -0000 1.5 @@ -3,7 +3,7 @@ Name: ocaml-curl Version: 0.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OCaml Curl library (ocurl) Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://sourceforge.net/projects/ocurl Source0: http://downloads.sourceforge.net/ocurl/ocurl-0.2.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0-7 BuildRequires: ocaml-findlib-devel, curl-devel >= 7.9.8 @@ -91,6 +90,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 0.2.1-7 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 0.2.1-6 - Force rebuild for OCaml 3.10.1. From fedora-extras-commits at redhat.com Sat Mar 1 08:17:02 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sat, 1 Mar 2008 08:17:02 GMT Subject: rpms/xastir/devel xastir-1.9.2-libdir.patch, NONE, 1.1 xastir.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803010817.m218H2YE017440@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xastir/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17414/devel Modified Files: .cvsignore sources Added Files: xastir-1.9.2-libdir.patch xastir.spec Log Message: initial import xastir-1.9.2-libdir.patch: --- NEW FILE xastir-1.9.2-libdir.patch --- diff -Naur xastir-1.9.2/Makefile.in xastir-libdir/Makefile.in --- xastir-1.9.2/Makefile.in 2007-11-06 19:12:46.000000000 +0200 +++ xastir-libdir/Makefile.in 2008-02-23 14:56:11.000000000 +0200 @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd diff -Naur xastir-1.9.2/scripts/Makefile.in xastir-libdir/scripts/Makefile.in --- xastir-1.9.2/scripts/Makefile.in 2007-11-06 19:12:43.000000000 +0200 +++ xastir-libdir/scripts/Makefile.in 2008-02-23 14:48:22.000000000 +0200 @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --- NEW FILE xastir.spec --- Summary : Amateur Station Tracking and Reporting system for amateur radio Name : xastir Version : 1.9.2 Release : 2%{?dist} License : GPLv2 Group : Applications/Internet Source : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz Patch0 : xastir-1.9.2-libdir.patch URL : http://www.xastir.org BuildRoot : %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires : lesstif-devel BuildRequires : libXt-devel BuildRequires : festival BuildRequires : ImageMagick-devel BuildRequires : dos2unix BuildRequires : libax25-devel BuildRequires : curl-devel BuildRequires : pcre-devel BuildRequires : proj-devel BuildRequires : python BuildRequires : shapelib-devel %description Xastir is a graphical application that interfaces HAM radio and internet access to realtime mapping software. Install XASTIR if you are interested in APRS(tm) and HAM radio software. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .libdir %build #./bootstrap.sh %configure --without-graphicsmagick --with-rtree make %{?_smp_mflags} for f in README ChangeLog ; do mv $f $f.iso88591 iconv -o $f -f iso88591 -t utf8 $f.iso88591 rm -f $f.iso88591 done dos2unix scripts/toporama250k.pl %install rm -rf %{buildroot} make install DESTDIR="%{buildroot}" INSTALL="install -p" #fix wrong doc-path instalation in make install target #or else we'll get unpacked files rm -rf %{buildroot}/usr/share/doc #remove gpx2shape because of unsupported dependency Geo::Shapelib rm %{buildroot}/usr/share/xastir/gpx2shape %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/xastir %{_bindir}/xastir_udp_client %{_bindir}/callpass %{_mandir}/man1/xastir.* %attr(0644,root,root) %{_datadir}/xastir/Coordinate.pm %{_datadir}/xastir %{_datadir}/xastir/help #%{_datadir}/xastir/config %{_datadir}/xastir/symbols %{_datadir}/xastir/maps #%{_datadir}/xastir/Counties #%{_datadir}/xastir/fcc #%{_datadir}/xastir/GNIS #%{_datadir}/xastir/sounds %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE %doc README README.Contributing README.CVS README.Getting-Started %doc README.MAPS README.win32 UPGRADE %changelog * Sat Feb 23 2008 Lucian Langa - 1.9.2-2 - Moved scripts from libdir to datadir * Fri Feb 22 2008 Lucian Langa - 1.9.2-1 - Updated to Fedora Packaging specifications * Thu Jul 03 2003 Alan Crosswell - 1.2.1 my patches now integrated into the main trunk. * Sat Jun 21 2003 Alan Crosswell - added xastir-maps.patch * Mon Jun 16 2003 Alan Crosswell - 1.2.0 * Fri Jun 06 2003 Alan Crosswell - June 5 snapshot * Thu May 15 2003 Alan Crosswell - start with chuck's spec file for 1.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xastir/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2008 19:57:04 -0000 1.1 +++ .cvsignore 1 Mar 2008 08:16:26 -0000 1.2 @@ -0,0 +1 @@ +xastir-1.9.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xastir/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2008 19:57:04 -0000 1.1 +++ sources 1 Mar 2008 08:16:26 -0000 1.2 @@ -0,0 +1 @@ +8608afa8f8f0c441a37ba72aeeccdcac xastir-1.9.2.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 08:33:17 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 1 Mar 2008 08:33:17 GMT Subject: rpms/f-spot/devel f-spot-0.4.2-GalleryExport.patch, NONE, 1.1 f-spot.spec, 1.63, 1.64 Message-ID: <200803010833.m218XHIF017751@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/f-spot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17702 Modified Files: f-spot.spec Added Files: f-spot-0.4.2-GalleryExport.patch Log Message: * Fri Feb 29 2008 Christopher Aillon - 0.4.2-3 - Fix the build f-spot-0.4.2-GalleryExport.patch: --- NEW FILE f-spot-0.4.2-GalleryExport.patch --- >From http://bugzilla.gnome.org/show_bug.cgi?id=516620 diff -up f-spot-0.4.2/extensions/GalleryExport/Makefile.am.GalleryExport f-spot-0.4.2/extensions/GalleryExport/Makefile.am --- f-spot-0.4.2/extensions/GalleryExport/Makefile.am.GalleryExport 2008-03-01 03:28:06.000000000 -0500 +++ f-spot-0.4.2/extensions/GalleryExport/Makefile.am 2008-03-01 03:28:51.000000000 -0500 @@ -36,7 +36,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $( plugindir = $(pkglibdir)/extensions install-data-hook: - rm -f $(plugindir)/GalleryExport.addin.xml + if [ -w $(plugindir)/GalleryExport.addin.xml ] ; then rm -f $(plugindir)/GalleryExport.addin.xml; fi plugin_DATA = \ $(PLUGIN_ASSEMBLY) diff -up f-spot-0.4.2/extensions/GalleryExport/Makefile.in.GalleryExport f-spot-0.4.2/extensions/GalleryExport/Makefile.in --- f-spot-0.4.2/extensions/GalleryExport/Makefile.in.GalleryExport 2008-03-01 03:27:57.000000000 -0500 +++ f-spot-0.4.2/extensions/GalleryExport/Makefile.in 2008-03-01 03:29:16.000000000 -0500 @@ -538,7 +538,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $( $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES) install-data-hook: - rm -f $(plugindir)/GalleryExport.addin.xml + if [ -w $(plugindir)/GalleryExport.addin.xml ] ; then rm -f $(plugindir)/GalleryExport.addin.xml; fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Index: f-spot.spec =================================================================== RCS file: /cvs/extras/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- f-spot.spec 24 Feb 2008 22:11:02 -0000 1.63 +++ f-spot.spec 1 Mar 2008 08:32:43 -0000 1.64 @@ -1,6 +1,6 @@ Name: f-spot Version: 0.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Photo management application Group: Applications/Multimedia @@ -9,6 +9,7 @@ Source0: f-spot-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=510325 Patch0: x-content.patch +Patch1: f-spot-0.4.2-GalleryExport.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel mono-web mono-data mono-data-sqlite lcms-devel @@ -43,6 +44,7 @@ %prep %setup -q %patch0 -p1 -b .x-content +%patch1 -p1 -b .GalleryExport %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -98,6 +100,9 @@ %{_datadir}/omf/f-spot %changelog +* Fri Feb 29 2008 Christopher Aillon - 0.4.2-3 +- Fix the build + * Mon Feb 18 2008 Fedora Release Engineering - 0.4.2-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Mar 1 08:33:44 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:33:44 GMT Subject: rpms/ocaml-ssl/devel ocaml-ssl.spec,1.6,1.7 Message-ID: <200803010833.m218Xib1017791@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-ssl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17731 Modified Files: ocaml-ssl.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 0.4.2-8 - Rebuild for ppc64. Index: ocaml-ssl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ssl/devel/ocaml-ssl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ocaml-ssl.spec 13 Feb 2008 00:24:47 -0000 1.6 +++ ocaml-ssl.spec 1 Mar 2008 08:33:08 -0000 1.7 @@ -3,7 +3,7 @@ Name: ocaml-ssl Version: 0.4.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: SSL bindings for OCaml Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://savonet.sourceforge.net/wiki/Savonet Source0: http://downloads.sourceforge.net/savonet/ocaml-ssl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-findlib-devel, openssl-devel @@ -87,6 +86,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 0.4.2-8 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 0.4.2-7 - Rebuild for OCaml 3.10.1. - For some reason 'Unix' and 'UnixLabels' leak so ignore them. From fedora-extras-commits at redhat.com Sat Mar 1 08:36:46 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:36:46 GMT Subject: rpms/ocaml-ulex/devel ocaml-ulex.spec,1.7,1.8 Message-ID: <200803010836.m218akwl017880@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-ulex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17860 Modified Files: ocaml-ulex.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 1.0-8 - Rebuild for ppc64. Index: ocaml-ulex.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ulex/devel/ocaml-ulex.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ocaml-ulex.spec 13 Feb 2008 01:21:09 -0000 1.7 +++ ocaml-ulex.spec 1 Mar 2008 08:36:10 -0000 1.8 @@ -3,7 +3,7 @@ Name: ocaml-ulex Version: 1.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: OCaml lexer generator for Unicode Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://www.cduce.org/download.html Source0: http://www.cduce.org/download/ulex-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0-7, ocaml-findlib-devel, ocaml-camlp4-devel BuildRequires: gawk @@ -88,6 +87,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 1.0-8 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 1.0-7 - Rebuild for OCaml 3.10.1 From fedora-extras-commits at redhat.com Sat Mar 1 08:39:06 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:39:06 GMT Subject: rpms/ocaml-curses/devel ocaml-curses.spec,1.4,1.5 Message-ID: <200803010839.m218d6DM017958@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-curses/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17936 Modified Files: ocaml-curses.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 0.1-7.20020319 - Rebuild for ppc64. Index: ocaml-curses.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-curses/devel/ocaml-curses.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ocaml-curses.spec 13 Feb 2008 00:10:15 -0000 1.4 +++ ocaml-curses.spec 1 Mar 2008 08:38:32 -0000 1.5 @@ -10,7 +10,7 @@ Name: ocaml-curses Version: 0.1 -Release: 6.%{alphatag}%{?dist} +Release: 7.%{alphatag}%{?dist} Summary: OCaml bindings for ncurses Group: Development/Libraries @@ -18,7 +18,6 @@ URL: http://savannah.nongnu.org/projects/ocaml-tmk/ Source0: ocaml-curses-%{alphatag}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-findlib-devel, ncurses-devel @@ -100,6 +99,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 0.1-7.20020319 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 0.1-6.20020319 - Rebuild for OCaml 3.10.1 From fedora-extras-commits at redhat.com Sat Mar 1 08:41:48 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:41:48 GMT Subject: rpms/ocaml-fileutils/devel ocaml-fileutils.spec,1.1,1.2 Message-ID: <200803010841.m218fmVx018060@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-fileutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18025 Modified Files: ocaml-fileutils.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 0.3.0-4 - Rebuild for ppc64. Index: ocaml-fileutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-fileutils/devel/ocaml-fileutils.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-fileutils.spec 22 Feb 2008 18:40:38 -0000 1.1 +++ ocaml-fileutils.spec 1 Mar 2008 08:41:14 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-fileutils Version: 0.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml library for common file and filename operations Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://www.gallu.homelinux.org/download/ Source0: http://www.gallu.homelinux.org/download/ocaml-fileutils-0.3.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml BuildRequires: ocaml-findlib-devel @@ -95,6 +94,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 0.3.0-4 +- Rebuild for ppc64. + * Thu Feb 21 2008 Richard W.M. Jones - 0.3.0-3 - Fixed grammar in the description section. - License is LGPLv2 with exceptions From fedora-extras-commits at redhat.com Sat Mar 1 08:44:04 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:44:04 GMT Subject: rpms/ocaml-expat/devel ocaml-expat.spec,1.6,1.7 Message-ID: <200803010844.m218i4WE018189@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-expat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18133 Modified Files: ocaml-expat.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 0.9.1-10 - Rebuild for ppc64. Index: ocaml-expat.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-expat/devel/ocaml-expat.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ocaml-expat.spec 13 Feb 2008 01:21:27 -0000 1.6 +++ ocaml-expat.spec 1 Mar 2008 08:43:26 -0000 1.7 @@ -3,7 +3,7 @@ Name: ocaml-expat Version: 0.9.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: OCaml wrapper for the Expat XML parsing library Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://www.xs4all.nl/~mmzeeman/ocaml/ Source0: http://www.xs4all.nl/~mmzeeman/ocaml/ocaml-expat-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-findlib-devel, expat-devel >= 2.0.1, chrpath @@ -90,6 +89,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 0.9.1-10 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 0.9.1-9 - Rebuild for OCaml 3.10.1. From fedora-extras-commits at redhat.com Sat Mar 1 08:46:37 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:46:37 GMT Subject: rpms/ocaml-dbus/devel ocaml-dbus.spec,1.2,1.3 Message-ID: <200803010846.m218kbAL018321@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-dbus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18299 Modified Files: ocaml-dbus.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 0.04-2 - Rebuild for ppc64. Index: ocaml-dbus.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/ocaml-dbus.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-dbus.spec 23 Feb 2008 14:25:19 -0000 1.2 +++ ocaml-dbus.spec 1 Mar 2008 08:46:01 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-dbus Version: 0.04 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for using D-Bus Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://tab.snarc.org/projects/ocaml_dbus/ Source0: http://tab.snarc.org/download/ocaml/ocaml_dbus-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 Patch0: ocaml-dbus-string-of-ty.patch Patch1: ocaml-dbus-object-path.patch @@ -102,6 +101,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 0.04-2 +- Rebuild for ppc64. + * Sat Feb 23 2008 Richard W.M. Jones - 0.04-1 - New upstream release 0.04. - Added patches which have gone upstream for Avahi support. From fedora-extras-commits at redhat.com Sat Mar 1 08:48:43 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:48:43 GMT Subject: rpms/ocaml-pcre/devel ocaml-pcre.spec,1.6,1.7 Message-ID: <200803010848.m218mhRJ018408@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pcre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18384 Modified Files: ocaml-pcre.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 5.13.0-2 - Rebuild for ppc64. Index: ocaml-pcre.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/ocaml-pcre.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ocaml-pcre.spec 13 Feb 2008 00:18:53 -0000 1.6 +++ ocaml-pcre.spec 1 Mar 2008 08:48:11 -0000 1.7 @@ -3,7 +3,7 @@ Name: ocaml-pcre Version: 5.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl compatibility regular expressions (PCRE) for OCaml Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://www.ocaml.info/home/ocaml_sources.html Source0: http://www.ocaml.info/ocaml_sources/pcre-ocaml-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0-7 BuildRequires: ocaml-findlib-devel, pcre-devel @@ -89,6 +88,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 5.13.0-2 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 5.13.0-1 - New upstream version 5.13.0. - Rebuild for OCaml 3.10.1. From fedora-extras-commits at redhat.com Sat Mar 1 08:51:33 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:51:33 GMT Subject: rpms/ocaml-xml-light/devel ocaml-xml-light.spec,1.5,1.6 Message-ID: <200803010851.m218pXNI018513@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-xml-light/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18491 Modified Files: ocaml-xml-light.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 2.2.cvs20070817-7 - Rebuild for ppc64. Index: ocaml-xml-light.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-xml-light/devel/ocaml-xml-light.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ocaml-xml-light.spec 13 Feb 2008 00:34:25 -0000 1.5 +++ ocaml-xml-light.spec 1 Mar 2008 08:51:00 -0000 1.6 @@ -3,7 +3,7 @@ Name: ocaml-xml-light Version: 2.2.cvs20070817 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Minimal XML parser and printer for OCaml Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://tech.motion-twin.com/xmllight.html Source0: xml-light-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-findlib-devel, ocaml-ocamldoc @@ -89,6 +88,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 2.2.cvs20070817-7 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 2.2.cvs20070817-6 - Rebuild for OCaml 3.10.1 From fedora-extras-commits at redhat.com Sat Mar 1 08:54:58 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:54:58 GMT Subject: rpms/ocaml-extlib/devel ocaml-extlib.spec,1.4,1.5 Message-ID: <200803010854.m218swuB018618@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-extlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18600 Modified Files: ocaml-extlib.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 1.5.1-2 - License is LGPLv2+ with exceptions. - Rebuild for ppc64. Index: ocaml-extlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-extlib/devel/ocaml-extlib.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ocaml-extlib.spec 13 Feb 2008 00:16:43 -0000 1.4 +++ ocaml-extlib.spec 1 Mar 2008 08:54:24 -0000 1.5 @@ -3,15 +3,14 @@ Name: ocaml-extlib Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml ExtLib additions to the standard library Group: Development/Libraries -License: LGPL +License: LGPLv2+ with exceptions URL: http://code.google.com/p/ocaml-extlib/ Source0: http://ocaml-extlib.googlecode.com/files/extlib-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 Patch0: extlib-install.patch @@ -113,6 +112,10 @@ %{_libdir}/ocaml/extlib/*.ml %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 1.5.1-2 +- License is LGPLv2+ with exceptions. +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 1.5.1-1 - New upstream version 1.5.1. - New home page. From fedora-extras-commits at redhat.com Sat Mar 1 08:57:17 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 08:57:17 GMT Subject: rpms/ocaml-calendar/devel ocaml-calendar.spec,1.4,1.5 Message-ID: <200803010857.m218vHJl018712@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-calendar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18694 Modified Files: ocaml-calendar.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 2.0-2 - Rebuild for ppc64. Index: ocaml-calendar.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ocaml-calendar.spec 13 Feb 2008 00:23:50 -0000 1.4 +++ ocaml-calendar.spec 1 Mar 2008 08:56:44 -0000 1.5 @@ -3,7 +3,7 @@ Name: ocaml-calendar Version: 2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective Caml library for managing dates and times Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://www.lri.fr/~signoles/prog.en.html#calendar Source0: http://www.lri.fr/~signoles/prog/calendar/calendar-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-findlib-devel, ocaml-ocamldoc @@ -74,6 +73,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 2.0-2 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 2.0-1 - New upstream version 2.0. - Rebuild for OCaml 3.10.1. From fedora-extras-commits at redhat.com Sat Mar 1 09:00:03 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 09:00:03 GMT Subject: rpms/ocaml-lablgtk/devel ocaml-lablgtk.spec,1.5,1.6 Message-ID: <200803010900.m21903c2018808@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-lablgtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18781 Modified Files: ocaml-lablgtk.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 2.10.0-3 - Rebuild for ppc64. Index: ocaml-lablgtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lablgtk/devel/ocaml-lablgtk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ocaml-lablgtk.spec 13 Feb 2008 00:34:06 -0000 1.5 +++ ocaml-lablgtk.spec 1 Mar 2008 08:59:28 -0000 1.6 @@ -2,7 +2,7 @@ Name: ocaml-lablgtk Version: 2.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective Caml interface to gtk+ @@ -30,7 +30,6 @@ BuildRequires: ocaml-lablgl-devel >= 1.03 BuildRequires: ocaml-ocamldoc BuildRequires: zlib-devel -ExcludeArch: ppc64 %define _use_internal_dependency_generator 0 @@ -148,6 +147,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 2.10.0-3 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 2.10.0-2 - Rebuild for OCaml 3.10.1. From fedora-extras-commits at redhat.com Sat Mar 1 09:09:13 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 09:09:13 GMT Subject: rpms/ocaml-zip/devel ocaml-zip.spec,1.1,1.2 Message-ID: <200803010909.m2199DVS026135@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-zip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26104 Modified Files: ocaml-zip.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 1.03-2 - Rebuild for ppc64. Index: ocaml-zip.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-zip/devel/ocaml-zip.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-zip.spec 29 Feb 2008 09:32:34 -0000 1.1 +++ ocaml-zip.spec 1 Mar 2008 09:08:35 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-zip Version: 1.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for reading and writing zip, jar and gzip files Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://pauillac.inria.fr/~xleroy/software.html Source0: http://caml.inria.fr/distrib/bazar-ocaml/camlzip-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel @@ -103,5 +102,8 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 1.03-2 +- Rebuild for ppc64. + * Fri Feb 22 2008 Richard W.M. Jones - 1.03-1 - Initial RPM release. From fedora-extras-commits at redhat.com Sat Mar 1 09:02:41 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 09:02:41 GMT Subject: rpms/ocaml-csv/devel ocaml-csv.spec,1.4,1.5 Message-ID: <200803010902.m2192fWE025997@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-csv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25969 Modified Files: ocaml-csv.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 1.1.6-7 - Rebuild for ppc64. Index: ocaml-csv.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-csv/devel/ocaml-csv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ocaml-csv.spec 13 Feb 2008 00:23:26 -0000 1.4 +++ ocaml-csv.spec 1 Mar 2008 09:01:57 -0000 1.5 @@ -3,7 +3,7 @@ Name: ocaml-csv Version: 1.1.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OCaml library for reading and writing CSV files Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://merjis.com/developers/csv Source0: http://merjis.com/_file/ocaml-csv-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 Patch0: csv-extlib.patch Patch1: csv-install.patch @@ -108,6 +107,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 1.1.6-7 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 1.1.6-6 - Force rebuild for OCaml 3.10.1. From fedora-extras-commits at redhat.com Sat Mar 1 09:24:07 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Sat, 1 Mar 2008 09:24:07 GMT Subject: rpms/texlive-texmf/devel texlive-texmf.spec,1.16,1.17 Message-ID: <200803010924.m219O73S026365@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/texlive-texmf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26328 Modified Files: texlive-texmf.spec Log Message: * Sat Mar 01 2008 Jindrich Novy - 2007-15 - require texlive-texmf in texlive-texmf-fonts (#431255) Index: texlive-texmf.spec =================================================================== RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive-texmf.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- texlive-texmf.spec 29 Feb 2008 13:44:53 -0000 1.16 +++ texlive-texmf.spec 1 Mar 2008 09:23:29 -0000 1.17 @@ -12,7 +12,7 @@ Name: texlive-texmf Version: 2007 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Architecture independent parts of the TeX formatting system Group: Applications/Publishing @@ -110,6 +110,7 @@ %package fonts Group: Applications/Publishing Summary: Font files needed for TeXLive +Requires: texlive-texmf = %{version}-%{release} Requires: texlive-texmf-dvips = %{version}-%{release} Requires: texlive-texmf-errata-fonts = %{version} @@ -645,6 +646,9 @@ %doc %{_texmf_main}/doc/ %changelog +* Sat Mar 01 2008 Jindrich Novy - 2007-15 +- require texlive-texmf in texlive-texmf-fonts (#431255) + * Thu Feb 28 2008 Jindrich Novy - 2007-14 - rename texlive-texmf-japanese to texlive-texmf-east-asian - use better approach in installation of cmap files for dvipdfmx From fedora-extras-commits at redhat.com Sat Mar 1 10:01:35 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 10:01:35 GMT Subject: rpms/ocaml-camlimages/devel ocaml-camlimages.spec,1.3,1.4 Message-ID: <200803011001.m21A1ZJR001394@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlimages/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26762 Modified Files: ocaml-camlimages.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones 2.2.0-10 - Rebuild for ppc64. Index: ocaml-camlimages.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ocaml-camlimages.spec 13 Feb 2008 11:16:30 -0000 1.3 +++ ocaml-camlimages.spec 1 Mar 2008 10:00:54 -0000 1.4 @@ -3,7 +3,7 @@ Name: ocaml-camlimages Version: 2.2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: OCaml image processing library Group: Development/Libraries @@ -14,13 +14,10 @@ Patch0: camlimages-2.2.0-stubdest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Excluding on ppc64 due to missing dependencies (Bug #239518) -ExcludeArch: ppc64 - BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-lablgtk-devel -BuildRequires: lablgtk libpng-devel libjpeg-devel -BuildRequires: libXpm-devel ghostscript-devel freetype-devel +BuildRequires: lablgtk, libpng-devel, libjpeg-devel +BuildRequires: libXpm-devel, ghostscript-devel, freetype-devel BuildRequires: giflib-devel %define buildlibs ppm bmp xvthumb jpeg gif png xpm ps graphics freetype @@ -92,6 +89,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones 2.2.0-10 +- Rebuild for ppc64. + * Wed Feb 13 2008 Richard W.M. Jones 2.2.0-9 - Rebuild for OCaml 3.10.1 - Fix paths to conform to packaging policy. From fedora-extras-commits at redhat.com Sat Mar 1 10:13:40 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 10:13:40 GMT Subject: rpms/ocaml-ocamlnet/devel ocaml-ocamlnet.spec,1.2,1.3 Message-ID: <200803011013.m21ADeGs001581@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-ocamlnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1561 Modified Files: ocaml-ocamlnet.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 2.2.9-3 - Rebuild for ppc64. Index: ocaml-ocamlnet.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-ocamlnet.spec 13 Feb 2008 01:21:46 -0000 1.2 +++ ocaml-ocamlnet.spec 1 Mar 2008 10:13:06 -0000 1.3 @@ -3,14 +3,13 @@ Name: ocaml-ocamlnet Version: 2.2.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network protocols for OCaml Group: Development/Libraries License: BSD URL: http://www.ocaml-programming.de/programming/ocamlnet.html Source0: http://www.ocaml-programming.de/packages/ocamlnet-%{version}.tar.gz -ExcludeArch: ppc64 Patch0: ocamlnet-ocaml310.patch Patch1: ocamlnet-ucred.patch @@ -233,6 +232,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 2.2.9-3 +- Rebuild for ppc64. + * Tue Feb 12 2008 Richard W.M. Jones - 2.2.9-2 - Rebuild for OCaml 3.10.1. From fedora-extras-commits at redhat.com Sat Mar 1 10:23:43 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 10:23:43 GMT Subject: rpms/ocaml-libvirt/devel ocaml-libvirt.spec,1.12,1.13 Message-ID: <200803011023.m21ANhEQ001729@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1711 Modified Files: ocaml-libvirt.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 0.4.0.3-3 - Rebuild for ppc64. Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ocaml-libvirt.spec 13 Feb 2008 10:20:16 -0000 1.12 +++ ocaml-libvirt.spec 1 Mar 2008 10:23:04 -0000 1.13 @@ -10,7 +10,7 @@ Name: ocaml-libvirt Version: 0.4.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml binding for libvirt Group: Development/Libraries @@ -18,7 +18,6 @@ URL: http://libvirt.org/ocaml/ Source0: http://libvirt.org/sources/ocaml/ocaml-libvirt/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-ocamldoc @@ -233,6 +232,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 0.4.0.3-3 +- Rebuild for ppc64. + * Wed Feb 13 2008 Richard W.M. Jones - 0.4.0.3-2 - Add BR gtk2-devel From fedora-extras-commits at redhat.com Sat Mar 1 10:31:13 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 1 Mar 2008 10:31:13 GMT Subject: rpms/mysql++/devel mysql++.devhelp, NONE, 1.1 .cvsignore, 1.6, 1.7 mysql++.spec, 1.7, 1.8 sources, 1.6, 1.7 mysql++3rc5-gcc43.patch, 1.1, NONE Message-ID: <200803011031.m21AVDwH001920@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/mysql++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1884 Modified Files: .cvsignore mysql++.spec sources Added Files: mysql++.devhelp Removed Files: mysql++3rc5-gcc43.patch Log Message: update to 3.0.0 final + add devhelp integration --- NEW FILE mysql++.devhelp --- Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mysql++/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Feb 2008 20:38:14 -0000 1.6 +++ .cvsignore 1 Mar 2008 10:30:34 -0000 1.7 @@ -1 +1 @@ -mysql++-3.0.0-rc5.tar.gz +mysql++-3.0.0.tar.gz Index: mysql++.spec =================================================================== RCS file: /cvs/extras/rpms/mysql++/devel/mysql++.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mysql++.spec 28 Feb 2008 20:38:14 -0000 1.7 +++ mysql++.spec 1 Mar 2008 10:30:34 -0000 1.8 @@ -1,23 +1,26 @@ Summary: C++ wrapper for the MySQL C API Name: mysql++ Version: 3.0.0 -Release: 0.1.rc5%{?dist} +Release: 1%{?dist} License: LGPLv2 Group: Development/Libraries URL: http://tangentsoft.net/mysql++/ -#Source0: http://tangentsoft.net/mysql++/releases/mysql++-%{version}.tar.gz -Source0: http://tangentsoft.net/mysql++/test/mysql++-3.0.0-rc5.tar.gz - -Patch0: mysql++3rc5-gcc43.patch +Source0: http://tangentsoft.net/mysql++/releases/mysql++-%{version}.tar.gz +Source1: mysql++.devhelp BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: mysql-devel %description -MySQL++ makes working with MySQL server queries as easy as working -with STL containers. This package contains only the libraries needed to -run MySQL++-based programs. If you are building your own MySQL++-based -programs, you also need to install the -devel package. +MySQL++ is a C++ wrapper for MySQL???s C API. + +It is built around STL principles, to make dealing with the database as easy +as dealing with an STL container. MySQL++ relieves the programmer of dealing +with cumbersome C data structures, generation of repetitive SQL statements, +and manual creation of C++ data structures to mirror the database schema. + +If you are building your own MySQL++-based programs, you also need +to install the -devel package. %package devel Summary: MySQL++ developer files (headers, examples, etc.) @@ -26,23 +29,28 @@ Requires: mysql-devel %description devel -These are the files needed to compile MySQL++ based programs, plus -some sample code to get you started. If you aren't building your own -programs, you probably don't need to install this package. +These are the files needed to compile MySQL++ based programs, +plus some sample code to get you started.You probably need to +install the -manuals package. + +If you aren't building your own programs, you probably don't need +to install this package. %package manuals Summary: MySQL++ user and reference manuals Group: Development/Libraries +Requires: devhelp %description manuals This is the MySQL++ documentation. It's a separate RPM just because it's so large, and it doesn't change with every release. +User Manual and Reference Manual are provided both in PDF and in +HTML format. You can use devhelp to browse it. + %prep %setup -q -%patch0 -p0 -b .gcc43 - %build %configure --with-mysql-lib=%{_libdir}/mysql \ --enable-thread-check \ @@ -73,6 +81,12 @@ -e '/^all:/s/test_[a-z,_]* //g' \ Makefile.simple > doc/examples/Makefile +# DevHelp stuff +%{__mkdir_p} %{buildroot}%{_datadir}/devhelp/books/%{name} +%{__install} -m644 %{SOURCE1} %{buildroot}%{_datadir}/devhelp/books/%{name}/%{name}.devhelp +%{__cp} -r doc/html/userman %{buildroot}%{_datadir}/devhelp/books/%{name}/userman +%{__cp} -r doc/html/refman %{buildroot}%{_datadir}/devhelp/books/%{name}/refman + %clean rm -rf %{buildroot} doc/examples @@ -93,9 +107,14 @@ %files manuals %defattr(-,root,root,-) -%doc doc/pdf doc/html doc/README-manuals-RPM.txt +%doc doc/pdf/* doc/README-manuals-RPM.txt +%{_datadir}/devhelp/books/%{name} %changelog +* Sat Mar 1 2008 Remi Collet 3.0.0-1 +- update to 3.0.0 Finale +- use devhelp to browse manuals + * Wed Feb 20 2008 Remi Collet 3.0.0-0.1.rc5 - update to 3.0.0 rc5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mysql++/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Feb 2008 20:38:14 -0000 1.6 +++ sources 1 Mar 2008 10:30:34 -0000 1.7 @@ -1 +1 @@ -3f0630ccdd888c7b2a6712518d728bbf mysql++-3.0.0-rc5.tar.gz +aa84cca868e1123ec53e9c977f1b6646 mysql++-3.0.0.tar.gz --- mysql++3rc5-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 1 10:35:31 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 10:35:31 GMT Subject: rpms/freetennis/devel freetennis.spec,1.6,1.7 Message-ID: <200803011035.m21AZVUU002030@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/freetennis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2010 Modified Files: freetennis.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones 0.4.8-10 - Rebuild for ppc64. Index: freetennis.spec =================================================================== RCS file: /cvs/pkgs/rpms/freetennis/devel/freetennis.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- freetennis.spec 13 Feb 2008 14:18:22 -0000 1.6 +++ freetennis.spec 1 Mar 2008 10:34:57 -0000 1.7 @@ -3,7 +3,7 @@ Name: freetennis Version: 0.4.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tennis simulation game Group: Amusements/Games @@ -15,11 +15,8 @@ Patch0: freetennis-0.4.8-pathfixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Excluding on ppc64 due to missing dependencies (Bug #239521) -ExcludeArch: ppc64 - -BuildRequires: ocaml SDL_gfx-devel SDL_mixer-devel gdk-pixbuf-devel -BuildRequires: lablgtk libXmu-devel gtk2-devel desktop-file-utils +BuildRequires: ocaml, SDL_gfx-devel, SDL_mixer-devel, gdk-pixbuf-devel +BuildRequires: lablgtk, libXmu-devel, gtk2-devel, desktop-file-utils BuildRequires: SDL_ttf-devel BuildRequires: ocaml-camlimages-devel BuildRequires: ocaml-SDL-devel >= 0.7.2-8 @@ -82,6 +79,9 @@ %{_datadir}/icons/hicolor/48x48/apps/freetennis.png %changelog +* Sat Mar 1 2008 Richard W.M. Jones 0.4.8-10 +- Rebuild for ppc64. + * Wed Feb 13 2008 Richard W.M. Jones 0.4.8-9 - Missing BR ocaml-lablgl-devel and ocaml-lablgtk-devel From fedora-extras-commits at redhat.com Sat Mar 1 11:29:49 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 1 Mar 2008 11:29:49 GMT Subject: rpms/nntpgrab/F-8 nntpgrab-0.2-gtk-2-12-7-fix.patch, NONE, 1.1 nntpgrab.spec, 1.4, 1.5 Message-ID: <200803011129.m21BTnIN010060@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10012/F-8 Modified Files: nntpgrab.spec Added Files: nntpgrab-0.2-gtk-2-12-7-fix.patch Log Message: The program would always crash with GTK 2.12.7 or higher. Added a patch to avoid this crash (GNOME BZ #514162) nntpgrab-0.2-gtk-2-12-7-fix.patch: --- NEW FILE nntpgrab-0.2-gtk-2-12-7-fix.patch --- --- nntpgrab-0.2.3/client/gui/nntpgrab_gui.ui.orig 2008-03-01 12:20:40.596982800 +0100 +++ nntpgrab-0.2.3/client/gui/nntpgrab_gui.ui 2008-03-01 12:20:58.431981990 +0100 @@ -319,7 +319,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/nntpgrab.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nntpgrab.spec 5 Feb 2008 17:02:11 -0000 1.4 +++ nntpgrab.spec 1 Mar 2008 11:29:13 -0000 1.5 @@ -1,11 +1,12 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab Version: 0.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Internet Source: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 Patch0: nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch +Patch1: nntpgrab-0.2-gtk-2-12-7-fix.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -78,6 +79,7 @@ %prep %setup -q %patch0 -p2 +%patch1 -p1 %build %configure @@ -145,6 +147,10 @@ %{_libdir}/pkgconfig/nntpgrab.pc %changelog +* Sat Mar 1 2008 Erik van Pienbroek - 0.2.3-2 +- The program would always crash with GTK 2.12.7 or higher. + Added a patch to avoid this crash (GNOME BZ #514162) + * Tue Feb 5 2008 Erik van Pienbroek - 0.2.3-1 - Update to 0.2.3. Fixes regression in 0.2.2 - Added a patch to fix an off-by-one error From fedora-extras-commits at redhat.com Sat Mar 1 11:29:56 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 1 Mar 2008 11:29:56 GMT Subject: rpms/nntpgrab/devel nntpgrab-0.2-gtk-2-12-7-fix.patch, NONE, 1.1 nntpgrab.spec, 1.4, 1.5 Message-ID: <200803011129.m21BTuke010063@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10012/devel Modified Files: nntpgrab.spec Added Files: nntpgrab-0.2-gtk-2-12-7-fix.patch Log Message: The program would always crash with GTK 2.12.7 or higher. Added a patch to avoid this crash (GNOME BZ #514162) nntpgrab-0.2-gtk-2-12-7-fix.patch: --- NEW FILE nntpgrab-0.2-gtk-2-12-7-fix.patch --- --- nntpgrab-0.2.3/client/gui/nntpgrab_gui.ui.orig 2008-03-01 12:20:40.596982800 +0100 +++ nntpgrab-0.2.3/client/gui/nntpgrab_gui.ui 2008-03-01 12:20:58.431981990 +0100 @@ -319,7 +319,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nntpgrab.spec 5 Feb 2008 17:02:17 -0000 1.4 +++ nntpgrab.spec 1 Mar 2008 11:29:19 -0000 1.5 @@ -1,11 +1,12 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab Version: 0.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Internet Source: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 Patch0: nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch +Patch1: nntpgrab-0.2-gtk-2-12-7-fix.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -78,6 +79,7 @@ %prep %setup -q %patch0 -p2 +%patch1 -p1 %build %configure @@ -145,6 +147,10 @@ %{_libdir}/pkgconfig/nntpgrab.pc %changelog +* Sat Mar 1 2008 Erik van Pienbroek - 0.2.3-2 +- The program would always crash with GTK 2.12.7 or higher. + Added a patch to avoid this crash (GNOME BZ #514162) + * Tue Feb 5 2008 Erik van Pienbroek - 0.2.3-1 - Update to 0.2.3. Fixes regression in 0.2.2 - Added a patch to fix an off-by-one error From fedora-extras-commits at redhat.com Sat Mar 1 11:34:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 11:34:48 +0000 Subject: [pkgdb] xterm: pertusus has requested watchbugzilla Message-ID: <200803011135.m21BZ7ad017980@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the watchbugzilla acl on xterm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Sat Mar 1 11:34:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 11:34:52 +0000 Subject: [pkgdb] xterm: pertusus has requested watchcommits Message-ID: <200803011135.m21BZAuR018000@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the watchcommits acl on xterm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Sat Mar 1 11:34:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 11:34:59 +0000 Subject: [pkgdb] xterm: pertusus has requested watchbugzilla Message-ID: <200803011135.m21BZFHN018024@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the watchbugzilla acl on xterm (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Sat Mar 1 11:34:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 11:34:59 +0000 Subject: [pkgdb] xterm: pertusus has requested watchcommits Message-ID: <200803011135.m21BZAuU018000@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the watchcommits acl on xterm (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Sat Mar 1 11:35:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 11:35:06 +0000 Subject: [pkgdb] xterm: pertusus has requested watchbugzilla Message-ID: <200803011135.m21BZFHQ018024@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the watchbugzilla acl on xterm (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Sat Mar 1 11:35:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 11:35:08 +0000 Subject: [pkgdb] xterm: pertusus has requested watchcommits Message-ID: <200803011135.m21BZFHT018024@bastion.fedora.phx.redhat.com> Patrice Dumas (pertusus) has requested the watchcommits acl on xterm (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Sat Mar 1 12:32:00 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 12:32:00 GMT Subject: rpms/ocaml-cil/devel ocaml-cil.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803011232.m21CW0Zn018531@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18508/devel Modified Files: .cvsignore sources Added Files: ocaml-cil.spec Log Message: Initial CVS import. --- NEW FILE ocaml-cil.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-cil Version: 1.3.6 Release: 4%{?dist} Summary: CIL - Infrastructure for C Program Analysis and Transformation Group: Development/Libraries License: BSD URL: http://cil.sourceforge.net/ Source0: http://hal.cs.berkeley.edu/cil/distrib/cil-1.3.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 ExcludeArch: ppc BuildRequires: ocaml, ocaml-findlib-devel, ocaml-ocamldoc %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description CIL (C Intermediate Language) is a high-level representation along with a set of tools that permit easy analysis and source-to-source transformation of C programs. CIL is both lower-level than abstract-syntax trees, by clarifying ambiguous constructs and removing redundant ones, and also higher-level than typical intermediate languages designed for compilation, by maintaining types and a close relationship with the source program. The main advantage of CIL is that it compiles all valid C programs into a few core constructs with a very clean semantics. Also CIL has a syntax-directed type system that makes it easy to analyze and manipulate C programs. Furthermore, the CIL front-end is able to process not only ANSI-C programs but also those using Microsoft C or GNU C extensions. If you do not use CIL and want instead to use just a C parser and analyze programs expressed as abstract-syntax trees then your analysis will have to handle a lot of ugly corners of the language (let alone the fact that parsing C itself is not a trivial task). In essence, CIL is a highly-structured, "clean" subset of C. CIL features a reduced number of syntactic and conceptual forms. For example, all looping constructs are reduced to a single form, all function bodies are given explicit return statements, syntactic sugar like "->" is eliminated and function arguments with array types become pointers. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %package doc Summary: Documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description doc The %{name}-doc package contains documentation for users of %{name}. %package cilly Summary: Support programs for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: perl >= 5.8 Provides: perl(CilConfig) = %{version} %description cilly The %{name}-cilly package contains the 'cilly' wrapper/replacement for gcc. %prep %setup -q -n cil ./configure --libdir=%{_libdir} %build make make quicktest cat > META < bin/CilConfig.pm < - 1.3.6-4 - ExcludeArch ppc - CIL doesn't build on PPC as it turns out. * Wed Nov 7 2007 Richard W.M. Jones - 1.3.6-3 - Change upstream URL. - perl(CilConfig) set to package version - Split out documentation into a separate -doc package. * Mon Aug 20 2007 Richard W.M. Jones - 1.3.6-2 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Feb 2008 17:03:55 -0000 1.1 +++ .cvsignore 1 Mar 2008 12:31:25 -0000 1.2 @@ -0,0 +1 @@ +cil-1.3.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Feb 2008 17:03:55 -0000 1.1 +++ sources 1 Mar 2008 12:31:25 -0000 1.2 @@ -0,0 +1 @@ +112dfbabdd0e1280800d62ba4449ab45 cil-1.3.6.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 12:38:18 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 12:38:18 GMT Subject: rpms/ocaml-cil/F-8 ocaml-cil.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803011238.m21CcIdH018691@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cil/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18661/F-8 Modified Files: .cvsignore sources Added Files: ocaml-cil.spec Log Message: Initial CVS import. --- NEW FILE ocaml-cil.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-cil Version: 1.3.6 Release: 4%{?dist} Summary: CIL - Infrastructure for C Program Analysis and Transformation Group: Development/Libraries License: BSD URL: http://cil.sourceforge.net/ Source0: http://hal.cs.berkeley.edu/cil/distrib/cil-1.3.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 ExcludeArch: ppc BuildRequires: ocaml, ocaml-findlib-devel, ocaml-ocamldoc %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description CIL (C Intermediate Language) is a high-level representation along with a set of tools that permit easy analysis and source-to-source transformation of C programs. CIL is both lower-level than abstract-syntax trees, by clarifying ambiguous constructs and removing redundant ones, and also higher-level than typical intermediate languages designed for compilation, by maintaining types and a close relationship with the source program. The main advantage of CIL is that it compiles all valid C programs into a few core constructs with a very clean semantics. Also CIL has a syntax-directed type system that makes it easy to analyze and manipulate C programs. Furthermore, the CIL front-end is able to process not only ANSI-C programs but also those using Microsoft C or GNU C extensions. If you do not use CIL and want instead to use just a C parser and analyze programs expressed as abstract-syntax trees then your analysis will have to handle a lot of ugly corners of the language (let alone the fact that parsing C itself is not a trivial task). In essence, CIL is a highly-structured, "clean" subset of C. CIL features a reduced number of syntactic and conceptual forms. For example, all looping constructs are reduced to a single form, all function bodies are given explicit return statements, syntactic sugar like "->" is eliminated and function arguments with array types become pointers. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %package doc Summary: Documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description doc The %{name}-doc package contains documentation for users of %{name}. %package cilly Summary: Support programs for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: perl >= 5.8 Provides: perl(CilConfig) = %{version} %description cilly The %{name}-cilly package contains the 'cilly' wrapper/replacement for gcc. %prep %setup -q -n cil ./configure --libdir=%{_libdir} %build make make quicktest cat > META < bin/CilConfig.pm < - 1.3.6-4 - ExcludeArch ppc - CIL doesn't build on PPC as it turns out. * Wed Nov 7 2007 Richard W.M. Jones - 1.3.6-3 - Change upstream URL. - perl(CilConfig) set to package version - Split out documentation into a separate -doc package. * Mon Aug 20 2007 Richard W.M. Jones - 1.3.6-2 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cil/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Feb 2008 17:03:55 -0000 1.1 +++ .cvsignore 1 Mar 2008 12:37:45 -0000 1.2 @@ -0,0 +1 @@ +cil-1.3.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cil/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Feb 2008 17:03:55 -0000 1.1 +++ sources 1 Mar 2008 12:37:45 -0000 1.2 @@ -0,0 +1 @@ +112dfbabdd0e1280800d62ba4449ab45 cil-1.3.6.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 12:48:46 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 1 Mar 2008 12:48:46 GMT Subject: rpms/xbae/devel xbae.spec,1.8,1.9 Message-ID: <200803011248.m21Cmk0q018856@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/xbae/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18838/devel Modified Files: xbae.spec Log Message: use __dist instead of __fedora Index: xbae.spec =================================================================== RCS file: /cvs/extras/rpms/xbae/devel/xbae.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xbae.spec 19 Feb 2008 18:33:35 -0000 1.8 +++ xbae.spec 1 Mar 2008 12:48:10 -0000 1.9 @@ -121,36 +121,36 @@ rm $RPM_BUILD_ROOT%{_libdir}/libXbae.la # prepare the main docs -# Use systematically __fedora_* to avoid directory name clash. -rm -rf __fedora_Xbae-docs -mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ __fedora_Xbae-docs +# Use systematically __dist_* to avoid directory name clash. +rm -rf __dist_Xbae-docs +mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ __dist_Xbae-docs # remove duplicate files already in %%doc -rm __fedora_Xbae-docs/README -rm __fedora_Xbae-docs/NEWS +rm __dist_Xbae-docs/README +rm __dist_Xbae-docs/NEWS # examples for builderXcessory are arch specific, this avoids clash of # doc files between arches -mv __fedora_Xbae-docs/examples/builderXcessory __fedora_Xbae-docs/examples/builderXcessory-%{_arch} +mv __dist_Xbae-docs/examples/builderXcessory __dist_Xbae-docs/examples/builderXcessory-%{_arch} # first clean examples -rm -rf __fedora_examples -cp -pr examples __fedora_examples -make -C __fedora_examples clean -find __fedora_examples -name '*akefile*' -exec rm {} \; -rm __fedora_examples/extest -rm __fedora_examples/testall +rm -rf __dist_examples +cp -pr examples __dist_examples +make -C __dist_examples clean +find __dist_examples -name '*akefile*' -exec rm {} \; +rm __dist_examples/extest +rm __dist_examples/testall # the builderXcessory directory is duplicated in the main doc and in the # example code. The master dir is considered to be in the main doc. # the README is better with the main examples doc, not in code examples -mv __fedora_examples/builderXcessory/README __fedora_Xbae-docs/examples/builderXcessory-%{_arch}/ +mv __dist_examples/builderXcessory/README __dist_Xbae-docs/examples/builderXcessory-%{_arch}/ # remove the duplicate dir and replace it with a link -rm -rf __fedora_examples/builderXcessory/ -ln -s ../examples/builderXcessory-%{_arch}/ __fedora_examples/builderXcessory-%{_arch} +rm -rf __dist_examples/builderXcessory/ +ln -s ../examples/builderXcessory-%{_arch}/ __dist_examples/builderXcessory-%{_arch} # then put the examples in a code_examples directory -rm -rf __fedora_code_examples -mkdir __fedora_code_examples -mv __fedora_examples __fedora_code_examples/code_examples +rm -rf __dist_code_examples +mkdir __dist_code_examples +mv __dist_examples __dist_code_examples/code_examples %clean @@ -169,7 +169,7 @@ %files devel %defattr(-,root,root,-) -%doc __fedora_Xbae-docs/* __fedora_code_examples/code_examples +%doc __dist_Xbae-docs/* __dist_code_examples/code_examples %{_includedir}/Xbae/ %{_libdir}/libXbae.so %{_mandir}/man*/Xbae* From fedora-extras-commits at redhat.com Sat Mar 1 12:50:39 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 1 Mar 2008 12:50:39 GMT Subject: rpms/perl-HTML-FormatText-WithLinks/devel perl-HTML-FormatText-WithLinks.spec, 1.5, 1.6 Message-ID: <200803011250.m21CodIe018905@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/perl-HTML-FormatText-WithLinks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18887 Modified Files: perl-HTML-FormatText-WithLinks.spec Log Message: fix license field Index: perl-HTML-FormatText-WithLinks.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-FormatText-WithLinks/devel/perl-HTML-FormatText-WithLinks.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-HTML-FormatText-WithLinks.spec 8 Aug 2007 09:51:40 -0000 1.5 +++ perl-HTML-FormatText-WithLinks.spec 1 Mar 2008 12:50:04 -0000 1.6 @@ -4,7 +4,7 @@ Summary: HTML to text conversion with links as footnotes Group: Development/Libraries -License: Artistic or GPL +License: Artistic or GPL+ URL: http://search.cpan.org/dist/HTML-FormatText-WithLinks Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Sat Mar 1 12:54:09 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 1 Mar 2008 12:54:09 GMT Subject: rpms/libnet/devel libnet.spec,1.11,1.12 Message-ID: <200803011254.m21Cs93l018991@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18958 Modified Files: libnet.spec Log Message: change __fedora to __dist Index: libnet.spec =================================================================== RCS file: /cvs/extras/rpms/libnet/devel/libnet.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libnet.spec 19 Feb 2008 18:22:11 -0000 1.11 +++ libnet.spec 1 Mar 2008 12:53:25 -0000 1.12 @@ -46,9 +46,9 @@ %build # keep the sample directory untouched by make -rm -rf __fedora_sample -mkdir __fedora_sample -cp -a sample __fedora_sample +rm -rf __dist_sample +mkdir __dist_sample +cp -a sample __dist_sample export CFLAGS="%{optflags} -fPIC" %configure --disable-dependency-tracking @@ -64,9 +64,9 @@ install -p -m0644 doc/man/man3/libnet*.3 %{buildroot}%{_mandir}/man3/ # prepare samples directory -rm -rf __fedora_sample/sample/win32 -rm __fedora_sample/sample/Makefile.in -sed -i -e 's:#include "../include/libnet.h":#include :' __fedora_sample/sample/libnet_test.h +rm -rf __dist_sample/sample/win32 +rm __dist_sample/sample/Makefile.in +sed -i -e 's:#include "../include/libnet.h":#include :' __dist_sample/sample/libnet_test.h %clean rm -rf %{buildroot} @@ -77,7 +77,7 @@ %doc README VERSION %doc doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING doc/DESIGN_NOTES %doc doc/MIGRATION doc/PACKET_BUILDING doc/PORTED doc/RAWSOCKET_NON_SEQUITUR -%doc doc/TODO doc/html/ __fedora_sample/sample/ +%doc doc/TODO doc/html/ __dist_sample/sample/ %{_bindir}/libnet-config %{_includedir}/libnet/ From fedora-extras-commits at redhat.com Sat Mar 1 12:54:48 2008 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sat, 1 Mar 2008 12:54:48 GMT Subject: rpms/python-tgfastdata/devel python-tgfastdata.spec,1.3,1.4 Message-ID: <200803011254.m21CsmJ7019033@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/python-tgfastdata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18995 Modified Files: python-tgfastdata.spec Log Message: * Sat Mar 1 2008 Ralf Ertzinger - 0.9a6-7 - BuildRequire: python-devel (fixes BZ434717) Index: python-tgfastdata.spec =================================================================== RCS file: /cvs/extras/rpms/python-tgfastdata/devel/python-tgfastdata.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-tgfastdata.spec 9 Dec 2006 17:43:30 -0000 1.3 +++ python-tgfastdata.spec 1 Mar 2008 12:54:12 -0000 1.4 @@ -5,7 +5,7 @@ Name: python-tgfastdata Version: 0.9a6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Automatic user interface generation for TurboGears Group: Development/Languages @@ -15,6 +15,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: python-devel + %description FastData is an extension to TurboGears which can provide automatic user @@ -49,6 +51,9 @@ %{python_sitelib}/TGFastData-%{version}-py%{pyver}.egg-info %changelog +* Sat Mar 1 2008 Ralf Ertzinger - 0.9a6-7 +- BuildRequire: python-devel (fixes BZ434717) + * Sat Dec 9 2006 Luke Macken - 0.9a6-6 - Rebuild for new python From fedora-extras-commits at redhat.com Sat Mar 1 12:55:17 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Sat, 1 Mar 2008 12:55:17 GMT Subject: rpms/texlive-texmf/devel texlive-texmf.spec,1.17,1.18 Message-ID: <200803011255.m21CtHYR019052@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/texlive-texmf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19018 Modified Files: texlive-texmf.spec Log Message: - add missing post/postun scriptlets for texlive-texmf-latex - require tex-preview Index: texlive-texmf.spec =================================================================== RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive-texmf.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- texlive-texmf.spec 1 Mar 2008 09:23:29 -0000 1.17 +++ texlive-texmf.spec 1 Mar 2008 12:54:44 -0000 1.18 @@ -62,6 +62,7 @@ BuildRequires: sed >= 3.95 ghostscript lzma Requires: texlive-texmf-errata = %{version} +Requires: tex-preview BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -435,6 +436,9 @@ [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : fi +%post latex +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : + %post doc [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : @@ -462,6 +466,9 @@ %postun fonts [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : +%postun latex +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : + %postun doc [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : @@ -648,6 +655,8 @@ %changelog * Sat Mar 01 2008 Jindrich Novy - 2007-15 - require texlive-texmf in texlive-texmf-fonts (#431255) +- add missing post/postun scriptlets for texlive-texmf-latex +- require tex-preview * Thu Feb 28 2008 Jindrich Novy - 2007-14 - rename texlive-texmf-japanese to texlive-texmf-east-asian From fedora-extras-commits at redhat.com Sat Mar 1 13:05:13 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Sat, 1 Mar 2008 13:05:13 GMT Subject: rpms/texlive/devel texlive.spec,1.27,1.28 Message-ID: <200803011305.m21D5Dxp026326@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/texlive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26299 Modified Files: texlive.spec Log Message: * Sat Mar 01 2008 Jindrich Novy - 2007-21 - require texlive-utils in texlive-latex Index: texlive.spec =================================================================== RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- texlive.spec 29 Feb 2008 15:22:52 -0000 1.27 +++ texlive.spec 1 Mar 2008 13:04:40 -0000 1.28 @@ -27,7 +27,7 @@ Name: texlive Version: %{texlive_ver} -Release: 20%{?dist} +Release: 21%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -287,6 +287,7 @@ Provides: tetex-latex = 3.0-99 Requires: texlive-texmf-latex = %{version} Requires: texlive-texmf-errata = %{version} +Requires: texlive-utils = %{version} Provides: tex(latex) %description latex @@ -1224,6 +1225,9 @@ %{_mandir}/man1/texutil.1* %changelog +* Sat Mar 01 2008 Jindrich Novy - 2007-21 +- require texlive-utils in texlive-latex + * Thu Feb 28 2008 Jindrich Novy - 2007-20 - move mktexpk to texlive-utils (#435176) - rename texlive-japanese to texlive-east-asian From fedora-extras-commits at redhat.com Sat Mar 1 13:11:06 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 1 Mar 2008 13:11:06 GMT Subject: rpms/nco/devel .cvsignore, 1.6, 1.7 nco.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200803011311.m21DB6k6026455@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/nco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26431 Modified Files: .cvsignore nco.spec sources Log Message: * Sat Mar 1 2008 - Patrice Dumas - 3.9.3-1 - update to 3.9.3 - separate static sub-package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nco/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Aug 2007 23:00:07 -0000 1.6 +++ .cvsignore 1 Mar 2008 13:10:16 -0000 1.7 @@ -1 +1 @@ -nco-3.9.1.tar.bz2 +nco-3.9.3.tar.gz Index: nco.spec =================================================================== RCS file: /cvs/extras/rpms/nco/devel/nco.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nco.spec 19 Feb 2008 02:21:56 -0000 1.10 +++ nco.spec 1 Mar 2008 13:10:16 -0000 1.11 @@ -1,19 +1,19 @@ Name: nco -Version: 3.9.1 -Release: 2%{?dist} +Version: 3.9.3 +Release: 1%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering -License: GPL +License: GPLv3 URL: http://nco.sourceforge.net/ # The NCO web site now recommends CVS so the tar.gz was obtained # using the following recommended commands: # cvs -d:pserver:anonymous at nco.cvs.sourceforge.net:/cvsroot/nco login # cvs -z3 -d:pserver:anonymous at nco.cvs.sourceforge.net:/cvsroot/nco \ -# co -r nco-3_1_5 -d nco-%{version} nco +# co -r nco-3_9_3 -d nco-%{version} nco # tar -czf nco-%{version}.tar.gz ./nco-%{version} -Source0: nco-%{version}.tar.bz2 -Patch0: nco_install_C_headers.patch +Source0: nco-%{version}.tar.gz +Patch0: nco_install_C_headers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison, flex, gawk @@ -28,6 +28,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} +%package static +Summary: Static libraries for NCO +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + %description The netCDF Operators, NCO, are a suite of command line programs known as operators. The operators facilitate manipulation and analysis of @@ -44,7 +49,10 @@ http://nco.sourceforge.net/. %description devel -This package contains the NCO header files and static libs. +This package contains the NCO header and development files. + +%description static +This package contains the NCO static libs. %prep %setup -q @@ -56,35 +64,31 @@ automake --foreign autoconf export CPPFLAGS=-I%{_includedir}/netcdf-3 -export LDFLAGS=-L%{_libdir}/netcdf-3 export CFLAGS="$RPM_OPT_FLAGS -fPIC" export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC" %configure --disable-dependency-tracking --includedir=%{_includedir}/nco make %{?_smp_mflags} -unset CPPFLAGS LDFLAGS CFLAGS CXXFLAGS %install -rm -rf ${RPM_BUILD_ROOT} -mkdir ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/nco -make install DESTDIR=${RPM_BUILD_ROOT} -rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la -rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir -rm -f ${RPM_BUILD_ROOT}%{_bindir}/mpnc* +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_includedir}/nco +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_infodir}/dir %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/install-info %{_infodir}/nco.info.gz \ +/sbin/install-info %{_infodir}/nco.info \ %{_infodir}/dir 2>/dev/null || : %postun /sbin/ldconfig if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/nco.info.gz \ + /sbin/install-info --delete %{_infodir}/nco.info \ %{_infodir}/dir 2>/dev/null || : fi @@ -99,14 +103,17 @@ %files devel %defattr(-,root,root,-) %{_includedir}/nco -%{_libdir}/libnco*.a %{_libdir}/libnco.so %{_libdir}/libnco_c++.so +%files static +%defattr(-,root,root,-) +%{_libdir}/libnco*.a %changelog -* Mon Feb 18 2008 Fedora Release Engineering - 3.9.1-2 -- Autorebuild for GCC 4.3 +* Sat Mar 1 2008 - Patrice Dumas - 3.9.3-1 +- update to 3.9.3 +- separate static sub-package * Mon Aug 27 2007 - Orion Poplawski - 3.9.1-1 - Update to 3.9.1 @@ -179,10 +186,10 @@ - updated to ver 2.9.8 * Sat Jul 17 2004 Ed Hill - 0:2.9.7-0.fdr.2 -- removed unneeded %ifarch +- removed unneeded %%ifarch * Sat Jul 17 2004 Ed Hill - 0:2.9.7-0.fdr.1 -- Add %post,%postun +- Add %%post,%%postun * Sat Jul 17 2004 Ed Hill - 0:2.9.7-0.fdr.0 - Initial working version Index: sources =================================================================== RCS file: /cvs/extras/rpms/nco/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Aug 2007 23:00:07 -0000 1.6 +++ sources 1 Mar 2008 13:10:16 -0000 1.7 @@ -1 +1 @@ -62a02fcf375df85569dc720dbb500c7a nco-3.9.1.tar.bz2 +6fe6fdf29b6eeada59089ca7344ce460 nco-3.9.3.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 13:32:17 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Sat, 1 Mar 2008 13:32:17 GMT Subject: rpms/texlive/devel texlive.spec,1.28,1.29 Message-ID: <200803011332.m21DWHoR027053@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/texlive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26997 Modified Files: texlive.spec Log Message: - specify required version more properly for subpackages Index: texlive.spec =================================================================== RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- texlive.spec 1 Mar 2008 13:04:40 -0000 1.28 +++ texlive.spec 1 Mar 2008 13:31:41 -0000 1.29 @@ -287,7 +287,7 @@ Provides: tetex-latex = 3.0-99 Requires: texlive-texmf-latex = %{version} Requires: texlive-texmf-errata = %{version} -Requires: texlive-utils = %{version} +Requires: texlive-utils = %{version}-%{release} Provides: tex(latex) %description latex @@ -301,8 +301,8 @@ %package east-asian Summary: Support for East Asian languages in TeXLive Group: Applications/Publishing -Requires: texlive = %{version} -Requires: texlive-latex = %{version} +Requires: texlive = %{version}-%{release} +Requires: texlive-latex = %{version}-%{release} Requires: texlive-texmf-dvips = %{version} Requires: texlive-texmf-errata-east-asian = %{version} Obsoletes: texlive-japanese < 2007-20 @@ -317,7 +317,7 @@ %package context Summary: ConTeXt is a document preparation system based on TeX Group: Applications/Publishing -Requires: texlive = %{version} +Requires: texlive = %{version}-%{release} Requires: texlive-texmf-errata-context = %{version} Requires: ruby Provides: tex(context) From fedora-extras-commits at redhat.com Sat Mar 1 14:36:43 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Sat, 1 Mar 2008 14:36:43 GMT Subject: rpms/celestia/devel celestia-1.5.0-gcc43.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 celestia.desktop, 1.2, 1.3 celestia.spec, 1.23, 1.24 sources, 1.6, 1.7 celestia-1.4.0-compile.patch, 1.1, NONE celestia-1.4.1-lua51-resume.patch, 1.1, NONE celestia-1.4.1-lua51.patch, 1.1, NONE celestia-1.4.1-strictalias.patch, 1.1, NONE Message-ID: <200803011436.m21Eahwq003021@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/celestia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2985 Modified Files: .cvsignore celestia.desktop celestia.spec sources Added Files: celestia-1.5.0-gcc43.patch Removed Files: celestia-1.4.0-compile.patch celestia-1.4.1-lua51-resume.patch celestia-1.4.1-lua51.patch celestia-1.4.1-strictalias.patch Log Message: Upstream release 1.5.0 and dropping unnecessary patches celestia-1.5.0-gcc43.patch (#434441) Moving to education category (#220793) celestia-1.5.0-gcc43.patch: --- NEW FILE celestia-1.5.0-gcc43.patch --- Marek Mahut : Fix problems with compilation under gcc 4.3 diff -Naur celestia-1.5.0-upstream/src/buildstardb.cpp celestia-1.5.0/src/buildstardb.cpp --- celestia-1.5.0-upstream/src/buildstardb.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/buildstardb.cpp 2008-03-01 08:52:23.000000000 +0100 @@ -17,6 +17,7 @@ #include #include #include "celengine/stardb.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/asterism.cpp celestia-1.5.0/src/celengine/asterism.cpp --- celestia-1.5.0-upstream/src/celengine/asterism.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/asterism.cpp 2008-03-01 09:23:23.000000000 +0100 @@ -8,6 +8,7 @@ // of the License, or (at your option) any later version. #include +#include #ifndef _WIN32 #ifndef TARGET_OS_MAC diff -Naur celestia-1.5.0-upstream/src/celengine/astro.cpp celestia-1.5.0/src/celengine/astro.cpp --- celestia-1.5.0-upstream/src/celengine/astro.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/astro.cpp 2008-03-01 09:14:33.000000000 +0100 @@ -10,12 +10,14 @@ #include #include #include +#include #include #include #include #include "celestia.h" #include "astro.h" #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/body.cpp celestia-1.5.0/src/celengine/body.cpp --- celestia-1.5.0-upstream/src/celengine/body.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/body.cpp 2008-03-01 09:34:10.000000000 +0100 @@ -14,6 +14,7 @@ #include #include #include +#include #include "mesh.h" #include "meshmanager.h" #include "body.h" diff -Naur celestia-1.5.0-upstream/src/celengine/cmdparser.cpp celestia-1.5.0/src/celengine/cmdparser.cpp --- celestia-1.5.0-upstream/src/celengine/cmdparser.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/cmdparser.cpp 2008-03-01 08:52:32.000000000 +0100 @@ -30,6 +30,7 @@ #include "astro.h" #include "cmdparser.h" #include "glcontext.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/console.cpp celestia-1.5.0/src/celengine/console.cpp --- celestia-1.5.0-upstream/src/celengine/console.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/console.cpp 2008-03-01 08:50:23.000000000 +0100 @@ -10,6 +10,7 @@ #include #include #include +#include #include "celutil/utf8.h" #include "gl.h" #include "vecgl.h" diff -Naur celestia-1.5.0-upstream/src/celengine/dds.cpp celestia-1.5.0/src/celengine/dds.cpp --- celestia-1.5.0-upstream/src/celengine/dds.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/dds.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -15,6 +15,7 @@ #include #include #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/dsodb.cpp celestia-1.5.0/src/celengine/dsodb.cpp --- celestia-1.5.0-upstream/src/celengine/dsodb.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/dsodb.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -32,6 +32,7 @@ #include #include #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/fragmentprog.cpp celestia-1.5.0/src/celengine/fragmentprog.cpp --- celestia-1.5.0-upstream/src/celengine/fragmentprog.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/fragmentprog.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -13,6 +13,7 @@ #include "gl.h" #include "glext.h" #include "fragmentprog.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/galaxy.cpp celestia-1.5.0/src/celengine/galaxy.cpp --- celestia-1.5.0-upstream/src/celengine/galaxy.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/galaxy.cpp 2008-03-01 11:52:10.000000000 +0100 @@ -23,6 +23,8 @@ #include "vecgl.h" #include "render.h" #include "texture.h" +#include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/glcontext.cpp celestia-1.5.0/src/celengine/glcontext.cpp --- celestia-1.5.0-upstream/src/celengine/glcontext.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/glcontext.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -12,6 +12,7 @@ #include "gl.h" #include "glext.h" #include "glcontext.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/glext.cpp celestia-1.5.0/src/celengine/glext.cpp --- celestia-1.5.0-upstream/src/celengine/glext.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/glext.cpp 2008-03-01 08:52:56.000000000 +0100 @@ -8,6 +8,7 @@ // of the License, or (at your option) any later version. #include +#include #include "gl.h" #ifndef _WIN32 @@ -19,6 +20,7 @@ #endif /* ! _WIN32 */ #include "glext.h" +#include // ARB_texture_compression glx::PFNGLCOMPRESSEDTEXIMAGE3DARBPROC glx::glCompressedTexImage3DARB; diff -Naur celestia-1.5.0-upstream/src/celengine/image.cpp celestia-1.5.0/src/celengine/image.cpp --- celestia-1.5.0-upstream/src/celengine/image.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/image.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -66,6 +66,7 @@ #include #include #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/location.cpp celestia-1.5.0/src/celengine/location.cpp --- celestia-1.5.0-upstream/src/celengine/location.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/location.cpp 2008-03-01 09:34:18.000000000 +0100 @@ -11,6 +11,7 @@ #include #include #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/lodspheremesh.cpp celestia-1.5.0/src/celengine/lodspheremesh.cpp --- celestia-1.5.0-upstream/src/celengine/lodspheremesh.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/lodspheremesh.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -17,6 +17,7 @@ #include "glext.h" #include "vecgl.h" #include "lodspheremesh.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/marker.cpp celestia-1.5.0/src/celengine/marker.cpp --- celestia-1.5.0-upstream/src/celengine/marker.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/marker.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -9,6 +9,7 @@ #include "marker.h" #include "gl.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/mesh.cpp celestia-1.5.0/src/celengine/mesh.cpp --- celestia-1.5.0-upstream/src/celengine/mesh.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/mesh.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -14,6 +14,7 @@ #include #include #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/meshmanager.cpp celestia-1.5.0/src/celengine/meshmanager.cpp --- celestia-1.5.0-upstream/src/celengine/meshmanager.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/meshmanager.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -26,6 +26,7 @@ #include "spheremesh.h" #include "texmanager.h" #include "meshmanager.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/modelfile.cpp celestia-1.5.0/src/celengine/modelfile.cpp --- celestia-1.5.0-upstream/src/celengine/modelfile.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/modelfile.cpp 2008-03-01 11:52:21.000000000 +0100 @@ -15,6 +15,8 @@ #include #include #include +#include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/nebula.cpp celestia-1.5.0/src/celengine/nebula.cpp --- celestia-1.5.0-upstream/src/celengine/nebula.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/nebula.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -21,6 +21,7 @@ #include "glext.h" #include "vecgl.h" #include "render.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/opencluster.cpp celestia-1.5.0/src/celengine/opencluster.cpp --- celestia-1.5.0-upstream/src/celengine/opencluster.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/opencluster.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -19,6 +19,7 @@ #include "gl.h" #include "vecgl.h" #include "render.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/overlay.cpp celestia-1.5.0/src/celengine/overlay.cpp --- celestia-1.5.0-upstream/src/celengine/overlay.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/overlay.cpp 2008-03-01 08:50:23.000000000 +0100 @@ -9,6 +9,7 @@ #include #include +#include #include #include "gl.h" #include "vecgl.h" diff -Naur celestia-1.5.0-upstream/src/celengine/parseobject.cpp celestia-1.5.0/src/celengine/parseobject.cpp --- celestia-1.5.0-upstream/src/celengine/parseobject.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/parseobject.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -21,6 +21,7 @@ #include "trajmanager.h" #include "rotationmanager.h" #include "universe.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/render.cpp celestia-1.5.0/src/celengine/render.cpp --- celestia-1.5.0-upstream/src/celengine/render.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/render.cpp 2008-03-01 08:53:29.000000000 +0100 @@ -11,6 +11,7 @@ #include #include #include +#include #ifndef _WIN32 #ifndef TARGET_OS_MAC diff -Naur celestia-1.5.0-upstream/src/celengine/rotationmanager.cpp celestia-1.5.0/src/celengine/rotationmanager.cpp --- celestia-1.5.0-upstream/src/celengine/rotationmanager.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/rotationmanager.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -14,6 +14,7 @@ #include #include "samporient.h" #include "rotationmanager.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/selection.cpp celestia-1.5.0/src/celengine/selection.cpp --- celestia-1.5.0-upstream/src/celengine/selection.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/selection.cpp 2008-03-01 09:34:25.000000000 +0100 @@ -8,6 +8,7 @@ // of the License, or (at your option) any later version. #include +#include #include "astro.h" #include "selection.h" diff -Naur celestia-1.5.0-upstream/src/celengine/shadermanager.cpp celestia-1.5.0/src/celengine/shadermanager.cpp --- celestia-1.5.0-upstream/src/celengine/shadermanager.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/shadermanager.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -15,6 +15,7 @@ #include #include #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/simulation.cpp celestia-1.5.0/src/celengine/simulation.cpp --- celestia-1.5.0-upstream/src/celengine/simulation.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/simulation.cpp 2008-03-01 09:34:28.000000000 +0100 @@ -11,6 +11,7 @@ // of the License, or (at your option) any later version. #include +#include #include "simulation.h" using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/solarsys.cpp celestia-1.5.0/src/celengine/solarsys.cpp --- celestia-1.5.0-upstream/src/celengine/solarsys.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/solarsys.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -30,6 +30,7 @@ #include "universe.h" #include "multitexture.h" #include "parseobject.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/solarsysxml.cpp celestia-1.5.0/src/celengine/solarsysxml.cpp --- celestia-1.5.0-upstream/src/celengine/solarsysxml.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/solarsysxml.cpp 2008-03-01 11:52:31.000000000 +0100 @@ -8,6 +8,8 @@ // of the License, or (at your option) any later version. #include +#include +#include #include #include @@ -20,6 +22,7 @@ #include "texmanager.h" #include "meshmanager.h" #include "solarsysxml.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/spiceinterface.cpp celestia-1.5.0/src/celengine/spiceinterface.cpp --- celestia-1.5.0-upstream/src/celengine/spiceinterface.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/spiceinterface.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -11,6 +11,7 @@ #include "SpiceUsr.h" #include "spiceinterface.h" +#include bool diff -Naur celestia-1.5.0-upstream/src/celengine/spiceorbit.cpp celestia-1.5.0/src/celengine/spiceorbit.cpp --- celestia-1.5.0-upstream/src/celengine/spiceorbit.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/spiceorbit.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -14,6 +14,7 @@ #include "SpiceUsr.h" #include "astro.h" #include "spiceorbit.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/stardb.cpp celestia-1.5.0/src/celengine/stardb.cpp --- celestia-1.5.0-upstream/src/celengine/stardb.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/stardb.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -24,6 +25,7 @@ #include "multitexture.h" #include "meshmanager.h" #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/texmanager.cpp celestia-1.5.0/src/celengine/texmanager.cpp --- celestia-1.5.0-upstream/src/celengine/texmanager.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/texmanager.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -13,6 +13,7 @@ #include #include "multitexture.h" #include "texmanager.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/texture.cpp celestia-1.5.0/src/celengine/texture.cpp --- celestia-1.5.0-upstream/src/celengine/texture.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/texture.cpp 2008-03-01 08:54:00.000000000 +0100 @@ -28,6 +28,7 @@ #include #include #include +#include #ifndef _WIN32 #ifndef TARGET_OS_MAC diff -Naur celestia-1.5.0-upstream/src/celengine/tokenizer.cpp celestia-1.5.0/src/celengine/tokenizer.cpp --- celestia-1.5.0-upstream/src/celengine/tokenizer.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/tokenizer.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -12,6 +12,7 @@ #include #include #include "tokenizer.h" +#include static bool issep(char c) diff -Naur celestia-1.5.0-upstream/src/celengine/trajmanager.cpp celestia-1.5.0/src/celengine/trajmanager.cpp --- celestia-1.5.0-upstream/src/celengine/trajmanager.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/trajmanager.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -15,6 +15,7 @@ #include #include "samporbit.h" #include "trajmanager.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/universe.cpp celestia-1.5.0/src/celengine/universe.cpp --- celestia-1.5.0-upstream/src/celengine/universe.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/universe.cpp 2008-03-01 09:34:33.000000000 +0100 @@ -13,6 +13,7 @@ #include #include #include +#include #include "astro.h" #include "3dsmesh.h" #include "meshmanager.h" diff -Naur celestia-1.5.0-upstream/src/celengine/vertexprog.cpp celestia-1.5.0/src/celengine/vertexprog.cpp --- celestia-1.5.0-upstream/src/celengine/vertexprog.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/vertexprog.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -14,6 +14,7 @@ #include "gl.h" #include "glext.h" #include "vertexprog.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celengine/virtualtex.cpp celestia-1.5.0/src/celengine/virtualtex.cpp --- celestia-1.5.0-upstream/src/celengine/virtualtex.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celengine/virtualtex.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -19,6 +19,7 @@ #include "virtualtex.h" #include "gl.h" #include "parser.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celestia/celestiacore.cpp celestia-1.5.0/src/celestia/celestiacore.cpp --- celestia-1.5.0-upstream/src/celestia/celestiacore.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/celestiacore.cpp 2008-03-01 08:54:18.000000000 +0100 @@ -43,6 +43,7 @@ #include #include #include "url.h" +#include #ifdef CELX #include diff -Naur celestia-1.5.0-upstream/src/celestia/celx.cpp celestia-1.5.0/src/celestia/celx.cpp --- celestia-1.5.0-upstream/src/celestia/celx.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/celx.cpp 2008-03-01 11:52:38.000000000 +0100 @@ -11,7 +11,9 @@ #include #include +#include #include +#include #include #include #include diff -Naur celestia-1.5.0-upstream/src/celestia/configfile.cpp celestia-1.5.0/src/celestia/configfile.cpp --- celestia-1.5.0-upstream/src/celestia/configfile.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/configfile.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -16,6 +16,7 @@ #include #include #include "configfile.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celestia/destination.cpp celestia-1.5.0/src/celestia/destination.cpp --- celestia-1.5.0-upstream/src/celestia/destination.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/destination.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -14,6 +14,7 @@ #include #include #include "destination.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celestia/eclipsefinder.cpp celestia-1.5.0/src/celestia/eclipsefinder.cpp --- celestia-1.5.0-upstream/src/celestia/eclipsefinder.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/eclipsefinder.cpp 2008-03-01 09:14:53.000000000 +0100 @@ -15,6 +15,7 @@ #include #include #include +#include #include "eclipsefinder.h" #include "celmath/mathlib.h" #include "celmath/ray.h" diff -Naur celestia-1.5.0-upstream/src/celestia/glutmain.cpp celestia-1.5.0/src/celestia/glutmain.cpp --- celestia-1.5.0-upstream/src/celestia/glutmain.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/glutmain.cpp 2008-03-01 08:55:18.000000000 +0100 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/actions.cpp celestia-1.5.0/src/celestia/gtk/actions.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/actions.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/actions.cpp 2008-03-01 08:55:33.000000000 +0100 @@ -15,6 +15,7 @@ #endif /* HAVE_CONFIG_H */ #include +#include #include #include diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/common.cpp celestia-1.5.0/src/celestia/gtk/common.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/common.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/common.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -20,6 +20,7 @@ #include #include "common.h" +#include /* Returns the offset of the timezone at date */ diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-eclipse.cpp celestia-1.5.0/src/celestia/gtk/dialog-eclipse.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/dialog-eclipse.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/dialog-eclipse.cpp 2008-03-01 08:51:48.000000000 +0100 @@ -18,6 +18,7 @@ #include "dialog-eclipse.h" #include "common.h" +#include /* Definitions: Callbacks */ diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-goto.cpp celestia-1.5.0/src/celestia/gtk/dialog-goto.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/dialog-goto.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/dialog-goto.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -18,6 +18,7 @@ #include "dialog-goto.h" #include "common.h" +#include /* Declarations: Callbacks */ diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-options.cpp celestia-1.5.0/src/celestia/gtk/dialog-options.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/dialog-options.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/dialog-options.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -17,6 +17,7 @@ #include "dialog-options.h" #include "common.h" #include "ui.h" +#include /* Definitions: Callbacks */ diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-solar.cpp celestia-1.5.0/src/celestia/gtk/dialog-solar.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/dialog-solar.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/dialog-solar.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -22,6 +22,7 @@ #include "dialog-solar.h" #include "actions.h" #include "common.h" +#include /* Declarations: Callbacks */ diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-star.cpp celestia-1.5.0/src/celestia/gtk/dialog-star.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/dialog-star.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/dialog-star.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -25,6 +25,7 @@ #include "dialog-star.h" #include "actions.h" #include "common.h" +#include /* Declarations: Callbacks */ diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-time.cpp celestia-1.5.0/src/celestia/gtk/dialog-time.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/dialog-time.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/dialog-time.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -18,6 +18,7 @@ #include "dialog-time.h" #include "common.h" +#include /* Declarations: Callbacks */ diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-tour.cpp celestia-1.5.0/src/celestia/gtk/dialog-tour.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/dialog-tour.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/dialog-tour.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -18,6 +18,7 @@ #include "dialog-tour.h" #include "common.h" +#include /* Declarations: Callbacks */ diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/main.cpp celestia-1.5.0/src/celestia/gtk/main.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/main.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/main.cpp 2008-03-01 08:56:03.000000000 +0100 @@ -19,6 +19,7 @@ #include #include #include +#include #include #ifdef WIN32 diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/menu-context.cpp celestia-1.5.0/src/celestia/gtk/menu-context.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/menu-context.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/menu-context.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -20,6 +20,7 @@ #include "menu-context.h" #include "actions.h" #include "common.h" +#include /* Definitions: Callbacks */ diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/settings-file.cpp celestia-1.5.0/src/celestia/gtk/settings-file.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/settings-file.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/settings-file.cpp 2008-03-01 09:34:40.000000000 +0100 @@ -11,6 +11,7 @@ */ #include +#include #include #include diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/settings-gconf.cpp celestia-1.5.0/src/celestia/gtk/settings-gconf.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/settings-gconf.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/settings-gconf.cpp 2008-03-01 09:34:44.000000000 +0100 @@ -12,6 +12,7 @@ #include #include +#include #include #include diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/splash.cpp celestia-1.5.0/src/celestia/gtk/splash.cpp --- celestia-1.5.0-upstream/src/celestia/gtk/splash.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/gtk/splash.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -22,6 +22,7 @@ #include "splash.h" #include "common.h" +#include /* Declarations */ diff -Naur celestia-1.5.0-upstream/src/celestia/kde/celestialbrowser.cpp celestia-1.5.0/src/celestia/kde/celestialbrowser.cpp --- celestia-1.5.0-upstream/src/celestia/kde/celestialbrowser.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/celestialbrowser.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -16,6 +16,7 @@ #include "cellistviewitem.h" #include "selectionpopup.h" #include "celutil/utf8.h" +#include /* * Constructs a CelestialBrowser which is a child of 'parent', with the diff -Naur celestia-1.5.0-upstream/src/celestia/kde/celsplashscreen.cpp celestia-1.5.0/src/celestia/kde/celsplashscreen.cpp --- celestia-1.5.0-upstream/src/celestia/kde/celsplashscreen.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/celsplashscreen.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -22,6 +22,7 @@ #include #include #include +#include CelSplashScreen::CelSplashScreen(const QString& filename, QWidget* _parent): QWidget(0, 0, WStyle_Customize | WX11BypassWM), diff -Naur celestia-1.5.0-upstream/src/celestia/kde/eclipsefinderdlg.cpp celestia-1.5.0/src/celestia/kde/eclipsefinderdlg.cpp --- celestia-1.5.0-upstream/src/celestia/kde/eclipsefinderdlg.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/eclipsefinderdlg.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -11,6 +11,7 @@ #include "celestiacore.h" #include "celengine/astro.h" #include "eclipsefinder.h" +#include /* * Constructs a EclipseFinder which is a child of 'parent', with the diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmanager.cpp celestia-1.5.0/src/celestia/kde/kcelbookmarkmanager.cpp --- celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmanager.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/kcelbookmarkmanager.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -19,6 +19,7 @@ #include #include #include "kcelbookmarkmanager.h" +#include KBookmarkManager* KCelBookmarkManager::self() { if ( !s_bookmarkManager ) diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmenu.cpp celestia-1.5.0/src/celestia/kde/kcelbookmarkmenu.cpp --- celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmenu.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/kcelbookmarkmenu.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -45,6 +45,7 @@ #include #include #include +#include template class QPtrList; diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdeapp.cpp celestia-1.5.0/src/celestia/kde/kdeapp.cpp --- celestia-1.5.0-upstream/src/celestia/kde/kdeapp.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/kdeapp.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -87,6 +87,7 @@ #endif #include "celengine/glext.h" +#include #define MENUMAXSIZE 100 diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdeglwidget.cpp celestia-1.5.0/src/celestia/kde/kdeglwidget.cpp --- celestia-1.5.0-upstream/src/celestia/kde/kdeglwidget.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/kdeglwidget.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -48,6 +48,7 @@ #include #include +#include KdeGlWidget::KdeGlWidget( QWidget* parent, const char* name, CelestiaCore* core) : QGLWidget( parent, name ) diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdemain.cpp celestia-1.5.0/src/celestia/kde/kdemain.cpp --- celestia-1.5.0-upstream/src/celestia/kde/kdemain.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/kdemain.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -20,6 +20,7 @@ #include #include "kdeuniquecelestia.h" +#include static const char *description = I18N_NOOP("Celestia"); diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdepreferencesdialog.cpp celestia-1.5.0/src/celestia/kde/kdepreferencesdialog.cpp --- celestia-1.5.0-upstream/src/celestia/kde/kdepreferencesdialog.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/kdepreferencesdialog.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -40,6 +40,7 @@ #include "celengine/render.h" #include "celengine/glcontext.h" #include "celengine/astro.h" +#include static uint32 FilterOtherLocations = ~(Location::City | Location::Observatory | diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdeuniquecelestia.cpp celestia-1.5.0/src/celestia/kde/kdeuniquecelestia.cpp --- celestia-1.5.0-upstream/src/celestia/kde/kdeuniquecelestia.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/kdeuniquecelestia.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -21,6 +21,7 @@ #include #include #include +#include KdeUniqueCelestia::KdeUniqueCelestia() { diff -Naur celestia-1.5.0-upstream/src/celestia/kde/selectionpopup.cpp celestia-1.5.0/src/celestia/kde/selectionpopup.cpp --- celestia-1.5.0-upstream/src/celestia/kde/selectionpopup.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/selectionpopup.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -29,6 +29,7 @@ #include #include "celutil/utf8.h" +#include SelectionPopup::SelectionPopup(QWidget* parent, CelestiaCore* _appCore, Selection _sel): KPopupMenu(parent), diff -Naur celestia-1.5.0-upstream/src/celestia/kde/videocapturedlg.cpp celestia-1.5.0/src/celestia/kde/videocapturedlg.cpp --- celestia-1.5.0-upstream/src/celestia/kde/videocapturedlg.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/kde/videocapturedlg.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -36,6 +36,7 @@ #include #include #include "kdeapp.h" +#include VideoCaptureDlg::VideoCaptureDlg(QWidget* p, const QString &dir): accepted(false) diff -Naur celestia-1.5.0-upstream/src/celestia/oggtheoracapture.cpp celestia-1.5.0/src/celestia/oggtheoracapture.cpp --- celestia-1.5.0-upstream/src/celestia/oggtheoracapture.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/oggtheoracapture.cpp 2008-03-01 09:15:02.000000000 +0100 @@ -66,11 +66,13 @@ #include #include "../celengine/gl.h" #include +#include #include "theora/theora.h" using namespace std; #include "oggtheoracapture.h" +#include // {"video-rate-target",required_argument,NULL,'V'}, // {"video-quality",required_argument,NULL,'v'}, diff -Naur celestia-1.5.0-upstream/src/celestia/scriptmenu.cpp celestia-1.5.0/src/celestia/scriptmenu.cpp --- celestia-1.5.0-upstream/src/celestia/scriptmenu.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/scriptmenu.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -13,6 +13,7 @@ #include "celutil/directory.h" #include "celutil/filetype.h" #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celestia/url.cpp celestia-1.5.0/src/celestia/url.cpp --- celestia-1.5.0-upstream/src/celestia/url.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/url.cpp 2008-03-01 11:52:48.000000000 +0100 @@ -16,10 +16,12 @@ ***************************************************************************/ #include +#include #include #include "celestiacore.h" #include "celengine/astro.h" #include "url.h" +#include static const unsigned int CurrentCelestiaURLVersion = 2; diff -Naur celestia-1.5.0-upstream/src/celestia/wglext.cpp celestia-1.5.0/src/celestia/wglext.cpp --- celestia-1.5.0-upstream/src/celestia/wglext.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/wglext.cpp 2008-03-01 11:52:52.000000000 +0100 @@ -14,7 +14,10 @@ #include "wglext.h" #include #include +#include +#include #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celestia/winbookmarks.cpp celestia-1.5.0/src/celestia/winbookmarks.cpp --- celestia-1.5.0-upstream/src/celestia/winbookmarks.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/winbookmarks.cpp 2008-03-01 11:52:58.000000000 +0100 @@ -13,6 +13,7 @@ #include "res/resource.h" #include #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celestia/windatepicker.cpp celestia-1.5.0/src/celestia/windatepicker.cpp --- celestia-1.5.0-upstream/src/celestia/windatepicker.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/windatepicker.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -11,10 +11,12 @@ #include #include +#include #include "celutil/basictypes.h" #include "celengine/astro.h" #include "celutil/util.h" #include "celutil/winutil.h" +#include // DatePicker is a Win32 control for setting the date. It replaces the diff -Naur celestia-1.5.0-upstream/src/celestia/wineclipses.cpp celestia-1.5.0/src/celestia/wineclipses.cpp --- celestia-1.5.0-upstream/src/celestia/wineclipses.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/wineclipses.cpp 2008-03-01 11:53:02.000000000 +0100 @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -23,6 +24,7 @@ #include "celmath/distance.h" #include "celutil/util.h" #include "celutil/winutil.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celestia/winhyperlinks.cpp celestia-1.5.0/src/celestia/winhyperlinks.cpp --- celestia-1.5.0-upstream/src/celestia/winhyperlinks.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/winhyperlinks.cpp 2008-03-01 08:50:24.000000000 +0100 @@ -9,6 +9,7 @@ // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. +#include #include "winhyperlinks.h" #include "res/resource.h" diff -Naur celestia-1.5.0-upstream/src/celestia/winmain.cpp celestia-1.5.0/src/celestia/winmain.cpp --- celestia-1.5.0-upstream/src/celestia/winmain.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/winmain.cpp 2008-03-01 11:53:07.000000000 +0100 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -59,6 +60,7 @@ #include "wglext.h" #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celestia/winsplash.cpp celestia-1.5.0/src/celestia/winsplash.cpp --- celestia-1.5.0-upstream/src/celestia/winsplash.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/winsplash.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -15,6 +15,7 @@ #include #include "res/resource.h" #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celestia/winstarbrowser.cpp celestia-1.5.0/src/celestia/winstarbrowser.cpp --- celestia-1.5.0-upstream/src/celestia/winstarbrowser.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/winstarbrowser.cpp 2008-03-01 11:53:13.000000000 +0100 @@ -15,10 +15,12 @@ #include #include #include +#include #include "winstarbrowser.h" #include "celutil/winutil.h" #include "res/resource.h" +#include extern void SetMouseCursor(LPCTSTR lpCursor); diff -Naur celestia-1.5.0-upstream/src/celestia/wintime.cpp celestia-1.5.0/src/celestia/wintime.cpp --- celestia-1.5.0-upstream/src/celestia/wintime.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celestia/wintime.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -18,6 +18,7 @@ #include #include "celutil/util.h" #include "celutil/winutil.h" +#include diff -Naur celestia-1.5.0-upstream/src/celmath/quaternion.h celestia-1.5.0/src/celmath/quaternion.h --- celestia-1.5.0-upstream/src/celmath/quaternion.h 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celmath/quaternion.h 2008-03-01 12:30:07.000000000 +0100 @@ -16,7 +16,6 @@ #include #include - template class Quaternion { public: diff -Naur celestia-1.5.0-upstream/src/celutil/bigfix.cpp celestia-1.5.0/src/celutil/bigfix.cpp --- celestia-1.5.0-upstream/src/celutil/bigfix.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celutil/bigfix.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -10,6 +10,7 @@ #include #include #include "bigfix.h" +#include /*** Constructors ***/ diff -Naur celestia-1.5.0-upstream/src/celutil/color.cpp celestia-1.5.0/src/celutil/color.cpp --- celestia-1.5.0-upstream/src/celutil/color.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celutil/color.cpp 2008-03-01 11:53:16.000000000 +0100 @@ -9,6 +9,7 @@ #include #include +#include #include #include "color.h" diff -Naur celestia-1.5.0-upstream/src/celutil/directory.cpp celestia-1.5.0/src/celutil/directory.cpp --- celestia-1.5.0-upstream/src/celutil/directory.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celutil/directory.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -9,6 +9,7 @@ #include #include "directory.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celutil/filetype.cpp celestia-1.5.0/src/celutil/filetype.cpp --- celestia-1.5.0-upstream/src/celutil/filetype.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celutil/filetype.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -11,6 +11,7 @@ #include #include "util.h" #include "filetype.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celutil/formatnum.cpp celestia-1.5.0/src/celutil/formatnum.cpp --- celestia-1.5.0-upstream/src/celutil/formatnum.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celutil/formatnum.cpp 2008-03-01 08:50:23.000000000 +0100 @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include "formatnum.h" // HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf diff -Naur celestia-1.5.0-upstream/src/celutil/utf8.cpp celestia-1.5.0/src/celutil/utf8.cpp --- celestia-1.5.0-upstream/src/celutil/utf8.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celutil/utf8.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -9,7 +9,9 @@ #include "utf8.h" #include +#include #include "util.h" +#include unsigned int WGL4_Normalization_00[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, diff -Naur celestia-1.5.0-upstream/src/celutil/util.cpp celestia-1.5.0/src/celutil/util.cpp --- celestia-1.5.0-upstream/src/celutil/util.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celutil/util.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -12,6 +12,7 @@ #include "util.h" #include #include +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/celutil/util.h celestia-1.5.0/src/celutil/util.h --- celestia-1.5.0-upstream/src/celutil/util.h 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celutil/util.h 2008-03-01 11:49:36.000000000 +0100 @@ -22,11 +22,11 @@ switch(0){case 0: case pred:;} #ifndef min -#define min(a, b) ((a) < (b) ? (a) : (b)) +template bool min(T1 a, T2 b){ return a<(T1)b; } #endif #ifndef max -#define max(a, b) ((a) < (b) ? (b) : (a)) +template bool max(T1 a, T2 b){ return a<(T1)b; } #endif #ifdef _WIN32 diff -Naur celestia-1.5.0-upstream/src/celutil/windirectory.cpp celestia-1.5.0/src/celutil/windirectory.cpp --- celestia-1.5.0-upstream/src/celutil/windirectory.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/celutil/windirectory.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -10,6 +10,7 @@ #include #include #include "directory.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/packdb.cpp celestia-1.5.0/src/packdb.cpp --- celestia-1.5.0-upstream/src/packdb.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/packdb.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -10,6 +10,7 @@ #include #include #include +#include #define SPECTRAL_O 0 #define SPECTRAL_B 1 diff -Naur celestia-1.5.0-upstream/src/tools/atmosphere/scattersim.cpp celestia-1.5.0/src/tools/atmosphere/scattersim.cpp --- celestia-1.5.0-upstream/src/tools/atmosphere/scattersim.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/tools/atmosphere/scattersim.cpp 2008-03-01 11:53:23.000000000 +0100 @@ -11,7 +11,9 @@ #include #include #include +#include #include +#include #include #include #include diff -Naur celestia-1.5.0-upstream/src/tools/buildstardb.cpp celestia-1.5.0/src/tools/buildstardb.cpp --- celestia-1.5.0-upstream/src/tools/buildstardb.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/tools/buildstardb.cpp 2008-03-01 08:51:49.000000000 +0100 @@ -16,6 +16,7 @@ #include #include #include "stardb.h" +#include using namespace std; diff -Naur celestia-1.5.0-upstream/src/tools/cmod/cmodfix.cpp celestia-1.5.0/src/tools/cmod/cmodfix.cpp --- celestia-1.5.0-upstream/src/tools/cmod/cmodfix.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/tools/cmod/cmodfix.cpp 2008-03-01 11:53:27.000000000 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #ifdef TRISTRIP diff -Naur celestia-1.5.0-upstream/src/tools/cmod/xtocmod.cpp celestia-1.5.0/src/tools/cmod/xtocmod.cpp --- celestia-1.5.0-upstream/src/tools/cmod/xtocmod.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/tools/cmod/xtocmod.cpp 2008-03-01 11:53:31.000000000 +0100 @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff -Naur celestia-1.5.0-upstream/src/tools/stardb/makestardb.cpp celestia-1.5.0/src/tools/stardb/makestardb.cpp --- celestia-1.5.0-upstream/src/tools/stardb/makestardb.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/tools/stardb/makestardb.cpp 2008-03-01 11:53:34.000000000 +0100 @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff -Naur celestia-1.5.0-upstream/src/tools/stardb/startextdump.cpp celestia-1.5.0/src/tools/stardb/startextdump.cpp --- celestia-1.5.0-upstream/src/tools/stardb/startextdump.cpp 2008-03-01 12:51:20.000000000 +0100 +++ celestia-1.5.0/src/tools/stardb/startextdump.cpp 2008-03-01 11:53:40.000000000 +0100 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/celestia/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 Apr 2006 23:40:43 -0000 1.6 +++ .cvsignore 1 Mar 2008 14:36:07 -0000 1.7 @@ -1 +1 @@ -celestia-1.4.1.tar.gz +celestia-1.5.0.tar.gz Index: celestia.desktop =================================================================== RCS file: /cvs/pkgs/rpms/celestia/devel/celestia.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- celestia.desktop 8 Nov 2004 04:09:26 -0000 1.2 +++ celestia.desktop 1 Mar 2008 14:36:07 -0000 1.3 @@ -2,7 +2,7 @@ Name=Celestia space simulator GenericName=Space simulator Comment=A real-time space simulator -Categories=Application;Astronomy;Science;Graphics; +Categories=Application;Astronomy;Science;Education Icon=celestia.png Exec=celestia Terminal=false Index: celestia.spec =================================================================== RCS file: /cvs/pkgs/rpms/celestia/devel/celestia.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- celestia.spec 20 Feb 2008 02:45:09 -0000 1.23 +++ celestia.spec 1 Mar 2008 14:36:07 -0000 1.24 @@ -1,15 +1,12 @@ -Name: celestia -Version: 1.4.1 -Release: 8%{?dist} +Name: celestia +Version: 1.5.0 +Release: 1%{?dist} Summary: OpenGL real-time visual space simulation -Group: Amusements/Graphics -License: GPL +Group: Applications/Emulators +License: GPLv2+ Source0: http://dl.sf.net/celestia/celestia-%{version}.tar.gz Source3: celestia.desktop -Patch0: celestia-1.4.0-compile.patch -Patch1: celestia-1.4.1-lua51.patch -Patch2: celestia-1.4.1-lua51-resume.patch -Patch3: celestia-1.4.1-strictalias.patch +Patch0: celestia-1.5.0-gcc43.patch URL: http://www.shatters.net/celestia/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -44,10 +41,7 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p1 -b .lua51 -%patch2 -p1 -b .lua51-resume -%patch3 -p1 -b .strictalias +%patch0 -p1 -b .gcc43 # Make sure we compile with the right CFLAGS/CXXFLAGS (from Hans de Goede). sed -i 's/CFLAGS="\$CFLAGS \$CELESTIAFLAGS \$CELESTIA_CFLAGS"/CFLAGS="\$CFLAGS \$CELESTIAFLAGS"/' configure @@ -85,15 +79,16 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ - --add-category Graphics \ + --add-category Education \ %{SOURCE3} -%find_lang %{name} +%find_lang %{name} --all-name %clean rm -rf $RPM_BUILD_ROOT + %pre if [ "$1" -gt 1 ]; then GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ @@ -102,11 +97,13 @@ killall -HUP gconfd-2 &>/dev/null || : fi + %post GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || : + %preun if [ "$1" -eq "0" ] ; then GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ @@ -130,6 +127,11 @@ %changelog +* Sat Mar 1 2008 Marek Mahut - 1.5.0-1 +- Upstream release 1.5.0 and dropping unnecessary patches +- celestia-1.5.0-gcc43.patch (#434441) +- Moving to education category (#220793) + * Tue Feb 19 2008 Fedora Release Engineering - 1.4.1-8 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/celestia/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Apr 2006 23:40:43 -0000 1.6 +++ sources 1 Mar 2008 14:36:07 -0000 1.7 @@ -1 +1 @@ -be1d36fc97a13b9a276249dbc0efac41 celestia-1.4.1.tar.gz +156bc1080d27906122945a20d84d4a82 celestia-1.5.0.tar.gz --- celestia-1.4.0-compile.patch DELETED --- --- celestia-1.4.1-lua51-resume.patch DELETED --- --- celestia-1.4.1-lua51.patch DELETED --- --- celestia-1.4.1-strictalias.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 1 15:14:46 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Sat, 1 Mar 2008 15:14:46 GMT Subject: rpms/nightfall/devel nightfall.spec,1.2,1.3 Message-ID: <200803011514.m21FEkvK010646@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/nightfall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10605 Modified Files: nightfall.spec Log Message: previous build failed because of koji problem Index: nightfall.spec =================================================================== RCS file: /cvs/pkgs/rpms/nightfall/devel/nightfall.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nightfall.spec 19 Feb 2008 14:20:06 -0000 1.2 +++ nightfall.spec 1 Mar 2008 15:14:08 -0000 1.3 @@ -1,6 +1,6 @@ Name: nightfall Version: 1.62 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Nightfall is an astronomy application for emulation of eclipsing stars License: GPLv2+ @@ -48,6 +48,9 @@ %{_datadir}/applications/fedora-nightfall.desktop %changelog +* Sat Mar 1 2008 Marek Mahut - 1.62-4 +- Rebuild for GCC 4.3 + * Tue Feb 19 2008 Fedora Release Engineering - 1.62-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Mar 1 15:15:42 2008 From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson)) Date: Sat, 1 Mar 2008 15:15:42 GMT Subject: rpms/clutter/F-8 .cvsignore, 1.6, 1.7 clutter.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200803011515.m21FFgVb010728@cvs-int.fedora.redhat.com> Author: allisson Update of /cvs/extras/rpms/clutter/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10657/F-8 Modified Files: .cvsignore clutter.spec sources Log Message: Update to 0.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clutter/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Oct 2007 12:42:17 -0000 1.6 +++ .cvsignore 1 Mar 2008 15:15:05 -0000 1.7 @@ -1 +1 @@ -clutter-0.4.2.tar.gz +clutter-0.6.0.tar.gz Index: clutter.spec =================================================================== RCS file: /cvs/extras/rpms/clutter/F-8/clutter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- clutter.spec 3 Oct 2007 12:42:17 -0000 1.6 +++ clutter.spec 1 Mar 2008 15:15:05 -0000 1.7 @@ -1,12 +1,12 @@ Name: clutter -Version: 0.4.2 +Version: 0.6.0 Release: 1%{?dist} Summary: Open Source software library for creating rich graphical user interfaces Group: Development/Libraries License: LGPLv2+ URL: http://www.clutter-project.org/ -Source0: http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz +Source0: http://www.clutter-project.org/sources/%{name}/0.6/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel mesa-libGL-devel gtk2-devel @@ -54,19 +54,23 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %exclude %{_libdir}/*.la -%{_libdir}/libclutter-glx-0.4.so.0 -%{_libdir}/libclutter-glx-0.4.so.0.401.1 +%{_libdir}/libclutter-glx-0.6.so.0 +%{_libdir}/libclutter-glx-0.6.so.0.600.0 %files devel %defattr(-, root, root) %{_includedir}/* -%{_libdir}/libclutter-glx-0.4.so -%{_libdir}/pkgconfig/clutter-0.4.pc -%{_libdir}/pkgconfig/clutter-glx-0.4.pc +%{_libdir}/libclutter-glx-0.6.so +%{_libdir}/pkgconfig/clutter-0.6.pc +%{_libdir}/pkgconfig/clutter-glx-0.6.pc +%{_libdir}/pkgconfig/clutter-x11-0.6.pc %{_datadir}/gtk-doc/html/clutter %changelog +* Sat Mar 1 2008 Allisson Azevedo 0.6.0-1 +- Update to 0.6.0 + * Wed Oct 3 2007 Allisson Azevedo 0.4.2-1 - Update to 0.4.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clutter/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Oct 2007 12:42:17 -0000 1.6 +++ sources 1 Mar 2008 15:15:05 -0000 1.7 @@ -1 +1 @@ -9f1a2d95dcb6a1f30a09f39bdcc10699 clutter-0.4.2.tar.gz +91caa82277a87b8be43bb0b9fdcbabb3 clutter-0.6.0.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 15:20:28 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Sat, 1 Mar 2008 15:20:28 GMT Subject: rpms/cvsplot/F-8 cvsplot.spec,1.12,1.13 Message-ID: <200803011520.m21FKSGG010900@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/cvsplot/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10854 Modified Files: cvsplot.spec Log Message: fixing Bugzilla Bug 427542: Dependency name change Index: cvsplot.spec =================================================================== RCS file: /cvs/pkgs/rpms/cvsplot/F-8/cvsplot.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cvsplot.spec 19 Aug 2007 08:08:56 -0000 1.12 +++ cvsplot.spec 1 Mar 2008 15:19:50 -0000 1.13 @@ -1,6 +1,6 @@ Name: cvsplot Version: 1.7.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Collect statistics from CVS controlled files @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: cvs >= 1.11.1, gnuplot, perl-DateManip >= 5.42 +Requires: cvs >= 1.11.1, gnuplot, perl-Date-Manip >= 5.42 Requires: perl(String::ShellQuote) Patch0: cvsplot-1.7.4.gnuplot.patch @@ -45,6 +45,9 @@ %changelog +* Sat Mar 1 2008 Marek Mahut - 1.7.4-6 +- Updating dependency name (BZ#427542) + * Sun Aug 19 2007 Marek Mahut - 1.7.4-5 - Updating license tag From fedora-extras-commits at redhat.com Sat Mar 1 16:19:15 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 1 Mar 2008 16:19:15 GMT Subject: rpms/gnome-commander/F-7 .cvsignore, 1.3, 1.4 gnome-commander.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200803011619.m21GJFnd019484@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19410/F-7 Modified Files: .cvsignore gnome-commander.spec sources Log Message: * Sat Mar 1 2008 Mamoru Tasaka - 1.2.5-1 - 1.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-7/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jun 2007 06:14:09 -0000 1.3 +++ .cvsignore 1 Mar 2008 16:18:37 -0000 1.4 @@ -1 +1 @@ -gnome-commander-1.2.4.tar.bz2 +gnome-commander-1.2.5.tar.bz2 Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-7/gnome-commander.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnome-commander.spec 9 Jun 2007 07:30:14 -0000 1.9 +++ gnome-commander.spec 1 Mar 2008 16:18:37 -0000 1.10 @@ -1,42 +1,39 @@ -%define id3lib_ver 3.8.3 -%define libexif_ver 0.6.12 -%define libgsf_ver 1.12.0 -%define libiptcdata_ver 0.2.1 -%define python_ver 2.4 +%define EXIV2_REQ 0.14 +%define TAGLIB_REQ 1.4 +%define LIBGSF_REQ 1.12.0 Name: gnome-commander -Version: 1.2.4 -Release: 2%{?dist} +Version: 1.2.5 +Release: 1%{?dist} Summary: A nice and fast file manager for the GNOME desktop +Summary(pl): Menad??er plik??w dla GNOME oparty o Norton Commander'a (TM) +Summary(sv): GNOME Commander ??r en snabb och smidig filhanderare f??r GNOME Group: Applications/File -License: GPL +License: GPLv2+ URL: http://www.nongnu.org/gcmd/ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: gettext +BuildRequires: intltool BuildRequires: scrollkeeper BuildRequires: chmlib-devel -BuildRequires: id3lib-devel >= %{id3lib_ver} -BuildRequires: lcms-devel -BuildRequires: libexif-devel >= %{libexif_ver} -BuildRequires: libgsf-devel +BuildRequires: exiv2-devel >= %{EXIV2_REQ} +BuildRequires: gnome-vfs2-devel +BuildRequires: libgsf-devel >= %{LIBGSF_REQ} +BuildRequires: libgnome-devel BuildRequires: libgnomeui-devel -BuildRequires: libiptcdata-devel >= %{libiptcdata_ver} +BuildRequires: taglib-devel >= %{TAGLIB_REQ} BuildRequires: gnome-doc-utils BuildRequires: perl(XML::Parser) -BuildRequires: python-devel >= %{python_ver} +BuildRequires: python-devel Requires: gnome-python2-gnomevfs -Requires: id3lib >= %{id3lib_ver} -Requires: libexif >= %{libexif_ver} -Requires: libiptcdata >= %{libiptcdata_ver} Requires: meld -Requires: yelp Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -45,6 +42,29 @@ In addition to performing the basic filemanager functions the program is also an FTP-client and it can browse SMB-networks. +%description -l cs +GNOME Commander je p??kn?? a rychl?? spr??vce soubor?? pro GNOME desktop. +Krom?? z??kladn??ch funkc?? spr??vy soubor?? je program tak?? +FTP klient a um?? proch??zet SMB s??t??mi. + +%description -l pl +GNOME Commander to niewielki i wydajny menad??er plik??w umo??liwiaj??cy +wykonywanie za pomoc?? klawiatury wszystkich standardowych operacji na plikach. +Dost??pne s?? r??wnie?? dodatkowe funkcje jak np. obs??uga FTP, czy te?? obs??uga +sieci SMB. + +%description -l ru +???????????? ???????????????????? ???????????????? ???????????????? ?????? Gnome. ?????????? ?????????????????? ?????????????????????? +?????????????? ???????????????? ?? ??????????????, ?????????? ???????????????????????? ??????????????????, ?????????????????? ?? ?????????? +?????????????? ??????????????????????, ?? ?????????????????????????? ?????????????????? ???????????????????????? ???????????? ????????????. +???????????????????????? ???????????????? ???????????????? ???????????????? ?? ?????????????? DND ?? ?????????????????? MIME. +?????????????????? ???? ?????????????? ???????????? ?????????????????? FTP ?????????? GnomeVFS. + +%description -l sv +GNOME Commander ??r en snabb och smidig filhanderare f??r GNOME. +Ut??ver att kunna hantera filer p?? din egen dator s?? kan programmet ??ven +ansluta till FTP-servrar och SMB-n??tverk. + %prep %setup -q @@ -84,7 +104,14 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO doc/*.txt +%doc AUTHORS +%doc BUGS +%doc ChangeLog +%doc COPYING +%doc NEWS +%doc README +%doc TODO +%doc doc/*.txt %{_bindir}/* %{_libdir}/%{name}/ @@ -99,6 +126,24 @@ %{_datadir}/pixmaps/%{name}/ %changelog +* Sat Mar 1 2008 Mamoru Tasaka - 1.2.5-1 +- 1.2.5 + +* Sat Feb 9 2008 Mamoru Tasaka +- Rebuild against gcc43 + +* Fri Oct 5 2007 Mamoru Tasaka - 1.2.4-4 +- Drop yelp dependency + +* Wed Aug 22 2007 Mamoru Tasaka - 1.2.4-3.dist.2 +- Mass rebuild (buildID or binutils issue) + +* Fri Aug 3 2007 Mamoru Tasaka - 1.2.4-3.dist.1 +- License update + +* Mon Jun 11 2007 Mamoru Tasaka - 1.2.4-3 +- Drop dependency for yelp + * Sat Jun 9 2007 Mamoru Tasaka - 1.2.4-2 - Add missing BR libgsf-devel @@ -106,12 +151,6 @@ - Update to 1.2.4 - Support python chmlib libiptcdata -- From upstream: - Sun Feb 4 2007 Piotr Eljasiak - - added libgsf dependencies - Wed Jan 30 2007 Piotr Eljasiak - - added build and runtime deps for python and gnome-python2-gnomevfs - * Sat Jun 9 2007 Mamoru Tasaka - 1.2.3-7 - Require yelp (#243392) @@ -181,7 +220,7 @@ - added dependencies * Mon Jun 24 2002 Piotr Eljasiak -- more cleanup in install section +- more cleanup in install section * Sat Jun 15 2002 Piotr Eljasiak - simplified install and files sections Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-7/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jun 2007 06:14:09 -0000 1.3 +++ sources 1 Mar 2008 16:18:37 -0000 1.4 @@ -1 +1 @@ -9897237e3d297086d88ddf3c7d0dc560 gnome-commander-1.2.4.tar.bz2 +7f6067eb837d3369f98bef80a6877596 gnome-commander-1.2.5.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 16:19:20 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 1 Mar 2008 16:19:20 GMT Subject: rpms/gnome-commander/F-8 .cvsignore, 1.3, 1.4 gnome-commander.spec, 1.13, 1.14 sources, 1.3, 1.4 Message-ID: <200803011619.m21GJKuM019494@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19410/F-8 Modified Files: .cvsignore gnome-commander.spec sources Log Message: * Sat Mar 1 2008 Mamoru Tasaka - 1.2.5-1 - 1.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jun 2007 06:14:34 -0000 1.3 +++ .cvsignore 1 Mar 2008 16:18:45 -0000 1.4 @@ -1 +1 @@ -gnome-commander-1.2.4.tar.bz2 +gnome-commander-1.2.5.tar.bz2 Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-8/gnome-commander.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnome-commander.spec 5 Oct 2007 06:28:31 -0000 1.13 +++ gnome-commander.spec 1 Mar 2008 16:18:45 -0000 1.14 @@ -1,13 +1,13 @@ -%define id3lib_ver 3.8.3 -%define libexif_ver 0.6.12 -%define libgsf_ver 1.12.0 -%define libiptcdata_ver 0.2.1 -%define python_ver 2.4 +%define EXIV2_REQ 0.14 +%define TAGLIB_REQ 1.4 +%define LIBGSF_REQ 1.12.0 Name: gnome-commander -Version: 1.2.4 -Release: 4%{?dist} +Version: 1.2.5 +Release: 1%{?dist} Summary: A nice and fast file manager for the GNOME desktop +Summary(pl): Menad??er plik??w dla GNOME oparty o Norton Commander'a (TM) +Summary(sv): GNOME Commander ??r en snabb och smidig filhanderare f??r GNOME Group: Applications/File License: GPLv2+ @@ -17,28 +17,23 @@ BuildRequires: desktop-file-utils BuildRequires: gettext +BuildRequires: intltool BuildRequires: scrollkeeper BuildRequires: chmlib-devel -BuildRequires: id3lib-devel >= %{id3lib_ver} -BuildRequires: lcms-devel -BuildRequires: libexif-devel >= %{libexif_ver} -%if 0%{?fedora} >= 6 -BuildRequires: libgsf-devel -%endif +BuildRequires: exiv2-devel >= %{EXIV2_REQ} +BuildRequires: gnome-vfs2-devel +BuildRequires: libgsf-devel >= %{LIBGSF_REQ} +BuildRequires: libgnome-devel BuildRequires: libgnomeui-devel -BuildRequires: libiptcdata-devel >= %{libiptcdata_ver} +BuildRequires: taglib-devel >= %{TAGLIB_REQ} BuildRequires: gnome-doc-utils BuildRequires: perl(XML::Parser) -BuildRequires: python-devel >= %{python_ver} +BuildRequires: python-devel Requires: gnome-python2-gnomevfs -Requires: id3lib >= %{id3lib_ver} -Requires: libexif >= %{libexif_ver} -Requires: libiptcdata >= %{libiptcdata_ver} Requires: meld -#Requires: yelp Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -47,6 +42,29 @@ In addition to performing the basic filemanager functions the program is also an FTP-client and it can browse SMB-networks. +%description -l cs +GNOME Commander je p??kn?? a rychl?? spr??vce soubor?? pro GNOME desktop. +Krom?? z??kladn??ch funkc?? spr??vy soubor?? je program tak?? +FTP klient a um?? proch??zet SMB s??t??mi. + +%description -l pl +GNOME Commander to niewielki i wydajny menad??er plik??w umo??liwiaj??cy +wykonywanie za pomoc?? klawiatury wszystkich standardowych operacji na plikach. +Dost??pne s?? r??wnie?? dodatkowe funkcje jak np. obs??uga FTP, czy te?? obs??uga +sieci SMB. + +%description -l ru +???????????? ???????????????????? ???????????????? ???????????????? ?????? Gnome. ?????????? ?????????????????? ?????????????????????? +?????????????? ???????????????? ?? ??????????????, ?????????? ???????????????????????? ??????????????????, ?????????????????? ?? ?????????? +?????????????? ??????????????????????, ?? ?????????????????????????? ?????????????????? ???????????????????????? ???????????? ????????????. +???????????????????????? ???????????????? ???????????????? ???????????????? ?? ?????????????? DND ?? ?????????????????? MIME. +?????????????????? ???? ?????????????? ???????????? ?????????????????? FTP ?????????? GnomeVFS. + +%description -l sv +GNOME Commander ??r en snabb och smidig filhanderare f??r GNOME. +Ut??ver att kunna hantera filer p?? din egen dator s?? kan programmet ??ven +ansluta till FTP-servrar och SMB-n??tverk. + %prep %setup -q @@ -86,7 +104,14 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO doc/*.txt +%doc AUTHORS +%doc BUGS +%doc ChangeLog +%doc COPYING +%doc NEWS +%doc README +%doc TODO +%doc doc/*.txt %{_bindir}/* %{_libdir}/%{name}/ @@ -101,6 +126,12 @@ %{_datadir}/pixmaps/%{name}/ %changelog +* Sat Mar 1 2008 Mamoru Tasaka - 1.2.5-1 +- 1.2.5 + +* Sat Feb 9 2008 Mamoru Tasaka +- Rebuild against gcc43 + * Fri Oct 5 2007 Mamoru Tasaka - 1.2.4-4 - Drop yelp dependency @@ -120,12 +151,6 @@ - Update to 1.2.4 - Support python chmlib libiptcdata -- From upstream: - Sun Feb 4 2007 Piotr Eljasiak - - added libgsf dependencies - Wed Jan 30 2007 Piotr Eljasiak - - added build and runtime deps for python and gnome-python2-gnomevfs - * Sat Jun 9 2007 Mamoru Tasaka - 1.2.3-7 - Require yelp (#243392) @@ -195,7 +220,7 @@ - added dependencies * Mon Jun 24 2002 Piotr Eljasiak -- more cleanup in install section +- more cleanup in install section * Sat Jun 15 2002 Piotr Eljasiak - simplified install and files sections Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jun 2007 06:14:34 -0000 1.3 +++ sources 1 Mar 2008 16:18:45 -0000 1.4 @@ -1 +1 @@ -9897237e3d297086d88ddf3c7d0dc560 gnome-commander-1.2.4.tar.bz2 +7f6067eb837d3369f98bef80a6877596 gnome-commander-1.2.5.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 16:19:24 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sat, 1 Mar 2008 16:19:24 GMT Subject: rpms/gnome-commander/devel .cvsignore, 1.3, 1.4 gnome-commander.spec, 1.14, 1.15 sources, 1.3, 1.4 Message-ID: <200803011619.m21GJOLL019499@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/gnome-commander/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19410/devel Modified Files: .cvsignore gnome-commander.spec sources Log Message: * Sat Mar 1 2008 Mamoru Tasaka - 1.2.5-1 - 1.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jun 2007 06:14:34 -0000 1.3 +++ .cvsignore 1 Mar 2008 16:18:51 -0000 1.4 @@ -1 +1 @@ -gnome-commander-1.2.4.tar.bz2 +gnome-commander-1.2.5.tar.bz2 Index: gnome-commander.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnome-commander.spec 9 Feb 2008 04:21:06 -0000 1.14 +++ gnome-commander.spec 1 Mar 2008 16:18:51 -0000 1.15 @@ -1,13 +1,13 @@ -%define id3lib_ver 3.8.3 -%define libexif_ver 0.6.12 -%define libgsf_ver 1.12.0 -%define libiptcdata_ver 0.2.1 -%define python_ver 2.4 +%define EXIV2_REQ 0.14 +%define TAGLIB_REQ 1.4 +%define LIBGSF_REQ 1.12.0 Name: gnome-commander -Version: 1.2.4 -Release: 4%{?dist}.2 +Version: 1.2.5 +Release: 1%{?dist} Summary: A nice and fast file manager for the GNOME desktop +Summary(pl): Menad??er plik??w dla GNOME oparty o Norton Commander'a (TM) +Summary(sv): GNOME Commander ??r en snabb och smidig filhanderare f??r GNOME Group: Applications/File License: GPLv2+ @@ -17,28 +17,23 @@ BuildRequires: desktop-file-utils BuildRequires: gettext +BuildRequires: intltool BuildRequires: scrollkeeper BuildRequires: chmlib-devel -BuildRequires: id3lib-devel >= %{id3lib_ver} -BuildRequires: lcms-devel -BuildRequires: libexif-devel >= %{libexif_ver} -%if 0%{?fedora} >= 6 -BuildRequires: libgsf-devel -%endif +BuildRequires: exiv2-devel >= %{EXIV2_REQ} +BuildRequires: gnome-vfs2-devel +BuildRequires: libgsf-devel >= %{LIBGSF_REQ} +BuildRequires: libgnome-devel BuildRequires: libgnomeui-devel -BuildRequires: libiptcdata-devel >= %{libiptcdata_ver} +BuildRequires: taglib-devel >= %{TAGLIB_REQ} BuildRequires: gnome-doc-utils BuildRequires: perl(XML::Parser) -BuildRequires: python-devel >= %{python_ver} +BuildRequires: python-devel Requires: gnome-python2-gnomevfs -Requires: id3lib >= %{id3lib_ver} -Requires: libexif >= %{libexif_ver} -Requires: libiptcdata >= %{libiptcdata_ver} Requires: meld -#Requires: yelp Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -47,6 +42,29 @@ In addition to performing the basic filemanager functions the program is also an FTP-client and it can browse SMB-networks. +%description -l cs +GNOME Commander je p??kn?? a rychl?? spr??vce soubor?? pro GNOME desktop. +Krom?? z??kladn??ch funkc?? spr??vy soubor?? je program tak?? +FTP klient a um?? proch??zet SMB s??t??mi. + +%description -l pl +GNOME Commander to niewielki i wydajny menad??er plik??w umo??liwiaj??cy +wykonywanie za pomoc?? klawiatury wszystkich standardowych operacji na plikach. +Dost??pne s?? r??wnie?? dodatkowe funkcje jak np. obs??uga FTP, czy te?? obs??uga +sieci SMB. + +%description -l ru +???????????? ???????????????????? ???????????????? ???????????????? ?????? Gnome. ?????????? ?????????????????? ?????????????????????? +?????????????? ???????????????? ?? ??????????????, ?????????? ???????????????????????? ??????????????????, ?????????????????? ?? ?????????? +?????????????? ??????????????????????, ?? ?????????????????????????? ?????????????????? ???????????????????????? ???????????? ????????????. +???????????????????????? ???????????????? ???????????????? ???????????????? ?? ?????????????? DND ?? ?????????????????? MIME. +?????????????????? ???? ?????????????? ???????????? ?????????????????? FTP ?????????? GnomeVFS. + +%description -l sv +GNOME Commander ??r en snabb och smidig filhanderare f??r GNOME. +Ut??ver att kunna hantera filer p?? din egen dator s?? kan programmet ??ven +ansluta till FTP-servrar och SMB-n??tverk. + %prep %setup -q @@ -86,7 +104,14 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO doc/*.txt +%doc AUTHORS +%doc BUGS +%doc ChangeLog +%doc COPYING +%doc NEWS +%doc README +%doc TODO +%doc doc/*.txt %{_bindir}/* %{_libdir}/%{name}/ @@ -101,6 +126,9 @@ %{_datadir}/pixmaps/%{name}/ %changelog +* Sat Mar 1 2008 Mamoru Tasaka - 1.2.5-1 +- 1.2.5 + * Sat Feb 9 2008 Mamoru Tasaka - Rebuild against gcc43 @@ -123,12 +151,6 @@ - Update to 1.2.4 - Support python chmlib libiptcdata -- From upstream: - Sun Feb 4 2007 Piotr Eljasiak - - added libgsf dependencies - Wed Jan 30 2007 Piotr Eljasiak - - added build and runtime deps for python and gnome-python2-gnomevfs - * Sat Jun 9 2007 Mamoru Tasaka - 1.2.3-7 - Require yelp (#243392) @@ -198,7 +220,7 @@ - added dependencies * Mon Jun 24 2002 Piotr Eljasiak -- more cleanup in install section +- more cleanup in install section * Sat Jun 15 2002 Piotr Eljasiak - simplified install and files sections Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jun 2007 06:14:34 -0000 1.3 +++ sources 1 Mar 2008 16:18:51 -0000 1.4 @@ -1 +1 @@ -9897237e3d297086d88ddf3c7d0dc560 gnome-commander-1.2.4.tar.bz2 +7f6067eb837d3369f98bef80a6877596 gnome-commander-1.2.5.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 16:30:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 16:30:49 +0000 Subject: [pkgdb] geos ownership updated Message-ID: <200803011631.m21GVBoK027032@bastion.fedora.phx.redhat.com> Package geos in Fedora devel was orphaned by Shawn McCann (smccann) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/geos From fedora-extras-commits at redhat.com Sat Mar 1 16:30:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 16:30:54 +0000 Subject: [pkgdb] geos ownership updated Message-ID: <200803011631.m21GVGRV027050@bastion.fedora.phx.redhat.com> Package geos in Fedora EPEL 4 was orphaned by Shawn McCann (smccann) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/geos From fedora-extras-commits at redhat.com Sat Mar 1 16:30:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 16:30:57 +0000 Subject: [pkgdb] geos ownership updated Message-ID: <200803011631.m21GVGRX027050@bastion.fedora.phx.redhat.com> Package geos in Fedora EPEL 5 was orphaned by Shawn McCann (smccann) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/geos From fedora-extras-commits at redhat.com Sat Mar 1 16:30:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 16:30:59 +0000 Subject: [pkgdb] geos ownership updated Message-ID: <200803011631.m21GVGRZ027050@bastion.fedora.phx.redhat.com> Package geos in Fedora 7 was orphaned by Shawn McCann (smccann) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/geos From fedora-extras-commits at redhat.com Sat Mar 1 16:31:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 16:31:02 +0000 Subject: [pkgdb] geos ownership updated Message-ID: <200803011631.m21GVBoM027032@bastion.fedora.phx.redhat.com> Package geos in Fedora 4 was orphaned by Shawn McCann (smccann) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/geos From fedora-extras-commits at redhat.com Sat Mar 1 16:31:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 16:31:04 +0000 Subject: [pkgdb] geos ownership updated Message-ID: <200803011631.m21GVGRb027050@bastion.fedora.phx.redhat.com> Package geos in Fedora 5 was orphaned by Shawn McCann (smccann) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/geos From fedora-extras-commits at redhat.com Sat Mar 1 16:31:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 16:31:08 +0000 Subject: [pkgdb] geos ownership updated Message-ID: <200803011631.m21GVBoO027032@bastion.fedora.phx.redhat.com> Package geos in Fedora 6 was orphaned by Shawn McCann (smccann) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/geos From fedora-extras-commits at redhat.com Sat Mar 1 16:31:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 16:31:11 +0000 Subject: [pkgdb] geos ownership updated Message-ID: <200803011631.m21GVGRd027050@bastion.fedora.phx.redhat.com> Package geos in Fedora 8 was orphaned by Shawn McCann (smccann) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/geos From fedora-extras-commits at redhat.com Sat Mar 1 16:46:41 2008 From: fedora-extras-commits at redhat.com (David Nielsen (dnielsen)) Date: Sat, 1 Mar 2008 16:46:41 GMT Subject: rpms/podsleuth/F-7 podsleuth.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803011646.m21Gkfvq020002@cvs-int.fedora.redhat.com> Author: dnielsen Update of /cvs/pkgs/rpms/podsleuth/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19960/F-7 Modified Files: .cvsignore sources Added Files: podsleuth.spec Log Message: Initial import --- NEW FILE podsleuth.spec --- %define debug_package %{nil} Name: podsleuth Version: 0.6.0 Release: 4%{?dist} Summary: Probes, identifies, and exposes properties and metadata bound to iPods Group: Applications/Multimedia License: MIT URL: http://banshee-project.org/PodSleuth Source0: http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel BuildRequires: hal-devel BuildRequires: ndesk-dbus-devel BuildRequires: sg3_utils-devel # JIT only availible on these: ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha # Disabled due to strange build failure: # s390 s390x %description Podsleuth probes, identifies, and exposes properties and metadata bound to iPods. %package devel Summary: .pc file for podsleuth Group: Documentation Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel Development files for podsleuth %prep %setup -q %build %configure --with-hal-callouts-dir=%{_libexecdir} # Breaks when smp flag is set make %install %{__rm} -rf %{buildroot} make DESTDIR=%{buildroot} install %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/podsleuth %{_libdir}/podsleuth/ %{_libexecdir}/hal-podsleuth %{_datadir}/hal/fdi/policy/20thirdparty/20-podsleuth.fdi %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/podsleuth.pc %changelog * Mon Feb 18 2008 David Nielsen - 0.6.1-4 - Spec fixes - Make exclusive arch at the request of callion * Fri Feb 01 2008 David Nielsen - 0.6.0-3 - More spec fixes * Tue Jan 22 2008 David Nielsen - 0.6.0-2 - Wolfy owes me karma points * Fri Jan 18 2008 David Nielsen - 0.6.0-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/podsleuth/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Feb 2008 20:15:28 -0000 1.1 +++ .cvsignore 1 Mar 2008 16:46:03 -0000 1.2 @@ -0,0 +1 @@ +podsleuth-0.6.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/podsleuth/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Feb 2008 20:15:28 -0000 1.1 +++ sources 1 Mar 2008 16:46:03 -0000 1.2 @@ -0,0 +1 @@ +35a50aec47d5a6138e582354fb43eebe podsleuth-0.6.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 16:51:35 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 1 Mar 2008 16:51:35 GMT Subject: rpms/alsa-tools/devel .cvsignore, 1.8, 1.9 alsa-tools.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200803011651.m21GpZZB020114@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/alsa-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20086 Modified Files: .cvsignore alsa-tools.spec sources Log Message: Update to upstream 1.0.16 (also fixes #434473) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/alsa-tools/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 5 Jan 2008 12:17:32 -0000 1.8 +++ .cvsignore 1 Mar 2008 16:50:54 -0000 1.9 @@ -1,5 +1 @@ -alsa-tools-1.0.15-pruned.tar.bz2 -envy24control.png -envy24control.desktop -echomixer.png -echomixer.desktop +alsa-tools-1.0.16-pruned.tar.bz2 Index: alsa-tools.spec =================================================================== RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- alsa-tools.spec 20 Feb 2008 05:22:19 -0000 1.15 +++ alsa-tools.spec 1 Mar 2008 16:50:54 -0000 1.16 @@ -14,8 +14,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.15 -Release: 3%{?dist} +Version: 1.0.16 +Release: 1%{?dist} # Checked at least one source file from all the sub-projects contained in # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15 @@ -193,6 +193,9 @@ %endif %changelog +* Sat Mar 01 2008 Tim Jackson - 1.0.16-1 +- Update to upstream 1.0.16 (fixes #434473) + * Wed Feb 20 2008 Fedora Release Engineering - 1.0.15-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/alsa-tools/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 5 Jan 2008 12:17:32 -0000 1.9 +++ sources 1 Mar 2008 16:50:54 -0000 1.10 @@ -1,5 +1,5 @@ +be1974e6953b07a8c03c0627e52a3399 alsa-tools-1.0.16-pruned.tar.bz2 57af85a810ed770885aec2a5b35648e6 echomixer.desktop 38db1b88c44adb5591f87173061d7d98 echomixer.png 4c10f8d250a86bdb3ea138488aec8fc4 envy24control.desktop 3a1a195f2b9641f68651e3d312e5476f envy24control.png -2ab2677de89c5fd0e769b212f206101a alsa-tools-1.0.15-pruned.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 17:19:57 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Sat, 1 Mar 2008 17:19:57 GMT Subject: rpms/alsa-tools/devel .cvsignore,1.9,1.10 Message-ID: <200803011719.m21HJvO4030350@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/alsa-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30223 Modified Files: .cvsignore Log Message: Ignore source files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/alsa-tools/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 1 Mar 2008 16:50:54 -0000 1.9 +++ .cvsignore 1 Mar 2008 17:19:17 -0000 1.10 @@ -1 +1,5 @@ alsa-tools-1.0.16-pruned.tar.bz2 +echomixer.desktop +echomixer.png +envy24control.desktop +envy24control.png From fedora-extras-commits at redhat.com Sat Mar 1 17:21:36 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 1 Mar 2008 17:21:36 GMT Subject: rpms/python-turboflot/F-8 .cvsignore, 1.2, 1.3 python-turboflot.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803011721.m21HLaFU030634@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-turboflot/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30538 Modified Files: .cvsignore python-turboflot.spec sources Log Message: Update to 0.0.9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2008 22:36:32 -0000 1.2 +++ .cvsignore 1 Mar 2008 17:21:01 -0000 1.3 @@ -1 +1 @@ -TurboFlot-0.0.6.tar.bz2 +TurboFlot-0.0.9.tar.bz2 Index: python-turboflot.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-8/python-turboflot.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-turboflot.spec 18 Feb 2008 22:36:32 -0000 1.1 +++ python-turboflot.spec 1 Mar 2008 17:21:01 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-turboflot -Version: 0.0.6 +Version: 0.0.9 Release: 1%{?dist} Summary: A TurboGears widget for Flot, a jQuery plotting library @@ -44,6 +44,18 @@ %changelog +* Tue Feb 27 2008 Luke Macken - 0.0.9-1 +- 0.0.9, which contains the following changes, thanks to Arthur Clune: + - Support an optional graph 'label' + - Add a css file for themeing the label + - Fix the user-specified IDs + +* Mon Feb 25 2008 Luke Macken - 0.0.8-1 +- Allow for user-specified IDs + +* Mon Feb 25 2008 Luke Macken - 0.0.7-1 +- Trivial bugfix to fix widget IDs + * Mon Feb 18 2008 Luke Macken - 0.0.6-1 - Update to 0.0.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2008 22:36:32 -0000 1.2 +++ sources 1 Mar 2008 17:21:01 -0000 1.3 @@ -1 +1 @@ -77873661f3681b5d4f2de598f2cc7f41 TurboFlot-0.0.6.tar.bz2 +09e9ab460953ca829b6cac54a51e7a36 TurboFlot-0.0.9.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 17:27:06 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 1 Mar 2008 17:27:06 GMT Subject: rpms/python-turboflot/F-7 .cvsignore, 1.2, 1.3 python-turboflot.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803011727.m21HR6re031473@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-turboflot/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31366 Modified Files: .cvsignore python-turboflot.spec sources Log Message: Update to 0.0.9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2008 22:35:27 -0000 1.2 +++ .cvsignore 1 Mar 2008 17:26:28 -0000 1.3 @@ -1 +1 @@ -TurboFlot-0.0.6.tar.bz2 +TurboFlot-0.0.9.tar.bz2 Index: python-turboflot.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-7/python-turboflot.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-turboflot.spec 18 Feb 2008 22:35:27 -0000 1.1 +++ python-turboflot.spec 1 Mar 2008 17:26:28 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-turboflot -Version: 0.0.6 +Version: 0.0.9 Release: 1%{?dist} Summary: A TurboGears widget for Flot, a jQuery plotting library @@ -44,6 +44,18 @@ %changelog +* Tue Feb 27 2008 Luke Macken - 0.0.9-1 +- 0.0.9, which contains the following changes, thanks to Arthur Clune: + - Support an optional graph 'label' + - Add a css file for themeing the label + - Fix the user-specified IDs + +* Mon Feb 25 2008 Luke Macken - 0.0.8-1 +- Allow for user-specified IDs + +* Mon Feb 25 2008 Luke Macken - 0.0.7-1 +- Trivial bugfix to fix widget IDs + * Mon Feb 18 2008 Luke Macken - 0.0.6-1 - Update to 0.0.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2008 22:35:27 -0000 1.2 +++ sources 1 Mar 2008 17:26:28 -0000 1.3 @@ -1 +1 @@ -77873661f3681b5d4f2de598f2cc7f41 TurboFlot-0.0.6.tar.bz2 +09e9ab460953ca829b6cac54a51e7a36 TurboFlot-0.0.9.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 17:32:03 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 1 Mar 2008 17:32:03 GMT Subject: rpms/python-turboflot/EL-5 .cvsignore, 1.2, 1.3 python-turboflot.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803011732.m21HW3oU032223@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-turboflot/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32127 Modified Files: .cvsignore python-turboflot.spec sources Log Message: Update to 0.0.9 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2008 22:37:45 -0000 1.2 +++ .cvsignore 1 Mar 2008 17:31:29 -0000 1.3 @@ -1 +1 @@ -TurboFlot-0.0.6.tar.bz2 +TurboFlot-0.0.9.tar.bz2 Index: python-turboflot.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/EL-5/python-turboflot.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-turboflot.spec 18 Feb 2008 22:37:45 -0000 1.1 +++ python-turboflot.spec 1 Mar 2008 17:31:29 -0000 1.2 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-turboflot -Version: 0.0.6 +Version: 0.0.9 Release: 1%{?dist} Summary: A TurboGears widget for Flot, a jQuery plotting library @@ -44,6 +44,18 @@ %changelog +* Tue Feb 27 2008 Luke Macken - 0.0.9-1 +- 0.0.9, which contains the following changes, thanks to Arthur Clune: + - Support an optional graph 'label' + - Add a css file for themeing the label + - Fix the user-specified IDs + +* Mon Feb 25 2008 Luke Macken - 0.0.8-1 +- Allow for user-specified IDs + +* Mon Feb 25 2008 Luke Macken - 0.0.7-1 +- Trivial bugfix to fix widget IDs + * Mon Feb 18 2008 Luke Macken - 0.0.6-1 - Update to 0.0.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2008 22:37:45 -0000 1.2 +++ sources 1 Mar 2008 17:31:29 -0000 1.3 @@ -1 +1 @@ -77873661f3681b5d4f2de598f2cc7f41 TurboFlot-0.0.6.tar.bz2 +09e9ab460953ca829b6cac54a51e7a36 TurboFlot-0.0.9.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 17:54:59 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 1 Mar 2008 17:54:59 GMT Subject: rpms/telepathy-haze/devel haze-icq.profile, NONE, 1.1 .cvsignore, 1.4, 1.5 haze-msn.profile, 1.1, 1.2 sources, 1.4, 1.5 telepathy-haze.spec, 1.8, 1.9 Message-ID: <200803011754.m21Hsxax000665@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/telepathy-haze/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv633/devel Modified Files: .cvsignore haze-msn.profile sources telepathy-haze.spec Added Files: haze-icq.profile Log Message: Update to 0.2.0, add ICQ MC profile --- NEW FILE haze-icq.profile --- [Profile] Manager = haze Protocol = icq _Name = ICQ (Haze) _Description = ICQ Protocol IconName = im-icq DisplayName = ICQ ConfigurationUI = jabber Capabilities = chat-p2p, supports-avatars, supports-alias, supports-roster SupportedPresences = offline,available,away,do-not-disturb Default-server = login.messaging.aol.com Default-port = 5190 Default-resource = Telepathy Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Nov 2007 23:44:18 -0000 1.4 +++ .cvsignore 1 Mar 2008 17:54:21 -0000 1.5 @@ -1 +1 @@ -telepathy-haze-0.1.4.tar.gz +telepathy-haze-0.2.0.tar.gz Index: haze-msn.profile =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/haze-msn.profile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- haze-msn.profile 12 Nov 2007 19:23:15 -0000 1.1 +++ haze-msn.profile 1 Mar 2008 17:54:21 -0000 1.2 @@ -2,7 +2,7 @@ Manager=haze Protocol=msn DisplayName=MSN (Haze) -IconName = empathy-proto-msn +IconName = im-msn ConfigurationUI = msn Capabilities = chat-p2p, split-account, supports-avatars, supports-alias SupportedPresences = offline,available,away,extended-away,hidden,do-not-disturb Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Nov 2007 23:44:18 -0000 1.4 +++ sources 1 Mar 2008 17:54:21 -0000 1.5 @@ -1 +1 @@ -8d35984ad70f28a05c1cffca246478c3 telepathy-haze-0.1.4.tar.gz +63bb7d0f9c45be27d5cec478f9f61846 telepathy-haze-0.2.0.tar.gz Index: telepathy-haze.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/telepathy-haze.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- telepathy-haze.spec 19 Feb 2008 19:22:09 -0000 1.8 +++ telepathy-haze.spec 1 Mar 2008 17:54:21 -0000 1.9 @@ -1,6 +1,6 @@ Name: telepathy-haze -Version: 0.1.4 -Release: 3%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: A multi-protocol Libpurple connection manager for Telepathy Group: Applications/Communications @@ -14,8 +14,6 @@ Source2: haze-msn.profile Source3: haze-yahoo.profile -Patch0: %{name}-fix-yahoo-apostrophe-escaping.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpurple-devel @@ -50,7 +48,6 @@ %prep %setup -q -%patch0 -b .yahoo-apostrophe-escaping %build @@ -90,6 +87,10 @@ %changelog +* Sat Mar 01 2008 Peter Gordon - 0.2.0-1 +- Update to new upstream release (0.2.0) +- Add ICQ Mission-Control profile. + * Tue Feb 19 2008 Fedora Release Engineering - 0.1.4-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Mar 1 18:02:50 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 1 Mar 2008 18:02:50 GMT Subject: rpms/telepathy-haze/devel telepathy-haze.spec,1.9,1.10 Message-ID: <200803011802.m21I2ojl007988@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/telepathy-haze/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7955/devel Modified Files: telepathy-haze.spec Log Message: _Actually_ add the ICQ profile. Index: telepathy-haze.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/telepathy-haze.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- telepathy-haze.spec 1 Mar 2008 17:54:21 -0000 1.9 +++ telepathy-haze.spec 1 Mar 2008 18:02:14 -0000 1.10 @@ -13,6 +13,7 @@ Source1: haze-aim.profile Source2: haze-msn.profile Source3: haze-yahoo.profile +Source4: haze-icq.profile BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,6 +65,7 @@ install -p -m 0644 -t %{buildroot}%{_datadir}/mission-control/profiles %{SOURCE1} install -p -m 0644 -t %{buildroot}%{_datadir}/mission-control/profiles %{SOURCE2} install -p -m 0644 -t %{buildroot}%{_datadir}/mission-control/profiles %{SOURCE3} +install -p -m 0644 -t %{buildroot}%{_datadir}/mission-control/profiles %{SOURCE4} %clean @@ -82,6 +84,7 @@ %defattr(-,root,root,-) %doc COPYING %{_datadir}/mission-control/profiles/haze-aim.profile +%{_datadir}/mission-control/profiles/haze-icq.profile %{_datadir}/mission-control/profiles/haze-msn.profile %{_datadir}/mission-control/profiles/haze-yahoo.profile @@ -136,3 +139,4 @@ * Mon Aug 13 2007 Peter Gordon - 0.1.0-1 - Initial packaging for Fedora. + From fedora-extras-commits at redhat.com Sat Mar 1 18:19:54 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Sat, 1 Mar 2008 18:19:54 GMT Subject: rpms/irssi/devel config.h, NONE, 1.1 irssi-0.8.12-multiarch.patch, NONE, 1.1 irssi.spec, 1.29, 1.30 Message-ID: <200803011819.m21IJsZR008183@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/irssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8151 Modified Files: irssi.spec Added Files: config.h irssi-0.8.12-multiarch.patch Log Message: fixing multiarch conflict --- NEW FILE config.h --- #include #if __WORDSIZE == 32 #include "config-32.h" #elif __WORDSIZE == 64 #include "config-64.h" #else #error "Unknown word size" #endif irssi-0.8.12-multiarch.patch: --- NEW FILE irssi-0.8.12-multiarch.patch --- diff -Naur irssi-0.8.12-upstream/config-32.h irssi-0.8.12/config-32.h --- irssi-0.8.12-upstream/config-32.h 1970-01-01 01:00:00.000000000 +0100 +++ irssi-0.8.12/config-32.h 2008-03-01 16:33:57.000000000 +0100 @@ -0,0 +1,149 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ +/* misc.. */ +#define HAVE_IPV6 1 +/* #undef HAVE_SOCKS_H */ +#define HAVE_PL_PERL 1 +#define HAVE_STATIC_PERL 1 +#define HAVE_GMODULE 1 +/* #undef HAVE_GC_H */ +/* #undef HAVE_GC_GC_H */ +/* #undef USE_GC */ +/* #undef HAVE_GLIB2 */ + +/* macros/curses checks */ +#define HAS_CURSES 1 +/* #undef USE_SUNOS_CURSES */ +/* #undef USE_BSD_CURSES */ +/* #undef USE_SYSV_CURSES */ +#define USE_NCURSES 1 +/* #undef NO_COLOR_CURSES */ +/* #undef SCO_FLAVOR */ + +/* our own curses checks */ +/* #undef HAVE_NCURSES_USE_DEFAULT_COLORS */ +/* #undef HAVE_CURSES_IDCOK */ +/* #undef HAVE_CURSES_RESIZETERM */ +/* #undef HAVE_CURSES_WRESIZE */ + +/* terminfo/termcap */ +#define HAVE_TERMINFO 1 + +/* If set to 64, enables 64bit off_t for some systems (eg. Linux, Solaris) */ +#define _FILE_OFFSET_BITS 64 + +/* What type should be used for uoff_t */ +/* #undef UOFF_T_INT */ +/* #undef UOFF_T_LONG */ +#define UOFF_T_LONG_LONG 1 + +/* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */ +#define PRIuUOFF_T "llu" + +/* Define to 1 if you have the header file. */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `fcntl' function. */ +#define HAVE_FCNTL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mkfifo' function. */ +#define HAVE_MKFIFO 1 + +/* Define to 1 if you have the `nl_langinfo' function. */ +#define HAVE_NL_LANGINFO 1 + +/* Build with OpenSSL support */ +#define HAVE_OPENSSL + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_ERR_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_SSL_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_REGEX_H 1 + +/* Build with socks support */ +/* #undef HAVE_SOCKS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UTSNAME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "irssi" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "irssi 0.8.12" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "irssi" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.8.12" + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of `off_t', as computed by sizeof. */ +#define SIZEOF_OFF_T 8 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Number of bits in a file offset, on hosts where this is settable. */ +#define _FILE_OFFSET_BITS 64 + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Define to 'int' if doesn't define. */ +/* #undef socklen_t */ diff -Naur irssi-0.8.12-upstream/config-64.h irssi-0.8.12/config-64.h --- irssi-0.8.12-upstream/config-64.h 1970-01-01 01:00:00.000000000 +0100 +++ irssi-0.8.12/config-64.h 2008-03-01 16:34:03.000000000 +0100 @@ -0,0 +1,149 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ +/* misc.. */ +#define HAVE_IPV6 1 +/* #undef HAVE_SOCKS_H */ +#define HAVE_PL_PERL 1 +#define HAVE_STATIC_PERL 1 +#define HAVE_GMODULE 1 +/* #undef HAVE_GC_H */ +/* #undef HAVE_GC_GC_H */ +/* #undef USE_GC */ +/* #undef HAVE_GLIB2 */ + +/* macros/curses checks */ +#define HAS_CURSES 1 +/* #undef USE_SUNOS_CURSES */ +/* #undef USE_BSD_CURSES */ +/* #undef USE_SYSV_CURSES */ +#define USE_NCURSES 1 +/* #undef NO_COLOR_CURSES */ +/* #undef SCO_FLAVOR */ + +/* our own curses checks */ +/* #undef HAVE_NCURSES_USE_DEFAULT_COLORS */ +/* #undef HAVE_CURSES_IDCOK */ +/* #undef HAVE_CURSES_RESIZETERM */ +/* #undef HAVE_CURSES_WRESIZE */ + +/* terminfo/termcap */ +#define HAVE_TERMINFO 1 + +/* If set to 64, enables 64bit off_t for some systems (eg. Linux, Solaris) */ +#define _FILE_OFFSET_BITS 64 + +/* What type should be used for uoff_t */ +/* #undef UOFF_T_INT */ +/* #undef UOFF_T_LONG */ +#define UOFF_T_LONG_LONG 1 + +/* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */ +#define PRIuUOFF_T "llu" + +/* Define to 1 if you have the header file. */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `fcntl' function. */ +#define HAVE_FCNTL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mkfifo' function. */ +#define HAVE_MKFIFO 1 + +/* Define to 1 if you have the `nl_langinfo' function. */ +#define HAVE_NL_LANGINFO 1 + +/* Build with OpenSSL support */ +#define HAVE_OPENSSL + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_ERR_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_SSL_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_REGEX_H 1 + +/* Build with socks support */ +/* #undef HAVE_SOCKS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UTSNAME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "irssi" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "irssi 0.8.12" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "irssi" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.8.12" + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of `off_t', as computed by sizeof. */ +#define SIZEOF_OFF_T 8 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Number of bits in a file offset, on hosts where this is settable. */ +#define _FILE_OFFSET_BITS 64 + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Define to 'int' if doesn't define. */ +/* #undef socklen_t */ diff -Naur irssi-0.8.12-upstream/config.h irssi-0.8.12/config.h --- irssi-0.8.12-upstream/config.h 2008-03-01 16:32:53.000000000 +0100 +++ irssi-0.8.12/config.h 2008-03-01 16:34:32.000000000 +0100 @@ -1,149 +1,9 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ -/* misc.. */ -#define HAVE_IPV6 1 -/* #undef HAVE_SOCKS_H */ -#define HAVE_PL_PERL 1 -#define HAVE_STATIC_PERL 1 -#define HAVE_GMODULE 1 -/* #undef HAVE_GC_H */ -/* #undef HAVE_GC_GC_H */ -/* #undef USE_GC */ -/* #undef HAVE_GLIB2 */ +#include -/* macros/curses checks */ -#define HAS_CURSES 1 -/* #undef USE_SUNOS_CURSES */ -/* #undef USE_BSD_CURSES */ -/* #undef USE_SYSV_CURSES */ -#define USE_NCURSES 1 -/* #undef NO_COLOR_CURSES */ -/* #undef SCO_FLAVOR */ - -/* our own curses checks */ -/* #undef HAVE_NCURSES_USE_DEFAULT_COLORS */ -/* #undef HAVE_CURSES_IDCOK */ -/* #undef HAVE_CURSES_RESIZETERM */ -/* #undef HAVE_CURSES_WRESIZE */ - -/* terminfo/termcap */ -#define HAVE_TERMINFO 1 - -/* If set to 64, enables 64bit off_t for some systems (eg. Linux, Solaris) */ -#define _FILE_OFFSET_BITS 64 - -/* What type should be used for uoff_t */ -/* #undef UOFF_T_INT */ -/* #undef UOFF_T_LONG */ -#define UOFF_T_LONG_LONG 1 - -/* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */ -#define PRIuUOFF_T "llu" - -/* Define to 1 if you have the header file. */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the `fcntl' function. */ -#define HAVE_FCNTL 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mkfifo' function. */ -#define HAVE_MKFIFO 1 - -/* Define to 1 if you have the `nl_langinfo' function. */ -#define HAVE_NL_LANGINFO 1 - -/* Build with OpenSSL support */ -#define HAVE_OPENSSL - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_OPENSSL_ERR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_OPENSSL_SSL_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_REGEX_H 1 - -/* Build with socks support */ -/* #undef HAVE_SOCKS */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_IOCTL_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_RESOURCE_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_UTSNAME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "irssi" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "irssi 0.8.12" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "irssi" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.8.12" - -/* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* The size of `long long', as computed by sizeof. */ -#define SIZEOF_LONG_LONG 8 - -/* The size of `off_t', as computed by sizeof. */ -#define SIZEOF_OFF_T 8 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Number of bits in a file offset, on hosts where this is settable. */ -#define _FILE_OFFSET_BITS 64 - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to 'int' if doesn't define. */ -/* #undef socklen_t */ +#if __WORDSIZE == 32 +#include "config-32.h" +#elif __WORDSIZE == 64 +#include "config-64.h" +#else +#error "Unknown word size" +#endif Index: irssi.spec =================================================================== RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- irssi.spec 19 Feb 2008 14:18:06 -0000 1.29 +++ irssi.spec 1 Mar 2008 18:19:11 -0000 1.30 @@ -3,16 +3,17 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 0.8.12 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://irssi.org/ Source0: http://irssi.org/files/irssi-%{version}.tar.bz2 +Source1: config.h + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ncurses-devel openssl-devel zlib-devel BuildRequires: pkgconfig glib2-devel perl-devel - Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %package devel @@ -43,23 +44,24 @@ --with-perl=yes \ --with-perl-lib=vendor -make +make %{_smp_mflags} +mv config.h config-$(getconf LONG_BIT).h +cp -p %{SOURCE1} config.h %install rm -rf $RPM_BUILD_ROOT -%makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +%makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="%{__install} -p" +install -p config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/config-$(getconf LONG_BIT).h -# Clean up rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name} find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';' - -# Fix permissions chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch} + %clean rm -rf $RPM_BUILD_ROOT @@ -73,6 +75,7 @@ %{_datadir}/%{name} %{_libdir}/%{name} %{_mandir}/man1/%{name}.1* +%{_includedir}/%{name}/config-$(getconf LONG_BIT).h %{perl_vendorarch}/Irssi* %{perl_vendorarch}/auto/Irssi @@ -82,6 +85,9 @@ %{_includedir}/irssi %changelog +* Sat Mar 1 2008 Marek Mahut - 0.8.12-6 +- Fix for multiarch conflict (BZ#341591) + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Mar 1 18:27:22 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Sat, 1 Mar 2008 18:27:22 GMT Subject: rpms/irssi/devel irssi.spec,1.30,1.31 Message-ID: <200803011827.m21IRMAn008326@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/irssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8295 Modified Files: irssi.spec Log Message: oh, rebuild Index: irssi.spec =================================================================== RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- irssi.spec 1 Mar 2008 18:19:11 -0000 1.30 +++ irssi.spec 1 Mar 2008 18:26:47 -0000 1.31 @@ -3,7 +3,7 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 0.8.12 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/Communications @@ -52,7 +52,7 @@ %install rm -rf $RPM_BUILD_ROOT %makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="%{__install} -p" -install -p config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/config-$(getconf LONG_BIT).h +install -p config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/%{name}/config-$(getconf LONG_BIT).h rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name} @@ -85,7 +85,7 @@ %{_includedir}/irssi %changelog -* Sat Mar 1 2008 Marek Mahut - 0.8.12-6 +* Sat Mar 1 2008 Marek Mahut - 0.8.12-7 - Fix for multiarch conflict (BZ#341591) * Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-5 From fedora-extras-commits at redhat.com Sat Mar 1 18:29:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:29:59 +0000 Subject: [pkgdb] ocaml-camlp5 was added for rjones Message-ID: <200803011830.m21IUIqv031177@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-camlp5 with summary Classical version of camlp4 OCaml preprocessor Kevin Fenzi (kevin) has approved Package ocaml-camlp5 Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-camlp5 with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-camlp5 in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-camlp5 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-camlp5 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-camlp5 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-camlp5 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5 From fedora-extras-commits at redhat.com Sat Mar 1 18:30:03 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 1 Mar 2008 18:30:03 GMT Subject: rpms/perl-Smart-Comments/devel .cvsignore, 1.2, 1.3 perl-Smart-Comments.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200803011830.m21IU3IA008453@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Smart-Comments/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8397 Modified Files: .cvsignore perl-Smart-Comments.spec sources Log Message: * Sat Mar 01 2008 Chris Weyl 1:v1.0.3-1 - update to v1.0.3 - update lic tag - add epoch, to move away from the 1.000... representation of the version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Smart-Comments/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Aug 2006 16:16:13 -0000 1.2 +++ .cvsignore 1 Mar 2008 18:29:22 -0000 1.3 @@ -1 +1 @@ -Smart-Comments-v1.0.2.tar.gz +Smart-Comments-v1.0.3.tar.gz Index: perl-Smart-Comments.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Smart-Comments/devel/perl-Smart-Comments.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Smart-Comments.spec 27 Mar 2007 22:32:49 -0000 1.4 +++ perl-Smart-Comments.spec 1 Mar 2008 18:29:22 -0000 1.5 @@ -1,23 +1,27 @@ -%define tarver v1.0.2 - Name: perl-Smart-Comments -Version: 1.000002 -Release: 4%{?dist} +Epoch: 1 +Version: v1.0.3 +Release: 1%{?dist} Summary: Comments that do more than just sit there Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Smart-Comments -Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Smart-Comments-%{tarver}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Smart-Comments-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## core -BuildRequires: perl, perl(ExtUtils::MakeMaker) -BuildRequires: perl(Test::More), perl(Text::Balanced), perl(Data::Dumper) -BuildRequires: perl(Filter::Simple), perl(List::Util) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Filter::Simple) +BuildRequires: perl(List::Util) +BuildRequires: perl(Test::More) +BuildRequires: perl(Text::Balanced) ## non-core BuildRequires: perl(version) -BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) +BuildRequires: perl(Test::Pod) +## author test +BuildRequires: perl(Test::Pod::Coverage) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -35,8 +39,9 @@ %prep -%setup -q -n Smart-Comments-%{tarver} +%setup -q -n Smart-Comments-%{version} +perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/* %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -45,10 +50,12 @@ %install rm -rf %{buildroot} + make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* + +%{_fixperms} %{buildroot}/* %check @@ -61,12 +68,17 @@ %files %defattr(-,root,root,-) -%doc README Changes +%doc README Changes t/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Sat Mar 01 2008 Chris Weyl 1:v1.0.3-1 +- update to v1.0.3 +- update lic tag +- add epoch, to move away from the 1.000... representation of the version + * Tue Mar 27 2007 Chris Weyl 1.000002-4 - be more explicit with core requires Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Smart-Comments/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Aug 2006 16:16:13 -0000 1.2 +++ sources 1 Mar 2008 18:29:22 -0000 1.3 @@ -1 +1 @@ -658df11ea3e1090a4c673b50860449b3 Smart-Comments-v1.0.2.tar.gz +899c141a4f0d624d7daaac71b6a428fd Smart-Comments-v1.0.3.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 18:30:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:30:04 +0000 Subject: [pkgdb] ocaml-camlp5 (Fedora, 8) updated by kevin Message-ID: <200803011830.m21IUR2X031215@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-camlp5 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-camlp5 (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-camlp5 (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-camlp5 (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-camlp5 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5 From fedora-extras-commits at redhat.com Sat Mar 1 18:30:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:30:04 +0000 Subject: [pkgdb] ocaml-camlp5 (Fedora, devel) updated by kevin Message-ID: <200803011830.m21IUR2a031215@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-camlp5 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5 From fedora-extras-commits at redhat.com Sat Mar 1 18:31:47 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:31:47 GMT Subject: rpms/ocaml-camlp5 - New directory Message-ID: <200803011831.m21IVlsK008644@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-camlp5 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOL8550/rpms/ocaml-camlp5 Log Message: Directory /cvs/extras/rpms/ocaml-camlp5 added to the repository From fedora-extras-commits at redhat.com Sat Mar 1 18:31:52 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:31:52 GMT Subject: rpms/ocaml-camlp5/devel - New directory Message-ID: <200803011831.m21IVqe1008658@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-camlp5/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOL8550/rpms/ocaml-camlp5/devel Log Message: Directory /cvs/extras/rpms/ocaml-camlp5/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 1 18:31:57 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:31:57 GMT Subject: rpms/ocaml-camlp5 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803011831.m21IVv0C008683@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-camlp5 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOL8550/rpms/ocaml-camlp5 Added Files: Makefile import.log Log Message: Setup of module ocaml-camlp5 --- NEW FILE Makefile --- # Top level Makefile for module ocaml-camlp5 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Mar 1 18:32:01 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:32:01 GMT Subject: rpms/ocaml-camlp5/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803011832.m21IW1nN008704@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-camlp5/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOL8550/rpms/ocaml-camlp5/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-camlp5 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-camlp5 # $Id: Makefile,v 1.1 2008/03/01 18:31:57 kevin Exp $ NAME := ocaml-camlp5 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Mar 1 18:33:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:33:26 +0000 Subject: [pkgdb] liblqr-1 was added for ics Message-ID: <200803011833.m21IXnF1031504@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package liblqr-1 with summary LiquidRescale library Kevin Fenzi (kevin) has approved Package liblqr-1 Kevin Fenzi (kevin) has added a Fedora devel branch for liblqr-1 with an owner of ics Kevin Fenzi (kevin) has approved liblqr-1 in Fedora devel Kevin Fenzi (kevin) has approved Package liblqr-1 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on liblqr-1 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on liblqr-1 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on liblqr-1 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/liblqr-1 From fedora-extras-commits at redhat.com Sat Mar 1 18:33:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:33:49 +0000 Subject: [pkgdb] liblqr-1 (Fedora, 8) updated by kevin Message-ID: <200803011834.m21IXnF4031504@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for liblqr-1 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on liblqr-1 (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on liblqr-1 (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on liblqr-1 (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on liblqr-1 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/liblqr-1 From fedora-extras-commits at redhat.com Sat Mar 1 18:33:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:33:49 +0000 Subject: [pkgdb] liblqr-1 (Fedora, 7) updated by kevin Message-ID: <200803011834.m21IXnF7031504@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for liblqr-1 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on liblqr-1 (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on liblqr-1 (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on liblqr-1 (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on liblqr-1 (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/liblqr-1 From fedora-extras-commits at redhat.com Sat Mar 1 18:33:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:33:49 +0000 Subject: [pkgdb] liblqr-1 (Fedora, devel) updated by kevin Message-ID: <200803011834.m21IYDaR031570@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on liblqr-1 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/liblqr-1 From fedora-extras-commits at redhat.com Sat Mar 1 18:34:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:34:15 GMT Subject: rpms/liblqr-1 - New directory Message-ID: <200803011834.m21IYF2X008879@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/liblqr-1 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBk8846/rpms/liblqr-1 Log Message: Directory /cvs/extras/rpms/liblqr-1 added to the repository From fedora-extras-commits at redhat.com Sat Mar 1 18:34:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:34:20 GMT Subject: rpms/liblqr-1/devel - New directory Message-ID: <200803011834.m21IYKDd008894@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/liblqr-1/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBk8846/rpms/liblqr-1/devel Log Message: Directory /cvs/extras/rpms/liblqr-1/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 1 18:34:23 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:34:23 GMT Subject: rpms/liblqr-1 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803011834.m21IYND5008919@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/liblqr-1 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBk8846/rpms/liblqr-1 Added Files: Makefile import.log Log Message: Setup of module liblqr-1 --- NEW FILE Makefile --- # Top level Makefile for module liblqr-1 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Mar 1 18:34:30 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:34:30 GMT Subject: rpms/liblqr-1/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803011834.m21IYUs4008935@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/liblqr-1/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBk8846/rpms/liblqr-1/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module liblqr-1 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: liblqr-1 # $Id: Makefile,v 1.1 2008/03/01 18:34:24 kevin Exp $ NAME := liblqr-1 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Mar 1 18:35:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:35:17 +0000 Subject: [pkgdb] ocaml-sqlite was added for rjones Message-ID: <200803011835.m21IZalR031746@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-sqlite with summary OCaml library for accessing SQLite3 databases Kevin Fenzi (kevin) has approved Package ocaml-sqlite Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-sqlite with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-sqlite in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-sqlite Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-sqlite (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-sqlite (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-sqlite (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite From fedora-extras-commits at redhat.com Sat Mar 1 18:35:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:35:22 +0000 Subject: [pkgdb] ocaml-sqlite (Fedora, 8) updated by kevin Message-ID: <200803011835.m21IZjWN031776@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-sqlite Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-sqlite (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-sqlite (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-sqlite (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-sqlite (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite From fedora-extras-commits at redhat.com Sat Mar 1 18:35:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:35:23 +0000 Subject: [pkgdb] ocaml-sqlite (Fedora, devel) updated by kevin Message-ID: <200803011835.m21IZjWQ031776@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-sqlite (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite From fedora-extras-commits at redhat.com Sat Mar 1 18:36:30 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:36:30 GMT Subject: rpms/ocaml-sqlite - New directory Message-ID: <200803011836.m21IaUOT009168@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-sqlite In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUb9133/rpms/ocaml-sqlite Log Message: Directory /cvs/extras/rpms/ocaml-sqlite added to the repository From fedora-extras-commits at redhat.com Sat Mar 1 18:36:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:36:35 GMT Subject: rpms/ocaml-sqlite/devel - New directory Message-ID: <200803011836.m21IaZ5D009181@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-sqlite/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUb9133/rpms/ocaml-sqlite/devel Log Message: Directory /cvs/extras/rpms/ocaml-sqlite/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 1 18:36:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:36:41 GMT Subject: rpms/ocaml-sqlite Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803011836.m21Iafo7009206@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-sqlite In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUb9133/rpms/ocaml-sqlite Added Files: Makefile import.log Log Message: Setup of module ocaml-sqlite --- NEW FILE Makefile --- # Top level Makefile for module ocaml-sqlite all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Mar 1 18:36:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:36:46 GMT Subject: rpms/ocaml-sqlite/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803011836.m21Iak6I009222@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-sqlite/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUb9133/rpms/ocaml-sqlite/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-sqlite --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-sqlite # $Id: Makefile,v 1.1 2008/03/01 18:36:42 kevin Exp $ NAME := ocaml-sqlite SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Mar 1 18:38:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:38:07 +0000 Subject: [pkgdb] ocaml-cairo was added for rjones Message-ID: <200803011838.m21IcUeI032001@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-cairo with summary OCaml library for accessing cairo graphics Kevin Fenzi (kevin) has approved Package ocaml-cairo Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-cairo with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-cairo in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-cairo Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-cairo (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-cairo (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-cairo (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo From fedora-extras-commits at redhat.com Sat Mar 1 18:38:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:38:15 +0000 Subject: [pkgdb] ocaml-cairo (Fedora, 8) updated by kevin Message-ID: <200803011838.m21IcUeL032001@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-cairo Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-cairo (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-cairo (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-cairo (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-cairo (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo From fedora-extras-commits at redhat.com Sat Mar 1 18:38:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:38:15 +0000 Subject: [pkgdb] ocaml-cairo (Fedora, devel) updated by kevin Message-ID: <200803011838.m21IcUeO032001@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-cairo (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo From fedora-extras-commits at redhat.com Sat Mar 1 18:38:37 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:38:37 GMT Subject: rpms/ocaml-cairo - New directory Message-ID: <200803011838.m21IcbEP009362@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-cairo In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVJ9332/rpms/ocaml-cairo Log Message: Directory /cvs/extras/rpms/ocaml-cairo added to the repository From fedora-extras-commits at redhat.com Sat Mar 1 18:38:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:38:41 GMT Subject: rpms/ocaml-cairo/devel - New directory Message-ID: <200803011838.m21Icfip009378@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-cairo/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVJ9332/rpms/ocaml-cairo/devel Log Message: Directory /cvs/extras/rpms/ocaml-cairo/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 1 18:38:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:38:51 GMT Subject: rpms/ocaml-cairo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803011838.m21IcpBg009422@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-cairo/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVJ9332/rpms/ocaml-cairo/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-cairo --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-cairo # $Id: Makefile,v 1.1 2008/03/01 18:38:49 kevin Exp $ NAME := ocaml-cairo SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Mar 1 18:38:48 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:38:48 GMT Subject: rpms/ocaml-cairo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803011838.m21IcmiP009406@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-cairo In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVJ9332/rpms/ocaml-cairo Added Files: Makefile import.log Log Message: Setup of module ocaml-cairo --- NEW FILE Makefile --- # Top level Makefile for module ocaml-cairo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Mar 1 18:39:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:39:40 +0000 Subject: [pkgdb] gpsman was added for sconklin Message-ID: <200803011840.m21Ie02G032224@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gpsman with summary GPS data manager Kevin Fenzi (kevin) has approved Package gpsman Kevin Fenzi (kevin) has added a Fedora devel branch for gpsman with an owner of sconklin Kevin Fenzi (kevin) has approved gpsman in Fedora devel Kevin Fenzi (kevin) has approved Package gpsman Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gpsman (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gpsman (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gpsman (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gpsman From fedora-extras-commits at redhat.com Sat Mar 1 18:39:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:39:58 +0000 Subject: [pkgdb] gpsman (Fedora, 7) updated by kevin Message-ID: <200803011840.m21IeLvQ032260@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for gpsman Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gpsman (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gpsman (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gpsman (Fedora 7) Kevin Fenzi (kevin) approved watchbugzilla on gpsman (Fedora 7) for bjensen Kevin Fenzi (kevin) approved watchcommits on gpsman (Fedora 7) for bjensen Kevin Fenzi (kevin) approved commit on gpsman (Fedora 7) for bjensen Kevin Fenzi (kevin) approved build on gpsman (Fedora 7) for bjensen Kevin Fenzi (kevin) approved approveacls on gpsman (Fedora 7) for bjensen Kevin Fenzi (kevin) Approved cvsextras for commit access on gpsman (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gpsman From fedora-extras-commits at redhat.com Sat Mar 1 18:39:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:39:58 +0000 Subject: [pkgdb] gpsman (Fedora, 8) updated by kevin Message-ID: <200803011840.m21IeLvM032260@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for gpsman Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gpsman (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gpsman (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gpsman (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on gpsman (Fedora 8) for bjensen Kevin Fenzi (kevin) approved watchcommits on gpsman (Fedora 8) for bjensen Kevin Fenzi (kevin) approved commit on gpsman (Fedora 8) for bjensen Kevin Fenzi (kevin) approved build on gpsman (Fedora 8) for bjensen Kevin Fenzi (kevin) approved approveacls on gpsman (Fedora 8) for bjensen Kevin Fenzi (kevin) Approved cvsextras for commit access on gpsman (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gpsman From fedora-extras-commits at redhat.com Sat Mar 1 18:39:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 18:39:59 +0000 Subject: [pkgdb] gpsman (Fedora, devel) updated by kevin Message-ID: <200803011840.m21IePcc032307@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on gpsman (Fedora devel) for bjensen Kevin Fenzi (kevin) approved watchcommits on gpsman (Fedora devel) for bjensen Kevin Fenzi (kevin) approved commit on gpsman (Fedora devel) for bjensen Kevin Fenzi (kevin) approved build on gpsman (Fedora devel) for bjensen Kevin Fenzi (kevin) approved approveacls on gpsman (Fedora devel) for bjensen Kevin Fenzi (kevin) Approved cvsextras for commit access on gpsman (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gpsman From fedora-extras-commits at redhat.com Sat Mar 1 18:40:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:40:15 GMT Subject: rpms/gpsman - New directory Message-ID: <200803011840.m21IeFj4009569@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gpsman In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSE9534/rpms/gpsman Log Message: Directory /cvs/extras/rpms/gpsman added to the repository From fedora-extras-commits at redhat.com Sat Mar 1 18:40:24 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:40:24 GMT Subject: rpms/gpsman/devel - New directory Message-ID: <200803011840.m21IeOsQ009589@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gpsman/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSE9534/rpms/gpsman/devel Log Message: Directory /cvs/extras/rpms/gpsman/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 1 18:40:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:40:28 GMT Subject: rpms/gpsman Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803011840.m21IeS5Q009626@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gpsman In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSE9534/rpms/gpsman Added Files: Makefile import.log Log Message: Setup of module gpsman --- NEW FILE Makefile --- # Top level Makefile for module gpsman all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Mar 1 18:40:32 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 18:40:32 GMT Subject: rpms/gpsman/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803011840.m21IeWfx009642@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gpsman/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSE9534/rpms/gpsman/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gpsman --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gpsman # $Id: Makefile,v 1.1 2008/03/01 18:40:28 kevin Exp $ NAME := gpsman SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Mar 1 18:40:56 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Sat, 1 Mar 2008 18:40:56 GMT Subject: rpms/irssi/devel irssi.spec,1.31,1.32 Message-ID: <200803011840.m21IeuDU009800@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/irssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9567 Modified Files: irssi.spec Log Message: rebuild Index: irssi.spec =================================================================== RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- irssi.spec 1 Mar 2008 18:26:47 -0000 1.31 +++ irssi.spec 1 Mar 2008 18:40:20 -0000 1.32 @@ -3,7 +3,7 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 0.8.12 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/Communications @@ -75,7 +75,7 @@ %{_datadir}/%{name} %{_libdir}/%{name} %{_mandir}/man1/%{name}.1* -%{_includedir}/%{name}/config-$(getconf LONG_BIT).h +%{_includedir}/%{name}/config-*.h %{perl_vendorarch}/Irssi* %{perl_vendorarch}/auto/Irssi @@ -85,7 +85,7 @@ %{_includedir}/irssi %changelog -* Sat Mar 1 2008 Marek Mahut - 0.8.12-7 +* Sat Mar 1 2008 Marek Mahut - 0.8.12-8 - Fix for multiarch conflict (BZ#341591) * Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-5 From fedora-extras-commits at redhat.com Sat Mar 1 18:53:43 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 1 Mar 2008 18:53:43 GMT Subject: rpms/perl-Catalyst-Plugin-Static-Simple/devel perl-Catalyst-Plugin-Static-Simple.spec, 1.4, 1.5 Message-ID: <200803011853.m21IrhsQ010114@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Static-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10092 Modified Files: perl-Catalyst-Plugin-Static-Simple.spec Log Message: * Sat Mar 01 2008 Chris Weyl 0.20-1 - update to 0.20 Index: perl-Catalyst-Plugin-Static-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Static-Simple/devel/perl-Catalyst-Plugin-Static-Simple.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Catalyst-Plugin-Static-Simple.spec 10 Aug 2007 01:16:03 -0000 1.4 +++ perl-Catalyst-Plugin-Static-Simple.spec 1 Mar 2008 18:53:07 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-Catalyst-Plugin-Static-Simple -Version: 0.19 +Version: 0.20 Release: 1%{?dist} Summary: Make serving static pages painless -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-Static-Simple/ Source0: http://www.cpan.org/authors/id/A/AG/AGRUNDMA/Catalyst-Plugin-Static-Simple-%{version}.tar.gz @@ -83,6 +83,9 @@ %{_mandir}/man3/* %changelog +* Sat Mar 01 2008 Chris Weyl 0.20-1 +- update to 0.20 + * Thu Aug 09 2007 Chris Weyl 0.19-1 - update to 0.19 From fedora-extras-commits at redhat.com Sat Mar 1 18:57:30 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 1 Mar 2008 18:57:30 GMT Subject: rpms/perl-Catalyst-Plugin-Static-Simple/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200803011857.m21IvUAs010246@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Static-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10219 Modified Files: .cvsignore sources Log Message: * Sat Mar 01 2008 Chris Weyl 0.20-1 - update to 0.20 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Static-Simple/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Aug 2007 01:16:03 -0000 1.4 +++ .cvsignore 1 Mar 2008 18:56:52 -0000 1.5 @@ -1 +1 @@ -Catalyst-Plugin-Static-Simple-0.19.tar.gz +Catalyst-Plugin-Static-Simple-0.20.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Static-Simple/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Aug 2007 01:16:03 -0000 1.4 +++ sources 1 Mar 2008 18:56:52 -0000 1.5 @@ -1 +1 @@ -58645ce0e1f6557c7c0d9db1d72cf8c6 Catalyst-Plugin-Static-Simple-0.19.tar.gz +b97da3a3cba9e173db926548ede48f96 Catalyst-Plugin-Static-Simple-0.20.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 19:00:12 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:00:12 GMT Subject: rpms/ocaml-camlp5/devel camlp5-META, NONE, 1.1 ocaml-camlp5.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803011900.m21J0CfB010441@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlp5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10351/devel Modified Files: .cvsignore sources Added Files: camlp5-META ocaml-camlp5.spec Log Message: Initial import. --- NEW FILE camlp5-META --- # Specifications for the "camlp5" preprocessor: requires = "" version = "[distributed with Ocaml]" description = "Base for Camlp5 syntax extensions" directory = "+camlp5" # For the toploop: archive(byte,toploop,camlp5o) = "camlp5o.cma" archive(byte,toploop,camlp5r) = "camlp5r.cma" # Scheme-like syntax: # Do #predicates "syntax,camlp5scheme", followed by #require "camlp5" archive(byte,toploop,camlp5scheme) = "camlp5sch.cma" # Standard ML-like syntax: # Do #predicates "syntax,camlp5sml", followed by #require "camlp5" archive(byte,toploop,camlp5sml) = "gramlib.cma camlp5_top.cma pa_sml.cmo" # Lisp-like syntax: # Do #predicates "syntax,camlp5lisp", followed by #require "camlp5" archive(byte,toploop,camlp5lisp) = "gramlib.cma camlp5_top.cma pa_lisp.cmo" # For the preprocessor itself: archive(syntax,preprocessor,camlp5o) = "pa_o.cmo pa_op.cmo pr_dump.cmo" archive(syntax,preprocessor,camlp5r) = "pa_r.cmo pa_rp.cmo pr_dump.cmo" archive(syntax,preprocessor,camlp5sml) = "pa_sml.cmo pr_dump.cmo" archive(syntax,preprocessor,camlp5scheme) = "pa_scheme.cmo pr_dump.cmo" archive(syntax,preprocessor,camlp5lisp) = "pa_lisp.cmo pr_dump.cmo" preprocessor = "camlp5 -nolib" package "gramlib" ( requires(toploop) = "camlp5" version = "[distributed with Ocaml]" description = "Grammar library to create syntax extensions" archive(byte) = "gramlib.cma" archive(byte,toploop) = "" # already contained in camlp5*.cma archive(native) = "gramlib.cmxa" ) package "quotations" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Quotations to create AST nodes" archive(syntax,preprocessor) = "q_MLast.cmo" archive(syntax,toploop) = "q_MLast.cmo" ) package "phony_quotations" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Phony quotations" archive(syntax,preprocessor) = "q_phony.cmo" archive(syntax,toploop) = "q_phony.cmo" ) package "extend" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: EXTEND the camlp5 grammar" archive(syntax,preprocessor) = "pa_extend.cmo" archive(syntax,toploop) = "pa_extend.cmo" ) package "extfun" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Extensible functions" archive(syntax,preprocessor) = "pa_extfun.cmo" archive(syntax,toploop) = "pa_extfun.cmo" ) package "fstream" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Functional stream parsers" archive(syntax,preprocessor) = "pa_fstream.cmo" archive(syntax,toploop) = "pa_fstream.cmo" ) package "macro" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Conditional compilation" archive(syntax,preprocessor) = "pa_macro.cmo" archive(syntax,toploop) = "pa_macro.cmo" ) package "unit_constraints" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Type constraints of type unit (revised syntax only)" archive(syntax,preprocessor,camlp5r) = "pa_ru.cmo" archive(syntax,toploop,camlp5r) = "pa_ru.cmo" error(syntax,-camlp5r) = "Not available" ) --- NEW FILE ocaml-camlp5.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-camlp5 Version: 5.08 Release: 1%{?dist} Summary: Classical version of camlp4 OCaml preprocessor Group: Development/Libraries License: BSD URL: http://pauillac.inria.fr/~ddr/camlp5/ Source0: http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz Source1: camlp5-META BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.1, ocaml-ocamldoc %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Pa_extend %description Camlp5 is a preprocessor-pretty-printer of OCaml. It is the continuation of the classical camlp4 with new features. OCaml 3.10 and above have an official camlp4 which is incompatible with classical (<= 3.09) versions. You can find that in the ocaml-camlp4 package. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n camlp5-%{version} ./configure %build make all %if %opt make opt strip meta/camlp5r.opt etc/camlp5o.opt %endif %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir} make install \ LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml \ OLIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} cp %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/ocaml/camlp5/META %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE %{_libdir}/ocaml/camlp5 %if %opt %exclude %{_libdir}/ocaml/camlp5/*.a %exclude %{_libdir}/ocaml/camlp5/*.cmxa %exclude %{_libdir}/ocaml/camlp5/*.cmx %endif %exclude %{_libdir}/ocaml/camlp5/*.mli %{_libdir}/ocaml/camlp5/META %files devel %defattr(-,root,root,-) %doc README LICENSE CHANGES ICHANGES DEVEL UPGRADING %if %opt %{_libdir}/ocaml/camlp5/*.a %{_libdir}/ocaml/camlp5/*.cmxa %{_libdir}/ocaml/camlp5/*.cmx %endif %{_libdir}/ocaml/camlp5/*.mli %{_bindir}/camlp5* %{_bindir}/mkcamlp5* %{_bindir}/ocpp5 %{_mandir}/man1/*.1* %changelog * Thu Feb 21 2008 Richard W.M. Jones - 5.08-1 - New upstream version 5.08. - BR ocaml >= 3.10.1. * Tue Feb 12 2008 Richard W.M. Jones - 5.04-2 - Strip the *.opt binaries. * Thu Dec 13 2007 Stijn Hoop - 5.04-1 - Update to 5.04 * Wed Aug 8 2007 Richard W.M. Jones - 4.07-2 - Add a META file. * Wed Aug 8 2007 Richard W.M. Jones - 4.07-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlp5/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2008 18:31:57 -0000 1.1 +++ .cvsignore 1 Mar 2008 18:59:37 -0000 1.2 @@ -0,0 +1 @@ +camlp5-5.08.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlp5/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:31:57 -0000 1.1 +++ sources 1 Mar 2008 18:59:37 -0000 1.2 @@ -0,0 +1 @@ +61f617f11eedb26ad8607fe21413f920 camlp5-5.08.tgz From fedora-extras-commits at redhat.com Sat Mar 1 19:01:50 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:01:50 GMT Subject: rpms/ocaml-camlp5/F-8 camlp5-META, NONE, 1.1 ocaml-camlp5.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803011901.m21J1oYH017682@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlp5/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16503/F-8 Modified Files: .cvsignore sources Added Files: camlp5-META ocaml-camlp5.spec Log Message: Initial import. --- NEW FILE camlp5-META --- # Specifications for the "camlp5" preprocessor: requires = "" version = "[distributed with Ocaml]" description = "Base for Camlp5 syntax extensions" directory = "+camlp5" # For the toploop: archive(byte,toploop,camlp5o) = "camlp5o.cma" archive(byte,toploop,camlp5r) = "camlp5r.cma" # Scheme-like syntax: # Do #predicates "syntax,camlp5scheme", followed by #require "camlp5" archive(byte,toploop,camlp5scheme) = "camlp5sch.cma" # Standard ML-like syntax: # Do #predicates "syntax,camlp5sml", followed by #require "camlp5" archive(byte,toploop,camlp5sml) = "gramlib.cma camlp5_top.cma pa_sml.cmo" # Lisp-like syntax: # Do #predicates "syntax,camlp5lisp", followed by #require "camlp5" archive(byte,toploop,camlp5lisp) = "gramlib.cma camlp5_top.cma pa_lisp.cmo" # For the preprocessor itself: archive(syntax,preprocessor,camlp5o) = "pa_o.cmo pa_op.cmo pr_dump.cmo" archive(syntax,preprocessor,camlp5r) = "pa_r.cmo pa_rp.cmo pr_dump.cmo" archive(syntax,preprocessor,camlp5sml) = "pa_sml.cmo pr_dump.cmo" archive(syntax,preprocessor,camlp5scheme) = "pa_scheme.cmo pr_dump.cmo" archive(syntax,preprocessor,camlp5lisp) = "pa_lisp.cmo pr_dump.cmo" preprocessor = "camlp5 -nolib" package "gramlib" ( requires(toploop) = "camlp5" version = "[distributed with Ocaml]" description = "Grammar library to create syntax extensions" archive(byte) = "gramlib.cma" archive(byte,toploop) = "" # already contained in camlp5*.cma archive(native) = "gramlib.cmxa" ) package "quotations" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Quotations to create AST nodes" archive(syntax,preprocessor) = "q_MLast.cmo" archive(syntax,toploop) = "q_MLast.cmo" ) package "phony_quotations" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Phony quotations" archive(syntax,preprocessor) = "q_phony.cmo" archive(syntax,toploop) = "q_phony.cmo" ) package "extend" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: EXTEND the camlp5 grammar" archive(syntax,preprocessor) = "pa_extend.cmo" archive(syntax,toploop) = "pa_extend.cmo" ) package "extfun" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Extensible functions" archive(syntax,preprocessor) = "pa_extfun.cmo" archive(syntax,toploop) = "pa_extfun.cmo" ) package "fstream" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Functional stream parsers" archive(syntax,preprocessor) = "pa_fstream.cmo" archive(syntax,toploop) = "pa_fstream.cmo" ) package "macro" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Conditional compilation" archive(syntax,preprocessor) = "pa_macro.cmo" archive(syntax,toploop) = "pa_macro.cmo" ) package "unit_constraints" ( requires = "camlp5" version = "[distributed with Ocaml]" description = "Syntax extension: Type constraints of type unit (revised syntax only)" archive(syntax,preprocessor,camlp5r) = "pa_ru.cmo" archive(syntax,toploop,camlp5r) = "pa_ru.cmo" error(syntax,-camlp5r) = "Not available" ) --- NEW FILE ocaml-camlp5.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-camlp5 Version: 5.08 Release: 1%{?dist} Summary: Classical version of camlp4 OCaml preprocessor Group: Development/Libraries License: BSD URL: http://pauillac.inria.fr/~ddr/camlp5/ Source0: http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz Source1: camlp5-META BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.1, ocaml-ocamldoc %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Pa_extend %description Camlp5 is a preprocessor-pretty-printer of OCaml. It is the continuation of the classical camlp4 with new features. OCaml 3.10 and above have an official camlp4 which is incompatible with classical (<= 3.09) versions. You can find that in the ocaml-camlp4 package. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n camlp5-%{version} ./configure %build make all %if %opt make opt strip meta/camlp5r.opt etc/camlp5o.opt %endif %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir} make install \ LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml \ OLIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} cp %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/ocaml/camlp5/META %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE %{_libdir}/ocaml/camlp5 %if %opt %exclude %{_libdir}/ocaml/camlp5/*.a %exclude %{_libdir}/ocaml/camlp5/*.cmxa %exclude %{_libdir}/ocaml/camlp5/*.cmx %endif %exclude %{_libdir}/ocaml/camlp5/*.mli %{_libdir}/ocaml/camlp5/META %files devel %defattr(-,root,root,-) %doc README LICENSE CHANGES ICHANGES DEVEL UPGRADING %if %opt %{_libdir}/ocaml/camlp5/*.a %{_libdir}/ocaml/camlp5/*.cmxa %{_libdir}/ocaml/camlp5/*.cmx %endif %{_libdir}/ocaml/camlp5/*.mli %{_bindir}/camlp5* %{_bindir}/mkcamlp5* %{_bindir}/ocpp5 %{_mandir}/man1/*.1* %changelog * Thu Feb 21 2008 Richard W.M. Jones - 5.08-1 - New upstream version 5.08. - BR ocaml >= 3.10.1. * Tue Feb 12 2008 Richard W.M. Jones - 5.04-2 - Strip the *.opt binaries. * Thu Dec 13 2007 Stijn Hoop - 5.04-1 - Update to 5.04 * Wed Aug 8 2007 Richard W.M. Jones - 4.07-2 - Add a META file. * Wed Aug 8 2007 Richard W.M. Jones - 4.07-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlp5/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2008 18:31:57 -0000 1.1 +++ .cvsignore 1 Mar 2008 19:01:13 -0000 1.2 @@ -0,0 +1 @@ +camlp5-5.08.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlp5/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:31:57 -0000 1.1 +++ sources 1 Mar 2008 19:01:13 -0000 1.2 @@ -0,0 +1 @@ +61f617f11eedb26ad8607fe21413f920 camlp5-5.08.tgz From fedora-extras-commits at redhat.com Sat Mar 1 19:03:54 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:03:54 GMT Subject: rpms/ocaml-camlp5/devel ocaml-camlp5.spec,1.1,1.2 Message-ID: <200803011903.m21J3skk017880@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlp5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17782 Modified Files: ocaml-camlp5.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 5.08-2 - Build on ppc64. Index: ocaml-camlp5.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlp5/devel/ocaml-camlp5.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-camlp5.spec 1 Mar 2008 18:59:37 -0000 1.1 +++ ocaml-camlp5.spec 1 Mar 2008 19:03:19 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-camlp5 Version: 5.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Classical version of camlp4 OCaml preprocessor Group: Development/Libraries @@ -12,7 +12,6 @@ Source0: http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz Source1: camlp5-META BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.1, ocaml-ocamldoc @@ -100,6 +99,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 5.08-2 +- Build on ppc64. + * Thu Feb 21 2008 Richard W.M. Jones - 5.08-1 - New upstream version 5.08. - BR ocaml >= 3.10.1. From fedora-extras-commits at redhat.com Sat Mar 1 19:04:23 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:04:23 GMT Subject: rpms/ocaml-cairo/devel ocaml-cairo-META, NONE, 1.1 ocaml-cairo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803011904.m21J4NLS017952@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cairo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17852/devel Modified Files: .cvsignore sources Added Files: ocaml-cairo-META ocaml-cairo.spec Log Message: Initial import. --- NEW FILE ocaml-cairo-META --- name = "cairo-ocaml" description = "Bindings to the cairo library." archive(byte) = "cairo.cma" archive(native) = "cairo.cmxa" requires = "bigarray" package "lablgtk2" ( requires = "cairo lablgtk2" archive(byte) = "cairo_lablgtk.cma" archive(native) = "cairo_lablgtk.cmxa" ) --- NEW FILE ocaml-cairo.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} # There are no source releases for ocaml-cairo. To get the source # matching this you have to do: # # cvs -d:pserver:anonymous at cvs.cairographics.org:/cvs/cairo co -D 2008-03-01 cairo-ocaml # tar zcf /tmp/ocaml-cairo-1.2.0.cvs20080301.tar.gz --exclude CVS cairo-ocaml # # Whether you'll get precisely the same tarball by this method is # questionable. If files get checked out in a different order then # you might need to use 'diff -urN' instead of comparing MD5 hashes. Name: ocaml-cairo Version: 1.2.0.cvs20080301 Release: 1%{?dist} Summary: OCaml library for accessing cairo graphics Group: Development/Libraries License: LGPLv2 URL: http://cairographics.org/cairo-ocaml/ Source0: ocaml-cairo-%{version}.tar.gz Source1: ocaml-cairo-META BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-lablgtk-devel BuildRequires: cairo-devel BuildRequires: automake BuildRequires: gtk2-devel BuildRequires: chrpath %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description Cairo is a multi-platform library providing anti-aliased vector-based rendering for multiple target backends. Paths consist of line segments and cubic splines and can be rendered at any width with various join and cap styles. All colors may be specified with optional translucence (opacity/alpha) and combined using the extended Porter/Duff compositing algebra as found in the X Render Extension. Cairo exports a stateful rendering API similar in spirit to the path construction, text, and painting operators of PostScript, (with the significant addition of translucence in the imaging model). When complete, the API is intended to support the complete imaging model of PDF 1.4. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n cairo-ocaml aclocal -I support autoconf ./configure --libdir=%{_libdir} cp %{SOURCE1} META %build make make doc %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs ocamlfind install cairo src/{*.mli,*.cmi,*.cma,lib*.a,*.cmxa,*.cmx,dll*.so} META strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dll*.so chrpath --delete $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dll*.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/ocaml/cairo %if %opt %exclude %{_libdir}/ocaml/cairo/*.a %exclude %{_libdir}/ocaml/cairo/*.cmxa %exclude %{_libdir}/ocaml/cairo/*.cmx %endif %exclude %{_libdir}/ocaml/cairo/*.mli %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) %doc COPYING ChangeLog README doc/html %if %opt %{_libdir}/ocaml/cairo/*.a %{_libdir}/ocaml/cairo/*.cmxa %{_libdir}/ocaml/cairo/*.cmx %endif %{_libdir}/ocaml/cairo/*.mli %changelog * Sat Mar 1 2008 Richard W.M. Jones - 1.2.0.cvs20080301-1 - Upgrade to latest CVS. - Include instructions on how check out versions from CVS. * Fri Feb 29 2008 Richard W.M. Jones - 1.2.0.cvs20080224-2 - Added BRs for automake and gtk2-devel. * Sun Feb 24 2008 Richard W.M. Jones - 1.2.0.cvs20080224-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2008 18:38:49 -0000 1.1 +++ .cvsignore 1 Mar 2008 19:03:48 -0000 1.2 @@ -0,0 +1 @@ +ocaml-cairo-1.2.0.cvs20080301.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:38:49 -0000 1.1 +++ sources 1 Mar 2008 19:03:48 -0000 1.2 @@ -0,0 +1 @@ +a4a91f25a2c18d5d26f2f19cf5b12980 ocaml-cairo-1.2.0.cvs20080301.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 19:04:33 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:04:33 GMT Subject: rpms/ocaml-sqlite/devel ocaml-sqlite-debian-install-no-mktop.patch, NONE, 1.1 ocaml-sqlite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803011904.m21J4X4c017985@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-sqlite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17862/devel Modified Files: .cvsignore sources Added Files: ocaml-sqlite-debian-install-no-mktop.patch ocaml-sqlite.spec Log Message: Initial import. ocaml-sqlite-debian-install-no-mktop.patch: --- NEW FILE ocaml-sqlite-debian-install-no-mktop.patch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## install-no-mktop.dpatch by Samuel Mimram ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Allow installation without building in native mode. @DPATCH@ diff -urNad ocaml-sqlite3-0.16.0~/Makefile.in ocaml-sqlite3-0.16.0/Makefile.in --- ocaml-sqlite3-0.16.0~/Makefile.in 2007-05-05 11:34:30.000000000 +0200 +++ ocaml-sqlite3-0.16.0/Makefile.in 2007-05-05 11:35:32.000000000 +0200 @@ -31,13 +31,9 @@ distclean: clean rm -rf autom4te.* config.* META Makefile doc -# install rebuilds sqlite3top to point to the findlib-managed dll and not the -# one in . -install: sqlite3.cma sqlite3.cmxa sqlite3top +install: sqlite3.cma [ -f *.so ] && SO_FILES=*.so; \ - ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma *.cmxa *.a *.cmx $$SO_FILES - ocamlfind ocamlmktop -o sqlite3top -package "sqlite3" sqlite3.cma - $(INSTALL) sqlite3top $(bindir)/sqlite3top + ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma $(wildcard *.cmxa *.a *.cmx) $$SO_FILES remove: uninstall uninstall: --- NEW FILE ocaml-sqlite.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-sqlite Version: 0.23.0 Release: 2%{?dist} Summary: OCaml library for accessing SQLite3 databases Group: Development/Libraries License: BSD URL: http://www.ocaml.info/home/ocaml_sources.html Source0: http://www.ocaml.info/ocaml_sources/ocaml-sqlite3-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 Patch0: ocaml-sqlite-debian-install-no-mktop.patch BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel BuildRequires: sqlite-devel >= 3 BuildRequires: chrpath %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description SQLite 3 database library wrapper for OCaml. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n ocaml-sqlite3-%{version} %patch0 -p1 ./configure --libdir=%{_libdir} %build make all %check pushd test for f in test_db test_exec test_stmt test_fun; do ocamlopt -I .. str.cmxa sqlite3.cmxa $f.ml -o $f ./$f done popd %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install strip $OCAMLFIND_DESTDIR/stublibs/dll*.so chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/ocaml/sqlite3 %if %opt %exclude %{_libdir}/ocaml/sqlite3/*.a %exclude %{_libdir}/ocaml/sqlite3/*.cmxa %exclude %{_libdir}/ocaml/sqlite3/*.cmx %endif %exclude %{_libdir}/ocaml/sqlite3/*.mli %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) %doc COPYING CHANGES doc README TODO VERSION %if %opt %{_libdir}/ocaml/sqlite3/*.a %{_libdir}/ocaml/sqlite3/*.cmxa %{_libdir}/ocaml/sqlite3/*.cmx %endif %{_libdir}/ocaml/sqlite3/*.mli %changelog * Fri Feb 29 2008 Richard W.M. Jones - 0.23.0-2 - Added BR ocaml-camlp4-devel. * Sun Feb 24 2008 Richard W.M. Jones - 0.23.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2008 18:36:42 -0000 1.1 +++ .cvsignore 1 Mar 2008 19:03:57 -0000 1.2 @@ -0,0 +1 @@ +ocaml-sqlite3-0.23.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:36:42 -0000 1.1 +++ sources 1 Mar 2008 19:03:57 -0000 1.2 @@ -0,0 +1 @@ +473b2dea5684dc681c0e3e7ecb083cee ocaml-sqlite3-0.23.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 19:06:03 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:06:03 GMT Subject: rpms/ocaml-cairo/devel ocaml-cairo.spec,1.1,1.2 Message-ID: <200803011906.m21J63v3018217@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cairo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095 Modified Files: ocaml-cairo.spec Log Message: Build for ppc64. Index: ocaml-cairo.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/ocaml-cairo.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-cairo.spec 1 Mar 2008 19:03:48 -0000 1.1 +++ ocaml-cairo.spec 1 Mar 2008 19:05:26 -0000 1.2 @@ -22,7 +22,6 @@ Source0: ocaml-cairo-%{version}.tar.gz Source1: ocaml-cairo-META BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel From fedora-extras-commits at redhat.com Sat Mar 1 19:06:08 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:06:08 GMT Subject: rpms/ocaml-sqlite/devel ocaml-sqlite.spec,1.1,1.2 Message-ID: <200803011906.m21J68bV018255@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-sqlite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18091 Modified Files: ocaml-sqlite.spec Log Message: Build for ppc64. Index: ocaml-sqlite.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/ocaml-sqlite.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-sqlite.spec 1 Mar 2008 19:03:57 -0000 1.1 +++ ocaml-sqlite.spec 1 Mar 2008 19:05:32 -0000 1.2 @@ -11,7 +11,6 @@ URL: http://www.ocaml.info/home/ocaml_sources.html Source0: http://www.ocaml.info/ocaml_sources/ocaml-sqlite3-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 Patch0: ocaml-sqlite-debian-install-no-mktop.patch From fedora-extras-commits at redhat.com Sat Mar 1 19:06:12 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:06:12 GMT Subject: rpms/ocaml-sqlite/F-8 ocaml-sqlite-debian-install-no-mktop.patch, NONE, 1.1 ocaml-sqlite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803011906.m21J6Cwu018264@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-sqlite/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18123/F-8 Modified Files: .cvsignore sources Added Files: ocaml-sqlite-debian-install-no-mktop.patch ocaml-sqlite.spec Log Message: Initial import. ocaml-sqlite-debian-install-no-mktop.patch: --- NEW FILE ocaml-sqlite-debian-install-no-mktop.patch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## install-no-mktop.dpatch by Samuel Mimram ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Allow installation without building in native mode. @DPATCH@ diff -urNad ocaml-sqlite3-0.16.0~/Makefile.in ocaml-sqlite3-0.16.0/Makefile.in --- ocaml-sqlite3-0.16.0~/Makefile.in 2007-05-05 11:34:30.000000000 +0200 +++ ocaml-sqlite3-0.16.0/Makefile.in 2007-05-05 11:35:32.000000000 +0200 @@ -31,13 +31,9 @@ distclean: clean rm -rf autom4te.* config.* META Makefile doc -# install rebuilds sqlite3top to point to the findlib-managed dll and not the -# one in . -install: sqlite3.cma sqlite3.cmxa sqlite3top +install: sqlite3.cma [ -f *.so ] && SO_FILES=*.so; \ - ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma *.cmxa *.a *.cmx $$SO_FILES - ocamlfind ocamlmktop -o sqlite3top -package "sqlite3" sqlite3.cma - $(INSTALL) sqlite3top $(bindir)/sqlite3top + ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma $(wildcard *.cmxa *.a *.cmx) $$SO_FILES remove: uninstall uninstall: --- NEW FILE ocaml-sqlite.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-sqlite Version: 0.23.0 Release: 2%{?dist} Summary: OCaml library for accessing SQLite3 databases Group: Development/Libraries License: BSD URL: http://www.ocaml.info/home/ocaml_sources.html Source0: http://www.ocaml.info/ocaml_sources/ocaml-sqlite3-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 Patch0: ocaml-sqlite-debian-install-no-mktop.patch BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel BuildRequires: sqlite-devel >= 3 BuildRequires: chrpath %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description SQLite 3 database library wrapper for OCaml. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n ocaml-sqlite3-%{version} %patch0 -p1 ./configure --libdir=%{_libdir} %build make all %check pushd test for f in test_db test_exec test_stmt test_fun; do ocamlopt -I .. str.cmxa sqlite3.cmxa $f.ml -o $f ./$f done popd %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install strip $OCAMLFIND_DESTDIR/stublibs/dll*.so chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/ocaml/sqlite3 %if %opt %exclude %{_libdir}/ocaml/sqlite3/*.a %exclude %{_libdir}/ocaml/sqlite3/*.cmxa %exclude %{_libdir}/ocaml/sqlite3/*.cmx %endif %exclude %{_libdir}/ocaml/sqlite3/*.mli %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) %doc COPYING CHANGES doc README TODO VERSION %if %opt %{_libdir}/ocaml/sqlite3/*.a %{_libdir}/ocaml/sqlite3/*.cmxa %{_libdir}/ocaml/sqlite3/*.cmx %endif %{_libdir}/ocaml/sqlite3/*.mli %changelog * Fri Feb 29 2008 Richard W.M. Jones - 0.23.0-2 - Added BR ocaml-camlp4-devel. * Sun Feb 24 2008 Richard W.M. Jones - 0.23.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sqlite/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2008 18:36:42 -0000 1.1 +++ .cvsignore 1 Mar 2008 19:05:37 -0000 1.2 @@ -0,0 +1 @@ +ocaml-sqlite3-0.23.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sqlite/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:36:42 -0000 1.1 +++ sources 1 Mar 2008 19:05:37 -0000 1.2 @@ -0,0 +1 @@ +473b2dea5684dc681c0e3e7ecb083cee ocaml-sqlite3-0.23.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 1 19:06:18 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:06:18 GMT Subject: rpms/ocaml-cairo/F-8 ocaml-cairo-META, NONE, 1.1 ocaml-cairo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803011906.m21J6Irn018332@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cairo/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18118/F-8 Modified Files: .cvsignore sources Added Files: ocaml-cairo-META ocaml-cairo.spec Log Message: Initial import. --- NEW FILE ocaml-cairo-META --- name = "cairo-ocaml" description = "Bindings to the cairo library." archive(byte) = "cairo.cma" archive(native) = "cairo.cmxa" requires = "bigarray" package "lablgtk2" ( requires = "cairo lablgtk2" archive(byte) = "cairo_lablgtk.cma" archive(native) = "cairo_lablgtk.cmxa" ) --- NEW FILE ocaml-cairo.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} # There are no source releases for ocaml-cairo. To get the source # matching this you have to do: # # cvs -d:pserver:anonymous at cvs.cairographics.org:/cvs/cairo co -D 2008-03-01 cairo-ocaml # tar zcf /tmp/ocaml-cairo-1.2.0.cvs20080301.tar.gz --exclude CVS cairo-ocaml # # Whether you'll get precisely the same tarball by this method is # questionable. If files get checked out in a different order then # you might need to use 'diff -urN' instead of comparing MD5 hashes. Name: ocaml-cairo Version: 1.2.0.cvs20080301 Release: 1%{?dist} Summary: OCaml library for accessing cairo graphics Group: Development/Libraries License: LGPLv2 URL: http://cairographics.org/cairo-ocaml/ Source0: ocaml-cairo-%{version}.tar.gz Source1: ocaml-cairo-META BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-lablgtk-devel BuildRequires: cairo-devel BuildRequires: automake BuildRequires: gtk2-devel BuildRequires: chrpath %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description Cairo is a multi-platform library providing anti-aliased vector-based rendering for multiple target backends. Paths consist of line segments and cubic splines and can be rendered at any width with various join and cap styles. All colors may be specified with optional translucence (opacity/alpha) and combined using the extended Porter/Duff compositing algebra as found in the X Render Extension. Cairo exports a stateful rendering API similar in spirit to the path construction, text, and painting operators of PostScript, (with the significant addition of translucence in the imaging model). When complete, the API is intended to support the complete imaging model of PDF 1.4. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n cairo-ocaml aclocal -I support autoconf ./configure --libdir=%{_libdir} cp %{SOURCE1} META %build make make doc %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs ocamlfind install cairo src/{*.mli,*.cmi,*.cma,lib*.a,*.cmxa,*.cmx,dll*.so} META strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dll*.so chrpath --delete $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dll*.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/ocaml/cairo %if %opt %exclude %{_libdir}/ocaml/cairo/*.a %exclude %{_libdir}/ocaml/cairo/*.cmxa %exclude %{_libdir}/ocaml/cairo/*.cmx %endif %exclude %{_libdir}/ocaml/cairo/*.mli %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) %doc COPYING ChangeLog README doc/html %if %opt %{_libdir}/ocaml/cairo/*.a %{_libdir}/ocaml/cairo/*.cmxa %{_libdir}/ocaml/cairo/*.cmx %endif %{_libdir}/ocaml/cairo/*.mli %changelog * Sat Mar 1 2008 Richard W.M. Jones - 1.2.0.cvs20080301-1 - Upgrade to latest CVS. - Include instructions on how check out versions from CVS. * Fri Feb 29 2008 Richard W.M. Jones - 1.2.0.cvs20080224-2 - Added BRs for automake and gtk2-devel. * Sun Feb 24 2008 Richard W.M. Jones - 1.2.0.cvs20080224-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cairo/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2008 18:38:49 -0000 1.1 +++ .cvsignore 1 Mar 2008 19:05:41 -0000 1.2 @@ -0,0 +1 @@ +ocaml-cairo-1.2.0.cvs20080301.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cairo/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:38:49 -0000 1.1 +++ sources 1 Mar 2008 19:05:41 -0000 1.2 @@ -0,0 +1 @@ +a4a91f25a2c18d5d26f2f19cf5b12980 ocaml-cairo-1.2.0.cvs20080301.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 19:07:23 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:07:23 GMT Subject: rpms/ocaml-cairo/devel ocaml-cairo.spec,1.2,1.3 Message-ID: <200803011907.m21J7NKr018422@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cairo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18384 Modified Files: ocaml-cairo.spec Log Message: Build for ppc64. Index: ocaml-cairo.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/ocaml-cairo.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-cairo.spec 1 Mar 2008 19:05:26 -0000 1.2 +++ ocaml-cairo.spec 1 Mar 2008 19:06:48 -0000 1.3 @@ -13,7 +13,7 @@ Name: ocaml-cairo Version: 1.2.0.cvs20080301 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for accessing cairo graphics Group: Development/Libraries @@ -118,9 +118,10 @@ %changelog -* Sat Mar 1 2008 Richard W.M. Jones - 1.2.0.cvs20080301-1 +* Sat Mar 1 2008 Richard W.M. Jones - 1.2.0.cvs20080301-2 - Upgrade to latest CVS. - Include instructions on how check out versions from CVS. +- Build for ppc64. * Fri Feb 29 2008 Richard W.M. Jones - 1.2.0.cvs20080224-2 - Added BRs for automake and gtk2-devel. From fedora-extras-commits at redhat.com Sat Mar 1 19:07:59 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:07:59 GMT Subject: rpms/ocaml-sqlite/devel ocaml-sqlite.spec,1.2,1.3 Message-ID: <200803011907.m21J7xVr018491@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-sqlite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18416 Modified Files: ocaml-sqlite.spec Log Message: Build for ppc64. Index: ocaml-sqlite.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/ocaml-sqlite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-sqlite.spec 1 Mar 2008 19:05:32 -0000 1.2 +++ ocaml-sqlite.spec 1 Mar 2008 19:07:20 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-sqlite Version: 0.23.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for accessing SQLite3 databases Group: Development/Libraries @@ -102,6 +102,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 0.23.0-3 +- Build for ppc64. + * Fri Feb 29 2008 Richard W.M. Jones - 0.23.0-2 - Added BR ocaml-camlp4-devel. From fedora-extras-commits at redhat.com Sat Mar 1 19:11:06 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:11:06 GMT Subject: rpms/ocaml-camlp5/F-8 ocaml-camlp5.spec,1.1,1.2 Message-ID: <200803011911.m21JB68T018611@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlp5/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18591 Modified Files: ocaml-camlp5.spec Log Message: * Sat Mar 1 2008 Richard W.M. Jones - 5.08-2 - Build for OCaml 3.10.0 in F8. Index: ocaml-camlp5.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlp5/F-8/ocaml-camlp5.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-camlp5.spec 1 Mar 2008 19:01:13 -0000 1.1 +++ ocaml-camlp5.spec 1 Mar 2008 19:10:30 -0000 1.2 @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 -BuildRequires: ocaml >= 3.10.1, ocaml-ocamldoc +BuildRequires: ocaml >= 3.10.0, ocaml-ocamldoc %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree @@ -100,6 +100,9 @@ %changelog +* Sat Mar 1 2008 Richard W.M. Jones - 5.08-2 +- Build for OCaml 3.10.0 in F8. + * Thu Feb 21 2008 Richard W.M. Jones - 5.08-1 - New upstream version 5.08. - BR ocaml >= 3.10.1. From fedora-extras-commits at redhat.com Sat Mar 1 19:12:19 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sat, 1 Mar 2008 19:12:19 GMT Subject: rpms/ocaml-camlp5/F-8 ocaml-camlp5.spec,1.2,1.3 Message-ID: <200803011912.m21JCJUs018678@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlp5/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18650 Modified Files: ocaml-camlp5.spec Log Message: Forgot to update release number. Index: ocaml-camlp5.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlp5/F-8/ocaml-camlp5.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-camlp5.spec 1 Mar 2008 19:10:30 -0000 1.2 +++ ocaml-camlp5.spec 1 Mar 2008 19:11:44 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-camlp5 Version: 5.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Classical version of camlp4 OCaml preprocessor Group: Development/Libraries From fedora-extras-commits at redhat.com Sat Mar 1 19:21:56 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 1 Mar 2008 19:21:56 GMT Subject: rpms/perl-Catalyst-Runtime/devel .cvsignore, 1.2, 1.3 perl-Catalyst-Runtime.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200803011921.m21JLuHe018881@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18854 Modified Files: .cvsignore perl-Catalyst-Runtime.spec sources Log Message: * Sat Mar 01 2008 Chris Weyl 5.7012-1 - update to 5.7012 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 May 2007 05:01:29 -0000 1.2 +++ .cvsignore 1 Mar 2008 19:21:20 -0000 1.3 @@ -1 +1 @@ -Catalyst-Runtime-5.7007.tar.gz +Catalyst-Runtime-5.7012.tar.gz Index: perl-Catalyst-Runtime.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/perl-Catalyst-Runtime.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Catalyst-Runtime.spec 15 May 2007 05:11:58 -0000 1.2 +++ perl-Catalyst-Runtime.spec 1 Mar 2008 19:21:20 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Catalyst-Runtime -Version: 5.7007 -Release: 4%{?dist} +Version: 5.7012 +Release: 1%{?dist} Summary: Catalyst core modules -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Runtime/ # remember to rebuild perl-Catalyst-Devel on update of this package @@ -24,7 +24,7 @@ BuildRequires: perl(Data::Dump) BuildRequires: perl(File::Modified) BuildRequires: perl(HTML::Entities) -BuildRequires: perl(HTTP::Body) >= 0.6 +BuildRequires: perl(HTTP::Body) >= 0.9 BuildRequires: perl(HTTP::Headers) >= 1.64 BuildRequires: perl(HTTP::Request) BuildRequires: perl(HTTP::Request::AsCGI) >= 0.5 @@ -39,7 +39,8 @@ # test BuildRequires: perl(Class::C3) BuildRequires: perl(File::Copy::Recursive) -BuildRequires: perl(GTop) +#BuildRequires: perl(GTop) +BuildRequires: perl(Proc::ProcessTable) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(YAML) @@ -47,11 +48,13 @@ # use base ... Requires: perl(Class::Accessor::Fast) Requires: perl(Class::Data::Inheritable) +# 'requires' +Requires: perl(HTTP::Request::AsCGI) >= 0.5 %description This is the primary class for the Catalyst-Runtime distribution. It provides -the core of the of any runtime Catalyst instance. +the core of the any runtime Catalyst instance. %prep %setup -q -n Catalyst-Runtime-%{version} @@ -104,6 +107,12 @@ %exclude %{_mandir}/man1/* %changelog +* Sat Mar 01 2008 Chris Weyl 5.7012-1 +- update to 5.7012 + +* Sun Oct 28 2007 Chris Weyl 5.7011-1 +- update to 5.7011 + * Mon May 14 2007 Chris Weyl 5.7007-4 - bump Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 May 2007 05:01:29 -0000 1.2 +++ sources 1 Mar 2008 19:21:20 -0000 1.3 @@ -1 +1 @@ -2d4d22d4153b49d64ed715bfd81d809d Catalyst-Runtime-5.7007.tar.gz +db926f732cd24ac4c35c50e612c03b7d Catalyst-Runtime-5.7012.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 19:29:08 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 1 Mar 2008 19:29:08 GMT Subject: rpms/perl-Smart-Comments/F-7 perl-Smart-Comments.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200803011929.m21JT8T3019086@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Smart-Comments/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19034 Modified Files: perl-Smart-Comments.spec sources Log Message: * Sat Mar 01 2008 Chris Weyl 1:v1.0.3-1 - update to v1.0.3 - update lic tag - add epoch, to move away from the 1.000... representation of the version Index: perl-Smart-Comments.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Smart-Comments/F-7/perl-Smart-Comments.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Smart-Comments.spec 27 Mar 2007 22:32:49 -0000 1.4 +++ perl-Smart-Comments.spec 1 Mar 2008 19:28:26 -0000 1.5 @@ -1,23 +1,27 @@ -%define tarver v1.0.2 - Name: perl-Smart-Comments -Version: 1.000002 -Release: 4%{?dist} +Epoch: 1 +Version: v1.0.3 +Release: 1%{?dist} Summary: Comments that do more than just sit there Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Smart-Comments -Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Smart-Comments-%{tarver}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Smart-Comments-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## core -BuildRequires: perl, perl(ExtUtils::MakeMaker) -BuildRequires: perl(Test::More), perl(Text::Balanced), perl(Data::Dumper) -BuildRequires: perl(Filter::Simple), perl(List::Util) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Filter::Simple) +BuildRequires: perl(List::Util) +BuildRequires: perl(Test::More) +BuildRequires: perl(Text::Balanced) ## non-core BuildRequires: perl(version) -BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) +BuildRequires: perl(Test::Pod) +## author test +BuildRequires: perl(Test::Pod::Coverage) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -35,8 +39,9 @@ %prep -%setup -q -n Smart-Comments-%{tarver} +%setup -q -n Smart-Comments-%{version} +perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/* %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -45,10 +50,12 @@ %install rm -rf %{buildroot} + make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* + +%{_fixperms} %{buildroot}/* %check @@ -61,12 +68,17 @@ %files %defattr(-,root,root,-) -%doc README Changes +%doc README Changes t/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Sat Mar 01 2008 Chris Weyl 1:v1.0.3-1 +- update to v1.0.3 +- update lic tag +- add epoch, to move away from the 1.000... representation of the version + * Tue Mar 27 2007 Chris Weyl 1.000002-4 - be more explicit with core requires Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Smart-Comments/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Aug 2006 16:16:13 -0000 1.2 +++ sources 1 Mar 2008 19:28:26 -0000 1.3 @@ -1 +1 @@ -658df11ea3e1090a4c673b50860449b3 Smart-Comments-v1.0.2.tar.gz +899c141a4f0d624d7daaac71b6a428fd Smart-Comments-v1.0.3.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 19:29:15 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 1 Mar 2008 19:29:15 GMT Subject: rpms/perl-Smart-Comments/F-8 perl-Smart-Comments.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200803011929.m21JTFPq019124@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Smart-Comments/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19060 Modified Files: perl-Smart-Comments.spec sources Log Message: * Sat Mar 01 2008 Chris Weyl 1:v1.0.3-1 - update to v1.0.3 - update lic tag - add epoch, to move away from the 1.000... representation of the version Index: perl-Smart-Comments.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Smart-Comments/F-8/perl-Smart-Comments.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Smart-Comments.spec 27 Mar 2007 22:32:49 -0000 1.4 +++ perl-Smart-Comments.spec 1 Mar 2008 19:28:41 -0000 1.5 @@ -1,23 +1,27 @@ -%define tarver v1.0.2 - Name: perl-Smart-Comments -Version: 1.000002 -Release: 4%{?dist} +Epoch: 1 +Version: v1.0.3 +Release: 1%{?dist} Summary: Comments that do more than just sit there Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Smart-Comments -Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Smart-Comments-%{tarver}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Smart-Comments-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## core -BuildRequires: perl, perl(ExtUtils::MakeMaker) -BuildRequires: perl(Test::More), perl(Text::Balanced), perl(Data::Dumper) -BuildRequires: perl(Filter::Simple), perl(List::Util) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Filter::Simple) +BuildRequires: perl(List::Util) +BuildRequires: perl(Test::More) +BuildRequires: perl(Text::Balanced) ## non-core BuildRequires: perl(version) -BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) +BuildRequires: perl(Test::Pod) +## author test +BuildRequires: perl(Test::Pod::Coverage) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -35,8 +39,9 @@ %prep -%setup -q -n Smart-Comments-%{tarver} +%setup -q -n Smart-Comments-%{version} +perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/* %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -45,10 +50,12 @@ %install rm -rf %{buildroot} + make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* + +%{_fixperms} %{buildroot}/* %check @@ -61,12 +68,17 @@ %files %defattr(-,root,root,-) -%doc README Changes +%doc README Changes t/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Sat Mar 01 2008 Chris Weyl 1:v1.0.3-1 +- update to v1.0.3 +- update lic tag +- add epoch, to move away from the 1.000... representation of the version + * Tue Mar 27 2007 Chris Weyl 1.000002-4 - be more explicit with core requires Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Smart-Comments/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Aug 2006 16:16:13 -0000 1.2 +++ sources 1 Mar 2008 19:28:41 -0000 1.3 @@ -1 +1 @@ -658df11ea3e1090a4c673b50860449b3 Smart-Comments-v1.0.2.tar.gz +899c141a4f0d624d7daaac71b6a428fd Smart-Comments-v1.0.3.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 19:30:30 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 1 Mar 2008 19:30:30 GMT Subject: rpms/perl-Catalyst-Devel/devel .cvsignore, 1.2, 1.3 perl-Catalyst-Devel.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200803011930.m21JUUiA019222@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Catalyst-Devel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19185 Modified Files: .cvsignore perl-Catalyst-Devel.spec sources Log Message: * Sat Mar 01 2008 Chris Weyl 1.03-1 - update to 1.03 (runtime to 5.7012) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Devel/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Aug 2007 20:09:43 -0000 1.2 +++ .cvsignore 1 Mar 2008 19:29:53 -0000 1.3 @@ -1,2 +1,2 @@ -Catalyst-Devel-1.02.tar.gz -Catalyst-Runtime-5.7007.tar.gz +Catalyst-Devel-1.03.tar.gz +Catalyst-Runtime-5.7012.tar.gz Index: perl-Catalyst-Devel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Devel/devel/perl-Catalyst-Devel.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Catalyst-Devel.spec 10 Aug 2007 20:10:35 -0000 1.2 +++ perl-Catalyst-Devel.spec 1 Mar 2008 19:29:53 -0000 1.3 @@ -1,9 +1,9 @@ -%define runtime_version 5.7007 +%define runtime_version 5.7012 Name: perl-Catalyst-Devel -Version: 1.02 -Release: 3%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Catalyst Development Tools -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Devel/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Devel-%{version}.tar.gz @@ -20,7 +20,7 @@ BuildRequires: perl(Catalyst::Action::RenderView) >= 0.04 BuildRequires: perl(Catalyst::Manual) >= 5.7000 BuildRequires: perl(Catalyst::Plugin::ConfigLoader) -BuildRequires: perl(Catalyst::Plugin::Static::Simple) >= 0.14 +BuildRequires: perl(Catalyst::Plugin::Static::Simple) >= 0.16 BuildRequires: perl(Class::Accessor::Fast) BuildRequires: perl(File::Copy::Recursive) BuildRequires: perl(Module::Install) >= 0.64 @@ -32,7 +32,7 @@ Requires: perl(Catalyst::Action::RenderView) >= 0.04 Requires: perl(Catalyst::Manual) >= 5.7000 Requires: perl(Catalyst::Plugin::ConfigLoader) -Requires: perl(Catalyst::Plugin::Static::Simple) >= 0.14 +Requires: perl(Catalyst::Plugin::Static::Simple) >= 0.16 Requires: perl(Class::Accessor::Fast) Requires: perl(Module::Install) >= 0.64 Requires: perl(Path::Class) >= 0.09 @@ -57,7 +57,7 @@ make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} \; +find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; # install catalyst.pl and manify it @@ -82,6 +82,9 @@ %{_bindir}/* %changelog +* Sat Mar 01 2008 Chris Weyl 1.03-1 +- update to 1.03 (runtime to 5.7012) + * Fri Aug 10 2007 Chris Weyl 1.02-3 - bump Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Catalyst-Devel/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Aug 2007 20:09:43 -0000 1.2 +++ sources 1 Mar 2008 19:29:53 -0000 1.3 @@ -1,2 +1,2 @@ -09dd471b600f4dddadc57ee5b56b2d02 Catalyst-Devel-1.02.tar.gz -2d4d22d4153b49d64ed715bfd81d809d Catalyst-Runtime-5.7007.tar.gz +82a4459165e38393eefcdc5a82652f91 Catalyst-Devel-1.03.tar.gz +db926f732cd24ac4c35c50e612c03b7d Catalyst-Runtime-5.7012.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 19:34:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:34:41 +0000 Subject: [pkgdb] celestia had acl change status Message-ID: <200803011935.m21JZ5LK002052@bastion.fedora.phx.redhat.com> Steven Pritchard (steve) has set the commit acl on celestia (Fedora devel) to Approved for Marek Mahut (mmahut) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/celestia From fedora-extras-commits at redhat.com Sat Mar 1 19:36:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:36:22 +0000 Subject: [pkgdb] recordmydesktop had groupAcl changed Message-ID: <200803011936.m21JakIK002117@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on recordmydesktop (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/recordmydesktop From fedora-extras-commits at redhat.com Sat Mar 1 19:36:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:36:26 +0000 Subject: [pkgdb] recordmydesktop had groupAcl changed Message-ID: <200803011936.m21Jakja002139@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on recordmydesktop (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/recordmydesktop From fedora-extras-commits at redhat.com Sat Mar 1 19:36:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:36:25 +0000 Subject: [pkgdb] recordmydesktop had groupAcl changed Message-ID: <200803011936.m21Jamxg002158@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on recordmydesktop (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/recordmydesktop From fedora-extras-commits at redhat.com Sat Mar 1 19:36:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:36:32 +0000 Subject: [pkgdb] recordmydesktop had groupAcl changed Message-ID: <200803011936.m21Jakjc002139@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on recordmydesktop (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/recordmydesktop From fedora-extras-commits at redhat.com Sat Mar 1 19:37:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:37:19 +0000 Subject: [pkgdb] arp-scan had groupAcl changed Message-ID: <200803011937.m21JakIM002117@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on arp-scan (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan From fedora-extras-commits at redhat.com Sat Mar 1 19:37:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:37:27 +0000 Subject: [pkgdb] arp-scan had groupAcl changed Message-ID: <200803011937.m21JbpOx002272@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on arp-scan (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan From fedora-extras-commits at redhat.com Sat Mar 1 19:37:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:37:32 +0000 Subject: [pkgdb] arp-scan had groupAcl changed Message-ID: <200803011937.m21Jakje002139@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on arp-scan (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/arp-scan From fedora-extras-commits at redhat.com Sat Mar 1 19:38:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:38:46 +0000 Subject: [pkgdb] avant-window-navigator had groupAcl changed Message-ID: <200803011939.m21Jd6fb002346@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on avant-window-navigator (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/avant-window-navigator From fedora-extras-commits at redhat.com Sat Mar 1 19:39:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:39:11 +0000 Subject: [pkgdb] telepathy-mission-control had groupAcl changed Message-ID: <200803011939.m21JdZ7K002382@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on telepathy-mission-control (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-mission-control From fedora-extras-commits at redhat.com Sat Mar 1 19:39:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:39:13 +0000 Subject: [pkgdb] telepathy-mission-control had groupAcl changed Message-ID: <200803011939.m21JdasU002400@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on telepathy-mission-control (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-mission-control From fedora-extras-commits at redhat.com Sat Mar 1 19:39:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:39:16 +0000 Subject: [pkgdb] telepathy-mission-control had groupAcl changed Message-ID: <200803011939.m21JdZ7M002382@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on telepathy-mission-control (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/telepathy-mission-control From fedora-extras-commits at redhat.com Sat Mar 1 19:39:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:39:31 +0000 Subject: [pkgdb] tcptraceroute had groupAcl changed Message-ID: <200803011939.m21Jd6fd002346@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on tcptraceroute (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tcptraceroute From fedora-extras-commits at redhat.com Sat Mar 1 19:39:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:39:28 +0000 Subject: [pkgdb] tcptraceroute had groupAcl changed Message-ID: <200803011939.m21JdZ7O002382@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on tcptraceroute (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tcptraceroute From fedora-extras-commits at redhat.com Sat Mar 1 19:39:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:39:29 +0000 Subject: [pkgdb] tcptraceroute had groupAcl changed Message-ID: <200803011939.m21JdasW002400@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on tcptraceroute (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tcptraceroute From fedora-extras-commits at redhat.com Sat Mar 1 19:39:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:39:32 +0000 Subject: [pkgdb] tcptraceroute had groupAcl changed Message-ID: <200803011939.m21JdZ7Q002382@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on tcptraceroute (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tcptraceroute From fedora-extras-commits at redhat.com Sat Mar 1 19:39:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:39:32 +0000 Subject: [pkgdb] tcptraceroute had groupAcl changed Message-ID: <200803011939.m21JdasY002400@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on tcptraceroute (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tcptraceroute From fedora-extras-commits at redhat.com Sat Mar 1 19:39:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:39:36 +0000 Subject: [pkgdb] tcptraceroute had groupAcl changed Message-ID: <200803011939.m21Jd6ff002346@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on tcptraceroute (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/tcptraceroute From fedora-extras-commits at redhat.com Sat Mar 1 19:40:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:21 +0000 Subject: [pkgdb] scratchpad had groupAcl changed Message-ID: <200803011940.m21Jd6fh002346@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on scratchpad (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scratchpad From fedora-extras-commits at redhat.com Sat Mar 1 19:40:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:18 +0000 Subject: [pkgdb] scratchpad had groupAcl changed Message-ID: <200803011940.m21Jdasa002400@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on scratchpad (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scratchpad From fedora-extras-commits at redhat.com Sat Mar 1 19:40:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:24 +0000 Subject: [pkgdb] scratchpad had groupAcl changed Message-ID: <200803011940.m21Jd6fj002346@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on scratchpad (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scratchpad From fedora-extras-commits at redhat.com Sat Mar 1 19:40:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:21 +0000 Subject: [pkgdb] scratchpad had groupAcl changed Message-ID: <200803011940.m21JdZ7S002382@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on scratchpad (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/scratchpad From fedora-extras-commits at redhat.com Sat Mar 1 19:40:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:43 +0000 Subject: [pkgdb] perl-SQLite-Simple had groupAcl changed Message-ID: <200803011941.m21Jf35R002708@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-SQLite-Simple (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:40:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:44 +0000 Subject: [pkgdb] perl-SQLite-Simple had groupAcl changed Message-ID: <200803011941.m21Jf35T002708@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-SQLite-Simple (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:40:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:41 +0000 Subject: [pkgdb] perl-SQLite-Simple had groupAcl changed Message-ID: <200803011941.m21Jdasc002400@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-SQLite-Simple (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:40:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:42 +0000 Subject: [pkgdb] perl-SQLite-Simple had groupAcl changed Message-ID: <200803011941.m21Jf61k002757@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-SQLite-Simple (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:40:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:47 +0000 Subject: [pkgdb] perl-SQLite-Simple had groupAcl changed Message-ID: <200803011941.m21Jf35V002708@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-SQLite-Simple (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:40:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:50 +0000 Subject: [pkgdb] perl-Nmap-Parser had groupAcl changed Message-ID: <200803011941.m21JfDkh002797@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Nmap-Parser (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nmap-Parser From fedora-extras-commits at redhat.com Sat Mar 1 19:40:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:50 +0000 Subject: [pkgdb] perl-Nmap-Parser had groupAcl changed Message-ID: <200803011941.m21Jf61m002757@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Nmap-Parser (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nmap-Parser From fedora-extras-commits at redhat.com Sat Mar 1 19:40:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:50 +0000 Subject: [pkgdb] perl-Nmap-Parser had groupAcl changed Message-ID: <200803011941.m21JfDkj002797@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Nmap-Parser (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nmap-Parser From fedora-extras-commits at redhat.com Sat Mar 1 19:40:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:56 +0000 Subject: [pkgdb] perl-Nmap-Parser had groupAcl changed Message-ID: <200803011941.m21Jf35X002708@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Nmap-Parser (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nmap-Parser From fedora-extras-commits at redhat.com Sat Mar 1 19:40:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:53 +0000 Subject: [pkgdb] perl-Nmap-Parser had groupAcl changed Message-ID: <200803011941.m21JfDkl002797@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Nmap-Parser (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nmap-Parser From fedora-extras-commits at redhat.com Sat Mar 1 19:40:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:54 +0000 Subject: [pkgdb] perl-Nmap-Parser had groupAcl changed Message-ID: <200803011941.m21Jf61o002757@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Nmap-Parser (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nmap-Parser From fedora-extras-commits at redhat.com Sat Mar 1 19:40:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:40:59 +0000 Subject: [pkgdb] perl-Nmap-Parser had groupAcl changed Message-ID: <200803011941.m21Jf35Z002708@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Nmap-Parser (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Nmap-Parser From fedora-extras-commits at redhat.com Sat Mar 1 19:41:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:29 +0000 Subject: [pkgdb] perl-Net-Write had groupAcl changed Message-ID: <200803011941.m21JfDkn002797@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Write (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Write From fedora-extras-commits at redhat.com Sat Mar 1 19:41:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:33 +0000 Subject: [pkgdb] perl-Net-Write had groupAcl changed Message-ID: <200803011941.m21JfrGq002995@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Write (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Write From fedora-extras-commits at redhat.com Sat Mar 1 19:41:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:30 +0000 Subject: [pkgdb] perl-Net-Write had groupAcl changed Message-ID: <200803011941.m21JfDkp002797@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Write (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Write From fedora-extras-commits at redhat.com Sat Mar 1 19:41:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:31 +0000 Subject: [pkgdb] perl-Net-Write had groupAcl changed Message-ID: <200803011941.m21Jf61q002757@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Write (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Write From fedora-extras-commits at redhat.com Sat Mar 1 19:41:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:35 +0000 Subject: [pkgdb] perl-Net-Write had groupAcl changed Message-ID: <200803011941.m21JfrGs002995@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Write (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Write From fedora-extras-commits at redhat.com Sat Mar 1 19:41:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:35 +0000 Subject: [pkgdb] perl-Net-Write had groupAcl changed Message-ID: <200803011941.m21Jfw09003072@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Write (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Write From fedora-extras-commits at redhat.com Sat Mar 1 19:41:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:36 +0000 Subject: [pkgdb] perl-Net-Pcap had groupAcl changed Message-ID: <200803011942.m21Jf61s002757@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Pcap (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Pcap From fedora-extras-commits at redhat.com Sat Mar 1 19:41:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:41 +0000 Subject: [pkgdb] perl-Net-Pcap had groupAcl changed Message-ID: <200803011942.m21JfrGu002995@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Pcap (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Pcap From fedora-extras-commits at redhat.com Sat Mar 1 19:41:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:40 +0000 Subject: [pkgdb] perl-Net-Pcap had groupAcl changed Message-ID: <200803011942.m21Jfw0B003072@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Pcap (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Pcap From fedora-extras-commits at redhat.com Sat Mar 1 19:41:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:44 +0000 Subject: [pkgdb] perl-Net-Pcap had groupAcl changed Message-ID: <200803011942.m21JfrGw002995@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Pcap (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Pcap From fedora-extras-commits at redhat.com Sat Mar 1 19:41:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:41 +0000 Subject: [pkgdb] perl-Net-Pcap had groupAcl changed Message-ID: <200803011942.m21Jfw0D003072@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Pcap (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Pcap From fedora-extras-commits at redhat.com Sat Mar 1 19:41:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:41 +0000 Subject: [pkgdb] perl-Net-Pcap had groupAcl changed Message-ID: <200803011942.m21Jg5g7003172@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Pcap (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Pcap From fedora-extras-commits at redhat.com Sat Mar 1 19:41:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:43 +0000 Subject: [pkgdb] perl-Net-Pcap had groupAcl changed Message-ID: <200803011942.m21Jg5g9003172@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Pcap (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Pcap From fedora-extras-commits at redhat.com Sat Mar 1 19:41:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:51 +0000 Subject: [pkgdb] perl-Net-Packet had groupAcl changed Message-ID: <200803011942.m21JfrH0002995@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Packet (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Packet From fedora-extras-commits at redhat.com Sat Mar 1 19:41:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:52 +0000 Subject: [pkgdb] perl-Net-Packet had groupAcl changed Message-ID: <200803011942.m21JgCHj003252@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Packet (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Packet From fedora-extras-commits at redhat.com Sat Mar 1 19:41:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:50 +0000 Subject: [pkgdb] perl-Net-Packet had groupAcl changed Message-ID: <200803011942.m21Jg5gB003172@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Packet (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Packet From fedora-extras-commits at redhat.com Sat Mar 1 19:41:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:51 +0000 Subject: [pkgdb] perl-Net-Packet had groupAcl changed Message-ID: <200803011942.m21Jg5gD003172@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Packet (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Packet From fedora-extras-commits at redhat.com Sat Mar 1 19:41:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:55 +0000 Subject: [pkgdb] perl-Net-Packet had groupAcl changed Message-ID: <200803011942.m21JgCHl003252@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Packet (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Packet From fedora-extras-commits at redhat.com Sat Mar 1 19:41:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:56 +0000 Subject: [pkgdb] perl-Net-Packet had groupAcl changed Message-ID: <200803011942.m21JgCHn003252@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Packet (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Packet From fedora-extras-commits at redhat.com Sat Mar 1 19:41:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:58 +0000 Subject: [pkgdb] perl-Net-Libdnet had groupAcl changed Message-ID: <200803011942.m21Jfw0F003072@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Libdnet (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Libdnet From fedora-extras-commits at redhat.com Sat Mar 1 19:41:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:41:58 +0000 Subject: [pkgdb] perl-Net-Libdnet had groupAcl changed Message-ID: <200803011942.m21Jg5gF003172@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Libdnet (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Libdnet From fedora-extras-commits at redhat.com Sat Mar 1 19:42:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:03 +0000 Subject: [pkgdb] perl-Net-Libdnet had groupAcl changed Message-ID: <200803011942.m21JgCHp003252@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Libdnet (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Libdnet From fedora-extras-commits at redhat.com Sat Mar 1 19:42:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:04 +0000 Subject: [pkgdb] perl-Net-Libdnet had groupAcl changed Message-ID: <200803011942.m21JgCHr003252@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Libdnet (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Libdnet From fedora-extras-commits at redhat.com Sat Mar 1 19:42:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:01 +0000 Subject: [pkgdb] perl-Net-Libdnet had groupAcl changed Message-ID: <200803011942.m21JgPZB003399@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Libdnet (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Libdnet From fedora-extras-commits at redhat.com Sat Mar 1 19:42:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:07 +0000 Subject: [pkgdb] perl-Net-Libdnet had groupAcl changed Message-ID: <200803011942.m21JgRhB003417@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Libdnet (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Libdnet From fedora-extras-commits at redhat.com Sat Mar 1 19:42:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:04 +0000 Subject: [pkgdb] perl-Net-Libdnet had groupAcl changed Message-ID: <200803011942.m21Jfw0H003072@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-Libdnet (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Libdnet From fedora-extras-commits at redhat.com Sat Mar 1 19:42:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:06 +0000 Subject: [pkgdb] perl-Net-IPv6Addr had groupAcl changed Message-ID: <200803011942.m21JgPZD003399@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv6Addr (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv6Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:08 +0000 Subject: [pkgdb] perl-Net-IPv6Addr had groupAcl changed Message-ID: <200803011942.m21JgPZF003399@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv6Addr (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv6Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:13 +0000 Subject: [pkgdb] perl-Net-IPv6Addr had groupAcl changed Message-ID: <200803011942.m21JgRhD003417@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv6Addr (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv6Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:10 +0000 Subject: [pkgdb] perl-Net-IPv6Addr had groupAcl changed Message-ID: <200803011942.m21JgYdf003496@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv6Addr (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv6Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:11 +0000 Subject: [pkgdb] perl-Net-IPv6Addr had groupAcl changed Message-ID: <200803011942.m21JgPZH003399@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv6Addr (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv6Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:13 +0000 Subject: [pkgdb] perl-Net-IPv6Addr had groupAcl changed Message-ID: <200803011942.m21JgPZJ003399@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv6Addr (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv6Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:18 +0000 Subject: [pkgdb] perl-Net-IPv4Addr had groupAcl changed Message-ID: <200803011942.m21JgRhF003417@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv4Addr (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv4Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:18 +0000 Subject: [pkgdb] perl-Net-IPv4Addr had groupAcl changed Message-ID: <200803011942.m21JgYdh003496@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv4Addr (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv4Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:23 +0000 Subject: [pkgdb] perl-Net-IPv4Addr had groupAcl changed Message-ID: <200803011942.m21JgRhH003417@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv4Addr (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv4Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:21 +0000 Subject: [pkgdb] perl-Net-IPv4Addr had groupAcl changed Message-ID: <200803011942.m21Jgjrh003615@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv4Addr (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv4Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:22 +0000 Subject: [pkgdb] perl-Net-IPv4Addr had groupAcl changed Message-ID: <200803011942.m21Jgjrj003615@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv4Addr (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv4Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:25 +0000 Subject: [pkgdb] perl-Net-IPv4Addr had groupAcl changed Message-ID: <200803011942.m21JgYdj003496@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv4Addr (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv4Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:27 +0000 Subject: [pkgdb] perl-Net-IPv4Addr had groupAcl changed Message-ID: <200803011942.m21JgYdl003496@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Net-IPv4Addr (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-IPv4Addr From fedora-extras-commits at redhat.com Sat Mar 1 19:42:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:32 +0000 Subject: [pkgdb] perl-Math-Base85 had groupAcl changed Message-ID: <200803011942.m21JgRhJ003417@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Math-Base85 (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Base85 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:29 +0000 Subject: [pkgdb] perl-Math-Base85 had groupAcl changed Message-ID: <200803011942.m21Jgjrl003615@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Math-Base85 (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Base85 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:30 +0000 Subject: [pkgdb] perl-Math-Base85 had groupAcl changed Message-ID: <200803011942.m21Jgjrn003615@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Math-Base85 (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Base85 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:33 +0000 Subject: [pkgdb] perl-Math-Base85 had groupAcl changed Message-ID: <200803011942.m21JgYdn003496@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Math-Base85 (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Base85 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:33 +0000 Subject: [pkgdb] perl-Math-Base85 had groupAcl changed Message-ID: <200803011942.m21Jgjrp003615@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Math-Base85 (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Base85 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:34 +0000 Subject: [pkgdb] perl-Math-Base85 had groupAcl changed Message-ID: <200803011942.m21JgwJc003799@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Math-Base85 (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Base85 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:38 +0000 Subject: [pkgdb] perl-libwhisker2 had groupAcl changed Message-ID: <200803011943.m21Jh1ft003816@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-libwhisker2 (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-libwhisker2 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:38 +0000 Subject: [pkgdb] perl-libwhisker2 had groupAcl changed Message-ID: <200803011943.m21JgwJe003799@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-libwhisker2 (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-libwhisker2 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:40 +0000 Subject: [pkgdb] perl-libwhisker2 had groupAcl changed Message-ID: <200803011943.m21JgwJg003799@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-libwhisker2 (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-libwhisker2 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:43 +0000 Subject: [pkgdb] perl-libwhisker2 had groupAcl changed Message-ID: <200803011943.m21Jh4Z7003859@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-libwhisker2 (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-libwhisker2 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:42 +0000 Subject: [pkgdb] perl-libwhisker2 had groupAcl changed Message-ID: <200803011943.m21Jh1fv003816@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-libwhisker2 (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-libwhisker2 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:47 +0000 Subject: [pkgdb] perl-libwhisker2 had groupAcl changed Message-ID: <200803011943.m21Jh4Z9003859@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-libwhisker2 (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-libwhisker2 From fedora-extras-commits at redhat.com Sat Mar 1 19:42:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:42:46 +0000 Subject: [pkgdb] perl-libwhisker2 had groupAcl changed Message-ID: <200803011943.m21JgwJi003799@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-libwhisker2 (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-libwhisker2 From fedora-extras-commits at redhat.com Sat Mar 1 19:43:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:13 +0000 Subject: [pkgdb] perl-DBIx-SQLite-Simple had groupAcl changed Message-ID: <200803011943.m21Jh1fx003816@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-DBIx-SQLite-Simple (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:43:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:15 +0000 Subject: [pkgdb] perl-DBIx-SQLite-Simple had groupAcl changed Message-ID: <200803011943.m21JgwJk003799@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-DBIx-SQLite-Simple (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:43:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:19 +0000 Subject: [pkgdb] perl-DBIx-SQLite-Simple had groupAcl changed Message-ID: <200803011943.m21Jh4ZB003859@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-DBIx-SQLite-Simple (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:43:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:16 +0000 Subject: [pkgdb] perl-DBIx-SQLite-Simple had groupAcl changed Message-ID: <200803011943.m21Jh1g1003816@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-DBIx-SQLite-Simple (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:43:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:16 +0000 Subject: [pkgdb] perl-DBIx-SQLite-Simple had groupAcl changed Message-ID: <200803011943.m21Jhe6K004123@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-DBIx-SQLite-Simple (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:43:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:20 +0000 Subject: [pkgdb] perl-DBIx-SQLite-Simple had groupAcl changed Message-ID: <200803011943.m21Jh4ZD003859@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-DBIx-SQLite-Simple (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:43:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:21 +0000 Subject: [pkgdb] perl-DBIx-SQLite-Simple had groupAcl changed Message-ID: <200803011943.m21Jh4ZF003859@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-DBIx-SQLite-Simple (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-SQLite-Simple From fedora-extras-commits at redhat.com Sat Mar 1 19:43:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:22 +0000 Subject: [pkgdb] perl-Class-Gomor had groupAcl changed Message-ID: <200803011943.m21Jhe6M004123@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Class-Gomor (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Gomor From fedora-extras-commits at redhat.com Sat Mar 1 19:43:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:25 +0000 Subject: [pkgdb] perl-Class-Gomor had groupAcl changed Message-ID: <200803011943.m21JhkY0004206@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Class-Gomor (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Gomor From fedora-extras-commits at redhat.com Sat Mar 1 19:43:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:23 +0000 Subject: [pkgdb] perl-Class-Gomor had groupAcl changed Message-ID: <200803011943.m21Jhe6O004123@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Class-Gomor (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Gomor From fedora-extras-commits at redhat.com Sat Mar 1 19:43:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:23 +0000 Subject: [pkgdb] perl-Class-Gomor had groupAcl changed Message-ID: <200803011943.m21Jh1g3003816@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Class-Gomor (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Gomor From fedora-extras-commits at redhat.com Sat Mar 1 19:43:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:27 +0000 Subject: [pkgdb] perl-Class-Gomor had groupAcl changed Message-ID: <200803011943.m21JhkY2004206@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Class-Gomor (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Gomor From fedora-extras-commits at redhat.com Sat Mar 1 19:43:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:26 +0000 Subject: [pkgdb] perl-Class-Gomor had groupAcl changed Message-ID: <200803011943.m21Jho6k004276@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Class-Gomor (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Gomor From fedora-extras-commits at redhat.com Sat Mar 1 19:43:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:26 +0000 Subject: [pkgdb] perl-Class-Gomor had groupAcl changed Message-ID: <200803011943.m21Jhe6Q004123@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on perl-Class-Gomor (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Gomor From fedora-extras-commits at redhat.com Sat Mar 1 19:43:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:32 +0000 Subject: [pkgdb] onesixtyone had groupAcl changed Message-ID: <200803011943.m21JhkY4004206@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on onesixtyone (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/onesixtyone From fedora-extras-commits at redhat.com Sat Mar 1 19:43:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:33 +0000 Subject: [pkgdb] onesixtyone had groupAcl changed Message-ID: <200803011943.m21JhkY6004206@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on onesixtyone (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/onesixtyone From fedora-extras-commits at redhat.com Sat Mar 1 19:43:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:31 +0000 Subject: [pkgdb] onesixtyone had groupAcl changed Message-ID: <200803011943.m21Jho6m004276@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on onesixtyone (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/onesixtyone From fedora-extras-commits at redhat.com Sat Mar 1 19:43:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:35 +0000 Subject: [pkgdb] onesixtyone had groupAcl changed Message-ID: <200803011943.m21Jhe6S004123@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on onesixtyone (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/onesixtyone From fedora-extras-commits at redhat.com Sat Mar 1 19:43:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:39 +0000 Subject: [pkgdb] onesixtyone had groupAcl changed Message-ID: <200803011943.m21JhkY8004206@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on onesixtyone (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/onesixtyone From fedora-extras-commits at redhat.com Sat Mar 1 19:43:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:36 +0000 Subject: [pkgdb] onesixtyone had groupAcl changed Message-ID: <200803011944.m21JhxGv004471@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on onesixtyone (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/onesixtyone From fedora-extras-commits at redhat.com Sat Mar 1 19:43:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:39 +0000 Subject: [pkgdb] nrg2iso had groupAcl changed Message-ID: <200803011944.m21Jho6o004276@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nrg2iso (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nrg2iso From fedora-extras-commits at redhat.com Sat Mar 1 19:43:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:43 +0000 Subject: [pkgdb] nrg2iso had groupAcl changed Message-ID: <200803011944.m21Ji35e004543@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nrg2iso (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nrg2iso From fedora-extras-commits at redhat.com Sat Mar 1 19:43:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:42 +0000 Subject: [pkgdb] nrg2iso had groupAcl changed Message-ID: <200803011944.m21Jho6q004276@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nrg2iso (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nrg2iso From fedora-extras-commits at redhat.com Sat Mar 1 19:43:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:42 +0000 Subject: [pkgdb] nrg2iso had groupAcl changed Message-ID: <200803011944.m21JhxGx004471@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nrg2iso (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nrg2iso From fedora-extras-commits at redhat.com Sat Mar 1 19:43:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:45 +0000 Subject: [pkgdb] nrg2iso had groupAcl changed Message-ID: <200803011944.m21JhxH1004471@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nrg2iso (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nrg2iso From fedora-extras-commits at redhat.com Sat Mar 1 19:43:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:48 +0000 Subject: [pkgdb] nrg2iso had groupAcl changed Message-ID: <200803011944.m21Ji35g004543@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nrg2iso (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nrg2iso From fedora-extras-commits at redhat.com Sat Mar 1 19:43:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:47 +0000 Subject: [pkgdb] nikto had groupAcl changed Message-ID: <200803011944.m21Jho6s004276@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nikto (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nikto From fedora-extras-commits at redhat.com Sat Mar 1 19:43:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:49 +0000 Subject: [pkgdb] nikto had groupAcl changed Message-ID: <200803011944.m21JiDf0004681@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nikto (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nikto From fedora-extras-commits at redhat.com Sat Mar 1 19:43:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:52 +0000 Subject: [pkgdb] nikto had groupAcl changed Message-ID: <200803011944.m21JhxH3004471@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nikto (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nikto From fedora-extras-commits at redhat.com Sat Mar 1 19:43:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:53 +0000 Subject: [pkgdb] nikto had groupAcl changed Message-ID: <200803011944.m21JhxH5004471@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nikto (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nikto From fedora-extras-commits at redhat.com Sat Mar 1 19:43:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:56 +0000 Subject: [pkgdb] nikto had groupAcl changed Message-ID: <200803011944.m21Ji35i004543@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nikto (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nikto From fedora-extras-commits at redhat.com Sat Mar 1 19:43:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:56 +0000 Subject: [pkgdb] nikto had groupAcl changed Message-ID: <200803011944.m21JiDf2004681@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nikto (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nikto From fedora-extras-commits at redhat.com Sat Mar 1 19:44:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:01 +0000 Subject: [pkgdb] nbtscan had groupAcl changed Message-ID: <200803011944.m21Ji35k004543@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nbtscan (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nbtscan From fedora-extras-commits at redhat.com Sat Mar 1 19:43:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:43:59 +0000 Subject: [pkgdb] nbtscan had groupAcl changed Message-ID: <200803011944.m21JiDf4004681@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nbtscan (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nbtscan From fedora-extras-commits at redhat.com Sat Mar 1 19:44:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:00 +0000 Subject: [pkgdb] nbtscan had groupAcl changed Message-ID: <200803011944.m21JiOaD004828@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nbtscan (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nbtscan From fedora-extras-commits at redhat.com Sat Mar 1 19:44:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:05 +0000 Subject: [pkgdb] nbtscan had groupAcl changed Message-ID: <200803011944.m21Ji35m004543@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nbtscan (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nbtscan From fedora-extras-commits at redhat.com Sat Mar 1 19:44:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:02 +0000 Subject: [pkgdb] nbtscan had groupAcl changed Message-ID: <200803011944.m21JiOaF004828@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nbtscan (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nbtscan From fedora-extras-commits at redhat.com Sat Mar 1 19:44:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:04 +0000 Subject: [pkgdb] nbtscan had groupAcl changed Message-ID: <200803011944.m21JiDf6004681@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nbtscan (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nbtscan From fedora-extras-commits at redhat.com Sat Mar 1 19:44:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:09 +0000 Subject: [pkgdb] nbtscan had groupAcl changed Message-ID: <200803011944.m21JiTWW004928@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on nbtscan (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/nbtscan From fedora-extras-commits at redhat.com Sat Mar 1 19:44:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:12 +0000 Subject: [pkgdb] muine-scrobbler had groupAcl changed Message-ID: <200803011944.m21JiTWY004928@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on muine-scrobbler (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/muine-scrobbler From fedora-extras-commits at redhat.com Sat Mar 1 19:44:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:10 +0000 Subject: [pkgdb] muine-scrobbler had groupAcl changed Message-ID: <200803011944.m21JiDf8004681@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on muine-scrobbler (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/muine-scrobbler From fedora-extras-commits at redhat.com Sat Mar 1 19:44:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:10 +0000 Subject: [pkgdb] muine-scrobbler had groupAcl changed Message-ID: <200803011944.m21JiYB4004998@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on muine-scrobbler (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/muine-scrobbler From fedora-extras-commits at redhat.com Sat Mar 1 19:44:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:13 +0000 Subject: [pkgdb] muine-scrobbler had groupAcl changed Message-ID: <200803011944.m21JiOaH004828@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on muine-scrobbler (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/muine-scrobbler From fedora-extras-commits at redhat.com Sat Mar 1 19:44:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:54 +0000 Subject: [pkgdb] ike-scan had groupAcl changed Message-ID: <200803011945.m21JiYB6004998@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on ike-scan (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ike-scan From fedora-extras-commits at redhat.com Sat Mar 1 19:44:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:58 +0000 Subject: [pkgdb] ike-scan had groupAcl changed Message-ID: <200803011945.m21JiTWa004928@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on ike-scan (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ike-scan From fedora-extras-commits at redhat.com Sat Mar 1 19:44:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:57 +0000 Subject: [pkgdb] ike-scan had groupAcl changed Message-ID: <200803011945.m21JiYB8004998@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on ike-scan (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ike-scan From fedora-extras-commits at redhat.com Sat Mar 1 19:44:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:44:58 +0000 Subject: [pkgdb] ike-scan had groupAcl changed Message-ID: <200803011945.m21JiOaJ004828@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on ike-scan (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ike-scan From fedora-extras-commits at redhat.com Sat Mar 1 19:45:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:02 +0000 Subject: [pkgdb] ike-scan had groupAcl changed Message-ID: <200803011945.m21JiTWc004928@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on ike-scan (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ike-scan From fedora-extras-commits at redhat.com Sat Mar 1 19:45:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:00 +0000 Subject: [pkgdb] ike-scan had groupAcl changed Message-ID: <200803011945.m21JiOaL004828@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on ike-scan (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ike-scan From fedora-extras-commits at redhat.com Sat Mar 1 19:45:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:00 +0000 Subject: [pkgdb] ike-scan had groupAcl changed Message-ID: <200803011945.m21JiYBA004998@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on ike-scan (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ike-scan From fedora-extras-commits at redhat.com Sat Mar 1 19:45:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:08 +0000 Subject: [pkgdb] halberd had groupAcl changed Message-ID: <200803011945.m21JjVCP005283@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on halberd (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/halberd From fedora-extras-commits at redhat.com Sat Mar 1 19:45:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:09 +0000 Subject: [pkgdb] halberd had groupAcl changed Message-ID: <200803011945.m21JjVCR005283@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on halberd (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/halberd From fedora-extras-commits at redhat.com Sat Mar 1 19:45:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:12 +0000 Subject: [pkgdb] halberd had groupAcl changed Message-ID: <200803011945.m21JiTWe004928@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on halberd (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/halberd From fedora-extras-commits at redhat.com Sat Mar 1 19:45:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:13 +0000 Subject: [pkgdb] halberd had groupAcl changed Message-ID: <200803011945.m21JjYmE005335@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on halberd (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/halberd From fedora-extras-commits at redhat.com Sat Mar 1 19:45:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:12 +0000 Subject: [pkgdb] halberd had groupAcl changed Message-ID: <200803011945.m21JiYBC004998@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on halberd (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/halberd From fedora-extras-commits at redhat.com Sat Mar 1 19:45:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:13 +0000 Subject: [pkgdb] halberd had groupAcl changed Message-ID: <200803011945.m21Jjbs6005376@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on halberd (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/halberd From fedora-extras-commits at redhat.com Sat Mar 1 19:45:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:21 +0000 Subject: [pkgdb] gtk-recordmydesktop had groupAcl changed Message-ID: <200803011945.m21JjVCT005283@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on gtk-recordmydesktop (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gtk-recordmydesktop From fedora-extras-commits at redhat.com Sat Mar 1 19:45:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:25 +0000 Subject: [pkgdb] gtk-recordmydesktop had groupAcl changed Message-ID: <200803011945.m21JjYmG005335@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on gtk-recordmydesktop (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gtk-recordmydesktop From fedora-extras-commits at redhat.com Sat Mar 1 19:45:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:24 +0000 Subject: [pkgdb] gtk-recordmydesktop had groupAcl changed Message-ID: <200803011945.m21Jjbs8005376@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on gtk-recordmydesktop (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gtk-recordmydesktop From fedora-extras-commits at redhat.com Sat Mar 1 19:45:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:24 +0000 Subject: [pkgdb] gtk-recordmydesktop had groupAcl changed Message-ID: <200803011945.m21JjVCV005283@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on gtk-recordmydesktop (Fedora 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gtk-recordmydesktop From fedora-extras-commits at redhat.com Sat Mar 1 19:45:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:27 +0000 Subject: [pkgdb] gtk-recordmydesktop had groupAcl changed Message-ID: <200803011945.m21JjVCX005283@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on gtk-recordmydesktop (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gtk-recordmydesktop From fedora-extras-commits at redhat.com Sat Mar 1 19:45:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:36 +0000 Subject: [pkgdb] firewalk had groupAcl changed Message-ID: <200803011945.m21JjYmI005335@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on firewalk (Fedora EPEL 4) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firewalk From fedora-extras-commits at redhat.com Sat Mar 1 19:45:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:34 +0000 Subject: [pkgdb] firewalk had groupAcl changed Message-ID: <200803011945.m21JjbsA005376@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on firewalk (Fedora EPEL 5) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firewalk From fedora-extras-commits at redhat.com Sat Mar 1 19:45:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:34 +0000 Subject: [pkgdb] firewalk had groupAcl changed Message-ID: <200803011945.m21Jjwmp005549@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on firewalk (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firewalk From fedora-extras-commits at redhat.com Sat Mar 1 19:45:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:38 +0000 Subject: [pkgdb] firewalk had groupAcl changed Message-ID: <200803011945.m21JjYmK005335@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on firewalk (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firewalk From fedora-extras-commits at redhat.com Sat Mar 1 19:45:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:39 +0000 Subject: [pkgdb] firewalk had groupAcl changed Message-ID: <200803011945.m21JjYmM005335@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on firewalk (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firewalk From fedora-extras-commits at redhat.com Sat Mar 1 19:45:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 19:45:39 +0000 Subject: [pkgdb] firewalk had groupAcl changed Message-ID: <200803011946.m21Jjwmr005549@bastion.fedora.phx.redhat.com> Sindre Pedersen Bj?rdal (sindrepb) has set the commit acl on firewalk (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/firewalk From fedora-extras-commits at redhat.com Sat Mar 1 19:51:48 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 1 Mar 2008 19:51:48 GMT Subject: rpms/kdebindings/devel kdebindings-4.0.2-qt434.patch, NONE, 1.1 kdebindings.spec, 1.86, 1.87 Message-ID: <200803011951.m21JpmFY019506@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19483/devel Modified Files: kdebindings.spec Added Files: kdebindings-4.0.2-qt434.patch Log Message: * Sat Mar 01 2008 Kevin Kofler 4.0.2-3 - backport 1 line of rev 776653 from trunk to fix build with Qt 4.3.4 kdebindings-4.0.2-qt434.patch: --- NEW FILE kdebindings-4.0.2-qt434.patch --- diff -ur kdebindings-4.0.2/kalyptus/kalyptus kdebindings-4.0.2-qt434/kalyptus/kalyptus --- kdebindings-4.0.2/kalyptus/kalyptus 2008-01-05 00:53:01.000000000 +0100 +++ kdebindings-4.0.2-qt434/kalyptus/kalyptus 2008-03-01 20:45:53.000000000 +0100 @@ -574,6 +574,7 @@ $p =~ m/^#\s*ifdef\s+QT_COMPAT/ or $p =~ m/^#\s*if\s+defined\s*\(?QT_COMPAT/ or $p =~ m/^#\s*ifdef\s+CONTAINER_CUSTOM_WIDGETS/ or + $p =~ m/^#\s*ifdef\s+Q_MAC_COMPAT_GL_FUNCTIONS/ or $p =~ m/^#\s*ifdef\s+QT3_SUPPORT/ or $p =~ m/^#\s*ifdef\s+KDE3_SUPPORT/ or $p =~ m/^#\s*ifdef\s+Q_WS_WIN/ or Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- kdebindings.spec 29 Feb 2008 23:55:59 -0000 1.86 +++ kdebindings.spec 1 Mar 2008 19:51:13 -0000 1.87 @@ -7,13 +7,16 @@ Name: kdebindings Version: 4.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops License: GPLv2 URL: http://developer.kde.org/language-bindings/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +# one line from http://websvn.kde.org/?view=rev&revision=776653 (Qt 4.4 fixes) +# fixes QMacCompatGL*-related errors with Qt 4.3.4 +Patch0: kdebindings-4.0.2-qt434.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kde-filesystem >= 4 @@ -59,6 +62,7 @@ %prep %setup -q +%patch0 -p1 -b .qt434 %build @@ -113,6 +117,9 @@ %changelog +* Sat Mar 01 2008 Kevin Kofler 4.0.2-3 +- backport 1 line of rev 776653 from trunk to fix build with Qt 4.3.4 + * Fri Feb 29 2008 Kevin Kofler 4.0.2-2 - drop lib64 patches (fixed upstream) From fedora-extras-commits at redhat.com Sat Mar 1 20:27:01 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 1 Mar 2008 20:27:01 GMT Subject: rpms/kdebindings/devel kdebindings-4.0.2-qt434.patch, 1.1, 1.2 kdebindings.spec, 1.87, 1.88 Message-ID: <200803012027.m21KR1bL027132@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27104/devel Modified Files: kdebindings-4.0.2-qt434.patch kdebindings.spec Log Message: Try build fixes from Dirk M??ller instead of my incomplete ones: * Sat Mar 01 2008 Kevin Kofler 4.0.2-3 - apply upstream build fixes for Qt 4.3.4 (rev 780996) kdebindings-4.0.2-qt434.patch: Index: kdebindings-4.0.2-qt434.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.0.2-qt434.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdebindings-4.0.2-qt434.patch 1 Mar 2008 19:51:13 -0000 1.1 +++ kdebindings-4.0.2-qt434.patch 1 Mar 2008 20:26:50 -0000 1.2 @@ -1,11 +1,64 @@ -diff -ur kdebindings-4.0.2/kalyptus/kalyptus kdebindings-4.0.2-qt434/kalyptus/kalyptus ---- kdebindings-4.0.2/kalyptus/kalyptus 2008-01-05 00:53:01.000000000 +0100 -+++ kdebindings-4.0.2-qt434/kalyptus/kalyptus 2008-03-01 20:45:53.000000000 +0100 -@@ -574,6 +574,7 @@ +Index: kalyptus/kalyptusCxxToSmoke.pm +=================================================================== +--- kalyptus/kalyptusCxxToSmoke.pm (revision 780995) ++++ kalyptus/kalyptusCxxToSmoke.pm (revision 780996) +@@ -443,6 +443,8 @@ + || $name eq 'qWarning' + || $name eq 'qCritical' + || $name eq 'qDebug' ++ || $name eq 'qFindString' ++ || $name eq 'qFindStringBoyerMoore' + # qHash() gives problems with building the Qwt lib + || $name eq 'qHash' + || ($classNode->{astNodeName} eq 'TextEvent' and $name eq 'data') +@@ -544,6 +546,7 @@ + } elsif( $m->{NodeType} eq 'var' ) { + if ( ($classNode->{astNodeName} eq 'QUuid' and $name eq 'data4') + || ($name eq 'd') ++ || ($classNode->{astNodeName} eq 'Tab' and $name eq 'type') + || ($classNode->{astNodeName} eq 'QObject' and $name eq 'staticMetaObject') + || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mIncomingMetaData') + || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mOutgoingMetaData') ) +Index: kalyptus/kalyptus +=================================================================== +--- kalyptus/kalyptus (revision 780995) ++++ kalyptus/kalyptus (revision 780996) +@@ -446,7 +446,7 @@ + } + } + +- if ( $p =~ /^\s*Q_OBJECT/ ) { ++ if ( $p =~ /^\s*Q_OBJECT/ && $cNode->{astNodeName} ne 'Qt') { + if ($qt_embedded) { + push @inputqueue, @qte_codeqobject; + } elsif ($qt4) { +@@ -457,11 +457,14 @@ + next; + } + # Hack, waiting for real handling of preprocessor defines ++ $p =~ s/Q_OBJECT//; + $p =~ s/Q_REQUIRED_RESULT//; + $p =~ s/QT_FASTCALL//; + $p =~ s/QT_ASCII_CAST_WARN//; + $p =~ s/QT_BEGIN_HEADER//; + $p =~ s/QT_END_HEADER//; ++ $p =~ s/QT_BEGIN_NAMESPACE//; ++ $p =~ s/QT_END_NAMESPACE//; + $p =~ s/QT_MODULE\(\w+\)//; + $p =~ s/QT_WEAK_SYMBOL//; + $p =~ s/QT_MOC_COMPAT//; +@@ -574,11 +577,14 @@ $p =~ m/^#\s*ifdef\s+QT_COMPAT/ or $p =~ m/^#\s*if\s+defined\s*\(?QT_COMPAT/ or $p =~ m/^#\s*ifdef\s+CONTAINER_CUSTOM_WIDGETS/ or ++ $p =~ m/^#\s*ifdef\s+Q_COMPILER_MANGLES_RETURN_TYPE/ or + $p =~ m/^#\s*ifdef\s+Q_MAC_COMPAT_GL_FUNCTIONS/ or $p =~ m/^#\s*ifdef\s+QT3_SUPPORT/ or $p =~ m/^#\s*ifdef\s+KDE3_SUPPORT/ or $p =~ m/^#\s*ifdef\s+Q_WS_WIN/ or + $p =~ m/^#if\s*!?defined\(Q_WS_WIN\)/ or + $p =~ m/^#if\s*!?defined\(Q_OS_WIN32\)/ or ++ $p =~ m/^#\s*ifdef\s+Q_OS_WINCE/ or + $p =~ m/^#\s*ifdef\s+Q_OS_UNIX/ or + $p =~ m/^#\s*ifdef\s+Q_MOC_RUN/ or + $p =~ m/^#\s*if\s+defined\s*\(QT3_SUPPORT/ or Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- kdebindings.spec 1 Mar 2008 19:51:13 -0000 1.87 +++ kdebindings.spec 1 Mar 2008 20:26:50 -0000 1.88 @@ -14,8 +14,7 @@ License: GPLv2 URL: http://developer.kde.org/language-bindings/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 -# one line from http://websvn.kde.org/?view=rev&revision=776653 (Qt 4.4 fixes) -# fixes QMacCompatGL*-related errors with Qt 4.3.4 +# http://websvn.kde.org/?view=rev&revision=780996 (build fixes for Qt 4.3.4) Patch0: kdebindings-4.0.2-qt434.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,7 +61,7 @@ %prep %setup -q -%patch0 -p1 -b .qt434 +%patch0 -p0 -b .qt434 %build @@ -118,7 +117,7 @@ %changelog * Sat Mar 01 2008 Kevin Kofler 4.0.2-3 -- backport 1 line of rev 776653 from trunk to fix build with Qt 4.3.4 +- apply upstream build fixes for Qt 4.3.4 (rev 780996) * Fri Feb 29 2008 Kevin Kofler 4.0.2-2 - drop lib64 patches (fixed upstream) From fedora-extras-commits at redhat.com Sat Mar 1 20:28:42 2008 From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh)) Date: Sat, 1 Mar 2008 20:28:42 GMT Subject: rpms/haproxy/devel haproxy-gcc43-compat.patch, NONE, 1.1 haproxy.init, 1.1, 1.2 haproxy.spec, 1.6, 1.7 Message-ID: <200803012028.m21KSgjo027204@cvs-int.fedora.redhat.com> Author: jjh Update of /cvs/pkgs/rpms/haproxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27151 Modified Files: haproxy.init haproxy.spec Added Files: haproxy-gcc43-compat.patch Log Message: gcc 4.3 compilation fix haproxy-gcc43-compat.patch: --- NEW FILE haproxy-gcc43-compat.patch --- diff -ru haproxy-1.3.14.2.orig/include/common/compat.h haproxy-1.3.14.2/include/common/compat.h --- haproxy-1.3.14.2.orig/include/common/compat.h 2008-01-20 16:06:34.000000000 -0700 +++ haproxy-1.3.14.2/include/common/compat.h 2008-02-26 08:47:47.000000000 -0700 @@ -35,6 +35,7 @@ #include #include #include +#include /* INTBITS * how many bits are needed to code the size of an int on the target platform. @@ -63,6 +64,8 @@ #endif #if defined(TPROXY) && defined(NETFILTER) +#include +#include #include #endif Index: haproxy.init =================================================================== RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- haproxy.init 21 Sep 2007 17:26:59 -0000 1.1 +++ haproxy.init 1 Mar 2008 20:28:08 -0000 1.2 @@ -73,7 +73,7 @@ return 1 fi echo -n $"Reloading $prog: " - $exec -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid) + $exec -D -f /etc/$prog/$prog.cfg -p /var/run/$prog.pid -sf $(cat /var/run/$prog.pid) retval=$? echo return $retval Index: haproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- haproxy.spec 19 Feb 2008 06:17:56 -0000 1.6 +++ haproxy.spec 1 Mar 2008 20:28:08 -0000 1.7 @@ -6,7 +6,7 @@ Name: haproxy Version: 1.3.14.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments Group: System Environment/Daemons @@ -118,6 +118,10 @@ %changelog +* Sat Mar 01 2008 Jeremy Hinegardner - 1.3.14.2-3 +- fix gcc 4.3 bug [#434144] +- update init script to properly reload configuration + * Tue Feb 19 2008 Fedora Release Engineering - 1.3.14.2-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Mar 1 20:40:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 20:40:07 GMT Subject: rpms/rkhunter/F-8 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 01-rkhunter, NONE, 1.1 Makefile, 1.3, 1.4 rkhunter.spec, 1.10, 1.11 rkhunter.sysconfig, NONE, 1.1 rkhunter-1.3.2.tar.gz.sha1.txt, NONE, 1.1 dead.package, 1.1, NONE Message-ID: <200803012040.m21Ke72a027451@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/rkhunter/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27416 Added Files: .cvsignore sources 01-rkhunter Makefile rkhunter.spec rkhunter.sysconfig rkhunter-1.3.2.tar.gz.sha1.txt Removed Files: dead.package Log Message: Bring package back, update Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 1 Mar 2008 20:39:32 -0000 1.8 @@ -0,0 +1 @@ +rkhunter-1.3.2.tar.gz Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 1 Mar 2008 20:39:32 -0000 1.8 @@ -0,0 +1 @@ +a00ff64d7076d6ff47ef0c9f0b6202f2 rkhunter-1.3.2.tar.gz --- NEW FILE 01-rkhunter --- #!/bin/sh # 01-rkhunter A shell script to update and run rkhunter via CRON XITVAL=0 # Get a secure tempfile TMPFILE1=`/bin/mktemp -p /var/rkhunter/tmp rkhcronlog.XXXXXXXXXX` || exit 1 if [ ! -e /var/lock/subsys/rkhunter ]; then # Try to keep the SysInit boot scan from colliding with us (highly unlikely) /bin/touch /var/lock/subsys/rkhunter # Source system configuration parameters. if [ -e /etc/sysconfig/rkhunter ] ; then . /etc/sysconfig/rkhunter else MAILTO=root at localhost fi # If a diagnostic mode scan was requested, setup the parameters if [ "$DIAG_SCAN" == "yes" ]; then RKHUNTER_FLAGS=" --checkall --run-application-check --skip-keypress --nocolors --quiet --append-log $TMPFILE1 " else RKHUNTER_FLAGS=" --cronjob " fi # Set a few critical parameters RKHUNTER=/usr/bin/rkhunter LOGFILE=/var/log/rkhunter.log # Run RootKit Hunter if available if [ -x $RKHUNTER ]; then /bin/echo -e "\n--------------------- Start Rootkit Hunter Update ---------------------" \ > $TMPFILE1 /bin/nice -n 10 $RKHUNTER --update 2>&1 >> $TMPFILE1 /bin/echo -e "\n---------------------- Start Rootkit Hunter Scan ----------------------" \ >> $TMPFILE1 /bin/nice -n 10 $RKHUNTER $RKHUNTER_FLAGS 2>&1 >> $TMPFILE1 XITVAL=$? /bin/echo -e "\n----------------------- End Rootkit Hunter Scan -----------------------" \ >> $TMPFILE1 /bin/cat $TMPFILE1 | /bin/mail -s 'rkhunter Daily Run' $MAILTO /bin/cat $TMPFILE1 >> $LOGFILE fi # Delete the gating lockfile /bin/rm -f /var/lock/subsys/rkhunter fi # Delete the secure tempfile /bin/rm -f $TMPFILE1 exit $XITVAL Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 1 Mar 2008 20:39:32 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: rkhunter +# $Id$ +NAME := rkhunter +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: rkhunter.spec =================================================================== RCS file: rkhunter.spec diff -N rkhunter.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rkhunter.spec 1 Mar 2008 20:39:32 -0000 1.11 @@ -0,0 +1,268 @@ +Name: rkhunter +Version: 1.3.2 +Release: 1%{?dist} +Summary: A host-based tool to scan for rootkits, backdoors and local exploits + +Group: Applications/System +License: GPLv2+ +URL: http://rkhunter.sourceforge.net/ +Source0: http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz +Source1: http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt +Source2: 01-rkhunter +Source3: rkhunter.sysconfig +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: coreutils, binutils, modutils, findutils, grep, mktemp +Requires: e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget +Requires: perl, perl(strict), perl(IO::Socket), mailx, logrotate + +%description +Rootkit Hunter (RKH) is an easy-to-use tool which checks +computers running UNIX (clones) for the presence of rootkits +and other unwanted tools. + +%prep + +%setup -q + +%{__perl} -pi.0001 -e ' + s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|; + s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|; + s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|; + s|^#(SCRIPTDIR=).+$|$1%{_datadir}/%{name}/scripts|; + s|^#(PKGMGR=).+$|$1RPM|; +%if 0%{?el4}%{?el5} + s|^#(OS_VERSION_FILE=).+$|$1/etc/redhat-release|; +%else + s|^#(OS_VERSION_FILE=).+$|$1/etc/fedora-release|; +%endif + s|^#(ALLOWHIDDENDIR=).+$|$1/dev/.udev|; + s|^#(ALLOWHIDDENFILE=).+$|$1/usr/share/man/man1/..1.gz|; + s|^(APPEND_LOG=).+$|$11|; + s|^(ALLOW_SSH_ROOT_USER=).+$|$1yes|; + s|^(DISABLE_TESTS=).+$|$1"additional_rkts suspscan hidden_procs deleted_files packet_cap_apps"|; + ' files/%{name}.conf + +# Add Fedora specific configs +echo "INSTALLDIR=%{_prefix}" >> files/%{name}.conf +echo "SCRIPTWHITELIST=/usr/bin/whatis" >> files/%name.conf +echo "SCRIPTWHITELIST=/usr/bin/ldd" >> files/%name.conf +echo "SCRIPTWHITELIST=/usr/bin/groups" >> files/%name.conf +echo "SCRIPTWHITELIST=/usr/bin/GET" >> files/%name.conf +echo "SCRIPTWHITELIST=/sbin/ifup" >> files/%name.conf +echo "SCRIPTWHITELIST=/sbin/ifdown" >> files/%name.conf +# in f8/f9 +%if 0%{?fc8}%{?fc9} +echo "SYSLOG_CONFIG_FILE=/etc/rsyslog.conf" >> files/%name.conf +%else +echo "SYSLOG_CONFIG_FILE=/etc/syslog.conf" >> files/%name.conf +%endif + +%{__cat} <<'EOF' >%{name}.logrotate +%{_localstatedir}/log/%{name}.log { + weekly + notifempty + create 640 root root +} +EOF + +%build +# Nothing to be built + +%install +%{__rm} -rf $RPM_BUILD_ROOT + +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/db/i18n + +%{__install} -m755 -p files/%{name} ${RPM_BUILD_ROOT}%{_bindir}/ + +%{__install} -m644 -p files/backdoorports.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/defaulthashes.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/md5blacklist.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/mirrors.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/os.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/programs_bad.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/programs_good.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/i18n/cn ${RPM_BUILD_ROOT}%{_var}/%{name}/db/i18n/ +%{__install} -m644 -p files/i18n/en ${RPM_BUILD_ROOT}%{_var}/%{name}/db/i18n/ + +%{__install} -m644 -p files/CHANGELOG ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ +%{__install} -m644 -p files/LICENSE ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ +%{__install} -m644 -p files/README ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ +%{__install} -m644 -p files/WISHLIST ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ +%{__install} -m755 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m755 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m755 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m644 -p files/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ +# Don't ship these unless we want to Require the perl modules +#%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +#%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m755 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m755 -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ +%{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} +%{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ +%{__install} -m640 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc %{_docdir}/%{name}-%{version}/* +%{_bindir}/%{name} +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/scripts +%{_sysconfdir}/cron.daily/01-%{name} +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%dir %{_var}/%{name} +%{_var}/%{name}/db +%{_var}/%{name}/db/i18n +%dir %{_var}/%{name}/tmp +%config(noreplace) %{_sysconfdir}/%{name}.conf +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%dir %{_docdir}/%{name}-%{version} +%{_mandir}/man8/* + +%changelog +* Thu Feb 28 2008 Kevin Fenzi - 1.3.2-1 +- Update to 1.3.2 +- Fix cron script + +* Thu Feb 28 2008 Kevin Fenzi - 1.3.0-2 +- Use /etc/redhat-release for EPEL and /etc/fedora release for Fedora. +- Add conditionals to support EPEL +- Fix man page warning. + +* Sun Feb 03 2008 Kevin Fenzi - 1.3.0-1 +- Revive package, clean up spec +- Update to 1.3.0 + +* Sat Mar 18 2006 Greg Houlette - 1.2.8-3 +- Made an RPM transparent change to move the sha1 canary check + file out of CVS and into the external lookaside cache (whose + filename changes with every new package release anyway...) + +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + +* Mon Jun 11 2005 Greg Houlette - 1.2.7-1 +- Added signature auto-updating to CRON scan (new script) +- Removed BOOTSCAN pending rewrite to full SysV Init scan in background +- Added the --append-log command line option +- Added Date Stamping to output +- Fixed bug in /etc/group missing report +- New package version release + +* Sun Jan 2 2005 Greg Houlette - 0:1.1.9-1 +- New package version release +- Added the --run-application-check command line option + to listing in command help +- Replaced 'Here' Doc editing of rkhunter.conf file + with in-place Perl edit +- tweaked rpmbuild -bb Autoclean + +* Fri Oct 15 2004 Greg Houlette - 0:1.1.8-0.fdr.1 (revisited) +- Removed redundant buildrequires /bin/sh, coreutils and perl +- Revise postun scriptlet +- Added /usr/share/doc/rkhunter-1.1.8/ to files list + +* Mon Oct 11 2004 Greg Houlette - 0:1.1.8-0.fdr.1 +- Changed Release Tag to 0.fdr.1 (testing) for QA +- Removed wget from dependencies +- Hid (temporarily) the --skip-application-check command + line option from being listed in help +- Fixed the spec files list, again! + +* Fri Oct 8 2004 Greg Houlette - 0:1.1.8-0.fdr.0.2.beta2 +- Unified and disabled the md5 canary check in prep + (check is now optional) removing the sha1 cross-check +- Fixed the spec files list, adding the /var/rkhunter + directory and the /usr/bin/rkhunter executable +- Fixed missing dependencies (rkh uses runtime checks) +- Disabled "auto-clean" for rpmbuild -bb +- Changed Application version scan default to + disabled awaiting backport fix in upstream sources +- Fixed shared_man_search.patch, configuration files + verify and added postun(install) cleanup + +* Fri Oct 1 2004 Greg Houlette - 0:1.1.8-0.fdr.0.1.beta1 +- More cosmetic patchwork +- Changed Release Tag to beta1 (pre-release) for QA submit + +* Tue Sep 28 2004 Greg Houlette - 0:1.1.8-0.fdr.1 +- Removed hidden_search.patch (1.1.7) after it was + merged into upstream source by Michael Boelen +- Removed .spec file from md5 and sha1 file checks + (it must be modifiable by Fedora QA release build) +- Added BOOTSCAN description file to documentation +- Restructured dynamic file creation ('Here' Docs) + moving them to the "prep" stage so that *_ALL_* + files are available prior to the "build" stage + (for inspection purposes) +- Added a /etc/sysconfig/rkhunter parameters file + +* Sun Aug 29 2004 Greg Houlette - 0:1.1.7-0.fdr.1 +- Cosmetic patchwork + +* Sat Aug 21 2004 Greg Houlette - 0:1.1.6-0.fdr.1 +- Moderate reworking of .spec file for packaging standards +- Added md5 and sha1 file checks to prep procedure for source .rpm +- Included an optional rc.local replacement for scan on boot (with full logging) + +* Tue Aug 10 2004 Michael Boelen - 1.1.5 +- Added update script +- Extended description + +* Sun Aug 08 2004 Greg Houlette - 1.1.5 +- Changed the install procedure eliminating the specification of + destination filenames (only needed if you are renaming during install) +- Changed the permissions for documentation files (root only overkill) +- Added the installation of the rkhunter Man Page +- Added the installation of the programs_{bad, good}.dat database files +- Added the installation of the LICENSE documentation file +- Added the chmod for root only to the /var/rkhunter/db directory + +* Sun May 23 2004 Craig Orsinger (cjo) +- version 1.1.0-1.cjo +- changed installation in accordance with new rootkit installation + procedure +- changed installation root to conform to LSB. Use standard macros. +- added recursive remove of old build root as prep for install phase + +* Wed Apr 28 2004 Doncho N. Gunchev - 1.0.9-0.mr700 +- dropped Requires: perl - rkhunter works without it +- dropped the bash alignpatch (check the source or contact me) +- various file mode fixes (.../tmp/, *.db) +- optimized the %%files section - any new files in the + current dirs will be fine - just %%{__install} them. + +* Mon Apr 26 2004 Michael Boelen - 1.0.8-0 +- Fixed missing md5blacklist.dat + +* Mon Apr 19 2004 Doncho N. Gunchev - 1.0.6-1.mr700 +- added missing /usr/local/rkhunter/db/md5blacklist.dat +- patched to align results in --cronjob, I think rpm based + distros have symlink /bin/sh -> /bin/bash +- added --with/--without alignpatch for conditional builds + (in case previous patch breaks something) + +* Sat Apr 03 2004 Michael Boelen / Joe Klemmer - 1.0.6-0 +- Update to 1.0.6 + +* Mon Mar 29 2004 Doncho N. Gunchev - 1.0.0-0 +- initial .spec file --- NEW FILE rkhunter.sysconfig --- # System configuration file for Rootkit Hunter which # stores RPM system specifics for cron run, etc. # # MAILTO= # DIAG_SCAN= no - perform normal report scan # yes - perform detailed report scan # (includes application check) MAILTO=root at localhost DIAG_SCAN=no --- NEW FILE rkhunter-1.3.2.tar.gz.sha1.txt --- 5dfa5246dc1c87b05f44f9f444466ce3d0d6edec rkhunter-1.3.2/files/stat.pl 73a42c94be2fb1fd3284d8dc60d22ff0fc8407f4 rkhunter-1.3.2/files/WISHLIST 5c4319fe3f9acc552b7a9e973b7d081f7cb31642 rkhunter-1.3.2/files/check_port.pl 56bf42d4fe669412b84eb307d5e314af4501dc9a rkhunter-1.3.2/files/testing/stringscanner.sh 361ada5406c7e57e62e840caf3d3bce5e8436fc1 rkhunter-1.3.2/files/testing/rootkitinfo.txt 73e76916a3f65dde2317fff6c932e1d77760fdf7 rkhunter-1.3.2/files/testing/rkhunter.conf 345ab306455525cf5626caadda22b5dcbf732bc1 rkhunter-1.3.2/files/LICENSE cb4903c649ad50b79230f5a5250da82c1d9ccb0f rkhunter-1.3.2/files/development/createhashes.sh e158163bfe6cb414d839e91880af37611f8b5cc0 rkhunter-1.3.2/files/development/createfilehashes.pl 7378fb7e91b1f7e789508e4e8d00e1e3a70ee6ff rkhunter-1.3.2/files/development/search_dead_sysmlinks.sh 0c613880f3447af695ca9f9f93e158b34c2a10c3 rkhunter-1.3.2/files/development/osinformation.sh 4f4dfb87e758236cadc5ac5af67bbb35f4f63eb1 rkhunter-1.3.2/files/development/rpmprelinkhashes.sh d09ab61a3563122b8cd6415e3083dfe1ef285a2b rkhunter-1.3.2/files/development/i18nchk 6b2f032d6143ed3b6ba3eae19d7921e154e69e47 rkhunter-1.3.2/files/development/createhashesall.sh 614a5d3999055a8faeecc393c5695d628e5a7675 rkhunter-1.3.2/files/development/rpmhashes.sh ebc05604eb51b10478d35ac3750699cefecd5ae3 rkhunter-1.3.2/files/filehashmd5.pl 736fd9ea453f34c023a9ebed97fa0cea7461aeb8 rkhunter-1.3.2/files/i18n/zh.utf8 52ac2bcbe9524971cc535b20fb6d3442f53ea8b0 rkhunter-1.3.2/files/i18n/cn 3aa3999bd924382f2a7b7e52ad0c3f7834d2285c rkhunter-1.3.2/files/i18n/zh 02e945d8a260275e118064080767db349fe576ef rkhunter-1.3.2/files/i18n/en a656a91b37a83a2325843f0ccedb5eb7866506ac rkhunter-1.3.2/files/mirrors.dat 1878119b6045eeab6a5afaebad7b523e86c3a935 rkhunter-1.3.2/files/filehashsha1.pl 9ddeec64999f4c0e6f9aa5992cd25c503311b764 rkhunter-1.3.2/files/backdoorports.dat 82c8c3881d59d228de3ce74a4b7b68eac07940f1 rkhunter-1.3.2/files/md5blacklist.dat e3ba269e33d5d385230d0a4457d87cf6e3acece8 rkhunter-1.3.2/files/tools/update_server.sh 90876286c511986474144a5a1fc21afa0f5f29c5 rkhunter-1.3.2/files/tools/update_client.sh ff10891d252f3859abe63054eb64f0e9eae2d781 rkhunter-1.3.2/files/tools/README ec4d60774decbb354f7aafcc2b65b1f87e000c97 rkhunter-1.3.2/files/suspscan.dat 7fa41ed0dc8c95b48b04dab42f1eaf8031c6ce7c rkhunter-1.3.2/files/ACKNOWLEDGMENTS 70fac95d14f77a3917c60f368edbfb9d90ce77c0 rkhunter-1.3.2/files/CHANGELOG 951b498f71fc4a126ca435f7bce96ed8b821efb6 rkhunter-1.3.2/files/os.dat 996a29dee608374e601ecf0253e445e16506c672 rkhunter-1.3.2/files/check_update.sh e651578a9556934bee10621b99297bbd6ccec273 rkhunter-1.3.2/files/rkhunter 575f460146ef61beeda2733f2e3f82c61909d3a8 rkhunter-1.3.2/files/rkhunter.conf 6753f47a54fdfad483fe06ad68dd47161f5efa45 rkhunter-1.3.2/files/rkhunter.8 a0b8900db1484a34f0505bf90b5a07fb38433151 rkhunter-1.3.2/files/rkhunter.spec 897aecb909610d8c2b967fffba4f9626416789fb rkhunter-1.3.2/files/README d824c9ca8b591d108bd7b194350166ac65e64212 rkhunter-1.3.2/files/readlink.sh c82074175e72642dd74322ce29281f0f2fe2798c rkhunter-1.3.2/files/programs_bad.dat d5bff919ce44a345a193824ea16b0404008d7823 rkhunter-1.3.2/files/programs_good.dat 59de768a09a4cd13599653df85ecc2362e416ab3 rkhunter-1.3.2/files/defaulthashes.dat 43bca835d9c64ab2f8cf7f1a5a078bb1b7da9306 rkhunter-1.3.2/files/showfiles.pl 286d1c1fcfa924d63583ae961382250724ac9599 rkhunter-1.3.2/files/FAQ a0badd192cc4f33fbf38f446eae3c858ba81c88f rkhunter-1.3.2/files/check_modules.pl 285155f63cfa7a6a73ec0352dccaaa2221989b94 rkhunter-1.3.2/files/contrib/rkhunter_remote_howto.txt beed9c4b594c5be28ca4837fdcd2ac367e2946ee rkhunter-1.3.2/files/contrib/run_rkhunter.sh 225cc53f9691ad39f10bd2aaac478355ce4dc411 rkhunter-1.3.2/files/contrib/README.txt 1b37e37eb80b4d7fd97b3d4e7f3711d3c4a335f4 rkhunter-1.3.2/installer.sh --- dead.package DELETED --- From fedora-extras-commits at redhat.com Sat Mar 1 20:43:58 2008 From: fedora-extras-commits at redhat.com (Jeremy Hinegardner (jjh)) Date: Sat, 1 Mar 2008 20:43:58 GMT Subject: rpms/haproxy/devel haproxy.spec,1.7,1.8 Message-ID: <200803012043.m21KhwKG027593@cvs-int.fedora.redhat.com> Author: jjh Update of /cvs/pkgs/rpms/haproxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27570 Modified Files: haproxy.spec Log Message: actually apply the gcc 4.3 compat patch Index: haproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- haproxy.spec 1 Mar 2008 20:28:08 -0000 1.7 +++ haproxy.spec 1 Mar 2008 20:43:21 -0000 1.8 @@ -6,7 +6,7 @@ Name: haproxy Version: 1.3.14.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments Group: System Environment/Daemons @@ -17,6 +17,9 @@ Source1: %{name}.init Source2: %{name}.cfg +Patch0: haproxy-gcc43-compat.patch + + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcre-devel @@ -41,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build # No configure script is present, it is all done via make flags @@ -118,6 +122,9 @@ %changelog +* Sat Mar 01 2008 Jeremy Hinegardner - 1.3.14.2-4 +- apply the gcc 4.3 patch to the build process + * Sat Mar 01 2008 Jeremy Hinegardner - 1.3.14.2-3 - fix gcc 4.3 bug [#434144] - update init script to properly reload configuration From fedora-extras-commits at redhat.com Sat Mar 1 20:47:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:47:21 +0000 Subject: [pkgdb] python-musicbrainz2 had acl change status Message-ID: <200803012047.m21Klk4b007427@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchcommits acl on python-musicbrainz2 (Fedora devel) to Approved for Sindre Pedersen Bj?rdal (sindrepb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-musicbrainz2 From fedora-extras-commits at redhat.com Sat Mar 1 20:47:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:47:22 +0000 Subject: [pkgdb] python-musicbrainz2 had acl change status Message-ID: <200803012047.m21KlkPj007431@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchbugzilla acl on python-musicbrainz2 (Fedora devel) to Approved for Sindre Pedersen Bj?rdal (sindrepb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-musicbrainz2 From fedora-extras-commits at redhat.com Sat Mar 1 20:47:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:47:25 +0000 Subject: [pkgdb] python-musicbrainz2 had acl change status Message-ID: <200803012047.m21KlkPn007431@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the commit acl on python-musicbrainz2 (Fedora devel) to Approved for Sindre Pedersen Bj?rdal (sindrepb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-musicbrainz2 From fedora-extras-commits at redhat.com Sat Mar 1 20:47:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:47:32 +0000 Subject: [pkgdb] python-musicbrainz2 had acl change status Message-ID: <200803012047.m21Klk4f007427@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchcommits acl on python-musicbrainz2 (Fedora 7) to Approved for Sindre Pedersen Bj?rdal (sindrepb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-musicbrainz2 From fedora-extras-commits at redhat.com Sat Mar 1 20:47:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:47:32 +0000 Subject: [pkgdb] python-musicbrainz2 had acl change status Message-ID: <200803012047.m21KlkPr007431@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchbugzilla acl on python-musicbrainz2 (Fedora 7) to Approved for Sindre Pedersen Bj?rdal (sindrepb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-musicbrainz2 From fedora-extras-commits at redhat.com Sat Mar 1 20:47:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:47:35 +0000 Subject: [pkgdb] python-musicbrainz2 had acl change status Message-ID: <200803012048.m21KlvcO007526@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the commit acl on python-musicbrainz2 (Fedora 7) to Approved for Sindre Pedersen Bj?rdal (sindrepb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-musicbrainz2 From fedora-extras-commits at redhat.com Sat Mar 1 20:47:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:47:43 +0000 Subject: [pkgdb] python-musicbrainz2 had acl change status Message-ID: <200803012048.m21Klk4j007427@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchbugzilla acl on python-musicbrainz2 (Fedora 8) to Approved for Sindre Pedersen Bj?rdal (sindrepb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-musicbrainz2 From fedora-extras-commits at redhat.com Sat Mar 1 20:47:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:47:46 +0000 Subject: [pkgdb] python-musicbrainz2 had acl change status Message-ID: <200803012048.m21KlvcS007526@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchcommits acl on python-musicbrainz2 (Fedora 8) to Approved for Sindre Pedersen Bj?rdal (sindrepb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-musicbrainz2 From fedora-extras-commits at redhat.com Sat Mar 1 20:47:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:47:51 +0000 Subject: [pkgdb] python-musicbrainz2 had acl change status Message-ID: <200803012048.m21KmCPq007607@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the commit acl on python-musicbrainz2 (Fedora 8) to Approved for Sindre Pedersen Bj?rdal (sindrepb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-musicbrainz2 From fedora-extras-commits at redhat.com Sat Mar 1 20:48:01 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 1 Mar 2008 20:48:01 GMT Subject: rpms/kdebindings/devel kdebindings-4.0.2-pykde4-kservice.patch, NONE, 1.1 kdebindings.spec, 1.88, 1.89 Message-ID: <200803012048.m21Km1jH027687@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27661/devel Modified Files: kdebindings.spec Added Files: kdebindings-4.0.2-pykde4-kservice.patch Log Message: - remove no longer existing protected KService::accessServiceTypes from PyKDE4 kdebindings-4.0.2-pykde4-kservice.patch: --- NEW FILE kdebindings-4.0.2-pykde4-kservice.patch --- diff -ur kdebindings-4.0.2/python/pykde4/sip/kdecore/kservice.sip kdebindings-4.0.2-pykde4-kservice/python/pykde4/sip/kdecore/kservice.sip --- kdebindings-4.0.2/python/pykde4/sip/kdecore/kservice.sip 2008-01-05 00:52:57.000000000 +0100 +++ kdebindings-4.0.2-pykde4-kservice/python/pykde4/sip/kdecore/kservice.sip 2008-03-01 21:44:59.000000000 +0100 @@ -91,9 +91,6 @@ static KService::List allServices (); static QString newServicePath (bool, const QString&, QString* = 0, const QStringList* = 0); -protected: - QStringList& accessServiceTypes (); - }; // class KService Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- kdebindings.spec 1 Mar 2008 20:26:50 -0000 1.88 +++ kdebindings.spec 1 Mar 2008 20:47:28 -0000 1.89 @@ -16,6 +16,8 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 # http://websvn.kde.org/?view=rev&revision=780996 (build fixes for Qt 4.3.4) Patch0: kdebindings-4.0.2-qt434.patch +# protected KService::accessServiceTypes has been removed, drop it from PyKDE4 +Patch1: kdebindings-4.0.2-pykde4-kservice.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kde-filesystem >= 4 @@ -62,6 +64,7 @@ %prep %setup -q %patch0 -p0 -b .qt434 +%patch1 -p1 -b .kservice %build @@ -118,6 +121,7 @@ %changelog * Sat Mar 01 2008 Kevin Kofler 4.0.2-3 - apply upstream build fixes for Qt 4.3.4 (rev 780996) +- remove no longer existing protected KService::accessServiceTypes from PyKDE4 * Fri Feb 29 2008 Kevin Kofler 4.0.2-2 - drop lib64 patches (fixed upstream) From fedora-extras-commits at redhat.com Sat Mar 1 20:48:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:48:07 +0000 Subject: [pkgdb] python-musicbrainz2 had acl change status Message-ID: <200803012048.m21KmW82007663@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the commit acl on python-musicbrainz2 (Fedora 8) to Obsolete for Sindre Pedersen Bj?rdal (sindrepb) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-musicbrainz2 From fedora-extras-commits at redhat.com Sat Mar 1 20:54:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 20:54:46 GMT Subject: rpms/rkhunter/F-7 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 01-rkhunter, NONE, 1.1 Makefile, 1.3, 1.4 rkhunter.spec, 1.10, 1.11 rkhunter.sysconfig, NONE, 1.1 rkhunter-1.3.2.tar.gz.sha1.txt, NONE, 1.1 dead.package, 1.1, NONE Message-ID: <200803012054.m21Kskv1027826@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/rkhunter/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27795 Added Files: .cvsignore sources 01-rkhunter Makefile rkhunter.spec rkhunter.sysconfig rkhunter-1.3.2.tar.gz.sha1.txt Removed Files: dead.package Log Message: Revive package Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 1 Mar 2008 20:54:06 -0000 1.8 @@ -0,0 +1 @@ +rkhunter-1.3.2.tar.gz Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 1 Mar 2008 20:54:06 -0000 1.8 @@ -0,0 +1 @@ +a00ff64d7076d6ff47ef0c9f0b6202f2 rkhunter-1.3.2.tar.gz --- NEW FILE 01-rkhunter --- #!/bin/sh # 01-rkhunter A shell script to update and run rkhunter via CRON XITVAL=0 # Get a secure tempfile TMPFILE1=`/bin/mktemp -p /var/rkhunter/tmp rkhcronlog.XXXXXXXXXX` || exit 1 if [ ! -e /var/lock/subsys/rkhunter ]; then # Try to keep the SysInit boot scan from colliding with us (highly unlikely) /bin/touch /var/lock/subsys/rkhunter # Source system configuration parameters. if [ -e /etc/sysconfig/rkhunter ] ; then . /etc/sysconfig/rkhunter else MAILTO=root at localhost fi # If a diagnostic mode scan was requested, setup the parameters if [ "$DIAG_SCAN" == "yes" ]; then RKHUNTER_FLAGS=" --checkall --run-application-check --skip-keypress --nocolors --quiet --append-log $TMPFILE1 " else RKHUNTER_FLAGS=" --cronjob " fi # Set a few critical parameters RKHUNTER=/usr/bin/rkhunter LOGFILE=/var/log/rkhunter.log # Run RootKit Hunter if available if [ -x $RKHUNTER ]; then /bin/echo -e "\n--------------------- Start Rootkit Hunter Update ---------------------" \ > $TMPFILE1 /bin/nice -n 10 $RKHUNTER --update 2>&1 >> $TMPFILE1 /bin/echo -e "\n---------------------- Start Rootkit Hunter Scan ----------------------" \ >> $TMPFILE1 /bin/nice -n 10 $RKHUNTER $RKHUNTER_FLAGS 2>&1 >> $TMPFILE1 XITVAL=$? /bin/echo -e "\n----------------------- End Rootkit Hunter Scan -----------------------" \ >> $TMPFILE1 /bin/cat $TMPFILE1 | /bin/mail -s 'rkhunter Daily Run' $MAILTO /bin/cat $TMPFILE1 >> $LOGFILE fi # Delete the gating lockfile /bin/rm -f /var/lock/subsys/rkhunter fi # Delete the secure tempfile /bin/rm -f $TMPFILE1 exit $XITVAL Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 1 Mar 2008 20:54:06 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: rkhunter +# $Id$ +NAME := rkhunter +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: rkhunter.spec =================================================================== RCS file: rkhunter.spec diff -N rkhunter.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rkhunter.spec 1 Mar 2008 20:54:06 -0000 1.11 @@ -0,0 +1,268 @@ +Name: rkhunter +Version: 1.3.2 +Release: 1%{?dist} +Summary: A host-based tool to scan for rootkits, backdoors and local exploits + +Group: Applications/System +License: GPLv2+ +URL: http://rkhunter.sourceforge.net/ +Source0: http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz +Source1: http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt +Source2: 01-rkhunter +Source3: rkhunter.sysconfig +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: coreutils, binutils, modutils, findutils, grep, mktemp +Requires: e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget +Requires: perl, perl(strict), perl(IO::Socket), mailx, logrotate + +%description +Rootkit Hunter (RKH) is an easy-to-use tool which checks +computers running UNIX (clones) for the presence of rootkits +and other unwanted tools. + +%prep + +%setup -q + +%{__perl} -pi.0001 -e ' + s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|; + s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|; + s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|; + s|^#(SCRIPTDIR=).+$|$1%{_datadir}/%{name}/scripts|; + s|^#(PKGMGR=).+$|$1RPM|; +%if 0%{?el4}%{?el5} + s|^#(OS_VERSION_FILE=).+$|$1/etc/redhat-release|; +%else + s|^#(OS_VERSION_FILE=).+$|$1/etc/fedora-release|; +%endif + s|^#(ALLOWHIDDENDIR=).+$|$1/dev/.udev|; + s|^#(ALLOWHIDDENFILE=).+$|$1/usr/share/man/man1/..1.gz|; + s|^(APPEND_LOG=).+$|$11|; + s|^(ALLOW_SSH_ROOT_USER=).+$|$1yes|; + s|^(DISABLE_TESTS=).+$|$1"additional_rkts suspscan hidden_procs deleted_files packet_cap_apps"|; + ' files/%{name}.conf + +# Add Fedora specific configs +echo "INSTALLDIR=%{_prefix}" >> files/%{name}.conf +echo "SCRIPTWHITELIST=/usr/bin/whatis" >> files/%name.conf +echo "SCRIPTWHITELIST=/usr/bin/ldd" >> files/%name.conf +echo "SCRIPTWHITELIST=/usr/bin/groups" >> files/%name.conf +echo "SCRIPTWHITELIST=/usr/bin/GET" >> files/%name.conf +echo "SCRIPTWHITELIST=/sbin/ifup" >> files/%name.conf +echo "SCRIPTWHITELIST=/sbin/ifdown" >> files/%name.conf +# in f8/f9 +%if 0%{?fc8}%{?fc9} +echo "SYSLOG_CONFIG_FILE=/etc/rsyslog.conf" >> files/%name.conf +%else +echo "SYSLOG_CONFIG_FILE=/etc/syslog.conf" >> files/%name.conf +%endif + +%{__cat} <<'EOF' >%{name}.logrotate +%{_localstatedir}/log/%{name}.log { + weekly + notifempty + create 640 root root +} +EOF + +%build +# Nothing to be built + +%install +%{__rm} -rf $RPM_BUILD_ROOT + +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/db/i18n + +%{__install} -m755 -p files/%{name} ${RPM_BUILD_ROOT}%{_bindir}/ + +%{__install} -m644 -p files/backdoorports.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/defaulthashes.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/md5blacklist.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/mirrors.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/os.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/programs_bad.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/programs_good.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/i18n/cn ${RPM_BUILD_ROOT}%{_var}/%{name}/db/i18n/ +%{__install} -m644 -p files/i18n/en ${RPM_BUILD_ROOT}%{_var}/%{name}/db/i18n/ + +%{__install} -m644 -p files/CHANGELOG ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ +%{__install} -m644 -p files/LICENSE ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ +%{__install} -m644 -p files/README ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ +%{__install} -m644 -p files/WISHLIST ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ +%{__install} -m755 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m755 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m755 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m644 -p files/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ +# Don't ship these unless we want to Require the perl modules +#%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +#%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m755 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m755 -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ +%{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} +%{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ +%{__install} -m640 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc %{_docdir}/%{name}-%{version}/* +%{_bindir}/%{name} +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/scripts +%{_sysconfdir}/cron.daily/01-%{name} +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%dir %{_var}/%{name} +%{_var}/%{name}/db +%{_var}/%{name}/db/i18n +%dir %{_var}/%{name}/tmp +%config(noreplace) %{_sysconfdir}/%{name}.conf +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%dir %{_docdir}/%{name}-%{version} +%{_mandir}/man8/* + +%changelog +* Thu Feb 28 2008 Kevin Fenzi - 1.3.2-1 +- Update to 1.3.2 +- Fix cron script + +* Thu Feb 28 2008 Kevin Fenzi - 1.3.0-2 +- Use /etc/redhat-release for EPEL and /etc/fedora release for Fedora. +- Add conditionals to support EPEL +- Fix man page warning. + +* Sun Feb 03 2008 Kevin Fenzi - 1.3.0-1 +- Revive package, clean up spec +- Update to 1.3.0 + +* Sat Mar 18 2006 Greg Houlette - 1.2.8-3 +- Made an RPM transparent change to move the sha1 canary check + file out of CVS and into the external lookaside cache (whose + filename changes with every new package release anyway...) + +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + +* Mon Jun 11 2005 Greg Houlette - 1.2.7-1 +- Added signature auto-updating to CRON scan (new script) +- Removed BOOTSCAN pending rewrite to full SysV Init scan in background +- Added the --append-log command line option +- Added Date Stamping to output +- Fixed bug in /etc/group missing report +- New package version release + +* Sun Jan 2 2005 Greg Houlette - 0:1.1.9-1 +- New package version release +- Added the --run-application-check command line option + to listing in command help +- Replaced 'Here' Doc editing of rkhunter.conf file + with in-place Perl edit +- tweaked rpmbuild -bb Autoclean + +* Fri Oct 15 2004 Greg Houlette - 0:1.1.8-0.fdr.1 (revisited) +- Removed redundant buildrequires /bin/sh, coreutils and perl +- Revise postun scriptlet +- Added /usr/share/doc/rkhunter-1.1.8/ to files list + +* Mon Oct 11 2004 Greg Houlette - 0:1.1.8-0.fdr.1 +- Changed Release Tag to 0.fdr.1 (testing) for QA +- Removed wget from dependencies +- Hid (temporarily) the --skip-application-check command + line option from being listed in help +- Fixed the spec files list, again! + +* Fri Oct 8 2004 Greg Houlette - 0:1.1.8-0.fdr.0.2.beta2 +- Unified and disabled the md5 canary check in prep + (check is now optional) removing the sha1 cross-check +- Fixed the spec files list, adding the /var/rkhunter + directory and the /usr/bin/rkhunter executable +- Fixed missing dependencies (rkh uses runtime checks) +- Disabled "auto-clean" for rpmbuild -bb +- Changed Application version scan default to + disabled awaiting backport fix in upstream sources +- Fixed shared_man_search.patch, configuration files + verify and added postun(install) cleanup + +* Fri Oct 1 2004 Greg Houlette - 0:1.1.8-0.fdr.0.1.beta1 +- More cosmetic patchwork +- Changed Release Tag to beta1 (pre-release) for QA submit + +* Tue Sep 28 2004 Greg Houlette - 0:1.1.8-0.fdr.1 +- Removed hidden_search.patch (1.1.7) after it was + merged into upstream source by Michael Boelen +- Removed .spec file from md5 and sha1 file checks + (it must be modifiable by Fedora QA release build) +- Added BOOTSCAN description file to documentation +- Restructured dynamic file creation ('Here' Docs) + moving them to the "prep" stage so that *_ALL_* + files are available prior to the "build" stage + (for inspection purposes) +- Added a /etc/sysconfig/rkhunter parameters file + +* Sun Aug 29 2004 Greg Houlette - 0:1.1.7-0.fdr.1 +- Cosmetic patchwork + +* Sat Aug 21 2004 Greg Houlette - 0:1.1.6-0.fdr.1 +- Moderate reworking of .spec file for packaging standards +- Added md5 and sha1 file checks to prep procedure for source .rpm +- Included an optional rc.local replacement for scan on boot (with full logging) + +* Tue Aug 10 2004 Michael Boelen - 1.1.5 +- Added update script +- Extended description + +* Sun Aug 08 2004 Greg Houlette - 1.1.5 +- Changed the install procedure eliminating the specification of + destination filenames (only needed if you are renaming during install) +- Changed the permissions for documentation files (root only overkill) +- Added the installation of the rkhunter Man Page +- Added the installation of the programs_{bad, good}.dat database files +- Added the installation of the LICENSE documentation file +- Added the chmod for root only to the /var/rkhunter/db directory + +* Sun May 23 2004 Craig Orsinger (cjo) +- version 1.1.0-1.cjo +- changed installation in accordance with new rootkit installation + procedure +- changed installation root to conform to LSB. Use standard macros. +- added recursive remove of old build root as prep for install phase + +* Wed Apr 28 2004 Doncho N. Gunchev - 1.0.9-0.mr700 +- dropped Requires: perl - rkhunter works without it +- dropped the bash alignpatch (check the source or contact me) +- various file mode fixes (.../tmp/, *.db) +- optimized the %%files section - any new files in the + current dirs will be fine - just %%{__install} them. + +* Mon Apr 26 2004 Michael Boelen - 1.0.8-0 +- Fixed missing md5blacklist.dat + +* Mon Apr 19 2004 Doncho N. Gunchev - 1.0.6-1.mr700 +- added missing /usr/local/rkhunter/db/md5blacklist.dat +- patched to align results in --cronjob, I think rpm based + distros have symlink /bin/sh -> /bin/bash +- added --with/--without alignpatch for conditional builds + (in case previous patch breaks something) + +* Sat Apr 03 2004 Michael Boelen / Joe Klemmer - 1.0.6-0 +- Update to 1.0.6 + +* Mon Mar 29 2004 Doncho N. Gunchev - 1.0.0-0 +- initial .spec file --- NEW FILE rkhunter.sysconfig --- # System configuration file for Rootkit Hunter which # stores RPM system specifics for cron run, etc. # # MAILTO= # DIAG_SCAN= no - perform normal report scan # yes - perform detailed report scan # (includes application check) MAILTO=root at localhost DIAG_SCAN=no --- NEW FILE rkhunter-1.3.2.tar.gz.sha1.txt --- 5dfa5246dc1c87b05f44f9f444466ce3d0d6edec rkhunter-1.3.2/files/stat.pl 73a42c94be2fb1fd3284d8dc60d22ff0fc8407f4 rkhunter-1.3.2/files/WISHLIST 5c4319fe3f9acc552b7a9e973b7d081f7cb31642 rkhunter-1.3.2/files/check_port.pl 56bf42d4fe669412b84eb307d5e314af4501dc9a rkhunter-1.3.2/files/testing/stringscanner.sh 361ada5406c7e57e62e840caf3d3bce5e8436fc1 rkhunter-1.3.2/files/testing/rootkitinfo.txt 73e76916a3f65dde2317fff6c932e1d77760fdf7 rkhunter-1.3.2/files/testing/rkhunter.conf 345ab306455525cf5626caadda22b5dcbf732bc1 rkhunter-1.3.2/files/LICENSE cb4903c649ad50b79230f5a5250da82c1d9ccb0f rkhunter-1.3.2/files/development/createhashes.sh e158163bfe6cb414d839e91880af37611f8b5cc0 rkhunter-1.3.2/files/development/createfilehashes.pl 7378fb7e91b1f7e789508e4e8d00e1e3a70ee6ff rkhunter-1.3.2/files/development/search_dead_sysmlinks.sh 0c613880f3447af695ca9f9f93e158b34c2a10c3 rkhunter-1.3.2/files/development/osinformation.sh 4f4dfb87e758236cadc5ac5af67bbb35f4f63eb1 rkhunter-1.3.2/files/development/rpmprelinkhashes.sh d09ab61a3563122b8cd6415e3083dfe1ef285a2b rkhunter-1.3.2/files/development/i18nchk 6b2f032d6143ed3b6ba3eae19d7921e154e69e47 rkhunter-1.3.2/files/development/createhashesall.sh 614a5d3999055a8faeecc393c5695d628e5a7675 rkhunter-1.3.2/files/development/rpmhashes.sh ebc05604eb51b10478d35ac3750699cefecd5ae3 rkhunter-1.3.2/files/filehashmd5.pl 736fd9ea453f34c023a9ebed97fa0cea7461aeb8 rkhunter-1.3.2/files/i18n/zh.utf8 52ac2bcbe9524971cc535b20fb6d3442f53ea8b0 rkhunter-1.3.2/files/i18n/cn 3aa3999bd924382f2a7b7e52ad0c3f7834d2285c rkhunter-1.3.2/files/i18n/zh 02e945d8a260275e118064080767db349fe576ef rkhunter-1.3.2/files/i18n/en a656a91b37a83a2325843f0ccedb5eb7866506ac rkhunter-1.3.2/files/mirrors.dat 1878119b6045eeab6a5afaebad7b523e86c3a935 rkhunter-1.3.2/files/filehashsha1.pl 9ddeec64999f4c0e6f9aa5992cd25c503311b764 rkhunter-1.3.2/files/backdoorports.dat 82c8c3881d59d228de3ce74a4b7b68eac07940f1 rkhunter-1.3.2/files/md5blacklist.dat e3ba269e33d5d385230d0a4457d87cf6e3acece8 rkhunter-1.3.2/files/tools/update_server.sh 90876286c511986474144a5a1fc21afa0f5f29c5 rkhunter-1.3.2/files/tools/update_client.sh ff10891d252f3859abe63054eb64f0e9eae2d781 rkhunter-1.3.2/files/tools/README ec4d60774decbb354f7aafcc2b65b1f87e000c97 rkhunter-1.3.2/files/suspscan.dat 7fa41ed0dc8c95b48b04dab42f1eaf8031c6ce7c rkhunter-1.3.2/files/ACKNOWLEDGMENTS 70fac95d14f77a3917c60f368edbfb9d90ce77c0 rkhunter-1.3.2/files/CHANGELOG 951b498f71fc4a126ca435f7bce96ed8b821efb6 rkhunter-1.3.2/files/os.dat 996a29dee608374e601ecf0253e445e16506c672 rkhunter-1.3.2/files/check_update.sh e651578a9556934bee10621b99297bbd6ccec273 rkhunter-1.3.2/files/rkhunter 575f460146ef61beeda2733f2e3f82c61909d3a8 rkhunter-1.3.2/files/rkhunter.conf 6753f47a54fdfad483fe06ad68dd47161f5efa45 rkhunter-1.3.2/files/rkhunter.8 a0b8900db1484a34f0505bf90b5a07fb38433151 rkhunter-1.3.2/files/rkhunter.spec 897aecb909610d8c2b967fffba4f9626416789fb rkhunter-1.3.2/files/README d824c9ca8b591d108bd7b194350166ac65e64212 rkhunter-1.3.2/files/readlink.sh c82074175e72642dd74322ce29281f0f2fe2798c rkhunter-1.3.2/files/programs_bad.dat d5bff919ce44a345a193824ea16b0404008d7823 rkhunter-1.3.2/files/programs_good.dat 59de768a09a4cd13599653df85ecc2362e416ab3 rkhunter-1.3.2/files/defaulthashes.dat 43bca835d9c64ab2f8cf7f1a5a078bb1b7da9306 rkhunter-1.3.2/files/showfiles.pl 286d1c1fcfa924d63583ae961382250724ac9599 rkhunter-1.3.2/files/FAQ a0badd192cc4f33fbf38f446eae3c858ba81c88f rkhunter-1.3.2/files/check_modules.pl 285155f63cfa7a6a73ec0352dccaaa2221989b94 rkhunter-1.3.2/files/contrib/rkhunter_remote_howto.txt beed9c4b594c5be28ca4837fdcd2ac367e2946ee rkhunter-1.3.2/files/contrib/run_rkhunter.sh 225cc53f9691ad39f10bd2aaac478355ce4dc411 rkhunter-1.3.2/files/contrib/README.txt 1b37e37eb80b4d7fd97b3d4e7f3711d3c4a335f4 rkhunter-1.3.2/installer.sh --- dead.package DELETED --- From fedora-extras-commits at redhat.com Sat Mar 1 20:56:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:56:19 +0000 Subject: [pkgdb] rkhunter (Fedora EPEL, 4) updated by kevin Message-ID: <200803012056.m21Kui4P008025@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for rkhunter Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rkhunter (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on rkhunter (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rkhunter (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rkhunter From fedora-extras-commits at redhat.com Sat Mar 1 20:56:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 01 Mar 2008 20:56:19 +0000 Subject: [pkgdb] rkhunter (Fedora EPEL, 5) updated by kevin Message-ID: <200803012056.m21Kui4R008025@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for rkhunter Kevin Fenzi (kevin) has set commit to Approved for cvsextras on rkhunter (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on rkhunter (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on rkhunter (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/rkhunter From fedora-extras-commits at redhat.com Sat Mar 1 20:59:00 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 1 Mar 2008 20:59:00 GMT Subject: rpms/f-spot/devel f-spot.spec,1.64,1.65 Message-ID: <200803012059.m21Kx0Sv028159@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/f-spot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28130 Modified Files: f-spot.spec Log Message: * Sat Mar 1 2008 Christopher Aillon - 0.4.2-4 - Require dcraw Index: f-spot.spec =================================================================== RCS file: /cvs/extras/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- f-spot.spec 1 Mar 2008 08:32:43 -0000 1.64 +++ f-spot.spec 1 Mar 2008 20:58:10 -0000 1.65 @@ -1,6 +1,6 @@ Name: f-spot Version: 0.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Photo management application Group: Applications/Multimedia @@ -24,6 +24,7 @@ BuildRequires: ndesk-dbus-glib-devel Requires: sqlite >= 3.3.1 Requires: lcms +Requires: dcraw Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -100,6 +101,9 @@ %{_datadir}/omf/f-spot %changelog +* Sat Mar 1 2008 Christopher Aillon - 0.4.2-4 +- Require dcraw + * Fri Feb 29 2008 Christopher Aillon - 0.4.2-3 - Fix the build From fedora-extras-commits at redhat.com Sat Mar 1 21:04:32 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 1 Mar 2008 21:04:32 GMT Subject: rpms/rkhunter/EL-4 01-rkhunter, NONE, 1.1 rkhunter-1.3.2.tar.gz.sha1.txt, NONE, 1.1 rkhunter.sysconfig, NONE, 1.1 rkhunter.spec, 1.6, 1.7 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6 rkhunter-1.1.8-showfiles.patch, 1.1, NONE rkhunter-1.1.9-shared_man_search.patch, 1.1, NONE rkhunter-1.2.7-append_log.patch, 1.1, NONE rkhunter-1.2.7-datestamp.patch, 1.1, NONE rkhunter-1.2.7-group_log.patch, 1.1, NONE rkhunter-1.2.7-manpage.patch, 1.1, NONE rkhunter-1.2.8-2.src.sha, 1.1, NONE rkhunter-1.2.8-app_check_default.patch, 1.1, NONE rkhunter-1.2.8-default_settings-conf.patch, 1.1, NONE Message-ID: <200803012104.m21L4WUr003061@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/rkhunter/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2984 Modified Files: rkhunter.spec sources .cvsignore Added Files: 01-rkhunter rkhunter-1.3.2.tar.gz.sha1.txt rkhunter.sysconfig Removed Files: rkhunter-1.1.8-showfiles.patch rkhunter-1.1.9-shared_man_search.patch rkhunter-1.2.7-append_log.patch rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch rkhunter-1.2.7-manpage.patch rkhunter-1.2.8-2.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Log Message: Initial el4 build, sync with fedora. --- NEW FILE 01-rkhunter --- #!/bin/sh # 01-rkhunter A shell script to update and run rkhunter via CRON XITVAL=0 # Get a secure tempfile TMPFILE1=`/bin/mktemp -p /var/rkhunter/tmp rkhcronlog.XXXXXXXXXX` || exit 1 if [ ! -e /var/lock/subsys/rkhunter ]; then # Try to keep the SysInit boot scan from colliding with us (highly unlikely) /bin/touch /var/lock/subsys/rkhunter # Source system configuration parameters. if [ -e /etc/sysconfig/rkhunter ] ; then . /etc/sysconfig/rkhunter else MAILTO=root at localhost fi # If a diagnostic mode scan was requested, setup the parameters if [ "$DIAG_SCAN" == "yes" ]; then RKHUNTER_FLAGS=" --checkall --run-application-check --skip-keypress --nocolors --quiet --append-log $TMPFILE1 " else RKHUNTER_FLAGS=" --cronjob " fi # Set a few critical parameters RKHUNTER=/usr/bin/rkhunter LOGFILE=/var/log/rkhunter.log # Run RootKit Hunter if available if [ -x $RKHUNTER ]; then /bin/echo -e "\n--------------------- Start Rootkit Hunter Update ---------------------" \ > $TMPFILE1 /bin/nice -n 10 $RKHUNTER --update 2>&1 >> $TMPFILE1 /bin/echo -e "\n---------------------- Start Rootkit Hunter Scan ----------------------" \ >> $TMPFILE1 /bin/nice -n 10 $RKHUNTER $RKHUNTER_FLAGS 2>&1 >> $TMPFILE1 XITVAL=$? /bin/echo -e "\n----------------------- End Rootkit Hunter Scan -----------------------" \ >> $TMPFILE1 /bin/cat $TMPFILE1 | /bin/mail -s 'rkhunter Daily Run' $MAILTO /bin/cat $TMPFILE1 >> $LOGFILE fi # Delete the gating lockfile /bin/rm -f /var/lock/subsys/rkhunter fi # Delete the secure tempfile /bin/rm -f $TMPFILE1 exit $XITVAL --- NEW FILE rkhunter-1.3.2.tar.gz.sha1.txt --- 5dfa5246dc1c87b05f44f9f444466ce3d0d6edec rkhunter-1.3.2/files/stat.pl 73a42c94be2fb1fd3284d8dc60d22ff0fc8407f4 rkhunter-1.3.2/files/WISHLIST 5c4319fe3f9acc552b7a9e973b7d081f7cb31642 rkhunter-1.3.2/files/check_port.pl 56bf42d4fe669412b84eb307d5e314af4501dc9a rkhunter-1.3.2/files/testing/stringscanner.sh 361ada5406c7e57e62e840caf3d3bce5e8436fc1 rkhunter-1.3.2/files/testing/rootkitinfo.txt 73e76916a3f65dde2317fff6c932e1d77760fdf7 rkhunter-1.3.2/files/testing/rkhunter.conf 345ab306455525cf5626caadda22b5dcbf732bc1 rkhunter-1.3.2/files/LICENSE cb4903c649ad50b79230f5a5250da82c1d9ccb0f rkhunter-1.3.2/files/development/createhashes.sh e158163bfe6cb414d839e91880af37611f8b5cc0 rkhunter-1.3.2/files/development/createfilehashes.pl 7378fb7e91b1f7e789508e4e8d00e1e3a70ee6ff rkhunter-1.3.2/files/development/search_dead_sysmlinks.sh 0c613880f3447af695ca9f9f93e158b34c2a10c3 rkhunter-1.3.2/files/development/osinformation.sh 4f4dfb87e758236cadc5ac5af67bbb35f4f63eb1 rkhunter-1.3.2/files/development/rpmprelinkhashes.sh d09ab61a3563122b8cd6415e3083dfe1ef285a2b rkhunter-1.3.2/files/development/i18nchk 6b2f032d6143ed3b6ba3eae19d7921e154e69e47 rkhunter-1.3.2/files/development/createhashesall.sh 614a5d3999055a8faeecc393c5695d628e5a7675 rkhunter-1.3.2/files/development/rpmhashes.sh ebc05604eb51b10478d35ac3750699cefecd5ae3 rkhunter-1.3.2/files/filehashmd5.pl 736fd9ea453f34c023a9ebed97fa0cea7461aeb8 rkhunter-1.3.2/files/i18n/zh.utf8 52ac2bcbe9524971cc535b20fb6d3442f53ea8b0 rkhunter-1.3.2/files/i18n/cn 3aa3999bd924382f2a7b7e52ad0c3f7834d2285c rkhunter-1.3.2/files/i18n/zh 02e945d8a260275e118064080767db349fe576ef rkhunter-1.3.2/files/i18n/en a656a91b37a83a2325843f0ccedb5eb7866506ac rkhunter-1.3.2/files/mirrors.dat 1878119b6045eeab6a5afaebad7b523e86c3a935 rkhunter-1.3.2/files/filehashsha1.pl 9ddeec64999f4c0e6f9aa5992cd25c503311b764 rkhunter-1.3.2/files/backdoorports.dat 82c8c3881d59d228de3ce74a4b7b68eac07940f1 rkhunter-1.3.2/files/md5blacklist.dat e3ba269e33d5d385230d0a4457d87cf6e3acece8 rkhunter-1.3.2/files/tools/update_server.sh 90876286c511986474144a5a1fc21afa0f5f29c5 rkhunter-1.3.2/files/tools/update_client.sh ff10891d252f3859abe63054eb64f0e9eae2d781 rkhunter-1.3.2/files/tools/README ec4d60774decbb354f7aafcc2b65b1f87e000c97 rkhunter-1.3.2/files/suspscan.dat 7fa41ed0dc8c95b48b04dab42f1eaf8031c6ce7c rkhunter-1.3.2/files/ACKNOWLEDGMENTS 70fac95d14f77a3917c60f368edbfb9d90ce77c0 rkhunter-1.3.2/files/CHANGELOG 951b498f71fc4a126ca435f7bce96ed8b821efb6 rkhunter-1.3.2/files/os.dat 996a29dee608374e601ecf0253e445e16506c672 rkhunter-1.3.2/files/check_update.sh e651578a9556934bee10621b99297bbd6ccec273 rkhunter-1.3.2/files/rkhunter 575f460146ef61beeda2733f2e3f82c61909d3a8 rkhunter-1.3.2/files/rkhunter.conf 6753f47a54fdfad483fe06ad68dd47161f5efa45 rkhunter-1.3.2/files/rkhunter.8 a0b8900db1484a34f0505bf90b5a07fb38433151 rkhunter-1.3.2/files/rkhunter.spec 897aecb909610d8c2b967fffba4f9626416789fb rkhunter-1.3.2/files/README d824c9ca8b591d108bd7b194350166ac65e64212 rkhunter-1.3.2/files/readlink.sh c82074175e72642dd74322ce29281f0f2fe2798c rkhunter-1.3.2/files/programs_bad.dat d5bff919ce44a345a193824ea16b0404008d7823 rkhunter-1.3.2/files/programs_good.dat 59de768a09a4cd13599653df85ecc2362e416ab3 rkhunter-1.3.2/files/defaulthashes.dat 43bca835d9c64ab2f8cf7f1a5a078bb1b7da9306 rkhunter-1.3.2/files/showfiles.pl 286d1c1fcfa924d63583ae961382250724ac9599 rkhunter-1.3.2/files/FAQ a0badd192cc4f33fbf38f446eae3c858ba81c88f rkhunter-1.3.2/files/check_modules.pl 285155f63cfa7a6a73ec0352dccaaa2221989b94 rkhunter-1.3.2/files/contrib/rkhunter_remote_howto.txt beed9c4b594c5be28ca4837fdcd2ac367e2946ee rkhunter-1.3.2/files/contrib/run_rkhunter.sh 225cc53f9691ad39f10bd2aaac478355ce4dc411 rkhunter-1.3.2/files/contrib/README.txt 1b37e37eb80b4d7fd97b3d4e7f3711d3c4a335f4 rkhunter-1.3.2/installer.sh --- NEW FILE rkhunter.sysconfig --- # System configuration file for Rootkit Hunter which # stores RPM system specifics for cron run, etc. # # MAILTO= # DIAG_SCAN= no - perform normal report scan # yes - perform detailed report scan # (includes application check) MAILTO=root at localhost DIAG_SCAN=no Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/EL-4/rkhunter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rkhunter.spec 17 Mar 2006 12:55:11 -0000 1.6 +++ rkhunter.spec 1 Mar 2008 21:03:56 -0000 1.7 @@ -1,99 +1,63 @@ -%define rkhVer 1.2.8 -%define rpmRel 2 - -# We can't let RPM do the dependencies automatic because it'll then pick up -# a correct but undesirable perl dependency, which rkhunter does not require -# in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. -AutoReqProv: no - Name: rkhunter -Version: %{rkhVer} -Release: %{rpmRel}%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System -License: GPL -URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz -Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha -Patch0: rkhunter-1.2.8-default_settings-conf.patch -Patch1: rkhunter-1.1.8-showfiles.patch -Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.2.8-app_check_default.patch -Patch4: rkhunter-1.2.7-datestamp.patch -Patch5: rkhunter-1.2.7-append_log.patch -Patch6: rkhunter-1.2.7-group_log.patch -Patch7: rkhunter-1.2.7-manpage.patch +License: GPLv2+ +URL: http://rkhunter.sourceforge.net/ +Source0: http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz +Source1: http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt +Source2: 01-rkhunter +Source3: rkhunter.sysconfig BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp +Requires: coreutils, binutils, modutils, findutils, grep, mktemp Requires: e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget -Requires: perl, perl(strict), perl(IO::Socket), mailx +Requires: perl, perl(strict), perl(IO::Socket), mailx, logrotate %description -Rootkit Hunter scans files and systems for known and unknown rootkits, -backdoors, and sniffers. The package contains one shell script, a few -text-based databases, and optional Perl modules. It should run on almost -every Unix clone. This tool scans for rootkits, backdoors and local -exploits by running tests like: - - MD5 hash compare - - Look for default files used by rootkits - - Wrong file permissions for binaries - - Look for suspected strings in LKM and KLD modules - - Look for hidden files - - Optional scan within plaintext and binary files - - Software version checks - - Application tests - -Rootkit Hunter is released as a GPL licensed project and -is free for everyone to use. - +Rootkit Hunter (RKH) is an easy-to-use tool which checks +computers running UNIX (clones) for the presence of rootkits +and other unwanted tools. %prep -# This optional check is for verification of original sources -# DURING the binary build process (sha1 canary check) -#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ -# && %{__perl} -pi.orig -e ' -# s|../SOURCES|%{_sourcedir}|g; -# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha -#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? -#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha -#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ -# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha - -%setup -q -n %{name} -%setup -q -D -T -a 1 -n %{name} - -%patch0 -b .orig +%setup -q %{__perl} -pi.0001 -e ' - s|^#(INSTALLDIR=).+$|$1%{_prefix}|; s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|; s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|; s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|; + s|^#(SCRIPTDIR=).+$|$1%{_datadir}/%{name}/scripts|; + s|^#(PKGMGR=).+$|$1RPM|; +%if 0%{?el4}%{?el5} + s|^#(OS_VERSION_FILE=).+$|$1/etc/redhat-release|; +%else + s|^#(OS_VERSION_FILE=).+$|$1/etc/fedora-release|; +%endif + s|^#(ALLOWHIDDENDIR=).+$|$1/dev/.udev|; + s|^#(ALLOWHIDDENFILE=).+$|$1/usr/share/man/man1/..1.gz|; + s|^(APPEND_LOG=).+$|$11|; + s|^(ALLOW_SSH_ROOT_USER=).+$|$1yes|; + s|^(DISABLE_TESTS=).+$|$1"additional_rkts suspscan hidden_procs deleted_files packet_cap_apps"|; ' files/%{name}.conf -%{__perl} -pi.orig -e ' - s|\@TMPDIR\@|%{_var}/%{name}/tmp|g; - s|\@STDIR\@|%{_localstatedir}|g; - s|\@CFGDIR\@|%{_sysconfdir}|g; - s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g; - s|\@ITDIR\@|%{_initrddir}|g; - s|\@RKEXE\@|%{_bindir}/%{name}|g; - s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g; - s|\@LGDIR\@|%{_localstatedir}/log|g; - ' 01-%{name} - -%patch1 -b .orig -%patch2 -b .orig -%patch3 -b .0001 -%patch4 -b .0002 -%patch5 -b .0003 -%patch6 -b .0004 -%patch7 -b .orig +# Add Fedora specific configs +echo "INSTALLDIR=%{_prefix}" >> files/%{name}.conf +echo "SCRIPTWHITELIST=/usr/bin/whatis" >> files/%name.conf +echo "SCRIPTWHITELIST=/usr/bin/ldd" >> files/%name.conf +echo "SCRIPTWHITELIST=/usr/bin/groups" >> files/%name.conf +echo "SCRIPTWHITELIST=/usr/bin/GET" >> files/%name.conf +echo "SCRIPTWHITELIST=/sbin/ifup" >> files/%name.conf +echo "SCRIPTWHITELIST=/sbin/ifdown" >> files/%name.conf +# in f8/f9 +%if 0%{?fc8}%{?fc9} +echo "SYSLOG_CONFIG_FILE=/etc/rsyslog.conf" >> files/%name.conf +%else +echo "SYSLOG_CONFIG_FILE=/etc/syslog.conf" >> files/%name.conf +%endif %{__cat} <<'EOF' >%{name}.logrotate %{_localstatedir}/log/%{name}.log { @@ -103,93 +67,88 @@ } EOF - %build -#%%configure -# We have nothing to configure... yet... - +# Nothing to be built %install %{__rm} -rf $RPM_BUILD_ROOT %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} +%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/db/i18n -%{__install} -m750 -p files/%{name} ${RPM_BUILD_ROOT}%{_bindir}/ +%{__install} -m755 -p files/%{name} ${RPM_BUILD_ROOT}%{_bindir}/ -%{__install} -m640 -p files/backdoorports.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ -%{__install} -m640 -p files/defaulthashes.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ -%{__install} -m640 -p files/md5blacklist.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ -%{__install} -m640 -p files/mirrors.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ -%{__install} -m640 -p files/os.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ -%{__install} -m640 -p files/programs_bad.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ -%{__install} -m640 -p files/programs_good.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/backdoorports.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/defaulthashes.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/md5blacklist.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/mirrors.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/os.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/programs_bad.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/programs_good.dat ${RPM_BUILD_ROOT}%{_var}/%{name}/db/ +%{__install} -m644 -p files/i18n/cn ${RPM_BUILD_ROOT}%{_var}/%{name}/db/i18n/ +%{__install} -m644 -p files/i18n/en ${RPM_BUILD_ROOT}%{_var}/%{name}/db/i18n/ %{__install} -m644 -p files/CHANGELOG ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ %{__install} -m644 -p files/LICENSE ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ %{__install} -m644 -p files/README ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ %{__install} -m644 -p files/WISHLIST ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/ - -%{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ - -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ -%{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ +%{__install} -m755 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m755 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m755 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m644 -p files/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ +# Don't ship these unless we want to Require the perl modules +#%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +#%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m755 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/ +%{__install} -m755 -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ -%{__install} -m640 -p %{name}.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} - +%{__install} -m640 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} %clean %{__rm} -rf $RPM_BUILD_ROOT -# Autoclean for rpmbuild -bb -#cd .. -#[ ! -d %{name} ] || %{__rm} -rf %{name} - - -%post -/bin/touch %{_localstatedir}/log/%{name}.log -/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \ - >> %{_localstatedir}/log/%{name}.log -%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log -/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \ - >> %{_localstatedir}/log/%{name}.log -/bin/chown root.root %{_localstatedir}/log/%{name}.log -/bin/chmod 640 %{_localstatedir}/log/%{name}.log - -%postun -if [ "$1" = 0 ]; then - [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} -fi - %files %defattr(-,root,root,-) +%doc %{_docdir}/%{name}-%{version}/* %{_bindir}/%{name} -%dir %{_prefix}/lib/%{name} -%{_prefix}/lib/%{name}/scripts +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} -%{_sysconfdir}/logrotate.d/%{name} +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} %{_var}/%{name}/db +%{_var}/%{name}/db/i18n %dir %{_var}/%{name}/tmp -%{_sysconfdir}/%{name}.conf -%{_sysconfdir}/sysconfig/%{name} +%config(noreplace) %{_sysconfdir}/%{name}.conf +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/* %{_mandir}/man8/* - %changelog +* Thu Feb 28 2008 Kevin Fenzi - 1.3.2-1 +- Update to 1.3.2 +- Fix cron script + +* Thu Feb 28 2008 Kevin Fenzi - 1.3.0-2 +- Use /etc/redhat-release for EPEL and /etc/fedora release for Fedora. +- Add conditionals to support EPEL +- Fix man page warning. + +* Sun Feb 03 2008 Kevin Fenzi - 1.3.0-1 +- Revive package, clean up spec +- Update to 1.3.0 + +* Sat Mar 18 2006 Greg Houlette - 1.2.8-3 +- Made an RPM transparent change to move the sha1 canary check + file out of CVS and into the external lookaside cache (whose + filename changes with every new package release anyway...) + * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/EL-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Mar 2006 20:57:35 -0000 1.5 +++ sources 1 Mar 2008 21:03:56 -0000 1.6 @@ -1,2 +1 @@ -41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz -a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz +a00ff64d7076d6ff47ef0c9f0b6202f2 rkhunter-1.3.2.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/EL-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Mar 2006 20:57:35 -0000 1.5 +++ .cvsignore 1 Mar 2008 21:03:56 -0000 1.6 @@ -1,3 +1 @@ -rkhunter-1.2.8.tar.gz -rkhunter-auto_scan.tar.gz -clog +rkhunter-1.3.2.tar.gz --- rkhunter-1.1.8-showfiles.patch DELETED --- --- rkhunter-1.1.9-shared_man_search.patch DELETED --- --- rkhunter-1.2.7-append_log.patch DELETED --- --- rkhunter-1.2.7-datestamp.patch DELETED --- --- rkhunter-1.2.7-group_log.patch DELETED --- --- rkhunter-1.2.7-manpage.patch DELETED --- --- rkhunter-1.2.8-2.src.sha DELETED --- --- rkhunter-1.2.8-app_check_default.patch DELETED --- --- rkhunter-1.2.8-default_settings-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 1 21:21:15 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 1 Mar 2008 21:21:15 GMT Subject: rpms/elfutils/devel .cvsignore, 1.40, 1.41 elfutils-portability.patch, 1.34, 1.35 elfutils.spec, 1.100, 1.101 sources, 1.44, 1.45 Message-ID: <200803012121.m21LLFIB003379@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/elfutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3347 Modified Files: .cvsignore elfutils-portability.patch elfutils.spec sources Log Message: New upstream version 0.133 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 22 Jan 2008 01:09:23 -0000 1.40 +++ .cvsignore 1 Mar 2008 21:20:41 -0000 1.41 @@ -1,3 +1,3 @@ testfile16.symtab.bz2 testfile16.symtab.debug.bz2 -elfutils-0.132.tar.gz +elfutils-0.133.tar.gz elfutils-portability.patch: Index: elfutils-portability.patch =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-portability.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- elfutils-portability.patch 22 Jan 2008 02:08:24 -0000 1.34 +++ elfutils-portability.patch 1 Mar 2008 21:20:41 -0000 1.35 @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -258,6 +258,11 @@ +@@ -281,6 +281,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -12,7 +12,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -280,6 +285,9 @@ +@@ -303,6 +308,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -297,7 +297,7 @@ AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR") --- elfutils/lib/ChangeLog +++ elfutils/lib/ChangeLog -@@ -16,6 +16,11 @@ +@@ -30,6 +30,11 @@ * Makefile.am (libeu_a_SOURCES): Add it. * system.h: Declare crc32_file. @@ -328,7 +328,7 @@ noinst_LIBRARIES = libeu.a --- elfutils/lib/Makefile.in +++ elfutils/lib/Makefile.in -@@ -92,6 +92,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -93,6 +93,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -336,7 +336,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -121,6 +122,7 @@ SHELL = @SHELL@ +@@ -122,6 +123,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -344,7 +344,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -176,9 +178,9 @@ target_alias = @target_alias@ +@@ -177,9 +179,9 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @@ -419,7 +419,7 @@ -I$(top_srcdir)/lib --- elfutils/libcpu/ChangeLog +++ elfutils/libcpu/ChangeLog -@@ -262,6 +262,11 @@ +@@ -265,6 +265,11 @@ * defs/i386.doc: New file. * defs/x86_64: New file. @@ -477,7 +477,7 @@ INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \ --- elfutils/libdw/ChangeLog +++ elfutils/libdw/ChangeLog -@@ -482,6 +482,11 @@ +@@ -490,6 +490,11 @@ 2005-05-31 Roland McGrath @@ -541,7 +541,17 @@ $(COMPILE))) --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -744,6 +744,11 @@ +@@ -1,3 +1,9 @@ ++2008-03-01 Roland McGrath ++ ++ * libdwflP.h (__libdwfl_seterrno): Remove parameter name from ++ prototype to avoid older compiler's complaint about reuse of the name. ++ (__libdwfl_canon_error): Likewise. ++ + 2008-02-19 Roland McGrath + + * relocate.c (relocate_section): Check for an unhandled relocation +@@ -760,6 +766,11 @@ 2005-07-21 Roland McGrath @@ -553,6 +563,26 @@ * Makefile.am (noinst_HEADERS): Add loc2c.c. * test2.c (main): Check sscanf result to quiet warning. +--- elfutils/libdwfl/libdwflP.h ++++ elfutils/libdwfl/libdwflP.h +@@ -1,5 +1,5 @@ + /* Internal definitions for libdwfl. +- Copyright (C) 2005, 2006, 2007 Red Hat, Inc. ++ Copyright (C) 2005, 2006, 2007, 2008 Red Hat, Inc. + This file is part of Red Hat elfutils. + + Red Hat elfutils is free software; you can redistribute it and/or modify +@@ -99,8 +99,8 @@ typedef enum { DWFL_ERRORS DWFL_E_NUM } + #define OTHER_ERROR(name) ((unsigned int) DWFL_E_##name << 16) + #define DWFL_E(name, errno) (OTHER_ERROR (name) | (errno)) + +-extern int __libdwfl_canon_error (Dwfl_Error error) internal_function; +-extern void __libdwfl_seterrno (Dwfl_Error error) internal_function; ++extern int __libdwfl_canon_error (Dwfl_Error) internal_function; ++extern void __libdwfl_seterrno (Dwfl_Error) internal_function; + + struct Dwfl + { --- elfutils/libdwfl/Makefile.am +++ elfutils/libdwfl/Makefile.am @@ -27,12 +27,13 @@ @@ -602,7 +632,7 @@ --- elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog -@@ -505,6 +505,11 @@ +@@ -527,6 +527,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. @@ -633,7 +663,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ --- elfutils/libebl/Makefile.in +++ elfutils/libebl/Makefile.in -@@ -121,6 +121,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -122,6 +122,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -641,7 +671,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -150,6 +151,7 @@ SHELL = @SHELL@ +@@ -151,6 +152,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -649,7 +679,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -205,9 +207,9 @@ target_alias = @target_alias@ +@@ -206,9 +208,9 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @@ -663,7 +693,7 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -333,6 +333,11 @@ +@@ -355,6 +355,11 @@ If section content hasn't been read yet, do it before looking for the block size. If no section data present, infer size of section header. @@ -795,7 +825,16 @@ YACC = @YACC@ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -126,6 +126,8 @@ +@@ -1,3 +1,8 @@ ++2008-03-01 Roland McGrath ++ ++ * readelf.c (dump_archive_index): Tweak portability hack ++ to match [__GNUC__ < 4] too. ++ + 2008-02-29 Roland McGrath + + * readelf.c (print_attributes): Add a cast. +@@ -249,6 +254,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -804,7 +843,7 @@ 2007-10-15 Roland McGrath * make-debug-archive.in: New file. -@@ -565,6 +567,10 @@ +@@ -688,6 +695,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . @@ -815,7 +854,7 @@ 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -641,6 +647,10 @@ +@@ -764,6 +775,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -826,7 +865,7 @@ 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -989,6 +999,11 @@ +@@ -1112,6 +1127,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -926,6 +965,17 @@ readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl size_LDADD = $(libelf) $(libeu) $(libmudflap) +--- elfutils/src/readelf.c ++++ elfutils/src/readelf.c +@@ -6340,7 +6340,7 @@ dump_archive_index (Elf *elf, const char + if (unlikely (elf_rand (elf, as_off) == 0) + || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf)) + == NULL)) +-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) ++#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4 + while (1) + #endif + error (EXIT_FAILURE, 0, --- elfutils/src/strings.c +++ elfutils/src/strings.c @@ -51,6 +51,10 @@ @@ -1007,7 +1057,16 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -703,6 +703,11 @@ +@@ -21,6 +21,8 @@ + + 2008-01-21 Roland McGrath + ++ * line2addr.c (main): Revert last change. ++ + * testfile45.S.bz2: Add tests for cltq, cqto. + * testfile45.expect.bz2: Adjust. + +@@ -729,6 +731,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -1019,6 +1078,17 @@ 2005-05-24 Ulrich Drepper * get-files.c (main): Use correct format specifier. +--- elfutils/tests/line2addr.c ++++ elfutils/tests/line2addr.c +@@ -132,7 +132,7 @@ main (int argc, char *argv[]) + { + struct args a = { .arg = argv[cnt] }; + +- switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line)) ++ switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line)) + { + default: + case 0: --- elfutils/tests/Makefile.am +++ elfutils/tests/Makefile.am @@ -25,12 +25,13 @@ @@ -1039,7 +1109,7 @@ endif --- elfutils/tests/Makefile.in +++ elfutils/tests/Makefile.in -@@ -325,6 +325,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -330,6 +330,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1047,7 +1117,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -354,6 +355,7 @@ SHELL = @SHELL@ +@@ -359,6 +360,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1055,7 +1125,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -408,10 +410,10 @@ sysconfdir = @sysconfdir@ +@@ -413,10 +415,10 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ Index: elfutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- elfutils.spec 21 Feb 2008 02:34:38 -0000 1.100 +++ elfutils.spec 1 Mar 2008 21:20:41 -0000 1.101 @@ -1,5 +1,5 @@ -%define eu_version 0.132 -%define eu_release 4 +%define eu_version 0.133 +%define eu_release 1 %if %{?_with_compat:1}%{!?_with_compat:0} %define compat 1 @@ -192,7 +192,6 @@ # XXX Nuke unpackaged files { cd ${RPM_BUILD_ROOT} rm -f .%{_bindir}/eu-ld - rm -f .%{_bindir}/eu-objdump rm -f .%{_includedir}/elfutils/libasm.h rm -f .%{_libdir}/libasm-%{version}.so rm -f .%{_libdir}/libasm.so* @@ -222,7 +221,7 @@ %{_bindir}/eu-elflint %{_bindir}/eu-findtextrel %{_bindir}/eu-nm -#%{_bindir}/eu-objdump +%{_bindir}/eu-objdump %{_bindir}/eu-ranlib %{_bindir}/eu-readelf %{_bindir}/eu-size @@ -274,8 +273,9 @@ %{_libdir}/libelf.a %changelog -* Wed Feb 20 2008 Jesse Keating - 0.132-4 -- Rebuild for GCC 4.3 +* Fri Feb 29 2008 Roland McGrath - 0.133-1 +- Update to 0.133 +- Install eu-objdump, now has limited disassembler support. * Mon Jan 21 2008 Roland McGrath - 0.132-3 - Update to 0.132 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 22 Jan 2008 02:08:24 -0000 1.44 +++ sources 1 Mar 2008 21:20:41 -0000 1.45 @@ -1,3 +1,3 @@ 07a924423a05b1bf6d0f9fe8b35dbe6b testfile16.symtab.bz2 bd40d1aaca8eaf1c7aea54bf4b29bda2 testfile16.symtab.debug.bz2 -73603ebe9bff4e5c7295c6e683436940 elfutils-0.132.tar.gz +f6c69d0dec7431f4d933bf2ba33a9aff elfutils-0.133.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 21:22:42 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 1 Mar 2008 21:22:42 GMT Subject: rpms/elfutils/F-7 .cvsignore, 1.40, 1.41 elfutils-portability.patch, 1.34, 1.35 elfutils.spec, 1.92, 1.93 sources, 1.44, 1.45 Message-ID: <200803012122.m21LMgS4003513@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/elfutils/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3443/F-7 Modified Files: .cvsignore elfutils-portability.patch elfutils.spec sources Log Message: New upstream version 0.133 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-7/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 22 Jan 2008 01:09:14 -0000 1.40 +++ .cvsignore 1 Mar 2008 21:22:04 -0000 1.41 @@ -1,3 +1,3 @@ testfile16.symtab.bz2 testfile16.symtab.debug.bz2 -elfutils-0.132.tar.gz +elfutils-0.133.tar.gz elfutils-portability.patch: Index: elfutils-portability.patch =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-7/elfutils-portability.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- elfutils-portability.patch 22 Jan 2008 02:08:05 -0000 1.34 +++ elfutils-portability.patch 1 Mar 2008 21:22:04 -0000 1.35 @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -258,6 +258,11 @@ +@@ -281,6 +281,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -12,7 +12,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -280,6 +285,9 @@ +@@ -303,6 +308,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -297,7 +297,7 @@ AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR") --- elfutils/lib/ChangeLog +++ elfutils/lib/ChangeLog -@@ -16,6 +16,11 @@ +@@ -30,6 +30,11 @@ * Makefile.am (libeu_a_SOURCES): Add it. * system.h: Declare crc32_file. @@ -328,7 +328,7 @@ noinst_LIBRARIES = libeu.a --- elfutils/lib/Makefile.in +++ elfutils/lib/Makefile.in -@@ -92,6 +92,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -93,6 +93,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -336,7 +336,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -121,6 +122,7 @@ SHELL = @SHELL@ +@@ -122,6 +123,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -344,7 +344,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -176,9 +178,9 @@ target_alias = @target_alias@ +@@ -177,9 +179,9 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @@ -419,7 +419,7 @@ -I$(top_srcdir)/lib --- elfutils/libcpu/ChangeLog +++ elfutils/libcpu/ChangeLog -@@ -262,6 +262,11 @@ +@@ -265,6 +265,11 @@ * defs/i386.doc: New file. * defs/x86_64: New file. @@ -477,7 +477,7 @@ INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \ --- elfutils/libdw/ChangeLog +++ elfutils/libdw/ChangeLog -@@ -482,6 +482,11 @@ +@@ -490,6 +490,11 @@ 2005-05-31 Roland McGrath @@ -541,7 +541,17 @@ $(COMPILE))) --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -744,6 +744,11 @@ +@@ -1,3 +1,9 @@ ++2008-03-01 Roland McGrath ++ ++ * libdwflP.h (__libdwfl_seterrno): Remove parameter name from ++ prototype to avoid older compiler's complaint about reuse of the name. ++ (__libdwfl_canon_error): Likewise. ++ + 2008-02-19 Roland McGrath + + * relocate.c (relocate_section): Check for an unhandled relocation +@@ -760,6 +766,11 @@ 2005-07-21 Roland McGrath @@ -553,6 +563,26 @@ * Makefile.am (noinst_HEADERS): Add loc2c.c. * test2.c (main): Check sscanf result to quiet warning. +--- elfutils/libdwfl/libdwflP.h ++++ elfutils/libdwfl/libdwflP.h +@@ -1,5 +1,5 @@ + /* Internal definitions for libdwfl. +- Copyright (C) 2005, 2006, 2007 Red Hat, Inc. ++ Copyright (C) 2005, 2006, 2007, 2008 Red Hat, Inc. + This file is part of Red Hat elfutils. + + Red Hat elfutils is free software; you can redistribute it and/or modify +@@ -99,8 +99,8 @@ typedef enum { DWFL_ERRORS DWFL_E_NUM } + #define OTHER_ERROR(name) ((unsigned int) DWFL_E_##name << 16) + #define DWFL_E(name, errno) (OTHER_ERROR (name) | (errno)) + +-extern int __libdwfl_canon_error (Dwfl_Error error) internal_function; +-extern void __libdwfl_seterrno (Dwfl_Error error) internal_function; ++extern int __libdwfl_canon_error (Dwfl_Error) internal_function; ++extern void __libdwfl_seterrno (Dwfl_Error) internal_function; + + struct Dwfl + { --- elfutils/libdwfl/Makefile.am +++ elfutils/libdwfl/Makefile.am @@ -27,12 +27,13 @@ @@ -602,7 +632,7 @@ --- elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog -@@ -505,6 +505,11 @@ +@@ -527,6 +527,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. @@ -633,7 +663,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ --- elfutils/libebl/Makefile.in +++ elfutils/libebl/Makefile.in -@@ -121,6 +121,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -122,6 +122,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -641,7 +671,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -150,6 +151,7 @@ SHELL = @SHELL@ +@@ -151,6 +152,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -649,7 +679,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -205,9 +207,9 @@ target_alias = @target_alias@ +@@ -206,9 +208,9 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @@ -663,7 +693,7 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -333,6 +333,11 @@ +@@ -355,6 +355,11 @@ If section content hasn't been read yet, do it before looking for the block size. If no section data present, infer size of section header. @@ -795,7 +825,16 @@ YACC = @YACC@ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -126,6 +126,8 @@ +@@ -1,3 +1,8 @@ ++2008-03-01 Roland McGrath ++ ++ * readelf.c (dump_archive_index): Tweak portability hack ++ to match [__GNUC__ < 4] too. ++ + 2008-02-29 Roland McGrath + + * readelf.c (print_attributes): Add a cast. +@@ -249,6 +254,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -804,7 +843,7 @@ 2007-10-15 Roland McGrath * make-debug-archive.in: New file. -@@ -565,6 +567,10 @@ +@@ -688,6 +695,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . @@ -815,7 +854,7 @@ 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -641,6 +647,10 @@ +@@ -764,6 +775,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -826,7 +865,7 @@ 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -989,6 +999,11 @@ +@@ -1112,6 +1127,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -926,6 +965,17 @@ readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl size_LDADD = $(libelf) $(libeu) $(libmudflap) +--- elfutils/src/readelf.c ++++ elfutils/src/readelf.c +@@ -6340,7 +6340,7 @@ dump_archive_index (Elf *elf, const char + if (unlikely (elf_rand (elf, as_off) == 0) + || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf)) + == NULL)) +-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) ++#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4 + while (1) + #endif + error (EXIT_FAILURE, 0, --- elfutils/src/strings.c +++ elfutils/src/strings.c @@ -51,6 +51,10 @@ @@ -1007,7 +1057,16 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -703,6 +703,11 @@ +@@ -21,6 +21,8 @@ + + 2008-01-21 Roland McGrath + ++ * line2addr.c (main): Revert last change. ++ + * testfile45.S.bz2: Add tests for cltq, cqto. + * testfile45.expect.bz2: Adjust. + +@@ -729,6 +731,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -1019,6 +1078,17 @@ 2005-05-24 Ulrich Drepper * get-files.c (main): Use correct format specifier. +--- elfutils/tests/line2addr.c ++++ elfutils/tests/line2addr.c +@@ -132,7 +132,7 @@ main (int argc, char *argv[]) + { + struct args a = { .arg = argv[cnt] }; + +- switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line)) ++ switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line)) + { + default: + case 0: --- elfutils/tests/Makefile.am +++ elfutils/tests/Makefile.am @@ -25,12 +25,13 @@ @@ -1039,7 +1109,7 @@ endif --- elfutils/tests/Makefile.in +++ elfutils/tests/Makefile.in -@@ -325,6 +325,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -330,6 +330,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1047,7 +1117,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -354,6 +355,7 @@ SHELL = @SHELL@ +@@ -359,6 +360,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1055,7 +1125,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -408,10 +410,10 @@ sysconfdir = @sysconfdir@ +@@ -413,10 +415,10 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ Index: elfutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-7/elfutils.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- elfutils.spec 22 Jan 2008 02:38:13 -0000 1.92 +++ elfutils.spec 1 Mar 2008 21:22:04 -0000 1.93 @@ -1,5 +1,5 @@ -%define eu_version 0.132 -%define eu_release 3 +%define eu_version 0.133 +%define eu_release 1 %if %{?_with_compat:1}%{!?_with_compat:0} %define compat 1 @@ -31,10 +31,11 @@ %endif License: GPLv2 with exceptions Group: Development/Tools +URL: https://fedorahosted.org/elfutils/ +# The Fedora development src.rpm is the canonical place this is published. Source: elfutils-%{version}.tar.gz Patch1: elfutils-portability.patch Patch2: elfutils-robustify.patch -Obsoletes: libelf libelf-devel Requires: elfutils-libelf-%{_arch} = %{version}-%{release} Requires: elfutils-libs-%{_arch} = %{version}-%{release} @@ -67,9 +68,8 @@ %package libs -Summary: Libraries to handle compiled objects. +Summary: Libraries to handle compiled objects Group: Development/Tools -License: GPL Provides: elfutils-libs-%{_arch} = %{version}-%{release} Requires: elfutils-libelf-%{_arch} = %{version}-%{release} @@ -80,9 +80,8 @@ other programs using these libraries. %package devel -Summary: Development libraries to handle compiled objects. +Summary: Development libraries to handle compiled objects Group: Development/Tools -License: GPL Provides: elfutils-devel-%{_arch} = %{version}-%{release} Requires: elfutils-libs-%{_arch} = %{version}-%{release} Requires: elfutils-libelf-devel-%{_arch} = %{version}-%{release} @@ -98,7 +97,7 @@ assembler interface. %package devel-static -Summary: Static archives to handle compiled objects. +Summary: Static archives to handle compiled objects Group: Development/Tools Provides: elfutils-devel-static-%{_arch} = %{version}-%{release} Requires: elfutils-devel-%{_arch} = %{version}-%{release} @@ -109,9 +108,10 @@ with the code to handle compiled objects. %package libelf -Summary: Library to read and write ELF files. +Summary: Library to read and write ELF files Group: Development/Tools Provides: elfutils-libelf-%{_arch} = %{version}-%{release} +Obsoletes: libelf <= 0.8.2-2 %description libelf The elfutils-libelf package provides a DSO which allows reading and @@ -128,6 +128,8 @@ %if !0%{?separate_devel_static} Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} %endif +Obsoletes: libelf-devel <= 0.8.2-2 +Provides: libelf-devel %description libelf-devel The elfutils-libelf-devel package contains the libraries to create @@ -190,7 +192,6 @@ # XXX Nuke unpackaged files { cd ${RPM_BUILD_ROOT} rm -f .%{_bindir}/eu-ld - rm -f .%{_bindir}/eu-objdump rm -f .%{_includedir}/elfutils/libasm.h rm -f .%{_libdir}/libasm-%{version}.so rm -f .%{_libdir}/libasm.so* @@ -220,7 +221,7 @@ %{_bindir}/eu-elflint %{_bindir}/eu-findtextrel %{_bindir}/eu-nm -#%{_bindir}/eu-objdump +%{_bindir}/eu-objdump %{_bindir}/eu-ranlib %{_bindir}/eu-readelf %{_bindir}/eu-size @@ -272,6 +273,10 @@ %{_libdir}/libelf.a %changelog +* Fri Feb 29 2008 Roland McGrath - 0.133-1 +- Update to 0.133 +- Install eu-objdump, now has limited disassembler support. + * Mon Jan 21 2008 Roland McGrath - 0.132-3 - Update to 0.132 - libelf: Use loff_t instead of off64_t in libelf.h header. (#377241) @@ -284,9 +289,9 @@ * Sun Nov 11 2007 Roland McGrath - 0.131-1 - Update to 0.131 - libdw: DW_FORM_ref_addr support; dwarf_formref entry point now deprecated; - bug fixes for oddly-formatted DWARF + bug fixes for oddly-formatted DWARF - libdwfl: bug fixes in offline archive support, symbol table handling; - apply partial relocations for dwfl_module_address_section on ET_REL + apply partial relocations for dwfl_module_address_section on ET_REL - libebl: powerpc backend support for Altivec registers * Wed Oct 17 2007 Roland McGrath - 0.130-3 @@ -303,7 +308,7 @@ - eu-elflint: stricter checks on debug sections - eu-unstrip: new options, --list (or -n), --relocate (or -R) - libelf: new function elf_getdata_rawchunk, replaces gelf_rawchunk; - new functions gelf_getnote, gelf_getauxv, gelf_update_auxv + new functions gelf_getnote, gelf_getauxv, gelf_update_auxv - libebl: backend improvements (#324031) - libdwfl: build_id support, new functions for it - libdwfl: dwfl_module_addrsym fixes (#268761, #268981) @@ -329,7 +334,7 @@ - Update to 0.127 - libdw: new function dwarf_getsrcdirs - libdwfl: new functions dwfl_module_addrsym, dwfl_report_begin_add, - dwfl_module_address_section + dwfl_module_address_section * Mon Feb 5 2007 Roland McGrath - 0.126-1 - Update to 0.126 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-7/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 22 Jan 2008 02:08:05 -0000 1.44 +++ sources 1 Mar 2008 21:22:04 -0000 1.45 @@ -1,3 +1,3 @@ 07a924423a05b1bf6d0f9fe8b35dbe6b testfile16.symtab.bz2 bd40d1aaca8eaf1c7aea54bf4b29bda2 testfile16.symtab.debug.bz2 -73603ebe9bff4e5c7295c6e683436940 elfutils-0.132.tar.gz +f6c69d0dec7431f4d933bf2ba33a9aff elfutils-0.133.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 21:22:49 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 1 Mar 2008 21:22:49 GMT Subject: rpms/elfutils/F-8 .cvsignore, 1.40, 1.41 elfutils-portability.patch, 1.34, 1.35 elfutils.spec, 1.95, 1.96 sources, 1.44, 1.45 Message-ID: <200803012122.m21LMn9s003522@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/elfutils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3443/F-8 Modified Files: .cvsignore elfutils-portability.patch elfutils.spec sources Log Message: New upstream version 0.133 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-8/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 22 Jan 2008 01:09:19 -0000 1.40 +++ .cvsignore 1 Mar 2008 21:22:11 -0000 1.41 @@ -1,3 +1,3 @@ testfile16.symtab.bz2 testfile16.symtab.debug.bz2 -elfutils-0.132.tar.gz +elfutils-0.133.tar.gz elfutils-portability.patch: Index: elfutils-portability.patch =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-8/elfutils-portability.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- elfutils-portability.patch 22 Jan 2008 02:08:13 -0000 1.34 +++ elfutils-portability.patch 1 Mar 2008 21:22:11 -0000 1.35 @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -258,6 +258,11 @@ +@@ -281,6 +281,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -12,7 +12,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -280,6 +285,9 @@ +@@ -303,6 +308,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -297,7 +297,7 @@ AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR") --- elfutils/lib/ChangeLog +++ elfutils/lib/ChangeLog -@@ -16,6 +16,11 @@ +@@ -30,6 +30,11 @@ * Makefile.am (libeu_a_SOURCES): Add it. * system.h: Declare crc32_file. @@ -328,7 +328,7 @@ noinst_LIBRARIES = libeu.a --- elfutils/lib/Makefile.in +++ elfutils/lib/Makefile.in -@@ -92,6 +92,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -93,6 +93,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -336,7 +336,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -121,6 +122,7 @@ SHELL = @SHELL@ +@@ -122,6 +123,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -344,7 +344,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -176,9 +178,9 @@ target_alias = @target_alias@ +@@ -177,9 +179,9 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @@ -419,7 +419,7 @@ -I$(top_srcdir)/lib --- elfutils/libcpu/ChangeLog +++ elfutils/libcpu/ChangeLog -@@ -262,6 +262,11 @@ +@@ -265,6 +265,11 @@ * defs/i386.doc: New file. * defs/x86_64: New file. @@ -477,7 +477,7 @@ INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \ --- elfutils/libdw/ChangeLog +++ elfutils/libdw/ChangeLog -@@ -482,6 +482,11 @@ +@@ -490,6 +490,11 @@ 2005-05-31 Roland McGrath @@ -541,7 +541,17 @@ $(COMPILE))) --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -744,6 +744,11 @@ +@@ -1,3 +1,9 @@ ++2008-03-01 Roland McGrath ++ ++ * libdwflP.h (__libdwfl_seterrno): Remove parameter name from ++ prototype to avoid older compiler's complaint about reuse of the name. ++ (__libdwfl_canon_error): Likewise. ++ + 2008-02-19 Roland McGrath + + * relocate.c (relocate_section): Check for an unhandled relocation +@@ -760,6 +766,11 @@ 2005-07-21 Roland McGrath @@ -553,6 +563,26 @@ * Makefile.am (noinst_HEADERS): Add loc2c.c. * test2.c (main): Check sscanf result to quiet warning. +--- elfutils/libdwfl/libdwflP.h ++++ elfutils/libdwfl/libdwflP.h +@@ -1,5 +1,5 @@ + /* Internal definitions for libdwfl. +- Copyright (C) 2005, 2006, 2007 Red Hat, Inc. ++ Copyright (C) 2005, 2006, 2007, 2008 Red Hat, Inc. + This file is part of Red Hat elfutils. + + Red Hat elfutils is free software; you can redistribute it and/or modify +@@ -99,8 +99,8 @@ typedef enum { DWFL_ERRORS DWFL_E_NUM } + #define OTHER_ERROR(name) ((unsigned int) DWFL_E_##name << 16) + #define DWFL_E(name, errno) (OTHER_ERROR (name) | (errno)) + +-extern int __libdwfl_canon_error (Dwfl_Error error) internal_function; +-extern void __libdwfl_seterrno (Dwfl_Error error) internal_function; ++extern int __libdwfl_canon_error (Dwfl_Error) internal_function; ++extern void __libdwfl_seterrno (Dwfl_Error) internal_function; + + struct Dwfl + { --- elfutils/libdwfl/Makefile.am +++ elfutils/libdwfl/Makefile.am @@ -27,12 +27,13 @@ @@ -602,7 +632,7 @@ --- elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog -@@ -505,6 +505,11 @@ +@@ -527,6 +527,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. @@ -633,7 +663,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ --- elfutils/libebl/Makefile.in +++ elfutils/libebl/Makefile.in -@@ -121,6 +121,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -122,6 +122,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -641,7 +671,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -150,6 +151,7 @@ SHELL = @SHELL@ +@@ -151,6 +152,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -649,7 +679,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -205,9 +207,9 @@ target_alias = @target_alias@ +@@ -206,9 +208,9 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @@ -663,7 +693,7 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -333,6 +333,11 @@ +@@ -355,6 +355,11 @@ If section content hasn't been read yet, do it before looking for the block size. If no section data present, infer size of section header. @@ -795,7 +825,16 @@ YACC = @YACC@ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -126,6 +126,8 @@ +@@ -1,3 +1,8 @@ ++2008-03-01 Roland McGrath ++ ++ * readelf.c (dump_archive_index): Tweak portability hack ++ to match [__GNUC__ < 4] too. ++ + 2008-02-29 Roland McGrath + + * readelf.c (print_attributes): Add a cast. +@@ -249,6 +254,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -804,7 +843,7 @@ 2007-10-15 Roland McGrath * make-debug-archive.in: New file. -@@ -565,6 +567,10 @@ +@@ -688,6 +695,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . @@ -815,7 +854,7 @@ 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -641,6 +647,10 @@ +@@ -764,6 +775,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -826,7 +865,7 @@ 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -989,6 +999,11 @@ +@@ -1112,6 +1127,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -926,6 +965,17 @@ readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl size_LDADD = $(libelf) $(libeu) $(libmudflap) +--- elfutils/src/readelf.c ++++ elfutils/src/readelf.c +@@ -6340,7 +6340,7 @@ dump_archive_index (Elf *elf, const char + if (unlikely (elf_rand (elf, as_off) == 0) + || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf)) + == NULL)) +-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) ++#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4 + while (1) + #endif + error (EXIT_FAILURE, 0, --- elfutils/src/strings.c +++ elfutils/src/strings.c @@ -51,6 +51,10 @@ @@ -1007,7 +1057,16 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -703,6 +703,11 @@ +@@ -21,6 +21,8 @@ + + 2008-01-21 Roland McGrath + ++ * line2addr.c (main): Revert last change. ++ + * testfile45.S.bz2: Add tests for cltq, cqto. + * testfile45.expect.bz2: Adjust. + +@@ -729,6 +731,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -1019,6 +1078,17 @@ 2005-05-24 Ulrich Drepper * get-files.c (main): Use correct format specifier. +--- elfutils/tests/line2addr.c ++++ elfutils/tests/line2addr.c +@@ -132,7 +132,7 @@ main (int argc, char *argv[]) + { + struct args a = { .arg = argv[cnt] }; + +- switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line)) ++ switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line)) + { + default: + case 0: --- elfutils/tests/Makefile.am +++ elfutils/tests/Makefile.am @@ -25,12 +25,13 @@ @@ -1039,7 +1109,7 @@ endif --- elfutils/tests/Makefile.in +++ elfutils/tests/Makefile.in -@@ -325,6 +325,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -330,6 +330,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1047,7 +1117,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -354,6 +355,7 @@ SHELL = @SHELL@ +@@ -359,6 +360,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1055,7 +1125,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -408,10 +410,10 @@ sysconfdir = @sysconfdir@ +@@ -413,10 +415,10 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ Index: elfutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-8/elfutils.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- elfutils.spec 22 Jan 2008 02:38:21 -0000 1.95 +++ elfutils.spec 1 Mar 2008 21:22:11 -0000 1.96 @@ -1,5 +1,5 @@ -%define eu_version 0.132 -%define eu_release 3 +%define eu_version 0.133 +%define eu_release 1 %if %{?_with_compat:1}%{!?_with_compat:0} %define compat 1 @@ -31,10 +31,11 @@ %endif License: GPLv2 with exceptions Group: Development/Tools +URL: https://fedorahosted.org/elfutils/ +# The Fedora development src.rpm is the canonical place this is published. Source: elfutils-%{version}.tar.gz Patch1: elfutils-portability.patch Patch2: elfutils-robustify.patch -Obsoletes: libelf libelf-devel Requires: elfutils-libelf-%{_arch} = %{version}-%{release} Requires: elfutils-libs-%{_arch} = %{version}-%{release} @@ -67,9 +68,8 @@ %package libs -Summary: Libraries to handle compiled objects. +Summary: Libraries to handle compiled objects Group: Development/Tools -License: GPL Provides: elfutils-libs-%{_arch} = %{version}-%{release} Requires: elfutils-libelf-%{_arch} = %{version}-%{release} @@ -80,9 +80,8 @@ other programs using these libraries. %package devel -Summary: Development libraries to handle compiled objects. +Summary: Development libraries to handle compiled objects Group: Development/Tools -License: GPL Provides: elfutils-devel-%{_arch} = %{version}-%{release} Requires: elfutils-libs-%{_arch} = %{version}-%{release} Requires: elfutils-libelf-devel-%{_arch} = %{version}-%{release} @@ -98,7 +97,7 @@ assembler interface. %package devel-static -Summary: Static archives to handle compiled objects. +Summary: Static archives to handle compiled objects Group: Development/Tools Provides: elfutils-devel-static-%{_arch} = %{version}-%{release} Requires: elfutils-devel-%{_arch} = %{version}-%{release} @@ -109,9 +108,10 @@ with the code to handle compiled objects. %package libelf -Summary: Library to read and write ELF files. +Summary: Library to read and write ELF files Group: Development/Tools Provides: elfutils-libelf-%{_arch} = %{version}-%{release} +Obsoletes: libelf <= 0.8.2-2 %description libelf The elfutils-libelf package provides a DSO which allows reading and @@ -128,6 +128,8 @@ %if !0%{?separate_devel_static} Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} %endif +Obsoletes: libelf-devel <= 0.8.2-2 +Provides: libelf-devel %description libelf-devel The elfutils-libelf-devel package contains the libraries to create @@ -190,7 +192,6 @@ # XXX Nuke unpackaged files { cd ${RPM_BUILD_ROOT} rm -f .%{_bindir}/eu-ld - rm -f .%{_bindir}/eu-objdump rm -f .%{_includedir}/elfutils/libasm.h rm -f .%{_libdir}/libasm-%{version}.so rm -f .%{_libdir}/libasm.so* @@ -220,7 +221,7 @@ %{_bindir}/eu-elflint %{_bindir}/eu-findtextrel %{_bindir}/eu-nm -#%{_bindir}/eu-objdump +%{_bindir}/eu-objdump %{_bindir}/eu-ranlib %{_bindir}/eu-readelf %{_bindir}/eu-size @@ -272,6 +273,10 @@ %{_libdir}/libelf.a %changelog +* Fri Feb 29 2008 Roland McGrath - 0.133-1 +- Update to 0.133 +- Install eu-objdump, now has limited disassembler support. + * Mon Jan 21 2008 Roland McGrath - 0.132-3 - Update to 0.132 - libelf: Use loff_t instead of off64_t in libelf.h header. (#377241) @@ -284,9 +289,9 @@ * Sun Nov 11 2007 Roland McGrath - 0.131-1 - Update to 0.131 - libdw: DW_FORM_ref_addr support; dwarf_formref entry point now deprecated; - bug fixes for oddly-formatted DWARF + bug fixes for oddly-formatted DWARF - libdwfl: bug fixes in offline archive support, symbol table handling; - apply partial relocations for dwfl_module_address_section on ET_REL + apply partial relocations for dwfl_module_address_section on ET_REL - libebl: powerpc backend support for Altivec registers * Wed Oct 17 2007 Roland McGrath - 0.130-3 @@ -303,7 +308,7 @@ - eu-elflint: stricter checks on debug sections - eu-unstrip: new options, --list (or -n), --relocate (or -R) - libelf: new function elf_getdata_rawchunk, replaces gelf_rawchunk; - new functions gelf_getnote, gelf_getauxv, gelf_update_auxv + new functions gelf_getnote, gelf_getauxv, gelf_update_auxv - libebl: backend improvements (#324031) - libdwfl: build_id support, new functions for it - libdwfl: dwfl_module_addrsym fixes (#268761, #268981) @@ -329,7 +334,7 @@ - Update to 0.127 - libdw: new function dwarf_getsrcdirs - libdwfl: new functions dwfl_module_addrsym, dwfl_report_begin_add, - dwfl_module_address_section + dwfl_module_address_section * Mon Feb 5 2007 Roland McGrath - 0.126-1 - Update to 0.126 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-8/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 22 Jan 2008 02:08:13 -0000 1.44 +++ sources 1 Mar 2008 21:22:11 -0000 1.45 @@ -1,3 +1,3 @@ 07a924423a05b1bf6d0f9fe8b35dbe6b testfile16.symtab.bz2 bd40d1aaca8eaf1c7aea54bf4b29bda2 testfile16.symtab.debug.bz2 -73603ebe9bff4e5c7295c6e683436940 elfutils-0.132.tar.gz +f6c69d0dec7431f4d933bf2ba33a9aff elfutils-0.133.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 21:23:48 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 1 Mar 2008 21:23:48 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.89,1.90 Message-ID: <200803012123.m21LNmLN003561@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3536/devel Modified Files: kdebindings.spec Log Message: * Sat Mar 01 2008 Kevin Kofler 4.0.2-4 - reenable qwt (should be fixed since 4.0.0) Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- kdebindings.spec 1 Mar 2008 20:47:28 -0000 1.89 +++ kdebindings.spec 1 Mar 2008 21:23:11 -0000 1.90 @@ -7,7 +7,7 @@ Name: kdebindings Version: 4.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -31,8 +31,7 @@ BuildRequires: ruby BuildRequires: giflib-devel BuildRequires: pcre-devel -# causes smokeqt to fail to build -#BuildRequires: qwt-devel +BuildRequires: qwt-devel BuildRequires: PyQt4-devel %if 0%{?fedora} > 8 BuildRequires: qscintilla-devel >= 2 @@ -119,6 +118,9 @@ %changelog +* Sat Mar 01 2008 Kevin Kofler 4.0.2-4 +- reenable qwt (should be fixed since 4.0.0) + * Sat Mar 01 2008 Kevin Kofler 4.0.2-3 - apply upstream build fixes for Qt 4.3.4 (rev 780996) - remove no longer existing protected KService::accessServiceTypes from PyKDE4 From fedora-extras-commits at redhat.com Sat Mar 1 21:37:26 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Sat, 1 Mar 2008 21:37:26 GMT Subject: rpms/bmpx/devel bmpx-gcc43.patch,NONE,1.1 bmpx.spec,1.6,1.7 Message-ID: <200803012137.m21LbQrF003883@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/bmpx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3856 Modified Files: bmpx.spec Added Files: bmpx-gcc43.patch Log Message: * fixed building for gcc 4.3 bmpx-gcc43.patch: --- NEW FILE bmpx-gcc43.patch --- diff -up bmpx-0.40.13/src/xds.cc.gcc43 bmpx-0.40.13/src/xds.cc --- bmpx-0.40.13/src/xds.cc.gcc43 2007-10-18 19:17:08.000000000 +0200 +++ bmpx-0.40.13/src/xds.cc 2008-03-01 22:18:55.000000000 +0100 @@ -22,6 +22,7 @@ // permission is above and beyond the permissions granted by the GPL license // BMPx is covered by. +#include #include #include "xds.hh" #define MAX_URI_LEN 4096 diff -up bmpx-0.40.13/src/podcast.cc.gcc43 bmpx-0.40.13/src/podcast.cc --- bmpx-0.40.13/src/podcast.cc.gcc43 2007-10-18 19:17:08.000000000 +0200 +++ bmpx-0.40.13/src/podcast.cc 2008-03-01 22:18:55.000000000 +0100 @@ -41,6 +41,7 @@ #include #include #include +#include #include "paths.hh" #include "util.hh" diff -up bmpx-0.40.13/src/parser/libxml2-sax-base.cc.gcc43 bmpx-0.40.13/src/parser/libxml2-sax-base.cc --- bmpx-0.40.13/src/parser/libxml2-sax-base.cc.gcc43 2007-10-18 19:17:06.000000000 +0200 +++ bmpx-0.40.13/src/parser/libxml2-sax-base.cc 2008-03-01 22:18:55.000000000 +0100 @@ -26,6 +26,7 @@ # include #endif //HAVE_CONFIG_H +#include #include #include diff -up bmpx-0.40.13/src/streams-shoutcast.cc.gcc43 bmpx-0.40.13/src/streams-shoutcast.cc --- bmpx-0.40.13/src/streams-shoutcast.cc.gcc43 2007-10-18 19:17:08.000000000 +0200 +++ bmpx-0.40.13/src/streams-shoutcast.cc 2008-03-01 22:18:55.000000000 +0100 @@ -27,6 +27,7 @@ #include #include +#include #include #include diff -up bmpx-0.40.13/src/ui-part-cdda.cc.gcc43 bmpx-0.40.13/src/ui-part-cdda.cc --- bmpx-0.40.13/src/ui-part-cdda.cc.gcc43 2007-10-18 19:17:08.000000000 +0200 +++ bmpx-0.40.13/src/ui-part-cdda.cc 2008-03-01 22:18:55.000000000 +0100 @@ -35,6 +35,7 @@ #include #include #include +#include #include #include diff -up bmpx-0.40.13/src/minisoup.cc.gcc43 bmpx-0.40.13/src/minisoup.cc --- bmpx-0.40.13/src/minisoup.cc.gcc43 2008-03-01 22:18:55.000000000 +0100 +++ bmpx-0.40.13/src/minisoup.cc 2008-03-01 22:18:55.000000000 +0100 @@ -26,6 +26,7 @@ # include #endif //HAVE_CONFIG_H +#include #include #include #include diff -up bmpx-0.40.13/src/database.cc.gcc43 bmpx-0.40.13/src/database.cc --- bmpx-0.40.13/src/database.cc.gcc43 2007-10-18 19:17:08.000000000 +0200 +++ bmpx-0.40.13/src/database.cc 2008-03-01 22:18:55.000000000 +0100 @@ -28,6 +28,7 @@ #include #include +#include #include #include diff -up bmpx-0.40.13/src/video-widget.cc.gcc43 bmpx-0.40.13/src/video-widget.cc --- bmpx-0.40.13/src/video-widget.cc.gcc43 2008-03-01 22:25:26.000000000 +0100 +++ bmpx-0.40.13/src/video-widget.cc 2008-03-01 22:25:31.000000000 +0100 @@ -22,6 +22,8 @@ // permission is above and beyond the permissions granted by the GPL license // BMPx is covered by. +#include + #include #include "video-widget.hh" #include "audio/play.hh" diff -up bmpx-0.40.13/src/uri.cc.gcc43 bmpx-0.40.13/src/uri.cc --- bmpx-0.40.13/src/uri.cc.gcc43 2007-10-18 19:17:08.000000000 +0200 +++ bmpx-0.40.13/src/uri.cc 2008-03-01 22:18:55.000000000 +0100 @@ -39,6 +39,7 @@ #include #include #include +#include #include "debug.hh" #include "uri.hh" diff -up bmpx-0.40.13/src/vfs.hh.gcc43 bmpx-0.40.13/src/vfs.hh --- bmpx-0.40.13/src/vfs.hh.gcc43 2007-10-18 19:17:08.000000000 +0200 +++ bmpx-0.40.13/src/vfs.hh 2008-03-01 22:18:55.000000000 +0100 @@ -26,6 +26,7 @@ #include #include +#include #include #include diff -up bmpx-0.40.13/plugins/vfs/container/libcontainer_m3u.cc.gcc43 bmpx-0.40.13/plugins/vfs/container/libcontainer_m3u.cc --- bmpx-0.40.13/plugins/vfs/container/libcontainer_m3u.cc.gcc43 2007-10-18 19:17:14.000000000 +0200 +++ bmpx-0.40.13/plugins/vfs/container/libcontainer_m3u.cc 2008-03-01 22:18:55.000000000 +0100 @@ -21,6 +21,8 @@ // permission is above and beyond the permissions granted by the GPL license // BMPx is covered by. +#include + #include #include diff -up bmpx-0.40.13/json/json_writer.cpp.gcc43 bmpx-0.40.13/json/json_writer.cpp --- bmpx-0.40.13/json/json_writer.cpp.gcc43 2007-10-18 19:17:09.000000000 +0200 +++ bmpx-0.40.13/json/json_writer.cpp 2008-03-01 22:18:55.000000000 +0100 @@ -3,6 +3,7 @@ #include #include #include +#include #if _MSC_VER >= 1400 // VC++ 8.0 #pragma warning( disable : 4996 ) // disable warning about strdup being deprecated. diff -up bmpx-0.40.13/json/json_value.cpp.gcc43 bmpx-0.40.13/json/json_value.cpp --- bmpx-0.40.13/json/json_value.cpp.gcc43 2007-10-18 19:17:09.000000000 +0200 +++ bmpx-0.40.13/json/json_value.cpp 2008-03-01 22:18:55.000000000 +0100 @@ -3,6 +3,7 @@ #include #include #include +#include #include "assert.h" #ifdef JSON_USE_CPPTL # include diff -up bmpx-0.40.13/json/json_reader.cpp.gcc43 bmpx-0.40.13/json/json_reader.cpp --- bmpx-0.40.13/json/json_reader.cpp.gcc43 2007-10-18 19:17:09.000000000 +0200 +++ bmpx-0.40.13/json/json_reader.cpp 2008-03-01 22:18:55.000000000 +0100 @@ -5,6 +5,7 @@ #include #include #include +#include #if _MSC_VER >= 1400 // VC++ 8.0 #pragma warning( disable : 4996 ) // disable warning about strdup being deprecated. diff -up bmpx-0.40.13/jnetlib/httpget.cpp.gcc43 bmpx-0.40.13/jnetlib/httpget.cpp --- bmpx-0.40.13/jnetlib/httpget.cpp.gcc43 2007-10-18 19:17:06.000000000 +0200 +++ bmpx-0.40.13/jnetlib/httpget.cpp 2008-03-01 22:18:55.000000000 +0100 @@ -20,6 +20,7 @@ #include #include #include +#include const char* JNL_HTTPGet::get_data () diff -up bmpx-0.40.13/jnetlib/httpserv.h.gcc43 bmpx-0.40.13/jnetlib/httpserv.h --- bmpx-0.40.13/jnetlib/httpserv.h.gcc43 2007-10-18 19:17:06.000000000 +0200 +++ bmpx-0.40.13/jnetlib/httpserv.h 2008-03-01 22:18:55.000000000 +0100 @@ -12,6 +12,7 @@ #ifndef _HTTPSERV_H_ #define _HTTPSERV_H_ +#include #include "connection.h" class JNL_HTTPServ diff -up bmpx-0.40.13/jnetlib/listen.cpp.gcc43 bmpx-0.40.13/jnetlib/listen.cpp --- bmpx-0.40.13/jnetlib/listen.cpp.gcc43 2008-03-01 22:23:45.000000000 +0100 +++ bmpx-0.40.13/jnetlib/listen.cpp 2008-03-01 22:24:13.000000000 +0100 @@ -6,6 +6,8 @@ ** License: see jnetlib.h */ +#include + #include "netinc.h" #include "util.h" #include "listen.h" diff -up bmpx-0.40.13/jnetlib/httpget.h.gcc43 bmpx-0.40.13/jnetlib/httpget.h --- bmpx-0.40.13/jnetlib/httpget.h.gcc43 2007-10-18 19:17:06.000000000 +0200 +++ bmpx-0.40.13/jnetlib/httpget.h 2008-03-01 22:18:55.000000000 +0100 @@ -46,6 +46,7 @@ #include #include +#include #include #include diff -up bmpx-0.40.13/jnetlib/asyncdns.cpp.gcc43 bmpx-0.40.13/jnetlib/asyncdns.cpp --- bmpx-0.40.13/jnetlib/asyncdns.cpp.gcc43 2008-03-01 22:23:22.000000000 +0100 +++ bmpx-0.40.13/jnetlib/asyncdns.cpp 2008-03-01 22:23:29.000000000 +0100 @@ -6,6 +6,8 @@ ** License: see jnetlib.h */ +#include + #include "netinc.h" #include "util.h" #include "asyncdns.h" diff -up bmpx-0.40.13/jnetlib/connection.cpp.gcc43 bmpx-0.40.13/jnetlib/connection.cpp --- bmpx-0.40.13/jnetlib/connection.cpp.gcc43 2007-10-18 19:17:06.000000000 +0200 +++ bmpx-0.40.13/jnetlib/connection.cpp 2008-03-01 22:18:55.000000000 +0100 @@ -13,7 +13,7 @@ #include "connection.h" #include - +#include JNL_Connection::JNL_Connection(JNL_AsyncDNS *dns, int sendbufsize, int recvbufsize) { Index: bmpx.spec =================================================================== RCS file: /cvs/pkgs/rpms/bmpx/devel/bmpx.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bmpx.spec 18 Feb 2008 19:06:49 -0000 1.6 +++ bmpx.spec 1 Mar 2008 21:36:52 -0000 1.7 @@ -1,14 +1,15 @@ Summary: Beep Media Player eXperimental Name: bmpx Version: 0.40.13 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: Applications/Multimedia URL: http://www.beep-media-player.org/ Source: http://files.beep-media-player.org/releases/0.40/%{name}-%{version}.tar.bz2 -Patch0: bmpx-constcastfix.patch -Patch1: bmpx-libsoup24.patch +Patch0: bmpx-constcastfix.patch +Patch1: bmpx-libsoup24.patch +Patch2: bmpx-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ @@ -74,6 +75,7 @@ %setup -q %patch0 -p1 -b .constcastfix %patch1 -p1 -b .libsoup24 +%patch2 -p1 -b .gcc43 %build %configure \ @@ -174,6 +176,9 @@ %changelog +* Sat Mar 1 2008 Alexander Kahl - 0.40.13-10 +- patch for missing explicit gcc 4.3 cstring/string.h include + * Mon Feb 18 2008 Fedora Release Engineering - 0.40.13-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Mar 1 21:40:08 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 1 Mar 2008 21:40:08 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.90,1.91 Message-ID: <200803012140.m21Le8a0003996@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3963/devel Modified Files: kdebindings.spec Log Message: qwt still broken, revert. Index: kdebindings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- kdebindings.spec 1 Mar 2008 21:23:11 -0000 1.90 +++ kdebindings.spec 1 Mar 2008 21:39:35 -0000 1.91 @@ -7,7 +7,7 @@ Name: kdebindings Version: 4.0.2 -Release: 4%{?dist} +Release: 3%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -31,7 +31,8 @@ BuildRequires: ruby BuildRequires: giflib-devel BuildRequires: pcre-devel -BuildRequires: qwt-devel +# causes smokeqt to fail to build +#BuildRequires: qwt-devel BuildRequires: PyQt4-devel %if 0%{?fedora} > 8 BuildRequires: qscintilla-devel >= 2 @@ -118,9 +119,6 @@ %changelog -* Sat Mar 01 2008 Kevin Kofler 4.0.2-4 -- reenable qwt (should be fixed since 4.0.0) - * Sat Mar 01 2008 Kevin Kofler 4.0.2-3 - apply upstream build fixes for Qt 4.3.4 (rev 780996) - remove no longer existing protected KService::accessServiceTypes from PyKDE4 From fedora-extras-commits at redhat.com Sat Mar 1 22:46:36 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 1 Mar 2008 22:46:36 GMT Subject: rpms/pmount/devel pmount.spec, 1.2, 1.3 pmount-0.9.13-keeppublic.patch, 1.1, NONE Message-ID: <200803012246.m21Mkatp011942@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pmount/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11924 Modified Files: pmount.spec Removed Files: pmount-0.9.13-keeppublic.patch Log Message: * Sat Mar 1 2008 Patrice Dumas 0.9.17-1 - update to 0.9.17 - remove pmount-0.9.13-keeppublic.patch now that dbus connection is private Index: pmount.spec =================================================================== RCS file: /cvs/extras/rpms/pmount/devel/pmount.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pmount.spec 19 Feb 2008 18:27:23 -0000 1.2 +++ pmount.spec 1 Mar 2008 22:46:03 -0000 1.3 @@ -1,20 +1,21 @@ Name: pmount -Version: 0.9.13 -Release: 2%{?dist} +Version: 0.9.17 +Release: 1%{?dist} Summary: Enable normal user mount Group: System Environment/Base -License: GPL -URL: http://www.piware.de/projects.shtml -Source0: http://www.piware.de/projects/pmount-%{version}.tar.gz +# realpath.c is GPLv2+. Others are GPL+; +License: GPLv2+ +URL: http://pmount.alioth.debian.org/ +Source0: http://alioth.debian.org/frs/download.php/2247/pmount-%{version}.tar.gz # don't set the setuid bits during make install Patch0: pmount-0.9.13-nosetuid.patch -Patch1: pmount-0.9.13-keeppublic.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: intltool gettext pkgconfig -BuildRequires: libsysfs-devel hal-devel -Requires: cryptsetup-luks +BuildRequires: libsysfs-devel hal-devel e2fsprogs-devel +# ntfs-3g may be used too, it is considered optional, will be used if installed. +Requires: cryptsetup-luks /bin/mount %description pmount ("policy mount") is a wrapper around the standard mount program @@ -26,11 +27,11 @@ %prep %setup -q %patch0 -p1 -b .nosetuid -%patch1 -p1 -b .keeppublic %build -# mount, umount and cryptsetup path are right and don't use rpm macros, -# so the corresponding configure options are not used. +# mount, umount, cryptsetup and ntfs-3g paths are right and don't use rpm +# macros, so the corresponding configure options are not used. /media/ is +# also rightly used. %configure \ --with-lock-dir=%{_localstatedir}/lock/pmount \ --with-whitelist=%{_sysconfdir}/pmount.allow @@ -59,6 +60,10 @@ %{_mandir}/man1/p*mount*.1* %changelog +* Sat Mar 1 2008 Patrice Dumas 0.9.17-1 +- update to 0.9.17 +- remove pmount-0.9.13-keeppublic.patch now that dbus connection is private + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.13-2 - Autorebuild for GCC 4.3 --- pmount-0.9.13-keeppublic.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 1 22:49:17 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 1 Mar 2008 22:49:17 GMT Subject: rpms/pmount/devel .cvsignore, 1.2, 1.3 pmount.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803012249.m21MnHke011994@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/pmount/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11964 Modified Files: .cvsignore pmount.spec sources Log Message: add new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pmount/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 May 2007 22:34:41 -0000 1.2 +++ .cvsignore 1 Mar 2008 22:48:39 -0000 1.3 @@ -1 +1 @@ -pmount-0.9.13.tar.gz +pmount-0.9.17.tar.gz Index: pmount.spec =================================================================== RCS file: /cvs/extras/rpms/pmount/devel/pmount.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pmount.spec 1 Mar 2008 22:46:03 -0000 1.3 +++ pmount.spec 1 Mar 2008 22:48:39 -0000 1.4 @@ -1,6 +1,6 @@ Name: pmount Version: 0.9.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Enable normal user mount Group: System Environment/Base @@ -60,7 +60,7 @@ %{_mandir}/man1/p*mount*.1* %changelog -* Sat Mar 1 2008 Patrice Dumas 0.9.17-1 +* Sat Mar 1 2008 Patrice Dumas 0.9.17-2 - update to 0.9.17 - remove pmount-0.9.13-keeppublic.patch now that dbus connection is private Index: sources =================================================================== RCS file: /cvs/extras/rpms/pmount/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 May 2007 22:34:41 -0000 1.2 +++ sources 1 Mar 2008 22:48:39 -0000 1.3 @@ -1 +1 @@ -978d1c996fb7f74e8bb953d5674ab691 pmount-0.9.13.tar.gz +24a676bf495bec367b2d971cdca1c54c pmount-0.9.17.tar.gz From fedora-extras-commits at redhat.com Sat Mar 1 23:16:17 2008 From: fedora-extras-commits at redhat.com (Johan Cwiklinski (trasher)) Date: Sat, 1 Mar 2008 23:16:17 GMT Subject: rpms/eric/devel eric4-4.1.1-install_py-createGlobalPluginsDir.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 eric.spec, 1.21, 1.22 sources, 1.7, 1.8 eric4-4.1.0-install_py-createGlobalPluginsDir.patch, 1.1, NONE Message-ID: <200803012316.m21NGHvg019612@cvs-int.fedora.redhat.com> Author: trasher Update of /cvs/extras/rpms/eric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19573 Modified Files: .cvsignore eric.spec sources Added Files: eric4-4.1.1-install_py-createGlobalPluginsDir.patch Removed Files: eric4-4.1.0-install_py-createGlobalPluginsDir.patch Log Message: Upgrade to 4.1.1 eric4-4.1.1-install_py-createGlobalPluginsDir.patch: --- NEW FILE eric4-4.1.1-install_py-createGlobalPluginsDir.patch --- diff -up eric4-4.1.1/install.py.patch eric4-4.1.1/install.py --- eric4-4.1.1/install.py.patch 2008-03-01 23:54:03.000000000 +0100 +++ eric4-4.1.1/install.py 2008-03-01 23:54:24.000000000 +0100 @@ -184,8 +184,6 @@ def createGlobalPluginsDir(): global cfg, distDir pdir = os.path.join(cfg['mdir'], "eric4plugins") - if distDir: - pdir = distDir + pdir fname = os.path.join(pdir, "__init__.py") if not os.path.exists(fname): if not os.path.exists(pdir): Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 4 Feb 2008 21:04:36 -0000 1.7 +++ .cvsignore 1 Mar 2008 23:15:40 -0000 1.8 @@ -1,5 +1,5 @@ -eric4-4.1.0.tar.gz -eric4-i18n-cs-4.1.0.tar.gz -eric4-i18n-de-4.1.0.tar.gz -eric4-i18n-fr-4.1.0.tar.gz -eric4-i18n-ru-4.1.0.tar.gz +eric4-4.1.1.tar.gz +eric4-i18n-cs-4.1.1.tar.gz +eric4-i18n-de-4.1.1.tar.gz +eric4-i18n-fr-4.1.1.tar.gz +eric4-i18n-ru-4.1.1.tar.gz Index: eric.spec =================================================================== RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- eric.spec 14 Feb 2008 17:42:37 -0000 1.21 +++ eric.spec 1 Mar 2008 23:15:40 -0000 1.22 @@ -4,8 +4,8 @@ Name: eric Summary: Python IDE -Version: 4.1.0 -Release: 2%{?dist} +Version: 4.1.1 +Release: 1%{?dist} License: GPL+ Group: Development/Tools @@ -20,7 +20,7 @@ Source4: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-cs-%{version}.tar.gz Source10: eric4.desktop -Patch1: eric4-4.1.0-install_py-createGlobalPluginsDir.patch +Patch1: eric4-4.1.1-install_py-createGlobalPluginsDir.patch Patch2: eric4-4.1.0-shebang.patch Provides: eric4 = %{version}-%{release} @@ -134,6 +134,9 @@ %changelog +* Sat Mar 01 2008 Johan Cwiklinski 4.1.1-1 +- 4.1.1 + * Thu Feb 14 2008 Rex Dieter 4.1.0-2 - BR: qscintilla-python-devel - update Source URLS Index: sources =================================================================== RCS file: /cvs/extras/rpms/eric/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 4 Feb 2008 21:04:36 -0000 1.7 +++ sources 1 Mar 2008 23:15:40 -0000 1.8 @@ -1,5 +1,5 @@ -2ab6fa6daa21c48d0b4630c424f7e5c5 eric4-4.1.0.tar.gz -81e384d046e9e38b7145b4713455a4c1 eric4-i18n-cs-4.1.0.tar.gz -141a25fc9f96c2d96f715ad6ebe639d4 eric4-i18n-de-4.1.0.tar.gz -139068df86e2616068dbb55fea185e9b eric4-i18n-fr-4.1.0.tar.gz -7e183807460920eaf234d0bf35812c31 eric4-i18n-ru-4.1.0.tar.gz +361c01fe5039cf399487df1e0d9fffe5 eric4-4.1.1.tar.gz +0caeafc1b98598e1b2fdc384f0634e3e eric4-i18n-cs-4.1.1.tar.gz +5a9fb0bcb8ab418a7ef0ef0d6ebc7df0 eric4-i18n-de-4.1.1.tar.gz +b86809ed9cbd00071e904113d50e2a43 eric4-i18n-fr-4.1.1.tar.gz +2bd0454b06c2934ca64ed6e95f05f2bd eric4-i18n-ru-4.1.1.tar.gz --- eric4-4.1.0-install_py-createGlobalPluginsDir.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 1 23:33:30 2008 From: fedora-extras-commits at redhat.com (Ville-Pekka Vainio (vpv)) Date: Sat, 1 Mar 2008 23:33:30 GMT Subject: rpms/malaga/devel malaga.spec, 1.3, 1.4 malaga-7.11-link-against-libmalaga.patch, 1.1, NONE Message-ID: <200803012333.m21NXUpw019996@cvs-int.fedora.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/malaga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19970 Modified Files: malaga.spec Removed Files: malaga-7.11-link-against-libmalaga.patch Log Message: New version, drop upstreamed patch Index: malaga.spec =================================================================== RCS file: /cvs/pkgs/rpms/malaga/devel/malaga.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- malaga.spec 23 Feb 2008 09:58:52 -0000 1.3 +++ malaga.spec 1 Mar 2008 23:32:52 -0000 1.4 @@ -1,13 +1,12 @@ Name: malaga -Version: 7.11 -Release: 3%{?dist} +Version: 7.12 +Release: 1%{?dist} Summary: A programming language for automatic language analysis Group: Development/Languages License: GPLv2+ URL: http://home.arcor.de/bjoern-beutel/malaga/ Source0: http://home.arcor.de/bjoern-beutel/malaga/%{name}-%{version}.tgz -Patch0: malaga-7.11-link-against-libmalaga.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel readline-devel @@ -45,7 +44,8 @@ %prep %setup -q -%patch0 -p1 +# Remove "@" marks so that the build process is more verbose +sed -i.debug -e 's|^\([ \t][ \t]*\)@|\1|' Makefile.in # Remove "-s" so binaries won't be stripped sed -i.strip -e 's| -s | |' Makefile.in # Make libtool output more verbose @@ -64,7 +64,7 @@ # Remove static archive find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' # Change permission of libmalaga.so* -chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libmalaga.so* +chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libmalaga.so* %clean @@ -103,6 +103,12 @@ %changelog +* Sun Mar 02 2008 Ville-Pekka Vainio 7.12-1 +- New version +- Drop upstreamed linking patch +- Re-add a Makefile.in sed build verbosity trick, which was done in the + dropped patch but not upstream + * Sat Feb 23 2008 Ville-Pekka Vainio 7.11-3 - Add Makefile.in patch to link the executables against libmalaga --- malaga-7.11-link-against-libmalaga.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 1 23:35:45 2008 From: fedora-extras-commits at redhat.com (Ville-Pekka Vainio (vpv)) Date: Sat, 1 Mar 2008 23:35:45 GMT Subject: rpms/malaga/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200803012335.m21NZjZT020057@cvs-int.fedora.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/malaga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20027 Modified Files: .cvsignore sources Log Message: Forgot to commit sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/malaga/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Oct 2007 18:12:00 -0000 1.2 +++ .cvsignore 1 Mar 2008 23:35:13 -0000 1.3 @@ -1 +1 @@ -malaga-7.11.tgz +malaga-7.12.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/malaga/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Oct 2007 18:12:00 -0000 1.2 +++ sources 1 Mar 2008 23:35:13 -0000 1.3 @@ -1 +1 @@ -f23a154b1efb80fc50cd0db2762cf014 malaga-7.11.tgz +9ab17bc2ecbc042620287e46713ec2c5 malaga-7.12.tgz From fedora-extras-commits at redhat.com Sat Mar 1 23:51:01 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Sat, 1 Mar 2008 23:51:01 GMT Subject: rpms/aircrack-ng/devel .cvsignore, 1.9, 1.10 aircrack-ng.spec, 1.11, 1.12 sources, 1.9, 1.10 aircrack-ng-0.9.2-include_limits.patch, 1.1, NONE Message-ID: <200803012351.m21Np1mj020251@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/aircrack-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20229 Modified Files: .cvsignore aircrack-ng.spec sources Removed Files: aircrack-ng-0.9.2-include_limits.patch Log Message: * Sat Mar 01 2008 Till Maas - 0.9.3-1 - update to latest version - remove path that was merged upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 13 Feb 2008 14:13:30 -0000 1.9 +++ .cvsignore 1 Mar 2008 23:50:27 -0000 1.10 @@ -1 +1 @@ -aircrack-ng-0.9.2.tar.gz +aircrack-ng-0.9.3.tar.gz Index: aircrack-ng.spec =================================================================== RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/aircrack-ng.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- aircrack-ng.spec 13 Feb 2008 14:13:30 -0000 1.11 +++ aircrack-ng.spec 1 Mar 2008 23:50:27 -0000 1.12 @@ -1,7 +1,7 @@ #%define svndate 20070418 Name: aircrack-ng -Version: 0.9.2 +Version: 0.9.3 #Release: 0.3.%{svndate}svn%{?dist} Release: 1%{?dist} Summary: 802.11 (wireless) sniffer and WEP/WPA-PSK key cracker @@ -12,7 +12,6 @@ URL: http://www.aircrack-ng.org/ Source0: http://download.aircrack-ng.org/aircrack-ng-%{version}.tar.gz Source1: %{name}-tarball -Patch0: aircrack-ng-0.9.2-include_limits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +26,6 @@ %prep #%setup -q -n aircrack-ng-%{svndate} %setup -q -n aircrack-ng-%{version} -%patch0 -p1 -b .include_limits %build @@ -71,6 +69,10 @@ %changelog +* Sat Mar 01 2008 Till Maas - 0.9.3-1 +- update to latest version +- remove path that was merged upstream + * Wed Feb 13 2008 Till Maas - 0.9.2-1 - update to latest version - remove patch that was merged upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 13 Feb 2008 14:13:30 -0000 1.9 +++ sources 1 Mar 2008 23:50:27 -0000 1.10 @@ -1 +1 @@ -13fbe2f39730eb5f48f256b20714e2b4 aircrack-ng-0.9.2.tar.gz +f37fdb000d8bad77da6a0a43bc2ef67a aircrack-ng-0.9.3.tar.gz --- aircrack-ng-0.9.2-include_limits.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 1 23:52:02 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Sat, 1 Mar 2008 23:52:02 GMT Subject: rpms/aircrack-ng/devel aircrack-ng.spec,1.12,1.13 Message-ID: <200803012352.m21Nq2HX020280@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/aircrack-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20257 Modified Files: aircrack-ng.spec Log Message: typofix Index: aircrack-ng.spec =================================================================== RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/aircrack-ng.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- aircrack-ng.spec 1 Mar 2008 23:50:27 -0000 1.12 +++ aircrack-ng.spec 1 Mar 2008 23:51:26 -0000 1.13 @@ -71,7 +71,7 @@ %changelog * Sat Mar 01 2008 Till Maas - 0.9.3-1 - update to latest version -- remove path that was merged upstream +- remove patch that was merged upstream * Wed Feb 13 2008 Till Maas - 0.9.2-1 - update to latest version From fedora-extras-commits at redhat.com Sat Mar 1 23:56:35 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Sat, 1 Mar 2008 23:56:35 GMT Subject: rpms/gpsman/devel gpsman-6.3.2-sourcedir.patch, NONE, 1.1 gpsman-icon.png, NONE, 1.1 gpsman.desktop, NONE, 1.1 gpsman.spec, NONE, 1.1 mb2gmn.1, NONE, 1.1 mou2gmn.1, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803012356.m21NuZss020445@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/gpsman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20406/devel Modified Files: .cvsignore sources Added Files: gpsman-6.3.2-sourcedir.patch gpsman-icon.png gpsman.desktop gpsman.spec mb2gmn.1 mou2gmn.1 Log Message: Initial project import gpsman-6.3.2-sourcedir.patch: --- NEW FILE gpsman-6.3.2-sourcedir.patch --- diff -up gpsman-6.3.2/gpsman.tcl.orig gpsman-6.3.2/gpsman.tcl --- gpsman-6.3.2/gpsman.tcl.orig 2007-12-09 18:56:02.000000000 +0100 +++ gpsman-6.3.2/gpsman.tcl 2007-12-09 18:58:35.000000000 +0100 @@ -218,7 +218,7 @@ switch $tcl_platform(platform) { } # path to directory containing program files -set SRCDIR gmsrc +set SRCDIR /usr/share/gpsman # all other defaults configuration is now done in file $SRCDIR/config.tcl --- NEW FILE gpsman.desktop --- [Desktop Entry] Name=gpsman GenericName=GPS Manager Comment=Graphical management of GPS data Exec=gpsman Icon=gpsman-icon Terminal=false Type=Application Categories=Network;HamRadio; --- NEW FILE gpsman.spec --- Name: gpsman Version: 6.3.2 Release: 3%{?dist} Summary: A GPS manager Group: Applications/Communications License: GPLv2+ URL: http://www.ncc.up.pt/gpsman/wGPSMan_4.html Source0: http://www.ncc.up.pt/gpsman/gpsmanhtml/gpsman-6.3.2.tgz #man files for the utils, stolen from debian Source1: mou2gmn.1 Source2: mb2gmn.1 Source3: gpsman.desktop Source4: gpsman-icon.png #fix location of files in executable Patch0: gpsman-%{version}-sourcedir.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils Requires: tkimg %description GPS Manager (GPSMan) is a graphical manager of GPS data that makes possible the preparation, inspection and edition of GPS data in a friendly environment. GPSMan supports communication and real-time logging with both Garmin and Lowrance receivers and accepts real-time logging information in NMEA 0183 from any GPS receiver. %prep %setup -q %patch0 -p1 #make sure all files are utf-8 recode() { iconv -f "$2" -t utf-8 < "$1" > "${1}_" mv -f "${1}_" "$1" } for f in `find manual/html -name *.html` do recode $f iso-8859-15 done recode manual/html/info/WPs.txt iso-8859-15 %build #no build needed %install rm -rf $RPM_BUILD_ROOT #manual install install -D -m 0755 gpsman.tcl $RPM_BUILD_ROOT%{_bindir}/gpsman install -Dd gmsrc $RPM_BUILD_ROOT%{_datadir}/gpsman for f in `find gmsrc/ -type f -maxdepth 1` do install -D -m 0644 $f $RPM_BUILD_ROOT%{_datadir}/gpsman/`echo $f | cut -d '/' -f2` done install -Dd gmsrc/gmicons $RPM_BUILD_ROOT%{_datadir}/gpsman/gmicons for f in `find gmsrc/gmicons/ -type f -name *.gif` do install -D -m 0644 $f $RPM_BUILD_ROOT%{_datadir}/gpsman/gmicons/`echo $f | cut -d '/' -f3` done install -D -m 0644 man/man1/gpsman.1 $RPM_BUILD_ROOT%{_mandir}/man1/gpsman.1 #utils install -D -m 0755 util/mb2gmn.tcl $RPM_BUILD_ROOT%{_bindir}/mb2gmn install -D -m 0755 util/mou2gmn.tcl $RPM_BUILD_ROOT%{_bindir}/mou2gmn #man files install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/mb2gmn.1 install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/mou2gmn.1 # desktop file and icon mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ install -m 644 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ desktop-file-install --vendor="" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE3} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %doc manual/GPSMandoc.pdf manual/html %{_bindir}/* %{_datadir}/gpsman %{_mandir}/man?/* %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop %attr(0644,root,root) %{_datadir}/pixmaps/* %changelog * Tue Feb 26 2008 Steve Conklin - 6.3.2-3 - rpmlint clean up * Sun Dec 09 2007 Robert 'Bob' Jensen - 6.3.2-2 - rpmlint clean up * Sun Dec 09 2007 Sindre Pedersen Bj??rdal - 6.3.2-1 - Initial build --- NEW FILE mb2gmn.1 --- .TH MB2GMN "1" .SH NAME mb2gmn \- convert MapBlast files into GPSManager files .SH SYNOPSIS .B mb2gmn .I "[port]" .SH DESCRIPTION This manual page documents briefly the .BR mb2gmn command. This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. Instead, it has documentation in /usr/share/doc/gpsman. .PP .B gpsman GPS Manager (GPSMan) is a graphical manager of GPS data that makes possible the preparation, inspection and edition of GPS data in a friendly environment. GPSMan supports communication and real-time logging with both Garmin and Lowrance receivers and accepts real-time logging information in NMEA0183 from any GPS receiver. To comunicate with the GPS device the user must have granted read/write permissions for the respective port. .SH AUTHOR This manual page was written by Rogerio Reis , for the Debian GNU/Linux system (but may be used by others). --- NEW FILE mou2gmn.1 --- .TH MOU2GMN "1" .SH NAME mou2gmn \- convert MapsOnUS files into GPSManager files .SH SYNOPSIS .B mou2gmn .I "[port]" .SH DESCRIPTION This manual page documents briefly the .BR mou2gmn command. This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. Instead, it has documentation in /usr/share/doc/gpsman. .PP .B gpsman GPS Manager (GPSMan) is a graphical manager of GPS data that makes possible the preparation, inspection and edition of GPS data in a friendly environment. GPSMan supports communication and real-time logging with both Garmin and Lowrance receivers and accepts real-time logging information in NMEA0183 from any GPS receiver. To comunicate with the GPS device the user must have granted read/write permissions for the respective port. .SH AUTHOR This manual page was written by Rogerio Reis , for the Debian GNU/Linux system (but may be used by others). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gpsman/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2008 18:40:28 -0000 1.1 +++ .cvsignore 1 Mar 2008 23:56:01 -0000 1.2 @@ -0,0 +1 @@ +gpsman-6.3.2.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gpsman/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:40:28 -0000 1.1 +++ sources 1 Mar 2008 23:56:01 -0000 1.2 @@ -0,0 +1 @@ +dcc72b7a2a1b61f98f8432f8eb367213 gpsman-6.3.2.tgz From fedora-extras-commits at redhat.com Sun Mar 2 00:05:10 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Sun, 2 Mar 2008 00:05:10 GMT Subject: rpms/gpsman/F-8 gpsman-6.3.2-sourcedir.patch, NONE, 1.1 gpsman-icon.png, NONE, 1.1 gpsman.desktop, NONE, 1.1 gpsman.spec, NONE, 1.1 mb2gmn.1, NONE, 1.1 mou2gmn.1, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200803020005.m2205ATP027661@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/gpsman/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27631 Modified Files: sources Added Files: gpsman-6.3.2-sourcedir.patch gpsman-icon.png gpsman.desktop gpsman.spec mb2gmn.1 mou2gmn.1 Log Message: Initial project import gpsman-6.3.2-sourcedir.patch: --- NEW FILE gpsman-6.3.2-sourcedir.patch --- diff -up gpsman-6.3.2/gpsman.tcl.orig gpsman-6.3.2/gpsman.tcl --- gpsman-6.3.2/gpsman.tcl.orig 2007-12-09 18:56:02.000000000 +0100 +++ gpsman-6.3.2/gpsman.tcl 2007-12-09 18:58:35.000000000 +0100 @@ -218,7 +218,7 @@ switch $tcl_platform(platform) { } # path to directory containing program files -set SRCDIR gmsrc +set SRCDIR /usr/share/gpsman # all other defaults configuration is now done in file $SRCDIR/config.tcl --- NEW FILE gpsman.desktop --- [Desktop Entry] Name=gpsman GenericName=GPS Manager Comment=Graphical management of GPS data Exec=gpsman Icon=gpsman-icon Terminal=false Type=Application Categories=Network;HamRadio; --- NEW FILE gpsman.spec --- Name: gpsman Version: 6.3.2 Release: 3%{?dist} Summary: A GPS manager Group: Applications/Communications License: GPLv2+ URL: http://www.ncc.up.pt/gpsman/wGPSMan_4.html Source0: http://www.ncc.up.pt/gpsman/gpsmanhtml/gpsman-6.3.2.tgz #man files for the utils, stolen from debian Source1: mou2gmn.1 Source2: mb2gmn.1 Source3: gpsman.desktop Source4: gpsman-icon.png #fix location of files in executable Patch0: gpsman-%{version}-sourcedir.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils Requires: tkimg %description GPS Manager (GPSMan) is a graphical manager of GPS data that makes possible the preparation, inspection and edition of GPS data in a friendly environment. GPSMan supports communication and real-time logging with both Garmin and Lowrance receivers and accepts real-time logging information in NMEA 0183 from any GPS receiver. %prep %setup -q %patch0 -p1 #make sure all files are utf-8 recode() { iconv -f "$2" -t utf-8 < "$1" > "${1}_" mv -f "${1}_" "$1" } for f in `find manual/html -name *.html` do recode $f iso-8859-15 done recode manual/html/info/WPs.txt iso-8859-15 %build #no build needed %install rm -rf $RPM_BUILD_ROOT #manual install install -D -m 0755 gpsman.tcl $RPM_BUILD_ROOT%{_bindir}/gpsman install -Dd gmsrc $RPM_BUILD_ROOT%{_datadir}/gpsman for f in `find gmsrc/ -type f -maxdepth 1` do install -D -m 0644 $f $RPM_BUILD_ROOT%{_datadir}/gpsman/`echo $f | cut -d '/' -f2` done install -Dd gmsrc/gmicons $RPM_BUILD_ROOT%{_datadir}/gpsman/gmicons for f in `find gmsrc/gmicons/ -type f -name *.gif` do install -D -m 0644 $f $RPM_BUILD_ROOT%{_datadir}/gpsman/gmicons/`echo $f | cut -d '/' -f3` done install -D -m 0644 man/man1/gpsman.1 $RPM_BUILD_ROOT%{_mandir}/man1/gpsman.1 #utils install -D -m 0755 util/mb2gmn.tcl $RPM_BUILD_ROOT%{_bindir}/mb2gmn install -D -m 0755 util/mou2gmn.tcl $RPM_BUILD_ROOT%{_bindir}/mou2gmn #man files install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/mb2gmn.1 install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/mou2gmn.1 # desktop file and icon mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ install -m 644 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ desktop-file-install --vendor="" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE3} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %doc manual/GPSMandoc.pdf manual/html %{_bindir}/* %{_datadir}/gpsman %{_mandir}/man?/* %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop %attr(0644,root,root) %{_datadir}/pixmaps/* %changelog * Tue Feb 26 2008 Steve Conklin - 6.3.2-3 - rpmlint clean up * Sun Dec 09 2007 Robert 'Bob' Jensen - 6.3.2-2 - rpmlint clean up * Sun Dec 09 2007 Sindre Pedersen Bj??rdal - 6.3.2-1 - Initial build --- NEW FILE mb2gmn.1 --- .TH MB2GMN "1" .SH NAME mb2gmn \- convert MapBlast files into GPSManager files .SH SYNOPSIS .B mb2gmn .I "[port]" .SH DESCRIPTION This manual page documents briefly the .BR mb2gmn command. This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. Instead, it has documentation in /usr/share/doc/gpsman. .PP .B gpsman GPS Manager (GPSMan) is a graphical manager of GPS data that makes possible the preparation, inspection and edition of GPS data in a friendly environment. GPSMan supports communication and real-time logging with both Garmin and Lowrance receivers and accepts real-time logging information in NMEA0183 from any GPS receiver. To comunicate with the GPS device the user must have granted read/write permissions for the respective port. .SH AUTHOR This manual page was written by Rogerio Reis , for the Debian GNU/Linux system (but may be used by others). --- NEW FILE mou2gmn.1 --- .TH MOU2GMN "1" .SH NAME mou2gmn \- convert MapsOnUS files into GPSManager files .SH SYNOPSIS .B mou2gmn .I "[port]" .SH DESCRIPTION This manual page documents briefly the .BR mou2gmn command. This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. Instead, it has documentation in /usr/share/doc/gpsman. .PP .B gpsman GPS Manager (GPSMan) is a graphical manager of GPS data that makes possible the preparation, inspection and edition of GPS data in a friendly environment. GPSMan supports communication and real-time logging with both Garmin and Lowrance receivers and accepts real-time logging information in NMEA0183 from any GPS receiver. To comunicate with the GPS device the user must have granted read/write permissions for the respective port. .SH AUTHOR This manual page was written by Rogerio Reis , for the Debian GNU/Linux system (but may be used by others). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gpsman/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:40:28 -0000 1.1 +++ sources 2 Mar 2008 00:04:34 -0000 1.2 @@ -0,0 +1 @@ +dcc72b7a2a1b61f98f8432f8eb367213 gpsman-6.3.2.tgz From fedora-extras-commits at redhat.com Sun Mar 2 00:08:27 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Sun, 2 Mar 2008 00:08:27 GMT Subject: rpms/gpsman/F-7 gpsman-6.3.2-sourcedir.patch, NONE, 1.1 gpsman-icon.png, NONE, 1.1 gpsman.desktop, NONE, 1.1 gpsman.spec, NONE, 1.1 mb2gmn.1, NONE, 1.1 mou2gmn.1, NONE, 1.1 Message-ID: <200803020008.m2208R5n027744@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/gpsman/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27735 Added Files: gpsman-6.3.2-sourcedir.patch gpsman-icon.png gpsman.desktop gpsman.spec mb2gmn.1 mou2gmn.1 Log Message: Initial project import gpsman-6.3.2-sourcedir.patch: --- NEW FILE gpsman-6.3.2-sourcedir.patch --- diff -up gpsman-6.3.2/gpsman.tcl.orig gpsman-6.3.2/gpsman.tcl --- gpsman-6.3.2/gpsman.tcl.orig 2007-12-09 18:56:02.000000000 +0100 +++ gpsman-6.3.2/gpsman.tcl 2007-12-09 18:58:35.000000000 +0100 @@ -218,7 +218,7 @@ switch $tcl_platform(platform) { } # path to directory containing program files -set SRCDIR gmsrc +set SRCDIR /usr/share/gpsman # all other defaults configuration is now done in file $SRCDIR/config.tcl --- NEW FILE gpsman.desktop --- [Desktop Entry] Name=gpsman GenericName=GPS Manager Comment=Graphical management of GPS data Exec=gpsman Icon=gpsman-icon Terminal=false Type=Application Categories=Network;HamRadio; --- NEW FILE gpsman.spec --- Name: gpsman Version: 6.3.2 Release: 3%{?dist} Summary: A GPS manager Group: Applications/Communications License: GPLv2+ URL: http://www.ncc.up.pt/gpsman/wGPSMan_4.html Source0: http://www.ncc.up.pt/gpsman/gpsmanhtml/gpsman-6.3.2.tgz #man files for the utils, stolen from debian Source1: mou2gmn.1 Source2: mb2gmn.1 Source3: gpsman.desktop Source4: gpsman-icon.png #fix location of files in executable Patch0: gpsman-%{version}-sourcedir.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils Requires: tkimg %description GPS Manager (GPSMan) is a graphical manager of GPS data that makes possible the preparation, inspection and edition of GPS data in a friendly environment. GPSMan supports communication and real-time logging with both Garmin and Lowrance receivers and accepts real-time logging information in NMEA 0183 from any GPS receiver. %prep %setup -q %patch0 -p1 #make sure all files are utf-8 recode() { iconv -f "$2" -t utf-8 < "$1" > "${1}_" mv -f "${1}_" "$1" } for f in `find manual/html -name *.html` do recode $f iso-8859-15 done recode manual/html/info/WPs.txt iso-8859-15 %build #no build needed %install rm -rf $RPM_BUILD_ROOT #manual install install -D -m 0755 gpsman.tcl $RPM_BUILD_ROOT%{_bindir}/gpsman install -Dd gmsrc $RPM_BUILD_ROOT%{_datadir}/gpsman for f in `find gmsrc/ -type f -maxdepth 1` do install -D -m 0644 $f $RPM_BUILD_ROOT%{_datadir}/gpsman/`echo $f | cut -d '/' -f2` done install -Dd gmsrc/gmicons $RPM_BUILD_ROOT%{_datadir}/gpsman/gmicons for f in `find gmsrc/gmicons/ -type f -name *.gif` do install -D -m 0644 $f $RPM_BUILD_ROOT%{_datadir}/gpsman/gmicons/`echo $f | cut -d '/' -f3` done install -D -m 0644 man/man1/gpsman.1 $RPM_BUILD_ROOT%{_mandir}/man1/gpsman.1 #utils install -D -m 0755 util/mb2gmn.tcl $RPM_BUILD_ROOT%{_bindir}/mb2gmn install -D -m 0755 util/mou2gmn.tcl $RPM_BUILD_ROOT%{_bindir}/mou2gmn #man files install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/mb2gmn.1 install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/mou2gmn.1 # desktop file and icon mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ install -m 644 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ desktop-file-install --vendor="" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE3} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %doc manual/GPSMandoc.pdf manual/html %{_bindir}/* %{_datadir}/gpsman %{_mandir}/man?/* %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop %attr(0644,root,root) %{_datadir}/pixmaps/* %changelog * Tue Feb 26 2008 Steve Conklin - 6.3.2-3 - rpmlint clean up * Sun Dec 09 2007 Robert 'Bob' Jensen - 6.3.2-2 - rpmlint clean up * Sun Dec 09 2007 Sindre Pedersen Bj??rdal - 6.3.2-1 - Initial build --- NEW FILE mb2gmn.1 --- .TH MB2GMN "1" .SH NAME mb2gmn \- convert MapBlast files into GPSManager files .SH SYNOPSIS .B mb2gmn .I "[port]" .SH DESCRIPTION This manual page documents briefly the .BR mb2gmn command. This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. Instead, it has documentation in /usr/share/doc/gpsman. .PP .B gpsman GPS Manager (GPSMan) is a graphical manager of GPS data that makes possible the preparation, inspection and edition of GPS data in a friendly environment. GPSMan supports communication and real-time logging with both Garmin and Lowrance receivers and accepts real-time logging information in NMEA0183 from any GPS receiver. To comunicate with the GPS device the user must have granted read/write permissions for the respective port. .SH AUTHOR This manual page was written by Rogerio Reis , for the Debian GNU/Linux system (but may be used by others). --- NEW FILE mou2gmn.1 --- .TH MOU2GMN "1" .SH NAME mou2gmn \- convert MapsOnUS files into GPSManager files .SH SYNOPSIS .B mou2gmn .I "[port]" .SH DESCRIPTION This manual page documents briefly the .BR mou2gmn command. This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. Instead, it has documentation in /usr/share/doc/gpsman. .PP .B gpsman GPS Manager (GPSMan) is a graphical manager of GPS data that makes possible the preparation, inspection and edition of GPS data in a friendly environment. GPSMan supports communication and real-time logging with both Garmin and Lowrance receivers and accepts real-time logging information in NMEA0183 from any GPS receiver. To comunicate with the GPS device the user must have granted read/write permissions for the respective port. .SH AUTHOR This manual page was written by Rogerio Reis , for the Debian GNU/Linux system (but may be used by others). From fedora-extras-commits at redhat.com Sun Mar 2 01:54:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 01:54:26 GMT Subject: rpms/orage/devel orage.spec,1.10,1.11 Message-ID: <200803020154.m221sQk5003144@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/orage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3122 Modified Files: orage.spec Log Message: Modify desktop to only show in Xfce, as orage requires xfce-mcs-manager Index: orage.spec =================================================================== RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- orage.spec 10 Feb 2008 23:54:07 -0000 1.10 +++ orage.spec 2 Mar 2008 01:53:47 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Time-managing application for Xfce4 Name: orage Version: 4.4.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/orage-4.4.2.tar.bz2 @@ -44,6 +44,7 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category Office \ + --add-only-show-in=XFCE \ xfcalendar.desktop %clean @@ -71,6 +72,9 @@ %{_datadir}/xfce4/panel-plugins/orageclock.desktop %changelog +* Sat Mar 01 2008 Kevin Fenzi - 4.4.2-3 +- Modify desktop to only show in Xfce, as orage requires xfce-mcs-manager + * Sun Feb 10 2008 Kevin Fenzi - 4.4.2-2 - Rebuild for gcc43 From fedora-extras-commits at redhat.com Sun Mar 2 02:00:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 02:00:38 GMT Subject: rpms/orage/F-8 orage.spec,1.9,1.10 Message-ID: <200803020200.m2220c35003248@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/orage/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3225 Modified Files: orage.spec Log Message: Modify desktop to only show in Xfce, as orage requires xfce-mcs-manager Index: orage.spec =================================================================== RCS file: /cvs/extras/rpms/orage/F-8/orage.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- orage.spec 10 Dec 2007 19:20:31 -0000 1.9 +++ orage.spec 2 Mar 2008 02:00:01 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Time-managing application for Xfce4 Name: orage Version: 4.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/orage-4.4.2.tar.bz2 @@ -44,6 +44,7 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category Office \ + --add-only-show-in=XFCE \ xfcalendar.desktop %clean @@ -71,6 +72,9 @@ %{_datadir}/xfce4/panel-plugins/orageclock.desktop %changelog +* Sat Mar 01 2008 Kevin Fenzi - 4.4.2-2 +- Modify desktop to only show in Xfce, as orage requires xfce-mcs-manager + * Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 - Update to 4.4.2 From fedora-extras-commits at redhat.com Sun Mar 2 02:01:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 02:01:49 GMT Subject: rpms/orage/F-7 orage.spec,1.9,1.10 Message-ID: <200803020201.m2221naH010401@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/orage/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9420 Modified Files: orage.spec Log Message: Modify desktop to only show in Xfce, as orage requires xfce-mcs-manager Index: orage.spec =================================================================== RCS file: /cvs/extras/rpms/orage/F-7/orage.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- orage.spec 10 Dec 2007 19:21:57 -0000 1.9 +++ orage.spec 2 Mar 2008 02:01:11 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Time-managing application for Xfce4 Name: orage Version: 4.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/orage-4.4.2.tar.bz2 @@ -44,6 +44,7 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category Office \ + --add-only-show-in=XFCE \ xfcalendar.desktop %clean @@ -71,6 +72,9 @@ %{_datadir}/xfce4/panel-plugins/orageclock.desktop %changelog +* Sat Mar 01 2008 Kevin Fenzi - 4.4.2-2 +- Modify desktop to only show in Xfce, as orage requires xfce-mcs-manager + * Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 - Update to 4.4.2 From fedora-extras-commits at redhat.com Sun Mar 2 02:38:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 02:38:38 +0000 Subject: [pkgdb] ocaml-pxp was added for rjones Message-ID: <200803020239.m222d6mF021774@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-pxp with summary Validating XML parser Kevin Fenzi (kevin) has approved Package ocaml-pxp Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-pxp with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-pxp in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-pxp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-pxp (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-pxp (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-pxp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp From fedora-extras-commits at redhat.com Sun Mar 2 02:38:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 02:38:46 +0000 Subject: [pkgdb] ocaml-pxp (Fedora, 8) updated by kevin Message-ID: <200803020239.m222dEuC021795@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-pxp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-pxp (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-pxp (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-pxp (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-pxp (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp From fedora-extras-commits at redhat.com Sun Mar 2 02:38:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 02:38:46 +0000 Subject: [pkgdb] ocaml-pxp (Fedora, devel) updated by kevin Message-ID: <200803020239.m222dEuF021795@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-pxp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp From fedora-extras-commits at redhat.com Sun Mar 2 02:40:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 02:40:03 GMT Subject: rpms/ocaml-pxp - New directory Message-ID: <200803020240.m222e3fw010830@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-pxp In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10792/rpms/ocaml-pxp Log Message: Directory /cvs/extras/rpms/ocaml-pxp added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 02:40:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 02:40:09 GMT Subject: rpms/ocaml-pxp/devel - New directory Message-ID: <200803020240.m222e9pR010844@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-pxp/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10792/rpms/ocaml-pxp/devel Log Message: Directory /cvs/extras/rpms/ocaml-pxp/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 02:40:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 02:40:16 GMT Subject: rpms/ocaml-pxp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803020240.m222eGqe010869@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-pxp In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10792/rpms/ocaml-pxp Added Files: Makefile import.log Log Message: Setup of module ocaml-pxp --- NEW FILE Makefile --- # Top level Makefile for module ocaml-pxp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Mar 2 02:40:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 02:40:19 GMT Subject: rpms/ocaml-pxp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803020240.m222eJwx010885@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-pxp/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL10792/rpms/ocaml-pxp/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-pxp --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-pxp # $Id: Makefile,v 1.1 2008/03/02 02:40:16 kevin Exp $ NAME := ocaml-pxp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Mar 2 03:50:55 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sun, 2 Mar 2008 03:50:55 GMT Subject: rpms/xulrunner/devel .cvsignore, 1.30, 1.31 sources, 1.31, 1.32 xulrunner.spec, 1.81, 1.82 Message-ID: <200803020350.m223otfG019685@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19659 Modified Files: .cvsignore sources xulrunner.spec Log Message: * Sat Mar 1 2008 Christopher Aillon 1.9-0.beta3.32 - Update to latest trunk (2008-03-01) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 1 Mar 2008 03:55:20 -0000 1.30 +++ .cvsignore 2 Mar 2008 03:50:19 -0000 1.31 @@ -1 +1 @@ -mozilla-20080229.tar.bz2 +mozilla-20080301.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 1 Mar 2008 03:55:20 -0000 1.31 +++ sources 2 Mar 2008 03:50:19 -0000 1.32 @@ -1 +1 @@ -5d815e7932fe7b668793fd1742ac3963 mozilla-20080229.tar.bz2 +0c7a15d3d8c785f78e2e01eb4b15dbbc mozilla-20080301.tar.bz2 Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- xulrunner.spec 1 Mar 2008 03:55:20 -0000 1.81 +++ xulrunner.spec 2 Mar 2008 03:50:19 -0000 1.82 @@ -7,14 +7,14 @@ %define version_internal 1.9pre %if ! %{official_branding} -%define cvsdate 20080229 +%define cvsdate 20080301 %define nightly .nightly%{cvsdate} %endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.beta3.31%{?nightly}%{?dist} +Release: 0.beta3.32%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -400,6 +400,9 @@ #--------------------------------------------------------------------- %changelog +* Sat Mar 1 2008 Christopher Aillon 1.9-0.beta3.32 +- Update to latest trunk (2008-03-01) + * Fri Feb 29 2008 Christopher Aillon 1.9-0.beta3.31 - Update to latest trunk (2008-02-29) From fedora-extras-commits at redhat.com Sun Mar 2 03:54:50 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sun, 2 Mar 2008 03:54:50 GMT Subject: rpms/firefox/devel .cvsignore, 1.60, 1.61 firefox.spec, 1.264, 1.265 sources, 1.71, 1.72 Message-ID: <200803020354.m223soCd019794@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19759 Modified Files: .cvsignore firefox.spec sources Log Message: * Sat Mar 1 2008 Christopher Aillon 3.0-0.beta3.32 - Update to latest trunk (2008-03-01) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 1 Mar 2008 03:55:34 -0000 1.60 +++ .cvsignore 2 Mar 2008 03:53:41 -0000 1.61 @@ -1 +1 @@ -mozilla-20080229.tar.bz2 +mozilla-20080301.tar.bz2 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- firefox.spec 1 Mar 2008 03:55:34 -0000 1.264 +++ firefox.spec 2 Mar 2008 03:53:41 -0000 1.265 @@ -7,20 +7,20 @@ %define mozappdir %{_libdir}/%{name}-%{version_internal} %define gecko_version 1.9 -%define xulrunner_version 1.9-0.beta3.31 +%define xulrunner_version 1.9-0.beta3.32 %define official_branding 0 %define build_langpacks 0 %if ! %{official_branding} -%define cvsdate 20080229 +%define cvsdate 20080301 %define nightly .nightly%{cvsdate} %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.beta3.31%{?nightly}%{?dist} +Release: 0.beta3.32%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -315,6 +315,9 @@ #--------------------------------------------------------------------- %changelog +* Sat Mar 1 2008 Christopher Aillon 3.0-0.beta3.32 +- Update to latest trunk (2008-03-01) + * Fri Feb 29 2008 Christopher Aillon 3.0-0.beta3.31 - Update to latest trunk (2008-02-29) Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/sources,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- sources 1 Mar 2008 03:55:34 -0000 1.71 +++ sources 2 Mar 2008 03:53:41 -0000 1.72 @@ -1 +1 @@ -5d815e7932fe7b668793fd1742ac3963 mozilla-20080229.tar.bz2 +0c7a15d3d8c785f78e2e01eb4b15dbbc mozilla-20080301.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 04:02:32 2008 From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel)) Date: Sun, 2 Mar 2008 04:02:32 GMT Subject: rpms/dhcpv6/devel .cvsignore, 1.13, 1.14 dhcpv6.spec, 1.81, 1.82 sources, 1.13, 1.14 Message-ID: <200803020402.m2242W0Z027265@cvs-int.fedora.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcpv6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26994 Modified Files: .cvsignore dhcpv6.spec sources Log Message: Upgraded to dhcpv6-1.0.12. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 1 Feb 2008 00:56:49 -0000 1.13 +++ .cvsignore 2 Mar 2008 04:01:53 -0000 1.14 @@ -1 +1 @@ -dhcpv6-1.0.11.tar.gz +dhcpv6-1.0.12.tar.gz Index: dhcpv6.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- dhcpv6.spec 1 Feb 2008 00:56:49 -0000 1.81 +++ dhcpv6.spec 2 Mar 2008 04:01:53 -0000 1.82 @@ -3,7 +3,7 @@ Summary: DHCPv6 - DHCP server and client for IPv6 Name: dhcpv6 -Version: 1.0.11 +Version: 1.0.12 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Daemons @@ -157,6 +157,9 @@ %{_libdir}/libdhcp6client.a %changelog +* Sat Mar 01 2008 David Cantrell - 1.0.12-1 +- Upgrade to dhcpv6-1.0.12 + * Thu Jan 31 2008 David Cantrell - 1.0.11-1 - Upgrade to dhcpv6-1.0.11 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 1 Feb 2008 00:56:49 -0000 1.13 +++ sources 2 Mar 2008 04:01:53 -0000 1.14 @@ -1 +1 @@ -1c601df5bddbd3a4da7aeacd8e260efd dhcpv6-1.0.11.tar.gz +75d44a46f5807f546710f091426eab45 dhcpv6-1.0.12.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 05:09:39 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Sun, 2 Mar 2008 05:09:39 GMT Subject: rpms/kernel/devel config-generic, 1.76, 1.77 kernel.spec, 1.464, 1.465 linux-2.6-firewire-git-pending.patch, 1.8, 1.9 Message-ID: <200803020509.m2259dXh032425@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32317 Modified Files: config-generic kernel.spec linux-2.6-firewire-git-pending.patch Log Message: * Sun Mar 01 2008 Jarod Wilson - firewire: fix suspend/resume on older PowerPC Macs (#312871) - firewire: support for first-gen Apple UniNorth controller - firewire: add option for remote debugging Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- config-generic 25 Feb 2008 05:35:20 -0000 1.76 +++ config-generic 2 Mar 2008 05:08:48 -0000 1.77 @@ -3462,3 +3462,4 @@ # CONFIG_RT_GROUP_SCHED is not set CONFIG_CGROUP_SCHED=y +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.464 retrieving revision 1.465 diff -u -r1.464 -r1.465 --- kernel.spec 29 Feb 2008 22:52:39 -0000 1.464 +++ kernel.spec 2 Mar 2008 05:08:48 -0000 1.465 @@ -1736,6 +1736,11 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Sun Mar 01 2008 Jarod Wilson +- firewire: fix suspend/resume on older PowerPC Macs (#312871) +- firewire: support for first-gen Apple UniNorth controller +- firewire: add option for remote debugging + * Fri Feb 29 2008 Kyle McMartin - Linux 2.6.25-rc3-git2 linux-2.6-firewire-git-pending.patch: Index: linux-2.6-firewire-git-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-firewire-git-pending.patch 27 Feb 2008 21:43:12 -0000 1.8 +++ linux-2.6-firewire-git-pending.patch 2 Mar 2008 05:08:48 -0000 1.9 @@ -9,6 +9,7 @@ Signed-off-by: Stefan Richter Cc: sparclinux at vger.kernel.org Cc: linuxppc-dev at ozlabs.org +Signed-off-by: Jarod Wilson --- This patch is a shot in the dark, based on a warning when building with @@ -64,6 +65,7 @@ Signed-off-by: Stefan Richter Cc: sparclinux at vger.kernel.org Cc: linuxppc-dev at ozlabs.org +Signed-off-by: Jarod Wilson --- drivers/firewire/fw-ohci.c | 4 ++-- drivers/firewire/fw-transaction.c | 2 +- @@ -291,6 +293,7 @@ card. Signed-off-by: Stefan Richter +Signed-off-by: Jarod Wilson --- drivers/firewire/fw-card.c | 51 ++++++++++++++++++++++----------- drivers/firewire/fw-topology.c | 1 @@ -519,6 +522,7 @@ to be shut down. Signed-off-by: Stefan Richter +Signed-off-by: Jarod Wilson --- Update: Refreshed to be applicable after patch "firewire: fw-sbp2: @@ -717,6 +721,7 @@ automatic module unloading" added another counter of card users. Signed-off-by: Stefan Richter +Signed-off-by: Jarod Wilson --- drivers/firewire/fw-card.c | 38 ------------------------------ drivers/firewire/fw-ohci.c | 8 +++--- @@ -855,6 +860,7 @@ sbp2_probe. Fixed by moving the _get further up. Signed-off-by: Stefan Richter +Signed-off-by: Jarod Wilson --- drivers/firewire/fw-sbp2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) @@ -891,6 +897,7 @@ Remove some line breaks. Signed-off-by: Stefan Richter +Signed-off-by: Jarod Wilson --- drivers/firewire/fw-device.h | 27 +++++++++++++++++---------- drivers/firewire/fw-sbp2.c | 4 ++-- @@ -988,3 +995,730 @@ http://arcgraph.de/sr/ +Write directly in big endian instead of byte-swapping after the fact. +This saves a few conversions, lets gcc use constant endianess +conversions where possible, and enables deeper endianess annotation. + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-sbp2.c | 96 ++++++++++++++++--------------------- + 1 file changed, 44 insertions(+), 52 deletions(-) + +Index: linux/drivers/firewire/fw-sbp2.c +=================================================================== +--- linux.orig/drivers/firewire/fw-sbp2.c ++++ linux/drivers/firewire/fw-sbp2.c +@@ -223,8 +223,8 @@ struct sbp2_status { + }; + + struct sbp2_pointer { +- u32 high; +- u32 low; ++ __be32 high; ++ __be32 low; + }; + + struct sbp2_orb { +@@ -252,8 +252,8 @@ struct sbp2_management_orb { + struct { + struct sbp2_pointer password; + struct sbp2_pointer response; +- u32 misc; +- u32 length; ++ __be32 misc; ++ __be32 length; + struct sbp2_pointer status_fifo; + } request; + __be32 response[4]; +@@ -262,13 +262,10 @@ struct sbp2_management_orb { + struct sbp2_status status; + }; + +-#define LOGIN_RESPONSE_GET_LOGIN_ID(v) ((v).misc & 0xffff) +-#define LOGIN_RESPONSE_GET_LENGTH(v) (((v).misc >> 16) & 0xffff) +- + struct sbp2_login_response { +- u32 misc; ++ __be32 misc; + struct sbp2_pointer command_block_agent; +- u32 reconnect_hold; ++ __be32 reconnect_hold; + }; + #define COMMAND_ORB_DATA_SIZE(v) ((v)) + #define COMMAND_ORB_PAGE_SIZE(v) ((v) << 16) +@@ -284,7 +281,7 @@ struct sbp2_command_orb { + struct { + struct sbp2_pointer next; + struct sbp2_pointer data_descriptor; +- u32 misc; ++ __be32 misc; + u8 command_block[12]; + } request; + struct scsi_cmnd *cmd; +@@ -453,8 +450,7 @@ sbp2_send_orb(struct sbp2_orb *orb, stru + unsigned long flags; + + orb->pointer.high = 0; +- orb->pointer.low = orb->request_bus; +- fw_memcpy_to_be32(&orb->pointer, &orb->pointer, sizeof(orb->pointer)); ++ orb->pointer.low = cpu_to_be32(orb->request_bus); + + spin_lock_irqsave(&device->card->lock, flags); + list_add_tail(&orb->link, &lu->orb_list); +@@ -530,31 +526,31 @@ sbp2_send_management_orb(struct sbp2_log + if (dma_mapping_error(orb->response_bus)) + goto fail_mapping_response; + +- orb->request.response.high = 0; +- orb->request.response.low = orb->response_bus; ++ orb->request.response.high = 0; ++ orb->request.response.low = cpu_to_be32(orb->response_bus); + +- orb->request.misc = ++ orb->request.misc = cpu_to_be32( + MANAGEMENT_ORB_NOTIFY | + MANAGEMENT_ORB_FUNCTION(function) | +- MANAGEMENT_ORB_LUN(lun_or_login_id); +- orb->request.length = +- MANAGEMENT_ORB_RESPONSE_LENGTH(sizeof(orb->response)); +- +- orb->request.status_fifo.high = lu->address_handler.offset >> 32; +- orb->request.status_fifo.low = lu->address_handler.offset; ++ MANAGEMENT_ORB_LUN(lun_or_login_id)); ++ orb->request.length = cpu_to_be32( ++ MANAGEMENT_ORB_RESPONSE_LENGTH(sizeof(orb->response))); ++ ++ orb->request.status_fifo.high = ++ cpu_to_be32(lu->address_handler.offset >> 32); ++ orb->request.status_fifo.low = ++ cpu_to_be32(lu->address_handler.offset); + + if (function == SBP2_LOGIN_REQUEST) { + /* Ask for 2^2 == 4 seconds reconnect grace period */ +- orb->request.misc |= ++ orb->request.misc |= cpu_to_be32( + MANAGEMENT_ORB_RECONNECT(2) | +- MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login); ++ MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login)); + timeout = lu->tgt->mgt_orb_timeout; + } else { + timeout = SBP2_ORB_TIMEOUT; + } + +- fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request)); +- + init_completion(&orb->done); + orb->base.callback = complete_management_orb; + +@@ -599,8 +595,7 @@ sbp2_send_management_orb(struct sbp2_log + sizeof(orb->response), DMA_FROM_DEVICE); + fail_mapping_response: + if (response) +- fw_memcpy_from_be32(response, +- orb->response, sizeof(orb->response)); ++ memcpy(response, orb->response, sizeof(orb->response)); + kref_put(&orb->base.kref, free_orb); + + return retval; +@@ -855,11 +850,10 @@ static void sbp2_login(struct work_struc + tgt->address_high = local_node_id << 16; + sbp2_set_generation(lu, generation); + +- /* Get command block agent offset and login id. */ + lu->command_block_agent_address = +- ((u64) (response.command_block_agent.high & 0xffff) << 32) | +- response.command_block_agent.low; +- lu->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response); ++ ((u64)(be32_to_cpu(response.command_block_agent.high) & 0xffff) ++ << 32) | be32_to_cpu(response.command_block_agent.low); ++ lu->login_id = be32_to_cpu(response.misc) & 0xffff; + + fw_notify("%s: logged in to LUN %04x (%d retries)\n", + tgt->bus_id, lu->lun, lu->retries); +@@ -1338,9 +1332,12 @@ sbp2_map_scatterlist(struct sbp2_command + * tables. + */ + if (count == 1 && sg_dma_len(sg) < SBP2_MAX_SG_ELEMENT_LENGTH) { +- orb->request.data_descriptor.high = lu->tgt->address_high; +- orb->request.data_descriptor.low = sg_dma_address(sg); +- orb->request.misc |= COMMAND_ORB_DATA_SIZE(sg_dma_len(sg)); ++ orb->request.data_descriptor.high = ++ cpu_to_be32(lu->tgt->address_high); ++ orb->request.data_descriptor.low = ++ cpu_to_be32(sg_dma_address(sg)); ++ orb->request.misc |= ++ cpu_to_be32(COMMAND_ORB_DATA_SIZE(sg_dma_len(sg))); + return 0; + } + +@@ -1361,16 +1358,14 @@ sbp2_map_scatterlist(struct sbp2_command + goto fail_page_table; + } + l = min(sg_len, SBP2_MAX_SG_ELEMENT_LENGTH); +- orb->page_table[j].low = sg_addr; +- orb->page_table[j].high = (l << 16); ++ orb->page_table[j].low = cpu_to_be32(sg_addr); ++ orb->page_table[j].high = cpu_to_be32(l << 16); + sg_addr += l; + sg_len -= l; + j++; + } + } + +- fw_memcpy_to_be32(orb->page_table, orb->page_table, +- sizeof(orb->page_table[0]) * j); + orb->page_table_bus = + dma_map_single(device->card->device, orb->page_table, + sizeof(orb->page_table), DMA_TO_DEVICE); +@@ -1384,11 +1379,10 @@ sbp2_map_scatterlist(struct sbp2_command + * initiator (i.e. us), but data_descriptor can refer to data + * on other nodes so we need to put our ID in descriptor.high. + */ +- orb->request.data_descriptor.high = lu->tgt->address_high; +- orb->request.data_descriptor.low = orb->page_table_bus; +- orb->request.misc |= +- COMMAND_ORB_PAGE_TABLE_PRESENT | +- COMMAND_ORB_DATA_SIZE(j); ++ orb->request.data_descriptor.high = cpu_to_be32(lu->tgt->address_high); ++ orb->request.data_descriptor.low = cpu_to_be32(orb->page_table_bus); ++ orb->request.misc |= cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT | ++ COMMAND_ORB_DATA_SIZE(j)); + + return 0; + +@@ -1434,7 +1428,7 @@ static int sbp2_scsi_queuecommand(struct + orb->done = done; + orb->cmd = cmd; + +- orb->request.next.high = SBP2_ORB_NULL; ++ orb->request.next.high = cpu_to_be32(SBP2_ORB_NULL); + orb->request.next.low = 0x0; + /* + * At speed 100 we can do 512 bytes per packet, at speed 200, +@@ -1444,23 +1438,21 @@ static int sbp2_scsi_queuecommand(struct + */ + max_payload = min(device->max_speed + 7, + device->card->max_receive - 1); +- orb->request.misc = ++ orb->request.misc = cpu_to_be32( + COMMAND_ORB_MAX_PAYLOAD(max_payload) | + COMMAND_ORB_SPEED(device->max_speed) | +- COMMAND_ORB_NOTIFY; ++ COMMAND_ORB_NOTIFY); + + if (cmd->sc_data_direction == DMA_FROM_DEVICE) +- orb->request.misc |= +- COMMAND_ORB_DIRECTION(SBP2_DIRECTION_FROM_MEDIA); ++ orb->request.misc |= cpu_to_be32( ++ COMMAND_ORB_DIRECTION(SBP2_DIRECTION_FROM_MEDIA)); + else if (cmd->sc_data_direction == DMA_TO_DEVICE) +- orb->request.misc |= +- COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA); ++ orb->request.misc |= cpu_to_be32( ++ COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA)); + + if (scsi_sg_count(cmd) && sbp2_map_scatterlist(orb, device, lu) < 0) + goto out; + +- fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request)); +- + memset(orb->request.command_block, + 0, sizeof(orb->request.command_block)); + memcpy(orb->request.command_block, cmd->cmnd, COMMAND_SIZE(*cmd->cmnd)); + +-- +Stefan Richter +-=====-==--- --=- ===-- +http://arcgraph.de/sr/ + + +How hard can it be to switch on one bit? :-) + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-sbp2.c | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +Index: linux/drivers/firewire/fw-sbp2.c +=================================================================== +--- linux.orig/drivers/firewire/fw-sbp2.c ++++ linux/drivers/firewire/fw-sbp2.c +@@ -174,9 +174,6 @@ struct sbp2_target { + #define SBP2_ORB_NULL 0x80000000 + #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 + +-#define SBP2_DIRECTION_TO_MEDIA 0x0 +-#define SBP2_DIRECTION_FROM_MEDIA 0x1 +- + /* Unit directory keys */ + #define SBP2_CSR_UNIT_CHARACTERISTICS 0x3a + #define SBP2_CSR_FIRMWARE_REVISION 0x3c +@@ -272,7 +269,7 @@ struct sbp2_login_response { + #define COMMAND_ORB_PAGE_TABLE_PRESENT ((1) << 19) + #define COMMAND_ORB_MAX_PAYLOAD(v) ((v) << 20) + #define COMMAND_ORB_SPEED(v) ((v) << 24) +-#define COMMAND_ORB_DIRECTION(v) ((v) << 27) ++#define COMMAND_ORB_DIRECTION ((1) << 27) + #define COMMAND_ORB_REQUEST_FORMAT(v) ((v) << 29) + #define COMMAND_ORB_NOTIFY ((1) << 31) + +@@ -1444,11 +1441,7 @@ static int sbp2_scsi_queuecommand(struct + COMMAND_ORB_NOTIFY); + + if (cmd->sc_data_direction == DMA_FROM_DEVICE) +- orb->request.misc |= cpu_to_be32( +- COMMAND_ORB_DIRECTION(SBP2_DIRECTION_FROM_MEDIA)); +- else if (cmd->sc_data_direction == DMA_TO_DEVICE) +- orb->request.misc |= cpu_to_be32( +- COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA)); ++ orb->request.misc |= cpu_to_be32(COMMAND_ORB_DIRECTION); + + if (scsi_sg_count(cmd) && sbp2_map_scatterlist(orb, device, lu) < 0) + goto out; + +-- +Stefan Richter +-=====-==--- --=- ===-- +http://arcgraph.de/sr/ + + +orb came from kzalloc. + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-sbp2.c | 3 --- + 1 file changed, 3 deletions(-) + +Index: linux/drivers/firewire/fw-sbp2.c +=================================================================== +--- linux.orig/drivers/firewire/fw-sbp2.c ++++ linux/drivers/firewire/fw-sbp2.c +@@ -1426,7 +1426,6 @@ static int sbp2_scsi_queuecommand(struct + orb->cmd = cmd; + + orb->request.next.high = cpu_to_be32(SBP2_ORB_NULL); +- orb->request.next.low = 0x0; + /* + * At speed 100 we can do 512 bytes per packet, at speed 200, + * 1024 bytes per packet etc. The SBP-2 max_payload field +@@ -1446,8 +1445,6 @@ static int sbp2_scsi_queuecommand(struct + if (scsi_sg_count(cmd) && sbp2_map_scatterlist(orb, device, lu) < 0) + goto out; + +- memset(orb->request.command_block, +- 0, sizeof(orb->request.command_block)); + memcpy(orb->request.command_block, cmd->cmnd, COMMAND_SIZE(*cmd->cmnd)); + + orb->base.callback = complete_command_orb; + +-- +Stefan Richter +-=====-==--- --=- ===-- +http://arcgraph.de/sr/ + + +The block/unblock logic is now sufficiently tested. + +Signed-off-by: Stefan Richter +--- + +To be postponed after 2.6.25. + + drivers/firewire/fw-sbp2.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +Index: linux/drivers/firewire/fw-sbp2.c +=================================================================== +--- linux.orig/drivers/firewire/fw-sbp2.c ++++ linux/drivers/firewire/fw-sbp2.c +@@ -687,10 +687,8 @@ static void sbp2_conditionally_block(str + if (!tgt->dont_block && !lu->blocked && + lu->generation != card->generation) { + lu->blocked = true; +- if (++tgt->blocked == 1) { ++ if (++tgt->blocked == 1) + scsi_block_requests(shost); +- fw_notify("blocked %s\n", lu->tgt->bus_id); +- } + } + spin_unlock_irqrestore(&card->lock, flags); + } +@@ -717,10 +715,8 @@ static void sbp2_conditionally_unblock(s + } + spin_unlock_irqrestore(&card->lock, flags); + +- if (unblock) { ++ if (unblock) + scsi_unblock_requests(shost); +- fw_notify("unblocked %s\n", lu->tgt->bus_id); +- } + } + + /* + +-- +Stefan Richter +-=====-==--- --=- ===-- +http://arcgraph.de/sr/ + + +Copied from ohci1394.c. This code is necessary to prevent machine check +exceptions when reloading or resuming the driver. + +Signed-off-by: Stefan Richter +Signed-off-by: Jarod Wilson +--- + drivers/firewire/fw-ohci.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 50 insertions(+) + +Index: linux-2.6.25-rc3/drivers/firewire/fw-ohci.c +=================================================================== +--- linux-2.6.25-rc3.orig/drivers/firewire/fw-ohci.c ++++ linux-2.6.25-rc3/drivers/firewire/fw-ohci.c +@@ -33,6 +33,10 @@ + #include + #include + ++#ifdef CONFIG_PPC_PMAC ++#include ++#endif ++ + #include "fw-ohci.h" + #include "fw-transaction.h" + +@@ -2057,6 +2061,18 @@ pci_probe(struct pci_dev *dev, const str + int err; + size_t size; + ++#ifdef CONFIG_PPC_PMAC ++ /* Necessary on some machines if fw-ohci was loaded/ unloaded before */ ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(dev); ++ ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1); ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); ++ } ++ } ++#endif /* CONFIG_PPC_PMAC */ ++ + ohci = kzalloc(sizeof(*ohci), GFP_KERNEL); + if (ohci == NULL) { + fw_error("Could not malloc fw_ohci data.\n"); +@@ -2189,6 +2205,20 @@ static void pci_remove(struct pci_dev *d + pci_iounmap(dev, ohci->registers); + pci_release_region(dev, 0); + pci_disable_device(dev); ++ ++#ifdef CONFIG_PPC_PMAC ++ /* On UniNorth, power down the cable and turn off the chip clock ++ * to save power on laptops */ ++ if (machine_is(powermac)) { ++ struct device_node* ofn = pci_device_to_OF_node(dev); ++ ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); ++ } ++ } ++#endif /* CONFIG_PPC_PMAC */ ++ + kfree(&ohci->card); + + fw_notify("Removed fw-ohci device.\n"); +@@ -2211,6 +2241,16 @@ static int pci_suspend(struct pci_dev *p + if (err) + fw_error("pci_set_power_state failed with %d\n", err); + ++/* PowerMac suspend code comes last */ ++#ifdef CONFIG_PPC_PMAC ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(pdev); ++ ++ if (ofn) ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); ++ } ++#endif /* CONFIG_PPC_PMAC */ ++ + return 0; + } + +@@ -2219,6 +2259,16 @@ static int pci_resume(struct pci_dev *pd + struct fw_ohci *ohci = pci_get_drvdata(pdev); + int err; + ++/* PowerMac resume code comes first */ ++#ifdef CONFIG_PPC_PMAC ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(pdev); ++ ++ if (ofn) ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); ++ } ++#endif /* CONFIG_PPC_PMAC */ ++ + pci_set_power_state(pdev, PCI_D0); + pci_restore_state(pdev); + err = pci_enable_device(pdev); + +-- +Stefan Richter +-=====-==--- --== ----= +http://arcgraph.de/sr/ + + +Mostly copied from ohci1394.c. Necessary for some older Macs, e.g. +PowerBook G3 Pismo and early PowerBook G4 Titanium. + +Signed-off-by: Stefan Richter +--- + +Since my TiBook has a broken FireWire PHY I was only able to test +the byte order of self ID packets but not of the headers of any +other packets. The code in handle_ar_packet() is only guesswork +from ohci1394.c's respective code. Also, I wonder what's up with +isochronous packets... + + drivers/firewire/fw-ohci.c | 29 +++++++++++++++++++++-------- + 1 file changed, 21 insertions(+), 8 deletions(-) + +Index: linux-2.6.25-rc3/drivers/firewire/fw-ohci.c +=================================================================== +--- linux-2.6.25-rc3.orig/drivers/firewire/fw-ohci.c ++++ linux-2.6.25-rc3/drivers/firewire/fw-ohci.c +@@ -179,6 +179,7 @@ struct fw_ohci { + int generation; + int request_generation; + u32 bus_seconds; ++ bool old_uninorth; + + /* + * Spinlock for accessing fw_ohci data. Never call out of +@@ -315,15 +316,22 @@ static int ar_context_add_page(struct ar + return 0; + } + ++#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32) ++#define cond_le32_to_cpu(v) \ ++ (ohci->old_uninorth ? (__force __u32)(v) : le32_to_cpu(v)) ++#else ++#define cond_le32_to_cpu(v) le32_to_cpu(v) ++#endif ++ + static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + { + struct fw_ohci *ohci = ctx->ohci; + struct fw_packet p; + u32 status, length, tcode; + +- p.header[0] = le32_to_cpu(buffer[0]); +- p.header[1] = le32_to_cpu(buffer[1]); +- p.header[2] = le32_to_cpu(buffer[2]); ++ p.header[0] = cond_le32_to_cpu(buffer[0]); ++ p.header[1] = cond_le32_to_cpu(buffer[1]); ++ p.header[2] = cond_le32_to_cpu(buffer[2]); + + tcode = (p.header[0] >> 4) & 0x0f; + switch (tcode) { +@@ -335,7 +343,7 @@ static __le32 *handle_ar_packet(struct a + break; + + case TCODE_READ_BLOCK_REQUEST : +- p.header[3] = le32_to_cpu(buffer[3]); ++ p.header[3] = cond_le32_to_cpu(buffer[3]); + p.header_length = 16; + p.payload_length = 0; + break; +@@ -344,7 +352,7 @@ static __le32 *handle_ar_packet(struct a + case TCODE_READ_BLOCK_RESPONSE: + case TCODE_LOCK_REQUEST: + case TCODE_LOCK_RESPONSE: +- p.header[3] = le32_to_cpu(buffer[3]); ++ p.header[3] = cond_le32_to_cpu(buffer[3]); + p.header_length = 16; + p.payload_length = p.header[3] >> 16; + break; +@@ -361,7 +369,7 @@ static __le32 *handle_ar_packet(struct a + + /* FIXME: What to do about evt_* errors? */ + length = (p.header_length + p.payload_length + 3) / 4; +- status = le32_to_cpu(buffer[length]); ++ status = cond_le32_to_cpu(buffer[length]); + + p.ack = ((status >> 16) & 0x1f) - 16; + p.speed = (status >> 21) & 0x7; +@@ -1026,13 +1034,14 @@ static void bus_reset_tasklet(unsigned l + */ + + self_id_count = (reg_read(ohci, OHCI1394_SelfIDCount) >> 3) & 0x3ff; +- generation = (le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff; ++ generation = (cond_le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff; + rmb(); + + for (i = 1, j = 0; j < self_id_count; i += 2, j++) { + if (ohci->self_id_cpu[i] != ~ohci->self_id_cpu[i + 1]) + fw_error("inconsistent self IDs\n"); +- ohci->self_id_buffer[j] = le32_to_cpu(ohci->self_id_cpu[i]); ++ ohci->self_id_buffer[j] = ++ cond_le32_to_cpu(ohci->self_id_cpu[i]); + } + rmb(); + +@@ -2091,6 +2100,10 @@ pci_probe(struct pci_dev *dev, const str + pci_write_config_dword(dev, OHCI1394_PCI_HCI_Control, 0); + pci_set_drvdata(dev, ohci); + ++#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32) ++ ohci->old_uninorth = dev->vendor == PCI_VENDOR_ID_APPLE && ++ dev->device == PCI_DEVICE_ID_APPLE_UNI_N_FW; ++#endif + spin_lock_init(&ohci->lock); + + tasklet_init(&ohci->bus_reset_tasklet, + +-- +Stefan Richter +-=====-==--- --== ----= +http://arcgraph.de/sr/ + + + +Shut up two "may be used uninitialised in this function" warnings due to +PPC32's implementation of dma_alloc_coherent(). + +Signed-off-by: Stefan Richter +--- + +Wasn't there a macro somewhere for this? + +Also, could this be better done in PPC32's dma_alloc_coherent()? +At least this kind of workaround here doesn't add anything to the +compiled result. + + drivers/firewire/fw-ohci.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: linux-2.6.25-rc3/drivers/firewire/fw-ohci.c +=================================================================== +--- linux-2.6.25-rc3.orig/drivers/firewire/fw-ohci.c ++++ linux-2.6.25-rc3/drivers/firewire/fw-ohci.c +@@ -544,7 +544,7 @@ static int + context_add_buffer(struct context *ctx) + { + struct descriptor_buffer *desc; +- dma_addr_t bus_addr; ++ dma_addr_t bus_addr uninitialized_var(bus_addr); + int offset; + + /* +@@ -1334,7 +1334,7 @@ ohci_set_config_rom(struct fw_card *card + unsigned long flags; + int retval = -EBUSY; + __be32 *next_config_rom; +- dma_addr_t next_config_rom_bus; ++ dma_addr_t next_config_rom_bus = uninitialized_var(next_config_rom_bus); + + ohci = fw_ohci(card); + + +-- +Stefan Richter +-=====-==--- --== ----= +http://arcgraph.de/sr/ + + +This way firewire-ohci can be used for remote debugging like ohci1394. + +Signed-off-by: Stefan Richter +--- + Documentation/debugging-via-ohci1394.txt | 13 ++++++++----- + drivers/firewire/fw-ohci.c | 9 +++++++++ + lib/Kconfig.debug | 10 ++++++++++ + 3 files changed, 27 insertions(+), 5 deletions(-) + +Index: linux/Documentation/debugging-via-ohci1394.txt +=================================================================== +--- linux.orig/Documentation/debugging-via-ohci1394.txt ++++ linux/Documentation/debugging-via-ohci1394.txt +@@ -41,11 +41,14 @@ to a working state and enables physical + This can be turned off by ohci1394's module parameter phys_dma=0. + + The alternative firewire-ohci driver in drivers/firewire uses filtered physical +-DMA, hence is not yet suitable for remote debugging. +- +-Because ohci1394 depends on the PCI enumeration to be completed, an +-initialization routine which runs pretty early (long before console_init() +-which makes the printk buffer appear on the console can be called) was written. ++DMA by default, which is more secure but not suitable for remote debugging. ++Compile the driver with CONFIG_FIREWIRE_OHCI_REMOTE_DMA to get unfiltered ++physical DMA. ++ ++Because ohci1394 and firewire-ohci depend on the PCI enumeration to be ++completed, an initialization routine which runs pretty early has been ++implemented for x86. This routine runs long before console_init() can be ++called, i.e. before the printk buffer appears on the console. + + To activate it, enable CONFIG_PROVIDE_OHCI1394_DMA_INIT (Kernel hacking menu: + Provide code for enabling DMA over FireWire early on boot) and pass the +Index: linux/drivers/firewire/fw-ohci.c +=================================================================== +--- linux.orig/drivers/firewire/fw-ohci.c ++++ linux/drivers/firewire/fw-ohci.c +@@ -1091,6 +1091,11 @@ static void bus_reset_tasklet(unsigned l + reg_write(ohci, OHCI1394_ConfigROMhdr, ohci->next_header); + } + ++#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA ++ reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0); ++ reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0); ++#endif ++ + spin_unlock_irqrestore(&ohci->lock, flags); + + if (free_rom) +@@ -1429,6 +1434,9 @@ static int ohci_cancel_packet(struct fw_ + static int + ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation) + { ++#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA ++ return 0; ++#else + struct fw_ohci *ohci = fw_ohci(card); + unsigned long flags; + int n, retval = 0; +@@ -1460,6 +1468,7 @@ ohci_enable_phys_dma(struct fw_card *car + out: + spin_unlock_irqrestore(&ohci->lock, flags); + return retval; ++#endif /* CONFIG_FIREWIRE_OHCI_REMOTE_DMA */ + } + + static u64 +Index: linux/lib/Kconfig.debug +=================================================================== +--- linux.orig/lib/Kconfig.debug ++++ linux/lib/Kconfig.debug +@@ -592,6 +592,16 @@ config LATENCYTOP + Enable this option if you want to use the LatencyTOP tool + to find out which userspace is blocking on what kernel operations. + ++config FIREWIRE_OHCI_REMOTE_DMA ++ bool "Remote debugging via firewire-ohci" ++ depends on FIREWIRE_OHCI ++ help ++ This option lets you use the FireWire bus for remote debugging. ++ It enables unfiltered remote DMA in the firewire-ohci driver. ++ See Documentation/debugging-via-ohci1394.txt for more information. ++ ++ If unsure, say N. ++ + config PROVIDE_OHCI1394_DMA_INIT + bool "Provide code for enabling DMA over FireWire early on boot" + depends on PCI && X86 + +-- +Stefan Richter +-=====-==--- --=- ===-- +http://arcgraph.de/sr/ + + From fedora-extras-commits at redhat.com Sun Mar 2 05:53:22 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Sun, 2 Mar 2008 05:53:22 GMT Subject: rpms/qosmic/devel qosmic-1.3-qosmic.cpp.patch, NONE, 1.1 qosmic-1.3-qosmic.pro.patch, 1.1, 1.2 qosmic.desktop, 1.1, 1.2 qosmic.spec, 1.3, 1.4 Message-ID: <200803020553.m225rMbc003826@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/qosmic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3791/devel Modified Files: qosmic-1.3-qosmic.pro.patch qosmic.desktop qosmic.spec Added Files: qosmic-1.3-qosmic.cpp.patch Log Message: update to 1.3-2 qosmic-1.3-qosmic.cpp.patch: --- NEW FILE qosmic-1.3-qosmic.cpp.patch --- diff -up qosmic/src/qosmic.cpp.orig qosmic/src/qosmic.cpp --- qosmic/src/qosmic.cpp.orig 2008-03-01 23:33:32.000000000 -0600 +++ qosmic/src/qosmic.cpp 2008-03-01 23:36:32.000000000 -0600 @@ -35,6 +35,8 @@ int main(int argc, char* argv[]) if (QFileInfo(palettes).exists()) setenv("flam3_palettes", palettes.toAscii().data(), 0); + else if (QFileInfo("/usr/share/flam3/flam3-palettes.xml").exists()) + setenv("flam3_palettes","/usr/share/flam3/flam3-palettes.xml", 0); else if (QFileInfo("./flam3-palettes.xml").exists()) setenv("flam3_palettes","./flam3-palettes.xml", 0); else if (QFileInfo("./flam3/flam3-palettes.xml").exists()) @@ -43,6 +45,7 @@ int main(int argc, char* argv[]) { cout << "Error: No palettes file found in\n\n" << palettes << "\n" << + "/usr/share/flam3/flam3-palettes.xml\n" << "./flam3-palettes.xml\n" << "./flam3/flam3-palettes.xml\n" << getenv("flam3_palettes") << "\n\n" << qosmic-1.3-qosmic.pro.patch: Index: qosmic-1.3-qosmic.pro.patch =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/devel/qosmic-1.3-qosmic.pro.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qosmic-1.3-qosmic.pro.patch 19 Feb 2008 05:07:03 -0000 1.1 +++ qosmic-1.3-qosmic.pro.patch 2 Mar 2008 05:53:18 -0000 1.2 @@ -1,8 +1,10 @@ diff -up qosmic/qosmic.pro.orig qosmic/qosmic.pro --- qosmic/qosmic.pro.orig 2008-02-18 22:18:44.000000000 -0600 -+++ qosmic/qosmic.pro 2008-02-18 22:20:44.000000000 -0600 -@@ -2,18 +2,18 @@ - PREFIX = /usr/local ++++ qosmic/qosmic.pro 2008-03-01 23:04:23.000000000 -0600 +@@ -1,19 +1,19 @@ + # installation prefix on *nix/osx +-PREFIX = /usr/local ++PREFIX = /usr # Most people need not muck about below here -!contains(QT_MAJOR_VERSION, 4){ Index: qosmic.desktop =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/devel/qosmic.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qosmic.desktop 9 Feb 2008 20:50:11 -0000 1.1 +++ qosmic.desktop 2 Mar 2008 05:53:18 -0000 1.2 @@ -7,4 +7,4 @@ Icon=qosmic Terminal=false Type=Application -Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Qt +Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Qt; Index: qosmic.spec =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/devel/qosmic.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qosmic.spec 19 Feb 2008 05:07:03 -0000 1.3 +++ qosmic.spec 2 Mar 2008 05:53:18 -0000 1.4 @@ -1,6 +1,6 @@ Name: qosmic Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A cosmic recursive fractal flame editor written in Qt4 Group: Applications/Multimedia @@ -10,7 +10,7 @@ Source1: http://students.washington.edu/bitsed/qosmic/images/icon.jpg Source2: qosmic.desktop Patch0: qosmic-1.3-qosmic.pro.patch -#Patch1: qosmic-1.2-qosmic.cpp.patch +Patch1: qosmic-1.3-qosmic.cpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flam3-devel @@ -26,8 +26,8 @@ %prep %setup -q -n qosmic -%patch0 -p1 -b qosmic.pro -#%patch1 -p1 -b qosmic.cpp +%patch0 -p1 -b .qosmic_pro +%patch1 -p1 -b .qosmic_cpp %build @@ -63,6 +63,11 @@ %changelog +* Sat Mar 01 2008 Ian Weller 1.3-2 +- Once again qosmic failed to start because it couldn't find the palettes, + hopefully fixed for good this time +- Made a small change to qosmic.desktop + * Mon Feb 18 2008 Ian Weller 1.3-1 - Updated upstream From fedora-extras-commits at redhat.com Sun Mar 2 05:54:16 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Sun, 2 Mar 2008 05:54:16 GMT Subject: rpms/kernel/devel linux-2.6-firewire-git-pending.patch,1.9,1.10 Message-ID: <200803020554.m225sGUI003922@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3896 Modified Files: linux-2.6-firewire-git-pending.patch Log Message: oops, screwed up manual update of patch... linux-2.6-firewire-git-pending.patch: Index: linux-2.6-firewire-git-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6-firewire-git-pending.patch 2 Mar 2008 05:08:48 -0000 1.9 +++ linux-2.6-firewire-git-pending.patch 2 Mar 2008 05:54:10 -0000 1.10 @@ -1607,7 +1607,7 @@ { struct descriptor_buffer *desc; - dma_addr_t bus_addr; -+ dma_addr_t bus_addr uninitialized_var(bus_addr); ++ dma_addr_t uninitialized_var(bus_addr); int offset; /* @@ -1616,7 +1616,7 @@ int retval = -EBUSY; __be32 *next_config_rom; - dma_addr_t next_config_rom_bus; -+ dma_addr_t next_config_rom_bus = uninitialized_var(next_config_rom_bus); ++ dma_addr_t uninitialized_var(next_config_rom_bus); ohci = fw_ohci(card); From fedora-extras-commits at redhat.com Sun Mar 2 05:54:57 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Sun, 2 Mar 2008 05:54:57 GMT Subject: rpms/qosmic/F-8 qosmic-1.3-qosmic.cpp.patch, NONE, 1.1 qosmic-1.3-qosmic.pro.patch, 1.1, 1.2 qosmic.desktop, 1.1, 1.2 qosmic.spec, 1.3, 1.4 Message-ID: <200803020554.m225svQN004024@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/qosmic/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3989/F-8 Modified Files: qosmic-1.3-qosmic.pro.patch qosmic.desktop qosmic.spec Added Files: qosmic-1.3-qosmic.cpp.patch Log Message: update to 1.3-2 qosmic-1.3-qosmic.cpp.patch: --- NEW FILE qosmic-1.3-qosmic.cpp.patch --- diff -up qosmic/src/qosmic.cpp.orig qosmic/src/qosmic.cpp --- qosmic/src/qosmic.cpp.orig 2008-03-01 23:33:32.000000000 -0600 +++ qosmic/src/qosmic.cpp 2008-03-01 23:36:32.000000000 -0600 @@ -35,6 +35,8 @@ int main(int argc, char* argv[]) if (QFileInfo(palettes).exists()) setenv("flam3_palettes", palettes.toAscii().data(), 0); + else if (QFileInfo("/usr/share/flam3/flam3-palettes.xml").exists()) + setenv("flam3_palettes","/usr/share/flam3/flam3-palettes.xml", 0); else if (QFileInfo("./flam3-palettes.xml").exists()) setenv("flam3_palettes","./flam3-palettes.xml", 0); else if (QFileInfo("./flam3/flam3-palettes.xml").exists()) @@ -43,6 +45,7 @@ int main(int argc, char* argv[]) { cout << "Error: No palettes file found in\n\n" << palettes << "\n" << + "/usr/share/flam3/flam3-palettes.xml\n" << "./flam3-palettes.xml\n" << "./flam3/flam3-palettes.xml\n" << getenv("flam3_palettes") << "\n\n" << qosmic-1.3-qosmic.pro.patch: Index: qosmic-1.3-qosmic.pro.patch =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-8/qosmic-1.3-qosmic.pro.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qosmic-1.3-qosmic.pro.patch 19 Feb 2008 05:13:16 -0000 1.1 +++ qosmic-1.3-qosmic.pro.patch 2 Mar 2008 05:54:51 -0000 1.2 @@ -1,8 +1,10 @@ diff -up qosmic/qosmic.pro.orig qosmic/qosmic.pro --- qosmic/qosmic.pro.orig 2008-02-18 22:18:44.000000000 -0600 -+++ qosmic/qosmic.pro 2008-02-18 22:20:44.000000000 -0600 -@@ -2,18 +2,18 @@ - PREFIX = /usr/local ++++ qosmic/qosmic.pro 2008-03-01 23:04:23.000000000 -0600 +@@ -1,19 +1,19 @@ + # installation prefix on *nix/osx +-PREFIX = /usr/local ++PREFIX = /usr # Most people need not muck about below here -!contains(QT_MAJOR_VERSION, 4){ Index: qosmic.desktop =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-8/qosmic.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qosmic.desktop 9 Feb 2008 23:30:29 -0000 1.1 +++ qosmic.desktop 2 Mar 2008 05:54:51 -0000 1.2 @@ -7,4 +7,4 @@ Icon=qosmic Terminal=false Type=Application -Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Qt +Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Qt; Index: qosmic.spec =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-8/qosmic.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qosmic.spec 19 Feb 2008 05:13:16 -0000 1.3 +++ qosmic.spec 2 Mar 2008 05:54:51 -0000 1.4 @@ -1,6 +1,6 @@ Name: qosmic Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A cosmic recursive fractal flame editor written in Qt4 Group: Applications/Multimedia @@ -10,7 +10,7 @@ Source1: http://students.washington.edu/bitsed/qosmic/images/icon.jpg Source2: qosmic.desktop Patch0: qosmic-1.3-qosmic.pro.patch -#Patch1: qosmic-1.2-qosmic.cpp.patch +Patch1: qosmic-1.3-qosmic.cpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flam3-devel @@ -26,8 +26,8 @@ %prep %setup -q -n qosmic -%patch0 -p1 -b qosmic.pro -#%patch1 -p1 -b qosmic.cpp +%patch0 -p1 -b .qosmic_pro +%patch1 -p1 -b .qosmic_cpp %build @@ -63,6 +63,11 @@ %changelog +* Sat Mar 01 2008 Ian Weller 1.3-2 +- Once again qosmic failed to start because it couldn't find the palettes, + hopefully fixed for good this time +- Made a small change to qosmic.desktop + * Mon Feb 18 2008 Ian Weller 1.3-1 - Updated upstream From fedora-extras-commits at redhat.com Sun Mar 2 05:56:17 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Sun, 2 Mar 2008 05:56:17 GMT Subject: rpms/qosmic/F-7 qosmic-1.3-qosmic.cpp.patch, NONE, 1.1 qosmic-1.3-qosmic.pro.patch, 1.1, 1.2 qosmic.desktop, 1.1, 1.2 qosmic.spec, 1.3, 1.4 Message-ID: <200803020556.m225uHHN004159@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/qosmic/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4126/F-7 Modified Files: qosmic-1.3-qosmic.pro.patch qosmic.desktop qosmic.spec Added Files: qosmic-1.3-qosmic.cpp.patch Log Message: update to 1.3-2 qosmic-1.3-qosmic.cpp.patch: --- NEW FILE qosmic-1.3-qosmic.cpp.patch --- diff -up qosmic/src/qosmic.cpp.orig qosmic/src/qosmic.cpp --- qosmic/src/qosmic.cpp.orig 2008-03-01 23:33:32.000000000 -0600 +++ qosmic/src/qosmic.cpp 2008-03-01 23:36:32.000000000 -0600 @@ -35,6 +35,8 @@ int main(int argc, char* argv[]) if (QFileInfo(palettes).exists()) setenv("flam3_palettes", palettes.toAscii().data(), 0); + else if (QFileInfo("/usr/share/flam3/flam3-palettes.xml").exists()) + setenv("flam3_palettes","/usr/share/flam3/flam3-palettes.xml", 0); else if (QFileInfo("./flam3-palettes.xml").exists()) setenv("flam3_palettes","./flam3-palettes.xml", 0); else if (QFileInfo("./flam3/flam3-palettes.xml").exists()) @@ -43,6 +45,7 @@ int main(int argc, char* argv[]) { cout << "Error: No palettes file found in\n\n" << palettes << "\n" << + "/usr/share/flam3/flam3-palettes.xml\n" << "./flam3-palettes.xml\n" << "./flam3/flam3-palettes.xml\n" << getenv("flam3_palettes") << "\n\n" << qosmic-1.3-qosmic.pro.patch: Index: qosmic-1.3-qosmic.pro.patch =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-7/qosmic-1.3-qosmic.pro.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qosmic-1.3-qosmic.pro.patch 19 Feb 2008 05:15:47 -0000 1.1 +++ qosmic-1.3-qosmic.pro.patch 2 Mar 2008 05:56:10 -0000 1.2 @@ -1,8 +1,10 @@ diff -up qosmic/qosmic.pro.orig qosmic/qosmic.pro --- qosmic/qosmic.pro.orig 2008-02-18 22:18:44.000000000 -0600 -+++ qosmic/qosmic.pro 2008-02-18 22:20:44.000000000 -0600 -@@ -2,18 +2,18 @@ - PREFIX = /usr/local ++++ qosmic/qosmic.pro 2008-03-01 23:04:23.000000000 -0600 +@@ -1,19 +1,19 @@ + # installation prefix on *nix/osx +-PREFIX = /usr/local ++PREFIX = /usr # Most people need not muck about below here -!contains(QT_MAJOR_VERSION, 4){ Index: qosmic.desktop =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-7/qosmic.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qosmic.desktop 9 Feb 2008 23:32:58 -0000 1.1 +++ qosmic.desktop 2 Mar 2008 05:56:10 -0000 1.2 @@ -7,4 +7,4 @@ Icon=qosmic Terminal=false Type=Application -Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Qt +Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Qt; Index: qosmic.spec =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-7/qosmic.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qosmic.spec 19 Feb 2008 05:15:47 -0000 1.3 +++ qosmic.spec 2 Mar 2008 05:56:10 -0000 1.4 @@ -1,6 +1,6 @@ Name: qosmic Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A cosmic recursive fractal flame editor written in Qt4 Group: Applications/Multimedia @@ -10,7 +10,7 @@ Source1: http://students.washington.edu/bitsed/qosmic/images/icon.jpg Source2: qosmic.desktop Patch0: qosmic-1.3-qosmic.pro.patch -#Patch1: qosmic-1.2-qosmic.cpp.patch +Patch1: qosmic-1.3-qosmic.cpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flam3-devel @@ -26,8 +26,8 @@ %prep %setup -q -n qosmic -%patch0 -p1 -b qosmic.pro -#%patch1 -p1 -b qosmic.cpp +%patch0 -p1 -b .qosmic_pro +%patch1 -p1 -b .qosmic_cpp %build @@ -63,6 +63,11 @@ %changelog +* Sat Mar 01 2008 Ian Weller 1.3-2 +- Once again qosmic failed to start because it couldn't find the palettes, + hopefully fixed for good this time +- Made a small change to qosmic.desktop + * Mon Feb 18 2008 Ian Weller 1.3-1 - Updated upstream From fedora-extras-commits at redhat.com Sun Mar 2 08:10:24 2008 From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai)) Date: Sun, 2 Mar 2008 08:10:24 GMT Subject: rpms/sepostgresql/devel sepostgresql-pgace-8.3.0-2.patch, 1.2, 1.3 sepostgresql-sepgsql-8.3.0-2.patch, 1.1, 1.2 sepostgresql.init, 1.15, 1.16 sepostgresql.spec, 1.16, 1.17 sepostgresql.te, 1.15, 1.16 Message-ID: <200803020810.m228AOoG026724@cvs-int.fedora.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/sepostgresql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26689 Modified Files: sepostgresql-pgace-8.3.0-2.patch sepostgresql-sepgsql-8.3.0-2.patch sepostgresql.init sepostgresql.spec sepostgresql.te Log Message: - BUGFIX: CREATE TABLE statement with explicit labeled columns - BUGFIX: SELECT count(*) does not filter unallowed tuples sepostgresql-pgace-8.3.0-2.patch: Index: sepostgresql-pgace-8.3.0-2.patch =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-pgace-8.3.0-2.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sepostgresql-pgace-8.3.0-2.patch 26 Feb 2008 08:04:10 -0000 1.2 +++ sepostgresql-pgace-8.3.0-2.patch 2 Mar 2008 08:10:12 -0000 1.3 @@ -1394,7 +1394,7 @@ */ diff -rpNU3 base/src/backend/nodes/copyfuncs.c pgace/src/backend/nodes/copyfuncs.c --- base/src/backend/nodes/copyfuncs.c 2008-01-07 23:51:33.000000000 +0900 -+++ pgace/src/backend/nodes/copyfuncs.c 2008-02-22 14:17:11.000000000 +0900 ++++ pgace/src/backend/nodes/copyfuncs.c 2008-03-02 12:21:10.000000000 +0900 @@ -24,6 +24,7 @@ #include "nodes/plannodes.h" @@ -1411,7 +1411,15 @@ return newnode; } -@@ -1869,6 +1871,7 @@ _copyQuery(Query *from) +@@ -1789,6 +1791,7 @@ _copyColumnDef(ColumnDef *from) + COPY_NODE_FIELD(raw_default); + COPY_STRING_FIELD(cooked_default); + COPY_NODE_FIELD(constraints); ++ COPY_NODE_FIELD(pgaceItem); + + return newnode; + } +@@ -1869,6 +1872,7 @@ _copyQuery(Query *from) COPY_NODE_FIELD(limitCount); COPY_NODE_FIELD(rowMarks); COPY_NODE_FIELD(setOperations); @@ -1419,7 +1427,7 @@ return newnode; } -@@ -2105,6 +2108,7 @@ _copyCreateStmt(CreateStmt *from) +@@ -2105,6 +2109,7 @@ _copyCreateStmt(CreateStmt *from) COPY_NODE_FIELD(options); COPY_SCALAR_FIELD(oncommit); COPY_STRING_FIELD(tablespacename); @@ -1427,7 +1435,7 @@ return newnode; } -@@ -3570,6 +3574,10 @@ copyObject(void *from) +@@ -3570,6 +3575,10 @@ copyObject(void *from) break; default: sepostgresql-sepgsql-8.3.0-2.patch: Index: sepostgresql-sepgsql-8.3.0-2.patch =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-sepgsql-8.3.0-2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sepostgresql-sepgsql-8.3.0-2.patch 7 Feb 2008 01:26:25 -0000 1.1 +++ sepostgresql-sepgsql-8.3.0-2.patch 2 Mar 2008 08:10:12 -0000 1.2 @@ -2829,8 +2829,8 @@ +} diff -rpNU3 pgace/src/backend/security/sepgsql/proxy.c sepgsql/src/backend/security/sepgsql/proxy.c --- pgace/src/backend/security/sepgsql/proxy.c 1970-01-01 09:00:00.000000000 +0900 -+++ sepgsql/src/backend/security/sepgsql/proxy.c 2008-02-04 17:40:05.000000000 +0900 -@@ -0,0 +1,1574 @@ ++++ sepgsql/src/backend/security/sepgsql/proxy.c 2008-03-02 17:00:56.000000000 +0900 +@@ -0,0 +1,1606 @@ +/* + * src/backend/security/sepgsqlProxy.c + * SE-PostgreSQL Query Proxy function to walk on query node tree @@ -3231,6 +3231,34 @@ + return selist; +} + ++static List *walkAggrefHelper(List *selist, Query *query, Node *node) ++{ ++ if (node == NULL) ++ return selist; ++ ++ if (IsA(node, RangeTblRef)) { ++ RangeTblRef *rtr = (RangeTblRef *) node; ++ RangeTblEntry *rte = rt_fetch(rtr->rtindex, query->rtable); ++ ++ if (rte->rtekind == RTE_RELATION) ++ selist = addEvalPgAttribute(selist, rte, 0, DB_COLUMN__SELECT); ++ } else if (IsA(node, JoinExpr)) { ++ JoinExpr *j = (JoinExpr *) node; ++ ++ selist = walkAggrefHelper(selist, query, j->larg); ++ selist = walkAggrefHelper(selist, query, j->rarg); ++ } else if (IsA(node, FromExpr)) { ++ FromExpr *fm = (FromExpr *)node; ++ ListCell *l; ++ ++ foreach (l, fm->fromlist) ++ selist = walkAggrefHelper(selist, query, lfirst(l)); ++ } else { ++ elog(ERROR, "SELinux: unexpected node type (%d) at Query->fromlist", nodeTag(node)); ++ } ++ return selist; ++} ++ +static List *sepgsqlWalkExpr(List *selist, queryChain *qc, Node *node, int flags) +{ + if (node == NULL) @@ -3268,6 +3296,10 @@ + + selist = addEvalPgProc(selist, aggref->aggfnoid, DB_PROCEDURE__EXECUTE); + selist = sepgsqlWalkExpr(selist, qc, (Node *) aggref->args, flags); ++ if (aggref->aggstar) { ++ Query *query = getQueryFromChain(qc); ++ selist = walkAggrefHelper(selist, query, (Node *) query->jointree); ++ } + break; + } + case T_OpExpr: Index: sepostgresql.init =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sepostgresql.init 27 Feb 2008 09:49:39 -0000 1.15 +++ sepostgresql.init 2 Mar 2008 08:10:12 -0000 1.16 @@ -9,7 +9,7 @@ PGVERSION="8.3.0" PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'` -SEPGVERSION="2.117" +SEPGVERSION="2.121" # source function library . /etc/rc.d/init.d/functions Index: sepostgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sepostgresql.spec 27 Feb 2008 09:49:39 -0000 1.16 +++ sepostgresql.spec 2 Mar 2008 08:10:12 -0000 1.17 @@ -13,7 +13,7 @@ Summary: Security Enhanced PostgreSQL Name: sepostgresql Version: 8.3.0 -Release: 2.117%{?sepgsql_extension}%{?dist} +Release: 2.121%{?sepgsql_extension}%{?dist} License: BSD Group: Applications/Databases Url: http://code.google.com/p/sepgsql/ @@ -211,6 +211,10 @@ %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups %changelog +* Sun Mar 2 2008 - sepostgresql-8.3.0-2.120 +- BUGFIX: CREATE TABLE statement with explicit labeled columns +- BUGFIX: SELECT count(*) does not filter unallowed tuples + * Wed Feb 27 2008 - sepostgresql-8.3.0-2.117 - ".beta" removed. Index: sepostgresql.te =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.te,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sepostgresql.te 27 Feb 2008 09:49:39 -0000 1.15 +++ sepostgresql.te 2 Mar 2008 08:10:12 -0000 1.16 @@ -1,4 +1,4 @@ -policy_module(sepostgresql, 2.117) +policy_module(sepostgresql, 2.121) gen_require(` all_userspace_class_perms From fedora-extras-commits at redhat.com Sun Mar 2 09:07:37 2008 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 2 Mar 2008 09:07:37 GMT Subject: rpms/gds2pov/devel .cvsignore, 1.3, 1.4 gds2pov.spec, 1.3, 1.4 sources, 1.3, 1.4 gdsto3d-20070815-lib64.patch, 1.1, NONE Message-ID: <200803020907.m2297bAV005407@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/pkgs/rpms/gds2pov/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5261/devel Modified Files: .cvsignore gds2pov.spec sources Removed Files: gdsto3d-20070815-lib64.patch Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gds2pov/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Aug 2007 00:43:40 -0000 1.3 +++ .cvsignore 2 Mar 2008 09:06:55 -0000 1.4 @@ -1 +1 @@ -gdsto3d-20070815.tar.bz2 +gdsto3d-20080229.tar.bz2 Index: gds2pov.spec =================================================================== RCS file: /cvs/pkgs/rpms/gds2pov/devel/gds2pov.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gds2pov.spec 18 Feb 2008 22:39:35 -0000 1.3 +++ gds2pov.spec 2 Mar 2008 09:06:55 -0000 1.4 @@ -1,13 +1,12 @@ Name: gds2pov -Version: 0.20070815 -Release: 2%{?dist} +Version: 0.20080229 +Release: 1%{?dist} Summary: GDS2 layout file to POV-Ray conversion Group: Applications/Engineering License: GPLv2 URL: http://www.atchoo.org/gds2pov/ -Source0: http://www.atchoo.org/gds2pov/files/gdsto3d-20070815.tar.bz2 -Patch0: gdsto3d-20070815-lib64.patch +Source0: http://www.atchoo.org/gds2pov/files/gdsto3d-20080229.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,8 +33,7 @@ %prep -%setup -q -n gdsto3d-20070815 -%patch0 -p0 -b .64 +%setup -q -n gdsto3d-20080229 %build cd build @@ -76,6 +74,12 @@ %changelog +* Mon Feb 18 2008 Fedora Release Engineering - 0.20080229-1 +- New upstream release +- Numerous fixes for compiling with gcc 4.3 +- Minor fix for building on multilib Linux x86_64 machines +- New feature - automatic generation of a skeleton process file based on an input gds2 file. + * Mon Feb 18 2008 Fedora Release Engineering - 0.20070815-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gds2pov/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Aug 2007 00:43:40 -0000 1.3 +++ sources 2 Mar 2008 09:06:55 -0000 1.4 @@ -1 +1 @@ -db78a8f519d68b43ffec824b38e10390 gdsto3d-20070815.tar.bz2 +b7c6b7313bf3810a8dd15c302241e987 gdsto3d-20080229.tar.bz2 --- gdsto3d-20070815-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 09:29:57 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 2 Mar 2008 09:29:57 GMT Subject: rpms/WebKit/devel WebKit.spec,1.4,1.5 Message-ID: <200803020929.m229TvU7009104@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8979 Modified Files: WebKit.spec Log Message: Fix bugs 435561 (case-sensitive header filename mismatch) and 433138 (gtk-devel subpackage should not depend on qt4-devel). Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- WebKit.spec 1 Mar 2008 08:07:18 -0000 1.4 +++ WebKit.spec 2 Mar 2008 09:29:19 -0000 1.5 @@ -7,7 +7,7 @@ Name: WebKit Version: 1.0.0 -Release: 0.5.svn%{svn_revision}%{?dist} +Release: 0.6.svn%{svn_revision}%{?dist} Summary: Web content engine library Group: Development/Libraries @@ -50,8 +50,6 @@ Requires: %{name}-gtk = %{version}-%{release} Requires: pkgconfig Requires: gtk2-devel -## Uses qmake, so needs the Qt4 development stuff too. -Requires: qt4-devel %description gtk-devel The %{name}-gtk-devel package contains libraries, build data, and header @@ -117,7 +115,7 @@ VERSION=%{version} \ CONFIG-=qt \ CONFIG+=gtk-port \ - WEBKIT_INC_DIR=%{_includedir}/WebKit \ + WEBKIT_INC_DIR=%{_includedir}/webkit \ WEBKIT_LIB_DIR=%{_libdir} \ ../WebKit.pro make %{?_smp_mflags} @@ -136,7 +134,6 @@ VERSION=%{version} \ CONFIG-=gtk \ CONFIG+=qt-port \ - WEBKIT_INC_DIR=%{_includedir}/WebKit \ WEBKIT_LIB_DIR=%{_libdir} \ ../WebKit.pro make %{?_smp_mflags} @@ -206,8 +203,10 @@ %files gtk-devel %defattr(-,root,root,-) -%{_includedir}/WebKit -%{_libdir}/libWebKitGtk.prl +## The .prl file stores information only on how the library was built, and is +## not needed for linking. +%exclude %{_libdir}/libWebKitGtk.prl +%{_includedir}/webkit %{_libdir}/libWebKitGtk.so %{_libdir}/pkgconfig/WebKitGtk.pc @@ -232,6 +231,12 @@ %changelog +* Sat Mar 01 2008 Peter Gordon 1.0.0-0.6.svn30667 +- Fix include directory naming. Resolves: bug 435561 (Header file <> header + file location mismatch) +- Remove qt4-devel runtime dependency and .prl file from WebKit-gtk-devel. + Resolves: bug 433138 (WebKit-gtk-devel has a requirement on qt4-devel) + * Fri Feb 29 2008 Peter Gordon 1.0.0-0.5.svn30667 - Update to new upstream snapshot (SVN 30667) - Add some build fixes for GCC 4.3: From fedora-extras-commits at redhat.com Sun Mar 2 10:21:00 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Sun, 2 Mar 2008 10:21:00 GMT Subject: rpms/bmpx/F-8 bmpx.spec,1.4,1.5 Message-ID: <200803021021.m22AL0oI017527@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/bmpx/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17465/F-8 Modified Files: bmpx.spec Log Message: * updated homepage url Index: bmpx.spec =================================================================== RCS file: /cvs/pkgs/rpms/bmpx/F-8/bmpx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bmpx.spec 18 Feb 2008 17:47:27 -0000 1.4 +++ bmpx.spec 2 Mar 2008 10:20:23 -0000 1.5 @@ -1,11 +1,11 @@ Summary: Beep Media Player eXperimental Name: bmpx Version: 0.40.13 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: Applications/Multimedia -URL: http://www.beep-media-player.org/ +URL: http://bmpx.backtrace.info/ Source: http://files.beep-media-player.org/releases/0.40/%{name}-%{version}.tar.bz2 Patch0: bmpx-constcastfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -168,6 +168,9 @@ %changelog +* Sun Mar 2 2008 Alexander Kahl - 0.40.13-8 +- updated homepage url + * Mon Feb 18 2008 Alexander Kahl - 0.40.13-7 - bump for firefox 2.0.0.12 From fedora-extras-commits at redhat.com Sun Mar 2 10:21:06 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Sun, 2 Mar 2008 10:21:06 GMT Subject: rpms/bmpx/devel bmpx.spec,1.7,1.8 Message-ID: <200803021021.m22AL6ct017530@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/bmpx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17465/devel Modified Files: bmpx.spec Log Message: * updated homepage url Index: bmpx.spec =================================================================== RCS file: /cvs/pkgs/rpms/bmpx/devel/bmpx.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bmpx.spec 1 Mar 2008 21:36:52 -0000 1.7 +++ bmpx.spec 2 Mar 2008 10:20:30 -0000 1.8 @@ -1,11 +1,11 @@ Summary: Beep Media Player eXperimental Name: bmpx Version: 0.40.13 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: Applications/Multimedia -URL: http://www.beep-media-player.org/ +URL: http://bmpx.backtrace.info/ Source: http://files.beep-media-player.org/releases/0.40/%{name}-%{version}.tar.bz2 Patch0: bmpx-constcastfix.patch Patch1: bmpx-libsoup24.patch @@ -25,6 +25,7 @@ BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel # Disabled for now, needs investigation +# http://bugs.backtrace.info/view.php?id=501 # BuildRequires: hal-devel BuildRequires: taglib-devel BuildRequires: libsidplay-devel @@ -176,6 +177,9 @@ %changelog +* Sun Mar 2 2008 Alexander Kahl - 0.40.13-11 +- updated homepage url + * Sat Mar 1 2008 Alexander Kahl - 0.40.13-10 - patch for missing explicit gcc 4.3 cstring/string.h include From fedora-extras-commits at redhat.com Sun Mar 2 10:43:49 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sun, 2 Mar 2008 10:43:49 GMT Subject: rpms/ocaml-pxp/F-8 ocaml-pxp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803021043.m22AhnoC017893@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pxp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17865/F-8 Modified Files: .cvsignore sources Added Files: ocaml-pxp.spec Log Message: Initial import. --- NEW FILE ocaml-pxp.spec --- %define debug_package %{nil} Name: ocaml-pxp Version: 1.2.0test1 Release: 5%{?dist} Summary: Validating XML parser Group: Development/Libraries License: BSD URL: http://www.ocaml-programming.de/packages/ Source0: http://www.ocaml-programming.de/packages/pxp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamlnet-devel BuildRequires: ocaml-ulex-devel BuildRequires: ocaml-pcre-devel, pcre-devel BuildRequires: ocaml-camlp4-devel %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Outcometree -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description pxp: The polymorphic XML parser, a validating XML-1.0 parser including a DOM-like model for the XML tree representation %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n pxp-%{version} ./configure \ -without-wlex \ -without-wlex-compat \ -lexlist all \ -without-pp # NB. Temporarily disabled the preprocessor extension # because it requires camlp5. %build make all make opt %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR make install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/pxp-engine/*.cma %{_libdir}/ocaml/pxp-engine/*.cmi %{_libdir}/ocaml/pxp-engine/*.cmo %{_libdir}/ocaml/pxp-lex-*/*.cma %{_libdir}/ocaml/pxp-lex-*/*.cmi %{_libdir}/ocaml/pxp-lex-*/*.cmo %{_libdir}/ocaml/pxp-ulex-utf8/*.cma %{_libdir}/ocaml/pxp-ulex-utf8/*.cmi %{_libdir}/ocaml/pxp-ulex-utf8/*.cmo #%{_libdir}/ocaml/pxp-pp/pxp_pp.cma %files devel %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/pxp-engine/META %{_libdir}/ocaml/pxp-engine/*.a %{_libdir}/ocaml/pxp-engine/*.cmxa %{_libdir}/ocaml/pxp-engine/*.mli %{_libdir}/ocaml/pxp-lex-*/META %{_libdir}/ocaml/pxp-lex-*/*.a %{_libdir}/ocaml/pxp-lex-*/*.cmxa %{_libdir}/ocaml/pxp-lex-*/*.cmx %{_libdir}/ocaml/pxp-lex-*/*.o %{_libdir}/ocaml/pxp-ulex-utf8/META %{_libdir}/ocaml/pxp-ulex-utf8/*.a %{_libdir}/ocaml/pxp-ulex-utf8/*.cmxa %{_libdir}/ocaml/pxp-ulex-utf8/*.cmx %{_libdir}/ocaml/pxp-ulex-utf8/*.o #%{_libdir}/ocaml/pxp-pp/META %{_libdir}/ocaml/pxp/META %changelog * Fri Feb 15 2008 Richard W.M. Jones - 1.2.0test1-5 - Added BR ocaml-camlp4-devel * Tue Feb 12 2008 Richard W.M. Jones - 1.2.0test1-4 - Added BR ocaml-pcre-devel, pcre-devel * Thu Sep 13 2007 Richard W.M. Jones - 1.2.0test1-3 - ExcludeArch ppc64 * Thu Sep 13 2007 Richard W.M. Jones - 1.2.0test1-2 - Build on OCaml 3.10 - Disable building the preprocessor (requires old camlp4 or camlp5). - License is BSD. - Ignore Parsetree. * Sat May 26 2007 Richard W.M. Jones - 1.2.0test1-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pxp/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2008 02:40:16 -0000 1.1 +++ .cvsignore 2 Mar 2008 10:43:13 -0000 1.2 @@ -0,0 +1 @@ +pxp-1.2.0test1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pxp/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 02:40:16 -0000 1.1 +++ sources 2 Mar 2008 10:43:13 -0000 1.2 @@ -0,0 +1 @@ +ede21215d7c3f988e8f5951746e90e26 pxp-1.2.0test1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 10:46:07 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sun, 2 Mar 2008 10:46:07 GMT Subject: rpms/ocaml-pxp/devel ocaml-pxp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803021046.m22Ak7SJ018013@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pxp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982/devel Modified Files: .cvsignore sources Added Files: ocaml-pxp.spec Log Message: Initial import. --- NEW FILE ocaml-pxp.spec --- %define debug_package %{nil} Name: ocaml-pxp Version: 1.2.0test1 Release: 5%{?dist} Summary: Validating XML parser Group: Development/Libraries License: BSD URL: http://www.ocaml-programming.de/packages/ Source0: http://www.ocaml-programming.de/packages/pxp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamlnet-devel BuildRequires: ocaml-ulex-devel BuildRequires: ocaml-pcre-devel, pcre-devel BuildRequires: ocaml-camlp4-devel %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Outcometree -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description pxp: The polymorphic XML parser, a validating XML-1.0 parser including a DOM-like model for the XML tree representation %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n pxp-%{version} ./configure \ -without-wlex \ -without-wlex-compat \ -lexlist all \ -without-pp # NB. Temporarily disabled the preprocessor extension # because it requires camlp5. %build make all make opt %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR make install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/pxp-engine/*.cma %{_libdir}/ocaml/pxp-engine/*.cmi %{_libdir}/ocaml/pxp-engine/*.cmo %{_libdir}/ocaml/pxp-lex-*/*.cma %{_libdir}/ocaml/pxp-lex-*/*.cmi %{_libdir}/ocaml/pxp-lex-*/*.cmo %{_libdir}/ocaml/pxp-ulex-utf8/*.cma %{_libdir}/ocaml/pxp-ulex-utf8/*.cmi %{_libdir}/ocaml/pxp-ulex-utf8/*.cmo #%{_libdir}/ocaml/pxp-pp/pxp_pp.cma %files devel %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/pxp-engine/META %{_libdir}/ocaml/pxp-engine/*.a %{_libdir}/ocaml/pxp-engine/*.cmxa %{_libdir}/ocaml/pxp-engine/*.mli %{_libdir}/ocaml/pxp-lex-*/META %{_libdir}/ocaml/pxp-lex-*/*.a %{_libdir}/ocaml/pxp-lex-*/*.cmxa %{_libdir}/ocaml/pxp-lex-*/*.cmx %{_libdir}/ocaml/pxp-lex-*/*.o %{_libdir}/ocaml/pxp-ulex-utf8/META %{_libdir}/ocaml/pxp-ulex-utf8/*.a %{_libdir}/ocaml/pxp-ulex-utf8/*.cmxa %{_libdir}/ocaml/pxp-ulex-utf8/*.cmx %{_libdir}/ocaml/pxp-ulex-utf8/*.o #%{_libdir}/ocaml/pxp-pp/META %{_libdir}/ocaml/pxp/META %changelog * Fri Feb 15 2008 Richard W.M. Jones - 1.2.0test1-5 - Added BR ocaml-camlp4-devel * Tue Feb 12 2008 Richard W.M. Jones - 1.2.0test1-4 - Added BR ocaml-pcre-devel, pcre-devel * Thu Sep 13 2007 Richard W.M. Jones - 1.2.0test1-3 - ExcludeArch ppc64 * Thu Sep 13 2007 Richard W.M. Jones - 1.2.0test1-2 - Build on OCaml 3.10 - Disable building the preprocessor (requires old camlp4 or camlp5). - License is BSD. - Ignore Parsetree. * Sat May 26 2007 Richard W.M. Jones - 1.2.0test1-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pxp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2008 02:40:16 -0000 1.1 +++ .cvsignore 2 Mar 2008 10:45:28 -0000 1.2 @@ -0,0 +1 @@ +pxp-1.2.0test1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pxp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 02:40:16 -0000 1.1 +++ sources 2 Mar 2008 10:45:28 -0000 1.2 @@ -0,0 +1 @@ +ede21215d7c3f988e8f5951746e90e26 pxp-1.2.0test1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 10:48:22 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Sun, 2 Mar 2008 10:48:22 GMT Subject: rpms/ocaml-pxp/devel ocaml-pxp.spec,1.1,1.2 Message-ID: <200803021048.m22AmMrV018106@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pxp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18076 Modified Files: ocaml-pxp.spec Log Message: Rebuild for ppc64. Index: ocaml-pxp.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pxp/devel/ocaml-pxp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-pxp.spec 2 Mar 2008 10:45:28 -0000 1.1 +++ ocaml-pxp.spec 2 Mar 2008 10:47:48 -0000 1.2 @@ -2,7 +2,7 @@ Name: ocaml-pxp Version: 1.2.0test1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Validating XML parser Group: Development/Libraries @@ -10,7 +10,6 @@ URL: http://www.ocaml-programming.de/packages/ Source0: http://www.ocaml-programming.de/packages/pxp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml BuildRequires: ocaml-ocamldoc @@ -105,6 +104,9 @@ %changelog +* Sun Mar 2 2008 Richard W.M. Jones - 1.2.0test1-6 +- Rebuild for ppc64. + * Fri Feb 15 2008 Richard W.M. Jones - 1.2.0test1-5 - Added BR ocaml-camlp4-devel From fedora-extras-commits at redhat.com Sun Mar 2 10:49:45 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros)) Date: Sun, 2 Mar 2008 10:49:45 GMT Subject: rpms/gle/devel .cvsignore, 1.4, 1.5 gle.spec, 1.7, 1.8 sources, 1.4, 1.5 gle-4.1.1-gcc43.patch, 1.1, NONE Message-ID: <200803021049.m22AnjCI018194@cvs-int.fedora.redhat.com> Author: terjeros Update of /cvs/extras/rpms/gle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18167 Modified Files: .cvsignore gle.spec sources Removed Files: gle-4.1.1-gcc43.patch Log Message: - 4.1.2 - Update pdf documentation - Drop patch now upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gle/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2008 18:58:37 -0000 1.4 +++ .cvsignore 2 Mar 2008 10:49:09 -0000 1.5 @@ -1,2 +1,2 @@ -GLE-4.1.1-src.zip +GLE-4.1.2-src.zip GLE-4.0.13-manual.pdf Index: gle.spec =================================================================== RCS file: /cvs/extras/rpms/gle/devel/gle.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gle.spec 10 Feb 2008 22:07:44 -0000 1.7 +++ gle.spec 2 Mar 2008 10:49:09 -0000 1.8 @@ -2,14 +2,13 @@ Summary: Graphics Layout Engine Name: gle -Version: 4.1.1 -Release: 4%{?dist} +Version: 4.1.2 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.gle-graphics.org/ Source: http://downloads.sourceforge.net/glx/GLE-%{version}-src.zip Source1: http://www.cs.kuleuven.be/~jan/gle/GLE-%{mver}-manual.pdf -Patch0: gle-4.1.1-gcc43.patch BuildRequires: libstdc++-devel >= 3.0 BuildRequires: libpng-devel libtiff-devel libjpeg-devel BuildRequires: ncurses-devel zlib-devel xorg-x11-proto-devel @@ -30,7 +29,6 @@ %prep %setup -q -n gle4 -%patch -p1 %{__install} -p -m 0644 %{SOURCE1} . %build @@ -60,6 +58,11 @@ %{_libdir}/lib%{name}-graphics-%{version}.so %changelog +* Sun Mar 2 2008 Terje Rosten - 4.1.2-1 +- 4.1.2 +- Update pdf documentation +- Drop patch now upstream + * Sun Feb 10 2008 Terje Rosten - 4.1.1-4 - Add patch to build with gcc-4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gle/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2008 18:58:37 -0000 1.4 +++ sources 2 Mar 2008 10:49:09 -0000 1.5 @@ -1,2 +1,2 @@ -c678fabf824d555a3a11d0cae0f626b5 GLE-4.1.1-src.zip -060f986881e29c0a0cd1cfc9a058ce8d GLE-4.0.13-manual.pdf +f689adc8294b657d37cc98f9ea788e81 GLE-4.1.2-src.zip +98a9398f95d661bff49473561fec27f3 GLE-4.0.13-manual.pdf --- gle-4.1.1-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 10:51:43 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 2 Mar 2008 10:51:43 GMT Subject: rpms/boswars/devel .cvsignore, 1.2, 1.3 boswars-2.4.1-gcc43.patch, 1.1, 1.2 boswars.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200803021051.m22AphHV018301@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/boswars/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18274 Modified Files: .cvsignore boswars-2.4.1-gcc43.patch boswars.spec sources Log Message: * Sun Mar 2 2008 Hans de Goede 2.5-1 - New upstream release 2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/boswars/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Sep 2007 07:22:03 -0000 1.2 +++ .cvsignore 2 Mar 2008 10:51:08 -0000 1.3 @@ -1 +1 @@ -boswars-2.4.1-src.tar.gz +boswars-2.5-src.tar.gz boswars-2.4.1-gcc43.patch: Index: boswars-2.4.1-gcc43.patch =================================================================== RCS file: /cvs/extras/rpms/boswars/devel/boswars-2.4.1-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- boswars-2.4.1-gcc43.patch 12 Jan 2008 12:52:13 -0000 1.1 +++ boswars-2.4.1-gcc43.patch 2 Mar 2008 10:51:08 -0000 1.2 @@ -9,3 +9,14 @@ #ifndef _MSC_VER #include +diff -up boswars-2.5-src/engine/pathfinder/astar.cpp~ boswars-2.5-src/engine/pathfinder/astar.cpp +--- boswars-2.5-src/engine/pathfinder/astar.cpp~ 2008-03-02 09:23:48.000000000 +0100 ++++ boswars-2.5-src/engine/pathfinder/astar.cpp 2008-03-02 09:23:48.000000000 +0100 +@@ -35,6 +35,7 @@ + + #include "stratagus.h" + #include "pathfinder.h" ++#include /* for abs() */ + + /*---------------------------------------------------------------------------- + -- Declarations Index: boswars.spec =================================================================== RCS file: /cvs/extras/rpms/boswars/devel/boswars.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- boswars.spec 19 Feb 2008 08:08:40 -0000 1.4 +++ boswars.spec 2 Mar 2008 10:51:08 -0000 1.5 @@ -1,6 +1,6 @@ Name: boswars -Version: 2.4.1 -Release: 5%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: Bos Wars is a futuristic real-time strategy game Group: Amusements/Games License: GPLv2 @@ -44,7 +44,7 @@ install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} install -p -m 644 languages/*.po languages/*.pot \ $RPM_BUILD_ROOT%{_datadir}/%{name}/languages -cp -a campaigns graphics maps scripts sounds units video \ +cp -a campaigns graphics intro maps scripts sounds units \ $RPM_BUILD_ROOT%{_datadir}/%{name} @@ -54,7 +54,7 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -install -p -m 644 graphics/elites/ui/elites_claw.png \ +install -p -m 644 graphics/ui/elites_claw.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png @@ -85,6 +85,9 @@ %changelog +* Sun Mar 2 2008 Hans de Goede 2.5-1 +- New upstream release 2.5 + * Tue Feb 19 2008 Fedora Release Engineering - 2.4.1-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/boswars/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Sep 2007 07:22:03 -0000 1.2 +++ sources 2 Mar 2008 10:51:08 -0000 1.3 @@ -1 +1 @@ -ad4fe087da5697e920c746c75c20b07f boswars-2.4.1-src.tar.gz +9d280d086ccf81119f40bde98eb9a795 boswars-2.5-src.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 10:58:05 2008 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 2 Mar 2008 10:58:05 GMT Subject: rpms/ghex/devel ghex.spec,1.24,1.25 Message-ID: <200803021058.m22Aw5S3018461@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/pkgs/rpms/ghex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18443 Modified Files: ghex.spec Log Message: * Sun Mar 02 2008 Thorsten Leemhuis - 2.21.92-2 - Update to 2.21.92 Index: ghex.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghex/devel/ghex.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ghex.spec 8 Feb 2008 18:09:22 -0000 1.24 +++ ghex.spec 2 Mar 2008 10:57:22 -0000 1.25 @@ -1,6 +1,6 @@ Name: ghex -Version: 2.21.90 -Release: 1.1 +Version: 2.21.92 +Release: 1 Summary: Binary editor for GNOME @@ -101,6 +101,9 @@ %changelog +* Sun Mar 02 2008 Thorsten Leemhuis - 2.21.92-2 +- Update to 2.21.92 + * Fri Feb 08 2008 Thorsten Leemhuis - 2.21.90-1 - Update to 2.21.90 From fedora-extras-commits at redhat.com Sun Mar 2 11:07:13 2008 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 2 Mar 2008 11:07:13 GMT Subject: rpms/ghex/devel .cvsignore,1.12,1.13 sources,1.13,1.14 Message-ID: <200803021107.m22B7Dpl025754@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/pkgs/rpms/ghex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25695 Modified Files: .cvsignore sources Log Message: forgot to update sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ghex/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 8 Feb 2008 07:00:02 -0000 1.12 +++ .cvsignore 2 Mar 2008 11:06:35 -0000 1.13 @@ -1 +1 @@ -ghex-2.21.90.tar.bz2 +ghex-2.21.92.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ghex/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Feb 2008 07:00:02 -0000 1.13 +++ sources 2 Mar 2008 11:06:35 -0000 1.14 @@ -1 +1 @@ -c38df753028fa1c1a4dab31d02884986 ghex-2.21.90.tar.bz2 +e90c603fc89b0baa545d43db0579e9a2 ghex-2.21.92.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 11:07:32 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros)) Date: Sun, 2 Mar 2008 11:07:32 GMT Subject: rpms/gle/F-7 .cvsignore,1.3,1.4 gle.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200803021107.m22B7WFg025787@cvs-int.fedora.redhat.com> Author: terjeros Update of /cvs/extras/rpms/gle/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25704/F-7 Modified Files: .cvsignore gle.spec sources Log Message: Sync with rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gle/F-7/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2008 19:36:14 -0000 1.3 +++ .cvsignore 2 Mar 2008 11:06:54 -0000 1.4 @@ -1,2 +1,2 @@ -GLE-4.1.1-src.zip +GLE-4.1.2-src.zip GLE-4.0.13-manual.pdf Index: gle.spec =================================================================== RCS file: /cvs/extras/rpms/gle/F-7/gle.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gle.spec 5 Jan 2008 20:25:07 -0000 1.4 +++ gle.spec 2 Mar 2008 11:06:54 -0000 1.5 @@ -2,8 +2,8 @@ Summary: Graphics Layout Engine Name: gle -Version: 4.1.1 -Release: 2%{?dist} +Version: 4.1.2 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.gle-graphics.org/ @@ -58,6 +58,17 @@ %{_libdir}/lib%{name}-graphics-%{version}.so %changelog +* Sun Mar 2 2008 Terje Rosten - 4.1.2-1 +- 4.1.2 +- Update pdf documentation +- Drop patch now upstream + +* Sun Feb 10 2008 Terje Rosten - 4.1.1-4 +- Add patch to build with gcc-4.3 + +* Sat Feb 9 2008 Terje Rosten - 4.1.1-3 +- rebuild + * Sat Jan 5 2008 Terje Rosten - 4.1.1-2 - Drop libs and devel packages - Don't ship pc file Index: sources =================================================================== RCS file: /cvs/extras/rpms/gle/F-7/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2008 19:36:14 -0000 1.3 +++ sources 2 Mar 2008 11:06:54 -0000 1.4 @@ -1,2 +1,2 @@ -c678fabf824d555a3a11d0cae0f626b5 GLE-4.1.1-src.zip -060f986881e29c0a0cd1cfc9a058ce8d GLE-4.0.13-manual.pdf +f689adc8294b657d37cc98f9ea788e81 GLE-4.1.2-src.zip +98a9398f95d661bff49473561fec27f3 GLE-4.0.13-manual.pdf From fedora-extras-commits at redhat.com Sun Mar 2 11:07:45 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros)) Date: Sun, 2 Mar 2008 11:07:45 GMT Subject: rpms/gle/F-8 .cvsignore,1.3,1.4 gle.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200803021107.m22B7jj9025827@cvs-int.fedora.redhat.com> Author: terjeros Update of /cvs/extras/rpms/gle/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25704/F-8 Modified Files: .cvsignore gle.spec sources Log Message: Sync with rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gle/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2008 19:36:26 -0000 1.3 +++ .cvsignore 2 Mar 2008 11:07:03 -0000 1.4 @@ -1,2 +1,2 @@ -GLE-4.1.1-src.zip +GLE-4.1.2-src.zip GLE-4.0.13-manual.pdf Index: gle.spec =================================================================== RCS file: /cvs/extras/rpms/gle/F-8/gle.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gle.spec 5 Jan 2008 20:25:14 -0000 1.4 +++ gle.spec 2 Mar 2008 11:07:03 -0000 1.5 @@ -2,8 +2,8 @@ Summary: Graphics Layout Engine Name: gle -Version: 4.1.1 -Release: 2%{?dist} +Version: 4.1.2 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.gle-graphics.org/ @@ -58,6 +58,17 @@ %{_libdir}/lib%{name}-graphics-%{version}.so %changelog +* Sun Mar 2 2008 Terje Rosten - 4.1.2-1 +- 4.1.2 +- Update pdf documentation +- Drop patch now upstream + +* Sun Feb 10 2008 Terje Rosten - 4.1.1-4 +- Add patch to build with gcc-4.3 + +* Sat Feb 9 2008 Terje Rosten - 4.1.1-3 +- rebuild + * Sat Jan 5 2008 Terje Rosten - 4.1.1-2 - Drop libs and devel packages - Don't ship pc file Index: sources =================================================================== RCS file: /cvs/extras/rpms/gle/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2008 19:36:26 -0000 1.3 +++ sources 2 Mar 2008 11:07:03 -0000 1.4 @@ -1,2 +1,2 @@ -c678fabf824d555a3a11d0cae0f626b5 GLE-4.1.1-src.zip -060f986881e29c0a0cd1cfc9a058ce8d GLE-4.0.13-manual.pdf +f689adc8294b657d37cc98f9ea788e81 GLE-4.1.2-src.zip +98a9398f95d661bff49473561fec27f3 GLE-4.0.13-manual.pdf From fedora-extras-commits at redhat.com Sun Mar 2 11:18:56 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 2 Mar 2008 11:18:56 GMT Subject: rpms/codeblocks/devel .cvsignore, 1.20, 1.21 codeblocks.spec, 1.23, 1.24 sources, 1.20, 1.21 codeblocks-autorev.patch, 1.4, NONE codeblocks-getsvn, 1.1, NONE Message-ID: <200803021118.m22BIuO4026129@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26098 Modified Files: .cvsignore codeblocks.spec sources Removed Files: codeblocks-autorev.patch codeblocks-getsvn Log Message: * Sun Mar 2 2008 Dan Horak 8.02-1 - update to stable release 8.02 - update BR to use system libraries Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 21 Feb 2008 15:45:10 -0000 1.20 +++ .cvsignore 2 Mar 2008 11:18:20 -0000 1.21 @@ -1 +1 @@ -codeblocks-svn4872.tar.bz2 +codeblocks-8.02-src.tar.bz2 Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- codeblocks.spec 21 Feb 2008 15:45:10 -0000 1.23 +++ codeblocks.spec 2 Mar 2008 11:18:20 -0000 1.24 @@ -1,26 +1,20 @@ -%define rev 4872 -%define date 20080211 - Name: codeblocks -Version: 1.0 -Release: 0.30.%{date}svn%{rev}%{?dist} +Version: 8.02 +Release: 1%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools -License: GPLv2+ +License: GPLv3+ URL: http://www.codeblocks.org/ -Source: %{name}-svn%{rev}.tar.bz2 +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel >= 2.8.0 +BuildRequires: wxGTK-devel >= 2.8.0, zlib-devel, bzip2-devel BuildRequires: zip BuildRequires: dos2unix -BuildRequires: autoconf, automake, libtool BuildRequires: desktop-file-utils Requires: %{name}-libs = %{version}-%{release} Requires: shared-mime-info Patch1: codeblocks-plugins.patch Patch2: codeblocks-desktop.patch -Patch3: codeblocks-autorev.patch -Source100: codeblocks-getsvn %description Code::Blocks is a free C++ IDE built specifically to meet the most demanding @@ -48,8 +42,6 @@ %package contrib-libs Summary: Libraries needed to run Code::Blocks contrib plugins Group: System Environment/Libraries -# the wxSmith plugin and libwxsmith* libraries are now GPLv3+ -License: GPLv2+ and GPLv3+ Obsoletes: %{name}-contrib < 1.0-0.28.20071210svn4719 %description contrib-libs @@ -58,8 +50,6 @@ %package contrib Summary: Additional Code::Blocks plugins Group: Development/Tools -# the wxSmith plugin and libwxsmith* libraries are now GPLv3+ -License: GPLv2+ and GPLv3+ Requires: %{name} = %{version}-%{release} Requires: %{name}-contrib-libs = %{version}-%{release} @@ -73,10 +63,9 @@ %prep -%setup -q -n %{name} +%setup -q %patch1 %patch2 -p1 -%patch3 # convert EOLs find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null @@ -87,7 +76,7 @@ sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am done -for p in AutoVersioning ThreadSearch byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems +for p in AutoVersioning BrowseTracker ThreadSearch byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems do sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am done @@ -100,15 +89,11 @@ find src/plugins/contrib/regex_testbed -type f -exec chmod a-x {} ';' find src/plugins/compilergcc -type f -exec chmod a-x {} ';' -# generate revision.m4 -echo "m4_define([SVN_REV], %{rev})" > revision.m4 -echo "m4_define([SVN_REVISION], 1.0svn%{rev})" >> revision.m4 -echo "m4_define([SVN_DATE], %{date})" >> revision.m4 +# fix version inside the configure script +sed -i 's/1\.0svn/%{version}/g' configure %build -./bootstrap - %configure --with-contrib-plugins=all # Don't use rpath! @@ -225,6 +210,7 @@ %files contrib %defattr(-,root,root) %{pkgdatadir}/AutoVersioning.zip +%{pkgdatadir}/BrowseTracker.zip %{pkgdatadir}/ThreadSearch.zip %{pkgdatadir}/byogames.zip %{pkgdatadir}/cb_koders.zip @@ -247,6 +233,7 @@ %{pkgdatadir}/lib_finder %{plugindir}/libAutoVersioning.so +%{plugindir}/libBrowseTracker.so %{plugindir}/libThreadSearch.so %{plugindir}/libbyogames.so %{plugindir}/libcb_koders.so @@ -266,6 +253,10 @@ %changelog +* Sun Mar 2 2008 Dan Horak 8.02-1 +- update to stable release 8.02 +- update BR to use system libraries + * Mon Feb 18 2008 Dan Horak 1.0-0.30.20080211svn4872 - update to revision 4872 - really fix the multilib problem with the contrib subpackage (#433124) Index: sources =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 21 Feb 2008 15:45:10 -0000 1.20 +++ sources 2 Mar 2008 11:18:20 -0000 1.21 @@ -1 +1 @@ -32b5517fbae8960272788bdc95a89605 codeblocks-svn4872.tar.bz2 +ac15b4b3de50d7650c2f7a8dbcb30f88 codeblocks-8.02-src.tar.bz2 --- codeblocks-autorev.patch DELETED --- --- codeblocks-getsvn DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 11:28:48 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sun, 2 Mar 2008 11:28:48 GMT Subject: rpms/ginac/devel ginac-build-gcc43.patch, NONE, 1.1 ginac.spec, 1.16, 1.17 Message-ID: <200803021128.m22BSmEH026328@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/ginac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26302 Modified Files: ginac.spec Added Files: ginac-build-gcc43.patch Log Message: * Sun Mar 2 2008 Alex Lancaster - 1.4.1-4 - Patch for building with GCC 4.3 (this has been applied upstream and so can be dropped in the next release of ginac). ginac-build-gcc43.patch: --- NEW FILE ginac-build-gcc43.patch --- diff -up ginac-1.4.1/ginac/numeric.cpp.fix ginac-1.4.1/ginac/numeric.cpp --- ginac-1.4.1/ginac/numeric.cpp.fix 2008-03-02 04:03:11.000000000 -0700 +++ ginac-1.4.1/ginac/numeric.cpp 2008-03-02 04:06:10.000000000 -0700 @@ -408,7 +408,7 @@ static inline bool coerce(T1& dst, const * @sa http://www.ginac.de/pipermail/cln-list/2006-October/000248.html */ template<> -static inline bool coerce(int& dst, const cln::cl_I& arg) +inline bool coerce(int& dst, const cln::cl_I& arg) { static const cln::cl_I cl_max_int = (cln::cl_I)(long)(std::numeric_limits::max()); @@ -422,7 +422,7 @@ static inline bool coerce -static inline bool coerce(unsigned int& dst, const cln::cl_I& arg) +inline bool coerce(unsigned int& dst, const cln::cl_I& arg) { static const cln::cl_I cl_max_uint = (cln::cl_I)(unsigned long)(std::numeric_limits::max()); Index: ginac.spec =================================================================== RCS file: /cvs/pkgs/rpms/ginac/devel/ginac.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ginac.spec 27 Feb 2008 14:30:56 -0000 1.16 +++ ginac.spec 2 Mar 2008 11:27:55 -0000 1.17 @@ -1,12 +1,13 @@ Name: ginac Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ library for symbolic calculations Group: System Environment/Libraries License: GPLv2+ URL: http://www.ginac.de/ Source0: http://www.ginac.de/%{name}-%{version}.tar.bz2 +Patch0: %{name}-build-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info @@ -54,6 +55,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --disable-dependency-tracking --disable-static @@ -99,6 +101,10 @@ %{_mandir}/man?/* %changelog +* Sun Mar 2 2008 Alex Lancaster - 1.4.1-4 +- Patch for building with GCC 4.3 (this has been applied upstream and so + can be dropped in the next release of ginac). + * Wed Feb 27 2008 Quentin Spencer 1.4.1-3 - Rebuild for new release of cln. From fedora-extras-commits at redhat.com Sun Mar 2 12:06:19 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 2 Mar 2008 12:06:19 GMT Subject: rpms/ClanLib/devel ClanLib-0.8.0-alsa.patch, NONE, 1.1 ClanLib.spec, 1.14, 1.15 ClanLib-0.8.0-gcc41.patch, 1.1, NONE ClanLib-0.8.0-grave_key.patch, 1.1, NONE Message-ID: <200803021206.m22C6JM6001443@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ClanLib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1404 Modified Files: ClanLib.spec Added Files: ClanLib-0.8.0-alsa.patch Removed Files: ClanLib-0.8.0-gcc41.patch ClanLib-0.8.0-grave_key.patch Log Message: * Sun Mar 2 2008 Hans de Goede 0.8.0-10 - Add support for audio output through alsa (original ClanLib only supports OSS??), this also adds support for using pulseaudio through alsa ClanLib-0.8.0-alsa.patch: --- NEW FILE ClanLib-0.8.0-alsa.patch --- diff -up ClanLib-0.8.0/Sources/Sound/Makefile.am.alsa ClanLib-0.8.0/Sources/Sound/Makefile.am --- ClanLib-0.8.0/Sources/Sound/Makefile.am.alsa 2008-03-02 10:43:33.000000000 +0100 +++ ClanLib-0.8.0/Sources/Sound/Makefile.am 2008-03-02 10:54:51.000000000 +0100 @@ -38,12 +38,15 @@ else libclanSound_la_SOURCES += \ Unix/soundoutput_oss.cpp \ Unix/soundoutput_oss.h \ +Unix/soundoutput_alsa.cpp \ +Unix/soundoutput_alsa.h \ SoundProviders/Unix/soundprovider_recorder_oss.cpp \ SoundProviders/Unix/soundprovider_recorder_oss.h endif libclanSound_la_LDFLAGS = \ -release $(LT_RELEASE) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -lasound # EOF # diff -up ClanLib-0.8.0/Sources/Sound/soundoutput.cpp.alsa ClanLib-0.8.0/Sources/Sound/soundoutput.cpp --- ClanLib-0.8.0/Sources/Sound/soundoutput.cpp.alsa 2005-10-25 12:39:25.000000000 +0200 +++ ClanLib-0.8.0/Sources/Sound/soundoutput.cpp 2008-03-02 10:48:33.000000000 +0100 @@ -40,6 +40,7 @@ #ifdef __APPLE__ #include "MacOSX/soundoutput_macosx.h" #else +#include "Unix/soundoutput_alsa.h" #include "Unix/soundoutput_oss.h" #endif #endif @@ -66,6 +67,15 @@ CL_SoundOutput::CL_SoundOutput(const CL_ #ifdef __APPLE__ impl = new CL_SoundOutput_MacOSX(desc.get_mixing_frequency()); #else +#ifdef __linux__ + CL_SoundOutput_alsa *alsa_impl; + alsa_impl = new CL_SoundOutput_alsa(desc.get_mixing_frequency()); + if (alsa_impl->handle) + impl = alsa_impl; + else + delete alsa_impl; + if (!impl) +#endif impl = new CL_SoundOutput_OSS(desc.get_mixing_frequency()); #endif #endif diff -up ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.cpp.alsa ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.cpp --- ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.cpp.alsa 2008-03-02 10:49:14.000000000 +0100 +++ ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.cpp 2008-03-02 11:03:43.000000000 +0100 @@ -0,0 +1,161 @@ +/* +** ClanLib SDK +** Copyright (c) 1997-2008 The ClanLib Team +** +** This software is provided 'as-is', without any express or implied +** warranty. In no event will the authors be held liable for any damages +** arising from the use of this software. +** +** Permission is granted to anyone to use this software for any purpose, +** including commercial applications, and to alter it and redistribute it +** freely, subject to the following restrictions: +** +** 1. The origin of this software must not be misrepresented; you must not +** claim that you wrote the original software. If you use this software +** in a product, an acknowledgment in the product documentation would be +** appreciated but is not required. +** 2. Altered source versions must be plainly marked as such, and must not be +** misrepresented as being the original software. +** 3. This notice may not be removed or altered from any source distribution. +** +** Note: Some of the libraries ClanLib may link to may have additional +** requirements or restrictions. +** +** File Author(s): +** +** Magnus Norddahl +** Hans de Goede +** (if your name is missing here, please add it) +*/ + +#include "Sound/precomp.h" +#include "soundoutput_alsa.h" +#include "API/Core/System/error.h" +#include "API/Core/System/cl_assert.h" +#include "API/Core/System/system.h" +#include "API/Core/System/log.h" + +#ifdef __linux__ + +///////////////////////////////////////////////////////////////////////////// +// CL_SoundOutput_alsa construction: + +CL_SoundOutput_alsa::CL_SoundOutput_alsa(int mixing_frequency) : + CL_SoundOutput_Generic(mixing_frequency), frames_in_buffer(4096), + frames_in_period(1024) +{ + int rc; + snd_pcm_hw_params_t *hwparams; + + rc = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 0); + if (rc < 0) + { + CL_Log::log("warn", "ClanSound: Couldn't open sound device, disabling sound"); + handle = NULL; + return; + } + + snd_pcm_hw_params_alloca(&hwparams); + snd_pcm_hw_params_any(handle, hwparams); + snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED); + snd_pcm_hw_params_set_format(handle, hwparams, SND_PCM_FORMAT_S16); + snd_pcm_hw_params_set_channels(handle, hwparams, 2); + snd_pcm_hw_params_set_rate_near(handle, hwparams, + (unsigned int *)&this->mixing_frequency, 0); + snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &frames_in_buffer); + frames_in_period = frames_in_buffer / 4; + snd_pcm_hw_params_set_period_size_near(handle, hwparams, &frames_in_period, 0); + + rc = snd_pcm_hw_params(handle, hwparams); + if (rc < 0) + { + CL_Log::log("warn", "ClanSound: Couldn't initialize sound device, disabling sound"); + snd_pcm_close(handle); + handle = NULL; + return; + } + + snd_pcm_hw_params_get_period_size(hwparams, &frames_in_period, 0); + + start_mixer_thread(); +} + +CL_SoundOutput_alsa::~CL_SoundOutput_alsa() +{ + stop_mixer_thread(); + if (handle) { + snd_pcm_close(handle); + handle = NULL; + } +} + +///////////////////////////////////////////////////////////////////////////// +// CL_SoundOutput_alsa operations: + +void CL_SoundOutput_alsa::silence() +{ + /* Note: not supported by all hardware! */ + if (handle) + snd_pcm_pause(handle, 1); +} + +bool CL_SoundOutput_alsa::is_full() +{ + int rc; + snd_pcm_sframes_t delay; + + if (handle == NULL) return false; + + rc = snd_pcm_delay(handle, &delay); + if (rc < 0) { + CL_Log::log("debug", "ClanSound: snd_pcm_delay() failed!?"); + return false; + } + + /* See if there is more then one period free in the buffer */ + return delay > (snd_pcm_sframes_t)(frames_in_buffer - frames_in_period); +} + +int CL_SoundOutput_alsa::get_fragment_size() +{ + return frames_in_period; +} + +void CL_SoundOutput_alsa::write_fragment(short *data) +{ + snd_pcm_sframes_t rc; + + if (handle == NULL) return; + + switch(snd_pcm_state(handle)) { + case SND_PCM_STATE_XRUN: + case SND_PCM_STATE_SUSPENDED: + snd_pcm_prepare(handle); + break; + case SND_PCM_STATE_PAUSED: + snd_pcm_pause(handle, 0); + break; + default: + break; + } + + rc = snd_pcm_writei(handle, data, frames_in_period); + if (rc < 0) + CL_Log::log("debug", "ClanSound: snd_pcm_writei() failed!"); +} + +void CL_SoundOutput_alsa::wait() +{ + if(handle == NULL) + { + CL_System::sleep(100); + return; + } + /* wait upto 1 second */ + snd_pcm_wait(handle, 1000); +} + +///////////////////////////////////////////////////////////////////////////// +// CL_SoundOutput_alsa implementation: + +#endif diff -up ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.h.alsa ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.h --- ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.h.alsa 2008-03-02 10:49:20.000000000 +0100 +++ ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.h 2008-03-02 10:43:09.000000000 +0100 @@ -0,0 +1,76 @@ +/* +** ClanLib SDK +** Copyright (c) 1997-2008 The ClanLib Team +** +** This software is provided 'as-is', without any express or implied +** warranty. In no event will the authors be held liable for any damages +** arising from the use of this software. +** +** Permission is granted to anyone to use this software for any purpose, +** including commercial applications, and to alter it and redistribute it +** freely, subject to the following restrictions: +** +** 1. The origin of this software must not be misrepresented; you must not +** claim that you wrote the original software. If you use this software +** in a product, an acknowledgment in the product documentation would be +** appreciated but is not required. +** 2. Altered source versions must be plainly marked as such, and must not be +** misrepresented as being the original software. +** 3. This notice may not be removed or altered from any source distribution. +** +** Note: Some of the libraries ClanLib may link to may have additional +** requirements or restrictions. +** +** File Author(s): +** +** Magnus Norddahl +** Hans de Goede +** (if your name is missing here, please add it) +*/ + +#ifndef header_soundoutput_alsa +#define header_soundoutput_alsa + +#ifdef __linux__ + +#include "../soundoutput_generic.h" +#include + +class CL_SoundOutput_alsa : public CL_SoundOutput_Generic +{ +//! Construction: +public: + CL_SoundOutput_alsa(int mixing_frequency); + + ~CL_SoundOutput_alsa(); + +//! Attributes: +public: + snd_pcm_t *handle; + snd_pcm_uframes_t frames_in_period; + snd_pcm_uframes_t frames_in_buffer; + +//! Operations: +public: + //: Called when we have no samples to play - and wants to tell the soundcard + //: about this possible event. + virtual void silence(); + + //: Returns true if all fragments are filled with data. + virtual bool is_full(); + + //: Returns the buffer size used by device (returned as num [stereo] samples). + virtual int get_fragment_size(); + + //: Writes a fragment to the soundcard. + virtual void write_fragment(short *data); + + //: Waits until output source isn't full anymore. + virtual void wait(); + +//! Implementation: +private: +}; + +#endif +#endif diff -up ClanLib-0.8.0/Sources/Sound/Makefile.in.alsa ClanLib-0.8.0/Sources/Sound/Makefile.in --- ClanLib-0.8.0/Sources/Sound/Makefile.in.alsa 2008-03-02 10:43:38.000000000 +0100 +++ ClanLib-0.8.0/Sources/Sound/Makefile.in 2008-03-02 10:54:53.000000000 +0100 @@ -46,6 +46,8 @@ target_triplet = @target@ @WIN32_FALSE at am__append_2 = \ @WIN32_FALSE at Unix/soundoutput_oss.cpp \ @WIN32_FALSE at Unix/soundoutput_oss.h \ + at WIN32_FALSE@Unix/soundoutput_alsa.cpp \ + at WIN32_FALSE@Unix/soundoutput_alsa.h \ @WIN32_FALSE at SoundProviders/Unix/soundprovider_recorder_oss.cpp \ @WIN32_FALSE at SoundProviders/Unix/soundprovider_recorder_oss.h @@ -90,12 +92,13 @@ am__libclanSound_la_SOURCES_DIST = \ SoundProviders/Win32/soundprovider_recorder_directsound.cpp \ SoundProviders/Win32/soundprovider_recorder_directsound.h \ Unix/soundoutput_oss.cpp Unix/soundoutput_oss.h \ + Unix/soundoutput_alsa.cpp Unix/soundoutput_alsa.h \ SoundProviders/Unix/soundprovider_recorder_oss.cpp \ SoundProviders/Unix/soundprovider_recorder_oss.h am__dirstamp = $(am__leading_dot)dirstamp @WIN32_TRUE at am__objects_1 = Win32/soundoutput_directsound.lo \ @WIN32_TRUE@ SoundProviders/Win32/soundprovider_recorder_directsound.lo - at WIN32_FALSE@am__objects_2 = Unix/soundoutput_oss.lo \ + at WIN32_FALSE@am__objects_2 = Unix/soundoutput_oss.lo Unix/soundoutput_alsa.lo \ @WIN32_FALSE@ SoundProviders/Unix/soundprovider_recorder_oss.lo am_libclanSound_la_OBJECTS = SoundFilters/echofilter_generic.lo \ SoundFilters/fadefilter_generic.lo \ @@ -324,7 +327,8 @@ libclanSound_la_SOURCES = SoundFilters/e soundprovider_session.cpp $(am__append_1) $(am__append_2) libclanSound_la_LDFLAGS = \ -release $(LT_RELEASE) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -lasound all: all-am @@ -448,6 +452,8 @@ Unix/$(DEPDIR)/$(am__dirstamp): @: > Unix/$(DEPDIR)/$(am__dirstamp) Unix/soundoutput_oss.lo: Unix/$(am__dirstamp) \ Unix/$(DEPDIR)/$(am__dirstamp) +Unix/soundoutput_alsa.lo: Unix/$(am__dirstamp) \ + Unix/$(DEPDIR)/$(am__dirstamp) SoundProviders/Unix/$(am__dirstamp): @$(mkdir_p) SoundProviders/Unix @: > SoundProviders/Unix/$(am__dirstamp) @@ -488,6 +494,8 @@ mostlyclean-compile: -rm -f SoundProviders/soundprovider_wave_session.lo -rm -f Unix/soundoutput_oss.$(OBJEXT) -rm -f Unix/soundoutput_oss.lo + -rm -f Unix/soundoutput_alsa.$(OBJEXT) + -rm -f Unix/soundoutput_alsa.lo -rm -f Win32/soundoutput_directsound.$(OBJEXT) -rm -f Win32/soundoutput_directsound.lo @@ -522,6 +530,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at SoundProviders/Unix/$(DEPDIR)/soundprovider_recorder_oss.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at SoundProviders/Win32/$(DEPDIR)/soundprovider_recorder_directsound.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at Unix/$(DEPDIR)/soundoutput_oss.Plo at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at Unix/$(DEPDIR)/soundoutput_alsa.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at Win32/$(DEPDIR)/soundoutput_directsound.Plo at am__quote@ .cpp.o: Index: ClanLib.spec =================================================================== RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ClanLib.spec 19 Feb 2008 07:38:23 -0000 1.14 +++ ClanLib.spec 2 Mar 2008 12:05:44 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Cross platform C++ game library Name: ClanLib Version: 0.8.0 -Release: 9%{?dist} +Release: 10%{?dist} Group: System Environment/Libraries License: zlib URL: http://www.clanlib.org/ @@ -14,6 +14,7 @@ Patch0: ClanLib-0.8.0-fullscreen.patch Patch1: ClanLib-0.8.0-tex-format.patch Patch2: ClanLib-0.8.0-gcc43.patch +Patch3: ClanLib-0.8.0-alsa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel BuildRequires: libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel @@ -41,6 +42,7 @@ %patch0 -p1 -z .fs %patch1 -p1 -z .texfmt %patch2 -p1 -z .gcc43 +%patch3 -p1 -z .alsa # fixup pc files sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in sed -i 's|Libs: -L${libdir}|Libs: -L${libdir}/%{name}-0.8|' \ @@ -90,6 +92,10 @@ %changelog +* Sun Mar 2 2008 Hans de Goede 0.8.0-10 +- Add support for audio output through alsa (original ClanLib only supports + OSS??), this also adds support for using pulseaudio through alsa + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.0-9 - Autorebuild for GCC 4.3 --- ClanLib-0.8.0-gcc41.patch DELETED --- --- ClanLib-0.8.0-grave_key.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 12:14:12 2008 From: fedora-extras-commits at redhat.com (Ville-Pekka Vainio (vpv)) Date: Sun, 2 Mar 2008 12:14:12 GMT Subject: rpms/libvoikko/devel libvoikko.spec,1.8,1.9 Message-ID: <200803021214.m22CECmY001568@cvs-int.fedora.redhat.com> Author: vpv Update of /cvs/pkgs/rpms/libvoikko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1544 Modified Files: libvoikko.spec Log Message: New subpackage voikko-tools Index: libvoikko.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libvoikko.spec 15 Feb 2008 22:54:26 -0000 1.8 +++ libvoikko.spec 2 Mar 2008 12:13:34 -0000 1.9 @@ -1,6 +1,6 @@ Name: libvoikko Version: 1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Voikko is a library for spellcheckers and hyphenators Group: System Environment/Libraries @@ -33,6 +33,15 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package -n voikko-tools +Summary: Test tools for %{name} +Group: Applications/Text +Requires: %{name} = %{version}-%{release} + +%description -n voikko-tools +This package contains voikkospell and voikkohyphenate, small command line +tools for testing libvoikko. These tools may also be useful for shell +scripts. %prep %setup -q @@ -65,6 +74,8 @@ %defattr(-,root,root,-) %doc ChangeLog COPYING README %{_libdir}/*.so.* + +%files -n voikko-tools %{_bindir}/voikkospell %{_bindir}/voikkohyphenate %{_mandir}/man1/voikkohyphenate.1.gz @@ -77,6 +88,10 @@ %{_libdir}/*.so %changelog +* Sun Mar 02 2008 - Ville-Pekka Vainio 1.6-3 +- Put voikkospell and voikkohyphenate into a separate voikko-tools + subpackage to decrease the size of the binary libvoikko package + * Sat Feb 16 2008 - Ville-Pekka Vainio 1.6-2 - Rebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 12:45:17 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Sun, 2 Mar 2008 12:45:17 GMT Subject: rpms/octave/devel octave.spec,1.70,1.71 Message-ID: <200803021245.m22CjHur001986@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1965 Modified Files: octave.spec Log Message: - Backout GCC 4.3 patch temporarily, causes trouble for octave-forge and may not be necessary (#435600). Will revert if this causes octave to fail. Index: octave.spec =================================================================== RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- octave.spec 29 Feb 2008 22:55:31 -0000 1.70 +++ octave.spec 2 Mar 2008 12:44:40 -0000 1.71 @@ -3,14 +3,14 @@ Name: octave Version: 3.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPLv3+ Source: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2 -Patch: octave-3.0.0-gcc43.patch +## Patch: octave-3.0.0-gcc43.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -55,7 +55,7 @@ %prep %setup -q -%patch -p1 -b .gcc43 +## patch -p1 -b .gcc43 # Check that octave_api is set correctly if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h then @@ -143,6 +143,10 @@ %changelog +* Sun Mar 2 2008 Alex Lancaster - 6:3.0.0-5 +- Backout GCC 4.3 patch temporarily, causes trouble for octave-forge and + may not be necessary (#435600) + * Fri Feb 29 2008 Orion Poplawski 3.0.0-4 - Rebuild for hdf5 1.8.0 using compatability API define - Add gcc43 patch From fedora-extras-commits at redhat.com Sun Mar 2 12:47:15 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 2 Mar 2008 12:47:15 GMT Subject: rpms/ClanLib06/devel ClanLib-0.6.5-alsa.patch, NONE, 1.1 ClanLib06.spec, 1.10, 1.11 Message-ID: <200803021247.m22ClF37002077@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ClanLib06/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2052 Modified Files: ClanLib06.spec Added Files: ClanLib-0.6.5-alsa.patch Log Message: * Sun Mar 2 2008 Hans de Goede 0.6.5-12 - Add support for audio output through alsa (original ClanLib only supports OSS??), this also adds support for using pulseaudio through alsa ClanLib-0.6.5-alsa.patch: --- NEW FILE ClanLib-0.6.5-alsa.patch --- diff -up /dev/null ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/alsa.cpp --- /dev/null 2008-03-02 13:00:58.162258534 +0100 +++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/alsa.cpp 2008-03-02 13:32:17.000000000 +0100 @@ -0,0 +1,167 @@ +/* +** ClanLib SDK +** Copyright (c) 1997-2008 The ClanLib Team +** +** This software is provided 'as-is', without any express or implied +** warranty. In no event will the authors be held liable for any damages +** arising from the use of this software. +** +** Permission is granted to anyone to use this software for any purpose, +** including commercial applications, and to alter it and redistribute it +** freely, subject to the following restrictions: +** +** 1. The origin of this software must not be misrepresented; you must not +** claim that you wrote the original software. If you use this software +** in a product, an acknowledgment in the product documentation would be +** appreciated but is not required. +** 2. Altered source versions must be plainly marked as such, and must not be +** misrepresented as being the original software. +** 3. This notice may not be removed or altered from any source distribution. +** +** Note: Some of the libraries ClanLib may link to may have additional +** requirements or restrictions. +** +** File Author(s): +** +** Magnus Norddahl +** Hans de Goede +** (if your name is missing here, please add it) +*/ + +#include "alsa.h" +#include "API/Core/System/error.h" +#include "API/Core/System/cl_assert.h" +#include "API/Core/System/system.h" +#include + +#ifdef USE_CLANSOUND +#ifdef __linux__ + +///////////////////////////////////////////////////////////////////////////// +// CL_SoundOutput_alsa construction: + +CL_SoundOutput_alsa::CL_SoundOutput_alsa() : + frames_in_buffer(2048), frames_in_period(512) +{ + int rc; + snd_pcm_hw_params_t *hwparams; + unsigned int mixing_frequency = 22050; + + rc = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 0); + if (rc < 0) + { + std::cout << "ClanSound: Warning, Couldn't open sound device, disabling sound\n"; + handle = NULL; + return; + } + + snd_pcm_hw_params_alloca(&hwparams); + snd_pcm_hw_params_any(handle, hwparams); + snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED); + snd_pcm_hw_params_set_format(handle, hwparams, SND_PCM_FORMAT_S16); + snd_pcm_hw_params_set_channels(handle, hwparams, 2); + snd_pcm_hw_params_set_rate_near(handle, hwparams, &mixing_frequency, 0); + snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &frames_in_buffer); + frames_in_period = frames_in_buffer / 4; + snd_pcm_hw_params_set_period_size_near(handle, hwparams, &frames_in_period, 0); + + rc = snd_pcm_hw_params(handle, hwparams); + if (rc < 0) + { + std::cout << "ClanSound: Warning, Couldn't initialize sound device, disabling sound\n"; + snd_pcm_close(handle); + handle = NULL; + return; + } + + snd_pcm_hw_params_get_period_size(hwparams, &frames_in_period, 0); + snd_pcm_hw_params_get_rate(hwparams, &mixing_frequency, 0); + + float percent_wrong = mixing_frequency / (float) 22050; + if (percent_wrong < 0.90 || percent_wrong > 1.10) + { + snd_pcm_close(handle); + /* Taken from oss driver, maybe make this a warning too? */ + throw CL_Error("ClanSound: Mixing rate (22.05 kHz) not supported by soundcard."); + } +} + +CL_SoundOutput_alsa::~CL_SoundOutput_alsa() +{ + if (handle) { + snd_pcm_close(handle); + handle = NULL; + } +} + +///////////////////////////////////////////////////////////////////////////// +// CL_SoundOutput_alsa operations: + +void CL_SoundOutput_alsa::silence() +{ + /* Note: not supported by all hardware! */ + if (handle) + snd_pcm_pause(handle, 1); +} + +bool CL_SoundOutput_alsa::is_full() +{ + int rc; + snd_pcm_sframes_t delay; + + if (handle == NULL) return false; + + rc = snd_pcm_delay(handle, &delay); + if (rc < 0) { + std::cout << "ClanSound: Warning, snd_pcm_delay() failed!?\n"; + return false; + } + + /* See if there is more then one period free in the buffer */ + return delay > (snd_pcm_sframes_t)(frames_in_buffer - frames_in_period); +} + +int CL_SoundOutput_alsa::get_frag_size() +{ + return frames_in_period; +} + +void CL_SoundOutput_alsa::write_fragment(short *data) +{ + snd_pcm_sframes_t rc; + + if (handle == NULL) return; + + switch(snd_pcm_state(handle)) { + case SND_PCM_STATE_XRUN: + case SND_PCM_STATE_SUSPENDED: + snd_pcm_prepare(handle); + break; + case SND_PCM_STATE_PAUSED: + snd_pcm_pause(handle, 0); + break; + default: + break; + } + + rc = snd_pcm_writei(handle, data, frames_in_period); + if (rc < 0) + std::cout << "ClanSound: Warning, snd_pcm_writei() failed!\n"; +} + +void CL_SoundOutput_alsa::wait() +{ + if(handle == NULL) + { + CL_System::sleep(100); + return; + } + /* wait upto 1 second */ + snd_pcm_wait(handle, 1000); +} + +///////////////////////////////////////////////////////////////////////////// +// CL_SoundOutput_alsa implementation: + +#endif +#endif diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.h.alsa ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.h --- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.h.alsa 2001-09-08 21:24:21.000000000 +0200 +++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.h 2008-03-02 13:18:19.000000000 +0100 @@ -10,6 +10,8 @@ #ifndef header_oss #define header_oss +#include "alsa.h" + class CL_CSOutput { public: @@ -35,6 +37,9 @@ public: private: int dev_dsp_fd; int frag_size; +#ifdef __linux__ + CL_SoundOutput_alsa *alsa; +#endif }; #endif diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.cpp.alsa ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.cpp --- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.cpp.alsa 2002-07-02 22:56:33.000000000 +0200 +++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.cpp 2008-03-02 13:18:19.000000000 +0100 @@ -37,6 +37,14 @@ bool has_sound = true; CL_CSOutput::CL_CSOutput() { +#ifdef __linux__ + alsa = new CL_SoundOutput_alsa(); + if (!alsa->handle) { + delete alsa; + alsa = NULL; + } else + return; +#endif dev_dsp_fd = open(DSP_DEVICE, O_WRONLY|O_NONBLOCK); if (dev_dsp_fd == -1) { @@ -99,6 +107,13 @@ CL_CSOutput::CL_CSOutput() CL_CSOutput::~CL_CSOutput() { +#ifdef __linux__ + if (alsa) { + delete alsa; + alsa = NULL; + return; + } +#endif if (dev_dsp_fd != -1) close(dev_dsp_fd); } @@ -106,12 +121,22 @@ void CL_CSOutput::silence() // Called when we have no samples to play - and wants to tell the soundcard // about this possible event. { +#ifdef __linux__ + if (alsa) { + alsa->silence(); + return; + } +#endif ioctl(dev_dsp_fd, SNDCTL_DSP_POST, 0); } bool CL_CSOutput::is_full() // Returns true if all fragments are filled with data. { +#ifdef __linux__ + if (alsa) + return alsa->is_full(); +#endif if (!has_sound) return false; audio_buf_info info; int err = ioctl(dev_dsp_fd, SNDCTL_DSP_GETOSPACE, &info); @@ -128,17 +153,33 @@ bool CL_CSOutput::is_full() int CL_CSOutput::get_frag_size() // Returns the buffer size used by device (returned as num [stereo] samples). { +#ifdef __linux__ + if (alsa) + return alsa->get_frag_size(); +#endif return frag_size/4; } void CL_CSOutput::write_fragment(short *data) // Writes a fragment to the soundcard. { +#ifdef __linux__ + if (alsa) { + alsa->write_fragment(data); + return; + } +#endif write(dev_dsp_fd, data, frag_size); } void CL_CSOutput::wait() { +#ifdef __linux__ + if (alsa) { + alsa->wait(); + return; + } +#endif if(!has_sound) { CL_System::sleep(100); diff -up /dev/null ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/alsa.h --- /dev/null 2008-03-02 13:00:58.162258534 +0100 +++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/alsa.h 2008-03-02 13:23:03.000000000 +0100 @@ -0,0 +1,75 @@ +/* +** ClanLib SDK +** Copyright (c) 1997-2008 The ClanLib Team +** +** This software is provided 'as-is', without any express or implied +** warranty. In no event will the authors be held liable for any damages +** arising from the use of this software. +** +** Permission is granted to anyone to use this software for any purpose, +** including commercial applications, and to alter it and redistribute it +** freely, subject to the following restrictions: +** +** 1. The origin of this software must not be misrepresented; you must not +** claim that you wrote the original software. If you use this software +** in a product, an acknowledgment in the product documentation would be +** appreciated but is not required. +** 2. Altered source versions must be plainly marked as such, and must not be +** misrepresented as being the original software. +** 3. This notice may not be removed or altered from any source distribution. +** +** Note: Some of the libraries ClanLib may link to may have additional +** requirements or restrictions. +** +** File Author(s): +** +** Magnus Norddahl +** Hans de Goede +** (if your name is missing here, please add it) +*/ + +#ifndef header_soundoutput_alsa +#define header_soundoutput_alsa + +#ifdef __linux__ + +#include + +class CL_SoundOutput_alsa +{ +//! Construction: +public: + CL_SoundOutput_alsa(); + + ~CL_SoundOutput_alsa(); + +//! Attributes: +public: + snd_pcm_t *handle; + snd_pcm_uframes_t frames_in_buffer; + snd_pcm_uframes_t frames_in_period; + +//! Operations: +public: + //: Called when we have no samples to play - and wants to tell the soundcard + //: about this possible event. + void silence(); + + //: Returns true if all fragments are filled with data. + bool is_full(); + + //: Returns the buffer size used by device (returned as num [stereo] samples). + int get_frag_size(); + + //: Writes a fragment to the soundcard. + void write_fragment(short *data); + + //: Waits until output source isn't full anymore. + void wait(); + +//! Implementation: +private: +}; + +#endif +#endif diff -up ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.alsa ClanLib-0.6.5/Setup/Unix/Makefile.sound.in --- ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.alsa 2008-03-02 13:18:19.000000000 +0100 +++ ClanLib-0.6.5/Setup/Unix/Makefile.sound.in 2008-03-02 13:30:35.000000000 +0100 @@ -42,6 +42,7 @@ OBJF_SOUND_CLANSOUND = \ Libs/Intermediate/cardplayback_clan.o \ Libs/Intermediate/mixer.o \ Libs/Intermediate/oss.o \ + Libs/Intermediate/alsa.o \ Libs/Intermediate/cdaudio_linux.o OBJF_SOUND_INTEL_ASM = \ @@ -51,8 +52,8 @@ OBJF_SOUND_ALL = $(OBJF_SOUND_GENERIC) $ Libs/libclanSound.so: Libs/libclanCore.so $(OBJF_SOUND_ALL) @echo "Building Libs/libclanSound.so" - @echo $(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore - @$(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore + @echo $(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore -lasound + @$(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore -lasound @ln -s -f libclanSound.so.$(D_VERSION_MINOR) Libs/libclanSound.so.$(D_VERSION_MAJOR) @ln -s -f libclanSound.so.$(D_VERSION_MAJOR) Libs/libclanSound.so Index: ClanLib06.spec =================================================================== RCS file: /cvs/extras/rpms/ClanLib06/devel/ClanLib06.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ClanLib06.spec 17 Feb 2008 18:46:11 -0000 1.10 +++ ClanLib06.spec 2 Mar 2008 12:46:39 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Version 0.6 of this Cross platform C++ game library Name: ClanLib06 Version: 0.6.5 -Release: 11%{?dist} +Release: 12%{?dist} Group: System Environment/Libraries License: LGPLv2 URL: http://www.clanlib.org/ @@ -16,6 +16,7 @@ Patch3: ClanLib-0.6.5-smalljpg.patch Patch4: ClanLib-0.6.5-gcc4.3.patch Patch5: ClanLib-0.6.5-mikmod32.patch +Patch6: ClanLib-0.6.5-alsa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel libXext-devel libXt-devel libGLU-devel BuildRequires: libICE-devel libXxf86vm-devel xorg-x11-proto-devel @@ -47,6 +48,7 @@ %patch3 -p1 -z .smalljpg %patch4 -p1 -z .gcc43 %patch5 -p1 -z .mikmod32 +%patch6 -p1 -z .alsa # mark asm files as NOT needing execstack for i in `find Sources -name '*.s'`; do echo '.section .note.GNU-stack,"", at progbits' >> $i @@ -95,6 +97,10 @@ %changelog +* Sun Mar 2 2008 Hans de Goede 0.6.5-12 +- Add support for audio output through alsa (original ClanLib only supports + OSS??), this also adds support for using pulseaudio through alsa + * Sun Feb 17 2008 Hans de Goede 0.6.5-11 - Rebuild for new libmikmod - Rebuild with gcc 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 12:54:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 12:54:06 +0000 Subject: [pkgdb] debootstrap had acl change status Message-ID: <200803021254.m22CsfNp010852@bastion.fedora.phx.redhat.com> Lubomir Kundrak (lkundrak) has set the watchbugzilla acl on debootstrap (Fedora EPEL 4) to Approved for Adam Goode (agoode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/debootstrap From fedora-extras-commits at redhat.com Sun Mar 2 12:54:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 12:54:09 +0000 Subject: [pkgdb] debootstrap had acl change status Message-ID: <200803021254.m22CsfNt010852@bastion.fedora.phx.redhat.com> Lubomir Kundrak (lkundrak) has set the watchcommits acl on debootstrap (Fedora EPEL 4) to Approved for Adam Goode (agoode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/debootstrap From fedora-extras-commits at redhat.com Sun Mar 2 12:54:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 12:54:09 +0000 Subject: [pkgdb] debootstrap had acl change status Message-ID: <200803021254.m22CsiR8010899@bastion.fedora.phx.redhat.com> Lubomir Kundrak (lkundrak) has set the commit acl on debootstrap (Fedora EPEL 4) to Approved for Adam Goode (agoode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/debootstrap From fedora-extras-commits at redhat.com Sun Mar 2 12:54:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 12:54:16 +0000 Subject: [pkgdb] debootstrap had acl change status Message-ID: <200803021254.m22Cskhd010916@bastion.fedora.phx.redhat.com> Lubomir Kundrak (lkundrak) has set the approveacls acl on debootstrap (Fedora EPEL 5) to Approved for Adam Goode (agoode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/debootstrap From fedora-extras-commits at redhat.com Sun Mar 2 12:54:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 12:54:12 +0000 Subject: [pkgdb] debootstrap had acl change status Message-ID: <200803021254.m22Cslnh010938@bastion.fedora.phx.redhat.com> Lubomir Kundrak (lkundrak) has set the approveacls acl on debootstrap (Fedora EPEL 4) to Approved for Adam Goode (agoode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/debootstrap From fedora-extras-commits at redhat.com Sun Mar 2 12:54:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 12:54:13 +0000 Subject: [pkgdb] debootstrap had acl change status Message-ID: <200803021254.m22CsiRC010899@bastion.fedora.phx.redhat.com> Lubomir Kundrak (lkundrak) has set the commit acl on debootstrap (Fedora EPEL 5) to Approved for Adam Goode (agoode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/debootstrap From fedora-extras-commits at redhat.com Sun Mar 2 12:54:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 12:54:20 +0000 Subject: [pkgdb] debootstrap had acl change status Message-ID: <200803021254.m22Cskhh010916@bastion.fedora.phx.redhat.com> Lubomir Kundrak (lkundrak) has set the watchcommits acl on debootstrap (Fedora EPEL 5) to Approved for Adam Goode (agoode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/debootstrap From fedora-extras-commits at redhat.com Sun Mar 2 12:54:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 12:54:18 +0000 Subject: [pkgdb] debootstrap had acl change status Message-ID: <200803021254.m22Cslnl010938@bastion.fedora.phx.redhat.com> Lubomir Kundrak (lkundrak) has set the watchbugzilla acl on debootstrap (Fedora EPEL 5) to Approved for Adam Goode (agoode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/debootstrap From fedora-extras-commits at redhat.com Sun Mar 2 13:19:35 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 2 Mar 2008 13:19:35 GMT Subject: rpms/pinot/devel .cvsignore, 1.6, 1.7 pinot.spec, 1.26, 1.27 sources, 1.6, 1.7 fixes_082_01.patch, 1.1, NONE pinot-0.82-gcc43-buildfix.patch, 1.6, NONE Message-ID: <200803021319.m22DJZhL009644@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/pinot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9618 Modified Files: .cvsignore pinot.spec sources Removed Files: fixes_082_01.patch pinot-0.82-gcc43-buildfix.patch Log Message: Update to 0.83 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Jan 2008 10:28:16 -0000 1.6 +++ .cvsignore 2 Mar 2008 13:19:01 -0000 1.7 @@ -1 +1 @@ -pinot-0.82.tar.gz +pinot-0.83.tar.gz Index: pinot.spec =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- pinot.spec 23 Feb 2008 12:46:54 -0000 1.26 +++ pinot.spec 2 Mar 2008 13:19:01 -0000 1.27 @@ -1,6 +1,6 @@ Name: pinot -Version: 0.82 -Release: 4%{?dist} +Version: 0.83 +Release: 1%{?dist} Summary: Personal search and metasearch for the Desktop Group: User Interface/Desktops @@ -8,8 +8,7 @@ URL: http://pinot.berlios.de/ Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz Patch0: fix_lang_detect.patch -Patch1: pinot-0.82-gcc43-buildfix.patch -Patch2: fixes_082_01.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sqlite-devel >= 3.3.1 @@ -54,8 +53,6 @@ %prep %setup -q %patch0 -p1 -b .lang_detect -%patch1 -p1 -b .gcc43 -%patch2 -p0 -b .fixes %build %configure @@ -120,6 +117,10 @@ %changelog +* Sun Mar 02 2008 Adel Gadllah 0.83-1 +- Update to 0.83 +- Drop upstreamed patches + * Sat Feb 23 2008 Adel Gadllah 0.82-4 - Add hotfix as requested by upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Jan 2008 10:28:16 -0000 1.6 +++ sources 2 Mar 2008 13:19:01 -0000 1.7 @@ -1 +1 @@ -99568299235fa72ab5cc3eae73ee68c6 pinot-0.82.tar.gz +8b915f119e33dd9651f48a584c796e9b pinot-0.83.tar.gz --- fixes_082_01.patch DELETED --- --- pinot-0.82-gcc43-buildfix.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 13:24:40 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sun, 2 Mar 2008 13:24:40 GMT Subject: rpms/pinot/F-8 .cvsignore, 1.6, 1.7 pinot.spec, 1.19, 1.20 sources, 1.6, 1.7 fixes_082_01.patch, 1.1, NONE Message-ID: <200803021324.m22DOe3l009774@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/pinot/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9744 Modified Files: .cvsignore pinot.spec sources Removed Files: fixes_082_01.patch Log Message: update to 0.83 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pinot/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Jan 2008 10:26:31 -0000 1.6 +++ .cvsignore 2 Mar 2008 13:24:07 -0000 1.7 @@ -1 +1 @@ -pinot-0.82.tar.gz +pinot-0.83.tar.gz Index: pinot.spec =================================================================== RCS file: /cvs/pkgs/rpms/pinot/F-8/pinot.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- pinot.spec 23 Feb 2008 12:54:54 -0000 1.19 +++ pinot.spec 2 Mar 2008 13:24:07 -0000 1.20 @@ -1,6 +1,6 @@ Name: pinot -Version: 0.82 -Release: 2%{?dist} +Version: 0.83 +Release: 1%{?dist} Summary: Personal search and metasearch for the Desktop Group: User Interface/Desktops @@ -8,7 +8,7 @@ URL: http://pinot.berlios.de/ Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz Patch0: fix_lang_detect.patch -Patch1: fixes_082_01.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sqlite-devel >= 3.3.1 @@ -53,7 +53,7 @@ %prep %setup -q %patch0 -p1 -b .lang_detect -%patch1 -p0 -b .fixes + %build %configure @@ -117,6 +117,10 @@ %{_libdir}/deskbar-applet/modules-2.20-compatible/pinot-* %changelog +* Sun Mar 02 2008 Adel Gadllah 0.83-1 +- Update to 0.83 +- Drop upstreamed patches + * Sat Feb 23 2008 Adel Gadllah 0.82-2 - Add hotfix as requested by upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pinot/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Jan 2008 10:26:31 -0000 1.6 +++ sources 2 Mar 2008 13:24:07 -0000 1.7 @@ -1 +1 @@ -99568299235fa72ab5cc3eae73ee68c6 pinot-0.82.tar.gz +8b915f119e33dd9651f48a584c796e9b pinot-0.83.tar.gz --- fixes_082_01.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 14:04:41 2008 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Sun, 2 Mar 2008 14:04:41 GMT Subject: rpms/audit/F-8 audit-1.6.8-audispd-memleak.patch, NONE, 1.1 audit.spec, 1.154, 1.155 Message-ID: <200803021404.m22E4fEp017437@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/pkgs/rpms/audit/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17400 Modified Files: audit.spec Added Files: audit-1.6.8-audispd-memleak.patch Log Message: * Sun Mar 02 2008 Steve Grubb 1.6.8-2 - Fix memleak in audit event dispatcher audit-1.6.8-audispd-memleak.patch: --- NEW FILE audit-1.6.8-audispd-memleak.patch --- diff -urp audit-1.6.8.orig/audisp/queue.c audit-1.6.8/audisp/queue.c --- audit-1.6.8.orig/audisp/queue.c 2008-02-14 11:52:34.000000000 -0500 +++ audit-1.6.8/audisp/queue.c 2008-03-02 08:52:50.000000000 -0500 @@ -117,13 +117,16 @@ void enqueue(event_t *e, struct daemon_c { unsigned int n, retry_cnt = 0; - if (processing_suspended) + if (processing_suspended) { + free(e); return; + } retry: // We allow 3 retries and then its over if (retry_cnt > 3) { do_overflow_action(config); + free(e); return; } pthread_mutex_lock(&queue_lock); Index: audit.spec =================================================================== RCS file: /cvs/pkgs/rpms/audit/F-8/audit.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- audit.spec 15 Feb 2008 17:03:59 -0000 1.154 +++ audit.spec 2 Mar 2008 14:04:02 -0000 1.155 @@ -1,17 +1,18 @@ %define sca_version 0.4.5 -%define sca_release 4 +%define sca_release 5 %define selinux_variants mls strict targeted %define selinux_policyver 3.0.8 Summary: User space tools for 2.6 kernel auditing Name: audit Version: 1.6.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://people.redhat.com/sgrubb/audit/ Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz Patch0: audit-1.6.8-zos.patch +Patch1: audit-1.6.8-audispd-memleak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext-devel intltool libtool swig python-devel BuildRequires: kernel-headers >= 2.6.18 @@ -96,6 +97,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 mkdir zos-remote-policy cp -p audisp/plugins/zos-remote/policy/audispd-zos-remote.* zos-remote-policy @@ -306,6 +308,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server %changelog +* Sun Mar 02 2008 Steve Grubb 1.6.8-2 +- Fix memleak in audit event dispatcher + * Fri Feb 15 2008 Steve Grubb 1.6.8-1 - New upstream version - Cleanup descriptors in audispd before running plugin From fedora-extras-commits at redhat.com Sun Mar 2 14:07:10 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 2 Mar 2008 14:07:10 GMT Subject: rpms/codeblocks/devel codeblocks.spec,1.24,1.25 Message-ID: <200803021407.m22E7AqZ017538@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17510 Modified Files: codeblocks.spec Log Message: - update plugin path generation Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- codeblocks.spec 2 Mar 2008 11:18:20 -0000 1.24 +++ codeblocks.spec 2 Mar 2008 14:06:30 -0000 1.25 @@ -73,15 +73,15 @@ # fix the dir, where plugins are installed for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler openfileslist projectsimporter scriptedwizard todo xpmanifest do - sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am + sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/$p/Makefile.* done for p in AutoVersioning BrowseTracker ThreadSearch byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems do - sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am + sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/contrib/$p/Makefile.* done -sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/wxSmith/plugin/Makefile.am +sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/contrib/wxSmith/plugin/Makefile.* sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp From fedora-extras-commits at redhat.com Sun Mar 2 14:14:08 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Sun, 2 Mar 2008 14:14:08 GMT Subject: rpms/libzzub/devel libzzub-gcc43.patch, NONE, 1.1 libzzub.spec, 1.6, 1.7 Message-ID: <200803021414.m22EE8Nr017728@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/libzzub/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17670 Modified Files: libzzub.spec Added Files: libzzub-gcc43.patch Log Message: * release -12 * patch for missing explicit gcc 4.3 includes * pyzzub %%files also seizes the python egg now libzzub-gcc43.patch: --- NEW FILE libzzub-gcc43.patch --- diff -up libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp.gcc43 libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp --- libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -45,6 +45,7 @@ Foundation, Inc., 59 Temple Place, Suite #include #include #include +#include #include diff -up libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp.gcc43 libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp --- libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp.gcc43 2008-03-02 14:40:56.000000000 +0100 +++ libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp 2008-03-02 14:41:46.000000000 +0100 @@ -17,5 +17,7 @@ #include +#include +#include #include "stdlib.h" #include "math.h" #include diff -up libzzub-0.2.3/src/plugins/lunar/pugxml.h.gcc43 libzzub-0.2.3/src/plugins/lunar/pugxml.h --- libzzub-0.2.3/src/plugins/lunar/pugxml.h.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/lunar/pugxml.h 2008-03-02 14:35:43.000000000 +0100 @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include #if defined(PUGOPT_MEMFIL) | defined(PUGOPT_NONSEG) # include diff -up libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp.gcc43 libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp --- libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "zzub/plugin.h" #include "lunarstd.h" diff -up libzzub-0.2.3/src/plugins/lunar/lunar.cpp.gcc43 libzzub-0.2.3/src/plugins/lunar/lunar.cpp --- libzzub-0.2.3/src/plugins/lunar/lunar.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/lunar/lunar.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -57,6 +57,7 @@ extern "C" { #include #include #include +#include #include #include #include diff -up libzzub-0.2.3/src/libzzub/pattern.h.gcc43 libzzub-0.2.3/src/libzzub/pattern.h --- libzzub-0.2.3/src/libzzub/pattern.h.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/libzzub/pattern.h 2008-03-02 14:35:43.000000000 +0100 @@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include "filereader.h" #ifndef SIZE_T_MAX + #include #define SIZE_T_MAX UINT_MAX #endif diff -up libzzub-0.2.3/src/libzzub/common.h.gcc43 libzzub-0.2.3/src/libzzub/common.h --- libzzub-0.2.3/src/libzzub/common.h.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/libzzub/common.h 2008-03-02 14:35:43.000000000 +0100 @@ -109,6 +109,7 @@ enum LoadProgressType { #include #include #include +#include #include #include #include diff -up libzzub-0.2.3/src/rtaudio/RtAudio.cpp.gcc43 libzzub-0.2.3/src/rtaudio/RtAudio.cpp --- libzzub-0.2.3/src/rtaudio/RtAudio.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/rtaudio/RtAudio.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -47,7 +47,10 @@ #include "RtAudio.h" #include +#include +#include #include +#include // Static variable definitions. const unsigned int RtApi::MAX_SAMPLE_RATES = 14; Index: libzzub.spec =================================================================== RCS file: /cvs/pkgs/rpms/libzzub/devel/libzzub.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libzzub.spec 18 Feb 2008 19:07:49 -0000 1.6 +++ libzzub.spec 2 Mar 2008 14:13:32 -0000 1.7 @@ -1,6 +1,6 @@ Name: libzzub Version: 0.2.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Powerful music sequencing library Group: System Environment/Libraries @@ -19,6 +19,7 @@ Patch1: libzzub-sonamefix.patch Patch2: libzzub-internalflacfix.patch Patch3: libzzub-doclocationfix.patch +Patch4: libzzub-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 @@ -69,6 +70,14 @@ mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp %patch2 -p1 -b .internalflacfix %patch3 -p1 -b .doclocationfix +mac2unix src/libzzub/{pattern,common}.h \ + src/rtaudio/RtAudio.cpp \ + src/plugins/lunar/lunarstd.cpp \ + src/plugins/firesledge_parameq/ParamEq.cpp \ + src/plugins/joachims_multi_v2/main.cpp \ + src/plugins/lunar/pugxml.h \ + src/plugins/lunar/lunar.cpp +%patch4 -p1 -b .gcc43 %build @@ -118,7 +127,6 @@ cd src/pyzzub %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean @@ -146,9 +154,13 @@ %files -n pyzzub %defattr(-,root,root,-) -%{python_sitelib}/zzub +%{python_sitelib}/* %changelog +* Sun Mar 2 2008 Alexander Kahl - 0.2.3-12 +- patch for missing explicit gcc 4.3 includes +- pyzzub %%files also seizes the python egg now + * Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-11 - Autorebuild for GCC 4.3 @@ -178,7 +190,7 @@ - fixed double source definition - adapted modified source tarball w/ mp3 support removed - added patch to use internal flac support -- removed INSTALL from %doc +- removed INSTALL from %%doc - removed explicit python requirement - replaced static rm commands with macros From fedora-extras-commits at redhat.com Sun Mar 2 14:17:20 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 2 Mar 2008 14:17:20 GMT Subject: rpms/xscreensaver/F-7 xscreensaver-5.05-addopts.patch, NONE, 1.1 xscreensaver-5.05-webcollage-default-nonet.patch, NONE, 1.1 xscreensaver.spec, 1.49, 1.50 xscreensaver-5.04-webcollage-default-nonet.patch, 1.1, NONE Message-ID: <200803021417.m22EHKdI017900@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17830/F-7 Modified Files: xscreensaver.spec Added Files: xscreensaver-5.05-addopts.patch xscreensaver-5.05-webcollage-default-nonet.patch Removed Files: xscreensaver-5.04-webcollage-default-nonet.patch Log Message: * Sun Mar 2 2008 Mamoru Tasaka - 1:5.05-1 - Update to 5.05 xscreensaver-5.05-addopts.patch: --- NEW FILE xscreensaver-5.05-addopts.patch --- --- xscreensaver-5.05/configure.in.opts 2008-03-02 22:41:39.000000000 +0900 +++ xscreensaver-5.05/configure.in 2008-03-02 22:48:04.000000000 +0900 @@ -395,10 +395,18 @@ ]) AC_DEFUN(AC_NO_LONG_STRING_WARNINGS, - [AC_CHECK_GCC_ARG(no_overlength, -Wno-overlength-strings)]) + [AC_CHECK_GCC_ARG(no_overlength, -Wno-overlength-strings) + if test $ac_gcc_accepts_no_overlength = yes ; then + CC="$CC -Wno-overlength-strings" + fi +]) AC_DEFUN(AC_NO_MISPLACED_DECLARATIONS, - [AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement)]) + [AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement) + if test $ac_gcc_accepts_no_decl_after = yes ; then + CC="$CC -Wdeclaration-after-statement" + fi +]) ############################################################################### xscreensaver-5.05-webcollage-default-nonet.patch: --- NEW FILE xscreensaver-5.05-webcollage-default-nonet.patch --- --- xscreensaver-5.05/driver/XScreenSaver.ad.in.nonet 2008-03-02 06:33:47.000000000 +0900 +++ xscreensaver-5.05/driver/XScreenSaver.ad.in 2008-03-02 20:13:51.000000000 +0900 @@ -306,10 +306,12 @@ m6502 -root \n\ abstractile -root \n\ - lcdscrub -root \n\ -- default-n: webcollage -root \n\ +- default-n: webcollage -root \ + -directory @DEFAULT_IMAGE_DIRECTORY@ \n\ - default-n: "WebCollage (whacked)" \ webcollage -root -filter \ - 'vidwhacker -stdin -stdout' \n\ + 'vidwhacker -stdin -stdout' \ + -directory @DEFAULT_IMAGE_DIRECTORY@ \n\ - default-n: vidwhacker -root \n\ \ @GL_KLUDGE@ GL: gears -root \n\ --- xscreensaver-5.05/hacks/config/webcollage.xml.nonet 2006-03-20 21:47:40.000000000 +0900 +++ xscreensaver-5.05/hacks/config/webcollage.xml 2008-03-02 20:09:16.000000000 +0900 @@ -20,7 +20,7 @@ - + <_description> This program makes collages out of random images pulled off of the Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- xscreensaver.spec 13 Nov 2007 10:49:54 -0000 1.49 +++ xscreensaver.spec 2 Mar 2008 14:16:44 -0000 1.50 @@ -1,22 +1,15 @@ %define name xscreensaver -%define version 5.04 +%define version 5.05 %define beta_ver %{nil} -%if 0%{?fedora} <= 6 -%define modular_conf 0 -%define fedora_rel 1.12 -%else + + %define modular_conf 1 %define fedora_rel 1 -%endif %define extrarel %{nil} -%if 0%{?fedora} >= 7 %define default_text %{_datadir}/doc/HTML/README-Accessibility -%else -%define default_text %{_datadir}/doc/eula.en_US -%endif %define pam_ver 0.80-7 %define autoconf_ver 2.53 @@ -38,7 +31,8 @@ Source10: update-xscreensaver-hacks %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -Patch21: xscreensaver-5.04-webcollage-default-nonet.patch +Patch3: xscreensaver-5.05-addopts.patch +Patch21: xscreensaver-5.05-webcollage-default-nonet.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -46,6 +40,7 @@ %package base Summary: A minimal installation of xscreensaver Group: Amusements/Graphics +BuildRequires: autoconf BuildRequires: bc BuildRequires: desktop-file-utils BuildRequires: gawk @@ -67,16 +62,10 @@ BuildRequires: gtk2-devel BuildRequires: libjpeg-devel BuildRequires: libglade2-devel -%if 0%{?fedora} >= 7 BuildRequires: fedora-release-notes -%else -BuildRequires: fedora-release -%endif Requires: %{_sysconfdir}/pam.d/system-auth Requires: pam > %{pam_ver} -%if 0%{?fedora} >= 7 Requires: xdg-utils -%endif Requires: xorg-x11-resutils Requires: xorg-x11-fonts-ISO8859-1-100dpi @@ -184,6 +173,7 @@ %setup -q -n %{name}-%{version}%{?beta_ver} %patch1 -p1 -b .sanitize-hacks +%patch3 -p1 -b .opts %patch21 -p1 -b .nonet change_option(){ @@ -285,7 +275,15 @@ cp -p %{_datadir}/libtool/config.{sub,guess} . fi +# fix for desktop-file-utils 0.14+ +%if 0%{?fedora} >= 9 +sed -i.icon -e 's|xscreensaver\.xpm|xscreensaver|' \ + driver/screensaver-properties.desktop.in +%endif + %build +autoconf + archdir=`./config.guess` mkdir $archdir cd $archdir @@ -297,11 +295,7 @@ CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}" CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults" CONFIG_OPTS="$CONFIG_OPTS --disable-root-passwd" -%if 0%{?fedora} >= 7 CONFIG_OPTS="$CONFIG_OPTS --with-browser=xdg-open" -%else -CONFIG_OPTS="$CONFIG_OPTS --with-browser=htmlview" -%endif # This is flaky: # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager" @@ -356,7 +350,7 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ --add-category DesktopSettings \ -%if 0%{?fedora} <= 7 +%if 0 --add-category X-Red-Hat-Base \ %else --remove-category Appearance \ @@ -566,6 +560,22 @@ %defattr(-,root,root,-) %changelog +* Sun Mar 2 2008 Mamoru Tasaka - 1:5.05-1 +- Update to 5.05 + +* Sun Feb 10 2008 Mamoru Tasaka - 1:5.04-5 +- Add -Wno-overlength-strings to shut up string length warning + +* Sat Feb 9 2008 Mamoru Tasaka - 1:5.04-4 +- Add patch to xscreensaver be happy with gcc43 +- Rebuild against gcc43 + +* Fri Dec 7 2007 Mamoru Tasaka - 1:5.04-3 +- Fix desktop icon name for desktop-file-utils 0.14+ on F-9+ + +* Fri Nov 16 2007 Mamoru Tasaka - 1:5.04-2 +- Rebuild against fixed mesa for F-9 (bug 380141) + * Tue Nov 13 2007 Mamoru Tasaka - 1:5.04-1 - Update to 5.04 --- xscreensaver-5.04-webcollage-default-nonet.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 14:17:28 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 2 Mar 2008 14:17:28 GMT Subject: rpms/xscreensaver/F-8 xscreensaver-5.05-addopts.patch, NONE, 1.1 xscreensaver-5.05-webcollage-default-nonet.patch, NONE, 1.1 xscreensaver.spec, 1.60, 1.61 xscreensaver-5.04-webcollage-default-nonet.patch, 1.1, NONE Message-ID: <200803021417.m22EHSGE017906@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17830/F-8 Modified Files: xscreensaver.spec Added Files: xscreensaver-5.05-addopts.patch xscreensaver-5.05-webcollage-default-nonet.patch Removed Files: xscreensaver-5.04-webcollage-default-nonet.patch Log Message: * Sun Mar 2 2008 Mamoru Tasaka - 1:5.05-1 - Update to 5.05 xscreensaver-5.05-addopts.patch: --- NEW FILE xscreensaver-5.05-addopts.patch --- --- xscreensaver-5.05/configure.in.opts 2008-03-02 22:41:39.000000000 +0900 +++ xscreensaver-5.05/configure.in 2008-03-02 22:48:04.000000000 +0900 @@ -395,10 +395,18 @@ ]) AC_DEFUN(AC_NO_LONG_STRING_WARNINGS, - [AC_CHECK_GCC_ARG(no_overlength, -Wno-overlength-strings)]) + [AC_CHECK_GCC_ARG(no_overlength, -Wno-overlength-strings) + if test $ac_gcc_accepts_no_overlength = yes ; then + CC="$CC -Wno-overlength-strings" + fi +]) AC_DEFUN(AC_NO_MISPLACED_DECLARATIONS, - [AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement)]) + [AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement) + if test $ac_gcc_accepts_no_decl_after = yes ; then + CC="$CC -Wdeclaration-after-statement" + fi +]) ############################################################################### xscreensaver-5.05-webcollage-default-nonet.patch: --- NEW FILE xscreensaver-5.05-webcollage-default-nonet.patch --- --- xscreensaver-5.05/driver/XScreenSaver.ad.in.nonet 2008-03-02 06:33:47.000000000 +0900 +++ xscreensaver-5.05/driver/XScreenSaver.ad.in 2008-03-02 20:13:51.000000000 +0900 @@ -306,10 +306,12 @@ m6502 -root \n\ abstractile -root \n\ - lcdscrub -root \n\ -- default-n: webcollage -root \n\ +- default-n: webcollage -root \ + -directory @DEFAULT_IMAGE_DIRECTORY@ \n\ - default-n: "WebCollage (whacked)" \ webcollage -root -filter \ - 'vidwhacker -stdin -stdout' \n\ + 'vidwhacker -stdin -stdout' \ + -directory @DEFAULT_IMAGE_DIRECTORY@ \n\ - default-n: vidwhacker -root \n\ \ @GL_KLUDGE@ GL: gears -root \n\ --- xscreensaver-5.05/hacks/config/webcollage.xml.nonet 2006-03-20 21:47:40.000000000 +0900 +++ xscreensaver-5.05/hacks/config/webcollage.xml 2008-03-02 20:09:16.000000000 +0900 @@ -20,7 +20,7 @@ - + <_description> This program makes collages out of random images pulled off of the Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- xscreensaver.spec 13 Nov 2007 10:49:59 -0000 1.60 +++ xscreensaver.spec 2 Mar 2008 14:16:50 -0000 1.61 @@ -1,22 +1,15 @@ %define name xscreensaver -%define version 5.04 +%define version 5.05 %define beta_ver %{nil} -%if 0%{?fedora} <= 6 -%define modular_conf 0 -%define fedora_rel 1.12 -%else + + %define modular_conf 1 %define fedora_rel 1 -%endif %define extrarel %{nil} -%if 0%{?fedora} >= 7 %define default_text %{_datadir}/doc/HTML/README-Accessibility -%else -%define default_text %{_datadir}/doc/eula.en_US -%endif %define pam_ver 0.80-7 %define autoconf_ver 2.53 @@ -38,7 +31,8 @@ Source10: update-xscreensaver-hacks %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -Patch21: xscreensaver-5.04-webcollage-default-nonet.patch +Patch3: xscreensaver-5.05-addopts.patch +Patch21: xscreensaver-5.05-webcollage-default-nonet.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -46,6 +40,7 @@ %package base Summary: A minimal installation of xscreensaver Group: Amusements/Graphics +BuildRequires: autoconf BuildRequires: bc BuildRequires: desktop-file-utils BuildRequires: gawk @@ -67,16 +62,10 @@ BuildRequires: gtk2-devel BuildRequires: libjpeg-devel BuildRequires: libglade2-devel -%if 0%{?fedora} >= 7 BuildRequires: fedora-release-notes -%else -BuildRequires: fedora-release -%endif Requires: %{_sysconfdir}/pam.d/system-auth Requires: pam > %{pam_ver} -%if 0%{?fedora} >= 7 Requires: xdg-utils -%endif Requires: xorg-x11-resutils Requires: xorg-x11-fonts-ISO8859-1-100dpi @@ -184,6 +173,7 @@ %setup -q -n %{name}-%{version}%{?beta_ver} %patch1 -p1 -b .sanitize-hacks +%patch3 -p1 -b .opts %patch21 -p1 -b .nonet change_option(){ @@ -285,7 +275,15 @@ cp -p %{_datadir}/libtool/config.{sub,guess} . fi +# fix for desktop-file-utils 0.14+ +%if 0%{?fedora} >= 9 +sed -i.icon -e 's|xscreensaver\.xpm|xscreensaver|' \ + driver/screensaver-properties.desktop.in +%endif + %build +autoconf + archdir=`./config.guess` mkdir $archdir cd $archdir @@ -297,11 +295,7 @@ CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}" CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults" CONFIG_OPTS="$CONFIG_OPTS --disable-root-passwd" -%if 0%{?fedora} >= 7 CONFIG_OPTS="$CONFIG_OPTS --with-browser=xdg-open" -%else -CONFIG_OPTS="$CONFIG_OPTS --with-browser=htmlview" -%endif # This is flaky: # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager" @@ -356,7 +350,7 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ --add-category DesktopSettings \ -%if 0%{?fedora} <= 7 +%if 0 --add-category X-Red-Hat-Base \ %else --remove-category Appearance \ @@ -566,6 +560,22 @@ %defattr(-,root,root,-) %changelog +* Sun Mar 2 2008 Mamoru Tasaka - 1:5.05-1 +- Update to 5.05 + +* Sun Feb 10 2008 Mamoru Tasaka - 1:5.04-5 +- Add -Wno-overlength-strings to shut up string length warning + +* Sat Feb 9 2008 Mamoru Tasaka - 1:5.04-4 +- Add patch to xscreensaver be happy with gcc43 +- Rebuild against gcc43 + +* Fri Dec 7 2007 Mamoru Tasaka - 1:5.04-3 +- Fix desktop icon name for desktop-file-utils 0.14+ on F-9+ + +* Fri Nov 16 2007 Mamoru Tasaka - 1:5.04-2 +- Rebuild against fixed mesa for F-9 (bug 380141) + * Tue Nov 13 2007 Mamoru Tasaka - 1:5.04-1 - Update to 5.04 --- xscreensaver-5.04-webcollage-default-nonet.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 14:17:33 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 2 Mar 2008 14:17:33 GMT Subject: rpms/xscreensaver/devel xscreensaver-5.05-addopts.patch, NONE, 1.1 xscreensaver-5.05-webcollage-default-nonet.patch, NONE, 1.1 xscreensaver.spec, 1.65, 1.66 xscreensaver-5.04-gcc43.patch, 1.1, NONE xscreensaver-5.04-webcollage-default-nonet.patch, 1.1, NONE Message-ID: <200803021417.m22EHXaE017909@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17830/devel Modified Files: xscreensaver.spec Added Files: xscreensaver-5.05-addopts.patch xscreensaver-5.05-webcollage-default-nonet.patch Removed Files: xscreensaver-5.04-gcc43.patch xscreensaver-5.04-webcollage-default-nonet.patch Log Message: * Sun Mar 2 2008 Mamoru Tasaka - 1:5.05-1 - Update to 5.05 xscreensaver-5.05-addopts.patch: --- NEW FILE xscreensaver-5.05-addopts.patch --- --- xscreensaver-5.05/configure.in.opts 2008-03-02 22:41:39.000000000 +0900 +++ xscreensaver-5.05/configure.in 2008-03-02 22:48:04.000000000 +0900 @@ -395,10 +395,18 @@ ]) AC_DEFUN(AC_NO_LONG_STRING_WARNINGS, - [AC_CHECK_GCC_ARG(no_overlength, -Wno-overlength-strings)]) + [AC_CHECK_GCC_ARG(no_overlength, -Wno-overlength-strings) + if test $ac_gcc_accepts_no_overlength = yes ; then + CC="$CC -Wno-overlength-strings" + fi +]) AC_DEFUN(AC_NO_MISPLACED_DECLARATIONS, - [AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement)]) + [AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement) + if test $ac_gcc_accepts_no_decl_after = yes ; then + CC="$CC -Wdeclaration-after-statement" + fi +]) ############################################################################### xscreensaver-5.05-webcollage-default-nonet.patch: --- NEW FILE xscreensaver-5.05-webcollage-default-nonet.patch --- --- xscreensaver-5.05/driver/XScreenSaver.ad.in.nonet 2008-03-02 06:33:47.000000000 +0900 +++ xscreensaver-5.05/driver/XScreenSaver.ad.in 2008-03-02 20:13:51.000000000 +0900 @@ -306,10 +306,12 @@ m6502 -root \n\ abstractile -root \n\ - lcdscrub -root \n\ -- default-n: webcollage -root \n\ +- default-n: webcollage -root \ + -directory @DEFAULT_IMAGE_DIRECTORY@ \n\ - default-n: "WebCollage (whacked)" \ webcollage -root -filter \ - 'vidwhacker -stdin -stdout' \n\ + 'vidwhacker -stdin -stdout' \ + -directory @DEFAULT_IMAGE_DIRECTORY@ \n\ - default-n: vidwhacker -root \n\ \ @GL_KLUDGE@ GL: gears -root \n\ --- xscreensaver-5.05/hacks/config/webcollage.xml.nonet 2006-03-20 21:47:40.000000000 +0900 +++ xscreensaver-5.05/hacks/config/webcollage.xml 2008-03-02 20:09:16.000000000 +0900 @@ -20,7 +20,7 @@ - + <_description> This program makes collages out of random images pulled off of the Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- xscreensaver.spec 10 Feb 2008 11:56:01 -0000 1.65 +++ xscreensaver.spec 2 Mar 2008 14:16:58 -0000 1.66 @@ -1,11 +1,11 @@ %define name xscreensaver -%define version 5.04 +%define version 5.05 %define beta_ver %{nil} %define modular_conf 1 -%define fedora_rel 5 +%define fedora_rel 1 %define extrarel %{nil} @@ -31,8 +31,8 @@ Source10: update-xscreensaver-hacks %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -Patch2: xscreensaver-5.04-gcc43.patch -Patch21: xscreensaver-5.04-webcollage-default-nonet.patch +Patch3: xscreensaver-5.05-addopts.patch +Patch21: xscreensaver-5.05-webcollage-default-nonet.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release} @@ -40,6 +40,7 @@ %package base Summary: A minimal installation of xscreensaver Group: Amusements/Graphics +BuildRequires: autoconf BuildRequires: bc BuildRequires: desktop-file-utils BuildRequires: gawk @@ -172,7 +173,7 @@ %setup -q -n %{name}-%{version}%{?beta_ver} %patch1 -p1 -b .sanitize-hacks -%patch2 -p1 -b .gcc43 +%patch3 -p1 -b .opts %patch21 -p1 -b .nonet change_option(){ @@ -281,14 +282,13 @@ %endif %build +autoconf + archdir=`./config.guess` mkdir $archdir cd $archdir export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" -%if 0%{?fedora} >= 9 -export CFLAGS="$CFLAGS -Wno-overlength-strings" -%endif CONFIG_OPTS="--prefix=%{_prefix} --with-pam --without-shadow --without-kerberos" CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks" @@ -560,6 +560,9 @@ %defattr(-,root,root,-) %changelog +* Sun Mar 2 2008 Mamoru Tasaka - 1:5.05-1 +- Update to 5.05 + * Sun Feb 10 2008 Mamoru Tasaka - 1:5.04-5 - Add -Wno-overlength-strings to shut up string length warning --- xscreensaver-5.04-gcc43.patch DELETED --- --- xscreensaver-5.04-webcollage-default-nonet.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 14:20:30 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 2 Mar 2008 14:20:30 GMT Subject: rpms/xscreensaver/F-7 .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200803021420.m22EKUWD018023@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17956/F-7 Modified Files: .cvsignore sources Log Message: Upload new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-7/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Nov 2007 10:49:54 -0000 1.6 +++ .cvsignore 2 Mar 2008 14:19:54 -0000 1.7 @@ -1 +1 @@ -xscreensaver-5.04.tar.gz +xscreensaver-5.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-7/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Nov 2007 10:49:54 -0000 1.6 +++ sources 2 Mar 2008 14:19:54 -0000 1.7 @@ -1 +1 @@ -1d27b5ddecdb49c806d1e91ca82fc43e xscreensaver-5.04.tar.gz +d759262b10d76f87f1a7fc50ae8664d4 xscreensaver-5.05.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 14:20:36 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 2 Mar 2008 14:20:36 GMT Subject: rpms/xscreensaver/F-8 .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200803021420.m22EKax1018029@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17956/F-8 Modified Files: .cvsignore sources Log Message: Upload new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Nov 2007 10:49:59 -0000 1.6 +++ .cvsignore 2 Mar 2008 14:20:00 -0000 1.7 @@ -1 +1 @@ -xscreensaver-5.04.tar.gz +xscreensaver-5.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Nov 2007 10:49:59 -0000 1.6 +++ sources 2 Mar 2008 14:20:00 -0000 1.7 @@ -1 +1 @@ -1d27b5ddecdb49c806d1e91ca82fc43e xscreensaver-5.04.tar.gz +d759262b10d76f87f1a7fc50ae8664d4 xscreensaver-5.05.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 14:20:44 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 2 Mar 2008 14:20:44 GMT Subject: rpms/xscreensaver/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200803021420.m22EKihF018036@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17956/devel Modified Files: .cvsignore sources Log Message: Upload new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Nov 2007 10:50:02 -0000 1.6 +++ .cvsignore 2 Mar 2008 14:20:06 -0000 1.7 @@ -1 +1 @@ -xscreensaver-5.04.tar.gz +xscreensaver-5.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Nov 2007 10:50:03 -0000 1.6 +++ sources 2 Mar 2008 14:20:06 -0000 1.7 @@ -1 +1 @@ -1d27b5ddecdb49c806d1e91ca82fc43e xscreensaver-5.04.tar.gz +d759262b10d76f87f1a7fc50ae8664d4 xscreensaver-5.05.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 14:45:07 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Sun, 2 Mar 2008 14:45:07 GMT Subject: rpms/libzzub/F-7 libzzub-gcc43.patch,NONE,1.1 libzzub.spec,1.5,1.6 Message-ID: <200803021445.m22Ej78S018656@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/libzzub/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18612/F-7 Modified Files: libzzub.spec Added Files: libzzub-gcc43.patch Log Message: * adapted -12 from devel libzzub-gcc43.patch: --- NEW FILE libzzub-gcc43.patch --- diff -up libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp.gcc43 libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp --- libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -45,6 +45,7 @@ Foundation, Inc., 59 Temple Place, Suite #include #include #include +#include #include diff -up libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp.gcc43 libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp --- libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp.gcc43 2008-03-02 14:40:56.000000000 +0100 +++ libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp 2008-03-02 14:41:46.000000000 +0100 @@ -17,5 +17,7 @@ #include +#include +#include #include "stdlib.h" #include "math.h" #include diff -up libzzub-0.2.3/src/plugins/lunar/pugxml.h.gcc43 libzzub-0.2.3/src/plugins/lunar/pugxml.h --- libzzub-0.2.3/src/plugins/lunar/pugxml.h.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/lunar/pugxml.h 2008-03-02 14:35:43.000000000 +0100 @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include #if defined(PUGOPT_MEMFIL) | defined(PUGOPT_NONSEG) # include diff -up libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp.gcc43 libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp --- libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "zzub/plugin.h" #include "lunarstd.h" diff -up libzzub-0.2.3/src/plugins/lunar/lunar.cpp.gcc43 libzzub-0.2.3/src/plugins/lunar/lunar.cpp --- libzzub-0.2.3/src/plugins/lunar/lunar.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/lunar/lunar.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -57,6 +57,7 @@ extern "C" { #include #include #include +#include #include #include #include diff -up libzzub-0.2.3/src/libzzub/pattern.h.gcc43 libzzub-0.2.3/src/libzzub/pattern.h --- libzzub-0.2.3/src/libzzub/pattern.h.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/libzzub/pattern.h 2008-03-02 14:35:43.000000000 +0100 @@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include "filereader.h" #ifndef SIZE_T_MAX + #include #define SIZE_T_MAX UINT_MAX #endif diff -up libzzub-0.2.3/src/libzzub/common.h.gcc43 libzzub-0.2.3/src/libzzub/common.h --- libzzub-0.2.3/src/libzzub/common.h.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/libzzub/common.h 2008-03-02 14:35:43.000000000 +0100 @@ -109,6 +109,7 @@ enum LoadProgressType { #include #include #include +#include #include #include #include diff -up libzzub-0.2.3/src/rtaudio/RtAudio.cpp.gcc43 libzzub-0.2.3/src/rtaudio/RtAudio.cpp --- libzzub-0.2.3/src/rtaudio/RtAudio.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/rtaudio/RtAudio.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -47,7 +47,10 @@ #include "RtAudio.h" #include +#include +#include #include +#include // Static variable definitions. const unsigned int RtApi::MAX_SAMPLE_RATES = 14; Index: libzzub.spec =================================================================== RCS file: /cvs/pkgs/rpms/libzzub/F-7/libzzub.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libzzub.spec 20 Nov 2007 10:12:38 -0000 1.5 +++ libzzub.spec 2 Mar 2008 14:44:30 -0000 1.6 @@ -1,6 +1,6 @@ Name: libzzub Version: 0.2.3 -Release: 10%{?dist} +Release: 12%{?dist} Summary: Powerful music sequencing library Group: System Environment/Libraries @@ -19,6 +19,7 @@ Patch1: libzzub-sonamefix.patch Patch2: libzzub-internalflacfix.patch Patch3: libzzub-doclocationfix.patch +Patch4: libzzub-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 @@ -69,6 +70,14 @@ mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp %patch2 -p1 -b .internalflacfix %patch3 -p1 -b .doclocationfix +mac2unix src/libzzub/{pattern,common}.h \ + src/rtaudio/RtAudio.cpp \ + src/plugins/lunar/lunarstd.cpp \ + src/plugins/firesledge_parameq/ParamEq.cpp \ + src/plugins/joachims_multi_v2/main.cpp \ + src/plugins/lunar/pugxml.h \ + src/plugins/lunar/lunar.cpp +%patch4 -p1 -b .gcc43 %build @@ -118,7 +127,6 @@ cd src/pyzzub %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean @@ -146,9 +154,16 @@ %files -n pyzzub %defattr(-,root,root,-) -%{python_sitelib}/zzub +%{python_sitelib}/* %changelog +* Sun Mar 2 2008 Alexander Kahl - 0.2.3-12 +- patch for missing explicit gcc 4.3 includes +- pyzzub %%files also seizes the python egg now + +* Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-11 +- Autorebuild for GCC 4.3 + * Tue Nov 20 2007 Alexander Kahl - 0.2.3-10 - updated buildfix patch to drop explicit sse optimizations - removed JOBS option again since scons supports -j build option @@ -175,7 +190,7 @@ - fixed double source definition - adapted modified source tarball w/ mp3 support removed - added patch to use internal flac support -- removed INSTALL from %doc +- removed INSTALL from %%doc - removed explicit python requirement - replaced static rm commands with macros From fedora-extras-commits at redhat.com Sun Mar 2 14:45:13 2008 From: fedora-extras-commits at redhat.com (Alexander Kahl (akahl)) Date: Sun, 2 Mar 2008 14:45:13 GMT Subject: rpms/libzzub/F-8 libzzub-gcc43.patch,NONE,1.1 libzzub.spec,1.6,1.7 Message-ID: <200803021445.m22EjDqN018659@cvs-int.fedora.redhat.com> Author: akahl Update of /cvs/pkgs/rpms/libzzub/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18612/F-8 Modified Files: libzzub.spec Added Files: libzzub-gcc43.patch Log Message: * adapted -12 from devel libzzub-gcc43.patch: --- NEW FILE libzzub-gcc43.patch --- diff -up libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp.gcc43 libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp --- libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -45,6 +45,7 @@ Foundation, Inc., 59 Temple Place, Suite #include #include #include +#include #include diff -up libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp.gcc43 libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp --- libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp.gcc43 2008-03-02 14:40:56.000000000 +0100 +++ libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp 2008-03-02 14:41:46.000000000 +0100 @@ -17,5 +17,7 @@ #include +#include +#include #include "stdlib.h" #include "math.h" #include diff -up libzzub-0.2.3/src/plugins/lunar/pugxml.h.gcc43 libzzub-0.2.3/src/plugins/lunar/pugxml.h --- libzzub-0.2.3/src/plugins/lunar/pugxml.h.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/lunar/pugxml.h 2008-03-02 14:35:43.000000000 +0100 @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include #if defined(PUGOPT_MEMFIL) | defined(PUGOPT_NONSEG) # include diff -up libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp.gcc43 libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp --- libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "zzub/plugin.h" #include "lunarstd.h" diff -up libzzub-0.2.3/src/plugins/lunar/lunar.cpp.gcc43 libzzub-0.2.3/src/plugins/lunar/lunar.cpp --- libzzub-0.2.3/src/plugins/lunar/lunar.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/plugins/lunar/lunar.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -57,6 +57,7 @@ extern "C" { #include #include #include +#include #include #include #include diff -up libzzub-0.2.3/src/libzzub/pattern.h.gcc43 libzzub-0.2.3/src/libzzub/pattern.h --- libzzub-0.2.3/src/libzzub/pattern.h.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/libzzub/pattern.h 2008-03-02 14:35:43.000000000 +0100 @@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include "filereader.h" #ifndef SIZE_T_MAX + #include #define SIZE_T_MAX UINT_MAX #endif diff -up libzzub-0.2.3/src/libzzub/common.h.gcc43 libzzub-0.2.3/src/libzzub/common.h --- libzzub-0.2.3/src/libzzub/common.h.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/libzzub/common.h 2008-03-02 14:35:43.000000000 +0100 @@ -109,6 +109,7 @@ enum LoadProgressType { #include #include #include +#include #include #include #include diff -up libzzub-0.2.3/src/rtaudio/RtAudio.cpp.gcc43 libzzub-0.2.3/src/rtaudio/RtAudio.cpp --- libzzub-0.2.3/src/rtaudio/RtAudio.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100 +++ libzzub-0.2.3/src/rtaudio/RtAudio.cpp 2008-03-02 14:35:43.000000000 +0100 @@ -47,7 +47,10 @@ #include "RtAudio.h" #include +#include +#include #include +#include // Static variable definitions. const unsigned int RtApi::MAX_SAMPLE_RATES = 14; Index: libzzub.spec =================================================================== RCS file: /cvs/pkgs/rpms/libzzub/F-8/libzzub.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libzzub.spec 20 Nov 2007 10:12:41 -0000 1.6 +++ libzzub.spec 2 Mar 2008 14:44:37 -0000 1.7 @@ -1,6 +1,6 @@ Name: libzzub Version: 0.2.3 -Release: 10%{?dist} +Release: 12%{?dist} Summary: Powerful music sequencing library Group: System Environment/Libraries @@ -19,6 +19,7 @@ Patch1: libzzub-sonamefix.patch Patch2: libzzub-internalflacfix.patch Patch3: libzzub-doclocationfix.patch +Patch4: libzzub-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 @@ -69,6 +70,14 @@ mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp %patch2 -p1 -b .internalflacfix %patch3 -p1 -b .doclocationfix +mac2unix src/libzzub/{pattern,common}.h \ + src/rtaudio/RtAudio.cpp \ + src/plugins/lunar/lunarstd.cpp \ + src/plugins/firesledge_parameq/ParamEq.cpp \ + src/plugins/joachims_multi_v2/main.cpp \ + src/plugins/lunar/pugxml.h \ + src/plugins/lunar/lunar.cpp +%patch4 -p1 -b .gcc43 %build @@ -118,7 +127,6 @@ cd src/pyzzub %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean @@ -146,9 +154,16 @@ %files -n pyzzub %defattr(-,root,root,-) -%{python_sitelib}/zzub +%{python_sitelib}/* %changelog +* Sun Mar 2 2008 Alexander Kahl - 0.2.3-12 +- patch for missing explicit gcc 4.3 includes +- pyzzub %%files also seizes the python egg now + +* Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-11 +- Autorebuild for GCC 4.3 + * Tue Nov 20 2007 Alexander Kahl - 0.2.3-10 - updated buildfix patch to drop explicit sse optimizations - removed JOBS option again since scons supports -j build option @@ -175,7 +190,7 @@ - fixed double source definition - adapted modified source tarball w/ mp3 support removed - added patch to use internal flac support -- removed INSTALL from %doc +- removed INSTALL from %%doc - removed explicit python requirement - replaced static rm commands with macros From fedora-extras-commits at redhat.com Sun Mar 2 14:58:57 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 14:58:57 GMT Subject: rpms/autogen/devel autogen.spec,1.10,1.11 Message-ID: <200803021458.m22EwvoI018945@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/autogen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18919 Modified Files: autogen.spec Log Message: Fixed Spec in devel. Modified Files: autogen.spec Index: autogen.spec =================================================================== RCS file: /cvs/pkgs/rpms/autogen/devel/autogen.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- autogen.spec 28 Feb 2008 02:55:24 -0000 1.10 +++ autogen.spec 2 Mar 2008 14:58:22 -0000 1.11 @@ -73,9 +73,11 @@ # Static libraries are needed to run test-suite. %configure -# Omit unused direct shared library dependencies. +# Fix Libtool to remove rpaths. rm -f ./libtool cp %{_bindir}/libtool . + +# Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' ./libtool make %{?_smp_mflags} From fedora-extras-commits at redhat.com Sun Mar 2 14:59:36 2008 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Sun, 2 Mar 2008 14:59:36 GMT Subject: rpms/bodr/devel .cvsignore, 1.2, 1.3 bodr.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200803021459.m22ExajS018986@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/pkgs/rpms/bodr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18954 Modified Files: .cvsignore bodr.spec sources Log Message: * Sun Feb 2 2008 Julian Sikorski - 8-1 - Updated to version 8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bodr/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 May 2007 21:52:37 -0000 1.2 +++ .cvsignore 2 Mar 2008 14:59:03 -0000 1.3 @@ -1 +1 @@ -bodr-6.tar.bz2 +bodr-8.tar.bz2 Index: bodr.spec =================================================================== RCS file: /cvs/pkgs/rpms/bodr/devel/bodr.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bodr.spec 26 Aug 2007 07:19:11 -0000 1.2 +++ bodr.spec 2 Mar 2008 14:59:03 -0000 1.3 @@ -1,6 +1,6 @@ Name: bodr -Version: 6 -Release: 2%{?dist} +Version: 8 +Release: 1%{?dist} Summary: Blue Obelisk Data Repository Group: System Environment/Libraries @@ -50,6 +50,9 @@ %changelog +* Sun Feb 2 2008 Julian Sikorski - 8-1 +- Updated to version 8 + * Sun Aug 26 2007 Julian Sikorski - 6-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bodr/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 May 2007 21:52:37 -0000 1.2 +++ sources 2 Mar 2008 14:59:03 -0000 1.3 @@ -1 +1 @@ -7719e785e1f416179de85c7a7f889eb1 bodr-6.tar.bz2 +3b2fcb2df9e5076ffcdb5c2aed29fcf8 bodr-8.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 15:01:47 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 15:01:47 GMT Subject: rpms/autogen/F-8 autogen.spec,1.10,1.11 Message-ID: <200803021501.m22F1l5B021622@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/autogen/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19065 Modified Files: autogen.spec Log Message: Fixed Spec in F-8. Modified Files: autogen.spec Index: autogen.spec =================================================================== RCS file: /cvs/pkgs/rpms/autogen/F-8/autogen.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- autogen.spec 28 Feb 2008 02:51:21 -0000 1.10 +++ autogen.spec 2 Mar 2008 15:01:11 -0000 1.11 @@ -73,9 +73,11 @@ # Static libraries are needed to run test-suite. %configure -# Omit unused direct shared library dependencies. +# Fix Libtool to remove rpaths. rm -f ./libtool cp %{_bindir}/libtool . + +# Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' ./libtool make %{?_smp_mflags} From fedora-extras-commits at redhat.com Sun Mar 2 15:02:52 2008 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Sun, 2 Mar 2008 15:02:52 GMT Subject: rpms/bodr/F-8 .cvsignore,1.2,1.3 bodr.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200803021502.m22F2qZh026234@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/pkgs/rpms/bodr/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24409 Modified Files: .cvsignore bodr.spec sources Log Message: * Sun Feb 2 2008 Julian Sikorski - 8-1 - Updated to version 8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bodr/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 May 2007 21:52:37 -0000 1.2 +++ .cvsignore 2 Mar 2008 15:02:18 -0000 1.3 @@ -1 +1 @@ -bodr-6.tar.bz2 +bodr-8.tar.bz2 Index: bodr.spec =================================================================== RCS file: /cvs/pkgs/rpms/bodr/F-8/bodr.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bodr.spec 26 Aug 2007 07:19:11 -0000 1.2 +++ bodr.spec 2 Mar 2008 15:02:18 -0000 1.3 @@ -1,6 +1,6 @@ Name: bodr -Version: 6 -Release: 2%{?dist} +Version: 8 +Release: 1%{?dist} Summary: Blue Obelisk Data Repository Group: System Environment/Libraries @@ -50,6 +50,9 @@ %changelog +* Sun Feb 2 2008 Julian Sikorski - 8-1 +- Updated to version 8 + * Sun Aug 26 2007 Julian Sikorski - 6-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bodr/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 May 2007 21:52:37 -0000 1.2 +++ sources 2 Mar 2008 15:02:18 -0000 1.3 @@ -1 +1 @@ -7719e785e1f416179de85c7a7f889eb1 bodr-6.tar.bz2 +3b2fcb2df9e5076ffcdb5c2aed29fcf8 bodr-8.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 15:03:43 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 15:03:43 GMT Subject: rpms/glade3/devel glade3.spec,1.7,1.8 Message-ID: <200803021503.m22F3hvn026309@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26231 Modified Files: glade3.spec Log Message: Updated to 3.4.1-4 in devel. Modified Files: glade3.spec Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- glade3.spec 2 Feb 2008 20:22:49 -0000 1.7 +++ glade3.spec 2 Mar 2008 15:03:08 -0000 1.8 @@ -6,7 +6,7 @@ Summary: User Interface Designer for GTK+ and GNOME Name: glade3 Version: 3.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Development/Tools URL: http://glade.gnome.org/ @@ -24,13 +24,13 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper -BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gnome-doc-utils BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libgnomeui-devel +BuildRequires: libtool BuildRequires: pygtk2-devel BuildRequires: scrollkeeper @@ -55,7 +55,7 @@ library to ease the integration of Glade into other applications. %package libgladeui-devel -Summary: Development files for libgladeui +Summary: Development files for %{name}-libgladeui License: GPLv2+ Group: Development/Libraries @@ -74,6 +74,10 @@ %build %configure --disable-static --enable-gtk-doc +# Fix Libtool to remove rpaths. +rm -f ./libtool +cp %{_bindir}/libtool . + # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool @@ -85,6 +89,7 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -delete +find $RPM_BUILD_ROOT -type f -name "*.a" -delete %if 0%{?fc7} rm -rf $RPM_BUILD_ROOT%{_var}/lib/scrollkeeper @@ -96,11 +101,6 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/glade-3.desktop -# Remove rpaths. -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/glade-3 -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/libgladegnome.so -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/libgladegtk.so - %clean rm -rf $RPM_BUILD_ROOT @@ -186,6 +186,10 @@ %{_includedir}/libgladeui-1.0/gladeui/* %changelog +* Sun Mar 02 2008 Debarshi Ray - 3.4.1-4 +- Replaced 'BuildRequires: chrpath' with 'BuildRequires: libtool' for removing + rpaths. + * Sun Feb 03 2008 Debarshi Ray - 3.4.1-3 - Omitted unused direct shared library dependencies. From fedora-extras-commits at redhat.com Sun Mar 2 15:04:14 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 15:04:14 GMT Subject: rpms/autogen/F-7 autogen.spec,1.10,1.11 Message-ID: <200803021504.m22F4ELv026390@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/autogen/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26299 Modified Files: autogen.spec Log Message: Fixed Spec in F-7. Modified Files: autogen.spec Index: autogen.spec =================================================================== RCS file: /cvs/pkgs/rpms/autogen/F-7/autogen.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- autogen.spec 28 Feb 2008 02:43:16 -0000 1.10 +++ autogen.spec 2 Mar 2008 15:03:40 -0000 1.11 @@ -73,9 +73,11 @@ # Static libraries are needed to run test-suite. %configure -# Omit unused direct shared library dependencies. +# Fix Libtool to remove rpaths. rm -f ./libtool cp %{_bindir}/libtool . + +# Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' ./libtool make %{?_smp_mflags} From fedora-extras-commits at redhat.com Sun Mar 2 15:04:38 2008 From: fedora-extras-commits at redhat.com (Julian Sikorski (belegdol)) Date: Sun, 2 Mar 2008 15:04:38 GMT Subject: rpms/bodr/F-7 .cvsignore,1.2,1.3 bodr.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200803021504.m22F4c12026403@cvs-int.fedora.redhat.com> Author: belegdol Update of /cvs/pkgs/rpms/bodr/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26359 Modified Files: .cvsignore bodr.spec sources Log Message: * Sun Feb 2 2008 Julian Sikorski - 8-1 - Updated to version 8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bodr/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 May 2007 21:55:36 -0000 1.2 +++ .cvsignore 2 Mar 2008 15:04:03 -0000 1.3 @@ -1 +1 @@ -bodr-6.tar.bz2 +bodr-8.tar.bz2 Index: bodr.spec =================================================================== RCS file: /cvs/pkgs/rpms/bodr/F-7/bodr.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bodr.spec 25 May 2007 21:55:36 -0000 1.1 +++ bodr.spec 2 Mar 2008 15:04:03 -0000 1.2 @@ -1,5 +1,5 @@ Name: bodr -Version: 6 +Version: 8 Release: 1%{?dist} Summary: Blue Obelisk Data Repository @@ -50,5 +50,11 @@ %changelog +* Sun Feb 2 2008 Julian Sikorski - 8-1 +- Updated to version 8 + +* Sun Aug 26 2007 Julian Sikorski - 6-2 +- Rebuild + * Sat Apr 21 2007 Julian Sikorski - 6-1 - Initial RPM release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bodr/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 May 2007 21:55:36 -0000 1.2 +++ sources 2 Mar 2008 15:04:03 -0000 1.3 @@ -1 +1 @@ -7719e785e1f416179de85c7a7f889eb1 bodr-6.tar.bz2 +3b2fcb2df9e5076ffcdb5c2aed29fcf8 bodr-8.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 15:05:49 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 15:05:49 GMT Subject: rpms/glade3/F-8 glade3.spec,1.7,1.8 Message-ID: <200803021505.m22F5niH026509@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26463 Modified Files: glade3.spec Log Message: Updated to 3.4.1-4 in F-8. Modified Files: glade3.spec Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-8/glade3.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- glade3.spec 2 Feb 2008 20:20:43 -0000 1.7 +++ glade3.spec 2 Mar 2008 15:05:16 -0000 1.8 @@ -6,7 +6,7 @@ Summary: User Interface Designer for GTK+ and GNOME Name: glade3 Version: 3.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Development/Tools URL: http://glade.gnome.org/ @@ -24,13 +24,13 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper -BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gnome-doc-utils BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libgnomeui-devel +BuildRequires: libtool BuildRequires: pygtk2-devel BuildRequires: scrollkeeper @@ -55,7 +55,7 @@ library to ease the integration of Glade into other applications. %package libgladeui-devel -Summary: Development files for libgladeui +Summary: Development files for %{name}-libgladeui License: GPLv2+ Group: Development/Libraries @@ -74,6 +74,10 @@ %build %configure --disable-static --enable-gtk-doc +# Fix Libtool to remove rpaths. +rm -f ./libtool +cp %{_bindir}/libtool . + # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool @@ -85,6 +89,7 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -delete +find $RPM_BUILD_ROOT -type f -name "*.a" -delete %if 0%{?fc7} rm -rf $RPM_BUILD_ROOT%{_var}/lib/scrollkeeper @@ -96,11 +101,6 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/glade-3.desktop -# Remove rpaths. -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/glade-3 -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/libgladegnome.so -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/libgladegtk.so - %clean rm -rf $RPM_BUILD_ROOT @@ -186,6 +186,10 @@ %{_includedir}/libgladeui-1.0/gladeui/* %changelog +* Sun Mar 02 2008 Debarshi Ray - 3.4.1-4 +- Replaced 'BuildRequires: chrpath' with 'BuildRequires: libtool' for removing + rpaths. + * Sun Feb 03 2008 Debarshi Ray - 3.4.1-3 - Omitted unused direct shared library dependencies. From fedora-extras-commits at redhat.com Sun Mar 2 15:07:56 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 15:07:56 GMT Subject: rpms/glade3/F-7 glade3.spec,1.9,1.10 Message-ID: <200803021507.m22F7uHB026595@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26566 Modified Files: glade3.spec Log Message: Updated to 3.4.1-4 in F-7. Modified Files: glade3.spec Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-7/glade3.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- glade3.spec 2 Feb 2008 20:18:29 -0000 1.9 +++ glade3.spec 2 Mar 2008 15:07:15 -0000 1.10 @@ -6,7 +6,7 @@ Summary: User Interface Designer for GTK+ and GNOME Name: glade3 Version: 3.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Development/Tools URL: http://glade.gnome.org/ @@ -24,13 +24,13 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper -BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gnome-doc-utils BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libgnomeui-devel +BuildRequires: libtool BuildRequires: pygtk2-devel BuildRequires: scrollkeeper @@ -55,7 +55,7 @@ library to ease the integration of Glade into other applications. %package libgladeui-devel -Summary: Development files for libgladeui +Summary: Development files for %{name}-libgladeui License: GPLv2+ Group: Development/Libraries @@ -74,6 +74,10 @@ %build %configure --disable-static --enable-gtk-doc +# Fix Libtool to remove rpaths. +rm -f ./libtool +cp %{_bindir}/libtool . + # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool @@ -85,6 +89,7 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -delete +find $RPM_BUILD_ROOT -type f -name "*.a" -delete %if 0%{?fc7} rm -rf $RPM_BUILD_ROOT%{_var}/lib/scrollkeeper @@ -96,11 +101,6 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/glade-3.desktop -# Remove rpaths. -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/glade-3 -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/libgladegnome.so -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/libgladegtk.so - %clean rm -rf $RPM_BUILD_ROOT @@ -186,6 +186,10 @@ %{_includedir}/libgladeui-1.0/gladeui/* %changelog +* Sun Mar 02 2008 Debarshi Ray - 3.4.1-4 +- Replaced 'BuildRequires: chrpath' with 'BuildRequires: libtool' for removing + rpaths. + * Sun Feb 03 2008 Debarshi Ray - 3.4.1-3 - Omitted unused direct shared library dependencies. From fedora-extras-commits at redhat.com Sun Mar 2 15:29:40 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 2 Mar 2008 15:29:40 GMT Subject: rpms/codeblocks/F-8 .cvsignore, 1.20, 1.21 codeblocks.spec, 1.23, 1.24 sources, 1.20, 1.21 codeblocks-autorev.patch, 1.4, NONE codeblocks-getsvn, 1.1, NONE Message-ID: <200803021529.m22FTetR026919@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26891 Modified Files: .cvsignore codeblocks.spec sources Removed Files: codeblocks-autorev.patch codeblocks-getsvn Log Message: * Sun Mar 2 2008 Dan Horak 8.02-1 - update to stable release 8.02 - update BR to use system libraries Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/codeblocks/F-8/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 21 Feb 2008 16:35:50 -0000 1.20 +++ .cvsignore 2 Mar 2008 15:29:02 -0000 1.21 @@ -1 +1 @@ -codeblocks-svn4872.tar.bz2 +codeblocks-8.02-src.tar.bz2 Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/F-8/codeblocks.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- codeblocks.spec 21 Feb 2008 16:35:50 -0000 1.23 +++ codeblocks.spec 2 Mar 2008 15:29:02 -0000 1.24 @@ -1,26 +1,20 @@ -%define rev 4872 -%define date 20080211 - Name: codeblocks -Version: 1.0 -Release: 0.30.%{date}svn%{rev}%{?dist} +Version: 8.02 +Release: 1%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools -License: GPLv2+ +License: GPLv3+ URL: http://www.codeblocks.org/ -Source: %{name}-svn%{rev}.tar.bz2 +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel >= 2.8.0 +BuildRequires: wxGTK-devel >= 2.8.0, zlib-devel, bzip2-devel BuildRequires: zip BuildRequires: dos2unix -BuildRequires: autoconf, automake, libtool BuildRequires: desktop-file-utils Requires: %{name}-libs = %{version}-%{release} Requires: shared-mime-info Patch1: codeblocks-plugins.patch Patch2: codeblocks-desktop.patch -Patch3: codeblocks-autorev.patch -Source100: codeblocks-getsvn %description Code::Blocks is a free C++ IDE built specifically to meet the most demanding @@ -48,8 +42,6 @@ %package contrib-libs Summary: Libraries needed to run Code::Blocks contrib plugins Group: System Environment/Libraries -# the wxSmith plugin and libwxsmith* libraries are now GPLv3+ -License: GPLv2+ and GPLv3+ Obsoletes: %{name}-contrib < 1.0-0.28.20071210svn4719 %description contrib-libs @@ -58,8 +50,6 @@ %package contrib Summary: Additional Code::Blocks plugins Group: Development/Tools -# the wxSmith plugin and libwxsmith* libraries are now GPLv3+ -License: GPLv2+ and GPLv3+ Requires: %{name} = %{version}-%{release} Requires: %{name}-contrib-libs = %{version}-%{release} @@ -73,10 +63,9 @@ %prep -%setup -q -n %{name} +%setup -q %patch1 %patch2 -p1 -%patch3 # convert EOLs find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null @@ -84,15 +73,15 @@ # fix the dir, where plugins are installed for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler openfileslist projectsimporter scriptedwizard todo xpmanifest do - sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am + sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/$p/Makefile.* done -for p in AutoVersioning ThreadSearch byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems +for p in AutoVersioning BrowseTracker ThreadSearch byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems do - sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am + sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/contrib/$p/Makefile.* done -sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/wxSmith/plugin/Makefile.am +sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/contrib/wxSmith/plugin/Makefile.* sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp @@ -100,15 +89,11 @@ find src/plugins/contrib/regex_testbed -type f -exec chmod a-x {} ';' find src/plugins/compilergcc -type f -exec chmod a-x {} ';' -# generate revision.m4 -echo "m4_define([SVN_REV], %{rev})" > revision.m4 -echo "m4_define([SVN_REVISION], 1.0svn%{rev})" >> revision.m4 -echo "m4_define([SVN_DATE], %{date})" >> revision.m4 +# fix version inside the configure script +sed -i 's/1\.0svn/%{version}/g' configure %build -./bootstrap - %configure --with-contrib-plugins=all # Don't use rpath! @@ -225,6 +210,7 @@ %files contrib %defattr(-,root,root) %{pkgdatadir}/AutoVersioning.zip +%{pkgdatadir}/BrowseTracker.zip %{pkgdatadir}/ThreadSearch.zip %{pkgdatadir}/byogames.zip %{pkgdatadir}/cb_koders.zip @@ -247,6 +233,7 @@ %{pkgdatadir}/lib_finder %{plugindir}/libAutoVersioning.so +%{plugindir}/libBrowseTracker.so %{plugindir}/libThreadSearch.so %{plugindir}/libbyogames.so %{plugindir}/libcb_koders.so @@ -266,6 +253,10 @@ %changelog +* Sun Mar 2 2008 Dan Horak 8.02-1 +- update to stable release 8.02 +- update BR to use system libraries + * Mon Feb 18 2008 Dan Horak 1.0-0.30.20080211svn4872 - update to revision 4872 - really fix the multilib problem with the contrib subpackage (#433124) Index: sources =================================================================== RCS file: /cvs/extras/rpms/codeblocks/F-8/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 21 Feb 2008 16:35:50 -0000 1.20 +++ sources 2 Mar 2008 15:29:02 -0000 1.21 @@ -1 +1 @@ -32b5517fbae8960272788bdc95a89605 codeblocks-svn4872.tar.bz2 +ac15b4b3de50d7650c2f7a8dbcb30f88 codeblocks-8.02-src.tar.bz2 --- codeblocks-autorev.patch DELETED --- --- codeblocks-getsvn DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 15:37:16 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 2 Mar 2008 15:37:16 GMT Subject: rpms/codeblocks/F-7 .cvsignore, 1.20, 1.21 codeblocks.spec, 1.22, 1.23 sources, 1.20, 1.21 codeblocks-autorev.patch, 1.4, NONE codeblocks-getsvn, 1.1, NONE Message-ID: <200803021537.m22FbGjj027089@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27065 Modified Files: .cvsignore codeblocks.spec sources Removed Files: codeblocks-autorev.patch codeblocks-getsvn Log Message: * Sun Mar 2 2008 Dan Horak 8.02-1 - update to stable release 8.02 - update BR to use system libraries Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/codeblocks/F-7/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 21 Feb 2008 16:38:24 -0000 1.20 +++ .cvsignore 2 Mar 2008 15:36:40 -0000 1.21 @@ -1 +1 @@ -codeblocks-svn4872.tar.bz2 +codeblocks-8.02-src.tar.bz2 Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/F-7/codeblocks.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- codeblocks.spec 21 Feb 2008 16:38:24 -0000 1.22 +++ codeblocks.spec 2 Mar 2008 15:36:40 -0000 1.23 @@ -1,26 +1,20 @@ -%define rev 4872 -%define date 20080211 - Name: codeblocks -Version: 1.0 -Release: 0.30.%{date}svn%{rev}%{?dist} +Version: 8.02 +Release: 1%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools -License: GPLv2+ +License: GPLv3+ URL: http://www.codeblocks.org/ -Source: %{name}-svn%{rev}.tar.bz2 +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel >= 2.8.0 +BuildRequires: wxGTK-devel >= 2.8.0, zlib-devel, bzip2-devel BuildRequires: zip BuildRequires: dos2unix -BuildRequires: autoconf, automake, libtool BuildRequires: desktop-file-utils Requires: %{name}-libs = %{version}-%{release} Requires: shared-mime-info Patch1: codeblocks-plugins.patch Patch2: codeblocks-desktop.patch -Patch3: codeblocks-autorev.patch -Source100: codeblocks-getsvn %description Code::Blocks is a free C++ IDE built specifically to meet the most demanding @@ -48,8 +42,6 @@ %package contrib-libs Summary: Libraries needed to run Code::Blocks contrib plugins Group: System Environment/Libraries -# the wxSmith plugin and libwxsmith* libraries are now GPLv3+ -License: GPLv2+ and GPLv3+ Obsoletes: %{name}-contrib < 1.0-0.28.20071210svn4719 %description contrib-libs @@ -58,8 +50,6 @@ %package contrib Summary: Additional Code::Blocks plugins Group: Development/Tools -# the wxSmith plugin and libwxsmith* libraries are now GPLv3+ -License: GPLv2+ and GPLv3+ Requires: %{name} = %{version}-%{release} Requires: %{name}-contrib-libs = %{version}-%{release} @@ -73,10 +63,9 @@ %prep -%setup -q -n %{name} +%setup -q %patch1 %patch2 -p1 -%patch3 # convert EOLs find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null @@ -84,15 +73,15 @@ # fix the dir, where plugins are installed for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler openfileslist projectsimporter scriptedwizard todo xpmanifest do - sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am + sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/$p/Makefile.* done -for p in AutoVersioning ThreadSearch byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems +for p in AutoVersioning BrowseTracker ThreadSearch byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems do - sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am + sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/contrib/$p/Makefile.* done -sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/wxSmith/plugin/Makefile.am +sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/contrib/wxSmith/plugin/Makefile.* sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp @@ -100,15 +89,11 @@ find src/plugins/contrib/regex_testbed -type f -exec chmod a-x {} ';' find src/plugins/compilergcc -type f -exec chmod a-x {} ';' -# generate revision.m4 -echo "m4_define([SVN_REV], %{rev})" > revision.m4 -echo "m4_define([SVN_REVISION], 1.0svn%{rev})" >> revision.m4 -echo "m4_define([SVN_DATE], %{date})" >> revision.m4 +# fix version inside the configure script +sed -i 's/1\.0svn/%{version}/g' configure %build -./bootstrap - %configure --with-contrib-plugins=all # Don't use rpath! @@ -225,6 +210,7 @@ %files contrib %defattr(-,root,root) %{pkgdatadir}/AutoVersioning.zip +%{pkgdatadir}/BrowseTracker.zip %{pkgdatadir}/ThreadSearch.zip %{pkgdatadir}/byogames.zip %{pkgdatadir}/cb_koders.zip @@ -247,6 +233,7 @@ %{pkgdatadir}/lib_finder %{plugindir}/libAutoVersioning.so +%{plugindir}/libBrowseTracker.so %{plugindir}/libThreadSearch.so %{plugindir}/libbyogames.so %{plugindir}/libcb_koders.so @@ -266,6 +253,10 @@ %changelog +* Sun Mar 2 2008 Dan Horak 8.02-1 +- update to stable release 8.02 +- update BR to use system libraries + * Mon Feb 18 2008 Dan Horak 1.0-0.30.20080211svn4872 - update to revision 4872 - really fix the multilib problem with the contrib subpackage (#433124) Index: sources =================================================================== RCS file: /cvs/extras/rpms/codeblocks/F-7/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 21 Feb 2008 16:38:24 -0000 1.20 +++ sources 2 Mar 2008 15:36:40 -0000 1.21 @@ -1 +1 @@ -32b5517fbae8960272788bdc95a89605 codeblocks-svn4872.tar.bz2 +ac15b4b3de50d7650c2f7a8dbcb30f88 codeblocks-8.02-src.tar.bz2 --- codeblocks-autorev.patch DELETED --- --- codeblocks-getsvn DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 15:45:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:45:21 GMT Subject: rpms/perl-XML-SAX/devel perl-XML-SAX.spec,1.17,1.18 Message-ID: <200803021545.m22FjLH5027257@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-SAX/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27223 Modified Files: perl-XML-SAX.spec Log Message: re-enable XML::LibXML BuildRequires Index: perl-XML-SAX.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-SAX/devel/perl-XML-SAX.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-XML-SAX.spec 28 Feb 2008 13:17:08 -0000 1.17 +++ perl-XML-SAX.spec 2 Mar 2008 15:44:42 -0000 1.18 @@ -1,7 +1,7 @@ Summary: XML-SAX Perl module Name: perl-XML-SAX Version: 0.16 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Libraries License: GPL+ or Artistic @@ -11,7 +11,7 @@ BuildArch: noarch BuildRequires: perl(XML::NamespaceSupport) -# BuildRequires: perl(XML::LibXML) +BuildRequires: perl(XML::LibXML) BuildRequires: perl(XML::LibXML::Common) BuildRequires: perl(ExtUtils::MakeMaker) @@ -105,6 +105,9 @@ %changelog +* Sun Mar 2 2008 Tom "spot" Callaway - 0.16-5 +- Re-enable XML::LibXML BuildRequires + * Wed Feb 27 2008 Tom "spot" Callaway - 0.16-4 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Sun Mar 2 15:49:52 2008 From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai)) Date: Sun, 2 Mar 2008 15:49:52 GMT Subject: rpms/sepostgresql/F-8 sepostgresql-8.2.6-1.patch, 1.3, 1.4 sepostgresql.init, 1.12, 1.13 sepostgresql.spec, 1.12, 1.13 sepostgresql.te, 1.12, 1.13 Message-ID: <200803021549.m22Fnq7l027491@cvs-int.fedora.redhat.com> Author: kaigai Update of /cvs/pkgs/rpms/sepostgresql/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27291 Modified Files: sepostgresql-8.2.6-1.patch sepostgresql.init sepostgresql.spec sepostgresql.te Log Message: - bugfix: SELECT count(*) was not filtered correctly. - more restricted class/perms declaration. sepostgresql-8.2.6-1.patch: Index: sepostgresql-8.2.6-1.patch =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql-8.2.6-1.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sepostgresql-8.2.6-1.patch 7 Feb 2008 01:05:33 -0000 1.3 +++ sepostgresql-8.2.6-1.patch 2 Mar 2008 15:49:16 -0000 1.4 @@ -4913,8 +4913,8 @@ +} diff -rpNU3 base/src/backend/security/sepgsqlProxy.c sepgsql/src/backend/security/sepgsqlProxy.c --- base/src/backend/security/sepgsqlProxy.c 1970-01-01 09:00:00.000000000 +0900 -+++ sepgsql/src/backend/security/sepgsqlProxy.c 2008-01-30 17:08:18.000000000 +0900 -@@ -0,0 +1,1467 @@ ++++ sepgsql/src/backend/security/sepgsqlProxy.c 2008-03-03 00:42:02.000000000 +0900 +@@ -0,0 +1,1501 @@ +/* + * src/backend/security/sepgsqlProxy.c + * SE-PostgreSQL Query Proxy function to walk on query node tree @@ -5306,6 +5306,36 @@ + return selist; +} + ++static List *walkAggrefHelper(List *selist, Query *query, Node *node) ++{ ++ if (node == NULL) ++ return selist; ++ ++ if (IsA(node, RangeTblRef)) { ++ RangeTblRef *rtr = (RangeTblRef *) node; ++ RangeTblEntry *rte = list_nth(query->rtable, rtr->rtindex - 1); ++ ++ if (rte->rtekind == RTE_RELATION) { ++ selist = addEvalPgClass(selist, rte, DB_TABLE__SELECT); ++ selist = addEvalPgAttribute(selist, rte, 0, DB_COLUMN__SELECT); ++ } ++ } else if (IsA(node, JoinExpr)) { ++ JoinExpr *j = (JoinExpr *) node; ++ ++ selist = walkAggrefHelper(selist, query, j->larg); ++ selist = walkAggrefHelper(selist, query, j->rarg); ++ } else if (IsA(node, FromExpr)) { ++ FromExpr *fm = (FromExpr *)node; ++ ListCell *l; ++ ++ foreach (l, fm->fromlist) ++ selist = walkAggrefHelper(selist, query, lfirst(l)); ++ } else { ++ elog(ERROR, "SELinux: unexpected node type (%d) at Query->fromlist", nodeTag(node)); ++ } ++ return selist; ++} ++ +static List *sepgsqlWalkExpr(List *selist, queryChain *qc, Node *node, int flags) +{ + if (node == NULL) @@ -5342,6 +5372,10 @@ + + selist = addEvalPgProc(selist, aggref->aggfnoid, DB_PROCEDURE__EXECUTE); + selist = sepgsqlWalkExpr(selist, qc, (Node *) aggref->args, flags); ++ if (aggref->aggstar) { ++ Query *query = getQueryFromChain(qc); ++ selist = walkAggrefHelper(selist, query, (Node *) query->jointree); ++ } + break; + } + case T_OpExpr: Index: sepostgresql.init =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.init,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sepostgresql.init 7 Feb 2008 02:14:37 -0000 1.12 +++ sepostgresql.init 2 Mar 2008 15:49:17 -0000 1.13 @@ -9,7 +9,7 @@ PGVERSION="8.2.6" PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'` -SEPGVERSION="1.208" +SEPGVERSION="1.225" # source function library . /etc/rc.d/init.d/functions Index: sepostgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sepostgresql.spec 7 Feb 2008 02:14:37 -0000 1.12 +++ sepostgresql.spec 2 Mar 2008 15:49:17 -0000 1.13 @@ -13,7 +13,7 @@ Summary: Security Enhanced PostgreSQL Name: sepostgresql Version: 8.2.6 -Release: 1.208%{?sepgsql_extension}%{?dist} +Release: 1.225%{?sepgsql_extension}%{?dist} License: BSD Group: Applications/Databases Url: http://code.google.com/p/sepgsql/ @@ -34,7 +34,6 @@ Requires(postun): policycoreutils Requires: postgresql-server = %{version} Requires: policycoreutils >= 2.0.16 libselinux >= 2.0.13 selinux-policy >= 3.0.6 -Requires: tzdata %description Security Enhanced PostgreSQL is an extension of PostgreSQL @@ -207,6 +206,9 @@ %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups %changelog +* Sun Mar 2 2008 - 8.2.6-1.225 +- bugfix: SELECT count(*) was not filtered correctly. + * Wed Feb 6 2008 - 8.2.6-1.208 - bugfix: blob:{read} is not evaluated correctly - policy update: allow db_database:{set_param} Index: sepostgresql.te =================================================================== RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.te,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sepostgresql.te 7 Feb 2008 02:14:37 -0000 1.12 +++ sepostgresql.te 2 Mar 2008 15:49:17 -0000 1.13 @@ -1,7 +1,12 @@ -policy_module(sepostgresql, 1.208) +policy_module(sepostgresql, 1.225) gen_require(` - all_userspace_class_perms + class db_database all_db_database_perms; + class db_table all_db_table_perms; + class db_procedure all_db_procedure_perms; + class db_column all_db_column_perms; + class db_tuple all_db_tuple_perms; + class db_blob all_db_blob_perms; type postgresql_t; type lib_t, shlib_t; From fedora-extras-commits at redhat.com Sun Mar 2 15:52:49 2008 From: fedora-extras-commits at redhat.com (Simo Sorce (simo)) Date: Sun, 2 Mar 2008 15:52:49 GMT Subject: rpms/rsync/devel .cvsignore, 1.24, 1.25 rsync.spec, 1.51, 1.52 sources, 1.24, 1.25 Message-ID: <200803021552.m22Fqn0K027883@cvs-int.fedora.redhat.com> Author: simo Update of /cvs/pkgs/rpms/rsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27783 Modified Files: .cvsignore rsync.spec sources Log Message: * Sun Mar 2 2008 Simo Sorce 3.0.0-1.fc9 - Final 3.0.0 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rsync/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 24 Feb 2008 00:47:39 -0000 1.24 +++ .cvsignore 2 Mar 2008 15:52:16 -0000 1.25 @@ -1,2 +1,2 @@ -rsync-3.0.0pre10.tar.gz -rsync-patches-3.0.0pre10.tar.gz +rsync-3.0.0.tar.gz +rsync-patches-3.0.0.tar.gz Index: rsync.spec =================================================================== RCS file: /cvs/pkgs/rpms/rsync/devel/rsync.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- rsync.spec 24 Feb 2008 00:47:39 -0000 1.51 +++ rsync.spec 2 Mar 2008 15:52:16 -0000 1.52 @@ -1,13 +1,13 @@ Summary: A program for synchronizing files over a network. Name: rsync Version: 3.0.0 -Release: 0.pre10%{?dist} +Release: 1%{?dist} Group: Applications/Internet # TAG: for pre versions use -Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre10.tar.gz -#Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz -Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre10.tar.gz -#Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz +#Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre10.tar.gz +Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz +#Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre10.tar.gz +Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz Source2: rsync.xinetd BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc, popt-devel Prefix: %{_prefix} @@ -25,10 +25,10 @@ %prep # TAG: for pre versions use -%setup -q -n rsync-%{version}pre10 -#%setup -q -%setup -q -b 1 -n rsync-%{version}pre10 -#%setup -q -b 1 +#%setup -q -n rsync-%{version}pre10 +%setup -q +#%setup -q -b 1 -n rsync-%{version}pre10 +%setup -q -b 1 #Needed for compatibility with previous patched rsync versions patch -p1 -i patches/acls.diff @@ -61,6 +61,9 @@ %{_mandir}/man5/rsyncd.conf.5* %changelog +* Sun Mar 2 2008 Simo Sorce 3.0.0-1.fc9 +- Final 3.0.0 release + * Sat Feb 23 2008 Simo Sorce 3.0.0-0.pre10.fc9 - Tenth preprelease of the 3.0.0 series Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rsync/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 24 Feb 2008 00:47:39 -0000 1.24 +++ sources 2 Mar 2008 15:52:16 -0000 1.25 @@ -1,2 +1,2 @@ -54bfda1a6d8a0c275920bca22fb0c68f rsync-3.0.0pre10.tar.gz -62b1d39f8551366dfc8e06a65c5af7c7 rsync-patches-3.0.0pre10.tar.gz +2122d460b4119749c6e5993938a9b501 rsync-3.0.0.tar.gz +2d3560f213ae59ebee67f81fc55a02a7 rsync-patches-3.0.0.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 15:54:35 2008 From: fedora-extras-commits at redhat.com (Alexandru Ciobanu (ics)) Date: Sun, 2 Mar 2008 15:54:35 GMT Subject: rpms/liblqr-1/devel liblqr-1-0.1.0-pkgconfig.patch, NONE, 1.1 liblqr-1.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803021554.m22FsZdT028133@cvs-int.fedora.redhat.com> Author: ics Update of /cvs/pkgs/rpms/liblqr-1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27887/devel Modified Files: .cvsignore sources Added Files: liblqr-1-0.1.0-pkgconfig.patch liblqr-1.spec Log Message: initial import liblqr-1-0.1.0-pkgconfig.patch: --- NEW FILE liblqr-1-0.1.0-pkgconfig.patch --- --- liblqr-1-0.1.0/lqr-1.pc.in.debug 2007-11-28 07:40:01.000000000 +0900 +++ liblqr-1-0.1.0/lqr-1.pc.in 2008-02-26 03:26:13.000000000 +0900 @@ -7,5 +7,5 @@ Description: LiquidRescale seam-carving library Requires: glib-2.0 Version: @PACKAGE_VERSION@ -Libs: -L${libdir}/@LIBRARY_SNAME@ -l at LIBRARY_SNAME@ +Libs: -l at LIBRARY_SNAME@ Cflags: -I${includedir}/@LIBRARY_SNAME@ --- NEW FILE liblqr-1.spec --- %define tarversion 1 Name: liblqr-1 Version: 0.1.0 Release: 5%{?dist} Summary: LiquidRescale library Group: System Environment/Libraries License: GPLv3 URL: http://liquidrescale.wikidot.com/ Source0: http://liblqr.wikidot.com/local--files/en:download-page/%{name}-%{version}-%{tarversion}.tar.gz Patch0: liblqr-1-0.1.0-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) BuildRequires: glib2-devel %description The LiquidRescale (lqr) library provides a C/C++ API for performing non-uniform resizing of images by the seam-carving technique. %package devel Summary: LiquidRescale library development kit Group: Development/Libraries License: GPLv3 Requires: %{name} = %{version}-%{release} Requires: glib2-devel, pkgconfig %description devel The libqr-devel package contains the header files needed to develop applications with liblqr %prep %setup -q # Patches %patch -p1 -b .pkgconfig %build export LDFLAGS="`pkg-config --libs glib-2.0` -lm" %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # remove .la files find $RPM_BUILD_ROOT -name \*.la -exec %{__rm} -f {} \; # Fedora MUST %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README ChangeLog COPYING %{_libdir}/liblqr-1.so.0.0.0 %{_libdir}/liblqr-1.so.0 %files devel %defattr (-, root, root,-) %doc docs/liblqr_manual.docbook %{_libdir}/liblqr-1.so %{_includedir}/lqr-1/ %{_libdir}/pkgconfig/lqr-1.pc %changelog * Fri Feb 29 2008 Alexandru Ciobanu - 0.1.0-5 - Applied pkgconfig patch to remove unneeded directories. - Changed permissions of files to 0644. - Fixed minor typos. * Mon Feb 25 2008 Alexandru Ciobanu - 0.1.0-4 - Cleaned SPEC file, again. * Wed Feb 20 2008 Alexandru Ciobanu - 0.1.0-3 - Cleaned SPEC file. * Tue Feb 19 2008 Alexandru Ciobanu - 0.1.0-2 - Fixed licensing issue. * Thu Jan 17 2008 Alexandru Ciobanu - 0.1.0-1 - Update to latest upstream release. - Added glib BuildRequires. * Mon Dec 10 2007 Alexandru Ciobanu - 0.1.0-0 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liblqr-1/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2008 18:34:24 -0000 1.1 +++ .cvsignore 2 Mar 2008 15:54:02 -0000 1.2 @@ -0,0 +1 @@ +liblqr-1-0.1.0-1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liblqr-1/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:34:24 -0000 1.1 +++ sources 2 Mar 2008 15:54:02 -0000 1.2 @@ -0,0 +1 @@ +6c8be281b11b9782e45fa7f401e05087 liblqr-1-0.1.0-1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 15:58:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:22 GMT Subject: rpms/perl-Class-DBI-Loader-Relationship/devel perl-Class-DBI-Loader-Relationship.spec, 1.9, 1.10 Message-ID: <200803021558.m22FwMbq028501@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-DBI-Loader-Relationship/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Class-DBI-Loader-Relationship/devel Modified Files: perl-Class-DBI-Loader-Relationship.spec Log Message: perl rebuild, chain 4 Index: perl-Class-DBI-Loader-Relationship.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Loader-Relationship/devel/perl-Class-DBI-Loader-Relationship.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Class-DBI-Loader-Relationship.spec 28 Jan 2008 21:45:55 -0000 1.9 +++ perl-Class-DBI-Loader-Relationship.spec 2 Mar 2008 15:55:17 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Loader-Relationship Version: 1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Easier relationship specification in CDBI::L Group: Development/Libraries License: GPL+ or Artistic @@ -54,6 +54,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.3-7 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 1.3-6 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:22 GMT Subject: rpms/perl-XML-XQL/devel perl-XML-XQL.spec,1.6,1.7 Message-ID: <200803021558.m22FwMbX028500@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-XQL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-XML-XQL/devel Modified Files: perl-XML-XQL.spec Log Message: perl rebuild, chain 4 Index: perl-XML-XQL.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-XQL/devel/perl-XML-XQL.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-XML-XQL.spec 28 Jan 2008 21:42:30 -0000 1.6 +++ perl-XML-XQL.spec 2 Mar 2008 15:54:42 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-XML-XQL Version: 0.68 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl module for querying XML tree structures with XQL License: GPL+ or Artistic Group: Development/Libraries @@ -62,6 +62,9 @@ %{_mandir}/man3/XML::XQL*.3* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.68-6 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.68-5 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:23 GMT Subject: rpms/perl-IO-Tty/devel perl-IO-Tty.spec,1.18,1.19 Message-ID: <200803021558.m22FwNSp028506@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-Tty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-IO-Tty/devel Modified Files: perl-IO-Tty.spec Log Message: perl rebuild, chain 4 Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-IO-Tty.spec 20 Feb 2008 01:39:12 -0000 1.18 +++ perl-IO-Tty.spec 2 Mar 2008 15:51:14 -0000 1.19 @@ -1,6 +1,6 @@ Name: perl-IO-Tty Version: 1.07 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl interface to pseudo tty's License: GPL+ or Artistic @@ -51,6 +51,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.07-5 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 1.07-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:23 GMT Subject: rpms/perl-Image-Base/devel perl-Image-Base.spec,1.11,1.12 Message-ID: <200803021558.m22FwNCj028509@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Image-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Image-Base/devel Modified Files: perl-Image-Base.spec Log Message: perl rebuild, chain 4 Index: perl-Image-Base.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Image-Base/devel/perl-Image-Base.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Image-Base.spec 28 Jan 2008 21:14:23 -0000 1.11 +++ perl-Image-Base.spec 2 Mar 2008 15:49:45 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Image-Base Version: 1.07 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Base class for loading, manipulating and saving images in Perl Group: Development/Libraries @@ -50,6 +50,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.07-9 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 1.07-8 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:25 GMT Subject: rpms/perl-Unicode-String/devel perl-Unicode-String.spec,1.14,1.15 Message-ID: <200803021558.m22FwPJw028512@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Unicode-String/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Unicode-String/devel Modified Files: perl-Unicode-String.spec Log Message: perl rebuild, chain 4 Index: perl-Unicode-String.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Unicode-String/devel/perl-Unicode-String.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Unicode-String.spec 18 Feb 2008 18:24:53 -0000 1.14 +++ perl-Unicode-String.spec 2 Mar 2008 15:51:48 -0000 1.15 @@ -2,7 +2,7 @@ Name: perl-Unicode-String Version: 2.09 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Perl modules to handle various Unicode issues @@ -56,6 +56,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.09-8 +- Rebuild for perl 5.10 (again) + * Mon Feb 18 2008 Fedora Release Engineering - 2.09-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:28 GMT Subject: rpms/perl-IPC-Run/devel perl-IPC-Run.spec,1.15,1.16 Message-ID: <200803021558.m22FwSPD028516@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IPC-Run/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-IPC-Run/devel Modified Files: perl-IPC-Run.spec Log Message: perl rebuild, chain 4 Index: perl-IPC-Run.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IPC-Run/devel/perl-IPC-Run.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-IPC-Run.spec 28 Jan 2008 21:24:18 -0000 1.15 +++ perl-IPC-Run.spec 2 Mar 2008 15:51:23 -0000 1.16 @@ -1,6 +1,6 @@ Name: perl-IPC-Run Version: 0.80 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl module for interacting with child processes License: GPL+ or Artistic @@ -61,6 +61,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.80-5 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 0.80-4 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:28 GMT Subject: rpms/perl-SQL-Statement/devel perl-SQL-Statement.spec,1.7,1.8 Message-ID: <200803021558.m22FwSre028515@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SQL-Statement/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-SQL-Statement/devel Modified Files: perl-SQL-Statement.spec Log Message: perl rebuild, chain 4 Index: perl-SQL-Statement.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SQL-Statement/devel/perl-SQL-Statement.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-SQL-Statement.spec 28 Jan 2008 21:38:36 -0000 1.7 +++ perl-SQL-Statement.spec 2 Mar 2008 15:53:52 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-SQL-Statement Version: 1.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SQL parsing and processing engine Group: Development/Libraries @@ -59,6 +59,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.15-4 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 1.15-3 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:28 GMT Subject: rpms/perl-AppConfig/devel perl-AppConfig.spec,1.15,1.16 Message-ID: <200803021558.m22FwSZq028522@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-AppConfig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-AppConfig/devel Modified Files: perl-AppConfig.spec Log Message: perl rebuild, chain 4 Index: perl-AppConfig.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-AppConfig/devel/perl-AppConfig.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-AppConfig.spec 28 Jan 2008 21:20:26 -0000 1.15 +++ perl-AppConfig.spec 2 Mar 2008 15:50:21 -0000 1.16 @@ -1,6 +1,6 @@ Name: perl-AppConfig Version: 1.66 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module for reading configuration files Group: Development/Libraries @@ -65,6 +65,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.66-3 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 1.66-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:28 GMT Subject: rpms/perl-Net-IP/devel perl-Net-IP.spec,1.11,1.12 Message-ID: <200803021558.m22FwSrb028521@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-IP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Net-IP/devel Modified Files: perl-Net-IP.spec Log Message: perl rebuild, chain 4 Index: perl-Net-IP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Net-IP.spec 1 Feb 2008 21:04:19 -0000 1.11 +++ perl-Net-IP.spec 2 Mar 2008 15:57:19 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Net-IP Version: 1.25 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Perl module for manipulation of IPv4 and IPv6 addresses Group: Development/Libraries @@ -63,6 +63,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.25-8 +- Rebuild for perl 5.10 (again) + * Fri Feb 1 2008 Tom "spot" Callaway - 1.25-7 - disable tests due to upstream bug 50114 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:29 GMT Subject: rpms/pilot-link/devel pilot-link.spec,1.72,1.73 Message-ID: <200803021558.m22FwTmD028525@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/pilot-link/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/pilot-link/devel Modified Files: pilot-link.spec Log Message: perl rebuild, chain 4 Index: pilot-link.spec =================================================================== RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- pilot-link.spec 20 Feb 2008 06:40:06 -0000 1.72 +++ pilot-link.spec 2 Mar 2008 15:54:52 -0000 1.73 @@ -3,7 +3,7 @@ Name: pilot-link Version: 0.12.3 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 2 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL Group: Applications/Communications @@ -190,6 +190,9 @@ %{_datadir}/aclocal/*.m4 %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2:0.12.3-9 +- Rebuild for perl 5.10 (again) + * Wed Feb 20 2008 Fedora Release Engineering - 2:0.12.3-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:29 GMT Subject: rpms/perl-SQL-Abstract-Limit/devel perl-SQL-Abstract-Limit.spec, 1.4, 1.5 Message-ID: <200803021558.m22FwT7m028532@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SQL-Abstract-Limit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-SQL-Abstract-Limit/devel Modified Files: perl-SQL-Abstract-Limit.spec Log Message: perl rebuild, chain 4 Index: perl-SQL-Abstract-Limit.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SQL-Abstract-Limit/devel/perl-SQL-Abstract-Limit.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-SQL-Abstract-Limit.spec 28 Jan 2008 21:40:32 -0000 1.4 +++ perl-SQL-Abstract-Limit.spec 2 Mar 2008 15:54:15 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-SQL-Abstract-Limit Version: 0.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Portable LIMIT Emulation Group: Development/Libraries License: GPL+ or Artistic @@ -44,6 +44,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.12-6 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.12-5 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:29 GMT Subject: rpms/perl-Image-Xpm/devel perl-Image-Xpm.spec,1.11,1.12 Message-ID: <200803021558.m22FwThT028531@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Image-Xpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Image-Xpm/devel Modified Files: perl-Image-Xpm.spec Log Message: perl rebuild, chain 4 Index: perl-Image-Xpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Image-Xpm/devel/perl-Image-Xpm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Image-Xpm.spec 28 Jan 2008 21:15:06 -0000 1.11 +++ perl-Image-Xpm.spec 2 Mar 2008 15:49:53 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Image-Xpm Version: 1.09 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Load, create, manipulate and save xpm image files in Perl Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.09-8 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 1.09-7 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:29 GMT Subject: rpms/perl-Socket6/devel perl-Socket6.spec,1.6,1.7 Message-ID: <200803021558.m22FwTdE028536@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Socket6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Socket6/devel Modified Files: perl-Socket6.spec Log Message: perl rebuild, chain 4 Index: perl-Socket6.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Socket6/devel/perl-Socket6.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Socket6.spec 20 Feb 2008 06:57:40 -0000 1.6 +++ perl-Socket6.spec 2 Mar 2008 15:55:48 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Socket6 Version: 0.19 -Release: 6%{?dist} +Release: 7%{?dist} Summary: IPv6 related part of the C socket.h defines and structure manipulators Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.19-7 +- Rebuild for perl 5.10 (again) + * Wed Feb 20 2008 Fedora Release Engineering - 0.19-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:29 GMT Subject: rpms/perl-Mail-IMAPClient/devel perl-Mail-IMAPClient.spec,1.3,1.4 Message-ID: <200803021558.m22FwT61028533@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Mail-IMAPClient/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Mail-IMAPClient/devel Modified Files: perl-Mail-IMAPClient.spec Log Message: perl rebuild, chain 4 Index: perl-Mail-IMAPClient.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/devel/perl-Mail-IMAPClient.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Mail-IMAPClient.spec 28 Jan 2008 21:47:18 -0000 1.3 +++ perl-Mail-IMAPClient.spec 2 Mar 2008 15:55:22 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Mail-IMAPClient Version: 2.2.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An IMAP Client API Group: Development/Libraries License: GPL+ or Artistic @@ -47,6 +47,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.2.9-6 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 2.2.9-5 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:29 GMT Subject: rpms/perl-XML-Filter-BufferText/devel perl-XML-Filter-BufferText.spec, 1.3, 1.4 Message-ID: <200803021558.m22FwTHO028526@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Filter-BufferText/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-XML-Filter-BufferText/devel Modified Files: perl-XML-Filter-BufferText.spec Log Message: perl rebuild, chain 4 Index: perl-XML-Filter-BufferText.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Filter-BufferText/devel/perl-XML-Filter-BufferText.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-XML-Filter-BufferText.spec 29 Jan 2008 20:48:32 -0000 1.3 +++ perl-XML-Filter-BufferText.spec 2 Mar 2008 15:52:17 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-XML-Filter-BufferText Version: 1.01 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Filter to put all characters() in one event License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.01-5 +- Rebuild for perl 5.10 (again) + * Tue Jan 29 2008 Tom "spot" Callaway 1.01-4 - BR perl(Test::More) From fedora-extras-commits at redhat.com Sun Mar 2 15:58:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:33 GMT Subject: rpms/perl-Class-DBI-Pg/devel perl-Class-DBI-Pg.spec,1.5,1.6 Message-ID: <200803021558.m22FwXtu028552@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-DBI-Pg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Class-DBI-Pg/devel Modified Files: perl-Class-DBI-Pg.spec Log Message: perl rebuild, chain 4 Index: perl-Class-DBI-Pg.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Pg/devel/perl-Class-DBI-Pg.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-DBI-Pg.spec 28 Jan 2008 21:44:42 -0000 1.5 +++ perl-Class-DBI-Pg.spec 2 Mar 2008 15:54:59 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Pg Version: 0.09 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Class::DBI extension for PostgreSQL Group: Development/Libraries License: GPL+ or Artistic @@ -46,6 +46,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.09-4 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.09-3 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:35 GMT Subject: rpms/perl-Class-DBI-AbstractSearch/devel perl-Class-DBI-AbstractSearch.spec, 1.6, 1.7 Message-ID: <200803021558.m22FwZx8028563@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-DBI-AbstractSearch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Class-DBI-AbstractSearch/devel Modified Files: perl-Class-DBI-AbstractSearch.spec Log Message: perl rebuild, chain 4 Index: perl-Class-DBI-AbstractSearch.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-DBI-AbstractSearch/devel/perl-Class-DBI-AbstractSearch.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Class-DBI-AbstractSearch.spec 28 Jan 2008 21:41:09 -0000 1.6 +++ perl-Class-DBI-AbstractSearch.spec 2 Mar 2008 15:54:29 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-AbstractSearch Version: 0.07 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Abstract Class::DBI's SQL with SQL::Abstract Group: Development/Libraries License: GPL+ or Artistic @@ -47,6 +47,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.07-5 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.07-4 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:35 GMT Subject: rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node.spec,1.6,1.7 Message-ID: <200803021558.m22FwZkL028566@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Tree-DAG_Node/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Tree-DAG_Node/devel Modified Files: perl-Tree-DAG_Node.spec Log Message: perl rebuild, chain 4 Index: perl-Tree-DAG_Node.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tree-DAG_Node/devel/perl-Tree-DAG_Node.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Tree-DAG_Node.spec 1 Feb 2008 03:25:16 -0000 1.6 +++ perl-Tree-DAG_Node.spec 2 Mar 2008 15:56:18 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Tree-DAG_Node Version: 1.06 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Class for representing nodes in a tree Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.06-3 +- Rebuild for perl 5.10 (again) + * Thu Jan 31 2008 Tom "spot" Callaway - 1.06-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:33 GMT Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.40,1.41 Message-ID: <200803021558.m22FwX3A028553@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBD-MySQL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-DBD-MySQL/devel Modified Files: perl-DBD-MySQL.spec Log Message: perl rebuild, chain 4 Index: perl-DBD-MySQL.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- perl-DBD-MySQL.spec 19 Feb 2008 21:58:41 -0000 1.40 +++ perl-DBD-MySQL.spec 2 Mar 2008 15:53:12 -0000 1.41 @@ -1,6 +1,6 @@ Name: perl-DBD-MySQL Version: 4.005 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A MySQL interface for perl Group: Development/Libraries @@ -64,6 +64,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 4.005-8 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 4.005-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:30 GMT Subject: rpms/perl-XML-Twig/devel perl-XML-Twig.spec,1.20,1.21 Message-ID: <200803021558.m22FwUxh028546@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Twig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-XML-Twig/devel Modified Files: perl-XML-Twig.spec Log Message: perl rebuild, chain 4 Index: perl-XML-Twig.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Twig/devel/perl-XML-Twig.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- perl-XML-Twig.spec 28 Jan 2008 21:30:27 -0000 1.20 +++ perl-XML-Twig.spec 2 Mar 2008 15:52:40 -0000 1.21 @@ -1,6 +1,6 @@ Name: perl-XML-Twig Version: 3.29 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A perl module for processing huge XML documents in tree mode Group: Development/Libraries @@ -90,6 +90,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 3.29-6 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 3.29-5 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:32 GMT Subject: rpms/perl-Net-DNS/devel perl-Net-DNS.spec,1.38,1.39 Message-ID: <200803021558.m22FwWES028549@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-DNS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Net-DNS/devel Modified Files: perl-Net-DNS.spec Log Message: perl rebuild, chain 4 Index: perl-Net-DNS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- perl-Net-DNS.spec 19 Feb 2008 22:07:34 -0000 1.38 +++ perl-Net-DNS.spec 2 Mar 2008 15:57:58 -0000 1.39 @@ -1,6 +1,6 @@ Name: perl-Net-DNS Version: 0.61 -Release: 6%{?dist} +Release: 7%{?dist} Summary: DNS resolver modules for Perl License: GPL+ or Artistic Group: Development/Libraries @@ -80,6 +80,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.61-7 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 0.61-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:29 GMT Subject: rpms/perl-Net-SSLeay/devel perl-Net-SSLeay.spec,1.9,1.10 Message-ID: <200803021558.m22FwTsD028543@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-SSLeay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Net-SSLeay/devel Modified Files: perl-Net-SSLeay.spec Log Message: perl rebuild, chain 4 Index: perl-Net-SSLeay.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Net-SSLeay.spec 19 Feb 2008 19:12:00 -0000 1.9 +++ perl-Net-SSLeay.spec 2 Mar 2008 15:56:44 -0000 1.10 @@ -5,7 +5,7 @@ Name: perl-Net-SSLeay Version: 1.32 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl extension for using OpenSSL Group: Development/Libraries License: OpenSSL @@ -67,6 +67,9 @@ %{_mandir}/man3/Net::SSLeay*.3* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.32-5 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 1.32-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:38 GMT Subject: rpms/perl-Tie-IxHash/devel perl-Tie-IxHash.spec,1.11,1.12 Message-ID: <200803021558.m22Fwc37028575@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Tie-IxHash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Tie-IxHash/devel Modified Files: perl-Tie-IxHash.spec Log Message: perl rebuild, chain 4 Index: perl-Tie-IxHash.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tie-IxHash/devel/perl-Tie-IxHash.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Tie-IxHash.spec 28 Jan 2008 21:07:50 -0000 1.11 +++ perl-Tie-IxHash.spec 2 Mar 2008 15:49:21 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Tie-IxHash Version: 1.21 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Ordered associative arrays for Perl Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.21-8 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 1.21-7 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:34 GMT Subject: rpms/perl-Text-Iconv/devel perl-Text-Iconv.spec,1.13,1.14 Message-ID: <200803021558.m22FwYIw028560@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Iconv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Text-Iconv/devel Modified Files: perl-Text-Iconv.spec Log Message: perl rebuild, chain 4 Index: perl-Text-Iconv.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Iconv/devel/perl-Text-Iconv.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Text-Iconv.spec 12 Feb 2008 15:32:24 -0000 1.13 +++ perl-Text-Iconv.spec 2 Mar 2008 15:52:29 -0000 1.14 @@ -1,6 +1,6 @@ Name: perl-Text-Iconv Version: 1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl interface to iconv() codeset conversion function Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.7-4 +- Rebuild for perl 5.10 (again) + * Tue Feb 12 2008 Andreas Thienemann - 1.7-3 - Rebuilt against gcc-4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:39 GMT Subject: rpms/perl-Class-DBI-mysql/devel perl-Class-DBI-mysql.spec,1.5,1.6 Message-ID: <200803021558.m22Fwdlu028580@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-DBI-mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Class-DBI-mysql/devel Modified Files: perl-Class-DBI-mysql.spec Log Message: perl rebuild, chain 4 Index: perl-Class-DBI-mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-DBI-mysql/devel/perl-Class-DBI-mysql.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-DBI-mysql.spec 28 Jan 2008 21:36:12 -0000 1.5 +++ perl-Class-DBI-mysql.spec 2 Mar 2008 15:53:33 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-mysql Version: 1.00 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Extensions to Class::DBI for MySQL Group: Development/Libraries License: GPL+ or Artistic @@ -47,6 +47,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.00-5 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 1.00-4 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:39 GMT Subject: rpms/perl-Unicode-Map8/devel perl-Unicode-Map8.spec,1.17,1.18 Message-ID: <200803021558.m22FwdcR028583@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Unicode-Map8/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Unicode-Map8/devel Modified Files: perl-Unicode-Map8.spec Log Message: perl rebuild, chain 4 Index: perl-Unicode-Map8.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Unicode-Map8/devel/perl-Unicode-Map8.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Unicode-Map8.spec 18 Feb 2008 18:23:58 -0000 1.17 +++ perl-Unicode-Map8.spec 2 Mar 2008 15:51:55 -0000 1.18 @@ -2,7 +2,7 @@ Name: perl-Unicode-Map8 Version: 0.12 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Mapping table between 8-bit chars and Unicode for Perl @@ -66,6 +66,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.12-17 +- Rebuild for perl 5.10 (again) + * Mon Feb 18 2008 Fedora Release Engineering - 0.12-16 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:40 GMT Subject: rpms/perl-Email-MIME-Modifier/devel perl-Email-MIME-Modifier.spec, 1.7, 1.8 Message-ID: <200803021558.m22Fwew3028589@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Email-MIME-Modifier/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Email-MIME-Modifier/devel Modified Files: perl-Email-MIME-Modifier.spec Log Message: perl rebuild, chain 4 Index: perl-Email-MIME-Modifier.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Modifier/devel/perl-Email-MIME-Modifier.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Email-MIME-Modifier.spec 28 Jan 2008 21:47:51 -0000 1.7 +++ perl-Email-MIME-Modifier.spec 2 Mar 2008 15:55:29 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Email-MIME-Modifier Version: 1.442 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Modify Email::MIME Objects Easily Group: Development/Libraries @@ -66,6 +66,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.442-3 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 1.442-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:41 GMT Subject: rpms/spamassassin/devel spamassassin.spec,1.106,1.107 Message-ID: <200803021558.m22FwfNO028595@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/spamassassin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/spamassassin/devel Modified Files: spamassassin.spec Log Message: perl rebuild, chain 4 Index: spamassassin.spec =================================================================== RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- spamassassin.spec 20 Feb 2008 06:58:31 -0000 1.106 +++ spamassassin.spec 2 Mar 2008 15:58:03 -0000 1.107 @@ -14,7 +14,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.2.4 -Release: 3%{?dist} +Release: 4%{?dist} License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -195,6 +195,9 @@ exit 0 %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 3.2.4-4 +- Rebuild for perl 5.10 (again) + * Wed Feb 20 2008 Fedora Release Engineering - 3.2.4-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:42 GMT Subject: rpms/perl-Parse-Yapp/devel perl-Parse-Yapp.spec,1.5,1.6 Message-ID: <200803021558.m22Fwgfk028607@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Parse-Yapp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Parse-Yapp/devel Modified Files: perl-Parse-Yapp.spec Log Message: perl rebuild, chain 4 Index: perl-Parse-Yapp.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Parse-Yapp/devel/perl-Parse-Yapp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Parse-Yapp.spec 28 Jan 2008 21:41:51 -0000 1.5 +++ perl-Parse-Yapp.spec 2 Mar 2008 15:54:35 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Parse-Yapp Version: 1.05 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Perl extension for generating and using LALR parsers Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.05-38 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 1.05-37 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:37 GMT Subject: rpms/perl-IO-Socket-INET6/devel perl-IO-Socket-INET6.spec,1.4,1.5 Message-ID: <200803021558.m22Fwbv1028569@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-Socket-INET6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-IO-Socket-INET6/devel Modified Files: perl-IO-Socket-INET6.spec Log Message: perl rebuild, chain 4 Index: perl-IO-Socket-INET6.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Socket-INET6/devel/perl-IO-Socket-INET6.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-IO-Socket-INET6.spec 1 Feb 2008 03:21:49 -0000 1.4 +++ perl-IO-Socket-INET6.spec 2 Mar 2008 15:56:00 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-IO-Socket-INET6 Version: 2.51 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl Object interface for AF_INET|AF_INET6 domain sockets Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.51-5 +- Rebuild for perl 5.10 (again) + * Thu Jan 31 2008 Tom "spot" Callaway - 2.51-4 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:40 GMT Subject: rpms/perl-XML-SAX-Writer/devel perl-XML-SAX-Writer.spec,1.3,1.4 Message-ID: <200803021558.m22FwexJ028590@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-SAX-Writer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-XML-SAX-Writer/devel Modified Files: perl-XML-SAX-Writer.spec Log Message: perl rebuild, chain 4 Index: perl-XML-SAX-Writer.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-SAX-Writer/devel/perl-XML-SAX-Writer.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-XML-SAX-Writer.spec 28 Jan 2008 21:31:31 -0000 1.3 +++ perl-XML-SAX-Writer.spec 2 Mar 2008 15:52:34 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-XML-SAX-Writer Version: 0.50 -Release: 4%{?dist} +Release: 5%{?dist} Summary: SAX2 Writer License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.50-5 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.50-4 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:44 GMT Subject: rpms/perl-TermReadKey/devel perl-TermReadKey.spec,1.20,1.21 Message-ID: <200803021558.m22FwihZ028619@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-TermReadKey/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-TermReadKey/devel Modified Files: perl-TermReadKey.spec Log Message: perl rebuild, chain 4 Index: perl-TermReadKey.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-TermReadKey/devel/perl-TermReadKey.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- perl-TermReadKey.spec 19 Feb 2008 22:12:37 -0000 1.20 +++ perl-TermReadKey.spec 2 Mar 2008 15:50:44 -0000 1.21 @@ -1,6 +1,6 @@ Name: perl-TermReadKey Version: 2.30 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A perl module for simple terminal control Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.30-6 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 2.30-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:40 GMT Subject: rpms/perl-Template-Toolkit/devel perl-Template-Toolkit.spec, 1.11, 1.12 Message-ID: <200803021558.m22Fwexx028586@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Template-Toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Template-Toolkit/devel Modified Files: perl-Template-Toolkit.spec Log Message: perl rebuild, chain 4 Index: perl-Template-Toolkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Template-Toolkit.spec 20 Feb 2008 01:42:41 -0000 1.11 +++ perl-Template-Toolkit.spec 2 Mar 2008 15:50:28 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Template-Toolkit Version: 2.19 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Template processing system Group: Development/Libraries License: GPL+ or Artistic @@ -94,6 +94,9 @@ %{_datadir}/tt2/examples %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.19-4 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 2.19-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:42 GMT Subject: rpms/perl-Class-MethodMaker/devel perl-Class-MethodMaker.spec, 1.12, 1.13 Message-ID: <200803021558.m22Fwg7h028610@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-MethodMaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Class-MethodMaker/devel Modified Files: perl-Class-MethodMaker.spec Log Message: perl rebuild, chain 4 Index: perl-Class-MethodMaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MethodMaker/devel/perl-Class-MethodMaker.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Class-MethodMaker.spec 19 Feb 2008 01:33:25 -0000 1.12 +++ perl-Class-MethodMaker.spec 2 Mar 2008 15:51:28 -0000 1.13 @@ -2,7 +2,7 @@ Name: perl-Class-MethodMaker Version: 2.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module for creating generic object-oriented methods Group: Development/Libraries @@ -53,6 +53,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.10-3 +- Rebuild for perl 5.10 (again) + * Mon Feb 18 2008 Fedora Release Engineering - 2.10-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:41 GMT Subject: rpms/perl-AnyData/devel perl-AnyData.spec,1.5,1.6 Message-ID: <200803021558.m22FwfZt028598@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-AnyData/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-AnyData/devel Modified Files: perl-AnyData.spec Log Message: perl rebuild, chain 4 Index: perl-AnyData.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-AnyData/devel/perl-AnyData.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-AnyData.spec 28 Jan 2008 21:39:16 -0000 1.5 +++ perl-AnyData.spec 2 Mar 2008 15:53:58 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-AnyData Version: 0.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Easy access to data in many formats Group: Development/Libraries License: GPL+ or Artistic @@ -54,6 +54,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.10-6 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.10-5 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:41 GMT Subject: rpms/perl-IO-Compress-Base/devel perl-IO-Compress-Base.spec, 1.4, 1.5 Message-ID: <200803021558.m22FwfSB028601@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-Compress-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-IO-Compress-Base/devel Modified Files: perl-IO-Compress-Base.spec Log Message: perl rebuild, chain 4 Index: perl-IO-Compress-Base.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Compress-Base/devel/perl-IO-Compress-Base.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-IO-Compress-Base.spec 28 Jan 2008 21:33:55 -0000 1.4 +++ perl-IO-Compress-Base.spec 2 Mar 2008 15:53:07 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-IO-Compress-Base Version: 2.005 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Base Class for IO::Compress modules License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/*.3pm* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.005-4 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 2.005-3 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:43 GMT Subject: rpms/perl-Test-Warn/devel perl-Test-Warn.spec,1.7,1.8 Message-ID: <200803021558.m22FwhlF028613@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-Warn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Test-Warn/devel Modified Files: perl-Test-Warn.spec Log Message: perl rebuild, chain 4 Index: perl-Test-Warn.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Warn/devel/perl-Test-Warn.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Test-Warn.spec 1 Feb 2008 03:28:10 -0000 1.7 +++ perl-Test-Warn.spec 2 Mar 2008 15:56:35 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Test-Warn Version: 0.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension to test methods for warnings Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.10-3 +- Rebuild for perl 5.10 (again) + * Thu Jan 31 2008 Tom "spot" Callaway - 0.10-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:42 GMT Subject: rpms/perl-IO-Socket-SSL/devel perl-IO-Socket-SSL.spec,1.10,1.11 Message-ID: <200803021558.m22FwgaA028604@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-IO-Socket-SSL/devel Modified Files: perl-IO-Socket-SSL.spec Log Message: perl rebuild, chain 4 Index: perl-IO-Socket-SSL.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-IO-Socket-SSL.spec 1 Feb 2008 03:30:23 -0000 1.10 +++ perl-IO-Socket-SSL.spec 2 Mar 2008 15:57:00 -0000 1.11 @@ -5,7 +5,7 @@ Name: perl-IO-Socket-SSL Version: 1.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl library for transparent SSL Group: Development/Libraries License: GPL+ or Artistic @@ -58,6 +58,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.12-4 +- Rebuild for perl 5.10 (again) + * Thu Jan 31 2008 Tom "spot" Callaway - 1.12-3 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:37 GMT Subject: rpms/perl-Test-NoWarnings/devel perl-Test-NoWarnings.spec,1.7,1.8 Message-ID: <200803021558.m22Fwb8k028572@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-NoWarnings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Test-NoWarnings/devel Modified Files: perl-Test-NoWarnings.spec Log Message: perl rebuild, chain 4 Index: perl-Test-NoWarnings.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-NoWarnings/devel/perl-Test-NoWarnings.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Test-NoWarnings.spec 28 Jan 2008 21:34:54 -0000 1.7 +++ perl-Test-NoWarnings.spec 2 Mar 2008 15:53:00 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Test-NoWarnings Version: 0.084 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Make sure you didn't emit any warnings while testing License: LGPLv2+ Group: Development/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.084-3 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.084-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:47 GMT Subject: rpms/perl-Class-DBI-Loader/devel perl-Class-DBI-Loader.spec, 1.5, 1.6 Message-ID: <200803021558.m22FwlqB028637@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-DBI-Loader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Class-DBI-Loader/devel Modified Files: perl-Class-DBI-Loader.spec Log Message: perl rebuild, chain 4 Index: perl-Class-DBI-Loader.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-DBI-Loader/devel/perl-Class-DBI-Loader.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-DBI-Loader.spec 28 Jan 2008 21:45:16 -0000 1.5 +++ perl-Class-DBI-Loader.spec 2 Mar 2008 15:55:03 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Loader Version: 0.34 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dynamic definition of Class::DBI sub classes Group: Development/Libraries License: GPL+ or Artistic @@ -49,6 +49,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.34-3 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.34-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:45 GMT Subject: rpms/perl-Image-Xbm/devel perl-Image-Xbm.spec,1.11,1.12 Message-ID: <200803021558.m22FwjZS028622@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Image-Xbm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Image-Xbm/devel Modified Files: perl-Image-Xbm.spec Log Message: perl rebuild, chain 4 Index: perl-Image-Xbm.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Image-Xbm/devel/perl-Image-Xbm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Image-Xbm.spec 28 Jan 2008 21:19:06 -0000 1.11 +++ perl-Image-Xbm.spec 2 Mar 2008 15:49:59 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Image-Xbm Version: 1.08 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Load, create, manipulate and save xbm image files in Perl Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.08-8 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 1.08-7 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:43 GMT Subject: rpms/perl-Template-Plugin-Class/devel perl-Template-Plugin-Class.spec, 1.7, 1.8 Message-ID: <200803021558.m22FwhLF028616@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Template-Plugin-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Template-Plugin-Class/devel Modified Files: perl-Template-Plugin-Class.spec Log Message: perl rebuild, chain 4 Index: perl-Template-Plugin-Class.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Template-Plugin-Class/devel/perl-Template-Plugin-Class.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Template-Plugin-Class.spec 28 Jan 2008 21:21:46 -0000 1.7 +++ perl-Template-Plugin-Class.spec 2 Mar 2008 15:50:40 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Template-Plugin-Class Version: 0.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Allow calling of class methods on arbitrary classes Group: Development/Libraries License: GPL+ or Artistic @@ -44,6 +44,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.13-5 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.13-4 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:49 GMT Subject: rpms/perl-Digest-BubbleBabble/devel perl-Digest-BubbleBabble.spec, 1.8, 1.9 Message-ID: <200803021558.m22FwnJI028652@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Digest-BubbleBabble/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Digest-BubbleBabble/devel Modified Files: perl-Digest-BubbleBabble.spec Log Message: perl rebuild, chain 4 Index: perl-Digest-BubbleBabble.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Digest-BubbleBabble/devel/perl-Digest-BubbleBabble.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Digest-BubbleBabble.spec 1 Feb 2008 03:31:00 -0000 1.8 +++ perl-Digest-BubbleBabble.spec 2 Mar 2008 15:57:12 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Create bubble-babble fingerprints Name: perl-Digest-BubbleBabble Version: 0.01 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Digest-BubbleBabble/ @@ -52,6 +52,9 @@ %{_mandir}/man3/Digest::BubbleBabble.3pm* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.01-8 +- Rebuild for perl 5.10 (again) + * Thu Jan 31 2008 Tom "spot" Callaway 0.01-7 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:47 GMT Subject: rpms/perl-XML-XPathEngine/devel perl-XML-XPathEngine.spec,1.3,1.4 Message-ID: <200803021558.m22FwlNM028638@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-XPathEngine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-XML-XPathEngine/devel Modified Files: perl-XML-XPathEngine.spec Log Message: perl rebuild, chain 4 Index: perl-XML-XPathEngine.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-XPathEngine/devel/perl-XML-XPathEngine.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-XML-XPathEngine.spec 28 Jan 2008 21:27:42 -0000 1.3 +++ perl-XML-XPathEngine.spec 2 Mar 2008 15:52:09 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-XML-XPathEngine Version: 0.08 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Re-usable XPath engine for DOM-like trees License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.08-4 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.08-3 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:45 GMT Subject: rpms/perl-Mail-Box/devel perl-Mail-Box.spec,1.4,1.5 Message-ID: <200803021558.m22FwjR5028624@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Mail-Box/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Mail-Box/devel Modified Files: perl-Mail-Box.spec Log Message: perl rebuild, chain 4 Index: perl-Mail-Box.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-Box/devel/perl-Mail-Box.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Mail-Box.spec 2 Feb 2008 18:33:37 -0000 1.4 +++ perl-Mail-Box.spec 2 Mar 2008 15:58:11 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Mail-Box Version: 2.073 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Manage a mailbox, a folder with messages Group: Development/Libraries License: GPL+ or Artistic @@ -17,7 +17,7 @@ BuildRequires: perl(Sys::Hostname), perl(Test::More), perl(Test::Harness), perl(MIME::Base64) BuildRequires: perl(URI), perl(IO::Scalar), perl(Digest::HMAC_MD5), perl(User::Identity) BuildRequires: perl(Time::Zone), perl(Email::Simple) -BuildRequires: perl(Email::Abstract) +# BuildRequires: perl(Email::Abstract) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -63,7 +63,7 @@ recode $RPM_BUILD_ROOT%{_mandir}/man3/Mail::Message::Field.3pm iso-8859-1 %check -make test +# make test %clean rm -rf $RPM_BUILD_ROOT @@ -75,6 +75,12 @@ %{_mandir}/man3/*.3* %changelog +* Sun Mar 2 2008 Tom "spot" Callaway - 2.073-4 +- Rebuild, first pass, disable tests, BR on Email::Abstract + +* Wed Feb 27 2008 Tom "spot" Callaway - 2.073-3 +- Rebuild for perl 5.10 (again) + * Sat Feb 2 2008 Tom "spot" Callaway - 2.073-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:45 GMT Subject: rpms/perl-XML-Simple/devel perl-XML-Simple.spec,1.14,1.15 Message-ID: <200803021558.m22FwjT9028625@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-XML-Simple/devel Modified Files: perl-XML-Simple.spec Log Message: perl rebuild, chain 4 Index: perl-XML-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-XML-Simple.spec 28 Jan 2008 21:08:59 -0000 1.14 +++ perl-XML-Simple.spec 2 Mar 2008 15:49:38 -0000 1.15 @@ -1,6 +1,6 @@ Name: perl-XML-Simple Version: 2.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easy API to maintain XML in Perl Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.18-3 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 2.18-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:45 GMT Subject: rpms/perl-DBD-AnyData/devel perl-DBD-AnyData.spec,1.4,1.5 Message-ID: <200803021558.m22Fwjcd028623@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBD-AnyData/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-DBD-AnyData/devel Modified Files: perl-DBD-AnyData.spec Log Message: perl rebuild, chain 4 Index: perl-DBD-AnyData.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-AnyData/devel/perl-DBD-AnyData.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DBD-AnyData.spec 28 Jan 2008 21:39:50 -0000 1.4 +++ perl-DBD-AnyData.spec 2 Mar 2008 15:54:11 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-DBD-AnyData Version: 0.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: DBI access to XML, CSV and other formats Group: Development/Libraries License: GPL+ or Artistic @@ -46,6 +46,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.09-3 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway 0.09-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:51 GMT Subject: rpms/perl-Email-Abstract/devel perl-Email-Abstract.spec,1.4,1.5 Message-ID: <200803021558.m22Fwp4J028658@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Email-Abstract/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Email-Abstract/devel Modified Files: perl-Email-Abstract.spec Log Message: perl rebuild, chain 4 Index: perl-Email-Abstract.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-Abstract/devel/perl-Email-Abstract.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Email-Abstract.spec 28 Jan 2008 21:56:32 -0000 1.4 +++ perl-Email-Abstract.spec 2 Mar 2008 15:58:16 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Email-Abstract Version: 2.134 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Unified interface to mail representations Group: Development/Libraries License: GPL+ or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.134-3 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 2.134-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:46 GMT Subject: rpms/mod_perl/devel mod_perl.spec,1.59,1.60 Message-ID: <200803021558.m22FwkUW028634@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mod_perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/mod_perl/devel Modified Files: mod_perl.spec Log Message: perl rebuild, chain 4 Index: mod_perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/mod_perl/devel/mod_perl.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- mod_perl.spec 19 Feb 2008 07:10:18 -0000 1.59 +++ mod_perl.spec 2 Mar 2008 15:53:39 -0000 1.60 @@ -2,7 +2,7 @@ Name: mod_perl Version: 2.0.3 -Release: 20 +Release: 21 Summary: An embedded Perl interpreter for the Apache HTTP Server Group: System Environment/Daemons @@ -131,6 +131,9 @@ %{_includedir}/httpd/* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.0.3-21 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 2.0.3-20 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 15:58:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:47 GMT Subject: rpms/perl-User-Identity/devel perl-User-Identity.spec,1.3,1.4 Message-ID: <200803021558.m22Fwl6d028644@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-User-Identity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-User-Identity/devel Modified Files: perl-User-Identity.spec Log Message: perl rebuild, chain 4 Index: perl-User-Identity.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-User-Identity/devel/perl-User-Identity.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-User-Identity.spec 28 Jan 2008 21:48:37 -0000 1.3 +++ perl-User-Identity.spec 2 Mar 2008 15:55:40 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-User-Identity Version: 0.92 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maintains info about a physical person Group: Development/Libraries License: GPL+ or Artistic @@ -43,6 +43,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.92-3 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 0.92-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:47 GMT Subject: rpms/perl-Term-ProgressBar/devel perl-Term-ProgressBar.spec, 1.3, 1.4 Message-ID: <200803021558.m22FwlUG028643@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Term-ProgressBar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Term-ProgressBar/devel Modified Files: perl-Term-ProgressBar.spec Log Message: perl rebuild, chain 4 Index: perl-Term-ProgressBar.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ProgressBar/devel/perl-Term-ProgressBar.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Term-ProgressBar.spec 28 Jan 2008 21:25:46 -0000 1.3 +++ perl-Term-ProgressBar.spec 2 Mar 2008 15:51:42 -0000 1.4 @@ -11,7 +11,7 @@ Name: perl-Term-ProgressBar Version: 2.09 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Provide a progress meter on a standard terminal License: GPL+ or Artistic Group: Development/Libraries @@ -71,6 +71,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 2.09-4 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 2.09-3 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:47 GMT Subject: rpms/perl-Array-Compare/devel perl-Array-Compare.spec,1.7,1.8 Message-ID: <200803021558.m22Fwl5A028645@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Array-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Array-Compare/devel Modified Files: perl-Array-Compare.spec Log Message: perl rebuild, chain 4 Index: perl-Array-Compare.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Array-Compare/devel/perl-Array-Compare.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Array-Compare.spec 1 Feb 2008 03:22:28 -0000 1.7 +++ perl-Array-Compare.spec 2 Mar 2008 15:56:07 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Array-Compare Version: 1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension for comparing arrays Group: Development/Libraries @@ -51,6 +51,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.14-3 +- Rebuild for perl 5.10 (again) + * Thu Jan 31 2008 Tom "spot" Callaway - 1.14-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:50 GMT Subject: rpms/perl-Image-Info/devel perl-Image-Info.spec,1.20,1.21 Message-ID: <200803021558.m22FwoBT028655@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Image-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-Image-Info/devel Modified Files: perl-Image-Info.spec Log Message: perl rebuild, chain 4 Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- perl-Image-Info.spec 28 Jan 2008 21:19:43 -0000 1.20 +++ perl-Image-Info.spec 2 Mar 2008 15:50:15 -0000 1.21 @@ -2,7 +2,7 @@ Name: perl-Image-Info Version: 1.27 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.27-3 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 1.27-2 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 15:58:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 2 Mar 2008 15:58:51 GMT Subject: rpms/perl-DBD-XBase/devel perl-DBD-XBase.spec,1.8,1.9 Message-ID: <200803021558.m22FwppV028663@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBD-XBase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27306/perl-DBD-XBase/devel Modified Files: perl-DBD-XBase.spec Log Message: perl rebuild, chain 4 Index: perl-DBD-XBase.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-XBase/devel/perl-DBD-XBase.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-DBD-XBase.spec 28 Jan 2008 21:38:00 -0000 1.8 +++ perl-DBD-XBase.spec 2 Mar 2008 15:53:47 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-DBD-XBase Version: 0.241 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl module for reading and writing the dbf files Group: Development/Libraries @@ -64,6 +64,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.241-7 +- Rebuild for perl 5.10 (again) + * Mon Jan 28 2008 Tom "spot" Callaway - 0.241-6 - rebuild for new perl From fedora-extras-commits at redhat.com Sun Mar 2 16:02:13 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 2 Mar 2008 16:02:13 GMT Subject: rpms/xfce4-xfapplet-plugin/devel xfce4-xfapplet-plugin.spec, 1.7, 1.8 Message-ID: <200803021602.m22G2DeU002510@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-xfapplet-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31479 Modified Files: xfce4-xfapplet-plugin.spec Log Message: * Sun Mar 02 2008 Christoph Wickert - 0.1.0-6 - Require only gnome-panel instead of gnome-applets Index: xfce4-xfapplet-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-xfapplet-plugin/devel/xfce4-xfapplet-plugin.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xfce4-xfapplet-plugin.spec 19 Feb 2008 00:08:39 -0000 1.7 +++ xfce4-xfapplet-plugin.spec 2 Mar 2008 16:01:38 -0000 1.8 @@ -1,6 +1,6 @@ Name: xfce4-xfapplet-plugin Version: 0.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A plugin to use gnome-panel based applets inside the Xfce4 panel Group: User Interface/Desktops @@ -12,7 +12,7 @@ BuildRequires: xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.2.0 BuildRequires: libxml2-devel, gettext, perl(XML::Parser) BuildRequires: gnome-panel-devel >= 2.0.0 -Requires: xfce4-panel >= 4.4.0, gnome-applets +Requires: xfce4-panel >= 4.4.0, gnome-panel %description The XfApplet Plugin is a plugin for the Xfce 4 Panel which allows one to use @@ -49,6 +49,9 @@ %changelog +* Sun Mar 02 2008 Christoph Wickert - 0.1.0-6 +- Require only gnome-panel instead of gnome-applets + * Mon Feb 18 2008 Fedora Release Engineering - 0.1.0-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 16:30:03 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 16:30:03 GMT Subject: rpms/fontforge/devel .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 fontforge.spec, 1.28, 1.29 Message-ID: <200803021630.m22GU3nk005911@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fontforge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5851 Modified Files: .cvsignore sources fontforge.spec Log Message: Update to upstream 20080203 Add new devel subpackage Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 2 Dec 2007 18:02:44 -0000 1.15 +++ .cvsignore 2 Mar 2008 16:29:16 -0000 1.16 @@ -1,2 +1,2 @@ -fontforge_full-20071110.tar.bz2 -fontforge_htdocs-20071109.tar.bz2 +fontforge_full-20080203.tar.bz2 +fontforge_htdocs-20080203.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 2 Dec 2007 18:02:44 -0000 1.15 +++ sources 2 Mar 2008 16:29:16 -0000 1.16 @@ -1,2 +1,2 @@ -79e0663867ed7a50ad901024ebd82a0f fontforge_full-20071110.tar.bz2 -ef2746373eacf71a0f13467a0e8c3856 fontforge_htdocs-20071109.tar.bz2 +c5a309c85821804424abbc3b8e78839d fontforge_full-20080203.tar.bz2 +1f2a227d350c03a1c1b336b97cf55ab6 fontforge_htdocs-20080203.tar.bz2 Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- fontforge.spec 2 Dec 2007 18:02:44 -0000 1.28 +++ fontforge.spec 2 Mar 2008 16:29:16 -0000 1.29 @@ -1,8 +1,8 @@ -%define docs_version 20071109 +%define docs_version 20080203 %define gettext_package FontForge Name: fontforge -Version: 20071110 +Version: 20080203 Release: 1%{?dist} Summary: Outline and bitmap font editor @@ -27,6 +27,7 @@ BuildRequires: libXt-devel BuildRequires: xorg-x11-proto-devel BuildRequires: gettext +BuildRequires: libtool Obsoletes: pfaedit Provides: pfaedit @@ -37,6 +38,16 @@ (ASCII and binary Type 1, some Type 3 and Type 0), TrueType, OpenType (Type2) and CID-keyed fonts. +%package devel +Summary: Development tools for fontforge +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +This package includes the libraries and header files you will need +to compile applications against fontforge. + %prep %setup -q -n %{name}-%{version} @@ -50,25 +61,18 @@ mkdir cidmaps tar xzf htdocs/cidmaps.tgz -C cidmaps -sed -i -e 's/-rpath $(libdir)//' fontforge/Makefile*.in - # Fix bad line terminators %{__sed} -i 's/\r//' htdocs/Big5.txt %{__sed} -i 's/\r//' htdocs/corpchar.txt - %build -export CPPFLAGS='-DDOCDIR=\"%{_docdir}/%{name}-%{version}/htdocs\"' -export LIBS=-lgif -%configure --with-regular-link --with-freetype-bytecode=no - -make %{?_smp_mflags} - +%configure --with-freetype-bytecode=no +make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -# make install DESTDIR=$RPM_BUILD_ROOT fails. -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT + install -p -m 644 cidmaps/Adobe* $RPM_BUILD_ROOT%{_datadir}/fontforge rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so} @@ -81,13 +85,15 @@ --add-category X-Fedora \ %{SOURCE1} -rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontforge.pc - # The fontforge makefiles install htdocs as well, but we # prefer to have them under the standard RPM location, so # remove the extra copy rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/fontforge +# remove unneeded .la and .a files +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a + # Find translations %find_lang %{gettext_package} @@ -104,14 +110,23 @@ %defattr(-,root,root,-) %doc AUTHORS LICENSE htdocs %{_bindir}/* -%{_libdir}/libg*.so.* +%{_libdir}/lib*.so.* %{_datadir}/applications/*fontforge.desktop %{_datadir}/fontforge %{_datadir}/pixmaps/fontforge.png %{_mandir}/man1/*.1* +%files devel +%defattr(-,root,root,-) +%{_includedir}/fontforge/ +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc %changelog +* Sat Mar 01 2008 Kevin Fenzi - 20080203-1 +- Update to upstream 20080203 +- Add new devel subpackage + * Sun Dec 02 2007 Roozbeh Pournader - 20071110-1 - Update to upstream 20071110 From fedora-extras-commits at redhat.com Sun Mar 2 16:30:30 2008 From: fedora-extras-commits at redhat.com (Alexandru Ciobanu (ics)) Date: Sun, 2 Mar 2008 16:30:30 GMT Subject: rpms/liblqr-1/F-8 liblqr-1-0.1.0-pkgconfig.patch, NONE, 1.1 liblqr-1.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803021630.m22GUU29005917@cvs-int.fedora.redhat.com> Author: ics Update of /cvs/pkgs/rpms/liblqr-1/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5883/F-8 Modified Files: .cvsignore sources Added Files: liblqr-1-0.1.0-pkgconfig.patch liblqr-1.spec Log Message: iniitla import liblqr-1-0.1.0-pkgconfig.patch: --- NEW FILE liblqr-1-0.1.0-pkgconfig.patch --- --- liblqr-1-0.1.0/lqr-1.pc.in.debug 2007-11-28 07:40:01.000000000 +0900 +++ liblqr-1-0.1.0/lqr-1.pc.in 2008-02-26 03:26:13.000000000 +0900 @@ -7,5 +7,5 @@ Description: LiquidRescale seam-carving library Requires: glib-2.0 Version: @PACKAGE_VERSION@ -Libs: -L${libdir}/@LIBRARY_SNAME@ -l at LIBRARY_SNAME@ +Libs: -l at LIBRARY_SNAME@ Cflags: -I${includedir}/@LIBRARY_SNAME@ --- NEW FILE liblqr-1.spec --- %define tarversion 1 Name: liblqr-1 Version: 0.1.0 Release: 5%{?dist} Summary: LiquidRescale library Group: System Environment/Libraries License: GPLv3 URL: http://liquidrescale.wikidot.com/ Source0: http://liblqr.wikidot.com/local--files/en:download-page/%{name}-%{version}-%{tarversion}.tar.gz Patch0: liblqr-1-0.1.0-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) BuildRequires: glib2-devel %description The LiquidRescale (lqr) library provides a C/C++ API for performing non-uniform resizing of images by the seam-carving technique. %package devel Summary: LiquidRescale library development kit Group: Development/Libraries License: GPLv3 Requires: %{name} = %{version}-%{release} Requires: glib2-devel, pkgconfig %description devel The libqr-devel package contains the header files needed to develop applications with liblqr %prep %setup -q # Patches %patch -p1 -b .pkgconfig %build export LDFLAGS="`pkg-config --libs glib-2.0` -lm" %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # remove .la files find $RPM_BUILD_ROOT -name \*.la -exec %{__rm} -f {} \; # Fedora MUST %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README ChangeLog COPYING %{_libdir}/liblqr-1.so.0.0.0 %{_libdir}/liblqr-1.so.0 %files devel %defattr (-, root, root,-) %doc docs/liblqr_manual.docbook %{_libdir}/liblqr-1.so %{_includedir}/lqr-1/ %{_libdir}/pkgconfig/lqr-1.pc %changelog * Fri Feb 29 2008 Alexandru Ciobanu - 0.1.0-5 - Applied pkgconfig patch to remove unneeded directories. - Changed permissions of files to 0644. - Fixed minor typos. * Mon Feb 25 2008 Alexandru Ciobanu - 0.1.0-4 - Cleaned SPEC file, again. * Wed Feb 20 2008 Alexandru Ciobanu - 0.1.0-3 - Cleaned SPEC file. * Tue Feb 19 2008 Alexandru Ciobanu - 0.1.0-2 - Fixed licensing issue. * Thu Jan 17 2008 Alexandru Ciobanu - 0.1.0-1 - Update to latest upstream release. - Added glib BuildRequires. * Mon Dec 10 2007 Alexandru Ciobanu - 0.1.0-0 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liblqr-1/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2008 18:34:24 -0000 1.1 +++ .cvsignore 2 Mar 2008 16:29:51 -0000 1.2 @@ -0,0 +1 @@ +liblqr-1-0.1.0-1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liblqr-1/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:34:24 -0000 1.1 +++ sources 2 Mar 2008 16:29:52 -0000 1.2 @@ -0,0 +1 @@ +6c8be281b11b9782e45fa7f401e05087 liblqr-1-0.1.0-1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 16:35:43 2008 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 2 Mar 2008 16:35:43 GMT Subject: rpms/tailor/F-8 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tailor.spec, 1.4, 1.5 Message-ID: <200803021635.m22GZhht006155@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/pkgs/rpms/tailor/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6124 Modified Files: .cvsignore sources tailor.spec Log Message: * Sun Dec 23 2007 Dan Horak 0.9.30-1 - update to upstream version 0.9.30 - remove support for FC <= 6 - update the License tag Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tailor/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Oct 2007 15:27:32 -0000 1.3 +++ .cvsignore 2 Mar 2008 16:35:04 -0000 1.4 @@ -1 +1 @@ -tailor-0.9.29.tar.gz +tailor-0.9.30.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tailor/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Oct 2007 15:27:32 -0000 1.3 +++ sources 2 Mar 2008 16:35:04 -0000 1.4 @@ -1 +1 @@ -9c4e29693e58531ddd17c64c461444b5 tailor-0.9.29.tar.gz +ae4558c677238be0f0c1db832690c67f tailor-0.9.30.tar.gz Index: tailor.spec =================================================================== RCS file: /cvs/pkgs/rpms/tailor/F-8/tailor.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tailor.spec 25 Oct 2007 15:27:32 -0000 1.4 +++ tailor.spec 2 Mar 2008 16:35:04 -0000 1.5 @@ -2,18 +2,14 @@ Summary: A tool to migrate changesets between several version control systems Name: tailor -Version: 0.9.29 +Version: 0.9.30 Release: 1%{?dist} Source0: http://darcs.arstecnica.it/%{name}-%{version}.tar.gz -License: GPL +License: GPLv3+ Group: Development/Tools Url: http://progetti.arstecnica.it/tailor BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{?fedora} <= 6 -BuildRequires: python -%else BuildRequires: python-devel -%endif Requires: python-vcpx = %{version}-%{release} BuildArch: noarch Patch: tailor-test.patch @@ -29,7 +25,7 @@ %package -n python-vcpx Summary: Version Control Patch eXchanger Group: Development/Libraries -Requires: cvs, subversion, mercurial, cogito, tla, bazaar +Requires: cvs, subversion, mercurial, cogito, tla, bazaar, monotone, git-core %description -n python-vcpx This is the package `vcpx` (pronounced "veeseepex"). It encapsulates @@ -64,10 +60,15 @@ %files -n python-vcpx %defattr(-,root,root,-) -%{python_sitelib}/vcpx +%{python_sitelib}/* %changelog +* Sun Dec 23 2007 Dan Horak 0.9.30-1 +- update to upstream version 0.9.30 +- remove support for FC <= 6 +- update the License tag + * Thu Oct 25 2007 Dan Horak 0.9.29-1 - update to upstream version 0.9.29 (fixes #349711) From fedora-extras-commits at redhat.com Sun Mar 2 16:43:47 2008 From: fedora-extras-commits at redhat.com (Alexandru Ciobanu (ics)) Date: Sun, 2 Mar 2008 16:43:47 GMT Subject: rpms/liblqr-1/F-7 liblqr-1-0.1.0-pkgconfig.patch, NONE, 1.1 liblqr-1.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803021643.m22Ghl5A006356@cvs-int.fedora.redhat.com> Author: ics Update of /cvs/pkgs/rpms/liblqr-1/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6329/F-7 Modified Files: .cvsignore sources Added Files: liblqr-1-0.1.0-pkgconfig.patch liblqr-1.spec Log Message: initial import liblqr-1-0.1.0-pkgconfig.patch: --- NEW FILE liblqr-1-0.1.0-pkgconfig.patch --- --- liblqr-1-0.1.0/lqr-1.pc.in.debug 2007-11-28 07:40:01.000000000 +0900 +++ liblqr-1-0.1.0/lqr-1.pc.in 2008-02-26 03:26:13.000000000 +0900 @@ -7,5 +7,5 @@ Description: LiquidRescale seam-carving library Requires: glib-2.0 Version: @PACKAGE_VERSION@ -Libs: -L${libdir}/@LIBRARY_SNAME@ -l at LIBRARY_SNAME@ +Libs: -l at LIBRARY_SNAME@ Cflags: -I${includedir}/@LIBRARY_SNAME@ --- NEW FILE liblqr-1.spec --- %define tarversion 1 Name: liblqr-1 Version: 0.1.0 Release: 5%{?dist} Summary: LiquidRescale library Group: System Environment/Libraries License: GPLv3 URL: http://liquidrescale.wikidot.com/ Source0: http://liblqr.wikidot.com/local--files/en:download-page/%{name}-%{version}-%{tarversion}.tar.gz Patch0: liblqr-1-0.1.0-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) BuildRequires: glib2-devel %description The LiquidRescale (lqr) library provides a C/C++ API for performing non-uniform resizing of images by the seam-carving technique. %package devel Summary: LiquidRescale library development kit Group: Development/Libraries License: GPLv3 Requires: %{name} = %{version}-%{release} Requires: glib2-devel, pkgconfig %description devel The libqr-devel package contains the header files needed to develop applications with liblqr %prep %setup -q # Patches %patch -p1 -b .pkgconfig %build export LDFLAGS="`pkg-config --libs glib-2.0` -lm" %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # remove .la files find $RPM_BUILD_ROOT -name \*.la -exec %{__rm} -f {} \; # Fedora MUST %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README ChangeLog COPYING %{_libdir}/liblqr-1.so.0.0.0 %{_libdir}/liblqr-1.so.0 %files devel %defattr (-, root, root,-) %doc docs/liblqr_manual.docbook %{_libdir}/liblqr-1.so %{_includedir}/lqr-1/ %{_libdir}/pkgconfig/lqr-1.pc %changelog * Fri Feb 29 2008 Alexandru Ciobanu - 0.1.0-5 - Applied pkgconfig patch to remove unneeded directories. - Changed permissions of files to 0644. - Fixed minor typos. * Mon Feb 25 2008 Alexandru Ciobanu - 0.1.0-4 - Cleaned SPEC file, again. * Wed Feb 20 2008 Alexandru Ciobanu - 0.1.0-3 - Cleaned SPEC file. * Tue Feb 19 2008 Alexandru Ciobanu - 0.1.0-2 - Fixed licensing issue. * Thu Jan 17 2008 Alexandru Ciobanu - 0.1.0-1 - Update to latest upstream release. - Added glib BuildRequires. * Mon Dec 10 2007 Alexandru Ciobanu - 0.1.0-0 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/liblqr-1/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2008 18:34:24 -0000 1.1 +++ .cvsignore 2 Mar 2008 16:43:09 -0000 1.2 @@ -0,0 +1 @@ +liblqr-1-0.1.0-1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/liblqr-1/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:34:24 -0000 1.1 +++ sources 2 Mar 2008 16:43:09 -0000 1.2 @@ -0,0 +1 @@ +6c8be281b11b9782e45fa7f401e05087 liblqr-1-0.1.0-1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 16:44:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 16:44:49 +0000 Subject: [pkgdb] ocamldsort was added for rjones Message-ID: <200803021645.m22GjLGS019439@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocamldsort with summary Dependency sorter for OCaml source files Kevin Fenzi (kevin) has approved Package ocamldsort Kevin Fenzi (kevin) has added a Fedora devel branch for ocamldsort with an owner of rjones Kevin Fenzi (kevin) has approved ocamldsort in Fedora devel Kevin Fenzi (kevin) has approved Package ocamldsort Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocamldsort (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocamldsort (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocamldsort (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort From fedora-extras-commits at redhat.com Sun Mar 2 16:45:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 16:45:01 +0000 Subject: [pkgdb] ocamldsort (Fedora, 8) updated by kevin Message-ID: <200803021645.m22GjLGV019439@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocamldsort Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocamldsort (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocamldsort (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocamldsort (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocamldsort (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort From fedora-extras-commits at redhat.com Sun Mar 2 16:45:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 16:45:01 +0000 Subject: [pkgdb] ocamldsort (Fedora, devel) updated by kevin Message-ID: <200803021645.m22GjLGY019439@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocamldsort (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort From fedora-extras-commits at redhat.com Sun Mar 2 16:47:29 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 16:47:29 GMT Subject: rpms/ocamldsort - New directory Message-ID: <200803021647.m22GlTTg006535@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocamldsort In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCv6504/rpms/ocamldsort Log Message: Directory /cvs/extras/rpms/ocamldsort added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 16:47:36 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 16:47:36 GMT Subject: rpms/ocamldsort/devel - New directory Message-ID: <200803021647.m22GlaZO006549@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocamldsort/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCv6504/rpms/ocamldsort/devel Log Message: Directory /cvs/extras/rpms/ocamldsort/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 16:47:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 16:47:43 GMT Subject: rpms/ocamldsort Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803021647.m22GlhIv006574@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocamldsort In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCv6504/rpms/ocamldsort Added Files: Makefile import.log Log Message: Setup of module ocamldsort --- NEW FILE Makefile --- # Top level Makefile for module ocamldsort all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Mar 2 16:47:49 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 16:47:49 GMT Subject: rpms/ocamldsort/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803021647.m22Gln2E006594@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocamldsort/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCv6504/rpms/ocamldsort/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocamldsort --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocamldsort # $Id: Makefile,v 1.1 2008/03/02 16:47:43 kevin Exp $ NAME := ocamldsort SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Mar 2 16:52:09 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sun, 2 Mar 2008 16:52:09 GMT Subject: rpms/xastir/F-8 xastir-1.9.2-libdir.patch, NONE, 1.1 xastir.desktop, NONE, 1.1 xastir.png, NONE, 1.1 xastir.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803021652.m22Gq9wu006820@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xastir/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6784/F-8 Modified Files: .cvsignore sources Added Files: xastir-1.9.2-libdir.patch xastir.desktop xastir.png xastir.spec Log Message: initial import for F-8 xastir-1.9.2-libdir.patch: --- NEW FILE xastir-1.9.2-libdir.patch --- diff -Naur xastir-1.9.2/Makefile.in xastir-libdir/Makefile.in --- xastir-1.9.2/Makefile.in 2007-11-06 19:12:46.000000000 +0200 +++ xastir-libdir/Makefile.in 2008-02-23 14:56:11.000000000 +0200 @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd diff -Naur xastir-1.9.2/scripts/Makefile.in xastir-libdir/scripts/Makefile.in --- xastir-1.9.2/scripts/Makefile.in 2007-11-06 19:12:43.000000000 +0200 +++ xastir-libdir/scripts/Makefile.in 2008-02-23 14:48:22.000000000 +0200 @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --- NEW FILE xastir.desktop --- [Desktop Entry] Encoding=UTF-8 Name=xastir GenericName=Xastir Comment=Amateur Station Tracking and Reporting system for amateur radio Exec=xastir Icon=xastir.png Terminal=false Type=Application Categories=HamRadio; Version=1.0 --- NEW FILE xastir.spec --- Summary : Amateur Station Tracking and Reporting system for amateur radio Name : xastir Version : 1.9.2 Release : 3%{?dist} License : GPLv2 Group : Applications/Internet Source0 : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz Source1 : %{name}.desktop Source2 : %{name}.png Patch0 : xastir-1.9.2-libdir.patch URL : http://www.xastir.org BuildRoot : %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires : lesstif-devel BuildRequires : libXt-devel BuildRequires : festival BuildRequires : ImageMagick-devel BuildRequires : dos2unix BuildRequires : libax25-devel BuildRequires : curl-devel BuildRequires : pcre-devel BuildRequires : proj-devel BuildRequires : python BuildRequires : shapelib-devel %description Xastir is a graphical application that interfaces HAM radio and internet access to realtime mapping software. Install XASTIR if you are interested in APRS(tm) and HAM radio software. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .libdir %build #./bootstrap.sh %configure --without-graphicsmagick --with-rtree make %{?_smp_mflags} for f in README ChangeLog ; do mv $f $f.iso88591 iconv -o $f -f iso88591 -t utf8 $f.iso88591 rm -f $f.iso88591 done dos2unix scripts/toporama250k.pl %install rm -rf %{buildroot} make install DESTDIR="%{buildroot}" INSTALL="install -p" #fix wrong doc-path instalation in make install target #or else we'll get unpacked files rm -rf %{buildroot}/usr/share/doc #remove gpx2shape because of unsupported dependency Geo::Shapelib rm %{buildroot}/usr/share/xastir/gpx2shape # no upstream .desktop or icon yet mkdir -p %{buildroot}/usr/share/pixmaps/ cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/xastir %{_bindir}/xastir_udp_client %{_bindir}/callpass %{_mandir}/man1/xastir.* %attr(0644,root,root) %{_datadir}/xastir/Coordinate.pm %{_datadir}/xastir %{_datadir}/xastir/help #%{_datadir}/xastir/config %{_datadir}/xastir/symbols %{_datadir}/xastir/maps #%{_datadir}/xastir/Counties #%{_datadir}/xastir/fcc #%{_datadir}/xastir/GNIS #%{_datadir}/xastir/sounds %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE %doc README README.Contributing README.CVS README.Getting-Started %doc README.MAPS README.win32 UPGRADE %changelog * Sat Mar 2 2008 Lucian Langa - 1.9.2-3 - Added desktop and icon file * Sat Feb 23 2008 Lucian Langa - 1.9.2-2 - Moved scripts from libdir to datadir * Fri Feb 22 2008 Lucian Langa - 1.9.2-1 - Updated to Fedora Packaging specifications * Thu Jul 03 2003 Alan Crosswell - 1.2.1 my patches now integrated into the main trunk. * Sat Jun 21 2003 Alan Crosswell - added xastir-maps.patch * Mon Jun 16 2003 Alan Crosswell - 1.2.0 * Fri Jun 06 2003 Alan Crosswell - June 5 snapshot * Thu May 15 2003 Alan Crosswell - start with chuck's spec file for 1.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xastir/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2008 19:57:04 -0000 1.1 +++ .cvsignore 2 Mar 2008 16:51:29 -0000 1.2 @@ -0,0 +1 @@ +xastir-1.9.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xastir/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2008 19:57:04 -0000 1.1 +++ sources 2 Mar 2008 16:51:29 -0000 1.2 @@ -0,0 +1 @@ +8608afa8f8f0c441a37ba72aeeccdcac xastir-1.9.2.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 16:55:12 2008 From: fedora-extras-commits at redhat.com (Marc Wiriadisastra (mwiriadi)) Date: Sun, 2 Mar 2008 16:55:12 GMT Subject: rpms/mediatomb/devel mediatomb-service-disable.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mediatomb.spec, 1.3, 1.4 sources, 1.2, 1.3 mediatomb-conf-fedora.patch, 1.1, NONE mediatomb-service.patch, 1.1, NONE mediatomb_update.patch, 1.1, NONE Message-ID: <200803021655.m22GtCdQ006981@cvs-int.fedora.redhat.com> Author: mwiriadi Update of /cvs/pkgs/rpms/mediatomb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6948/devel Modified Files: .cvsignore mediatomb.spec sources Added Files: mediatomb-service-disable.patch Removed Files: mediatomb-conf-fedora.patch mediatomb-service.patch mediatomb_update.patch Log Message: New release version 0.11.0 Upstream has asked me to remove libextractor added inotify which works Removed patches due to upstream inclusion Added expat-devel Build with xulrunner Added patch to remove automatic service up and chkconfig up mediatomb-service-disable.patch: --- NEW FILE mediatomb-service-disable.patch --- --- mediatomb-0.11.0/scripts/mediatomb-service-fedora 2008-03-02 07:48:34.000000000 +0900 +++ mediatomb-0.11.0.mod/scripts/mediatomb-service-fedora 2008-03-03 00:54:27.000000000 +0900 @@ -2,7 +2,7 @@ # # mediatomb This script starts and stops the mediatomb daemon # -# chkconfig: 2345 95 30 +# chkconfig: - 95 30 # processname: mediatomb # description: mediatomb is a daemon process which provides a UPnP service # config: /etc/mediatomb Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mediatomb/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Jan 2008 08:31:31 -0000 1.2 +++ .cvsignore 2 Mar 2008 16:54:36 -0000 1.3 @@ -1 +1 @@ -mediatomb-0.10.0.tar.gz +mediatomb-0.11.0.tar.gz Index: mediatomb.spec =================================================================== RCS file: /cvs/pkgs/rpms/mediatomb/devel/mediatomb.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mediatomb.spec 13 Feb 2008 12:59:38 -0000 1.3 +++ mediatomb.spec 2 Mar 2008 16:54:36 -0000 1.4 @@ -1,18 +1,22 @@ -Version: 0.10.0 +Version: 0.11.0 Summary: UPnP AV MediaServer Name: mediatomb -Release: 9%{?dist} +Release: 1%{?dist} Summary: MediaTomb - UPnP AV Mediaserver for Linux License: GPLv2 Group: Applications/Multimedia Source: http://downloads.sourceforge.net/mediatomb/%{name}-%{version}.tar.gz -Patch0: mediatomb-service.patch -Patch1: mediatomb-conf-fedora.patch -Patch2: mediatomb_update.patch +Patch0: mediatomb-service-disable.patch URL: http://mediatomb.cc Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel, libextractor-devel -Requires: mysql +BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel +BuildRequires: expat-devel +%if 0%{?fedora} >= 9 +BuildRequires: xulrunner-devel +%else +BuildRequires: firefox-devel +%endif +Requires: mysql, expat Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -28,11 +32,13 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build -%configure --enable-libextractor +%if 0%{?fedora} >= 9 +%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9pre/js/ +%else +%configure --enable-inotify --enable-taglib --enable-libjs +%endif %{__make} %{?_smp_mflags} @@ -52,9 +58,9 @@ %{__cat} > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} << 'EOF' /var/log/mediatomb { create 644 root root - monthly - compress - missingok + monthly + compress + missingok } EOF @@ -91,6 +97,15 @@ %{_initrddir}/mediatomb %changelog +* Sun Mar 2 2008 Marc Wiriadisastra 0.11.0-1 +- New release version 0.11.0 +- Upstream has asked me to remove libextractor +- added inotify which works +- Removed patches due to upstream inclusion +- Added expat-devel +- Build with xulrunner +- Added patch to remove automatic service up and chkconfig up + * Wed Feb 13 2008 Marc Wiriadisastra 0.10.0-9 - Rebuild for gcc4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mediatomb/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Jan 2008 08:31:31 -0000 1.2 +++ sources 2 Mar 2008 16:54:36 -0000 1.3 @@ -1 +1 @@ -2436c73de4ac5f3ba1575f7ee93a0430 mediatomb-0.10.0.tar.gz +661f08933830d920de21436fe122fb15 mediatomb-0.11.0.tar.gz --- mediatomb-conf-fedora.patch DELETED --- --- mediatomb-service.patch DELETED --- --- mediatomb_update.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 16:57:19 2008 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Sun, 2 Mar 2008 16:57:19 GMT Subject: rpms/perl-mogilefs-server/EL-5 perl-mogilefs-server.spec, NONE, 1.1 Makefile, 1.1, 1.2 mogilefs-server.spec, 1.1, NONE Message-ID: <200803021657.m22GvJAg007146@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/pkgs/rpms/perl-mogilefs-server/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7084 Modified Files: Makefile Added Files: perl-mogilefs-server.spec Removed Files: mogilefs-server.spec Log Message: rename package --- NEW FILE perl-mogilefs-server.spec --- Name: perl-mogilefs-server Version: 2.17 Release: 5%{?dist} Summary: Server part of the MogileFS distributed filesystem License: GPL+ or Artistic Group: System Environment/Daemons URL: http://search.cpan.org/dist/mogilefs-server/ Source0: http://search.cpan.org/CPAN/authors/id/B/BR/BRADFITZ/mogilefs-server-%{version}.tar.gz Source1: mogstored.init Source2: mogilefsd.init Source3: mogilefsd.conf Source4: mogilefs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) BuildRequires: perl(MogileFS::Utils) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: mogilefs-server = %{version}-%{release} Obsoletes: mogilefs-server < 2.17-5 %description Server part of the MogileFS distributed filesystem %package -n mogilefsd Summary: MogileFS tracker daemon Group: System Environment/Daemons Requires: initscripts Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service BuildRequires: perl(Net::Netmask) BuildRequires: perl(DBD::mysql) %package -n mogstored Summary: MogileFS storage daemon Group: System Environment/Daemons Requires: initscripts Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service BuildRequires: perl(Gearman::Client::Async) BuildRequires: perl(Gearman::Server) %package -n mogstored-backend-perlbal Summary: Perlbal backend for mogstored Group: System Environment/Daemons Requires: perl(Mogstored::HTTPServer), Perlbal BuildRequires: perl(Perlbal) %package -n mogstored-backend-apache Summary: Apache backend for mogstored Group: System Environment/Daemons Requires: perl(Mogstored::HTTPServer), httpd %package -n mogstored-backend-lighttpd Summary: LigHTTPd backend for mogstored Group: System Environment/Daemons Requires: perl(Mogstored::HTTPServer), lighttpd %description -n mogilefsd The MogileFS tracker daemon mogilefsd %description -n mogstored The MogileFS storage daemon mogstored %description -n mogstored-backend-perlbal Perlbal backend for mogstored, the MogileFS storage daemon %description -n mogstored-backend-apache Apache backend for mogstored, the MogileFS storage daemon %description -n mogstored-backend-lighttpd LigHTTPd backend for mogstored, the MogileFS storage daemon %prep %setup -q -n mogilefs-server-%{version} # Remove mogstored backends and Perlbal from Requires: cat << \EOF > mogstored-req #!/bin/sh %{__perl_requires} $* |\ sed -e '/perl(Mogstored::HTTPServer::.*)/d' \ -e '/perl(Perlbal)/d' EOF %define __perl_requires %{_builddir}/mogilefs-server-%{version}/mogstored-req chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %{__install} -d -m0755 %{buildroot}%{_initrddir} %{__install} -p -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/mogstored %{__install} -p -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/mogilefsd %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/mogilefs %{__install} -p -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/mogilefs/mogilefsd.conf %{__install} -p -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/mogilefs/mogilefs.conf # remove the SQLite backend for now, since the latest driver # is not in Fedora yet (#245699) and most people are probably # only interested in the MySQL backend # the PostgreSQL backend is not stable yet rm %{buildroot}%{perl_vendorlib}/MogileFS/Store/SQLite.pm rm %{buildroot}%{perl_vendorlib}/MogileFS/Store/Postgres.pm %check rm t/mogstored-shutdown.t make test %clean rm -rf %{buildroot} %pre -n mogilefsd getent group mogilefsd >/dev/null || groupadd -r mogilefsd getent passwd mogilesd >/dev/null || \ useradd -r -g mogilefsd -d / -s /sbin/nologin \ -c "MogileFS tracker daemon" mogilefsd exit 0 %post -n mogilefsd if [ $1 -eq 1 ]; then /sbin/chkconfig --add mogilefsd fi %preun -n mogilefsd if [ $1 -eq 0 ]; then /sbin/service mogilefsd stop >/dev/null 2>&1 || : /sbin/chkconfig --del mogilefsd fi %pre -n mogstored getent group mogstored >/dev/null || groupadd -r mogstored getent passwd mogstored >/dev/null || \ useradd -r -g mogstored -d / -s /sbin/nologin \ -c "MogileFS storage daemon" mogstored exit 0 %post -n mogstored if [ $1 -eq 1 ]; then /sbin/chkconfig --add mogstored fi %preun -n mogstored if [ $1 -eq 0 ]; then /sbin/service mogstored stop >/dev/null 2>&1 || : /sbin/chkconfig --del mogstored fi %files -n mogilefsd %defattr(-,root,root,-) %doc CHANGES TODO doc/ %{_bindir}/mogilefsd %{_bindir}/mogdbsetup %{_mandir}/man1/mogilefsd.* %{_mandir}/man3/MogileFS::*.* %{perl_vendorlib}/MogileFS/* %dir %{perl_vendorlib}/MogileFS %dir %{_sysconfdir}/mogilefs %config(noreplace) %{_sysconfdir}/mogilefs/mogilefs.conf %config(noreplace) %{_sysconfdir}/mogilefs/mogilefsd.conf %{_initrddir}/mogilefsd %files -n mogstored %defattr(-,root,root,-) %{_bindir}/mogstored %{_bindir}/mogautomount %{_mandir}/man1/mogstored.* %{_mandir}/man1/mogautomount.* %dir %{perl_vendorlib}/Mogstored %{perl_vendorlib}/Mogstored/ChildProcess* %{perl_vendorlib}/Mogstored/FIDStatter.pm %{perl_vendorlib}/Mogstored/HTTPServer.pm %{perl_vendorlib}/Mogstored/SideChannel* %{_initrddir}/mogstored %files -n mogstored-backend-perlbal %defattr(-,root,root,-) %{perl_vendorlib}/Mogstored/HTTPServer/Perlbal.pm %files -n mogstored-backend-apache %defattr(-,root,root,-) %{perl_vendorlib}/Mogstored/HTTPServer/Apache.pm %files -n mogstored-backend-lighttpd %defattr(-,root,root,-) %{perl_vendorlib}/Mogstored/HTTPServer/Lighttpd.pm %changelog * Sun Mar 02 2008 Ruben Kerkhof 2.17-5 - Rename package to respect the Naming Guidelines * Sat Jan 19 2008 Ruben Kerkhof 2.17-4 - Require Perlbal instead of perlbal - Remove autogenerated Perlbal dependency from mogstored * Sat Jan 19 2008 Ruben Kerkhof 2.17-3 - Add Requires for perlbal to perlbal backend - Rename package - Remove failing test * Thu Sep 06 2007 Ruben Kerkhof 2.17-2 - Add missing BRs (#252257) * Sun May 20 2007 Ruben Kerkhof 2.17-1 - Initial import Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/EL-5/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 20 Jan 2008 18:12:36 -0000 1.1 +++ Makefile 2 Mar 2008 16:56:43 -0000 1.2 @@ -1,6 +1,6 @@ # Makefile for source rpm: mogilefs-server # $Id$ -NAME := mogilefs-server +NAME := perl-mogilefs-server SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common --- mogilefs-server.spec DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 16:57:44 2008 From: fedora-extras-commits at redhat.com (Marc Wiriadisastra (mwiriadi)) Date: Sun, 2 Mar 2008 16:57:44 GMT Subject: rpms/mediatomb/F-8 mediatomb-service-disable.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mediatomb.spec, 1.2, 1.3 sources, 1.2, 1.3 mediatomb-conf-fedora.patch, 1.1, NONE mediatomb-service.patch, 1.1, NONE mediatomb_update.patch, 1.1, NONE Message-ID: <200803021657.m22GvifQ007153@cvs-int.fedora.redhat.com> Author: mwiriadi Update of /cvs/pkgs/rpms/mediatomb/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7123/F-8 Modified Files: .cvsignore mediatomb.spec sources Added Files: mediatomb-service-disable.patch Removed Files: mediatomb-conf-fedora.patch mediatomb-service.patch mediatomb_update.patch Log Message: New release version 0.11.0 Upstream has asked me to remove libextractor added inotify which works Removed patches due to upstream inclusion Added expat-devel Build with xulrunner Added patch to remove automatic service up and chkconfig up mediatomb-service-disable.patch: --- NEW FILE mediatomb-service-disable.patch --- --- mediatomb-0.11.0/scripts/mediatomb-service-fedora 2008-03-02 07:48:34.000000000 +0900 +++ mediatomb-0.11.0.mod/scripts/mediatomb-service-fedora 2008-03-03 00:54:27.000000000 +0900 @@ -2,7 +2,7 @@ # # mediatomb This script starts and stops the mediatomb daemon # -# chkconfig: 2345 95 30 +# chkconfig: - 95 30 # processname: mediatomb # description: mediatomb is a daemon process which provides a UPnP service # config: /etc/mediatomb Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mediatomb/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Jan 2008 08:37:12 -0000 1.2 +++ .cvsignore 2 Mar 2008 16:57:10 -0000 1.3 @@ -1 +1 @@ -mediatomb-0.10.0.tar.gz +mediatomb-0.11.0.tar.gz Index: mediatomb.spec =================================================================== RCS file: /cvs/pkgs/rpms/mediatomb/F-8/mediatomb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mediatomb.spec 4 Jan 2008 23:57:17 -0000 1.2 +++ mediatomb.spec 2 Mar 2008 16:57:10 -0000 1.3 @@ -1,18 +1,22 @@ -Version: 0.10.0 +Version: 0.11.0 Summary: UPnP AV MediaServer Name: mediatomb -Release: 8%{?dist} +Release: 1%{?dist} Summary: MediaTomb - UPnP AV Mediaserver for Linux License: GPLv2 Group: Applications/Multimedia Source: http://downloads.sourceforge.net/mediatomb/%{name}-%{version}.tar.gz -Patch0: mediatomb-service.patch -Patch1: mediatomb-conf-fedora.patch -Patch2: mediatomb_update.patch +Patch0: mediatomb-service-disable.patch URL: http://mediatomb.cc Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel, libextractor-devel -Requires: mysql +BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel +BuildRequires: expat-devel +%if 0%{?fedora} >= 9 +BuildRequires: xulrunner-devel +%else +BuildRequires: firefox-devel +%endif +Requires: mysql, expat Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -28,11 +32,13 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build -%configure --enable-libextractor +%if 0%{?fedora} >= 9 +%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9pre/js/ +%else +%configure --enable-inotify --enable-taglib --enable-libjs +%endif %{__make} %{?_smp_mflags} @@ -52,9 +58,9 @@ %{__cat} > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} << 'EOF' /var/log/mediatomb { create 644 root root - monthly - compress - missingok + monthly + compress + missingok } EOF @@ -91,6 +97,18 @@ %{_initrddir}/mediatomb %changelog +* Sun Mar 2 2008 Marc Wiriadisastra 0.11.0-1 +- New release version 0.11.0 +- Upstream has asked me to remove libextractor +- added inotify which works +- Removed patches due to upstream inclusion +- Added expat-devel +- Build with xulrunner +- Added patch to remove automatic service up and chkconfig up + +* Wed Feb 13 2008 Marc Wiriadisastra 0.10.0-9 +- Rebuild for gcc4.3 + * Sat Jan 5 2008 Marc Wiriadisastra 0.10.0-8 - Added patch from upstream fixes the following issues (no bugs #) - fixes 64bit issues in libupnp Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mediatomb/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Jan 2008 08:37:12 -0000 1.2 +++ sources 2 Mar 2008 16:57:10 -0000 1.3 @@ -1 +1 @@ -2436c73de4ac5f3ba1575f7ee93a0430 mediatomb-0.10.0.tar.gz +661f08933830d920de21436fe122fb15 mediatomb-0.11.0.tar.gz --- mediatomb-conf-fedora.patch DELETED --- --- mediatomb-service.patch DELETED --- --- mediatomb_update.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 16:59:43 2008 From: fedora-extras-commits at redhat.com (Marc Wiriadisastra (mwiriadi)) Date: Sun, 2 Mar 2008 16:59:43 GMT Subject: rpms/mediatomb/F-7 mediatomb-service-disable.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mediatomb.spec, 1.2, 1.3 sources, 1.2, 1.3 mediatomb-conf-fedora.patch, 1.1, NONE mediatomb-service.patch, 1.1, NONE mediatomb_update.patch, 1.1, NONE Message-ID: <200803021659.m22Gxhd6007331@cvs-int.fedora.redhat.com> Author: mwiriadi Update of /cvs/pkgs/rpms/mediatomb/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7283/F-7 Modified Files: .cvsignore mediatomb.spec sources Added Files: mediatomb-service-disable.patch Removed Files: mediatomb-conf-fedora.patch mediatomb-service.patch mediatomb_update.patch Log Message: New release version 0.11.0 Upstream has asked me to remove libextractor added inotify which works Removed patches due to upstream inclusion Added expat-devel Build with xulrunner Added patch to remove automatic service up and chkconfig up mediatomb-service-disable.patch: --- NEW FILE mediatomb-service-disable.patch --- --- mediatomb-0.11.0/scripts/mediatomb-service-fedora 2008-03-02 07:48:34.000000000 +0900 +++ mediatomb-0.11.0.mod/scripts/mediatomb-service-fedora 2008-03-03 00:54:27.000000000 +0900 @@ -2,7 +2,7 @@ # # mediatomb This script starts and stops the mediatomb daemon # -# chkconfig: 2345 95 30 +# chkconfig: - 95 30 # processname: mediatomb # description: mediatomb is a daemon process which provides a UPnP service # config: /etc/mediatomb Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mediatomb/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Jan 2008 08:31:31 -0000 1.2 +++ .cvsignore 2 Mar 2008 16:59:08 -0000 1.3 @@ -1 +1 @@ -mediatomb-0.10.0.tar.gz +mediatomb-0.11.0.tar.gz Index: mediatomb.spec =================================================================== RCS file: /cvs/pkgs/rpms/mediatomb/F-7/mediatomb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mediatomb.spec 4 Jan 2008 23:55:13 -0000 1.2 +++ mediatomb.spec 2 Mar 2008 16:59:08 -0000 1.3 @@ -1,18 +1,22 @@ -Version: 0.10.0 +Version: 0.11.0 Summary: UPnP AV MediaServer Name: mediatomb -Release: 8%{?dist} +Release: 1%{?dist} Summary: MediaTomb - UPnP AV Mediaserver for Linux License: GPLv2 Group: Applications/Multimedia Source: http://downloads.sourceforge.net/mediatomb/%{name}-%{version}.tar.gz -Patch0: mediatomb-service.patch -Patch1: mediatomb-conf-fedora.patch -Patch2: mediatomb_update.patch +Patch0: mediatomb-service-disable.patch URL: http://mediatomb.cc Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel, libextractor-devel -Requires: mysql +BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel +BuildRequires: expat-devel +%if 0%{?fedora} >= 9 +BuildRequires: xulrunner-devel +%else +BuildRequires: firefox-devel +%endif +Requires: mysql, expat Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -28,11 +32,13 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build -%configure --enable-libextractor +%if 0%{?fedora} >= 9 +%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9pre/js/ +%else +%configure --enable-inotify --enable-taglib --enable-libjs +%endif %{__make} %{?_smp_mflags} @@ -52,9 +58,9 @@ %{__cat} > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} << 'EOF' /var/log/mediatomb { create 644 root root - monthly - compress - missingok + monthly + compress + missingok } EOF @@ -91,6 +97,18 @@ %{_initrddir}/mediatomb %changelog +* Sun Mar 2 2008 Marc Wiriadisastra 0.11.0-1 +- New release version 0.11.0 +- Upstream has asked me to remove libextractor +- added inotify which works +- Removed patches due to upstream inclusion +- Added expat-devel +- Build with xulrunner +- Added patch to remove automatic service up and chkconfig up + +* Wed Feb 13 2008 Marc Wiriadisastra 0.10.0-9 +- Rebuild for gcc4.3 + * Sat Jan 5 2008 Marc Wiriadisastra 0.10.0-8 - Added patch from upstream fixes the following issues (no bugs #) - fixes 64bit issues in libupnp Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mediatomb/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Jan 2008 08:31:31 -0000 1.2 +++ sources 2 Mar 2008 16:59:08 -0000 1.3 @@ -1 +1 @@ -2436c73de4ac5f3ba1575f7ee93a0430 mediatomb-0.10.0.tar.gz +661f08933830d920de21436fe122fb15 mediatomb-0.11.0.tar.gz --- mediatomb-conf-fedora.patch DELETED --- --- mediatomb-service.patch DELETED --- --- mediatomb_update.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 17:01:33 2008 From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben)) Date: Sun, 2 Mar 2008 17:01:33 GMT Subject: rpms/perl-mogilefs-server/F-8 perl-mogilefs-server.spec, NONE, 1.1 Makefile, 1.1, 1.2 mogilefs-server.spec, 1.1, NONE Message-ID: <200803021701.m22H1XiO009017@cvs-int.fedora.redhat.com> Author: ruben Update of /cvs/pkgs/rpms/perl-mogilefs-server/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393 Modified Files: Makefile Added Files: perl-mogilefs-server.spec Removed Files: mogilefs-server.spec Log Message: * Sun Mar 02 2008 Ruben Kerkhof 2.17-5 - Rename package to respect the Naming Guidelines --- NEW FILE perl-mogilefs-server.spec --- Name: perl-mogilefs-server Version: 2.17 Release: 5%{?dist} Summary: Server part of the MogileFS distributed filesystem License: GPL+ or Artistic Group: System Environment/Daemons URL: http://search.cpan.org/dist/mogilefs-server/ Source0: http://search.cpan.org/CPAN/authors/id/B/BR/BRADFITZ/mogilefs-server-%{version}.tar.gz Source1: mogstored.init Source2: mogilefsd.init Source3: mogilefsd.conf Source4: mogilefs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) BuildRequires: perl(MogileFS::Utils) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: mogilefs-server = %{version}-%{release} Obsoletes: mogilefs-server < 2.17-5 %description Server part of the MogileFS distributed filesystem %package -n mogilefsd Summary: MogileFS tracker daemon Group: System Environment/Daemons Requires: initscripts Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service BuildRequires: perl(Net::Netmask) BuildRequires: perl(DBD::mysql) %package -n mogstored Summary: MogileFS storage daemon Group: System Environment/Daemons Requires: initscripts Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service BuildRequires: perl(Gearman::Client::Async) BuildRequires: perl(Gearman::Server) %package -n mogstored-backend-perlbal Summary: Perlbal backend for mogstored Group: System Environment/Daemons Requires: perl(Mogstored::HTTPServer), Perlbal BuildRequires: perl(Perlbal) %package -n mogstored-backend-apache Summary: Apache backend for mogstored Group: System Environment/Daemons Requires: perl(Mogstored::HTTPServer), httpd %package -n mogstored-backend-lighttpd Summary: LigHTTPd backend for mogstored Group: System Environment/Daemons Requires: perl(Mogstored::HTTPServer), lighttpd %description -n mogilefsd The MogileFS tracker daemon mogilefsd %description -n mogstored The MogileFS storage daemon mogstored %description -n mogstored-backend-perlbal Perlbal backend for mogstored, the MogileFS storage daemon %description -n mogstored-backend-apache Apache backend for mogstored, the MogileFS storage daemon %description -n mogstored-backend-lighttpd LigHTTPd backend for mogstored, the MogileFS storage daemon %prep %setup -q -n mogilefs-server-%{version} # Remove mogstored backends and Perlbal from Requires: cat << \EOF > mogstored-req #!/bin/sh %{__perl_requires} $* |\ sed -e '/perl(Mogstored::HTTPServer::.*)/d' \ -e '/perl(Perlbal)/d' EOF %define __perl_requires %{_builddir}/mogilefs-server-%{version}/mogstored-req chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %{__install} -d -m0755 %{buildroot}%{_initrddir} %{__install} -p -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/mogstored %{__install} -p -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/mogilefsd %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/mogilefs %{__install} -p -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/mogilefs/mogilefsd.conf %{__install} -p -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/mogilefs/mogilefs.conf # remove the SQLite backend for now, since the latest driver # is not in Fedora yet (#245699) and most people are probably # only interested in the MySQL backend # the PostgreSQL backend is not stable yet rm %{buildroot}%{perl_vendorlib}/MogileFS/Store/SQLite.pm rm %{buildroot}%{perl_vendorlib}/MogileFS/Store/Postgres.pm %check rm t/mogstored-shutdown.t make test %clean rm -rf %{buildroot} %pre -n mogilefsd getent group mogilefsd >/dev/null || groupadd -r mogilefsd getent passwd mogilesd >/dev/null || \ useradd -r -g mogilefsd -d / -s /sbin/nologin \ -c "MogileFS tracker daemon" mogilefsd exit 0 %post -n mogilefsd if [ $1 -eq 1 ]; then /sbin/chkconfig --add mogilefsd fi %preun -n mogilefsd if [ $1 -eq 0 ]; then /sbin/service mogilefsd stop >/dev/null 2>&1 || : /sbin/chkconfig --del mogilefsd fi %pre -n mogstored getent group mogstored >/dev/null || groupadd -r mogstored getent passwd mogstored >/dev/null || \ useradd -r -g mogstored -d / -s /sbin/nologin \ -c "MogileFS storage daemon" mogstored exit 0 %post -n mogstored if [ $1 -eq 1 ]; then /sbin/chkconfig --add mogstored fi %preun -n mogstored if [ $1 -eq 0 ]; then /sbin/service mogstored stop >/dev/null 2>&1 || : /sbin/chkconfig --del mogstored fi %files -n mogilefsd %defattr(-,root,root,-) %doc CHANGES TODO doc/ %{_bindir}/mogilefsd %{_bindir}/mogdbsetup %{_mandir}/man1/mogilefsd.* %{_mandir}/man3/MogileFS::*.* %{perl_vendorlib}/MogileFS/* %dir %{perl_vendorlib}/MogileFS %dir %{_sysconfdir}/mogilefs %config(noreplace) %{_sysconfdir}/mogilefs/mogilefs.conf %config(noreplace) %{_sysconfdir}/mogilefs/mogilefsd.conf %{_initrddir}/mogilefsd %files -n mogstored %defattr(-,root,root,-) %{_bindir}/mogstored %{_bindir}/mogautomount %{_mandir}/man1/mogstored.* %{_mandir}/man1/mogautomount.* %dir %{perl_vendorlib}/Mogstored %{perl_vendorlib}/Mogstored/ChildProcess* %{perl_vendorlib}/Mogstored/FIDStatter.pm %{perl_vendorlib}/Mogstored/HTTPServer.pm %{perl_vendorlib}/Mogstored/SideChannel* %{_initrddir}/mogstored %files -n mogstored-backend-perlbal %defattr(-,root,root,-) %{perl_vendorlib}/Mogstored/HTTPServer/Perlbal.pm %files -n mogstored-backend-apache %defattr(-,root,root,-) %{perl_vendorlib}/Mogstored/HTTPServer/Apache.pm %files -n mogstored-backend-lighttpd %defattr(-,root,root,-) %{perl_vendorlib}/Mogstored/HTTPServer/Lighttpd.pm %changelog * Sun Mar 02 2008 Ruben Kerkhof 2.17-5 - Rename package to respect the Naming Guidelines * Sat Jan 19 2008 Ruben Kerkhof 2.17-4 - Require Perlbal instead of perlbal - Remove autogenerated Perlbal dependency from mogstored * Sat Jan 19 2008 Ruben Kerkhof 2.17-3 - Add Requires for perlbal to perlbal backend - Rename package - Remove failing test * Thu Sep 06 2007 Ruben Kerkhof 2.17-2 - Add missing BRs (#252257) * Sun May 20 2007 Ruben Kerkhof 2.17-1 - Initial import Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/F-8/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 20 Jan 2008 18:12:36 -0000 1.1 +++ Makefile 2 Mar 2008 17:00:57 -0000 1.2 @@ -1,6 +1,6 @@ # Makefile for source rpm: mogilefs-server # $Id$ -NAME := mogilefs-server +NAME := perl-mogilefs-server SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common --- mogilefs-server.spec DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 17:01:37 2008 From: fedora-extras-commits at redhat.com (Ville-Pekka Vainio (vpv)) Date: Sun, 2 Mar 2008 17:01:37 GMT Subject: comps comps-f9.xml.in,1.284,1.285 Message-ID: <200803021701.m22H1bIY009024@cvs-int.fedora.redhat.com> Author: vpv Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7422 Modified Files: comps-f9.xml.in Log Message: Add two of my VDR packages Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.284 retrieving revision 1.285 diff -u -r1.284 -r1.285 --- comps-f9.xml.in 1 Mar 2008 04:10:05 -0000 1.284 +++ comps-f9.xml.in 2 Mar 2008 17:01:07 -0000 1.285 @@ -3492,10 +3492,12 @@ vdr-femon vdr-osdteletext vdr-skins + vdr-skinsoppalusikka vdr-subtitles vdr-sudoku vdr-text2skin vdr-ttxtsubs + vdr-tvonscreen vdr-wapd vdradmin-am wmix From fedora-extras-commits at redhat.com Sun Mar 2 17:02:40 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sun, 2 Mar 2008 17:02:40 GMT Subject: rpms/xastir/F-8 xastir.spec,1.1,1.2 Message-ID: <200803021702.m22H2eql014789@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xastir/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11549 Modified Files: xastir.spec Log Message: update buildrequires Index: xastir.spec =================================================================== RCS file: /cvs/pkgs/rpms/xastir/F-8/xastir.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xastir.spec 2 Mar 2008 16:51:29 -0000 1.1 +++ xastir.spec 2 Mar 2008 17:02:05 -0000 1.2 @@ -21,6 +21,7 @@ BuildRequires : proj-devel BuildRequires : python BuildRequires : shapelib-devel +BuildRequires : desktop-file-utils %description Xastir is a graphical application that interfaces HAM radio From fedora-extras-commits at redhat.com Sun Mar 2 17:08:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:08:53 +0000 Subject: [pkgdb] minbar was added for izhar Message-ID: <200803021709.m22H9U1t020787@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package minbar with summary Athan call and prayer times notification software Kevin Fenzi (kevin) has approved Package minbar Kevin Fenzi (kevin) has added a Fedora devel branch for minbar with an owner of izhar Kevin Fenzi (kevin) has approved minbar in Fedora devel Kevin Fenzi (kevin) has approved Package minbar Kevin Fenzi (kevin) has set commit to Approved for cvsextras on minbar (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on minbar (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on minbar (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/minbar From fedora-extras-commits at redhat.com Sun Mar 2 17:09:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:09:09 +0000 Subject: [pkgdb] minbar (Fedora, 8) updated by kevin Message-ID: <200803021709.m22H9lWG020812@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for minbar Kevin Fenzi (kevin) has set commit to Approved for cvsextras on minbar (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on minbar (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on minbar (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on minbar (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/minbar From fedora-extras-commits at redhat.com Sun Mar 2 17:09:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:09:10 +0000 Subject: [pkgdb] minbar (Fedora, 7) updated by kevin Message-ID: <200803021709.m22H9lWJ020812@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for minbar Kevin Fenzi (kevin) has set commit to Approved for cvsextras on minbar (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on minbar (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on minbar (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on minbar (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/minbar From fedora-extras-commits at redhat.com Sun Mar 2 17:09:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:09:10 +0000 Subject: [pkgdb] minbar (Fedora, devel) updated by kevin Message-ID: <200803021709.m22H9lWM020812@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on minbar (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/minbar From fedora-extras-commits at redhat.com Sun Mar 2 17:10:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:10:07 GMT Subject: rpms/minbar - New directory Message-ID: <200803021710.m22HA70C014968@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/minbar In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi14933/rpms/minbar Log Message: Directory /cvs/extras/rpms/minbar added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 17:10:11 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:10:11 GMT Subject: rpms/minbar/devel - New directory Message-ID: <200803021710.m22HABYI014982@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/minbar/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi14933/rpms/minbar/devel Log Message: Directory /cvs/extras/rpms/minbar/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 17:10:17 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:10:17 GMT Subject: rpms/minbar Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803021710.m22HAHsl015007@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/minbar In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi14933/rpms/minbar Added Files: Makefile import.log Log Message: Setup of module minbar --- NEW FILE Makefile --- # Top level Makefile for module minbar all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Mar 2 17:10:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:10:21 GMT Subject: rpms/minbar/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803021710.m22HALOQ015023@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/minbar/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi14933/rpms/minbar/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module minbar --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: minbar # $Id: Makefile,v 1.1 2008/03/02 17:10:17 kevin Exp $ NAME := minbar SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Mar 2 17:12:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:12:16 +0000 Subject: [pkgdb] gmfsk was added for bjensen Message-ID: <200803021712.m22HCmqQ021052@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gmfsk with summary A Gnome Multimode HF Terminal for Ham Radio Kevin Fenzi (kevin) has approved Package gmfsk Kevin Fenzi (kevin) has added a Fedora devel branch for gmfsk with an owner of bjensen Kevin Fenzi (kevin) has approved gmfsk in Fedora devel Kevin Fenzi (kevin) has approved Package gmfsk Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gmfsk (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gmfsk (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gmfsk (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gmfsk From fedora-extras-commits at redhat.com Sun Mar 2 17:12:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:12:29 +0000 Subject: [pkgdb] gmfsk (Fedora, 8) updated by kevin Message-ID: <200803021713.m22HD6L1021078@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for gmfsk Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gmfsk (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gmfsk (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gmfsk (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on gmfsk (Fedora 8) for sindrepb Kevin Fenzi (kevin) approved watchcommits on gmfsk (Fedora 8) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on gmfsk (Fedora 8) for sconklin Kevin Fenzi (kevin) approved watchcommits on gmfsk (Fedora 8) for sconklin Kevin Fenzi (kevin) approved commit on gmfsk (Fedora 8) for sconklin Kevin Fenzi (kevin) approved build on gmfsk (Fedora 8) for sconklin Kevin Fenzi (kevin) approved approveacls on gmfsk (Fedora 8) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on gmfsk (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gmfsk From fedora-extras-commits at redhat.com Sun Mar 2 17:12:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:12:29 +0000 Subject: [pkgdb] gmfsk (Fedora, 7) updated by kevin Message-ID: <200803021713.m22HD6D5021079@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for gmfsk Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gmfsk (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gmfsk (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gmfsk (Fedora 7) Kevin Fenzi (kevin) approved watchbugzilla on gmfsk (Fedora 7) for sindrepb Kevin Fenzi (kevin) approved watchcommits on gmfsk (Fedora 7) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on gmfsk (Fedora 7) for sconklin Kevin Fenzi (kevin) approved watchcommits on gmfsk (Fedora 7) for sconklin Kevin Fenzi (kevin) approved commit on gmfsk (Fedora 7) for sconklin Kevin Fenzi (kevin) approved build on gmfsk (Fedora 7) for sconklin Kevin Fenzi (kevin) approved approveacls on gmfsk (Fedora 7) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on gmfsk (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gmfsk From fedora-extras-commits at redhat.com Sun Mar 2 17:12:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:12:29 +0000 Subject: [pkgdb] gmfsk (Fedora, devel) updated by kevin Message-ID: <200803021713.m22HD6L5021078@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on gmfsk (Fedora devel) for sindrepb Kevin Fenzi (kevin) approved watchcommits on gmfsk (Fedora devel) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on gmfsk (Fedora devel) for sconklin Kevin Fenzi (kevin) approved watchcommits on gmfsk (Fedora devel) for sconklin Kevin Fenzi (kevin) approved commit on gmfsk (Fedora devel) for sconklin Kevin Fenzi (kevin) approved build on gmfsk (Fedora devel) for sconklin Kevin Fenzi (kevin) approved approveacls on gmfsk (Fedora devel) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on gmfsk (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gmfsk From fedora-extras-commits at redhat.com Sun Mar 2 17:12:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:12:58 GMT Subject: rpms/gmfsk - New directory Message-ID: <200803021712.m22HCwjI015292@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gmfsk In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15252/rpms/gmfsk Log Message: Directory /cvs/extras/rpms/gmfsk added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 17:13:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:13:10 GMT Subject: rpms/gmfsk/devel - New directory Message-ID: <200803021713.m22HDAkB015305@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gmfsk/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15252/rpms/gmfsk/devel Log Message: Directory /cvs/extras/rpms/gmfsk/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 17:13:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:13:15 GMT Subject: rpms/gmfsk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803021713.m22HDFkV015330@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gmfsk In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15252/rpms/gmfsk Added Files: Makefile import.log Log Message: Setup of module gmfsk --- NEW FILE Makefile --- # Top level Makefile for module gmfsk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Mar 2 17:13:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:13:21 GMT Subject: rpms/gmfsk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803021713.m22HDL63015353@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gmfsk/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH15252/rpms/gmfsk/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gmfsk --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gmfsk # $Id: Makefile,v 1.1 2008/03/02 17:13:15 kevin Exp $ NAME := gmfsk SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Mar 2 17:15:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:15:24 +0000 Subject: [pkgdb] xdx was added for bjensen Message-ID: <200803021715.m22HFvqu021320@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xdx with summary DX-cluster tcp/ip client for amateur radio Kevin Fenzi (kevin) has approved Package xdx Kevin Fenzi (kevin) has added a Fedora devel branch for xdx with an owner of bjensen Kevin Fenzi (kevin) has approved xdx in Fedora devel Kevin Fenzi (kevin) has approved Package xdx Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdx (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdx (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdx From fedora-extras-commits at redhat.com Sun Mar 2 17:15:29 2008 From: fedora-extras-commits at redhat.com (Ville-Pekka Vainio (vpv)) Date: Sun, 2 Mar 2008 17:15:29 GMT Subject: comps comps-f9.xml.in,1.285,1.286 Message-ID: <200803021715.m22HFT8h015560@cvs-int.fedora.redhat.com> Author: vpv Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15535 Modified Files: comps-f9.xml.in Log Message: Add malaga to scientific, I think this is the most suitable group since the package is about automatic (natural) language analysis and would mostly be used for (computer) linguistics Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.285 retrieving revision 1.286 diff -u -r1.285 -r1.286 --- comps-f9.xml.in 2 Mar 2008 17:01:07 -0000 1.285 +++ comps-f9.xml.in 2 Mar 2008 17:14:59 -0000 1.286 @@ -1136,6 +1136,7 @@ libtcd Macaulay2 magic + malaga maxima maxima-gui ncl From fedora-extras-commits at redhat.com Sun Mar 2 17:15:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:15:41 +0000 Subject: [pkgdb] xdx (Fedora, 8) updated by kevin Message-ID: <200803021716.m22HGIpC021378@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xdx Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdx (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdx (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdx (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on xdx (Fedora 8) for sindrepb Kevin Fenzi (kevin) approved watchcommits on xdx (Fedora 8) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on xdx (Fedora 8) for sconklin Kevin Fenzi (kevin) approved watchcommits on xdx (Fedora 8) for sconklin Kevin Fenzi (kevin) approved commit on xdx (Fedora 8) for sconklin Kevin Fenzi (kevin) approved build on xdx (Fedora 8) for sconklin Kevin Fenzi (kevin) approved approveacls on xdx (Fedora 8) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on xdx (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdx From fedora-extras-commits at redhat.com Sun Mar 2 17:15:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:15:41 +0000 Subject: [pkgdb] xdx (Fedora, 7) updated by kevin Message-ID: <200803021716.m22HGICX021379@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for xdx Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdx (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdx (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdx (Fedora 7) Kevin Fenzi (kevin) approved watchbugzilla on xdx (Fedora 7) for sindrepb Kevin Fenzi (kevin) approved watchcommits on xdx (Fedora 7) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on xdx (Fedora 7) for sconklin Kevin Fenzi (kevin) approved watchcommits on xdx (Fedora 7) for sconklin Kevin Fenzi (kevin) approved commit on xdx (Fedora 7) for sconklin Kevin Fenzi (kevin) approved build on xdx (Fedora 7) for sconklin Kevin Fenzi (kevin) approved approveacls on xdx (Fedora 7) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on xdx (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdx From fedora-extras-commits at redhat.com Sun Mar 2 17:15:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:15:41 +0000 Subject: [pkgdb] xdx (Fedora, devel) updated by kevin Message-ID: <200803021716.m22HGICZ021379@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on xdx (Fedora devel) for sindrepb Kevin Fenzi (kevin) approved watchcommits on xdx (Fedora devel) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on xdx (Fedora devel) for sconklin Kevin Fenzi (kevin) approved watchcommits on xdx (Fedora devel) for sconklin Kevin Fenzi (kevin) approved commit on xdx (Fedora devel) for sconklin Kevin Fenzi (kevin) approved build on xdx (Fedora devel) for sconklin Kevin Fenzi (kevin) approved approveacls on xdx (Fedora devel) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on xdx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdx From fedora-extras-commits at redhat.com Sun Mar 2 17:16:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:16:07 GMT Subject: rpms/xdx - New directory Message-ID: <200803021716.m22HG78t015614@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdx In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY15574/rpms/xdx Log Message: Directory /cvs/extras/rpms/xdx added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 17:16:18 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:16:18 GMT Subject: rpms/xdx/devel - New directory Message-ID: <200803021716.m22HGItW015631@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdx/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY15574/rpms/xdx/devel Log Message: Directory /cvs/extras/rpms/xdx/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 17:16:23 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:16:23 GMT Subject: rpms/xdx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803021716.m22HGNBZ015656@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdx In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY15574/rpms/xdx Added Files: Makefile import.log Log Message: Setup of module xdx --- NEW FILE Makefile --- # Top level Makefile for module xdx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Mar 2 17:16:29 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:16:29 GMT Subject: rpms/xdx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803021716.m22HGTIL015676@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdx/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY15574/rpms/xdx/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xdx --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xdx # $Id: Makefile,v 1.1 2008/03/02 17:16:23 kevin Exp $ NAME := xdx SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Mar 2 17:16:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:16:37 +0000 Subject: [pkgdb] lpsk31 was added for bjensen Message-ID: <200803021717.m22HGICc021379@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package lpsk31 with summary A ncurses application for ham radio communications using PSK31 Kevin Fenzi (kevin) has approved Package lpsk31 Kevin Fenzi (kevin) has added a Fedora devel branch for lpsk31 with an owner of bjensen Kevin Fenzi (kevin) has approved lpsk31 in Fedora devel Kevin Fenzi (kevin) has approved Package lpsk31 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lpsk31 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lpsk31 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lpsk31 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lpsk31 From fedora-extras-commits at redhat.com Sun Mar 2 17:17:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:17:00 +0000 Subject: [pkgdb] lpsk31 (Fedora, 8) updated by kevin Message-ID: <200803021717.m22HHc8Z021606@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for lpsk31 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lpsk31 (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lpsk31 (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lpsk31 (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on lpsk31 (Fedora 8) for sindrepb Kevin Fenzi (kevin) approved watchcommits on lpsk31 (Fedora 8) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on lpsk31 (Fedora 8) for sconklin Kevin Fenzi (kevin) approved watchcommits on lpsk31 (Fedora 8) for sconklin Kevin Fenzi (kevin) approved commit on lpsk31 (Fedora 8) for sconklin Kevin Fenzi (kevin) approved build on lpsk31 (Fedora 8) for sconklin Kevin Fenzi (kevin) approved approveacls on lpsk31 (Fedora 8) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on lpsk31 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lpsk31 From fedora-extras-commits at redhat.com Sun Mar 2 17:17:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:17:01 +0000 Subject: [pkgdb] lpsk31 (Fedora, 7) updated by kevin Message-ID: <200803021717.m22HHc8d021606@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for lpsk31 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lpsk31 (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lpsk31 (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lpsk31 (Fedora 7) Kevin Fenzi (kevin) approved watchbugzilla on lpsk31 (Fedora 7) for sindrepb Kevin Fenzi (kevin) approved watchcommits on lpsk31 (Fedora 7) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on lpsk31 (Fedora 7) for sconklin Kevin Fenzi (kevin) approved watchcommits on lpsk31 (Fedora 7) for sconklin Kevin Fenzi (kevin) approved commit on lpsk31 (Fedora 7) for sconklin Kevin Fenzi (kevin) approved build on lpsk31 (Fedora 7) for sconklin Kevin Fenzi (kevin) approved approveacls on lpsk31 (Fedora 7) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on lpsk31 (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lpsk31 From fedora-extras-commits at redhat.com Sun Mar 2 17:17:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:17:01 +0000 Subject: [pkgdb] lpsk31 (Fedora, devel) updated by kevin Message-ID: <200803021717.m22HHfCh021655@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on lpsk31 (Fedora devel) for sindrepb Kevin Fenzi (kevin) approved watchcommits on lpsk31 (Fedora devel) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on lpsk31 (Fedora devel) for sconklin Kevin Fenzi (kevin) approved watchcommits on lpsk31 (Fedora devel) for sconklin Kevin Fenzi (kevin) approved commit on lpsk31 (Fedora devel) for sconklin Kevin Fenzi (kevin) approved build on lpsk31 (Fedora devel) for sconklin Kevin Fenzi (kevin) approved approveacls on lpsk31 (Fedora devel) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on lpsk31 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lpsk31 From fedora-extras-commits at redhat.com Sun Mar 2 17:17:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:17:28 GMT Subject: rpms/lpsk31 - New directory Message-ID: <200803021717.m22HHSPA015900@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lpsk31 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR15863/rpms/lpsk31 Log Message: Directory /cvs/extras/rpms/lpsk31 added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 17:17:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:17:41 GMT Subject: rpms/lpsk31/devel - New directory Message-ID: <200803021717.m22HHfWb015925@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lpsk31/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR15863/rpms/lpsk31/devel Log Message: Directory /cvs/extras/rpms/lpsk31/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 17:17:47 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:17:47 GMT Subject: rpms/lpsk31 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803021717.m22HHliU015953@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lpsk31 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR15863/rpms/lpsk31 Added Files: Makefile import.log Log Message: Setup of module lpsk31 --- NEW FILE Makefile --- # Top level Makefile for module lpsk31 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Mar 2 17:17:52 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:17:52 GMT Subject: rpms/lpsk31/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803021717.m22HHqJx015972@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lpsk31/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR15863/rpms/lpsk31/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lpsk31 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: lpsk31 # $Id: Makefile,v 1.1 2008/03/02 17:17:47 kevin Exp $ NAME := lpsk31 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Mar 2 17:18:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:18:19 +0000 Subject: [pkgdb] perl-Module-Signature (Fedora EPEL, 4) updated by kevin Message-ID: <200803021718.m22HIufa021815@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for perl-Module-Signature Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Module-Signature (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Module-Signature (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Module-Signature (Fedora EPEL 4) Kevin Fenzi (kevin) changed owner of perl-Module-Signature in Fedora EPEL 4 to pertusus To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Signature From fedora-extras-commits at redhat.com Sun Mar 2 17:18:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:18:19 +0000 Subject: [pkgdb] perl-Module-Signature (Fedora EPEL, 5) updated by kevin Message-ID: <200803021718.m22HIufd021815@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for perl-Module-Signature Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-Module-Signature (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-Module-Signature (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-Module-Signature (Fedora EPEL 5) Kevin Fenzi (kevin) changed owner of perl-Module-Signature in Fedora EPEL 5 to pertusus To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Module-Signature From fedora-extras-commits at redhat.com Sun Mar 2 17:22:35 2008 From: fedora-extras-commits at redhat.com (Ville-Pekka Vainio (vpv)) Date: Sun, 2 Mar 2008 17:22:35 GMT Subject: comps comps-f9.xml.in,1.286,1.287 Message-ID: <200803021722.m22HMZjE016456@cvs-int.fedora.redhat.com> Author: vpv Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16421 Modified Files: comps-f9.xml.in Log Message: Add openoffice.org-voikko to Finnish support group, as discussed don fedora-devel-list Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.286 retrieving revision 1.287 diff -u -r1.286 -r1.287 --- comps-f9.xml.in 2 Mar 2008 17:14:59 -0000 1.286 +++ comps-f9.xml.in 2 Mar 2008 17:22:05 -0000 1.287 @@ -1289,6 +1289,7 @@ koffice-langpack-fi moodle-fi openoffice.org-langpack-fi_FI + openoffice.org-voikko From fedora-extras-commits at redhat.com Sun Mar 2 17:23:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:23:09 +0000 Subject: [pkgdb] splat was added for sconklin Message-ID: <200803021723.m22HNkdE022107@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package splat with summary Analyze point-to-point terrestrial RF communication links Kevin Fenzi (kevin) has approved Package splat Kevin Fenzi (kevin) has added a Fedora devel branch for splat with an owner of sconklin Kevin Fenzi (kevin) has approved splat in Fedora devel Kevin Fenzi (kevin) has approved Package splat Kevin Fenzi (kevin) has set commit to Approved for cvsextras on splat (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on splat (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on splat (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/splat From fedora-extras-commits at redhat.com Sun Mar 2 17:23:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:23:30 +0000 Subject: [pkgdb] splat (Fedora, 8) updated by kevin Message-ID: <200803021724.m22HO794022138@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for splat Kevin Fenzi (kevin) has set commit to Approved for cvsextras on splat (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on splat (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on splat (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on splat (Fedora 8) for bjensen Kevin Fenzi (kevin) approved watchcommits on splat (Fedora 8) for bjensen Kevin Fenzi (kevin) approved commit on splat (Fedora 8) for bjensen Kevin Fenzi (kevin) approved build on splat (Fedora 8) for bjensen Kevin Fenzi (kevin) approved approveacls on splat (Fedora 8) for bjensen Kevin Fenzi (kevin) Approved cvsextras for commit access on splat (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/splat From fedora-extras-commits at redhat.com Sun Mar 2 17:23:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:23:30 +0000 Subject: [pkgdb] splat (Fedora, 7) updated by kevin Message-ID: <200803021724.m22HO798022138@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for splat Kevin Fenzi (kevin) has set commit to Approved for cvsextras on splat (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on splat (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on splat (Fedora 7) Kevin Fenzi (kevin) approved watchbugzilla on splat (Fedora 7) for bjensen Kevin Fenzi (kevin) approved watchcommits on splat (Fedora 7) for bjensen Kevin Fenzi (kevin) approved commit on splat (Fedora 7) for bjensen Kevin Fenzi (kevin) approved build on splat (Fedora 7) for bjensen Kevin Fenzi (kevin) approved approveacls on splat (Fedora 7) for bjensen Kevin Fenzi (kevin) Approved cvsextras for commit access on splat (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/splat From fedora-extras-commits at redhat.com Sun Mar 2 17:23:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:23:31 +0000 Subject: [pkgdb] splat (Fedora, devel) updated by kevin Message-ID: <200803021724.m22HOAiw022184@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on splat (Fedora devel) for bjensen Kevin Fenzi (kevin) approved watchcommits on splat (Fedora devel) for bjensen Kevin Fenzi (kevin) approved commit on splat (Fedora devel) for bjensen Kevin Fenzi (kevin) approved build on splat (Fedora devel) for bjensen Kevin Fenzi (kevin) approved approveacls on splat (Fedora devel) for bjensen Kevin Fenzi (kevin) Approved cvsextras for commit access on splat (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/splat From fedora-extras-commits at redhat.com Sun Mar 2 17:24:17 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:24:17 GMT Subject: rpms/splat - New directory Message-ID: <200803021724.m22HOHun016522@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/splat In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR16486/rpms/splat Log Message: Directory /cvs/extras/rpms/splat added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 17:24:29 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:24:29 GMT Subject: rpms/splat/devel - New directory Message-ID: <200803021724.m22HOTIr016536@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/splat/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR16486/rpms/splat/devel Log Message: Directory /cvs/extras/rpms/splat/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 2 17:24:36 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:24:36 GMT Subject: rpms/splat Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803021724.m22HOai7016561@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/splat In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR16486/rpms/splat Added Files: Makefile import.log Log Message: Setup of module splat --- NEW FILE Makefile --- # Top level Makefile for module splat all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Mar 2 17:24:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sun, 2 Mar 2008 17:24:44 GMT Subject: rpms/splat/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803021724.m22HOi0s016577@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/splat/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR16486/rpms/splat/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module splat --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: splat # $Id: Makefile,v 1.1 2008/03/02 17:24:36 kevin Exp $ NAME := splat SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Mar 2 17:27:50 2008 From: fedora-extras-commits at redhat.com (Steve Conklin (sconklin)) Date: Sun, 2 Mar 2008 17:27:50 GMT Subject: rpms/gpsman/F-7 sources,1.1,1.2 Message-ID: <200803021727.m22HRoBJ016810@cvs-int.fedora.redhat.com> Author: sconklin Update of /cvs/pkgs/rpms/gpsman/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16785 Modified Files: sources Log Message: forgot the sources file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gpsman/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2008 18:40:28 -0000 1.1 +++ sources 2 Mar 2008 17:27:15 -0000 1.2 @@ -0,0 +1 @@ +dcc72b7a2a1b61f98f8432f8eb367213 gpsman-6.3.2.tgz From fedora-extras-commits at redhat.com Sun Mar 2 17:34:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:34:22 +0000 Subject: [pkgdb] minbar: izhar has requested watchcommits Message-ID: <200803021734.m22HYxxB022628@bastion.fedora.phx.redhat.com> Mohd Izhar Firdaus Ismail (izhar) has requested the watchcommits acl on minbar (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/minbar From fedora-extras-commits at redhat.com Sun Mar 2 17:34:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:34:23 +0000 Subject: [pkgdb] minbar: izhar has requested commit Message-ID: <200803021735.m22HZ6eR022649@bastion.fedora.phx.redhat.com> Mohd Izhar Firdaus Ismail (izhar) has requested the commit acl on minbar (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/minbar From fedora-extras-commits at redhat.com Sun Mar 2 17:34:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:34:29 +0000 Subject: [pkgdb] minbar: izhar has given up watchcommits Message-ID: <200803021735.m22HYxxD022628@bastion.fedora.phx.redhat.com> Mohd Izhar Firdaus Ismail (izhar) has given up the watchcommits acl on minbar (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/minbar From fedora-extras-commits at redhat.com Sun Mar 2 17:34:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sun, 02 Mar 2008 17:34:29 +0000 Subject: [pkgdb] minbar: izhar has given up commit Message-ID: <200803021735.m22HZ6eT022649@bastion.fedora.phx.redhat.com> Mohd Izhar Firdaus Ismail (izhar) has given up the commit acl on minbar (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/minbar From fedora-extras-commits at redhat.com Sun Mar 2 17:36:46 2008 From: fedora-extras-commits at redhat.com (Mohd Izhar Firdaus Ismail (izhar)) Date: Sun, 2 Mar 2008 17:36:46 GMT Subject: rpms/minbar/F-8 minbar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803021736.m22Hak4f017101@cvs-int.fedora.redhat.com> Author: izhar Update of /cvs/pkgs/rpms/minbar/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17078/F-8 Modified Files: .cvsignore sources Added Files: minbar.spec Log Message: - initial import --- NEW FILE minbar.spec --- Name: minbar Version: 0.2.1 Release: 6%{?dist} Summary: Athan call and prayer times notification software Group: User Interface/Desktops License: GPLv2+ URL: http://djihed.com/minbar/ Source0: http://files.djihed.com/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libitl-devel libglade2-devel gstreamer-devel libgnomecanvas-devel BuildRequires: GConf2-devel libnotify-devel gettext desktop-file-utils BuildRequires: perl(XML::Parser) Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 #Requires: %description Minbar is a GNOME GUI with tray icon, for athan call and notifications for Islam prayer times. %prep %setup -q sed -i -e "s|\(Utility;\)\1|\1|" %{name}.desktop.in %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL desktop-file-install --vendor="fedora" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %preun if [ "$1" -eq 0 ]; then GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS README NEWS TODO HACKING ChangeLog %{_bindir}/minbar %{_datadir}/applications/fedora-minbar.desktop %{_datadir}/icons/hicolor/*/apps/minbar.png %{_sysconfdir}/gconf/schemas/minbar.schemas %{_mandir}/man1/minbar.1.gz %{_datadir}/minbar/ %changelog * Sun Mar 2 2008 Mohd Izhar Firdaus Ismail 0.2.1-6 - fixed gtk-update-icon-cache scriptlet * Sun Feb 24 2008 Mohd Izhar Firdaus Ismail 0.2.1-4 - more packaging fix * Sun Feb 17 2008 Mohd Izhar Firdaus Ismail 0.2.1-3 - added missing BR perl(XML::Parser), desktop-file-utils * Fri Feb 01 2008 Mohd Izhar Firdaus Ismail 0.2.1-2 - Fixed version - Added more builddeps * Mon Jan 28 2008 Mohd Izhar Firdaus Ismail 0.0.2-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/minbar/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2008 17:10:17 -0000 1.1 +++ .cvsignore 2 Mar 2008 17:36:09 -0000 1.2 @@ -0,0 +1 @@ +minbar-0.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/minbar/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:10:17 -0000 1.1 +++ sources 2 Mar 2008 17:36:09 -0000 1.2 @@ -0,0 +1 @@ +dd1543a2e6cc9873d39d60b61dec7508 minbar-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 17:40:04 2008 From: fedora-extras-commits at redhat.com (Mohd Izhar Firdaus Ismail (izhar)) Date: Sun, 2 Mar 2008 17:40:04 GMT Subject: rpms/minbar/devel minbar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803021740.m22He4Ng017212@cvs-int.fedora.redhat.com> Author: izhar Update of /cvs/pkgs/rpms/minbar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17175/devel Modified Files: .cvsignore sources Added Files: minbar.spec Log Message: - initial import --- NEW FILE minbar.spec --- Name: minbar Version: 0.2.1 Release: 6%{?dist} Summary: Athan call and prayer times notification software Group: User Interface/Desktops License: GPLv2+ URL: http://djihed.com/minbar/ Source0: http://files.djihed.com/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libitl-devel libglade2-devel gstreamer-devel libgnomecanvas-devel BuildRequires: GConf2-devel libnotify-devel gettext desktop-file-utils BuildRequires: perl(XML::Parser) Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 #Requires: %description Minbar is a GNOME GUI with tray icon, for athan call and notifications for Islam prayer times. %prep %setup -q sed -i -e "s|\(Utility;\)\1|\1|" %{name}.desktop.in %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL desktop-file-install --vendor="fedora" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %preun if [ "$1" -eq 0 ]; then GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS README NEWS TODO HACKING ChangeLog %{_bindir}/minbar %{_datadir}/applications/fedora-minbar.desktop %{_datadir}/icons/hicolor/*/apps/minbar.png %{_sysconfdir}/gconf/schemas/minbar.schemas %{_mandir}/man1/minbar.1.gz %{_datadir}/minbar/ %changelog * Sun Mar 2 2008 Mohd Izhar Firdaus Ismail 0.2.1-6 - fixed gtk-update-icon-cache scriptlet * Sun Feb 24 2008 Mohd Izhar Firdaus Ismail 0.2.1-4 - more packaging fix * Sun Feb 17 2008 Mohd Izhar Firdaus Ismail 0.2.1-3 - added missing BR perl(XML::Parser), desktop-file-utils * Fri Feb 01 2008 Mohd Izhar Firdaus Ismail 0.2.1-2 - Fixed version - Added more builddeps * Mon Jan 28 2008 Mohd Izhar Firdaus Ismail 0.0.2-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/minbar/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2008 17:10:17 -0000 1.1 +++ .cvsignore 2 Mar 2008 17:39:26 -0000 1.2 @@ -0,0 +1 @@ +minbar-0.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/minbar/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:10:17 -0000 1.1 +++ sources 2 Mar 2008 17:39:26 -0000 1.2 @@ -0,0 +1 @@ +dd1543a2e6cc9873d39d60b61dec7508 minbar-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 17:43:29 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sun, 2 Mar 2008 17:43:29 GMT Subject: rpms/perl-Module-Signature/EL-4 .cvsignore, 1.2, 1.3 perl-Module-Signature.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200803021743.m22HhTgs017433@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/perl-Module-Signature/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17359/EL-4 Modified Files: .cvsignore perl-Module-Signature.spec sources Log Message: sync witht devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/EL-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2005 19:13:37 -0000 1.2 +++ .cvsignore 2 Mar 2008 17:42:42 -0000 1.3 @@ -1 +1 @@ -Module-Signature-0.44.tar.gz +Module-Signature-0.55.tar.gz Index: perl-Module-Signature.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/EL-4/perl-Module-Signature.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Module-Signature.spec 15 Apr 2005 18:22:24 -0000 1.2 +++ perl-Module-Signature.spec 2 Mar 2008 17:42:42 -0000 1.3 @@ -1,20 +1,24 @@ -# Must use expand to ensure mktemp is run only once -%{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)} - Name: perl-Module-Signature -Version: 0.44 -Release: 1 +Version: 0.55 +Release: 2%{?dist} Summary: CPAN signature management utilities and modules Group: Development/Libraries -License: GPL or Artistic +License: MIT URL: http://search.cpan.org/dist/Module-Signature/ -Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-Signature-0.44.tar.gz +Source0: http://www.cpan.org/authors/id/A/AU/AUDREYT/Module-Signature-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Digest::SHA1), gnupg -Requires: gnupg, perl(PAR::Dist), perl(Digest::SHA1) +BuildRequires: gnupg +BuildRequires: perl(Digest::SHA1) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) +Requires: gnupg +Requires: perl(Digest::SHA1) +# not sure EL-4 rpm understand that, using a plain Requires. +#Requires(hint): perl(PAR::Dist) +Requires: perl(PAR::Dist) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -27,8 +31,8 @@ %build -mkdir -m 700 %{mytempdir}/_gnupg ; export GNUPGHOME=%{mytempdir}/_gnupg -%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null +PERL_AUTOINSTALL=--skipdeps \ +%{__perl} Makefile.PL INSTALLDIRS=vendor --installdeps make %{?_smp_mflags} @@ -40,27 +44,51 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : -export GNUPGHOME=%{mytempdir}/_gnupg -for f in debug*.list ; do test -e $f && mv $f %{mytempdir} ; done -# make test # would require network access -for f in %{mytempdir}/debug*.list ; do test -e $f && mv $f . ; done +%check +make test %clean -rm -rf $RPM_BUILD_ROOT %{mytempdir} +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS Changes README TODO *.pub +%doc AUTHORS Changes README *.pub %{_bindir}/cpansign -%{perl_vendorlib}/Module +%{perl_vendorlib}/Module/ %{_mandir}/man[13]/*.[13]* %changelog -* Thu Apr 7 2005 Ville Skytt?? - 0.44-1 +* Tue Apr 17 2007 Ville Skytt?? - 0.55-2 +- BuildRequire perl(ExtUtils::MakeMaker) and perl(Test::More). + +* Tue Aug 22 2006 Ville Skytt?? - 0.55-1 +- 0.55. +- Make PAR::Dist dependency a Requires(hint). + +* Fri May 12 2006 Ville Skytt?? - 0.54-1 +- 0.54, license changed to MIT. + +* Wed Feb 1 2006 Ville Skytt?? - 0.53-1 +- 0.53. + +* Fri Jan 20 2006 Ville Skytt?? - 0.52-1 +- 0.52. +- Run non-live tests during build and make live ones optional, enabled + when building with "--with livetests". + +* Mon Jan 2 2006 Ville Skytt?? - 0.51-1 +- 0.51. + +* Mon Aug 22 2005 Ville Skytt?? - 0.50-1 +- 0.50. + +* Wed Aug 10 2005 Ville Skytt?? - 0.45-1 +- 0.45. + +* Thu Apr 7 2005 Ville Skytt?? - 0.44-2 - Drop Epoch: 0 and 0.fdr. release prefix. * Fri Dec 17 2004 Ville Skytt?? - 0:0.44-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/EL-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2005 19:13:37 -0000 1.2 +++ sources 2 Mar 2008 17:42:42 -0000 1.3 @@ -1 +1 @@ -f1928d481376c1402878890feec26a1f Module-Signature-0.44.tar.gz +0e2571a76c4bf37d61d9f24d71afbd77 Module-Signature-0.55.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 17:43:35 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sun, 2 Mar 2008 17:43:35 GMT Subject: rpms/perl-Module-Signature/EL-5 perl-Module-Signature.spec, 1.9, 1.10 Message-ID: <200803021743.m22HhZPa017438@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/perl-Module-Signature/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17359/EL-5 Modified Files: perl-Module-Signature.spec Log Message: sync witht devel Index: perl-Module-Signature.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/EL-5/perl-Module-Signature.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Module-Signature.spec 28 Aug 2006 16:09:54 -0000 1.9 +++ perl-Module-Signature.spec 2 Mar 2008 17:42:59 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Module-Signature Version: 0.55 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CPAN signature management utilities and modules Group: Development/Libraries @@ -12,6 +12,8 @@ BuildArch: noarch BuildRequires: gnupg BuildRequires: perl(Digest::SHA1) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) Requires: gnupg Requires: perl(Digest::SHA1) Requires(hint): perl(PAR::Dist) @@ -57,6 +59,9 @@ %changelog +* Tue Apr 17 2007 Ville Skytt?? - 0.55-2 +- BuildRequire perl(ExtUtils::MakeMaker) and perl(Test::More). + * Tue Aug 22 2006 Ville Skytt?? - 0.55-1 - 0.55. - Make PAR::Dist dependency a Requires(hint). From fedora-extras-commits at redhat.com Sun Mar 2 17:44:21 2008 From: fedora-extras-commits at redhat.com (Mohd Izhar Firdaus Ismail (izhar)) Date: Sun, 2 Mar 2008 17:44:21 GMT Subject: rpms/libitl/F-8 libitl-configure, NONE, 1.1 libitl-makefile-destdir.patch, NONE, 1.1 libitl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803021744.m22HiLfu017474@cvs-int.fedora.redhat.com> Author: izhar Update of /cvs/pkgs/rpms/libitl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17437/F-8 Modified Files: .cvsignore sources Added Files: libitl-configure libitl-makefile-destdir.patch libitl.spec Log Message: - initial import --- NEW FILE libitl-configure --- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for libitl 0.6.4. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi # PATH needs CR # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then echo "#! /bin/sh" >conf$$.sh echo "exit 0" >>conf$$.sh chmod +x conf$$.sh if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi rm -f conf$$.sh fi # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false fi # IFS # We need space, tab and new line, in precisely that order. Quoting is # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) as_nl=' ' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. case $0 in *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS ;; esac # We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi # Work around bugs in pre-3.0 UWIN ksh. for as_var in ENV MAIL MAILPATH do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. for as_var in \ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false fi # Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } /^X\/\(\/\/\)$/{ s//\1/ q } /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` # CDPATH. $as_unset CDPATH if test "x$CONFIG_SHELL" = x; then if (eval ":") 2>/dev/null; then as_have_required=yes else as_have_required=no fi if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } as_func_success () { as_func_return 0 } as_func_failure () { as_func_return 1 } as_func_ret_success () { return 0 } as_func_ret_failure () { return 1 } exitcode=0 if as_func_success; then : else exitcode=1 echo as_func_success failed. fi if as_func_failure; then exitcode=1 echo as_func_failure succeeded. fi if as_func_ret_success; then : else exitcode=1 echo as_func_ret_success failed. fi [...4510 lines suppressed...] } /^X\(\/\/\)[^/].*/{ s//\1/ q } /^X\(\/\/\)$/{ s//\1/ q } /^X\(\/\).*/{ s//\1/ q } s/.*/./; q'` { as_dir="$ac_dir" case $as_dir in #( -*) as_dir=./$as_dir;; esac test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= while :; do case $as_dir in #( *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q } /^X\(\/\/\)[^/].*/{ s//\1/ q } /^X\(\/\/\)$/{ s//\1/ q } /^X\(\/\).*/{ s//\1/ q } s/.*/./; q'` test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` # A ".." for each directory in $ac_dir_suffix. ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; esac ;; esac ac_abs_top_builddir=$ac_pwd ac_abs_builddir=$ac_pwd$ac_dir_suffix # for backward compatibility: ac_top_builddir=$ac_top_build_prefix case $srcdir in .) # We are building in place. ac_srcdir=. ac_top_srcdir=$ac_top_builddir_sub ac_abs_top_srcdir=$ac_pwd ;; [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; ac_top_srcdir=$srcdir ac_abs_top_srcdir=$srcdir ;; *) # Relative name. ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_build_prefix$srcdir ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix case $ac_mode in :F) # # CONFIG_FILE # _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= case `sed -n '/datarootdir/ { p q } /@datadir@/p /@docdir@/p /@infodir@/p /@localedir@/p /@mandir@/p ' $ac_file_inputs` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s&@configure_input@&$configure_input&;t t s&@top_builddir@&$ac_top_builddir_sub&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t $ac_datarootdir_hack " $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out"; rm -f "$tmp/out";; *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac ;; esac done # for ac_tag { (exit 0); exit 0; } _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open # by configure, so config.status won't be able to write to it; its # output is simply discarded. So we exec the FD to /dev/null, # effectively closing config.log, so it can be properly (re)opened and # appended to by config.status. When coming back to configure, we # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: ac_config_status_args= test "$silent" = yes && ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi libitl-makefile-destdir.patch: --- NEW FILE libitl-makefile-destdir.patch --- diff -ruN libitl-0.6.4/build/config.mk.in libitl-0.6.4.new/build/config.mk.in --- libitl-0.6.4/build/config.mk.in 2005-03-18 05:50:14.000000000 +0730 +++ libitl-0.6.4.new/build/config.mk.in 2007-10-18 20:52:50.000000000 +0730 @@ -11,4 +11,6 @@ CFLAGS=@CFLAGS@ LDFLAGS=@LDFLAGS@ PREFIX=@prefix@ - +LIBDIR=@libdir@ +INCLUDEDIR=@includedir@ +DESTDIR= diff -ruN libitl-0.6.4/hijri/Makefile libitl-0.6.4.new/hijri/Makefile --- libitl-0.6.4/hijri/Makefile 2005-01-14 18:14:36.000000000 +0730 +++ libitl-0.6.4.new/hijri/Makefile 2007-10-18 20:37:36.000000000 +0730 @@ -9,14 +9,14 @@ install: all @echo "==> Installing hijri component..." - test -d $(PREFIX)/include/itl \ - || mkdir -p $(PREFIX)/include/itl \ + test -d $(DESTDIR)/$(INCLUDEDIR)/itl \ + || mkdir -p $(DESTDIR)/$(INCLUDEDIR)/itl \ || exit 1; - cp src/hijri.h $(PREFIX)/include/itl + cp src/hijri.h $(DESTDIR)/$(INCLUDEDIR)/itl uninstall: @echo "==> Uninstalling hijri component..." - rm -f $(PREFIX)/include/itl/hijri.h + rm -f $(DESTDIR)/$(INCLUDEDIR)/itl/hijri.h clean: @echo "==> Cleaning hijri component files..." diff -ruN libitl-0.6.4/Makefile libitl-0.6.4.new/Makefile --- libitl-0.6.4/Makefile 2005-03-17 06:32:00.000000000 +0730 +++ libitl-0.6.4.new/Makefile 2007-10-18 20:53:06.000000000 +0730 @@ -23,7 +23,7 @@ @false build/libitl.so: components - $(LD) build/*.o $(LDFLAGS) -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME) + $(LD) build/*.o $(LDFLAGS) --build-id -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME) (cd build/ && ln -sf $(FULLNAME) $(SONAME)) (cd build/ && ln -sf $(FULLNAME) libitl.so) @@ -35,12 +35,12 @@ strip --strip-unneeded build/$(FULLNAME) rm -f build/*.o build/ITL_* @echo "==> Installing libitl library..." - test -d $(PREFIX)/lib \ - || mkdir -p $(PREFIX)/lib \ + test -d $(LIBDIR) \ + || mkdir -p $(LIBDIR) \ || exit 1; - cp build/$(FULLNAME) $(PREFIX)/lib - cp -P build/$(SONAME) $(PREFIX)/lib - cp -P build/libitl.so $(PREFIX)/lib + cp build/$(FULLNAME) $(LIBDIR) + cp -P build/$(SONAME) $(LIBDIR) + cp -P build/libitl.so $(LIBDIR) @echo "==> Installing ITL components..." for i in $(COMPONENTS); do \ $(MAKE) -C $$i install || exit 1; \ @@ -52,12 +52,12 @@ install: build/libitl.so @echo "==> Installing libitl library..." - test -d $(PREFIX)/lib/itl \ - || mkdir -p $(PREFIX)/lib/itl \ + test -d $(DESTDIR)/$(LIBDIR)/ \ + || mkdir -p $(DESTDIR)/$(LIBDIR)/ \ || exit 1; - cp build/$(FULLNAME) $(PREFIX)/lib/itl - cp -P build/$(SONAME) $(PREFIX)/lib/itl - cp -P build/libitl.so $(PREFIX)/lib/itl + cp build/$(FULLNAME) $(DESTDIR)/$(LIBDIR)/ + cp -P build/$(SONAME) $(DESTDIR)/$(LIBDIR)/ + cp -P build/libitl.so $(DESTDIR)/$(LIBDIR)/ @echo "==> Installing ITL components..." for i in $(COMPONENTS); do \ $(MAKE) -C $$i install || exit 1; \ @@ -65,9 +65,9 @@ uninstall: @echo "==> Uninstall ITL library..." - rm -rf $(PREFIX)/lib/itl + rm -rf $(DESTDIR)/$(LIBDIR)/libitl.so* @echo "==> Removing ITL include dir..." - rm -rf $(PREFIX)/include/itl + rm -rf $(DESTDIR)/$(INCLUDEDIR)/itl @echo "==> Uninstalling ITL components..." for i in $(COMPONENTS); do \ $(MAKE) -C $$i uninstall || exit 1; \ diff -ruN libitl-0.6.4/prayertime/Makefile libitl-0.6.4.new/prayertime/Makefile --- libitl-0.6.4/prayertime/Makefile 2005-01-14 18:14:35.000000000 +0730 +++ libitl-0.6.4.new/prayertime/Makefile 2007-10-18 20:37:03.000000000 +0730 @@ -9,14 +9,14 @@ install: all @echo "==> Installing prayertime component..." - test -d $(PREFIX)/include/itl \ - || mkdir -p $(PREFIX)/include/itl \ + test -d $(DESTDIR)/$(INCLUDEDIR)/itl \ + || mkdir -p $(DESTDIR)/$(INCLUDEDIR)/itl \ || exit 1; - cp src/prayer.h $(PREFIX)/include/itl + cp src/prayer.h $(DESTDIR)/$(INCLUDEDIR)/itl uninstall: @echo "==> Uninstalling prayertime component..." - rm -f $(PREFIX)/include/itl/prayer.h + rm -f $(DESTDIR)/$(INCLUDEDIR)/itl/prayer.h clean: @echo "==> Cleaning prayertime component files..." --- NEW FILE libitl.spec --- Name: libitl Version: 0.6.4 Release: 3%{?dist} Summary: Libraries for The Islamic Tools and Libraries Project Group: System Environment/Libraries License: LGPLv2+ URL: http://www.arabeyes.org/project.php?proj=ITL Source0: http://switch.dl.sourceforge.net/sourceforge/arabeyes/%{name}-%{version}.tar.bz2 Source1: libitl-configure BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Patch101: libitl-makefile-destdir.patch #BuildRequires: autoconf %description The Islamic Tools and Libraries (ITL) is a project to provide a plethora of useful Islamic tools and applications as well as a comprehensive feature-full Islam-centric library. The ITL project currently includes Hijri date, Muslim prayer times, and Qibla. This package contains the libraries for applications using ITL %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %patch101 -p1 -b .makefile-destdir #./autogen.sh cp %{SOURCE1} configure chmod +x configure %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/libitl.so.* %files devel %defattr(-,root,root,-) %doc prayertime/doc/method-info.txt %doc prayertime/README %doc hijri/README %{_libdir}/libitl.so %{_includedir}/itl/ %changelog * Fri Feb 15 2008 Mohd Izhar Firdaus Ismail 0.6.4-3 - include the configure script as a source instead of as a patch * Sun Feb 03 2008 Mohd Izhar Firdaus Ismail 0.6.4-2 - modified makefile to install .so files to standard path - moved unversioned .so to devel package - added requires to ldconfig - changed license to LGPLv2+ - upstream tarball doesn't include a configure script. ran autogen.sh with autoconf-2.61 and created a patch to include a configure script instead of running autogen.sh on every compile. autoconf-2.61 works with this tarball but we don't know about the other autoconf versions. * Thu Oct 18 2007 Mohd Izhar Firdaus Ismail 0.6.4-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libitl/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Feb 2008 22:13:43 -0000 1.1 +++ .cvsignore 2 Mar 2008 17:43:44 -0000 1.2 @@ -0,0 +1 @@ +libitl-0.6.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libitl/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Feb 2008 22:13:43 -0000 1.1 +++ sources 2 Mar 2008 17:43:44 -0000 1.2 @@ -0,0 +1 @@ +477081809cfc2006fdd2b8d0099d985b libitl-0.6.4.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 18:02:58 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 2 Mar 2008 18:02:58 GMT Subject: rpms/jd/F-7 .cvsignore, 1.183, 1.184 jd.spec, 1.208, 1.209 sources, 1.184, 1.185 Message-ID: <200803021802.m22I2w2W024984@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23485/F-7 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Mar 3 2008 Mamoru Tasaka - 2.0.0-0.3.svn1886 - svn 1886 (version 2.0.0) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- .cvsignore 26 Feb 2008 16:46:14 -0000 1.183 +++ .cvsignore 2 Mar 2008 18:02:20 -0000 1.184 @@ -1,3 +1,3 @@ jd-1.9.9-beta080225.tgz jd-2.0.0-svn1763_jdsksy.tgz -jd-2.0.0-svn1879_trunk.tgz +jd-2.0.0-svn1886_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- jd.spec 26 Feb 2008 16:46:14 -0000 1.208 +++ jd.spec 2 Mar 2008 18:02:20 -0000 1.209 @@ -22,7 +22,7 @@ %if %use_trunk %define main_ver 2.0.0 -%define strtag svn1879_trunk +%define strtag svn1886_trunk %define _pre_release 1 %endif @@ -143,8 +143,8 @@ %{icondir}/%{name}.png %changelog -* Wed Feb 27 2008 Mamoru Tasaka - 2.0.0-0.3.svn1879 -- svn 1879 (version 2.0.0) +* Mon Mar 3 2008 Mamoru Tasaka - 2.0.0-0.3.svn1886 +- svn 1886 (version 2.0.0) * Mon Feb 25 2008 Mamoru Tasaka - 1.9.9-0.3.beta080225 - 1.9.9 beta 080225 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-7/sources,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- sources 26 Feb 2008 16:46:14 -0000 1.184 +++ sources 2 Mar 2008 18:02:20 -0000 1.185 @@ -1,3 +1,3 @@ 5fcca1803f2f0ab384f79236e0d3f392 jd-1.9.9-beta080225.tgz e0de8ba3fde4a2f4ccf989f8b4842076 jd-2.0.0-svn1763_jdsksy.tgz -6277a167f9693fe5b2c10c5b06e82c11 jd-2.0.0-svn1879_trunk.tgz +47b6e9f5f1ba0ee282a86cfea6be365b jd-2.0.0-svn1886_trunk.tgz From fedora-extras-commits at redhat.com Sun Mar 2 18:03:04 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 2 Mar 2008 18:03:04 GMT Subject: rpms/jd/F-8 .cvsignore, 1.204, 1.205 jd.spec, 1.236, 1.237 sources, 1.205, 1.206 Message-ID: <200803021803.m22I34um024989@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23485/F-8 Modified Files: .cvsignore jd.spec sources Log Message: * Mon Mar 3 2008 Mamoru Tasaka - 2.0.0-0.3.svn1886 - svn 1886 (version 2.0.0) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- .cvsignore 26 Feb 2008 16:46:25 -0000 1.204 +++ .cvsignore 2 Mar 2008 18:02:29 -0000 1.205 @@ -1,3 +1,3 @@ jd-1.9.9-beta080225.tgz jd-2.0.0-svn1763_jdsksy.tgz -jd-2.0.0-svn1879_trunk.tgz +jd-2.0.0-svn1886_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- jd.spec 26 Feb 2008 16:46:25 -0000 1.236 +++ jd.spec 2 Mar 2008 18:02:29 -0000 1.237 @@ -22,7 +22,7 @@ %if %use_trunk %define main_ver 2.0.0 -%define strtag svn1879_trunk +%define strtag svn1886_trunk %define _pre_release 1 %endif @@ -143,8 +143,8 @@ %{icondir}/%{name}.png %changelog -* Wed Feb 27 2008 Mamoru Tasaka - 2.0.0-0.3.svn1879 -- svn 1879 (version 2.0.0) +* Mon Mar 3 2008 Mamoru Tasaka - 2.0.0-0.3.svn1886 +- svn 1886 (version 2.0.0) * Mon Feb 25 2008 Mamoru Tasaka - 1.9.9-0.3.beta080225 - 1.9.9 beta 080225 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/F-8/sources,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- sources 26 Feb 2008 16:46:25 -0000 1.205 +++ sources 2 Mar 2008 18:02:29 -0000 1.206 @@ -1,3 +1,3 @@ 5fcca1803f2f0ab384f79236e0d3f392 jd-1.9.9-beta080225.tgz e0de8ba3fde4a2f4ccf989f8b4842076 jd-2.0.0-svn1763_jdsksy.tgz -6277a167f9693fe5b2c10c5b06e82c11 jd-2.0.0-svn1879_trunk.tgz +47b6e9f5f1ba0ee282a86cfea6be365b jd-2.0.0-svn1886_trunk.tgz From fedora-extras-commits at redhat.com Sun Mar 2 18:03:09 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 2 Mar 2008 18:03:09 GMT Subject: rpms/jd/devel .cvsignore, 1.210, 1.211 jd.spec, 1.244, 1.245 sources, 1.211, 1.212 Message-ID: <200803021803.m22I39NT024994@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23485/devel Modified Files: .cvsignore jd.spec sources Log Message: * Mon Mar 3 2008 Mamoru Tasaka - 2.0.0-0.3.svn1886 - svn 1886 (version 2.0.0) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- .cvsignore 26 Feb 2008 16:46:29 -0000 1.210 +++ .cvsignore 2 Mar 2008 18:02:34 -0000 1.211 @@ -1,3 +1,3 @@ jd-1.9.9-beta080225.tgz jd-2.0.0-svn1763_jdsksy.tgz -jd-2.0.0-svn1879_trunk.tgz +jd-2.0.0-svn1886_trunk.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- jd.spec 26 Feb 2008 16:46:30 -0000 1.244 +++ jd.spec 2 Mar 2008 18:02:35 -0000 1.245 @@ -22,7 +22,7 @@ %if %use_trunk %define main_ver 2.0.0 -%define strtag svn1879_trunk +%define strtag svn1886_trunk %define _pre_release 1 %endif @@ -143,8 +143,8 @@ %{icondir}/%{name}.png %changelog -* Wed Feb 27 2008 Mamoru Tasaka - 2.0.0-0.3.svn1879 -- svn 1879 (version 2.0.0) +* Mon Mar 3 2008 Mamoru Tasaka - 2.0.0-0.3.svn1886 +- svn 1886 (version 2.0.0) * Mon Feb 25 2008 Mamoru Tasaka - 1.9.9-0.3.beta080225 - 1.9.9 beta 080225 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.211 retrieving revision 1.212 diff -u -r1.211 -r1.212 --- sources 26 Feb 2008 16:46:30 -0000 1.211 +++ sources 2 Mar 2008 18:02:35 -0000 1.212 @@ -1,3 +1,3 @@ 5fcca1803f2f0ab384f79236e0d3f392 jd-1.9.9-beta080225.tgz e0de8ba3fde4a2f4ccf989f8b4842076 jd-2.0.0-svn1763_jdsksy.tgz -6277a167f9693fe5b2c10c5b06e82c11 jd-2.0.0-svn1879_trunk.tgz +47b6e9f5f1ba0ee282a86cfea6be365b jd-2.0.0-svn1886_trunk.tgz From fedora-extras-commits at redhat.com Sun Mar 2 18:05:46 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sun, 2 Mar 2008 18:05:46 GMT Subject: rpms/xastir/F-8 xastir.spec,1.2,1.3 Message-ID: <200803021805.m22I5kYn025169@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xastir/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25136 Modified Files: xastir.spec Log Message: misc cleanups Index: xastir.spec =================================================================== RCS file: /cvs/pkgs/rpms/xastir/F-8/xastir.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xastir.spec 2 Mar 2008 17:02:05 -0000 1.2 +++ xastir.spec 2 Mar 2008 18:05:07 -0000 1.3 @@ -72,14 +72,16 @@ %{_mandir}/man1/xastir.* %attr(0644,root,root) %{_datadir}/xastir/Coordinate.pm %{_datadir}/xastir -%{_datadir}/xastir/help +##%{_datadir}/xastir/help #%{_datadir}/xastir/config -%{_datadir}/xastir/symbols -%{_datadir}/xastir/maps +##%{_datadir}/xastir/symbols +##%{_datadir}/xastir/maps #%{_datadir}/xastir/Counties #%{_datadir}/xastir/fcc #%{_datadir}/xastir/GNIS #%{_datadir}/xastir/sounds +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/applications/*%{name}.desktop %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE %doc README README.Contributing README.CVS README.Getting-Started %doc README.MAPS README.win32 UPGRADE @@ -87,6 +89,7 @@ %changelog * Sat Mar 2 2008 Lucian Langa - 1.9.2-3 - Added desktop and icon file +- Misc cleanups * Sat Feb 23 2008 Lucian Langa - 1.9.2-2 - Moved scripts from libdir to datadir From fedora-extras-commits at redhat.com Sun Mar 2 18:24:27 2008 From: fedora-extras-commits at redhat.com (Mohd Izhar Firdaus Ismail (izhar)) Date: Sun, 2 Mar 2008 18:24:27 GMT Subject: rpms/libitl/F-7 libitl-makefile-destdir.patch, 1.1, 1.2 libitl.spec, 1.1, 1.2 Message-ID: <200803021824.m22IORXJ025426@cvs-int.fedora.redhat.com> Author: izhar Update of /cvs/pkgs/rpms/libitl/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25396/F-7 Modified Files: libitl-makefile-destdir.patch libitl.spec Log Message: - remove --build-id from makefile libitl-makefile-destdir.patch: Index: libitl-makefile-destdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/libitl/F-7/libitl-makefile-destdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libitl-makefile-destdir.patch 15 Feb 2008 04:33:57 -0000 1.1 +++ libitl-makefile-destdir.patch 2 Mar 2008 18:23:51 -0000 1.2 @@ -34,15 +34,6 @@ diff -ruN libitl-0.6.4/Makefile libitl-0.6.4.new/Makefile --- libitl-0.6.4/Makefile 2005-03-17 06:32:00.000000000 +0730 +++ libitl-0.6.4.new/Makefile 2007-10-18 20:53:06.000000000 +0730 -@@ -23,7 +23,7 @@ - @false - - build/libitl.so: components -- $(LD) build/*.o $(LDFLAGS) -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME) -+ $(LD) build/*.o $(LDFLAGS) --build-id -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME) - (cd build/ && ln -sf $(FULLNAME) $(SONAME)) - (cd build/ && ln -sf $(FULLNAME) libitl.so) - @@ -35,12 +35,12 @@ strip --strip-unneeded build/$(FULLNAME) rm -f build/*.o build/ITL_* Index: libitl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libitl/F-7/libitl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libitl.spec 15 Feb 2008 04:33:57 -0000 1.1 +++ libitl.spec 2 Mar 2008 18:23:51 -0000 1.2 @@ -1,6 +1,6 @@ Name: libitl Version: 0.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Libraries for The Islamic Tools and Libraries Project Group: System Environment/Libraries @@ -77,6 +77,9 @@ %changelog +* Mon Mar 03 2008 Mohd Izhar Firdaus Ismail 0.6.4-4 +- remove --build-id from makefile + * Fri Feb 15 2008 Mohd Izhar Firdaus Ismail 0.6.4-3 - include the configure script as a source instead of as a patch From fedora-extras-commits at redhat.com Sun Mar 2 18:25:34 2008 From: fedora-extras-commits at redhat.com (Mohd Izhar Firdaus Ismail (izhar)) Date: Sun, 2 Mar 2008 18:25:34 GMT Subject: rpms/libitl/F-8 libitl-makefile-destdir.patch, 1.1, 1.2 libitl.spec, 1.1, 1.2 Message-ID: <200803021825.m22IPYc0025505@cvs-int.fedora.redhat.com> Author: izhar Update of /cvs/pkgs/rpms/libitl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25482/F-8 Modified Files: libitl-makefile-destdir.patch libitl.spec Log Message: - remove --build-id from makefile libitl-makefile-destdir.patch: Index: libitl-makefile-destdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/libitl/F-8/libitl-makefile-destdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libitl-makefile-destdir.patch 2 Mar 2008 17:43:44 -0000 1.1 +++ libitl-makefile-destdir.patch 2 Mar 2008 18:25:28 -0000 1.2 @@ -34,15 +34,6 @@ diff -ruN libitl-0.6.4/Makefile libitl-0.6.4.new/Makefile --- libitl-0.6.4/Makefile 2005-03-17 06:32:00.000000000 +0730 +++ libitl-0.6.4.new/Makefile 2007-10-18 20:53:06.000000000 +0730 -@@ -23,7 +23,7 @@ - @false - - build/libitl.so: components -- $(LD) build/*.o $(LDFLAGS) -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME) -+ $(LD) build/*.o $(LDFLAGS) --build-id -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME) - (cd build/ && ln -sf $(FULLNAME) $(SONAME)) - (cd build/ && ln -sf $(FULLNAME) libitl.so) - @@ -35,12 +35,12 @@ strip --strip-unneeded build/$(FULLNAME) rm -f build/*.o build/ITL_* Index: libitl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libitl/F-8/libitl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libitl.spec 2 Mar 2008 17:43:44 -0000 1.1 +++ libitl.spec 2 Mar 2008 18:25:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: libitl Version: 0.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Libraries for The Islamic Tools and Libraries Project Group: System Environment/Libraries @@ -77,6 +77,9 @@ %changelog +* Mon Mar 03 2008 Mohd Izhar Firdaus Ismail 0.6.4-4 +- remove --build-id from makefile + * Fri Feb 15 2008 Mohd Izhar Firdaus Ismail 0.6.4-3 - include the configure script as a source instead of as a patch From fedora-extras-commits at redhat.com Sun Mar 2 18:27:29 2008 From: fedora-extras-commits at redhat.com (Mohd Izhar Firdaus Ismail (izhar)) Date: Sun, 2 Mar 2008 18:27:29 GMT Subject: rpms/libitl/devel libitl-makefile-destdir.patch, 1.1, 1.2 libitl.spec, 1.1, 1.2 Message-ID: <200803021827.m22IRTlY025608@cvs-int.fedora.redhat.com> Author: izhar Update of /cvs/pkgs/rpms/libitl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25580/devel Modified Files: libitl-makefile-destdir.patch libitl.spec Log Message: - remove --build-id from makefile libitl-makefile-destdir.patch: Index: libitl-makefile-destdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/libitl/devel/libitl-makefile-destdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libitl-makefile-destdir.patch 15 Feb 2008 02:05:48 -0000 1.1 +++ libitl-makefile-destdir.patch 2 Mar 2008 18:27:24 -0000 1.2 @@ -34,15 +34,6 @@ diff -ruN libitl-0.6.4/Makefile libitl-0.6.4.new/Makefile --- libitl-0.6.4/Makefile 2005-03-17 06:32:00.000000000 +0730 +++ libitl-0.6.4.new/Makefile 2007-10-18 20:53:06.000000000 +0730 -@@ -23,7 +23,7 @@ - @false - - build/libitl.so: components -- $(LD) build/*.o $(LDFLAGS) -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME) -+ $(LD) build/*.o $(LDFLAGS) --build-id -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME) - (cd build/ && ln -sf $(FULLNAME) $(SONAME)) - (cd build/ && ln -sf $(FULLNAME) libitl.so) - @@ -35,12 +35,12 @@ strip --strip-unneeded build/$(FULLNAME) rm -f build/*.o build/ITL_* Index: libitl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libitl/devel/libitl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libitl.spec 15 Feb 2008 02:05:48 -0000 1.1 +++ libitl.spec 2 Mar 2008 18:27:24 -0000 1.2 @@ -1,6 +1,6 @@ Name: libitl Version: 0.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Libraries for The Islamic Tools and Libraries Project Group: System Environment/Libraries @@ -77,6 +77,9 @@ %changelog +* Mon Mar 03 2008 Mohd Izhar Firdaus Ismail 0.6.4-4 +- remove --build-id from makefile + * Fri Feb 15 2008 Mohd Izhar Firdaus Ismail 0.6.4-3 - include the configure script as a source instead of as a patch From fedora-extras-commits at redhat.com Sun Mar 2 18:28:00 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sun, 2 Mar 2008 18:28:00 GMT Subject: rpms/xastir/F-8 xastir.spec,1.3,1.4 Message-ID: <200803021828.m22IS0pV025664@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xastir/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25577 Modified Files: xastir.spec Log Message: misc cleanups Index: xastir.spec =================================================================== RCS file: /cvs/pkgs/rpms/xastir/F-8/xastir.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xastir.spec 2 Mar 2008 18:05:07 -0000 1.3 +++ xastir.spec 2 Mar 2008 18:27:22 -0000 1.4 @@ -1,7 +1,7 @@ Summary : Amateur Station Tracking and Reporting system for amateur radio Name : xastir Version : 1.9.2 -Release : 3%{?dist} +Release : 4%{?dist} License : GPLv2 Group : Applications/Internet Source0 : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz @@ -87,9 +87,11 @@ %doc README.MAPS README.win32 UPGRADE %changelog +* Sat Mar 2 2008 Lucian Langa - 1.9.2-4 +- Misc cleanups + * Sat Mar 2 2008 Lucian Langa - 1.9.2-3 - Added desktop and icon file -- Misc cleanups * Sat Feb 23 2008 Lucian Langa - 1.9.2-2 - Moved scripts from libdir to datadir From fedora-extras-commits at redhat.com Sun Mar 2 18:48:40 2008 From: fedora-extras-commits at redhat.com (Christian Nolte (noltec)) Date: Sun, 2 Mar 2008 18:48:40 GMT Subject: rpms/kbibtex/devel kbibtex.spec,1.11,1.12 Message-ID: <200803021848.m22ImeH8025951@cvs-int.fedora.redhat.com> Author: noltec Update of /cvs/pkgs/rpms/kbibtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25928 Modified Files: kbibtex.spec Log Message: - Corrected kdelibs3-devel build dependency Index: kbibtex.spec =================================================================== RCS file: /cvs/pkgs/rpms/kbibtex/devel/kbibtex.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kbibtex.spec 19 Feb 2008 16:17:54 -0000 1.11 +++ kbibtex.spec 2 Mar 2008 18:48:06 -0000 1.12 @@ -1,6 +1,6 @@ Name: kbibtex Version: 0.1.5.52 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A BibTeX editor for KDE Group: Applications/Editors @@ -9,7 +9,7 @@ Source0: http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel >= 3.3 libxslt-devel desktop-file-utils +BuildRequires: kdebase-devel >= 3.3 libxslt-devel desktop-file-utils kdelibs3-devel #Requires: Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -113,6 +113,9 @@ %{_datadir}/applications/fedora-kbibtex_part.desktop %changelog +* Sun Mar 02 2008 Fedora Release Engineering - 0.1.5.52-13 +- Corrected build-dependency on kde3-libs + * Tue Feb 19 2008 Fedora Release Engineering - 0.1.5.52-12 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 19:04:49 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Sun, 2 Mar 2008 19:04:49 GMT Subject: rpms/xorg-x11-drv-amd/F-8 amd-wide-mode.patches, NONE, 1.1 xorg-x11-drv-amd.spec, 1.16, 1.17 Message-ID: <200803021904.m22J4ngi000833@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/xorg-x11-drv-amd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv790 Modified Files: xorg-x11-drv-amd.spec Added Files: amd-wide-mode.patches Log Message: Bart Trojanowski's widemode patch --- NEW FILE amd-wide-mode.patches --- >From 62076bb36c7e3d521c7e5b21f79b50571ef45201 Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Wed, 13 Feb 2008 10:43:26 -0500 Subject: [PATCH] ddc patch from Jordan --- src/amd_gx_driver.c | 9 +++++---- src/amd_lx_driver.c | 21 +++++++++++++++------ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/amd_gx_driver.c b/src/amd_gx_driver.c index 177b111..ead492f 100644 --- a/src/amd_gx_driver.c +++ b/src/amd_gx_driver.c @@ -783,7 +783,9 @@ GXSetVideoMode(ScrnInfoPtr pScrni, DisplayModePtr pMode) /* Only use the panel mode for built in modes */ - if ((pMode->type && pMode->type != M_T_USERDEF) && pGeode->Panel) { + if ((pMode->type & M_T_BUILTIN) || (pMode->type & M_T_DEFAULT) + && pGeode->Panel) { + GFX(set_fixed_timings(pGeode->PanelX, pGeode->PanelY, pMode->CrtcHDisplay, pMode->CrtcVDisplay, pScrni->bitsPerPixel)); @@ -1390,10 +1392,9 @@ GXValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags) GeodeRec *pGeode = GEODEPTR(pScrni); int p, ret; - /* Not sure if this is an X bug or not - but on my current build, - * user defined modes pass a type of 0 */ + /* Use the durango lookup for builtin or default modes only */ - if (pMode->type && pMode->type != M_T_USERDEF) { + if ((pMode->type & M_T_BUILTIN) || (pMode->type & M_T_DEFAULT)) { if (pGeode->Panel) { if (pMode->CrtcHDisplay > pGeode->PanelX || diff --git a/src/amd_lx_driver.c b/src/amd_lx_driver.c index 9abbd5f..c779ac1 100644 --- a/src/amd_lx_driver.c +++ b/src/amd_lx_driver.c @@ -845,9 +845,10 @@ LXSetVideoMode(ScrnInfoPtr pScrni, DisplayModePtr pMode) lx_disable_dac_power(pScrni, DF_CRT_DISABLE); vg_set_compression_enable(0); - if (!pMode->type || pMode->type == M_T_USERDEF) - lx_set_custom_mode(pGeode, pMode, pScrni->bitsPerPixel); - else { + /* If the mode is a default one, then set the mode with the Cimarron + * tables */ + + if ((pMode->type & M_T_BUILTIN) || (pMode->type & M_T_DEFAULT)) { if (pMode->Flags & V_NHSYNC) flags |= VG_MODEFLAG_NEG_HSYNC; if (pMode->Flags & V_NVSYNC) @@ -878,8 +879,14 @@ LXSetVideoMode(ScrnInfoPtr pScrni, DisplayModePtr pMode) pScrni->bitsPerPixel, GeodeGetRefreshRate(pMode), 0); } - } - + } + else { + /* For anything other then a default mode - use the passed in + * timings */ + + lx_set_custom_mode(pGeode, pMode, pScrni->bitsPerPixel); + } + if (pGeode->Output & OUTPUT_PANEL) df_set_output_path((pGeode->Output & OUTPUT_CRT) ? DF_DISPLAY_CRT_FP : DF_DISPLAY_FP); else @@ -1386,7 +1393,9 @@ LXValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags) memset(&vgQueryMode, 0, sizeof(vgQueryMode)); - if (pMode->type && pMode->type != M_T_USERDEF) { + /* For builtin and default modes, try to look up the mode in Cimarron */ + + if ((pMode->type & M_T_BUILTIN) || (pMode->type && M_T_DEFAULT)) { if (pGeode->Output & OUTPUT_PANEL) { -- 1.5.3.8 >From 17d1a6a83aab541a5d627ceee526b1d89c0929c0 Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Sat, 1 Mar 2008 11:38:57 -0500 Subject: [PATCH] fix logic bug in LXValidMode() --- src/amd_lx_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/amd_lx_driver.c b/src/amd_lx_driver.c index c779ac1..f125995 100644 --- a/src/amd_lx_driver.c +++ b/src/amd_lx_driver.c @@ -1395,7 +1395,7 @@ LXValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags) /* For builtin and default modes, try to look up the mode in Cimarron */ - if ((pMode->type & M_T_BUILTIN) || (pMode->type && M_T_DEFAULT)) { + if ((pMode->type & M_T_BUILTIN) || (pMode->type & M_T_DEFAULT)) { if (pGeode->Output & OUTPUT_PANEL) { -- 1.5.3.8 Index: xorg-x11-drv-amd.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-amd/F-8/xorg-x11-drv-amd.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xorg-x11-drv-amd.spec 15 Feb 2008 16:58:37 -0000 1.16 +++ xorg-x11-drv-amd.spec 2 Mar 2008 19:04:14 -0000 1.17 @@ -7,7 +7,7 @@ Summary: Xorg X11 AMD Geode video driver Name: xorg-x11-drv-amd Version: 2.7.7.6 -Release: 1%{?dist} +Release: 2%{?dist} #Release: 0.1.%{gitdate}%{?dist} URL: http://www.x.org/wiki/AMDGeodeDriver # Upstream GIT @@ -15,11 +15,12 @@ # Upstream Tarballs # http://xorg.freedesktop.org/releases/individual/driver/ Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-amd-%{version}.tar.bz2 +Patch0: amd-wide-mode.patches License: MIT/X11 Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} +ExclusiveArch: %{ix86} BuildRequires: pkgconfig BuildRequires: autoconf @@ -44,6 +45,7 @@ %prep %setup -q -n %{tarball}-%{version} +%patch0 -p1 # remind myself to do snapshots properly if [ -e %{tarball}/.git ] ; then @@ -77,6 +79,9 @@ %{driverdir}/ztv_drv.so %changelog +* Sun Mar 02 2008 Warren Togami 2.7.7.6-2 +- Bart Trojanowski's widemode patch + * Fri Feb 15 2008 Warren Togami 2.7.7.6-1 - update to 2.7.7.6 and remove all patches - Jordan Crouse (AMD) says to OLPC: From fedora-extras-commits at redhat.com Sun Mar 2 19:04:55 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sun, 2 Mar 2008 19:04:55 GMT Subject: rpms/openbabel/devel .cvsignore, 1.8, 1.9 openbabel-rpm.patch, 1.1, 1.2 openbabel.spec, 1.17, 1.18 sources, 1.8, 1.9 Message-ID: <200803021904.m22J4trs000844@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/openbabel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv786 Modified Files: .cvsignore openbabel-rpm.patch openbabel.spec sources Log Message: - updated to 2.2.0 beta4 - enable CML tests again (fixed upstream) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 23 Feb 2008 20:02:14 -0000 1.8 +++ .cvsignore 2 Mar 2008 19:04:13 -0000 1.9 @@ -1 +1 @@ -openbabel-2.2.0b3-20080215-r2249.tar.gz +openbabel-2.2.0b4-20080301-r2299.tar.gz openbabel-rpm.patch: Index: openbabel-rpm.patch =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-rpm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openbabel-rpm.patch 23 Feb 2008 20:02:14 -0000 1.1 +++ openbabel-rpm.patch 2 Mar 2008 19:04:13 -0000 1.2 @@ -12,19 +12,3 @@ sed -e 's/rb_define_module(\"Openbabel\")/rb_define_module(\"OpenBabel\")/' -e 's/void Init_OpenBabel/void Init_openbabel/' ruby/openbabel_ruby.new mv ruby/openbabel_ruby.new ruby/openbabel_ruby.cpp endif # BUILD_RUBY -diff -up openbabel-2.2.0b3-20080215-r2249/test/cml.sh.r openbabel-2.2.0b3-20080215-r2249/test/cml.sh ---- openbabel-2.2.0b3-20080215-r2249/test/cml.sh.r 2008-01-10 18:47:23.000000000 +0100 -+++ openbabel-2.2.0b3-20080215-r2249/test/cml.sh 2008-02-23 17:18:33.000000000 +0100 -@@ -14,8 +14,8 @@ fi - - echo - echo "# Testing CML support..." --if [ -f $cmltestdir/test.sh ]; then -- (cd $cmltestdir; source test.sh 2>/dev/null) --else -+#if [ -f $cmltestdir/test.sh ]; then -+# (cd $cmltestdir; source test.sh 2>/dev/null) -+#else - echo "1..0 # skipping - CML test set not found" --fi -+#fi Index: openbabel.spec =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- openbabel.spec 23 Feb 2008 20:02:14 -0000 1.17 +++ openbabel.spec 2 Mar 2008 19:04:13 -0000 1.18 @@ -4,12 +4,12 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]') -%define beta_ver b3 -%define beta_str b3-20080215-r2249 +%define beta_ver b4 +%define beta_str b4-20080301-r2299 Name: openbabel Version: 2.2.0 -Release: 0.1.%{beta_ver}%{?dist} +Release: 0.2.%{beta_ver}%{?dist} Summary: Chemistry software file format converter License: GPLv2 Group: Applications/File @@ -87,7 +87,7 @@ Ruby wrapper for the Open Babel library. %prep -%setup -q -n %{name}-%{version}%{beta_str} +%setup -q -n %{name}-%{version}%{beta_ver} %patch -p1 -b .gcc43 %patch1 -p1 -b .r @@ -180,6 +180,10 @@ %{ruby_sitearch}/openbabel.so %changelog +* Sun Mar 02 2008 Dominik Mierzejewski 2.2.0-0.2.b4 +- updated to 2.2.0 beta4 +- enable CML tests again (fixed upstream) + * Fri Feb 22 2008 Dominik Mierzejewski 2.2.0-0.1.b3 - updated to 2.2.0 beta3 - renamed language bindings subpackages Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openbabel/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 23 Feb 2008 20:02:14 -0000 1.8 +++ sources 2 Mar 2008 19:04:13 -0000 1.9 @@ -1 +1 @@ -0d0b79d0b8c4ba83efada0d8668f63af openbabel-2.2.0b3-20080215-r2249.tar.gz +1da2f8d1d47a554a22de5c12e5ddf896 openbabel-2.2.0b4-20080301-r2299.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 19:33:01 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 2 Mar 2008 19:33:01 GMT Subject: rpms/php-pecl-xdebug/EL-5 php-pecl-xdebug.spec,1.13,1.14 Message-ID: <200803021933.m22JX1mr001327@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pecl-xdebug/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1259/EL-5 Modified Files: php-pecl-xdebug.spec Log Message: fix requires Index: php-pecl-xdebug.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-xdebug/EL-5/php-pecl-xdebug.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- php-pecl-xdebug.spec 23 Feb 2008 02:28:54 -0000 1.13 +++ php-pecl-xdebug.spec 2 Mar 2008 19:32:21 -0000 1.14 @@ -6,7 +6,7 @@ Name: php-pecl-xdebug Version: 2.0.2 -Release: 3%{?dist}.3 +Release: 4%{?dist} Summary: PECL package for debugging PHP scripts License: BSD @@ -16,9 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel php-pear >= 1:1.4.9-1.2 -# EL-5 currently does not have libedit -#BuildRequires: libedit-devel automake -BuildRequires: automake +BuildRequires: libedit-devel automake +Requires(post): %{__pecl} +Requires(postun): %{__pecl} Provides: php-pecl(Xdebug) = %{version} %if %{?php_zend_api}0 @@ -52,9 +52,7 @@ pushd debugclient cp %{_datadir}/automake*/depcomp . chmod +x configure -# EL-5 currently does not have libedit -#configure --with-libedit -%configure --without-libedit +%configure --with-libedit CFLAGS="$RPM_OPT_FLAGS" make popd @@ -112,14 +110,8 @@ %changelog -* Fri Feb 22 2008 Christopher Stone 2.0.2-3.3 -- Fix rpm comment parsing limitation - -* Fri Feb 22 2008 Christopher Stone 2.0.2-3.2 -- Explicitly specify to not use libedit in %%configure - -* Fri Feb 22 2008 Christopher Stone 2.0.2-3.1 -- Remove libedit requirement for EL-5 until libedit is available +* Sun Mar 02 2008 Christopher Stone 2.0.2-4 +- Add %%{__pecl} to post/postun Requires * Fri Feb 22 2008 Christopher Stone 2.0.2-3 - %%define %%pecl_name to properly register package From fedora-extras-commits at redhat.com Sun Mar 2 19:33:06 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 2 Mar 2008 19:33:06 GMT Subject: rpms/php-pecl-xdebug/F-7 php-pecl-xdebug.spec,1.9,1.10 Message-ID: <200803021933.m22JX6ej001330@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pecl-xdebug/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1259/F-7 Modified Files: php-pecl-xdebug.spec Log Message: fix requires Index: php-pecl-xdebug.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-7/php-pecl-xdebug.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- php-pecl-xdebug.spec 23 Feb 2008 01:25:06 -0000 1.9 +++ php-pecl-xdebug.spec 2 Mar 2008 19:32:32 -0000 1.10 @@ -6,7 +6,7 @@ Name: php-pecl-xdebug Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PECL package for debugging PHP scripts License: BSD @@ -17,6 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel php-pear >= 1:1.4.9-1.2 BuildRequires: libedit-devel automake +Requires(post): %{__pecl} +Requires(postun): %{__pecl} Provides: php-pecl(Xdebug) = %{version} %if %{?php_zend_api}0 @@ -108,6 +110,9 @@ %changelog +* Sun Mar 02 2008 Christopher Stone 2.0.2-4 +- Add %%{__pecl} to post/postun Requires + * Fri Feb 22 2008 Christopher Stone 2.0.2-3 - %%define %%pecl_name to properly register package - Install xml package description From fedora-extras-commits at redhat.com Sun Mar 2 19:33:17 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 2 Mar 2008 19:33:17 GMT Subject: rpms/php-pecl-xdebug/F-8 php-pecl-xdebug.spec,1.9,1.10 Message-ID: <200803021933.m22JXHV8001336@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pecl-xdebug/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1259/F-8 Modified Files: php-pecl-xdebug.spec Log Message: fix requires Index: php-pecl-xdebug.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-8/php-pecl-xdebug.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- php-pecl-xdebug.spec 23 Feb 2008 01:25:15 -0000 1.9 +++ php-pecl-xdebug.spec 2 Mar 2008 19:32:37 -0000 1.10 @@ -6,7 +6,7 @@ Name: php-pecl-xdebug Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PECL package for debugging PHP scripts License: BSD @@ -17,6 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel php-pear >= 1:1.4.9-1.2 BuildRequires: libedit-devel automake +Requires(post): %{__pecl} +Requires(postun): %{__pecl} Provides: php-pecl(Xdebug) = %{version} %if %{?php_zend_api}0 @@ -108,6 +110,9 @@ %changelog +* Sun Mar 02 2008 Christopher Stone 2.0.2-4 +- Add %%{__pecl} to post/postun Requires + * Fri Feb 22 2008 Christopher Stone 2.0.2-3 - %%define %%pecl_name to properly register package - Install xml package description From fedora-extras-commits at redhat.com Sun Mar 2 19:33:22 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 2 Mar 2008 19:33:22 GMT Subject: rpms/php-pecl-xdebug/devel php-pecl-xdebug.spec,1.10,1.11 Message-ID: <200803021933.m22JXM84001339@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pecl-xdebug/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1259/devel Modified Files: php-pecl-xdebug.spec Log Message: fix requires Index: php-pecl-xdebug.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/php-pecl-xdebug.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- php-pecl-xdebug.spec 23 Feb 2008 01:25:18 -0000 1.10 +++ php-pecl-xdebug.spec 2 Mar 2008 19:32:47 -0000 1.11 @@ -6,7 +6,7 @@ Name: php-pecl-xdebug Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PECL package for debugging PHP scripts License: BSD @@ -17,6 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel php-pear >= 1:1.4.9-1.2 BuildRequires: libedit-devel automake +Requires(post): %{__pecl} +Requires(postun): %{__pecl} Provides: php-pecl(Xdebug) = %{version} %if %{?php_zend_api}0 @@ -108,6 +110,9 @@ %changelog +* Sun Mar 02 2008 Christopher Stone 2.0.2-4 +- Add %%{__pecl} to post/postun Requires + * Fri Feb 22 2008 Christopher Stone 2.0.2-3 - %%define %%pecl_name to properly register package - Install xml package description From fedora-extras-commits at redhat.com Sun Mar 2 19:35:48 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 19:35:48 GMT Subject: rpms/glade3/devel glade3.spec,1.8,1.9 Message-ID: <200803021935.m22JZmk5001447@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1378 Modified Files: glade3.spec Log Message: Updated to 3.4.1-5 in devel. Modified Files: glade3.spec Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- glade3.spec 2 Mar 2008 15:03:08 -0000 1.8 +++ glade3.spec 2 Mar 2008 19:35:12 -0000 1.9 @@ -24,10 +24,13 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper +%if 0%{?fc7} +BuildRequires: gtk-doc +%endif + BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gnome-doc-utils -BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libgnomeui-devel BuildRequires: libtool @@ -59,6 +62,7 @@ License: GPLv2+ Group: Development/Libraries +Requires: gtk-doc Requires: gtk2-devel Requires: %{name}-libgladeui = %{version}-%{release} Requires: libxml2-devel @@ -186,6 +190,10 @@ %{_includedir}/libgladeui-1.0/gladeui/* %changelog +* Sun Mar 02 2008 Debarshi Ray - 3.4.1-5 +- Removed 'BuildRequires: gtk-doc' from all distributions, except Fedora 7. +- Added 'Requires: gtk-doc' for glade3-libgladeui-devel. + * Sun Mar 02 2008 Debarshi Ray - 3.4.1-4 - Replaced 'BuildRequires: chrpath' with 'BuildRequires: libtool' for removing rpaths. @@ -194,7 +202,7 @@ - Omitted unused direct shared library dependencies. * Fri Dec 21 2007 Debarshi Ray - 3.4.1-2 -- Removed deletion of /var/lib/scrollkeeper for all distributions, except +- Removed deletion of /var/lib/scrollkeeper from all distributions, except Fedora 7. * Thu Dec 20 2007 Debarshi Ray - 3.4.1-1 @@ -211,7 +219,7 @@ * Tue Nov 13 2007 Debarshi Ray - 3.4.0-3 - Clarified multiple licensing issues according to Fedora licensing guidelines. - Trimmed the 'BuildRequires' list. -- Trimmed the 'Requires' list for -devel. +- Trimmed the 'Requires' list for glade3-libgladeui-devel. - Removed custom config files for /etc/ld.so.conf.d. * Wed Nov 07 2007 Debarshi Ray - 3.4.0-2 From fedora-extras-commits at redhat.com Sun Mar 2 19:41:06 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 19:41:06 GMT Subject: rpms/glade3/devel glade3.spec,1.9,1.10 Message-ID: <200803021941.m22Jf6JV001509@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1489 Modified Files: glade3.spec Log Message: Fixed Spec in devel. Modified Files: glade3.spec Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- glade3.spec 2 Mar 2008 19:35:12 -0000 1.9 +++ glade3.spec 2 Mar 2008 19:40:31 -0000 1.10 @@ -6,7 +6,7 @@ Summary: User Interface Designer for GTK+ and GNOME Name: glade3 Version: 3.4.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Development/Tools URL: http://glade.gnome.org/ From fedora-extras-commits at redhat.com Sun Mar 2 19:43:18 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 19:43:18 GMT Subject: rpms/glade3/F-8 glade3.spec,1.8,1.9 Message-ID: <200803021943.m22JhIut001617@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1596 Modified Files: glade3.spec Log Message: Updated to 3.4.1-5 in F-8. Modified Files: glade3.spec Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-8/glade3.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- glade3.spec 2 Mar 2008 15:05:16 -0000 1.8 +++ glade3.spec 2 Mar 2008 19:42:42 -0000 1.9 @@ -6,7 +6,7 @@ Summary: User Interface Designer for GTK+ and GNOME Name: glade3 Version: 3.4.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Development/Tools URL: http://glade.gnome.org/ @@ -24,10 +24,13 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper +%if 0%{?fc7} +BuildRequires: gtk-doc +%endif + BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gnome-doc-utils -BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libgnomeui-devel BuildRequires: libtool @@ -59,6 +62,7 @@ License: GPLv2+ Group: Development/Libraries +Requires: gtk-doc Requires: gtk2-devel Requires: %{name}-libgladeui = %{version}-%{release} Requires: libxml2-devel @@ -186,6 +190,10 @@ %{_includedir}/libgladeui-1.0/gladeui/* %changelog +* Sun Mar 02 2008 Debarshi Ray - 3.4.1-5 +- Removed 'BuildRequires: gtk-doc' from all distributions, except Fedora 7. +- Added 'Requires: gtk-doc' for glade3-libgladeui-devel. + * Sun Mar 02 2008 Debarshi Ray - 3.4.1-4 - Replaced 'BuildRequires: chrpath' with 'BuildRequires: libtool' for removing rpaths. @@ -194,7 +202,7 @@ - Omitted unused direct shared library dependencies. * Fri Dec 21 2007 Debarshi Ray - 3.4.1-2 -- Removed deletion of /var/lib/scrollkeeper for all distributions, except +- Removed deletion of /var/lib/scrollkeeper from all distributions, except Fedora 7. * Thu Dec 20 2007 Debarshi Ray - 3.4.1-1 @@ -211,7 +219,7 @@ * Tue Nov 13 2007 Debarshi Ray - 3.4.0-3 - Clarified multiple licensing issues according to Fedora licensing guidelines. - Trimmed the 'BuildRequires' list. -- Trimmed the 'Requires' list for -devel. +- Trimmed the 'Requires' list for glade3-libgladeui-devel. - Removed custom config files for /etc/ld.so.conf.d. * Wed Nov 07 2007 Debarshi Ray - 3.4.0-2 From fedora-extras-commits at redhat.com Sun Mar 2 19:45:46 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 19:45:46 GMT Subject: rpms/glade3/F-7 glade3.spec,1.10,1.11 Message-ID: <200803021945.m22JjkE3001720@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1682 Modified Files: glade3.spec Log Message: Updated to 3.4.1-5 in F-7. Modified Files: glade3.spec Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-7/glade3.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- glade3.spec 2 Mar 2008 15:07:15 -0000 1.10 +++ glade3.spec 2 Mar 2008 19:45:09 -0000 1.11 @@ -6,7 +6,7 @@ Summary: User Interface Designer for GTK+ and GNOME Name: glade3 Version: 3.4.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Development/Tools URL: http://glade.gnome.org/ @@ -24,10 +24,13 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper +%if 0%{?fc7} +BuildRequires: gtk-doc +%endif + BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gnome-doc-utils -BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libgnomeui-devel BuildRequires: libtool @@ -59,6 +62,7 @@ License: GPLv2+ Group: Development/Libraries +Requires: gtk-doc Requires: gtk2-devel Requires: %{name}-libgladeui = %{version}-%{release} Requires: libxml2-devel @@ -186,6 +190,10 @@ %{_includedir}/libgladeui-1.0/gladeui/* %changelog +* Sun Mar 02 2008 Debarshi Ray - 3.4.1-5 +- Removed 'BuildRequires: gtk-doc' from all distributions, except Fedora 7. +- Added 'Requires: gtk-doc' for glade3-libgladeui-devel. + * Sun Mar 02 2008 Debarshi Ray - 3.4.1-4 - Replaced 'BuildRequires: chrpath' with 'BuildRequires: libtool' for removing rpaths. @@ -194,7 +202,7 @@ - Omitted unused direct shared library dependencies. * Fri Dec 21 2007 Debarshi Ray - 3.4.1-2 -- Removed deletion of /var/lib/scrollkeeper for all distributions, except +- Removed deletion of /var/lib/scrollkeeper from all distributions, except Fedora 7. * Thu Dec 20 2007 Debarshi Ray - 3.4.1-1 @@ -211,7 +219,7 @@ * Tue Nov 13 2007 Debarshi Ray - 3.4.0-3 - Clarified multiple licensing issues according to Fedora licensing guidelines. - Trimmed the 'BuildRequires' list. -- Trimmed the 'Requires' list for -devel. +- Trimmed the 'Requires' list for glade3-libgladeui-devel. - Removed custom config files for /etc/ld.so.conf.d. * Wed Nov 07 2007 Debarshi Ray - 3.4.0-2 From fedora-extras-commits at redhat.com Sun Mar 2 19:55:12 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 19:55:12 GMT Subject: rpms/libgdl/F-7 libgdl-0.7.10-pkgconfig.patch, NONE, 1.1 libgdl.spec, 1.4, 1.5 libgdl-0.7.8-pkgconfig.patch, 1.1, NONE Message-ID: <200803021955.m22JtCip001894@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libgdl/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1870 Modified Files: libgdl.spec Added Files: libgdl-0.7.10-pkgconfig.patch Removed Files: libgdl-0.7.8-pkgconfig.patch Log Message: Updated to 0.7.10-1 in F-7. Modified Files: libgdl.spec Added Files: libgdl-0.7.10-pkgconfig.patch Removed Files: libgdl-0.7.8-pkgconfig.patch libgdl-0.7.10-pkgconfig.patch: --- NEW FILE libgdl-0.7.10-pkgconfig.patch --- diff -urNp gdl-0.7.10.orig/gdl-1.0.pc.in gdl-0.7.10/gdl-1.0.pc.in --- gdl-0.7.10.orig/gdl-1.0.pc.in 2007-05-07 18:40:12.000000000 +0530 +++ gdl-0.7.10/gdl-1.0.pc.in 2008-03-02 20:48:50.000000000 +0530 @@ -7,6 +7,6 @@ idldir=@datadir@/idl/libgdl-1.0 Name: gdl Description: Gnome DevTool Libraries Version: @VERSION@ -Requires: gtk+-2.0 libxml-2.0 libglade-2.0 +Requires: gtk+-2.0 Libs: -L${libdir} -lgdl-1 Cflags: -I${includedir} diff -urNp gdl-0.7.10.orig/gdl-gnome-1.0.pc.in gdl-0.7.10/gdl-gnome-1.0.pc.in --- gdl-0.7.10.orig/gdl-gnome-1.0.pc.in 2007-05-07 18:40:12.000000000 +0530 +++ gdl-0.7.10/gdl-gnome-1.0.pc.in 2008-03-02 20:48:50.000000000 +0530 @@ -7,6 +7,6 @@ idldir=@datadir@/idl/libgdl-1.0 Name: gdl-gnome Description: Gnome DevTool Libraries - Gnome part Version: @VERSION@ -Requires: libgnomeui-2.0 gnome-vfs-2.0 gtk+-2.0 gdl-1.0 +Requires: gtk+-2.0 gdl-1.0 Libs: -L${libdir} -lgdl-gnome-1 Cflags: -I${includedir} Index: libgdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/F-7/libgdl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libgdl.spec 2 Feb 2008 20:43:32 -0000 1.4 +++ libgdl.spec 2 Mar 2008 19:54:35 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Components and library for GNOME development tools Name: libgdl -Version: 0.7.8 -Release: 2%{?dist} +Version: 0.7.10 +Release: 1%{?dist} # Mixed source licensing scenario. License: (GPLv2 and GPLv2+ and LGPLv2+) Group: Development/Libraries @@ -16,10 +16,14 @@ Provides: anjuta-gdl = %{version}-%{release} Obsoletes: anjuta-gdl < 0.7.7-1 -BuildRequires: chrpath +%if 0%{?fc7} +BuildRequires: gtk-doc +%endif + BuildRequires: gettext BuildRequires: intltool BuildRequires: libgnomeui-devel +BuildRequires: libtool BuildRequires: perl(XML::Parser) %description @@ -41,6 +45,7 @@ Provides: anjuta-gdl-devel = %{version}-%{release} Obsoletes: anjuta-gdl-devel < 0.7.7-1 +Requires: gtk-doc Requires: gtk2-devel Requires: %{name} = %{version}-%{release} Requires: pkgconfig @@ -53,7 +58,11 @@ %patch0 -p1 %build -%configure --disable-static +%configure --disable-static --enable-gtk-doc + +# Fix Libtool to remove rpaths. +rm -f ./libtool +cp %{_bindir}/libtool . # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool @@ -65,12 +74,10 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -delete +find $RPM_BUILD_ROOT -type f -name "*.a" -delete %find_lang gdl-1 -# Remove rpaths. -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gnome-1.so.0.0.0 - %clean rm -rf $RPM_BUILD_ROOT @@ -99,10 +106,20 @@ %{_libdir}/pkgconfig/gdl-1.0.pc %{_libdir}/pkgconfig/gdl-gnome-1.0.pc +%dir %{_datadir}/gtk-doc/html/gdl +%{_datadir}/gtk-doc/html/gdl/* + %dir %{_includedir}/%{name}-1.0 %{_includedir}/%{name}-1.0/gdl %changelog +* Sun Mar 02 2008 Debarshi Ray - 0.7.10-1 +- Version bump to 0.7.10. +- Added 'BuildRequires: gtk-doc' on Fedora 7. +- Added 'Requires: gtk-doc' for libgdl-devel. +- Replaced 'BuildRequires: chrpath' with 'BuildRequires: libtool' for removing + rpaths. + * Sun Feb 03 2008 Debarshi Ray - 0.7.8-2 - Omitted unused direct shared library dependencies. --- libgdl-0.7.8-pkgconfig.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 19:58:03 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 2 Mar 2008 19:58:03 GMT Subject: rpms/php-pecl-xdebug/EL-5 php-pecl-xdebug.spec,1.14,1.15 Message-ID: <200803021958.m22Jw3JG002040@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pecl-xdebug/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1971/EL-5 Modified Files: php-pecl-xdebug.spec Log Message: make spec compatible with el5 Index: php-pecl-xdebug.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-xdebug/EL-5/php-pecl-xdebug.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- php-pecl-xdebug.spec 2 Mar 2008 19:32:21 -0000 1.14 +++ php-pecl-xdebug.spec 2 Mar 2008 19:57:29 -0000 1.15 @@ -15,17 +15,21 @@ Source0: http://pecl.php.net/get/xdebug-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: php-devel php-pear >= 1:1.4.9-1.2 -BuildRequires: libedit-devel automake +BuildRequires: automake php-devel php-pear >= 1:1.4.9-1.2 +%if 0%{?fedora} +BuildRequires: libedit-devel +%endif Requires(post): %{__pecl} Requires(postun): %{__pecl} Provides: php-pecl(Xdebug) = %{version} -%if %{?php_zend_api}0 +%if 0%{?php_zend_api} +%define config_flags --with-libedit Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} %else # for EL-5 +%define config_flags --without-libedit Requires: php-api = %{php_apiver} %endif @@ -49,10 +53,12 @@ phpize %configure --enable-xdebug CFLAGS="$RPM_OPT_FLAGS" make + +# Build debugclient pushd debugclient cp %{_datadir}/automake*/depcomp . chmod +x configure -%configure --with-libedit +%configure %{config_flags} CFLAGS="$RPM_OPT_FLAGS" make popd From fedora-extras-commits at redhat.com Sun Mar 2 19:58:12 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 2 Mar 2008 19:58:12 GMT Subject: rpms/php-pecl-xdebug/F-7 php-pecl-xdebug.spec,1.10,1.11 Message-ID: <200803021958.m22JwCS8002043@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pecl-xdebug/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1971/F-7 Modified Files: php-pecl-xdebug.spec Log Message: make spec compatible with el5 Index: php-pecl-xdebug.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-7/php-pecl-xdebug.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- php-pecl-xdebug.spec 2 Mar 2008 19:32:32 -0000 1.10 +++ php-pecl-xdebug.spec 2 Mar 2008 19:57:33 -0000 1.11 @@ -15,17 +15,21 @@ Source0: http://pecl.php.net/get/xdebug-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: php-devel php-pear >= 1:1.4.9-1.2 -BuildRequires: libedit-devel automake +BuildRequires: automake php-devel php-pear >= 1:1.4.9-1.2 +%if 0%{?fedora} +BuildRequires: libedit-devel +%endif Requires(post): %{__pecl} Requires(postun): %{__pecl} Provides: php-pecl(Xdebug) = %{version} -%if %{?php_zend_api}0 +%if 0%{?php_zend_api} +%define config_flags --with-libedit Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} %else # for EL-5 +%define config_flags --without-libedit Requires: php-api = %{php_apiver} %endif @@ -49,10 +53,12 @@ phpize %configure --enable-xdebug CFLAGS="$RPM_OPT_FLAGS" make + +# Build debugclient pushd debugclient cp %{_datadir}/automake*/depcomp . chmod +x configure -%configure --with-libedit +%configure %{config_flags} CFLAGS="$RPM_OPT_FLAGS" make popd From fedora-extras-commits at redhat.com Sun Mar 2 19:58:17 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 2 Mar 2008 19:58:17 GMT Subject: rpms/php-pecl-xdebug/F-8 php-pecl-xdebug.spec,1.10,1.11 Message-ID: <200803021958.m22JwH1b002048@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pecl-xdebug/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1971/F-8 Modified Files: php-pecl-xdebug.spec Log Message: make spec compatible with el5 Index: php-pecl-xdebug.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-xdebug/F-8/php-pecl-xdebug.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- php-pecl-xdebug.spec 2 Mar 2008 19:32:37 -0000 1.10 +++ php-pecl-xdebug.spec 2 Mar 2008 19:57:42 -0000 1.11 @@ -15,17 +15,21 @@ Source0: http://pecl.php.net/get/xdebug-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: php-devel php-pear >= 1:1.4.9-1.2 -BuildRequires: libedit-devel automake +BuildRequires: automake php-devel php-pear >= 1:1.4.9-1.2 +%if 0%{?fedora} +BuildRequires: libedit-devel +%endif Requires(post): %{__pecl} Requires(postun): %{__pecl} Provides: php-pecl(Xdebug) = %{version} -%if %{?php_zend_api}0 +%if 0%{?php_zend_api} +%define config_flags --with-libedit Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} %else # for EL-5 +%define config_flags --without-libedit Requires: php-api = %{php_apiver} %endif @@ -49,10 +53,12 @@ phpize %configure --enable-xdebug CFLAGS="$RPM_OPT_FLAGS" make + +# Build debugclient pushd debugclient cp %{_datadir}/automake*/depcomp . chmod +x configure -%configure --with-libedit +%configure %{config_flags} CFLAGS="$RPM_OPT_FLAGS" make popd From fedora-extras-commits at redhat.com Sun Mar 2 19:58:26 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sun, 2 Mar 2008 19:58:26 GMT Subject: rpms/php-pecl-xdebug/devel php-pecl-xdebug.spec,1.11,1.12 Message-ID: <200803021958.m22JwQc5002051@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pecl-xdebug/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1971/devel Modified Files: php-pecl-xdebug.spec Log Message: make spec compatible with el5 Index: php-pecl-xdebug.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-xdebug/devel/php-pecl-xdebug.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- php-pecl-xdebug.spec 2 Mar 2008 19:32:47 -0000 1.11 +++ php-pecl-xdebug.spec 2 Mar 2008 19:57:48 -0000 1.12 @@ -15,17 +15,21 @@ Source0: http://pecl.php.net/get/xdebug-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: php-devel php-pear >= 1:1.4.9-1.2 -BuildRequires: libedit-devel automake +BuildRequires: automake php-devel php-pear >= 1:1.4.9-1.2 +%if 0%{?fedora} +BuildRequires: libedit-devel +%endif Requires(post): %{__pecl} Requires(postun): %{__pecl} Provides: php-pecl(Xdebug) = %{version} -%if %{?php_zend_api}0 +%if 0%{?php_zend_api} +%define config_flags --with-libedit Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} %else # for EL-5 +%define config_flags --without-libedit Requires: php-api = %{php_apiver} %endif @@ -49,10 +53,12 @@ phpize %configure --enable-xdebug CFLAGS="$RPM_OPT_FLAGS" make + +# Build debugclient pushd debugclient cp %{_datadir}/automake*/depcomp . chmod +x configure -%configure --with-libedit +%configure %{config_flags} CFLAGS="$RPM_OPT_FLAGS" make popd From fedora-extras-commits at redhat.com Sun Mar 2 20:02:56 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 20:02:56 GMT Subject: rpms/libgdl/F-8 libgdl-0.7.10-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libgdl.spec, 1.4, 1.5 sources, 1.3, 1.4 libgdl-0.7.8-pkgconfig.patch, 1.1, NONE Message-ID: <200803022002.m22K2uAw009306@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libgdl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9269 Modified Files: .cvsignore libgdl.spec sources Added Files: libgdl-0.7.10-pkgconfig.patch Removed Files: libgdl-0.7.8-pkgconfig.patch Log Message: Updated to 0.7.10-1 in F-8. Modified Files: .cvsignore libgdl.spec sources Added Files: libgdl-0.7.10-pkgconfig.patch Removed Files: libgdl-0.7.8-pkgconfig.patch libgdl-0.7.10-pkgconfig.patch: --- NEW FILE libgdl-0.7.10-pkgconfig.patch --- diff -urNp gdl-0.7.10.orig/gdl-1.0.pc.in gdl-0.7.10/gdl-1.0.pc.in --- gdl-0.7.10.orig/gdl-1.0.pc.in 2007-05-07 18:40:12.000000000 +0530 +++ gdl-0.7.10/gdl-1.0.pc.in 2008-03-02 20:48:50.000000000 +0530 @@ -7,6 +7,6 @@ idldir=@datadir@/idl/libgdl-1.0 Name: gdl Description: Gnome DevTool Libraries Version: @VERSION@ -Requires: gtk+-2.0 libxml-2.0 libglade-2.0 +Requires: gtk+-2.0 Libs: -L${libdir} -lgdl-1 Cflags: -I${includedir} diff -urNp gdl-0.7.10.orig/gdl-gnome-1.0.pc.in gdl-0.7.10/gdl-gnome-1.0.pc.in --- gdl-0.7.10.orig/gdl-gnome-1.0.pc.in 2007-05-07 18:40:12.000000000 +0530 +++ gdl-0.7.10/gdl-gnome-1.0.pc.in 2008-03-02 20:48:50.000000000 +0530 @@ -7,6 +7,6 @@ idldir=@datadir@/idl/libgdl-1.0 Name: gdl-gnome Description: Gnome DevTool Libraries - Gnome part Version: @VERSION@ -Requires: libgnomeui-2.0 gnome-vfs-2.0 gtk+-2.0 gdl-1.0 +Requires: gtk+-2.0 gdl-1.0 Libs: -L${libdir} -lgdl-gnome-1 Cflags: -I${includedir} Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jan 2008 19:57:29 -0000 1.3 +++ .cvsignore 2 Mar 2008 20:02:21 -0000 1.4 @@ -1 +1 @@ -gdl-0.7.8.tar.gz +gdl-0.7.10.tar.gz Index: libgdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/F-8/libgdl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libgdl.spec 2 Feb 2008 20:46:16 -0000 1.4 +++ libgdl.spec 2 Mar 2008 20:02:21 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Components and library for GNOME development tools Name: libgdl -Version: 0.7.8 -Release: 2%{?dist} +Version: 0.7.10 +Release: 1%{?dist} # Mixed source licensing scenario. License: (GPLv2 and GPLv2+ and LGPLv2+) Group: Development/Libraries @@ -16,10 +16,14 @@ Provides: anjuta-gdl = %{version}-%{release} Obsoletes: anjuta-gdl < 0.7.7-1 -BuildRequires: chrpath +%if 0%{?fc7} +BuildRequires: gtk-doc +%endif + BuildRequires: gettext BuildRequires: intltool BuildRequires: libgnomeui-devel +BuildRequires: libtool BuildRequires: perl(XML::Parser) %description @@ -41,6 +45,7 @@ Provides: anjuta-gdl-devel = %{version}-%{release} Obsoletes: anjuta-gdl-devel < 0.7.7-1 +Requires: gtk-doc Requires: gtk2-devel Requires: %{name} = %{version}-%{release} Requires: pkgconfig @@ -53,7 +58,11 @@ %patch0 -p1 %build -%configure --disable-static +%configure --disable-static --enable-gtk-doc + +# Fix Libtool to remove rpaths. +rm -f ./libtool +cp %{_bindir}/libtool . # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool @@ -65,12 +74,10 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -delete +find $RPM_BUILD_ROOT -type f -name "*.a" -delete %find_lang gdl-1 -# Remove rpaths. -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gnome-1.so.0.0.0 - %clean rm -rf $RPM_BUILD_ROOT @@ -99,10 +106,20 @@ %{_libdir}/pkgconfig/gdl-1.0.pc %{_libdir}/pkgconfig/gdl-gnome-1.0.pc +%dir %{_datadir}/gtk-doc/html/gdl +%{_datadir}/gtk-doc/html/gdl/* + %dir %{_includedir}/%{name}-1.0 %{_includedir}/%{name}-1.0/gdl %changelog +* Sun Mar 02 2008 Debarshi Ray - 0.7.10-1 +- Version bump to 0.7.10. +- Added 'BuildRequires: gtk-doc' on Fedora 7. +- Added 'Requires: gtk-doc' for libgdl-devel. +- Replaced 'BuildRequires: chrpath' with 'BuildRequires: libtool' for removing + rpaths. + * Sun Feb 03 2008 Debarshi Ray - 0.7.8-2 - Omitted unused direct shared library dependencies. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jan 2008 19:57:29 -0000 1.3 +++ sources 2 Mar 2008 20:02:21 -0000 1.4 @@ -1 +1 @@ -a54dbe53f6b2c6b196c24ea2285b0cea gdl-0.7.8.tar.gz +d1d712b65489976f6bd434954afd4e9c gdl-0.7.10.tar.gz --- libgdl-0.7.8-pkgconfig.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 20:04:51 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 20:04:51 GMT Subject: rpms/libgdl/F-7 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200803022004.m22K4pgt009389@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libgdl/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9364 Modified Files: .cvsignore sources Log Message: Fixed Spec in F-7. Modified Files: .cvsignore sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/F-7/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jan 2008 19:54:04 -0000 1.3 +++ .cvsignore 2 Mar 2008 20:04:12 -0000 1.4 @@ -1 +1 @@ -gdl-0.7.8.tar.gz +gdl-0.7.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/F-7/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jan 2008 19:54:04 -0000 1.3 +++ sources 2 Mar 2008 20:04:12 -0000 1.4 @@ -1 +1 @@ -a54dbe53f6b2c6b196c24ea2285b0cea gdl-0.7.8.tar.gz +d1d712b65489976f6bd434954afd4e9c gdl-0.7.10.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 20:10:51 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Sun, 2 Mar 2008 20:10:51 GMT Subject: rpms/libgdl/devel libgdl-0.7.10-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libgdl.spec, 1.4, 1.5 sources, 1.3, 1.4 libgdl-0.7.8-pkgconfig.patch, 1.1, NONE Message-ID: <200803022010.m22KAp2Q009565@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libgdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9537 Modified Files: .cvsignore libgdl.spec sources Added Files: libgdl-0.7.10-pkgconfig.patch Removed Files: libgdl-0.7.8-pkgconfig.patch Log Message: Updated to 0.7.10-1 in devel. Modified Files: .cvsignore libgdl.spec sources Added Files: libgdl-0.7.10-pkgconfig.patch Removed Files: libgdl-0.7.8-pkgconfig.patch libgdl-0.7.10-pkgconfig.patch: --- NEW FILE libgdl-0.7.10-pkgconfig.patch --- diff -urNp gdl-0.7.10.orig/gdl-1.0.pc.in gdl-0.7.10/gdl-1.0.pc.in --- gdl-0.7.10.orig/gdl-1.0.pc.in 2007-05-07 18:40:12.000000000 +0530 +++ gdl-0.7.10/gdl-1.0.pc.in 2008-03-02 20:48:50.000000000 +0530 @@ -7,6 +7,6 @@ idldir=@datadir@/idl/libgdl-1.0 Name: gdl Description: Gnome DevTool Libraries Version: @VERSION@ -Requires: gtk+-2.0 libxml-2.0 libglade-2.0 +Requires: gtk+-2.0 Libs: -L${libdir} -lgdl-1 Cflags: -I${includedir} diff -urNp gdl-0.7.10.orig/gdl-gnome-1.0.pc.in gdl-0.7.10/gdl-gnome-1.0.pc.in --- gdl-0.7.10.orig/gdl-gnome-1.0.pc.in 2007-05-07 18:40:12.000000000 +0530 +++ gdl-0.7.10/gdl-gnome-1.0.pc.in 2008-03-02 20:48:50.000000000 +0530 @@ -7,6 +7,6 @@ idldir=@datadir@/idl/libgdl-1.0 Name: gdl-gnome Description: Gnome DevTool Libraries - Gnome part Version: @VERSION@ -Requires: libgnomeui-2.0 gnome-vfs-2.0 gtk+-2.0 gdl-1.0 +Requires: gtk+-2.0 gdl-1.0 Libs: -L${libdir} -lgdl-gnome-1 Cflags: -I${includedir} Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jan 2008 20:00:36 -0000 1.3 +++ .cvsignore 2 Mar 2008 20:10:10 -0000 1.4 @@ -1 +1 @@ -gdl-0.7.8.tar.gz +gdl-0.7.10.tar.gz Index: libgdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/devel/libgdl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libgdl.spec 2 Feb 2008 20:49:47 -0000 1.4 +++ libgdl.spec 2 Mar 2008 20:10:10 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Components and library for GNOME development tools Name: libgdl -Version: 0.7.8 -Release: 2%{?dist} +Version: 0.7.10 +Release: 1%{?dist} # Mixed source licensing scenario. License: (GPLv2 and GPLv2+ and LGPLv2+) Group: Development/Libraries @@ -16,10 +16,14 @@ Provides: anjuta-gdl = %{version}-%{release} Obsoletes: anjuta-gdl < 0.7.7-1 -BuildRequires: chrpath +%if 0%{?fc7} +BuildRequires: gtk-doc +%endif + BuildRequires: gettext BuildRequires: intltool BuildRequires: libgnomeui-devel +BuildRequires: libtool BuildRequires: perl(XML::Parser) %description @@ -41,6 +45,7 @@ Provides: anjuta-gdl-devel = %{version}-%{release} Obsoletes: anjuta-gdl-devel < 0.7.7-1 +Requires: gtk-doc Requires: gtk2-devel Requires: %{name} = %{version}-%{release} Requires: pkgconfig @@ -53,7 +58,11 @@ %patch0 -p1 %build -%configure --disable-static +%configure --disable-static --enable-gtk-doc + +# Fix Libtool to remove rpaths. +rm -f ./libtool +cp %{_bindir}/libtool . # Omit unused direct shared library dependencies. sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool @@ -65,12 +74,10 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -delete +find $RPM_BUILD_ROOT -type f -name "*.a" -delete %find_lang gdl-1 -# Remove rpaths. -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gnome-1.so.0.0.0 - %clean rm -rf $RPM_BUILD_ROOT @@ -99,10 +106,20 @@ %{_libdir}/pkgconfig/gdl-1.0.pc %{_libdir}/pkgconfig/gdl-gnome-1.0.pc +%dir %{_datadir}/gtk-doc/html/gdl +%{_datadir}/gtk-doc/html/gdl/* + %dir %{_includedir}/%{name}-1.0 %{_includedir}/%{name}-1.0/gdl %changelog +* Sun Mar 02 2008 Debarshi Ray - 0.7.10-1 +- Version bump to 0.7.10. +- Added 'BuildRequires: gtk-doc' on Fedora 7. +- Added 'Requires: gtk-doc' for libgdl-devel. +- Replaced 'BuildRequires: chrpath' with 'BuildRequires: libtool' for removing + rpaths. + * Sun Feb 03 2008 Debarshi Ray - 0.7.8-2 - Omitted unused direct shared library dependencies. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jan 2008 20:00:36 -0000 1.3 +++ sources 2 Mar 2008 20:10:10 -0000 1.4 @@ -1 +1 @@ -a54dbe53f6b2c6b196c24ea2285b0cea gdl-0.7.8.tar.gz +d1d712b65489976f6bd434954afd4e9c gdl-0.7.10.tar.gz --- libgdl-0.7.8-pkgconfig.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 2 20:25:06 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sun, 2 Mar 2008 20:25:06 GMT Subject: rpms/libgadu/F-8 .cvsignore, 1.4, 1.5 libgadu.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200803022025.m22KP6xL009846@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/libgadu/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9824 Modified Files: .cvsignore libgadu.spec sources Log Message: - updated to 1.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgadu/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2008 15:18:33 -0000 1.4 +++ .cvsignore 2 Mar 2008 20:24:30 -0000 1.5 @@ -1 +1 @@ -libgadu-1.7.2.tar.gz +libgadu-1.8.0.tar.gz Index: libgadu.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgadu/F-8/libgadu.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libgadu.spec 16 Feb 2008 15:18:33 -0000 1.4 +++ libgadu.spec 2 Mar 2008 20:24:30 -0000 1.5 @@ -1,5 +1,5 @@ Name: libgadu -Version: 1.7.2 +Version: 1.8.0 Release: 1%{?dist} Summary: A Gadu-gadu protocol compatible communications library License: LGPLv2 @@ -69,6 +69,9 @@ %{_libdir}/pkgconfig/* %changelog +* Sun Feb 24 2008 Dominik Mierzejewski 1.8.0-1 +- updated to 1.8.0 + * Sat Feb 16 2008 Dominik Mierzejewski 1.7.2-1 - updated to 1.7.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgadu/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2008 15:18:33 -0000 1.4 +++ sources 2 Mar 2008 20:24:30 -0000 1.5 @@ -1 +1 @@ -548bd7328984fdf0528355f4824243ac libgadu-1.7.2.tar.gz +a5257e6f2cd5e309837f5fe567e9b94a libgadu-1.8.0.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 20:26:09 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Sun, 2 Mar 2008 20:26:09 GMT Subject: rpms/libgadu/F-7 .cvsignore, 1.4, 1.5 libgadu.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200803022026.m22KQ9xG009887@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/libgadu/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9852 Modified Files: .cvsignore libgadu.spec sources Log Message: - updated to 1.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgadu/F-7/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2008 15:18:29 -0000 1.4 +++ .cvsignore 2 Mar 2008 20:25:32 -0000 1.5 @@ -1 +1 @@ -libgadu-1.7.2.tar.gz +libgadu-1.8.0.tar.gz Index: libgadu.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgadu/F-7/libgadu.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libgadu.spec 16 Feb 2008 15:18:29 -0000 1.3 +++ libgadu.spec 2 Mar 2008 20:25:32 -0000 1.4 @@ -1,5 +1,5 @@ Name: libgadu -Version: 1.7.2 +Version: 1.8.0 Release: 1%{?dist} Summary: A Gadu-gadu protocol compatible communications library License: LGPLv2 @@ -70,6 +70,9 @@ %{_libdir}/pkgconfig/* %changelog +* Sun Feb 24 2008 Dominik Mierzejewski 1.8.0-1 +- updated to 1.8.0 + * Sat Feb 16 2008 Dominik Mierzejewski 1.7.2-1 - updated to 1.7.2 - updated license tag Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgadu/F-7/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2008 15:18:29 -0000 1.4 +++ sources 2 Mar 2008 20:25:32 -0000 1.5 @@ -1 +1 @@ -548bd7328984fdf0528355f4824243ac libgadu-1.7.2.tar.gz +a5257e6f2cd5e309837f5fe567e9b94a libgadu-1.8.0.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 20:31:50 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sun, 2 Mar 2008 20:31:50 GMT Subject: rpms/hdf/devel hdf.spec,1.24,1.25 Message-ID: <200803022031.m22KVoU0010023@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/hdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10003 Modified Files: hdf.spec Log Message: * Sun Mar 2 2008 Patrice Dumas 4.2r3-2 - don't ship an empty netcdf.h file. The related definitions are now in hdf4_netcdf.h Index: hdf.spec =================================================================== RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- hdf.spec 8 Feb 2008 16:51:55 -0000 1.24 +++ hdf.spec 2 Mar 2008 20:31:05 -0000 1.25 @@ -1,6 +1,6 @@ Name: hdf Version: 4.2r3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries @@ -46,8 +46,8 @@ chmod a-x *hdf/*/*.c hdf/*/*.h # restore include file timestamps modified by patching -touch -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h -touch -r ./mfhdf/libsrc/config/netcdf-linux.h.ppc ./mfhdf/libsrc/config/netcdf-linux.h +touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h +touch -c -r ./mfhdf/libsrc/config/netcdf-linux.h.ppc ./mfhdf/libsrc/config/netcdf-linux.h %build @@ -60,18 +60,15 @@ make # correct the timestamps based on files used to generate the header files -touch -r ./mfhdf/fortran/config/netcdf-linux.inc mfhdf/fortran/netcdf.inc -touch -r ./mfhdf/libsrc/config/netcdf-linux.h mfhdf/libsrc/netcdf.h -touch -r hdf/src/hdf.inc hdf/src/hdf.f90 -touch -r hdf/src/dffunc.inc hdf/src/dffunc.f90 -touch -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90 +touch -c -r ./mfhdf/fortran/config/netcdf-linux.inc mfhdf/fortran/netcdf.inc +touch -c -r hdf/src/hdf.inc hdf/src/hdf.f90 +touch -c -r hdf/src/dffunc.inc hdf/src/dffunc.f90 +touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90 # netcdf fortran include need same treatement, but they are not shipped %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' -# install netcdf.h it is needed for definition of sd_nc* symbols -install -p -m0644 mfhdf/libsrc/netcdf.h $RPM_BUILD_ROOT%{_includedir}/hdf/ #Don't conflict with netcdf #rm $RPM_BUILD_ROOT%{_bindir}/nc* $RPM_BUILD_ROOT%{_mandir}/man1/nc* for file in ncdump ncgen; do @@ -81,13 +78,13 @@ done # this is done to have the same timestamp on multiarch setups -touch -r README $RPM_BUILD_ROOT/%{_includedir}/hdf/h4config.h +touch -c -r README $RPM_BUILD_ROOT/%{_includedir}/hdf/h4config.h # Remove an autoconf conditional from the API that is unused and cause # the API to be different on x86 and x86_64 pushd $RPM_BUILD_ROOT/%{_includedir}/hdf grep -v 'H4_SIZEOF_INTP' h4config.h > h4config.h.tmp -touch -r h4config.h h4config.h.tmp +touch -c -r h4config.h h4config.h.tmp mv h4config.h.tmp h4config.h popd @@ -112,6 +109,10 @@ %changelog +* Sun Mar 2 2008 Patrice Dumas 4.2r3-2 +- don't ship an empty netcdf.h file. The related definitions are now + in hdf4_netcdf.h + * Tue Feb 5 2008 Orion Poplawski 4.2.r3-1 - Update to 4.2r3 From fedora-extras-commits at redhat.com Sun Mar 2 20:41:24 2008 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Sun, 2 Mar 2008 20:41:24 GMT Subject: rpms/libmtp/devel .cvsignore, 1.13, 1.14 libmtp.spec, 1.17, 1.18 sources, 1.13, 1.14 Message-ID: <200803022041.m22KfOhR010252@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libmtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10214 Modified Files: .cvsignore libmtp.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 8 Jan 2008 23:14:46 -0000 1.13 +++ .cvsignore 2 Mar 2008 20:40:50 -0000 1.14 @@ -1 +1 @@ -libmtp-0.2.5.tar.gz +libmtp-0.2.6.tar.gz Index: libmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libmtp.spec 9 Feb 2008 22:12:21 -0000 1.17 +++ libmtp.spec 2 Mar 2008 20:40:50 -0000 1.18 @@ -1,9 +1,9 @@ -# SPEC file for libmtp, primary target is the Fedora Extras +# SPEC file for libmtp, primary target is the Fedora # RPM repository. Name: libmtp -Version: 0.2.5 -Release: 2%{?dist} +Version: 0.2.6 +Release: 1%{?dist} Summary: A software library for MTP media players URL: http://libmtp.sourceforge.net/ @@ -108,6 +108,9 @@ %changelog +* Sun Mar 2 2008 Linus Walleij 0.2.6-1 +- New upstream release. + * Sat Feb 9 2008 Linus Walleij 0.2.5-2 - Rebuild for GCC 4.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmtp/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Jan 2008 23:14:46 -0000 1.13 +++ sources 2 Mar 2008 20:40:50 -0000 1.14 @@ -1 +1 @@ -b76b707808c90288a57b2084424ad0c4 libmtp-0.2.5.tar.gz +a320b724a00ff17d97e7ccbf74ad01f0 libmtp-0.2.6.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 20:42:27 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Sun, 2 Mar 2008 20:42:27 GMT Subject: rpms/kadu/F-8 .cvsignore, 1.11, 1.12 kadu.spec, 1.24, 1.25 sources, 1.13, 1.14 Message-ID: <200803022042.m22KgR1P010354@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/kadu/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10313 Modified Files: .cvsignore kadu.spec sources Log Message: * Thu Feb 28 2008 Micha?? Bentkowski - 0.6.0-1 - Stable - New versions of osdhints_notify, audacious_mediaplayer, filtering, mediaplayer and panelkadu Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kadu/F-8/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 6 Jan 2008 12:21:07 -0000 1.11 +++ .cvsignore 2 Mar 2008 20:41:54 -0000 1.12 @@ -1,17 +1,26 @@ -agent-0.4.3.tar.gz +agent-0.4.4.tar.gz amarok_mediaplayer-20071220.tar.bz2 ao_sound-20060424.tar.bz2 +audacious_mediaplayer-20080224.tar.bz2 dcopexport-0.11.3-20071129-0.6.0.tar.bz2 -filedesc-20071221.tar.bz2 -kadu-0.6.0-beta2.tar.bz2 +falf_mediaplayer-20071225.tar.bz2 +filedesc-20080104.tar.bz2 +filtering-20080224.tar.bz2 +kadu-0.6.0.tar.bz2 +kadu-firewall-0.7.5.tar.bz2 +kadu-osdhints_notify-0.4.0.9.tar.bz2 +kadu-pcspeaker-0.6.0.3.tar.bz2 kadu-profiles-0.3.1.tar.bz2 -kadu-tabs-1.1.1.tar.bz2 -led_notify-0.13.tar.bz2 -mediaplayer-20071220.tar.bz2 +kadu-tabs-1.1.4.tar.bz2 +led_notify-0.18.tar.bz2 +mail-0.3.3.tar.bz2 +mediaplayer-20080224.tar.bz2 miastoplusa_sms-0.6-1.3.9.tar.gz -screenshot-20071216.tar.bz2 -spellchecker-20071220.tar.bz2 -weather-3.07.tar.bz2 -xmms_mediaplayer-20071220.tar.bz2 -audacious_mediaplayer-20071220.tar.bz2 -kadu-pcspeaker-0.6.0.2.tar.bz2 +mime_tex-1.4.1.tar.bz2 +mx610_notify-0.3.1.tar.bz2 +panelkadu-0.6-beta3.tar.gz +screenshot-20080104.tar.bz2 +spellchecker-20071230.tar.bz2 +water_notify-0.1.1-try2.tar.bz2 +weather-3.13.tar.bz2 +xmms_mediaplayer-20080116.tar.bz2 Index: kadu.spec =================================================================== RCS file: /cvs/extras/rpms/kadu/F-8/kadu.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- kadu.spec 6 Jan 2008 12:21:07 -0000 1.24 +++ kadu.spec 2 Mar 2008 20:41:54 -0000 1.25 @@ -1,5 +1,3 @@ -%define alphatag beta2 - # unpack_module_source(): # we check if we should build a given package # if so, we unpack sources and add entry to config @@ -44,20 +42,30 @@ # kadu.spec # table to make it possible to find out quickly which # subpackage has which source's number +# LAST NUMBER: 125 # 116 agent # 101 amarok_mediaplayer # 102 ao_sound # 103 audacious_mediaplayer # 104 dcopexport +# 117 falf_mediaplayer # 105 filedesc +# 121 filtering +# 122 firewall # 106 led_notify +# 118 mail # 107 mediaplayer # 108 miastoplusa_sms +# 119 mime_tex +# 120 mx610_notify +# 124 osdhints_notify +# 123 panelkadu # 109 pcspeaker # 110 profiles # 111 screenshot # 112 spellchecker # 113 tabs +# 125 water_notify # 114 weather # 115 xmms_mediaplayer # the modules above aren't all external modules @@ -71,14 +79,19 @@ # dcopexport # esd_sound # filedesc +# filtering +# firewall # led_notify # mediaplayer # miastoplusa_sms +# osdhints_notify +# panelkadu # pcspeaker # profiles # screenshot # spellchecker # tabs +# water_notify # weather # xmms_mediaplayer @@ -89,102 +102,135 @@ %bcond_without amarok_mediaplayer %bcond_without ao_sound %bcond_without arts_sound -%bcond_with audacious_mediaplayer +%bcond_without audacious_mediaplayer %bcond_without dcopexport %bcond_without esd_sound +%bcond_without falf_mediaplayer %bcond_without filedesc +%bcond_without filtering +%bcond_without firewall %bcond_without led_notify +%bcond_without mail %bcond_without mediaplayer +%bcond_without mime_tex %bcond_without miastoplusa_sms +%bcond_without mx610_notify +%bcond_without osdhints_notify +%bcond_without panelkadu %bcond_without pcspeaker %bcond_without profiles %bcond_without screenshot %bcond_without spellchecker %bcond_without tabs +%bcond_without water_notify %bcond_without weather %bcond_without xmms_mediaplayer # doesn't build right now -%bcond_with existing_libgadu # current release of libgadu is too old +%bcond_without existing_libgadu # current release of libgadu is too old # to work properly. Until there's no new release, we must use # internal libgadu of kadu. Name: kadu Version: 0.6.0 -Release: 0.6.%{alphatag}%{?dist} +Release: 1%{?dist} Summary: An Gadu-Gadu client for online messaging Summary(pl): Klient Gadu-Gadu Group: Applications/Internet License: GPLv2 URL: http://www.kadu.net -Source0: http://www.kadu.net/download/stable/kadu-%{version}-%{alphatag}.tar.bz2 +Source0: http://www.kadu.net/download/stable/kadu-%{version}.tar.bz2 Source3: kadu.desktop # external modules: %if %{with agent} -Source116: http://misiek.jah.pl/assets/2007/12/27/agent-0.4.3.tar.gz +Source116: http://misiek.jah.pl/assets/2008/2/8/agent-0.4.4.tar.gz %endif %if %{with amarok_mediaplayer} Source101: http://www.kadu.net/download/modules_extra/amarok_mediaplayer/amarok_mediaplayer-20071220.tar.bz2 %endif %if %{with ao_sound} -Source102: http://www.kadu.net/~joi/ao_sound/packages/ao_sound-20060424.tar.bz2 +Source102: http://www.kadu.net/~joi/ao_sound/packages/ao_sound-20060424.tar.bz2 %endif %if %{with audacious_mediaplayer} -Source103: http://www.kadu.net/download/modules_extra/audacious_mediaplayer/audacious_mediaplayer-20071220.tar.bz2 +Source103: http://www.kadu.net/download/modules_extra/audacious_mediaplayer/audacious_mediaplayer-20080224.tar.bz2 %endif %if %{with dcopexport} Source104: http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.3-20071129-0.6.0.tar.bz2 %endif +%if %{with falf_mediaplayer} +Source117: http://www.kadu.net/download/modules_extra/falf_mediaplayer/falf_mediaplayer-20071225.tar.bz2 +%endif %if %{with filedesc} -Source105: http://www.kadu.net/download/modules_extra/filedesc/filedesc-20071221.tar.bz2 +Source105: http://www.kadu.net/download/modules_extra/filedesc/filedesc-20080104.tar.bz2 +%endif +%if %{with filtering} +Source121: http://www.kadu.net/download/modules_extra/filtering/filtering-20080224.tar.bz2 +%endif +%if %{with firewall} +Source122: http://www.kadu.net/~dorr/moduly/kadu-firewall-0.7.5.tar.bz2 %endif %if %{with led_notify} -Source106: http://kadu.net/~blysk/led_notify-0.13.tar.bz2 +Source106: http://kadu.net/~blysk/led_notify-0.18.tar.bz2 +%endif +%if %{with mail} +Source118: http://www.kadu.net/~weagle/mail/mail-0.3.3.tar.bz2 %endif %if %{with mediaplayer} -Source107: http://www.kadu.net/download/modules_extra/mediaplayer/mediaplayer-20071220.tar.bz2 +Source107: http://www.kadu.net/download/modules_extra/mediaplayer/mediaplayer-20080224.tar.bz2 %endif %if %{with miastoplusa_sms} Source108: http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.6-1.3.9.tar.gz %endif +%if %{with mime_tex} +Source119: http://kadu.net/~patryk/mime_tex/mime_tex-1.4.1.tar.bz2 +%endif +%if %{with mx610_notify} +Source120: http://kadu.jarzebski.pl/mx610_notify-0.3.1.tar.bz2 +%endif +%if %{with osdhints_notify} +Source124: http://www.kadu.net/~dorr/moduly/kadu-osdhints_notify-0.4.0.9.tar.bz2 +%endif +%if %{with panelkadu} +Source123: http://www.ultr.pl/kadu/panelkadu-0.6-beta3.tar.gz +%endif %if %{with pcspeaker} -Source109: http://kadu.net/~dorr/kadu-pcspeaker-0.6.0.2.tar.bz2 +Source109: http://kadu.net/~dorr/moduly/kadu-pcspeaker-0.6.0.3.tar.bz2 %endif %if %{with profiles} -Source110: http://www.kadu.net/~dorr/kadu-profiles-0.3.1.tar.bz2 +Source110: http://www.kadu.net/~dorr/moduly/kadu-profiles-0.3.1.tar.bz2 %endif %if %{with screenshot} -Source111: http://www.kadu.net/download/modules_extra/screenshot/screenshot-20071216.tar.bz2 +Source111: http://www.kadu.net/download/modules_extra/screenshot/screenshot-20080104.tar.bz2 %endif %if %{with spellchecker} -Source112: http://www.kadu.net/download/modules_extra/spellchecker/spellchecker-20071220.tar.bz2 +Source112: http://www.kadu.net/download/modules_extra/spellchecker/spellchecker-20071230.tar.bz2 %endif %if %{with tabs} -Source113: http://www.kadu.net/~arvenil/tabs/download/0.6.0/kadu-tabs-1.1.1.tar.bz2 +Source113: http://www.kadu.net/~arvenil/tabs/download/0.6.0/kadu-tabs-1.1.4.tar.bz2 +%endif +%if %{with water_notify} +Source125: http://kadu.jarzebski.pl/water_notify-0.1.1-try2.tar.bz2 %endif %if %{with weather} -Source114: http://kadu.net/~blysk/weather-3.07.tar.bz2 +Source114: http://kadu.net/~blysk/weather-3.13.tar.bz2 %endif %if %{with xmms_mediaplayer} -Source115: http://www.kadu.net/download/modules_extra/xmms_mediaplayer/xmms_mediaplayer-20071220.tar.bz2 +Source115: http://www.kadu.net/download/modules_extra/xmms_mediaplayer/xmms_mediaplayer-20080116.tar.bz2 %endif -Patch0: kadu-0.6.0-xmmsfix.patch +#Patch0: kadu-0.6.0-xmmsfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpng-devel qt-devel libsndfile-devel openssl-devel %if %{with existing_libgadu} BuildRequires: libgadu-devel %endif -Obsoletes: kadu-xmms < 0.6.0-0.1.alpha1 -Obsoletes: kadu-mail < 0.6.0-0.1.alpha1 Obsoletes: kadu-extinfo < 0.6.0-0.1.alpha1 Obsoletes: kadu-iwait4u < 0.6.0-0.1.alpha1 Obsoletes: kadu-powerkadu < 0.6.0-0.1.alpha1 -Obsoletes: kadu-osdhints_notify < 0.6.0-0.1.alpha1 -Obsoletes: kadu-firewall < 0.6.0-0.1.alpha1 Obsoletes: kadu-advanced_userlist < 0.6.0-0.1.alpha1 -Provides: kadu-advanced_userlist = {version}-%{release} -Obsoletes: kadu-filedesc < 0.6.0-0.1.alpha1 +Provides: kadu-advanced_userlist = %{version}-%{release} +Obsoletes: kadu-exec_notify < 0.6.0-0.1.alpha1 +Provides: kadu-exec_notify = %{version}-%{release} %description Kadu is a dynamically evolving instant messenger compatible with the Gadu-Gadu @@ -247,6 +293,8 @@ Group: Applications/Internet Requires: %{name} = %{version}-%{release} Requires: kadu-mediaplayer = %{version}-%{release} +Obsoletes: kadu-amarok < 0.6.0-0.1.alpha1 +Provides: kadu-amarok = %{version}-%{release} BuildRequires: kdelibs3-devel %description amarok_mediaplayer Amarok_mediaplayer is a module to put title of current song from Amarok in @@ -294,7 +342,7 @@ Summary: Audacious support in mediaplayer module Summary(pl): Wsparcie dla Audacious w module mediaplayer Group: Applications/Internet -BuildRequires: audacious-devel +BuildRequires: audacious-devel dbus-glib-devel Requires: %{name} = %{version}-%{release} Requires: kadu-mediaplayer = %{version}-%{release} @@ -314,7 +362,7 @@ Summary(pl): Eksport kilku funkcji poprzez DCOP Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Requires: kdelibs3-devel +BuildRequires: kdelibs3-devel %description dcopexport Dcopexport is a module to export some Kadu functions using DCOP, e.g. it allows you to use gg://xxx links. @@ -340,6 +388,22 @@ %endif +%if %{with falf_mediaplayer} +%package falf_mediaplayer +Summary: FALF support in mediaplayer module +Summary(pl): Wsparcie dla FALF w module mediaplayer +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description falf_mediaplayer +Falf_mediaplayer is a module to put title of current song from +FALF in your status + +%description falf_mediaplayer -l pl +Falf_mediaplayer to modu?? umo??liwiaj??cy umieszczenie tytu??u aktualnie +s??uchanej piosenki w FALF w opisie. + +%endif + %if %{with filedesc} %package filedesc Summary: Get status from file @@ -354,6 +418,37 @@ %endif +%if %{with filtering} +%package filtering +Summary: User list filtering +Summary(pl): Filtrowanie listy kontakt??w +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description filtering +Filtering is a module to filter visible contacts in user list. + +%description filtering -l pl +Filtering to modu?? umo??liwiaj??cy filtrowanie widocznych +kontakt??w na li??cie. + +%endif + +%if %{with firewall} +%package firewall +Summary: Protection against unwanted chats +Summary(pl): Ochrona przed niechcianymi rozmowami +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description firewall +Firewall is a module to ask a simple question to unknown +interlocutor. + +%description firewall -l pl +Firwall to modu?? zadaj??cy proste, zdefiniowane pytanie +nieznajomym rozm??wcom. + +%endif + %if %{with led_notify} %package led_notify Summary: Notification by Scroll Lock LED @@ -371,6 +466,20 @@ %endif +%if %{with mail} +%package mail +Summary: Mail checking module +Summary(pl): Modu?? do sprawdzania poczty +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description mail +Mail is a module to check whether there are new mails. + +%description mail -l pl +Mail to modu?? do sprawdzania czy s?? nowe maile. + +%endif + %if %{with mediaplayer} %package mediaplayer Summary: Put a current song name in status @@ -402,6 +511,69 @@ %endif +%if %{with mime_tex} +%package mime_tex +Summary: TeX formulas support +Summary(pl): Obs??uga formu?? matematycznych TeX +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description mime_tex +Mime_tex is a module to edit TeX mathematic formulas in chat window. + +%description mime_tex -l pl +Mime_tex to modu?? umo??liwiaj??cy edycj?? formu?? matematycznych TeX +w oknie rozmowy. + +%endif + +%if %{with mx610_notify} +%package mx610_notify +Summary: Notify with LED on Logitech MX610 mouse +Summary(pl): Powiadamianie diodami LED w myszce Logitech MX610 +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description mx610_notify +Mx610_notify is a module to notify user of some events using LED +on Logitech MX610 mouse. + +%description mx610_notify -l pl +Mx610_notify to modu?? umo??liwiaj??cy powiadamianie u??ytkownika +o pewnych zdarzeniach przy pomocy diod LED myszki Logitech MX610. + +%endif + +%if %{with osdhints_notify} +%package osdhints_notify +Summary: Notification by OSD-like hints +Summary(pl): Powiadamanie o zdarzeniach przy pomocy dymk??w typu OSD +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description osdhints_notify +Osdhints_notify is a module to notify users about some events +with OSD-like hints. + +%description osdhints_notify -l pl +Osdhints_notify to modu?? umo??liwiaj??cy powiadamianie u??ytkownika +o pewnych zdarzeniach przy pomocy dymk??w typu OSD. + +%endif + + +%if %{with panelkadu} +%package panelkadu +Summary: Makes a panel from Kadu main window +Summary(pl): Zamienia Kadu w panel na skraju ekranu +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description panelkadu +Panelkadu is a module to make a panel from Kadu main window. + +%description panelkadu -l pl +Panelkadu to modu?? zamieniaj??cy kadu w panel na skraju ekranu. + +%endif + + %if %{with pcspeaker} %package pcspeaker Summary: Notify by PC Speaker @@ -483,6 +655,24 @@ %endif +%if %{with water_notify} +%package water_notify +Summary: Notifications by Water Compiz plugin +Summary(pl): Powiadomienia kroplami wody w Compiz +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +BuildRequires: dbus-devel +%description water_notify +Water_notify is a module to notify user about some events with +Water Compiz plugin. + +%description water_notify -l pl +Water_notify to modu?? umo??liwiaj??cy powiadamianie u??ytkownika +o pewnych zdarzeniach przy u??yciu wtyczki Woda z Compiza. + +%endif + + %if %{with weather} %package weather Summary: Weather checking @@ -509,6 +699,8 @@ BuildRequires: xmms-devel Requires: %{name} = %{version}-%{release} Requires: kadu-mediaplayer = %{version}-%{release} +Obsoletes: kadu-xmms < 0.6.0-0.1.alpha1 +Provides: kadu-xmms = %{version}-%{release} %description xmms_mediaplayer Xmms_mediaplayer is a module to put title of current song from xmms in your status. @@ -539,6 +731,15 @@ %unpack_module_source 114 weather %unpack_module_source 115 xmms_mediaplayer %unpack_module_source 116 agent +%unpack_module_source 117 falf_mediaplayer +%unpack_module_source 118 mail +%unpack_module_source 119 mime_tex +%unpack_module_source 120 mx610_notify +%unpack_module_source 121 filtering +%unpack_module_source 122 firewall +%unpack_module_source 123 panelkadu +%unpack_module_source 124 osdhints_notify +%unpack_module_source 125 water_notify %setup -q -D -T -n kadu %if %{with alsa_sound} @@ -549,15 +750,21 @@ %endif %if %{with esd_sound} sed "s#^module_esd_sound=.#module_esd_sound=m#" -i .config -%endif +%endif -%if %{with xmms_mediaplayer} -%patch0 -p0 -b .xmmsfix +%if %{with audacious_mediaplayer} +pushd modules/audacious_mediaplayer +sed 's#cflags`#cflags` -I/usr/include/dbus-1.0#' -i spec +# above adds missing include path +popd %endif %build +%if %{with existing_libgadu} +%define _with_existing_libgadu 1 +%endif unset QTDIR || : ; . /etc/profile.d/qt.sh -%configure --enable-debug --disable-dependency-tracking \ +%configure --enable-debug \ %{?_with_existing_libgadu:--with-existing-libgadu} make %{?_smp_mflags} @@ -649,8 +856,8 @@ %if ! %{with existing_libgadu} %exclude %{_includedir}/libgadu.h %exclude %{_libdir}/pkgconfig/libgadu.pc +%exclude %{_libdir}/libgadu* %endif - # external modules: %if %{with agent} @@ -703,18 +910,42 @@ %module_files esd_sound %endif +%if %{with falf_mediaplayer} +%files falf_mediaplayer +%defattr(-, root, root, -) +%module_files falf_mediaplayer +%endif + %if %{with filedesc} %files filedesc %defattr(-, root, root, -) %module_files filedesc -cdt %endif +%if %{with filtering} +%files filtering +%defattr(-, root, root, -) +%module_files filtering -cdt +%endif + +%if %{with firewall} +%files firewall +%defattr(-, root, root, -) +%module_files firewall -ct +%endif + %if %{with led_notify} %files led_notify %defattr(-, root, root, -) %module_files led_notify -ct %endif +%if %{with mail} +%files mail +%defattr(-, root, root, -) +%module_files mail -ct +%endif + %if %{with mediaplayer} %files mediaplayer %defattr(-, root, root, -) @@ -727,6 +958,32 @@ %module_files miastoplusa_sms -cdt %endif +%if %{with mime_tex} +%files mime_tex +%defattr(-, root, root, -) +%module_files mime_tex -cdt +%{_libdir}/kadu/modules/bin/mime_tex +%endif + +%if %{with mx610_notify} +%files mx610_notify +%defattr(-, root, root, -) +%module_files mx610_notify -ct +%endif + +%if %{with osdhints_notify} +%files osdhints_notify +%defattr(-, root, root, -) +%module_files osdhints_notify -cdt +%endif + +%if %{with panelkadu} +%files panelkadu +%defattr(-, root, root, -) +%module_files panelkadu -ct +%endif + + %if %{with pcspeaker} %files pcspeaker %defattr(-, root, root, -) @@ -757,6 +1014,13 @@ %module_files tabs -ct %endif +%if %{with water_notify} +%files water_notify +%defattr(-, root, root, -) +%module_files water_notify -ct +%endif + + %if %{with weather} %files weather %defattr(-, root, root, -) @@ -771,6 +1035,39 @@ %changelog +* Thu Feb 28 2008 Micha?? Bentkowski - 0.6.0-1 +- Stable +- New versions of osdhints_notify, audacious_mediaplayer, filtering, +mediaplayer and panelkadu + +* Mon Feb 18 2008 Micha?? Bentkowski - 0.6.0-0.12.rc4 +- rc4 +- Add modules: water_notify, osdhints_notify, panelkadu + +* Wed Feb 13 2008 Micha?? Bentkowski - 0.6.0-0.11.rc3 +- rc3 +- New firewall module +- New versions of some modules + +* Sun Feb 03 2008 Micha?? Bentkowski - 0.6.0-0.10.rc2.try2 +- rc2-try2 + +* Sun Feb 03 2008 Micha?? Bentkowski - 0.6.0-0.9.rc2 +- rc2 +- New versions of led_notify, weather, pcspeaker, mime_tex, tabs, +mediaplayer, xmms_mediaplayer and mail modules +- Add filtering module +- Get rid of xmmsfix patch +- Fix mail module + +* Sun Jan 13 2008 Micha?? Bentkowski - 0.6.0-0.8.rc1 +- rc1 +- New mx610_notify, falf_mediaplayer, mail and mime_tex modules. +- New versions of some modules + +* Sun Jan 06 2008 Micha?? Bentkowski - 0.6.0-0.7.beta2 +- Fix bug 427679 (add forgotten %% symbol in one place) + * Sun Jan 06 2008 Micha?? Bentkowski - 0.6.0-0.6.beta2 - Now forgot to include that one source changed its name Index: sources =================================================================== RCS file: /cvs/extras/rpms/kadu/F-8/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 6 Jan 2008 12:21:07 -0000 1.13 +++ sources 2 Mar 2008 20:41:54 -0000 1.14 @@ -1,17 +1,26 @@ -a9a11dac6098de49d19b80760374fe3b agent-0.4.3.tar.gz +4401e0e3c509af347cb14a89236301ea agent-0.4.4.tar.gz 51d304e335e814f3d8c0f1654007a7d7 amarok_mediaplayer-20071220.tar.bz2 95809d330e48e61f58ec961ddbf0b529 ao_sound-20060424.tar.bz2 +aa427d5b87fcc48cdd799cf19fe92da1 audacious_mediaplayer-20080224.tar.bz2 b36fcfcf4756285f30cbb6c2b6c2a2da dcopexport-0.11.3-20071129-0.6.0.tar.bz2 -317627cbc5fd09a6a0039cdfccbfbce1 filedesc-20071221.tar.bz2 -05b3130d7e57b537ddccb28613098228 kadu-0.6.0-beta2.tar.bz2 -cae700d747123a3bf34cf4134c7f01fe kadu-profiles-0.3.1.tar.bz2 -baa352d4eef2fda14dcd4d8e9a59033a kadu-tabs-1.1.1.tar.bz2 -8c99002250cc27b553cf4739a4762396 led_notify-0.13.tar.bz2 -20770dea543e192fa14d6eddaacd006d mediaplayer-20071220.tar.bz2 +927db40f7136ff86b3e83307b5cec2d9 falf_mediaplayer-20071225.tar.bz2 +8d11979fa8a3795f7ab20fbb1fb8bdbb filedesc-20080104.tar.bz2 +a672d4ef9ce113196e4689b9141b4aef filtering-20080224.tar.bz2 +8f1ee07558c82573d2c6e7ccd05f224f kadu-0.6.0.tar.bz2 +9b0f04b4254b4ff08254b15e59a81be7 kadu-firewall-0.7.5.tar.bz2 +f515d2dd54d4a5948f691b05d13be70d kadu-osdhints_notify-0.4.0.9.tar.bz2 +4b8abfe0c57efabb49ba8c6c71a316f2 kadu-pcspeaker-0.6.0.3.tar.bz2 +d7ec7f808d15308d10ed76d1e3743f37 kadu-profiles-0.3.1.tar.bz2 +57e4c970f496ba81495d59d7b96bcdf1 kadu-tabs-1.1.4.tar.bz2 +786a0ee40a3aef03b51e2d89a2bceda5 led_notify-0.18.tar.bz2 +898561b215ac10a99be62fa4e3a50a55 mail-0.3.3.tar.bz2 +8a27d4873e6896d63f7c8193029b24ca mediaplayer-20080224.tar.bz2 e5c4d5cd94cef40730e281b9a6c9ed37 miastoplusa_sms-0.6-1.3.9.tar.gz -8b3f229e54336a25c2efab759eaf85e0 screenshot-20071216.tar.bz2 -58051123d08616f596327dc29dcd5527 spellchecker-20071220.tar.bz2 -fa0fc81ab6906aa7e21ee8b2405f5e44 weather-3.07.tar.bz2 -3c2bfa4507bea42395d1d3cd02576711 xmms_mediaplayer-20071220.tar.bz2 -37cb762e361208c5c571771fb86968b5 audacious_mediaplayer-20071220.tar.bz2 -1573f9a15f55c484bdd81c65fd817f84 kadu-pcspeaker-0.6.0.2.tar.bz2 +d640b2ba650fb5aa0f3502ad7379b14b mime_tex-1.4.1.tar.bz2 +08bba105d9307bbf1a8e8482529441a4 mx610_notify-0.3.1.tar.bz2 +0070c9bb4559ec29bb1195acdc5c5967 panelkadu-0.6-beta3.tar.gz +47d3d5564b272a186667c1507e19844f screenshot-20080104.tar.bz2 +a46eab2f3d9c31cee13ccf3a441bceec spellchecker-20071230.tar.bz2 +10320f9b96366422bbcd7ec76d4e85a1 water_notify-0.1.1-try2.tar.bz2 +41a6edd1356a36e4606e432d0bc856f6 weather-3.13.tar.bz2 +97dd4c9cd19b69b9ab6d38a20cd37a2e xmms_mediaplayer-20080116.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 20:51:25 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 20:51:25 GMT Subject: rpms/gmfsk/devel gmfsk-0.7pre1-gcc.patch, NONE, 1.1 gmfsk.desktop, NONE, 1.1 gmfsk.png, NONE, 1.1 gmfsk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803022051.m22KpP6Y010625@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/gmfsk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10578/devel Modified Files: .cvsignore sources Added Files: gmfsk-0.7pre1-gcc.patch gmfsk.desktop gmfsk.png gmfsk.spec Log Message: Committing in gmfsk0.7pre1 for devel. Modified Files: devel/.cvsignore devel/sources Added Files: devel/gmfsk-0.7pre1-gcc.patch devel/gmfsk.desktop devel/gmfsk.png devel/gmfsk.spec gmfsk-0.7pre1-gcc.patch: --- NEW FILE gmfsk-0.7pre1-gcc.patch --- diff -up gmfsk-0.7pre1/src/olivia/mfsk.h.gccfix gmfsk-0.7pre1/src/olivia/mfsk.h --- gmfsk-0.7pre1/src/olivia/mfsk.h.gccfix 2005-01-20 14:38:06.000000000 -0600 +++ gmfsk-0.7pre1/src/olivia/mfsk.h 2008-02-28 16:27:08.000000000 -0600 @@ -1448,7 +1448,7 @@ class MFSK_Encoder void PrintOutputBlock(void) { size_t TimeBit; for(TimeBit=0; TimeBit MFSK_Encoder Encoder; // FEC encoder size_t SymbolPtr; - MFSK_Modulator Modulator; // MFSK modulator + MFSK_Modulator Modulator; // MFSK modulator Type *ModulatorOutput; - RateConverter RateConverter; // output rate converter + ::RateConverter RateConverter; // output rate converter Type *ConverterOutput; @@ -2209,7 +2209,7 @@ template private: - RateConverter RateConverter; + ::RateConverter RateConverter; Seq InputBuffer; --- NEW FILE gmfsk.desktop --- [Desktop Entry] Encoding=UTF-8 Name=gmfsk GenericName=gmfsk Comment=A Gnome Multimode HF Terminal for Ham Radio Exec=gmfsk Icon=gmfsk.png Terminal=false Type=Application Categories=HamRadio; Version=1.0 --- NEW FILE gmfsk.spec --- Name: gmfsk Version: 0.7 Release: 0.5.pre1%{?dist} Summary: A Gnome Multimode HF Terminal for Ham Radio Group: Applications/Communications License: GPLv2+ URL: http://gmfsk.connect.fi/ Source0: http://gmfsk.connect.fi/%{name}-%{version}pre1.tar.gz #add .desktop file Source1: %{name}.desktop #temporary Icon Source2: %{name}.png Patch0: gmfsk-0.7pre1-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fftw2-devel, GConf2-devel, libgnomeui-devel, hamlib-devel BuildRequires: scrollkeeper, gettext, desktop-file-utils #Requires: Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper Requires(preun): GConf2 Requires(postun): scrollkeeper %description gmfsk is a terminal program for amateur radio digital communication modes for GNOME. It supports MFSK, RTTY, THROB, PSK31, MT63 and Hellschreiber modulations. It is used for keyboard-to-keyboard chatting and not reliable packet communication. %prep %setup -qn %{name}-%{version}pre1 %patch0 -p 1 -b .gccfix #all files should be utf-8 recode() { iconv -f "$2" -t utf-8 < "$1" > "${1}_" mv -f "${1}_" "$1" } recode README iso-8859-15 %build %configure --enable-hamlib make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT #applications shouldn't install fonts rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts # no upstream .desktop or icon mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}/ install -m 644 %{SOURCE2} \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ desktop-file-install --vendor="" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE1} %find_lang %{name} %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %postun scrollkeeper-update -q || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO %{_bindir}/* %{_datadir}/gnome/help/gmfsk %{_datadir}/omf/gmfsk %{_datadir}/pixmaps/* %{_datadir}/applications/*%{name}.desktop %config(noreplace) %{_sysconfdir}/gconf/schemas/* %changelog * Sun Mar 02 2008 Robert 'Bob' Jensen - 0.7-0.5.pre1 - Fix NVR per nirik's request * Thu Feb 28 2008 Steve Conklin - 0.7-0.pre1.4 - Fix compiler errors - fixed some desktop file and icon errors * Tue Feb 26 2008 Robert 'Bob' Jensen - 0.7-0.pre1.3 - Add icon file * Tue Feb 26 2008 Robert 'Bob' Jensen - 0.7-0.pre1.2 - Add .desktop file * Sun Dec 09 2007 Sindre Pedersen Bj??rdal - 0.7-0.pre1.1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gmfsk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2008 17:13:15 -0000 1.1 +++ .cvsignore 2 Mar 2008 20:50:52 -0000 1.2 @@ -0,0 +1 @@ +gmfsk-0.7pre1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gmfsk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:13:15 -0000 1.1 +++ sources 2 Mar 2008 20:50:52 -0000 1.2 @@ -0,0 +1 @@ +62bf63530f67eff2b757e7e46507a275 gmfsk-0.7pre1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 20:59:55 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 20:59:55 GMT Subject: rpms/gmfsk/F-8 gmfsk-0.7pre1-gcc.patch, NONE, 1.1 gmfsk.desktop, NONE, 1.1 gmfsk.png, NONE, 1.1 gmfsk.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200803022059.m22KxtUV010873@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/gmfsk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10847 Modified Files: sources Added Files: gmfsk-0.7pre1-gcc.patch gmfsk.desktop gmfsk.png gmfsk.spec Log Message: * Sun Mar 02 2008 Robert 'Bob' Jensen - 0.7-0.5.pre1 - Fix NVR per nirik's request gmfsk-0.7pre1-gcc.patch: --- NEW FILE gmfsk-0.7pre1-gcc.patch --- diff -up gmfsk-0.7pre1/src/olivia/mfsk.h.gccfix gmfsk-0.7pre1/src/olivia/mfsk.h --- gmfsk-0.7pre1/src/olivia/mfsk.h.gccfix 2005-01-20 14:38:06.000000000 -0600 +++ gmfsk-0.7pre1/src/olivia/mfsk.h 2008-02-28 16:27:08.000000000 -0600 @@ -1448,7 +1448,7 @@ class MFSK_Encoder void PrintOutputBlock(void) { size_t TimeBit; for(TimeBit=0; TimeBit MFSK_Encoder Encoder; // FEC encoder size_t SymbolPtr; - MFSK_Modulator Modulator; // MFSK modulator + MFSK_Modulator Modulator; // MFSK modulator Type *ModulatorOutput; - RateConverter RateConverter; // output rate converter + ::RateConverter RateConverter; // output rate converter Type *ConverterOutput; @@ -2209,7 +2209,7 @@ template private: - RateConverter RateConverter; + ::RateConverter RateConverter; Seq InputBuffer; --- NEW FILE gmfsk.desktop --- [Desktop Entry] Encoding=UTF-8 Name=gmfsk GenericName=gmfsk Comment=A Gnome Multimode HF Terminal for Ham Radio Exec=gmfsk Icon=gmfsk.png Terminal=false Type=Application Categories=HamRadio; Version=1.0 --- NEW FILE gmfsk.spec --- Name: gmfsk Version: 0.7 Release: 0.5.pre1%{?dist} Summary: A Gnome Multimode HF Terminal for Ham Radio Group: Applications/Communications License: GPLv2+ URL: http://gmfsk.connect.fi/ Source0: http://gmfsk.connect.fi/%{name}-%{version}pre1.tar.gz #add .desktop file Source1: %{name}.desktop #temporary Icon Source2: %{name}.png Patch0: gmfsk-0.7pre1-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fftw2-devel, GConf2-devel, libgnomeui-devel, hamlib-devel BuildRequires: scrollkeeper, gettext, desktop-file-utils #Requires: Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper Requires(preun): GConf2 Requires(postun): scrollkeeper %description gmfsk is a terminal program for amateur radio digital communication modes for GNOME. It supports MFSK, RTTY, THROB, PSK31, MT63 and Hellschreiber modulations. It is used for keyboard-to-keyboard chatting and not reliable packet communication. %prep %setup -qn %{name}-%{version}pre1 %patch0 -p 1 -b .gccfix #all files should be utf-8 recode() { iconv -f "$2" -t utf-8 < "$1" > "${1}_" mv -f "${1}_" "$1" } recode README iso-8859-15 %build %configure --enable-hamlib make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT #applications shouldn't install fonts rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts # no upstream .desktop or icon mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}/ install -m 644 %{SOURCE2} \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ desktop-file-install --vendor="" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE1} %find_lang %{name} %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %postun scrollkeeper-update -q || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO %{_bindir}/* %{_datadir}/gnome/help/gmfsk %{_datadir}/omf/gmfsk %{_datadir}/pixmaps/* %{_datadir}/applications/*%{name}.desktop %config(noreplace) %{_sysconfdir}/gconf/schemas/* %changelog * Sun Mar 02 2008 Robert 'Bob' Jensen - 0.7-0.5.pre1 - Fix NVR per nirik's request * Thu Feb 28 2008 Steve Conklin - 0.7-0.pre1.4 - Fix compiler errors - fixed some desktop file and icon errors * Tue Feb 26 2008 Robert 'Bob' Jensen - 0.7-0.pre1.3 - Add icon file * Tue Feb 26 2008 Robert 'Bob' Jensen - 0.7-0.pre1.2 - Add .desktop file * Sun Dec 09 2007 Sindre Pedersen Bj??rdal - 0.7-0.pre1.1 - Initial build Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gmfsk/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:13:15 -0000 1.1 +++ sources 2 Mar 2008 20:59:21 -0000 1.2 @@ -0,0 +1 @@ +62bf63530f67eff2b757e7e46507a275 gmfsk-0.7pre1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 21:01:27 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 21:01:27 GMT Subject: rpms/gmfsk/F-7 gmfsk-0.7pre1-gcc.patch, NONE, 1.1 gmfsk.desktop, NONE, 1.1 gmfsk.png, NONE, 1.1 gmfsk.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200803022101.m22L1RcP018050@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/gmfsk/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10934 Modified Files: sources Added Files: gmfsk-0.7pre1-gcc.patch gmfsk.desktop gmfsk.png gmfsk.spec Log Message: * Sun Mar 02 2008 Robert 'Bob' Jensen - 0.7-0.5.pre1 - Fix NVR per nirik's request gmfsk-0.7pre1-gcc.patch: --- NEW FILE gmfsk-0.7pre1-gcc.patch --- diff -up gmfsk-0.7pre1/src/olivia/mfsk.h.gccfix gmfsk-0.7pre1/src/olivia/mfsk.h --- gmfsk-0.7pre1/src/olivia/mfsk.h.gccfix 2005-01-20 14:38:06.000000000 -0600 +++ gmfsk-0.7pre1/src/olivia/mfsk.h 2008-02-28 16:27:08.000000000 -0600 @@ -1448,7 +1448,7 @@ class MFSK_Encoder void PrintOutputBlock(void) { size_t TimeBit; for(TimeBit=0; TimeBit MFSK_Encoder Encoder; // FEC encoder size_t SymbolPtr; - MFSK_Modulator Modulator; // MFSK modulator + MFSK_Modulator Modulator; // MFSK modulator Type *ModulatorOutput; - RateConverter RateConverter; // output rate converter + ::RateConverter RateConverter; // output rate converter Type *ConverterOutput; @@ -2209,7 +2209,7 @@ template private: - RateConverter RateConverter; + ::RateConverter RateConverter; Seq InputBuffer; --- NEW FILE gmfsk.desktop --- [Desktop Entry] Encoding=UTF-8 Name=gmfsk GenericName=gmfsk Comment=A Gnome Multimode HF Terminal for Ham Radio Exec=gmfsk Icon=gmfsk.png Terminal=false Type=Application Categories=HamRadio; Version=1.0 --- NEW FILE gmfsk.spec --- Name: gmfsk Version: 0.7 Release: 0.5.pre1%{?dist} Summary: A Gnome Multimode HF Terminal for Ham Radio Group: Applications/Communications License: GPLv2+ URL: http://gmfsk.connect.fi/ Source0: http://gmfsk.connect.fi/%{name}-%{version}pre1.tar.gz #add .desktop file Source1: %{name}.desktop #temporary Icon Source2: %{name}.png Patch0: gmfsk-0.7pre1-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fftw2-devel, GConf2-devel, libgnomeui-devel, hamlib-devel BuildRequires: scrollkeeper, gettext, desktop-file-utils #Requires: Requires(pre): GConf2 Requires(post): GConf2, scrollkeeper Requires(preun): GConf2 Requires(postun): scrollkeeper %description gmfsk is a terminal program for amateur radio digital communication modes for GNOME. It supports MFSK, RTTY, THROB, PSK31, MT63 and Hellschreiber modulations. It is used for keyboard-to-keyboard chatting and not reliable packet communication. %prep %setup -qn %{name}-%{version}pre1 %patch0 -p 1 -b .gccfix #all files should be utf-8 recode() { iconv -f "$2" -t utf-8 < "$1" > "${1}_" mv -f "${1}_" "$1" } recode README iso-8859-15 %build %configure --enable-hamlib make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT #applications shouldn't install fonts rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts # no upstream .desktop or icon mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}/ install -m 644 %{SOURCE2} \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ desktop-file-install --vendor="" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE1} %find_lang %{name} %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %postun scrollkeeper-update -q || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO %{_bindir}/* %{_datadir}/gnome/help/gmfsk %{_datadir}/omf/gmfsk %{_datadir}/pixmaps/* %{_datadir}/applications/*%{name}.desktop %config(noreplace) %{_sysconfdir}/gconf/schemas/* %changelog * Sun Mar 02 2008 Robert 'Bob' Jensen - 0.7-0.5.pre1 - Fix NVR per nirik's request * Thu Feb 28 2008 Steve Conklin - 0.7-0.pre1.4 - Fix compiler errors - fixed some desktop file and icon errors * Tue Feb 26 2008 Robert 'Bob' Jensen - 0.7-0.pre1.3 - Add icon file * Tue Feb 26 2008 Robert 'Bob' Jensen - 0.7-0.pre1.2 - Add .desktop file * Sun Dec 09 2007 Sindre Pedersen Bj??rdal - 0.7-0.pre1.1 - Initial build Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gmfsk/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:13:15 -0000 1.1 +++ sources 2 Mar 2008 21:00:52 -0000 1.2 @@ -0,0 +1 @@ +62bf63530f67eff2b757e7e46507a275 gmfsk-0.7pre1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 21:16:04 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 21:16:04 GMT Subject: rpms/lpsk31/devel lpsk31-1.1-makefile.patch, NONE, 1.1 lpsk31.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803022116.m22LG47C018403@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/lpsk31/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18355/devel Modified Files: .cvsignore sources Added Files: lpsk31-1.1-makefile.patch lpsk31.spec Log Message: Committing in lpsk31-1.1 for devel. Modified Files: devel/.cvsignore devel/sources Added Files: devel/lpsk31-1.1-makefile.patch devel/lpsk31.spec lpsk31-1.1-makefile.patch: --- NEW FILE lpsk31-1.1-makefile.patch --- diff -up lpsk31/Makefile.orig lpsk31/Makefile --- lpsk31/Makefile.orig 2008-02-29 23:13:25.000000000 -0600 +++ lpsk31/Makefile 2008-02-29 23:17:49.000000000 -0600 @@ -2,10 +2,12 @@ SHELL = /bin/sh PROJECT = lpsk31 -BINDIR = /usr/local/bin -DOCDIR = /usr/local/share/ +BINDIR = /usr/bin +DOCDIR = /usr/share/doc/ CC = gcc -Wall -O2 -march=native +DESTDIR= + objects = cat.o lpsk31.o phase.o pskcodec.o screen.o sound.o $(PROJECT) : $(objects) @@ -14,15 +16,14 @@ $(PROJECT) : $(objects) $(objects) : $(PROJECT).h install : $(PROJECT) - install -m 755 --strip $(PROJECT) $(BINDIR) - install -m 644 doc/$(PROJECT).html $(DOCDIR) + install -D -m 755 $(PROJECT) $(DESTDIR)$(BINDIR)/$(PROJECT) if test ! -d $(HOME)/$(PROJECT); then mkdir $(HOME)/$(PROJECT); fi install -m 644 default/$(PROJECT)rc $(HOME)/$(PROJECT) uninstall : if test -d $(HOME)/$(PROJECT); then rm -r $(HOME)/$(PROJECT); fi - rm $(BINDIR)/$(PROJECT) - rm $(DOCDIR)/$(PROJECT).html + rm $(DESTDIR)$(BINDIR)/$(PROJECT) + rm $(DESTDIR)$(DOCDIR)/$(PROJECT).html clean : rm -f *.o *~ --- NEW FILE lpsk31.spec --- Name: lpsk31 Version: 1.1 Release: 1%{?dist} Summary: A ncurses application for ham radio communications using PSK31 digital mode Group: Applications/Communications License: GPLv2+ URL: http://5b4az.chronos.org.uk/pages/digital.html Source0: http://5b4az.chronos.org.uk/pkg/psk31/lpsk31/%{name}-%{version}.tar.gz Patch0: lpsk31-1.1-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel #Requires: %description lpsk31 is a ncurses console application for ham radio communications in the popular PSK31 digital mode. lpsk31 uses only integer arithmetic for both signal detection and audio tone synthesis, so that it needs no floating point calculations for its operation. lpsk31 can keep a log of QSO's in text and ADIF format as well as a raw log of all that is typed in the transmit window or displayed in the receive window. %prep %setup -q -n %{name} %patch0 -p1 %build make CC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files #doesn't contain a copy of GPLv2 License, queried upstream %defattr(-,root,root,-) %doc AUTHORS README doc/* %{_bindir}/%{name} %changelog * Sat Mar 01 2008 Robert 'Bob' Jensen 1.1-1 - Initial SPEC Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/lpsk31/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2008 17:17:47 -0000 1.1 +++ .cvsignore 2 Mar 2008 21:15:15 -0000 1.2 @@ -0,0 +1 @@ +lpsk31-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lpsk31/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:17:47 -0000 1.1 +++ sources 2 Mar 2008 21:15:15 -0000 1.2 @@ -0,0 +1 @@ +70a5461c9426f5d298c8a798a6436376 lpsk31-1.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 21:25:08 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 21:25:08 GMT Subject: rpms/lpsk31/F-8 lpsk31-1.1-makefile.patch, NONE, 1.1 lpsk31.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200803022125.m22LP89d018594@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/lpsk31/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18570 Modified Files: sources Added Files: lpsk31-1.1-makefile.patch lpsk31.spec Log Message: * Sat Mar 01 2008 Robert 'Bob' Jensen 1.1-1 - Initial SPEC lpsk31-1.1-makefile.patch: --- NEW FILE lpsk31-1.1-makefile.patch --- diff -up lpsk31/Makefile.orig lpsk31/Makefile --- lpsk31/Makefile.orig 2008-02-29 23:13:25.000000000 -0600 +++ lpsk31/Makefile 2008-02-29 23:17:49.000000000 -0600 @@ -2,10 +2,12 @@ SHELL = /bin/sh PROJECT = lpsk31 -BINDIR = /usr/local/bin -DOCDIR = /usr/local/share/ +BINDIR = /usr/bin +DOCDIR = /usr/share/doc/ CC = gcc -Wall -O2 -march=native +DESTDIR= + objects = cat.o lpsk31.o phase.o pskcodec.o screen.o sound.o $(PROJECT) : $(objects) @@ -14,15 +16,14 @@ $(PROJECT) : $(objects) $(objects) : $(PROJECT).h install : $(PROJECT) - install -m 755 --strip $(PROJECT) $(BINDIR) - install -m 644 doc/$(PROJECT).html $(DOCDIR) + install -D -m 755 $(PROJECT) $(DESTDIR)$(BINDIR)/$(PROJECT) if test ! -d $(HOME)/$(PROJECT); then mkdir $(HOME)/$(PROJECT); fi install -m 644 default/$(PROJECT)rc $(HOME)/$(PROJECT) uninstall : if test -d $(HOME)/$(PROJECT); then rm -r $(HOME)/$(PROJECT); fi - rm $(BINDIR)/$(PROJECT) - rm $(DOCDIR)/$(PROJECT).html + rm $(DESTDIR)$(BINDIR)/$(PROJECT) + rm $(DESTDIR)$(DOCDIR)/$(PROJECT).html clean : rm -f *.o *~ --- NEW FILE lpsk31.spec --- Name: lpsk31 Version: 1.1 Release: 1%{?dist} Summary: A ncurses application for ham radio communications using PSK31 digital mode Group: Applications/Communications License: GPLv2+ URL: http://5b4az.chronos.org.uk/pages/digital.html Source0: http://5b4az.chronos.org.uk/pkg/psk31/lpsk31/%{name}-%{version}.tar.gz Patch0: lpsk31-1.1-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel #Requires: %description lpsk31 is a ncurses console application for ham radio communications in the popular PSK31 digital mode. lpsk31 uses only integer arithmetic for both signal detection and audio tone synthesis, so that it needs no floating point calculations for its operation. lpsk31 can keep a log of QSO's in text and ADIF format as well as a raw log of all that is typed in the transmit window or displayed in the receive window. %prep %setup -q -n %{name} %patch0 -p1 %build make CC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files #doesn't contain a copy of GPLv2 License, queried upstream %defattr(-,root,root,-) %doc AUTHORS README doc/* %{_bindir}/%{name} %changelog * Sat Mar 01 2008 Robert 'Bob' Jensen 1.1-1 - Initial SPEC Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lpsk31/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:17:47 -0000 1.1 +++ sources 2 Mar 2008 21:24:34 -0000 1.2 @@ -0,0 +1 @@ +70a5461c9426f5d298c8a798a6436376 lpsk31-1.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 21:26:34 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 21:26:34 GMT Subject: rpms/lpsk31/F-7 lpsk31-1.1-makefile.patch, NONE, 1.1 lpsk31.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200803022126.m22LQYsq018681@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/lpsk31/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18657 Modified Files: sources Added Files: lpsk31-1.1-makefile.patch lpsk31.spec Log Message: * Sat Mar 01 2008 Robert 'Bob' Jensen 1.1-1 - Initial SPEC lpsk31-1.1-makefile.patch: --- NEW FILE lpsk31-1.1-makefile.patch --- diff -up lpsk31/Makefile.orig lpsk31/Makefile --- lpsk31/Makefile.orig 2008-02-29 23:13:25.000000000 -0600 +++ lpsk31/Makefile 2008-02-29 23:17:49.000000000 -0600 @@ -2,10 +2,12 @@ SHELL = /bin/sh PROJECT = lpsk31 -BINDIR = /usr/local/bin -DOCDIR = /usr/local/share/ +BINDIR = /usr/bin +DOCDIR = /usr/share/doc/ CC = gcc -Wall -O2 -march=native +DESTDIR= + objects = cat.o lpsk31.o phase.o pskcodec.o screen.o sound.o $(PROJECT) : $(objects) @@ -14,15 +16,14 @@ $(PROJECT) : $(objects) $(objects) : $(PROJECT).h install : $(PROJECT) - install -m 755 --strip $(PROJECT) $(BINDIR) - install -m 644 doc/$(PROJECT).html $(DOCDIR) + install -D -m 755 $(PROJECT) $(DESTDIR)$(BINDIR)/$(PROJECT) if test ! -d $(HOME)/$(PROJECT); then mkdir $(HOME)/$(PROJECT); fi install -m 644 default/$(PROJECT)rc $(HOME)/$(PROJECT) uninstall : if test -d $(HOME)/$(PROJECT); then rm -r $(HOME)/$(PROJECT); fi - rm $(BINDIR)/$(PROJECT) - rm $(DOCDIR)/$(PROJECT).html + rm $(DESTDIR)$(BINDIR)/$(PROJECT) + rm $(DESTDIR)$(DOCDIR)/$(PROJECT).html clean : rm -f *.o *~ --- NEW FILE lpsk31.spec --- Name: lpsk31 Version: 1.1 Release: 1%{?dist} Summary: A ncurses application for ham radio communications using PSK31 digital mode Group: Applications/Communications License: GPLv2+ URL: http://5b4az.chronos.org.uk/pages/digital.html Source0: http://5b4az.chronos.org.uk/pkg/psk31/lpsk31/%{name}-%{version}.tar.gz Patch0: lpsk31-1.1-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel #Requires: %description lpsk31 is a ncurses console application for ham radio communications in the popular PSK31 digital mode. lpsk31 uses only integer arithmetic for both signal detection and audio tone synthesis, so that it needs no floating point calculations for its operation. lpsk31 can keep a log of QSO's in text and ADIF format as well as a raw log of all that is typed in the transmit window or displayed in the receive window. %prep %setup -q -n %{name} %patch0 -p1 %build make CC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files #doesn't contain a copy of GPLv2 License, queried upstream %defattr(-,root,root,-) %doc AUTHORS README doc/* %{_bindir}/%{name} %changelog * Sat Mar 01 2008 Robert 'Bob' Jensen 1.1-1 - Initial SPEC Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/lpsk31/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:17:47 -0000 1.1 +++ sources 2 Mar 2008 21:25:56 -0000 1.2 @@ -0,0 +1 @@ +70a5461c9426f5d298c8a798a6436376 lpsk31-1.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 21:31:42 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Sun, 2 Mar 2008 21:31:42 GMT Subject: rpms/xorg-x11-server/F-8 xorg-server-1.3.0.0-0001-X86EMU-handle-CPUID-instruction.patch, NONE, 1.1 xorg-server-1.3.0.0-0002-X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch, NONE, 1.1 xorg-server-1.3.0.0-0003-X86EMU-when-emulating-PCI-access-use-the-correct-d.patch, NONE, 1.1 xorg-server-1.3.0.0-geode-gx2-lx-autodetect.patch, NONE, 1.1 xorg-server-1.3.0.0-prefer-openchrome-ugly-hack.patch, NONE, 1.1 xorg-x11-server.spec, 1.270, 1.271 Message-ID: <200803022131.m22LVg7Z018990@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/xorg-x11-server/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18870 Modified Files: xorg-x11-server.spec Added Files: xorg-server-1.3.0.0-0001-X86EMU-handle-CPUID-instruction.patch xorg-server-1.3.0.0-0002-X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch xorg-server-1.3.0.0-0003-X86EMU-when-emulating-PCI-access-use-the-correct-d.patch xorg-server-1.3.0.0-geode-gx2-lx-autodetect.patch xorg-server-1.3.0.0-prefer-openchrome-ugly-hack.patch Log Message: - xorg-server-1.3.0.0-prefer-openchrome-ugly-hack.patch: Prefer openchrome to via driver during autoconfiguration. - xorg-server-1.3.0.0-0001-X86EMU-handle-CPUID-instruction.patch xorg-server-1.3.0.0-0002-X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch xorg-server-1.3.0.0-0003-X86EMU-when-emulating-PCI-access-use-the-correct-d.patch X86EMU fixes that allow amd driver work with a few broken BIOS - xorg-server-1.3.0.0-geode-gx2-lx-autodetect.patch: Autoconfigure AMD Geode GX2 100b:0030 AMD Geode LX 1022:2081 xorg-server-1.3.0.0-0001-X86EMU-handle-CPUID-instruction.patch: --- NEW FILE xorg-server-1.3.0.0-0001-X86EMU-handle-CPUID-instruction.patch --- >From 6b31b336b9f960a86f8cace29e82c90c944c7fd0 Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Sat, 2 Feb 2008 12:21:57 -0500 Subject: [PATCH] X86EMU: handle CPUID instruction This bug is tracked here: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-amd/+bug/180742 After trying to switch from X to VT (or just quit) the video-amd driver attempts to issue INT 10/0 to go to mode 3 (VGA). The emulator, running the BIOS code, would then spit out: c000:0282: A2 ILLEGAL EXTENDED X86 OPCODE! The opcode was 0F A2, or CPUID; it was not implemented in the emulator. This simple patch, against 1.3.0.0, handles the CPUID instruction in one of two ways: 1) if ran on __i386__ or __x86_64__ then it calls the CPUID instruction directly. 2) if ran elsewhere it returns a canned 486dx4 set of values for function 1. This fix allows the video-amd driver to switch back to console mode, with the GSW BIOS. Thanks to Symbio Technologies for funding my work, and ThinCan for providing hardware :) Signed-off-by: Bart Trojanowski Acked-by: Eric Anholt --- hw/xfree86/x86emu/ops2.c | 16 ++++++- hw/xfree86/x86emu/prim_ops.c | 59 +++++++++++++++++++++++ hw/xfree86/x86emu/x86emu/prim_ops.h | 1 + hw/xfree86/x86emu/x86emu/prim_x86_gcc.h | 79 +++++++++++++++++++++++++++++++ 4 files changed, 154 insertions(+), 1 deletions(-) create mode 100644 hw/xfree86/x86emu/x86emu/prim_x86_gcc.h diff --git a/hw/xfree86/x86emu/ops2.c b/hw/xfree86/x86emu/ops2.c index 8c6c535..324de8a 100644 --- a/hw/xfree86/x86emu/ops2.c +++ b/hw/xfree86/x86emu/ops2.c @@ -328,6 +328,20 @@ static void x86emuOp2_pop_FS(u8 X86EMU_UNUSED(op2)) } /**************************************************************************** +REMARKS: CPUID takes EAX/ECX as inputs, writes EAX/EBX/ECX/EDX as output +Handles opcode 0x0f,0xa2 +****************************************************************************/ +static void x86emuOp2_cpuid(u8 X86EMU_UNUSED(op2)) +{ + START_OF_INSTR(); + DECODE_PRINTF("CPUID\n"); + TRACE_AND_STEP(); + cpuid(); + DECODE_CLEAR_SEGOVR(); + END_OF_INSTR(); +} + +/**************************************************************************** REMARKS: Handles opcode 0x0f,0xa3 ****************************************************************************/ @@ -2734,7 +2748,7 @@ void (*x86emu_optab2[256])(u8) = /* 0xa0 */ x86emuOp2_push_FS, /* 0xa1 */ x86emuOp2_pop_FS, -/* 0xa2 */ x86emuOp2_illegal_op, +/* 0xa2 */ x86emuOp2_cpuid, /* 0xa3 */ x86emuOp2_bt_R, /* 0xa4 */ x86emuOp2_shld_IMM, /* 0xa5 */ x86emuOp2_shld_CL, diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c index b9e7257..ca56cae 100644 --- a/hw/xfree86/x86emu/prim_ops.c +++ b/hw/xfree86/x86emu/prim_ops.c @@ -102,6 +102,12 @@ #define PRIM_OPS_NO_REDEFINE_ASM #include "x86emu/x86emui.h" +#if defined(__GNUC__) +# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) +# include "x86emu/prim_x86_gcc.h" +# endif +#endif + /*------------------------- Global Variables ------------------------------*/ static u32 x86emu_parity_tab[8] = @@ -2654,3 +2660,56 @@ DB( if (CHECK_SP_ACCESS()) return res; } +/**************************************************************************** +REMARKS: +CPUID takes EAX/ECX as inputs, writes EAX/EBX/ECX/EDX as output +****************************************************************************/ +void cpuid (void) +{ + u32 feature = M.x86.R_EAX; +#ifdef X86EMU_HAS_HW_CPUID + // If the platform allows it, we will base our values on the real + // results from the CPUID instruction. We limit support to the + // first two features, and the results of those are sanitized. + if (feature <= 1) + hw_cpuid(&M.x86.R_EAX, &M.x86.R_EBX, &M.x86.R_ECX, &M.x86.R_EDX); +#endif + switch (feature) { + case 0: + // Regardless if we have real data from the hardware, the emulator + // will only support upto feature 1, which we set in register EAX. + // Registers EBX:EDX:ECX contain a string identifying the CPU. + M.x86.R_EAX = 1; +#ifndef X86EMU_HAS_HW_CPUID + // EBX:EDX:ECX = "GenuineIntel" + M.x86.R_EBX = 0x756e6547; + M.x86.R_EDX = 0x49656e69; + M.x86.R_ECX = 0x6c65746e; +#endif + break; + case 1: +#ifndef X86EMU_HAS_HW_CPUID + // If we don't have x86 compatible hardware, we return values from an + // Intel 486dx4; which was one of the first processors to have CPUID. + M.x86.R_EAX = 0x00000480; + M.x86.R_EBX = 0x00000000; + M.x86.R_ECX = 0x00000000; + M.x86.R_EDX = 0x00000002; // VME +#else + // In the case that we have hardware CPUID instruction, we make sure + // that the features reported are limited to TSC and VME. + M.x86.R_EDX &= 0x00000012; +#endif + break; + default: + // Finally, we don't support any additional features. Most CPUs + // return all zeros when queried for invalid or unsupported feature + // numbers. + M.x86.R_EAX = 0; + M.x86.R_EBX = 0; + M.x86.R_ECX = 0; + M.x86.R_EDX = 0; + break; + } +} + diff --git a/hw/xfree86/x86emu/x86emu/prim_ops.h b/hw/xfree86/x86emu/x86emu/prim_ops.h index bea8357..6ac2a29 100644 --- a/hw/xfree86/x86emu/x86emu/prim_ops.h +++ b/hw/xfree86/x86emu/x86emu/prim_ops.h @@ -133,6 +133,7 @@ void push_word (u16 w); void push_long (u32 w); u16 pop_word (void); u32 pop_long (void); +void cpuid (void); #ifdef __cplusplus } /* End of "C" linkage for C++ */ diff --git a/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h new file mode 100644 index 0000000..c085ddc --- /dev/null +++ b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h @@ -0,0 +1,79 @@ +/**************************************************************************** +* +* Inline helpers for x86emu +* +* Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC +* +* ======================================================================== +* +* Permission to use, copy, modify, distribute, and sell this software and +* its documentation for any purpose is hereby granted without fee, +* provided that the above copyright notice appear in all copies and that +* both that copyright notice and this permission notice appear in +* supporting documentation, and that the name of the authors not be used +* in advertising or publicity pertaining to distribution of the software +* without specific, written prior permission. The authors makes no +* representations about the suitability of this software for any purpose. +* It is provided "as is" without express or implied warranty. +* +* THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +* EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +* USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +* PERFORMANCE OF THIS SOFTWARE. +* +* ======================================================================== +* +* Language: GNU C +* Environment: GCC on i386 or x86-64 +* Developer: Bart Trojanowski +* +* Description: This file defines a few x86 macros that can be used by the +* emulator to execute native instructions. +* +* For PIC vs non-PIC code refer to: +* http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well +* +****************************************************************************/ +#ifndef __X86EMU_PRIM_X86_GCC_H +#define __X86EMU_PRIM_X86_GCC_H + +#include "x86emu/types.h" + +#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__)) +#error This file is intended to be used by gcc on i386 or x86-64 system +#endif + +#if defined(__PIC__) && defined(__i386__) + +#define X86EMU_HAS_HW_CPUID 1 +static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d) +{ + __asm__ __volatile__ ("pushl %%ebx \n\t" + "cpuid \n\t" + "movl %%ebx, %1 \n\t" + "popl %%ebx \n\t" + : "=a" (*a), "=r" (*b), + "=c" (*c), "=d" (*d) + : "a" (*a), "c" (*c) + : "cc"); +} + +#else // ! (__PIC__ && __i386__) + +#define X86EMU_HAS_HW_CPUID 1 +static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d) +{ + __asm__ __volatile__ ("cpuid" + : "=a" (*a), "=b" (*b), + "=c" (*c), "=d" (*d) + : "a" (*a), "c" (*c) + : "cc"); +} + +#endif // __PIC__ && __i386__ + + +#endif // __X86EMU_PRIM_X86_GCC_H -- 1.5.3.7.1150.g149d432 xorg-server-1.3.0.0-0002-X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch: --- NEW FILE xorg-server-1.3.0.0-0002-X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch --- >From 3fd434670e4c371c5a1970982fdb6039b5bdf5fe Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Tue, 19 Feb 2008 20:44:40 -0500 Subject: [PATCH] X86EMU: added blacklist for I/O port in 0-0xFF range This patch adds a test just before x86emu accesses real I/O ports. The intent is to prevent access to ports that are know to be under the kernel's control. Accessing these from the X process could cause catastrophic failure of the system, as it had occurred on all Geode systems with the General Software VGA BIOS. If such an access is detected, we terminate X "gracefully" by sending a SIGSEGV signal which is picked up by xf86SigHandler(), it then dumps the backtrace and exits gracefully. Note that exiting here avoids a system corruption or freeze. This patch was based on help from Alan Cox. Thanks to Symbio Technologies for funding my work, and ThinCan for providing hardware :) Signed-off-by: Bart Trojanowski --- hw/xfree86/int10/helper_exec.c | 92 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 86 insertions(+), 6 deletions(-) diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index d80de89..babf99c 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -19,6 +19,8 @@ #endif #include +#include +#include #include #include "xf86.h" @@ -203,6 +205,72 @@ stack_trace(xf86Int10InfoPtr pInt) xf86ErrorFVerb(3, "\n"); } +enum port_action_e { + PORT_ACTION_PERMIT, + PORT_ACTION_WARN, + PORT_ACTION_BAIL, + PORT_ACTION_MAX +}; + +static const struct port_range { + CARD16 start, end; + enum port_action_e access; +} port_range_table[] = { + // NOTE: port ranges are non overlapping and sorted + { 0x00, 0x1f, PORT_ACTION_BAIL }, // DMA + { 0x20, 0x21, PORT_ACTION_BAIL }, // PIC + { 0x40, 0x47, PORT_ACTION_BAIL }, // PIT 1&2 + { 0x50, 0x53, PORT_ACTION_BAIL }, + { 0x70, 0x77, PORT_ACTION_BAIL }, // CMOS/RTC + { 0x81, 0x8f, PORT_ACTION_BAIL }, // DIAG REGS + { 0xa0, 0xa1, PORT_ACTION_BAIL }, // PIC2 + { 0xc0, 0xdf, PORT_ACTION_BAIL }, // DMA +}; +#define ARRAY_SIZE(X) (sizeof((X)) / (sizeof(*(X)))) +#define ARRAY_END(X) (&((X)[ARRAY_SIZE(X)])) + +static void assert_port_access_allowed (CARD16 port, CARD16 width) +{ + CARD16 access_start, access_end; + const struct port_range *pr, *pr_start, *pr_end; + + access_start = port; + access_end = port + width - 1; + + // TODO: if the list gets too long we should do a binary search + // or convert the port list to a bitmap representation + pr_start = port_range_table; + pr_end = ARRAY_END(port_range_table); + + for (pr = pr_start; pr < pr_end; pr++) { + if (access_end < pr->start) + continue; + if (access_start > pr->end) + break; + + // we are in the pr range now + switch (pr->access) { + default: + continue; + case PORT_ACTION_BAIL: + case PORT_ACTION_WARN: + break; + } + + ErrorF("Emulator asked to make a suspect %saccess to " + "port %u (0x%04x)%s\n", + (width == 1) ? "byte " : + (width == 2) ? "word " : + (width == 4) ? "long " : "", + port, port, + (pr->access == PORT_ACTION_BAIL) + ? "; terminating." : "ignoring."); + + if (pr->access == PORT_ACTION_BAIL) + kill(getpid(), SIGSEGV); + } +} + int port_rep_inb(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) @@ -328,8 +396,10 @@ x_inb(CARD16 port) } #endif /* __NOT_YET__ */ } else { - if (!pciCfg1inb(port, &val)) + if (!pciCfg1inb(port, &val)) { + assert_port_access_allowed (port, sizeof(val)); val = inb(Int10Current->ioBase + port); + } #ifdef PRINT_PORT ErrorF(" inb(%#x) = %2.2x\n", port, val); #endif @@ -352,8 +422,10 @@ x_inw(CARD16 port) X_GETTIMEOFDAY(&tv); val = (CARD16)(tv.tv_usec / 3); } else { - if (!pciCfg1inw(port, &val)) + if (!pciCfg1inw(port, &val)) { + assert_port_access_allowed (port, sizeof(val)); val = inw(Int10Current->ioBase + port); + } } #ifdef PRINT_PORT ErrorF(" inw(%#x) = %4.4x\n", port, val); @@ -390,8 +462,10 @@ x_outb(CARD16 port, CARD8 val) #ifdef PRINT_PORT ErrorF(" outb(%#x, %2.2x)\n", port, val); #endif - if (!pciCfg1outb(port, val)) + if (!pciCfg1outb(port, val)) { + assert_port_access_allowed (port, sizeof(val)); outb(Int10Current->ioBase + port, val); + } } } @@ -402,8 +476,10 @@ x_outw(CARD16 port, CARD16 val) ErrorF(" outw(%#x, %4.4x)\n", port, val); #endif - if (!pciCfg1outw(port, val)) + if (!pciCfg1outw(port, val)) { + assert_port_access_allowed (port, sizeof(val)); outw(Int10Current->ioBase + port, val); + } } CARD32 @@ -411,8 +487,10 @@ x_inl(CARD16 port) { CARD32 val; - if (!pciCfg1in(port, &val)) + if (!pciCfg1in(port, &val)) { + assert_port_access_allowed (port, sizeof(val)); val = inl(Int10Current->ioBase + port); + } #ifdef PRINT_PORT ErrorF(" inl(%#x) = %8.8x\n", port, val); @@ -427,8 +505,10 @@ x_outl(CARD16 port, CARD32 val) ErrorF(" outl(%#x, %8.8x)\n", port, val); #endif - if (!pciCfg1out(port, val)) + if (!pciCfg1out(port, val)) { + assert_port_access_allowed (port, sizeof(val)); outl(Int10Current->ioBase + port, val); + } } CARD8 -- 1.5.3.7.1150.g149d432 xorg-server-1.3.0.0-0003-X86EMU-when-emulating-PCI-access-use-the-correct-d.patch: --- NEW FILE xorg-server-1.3.0.0-0003-X86EMU-when-emulating-PCI-access-use-the-correct-d.patch --- >From 8746d1e3a7844e1030eefc6e160756ec43bce246 Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Fri, 11 Jan 2008 19:59:54 -0500 Subject: [PATCH] X86EMU: when emulating PCI access, use the correct device When in x86emu, the PCI emulation routines were being given the TAG of the video device regardless of what the BIOS code that is being emulated asked for. This patch uses the bus:dev:fn numbers that were passed to 0xCF8 when calling the libpciaccess functions after an access to 0xCFC. Thanks to Symbio Technologies for funding my work, and ThinCan for providing hardware :) Signed-off-by: Bart Trojanowski --- hw/xfree86/int10/helper_exec.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index babf99c..cc95ef3 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -549,7 +549,8 @@ Mem_wl(CARD32 addr, CARD32 val) static CARD32 PciCfg1Addr = 0; -#define OFFSET(Cfg1Addr) (Cfg1Addr & 0xff) +#define PCI_OFFSET(x) ((x) & 0x000000ff) +#define PCI_TAG(x) ((x) & 0x00ffff00) static int pciCfg1in(CARD16 addr, CARD32 *val) @@ -559,7 +560,7 @@ pciCfg1in(CARD16 addr, CARD32 *val) return 1; } if (addr == 0xCFC) { - *val = pciReadLong(Int10Current->Tag, OFFSET(PciCfg1Addr)); + *val = pciReadLong(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr)); return 1; } return 0; @@ -573,7 +574,7 @@ pciCfg1out(CARD16 addr, CARD32 val) return 1; } if (addr == 0xCFC) { - pciWriteLong(Int10Current->Tag, OFFSET(PciCfg1Addr), val); + pciWriteLong(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr), val); return 1; } return 0; @@ -591,7 +592,7 @@ pciCfg1inw(CARD16 addr, CARD16 *val) } if ((addr >= 0xCFC) && (addr <= 0xCFF)) { offset = addr - 0xCFC; - *val = pciReadWord(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset); + *val = pciReadWord(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset); return 1; } return 0; @@ -610,7 +611,7 @@ pciCfg1outw(CARD16 addr, CARD16 val) } if ((addr >= 0xCFC) && (addr <= 0xCFF)) { offset = addr - 0xCFC; - pciWriteWord(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset, val); + pciWriteWord(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset, val); return 1; } return 0; @@ -628,7 +629,7 @@ pciCfg1inb(CARD16 addr, CARD8 *val) } if ((addr >= 0xCFC) && (addr <= 0xCFF)) { offset = addr - 0xCFC; - *val = pciReadByte(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset); + *val = pciReadByte(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset); return 1; } return 0; @@ -647,7 +648,7 @@ pciCfg1outb(CARD16 addr, CARD8 val) } if ((addr >= 0xCFC) && (addr <= 0xCFF)) { offset = addr - 0xCFC; - pciWriteByte(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset, val); + pciWriteByte(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset, val); return 1; } return 0; -- 1.5.3.7.1150.g149d432 xorg-server-1.3.0.0-geode-gx2-lx-autodetect.patch: --- NEW FILE xorg-server-1.3.0.0-geode-gx2-lx-autodetect.patch --- diff -urN xorg-server-1.3.0.0.orig/hw/xfree86/common/xf86AutoConfig.c xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c --- xorg-server-1.3.0.0.orig/hw/xfree86/common/xf86AutoConfig.c 2008-03-02 15:07:48.000000000 -0500 +++ xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c 2008-03-02 15:21:19.000000000 -0500 @@ -160,12 +160,18 @@ { /* * things not handled yet: - * amd/cyrix/nsc + * cyrix/nsc * xgi */ switch (info->vendor) { + case 0x100b: + if (info->chipType == 0x0030) + return "amd"; + case 0x1022: + if (info->chipType == 0x2081) + return "amd"; case 0x1142: return "apm"; case 0xedd8: return "ark"; case 0x1a03: return "ast"; xorg-server-1.3.0.0-prefer-openchrome-ugly-hack.patch: --- NEW FILE xorg-server-1.3.0.0-prefer-openchrome-ugly-hack.patch --- --- xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c.orig 2008-02-28 17:00:39.000000000 -0500 +++ xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c 2008-02-28 17:32:45.000000000 -0500 @@ -203,7 +203,13 @@ case 0x3d3d: return "glint"; case 0x1023: return "trident"; case 0x100c: return "tseng"; - case 0x1106: return "via"; + case 0x1106: + /* Prefer openchrome if available before via driver */ + if(!access(DEFAULT_MODULE_PATH "/drivers/openchrome_drv.so", R_OK)) { + return "openchrome"; + } else { + return "via"; + } case 0x15ad: return "vmware"; default: break; } Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-8/xorg-x11-server.spec,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- xorg-x11-server.spec 12 Feb 2008 16:46:24 -0000 1.270 +++ xorg-x11-server.spec 2 Mar 2008 21:30:46 -0000 1.271 @@ -9,7 +9,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.3.0.0 -Release: 42%{?dist} +Release: 43%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -81,6 +81,11 @@ Patch2018: xserver-1.3.0-late-sigusr1.patch Patch2019: xserver-1.3.0-yet-more-vt-ioctl-hate.patch Patch2020: xserver-1.3.0-update-edid-quirks.patch +Patch2021: xorg-server-1.3.0.0-prefer-openchrome-ugly-hack.patch +Patch2022: xorg-server-1.3.0.0-0001-X86EMU-handle-CPUID-instruction.patch +Patch2023: xorg-server-1.3.0.0-0003-X86EMU-when-emulating-PCI-access-use-the-correct-d.patch +Patch2024: xorg-server-1.3.0.0-0002-X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch +Patch2025: xorg-server-1.3.0.0-geode-gx2-lx-autodetect.patch # assorted PCI layer shenanigans. oh the pain. Patch2500: xorg-x11-server-1.2.99-unbreak-domain.patch @@ -360,6 +365,11 @@ %patch2018 -p1 -b .sigusr1 %patch2019 -p1 -b .vt-ioctl-hate %patch2020 -p1 -b .more-quirk-patch +%patch2021 -p1 -b .prefer-openchrome-ugly-hack +%patch2022 -p1 -b .X86EMU-handle-CPUID-instruction +%patch2023 -p1 -b .X86EMU-added-blacklist +%patch2024 -p1 -b .X86EMU-when-emulating-PCI +%patch2025 -p1 -b .geode-gx2-lx-autodetect %patch2500 -p1 -b .unbreak-domains %patch2501 -p1 -b .pci-bus-count @@ -643,6 +653,17 @@ %changelog +* Sun Mar 02 2008 Warren Togami 1.3.0.0-43 +- xorg-server-1.3.0.0-prefer-openchrome-ugly-hack.patch: + Prefer openchrome to via driver during autoconfiguration. +- xorg-server-1.3.0.0-0001-X86EMU-handle-CPUID-instruction.patch + xorg-server-1.3.0.0-0002-X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch + xorg-server-1.3.0.0-0003-X86EMU-when-emulating-PCI-access-use-the-correct-d.patch + X86EMU fixes that allow amd driver work with a few broken BIOS +- xorg-server-1.3.0.0-geode-gx2-lx-autodetect.patch: + Autoconfigure AMD Geode GX2 100b:0030 + AMD Geode LX 1022:2081 + * Tue Feb 12 2008 Adam Jackson 1.3.0.0-42 - xserver-1.3.0-avoid-ps2-probe.patch: Delete an irrelevant hunk against the module loader that broke Xorg -configure. (#397461) From fedora-extras-commits at redhat.com Sun Mar 2 21:31:55 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 21:31:55 GMT Subject: rpms/splat/devel citydecoder.man, NONE, 1.1 splat-1.2-build.patch, NONE, 1.1 splat-1.2-gcc.patch, NONE, 1.1 splat-1.2-parens.patch, NONE, 1.1 splat.spec, NONE, 1.1 srtm2sdf.man, NONE, 1.1 usgs2sdf.man, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803022131.m22LVtlR018994@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/splat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18859/devel Modified Files: .cvsignore sources Added Files: citydecoder.man splat-1.2-build.patch splat-1.2-gcc.patch splat-1.2-parens.patch splat.spec srtm2sdf.man usgs2sdf.man Log Message: Committing in splat-1.2.1 for devel. Modified Files: devel/.cvsignore devel/sources Added Files: devel/citydecoder.man devel/splat-1.2-build.patch devel/splat-1.2-gcc.patch devel/splat-1.2-parens.patch devel/splat.spec devel/srtm2sdf.man devel/usgs2sdf.man --- NEW FILE citydecoder.man --- .\" Man page for citydecoder .\" Created by copying text from utils/README .TH man 1 "09 December 2007" "1.0" "citydecoder" .SH NAME citydecoder \- Generate city/site data files files for use with SPLAT from U.S. Census Bureau files of Incorporated Places/Census Designated Places .SH SYNOPSIS .B citydecoder file .SH DESCRIPTION .B citydecoder is an utility that reads U.S. Census Bureau files of Incorporated Places/Census Designated Places, and generates city/site data files for use with SPLAT! software. Files for use with this utility are available for download free of charge from: http://www.census.gov/geo/www/cob/bdy_files.html. .P Please select the ARC/INFO Ungenerate (ASCII) Metadata Cartographic Boundary Files from this site and unzip them prior to importing them to citydecoder. U.S. Census files are cataloged by the two digit FIPS code for the region (state) they represent. citydecoder takes as an argument the two-letter file prefix plus the FIPS code of the region or state being processed. .SH EXAMPLES citydecoder pl34 .SH FILES .P .I /usr/bin/citydecoder .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Sindre Pedersen Bj??rdal (foolish at guezz.net) .fi .SH HISTORY 2007 \- Text copyed from README splat-1.2-build.patch: --- NEW FILE splat-1.2-build.patch --- diff -up splat-1.2.1/build.spc splat-1.2.1/build --- splat-1.2.1/build.spc 2008-02-26 20:31:34.000000000 -0600 +++ splat-1.2.1/build 2008-02-26 20:37:44.000000000 -0600 @@ -8,13 +8,19 @@ cpu=`uname -m` if [ $cpu == "x86_64" ]; then cpu="x86-64" +elif [ $cpu == "ppc" ]; then + MARCH = "" +elif [ $cpu == "ppc64" ]; then + MARCH = "" +else + MARCH = " -march=$cpu " fi build_splat() { echo -n "Compiling SPLAT!... " ## g++ -Wall -O3 -s -lm -lbz2 -fomit-frame-pointer -march=$cpu itm.cpp splat.cpp -o splat - g++ -Wall -O3 -fomit-frame-pointer -ffast-math -march=$cpu itm.cpp splat.cpp -lm -lbz2 -o splat + g++ -Wall -O3 -fomit-frame-pointer -ffast-math $MARCH itm.cpp splat.cpp -lm -lbz2 -o splat echo "Done!" } splat-1.2-gcc.patch: --- NEW FILE splat-1.2-gcc.patch --- diff -up splat-1.2.1/splat.cpp.spc splat-1.2.1/splat.cpp --- splat-1.2.1/splat.cpp.spc 2008-02-25 12:17:10.000000000 -0600 +++ splat-1.2.1/splat.cpp 2008-02-25 12:17:50.000000000 -0600 @@ -6036,7 +6036,7 @@ void WriteKML(struct site source, struct fflush(stdout); } -int main(char argc, char *argv[]) +int main(int argc, char *argv[]) { int x, y, z=0, min_lat, min_lon, max_lat, max_lon, rxlat, rxlon, txlat, txlon, west_min, west_max, splat-1.2-parens.patch: --- NEW FILE splat-1.2-parens.patch --- diff -up splat-1.2.1/splat.cpp.spc splat-1.2.1/splat.cpp --- splat-1.2.1/splat.cpp.spc 2008-02-26 20:47:36.000000000 -0600 +++ splat-1.2.1/splat.cpp 2008-02-26 20:49:16.000000000 -0600 @@ -2799,7 +2799,7 @@ void PlotLRPath(struct site source, stru /* Mark this point as being analyzed */ - PutMask(path.lat[y],path.lon[y],(GetMask(path.lat[y],path.lon[y])&7)+mask_value<<3); + PutMask(path.lat[y],path.lon[y],(GetMask(path.lat[y],path.lon[y])&7)+(mask_value<<3)); } } } --- NEW FILE splat.spec --- Name: splat Version: 1.2.1 Release: 6%{?dist} Summary: Analyze point-to-point terrestrial RF communication links Group: Applications/Communications License: GPLv2+ URL: http://www.qsl.net/kd2bd/splat.html Source0: http://www.ibiblio.org/pub/linux/apps/ham/%{name}-%{version}.tar.bz2 #man pages for utilities, generated from utils README file Source1: citydecoder.man Source2: srtm2sdf.man Source3: usgs2sdf.man Patch0: splat-1.2-gcc.patch Patch1: splat-1.2-build.patch Patch2: splat-1.2-parens.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel BuildRequires: groff, desktop-file-utils #Requires: %description SPLAT! is a Surface Path Length And Terrain analysis application written for Linux and Unix workstations. SPLAT! analyzes point-to-point terrestrial RF communication links, and provides information useful to communication system designers and site engineers. %package utils Summary: Utilities for use with SPLAT! Group: Applications/Communications Requires: %{name} = %{version}-%{release} %description utils Utilities for use with SPLAT! Includes: citydecoder srtm2sdf usg2sdf %prep %setup -q %patch0 -p1 -b .gcc %patch1 -p1 -b .ppc %patch2 -p1 -b .parens #fix end of line encoding %{__sed} -i 's/\r//' utils/fips.txt %build #uses custom build scripts ./build all #build additional man pages groff -e -T ascii -man %{SOURCE1} > $RPM_BUILD_DIR/%{name}-%{version}/utils/citydecoder.1 groff -e -T ascii -man %{SOURCE2} > $RPM_BUILD_DIR/%{name}-%{version}/utils/srtm2sdf.1 groff -e -T ascii -man %{SOURCE3} > $RPM_BUILD_DIR/%{name}-%{version}/utils/usgs2sdf.1 %install rm -rf $RPM_BUILD_ROOT #manual install, easier than patching upstream custom install script install -D -m 0755 splat $RPM_BUILD_ROOT%{_bindir}/splat install -D -m 0644 docs/english/man/splat.1 $RPM_BUILD_ROOT%{_mandir}/man1/splat.1 install -D -m 0644 docs/spanish/man/splat.1 $RPM_BUILD_ROOT%{_mandir}/es/man1/splat.1 #utils install -D -m 0755 utils/citydecoder $RPM_BUILD_ROOT%{_bindir}/citydecoder install -D -m 0755 utils/usgs2sdf $RPM_BUILD_ROOT%{_bindir}/usgs2sdf install -D -m 0755 utils/srtm2sdf $RPM_BUILD_ROOT%{_bindir}/srtm2sdf #additional man pagers install -D -m 0644 utils/citydecoder.1 $RPM_BUILD_ROOT%{_mandir}/man1/citydecoder.1 install -D -m 0644 utils/srtm2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/srtm2sdf.1 install -D -m 0644 utils/usgs2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/usgs2sdf.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES COPYING README %doc sample_data %{_bindir}/splat %{_mandir}/man?/splat* %{_mandir}/es/man?/splat* %files utils %doc COPYING utils/README utils/fips.txt %{_bindir}/citydecoder %{_bindir}/srtm2sdf %{_bindir}/usgs2sdf %{_mandir}/man?/citydecoder* %{_mandir}/man?/srtm2sdf* %{_mandir}/man?/usgs2sdf* %changelog * Thu Feb 28 2008 Steve Conklin - 1.2.1-6 - Silly, there's no gui. Removed desktop and icon files. * Thu Feb 28 2008 Steve Conklin - 1.2.1-5 - installed desktop and icon files with main package, not utils * Tue Feb 26 2008 Steve Conklin - 1.2.1-4 - removed erroneous -march flag for ppc * Mon Feb 25 2008 Steve Conklin - 1.2.1-3 - Fixed declaration that the new gcc didn't like * Tue Feb 19 2008 Steve Conklin - 1.2.1-2 - Added desktop file and icon * Sun Dec 09 2007 Sindre Pedersen Bj??rdal - 1.2.1-1 - Initial Build --- NEW FILE srtm2sdf.man --- .\" Man page for srtm2sdf .\" Created by copying text from utils/README .TH man 1 "09 December 2007" "1.0" "srtm2sdf" .SH NAME srtm2sdf \- Generate SPLAT Data Files (SDFs) from 3-arc second STS-99 Space Shuttle Topography Mission (SRTM-3) elevation data files. .SH SYNOPSIS .B srtm2sdf [options] file .SH DESCRIPTION .B srtm2sdf is a utility that generates SPLAT Data Files (SDFs) from 3-arc second STS-99 Space Shuttle Topography Mission (SRTM-3) elevation data files. This data is of a much higher quality than that contained in older USGS Digital Elevation Models of the same resolution. However, many SRTM-3 Version 2 elevation models contain data "voids" and "wells" that are the consequence of the radar mapping process. .P The srtm2sdf utility has the ability to detect and replace SRTM data outliers with equivalent SDF data created through the usgs2sdf utility (below). If equivalent USGS-derived SPLAT Data Files are not available, SRTM outliers are handled either through adjacent pixel averaging, or by threshold limiting using user-specified limits. Of all three methods, the USGS-derived SDF replacement method yields the best results. .SH OPTIONS The srtm2sdf utility accepts command-line options as follows: .P .IP -d used to specify the directory path to the location of existing SDF files The -d option overridesthe default path specified in your $HOME/.splat_path file. .P .IP -n used to specify the elevation (in meters) below which SRTM data is replaced. Below this limit, SRTM elevation data is either replaced using existing SDF equivalent files, or averaged among adjacent elevation data points. The default threshold for the replacement limit is sea-level (0 meters). Unless elevations below sea-level are known to exist for the region being processed by the srtm2sdf utility, the -n option need not be specified. .SH EXAMPLES srtm2sdf \ N40W074.hgt .P srtm2sdf \-d /cdrom/sdf N40W074.hgt .P srtm2sdf \-d /dev/null N40W074.hgt .P (/dev/null prevents USGS data replacement from taking place) srtm2sdf \-n \-5 N40W074.hgt .SH FILES .P .I /usr/bin/srtm2sdf .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Sindre Pedersen Bj??rdal (foolish at guezz.net) .fi .SH HISTORY 2007 \- Text copyed from README --- NEW FILE usgs2sdf.man --- .\" Man page for usgs2sdf .\" Created by copying text from utils/README .TH man 1 "09 December 2007" "1.0" "usgs2sdf" .SH NAME usgs2sdf \- Generate SPLAT Data Files (SDFs) from uncompressed delimited Digital Elevation Model Data from the US Geological Survey Designated Places .SH SYNOPSIS .B usgs2sdf file .SH DESCRIPTION The .B usgs2sdf utility takes as an argument the name of an uncompressed delimited Digital Elevation Model Data (DEM) downloaded from the US Geological Survey, and generates a SPLAT Data File (SDF) compatible with SPLAT! Software. .SH EXAMPLES usgs2sdf wilmington-e .SH FILES .P .I /usr/bin/usgs2sdf .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Sindre Pedersen Bjordal (foolish at guezz.net) .fi .SH HISTORY 2007 \- Text copyed from README Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/splat/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2008 17:24:36 -0000 1.1 +++ .cvsignore 2 Mar 2008 21:31:20 -0000 1.2 @@ -0,0 +1 @@ +splat-1.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/splat/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:24:36 -0000 1.1 +++ sources 2 Mar 2008 21:31:20 -0000 1.2 @@ -0,0 +1 @@ +46a223f7db0d59dc79dd5467cdebf14d splat-1.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 21:31:57 2008 From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel)) Date: Sun, 2 Mar 2008 21:31:57 GMT Subject: rpms/dhcpv6/devel .cvsignore, 1.14, 1.15 dhcpv6.spec, 1.82, 1.83 sources, 1.14, 1.15 Message-ID: <200803022131.m22LVvrS019002@cvs-int.fedora.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcpv6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18931 Modified Files: .cvsignore dhcpv6.spec sources Log Message: * Sun Mar 02 2008 David Cantrell - 1.0.13-1 - Upgrade to dhcpv6-1.0.13, major changes: Actually remove -fvisibility=hidden Avoid symbol collisons with dprintf() Try to use network-functions to update resolv.conf Verify length of RELAY_REPL buffer correctly Update 'now' when checking expiration for each timer Add domain list option check to specify dnslist Fix RFC3315 section 17.2.2 bug Do not override yy_init so we're more compatible with flex Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 2 Mar 2008 04:01:53 -0000 1.14 +++ .cvsignore 2 Mar 2008 21:31:22 -0000 1.15 @@ -1 +1 @@ -dhcpv6-1.0.12.tar.gz +dhcpv6-1.0.13.tar.gz Index: dhcpv6.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- dhcpv6.spec 2 Mar 2008 04:01:53 -0000 1.82 +++ dhcpv6.spec 2 Mar 2008 21:31:22 -0000 1.83 @@ -3,7 +3,7 @@ Summary: DHCPv6 - DHCP server and client for IPv6 Name: dhcpv6 -Version: 1.0.12 +Version: 1.0.13 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Daemons @@ -157,6 +157,17 @@ %{_libdir}/libdhcp6client.a %changelog +* Sun Mar 02 2008 David Cantrell - 1.0.13-1 +- Upgrade to dhcpv6-1.0.13, major changes: + Actually remove -fvisibility=hidden + Avoid symbol collisons with dprintf() + Try to use network-functions to update resolv.conf + Verify length of RELAY_REPL buffer correctly + Update 'now' when checking expiration for each timer + Add domain list option check to specify dnslist + Fix RFC3315 section 17.2.2 bug + Do not override yy_init so we're more compatible with flex + * Sat Mar 01 2008 David Cantrell - 1.0.12-1 - Upgrade to dhcpv6-1.0.12 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 Mar 2008 04:01:53 -0000 1.14 +++ sources 2 Mar 2008 21:31:22 -0000 1.15 @@ -1 +1 @@ -75d44a46f5807f546710f091426eab45 dhcpv6-1.0.12.tar.gz +92554560f198a630688d893274698158 dhcpv6-1.0.13.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 21:35:28 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 21:35:28 GMT Subject: rpms/splat/F-8 citydecoder.man, NONE, 1.1 splat-1.2-build.patch, NONE, 1.1 splat-1.2-gcc.patch, NONE, 1.1 splat-1.2-parens.patch, NONE, 1.1 splat.spec, NONE, 1.1 srtm2sdf.man, NONE, 1.1 usgs2sdf.man, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200803022135.m22LZSek019158@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/splat/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123 Modified Files: sources Added Files: citydecoder.man splat-1.2-build.patch splat-1.2-gcc.patch splat-1.2-parens.patch splat.spec srtm2sdf.man usgs2sdf.man Log Message: * Thu Feb 28 2008 Steve Conklin - 1.2.1-6 - Silly, there's no gui. Removed desktop and icon files. --- NEW FILE citydecoder.man --- .\" Man page for citydecoder .\" Created by copying text from utils/README .TH man 1 "09 December 2007" "1.0" "citydecoder" .SH NAME citydecoder \- Generate city/site data files files for use with SPLAT from U.S. Census Bureau files of Incorporated Places/Census Designated Places .SH SYNOPSIS .B citydecoder file .SH DESCRIPTION .B citydecoder is an utility that reads U.S. Census Bureau files of Incorporated Places/Census Designated Places, and generates city/site data files for use with SPLAT! software. Files for use with this utility are available for download free of charge from: http://www.census.gov/geo/www/cob/bdy_files.html. .P Please select the ARC/INFO Ungenerate (ASCII) Metadata Cartographic Boundary Files from this site and unzip them prior to importing them to citydecoder. U.S. Census files are cataloged by the two digit FIPS code for the region (state) they represent. citydecoder takes as an argument the two-letter file prefix plus the FIPS code of the region or state being processed. .SH EXAMPLES citydecoder pl34 .SH FILES .P .I /usr/bin/citydecoder .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Sindre Pedersen Bj??rdal (foolish at guezz.net) .fi .SH HISTORY 2007 \- Text copyed from README splat-1.2-build.patch: --- NEW FILE splat-1.2-build.patch --- diff -up splat-1.2.1/build.spc splat-1.2.1/build --- splat-1.2.1/build.spc 2008-02-26 20:31:34.000000000 -0600 +++ splat-1.2.1/build 2008-02-26 20:37:44.000000000 -0600 @@ -8,13 +8,19 @@ cpu=`uname -m` if [ $cpu == "x86_64" ]; then cpu="x86-64" +elif [ $cpu == "ppc" ]; then + MARCH = "" +elif [ $cpu == "ppc64" ]; then + MARCH = "" +else + MARCH = " -march=$cpu " fi build_splat() { echo -n "Compiling SPLAT!... " ## g++ -Wall -O3 -s -lm -lbz2 -fomit-frame-pointer -march=$cpu itm.cpp splat.cpp -o splat - g++ -Wall -O3 -fomit-frame-pointer -ffast-math -march=$cpu itm.cpp splat.cpp -lm -lbz2 -o splat + g++ -Wall -O3 -fomit-frame-pointer -ffast-math $MARCH itm.cpp splat.cpp -lm -lbz2 -o splat echo "Done!" } splat-1.2-gcc.patch: --- NEW FILE splat-1.2-gcc.patch --- diff -up splat-1.2.1/splat.cpp.spc splat-1.2.1/splat.cpp --- splat-1.2.1/splat.cpp.spc 2008-02-25 12:17:10.000000000 -0600 +++ splat-1.2.1/splat.cpp 2008-02-25 12:17:50.000000000 -0600 @@ -6036,7 +6036,7 @@ void WriteKML(struct site source, struct fflush(stdout); } -int main(char argc, char *argv[]) +int main(int argc, char *argv[]) { int x, y, z=0, min_lat, min_lon, max_lat, max_lon, rxlat, rxlon, txlat, txlon, west_min, west_max, splat-1.2-parens.patch: --- NEW FILE splat-1.2-parens.patch --- diff -up splat-1.2.1/splat.cpp.spc splat-1.2.1/splat.cpp --- splat-1.2.1/splat.cpp.spc 2008-02-26 20:47:36.000000000 -0600 +++ splat-1.2.1/splat.cpp 2008-02-26 20:49:16.000000000 -0600 @@ -2799,7 +2799,7 @@ void PlotLRPath(struct site source, stru /* Mark this point as being analyzed */ - PutMask(path.lat[y],path.lon[y],(GetMask(path.lat[y],path.lon[y])&7)+mask_value<<3); + PutMask(path.lat[y],path.lon[y],(GetMask(path.lat[y],path.lon[y])&7)+(mask_value<<3)); } } } --- NEW FILE splat.spec --- Name: splat Version: 1.2.1 Release: 6%{?dist} Summary: Analyze point-to-point terrestrial RF communication links Group: Applications/Communications License: GPLv2+ URL: http://www.qsl.net/kd2bd/splat.html Source0: http://www.ibiblio.org/pub/linux/apps/ham/%{name}-%{version}.tar.bz2 #man pages for utilities, generated from utils README file Source1: citydecoder.man Source2: srtm2sdf.man Source3: usgs2sdf.man Patch0: splat-1.2-gcc.patch Patch1: splat-1.2-build.patch Patch2: splat-1.2-parens.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel BuildRequires: groff, desktop-file-utils #Requires: %description SPLAT! is a Surface Path Length And Terrain analysis application written for Linux and Unix workstations. SPLAT! analyzes point-to-point terrestrial RF communication links, and provides information useful to communication system designers and site engineers. %package utils Summary: Utilities for use with SPLAT! Group: Applications/Communications Requires: %{name} = %{version}-%{release} %description utils Utilities for use with SPLAT! Includes: citydecoder srtm2sdf usg2sdf %prep %setup -q %patch0 -p1 -b .gcc %patch1 -p1 -b .ppc %patch2 -p1 -b .parens #fix end of line encoding %{__sed} -i 's/\r//' utils/fips.txt %build #uses custom build scripts ./build all #build additional man pages groff -e -T ascii -man %{SOURCE1} > $RPM_BUILD_DIR/%{name}-%{version}/utils/citydecoder.1 groff -e -T ascii -man %{SOURCE2} > $RPM_BUILD_DIR/%{name}-%{version}/utils/srtm2sdf.1 groff -e -T ascii -man %{SOURCE3} > $RPM_BUILD_DIR/%{name}-%{version}/utils/usgs2sdf.1 %install rm -rf $RPM_BUILD_ROOT #manual install, easier than patching upstream custom install script install -D -m 0755 splat $RPM_BUILD_ROOT%{_bindir}/splat install -D -m 0644 docs/english/man/splat.1 $RPM_BUILD_ROOT%{_mandir}/man1/splat.1 install -D -m 0644 docs/spanish/man/splat.1 $RPM_BUILD_ROOT%{_mandir}/es/man1/splat.1 #utils install -D -m 0755 utils/citydecoder $RPM_BUILD_ROOT%{_bindir}/citydecoder install -D -m 0755 utils/usgs2sdf $RPM_BUILD_ROOT%{_bindir}/usgs2sdf install -D -m 0755 utils/srtm2sdf $RPM_BUILD_ROOT%{_bindir}/srtm2sdf #additional man pagers install -D -m 0644 utils/citydecoder.1 $RPM_BUILD_ROOT%{_mandir}/man1/citydecoder.1 install -D -m 0644 utils/srtm2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/srtm2sdf.1 install -D -m 0644 utils/usgs2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/usgs2sdf.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES COPYING README %doc sample_data %{_bindir}/splat %{_mandir}/man?/splat* %{_mandir}/es/man?/splat* %files utils %doc COPYING utils/README utils/fips.txt %{_bindir}/citydecoder %{_bindir}/srtm2sdf %{_bindir}/usgs2sdf %{_mandir}/man?/citydecoder* %{_mandir}/man?/srtm2sdf* %{_mandir}/man?/usgs2sdf* %changelog * Thu Feb 28 2008 Steve Conklin - 1.2.1-6 - Silly, there's no gui. Removed desktop and icon files. * Thu Feb 28 2008 Steve Conklin - 1.2.1-5 - installed desktop and icon files with main package, not utils * Tue Feb 26 2008 Steve Conklin - 1.2.1-4 - removed erroneous -march flag for ppc * Mon Feb 25 2008 Steve Conklin - 1.2.1-3 - Fixed declaration that the new gcc didn't like * Tue Feb 19 2008 Steve Conklin - 1.2.1-2 - Added desktop file and icon * Sun Dec 09 2007 Sindre Pedersen Bj??rdal - 1.2.1-1 - Initial Build --- NEW FILE srtm2sdf.man --- .\" Man page for srtm2sdf .\" Created by copying text from utils/README .TH man 1 "09 December 2007" "1.0" "srtm2sdf" .SH NAME srtm2sdf \- Generate SPLAT Data Files (SDFs) from 3-arc second STS-99 Space Shuttle Topography Mission (SRTM-3) elevation data files. .SH SYNOPSIS .B srtm2sdf [options] file .SH DESCRIPTION .B srtm2sdf is a utility that generates SPLAT Data Files (SDFs) from 3-arc second STS-99 Space Shuttle Topography Mission (SRTM-3) elevation data files. This data is of a much higher quality than that contained in older USGS Digital Elevation Models of the same resolution. However, many SRTM-3 Version 2 elevation models contain data "voids" and "wells" that are the consequence of the radar mapping process. .P The srtm2sdf utility has the ability to detect and replace SRTM data outliers with equivalent SDF data created through the usgs2sdf utility (below). If equivalent USGS-derived SPLAT Data Files are not available, SRTM outliers are handled either through adjacent pixel averaging, or by threshold limiting using user-specified limits. Of all three methods, the USGS-derived SDF replacement method yields the best results. .SH OPTIONS The srtm2sdf utility accepts command-line options as follows: .P .IP -d used to specify the directory path to the location of existing SDF files The -d option overridesthe default path specified in your $HOME/.splat_path file. .P .IP -n used to specify the elevation (in meters) below which SRTM data is replaced. Below this limit, SRTM elevation data is either replaced using existing SDF equivalent files, or averaged among adjacent elevation data points. The default threshold for the replacement limit is sea-level (0 meters). Unless elevations below sea-level are known to exist for the region being processed by the srtm2sdf utility, the -n option need not be specified. .SH EXAMPLES srtm2sdf \ N40W074.hgt .P srtm2sdf \-d /cdrom/sdf N40W074.hgt .P srtm2sdf \-d /dev/null N40W074.hgt .P (/dev/null prevents USGS data replacement from taking place) srtm2sdf \-n \-5 N40W074.hgt .SH FILES .P .I /usr/bin/srtm2sdf .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Sindre Pedersen Bj??rdal (foolish at guezz.net) .fi .SH HISTORY 2007 \- Text copyed from README --- NEW FILE usgs2sdf.man --- .\" Man page for usgs2sdf .\" Created by copying text from utils/README .TH man 1 "09 December 2007" "1.0" "usgs2sdf" .SH NAME usgs2sdf \- Generate SPLAT Data Files (SDFs) from uncompressed delimited Digital Elevation Model Data from the US Geological Survey Designated Places .SH SYNOPSIS .B usgs2sdf file .SH DESCRIPTION The .B usgs2sdf utility takes as an argument the name of an uncompressed delimited Digital Elevation Model Data (DEM) downloaded from the US Geological Survey, and generates a SPLAT Data File (SDF) compatible with SPLAT! Software. .SH EXAMPLES usgs2sdf wilmington-e .SH FILES .P .I /usr/bin/usgs2sdf .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Sindre Pedersen Bjordal (foolish at guezz.net) .fi .SH HISTORY 2007 \- Text copyed from README Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/splat/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:24:36 -0000 1.1 +++ sources 2 Mar 2008 21:34:50 -0000 1.2 @@ -0,0 +1 @@ +46a223f7db0d59dc79dd5467cdebf14d splat-1.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 21:37:13 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 21:37:13 GMT Subject: rpms/splat/F-7 citydecoder.man, NONE, 1.1 splat-1.2-build.patch, NONE, 1.1 splat-1.2-gcc.patch, NONE, 1.1 splat-1.2-parens.patch, NONE, 1.1 splat.spec, NONE, 1.1 srtm2sdf.man, NONE, 1.1 usgs2sdf.man, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200803022137.m22LbDlK019263@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/splat/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19219 Modified Files: sources Added Files: citydecoder.man splat-1.2-build.patch splat-1.2-gcc.patch splat-1.2-parens.patch splat.spec srtm2sdf.man usgs2sdf.man Log Message: * Thu Feb 28 2008 Steve Conklin - 1.2.1-6 - Silly, there's no gui. Removed desktop and icon files. --- NEW FILE citydecoder.man --- .\" Man page for citydecoder .\" Created by copying text from utils/README .TH man 1 "09 December 2007" "1.0" "citydecoder" .SH NAME citydecoder \- Generate city/site data files files for use with SPLAT from U.S. Census Bureau files of Incorporated Places/Census Designated Places .SH SYNOPSIS .B citydecoder file .SH DESCRIPTION .B citydecoder is an utility that reads U.S. Census Bureau files of Incorporated Places/Census Designated Places, and generates city/site data files for use with SPLAT! software. Files for use with this utility are available for download free of charge from: http://www.census.gov/geo/www/cob/bdy_files.html. .P Please select the ARC/INFO Ungenerate (ASCII) Metadata Cartographic Boundary Files from this site and unzip them prior to importing them to citydecoder. U.S. Census files are cataloged by the two digit FIPS code for the region (state) they represent. citydecoder takes as an argument the two-letter file prefix plus the FIPS code of the region or state being processed. .SH EXAMPLES citydecoder pl34 .SH FILES .P .I /usr/bin/citydecoder .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Sindre Pedersen Bj??rdal (foolish at guezz.net) .fi .SH HISTORY 2007 \- Text copyed from README splat-1.2-build.patch: --- NEW FILE splat-1.2-build.patch --- diff -up splat-1.2.1/build.spc splat-1.2.1/build --- splat-1.2.1/build.spc 2008-02-26 20:31:34.000000000 -0600 +++ splat-1.2.1/build 2008-02-26 20:37:44.000000000 -0600 @@ -8,13 +8,19 @@ cpu=`uname -m` if [ $cpu == "x86_64" ]; then cpu="x86-64" +elif [ $cpu == "ppc" ]; then + MARCH = "" +elif [ $cpu == "ppc64" ]; then + MARCH = "" +else + MARCH = " -march=$cpu " fi build_splat() { echo -n "Compiling SPLAT!... " ## g++ -Wall -O3 -s -lm -lbz2 -fomit-frame-pointer -march=$cpu itm.cpp splat.cpp -o splat - g++ -Wall -O3 -fomit-frame-pointer -ffast-math -march=$cpu itm.cpp splat.cpp -lm -lbz2 -o splat + g++ -Wall -O3 -fomit-frame-pointer -ffast-math $MARCH itm.cpp splat.cpp -lm -lbz2 -o splat echo "Done!" } splat-1.2-gcc.patch: --- NEW FILE splat-1.2-gcc.patch --- diff -up splat-1.2.1/splat.cpp.spc splat-1.2.1/splat.cpp --- splat-1.2.1/splat.cpp.spc 2008-02-25 12:17:10.000000000 -0600 +++ splat-1.2.1/splat.cpp 2008-02-25 12:17:50.000000000 -0600 @@ -6036,7 +6036,7 @@ void WriteKML(struct site source, struct fflush(stdout); } -int main(char argc, char *argv[]) +int main(int argc, char *argv[]) { int x, y, z=0, min_lat, min_lon, max_lat, max_lon, rxlat, rxlon, txlat, txlon, west_min, west_max, splat-1.2-parens.patch: --- NEW FILE splat-1.2-parens.patch --- diff -up splat-1.2.1/splat.cpp.spc splat-1.2.1/splat.cpp --- splat-1.2.1/splat.cpp.spc 2008-02-26 20:47:36.000000000 -0600 +++ splat-1.2.1/splat.cpp 2008-02-26 20:49:16.000000000 -0600 @@ -2799,7 +2799,7 @@ void PlotLRPath(struct site source, stru /* Mark this point as being analyzed */ - PutMask(path.lat[y],path.lon[y],(GetMask(path.lat[y],path.lon[y])&7)+mask_value<<3); + PutMask(path.lat[y],path.lon[y],(GetMask(path.lat[y],path.lon[y])&7)+(mask_value<<3)); } } } --- NEW FILE splat.spec --- Name: splat Version: 1.2.1 Release: 6%{?dist} Summary: Analyze point-to-point terrestrial RF communication links Group: Applications/Communications License: GPLv2+ URL: http://www.qsl.net/kd2bd/splat.html Source0: http://www.ibiblio.org/pub/linux/apps/ham/%{name}-%{version}.tar.bz2 #man pages for utilities, generated from utils README file Source1: citydecoder.man Source2: srtm2sdf.man Source3: usgs2sdf.man Patch0: splat-1.2-gcc.patch Patch1: splat-1.2-build.patch Patch2: splat-1.2-parens.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel BuildRequires: groff, desktop-file-utils #Requires: %description SPLAT! is a Surface Path Length And Terrain analysis application written for Linux and Unix workstations. SPLAT! analyzes point-to-point terrestrial RF communication links, and provides information useful to communication system designers and site engineers. %package utils Summary: Utilities for use with SPLAT! Group: Applications/Communications Requires: %{name} = %{version}-%{release} %description utils Utilities for use with SPLAT! Includes: citydecoder srtm2sdf usg2sdf %prep %setup -q %patch0 -p1 -b .gcc %patch1 -p1 -b .ppc %patch2 -p1 -b .parens #fix end of line encoding %{__sed} -i 's/\r//' utils/fips.txt %build #uses custom build scripts ./build all #build additional man pages groff -e -T ascii -man %{SOURCE1} > $RPM_BUILD_DIR/%{name}-%{version}/utils/citydecoder.1 groff -e -T ascii -man %{SOURCE2} > $RPM_BUILD_DIR/%{name}-%{version}/utils/srtm2sdf.1 groff -e -T ascii -man %{SOURCE3} > $RPM_BUILD_DIR/%{name}-%{version}/utils/usgs2sdf.1 %install rm -rf $RPM_BUILD_ROOT #manual install, easier than patching upstream custom install script install -D -m 0755 splat $RPM_BUILD_ROOT%{_bindir}/splat install -D -m 0644 docs/english/man/splat.1 $RPM_BUILD_ROOT%{_mandir}/man1/splat.1 install -D -m 0644 docs/spanish/man/splat.1 $RPM_BUILD_ROOT%{_mandir}/es/man1/splat.1 #utils install -D -m 0755 utils/citydecoder $RPM_BUILD_ROOT%{_bindir}/citydecoder install -D -m 0755 utils/usgs2sdf $RPM_BUILD_ROOT%{_bindir}/usgs2sdf install -D -m 0755 utils/srtm2sdf $RPM_BUILD_ROOT%{_bindir}/srtm2sdf #additional man pagers install -D -m 0644 utils/citydecoder.1 $RPM_BUILD_ROOT%{_mandir}/man1/citydecoder.1 install -D -m 0644 utils/srtm2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/srtm2sdf.1 install -D -m 0644 utils/usgs2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/usgs2sdf.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES COPYING README %doc sample_data %{_bindir}/splat %{_mandir}/man?/splat* %{_mandir}/es/man?/splat* %files utils %doc COPYING utils/README utils/fips.txt %{_bindir}/citydecoder %{_bindir}/srtm2sdf %{_bindir}/usgs2sdf %{_mandir}/man?/citydecoder* %{_mandir}/man?/srtm2sdf* %{_mandir}/man?/usgs2sdf* %changelog * Thu Feb 28 2008 Steve Conklin - 1.2.1-6 - Silly, there's no gui. Removed desktop and icon files. * Thu Feb 28 2008 Steve Conklin - 1.2.1-5 - installed desktop and icon files with main package, not utils * Tue Feb 26 2008 Steve Conklin - 1.2.1-4 - removed erroneous -march flag for ppc * Mon Feb 25 2008 Steve Conklin - 1.2.1-3 - Fixed declaration that the new gcc didn't like * Tue Feb 19 2008 Steve Conklin - 1.2.1-2 - Added desktop file and icon * Sun Dec 09 2007 Sindre Pedersen Bj??rdal - 1.2.1-1 - Initial Build --- NEW FILE srtm2sdf.man --- .\" Man page for srtm2sdf .\" Created by copying text from utils/README .TH man 1 "09 December 2007" "1.0" "srtm2sdf" .SH NAME srtm2sdf \- Generate SPLAT Data Files (SDFs) from 3-arc second STS-99 Space Shuttle Topography Mission (SRTM-3) elevation data files. .SH SYNOPSIS .B srtm2sdf [options] file .SH DESCRIPTION .B srtm2sdf is a utility that generates SPLAT Data Files (SDFs) from 3-arc second STS-99 Space Shuttle Topography Mission (SRTM-3) elevation data files. This data is of a much higher quality than that contained in older USGS Digital Elevation Models of the same resolution. However, many SRTM-3 Version 2 elevation models contain data "voids" and "wells" that are the consequence of the radar mapping process. .P The srtm2sdf utility has the ability to detect and replace SRTM data outliers with equivalent SDF data created through the usgs2sdf utility (below). If equivalent USGS-derived SPLAT Data Files are not available, SRTM outliers are handled either through adjacent pixel averaging, or by threshold limiting using user-specified limits. Of all three methods, the USGS-derived SDF replacement method yields the best results. .SH OPTIONS The srtm2sdf utility accepts command-line options as follows: .P .IP -d used to specify the directory path to the location of existing SDF files The -d option overridesthe default path specified in your $HOME/.splat_path file. .P .IP -n used to specify the elevation (in meters) below which SRTM data is replaced. Below this limit, SRTM elevation data is either replaced using existing SDF equivalent files, or averaged among adjacent elevation data points. The default threshold for the replacement limit is sea-level (0 meters). Unless elevations below sea-level are known to exist for the region being processed by the srtm2sdf utility, the -n option need not be specified. .SH EXAMPLES srtm2sdf \ N40W074.hgt .P srtm2sdf \-d /cdrom/sdf N40W074.hgt .P srtm2sdf \-d /dev/null N40W074.hgt .P (/dev/null prevents USGS data replacement from taking place) srtm2sdf \-n \-5 N40W074.hgt .SH FILES .P .I /usr/bin/srtm2sdf .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Sindre Pedersen Bj??rdal (foolish at guezz.net) .fi .SH HISTORY 2007 \- Text copyed from README --- NEW FILE usgs2sdf.man --- .\" Man page for usgs2sdf .\" Created by copying text from utils/README .TH man 1 "09 December 2007" "1.0" "usgs2sdf" .SH NAME usgs2sdf \- Generate SPLAT Data Files (SDFs) from uncompressed delimited Digital Elevation Model Data from the US Geological Survey Designated Places .SH SYNOPSIS .B usgs2sdf file .SH DESCRIPTION The .B usgs2sdf utility takes as an argument the name of an uncompressed delimited Digital Elevation Model Data (DEM) downloaded from the US Geological Survey, and generates a SPLAT Data File (SDF) compatible with SPLAT! Software. .SH EXAMPLES usgs2sdf wilmington-e .SH FILES .P .I /usr/bin/usgs2sdf .SH SEE ALSO .BR splat (1), .SH BUGS No known bugs at this time. .SH AUTHOR .nf Sindre Pedersen Bjordal (foolish at guezz.net) .fi .SH HISTORY 2007 \- Text copyed from README Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/splat/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:24:36 -0000 1.1 +++ sources 2 Mar 2008 21:36:38 -0000 1.2 @@ -0,0 +1 @@ +46a223f7db0d59dc79dd5467cdebf14d splat-1.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 21:44:57 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 21:44:57 GMT Subject: rpms/xdx/devel xdx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803022144.m22LivHp019475@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/xdx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19441/devel Modified Files: .cvsignore sources Added Files: xdx.spec Log Message: Committing in xdx-2.4 for devel. Modified Files: devel/.cvsignore devel/sources Added Files: devel/xdx.spec --- NEW FILE xdx.spec --- Name: xdx Version: 2.4 Release: 2%{?dist} Summary: DX-cluster tcp/ip client for amateur radio Group: Applications/Communications License: GPLv2+ URL: http://pg4i.chronos.org.uk/linux/%{name}.html Source0: http://pg4i.chronos.org.uk/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gtk2-devel, gettext, desktop-file-utils #Requires: %description Xdx is a client to connect to a DX-cluster. Dx messages will be displayed in a list, announcements will go to a text display. As well as the usual functions, if you have hamlib installed it can control the radio and set the frequency simply by double clicking a DX-spot (using rigctl). %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --remove-category Application \ $RPM_BUILD_ROOT%{_datadir}/applications/Xdx.desktop #don't include backup file in package rm -f `find $RPM_BUILD_ROOT -name *~` %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc README AUTHORS ChangeLog COPYING NEWS %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/* %{_datadir}/man/man1/%{name}.1.gz %changelog * Thu Feb 28 2008 Robert 'Bob' Jensen 2.4-2 - Submit for review * Tue Dec 05 2007 Robert 'Bob' Jensen 2.4-1 - Upstream update * Thu Nov 22 2007 Sindre Pedersen Bj??rdal 2.3-2 - Update License to GPLv2+ - Add gettext dependency - Add desktop-file-utils shebang - Don't include backup files * Tue Nov 20 2007 Robert 'Bob' Jensen 2.3-1 - Initial SPEC Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xdx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2008 17:16:23 -0000 1.1 +++ .cvsignore 2 Mar 2008 21:44:18 -0000 1.2 @@ -0,0 +1 @@ +xdx-2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xdx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:16:23 -0000 1.1 +++ sources 2 Mar 2008 21:44:18 -0000 1.2 @@ -0,0 +1 @@ +9834e9759f7d6a0b7b2fe200020551d7 xdx-2.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 21:46:55 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 2 Mar 2008 21:46:55 GMT Subject: rpms/scummvm/devel .cvsignore, 1.4, 1.5 scummvm.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200803022146.m22LktsA019624@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19573 Modified Files: .cvsignore scummvm.spec sources Log Message: * Sat Mar 1 2008 Hans de Goede 0.11.1-1 - New upstream version 0.11.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scummvm/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jan 2008 22:55:21 -0000 1.4 +++ .cvsignore 2 Mar 2008 21:46:21 -0000 1.5 @@ -1,2 +1,2 @@ -scummvm-0.11.0.tar.bz2 +scummvm-0.11.1.tar.bz2 scummvm-icons.tar.gz Index: scummvm.spec =================================================================== RCS file: /cvs/extras/rpms/scummvm/devel/scummvm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scummvm.spec 19 Feb 2008 09:38:43 -0000 1.10 +++ scummvm.spec 2 Mar 2008 21:46:21 -0000 1.11 @@ -1,6 +1,6 @@ Name: scummvm -Version: 0.11.0 -Release: 2%{?dist} +Version: 0.11.1 +Release: 1%{?dist} Summary: Interpreter for several adventure games Group: Applications/Emulators License: GPLv2+ @@ -104,6 +104,9 @@ %changelog +* Sat Mar 1 2008 Hans de Goede 0.11.1-1 +- New upstream version 0.11.1 + * Tue Feb 19 2008 Fedora Release Engineering - 0.11.0-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scummvm/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jan 2008 22:55:21 -0000 1.4 +++ sources 2 Mar 2008 21:46:21 -0000 1.5 @@ -1,2 +1,2 @@ -5066301a182b7e0f1da1eec21c80024f scummvm-0.11.0.tar.bz2 +8dc9eb9d18574a7ecfa6586892e0de4e scummvm-0.11.1.tar.bz2 b20d750de2c88e8aefea364afae1776c scummvm-icons.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 21:46:57 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Sun, 2 Mar 2008 21:46:57 GMT Subject: rpms/xdx/F-8 xdx.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200803022146.m22Lkvfp019627@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/xdx/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19584 Modified Files: sources Added Files: xdx.spec Log Message: * Thu Feb 28 2008 Robert 'Bob' Jensen 2.4-2 - Submit for review --- NEW FILE xdx.spec --- Name: xdx Version: 2.4 Release: 2%{?dist} Summary: DX-cluster tcp/ip client for amateur radio Group: Applications/Communications License: GPLv2+ URL: http://pg4i.chronos.org.uk/linux/%{name}.html Source0: http://pg4i.chronos.org.uk/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gtk2-devel, gettext, desktop-file-utils #Requires: %description Xdx is a client to connect to a DX-cluster. Dx messages will be displayed in a list, announcements will go to a text display. As well as the usual functions, if you have hamlib installed it can control the radio and set the frequency simply by double clicking a DX-spot (using rigctl). %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --remove-category Application \ $RPM_BUILD_ROOT%{_datadir}/applications/Xdx.desktop #don't include backup file in package rm -f `find $RPM_BUILD_ROOT -name *~` %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc README AUTHORS ChangeLog COPYING NEWS %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/* %{_datadir}/man/man1/%{name}.1.gz %changelog * Thu Feb 28 2008 Robert 'Bob' Jensen 2.4-2 - Submit for review * Tue Dec 05 2007 Robert 'Bob' Jensen 2.4-1 - Upstream update * Thu Nov 22 2007 Sindre Pedersen Bj??rdal 2.3-2 - Update License to GPLv2+ - Add gettext dependency - Add desktop-file-utils shebang - Don't include backup files * Tue Nov 20 2007 Robert 'Bob' Jensen 2.3-1 - Initial SPEC Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xdx/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 17:16:23 -0000 1.1 +++ sources 2 Mar 2008 21:46:22 -0000 1.2 @@ -0,0 +1 @@ +9834e9759f7d6a0b7b2fe200020551d7 xdx-2.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 2 21:51:37 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 2 Mar 2008 21:51:37 GMT Subject: rpms/ClanLib06/devel ClanLib06.spec,1.11,1.12 Message-ID: <200803022151.m22LpbpM019792@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ClanLib06/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19772 Modified Files: ClanLib06.spec Log Message: * Sun Mar 2 2008 Hans de Goede 0.6.5-12 - Add support for audio output through alsa (original ClanLib only supports OSS??), this also adds support for using pulseaudio through alsa Index: ClanLib06.spec =================================================================== RCS file: /cvs/extras/rpms/ClanLib06/devel/ClanLib06.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ClanLib06.spec 2 Mar 2008 12:46:39 -0000 1.11 +++ ClanLib06.spec 2 Mar 2008 21:51:03 -0000 1.12 @@ -22,6 +22,7 @@ BuildRequires: libICE-devel libXxf86vm-devel xorg-x11-proto-devel BuildRequires: libvorbis-devel libpng-devel libjpeg-devel mikmod-devel BuildRequires: tolua++-devel Hermes-devel freetype-devel autoconf +BuildRequires: alsa-lib-devel Provides: clanlib06 = %{version}-%{release} %description From fedora-extras-commits at redhat.com Sun Mar 2 21:54:28 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Sun, 2 Mar 2008 21:54:28 GMT Subject: rpms/upstart/devel upstart-tty-stack.patch, NONE, 1.1 upstart.spec, 1.4, 1.5 Message-ID: <200803022154.m22LsSYQ019907@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19880/devel Modified Files: upstart.spec Added Files: upstart-tty-stack.patch Log Message: Add tty stack initctl commands upstart-tty-stack.patch: --- NEW FILE upstart-tty-stack.patch --- === modified file 'init/Makefile.am' --- init/Makefile.am 2007-10-11 21:00:43 +0000 +++ init/Makefile.am 2008-02-29 21:38:58 +0000 @@ -16,6 +16,7 @@ init_SOURCES = \ main.c \ + tty.c tty.h\ errors.h paths.h \ process.c process.h \ job.c job.h \ === modified file 'init/control.c' --- init/control.c 2007-03-13 17:25:34 +0000 +++ init/control.c 2008-03-01 08:00:46 +0000 @@ -43,6 +43,7 @@ #include #include "job.h" +#include "tty.h" #include "control.h" #include "notify.h" @@ -57,6 +58,11 @@ static int control_job_find (void *data, pid_t pid, UpstartMessageType type, const char *pattern); +static int control_push_tty (void *data, pid_t pid, + UpstartMessageType type, + const char *device); +static int control_pop_tty (void *data, pid_t pid, + UpstartMessageType type); static int control_job_query (void *data, pid_t pid, UpstartMessageType type, const char *name, unsigned int id); @@ -96,6 +102,10 @@ static UpstartMessage message_handlers[] = { { -1, UPSTART_VERSION_QUERY, (UpstartMessageHandler)control_version_query }, + { -1, UPSTART_PUSH_TTY, + (UpstartMessageHandler)control_push_tty }, + { -1, UPSTART_POP_TTY, + (UpstartMessageHandler)control_pop_tty }, { -1, UPSTART_LOG_PRIORITY, (UpstartMessageHandler)control_log_priority }, { -1, UPSTART_JOB_FIND, @@ -308,6 +318,66 @@ nih_io_send_message (control_io, message); } +/** + * control_push_tty: + * @data: data pointer, + * @pid: origin process id, + * @type: message type received. + * + * This function is called to change the current tty. + * + * Returns: zero on success, negative value on raised error. + **/ +static int +control_push_tty (void *data, + pid_t pid, + UpstartMessageType type, + const char *device) +{ + NihIoMessage *reply; + + nih_assert (pid > 0); + nih_assert (type == UPSTART_PUSH_TTY); + + nih_info (_("Control request to change tty")); + + NIH_MUST (reply = upstart_message_new (control_io, pid, + UPSTART_TTY, + push_tty (device))); + nih_io_send_message (control_io, reply); + + return 0; +} + +/** + * control_pop_tty: + * @data: data pointer, + * @pid: origin process id, + * @type: message type received. + * + * This function is called to revert the most recent tty change. + * + * Returns: zero on success, negative value on raised error. + **/ +static int +control_pop_tty (void *data, + pid_t pid, + UpstartMessageType type) +{ + NihIoMessage *reply; + + nih_assert (pid > 0); + nih_assert (type == UPSTART_POP_TTY); + + nih_info (_("Control request to revert changed tty")); + + NIH_MUST (reply = upstart_message_new (control_io, pid, + UPSTART_TTY, + pop_tty ())); + nih_io_send_message (control_io, reply); + + return 0; +} /** * control_version_query: === modified file 'init/main.c' --- init/main.c 2007-03-13 19:13:19 +0000 +++ init/main.c 2008-03-02 03:14:59 +0000 @@ -58,6 +58,7 @@ #include "control.h" #include "cfgfile.h" #include "paths.h" +#include "tty.h" /* Prototypes for static functions */ @@ -190,6 +191,8 @@ if (! (restart || rescue)) reset_console (); + tty_stack_init (); + /* Set the PATH environment variable */ setenv ("PATH", PATH, TRUE); === modified file 'init/process.c' --- init/process.c 2007-10-11 21:08:38 +0000 +++ init/process.c 2008-03-02 21:22:05 +0000 @@ -51,6 +51,7 @@ #include "job.h" #include "process.h" #include "paths.h" +#include "tty.h" /* Prototypes for static functions */ @@ -385,10 +386,11 @@ break; - case CONSOLE_OUTPUT: + case CONSOLE_OUTPUT: { /* Ordinary console input and output */ - fd = open (CONSOLE, O_RDWR | O_NOCTTY); + fd = open (current_tty (), O_RDWR | O_NOCTTY); break; + } case CONSOLE_OWNER: /* As CONSOLE_OUTPUT but with ^C, etc. sent */ === added file 'init/tty.c' --- init/tty.c 1970-01-01 00:00:00 +0000 +++ init/tty.c 2008-03-02 21:18:03 +0000 @@ -0,0 +1,97 @@ +/* upstart + * + * tty.c - tty change events + * + * Copyright ?? 2007 Canonical Ltd. + * Author: Scott James Remnant . + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H +# include +#endif /* HAVE_CONFIG_H */ + +#include +#include +#include +#include +#include +#include +#include +#include [...1956 lines suppressed...] +++ upstart/message.h 2008-02-28 04:52:36 +0000 @@ -57,11 +57,20 @@ * UPSTART_VERSION message in reply. * * Clients may send UPSTART_LOG_PRIORITY, without any reply. + * + * Clients may send UPSTART_PUSH_TTY and recieve an UPSTART_TTY message + * in reply + * + * Clients may send UPSTART_POP_TTY and recieve an UPSTART_TTY message + * in reply */ UPSTART_NO_OP = 0x0000, UPSTART_VERSION_QUERY = 0x0001, UPSTART_LOG_PRIORITY = 0x0002, UPSTART_VERSION = 0x0010, + UPSTART_PUSH_TTY = 0x0011, + UPSTART_POP_TTY = 0x0012, + UPSTART_TTY = 0x0013, /* Job requests and responses. * === modified file 'util/initctl.c' --- util/initctl.c 2007-03-13 18:08:31 +0000 +++ util/initctl.c 2008-03-02 21:05:23 +0000 @@ -99,6 +99,9 @@ static char *output_name (unsigned int id, const char *name); /* Prototypes of response handler functions */ +static int handle_tty (void *data, pid_t pid, + UpstartMessageType type, + const char *tty); static int handle_version (void *data, pid_t pid, UpstartMessageType type, const char *version); @@ -159,6 +162,8 @@ /* Prototypes for option and command functions */ int env_option (NihOption *option, const char *arg); +int push_tty_action (NihCommand *command, char * const *args); +int pop_tty_action (NihCommand *command, char * const *args); int start_action (NihCommand *command, char * const *args); int stop_action (NihCommand *command, char * const *args); int status_action (NihCommand *command, char * const *args); @@ -296,6 +301,8 @@ { -1, UPSTART_VERSION, (UpstartMessageHandler)handle_version }, + { -1, UPSTART_TTY, + (UpstartMessageHandler)handle_tty }, { -1, UPSTART_JOB, (UpstartMessageHandler)handle_job }, { -1, UPSTART_JOB_FINISHED, @@ -687,6 +694,40 @@ } /** + * handle_tty: + * @data: data passed to handler, + * @pid: origin of message, + * @type: message type, + * @version: tty device in use. + * + * Handles receipt of the UPSTART_TTY reply from the server, which is + * sent in response to an UPSTART_PUSH_TTY or UPSTART_POP_TTY message. + * + * Output the version string received and mark it as a response. + * + * Returns: zero on success, negative value on error or positive value if the + * command should exit with that exit status. + **/ +static int +handle_tty (void *data, + pid_t pid, + UpstartMessageType type, + const char *tty) +{ + nih_assert (pid > 0); + nih_assert (type == UPSTART_TTY); + nih_assert (tty != NULL); + + if (! event_caused) + num_responses++; + + event_caused = FALSE; + + nih_message ("%s", tty); + + return 0; +} +/** * handle_job: * @data: data passed to handler, * @pid: origin of message, @@ -1802,6 +1843,61 @@ } /** + * pop_tty_action: + * @command: NihCommand invoked, + * @args: command-line arguments. + * + * This function is called for the "pop_tty" command; it takes no arguments. + * + * It reverts the last push_tty command, and replies with the new tty. + * + * Returns: command exit status. + **/ +int +pop_tty_action (NihCommand *command, + char * const *args) +{ + nih_assert (command != NULL); + nih_assert (args != NULL); + + if (initctl_send (UPSTART_POP_TTY) < 0) + return 1; + + return initctl_recv (1); +} + +/** + * push_tty_action: + * @command: NihCommand invoked, + * @args: command-line arguments. + * + * This function is called for the "push_tty" command; it takes a tty device + * name. + * + * It causes upstart to begin using that tty, and replies with the new tty. + * + * Returns: command exit status. + **/ +int +push_tty_action (NihCommand *command, + char * const *args) +{ + nih_assert (command != NULL); + nih_assert (args != NULL); + + if (! args[0]) { + fprintf (stderr, _("%s: missing device name\n"), program_name); + nih_main_suggest_help (); + return 1; + } + + if (initctl_send (UPSTART_PUSH_TTY, args[0]) < 0) + return 1; + + return initctl_recv (1); +} + +/** * emit_action: * @command: NihCommand invoked, * @args: command-line arguments. @@ -2079,6 +2175,24 @@ }; /** + * pop_tty_options: + * + * Command-line options accepted for the pop_tty command. + **/ +NihOption pop_tty_options[] = { + NIH_OPTION_LAST +}; + +/** + * push_tty_options: + * + * Command-line options accepted for the push_tty command. + **/ +NihOption push_tty_options[] = { + NIH_OPTION_LAST +}; + +/** * log_priority_options: * * Command-line options accepted for the log-priority command. @@ -2156,6 +2270,16 @@ NULL, &event_commands, events_options, events_action }, + { "push-tty", NULL, + N_("Change the init daemon's tty device"), + NULL, + NULL, push_tty_options, push_tty_action }, + + { "pop-tty", NULL, + N_("Revert the last change to the init daemon's tty device"), + NULL, + NULL, pop_tty_options, pop_tty_action }, + { "version", NULL, N_("Request the version of the init daemon."), NULL, Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- upstart.spec 16 Feb 2008 03:53:32 -0000 1.4 +++ upstart.spec 2 Mar 2008 21:53:54 -0000 1.5 @@ -1,6 +1,6 @@ Name: upstart Version: 0.3.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An event-driven init system Group: System Environment/Base @@ -9,6 +9,7 @@ Source0: http://upstart.ubuntu.com/download/0.3/upstart-%{version}.tar.bz2 Patch0: upstart-gcc43.patch Patch1: upstart-force-on-shutdown-reboot.patch +Patch2: upstart-tty-stack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -22,6 +23,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 %build %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib} @@ -83,6 +85,9 @@ %{_mandir}/man8/telinit.8.gz %changelog +* Sun Mar 03 2008 Casey Dahlin - 0.3.9-6 +- Added patch to allow runtime tty changes + * Fri Feb 15 2008 Casey Dahlin - 0.3.9-5 - Added patch to imply --force on runlevels 0 and 6 From fedora-extras-commits at redhat.com Sun Mar 2 22:09:00 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Sun, 2 Mar 2008 22:09:00 GMT Subject: rpms/upstart/devel upstart.spec,1.5,1.6 Message-ID: <200803022209.m22M90sR027244@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27222/devel Modified Files: upstart.spec Log Message: Added BuildRequires for automake Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- upstart.spec 2 Mar 2008 21:53:54 -0000 1.5 +++ upstart.spec 2 Mar 2008 22:08:23 -0000 1.6 @@ -1,6 +1,6 @@ Name: upstart Version: 0.3.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An event-driven init system Group: System Environment/Base @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext +BuildRequires: automake >= 1.10 %description Upstart is an event-based replacement for the /sbin/init daemon which @@ -85,6 +86,9 @@ %{_mandir}/man8/telinit.8.gz %changelog +* Sun Mar 03 2008 Casey Dahlin - 0.3.9-7 +- Added BuildRequires: automake + * Sun Mar 03 2008 Casey Dahlin - 0.3.9-6 - Added patch to allow runtime tty changes From fedora-extras-commits at redhat.com Sun Mar 2 22:18:50 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Sun, 2 Mar 2008 22:18:50 GMT Subject: devel/anaconda .cvsignore, 1.498, 1.499 anaconda.spec, 1.638, 1.639 sources, 1.630, 1.631 Message-ID: <200803022218.m22MIo4S027496@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/anaconda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27453 Modified Files: .cvsignore anaconda.spec sources Log Message: * Sun Mar 02 2008 Jeremy Katz - 11.4.0.42-1 - Fix a traceback when we have an error. Related to #433658 (katzj) - Add virtio_pci in hopes of getting virtio working (katzj) - Pull in the bits of pirut that we use so that we don't depend on pirut (katzj) - Default to RAID1 instead of RAID0 (#435579) (katzj) - Refresh po (katzj) - Fix traceback leaving task selection screen (#435556) (katzj) - More ext4 vs ext4dev nonsense. (#435517) (katzj) - Fix reverse name lookup. (pjones) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v retrieving revision 1.498 retrieving revision 1.499 diff -u -r1.498 -r1.499 --- .cvsignore 28 Feb 2008 22:56:08 -0000 1.498 +++ .cvsignore 2 Mar 2008 22:18:17 -0000 1.499 @@ -1 +1 @@ -anaconda-11.4.0.41.tar.bz2 +anaconda-11.4.0.42.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v retrieving revision 1.638 retrieving revision 1.639 diff -u -r1.638 -r1.639 --- anaconda.spec 28 Feb 2008 22:56:08 -0000 1.638 +++ anaconda.spec 2 Mar 2008 22:18:17 -0000 1.639 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.41 +Version: 11.4.0.42 Release: 1 License: GPLv2+ Group: Applications/System @@ -27,7 +27,6 @@ %define yumver 2.9.2 %define rhplver 0.170 %define partedver 1.8.1 -%define pirutver 1.1.0 %define syscfgdatever 1.9.0 %define pythonpyblockver 0.24-1 %define libbdevidver 5.1.2-1 @@ -55,7 +54,6 @@ BuildRequires: mkinitrd-devel >= %{mkinitrdver} BuildRequires: newt-devel BuildRequires: pango-devel -BuildRequires: pirut BuildRequires: popt-devel BuildRequires: pykickstart >= %{pykickstartver} BuildRequires: python-devel @@ -77,7 +75,6 @@ Requires: parted >= %{partedver} Requires: pyparted >= %{partedver} Requires: yum >= %{yumver} -Requires: pirut >= %{pirutver} Requires: libxml2-python Requires: python-urlgrabber Requires: system-logos @@ -212,6 +209,16 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Sun Mar 02 2008 Jeremy Katz - 11.4.0.42-1 +- Fix a traceback when we have an error. Related to #433658 (katzj) +- Add virtio_pci in hopes of getting virtio working (katzj) +- Pull in the bits of pirut that we use so that we don't depend on pirut (katzj) +- Default to RAID1 instead of RAID0 (#435579) (katzj) +- Refresh po (katzj) +- Fix traceback leaving task selection screen (#435556) (katzj) +- More ext4 vs ext4dev nonsense. (#435517) (katzj) +- Fix reverse name lookup. (pjones) + * Thu Feb 28 2008 Jeremy Katz - 11.4.0.41-1 - Don't write out /etc/rpm/platform anymore. (katzj) - anaconda-runtime now needs yum-utils (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/devel/anaconda/sources,v retrieving revision 1.630 retrieving revision 1.631 diff -u -r1.630 -r1.631 --- sources 28 Feb 2008 22:56:08 -0000 1.630 +++ sources 2 Mar 2008 22:18:17 -0000 1.631 @@ -1 +1 @@ -2350a6dc01be30a9bd5f2f64f7987811 anaconda-11.4.0.41.tar.bz2 +d942dab4fa44a17f6d6b0d833a187433 anaconda-11.4.0.42.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 2 22:18:57 2008 From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp)) Date: Sun, 2 Mar 2008 22:18:57 GMT Subject: rpms/gnome-desktop/devel add-randr-12.patch, 1.13, 1.14 gnome-desktop.spec, 1.131, 1.132 Message-ID: <200803022218.m22MIvhn027551@cvs-int.fedora.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/gnome-desktop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27490 Modified Files: add-randr-12.patch gnome-desktop.spec Log Message: Update randr code add-randr-12.patch: Index: add-randr-12.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/add-randr-12.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- add-randr-12.patch 20 Feb 2008 18:33:19 -0000 1.13 +++ add-randr-12.patch 2 Mar 2008 22:18:50 -0000 1.14 @@ -1,6 +1,6 @@ diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/monitor-db.c --- /dev/null 2008-02-19 17:35:05.543056439 -0500 -+++ gnome-desktop-2.21.91/libgnome-desktop/monitor-db.c 2008-02-20 13:41:10.000000000 -0500 ++++ gnome-desktop-2.21.91/libgnome-desktop/monitor-db.c 2008-03-02 17:21:20.000000000 -0500 @@ -0,0 +1,1198 @@ +#include +#include @@ -1202,7 +1202,7 @@ +} diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/edid-parse.c --- /dev/null 2008-02-19 17:35:05.543056439 -0500 -+++ gnome-desktop-2.21.91/libgnome-desktop/edid-parse.c 2008-02-20 13:41:10.000000000 -0500 ++++ gnome-desktop-2.21.91/libgnome-desktop/edid-parse.c 2008-03-02 17:21:21.000000000 -0500 @@ -0,0 +1,551 @@ +/* + * Copyright 2007 Red Hat, Inc. @@ -1757,7 +1757,7 @@ +} diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/randrwrap.h --- /dev/null 2008-02-19 17:35:05.543056439 -0500 -+++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/randrwrap.h 2008-02-20 13:41:10.000000000 -0500 ++++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/randrwrap.h 2008-03-02 17:21:20.000000000 -0500 @@ -0,0 +1,100 @@ +#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA +#error This is not yet for general consumption. @@ -1861,7 +1861,7 @@ +#endif diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/monitor-db.h --- /dev/null 2008-02-19 17:35:05.543056439 -0500 -+++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/monitor-db.h 2008-02-20 13:41:10.000000000 -0500 ++++ gnome-desktop-2.21.91/libgnome-desktop/libgnomeui/monitor-db.h 2008-03-02 17:21:20.000000000 -0500 @@ -0,0 +1,51 @@ +#ifndef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA +#error This is not for general consumption yet. @@ -1928,7 +1928,7 @@ + diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/randrwrap.c --- /dev/null 2008-02-19 17:35:05.543056439 -0500 -+++ gnome-desktop-2.21.91/libgnome-desktop/randrwrap.c 2008-02-20 13:41:10.000000000 -0500 ++++ gnome-desktop-2.21.91/libgnome-desktop/randrwrap.c 2008-03-02 17:21:20.000000000 -0500 @@ -0,0 +1,1122 @@ +#define I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA +#include "libgnomeui/randrwrap.h" @@ -3054,8 +3054,8 @@ +#endif diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/display-name.c --- /dev/null 2008-02-19 17:35:05.543056439 -0500 -+++ gnome-desktop-2.21.91/libgnome-desktop/display-name.c 2008-02-20 13:41:10.000000000 -0500 -@@ -0,0 +1,193 @@ ++++ gnome-desktop-2.21.91/libgnome-desktop/display-name.c 2008-03-02 17:21:21.000000000 -0500 +@@ -0,0 +1,249 @@ +/* + * Copyright 2007 Red Hat, Inc. + * @@ -3109,6 +3109,7 @@ + { "WAC", "Wacom" }, + { "NEC", "NEC" }, + { "CMO", "CMO" }, /* Chi Mei */ ++ { "BNQ", "BenQ" }, + + { "ABP", "Advansys" }, + { "ACC", "Accton" }, @@ -3178,6 +3179,61 @@ + { "VMI", "Vermont" }, + { "WDC", "Western Digital" }, + { "ZDS", "Zeos" }, ++ ++ /* From http://faydoc.tripod.com/structures/01/0136.htm */ ++ { "ACT", "Targa" }, ++ { "ADI", "ADI" }, ++ { "AOC", "AOC Intl" }, ++ { "API", "Acer America" }, ++ { "APP", "Apple Computer" }, ++ { "ART", "ArtMedia" }, ++ { "AST", "AST Research" }, ++ { "CPL", "Compal" }, ++ { "CTX", "Chuntex Electronic Co." }, ++ { "DPC", "Delta Electronics" }, ++ { "DWE", "Daewoo" }, ++ { "ECS", "ELITEGROUP" }, ++ { "EIZ", "EIZO" }, ++ { "FCM", "Funai" }, ++ { "GSM", "LG Electronics" }, ++ { "GWY", "Gateway 2000" }, ++ { "HEI", "Hyundai" }, ++ { "HIT", "Hitachi" }, ++ { "HSL", "Hansol" }, ++ { "HTC", "Hitachi" }, ++ { "ICL", "Fujitsu ICL" }, ++ { "IVM", "Idek Iiyama" }, ++ { "KFC", "KFC Computek" }, ++ { "LKM", "ADLAS" }, ++ { "LNK", "LINK Tech" }, ++ { "LTN", "Lite-On" }, ++ { "MAG", "MAG InnoVision" }, ++ { "MAX", "Maxdata" }, ++ { "MEI", "Panasonic" }, ++ { "MEL", "Mitsubishi" }, ++ { "MIR", "miro" }, ++ { "MTC", "MITAC" }, ++ { "NAN", "NANAO" }, ++ { "NEC", "NEC Tech" }, ++ { "NOK", "Nokia" }, ++ { "OQI", "OPTIQUEST" }, ++ { "PBN", "Packard Bell" }, ++ { "PGS", "Princeton" }, ++ { "PHL", "Philips" }, ++ { "REL", "Relisys" }, ++ { "SDI", "Samtron" }, ++ { "SMI", "Smile" }, ++ { "SPT", "Sceptre" }, ++ { "SRC", "Shamrock Technology" }, ++ { "STP", "Sceptre" }, ++ { "TAT", "Tatung" }, ++ { "TRL", "Royal Information Company" }, ++ { "TSB", "Toshiba, Inc." }, ++ { "UNM", "Unisys" }, ++ { "VSC", "ViewSonic" }, ++ { "WTC", "Wen Tech" }, ++ { "ZCM", "Zenith Data Systems" }, ++ + { "???", "Unknown" }, +}; + @@ -3251,7 +3307,7 @@ +} diff -up /dev/null gnome-desktop-2.21.91/libgnome-desktop/edid.h --- /dev/null 2008-02-19 17:35:05.543056439 -0500 -+++ gnome-desktop-2.21.91/libgnome-desktop/edid.h 2008-02-20 13:41:10.000000000 -0500 ++++ gnome-desktop-2.21.91/libgnome-desktop/edid.h 2008-03-02 17:21:21.000000000 -0500 @@ -0,0 +1,170 @@ +typedef unsigned char uchar; +typedef struct MonitorInfo MonitorInfo; Index: gnome-desktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- gnome-desktop.spec 26 Feb 2008 20:35:03 -0000 1.131 +++ gnome-desktop.spec 2 Mar 2008 22:18:51 -0000 1.132 @@ -12,7 +12,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop Version: 2.21.92 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.21/%{name}-%{version}.tar.bz2 License: GPLv2+ and LGPLv2+ @@ -121,6 +121,9 @@ %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Sun Mar 2 2008 Soren Sandmann - 2.21.92-3 +- Update randr code with more display manufacturers. + * Tue Feb 26 2008 Matthias Clasen - 2.21.92-2 - Fix a bug in the multires patch From fedora-extras-commits at redhat.com Sun Mar 2 22:21:41 2008 From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp)) Date: Sun, 2 Mar 2008 22:21:41 GMT Subject: rpms/gnome-settings-daemon/devel add-randr-12.patch, 1.1, 1.2 gnome-settings-daemon.spec, 1.11, 1.12 Message-ID: <200803022221.m22MLfAR027688@cvs-int.fedora.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27665 Modified Files: add-randr-12.patch gnome-settings-daemon.spec Log Message: Handle video key add-randr-12.patch: Index: add-randr-12.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/add-randr-12.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- add-randr-12.patch 12 Feb 2008 19:57:10 -0000 1.1 +++ add-randr-12.patch 2 Mar 2008 22:21:35 -0000 1.2 @@ -1,6 +1,6 @@ diff -up gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12 gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c --- gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12 2007-12-24 06:18:48.000000000 -0500 -+++ gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c 2008-02-12 14:42:57.000000000 -0500 ++++ gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c 2008-03-02 17:26:08.000000000 -0500 @@ -36,6 +36,10 @@ #include #include @@ -12,7 +12,23 @@ #ifdef HAVE_RANDR #include #endif -@@ -61,258 +65,60 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xra +@@ -44,9 +48,14 @@ + + #define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate)) + ++#define VIDEO_KEYSYM "XF86Display" ++ + struct GsdXrandrManagerPrivate + { +- gboolean dummy; ++ /* Key code of the fn-F7 video key (XF86Display) */ ++ guint keycode; ++ RWScreen *rw_screen; ++ gboolean running; + }; + + enum { +@@ -61,248 +70,74 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xra static gpointer manager_object = NULL; @@ -38,8 +54,12 @@ - g_error_free (error); - - return 0; --} -- ++static GdkAtom ++gnome_randr_atom (void) ++{ ++ return gdk_atom_intern ("_GNOME_RANDR_ATOM", FALSE); + } + -static int -get_resolution (GConfClient *client, - int screen, @@ -67,11 +87,30 @@ - if (val == NULL) { - return -1; - } -- ++static Atom ++gnome_randr_xatom (void) ++{ ++ return gdk_x11_atom_to_xatom (gnome_randr_atom()); ++} + - if (sscanf (val, "%dx%d", &w, &h) != 2) { - g_free (val); - return -1; -- } ++static GdkFilterReturn ++on_client_message (GdkXEvent *xevent, ++ GdkEvent *event, ++ gpointer data) ++{ ++ RWScreen *screen = data; ++ XEvent *ev = (XEvent *)xevent; ++ ++ if (ev->type == ClientMessage && ++ ev->xclient.message_type == gnome_randr_xatom()) { ++ ++ configuration_apply_stored (screen); ++ ++ return GDK_FILTER_REMOVE; + } - - g_free (val); - @@ -79,18 +118,19 @@ - *height = h; - - return i; -+static GdkAtom -+gnome_randr_atom (void) -+{ -+ return gdk_atom_intern ("_GNOME_RANDR_ATOM", FALSE); ++ ++ /* Pass the event on to GTK+ */ ++ return GDK_FILTER_CONTINUE; } -static int -get_rate (GConfClient *client, - char *display, - int screen) -+static Atom -+gnome_randr_xatom (void) ++static GdkFilterReturn ++event_filter (GdkXEvent *xevent, ++ GdkEvent *event, ++ gpointer data) { - char *key; - int val; @@ -100,16 +140,22 @@ - error = NULL; - val = gconf_client_get_int (client, key, &error); - g_free (key); -- ++ GsdXrandrManager *manager = data; ++ XEvent *xev = (XEvent *) xevent; + - if (error == NULL) { - return val; - } -- ++ if (!manager->priv->running) ++ return GDK_FILTER_CONTINUE; + - g_error_free (error); - - return 0; -+ return gdk_x11_atom_to_xatom (gnome_randr_atom()); - } +-} ++ /* verify we have a key event */ ++ if (xev->xany.type != KeyPress && xev->xany.type != KeyRelease) ++ return GDK_FILTER_CONTINUE; -static int -find_closest_size (XRRScreenSize *sizes, @@ -133,25 +179,16 @@ - closest_width = sizes[i].width; - closest_height = sizes[i].height; - } -+static GdkFilterReturn -+on_client_message (GdkXEvent *xevent, -+ GdkEvent *event, -+ gpointer data) -+{ -+ RWScreen *screen = data; -+ XEvent *ev = (XEvent *)xevent; -+ -+ if (ev->type == ClientMessage && -+ ev->xclient.message_type == gnome_randr_xatom()) { -+ -+ configuration_apply_stored (screen); ++ if (xev->xkey.keycode == manager->priv->keycode) { ++ /* FIXME: here we should cycle between valid ++ * configurations, and save them ++ */ ++ configuration_apply_stored (manager->priv->rw_screen); + -+ return GDK_FILTER_REMOVE; ++ return GDK_FILTER_CONTINUE; } -- + - return closest; -+ -+ /* Pass the event on to GTK+ */ + return GDK_FILTER_CONTINUE; } -#endif /* HAVE_RANDR */ @@ -193,10 +230,12 @@ - || XRRQueryVersion (xdisplay, &major, &minor) == 0) { - return; - } -- ++ GsdXrandrManager *manager = data; + - if (major != 1 || minor < 1) { - g_message ("Display has unsupported version of XRandR (%d.%d), not setting resolution.", major, minor); -- return; ++ if (!manager->priv->running) + return; - } - - client = gconf_client_get_default (); @@ -283,27 +322,65 @@ - } - -#endif /* HAVE_RANDR */ ++ + /* FIXME: Set up any new screens here */ } gboolean - gsd_xrandr_manager_start (GsdXrandrManager *manager, - GError **error) +@@ -311,8 +146,25 @@ gsd_xrandr_manager_start (GsdXrandrManag { -+ RWScreen *rw_screen; -+ g_debug ("Starting xrandr manager"); -+ -+ rw_screen = rw_screen_new (gdk_screen_get_default(), on_randr_event, NULL); - apply_settings (manager); - -+ configuration_apply_stored (rw_screen); ++ manager->priv->running = TRUE; ++ ++ if (manager->priv->keycode) { ++ XGrabKey (gdk_x11_get_default_xdisplay(), ++ manager->priv->keycode, AnyModifier, ++ gdk_x11_get_default_root_xwindow(), ++ True, GrabModeAsync, GrabModeAsync); ++ } ++ ++ configuration_apply_stored (manager->priv->rw_screen); ++ ++ gdk_window_add_filter (gdk_get_default_root_window(), ++ (GdkFilterFunc)event_filter, ++ manager); + + gdk_add_client_message_filter (gnome_randr_atom(), + on_client_message, -+ rw_screen); ++ manager->priv->rw_screen); + return TRUE; } +@@ -320,6 +172,12 @@ void + gsd_xrandr_manager_stop (GsdXrandrManager *manager) + { + g_debug ("Stopping xrandr manager"); ++ ++ manager->priv->running = FALSE; ++ ++ XUngrabKey (gdk_x11_get_default_xdisplay(), ++ manager->priv->keycode, AnyModifier, ++ gdk_x11_get_default_root_xwindow()); + } + + static void +@@ -400,8 +258,15 @@ gsd_xrandr_manager_class_init (GsdXrandr + static void + gsd_xrandr_manager_init (GsdXrandrManager *manager) + { ++ Display *dpy = gdk_x11_get_default_xdisplay (); ++ guint keyval = gdk_keyval_from_name (VIDEO_KEYSYM); ++ guint keycode = XKeysymToKeycode (dpy, keyval); ++ + manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager); + ++ manager->priv->keycode = keycode; ++ manager->priv->rw_screen = rw_screen_new ( ++ gdk_screen_get_default(), on_randr_event, NULL); + } + + static void Index: gnome-settings-daemon.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnome-settings-daemon.spec 29 Feb 2008 22:26:07 -0000 1.11 +++ gnome-settings-daemon.spec 2 Mar 2008 22:21:35 -0000 1.12 @@ -1,6 +1,6 @@ Name: gnome-settings-daemon Version: 2.21.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -123,6 +123,9 @@ %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Sun Mar 2 2008 Soren Sandmann - 2.21.92-2 +- Update randr patch to handle video key + * Fri Feb 29 2008 Jon McCann - 2.21.92-1 - Update to 2.21.92 From fedora-extras-commits at redhat.com Sun Mar 2 22:23:59 2008 From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik)) Date: Sun, 2 Mar 2008 22:23:59 GMT Subject: rpms/warzone2100/F-8 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 warzone2100.spec, 1.15, 1.16 Message-ID: <200803022223.m22MNxvl027791@cvs-int.fedora.redhat.com> Author: karlik Update of /cvs/pkgs/rpms/warzone2100/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27764 Modified Files: .cvsignore sources warzone2100.spec Log Message: Update to v2.1.0-beta1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/warzone2100/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Dec 2007 21:38:02 -0000 1.7 +++ .cvsignore 2 Mar 2008 22:23:26 -0000 1.8 @@ -1 +1 @@ -warzone2100-2.0.10.tar.bz2 +warzone2100-2.1_beta1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/warzone2100/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Dec 2007 21:38:02 -0000 1.7 +++ sources 2 Mar 2008 22:23:26 -0000 1.8 @@ -1 +1 @@ -d27b89fde2c8017020756441bdd2a67b warzone2100-2.0.10.tar.bz2 +7dadec6350e65146a1b497657c4f7c98 warzone2100-2.1_beta1.tar.bz2 Index: warzone2100.spec =================================================================== RCS file: /cvs/pkgs/rpms/warzone2100/F-8/warzone2100.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- warzone2100.spec 30 Dec 2007 21:38:02 -0000 1.15 +++ warzone2100.spec 2 Mar 2008 22:23:26 -0000 1.16 @@ -1,17 +1,18 @@ Name: warzone2100 -Version: 2.0.10 -Release: 1%{?dist} +Version: 2.1.0 +Release: 0.1.beta1%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games License: GPLv2+ URL: http://wz2100.net/ -Source0: http://download.gna.org/warzone/releases/2.0/%{name}-%{version}.tar.bz2 +Source0: http://download.gna.org/warzone/releases/2.0/%{name}-2.1_beta1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: x86_64 ppc64 sparc64 alpha +#ExcludeArch: x86_64 ppc64 sparc64 alpha BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip BuildRequires: libjpeg-devel libpng-devel libogg-devel libvorbis-devel +BuildRequires: quesoglc-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils Obsoletes: warzone2100-data @@ -24,12 +25,11 @@ ReDev project was formed to take care of its future. %prep -%setup -q +%setup -q -n %{name}-2.1_beta1 %build -./autogen.sh %configure --disable-mp3 --with-distributor="Fedora" -make +make %{_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -39,20 +39,24 @@ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop rm $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/warzone2100 %{_datadir}/icons/warzone* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/warzone2100 -%doc AUTHORS ChangeLog COPYING COPYING.README TODO +%doc ABOUT-NLS AUTHORS ChangeLog COPYING COPYING.README %changelog +* Sun Mar 02 2008 Karol Trzcionka - 2.1.0-0.1.beta1 +- Update to v2.1.0-beta1 +- Remove ExcludeArch * Sun Dec 30 2007 Karol Trzcionka - 2.0.10-1 - Update to v2.0.10 * Mon Dec 03 2007 Karol Trzcionka - 2.0.8-2 From fedora-extras-commits at redhat.com Sun Mar 2 22:25:26 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Sun, 2 Mar 2008 22:25:26 GMT Subject: rpms/upstart/devel upstart.spec,1.6,1.7 Message-ID: <200803022225.m22MPQ1U027879@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27821/devel Modified Files: upstart.spec Log Message: Run automake after patching to detect new files Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- upstart.spec 2 Mar 2008 22:08:23 -0000 1.6 +++ upstart.spec 2 Mar 2008 22:24:48 -0000 1.7 @@ -25,6 +25,7 @@ %patch0 -p1 %patch1 -p1 %patch2 +automake %build %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib} @@ -88,6 +89,7 @@ %changelog * Sun Mar 03 2008 Casey Dahlin - 0.3.9-7 - Added BuildRequires: automake +- Run automake after patching * Sun Mar 03 2008 Casey Dahlin - 0.3.9-6 - Added patch to allow runtime tty changes From fedora-extras-commits at redhat.com Sun Mar 2 22:32:17 2008 From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp)) Date: Sun, 2 Mar 2008 22:32:17 GMT Subject: rpms/control-center/devel add-randr12-capplet.patch, 1.11, 1.12 control-center.spec, 1.345, 1.346 Message-ID: <200803022232.m22MWHUn028102@cvs-int.fedora.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28055 Modified Files: add-randr12-capplet.patch control-center.spec Log Message: Update randr add-randr12-capplet.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 add-randr12-capplet.patch Index: add-randr12-capplet.patch =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/add-randr12-capplet.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- add-randr12-capplet.patch 16 Feb 2008 01:45:46 -0000 1.11 +++ add-randr12-capplet.patch 2 Mar 2008 22:32:01 -0000 1.12 @@ -1,141 +1,563 @@ -diff -up /dev/null gnome-control-center-2.21.90/capplets/display/foo-marshal.c ---- /dev/null 2008-02-13 09:53:53.228642516 -0500 -+++ gnome-control-center-2.21.90/capplets/display/foo-marshal.c 2008-02-15 20:33:42.000000000 -0500 -@@ -0,0 +1,279 @@ +diff -up /dev/null gnome-control-center-2.21.92/capplets/display/display-capplet.glade +--- /dev/null 2008-02-19 17:35:05.543056439 -0500 ++++ gnome-control-center-2.21.92/capplets/display/display-capplet.glade 2008-03-02 17:36:13.000000000 -0500 +@@ -0,0 +1,418 @@ ++ ++ + -+#include ++ + ++ ++ 18 ++ ++ GTK_WINDOW_TOPLEVEL ++ GTK_WIN_POS_NONE ++ False ++ True ++ False ++ True ++ False ++ False ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ GDK_GRAVITY_NORTH_WEST ++ True ++ False ++ False + -+#ifdef G_ENABLE_DEBUG -+#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -+#define g_marshal_value_peek_char(v) g_value_get_char (v) -+#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -+#define g_marshal_value_peek_int(v) g_value_get_int (v) -+#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -+#define g_marshal_value_peek_long(v) g_value_get_long (v) -+#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -+#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -+#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -+#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -+#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -+#define g_marshal_value_peek_float(v) g_value_get_float (v) -+#define g_marshal_value_peek_double(v) g_value_get_double (v) -+#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -+#define g_marshal_value_peek_param(v) g_value_get_param (v) -+#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -+#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -+#define g_marshal_value_peek_object(v) g_value_get_object (v) -+#else /* !G_ENABLE_DEBUG */ -+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. -+ * Do not access GValues directly in your code. Instead, use the -+ * g_value_get_*() functions -+ */ -+#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -+#define g_marshal_value_peek_char(v) (v)->data[0].v_int -+#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -+#define g_marshal_value_peek_int(v) (v)->data[0].v_int -+#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -+#define g_marshal_value_peek_long(v) (v)->data[0].v_long -+#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -+#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -+#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -+#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -+#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -+#define g_marshal_value_peek_float(v) (v)->data[0].v_float -+#define g_marshal_value_peek_double(v) (v)->data[0].v_double -+#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -+#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -+#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -+#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -+#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -+#endif /* !G_ENABLE_DEBUG */ ++ ++ ++ True ++ False ++ 0 + ++ ++ ++ True ++ GTK_BUTTONBOX_END + -+/* VOID:OBJECT,OBJECT (marshal.list:1) */ -+void -+foo_marshal_VOID__OBJECT_OBJECT (GClosure *closure, -+ GValue *return_value G_GNUC_UNUSED, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint G_GNUC_UNUSED, -+ gpointer marshal_data) -+{ -+ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, -+ gpointer arg_1, -+ gpointer arg_2, -+ gpointer data2); -+ register GMarshalFunc_VOID__OBJECT_OBJECT callback; -+ register GCClosure *cc = (GCClosure*) closure; -+ register gpointer data1, data2; ++ ++ ++ True ++ True ++ True ++ gtk-help ++ True ++ GTK_RELIEF_NORMAL ++ True ++ -11 ++ ++ + -+ g_return_if_fail (n_param_values == 3); ++ ++ ++ True ++ True ++ True ++ gtk-apply ++ True ++ GTK_RELIEF_NORMAL ++ True ++ -10 ++ ++ + -+ if (G_CCLOSURE_SWAP_DATA (closure)) -+ { -+ data1 = closure->data; -+ data2 = g_value_peek_pointer (param_values + 0); -+ } -+ else -+ { -+ data1 = g_value_peek_pointer (param_values + 0); -+ data2 = closure->data; -+ } -+ callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); ++ ++ ++ True ++ True ++ True ++ gtk-close ++ True ++ GTK_RELIEF_NORMAL ++ True ++ -7 ++ ++ ++ ++ ++ 0 ++ False ++ True ++ GTK_PACK_END ++ ++ + -+ callback (data1, -+ g_marshal_value_peek_object (param_values + 1), -+ g_marshal_value_peek_object (param_values + 2), -+ data2); -+} ++ ++ ++ True ++ False ++ 12 + -+/* VOID:UINT,UINT,UINT,UINT (marshal.list:2) */ -+void -+foo_marshal_VOID__UINT_UINT_UINT_UINT (GClosure *closure, -+ GValue *return_value G_GNUC_UNUSED, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint G_GNUC_UNUSED, -+ gpointer marshal_data) -+{ -+ typedef void (*GMarshalFunc_VOID__UINT_UINT_UINT_UINT) (gpointer data1, -+ guint arg_1, -+ guint arg_2, -+ guint arg_3, -+ guint arg_4, -+ gpointer data2); -+ register GMarshalFunc_VOID__UINT_UINT_UINT_UINT callback; -+ register GCClosure *cc = (GCClosure*) closure; -+ register gpointer data1, data2; ++ ++ [...6235 lines suppressed...] -+typedef struct FooScrollArea FooScrollArea; -+typedef struct FooScrollAreaClass FooScrollAreaClass; -+typedef struct FooScrollAreaPrivate FooScrollAreaPrivate; -+typedef struct FooScrollAreaEvent FooScrollAreaEvent; ++ if (dx > 0) ++ { ++ rect.x = 0; ++ rect.width = dx; ++ } ++ else ++ { ++ rect.x = store->width + dx; ++ rect.width = -dx; ++ } + -+typedef enum ++ gdk_region_union_with_rect (store->update_region, &rect); ++} ++ ++static void ++backing_store_invalidate_rect (BackingStore *store, ++ GdkRectangle *rect) +{ -+ FOO_BUTTON_PRESS, -+ FOO_BUTTON_RELEASE, -+ FOO_MOTION -+} FooScrollAreaEventType; ++ gdk_region_union_with_rect (store->update_region, rect); ++} + -+struct FooScrollAreaEvent ++static void ++backing_store_invalidate_region (BackingStore *store, ++ GdkRegion *region) +{ -+ FooScrollAreaEventType type; -+ int x; -+ int y; -+}; ++ gdk_region_union (store->update_region, region); ++} + -+typedef void (* FooScrollAreaEventFunc) (FooScrollArea *area, -+ FooScrollAreaEvent *event, -+ gpointer data); ++static void ++backing_store_invalidate_all (BackingStore *store) ++{ ++ GdkRectangle rect = { 0, 0, store->width, store->height }; ++ gdk_region_destroy (store->update_region); ++ store->update_region = gdk_region_rectangle (&rect); ++} + -+struct FooScrollArea ++static void ++backing_store_resize (BackingStore *store, ++ int width, ++ int height) +{ -+ GtkContainer parent_instance; ++ GdkPixmap *pixmap = gdk_pixmap_new (store->pixmap, width, height, -1); + -+ FooScrollAreaPrivate *priv; -+}; ++ /* Unfortunately we don't know in which direction we were resized, ++ * so we just assume we were dragged from the south-east corner. ++ * ++ * Although, maybe we could get the root coordinates of the input-window? ++ * That might just work, actually. We need to make sure metacity uses ++ * static gravity for the window before this will be useful. ++ */ ++ simple_draw_drawable (pixmap, store->pixmap, 0, 0, 0, 0, -1, -1); + -+struct FooScrollAreaClass -+{ -+ GtkContainerClass parent_class; ++ g_object_unref (store->pixmap); + -+ void (*set_scroll_adjustments) (FooScrollArea *scroll_area, -+ GtkAdjustment *hadjustment, -+ GtkAdjustment *vadjustment); ++ store->pixmap = pixmap; + -+ void (*viewport_changed) (FooScrollArea *scroll_area, -+ GdkRectangle *old_viewport, -+ GdkRectangle *new_viewport); ++ /* FIXME: invalidate uncovered strip only */ + -+ void (*paint) (FooScrollArea *scroll_area, -+ cairo_t *cr, -+ GdkRectangle *extents, -+ GdkRegion *region); -+}; ++ backing_store_invalidate_all (store); ++} + -+GType foo_scroll_area_get_type (void); ++static void ++cclip_to_region (cairo_t *cr, GdkRegion *region) ++{ ++ int n_rects; ++ GdkRectangle *rects; + -+FooScrollArea *foo_scroll_area_new (void); ++ gdk_region_get_rectangles (region, &rects, &n_rects); + -+/* Set the requisition for the widget. */ -+void foo_scroll_area_set_min_size (FooScrollArea *scroll_area, -+ int min_width, -+ int min_height); ++ cairo_new_path (cr); ++ while (n_rects--) ++ { ++ GdkRectangle *rect = &(rects[n_rects]); + -+/* Set how much of the canvas can be scrolled into view */ -+void foo_scroll_area_set_size (FooScrollArea *scroll_area, -+ int width, -+ int height); -+void foo_scroll_area_set_size_fixed_y (FooScrollArea *scroll_area, -+ int width, -+ int height, -+ int old_y, -+ int new_y); -+void foo_scroll_area_set_viewport_pos (FooScrollArea *scroll_area, -+ int x, -+ int y); -+void foo_scroll_area_get_viewport (FooScrollArea *scroll_area, -+ GdkRectangle *viewport); -+void foo_scroll_area_add_input_from_stroke (FooScrollArea *scroll_area, -+ cairo_t *cr, -+ FooScrollAreaEventFunc func, -+ gpointer data); -+void foo_scroll_area_add_input_from_fill (FooScrollArea *scroll_area, -+ cairo_t *cr, -+ FooScrollAreaEventFunc func, -+ gpointer data); -+void foo_scroll_area_invalidate_region (FooScrollArea *area, -+ GdkRegion *region); -+void foo_scroll_area_invalidate (FooScrollArea *scroll_area); -+void foo_scroll_area_invalidate_rect (FooScrollArea *scroll_area, -+ int x, -+ int y, -+ int width, -+ int height); -+void foo_scroll_area_begin_grab (FooScrollArea *scroll_area, -+ FooScrollAreaEventFunc func, -+ gpointer input_data); -+void foo_scroll_area_end_grab (FooScrollArea *scroll_area); -+gboolean foo_scroll_area_is_grabbed (FooScrollArea *scroll_area); ++ cairo_rectangle (cr, rect->x, rect->y, rect->width, rect->height); ++ } ++ cairo_clip (cr); + -+void foo_scroll_area_begin_auto_scroll (FooScrollArea *scroll_area); -+void foo_scroll_area_auto_scroll (FooScrollArea *scroll_area, -+ FooScrollAreaEvent *event); -+void foo_scroll_area_end_auto_scroll (FooScrollArea *scroll_area); -diff -up gnome-control-center-2.21.90/capplets/display/Makefile.am.add-randr12-capplet gnome-control-center-2.21.90/capplets/display/Makefile.am ---- gnome-control-center-2.21.90/capplets/display/Makefile.am.add-randr12-capplet 2008-01-29 07:22:35.000000000 -0500 -+++ gnome-control-center-2.21.90/capplets/display/Makefile.am 2008-02-13 13:12:09.000000000 -0500 -@@ -1,9 +1,18 @@ - # This is used in GNOMECC_CAPPLETS_CFLAGS - cappletname = display - -+gladedir = $(pkgdatadir)/glade -+dist_glade_DATA = display-capplet.glade ++ g_free (rects); ++} + - bin_PROGRAMS = gnome-display-properties - --gnome_display_properties_SOURCES = main.c -+gnome_display_properties_SOURCES = \ -+ xrandr-capplet.c \ -+ scrollarea.c \ -+ foo-marshal.c \ -+ scrollarea.h \ -+ foo-marshal.h ++static void ++backing_store_process_updates (BackingStore *store, ++ ExposeFunc func, ++ gpointer data) ++{ ++ cairo_t *cr = gdk_cairo_create (store->pixmap); ++ GdkRegion *region = store->update_region; ++ store->update_region = gdk_region_new (); + - gnome_display_properties_LDFLAGS = -export-dynamic - gnome_display_properties_LDADD = \ - $(DISPLAY_CAPPLET_LIBS) \ ++ cclip_to_region (cr, store->update_region); ++ ++ func (cr, store->update_region, data); ++ ++ gdk_region_destroy (region); ++ cairo_destroy (cr); ++} ++ ++#endif Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.345 retrieving revision 1.346 diff -u -r1.345 -r1.346 --- control-center.spec 1 Mar 2008 04:43:08 -0000 1.345 +++ control-center.spec 2 Mar 2008 22:32:01 -0000 1.346 @@ -22,7 +22,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.21.92 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -353,6 +353,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Sun Mar 2 2008 Soren Sandmann - 2.21.92-3 +- Update randr + * Fri Feb 29 2008 Matthias Clasen - 2.21.92-2 - Fix broken schema translations From fedora-extras-commits at redhat.com Sun Mar 2 22:33:05 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Sun, 2 Mar 2008 22:33:05 GMT Subject: rpms/upstart/devel upstart.spec,1.7,1.8 Message-ID: <200803022233.m22MX5wW028166@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28124/devel Modified Files: upstart.spec Log Message: Run automake after applying patch Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- upstart.spec 2 Mar 2008 22:24:48 -0000 1.7 +++ upstart.spec 2 Mar 2008 22:32:33 -0000 1.8 @@ -1,6 +1,6 @@ Name: upstart Version: 0.3.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An event-driven init system Group: System Environment/Base @@ -87,9 +87,11 @@ %{_mandir}/man8/telinit.8.gz %changelog +* Sun Mar 03 2008 Casey Dahlin - 0.3.9-8 +- Run automake after patching + * Sun Mar 03 2008 Casey Dahlin - 0.3.9-7 - Added BuildRequires: automake -- Run automake after patching * Sun Mar 03 2008 Casey Dahlin - 0.3.9-6 - Added patch to allow runtime tty changes From fedora-extras-commits at redhat.com Sun Mar 2 22:39:50 2008 From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik)) Date: Sun, 2 Mar 2008 22:39:50 GMT Subject: rpms/warzone2100/F-8 warzone2100.spec,1.16,1.17 Message-ID: <200803022239.m22Mdons028286@cvs-int.fedora.redhat.com> Author: karlik Update of /cvs/pkgs/rpms/warzone2100/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28264 Modified Files: warzone2100.spec Log Message: Fix BRs Index: warzone2100.spec =================================================================== RCS file: /cvs/pkgs/rpms/warzone2100/F-8/warzone2100.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- warzone2100.spec 2 Mar 2008 22:23:26 -0000 1.16 +++ warzone2100.spec 2 Mar 2008 22:39:14 -0000 1.17 @@ -1,6 +1,6 @@ Name: warzone2100 Version: 2.1.0 -Release: 0.1.beta1%{?dist} +Release: 0.2.beta1%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -12,7 +12,7 @@ BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip BuildRequires: libjpeg-devel libpng-devel libogg-devel libvorbis-devel -BuildRequires: quesoglc-devel +BuildRequires: quesoglc-devel popt-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils Obsoletes: warzone2100-data @@ -54,6 +54,8 @@ %doc ABOUT-NLS AUTHORS ChangeLog COPYING COPYING.README %changelog +* Sun Mar 02 2008 Karol Trzcionka - 2.1.0-0.2.beta1 +- Fix BRs * Sun Mar 02 2008 Karol Trzcionka - 2.1.0-0.1.beta1 - Update to v2.1.0-beta1 - Remove ExcludeArch From fedora-extras-commits at redhat.com Sun Mar 2 22:42:26 2008 From: fedora-extras-commits at redhat.com (Soren Sandmann Pedersen (ssp)) Date: Sun, 2 Mar 2008 22:42:26 GMT Subject: rpms/gnome-settings-daemon/devel add-randr-12.patch,1.2,1.3 Message-ID: <200803022242.m22MgQAC028408@cvs-int.fedora.redhat.com> Author: ssp Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28387 Modified Files: add-randr-12.patch Log Message: Diff against correct version add-randr-12.patch: Index: add-randr-12.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/add-randr-12.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- add-randr-12.patch 2 Mar 2008 22:21:35 -0000 1.2 +++ add-randr-12.patch 2 Mar 2008 22:42:21 -0000 1.3 @@ -1,34 +1,42 @@ -diff -up gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12 gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c ---- gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12 2007-12-24 06:18:48.000000000 -0500 -+++ gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c 2008-03-02 17:26:08.000000000 -0500 -@@ -36,6 +36,10 @@ +diff -up gnome-settings-daemon-2.21.92/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12 gnome-settings-daemon-2.21.92/plugins/xrandr/gsd-xrandr-manager.c +--- gnome-settings-daemon-2.21.92/plugins/xrandr/gsd-xrandr-manager.c.add-randr-12 2008-02-20 09:20:27.000000000 -0500 ++++ gnome-settings-daemon-2.21.92/plugins/xrandr/gsd-xrandr-manager.c 2008-03-02 17:48:02.000000000 -0500 +@@ -35,7 +35,10 @@ + #include #include #include - +-#include ++ +#define I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA +#include +#include -+ + #ifdef HAVE_RANDR #include - #endif -@@ -44,9 +48,14 @@ +@@ -43,6 +46,22 @@ - #define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate)) + #include "gsd-xrandr-manager.h" ++#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate)) ++ +#define VIDEO_KEYSYM "XF86Display" + - struct GsdXrandrManagerPrivate - { -- gboolean dummy; ++struct GsdXrandrManagerPrivate ++{ + /* Key code of the fn-F7 video key (XF86Display) */ + guint keycode; + RWScreen *rw_screen; + gboolean running; - }; - - enum { -@@ -61,248 +70,74 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xra ++}; ++ ++enum { ++ PROP_0, ++}; ++ + static void gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass); + static void gsd_xrandr_manager_init (GsdXrandrManager *xrandr_manager); + static void gsd_xrandr_manager_finalize (GObject *object); +@@ -51,248 +70,74 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xra static gpointer manager_object = NULL; @@ -135,28 +143,28 @@ - char *key; - int val; - GError *error; -- ++ GsdXrandrManager *manager = data; ++ XEvent *xev = (XEvent *) xevent; + - key = g_strdup_printf ("%s/%d/rate", display, screen); - error = NULL; - val = gconf_client_get_int (client, key, &error); - g_free (key); -+ GsdXrandrManager *manager = data; -+ XEvent *xev = (XEvent *) xevent; ++ if (!manager->priv->running) ++ return GDK_FILTER_CONTINUE; - if (error == NULL) { - return val; - } -+ if (!manager->priv->running) -+ return GDK_FILTER_CONTINUE; - -- g_error_free (error); - -- return 0; --} +- g_error_free (error); + /* verify we have a key event */ + if (xev->xany.type != KeyPress && xev->xany.type != KeyRelease) + return GDK_FILTER_CONTINUE; +- return 0; +-} +- -static int -find_closest_size (XRRScreenSize *sizes, - int nsizes, @@ -327,7 +335,7 @@ } gboolean -@@ -311,8 +146,25 @@ gsd_xrandr_manager_start (GsdXrandrManag +@@ -301,8 +146,25 @@ gsd_xrandr_manager_start (GsdXrandrManag { g_debug ("Starting xrandr manager"); @@ -355,7 +363,7 @@ return TRUE; } -@@ -320,6 +172,12 @@ void +@@ -310,6 +172,12 @@ void gsd_xrandr_manager_stop (GsdXrandrManager *manager) { g_debug ("Stopping xrandr manager"); @@ -368,7 +376,14 @@ } static void -@@ -400,8 +258,15 @@ gsd_xrandr_manager_class_init (GsdXrandr +@@ -383,11 +251,22 @@ gsd_xrandr_manager_class_init (GsdXrandr + object_class->constructor = gsd_xrandr_manager_constructor; + object_class->dispose = gsd_xrandr_manager_dispose; + object_class->finalize = gsd_xrandr_manager_finalize; ++ ++ g_type_class_add_private (klass, sizeof (GsdXrandrManagerPrivate)); + } + static void gsd_xrandr_manager_init (GsdXrandrManager *manager) { @@ -376,11 +391,20 @@ + guint keyval = gdk_keyval_from_name (VIDEO_KEYSYM); + guint keycode = XKeysymToKeycode (dpy, keyval); + - manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager); - ++ manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager); ++ + manager->priv->keycode = keycode; + manager->priv->rw_screen = rw_screen_new ( + gdk_screen_get_default(), on_randr_event, NULL); } static void +@@ -400,6 +279,8 @@ gsd_xrandr_manager_finalize (GObject *ob + + xrandr_manager = GSD_XRANDR_MANAGER (object); + ++ g_return_if_fail (xrandr_manager->priv != NULL); ++ + G_OBJECT_CLASS (gsd_xrandr_manager_parent_class)->finalize (object); + } + From fedora-extras-commits at redhat.com Sun Mar 2 22:54:34 2008 From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik)) Date: Sun, 2 Mar 2008 22:54:34 GMT Subject: rpms/warzone2100/F-8 warzone2100.spec,1.17,1.18 Message-ID: <200803022254.m22MsY8L028610@cvs-int.fedora.redhat.com> Author: karlik Update of /cvs/pkgs/rpms/warzone2100/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28586 Modified Files: warzone2100.spec Log Message: add translations Index: warzone2100.spec =================================================================== RCS file: /cvs/pkgs/rpms/warzone2100/F-8/warzone2100.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- warzone2100.spec 2 Mar 2008 22:39:14 -0000 1.17 +++ warzone2100.spec 2 Mar 2008 22:53:57 -0000 1.18 @@ -1,6 +1,6 @@ Name: warzone2100 Version: 2.1.0 -Release: 0.2.beta1%{?dist} +Release: 0.3.beta1%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -12,7 +12,7 @@ BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip BuildRequires: libjpeg-devel libpng-devel libogg-devel libvorbis-devel -BuildRequires: quesoglc-devel popt-devel +BuildRequires: quesoglc-devel popt-devel gettext BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils Obsoletes: warzone2100-data @@ -54,6 +54,8 @@ %doc ABOUT-NLS AUTHORS ChangeLog COPYING COPYING.README %changelog +* Sun Mar 02 2008 Karol Trzcionka - 2.1.0-0.3.beta1 +- add translations * Sun Mar 02 2008 Karol Trzcionka - 2.1.0-0.2.beta1 - Fix BRs * Sun Mar 02 2008 Karol Trzcionka - 2.1.0-0.1.beta1 From fedora-extras-commits at redhat.com Sun Mar 2 23:04:45 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 2 Mar 2008 23:04:45 GMT Subject: rpms/python-telepathy/devel .cvsignore, 1.10, 1.11 python-telepathy.spec, 1.19, 1.20 sources, 1.10, 1.11 Message-ID: <200803022304.m22N4jhl003463@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/python-telepathy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3441 Modified Files: .cvsignore python-telepathy.spec sources Log Message: * Sun Mar 2 2008 Brian Pepple - 0.15.0-1 - Update to 0.15.0. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-telepathy/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 28 Nov 2007 21:52:08 -0000 1.10 +++ .cvsignore 2 Mar 2008 23:04:09 -0000 1.11 @@ -1,2 +1,2 @@ -telepathy-python-0.14.0.tar.gz +telepathy-python-0.15.0.tar.gz telepathy-python-README-examples Index: python-telepathy.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-telepathy/devel/python-telepathy.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- python-telepathy.spec 29 Nov 2007 17:14:41 -0000 1.19 +++ python-telepathy.spec 2 Mar 2008 23:04:09 -0000 1.20 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-telepathy -Version: 0.14.0 -Release: 4%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Python libraries for Telepathy Group: Development/Languages @@ -47,9 +47,13 @@ %defattr(-,root,root,-) %doc COPYING AUTHORS README examples/ %{python_sitelib}/telepathy/ +%{python_sitelib}/*.egg-info %changelog +* Sun Mar 2 2008 Brian Pepple - 0.15.0-1 +- Update to 0.15.0. + * Thu Nov 29 2007 Matej Cepl 0.14.0-4 - apparently some part of setup.py decided that everything in examples/ directory, which doesn't have .py extension should be executable. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-telepathy/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 28 Nov 2007 21:52:08 -0000 1.10 +++ sources 2 Mar 2008 23:04:09 -0000 1.11 @@ -1,2 +1,2 @@ -a42cc4defcaf46099e07972ece791c2d telepathy-python-0.14.0.tar.gz +678a28e3b7d06f75940beec28130d9a5 telepathy-python-0.15.0.tar.gz 100cfb0ef7231513a617d989e86a2a3c telepathy-python-README-examples From fedora-extras-commits at redhat.com Sun Mar 2 23:24:26 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sun, 2 Mar 2008 23:24:26 GMT Subject: rpms/wdm/devel wdm.spec,1.3,1.4 Message-ID: <200803022324.m22NOQ7Y003962@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/wdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3940 Modified Files: wdm.spec Log Message: * Mon Mar 3 2008 Patrice Dumas 1.28-10 - all the images are now in desktop-backgrounds-basic Index: wdm.spec =================================================================== RCS file: /cvs/extras/rpms/wdm/devel/wdm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wdm.spec 19 Feb 2008 18:31:33 -0000 1.3 +++ wdm.spec 2 Mar 2008 23:23:51 -0000 1.4 @@ -4,7 +4,8 @@ Summary: WINGs Display Manager Group: User Interface/X -License: GPL +# many MIT source files from xdm, and GPLv2+ from Wings +License: GPLv2+ URL: http://voins.program.ru/wdm/ Source0: http://voins.program.ru/wdm/wdm-%{version}.tar.bz2 # stolen from xdm @@ -25,6 +26,8 @@ # fix reconfiguration script Patch3: wdm-1.28-reconf.patch +#Patch4: wdm-1.28-ck.patch + BuildRequires: WINGs-devel gettext libselinux-devel pam-devel BuildRequires: libXt-devel libXmu-devel BuildRequires: xrdb xterm /sbin/shutdown @@ -35,7 +38,7 @@ # we use 'include' in the pam file, so Requires: pam >= 0.80 # reuse the images -Requires: desktop-backgrounds-basic system-logos +Requires: desktop-backgrounds-basic %description wdm combines the functions of a graphical display manager identifying @@ -49,9 +52,10 @@ Rothamel's "external greet" interface (see AUTHORS) was used to communicate wdm with wdmLogin. -In fedora, wdm may be called through a wrapper, wdm-dynwm, which determines -the available window managers using the freedesktop information and modifies -the wdm-config configuration file accordingly, before launching wdm. +In the distribution, wdm may be called through a wrapper, wdm-dynwm, +which determines the available window managers using the freedesktop +information and modifies the wdm-config configuration file accordingly, +before launching wdm. %prep %setup -q @@ -59,11 +63,13 @@ %patch1 -p1 -b .fedora %patch2 -p1 -b .failsafe_tmp %patch3 -p1 -b .reconf +#%patch4 -p1 -b .ck %build export DEF_SERVER='%{_bindir}/X -nolisten tcp' -export INSTALL='install -p' +#export CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags ck-connector` -DUSE_CONSOLEKIT" +#export LDFLAGS="`pkg-config --libs ck-connector`" %configure \ --with-pamdir=%{_sysconfdir}/pam.d \ @@ -85,7 +91,7 @@ %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update_wdm_wmlist @@ -165,6 +171,9 @@ %changelog +* Mon Mar 3 2008 Patrice Dumas 1.28-10 +- all the images are now in desktop-backgrounds-basic + * Tue Feb 19 2008 Fedora Release Engineering - 1.28-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sun Mar 2 23:25:48 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sun, 2 Mar 2008 23:25:48 GMT Subject: rpms/wdm/devel wdm.spec,1.4,1.5 Message-ID: <200803022325.m22NPmsu004035@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/wdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4004 Modified Files: wdm.spec Log Message: bump release Index: wdm.spec =================================================================== RCS file: /cvs/extras/rpms/wdm/devel/wdm.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wdm.spec 2 Mar 2008 23:23:51 -0000 1.4 +++ wdm.spec 2 Mar 2008 23:25:15 -0000 1.5 @@ -1,6 +1,6 @@ Name: wdm Version: 1.28 -Release: 9%{?dist} +Release: 10%{?dist} Summary: WINGs Display Manager Group: User Interface/X From fedora-extras-commits at redhat.com Sun Mar 2 23:27:53 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Sun, 2 Mar 2008 23:27:53 GMT Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.83,1.84 Message-ID: <200803022327.m22NRrPj004168@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4134 Modified Files: xorg-x11-drv-ati.spec Log Message: * Mon Mar 03 2008 Dave Airlie 6.8.0-3 - rebuild for upstream ABI breakage Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- xorg-x11-drv-ati.spec 26 Feb 2008 08:49:34 -0000 1.83 +++ xorg-x11-drv-ati.spec 2 Mar 2008 23:27:17 -0000 1.84 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.8.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -84,6 +84,9 @@ %{_mandir}/man4/radeon.4* %changelog +* Mon Mar 03 2008 Dave Airlie 6.8.0-3 +- rebuild for upstream ABI breakage + * Tue Feb 26 2008 Dave Airlie 6.8.0-2 - rebase to upstream 6.8.0 release + git fixes From fedora-extras-commits at redhat.com Sun Mar 2 23:29:33 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Sun, 2 Mar 2008 23:29:33 GMT Subject: rpms/upstart/devel upstart-tty-stack.patch, 1.1, 1.2 upstart.spec, 1.8, 1.9 Message-ID: <200803022329.m22NTXA9004284@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4261/devel Modified Files: upstart-tty-stack.patch upstart.spec Log Message: Attempt to fix build issue with tty stack patch upstart-tty-stack.patch: Index: upstart-tty-stack.patch =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart-tty-stack.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- upstart-tty-stack.patch 2 Mar 2008 21:53:54 -0000 1.1 +++ upstart-tty-stack.patch 2 Mar 2008 23:29:26 -0000 1.2 @@ -10,6 +10,39 @@ process.c process.h \ job.c job.h \ +=== modified file 'init/Makefile.in' +--- init/Makefile.in 2008-03-02 23:21:30 +0000 ++++ init/Makefile.in 2008-02-29 21:39:16 +0000 +@@ -70,9 +70,9 @@ + am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" + sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(sbin_PROGRAMS) +-am_init_OBJECTS = main.$(OBJEXT) process.$(OBJEXT) job.$(OBJEXT) \ +- event.$(OBJEXT) control.$(OBJEXT) notify.$(OBJEXT) \ +- cfgfile.$(OBJEXT) ++am_init_OBJECTS = main.$(OBJEXT) tty.$(OBJEXT) process.$(OBJEXT) \ ++ job.$(OBJEXT) event.$(OBJEXT) control.$(OBJEXT) \ ++ notify.$(OBJEXT) cfgfile.$(OBJEXT) + init_OBJECTS = $(am_init_OBJECTS) + am__DEPENDENCIES_1 = + init_DEPENDENCIES = ../upstart/libupstart.la ../nih/libnih.la \ +@@ -308,6 +308,7 @@ + + init_SOURCES = \ + main.c \ ++ tty.c tty.h\ + errors.h paths.h \ + process.c process.h \ + job.c job.h \ +@@ -468,6 +469,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_job.Po at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_notify.Po at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_process.Po at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tty.Po at am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + === modified file 'init/control.c' --- init/control.c 2007-03-13 17:25:34 +0000 +++ init/control.c 2008-03-01 08:00:46 +0000 Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- upstart.spec 2 Mar 2008 22:32:33 -0000 1.8 +++ upstart.spec 2 Mar 2008 23:29:26 -0000 1.9 @@ -1,6 +1,6 @@ Name: upstart Version: 0.3.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An event-driven init system Group: System Environment/Base @@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext -BuildRequires: automake >= 1.10 %description Upstart is an event-based replacement for the /sbin/init daemon which @@ -25,7 +24,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -automake %build %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib} @@ -87,6 +85,9 @@ %{_mandir}/man8/telinit.8.gz %changelog +* Sun Mar 03 2008 Casey Dahlin - 0.3.9-9 +- Remove automake dependency, build Makefile.in changes into patch + * Sun Mar 03 2008 Casey Dahlin - 0.3.9-8 - Run automake after patching From fedora-extras-commits at redhat.com Sun Mar 2 23:33:17 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Sun, 2 Mar 2008 23:33:17 GMT Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.76,1.77 Message-ID: <200803022333.m22NXHjt004573@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4398 Modified Files: xorg-x11-drv-i810.spec Log Message: * Mon Mar 03 2008 Dave Airlie 2.2.1-3 - update for new server abi Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- xorg-x11-drv-i810.spec 28 Feb 2008 18:22:05 -0000 1.76 +++ xorg-x11-drv-i810.spec 2 Mar 2008 23:32:26 -0000 1.77 @@ -5,7 +5,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-i810 Version: 2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -126,6 +126,9 @@ %{_libdir}/libI810XvMC.so %changelog +* Mon Mar 03 2008 Dave Airlie 2.2.1-3 +- update for new server abi + * Thu Feb 28 2008 Adam Jackson 2.2.1-2 - intel-2.1.1-efi.patch: Fix SDVO I2C on Mac Mini in EFI mode. From fedora-extras-commits at redhat.com Sun Mar 2 23:33:55 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Sun, 2 Mar 2008 23:33:55 GMT Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.67,1.68 Message-ID: <200803022333.m22NXtg0004697@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4570 Modified Files: xorg-x11-drv-nv.spec Log Message: * Mon Mar 03 2008 Dave Airlie 2.1.7-3 - update for new server ABI Index: xorg-x11-drv-nv.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- xorg-x11-drv-nv.spec 29 Feb 2008 05:08:57 -0000 1.67 +++ xorg-x11-drv-nv.spec 2 Mar 2008 23:33:19 -0000 1.68 @@ -5,7 +5,7 @@ Summary: Xorg X11 nv video driver Name: xorg-x11-drv-nv Version: 2.1.7 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -67,6 +67,9 @@ %{_mandir}/man4/nv.4* %changelog +* Mon Mar 03 2008 Dave Airlie 2.1.7-3 +- update for new server ABI + * Fri Feb 29 2008 Dave Airlie 2.1.7-2 - drop nouveau sub-package From fedora-extras-commits at redhat.com Sun Mar 2 23:36:05 2008 From: fedora-extras-commits at redhat.com (Mohd Izhar Firdaus Ismail (izhar)) Date: Sun, 2 Mar 2008 23:36:05 GMT Subject: rpms/libitl/F-8 libitl-makefile-destdir.patch, 1.2, 1.3 libitl.spec, 1.2, 1.3 Message-ID: <200803022336.m22Na5oL005035@cvs-int.fedora.redhat.com> Author: izhar Update of /cvs/pkgs/rpms/libitl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4997 Modified Files: libitl-makefile-destdir.patch libitl.spec Log Message: reverting to 1.1 libitl-makefile-destdir.patch: Index: libitl-makefile-destdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/libitl/F-8/libitl-makefile-destdir.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libitl-makefile-destdir.patch 2 Mar 2008 18:25:28 -0000 1.2 +++ libitl-makefile-destdir.patch 2 Mar 2008 23:35:59 -0000 1.3 @@ -34,6 +34,15 @@ diff -ruN libitl-0.6.4/Makefile libitl-0.6.4.new/Makefile --- libitl-0.6.4/Makefile 2005-03-17 06:32:00.000000000 +0730 +++ libitl-0.6.4.new/Makefile 2007-10-18 20:53:06.000000000 +0730 +@@ -23,7 +23,7 @@ + @false + + build/libitl.so: components +- $(LD) build/*.o $(LDFLAGS) -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME) ++ $(LD) build/*.o $(LDFLAGS) --build-id -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME) + (cd build/ && ln -sf $(FULLNAME) $(SONAME)) + (cd build/ && ln -sf $(FULLNAME) libitl.so) + @@ -35,12 +35,12 @@ strip --strip-unneeded build/$(FULLNAME) rm -f build/*.o build/ITL_* Index: libitl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libitl/F-8/libitl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libitl.spec 2 Mar 2008 18:25:28 -0000 1.2 +++ libitl.spec 2 Mar 2008 23:35:59 -0000 1.3 @@ -1,6 +1,6 @@ Name: libitl Version: 0.6.4 -Release: 4%{?dist} +Release: 3%{?dist} Summary: Libraries for The Islamic Tools and Libraries Project Group: System Environment/Libraries @@ -77,9 +77,6 @@ %changelog -* Mon Mar 03 2008 Mohd Izhar Firdaus Ismail 0.6.4-4 -- remove --build-id from makefile - * Fri Feb 15 2008 Mohd Izhar Firdaus Ismail 0.6.4-3 - include the configure script as a source instead of as a patch From fedora-extras-commits at redhat.com Mon Mar 3 00:02:58 2008 From: fedora-extras-commits at redhat.com (Marc Wiriadisastra (mwiriadi)) Date: Mon, 3 Mar 2008 00:02:58 GMT Subject: rpms/gnome-themes-extras/devel gnome-themes-extras_license-and-i18n.patch, NONE, 1.1 gnome-themes-extras.spec, 1.20, 1.21 Message-ID: <200803030002.m2302wAK015296@cvs-int.fedora.redhat.com> Author: mwiriadi Update of /cvs/pkgs/rpms/gnome-themes-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15101/devel Modified Files: gnome-themes-extras.spec Added Files: gnome-themes-extras_license-and-i18n.patch Log Message: Integrated patch from upstream for license and i18n gnome-themes-extras_license-and-i18n.patch: --- NEW FILE gnome-themes-extras_license-and-i18n.patch --- Index: COPYING.CCBYSA25 =================================================================== --- COPYING.CCBYSA25 (Revision 0) +++ COPYING.CCBYSA25 (Revision 0) @@ -0,0 +1,66 @@ +Attribution-ShareAlike 2.5 +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + 1. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License. + 2. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License. + 3. "Licensor" means the individual or entity that offers the Work under the terms of this License. + 4. "Original Author" means the individual or entity who created the Work. + 5. "Work" means the copyrightable work of authorship offered under the terms of this License. + 6. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + 7. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. + +2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + 1. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; + 2. to create and reproduce Derivative Works; + 3. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works; + 4. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works. + 5. + + For the avoidance of doubt, where the work is a musical composition: + 1. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work. + 2. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights society or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions). + 6. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions). + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + 1. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Wo! rk apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(c), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(c), as requested. + 2. You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, a later version of this License with the same License Elements as this License, or a Creative Commons iCommons license that contains the same License Elements as this License (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of, or the Uniform Resource Identifier for, this License or other license specified in the previous sentence with every copy or phonorecord of each Derivative Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Derivative Works that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder, and You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitall! y perform the Derivative Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Derivative Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Derivative Work itself to be made subject to the terms of this License. + 3. If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g.! , "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + 1. Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + 2. Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. + +Creative Commons may be contacted at http://creativecommons.org/. Index: AUTHORS =================================================================== --- AUTHORS (Revision 466) +++ AUTHORS (Arbeitskopie) @@ -1,9 +1,2 @@ -Andrea Cimitan - Darklooks Gtk Theme - -Andreasn Nilsson - Foxtrot Icon Theme - -Silvestre Herrera - Gion Icon Theme - Dropline Neu! Icon Theme +For all authors of a given theme please see the AUTHORS file in each theme +directory Index: desktop-themes/Darklooks/AUTHORS =================================================================== --- desktop-themes/Darklooks/AUTHORS (Revision 0) +++ desktop-themes/Darklooks/AUTHORS (Revision 0) @@ -0,0 +1 @@ +Andrea Cimitan Index: desktop-themes/Darklooks/index.theme.in =================================================================== --- desktop-themes/Darklooks/index.theme.in (Revision 466) +++ desktop-themes/Darklooks/index.theme.in (Arbeitskopie) @@ -1,7 +1,7 @@ [Desktop Entry] -Name=Darklooks +_Name=Darklooks Type=X-GNOME-Metatheme -Comment=A dark Clearlooks theme +_Comment=A dark Clearlooks theme Encoding=UTF-8 [X-GNOME-Metatheme] Index: gtk-themes/Darklooks/AUTHORS =================================================================== --- gtk-themes/Darklooks/AUTHORS (Revision 0) +++ gtk-themes/Darklooks/AUTHORS (Revision 0) @@ -0,0 +1 @@ +Andrea Cimitan Index: COPYING =================================================================== --- COPYING (Revision 466) +++ COPYING (Arbeitskopie) @@ -1 +1,12 @@ +The included themes are released under the following licenses: +desktop-themes/Darklooks: GPL2+ +gtk-themes/Darklooks: GPL2+ +icon-themes/Foxtrott: CC-BY-SA +icon-themes/Gion: GPL2 +icon-themes/Neu: GPL2 + +A full copy of the GNU General Public License version 2 can be found in +COPYING.GPL2, +a full copy of the Creative Commons Attribution Share-Alike license version +2.5 can be found in COPYING.CCBYSA25. Index: icon-themes/Foxtrot/index.theme.in =================================================================== --- icon-themes/Foxtrot/index.theme.in (Revision 466) +++ icon-themes/Foxtrot/index.theme.in (Arbeitskopie) @@ -1,6 +1,6 @@ [Icon Theme] -Name=Foxtrot -Comment=A tangonized theme with Bluecurve colors +_Name=Foxtrot +_Comment=A tangonized theme with Bluecurve colors Inherits=gnome Example=x-directory-normal Index: icon-themes/Neu/index.theme.in =================================================================== --- icon-themes/Neu/index.theme.in (Revision 466) +++ icon-themes/Neu/index.theme.in (Arbeitskopie) @@ -1,6 +1,6 @@ [Icon Theme] -Name=Dropline Neu! -Comment=Dropline Neu! Icon Theme +_Name=Dropline Neu! +_Comment=Dropline Neu! Icon Theme Inherits=gnome Example=x-directory-normal DisplayDepth=32 Index: icon-themes/Gion/index.theme.in =================================================================== --- icon-themes/Gion/index.theme.in (Revision 466) +++ icon-themes/Gion/index.theme.in (Arbeitskopie) @@ -1,6 +1,6 @@ [Icon Theme] -Name=Gion -Comment=Gion Icon Theme +_Name=Gion +_Comment=Gion Icon Theme Inherits=gnome Example=x-directory-normal DisplayDepth=32 Index: COPYING.GPL2 =================================================================== --- COPYING.GPL2 (Revision 0) +++ COPYING.GPL2 (Revision 0) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Index: po/ChangeLog =================================================================== --- po/ChangeLog (Revision 466) +++ po/ChangeLog (Arbeitskopie) @@ -1,411 +0,0 @@ -2007-07-31 Andrea Cimitan - - * POTFILES.in: - Removed old stuff - -2007-07-30 Andrea Cimitan - - Removed all the *.po because all themes were removed - -2007-04-7 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-02-24 Matic Zgur - - * sl.po: Added Slovenian translation. - -2007-02-23 Peter Bach - - * da.po: Updated Danish translation. - -2006-12-15 Pema Geyleg - - * dz.po: Added Dzongkha Translation. - -2006-11-18 Djihed Afifi - - * ar.po: Added Arabic Translation. - * LINGUAS: Added ar. - -2006-09-25 Pawan Chitrakar - - * ne.po: Updated Nepali Translation - -2006-09-04 Josep Puigdemont i Casamaj?? - - * ca.po: Updated Catalan translation. - -2006-08-26 Christophe Merlet - - * fr.po: Updated French translation from - Emmanuel Andry . - -2006-08-16 Gabor Kelemen - - * hu.po: Translation updated. - -2006-02-28 Clytie Siddall - - * lv.po: Updated Latvian translation by Raivis Dejus . - -2005-12-06 Kjartan Maraas - - * nb.po: Updated Norwegian bokm??l translation. - -2005-10-16 Funda Wang - - * zh_CN.po: Updated Simplified Chinese translation. - -2005-09-01 Pawan Chitrakar - - * ne.po: Added Nepali Translation - -2005-08-15 Clytie Siddall - - * vi.po: Updated Vietnamese translation. - -2005-08-13 Ilkka Tuohela - - * fi.po: Added Finnish translation - -2006-08-09 Maxim Dziumanenko - - * uk.po: Added Ukrainian translation. - -2005-06-20 Christian Rose - - * sv.po: Updated Swedish translation. - -2005-06-10 Ignacio Casal Quinteiro - - * gl.po: Updated Galician translation. - -2005-04-05 Alexander Shopov - - * bg.po: Added Bulgarian translation by - Stanimir Djevelekov - -2005-04-01 Steve Murphy - - * rw.po: Added Kinyarwanda translation. - -2005-03-18 Gabor Kelemen - - * hu.po: Hungarian translation added. - -2005-03-16 Adam Weinberger - - * en_CA.po: Updated Canadian English translation. - -2005-03-06 Marcel Telka - - * sk.po: Updated Slovak translation. - -2005-01-12 Frank Arnold - - * de.po: Updated German translation. - -2004-09-02 Dmitry G. Mastrukov - - * ru.po: Added Russian translation - from Russian team . - -2004-09-01 Takeshi AIHANA - - * ja.po: Updated Japanese translation. - -2004-08-20 Laurent Dhima - - * sq.po: Updated Albanian translation. - -2004-08-18 Laurent Dhima - - * sq.po: Updated Albanian translation. - -2004-08-11 Adam Weinberger - - * en_CA.po: Added Canadian English translation. - -2004-07-31 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2004-07-28 Gustavo Maciel Dias Vieira - - * pt_BR.po: Added Brazilian Portuguese translation done by Raphael - Higino . - -2004-07-24 David Lodge - - * en_GB.po: Updated British translation. - -2004-07-18 Vincent van Adrighem - - * nl.po: Translation updated. - -2004-07-01 Laurent Dhima - - * sq.po: Translation updated. - -2004-06-28 Laurent Dhima - - * sq.po: Translation updated. - -2004-06-13 Vincent van Adrighem - - * nl.po: Translation updated by Tino Meinen. - -2004-04-10 Gareth Owen - - * en_GB.po: Added British English translation - -2004-03-06 Laurent Dhima - - * sq.po: Added Albanian translation. - -2004-03-06 Changwoo Ryu - - * ko.po: Updated Korean translation. - -2004-03-04 Guntupalli Karunakar - - * pa.po: Added Punjabi translation by - Amanpreet Singh Alam . - -2004-02-11 Funda Wang - - * zh_CN.po: Updated Simplified Chinese translation. - -2004-02-03 ??ygimantas Beru??ka - - * lt.po: Added Lithuanian translation. - -2004-02-01 Ole Laursen - - * da.po: Updated Danish translation. - -2004-01-28 Miloslav Trmac - - * cs.po: Fixed Czech translation. - -2004-01-18 Kjartan Maraas - - * no.po: Updated Norwegian translation. - -2004-01-11 Alessio Frusciante - - * it.po: Added Italian translation by - Luca Ferretti. - -2003-11-20 Kostas Papadimas - - * el.po: Added Greek translation. - -2003-11-16 Jordi Mallach - - * ca.po: Updated Catalan translation. - -2003-10-25 Metin Amiroff - - * az.po: Updated Azerbaijani translation. - -2003-10-19 Takeshi AIHANA - - * ja.po: Updated Japanese translation. - -2003-09-09 Duarte Loreto - - * pt.po: Updated Portuguese translation. - -2003-09-05 Artur Flinta - - * pl.po: Updated Polish translation. - -2003-09-05 Vincent van Adrighem - - * nl.po: Dutch translation updated by -(zenity:1648): Gdk-WARNING **: locale not supported by Xlib - -(zenity:1648): Gdk-WARNING **: can not set locale modifiers -Tino Meinen. - -2003-09-01 Pablo Gonzalo del Campo - - * es.po: Revision of Spanish translation by - Francisco Javier F. Serrador . - -2003-09-01 Metin Amiroff - - * az.po: Added Azerbaijani translation. - -2003-08-30 Wang Jian - - * zh_CN.po: Added Simplified Chinese translation by - Mai Hao Hui . - -2003-08-29 Danilo ??egan - - * sr.po, sr at Latn.po: Updated Serbian translation. - -2003-08-26 Pablo Gonzalo del Campo - - * es.po: Updated Spanish translation by - Francisco Javier F. Serrador . - -2003-08-26 Artur Flinta - - * pl.po: Updated Polish translation. - -2003-08-26 Changwoo Ryu - - * ko.po: Added Korean translation by - Young-Ho Cha . - -2003-08-25 Ole Laursen - - * da.po: Added Danish translation. - -2003-08-25 Danilo ??egan - - * sr.po, sr at Latn.po: Updated Serbian translation. - -2003-08-23 Kjartan Maraas - - * no.po: Update Norwegian translation. - -2003-08-23 Christian Rose - - * sv.po: Updated Swedish translation. - -2003-08-20 Kjartan Maraas - - * no.po: Added Norwegian translation. - -2003-08-15 Takeshi AIHANA - - *ja.po: Updated Japanese translation. - -2003-08-02 Vincent van Adrighem - - * nl.po: Dutch translation added by Elros Cyriatan. - -2003-07-31 Christian Rose - - * sv.po: Updated Swedish translation. - -2003-07-28 Duarte Loreto - - * pt.po: Updated Portuguese translation. - -2003-07-27 Artur Flinta - - * pl.po: Updated Polish translation. - -2003-07-22 Miloslav Trmac - - * cs.po: Updated Czech translation. - -2003-07-21 Pablo Gonzalo del Campo - - * es.po: Updated Spanish translation by - Francisco Javier F. Serrador . - -2003-07-21 Artur Flinta - - * pl.po: Updated Polish translation. - -2003-07-17 Christian Neumair - - * de.po: Updated German translation. - -2003-07-17 Takeshi AIHANA - - * ja.po: Added Japanese translation. - -2003-07-15 Danilo ??egan - - * sr.po, sr at Latn.po: Added Serbian translation by Serbian team - (Prevod.org). - -2003-07-07 Abel Cheung - - * zh_TW.po: Updated traditional Chinese translation. - -2003-07-02 Artur Flinta - - * pl.po: Updated Polish translation. - -2003-06-18 Fatih Demir - - * tr.po: Added Turkish translation by Sami Onur Zaim. - -2003-06-18 Christophe Merlet - - * fr.po: Added French translation from - Yann Laviolette . - -2003-06-13 Jordi Mallach - - * ca.po: Updated Catalan translation. - -2003-06-13 Gil "Dolfin" Osher - - * he.po: Added Hebrew translation. - -2003-05-26 Pablo Gonzalo del Campo - - * es.po: Added Spanish translation by - Francisco Javier F. Serrador - -2003-05-24 Duarte Loreto - - * pt.po: Added Portuguese translation. - -2003-05-21 Christian Rose - - * sv.po: Updated Swedish translation. - -2003-05-21 Miloslav Trmac - - * cs.po: Updated Czech translation. - -2003-05-20 Christian Neumair - - * POTFILES.in: Added missing files. - * de.po: Added German translation. - -2003-05-18 Miloslav Trmac - - * cs.po: Updated CZech translation. - -2003-05-09 Abel Cheung - - * zh_TW.po: New traditional Chinese translation. - -2003-05-08 Miloslav Trmac - - * cs.po: Updated Czech translation. - -2003-05-07 Miloslav Trmac - - * cs.po: Added Czech translation. - -2003-05-07 Jordi Mallach - - * ca.po: Added Catalan translation. - -2003-05-07 Christian Rose - - * sv.po: Updated Swedish translation. - -2003-05-07 Christian Neumair - - * POTFILES.in: Added missing file. - * de.po: Added German translation. - -2003-05-07 Christian Rose - - * POTFILES.in: Added missing files. - * sv.po: Added Swedish translation. - Index: po/POTFILES.in =================================================================== --- po/POTFILES.in (Revision 466) +++ po/POTFILES.in (Arbeitskopie) @@ -0,0 +1,4 @@ +desktop-themes/Darklooks/index.theme.in +icon-themes/Foxtrot/index.theme.in +icon-themes/Gion/index.theme.in +icon-themes/Neu/index.theme.in Index: gnome-themes-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes-extras/devel/gnome-themes-extras.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gnome-themes-extras.spec 14 Jan 2008 11:04:07 -0000 1.20 +++ gnome-themes-extras.spec 3 Mar 2008 00:02:20 -0000 1.21 @@ -1,6 +1,6 @@ Name: gnome-themes-extras Version: 2.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Collection of metathemes for the Gnome desktop environment @@ -8,6 +8,7 @@ License: GPLv2 URL: http://librsvg.sourceforge.net/theme.php Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/%{version}/%{name}-%{version}.tar.bz2 +Patch0: gnome-themes-extras_license-and-i18n.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext, gtk2-devel, perl(XML::Parser), gtk2-engines >= 2.11.7, icon-naming-utils >= 0.8.1 @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p0 %build %configure @@ -51,6 +53,9 @@ %{_datadir}/themes/Darklooks/ %changelog +* Mon Mar 3 2008 Marc Wiriadisastra - 2.20-5 +- Integrated patch from upstream for licenses and pot files + * Thu Jan 10 2008 Marc Wiriadisastra - 2.20-4 - Switched back to monolithic package - Removed patches From fedora-extras-commits at redhat.com Mon Mar 3 00:04:56 2008 From: fedora-extras-commits at redhat.com (Marc Wiriadisastra (mwiriadi)) Date: Mon, 3 Mar 2008 00:04:56 GMT Subject: rpms/gnome-themes-extras/F-8 gnome-themes-extras_license-and-i18n.patch, NONE, 1.1 gnome-themes-extras.spec, 1.20, 1.21 Message-ID: <200803030004.m2304u9f015600@cvs-int.fedora.redhat.com> Author: mwiriadi Update of /cvs/pkgs/rpms/gnome-themes-extras/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15446/F-8 Modified Files: gnome-themes-extras.spec Added Files: gnome-themes-extras_license-and-i18n.patch Log Message: Added patch to fix lack of license and i18n gnome-themes-extras_license-and-i18n.patch: --- NEW FILE gnome-themes-extras_license-and-i18n.patch --- Index: COPYING.CCBYSA25 =================================================================== --- COPYING.CCBYSA25 (Revision 0) +++ COPYING.CCBYSA25 (Revision 0) @@ -0,0 +1,66 @@ +Attribution-ShareAlike 2.5 +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + 1. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License. + 2. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License. + 3. "Licensor" means the individual or entity that offers the Work under the terms of this License. + 4. "Original Author" means the individual or entity who created the Work. + 5. "Work" means the copyrightable work of authorship offered under the terms of this License. + 6. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + 7. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. + +2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + 1. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; + 2. to create and reproduce Derivative Works; + 3. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works; + 4. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works. + 5. + + For the avoidance of doubt, where the work is a musical composition: + 1. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work. + 2. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights society or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions). + 6. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions). + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + 1. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Wo! rk apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(c), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(c), as requested. + 2. You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, a later version of this License with the same License Elements as this License, or a Creative Commons iCommons license that contains the same License Elements as this License (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of, or the Uniform Resource Identifier for, this License or other license specified in the previous sentence with every copy or phonorecord of each Derivative Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Derivative Works that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder, and You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitall! y perform the Derivative Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Derivative Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Derivative Work itself to be made subject to the terms of this License. + 3. If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g.! , "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + 1. Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + 2. Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. + +Creative Commons may be contacted at http://creativecommons.org/. Index: AUTHORS =================================================================== --- AUTHORS (Revision 466) +++ AUTHORS (Arbeitskopie) @@ -1,9 +1,2 @@ -Andrea Cimitan - Darklooks Gtk Theme - -Andreasn Nilsson - Foxtrot Icon Theme - -Silvestre Herrera - Gion Icon Theme - Dropline Neu! Icon Theme +For all authors of a given theme please see the AUTHORS file in each theme +directory Index: desktop-themes/Darklooks/AUTHORS =================================================================== --- desktop-themes/Darklooks/AUTHORS (Revision 0) +++ desktop-themes/Darklooks/AUTHORS (Revision 0) @@ -0,0 +1 @@ +Andrea Cimitan Index: desktop-themes/Darklooks/index.theme.in =================================================================== --- desktop-themes/Darklooks/index.theme.in (Revision 466) +++ desktop-themes/Darklooks/index.theme.in (Arbeitskopie) @@ -1,7 +1,7 @@ [Desktop Entry] -Name=Darklooks +_Name=Darklooks Type=X-GNOME-Metatheme -Comment=A dark Clearlooks theme +_Comment=A dark Clearlooks theme Encoding=UTF-8 [X-GNOME-Metatheme] Index: gtk-themes/Darklooks/AUTHORS =================================================================== --- gtk-themes/Darklooks/AUTHORS (Revision 0) +++ gtk-themes/Darklooks/AUTHORS (Revision 0) @@ -0,0 +1 @@ +Andrea Cimitan Index: COPYING =================================================================== --- COPYING (Revision 466) +++ COPYING (Arbeitskopie) @@ -1 +1,12 @@ +The included themes are released under the following licenses: +desktop-themes/Darklooks: GPL2+ +gtk-themes/Darklooks: GPL2+ +icon-themes/Foxtrott: CC-BY-SA +icon-themes/Gion: GPL2 +icon-themes/Neu: GPL2 + +A full copy of the GNU General Public License version 2 can be found in +COPYING.GPL2, +a full copy of the Creative Commons Attribution Share-Alike license version +2.5 can be found in COPYING.CCBYSA25. Index: icon-themes/Foxtrot/index.theme.in =================================================================== --- icon-themes/Foxtrot/index.theme.in (Revision 466) +++ icon-themes/Foxtrot/index.theme.in (Arbeitskopie) @@ -1,6 +1,6 @@ [Icon Theme] -Name=Foxtrot -Comment=A tangonized theme with Bluecurve colors +_Name=Foxtrot +_Comment=A tangonized theme with Bluecurve colors Inherits=gnome Example=x-directory-normal Index: icon-themes/Neu/index.theme.in =================================================================== --- icon-themes/Neu/index.theme.in (Revision 466) +++ icon-themes/Neu/index.theme.in (Arbeitskopie) @@ -1,6 +1,6 @@ [Icon Theme] -Name=Dropline Neu! -Comment=Dropline Neu! Icon Theme +_Name=Dropline Neu! +_Comment=Dropline Neu! Icon Theme Inherits=gnome Example=x-directory-normal DisplayDepth=32 Index: icon-themes/Gion/index.theme.in =================================================================== --- icon-themes/Gion/index.theme.in (Revision 466) +++ icon-themes/Gion/index.theme.in (Arbeitskopie) @@ -1,6 +1,6 @@ [Icon Theme] -Name=Gion -Comment=Gion Icon Theme +_Name=Gion +_Comment=Gion Icon Theme Inherits=gnome Example=x-directory-normal DisplayDepth=32 Index: COPYING.GPL2 =================================================================== --- COPYING.GPL2 (Revision 0) +++ COPYING.GPL2 (Revision 0) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Index: po/ChangeLog =================================================================== --- po/ChangeLog (Revision 466) +++ po/ChangeLog (Arbeitskopie) @@ -1,411 +0,0 @@ -2007-07-31 Andrea Cimitan - - * POTFILES.in: - Removed old stuff - -2007-07-30 Andrea Cimitan - - Removed all the *.po because all themes were removed - -2007-04-7 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2007-02-24 Matic Zgur - - * sl.po: Added Slovenian translation. - -2007-02-23 Peter Bach - - * da.po: Updated Danish translation. - -2006-12-15 Pema Geyleg - - * dz.po: Added Dzongkha Translation. - -2006-11-18 Djihed Afifi - - * ar.po: Added Arabic Translation. - * LINGUAS: Added ar. - -2006-09-25 Pawan Chitrakar - - * ne.po: Updated Nepali Translation - -2006-09-04 Josep Puigdemont i Casamaj?? - - * ca.po: Updated Catalan translation. - -2006-08-26 Christophe Merlet - - * fr.po: Updated French translation from - Emmanuel Andry . - -2006-08-16 Gabor Kelemen - - * hu.po: Translation updated. - -2006-02-28 Clytie Siddall - - * lv.po: Updated Latvian translation by Raivis Dejus . - -2005-12-06 Kjartan Maraas - - * nb.po: Updated Norwegian bokm??l translation. - -2005-10-16 Funda Wang - - * zh_CN.po: Updated Simplified Chinese translation. - -2005-09-01 Pawan Chitrakar - - * ne.po: Added Nepali Translation - -2005-08-15 Clytie Siddall - - * vi.po: Updated Vietnamese translation. - -2005-08-13 Ilkka Tuohela - - * fi.po: Added Finnish translation - -2006-08-09 Maxim Dziumanenko - - * uk.po: Added Ukrainian translation. - -2005-06-20 Christian Rose - - * sv.po: Updated Swedish translation. - -2005-06-10 Ignacio Casal Quinteiro - - * gl.po: Updated Galician translation. - -2005-04-05 Alexander Shopov - - * bg.po: Added Bulgarian translation by - Stanimir Djevelekov - -2005-04-01 Steve Murphy - - * rw.po: Added Kinyarwanda translation. - -2005-03-18 Gabor Kelemen - - * hu.po: Hungarian translation added. - -2005-03-16 Adam Weinberger - - * en_CA.po: Updated Canadian English translation. - -2005-03-06 Marcel Telka - - * sk.po: Updated Slovak translation. - -2005-01-12 Frank Arnold - - * de.po: Updated German translation. - -2004-09-02 Dmitry G. Mastrukov - - * ru.po: Added Russian translation - from Russian team . - -2004-09-01 Takeshi AIHANA - - * ja.po: Updated Japanese translation. - -2004-08-20 Laurent Dhima - - * sq.po: Updated Albanian translation. - -2004-08-18 Laurent Dhima - - * sq.po: Updated Albanian translation. - -2004-08-11 Adam Weinberger - - * en_CA.po: Added Canadian English translation. - -2004-07-31 Francisco Javier F. Serrador - - * es.po: Updated Spanish translation. - -2004-07-28 Gustavo Maciel Dias Vieira - - * pt_BR.po: Added Brazilian Portuguese translation done by Raphael - Higino . - -2004-07-24 David Lodge - - * en_GB.po: Updated British translation. - -2004-07-18 Vincent van Adrighem - - * nl.po: Translation updated. - -2004-07-01 Laurent Dhima - - * sq.po: Translation updated. - -2004-06-28 Laurent Dhima - - * sq.po: Translation updated. - -2004-06-13 Vincent van Adrighem - - * nl.po: Translation updated by Tino Meinen. - -2004-04-10 Gareth Owen - - * en_GB.po: Added British English translation - -2004-03-06 Laurent Dhima - - * sq.po: Added Albanian translation. - -2004-03-06 Changwoo Ryu - - * ko.po: Updated Korean translation. - -2004-03-04 Guntupalli Karunakar - - * pa.po: Added Punjabi translation by - Amanpreet Singh Alam . - -2004-02-11 Funda Wang - - * zh_CN.po: Updated Simplified Chinese translation. - -2004-02-03 ??ygimantas Beru??ka - - * lt.po: Added Lithuanian translation. - -2004-02-01 Ole Laursen - - * da.po: Updated Danish translation. - -2004-01-28 Miloslav Trmac - - * cs.po: Fixed Czech translation. - -2004-01-18 Kjartan Maraas - - * no.po: Updated Norwegian translation. - -2004-01-11 Alessio Frusciante - - * it.po: Added Italian translation by - Luca Ferretti. - -2003-11-20 Kostas Papadimas - - * el.po: Added Greek translation. - -2003-11-16 Jordi Mallach - - * ca.po: Updated Catalan translation. - -2003-10-25 Metin Amiroff - - * az.po: Updated Azerbaijani translation. - -2003-10-19 Takeshi AIHANA - - * ja.po: Updated Japanese translation. - -2003-09-09 Duarte Loreto - - * pt.po: Updated Portuguese translation. - -2003-09-05 Artur Flinta - - * pl.po: Updated Polish translation. - -2003-09-05 Vincent van Adrighem - - * nl.po: Dutch translation updated by -(zenity:1648): Gdk-WARNING **: locale not supported by Xlib - -(zenity:1648): Gdk-WARNING **: can not set locale modifiers -Tino Meinen. - -2003-09-01 Pablo Gonzalo del Campo - - * es.po: Revision of Spanish translation by - Francisco Javier F. Serrador . - -2003-09-01 Metin Amiroff - - * az.po: Added Azerbaijani translation. - -2003-08-30 Wang Jian - - * zh_CN.po: Added Simplified Chinese translation by - Mai Hao Hui . - -2003-08-29 Danilo ??egan - - * sr.po, sr at Latn.po: Updated Serbian translation. - -2003-08-26 Pablo Gonzalo del Campo - - * es.po: Updated Spanish translation by - Francisco Javier F. Serrador . - -2003-08-26 Artur Flinta - - * pl.po: Updated Polish translation. - -2003-08-26 Changwoo Ryu - - * ko.po: Added Korean translation by - Young-Ho Cha . - -2003-08-25 Ole Laursen - - * da.po: Added Danish translation. - -2003-08-25 Danilo ??egan - - * sr.po, sr at Latn.po: Updated Serbian translation. - -2003-08-23 Kjartan Maraas - - * no.po: Update Norwegian translation. - -2003-08-23 Christian Rose - - * sv.po: Updated Swedish translation. - -2003-08-20 Kjartan Maraas - - * no.po: Added Norwegian translation. - -2003-08-15 Takeshi AIHANA - - *ja.po: Updated Japanese translation. - -2003-08-02 Vincent van Adrighem - - * nl.po: Dutch translation added by Elros Cyriatan. - -2003-07-31 Christian Rose - - * sv.po: Updated Swedish translation. - -2003-07-28 Duarte Loreto - - * pt.po: Updated Portuguese translation. - -2003-07-27 Artur Flinta - - * pl.po: Updated Polish translation. - -2003-07-22 Miloslav Trmac - - * cs.po: Updated Czech translation. - -2003-07-21 Pablo Gonzalo del Campo - - * es.po: Updated Spanish translation by - Francisco Javier F. Serrador . - -2003-07-21 Artur Flinta - - * pl.po: Updated Polish translation. - -2003-07-17 Christian Neumair - - * de.po: Updated German translation. - -2003-07-17 Takeshi AIHANA - - * ja.po: Added Japanese translation. - -2003-07-15 Danilo ??egan - - * sr.po, sr at Latn.po: Added Serbian translation by Serbian team - (Prevod.org). - -2003-07-07 Abel Cheung - - * zh_TW.po: Updated traditional Chinese translation. - -2003-07-02 Artur Flinta - - * pl.po: Updated Polish translation. - -2003-06-18 Fatih Demir - - * tr.po: Added Turkish translation by Sami Onur Zaim. - -2003-06-18 Christophe Merlet - - * fr.po: Added French translation from - Yann Laviolette . - -2003-06-13 Jordi Mallach - - * ca.po: Updated Catalan translation. - -2003-06-13 Gil "Dolfin" Osher - - * he.po: Added Hebrew translation. - -2003-05-26 Pablo Gonzalo del Campo - - * es.po: Added Spanish translation by - Francisco Javier F. Serrador - -2003-05-24 Duarte Loreto - - * pt.po: Added Portuguese translation. - -2003-05-21 Christian Rose - - * sv.po: Updated Swedish translation. - -2003-05-21 Miloslav Trmac - - * cs.po: Updated Czech translation. - -2003-05-20 Christian Neumair - - * POTFILES.in: Added missing files. - * de.po: Added German translation. - -2003-05-18 Miloslav Trmac - - * cs.po: Updated CZech translation. - -2003-05-09 Abel Cheung - - * zh_TW.po: New traditional Chinese translation. - -2003-05-08 Miloslav Trmac - - * cs.po: Updated Czech translation. - -2003-05-07 Miloslav Trmac - - * cs.po: Added Czech translation. - -2003-05-07 Jordi Mallach - - * ca.po: Added Catalan translation. - -2003-05-07 Christian Rose - - * sv.po: Updated Swedish translation. - -2003-05-07 Christian Neumair - - * POTFILES.in: Added missing file. - * de.po: Added German translation. - -2003-05-07 Christian Rose - - * POTFILES.in: Added missing files. - * sv.po: Added Swedish translation. - Index: po/POTFILES.in =================================================================== --- po/POTFILES.in (Revision 466) +++ po/POTFILES.in (Arbeitskopie) @@ -0,0 +1,4 @@ +desktop-themes/Darklooks/index.theme.in +icon-themes/Foxtrot/index.theme.in +icon-themes/Gion/index.theme.in +icon-themes/Neu/index.theme.in Index: gnome-themes-extras.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes-extras/F-8/gnome-themes-extras.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gnome-themes-extras.spec 14 Jan 2008 11:07:05 -0000 1.20 +++ gnome-themes-extras.spec 3 Mar 2008 00:04:18 -0000 1.21 @@ -1,6 +1,6 @@ Name: gnome-themes-extras Version: 2.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Collection of metathemes for the Gnome desktop environment @@ -8,6 +8,7 @@ License: GPLv2 URL: http://librsvg.sourceforge.net/theme.php Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/%{version}/%{name}-%{version}.tar.bz2 +Patch0: gnome-themes-extras_license-and-i18n.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext, gtk2-devel, perl(XML::Parser), gtk2-engines >= 2.11.7, icon-naming-utils >= 0.8.1 @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p0 %build %configure @@ -51,6 +53,9 @@ %{_datadir}/themes/Darklooks/ %changelog +* Mon Mar 3 2008 Marc Wiriadisastra - 2.20-5 +- Integrated patch from upstream for licenses and pot files + * Thu Jan 10 2008 Marc Wiriadisastra - 2.20-4 - Switched back to monolithic package - Removed patches From fedora-extras-commits at redhat.com Mon Mar 3 00:35:32 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 3 Mar 2008 00:35:32 GMT Subject: rpms/hal/devel hal.spec,1.142,1.143 Message-ID: <200803030035.m230ZWXa017679@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/hal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17655 Modified Files: hal.spec Log Message: * Mon Mar 03 2008 - Bastien Nocera - 0.5.10-5%{?dist} - Require smbios-utils, not libsmbios-bin Index: hal.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- hal.spec 14 Feb 2008 10:52:51 -0000 1.142 +++ hal.spec 3 Mar 2008 00:34:58 -0000 1.143 @@ -26,7 +26,7 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.10 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.freedesktop.org/Software/hal Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -82,7 +82,7 @@ %endif %ifarch %{ix86} x86_64 Requires: dmidecode >= %{dmidecode_version} -Requires: libsmbios-bin +Requires: smbios-utils %endif Requires: ConsoleKit >= %{consolekit_version} Requires: PolicyKit >= %{policykit_version} @@ -243,6 +243,9 @@ %{_datadir}/gtk-doc/html/libhal-storage/* %changelog +* Mon Mar 03 2008 - Bastien Nocera - 0.5.10-5%{?dist} +- Require smbios-utils, not libsmbios-bin + * Thu Feb 14 2008 Adam Tkac - 0.5.10-5%{?dist} - rebuild against new libsmbios From fedora-extras-commits at redhat.com Mon Mar 3 00:46:23 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 3 Mar 2008 00:46:23 GMT Subject: rpms/elfutils/F-7 elfutils.spec,1.93,1.94 Message-ID: <200803030046.m230kNYQ017904@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/elfutils/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17851/F-7 Modified Files: elfutils.spec Log Message: Package libasm, fix libelf-devel provide. Index: elfutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-7/elfutils.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- elfutils.spec 1 Mar 2008 21:22:04 -0000 1.93 +++ elfutils.spec 3 Mar 2008 00:45:46 -0000 1.94 @@ -1,5 +1,5 @@ %define eu_version 0.133 -%define eu_release 1 +%define eu_release 2 %if %{?_with_compat:1}%{!?_with_compat:0} %define compat 1 @@ -129,7 +129,6 @@ Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} %endif Obsoletes: libelf-devel <= 0.8.2-2 -Provides: libelf-devel %description libelf-devel The elfutils-libelf-devel package contains the libraries to create @@ -192,10 +191,6 @@ # XXX Nuke unpackaged files { cd ${RPM_BUILD_ROOT} rm -f .%{_bindir}/eu-ld - rm -f .%{_includedir}/elfutils/libasm.h - rm -f .%{_libdir}/libasm-%{version}.so - rm -f .%{_libdir}/libasm.so* - rm -f .%{_libdir}/libasm.a } %check @@ -233,8 +228,9 @@ %files libs %defattr(-,root,root) +%{_libdir}/libasm-%{version}.so +%{_libdir}/libasm.so.* %{_libdir}/libdw-%{version}.so -#%{_libdir}/libasm.so.* %{_libdir}/libdw.so.* %dir %{_libdir}/elfutils %{_libdir}/elfutils/lib*.so @@ -244,16 +240,17 @@ %{_includedir}/dwarf.h %dir %{_includedir}/elfutils %{_includedir}/elfutils/elf-knowledge.h +%{_includedir}/elfutils/libasm.h %{_includedir}/elfutils/libebl.h %{_includedir}/elfutils/libdw.h %{_includedir}/elfutils/libdwfl.h %{_libdir}/libebl.a -#%{_libdir}/libasm.so +%{_libdir}/libasm.so %{_libdir}/libdw.so %files devel-static %defattr(-,root,root) -#%{_libdir}/libasm.a +%{_libdir}/libasm.a %{_libdir}/libdw.a %files libelf @@ -273,9 +270,14 @@ %{_libdir}/libelf.a %changelog -* Fri Feb 29 2008 Roland McGrath - 0.133-1 +* Sun Mar 2 2008 Roland McGrath - 0.133-2 - Update to 0.133 -- Install eu-objdump, now has limited disassembler support. + - readelf, elflint, libebl: SHT_GNU_ATTRIBUTE section handling (readelf -A) + - readelf: core note handling for NT_386_TLS, NT_PPC_SPE, Alpha NT_AUXV + - libdwfl: bug fixes and optimization in relocation handling + - elfcmp: bug fix for non-allocated section handling + - ld: implement newer features of binutils linker. +- Install eu-objdump and libasm, now has limited disassembler support. * Mon Jan 21 2008 Roland McGrath - 0.132-3 - Update to 0.132 From fedora-extras-commits at redhat.com Mon Mar 3 00:46:30 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 3 Mar 2008 00:46:30 GMT Subject: rpms/elfutils/F-8 elfutils.spec,1.96,1.97 Message-ID: <200803030046.m230kUuI017907@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/elfutils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17851/F-8 Modified Files: elfutils.spec Log Message: Package libasm, fix libelf-devel provide. Index: elfutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/F-8/elfutils.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- elfutils.spec 1 Mar 2008 21:22:11 -0000 1.96 +++ elfutils.spec 3 Mar 2008 00:45:53 -0000 1.97 @@ -1,5 +1,5 @@ %define eu_version 0.133 -%define eu_release 1 +%define eu_release 2 %if %{?_with_compat:1}%{!?_with_compat:0} %define compat 1 @@ -129,7 +129,6 @@ Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} %endif Obsoletes: libelf-devel <= 0.8.2-2 -Provides: libelf-devel %description libelf-devel The elfutils-libelf-devel package contains the libraries to create @@ -192,10 +191,6 @@ # XXX Nuke unpackaged files { cd ${RPM_BUILD_ROOT} rm -f .%{_bindir}/eu-ld - rm -f .%{_includedir}/elfutils/libasm.h - rm -f .%{_libdir}/libasm-%{version}.so - rm -f .%{_libdir}/libasm.so* - rm -f .%{_libdir}/libasm.a } %check @@ -233,8 +228,9 @@ %files libs %defattr(-,root,root) +%{_libdir}/libasm-%{version}.so +%{_libdir}/libasm.so.* %{_libdir}/libdw-%{version}.so -#%{_libdir}/libasm.so.* %{_libdir}/libdw.so.* %dir %{_libdir}/elfutils %{_libdir}/elfutils/lib*.so @@ -244,16 +240,17 @@ %{_includedir}/dwarf.h %dir %{_includedir}/elfutils %{_includedir}/elfutils/elf-knowledge.h +%{_includedir}/elfutils/libasm.h %{_includedir}/elfutils/libebl.h %{_includedir}/elfutils/libdw.h %{_includedir}/elfutils/libdwfl.h %{_libdir}/libebl.a -#%{_libdir}/libasm.so +%{_libdir}/libasm.so %{_libdir}/libdw.so %files devel-static %defattr(-,root,root) -#%{_libdir}/libasm.a +%{_libdir}/libasm.a %{_libdir}/libdw.a %files libelf @@ -273,9 +270,14 @@ %{_libdir}/libelf.a %changelog -* Fri Feb 29 2008 Roland McGrath - 0.133-1 +* Sun Mar 2 2008 Roland McGrath - 0.133-2 - Update to 0.133 -- Install eu-objdump, now has limited disassembler support. + - readelf, elflint, libebl: SHT_GNU_ATTRIBUTE section handling (readelf -A) + - readelf: core note handling for NT_386_TLS, NT_PPC_SPE, Alpha NT_AUXV + - libdwfl: bug fixes and optimization in relocation handling + - elfcmp: bug fix for non-allocated section handling + - ld: implement newer features of binutils linker. +- Install eu-objdump and libasm, now has limited disassembler support. * Mon Jan 21 2008 Roland McGrath - 0.132-3 - Update to 0.132 From fedora-extras-commits at redhat.com Mon Mar 3 00:46:37 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 3 Mar 2008 00:46:37 GMT Subject: rpms/elfutils/devel elfutils.spec,1.101,1.102 Message-ID: <200803030046.m230kbXb017912@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/elfutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17851/devel Modified Files: elfutils.spec Log Message: Package libasm, fix libelf-devel provide. Index: elfutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- elfutils.spec 1 Mar 2008 21:20:41 -0000 1.101 +++ elfutils.spec 3 Mar 2008 00:46:00 -0000 1.102 @@ -1,5 +1,5 @@ %define eu_version 0.133 -%define eu_release 1 +%define eu_release 2 %if %{?_with_compat:1}%{!?_with_compat:0} %define compat 1 @@ -129,7 +129,6 @@ Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} %endif Obsoletes: libelf-devel <= 0.8.2-2 -Provides: libelf-devel %description libelf-devel The elfutils-libelf-devel package contains the libraries to create @@ -192,10 +191,6 @@ # XXX Nuke unpackaged files { cd ${RPM_BUILD_ROOT} rm -f .%{_bindir}/eu-ld - rm -f .%{_includedir}/elfutils/libasm.h - rm -f .%{_libdir}/libasm-%{version}.so - rm -f .%{_libdir}/libasm.so* - rm -f .%{_libdir}/libasm.a } %check @@ -233,8 +228,9 @@ %files libs %defattr(-,root,root) +%{_libdir}/libasm-%{version}.so +%{_libdir}/libasm.so.* %{_libdir}/libdw-%{version}.so -#%{_libdir}/libasm.so.* %{_libdir}/libdw.so.* %dir %{_libdir}/elfutils %{_libdir}/elfutils/lib*.so @@ -244,16 +240,17 @@ %{_includedir}/dwarf.h %dir %{_includedir}/elfutils %{_includedir}/elfutils/elf-knowledge.h +%{_includedir}/elfutils/libasm.h %{_includedir}/elfutils/libebl.h %{_includedir}/elfutils/libdw.h %{_includedir}/elfutils/libdwfl.h %{_libdir}/libebl.a -#%{_libdir}/libasm.so +%{_libdir}/libasm.so %{_libdir}/libdw.so %files devel-static %defattr(-,root,root) -#%{_libdir}/libasm.a +%{_libdir}/libasm.a %{_libdir}/libdw.a %files libelf @@ -273,9 +270,14 @@ %{_libdir}/libelf.a %changelog -* Fri Feb 29 2008 Roland McGrath - 0.133-1 +* Sun Mar 2 2008 Roland McGrath - 0.133-2 - Update to 0.133 -- Install eu-objdump, now has limited disassembler support. + - readelf, elflint, libebl: SHT_GNU_ATTRIBUTE section handling (readelf -A) + - readelf: core note handling for NT_386_TLS, NT_PPC_SPE, Alpha NT_AUXV + - libdwfl: bug fixes and optimization in relocation handling + - elfcmp: bug fix for non-allocated section handling + - ld: implement newer features of binutils linker. +- Install eu-objdump and libasm, now has limited disassembler support. * Mon Jan 21 2008 Roland McGrath - 0.132-3 - Update to 0.132 From fedora-extras-commits at redhat.com Mon Mar 3 01:06:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 01:06:21 GMT Subject: rpms/fontforge/devel fontforge.spec,1.29,1.30 Message-ID: <200803030106.m2316Ltk025459@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fontforge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25416 Modified Files: fontforge.spec Log Message: Change Requires from htmlview to xdg-utils (bz 312691) Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- fontforge.spec 2 Mar 2008 16:29:16 -0000 1.29 +++ fontforge.spec 3 Mar 2008 01:05:31 -0000 1.30 @@ -3,7 +3,7 @@ Name: fontforge Version: 20080203 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -14,7 +14,7 @@ Source2: http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: htmlview +Requires: xdg-utils BuildRequires: libjpeg-devel BuildRequires: libtiff-devel @@ -123,6 +123,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Sun Mar 02 2008 Kevin Fenzi - 20080203-2 +- Change Requires from htmlview to xdg-utils (bz 312691) + * Sat Mar 01 2008 Kevin Fenzi - 20080203-1 - Update to upstream 20080203 - Add new devel subpackage From fedora-extras-commits at redhat.com Mon Mar 3 01:35:10 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 3 Mar 2008 01:35:10 GMT Subject: rpms/NetworkManager/F-8 .cvsignore, 1.78, 1.79 NetworkManager.spec, 1.203, 1.204 sources, 1.97, 1.98 Message-ID: <200803030135.m231ZAw9025901@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25868 Modified Files: .cvsignore NetworkManager.spec sources Log Message: * Sun Mar 2 2008 Dan Williams - 1:0.7.0-0.6.7.svn3370 - Fix crash of nm-system-settings on malformed ifcfg files (rh #434919) - Require gnome-icon-theme to pick up lock.png (rh #435344) - Fix applet segfault after connection removal via connection editor or GConf Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/F-8/.cvsignore,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- .cvsignore 29 Feb 2008 19:39:15 -0000 1.78 +++ .cvsignore 3 Mar 2008 01:34:10 -0000 1.79 @@ -71,3 +71,5 @@ nm-applet-0.7.0.svn516.tar.gz NetworkManager-0.7.0.svn3369.tar.gz nm-applet-0.7.0.svn568.tar.gz +NetworkManager-0.7.0.svn3370.tar.gz +nm-applet-0.7.0.svn571.tar.gz Index: NetworkManager.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/F-8/NetworkManager.spec,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- NetworkManager.spec 29 Feb 2008 19:39:15 -0000 1.203 +++ NetworkManager.spec 3 Mar 2008 01:34:10 -0000 1.204 @@ -1,15 +1,15 @@ ExcludeArch: s390 s390x %define dbus_version 1.1 -%define dbus_glib_version 0.73 +%define dbus_glib_version 0.73-6 %define hal_version 0.5.0 %define gtk2_version 2.12.0 %define wireless_tools_version 1:28-0pre9 %define libnl_version 1.0-0.15.pre8.git20071218 -%define snapshot svn3369 -%define applet_snapshot svn568 +%define snapshot svn3370 +%define applet_snapshot svn571 Name: NetworkManager Summary: Network connection manager and user applications @@ -82,6 +82,7 @@ PreReq: gtk2 >= %{gtk2_version} Requires: gnome-keyring Requires: nss >= 3.11.7 +Requires: gnome-icon-theme %description gnome This package contains GNOME utilities and applications for use with @@ -276,6 +277,11 @@ %changelog +* Sun Mar 2 2008 Dan Williams - 1:0.7.0-0.6.7.svn3370 +- Fix crash of nm-system-settings on malformed ifcfg files (rh #434919) +- Require gnome-icon-theme to pick up lock.png (rh #435344) +- Fix applet segfault after connection removal via connection editor or GConf + * Fri Feb 29 2008 Dan Williams - 1:0.7.0-0.6.7.svn3369 - Don't create multiple connections for hidden access points - Fix scanning behavior Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/F-8/sources,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- sources 29 Feb 2008 19:39:15 -0000 1.97 +++ sources 3 Mar 2008 01:34:10 -0000 1.98 @@ -1,2 +1,2 @@ -c86457760846972edda0b0b6c7df4533 NetworkManager-0.7.0.svn3369.tar.gz -650c9fb2ee5c95cffb9d0429bfd91291 nm-applet-0.7.0.svn568.tar.gz +d23d10962547ac273926dfb5cc0615e0 NetworkManager-0.7.0.svn3370.tar.gz +9dbb6db9709a8f094dbd5f5e27e15044 nm-applet-0.7.0.svn571.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 01:39:52 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 3 Mar 2008 01:39:52 GMT Subject: rpms/NetworkManager/devel NetworkManager.spec, 1.196, 1.197 sources, 1.88, 1.89 Message-ID: <200803030139.m231dqjN026020@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25988 Modified Files: NetworkManager.spec sources Log Message: * Sun Mar 2 2008 Dan Williams - 1:0.7.0-0.8.svn3370 - Fix crash of nm-system-settings on malformed ifcfg files (rh #434919) - Require gnome-icon-theme to pick up lock.png (rh #435344) - Fix applet segfault after connection removal via connection editor or GConf Index: NetworkManager.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- NetworkManager.spec 29 Feb 2008 19:46:34 -0000 1.196 +++ NetworkManager.spec 3 Mar 2008 01:38:56 -0000 1.197 @@ -1,15 +1,15 @@ ExcludeArch: s390 s390x %define dbus_version 1.1 -%define dbus_glib_version 0.73 +%define dbus_glib_version 0.73-6 %define hal_version 0.5.0 %define gtk2_version 2.12.0 %define wireless_tools_version 1:28-0pre9 %define libnl_version 1.0-0.15.pre8.git20071218 -%define snapshot svn3369 -%define applet_snapshot svn568 +%define snapshot svn3370 +%define applet_snapshot svn571 Name: NetworkManager Summary: Network connection manager and user applications @@ -60,6 +60,7 @@ BuildRequires: ppp >= 2.4.4 BuildRequires: gnome-common BuildRequires: nss-devel >= 3.11.7 +Requires: gnome-icon-theme %description NetworkManager attempts to keep an active network connection available at all @@ -278,6 +279,11 @@ %changelog +* Sun Mar 2 2008 Dan Williams - 1:0.7.0-0.8.svn3370 +- Fix crash of nm-system-settings on malformed ifcfg files (rh #434919) +- Require gnome-icon-theme to pick up lock.png (rh #435344) +- Fix applet segfault after connection removal via connection editor or GConf + * Fri Feb 29 2008 Dan Williams - 1:0.7.0-0.8.svn3369 - Don't create multiple connections for hidden access points - Fix scanning behavior Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- sources 29 Feb 2008 19:46:34 -0000 1.88 +++ sources 3 Mar 2008 01:38:56 -0000 1.89 @@ -1,2 +1,2 @@ -c86457760846972edda0b0b6c7df4533 NetworkManager-0.7.0.svn3369.tar.gz -650c9fb2ee5c95cffb9d0429bfd91291 nm-applet-0.7.0.svn568.tar.gz +d23d10962547ac273926dfb5cc0615e0 NetworkManager-0.7.0.svn3370.tar.gz +9dbb6db9709a8f094dbd5f5e27e15044 nm-applet-0.7.0.svn571.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 02:36:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 02:36:28 GMT Subject: rpms/perl-XML-Twig/devel .cvsignore, 1.11, 1.12 perl-XML-Twig.spec, 1.21, 1.22 sources, 1.11, 1.12 Message-ID: <200803030236.m232aSdc001526@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Twig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1502 Modified Files: .cvsignore perl-XML-Twig.spec sources Log Message: update to 3.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Twig/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 13 Feb 2007 16:42:14 -0000 1.11 +++ .cvsignore 3 Mar 2008 02:35:47 -0000 1.12 @@ -1 +1 @@ -XML-Twig-3.29.tar.gz +XML-Twig-3.32.tar.gz Index: perl-XML-Twig.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Twig/devel/perl-XML-Twig.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- perl-XML-Twig.spec 2 Mar 2008 15:52:40 -0000 1.21 +++ perl-XML-Twig.spec 3 Mar 2008 02:35:47 -0000 1.22 @@ -1,6 +1,6 @@ Name: perl-XML-Twig -Version: 3.29 -Release: 6%{?dist} +Version: 3.32 +Release: 1%{?dist} Summary: A perl module for processing huge XML documents in tree mode Group: Development/Libraries @@ -90,6 +90,9 @@ %changelog +* Sun Mar 2 2008 Tom "spot" Callaway - 3.32-1 +- update to 3.32 + * Wed Feb 27 2008 Tom "spot" Callaway - 3.29-6 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Twig/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 13 Feb 2007 16:42:14 -0000 1.11 +++ sources 3 Mar 2008 02:35:47 -0000 1.12 @@ -1 +1 @@ -fd1931464e28fb7ad082439bc2c11c2c XML-Twig-3.29.tar.gz +9df9dcab00aa093c4e540caa5cb759fa XML-Twig-3.32.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 02:53:41 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Mon, 3 Mar 2008 02:53:41 GMT Subject: rpms/mesa/devel mesa-7.1pre-nukeglthread-debug.patch, NONE, 1.1 mesa.spec, 1.169, 1.170 Message-ID: <200803030253.m232rfSV001935@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/mesa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1908 Modified Files: mesa.spec Added Files: mesa-7.1pre-nukeglthread-debug.patch Log Message: * Mon Mar 03 2008 Dave Airlie 7.1-0.18 - fix i915 build due to symbol visibility mesa-7.1pre-nukeglthread-debug.patch: --- NEW FILE mesa-7.1pre-nukeglthread-debug.patch --- diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index 94d499f..2ba596e 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -615,11 +615,6 @@ intel_render_texture(GLcontext * ctx, } } - DBG("Begin render texture tid %x tex=%u w=%d h=%d refcount=%d\n", - _glthread_GetID(), - att->Texture->Name, newImage->Width, newImage->Height, - irb->Base.RefCount); - /* point the renderbufer's region to the texture image region */ intel_image = intel_texture_image(newImage); if (irb->region != intel_image->mt->region) { @@ -656,8 +651,6 @@ intel_finish_render_texture(GLcontext * ctx, { struct intel_renderbuffer *irb = intel_renderbuffer(att->Renderbuffer); - DBG("End render texture (tid %x) tex %u\n", _glthread_GetID(), att->Texture->Name); - if (irb) { /* just release the region */ intel_region_release(&irb->region); Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- mesa.spec 26 Feb 2008 20:41:53 -0000 1.169 +++ mesa.spec 3 Mar 2008 02:52:48 -0000 1.170 @@ -15,7 +15,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.1 -Release: 0.17%{?dist} +Release: 0.18%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -29,6 +29,7 @@ Patch0: mesa-7.1pre-osmesa-version.patch Patch1: mesa-7.1-dri-drivers.patch +Patch2: mesa-7.1pre-nukeglthread-debug.patch BuildRequires: pkgconfig autoconf automake %if %{with_dri} @@ -151,6 +152,7 @@ %setup -q -n mesa-%{gitdate} -b2 %patch0 -p1 -b .osmesa %patch1 -p1 -b .dri-drivers +%patch2 -p1 -b .intel-glthread # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT # license and are not open source/free software, so we remove them. @@ -393,6 +395,9 @@ %{_libdir}/mesa-demos-data %changelog +* Mon Mar 03 2008 Dave Airlie 7.1-0.18 +- fix i915 build due to symbol visibility + * Tue Feb 26 2008 Adam Jackson 7.1-0.17 - Fix OSMesa symlink bug. (#424545) - Build OSMesa with -Os to be slightly less bloaty. From fedora-extras-commits at redhat.com Mon Mar 3 03:28:18 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Mon, 3 Mar 2008 03:28:18 GMT Subject: rpms/xulrunner/devel .cvsignore, 1.31, 1.32 sources, 1.32, 1.33 xulrunner.spec, 1.82, 1.83 Message-ID: <200803030328.m233SI4l009682@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9649 Modified Files: .cvsignore sources xulrunner.spec Log Message: * Sun Mar 2 2008 Christopher Aillon 1.9-0.beta3.33 - Update to latest trunk (2008-03-02) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 2 Mar 2008 03:50:19 -0000 1.31 +++ .cvsignore 3 Mar 2008 03:27:42 -0000 1.32 @@ -1 +1 @@ -mozilla-20080301.tar.bz2 +mozilla-20080302.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 2 Mar 2008 03:50:19 -0000 1.32 +++ sources 3 Mar 2008 03:27:42 -0000 1.33 @@ -1 +1 @@ -0c7a15d3d8c785f78e2e01eb4b15dbbc mozilla-20080301.tar.bz2 +1466d3cd204dde4716c9732313f0ce0c mozilla-20080302.tar.bz2 Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- xulrunner.spec 2 Mar 2008 03:50:19 -0000 1.82 +++ xulrunner.spec 3 Mar 2008 03:27:42 -0000 1.83 @@ -7,14 +7,14 @@ %define version_internal 1.9pre %if ! %{official_branding} -%define cvsdate 20080301 +%define cvsdate 20080302 %define nightly .nightly%{cvsdate} %endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.beta3.32%{?nightly}%{?dist} +Release: 0.beta3.33%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -400,6 +400,9 @@ #--------------------------------------------------------------------- %changelog +* Sun Mar 2 2008 Christopher Aillon 1.9-0.beta3.33 +- Update to latest trunk (2008-03-02) + * Sat Mar 1 2008 Christopher Aillon 1.9-0.beta3.32 - Update to latest trunk (2008-03-01) From fedora-extras-commits at redhat.com Mon Mar 3 03:29:10 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Mon, 3 Mar 2008 03:29:10 GMT Subject: rpms/firefox/devel .cvsignore, 1.61, 1.62 firefox.spec, 1.265, 1.266 sources, 1.72, 1.73 Message-ID: <200803030329.m233TAjf009737@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9672 Modified Files: .cvsignore firefox.spec sources Log Message: * Sun Mar 2 2008 Christopher Aillon 3.0-0.beta3.33 - Update to latest trunk (2008-03-02) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 2 Mar 2008 03:53:41 -0000 1.61 +++ .cvsignore 3 Mar 2008 03:28:00 -0000 1.62 @@ -1 +1 @@ -mozilla-20080301.tar.bz2 +mozilla-20080302.tar.bz2 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- firefox.spec 2 Mar 2008 03:53:41 -0000 1.265 +++ firefox.spec 3 Mar 2008 03:28:00 -0000 1.266 @@ -7,20 +7,20 @@ %define mozappdir %{_libdir}/%{name}-%{version_internal} %define gecko_version 1.9 -%define xulrunner_version 1.9-0.beta3.32 +%define xulrunner_version 1.9-0.beta3.33 %define official_branding 0 %define build_langpacks 0 %if ! %{official_branding} -%define cvsdate 20080301 +%define cvsdate 20080302 %define nightly .nightly%{cvsdate} %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.beta3.32%{?nightly}%{?dist} +Release: 0.beta3.33%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -315,6 +315,9 @@ #--------------------------------------------------------------------- %changelog +* Sun Mar 2 2008 Christopher Aillon 3.0-0.beta3.33 +- Update to latest trunk (2008-03-02) + * Sat Mar 1 2008 Christopher Aillon 3.0-0.beta3.32 - Update to latest trunk (2008-03-01) Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/sources,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- sources 2 Mar 2008 03:53:41 -0000 1.72 +++ sources 3 Mar 2008 03:28:00 -0000 1.73 @@ -1 +1 @@ -0c7a15d3d8c785f78e2e01eb4b15dbbc mozilla-20080301.tar.bz2 +1466d3cd204dde4716c9732313f0ce0c mozilla-20080302.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 03:34:54 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Mon, 3 Mar 2008 03:34:54 GMT Subject: rpms/kernel/devel linux-2.6-drm-git-mm-revert-nopfn.patch, NONE, 1.1 kernel.spec, 1.465, 1.466 Message-ID: <200803030334.m233YsQt009884@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9856 Modified Files: kernel.spec Added Files: linux-2.6-drm-git-mm-revert-nopfn.patch Log Message: * Mon Mar 03 2008 Dave Airlie - drm: revert nopfn->fault conversion to fix oops on intel linux-2.6-drm-git-mm-revert-nopfn.patch: --- NEW FILE linux-2.6-drm-git-mm-revert-nopfn.patch --- commit 4825484968daa23b3a55446c5f40f4d35fb6ff21 Author: Dave Airlie Date: Mon Mar 3 13:29:52 2008 +1000 Revert "drm: reimplement nopfn callers with fault" This reverts commit ae0bdbd7e1d02e978323640256125f8a5391510a. diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index 6184b98..3cd0b1c 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/char/drm/drm_vm.c @@ -679,8 +679,8 @@ EXPORT_SYMBOL(drm_mmap); * \c Pagefault method for buffer objects. * * \param vma Virtual memory area. - * \param vmf vm fault data - * \return Error or VM_FAULT_NOPAGE: the pfn is manually inserted. + * \param address File offset. + * \return Error or refault. The pfn is manually inserted. * * It's important that pfns are inserted while holding the bo->mutex lock. * otherwise we might race with unmap_mapping_range() which is always @@ -692,7 +692,8 @@ EXPORT_SYMBOL(drm_mmap); * protected by the bo->mutex lock. */ -static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +static unsigned long drm_bo_vm_nopfn(struct vm_area_struct *vma, + unsigned long address) { struct drm_buffer_object *bo = (struct drm_buffer_object *) vma->vm_private_data; unsigned long page_offset; @@ -704,22 +705,25 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) unsigned long bus_base; unsigned long bus_offset; unsigned long bus_size; - unsigned long ret = VM_FAULT_NOPAGE; + unsigned long ret = NOPFN_REFAULT; + + if (address > vma->vm_end) + return NOPFN_SIGBUS; dev = bo->dev; err = drm_bo_read_lock(&dev->bm.bm_lock); if (err) - return VM_FAULT_NOPAGE; + return NOPFN_REFAULT; err = mutex_lock_interruptible(&bo->mutex); if (err) { drm_bo_read_unlock(&dev->bm.bm_lock); - return VM_FAULT_NOPAGE; + return NOPFN_REFAULT; } err = drm_bo_wait(bo, 0, 0, 0); if (err) { - ret = (err != -EAGAIN) ? VM_FAULT_SIGBUS : VM_FAULT_NOPAGE; + ret = (err != -EAGAIN) ? NOPFN_SIGBUS : NOPFN_REFAULT; goto out_unlock; } @@ -734,7 +738,7 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) DRM_BO_FLAG_FORCE_MAPPABLE; err = drm_bo_move_buffer(bo, new_flags, 0, 0); if (err) { - ret = (err != -EAGAIN) ? VM_FAULT_SIGBUS : VM_FAULT_NOPAGE; + ret = (err != -EAGAIN) ? NOPFN_SIGBUS : NOPFN_REFAULT; goto out_unlock; } } @@ -743,12 +747,11 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) &bus_size); if (err) { - ret = VM_FAULT_SIGBUS; + ret = NOPFN_SIGBUS; goto out_unlock; } - /* XXX: vmf->pgoff may work here, but it adds on vma->vm_pgoff */ - page_offset = ((unsigned long)vmf->virtual_address - vma->vm_start) >> PAGE_SHIFT; + page_offset = (address - vma->vm_start) >> PAGE_SHIFT; if (bus_size) { struct drm_mem_type_manager *man = &dev->bm.man[bo->mem.mem_type]; @@ -761,7 +764,7 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) drm_ttm_fixup_caching(ttm); page = drm_ttm_get_page(ttm, page_offset); if (!page) { - ret = VM_FAULT_OOM; + ret = NOPFN_OOM; goto out_unlock; } pfn = page_to_pfn(page); @@ -770,9 +773,9 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) drm_io_prot(_DRM_TTM, vma); } - err = vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn); + err = vm_insert_pfn(vma, address, pfn); if (err) { - ret = (err != -EAGAIN) ? VM_FAULT_OOM : VM_FAULT_NOPAGE; + ret = (err != -EAGAIN) ? NOPFN_OOM : NOPFN_REFAULT; goto out_unlock; } out_unlock: @@ -827,7 +830,7 @@ static void drm_bo_vm_close(struct vm_area_struct *vma) } static struct vm_operations_struct drm_bo_vm_ops = { - .fault = drm_bo_vm_fault, + .nopfn = drm_bo_vm_nopfn, .open = drm_bo_vm_open, .close = drm_bo_vm_close, }; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.465 retrieving revision 1.466 diff -u -r1.465 -r1.466 --- kernel.spec 2 Mar 2008 05:08:48 -0000 1.465 +++ kernel.spec 3 Mar 2008 03:34:19 -0000 1.466 @@ -619,6 +619,7 @@ Patch1801: linux-2.6-drm-git-mm.patch Patch1802: linux-2.6-ppc32-ucmpdi2.patch Patch1803: nouveau-drm.patch +Patch1804: linux-2.6-drm-git-mm-revert-nopfn.patch # kludge to make ich9 e1000 work Patch2000: linux-2.6-e1000-ich9.patch @@ -1133,6 +1134,7 @@ ApplyPatch linux-2.6-drm-git-mm.patch ApplyPatch linux-2.6-ppc32-ucmpdi2.patch ApplyPatch nouveau-drm.patch +ApplyPatch linux-2.6-drm-git-mm-revert-nopfn.patch # ext4dev stable patch queue, slated for 2.6.25 #ApplyPatch linux-2.6-ext4-stable-queue.patch @@ -1736,7 +1738,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog -* Sun Mar 01 2008 Jarod Wilson +* Mon Mar 03 2008 Dave Airlie +- drm: revert nopfn->fault conversion to fix oops on intel + +* Sat Mar 01 2008 Jarod Wilson - firewire: fix suspend/resume on older PowerPC Macs (#312871) - firewire: support for first-gen Apple UniNorth controller - firewire: add option for remote debugging From fedora-extras-commits at redhat.com Mon Mar 3 03:37:31 2008 From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr)) Date: Mon, 3 Mar 2008 03:37:31 GMT Subject: rpms/mlocate/devel .cvsignore, 1.8, 1.9 mlocate.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <200803030337.m233bVND010012@cvs-int.fedora.redhat.com> Author: mitr Update of /cvs/pkgs/rpms/mlocate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9978 Modified Files: .cvsignore mlocate.spec sources Log Message: * Mon Mar 3 2008 Miloslav Trma?? - 0.19-1 - Update to mlocate-0.19 - New home page at https://fedorahosted.org/mlocate/ . Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mlocate/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 24 Aug 2007 23:31:53 -0000 1.8 +++ .cvsignore 3 Mar 2008 03:36:55 -0000 1.9 @@ -1 +1 @@ -mlocate-0.18.tar.bz2 +mlocate-0.19.tar.bz2 Index: mlocate.spec =================================================================== RCS file: /cvs/pkgs/rpms/mlocate/devel/mlocate.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mlocate.spec 19 Feb 2008 13:53:59 -0000 1.15 +++ mlocate.spec 3 Mar 2008 03:36:55 -0000 1.16 @@ -1,9 +1,11 @@ Summary: An utility for finding files by name Name: mlocate -Version: 0.18 -Release: 2 +Version: 0.19 +Release: 1 License: GPLv2 +URL: https://fedorahosted.org/mlocate/ Group: Applications/System +# https://fedorahosted.org/mlocate/attachment/wiki/MlocateDownloads/mlocate-%{version}.tar.bz2?format=raw Source0: %{name}-%{version}.tar.bz2 Source1: updatedb.conf Source2: mlocate.cron @@ -66,6 +68,10 @@ %ghost /var/lib/mlocate/mlocate.db %changelog +* Mon Mar 3 2008 Miloslav Trma?? - 0.19-1 +- Update to mlocate-0.19 +- New home page at https://fedorahosted.org/mlocate/ . + * Tue Feb 19 2008 Fedora Release Engineering - 0.18-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mlocate/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Aug 2007 23:31:53 -0000 1.8 +++ sources 3 Mar 2008 03:36:55 -0000 1.9 @@ -1 +1 @@ -c4352d10b47e569297caedd2c2d22675 mlocate-0.18.tar.bz2 +34d0f0411ac5473bdb6a50ae36327f76 mlocate-0.19.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 04:02:44 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Mon, 3 Mar 2008 04:02:44 GMT Subject: rpms/xorg-x11-server/F-8 xserver-1.3.0-exaupgrade-latest-fixes.patch, NONE, 1.1 xorg-x11-server.spec, 1.271, 1.272 Message-ID: <200803030402.m2342iFS017696@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-server/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17428 Modified Files: xorg-x11-server.spec Added Files: xserver-1.3.0-exaupgrade-latest-fixes.patch Log Message: add exa fixups patch xserver-1.3.0-exaupgrade-latest-fixes.patch: --- NEW FILE xserver-1.3.0-exaupgrade-latest-fixes.patch --- diff -ur ./exa_accel.c /home/airlied/devel/xorg/xserver/exa/exa_accel.c --- ./exa_accel.c 2008-03-03 12:55:32.000000000 +1000 +++ xserver/exa/exa_accel.c 2008-03-03 13:41:24.000000000 +1000 @@ -1187,7 +1187,8 @@ int dstY = pBox->y1; int tileY; - tileY = (dstY - pDrawable->y - pPatOrg->y) % tileHeight; + modulus(dstY - pDrawable->y - pPatOrg->y, tileHeight, tileY); + while (height > 0) { int width = pBox->x2 - pBox->x1; int dstX = pBox->x1; @@ -1198,7 +1199,8 @@ h = height; height -= h; - tileX = (dstX - pDrawable->x - pPatOrg->x) % tileWidth; + modulus(dstX - pDrawable->x - pPatOrg->x, tileWidth, tileX); + while (width > 0) { int w = tileWidth - tileX; if (w > width) @@ -1223,7 +1225,8 @@ } fallback: - if (alu != GXcopy || planemask != FB_ALLONES) + if (alu != GXcopy || planemask != FB_ALLONES || pPatOrg->x != 0 || + pPatOrg->y != 0) return FALSE; EXA_FALLBACK(("from %p to %p (%c,%c)\n", pTile, pDrawable, exaDrawableLocation(&pTile->drawable), diff -ur ./exa.c /home/airlied/devel/xorg/xserver/exa/exa.c --- ./exa.c 2008-03-03 12:55:32.000000000 +1000 +++ xserver/exa/exa.c 2008-03-03 13:41:24.000000000 +1000 @@ -526,6 +526,7 @@ if (ps) { ps->Composite = pExaScr->SavedComposite; ps->Glyphs = pExaScr->SavedGlyphs; + ps->Trapezoids = pExaScr->SavedTrapezoids; } #endif @@ -684,6 +685,9 @@ pExaScr->SavedGlyphs = ps->Glyphs; ps->Glyphs = exaGlyphs; + + pExaScr->SavedTrapezoids = ps->Trapezoids; + ps->Trapezoids = exaTrapezoids; } #endif diff -ur ./exa_migration.c /home/airlied/devel/xorg/xserver/exa/exa_migration.c --- ./exa_migration.c 2008-03-03 12:55:32.000000000 +1000 +++ xserver/exa/exa_migration.c 2008-03-03 13:41:24.000000000 +1000 @@ -319,6 +319,10 @@ if (pPixmap->drawable.bitsPerPixel < 8) return; + if (pPixmap->drawable.width > pExaScr->info->maxX || + pPixmap->drawable.height > pExaScr->info->maxY) + return; + if (pExaPixmap->area == NULL) { pExaPixmap->area = exaOffscreenAlloc (pScreen, pExaPixmap->fb_size, diff -ur ./exa_priv.h /home/airlied/devel/xorg/xserver/exa/exa_priv.h --- ./exa_priv.h 2008-03-03 12:55:32.000000000 +1000 +++ xserver/exa/exa_priv.h 2008-03-03 13:41:24.000000000 +1000 @@ -108,6 +108,7 @@ RasterizeTrapezoidProcPtr SavedRasterizeTrapezoid; AddTrianglesProcPtr SavedAddTriangles; GlyphsProcPtr SavedGlyphs; + TrapezoidsProcPtr SavedTrapezoids; #endif Bool swappedOut; enum ExaMigrationHeuristic migration; @@ -393,6 +394,11 @@ CARD16 height); void +exaTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, + PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, + int ntrap, xTrapezoid *traps); + +void exaRasterizeTrapezoid (PicturePtr pPicture, xTrapezoid *trap, int x_off, int y_off); diff -ur ./exa_render.c /home/airlied/devel/xorg/xserver/exa/exa_render.c --- ./exa_render.c 2008-03-03 12:55:32.000000000 +1000 +++ xserver/exa/exa_render.c 2008-03-03 13:41:24.000000000 +1000 @@ -749,6 +749,132 @@ } #endif +/** + * Same as miCreateAlphaPicture, except it uses ExaCheckPolyFillRect instead + * of PolyFillRect to initialize the pixmap after creating it, to prevent + * the pixmap from being migrated. + * + * See the comments about exaTrapezoids. + */ +static PicturePtr +exaCreateAlphaPicture (ScreenPtr pScreen, + PicturePtr pDst, + PictFormatPtr pPictFormat, + CARD16 width, + CARD16 height) +{ + PixmapPtr pPixmap; + PicturePtr pPicture; + GCPtr pGC; + int error; + xRectangle rect; + + if (width > 32767 || height > 32767) + return 0; + + if (!pPictFormat) + { + if (pDst->polyEdge == PolyEdgeSharp) + pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1); + else + pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8); + if (!pPictFormat) + return 0; + } + + pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, + pPictFormat->depth); + if (!pPixmap) + return 0; + pGC = GetScratchGC (pPixmap->drawable.depth, pScreen); + if (!pGC) + { + (*pScreen->DestroyPixmap) (pPixmap); + return 0; + } + ValidateGC (&pPixmap->drawable, pGC); + rect.x = 0; + rect.y = 0; + rect.width = width; + rect.height = height; + ExaCheckPolyFillRect (&pPixmap->drawable, pGC, 1, &rect); + exaPixmapDirty (pPixmap, 0, 0, width, height); + FreeScratchGC (pGC); + pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat, + 0, 0, serverClient, &error); + (*pScreen->DestroyPixmap) (pPixmap); + return pPicture; +} + +/** + * exaTrapezoids is essentially a copy of miTrapezoids that uses + * exaCreateAlphaPicture instead of miCreateAlphaPicture. + * + * The problem with miCreateAlphaPicture is that it calls PolyFillRect + * to initialize the contents after creating the pixmap, which + * causes the pixmap to be moved in for acceleration. The subsequent + * call to RasterizeTrapezoid won't be accelerated however, which + * forces the pixmap to be moved out again. + * + * exaCreateAlphaPicture avoids this roundtrip by using ExaCheckPolyFillRect + * to initialize the contents. + */ +void +exaTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, + PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, + int ntrap, xTrapezoid *traps) +{ + ScreenPtr pScreen = pDst->pDrawable->pScreen; + PictureScreenPtr ps = GetPictureScreen(pScreen); + + /* + * Check for solid alpha add + */ + if (op == PictOpAdd && miIsSolidAlpha (pSrc)) + { + for (; ntrap; ntrap--, traps++) + (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0); + } + else if (maskFormat) + { + PicturePtr pPicture; + BoxRec bounds; + INT16 xDst, yDst; + INT16 xRel, yRel; + + xDst = traps[0].left.p1.x >> 16; + yDst = traps[0].left.p1.y >> 16; + + miTrapezoidBounds (ntrap, traps, &bounds); + if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) + return; + pPicture = exaCreateAlphaPicture (pScreen, pDst, maskFormat, + bounds.x2 - bounds.x1, + bounds.y2 - bounds.y1); + if (!pPicture) + return; + for (; ntrap; ntrap--, traps++) + (*ps->RasterizeTrapezoid) (pPicture, traps, + -bounds.x1, -bounds.y1); + xRel = bounds.x1 + xSrc - xDst; + yRel = bounds.y1 + ySrc - yDst; + CompositePicture (op, pSrc, pPicture, pDst, + xRel, yRel, 0, 0, bounds.x1, bounds.y1, + bounds.x2 - bounds.x1, + bounds.y2 - bounds.y1); + FreePicture (pPicture, 0); + } + else + { + if (pDst->polyEdge == PolyEdgeSharp) + maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1); + else + maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8); + for (; ntrap; ntrap--, traps++) + exaTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps); + } +} + #define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0) /** diff -ur ./exa_unaccel.c /home/airlied/devel/xorg/xserver/exa/exa_unaccel.c --- ./exa_unaccel.c 2008-03-03 12:55:32.000000000 +1000 +++ xserver/exa/exa_unaccel.c 2008-03-03 13:41:24.000000000 +1000 @@ -382,19 +382,19 @@ ExaMigrationRec pixmaps[1]; ExaPixmapPriv (pPixmap); + fb = pExaPixmap->sys_ptr; + /* Try to avoid framebuffer readbacks */ - if (exaPixmapIsOffscreen(pPixmap)) { - if (!miPointInRegion(DamageRegion(pExaPixmap->pDamage), 0, 0, &box)) { - fb = pExaPixmap->sys_ptr; - } else { - need_finish = TRUE; - fb = pPixmap->devPrivate.ptr; - pixmaps[0].as_dst = FALSE; - pixmaps[0].as_src = TRUE; - pixmaps[0].pPix = pPixmap; - exaDoMigration (pixmaps, 1, FALSE); - exaPrepareAccess(&pPixmap->drawable, EXA_PREPARE_SRC); - } + if (exaPixmapIsOffscreen(pPixmap) && + miPointInRegion(DamageRegion(pExaPixmap->pDamage), 0, 0, &box)) + { + need_finish = TRUE; + pixmaps[0].as_dst = FALSE; + pixmaps[0].as_src = TRUE; + pixmaps[0].pPix = pPixmap; + exaDoMigration (pixmaps, 1, FALSE); + exaPrepareAccess(&pPixmap->drawable, EXA_PREPARE_SRC); + fb = pPixmap->devPrivate.ptr; } switch (pPixmap->drawable.bitsPerPixel) { Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-8/xorg-x11-server.spec,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- xorg-x11-server.spec 2 Mar 2008 21:30:46 -0000 1.271 +++ xorg-x11-server.spec 3 Mar 2008 04:02:08 -0000 1.272 @@ -63,6 +63,7 @@ Patch1024: xserver-1.3.0-avoid-ps2-probe.patch Patch1025: xserver-1.3.0-ignore-extra-entity.patch Patch1026: xserver-1.3.0-randr-fix-set-rotations-xinerama.patch +Patch1027: xserver-1.3.0-exaupgrade-latest-fixes.patch Patch2001: xserver-1.2.0-geode-mmx.patch Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch @@ -347,6 +348,7 @@ %patch1024 -p1 -b .ps2-probe %patch1025 -p1 -b .ignore-entities %patch1026 -p1 -b .fix-set-rotation-crash +%patch1027 -p1 -b .fix-exa %patch2001 -p1 -b .geode-mmx %patch2002 -p1 -b .xephyr-keysym @@ -663,6 +665,7 @@ - xorg-server-1.3.0.0-geode-gx2-lx-autodetect.patch: Autoconfigure AMD Geode GX2 100b:0030 AMD Geode LX 1022:2081 +- xserver-1.3.0-exaupgrade-latest-fixes.patch - airlied - fix EXA * Tue Feb 12 2008 Adam Jackson 1.3.0.0-42 - xserver-1.3.0-avoid-ps2-probe.patch: Delete an irrelevant hunk against From fedora-extras-commits at redhat.com Mon Mar 3 04:17:59 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Mon, 3 Mar 2008 04:17:59 GMT Subject: rpms/xorg-x11-server/F-8 xorg-x11-server.spec,1.272,1.273 Message-ID: <200803030417.m234HxP0018093@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/xorg-x11-server/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18070 Modified Files: xorg-x11-server.spec Log Message: Add credit to Bart for his X86EMU patches Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-8/xorg-x11-server.spec,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- xorg-x11-server.spec 3 Mar 2008 04:02:08 -0000 1.272 +++ xorg-x11-server.spec 3 Mar 2008 04:17:02 -0000 1.273 @@ -662,6 +662,7 @@ xorg-server-1.3.0.0-0002-X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch xorg-server-1.3.0.0-0003-X86EMU-when-emulating-PCI-access-use-the-correct-d.patch X86EMU fixes that allow amd driver work with a few broken BIOS + (from Bart Trojanowski of Symbio Technologies) - xorg-server-1.3.0.0-geode-gx2-lx-autodetect.patch: Autoconfigure AMD Geode GX2 100b:0030 AMD Geode LX 1022:2081 From fedora-extras-commits at redhat.com Mon Mar 3 04:30:45 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Mon, 3 Mar 2008 04:30:45 GMT Subject: rpms/xfsprogs/devel xfsprogs.spec,1.35,1.36 Message-ID: <200803030430.m234Ujhd018294@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/xfsprogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18272 Modified Files: xfsprogs.spec Log Message: * Sun Mar 02 2008 Eric Sandeen 2.9.7-1 - Update to xfsprogs 2.9.7 - Lazy sb counters back off by default; other misc fixes Index: xfsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- xfsprogs.spec 7 Feb 2008 05:47:46 -0000 1.35 +++ xfsprogs.spec 3 Mar 2008 04:30:10 -0000 1.36 @@ -1,6 +1,6 @@ Summary: Utilities for managing the XFS filesystem Name: xfsprogs -Version: 2.9.6 +Version: 2.9.7 Release: 1%{?dist} # Licensing based on generic "GNU GENERAL PUBLIC LICENSE" # in source, with no mention of version. @@ -106,6 +106,10 @@ %{_libdir}/*.so %changelog +* Sun Mar 02 2008 Eric Sandeen 2.9.7-1 +- Update to xfsprogs 2.9.7 +- Lazy sb counters back off by default; other misc fixes + * Wed Feb 06 2008 Eric Sandeen 2.9.6-1 - Update to xfsprogs 2.9.6 - fixes mkfs sizing problem. - Trim down BuildRequires to what's actually required now From fedora-extras-commits at redhat.com Mon Mar 3 04:34:32 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Mon, 3 Mar 2008 04:34:32 GMT Subject: rpms/xfsprogs/devel .cvsignore,1.14,1.15 sources,1.15,1.16 Message-ID: <200803030434.m234YW9A018420@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/xfsprogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18388 Modified Files: .cvsignore sources Log Message: *sigh* new tarball too, dummy. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfsprogs/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Feb 2008 05:47:46 -0000 1.14 +++ .cvsignore 3 Mar 2008 04:33:59 -0000 1.15 @@ -1 +1 @@ -xfsprogs_2.9.6-1.tar.gz +xfsprogs_2.9.7-1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfsprogs/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 7 Feb 2008 05:47:46 -0000 1.15 +++ sources 3 Mar 2008 04:33:59 -0000 1.16 @@ -1 +1 @@ -6c356ef7b067aad1191be4f45539f5d7 xfsprogs_2.9.6-1.tar.gz +2bba6d3e4183defacf99e5e8ce805460 xfsprogs_2.9.7-1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 05:07:16 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Mon, 3 Mar 2008 05:07:16 GMT Subject: rpms/tracker/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 tracker.spec, 1.32, 1.33 Message-ID: <200803030507.m2357GHN026093@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26069 Modified Files: .cvsignore sources tracker.spec Log Message: * Sun Mar 02 2008 Deji Akingunola - 0.6.6-1 - New release 0.6.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tracker/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 28 Feb 2008 05:55:33 -0000 1.11 +++ .cvsignore 3 Mar 2008 05:06:39 -0000 1.12 @@ -1 +1 @@ -tracker-0.6.5.tar.bz2 +tracker-0.6.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/tracker/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 28 Feb 2008 05:55:33 -0000 1.11 +++ sources 3 Mar 2008 05:06:39 -0000 1.12 @@ -1 +1 @@ -71a510aab9153b0b8fe01d0af3b359ba tracker-0.6.5.tar.bz2 +0845998f8f0d715b3f1b306d59fdae4d tracker-0.6.6.tar.bz2 Index: tracker.spec =================================================================== RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- tracker.spec 28 Feb 2008 05:55:33 -0000 1.32 +++ tracker.spec 3 Mar 2008 05:06:39 -0000 1.33 @@ -1,6 +1,6 @@ Summary: An object database, tag/metadata database, search tool and indexer Name: tracker -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -137,6 +137,9 @@ %{_sysconfdir}/xdg/autostart/tracker-applet.desktop %changelog +* Sun Mar 02 2008 Deji Akingunola - 0.6.6-1 +- New release 0.6.6 + * Thu Feb 28 2008 Deji Akingunola - 0.6.5-1 - New release 0.6.5 From fedora-extras-commits at redhat.com Mon Mar 3 06:08:12 2008 From: fedora-extras-commits at redhat.com (Michael Stone (mstone)) Date: Mon, 3 Mar 2008 06:08:12 GMT Subject: rpms/olpc-utils/OLPC-2 .cvsignore, 1.28, 1.29 olpc-utils.spec, 1.35, 1.36 sources, 1.30, 1.31 Message-ID: <200803030608.m2368Cum001909@cvs-int.fedora.redhat.com> Author: mstone Update of /cvs/pkgs/rpms/olpc-utils/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1881 Modified Files: .cvsignore olpc-utils.spec sources Log Message: - Teach olpc-configure about usb customization keys. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-2/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 13 Feb 2008 05:33:58 -0000 1.28 +++ .cvsignore 3 Mar 2008 06:07:33 -0000 1.29 @@ -1 +1 @@ -olpc-utils-0.68.tar.bz2 +olpc-utils-0.69.tar.bz2 Index: olpc-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-2/olpc-utils.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- olpc-utils.spec 13 Feb 2008 05:33:58 -0000 1.35 +++ olpc-utils.spec 3 Mar 2008 06:07:33 -0000 1.36 @@ -1,5 +1,5 @@ Name: olpc-utils -Version: 0.68 +Version: 0.69 Release: 1%{?dist} Summary: OLPC utilities URL: http://dev.laptop.org/git?p=projects/olpc-utils;a=summary @@ -101,6 +101,9 @@ %changelog +* Sun Mar 02 2008 Michael Stone - 0.69-1 +- Teach olpc-configure about usb customization keys. + * Fri Feb 12 2008 Michael Stone - 0.68-1 - Import olpc-audit from Marcus - Import sudo from cscott Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-2/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 13 Feb 2008 05:33:58 -0000 1.30 +++ sources 3 Mar 2008 06:07:33 -0000 1.31 @@ -1 +1 @@ -48e6efbe2fb4e6e6cf7c69f3fe1d1dc5 olpc-utils-0.68.tar.bz2 +31b4e2bb04f748f8ff420f76f944d6a2 olpc-utils-0.69.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 06:14:02 2008 From: fedora-extras-commits at redhat.com (Hu Zheng (zhu)) Date: Mon, 3 Mar 2008 06:14:02 GMT Subject: rpms/zhcon/devel zhcon-0.2.6.gcc43.patch, 1.1, 1.2 zhcon.spec, 1.6, 1.7 Message-ID: <200803030614.m236E2sq002046@cvs-int.fedora.redhat.com> Author: zhu Update of /cvs/pkgs/rpms/zhcon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2021 Modified Files: zhcon-0.2.6.gcc43.patch zhcon.spec Log Message: i386 build fix zhcon-0.2.6.gcc43.patch: Index: zhcon-0.2.6.gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/devel/zhcon-0.2.6.gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zhcon-0.2.6.gcc43.patch 26 Feb 2008 09:13:06 -0000 1.1 +++ zhcon-0.2.6.gcc43.patch 3 Mar 2008 06:13:52 -0000 1.2 @@ -1,3 +1,12 @@ +Only in zhcon-0.2.5: config.h +Only in zhcon-0.2.5: config.log +Only in zhcon-0.2.5: config.status +Only in zhcon-0.2.5/debian: Makefile +Only in zhcon-0.2.5/doc: Makefile +Only in zhcon-0.2.5/doc: zhcon.1 +Only in zhcon-0.2.5/font: Makefile +Only in zhcon-0.2.5/input: Makefile +Only in zhcon-0.2.5: Makefile diff -u -r zhcon-0.2.5/src/basefont.cpp zhcon-0.2.5.fix/src/basefont.cpp --- zhcon-0.2.5/src/basefont.cpp 2006-04-25 00:38:27.000000000 +0800 +++ zhcon-0.2.5.fix/src/basefont.cpp 2008-02-26 17:00:11.000000000 +0800 @@ -9,14 +18,21 @@ #include #include #include +Only in zhcon-0.2.5/src: .deps +Only in zhcon-0.2.5/src/display: .deps +Only in zhcon-0.2.5/src/display: fbdev.o +Only in zhcon-0.2.5/src/display: fblinear15.o +Only in zhcon-0.2.5/src/display: fblinear16.o +Only in zhcon-0.2.5/src/display: fblinear24.o +Only in zhcon-0.2.5/src/display: fblinear32.o diff -u -r zhcon-0.2.5/src/display/fblinear4.cpp zhcon-0.2.5.fix/src/display/fblinear4.cpp --- zhcon-0.2.5/src/display/fblinear4.cpp 2006-04-25 00:38:23.000000000 +0800 -+++ zhcon-0.2.5.fix/src/display/fblinear4.cpp 2008-02-26 16:59:08.000000000 +0800 ++++ zhcon-0.2.5.fix/src/display/fblinear4.cpp 2008-03-03 14:10:32.000000000 +0800 @@ -17,6 +17,7 @@ * * ***************************************************************************/ -+#include ++#include #include #include #include "global.h" @@ -42,6 +58,7 @@ #ifdef USING_VGA #include #include +Only in zhcon-0.2.5/src/display: Makefile diff -u -r zhcon-0.2.5/src/display/vgadev.cpp zhcon-0.2.5.fix/src/display/vgadev.cpp --- zhcon-0.2.5/src/display/vgadev.cpp 2008-02-26 16:25:27.000000000 +0800 +++ zhcon-0.2.5.fix/src/display/vgadev.cpp 2008-02-26 16:59:57.000000000 +0800 @@ -98,6 +115,7 @@ #include #include +Only in zhcon-0.2.5/src: Makefile diff -u -r zhcon-0.2.5/src/window.cpp zhcon-0.2.5.fix/src/window.cpp --- zhcon-0.2.5/src/window.cpp 2006-04-25 00:38:25.000000000 +0800 +++ zhcon-0.2.5.fix/src/window.cpp 2008-02-26 17:00:29.000000000 +0800 @@ -131,3 +149,6 @@ #include #include #include +Only in zhcon-0.2.5: stamp-h1 +Only in zhcon-0.2.5/tools: .deps +Only in zhcon-0.2.5/tools: Makefile Index: zhcon.spec =================================================================== RCS file: /cvs/pkgs/rpms/zhcon/devel/zhcon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- zhcon.spec 26 Feb 2008 09:13:06 -0000 1.6 +++ zhcon.spec 3 Mar 2008 06:13:52 -0000 1.7 @@ -1,7 +1,7 @@ Name: zhcon Summary: A Fast Console CJK System Using FrameBuffer Version: 0.2.6 -Release: 7%{?dist} +Release: 8%{?dist} Group: Applications/System License: GPL URL: http://www.sourceforge.net/projects/%{name}/ @@ -67,6 +67,9 @@ %{_datadir}/%{name}/ %changelog +* Mon Mar 03 2008 Hu Zheng - 0.2.6-8 +- i386 build fix. + * Tue Feb 26 2008 Hu Zheng - 0.2.6-7 - Gcc-4.3 compile fix. From fedora-extras-commits at redhat.com Mon Mar 3 06:22:27 2008 From: fedora-extras-commits at redhat.com (Hu Zheng (zhu)) Date: Mon, 3 Mar 2008 06:22:27 GMT Subject: rpms/scim-hangul/devel scim-hangul-0.3.2.gcc43.patch, 1.1, 1.2 scim-hangul.spec, 1.29, 1.30 Message-ID: <200803030622.m236MReg002204@cvs-int.fedora.redhat.com> Author: zhu Update of /cvs/pkgs/rpms/scim-hangul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2181 Modified Files: scim-hangul-0.3.2.gcc43.patch scim-hangul.spec Log Message: ppc64 build fix scim-hangul-0.3.2.gcc43.patch: Index: scim-hangul-0.3.2.gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/scim-hangul/devel/scim-hangul-0.3.2.gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scim-hangul-0.3.2.gcc43.patch 26 Feb 2008 08:13:28 -0000 1.1 +++ scim-hangul-0.3.2.gcc43.patch 3 Mar 2008 06:22:21 -0000 1.2 @@ -1,11 +1,11 @@ diff -u -r scim-hangul-0.3.2.orig/src/scim_hangul_imengine.cpp scim-hangul-0.3.2/src/scim_hangul_imengine.cpp --- scim-hangul-0.3.2.orig/src/scim_hangul_imengine.cpp 2006-10-23 20:42:47.000000000 +0800 -+++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp 2008-02-25 14:56:22.000000000 +0800 ++++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp 2008-03-03 14:18:09.000000000 +0800 @@ -33,6 +33,7 @@ #include #endif -+#include ++#include #include #include "scim_hangul_imengine.h" Index: scim-hangul.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-hangul/devel/scim-hangul.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- scim-hangul.spec 26 Feb 2008 08:13:28 -0000 1.29 +++ scim-hangul.spec 3 Mar 2008 06:22:21 -0000 1.30 @@ -1,6 +1,6 @@ Name: scim-hangul Version: 0.3.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3 URL: http://www.scim-im.org/ @@ -51,6 +51,9 @@ %changelog +* Mon Mar 03 2008 Hu Zheng - 0.3.2-4 +- ppc64 build fix. + * Mon Feb 25 2008 Hu Zheng - 0.3.2-3 - Gcc4.3 compile fix. From fedora-extras-commits at redhat.com Mon Mar 3 06:34:16 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Mon, 3 Mar 2008 06:34:16 GMT Subject: rpms/kernel/devel linux-2.6-drm-git-i915-remove-priv-access.patch, NONE, 1.1 kernel.spec, 1.466, 1.467 Message-ID: <200803030634.m236YGg2002424@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2374 Modified Files: kernel.spec Added Files: linux-2.6-drm-git-i915-remove-priv-access.patch Log Message: * Mon Mar 03 2008 Dave Airlie - drm/i915: remove intel sarea priv refs for DRI2 linux-2.6-drm-git-i915-remove-priv-access.patch: --- NEW FILE linux-2.6-drm-git-i915-remove-priv-access.patch --- diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c index d2b7d3f..30ab367 100644 --- a/drivers/char/drm/i915_dma.c +++ b/drivers/char/drm/i915_dma.c @@ -51,7 +51,7 @@ int i915_wait_ring(struct drm_device *dev, int n, const char *caller) if (ring->space >= n) return 0; - dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; + //dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; if (ring->head != last_head) i = 0; @@ -73,8 +73,8 @@ void i915_kernel_lost_context(struct drm_device *dev) if (ring->space < 0) ring->space += ring->Size; - if (ring->head == ring->tail) - dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY; +// if (ring->head == ring->tail) +// dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY; } static int i915_dma_cleanup(struct drm_device *dev) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.466 retrieving revision 1.467 diff -u -r1.466 -r1.467 --- kernel.spec 3 Mar 2008 03:34:19 -0000 1.466 +++ kernel.spec 3 Mar 2008 06:33:26 -0000 1.467 @@ -620,6 +620,7 @@ Patch1802: linux-2.6-ppc32-ucmpdi2.patch Patch1803: nouveau-drm.patch Patch1804: linux-2.6-drm-git-mm-revert-nopfn.patch +Patch1805: linux-2.6-drm-git-i915-remove-priv-access.patch # kludge to make ich9 e1000 work Patch2000: linux-2.6-e1000-ich9.patch @@ -1135,6 +1136,7 @@ ApplyPatch linux-2.6-ppc32-ucmpdi2.patch ApplyPatch nouveau-drm.patch ApplyPatch linux-2.6-drm-git-mm-revert-nopfn.patch +ApplyPatch linux-2.6-drm-git-i915-remove-priv-access.patch # ext4dev stable patch queue, slated for 2.6.25 #ApplyPatch linux-2.6-ext4-stable-queue.patch @@ -1739,6 +1741,9 @@ %changelog * Mon Mar 03 2008 Dave Airlie +- drm/i915: remove intel sarea priv refs for DRI2 + +* Mon Mar 03 2008 Dave Airlie - drm: revert nopfn->fault conversion to fix oops on intel * Sat Mar 01 2008 Jarod Wilson From fedora-extras-commits at redhat.com Mon Mar 3 07:03:30 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim)) Date: Mon, 3 Mar 2008 07:03:30 GMT Subject: rpms/jakarta-commons-collections/devel commons-collections-3.2-jpp-depmap.xml, NONE, 1.1 jakarta-commons-collections.spec, 1.51, 1.52 sources, 1.8, 1.9 Message-ID: <200803030703.m2373Ubm010007@cvs-int.fedora.redhat.com> Author: devrim Update of /cvs/extras/rpms/jakarta-commons-collections/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9981 Modified Files: jakarta-commons-collections.spec sources Added Files: commons-collections-3.2-jpp-depmap.xml Log Message: Add missing sources, per #434059 --- NEW FILE commons-collections-3.2-jpp-depmap.xml --- junit junit 3.8.1 JPP junit junit.jar 3.8.1 Index: jakarta-commons-collections.spec =================================================================== RCS file: /cvs/extras/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- jakarta-commons-collections.spec 19 Feb 2008 01:24:47 -0000 1.51 +++ jakarta-commons-collections.spec 3 Mar 2008 07:02:56 -0000 1.52 @@ -44,7 +44,7 @@ Name: jakarta-%{short_name} Version: 3.2 -Release: 2jpp.1%{?dist} +Release: 2jpp.2%{?dist} Epoch: 0 Summary: Provides new interfaces, implementations and utilities for Java Collections License: ASL 2.0 @@ -375,6 +375,9 @@ %endif %changelog +* Sun Mar 2 2008 Devrim GUNDUZ - 0:3.2-2jpp.2 +- Add missing sources, per #434059 + * Mon Feb 18 2008 Fedora Release Engineering - 0:3.2-2jpp.1 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jakarta-commons-collections/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 10 Feb 2008 02:48:57 -0000 1.8 +++ sources 3 Mar 2008 07:02:56 -0000 1.9 @@ -1 +1,2 @@ +ae5c78642da2f356e0d9806c6ce5f265 commons-build.tar.gz dbf80727b384bfb9c220d78af30ebc14 commons-collections-3.2-src.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 07:10:18 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 3 Mar 2008 07:10:18 GMT Subject: rpms/avahi/devel avahi-0.6.22-update-de.patch, NONE, 1.1 avahi.spec, 1.103, 1.104 Message-ID: <200803030710.m237AIhJ010172@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/avahi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10141/devel Modified Files: avahi.spec Added Files: avahi-0.6.22-update-de.patch Log Message: * Mon Mar 03 2008 Kevin Kofler - 0.6.22-8 - updated (completed) German translation by Fabian Affolter (#427090) Lennart, can you please commit this to the upstream tree? Thanks in advance! avahi-0.6.22-update-de.patch: --- NEW FILE avahi-0.6.22-update-de.patch --- diff -ur avahi-0.6.22/po/de.po avahi-0.6.22-update-de/po/de.po --- avahi-0.6.22/po/de.po 2007-12-17 16:11:38.000000000 +0100 +++ avahi-0.6.22-update-de/po/de.po 2008-03-03 07:59:55.000000000 +0100 @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Fabian Affolter , 2007. # msgid "" msgstr "" "Project-Id-Version: Avahi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 15:52+0100\n" -"PO-Revision-Date: 2007-12-17 16:11+0100\n" -"Last-Translator: \n" -"Language-Team: de\n" +"POT-Creation-Date: 2007-12-31 01:39-0700\n" +"PO-Revision-Date: 2008-02-17 01:03+0100\n" +"Last-Translator: Fabian Affolter \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: de\n" +"X-Poedit-Language: German\n" "X-Poedit-Country: DE\n" #: ../avahi-common/error.c:32 @@ -43,7 +43,7 @@ #: ../avahi-common/error.c:38 msgid "Invalid DNS TTL" -msgstr "Ung??ltige DNS TTL" +msgstr "Ung??ltige DNS-TTL" #: ../avahi-common/error.c:39 msgid "Resource record key is pattern" @@ -59,11 +59,11 @@ #: ../avahi-common/error.c:43 msgid "Invalid service name" -msgstr "Ung??ltiger Dienstename" +msgstr "Ung??ltiger Dienstname" #: ../avahi-common/error.c:44 msgid "Invalid service type" -msgstr "Ung??ltiger Dienstetyp" +msgstr "Ung??ltiger Diensttyp" #: ../avahi-common/error.c:45 msgid "Invalid port number" @@ -99,7 +99,7 @@ #: ../avahi-common/error.c:54 msgid "Access denied" -msgstr "Zugriff abgelehnt" +msgstr "Zugriff verweigert" #: ../avahi-common/error.c:55 msgid "Invalid operation" @@ -159,7 +159,7 @@ #: ../avahi-common/error.c:70 msgid "Invalid DNS return code" -msgstr "Ung??ltiger DNS R??ckgabewert" +msgstr "Ung??ltiger DNS-R??ckgabewert" #: ../avahi-common/error.c:71 msgid "DNS failure: FORMERR" @@ -171,55 +171,55 @@ #: ../avahi-common/error.c:73 msgid "DNS failure: NXDOMAIN" -msgstr "" +msgstr "DNS-Fehler: NXDOMAIN" #: ../avahi-common/error.c:74 msgid "DNS failure: NOTIMP" -msgstr "" +msgstr "DNS-Fehler: NOTIMP" #: ../avahi-common/error.c:76 msgid "DNS failure: REFUSED" -msgstr "" +msgstr "DNS-Fehler: REFUSED" #: ../avahi-common/error.c:77 msgid "DNS failure: YXDOMAIN" -msgstr "" +msgstr "DNS-Fehler: YXDOMAIN" #: ../avahi-common/error.c:78 msgid "DNS failure: YXRRSET" -msgstr "" +msgstr "DNS-Fehler: YXRRSET" #: ../avahi-common/error.c:79 msgid "DNS failure: NXRRSET" -msgstr "" +msgstr "DNS-Fehler: NXRRSET" #: ../avahi-common/error.c:80 msgid "DNS failure: NOTAUTH" -msgstr "" +msgstr "DNS-Fehler: NOTAUTH" #: ../avahi-common/error.c:81 msgid "DNS failure: NOTZONE" -msgstr "" +msgstr "DNS-Fehler: NOTZONE" #: ../avahi-common/error.c:82 msgid "Invalid RDATA" -msgstr "" +msgstr "Ung??ltige RDATA" #: ../avahi-common/error.c:83 msgid "Invalid DNS type" -msgstr "" +msgstr "Ung??ltiger DNS Typ" #: ../avahi-common/error.c:84 msgid "Invalid DNS class" -msgstr "" +msgstr "Ung??ltige DNS Klasse" #: ../avahi-common/error.c:85 msgid "Not supported" -msgstr "" +msgstr "Nicht unterst??tzt" #: ../avahi-common/error.c:87 msgid "Not permitted" -msgstr "" +msgstr "Nicht erlaubt" #: ../avahi-common/error.c:88 msgid "Invalid argument" @@ -231,7 +231,7 @@ #: ../avahi-common/error.c:90 msgid "The requested operation is invalid because redundant" -msgstr "" +msgstr "Die angeforderte Operation ist ung??ltig, da sie doppelt ausgef??hrt wurde" #: ../avahi-common/error.c:96 msgid "Invalid Error Code" @@ -240,17 +240,17 @@ #: ../avahi-ui/avahi-ui.c:326 #, c-format msgid "Avahi client failure: %s" -msgstr "" +msgstr "Avahi-Client-Fehler: %s" #: ../avahi-ui/avahi-ui.c:388 #, c-format msgid "Avahi resolver failure: %s" -msgstr "" +msgstr "Avahi-Aufl??sungsfehler: %s" #: ../avahi-ui/avahi-ui.c:518 #, c-format msgid "Browsing for service type %s in domain %s failed: %s" -msgstr "" +msgstr "Durchsuchen nach Dienst-Typen %s in Dom??ne %s fehlgeschlagen: %s" #: ../avahi-ui/avahi-ui.c:519 #: ../avahi-utils/avahi-browse.c:157 @@ -263,17 +263,17 @@ #: ../avahi-ui/avahi-ui.c:649 #, c-format msgid "Avahi domain browser failure: %s" -msgstr "" +msgstr "Avahi-Dom??nenbrowser-Fehler: %s" #: ../avahi-ui/avahi-ui.c:684 #, c-format msgid "Failed to read Avahi domain: %s" -msgstr "" +msgstr "Fehler beim Lesen der Avahi-Dom??ne: %s" #: ../avahi-ui/avahi-ui.c:717 #, c-format msgid "Failed to connect to Avahi server: %s" -msgstr "" +msgstr "Verbindung zu Avahi-Server fehlgeschlagen: %s" #: ../avahi-ui/avahi-ui.c:735 msgid "Browsing for services on local network:" @@ -287,25 +287,25 @@ #: ../avahi-ui/avahi-ui.c:773 #, c-format msgid "Failed to create browser for %s: %s" -msgstr "" +msgstr "Browser-Erzeugung f??r %s fehlgeschlagen: %s" #: ../avahi-ui/avahi-ui.c:903 #, c-format msgid "Failed to create resolver for %s of type %s in domain %s: %s" -msgstr "" +msgstr "Ausl??ser-Erzeugung f??r %s vom Typ %s in Dom??ne %s fehlgeschlagen: %s" #: ../avahi-ui/avahi-ui.c:978 #, c-format msgid "Failed to create domain browser: %s" -msgstr "" +msgstr "Dom??nenbrowser-Erzeugung fehlgeschlagen: %s" #: ../avahi-ui/avahi-ui.c:989 msgid "Change domain" -msgstr "Dom??ne ??ndern" +msgstr "Dom??ne ??ndern" #: ../avahi-ui/avahi-ui.c:1021 msgid "Service Name" -msgstr "Dienstename" +msgstr "Dienstname" #: ../avahi-ui/avahi-ui.c:1029 #: ../avahi-ui/avahi-ui.c:1160 @@ -320,38 +320,37 @@ msgid "_Domain..." msgstr "_Dom??ne..." -#: ../avahi-ui/bssh.c:50 +#: ../avahi-ui/bssh.c:51 msgid "Choose Shell Server" msgstr "Shell-Dienst Ausw??hlen" -#: ../avahi-ui/bssh.c:52 +#: ../avahi-ui/bssh.c:53 msgid "Desktop" msgstr "Arbeitsplatz" -#: ../avahi-ui/bssh.c:53 +#: ../avahi-ui/bssh.c:54 msgid "Terminal" msgstr "Terminal" -#: ../avahi-ui/bssh.c:55 +#: ../avahi-ui/bssh.c:56 msgid "Choose VNC server" -msgstr "VNC-Dienst Ausw??hlen" +msgstr "VNC-Dienst ausw??hlen" -#: ../avahi-ui/bssh.c:58 +#: ../avahi-ui/bssh.c:59 msgid "Choose SSH server" -msgstr "SSH-Dienst Ausw??hlen" +msgstr "SSH-Dienst ausw??hlen" -#: ../avahi-ui/bssh.c:80 +#: ../avahi-ui/bssh.c:81 #, c-format msgid "Connecting to '%s' ...\n" msgstr "Verbinde zu '%s' ...\n" -#: ../avahi-ui/bssh.c:134 +#: ../avahi-ui/bssh.c:135 #, c-format msgid "execlp() failed: %s\n" msgstr "execlp() fehlgeschlagen: %s\n" -#: ../avahi-ui/bssh.c:144 -#, c-format +#: ../avahi-ui/bssh.c:145 msgid "Canceled.\n" msgstr "Abgebrochen.\n" @@ -369,32 +368,32 @@ #: ../avahi-utils/avahi-browse.c:245 #, c-format msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" -msgstr "" +msgstr "Fehler beim Aufl??sen des Dienstes '%s' des Typ '%s' in Dom??ne '%s': %s\n" #: ../avahi-utils/avahi-browse.c:324 #, c-format msgid "service_browser failed: %s\n" -msgstr "" +msgstr "service_browser fehlgeschlagen: %s\n" #: ../avahi-utils/avahi-browse.c:362 #, c-format msgid "avahi_service_browser_new() failed: %s\n" -msgstr "" +msgstr "avahi_service_browser_new() fehlgeschlagen: %s\n" #: ../avahi-utils/avahi-browse.c:398 #, c-format msgid "service_type_browser failed: %s\n" -msgstr "" +msgstr "service_type_browser fehlgeschlagen: %s\n" #: ../avahi-utils/avahi-browse.c:428 #, c-format msgid "avahi_service_type_browser_new() failed: %s\n" -msgstr "" +msgstr "avahi_service_type_browser_new() fehlgeschlagen: %s\n" #: ../avahi-utils/avahi-browse.c:503 #, c-format msgid "avahi_domain_browser_new() failed: %s\n" -msgstr "" +msgstr "avahi_domain_browser_new() fehlgeschlagen: %s\n" #: ../avahi-utils/avahi-browse.c:519 #: ../avahi-utils/avahi-publish.c:391 @@ -402,7 +401,7 @@ #: ../avahi-utils/avahi-set-host-name.c:170 #, c-format msgid "Failed to query version string: %s\n" -msgstr "" +msgstr "Versionsstring-Abfrage fehlgeschlagen: %s\n" #: ../avahi-utils/avahi-browse.c:524 #: ../avahi-utils/avahi-publish.c:396 @@ -411,7 +410,7 @@ #: ../avahi-utils/avahi-set-host-name.c:191 #, c-format msgid "Failed to query host name: %s\n" -msgstr "" +msgstr "Hostname-Abfrage fehlgeschlagen: %s\n" #: ../avahi-utils/avahi-browse.c:528 #: ../avahi-utils/avahi-publish.c:400 @@ -424,27 +423,27 @@ #: ../avahi-utils/avahi-browse.c:531 #, c-format msgid "E Ifce Prot Domain\n" -msgstr "" +msgstr "E Ifce Prot-Dom??ne\n" #: ../avahi-utils/avahi-browse.c:533 #, c-format msgid "E Ifce Prot %-*s %-20s Domain\n" -msgstr "" +msgstr "E Ifce Prot %-*s %-20s-Dom??ne\n" #: ../avahi-utils/avahi-browse.c:533 msgid "Name" -msgstr "" +msgstr "Name" #: ../avahi-utils/avahi-browse.c:533 msgid "Type" -msgstr "" +msgstr "Typ" #. We have been disconnected, so let reconnect #: ../avahi-utils/avahi-browse.c:564 #: ../avahi-utils/avahi-publish.c:165 #, c-format msgid "Disconnected, reconnecting ...\n" -msgstr "" +msgstr "Nicht verbunden, neu verbinden ...\n" #: ../avahi-utils/avahi-browse.c:578 #: ../avahi-utils/avahi-browse.c:808 @@ -454,7 +453,7 @@ #: ../avahi-utils/avahi-set-host-name.c:162 #, c-format msgid "Failed to create client object: %s\n" -msgstr "" +msgstr "Clientobjekt-Erzeugung fehlgeschlagen: %s\n" #: ../avahi-utils/avahi-browse.c:583 #: ../avahi-utils/avahi-publish.c:177 @@ -462,13 +461,13 @@ #: ../avahi-utils/avahi-set-host-name.c:61 #, c-format msgid "Client failure, exiting: %s\n" -msgstr "" +msgstr "Client-Fehler, verlassen: %s\n" #: ../avahi-utils/avahi-browse.c:602 #: ../avahi-utils/avahi-publish.c:208 #, c-format msgid "Waiting for daemon ...\n" -msgstr "" +msgstr "Warte auf Daemon ...\n" #: ../avahi-utils/avahi-browse.c:626 msgid "" @@ -485,18 +484,32 @@ " -f --no-fail Don't fail if the daemon is not available\n" " -p --parsable Output in parsable format\n" msgstr "" +" -h --help Zeigt diese Hilfe an\n" +" -V --version Zeigt die Version an\n" +" -D --browse-domains Durchsuche nach suchenden Dom??ne statt nach Diensten\n" +" -a --all Zeigt alle Dienste, ohne R??cksicht auf die Typen\n" +" -d --domain=DOMAIN Die Dom??ne zum Durchsuchen\n" +" -v --verbose Aktiviert detaillierten Modus\n" +" -t --terminate Beenden nach Ausgeben einer mehr oder weniger kompletten Liste\n" +" -c --cache Beenden nach Ausgeben aller Eintr??ge aus dem Cache\n" +" -l --ignore-local Ignoriere lokale Dienste\n" +" -r --resolve L??se gefundene Dienste auf\n" +" -f --no-fail Schl??gt nicht fehl, wenn der Daemon nicht verf??gbar ist\n" +" -p --parsable Ausgabe in parsbaren Format\n" #: ../avahi-utils/avahi-browse.c:639 msgid "" " -k --no-db-lookup Don't lookup service types\n" " -b --dump-db Dump service type database\n" msgstr "" +" -k --no-db-lookup Schlage Dienst-Typen nicht nach\n" +" -b --dump-db Anzeigen der Dienst-Typen-Datenbank\n" #: ../avahi-utils/avahi-browse.c:745 #: ../avahi-utils/avahi-resolve.c:221 #, c-format msgid "Too few arguments\n" -msgstr "Zu viele Argumente\n" +msgstr "Zu wenige Argumente\n" #: ../avahi-utils/avahi-browse.c:754 #, c-format @@ -509,7 +522,7 @@ #: ../avahi-utils/avahi-set-host-name.c:154 #, c-format msgid "Failed to create simple poll object.\n" -msgstr "" +msgstr "Fehler beim Erzeugen eines einfachen Abfrage-Objekts: \n" #: ../avahi-utils/avahi-publish.c:78 #, c-format @@ -519,37 +532,37 @@ #: ../avahi-utils/avahi-publish.c:83 #, c-format msgid "Failed to register: %s\n" -msgstr "" +msgstr "Registrierung fehlgeschlagen: %s\n" #: ../avahi-utils/avahi-publish.c:96 #, c-format msgid "Name collision, picking new name '%s'.\n" -msgstr "" +msgstr "Namenskollision, w??hle neuen Name '%s'.\n" #: ../avahi-utils/avahi-publish.c:116 #, c-format msgid "Failed to create entry group: %s\n" -msgstr "" +msgstr "Fehler bei der Erzeugung der Einstiegsgruppe: %s\n" #: ../avahi-utils/avahi-publish.c:126 #, c-format msgid "Failed to add address: %s\n" -msgstr "" +msgstr "Fehler beim Hinzuf??gen der Adresse: %s\n" #: ../avahi-utils/avahi-publish.c:136 #, c-format msgid "Failed to add service: %s\n" -msgstr "" +msgstr "Fehler beim Hinzuf??gen des Dienstes: %s\n" #: ../avahi-utils/avahi-publish.c:142 #, c-format msgid "Failed to add subtype '%s': %s\n" -msgstr "" +msgstr "Fehler beim Hinzuf??gen des Untertyps: '%s': %s\n" #: ../avahi-utils/avahi-publish.c:193 #, c-format msgid "Host name conflict\n" -msgstr "" +msgstr "Hostname-Konflikt\n" #: ../avahi-utils/avahi-publish.c:218 #, c-format @@ -567,6 +580,18 @@ " --subtype=SUBTYPE An additional subtype to register this service with\n" " -f --no-fail Don't fail if the daemon is not available\n" msgstr "" +"%s [options] %s []\n" +"%s [options] %s
\n" +"\n" +" -h --help Zeigt diese Hilfe an\n" +" -V --version Zeigt die Version an\n" +" -s --service Ver??ffentlicht Service\n" +" -a --address Ver??ffentlicht Addresse\n" +" -v --verbose Aktiviert detaillierten Modus\n" +" -d --domain=DOMAIN Domain zum Ver??ffentlichen des Dienstes auf\n" +" -H --host=DOMAIN Host, wo sich der Service befindet\n" +" --subtype=SUBTYPE Ein zus??tzlicher Untertyp zum Registrieren des Dienstes mit\n" +" -f --no-fail Schl??gt nicht fehl, wenn der Daemon nicht verf??gbar ist\n" #: ../avahi-utils/avahi-publish.c:300 #: ../avahi-utils/avahi-publish.c:315 @@ -577,7 +602,7 @@ #: ../avahi-utils/avahi-publish.c:326 #, c-format msgid "Failed to parse port number: %s\n" -msgstr "" +msgstr "Parsen der Port-Nummer fehlgeschlagen: %s\n" #: ../avahi-utils/avahi-publish.c:358 #: ../avahi-utils/avahi-resolve.c:248 @@ -588,12 +613,12 @@ #: ../avahi-utils/avahi-resolve.c:91 #, c-format msgid "Failed to resolve host name '%s': %s\n" -msgstr "" +msgstr "Fehler beim Aufl??sen des Hostnamens '%s': %s\n" #: ../avahi-utils/avahi-resolve.c:128 #, c-format msgid "Failed to resolve address '%s': %s\n" -msgstr "" +msgstr "Fehler beim Aufl??sen der Adresse '%s': %s\n" #: ../avahi-utils/avahi-resolve.c:159 #, c-format @@ -609,22 +634,32 @@ " -6 Lookup IPv6 address\n" " -4 Lookup IPv4 address\n" msgstr "" +"%s [options] %s \n" +"%s [options] %s
\n" +"\n" +" -h --help Zeigt diese Hilfe an\n" +" -V --version Zeigt die Version an\n" +" -n --name L??st Hostname auf\n" +" -a --address L??st Addresse auf\n" +" -v --verbose Aktiviert detaillierten Modus\n" +" -6 Schl??gt IPv6-Addresse nach\n" +" -4 Schl??gt IPv4-Addresse nach\n" #: ../avahi-utils/avahi-resolve.c:301 #: ../avahi-utils/avahi-set-host-name.c:183 #, c-format msgid "Failed to create host name resolver: %s\n" -msgstr "" +msgstr "Fehler beim Erzeugen des Hostnamen-Aufl??sers: %s\n" #: ../avahi-utils/avahi-resolve.c:311 #, c-format msgid "Failed to parse address '%s'\n" -msgstr "" +msgstr "Fehler beim Parsen der Adresse '%s'\n" #: ../avahi-utils/avahi-resolve.c:316 #, c-format msgid "Failed to create address resolver: %s\n" -msgstr "" +msgstr "Fehler beim Erzeugen des Adress-Aufl??sers: %s\n" #: ../avahi-utils/avahi-set-host-name.c:75 #, c-format @@ -635,6 +670,11 @@ " -V --version Show version\n" " -v --verbose Enable verbose mode\n" msgstr "" +"%s [options] \n" +"\n" +" -h --help Zeigt diese Hilfe an\n" +" -V --version Zeigt die Version an\n" +" -v --verbose Aktiviert detaillierten Modus\n" #: ../avahi-utils/avahi-set-host-name.c:116 #, c-format @@ -644,5 +684,5 @@ #: ../avahi-utils/avahi-set-host-name.c:195 #, c-format msgid "Host name successfully changed to %s\n" -msgstr "" +msgstr "Hostname erfolgreich ge??ndert auf %s\n" Index: avahi.spec =================================================================== RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- avahi.spec 21 Feb 2008 14:19:58 -0000 1.103 +++ avahi.spec 3 Mar 2008 07:09:35 -0000 1.104 @@ -6,7 +6,7 @@ %endif Name: avahi Version: 0.6.22 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Local network service discovery Group: System Environment/Base License: LGPLv2 @@ -39,6 +39,7 @@ # enable mono's mcs to work in beehive buildroot: Patch2: avahi-0.6.3-MONO_SHARED_DIR.patch Patch3: avahi-0.6.22-vncviewer.patch +Patch4: avahi-0.6.22-update-de.patch %description Avahi is a system which facilitates service discovery on @@ -244,6 +245,7 @@ %patch2 -p1 -b .MONO_SHARED_DIR %endif %patch3 -p1 -b .vncviewer +%patch4 -p1 -b .update-de %build @@ -520,6 +522,9 @@ %endif %changelog +* Mon Mar 03 2008 Kevin Kofler - 0.6.22-8 +- updated (completed) German translation by Fabian Affolter (#427090) + * Thu Feb 21 2008 Adam Tkac - 0.6.22-7 - really rebuild against new libcap From fedora-extras-commits at redhat.com Mon Mar 3 08:18:55 2008 From: fedora-extras-commits at redhat.com (Michael Stone (mstone)) Date: Mon, 3 Mar 2008 08:18:55 GMT Subject: rpms/olpc-utils/OLPC-2 .cvsignore, 1.29, 1.30 olpc-utils.spec, 1.36, 1.37 sources, 1.31, 1.32 Message-ID: <200803030818.m238Ithp018315@cvs-int.fedora.redhat.com> Author: mstone Update of /cvs/pkgs/rpms/olpc-utils/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18277 Modified Files: .cvsignore olpc-utils.spec sources Log Message: - Substitute $olpc_usb_version for $olpc_home_version to fix a stupid mistake. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-2/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 3 Mar 2008 06:07:33 -0000 1.29 +++ .cvsignore 3 Mar 2008 08:18:19 -0000 1.30 @@ -1 +1 @@ -olpc-utils-0.69.tar.bz2 +olpc-utils-0.70.tar.bz2 Index: olpc-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-2/olpc-utils.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- olpc-utils.spec 3 Mar 2008 06:07:33 -0000 1.36 +++ olpc-utils.spec 3 Mar 2008 08:18:19 -0000 1.37 @@ -1,5 +1,5 @@ Name: olpc-utils -Version: 0.69 +Version: 0.70 Release: 1%{?dist} Summary: OLPC utilities URL: http://dev.laptop.org/git?p=projects/olpc-utils;a=summary @@ -101,6 +101,9 @@ %changelog +* Sun Mar 02 2008 Michael Stone - 0.70-1 +- Substitute $olpc_usb_version for $olpc_home_version to fix a stupid mistake. + * Sun Mar 02 2008 Michael Stone - 0.69-1 - Teach olpc-configure about usb customization keys. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-2/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 3 Mar 2008 06:07:33 -0000 1.31 +++ sources 3 Mar 2008 08:18:19 -0000 1.32 @@ -1 +1 @@ -31b4e2bb04f748f8ff420f76f944d6a2 olpc-utils-0.69.tar.bz2 +3d009d988ea678e2ba798e1cc0963e38 olpc-utils-0.70.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 08:37:53 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Mon, 3 Mar 2008 08:37:53 GMT Subject: rpms/scim/devel scim-1.4.7-fix-fallback.patch, NONE, 1.1 scim.spec, 1.106, 1.107 Message-ID: <200803030837.m238br7O018678@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18639 Modified Files: scim.spec Added Files: scim-1.4.7-fix-fallback.patch Log Message: Fix fallback problem in gtkim module #235147. scim-1.4.7-fix-fallback.patch: --- NEW FILE scim-1.4.7-fix-fallback.patch --- diff -up scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp.fix-fallback scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp --- scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp.fix-fallback 2008-03-03 16:02:44.000000000 +0800 +++ scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp 2008-03-03 16:29:49.000000000 +0800 @@ -137,6 +137,12 @@ static gboolean gtk_scim_key_snooper static void gtk_im_slave_commit_cb (GtkIMContext *context, const char *str, GtkIMContextSCIM *context_scim); +static void gtk_im_slave_preedit_changed_cb (GtkIMContext *context, + GtkIMContextSCIM *context_scim); +static void gtk_im_slave_preedit_start_cb (GtkIMContext *context, + GtkIMContextSCIM *context_scim); +static void gtk_im_slave_preedit_end_cb (GtkIMContext *context, + GtkIMContextSCIM *context_scim); /* private functions */ static void panel_slot_reload_config (int context); @@ -499,11 +505,30 @@ gtk_im_context_scim_init (GtkIMContextSC context_scim->impl = NULL; /* slave exists for using gtk+'s table based input method */ + context_scim->slave_preedit = false; context_scim->slave = gtk_im_context_simple_new (); g_signal_connect(G_OBJECT(context_scim->slave), "commit", G_CALLBACK(gtk_im_slave_commit_cb), context_scim); + + g_signal_connect(G_OBJECT(context_scim->slave), + "preedit-changed", + G_CALLBACK(gtk_im_slave_preedit_changed_cb), + context_scim); + + g_signal_connect(G_OBJECT(context_scim->slave), + "preedit-start", + G_CALLBACK(gtk_im_slave_preedit_start_cb), + context_scim); + + g_signal_connect(G_OBJECT(context_scim->slave), + "preedit-end", + G_CALLBACK(gtk_im_slave_preedit_end_cb), + context_scim); + + + if (_backend.null ()) return; @@ -609,6 +634,15 @@ gtk_im_context_scim_finalize (GObject *o g_signal_handlers_disconnect_by_func(context_scim->slave, (void *)gtk_im_slave_commit_cb, (void *)context_scim); + g_signal_handlers_disconnect_by_func(context_scim->slave, + (void *)gtk_im_slave_preedit_changed_cb, + (void *)context_scim); + g_signal_handlers_disconnect_by_func(context_scim->slave, + (void *)gtk_im_slave_preedit_start_cb, + (void *)context_scim); + g_signal_handlers_disconnect_by_func(context_scim->slave, + (void *)gtk_im_slave_preedit_end_cb, + (void *)context_scim); g_object_unref(context_scim->slave); gtk_im_context_scim_finalize_partial (context_scim); @@ -649,8 +683,15 @@ gtk_im_context_scim_filter_keypress (Gtk if (!_snooper_installed) ret = gtk_scim_key_snooper (0, event, 0); - if (!ret && context_scim->slave) - ret = gtk_im_context_filter_keypress (context_scim->slave, event); + if (context_scim->slave) { + if (!ret ) { + ret = gtk_im_context_filter_keypress (context_scim->slave, event); + } + else if (context_scim->slave_preedit) { + context_scim->slave_preedit = false; + gtk_im_context_reset (context_scim->slave); + } + } } return ret; @@ -853,6 +894,11 @@ gtk_im_context_scim_get_preedit_string ( SCIM_DEBUG_FRONTEND(1) << "gtk_im_context_scim_get_preedit_string...\n"; GtkIMContextSCIM *context_scim = GTK_IM_CONTEXT_SCIM (context); + + if (context_scim->slave_preedit == true) { + gtk_im_context_get_preedit_string (context_scim->slave, str, attrs, cursor_pos); + return; + } if (context_scim && context_scim->impl && context_scim->impl->is_on) { String mbs = utf8_wcstombs (context_scim->impl->preedit_string); @@ -1024,6 +1070,30 @@ gtk_im_slave_commit_cb (GtkIMContext g_signal_emit_by_name(context_scim, "commit", str); } +static void +gtk_im_slave_preedit_changed_cb (GtkIMContext *context, + GtkIMContextSCIM *context_scim) +{ + context_scim->slave_preedit = true; + g_signal_emit_by_name(context_scim, "preedit-changed"); +} + +static void +gtk_im_slave_preedit_start_cb (GtkIMContext *context, + GtkIMContextSCIM *context_scim) +{ + context_scim->slave_preedit = true; + g_signal_emit_by_name(context_scim, "preedit-start"); +} + +static void +gtk_im_slave_preedit_end_cb (GtkIMContext *context, + GtkIMContextSCIM *context_scim) +{ + context_scim->slave_preedit = false; + g_signal_emit_by_name(context_scim, "preedit-end"); +} + /* Panel Slot functions */ static void panel_slot_reload_config (int context) diff -up scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.h.fix-fallback scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.h --- scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.h.fix-fallback 2008-03-03 16:18:44.000000000 +0800 +++ scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.h 2008-03-03 16:19:08.000000000 +0800 @@ -39,6 +39,7 @@ struct _GtkIMContextSCIM { GtkIMContext object; GtkIMContext *slave; + bool slave_preedit; GtkIMContextSCIMImpl *impl; Index: scim.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- scim.spec 26 Feb 2008 03:04:05 -0000 1.106 +++ scim.spec 3 Mar 2008 08:37:14 -0000 1.107 @@ -3,7 +3,7 @@ Name: scim Version: 1.4.7 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Smart Common Input Method platform License: LGPLv2+ @@ -38,6 +38,7 @@ Patch17: scim-1.4.5-no-rpath-libdir.patch Patch18: scim-1.4.7-ja-sinhala-236715.patch Patch19: scim-1.4.7-remove-locale.patch +Patch20: scim-1.4.7-fix-fallback.patch %description SCIM is a user friendly and full featured input method user interface and @@ -156,6 +157,7 @@ %patch17 -p1 -b .17-rpath~ %patch18 -p1 -b .18-sinhala~ %patch19 -p1 -b .19-remove-locale~ +%patch20 -p1 -b .20-fix-fallback %if %{snapshot} ./bootstrap @@ -293,6 +295,9 @@ %changelog +* Mon Mar 3 2008 Huang Peng - 1.4.7-13 +- Fix fallback problem in gtkim module #235147. + * Tue Feb 26 2008 Huang Peng - 1.4.7-12 - Update to scim.conf to use /usr/bin/scim to start scim processes. From fedora-extras-commits at redhat.com Mon Mar 3 08:38:58 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Mon, 3 Mar 2008 08:38:58 GMT Subject: rpms/octave/devel octave.spec, 1.71, 1.72 octave-3.0.0-gcc43.patch, 1.1, 1.2 Message-ID: <200803030838.m238cw3G018755@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18684 Modified Files: octave.spec octave-3.0.0-gcc43.patch Log Message: * Mon Mar 3 2008 Alex Lancaster - 6:3.0.0-6 - Re-enable patch, but change cstring -> string.h so it works for C as well as C++ Index: octave.spec =================================================================== RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- octave.spec 2 Mar 2008 12:44:40 -0000 1.71 +++ octave.spec 3 Mar 2008 08:38:05 -0000 1.72 @@ -3,14 +3,14 @@ Name: octave Version: 3.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPLv3+ Source: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2 -## Patch: octave-3.0.0-gcc43.patch +Patch: octave-3.0.0-gcc43.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -55,7 +55,7 @@ %prep %setup -q -## patch -p1 -b .gcc43 +%patch -p1 -b .gcc43 # Check that octave_api is set correctly if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h then @@ -143,6 +143,10 @@ %changelog +* Mon Mar 3 2008 Alex Lancaster - 6:3.0.0-6 +- Re-enable patch, but change cstring -> string.h so it works for C as + well as C++ + * Sun Mar 2 2008 Alex Lancaster - 6:3.0.0-5 - Backout GCC 4.3 patch temporarily, causes trouble for octave-forge and may not be necessary (#435600) octave-3.0.0-gcc43.patch: Index: octave-3.0.0-gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/octave/devel/octave-3.0.0-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- octave-3.0.0-gcc43.patch 29 Feb 2008 22:55:31 -0000 1.1 +++ octave-3.0.0-gcc43.patch 3 Mar 2008 08:38:05 -0000 1.2 @@ -4,7 +4,7 @@ #if ! defined (MXARRAY_H) #define MXARRAY_H -+#include ++#include + typedef enum { From fedora-extras-commits at redhat.com Mon Mar 3 08:40:33 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Mon, 3 Mar 2008 08:40:33 GMT Subject: rpms/octave/devel octave.spec,1.72,1.73 Message-ID: <200803030840.m238eXpi018814@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18782 Modified Files: octave.spec Log Message: Fix changelog. Index: octave.spec =================================================================== RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- octave.spec 3 Mar 2008 08:38:05 -0000 1.72 +++ octave.spec 3 Mar 2008 08:39:54 -0000 1.73 @@ -145,7 +145,7 @@ %changelog * Mon Mar 3 2008 Alex Lancaster - 6:3.0.0-6 - Re-enable patch, but change cstring -> string.h so it works for C as - well as C++ + well as C++. Hopefully this will #435600 for real. * Sun Mar 2 2008 Alex Lancaster - 6:3.0.0-5 - Backout GCC 4.3 patch temporarily, causes trouble for octave-forge and From fedora-extras-commits at redhat.com Mon Mar 3 09:13:12 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Mon, 3 Mar 2008 09:13:12 GMT Subject: rpms/perl/F-8 perl.spec,1.147,1.148 Message-ID: <200803030913.m239DCYV026335@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26283 Modified Files: perl.spec Log Message: Remove conflicts File-Temp. It doesn't update perl with yum. Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/F-8/perl.spec,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- perl.spec 29 Feb 2008 14:51:10 -0000 1.147 +++ perl.spec 3 Mar 2008 09:12:19 -0000 1.148 @@ -24,7 +24,7 @@ Name: perl Version: %{perl_version} -Release: 35%{?dist} +Release: 36%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -206,8 +206,7 @@ # Long history in 3rd-party repositories: Provides: perl-File-Temp = 0.16 -Obsoletes: perl-File-Temp < 0.16 -Conflicts: perl-File-Temp +Obsoletes: perl-File-Temp <= 0.15 Requires: perl-libs = %{perl_epoch}:%{perl_version}-%{release} Requires: db4 = %{db4_major}.%{db4_minor}.%{db4_patch} @@ -808,6 +807,9 @@ # Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry. %changelog +* Fri Feb 29 2008 Marcela Maslanova - 4:5.8.8-36 +- remove conflicts perl-File-Temp. Use obsoletes. + * Fri Feb 29 2008 Marcela Maslanova - 4:5.8.8-35 - upgrade Scalar::Util - possible fix for many bugs. Packages dependent on this module could work even with use of CPAN modules. From fedora-extras-commits at redhat.com Mon Mar 3 09:30:34 2008 From: fedora-extras-commits at redhat.com (Tim Niemueller (timn)) Date: Mon, 3 Mar 2008 09:30:34 GMT Subject: rpms/NetworkManager-openvpn/devel NetworkManager-openvpn.spec, 1.10, 1.11 Message-ID: <200803030930.m239UYxS026623@cvs-int.fedora.redhat.com> Author: timn Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26598 Modified Files: NetworkManager-openvpn.spec Log Message: Mute %post and %postun scripts Index: NetworkManager-openvpn.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- NetworkManager-openvpn.spec 7 Feb 2008 23:29:29 -0000 1.10 +++ NetworkManager-openvpn.spec 3 Mar 2008 09:29:51 -0000 1.11 @@ -10,7 +10,7 @@ Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 8%{svn_snapshot}%{?dist} +Release: 9%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -76,15 +76,17 @@ %post /sbin/ldconfig /usr/bin/update-desktop-database > /dev/null +touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun /sbin/ldconfig /usr/bin/update-desktop-database > /dev/null +touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files @@ -103,6 +105,9 @@ %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Mon Mar 03 2008 Tim Niemueller 1:0.7.0-9.svn3302 +- Mute %post and %postun scripts + * Fri Feb 08 2008 Tim Niemueller 1:0.7.0-8.svn3302 - Update to latest SVN snapshot - Fixes rhbz#429816 (port was not saved correctly) From fedora-extras-commits at redhat.com Mon Mar 3 09:33:54 2008 From: fedora-extras-commits at redhat.com (Tim Niemueller (timn)) Date: Mon, 3 Mar 2008 09:33:54 GMT Subject: rpms/NetworkManager-openvpn/F-8 NetworkManager-openvpn.spec, 1.13, 1.14 Message-ID: <200803030933.m239XsPY026698@cvs-int.fedora.redhat.com> Author: timn Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26670 Modified Files: NetworkManager-openvpn.spec Log Message: Mute %post and %postun scripts Index: NetworkManager-openvpn.spec =================================================================== RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/NetworkManager-openvpn.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- NetworkManager-openvpn.spec 7 Feb 2008 23:23:22 -0000 1.13 +++ NetworkManager-openvpn.spec 3 Mar 2008 09:33:07 -0000 1.14 @@ -10,7 +10,7 @@ Name: NetworkManager-openvpn Epoch: 1 Version: 0.7.0 -Release: 8%{svn_snapshot}%{?dist} +Release: 9%{svn_snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -76,15 +76,17 @@ %post /sbin/ldconfig /usr/bin/update-desktop-database > /dev/null +touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun /sbin/ldconfig /usr/bin/update-desktop-database > /dev/null +touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files @@ -103,6 +105,9 @@ %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo %changelog +* Mon Mar 03 2008 Tim Niemueller 1:0.7.0-9.svn3302 +- Mute %post and %postun scripts + * Fri Feb 08 2008 Tim Niemueller 1:0.7.0-8.svn3302 - Update to latest SVN snapshot - Fixes rhbz#429816 (port was not saved correctly) From fedora-extras-commits at redhat.com Mon Mar 3 09:35:47 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Mon, 3 Mar 2008 09:35:47 GMT Subject: rpms/iptables/devel iptables.spec,1.60,1.61 Message-ID: <200803030935.m239Zl5h026752@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26725 Modified Files: iptables.spec Log Message: - use the kernel headers from the build tree for iptables for now to be able to compile this package, but this makes the package more kernel dependant Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- iptables.spec 20 Feb 2008 05:58:52 -0000 1.60 +++ iptables.spec 3 Mar 2008 09:35:13 -0000 1.61 @@ -3,7 +3,7 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities Version: 1.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config @@ -15,6 +15,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) License: GPLv2 BuildRequires: libselinux-devel +BuildRequires: kernel Conflicts: kernel < 2.4.20 Requires(post): chkconfig Requires(preun): chkconfig @@ -71,7 +72,7 @@ TOPDIR=`pwd` OPT="$RPM_OPT_FLAGS -I$TOPDIR/include -fPIC" export KERNEL_DIR=/usr -export KBUILD_OUTPUT=/usr +#export KBUILD_OUTPUT=/usr export DO_SELINUX=1 make COPT_FLAGS="$OPT" LIBDIR=/%{_lib} make COPT_FLAGS="$OPT" LIBDIR=/%{_lib} iptables-save iptables-restore @@ -80,7 +81,7 @@ %install rm -rf %{buildroot} export KERNEL_DIR=/usr -export KBUILD_OUTPUT=/usr +#export KBUILD_OUTPUT=/usr export DO_SELINUX=1 make install DESTDIR=%{buildroot} BINDIR=/sbin LIBDIR=/%{_lib} MANDIR=%{_mandir} %if %{build_devel} @@ -154,6 +155,10 @@ %endif %changelog +* Mon Mar 3 2008 Thomas Woerner 1.4.0-3 +- use the kernel headers from the build tree for iptables for now to be able to + compile this package, but this makes the package more kernel dependant + * Wed Feb 20 2008 Fedora Release Engineering - 1.4.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 09:39:19 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 3 Mar 2008 09:39:19 GMT Subject: rpms/gimp/devel .cvsignore, 1.40, 1.41 gimp.spec, 1.156, 1.157 sources, 1.40, 1.41 Message-ID: <200803030939.m239dJuj026857@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gimp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26829 Modified Files: .cvsignore gimp.spec sources Log Message: version 2.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 30 Jan 2008 11:41:48 -0000 1.40 +++ .cvsignore 3 Mar 2008 09:38:42 -0000 1.41 @@ -1 +1 @@ -gimp-2.4.4.tar.bz2 +gimp-2.4.5.tar.bz2 Index: gimp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- gimp.spec 18 Feb 2008 10:52:36 -0000 1.156 +++ gimp.spec 3 Mar 2008 09:38:42 -0000 1.157 @@ -44,14 +44,14 @@ Summary: GNU Image Manipulation Program Name: gimp -Version: 2.4.4 +Version: 2.4.5 %define binver 2.4 %define gimp_lang_ver 20 %define interfacever 2.0 %define age 0 %define minorver 400 %define microver %(ver=%{version}; echo ${ver##*.*.}) -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: GPLv2+ Group: Applications/Multimedia @@ -456,6 +456,36 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Mar 03 2008 Nils Philippsen - 2:2.4.5-1 +- version 2.4.5 + + Changes in GIMP 2.4.5 + ===================== + + - fixed a regression introduced by the brush cursor optimization + (bug #514309) + - fixed bug in transform tool preview (bug #340965) + - fixed PSD export of images with layer masks + - fixed base64 encoding routine of the Mail plug-in + - use the correct background color when creating a new image + (bug #514082) + - explicitly link libgimpthumb with GLib (bug #515566) + - improved selection of the font sample string (bug #514021) + - unified handling of "Enter" and "Space" keysyms (bug #516544) + - fixed bug in the Glossy script when used with a pattern (bug #517285) + - correctly record dimensions in Exif data when saving as JPEG + (bug #517077) + - fixed sensitivity of plug-in menu items (bug #517683) + - fixed potential crashes in Wind, Warp, Small Tiles and Apply Canvas + plug-ins (bug #516369) + - added default keyboard shortcut for "Paste As New Image" + (Ctrl-Shift-V) + - added default keyboard shortcut for "Copy Visible" (Ctrl-Shift-C) + - fixed missing preview update in Curves tool (bug #518012) + - fixed a bug in the Frosty Logo script (bug #472316) + - fixed backward transformations using the PDB (bug #518910) + - translation fixes and updates (de, eu, eo, fr, he, hu, it, ja, ko) + * Mon Feb 18 2008 Nils Philippsen - 2:2.4.4-2 - let gimp-libs provide, gimp and gimp-devel require "gimp-libs-%%{_arch}" (#433195) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 30 Jan 2008 11:41:48 -0000 1.40 +++ sources 3 Mar 2008 09:38:42 -0000 1.41 @@ -1 +1 @@ -41d0568581de99f3fd2ecb5babae1f6e gimp-2.4.4.tar.bz2 +162e264dc5f0c7e4de8794e78818381f gimp-2.4.5.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 09:43:16 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Mon, 3 Mar 2008 09:43:16 GMT Subject: rpms/iptables/devel iptables.spec,1.61,1.62 Message-ID: <200803030943.m239hGVQ026963@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26910 Modified Files: iptables.spec Log Message: - make it fully kernel dependant - linux/conpiler.h is still missing Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- iptables.spec 3 Mar 2008 09:35:13 -0000 1.61 +++ iptables.spec 3 Mar 2008 09:42:41 -0000 1.62 @@ -71,7 +71,7 @@ %build TOPDIR=`pwd` OPT="$RPM_OPT_FLAGS -I$TOPDIR/include -fPIC" -export KERNEL_DIR=/usr +#export KERNEL_DIR=/usr #export KBUILD_OUTPUT=/usr export DO_SELINUX=1 make COPT_FLAGS="$OPT" LIBDIR=/%{_lib} @@ -80,7 +80,7 @@ %install rm -rf %{buildroot} -export KERNEL_DIR=/usr +#export KERNEL_DIR=/usr #export KBUILD_OUTPUT=/usr export DO_SELINUX=1 make install DESTDIR=%{buildroot} BINDIR=/sbin LIBDIR=/%{_lib} MANDIR=%{_mandir} From fedora-extras-commits at redhat.com Mon Mar 3 09:44:58 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Mon, 3 Mar 2008 09:44:58 GMT Subject: rpms/kernel-xen-2.6/devel kernel.spec,1.11.2.10,1.11.2.11 Message-ID: <200803030944.m239iw19027095@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27040 Modified Files: Tag: private-markmc-pv-ops-branch kernel.spec Log Message: Don't create debuginfo.list for main package The main package uses debugfiles.list rather than debuginfo.list, so we should not be creating debuginfo.list. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.11.2.10 retrieving revision 1.11.2.11 diff -u -r1.11.2.10 -r1.11.2.11 --- kernel.spec 29 Feb 2008 19:23:03 -0000 1.11.2.10 +++ kernel.spec 3 Mar 2008 09:44:14 -0000 1.11.2.11 @@ -813,7 +813,7 @@ %description -n %{variantbase}%{?1:-%{1}}-debuginfo\ This package provides debug information for package %{variantbase}%{?1:-%{1}}.\ This is required to use SystemTap with %{variantbase}%{?1:-%{1}}-%{KVERREL}.\ -%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}(\.debug)?' -o debuginfo%{?1}.list}\ +%{1?:%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}(\.debug)?' -o debuginfo%{?1}.list}}\ %{nil} # From fedora-extras-commits at redhat.com Mon Mar 3 09:49:26 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 3 Mar 2008 09:49:26 GMT Subject: rpms/gimp/F-8 .cvsignore, 1.40, 1.41 gimp.spec, 1.151, 1.152 sources, 1.40, 1.41 Message-ID: <200803030949.m239nQ8X027232@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gimp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188 Modified Files: .cvsignore gimp.spec sources Log Message: version 2.4.5 let gimp-libs provide, gimp and gimp-devel require "gimp-libs-%{_arch}" (#433195) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gimp/F-8/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 30 Jan 2008 11:43:13 -0000 1.40 +++ .cvsignore 3 Mar 2008 09:48:48 -0000 1.41 @@ -1 +1 @@ -gimp-2.4.4.tar.bz2 +gimp-2.4.5.tar.bz2 Index: gimp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gimp/F-8/gimp.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- gimp.spec 30 Jan 2008 11:43:13 -0000 1.151 +++ gimp.spec 3 Mar 2008 09:48:48 -0000 1.152 @@ -44,7 +44,7 @@ Summary: GNU Image Manipulation Program Name: gimp -Version: 2.4.4 +Version: 2.4.5 %define binver 2.4 %define gimp_lang_ver 20 %define interfacever 2.0 @@ -97,6 +97,8 @@ %if %{with lcms} BuildRequires: lcms-devel %endif + +Requires: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: desktop-file-utils >= 0.9 Requires: glib2 >= 2.12.3 Requires: gtk2 >= 2.10.13 @@ -137,6 +139,7 @@ Summary: GIMP libraries Group: System Environment/Libraries License: LGPLv2+ +Provides: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} %description libs The gimp-libs package contains shared libraries needed for the GNU Image @@ -146,7 +149,7 @@ Summary: GIMP plugin and extension development kit Group: Applications/Multimedia License: LGPLv2+ -Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gtk2-devel Requires: glib2-devel Requires: pkgconfig @@ -453,6 +456,40 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Mar 03 2008 Nils Philippsen - 2:2.4.5-1 +- version 2.4.5 + + Changes in GIMP 2.4.5 + ===================== + + - fixed a regression introduced by the brush cursor optimization + (bug #514309) + - fixed bug in transform tool preview (bug #340965) + - fixed PSD export of images with layer masks + - fixed base64 encoding routine of the Mail plug-in + - use the correct background color when creating a new image + (bug #514082) + - explicitly link libgimpthumb with GLib (bug #515566) + - improved selection of the font sample string (bug #514021) + - unified handling of "Enter" and "Space" keysyms (bug #516544) + - fixed bug in the Glossy script when used with a pattern (bug #517285) + - correctly record dimensions in Exif data when saving as JPEG + (bug #517077) + - fixed sensitivity of plug-in menu items (bug #517683) + - fixed potential crashes in Wind, Warp, Small Tiles and Apply Canvas + plug-ins (bug #516369) + - added default keyboard shortcut for "Paste As New Image" + (Ctrl-Shift-V) + - added default keyboard shortcut for "Copy Visible" (Ctrl-Shift-C) + - fixed missing preview update in Curves tool (bug #518012) + - fixed a bug in the Frosty Logo script (bug #472316) + - fixed backward transformations using the PDB (bug #518910) + - translation fixes and updates (de, eu, eo, fr, he, hu, it, ja, ko) + +* Mon Feb 18 2008 Nils Philippsen - 2:2.4.4-2 +- let gimp-libs provide, gimp and gimp-devel require "gimp-libs-%%{_arch}" + (#433195) + * Wed Jan 30 2008 Nils Philippsen - 2:2.4.4-1 - version 2.4.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gimp/F-8/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 30 Jan 2008 11:43:13 -0000 1.40 +++ sources 3 Mar 2008 09:48:48 -0000 1.41 @@ -1 +1 @@ -41d0568581de99f3fd2ecb5babae1f6e gimp-2.4.4.tar.bz2 +162e264dc5f0c7e4de8794e78818381f gimp-2.4.5.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 09:50:49 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 3 Mar 2008 09:50:49 GMT Subject: rpms/gimp/F-7 .cvsignore, 1.37, 1.38 gimp.spec, 1.140, 1.141 sources, 1.37, 1.38 Message-ID: <200803030950.m239onBn027313@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/gimp/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27247 Modified Files: .cvsignore gimp.spec sources Log Message: version 2.4.5 let gimp-libs provide, gimp and gimp-devel require "gimp-libs-%{_arch}" (#433195) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gimp/F-7/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 30 Jan 2008 11:43:55 -0000 1.37 +++ .cvsignore 3 Mar 2008 09:50:09 -0000 1.38 @@ -1 +1 @@ -gimp-2.4.4.tar.bz2 +gimp-2.4.5.tar.bz2 Index: gimp.spec =================================================================== RCS file: /cvs/pkgs/rpms/gimp/F-7/gimp.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- gimp.spec 30 Jan 2008 11:43:55 -0000 1.140 +++ gimp.spec 3 Mar 2008 09:50:09 -0000 1.141 @@ -44,7 +44,7 @@ Summary: GNU Image Manipulation Program Name: gimp -Version: 2.4.4 +Version: 2.4.5 %define binver 2.4 %define gimp_lang_ver 20 %define interfacever 2.0 @@ -97,6 +97,8 @@ %if %{with lcms} BuildRequires: lcms-devel %endif + +Requires: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: desktop-file-utils >= 0.9 Requires: glib2 >= 2.12.3 Requires: gtk2 >= 2.10.13 @@ -137,6 +139,7 @@ Summary: GIMP libraries Group: System Environment/Libraries License: LGPLv2+ +Provides: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} %description libs The gimp-libs package contains shared libraries needed for the GNU Image @@ -146,7 +149,7 @@ Summary: GIMP plugin and extension development kit Group: Applications/Multimedia License: LGPLv2+ -Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gtk2-devel Requires: glib2-devel Requires: pkgconfig @@ -453,6 +456,40 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Mar 03 2008 Nils Philippsen - 2:2.4.5-1 +- version 2.4.5 + + Changes in GIMP 2.4.5 + ===================== + + - fixed a regression introduced by the brush cursor optimization + (bug #514309) + - fixed bug in transform tool preview (bug #340965) + - fixed PSD export of images with layer masks + - fixed base64 encoding routine of the Mail plug-in + - use the correct background color when creating a new image + (bug #514082) + - explicitly link libgimpthumb with GLib (bug #515566) + - improved selection of the font sample string (bug #514021) + - unified handling of "Enter" and "Space" keysyms (bug #516544) + - fixed bug in the Glossy script when used with a pattern (bug #517285) + - correctly record dimensions in Exif data when saving as JPEG + (bug #517077) + - fixed sensitivity of plug-in menu items (bug #517683) + - fixed potential crashes in Wind, Warp, Small Tiles and Apply Canvas + plug-ins (bug #516369) + - added default keyboard shortcut for "Paste As New Image" + (Ctrl-Shift-V) + - added default keyboard shortcut for "Copy Visible" (Ctrl-Shift-C) + - fixed missing preview update in Curves tool (bug #518012) + - fixed a bug in the Frosty Logo script (bug #472316) + - fixed backward transformations using the PDB (bug #518910) + - translation fixes and updates (de, eu, eo, fr, he, hu, it, ja, ko) + +* Mon Feb 18 2008 Nils Philippsen - 2:2.4.4-2 +- let gimp-libs provide, gimp and gimp-devel require "gimp-libs-%%{_arch}" + (#433195) + * Wed Jan 30 2008 Nils Philippsen - 2:2.4.4-1 - version 2.4.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gimp/F-7/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 30 Jan 2008 11:43:55 -0000 1.37 +++ sources 3 Mar 2008 09:50:09 -0000 1.38 @@ -1 +1 @@ -41d0568581de99f3fd2ecb5babae1f6e gimp-2.4.4.tar.bz2 +162e264dc5f0c7e4de8794e78818381f gimp-2.4.5.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 10:13:31 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Mon, 3 Mar 2008 10:13:31 GMT Subject: rpms/pilot-link/devel pilot-link-0.12.2-Zire.patch, NONE, 1.1 19-pam-acl-management.fdi, 1.1, 1.2 pilot-link.spec, 1.73, 1.74 Message-ID: <200803031013.m23ADVFx002378@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/pilot-link/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2341 Modified Files: 19-pam-acl-management.fdi pilot-link.spec Added Files: pilot-link-0.12.2-Zire.patch Log Message: - Synchronize with F-8 branch: - add Z22 patch - change hal rules pilot-link-0.12.2-Zire.patch: --- NEW FILE pilot-link-0.12.2-Zire.patch --- diff -up pilot-link-0.12.2/libpisock/usb.c.pom pilot-link-0.12.2/libpisock/usb.c --- pilot-link-0.12.2/libpisock/usb.c.pom 2008-02-07 15:03:58.000000000 +0100 +++ pilot-link-0.12.2/libpisock/usb.c 2008-02-07 15:02:51.000000000 +0100 @@ -810,7 +810,8 @@ pi_usb_dev_t known_devices[] = { { .vendor = 0x0830, .product = 0x0061, + .idstr = "Zire 31, 72, Z22", + .flags = USB_INIT_TAPWAVE, - .idstr = "Zire 31, 72", }, { Index: 19-pam-acl-management.fdi =================================================================== RCS file: /cvs/pkgs/rpms/pilot-link/devel/19-pam-acl-management.fdi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 19-pam-acl-management.fdi 4 Jan 2008 08:43:15 -0000 1.1 +++ 19-pam-acl-management.fdi 3 Mar 2008 10:12:41 -0000 1.2 @@ -4,54 +4,238 @@ - - - + + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + access_control pda linux.device_file - - + + access_control pda linux.device_file + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + - - - + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + access_control pda linux.device_file + + + + + + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + + + access_control + pda + linux.device_file + + - - - - + + + + + access_control pda linux.device_file - - + + access_control pda linux.device_file + - - - access_control - pda - linux.device_file + + + + + + access_control + pda + linux.device_file + + + + + + + + + + access_control + pda + linux.device_file - + + + access_control + pda + linux.device_file + + + + + + + + + + access_control + pda + linux.device_file + + + + + + + + + access_control + pda + linux.device_file + + + + Index: pilot-link.spec =================================================================== RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- pilot-link.spec 2 Mar 2008 15:54:52 -0000 1.73 +++ pilot-link.spec 3 Mar 2008 10:12:41 -0000 1.74 @@ -3,7 +3,7 @@ Name: pilot-link Version: 0.12.3 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 2 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL Group: Applications/Communications @@ -26,6 +26,8 @@ Patch6: pilot-link-0.12.2-open.patch Patch7: pilot-link-0.12.3-md5.patch Patch8: bluetooth-session-register.diff +Patch9: pilot-link-0.12.2-Zire.patch + Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -81,6 +83,7 @@ %patch6 -p1 -b .open %patch7 -p1 -b .md5 %patch8 -p0 -b .bluetooth-sdp +%patch9 -p1 -b .Zire %build autoreconf -is @@ -190,6 +193,11 @@ %{_datadir}/aclocal/*.m4 %changelog +* Mon Mar 3 2008 Ivana Varekova - 2:0.12.3-10 +- Synchronize with F-8 branch: +- add Z22 patch +- change hal rules + * Wed Feb 27 2008 Tom "spot" Callaway - 2:0.12.3-9 - Rebuild for perl 5.10 (again) @@ -199,7 +207,7 @@ * Mon Jan 28 2008 Tom "spot" Callaway - 2:0.12.3-7 - rebuild for new perl -* Fri Jan 11 2008 Ivana Varekova - 2:0.12.3-6 +* Fri Jan 11 2008 Ivana Varekova - 2:0.12.3-6 - Synchronize with F-8 branch: - remove visor modul remove from %post script - Change README.fedora use "ttyUSB[13579]" in 60-pilot.rules From fedora-extras-commits at redhat.com Mon Mar 3 10:20:09 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Mon, 3 Mar 2008 10:20:09 GMT Subject: rpms/iptables/devel iptables.spec,1.62,1.63 Message-ID: <200803031020.m23AK91J002523@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2483 Modified Files: iptables.spec Log Message: - also require kernel-devel Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- iptables.spec 3 Mar 2008 09:42:41 -0000 1.62 +++ iptables.spec 3 Mar 2008 10:19:26 -0000 1.63 @@ -1,4 +1,5 @@ %define build_devel 1 +%uname $(rpm -q --qf "%{VERSION}-%{RELEASE}\n" kernel) Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities @@ -15,7 +16,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) License: GPLv2 BuildRequires: libselinux-devel -BuildRequires: kernel +BuildRequires: kernel, kernel-devel Conflicts: kernel < 2.4.20 Requires(post): chkconfig Requires(preun): chkconfig @@ -73,6 +74,10 @@ OPT="$RPM_OPT_FLAGS -I$TOPDIR/include -fPIC" #export KERNEL_DIR=/usr #export KBUILD_OUTPUT=/usr +export KERNEL_DIR="/lib/modules/%{uname}/source" +export KBUILD_OUTPUT="/lib/modules/%{uname}/build" + + export DO_SELINUX=1 make COPT_FLAGS="$OPT" LIBDIR=/%{_lib} make COPT_FLAGS="$OPT" LIBDIR=/%{_lib} iptables-save iptables-restore From fedora-extras-commits at redhat.com Mon Mar 3 10:21:25 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Mon, 3 Mar 2008 10:21:25 GMT Subject: rpms/iptables/devel iptables.spec,1.63,1.64 Message-ID: <200803031021.m23ALPQr002589@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2560 Modified Files: iptables.spec Log Message: - dropped uname Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- iptables.spec 3 Mar 2008 10:19:26 -0000 1.63 +++ iptables.spec 3 Mar 2008 10:20:41 -0000 1.64 @@ -1,5 +1,4 @@ %define build_devel 1 -%uname $(rpm -q --qf "%{VERSION}-%{RELEASE}\n" kernel) Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities From fedora-extras-commits at redhat.com Mon Mar 3 10:22:16 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Mon, 3 Mar 2008 10:22:16 GMT Subject: rpms/scim/devel scim-1.4.7-fix-capslock.patch, NONE, 1.1 scim.spec, 1.107, 1.108 Message-ID: <200803031022.m23AMGWa002665@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2586 Modified Files: scim.spec Added Files: scim-1.4.7-fix-capslock.patch Log Message: Fix capslock problem with hotkeys. #431222. scim-1.4.7-fix-capslock.patch: --- NEW FILE scim-1.4.7-fix-capslock.patch --- diff -up scim-1.4.7/utils/scimkeyselection.cpp.fix-capslock scim-1.4.7/utils/scimkeyselection.cpp --- scim-1.4.7/utils/scimkeyselection.cpp.fix-capslock 2008-03-03 18:12:51.000000000 +0800 +++ scim-1.4.7/utils/scimkeyselection.cpp 2008-03-03 18:18:10.000000000 +0800 @@ -267,6 +267,11 @@ scim_key_selection_init (ScimKeySelectio gtk_widget_show (keyselection->toggle_hyper); gtk_box_pack_start (GTK_BOX (hbox), keyselection->toggle_hyper, TRUE, TRUE, 2); + + keyselection->toggle_capslock = gtk_check_button_new_with_mnemonic (_("Ca_psLock")); + gtk_widget_show (keyselection->toggle_capslock); + gtk_box_pack_start (GTK_BOX (hbox), keyselection->toggle_capslock, TRUE, TRUE, 2); + hbox = gtk_hbox_new (TRUE, 0); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (keyselection), hbox, FALSE, FALSE, 4); @@ -319,6 +324,8 @@ scim_key_selection_add_key_button_callba key += String ("Super+"); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (keyselection->toggle_hyper))) key += String ("Hyper+"); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (keyselection->toggle_capslock))) + key += String ("CapsLock+"); key_code = String (gtk_entry_get_text (GTK_ENTRY (keyselection->key_code))); if (!key_code.length ()){ @@ -572,6 +579,9 @@ scim_key_selection_set_key_event (ScimKe GTK_TOGGLE_BUTTON (keyselection->toggle_hyper), event.is_hyper_down ()); gtk_toggle_button_set_active ( + GTK_TOGGLE_BUTTON (keyselection->toggle_capslock), + event.is_caps_lock_down ()); + gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON (keyselection->toggle_release), event.is_key_release ()); Index: scim.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- scim.spec 3 Mar 2008 08:37:14 -0000 1.107 +++ scim.spec 3 Mar 2008 10:21:33 -0000 1.108 @@ -3,7 +3,7 @@ Name: scim Version: 1.4.7 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Smart Common Input Method platform License: LGPLv2+ @@ -39,6 +39,7 @@ Patch18: scim-1.4.7-ja-sinhala-236715.patch Patch19: scim-1.4.7-remove-locale.patch Patch20: scim-1.4.7-fix-fallback.patch +Patch21: scim-1.4.7-fix-capslock.patch %description SCIM is a user friendly and full featured input method user interface and @@ -158,6 +159,7 @@ %patch18 -p1 -b .18-sinhala~ %patch19 -p1 -b .19-remove-locale~ %patch20 -p1 -b .20-fix-fallback +%patch21 -p1 -b .20-fix-capslock %if %{snapshot} ./bootstrap @@ -295,6 +297,9 @@ %changelog +* Mon Mar 3 2008 Huang Peng - 1.4.7-14 +- Fix capslock problem #431222. + * Mon Mar 3 2008 Huang Peng - 1.4.7-13 - Fix fallback problem in gtkim module #235147. From fedora-extras-commits at redhat.com Mon Mar 3 10:27:22 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Mon, 3 Mar 2008 10:27:22 GMT Subject: devel/hwdata .cvsignore, 1.93, 1.94 hwdata.spec, 1.101, 1.102 sources, 1.96, 1.97 Message-ID: <200803031027.m23ARMFD002795@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/hwdata In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2764 Modified Files: .cvsignore hwdata.spec sources Log Message: - update pci.ids, usb.ids (#431658) Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/hwdata/.cvsignore,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- .cvsignore 23 Jan 2008 10:18:37 -0000 1.93 +++ .cvsignore 3 Mar 2008 10:26:48 -0000 1.94 @@ -1 +1 @@ -hwdata-0.215.tar.bz2 +hwdata-0.216.tar.bz2 Index: hwdata.spec =================================================================== RCS file: /cvs/extras/devel/hwdata/hwdata.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- hwdata.spec 23 Jan 2008 10:18:37 -0000 1.101 +++ hwdata.spec 3 Mar 2008 10:26:48 -0000 1.102 @@ -1,6 +1,6 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.215 +Version: 0.216 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -36,6 +36,12 @@ %{_datadir}/%{name}/* %changelog +* Wed Mar 03 2008 Karsten Hopp 0.216-1 +- update pci.ids, usb.ids (#431658) + +* Tue Jan 29 2008 Phil Knirsch 0.215-1 +- Pull new upstream pci.ids + * Wed Jan 23 2008 Karsten Hopp 0.215-1 - add HP W2207 monitor - add oui.txt, a list of bluetooth device makers Index: sources =================================================================== RCS file: /cvs/extras/devel/hwdata/sources,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- sources 23 Jan 2008 10:18:37 -0000 1.96 +++ sources 3 Mar 2008 10:26:48 -0000 1.97 @@ -1 +1 @@ -394ab3e4eedb538c26e3917742b96ac7 hwdata-0.215.tar.bz2 +48b92d7a003f5bd0f30f4397a4cf6475 hwdata-0.216.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 10:33:38 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Mon, 3 Mar 2008 10:33:38 GMT Subject: rpms/scim/devel scim-1.4.7-fix-capslock.patch,1.1,1.2 Message-ID: <200803031033.m23AXc3s002995@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2954 Modified Files: scim-1.4.7-fix-capslock.patch Log Message: Fix a little problem in the patch. scim-1.4.7-fix-capslock.patch: Index: scim-1.4.7-fix-capslock.patch =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim-1.4.7-fix-capslock.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scim-1.4.7-fix-capslock.patch 3 Mar 2008 10:21:33 -0000 1.1 +++ scim-1.4.7-fix-capslock.patch 3 Mar 2008 10:33:27 -0000 1.2 @@ -1,3 +1,14 @@ +diff -up scim-1.4.7/utils/scimkeyselection.h.fix-capslock scim-1.4.7/utils/scimkeyselection.h +--- scim-1.4.7/utils/scimkeyselection.h.fix-capslock 2008-03-03 18:33:40.000000000 +0800 ++++ scim-1.4.7/utils/scimkeyselection.h 2008-03-03 18:15:16.000000000 +0800 +@@ -36,6 +36,7 @@ struct _ScimKeySelection + GtkWidget *toggle_meta; + GtkWidget *toggle_super; + GtkWidget *toggle_hyper; ++ GtkWidget *toggle_capslock; + GtkWidget *toggle_release; + GtkWidget *key_code; + diff -up scim-1.4.7/utils/scimkeyselection.cpp.fix-capslock scim-1.4.7/utils/scimkeyselection.cpp --- scim-1.4.7/utils/scimkeyselection.cpp.fix-capslock 2008-03-03 18:12:51.000000000 +0800 +++ scim-1.4.7/utils/scimkeyselection.cpp 2008-03-03 18:18:10.000000000 +0800 From fedora-extras-commits at redhat.com Mon Mar 3 10:33:45 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Mon, 3 Mar 2008 10:33:45 GMT Subject: rpms/sdcc/devel sdcc.spec,1.4,1.5 Message-ID: <200803031033.m23AXjlm002998@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/sdcc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2905 Modified Files: sdcc.spec Log Message: some ugly race Index: sdcc.spec =================================================================== RCS file: /cvs/pkgs/rpms/sdcc/devel/sdcc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sdcc.spec 20 Feb 2008 05:50:58 -0000 1.4 +++ sdcc.spec 3 Mar 2008 10:33:09 -0000 1.5 @@ -1,6 +1,6 @@ Name: sdcc Version: 2.6.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Small Device C Compiler Group: Applications/Engineering @@ -66,7 +66,7 @@ %build %configure --enable-doc --enable-libgc STRIP=: -make %{?_smp_mflags} Q= +make Q= %install @@ -113,6 +113,9 @@ %{_datadir}/%{name}/lib/*/*.asm %changelog +* Sun Mar 2 2008 Marek Mahut - 2.6.0-12 +- Fixing build problems under GCC 4.3 + * Wed Feb 20 2008 Fedora Release Engineering - 2.6.0-11 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 10:56:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 10:56:52 +0000 Subject: [pkgdb] xterm had acl change status Message-ID: <200803031057.m23AvfNQ021051@bastion.fedora.phx.redhat.com> Miroslav Lichvar (mlichvar) has set the watchbugzilla acl on xterm (Fedora devel) to Approved for Patrice Dumas (pertusus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Mon Mar 3 10:57:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 10:57:00 +0000 Subject: [pkgdb] xterm had acl change status Message-ID: <200803031057.m23AvftK021054@bastion.fedora.phx.redhat.com> Miroslav Lichvar (mlichvar) has set the watchcommits acl on xterm (Fedora devel) to Approved for Patrice Dumas (pertusus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Mon Mar 3 10:56:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 10:56:55 +0000 Subject: [pkgdb] xterm had acl change status Message-ID: <200803031057.m23Avh6K021089@bastion.fedora.phx.redhat.com> Miroslav Lichvar (mlichvar) has set the watchbugzilla acl on xterm (Fedora 7) to Approved for Patrice Dumas (pertusus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Mon Mar 3 10:57:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 10:57:02 +0000 Subject: [pkgdb] xterm had acl change status Message-ID: <200803031057.m23AvftN021054@bastion.fedora.phx.redhat.com> Miroslav Lichvar (mlichvar) has set the watchcommits acl on xterm (Fedora 7) to Approved for Patrice Dumas (pertusus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Mon Mar 3 10:57:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 10:57:04 +0000 Subject: [pkgdb] xterm had acl change status Message-ID: <200803031057.m23AvftQ021054@bastion.fedora.phx.redhat.com> Miroslav Lichvar (mlichvar) has set the watchbugzilla acl on xterm (Fedora 8) to Approved for Patrice Dumas (pertusus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Mon Mar 3 10:57:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 10:57:05 +0000 Subject: [pkgdb] xterm had acl change status Message-ID: <200803031057.m23AvlnN021147@bastion.fedora.phx.redhat.com> Miroslav Lichvar (mlichvar) has set the watchcommits acl on xterm (Fedora 8) to Approved for Patrice Dumas (pertusus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xterm From fedora-extras-commits at redhat.com Mon Mar 3 11:08:22 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Mon, 3 Mar 2008 11:08:22 GMT Subject: rpms/iptables/devel iptables.spec,1.64,1.65 Message-ID: <200803031108.m23B8MYN010696@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10657 Modified Files: iptables.spec Log Message: - force usage of kernel-devel in build environment instead of uname detected kernel Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- iptables.spec 3 Mar 2008 10:20:41 -0000 1.64 +++ iptables.spec 3 Mar 2008 11:07:40 -0000 1.65 @@ -1,4 +1,5 @@ %define build_devel 1 +%define _kernel $(ls -d /usr/src/kernels/*/ | head -1) Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities @@ -15,7 +16,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) License: GPLv2 BuildRequires: libselinux-devel -BuildRequires: kernel, kernel-devel +BuildRequires: kernel-devel Conflicts: kernel < 2.4.20 Requires(post): chkconfig Requires(preun): chkconfig @@ -73,9 +74,8 @@ OPT="$RPM_OPT_FLAGS -I$TOPDIR/include -fPIC" #export KERNEL_DIR=/usr #export KBUILD_OUTPUT=/usr -export KERNEL_DIR="/lib/modules/%{uname}/source" -export KBUILD_OUTPUT="/lib/modules/%{uname}/build" - +export KERNEL_DIR=%{_kernel} +export KBUILD_OUTPUT=%{_kernel} export DO_SELINUX=1 make COPT_FLAGS="$OPT" LIBDIR=/%{_lib} @@ -86,6 +86,8 @@ rm -rf %{buildroot} #export KERNEL_DIR=/usr #export KBUILD_OUTPUT=/usr +export KERNEL_DIR=%{_kernel} +export KBUILD_OUTPUT=%{_kernel} export DO_SELINUX=1 make install DESTDIR=%{buildroot} BINDIR=/sbin LIBDIR=/%{_lib} MANDIR=%{_mandir} %if %{build_devel} From fedora-extras-commits at redhat.com Mon Mar 3 11:22:24 2008 From: fedora-extras-commits at redhat.com (Radek Brich (rbrich)) Date: Mon, 3 Mar 2008 11:22:24 GMT Subject: rpms/cpio/devel cpio-2.9-dir_perm.patch, 1.1, 1.2 cpio.spec, 1.58, 1.59 Message-ID: <200803031122.m23BMOBK010935@cvs-int.fedora.redhat.com> Author: rbrich Update of /cvs/extras/rpms/cpio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10894 Modified Files: cpio-2.9-dir_perm.patch cpio.spec Log Message: resolve #430835 better... cpio-2.9-dir_perm.patch: Index: cpio-2.9-dir_perm.patch =================================================================== RCS file: /cvs/extras/rpms/cpio/devel/cpio-2.9-dir_perm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpio-2.9-dir_perm.patch 14 Feb 2008 14:10:51 -0000 1.1 +++ cpio-2.9-dir_perm.patch 3 Mar 2008 11:22:13 -0000 1.2 @@ -1,101 +1,452 @@ -diff -up cpio-2.9/src/extern.h.orig cpio-2.9/src/extern.h ---- cpio-2.9/src/extern.h.orig 2007-06-28 14:59:38.000000000 +0200 -+++ cpio-2.9/src/extern.h 2008-02-13 15:24:37.000000000 +0100 -@@ -211,7 +211,7 @@ uintmax_t from_ascii (char const *where, - - void delay_set_stat (char const *file_name, struct stat *st, - mode_t invert_permissions); --void repair_delayed_set_stat (char const *dir, -+int repair_delayed_set_stat (char const *dir, - struct stat *dir_stat_info); - void apply_delayed_set_stat (void); - -diff -up cpio-2.9/src/copyin.c.orig cpio-2.9/src/copyin.c ---- cpio-2.9/src/copyin.c.orig 2007-06-28 12:51:09.000000000 +0200 -+++ cpio-2.9/src/copyin.c 2008-02-14 10:28:33.000000000 +0100 -@@ -570,6 +570,7 @@ static void - copyin_directory (struct cpio_file_stat *file_hdr, int existing_dir) +Redhat-bugzilla: 430835 + +* revert make_path code to previous state, which worked better +* this can be dropped when permission issues are solved in upstream + + +diff -up cpio-2.9/src/extern.h.dir_perm cpio-2.9/src/extern.h +--- cpio-2.9/src/extern.h.dir_perm 2007-06-28 14:59:38.000000000 +0200 ++++ cpio-2.9/src/extern.h 2008-03-03 11:57:43.000000000 +0100 +@@ -140,8 +140,8 @@ void process_args (int argc, char *argv[ + void initialize_buffers (void); + + /* makepath.c */ +-int make_path (char *argpath, uid_t owner, gid_t group, +- const char *verbose_fmt_string); ++int make_path (char *argpath, int mode, int parent_mode, ++ uid_t owner, gid_t group, char *verbose_fmt_string); + + /* tar.c */ + void write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); +diff -up cpio-2.9/src/util.c.dir_perm cpio-2.9/src/util.c +--- cpio-2.9/src/util.c.dir_perm 2007-06-28 15:04:51.000000000 +0200 ++++ cpio-2.9/src/util.c 2008-03-03 11:45:00.000000000 +0100 +@@ -618,14 +618,7 @@ create_all_directories (char *name) + error (2, 0, _("virtual memory exhausted")); + + if (dir[0] != '.' || dir[1] != '\0') +- { +- const char *fmt; +- if (warn_option & CPIO_WARN_INTERDIR) +- fmt = _("Creating intermediate directory `%s'"); +- else +- fmt = NULL; +- make_path (dir, -1, -1, fmt); +- } ++ make_path (dir, mode, 0700, -1, -1, (char *) NULL); + + free (dir); + } +diff -up cpio-2.9/src/copyin.c.dir_perm cpio-2.9/src/copyin.c +--- cpio-2.9/src/copyin.c.dir_perm 2008-03-03 11:45:00.000000000 +0100 ++++ cpio-2.9/src/copyin.c 2008-03-03 11:45:00.000000000 +0100 +@@ -186,12 +186,11 @@ list_file(struct cpio_file_stat* file_hd + + static int + try_existing_file (struct cpio_file_stat* file_hdr, int in_file_des, +- int *existing_dir, mode_t *existing_mode) ++ int *existing_dir) + { + struct stat file_stat; + + *existing_dir = false; +- *existing_mode = 0; + if (lstat (file_hdr->c_name, &file_stat) == 0) + { + if (S_ISDIR (file_stat.st_mode) +@@ -201,7 +200,6 @@ try_existing_file (struct cpio_file_stat + we are trying to create, don't complain about + it. */ + *existing_dir = true; +- *existing_mode = file_stat.st_mode; + return 0; + } + else if (!unconditional_flag +@@ -569,7 +567,7 @@ copyin_regular_file (struct cpio_file_st + } + + static void +-copyin_directory (struct cpio_file_stat *file_hdr, int existing_dir, mode_t existing_mode) ++copyin_directory (struct cpio_file_stat *file_hdr, int existing_dir) { int res; /* Result of various function calls. */ -+ struct stat file_stat; #ifdef HPUX_CDF - int cdf_flag; /* True if file is a CDF. */ - int cdf_char; /* Index of `+' char indicating a CDF. */ -@@ -626,7 +627,6 @@ copyin_directory (struct cpio_file_stat - create_all_directories(), so the mkdir will fail - because the directory exists. If that's the case, - don't complain about it. */ -- struct stat file_stat; - if (errno != EEXIST) - { - mkdir_error (file_hdr->c_name); -@@ -645,7 +645,11 @@ copyin_directory (struct cpio_file_stat +@@ -612,22 +610,14 @@ copyin_directory (struct cpio_file_stat + cdf_flag = 1; } + #endif +- res = mkdir (file_hdr->c_name, file_hdr->c_mode & ~077); ++ res = mkdir (file_hdr->c_name, file_hdr->c_mode); + } + else +- { +- if (!no_chown_flag && (existing_mode & 077) != 0 +- && chmod (file_hdr->c_name, existing_mode & 07700) < 0) +- { +- error (0, errno, "%s: chmod", file_hdr->c_name); +- return; +- } +- res = 0; +- } ++ res = 0; + if (res < 0 && create_dir_flag) + { + create_all_directories (file_hdr->c_name); +- res = mkdir (file_hdr->c_name, file_hdr->c_mode & ~077); ++ res = mkdir (file_hdr->c_name, file_hdr->c_mode); } + if (res < 0) + { +@@ -702,12 +692,12 @@ copyin_device (struct cpio_file_stat* fi + return; + } + +- res = mknod (file_hdr->c_name, file_hdr->c_mode & ~077, ++ res = mknod (file_hdr->c_name, file_hdr->c_mode, + makedev (file_hdr->c_rdev_maj, file_hdr->c_rdev_min)); + if (res < 0 && create_dir_flag) + { + create_all_directories (file_hdr->c_name); +- res = mknod (file_hdr->c_name, file_hdr->c_mode & ~077, ++ res = mknod (file_hdr->c_name, file_hdr->c_mode, + makedev (file_hdr->c_rdev_maj, file_hdr->c_rdev_min)); + } + if (res < 0) +@@ -782,10 +772,9 @@ static void + copyin_file (struct cpio_file_stat* file_hdr, int in_file_des) + { + int existing_dir; +- mode_t existing_mode; -- set_perms (-1, file_hdr); -+ /* if the directory is queued for delayed_set_stat, -+ fix permissions in the queue, otherwise set the permissions now */ -+ cpio_to_stat(file_hdr, &file_stat); -+ if (repair_delayed_set_stat(file_hdr->c_name, &file_stat)) -+ set_perms (-1, file_hdr); - } - - static void -diff -up cpio-2.9/src/makepath.c.orig cpio-2.9/src/makepath.c -diff -up cpio-2.9/src/util.c.orig cpio-2.9/src/util.c ---- cpio-2.9/src/util.c.orig 2007-06-28 15:04:51.000000000 +0200 -+++ cpio-2.9/src/util.c 2008-02-14 13:24:37.000000000 +0100 -@@ -1265,6 +1265,16 @@ stat_to_cpio (struct cpio_file_stat *hdr - hdr->c_tar_linkname = NULL; - } + if (!to_stdout_option +- && try_existing_file (file_hdr, in_file_des, &existing_dir, &existing_mode) < 0) ++ && try_existing_file (file_hdr, in_file_des, &existing_dir) < 0) + return; + + /* Do the real copy or link. */ +@@ -796,7 +785,7 @@ copyin_file (struct cpio_file_stat* file + break; + + case CP_IFDIR: +- copyin_directory(file_hdr, existing_dir, existing_mode); ++ copyin_directory (file_hdr, existing_dir); + break; -+void -+cpio_to_stat (struct cpio_file_stat *hdr, struct stat *st) -+{ -+ stat (hdr->c_name, st); -+ st->st_mode = hdr->c_mode; -+ st->st_uid = CPIO_UID(hdr->c_uid); -+ st->st_gid = CPIO_GID(hdr->c_gid); -+ st->st_mtime = hdr->c_mtime; -+} + case CP_IFCHR: +@@ -1573,8 +1562,6 @@ process_copy_in () + if (dot_flag) + fputc ('\n', stderr); + +- apply_delayed_set_stat (); +- + if (append_flag) + return; + +diff -up cpio-2.9/src/makepath.c.dir_perm cpio-2.9/src/makepath.c +--- cpio-2.9/src/makepath.c.dir_perm 2007-06-28 15:09:47.000000000 +0200 ++++ cpio-2.9/src/makepath.c 2008-03-03 11:45:00.000000000 +0100 +@@ -1,9 +1,9 @@ + /* makepath.c -- Ensure that a directory path exists. +- Copyright (C) 1990, 2006, 2007 Free Software Foundation, Inc. ++ Copyright (C) 1990, 2006 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) ++ the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, +@@ -29,15 +29,14 @@ + #include + #include + #include +-#include "cpiohdr.h" +-#include "dstring.h" +-#include "extern.h" + + /* Ensure that the directory ARGPATH exists. + Remove any trailing slashes from ARGPATH before calling this function. + +- Make all directory components that don't already exist with +- permissions 700. ++ Make any leading directories that don't already exist, with ++ permissions PARENT_MODE. ++ If the last element of ARGPATH does not exist, create it as ++ a new directory with permissions MODE. + If OWNER and GROUP are non-negative, make them the UID and GID of + created directories. + If VERBOSE_FMT_STRING is nonzero, use it as a printf format +@@ -49,26 +48,48 @@ + + int + make_path (char *argpath, ++ int mode, ++ int parent_mode, + uid_t owner, + gid_t group, +- const char *verbose_fmt_string) ++ char *verbose_fmt_string) + { + char *dirpath; /* A copy we can scribble NULs on. */ + struct stat stats; + int retval = 0; +- mode_t tmpmode; +- mode_t invert_permissions; +- int we_are_root = getuid () == 0; ++ int oldmask = umask (0); + dirpath = alloca (strlen (argpath) + 1); +- + strcpy (dirpath, argpath); + + if (stat (dirpath, &stats)) + { +- tmpmode = MODE_RWX & ~ newdir_umask; +- invert_permissions = we_are_root ? 0 : MODE_WXUSR & ~ tmpmode; ++ char *slash; ++ int tmp_mode; /* Initial perms for leading dirs. */ ++ int re_protect; /* Should leading dirs be unwritable? */ ++ struct ptr_list ++ { ++ char *dirname_end; ++ struct ptr_list *next; ++ }; ++ struct ptr_list *p, *leading_dirs = NULL; + - #ifndef HAVE_FCHOWN - # define fchown(fd, uid, gid) (-1) ++ /* If leading directories shouldn't be writable or executable, ++ or should have set[ug]id or sticky bits set and we are setting ++ their owners, we need to fix their permissions after making them. */ ++ if (((parent_mode & 0300) != 0300) ++ || (owner != (uid_t) -1 && group != (gid_t) -1 ++ && (parent_mode & 07000) != 0)) ++ { ++ tmp_mode = 0700; ++ re_protect = 1; ++ } ++ else ++ { ++ tmp_mode = parent_mode; ++ re_protect = 0; ++ } + +- char *slash = dirpath; ++ slash = dirpath; + while (*slash == '/') + slash++; + while ((slash = strchr (slash, '/'))) +@@ -91,9 +112,10 @@ make_path (char *argpath, + *(slash -1) = '\0'; + } #endif -@@ -1389,7 +1399,7 @@ delay_set_stat (char const *file_name, s - created within the file name of DIR. The intermediate directory turned - out to be the same as this directory, e.g. due to ".." or symbolic - links. *DIR_STAT_INFO is the status of the directory. */ --void -+int - repair_delayed_set_stat (char const *dir, - struct stat *dir_stat_info) - { -@@ -1400,22 +1410,19 @@ repair_delayed_set_stat (char const *dir - if (stat (data->stat.c_name, &st) != 0) +- if (mkdir (dirpath, tmpmode ^ invert_permissions)) ++ if (mkdir (dirpath, tmp_mode)) + { + error (0, errno, _("cannot make directory `%s'"), dirpath); ++ umask (oldmask); + return 1; + } + else +@@ -101,18 +123,24 @@ make_path (char *argpath, + if (verbose_fmt_string != NULL) + error (0, 0, verbose_fmt_string, dirpath); + +- if (stat (dirpath, &stats)) +- stat_error (dirpath); +- else ++ if (owner != (uid_t) -1 && group != (gid_t) -1 ++ && chown (dirpath, owner, group) ++#ifdef AFS ++ && errno != EPERM ++#endif ++ ) ++ { ++ chown_error_details (dirpath, owner, group); ++ retval = 1; ++ } ++ if (re_protect) + { +- if (owner != -1) +- stats.st_uid = owner; +- if (group != -1) +- stats.st_gid = group; +- +- delay_set_stat (dirpath, &stats, invert_permissions); ++ struct ptr_list *new = (struct ptr_list *) ++ alloca (sizeof (struct ptr_list)); ++ new->dirname_end = slash; ++ new->next = leading_dirs; ++ leading_dirs = new; + } +- + #ifdef HPUX_CDF + if (iscdf) + { +@@ -129,6 +157,7 @@ make_path (char *argpath, + else if (!S_ISDIR (stats.st_mode)) + { + error (0, 0, _("`%s' exists but is not a directory"), dirpath); ++ umask (oldmask); + return 1; + } + +@@ -143,7 +172,7 @@ make_path (char *argpath, + /* We're done making leading directories. + Make the final component of the path. */ + +- if (mkdir (dirpath, tmpmode ^ invert_permissions)) ++ if (mkdir (dirpath, mode)) { - stat_error (data->stat.c_name); -- return; -+ return 0; + /* In some cases, if the final component in dirpath was `.' then we + just got an EEXIST error from that last mkdir(). If that's +@@ -153,24 +182,51 @@ make_path (char *argpath, + (!S_ISDIR (stats.st_mode) ) ) + { + error (0, errno, _("cannot make directory `%s'"), dirpath); ++ umask (oldmask); + return 1; + } } +- else if (stat (dirpath, &stats)) +- stat_error (dirpath); +- else +- { +- if (owner != -1) +- stats.st_uid = owner; +- if (group != -1) +- stats.st_gid = group; +- +- delay_set_stat (dirpath, &stats, invert_permissions); +- } +- + if (verbose_fmt_string != NULL) + error (0, 0, verbose_fmt_string, dirpath); - if (st.st_dev == dir_stat_info->st_dev - && st.st_ino == dir_stat_info->st_ino) ++ if (owner != (uid_t) -1 && group != (gid_t) -1) ++ { ++ if (chown (dirpath, owner, group) ++#ifdef AFS ++ && errno != EPERM ++#endif ++ ) ++ { ++ chown_error_details (dirpath, owner, group); ++ retval = 1; ++ } ++ } ++ /* chown may have turned off some permission bits we wanted. */ ++ if ((mode & 07000) != 0 && chmod (dirpath, mode)) ++ { ++ chmod_error_details (dirpath, mode); ++ retval = 1; ++ } ++ ++ /* If the mode for leading directories didn't include owner "wx" ++ privileges, we have to reset their protections to the correct ++ value. */ ++ for (p = leading_dirs; p != NULL; p = p->next) ++ { ++ *p->dirname_end = '\0'; ++#if 0 ++ /* cpio always calls make_path with parent mode 0700, so ++ we don't have to do this. If we ever do have to do this, ++ we have to stat the directory first to get the setuid ++ bit so we don't break HP CDF's. */ ++ if (chmod (dirpath, parent_mode)) ++ { ++ chmod_error_details (dirpath, parent_mode); ++ retval = 1; ++ } ++#endif ++ ++ } + } + else + { +@@ -179,10 +235,33 @@ make_path (char *argpath, + if (!S_ISDIR (stats.st_mode)) { - stat_to_cpio (&data->stat, dir_stat_info); -- data->invert_permissions = -- ((dir_stat_info->st_mode ^ st.st_mode) -- & MODE_RWX & ~ newdir_umask); -- return; -+ data->invert_permissions = 0; -+ return 0; + error (0, 0, _("`%s' exists but is not a directory"), dirpath); ++ umask (oldmask); + return 1; } + ++ /* chown must precede chmod because on some systems, ++ chown clears the set[ug]id bits for non-superusers, ++ resulting in incorrect permissions. ++ On System V, users can give away files with chown and then not ++ be able to chmod them. So don't give files away. */ ++ ++ if (owner != (uid_t) -1 && group != (gid_t) -1 ++ && chown (dirpath, owner, group) ++#ifdef AFS ++ && errno != EPERM ++#endif ++ ) ++ { ++ chown_error_details (dirpath, owner, group); ++ retval = 1; ++ } ++ if (chmod (dirpath, mode)) ++ { ++ chmod_error_details (dirpath, mode); ++ retval = 1; ++ } } -- ERROR ((0, 0, _("%s: Unexpected inconsistency when making directory"), -- quotearg_colon (dir))); -+ return -1; ++ umask (oldmask); + return retval; } +diff -up cpio-2.9/src/copypass.c.dir_perm cpio-2.9/src/copypass.c +--- cpio-2.9/src/copypass.c.dir_perm 2008-03-03 11:45:00.000000000 +0100 ++++ cpio-2.9/src/copypass.c 2008-03-03 11:45:00.000000000 +0100 +@@ -239,23 +239,15 @@ process_copy_pass () + cdf_flag = 1; + } + #endif +- res = mkdir (output_name.ds_string, in_file_stat.st_mode & ~077); ++ res = mkdir (output_name.ds_string, in_file_stat.st_mode); + + } + else +- { +- if (!no_chown_flag && (out_file_stat.st_mode & 077) != 0 +- && chmod (output_name.ds_string, out_file_stat.st_mode & 07700) < 0) +- { +- error (0, errno, "%s: chmod", output_name.ds_string); +- continue; +- } +- res = 0; +- } ++ res = 0; + if (res < 0 && create_dir_flag) + { + create_all_directories (output_name.ds_string); +- res = mkdir (output_name.ds_string, in_file_stat.st_mode & ~077); ++ res = mkdir (output_name.ds_string, in_file_stat.st_mode); + } + if (res < 0) + { +@@ -298,12 +290,12 @@ process_copy_pass () + + if (link_res < 0) + { +- res = mknod (output_name.ds_string, in_file_stat.st_mode & ~077, ++ res = mknod (output_name.ds_string, in_file_stat.st_mode, + in_file_stat.st_rdev); + if (res < 0 && create_dir_flag) + { + create_all_directories (output_name.ds_string); +- res = mknod (output_name.ds_string, in_file_stat.st_mode & ~077, ++ res = mknod (output_name.ds_string, in_file_stat.st_mode, + in_file_stat.st_rdev); + } + if (res < 0) +@@ -373,8 +365,6 @@ process_copy_pass () + if (dot_flag) + fputc ('\n', stderr); - void +- apply_delayed_set_stat (); +- + if (!quiet_flag) + { + size_t blocks = (output_bytes + io_block_size - 1) / io_block_size; Index: cpio.spec =================================================================== RCS file: /cvs/extras/rpms/cpio/devel/cpio.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- cpio.spec 14 Feb 2008 14:10:51 -0000 1.58 +++ cpio.spec 3 Mar 2008 11:22:13 -0000 1.59 @@ -3,7 +3,7 @@ Summary: A GNU archiving program Name: cpio Version: 2.9 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -84,6 +84,11 @@ %{_infodir}/*.info* %changelog +* Mon Mar 03 2008 Radek Brich 2.9-7 +- fix -dir_perm patch to restore permissions correctly even + in passthrough mode -- revert affected code to cpio 2.8 state + (bz#430835) + * Thu Feb 14 2008 Radek Brich 2.9-6 - when extracting archive created with 'find -depth', restore the permissions of directories properly (bz#430835) From fedora-extras-commits at redhat.com Mon Mar 3 11:32:07 2008 From: fedora-extras-commits at redhat.com (Radek Brich (rbrich)) Date: Mon, 3 Mar 2008 11:32:07 GMT Subject: rpms/cpio/F-8 cpio-2.9-dir_perm.patch,1.1,1.2 cpio.spec,1.58,1.59 Message-ID: <200803031132.m23BW7qm011143@cvs-int.fedora.redhat.com> Author: rbrich Update of /cvs/extras/rpms/cpio/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11119 Modified Files: cpio-2.9-dir_perm.patch cpio.spec Log Message: resolve #430835 better... cpio-2.9-dir_perm.patch: Index: cpio-2.9-dir_perm.patch =================================================================== RCS file: /cvs/extras/rpms/cpio/F-8/cpio-2.9-dir_perm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpio-2.9-dir_perm.patch 19 Feb 2008 10:33:29 -0000 1.1 +++ cpio-2.9-dir_perm.patch 3 Mar 2008 11:32:02 -0000 1.2 @@ -1,101 +1,452 @@ -diff -up cpio-2.9/src/extern.h.orig cpio-2.9/src/extern.h ---- cpio-2.9/src/extern.h.orig 2007-06-28 14:59:38.000000000 +0200 -+++ cpio-2.9/src/extern.h 2008-02-13 15:24:37.000000000 +0100 -@@ -211,7 +211,7 @@ uintmax_t from_ascii (char const *where, - - void delay_set_stat (char const *file_name, struct stat *st, - mode_t invert_permissions); --void repair_delayed_set_stat (char const *dir, -+int repair_delayed_set_stat (char const *dir, - struct stat *dir_stat_info); - void apply_delayed_set_stat (void); - -diff -up cpio-2.9/src/copyin.c.orig cpio-2.9/src/copyin.c ---- cpio-2.9/src/copyin.c.orig 2007-06-28 12:51:09.000000000 +0200 -+++ cpio-2.9/src/copyin.c 2008-02-14 10:28:33.000000000 +0100 -@@ -570,6 +570,7 @@ static void - copyin_directory (struct cpio_file_stat *file_hdr, int existing_dir) +Redhat-bugzilla: 430835 + +* revert make_path code to previous state, which worked better +* this can be dropped when permission issues are solved in upstream + + +diff -up cpio-2.9/src/extern.h.dir_perm cpio-2.9/src/extern.h +--- cpio-2.9/src/extern.h.dir_perm 2007-06-28 14:59:38.000000000 +0200 ++++ cpio-2.9/src/extern.h 2008-03-03 11:57:43.000000000 +0100 +@@ -140,8 +140,8 @@ void process_args (int argc, char *argv[ + void initialize_buffers (void); + + /* makepath.c */ +-int make_path (char *argpath, uid_t owner, gid_t group, +- const char *verbose_fmt_string); ++int make_path (char *argpath, int mode, int parent_mode, ++ uid_t owner, gid_t group, char *verbose_fmt_string); + + /* tar.c */ + void write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des); +diff -up cpio-2.9/src/util.c.dir_perm cpio-2.9/src/util.c +--- cpio-2.9/src/util.c.dir_perm 2007-06-28 15:04:51.000000000 +0200 ++++ cpio-2.9/src/util.c 2008-03-03 11:45:00.000000000 +0100 +@@ -618,14 +618,7 @@ create_all_directories (char *name) + error (2, 0, _("virtual memory exhausted")); + + if (dir[0] != '.' || dir[1] != '\0') +- { +- const char *fmt; +- if (warn_option & CPIO_WARN_INTERDIR) +- fmt = _("Creating intermediate directory `%s'"); +- else +- fmt = NULL; +- make_path (dir, -1, -1, fmt); +- } ++ make_path (dir, mode, 0700, -1, -1, (char *) NULL); + + free (dir); + } +diff -up cpio-2.9/src/copyin.c.dir_perm cpio-2.9/src/copyin.c +--- cpio-2.9/src/copyin.c.dir_perm 2008-03-03 11:45:00.000000000 +0100 ++++ cpio-2.9/src/copyin.c 2008-03-03 11:45:00.000000000 +0100 +@@ -186,12 +186,11 @@ list_file(struct cpio_file_stat* file_hd + + static int + try_existing_file (struct cpio_file_stat* file_hdr, int in_file_des, +- int *existing_dir, mode_t *existing_mode) ++ int *existing_dir) + { + struct stat file_stat; + + *existing_dir = false; +- *existing_mode = 0; + if (lstat (file_hdr->c_name, &file_stat) == 0) + { + if (S_ISDIR (file_stat.st_mode) +@@ -201,7 +200,6 @@ try_existing_file (struct cpio_file_stat + we are trying to create, don't complain about + it. */ + *existing_dir = true; +- *existing_mode = file_stat.st_mode; + return 0; + } + else if (!unconditional_flag +@@ -569,7 +567,7 @@ copyin_regular_file (struct cpio_file_st + } + + static void +-copyin_directory (struct cpio_file_stat *file_hdr, int existing_dir, mode_t existing_mode) ++copyin_directory (struct cpio_file_stat *file_hdr, int existing_dir) { int res; /* Result of various function calls. */ -+ struct stat file_stat; #ifdef HPUX_CDF - int cdf_flag; /* True if file is a CDF. */ - int cdf_char; /* Index of `+' char indicating a CDF. */ -@@ -626,7 +627,6 @@ copyin_directory (struct cpio_file_stat - create_all_directories(), so the mkdir will fail - because the directory exists. If that's the case, - don't complain about it. */ -- struct stat file_stat; - if (errno != EEXIST) - { - mkdir_error (file_hdr->c_name); -@@ -645,7 +645,11 @@ copyin_directory (struct cpio_file_stat +@@ -612,22 +610,14 @@ copyin_directory (struct cpio_file_stat + cdf_flag = 1; } + #endif +- res = mkdir (file_hdr->c_name, file_hdr->c_mode & ~077); ++ res = mkdir (file_hdr->c_name, file_hdr->c_mode); + } + else +- { +- if (!no_chown_flag && (existing_mode & 077) != 0 +- && chmod (file_hdr->c_name, existing_mode & 07700) < 0) +- { +- error (0, errno, "%s: chmod", file_hdr->c_name); +- return; +- } +- res = 0; +- } ++ res = 0; + if (res < 0 && create_dir_flag) + { + create_all_directories (file_hdr->c_name); +- res = mkdir (file_hdr->c_name, file_hdr->c_mode & ~077); ++ res = mkdir (file_hdr->c_name, file_hdr->c_mode); } + if (res < 0) + { +@@ -702,12 +692,12 @@ copyin_device (struct cpio_file_stat* fi + return; + } + +- res = mknod (file_hdr->c_name, file_hdr->c_mode & ~077, ++ res = mknod (file_hdr->c_name, file_hdr->c_mode, + makedev (file_hdr->c_rdev_maj, file_hdr->c_rdev_min)); + if (res < 0 && create_dir_flag) + { + create_all_directories (file_hdr->c_name); +- res = mknod (file_hdr->c_name, file_hdr->c_mode & ~077, ++ res = mknod (file_hdr->c_name, file_hdr->c_mode, + makedev (file_hdr->c_rdev_maj, file_hdr->c_rdev_min)); + } + if (res < 0) +@@ -782,10 +772,9 @@ static void + copyin_file (struct cpio_file_stat* file_hdr, int in_file_des) + { + int existing_dir; +- mode_t existing_mode; -- set_perms (-1, file_hdr); -+ /* if the directory is queued for delayed_set_stat, -+ fix permissions in the queue, otherwise set the permissions now */ -+ cpio_to_stat(file_hdr, &file_stat); -+ if (repair_delayed_set_stat(file_hdr->c_name, &file_stat)) -+ set_perms (-1, file_hdr); - } - - static void -diff -up cpio-2.9/src/makepath.c.orig cpio-2.9/src/makepath.c -diff -up cpio-2.9/src/util.c.orig cpio-2.9/src/util.c ---- cpio-2.9/src/util.c.orig 2007-06-28 15:04:51.000000000 +0200 -+++ cpio-2.9/src/util.c 2008-02-14 13:24:37.000000000 +0100 -@@ -1265,6 +1265,16 @@ stat_to_cpio (struct cpio_file_stat *hdr - hdr->c_tar_linkname = NULL; - } + if (!to_stdout_option +- && try_existing_file (file_hdr, in_file_des, &existing_dir, &existing_mode) < 0) ++ && try_existing_file (file_hdr, in_file_des, &existing_dir) < 0) + return; + + /* Do the real copy or link. */ +@@ -796,7 +785,7 @@ copyin_file (struct cpio_file_stat* file + break; + + case CP_IFDIR: +- copyin_directory(file_hdr, existing_dir, existing_mode); ++ copyin_directory (file_hdr, existing_dir); + break; -+void -+cpio_to_stat (struct cpio_file_stat *hdr, struct stat *st) -+{ -+ stat (hdr->c_name, st); -+ st->st_mode = hdr->c_mode; -+ st->st_uid = CPIO_UID(hdr->c_uid); -+ st->st_gid = CPIO_GID(hdr->c_gid); -+ st->st_mtime = hdr->c_mtime; -+} + case CP_IFCHR: +@@ -1573,8 +1562,6 @@ process_copy_in () + if (dot_flag) + fputc ('\n', stderr); + +- apply_delayed_set_stat (); +- + if (append_flag) + return; + +diff -up cpio-2.9/src/makepath.c.dir_perm cpio-2.9/src/makepath.c +--- cpio-2.9/src/makepath.c.dir_perm 2007-06-28 15:09:47.000000000 +0200 ++++ cpio-2.9/src/makepath.c 2008-03-03 11:45:00.000000000 +0100 +@@ -1,9 +1,9 @@ + /* makepath.c -- Ensure that a directory path exists. +- Copyright (C) 1990, 2006, 2007 Free Software Foundation, Inc. ++ Copyright (C) 1990, 2006 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) ++ the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, +@@ -29,15 +29,14 @@ + #include + #include + #include +-#include "cpiohdr.h" +-#include "dstring.h" +-#include "extern.h" + + /* Ensure that the directory ARGPATH exists. + Remove any trailing slashes from ARGPATH before calling this function. + +- Make all directory components that don't already exist with +- permissions 700. ++ Make any leading directories that don't already exist, with ++ permissions PARENT_MODE. ++ If the last element of ARGPATH does not exist, create it as ++ a new directory with permissions MODE. + If OWNER and GROUP are non-negative, make them the UID and GID of + created directories. + If VERBOSE_FMT_STRING is nonzero, use it as a printf format +@@ -49,26 +48,48 @@ + + int + make_path (char *argpath, ++ int mode, ++ int parent_mode, + uid_t owner, + gid_t group, +- const char *verbose_fmt_string) ++ char *verbose_fmt_string) + { + char *dirpath; /* A copy we can scribble NULs on. */ + struct stat stats; + int retval = 0; +- mode_t tmpmode; +- mode_t invert_permissions; +- int we_are_root = getuid () == 0; ++ int oldmask = umask (0); + dirpath = alloca (strlen (argpath) + 1); +- + strcpy (dirpath, argpath); + + if (stat (dirpath, &stats)) + { +- tmpmode = MODE_RWX & ~ newdir_umask; +- invert_permissions = we_are_root ? 0 : MODE_WXUSR & ~ tmpmode; ++ char *slash; ++ int tmp_mode; /* Initial perms for leading dirs. */ ++ int re_protect; /* Should leading dirs be unwritable? */ ++ struct ptr_list ++ { ++ char *dirname_end; ++ struct ptr_list *next; ++ }; ++ struct ptr_list *p, *leading_dirs = NULL; + - #ifndef HAVE_FCHOWN - # define fchown(fd, uid, gid) (-1) ++ /* If leading directories shouldn't be writable or executable, ++ or should have set[ug]id or sticky bits set and we are setting ++ their owners, we need to fix their permissions after making them. */ ++ if (((parent_mode & 0300) != 0300) ++ || (owner != (uid_t) -1 && group != (gid_t) -1 ++ && (parent_mode & 07000) != 0)) ++ { ++ tmp_mode = 0700; ++ re_protect = 1; ++ } ++ else ++ { ++ tmp_mode = parent_mode; ++ re_protect = 0; ++ } + +- char *slash = dirpath; ++ slash = dirpath; + while (*slash == '/') + slash++; + while ((slash = strchr (slash, '/'))) +@@ -91,9 +112,10 @@ make_path (char *argpath, + *(slash -1) = '\0'; + } #endif -@@ -1389,7 +1399,7 @@ delay_set_stat (char const *file_name, s - created within the file name of DIR. The intermediate directory turned - out to be the same as this directory, e.g. due to ".." or symbolic - links. *DIR_STAT_INFO is the status of the directory. */ --void -+int - repair_delayed_set_stat (char const *dir, - struct stat *dir_stat_info) - { -@@ -1400,22 +1410,19 @@ repair_delayed_set_stat (char const *dir - if (stat (data->stat.c_name, &st) != 0) +- if (mkdir (dirpath, tmpmode ^ invert_permissions)) ++ if (mkdir (dirpath, tmp_mode)) + { + error (0, errno, _("cannot make directory `%s'"), dirpath); ++ umask (oldmask); + return 1; + } + else +@@ -101,18 +123,24 @@ make_path (char *argpath, + if (verbose_fmt_string != NULL) + error (0, 0, verbose_fmt_string, dirpath); + +- if (stat (dirpath, &stats)) +- stat_error (dirpath); +- else ++ if (owner != (uid_t) -1 && group != (gid_t) -1 ++ && chown (dirpath, owner, group) ++#ifdef AFS ++ && errno != EPERM ++#endif ++ ) ++ { ++ chown_error_details (dirpath, owner, group); ++ retval = 1; ++ } ++ if (re_protect) + { +- if (owner != -1) +- stats.st_uid = owner; +- if (group != -1) +- stats.st_gid = group; +- +- delay_set_stat (dirpath, &stats, invert_permissions); ++ struct ptr_list *new = (struct ptr_list *) ++ alloca (sizeof (struct ptr_list)); ++ new->dirname_end = slash; ++ new->next = leading_dirs; ++ leading_dirs = new; + } +- + #ifdef HPUX_CDF + if (iscdf) + { +@@ -129,6 +157,7 @@ make_path (char *argpath, + else if (!S_ISDIR (stats.st_mode)) + { + error (0, 0, _("`%s' exists but is not a directory"), dirpath); ++ umask (oldmask); + return 1; + } + +@@ -143,7 +172,7 @@ make_path (char *argpath, + /* We're done making leading directories. + Make the final component of the path. */ + +- if (mkdir (dirpath, tmpmode ^ invert_permissions)) ++ if (mkdir (dirpath, mode)) { - stat_error (data->stat.c_name); -- return; -+ return 0; + /* In some cases, if the final component in dirpath was `.' then we + just got an EEXIST error from that last mkdir(). If that's +@@ -153,24 +182,51 @@ make_path (char *argpath, + (!S_ISDIR (stats.st_mode) ) ) + { + error (0, errno, _("cannot make directory `%s'"), dirpath); ++ umask (oldmask); + return 1; + } } +- else if (stat (dirpath, &stats)) +- stat_error (dirpath); +- else +- { +- if (owner != -1) +- stats.st_uid = owner; +- if (group != -1) +- stats.st_gid = group; +- +- delay_set_stat (dirpath, &stats, invert_permissions); +- } +- + if (verbose_fmt_string != NULL) + error (0, 0, verbose_fmt_string, dirpath); - if (st.st_dev == dir_stat_info->st_dev - && st.st_ino == dir_stat_info->st_ino) ++ if (owner != (uid_t) -1 && group != (gid_t) -1) ++ { ++ if (chown (dirpath, owner, group) ++#ifdef AFS ++ && errno != EPERM ++#endif ++ ) ++ { ++ chown_error_details (dirpath, owner, group); ++ retval = 1; ++ } ++ } ++ /* chown may have turned off some permission bits we wanted. */ ++ if ((mode & 07000) != 0 && chmod (dirpath, mode)) ++ { ++ chmod_error_details (dirpath, mode); ++ retval = 1; ++ } ++ ++ /* If the mode for leading directories didn't include owner "wx" ++ privileges, we have to reset their protections to the correct ++ value. */ ++ for (p = leading_dirs; p != NULL; p = p->next) ++ { ++ *p->dirname_end = '\0'; ++#if 0 ++ /* cpio always calls make_path with parent mode 0700, so ++ we don't have to do this. If we ever do have to do this, ++ we have to stat the directory first to get the setuid ++ bit so we don't break HP CDF's. */ ++ if (chmod (dirpath, parent_mode)) ++ { ++ chmod_error_details (dirpath, parent_mode); ++ retval = 1; ++ } ++#endif ++ ++ } + } + else + { +@@ -179,10 +235,33 @@ make_path (char *argpath, + if (!S_ISDIR (stats.st_mode)) { - stat_to_cpio (&data->stat, dir_stat_info); -- data->invert_permissions = -- ((dir_stat_info->st_mode ^ st.st_mode) -- & MODE_RWX & ~ newdir_umask); -- return; -+ data->invert_permissions = 0; -+ return 0; + error (0, 0, _("`%s' exists but is not a directory"), dirpath); ++ umask (oldmask); + return 1; } + ++ /* chown must precede chmod because on some systems, ++ chown clears the set[ug]id bits for non-superusers, ++ resulting in incorrect permissions. ++ On System V, users can give away files with chown and then not ++ be able to chmod them. So don't give files away. */ ++ ++ if (owner != (uid_t) -1 && group != (gid_t) -1 ++ && chown (dirpath, owner, group) ++#ifdef AFS ++ && errno != EPERM ++#endif ++ ) ++ { ++ chown_error_details (dirpath, owner, group); ++ retval = 1; ++ } ++ if (chmod (dirpath, mode)) ++ { ++ chmod_error_details (dirpath, mode); ++ retval = 1; ++ } } -- ERROR ((0, 0, _("%s: Unexpected inconsistency when making directory"), -- quotearg_colon (dir))); -+ return -1; ++ umask (oldmask); + return retval; } +diff -up cpio-2.9/src/copypass.c.dir_perm cpio-2.9/src/copypass.c +--- cpio-2.9/src/copypass.c.dir_perm 2008-03-03 11:45:00.000000000 +0100 ++++ cpio-2.9/src/copypass.c 2008-03-03 11:45:00.000000000 +0100 +@@ -239,23 +239,15 @@ process_copy_pass () + cdf_flag = 1; + } + #endif +- res = mkdir (output_name.ds_string, in_file_stat.st_mode & ~077); ++ res = mkdir (output_name.ds_string, in_file_stat.st_mode); + + } + else +- { +- if (!no_chown_flag && (out_file_stat.st_mode & 077) != 0 +- && chmod (output_name.ds_string, out_file_stat.st_mode & 07700) < 0) +- { +- error (0, errno, "%s: chmod", output_name.ds_string); +- continue; +- } +- res = 0; +- } ++ res = 0; + if (res < 0 && create_dir_flag) + { + create_all_directories (output_name.ds_string); +- res = mkdir (output_name.ds_string, in_file_stat.st_mode & ~077); ++ res = mkdir (output_name.ds_string, in_file_stat.st_mode); + } + if (res < 0) + { +@@ -298,12 +290,12 @@ process_copy_pass () + + if (link_res < 0) + { +- res = mknod (output_name.ds_string, in_file_stat.st_mode & ~077, ++ res = mknod (output_name.ds_string, in_file_stat.st_mode, + in_file_stat.st_rdev); + if (res < 0 && create_dir_flag) + { + create_all_directories (output_name.ds_string); +- res = mknod (output_name.ds_string, in_file_stat.st_mode & ~077, ++ res = mknod (output_name.ds_string, in_file_stat.st_mode, + in_file_stat.st_rdev); + } + if (res < 0) +@@ -373,8 +365,6 @@ process_copy_pass () + if (dot_flag) + fputc ('\n', stderr); - void +- apply_delayed_set_stat (); +- + if (!quiet_flag) + { + size_t blocks = (output_bytes + io_block_size - 1) / io_block_size; Index: cpio.spec =================================================================== RCS file: /cvs/extras/rpms/cpio/F-8/cpio.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- cpio.spec 19 Feb 2008 10:33:29 -0000 1.58 +++ cpio.spec 3 Mar 2008 11:32:02 -0000 1.59 @@ -3,7 +3,7 @@ Summary: A GNU archiving program Name: cpio Version: 2.9 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -82,6 +82,11 @@ %{_infodir}/*.info* %changelog +* Mon Mar 03 2008 Radek Brich 2.9-7 +- fix -dir_perm patch to restore permissions correctly even + in passthrough mode => revert part of code back to cpio 2.8 state + (bz#430835) + * Thu Feb 14 2008 Radek Brich 2.9-6 - when extracting archive created with 'find -depth', restore the permissions of directories properly (bz#430835) From fedora-extras-commits at redhat.com Mon Mar 3 11:33:36 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 11:33:36 GMT Subject: rpms/kdebindings/devel kdebindings.spec, 1.91, 1.92 sources, 1.40, 1.41 kdebindings-4.0.2-pykde4-kservice.patch, 1.1, NONE kdebindings-4.0.2-qt434.patch, 1.2, NONE Message-ID: <200803031133.m23BXa8l011228@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11202 Modified Files: kdebindings.spec sources Removed Files: kdebindings-4.0.2-pykde4-kservice.patch kdebindings-4.0.2-qt434.patch Log Message: respin Index: kdebindings.spec =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- kdebindings.spec 1 Mar 2008 21:39:35 -0000 1.91 +++ kdebindings.spec 3 Mar 2008 11:32:56 -0000 1.92 @@ -7,17 +7,13 @@ Name: kdebindings Version: 4.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops License: GPLv2 URL: http://developer.kde.org/language-bindings/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 -# http://websvn.kde.org/?view=rev&revision=780996 (build fixes for Qt 4.3.4) -Patch0: kdebindings-4.0.2-qt434.patch -# protected KService::accessServiceTypes has been removed, drop it from PyKDE4 -Patch1: kdebindings-4.0.2-pykde4-kservice.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kde-filesystem >= 4 @@ -63,9 +59,6 @@ %prep %setup -q -%patch0 -p0 -b .qt434 -%patch1 -p1 -b .kservice - %build @@ -119,6 +112,9 @@ %changelog +* Mon Mar 03 2008 Than Ngo 4.0.2-4 +- respin + * Sat Mar 01 2008 Kevin Kofler 4.0.2-3 - apply upstream build fixes for Qt 4.3.4 (rev 780996) - remove no longer existing protected KService::accessServiceTypes from PyKDE4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 28 Feb 2008 18:02:33 -0000 1.40 +++ sources 3 Mar 2008 11:32:56 -0000 1.41 @@ -1 +1 @@ -a8a6a06de991272f3d82d2d5a7d3007c kdebindings-4.0.2.tar.bz2 +b04fd41f4ec6cb023e209ff91f44d836 kdebindings-4.0.2.tar.bz2 --- kdebindings-4.0.2-pykde4-kservice.patch DELETED --- --- kdebindings-4.0.2-qt434.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 11:35:46 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 11:35:46 GMT Subject: rpms/kdebindings/devel kdebindings.spec,1.92,1.93 Message-ID: <200803031135.m23BZkA6011316@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebindings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11289 Modified Files: kdebindings.spec Log Message: bump release Index: kdebindings.spec =================================================================== RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- kdebindings.spec 3 Mar 2008 11:32:56 -0000 1.92 +++ kdebindings.spec 3 Mar 2008 11:35:11 -0000 1.93 @@ -7,7 +7,7 @@ Name: kdebindings Version: 4.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: KDE bindings to non-C++ languages Group: User Interface/Desktops @@ -112,7 +112,7 @@ %changelog -* Mon Mar 03 2008 Than Ngo 4.0.2-4 +* Mon Mar 03 2008 Than Ngo 4.0.2-5 - respin * Sat Mar 01 2008 Kevin Kofler 4.0.2-3 From fedora-extras-commits at redhat.com Mon Mar 3 11:39:28 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 3 Mar 2008 11:39:28 GMT Subject: rpms/mfiler2/F-7 .cvsignore, 1.18, 1.19 mfiler2.spec, 1.17, 1.18 sources, 1.18, 1.19 Message-ID: <200803031139.m23BdSmO011491@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/mfiler2/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11425/F-7 Modified Files: .cvsignore mfiler2.spec sources Log Message: * Mon Mar 3 2008 Mamoru Tasaka - 4.0.9b-1 - 4.0.9b Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mfiler2/F-7/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 20 Feb 2008 09:29:04 -0000 1.18 +++ .cvsignore 3 Mar 2008 11:38:54 -0000 1.19 @@ -1 +1 @@ -mfiler2-4.0.9a.tgz +mfiler2-4.0.9b.tgz Index: mfiler2.spec =================================================================== RCS file: /cvs/extras/rpms/mfiler2/F-7/mfiler2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mfiler2.spec 20 Feb 2008 09:29:04 -0000 1.17 +++ mfiler2.spec 3 Mar 2008 11:38:54 -0000 1.18 @@ -4,7 +4,7 @@ Name: mfiler2 -Version: 4.0.9a +Version: 4.0.9b Release: 1%{?dist} Summary: Two pane file manager under UNIX console @@ -98,6 +98,9 @@ %changelog +* Mon Mar 3 2008 Mamoru Tasaka - 4.0.9b-1 +- 4.0.9b + * Wed Feb 20 2008 Mamoru Tasaka - 4.0.9a-1 - 4.0.9a Index: sources =================================================================== RCS file: /cvs/extras/rpms/mfiler2/F-7/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 20 Feb 2008 09:29:04 -0000 1.18 +++ sources 3 Mar 2008 11:38:54 -0000 1.19 @@ -1 +1 @@ -aa05d1544fa135c69e443e5de3ec34de mfiler2-4.0.9a.tgz +15a9ac47fe011779f3075699e53b4211 mfiler2-4.0.9b.tgz From fedora-extras-commits at redhat.com Mon Mar 3 11:39:34 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 3 Mar 2008 11:39:34 GMT Subject: rpms/mfiler2/F-8 .cvsignore, 1.18, 1.19 mfiler2.spec, 1.17, 1.18 sources, 1.18, 1.19 Message-ID: <200803031139.m23BdYZ6011496@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/mfiler2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11425/F-8 Modified Files: .cvsignore mfiler2.spec sources Log Message: * Mon Mar 3 2008 Mamoru Tasaka - 4.0.9b-1 - 4.0.9b Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mfiler2/F-8/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 20 Feb 2008 09:29:36 -0000 1.18 +++ .cvsignore 3 Mar 2008 11:38:59 -0000 1.19 @@ -1 +1 @@ -mfiler2-4.0.9a.tgz +mfiler2-4.0.9b.tgz Index: mfiler2.spec =================================================================== RCS file: /cvs/extras/rpms/mfiler2/F-8/mfiler2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mfiler2.spec 20 Feb 2008 09:29:36 -0000 1.17 +++ mfiler2.spec 3 Mar 2008 11:38:59 -0000 1.18 @@ -4,7 +4,7 @@ Name: mfiler2 -Version: 4.0.9a +Version: 4.0.9b Release: 1%{?dist} Summary: Two pane file manager under UNIX console @@ -98,6 +98,9 @@ %changelog +* Mon Mar 3 2008 Mamoru Tasaka - 4.0.9b-1 +- 4.0.9b + * Wed Feb 20 2008 Mamoru Tasaka - 4.0.9a-1 - 4.0.9a Index: sources =================================================================== RCS file: /cvs/extras/rpms/mfiler2/F-8/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 20 Feb 2008 09:29:36 -0000 1.18 +++ sources 3 Mar 2008 11:38:59 -0000 1.19 @@ -1 +1 @@ -aa05d1544fa135c69e443e5de3ec34de mfiler2-4.0.9a.tgz +15a9ac47fe011779f3075699e53b4211 mfiler2-4.0.9b.tgz From fedora-extras-commits at redhat.com Mon Mar 3 11:39:38 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 3 Mar 2008 11:39:38 GMT Subject: rpms/mfiler2/devel .cvsignore, 1.18, 1.19 mfiler2.spec, 1.17, 1.18 sources, 1.18, 1.19 Message-ID: <200803031139.m23BdcuX011501@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/mfiler2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11425/devel Modified Files: .cvsignore mfiler2.spec sources Log Message: * Mon Mar 3 2008 Mamoru Tasaka - 4.0.9b-1 - 4.0.9b Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mfiler2/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 20 Feb 2008 09:29:40 -0000 1.18 +++ .cvsignore 3 Mar 2008 11:39:04 -0000 1.19 @@ -1 +1 @@ -mfiler2-4.0.9a.tgz +mfiler2-4.0.9b.tgz Index: mfiler2.spec =================================================================== RCS file: /cvs/extras/rpms/mfiler2/devel/mfiler2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mfiler2.spec 20 Feb 2008 09:29:40 -0000 1.17 +++ mfiler2.spec 3 Mar 2008 11:39:04 -0000 1.18 @@ -4,7 +4,7 @@ Name: mfiler2 -Version: 4.0.9a +Version: 4.0.9b Release: 1%{?dist} Summary: Two pane file manager under UNIX console @@ -98,6 +98,9 @@ %changelog +* Mon Mar 3 2008 Mamoru Tasaka - 4.0.9b-1 +- 4.0.9b + * Wed Feb 20 2008 Mamoru Tasaka - 4.0.9a-1 - 4.0.9a Index: sources =================================================================== RCS file: /cvs/extras/rpms/mfiler2/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 20 Feb 2008 09:29:40 -0000 1.18 +++ sources 3 Mar 2008 11:39:04 -0000 1.19 @@ -1 +1 @@ -aa05d1544fa135c69e443e5de3ec34de mfiler2-4.0.9a.tgz +15a9ac47fe011779f3075699e53b4211 mfiler2-4.0.9b.tgz From fedora-extras-commits at redhat.com Mon Mar 3 11:49:41 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Mon, 3 Mar 2008 11:49:41 GMT Subject: comps comps-f9.xml.in, 1.287, 1.288 comps-f8.xml.in, 1.227, 1.228 comps-f7.xml.in, 1.315, 1.316 Message-ID: <200803031149.m23BnfT4011825@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11789 Modified Files: comps-f9.xml.in comps-f8.xml.in comps-f7.xml.in Log Message: Add lshw-gui (mentioned on http://dailypackage.fedorabook.com/ as not having an entry in pirut). Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- comps-f9.xml.in 2 Mar 2008 17:22:05 -0000 1.287 +++ comps-f9.xml.in 3 Mar 2008 11:49:10 -0000 1.288 @@ -27,6 +27,7 @@ gparted gsynaptics lat + lshw-gui luma opyum pessulus Index: comps-f8.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f8.xml.in,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- comps-f8.xml.in 29 Feb 2008 05:15:12 -0000 1.227 +++ comps-f8.xml.in 3 Mar 2008 11:49:10 -0000 1.228 @@ -27,6 +27,7 @@ gparted gsynaptics lat + lshw-gui luma opyum pessulus Index: comps-f7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f7.xml.in,v retrieving revision 1.315 retrieving revision 1.316 diff -u -r1.315 -r1.316 --- comps-f7.xml.in 29 Feb 2008 05:15:12 -0000 1.315 +++ comps-f7.xml.in 3 Mar 2008 11:49:10 -0000 1.316 @@ -27,6 +27,7 @@ gparted gsynaptics lat + lshw-gui luma opyum pessulus From fedora-extras-commits at redhat.com Mon Mar 3 11:58:37 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Mon, 3 Mar 2008 11:58:37 GMT Subject: rpms/kernel-xen-2.6/devel kernel.spec,1.11.2.11,1.11.2.12 Message-ID: <200803031158.m23BwbGr011948@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11912 Modified Files: Tag: private-markmc-pv-ops-branch kernel.spec Log Message: Bah, silly syntax Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.11.2.11 retrieving revision 1.11.2.12 diff -u -r1.11.2.11 -r1.11.2.12 --- kernel.spec 3 Mar 2008 09:44:14 -0000 1.11.2.11 +++ kernel.spec 3 Mar 2008 11:58:02 -0000 1.11.2.12 @@ -813,7 +813,7 @@ %description -n %{variantbase}%{?1:-%{1}}-debuginfo\ This package provides debug information for package %{variantbase}%{?1:-%{1}}.\ This is required to use SystemTap with %{variantbase}%{?1:-%{1}}-%{KVERREL}.\ -%{1?:%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}(\.debug)?' -o debuginfo%{?1}.list}}\ +%{?1:%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}(\.debug)?' -o debuginfo%{?1}.list}}\ %{nil} # From fedora-extras-commits at redhat.com Mon Mar 3 12:13:52 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 3 Mar 2008 12:13:52 GMT Subject: rpms/phpMyAdmin/EL-4 .cvsignore, 1.10, 1.11 phpMyAdmin.spec, 1.17, 1.18 sources, 1.14, 1.15 Message-ID: <200803031213.m23CDqLD019390@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19287/EL-4 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Jan 2008 19:40:01 -0000 1.10 +++ .cvsignore 3 Mar 2008 12:12:36 -0000 1.11 @@ -1 +1 @@ -phpMyAdmin-2.11.4-all-languages.tar.bz2 +phpMyAdmin-2.11.5-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- phpMyAdmin.spec 13 Jan 2008 19:40:01 -0000 1.17 +++ phpMyAdmin.spec 3 Mar 2008 12:12:36 -0000 1.18 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 2.11.4 +Version: 2.11.5 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Mon Mar 03 2008 Robert Scheck 2.11.5-1 +- Upstream released 2.11.5 + * Sun Jan 13 2008 Robert Scheck 2.11.4-1 - Upstream released 2.11.4 - Corrected mod_security example in configuration file (#427119) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 13 Jan 2008 19:40:01 -0000 1.14 +++ sources 3 Mar 2008 12:12:36 -0000 1.15 @@ -1 +1 @@ -0b6d797a0c14a015d19b94e839f48d1b phpMyAdmin-2.11.4-all-languages.tar.bz2 +22746f957f2d937660d3b8cd707e05d8 phpMyAdmin-2.11.5-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 12:13:58 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 3 Mar 2008 12:13:58 GMT Subject: rpms/phpMyAdmin/F-8 .cvsignore, 1.11, 1.12 phpMyAdmin.spec, 1.17, 1.18 sources, 1.14, 1.15 Message-ID: <200803031213.m23CDwou019400@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19287/F-8 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 13 Jan 2008 19:40:24 -0000 1.11 +++ .cvsignore 3 Mar 2008 12:13:11 -0000 1.12 @@ -1 +1 @@ -phpMyAdmin-2.11.4-all-languages.tar.bz2 +phpMyAdmin-2.11.5-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/phpMyAdmin.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- phpMyAdmin.spec 13 Jan 2008 19:40:24 -0000 1.17 +++ phpMyAdmin.spec 3 Mar 2008 12:13:11 -0000 1.18 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 2.11.4 +Version: 2.11.5 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Mon Mar 03 2008 Robert Scheck 2.11.5-1 +- Upstream released 2.11.5 + * Sun Jan 13 2008 Robert Scheck 2.11.4-1 - Upstream released 2.11.4 - Corrected mod_security example in configuration file (#427119) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-8/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 13 Jan 2008 19:40:24 -0000 1.14 +++ sources 3 Mar 2008 12:13:11 -0000 1.15 @@ -1 +1 @@ -0b6d797a0c14a015d19b94e839f48d1b phpMyAdmin-2.11.4-all-languages.tar.bz2 +22746f957f2d937660d3b8cd707e05d8 phpMyAdmin-2.11.5-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 12:13:59 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 3 Mar 2008 12:13:59 GMT Subject: rpms/phpMyAdmin/EL-5 .cvsignore, 1.10, 1.11 phpMyAdmin.spec, 1.17, 1.18 sources, 1.14, 1.15 Message-ID: <200803031213.m23CDxBn019405@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19287/EL-5 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Jan 2008 19:40:09 -0000 1.10 +++ .cvsignore 3 Mar 2008 12:12:53 -0000 1.11 @@ -1 +1 @@ -phpMyAdmin-2.11.4-all-languages.tar.bz2 +phpMyAdmin-2.11.5-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- phpMyAdmin.spec 13 Jan 2008 19:40:09 -0000 1.17 +++ phpMyAdmin.spec 3 Mar 2008 12:12:53 -0000 1.18 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 2.11.4 +Version: 2.11.5 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Mon Mar 03 2008 Robert Scheck 2.11.5-1 +- Upstream released 2.11.5 + * Sun Jan 13 2008 Robert Scheck 2.11.4-1 - Upstream released 2.11.4 - Corrected mod_security example in configuration file (#427119) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 13 Jan 2008 19:40:09 -0000 1.14 +++ sources 3 Mar 2008 12:12:53 -0000 1.15 @@ -1 +1 @@ -0b6d797a0c14a015d19b94e839f48d1b phpMyAdmin-2.11.4-all-languages.tar.bz2 +22746f957f2d937660d3b8cd707e05d8 phpMyAdmin-2.11.5-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 12:14:11 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 3 Mar 2008 12:14:11 GMT Subject: rpms/phpMyAdmin/F-7 .cvsignore, 1.9, 1.10 phpMyAdmin.spec, 1.17, 1.18 sources, 1.14, 1.15 Message-ID: <200803031214.m23CEBNQ019416@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19287/F-7 Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-7/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 13 Jan 2008 19:40:18 -0000 1.9 +++ .cvsignore 3 Mar 2008 12:13:00 -0000 1.10 @@ -1 +1 @@ -phpMyAdmin-2.11.4-all-languages.tar.bz2 +phpMyAdmin-2.11.5-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-7/phpMyAdmin.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- phpMyAdmin.spec 13 Jan 2008 19:40:18 -0000 1.17 +++ phpMyAdmin.spec 3 Mar 2008 12:13:00 -0000 1.18 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 2.11.4 +Version: 2.11.5 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Mon Mar 03 2008 Robert Scheck 2.11.5-1 +- Upstream released 2.11.5 + * Sun Jan 13 2008 Robert Scheck 2.11.4-1 - Upstream released 2.11.4 - Corrected mod_security example in configuration file (#427119) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-7/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 13 Jan 2008 19:40:18 -0000 1.14 +++ sources 3 Mar 2008 12:13:00 -0000 1.15 @@ -1 +1 @@ -0b6d797a0c14a015d19b94e839f48d1b phpMyAdmin-2.11.4-all-languages.tar.bz2 +22746f957f2d937660d3b8cd707e05d8 phpMyAdmin-2.11.5-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 12:14:18 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 3 Mar 2008 12:14:18 GMT Subject: rpms/phpMyAdmin/devel .cvsignore, 1.14, 1.15 phpMyAdmin.spec, 1.17, 1.18 sources, 1.14, 1.15 Message-ID: <200803031214.m23CEIks019421@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/phpMyAdmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19287/devel Modified Files: .cvsignore phpMyAdmin.spec sources Log Message: Upstream released 2.11.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 13 Jan 2008 19:40:33 -0000 1.14 +++ .cvsignore 3 Mar 2008 12:13:29 -0000 1.15 @@ -1 +1 @@ -phpMyAdmin-2.11.4-all-languages.tar.bz2 +phpMyAdmin-2.11.5-all-languages.tar.bz2 Index: phpMyAdmin.spec =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- phpMyAdmin.spec 13 Jan 2008 19:40:33 -0000 1.17 +++ phpMyAdmin.spec 3 Mar 2008 12:13:29 -0000 1.18 @@ -1,5 +1,5 @@ Name: phpMyAdmin -Version: 2.11.4 +Version: 2.11.5 Release: 1%{?dist} Summary: Web based MySQL browser written in php @@ -54,6 +54,9 @@ %config(noreplace) %{_sysconfdir}/%{name} %changelog +* Mon Mar 03 2008 Robert Scheck 2.11.5-1 +- Upstream released 2.11.5 + * Sun Jan 13 2008 Robert Scheck 2.11.4-1 - Upstream released 2.11.4 - Corrected mod_security example in configuration file (#427119) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 13 Jan 2008 19:40:33 -0000 1.14 +++ sources 3 Mar 2008 12:13:29 -0000 1.15 @@ -1 +1 @@ -0b6d797a0c14a015d19b94e839f48d1b phpMyAdmin-2.11.4-all-languages.tar.bz2 +22746f957f2d937660d3b8cd707e05d8 phpMyAdmin-2.11.5-all-languages.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 12:28:47 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 3 Mar 2008 12:28:47 GMT Subject: rpms/mksh/EL-4 .cvsignore, 1.9, 1.10 mksh.spec, 1.10, 1.11 sources, 1.9, 1.10 Message-ID: <200803031228.m23CSl1d020037@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913/EL-4 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 33 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 9 Nov 2007 23:49:27 -0000 1.9 +++ .cvsignore 3 Mar 2008 12:28:10 -0000 1.10 @@ -1,2 +1,2 @@ -mksh-R32.cpio.gz +mksh-R33.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-4/mksh.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mksh.spec 9 Nov 2007 23:49:27 -0000 1.10 +++ mksh.spec 3 Mar 2008 12:28:10 -0000 1.11 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 32 +Version: 33 Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -71,6 +71,12 @@ %{_mandir}/man1/%{name}.1* %changelog +* Mon Mar 03 2008 Robert Scheck 33-1 +- Upgrade to 33 + +* Sun Feb 10 2008 Robert Scheck 32-2 +- Rebuild against gcc 4.3 + * Sat Nov 10 2007 Robert Scheck 32-1 - Upgrade to 32 - Solved fork problems in %%check (thanks to Thorsten Glaser) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Nov 2007 23:49:27 -0000 1.9 +++ sources 3 Mar 2008 12:28:10 -0000 1.10 @@ -1,2 +1,2 @@ -c54c416de790c67c0f4409008a68efd4 mksh-R32.cpio.gz +dbe6561bf94c4a85f92aecc22fe2c8b9 mksh-R33.cpio.gz 4c61767ff91253869cff5f7b366d54af arc4random.c From fedora-extras-commits at redhat.com Mon Mar 3 12:28:53 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 3 Mar 2008 12:28:53 GMT Subject: rpms/mksh/EL-5 .cvsignore, 1.9, 1.10 mksh.spec, 1.10, 1.11 sources, 1.9, 1.10 Message-ID: <200803031228.m23CSrJI020047@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913/EL-5 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 33 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 9 Nov 2007 23:49:30 -0000 1.9 +++ .cvsignore 3 Mar 2008 12:28:17 -0000 1.10 @@ -1,2 +1,2 @@ -mksh-R32.cpio.gz +mksh-R33.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-5/mksh.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mksh.spec 9 Nov 2007 23:49:30 -0000 1.10 +++ mksh.spec 3 Mar 2008 12:28:17 -0000 1.11 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 32 +Version: 33 Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -71,6 +71,12 @@ %{_mandir}/man1/%{name}.1* %changelog +* Mon Mar 03 2008 Robert Scheck 33-1 +- Upgrade to 33 + +* Sun Feb 10 2008 Robert Scheck 32-2 +- Rebuild against gcc 4.3 + * Sat Nov 10 2007 Robert Scheck 32-1 - Upgrade to 32 - Solved fork problems in %%check (thanks to Thorsten Glaser) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/EL-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Nov 2007 23:49:30 -0000 1.9 +++ sources 3 Mar 2008 12:28:17 -0000 1.10 @@ -1,2 +1,2 @@ -c54c416de790c67c0f4409008a68efd4 mksh-R32.cpio.gz +dbe6561bf94c4a85f92aecc22fe2c8b9 mksh-R33.cpio.gz 4c61767ff91253869cff5f7b366d54af arc4random.c From fedora-extras-commits at redhat.com Mon Mar 3 12:28:55 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Mon, 3 Mar 2008 12:28:55 GMT Subject: rpms/compat-flex/devel compat-flex.spec,1.5,1.6 Message-ID: <200803031228.m23CSt5J020050@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/compat-flex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19937 Modified Files: compat-flex.spec Log Message: Fix source tag. Index: compat-flex.spec =================================================================== RCS file: /cvs/pkgs/rpms/compat-flex/devel/compat-flex.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- compat-flex.spec 19 Feb 2008 19:55:25 -0000 1.5 +++ compat-flex.spec 3 Mar 2008 12:28:17 -0000 1.6 @@ -6,7 +6,7 @@ Group: Development/Tools URL: http://www.gnu.org/software/flex/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source: ftp://ftp.gnu.org/non-gnu/flex/flex-2.5.4a.tar.gz +Source: http://downloads.sourceforge.net/flex/flex-%{version}.tar.bz2 Source2: README.fedora Patch0: flex-2.5.4a-skel.patch Patch1: flex-2.5.4-glibc22.patch From fedora-extras-commits at redhat.com Mon Mar 3 12:28:59 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 3 Mar 2008 12:28:59 GMT Subject: rpms/mksh/F-7 .cvsignore, 1.9, 1.10 mksh.spec, 1.10, 1.11 sources, 1.9, 1.10 Message-ID: <200803031228.m23CSxXX020060@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913/F-7 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 33 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-7/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 9 Nov 2007 23:49:33 -0000 1.9 +++ .cvsignore 3 Mar 2008 12:28:23 -0000 1.10 @@ -1,2 +1,2 @@ -mksh-R32.cpio.gz +mksh-R33.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-7/mksh.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mksh.spec 9 Nov 2007 23:49:33 -0000 1.10 +++ mksh.spec 3 Mar 2008 12:28:23 -0000 1.11 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 32 +Version: 33 Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -71,6 +71,12 @@ %{_mandir}/man1/%{name}.1* %changelog +* Mon Mar 03 2008 Robert Scheck 33-1 +- Upgrade to 33 + +* Sun Feb 10 2008 Robert Scheck 32-2 +- Rebuild against gcc 4.3 + * Sat Nov 10 2007 Robert Scheck 32-1 - Upgrade to 32 - Solved fork problems in %%check (thanks to Thorsten Glaser) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-7/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Nov 2007 23:49:33 -0000 1.9 +++ sources 3 Mar 2008 12:28:23 -0000 1.10 @@ -1,2 +1,2 @@ -c54c416de790c67c0f4409008a68efd4 mksh-R32.cpio.gz +dbe6561bf94c4a85f92aecc22fe2c8b9 mksh-R33.cpio.gz 4c61767ff91253869cff5f7b366d54af arc4random.c From fedora-extras-commits at redhat.com Mon Mar 3 12:29:06 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 3 Mar 2008 12:29:06 GMT Subject: rpms/mksh/F-8 .cvsignore, 1.9, 1.10 mksh.spec, 1.10, 1.11 sources, 1.9, 1.10 Message-ID: <200803031229.m23CT6Lo020071@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913/F-8 Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 33 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-8/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 9 Nov 2007 23:49:35 -0000 1.9 +++ .cvsignore 3 Mar 2008 12:28:29 -0000 1.10 @@ -1,2 +1,2 @@ -mksh-R32.cpio.gz +mksh-R33.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-8/mksh.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mksh.spec 9 Nov 2007 23:49:35 -0000 1.10 +++ mksh.spec 3 Mar 2008 12:28:29 -0000 1.11 @@ -2,7 +2,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 32 +Version: 33 Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells @@ -71,6 +71,12 @@ %{_mandir}/man1/%{name}.1* %changelog +* Mon Mar 03 2008 Robert Scheck 33-1 +- Upgrade to 33 + +* Sun Feb 10 2008 Robert Scheck 32-2 +- Rebuild against gcc 4.3 + * Sat Nov 10 2007 Robert Scheck 32-1 - Upgrade to 32 - Solved fork problems in %%check (thanks to Thorsten Glaser) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/F-8/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Nov 2007 23:49:35 -0000 1.9 +++ sources 3 Mar 2008 12:28:29 -0000 1.10 @@ -1,2 +1,2 @@ -c54c416de790c67c0f4409008a68efd4 mksh-R32.cpio.gz +dbe6561bf94c4a85f92aecc22fe2c8b9 mksh-R33.cpio.gz 4c61767ff91253869cff5f7b366d54af arc4random.c From fedora-extras-commits at redhat.com Mon Mar 3 12:29:11 2008 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 3 Mar 2008 12:29:11 GMT Subject: rpms/mksh/devel .cvsignore, 1.9, 1.10 mksh.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200803031229.m23CTBaA020078@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/pkgs/rpms/mksh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913/devel Modified Files: .cvsignore mksh.spec sources Log Message: Upgrade to 33 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mksh/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 9 Nov 2007 23:49:42 -0000 1.9 +++ .cvsignore 3 Mar 2008 12:28:36 -0000 1.10 @@ -1,2 +1,2 @@ -mksh-R32.cpio.gz +mksh-R33.cpio.gz arc4random.c Index: mksh.spec =================================================================== RCS file: /cvs/pkgs/rpms/mksh/devel/mksh.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mksh.spec 10 Feb 2008 00:17:59 -0000 1.11 +++ mksh.spec 3 Mar 2008 12:28:36 -0000 1.12 @@ -2,8 +2,8 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh -Version: 32 -Release: 2%{?dist} +Version: 33 +Release: 1%{?dist} License: BSD with advertising Group: System Environment/Shells URL: http://www.mirbsd.de/%{name}/ @@ -71,6 +71,9 @@ %{_mandir}/man1/%{name}.1* %changelog +* Mon Mar 03 2008 Robert Scheck 33-1 +- Upgrade to 33 + * Sun Feb 10 2008 Robert Scheck 32-2 - Rebuild against gcc 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mksh/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Nov 2007 23:49:42 -0000 1.9 +++ sources 3 Mar 2008 12:28:36 -0000 1.10 @@ -1,2 +1,2 @@ -c54c416de790c67c0f4409008a68efd4 mksh-R32.cpio.gz +dbe6561bf94c4a85f92aecc22fe2c8b9 mksh-R33.cpio.gz 4c61767ff91253869cff5f7b366d54af arc4random.c From fedora-extras-commits at redhat.com Mon Mar 3 12:29:49 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Mon, 3 Mar 2008 12:29:49 GMT Subject: rpms/byacc/devel byacc.spec,1.5,1.6 Message-ID: <200803031229.m23CTn15020110@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/byacc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20075 Modified Files: byacc.spec Log Message: Fix source tag. Index: byacc.spec =================================================================== RCS file: /cvs/pkgs/rpms/byacc/devel/byacc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- byacc.spec 19 Feb 2008 19:54:28 -0000 1.5 +++ byacc.spec 3 Mar 2008 12:29:12 -0000 1.6 @@ -7,7 +7,7 @@ License: Public Domain Group: Development/Tools URL: http://invisible-island.net/byacc/byacc.html -Source: ftp://invisible-island.net/byacc/byacc-%{byaccdate}.tar.gz +Source: ftp://invisible-island.net/byacc/byacc-%{byaccdate}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description From fedora-extras-commits at redhat.com Mon Mar 3 12:37:03 2008 From: fedora-extras-commits at redhat.com (Matej Cepl (mcepl)) Date: Mon, 3 Mar 2008 12:37:03 GMT Subject: rpms/anjuta/F-7 anjuta.spec,1.33,1.34 Message-ID: <200803031237.m23Cb3fD020549@cvs-int.fedora.redhat.com> Author: mcepl Update of /cvs/pkgs/rpms/anjuta/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20529 Modified Files: anjuta.spec Log Message: Testing bug 249138 Index: anjuta.spec =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/F-7/anjuta.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- anjuta.spec 19 Feb 2008 17:24:32 -0000 1.33 +++ anjuta.spec 3 Mar 2008 12:36:23 -0000 1.34 @@ -8,7 +8,7 @@ Name: anjuta Epoch: 1 Version: 2.2.3 -Release: 2%{?dist} +Release: 2.mc.1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.anjuta.org/ @@ -49,8 +49,6 @@ BuildRequires: subversion-devel BuildRequires: vte-devel -ExcludeArch: ppc64 - %description Anjuta DevStudio is a versatile Integrated Development Environment (IDE) on GNOME Desktop Environment and features a number of advanced programming @@ -258,6 +256,9 @@ %{_includedir}/libanjuta-1.0/libanjuta %changelog +* Mon Mar 03 2008 Matej Cepl 2.2.3-2.mc.1.fc9 +- Eliminated ExcludeArch -- should be working now. + * Mon Feb 18 2008 Debarshi Ray - 1:2.2.3-2 - Added 'BuildRequires: libgnomeui-devel' to prevent failure on Fedora 7. - Disabled Devhelp plugin to prevent failure on Fedora 7. From fedora-extras-commits at redhat.com Mon Mar 3 12:57:10 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 12:57:10 GMT Subject: rpms/kde-l10n/devel .cvsignore, 1.4, 1.5 kde-l10n.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200803031257.m23CvA2Q021024@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kde-l10n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20997 Modified Files: .cvsignore kde-l10n.spec sources Log Message: 4.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Feb 2008 11:34:06 -0000 1.4 +++ .cvsignore 3 Mar 2008 12:56:34 -0000 1.5 @@ -86,3 +86,48 @@ kde-l10n-wa-4.0.1.tar.bz2 kde-l10n-zh_CN-4.0.1.tar.bz2 kde-l10n-zh_TW-4.0.1.tar.bz2 +kde-l10n-ar-4.0.2.tar.bz2 +kde-l10n-be-4.0.2.tar.bz2 +kde-l10n-bg-4.0.2.tar.bz2 +kde-l10n-ca-4.0.2.tar.bz2 +kde-l10n-cs-4.0.2.tar.bz2 +kde-l10n-csb-4.0.2.tar.bz2 +kde-l10n-da-4.0.2.tar.bz2 +kde-l10n-de-4.0.2.tar.bz2 +kde-l10n-el-4.0.2.tar.bz2 +kde-l10n-en_GB-4.0.2.tar.bz2 +kde-l10n-eo-4.0.2.tar.bz2 +kde-l10n-es-4.0.2.tar.bz2 +kde-l10n-et-4.0.2.tar.bz2 +kde-l10n-eu-4.0.2.tar.bz2 +kde-l10n-fi-4.0.2.tar.bz2 +kde-l10n-fr-4.0.2.tar.bz2 +kde-l10n-ga-4.0.2.tar.bz2 +kde-l10n-gl-4.0.2.tar.bz2 +kde-l10n-hi-4.0.2.tar.bz2 +kde-l10n-hu-4.0.2.tar.bz2 +kde-l10n-it-4.0.2.tar.bz2 +kde-l10n-ja-4.0.2.tar.bz2 +kde-l10n-km-4.0.2.tar.bz2 +kde-l10n-ko-4.0.2.tar.bz2 +kde-l10n-mk-4.0.2.tar.bz2 +kde-l10n-lv-4.0.2.tar.bz2 +kde-l10n-nb-4.0.2.tar.bz2 +kde-l10n-nds-4.0.2.tar.bz2 +kde-l10n-ne-4.0.2.tar.bz2 +kde-l10n-nl-4.0.2.tar.bz2 +kde-l10n-nn-4.0.2.tar.bz2 +kde-l10n-pa-4.0.2.tar.bz2 +kde-l10n-pl-4.0.2.tar.bz2 +kde-l10n-pt-4.0.2.tar.bz2 +kde-l10n-pt_BR-4.0.2.tar.bz2 +kde-l10n-ru-4.0.2.tar.bz2 +kde-l10n-se-4.0.2.tar.bz2 +kde-l10n-sl-4.0.2.tar.bz2 +kde-l10n-sv-4.0.2.tar.bz2 +kde-l10n-th-4.0.2.tar.bz2 +kde-l10n-tr-4.0.2.tar.bz2 +kde-l10n-uk-4.0.2.tar.bz2 +kde-l10n-wa-4.0.2.tar.bz2 +kde-l10n-zh_CN-4.0.2.tar.bz2 +kde-l10n-zh_TW-4.0.2.tar.bz2 Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kde-l10n.spec 7 Feb 2008 21:09:45 -0000 1.13 +++ kde-l10n.spec 3 Mar 2008 12:56:34 -0000 1.14 @@ -1,8 +1,8 @@ %define buildall 0 Name: kde-l10n -Version: 4.0.1 -Release: 3%{dist} +Version: 4.0.2 +Release: 1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE Group: User Interface/Desktops @@ -1182,6 +1182,9 @@ %lang(zh_TW) %{_datadir}/locale/zh_TW/* %changelog +* Mon Mar 03 2008 Than Ngo 4.0.2-1 +- 4.0.2 + * Thu Feb 07 2008 Kevin Kofler 4.0.1-3 - don't ship kdewebdev translations (we don't ship kdewebdev 4 yet) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Feb 2008 11:34:06 -0000 1.4 +++ sources 3 Mar 2008 12:56:34 -0000 1.5 @@ -1,45 +1,45 @@ -06dc791cad4d2d15d84d3873b5fcadfd kde-l10n-ar-4.0.1.tar.bz2 -b46f6b1bd6d67098a870d794377d7a2c kde-l10n-be-4.0.1.tar.bz2 -1209da4b565a70729af671e7f0bf0eff kde-l10n-bg-4.0.1.tar.bz2 -ffe2181c499a3ceda84fefcd177dc68b kde-l10n-ca-4.0.1.tar.bz2 -1ca7ca2d85256c8fde6f3168d2d1f766 kde-l10n-cs-4.0.1.tar.bz2 -bde05e7d0bb6c8ba2ad0c10b894dba6e kde-l10n-csb-4.0.1.tar.bz2 -84e08e12c6d7eae6020068ba9c52580f kde-l10n-da-4.0.1.tar.bz2 -f63b250d7fd73087725f9b63a4fab9bc kde-l10n-de-4.0.1.tar.bz2 -21ac2bf8d116e97f524919ab940610b1 kde-l10n-el-4.0.1.tar.bz2 -be7e1a8b9f4065900f5483ba95086970 kde-l10n-en_GB-4.0.1.tar.bz2 -5b1bd0430f5c58c57470db96382508ca kde-l10n-eo-4.0.1.tar.bz2 -1a94cf6e8d09ff516473e00e7933badd kde-l10n-es-4.0.1.tar.bz2 -9166c6f09b8f47ae3a7e96232876b64b kde-l10n-et-4.0.1.tar.bz2 -7876c6e2d89a4081c6cd247d908fe977 kde-l10n-eu-4.0.1.tar.bz2 -0c88020bcc27105f391380d2798c6fa9 kde-l10n-fi-4.0.1.tar.bz2 -83782110ecdcae5ddd2d6fe512646c17 kde-l10n-fr-4.0.1.tar.bz2 -08a9ac5266871af319813815b3c51bc2 kde-l10n-ga-4.0.1.tar.bz2 -330f1eff565c255229bcc3e74b574d79 kde-l10n-gl-4.0.1.tar.bz2 -f2e8fa5159b216a2f7bf09ccd0054a73 kde-l10n-hi-4.0.1.tar.bz2 -ab1e12686d522f3f97c2cce4e60606ad kde-l10n-hu-4.0.1.tar.bz2 -e35da2754b678940a5da4f978188d166 kde-l10n-it-4.0.1.tar.bz2 -56e284831f16fa39a33575db4789e570 kde-l10n-ja-4.0.1.tar.bz2 -344859bd3626c335d6d03b75f137fc9f kde-l10n-km-4.0.1.tar.bz2 -47bfa9df54dd676f1f646205437b8e0b kde-l10n-ko-4.0.1.tar.bz2 -b2b3e28a0009626adc0df81f08a73377 kde-l10n-mk-4.0.1.tar.bz2 -39d5c58dcc56d78fb6f7d50c72bb8cda kde-l10n-lv-4.0.1.tar.bz2 -8502dfe4fc1efc04dacd3ac4f03021ae kde-l10n-nb-4.0.1.tar.bz2 -1d730ae0ef43a68f00120eb519d8a96c kde-l10n-nds-4.0.1.tar.bz2 -aba63df4f85c15a7af532e730b86134a kde-l10n-ne-4.0.1.tar.bz2 -503357f23a0c72b3e0abda8c4776744e kde-l10n-nl-4.0.1.tar.bz2 -8be491221cd22c8fee7243a57257c4ff kde-l10n-nn-4.0.1.tar.bz2 -80f6fa6273cb8cda3c98617c7438e0cb kde-l10n-pa-4.0.1.tar.bz2 -99ccbaf208b4e52152bdd89682bcb092 kde-l10n-pl-4.0.1.tar.bz2 -41f6d44172efa1b386d1e529d7fa8f97 kde-l10n-pt-4.0.1.tar.bz2 -214d865fee8bbbced8e21dda5636dd32 kde-l10n-pt_BR-4.0.1.tar.bz2 -58948f58b685ba11e4c2f32c5e8096e9 kde-l10n-ru-4.0.1.tar.bz2 -366178a90264078363d8b047e523dc23 kde-l10n-se-4.0.1.tar.bz2 -052ffc474c8b7037eb89539f2c30a4d9 kde-l10n-sl-4.0.1.tar.bz2 -2a228f4eb0138544714cc3956e0c47e7 kde-l10n-sv-4.0.1.tar.bz2 -fb03148b1770d571bc413b4e28ed9658 kde-l10n-th-4.0.1.tar.bz2 -3e05184477c6eac1f27aad4494e4e92f kde-l10n-tr-4.0.1.tar.bz2 -4cbf047bb6631ecb80c29d0e909492ef kde-l10n-uk-4.0.1.tar.bz2 -12d77fc8b059f3026e9f0ed7e2860ca3 kde-l10n-wa-4.0.1.tar.bz2 -67808ca0afd1dbc76456dcfb74666f0c kde-l10n-zh_CN-4.0.1.tar.bz2 -0cb6fd19473be52f7e8ae3006e9f418e kde-l10n-zh_TW-4.0.1.tar.bz2 +7eb3f8912a54bfd855d1e8956f386fe9 kde-l10n-ar-4.0.2.tar.bz2 +c02c67f71305b62cc33663fea0c8f574 kde-l10n-be-4.0.2.tar.bz2 +71f9b0ddfd43e4be2850de94d64cc792 kde-l10n-bg-4.0.2.tar.bz2 +e9efec6d7bdb2954a0161a3697aac441 kde-l10n-ca-4.0.2.tar.bz2 +d316108bbdeb8c2cd7ecc62ede2c1785 kde-l10n-cs-4.0.2.tar.bz2 +caef781008569069ac8585380e54a291 kde-l10n-csb-4.0.2.tar.bz2 +9e979225383c00b73a93cbae5328dbc2 kde-l10n-da-4.0.2.tar.bz2 +56b7e67c617d7a97cad91df41765b650 kde-l10n-de-4.0.2.tar.bz2 +292e00df7a8a930f4fd4ea693a5cbd50 kde-l10n-el-4.0.2.tar.bz2 +9c74d4606a397f160916c2dd0b6deeea kde-l10n-en_GB-4.0.2.tar.bz2 +6b942a03c60311d0273e43eac64884fa kde-l10n-eo-4.0.2.tar.bz2 +c86e6a4bfcfc242260c0bd6b1a5c8d6b kde-l10n-es-4.0.2.tar.bz2 +ee2bdae262e17f3215c80d9c4624b3dd kde-l10n-et-4.0.2.tar.bz2 +002c3d8367d90549d0350a5723228408 kde-l10n-eu-4.0.2.tar.bz2 +d26f79e0ecc071d3bc22b2455c697383 kde-l10n-fi-4.0.2.tar.bz2 +5b775530134858b25a5a78555ae812d5 kde-l10n-fr-4.0.2.tar.bz2 +21172ddeffd4a3355a0b700834ce4eea kde-l10n-ga-4.0.2.tar.bz2 +cc90adaf7bfc591c53653540e268631d kde-l10n-gl-4.0.2.tar.bz2 +d2cb424cabebc54996225176e6b85591 kde-l10n-hi-4.0.2.tar.bz2 +6b2bffb65d811b05dd038498a65fabd7 kde-l10n-hu-4.0.2.tar.bz2 +31de13ef52381250178fd32eeac9e5fa kde-l10n-it-4.0.2.tar.bz2 +fbed60a10cf19b012ecaae09f3415f92 kde-l10n-ja-4.0.2.tar.bz2 +9e1fed21863ba08e05ce2d66df566954 kde-l10n-km-4.0.2.tar.bz2 +b7364ab5cef941a39b6166624a1bdbf8 kde-l10n-ko-4.0.2.tar.bz2 +14f2da2b53d0cd35b3fac3aba64d28b3 kde-l10n-mk-4.0.2.tar.bz2 +ab897bf89ee80c2548af0c3a21ae9e87 kde-l10n-lv-4.0.2.tar.bz2 +9da3b8b83bc7ce0dd6678baf19e408f9 kde-l10n-nb-4.0.2.tar.bz2 +a5f8a74ecd211197f5b3609346077c7b kde-l10n-nds-4.0.2.tar.bz2 +0940569b04ef0a049bfa26012d729273 kde-l10n-ne-4.0.2.tar.bz2 +ee9651792e75ad98891ab95c3db397f9 kde-l10n-nl-4.0.2.tar.bz2 +ed6ec39f0ece0128e7f1d44115d8ad6b kde-l10n-nn-4.0.2.tar.bz2 +1d347c3330272224f65bbcf78337425b kde-l10n-pa-4.0.2.tar.bz2 +17756a5f9bbb813315b08655d51e9187 kde-l10n-pl-4.0.2.tar.bz2 +e6a3b09ff9c64176b3d758cae90d1a43 kde-l10n-pt-4.0.2.tar.bz2 +6fa11383e79ed536bf4b4118a3d26033 kde-l10n-pt_BR-4.0.2.tar.bz2 +91f98c134b2fc7b8ba760b675ea30dd6 kde-l10n-ru-4.0.2.tar.bz2 +e22ea3a549a6b15706ad5a49bfea7ad2 kde-l10n-se-4.0.2.tar.bz2 +9c650d1ffb30e909fd85b5a790fc69c7 kde-l10n-sl-4.0.2.tar.bz2 +9dc35f123d8fb9df634fa84033374259 kde-l10n-sv-4.0.2.tar.bz2 +4509283a19b42d6a22f7b36db3326d6a kde-l10n-th-4.0.2.tar.bz2 +01edffb4e27c5a80b12e090cd04b82a6 kde-l10n-tr-4.0.2.tar.bz2 +5f7e65db801b224419a1178734a0c557 kde-l10n-uk-4.0.2.tar.bz2 +72d3f2dcc42cad0203a4af5832809786 kde-l10n-wa-4.0.2.tar.bz2 +b4253ac4657f43138c71a6248e2054ce kde-l10n-zh_CN-4.0.2.tar.bz2 +d04097d9e73dcd04da78545d31d9f409 kde-l10n-zh_TW-4.0.2.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 12:59:13 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Mon, 3 Mar 2008 12:59:13 GMT Subject: rpms/valgrind/devel valgrind-3.3.0-cachegrind-improvements.patch, NONE, 1.1 valgrind-3.3.0-helgrind-p_b_w.patch, NONE, 1.1 valgrind-3.3.0-openat.patch, NONE, 1.1 valgrind-3.3.0-pkg-config.patch, NONE, 1.1 valgrind-3.3.0-power5+-6.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 valgrind.spec, 1.54, 1.55 valgrind-3.2.3-cachegrind-improvements.patch, 1.2, NONE valgrind-3.2.3-glibc2_6.patch, 1.1, NONE valgrind-3.2.3-glibc2_7.patch, 1.1, NONE valgrind-3.2.3-io_destroy.patch, 1.1, NONE valgrind-3.2.3-openat.patch, 1.1, NONE valgrind-3.2.3-pkg-config.patch, 1.1, NONE valgrind-3.2.3-power5+-6.patch, 1.1, NONE valgrind-3.2.3-private-futex.patch, 1.1, NONE valgrind-3.2.3-x86_64-nops.patch, 1.1, NONE Message-ID: <200803031259.m23CxDPq021222@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/valgrind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157/devel Modified Files: .cvsignore sources valgrind.spec Added Files: valgrind-3.3.0-cachegrind-improvements.patch valgrind-3.3.0-helgrind-p_b_w.patch valgrind-3.3.0-openat.patch valgrind-3.3.0-pkg-config.patch valgrind-3.3.0-power5+-6.patch Removed Files: valgrind-3.2.3-cachegrind-improvements.patch valgrind-3.2.3-glibc2_6.patch valgrind-3.2.3-glibc2_7.patch valgrind-3.2.3-io_destroy.patch valgrind-3.2.3-openat.patch valgrind-3.2.3-pkg-config.patch valgrind-3.2.3-power5+-6.patch valgrind-3.2.3-private-futex.patch valgrind-3.2.3-x86_64-nops.patch Log Message: 3.3.0-1 valgrind-3.3.0-cachegrind-improvements.patch: --- NEW FILE valgrind-3.3.0-cachegrind-improvements.patch --- --- valgrind-3.3.0/cachegrind/cg_sim.c.jj 2007-01-08 02:43:10.000000000 -0500 +++ valgrind-3.3.0/cachegrind/cg_sim.c 2007-02-13 07:15:46.000000000 -0500 @@ -42,29 +42,32 @@ typedef struct { Int size; /* bytes */ Int assoc; Int line_size; /* bytes */ - Int sets; Int sets_min_1; Int assoc_bits; Int line_size_bits; Int tag_shift; - Char desc_line[128]; UWord* tags; -} cache_t2; + Char desc_line[128]; +} cache_t2 +#ifdef __GNUC__ +__attribute__ ((aligned (8 * sizeof (Int)))) +#endif +; /* By this point, the size/assoc/line_size has been checked. */ static void cachesim_initcache(cache_t config, cache_t2* c) { - Int i; + Int sets; c->size = config.size; c->assoc = config.assoc; c->line_size = config.line_size; - c->sets = (c->size / c->line_size) / c->assoc; - c->sets_min_1 = c->sets - 1; + sets = (c->size / c->line_size) / c->assoc; + c->sets_min_1 = sets - 1; c->assoc_bits = VG_(log2)(c->assoc); c->line_size_bits = VG_(log2)(c->line_size); - c->tag_shift = c->line_size_bits + VG_(log2)(c->sets); + c->tag_shift = c->line_size_bits + VG_(log2)(sets); if (c->assoc == 1) { VG_(sprintf)(c->desc_line, "%d B, %d B, direct-mapped", @@ -74,10 +77,7 @@ static void cachesim_initcache(cache_t c c->size, c->line_size, c->assoc); } - c->tags = VG_(malloc)(sizeof(UWord) * c->sets * c->assoc); - - for (i = 0; i < c->sets * c->assoc; i++) - c->tags[i] = 0; + c->tags = VG_(calloc)(sizeof(UWord) * sets, c->assoc); } /* This is done as a macro rather than by passing in the cache_t2 as an @@ -140,8 +140,7 @@ void cachesim_##L##_doref(Addr a, UChar return; \ \ /* Second case: word straddles two lines. */ \ - /* Nb: this is a fast way of doing ((set1+1) % L.sets) */ \ - } else if (((set1 + 1) & (L.sets-1)) == set2) { \ + } else if (((set1 + 1) & (L.sets_min_1)) == set2) { \ set = &(L.tags[set1 << L.assoc_bits]); \ if (tag == set[0]) { \ goto block2; \ valgrind-3.3.0-helgrind-p_b_w.patch: --- NEW FILE valgrind-3.3.0-helgrind-p_b_w.patch --- --- valgrind-3.3.0/glibc-2.34567-NPTL-helgrind.supp.jj 2007-12-11 00:18:47.000000000 +0100 +++ valgrind-3.3.0/glibc-2.34567-NPTL-helgrind.supp 2008-03-03 13:48:42.000000000 +0100 @@ -198,6 +198,11 @@ obj:/lib*/libpthread-2.7.*so fun:sem_* } +{ + helgrind-glibc27-199 + Helgrind:Race + fun:pthread_barrier_wait +} ######------------ glibc-2.6 specific ---------###### # valgrind-3.3.0-openat.patch: --- NEW FILE valgrind-3.3.0-openat.patch --- Testcase: #define _GNU_SOURCE #include #include int main (void) { int dfd = open ("/tmp", O_RDONLY); int fd1 = openat (dfd, "abc", O_RDONLY); int fd2 = openat (0x12345678, "/tmp/abc", O_RDONLY); int fd3 = openat (AT_FDCWD, "abc", O_RDONLY); /* This is the only one that should warn. */ int fd4 = openat (0x12345678, "abc", O_RDONLY); return 0; } --- valgrind-3.3.0/coregrind/m_syswrap/syswrap-linux.c.jj 2007-12-11 00:18:43.000000000 +0100 +++ valgrind-3.3.0/coregrind/m_syswrap/syswrap-linux.c 2008-03-03 11:35:15.000000000 +0100 @@ -2455,10 +2455,15 @@ PRE(sys_openat) int, dfd, const char *, filename, int, flags); } - if (ARG1 != VKI_AT_FDCWD && !ML_(fd_allowed)(ARG1, "openat", tid, False)) + PRE_MEM_RASCIIZ( "openat(filename)", ARG2 ); + + /* For absolute filenames, dfd is ignored. If dfd is AT_FDCWD, + filename is relative to cwd. */ + if (ML_(safe_to_deref)( (void*)ARG2, 1 ) + && *(Char *)ARG2 != '/' + && ARG1 != VKI_AT_FDCWD + && !ML_(fd_allowed)(ARG1, "openat", tid, False)) SET_STATUS_Failure( VKI_EBADF ); - else - PRE_MEM_RASCIIZ( "openat(filename)", ARG2 ); /* Handle the case where the open is of /proc/self/cmdline or /proc//cmdline, and just give it a copy of the fd for the valgrind-3.3.0-pkg-config.patch: --- NEW FILE valgrind-3.3.0-pkg-config.patch --- --- valgrind-3.3.0/configure.in.jj 2007-01-29 14:42:52.000000000 -0500 +++ valgrind-3.3.0/configure.in 2007-02-13 08:02:26.000000000 -0500 @@ -251,6 +251,7 @@ AC_MSG_CHECKING([for a supported CPU/OS AC_SUBST(VG_PLATFORM_PRI) AC_SUBST(VG_PLATFORM_SEC) +AC_SUBST(VG_PLATFORM) case "$VG_ARCH-$VG_OS" in x86-linux) @@ -296,6 +297,7 @@ case "$VG_ARCH-$VG_OS" in AC_MSG_ERROR([Valgrind is platform specific. Sorry. Please consider doing a port.]) ;; esac +VG_PLATFORM=`echo "$VG_PLATFORM_PRI" | LC_ALL=C tr A-Z_ a-z-` # Set up VG_. Either one or two of these become defined. # --- valgrind-3.3.0/configure.jj 2007-01-29 14:45:30.000000000 -0500 +++ valgrind-3.3.0/configure 2007-02-13 08:04:33.000000000 -0500 @@ -311,7 +311,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT VEX_DIR DISTCHECK_CONFIGURE_FLAGS LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB PERL GDB CCAS CCASFLAGS build build_cpu build_vendor build_os h! ost host_cpu host_vendor host_os VG_ARCH VG_ARCH_ALL VALT_LOAD_ADDRESS VG_OS VG_PLATFORM_PRI VG_PLATFORM_SEC VGP_X86_LINUX_TRUE VGP_X86_LINUX_FALSE VGP_AMD64_LINUX_TRUE VGP_AMD64_LINUX_FALSE VGP_PPC32_LINUX_TRUE VGP_PPC32_LINUX_FALSE VGP_PPC64_LINUX_TRUE VGP_PPC64_LINUX_FALSE VGP_PPC32_AIX5_TRUE VGP_PPC32_AIX5_FALSE VGP_PPC64_AIX5_TRUE VGP_PPC64_AIX5_FALSE VGO_LINUX_TRUE VGO_LINUX_FALSE VGO_AIX5_TRUE VGO_AIX5_FALSE VGP_HAVE_SECONDARY_TRUE VGP_HAVE_SECONDARY_FALSE DEFAULT_SUPP EGREP FLAG_M32 FLAG_MAIX32 FLAG_M64 FLAG_MAIX64 FLAG_MMMX FLAG_MSSE PREFERRED_STACK_BOUNDARY FLAG_WDECL_AFTER_STMT FLAG_FNO_STACK_PROTECTOR BUILD_SSE3_TESTS_TRUE BUILD_SSE3_TESTS_FALSE LIBOBJS MPI_CC BUILD_MPIWRAP_PRI_TRUE BUILD_MPIWRAP_PRI_FALSE BUILD_MPIWRAP_SEC_TRUE BUILD_MPIWRAP_SEC_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT VEX_DIR DISTCHECK_CONFIGURE_FLAGS LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB PERL GDB CCAS CCASFLAGS build build_cpu build_vendor build_os h! ost host_cpu host_vendor host_os VG_ARCH VG_ARCH_ALL VALT_LOAD_ADDRESS VG_OS VG_PLATFORM_PRI VG_PLATFORM_SEC VG_PLATFORM VGP_X86_LINUX_TRUE VGP_X86_LINUX_FALSE VGP_AMD64_LINUX_TRUE VGP_AMD64_LINUX_FALSE VGP_PPC32_LINUX_TRUE VGP_PPC32_LINUX_FALSE VGP_PPC64_LINUX_TRUE VGP_PPC64_LINUX_FALSE VGP_PPC32_AIX5_TRUE VGP_PPC32_AIX5_FALSE VGP_PPC64_AIX5_TRUE VGP_PPC64_AIX5_FALSE VGO_LINUX_TRUE VGO_LINUX_FALSE VGO_AIX5_TRUE VGO_AIX5_FALSE VGP_HAVE_SECONDARY_TRUE VGP_HAVE_SECONDARY_FALSE DEFAULT_SUPP EGREP FLAG_M32 FLAG_MAIX32 FLAG_M64 FLAG_MAIX64 FLAG_MMMX FLAG_MSSE PREFERRED_STACK_BOUNDARY FLAG_WDECL_AFTER_STMT FLAG_FNO_STACK_PROTECTOR BUILD_SSE3_TESTS_TRUE BUILD_SSE3_TESTS_FALSE LIBOBJS MPI_CC BUILD_MPIWRAP_PRI_TRUE BUILD_MPIWRAP_PRI_FALSE BUILD_MPIWRAP_SEC_TRUE BUILD_MPIWRAP_SEC_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -4348,6 +4348,7 @@ echo "$as_me: error: Valgrind is platfor { (exit 1); exit 1; }; } ;; esac +VG_PLATFORM=`echo "$VG_PLATFORM_PRI" | LC_ALL=C tr A-Z_ a-z-` # Set up VGP_. Either one or two of these become defined. # @@ -8351,6 +8352,7 @@ s, at VALT_LOAD_ADDRESS@,$VALT_LOAD_ADDRESS s, at VG_OS@,$VG_OS,;t t s, at VG_PLATFORM_PRI@,$VG_PLATFORM_PRI,;t t s, at VG_PLATFORM_SEC@,$VG_PLATFORM_SEC,;t t +s, at VG_PLATFORM@,$VG_PLATFORM,;t t s, at VGP_X86_LINUX_TRUE@,$VGP_X86_LINUX_TRUE,;t t s, at VGP_X86_LINUX_FALSE@,$VGP_X86_LINUX_FALSE,;t t s, at VGP_AMD64_LINUX_TRUE@,$VGP_AMD64_LINUX_TRUE,;t t --- valgrind-3.3.0/valgrind.pc.in.jj 2007-01-02 09:52:30.000000000 -0500 +++ valgrind-3.3.0/valgrind.pc.in 2007-02-13 08:04:57.000000000 -0500 @@ -4,13 +4,13 @@ libdir=@libdir@ includedir=@includedir@/valgrind arch=@VG_ARCH@ os=@VG_OS@ -platform=@VG_PLATFORM_PRI@ +platform=@VG_PLATFORM@ valt_load_address=@VALT_LOAD_ADDRESS@ Name: Valgrind Description: A dynamic binary instrumentation framework Version: @VERSION@ Requires: -Libs: -L${libdir}/valgrind/@VG_PLATFORM_PRI@ -lcoregrind -lvex -lgcc +Libs: -L${libdir}/valgrind/@VG_PLATFORM@ -lcoregrind -lvex -lgcc Cflags: -I${includedir} valgrind-3.3.0-power5+-6.patch: --- NEW FILE valgrind-3.3.0-power5+-6.patch --- --- valgrind-3.3.0/VEX/priv/guest-ppc/toIR.c.jj 2007-12-11 00:18:52.000000000 +0100 +++ valgrind-3.3.0/VEX/priv/guest-ppc/toIR.c 2008-03-03 09:58:59.000000000 +0100 @@ -333,6 +333,7 @@ typedef enum { } PPC_GST; #define MASK_FPSCR_RN 0x3 +#define MASK_FPSCR_FPRF 0x1F000 #define MASK_VSCR_VALID 0x00010001 @@ -2142,7 +2143,7 @@ static IRExpr* /* ::Ity_I32 */ getGST_ma /* We're only keeping track of the rounding mode, so if the mask isn't asking for this, just return 0x0 */ - if (mask & 0x3) { + if (mask & (MASK_FPSCR_RN|MASK_FPSCR_FPRF)) { assign( val, IRExpr_Get( OFFB_FPROUND, Ity_I32 ) ); } else { assign( val, mkU32(0x0) ); @@ -2271,7 +2272,7 @@ static void putGST_masked ( PPC_GST reg, switch (reg) { case PPC_GST_FPSCR: { /* Allow writes to Rounding Mode */ - if (mask & 0x3) { + if (mask & (MASK_FPSCR_RN|MASK_FPSCR_FPRF)) { /* construct new fpround from new and old values as per mask: new fpround = (src & (3 & mask)) | (fpround & (3 & ~mask)) */ stmt( @@ -2279,11 +2280,11 @@ static void putGST_masked ( PPC_GST reg, OFFB_FPROUND, binop( Iop_Or32, - binop(Iop_And32, src, mkU32(3 & mask)), + binop(Iop_And32, src, mkU32((MASK_FPSCR_RN|MASK_FPSCR_FPRF) & mask)), binop( Iop_And32, IRExpr_Get(OFFB_FPROUND,Ity_I32), - mkU32(3 & ~mask) + mkU32((MASK_FPSCR_RN|MASK_FPSCR_FPRF) & ~mask) ) ) ) @@ -3224,6 +3225,48 @@ static Bool dis_int_logic ( UInt theInst // TODO: alternatively: assign(rA, verbose_Clz64(rS)); break; + case 0x1FC: // cmpb (Power6: compare bytes) + DIP("cmpb r%u,r%u,r%u\n", rA_addr, rS_addr, rB_addr); + + if (mode64) + assign( rA, unop( Iop_V128to64, + binop( Iop_CmpEQ8x16, + binop( Iop_64HLtoV128, mkU64(0), mkexpr(rS) ), + binop( Iop_64HLtoV128, mkU64(0), mkexpr(rB) ) + )) ); + else + assign( rA, unop( Iop_V128to32, + binop( Iop_CmpEQ8x16, + unop( Iop_32UtoV128, mkexpr(rS) ), + unop( Iop_32UtoV128, mkexpr(rB) ) + )) ); + break; + + case 0x2DF: { // mftgpr (move floating-point to general purpose register) + IRTemp frB = newTemp(Ity_F64); + DIP("mftgpr r%u,fr%u\n", rS_addr, rB_addr); + + assign( frB, getFReg(rB_addr)); // always F64 + if (mode64) + assign( rA, unop( Iop_ReinterpF64asI64, mkexpr(frB)) ); + else + assign( rA, unop( Iop_64to32, unop( Iop_ReinterpF64asI64, mkexpr(frB))) ); + + putIReg( rS_addr, mkexpr(rA)); + return True; + } + case 0x25F: { // mffgpr (move floating-point from general purpose register) + IRTemp frA = newTemp(Ity_F64); + DIP("mffgpr fr%u,r%u\n", rS_addr, rB_addr); + + if (mode64) + assign( frA, unop( Iop_ReinterpI64asF64, mkexpr(rB)) ); + else + assign( frA, unop( Iop_ReinterpI64asF64, unop( Iop_32Uto64, mkexpr(rB))) ); + + putFReg( rS_addr, mkexpr(frA)); + return True; + } default: vex_printf("dis_int_logic(ppc)(opc2)\n"); return False; @@ -6533,6 +6576,45 @@ static Bool dis_fp_round ( UInt theInstr binop(Iop_I64toF64, rm, mkexpr(r_tmp64)) ); break; + case 0x188: case 0x1A8: case 0x1C8: case 0x1E8: // frin, friz, frip, frim + switch(opc2) { + case 0x188: // frin (Floating Round to Integer Nearest) + DIP("frin%s fr%u,fr%u\n", flag_rC ? ".":"", frD_addr, frB_addr); + assign( r_tmp64, + binop(Iop_F64toI64, mkU32(Irrm_NEAREST), mkexpr(frB)) ); + break; + case 0x1A8: // friz (Floating Round to Integer Toward Zero) + DIP("friz%s fr%u,fr%u\n", flag_rC ? ".":"", frD_addr, frB_addr); + assign( r_tmp64, + binop(Iop_F64toI64, mkU32(Irrm_ZERO), mkexpr(frB)) ); + break; + case 0x1C8: // frip (Floating Round to Integer Plus) + DIP("frip%s fr%u,fr%u\n", flag_rC ? ".":"", frD_addr, frB_addr); + assign( r_tmp64, + binop(Iop_F64toI64, mkU32(Irrm_PosINF), mkexpr(frB)) ); + break; + case 0x1E8: // frim (Floating Round to Integer Minus) + DIP("frim%s fr%u,fr%u\n", flag_rC ? ".":"", frD_addr, frB_addr); + assign( r_tmp64, + binop(Iop_F64toI64, mkU32(Irrm_NegINF), mkexpr(frB)) ); + break; + } + + /* don't use the rounded integer if frB is outside -9e18..9e18 */ + /* F64 has only log10(2**52) significant digits anyway */ + /* need to preserve sign of zero */ + /* frD = (fabs(frB) > 9e18) ? frB : + (sign(frB)) ? -fabs((double)r_tmp64) : (double)r_tmp64 */ + assign( frD, IRExpr_Mux0X( unop( Iop_32to8, binop( Iop_CmpF64, + IRExpr_Const(IRConst_F64(9e18)), unop( Iop_AbsF64, mkexpr(frB)))), + IRExpr_Mux0X( unop( Iop_32to8, binop( Iop_Shr32, unop( Iop_64HIto32, + unop(Iop_ReinterpF64asI64, mkexpr(frB))), mkU8(31))), + binop( Iop_I64toF64, mkU32(0), mkexpr(r_tmp64) ), + unop( Iop_NegF64, unop( Iop_AbsF64, + binop(Iop_I64toF64, mkU32(0), mkexpr(r_tmp64)) )) ), + mkexpr(frB) )); + break; + default: vex_printf("dis_fp_round(ppc)(opc2)\n"); return False; @@ -9139,6 +9221,10 @@ DisResult disInstr_PPC_WRK ( case 0x32E: // fctid case 0x32F: // fctidz case 0x34E: // fcfid + case 0x188: // frin (Power5+) + case 0x1A8: // friz (Power5+) + case 0x1C8: // frip (Power5+) + case 0x1E8: // frim (Power5+) if (dis_fp_round(theInstr)) goto decode_success; goto decode_failure; @@ -9216,6 +9302,10 @@ DisResult disInstr_PPC_WRK ( if (dis_int_arith( theInstr )) goto decode_success; goto decode_failure; + case 0x1FC: // cmpb + if (dis_int_logic( theInstr )) goto decode_success; + goto decode_failure; + default: break; // Fall through... } @@ -9234,6 +9324,7 @@ DisResult disInstr_PPC_WRK ( case 0x11C: case 0x3BA: case 0x39A: // eqv, extsb, extsh case 0x1DC: case 0x07C: case 0x1BC: // nand, nor, or case 0x19C: case 0x13C: // orc, xor + case 0x2DF: case 0x25F: // mftgpr, mffgpr if (dis_int_logic( theInstr )) goto decode_success; goto decode_failure; --- valgrind-3.3.0/none/tests/ppc32/Makefile.am.jj 2007-12-11 00:18:32.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc32/Makefile.am 2008-03-03 10:00:36.000000000 +0100 @@ -19,13 +19,15 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ testVMX.stderr.exp testVMX.stdout.exp testVMX.vgtest \ twi.stderr.exp twi.stdout.exp twi.vgtest \ tw.stderr.exp tw.stdout.exp tw.vgtest \ - xlc_dbl_u32.stderr.exp xlc_dbl_u32.stdout.exp xlc_dbl_u32.vgtest + xlc_dbl_u32.stderr.exp xlc_dbl_u32.stdout.exp xlc_dbl_u32.vgtest \ + power5+_round.stderr.exp power5+_round.stdout.exp power5+_round.vgtest \ + power6_bcmp.stderr.exp power6_bcmp.stdout.exp power6_bcmp.vgtest check_PROGRAMS = \ bug129390-ppc32 \ bug139050-ppc32 \ ldstrev lsw jm-insns mftocrf mcrfs round test_fx test_gx \ - testVMX twi tw xlc_dbl_u32 + testVMX twi tw xlc_dbl_u32 power5+_round power6_bcmp AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -I$(top_srcdir)/include \ @FLAG_M32@ --- valgrind-3.3.0/none/tests/ppc32/power5+_round.c.jj 2008-03-03 09:58:59.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc32/power5+_round.c 2008-03-03 09:58:59.000000000 +0100 @@ -0,0 +1,147 @@ +/* Copyright (C) 2007 Pete Eberlein eberlein at us.ibm.com + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307, USA. + + The GNU General Public License is contained in the file COPYING. +*/ + + + +#include +#include +#include +#include + +#define POS_NORMAL 0x4000 +#define NEG_NORMAL 0x8000 +#define POS_INF 0x5000 +#define NEG_INF 0x9000 +#define POS_ZERO 0x2000 +#define NEG_ZERO 0x12000 +#define POS_DENORMAL 0x14000 +#define NEG_DENORMAL 0x18000 +#define NAN 0x11000 +#define FPRF_MASK 0x1F000 + + +int main (int argc, char* argv[]) { + + double inf, neg0, nan; + union { + double d; + struct { unsigned int dummy, dummy2: 15, fprf:17; }; + } fpscr; + + inf = strtod("inf", NULL); + neg0 = copysign(0, -1); + nan = strtod("nan", NULL); + + + /* This set is disabled until fprf is implemented. */ + if (0) { + double set[] = {inf, 1.5, 0, neg0, -1.5, -inf, nan}; + int i, j, fprf; + for (i=0; i<7; ++i) { + for (j=0; j<7; ++j) { + asm ("fcmpu 1, %1, %2\n\t" \ + "mffs %0\n" \ + : "=f" (fpscr.d) \ + : "f" (set[i]), "f" (set[j]) \ + ); + + if (i == 6 || j == 6) { + fprf = 0x1000; // Unordered + } else if (i == j || (i==2 && j==3) || (i==3 && j==2)) { + fprf = 0x2000; // Equal + } else if (i < j) { + fprf = 0x4000; // Greater Than + } else if (i > j) { + fprf = 0x8000; // Less Than + } + + printf("fcmpu\t%.1f\t%.1f\t%x\t%s\n", set[i], set[j], fpscr.fprf, + fpscr.fprf == fprf ? "PASS" : "FAIL"); + } + } + } + + { + double set[] = {inf, 1.9, 1.1, 0, neg0, -1.1, -1.9, -inf, nan}; + double frin[] = {inf, 2.0, 1.0, 0, neg0, -1.0, -2.0, -inf, nan}; + double friz[] = {inf, 1.0, 1.0, 0, neg0, -1.0, -1.0, -inf, nan}; + double frip[] = {inf, 2.0, 2.0, 0, neg0, -1.0, -1.0, -inf, nan}; + double frim[] = {inf, 1.0, 1.0, 0, neg0, -2.0, -2.0, -inf, nan}; + int fprf[] = {POS_INF, POS_NORMAL, POS_NORMAL, POS_ZERO, NEG_ZERO, + NEG_NORMAL, NEG_NORMAL, NEG_INF, NAN}; + double set2[] = {0.9, 0.1, -0.1, -0.9, 1e-40, -1e-40}; + double frin2[] = {1.0, 0.0, -0.0, -1.0, 0.0, -0.0}; + int frin2rf[] = {POS_NORMAL,POS_ZERO,NEG_ZERO,NEG_NORMAL,POS_ZERO,NEG_ZERO}; + double friz2[] = {0.0, 0.0, -0.0, -0.0, 0.0, -0.0}; + int friz2rf[] = {POS_ZERO,POS_ZERO,NEG_ZERO,NEG_ZERO,POS_ZERO,NEG_ZERO}; + double frip2[] = {1.0, 1.0, -0.0, -0.0, 1.0, -0.0}; + int frip2rf[] = {POS_NORMAL,POS_NORMAL,NEG_ZERO,NEG_ZERO,POS_NORMAL,NEG_ZERO}; + double frim2[] = {0.0, 0.0, -1.0, -1.0, 0.0, -1.0}; + int frim2rf[] = {POS_ZERO,POS_ZERO,NEG_NORMAL,NEG_NORMAL,POS_ZERO,NEG_NORMAL}; + double ret; + int i; + +#define DO_TEST(op,in,out,rf) for (i=0; i +#include +#include + +#define CMPB(result,a,b) \ + asm __volatile ("cmpb %0, %1, %2\n" : "=r"(result) : "r"(a), "r"(b)) + + +int main (int argc, char* argv[]) { + int i,j,k; + long mask; + for (i=1; i<16; i++) { + mask = 0; + if(i&1) mask+=0xff; + if(i&2) mask+=0xff00; + if(i&4) mask+=0xff0000; + if(i&8) mask+=0xff000000; + + for (j=0; j<256; j++) + for (k=0; k<256; k++) + if (j!=k) { + + long a, b, result; + a = (mask & (j*0x1010101)) + ((~mask) & (k*0x1010101)); + b = j*0x1010101; + CMPB(result, a, b); + if (result != mask) + printf("%8x %8x %8x %8x\n", mask, a, b, result); + exit(1); + } + + } + + return 0; +} + --- valgrind-3.3.0/none/tests/ppc32/power6_bcmp.stderr.exp.jj 2008-03-03 09:58:59.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc32/power6_bcmp.stderr.exp 2008-03-03 09:58:59.000000000 +0100 @@ -0,0 +1,2 @@ + + --- valgrind-3.3.0/none/tests/ppc32/power6_bcmp.vgtest.jj 2008-03-03 09:58:59.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc32/power6_bcmp.vgtest 2008-03-03 09:58:59.000000000 +0100 @@ -0,0 +1 @@ +prog: power6_bcmp --- valgrind-3.3.0/none/tests/ppc64/Makefile.am.jj 2007-12-11 00:18:35.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc64/Makefile.am 2008-03-03 10:01:52.000000000 +0100 @@ -9,10 +9,12 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ std_reg_imm.vgtest std_reg_imm.stderr.exp std_reg_imm.stdout.exp \ round.stderr.exp round.stdout.exp round.vgtest \ twi_tdi.stderr.exp twi_tdi.stdout.exp twi_tdi.vgtest \ - tw_td.stderr.exp tw_td.stdout.exp tw_td.vgtest + tw_td.stderr.exp tw_td.stdout.exp tw_td.vgtest \ + power6_bcmp.stderr.exp power6_bcmp.stdout.exp power6_bcmp.vgtest \ + power6_mf_gpr.stderr.exp power6_mf_gpr.stdout.exp power6_mf_gpr.vgtest check_PROGRAMS = \ - jm-insns lsw round std_reg_imm twi_tdi tw_td + jm-insns lsw round std_reg_imm twi_tdi tw_td power6_bcmp power6_mf_gpr AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -I$(top_srcdir)/include \ @FLAG_M64@ --- valgrind-3.3.0/none/tests/ppc64/power6_bcmp.c.jj 2008-03-03 09:58:59.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc64/power6_bcmp.c 2008-03-03 09:58:59.000000000 +0100 @@ -0,0 +1,61 @@ +/* Copyright (C) 2007 Pete Eberlein eberlein at us.ibm.com + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307, USA. + + The GNU General Public License is contained in the file COPYING. +*/ + + +#include +#include +#include + +#define CMPB(result,a,b) \ + asm ("cmpb %0, %1, %2\n" : "=r"(result) : "r"(a), "r"(b)) + + +int main (int argc, char* argv[]) { + int i,j,k; + unsigned long mask; + for (i=1; i<256; i++) { + mask = 0; + if(i&1) mask+=0xff; + if(i&2) mask+=0xff00; + if(i&4) mask+=0xff0000; + if(i&8) mask+=0xff000000; + if(i&16) mask+=0xff00000000; + if(i&32) mask+=0xff0000000000; + if(i&64) mask+=0xff000000000000; + if(i&128) mask+=0xff00000000000000; + + for (j=0; j<256; j++) + for (k=0; k<256; k++) + if (j!=k) { + + unsigned long a, b, result; + a = (mask & (j*0x101010101010101)) + ((~mask) & (k*0x101010101010101)); + b = j*0x101010101010101; + CMPB(result, a, b); + if (result != mask) + printf("%8lx %8lx %8lx %8lx\n", mask, a, b, result); + exit(1); + } + + } + + return 0; +} + --- valgrind-3.3.0/none/tests/ppc64/power6_bcmp.stderr.exp.jj 2008-03-03 09:58:59.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc64/power6_bcmp.stderr.exp 2008-03-03 09:58:59.000000000 +0100 @@ -0,0 +1,2 @@ + + --- valgrind-3.3.0/none/tests/ppc64/power6_bcmp.vgtest.jj 2008-03-03 09:58:59.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc64/power6_bcmp.vgtest 2008-03-03 09:58:59.000000000 +0100 @@ -0,0 +1 @@ +prog: power6_bcmp --- valgrind-3.3.0/none/tests/ppc64/power6_mf_gpr.c.jj 2008-03-03 09:58:59.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc64/power6_mf_gpr.c 2008-03-03 09:58:59.000000000 +0100 @@ -0,0 +1,47 @@ +/* Copyright (C) 2007 Pete Eberlein eberlein at us.ibm.com + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307, USA. + + The GNU General Public License is contained in the file COPYING. +*/ + +#include +#include + + + +int main (int argc, char* argv[]) +{ + + long i; + double f; + + i = 0; + f = 100.0; + + printf("%lx %f\n", i, f); + + asm ("mftgpr %0, %1\n" : "=r"(i) : "f"(f)); + + f=0.0; + printf("%lx %f\n", i, f); + + asm ("mffgpr %0, %1\n" : "=f"(f) : "r"(i)); + + printf("%lx %f\n", i, f); + + return 0; +} --- valgrind-3.3.0/none/tests/ppc64/power6_mf_gpr.stderr.exp.jj 2008-03-03 09:58:59.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc64/power6_mf_gpr.stderr.exp 2008-03-03 09:58:59.000000000 +0100 @@ -0,0 +1,2 @@ + + --- valgrind-3.3.0/none/tests/ppc64/power6_mf_gpr.stdout.exp.jj 2008-03-03 09:58:59.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc64/power6_mf_gpr.stdout.exp 2008-03-03 09:58:59.000000000 +0100 @@ -0,0 +1,3 @@ +0 100.000000 +4059000000000000 0.000000 +4059000000000000 100.000000 --- valgrind-3.3.0/none/tests/ppc64/power6_mf_gpr.vgtest.jj 2008-03-03 09:58:59.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc64/power6_mf_gpr.vgtest 2008-03-03 09:58:59.000000000 +0100 @@ -0,0 +1 @@ +prog: power6_mf_gpr --- valgrind-3.3.0/none/tests/ppc32/Makefile.in.jj 2007-12-11 00:23:53.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc32/Makefile.in 2008-03-03 10:02:14.000000000 +0100 @@ -40,7 +40,8 @@ check_PROGRAMS = bug129390-ppc32$(EXEEXT ldstrev$(EXEEXT) lsw$(EXEEXT) jm-insns$(EXEEXT) \ mftocrf$(EXEEXT) mcrfs$(EXEEXT) round$(EXEEXT) \ test_fx$(EXEEXT) test_gx$(EXEEXT) testVMX$(EXEEXT) \ - twi$(EXEEXT) tw$(EXEEXT) xlc_dbl_u32$(EXEEXT) + twi$(EXEEXT) tw$(EXEEXT) xlc_dbl_u32$(EXEEXT) \ + power5+_round$(EXEEXT) power6_bcmp$(EXEEXT) subdir = none/tests/ppc32 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -71,6 +72,12 @@ mcrfs_LDADD = $(LDADD) mftocrf_SOURCES = mftocrf.c mftocrf_OBJECTS = mftocrf.$(OBJEXT) mftocrf_LDADD = $(LDADD) +power5__round_SOURCES = power5+_round.c +power5__round_OBJECTS = power5+_round.$(OBJEXT) +power5__round_LDADD = $(LDADD) +power6_bcmp_SOURCES = power6_bcmp.c +power6_bcmp_OBJECTS = power6_bcmp.$(OBJEXT) +power6_bcmp_LDADD = $(LDADD) round_SOURCES = round.c round_OBJECTS = round.$(OBJEXT) round_LDADD = $(LDADD) @@ -101,11 +108,12 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = bug129390-ppc32.c bug139050-ppc32.c jm-insns.c ldstrev.c \ - lsw.c mcrfs.c mftocrf.c round.c testVMX.c test_fx.c test_gx.c \ - tw.c twi.c xlc_dbl_u32.c + lsw.c mcrfs.c mftocrf.c power5+_round.c power6_bcmp.c round.c \ + testVMX.c test_fx.c test_gx.c tw.c twi.c xlc_dbl_u32.c DIST_SOURCES = bug129390-ppc32.c bug139050-ppc32.c jm-insns.c \ - ldstrev.c lsw.c mcrfs.c mftocrf.c round.c testVMX.c test_fx.c \ - test_gx.c tw.c twi.c xlc_dbl_u32.c + ldstrev.c lsw.c mcrfs.c mftocrf.c power5+_round.c \ + power6_bcmp.c round.c testVMX.c test_fx.c test_gx.c tw.c twi.c \ + xlc_dbl_u32.c ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -266,7 +275,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ testVMX.stderr.exp testVMX.stdout.exp testVMX.vgtest \ twi.stderr.exp twi.stdout.exp twi.vgtest \ tw.stderr.exp tw.stdout.exp tw.vgtest \ - xlc_dbl_u32.stderr.exp xlc_dbl_u32.stdout.exp xlc_dbl_u32.vgtest + xlc_dbl_u32.stderr.exp xlc_dbl_u32.stdout.exp xlc_dbl_u32.vgtest \ + power5+_round.stderr.exp power5+_round.stdout.exp power5+_round.vgtest \ + power6_bcmp.stderr.exp power6_bcmp.stdout.exp power6_bcmp.vgtest AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -I$(top_srcdir)/include \ @FLAG_M32@ @@ -335,6 +346,12 @@ mcrfs$(EXEEXT): $(mcrfs_OBJECTS) $(mcrfs mftocrf$(EXEEXT): $(mftocrf_OBJECTS) $(mftocrf_DEPENDENCIES) @rm -f mftocrf$(EXEEXT) $(LINK) $(mftocrf_LDFLAGS) $(mftocrf_OBJECTS) $(mftocrf_LDADD) $(LIBS) +power5+_round$(EXEEXT): $(power5__round_OBJECTS) $(power5__round_DEPENDENCIES) + @rm -f power5+_round$(EXEEXT) + $(LINK) $(power5__round_LDFLAGS) $(power5__round_OBJECTS) $(power5__round_LDADD) $(LIBS) +power6_bcmp$(EXEEXT): $(power6_bcmp_OBJECTS) $(power6_bcmp_DEPENDENCIES) + @rm -f power6_bcmp$(EXEEXT) + $(LINK) $(power6_bcmp_LDFLAGS) $(power6_bcmp_OBJECTS) $(power6_bcmp_LDADD) $(LIBS) round$(EXEEXT): $(round_OBJECTS) $(round_DEPENDENCIES) @rm -f round$(EXEEXT) $(LINK) $(round_LDFLAGS) $(round_OBJECTS) $(round_LDADD) $(LIBS) @@ -370,6 +387,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lsw.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mcrfs.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mftocrf.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/power5+_round.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/power6_bcmp.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/round.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testVMX-testVMX.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_fx.Po at am__quote@ --- valgrind-3.3.0/none/tests/ppc64/Makefile.in.jj 2007-12-11 00:23:55.000000000 +0100 +++ valgrind-3.3.0/none/tests/ppc64/Makefile.in 2008-03-03 10:02:14.000000000 +0100 @@ -37,7 +37,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = jm-insns$(EXEEXT) lsw$(EXEEXT) round$(EXEEXT) \ - std_reg_imm$(EXEEXT) twi_tdi$(EXEEXT) tw_td$(EXEEXT) + std_reg_imm$(EXEEXT) twi_tdi$(EXEEXT) tw_td$(EXEEXT) \ + power6_bcmp$(EXEEXT) power6_mf_gpr$(EXEEXT) subdir = none/tests/ppc64 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -53,6 +54,12 @@ jm_insns_LDADD = $(LDADD) lsw_SOURCES = lsw.c lsw_OBJECTS = lsw.$(OBJEXT) lsw_LDADD = $(LDADD) +power6_bcmp_SOURCES = power6_bcmp.c +power6_bcmp_OBJECTS = power6_bcmp.$(OBJEXT) +power6_bcmp_LDADD = $(LDADD) +power6_mf_gpr_SOURCES = power6_mf_gpr.c +power6_mf_gpr_OBJECTS = power6_mf_gpr.$(OBJEXT) +power6_mf_gpr_LDADD = $(LDADD) round_SOURCES = round.c round_OBJECTS = round.$(OBJEXT) round_LDADD = $(LDADD) @@ -73,9 +80,10 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = jm-insns.c lsw.c round.c std_reg_imm.c tw_td.c twi_tdi.c -DIST_SOURCES = jm-insns.c lsw.c round.c std_reg_imm.c tw_td.c \ - twi_tdi.c +SOURCES = jm-insns.c lsw.c power6_bcmp.c power6_mf_gpr.c round.c \ + std_reg_imm.c tw_td.c twi_tdi.c +DIST_SOURCES = jm-insns.c lsw.c power6_bcmp.c power6_mf_gpr.c round.c \ + std_reg_imm.c tw_td.c twi_tdi.c ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -226,7 +235,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ std_reg_imm.vgtest std_reg_imm.stderr.exp std_reg_imm.stdout.exp \ round.stderr.exp round.stdout.exp round.vgtest \ twi_tdi.stderr.exp twi_tdi.stdout.exp twi_tdi.vgtest \ - tw_td.stderr.exp tw_td.stdout.exp tw_td.vgtest + tw_td.stderr.exp tw_td.stdout.exp tw_td.vgtest \ + power6_bcmp.stderr.exp power6_bcmp.stdout.exp power6_bcmp.vgtest \ + power6_mf_gpr.stderr.exp power6_mf_gpr.stdout.exp power6_mf_gpr.vgtest AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -I$(top_srcdir)/include \ @FLAG_M64@ @@ -277,6 +288,12 @@ jm-insns$(EXEEXT): $(jm_insns_OBJECTS) $ lsw$(EXEEXT): $(lsw_OBJECTS) $(lsw_DEPENDENCIES) @rm -f lsw$(EXEEXT) $(LINK) $(lsw_LDFLAGS) $(lsw_OBJECTS) $(lsw_LDADD) $(LIBS) +power6_bcmp$(EXEEXT): $(power6_bcmp_OBJECTS) $(power6_bcmp_DEPENDENCIES) + @rm -f power6_bcmp$(EXEEXT) + $(LINK) $(power6_bcmp_LDFLAGS) $(power6_bcmp_OBJECTS) $(power6_bcmp_LDADD) $(LIBS) +power6_mf_gpr$(EXEEXT): $(power6_mf_gpr_OBJECTS) $(power6_mf_gpr_DEPENDENCIES) + @rm -f power6_mf_gpr$(EXEEXT) + $(LINK) $(power6_mf_gpr_LDFLAGS) $(power6_mf_gpr_OBJECTS) $(power6_mf_gpr_LDADD) $(LIBS) round$(EXEEXT): $(round_OBJECTS) $(round_DEPENDENCIES) @rm -f round$(EXEEXT) $(LINK) $(round_LDFLAGS) $(round_OBJECTS) $(round_LDADD) $(LIBS) @@ -298,6 +315,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/jm_insns-jm-insns.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lsw.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/power6_bcmp.Po at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/power6_mf_gpr.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/round.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/std_reg_imm.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tw_td.Po at am__quote@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/valgrind/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2007 12:24:25 -0000 1.12 +++ .cvsignore 3 Mar 2008 12:58:38 -0000 1.13 @@ -1 +1 @@ -valgrind-3.2.3.tar.bz2 +valgrind-3.3.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/valgrind/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2007 12:24:25 -0000 1.12 +++ sources 3 Mar 2008 12:58:38 -0000 1.13 @@ -1 +1 @@ -978847992b136c8d8cb5c6559a91df1c valgrind-3.2.3.tar.bz2 +e5fc39755a714f36b7e5014c1c6d4748 valgrind-3.3.0.tar.bz2 Index: valgrind.spec =================================================================== RCS file: /cvs/pkgs/rpms/valgrind/devel/valgrind.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- valgrind.spec 19 Feb 2008 05:43:22 -0000 1.54 +++ valgrind.spec 3 Mar 2008 12:58:38 -0000 1.55 @@ -1,18 +1,14 @@ Summary: Tool for finding memory management bugs in programs Name: valgrind -Version: 3.2.3 -Release: 8 +Version: 3.3.0 +Release: 1 Epoch: 1 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2 -Patch1: valgrind-3.2.3-openat.patch -Patch2: valgrind-3.2.3-cachegrind-improvements.patch -Patch3: valgrind-3.2.3-pkg-config.patch -Patch4: valgrind-3.2.3-glibc2_6.patch -Patch5: valgrind-3.2.3-io_destroy.patch -Patch6: valgrind-3.2.3-power5+-6.patch -Patch7: valgrind-3.2.3-private-futex.patch -Patch8: valgrind-3.2.3-x86_64-nops.patch -Patch9: valgrind-3.2.3-glibc2_7.patch +Patch1: valgrind-3.3.0-cachegrind-improvements.patch +Patch2: valgrind-3.3.0-pkg-config.patch +Patch3: valgrind-3.3.0-power5+-6.patch +Patch4: valgrind-3.3.0-openat.patch +Patch5: valgrind-3.3.0-helgrind-p_b_w.patch License: GPLv2 URL: http://www.valgrind.org/ Group: Development/Debuggers @@ -22,8 +18,24 @@ # Ensure glibc{,-devel} is installed for both multilib arches BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so %endif -BuildRequires: glibc-devel >= 2.5 +BuildRequires: glibc-devel >= 2.7 ExclusiveArch: %{ix86} x86_64 ppc ppc64 +%ifarch %{ix86} +%define valarch x86 +%define valsecarch %{nil} +%endif +%ifarch x86_64 +%define valarch amd64 +%define valsecarch x86 +%endif +%ifarch ppc +%define valarch ppc32 +%define valsecarch ppc64 +%endif +%ifarch ppc64 +%define valarch ppc64 +%define valsecarch ppc32 +%endif # Disable build root strip policy %define __spec_install_post /usr/lib/rpm/brp-compress || : @@ -39,6 +51,15 @@ detect a lot of problems that are otherwise very hard to find/diagnose. +%package devel +Summary: Development files for valgrind +Group: Development/Debuggers +Requires: valgrind = %{epoch}:%{version}-%{release} + +%description devel +Header files and libraries for development of valgrind aware programs +or valgrind plugins. + %prep %setup -q %patch1 -p1 @@ -46,10 +67,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %build %ifarch x86_64 ppc64 @@ -64,7 +81,7 @@ # Force a specific set of default suppressions echo -n > default.supp -for file in glibc-2.7.supp xfree-4.supp ; do +for file in xfree-4.supp glibc-2.34567-NPTL-helgrind.supp glibc-2.7.supp; do cat $file >> default.supp done @@ -109,18 +126,13 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/valgrind/* docs.installed/ rm -f docs.installed/*.ps -%ifarch x86_64 -rm -rf $RPM_BUILD_ROOT%{_libdir}/valgrind/x86-linux -ln -sf ../../lib/valgrind/x86-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/x86-linux -%endif - -%ifarch ppc64 -rm -rf $RPM_BUILD_ROOT%{_libdir}/valgrind/ppc32-linux -ln -sf ../../lib/valgrind/ppc32-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/ppc32-linux -%endif - +%if "%{valsecarch}" != "" %ifarch ppc -ln -sf ../../lib64/valgrind/ppc64-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/ppc64-linux +ln -sf ../../lib64/valgrind/%{valsecarch}-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/%{valsecarch}-linux +%else +rm -rf $RPM_BUILD_ROOT%{_libdir}/valgrind/%{valsecarch}-linux || : +ln -sf ../../lib/valgrind/%{valsecarch}-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/%{valsecarch}-linux +%endif %endif %clean @@ -131,14 +143,28 @@ %doc ACKNOWLEDGEMENTS COPYING NEWS README_* %doc docs.installed/html docs.installed/*.pdf %{_bindir}/* +%dir %{_libdir}/valgrind +%dir %{_libdir}/valgrind/%{valarch}-linux +%if "%{valsecarch}" != "" +%{_libdir}/valgrind/%{valsecarch}-linux +%endif +%{_libdir}/valgrind/%{valarch}-linux/*[^a] +%{_libdir}/valgrind/%{valarch}-linux/*[^.]a +%{_libdir}/valgrind/*.supp +%{_mandir}/man1/valgrind* + +%files devel +%defattr(-,root,root) %{_includedir}/valgrind -%{_libdir}/valgrind +%dir %{_libdir}/valgrind +%dir %{_libdir}/valgrind/%{valarch}-linux +%{_libdir}/valgrind/%{valarch}-linux/*.a %{_libdir}/pkgconfig/* -%{_mandir}/man1/valgrind* %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 1:3.2.3-8 -- Autorebuild for GCC 4.3 +* Mon Mar 3 2008 Jakub Jelinek 3.3.0-1 +- update to 3.3.0 +- split off devel bits into valgrind-devel subpackage * Thu Oct 18 2007 Jakub Jelinek 3.2.3-7 - add suppressions for glibc >= 2.7 --- valgrind-3.2.3-cachegrind-improvements.patch DELETED --- --- valgrind-3.2.3-glibc2_6.patch DELETED --- --- valgrind-3.2.3-glibc2_7.patch DELETED --- --- valgrind-3.2.3-io_destroy.patch DELETED --- --- valgrind-3.2.3-openat.patch DELETED --- --- valgrind-3.2.3-pkg-config.patch DELETED --- --- valgrind-3.2.3-power5+-6.patch DELETED --- --- valgrind-3.2.3-private-futex.patch DELETED --- --- valgrind-3.2.3-x86_64-nops.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 13:00:33 2008 From: fedora-extras-commits at redhat.com (Michal Schmidt (michich)) Date: Mon, 3 Mar 2008 13:00:33 GMT Subject: rpms/jabbim/devel .cvsignore, 1.5, 1.6 jabbim.spec, 1.12, 1.13 sources, 1.12, 1.13 Message-ID: <200803031300.m23D0XVo021320@cvs-int.fedora.redhat.com> Author: michich Update of /cvs/pkgs/rpms/jabbim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21283 Modified Files: .cvsignore jabbim.spec sources Log Message: * Mon Mar 3 2008 Michal Schmidt - 0.4-0.1.20080303svn - Upstream SVN revision 2369. - Upgrading from 0.3 should be without problems (old copies of plugins in ~/.jabbim/plugins are harmless, config settings are preserved, archive is converted). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Jan 2008 09:58:22 -0000 1.5 +++ .cvsignore 3 Mar 2008 12:59:53 -0000 1.6 @@ -1 +1 @@ -jabbim-0.3.tgz +jabbim-svn.tar.bz2 Index: jabbim.spec =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jabbim.spec 19 Jan 2008 09:58:22 -0000 1.12 +++ jabbim.spec 3 Mar 2008 12:59:53 -0000 1.13 @@ -1,13 +1,15 @@ Name: jabbim -Version: 0.3 -Release: 1%{?dist} +Version: 0.4 +Release: 0.1.20080303svn%{?dist} Summary: Jabber client for mere mortals Group: Applications/Internet License: GPLv2+ URL: http://dev.jabbim.cz/jabbim -# Downloaded from HanzZ's jdisk: http://disk.jabbim.cz/pyjim at jabber.cz/jabbim-0.3.tgz -Source0: jabbim-0.3.tgz +# The source was obtained from upstream SVN repository: +# svn export -r 2369 svn://dev.jabbim.cz/jabbim/trunk jabbim-svn +# tar -cjf jabbim-svn.tar.bz2 jabbim-svn/ +Source0: jabbim-svn.tar.bz2 Source1: jabbim.in BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,7 +35,7 @@ %prep -%setup -q +%setup -q -n jabbim-svn # fill in the template for the starting script sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim @@ -50,11 +52,21 @@ mkdir -p %{buildroot}/%{_bindir} install -p -m 755 jabbim %{buildroot}/%{_bindir}/jabbim rm jabbim +install -p -m 755 plugins/remote/jabbim_remote.py %{buildroot}/%{_bindir}/jabbim_remote +rm plugins/remote/jabbim_remote.py # remove the files which are not useful for end-users # and files which upstream forgot to remove -rm jabbim.sh +rm jabbim.sh jabbim.pro epydoc.cfg test.py gui-test.py +rm locales/jabbim_{cs,en,sk,pl,fr}.ts rm images/32x32/status/rsvg2png.sh +rm themes/web2/style.css~ +rm plugins/dcoper/cs.qm +find plugins -name '*.ts' | xargs rm +# XXX: what about 'scalable' dir? +find images -name '*.svg' | xargs rm + +chmod +x plugins/format/{textile,markdown}.py mkdir -p %{buildroot}/%{jabbimdata} # take everything else upstream ships @@ -93,6 +105,7 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING %{_bindir}/jabbim +%{_bindir}/jabbim_remote %{_datadir}/applications/fedora-jabbim.desktop %{_datadir}/icons/hicolor/*/apps/jabbim.png %{_datadir}/pixmaps/jabbim.png @@ -100,6 +113,12 @@ %changelog +* Mon Mar 3 2008 Michal Schmidt - 0.4-0.1.20080303svn +- Upstream SVN revision 2369. +- Upgrading from 0.3 should be without problems (old copies of plugins + in ~/.jabbim/plugins are harmless, config settings are preserved, + archive is converted). + * Thu Jan 17 2008 Michal Schmidt - 0.3-1 - Upstream release 0.3 "PERUN". Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 19 Jan 2008 09:58:22 -0000 1.12 +++ sources 3 Mar 2008 12:59:53 -0000 1.13 @@ -1 +1 @@ -bd2dd704a6ef1b3799185c2e467aa08b jabbim-0.3.tgz +d4b5e625976b732450a57ee98d9902ae jabbim-svn.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 13:02:50 2008 From: fedora-extras-commits at redhat.com (Karel Zak (kzak)) Date: Mon, 3 Mar 2008 13:02:50 GMT Subject: rpms/gnome-applet-vm/devel .cvsignore, 1.7, 1.8 gnome-applet-vm.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200803031302.m23D2odN028538@cvs-int.fedora.redhat.com> Author: kzak Update of /cvs/pkgs/rpms/gnome-applet-vm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28504 Modified Files: .cvsignore gnome-applet-vm.spec sources Log Message: * Mon Mar 3 2008 Karel Zak 0.2.0-1 - upgrade to 0.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Apr 2007 12:37:29 -0000 1.7 +++ .cvsignore 3 Mar 2008 13:02:13 -0000 1.8 @@ -1 +1 @@ -gnome-applet-vm-0.1.2.tar.bz2 +gnome-applet-vm-0.2.0.tar.bz2 Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnome-applet-vm.spec 19 Feb 2008 10:33:17 -0000 1.16 +++ gnome-applet-vm.spec 3 Mar 2008 13:02:13 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Simple virtual domains monitor which embeds itself in the GNOME panel Name: gnome-applet-vm -Version: 0.1.2 -Release: 3%{?dist} +Version: 0.2.0 +Release: 1%{?dist} %define upstreamname %{name}-%{version} License: GPL Group: User Interface/Desktops @@ -19,7 +19,6 @@ %define libglade_version 2.4.0 BuildRequires: libvirt-devel -BuildRequires: xen-devel BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} @@ -30,13 +29,13 @@ BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: dbus-devel BuildRequires: dbus-glib-devel -BuildRequires: libtool autoconf gettext +BuildRequires: autoconf gettext BuildRequires: gnome-doc-utils BuildRequires: perl-XML-Parser BuildRequires: pkgconfig +BuildRequires: libxml2-devel Requires: gtk2 >= %{gtk2_version} -Requires: xen Requires: libvirt Requires: gnome-panel >= %{gnome_panel_version} Requires: usermode @@ -46,8 +45,8 @@ Requires(postun): /sbin/ldconfig %description -The gnome-applet-vm is GNOME panel applet for monitoring and controlling -locally-running virtual machines. +The gnome-applet-vm is GNOME panel applet for monitoring and controlling +virtual machines. %prep %setup -q -n %{upstreamname} @@ -68,6 +67,7 @@ # userhelper mkdir -p $RPM_BUILD_ROOT/%{_bindir} ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/vm_applet_wrapper +rm -rf $RPM_BUILD_ROOT/ChangeLog %clean rm -rf $RPM_BUILD_ROOT @@ -79,12 +79,12 @@ export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` /usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/vm-applet.schemas > /dev/null -%postun +%postun /sbin/ldconfig %files %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%doc AUTHORS COPYING NEWS README %{_datadir}/pixmaps %{_datadir}/gnome-2.0/ui/* %{_datadir}/gnome/help/* @@ -98,6 +98,9 @@ %config %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog +* Mon Mar 3 2008 Karel Zak 0.2.0-1 +- upgrade to 0.2.0 + * Tue Feb 19 2008 Fedora Release Engineering - 0.1.2-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 16 Apr 2007 12:37:29 -0000 1.8 +++ sources 3 Mar 2008 13:02:13 -0000 1.9 @@ -1 +1 @@ -3201335d63b1ed3c089df9ab2aec443f gnome-applet-vm-0.1.2.tar.bz2 +bc4c7814d9659b544f3ac9d60926ec9d gnome-applet-vm-0.2.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 13:26:03 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Mon, 3 Mar 2008 13:26:03 GMT Subject: rpms/ocamldsort/F-8 ocamldsort.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803031326.m23DQ3v0029022@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocamldsort/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28954/F-8 Modified Files: .cvsignore sources Added Files: ocamldsort.spec Log Message: Initial CVS import. --- NEW FILE ocamldsort.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocamldsort Version: 0.14.4 Release: 2%{?dist} Summary: Dependency sorter for OCaml source files Group: Development/Libraries License: GPLv2+ URL: http://dimitri.mutu.net/ocaml.html Source0: ftp://quatramaran.ens.fr/pub/ara/ocamldsort/ocamldsort-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel %description The ocamldsort command scans a set of Objective Caml source files (.ml and .mli files), sorts them according to their dependencies and prints the sorted files in order to link their corresponding .cmo files. For ocamldsort to work it must get a list of dependencies generated by ocamldep, if the standard input to ocamldsort has been redirected then ocamldsort assumes that this is a dependency file generated by ocamldep. Otherwise ocamldsort calls ocamldep to generate the dependency list itself. In either case the source files to be sorted should be given as arguments to the ocamldsort command. %prep %setup -q # The configure script for this package contains some mistakes # but they don't affect building. ./configure --libdir=%{_libdir} %build make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 %if %opt install -m 0755 ocamldsort.opt $RPM_BUILD_ROOT%{_bindir}/ocamldsort %else install -m 0755 ocamldsort $RPM_BUILD_ROOT%{_bindir} %endif strip $RPM_BUILD_ROOT%{_bindir}/ocamldsort gzip ocamldsort.1 install -m 0644 ocamldsort.1.gz $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_bindir}/ocamldsort %{_mandir}/man1/ocamldsort.1.gz %changelog * Sat Mar 1 2008 Richard W.M. Jones - 0.14.4-2 - Add missing BR ocaml-camlp4-devel and test in mock. * Sun Feb 24 2008 Richard W.M. Jones - 0.14.4-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocamldsort/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2008 16:47:43 -0000 1.1 +++ .cvsignore 3 Mar 2008 13:25:26 -0000 1.2 @@ -0,0 +1 @@ +ocamldsort-0.14.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocamldsort/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 16:47:43 -0000 1.1 +++ sources 3 Mar 2008 13:25:26 -0000 1.2 @@ -0,0 +1 @@ +9651d6afb204c0b22cd69be8a847e1d4 ocamldsort-0.14.4.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 13:26:28 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Mon, 3 Mar 2008 13:26:28 GMT Subject: rpms/lftp/devel lftp.spec,1.68,1.69 Message-ID: <200803031326.m23DQSlC029091@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/lftp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28990 Modified Files: lftp.spec Log Message: * Thu Feb 28 2008 Martin Nagy - 3.6.3-2 - fix rpath Index: lftp.spec =================================================================== RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- lftp.spec 25 Feb 2008 09:40:18 -0000 1.68 +++ lftp.spec 3 Mar 2008 13:25:47 -0000 1.69 @@ -1,13 +1,13 @@ -Summary: A sophisticated file transfer program -Name: lftp -Version: 3.6.3 -Release: 1%{?dist} -License: GPLv2+ -Group: Applications/Internet -Source0: ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz -URL: http://lftp.yar.ru/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel, gettext +Summary: A sophisticated file transfer program +Name: lftp +Version: 3.6.3 +Release: 2%{?dist} +License: GPLv2+ +Group: Applications/Internet +Source0: ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz +URL: http://lftp.yar.ru/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel, gettext %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job @@ -17,16 +17,17 @@ %prep %setup -q +sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure +sed -i.norpath -e \ + '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib64 |' \ + configure %build if pkg-config openssl ; then CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS fi -%configure --with-modules --disable-static --with-openssl=/usr --with-debug --disable-rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -export tagname=CC +%configure --with-modules --disable-static --with-openssl=%{_prefix} --with-debug make %{?_smp_mflags} %install @@ -39,8 +40,6 @@ iconv -f ISO88591 -t UTF8 NEWS -o NEWS.tmp touch -r NEWS NEWS.tmp mv -f NEWS.tmp NEWS -mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d -echo "%{_libdir}/lftp/%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf # Remove files from $RPM_BUILD_ROOT that we aren't shipping. rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.*a @@ -78,9 +77,11 @@ %{_libdir}/lftp/%{version}/liblftp-getdate.so %{_libdir}/liblftp-jobs* %{_libdir}/liblftp-tasks* -%config /etc/ld.so.conf.d/* %changelog +* Thu Feb 28 2008 Martin Nagy - 3.6.3-2 +- fix rpath + * Mon Feb 25 2008 Martin Nagy - 3.6.3-1 - update to newest version - remove patches fixed in upstream: progress_overflow, empty_argument @@ -124,7 +125,7 @@ * Thu Jan 18 2007 Maros Barabas - 3.5.9 - Upgrade to 3.5.9 from upstream -* Wed Aug 23 2006 Maros Barabas - 3.5.1-2 +* Wed Aug 23 2006 Maros Barabas - 3.5.1-2 - remove .a & .la from libdir * Mon Jul 17 2006 Jason Vas Dias - 3.5.1-1.fc6 From fedora-extras-commits at redhat.com Mon Mar 3 13:27:02 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Mon, 3 Mar 2008 13:27:02 GMT Subject: rpms/ocamldsort/devel ocamldsort.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803031327.m23DR2cN029146@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocamldsort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29080/devel Modified Files: .cvsignore sources Added Files: ocamldsort.spec Log Message: Initial CVS import. --- NEW FILE ocamldsort.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocamldsort Version: 0.14.4 Release: 2%{?dist} Summary: Dependency sorter for OCaml source files Group: Development/Libraries License: GPLv2+ URL: http://dimitri.mutu.net/ocaml.html Source0: ftp://quatramaran.ens.fr/pub/ara/ocamldsort/ocamldsort-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel %description The ocamldsort command scans a set of Objective Caml source files (.ml and .mli files), sorts them according to their dependencies and prints the sorted files in order to link their corresponding .cmo files. For ocamldsort to work it must get a list of dependencies generated by ocamldep, if the standard input to ocamldsort has been redirected then ocamldsort assumes that this is a dependency file generated by ocamldep. Otherwise ocamldsort calls ocamldep to generate the dependency list itself. In either case the source files to be sorted should be given as arguments to the ocamldsort command. %prep %setup -q # The configure script for this package contains some mistakes # but they don't affect building. ./configure --libdir=%{_libdir} %build make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 %if %opt install -m 0755 ocamldsort.opt $RPM_BUILD_ROOT%{_bindir}/ocamldsort %else install -m 0755 ocamldsort $RPM_BUILD_ROOT%{_bindir} %endif strip $RPM_BUILD_ROOT%{_bindir}/ocamldsort gzip ocamldsort.1 install -m 0644 ocamldsort.1.gz $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_bindir}/ocamldsort %{_mandir}/man1/ocamldsort.1.gz %changelog * Sat Mar 1 2008 Richard W.M. Jones - 0.14.4-2 - Add missing BR ocaml-camlp4-devel and test in mock. * Sun Feb 24 2008 Richard W.M. Jones - 0.14.4-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocamldsort/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2008 16:47:43 -0000 1.1 +++ .cvsignore 3 Mar 2008 13:26:26 -0000 1.2 @@ -0,0 +1 @@ +ocamldsort-0.14.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocamldsort/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2008 16:47:43 -0000 1.1 +++ sources 3 Mar 2008 13:26:26 -0000 1.2 @@ -0,0 +1 @@ +9651d6afb204c0b22cd69be8a847e1d4 ocamldsort-0.14.4.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 13:28:39 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Mon, 3 Mar 2008 13:28:39 GMT Subject: rpms/ocamldsort/devel ocamldsort.spec,1.1,1.2 Message-ID: <200803031328.m23DSdEY029248@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocamldsort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29220 Modified Files: ocamldsort.spec Log Message: * Mon Mar 3 2008 Richard W.M. Jones - 0.14.4-3 - Rebuild for ppc64. Index: ocamldsort.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocamldsort/devel/ocamldsort.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocamldsort.spec 3 Mar 2008 13:26:26 -0000 1.1 +++ ocamldsort.spec 3 Mar 2008 13:28:06 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocamldsort Version: 0.14.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dependency sorter for OCaml source files Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://dimitri.mutu.net/ocaml.html Source0: ftp://quatramaran.ens.fr/pub/ara/ocamldsort/ocamldsort-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel @@ -73,6 +72,9 @@ %changelog +* Mon Mar 3 2008 Richard W.M. Jones - 0.14.4-3 +- Rebuild for ppc64. + * Sat Mar 1 2008 Richard W.M. Jones - 0.14.4-2 - Add missing BR ocaml-camlp4-devel and test in mock. From fedora-extras-commits at redhat.com Mon Mar 3 13:30:34 2008 From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie)) Date: Mon, 3 Mar 2008 13:30:34 GMT Subject: rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-fr.patch, NONE, 1.1 xkeyboard-config-olpc-it.patch, NONE, 1.1 xkeyboard-config.spec, 1.19, 1.20 Message-ID: <200803031330.m23DUY1V029359@cvs-int.fedora.redhat.com> Author: bernie Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29327 Modified Files: xkeyboard-config.spec Added Files: xkeyboard-config-olpc-fr.patch xkeyboard-config-olpc-it.patch Log Message: * Mon Mar 03 2008 Bernardo Innocenti 1.1-11.20071130cvs - Add xkeyboard-config-olpc-fr.patch - Add xkeyboard-config-olpc-it.patch xkeyboard-config-olpc-fr.patch: --- NEW FILE xkeyboard-config-olpc-fr.patch --- Index: symbols/fr =================================================================== RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/fr,v retrieving revision 1.17 diff -u -p -r1.17 fr --- symbols/fr 2 Jan 2008 21:21:43 -0000 1.17 +++ symbols/fr 29 Feb 2008 13:45:41 -0000 @@ -755,3 +755,10 @@ xkb_symbols "geo" { }; +// OLPC Section +xkb_symbols "olpc" { + + include "basic" + + key { [ 3, slash, ograve, Ograve ] }; +}; Index: rules/base.lists.part =================================================================== RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.lists.part,v retrieving revision 1.58 diff -u -p -r1.58 base.lists.part --- rules/base.lists.part 4 Feb 2008 23:28:42 -0000 1.58 +++ rules/base.lists.part 3 Mar 2008 07:24:14 -0000 @@ -15,7 +15,7 @@ ! $pcgeometries = abnt2 latitude jp106 kr106 // Layouts that provide further specializations for the OLPC -! $olpclayouts = af am ara br es et kh kz in mn np ru th tr us +! $olpclayouts = af am ara br es et fr kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 ! $maclaptop = ibook powerbook macbook78 macbook79 xkeyboard-config-olpc-it.patch: --- NEW FILE xkeyboard-config-olpc-it.patch --- Index: rules/base.lists.part =================================================================== RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.lists.part,v retrieving revision 1.59 diff -u -p -u -p -r1.59 base.lists.part --- rules/base.lists.part 1 Mar 2008 21:01:56 -0000 1.59 +++ rules/base.lists.part 3 Mar 2008 13:19:36 -0000 @@ -15,7 +15,7 @@ ! $pcgeometries = abnt2 latitude jp106 kr106 // Layouts that provide further specializations for the OLPC -! $olpclayouts = af am ara br es et fr kh kz in mn np ru th tr us +! $olpclayouts = af am ara br es et fr it kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 ! $maclaptop = ibook powerbook macbook78 macbook79 Index: symbols/it =================================================================== RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/it,v retrieving revision 1.12 diff -u -p -u -p -r1.12 it --- symbols/it 4 Sep 2007 06:39:22 -0000 1.12 +++ symbols/it 3 Mar 2008 13:19:36 -0000 @@ -153,3 +153,13 @@ xkb_symbols "geo" { }; +// OLPC Section +xkb_symbols "olpc" { + + include "basic" + + key { [ igrave, asciicircum, asciitilde, dead_tilde ] }; + key { [ ugrave, section, Egrave, dead_breve ] }; + key { [ less, greater, guillemotleft, guillemotright ] }; +}; + Index: xkeyboard-config.spec =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xkeyboard-config.spec 7 Feb 2008 19:18:31 -0000 1.19 +++ xkeyboard-config.spec 3 Mar 2008 13:29:56 -0000 1.20 @@ -5,7 +5,7 @@ Summary: xkeyboard-config alternative xkb data files Name: xkeyboard-config Version: 1.1 -Release: 11.%{cvsdate}%{?dist} +Release: 12.%{cvsdate}%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -26,6 +26,8 @@ Patch10: xkeyboard-config-olpc-misc.patch Patch11: xkeyboard-config-olpc-af-AE09.patch Patch12: xkeyboard-config-olpc-kh-olpc-section-add.patch +Patch13: xkeyboard-config-olpc-fr.patch +Patch14: xkeyboard-config-olpc-it.patch BuildArch: noarch @@ -67,6 +69,8 @@ %patch10 -p0 -b .misc %patch11 -p0 -b .ae09 %patch12 -p0 -b .kh +%patch13 -p0 -b .fr +%patch14 -p0 -b .it %build %configure \ @@ -106,6 +110,10 @@ %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Mon Mar 03 2008 Bernardo Innocenti 1.1-11.20071130cvs +- Add xkeyboard-config-olpc-fr.patch +- Add xkeyboard-config-olpc-it.patch + * Thu Feb 07 2008 Dennis Gilmore 1.1-11.20071130cvs - add patches from arjs for http://dev.laptop.org/ticket/6159 From fedora-extras-commits at redhat.com Mon Mar 3 13:36:09 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Mon, 3 Mar 2008 13:36:09 GMT Subject: rpms/ocaml-dbus/devel ocaml-dbus-no-fail-unknown-type.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 ocaml-dbus.spec, 1.3, 1.4 sources, 1.3, 1.4 ocaml-dbus-example_avahi.ml, 1.1, NONE ocaml-dbus-object-path.patch, 1.1, NONE ocaml-dbus-string-of-ty.patch, 1.1, NONE Message-ID: <200803031336.m23Da9gi029574@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-dbus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29531/devel Modified Files: .cvsignore ocaml-dbus.spec sources Added Files: ocaml-dbus-no-fail-unknown-type.patch Removed Files: ocaml-dbus-example_avahi.ml ocaml-dbus-object-path.patch ocaml-dbus-string-of-ty.patch Log Message: * Mon Mar 3 2008 Richard W.M. Jones - 0.05-1 - New upstream release 0.05. - Include 'THANKS' file in doc. ocaml-dbus-no-fail-unknown-type.patch: --- NEW FILE ocaml-dbus-no-fail-unknown-type.patch --- Index: dbus_stubs.c =================================================================== RCS file: /home/remote/rjones/cvsroot/redhat/ocaml_dbus/dbus_stubs.c,v retrieving revision 1.6 diff -u -r1.6 dbus_stubs.c --- dbus_stubs.c 3 Mar 2008 13:16:12 -0000 1.6 +++ dbus_stubs.c 3 Mar 2008 13:19:43 -0000 @@ -13,6 +13,7 @@ * Dbus binding */ +#include #include #include #include @@ -726,8 +727,9 @@ break; } default: - caml_failwith("unexpected type in message"); - r = Val_int(0); + fprintf (stderr, "unknown message type: %d (%c)\n", + c_type, c_type); + r = Val_int (0); /* Unknown */ break; } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Feb 2008 14:25:19 -0000 1.3 +++ .cvsignore 3 Mar 2008 13:35:33 -0000 1.4 @@ -1 +1 @@ -ocaml_dbus-0.04.tar.bz2 +ocaml_dbus-0.05.tar.bz2 Index: ocaml-dbus.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/ocaml-dbus.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ocaml-dbus.spec 1 Mar 2008 08:46:01 -0000 1.3 +++ ocaml-dbus.spec 3 Mar 2008 13:35:33 -0000 1.4 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-dbus -Version: 0.04 -Release: 2%{?dist} +Version: 0.05 +Release: 1%{?dist} Summary: OCaml library for using D-Bus Group: Development/Libraries @@ -12,9 +12,7 @@ Source0: http://tab.snarc.org/download/ocaml/ocaml_dbus-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: ocaml-dbus-string-of-ty.patch -Patch1: ocaml-dbus-object-path.patch -Source1: ocaml-dbus-example_avahi.ml +Patch0: ocaml-dbus-no-fail-unknown-type.patch BuildRequires: ocaml >= 3.10.0-7, ocaml-findlib BuildRequires: dbus-devel @@ -43,8 +41,6 @@ %prep %setup -q -n ocaml_dbus-%{version} %patch0 -p0 -%patch1 -p0 -cp %{SOURCE1} example_avahi.ml %build @@ -91,7 +87,7 @@ %files devel %defattr(-,root,root,-) -%doc README example_avahi.ml +%doc README THANKS example_avahi.ml %if %opt %{_libdir}/ocaml/dbus/*.a %{_libdir}/ocaml/dbus/*.cmxa @@ -101,6 +97,10 @@ %changelog +* Mon Mar 3 2008 Richard W.M. Jones - 0.05-1 +- New upstream release 0.05. +- Include 'THANKS' file in doc. + * Sat Mar 1 2008 Richard W.M. Jones - 0.04-2 - Rebuild for ppc64. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Feb 2008 14:25:19 -0000 1.3 +++ sources 3 Mar 2008 13:35:33 -0000 1.4 @@ -1 +1 @@ -736b11fa87655f23ea63d94f89573a74 ocaml_dbus-0.04.tar.bz2 +88fa86074ba4d14c5be75f1cfd991fd3 ocaml_dbus-0.05.tar.bz2 --- ocaml-dbus-example_avahi.ml DELETED --- --- ocaml-dbus-object-path.patch DELETED --- --- ocaml-dbus-string-of-ty.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 13:39:14 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 13:39:14 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.x-kcontrol-crash.patch, NONE, 1.1 kdebase-workspace.spec, 1.41, 1.42 Message-ID: <200803031339.m23DdEjA029710@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29665 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.x-kcontrol-crash.patch Log Message: apply upstream patch to fix crash in khotkeys kdebase-workspace-4.0.x-kcontrol-crash.patch: --- NEW FILE kdebase-workspace-4.0.x-kcontrol-crash.patch --- Index: workspace/khotkeys/kcontrol/condition_list_widget.cpp =================================================================== --- workspace/khotkeys/kcontrol/condition_list_widget.cpp (Revision 781668) +++ workspace/khotkeys/kcontrol/condition_list_widget.cpp (Revision 781669) @@ -226,10 +226,14 @@ } void Condition_list_widget::delete_pressed() +{ + if ( selected_item ) { - conditions.remove( selected_item->condition()); // we own it - delete selected_item; // CHECKME snad vyvola signaly pro enable() + conditions.remove( selected_item->condition()); // we own it + delete selected_item; // CHECKME snad vyvola signaly pro enable() + selected_item = NULL; } +} void Condition_list_widget::modify_pressed() { Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- kdebase-workspace.spec 29 Feb 2008 22:05:31 -0000 1.41 +++ kdebase-workspace.spec 3 Mar 2008 13:38:38 -0000 1.42 @@ -6,7 +6,7 @@ Name: kdebase-workspace Version: 4.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -18,6 +18,8 @@ # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu) # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886 Patch3: kdebase-workspace-4.0.2-kde#155362.patch +# upstream patch +Patch4: kdebase-workspace-4.0.x-kcontrol-crash.patch # upgrade path for former kde-redhat'ers Obsoletes: kdebase-kdm < 6:%{version}-%{release} @@ -105,7 +107,7 @@ # ConsoleKit support for KDM (#228111, kde#147790) %patch2 -p1 -b .consolekit %patch3 -p1 -b .kde#155362 - +%patch4 -p0 -b .kcontrol-crash %build @@ -218,6 +220,9 @@ %changelog +* Mon Mar 03 2008 Than Ngo 4.0.2-3 +- apply upstream patch to fix crash in khotkeys + * Fri Feb 29 2008 Kevin Kofler 4.0.2-2 - drop upstreamed kde#155974 patch - update kde#155362 patch From fedora-extras-commits at redhat.com Mon Mar 3 13:41:27 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Mon, 3 Mar 2008 13:41:27 GMT Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.169, 1.170 Message-ID: <200803031341.m23DfRut029795@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29728 Modified Files: system-config-printer.spec Log Message: * Mon Mar 3 2008 Tim Waugh - Requires /usr/bin/system-install-packages not pirut (bug #435622). Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- system-config-printer.spec 19 Feb 2008 17:31:29 -0000 1.169 +++ system-config-printer.spec 3 Mar 2008 13:40:45 -0000 1.170 @@ -28,7 +28,7 @@ Requires: usermode >= 1.94 Requires: desktop-file-utils >= 0.2.92 Requires: dbus-x11 -Requires: pirut +Requires: /usr/bin/system-install-packages Requires: system-config-printer-libs = %{version}-%{release} Requires: gnome-icon-theme Requires: gnome-python2 @@ -131,6 +131,9 @@ exit 0 %changelog +* Mon Mar 3 2008 Tim Waugh +- Requires /usr/bin/system-install-packages not pirut (bug #435622). + * Tue Feb 19 2008 Tim Waugh 0.7.82-1 - Updated to pycups-1.9.35. - 0.7.82: From fedora-extras-commits at redhat.com Mon Mar 3 13:47:16 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 13:47:16 GMT Subject: rpms/kdebase/F-7 kdebase-3.5-khotkeys-crash.patch, NONE, 1.1 kdebase.spec, 1.272, 1.273 Message-ID: <200803031347.m23DlGSj029938@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29906 Modified Files: kdebase.spec Added Files: kdebase-3.5-khotkeys-crash.patch Log Message: apply upstream patch to fix crash in khotkey kdebase-3.5-khotkeys-crash.patch: --- NEW FILE kdebase-3.5-khotkeys-crash.patch --- Index: khotkeys/kcontrol/condition_list_widget.cpp =================================================================== --- khotkeys/kcontrol/condition_list_widget.cpp (Revision 781669) +++ khotkeys/kcontrol/condition_list_widget.cpp (Revision 781670) @@ -221,10 +221,14 @@ } void Condition_list_widget::delete_pressed() +{ + if ( selected_item ) { - conditions.remove( selected_item->condition()); // we own it - delete selected_item; // CHECKME snad vyvola signaly pro enable() + conditions.remove( selected_item->condition()); // we own it + delete selected_item; // CHECKME snad vyvola signaly pro enable() + selected_item = NULL; } +} void Condition_list_widget::modify_pressed() { Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-7/kdebase.spec,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- kdebase.spec 28 Feb 2008 18:26:26 -0000 1.272 +++ kdebase.spec 3 Mar 2008 13:46:36 -0000 1.273 @@ -85,6 +85,7 @@ # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch Patch200: kdebase-3.5.7-kde#83974.patch Patch201: kdebase-3.5.9-lmsensors.patch +Patch202: kdebase-3.5-khotkeys-crash.patch # security fixes @@ -297,6 +298,7 @@ ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch #patch200 -p4 -b .kde#83974 %patch201 -p0 -b .sensor +%patch202 -p0 -b .khotkeys-crash %if "%{name}" != "kdebase" # hacks to omit stuff that doesn't support DO_NOT_COMPILE @@ -795,6 +797,7 @@ %changelog * Thu Feb 28 2008 Than Ngo 3.5.9-3 - apply upstream patch to unbreak lmsensors support again +- apply upstream patch to fix crash in khotkey * Wed Feb 27 2008 Rex Dieter - 3.5.9-2 - f9+: don't omit all of khelpcenter, some is needed for kde3 apps' help From fedora-extras-commits at redhat.com Mon Mar 3 13:47:58 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Mon, 3 Mar 2008 13:47:58 GMT Subject: rpms/iptables/devel iptables-1.4.0-in6_u.patch, NONE, 1.1 iptables.spec, 1.65, 1.66 Message-ID: <200803031347.m23Dlwc2029994@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29937 Modified Files: iptables.spec Added Files: iptables-1.4.0-in6_u.patch Log Message: - use s6_addr32 instead of in6_u.u6_addr32 iptables-1.4.0-in6_u.patch: --- NEW FILE iptables-1.4.0-in6_u.patch --- diff -up iptables-1.4.0/ip6tables.c.in6_u iptables-1.4.0/ip6tables.c --- iptables-1.4.0/ip6tables.c.in6_u 2008-03-03 14:33:30.000000000 +0100 +++ iptables-1.4.0/ip6tables.c 2008-03-03 14:38:54.000000000 +0100 @@ -678,7 +678,7 @@ parse_hostnetworkmask(const char *name, for (i = 0, j = 0; i < n; i++) { int k; for (k = 0; k < 4; k++) - addrp[j].in6_u.u6_addr32[k] &= maskp->in6_u.u6_addr32[k]; + addrp[j].s6_addr32[k] &= maskp->s6_addr32[k]; j++; for (k = 0; k < j - 1; k++) { if (IN6_ARE_ADDR_EQUAL(&addrp[k], &addrp[j - 1])) { diff -up iptables-1.4.0/libiptc/libip6tc.c.in6_u iptables-1.4.0/libiptc/libip6tc.c --- iptables-1.4.0/libiptc/libip6tc.c.in6_u 2008-03-03 14:33:31.000000000 +0100 +++ iptables-1.4.0/libiptc/libip6tc.c 2008-03-03 14:33:31.000000000 +0100 @@ -113,7 +113,7 @@ typedef unsigned int socklen_t; #include "libiptc.c" #define BIT6(a, l) \ - ((ntohl(a->in6_u.u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) + ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) int ipv6_prefix_length(const struct in6_addr *a) Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- iptables.spec 3 Mar 2008 11:07:40 -0000 1.65 +++ iptables.spec 3 Mar 2008 13:47:25 -0000 1.66 @@ -11,6 +11,7 @@ Patch0: iptables-1.3.8-iptc.patch Patch4: iptables-1.3.8-typo_latter.patch Patch5: iptables-1.4.0-cloexec.patch +Patch6: iptables-1.4.0-in6_u.patch Group: System Environment/Base URL: http://www.netfilter.org/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -60,6 +61,7 @@ %patch0 -p1 -b .iptc %patch4 -p1 -b .typo_latter %patch5 -p1 -b .cloexec +%patch6 -p1 -b .in6_u # Put it to a reasonable place find . -type f -exec perl -pi -e "s,/usr/local,%{_prefix},g" {} \; @@ -164,6 +166,7 @@ * Mon Mar 3 2008 Thomas Woerner 1.4.0-3 - use the kernel headers from the build tree for iptables for now to be able to compile this package, but this makes the package more kernel dependant +- use s6_addr32 instead of in6_u.u6_addr32 * Wed Feb 20 2008 Fedora Release Engineering - 1.4.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 13:50:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:50:16 +0000 Subject: [pkgdb] gperf ownership updated Message-ID: <200803031351.m23Dp6qD026808@bastion.fedora.phx.redhat.com> Package gperf in Fedora devel was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 13:50:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:50:56 +0000 Subject: [pkgdb] mingetty ownership updated Message-ID: <200803031351.m23DpdgR026835@bastion.fedora.phx.redhat.com> Package mingetty in Fedora devel was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 13:51:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:51:08 +0000 Subject: [pkgdb] PyXML ownership updated Message-ID: <200803031351.m23DpdgT026835@bastion.fedora.phx.redhat.com> Package PyXML in Fedora devel was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyXML From fedora-extras-commits at redhat.com Mon Mar 3 13:51:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:51:14 +0000 Subject: [pkgdb] time ownership updated Message-ID: <200803031352.m23Dq45W026883@bastion.fedora.phx.redhat.com> Package time in Fedora devel was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/time From fedora-extras-commits at redhat.com Mon Mar 3 13:51:32 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 13:51:32 GMT Subject: rpms/kdebase/F-8 kdebase-3.5-khotkeys-crash.patch, NONE, 1.1 kdebase.spec, 1.289, 1.290 Message-ID: <200803031351.m23DpWE0030102@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30060 Modified Files: kdebase.spec Added Files: kdebase-3.5-khotkeys-crash.patch Log Message: - apply upstream patch to fix crash in khotkey kdebase-3.5-khotkeys-crash.patch: --- NEW FILE kdebase-3.5-khotkeys-crash.patch --- Index: khotkeys/kcontrol/condition_list_widget.cpp =================================================================== --- khotkeys/kcontrol/condition_list_widget.cpp (Revision 781669) +++ khotkeys/kcontrol/condition_list_widget.cpp (Revision 781670) @@ -221,10 +221,14 @@ } void Condition_list_widget::delete_pressed() +{ + if ( selected_item ) { - conditions.remove( selected_item->condition()); // we own it - delete selected_item; // CHECKME snad vyvola signaly pro enable() + conditions.remove( selected_item->condition()); // we own it + delete selected_item; // CHECKME snad vyvola signaly pro enable() + selected_item = NULL; } +} void Condition_list_widget::modify_pressed() { Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-8/kdebase.spec,v retrieving revision 1.289 retrieving revision 1.290 diff -u -r1.289 -r1.290 --- kdebase.spec 28 Feb 2008 18:26:31 -0000 1.289 +++ kdebase.spec 3 Mar 2008 13:50:55 -0000 1.290 @@ -85,6 +85,7 @@ # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch Patch200: kdebase-3.5.7-kde#83974.patch Patch201: kdebase-3.5.9-lmsensors.patch +Patch202: kdebase-3.5-khotkeys-crash.patch # security fixes @@ -297,6 +298,7 @@ ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch #patch200 -p4 -b .kde#83974 %patch201 -p0 -b .sensor +%patch202 -p0 -b .khotkeys-crash %if "%{name}" != "kdebase" # hacks to omit stuff that doesn't support DO_NOT_COMPILE @@ -795,6 +797,7 @@ %changelog * Thu Feb 28 2008 Than Ngo 3.5.9-3 - apply upstream patch to unbreak lmsensors support again +- apply upstream patch to fix crash in khotkey * Wed Feb 27 2008 Rex Dieter - 3.5.9-2 - f9+: don't omit all of khelpcenter, some is needed for kde3 apps' help From fedora-extras-commits at redhat.com Mon Mar 3 13:53:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:53:25 +0000 Subject: [pkgdb] PyXML ownership updated Message-ID: <200803031354.m23DsFEm026997@bastion.fedora.phx.redhat.com> Package PyXML in Fedora 7 was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyXML From fedora-extras-commits at redhat.com Mon Mar 3 13:53:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:53:31 +0000 Subject: [pkgdb] PyXML ownership updated Message-ID: <200803031354.m23DsLOk027023@bastion.fedora.phx.redhat.com> Package PyXML in Fedora 8 was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyXML From fedora-extras-commits at redhat.com Mon Mar 3 13:53:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:53:50 +0000 Subject: [pkgdb] time ownership updated Message-ID: <200803031354.m23DsFEo026997@bastion.fedora.phx.redhat.com> Package time in Fedora 7 was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/time From fedora-extras-commits at redhat.com Mon Mar 3 13:53:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:53:51 +0000 Subject: [pkgdb] time ownership updated Message-ID: <200803031354.m23DsLOm027023@bastion.fedora.phx.redhat.com> Package time in Fedora 8 was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/time From fedora-extras-commits at redhat.com Mon Mar 3 13:54:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:54:09 +0000 Subject: [pkgdb] gperf ownership updated Message-ID: <200803031355.m23DsFEq026997@bastion.fedora.phx.redhat.com> Package gperf in Fedora 7 was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 13:54:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:54:20 +0000 Subject: [pkgdb] gperf ownership updated Message-ID: <200803031355.m23Dt3Ss027132@bastion.fedora.phx.redhat.com> Package gperf in Fedora 8 was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 13:54:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:54:41 +0000 Subject: [pkgdb] mingetty ownership updated Message-ID: <200803031355.m23DsLOo027023@bastion.fedora.phx.redhat.com> Package mingetty in Fedora 8 was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 13:54:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:54:46 +0000 Subject: [pkgdb] mingetty ownership updated Message-ID: <200803031355.m23DsLOr027023@bastion.fedora.phx.redhat.com> Package mingetty in Fedora OLPC 2 was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 13:55:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 13:55:29 +0000 Subject: [pkgdb] mingetty ownership updated Message-ID: <200803031356.m23DuKPX027247@bastion.fedora.phx.redhat.com> Package mingetty in Fedora 7 was orphaned by Florian La Roche (laroche) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 13:56:29 2008 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Mon, 3 Mar 2008 13:56:29 GMT Subject: rpms/mgopen-fonts/devel mgopen-fonts.spec,1.6,1.7 Message-ID: <200803031356.m23DuTur030244@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30211 Modified Files: mgopen-fonts.spec Log Message: - Drop ancient Conflicts < fontconfig-2.3.93 - Convert LICENCE file to UTF-8 - Fix License description to Bitstream Vera - Spec cleanup Index: mgopen-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mgopen-fonts/devel/mgopen-fonts.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mgopen-fonts.spec 10 Feb 2008 16:30:50 -0000 1.6 +++ mgopen-fonts.spec 3 Mar 2008 13:55:53 -0000 1.7 @@ -1,22 +1,24 @@ +%define fontname mgopen +%define fontdir %{_datadir}/fonts/%{fontname} +%define fontconfdir %{_sysconfdir}/fonts/conf.d %define archivename MgOpen -%define fontdir %{_datadir}/fonts/mgopen %define upstream_date 20050515 -Name: mgopen-fonts +Name: %{fontname}-fonts Version: 0.%{upstream_date} -Release: 6%{?dist} +Release: 7%{?dist} Summary: Truetype greek fonts Group: User Interface/X -License: Redistributable, with restrictions +License: Bitstream Vera URL: http://www.ellak.gr/fonts/mgopen/ Source0: %{archivename}-%{upstream_date}.tar.gz # Upstream tarball is not versioned http://www.ellak.gr/fonts/mgopen/files/%{archivename}.tar.gz Source1: %{archivename}-%{upstream_date}-doc.tar.gz # Tarball of the documentation on the site http://www.ellak.gr/fonts/mgopen/ # The LICENCE file is an excerpt from the html page -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch -Conflicts: fontconfig < 2.3.93 +# Conflicts: fontconfig < 2.3.93 %description @@ -27,28 +29,29 @@ %prep %setup -q -c -a1 -n %{archivename}-%{version} +iconv -f ISO-8859-1 -t UTF-8 LICENCE > LICENCE.tmp; mv LICENCE.tmp LICENCE %build %install -/bin/rm -rf $RPM_BUILD_ROOT -install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} -install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} +rm -rf %{buildroot} +install -d -m 0755 %{buildroot}%{fontdir} +install -m 0644 *.ttf %{buildroot}%{fontdir} %clean -/bin/rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{_datadir}/fonts + %{_bindir}/fc-cache -r %{fontdir} || : fi %postun if [ "$1" = "0" ]; then if [ -x %{_bindir}/fc-cache ]; then - %{_bindir}/fc-cache %{_datadir}/fonts + %{_bindir}/fc-cache -f %{fontdir} || : fi fi @@ -61,7 +64,13 @@ %changelog -* Sun Feb 10 2008 Sarantis Paskalis +* Mon Mar 3 2008 Sarantis Paskalis 0.20050515-7 +- Drop ancient Conflicts < fontconfig-2.3.93 +- Convert LICENCE file to UTF-8 +- Fix License description to Bitstream Vera +- Spec cleanup + +* Sun Feb 10 2008 Sarantis Paskalis 0.20050515-6 - rebuilt for GCC 4.3 as requested by Fedora Release Engineering * Tue Aug 29 2006 Sarantis Paskalis 0.20050515-5 From fedora-extras-commits at redhat.com Mon Mar 3 13:57:38 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Mon, 3 Mar 2008 13:57:38 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch, 1.1, 1.2 Message-ID: <200803031357.m23Dvcx4030313@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30285 Modified Files: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch Log Message: reverse logic openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch: Index: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch 26 Feb 2008 09:04:10 -0000 1.1 +++ openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch 3 Mar 2008 13:57:33 -0000 1.2 @@ -7,7 +7,7 @@ -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "cupsPrintFile( %s, %s, %s, %d, %p ) returns %d\n", + static const char* pEnv = getenv( "SAL_DEBUG_CUPS" ); -+ if( ! pEnv || ! *pEnv ) ++ if( pEnv && *pEnv ) + { + fprintf( stderr, "cupsPrintFile( %s, %s, %s, %d, %p ) returns %d\n", pDest->name, From fedora-extras-commits at redhat.com Mon Mar 3 14:00:54 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Mon, 3 Mar 2008 14:00:54 GMT Subject: rpms/coreutils/devel coreutils-6.10-verbose.patch, NONE, 1.1 coreutils.spec, 1.195, 1.196 Message-ID: <200803031400.m23E0s8v030418@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30388 Modified Files: coreutils.spec Added Files: coreutils-6.10-verbose.patch Log Message: upstream consolidation: verbose outputs should be on stdout if possible coreutils-6.10-verbose.patch: --- NEW FILE coreutils-6.10-verbose.patch --- diff --git a/doc/coreutils.texi b/doc/coreutils.texi index df6792d..e3a0d50 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -2838,7 +2838,7 @@ Use digits in suffixes rather than lower-case letters. @itemx --verbose @opindex --verbose -Write a diagnostic to standard error just before each output file is opened. +Write a diagnostic just before each output file is opened. @end table @@ -8190,7 +8190,7 @@ If a file has multiple links, only the named links will be removed. @itemx --verbose @opindex -v @opindex --verbose -Display status updates as sterilization proceeds. +Display to standard error status updates as sterilization proceeds. @item -x @itemx --exact diff --git a/src/install.c b/src/install.c index db08751..95e37fc 100644 --- a/src/install.c +++ b/src/install.c @@ -1,5 +1,5 @@ /* install - copy files and set attributes - Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation, Inc. + Copyright (C) 89, 90, 91, 1995-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -762,7 +762,7 @@ announce_mkdir (char const *dir, void *options) { struct cp_options const *x = options; if (x->verbose) - error (0, 0, _("creating directory %s"), quote (dir)); + printf (_("%s: creating directory %s\n"), program_name, quote (dir)); } /* Make ancestor directory DIR, whose last file name component is diff --git a/src/rmdir.c b/src/rmdir.c index bb1a0c8..609c387 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -1,6 +1,6 @@ /* rmdir -- remove directories - Copyright (C) 90, 91, 1995-2002, 2004, 2005, 2006, 2007 Free Software + Copyright (C) 90, 91, 1995-2002, 2004-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -134,7 +134,7 @@ remove_parents (char *dir) /* Give a diagnostic for each attempted removal if --verbose. */ if (verbose) - error (0, 0, _("removing directory, %s"), quote (dir)); + printf(_("%s: removing directory, %s\n"), program_name, quote (dir)); ok = (rmdir (dir) == 0); @@ -233,7 +233,7 @@ main (int argc, char **argv) /* Give a diagnostic for each attempted removal if --verbose. */ if (verbose) - error (0, 0, _("removing directory, %s"), dir); + printf(_("%s: removing directory, %s\n"), program_name, dir); if (rmdir (dir) != 0) { diff --git a/src/mkdir.c b/src/mkdir.c index 0704077..3781065 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -1,5 +1,5 @@ /* mkdir -- make directories - Copyright (C) 90, 1995-2002, 2004-2007 Free Software Foundation, Inc. + Copyright (C) 90, 1995-2002, 2004-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -79,6 +79,19 @@ Mandatory arguments to long options are mandatory for short options too.\n\ exit (status); } +/* Verbose formatted output of variable count of arguments. */ +static void +verbose_output (FILE *fp, char const *fmt, ...) +{ + va_list ap; + fputs (program_name, fp); + fputs (": ", fp); + va_start (ap, fmt); + vfprintf (fp, fmt, ap); + va_end (ap); + fputc ('\n', fp); +} + /* Options passed to subsidiary functions. */ struct mkdir_options { @@ -105,7 +118,7 @@ announce_mkdir (char const *dir, void *options) { struct mkdir_options const *o = options; if (o->created_directory_format) - error (0, 0, o->created_directory_format, quote (dir)); + verbose_output (stdout, o->created_directory_format, quote (dir)); } /* Make ancestor directory DIR, whose last component is COMPONENT, diff --git a/src/split.c b/src/split.c index 5807a1c..f84d40e 100644 --- a/src/split.c +++ b/src/split.c @@ -1,5 +1,5 @@ /* split.c -- split a file into pieces. - Copyright (C) 1988, 1991, 1995-2007 Free Software Foundation, Inc. + Copyright (C) 1988, 1991, 1995-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -122,8 +122,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -l, --lines=NUMBER put NUMBER lines per output file\n\ "), DEFAULT_SUFFIX_LENGTH); fputs (_("\ - --verbose print a diagnostic to standard error just\n\ - before each output file is opened\n\ + --verbose print a diagnostic just before each\n\ + output file is opened\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); @@ -208,7 +208,7 @@ cwrite (bool new_file_flag, const char *bp, size_t bytes) next_file_name (); if (verbose) - fprintf (stderr, _("creating file %s\n"), quote (outfile)); + fprintf (stdout, _("creating file %s\n"), quote (outfile)); output_desc = open (outfile, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP diff --git a/tests/misc/split-a b/tests/misc/split-a index 794115f..a8eed38 100755 --- a/tests/misc/split-a +++ b/tests/misc/split-a @@ -1,7 +1,7 @@ #!/bin/sh # Show that split -a works. -# Copyright (C) 2002-2007 Free Software Foundation, Inc. +# Copyright (C) 2002-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -39,7 +39,7 @@ test -f xaz && fail=1 rm -f x* # With a longer suffix, it must succeed. -split --verbose -b 1 -a 2 in 2> err || fail=1 +split --verbose -b 1 -a 2 in > err || fail=1 test -f xaa || fail=1 test -f xaz || fail=1 test -f xba || fail=1 diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v index 2c84b41..569e9b0 100755 --- a/tests/mkdir/p-v +++ b/tests/mkdir/p-v @@ -1,7 +1,7 @@ #!/bin/sh # Test mkdir -pv. -# Copyright (C) 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2006-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ fi . $srcdir/../lang-default . $srcdir/../test-lib.sh -mkdir -pv foo/a/b/c/d 2>out || exit +mkdir -pv foo/a/b/c/d >out || exit diff - out <<\EOF mkdir: created directory `foo' Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- coreutils.spec 18 Feb 2008 14:37:04 -0000 1.195 +++ coreutils.spec 3 Mar 2008 14:00:19 -0000 1.196 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.10 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -18,6 +18,7 @@ Source203: coreutils-runuser-l.pamd # From upstream +Patch1:coreutils-6.10-verbose.patch # Our patches Patch100: coreutils-chgrp.patch @@ -95,6 +96,7 @@ cd %name-%version # From upstream +%patch1 -p1 -b .verbose # Our patches %patch100 -p1 -b .chgrp @@ -245,7 +247,7 @@ %defattr(-,root,root,-) %dir %{_datadir}/locale/*/LC_TIME %config(noreplace) %{_sysconfdir}/DIR_COLORS* -%config %{_sysconfdir}/profile.d/* +%config(noreplace) %{_sysconfdir}/profile.d/* %{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/su} %{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/su-l} %{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/runuser} @@ -291,6 +293,9 @@ /sbin/runuser %changelog +* Mon Mar 3 2008 Ondrej Vasik - 6.10-9 +- consolidation of verbose output to stdout (upstream) + * Mon Feb 18 2008 Ondrej Vasik - 6.10-8 - use default security context in install - broken by coreutils-6.10 update(#319231) From fedora-extras-commits at redhat.com Mon Mar 3 14:05:30 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 14:05:30 GMT Subject: rpms/kde-l10n/devel kde-l10n.spec,1.14,1.15 Message-ID: <200803031405.m23E5UCZ005262@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kde-l10n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5216 Modified Files: kde-l10n.spec Log Message: fix rpm file Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kde-l10n.spec 3 Mar 2008 12:56:34 -0000 1.14 +++ kde-l10n.spec 3 Mar 2008 14:04:49 -0000 1.15 @@ -1004,6 +1004,13 @@ %files LowSaxon %defattr(-,root,root) %lang(nds) %{_datadir}/locale/nds/* +%lang(nds) %{_kde4_appsdir}/lettres/nds +%lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml +%lang(nds) %{_kde4_appsdir}/khangman/nds.txt +%lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds.soundtheme +%lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds +%lang(nds) %{_kde4_appsdir}/kturtle/examples/nds +%lang(nds) %{_kde4_appsdir}/kvtml/nds %files Latvian %defattr(-,root,root) From fedora-extras-commits at redhat.com Mon Mar 3 14:09:38 2008 From: fedora-extras-commits at redhat.com (Karel Zak (kzak)) Date: Mon, 3 Mar 2008 14:09:38 GMT Subject: rpms/gnome-applet-vm/devel .cvsignore, 1.8, 1.9 gnome-applet-vm.spec, 1.17, 1.18 sources, 1.9, 1.10 Message-ID: <200803031409.m23E9cbL005448@cvs-int.fedora.redhat.com> Author: kzak Update of /cvs/pkgs/rpms/gnome-applet-vm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5394 Modified Files: .cvsignore gnome-applet-vm.spec sources Log Message: * Mon Mar 3 2008 Karel Zak 0.2.0-2 - update tarball (forgot -rc1 suffix) - fix URL and Source: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 3 Mar 2008 13:02:13 -0000 1.8 +++ .cvsignore 3 Mar 2008 14:08:54 -0000 1.9 @@ -1 +1 @@ -gnome-applet-vm-0.2.0.tar.bz2 +gnome-applet-vm-0.2.0-rc1.tar.bz2 Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnome-applet-vm.spec 3 Mar 2008 13:02:13 -0000 1.17 +++ gnome-applet-vm.spec 3 Mar 2008 14:08:54 -0000 1.18 @@ -1,13 +1,13 @@ Summary: Simple virtual domains monitor which embeds itself in the GNOME panel Name: gnome-applet-vm Version: 0.2.0 -Release: 1%{?dist} -%define upstreamname %{name}-%{version} +Release: 2%{?dist} License: GPL Group: User Interface/Desktops -Source: %{upstreamname}.tar.bz2 +%define upstreamname %{name}-%{version}-rc1 +Source: http://people.redhat.com/kzak/gnome-applet-vm/v0.2/%{upstreamname}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -URL: http://people.redhat.com/kzak/gnome-applet-vm +URL: https://fedorahosted.org/gnome-applet-vm ExclusiveArch: i386 x86_64 %define glib2_version 2.2.0 @@ -98,6 +98,10 @@ %config %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog +* Mon Mar 3 2008 Karel Zak 0.2.0-2 +- update tarball (forgot -rc1 suffix) +- fix URL and Source: + * Mon Mar 3 2008 Karel Zak 0.2.0-1 - upgrade to 0.2.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applet-vm/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 3 Mar 2008 13:02:13 -0000 1.9 +++ sources 3 Mar 2008 14:08:54 -0000 1.10 @@ -1 +1 @@ -bc4c7814d9659b544f3ac9d60926ec9d gnome-applet-vm-0.2.0.tar.bz2 +c6bf40b6830802d8d3967945b4f461a1 gnome-applet-vm-0.2.0-rc1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 14:10:06 2008 From: fedora-extras-commits at redhat.com (Karel Zak (kzak)) Date: Mon, 3 Mar 2008 14:10:06 GMT Subject: rpms/readahead/devel readahead-1.4.2-maxpath.patch, NONE, 1.1 readahead.spec, 1.42, 1.43 Message-ID: <200803031410.m23EA6eX005458@cvs-int.fedora.redhat.com> Author: kzak Update of /cvs/pkgs/rpms/readahead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5423 Modified Files: readahead.spec Added Files: readahead-1.4.2-maxpath.patch Log Message: * Mon Mar 3 2008 Karel Zak 1:1.4.2-5 - fix #434277 - readahead failed massrebuild attempt for GCC 4.3 readahead-1.4.2-maxpath.patch: --- NEW FILE readahead-1.4.2-maxpath.patch --- diff -up readahead-1.4.2/src/readahead-collector.c.maxpath readahead-1.4.2/src/readahead-collector.c --- readahead-1.4.2/src/readahead-collector.c.maxpath 2008-03-03 15:02:17.000000000 +0100 +++ readahead-1.4.2/src/readahead-collector.c 2008-03-03 15:02:06.000000000 +0100 @@ -34,6 +34,7 @@ #include #include #include +#include /* * Defauls Index: readahead.spec =================================================================== RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- readahead.spec 19 Feb 2008 10:37:01 -0000 1.42 +++ readahead.spec 3 Mar 2008 14:09:31 -0000 1.43 @@ -1,7 +1,7 @@ Summary: Read a preset list of files into memory Name: readahead Version: 1.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -19,6 +19,7 @@ Patch1: readahead-1.4.2-cleanup-ld.patch Patch2: readahead-1.4.2-null-name.patch +Patch3: readahead-1.4.2-maxpath.patch %description readahead reads the contents of a list of files into memory, @@ -32,6 +33,7 @@ %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure --sbindir=/sbin @@ -72,6 +74,9 @@ /sbin/readahead-collector %changelog +* Mon Mar 3 2008 Karel Zak 1:1.4.2-5 +- fix #434277 - readahead failed massrebuild attempt for GCC 4.3 + * Tue Feb 19 2008 Fedora Release Engineering - 1:1.4.2-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 14:14:14 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Mon, 3 Mar 2008 14:14:14 GMT Subject: rpms/shadow-utils/devel shadow-4.1.0-selinux.patch, 1.1, 1.2 shadow-utils.spec, 1.110, 1.111 Message-ID: <200803031414.m23EEE9I005701@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/shadow-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5674 Modified Files: shadow-4.1.0-selinux.patch shadow-utils.spec Log Message: fix selinux labeling (#433757) shadow-4.1.0-selinux.patch: Index: shadow-4.1.0-selinux.patch =================================================================== RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-4.1.0-selinux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- shadow-4.1.0-selinux.patch 12 Dec 2007 15:07:44 -0000 1.1 +++ shadow-4.1.0-selinux.patch 3 Mar 2008 14:14:07 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up /dev/null shadow-4.1.0/libmisc/system.c ---- /dev/null 2007-12-08 00:31:02.590331462 +0100 -+++ shadow-4.1.0/libmisc/system.c 2007-12-12 14:13:30.000000000 +0100 +diff -upb shadow-4.1.0/libmisc/system.c.selinux shadow-4.1.0/libmisc/system.c +--- shadow-4.1.0/libmisc/system.c.selinux 2008-03-03 14:18:17.000000000 +0100 ++++ shadow-4.1.0/libmisc/system.c 2008-03-03 14:18:17.000000000 +0100 @@ -0,0 +1,37 @@ +#include + @@ -39,21 +39,9 @@ + exit (-1); +} + -diff -up shadow-4.1.0/libmisc/copydir.c.selinux shadow-4.1.0/libmisc/copydir.c ---- shadow-4.1.0/libmisc/copydir.c.selinux 2007-11-11 00:45:59.000000000 +0100 -+++ shadow-4.1.0/libmisc/copydir.c 2007-12-12 14:13:30.000000000 +0100 -@@ -54,7 +54,7 @@ struct link_name { - static struct link_name *links; - - #ifdef WITH_SELINUX --static int selinux_file_context (const char *dst_name) -+int selinux_file_context (const char *dst_name) - { - security_context_t scontext = NULL; - -diff -up shadow-4.1.0/libmisc/Makefile.am.selinux shadow-4.1.0/libmisc/Makefile.am +diff -upb shadow-4.1.0/libmisc/Makefile.am.selinux shadow-4.1.0/libmisc/Makefile.am --- shadow-4.1.0/libmisc/Makefile.am.selinux 2007-11-23 10:15:48.000000000 +0100 -+++ shadow-4.1.0/libmisc/Makefile.am 2007-12-12 14:13:30.000000000 +0100 ++++ shadow-4.1.0/libmisc/Makefile.am 2008-03-03 14:18:17.000000000 +0100 @@ -42,6 +42,7 @@ libmisc_a_SOURCES = \ setugid.c \ setupenv.c \ @@ -62,139 +50,208 @@ strtoday.c \ sub.c \ sulog.c \ -diff -up shadow-4.1.0/src/useradd.c.selinux shadow-4.1.0/src/useradd.c ---- shadow-4.1.0/src/useradd.c.selinux 2007-12-12 14:11:41.000000000 +0100 -+++ shadow-4.1.0/src/useradd.c 2007-12-12 14:24:12.000000000 +0100 -@@ -100,6 +100,7 @@ static const char *user_comment = ""; - static const char *user_home = ""; - static const char *user_shell = ""; - static const char *create_mail_spool = ""; -+static const char *user_selinux = ""; +diff -upb shadow-4.1.0/libmisc/copydir.c.selinux shadow-4.1.0/libmisc/copydir.c +--- shadow-4.1.0/libmisc/copydir.c.selinux 2007-11-11 00:45:59.000000000 +0100 ++++ shadow-4.1.0/libmisc/copydir.c 2008-03-03 14:19:01.000000000 +0100 +@@ -54,7 +54,7 @@ struct link_name { + static struct link_name *links; - static long user_expire = -1; - static int is_shadow_pwd; -@@ -170,6 +171,7 @@ static int set_defaults (void); - static int get_groups (char *); - static void usage (void); - static void new_pwent (struct passwd *); -+static void selinux_update_mapping (void); + #ifdef WITH_SELINUX +-static int selinux_file_context (const char *dst_name) ++int selinux_file_context (const char *dst_name) + { + security_context_t scontext = NULL; - static long scale_age (long); - static void new_spent (struct spwd *); -@@ -356,6 +358,7 @@ static void get_defaults (void) - def_create_mail_spool = xstrdup (cp); +@@ -199,7 +199,7 @@ int copy_tree (const char *src_root, con + if (strlen (src_root) + strlen (ent->d_name) + 2 > + sizeof src_name) { + err++; +- break; ++ break; } + snprintf (src_name, sizeof src_name, "%s/%s", src_root, + ent->d_name); +@@ -207,7 +207,7 @@ int copy_tree (const char *src_root, con + if (strlen (dst_root) + strlen (ent->d_name) + 2 > + sizeof dst_name) { + err++; +- break; ++ break; + } + snprintf (dst_name, sizeof dst_name, "%s/%s", dst_root, + ent->d_name); +@@ -313,7 +313,7 @@ int copy_tree (const char *src_root, con + if (mknod (dst_name, sb.st_mode & ~07777, sb.st_rdev) + || chown (dst_name, + uid == (uid_t) - 1 ? sb.st_uid : uid, +- gid == (gid_t) - 1 ? sb.st_gid : gid) ++ gid == (gid_t) - 1 ? sb.st_gid : gid) + || chmod (dst_name, sb.st_mode & 07777)) { + err++; + break; +@@ -363,6 +363,10 @@ int copy_tree (const char *src_root, con + src_orig = 0; + dst_orig = 0; } -+ fclose(fp); - } - - /* -@@ -644,6 +647,10 @@ static void usage (void) - " account\n" - " -s, --shell SHELL the login shell for the new user account\n" - " -u, --uid UID force use the UID for the new user account\n" +#ifdef WITH_SELINUX -+ " -Z, --selinux-user SEUSER use a specific SEUSER for the SELinux user mapping\n" ++ /* Reset SELinux to create files with default contexts */ ++ setfscreatecon (NULL); +#endif -+ - "\n")); - exit (E_USAGE); + return err ? -1 : 0; } -@@ -1030,11 +1037,18 @@ static void process_flags (int argc, cha - {"non-unique", no_argument, NULL, 'o'}, - {"password", required_argument, NULL, 'p'}, - {"shell", required_argument, NULL, 's'}, -+#ifdef WITH_SELINUX -+ {"selinux-user", required_argument, NULL, 'Z'}, -+#endif - {"uid", required_argument, NULL, 'u'}, - {NULL, 0, NULL, '\0'} - }; - while ((c = + +diff -upb shadow-4.1.0/man/usermod.8.xml.selinux shadow-4.1.0/man/usermod.8.xml +--- shadow-4.1.0/man/usermod.8.xml.selinux 2007-12-09 00:24:36.000000000 +0100 ++++ shadow-4.1.0/man/usermod.8.xml 2008-03-03 14:18:17.000000000 +0100 +@@ -245,6 +245,19 @@ + + + ++ ++ ++ , ++ SEUSER ++ ++ ++ ++ The SELinux user for the user's login. The default is to leave this ++ field the blank, which causes the system to select the default ++ SELinux user. ++ ++ ++ + + + +diff -upb shadow-4.1.0/man/useradd.8.selinux shadow-4.1.0/man/useradd.8 +--- shadow-4.1.0/man/useradd.8.selinux 2008-03-03 14:14:45.000000000 +0100 ++++ shadow-4.1.0/man/useradd.8 2008-03-03 14:18:17.000000000 +0100 +@@ -163,6 +163,11 @@ doesn\'t work yet\. + Allow the creation of a user account with a duplicate (non\-unique) UID\. + .RE + .PP ++\fB\-Z\fR, \fB\-\-selinux-user\fR \fISEUSER\fR ++.RS 4 ++The SELinux user for the user\'s login\. The default is to leave this field blank, which causes the system to select the default SELinux user\. ++.RE ++.PP + \fB\-p\fR, \fB\-\-password\fR \fIPASSWORD\fR + .RS 4 + The encrypted password, as returned by +diff -upb shadow-4.1.0/man/usermod.8.selinux shadow-4.1.0/man/usermod.8 +--- shadow-4.1.0/man/usermod.8.selinux 2007-12-10 00:07:16.000000000 +0100 ++++ shadow-4.1.0/man/usermod.8 2008-03-03 14:18:17.000000000 +0100 +@@ -133,6 +133,11 @@ Note: if you wish to unlock the account + value from + \fI/etc/default/useradd\fR)\. + .RE ++.PP ++\fB\-Z\fR, \fB\-\-selinux-user\fR \fISEUSER\fR ++.RS 4 ++The SELinux user for the user\'s login\. The default is to leave this field blank, which causes the system to select the default SELinux user. ++.RE + .SH "CAVEATS" + .PP + +diff -upb shadow-4.1.0/man/useradd.8.xml.selinux shadow-4.1.0/man/useradd.8.xml +--- shadow-4.1.0/man/useradd.8.xml.selinux 2007-12-09 00:24:36.000000000 +0100 ++++ shadow-4.1.0/man/useradd.8.xml 2008-03-03 14:18:17.000000000 +0100 +@@ -273,6 +273,19 @@ + between 0 and 999 are typically reserved for system accounts. + + ++ ++ ++ ++ , ++ SEUSER ++ ++ ++ ++ The SELinux user for the user's login. The default is to leave this ++ field blank, which causes the system to select the default SELinux ++ user. ++ ++ + + + +@@ -346,7 +359,7 @@ + + + +- ++ + + + +@@ -399,7 +412,7 @@ + + + FILES +- ++ + + /etc/passwd + +diff -upb shadow-4.1.0/lib/prototypes.h.selinux shadow-4.1.0/lib/prototypes.h +--- shadow-4.1.0/lib/prototypes.h.selinux 2007-11-23 21:10:52.000000000 +0100 ++++ shadow-4.1.0/lib/prototypes.h 2008-03-03 14:18:17.000000000 +0100 +@@ -53,6 +53,9 @@ extern int is_listed (const char *, cons + /* copydir.c */ + extern int copy_tree (const char *, const char *, uid_t, gid_t); + extern int remove_tree (const char *); +#ifdef WITH_SELINUX -+ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:Z:", -+#else - getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:", ++extern int selinux_file_context (const char *dst_name); +#endif - long_options, NULL)) != -1) { - switch (c) { - case 'b': -@@ -1215,6 +1229,17 @@ static void process_flags (int argc, cha - case 'M': - Mflg++; - break; -+#ifdef WITH_SELINUX -+ case 'Z': -+ if (is_selinux_enabled() > 0) -+ user_selinux = optarg; -+ else { -+ fprintf (stderr,_("%s: -Z requires SELinux enabled kernel\n"), Prog); + + /* encrypt.c */ + extern char *pw_encrypt (const char *, const char *); +@@ -151,6 +154,9 @@ extern void setup_env (struct passwd *); + /* shell.c */ + extern int shell (const char *, const char *, char *const *); + ++/* system.c */ ++extern int safe_system(const char *command, const char *argv[], const char *env[], int ignore_stderr); + -+ exit (E_BAD_ARG); -+ } -+ break; + /* strtoday.c */ + extern long strtoday (const char *); + +diff -upb shadow-4.1.0/lib/defines.h.selinux shadow-4.1.0/lib/defines.h +--- shadow-4.1.0/lib/defines.h.selinux 2007-11-24 12:18:35.000000000 +0100 ++++ shadow-4.1.0/lib/defines.h 2008-03-03 14:18:17.000000000 +0100 +@@ -342,4 +342,7 @@ extern char *strerror (); + #include + #endif + ++#ifdef WITH_SELINUX ++#include +#endif - default: - usage (); - } -@@ -1583,6 +1608,33 @@ static void usr_update (void) - grp_update (); - } + #endif /* _DEFINES_H_ */ +diff -upb shadow-4.1.0/src/userdel.c.selinux shadow-4.1.0/src/userdel.c +--- shadow-4.1.0/src/userdel.c.selinux 2007-11-24 23:41:19.000000000 +0100 ++++ shadow-4.1.0/src/userdel.c 2008-03-03 14:18:17.000000000 +0100 +@@ -809,6 +809,17 @@ int main (int argc, char **argv) + #endif + } -+static void selinux_update_mapping () { -+ +#ifdef WITH_SELINUX -+ if (is_selinux_enabled() <= 0) return; -+ -+ if (*user_selinux) { /* must be done after passwd write() */ -+ const char *argv[7]; ++ if (is_selinux_enabled() > 0) { ++ const char *argv[5]; + argv[0] = "/usr/sbin/semanage"; + argv[1] = "login"; -+ argv[2] = "-a"; -+ argv[3] = "-s"; -+ argv[4] = user_selinux; -+ argv[5] = user_name; -+ argv[6] = NULL; -+ if (safe_system(argv[0], argv, NULL, 0)) { -+ fprintf (stderr, -+ _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"), -+ Prog, user_name, user_selinux); -+#ifdef WITH_AUDIT -+ audit_logger (AUDIT_USER_CHAUTHTOK, Prog, -+ "adding SELinux user mapping", user_name, user_id, 0); ++ argv[2] = "-d"; ++ argv[3] = user_name; ++ argv[4] = NULL; ++ safe_system(argv[0], argv, NULL, 1); ++ } +#endif -+ } -+ } -+#endif -+ -+} - /* - * create_home - create the user's home directory - * -@@ -1592,7 +1644,11 @@ static void usr_update (void) - */ - static void create_home (void) - { -+ - if (access (user_home, F_OK)) { -+#ifdef WITH_SELINUX -+ selinux_file_context (user_home); -+#endif - /* XXX - create missing parent directories. --marekm */ - if (mkdir (user_home, 0)) { - fprintf (stderr, -@@ -1818,6 +1874,8 @@ int main (int argc, char **argv) - - usr_update (); - -+ selinux_update_mapping(); -+ - if (mflg) { - create_home (); - if (home_added) -diff -up shadow-4.1.0/src/usermod.c.selinux shadow-4.1.0/src/usermod.c + /* + * Cancel any crontabs or at jobs. Have to do this before we remove + * the entry from /etc/passwd. +diff -upb shadow-4.1.0/src/usermod.c.selinux shadow-4.1.0/src/usermod.c --- shadow-4.1.0/src/usermod.c.selinux 2007-11-24 23:41:19.000000000 +0100 -+++ shadow-4.1.0/src/usermod.c 2007-12-12 14:21:44.000000000 +0100 ++++ shadow-4.1.0/src/usermod.c 2008-03-03 14:18:17.000000000 +0100 @@ -90,6 +90,7 @@ static char *user_comment; static char *user_home; static char *user_newhome; @@ -211,6 +268,21 @@ static void new_spent (struct spwd *); static void fail_exit (int); +@@ -250,12 +252,12 @@ static int get_groups (char *list) + #endif + + if (ngroups == sys_ngroups) { +- fprintf (stderr, ++ fprintf (stderr, + _ + ("%s: too many groups specified (max %d).\n"), + Prog, ngroups); + break; +- } ++ } + + /* + * Add the group name to the user's list of groups. @@ -302,6 +304,9 @@ static void usage (void) " -s, --shell SHELL new login shell for the user account\n" " -u, --uid UID new UID for the user account\n" @@ -221,6 +293,33 @@ "\n")); exit (E_USAGE); } +@@ -332,7 +337,7 @@ static char *new_pw_passwd (char *pw_pas + "You should set a password with usermod -p to unlock this user account.\n"), + Prog); + return pw_pass; +- } ++ } + + #ifdef WITH_AUDIT + audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "updating password", +@@ -405,7 +410,7 @@ static void new_pwent (struct passwd *pw + #else + pwent->pw_gecos = user_comment; + #endif +- } ++ } + + if (dflg) { + #ifdef WITH_AUDIT +@@ -826,7 +831,7 @@ static void process_flags (int argc, cha + user_comment = xstrdup (pwd->pw_gecos); + user_home = xstrdup (pwd->pw_dir); + user_shell = xstrdup (pwd->pw_shell); +- } ++ } + #ifdef WITH_AUDIT + user_newname = user_name; + user_newid = user_id; @@ -888,13 +893,20 @@ static void process_flags (int argc, cha {"move-home", no_argument, NULL, 'm'}, {"non-unique", no_argument, NULL, 'o'}, @@ -242,6 +341,15 @@ long_options, NULL)) != -1) { switch (c) { case 'a': +@@ -966,7 +978,7 @@ static void process_flags (int argc, cha + fprintf (stderr, + _("%s: unknown group %s\n"), + Prog, optarg); +- exit (E_NOTFOUND); ++ exit (E_NOTFOUND); + } + user_newgid = grp->gr_gid; + gflg++; @@ -1028,6 +1040,16 @@ static void process_flags (int argc, cha case 'U': Uflg++; @@ -259,6 +367,15 @@ default: usage (); } +@@ -1040,7 +1062,7 @@ static void process_flags (int argc, cha + exit (E_USAGE); + } + if (!is_shadow_pwd && (eflg || fflg)) { +- fprintf (stderr, ++ fprintf (stderr, + _ + ("%s: shadow passwords required for -e and -f\n"), + Prog); @@ -1575,6 +1597,8 @@ int main (int argc, char **argv) nscd_flush_cache ("passwd"); nscd_flush_cache ("group"); @@ -331,134 +448,228 @@ + } +#endif +} -diff -up shadow-4.1.0/src/userdel.c.selinux shadow-4.1.0/src/userdel.c ---- shadow-4.1.0/src/userdel.c.selinux 2007-11-24 23:41:19.000000000 +0100 -+++ shadow-4.1.0/src/userdel.c 2007-12-12 14:13:30.000000000 +0100 -@@ -809,6 +809,17 @@ int main (int argc, char **argv) - #endif - } +diff -upb shadow-4.1.0/src/useradd.c.selinux shadow-4.1.0/src/useradd.c +--- shadow-4.1.0/src/useradd.c.selinux 2008-03-03 14:14:45.000000000 +0100 ++++ shadow-4.1.0/src/useradd.c 2008-03-03 14:19:01.000000000 +0100 +@@ -100,6 +100,7 @@ static const char *user_comment = ""; + static const char *user_home = ""; + static const char *user_shell = ""; + static const char *create_mail_spool = ""; ++static const char *user_selinux = ""; -+#ifdef WITH_SELINUX -+ if (is_selinux_enabled() > 0) { -+ const char *argv[5]; -+ argv[0] = "/usr/sbin/semanage"; -+ argv[1] = "login"; -+ argv[2] = "-d"; -+ argv[3] = user_name; -+ argv[4] = NULL; -+ safe_system(argv[0], argv, NULL, 1); -+ } -+#endif - /* - * Cancel any crontabs or at jobs. Have to do this before we remove - * the entry from /etc/passwd. -diff -up shadow-4.1.0/man/useradd.8.selinux shadow-4.1.0/man/useradd.8 ---- shadow-4.1.0/man/useradd.8.selinux 2007-12-12 14:11:41.000000000 +0100 -+++ shadow-4.1.0/man/useradd.8 2007-12-12 14:19:21.000000000 +0100 -@@ -163,6 +163,11 @@ doesn\'t work yet\. - Allow the creation of a user account with a duplicate (non\-unique) UID\. - .RE - .PP -+\fB\-Z\fR, \fB\-\-selinux-user\fR \fISEUSER\fR -+.RS 4 -+The SELinux user for the user\'s login\. The default is to leave this field blank, which causes the system to select the default SELinux user\. -+.RE -+.PP - \fB\-p\fR, \fB\-\-password\fR \fIPASSWORD\fR - .RS 4 - The encrypted password, as returned by -diff -up shadow-4.1.0/man/usermod.8.xml.selinux shadow-4.1.0/man/usermod.8.xml ---- shadow-4.1.0/man/usermod.8.xml.selinux 2007-12-09 00:24:36.000000000 +0100 -+++ shadow-4.1.0/man/usermod.8.xml 2007-12-12 14:13:30.000000000 +0100 -@@ -245,6 +245,19 @@ - - - -+ -+ -+ , -+ SEUSER -+ -+ -+ -+ The SELinux user for the user's login. The default is to leave this -+ field the blank, which causes the system to select the default -+ SELinux user. -+ -+ -+ - - + static long user_expire = -1; + static int is_shadow_pwd; +@@ -170,6 +171,7 @@ static int set_defaults (void); + static int get_groups (char *); + static void usage (void); + static void new_pwent (struct passwd *); ++static void selinux_update_mapping (void); -diff -up shadow-4.1.0/man/usermod.8.selinux shadow-4.1.0/man/usermod.8 ---- shadow-4.1.0/man/usermod.8.selinux 2007-12-10 00:07:16.000000000 +0100 -+++ shadow-4.1.0/man/usermod.8 2007-12-12 14:17:10.000000000 +0100 -@@ -133,6 +133,11 @@ Note: if you wish to unlock the account - value from - \fI/etc/default/useradd\fR)\. - .RE -+.PP -+\fB\-Z\fR, \fB\-\-selinux-user\fR \fISEUSER\fR -+.RS 4 -+The SELinux user for the user\'s login\. The default is to leave this field blank, which causes the system to select the default SELinux user. -+.RE - .SH "CAVEATS" - .PP + static long scale_age (long); + static void new_spent (struct spwd *); +@@ -356,6 +358,7 @@ static void get_defaults (void) + def_create_mail_spool = xstrdup (cp); + } + } ++ fclose(fp); + } -diff -up shadow-4.1.0/man/useradd.8.xml.selinux shadow-4.1.0/man/useradd.8.xml ---- shadow-4.1.0/man/useradd.8.xml.selinux 2007-12-09 00:24:36.000000000 +0100 -+++ shadow-4.1.0/man/useradd.8.xml 2007-12-12 14:13:30.000000000 +0100 -@@ -274,6 +274,19 @@ - - - -+ -+ -+ , -+ SEUSER -+ -+ -+ -+ The SELinux user for the user's login. The default is to leave this -+ field blank, which causes the system to select the default SELinux -+ user. -+ -+ -+ - + /* +@@ -586,7 +589,7 @@ static int get_groups (char *list) + #endif - -diff -up shadow-4.1.0/lib/defines.h.selinux shadow-4.1.0/lib/defines.h ---- shadow-4.1.0/lib/defines.h.selinux 2007-11-24 12:18:35.000000000 +0100 -+++ shadow-4.1.0/lib/defines.h 2007-12-12 14:13:30.000000000 +0100 -@@ -342,4 +342,7 @@ extern char *strerror (); - #include + if (ngroups == sys_ngroups) { +- fprintf (stderr, ++ fprintf (stderr, + _ + ("%s: too many groups specified (max %d).\n"), + Prog, ngroups); +@@ -644,6 +647,10 @@ static void usage (void) + " account\n" + " -s, --shell SHELL the login shell for the new user account\n" + " -u, --uid UID force use the UID for the new user account\n" ++#ifdef WITH_SELINUX ++ " -Z, --selinux-user SEUSER use a specific SEUSER for the SELinux user mapping\n" ++#endif ++ + "\n")); + exit (E_USAGE); + } +@@ -696,7 +703,7 @@ static void new_spent (struct spwd *spen + spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1)); + spent->sp_inact = scale_age (def_inactive); + spent->sp_expire = scale_age (user_expire); +- } ++ } + else { + spent->sp_min = scale_age(-1); + spent->sp_max = scale_age(-1); +@@ -1030,32 +1037,39 @@ static void process_flags (int argc, cha + {"non-unique", no_argument, NULL, 'o'}, + {"password", required_argument, NULL, 'p'}, + {"shell", required_argument, NULL, 's'}, ++#ifdef WITH_SELINUX ++ {"selinux-user", required_argument, NULL, 'Z'}, ++#endif + {"uid", required_argument, NULL, 'u'}, + {NULL, 0, NULL, '\0'} + }; + while ((c = ++#ifdef WITH_SELINUX ++ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:Z:", ++#else + getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:", ++#endif + long_options, NULL)) != -1) { + switch (c) { + case 'b': + if (!VALID (optarg) + || optarg[0] != '/') { +- fprintf (stderr, ++ fprintf (stderr, + _ + ("%s: invalid base directory '%s'\n"), + Prog, optarg); +- exit (E_BAD_ARG); ++ exit (E_BAD_ARG); + } + def_home = optarg; + bflg++; + break; + case 'c': + if (!VALID (optarg)) { +- fprintf (stderr, ++ fprintf (stderr, + _ + ("%s: invalid comment '%s'\n"), + Prog, optarg); +- exit (E_BAD_ARG); ++ exit (E_BAD_ARG); + } + user_comment = optarg; + cflg++; +@@ -1063,11 +1077,11 @@ static void process_flags (int argc, cha + case 'd': + if (!VALID (optarg) + || optarg[0] != '/') { +- fprintf (stderr, ++ fprintf (stderr, + _ + ("%s: invalid home directory '%s'\n"), + Prog, optarg); +- exit (E_BAD_ARG); ++ exit (E_BAD_ARG); + } + user_home = optarg; + dflg++; +@@ -1161,7 +1175,7 @@ static void process_flags (int argc, cha + _ + ("%s: -K requires KEY=VALUE\n"), + Prog); +- exit (E_BAD_ARG); ++ exit (E_BAD_ARG); + } + /* terminate name, point to value */ + *cp++ = '\0'; +@@ -1215,6 +1229,17 @@ static void process_flags (int argc, cha + case 'M': + Mflg++; + break; ++#ifdef WITH_SELINUX ++ case 'Z': ++ if (is_selinux_enabled() > 0) ++ user_selinux = optarg; ++ else { ++ fprintf (stderr,_("%s: -Z requires SELinux enabled kernel\n"), Prog); ++ ++ exit (E_BAD_ARG); ++ } ++ break; ++#endif + default: + usage (); + } +@@ -1238,7 +1263,7 @@ static void process_flags (int argc, cha + */ + if (Dflg) { + if (optind != argc) +- usage (); ++ usage (); + + if (uflg || oflg || Gflg || dflg || cflg || mflg) + usage (); +@@ -1253,7 +1278,7 @@ static void process_flags (int argc, cha + ("%s: invalid user name '%s'\n"), + Prog, user_name); + #ifdef WITH_AUDIT +- audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user", ++ audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user", + user_name, -1, 0); #endif + exit (E_BAD_ARG); +@@ -1583,6 +1608,33 @@ static void usr_update (void) + grp_update (); + } ++static void selinux_update_mapping () { ++ +#ifdef WITH_SELINUX -+#include ++ if (is_selinux_enabled() <= 0) return; ++ ++ if (*user_selinux) { /* must be done after passwd write() */ ++ const char *argv[7]; ++ argv[0] = "/usr/sbin/semanage"; ++ argv[1] = "login"; ++ argv[2] = "-a"; ++ argv[3] = "-s"; ++ argv[4] = user_selinux; ++ argv[5] = user_name; ++ argv[6] = NULL; ++ if (safe_system(argv[0], argv, NULL, 0)) { ++ fprintf (stderr, ++ _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"), ++ Prog, user_name, user_selinux); ++#ifdef WITH_AUDIT ++ audit_logger (AUDIT_USER_CHAUTHTOK, Prog, ++ "adding SELinux user mapping", user_name, user_id, 0); ++#endif ++ } ++ } +#endif - #endif /* _DEFINES_H_ */ -diff -up shadow-4.1.0/lib/prototypes.h.selinux shadow-4.1.0/lib/prototypes.h ---- shadow-4.1.0/lib/prototypes.h.selinux 2007-11-23 21:10:52.000000000 +0100 -+++ shadow-4.1.0/lib/prototypes.h 2007-12-12 14:13:30.000000000 +0100 -@@ -53,6 +53,9 @@ extern int is_listed (const char *, cons - /* copydir.c */ - extern int copy_tree (const char *, const char *, uid_t, gid_t); - extern int remove_tree (const char *); ++ ++} + /* + * create_home - create the user's home directory + * +@@ -1592,7 +1644,11 @@ static void usr_update (void) + */ + static void create_home (void) + { ++ + if (access (user_home, F_OK)) { +#ifdef WITH_SELINUX -+extern int selinux_file_context (const char *dst_name); ++ selinux_file_context (user_home); +#endif + /* XXX - create missing parent directories. --marekm */ + if (mkdir (user_home, 0)) { + fprintf (stderr, +@@ -1614,6 +1670,10 @@ static void create_home (void) + audit_logger (AUDIT_USER_CHAUTHTOK, Prog, + "adding home directory", user_name, user_id, 1); + #endif ++#ifdef WITH_SELINUX ++ /* Reset SELinux to create files with default contexts */ ++ setfscreatecon (NULL); ++#endif + } + } - /* encrypt.c */ - extern char *pw_encrypt (const char *, const char *); -@@ -151,6 +154,9 @@ extern void setup_env (struct passwd *); - /* shell.c */ - extern int shell (const char *, const char *, char *const *); +@@ -1847,6 +1907,8 @@ int main (int argc, char **argv) -+/* system.c */ -+extern int safe_system(const char *command, const char *argv[], const char *env[], int ignore_stderr); + close_files (); + ++ selinux_update_mapping(); + - /* strtoday.c */ - extern long strtoday (const char *); + nscd_flush_cache ("passwd"); + nscd_flush_cache ("group"); Index: shadow-utils.spec =================================================================== RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- shadow-utils.spec 19 Feb 2008 12:01:10 -0000 1.110 +++ shadow-utils.spec 3 Mar 2008 14:14:07 -0000 1.111 @@ -5,7 +5,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2 @@ -195,6 +195,9 @@ %{_mandir}/man8/vigr.8* %changelog +* Mon Mar 03 2008 Peter Vrabec 2:4.1.0-4 +- fix selinux labeling (#433757) + * Tue Feb 19 2008 Peter Vrabec 2:4.1.0-3 - fix groupmems segmentation fault (#430813) From fedora-extras-commits at redhat.com Mon Mar 3 14:16:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:16:29 +0000 Subject: [pkgdb] gperf ownership updated Message-ID: <200803031417.m23EHDFZ028041@bastion.fedora.phx.redhat.com> Package gperf in Fedora devel is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:16:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:16:34 +0000 Subject: [pkgdb] gperf ownership updated Message-ID: <200803031417.m23EHDFb028041@bastion.fedora.phx.redhat.com> Package gperf in Fedora 7 is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:16:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:16:38 +0000 Subject: [pkgdb] gperf ownership updated Message-ID: <200803031417.m23EHDFd028041@bastion.fedora.phx.redhat.com> Package gperf in Fedora 8 is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:16:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:16:51 +0000 Subject: [pkgdb] gperf: rrakus has requested watchbugzilla Message-ID: <200803031417.m23EHfpB028108@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on gperf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:16:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:16:51 +0000 Subject: [pkgdb] gperf: rrakus has requested commit Message-ID: <200803031417.m23EHfn8028110@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on gperf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:16:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:16:54 +0000 Subject: [pkgdb] gperf: rrakus has requested approveacls Message-ID: <200803031417.m23EHfpD028108@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on gperf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:16:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:16:59 +0000 Subject: [pkgdb] gperf: rrakus has requested watchbugzilla Message-ID: <200803031417.m23EHfnA028110@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on gperf (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:17:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:01 +0000 Subject: [pkgdb] gperf: rrakus has requested watchcommits Message-ID: <200803031417.m23EHfpF028108@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on gperf (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:17:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:08 +0000 Subject: [pkgdb] gperf: rrakus has requested approveacls Message-ID: <200803031417.m23EHDFf028041@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on gperf (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:17:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:01 +0000 Subject: [pkgdb] gperf: rrakus has requested commit Message-ID: <200803031417.m23EHfpH028108@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on gperf (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:17:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:11 +0000 Subject: [pkgdb] mingetty ownership updated Message-ID: <200803031417.m23EHDFh028041@bastion.fedora.phx.redhat.com> Package mingetty in Fedora devel is now owned by Bernardo Innocenti (bernie) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:17:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:09 +0000 Subject: [pkgdb] gperf: rrakus has requested watchcommits Message-ID: <200803031417.m23EHfpJ028108@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on gperf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:17:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:17 +0000 Subject: [pkgdb] mingetty ownership updated Message-ID: <200803031418.m23EI12I028279@bastion.fedora.phx.redhat.com> Package mingetty in Fedora OLPC 2 is now owned by Bernardo Innocenti (bernie) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:17:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:16 +0000 Subject: [pkgdb] gperf: rrakus has requested watchbugzilla Message-ID: <200803031418.m23EI7tQ028297@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on gperf (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:17:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:25 +0000 Subject: [pkgdb] gperf: rrakus has requested approveacls Message-ID: <200803031418.m23EI12K028279@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on gperf (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:17:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:19 +0000 Subject: [pkgdb] gperf: rrakus has requested commit Message-ID: <200803031418.m23EI7tS028297@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on gperf (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:17:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:28 +0000 Subject: [pkgdb] gperf: rrakus has requested watchcommits Message-ID: <200803031418.m23EI12M028279@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on gperf (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:17:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:23 +0000 Subject: [pkgdb] mingetty: bernie has requested watchbugzilla Message-ID: <200803031418.m23EHfnC028110@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has requested the watchbugzilla acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:17:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:31 +0000 Subject: [pkgdb] mingetty: bernie has requested watchcommits Message-ID: <200803031418.m23EI12O028279@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has requested the watchcommits acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:17:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:26 +0000 Subject: [pkgdb] mingetty: bernie has requested commit Message-ID: <200803031418.m23EHfnE028110@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has requested the commit acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:17:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:17:34 +0000 Subject: [pkgdb] mingetty: bernie has requested approveacls Message-ID: <200803031418.m23EI12Q028279@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has requested the approveacls acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:03 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803031418.m23EI7tU028297@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the watchbugzilla acl on mingetty (Fedora devel) to Approved for Bernardo Innocenti (bernie) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:03 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803031418.m23EHfnG028110@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the watchcommits acl on mingetty (Fedora devel) to Approved for Bernardo Innocenti (bernie) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:03 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803031418.m23EIsKZ028532@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the commit acl on mingetty (Fedora devel) to Approved for Bernardo Innocenti (bernie) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:12 +0000 Subject: [pkgdb] mingetty: rrakus has requested watchbugzilla Message-ID: <200803031418.m23EIuKf028564@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:06 +0000 Subject: [pkgdb] mingetty: rrakus has requested watchcommits Message-ID: <200803031418.m23EIsKc028532@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:13 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803031418.m23EIuKh028564@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the approveacls acl on mingetty (Fedora devel) to Approved for Bernardo Innocenti (bernie) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:14 +0000 Subject: [pkgdb] mingetty: rrakus has requested commit Message-ID: <200803031418.m23EIuKk028564@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:09 +0000 Subject: [pkgdb] mingetty: rrakus has requested approveacls Message-ID: <200803031419.m23EI7tX028297@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:10 +0000 Subject: [pkgdb] mingetty ownership updated Message-ID: <200803031419.m23EIsKe028532@bastion.fedora.phx.redhat.com> Package mingetty in Fedora 7 is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:21 +0000 Subject: [pkgdb] mingetty had groupAcl changed Message-ID: <200803031419.m23EIuKm028564@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the commit acl on mingetty (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:15 +0000 Subject: [pkgdb] mingetty: rrakus has requested watchbugzilla Message-ID: <200803031419.m23EIsKg028532@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on mingetty (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:16 +0000 Subject: [pkgdb] mingetty: rrakus has requested watchcommits Message-ID: <200803031419.m23EJ6GK028722@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on mingetty (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:17 +0000 Subject: [pkgdb] mingetty: rrakus has requested commit Message-ID: <200803031419.m23EJ6GM028722@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on mingetty (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:26 +0000 Subject: [pkgdb] mingetty: rrakus has requested approveacls Message-ID: <200803031419.m23EJ9Uu028761@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on mingetty (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:22 +0000 Subject: [pkgdb] mingetty ownership updated Message-ID: <200803031419.m23EJ6GO028722@bastion.fedora.phx.redhat.com> Package mingetty in Fedora 8 is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:26 +0000 Subject: [pkgdb] mingetty: rrakus has requested watchbugzilla Message-ID: <200803031419.m23EJ6GQ028722@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on mingetty (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:27 +0000 Subject: [pkgdb] mingetty: rrakus has requested watchcommits Message-ID: <200803031419.m23EJ6GS028722@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on mingetty (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:35 +0000 Subject: [pkgdb] mingetty: rrakus has requested commit Message-ID: <200803031419.m23EJ9Uw028761@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on mingetty (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:18:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:18:37 +0000 Subject: [pkgdb] mingetty: rrakus has requested approveacls Message-ID: <200803031419.m23EJ9V0028761@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on mingetty (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:19:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:05 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803031419.m23EJ9V3028761@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the watchbugzilla acl on mingetty (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:19:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:01 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803031419.m23EJq8A029027@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the watchcommits acl on mingetty (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:19:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:02 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803031419.m23EJqGX029032@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the commit acl on mingetty (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:19:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:09 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803031419.m23EJrs7029065@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the approveacls acl on mingetty (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:19:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:38 +0000 Subject: [pkgdb] gperf: rrakus has given up approveacls Message-ID: <200803031420.m23EJqGZ029032@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the approveacls acl on gperf (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:19:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:47 +0000 Subject: [pkgdb] gperf: rrakus has given up commit Message-ID: <200803031420.m23EJrs9029065@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the commit acl on gperf (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:19:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:43 +0000 Subject: [pkgdb] gperf: rrakus has given up watchcommits Message-ID: <200803031420.m23EJq8C029027@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchcommits acl on gperf (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:19:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:44 +0000 Subject: [pkgdb] gperf: rrakus has given up watchbugzilla Message-ID: <200803031420.m23EJqGb029032@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchbugzilla acl on gperf (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:19:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:51 +0000 Subject: [pkgdb] gperf: rrakus has given up watchbugzilla Message-ID: <200803031420.m23EJq8E029027@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchbugzilla acl on gperf (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:19:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:52 +0000 Subject: [pkgdb] gperf: rrakus has given up watchcommits Message-ID: <200803031420.m23EJqGd029032@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchcommits acl on gperf (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:19:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:54 +0000 Subject: [pkgdb] gperf: rrakus has given up approveacls Message-ID: <200803031420.m23EJqGf029032@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the approveacls acl on gperf (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:20:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:05 +0000 Subject: [pkgdb] gperf: rrakus has given up commit Message-ID: <200803031420.m23EJrsF029065@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the commit acl on gperf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:19:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:58 +0000 Subject: [pkgdb] gperf: rrakus has given up watchcommits Message-ID: <200803031420.m23EJq8G029027@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchcommits acl on gperf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:19:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:19:59 +0000 Subject: [pkgdb] gperf: rrakus has given up commit Message-ID: <200803031420.m23EJrsB029065@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the commit acl on gperf (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:20:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:02 +0000 Subject: [pkgdb] gperf: rrakus has given up watchbugzilla Message-ID: <200803031420.m23EJrsD029065@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchbugzilla acl on gperf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:20:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:10 +0000 Subject: [pkgdb] mingetty: rrakus has given up commit Message-ID: <200803031421.m23EL1Z7029378@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the commit acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:16 +0000 Subject: [pkgdb] mingetty: rrakus has given up watchcommits Message-ID: <200803031421.m23EL0el029354@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchcommits acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:10 +0000 Subject: [pkgdb] mingetty: rrakus has given up watchbugzilla Message-ID: <200803031421.m23EL1jI029388@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchbugzilla acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:12 +0000 Subject: [pkgdb] mingetty: rrakus has given up approveacls Message-ID: <200803031421.m23EL1ZA029378@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the approveacls acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:17 +0000 Subject: [pkgdb] mingetty: rrakus has given up watchcommits Message-ID: <200803031421.m23EL1ZC029378@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchcommits acl on mingetty (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:18 +0000 Subject: [pkgdb] mingetty: rrakus has given up watchbugzilla Message-ID: <200803031421.m23EL1jK029388@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchbugzilla acl on mingetty (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:26 +0000 Subject: [pkgdb] mingetty: rrakus has given up approveacls Message-ID: <200803031421.m23EL0en029354@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the approveacls acl on mingetty (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:20 +0000 Subject: [pkgdb] mingetty: rrakus has given up commit Message-ID: <200803031421.m23EL1jM029388@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the commit acl on mingetty (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:23 +0000 Subject: [pkgdb] mingetty: rrakus has given up watchbugzilla Message-ID: <200803031421.m23EL1jO029388@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchbugzilla acl on mingetty (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:24 +0000 Subject: [pkgdb] mingetty: rrakus has given up watchcommits Message-ID: <200803031421.m23EL1ZE029378@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the watchcommits acl on mingetty (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:32 +0000 Subject: [pkgdb] mingetty: rrakus has given up commit Message-ID: <200803031421.m23EL0ep029354@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the commit acl on mingetty (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:25 +0000 Subject: [pkgdb] mingetty: rrakus has given up approveacls Message-ID: <200803031421.m23ELGiD029575@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the approveacls acl on mingetty (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:20:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:40 +0000 Subject: [pkgdb] time ownership updated Message-ID: <200803031421.m23EL1jQ029388@bastion.fedora.phx.redhat.com> Package time in Fedora devel is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/time From fedora-extras-commits at redhat.com Mon Mar 3 14:20:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:48 +0000 Subject: [pkgdb] time ownership updated Message-ID: <200803031421.m23EL0er029354@bastion.fedora.phx.redhat.com> Package time in Fedora 7 is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/time From fedora-extras-commits at redhat.com Mon Mar 3 14:20:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:20:44 +0000 Subject: [pkgdb] time ownership updated Message-ID: <200803031421.m23ELYT9029685@bastion.fedora.phx.redhat.com> Package time in Fedora 8 is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/time From fedora-extras-commits at redhat.com Mon Mar 3 14:21:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:21:16 +0000 Subject: [pkgdb] gperf: rrakus has given up approveacls Message-ID: <200803031422.m23ELGiF029575@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has given up the approveacls acl on gperf (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gperf From fedora-extras-commits at redhat.com Mon Mar 3 14:21:59 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 3 Mar 2008 14:21:59 GMT Subject: extras-repoclosure rc-modified,1.20,1.21 Message-ID: <200803031421.m23ELxXD005943@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5927 Modified Files: rc-modified Log Message: rely on returnNewestByName for noarch<->arch evr comparison Index: rc-modified =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- rc-modified 27 Feb 2008 10:16:32 -0000 1.20 +++ rc-modified 3 Mar 2008 14:21:59 -0000 1.21 @@ -142,19 +142,6 @@ except AttributeError: pass - def isnotnewest(pkg): - # Handle noarch<->arch switches in package updates, so any - # old nevra returned by returnNewestByNameArch() are skipped. - # TODO: There must be a more elegant/convenient way. - if (pkg.pkgtup[1] == 'noarch'): - if (pkg.pkgtup not in newestpkgtuplist): - return True - else: - for p in self.pkgSack.returnNewestByName(pkg.pkgtup[0]): - if (p.pkgtup[1] == 'noarch') and (p.pkgtup in newestpkgtuplist): - return True - return False - for (req, flags, (reqe, reqv, reqr)) in pkg.returnPrco('requires'): if req.startswith('rpmlib'): continue # ignore rpmlib deps @@ -167,7 +154,7 @@ pass if len(resolve_sack) < 1: - if newest and isnotnewest(pkg): + if newest and pkg.pkgtup not in newestpkgtuplist: break if not unresolved.has_key(pkg): unresolved[pkg] = [] @@ -181,7 +168,7 @@ if newest and not kernelprovides and not req.startswith('kernel'): # we allow old kernels resolved_by_newest = False - for po in resolve_sack:# look through and make sure all our answers are newest-only + for po in resolve_sack:# look through and make sure any of our answers are newest-only # 2nd stage handling of obsoletes. Only keep providers, # which are not obsolete. If no provider is left, the @@ -202,7 +189,7 @@ if resolved_by_newest: resolved[(req,flags,ver)] = 1 else: - if newest and isnotnewest(pkg): + if newest and pkg.pkgtup not in newestpkgtuplist: break if not unresolved.has_key(pkg): unresolved[pkg] = [] From fedora-extras-commits at redhat.com Mon Mar 3 14:22:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:13 +0000 Subject: [pkgdb] PyXML ownership updated Message-ID: <200803031423.m23ELGiH029575@bastion.fedora.phx.redhat.com> Package PyXML in Fedora devel is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyXML From fedora-extras-commits at redhat.com Mon Mar 3 14:22:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:21 +0000 Subject: [pkgdb] PyXML ownership updated Message-ID: <200803031423.m23EN54O029833@bastion.fedora.phx.redhat.com> Package PyXML in Fedora 7 is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyXML From fedora-extras-commits at redhat.com Mon Mar 3 14:22:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:15 +0000 Subject: [pkgdb] PyXML ownership updated Message-ID: <200803031423.m23ELGiJ029575@bastion.fedora.phx.redhat.com> Package PyXML in Fedora 8 is now owned by Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PyXML From fedora-extras-commits at redhat.com Mon Mar 3 14:22:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:42 +0000 Subject: [pkgdb] mingetty: rrakus has requested watchbugzilla Message-ID: <200803031423.m23ENXsV029898@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:22:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:52 +0000 Subject: [pkgdb] mingetty: rrakus has requested approveacls Message-ID: <200803031423.m23EN54R029833@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:22:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:44 +0000 Subject: [pkgdb] mingetty: rrakus has requested watchcommits Message-ID: <200803031423.m23ENZ1O029913@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:22:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:46 +0000 Subject: [pkgdb] mingetty: rrakus has requested commit Message-ID: <200803031423.m23ENZ1R029913@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on mingetty (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:22:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:58 +0000 Subject: [pkgdb] mingetty: rrakus has requested watchbugzilla Message-ID: <200803031423.m23EN54U029833@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on mingetty (Fedora OLPC 2) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:22:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:52 +0000 Subject: [pkgdb] mingetty: rrakus has requested watchcommits Message-ID: <200803031423.m23ENXsY029898@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on mingetty (Fedora OLPC 2) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:22:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:55 +0000 Subject: [pkgdb] mingetty: rrakus has requested commit Message-ID: <200803031423.m23ENZ1U029913@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on mingetty (Fedora OLPC 2) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:22:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 14:22:56 +0000 Subject: [pkgdb] mingetty: rrakus has requested approveacls Message-ID: <200803031423.m23ENkI6030031@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on mingetty (Fedora OLPC 2) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 14:24:27 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Mon, 3 Mar 2008 14:24:27 GMT Subject: rpms/thunderbird/devel thunderbird.sh.in, 1.8, 1.9 thunderbird.spec, 1.113, 1.114 Message-ID: <200803031424.m23EORX5006014@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/thunderbird/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5983 Modified Files: thunderbird.sh.in thunderbird.spec Log Message: Updated starting script (#426331) Index: thunderbird.sh.in =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.sh.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- thunderbird.sh.in 26 Sep 2007 15:32:44 -0000 1.8 +++ thunderbird.sh.in 3 Mar 2008 14:23:29 -0000 1.9 @@ -4,19 +4,34 @@ # (based on the Mozilla RPM launch script) # -MOZ_LIB_DIR="/usr/lib" -if [ -x "/usr/lib64/thunderbird-TBIRD_VERSION/thunderbird-bin" ] -then - MOZ_LIB_DIR="/usr/lib64" +## +## Variables +## +MOZ_ARCH=$(uname -m) +case $MOZ_ARCH in + x86_64 | ia64 | s390 ) + MOZ_LIB_DIR="/usr/lib64" + SECONDARY_LIB_DIR="/usr/lib" + ;; + * ) + MOZ_LIB_DIR="/usr/lib" + SECONDARY_LIB_DIR="/usr/lib64" + ;; +esac + +if [ ! -x $MOZ_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird ]; then + if [ ! -x $SECONDARY_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird ]; then + echo "Error: $MOZ_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird not found" + if [ -d $SECONDARY_LIB_DIR ]; then + echo " $SECONDARY_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird not found" + fi + exit 1 + fi + MOZ_LIB_DIR="$SECONDARY_LIB_DIR" fi -MOZILLA_FIVE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION" -MRE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION" -export MOZILLA_FIVE_HOME MRE_HOME - -MOZ_PROGRAM=$MRE_HOME/thunderbird -#MOZ_CLIENT_PROGRAM="$MRE_HOME/mozilla-xremote-client -a thunderbird" -MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird-bin -remote" +MOZ_DIST_BIN="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION" +MOZ_PROGRAM="$MOZ_DIST_BIN/thunderbird" ## ## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default @@ -25,74 +40,4 @@ #MOZ_DISABLE_PANGO=1 #export MOZ_DISABLE_PANGO - -function check_running() { - $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null - RETURN_VAL=$? - if [ "$RETURN_VAL" -eq "2" ]; then - echo 0 - return 0 - else - echo 1 - return 1 - fi -} - -function rm_shit() { - find $HOME/.thunderbird -name XUL.mfasl 2>/dev/null | xargs rm -f -} - -# currently unused -MOZARGS="" - -ALREADY_RUNNING=`check_running` - -# If no command-line arguments given... -if [ -z "$1" ]; then - if [ "${ALREADY_RUNNING}" -eq "1" ]; then - exec $MOZ_CLIENT_PROGRAM "xfeDoCommand(openInbox)" >/dev/null 2>&1 - else - rm_shit - exec $MOZ_PROGRAM $MOZARGS >/dev/null 2>&1 - fi -fi - -for arg in $@ ; do - case "$1" in - -remote) - shift - exec $MOZ_PROGRAM -remote "$@" - ;; - - -mail) - shift - if [ "${ALREADY_RUNNING}" -eq "1" ]; then - # remove 'mailto:' prefix - ARGS="`echo $@ | sed 's/^mailto://'`" - exec $MOZ_CLIENT_PROGRAM "mailto($ARGS)" - else - rm_shit - exec $MOZ_PROGRAM $MOZARGS -mail "$@" - fi - ;; - - -compose) - shift - if [ "${ALREADY_RUNNING}" -eq "1" ]; then - # remove 'mailto:' prefix - ARGS="`echo $@ | sed 's/^mailto://'`" - exec $MOZ_CLIENT_PROGRAM "mailto($ARGS)" - else - rm_shit - exec $MOZ_PROGRAM $MOZARGS -compose "$@" - fi - ;; - - *) - # for now, pass it on and hope for the best - exec $MOZ_PROGRAM $MOZARGS "$@" - ;; - esac - shift -done - +exec $MOZ_PROGRAM "$@" Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- thunderbird.spec 27 Feb 2008 14:19:33 -0000 1.113 +++ thunderbird.spec 3 Mar 2008 14:23:29 -0000 1.114 @@ -8,7 +8,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 2.0.0.12 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -319,6 +319,9 @@ #=============================================================================== %changelog +* Mon Mar 03 2008 Martin Stransky 2.0.0.12-2 +- Updated starting script (#426331) + * Tue Feb 26 2008 Christopher Aillon 2.0.0.12-1 - Update to 2.0.0.12 - Fix up icon location and some scriptlets From fedora-extras-commits at redhat.com Mon Mar 3 14:34:04 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 3 Mar 2008 14:34:04 GMT Subject: rpms/gmyth/devel .cvsignore, 1.3, 1.4 gmyth.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200803031434.m23EY4Es006311@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gmyth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6270 Modified Files: .cvsignore gmyth.spec sources Log Message: * Mon Mar 03 2008 - Bastien Nocera - 0.7.1-1 - Update to 0.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gmyth/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Feb 2008 19:29:25 -0000 1.3 +++ .cvsignore 3 Mar 2008 14:33:28 -0000 1.4 @@ -1 +1 @@ -gmyth_0.7-indt1.tar.gz +gmyth-0.7.1.tar.gz Index: gmyth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gmyth/devel/gmyth.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gmyth.spec 4 Feb 2008 19:29:25 -0000 1.4 +++ gmyth.spec 3 Mar 2008 14:33:28 -0000 1.5 @@ -1,12 +1,10 @@ -%define short_version 0.7 - Summary: MythTV remote access libraries Name: gmyth -Version: 0.7.0 +Version: 0.7.1 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries -Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{short_version}-indt1.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: COPYING.LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://gmyth.sf.net @@ -27,7 +25,7 @@ gmyth-devel contains development libraries and headers for the GMyth library. %prep -%setup -q -n %{name} +%setup -q # Upstream used the default license from the autotools, all the # files and the project page says LGPL, see: # http://sourceforge.net/tracker/index.php?func=detail&aid=1790620&group_id=177106&atid=879914 @@ -36,7 +34,7 @@ %build %configure make %{?_smp_mflags} -chmod a-x src/*.[ch] +chmod a-x gmyth/*.[ch] %install rm -rf $RPM_BUILD_ROOT @@ -64,6 +62,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 03 2008 - Bastien Nocera - 0.7.1-1 +- Update to 0.7.1 + * Mon Feb 04 2008 - Bastien Nocera - 0.7.0-1 - Update to 0.7.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gmyth/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Feb 2008 19:29:25 -0000 1.3 +++ sources 3 Mar 2008 14:33:28 -0000 1.4 @@ -1 +1 @@ -a32d4a6c59a646fbce326bc4484d3912 gmyth_0.7-indt1.tar.gz +ab6b7525fd9c71cf5203f9e61abec0c3 gmyth-0.7.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 14:40:55 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Mon, 3 Mar 2008 14:40:55 GMT Subject: devel/vim 7.1.263,NONE,1.1 Message-ID: <200803031440.m23EetUW006446@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6439 Added Files: 7.1.263 Log Message: - patchlevel 263 --- NEW FILE 7.1.263 --- To: vim-dev at vim.org Subject: Patch 7.1.263 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.263 Problem: The filetype can consist of two dot separated names. This works for syntax and ftplugin, but not for indent. (Brett Stahlman) Solution: Use split() and loop over each dot separated name. Files: runtime/indent.vim *** ../vim-7.1.262/runtime/indent.vim Mon Mar 28 22:56:55 2005 --- runtime/indent.vim Fri Feb 22 21:05:39 2008 *************** *** 1,7 **** " Vim support file to switch on loading indent files for file types " " Maintainer: Bram Moolenaar ! " Last Change: 2005 Mar 28 if exists("did_indent_on") finish --- 1,7 ---- " Vim support file to switch on loading indent files for file types " " Maintainer: Bram Moolenaar ! " Last Change: 2008 Feb 22 if exists("did_indent_on") finish *************** *** 15,25 **** exe b:undo_indent unlet! b:undo_indent b:did_indent endif ! if expand("") != "" if exists("b:did_indent") unlet b:did_indent endif ! runtime! indent/.vim endif endfunc augroup END --- 15,31 ---- exe b:undo_indent unlet! b:undo_indent b:did_indent endif ! let s = expand("") ! if s != "" if exists("b:did_indent") unlet b:did_indent endif ! ! " When there is a dot it is used to separate filetype names. Thus for ! " "aaa.bbb" load "indent/aaa.vim" and then "indent/bbb.vim". ! for name in split(s, '\.') ! exe 'runtime! indent/' . name . '.vim' ! endfor endif endfunc augroup END *** ../vim-7.1.262/src/version.c Wed Feb 20 20:09:44 2008 --- src/version.c Mon Feb 25 20:44:04 2008 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 263, /**/ -- hundred-and-one symptoms of being an internet addict: 45. You buy a Captain Kirk chair with a built-in keyboard and mouse. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Mon Mar 3 14:41:05 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Mon, 3 Mar 2008 14:41:05 GMT Subject: devel/vim 7.1.264,NONE,1.1 Message-ID: <200803031441.m23Ef5wr006471@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6462 Added Files: 7.1.264 Log Message: - patchlevel 264 --- NEW FILE 7.1.264 --- To: vim-dev at vim.org Subject: Patch 7.1.264 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.264 Problem: Crash when indenting lines. (Dominique Pelle) Solution: Set the cursor column when changing the cursor line. Files: src/ops.c, src/misc1.c *** ../vim-7.1.263/src/ops.c Wed Feb 6 14:43:50 2008 --- src/ops.c Sun Feb 24 14:56:38 2008 *************** *** 692,697 **** --- 692,698 ---- } } ++curwin->w_cursor.lnum; + curwin->w_cursor.col = 0; /* make sure it's valid */ } /* put cursor on first non-blank of indented line */ *** ../vim-7.1.263/src/misc1.c Wed Feb 13 10:57:11 2008 --- src/misc1.c Sun Feb 24 15:04:27 2008 *************** *** 6894,6899 **** --- 6894,6900 ---- if (trypos != NULL) { curwin->w_cursor.lnum = trypos->lnum + 1; + curwin->w_cursor.col = 0; continue; } *************** *** 6954,6959 **** --- 6955,6961 ---- if (trypos != NULL) { curwin->w_cursor.lnum = trypos->lnum + 1; + curwin->w_cursor.col = 0; continue; } } *************** *** 6991,6996 **** --- 6993,6999 ---- if ((trypos = find_start_comment(ind_maxcomment)) != NULL) { curwin->w_cursor.lnum = trypos->lnum + 1; + curwin->w_cursor.col = 0; continue; } *************** *** 7114,7120 **** --- 7117,7126 ---- { if (find_last_paren(l, '{', '}') && (trypos = find_start_brace(ind_maxcomment)) != NULL) + { curwin->w_cursor.lnum = trypos->lnum + 1; + curwin->w_cursor.col = 0; + } continue; } *************** *** 7230,7240 **** * case xx: if ( asdf && * asdf) */ ! curwin->w_cursor.lnum = trypos->lnum; l = ml_get_curline(); if (cin_iscase(l) || cin_isscopedecl(l)) { ++curwin->w_cursor.lnum; continue; } } --- 7236,7247 ---- * case xx: if ( asdf && * asdf) */ ! curwin->w_cursor = *trypos; l = ml_get_curline(); if (cin_iscase(l) || cin_isscopedecl(l)) { ++curwin->w_cursor.lnum; + curwin->w_cursor.col = 0; continue; } } *************** *** 7254,7259 **** --- 7261,7267 ---- if (*l == NUL || l[STRLEN(l) - 1] != '\\') break; --curwin->w_cursor.lnum; + curwin->w_cursor.col = 0; } } *************** *** 7587,7597 **** * case xx: if ( asdf && * asdf) */ ! curwin->w_cursor.lnum = trypos->lnum; l = ml_get_curline(); if (cin_iscase(l) || cin_isscopedecl(l)) { ++curwin->w_cursor.lnum; continue; } } --- 7595,7606 ---- * case xx: if ( asdf && * asdf) */ ! curwin->w_cursor = *trypos; l = ml_get_curline(); if (cin_iscase(l) || cin_isscopedecl(l)) { ++curwin->w_cursor.lnum; + curwin->w_cursor.col = 0; continue; } } *************** *** 7652,7664 **** && (trypos = find_start_brace(ind_maxcomment)) != NULL) /* XXX */ { ! curwin->w_cursor.lnum = trypos->lnum; /* if not "else {" check for terminated again */ /* but skip block for "} else {" */ l = cin_skipcomment(ml_get_curline()); if (*l == '}' || !cin_iselse(l)) goto term_again; ++curwin->w_cursor.lnum; } } } --- 7661,7674 ---- && (trypos = find_start_brace(ind_maxcomment)) != NULL) /* XXX */ { ! curwin->w_cursor = *trypos; /* if not "else {" check for terminated again */ /* but skip block for "} else {" */ l = cin_skipcomment(ml_get_curline()); if (*l == '}' || !cin_iselse(l)) goto term_again; ++curwin->w_cursor.lnum; + curwin->w_cursor.col = 0; } } } *************** *** 7727,7732 **** --- 7737,7743 ---- if ((trypos = find_start_comment(ind_maxcomment)) != NULL) { curwin->w_cursor.lnum = trypos->lnum + 1; + curwin->w_cursor.col = 0; continue; } *************** *** 7777,7783 **** if (find_last_paren(l, '(', ')') && (trypos = find_match_paren(ind_maxparen, ind_maxcomment)) != NULL) ! curwin->w_cursor.lnum = trypos->lnum; /* For a line ending in ',' that is a continuation line go * back to the first line with a backslash: --- 7788,7794 ---- if (find_last_paren(l, '(', ')') && (trypos = find_match_paren(ind_maxparen, ind_maxcomment)) != NULL) ! curwin->w_cursor = *trypos; /* For a line ending in ',' that is a continuation line go * back to the first line with a backslash: *************** *** 7791,7796 **** --- 7802,7808 ---- if (*l == NUL || l[STRLEN(l) - 1] != '\\') break; --curwin->w_cursor.lnum; + curwin->w_cursor.col = 0; } amount = get_indent(); /* XXX */ *************** *** 7864,7870 **** if ((trypos = find_match_paren(ind_maxparen, ind_maxcomment)) != NULL) ! curwin->w_cursor.lnum = trypos->lnum; amount = get_indent(); /* XXX */ break; } --- 7876,7882 ---- if ((trypos = find_match_paren(ind_maxparen, ind_maxcomment)) != NULL) ! curwin->w_cursor = *trypos; amount = get_indent(); /* XXX */ break; } *** ../vim-7.1.263/src/version.c Mon Feb 25 20:45:46 2008 --- src/version.c Mon Feb 25 21:51:20 2008 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 264, /**/ -- hundred-and-one symptoms of being an internet addict: 49. You never have to deal with busy signals when calling your ISP...because you never log off. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Mon Mar 3 14:41:17 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Mon, 3 Mar 2008 14:41:17 GMT Subject: devel/vim 7.1.265,NONE,1.1 Message-ID: <200803031441.m23EfHgq006495@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6487 Added Files: 7.1.265 Log Message: - patchlevel 265 --- NEW FILE 7.1.265 --- To: vim-dev at vim.org Subject: Patch 7.1.265 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.265 Problem: When 'isfname' contains a space, cmdline completion can hang. (James Vega) Solution: Reset the "len" variable. Files: src/ex_docmd.c *** ../vim-7.1.264/src/ex_docmd.c Sat Jan 19 15:55:51 2008 --- src/ex_docmd.c Sun Feb 24 22:09:52 2008 *************** *** 3346,3351 **** --- 3346,3352 ---- #endif )) { + len = 0; /* avoid getting stuck when space is in 'isfname' */ while (*p != NUL) { #ifdef FEAT_MBYTE *** ../vim-7.1.264/src/version.c Mon Feb 25 21:54:23 2008 --- src/version.c Tue Feb 26 21:28:25 2008 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 265, /**/ -- Q: What is a patch 22? A: A patch you need to include to make it possible to include patches. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Mon Mar 3 14:41:57 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Mon, 3 Mar 2008 14:41:57 GMT Subject: devel/vim 7.1.266,NONE,1.1 README.patches,1.97,1.98 Message-ID: <200803031441.m23Efvpm006555@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6514 Modified Files: README.patches Added Files: 7.1.266 Log Message: - patchlevel 266 --- NEW FILE 7.1.266 --- To: vim-dev at vim.org Subject: Patch 7.1.266 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.266 Problem: When the version string returned by the terminal contains unexpected characters, it is used as typed input. (James Vega) Solution: Assume the escape sequence ends in a letter. Files: src/term.c *** ../vim-7.1.265/src/term.c Sat Sep 15 14:06:41 2007 --- src/term.c Mon Feb 25 20:21:53 2008 *************** *** 4050,4064 **** { /* Check for xterm version string: "[>{x};{vers};{y}c". Also * eat other possible responses to t_RV, rxvt returns ! * "[?1;2c". Also accept CSI instead of [. */ if (*T_CRV != NUL && ((tp[0] == ESC && tp[1] == '[' && len >= 3) || (tp[0] == CSI && len >= 2))) { j = 0; extra = 0; ! for (i = 2 + (tp[0] != CSI); ! i < len && (VIM_ISDIGIT(tp[i]) ! || tp[i] == ';' || tp[i] == '.'); ++i) if (tp[i] == ';' && ++j == 1) extra = atoi((char *)tp + i + 1); if (i == len) --- 4050,4066 ---- { /* Check for xterm version string: "[>{x};{vers};{y}c". Also * eat other possible responses to t_RV, rxvt returns ! * "[?1;2c". Also accept CSI instead of [. ! * mrxvt has been reported to have "+" in the version. Assume ! * the escape sequence ends with a letter or one of "{|}~". */ if (*T_CRV != NUL && ((tp[0] == ESC && tp[1] == '[' && len >= 3) || (tp[0] == CSI && len >= 2))) { j = 0; extra = 0; ! for (i = 2 + (tp[0] != CSI); i < len ! && !(tp[i] >= '{' && tp[i] <= '~') ! && !ASCII_ISALPHA(tp[i]); ++i) if (tp[i] == ';' && ++j == 1) extra = atoi((char *)tp + i + 1); if (i == len) *** ../vim-7.1.265/src/version.c Tue Feb 26 21:29:06 2008 --- src/version.c Wed Feb 27 16:10:59 2008 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 266, /**/ -- hundred-and-one symptoms of being an internet addict: 54. You start tilting your head sideways to smile. :-) /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// Index: README.patches =================================================================== RCS file: /cvs/extras/devel/vim/README.patches,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- README.patches 25 Feb 2008 15:49:36 -0000 1.97 +++ README.patches 3 Mar 2008 14:41:24 -0000 1.98 @@ -294,3 +294,7 @@ 1805 7.1.260 cursor position wrong after ^@ wrapping halfway if using utf-8 2255 7.1.261 for a 2 byte BOM UCS-2 is used, which doesn't work for UTF-16 3438 7.1.262 can't get the process ID of Vim + 2442 7.1.263 filetype with dot doesn't work for indent plugins + 6295 7.1.264 crash when C-indenting + 1310 7.1.265 hang when completing file name and space in 'isfname' + 2510 7.1.266 version string returned by terminal may be used as typed input From fedora-extras-commits at redhat.com Mon Mar 3 14:45:56 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 3 Mar 2008 14:45:56 GMT Subject: common Makefile.common,1.87,1.88 Message-ID: <200803031445.m23EjuT9006661@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6619 Modified Files: Makefile.common Log Message: if someone defines SECONDARY_CONFIG trust they know what they are doing. Index: Makefile.common =================================================================== RCS file: /cvs/extras/common/Makefile.common,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- Makefile.common 15 Jan 2008 14:22:36 -0000 1.87 +++ Makefile.common 3 Mar 2008 14:45:26 -0000 1.88 @@ -111,7 +111,10 @@ do if [ "$$name" = "$(NAME)" ]; then echo "-c ~/.koji/sparc-config"; fi \ done endef +# if we have defineded SECONDARY_CONFIG trust the user is doing it for a reason +ifndef SECONDARY_CONFIG SECONDARY_CONFIG := $(shell $(secondary-arch)) +endif # default target: just make sure we've got the sources all: sources From fedora-extras-commits at redhat.com Mon Mar 3 14:47:35 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 14:47:35 GMT Subject: rpms/kde-l10n/devel kde-l10n.spec,1.15,1.16 Message-ID: <200803031447.m23ElZAO006706@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kde-l10n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6670 Modified Files: kde-l10n.spec Log Message: typo Index: kde-l10n.spec =================================================================== RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- kde-l10n.spec 3 Mar 2008 14:04:49 -0000 1.15 +++ kde-l10n.spec 3 Mar 2008 14:46:54 -0000 1.16 @@ -1004,7 +1004,7 @@ %files LowSaxon %defattr(-,root,root) %lang(nds) %{_datadir}/locale/nds/* -%lang(nds) %{_kde4_appsdir}/lettres/nds +%lang(nds) %{_kde4_appsdir}/klettres/nds %lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml %lang(nds) %{_kde4_appsdir}/khangman/nds.txt %lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds.soundtheme From fedora-extras-commits at redhat.com Mon Mar 3 14:49:06 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 3 Mar 2008 14:49:06 GMT Subject: rpms/glib2/devel inline.patch,NONE,1.1 glib2.spec,1.157,1.158 Message-ID: <200803031449.m23En6lt006800@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6753 Modified Files: glib2.spec Added Files: inline.patch Log Message: fix inline support inline.patch: --- NEW FILE inline.patch --- diff -up glib-2.15.6/glib/gutils.h.inline glib-2.15.6/glib/gutils.h --- glib-2.15.6/glib/gutils.h.inline 2008-03-03 09:46:44.000000000 -0500 +++ glib-2.15.6/glib/gutils.h 2008-03-03 09:46:52.000000000 -0500 @@ -97,7 +97,11 @@ G_BEGIN_DECLS # define G_INLINE_FUNC # undef G_CAN_INLINE #elif defined (__GNUC__) -# define G_INLINE_FUNC static __inline __attribute__ ((unused)) +# ifdef __GNUC_STDC_INLINE__ +# define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__)) +# else +# define G_INLINE_FUNC extern inline +# endif #elif defined (G_CAN_INLINE) # define G_INLINE_FUNC static inline #else /* can't inline */ Index: glib2.spec =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- glib2.spec 25 Feb 2008 20:21:00 -0000 1.157 +++ glib2.spec 3 Mar 2008 14:48:18 -0000 1.158 @@ -3,7 +3,7 @@ Summary: A library of handy utility functions Name: glib2 Version: 2.15.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -18,6 +18,8 @@ BuildRequires: libselinux-devel # for sys/inotify.h BuildRequires: glibc-devel +# fixed in upstream svn +Patch0: inline.patch %description @@ -51,6 +53,7 @@ %prep %setup -q -n glib-%{version} +%patch0 -p1 -b .inline %build %configure --disable-gtk-doc --enable-static @@ -123,6 +126,9 @@ %{_libdir}/lib*.a %changelog +* Mon Mar 3 2008 Matthias Clasen - 2.15.6-2 +- Fix inline support + * Mon Feb 25 2008 Matthias Clasen - 2.15.6-1 - Update to 2.15.6 From fedora-extras-commits at redhat.com Mon Mar 3 14:54:13 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Mon, 3 Mar 2008 14:54:13 GMT Subject: rpms/iptables/devel iptables.spec,1.66,1.67 Message-ID: <200803031454.m23EsDcO007006@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/iptables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6930 Modified Files: iptables.spec Log Message: - removed // from _kernel because of /usr/lib/rpm/debugedit problem Index: iptables.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- iptables.spec 3 Mar 2008 13:47:25 -0000 1.66 +++ iptables.spec 3 Mar 2008 14:53:35 -0000 1.67 @@ -1,5 +1,5 @@ %define build_devel 1 -%define _kernel $(ls -d /usr/src/kernels/*/ | head -1) +%define _kernel $(ls -d /usr/src/kernels/* | head -1) Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities From fedora-extras-commits at redhat.com Mon Mar 3 14:54:38 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Mon, 3 Mar 2008 14:54:38 GMT Subject: rpms/libsmbios/devel libsmbios.spec,1.10,1.11 Message-ID: <200803031454.m23EscD5007048@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/libsmbios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6980 Modified Files: libsmbios.spec Log Message: * Wed Feb 13 2008 Michael E Brown - 2.0.1-2 - properly obsolete older versions Index: libsmbios.spec =================================================================== RCS file: /cvs/extras/rpms/libsmbios/devel/libsmbios.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libsmbios.spec 14 Feb 2008 05:39:38 -0000 1.10 +++ libsmbios.spec 3 Mar 2008 14:53:58 -0000 1.11 @@ -8,7 +8,7 @@ Name: %{release_name} Version: %{release_version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ or OSL Group: System Environment/Libraries Source: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz @@ -44,9 +44,9 @@ Summary: The "supported" sample binaries that use libsmbios Group: Applications/System Requires: libsmbios = %{version}-%{release} -Obsoletes: libsmbios-bin < 0:0.13.11 +Obsoletes: libsmbios-bin < 0:2.0.0 Provides: libsmbios-bin = %{version}-%{release} -Obsoletes: libsmbios-unsupported-bin < 0.13.11 +Obsoletes: libsmbios-unsupported-bin < 0:2.0.0 Provides: libsmbios-unsupported-bin = %{version}-%{release} %package devel @@ -152,6 +152,9 @@ # ./ChangeLog is appended by configure %changelog +* Wed Feb 13 2008 Michael E Brown - 2.0.1-2 +- properly obsolete older versions + * Wed Feb 13 2008 Michael E Brown - 2.0.1 - Fixup GCC 4.3 compile issues. From fedora-extras-commits at redhat.com Mon Mar 3 14:55:47 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Mon, 3 Mar 2008 14:55:47 GMT Subject: rpms/ppp/devel ppp-2.4.2-dontwriteetc.patch, 1.1, 1.2 ppp.spec, 1.42, 1.43 Message-ID: <200803031455.m23EtlX6007158@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/ppp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7135 Modified Files: ppp-2.4.2-dontwriteetc.patch ppp.spec Log Message: * Mon Mar 03 2008 Martin Nagy 2.4.4-5 - put logs into /var/log/ppp (#118837) ppp-2.4.2-dontwriteetc.patch: Index: ppp-2.4.2-dontwriteetc.patch =================================================================== RCS file: /cvs/extras/rpms/ppp/devel/ppp-2.4.2-dontwriteetc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ppp-2.4.2-dontwriteetc.patch 9 Sep 2004 10:43:30 -0000 1.1 +++ ppp-2.4.2-dontwriteetc.patch 3 Mar 2008 14:55:40 -0000 1.2 @@ -1,35 +1,52 @@ ---- ppp-2.4.2/chat/chat.8.dontwriteetc 2002-09-07 12:37:49.000000000 +0200 -+++ ppp-2.4.2/chat/chat.8 2004-05-07 10:45:30.000000000 +0200 -@@ -200,7 +200,7 @@ +diff -up ppp-2.4.4/chat/chat.8.dontwriteetc ppp-2.4.4/chat/chat.8 +--- ppp-2.4.4/chat/chat.8.dontwriteetc 2004-11-13 13:22:49.000000000 +0100 ++++ ppp-2.4.4/chat/chat.8 2008-03-03 15:37:55.000000000 +0100 +@@ -200,7 +200,7 @@ The \fBSAY\fR directive allows the scrip at the terminal via standard error. If \fBchat\fR is being run by pppd, and pppd is running as a daemon (detached from its controlling terminal), standard error will normally be redirected to the file --/etc/ppp/connect-errors. -+/var/log/ppp/connect-errors. +-/etc/ppp/connect\-errors. ++/var/log/ppp/connect\-errors. .LP \fBSAY\fR strings must be enclosed in single or double quotes. If carriage return and line feed are needed in the string to be output, ---- ppp-2.4.2/linux/Makefile.top.dontwriteetc 2002-09-07 12:37:49.000000000 +0200 -+++ ppp-2.4.2/linux/Makefile.top 2004-05-07 10:44:40.000000000 +0200 -@@ -5,6 +5,8 @@ - INCDIR = $(DESTDIR)/usr/include - MANDIR = $(DESTDIR)/usr/man - ETCDIR = $(DESTDIR)/etc/ppp +diff -up ppp-2.4.4/pppd/pathnames.h.dontwriteetc ppp-2.4.4/pppd/pathnames.h +--- ppp-2.4.4/pppd/pathnames.h.dontwriteetc 2008-03-03 15:26:51.000000000 +0100 ++++ ppp-2.4.4/pppd/pathnames.h 2008-03-03 15:26:51.000000000 +0100 +@@ -28,9 +28,9 @@ + #define _PATH_AUTHUP _ROOT_PATH "/etc/ppp/auth-up" + #define _PATH_AUTHDOWN _ROOT_PATH "/etc/ppp/auth-down" + #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." +-#define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors" ++#define _PATH_CONNERRS _ROOT_PATH "/var/log/ppp/connect-errors" + #define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/" +-#define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf" ++#define _PATH_RESOLV _ROOT_PATH "/var/run/ppp/resolv.conf" + + #define _PATH_USEROPT ".ppprc" + #define _PATH_PSEUDONYM ".ppp_pseudonym" +diff -up ppp-2.4.4/linux/Makefile.top.dontwriteetc ppp-2.4.4/linux/Makefile.top +--- ppp-2.4.4/linux/Makefile.top.dontwriteetc 2006-06-04 07:04:14.000000000 +0200 ++++ ppp-2.4.4/linux/Makefile.top 2008-03-03 15:42:10.000000000 +0100 +@@ -5,6 +5,8 @@ BINDIR = $(DESTDIR)/sbin + INCDIR = $(DESTDIR)/include + MANDIR = $(DESTDIR)/share/man + ETCDIR = $(INSTROOT)@SYSCONF@/ppp +RUNDIR = $(DESTDIR)/var/run/ppp +LOGDIR = $(DESTDIR)/var/log/ppp # uid 0 = root INSTALL= install -@@ -16,7 +18,7 @@ +@@ -16,7 +18,7 @@ all: cd pppstats; $(MAKE) $(MFLAGS) all cd pppdump; $(MAKE) $(MFLAGS) all --install: $(BINDIR) $(MANDIR)/man8 install-progs install-etcppp install-devel -+install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-etcppp install-devel +-install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel ++install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-devel install-progs: - cd chat; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install -@@ -44,6 +46,10 @@ + cd chat; $(MAKE) $(MFLAGS) install +@@ -44,6 +46,10 @@ $(MANDIR)/man8: $(INSTALL) -d -m 755 $@ $(ETCDIR): $(INSTALL) -d -m 755 $@ @@ -40,17 +57,3 @@ clean: rm -f `find . -name '*.[oas]' -print` ---- ppp-2.4.2/pppd/pathnames.h.dontwriteetc 2004-05-07 10:29:29.000000000 +0200 -+++ ppp-2.4.2/pppd/pathnames.h 2004-05-07 11:40:08.000000000 +0200 -@@ -27,9 +27,9 @@ - #define _PATH_AUTHUP _ROOT_PATH "/etc/ppp/auth-up" - #define _PATH_AUTHDOWN _ROOT_PATH "/etc/ppp/auth-down" - #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." --#define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors" -+#define _PATH_CONNERRS _ROOT_PATH "/var/log/ppp/connect-errors" - #define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/" --#define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf" -+#define _PATH_RESOLV _ROOT_PATH "/var/run/ppp/resolv.conf" - - #define _PATH_USEROPT ".ppprc" - #define _PATH_PSEUDONYM ".ppp_pseudonym" Index: ppp.spec =================================================================== RCS file: /cvs/extras/rpms/ppp/devel/ppp.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- ppp.spec 11 Feb 2008 10:21:51 -0000 1.42 +++ ppp.spec 3 Mar 2008 14:55:40 -0000 1.43 @@ -1,7 +1,7 @@ Summary: The PPP (Point-to-Point Protocol) daemon. Name: ppp Version: 2.4.4 -Release: 4%{?dist} +Release: 5%{?dist} License: distributable Group: System Environment/Daemons Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz @@ -23,6 +23,7 @@ Patch20: ppp-2.4.3-ipv6-accept-remote.patch Patch21: ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch Patch22: ppp-2.4.4-cbcp.patch +Patch23: ppp-2.4.2-dontwriteetc.patch BuildRoot: %{_tmppath}/%{name}-root BuildPrereq: pam-devel, libpcap-devel @@ -55,6 +56,7 @@ %patch20 -p1 -b .ipv6cp %patch21 -p1 -b .usepeerdns-var_run_ppp_resolv %patch22 -p1 -b .cbcp +%patch23 -p1 -b .dontwriteetc rm -f scripts/*.local rm -f scripts/*.change_resolv_conf @@ -116,6 +118,9 @@ %changelog +* Mon Mar 03 2008 Martin Nagy 2.4.4-5 +- put logs into /var/log/ppp (#118837) + * Mon Feb 11 2008 Martin Nagy 2.4.4-4 - rebuild for gcc-4.3 From fedora-extras-commits at redhat.com Mon Mar 3 15:10:21 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Mon, 3 Mar 2008 15:10:21 GMT Subject: rpms/kernel/devel patch-2.6.25-rc3-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.771, 1.772 kernel.spec, 1.467, 1.468 sources, 1.731, 1.732 upstream, 1.653, 1.654 patch-2.6.25-rc3-git2.bz2.sign, 1.1, NONE Message-ID: <200803031510.m23FAL1b014543@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14513 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.25-rc3-git4.bz2.sign Removed Files: patch-2.6.25-rc3-git2.bz2.sign Log Message: * Mon Mar 03 2008 Kyle McMartin - Linux 2.6.25-rc3-git4 --- NEW FILE patch-2.6.25-rc3-git4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBHy6KoyGugalF9Dw4RAnWHAJ9v+DWM1vKaal215KCbComnQSR4oQCcDyND jDJJqashNpP3gopShJmmMUo= =SYXe -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.771 retrieving revision 1.772 diff -u -r1.771 -r1.772 --- .cvsignore 29 Feb 2008 22:52:39 -0000 1.771 +++ .cvsignore 3 Mar 2008 15:09:40 -0000 1.772 @@ -5,4 +5,4 @@ kernel-2.6.24 linux-2.6.24.tar.bz2 patch-2.6.25-rc3.bz2 -patch-2.6.25-rc3-git2.bz2 +patch-2.6.25-rc3-git4.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.467 retrieving revision 1.468 diff -u -r1.467 -r1.468 --- kernel.spec 3 Mar 2008 06:33:26 -0000 1.467 +++ kernel.spec 3 Mar 2008 15:09:40 -0000 1.468 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 3 # The git snapshot level -%define gitrev 2 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1143,10 +1143,10 @@ # linux1394 git patches #ApplyPatch linux-2.6-firewire-git-update.patch -C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}') -if [ "$C" -gt 10 ]; then -ApplyPatch linux-2.6-firewire-git-pending.patch -fi +#C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}') +#if [ "$C" -gt 10 ]; then +#ApplyPatch linux-2.6-firewire-git-pending.patch +#fi # usb video ApplyPatch linux-2.6-uvcvideo.patch @@ -1740,6 +1740,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Mon Mar 03 2008 Kyle McMartin +- Linux 2.6.25-rc3-git4 + * Mon Mar 03 2008 Dave Airlie - drm/i915: remove intel sarea priv refs for DRI2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.731 retrieving revision 1.732 diff -u -r1.731 -r1.732 --- sources 29 Feb 2008 22:52:39 -0000 1.731 +++ sources 3 Mar 2008 15:09:40 -0000 1.732 @@ -1,3 +1,3 @@ 3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2 01b1f6c7b35ba356129c121a81a77991 patch-2.6.25-rc3.bz2 -156ea1879953fb76a7bdf70be5ade0fc patch-2.6.25-rc3-git2.bz2 +098e75ab0b399f89f36f07073207033f patch-2.6.25-rc3-git4.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.653 retrieving revision 1.654 diff -u -r1.653 -r1.654 --- upstream 29 Feb 2008 22:52:39 -0000 1.653 +++ upstream 3 Mar 2008 15:09:40 -0000 1.654 @@ -1,3 +1,3 @@ linux-2.6.24.tar.bz2 patch-2.6.25-rc3.bz2 -patch-2.6.25-rc3-git2.bz2 +patch-2.6.25-rc3-git4.bz2 --- patch-2.6.25-rc3-git2.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 15:14:54 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Mon, 3 Mar 2008 15:14:54 GMT Subject: rpms/libvirt/devel .cvsignore, 1.26, 1.27 libvirt.spec, 1.72, 1.73 sources, 1.27, 1.28 libvirt-0.4.0-auth-null-cb-2.patch, 1.1, NONE libvirt-0.4.0-auth-null-cb.patch, 1.1, NONE libvirt-0.4.0-conffile-size.patch, 1.1, NONE libvirt-0.4.0-nodeinfo-compat.patch, 1.1, NONE libvirt-0.4.0-remote-ssh.patch, 1.1, NONE Message-ID: <200803031514.m23FEs8x014611@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14580 Modified Files: .cvsignore libvirt.spec sources Removed Files: libvirt-0.4.0-auth-null-cb-2.patch libvirt-0.4.0-auth-null-cb.patch libvirt-0.4.0-conffile-size.patch libvirt-0.4.0-nodeinfo-compat.patch libvirt-0.4.0-remote-ssh.patch Log Message: Release of 0.4.1, removal of old patches, spec file cleanup, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 18 Dec 2007 10:44:34 -0000 1.26 +++ .cvsignore 3 Mar 2008 15:14:14 -0000 1.27 @@ -23,3 +23,4 @@ libvirt-0.3.2.tar.gz libvirt-0.3.3.tar.gz libvirt-0.4.0.tar.gz +libvirt-0.4.1.tar.gz Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- libvirt.spec 20 Feb 2008 06:45:43 -0000 1.72 +++ libvirt.spec 3 Mar 2008 15:14:14 -0000 1.73 @@ -8,18 +8,19 @@ %define with_proxy yes %endif +%if "%{fedora}" +%define with_qemu 1 +%else +%define with_qemu 0 +%endif + Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.4.0 -Release: 5%{?dist}%{?extra_release} +Version: 0.4.1 +Release: 1%{?dist}%{?extra_release} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz -Patch1: libvirt-%{version}-auth-null-cb.patch -Patch2: libvirt-%{version}-conffile-size.patch -Patch3: libvirt-%{version}-auth-null-cb-2.patch -Patch4: libvirt-%{version}-remote-ssh.patch -Patch5: libvirt-%{version}-nodeinfo-compat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -34,12 +35,26 @@ Requires: nc Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config -# work correctly & doesn't have onerous dependancies +# work correctly & doesn't have onerous dependencies Requires: cyrus-sasl-md5 %if %{with_polkit} Requires: PolicyKit >= 0.6 %endif - +# For mount/umount in FS driver +BuildRequires: util-linux +%if %{with_qemu} +# From QEMU RPMs +Requires: /usr/bin/qemu-img +%else +# From Xen RPMs +Requires: /usr/sbin/qcow-create +%endif +# For LVM drivers +Requires: lvm2 +# For ISCSI driver +Requires: iscsi-initiator-utils +# For disk driver +Requires: parted %ifarch i386 x86_64 ia64 BuildRequires: xen-devel %endif @@ -49,19 +64,36 @@ BuildRequires: gettext BuildRequires: gnutls-devel BuildRequires: avahi-devel +BuildRequires: libselinux-devel BuildRequires: dnsmasq BuildRequires: bridge-utils +BuildRequires: qemu BuildRequires: cyrus-sasl-devel %if %{with_polkit} BuildRequires: PolicyKit-devel >= 0.6 %endif +# For mount/umount in FS driver +BuildRequires: util-linux +%if %{with_qemu} +# From QEMU RPMs +BuildRequires: /usr/bin/qemu-img +%else +# From Xen RPMs +BuildRequires: /usr/sbin/qcow-create +%endif +# For LVM drivers +BuildRequires: lvm2 +# For ISCSI driver +BuildRequires: iscsi-initiator-utils +# For disk driver +BuildRequires: parted-devel Obsoletes: libvir # Fedora build root suckage BuildRequires: gawk %description -Libvirt is a C toolkit to interract with the virtualization capabilities +Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). %package devel @@ -87,23 +119,24 @@ %description python The libvirt-python package contains a module that permits applications written in the Python programming language to use the interface -supplied by the libvirt library to use the the virtualization capabilities +supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build -# Xen is availble only on i386 x86_64 ia64 +# Xen is available only on i386 x86_64 ia64 %ifarch i386 i686 x86_64 ia64 -%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid +%configure --with-init-script=redhat \ + --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ + --with-remote-file=%{_localstatedir}/run/libvirtd.pid \ + --with-xen-proxy=%{with_proxy} %else -%configure --without-xen --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid +%configure --without-xen \ + --with-init-script=redhat \ + --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ + --with-remote-file=%{_localstatedir}/run/libvirtd.pid %endif make @@ -190,6 +223,7 @@ %if %{with_proxy} == "yes" %attr(4755, root, root) %{_libexecdir}/libvirt_proxy %endif +%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %attr(0755, root, root) %{_sbindir}/libvirtd %doc docs/*.rng %doc docs/*.xml @@ -222,6 +256,13 @@ %doc docs/examples/python %changelog +* Mon Mar 3 2008 Daniel Veillard - 0.4.1-1.fc9 +- Release of 0.4.1 +- Storage APIs +- xenner support +- lots of assorted improvements, bugfixes and cleanups +- documentation and localization improvements + * Wed Feb 20 2008 Fedora Release Engineering - 0.4.0-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 18 Dec 2007 10:44:34 -0000 1.27 +++ sources 3 Mar 2008 15:14:14 -0000 1.28 @@ -1 +1 @@ -2f6c6adb62145988f0e5021e5cbd71d3 libvirt-0.4.0.tar.gz +4dfe45869f082393cfd09f4690454c12 libvirt-0.4.1.tar.gz --- libvirt-0.4.0-auth-null-cb-2.patch DELETED --- --- libvirt-0.4.0-auth-null-cb.patch DELETED --- --- libvirt-0.4.0-conffile-size.patch DELETED --- --- libvirt-0.4.0-nodeinfo-compat.patch DELETED --- --- libvirt-0.4.0-remote-ssh.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 15:43:44 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Mon, 3 Mar 2008 15:43:44 GMT Subject: rpms/libvirt/devel libvirt.spec,1.73,1.74 Message-ID: <200803031543.m23FhiEU015042@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15024 Modified Files: libvirt.spec Log Message: Trying to work around ppc64 lacking any virtualization, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- libvirt.spec 3 Mar 2008 15:14:14 -0000 1.73 +++ libvirt.spec 3 Mar 2008 15:43:06 -0000 1.74 @@ -42,6 +42,8 @@ %endif # For mount/umount in FS driver BuildRequires: util-linux +# PPC64 has no Xen nor QEmu, build anyway +%ifnarch ppc64 %if %{with_qemu} # From QEMU RPMs Requires: /usr/bin/qemu-img @@ -49,6 +51,7 @@ # From Xen RPMs Requires: /usr/sbin/qcow-create %endif +%endif # For LVM drivers Requires: lvm2 # For ISCSI driver From fedora-extras-commits at redhat.com Mon Mar 3 15:50:22 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Mon, 3 Mar 2008 15:50:22 GMT Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea-jhat.patch, 1.7, 1.8 java-1.7.0-icedtea.spec, 1.54, 1.55 sources, 1.39, 1.40 Message-ID: <200803031550.m23FoMqA015210@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15180 Modified Files: java-1.7.0-icedtea-jhat.patch java-1.7.0-icedtea.spec sources Log Message: * Mon Mar 03 2008 Lillian Angel - 1.7.0.0-0.28.b24 - ExcludeArch ppc added. - Updated release. java-1.7.0-icedtea-jhat.patch: Index: java-1.7.0-icedtea-jhat.patch =================================================================== RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea-jhat.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- java-1.7.0-icedtea-jhat.patch 5 Feb 2008 17:46:23 -0000 1.7 +++ java-1.7.0-icedtea-jhat.patch 3 Mar 2008 15:50:11 -0000 1.8 @@ -48,9 +48,9 @@ # dump file is large so remove it rm ${DUMPFILE} ---- oldopenjdk/jdk/make/common/Release.gmk 2008-02-05 11:31:07.000000000 -0500 -+++ openjdk/jdk/make/common/Release.gmk 2008-02-05 11:32:09.000000000 -0500 -@@ -371,7 +371,6 @@ +--- oldopenjdk/jdk/make/common/Release.gmk 2008-01-04 18:20:29.000000000 -0500 ++++ openjdk/jdk/make/common/Release.gmk 2008-02-29 08:59:51.000000000 -0500 +@@ -373,7 +373,6 @@ com/sun/tools/example/debug/expr \ com/sun/tools/example/debug/tty \ com/sun/tools/extcheck \ @@ -58,11 +58,13 @@ com/sun/tools/javac \ com/sun/tools/javadoc \ com/sun/tools/apt \ -@@ -469,7 +468,6 @@ +@@ -473,8 +472,7 @@ + wsgen$(EXE_SUFFIX) \ wsimport$(EXE_SUFFIX) \ schemagen$(EXE_SUFFIX) \ - jsadebugd$(EXE_SUFFIX) \ -- jhat$(EXE_SUFFIX) \ - javaws$(EXE_SUFFIX) +- jsadebugd$(EXE_SUFFIX) \ +- jhat$(EXE_SUFFIX) ++ jsadebugd$(EXE_SUFFIX) # The following get removed from the JRE after the bulk-copy of LIBDIR... + NOTJRELIBS = tools.jar \ Index: java-1.7.0-icedtea.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- java-1.7.0-icedtea.spec 25 Feb 2008 02:25:36 -0000 1.54 +++ java-1.7.0-icedtea.spec 3 Mar 2008 15:50:11 -0000 1.55 @@ -101,7 +101,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.27.%{openjdkver}%{?dist} +Release: 0.28.%{openjdkver}%{?dist} Summary: IcedTea Runtime Environment Group: Development/Languages @@ -121,6 +121,7 @@ Source7: mauve_tests Patch0: java-1.7.0-icedtea-win32.patch Patch1: java-1.7.0-icedtea-jhat.patch +ExcludeArch: ppc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -744,6 +745,10 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Mon Mar 03 2008 Lillian Angel - 1.7.0.0-0.28.b24 +- ExcludeArch ppc added. +- Updated release. + * Tue Feb 19 2008 Lillian Angel - 1.7.0.0-0.27.b24 - Updated sources. - Updated release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 19 Feb 2008 17:32:05 -0000 1.39 +++ sources 3 Mar 2008 15:50:11 -0000 1.40 @@ -2,4 +2,4 @@ abee6aad1525bee3d45a13d0adf859c9 mauve-2007-09-12.tar.gz 254bfa2360efb5374439f9b1738c7b22 openjdk-b24-fedora.zip 7a0c160c03012cd40957a7a112e25038 mauve_tests -26baaf03704d813f63616e3590f0fc3f icedtea-1.6.tar.gz +0deadd4cbbef0490365bc6a24661e638 icedtea-1.6.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 15:56:11 2008 From: fedora-extras-commits at redhat.com (John Dennis (jdennis)) Date: Mon, 3 Mar 2008 15:56:11 GMT Subject: rpms/setroubleshoot-plugins/F-8 setroubleshoot-plugins.spec, 1.11, 1.12 Message-ID: <200803031556.m23FuBIK015432@cvs-int.fedora.redhat.com> Author: jdennis Update of /cvs/pkgs/rpms/setroubleshoot-plugins/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15375/F-8 Modified Files: setroubleshoot-plugins.spec Log Message: fix requires on setroubleshoot, should have been setroubleshoot-server Index: setroubleshoot-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/F-8/setroubleshoot-plugins.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- setroubleshoot-plugins.spec 22 Feb 2008 17:22:31 -0000 1.11 +++ setroubleshoot-plugins.spec 3 Mar 2008 15:55:30 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Analysis plugins for use with setroubleshoot Name: setroubleshoot-plugins Version: 2.0.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/setroubleshoot @@ -12,7 +12,7 @@ BuildRequires: perl-XML-Parser BuildRequires: intltool gettext python Requires: dbus -Requires: setroubleshoot >= 2.0.4 +Requires: setroubleshoot-server >= 2.0.4 %{?fc9:Requires: policycoreutils >= 2.0.35-2} %define pkgdocdir %{_datadir}/doc/%{name}-%{version} @@ -52,6 +52,9 @@ %{_datadir}/setroubleshoot/plugins %changelog +* Mon Mar 3 2008 John Dennis - 2.0.4-4 + - change requires setroubleshoot to requires setroubleshoot-server + * Fri Feb 22 2008 - 2.0.4-3 - bump rev for build From fedora-extras-commits at redhat.com Mon Mar 3 15:56:18 2008 From: fedora-extras-commits at redhat.com (John Dennis (jdennis)) Date: Mon, 3 Mar 2008 15:56:18 GMT Subject: rpms/setroubleshoot-plugins/devel setroubleshoot-plugins.spec, 1.9, 1.10 Message-ID: <200803031556.m23FuIVi015435@cvs-int.fedora.redhat.com> Author: jdennis Update of /cvs/pkgs/rpms/setroubleshoot-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15375/devel Modified Files: setroubleshoot-plugins.spec Log Message: fix requires on setroubleshoot, should have been setroubleshoot-server Index: setroubleshoot-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- setroubleshoot-plugins.spec 31 Jan 2008 21:58:45 -0000 1.9 +++ setroubleshoot-plugins.spec 3 Mar 2008 15:55:41 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Analysis plugins for use with setroubleshoot Name: setroubleshoot-plugins Version: 2.0.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/setroubleshoot @@ -12,7 +12,7 @@ BuildRequires: perl-XML-Parser BuildRequires: intltool gettext python Requires: dbus -Requires: setroubleshoot >= 2.0.4 +Requires: setroubleshoot-server >= 2.0.4 %if 0%{?fedora} Requires: policycoreutils >= 2.0.35-2 %endif @@ -54,6 +54,9 @@ %{_datadir}/setroubleshoot/plugins %changelog +* Mon Mar 3 2008 John Dennis - 2.0.4-2 + - change requires setroubleshoot to requires setroubleshoot-server + * Thu Jan 31 2008 - 2.0.4-1 - Resolve bug #416351: setroubleshoot does not escape regex chars in suggested cmds - add new template substitution $SOURCE, a friendly name, $SOURCE_PATH still exists From fedora-extras-commits at redhat.com Mon Mar 3 15:57:14 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Mon, 3 Mar 2008 15:57:14 GMT Subject: rpms/gnome-panel/devel gnome-panel-2.16.1-allow-spurious-view-done-signals.patch, NONE, 1.1 gnome-panel.spec, 1.268, 1.269 Message-ID: <200803031557.m23FvE5W015469@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15431 Modified Files: gnome-panel.spec Added Files: gnome-panel-2.16.1-allow-spurious-view-done-signals.patch Log Message: - Don't crash with Zimbra connector gnome-panel-2.16.1-allow-spurious-view-done-signals.patch: --- NEW FILE gnome-panel-2.16.1-allow-spurious-view-done-signals.patch --- --- gnome-panel-2.16.1/applets/clock/calendar-client.c.allow-spurious-view-done-signals 2008-01-07 11:50:59.000000000 -0500 +++ gnome-panel-2.16.1/applets/clock/calendar-client.c 2008-01-07 11:54:08.000000000 -0500 @@ -1199,6 +1199,13 @@ { CalendarClientQuery *query; + if (!source->query_in_progress) + { + g_warning ("Got spurious 'view-done' signal from calendar backend for query %p\n", + &source->completed_query); + return; + } + query = goddamn_this_is_crack (source, view, NULL); dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message (status)); Index: gnome-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- gnome-panel.spec 26 Feb 2008 17:36:45 -0000 1.268 +++ gnome-panel.spec 3 Mar 2008 15:56:32 -0000 1.269 @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.21.92 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2 @@ -110,6 +110,9 @@ Patch23: sunrise.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=520111 +Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch + Conflicts: gnome-power-manager < 2.15.3 %description @@ -156,6 +159,7 @@ %patch11 -p1 -b .applet-error %patch14 -p1 -b .ck-shutdown %patch23 -p1 -b .sunrise +%patch24 -p1 -b .allow-spurious-view-done-signals . %{SOURCE6} @@ -340,6 +344,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 3 2008 Ray Strode - 2.21.92-2 +- Don't crash with Zimbra connector + * Tue Feb 26 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 From fedora-extras-commits at redhat.com Mon Mar 3 15:58:15 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Mon, 3 Mar 2008 15:58:15 GMT Subject: rpms/gnome-panel/devel gnome-panel.spec,1.269,1.270 Message-ID: <200803031558.m23FwFaq015519@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15475 Modified Files: gnome-panel.spec Log Message: Update changelog with bug number Index: gnome-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- gnome-panel.spec 3 Mar 2008 15:56:32 -0000 1.269 +++ gnome-panel.spec 3 Mar 2008 15:57:27 -0000 1.270 @@ -345,7 +345,7 @@ %changelog * Mon Mar 3 2008 Ray Strode - 2.21.92-2 -- Don't crash with Zimbra connector +- Don't crash with Zimbra connector (bug 435355) * Tue Feb 26 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 From fedora-extras-commits at redhat.com Mon Mar 3 16:03:47 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Mon, 3 Mar 2008 16:03:47 GMT Subject: rpms/gnome-panel/F-8 gnome-panel.spec,1.230,1.231 Message-ID: <200803031603.m23G3l8t022834@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gnome-panel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22779 Modified Files: gnome-panel.spec Log Message: - Don't crash with Zimbra connector (bug 435355) Index: gnome-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/F-8/gnome-panel.spec,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- gnome-panel.spec 8 Jan 2008 15:53:03 -0000 1.230 +++ gnome-panel.spec 3 Mar 2008 16:03:08 -0000 1.231 @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.20.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2 Source1: redhat-panel-default-setup.entries @@ -107,6 +107,9 @@ #compiz support Patch13: gnome-panel-2.20.1-compiz-support.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=520111 +Patch14: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch + Conflicts: gnome-power-manager < 2.15.3 %description @@ -145,6 +148,7 @@ %patch11 -p1 -b .applet-error %patch12 -p1 -b .more-sharp-icons %patch13 -p1 -b .compiz-support +%patch14 -p1 -b .allow-spurious-view-done-signals . %{SOURCE4} @@ -324,6 +328,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 3 2008 Ray Strode - 2.20.3-2 +- Don't crash with Zimbra connector (bug 435355) + * Tue Jan 08 2008 - Bastien Nocera - 2.20.3-1 - Update to 2.20.3 From fedora-extras-commits at redhat.com Mon Mar 3 16:04:00 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Mon, 3 Mar 2008 16:04:00 GMT Subject: rpms/libvirt/devel libvirt.spec,1.74,1.75 Message-ID: <200803031604.m23G40XD022837@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22788 Modified Files: libvirt.spec Log Message: More crazyness around ppc64, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- libvirt.spec 3 Mar 2008 15:43:06 -0000 1.74 +++ libvirt.spec 3 Mar 2008 16:03:24 -0000 1.75 @@ -9,7 +9,11 @@ %endif %if "%{fedora}" +%ifarch ppc64 +%define with_qemu 0 +%else %define with_qemu 1 +%endif %else %define with_qemu 0 %endif @@ -42,7 +46,7 @@ %endif # For mount/umount in FS driver BuildRequires: util-linux -# PPC64 has no Xen nor QEmu, build anyway +# PPC64 has no Xen nor QEmu, try to build anyway %ifnarch ppc64 %if %{with_qemu} # From QEMU RPMs @@ -70,13 +74,17 @@ BuildRequires: libselinux-devel BuildRequires: dnsmasq BuildRequires: bridge-utils +%if %{with_qemu} BuildRequires: qemu +%endif BuildRequires: cyrus-sasl-devel %if %{with_polkit} BuildRequires: PolicyKit-devel >= 0.6 %endif # For mount/umount in FS driver BuildRequires: util-linux +# PPC64 has no Xen nor QEmu, try to build anyway +%ifnarch ppc64 %if %{with_qemu} # From QEMU RPMs BuildRequires: /usr/bin/qemu-img @@ -84,6 +92,7 @@ # From Xen RPMs BuildRequires: /usr/sbin/qcow-create %endif +%endif # For LVM drivers BuildRequires: lvm2 # For ISCSI driver @@ -136,10 +145,18 @@ --with-remote-file=%{_localstatedir}/run/libvirtd.pid \ --with-xen-proxy=%{with_proxy} %else +%ifnarch ppc64 %configure --without-xen \ --with-init-script=redhat \ --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ --with-remote-file=%{_localstatedir}/run/libvirtd.pid +%else +%configure --without-xen \ + --without-qemu \ + --with-init-script=redhat \ + --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ + --with-remote-file=%{_localstatedir}/run/libvirtd.pid +%endif %endif make From fedora-extras-commits at redhat.com Mon Mar 3 16:05:51 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Mon, 3 Mar 2008 16:05:51 GMT Subject: rpms/kernel/devel linux-2.6-virtio_blk-fix-sysfs-bits.patch, NONE, 1.1 kernel.spec, 1.468, 1.469 Message-ID: <200803031605.m23G5pEK022987@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22907 Modified Files: kernel.spec Added Files: linux-2.6-virtio_blk-fix-sysfs-bits.patch Log Message: * Mon Mar 03 2008 Kyle McMartin - Add virtio_blk patch from Jeremy Katz linux-2.6-virtio_blk-fix-sysfs-bits.patch: --- NEW FILE linux-2.6-virtio_blk-fix-sysfs-bits.patch --- From: Jeremy Katz To: rusty at rustcorp.com.au Cc: Jeremy Katz Subject: [PATCH] Fix sysfs bits to have proper block symlink Date: Sun, 2 Mar 2008 17:00:15 -0500 Fix up so that the virtio_blk devices in sysfs link correctly to their block device. This then allows them to be detected by hal, etc Signed-off-by: Jeremy Katz --- drivers/block/virtio_blk.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 3b1a68d..0cfbe8c 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -238,6 +238,7 @@ static int virtblk_probe(struct virtio_device *vdev) vblk->disk->first_minor = index_to_minor(index); vblk->disk->private_data = vblk; vblk->disk->fops = &virtblk_fops; + vblk->disk->driverfs_dev = &vdev->dev; index++; /* If barriers are supported, tell block layer that queue is ordered */ Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.468 retrieving revision 1.469 diff -u -r1.468 -r1.469 --- kernel.spec 3 Mar 2008 15:09:40 -0000 1.468 +++ kernel.spec 3 Mar 2008 16:05:03 -0000 1.469 @@ -646,6 +646,8 @@ Patch2501: linux-2.6-ppc-use-libgcc.patch +Patch2503: linux-2.6-virtio_blk-fix-sysfs-bits.patch + ### HACK ### Patch2502: linux-2.6-blkcipher-depend-on-chainiv.patch @@ -1153,6 +1155,8 @@ ApplyPatch linux-2.6-ppc-use-libgcc.patch +ApplyPatch linux-2.6-virtio_blk-fix-sysfs-bits.patch + ApplyPatch linux-2.6-blkcipher-depend-on-chainiv.patch # ---------- below all scheduled for 2.6.24 ----------------- @@ -1741,6 +1745,9 @@ %changelog * Mon Mar 03 2008 Kyle McMartin +- Add virtio_blk patch from Jeremy Katz + +* Mon Mar 03 2008 Kyle McMartin - Linux 2.6.25-rc3-git4 * Mon Mar 03 2008 Dave Airlie From fedora-extras-commits at redhat.com Mon Mar 3 16:06:00 2008 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 3 Mar 2008 16:06:00 GMT Subject: rpms/graphviz/devel graphviz-multilib.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 graphviz.spec, 1.44, 1.45 sources, 1.11, 1.12 Message-ID: <200803031606.m23G60FX022992@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/pkgs/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22918 Modified Files: .cvsignore graphviz.spec sources Added Files: graphviz-multilib.patch Log Message: * Mon Mar 03 2008 Patrick "Jima" Laughton 2.16.1-0.2 - New upstream release (fixes BZ#433205, BZ#427376) - Merged spec changes in from upstream - Added patch from BZ#432683 graphviz-multilib.patch: --- NEW FILE graphviz-multilib.patch --- diff -urN graphviz-2.16.1.orig/plugin/pango/gvtextlayout_pango.c graphviz-2.16.1/plugin/pango/gvtextlayout_pango.c --- graphviz-2.16.1.orig/plugin/pango/gvtextlayout_pango.c 2007-11-09 17:31:43.000000000 -0600 +++ graphviz-2.16.1/plugin/pango/gvtextlayout_pango.c 2008-03-03 09:55:01.000000000 -0600 @@ -154,8 +154,8 @@ logical_rect.height = 0; textlayout_scale = POINTS_PER_INCH / (FONT_DPI * PANGO_SCALE); - para->width = logical_rect.width * textlayout_scale; - para->height = logical_rect.height * textlayout_scale; + para->width = ROUND(logical_rect.width * textlayout_scale); + para->height = ROUND(logical_rect.height * textlayout_scale); /* The y offset from baseline to 0,0 of the bitmap representation */ iter = pango_layout_get_iter (layout); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/graphviz/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 28 Nov 2007 18:17:02 -0000 1.11 +++ .cvsignore 3 Mar 2008 16:05:19 -0000 1.12 @@ -1 +1 @@ -graphviz-2.16.tar.gz +graphviz-2.16.1.tar.gz Index: graphviz.spec =================================================================== RCS file: /cvs/pkgs/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- graphviz.spec 12 Feb 2008 17:53:11 -0000 1.44 +++ graphviz.spec 3 Mar 2008 16:05:19 -0000 1.45 @@ -6,9 +6,9 @@ #-- Global graphviz rpm and src.rpm tags------------------------------------- Name: graphviz Summary: Graph Visualization Tools -Version: 2.16 +Version: 2.16.1 -%define truerelease 3.3 +%define truerelease 0.2 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -20,6 +20,7 @@ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Patch0: %{name}-tk8.5.patch Patch1: %{name}-gcc43.patch +Patch2: %{name}-multilib.patch # graphviz is relocatable - Caution: this feature is used in AT&T, # but probably will not be supported in Redhat/Fedora/Centos distros @@ -40,6 +41,7 @@ %define PHP 0 %define PYTHON 0 %define RUBY 0 +%define R_LANG 0 %define TCL 1 %define IPSEPCOLA --without-ipsepcola %define MYLIBGD --with-mylibgd @@ -84,11 +86,10 @@ %if "%rhel" >= "4" # PERL is available earlier, but a suitable SWIG isn't %define PERL 1 -%define PHP 1 %define RUBY 1 %define GUILE 1 %define PYTHON 1 -BuildRequires: perl php-devel ruby ruby-devel guile-devel python-devel +BuildRequires: perl ruby-devel guile-devel python-devel %endif %if "%rhel" >= "5" %define JAVA 1 @@ -97,9 +98,10 @@ BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel %endif %if "%rhel" >= "6" +%define PHP 1 %define MYLIBGD --without-mylibgd %define GDK_PIXBUF --with-gdk-pixbuf -BuildRequires: gd gd-devel perl-devel +BuildRequires: gd gd-devel perl-devel php-devel %endif %endif @@ -121,15 +123,15 @@ %define IPSEPCOLA --with-ipsepcola %endif %if "%fedora" >= "4" -%define PHP 1 %define RUBY 1 %define GUILE 1 %define PYTHON 1 -BuildRequires: libtool-ltdl libtool-ltdl-devel php-devel ruby ruby-devel guile-devel python-devel +BuildRequires: libtool-ltdl libtool-ltdl-devel ruby ruby-devel guile-devel python-devel %endif %if "%fedora" >= "5" +%define PHP 1 %define JAVA 1 -BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel +BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel php-devel %ifnarch ppc64 %define SHARP 1 %define OCAML 1 @@ -147,6 +149,10 @@ %define GDK_PIXBUF --with-gdk-pixbuf BuildRequires: gd gd-devel perl-devel DevIL-devel %endif +%if "%fedora" >= "8" +%define R_LANG 1 +BuildRequires: R swig >= 1.3.33 +%endif %if "%fedora" >= "9" %define MING 0 #BuildRequires: ming ming-devel @@ -192,6 +198,7 @@ %endif %if %{MING} %exclude %{_libdir}/graphviz/libgvplugin_ming.* +%exclude %{_libdir}/graphviz/*fdb %endif #-- graphviz-gd rpm -------------------------------------------------- @@ -230,7 +237,7 @@ %description devil Graphviz plugin for renderers based on DevIL. (Unless you absolutely have to use BMP, TIF, or TGA, you are recommended to use the PNG format instead -support directly by the cairo+pango based renderer in the base graphviz rpm.) +supported directly by the cairo+pango based renderer in the base graphviz rpm.) # run "dot -c" to generate plugin config in %{_libdir}/graphviz/config %post devil @@ -262,6 +269,7 @@ %files ming %{_libdir}/graphviz/libgvplugin_ming.so.* +%{_libdir}/graphviz/*fdb %endif #-- graphviz-sharp rpm -------------------------------------------- @@ -417,6 +425,23 @@ %{_mandir}/mann/gv_python.n* %endif +#-- graphviz-r rpm --------------------------------------------- +%if %{R_LANG} +%package r +Group: Applications/Multimedia +Summary: R extension for graphviz +Requires: graphviz = %{version}-%{release} r + +%description r +R extension for graphviz. + +%files r +%defattr(-,root,root,-) +%dir %{_libdir}/graphviz/r +%{_libdir}/graphviz/r/* +%{_mandir}/mann/gv_r.n* +%endif + #-- graphviz-ruby rpm --------------------------------------------- %if %{RUBY} %package ruby @@ -508,6 +533,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %if ! %{SHARP} @@ -537,6 +563,9 @@ %if ! %{PYTHON} %define NO_PYTHON --disable-python %endif +%if ! %{R_LANG} +%define NO_R_LANG --disable-r +%endif %if ! %{RUBY} %define NO_RUBY --disable-ruby %endif @@ -566,7 +595,7 @@ --disable-static \ --disable-dependency-tracking \ %{MYLIBGD} %{IPSEPCOLA} %{PANGOCAIRO} %{GDK_PIXBUF} \ - %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_RUBY} %{?NO_TCL} %{?NO_DEVIL} %{?NO_MING} + %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_R_LANG} %{?NO_RUBY} %{?NO_TCL} %{?NO_DEVIL} %{?NO_MING} make %{?_smp_mflags} %install @@ -581,11 +610,20 @@ rm -rf %{buildroot}%{_datadir}/%{name}/doc %clean +# regression test +cd rtest +make rtest +# clean up temporary installation rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Mon Mar 03 2008 Patrick "Jima" Laughton 2.16.1-0.2 +- New upstream release (fixes BZ#433205, BZ#427376) +- Merged spec changes in from upstream +- Added patch from BZ#432683 + * Tue Feb 12 2008 Patrick "Jima" Laughton 2.16-3.3 - Added upstream-provided patch for building under GCC 4.3 (thanks John!) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/graphviz/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 28 Nov 2007 18:17:02 -0000 1.11 +++ sources 3 Mar 2008 16:05:19 -0000 1.12 @@ -1 +1 @@ -c8cac2c66a52e37a2be9290d4f38e525 graphviz-2.16.tar.gz +8952fb2a627b38e38ed429a3a9d5cc5c graphviz-2.16.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 16:08:19 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 16:08:19 GMT Subject: rpms/kdebase/F-7 kdebase-3.5-khotkeys-crash.patch, 1.1, 1.2 kdebase.spec, 1.273, 1.274 Message-ID: <200803031608.m23G8JU3023134@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23111 Modified Files: kdebase-3.5-khotkeys-crash.patch kdebase.spec Log Message: apply upstream patch to fix crash in khotkey kdebase-3.5-khotkeys-crash.patch: Index: kdebase-3.5-khotkeys-crash.patch =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-7/kdebase-3.5-khotkeys-crash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdebase-3.5-khotkeys-crash.patch 3 Mar 2008 13:46:36 -0000 1.1 +++ kdebase-3.5-khotkeys-crash.patch 3 Mar 2008 16:08:07 -0000 1.2 @@ -19,3 +19,15 @@ void Condition_list_widget::modify_pressed() { +Index: khotkeys/kcontrol/actions_listview_widget.cpp +=================================================================== +--- khotkeys/kcontrol/actions_listview_widget.cpp (Revision 781557) ++++ khotkeys/kcontrol/actions_listview_widget.cpp (Revision 781558) +@@ -110,6 +110,7 @@ + // if( nw == NULL ) + // nw = current_action()->itemBelow(); + delete saved_current_item; ++ saved_current_item = NULL; + recent_item = NULL; + // if( nw != NULL ) + // { Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-7/kdebase.spec,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- kdebase.spec 3 Mar 2008 13:46:36 -0000 1.273 +++ kdebase.spec 3 Mar 2008 16:08:07 -0000 1.274 @@ -12,7 +12,7 @@ %define _with_samba --with-samba Version: 3.5.9 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdebase3 @@ -795,9 +795,11 @@ %changelog +* Mon Mar 03 2008 Than Ngo 3.5.9-4 +- apply upstream patch to fix crash in khotkey + * Thu Feb 28 2008 Than Ngo 3.5.9-3 - apply upstream patch to unbreak lmsensors support again -- apply upstream patch to fix crash in khotkey * Wed Feb 27 2008 Rex Dieter - 3.5.9-2 - f9+: don't omit all of khelpcenter, some is needed for kde3 apps' help From fedora-extras-commits at redhat.com Mon Mar 3 16:14:39 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Mon, 3 Mar 2008 16:14:39 GMT Subject: rpms/gdb/devel gdb-6.8-bz377541-fortran-dynamic-arrays.patch, NONE, 1.1 gdb-6.8-watchpoint-inaccessible-memory.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 gdb-6.3-catch-debug-registers-error-20060527.patch, 1.2, 1.3 gdb-6.3-dwattype0-20050201.patch, 1.2, 1.3 gdb-6.3-ia64-info-frame-fix-20050725.patch, 1.1, 1.2 gdb-6.3-ia64-sigtramp-fp-20050926.patch, 1.3, 1.4 gdb-6.3-nonthreaded-wp-20050117.patch, 1.6, 1.7 gdb-6.3-pie-20050110.patch, 1.6, 1.7 gdb-6.5-bz181390-memory-address-width.patch, 1.2, 1.3 gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch, 1.4, 1.5 gdb-6.5-gcore-i386-on-amd64.patch, 1.3, 1.4 gdb-6.5-sharedlibrary-path.patch, 1.2, 1.3 gdb-6.6-buildid-locate.patch, 1.8, 1.9 gdb-6.6-bz235197-fork-detach-info.patch, 1.1, 1.2 gdb-6.6-bz247354-leader-exit-fix.patch, 1.1, 1.2 gdb-6.6-multifork-debugreg.patch, 1.3, 1.4 gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch, 1.3, 1.4 gdb-6.7-bz233852-attach-signalled-fix.patch, 1.1, 1.2 gdb-6.7-bz426600-DW_TAG_interface_type-fix.patch, 1.1, 1.2 gdb-6.7-bz426600-DW_TAG_interface_type-test.patch, 1.1, 1.2 gdb.spec, 1.271, 1.272 sources, 1.23, 1.24 gdb-6.3-ia64-sigaltstack-20050711.patch, 1.2, NONE gdb-6.3-ppc64section-20041026.patch, 1.1, NONE gdb-6.3-test-pie-20050107.patch, 1.4, NONE gdb-6.3-threaded-watchpoints-20041213.patch, 1.8, NONE gdb-6.3-threaded-watchpoints2-20050225.patch, 1.5, NONE gdb-6.5-bz237872-ppc-long-double.patch, 1.2, NONE gdb-6.6-bz232371-selinux-thread-error.patch, 1.1, NONE gdb-6.6-bz237096-watchthreads-testcasefix.patch, 1.1, NONE gdb-6.6-cu-ranges.patch, 1.1, NONE gdb-6.7-bz428882-ia64-fix.patch, 1.1, NONE gdb-6.7.1-upstream.patch, 1.4, NONE Message-ID: <200803031614.m23GEdMD023432@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23301 Modified Files: .cvsignore gdb-6.3-catch-debug-registers-error-20060527.patch gdb-6.3-dwattype0-20050201.patch gdb-6.3-ia64-info-frame-fix-20050725.patch gdb-6.3-ia64-sigtramp-fp-20050926.patch gdb-6.3-nonthreaded-wp-20050117.patch gdb-6.3-pie-20050110.patch gdb-6.5-bz181390-memory-address-width.patch gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch gdb-6.5-gcore-i386-on-amd64.patch gdb-6.5-sharedlibrary-path.patch gdb-6.6-buildid-locate.patch gdb-6.6-bz235197-fork-detach-info.patch gdb-6.6-bz247354-leader-exit-fix.patch gdb-6.6-multifork-debugreg.patch gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch gdb-6.7-bz233852-attach-signalled-fix.patch gdb-6.7-bz426600-DW_TAG_interface_type-fix.patch gdb-6.7-bz426600-DW_TAG_interface_type-test.patch gdb.spec sources Added Files: gdb-6.8-bz377541-fortran-dynamic-arrays.patch gdb-6.8-watchpoint-inaccessible-memory.patch Removed Files: gdb-6.3-ia64-sigaltstack-20050711.patch gdb-6.3-ppc64section-20041026.patch gdb-6.3-test-pie-20050107.patch gdb-6.3-threaded-watchpoints-20041213.patch gdb-6.3-threaded-watchpoints2-20050225.patch gdb-6.5-bz237872-ppc-long-double.patch gdb-6.6-bz232371-selinux-thread-error.patch gdb-6.6-bz237096-watchthreads-testcasefix.patch gdb-6.6-cu-ranges.patch gdb-6.7-bz428882-ia64-fix.patch gdb-6.7.1-upstream.patch Log Message: * Mon Mar 3 2008 Jan Kratochvil - 6.7.50.20080227-1 - Upgrade to the upstream gdb-6.8 prerelease. - Cleanup the leftover `.orig' files during %prep. - Add expat-devel check by the configure script (for the other-arch builds). - `--with testsuite' now also BuildRequires: fpc - Backport fix of a segfault + PIE regression since 6.7.1 on PIE executables. - Update the printed GDB version string to be Fedora specific. gdb-6.8-bz377541-fortran-dynamic-arrays.patch: --- NEW FILE gdb-6.8-bz377541-fortran-dynamic-arrays.patch --- The last version posted upstream: 0: http://sources.redhat.com/ml/gdb-patches/2007-11/msg00438.html 1: http://sources.redhat.com/ml/gdb-patches/2007-11/msg00439.html 2: http://sources.redhat.com/ml/gdb-patches/2007-11/msg00440.html 3: http://sources.redhat.com/ml/gdb-patches/2007-11/msg00441.html 4: http://sources.redhat.com/ml/gdb-patches/2007-11/msg00442.html 5: http://sources.redhat.com/ml/gdb-patches/2007-11/msg00443.html 6: http://sources.redhat.com/ml/gdb-patches/2007-11/msg00444.html 2008-02-24 Jan Kratochvil Port to GDB-6.8pre. diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8cvs20080219-fortranless/gdb/Makefile.in gdb-6.8cvs20080219/gdb/Makefile.in --- gdb-6.8cvs20080219-fortranless/gdb/Makefile.in 2008-02-22 08:19:37.000000000 +0100 +++ gdb-6.8cvs20080219/gdb/Makefile.in 2008-02-22 16:59:22.000000000 +0100 @@ -758,6 +758,7 @@ disasm_h = disasm.h doublest_h = doublest.h $(floatformat_h) dummy_frame_h = dummy-frame.h dfp_h = dfp.h +dwarf2block_h = dwarf2block.h dwarf2expr_h = dwarf2expr.h dwarf2_frame_h = dwarf2-frame.h dwarf2loc_h = dwarf2loc.h @@ -1051,7 +1052,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $ exec.o bcache.o objfiles.o observer.o minsyms.o maint.o demangle.o \ dbxread.o coffread.o coff-pe-read.o \ dwarf2read.o mipsread.o stabsread.o corefile.o \ - dwarf2expr.o dwarf2loc.o dwarf2-frame.o \ + dwarf2block.o dwarf2expr.o dwarf2loc.o dwarf2-frame.o \ ada-lang.o c-lang.o f-lang.o objc-lang.o \ ui-out.o cli-out.o \ varobj.o vec.o wrapper.o \ @@ -2086,6 +2087,8 @@ dummy-frame.o: dummy-frame.c $(defs_h) $ $(command_h) $(gdbcmd_h) $(gdb_string_h) dfp.o: dfp.c $(defs_h) $(expression_h) $(gdbtypes_h) $(value_h) $(dfp_h) \ $(decimal128_h) $(decimal64_h) $(decimal32_h) +dwarf2block.o: dwarf2block.c $(dwarf2block_h) $(defs_h) $(gdbcore_h) \ + $(dwarf2expr_h) $(exceptions_h) dwarf2expr.o: dwarf2expr.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(value_h) \ $(gdbcore_h) $(elf_dwarf2_h) $(dwarf2expr_h) dwarf2-frame.o: dwarf2-frame.c $(defs_h) $(dwarf2expr_h) $(elf_dwarf2_h) \ @@ -2096,13 +2099,14 @@ dwarf2-frame.o: dwarf2-frame.c $(defs_h) dwarf2loc.o: dwarf2loc.c $(defs_h) $(ui_out_h) $(value_h) $(frame_h) \ $(gdbcore_h) $(target_h) $(inferior_h) $(ax_h) $(ax_gdb_h) \ $(regcache_h) $(objfiles_h) $(exceptions_h) $(elf_dwarf2_h) \ - $(dwarf2expr_h) $(dwarf2loc_h) $(gdb_string_h) $(gdb_assert_h) + $(dwarf2expr_h) $(dwarf2loc_h) $(gdb_string_h) $(gdb_assert_h) \ + $(dwarf2block_h) dwarf2read.o: dwarf2read.c $(defs_h) $(bfd_h) $(symtab_h) $(gdbtypes_h) \ $(objfiles_h) $(elf_dwarf2_h) $(buildsym_h) $(demangle_h) \ $(expression_h) $(filenames_h) $(macrotab_h) $(language_h) \ $(complaints_h) $(bcache_h) $(dwarf2expr_h) $(dwarf2loc_h) \ $(cp_support_h) $(hashtab_h) $(command_h) $(gdbcmd_h) \ - $(gdb_string_h) $(gdb_assert_h) + $(gdb_string_h) $(gdb_assert_h) $(dwarf2block_h) $(f_lang_h) elfread.o: elfread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(elf_bfd_h) \ $(elf_mips_h) $(symtab_h) $(symfile_h) $(objfiles_h) $(buildsym_h) \ $(stabsread_h) $(gdb_stabs_h) $(complaints_h) $(demangle_h) \ @@ -2138,10 +2142,10 @@ f-exp.o: f-exp.c $(defs_h) $(gdb_string_ findvar.o: findvar.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(frame_h) \ $(value_h) $(gdbcore_h) $(inferior_h) $(target_h) $(gdb_string_h) \ $(gdb_assert_h) $(floatformat_h) $(symfile_h) $(regcache_h) \ - $(user_regs_h) $(block_h) + $(user_regs_h) $(block_h) $(dwarf2block_h) f-lang.o: f-lang.c $(defs_h) $(gdb_string_h) $(symtab_h) $(gdbtypes_h) \ $(expression_h) $(parser_defs_h) $(language_h) $(f_lang_h) \ - $(valprint_h) $(value_h) + $(valprint_h) $(value_h) $(dwarf2block_h) fork-child.o: fork-child.c $(defs_h) $(gdb_string_h) $(frame_h) \ $(inferior_h) $(target_h) $(gdb_wait_h) $(gdb_vfork_h) $(gdbcore_h) \ $(terminal_h) $(gdbthread_h) $(command_h) $(solib_h) @@ -2166,7 +2170,7 @@ frv-tdep.o: frv-tdep.c $(defs_h) $(gdb_s $(frv_tdep_h) f-typeprint.o: f-typeprint.c $(defs_h) $(gdb_obstack_h) $(bfd_h) $(symtab_h) \ $(gdbtypes_h) $(expression_h) $(value_h) $(gdbcore_h) $(target_h) \ - $(f_lang_h) $(gdb_string_h) + $(f_lang_h) $(gdb_string_h) $(dwarf2block_h) f-valprint.o: f-valprint.c $(defs_h) $(gdb_string_h) $(symtab_h) \ $(gdbtypes_h) $(expression_h) $(value_h) $(valprint_h) $(language_h) \ $(f_lang_h) $(frame_h) $(gdbcore_h) $(command_h) $(block_h) @@ -2181,7 +2185,8 @@ gdb-events.o: gdb-events.c $(defs_h) $(g gdbtypes.o: gdbtypes.c $(defs_h) $(gdb_string_h) $(bfd_h) $(symtab_h) \ $(symfile_h) $(objfiles_h) $(gdbtypes_h) $(expression_h) \ $(language_h) $(target_h) $(value_h) $(demangle_h) $(complaints_h) \ - $(gdbcmd_h) $(wrapper_h) $(cp_abi_h) $(gdb_assert_h) $(hashtab_h) + $(gdbcmd_h) $(wrapper_h) $(cp_abi_h) $(gdb_assert_h) $(hashtab_h) \ + $(dwarf2block_h) glibc-tdep.o: glibc-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(symfile_h) \ $(objfiles_h) $(glibc_tdep_h) gnu-nat.o: gnu-nat.c $(gdb_string_h) $(defs_h) $(inferior_h) $(symtab_h) \ @@ -2939,7 +2944,7 @@ tramp-frame.o: tramp-frame.c $(defs_h) $ typeprint.o: typeprint.c $(defs_h) $(gdb_obstack_h) $(bfd_h) $(symtab_h) \ $(gdbtypes_h) $(expression_h) $(value_h) $(gdbcore_h) $(command_h) \ $(gdbcmd_h) $(target_h) $(language_h) $(cp_abi_h) $(typeprint_h) \ - $(gdb_string_h) + $(gdb_string_h) $(dwarf2block_h) ui-file.o: ui-file.c $(defs_h) $(ui_file_h) $(gdb_string_h) ui-out.o: ui-out.c $(defs_h) $(gdb_string_h) $(expression_h) $(language_h) \ $(ui_out_h) $(gdb_assert_h) diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8cvs20080219-fortranless/gdb/ada-lang.c gdb-6.8cvs20080219/gdb/ada-lang.c --- gdb-6.8cvs20080219-fortranless/gdb/ada-lang.c 2008-02-14 23:03:56.000000000 +0100 +++ gdb-6.8cvs20080219/gdb/ada-lang.c 2008-02-22 16:47:53.000000000 +0100 @@ -11012,6 +11012,7 @@ const struct language_defn ada_language_ ada_language_arch_info, ada_print_array_index, default_pass_by_reference, + default_value_address_get, /* Retrieve the real data value */ LANG_MAGIC }; diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8cvs20080219-fortranless/gdb/c-lang.c gdb-6.8cvs20080219/gdb/c-lang.c --- gdb-6.8cvs20080219-fortranless/gdb/c-lang.c 2008-02-14 23:03:56.000000000 +0100 +++ gdb-6.8cvs20080219/gdb/c-lang.c 2008-02-22 17:01:17.000000000 +0100 @@ -427,6 +427,7 @@ const struct language_defn c_language_de c_language_arch_info, default_print_array_index, default_pass_by_reference, + default_value_address_get, /* Retrieve the real data value */ LANG_MAGIC }; @@ -540,6 +541,7 @@ const struct language_defn cplus_languag cplus_language_arch_info, default_print_array_index, cp_pass_by_reference, + default_value_address_get, /* Retrieve the real data value */ LANG_MAGIC }; @@ -575,6 +577,7 @@ const struct language_defn asm_language_ c_language_arch_info, /* FIXME: la_language_arch_info. */ default_print_array_index, default_pass_by_reference, + default_value_address_get, /* Retrieve the real data value */ LANG_MAGIC }; @@ -615,6 +618,7 @@ const struct language_defn minimal_langu c_language_arch_info, default_print_array_index, default_pass_by_reference, + default_value_address_get, /* Retrieve the real data value */ LANG_MAGIC }; diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8cvs20080219-fortranless/gdb/dwarf2block.c gdb-6.8cvs20080219/gdb/dwarf2block.c --- gdb-6.8cvs20080219-fortranless/gdb/dwarf2block.c 1970-01-01 01:00:00.000000000 +0100 +++ gdb-6.8cvs20080219/gdb/dwarf2block.c 2008-02-22 16:49:35.000000000 +0100 @@ -0,0 +1,153 @@ +/* DWARF DW_FORM_block* expression evaluation. + + Copyright (C) 2007 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include "defs.h" +#include "dwarf2block.h" +#include "gdbcore.h" +#include "dwarf2expr.h" +#include "exceptions.h" + +/* This is the baton used when performing dwarf2 DW_BLOCK evaluation. */ +struct dwarf_block_baton +{ + CORE_ADDR address; +}; + +/* Read memory at ADDR (length LEN) into BUF. */ + +static void +dwarf_block_read_mem (void *baton, gdb_byte *buf, CORE_ADDR addr, size_t len) +{ + read_memory (addr, buf, len); +} + +static CORE_ADDR +dwarf_block_object_address (void *baton) +{ + struct dwarf_block_baton *debaton = baton; + + /* The message is suppressed in DWARF_BLOCK_EXEC. */ + if (debaton->address == 0) + error (_("Cannot resolve DW_OP_push_object_address for a missing object")); + [...1840 lines suppressed...] +# $1 = (( ( 3, 3, 3, 3, 3, 3) ( 3, 3, 3, 3, 3, 3) --- , 3) ) ( ( 3, 3, ...) ...) ...) +gdb_test "p varw" "\\$\[0-9\]* = \\(\[()3, .\]*\\)" + +gdb_breakpoint [gdb_get_line_number "varw-almostfilled"] +gdb_continue_to_breakpoint "varw-almostfilled" +gdb_test "ptype varw" "type = real\\*4 \\(5,4,3\\)" +gdb_test "p varw(3,1,1)=1" "\\$\[0-9\]* = 1" +# $1 = (( ( 6, 5, 1, 5, 5, 5) ( 5, 5, 5, 5, 5, 5) --- , 5) ) ( ( 5, 5, ...) ...) ...) +gdb_test "p varw" "\\$\[0-9\]* = \\( *\\( *\\( *6, *5, *1,\[()5, .\]*\\)" +# "up" works with GCC but other Fortran compilers may copy the values into the +# outer function only on the exit of the inner function. +gdb_test "finish" ".*call bar \\(y, x\\)" +gdb_test "p z(2,4,5)" "\\$\[0-9\]* = 3" +gdb_test "p z(2,4,6)" "\\$\[0-9\]* = 6" +gdb_test "p z(2,4,7)" "\\$\[0-9\]* = 5" +gdb_test "p z(4,4,6)" "\\$\[0-9\]* = 1" + +gdb_breakpoint [gdb_get_line_number "varz-almostfilled"] +gdb_continue_to_breakpoint "varz-almostfilled" +# GCC uses the pointer type here, Intel Fortran Compiler 10.1.008 does not. +gdb_test "ptype varz" "type = (PTR TO -> \\( )?real\\*4 \\(\\*\\)\\)?" +# Intel Fortran Compiler 10.1.008 has a bug here - (2:11,7:7) +# as it produces DW_AT_lower_bound == DW_AT_upper_bound == 7. +gdb_test "ptype vart" "type = (PTR TO -> \\( )?real\\*4 \\(2:11,7:\\*\\)\\)?" +gdb_test "p varz(3)" "\\$\[0-9\]* = 4" +# maps to foo::vary(1,1) +gdb_test "p vart(2,7)" "\\$\[0-9\]* = 8" +# maps to foo::vary(2,2) +gdb_test "p vart(3,8)" "\\$\[0-9\]* = 9" +# maps to foo::vary(1,3) +gdb_test "p vart(2,9)" "\\$\[0-9\]* = 10" diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8cvs20080219-fortranless/gdb/testsuite/gdb.fortran/dynamic.f90 gdb-6.8cvs20080219/gdb/testsuite/gdb.fortran/dynamic.f90 --- gdb-6.8cvs20080219-fortranless/gdb/testsuite/gdb.fortran/dynamic.f90 1970-01-01 01:00:00.000000000 +0100 +++ gdb-6.8cvs20080219/gdb/testsuite/gdb.fortran/dynamic.f90 2008-02-22 16:59:42.000000000 +0100 @@ -0,0 +1,97 @@ +! Copyright 2007 Free Software Foundation, Inc. +! +! This program is free software; you can redistribute it and/or modify +! it under the terms of the GNU General Public License as published by +! the Free Software Foundation; either version 2 of the License, or +! (at your option) any later version. +! +! This program is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +! GNU General Public License for more details. +! +! You should have received a copy of the GNU General Public License +! along with this program; if not, write to the Free Software +! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +! +! Ihis file is the Fortran source file for dynamic.exp. +! Original file written by Jakub Jelinek . +! Modified for the GDB testcase by Jan Kratochvil . + +subroutine baz + real, target, allocatable :: varx (:, :, :) + real, pointer :: varv (:, :, :) + real, target :: varu (1, 2, 3) + logical :: l + allocate (varx (1:6, 5:15, 17:28)) ! varx-init + l = allocated (varx) + varx(:, :, :) = 6 ! varx-allocated + varx(1, 5, 17) = 7 + varx(2, 6, 18) = 8 + varx(6, 15, 28) = 9 + varv => varx ! varx-filled + l = associated (varv) + varv(3, 7, 19) = 10 ! varv-associated + varv => null () ! varv-filled + l = associated (varv) + deallocate (varx) ! varv-deassociated + l = allocated (varx) + varu(:, :, :) = 10 ! varx-deallocated + allocate (varv (1:6, 5:15, 17:28)) + l = associated (varv) + varv(:, :, :) = 6 + varv(1, 5, 17) = 7 + varv(2, 6, 18) = 8 + varv(6, 15, 28) = 9 + deallocate (varv) + l = associated (varv) + varv => varu + varv(1, 1, 1) = 6 + varv(1, 2, 3) = 7 + l = associated (varv) +end subroutine baz +subroutine foo (vary, varw) + real :: vary (:, :) + real :: varw (:, :, :) + vary(:, :) = 4 ! vary-passed + vary(1, 1) = 8 + vary(2, 2) = 9 + vary(1, 3) = 10 + varw(:, :, :) = 5 ! vary-filled + varw(1, 1, 1) = 6 + varw(2, 2, 2) = 7 ! varw-almostfilled +end subroutine foo +subroutine bar (varz, vart) + real :: varz (*) + real :: vart (2:11, 7:*) + varz(1:3) = 4 + varz(2) = 5 ! varz-almostfilled +end subroutine bar +program test + interface + subroutine foo (vary, varw) + real :: vary (:, :) + real :: varw (:, :, :) + end subroutine + end interface + interface + subroutine bar (varz, vart) + real :: varz (*) + real :: vart (2:11, 7:*) + end subroutine + end interface + real :: x (10, 10), y (5), z(8, 8, 8) + x(:,:) = 1 + y(:) = 2 + z(:,:,:) = 3 + call baz + call foo (x, z(2:6, 4:7, 6:8)) + call bar (y, x) + if (x (1, 1) .ne. 8 .or. x (2, 2) .ne. 9 .or. x (1, 2) .ne. 4) call abort + if (x (1, 3) .ne. 10) call abort + if (z (2, 4, 6) .ne. 6 .or. z (3, 5, 7) .ne. 7 .or. z (2, 4, 7) .ne. 5) call abort + if (any (y .ne. (/4, 5, 4, 2, 2/))) call abort + call foo (transpose (x), z) + if (x (1, 1) .ne. 8 .or. x (2, 2) .ne. 9 .or. x (1, 2) .ne. 4) call abort + if (x (3, 1) .ne. 10) call abort +end diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8cvs20080219-fortranless/gdb/typeprint.c gdb-6.8cvs20080219/gdb/typeprint.c --- gdb-6.8cvs20080219-fortranless/gdb/typeprint.c 2008-02-14 23:04:00.000000000 +0100 +++ gdb-6.8cvs20080219/gdb/typeprint.c 2008-02-22 16:49:35.000000000 +0100 @@ -33,6 +33,7 @@ #include "cp-abi.h" #include "typeprint.h" #include "gdb_string.h" +#include "dwarf2block.h" #include /* For real-type printing in whatis_exp() */ @@ -130,6 +131,7 @@ whatis_exp (char *exp, int show) val = access_value_history (0); type = value_type (val); + object_address_set (VALUE_ADDRESS (val)); if (objectprint) { diff -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8cvs20080219-fortranless/gdb/valops.c gdb-6.8cvs20080219/gdb/valops.c --- gdb-6.8cvs20080219-fortranless/gdb/valops.c 2008-02-22 08:19:37.000000000 +0100 +++ gdb-6.8cvs20080219/gdb/valops.c 2008-02-22 16:47:53.000000000 +0100 @@ -571,12 +571,21 @@ value_at_lazy (struct type *type, CORE_A int value_fetch_lazy (struct value *val) { - CORE_ADDR addr = VALUE_ADDRESS (val) + value_offset (val); - int length = TYPE_LENGTH (value_enclosing_type (val)); + CORE_ADDR addr; + int length; - struct type *type = value_type (val); - if (length) - read_memory (addr, value_contents_all_raw (val), length); + addr = VALUE_ADDRESS (val); + if (LA_VALUE_ADDRESS_GET (value_type (val), &addr)) + { + struct type *type = value_enclosing_type (val); + int length = TYPE_LENGTH (check_typedef (type)); + + if (length) + { + addr += value_offset (val); + read_memory (addr, value_contents_all_raw (val), length); + } + } set_value_lazy (val, 0); return 0; @@ -880,12 +889,17 @@ struct value * value_coerce_array (struct value *arg1) { struct type *type = check_typedef (value_type (arg1)); + CORE_ADDR address; if (VALUE_LVAL (arg1) != lval_memory) error (_("Attempt to take address of value not located in memory.")); + address = VALUE_ADDRESS (arg1); + if (!LA_VALUE_ADDRESS_GET (type, &address)) + error (_("Attempt to take address of non-valid value.")); + return value_from_pointer (lookup_pointer_type (TYPE_TARGET_TYPE (type)), - (VALUE_ADDRESS (arg1) + value_offset (arg1))); + address + value_offset (arg1)); } /* Given a value which is a function, return a value which is a pointer gdb-6.8-watchpoint-inaccessible-memory.patch: --- NEW FILE gdb-6.8-watchpoint-inaccessible-memory.patch --- http://sourceware.org/ml/gdb-patches/2008-02/msg00472.html 2008-02-28 Daniel Jacobowitz * breakpoint.c (fetch_watchpoint_value): New function. (update_watchpoint): Set and clear val_valid. Use fetch_watchpoint_value. Handle unreadable values on the value chain. Correct check for user-requested array watchpoints. (breakpoint_init_inferior): Clear val_valid. (watchpoint_value_print): New function. (print_it_typical): Use it. Do not free or clear old_val. Print watchpoints even if old_val == NULL. (watchpoint_check): Use fetch_watchpoint_value. Check for values becoming readable or unreadable. (watch_command_1): Use fetch_watchpoint_value. Set val_valid. (do_enable_watchpoint): Likewise. * breakpoint.h (struct breakpoint): Update comment for val. Add val_valid. * NEWS: Mention watchpoints on inaccessible memory. 2008-02-28 Daniel Jacobowitz * gdb.base/watchpoint.c (global_ptr, func4): New. (main): Call func4. * gdb.base/watchpoint.exp: Call test_inaccessible_watchpoint. (test_inaccessible_watchpoint): New. [ Backported for GDB-6.8pre. ] It fixes the regression since GDB-6.7.1rh on x86_64 -m64 -fPIE/-pie: -PASS: gdb.base/watchpoint.exp: run to marker1 in test_simple_watchpoint +FAIL: gdb.base/watchpoint.exp: run to marker1 in test_simple_watchpoint diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.50.20080227-orig/gdb/NEWS gdb-6.7.50.20080227-dynwatch/gdb/NEWS --- gdb-6.7.50.20080227-orig/gdb/NEWS 2008-03-03 08:42:11.000000000 +0100 +++ gdb-6.7.50.20080227-dynwatch/gdb/NEWS 2008-03-03 08:38:18.000000000 +0100 @@ -1,6 +1,9 @@ What has changed in GDB? (Organized release by release) +* Watchpoints can now be set on unreadable memory locations, e.g. addresses +which will be allocated using malloc later in program execution. + *** Changes since GDB 6.7 * New native configurations diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.50.20080227-orig/gdb/breakpoint.c gdb-6.7.50.20080227-dynwatch/gdb/breakpoint.c --- gdb-6.7.50.20080227-orig/gdb/breakpoint.c 2008-03-03 08:42:10.000000000 +0100 +++ gdb-6.7.50.20080227-dynwatch/gdb/breakpoint.c 2008-03-03 08:37:33.000000000 +0100 @@ -55,6 +55,7 @@ #include "memattr.h" #include "ada-lang.h" #include "top.h" +#include "wrapper.h" #include "gdb-events.h" #include "mi/mi-common.h" @@ -826,7 +827,65 @@ is_hardware_watchpoint (struct breakpoin || bpt->type == bp_access_watchpoint); } -/* Assuming that B is a hardware breakpoint: +/* Find the current value of a watchpoint on EXP. Return the value in + *VALP and *RESULTP and the chain of intermediate and final values + in *VAL_CHAIN. RESULTP and VAL_CHAIN may be NULL if the caller does + not need them. + + If an error occurs while evaluating the expression, *RESULTP will + be set to NULL. *RESULTP may be a lazy value, if the result could + not be read from memory. It is used to determine whether a value + is user-specified (we should watch the whole value) or intermediate + (we should watch only the bit used to locate the final value). + + If the final value, or any intermediate value, could not be read + from memory, *VALP will be set to NULL. *VAL_CHAIN will still be + set to any referenced values. *VALP will never be a lazy value. + This is the value which we store in struct breakpoint. + + If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the + value chain. The caller must free the values individually. If + VAL_CHAIN is NULL, all generated values will be left on the value + chain. */ + +static void +fetch_watchpoint_value (struct expression *exp, struct value **valp, + struct value **resultp, struct value **val_chain) +{ + struct value *mark, *new_mark, *result; + + *valp = NULL; + if (resultp) + *resultp = NULL; + if (val_chain) + *val_chain = NULL; + + /* Evaluate the expression. */ + mark = value_mark (); + result = NULL; + gdb_evaluate_expression (exp, &result); + new_mark = value_mark (); + if (mark == new_mark) + return; + if (resultp) + *resultp = result; + + /* Make sure it's not lazy, so that after the target stops again we + have a non-lazy previous value to compare with. */ + if (result != NULL + && (!value_lazy (result) || gdb_value_fetch_lazy (result))) + *valp = result; + + if (val_chain) + { + /* Return the chain of intermediate values. We use this to + decide which addresses to watch. */ + *val_chain = new_mark; + value_release_to_mark (mark); + } +} + +/* Assuming that B is a hardware watchpoint: - Reparse watchpoint expression, is REPARSE is non-zero - Evaluate expression and store the result in B->val - Update the list of values that must be watched in B->loc. @@ -837,7 +896,6 @@ static void update_watchpoint (struct breakpoint *b, int reparse) { int within_current_scope; - struct value *mark = value_mark (); struct frame_id saved_frame_id; struct bp_location *loc; bpstat bs; @@ -889,9 +947,9 @@ update_watchpoint (struct breakpoint *b, to the user when the old value and the new value may actually be completely different objects. */ value_free (b->val); - b->val = NULL; + b->val = NULL; + b->val_valid = 0; } - /* If we failed to parse the expression, for example because it refers to a global variable in a not-yet-loaded shared library, @@ -900,43 +958,37 @@ update_watchpoint (struct breakpoint *b, is different from out-of-scope watchpoint. */ if (within_current_scope && b->exp) { - struct value *v, *next; + struct value *val_chain, *v, *result, *next; + + fetch_watchpoint_value (b->exp, &v, &result, &val_chain); - /* Evaluate the expression and make sure it's not lazy, so that - after target stops again, we have a non-lazy previous value - to compare with. Also, making the value non-lazy will fetch - intermediate values as needed, which we use to decide which - addresses to watch. - - The value returned by evaluate_expression is stored in b->val. - In addition, we look at all values which were created - during evaluation, and set watchoints at addresses as needed. - Those values are explicitly deleted here. */ - v = evaluate_expression (b->exp); /* Avoid setting b->val if it's already set. The meaning of b->val is 'the last value' user saw, and we should update it only if we reported that last value to user. As it happens, the code that reports it updates b->val directly. */ - if (b->val == NULL) - b->val = v; - value_contents (v); - value_release_to_mark (mark); + if (!b->val_valid) + { + b->val = v; + b->val_valid = 1; + } /* Look at each value on the value chain. */ - for (; v; v = value_next (v)) + for (v = val_chain; v; v = value_next (v)) { /* If it's a memory location, and GDB actually needed its contents to evaluate the expression, then we - must watch it. */ + must watch it. If the first value returned is + still lazy, that means an error occurred reading it; + watch it anyway in case it becomes readable. */ if (VALUE_LVAL (v) == lval_memory - && ! value_lazy (v)) + && (v == val_chain || ! value_lazy (v))) { struct type *vtype = check_typedef (value_type (v)); /* We only watch structs and arrays if user asked for it explicitly, never if they just happen to appear in the middle of some value chain. */ - if (v == b->val + if (v == result || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT && TYPE_CODE (vtype) != TYPE_CODE_ARRAY)) { @@ -1682,6 +1734,7 @@ breakpoint_init_inferior (enum inf_conte if (b->val) value_free (b->val); b->val = NULL; + b->val_valid = 0; } break; default: @@ -2104,6 +2157,17 @@ top: do_cleanups (old_chain); } +/* Print out the (old or new) value associated with a watchpoint. */ + +static void +watchpoint_value_print (struct value *val, struct ui_file *stream) +{ + if (val == NULL) + fprintf_unfiltered (stream, _("")); + else + value_print (val, stream, 0, Val_pretty_default); +} + /* This is the normal print function for a bpstat. In the future, much of this logic could (should?) be moved to bpstat_stop_status, by having it set different print_it values. @@ -2222,26 +2286,21 @@ print_it_typical (bpstat bs) case bp_watchpoint: case bp_hardware_watchpoint: - if (bs->old_val != NULL) - { - annotate_watchpoint (b->number); - if (ui_out_is_mi_like_p (uiout)) - ui_out_field_string - (uiout, "reason", - async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nOld value = "); - value_print (bs->old_val, stb->stream, 0, Val_pretty_default); - ui_out_field_stream (uiout, "old", stb); - ui_out_text (uiout, "\nNew value = "); - value_print (b->val, stb->stream, 0, Val_pretty_default); - ui_out_field_stream (uiout, "new", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); - value_free (bs->old_val); - bs->old_val = NULL; - } + annotate_watchpoint (b->number); + if (ui_out_is_mi_like_p (uiout)) + ui_out_field_string + (uiout, "reason", + async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); + mention (b); + ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); + ui_out_text (uiout, "\nOld value = "); + watchpoint_value_print (bs->old_val, stb->stream); + ui_out_field_stream (uiout, "old", stb); + ui_out_text (uiout, "\nNew value = "); + watchpoint_value_print (b->val, stb->stream); + ui_out_field_stream (uiout, "new", stb); + do_cleanups (ui_out_chain); + ui_out_text (uiout, "\n"); /* More than one watchpoint may have been triggered. */ return PRINT_UNKNOWN; break; @@ -2254,7 +2313,7 @@ print_it_typical (bpstat bs) mention (b); ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); ui_out_text (uiout, "\nValue = "); - value_print (b->val, stb->stream, 0, Val_pretty_default); + watchpoint_value_print (b->val, stb->stream); ui_out_field_stream (uiout, "value", stb); do_cleanups (ui_out_chain); ui_out_text (uiout, "\n"); @@ -2262,7 +2321,7 @@ print_it_typical (bpstat bs) break; case bp_access_watchpoint: - if (bs->old_val != NULL) + if (bs->old_val != NULL) { annotate_watchpoint (b->number); if (ui_out_is_mi_like_p (uiout)) @@ -2272,10 +2331,8 @@ print_it_typical (bpstat bs) mention (b); ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); ui_out_text (uiout, "\nOld value = "); - value_print (bs->old_val, stb->stream, 0, Val_pretty_default); + watchpoint_value_print (bs->old_val, stb->stream); ui_out_field_stream (uiout, "old", stb); - value_free (bs->old_val); - bs->old_val = NULL; ui_out_text (uiout, "\nNew value = "); } else @@ -2288,7 +2345,7 @@ print_it_typical (bpstat bs) ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); ui_out_text (uiout, "\nValue = "); } - value_print (b->val, stb->stream, 0,Val_pretty_default); + watchpoint_value_print (b->val, stb->stream); ui_out_field_stream (uiout, "new", stb); do_cleanups (ui_out_chain); ui_out_text (uiout, "\n"); @@ -2575,13 +2632,20 @@ watchpoint_check (void *p) we might be in the middle of evaluating a function call. */ struct value *mark = value_mark (); - struct value *new_val = evaluate_expression (b->exp); - if (!value_equal (b->val, new_val)) + struct value *new_val; + + fetch_watchpoint_value (b->exp, &new_val, NULL, NULL); + if ((b->val != NULL) != (new_val != NULL) + || (b->val != NULL && !value_equal (b->val, new_val))) { - release_value (new_val); - value_free_to_mark (mark); + if (new_val != NULL) + { + release_value (new_val); + value_free_to_mark (mark); + } bs->old_val = b->val; b->val = new_val; + b->val_valid = 1; /* We will stop here */ return WP_VALUE_CHANGED; } @@ -5780,10 +5844,9 @@ watch_command_1 (char *arg, int accessfl exp_end = arg; exp_valid_block = innermost_block; mark = value_mark (); - val = evaluate_expression (exp); - release_value (val); - if (value_lazy (val)) - value_fetch_lazy (val); + fetch_watchpoint_value (exp, &val, NULL, NULL); + if (val != NULL) + release_value (val); tok = arg; while (*tok == ' ' || *tok == '\t') @@ -5872,6 +5935,7 @@ watch_command_1 (char *arg, int accessfl b->exp_valid_block = exp_valid_block; b->exp_string = savestring (exp_start, exp_end - exp_start); b->val = val; + b->val_valid = 1; b->loc->cond = cond; if (cond_start) b->cond_string = savestring (cond_start, cond_end - cond_start); @@ -7755,11 +7819,11 @@ is valid is not currently in scope.\n"), if (bpt->val) value_free (bpt->val); mark = value_mark (); - bpt->val = evaluate_expression (bpt->exp); - release_value (bpt->val); - if (value_lazy (bpt->val)) - value_fetch_lazy (bpt->val); - + fetch_watchpoint_value (bpt->exp, &bpt->val, NULL, NULL); + if (bpt->val) + release_value (bpt->val); + bpt->val_valid = 1; + if (bpt->type == bp_hardware_watchpoint || bpt->type == bp_read_watchpoint || bpt->type == bp_access_watchpoint) diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.50.20080227-orig/gdb/breakpoint.h gdb-6.7.50.20080227-dynwatch/gdb/breakpoint.h --- gdb-6.7.50.20080227-orig/gdb/breakpoint.h 2008-03-03 08:42:10.000000000 +0100 +++ gdb-6.7.50.20080227-dynwatch/gdb/breakpoint.h 2008-03-03 08:34:20.000000000 +0100 @@ -392,8 +392,13 @@ struct breakpoint /* The largest block within which it is valid, or NULL if it is valid anywhere (e.g. consists just of global symbols). */ struct block *exp_valid_block; - /* Value of the watchpoint the last time we checked it. */ + /* Value of the watchpoint the last time we checked it, or NULL + when we do not know the value yet or the value was not + readable. VAL is never lazy. */ struct value *val; + /* Nonzero if VAL is valid. If VAL_VALID is set but VAL is NULL, + then an error occurred reading the value. */ + int val_valid; /* Holds the address of the related watchpoint_scope breakpoint when using watchpoints on local variables (might the concept diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.50.20080227-orig/gdb/testsuite/gdb.base/watchpoint.c gdb-6.7.50.20080227-dynwatch/gdb/testsuite/gdb.base/watchpoint.c --- gdb-6.7.50.20080227-orig/gdb/testsuite/gdb.base/watchpoint.c 2003-03-17 20:51:58.000000000 +0100 +++ gdb-6.7.50.20080227-dynwatch/gdb/testsuite/gdb.base/watchpoint.c 2008-03-03 08:34:20.000000000 +0100 @@ -39,6 +39,8 @@ struct foo struct1, struct2, *ptr1, *ptr int doread = 0; +char *global_ptr; + void marker1 () { } @@ -110,6 +112,14 @@ func1 () return 73; } +void +func4 () +{ + buf[0] = 3; + global_ptr = buf; + buf[0] = 7; +} + int main () { #ifdef usestubs @@ -185,5 +195,7 @@ int main () func3 (); + func4 (); + return 0; } diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.50.20080227-orig/gdb/testsuite/gdb.base/watchpoint.exp gdb-6.7.50.20080227-dynwatch/gdb/testsuite/gdb.base/watchpoint.exp --- gdb-6.7.50.20080227-orig/gdb/testsuite/gdb.base/watchpoint.exp 2008-01-01 23:53:19.000000000 +0100 +++ gdb-6.7.50.20080227-dynwatch/gdb/testsuite/gdb.base/watchpoint.exp 2008-03-03 08:34:20.000000000 +0100 @@ -645,6 +645,30 @@ proc test_watchpoint_and_breakpoint {} { } } +proc test_inaccessible_watchpoint {} { + global gdb_prompt + + # This is a test for watchpoints on currently inaccessible (but later + # valid) memory. + + if [runto func4] then { + gdb_test "watch *global_ptr" ".*atchpoint \[0-9\]+: \\*global_ptr" + gdb_test "next" ".*global_ptr = buf.*" + gdb_test_multiple "next" "next over ptr init" { + -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = .*\r\nNew value = 3 .*\r\n.*$gdb_prompt $" { + # We can not test for here because NULL may be readable. + # This test does rely on *NULL != 3. + pass "next over ptr init" + } + } + gdb_test_multiple "next" "next over buffer set" { + -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = 3 .*\r\nNew value = 7 .*\r\n.*$gdb_prompt $" { + pass "next over buffer set" + } + } + } +} + # Start with a fresh gdb. gdb_exit @@ -655,6 +679,7 @@ set prev_timeout $timeout set timeout 600 verbose "Timeout now 600 sec.\n" +gdb_test "set debug solib 1" if [initialize] then { test_simple_watchpoint @@ -797,6 +822,8 @@ if [initialize] then { } } + test_inaccessible_watchpoint + # See above. if [istarget "mips-idt-*"] then { gdb_exit Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 1 Nov 2007 22:28:37 -0000 1.24 +++ .cvsignore 3 Mar 2008 16:13:47 -0000 1.25 @@ -1 +1 @@ -gdb-6.7.1.tar.bz2 +gdb-6.7.50.20080227.tar.bz2 gdb-6.3-catch-debug-registers-error-20060527.patch: Index: gdb-6.3-catch-debug-registers-error-20060527.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-catch-debug-registers-error-20060527.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-catch-debug-registers-error-20060527.patch 11 Jul 2006 08:25:57 -0000 1.2 +++ gdb-6.3-catch-debug-registers-error-20060527.patch 3 Mar 2008 16:13:47 -0000 1.3 @@ -6,52 +6,153 @@ (i386_linux_set_debug_regs_for_thread): ... this, and add new function to catch exceptions in the old one. -Index: gdb-6.5/gdb/i386-linux-nat.c +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + +This patch was originally made to workaround a deficiency of ia32el (==ia32 +emulator on ia64) which EIOs on ptrace(2) of the debug registers. + +Currently I can no longer run gdb.i386 on RHEL-5.1.ia64 as it fails on + $ rpm -qv kernel + kernel-2.6.18-53.el5.ia64 + $ file /emul/ia32-linux/usr/bin/gdb ./print-threads + /emul/ia32-linux/usr/bin/gdb: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), for GNU/Linux 2.6.9, dynamically linked (uses shared libs), for GNU/Linux 2.6.9, stripped + ./print-threads: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), for GNU/Linux 2.6.9, dynamically linked (uses shared libs), for GNU/Linux 2.6.9, not stripped + $ /emul/ia32-linux/usr/bin/gdb ./print-threads + (gdb) r + Starting program: /root/jkratoch/redhat/print-threads + Warning: + Cannot insert breakpoint -2. + Error accessing memory address 0x555766fb: Input/output error. + (gdb) maint info breakpoints + Num Type Disp Enb Address What + -1 longjmp resume keep n 0x00000000 + -2 shlib events keep y 0x555766fb + +ia32-on-ia64 run problem info: + +the inconsistency is in function linux_nat_wait - there is a variable called +block_mask, which is assumed to represent the current signal mask. in the +following execution path this assumption does not hold: + +1) block-mask is filled with SIGCHLD and the signal is masked in + lin_lwp_attach_lwp, which is called at the beginning of the procedure + that handles a new thread in the debuggee. +2) further down this procedure gdb tries to set the debug regs of the debuggee. + when trying to set debug regs - gdb fails and calls throw_exception. this + function finishes with siglongjmp, which clears the sigmask (seq. 1). +3) further down, linux_nat_wait is called to wait on the new child. in + linux_nat_wait there is a sequence : + + if ( ! (block_mask & SIGCHLD) ) + mask- SIGCHLD + while () { + wait-no-hang( ) + if no child found then + sigsuspend (SIGCHLD) + +4) the signal that notifies the debugger about the child is received after the + wait and before the sigsuspend. originally, this was not supposed to happen + because SIGCHLD is supposed to be blocked, but because what happens in step + 2, the signal mask is cleared and the signal is received at this point, + which results with a hang + +sequence 1: + +catch_errors (symbol_add_stubs) + symbol_file_add_with_addrs_or_offsets + deprecated_target_new_objfile_hook + tui_new_objfile_hook + attach_thread + observer_notify_linux_new_thread + generic_observer_notify + observer_linux_new_thread_notification_stub + i386_linux_new_thread + i386_linux_set_debug_regs_for_thread + i386_linux_dr_set_addr + i386_linux_dr_set + perror_with_name + . + . + . + throw_exception + siglongjmp + +RHEL Bug 175270 + +Index: gdb-6.8cvs20080219/gdb/i386-linux-nat.c =================================================================== ---- gdb-6.5.orig/gdb/i386-linux-nat.c 2006-07-11 05:21:58.000000000 -0300 -+++ gdb-6.5/gdb/i386-linux-nat.c 2006-07-11 05:24:29.000000000 -0300 -@@ -27,6 +27,7 @@ - #include "observer.h" +--- gdb-6.8cvs20080219.orig/gdb/i386-linux-nat.c 2008-01-10 19:19:02.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/i386-linux-nat.c 2008-02-24 09:23:09.000000000 +0100 +@@ -24,6 +24,7 @@ + #include "regcache.h" #include "target.h" #include "linux-nat.h" +#include "exceptions.h" #include "gdb_assert.h" #include "gdb_string.h" -@@ -695,14 +696,33 @@ struct i386_debug_register_state - unsigned long control; - }; +@@ -611,20 +612,40 @@ i386_linux_dr_get (ptid_t ptid, int regn + return value; + } -static void --i386_linux_set_debug_regs_for_thread (ptid_t ptid, -- struct i386_debug_register_state *dbs) -+struct i386_debug_register_for_thread -+{ -+ ptid_t ptid; -+ struct i386_debug_register_state *dbs; -+}; -+ +-i386_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) +-{ +- int tid; ++struct i386_linux_dr_set ++ { ++ int tid; ++ int regnum; ++ unsigned long value; ++ }; + +- tid = TIDGET (ptid); +- if (tid == 0) +- tid = PIDGET (ptid); +static int -+i386_linux_set_dr_for_thread (void *drp) - { -+ ptid_t ptid = ((struct i386_debug_register_for_thread *)drp)->ptid; -+ struct i386_debug_register_state *dbs -+ = ((struct i386_debug_register_for_thread *)drp)->dbs; - int i; - for (i = 0; i < (DR_LASTADDR - DR_FIRSTADDR) + 1; ++i) - i386_linux_dr_set_addr (ptid, i, dbs->addr[i]); - i386_linux_dr_set_control (ptid, dbs->control); ++i386_linux_dr_set_core (void *data_pointer) ++{ ++ struct i386_linux_dr_set *data = data_pointer; + + errno = 0; +- ptrace (PTRACE_POKEUSER, tid, +- offsetof (struct user, u_debugreg[regnum]), value); ++ ptrace (PTRACE_POKEUSER, data->tid, ++ offsetof (struct user, u_debugreg[data->regnum]), data->value); + if (errno != 0) + perror_with_name (_("Couldn't write debug register")); + return 1; +} + +static int -+i386_linux_set_debug_regs_for_thread (ptid_t ptid, -+ struct i386_debug_register_state *dbs) ++i386_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) +{ -+ struct i386_debug_register_for_thread dr; -+ dr.ptid = ptid; -+ dr.dbs = dbs; -+ return catch_errors (i386_linux_set_dr_for_thread, &dr, "", RETURN_MASK_ALL); ++ struct i386_linux_dr_set data; ++ int tid; ++ ++ data.tid = TIDGET (ptid); ++ if (data.tid == 0) ++ data.tid = PIDGET (ptid); ++ ++ data.regnum = regnum; ++ data.value = value; ++ ++ return catch_errors (i386_linux_dr_set_core, &data, "", RETURN_MASK_ALL); } - /* Iterator function to support syncing debug registers across all threads. */ + void +Index: gdb-6.8cvs20080219/gdb/Makefile.in +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/Makefile.in 2008-02-24 09:13:35.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/Makefile.in 2008-02-24 09:14:26.000000000 +0100 +@@ -2252,7 +2252,7 @@ i386gnu-tdep.o: i386gnu-tdep.c $(defs_h) + i386-linux-nat.o: i386-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \ + $(regcache_h) $(linux_nat_h) $(gdb_assert_h) $(gdb_string_h) \ + $(gregset_h) $(i387_tdep_h) $(i386_tdep_h) $(i386_linux_tdep_h) \ +- $(gdb_proc_service_h) $(target_h) ++ $(gdb_proc_service_h) $(target_h) $(exceptions_h) + i386-linux-tdep.o: i386-linux-tdep.c $(defs_h) $(gdbcore_h) $(frame_h) \ + $(value_h) $(regcache_h) $(inferior_h) $(osabi_h) $(reggroups_h) \ + $(dwarf2_frame_h) $(gdb_string_h) $(i386_tdep_h) \ gdb-6.3-dwattype0-20050201.patch: Index: gdb-6.3-dwattype0-20050201.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-dwattype0-20050201.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-dwattype0-20050201.patch 22 Feb 2005 17:34:05 -0000 1.2 +++ gdb-6.3-dwattype0-20050201.patch 3 Mar 2008 16:13:47 -0000 1.3 @@ -3,11 +3,17 @@ * dwarf2read.c (die_type): Tolerate a type reference to location <0> and treat as unknown type. ---- gdb-6.3/gdb/dwarf2read.c.fix Tue Feb 1 16:48:49 2005 -+++ gdb-6.3/gdb/dwarf2read.c Tue Feb 1 16:50:12 2005 -@@ -7120,6 +7120,10 @@ die_type (struct die_info *die, struct d +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + +Index: gdb-6.8cvs20080219/gdb/dwarf2read.c +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/dwarf2read.c 2008-02-22 08:10:39.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/dwarf2read.c 2008-02-22 08:17:56.000000000 +0100 +@@ -7634,6 +7634,10 @@ die_type (struct die_info *die, struct d /* A missing DW_AT_type represents a void type. */ - return dwarf2_fundamental_type (cu->objfile, FT_VOID, cu); + return builtin_type (current_gdbarch)->builtin_void; } + else if (DW_ADDR (type_attr) == 0) + /* If we have an invalid reference to 0, ignore it and treat gdb-6.3-ia64-info-frame-fix-20050725.patch: Index: gdb-6.3-ia64-info-frame-fix-20050725.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ia64-info-frame-fix-20050725.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-ia64-info-frame-fix-20050725.patch 25 Jul 2005 22:43:34 -0000 1.1 +++ gdb-6.3-ia64-info-frame-fix-20050725.patch 3 Mar 2008 16:13:47 -0000 1.2 @@ -9,6 +9,10 @@ * gdb.arch/ia64-sigtramp.exp: New test. * gdb.arch/ia64-sigtramp.c: Ditto. +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. (Only the testcase has remained.) + --- gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigtramp.c.fix 2005-07-25 16:42:46.000000000 -0400 +++ gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigtramp.c 2005-07-25 16:42:08.000000000 -0400 @@ -0,0 +1,23 @@ @@ -104,17 +108,3 @@ +gdb_test "f 1" ".*signal handler called.*" "frame 1" +gdb_test "info frame" "Stack level 1.*p63 at .*" "info sigtramp frame" + ---- gdb-6.3/gdb/libunwind-frame.c.fix 2005-07-25 16:41:30.000000000 -0400 -+++ gdb-6.3/gdb/libunwind-frame.c 2005-07-25 16:46:23.000000000 -0400 -@@ -303,8 +303,9 @@ libunwind_frame_prev_register (struct fr - modification to support unwinding through a sigaltstack. */ - if (uw_regnum == INT_MAX) - { -- store_unsigned_integer (valuep, sizeof (CORE_ADDR), -- (CORE_ADDR)&cache->cursor); -+ if (valuep) -+ store_unsigned_integer (valuep, sizeof (CORE_ADDR), -+ (CORE_ADDR)&cache->cursor); - return; - } - gdb-6.3-ia64-sigtramp-fp-20050926.patch: Index: gdb-6.3-ia64-sigtramp-fp-20050926.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-ia64-sigtramp-fp-20050926.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.3-ia64-sigtramp-fp-20050926.patch 1 Nov 2007 20:24:20 -0000 1.3 +++ gdb-6.3-ia64-sigtramp-fp-20050926.patch 3 Mar 2008 16:13:47 -0000 1.4 @@ -16,10 +16,14 @@ Port to GDB-6.7. -Index: gdb-6.7/gdb/libunwind-frame.c +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + +Index: gdb-6.8cvs20080219/gdb/libunwind-frame.c =================================================================== ---- gdb-6.7.orig/gdb/libunwind-frame.c 2007-10-15 00:08:30.000000000 +0200 -+++ gdb-6.7/gdb/libunwind-frame.c 2007-10-15 00:13:29.000000000 +0200 +--- gdb-6.8cvs20080219.orig/gdb/libunwind-frame.c 2008-01-02 00:04:03.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/libunwind-frame.c 2008-02-24 20:25:56.000000000 +0100 @@ -61,6 +61,7 @@ static unw_word_t (*unw_find_dyn_list_p) struct libunwind_frame_cache { @@ -28,19 +32,19 @@ CORE_ADDR func_addr; unw_cursor_t cursor; unw_addr_space_t as; -@@ -134,7 +135,7 @@ libunwind_frame_cache (struct frame_info +@@ -133,6 +134,7 @@ libunwind_frame_cache (struct frame_info unw_accessors_t *acc; unw_addr_space_t as; - unw_cursor_t *cursor_addr; -- unw_word_t fp; + unw_word_t fp; + unw_word_t fp, sp; unw_regnum_t uw_sp_regnum; struct libunwind_frame_cache *cache; struct libunwind_descr *descr; -@@ -183,14 +184,29 @@ libunwind_frame_cache (struct frame_info - else /* make copy */ - cache->cursor = *cursor_addr; +@@ -171,14 +173,30 @@ libunwind_frame_cache (struct frame_info + : __LITTLE_ENDIAN); + unw_init_remote_p (&cache->cursor, as, next_frame); ++ + /* For the base address, we have a small problem. The majority + of the time, we can get the stack pointer of the previous + frame to use as a frame pointer. In the case where we have @@ -50,7 +54,7 @@ + sigaltstack as we want. To handle this, we record the stack + address so the caller may calculate a more correct base address + to use. */ -+ uw_sp_regnum = descr->gdb2uw (gdbarch_sp_regnum (current_gdbarch)); ++ uw_sp_regnum = descr->gdb2uw (gdbarch_sp_regnum (gdbarch)); + ret = unw_get_reg_p (&cache->cursor, uw_sp_regnum, &sp); + if (ret < 0) + { @@ -65,11 +69,11 @@ } - /* To get base address, get sp from previous frame. */ -- uw_sp_regnum = descr->gdb2uw (gdbarch_sp_regnum (current_gdbarch)); +- uw_sp_regnum = descr->gdb2uw (gdbarch_sp_regnum (gdbarch)); ret = unw_get_reg_p (&cache->cursor, uw_sp_regnum, &fp); if (ret < 0) { -@@ -198,6 +214,7 @@ libunwind_frame_cache (struct frame_info +@@ -186,6 +204,7 @@ libunwind_frame_cache (struct frame_info error (_("Can't get libunwind sp register.")); } @@ -77,7 +81,7 @@ cache->base = (CORE_ADDR)fp; cache->as = as; -@@ -402,6 +419,31 @@ libunwind_search_unwind_table (void *as, +@@ -381,6 +400,31 @@ libunwind_search_unwind_table (void *as, di, pi, need_unwind_info, args); } @@ -109,7 +113,7 @@ /* Verify if we are in a sigtramp frame and we can use libunwind to unwind. */ const struct frame_unwind * libunwind_sigtramp_frame_sniffer (struct frame_info *next_frame) -@@ -439,7 +481,7 @@ libunwind_sigtramp_frame_sniffer (struct +@@ -419,7 +463,7 @@ libunwind_sigtramp_frame_sniffer (struct ret = unw_is_signal_frame_p (&cursor); unw_destroy_addr_space_p (as); if (ret > 0) @@ -118,11 +122,11 @@ return NULL; } -Index: gdb-6.7/gdb/libunwind-frame.h +Index: gdb-6.8cvs20080219/gdb/libunwind-frame.h =================================================================== ---- gdb-6.7.orig/gdb/libunwind-frame.h 2007-10-15 00:05:20.000000000 +0200 -+++ gdb-6.7/gdb/libunwind-frame.h 2007-10-15 00:08:36.000000000 +0200 -@@ -48,6 +48,9 @@ void libunwind_frame_set_descr (struct g +--- gdb-6.8cvs20080219.orig/gdb/libunwind-frame.h 2008-01-02 00:04:03.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/libunwind-frame.h 2008-02-24 20:23:47.000000000 +0100 +@@ -47,6 +47,9 @@ void libunwind_frame_set_descr (struct g void libunwind_frame_this_id (struct frame_info *next_frame, void **this_cache, struct frame_id *this_id); @@ -132,11 +136,11 @@ void libunwind_frame_prev_register (struct frame_info *next_frame, void **this_cache, int regnum, int *optimizedp, enum lval_type *lvalp, CORE_ADDR *addrp, -Index: gdb-6.7/gdb/ia64-tdep.c +Index: gdb-6.8cvs20080219/gdb/ia64-tdep.c =================================================================== ---- gdb-6.7.orig/gdb/ia64-tdep.c 2007-10-15 00:05:20.000000000 +0200 -+++ gdb-6.7/gdb/ia64-tdep.c 2007-10-15 00:08:36.000000000 +0200 -@@ -2968,7 +2968,7 @@ ia64_libunwind_sigtramp_frame_this_id (s +--- gdb-6.8cvs20080219.orig/gdb/ia64-tdep.c 2008-02-24 20:23:40.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/ia64-tdep.c 2008-02-24 20:23:47.000000000 +0100 +@@ -2942,7 +2942,7 @@ ia64_libunwind_sigtramp_frame_this_id (s struct frame_id id; CORE_ADDR prev_ip; @@ -145,7 +149,7 @@ if (frame_id_eq (id, null_frame_id)) { (*this_id) = null_frame_id; -@@ -2980,8 +2980,14 @@ ia64_libunwind_sigtramp_frame_this_id (s +@@ -2954,8 +2954,14 @@ ia64_libunwind_sigtramp_frame_this_id (s frame_unwind_register (next_frame, IA64_BSP_REGNUM, buf); bsp = extract_unsigned_integer (buf, 8); gdb-6.3-nonthreaded-wp-20050117.patch: Index: gdb-6.3-nonthreaded-wp-20050117.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-nonthreaded-wp-20050117.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gdb-6.3-nonthreaded-wp-20050117.patch 1 Nov 2007 20:24:20 -0000 1.6 +++ gdb-6.3-nonthreaded-wp-20050117.patch 3 Mar 2008 16:13:47 -0000 1.7 @@ -13,10 +13,14 @@ Port to GDB-6.7. -Index: gdb-6.7/gdb/doc/observer.texi +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + +Index: gdb-6.8cvs20080219/gdb/doc/observer.texi =================================================================== ---- gdb-6.7.orig/gdb/doc/observer.texi 2007-10-13 05:09:50.000000000 +0200 -+++ gdb-6.7/gdb/doc/observer.texi 2007-10-14 23:24:52.000000000 +0200 +--- gdb-6.8cvs20080219.orig/gdb/doc/observer.texi 2007-10-09 13:06:07.000000000 +0200 ++++ gdb-6.8cvs20080219/gdb/doc/observer.texi 2008-02-21 17:45:46.000000000 +0100 @@ -119,6 +119,10 @@ when @value{GDBN} calls this observer, t haven't been loaded yet. @end deftypefun @@ -28,11 +32,19 @@ @deftypefun void solib_unloaded (struct so_list *@var{solib}) The shared library specified by @var{solib} has been unloaded. @end deftypefun -Index: gdb-6.7/gdb/linux-nat.c +Index: gdb-6.8cvs20080219/gdb/linux-nat.c =================================================================== ---- gdb-6.7.orig/gdb/linux-nat.c 2007-10-13 05:09:50.000000000 +0200 -+++ gdb-6.7/gdb/linux-nat.c 2007-10-14 23:24:52.000000000 +0200 -@@ -742,11 +742,26 @@ iterate_over_lwps (int (*callback) (stru +--- gdb-6.8cvs20080219.orig/gdb/linux-nat.c 2008-02-21 17:45:45.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/linux-nat.c 2008-02-22 08:12:57.000000000 +0100 +@@ -37,6 +37,7 @@ + #include "regset.h" + #include "inf-ptrace.h" + #include "auxv.h" ++#include "observer.h" + #include /* for MAXPATHLEN */ + #include /* for elf_gregset etc. */ + #include "elf-bfd.h" /* for elfcore_write_* */ +@@ -751,11 +752,26 @@ iterate_over_lwps (int (*callback) (stru { struct lwp_info *lp, *lpnext; @@ -62,8 +74,8 @@ } return NULL; -@@ -3272,6 +3284,18 @@ linux_nat_add_target (struct target_ops - thread_db_init (t); +@@ -3319,6 +3335,18 @@ linux_nat_get_siginfo (ptid_t ptid) + return &lp->siginfo; } +/* Observer function for a mourn inferior event. This is needed @@ -81,7 +93,7 @@ void _initialize_linux_nat (void) { -@@ -3286,6 +3310,8 @@ Specify any of the following keywords fo +@@ -3333,6 +3361,8 @@ Specify any of the following keywords fo status -- list a different bunch of random process info.\n\ all -- list all available /proc info.")); @@ -90,10 +102,10 @@ /* Save the original signal mask. */ sigprocmask (SIG_SETMASK, NULL, &normal_mask); -Index: gdb-6.7/gdb/target.c +Index: gdb-6.8cvs20080219/gdb/target.c =================================================================== ---- gdb-6.7.orig/gdb/target.c 2007-08-23 20:08:45.000000000 +0200 -+++ gdb-6.7/gdb/target.c 2007-10-14 23:25:13.000000000 +0200 +--- gdb-6.8cvs20080219.orig/gdb/target.c 2008-02-14 23:04:00.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/target.c 2008-02-22 08:10:37.000000000 +0100 @@ -39,6 +39,7 @@ #include "gdbcore.h" #include "exceptions.h" @@ -116,11 +128,11 @@ static int nomemory (CORE_ADDR memaddr, char *myaddr, int len, int write, struct target_ops *t) -Index: gdb-6.7/gdb/target.h +Index: gdb-6.8cvs20080219/gdb/target.h =================================================================== ---- gdb-6.7.orig/gdb/target.h 2007-08-23 20:08:46.000000000 +0200 -+++ gdb-6.7/gdb/target.h 2007-10-14 23:24:52.000000000 +0200 -@@ -864,8 +864,7 @@ int target_follow_fork (int follow_child +--- gdb-6.8cvs20080219.orig/gdb/target.h 2008-01-02 00:04:05.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/target.h 2008-02-22 08:10:37.000000000 +0100 +@@ -861,8 +861,7 @@ int target_follow_fork (int follow_child /* The inferior process has died. Do what is right. */ @@ -130,9 +142,10 @@ /* Does target have enough data to do a run or attach command? */ -diff -u -u -X /home/jkratoch/.diffi.list -rup gdb-6.6-orig/gdb/testsuite/gdb.base/follow-child.c gdb-6.6/gdb/testsuite/gdb.base/follow-child.c ---- gdb-6.6-orig/gdb/testsuite/gdb.base/follow-child.c 2007-10-13 19:24:58.000000000 +0200 -+++ gdb-6.6/gdb/testsuite/gdb.base/follow-child.c 2007-10-13 19:11:08.000000000 +0200 +Index: gdb-6.8cvs20080219/gdb/testsuite/gdb.base/follow-child.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8cvs20080219/gdb/testsuite/gdb.base/follow-child.c 2008-02-22 08:14:04.000000000 +0100 @@ -0,0 +1,29 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -147,7 +160,7 @@ + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -+ ++ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -163,9 +176,10 @@ + sleep (60); + return 0; +} -diff -u -u -X /home/jkratoch/.diffi.list -rup gdb-6.6-orig/gdb/testsuite/gdb.base/follow-child.exp gdb-6.6/gdb/testsuite/gdb.base/follow-child.exp ---- gdb-6.6-orig/gdb/testsuite/gdb.base/follow-child.exp 2007-10-13 19:24:58.000000000 +0200 -+++ gdb-6.6/gdb/testsuite/gdb.base/follow-child.exp 2007-10-13 19:24:21.000000000 +0200 +Index: gdb-6.8cvs20080219/gdb/testsuite/gdb.base/follow-child.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8cvs20080219/gdb/testsuite/gdb.base/follow-child.exp 2008-02-22 08:14:17.000000000 +0100 @@ -0,0 +1,55 @@ +# Copyright 2007 Free Software Foundation, Inc. + @@ -181,7 +195,7 @@ +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +if $tracelevel then { + strace $tracelevel @@ -222,3 +236,16 @@ + fail $test + } +} +Index: gdb-6.8cvs20080219/gdb/Makefile.in +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/Makefile.in 2008-02-22 08:10:38.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/Makefile.in 2008-02-22 08:13:31.000000000 +0100 +@@ -2377,7 +2377,7 @@ linux-nat.o: linux-nat.c $(defs_h) $(inf + $(gdb_wait_h) $(gdb_assert_h) $(linux_nat_h) $(gdbthread_h) \ + $(gdbcmd_h) $(regcache_h) $(regset_h) $(inf_ptrace_h) $(auxv_h) \ + $(elf_bfd_h) $(gregset_h) $(gdbcore_h) $(gdbthread_h) $(gdb_stat_h) \ +- $(linux_fork_h) ++ $(linux_fork_h) $(observer_h) + linux-thread-db.o: linux-thread-db.c $(defs_h) $(gdb_assert_h) \ + $(gdb_proc_service_h) $(gdb_thread_db_h) $(bfd_h) $(exceptions_h) \ + $(gdbthread_h) $(inferior_h) $(symfile_h) $(objfiles_h) $(target_h) \ gdb-6.3-pie-20050110.patch: Index: gdb-6.3-pie-20050110.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gdb-6.3-pie-20050110.patch 16 Nov 2007 02:15:40 -0000 1.6 +++ gdb-6.3-pie-20050110.patch 3 Mar 2008 16:13:47 -0000 1.7 @@ -10,11 +10,19 @@ * solib-svr4.c (svr4_current_sos): Fix segfault on NULL EXEC_BFD. -Index: gdb-6.7.1/gdb/dwarf2read.c +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + +2008-02-27 Jan Kratochvil + + Port to gdb-6.7.50.20080227. + +Index: gdb-6.7.50.20080227/gdb/dwarf2read.c =================================================================== ---- gdb-6.7.1.orig/gdb/dwarf2read.c 2007-11-02 15:24:10.000000000 +0100 -+++ gdb-6.7.1/gdb/dwarf2read.c 2007-11-02 15:24:19.000000000 +0100 -@@ -1226,7 +1226,7 @@ dwarf2_build_psymtabs (struct objfile *o +--- gdb-6.7.50.20080227.orig/gdb/dwarf2read.c 2008-02-27 08:57:20.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/dwarf2read.c 2008-02-27 08:57:31.000000000 +0100 +@@ -1217,7 +1217,7 @@ dwarf2_build_psymtabs (struct objfile *o else dwarf2_per_objfile->loc_buffer = NULL; @@ -23,10 +31,10 @@ || (objfile->global_psymbols.size == 0 && objfile->static_psymbols.size == 0)) { -Index: gdb-6.7.1/gdb/auxv.c +Index: gdb-6.7.50.20080227/gdb/auxv.c =================================================================== ---- gdb-6.7.1.orig/gdb/auxv.c 2007-08-23 20:08:26.000000000 +0200 -+++ gdb-6.7.1/gdb/auxv.c 2007-11-02 15:24:19.000000000 +0100 +--- gdb-6.7.50.20080227.orig/gdb/auxv.c 2008-01-16 17:27:37.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/auxv.c 2008-02-27 08:57:31.000000000 +0100 @@ -80,7 +80,7 @@ procfs_xfer_auxv (struct target_ops *ops Return 1 if an entry was read into *TYPEP and *VALP. */ int @@ -89,7 +97,7 @@ { #define TAG(tag, text, kind) \ case tag: name = #tag; description = text; flavor = kind; break -@@ -211,7 +213,7 @@ fprint_target_auxv (struct ui_file *file +@@ -213,7 +215,7 @@ fprint_target_auxv (struct ui_file *file } fprintf_filtered (file, "%-4s %-20s %-30s ", @@ -98,10 +106,10 @@ switch (flavor) { case dec: -Index: gdb-6.7.1/gdb/auxv.h +Index: gdb-6.7.50.20080227/gdb/auxv.h =================================================================== ---- gdb-6.7.1.orig/gdb/auxv.h 2007-08-23 20:08:26.000000000 +0200 -+++ gdb-6.7.1/gdb/auxv.h 2007-11-02 15:24:19.000000000 +0100 +--- gdb-6.7.50.20080227.orig/gdb/auxv.h 2008-01-01 23:53:09.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/auxv.h 2008-02-27 08:57:31.000000000 +0100 @@ -35,14 +35,14 @@ struct target_ops; /* Forward declarati Return 1 if an entry was read into *TYPEP and *VALP. */ extern int target_auxv_parse (struct target_ops *ops, @@ -119,11 +127,11 @@ /* Print the contents of the target's AUXV on the specified file. */ extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops); -Index: gdb-6.7.1/gdb/breakpoint.h +Index: gdb-6.7.50.20080227/gdb/breakpoint.h =================================================================== ---- gdb-6.7.1.orig/gdb/breakpoint.h 2007-11-02 15:22:24.000000000 +0100 -+++ gdb-6.7.1/gdb/breakpoint.h 2007-11-02 15:24:59.000000000 +0100 -@@ -150,6 +150,7 @@ enum enable_state +--- gdb-6.7.50.20080227.orig/gdb/breakpoint.h 2008-02-01 17:24:46.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/breakpoint.h 2008-02-27 08:57:31.000000000 +0100 +@@ -144,6 +144,7 @@ enum enable_state automatically enabled and reset when the call "lands" (either completes, or stops at another eventpoint). */ @@ -131,7 +139,7 @@ bp_permanent /* There is a breakpoint instruction hard-wired into the target's code. Don't try to write another breakpoint instruction on top of it, or restore -@@ -826,6 +827,10 @@ extern void remove_thread_event_breakpoi +@@ -823,6 +824,10 @@ extern void remove_thread_event_breakpoi extern void disable_breakpoints_in_shlibs (void); @@ -139,13 +147,13 @@ + +extern void re_enable_breakpoints_at_startup (void); + - extern void create_solib_load_event_breakpoint (char *, int, char *, char *); + /* This function returns TRUE if ep is a catchpoint. */ + extern int ep_is_catchpoint (struct breakpoint *); - extern void create_solib_unload_event_breakpoint (char *, int, -Index: gdb-6.7.1/gdb/symfile-mem.c +Index: gdb-6.7.50.20080227/gdb/symfile-mem.c =================================================================== ---- gdb-6.7.1.orig/gdb/symfile-mem.c 2007-08-23 20:08:39.000000000 +0200 -+++ gdb-6.7.1/gdb/symfile-mem.c 2007-11-02 15:24:19.000000000 +0100 +--- gdb-6.7.50.20080227.orig/gdb/symfile-mem.c 2008-01-01 23:53:13.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/symfile-mem.c 2008-02-27 08:57:31.000000000 +0100 @@ -108,7 +108,7 @@ symbol_file_add_from_memory (struct bfd } @@ -155,11 +163,11 @@ /* This might change our ideas about frames already looked at. */ reinit_frame_cache (); -Index: gdb-6.7.1/gdb/infrun.c +Index: gdb-6.7.50.20080227/gdb/infrun.c =================================================================== ---- gdb-6.7.1.orig/gdb/infrun.c 2007-11-02 15:21:57.000000000 +0100 -+++ gdb-6.7.1/gdb/infrun.c 2007-11-02 15:24:19.000000000 +0100 -@@ -2298,6 +2298,11 @@ process_event_stop_test: +--- gdb-6.7.50.20080227.orig/gdb/infrun.c 2008-02-27 08:57:20.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/infrun.c 2008-02-27 08:57:31.000000000 +0100 +@@ -2277,6 +2277,11 @@ process_event_stop_test: #endif target_terminal_inferior (); @@ -171,13 +179,13 @@ /* If requested, stop when the dynamic linker notifies gdb of events. This allows the user to get control and place breakpoints in initializer routines for -Index: gdb-6.7.1/gdb/objfiles.c +Index: gdb-6.7.50.20080227/gdb/objfiles.c =================================================================== ---- gdb-6.7.1.orig/gdb/objfiles.c 2007-08-23 20:08:36.000000000 +0200 -+++ gdb-6.7.1/gdb/objfiles.c 2007-11-02 15:24:19.000000000 +0100 -@@ -48,6 +48,9 @@ - #include "dictionary.h" +--- gdb-6.7.50.20080227.orig/gdb/objfiles.c 2008-01-01 23:53:12.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/objfiles.c 2008-02-27 08:57:31.000000000 +0100 +@@ -49,6 +49,9 @@ #include "source.h" + #include "addrmap.h" +#include "auxv.h" +#include "elf/common.h" @@ -185,7 +193,7 @@ /* Prototypes for local functions */ static void objfile_alloc_data (struct objfile *objfile); -@@ -259,7 +262,19 @@ init_entry_point_info (struct objfile *o +@@ -260,7 +263,19 @@ init_entry_point_info (struct objfile *o CORE_ADDR entry_point_address (void) { @@ -206,10 +214,10 @@ } /* Create the terminating entry of OBJFILE's minimal symbol table. -Index: gdb-6.7.1/gdb/solib-svr4.c +Index: gdb-6.7.50.20080227/gdb/solib-svr4.c =================================================================== ---- gdb-6.7.1.orig/gdb/solib-svr4.c 2007-11-02 15:21:46.000000000 +0100 -+++ gdb-6.7.1/gdb/solib-svr4.c 2007-11-02 15:24:19.000000000 +0100 +--- gdb-6.7.50.20080227.orig/gdb/solib-svr4.c 2008-02-27 08:57:19.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/solib-svr4.c 2008-02-27 08:59:06.000000000 +0100 @@ -31,6 +31,8 @@ #include "gdbcore.h" #include "target.h" @@ -219,7 +227,7 @@ #include "gdb_assert.h" -@@ -249,7 +251,9 @@ static char *debug_loader_name; +@@ -246,7 +248,9 @@ static char *debug_loader_name; /* Local function prototypes */ @@ -229,7 +237,7 @@ static CORE_ADDR bfd_lookup_symbol (bfd *, char *); -@@ -352,10 +356,12 @@ scan_dyntag (int dyntag, bfd *abfd, CORE +@@ -349,10 +353,12 @@ scan_dyntag (int dyntag, bfd *abfd, CORE int arch_size, step, sect_size; long dyn_tag; CORE_ADDR dyn_ptr, dyn_addr; @@ -242,7 +250,7 @@ if (abfd == NULL) return 0; -@@ -363,19 +369,74 @@ scan_dyntag (int dyntag, bfd *abfd, CORE +@@ -360,19 +366,74 @@ scan_dyntag (int dyntag, bfd *abfd, CORE if (arch_size == -1) return 0; @@ -319,7 +327,7 @@ /* Iterate over BUF and scan for DYNTAG. If found, set PTR and return. */ step = (arch_size == 32) ? sizeof (Elf32_External_Dyn) -@@ -408,9 +469,43 @@ scan_dyntag (int dyntag, bfd *abfd, CORE +@@ -405,9 +466,43 @@ scan_dyntag (int dyntag, bfd *abfd, CORE CORE_ADDR ptr_addr; ptr_addr = dyn_addr + (buf - bufstart) + arch_size / 8; @@ -365,7 +373,7 @@ *ptr = dyn_ptr; } return 1; -@@ -547,6 +642,10 @@ solib_svr4_r_map (void) +@@ -544,6 +639,10 @@ solib_svr4_r_map (void) { struct link_map_offsets *lmo = svr4_fetch_link_map_offsets (); @@ -376,41 +384,40 @@ return read_memory_typed_address (debug_base + lmo->r_map_offset, builtin_type_void_data_ptr); } -@@ -704,6 +803,11 @@ svr4_current_sos (void) +@@ -713,6 +812,11 @@ svr4_current_sos (void) + struct so_list *head = 0; struct so_list **link_ptr = &head; CORE_ADDR ldsomap = 0; + const char *filename = exec_bfd ? exec_bfd->filename : ""; - ++ + if (debug_solib) + fprintf_unfiltered (gdb_stdlog, + "svr4_current_sos: exec_bfd %s\n", filename); -+ - /* Make sure we've looked up the inferior's dynamic linker's base - structure. */ + + /* Always locate the debug struct, in case it has moved. */ + debug_base = 0; +@@ -721,10 +825,19 @@ svr4_current_sos (void) + /* If we can't find the dynamic linker's base structure, this + must not be a dynamically linked executable. Hmm. */ if (! debug_base) -@@ -713,11 +817,20 @@ svr4_current_sos (void) - /* If we can't find the dynamic linker's base structure, this - must not be a dynamically linked executable. Hmm. */ - if (! debug_base) -- return svr4_default_sos (); -+ { -+ if (debug_solib) -+ fprintf_unfiltered (gdb_stdlog, -+ "svr4_current_sos: no DT_DEBUG found in %s -- return now\n", -+ filename); -+ return svr4_default_sos (); -+ } - } +- return svr4_default_sos (); ++ { ++ if (debug_solib) ++ fprintf_unfiltered (gdb_stdlog, ++ "svr4_current_sos: no DT_DEBUG found in %s -- return now\n", ++ filename); ++ return svr4_default_sos (); ++ } /* Walk the inferior's link map list, and build our list of `struct so_list' nodes. */ + if (debug_solib) + fprintf_unfiltered (gdb_stdlog, -+ "svr4_current_sos: walk link map in %s\n", filename); ++ "svr4_current_sos: walk link map in %s\n", filename); lm = solib_svr4_r_map (); while (lm) -@@ -733,23 +847,103 @@ svr4_current_sos (void) +@@ -740,23 +853,103 @@ svr4_current_sos (void) new->lm_info->lm = xzalloc (lmo->link_map_size); make_cleanup (xfree, new->lm_info->lm); @@ -516,7 +523,7 @@ target_read_string (LM_NAME (new), &buffer, SO_NAME_MAX_PATH_SIZE - 1, &errcode); if (errcode != 0) -@@ -757,23 +951,35 @@ svr4_current_sos (void) +@@ -764,23 +957,35 @@ svr4_current_sos (void) safe_strerror (errcode)); else { @@ -568,7 +575,7 @@ } /* On Solaris, the dynamic linker is not in the normal list of -@@ -789,6 +995,9 @@ svr4_current_sos (void) +@@ -796,6 +1001,9 @@ svr4_current_sos (void) if (head == NULL) return svr4_default_sos (); @@ -578,7 +585,7 @@ return head; } -@@ -868,7 +1079,7 @@ svr4_fetch_objfile_link_map (struct objf +@@ -875,7 +1083,7 @@ svr4_fetch_objfile_link_map (struct objf /* On some systems, the only way to recognize the link map entry for the main executable file is by looking at its name. Return non-zero iff SONAME matches one of the known main executable names. */ @@ -587,7 +594,7 @@ static int match_main (char *soname) { -@@ -882,6 +1093,7 @@ match_main (char *soname) +@@ -889,6 +1097,7 @@ match_main (char *soname) return (0); } @@ -595,7 +602,7 @@ /* Return 1 if PC lies in the dynamic symbol resolution code of the SVR4 run time loader. */ -@@ -979,6 +1191,11 @@ enable_break (void) +@@ -1040,6 +1249,11 @@ enable_break (void) /* Find the .interp section; if not found, warn the user and drop into the old breakpoint at symbol code. */ interp_sect = bfd_get_section_by_name (exec_bfd, ".interp"); @@ -607,7 +614,7 @@ if (interp_sect) { unsigned int interp_sect_size; -@@ -1018,6 +1235,9 @@ enable_break (void) +@@ -1074,6 +1288,9 @@ enable_break (void) if (tmp_fd >= 0) tmp_bfd = bfd_fopen (tmp_pathname, gnutarget, FOPEN_RB, tmp_fd); @@ -617,7 +624,7 @@ if (tmp_bfd == NULL) goto bkpt_at_symbol; -@@ -1115,6 +1335,9 @@ enable_break (void) +@@ -1180,6 +1397,9 @@ enable_break (void) if (sym_addr != 0) { create_solib_event_breakpoint (load_addr + sym_addr); @@ -627,7 +634,7 @@ return 1; } -@@ -1375,6 +1598,8 @@ svr4_solib_create_inferior_hook (void) +@@ -1440,6 +1660,8 @@ svr4_solib_create_inferior_hook (void) while (stop_signal != TARGET_SIGNAL_TRAP); stop_soon = NO_STOP_QUIETLY; #endif /* defined(_SCO_DS) */ @@ -636,7 +643,7 @@ } static void -@@ -1551,6 +1776,75 @@ svr4_lp64_fetch_link_map_offsets (void) +@@ -1620,6 +1842,75 @@ svr4_lp64_fetch_link_map_offsets (void) return lmp; } @@ -712,20 +719,19 @@ struct target_so_ops svr4_so_ops; -@@ -1592,4 +1886,8 @@ _initialize_svr4_solib (void) - - /* FIXME: Don't do this here. *_gdbarch_init() should set so_ops. */ - current_target_so_ops = &svr4_so_ops; +@@ -1678,4 +1969,7 @@ _initialize_svr4_solib (void) + svr4_so_ops.in_dynsym_resolve_code = svr4_in_dynsym_resolve_code; + svr4_so_ops.lookup_lib_global_symbol = elf_lookup_lib_symbol; + svr4_so_ops.same = svr4_same; + + add_info ("linkmap", info_linkmap_command, -+ "Display the inferior's linkmap."); -+ ++ "Display the inferior's linkmap."); } -Index: gdb-6.7.1/gdb/varobj.c +Index: gdb-6.7.50.20080227/gdb/varobj.c =================================================================== ---- gdb-6.7.1.orig/gdb/varobj.c 2007-08-31 21:01:17.000000000 +0200 -+++ gdb-6.7.1/gdb/varobj.c 2007-11-02 15:24:19.000000000 +0100 -@@ -1116,6 +1116,62 @@ install_new_value (struct varobj *var, s +--- gdb-6.7.50.20080227.orig/gdb/varobj.c 2008-02-04 08:49:04.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/varobj.c 2008-02-27 08:57:31.000000000 +0100 +@@ -1078,6 +1078,62 @@ install_new_value (struct varobj *var, s return changed; } @@ -788,10 +794,10 @@ /* Update the values for a variable and its children. This is a two-pronged attack. First, re-parse the value for the root's expression to see if it's changed. Then go all the way -Index: gdb-6.7.1/gdb/solist.h +Index: gdb-6.7.50.20080227/gdb/solist.h =================================================================== ---- gdb-6.7.1.orig/gdb/solist.h 2007-08-23 20:08:38.000000000 +0200 -+++ gdb-6.7.1/gdb/solist.h 2007-11-02 15:24:19.000000000 +0100 +--- gdb-6.7.50.20080227.orig/gdb/solist.h 2008-01-07 16:19:58.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/solist.h 2008-02-27 08:57:31.000000000 +0100 @@ -61,6 +61,8 @@ struct so_list bfd *abfd; char symbols_loaded; /* flag: symbols read in yet? */ @@ -801,7 +807,7 @@ struct objfile *objfile; /* objfile for loaded lib */ struct section_table *sections; struct section_table *sections_end; -@@ -123,9 +125,15 @@ void free_so (struct so_list *so); +@@ -127,9 +129,15 @@ void free_so (struct so_list *so); /* Return address of first so_list entry in master shared object list. */ struct so_list *master_so_list (void); @@ -817,28 +823,28 @@ /* FIXME: gdbarch needs to control this variable */ extern struct target_so_ops *current_target_so_ops; -@@ -143,4 +151,6 @@ struct symbol *solib_global_lookup (cons +@@ -140,4 +148,6 @@ struct symbol *solib_global_lookup (cons const domain_enum domain, struct symtab **symtab); +/* Controls the printing of debugging output. */ +extern int debug_solib; #endif -Index: gdb-6.7.1/gdb/varobj.h +Index: gdb-6.7.50.20080227/gdb/varobj.h =================================================================== ---- gdb-6.7.1.orig/gdb/varobj.h 2007-08-31 20:52:05.000000000 +0200 -+++ gdb-6.7.1/gdb/varobj.h 2007-11-02 15:24:19.000000000 +0100 -@@ -114,4 +114,6 @@ extern int varobj_update (struct varobj +--- gdb-6.7.50.20080227.orig/gdb/varobj.h 2008-01-30 08:17:31.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/varobj.h 2008-02-27 08:57:31.000000000 +0100 +@@ -122,4 +122,6 @@ extern void varobj_invalidate (void); - extern void varobj_invalidate (void); + extern int varobj_editable_p (struct varobj *var); +extern void varobj_refresh(void); + #endif /* VAROBJ_H */ -Index: gdb-6.7.1/gdb/symfile.c +Index: gdb-6.7.50.20080227/gdb/symfile.c =================================================================== ---- gdb-6.7.1.orig/gdb/symfile.c 2007-09-24 23:48:05.000000000 +0200 -+++ gdb-6.7.1/gdb/symfile.c 2007-11-02 15:24:19.000000000 +0100 +--- gdb-6.7.50.20080227.orig/gdb/symfile.c 2008-01-29 23:47:20.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/symfile.c 2008-02-27 08:57:31.000000000 +0100 @@ -47,6 +47,7 @@ #include "readline/readline.h" #include "gdb_assert.h" @@ -847,7 +853,7 @@ #include "observer.h" #include "exec.h" #include "parser-defs.h" -@@ -779,7 +780,7 @@ syms_from_objfile (struct objfile *objfi +@@ -778,7 +779,7 @@ syms_from_objfile (struct objfile *objfi /* Now either addrs or offsets is non-zero. */ @@ -856,7 +862,7 @@ { /* We will modify the main symbol table, make sure that all its users will be cleaned up if an error occurs during symbol reading. */ -@@ -807,7 +808,7 @@ syms_from_objfile (struct objfile *objfi +@@ -806,7 +807,7 @@ syms_from_objfile (struct objfile *objfi We no longer warn if the lowest section is not a text segment (as happens for the PA64 port. */ @@ -865,7 +871,7 @@ { asection *lower_sect; asection *sect; -@@ -976,17 +977,21 @@ new_symfile_objfile (struct objfile *obj +@@ -975,17 +976,21 @@ new_symfile_objfile (struct objfile *obj /* If this is the main symbol file we have to clean up all users of the old main symbol file. Otherwise it is sufficient to fixup all the breakpoints that may have been redefined by this symbol file. */ @@ -889,7 +895,7 @@ /* We're done reading the symbol file; finish off complaints. */ clear_complaints (&symfile_complaints, 0, verbo); -@@ -1029,7 +1034,7 @@ symbol_file_add_with_addrs_or_offsets (b +@@ -1028,7 +1033,7 @@ symbol_file_add_with_addrs_or_offsets (b interactively wiping out any existing symbols. */ if ((have_full_symbols () || have_partial_symbols ()) @@ -898,7 +904,7 @@ && from_tty && !query ("Load new symbol table from \"%s\"? ", name)) error (_("Not confirmed.")); -@@ -1213,6 +1218,10 @@ symbol_file_clear (int from_tty) +@@ -1212,6 +1217,10 @@ symbol_file_clear (int from_tty) symfile_objfile->name) : !query (_("Discard symbol table? ")))) error (_("Not confirmed.")); @@ -909,7 +915,7 @@ free_all_objfiles (); /* solib descriptors may have handles to objfiles. Since their -@@ -2470,6 +2479,8 @@ reread_symbols (void) +@@ -2466,6 +2475,8 @@ reread_symbols (void) /* Discard cleanups as symbol reading was successful. */ discard_cleanups (old_cleanups); @@ -918,7 +924,7 @@ /* If the mtime has changed between the time we set new_modtime and now, we *want* this to be out of date, so don't call stat again now. */ -@@ -2837,6 +2848,7 @@ clear_symtab_users (void) +@@ -2834,6 +2845,7 @@ clear_symtab_users (void) breakpoint_re_set (); set_default_breakpoint (0, 0, 0, 0); clear_pc_function_cache (); @@ -926,101 +932,20 @@ observer_notify_new_objfile (NULL); /* Clear globals which might have pointed into a removed objfile. -Index: gdb-6.7.1/gdb/breakpoint.c +Index: gdb-6.7.50.20080227/gdb/breakpoint.c =================================================================== ---- gdb-6.7.1.orig/gdb/breakpoint.c 2007-11-02 15:24:10.000000000 +0100 -+++ gdb-6.7.1/gdb/breakpoint.c 2007-11-02 15:26:50.000000000 +0100 -@@ -847,15 +847,15 @@ insert_watchpoints_for_new_thread (ptid_ - struct value *v = b->owner->val_chain; - - /* Look at each value on the value chain. */ -- for (; v; v = v->next) -+ for (; v; v = value_next (v)) - { - /* If it's a memory location, and GDB actually needed - its contents to evaluate the expression, then we - must watch it. */ - if (VALUE_LVAL (v) == lval_memory -- && ! VALUE_LAZY (v)) -+ && ! value_lazy (v)) - { -- struct type *vtype = check_typedef (VALUE_TYPE (v)); -+ struct type *vtype = check_typedef (value_type (v)); - - /* We only watch structs and arrays if user asked - for it explicitly, never if they just happen to -@@ -867,8 +867,8 @@ insert_watchpoints_for_new_thread (ptid_ - CORE_ADDR addr; - int len, type; - -- addr = VALUE_ADDRESS (v) + VALUE_OFFSET (v); -- len = TYPE_LENGTH (VALUE_TYPE (v)); -+ addr = VALUE_ADDRESS (v) + value_offset (v); -+ len = TYPE_LENGTH (value_type (v)); - type = hw_write; - if (b->owner->type == bp_read_watchpoint) - type = hw_read; -@@ -2767,12 +2767,12 @@ mark_triggered_watchpoints (CORE_ADDR st - || b->type == bp_read_watchpoint - || b->type == bp_access_watchpoint) - { -- for (v = b->val_chain; v; v = v->next) -+ for (v = b->val_chain; v; v = value_next (v)) - { - if (VALUE_LVAL (v) == lval_memory -- && ! VALUE_LAZY (v)) -+ && ! value_lazy (v)) - { -- struct type *vtype = check_typedef (VALUE_TYPE (v)); -+ struct type *vtype = check_typedef (value_type (v)); - - if (v == b->val_chain - || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT -@@ -2780,11 +2780,11 @@ mark_triggered_watchpoints (CORE_ADDR st - { - CORE_ADDR vaddr; - -- vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v); -+ vaddr = VALUE_ADDRESS (v) + value_offset (v); - /* Exact match not required. Within range is - sufficient. */ - if (addr >= vaddr && -- addr < vaddr + TYPE_LENGTH (VALUE_TYPE (v))) -+ addr < vaddr + TYPE_LENGTH (value_type (v))) - b->watchpoint_triggered = 1; - } - } -@@ -2957,12 +2957,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p - bs->stop = 0; - continue; - } -- for (v = b->val_chain; v; v = v->next) -+ for (v = b->val_chain; v; v = value_next (v)) - { - if (VALUE_LVAL (v) == lval_memory -- && ! VALUE_LAZY (v)) -+ && ! value_lazy (v)) - { -- struct type *vtype = check_typedef (VALUE_TYPE (v)); -+ struct type *vtype = check_typedef (value_type (v)); - - if (v == b->val_chain - || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT -@@ -2970,11 +2970,11 @@ bpstat_stop_status (CORE_ADDR bp_addr, p - { - CORE_ADDR vaddr; - -- vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v); -+ vaddr = VALUE_ADDRESS (v) + value_offset (v); - /* Exact match not required. Within range is - sufficient. */ - if (addr >= vaddr && -- addr < vaddr + TYPE_LENGTH (VALUE_TYPE (v))) -+ addr < vaddr + TYPE_LENGTH (value_type (v))) - must_check_value = 1; - } - } -@@ -4118,7 +4118,8 @@ describe_other_breakpoints (CORE_ADDR pc +--- gdb-6.7.50.20080227.orig/gdb/breakpoint.c 2008-02-27 08:57:20.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/breakpoint.c 2008-02-27 08:57:31.000000000 +0100 +@@ -923,7 +923,7 @@ update_watchpoint (struct breakpoint *b, + value_release_to_mark (mark); + + /* Look at each value on the value chain. */ +- for (; v; v = next) ++ for (; v; v = value_next (v)) + { + /* If it's a memory location, and GDB actually needed + its contents to evaluate the expression, then we +@@ -3882,7 +3882,8 @@ describe_other_breakpoints (CORE_ADDR pc printf_filtered (" (thread %d)", b->thread); printf_filtered ("%s%s ", ((b->enable_state == bp_disabled || @@ -1030,7 +955,7 @@ ? " (disabled)" : b->enable_state == bp_permanent ? " (permanent)" -@@ -4773,6 +4774,62 @@ disable_breakpoints_in_unloaded_shlib (s +@@ -4534,6 +4535,62 @@ disable_breakpoints_in_unloaded_shlib (s } } @@ -1091,13 +1016,13 @@ + + static void - solib_load_unload_1 (char *hookname, int tempflag, char *dll_pathname, - char *cond_string, enum bptype bp_kind) -Index: gdb-6.7.1/gdb/solib.c + create_fork_vfork_event_catchpoint (int tempflag, char *cond_string, + enum bptype bp_kind) +Index: gdb-6.7.50.20080227/gdb/solib.c =================================================================== ---- gdb-6.7.1.orig/gdb/solib.c 2007-08-23 20:08:38.000000000 +0200 -+++ gdb-6.7.1/gdb/solib.c 2007-11-02 15:24:19.000000000 +0100 -@@ -78,6 +78,8 @@ set_solib_ops (struct gdbarch *gdbarch, +--- gdb-6.7.50.20080227.orig/gdb/solib.c 2008-01-07 16:19:58.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/solib.c 2008-02-27 08:57:31.000000000 +0100 +@@ -79,6 +79,8 @@ set_solib_ops (struct gdbarch *gdbarch, /* external data declarations */ @@ -1106,7 +1031,7 @@ /* FIXME: gdbarch needs to control this variable, or else every configuration needs to call set_solib_ops. */ struct target_so_ops *current_target_so_ops; -@@ -105,6 +107,8 @@ The search path for loading non-absolute +@@ -102,6 +104,8 @@ The search path for loading non-absolute value); } @@ -1115,7 +1040,7 @@ /* GLOBAL FUNCTION -@@ -394,7 +398,6 @@ free_so (struct so_list *so) +@@ -391,7 +395,6 @@ free_so (struct so_list *so) xfree (so); } @@ -1123,7 +1048,7 @@ /* Return address of first so_list entry in master shared object list. */ struct so_list * master_so_list (void) -@@ -402,7 +405,6 @@ master_so_list (void) +@@ -399,7 +402,6 @@ master_so_list (void) return so_list_head; } @@ -1131,7 +1056,7 @@ /* A small stub to get us past the arg-passing pinhole of catch_errors. */ static int -@@ -414,15 +416,40 @@ symbol_add_stub (void *arg) +@@ -411,15 +413,40 @@ symbol_add_stub (void *arg) /* Have we already loaded this shared object? */ ALL_OBJFILES (so->objfile) { @@ -1175,18 +1100,18 @@ free_section_addr_info (sap); return (1); -@@ -550,6 +577,10 @@ update_solib_list (int from_tty, struct - the inferior's current list. */ - while (i) - { -+ if (debug_solib) -+ fprintf_unfiltered (gdb_stdlog, -+ "update_solib_list: compare gdb:%s and inferior:%s\n", -+ gdb->so_original_name, i->so_original_name); - if (! strcmp (gdb->so_original_name, i->so_original_name)) - break; - -@@ -603,28 +634,7 @@ update_solib_list (int from_tty, struct +@@ -545,6 +572,10 @@ update_solib_list (int from_tty, struct + } + else + { ++ if (debug_solib) ++ fprintf_unfiltered (gdb_stdlog, ++ "update_solib_list: compare gdb:%s and inferior:%s\n", ++ gdb->so_original_name, i->so_original_name); + if (! strcmp (gdb->so_original_name, i->so_original_name)) + break; + } +@@ -599,28 +630,7 @@ update_solib_list (int from_tty, struct /* Fill in the rest of each of the `struct so_list' nodes. */ for (i = inferior; i; i = i->next) { @@ -1216,7 +1141,7 @@ /* Notify any observer that the shared object has been loaded now that we've added it to GDB's tables. */ -@@ -720,6 +730,41 @@ solib_add (char *pattern, int from_tty, +@@ -716,6 +726,41 @@ solib_add (char *pattern, int from_tty, } } @@ -1258,7 +1183,7 @@ /* -@@ -1045,4 +1090,12 @@ This takes precedence over the environme +@@ -1035,4 +1080,12 @@ This takes precedence over the environme reload_shared_libraries, show_solib_search_path, &setlist, &showlist); @@ -1271,11 +1196,11 @@ + NULL, NULL, + &setdebuglist, &showdebuglist); } -Index: gdb-6.7.1/gdb/elfread.c +Index: gdb-6.7.50.20080227/gdb/elfread.c =================================================================== ---- gdb-6.7.1.orig/gdb/elfread.c 2007-08-23 20:08:28.000000000 +0200 -+++ gdb-6.7.1/gdb/elfread.c 2007-11-02 15:24:19.000000000 +0100 -@@ -611,7 +611,7 @@ elf_symfile_read (struct objfile *objfil +--- gdb-6.7.50.20080227.orig/gdb/elfread.c 2008-01-01 23:53:09.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/elfread.c 2008-02-27 08:57:31.000000000 +0100 +@@ -644,7 +644,7 @@ elf_symfile_read (struct objfile *objfil /* If we are reinitializing, or if we have never loaded syms yet, set table to empty. MAINLINE is cleared so that *_read_psymtab functions do not all also re-initialize the psymbol table. */ @@ -1284,11 +1209,11 @@ { init_psymbol_list (objfile, 0); mainline = 0; -Index: gdb-6.7.1/gdb/Makefile.in +Index: gdb-6.7.50.20080227/gdb/Makefile.in =================================================================== ---- gdb-6.7.1.orig/gdb/Makefile.in 2007-11-02 15:24:10.000000000 +0100 -+++ gdb-6.7.1/gdb/Makefile.in 2007-11-02 15:24:19.000000000 +0100 -@@ -1819,7 +1819,7 @@ amd64-tdep.o: amd64-tdep.c $(defs_h) $(a +--- gdb-6.7.50.20080227.orig/gdb/Makefile.in 2008-02-27 08:57:20.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/Makefile.in 2008-02-27 08:57:31.000000000 +0100 +@@ -1914,7 +1914,7 @@ amd64-tdep.o: amd64-tdep.c $(defs_h) $(a $(dummy_frame_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \ $(inferior_h) $(gdbcmd_h) $(gdbcore_h) $(objfiles_h) $(regcache_h) \ $(regset_h) $(symfile_h) $(gdb_assert_h) $(amd64_tdep_h) \ @@ -1297,10 +1222,10 @@ annotate.o: annotate.c $(defs_h) $(annotate_h) $(value_h) $(target_h) \ $(gdbtypes_h) $(breakpoint_h) arch-utils.o: arch-utils.c $(defs_h) $(arch_utils_h) $(buildsym_h) \ -Index: gdb-6.7.1/gdb/amd64-tdep.c +Index: gdb-6.7.50.20080227/gdb/amd64-tdep.c =================================================================== ---- gdb-6.7.1.orig/gdb/amd64-tdep.c 2007-11-02 15:21:46.000000000 +0100 -+++ gdb-6.7.1/gdb/amd64-tdep.c 2007-11-02 15:24:19.000000000 +0100 +--- gdb-6.7.50.20080227.orig/gdb/amd64-tdep.c 2008-02-27 08:57:19.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/amd64-tdep.c 2008-02-27 08:57:31.000000000 +0100 @@ -36,6 +36,7 @@ #include "symfile.h" #include "dwarf2-frame.h" @@ -1309,7 +1234,7 @@ #include "amd64-tdep.h" #include "i387-tdep.h" -@@ -734,16 +735,28 @@ amd64_alloc_frame_cache (void) +@@ -731,16 +732,28 @@ amd64_alloc_frame_cache (void) Any function that doesn't start with this sequence will be assumed to have no prologue and thus no valid frame pointer in %rbp. */ @@ -1342,7 +1267,7 @@ op = read_memory_unsigned_integer (pc, 1); -@@ -756,18 +769,57 @@ amd64_analyze_prologue (CORE_ADDR pc, CO +@@ -753,18 +766,57 @@ amd64_analyze_prologue (CORE_ADDR pc, CO /* If that's all, return now. */ if (current_pc <= pc + 1) gdb-6.5-bz181390-memory-address-width.patch: Index: gdb-6.5-bz181390-memory-address-width.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz181390-memory-address-width.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.5-bz181390-memory-address-width.patch 1 Nov 2007 20:24:20 -0000 1.2 +++ gdb-6.5-bz181390-memory-address-width.patch 3 Mar 2008 16:13:47 -0000 1.3 @@ -1,6 +1,5 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181390 - 2006-09-28 Jan Kratochvil * gdb/utils.c (paddress): Disable cutting of the printed addresses @@ -9,15 +8,16 @@ (value_as_address): New `value_as_address' wrapper - cut memory address to the target's address bit size, bugreport by John Reiser. +2008-03-02 Jan Kratochvil + + Port to GDB-6.8pre. + New testcase `gdb.arch/amd64-i386-address.exp'. -Index: gdb-6.5/gdb/utils.c +Index: gdb-6.7.50.20080227/gdb/utils.c =================================================================== -RCS file: /cvs/src/src/gdb/utils.c,v -retrieving revision 1.169 -diff -u -p -r1.169 utils.c ---- gdb-6.5.orig/gdb/utils.c 21 Sep 2006 13:50:51 -0000 1.169 -+++ gdb-6.5/gdb/utils.c 28 Sep 2006 17:06:03 -0000 -@@ -2596,6 +2596,14 @@ paddr_nz (CORE_ADDR addr) +--- gdb-6.7.50.20080227.orig/gdb/utils.c 2008-03-02 14:28:44.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/utils.c 2008-03-02 14:35:09.000000000 +0100 +@@ -2540,6 +2540,14 @@ paddr_nz (CORE_ADDR addr) const char * paddress (CORE_ADDR addr) { @@ -32,7 +32,7 @@ /* Truncate address to the size of a target address, avoiding shifts larger or equal than the width of a CORE_ADDR. The local variable ADDR_BIT stops the compiler reporting a shift overflow -@@ -2609,6 +2617,8 @@ paddress (CORE_ADDR addr) +@@ -2553,6 +2561,8 @@ paddress (CORE_ADDR addr) if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT)) addr &= ((CORE_ADDR) 1 << addr_bit) - 1; @@ -41,30 +41,26 @@ return hex_string (addr); } -Index: gdb-6.5/gdb/value.c +Index: gdb-6.7.50.20080227/gdb/value.c =================================================================== -RCS file: /cvs/src/src/gdb/value.c,v -retrieving revision 1.36 -diff -u -p -r1.36 value.c ---- gdb-6.5.orig/gdb/value.c 31 Mar 2006 10:36:18 -0000 1.36 -+++ gdb-6.5/gdb/value.c 28 Sep 2006 17:06:03 -0000 -@@ -950,11 +950,10 @@ value_as_double (struct value *val) - error (_("Invalid floating value found in program.")); +--- gdb-6.7.50.20080227.orig/gdb/value.c 2008-01-18 18:07:40.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/value.c 2008-03-02 14:36:38.000000000 +0100 +@@ -983,11 +983,9 @@ value_as_double (struct value *val) return foo; } + -/* Extract a value as a C pointer. Does not deallocate the value. - Note that val's type may not actually be a pointer; value_as_long - handles all the cases. */ -CORE_ADDR -value_as_address (struct value *val) -+ +/* See `value_as_address' below - core of value to C pointer extraction. */ +static CORE_ADDR +value_as_address_core (struct value *val) { /* Assume a CORE_ADDR can fit in a LONGEST (for now). Not sure whether we want this to be true eventually. */ -@@ -1054,6 +1053,34 @@ value_as_address (struct value *val) +@@ -1087,6 +1085,34 @@ value_as_address (struct value *val) return unpack_long (value_type (val), value_contents (val)); #endif } @@ -99,3 +95,103 @@ /* Unpack raw data (copied from debugee, target byte order) at VALADDR as a long, or as a double, assuming the raw data is described +--- /dev/null 2008-03-01 10:30:54.797374318 +0100 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.arch/amd64-i386-address.S 2008-03-02 12:47:06.000000000 +0100 +@@ -0,0 +1,32 @@ ++/* Copyright 2008 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . ++ ++ Please email any bugs, comments, and/or additions to this file to: ++ bug-gdb at gnu.org ++ ++ This file is part of the gdb testsuite. ++ ++ Test UNsigned extension of the 32-bit inferior address on a 64-bit host. ++ This file is based on the work by John Reiser. ++ This file was created by Jan Kratochvil . ++ https://bugzilla.redhat.com/show_bug.cgi?id=181390 */ ++ ++_start: .globl _start ++ nop ++ int3 ++ movl %esp,%ebx ++ int3 # examining memory from $ebx fails, from $esp succeeds ++ nop ++ nop +--- /dev/null 2008-03-01 10:30:54.797374318 +0100 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.arch/amd64-i386-address.exp 2008-03-02 12:57:11.000000000 +0100 +@@ -0,0 +1,62 @@ ++# Copyright 2008 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# Please email any bugs, comments, and/or additions to this file to: ++# bug-gdb at gnu.org ++ ++# This file is part of the gdb testsuite. ++ ++# Test UNsigned extension of the 32-bit inferior address on a 64-bit host. ++# This file is based on the work by John Reiser. ++# This file was created by Jan Kratochvil . ++# https://bugzilla.redhat.com/show_bug.cgi?id=181390 ++ ++if {![istarget "x86_64-*-*"]} then { ++ verbose "Skipping amd64->i386 adress test." ++ return ++} ++ ++set testfile "amd64-i386-address" ++set srcfile ${testfile}.S ++set binfile ${objdir}/${subdir}/${testfile} ++ ++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-m32 -nostdlib"]] != "" } { ++ untested amd64-i386-address.exp ++ return -1 ++} ++ ++# Get things started. ++ ++gdb_exit ++gdb_start ++gdb_reinitialize_dir $srcdir/$subdir ++gdb_load ${binfile} ++ ++gdb_run_cmd ++ ++set test "trap stop" ++gdb_test_multiple "" $test { ++ -re "Program received signal SIGTRAP,.*_start .*$gdb_prompt $" { ++ pass $test ++ } ++} ++ ++gdb_test "stepi" ".*_start .*int3.*" ++ ++gdb_test "x/x \$esp" "0x\[0-9a-f\]*:\t0x0*1" ++ ++# Failure case would be: ++# 0xff8d7f00: Cannot access memory at address 0xff8d7f00 ++gdb_test "x/x \$ebx" "0x\[0-9a-f\]*:\t0x0*1" gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch: Index: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch 16 Nov 2007 02:15:40 -0000 1.4 +++ gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch 3 Mar 2008 16:13:47 -0000 1.5 @@ -1,5 +1,8 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=185337 +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. currently for trivial nonthreaded helloworld with no debug info up to -ggdb2 you will get: @@ -27,9 +30,11 @@ <81a2> DW_AT_name : (indirect string, offset: 0x280e): __errno_location <81a8> DW_AT_MIPS_linkage_name: (indirect string, offset: 0x2808): *__GI___errno_location ---- ./gdb/dwarf2read.c 25 Oct 2007 20:54:27 -0000 1.236 -+++ ./gdb/dwarf2read.c 3 Nov 2007 21:03:43 -0000 -@@ -5550,8 +5550,8 @@ read_partial_die (struct partial_die_inf +Index: gdb-6.8cvs20080219/gdb/dwarf2read.c +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/dwarf2read.c 2008-02-19 17:27:21.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/dwarf2read.c 2008-02-20 13:35:19.000000000 +0100 +@@ -5679,8 +5679,8 @@ read_partial_die (struct partial_die_inf { case DW_AT_name: @@ -40,7 +45,7 @@ part_die->name = DW_STRING (&attr); break; case DW_AT_comp_dir: -@@ -5559,7 +5559,9 @@ read_partial_die (struct partial_die_inf +@@ -5688,7 +5688,9 @@ read_partial_die (struct partial_die_inf part_die->dirname = DW_STRING (&attr); break; case DW_AT_MIPS_linkage_name: @@ -51,7 +56,7 @@ break; case DW_AT_low_pc: has_low_pc_attr = 1; -@@ -7871,9 +7873,13 @@ dwarf2_linkage_name (struct die_info *di +@@ -7936,9 +7938,13 @@ dwarf2_linkage_name (struct die_info *di { struct attribute *attr; @@ -68,22 +73,20 @@ attr = dwarf2_attr (die, DW_AT_name, cu); if (attr && DW_STRING (attr)) return DW_STRING (attr); - - - -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1/gdb/gdbtypes.c gdb-6.7.1-patched/gdb/gdbtypes.c ---- gdb-6.7.1/gdb/gdbtypes.c 2007-11-04 01:43:03.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/gdbtypes.c 2007-11-04 01:09:31.000000000 +0100 -@@ -3465,6 +3465,8 @@ gdbtypes_post_init (struct gdbarch *gdba +Index: gdb-6.8cvs20080219/gdb/gdbtypes.c +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/gdbtypes.c 2008-02-14 23:03:57.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/gdbtypes.c 2008-02-20 13:35:19.000000000 +0100 +@@ -3106,6 +3106,8 @@ gdbtypes_post_init (struct gdbarch *gdba init_type (TYPE_CODE_INT, - gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT, + gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT, 0, "int", (struct objfile *) NULL); + builtin_type->builtin_int_ptr = + make_pointer_type (builtin_type->builtin_int, NULL); builtin_type->builtin_unsigned_int = init_type (TYPE_CODE_INT, - gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT, -@@ -3559,6 +3561,11 @@ gdbtypes_post_init (struct gdbarch *gdba + gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT, +@@ -3215,6 +3217,11 @@ gdbtypes_post_init (struct gdbarch *gdba "", NULL); TYPE_TARGET_TYPE (builtin_type->nodebug_text_symbol) = builtin_type->builtin_int; @@ -95,10 +98,11 @@ builtin_type->nodebug_data_symbol = init_type (TYPE_CODE_INT, gdbarch_int_bit (gdbarch) / HOST_CHAR_BIT, 0, -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1/gdb/gdbtypes.h gdb-6.7.1-patched/gdb/gdbtypes.h ---- gdb-6.7.1/gdb/gdbtypes.h 2007-11-04 01:43:03.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/gdbtypes.h 2007-11-04 01:07:50.000000000 +0100 -@@ -1008,6 +1008,7 @@ struct builtin_type +Index: gdb-6.8cvs20080219/gdb/gdbtypes.h +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/gdbtypes.h 2008-02-14 23:03:57.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/gdbtypes.h 2008-02-20 13:35:19.000000000 +0100 +@@ -942,6 +942,7 @@ struct builtin_type /* Types used for symbols with no debug information. */ struct type *nodebug_text_symbol; @@ -106,7 +110,7 @@ struct type *nodebug_data_symbol; struct type *nodebug_unknown_symbol; struct type *nodebug_tls_symbol; -@@ -1026,6 +1027,7 @@ struct builtin_type +@@ -960,6 +961,7 @@ struct builtin_type struct type *builtin_char; struct type *builtin_short; struct type *builtin_int; @@ -114,10 +118,11 @@ struct type *builtin_long; struct type *builtin_signed_char; struct type *builtin_unsigned_char; -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1/gdb/parse.c gdb-6.7.1-patched/gdb/parse.c ---- gdb-6.7.1/gdb/parse.c 2007-08-23 20:08:36.000000000 +0200 -+++ gdb-6.7.1-patched/gdb/parse.c 2007-11-04 01:06:59.000000000 +0100 -@@ -424,7 +424,12 @@ write_exp_msymbol (struct minimal_symbol +Index: gdb-6.8cvs20080219/gdb/parse.c +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/parse.c 2008-01-02 00:04:03.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/parse.c 2008-02-20 13:35:19.000000000 +0100 +@@ -437,7 +437,12 @@ write_exp_msymbol (struct minimal_symbol case mst_text: case mst_file_text: case mst_solib_trampoline: @@ -131,10 +136,11 @@ break; case mst_data: -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1/gdb/target.c gdb-6.7.1-patched/gdb/target.c ---- gdb-6.7.1/gdb/target.c 2007-11-04 01:43:03.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/target.c 2007-11-04 01:37:45.000000000 +0100 -@@ -819,6 +819,25 @@ pop_target (void) +Index: gdb-6.8cvs20080219/gdb/target.c +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/target.c 2008-02-19 17:22:33.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/target.c 2008-02-20 13:36:17.000000000 +0100 +@@ -812,6 +812,25 @@ pop_target (void) internal_error (__FILE__, __LINE__, _("failed internal consistency check")); } @@ -157,10 +163,10 @@ + return 1; +} + - /* Using the objfile specified in BATON, find the address for the + /* Using the objfile specified in OBJFILE, find the address for the current thread's thread-local storage with offset OFFSET. */ CORE_ADDR -@@ -904,7 +923,28 @@ target_translate_tls_address (struct obj +@@ -893,7 +912,28 @@ target_translate_tls_address (struct obj /* It wouldn't be wrong here to try a gdbarch method, too; finding TLS is an ABI-specific thing. But we don't do that yet. */ else @@ -190,9 +196,10 @@ return addr; } -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1/gdb/testsuite/gdb.dwarf2/dw2-errno.c gdb-6.7.1-patched/gdb/testsuite/gdb.dwarf2/dw2-errno.c ---- gdb-6.7.1/gdb/testsuite/gdb.dwarf2/dw2-errno.c 2007-11-04 01:43:41.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/testsuite/gdb.dwarf2/dw2-errno.c 2007-11-03 23:29:02.000000000 +0100 +Index: gdb-6.8cvs20080219/gdb/testsuite/gdb.dwarf2/dw2-errno.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8cvs20080219/gdb/testsuite/gdb.dwarf2/dw2-errno.c 2008-02-20 13:35:19.000000000 +0100 @@ -0,0 +1,28 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -222,9 +229,10 @@ + + return 0; /* breakpoint */ +} -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1/gdb/testsuite/gdb.dwarf2/dw2-errno.exp gdb-6.7.1-patched/gdb/testsuite/gdb.dwarf2/dw2-errno.exp ---- gdb-6.7.1/gdb/testsuite/gdb.dwarf2/dw2-errno.exp 2007-11-04 01:43:39.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/testsuite/gdb.dwarf2/dw2-errno.exp 2007-11-04 01:41:46.000000000 +0100 +Index: gdb-6.8cvs20080219/gdb/testsuite/gdb.dwarf2/dw2-errno.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.8cvs20080219/gdb/testsuite/gdb.dwarf2/dw2-errno.exp 2008-02-20 13:35:19.000000000 +0100 @@ -0,0 +1,67 @@ +# Copyright 2007 Free Software Foundation, Inc. + gdb-6.5-gcore-i386-on-amd64.patch: Index: gdb-6.5-gcore-i386-on-amd64.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-gcore-i386-on-amd64.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.5-gcore-i386-on-amd64.patch 1 Nov 2007 20:24:20 -0000 1.3 +++ gdb-6.5-gcore-i386-on-amd64.patch 3 Mar 2008 16:13:47 -0000 1.4 @@ -19,11 +19,15 @@ Port to GDB-6.7. -Index: gdb-6.7/gdb/Makefile.in +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + +Index: gdb-6.8cvs20080219/gdb/Makefile.in =================================================================== ---- gdb-6.7.orig/gdb/Makefile.in 2007-10-14 23:57:38.000000000 +0200 -+++ gdb-6.7/gdb/Makefile.in 2007-10-16 15:46:48.000000000 +0200 -@@ -717,6 +717,7 @@ gdb_expat_h = gdb_expat.h +--- gdb-6.8cvs20080219.orig/gdb/Makefile.in 2008-02-19 16:52:21.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/Makefile.in 2008-02-20 13:39:08.000000000 +0100 +@@ -785,6 +785,7 @@ gdb_expat_h = gdb_expat.h gdb_locale_h = gdb_locale.h gdb_obstack_h = gdb_obstack.h $(obstack_h) gdb_proc_service_h = gdb_proc_service.h $(gregset_h) @@ -31,7 +35,7 @@ gdb_ptrace_h = gdb_ptrace.h gdb_regex_h = gdb_regex.h $(xregex_h) gdb_select_h = gdb_select.h -@@ -726,6 +727,7 @@ gdb_string_h = gdb_string.h +@@ -794,6 +795,7 @@ gdb_string_h = gdb_string.h gdb_thread_db_h = gdb_thread_db.h gdbthread_h = gdbthread.h $(breakpoint_h) $(frame_h) gdbtypes_h = gdbtypes.h $(hashtab_h) @@ -39,7 +43,7 @@ gdb_vfork_h = gdb_vfork.h gdb_wait_h = gdb_wait.h glibc_tdep_h = glibc-tdep.h -@@ -1793,7 +1795,8 @@ amd64fbsd-tdep.o: amd64fbsd-tdep.c $(def +@@ -1888,7 +1890,8 @@ amd64fbsd-tdep.o: amd64fbsd-tdep.c $(def amd64-linux-nat.o: amd64-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \ $(regcache_h) $(linux_nat_h) $(gdb_assert_h) $(gdb_string_h) \ $(gdb_proc_service_h) $(gregset_h) $(amd64_tdep_h) \ @@ -49,11 +53,11 @@ amd64-linux-tdep.o: amd64-linux-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \ $(regcache_h) $(osabi_h) $(symtab_h) $(gdb_string_h) $(amd64_tdep_h) \ $(solib_svr4_h) $(gdbtypes_h) $(reggroups_h) $(amd64_linux_tdep_h) -Index: gdb-6.7/gdb/amd64-linux-nat.c +Index: gdb-6.8cvs20080219/gdb/amd64-linux-nat.c =================================================================== ---- gdb-6.7.orig/gdb/amd64-linux-nat.c 2007-10-14 23:39:04.000000000 +0200 -+++ gdb-6.7/gdb/amd64-linux-nat.c 2007-10-16 15:46:18.000000000 +0200 -@@ -51,6 +51,9 @@ +--- gdb-6.8cvs20080219.orig/gdb/amd64-linux-nat.c 2008-02-16 19:10:27.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/amd64-linux-nat.c 2008-02-20 13:39:08.000000000 +0100 +@@ -50,6 +50,9 @@ #include "amd64-tdep.h" #include "i386-linux-tdep.h" #include "amd64-nat.h" @@ -63,7 +67,7 @@ /* Mapping between the general-purpose registers in GNU/Linux x86-64 `struct user' format and GDB's register cache layout. */ -@@ -85,6 +88,35 @@ static int amd64_linux_gregset64_reg_off +@@ -84,6 +87,35 @@ static int amd64_linux_gregset64_reg_off GNU/Linux i386 registers are all 32-bit, but since we're little-endian we get away with that. */ @@ -99,7 +103,7 @@ /* From on GNU/Linux i386. */ static int amd64_linux_gregset32_reg_offset[] = { -@@ -103,6 +135,96 @@ static int amd64_linux_gregset32_reg_off +@@ -102,6 +134,96 @@ static int amd64_linux_gregset32_reg_off }; @@ -196,7 +200,7 @@ /* Transfering the general-purpose registers between GDB, inferiors and core files. */ -@@ -529,6 +649,11 @@ _initialize_amd64_linux_nat (void) +@@ -429,6 +551,11 @@ _initialize_amd64_linux_nat (void) t->to_fetch_registers = amd64_linux_fetch_inferior_registers; t->to_store_registers = amd64_linux_store_inferior_registers; @@ -207,11 +211,11 @@ + /* Register the target. */ linux_nat_add_target (t); - -Index: gdb-6.7/gdb/config.in + linux_nat_set_new_thread (t, amd64_linux_new_thread); +Index: gdb-6.8cvs20080219/gdb/config.in =================================================================== ---- gdb-6.7.orig/gdb/config.in 2007-06-18 17:46:37.000000000 +0200 -+++ gdb-6.7/gdb/config.in 2007-10-16 15:46:18.000000000 +0200 +--- gdb-6.8cvs20080219.orig/gdb/config.in 2008-01-10 19:17:06.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/config.in 2008-02-20 13:39:08.000000000 +0100 @@ -385,6 +385,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_POLL_H @@ -232,11 +236,11 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_USER_H -Index: gdb-6.7/gdb/configure +Index: gdb-6.8cvs20080219/gdb/configure =================================================================== ---- gdb-6.7.orig/gdb/configure 2007-09-29 22:54:13.000000000 +0200 -+++ gdb-6.7/gdb/configure 2007-10-16 15:46:18.000000000 +0200 -@@ -10439,6 +10439,157 @@ done +--- gdb-6.8cvs20080219.orig/gdb/configure 2008-02-14 23:03:56.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/configure 2008-02-20 13:39:08.000000000 +0100 +@@ -11140,6 +11140,157 @@ done @@ -394,11 +398,11 @@ for ac_header in sys/wait.h wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -Index: gdb-6.7/gdb/configure.ac +Index: gdb-6.8cvs20080219/gdb/configure.ac =================================================================== ---- gdb-6.7.orig/gdb/configure.ac 2007-09-29 22:54:13.000000000 +0200 -+++ gdb-6.7/gdb/configure.ac 2007-10-16 15:46:18.000000000 +0200 -@@ -424,6 +424,7 @@ AC_CHECK_HEADERS(sys/user.h, [], [], +--- gdb-6.8cvs20080219.orig/gdb/configure.ac 2008-02-14 23:03:56.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/configure.ac 2008-02-20 13:39:08.000000000 +0100 +@@ -523,6 +523,7 @@ AC_CHECK_HEADERS(sys/user.h, [], [], # include #endif ]) @@ -406,10 +410,10 @@ AC_CHECK_HEADERS(sys/wait.h wait.h) AC_CHECK_HEADERS(termios.h termio.h sgtty.h) AC_CHECK_HEADERS(unistd.h) -Index: gdb-6.7/gdb/gcore.c +Index: gdb-6.8cvs20080219/gdb/gcore.c =================================================================== ---- gdb-6.7.orig/gdb/gcore.c 2007-10-14 23:57:38.000000000 +0200 -+++ gdb-6.7/gdb/gcore.c 2007-10-16 15:46:18.000000000 +0200 +--- gdb-6.8cvs20080219.orig/gdb/gcore.c 2008-02-19 16:52:21.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/gcore.c 2008-02-20 13:39:08.000000000 +0100 @@ -317,6 +317,11 @@ gcore_create_callback (CORE_ADDR vaddr, asection *osec; flagword flags = SEC_ALLOC | SEC_HAS_CONTENTS | SEC_LOAD; @@ -422,10 +426,10 @@ /* If the memory segment has no permissions set, ignore it, otherwise when we later try to access it for read/write, we'll get an error or jam the kernel. */ -Index: gdb-6.7/gdb/gdb_procfs32.h +Index: gdb-6.8cvs20080219/gdb/gdb_procfs32.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.7/gdb/gdb_procfs32.h 2007-10-16 15:46:18.000000000 +0200 ++++ gdb-6.8cvs20080219/gdb/gdb_procfs32.h 2008-02-20 13:39:08.000000000 +0100 @@ -0,0 +1,128 @@ +#ifdef HAVE_SYS_PROCFS32_H +#include @@ -555,10 +559,10 @@ +#endif /* _SYS_PROCFS32_H */ + +#endif /* HAVE_SYS_PROCFS32_H */ -Index: gdb-6.7/gdb/gdb_user32.h +Index: gdb-6.8cvs20080219/gdb/gdb_user32.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.7/gdb/gdb_user32.h 2007-10-16 15:46:18.000000000 +0200 ++++ gdb-6.8cvs20080219/gdb/gdb_user32.h 2008-02-20 13:39:08.000000000 +0100 @@ -0,0 +1,108 @@ +#ifdef HAVE_SYS_USER32_H +#include @@ -668,11 +672,11 @@ +#endif /* _SYS_USER32_H */ + +#endif /* HAVE_SYS_USER32_H */ -Index: gdb-6.7/gdb/linux-nat.c +Index: gdb-6.8cvs20080219/gdb/linux-nat.c =================================================================== ---- gdb-6.7.orig/gdb/linux-nat.c 2007-10-15 21:42:26.000000000 +0200 -+++ gdb-6.7/gdb/linux-nat.c 2007-10-16 15:46:18.000000000 +0200 -@@ -98,6 +98,21 @@ static LONGEST (*super_xfer_partial) (st +--- gdb-6.8cvs20080219.orig/gdb/linux-nat.c 2008-02-19 17:27:21.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/linux-nat.c 2008-02-20 13:39:08.000000000 +0100 +@@ -104,6 +104,21 @@ static LONGEST (*super_xfer_partial) (st const gdb_byte *, ULONGEST, LONGEST); @@ -694,7 +698,7 @@ static int debug_linux_nat; static void show_debug_linux_nat (struct ui_file *file, int from_tty, -@@ -2687,11 +2696,11 @@ linux_nat_do_thread_registers (bfd *obfd +@@ -2716,11 +2731,11 @@ linux_nat_do_thread_registers (bfd *obfd else fill_gregset (regcache, &gregs, -1); @@ -711,7 +715,7 @@ if (core_regset_p && (regset = gdbarch_regset_from_core_section (gdbarch, ".reg2", -@@ -2702,10 +2711,11 @@ linux_nat_do_thread_registers (bfd *obfd +@@ -2731,10 +2746,11 @@ linux_nat_do_thread_registers (bfd *obfd else fill_fpregset (regcache, &fpregs, -1); @@ -727,7 +731,7 @@ #ifdef FILL_FPXREGSET if (core_regset_p -@@ -2799,9 +2808,9 @@ linux_nat_make_corefile_notes (bfd *obfd +@@ -2828,9 +2844,9 @@ linux_nat_make_corefile_notes (bfd *obfd psargs_end - string_end); } } @@ -740,16 +744,16 @@ } /* Dump information for threads. */ -Index: gdb-6.7/gdb/linux-nat.h +Index: gdb-6.8cvs20080219/gdb/linux-nat.h =================================================================== ---- gdb-6.7.orig/gdb/linux-nat.h 2007-10-13 05:09:50.000000000 +0200 -+++ gdb-6.7/gdb/linux-nat.h 2007-10-16 15:46:18.000000000 +0200 -@@ -110,3 +110,12 @@ void linux_nat_add_target (struct target - /* Update linux-nat internal state when changing from one fork - to another. */ - void linux_nat_switch_fork (ptid_t new_ptid); +--- gdb-6.8cvs20080219.orig/gdb/linux-nat.h 2008-02-19 14:26:32.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/linux-nat.h 2008-02-20 13:39:37.000000000 +0100 +@@ -124,3 +124,12 @@ void linux_nat_switch_fork (ptid_t new_p + + /* Return the saved siginfo associated with PTID. */ + struct siginfo *linux_nat_get_siginfo (ptid_t ptid); + -+/* This functions make elfcore note sections. ++/* These functions make elfcore note sections. + They may get overriden by code adjusting data for multi-target builds. */ +extern char *(*linux_elfcore_write_prpsinfo) + (bfd *, char *, int *, const char *, const char *); gdb-6.5-sharedlibrary-path.patch: Index: gdb-6.5-sharedlibrary-path.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.5-sharedlibrary-path.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.5-sharedlibrary-path.patch 1 Nov 2007 20:24:20 -0000 1.2 +++ gdb-6.5-sharedlibrary-path.patch 3 Mar 2008 16:13:47 -0000 1.3 @@ -16,17 +16,21 @@ Port to GDB-6.7. -Index: gdb-6.7/gdb/solib-svr4.c +2008-02-27 Jan Kratochvil + + Port to gdb-6.7.50.20080227. + +Index: gdb-6.7.50.20080227/gdb/solib-svr4.c =================================================================== ---- gdb-6.7.orig/gdb/solib-svr4.c 2007-10-14 23:04:45.000000000 +0200 -+++ gdb-6.7/gdb/solib-svr4.c 2007-10-16 15:43:56.000000000 +0200 -@@ -1009,10 +1009,14 @@ CORE_ADDR +--- gdb-6.7.50.20080227.orig/gdb/solib-svr4.c 2008-02-27 08:59:06.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/solib-svr4.c 2008-02-27 09:00:44.000000000 +0100 +@@ -1017,10 +1017,14 @@ CORE_ADDR svr4_fetch_objfile_link_map (struct objfile *objfile) { CORE_ADDR lm; + int resolve; - if ((debug_base = locate_base ()) == 0) + if (locate_base () == 0) return 0; /* failed somehow... */ +for (resolve = 0; resolve <= 1; resolve++) @@ -35,7 +39,7 @@ /* Position ourselves on the first link map. */ lm = solib_svr4_r_map (); while (lm) -@@ -1051,6 +1055,21 @@ svr4_fetch_objfile_link_map (struct objf +@@ -1059,6 +1063,21 @@ svr4_fetch_objfile_link_map (struct objf safe_strerror (errcode)); else { @@ -57,7 +61,7 @@ /* Is this the linkmap for the file we want? */ /* If the file is not a shared library and has no name, we are sure it is the main executable, so we return that. */ -@@ -1069,6 +1088,9 @@ svr4_fetch_objfile_link_map (struct objf +@@ -1077,6 +1096,9 @@ svr4_fetch_objfile_link_map (struct objf builtin_type_void_data_ptr); do_cleanups (old_chain); } @@ -67,10 +71,10 @@ return 0; } -Index: gdb-6.7/gdb/testsuite/gdb.threads/tls-sepdebug-main.c +Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-main.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.7/gdb/testsuite/gdb.threads/tls-sepdebug-main.c 2007-10-16 15:40:01.000000000 +0200 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-main.c 2008-02-27 09:00:15.000000000 +0100 @@ -0,0 +1,25 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -97,10 +101,10 @@ +{ + return 0; +} -Index: gdb-6.7/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c +Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.7/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c 2007-10-16 15:40:01.000000000 +0200 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c 2008-02-27 09:00:15.000000000 +0100 @@ -0,0 +1,22 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -124,10 +128,10 @@ + bug-gdb at prep.ai.mit.edu */ + +__thread int var = 42; -Index: gdb-6.7/gdb/testsuite/gdb.threads/tls-sepdebug.exp +Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.7/gdb/testsuite/gdb.threads/tls-sepdebug.exp 2007-10-16 15:40:01.000000000 +0200 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug.exp 2008-02-27 09:00:15.000000000 +0100 @@ -0,0 +1,81 @@ +# Copyright 2006 Free Software Foundation, Inc. + gdb-6.6-buildid-locate.patch: Index: gdb-6.6-buildid-locate.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gdb-6.6-buildid-locate.patch 21 Feb 2008 21:41:59 -0000 1.8 +++ gdb-6.6-buildid-locate.patch 3 Mar 2008 16:13:47 -0000 1.9 @@ -18,11 +18,16 @@ Provide its level 0 to disable the build-id messages. Resolve the RH Bug 432164. -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1-unpatched/gdb/Makefile.in gdb-6.7.1-patched/gdb/Makefile.in ---- gdb-6.7.1-unpatched/gdb/Makefile.in 2008-02-21 05:01:55.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/Makefile.in 2008-02-21 04:58:13.000000000 +0100 -@@ -387,7 +387,7 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcode - CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) \ +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + +Index: gdb-6.7.50.20080227/gdb/Makefile.in +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/Makefile.in 2008-03-01 10:30:49.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/Makefile.in 2008-03-01 10:38:01.000000000 +0100 +@@ -392,7 +392,7 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcode + CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \ $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \ $(LIBICONV) $(LIBEXPAT) \ - $(LIBIBERTY) $(WIN32LIBS) @@ -30,33 +35,34 @@ CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) -@@ -1932,7 +1932,8 @@ corelow.o: corelow.c $(defs_h) $(arch_ut +@@ -2029,7 +2029,8 @@ corelow.o: corelow.c $(defs_h) $(arch_ut $(inferior_h) $(symtab_h) $(command_h) $(bfd_h) $(target_h) \ $(gdbcore_h) $(gdbthread_h) $(regcache_h) $(regset_h) $(symfile_h) \ $(exec_h) $(readline_h) $(gdb_assert_h) \ -- $(exceptions_h) $(solib_h) -+ $(exceptions_h) $(solib_h) $(auxv_h) $(elf_common_h) $(objfiles_h) \ -+ $(gdbcmd_h) +- $(exceptions_h) $(solib_h) $(filenames_h) ++ $(exceptions_h) $(solib_h) $(filenames_h) $(auxv_h) $(elf_common_h) \ ++ $(objfiles_h) $(gdbcmd_h) core-regset.o: core-regset.c $(defs_h) $(command_h) $(gdbcore_h) \ $(inferior_h) $(target_h) $(regcache_h) $(gdb_string_h) $(gregset_h) cp-abi.o: cp-abi.c $(defs_h) $(value_h) $(cp_abi_h) $(command_h) $(gdbcmd_h) \ -@@ -2768,7 +2769,8 @@ symfile.o: symfile.c $(defs_h) $(bfdlink +@@ -2884,7 +2885,8 @@ symfile.o: symfile.c $(defs_h) $(bfdlink $(gdb_stabs_h) $(gdb_obstack_h) $(completer_h) $(bcache_h) \ $(hashtab_h) $(readline_h) $(gdb_assert_h) $(block_h) \ $(gdb_string_h) $(gdb_stat_h) $(observer_h) $(exec_h) \ -- $(parser_defs_h) $(varobj_h) $(elf_bfd_h) -+ $(parser_defs_h) $(varobj_h) $(elf_bfd_h) $(gdb_stdint_h) $(libbfd_h) \ -+ $(elf_bfd_h) $(elf_external_h) +- $(parser_defs_h) $(varobj_h) $(elf_bfd_h) $(solib_h) ++ $(parser_defs_h) $(varobj_h) $(elf_bfd_h) $(solib_h) $(gdb_stdint_h) \ ++ $(libbfd_h) $(elf_bfd_h) $(elf_external_h) symfile-mem.o: symfile-mem.c $(defs_h) $(symtab_h) $(gdbcore_h) \ $(objfiles_h) $(exceptions_h) $(gdbcmd_h) $(target_h) $(value_h) \ $(symfile_h) $(observer_h) $(auxv_h) $(elf_common_h) -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1-unpatched/gdb/corelow.c gdb-6.7.1-patched/gdb/corelow.c ---- gdb-6.7.1-unpatched/gdb/corelow.c 2008-02-21 05:01:55.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/corelow.c 2008-02-21 04:58:13.000000000 +0100 -@@ -44,6 +44,10 @@ - #include "gdb_assert.h" +Index: gdb-6.7.50.20080227/gdb/corelow.c +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/corelow.c 2008-02-09 14:45:33.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/corelow.c 2008-03-01 10:30:50.000000000 +0100 +@@ -45,6 +45,10 @@ #include "exceptions.h" #include "solib.h" + #include "filenames.h" +#include "auxv.h" +#include "elf/common.h" +#include "objfiles.h" @@ -64,7 +70,7 @@ #ifndef O_LARGEFILE -@@ -251,6 +255,56 @@ add_to_thread_list (bfd *abfd, asection +@@ -248,6 +252,56 @@ add_to_thread_list (bfd *abfd, asection inferior_ptid = pid_to_ptid (thread_id); /* Yes, make it current */ } @@ -121,7 +127,7 @@ /* This routine opens and sets up the core file bfd. */ static void -@@ -347,6 +401,15 @@ core_open (char *filename, int from_tty) +@@ -344,6 +398,15 @@ core_open (char *filename, int from_tty) ontop = !push_target (&core_ops); discard_cleanups (old_chain); @@ -137,7 +143,7 @@ /* This is done first, before anything has a chance to query the inferior for information such as symbols. */ post_create_inferior (&core_ops, from_tty); -@@ -678,4 +741,11 @@ _initialize_corelow (void) +@@ -692,4 +755,11 @@ _initialize_corelow (void) if (!coreops_suppress_target) add_target (&core_ops); @@ -149,10 +155,11 @@ + NULL, NULL, NULL, + &setlist, &showlist); } -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1-unpatched/gdb/doc/gdb.texinfo gdb-6.7.1-patched/gdb/doc/gdb.texinfo ---- gdb-6.7.1-unpatched/gdb/doc/gdb.texinfo 2008-02-21 05:00:36.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/doc/gdb.texinfo 2008-02-21 04:59:10.000000000 +0100 -@@ -12074,6 +12074,27 @@ information files. +Index: gdb-6.7.50.20080227/gdb/doc/gdb.texinfo +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/doc/gdb.texinfo 2008-03-01 10:30:50.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/doc/gdb.texinfo 2008-03-01 10:38:02.000000000 +0100 +@@ -12208,6 +12208,27 @@ information files. @end table @@ -180,10 +187,11 @@ @cindex @code{.gnu_debuglink} sections @cindex debug link sections A debug link is a special section of the executable file named -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1-unpatched/gdb/solib-svr4.c gdb-6.7.1-patched/gdb/solib-svr4.c ---- gdb-6.7.1-unpatched/gdb/solib-svr4.c 2008-02-21 05:01:55.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/solib-svr4.c 2008-02-21 04:58:13.000000000 +0100 -@@ -960,9 +960,34 @@ svr4_current_sos (void) +Index: gdb-6.7.50.20080227/gdb/solib-svr4.c +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/solib-svr4.c 2008-03-01 10:30:48.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/solib-svr4.c 2008-03-01 10:30:50.000000000 +0100 +@@ -967,9 +967,34 @@ svr4_current_sos (void) free_so (new); else { @@ -221,20 +229,21 @@ if (debug_solib) { fprintf_unfiltered (gdb_stdlog, -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1-unpatched/gdb/symfile.c gdb-6.7.1-patched/gdb/symfile.c ---- gdb-6.7.1-unpatched/gdb/symfile.c 2008-02-21 05:02:16.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/symfile.c 2008-02-21 04:59:10.000000000 +0100 -@@ -53,6 +53,9 @@ - #include "parser-defs.h" +Index: gdb-6.7.50.20080227/gdb/symfile.c +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/symfile.c 2008-03-01 10:30:48.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/symfile.c 2008-03-01 10:47:02.000000000 +0100 +@@ -54,6 +54,9 @@ #include "varobj.h" #include "elf-bfd.h" + #include "solib.h" +#include "gdb_stdint.h" +#include "libbfd.h" +#include "elf/external.h" #include #include -@@ -61,6 +64,7 @@ +@@ -62,6 +65,7 @@ #include #include #include @@ -242,7 +251,7 @@ int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num); -@@ -1262,16 +1266,65 @@ symbol_file_clear (int from_tty) +@@ -1235,16 +1239,65 @@ symbol_file_clear (int from_tty) printf_unfiltered (_("No symbol file now.\n")); } @@ -310,7 +319,7 @@ { struct build_id *retval; -@@ -1287,6 +1340,348 @@ build_id_bfd_get (bfd *abfd) +@@ -1260,6 +1313,348 @@ build_id_bfd_get (bfd *abfd) return retval; } @@ -659,7 +668,7 @@ /* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value. */ static int -@@ -1301,7 +1696,7 @@ build_id_verify (const char *filename, s +@@ -1274,7 +1669,7 @@ build_id_verify (const char *filename, s if (abfd == NULL) return 0; @@ -668,7 +677,7 @@ if (found == NULL) warning (_("File \"%s\" has no build-id, file skipped"), filename); -@@ -1317,8 +1712,9 @@ build_id_verify (const char *filename, s +@@ -1290,8 +1685,9 @@ build_id_verify (const char *filename, s return retval; } @@ -680,7 +689,7 @@ { char *link, *s, *retval = NULL; gdb_byte *data = build_id->data; -@@ -1326,7 +1722,9 @@ build_id_to_debug_filename (struct build +@@ -1299,7 +1695,9 @@ build_id_to_debug_filename (struct build /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */ link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1 @@ -691,7 +700,7 @@ s = link + sprintf (link, "%s/.build-id/", debug_file_directory); if (size > 0) { -@@ -1337,12 +1735,14 @@ build_id_to_debug_filename (struct build +@@ -1310,12 +1708,14 @@ build_id_to_debug_filename (struct build *s++ = '/'; while (size-- > 0) s += sprintf (s, "%02x", (unsigned) *data++); @@ -708,7 +717,7 @@ if (retval != NULL && !build_id_verify (retval, build_id)) { -@@ -1350,9 +1750,202 @@ build_id_to_debug_filename (struct build +@@ -1323,9 +1723,202 @@ build_id_to_debug_filename (struct build retval = NULL; } @@ -911,7 +920,20 @@ static char * get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out) { -@@ -1447,23 +2040,27 @@ find_separate_debug_file (struct objfile +@@ -1411,32 +2004,36 @@ static char * + find_separate_debug_file (struct objfile *objfile) + { + asection *sect; +- char *basename; +- char *dir; +- char *debugfile; ++ char *basename = NULL; ++ char *dir = NULL; ++ char *debugfile = NULL; + char *name_copy; +- char *canon_name; ++ char *canon_name = NULL; + bfd_size_type debuglink_size; unsigned long crc32; int i; struct build_id *build_id; @@ -944,64 +966,103 @@ } basename = get_debug_link_info (objfile, &crc32); -@@ -1471,7 +2068,10 @@ find_separate_debug_file (struct objfile +@@ -1444,7 +2041,7 @@ find_separate_debug_file (struct objfile if (basename == NULL) /* There's no separate debug info, hence there's no way we could load it => no warning. */ - return NULL; -+ { -+ xfree (build_id_filename); -+ return NULL; -+ } ++ goto cleanup_return_debugfile; dir = xstrdup (objfile->name); -@@ -1500,6 +2100,7 @@ find_separate_debug_file (struct objfile +@@ -1460,23 +2057,19 @@ find_separate_debug_file (struct objfile + gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i])); + dir[i+1] = '\0'; + +- debugfile = alloca (strlen (debug_file_directory) + 1 +- + strlen (dir) +- + strlen (DEBUG_SUBDIRECTORY) +- + strlen ("/") +- + strlen (basename) +- + 1); ++ debugfile = xmalloc (strlen (debug_file_directory) + 1 ++ + strlen (dir) ++ + strlen (DEBUG_SUBDIRECTORY) ++ + strlen ("/") ++ + strlen (basename) ++ + 1); + + /* First try in the same directory as the original file. */ + strcpy (debugfile, dir); + strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) - { -+ xfree (build_id_filename); - xfree (basename); - xfree (dir); - return xstrdup (debugfile); -@@ -1513,6 +2114,7 @@ find_separate_debug_file (struct objfile +- { +- xfree (basename); +- xfree (dir); +- return xstrdup (debugfile); +- } ++ goto cleanup_return_debugfile; + + /* Then try in the subdirectory named DEBUG_SUBDIRECTORY. */ + strcpy (debugfile, dir); +@@ -1485,11 +2078,7 @@ find_separate_debug_file (struct objfile + strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) - { -+ xfree (build_id_filename); - xfree (basename); - xfree (dir); - return xstrdup (debugfile); -@@ -1526,6 +2128,7 @@ find_separate_debug_file (struct objfile +- { +- xfree (basename); +- xfree (dir); +- return xstrdup (debugfile); +- } ++ goto cleanup_return_debugfile; + + /* Then try in the global debugfile directory. */ + strcpy (debugfile, debug_file_directory); +@@ -1498,11 +2087,7 @@ find_separate_debug_file (struct objfile + strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) - { -+ xfree (build_id_filename); - xfree (basename); - xfree (dir); - return xstrdup (debugfile); -@@ -1545,6 +2148,7 @@ find_separate_debug_file (struct objfile +- { +- xfree (basename); +- xfree (dir); +- return xstrdup (debugfile); +- } ++ goto cleanup_return_debugfile; + + /* If the file is in the sysroot, try using its base path in the + global debugfile directory. */ +@@ -1517,20 +2102,19 @@ find_separate_debug_file (struct objfile + strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) - { -+ xfree (build_id_filename); - xfree (canon_name); - xfree (basename); - xfree (dir); -@@ -1552,6 +2156,12 @@ find_separate_debug_file (struct objfile - } +- { +- xfree (canon_name); +- xfree (basename); +- xfree (dir); +- return xstrdup (debugfile); +- } ++ goto cleanup_return_debugfile; } - +- +- if (canon_name) +- xfree (canon_name); + ++ debugfile = NULL; + if (build_id_filename != NULL) -+ { -+ build_id_print_missing (objfile->name, build_id_filename); -+ xfree (build_id_filename); -+ } ++ build_id_print_missing (objfile->name, build_id_filename); + - if (canon_name) - xfree (canon_name); ++cleanup_return_debugfile: ++ xfree (build_id_filename); ++ xfree (canon_name); + xfree (basename); + xfree (dir); +- return NULL; ++ return debugfile; + } + -@@ -4275,4 +4885,16 @@ the global debug-file directory prepende +@@ -4220,4 +4804,16 @@ the global debug-file directory prepende NULL, show_debug_file_directory, &setlist, &showlist); @@ -1018,10 +1079,11 @@ + + observer_attach_inferior_created (missing_debuginfos_change_inferior_created); } -diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.7.1-unpatched/gdb/symfile.h gdb-6.7.1-patched/gdb/symfile.h ---- gdb-6.7.1-unpatched/gdb/symfile.h 2008-02-21 05:01:55.000000000 +0100 -+++ gdb-6.7.1-patched/gdb/symfile.h 2008-02-21 04:58:13.000000000 +0100 -@@ -353,6 +353,13 @@ extern int symfile_map_offsets_to_segmen +Index: gdb-6.7.50.20080227/gdb/symfile.h +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/symfile.h 2008-02-03 23:13:29.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/symfile.h 2008-03-01 10:30:50.000000000 +0100 +@@ -358,6 +358,13 @@ extern int symfile_map_offsets_to_segmen struct symfile_segment_data *get_symfile_segment_data (bfd *abfd); void free_symfile_segment_data (struct symfile_segment_data *data); gdb-6.6-bz235197-fork-detach-info.patch: Index: gdb-6.6-bz235197-fork-detach-info.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-bz235197-fork-detach-info.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.6-bz235197-fork-detach-info.patch 7 Jan 2008 15:10:23 -0000 1.1 +++ gdb-6.6-bz235197-fork-detach-info.patch 3 Mar 2008 16:13:47 -0000 1.2 @@ -1,26 +1,25 @@ ---- ./gdb/linux-nat.c 9 Feb 2007 20:52:16 -0000 1.56 -+++ ./gdb/linux-nat.c 22 Apr 2007 17:20:25 -0000 -@@ -378,9 +378,17 @@ child_follow_fork (struct target_ops *op +2008-03-01 Jan Kratochvil + + Port to GDB-6.8pre. + Remove the `[' character from the GDB-6.8 default message. + +Index: gdb-6.7.50.20080227/gdb/linux-nat.c +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/linux-nat.c 2008-03-01 10:30:48.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/linux-nat.c 2008-03-01 10:48:25.000000000 +0100 +@@ -415,7 +415,7 @@ linux_child_follow_fork (struct target_o /* Detach new forked process? */ if (detach_fork) { -+ static int advice_printed = 0; -+ -+ target_terminal_ours (); -+ fprintf_filtered (gdb_stdlog, -+ _("[Detaching after fork from child process %d.%s]\n"), -+ child_pid, (advice_printed ? "" : -+ _(" (Try `set detach-on-fork off'.)"))); -+ advice_printed = 1; -+ - if (debug_linux_nat) +- if (info_verbose || debug_linux_nat) ++ if (1 /* Fedora Bug 235197 */ || info_verbose || debug_linux_nat) { -- target_terminal_ours (); + target_terminal_ours (); fprintf_filtered (gdb_stdlog, - "Detaching after fork from child process %d.\n", - child_pid); ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ ./gdb/testsuite/gdb.base/fork-detach.c 22 Apr 2007 17:20:25 -0000 +Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.base/fork-detach.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.base/fork-detach.c 2008-03-01 10:30:49.000000000 +0100 @@ -0,0 +1,57 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -79,8 +78,10 @@ + } + return 0; +} ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ ./gdb/testsuite/gdb.base/fork-detach.exp 22 Apr 2007 17:20:25 -0000 +Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.base/fork-detach.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.base/fork-detach.exp 2008-03-01 10:49:36.000000000 +0100 @@ -0,0 +1,43 @@ +# Copyright 2007 Free Software Foundation, Inc. + @@ -96,7 +97,7 @@ +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +if $tracelevel then { + strace $tracelevel @@ -123,5 +124,5 @@ +gdb_run_cmd +# `Starting program: .*' prefix is available since gdb-6.7. +gdb_test "" \ -+ "\\\[Detaching after fork from child process.*Program exited normally\\..*" \ ++ "Detaching after fork from child process.*Program exited normally\\..*" \ + "Info message caught" gdb-6.6-bz247354-leader-exit-fix.patch: Index: gdb-6.6-bz247354-leader-exit-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-bz247354-leader-exit-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.6-bz247354-leader-exit-fix.patch 8 Jul 2007 10:45:30 -0000 1.1 +++ gdb-6.6-bz247354-leader-exit-fix.patch 3 Mar 2008 16:13:47 -0000 1.2 @@ -6,9 +6,15 @@ (linux_xfer_partial_lwp): ... here. (linux_xfer_partial): New function wrapping LINUX_XFER_PARTIAL_LWP. ---- ./gdb/linux-nat.c 3 Jul 2007 17:01:55 -0000 1.65 -+++ ./gdb/linux-nat.c 7 Jul 2007 15:21:57 -0000 -@@ -1343,6 +1343,31 @@ linux_handle_extended_wait (struct lwp_i +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + +Index: gdb-6.8cvs20080219/gdb/linux-nat.c +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/linux-nat.c 2008-02-21 12:03:38.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/linux-nat.c 2008-02-21 12:05:01.000000000 +0100 +@@ -1570,6 +1570,31 @@ linux_handle_extended_wait (struct lwp_i _("unknown ptrace event %d"), event); } @@ -40,7 +46,7 @@ /* Wait for LP to stop. Returns the wait status, or 0 if the LWP has exited. */ -@@ -1350,16 +1375,31 @@ static int +@@ -1577,16 +1602,31 @@ static int wait_lwp (struct lwp_info *lp) { pid_t pid; @@ -76,7 +82,7 @@ if (pid == -1 && errno == ECHILD) { /* The thread has previously exited. We need to delete it -@@ -3144,10 +3159,12 @@ linux_proc_pending_signals (int pid, sig +@@ -3451,10 +3491,12 @@ linux_proc_pending_signals (int pid, sig fclose (procfile); } @@ -92,7 +98,7 @@ { LONGEST xfer; -@@ -3164,6 +3181,45 @@ linux_xfer_partial (struct target_ops *o +@@ -3495,6 +3537,45 @@ linux_xfer_partial (struct target_ops *o offset, len); } @@ -135,6 +141,6 @@ + return xfer; +} + - /* Create a prototype generic Linux target. The client can override + /* Create a prototype generic GNU/Linux target. The client can override it with local methods. */ gdb-6.6-multifork-debugreg.patch: Index: gdb-6.6-multifork-debugreg.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-multifork-debugreg.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.6-multifork-debugreg.patch 12 Jan 2008 16:28:31 -0000 1.3 +++ gdb-6.6-multifork-debugreg.patch 3 Mar 2008 16:13:47 -0000 1.4 @@ -14,38 +14,93 @@ * gdb.texinfo (Setting Watchpoints): New paragraph on the software watchpoints safety wrt `set scheduler-locking'. -diff -u -ruNp gdb-6.7.1-orig/gdb/amd64-linux-nat.c gdb-6.7.1/gdb/amd64-linux-nat.c ---- gdb-6.7.1-orig/gdb/amd64-linux-nat.c 2008-01-11 20:59:17.000000000 +0100 -+++ gdb-6.7.1/gdb/amd64-linux-nat.c 2008-01-11 20:49:42.000000000 +0100 -@@ -501,6 +501,12 @@ amd64_linux_insert_watchpoint (CORE_ADDR - return rc; +2008-03-01 Jan Kratochvil + + Port to GDB-6.8pre. + +Index: gdb-6.7.50.20080227/gdb/amd64-linux-nat.c +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/amd64-linux-nat.c 2008-03-01 10:38:02.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/amd64-linux-nat.c 2008-03-01 16:33:40.000000000 +0100 +@@ -408,25 +408,43 @@ amd64_linux_dr_set (ptid_t ptid, int reg + void + amd64_linux_dr_set_control (unsigned long control) + { +- struct lwp_info *lp; +- ptid_t ptid; +- + amd64_linux_dr[DR_CONTROL] = control; +- ALL_LWPS (lp, ptid) +- amd64_linux_dr_set (ptid, DR_CONTROL, control); ++ ++ /* I386_DETACH_BREAKPOINTS may need to reset the registers on single process ++ not listed for ALL_LWPS. */ ++ ++ if (ptid_get_lwp (inferior_ptid) == 0) ++ amd64_linux_dr_set (inferior_ptid, DR_CONTROL, control); ++ else ++ { ++ struct lwp_info *lp; ++ ptid_t ptid; ++ ++ ALL_LWPS (lp, ptid) ++ amd64_linux_dr_set (ptid, DR_CONTROL, control); ++ } + } + + void + amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr) + { +- struct lwp_info *lp; +- ptid_t ptid; +- + gdb_assert (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR); + + amd64_linux_dr[DR_FIRSTADDR + regnum] = addr; +- ALL_LWPS (lp, ptid) +- amd64_linux_dr_set (ptid, DR_FIRSTADDR + regnum, addr); ++ ++ /* I386_DETACH_BREAKPOINTS may need to reset the registers on single process ++ not listed for ALL_LWPS. */ ++ ++ if (ptid_get_lwp (inferior_ptid) == 0) ++ amd64_linux_dr_set (inferior_ptid, DR_FIRSTADDR + regnum, addr); ++ else ++ { ++ struct lwp_info *lp; ++ ptid_t ptid; ++ ++ ALL_LWPS (lp, ptid) ++ amd64_linux_dr_set (ptid, DR_FIRSTADDR + regnum, addr); ++ } } + void +@@ -451,6 +469,41 @@ amd64_linux_new_thread (ptid_t ptid) + + amd64_linux_dr_set (ptid, DR_CONTROL, amd64_linux_dr[DR_CONTROL]); + } ++ +/* TO_FOLLOW_FORK stores here the PID under DETACH_BREAKPOINTS for the child + process of traced FORK. We must clear such watchpoints only once during + DETACH_BREAKPOINTS. */ + +static int amd64_linux_detach_breakpoints_pid; + - /* Remove a watchpoint that watched the memory region which starts at - address ADDR, whose length is LEN bytes, and for accesses of the - type TYPE. Return 0 on success, -1 on failure. */ -@@ -508,12 +514,33 @@ int - amd64_linux_remove_watchpoint (CORE_ADDR addr, int len, int type) - { - int rc; -+ ++/* Remove a watchpoint that watched the memory region which starts at ++ address ADDR, whose length is LEN bytes, and for accesses of the ++ type TYPE. Return 0 on success, -1 on failure. */ ++int ++amd64_linux_remove_watchpoint (CORE_ADDR addr, int len, int type) ++{ + if (ptid_get_pid (inferior_ptid) == amd64_linux_detach_breakpoints_pid) + return 0; + /* FOLLOW-FORK-MODE CHILD runs later the CHILD with no restrictions. */ + amd64_linux_detach_breakpoints_pid = 0; + - rc = i386_remove_watchpoint (addr, len, type); - if (!rc) - amd64_linux_sync_debug_registers_across_threads (); - return rc; - } - ++ return i386_remove_watchpoint (addr, len, type); ++} ++ +static void +amd64_linux_detach_breakpoints (int detached_pid) +{ @@ -60,24 +115,10 @@ + + do_cleanups (old_chain); +} -+ - /* Insert a hardware-assisted breakpoint at address ADDR. SHADOW is - unused. Return 0 on success, EBUSY on failure. */ - int -@@ -532,6 +559,12 @@ int - amd64_linux_remove_hw_breakpoint (struct bp_target_info *bp_tgt) - { - int rc; -+ -+ if (ptid_get_pid (inferior_ptid) == amd64_linux_detach_breakpoints_pid) -+ return 0; -+ /* FOLLOW-FORK-MODE CHILD runs later the CHILD with no restrictions. */ -+ amd64_linux_detach_breakpoints_pid = 0; -+ - rc = i386_remove_hw_breakpoint (bp_tgt); - if (!rc) - amd64_linux_sync_debug_registers_across_threads (); -@@ -620,6 +653,41 @@ amd64_linux_child_post_startup_inferior + + + /* This function is called by libthread_db as part of its handling of +@@ -520,6 +573,41 @@ amd64_linux_child_post_startup_inferior i386_cleanup_dregs (); super_post_startup_inferior (ptid); } @@ -119,7 +160,7 @@ /* Provide a prototype to silence -Wmissing-prototypes. */ -@@ -656,6 +724,9 @@ _initialize_amd64_linux_nat (void) +@@ -556,6 +644,9 @@ _initialize_amd64_linux_nat (void) linux_elfcore_write_prstatus = amd64_linux_elfcore_write_prstatus; linux_elfcore_write_prfpreg = amd64_linux_elfcore_write_prfpreg; @@ -128,51 +169,99 @@ + /* Register the target. */ linux_nat_add_target (t); - -diff -u -ruNp gdb-6.7.1-orig/gdb/config/i386/nm-i386.h gdb-6.7.1/gdb/config/i386/nm-i386.h ---- gdb-6.7.1-orig/gdb/config/i386/nm-i386.h 2007-08-23 20:08:48.000000000 +0200 -+++ gdb-6.7.1/gdb/config/i386/nm-i386.h 2008-01-11 20:47:42.000000000 +0100 -@@ -114,6 +114,8 @@ extern int i386_stopped_by_watchpoint (v - reset all debug registers by calling i386_cleanup_dregs (). */ - #define CHILD_POST_STARTUP_INFERIOR + linux_nat_set_new_thread (t, amd64_linux_new_thread); +Index: gdb-6.7.50.20080227/gdb/config/i386/nm-i386.h +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/config/i386/nm-i386.h 2008-03-01 10:38:02.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/config/i386/nm-i386.h 2008-03-01 10:50:39.000000000 +0100 +@@ -110,6 +110,8 @@ extern int i386_stopped_by_watchpoint (v + #define target_remove_hw_breakpoint(bp_tgt) \ + i386_remove_hw_breakpoint (bp_tgt) +extern void i386_detach_breakpoints (int detached_pid); + #endif /* I386_USE_GENERIC_WATCHPOINTS */ #endif /* NM_I386_H */ -diff -u -ruNp gdb-6.7.1-orig/gdb/i386-linux-nat.c gdb-6.7.1/gdb/i386-linux-nat.c ---- gdb-6.7.1-orig/gdb/i386-linux-nat.c 2008-01-11 20:59:17.000000000 +0100 -+++ gdb-6.7.1/gdb/i386-linux-nat.c 2008-01-11 20:49:52.000000000 +0100 -@@ -745,6 +745,12 @@ i386_linux_insert_watchpoint (CORE_ADDR - return rc; +Index: gdb-6.7.50.20080227/gdb/i386-linux-nat.c +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/i386-linux-nat.c 2008-03-01 10:38:02.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/i386-linux-nat.c 2008-03-01 16:33:40.000000000 +0100 +@@ -655,21 +655,42 @@ i386_linux_dr_set_control (unsigned long + ptid_t ptid; + + i386_linux_dr[DR_CONTROL] = control; +- ALL_LWPS (lp, ptid) +- i386_linux_dr_set (ptid, DR_CONTROL, control); ++ ++ /* I386_DETACH_BREAKPOINTS may need to reset the registers on single process ++ not listed for ALL_LWPS. */ ++ ++ if (ptid_get_lwp (inferior_ptid) == 0) ++ i386_linux_dr_set (inferior_ptid, DR_CONTROL, control); ++ else ++ { ++ struct lwp_info *lp; ++ ptid_t ptid; ++ ++ ALL_LWPS (lp, ptid) ++ i386_linux_dr_set (ptid, DR_CONTROL, control); ++ } } + void + i386_linux_dr_set_addr (int regnum, CORE_ADDR addr) + { +- struct lwp_info *lp; +- ptid_t ptid; +- + gdb_assert (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR); + + i386_linux_dr[DR_FIRSTADDR + regnum] = addr; +- ALL_LWPS (lp, ptid) +- i386_linux_dr_set (ptid, DR_FIRSTADDR + regnum, addr); ++ ++ /* I386_DETACH_BREAKPOINTS may need to reset the registers on single process ++ not listed for ALL_LWPS. */ ++ ++ if (ptid_get_lwp (inferior_ptid) == 0) ++ i386_linux_dr_set (inferior_ptid, DR_FIRSTADDR + regnum, addr); ++ else ++ { ++ struct lwp_info *lp; ++ ptid_t ptid; ++ ++ ALL_LWPS (lp, ptid) ++ i386_linux_dr_set (ptid, DR_FIRSTADDR + regnum, addr); ++ } + } + + void +@@ -694,6 +715,41 @@ i386_linux_new_thread (ptid_t ptid) + + i386_linux_dr_set (ptid, DR_CONTROL, i386_linux_dr[DR_CONTROL]); + } ++ +/* TO_FOLLOW_FORK stores here the PID under DETACH_BREAKPOINTS for the child + process of traced FORK. We must clear such watchpoints only once during + DETACH_BREAKPOINTS. */ + +static int i386_linux_detach_breakpoints_pid; + - /* Remove a watchpoint that watched the memory region which starts at - address ADDR, whose length is LEN bytes, and for accesses of the - type TYPE. Return 0 on success, -1 on failure. */ -@@ -752,12 +758,33 @@ int - i386_linux_remove_watchpoint (CORE_ADDR addr, int len, int type) - { - int rc; -+ ++/* Remove a watchpoint that watched the memory region which starts at ++ address ADDR, whose length is LEN bytes, and for accesses of the ++ type TYPE. Return 0 on success, -1 on failure. */ ++int ++i386_linux_remove_watchpoint (CORE_ADDR addr, int len, int type) ++{ + if (ptid_get_pid (inferior_ptid) == i386_linux_detach_breakpoints_pid) + return 0; + /* FOLLOW-FORK-MODE CHILD runs later the CHILD with no restrictions. */ + i386_linux_detach_breakpoints_pid = 0; + - rc = i386_remove_watchpoint (addr, len, type); - if (!rc) - i386_linux_sync_debug_registers_across_threads (); - return rc; - } - ++ return i386_remove_watchpoint (addr, len, type); ++} ++ +static void +i386_linux_detach_breakpoints (int detached_pid) +{ @@ -187,11 +276,10 @@ + + do_cleanups (old_chain); +} -+ - /* Insert a hardware-assisted breakpoint at address ADDR. SHADOW is - unused. Return 0 on success, EBUSY on failure. */ - int -@@ -940,6 +967,40 @@ i386_linux_child_post_startup_inferior ( + + + /* Called by libthread_db. Returns a pointer to the thread local +@@ -833,6 +889,40 @@ i386_linux_child_post_startup_inferior ( super_post_startup_inferior (ptid); } @@ -232,7 +320,7 @@ void _initialize_i386_linux_nat (void) { -@@ -959,6 +1020,9 @@ _initialize_i386_linux_nat (void) +@@ -852,6 +942,9 @@ _initialize_i386_linux_nat (void) t->to_fetch_registers = i386_linux_fetch_inferior_registers; t->to_store_registers = i386_linux_store_inferior_registers; @@ -241,11 +329,12 @@ + /* Register the target. */ linux_nat_add_target (t); - -diff -u -ruNp gdb-6.7.1-orig/gdb/i386-nat.c gdb-6.7.1/gdb/i386-nat.c ---- gdb-6.7.1-orig/gdb/i386-nat.c 2008-01-11 20:59:17.000000000 +0100 -+++ gdb-6.7.1/gdb/i386-nat.c 2008-01-11 20:47:57.000000000 +0100 -@@ -545,6 +546,17 @@ i386_remove_watchpoint (CORE_ADDR addr, + linux_nat_set_new_thread (t, i386_linux_new_thread); +Index: gdb-6.7.50.20080227/gdb/i386-nat.c +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/i386-nat.c 2008-03-01 10:38:02.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/i386-nat.c 2008-03-01 10:50:39.000000000 +0100 +@@ -544,6 +544,17 @@ i386_remove_watchpoint (CORE_ADDR addr, return retval; } @@ -263,10 +352,12 @@ /* Return non-zero if we can watch a memory region that starts at address ADDR and whose length is LEN bytes. */ ---- gdb-6.5/gdb/ia64-linux-nat.c.orig 2008-01-12 15:47:40.000000000 +0100 -+++ gdb-6.5/gdb/ia64-linux-nat.c 2008-01-12 15:57:58.000000000 +0100 -@@ -664,12 +664,23 @@ ia64_linux_remove_watchpoint_callback (s - args->len); +Index: gdb-6.7.50.20080227/gdb/ia64-linux-nat.c +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/ia64-linux-nat.c 2008-03-01 10:38:02.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/ia64-linux-nat.c 2008-03-01 10:50:39.000000000 +0100 +@@ -583,6 +583,12 @@ ia64_linux_insert_watchpoint (CORE_ADDR + return 0; } +/* TO_FOLLOW_FORK stores here the PID under DETACH_BREAKPOINTS for the child @@ -275,23 +366,24 @@ + +static int ia64_linux_detach_breakpoints_pid; + - /* Remove a watchpoint for all threads. */ static int - ia64_linux_remove_watchpoint (CORE_ADDR addr, int len) + ia64_linux_remove_watchpoint (CORE_ADDR addr, int len, int type) { - struct linux_watchpoint args; +@@ -590,6 +596,11 @@ ia64_linux_remove_watchpoint (CORE_ADDR + long dbr_addr, dbr_mask; + int max_watchpoints = 4; + if (ptid_get_pid (inferior_ptid) == ia64_linux_detach_breakpoints_pid) + return 0; + /* FOLLOW-FORK-MODE CHILD runs later the CHILD with no restrictions. */ + ia64_linux_detach_breakpoints_pid = 0; + - args.addr = addr; - args.len = len; + if (len <= 0 || !is_power_of_2 (len)) + return -1; + +@@ -617,6 +628,22 @@ ia64_linux_remove_watchpoint (CORE_ADDR + } -@@ -771,6 +782,22 @@ ia64_linux_xfer_partial (struct target_o - /* Observer function for a new thread attach. We need to insert - existing watchpoints on the new thread. */ static void +ia64_linux_detach_breakpoints (int detached_pid) +{ @@ -311,9 +403,9 @@ +static void ia64_linux_new_thread (ptid_t ptid) { - insert_watchpoints_for_new_thread (ptid, -@@ -793,6 +820,40 @@ ia64_linux_save_sigtrap_info (void *queu - lp->saved_trap_data); + int i, any; +@@ -805,6 +832,40 @@ ia64_linux_xfer_partial (struct target_o + offset, len); } +static int (*ia64_linux_super_follow_fork) (struct target_ops *ops, @@ -353,21 +445,22 @@ void _initialize_ia64_linux_nat (void); /* -@@ -865,6 +926,9 @@ _initialize_ia64_linux_nat (void) - super_xfer_partial = t->to_xfer_partial; - t->to_xfer_partial = ia64_linux_xfer_partial; +@@ -899,6 +960,9 @@ _initialize_ia64_linux_nat (void) + t->to_insert_watchpoint = ia64_linux_insert_watchpoint; + t->to_remove_watchpoint = ia64_linux_remove_watchpoint; + ia64_linux_super_follow_fork = t->to_follow_fork; + t->to_follow_fork = ia64_linux_follow_fork; + /* Register the target. */ linux_nat_add_target (t); - -diff -u -ruNp gdb-6.7.1-orig/gdb/ppc-linux-nat.c gdb-6.7.1/gdb/ppc-linux-nat.c ---- gdb-6.7.1-orig/gdb/ppc-linux-nat.c 2007-08-30 15:13:59.000000000 +0200 -+++ gdb-6.7.1/gdb/ppc-linux-nat.c 2008-01-11 20:43:12.000000000 +0100 -@@ -837,12 +837,23 @@ ppc_linux_insert_watchpoint (CORE_ADDR a - return ptrace (PTRACE_SET_DEBUGREG, tid, 0, dabr_value); + linux_nat_set_new_thread (t, ia64_linux_new_thread); +Index: gdb-6.7.50.20080227/gdb/ppc-linux-nat.c +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/ppc-linux-nat.c 2008-03-01 10:38:02.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/ppc-linux-nat.c 2008-03-01 10:50:39.000000000 +0100 +@@ -847,6 +847,12 @@ ppc_linux_insert_watchpoint (CORE_ADDR a + return 0; } +/* TO_FOLLOW_FORK stores here the PID under DETACH_BREAKPOINTS for the child @@ -379,19 +472,20 @@ static int ppc_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw) { - int tid; - ptid_t ptid = inferior_ptid; +@@ -854,6 +860,11 @@ ppc_linux_remove_watchpoint (CORE_ADDR a + ptid_t ptid; + long dabr_value = 0; + if (ptid_get_pid (inferior_ptid) == ppc_linux_detach_breakpoints_pid) + return 0; + /* FOLLOW-FORK-MODE CHILD runs later the CHILD with no restrictions. */ + ppc_linux_detach_breakpoints_pid = 0; + - tid = TIDGET (ptid); - if (tid == 0) - tid = PIDGET (ptid); -@@ -850,6 +861,15 @@ ppc_linux_remove_watchpoint (CORE_ADDR a - return ptrace (PTRACE_SET_DEBUGREG, tid, 0, 0); + saved_dabr_value = 0; + ALL_LWPS (lp, ptid) + if (ptrace (PTRACE_SET_DEBUGREG, TIDGET (ptid), 0, saved_dabr_value) < 0) +@@ -867,6 +878,15 @@ ppc_linux_new_thread (ptid_t ptid) + ptrace (PTRACE_SET_DEBUGREG, TIDGET (ptid), 0, saved_dabr_value); } +static void @@ -406,8 +500,8 @@ static int ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p) { -@@ -945,6 +965,40 @@ fill_fpregset (const struct regcache *re - fpregsetp, sizeof (*fpregsetp)); +@@ -976,6 +996,40 @@ ppc_linux_read_description (struct targe + return NULL; } +static int (*ppc_linux_super_follow_fork) (struct target_ops *ops, @@ -447,26 +541,28 @@ void _initialize_ppc_linux_nat (void); void -@@ -967,6 +1021,9 @@ _initialize_ppc_linux_nat (void) - t->to_stopped_by_watchpoint = ppc_linux_stopped_by_watchpoint; - t->to_stopped_data_address = ppc_linux_stopped_data_address; +@@ -1000,6 +1054,9 @@ _initialize_ppc_linux_nat (void) + + t->to_read_description = ppc_linux_read_description; + ppc_linux_super_follow_fork = t->to_follow_fork; + t->to_follow_fork = ppc_linux_follow_fork; + /* Register the target. */ linux_nat_add_target (t); - } ---- gdb-6.7.1-unpatched/gdb/s390-nat.c 2008-01-11 15:33:48.000000000 -0500 -+++ gdb-6.7.1/gdb/s390-nat.c 2008-01-11 15:35:50.000000000 -0500 -@@ -269,17 +269,15 @@ s390_stopped_by_watchpoint (void) + linux_nat_set_new_thread (t, ppc_linux_new_thread); +Index: gdb-6.7.50.20080227/gdb/s390-nat.c +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/s390-nat.c 2008-03-01 10:38:02.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/s390-nat.c 2008-03-01 10:50:39.000000000 +0100 +@@ -283,21 +283,15 @@ s390_stopped_by_watchpoint (void) } static void -s390_fix_watch_points (ptid_t ptid) -+s390_fix_watch_points_list (int tid, struct watch_area *area_list) ++s390_fix_watch_points (int tid, struct watch_area *area_list) { -- int tid = s390_tid (ptid); +- int tid; - per_struct per_info; ptrace_area parea; @@ -474,12 +570,16 @@ CORE_ADDR watch_lo_addr = (CORE_ADDR)-1, watch_hi_addr = 0; struct watch_area *area; +- tid = TIDGET (ptid); +- if (tid == 0) +- tid = PIDGET (ptid); +- - for (area = watch_base; area; area = area->next) + for (area = area_list; area; area = area->next) { watch_lo_addr = min (watch_lo_addr, area->lo_addr); watch_hi_addr = max (watch_hi_addr, area->hi_addr); -@@ -291,7 +289,7 @@ s390_fix_watch_points (ptid_t ptid) +@@ -309,7 +303,7 @@ s390_fix_watch_points (ptid_t ptid) if (ptrace (PTRACE_PEEKUSR_AREA, tid, &parea) < 0) perror_with_name (_("Couldn't retrieve watchpoint status")); @@ -488,20 +588,26 @@ { per_info.control_regs.bits.em_storage_alteration = 1; per_info.control_regs.bits.storage_alt_space_ctl = 1; -@@ -308,6 +306,12 @@ s390_fix_watch_points (ptid_t ptid) +@@ -326,6 +320,18 @@ s390_fix_watch_points (ptid_t ptid) perror_with_name (_("Couldn't modify watchpoint status")); } +static void +s390_fix_watch_points (ptid_t ptid) +{ -+ s390_fix_watch_points_list (s390_tid (ptid), watch_base); ++ int tid; ++ ++ tid = TIDGET (ptid); ++ if (tid == 0) ++ tid = PIDGET (ptid); ++ ++ s390_fix_watch_points_list (tid, watch_base); +} + - /* Callback routine to use with iterate_over_lwps to insert a specified - watchpoint on all threads. */ static int -@@ -348,12 +352,23 @@ s390_remove_watchpoint_callback (struct + s390_insert_watchpoint (CORE_ADDR addr, int len, int type) + { +@@ -347,6 +353,12 @@ s390_insert_watchpoint (CORE_ADDR addr, return 0; } @@ -511,10 +617,11 @@ + +static int s390_detach_breakpoints_pid; + - /* Remove a specified watchpoint from all threads. */ static int s390_remove_watchpoint (CORE_ADDR addr, int len, int type) { +@@ -354,6 +366,11 @@ s390_remove_watchpoint (CORE_ADDR addr, + ptid_t ptid; struct watch_area *area, **parea; + if (ptid_get_pid (inferior_ptid) == s390_detach_breakpoints_pid) @@ -525,7 +632,7 @@ for (parea = &watch_base; *parea; parea = &(*parea)->next) if ((*parea)->lo_addr == addr && (*parea)->hi_addr == addr + len - 1) -@@ -378,6 +393,15 @@ s390_remove_watchpoint (CORE_ADDR addr, +@@ -375,6 +392,15 @@ s390_remove_watchpoint (CORE_ADDR addr, return 0; } @@ -541,8 +648,8 @@ static int s390_can_use_hw_breakpoint (int type, int cnt, int othertype) { -@@ -399,6 +423,39 @@ s390_linux_new_thread (ptid_t ptid) - s390_fix_watch_points (ptid); +@@ -387,6 +413,39 @@ s390_region_ok_for_hw_watchpoint (CORE_A + return 1; } +static int (*s390_super_follow_fork) (struct target_ops *ops, int follow_child); @@ -581,7 +688,7 @@ void _initialize_s390_nat (void); -@@ -422,6 +479,9 @@ _initialize_s390_nat (void) +@@ -410,6 +469,9 @@ _initialize_s390_nat (void) t->to_insert_watchpoint = s390_insert_watchpoint; t->to_remove_watchpoint = s390_remove_watchpoint; @@ -590,10 +697,11 @@ + /* Register the target. */ linux_nat_add_target (t); - -diff -u -ruNp gdb-6.7.1-orig/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c gdb-6.7.1/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c ---- gdb-6.7.1-orig/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.7.1/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c 2008-01-11 20:28:48.000000000 +0100 + linux_nat_set_new_thread (t, s390_fix_watch_points); +Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/watchpoint-fork-forkoff.c 2008-03-01 15:18:13.000000000 +0100 @@ -0,0 +1,160 @@ +/* Test case for forgotten hw-watchpoints after fork()-off of a process. + @@ -755,9 +863,10 @@ +#else +# error "!FOLLOW_PARENT && !FOLLOW_CHILD" +#endif -diff -u -ruNp gdb-6.7.1-orig/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c gdb-6.7.1/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c ---- gdb-6.7.1-orig/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.7.1/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c 2008-01-11 20:28:48.000000000 +0100 +Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c 2008-03-01 10:50:39.000000000 +0100 @@ -0,0 +1,154 @@ +/* Test case for forgotten hw-watchpoints after fork()-off of a process. + @@ -861,7 +970,7 @@ +} + +int main (void) -+{ ++{ + int i; + void *thread_result; + @@ -913,9 +1022,10 @@ + + return 0; +} -diff -u -ruNp gdb-6.7.1-orig/gdb/testsuite/gdb.threads/watchpoint-fork.c gdb-6.7.1/gdb/testsuite/gdb.threads/watchpoint-fork.c ---- gdb-6.7.1-orig/gdb/testsuite/gdb.threads/watchpoint-fork.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.7.1/gdb/testsuite/gdb.threads/watchpoint-fork.c 2008-01-11 20:28:48.000000000 +0100 +Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/watchpoint-fork.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/watchpoint-fork.c 2008-03-01 10:50:39.000000000 +0100 @@ -0,0 +1,56 @@ +/* Test case for forgotten hw-watchpoints after fork()-off of a process. + @@ -973,9 +1083,10 @@ + + return 0; +} -diff -u -ruNp gdb-6.7.1-orig/gdb/testsuite/gdb.threads/watchpoint-fork.exp gdb-6.7.1/gdb/testsuite/gdb.threads/watchpoint-fork.exp ---- gdb-6.7.1-orig/gdb/testsuite/gdb.threads/watchpoint-fork.exp 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.7.1/gdb/testsuite/gdb.threads/watchpoint-fork.exp 2008-01-11 20:28:48.000000000 +0100 +Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/watchpoint-fork.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/watchpoint-fork.exp 2008-03-01 10:50:39.000000000 +0100 @@ -0,0 +1,140 @@ +# Copyright 2008 Free Software Foundation, Inc. + @@ -1117,47 +1228,16 @@ +if {[istarget "*-*-linux*"]} { + test child FOLLOW_CHILD +} +Index: gdb-6.7.50.20080227/gdb/doc/gdb.texinfo =================================================================== -RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v -retrieving revision 1.434 -retrieving revision 1.435 -diff -u -r1.434 -r1.435 ---- src/gdb/doc/gdb.texinfo 2007/09/28 11:09:55 1.434 -+++ src/gdb/doc/gdb.texinfo 2007/10/01 00:17:58 1.435 -@@ -3346,20 +3346,13 @@ - way of doing that would be to set a code breakpoint at the entry to the - @code{main} function and when it breaks, set all the watchpoints. - -- at quotation - @cindex watchpoints and threads - @cindex threads and watchpoints -- at emph{Warning:} In multi-thread programs, watchpoints have only limited --usefulness. With the current watchpoint implementation, @value{GDBN} --can only watch the value of an expression @emph{in a single thread}. If --you are confident that the expression can only change due to the current --thread's activity (and if you are also confident that no other thread --can become current), then you can use watchpoints as usual. However, -- at value{GDBN} may not notice when a non-current thread's activity changes --the expression. -+In multi-threaded programs, watchpoints will detect changes to the -+watched expression from every thread. - -- at c FIXME: this is almost identical to the previous paragraph. -- at emph{HP-UX Warning:} In multi-thread programs, software watchpoints -+ at quotation -+ at emph{Warning:} In multi-threaded programs, software watchpoints - have only limited usefulness. If @value{GDBN} creates a software - watchpoint, it can only watch the value of an expression @emph{in a - single thread}. If you are confident that the expression can only - ---- gdb-6.5/gdb/doc/gdb.texinfo-orig 2007-12-15 13:25:14.000000000 +0100 -+++ gdb-6.5/gdb/doc/gdb.texinfo 2007-12-15 13:45:25.000000000 +0100 -@@ -3261,6 +3261,14 @@ +--- gdb-6.7.50.20080227.orig/gdb/doc/gdb.texinfo 2008-03-01 10:50:39.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/doc/gdb.texinfo 2008-03-01 10:50:39.000000000 +0100 +@@ -3386,6 +3386,14 @@ confident that no other thread can becom software watchpoints as usual. However, @value{GDBN} may not notice when a non-current thread's activity changes the expression. (Hardware watchpoints, in contrast, watch an expression in all threads.) + -+Software watchpoints single-step the current thread to track the changes. ++Software watchpoints single-step the current thread to track the changes. +Other threads are left freely running on @code{continue}; therefore, their +changes cannot be caught. To get more reliable software watchpoints, please +use @code{set scheduler-locking on}. The default for Red Hat/Fedora @@ -1167,3 +1247,45 @@ @end quotation @xref{set remote hardware-watchpoint-limit}. +Index: gdb-6.7.50.20080227/gdb/config/i386/nm-linux.h +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/config/i386/nm-linux.h 2008-03-01 10:38:02.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/config/i386/nm-linux.h 2008-03-01 10:50:39.000000000 +0100 +@@ -44,6 +44,17 @@ extern void i386_linux_dr_reset_addr (in + extern unsigned long i386_linux_dr_get_status (void); + #define I386_DR_LOW_GET_STATUS() \ + i386_linux_dr_get_status () ++ ++/* Remove a watchpoint that watched the memory region which starts at ++ * address ADDR, whose length is LEN bytes, and for accesses of the ++ * type TYPE. Return 0 on success, -1 on failure. */ ++extern int i386_linux_remove_watchpoint (CORE_ADDR addr, int len, int type); ++ ++/* Override basic i386 macros for watchpoint and hardware breakpoint ++ insertion/removal to support threads. */ ++#undef target_remove_watchpoint ++#define target_remove_watchpoint(addr, len, type) \ ++ i386_linux_remove_watchpoint (addr, len, type) + + + #ifdef HAVE_PTRACE_GETFPXREGS +Index: gdb-6.7.50.20080227/gdb/config/i386/nm-linux64.h +=================================================================== +--- gdb-6.7.50.20080227.orig/gdb/config/i386/nm-linux64.h 2008-03-01 10:38:02.000000000 +0100 ++++ gdb-6.7.50.20080227/gdb/config/i386/nm-linux64.h 2008-03-01 10:50:39.000000000 +0100 +@@ -50,4 +50,15 @@ extern unsigned long amd64_linux_dr_get_ + #define I386_DR_LOW_GET_STATUS() \ + amd64_linux_dr_get_status () + ++/* Remove a watchpoint that watched the memory region which starts at ++ * address ADDR, whose length is LEN bytes, and for accesses of the ++ * type TYPE. Return 0 on success, -1 on failure. */ ++extern int amd64_linux_remove_watchpoint (CORE_ADDR addr, int len, int type); ++ ++/* Override basic amd64 macros for watchpoint and hardware breakpoint ++ insertion/removal to support threads. */ ++#undef target_remove_watchpoint ++#define target_remove_watchpoint(addr, len, type) \ ++ amd64_linux_remove_watchpoint (addr, len, type) ++ + #endif /* nm-linux64.h */ gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch: Index: gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch 19 Oct 2007 00:12:58 -0000 1.3 +++ gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch 3 Mar 2008 16:13:47 -0000 1.4 @@ -17,9 +17,15 @@ * infrun.c (proceed): RESUME_STEP initialized for non-stepping. RESUME_STEP set according to STEP only at the end of the function. ---- ./gdb/inferior.h 15 Jun 2007 22:44:55 -0000 1.83 -+++ ./gdb/inferior.h 25 Jun 2007 20:33:02 -0000 -@@ -194,7 +194,15 @@ extern void reopen_exec_file (void); +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + +Index: gdb-6.8cvs20080219/gdb/inferior.h +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/inferior.h 2008-02-14 23:03:57.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/inferior.h 2008-02-19 14:15:01.000000000 +0100 +@@ -179,7 +179,15 @@ extern void reopen_exec_file (void); /* The `resume' routine should only be called in special circumstances. Normally, use `proceed', which handles a lot of bookkeeping. */ @@ -36,9 +42,11 @@ /* From misc files */ ---- ./gdb/infrun.c 22 Jun 2007 12:47:48 -0000 1.243 -+++ ./gdb/infrun.c 25 Jun 2007 20:33:02 -0000 -@@ -76,7 +76,8 @@ static void set_schedlock_func (char *ar +Index: gdb-6.8cvs20080219/gdb/infrun.c +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/infrun.c 2008-02-14 23:03:57.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/infrun.c 2008-02-19 14:24:37.000000000 +0100 +@@ -74,7 +74,8 @@ static void set_schedlock_func (char *ar struct execution_control_state; @@ -48,7 +56,7 @@ static void xdb_handle_command (char *args, int from_tty); -@@ -496,15 +497,18 @@ set_schedlock_func (char *args, int from +@@ -508,15 +509,18 @@ set_schedlock_func (char *args, int from STEP nonzero if we should step (zero to continue instead). SIG is the signal to give the inferior (zero for none). */ void @@ -70,7 +78,7 @@ /* FIXME: calling breakpoint_here_p (read_pc ()) three times! */ -@@ -593,9 +597,10 @@ a command like `return' or `jump' to con +@@ -632,9 +636,10 @@ a command like `return' or `jump' to con resume_ptid = inferior_ptid; } @@ -83,7 +91,7 @@ { /* User-settable 'scheduler' mode requires solo thread resume. */ resume_ptid = inferior_ptid; -@@ -711,7 +716,7 @@ static CORE_ADDR prev_pc; +@@ -742,7 +747,7 @@ static CORE_ADDR prev_pc; void proceed (CORE_ADDR addr, enum target_signal siggnal, int step) { @@ -92,7 +100,7 @@ if (step > 0) step_start_function = find_pc_function (read_pc ()); -@@ -725,13 +731,13 @@ proceed (CORE_ADDR addr, enum target_sig +@@ -756,13 +761,13 @@ proceed (CORE_ADDR addr, enum target_sig step one instruction before inserting breakpoints so that we do not stop right away (and report a second hit at this breakpoint). */ @@ -108,10 +116,10 @@ } else { -@@ -755,9 +761,9 @@ proceed (CORE_ADDR addr, enum target_sig +@@ -786,9 +791,9 @@ proceed (CORE_ADDR addr, enum target_sig that reported the most recent event. If a step-over is required it returns TRUE and sets the current thread to the old thread. */ - if (prepare_to_proceed () && breakpoint_here_p (read_pc ())) + if (prepare_to_proceed (step)) - oneproc = 1; + resume_step = RESUME_STEP_USER; @@ -119,8 +127,8 @@ + if (resume_step == RESUME_STEP_USER) /* We will get a trace trap after one instruction. Continue it automatically and insert breakpoints then. */ - trap_expected = 1; -@@ -806,8 +812,13 @@ proceed (CORE_ADDR addr, enum target_sig + stepping_over_breakpoint = 1; +@@ -832,8 +837,13 @@ proceed (CORE_ADDR addr, enum target_sig updated correctly when the inferior is stopped. */ prev_pc = read_pc (); @@ -135,7 +143,7 @@ /* Wait for it to stop (if not standalone) and in any case decode why it stopped, and act accordingly. */ -@@ -2681,14 +2690,20 @@ process_event_stop_test: +@@ -2723,14 +2733,21 @@ process_event_stop_test: /* Are we in the middle of stepping? */ @@ -145,11 +153,12 @@ { - return ((!ecs->handling_longjmp - && ((step_range_end && step_resume_breakpoint == NULL) -- || trap_expected)) +- || stepping_over_breakpoint)) - || ecs->stepping_through_solib_after_catch - || bpstat_should_step ()); + if (!ecs->handling_longjmp -+ && ((step_range_end && step_resume_breakpoint == NULL) || trap_expected)) ++ && ((step_range_end && step_resume_breakpoint == NULL) ++ || stepping_over_breakpoint)) + return RESUME_STEP_USER; + + if (ecs->stepping_through_solib_after_catch) @@ -162,9 +171,11 @@ } /* Subroutine call with source code we should not step over. Do step ---- ./gdb/linux-nat.c 16 Jun 2007 17:16:25 -0000 1.64 -+++ ./gdb/linux-nat.c 25 Jun 2007 20:33:02 -0000 -@@ -1720,7 +1720,10 @@ count_events_callback (struct lwp_info * +Index: gdb-6.8cvs20080219/gdb/linux-nat.c +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/linux-nat.c 2008-02-14 23:03:57.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/linux-nat.c 2008-02-19 14:15:01.000000000 +0100 +@@ -1751,7 +1751,10 @@ count_events_callback (struct lwp_info * static int select_singlestep_lwp_callback (struct lwp_info *lp, void *data) { @@ -176,9 +187,11 @@ return 1; else return 0; ---- ./gdb/linux-nat.h 10 May 2007 21:36:00 -0000 1.18 -+++ ./gdb/linux-nat.h 25 Jun 2007 20:33:02 -0000 -@@ -53,8 +53,8 @@ struct lwp_info +Index: gdb-6.8cvs20080219/gdb/linux-nat.h +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/linux-nat.h 2008-02-14 23:03:58.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/linux-nat.h 2008-02-19 14:15:01.000000000 +0100 +@@ -55,8 +55,8 @@ struct lwp_info /* If non-zero, a pending wait status. */ int status; @@ -187,5 +200,5 @@ + /* The kind of stepping of this LWP. */ + enum resume_step step; - /* If WAITSTATUS->KIND != TARGET_WAITKIND_SPURIOUS, the waitstatus - for this LWP's last event. This may correspond to STATUS above, + /* Non-zero si_signo if this LWP stopped with a trap. si_addr may + be the address of a hardware watchpoint. */ gdb-6.7-bz233852-attach-signalled-fix.patch: Index: gdb-6.7-bz233852-attach-signalled-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.7-bz233852-attach-signalled-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.7-bz233852-attach-signalled-fix.patch 10 Jan 2008 17:17:49 -0000 1.1 +++ gdb-6.7-bz233852-attach-signalled-fix.patch 3 Mar 2008 16:13:47 -0000 1.2 @@ -18,10 +18,15 @@ * gdb.texinfo (Attach): Document the ATTACH and DETACH commands for stopped processes. Document the messages on the seen pending signals. -diff -u -X /home/short/.diffi.list -ruNp gdb-6.5-unpatched/gdb/NEWS gdb-6.5/gdb/NEWS ---- gdb-6.5-unpatched/gdb/NEWS 2008-01-09 18:26:07.000000000 +0100 -+++ gdb-6.5/gdb/NEWS 2008-01-09 15:26:30.000000000 +0100 -@@ -9,6 +9,9 @@ Renesas M32C/M16C m32c-elf +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + +Index: gdb-6.8cvs20080219/gdb/NEWS +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/NEWS 2008-02-24 19:35:37.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/NEWS 2008-02-24 19:36:26.000000000 +0100 +@@ -412,6 +412,9 @@ Renesas M32C/M16C m32c-elf Morpho Technologies ms1 ms1-elf @@ -31,30 +36,27 @@ * New commands init-if-undefined Initialize a convenience variable, but ---- gdb-6.7.1/gdb/linux-nat.c.orig 2008-01-09 23:54:42.000000000 +0100 -+++ gdb-6.7.1/gdb/linux-nat.c 2008-01-10 00:08:07.000000000 +0100 -@@ -85,11 +85,20 @@ - #define __WALL 0x40000000 /* Wait for any child. */ +Index: gdb-6.8cvs20080219/gdb/linux-nat.c +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/linux-nat.c 2008-02-24 19:36:26.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/linux-nat.c 2008-02-24 19:45:01.000000000 +0100 +@@ -89,6 +89,15 @@ + #define PTRACE_GETSIGINFO 0x4202 #endif +#define STRINGIFY_ARG(x) #x +#define STRINGIFY(x) STRINGIFY_ARG (x) + -+static int linux_ptrace_post_attach (struct lwp_info *lp); ++static int linux_ptrace_post_attach (ptid_t ptid, int *cloned_return); +static int kill_lwp (int lwpid, int signo); + - /* The single-threaded native GNU/Linux target_ops. We save a pointer for - the use of the multi-threaded target. */ - static struct target_ops *linux_ops; - static struct target_ops linux_ops_saved; - +/* PID of the inferior stopped by SIGSTOP before attaching (or zero). */ +static pid_t pid_was_stopped; + - /* The saved to_xfer_partial method, inherited from inf-ptrace.c. - Called by our to_xfer_partial. */ - static LONGEST (*super_xfer_partial) (struct target_ops *, -@@ -540,6 +549,11 @@ linux_child_follow_fork (struct target_o + /* The single-threaded native GNU/Linux target_ops. We save a pointer for + the use of the multi-threaded target. */ + static struct target_ops *linux_ops; +@@ -539,6 +548,11 @@ linux_child_follow_fork (struct target_o } else { @@ -66,52 +68,75 @@ target_detach (NULL, 0); } -@@ -940,7 +954,6 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver +@@ -942,9 +956,8 @@ lin_lwp_attach_lwp (ptid_t ptid) to happen. */ if (GET_LWP (ptid) != GET_PID (ptid) && lp == NULL) { - pid_t pid; int status; +- int cloned = 0; ++ int cloned; if (ptrace (PTRACE_ATTACH, GET_LWP (ptid), 0, 0) < 0) -@@ -958,10 +971,156 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver - if (lp == NULL) - lp = add_lwp (ptid); + { +@@ -958,37 +971,20 @@ lin_lwp_attach_lwp (ptid_t ptid) + return -1; + } - if (debug_linux_nat) - fprintf_unfiltered (gdb_stdlog, - "LLAL: PTRACE_ATTACH %s, 0, 0 (OK)\n", - target_pid_to_str (ptid)); -+ status = linux_ptrace_post_attach (lp); +- +- pid = my_waitpid (GET_LWP (ptid), &status, 0); +- if (pid == -1 && errno == ECHILD) +- { +- /* Try again with __WCLONE to check cloned processes. */ +- pid = my_waitpid (GET_LWP (ptid), &status, __WCLONE); +- cloned = 1; ++ status = linux_ptrace_post_attach (ptid, &cloned); + if (status != 0) + { + error (_("Thread %s exited: %s"), target_pid_to_str (ptid), + status_to_str (status)); -+ } -+ + } + +- gdb_assert (pid == GET_LWP (ptid) +- && WIFSTOPPED (status) && WSTOPSIG (status)); +- +- if (lp == NULL) +- lp = add_lwp (ptid); ++ /* ADD_LWP with TID only already after the WAITPID. */ ++ lp = add_lwp (ptid); + lp->cloned = cloned; + +- target_post_attach (pid); + target_post_attach (GET_LWP (ptid)); -+ -+ lp->stopped = 1; -+ } -+ else -+ { -+ /* We assume that the LWP representing the original process is -+ already stopped. Mark it as stopped in the data structure -+ that the GNU/linux ptrace layer uses to keep track of -+ threads. Note that this won't have already been done since -+ the main thread will have, we assume, been stopped by an -+ attach from a different layer. */ -+ if (lp == NULL) -+ lp = add_lwp (ptid); -+ lp->stopped = 1; -+ } -+ -+ if (verbose) -+ printf_filtered (_("[New %s]\n"), target_pid_to_str (ptid)); -+ -+ return 0; -+} -+ + + lp->stopped = 1; +- +- if (debug_linux_nat) +- { +- fprintf_unfiltered (gdb_stdlog, +- "LLAL: waitpid %s received %s\n", +- target_pid_to_str (ptid), +- status_to_str (status)); +- } + } + else + { +@@ -998,44 +994,202 @@ lin_lwp_attach_lwp (ptid_t ptid) + threads. Note that this won't have already been done since + the main thread will have, we assume, been stopped by an + attach from a different layer. */ +- if (lp == NULL) +- lp = add_lwp (ptid); + lp->stopped = 1; + } + + return 0; + } + +/* Detect `T (stopped)' in `/proc/PID/status'. + Other states including `T (tracing stop)' are reported as false. */ + @@ -119,7 +144,7 @@ +pid_is_stopped (pid_t pid) +{ + FILE *status_file; -+ char buf[100]; ++ char buf[100]; + int retval = 0; + + snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid); @@ -135,7 +160,7 @@ + have_state = 1; + break; + } -+ } ++ } + if (have_state && strstr (buf, "T (stopped)") != NULL) + retval = 1; + fclose (status_file); @@ -206,11 +231,11 @@ + Similiar processing is being done in this file by WAIT_LWP. */ + +static int -+linux_ptrace_post_attach (struct lwp_info *lp) ++linux_ptrace_post_attach (ptid_t ptid, int *cloned_return) +{ -+ ptid_t ptid = lp->ptid; + unsigned long sig; + int this_thread_was_stopped; ++ int cloned = 0; + + if (debug_linux_nat) + fprintf_unfiltered (gdb_stdlog, @@ -232,52 +257,33 @@ + { + pid_t pid; + int status; - - pid = my_waitpid (GET_LWP (ptid), &status, 0); - if (pid == -1 && errno == ECHILD) -@@ -974,13 +1133,7 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver - target_pid_to_str (ptid), safe_strerror (errno)); - lp->cloned = 1; - } -- -- gdb_assert (pid == GET_LWP (ptid) -- && WIFSTOPPED (status) && WSTOPSIG (status)); -- -- target_post_attach (pid); -- -- lp->stopped = 1; ++ ++ pid = my_waitpid (GET_LWP (ptid), &status, 0); ++ if (pid == -1 && errno == ECHILD) ++ { ++ /* Try again with __WCLONE to check cloned processes. */ ++ pid = my_waitpid (GET_LWP (ptid), &status, __WCLONE); ++ cloned = 1; ++ } ++ + gdb_assert (pid == GET_LWP (ptid)); - - if (debug_linux_nat) - { -@@ -989,22 +1142,32 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver - target_pid_to_str (ptid), - status_to_str (status)); - } -- } -- else -- { -- /* We assume that the LWP representing the original process is -- already stopped. Mark it as stopped in the data structure -- that the GNU/linux ptrace layer uses to keep track of -- threads. Note that this won't have already been done since -- the main thread will have, we assume, been stopped by an -- attach from a different layer. */ -- if (lp == NULL) -- lp = add_lwp (ptid); -- lp->stopped = 1; -- } - -- if (verbose) -- printf_filtered (_("[New %s]\n"), target_pid_to_str (ptid)); ++ ++ if (debug_linux_nat) ++ { ++ fprintf_unfiltered (gdb_stdlog, ++ "LLAL: waitpid %s received %s\n", ++ target_pid_to_str (ptid), ++ status_to_str (status)); ++ } ++ + /* Check if the thread has exited. */ + if (WIFEXITED (status) || WIFSIGNALED (status)) -+ return status; ++ return status; + gdb_assert (WIFSTOPPED (status)); + sig = WSTOPSIG (status); + gdb_assert (sig != 0); + if (sig == SIGSTOP) -+ break; ++ break; + + /* As the second signal for stopped processes we send SIGSTOP. */ + if (this_thread_was_stopped && sig == SIGCONT) @@ -295,20 +301,22 @@ + if (ptrace (PTRACE_CONT, GET_LWP (ptid), NULL, (void *) sig) != 0) + perror_with_name (("ptrace")); + } - - return 0; - } -@@ -1013,7 +1176,6 @@ static void ++ *cloned_return = cloned; ++ return 0; ++} ++ + static void linux_nat_attach (char *args, int from_tty) { struct lwp_info *lp; - pid_t pid; int status; +- int cloned = 0; ++ int cloned; /* FIXME: We should probably accept a list of process id's, and -@@ -1024,21 +1186,12 @@ linux_nat_attach (char *args, int from_t - inferior_ptid = BUILD_LWP (GET_PID (inferior_ptid), GET_PID (inferior_ptid)); - lp = add_lwp (inferior_ptid); + attach all of them. */ + linux_ops->to_attach (args, from_tty); - /* Make sure the initial process is stopped. The user-level threads - layer might want to poke around in the inferior, and that won't @@ -320,21 +328,27 @@ - - /* Try again with __WCLONE to check cloned processes. */ - pid = my_waitpid (GET_PID (inferior_ptid), &status, __WCLONE); -- lp->cloned = 1; +- cloned = 1; - } - - gdb_assert (pid == GET_PID (inferior_ptid) - && WIFSTOPPED (status) && WSTOPSIG (status) == SIGSTOP); -+ status = linux_ptrace_post_attach (lp); +- + /* Add the initial process as the first LWP to the list. */ + inferior_ptid = BUILD_LWP (GET_PID (inferior_ptid), GET_PID (inferior_ptid)); ++ ++ status = linux_ptrace_post_attach (inferior_ptid, &cloned); + if (status != 0) + error (_("Program %s exited: %s\n"), target_pid_to_str (inferior_ptid), + status_to_str (status)); -+ if (lp->cloned) ++ if (cloned) + warning (_("%s is a cloned process"), target_pid_to_str (inferior_ptid)); ++ ++ /* ADD_LWP with TID only already after the WAITPID. */ + lp = add_lwp (inferior_ptid); + lp->cloned = cloned; - lp->stopped = 1; - -@@ -1047,8 +1200,8 @@ linux_nat_attach (char *args, int from_t +@@ -1046,8 +1200,8 @@ linux_nat_attach (char *args, int from_t lp->resumed = 1; if (debug_linux_nat) { @@ -345,7 +359,7 @@ } } -@@ -1093,6 +1246,9 @@ detach_callback (struct lwp_info *lp, vo +@@ -1092,6 +1246,9 @@ detach_callback (struct lwp_info *lp, vo overall process id just yet. */ if (GET_LWP (lp->ptid) != GET_PID (lp->ptid)) { @@ -355,7 +369,7 @@ errno = 0; if (ptrace (PTRACE_DETACH, GET_LWP (lp->ptid), 0, WSTOPSIG (lp->status)) < 0) -@@ -1121,6 +1277,9 @@ linux_nat_detach (char *args, int from_t +@@ -1120,6 +1277,9 @@ linux_nat_detach (char *args, int from_t trap_ptid = null_ptid; @@ -365,9 +379,9 @@ /* Destroy LWP info; it's no longer valid. */ init_lwp_list (); -@@ -1258,6 +1417,14 @@ linux_nat_resume (ptid_t ptid, int step_ - lp->stopped = 0; - } +@@ -1255,6 +1415,14 @@ linux_nat_resume (ptid_t ptid, int step_ + resume_callback. */ + lp->stopped = 0; + /* At this point, we are going to resume the inferior and if we + have attached to a stopped process, we no longer should leave @@ -380,10 +394,11 @@ if (resume_all) iterate_over_lwps (resume_callback, NULL); -diff -u -X /home/short/.diffi.list -ruNp gdb-6.5-unpatched/gdb/doc/gdb.texinfo gdb-6.5/gdb/doc/gdb.texinfo ---- gdb-6.5-unpatched/gdb/doc/gdb.texinfo 2008-01-09 18:26:07.000000000 +0100 -+++ gdb-6.5/gdb/doc/gdb.texinfo 2008-01-09 15:26:30.000000000 +0100 -@@ -2190,16 +2190,29 @@ can step and continue; you can modify st +Index: gdb-6.8cvs20080219/gdb/doc/gdb.texinfo +=================================================================== +--- gdb-6.8cvs20080219.orig/gdb/doc/gdb.texinfo 2008-02-24 19:36:24.000000000 +0100 ++++ gdb-6.8cvs20080219/gdb/doc/gdb.texinfo 2008-02-24 19:36:26.000000000 +0100 +@@ -2176,16 +2176,29 @@ can step and continue; you can modify st process continue running, you may use the @code{continue} command after attaching @value{GDBN} to the process. @@ -418,4 +433,4 @@ + at key{RET} again after executing the command. @end table - If you exit @value{GDBN} or use the @code{run} command while you have an + If you exit @value{GDBN} while you have an attached process, you detach gdb-6.7-bz426600-DW_TAG_interface_type-fix.patch: Index: gdb-6.7-bz426600-DW_TAG_interface_type-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.7-bz426600-DW_TAG_interface_type-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.7-bz426600-DW_TAG_interface_type-fix.patch 7 Jan 2008 15:10:23 -0000 1.1 +++ gdb-6.7-bz426600-DW_TAG_interface_type-fix.patch 3 Mar 2008 16:13:47 -0000 1.2 @@ -1,13 +1,8 @@ +Original patch was: http://sourceware.org/ml/gdb-patches/2007-12/msg00397.html http://sourceware.org/ml/gdb-cvs/2007-12/msg00123.html -2007-12-22 Jan Kratochvil - - * dwarf2read.c (scan_partial_symbols partial_die_parent_scope) - (add_partial_symbol, pdi_needs_namespace, process_die) - (is_type_tag_for_partial, load_partial_dies, new_symbol) - (read_type_die, determine_prefix): Extend the current code of - `DW_TAG_class_type' also for `DW_TAG_interface_type'. +extended for the RHEL safety: 2007-12-28 Jan Kratochvil @@ -15,93 +10,10 @@ `DW_TAG_class_type'-type backing for `DW_TAG_interface_type', even for namespaces which should not apply for Java `DW_TAG_interface_type'. -=================================================================== -RCS file: /cvs/src/src/gdb/dwarf2read.c,v -retrieving revision 1.242 -retrieving revision 1.243 -diff -u -r1.242 -r1.243 ---- src/gdb/dwarf2read.c 2007/12/17 18:38:30 1.242 -+++ src/gdb/dwarf2read.c 2007/12/22 20:58:30 1.243 -@@ -1747,6 +1747,7 @@ - } - break; - case DW_TAG_class_type: -+ case DW_TAG_interface_type: - case DW_TAG_structure_type: - if (!pdi->is_declaration) - { -@@ -1829,6 +1830,7 @@ - if (parent->tag == DW_TAG_namespace - || parent->tag == DW_TAG_structure_type - || parent->tag == DW_TAG_class_type -+ || parent->tag == DW_TAG_interface_type - || parent->tag == DW_TAG_union_type) - { - if (grandparent_scope == NULL) -@@ -1976,6 +1978,7 @@ - 0, (CORE_ADDR) 0, cu->language, objfile); - break; - case DW_TAG_class_type: -+ case DW_TAG_interface_type: - case DW_TAG_structure_type: - case DW_TAG_union_type: - case DW_TAG_enumeration_type: -@@ -2057,6 +2060,7 @@ - case DW_TAG_namespace: - case DW_TAG_typedef: - case DW_TAG_class_type: -+ case DW_TAG_interface_type: - case DW_TAG_structure_type: - case DW_TAG_union_type: - case DW_TAG_enumeration_type: -@@ -2676,6 +2680,7 @@ - read_lexical_block_scope (die, cu); - break; - case DW_TAG_class_type: -+ case DW_TAG_interface_type: - case DW_TAG_structure_type: - case DW_TAG_union_type: - read_structure_type (die, cu); -@@ -5403,6 +5408,7 @@ - #endif - case DW_TAG_base_type: - case DW_TAG_class_type: -+ case DW_TAG_interface_type: - case DW_TAG_enumeration_type: - case DW_TAG_structure_type: - case DW_TAG_subrange_type: -@@ -5608,6 +5614,7 @@ - || last_die->tag == DW_TAG_enumeration_type - || (cu->language != language_c - && (last_die->tag == DW_TAG_class_type -+ || last_die->tag == DW_TAG_interface_type - || last_die->tag == DW_TAG_structure_type - || last_die->tag == DW_TAG_union_type)))) - { -@@ -7358,6 +7365,7 @@ - (FIXME?) */ - break; - case DW_TAG_class_type: -+ case DW_TAG_interface_type: - case DW_TAG_structure_type: - case DW_TAG_union_type: - case DW_TAG_set_type: -@@ -7677,6 +7685,7 @@ - switch (die->tag) - { - case DW_TAG_class_type: -+ case DW_TAG_interface_type: - case DW_TAG_structure_type: - case DW_TAG_union_type: - read_structure_type (die, cu); -@@ -7781,6 +7790,7 @@ - } - break; - case DW_TAG_class_type: -+ case DW_TAG_interface_type: - case DW_TAG_structure_type: - { - if (parent->type != NULL && TYPE_TAG_NAME (parent->type) != NULL) +2008-02-24 Jan Kratochvil + + Port to GDB-6.8pre. + Index: ./gdb/dwarf2read.c =================================================================== RCS file: /cvs/src/src/gdb/dwarf2read.c,v gdb-6.7-bz426600-DW_TAG_interface_type-test.patch: Index: gdb-6.7-bz426600-DW_TAG_interface_type-test.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.7-bz426600-DW_TAG_interface_type-test.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.7-bz426600-DW_TAG_interface_type-test.patch 7 Jan 2008 15:10:23 -0000 1.1 +++ gdb-6.7-bz426600-DW_TAG_interface_type-test.patch 3 Mar 2008 16:13:47 -0000 1.2 @@ -4,6 +4,10 @@ * gdb.arch/i386-interface.S, gdb.arch/i386-interface.exp: New files. +2008-03-02 Jan Kratochvil + + * gdb.arch/i386-interface.exp: Fix a testcase race. + --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ./gdb/testsuite/gdb.arch/i386-interface.S 22 Dec 2007 19:07:28 -0000 @@ -0,0 +1,628 @@ @@ -693,14 +697,14 @@ + +set test "ptype Interface" +gdb_test_multiple $test $test { -+ -re "type = class Interface *extends java.lang.Object \{" { ++ -re "type = class Interface *extends java.lang.Object \{.*$gdb_prompt $" { + pass $test + } +} + +set test "ptype Class" +gdb_test_multiple $test $test { -+ -re "type = class Class *extends java.lang.Object implements Interface \{" { ++ -re "type = class Class *extends java.lang.Object implements Interface \{.*$gdb_prompt $" { + pass $test + } +} Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- gdb.spec 1 Mar 2008 08:03:38 -0000 1.271 +++ gdb.spec 3 Mar 2008 16:13:47 -0000 1.272 @@ -8,14 +8,14 @@ # Set version to contents of gdb/version.in. # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch). -Version: 6.7.1 +Version: 6.7.50.20080227 # The release always contains a leading reserved number, start it at 1. -Release: 16%{?dist} +Release: 1%{?dist} License: GPL Group: Development/Debuggers -Source: ftp://ftp.gnu.org/gnu/gdb/gdb-6.7.1.tar.bz2 +Source: ftp://sourceware.org/pub/gdb/snapshots/current/gdb-6.7.50.20080227.tar.bz2 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://gnu.org/software/gdb/ @@ -82,10 +82,6 @@ # Stop a backtrace when a zero PC is encountered. Patch106: gdb-6.3-framepczero-20040927.patch -# Pass the pc's section into the symbol search code; stops the lookup -# finding a symbol from the wrong section. -Patch108: gdb-6.3-ppc64section-20041026.patch - # Include the pc's section when doing a symbol lookup so that the # correct symbol is found. Patch111: gdb-6.3-ppc64displaysymbol-20041124.patch @@ -95,9 +91,6 @@ # Make upstream `set scheduler-locking step' as default. Patch260: gdb-6.6-scheduler_locking-step-is-default.patch -# Threaded watchpoint support -Patch113: gdb-6.3-threaded-watchpoints-20041213.patch - # Continue removing breakpoints even when failure occurs. Patch117: gdb-6.3-removebp-20041130.patch @@ -112,7 +105,6 @@ Patch120: gdb-6.3-type-fix-20041213.patch # VSYSCALL and PIE -Patch122: gdb-6.3-test-pie-20050107.patch Patch124: gdb-6.3-pie-20050110.patch # Get selftest working with sep-debug-info @@ -140,9 +132,6 @@ # Prevent gdb from being pushed into background Patch142: gdb-6.3-terminal-fix-20050214.patch -# Allow sibling threads to set threaded watchpoints for x86 and x86-64 -Patch145: gdb-6.3-threaded-watchpoints2-20050225.patch - # Fix unexpected compiler warning messages. Patch147: gdb-6.3-warnings-20050317.patch @@ -162,9 +151,6 @@ # IA64 sigtramp prev register patch Patch158: gdb-6.3-ia64-sigtramp-frame-20050708.patch -# IA64 sigaltstack patch -Patch159: gdb-6.3-ia64-sigaltstack-20050711.patch - # IA64 gcore speed-up patch Patch160: gdb-6.3-ia64-gcore-speedup-20050714.patch @@ -263,7 +249,7 @@ Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch # Backported post gdb-6.7 release fixups. -Patch232: gdb-6.7.1-upstream.patch +#Patch232: gdb-6.7.1-upstream.patch # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000). Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch @@ -271,9 +257,6 @@ # Temporary support for shared libraries >2GB on 64bit hosts. (BZ 231832) Patch235: gdb-6.3-bz231832-obstack-2gb.patch -# Suggest SELinux permissions problem; no assertion failure anymore (BZ 232371). -Patch236: gdb-6.6-bz232371-selinux-thread-error.patch - # Fix prelink(8) testcase for non-root $PATH missing `/usr/sbin' (BZ 225783). Patch240: gdb-6.6-bz225783-prelink-path.patch @@ -283,18 +266,12 @@ # Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517). Patch245: gdb-6.6-bz229517-gcore-without-terminal.patch -# Fix testcase for watchpoints in threads (for BZ 237096). -Patch246: gdb-6.6-bz237096-watchthreads-testcasefix.patch - # Notify user of a child forked process being detached (BZ 235197). Patch247: gdb-6.6-bz235197-fork-detach-info.patch # New testcase for gcore of 32bit inferiors on 64bit hosts. Patch249: gdb-6.6-gcore32-test.patch -# Enable PowerPC to print 128-bit long double variables (BZ 237872). -Patch251: gdb-6.5-bz237872-ppc-long-double.patch - # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp". Patch254: gdb-6.6-testsuite-timeouts.patch @@ -325,9 +302,6 @@ # Fixed the kernel i386-on-x86_64 VDSO loading (producing `Lowest section in'). Patch277: gdb-6.6-vdso-i386-on-amd64-warning.patch -# Fix debug load for sparse assembler files (such as vDSO32 for i386-on-x86_64). -Patch278: gdb-6.6-cu-ranges.patch - # Fix hardware watchpoints after inferior forks-off some process. # Threaded `set follow-fork-mode child' still not fixed there, glibc fixes reqd. # `set detach-on-fork off' not fixed there in general - it already assert-fails. @@ -362,12 +336,15 @@ # Fix false `(no debugging symbols found)' on `-readnever' runs. Patch301: gdb-6.6-buildid-readnever-silent.patch -# ia64 build fixes from Doug Chapman (BZ 428882). -Patch303: gdb-6.7-bz428882-ia64-fix.patch - # Fix #include on kernel-headers-2.6.25-0.40.rc1.git2.fc9.x86_64. Patch304: gdb-6.7-kernel-headers-compat.patch +# Fix/implement the Fortran dynamic arrays support (BZ 377541). +Patch305: gdb-6.8-bz377541-fortran-dynamic-arrays.patch + +# Backport fix of a segfault + PIE regression since 6.7.1 on PIE executables. +Patch306: gdb-6.8-watchpoint-inaccessible-memory.patch + BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext BuildRequires: flex bison sharutils expat-devel Requires: readline @@ -378,7 +355,7 @@ # BuildRequires are set here only for the complete testsuite run. %if 0%{?_with_testsuite:1} # gcc-objc++ is not covered by the GDB testsuite. -BuildRequires: gcc gcc-c++ gcc-gfortran gcc-java gcc-objc +BuildRequires: gcc gcc-c++ gcc-gfortran gcc-java gcc-objc fpc # Copied from gcc-4.1.2-32 %ifarch %{ix86} x86_64 ia64 ppc alpha BuildRequires: gcc-gnat @@ -429,7 +406,7 @@ # Apply patches defined above. -%patch232 -p1 +#%patch232 -p1 %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -440,15 +417,12 @@ %patch104 -p1 %patch105 -p1 %patch106 -p1 -%patch108 -p1 %patch111 -p1 %patch112 -p1 -%patch113 -p1 %patch117 -p1 %patch118 -p1 %patch119 -p1 %patch120 -p1 -%patch122 -p1 %patch124 -p1 %patch125 -p1 %patch128 -p1 @@ -458,7 +432,6 @@ %patch141 -p1 %patch259 -p1 %patch142 -p1 -%patch145 -p1 %patch147 -p1 %patch148 -p1 %patch150 -p1 @@ -466,7 +439,6 @@ %patch153 -p1 %patch157 -p1 %patch158 -p1 -%patch159 -p1 %patch160 -p1 %patch161 -p1 %patch162 -p1 @@ -501,14 +473,11 @@ %patch231 -p1 %patch234 -p1 %patch235 -p1 -%patch236 -p1 %patch240 -p1 %patch241 -p1 %patch245 -p1 -%patch246 -p1 %patch247 -p1 %patch249 -p1 -%patch251 -p1 %patch254 -p1 %patch256 -p1 %patch258 -p1 @@ -521,7 +490,6 @@ %patch275 -p1 %patch276 -p1 %patch277 -p1 -%patch278 -p1 %patch280 -p1 %patch282 -p1 %patch283 -p1 @@ -533,17 +501,22 @@ %patch296 -p1 %patch298 -p1 %patch301 -p1 -%patch303 -p1 %patch304 -p1 +%patch305 -p1 +%patch306 -p1 + +find -name "*.orig" | xargs rm -f +! find -name "*.rej" # Should not happen. -# Change the version that gets printed at GDB startup, so it is RedHat +# Change the version that gets printed at GDB startup, so it is Fedora # specific. cat > gdb/version.in << _FOO -Red Hat Linux (%{version}-%{release}rh) +Fedora (%{version}-%{release}) _FOO # Remove the info and other generated files added by the FSF release # process. +rm -f libdecnumber/gstdint.h rm -f bfd/doc/*.info rm -f bfd/doc/*.info-* rm -f gdb/doc/*.info @@ -591,6 +564,7 @@ --disable-sim \ --disable-rpath \ --with-system-readline \ + --with-expat \ %ifarch ia64 --with-libunwind \ %else @@ -763,6 +737,14 @@ %{_mandir}/*/gdbserver.1* %changelog +* Mon Mar 3 2008 Jan Kratochvil - 6.7.50.20080227-1 +- Upgrade to the upstream gdb-6.8 prerelease. +- Cleanup the leftover `.orig' files during %%prep. +- Add expat-devel check by the configure script (for the other-arch builds). +- `--with testsuite' now also BuildRequires: fpc +- Backport fix of a segfault + PIE regression since 6.7.1 on PIE executables. +- Update the printed GDB version string to be Fedora specific. + * Sat Mar 1 2008 Jan Kratochvil - 6.7.1-16 - Run the full testsuite also in the `-fPIE -pie' mode. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 1 Nov 2007 22:28:37 -0000 1.23 +++ sources 3 Mar 2008 16:13:47 -0000 1.24 @@ -1 +1 @@ -30a6bf36eded4ae5a152d7d71b86dc14 gdb-6.7.1.tar.bz2 +79c01091740eda9b2ecf4981b603c477 gdb-6.7.50.20080227.tar.bz2 --- gdb-6.3-ia64-sigaltstack-20050711.patch DELETED --- --- gdb-6.3-ppc64section-20041026.patch DELETED --- --- gdb-6.3-test-pie-20050107.patch DELETED --- --- gdb-6.3-threaded-watchpoints-20041213.patch DELETED --- --- gdb-6.3-threaded-watchpoints2-20050225.patch DELETED --- --- gdb-6.5-bz237872-ppc-long-double.patch DELETED --- --- gdb-6.6-bz232371-selinux-thread-error.patch DELETED --- --- gdb-6.6-bz237096-watchthreads-testcasefix.patch DELETED --- --- gdb-6.6-cu-ranges.patch DELETED --- --- gdb-6.7-bz428882-ia64-fix.patch DELETED --- --- gdb-6.7.1-upstream.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 16:16:08 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 3 Mar 2008 16:16:08 GMT Subject: rpms/gmyth/devel gmyth.spec,1.5,1.6 COPYING.LGPL,1.1,NONE Message-ID: <200803031616.m23GG8TP023538@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gmyth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23499 Modified Files: gmyth.spec Removed Files: COPYING.LGPL Log Message: * Mon Mar 03 2008 - Bastien Nocera - 0.7.1-2 - Remove our own COPYING file, the upstream reports the right license now Index: gmyth.spec =================================================================== RCS file: /cvs/pkgs/rpms/gmyth/devel/gmyth.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gmyth.spec 3 Mar 2008 14:33:28 -0000 1.5 +++ gmyth.spec 3 Mar 2008 16:15:33 -0000 1.6 @@ -1,11 +1,10 @@ Summary: MythTV remote access libraries Name: gmyth Version: 0.7.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: COPYING.LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://gmyth.sf.net BuildRequires: mysql-devel curl-devel libxml2-devel glib2-devel @@ -26,10 +25,6 @@ %prep %setup -q -# Upstream used the default license from the autotools, all the -# files and the project page says LGPL, see: -# http://sourceforge.net/tracker/index.php?func=detail&aid=1790620&group_id=177106&atid=879914 -cp -a %{SOURCE1} . %build %configure @@ -51,7 +46,7 @@ %files %defattr(-, root, root) -%doc AUTHORS COPYING.LGPL +%doc AUTHORS COPYING %{_bindir}/* %{_libdir}/libgmyth.so.* @@ -62,6 +57,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 03 2008 - Bastien Nocera - 0.7.1-2 +- Remove our own COPYING file, the upstream reports the right + license now + * Mon Mar 03 2008 - Bastien Nocera - 0.7.1-1 - Update to 0.7.1 --- COPYING.LGPL DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 16:18:26 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Mon, 3 Mar 2008 16:18:26 GMT Subject: rpms/MAKEDEV/devel .cvsignore, 1.51, 1.52 MAKEDEV.spec, 1.59, 1.60 sources, 1.51, 1.52 makedev-3.23-compile-fix.patch, 1.1, NONE Message-ID: <200803031618.m23GIQl2023616@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/MAKEDEV/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23578 Modified Files: .cvsignore MAKEDEV.spec sources Removed Files: makedev-3.23-compile-fix.patch Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 20 Jun 2006 17:26:22 -0000 1.51 +++ .cvsignore 3 Mar 2008 16:17:51 -0000 1.52 @@ -1 +1,2 @@ MAKEDEV-3.23-1.tar.gz +MAKEDEV-3.23-4.tar.gz Index: MAKEDEV.spec =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/devel/MAKEDEV.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- MAKEDEV.spec 25 Feb 2008 18:46:11 -0000 1.59 +++ MAKEDEV.spec 3 Mar 2008 16:17:51 -0000 1.60 @@ -1,15 +1,17 @@ Name: MAKEDEV Version: 3.23 -Release: 3 +Release: 4 Group: System Environment/Base -License: GPL -Source: MAKEDEV-%{version}-1.tar.gz -Patch0: makedev-3.23-compile-fix.patch -Summary: A program used for creating device files in /dev. -BuildRoot: %{_tmppath}/%{name}-root -BuildPrereq: libselinux-devel +License: GPLv2 +# This is a Red Hat maintained package which is specific to +# our distribution. Thus the source is only available from +# within this srpm. +Source: MAKEDEV-%{version}-%{release}.tar.gz +Summary: A program used for creating device files in /dev +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libselinux-devel URL: http://www.lanana.org/docs/device-list/ -Prereq: /usr/sbin/groupadd, /usr/sbin/useradd, grep, mktemp +Requires(pre): shadow-utils %description This package contains the MAKEDEV program, which makes it easier to create @@ -23,7 +25,6 @@ %prep %setup -q -%patch0 -p1 %build make OPTFLAGS="$RPM_OPT_FLAGS" SELINUX=1 @@ -36,10 +37,11 @@ rm -fr $RPM_BUILD_ROOT %pre -# Add the floopy group and the vcsa user. -/usr/sbin/groupadd -g 19 -r -f floppy > /dev/null 2>/dev/null -/usr/sbin/useradd -c "virtual console memory owner" -u 69 \ - -s /sbin/nologin -r -d /dev vcsa 2> /dev/null +# Add the floppy group and the vcsa user. +getent group floppy >/dev/null || groupadd -g 19 -r floppy +getent passwd vcsa >/dev/null || \ +useradd -r -d /dev -s /sbin/nologin -u 69 \ + -c "virtual console memory owner" vcsa exit 0 %files @@ -48,9 +50,22 @@ %{_mandir}/man8/* %{_sbindir}/mksock /sbin/MAKEDEV -%config %{_sysconfdir}/makedev.d +%config(noreplace) %{_sysconfdir}/makedev.d %changelog +* Mon Mar 03 2008 Chris Lumens 3.23-4 +- Change license to GPLv2 only. +- minor cleanups for merge review (Todd Zullinger ): + - rpmlint warnings fixed: + - buildprereq and prereq use + - quoted macros in %%changelog + - summary-ended-with-dot + - create vcsa user and floppy group according to packaging guidelines + (Packaging/UsersAndGroups) + - note that we are upstream for MAKEDEV above the source tag + - bring BuildRoot tag in line with the packaging guidelines + - remove grep and mktemp from Require + * Mon Feb 25 2008 Jeremy Katz - 3.23-3 - Add fix to build with gcc 4.3 @@ -462,7 +477,7 @@ - generate device manifest with MAKEDEV -M to build as non-root. * Wed Jul 11 2001 Bill Nottingham -- add proper prereqs to dev package for %post (#48769) +- add proper prereqs to dev package for %%post (#48769) * Thu Jul 05 2001 Florian La Roche - disable unneeded parts of post for s390,s390x @@ -491,7 +506,7 @@ - add /dev/shm to fstab too * Thu Jun 22 2001 Nalin Dahyabhai -- own %{_sysconfdir}/makedev.d in addition to files it contains +- own %%{_sysconfdir}/makedev.d in addition to files it contains * Wed Jun 21 2001 Karsten Hopp - correct device naming and major/minor numbers on S390 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/MAKEDEV/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 20 Jun 2006 17:26:22 -0000 1.51 +++ sources 3 Mar 2008 16:17:51 -0000 1.52 @@ -1 +1 @@ -554faf6cbc9a84e4bd58ccfa32d74e2f MAKEDEV-3.23-1.tar.gz +362b9511f5bca9209cde450358384b1e MAKEDEV-3.23-4.tar.gz --- makedev-3.23-compile-fix.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 16:22:44 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Mon, 3 Mar 2008 16:22:44 GMT Subject: rpms/nfs-utils/devel nfs-utils-1.1.1-gssd-mcred.patch, NONE, 1.1 nfs-utils-1.1.1-idmapd-validasc.patch, NONE, 1.1 nfs-utils-1.1.1-mountd-exportlist.patch, NONE, 1.1 nfs-utils-1.1.1-nfsstat-cmdline.patch, NONE, 1.1 nfs-utils.spec, 1.165, 1.166 nfslock.init, 1.19, 1.20 Message-ID: <200803031622.m23GMi1C023818@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23732 Modified Files: nfs-utils.spec nfslock.init Added Files: nfs-utils-1.1.1-gssd-mcred.patch nfs-utils-1.1.1-idmapd-validasc.patch nfs-utils-1.1.1-mountd-exportlist.patch nfs-utils-1.1.1-nfsstat-cmdline.patch Log Message: - Stopped mountd from incorrectly logging an error (commit 9dd9b68c4c44f0d9102eb85ee2fa36a8b7f638e3) - Stop gssd from ignoring the machine credential caches (commit 46d439b17f22216ce8f9257a982c6ade5d1c5931) - Fixed typo in the nfsstat command line arugments. (commit acf95d32a44fd8357c24e8a04ec53fc6900bfc58) - Added test to stop buffer overflow in idmapd (commit bcd0fcaf0966c546da5043be700587f73174ae25) nfs-utils-1.1.1-gssd-mcred.patch: --- NEW FILE nfs-utils-1.1.1-gssd-mcred.patch --- commit 46d439b17f22216ce8f9257a982c6ade5d1c5931 Author: Vince Busam Date: Tue Feb 26 13:04:52 2008 -0500 Stop gssd from ignoring the machine credential cache defined by the -d flag Signed-off-by: Steve Dickson Signed-off-by: Kevin Coffman diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c index bf8690e..3cf27ca 100644 --- a/utils/gssd/krb5_util.c +++ b/utils/gssd/krb5_util.c @@ -404,7 +404,7 @@ gssd_get_single_krb5_cred(krb5_context context, cache_type = "FILE"; snprintf(cc_name, sizeof(cc_name), "%s:%s/%s%s_%s", cache_type, - GSSD_DEFAULT_CRED_DIR, GSSD_DEFAULT_CRED_PREFIX, + ccachedir, GSSD_DEFAULT_CRED_PREFIX, GSSD_DEFAULT_MACHINE_CRED_SUFFIX, ple->realm); ple->endtime = my_creds.times.endtime; if (ple->ccname != NULL) nfs-utils-1.1.1-idmapd-validasc.patch: --- NEW FILE nfs-utils-1.1.1-idmapd-validasc.patch --- commit bcd0fcaf0966c546da5043be700587f73174ae25 Author: NeilBrown Date: Tue Feb 26 13:57:39 2008 -0500 If validateascii is passed a string containing only non-zero 7bit values, then the loop with exit with i == len, and the following test will access beyond the end of the array. So add an extra test to fix this. Found by Marcus Meissner . Signed-off-by: NeilBrown Signed-off-by: Steve Dickson diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c index 355c6e1..6b5971c 100644 --- a/utils/idmapd/idmapd.c +++ b/utils/idmapd/idmapd.c @@ -848,7 +848,7 @@ validateascii(char *string, u_int32_t len) return (-1); } - if (string[i] != '\0') + if ((i >= len) || string[i] != '\0') return (-1); return (i + 1); nfs-utils-1.1.1-mountd-exportlist.patch: --- NEW FILE nfs-utils-1.1.1-mountd-exportlist.patch --- commit 9dd9b68c4c44f0d9102eb85ee2fa36a8b7f638e3 Author: Harshula Jayasuriya Date: Tue Feb 12 16:13:25 2008 -0500 In mountd, if get_exportlist() (utils/mountd/mountd.c) returns NULL it should not be considered a failure. It just means that there are no exports on the system. The practical problem with the current code is that a showmount -e results in a syslog message from mountd that looks like: rpc.mountd: export request from 10.250.100.2 failed. Reviewed-by: Greg Banks Signed-off-by: Harshula Jayasuriya Signed-off-by: Steve Dickson diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c index 4a50588..63d5ce1 100644 --- a/utils/mountd/mountd.c +++ b/utils/mountd/mountd.c @@ -203,9 +203,8 @@ mount_dump_1_svc(struct svc_req *rqstp, void *argp, mountlist *res) struct sockaddr_in *addr = (struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt); - if ((*res = mountlist_list()) == NULL) - xlog(L_WARNING, "dump request from %s failed.", - inet_ntoa(addr->sin_addr)); + xlog(D_CALL, "dump request from %s.", inet_ntoa(addr->sin_addr)); + *res = mountlist_list(); return 1; } @@ -254,9 +253,8 @@ mount_export_1_svc(struct svc_req *rqstp, void *argp, exports *resp) struct sockaddr_in *addr = (struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt); - if ((*resp = get_exportlist()) == NULL) - xlog(L_WARNING, "export request from %s failed.", - inet_ntoa(addr->sin_addr)); + xlog(D_CALL, "export request from %s.", inet_ntoa(addr->sin_addr)); + *resp = get_exportlist(); return 1; } @@ -267,9 +265,9 @@ mount_exportall_1_svc(struct svc_req *rqstp, void *argp, exports *resp) struct sockaddr_in *addr = (struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt); - if ((*resp = get_exportlist()) == NULL) - xlog(L_WARNING, "exportall request from %s failed.", - inet_ntoa(addr->sin_addr)); + xlog(D_CALL, "exportall request from %s.", inet_ntoa(addr->sin_addr)); + *resp = get_exportlist(); + return 1; } nfs-utils-1.1.1-nfsstat-cmdline.patch: --- NEW FILE nfs-utils-1.1.1-nfsstat-cmdline.patch --- commit acf95d32a44fd8357c24e8a04ec53fc6900bfc58 Author: Peng Haitao Date: Tue Feb 26 13:52:18 2008 -0500 Fixed typo in the nfsstat command line arugments. Signed-off-by: Steve Dickson diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c index 828119b..ed8cfc8 100644 --- a/utils/nfsstat/nfsstat.c +++ b/utils/nfsstat/nfsstat.c @@ -237,7 +237,7 @@ static struct option longopts[] = { "all", 0, 0, 'v' }, { "auto", 0, 0, '\3' }, { "client", 0, 0, 'c' }, - { "mounts", 0, 0, 'm' }, + { "mounted", 0, 0, 'm' }, { "nfs", 0, 0, 'n' }, { "rpc", 0, 0, 'r' }, { "server", 0, 0, 's' }, Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- nfs-utils.spec 9 Feb 2008 15:02:57 -0000 1.165 +++ nfs-utils.spec 3 Mar 2008 16:22:08 -0000 1.166 @@ -2,7 +2,7 @@ Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 # group all 32bit related archs @@ -45,6 +45,10 @@ Patch105: nfs-utils-1.1.1-mountd-crossmnt.patch Patch106: nfs-utils-1.1.1-mount-relatime.patch Patch107: nfs-utils-1.1.1-mountd-crossmnt-cleanup.patch +Patch108: nfs-utils-1.1.1-mountd-exportlist.patch +Patch109: nfs-utils-1.1.1-gssd-mcred.patch +Patch110: nfs-utils-1.1.1-nfsstat-cmdline.patch +Patch111: nfs-utils-1.1.1-idmapd-validasc.patch Group: System Environment/Daemons Provides: exportfs = %{epoch}:%{version}-%{release} @@ -114,6 +118,10 @@ %patch105 -p1 %patch106 -p1 %patch107 -p1 +%patch108 -p1 +%patch109 -p1 +%patch110 -p1 +%patch111 -p1 # Remove .orig files find . -name "*.orig" | xargs rm -f @@ -277,6 +285,16 @@ %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Mon Mar 3 2008 Steve Dickson 1.1.1-5 +- Stopped mountd from incorrectly logging an error + (commit 9dd9b68c4c44f0d9102eb85ee2fa36a8b7f638e3) +- Stop gssd from ignoring the machine credential caches + (commit 46d439b17f22216ce8f9257a982c6ade5d1c5931) +- Fixed typo in the nfsstat command line arugments. + (commit acf95d32a44fd8357c24e8a04ec53fc6900bfc58) +- Added test to stop buffer overflow in idmapd + (commit bcd0fcaf0966c546da5043be700587f73174ae25) + * Sat Feb 9 2008 Steve Dickson 1.1.1-4 - Cleaned up some typos that were found in the various places in the mountd code Index: nfslock.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfslock.init,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- nfslock.init 5 Jan 2008 14:27:40 -0000 1.19 +++ nfslock.init 3 Mar 2008 16:22:08 -0000 1.20 @@ -53,11 +53,12 @@ start() { if [ ! -f /var/lock/subsys/nfslock ]; then + + # Make sure locks are recovered + rm -f /var/run/sm-notify.pid + # Start daemons. if [ "$USERLAND_LOCKD" ]; then - # Make sure locks are recovered - rm -f /var/run/sm-notify.pid - echo -n $"Starting NFS locking: " daemon rpc.lockd echo From fedora-extras-commits at redhat.com Mon Mar 3 16:22:54 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 3 Mar 2008 16:22:54 GMT Subject: rpms/wpa_supplicant/F-8 wpa_supplicant-0.5.10-dbus-service-file.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 wpa_supplicant.spec, 1.43, 1.44 fi.epitest.hostap.WPASupplicant.service, 1.1, NONE wpa_supplicant-0.5.7-always-scan.patch, 1.1, NONE wpa_supplicant-0.5.7-dbus-blobs.patch, 1.4, NONE wpa_supplicant-0.5.7-dbus-iface-segfault-fix.patch, 1.1, NONE wpa_supplicant-0.5.7-dbus-permissions-fix.patch, 1.1, NONE wpa_supplicant-0.5.7-debug-file.patch, 1.1, NONE wpa_supplicant-0.5.7-fix-dynamic-wep-with-mac80211.patch, 1.1, NONE wpa_supplicant-0.5.7-fix-signal-leaks.patch, 1.1, NONE wpa_supplicant-0.5.7-ignore-dup-ca-cert-addition.patch, 1.2, NONE wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch, 1.1, NONE wpa_supplicant-0.5.9-adhoc-frequency.patch, 1.1, NONE wpa_supplicant-driver-wext-debug.patch, 1.2, NONE wpa_supplicant-wep-key-fix.patch, 1.1, NONE Message-ID: <200803031622.m23GMsTQ023855@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/wpa_supplicant/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738 Modified Files: .cvsignore sources wpa_supplicant.spec Added Files: wpa_supplicant-0.5.10-dbus-service-file.patch Removed Files: fi.epitest.hostap.WPASupplicant.service wpa_supplicant-0.5.7-always-scan.patch wpa_supplicant-0.5.7-dbus-blobs.patch wpa_supplicant-0.5.7-dbus-iface-segfault-fix.patch wpa_supplicant-0.5.7-dbus-permissions-fix.patch wpa_supplicant-0.5.7-debug-file.patch wpa_supplicant-0.5.7-fix-dynamic-wep-with-mac80211.patch wpa_supplicant-0.5.7-fix-signal-leaks.patch wpa_supplicant-0.5.7-ignore-dup-ca-cert-addition.patch wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch wpa_supplicant-0.5.9-adhoc-frequency.patch wpa_supplicant-driver-wext-debug.patch wpa_supplicant-wep-key-fix.patch Log Message: * Sun Mar 2 2008 Dan Williams - 0.5.10-1 - Update to latest stable release; remove upstreamed patches wpa_supplicant-0.5.10-dbus-service-file.patch: --- NEW FILE wpa_supplicant-0.5.10-dbus-service-file.patch --- diff -up wpa_supplicant-0.5.10/dbus-wpa_supplicant.service.fedora wpa_supplicant-0.5.10/dbus-wpa_supplicant.service --- wpa_supplicant-0.5.10/dbus-wpa_supplicant.service.fedora 2008-03-02 20:58:35.000000000 -0500 +++ wpa_supplicant-0.5.10/dbus-wpa_supplicant.service 2008-03-02 20:58:41.000000000 -0500 @@ -1,4 +1,4 @@ [D-BUS Service] Name=fi.epitest.hostap.WPASupplicant -Exec=/sbin/wpa_supplicant -u +Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f /var/log/wpa_supplicant.log User=root Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 15 Mar 2007 18:48:00 -0000 1.7 +++ .cvsignore 3 Mar 2008 16:22:12 -0000 1.8 @@ -5,3 +5,4 @@ madwifi-headers-r1475.tar.bz2 wpa_supplicant-0.4.9.tar.gz wpa_supplicant-0.5.7.tar.gz +wpa_supplicant-0.5.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 15 Mar 2007 18:48:00 -0000 1.7 +++ sources 3 Mar 2008 16:22:12 -0000 1.8 @@ -1,2 +1,2 @@ b82289b140cc1c66db11564bde248d8a madwifi-headers-r1475.tar.bz2 -bd2436392ad3c6d2513da701a12f2d27 wpa_supplicant-0.5.7.tar.gz +9e7b99da67c47d81121368c6d580d069 wpa_supplicant-0.5.10.tar.gz Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- wpa_supplicant.spec 25 Dec 2007 23:43:25 -0000 1.43 +++ wpa_supplicant.spec 3 Mar 2008 16:22:12 -0000 1.44 @@ -1,8 +1,8 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant Name: wpa_supplicant Epoch: 1 -Version: 0.5.7 -Release: 21%{?dist} +Version: 0.5.10 +Release: 1%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -11,33 +11,16 @@ Source3: %{name}.init.d Source4: %{name}.sysconfig Source5: madwifi-headers-r1475.tar.bz2 -Source6: fi.epitest.hostap.WPASupplicant.service -Source7: %{name}.logrotate +Source6: %{name}.logrotate + Patch0: wpa_supplicant-assoc-timeout.patch -Patch1: wpa_supplicant-driver-wext-debug.patch -Patch2: wpa_supplicant-wep-key-fix.patch -# http://hostap.epitest.fi/bugz/show_bug.cgi?id=192 -# Upstream -Patch3: wpa_supplicant-fix-deprecated-dbus-function.patch -# Upstream -Patch4: wpa_supplicant-0.5.7-debug-file.patch -Patch5: wpa_supplicant-0.5.7-qmake-location.patch -# Upstream -Patch6: wpa_supplicant-0.5.7-flush-debug-output.patch -# Rejected by upstream -Patch7: wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch -Patch8: wpa_supplicant-0.5.7-always-scan.patch -# Upstream -Patch9: wpa_supplicant-0.5.7-dbus-iface-segfault-fix.patch -Patch10: wpa_supplicant-0.5.7-dbus-blobs.patch -Patch11: wpa_supplicant-0.5.7-dbus-permissions-fix.patch -Patch12: wpa_supplicant-0.5.7-ignore-dup-ca-cert-addition.patch -# Upstream -Patch13: wpa_supplicant-0.5.7-fix-dynamic-wep-with-mac80211.patch -Patch14: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch -# Upstream -Patch15: wpa_supplicant-0.5.7-fix-signal-leaks.patch -Patch16: wpa_supplicant-0.5.9-adhoc-frequency.patch +# Upstream in 0.6.x +Patch1: wpa_supplicant-fix-deprecated-dbus-function.patch +Patch2: wpa_supplicant-0.5.7-qmake-location.patch +Patch3: wpa_supplicant-0.5.7-flush-debug-output.patch +Patch4: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch +Patch5: wpa_supplicant-0.5.10-dbus-service-file.patch + URL: http://w1.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,22 +48,11 @@ %prep %setup -q %patch0 -p1 -b .assoc-timeout -%patch1 -p1 -b .driver-wext-debug -%patch2 -p1 -b .wep-key-fix -%patch3 -p0 -b .fix-deprecated-dbus-functions -%patch4 -p1 -b .debug-file -%patch5 -p1 -b .qmake-location -%patch6 -p1 -b .flush-debug-output -%patch7 -p1 -b .sigusr1-changes-debuglevel -%patch8 -p1 -b .always-scan -%patch9 -p1 -b .dbus-iface-segfault-fix -%patch10 -p2 -b .dbus-blobs -%patch11 -p1 -b .dbus-permissions-fix -%patch12 -p1 -b .ignore-dup-ca-cert-addition -%patch13 -p1 -b .fix-dynamic-wep-with-mac80211 -%patch14 -p1 -b .use-IW_ENCODE_TEMP -%patch15 -p1 -b .signal-leak-fixes -%patch16 -p2 -b .adhoc-freq +%patch1 -p0 -b .fix-deprecated-dbus-functions +%patch2 -p1 -b .qmake-location +%patch3 -p1 -b .flush-debug-output +%patch4 -p1 -b .use-IW_ENCODE_TEMP +%patch5 -p1 -b .dbus-service-file %build cp %{SOURCE1} ./.config @@ -99,7 +71,7 @@ install -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/rc.d/init.d/%{name} install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/%{name} install -d %{buildroot}/%{_sysconfdir}/logrotate.d -install -m 0644 %{SOURCE7} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} +install -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} # config install -d %{buildroot}/%{_sysconfdir}/%{name} @@ -113,7 +85,7 @@ install -d %{buildroot}/%{_sysconfdir}/dbus-1/system.d/ install -m 0644 dbus-wpa_supplicant.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf install -d %{buildroot}/%{_datadir}/dbus-1/system-services/ -install -m 0644 %{SOURCE6} %{buildroot}/%{_datadir}/dbus-1/system-services +install -m 0644 dbus-wpa_supplicant.service %{buildroot}/%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service # gui install -d %{buildroot}/%{_bindir} @@ -169,6 +141,9 @@ %{_bindir}/wpa_gui %changelog +* Sun Mar 2 2008 Dan Williams - 0.5.10-1 +- Update to latest stable release; remove upstreamed patches + * Tue Dec 25 2007 Dan Williams - 0.5.7-21 - Backport 'frequency' option for Ad-Hoc network configs --- fi.epitest.hostap.WPASupplicant.service DELETED --- --- wpa_supplicant-0.5.7-always-scan.patch DELETED --- --- wpa_supplicant-0.5.7-dbus-blobs.patch DELETED --- --- wpa_supplicant-0.5.7-dbus-iface-segfault-fix.patch DELETED --- --- wpa_supplicant-0.5.7-dbus-permissions-fix.patch DELETED --- --- wpa_supplicant-0.5.7-debug-file.patch DELETED --- --- wpa_supplicant-0.5.7-fix-dynamic-wep-with-mac80211.patch DELETED --- --- wpa_supplicant-0.5.7-fix-signal-leaks.patch DELETED --- --- wpa_supplicant-0.5.7-ignore-dup-ca-cert-addition.patch DELETED --- --- wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch DELETED --- --- wpa_supplicant-0.5.9-adhoc-frequency.patch DELETED --- --- wpa_supplicant-driver-wext-debug.patch DELETED --- --- wpa_supplicant-wep-key-fix.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 16:24:43 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Mon, 3 Mar 2008 16:24:43 GMT Subject: rpms/python-docutils/devel python-docutils.spec,1.11,1.12 Message-ID: <200803031624.m23GOh5G023944@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-docutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23908 Modified Files: python-docutils.spec Log Message: * Mon Mar 3 2008 Toshio Kuratomi 0.4-8 - Use regular Requires syntax for python-imaging as missingok is just wrong. Index: python-docutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-docutils/devel/python-docutils.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- python-docutils.spec 27 Sep 2007 21:50:06 -0000 1.11 +++ python-docutils.spec 3 Mar 2008 16:23:52 -0000 1.12 @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A system for processing plaintext documentation Group: Development/Languages @@ -23,7 +23,7 @@ BuildRequires: python-setuptools %endif -Requires(missingok): python-imaging +Requires: python-imaging Provides: docutils = %{version}-%{release} Obsoletes: docutils < %{version}-%{release} @@ -85,6 +85,9 @@ %{python_sitelib}/*egg-info/ %changelog +* Mon Mar 3 2008 Toshio Kuratomi 0.4-8 +- Use regular Requires syntax for python-imaging as missingok is just wrong. + * Thu Sep 27 2007 Toshio Kuratomi 0.4-7 - Build egg info. From fedora-extras-commits at redhat.com Mon Mar 3 16:30:21 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Mon, 3 Mar 2008 16:30:21 GMT Subject: rpms/gnome-panel/devel gnome-panel-2.21.92-allow-spurious-view-done-signals.patch, NONE, 1.1 Message-ID: <200803031630.m23GULs8024195@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24186 Added Files: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch Log Message: actually add patch gnome-panel-2.21.92-allow-spurious-view-done-signals.patch: --- NEW FILE gnome-panel-2.21.92-allow-spurious-view-done-signals.patch --- diff -up gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals gnome-panel-2.21.92/applets/clock/calendar-client.c --- gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals 2008-02-26 08:17:49.000000000 -0500 +++ gnome-panel-2.21.92/applets/clock/calendar-client.c 2008-03-03 10:22:57.000000000 -0500 @@ -1217,6 +1217,13 @@ calendar_client_handle_query_completed ( { CalendarClientQuery *query; + if (!source->query_in_progress) + { + g_warning ("Got spurious 'view-done' signal from calendar backend for query %p\n", + &source->completed_query); + return; + } + query = goddamn_this_is_crack (source, view, NULL); dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message (status)); From fedora-extras-commits at redhat.com Mon Mar 3 16:31:08 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Mon, 3 Mar 2008 16:31:08 GMT Subject: rpms/gnome-panel/F-8 gnome-panel-2.21.92-allow-spurious-view-done-signals.patch, NONE, 1.1 Message-ID: <200803031631.m23GV8DD024328@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gnome-panel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24298 Added Files: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch Log Message: actually add patch gnome-panel-2.21.92-allow-spurious-view-done-signals.patch: --- NEW FILE gnome-panel-2.21.92-allow-spurious-view-done-signals.patch --- diff -up gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals gnome-panel-2.21.92/applets/clock/calendar-client.c --- gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals 2008-02-26 08:17:49.000000000 -0500 +++ gnome-panel-2.21.92/applets/clock/calendar-client.c 2008-03-03 10:22:57.000000000 -0500 @@ -1217,6 +1217,13 @@ calendar_client_handle_query_completed ( { CalendarClientQuery *query; + if (!source->query_in_progress) + { + g_warning ("Got spurious 'view-done' signal from calendar backend for query %p\n", + &source->completed_query); + return; + } + query = goddamn_this_is_crack (source, view, NULL); dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message (status)); From fedora-extras-commits at redhat.com Mon Mar 3 16:35:32 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 16:35:32 GMT Subject: rpms/kdebase/F-8 kdebase-3.5-khotkeys-crash.patch, 1.1, 1.2 kdebase.spec, 1.290, 1.291 Message-ID: <200803031635.m23GZWPn024491@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24446 Modified Files: kdebase-3.5-khotkeys-crash.patch kdebase.spec Log Message: apply upstream patch to fix crash in khotkey kdebase-3.5-khotkeys-crash.patch: Index: kdebase-3.5-khotkeys-crash.patch =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-8/kdebase-3.5-khotkeys-crash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdebase-3.5-khotkeys-crash.patch 3 Mar 2008 13:50:55 -0000 1.1 +++ kdebase-3.5-khotkeys-crash.patch 3 Mar 2008 16:35:24 -0000 1.2 @@ -19,3 +19,15 @@ void Condition_list_widget::modify_pressed() { +Index: khotkeys/kcontrol/actions_listview_widget.cpp +=================================================================== +--- khotkeys/kcontrol/actions_listview_widget.cpp (Revision 781557) ++++ khotkeys/kcontrol/actions_listview_widget.cpp (Revision 781558) +@@ -110,6 +110,7 @@ + // if( nw == NULL ) + // nw = current_action()->itemBelow(); + delete saved_current_item; ++ saved_current_item = NULL; + recent_item = NULL; + // if( nw != NULL ) + // { Index: kdebase.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase/F-8/kdebase.spec,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- kdebase.spec 3 Mar 2008 13:50:55 -0000 1.290 +++ kdebase.spec 3 Mar 2008 16:35:24 -0000 1.291 @@ -12,7 +12,7 @@ %define _with_samba --with-samba Version: 3.5.9 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdebase3 @@ -795,9 +795,11 @@ %changelog +* Mon Mar 03 2008 Than Ngo 3.5.9-4 +- apply upstream patch to fix crash in khotkey + * Thu Feb 28 2008 Than Ngo 3.5.9-3 - apply upstream patch to unbreak lmsensors support again -- apply upstream patch to fix crash in khotkey * Wed Feb 27 2008 Rex Dieter - 3.5.9-2 - f9+: don't omit all of khelpcenter, some is needed for kde3 apps' help From fedora-extras-commits at redhat.com Mon Mar 3 16:36:54 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Mon, 3 Mar 2008 16:36:54 GMT Subject: rpms/tftp/devel tftp.spec,1.42,1.43 Message-ID: <200803031636.m23GasFg024588@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/tftp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24555 Modified Files: tftp.spec Log Message: * Mon Mar 03 2008 Martin Nagy - 0.48-2 - changed description (#234099) Index: tftp.spec =================================================================== RCS file: /cvs/extras/rpms/tftp/devel/tftp.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- tftp.spec 11 Feb 2008 12:06:30 -0000 1.42 +++ tftp.spec 3 Mar 2008 16:36:10 -0000 1.43 @@ -3,7 +3,7 @@ Summary: The client for the Trivial File Transfer Protocol (TFTP) Name: tftp Version: %{tftp_hpa_version} -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Internet Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz @@ -36,7 +36,7 @@ server for TFTP, which allows users to transfer files to and from a remote machine. TFTP provides very little security, and should not be enabled unless it is expressly needed. The TFTP server is run from -%{_sysconfdir}/xinetd.d/tftp, and is disabled by default on Red Hat Linux systems. +%{_sysconfdir}/xinetd.d/tftp, and is disabled by default. %prep %setup -q -n tftp-hpa-%{version} @@ -88,6 +88,9 @@ %{_mandir}/man8/* %changelog +* Mon Mar 03 2008 Martin Nagy - 0.48-2 +- changed description (#234099) + * Mon Feb 11 2008 Martin Nagy - 0.48-2 - rebuild for gcc-4.3 From fedora-extras-commits at redhat.com Mon Mar 3 16:41:41 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 3 Mar 2008 16:41:41 GMT Subject: rpms/texlive-texmf-errata/devel texlive-texmf-errata.spec,1.5,1.6 Message-ID: <200803031641.m23GffmF024757@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/texlive-texmf-errata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24717 Modified Files: texlive-texmf-errata.spec Log Message: * Mon Mar 03 2008 Jindrich Novy - 2007-4 - add texlive-texmf-errata-xetex Index: texlive-texmf-errata.spec =================================================================== RCS file: /cvs/extras/rpms/texlive-texmf-errata/devel/texlive-texmf-errata.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- texlive-texmf-errata.spec 29 Feb 2008 11:42:51 -0000 1.5 +++ texlive-texmf-errata.spec 3 Mar 2008 16:40:54 -0000 1.6 @@ -3,7 +3,7 @@ Name: texlive-texmf-errata Version: 2007 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Errata for texlive-texmf Group: Applications/Publishing License: Artistic 2.0 and GPLv2 and GPLv2+ and LGPLv2+ and LPPL and MIT and Public Domain and UCD and Utopia @@ -75,6 +75,14 @@ This package is where errata to the texlive-texmf-context package will appear, when needed. +%package xetex +Group: Applications/Publishing +Summary: Errata for texlive-texmf-xetex + +%description xetex +This package is where errata to the texlive-texmf-xetex package will appear, +when needed. + %prep @@ -174,7 +182,13 @@ %files context %defattr(-,root,root,-) +%files xetex +%defattr(-,root,root,-) + %changelog +* Mon Mar 03 2008 Jindrich Novy - 2007-4 +- add texlive-texmf-errata-xetex + * Thu Feb 28 2008 Jindrich Novy - 2007-3 - rename japanese to east-asian - fix description, obsolete old japanese package From fedora-extras-commits at redhat.com Mon Mar 3 16:45:41 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 3 Mar 2008 16:45:41 GMT Subject: rpms/texlive-texmf/devel sources, 1.3, 1.4 texlive-texmf.spec, 1.18, 1.19 texlive.2007.zip.list, 1.2, 1.3 Message-ID: <200803031645.m23GjfHT024912@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/texlive-texmf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24841 Modified Files: sources texlive-texmf.spec texlive.2007.zip.list Log Message: * Mon Mar 03 2008 Jindrich Novy - 2007-16 - update texlive package list to ship complete upstream XeTeX TeXLive distribution - introduce new texlive-texmf-xetex subpackage - move context bits to its subpackage, add missing styles from upstream collection-context Index: sources =================================================================== RCS file: /cvs/extras/rpms/texlive-texmf/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2008 15:48:44 -0000 1.3 +++ sources 3 Mar 2008 16:45:06 -0000 1.4 @@ -2,4 +2,4 @@ c24f99d1fd399acecc2f3070c23f43f1 platex209.tar.bz2 9eb48ecb66cfd626865222564545de1c ptex-texmf-2.5.tar.gz 97c26c0067177fb633616f8611561bc7 texlive.texmf-var-2007.zip -8b55aac6ced3c248d17ab588ac3f276d texlive.texmf-2007.tar.lzma +64d27853026b019f14b8b277864e999d texlive.texmf-2007.tar.lzma Index: texlive-texmf.spec =================================================================== RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive-texmf.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- texlive-texmf.spec 1 Mar 2008 12:54:44 -0000 1.18 +++ texlive-texmf.spec 3 Mar 2008 16:45:06 -0000 1.19 @@ -12,7 +12,7 @@ Name: texlive-texmf Version: 2007 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Architecture independent parts of the TeX formatting system Group: Applications/Publishing @@ -62,10 +62,12 @@ BuildRequires: sed >= 3.95 ghostscript lzma Requires: texlive-texmf-errata = %{version} +%if !%{f8_packaging} Requires: tex-preview +%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch Obsoletes: tetex-eurofont Obsoletes: tetex-lineno = 4.41 @@ -79,7 +81,7 @@ %package afm Group: Applications/Publishing Summary: Texmf files needed for texlive-afm -Requires: texlive-texmf-errata-afm = %{version} +Requires: texlive-texmf-errata-afm = %{version} %description afm This package contains the components of the TEXMF tree needed for the @@ -129,6 +131,16 @@ This package contains the components of the TEXMF tree needed for the texlive-latex package. +%package xetex +Group: Applications/Publishing +Summary: Texmf files needed for texlive-xetex +Requires: texlive-texmf = %{version}-%{release} +Requires: texlive-texmf-errata-xetex = %{version} + +%description xetex +This package contains the components of the TEXMF tree needed for the +texlive-xetex package. + %package east-asian Group: Applications/Publishing Summary: Texmf files needed for texlive-east-asian @@ -151,7 +163,7 @@ %prep %setup -q -c -T -unlzma -c %{SOURCE0} | tar fx - +lzma -dc %{SOURCE0} | tar x mkdir texmf-var unzip -d texmf-var %{SOURCE1} @@ -439,6 +451,9 @@ %post latex [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : +%post xetex +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : + %post doc [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : @@ -469,6 +484,9 @@ %postun latex [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : +%postun xetex +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : + %postun doc [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : @@ -482,16 +500,28 @@ %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/rpm/macros.texlive %doc texlive.%{version}.zip.list -%{_texmf_main}/bibtex/ +%{_texmf_main}/bibtex/bib/ +%{_texmf_main}/bibtex/csf/ +%{_texmf_main}/bibtex/bst/[a-b]*/ +%{_texmf_main}/bibtex/bst/camel/ +%{_texmf_main}/bibtex/bst/[d-x]*/ %dir %{_texmf_main}/dvipdfm/ %dir %{_texmf_main}/dvipdfm/config/ %{_texmf_main}/dvipdfm/config/config %dir %{_texmf_main}/fmtutil/ %{_texmf_main}/makeindex/ %{_texmf_main}/metafont/ -%{_texmf_main}/metapost/ +%{_texmf_main}/metapost/base/ +%{_texmf_main}/metapost/config/ +%{_texmf_main}/metapost/mfpic/ +%{_texmf_main}/metapost/misc/ +%{_texmf_main}/metapost/mpattern/ +%{_texmf_main}/metapost/support/ %{_texmf_main}/omega/ -%{_texmf_main}/scripts/ +%{_texmf_main}/scripts/hyphen/ +%{_texmf_main}/scripts/oberdiek/ +%{_texmf_main}/scripts/pkfix/ +%{_texmf_main}/scripts/ps2eps/ %{_texmf_main}/texconfig/ %dir %{_texmf_main}/tex %{_texmf_main}/tex/amstex/ @@ -520,21 +550,43 @@ # will result in a couple files being owned by texmf and texmf-fonts # texmf/tex/generic/babel/{frenchb.cfg,hyphen.cfg} # Not really worth worrying about. -%{_texmf_main}/tex/generic/ +%{_texmf_main}/tex/generic/b*/ +%{_texmf_main}/tex/generic/config/ +%{_texmf_main}/tex/generic/[d-h]*/ +%{_texmf_main}/tex/generic/[m-o]*/ +%{_texmf_main}/tex/generic/p[a-f]*/ +%{_texmf_main}/tex/generic/pgf/basiclayer/ +%{_texmf_main}/tex/generic/pgf/frontendlayer/ +%{_texmf_main}/tex/generic/pgf/libraries/ +%{_texmf_main}/tex/generic/pgf/systemlayer/ +%{_texmf_main}/tex/generic/pgf/utilities/*.tex +%{_texmf_main}/tex/generic/pgf/utilities/pgfutil-latex.def +%{_texmf_main}/tex/generic/pgf/utilities/pgfutil-plain.def +%{_texmf_main}/tex/generic/p[i-x]*/ +%{_texmf_main}/tex/generic/[q-w]*/ +%{_texmf_main}/tex/generic/xu-hyphen/ +%{_texmf_main}/tex/generic/xypic/ # configs %dir %{_texmf_main}/web2c %{_texmf_main}/web2c/*.tcx -%{_texmf_main}/web2c/*.cnf +%{_texmf_main}/web2c/fmtutil.cnf +%{_texmf_main}/web2c/mktex.cnf +%{_texmf_main}/web2c/texmf.cnf %{_texmf_main}/web2c/*.cfg %config(noreplace) %{_texmf_conf}/web2c/*.cnf -%{_texmf_main}/web2c/*.pool +%{_texmf_main}/web2c/aleph.pool +%{_texmf_main}/web2c/mf.pool +%{_texmf_main}/web2c/omega.pool +%{_texmf_main}/web2c/pdftex.pool +%{_texmf_main}/web2c/tex.pool # var %if %{f8_packaging} %dir %{_texmf_var}/xdvi %config(noreplace) %{_texmf_var}/xdvi/XDvi %endif %config(noreplace) %{_texmf_var}/web2c/mktex.cnf -%{_texmf_var}/tex/ +%{_texmf_var}/tex/generic/ +%{_texmf_var}/tex/plain/ %dir %{_texmf_var}/fonts %dir %{_texmf_var}/fonts/map %dir %{_texmf_var}/fonts/map/dvipdfm @@ -599,6 +651,16 @@ %{_texmf_main}/context/data/scite-ctx.properties %{_texmf_main}/context/data/scite-ctx.readme %{_texmf_main}/tex/context/ +%{_texmf_main}/scripts/context/ +%{_texmf_var}/tex/context/ +%{_texmf_main}/web2c/context.cnf +%{_texmf_main}/metapost/context/ +%{_texmf_main}/tex/generic/context/ +%{_texmf_main}/bibtex/bst/context/ +%{_texmf_main}/tex/generic/pgf/utilities/pgfutil-context.def +%{_texmf_main}/fonts/enc/dvips/context/ +%{_texmf_main}/fonts/map/pdftex/context/ +%{_texmf_main}/fonts/map/dvipdfm/context/ %files afm %defattr(-,root,root,-) @@ -608,7 +670,11 @@ %defattr(-,root,root,-) %{_texmf_main}/dvips/ %{_texmf_var}/dvips/ -%{_texmf_main}/fonts/enc/dvips/ +%{_texmf_main}/fonts/enc/dvips/[a-b]*/ +%{_texmf_main}/fonts/enc/dvips/cb/ +%{_texmf_main}/fonts/enc/dvips/cc-pl/ +%{_texmf_main}/fonts/enc/dvips/cs/ +%{_texmf_main}/fonts/enc/dvips/[d-z]*/ %{_texmf_main}/fonts/map/dvips/ %files fonts @@ -638,21 +704,39 @@ %{_texmf_main}/tex/lambda/base/omarab.cfg %{_texmf_main}/tex/lambda/base/omlgc.cfg %{_texmf_main}/fonts/enc/pdftex/ -%{_texmf_main}/fonts/map/pdftex/ -%{_texmf_main}/fonts/map/dvipdfm/ +%{_texmf_main}/fonts/map/pdftex/updmap/ +%{_texmf_main}/fonts/map/pdftex/vntex/ +%{_texmf_main}/fonts/map/dvipdfm/dvipdfmx/ +%{_texmf_main}/fonts/map/dvipdfm/tetex/ +%{_texmf_main}/fonts/map/dvipdfm/updmap/ %files latex %defattr(-,root,root,-) %{_texmf_main}/tex/cslatex/ %{_texmf_main}/tex/latex/ %{_texmf_main}/tex/platex/ + +%files xetex +%defattr(-,root,root,-) %{_texmf_main}/tex/xelatex/ +%{_texmf_main}/fonts/misc/xetex/ +%{_texmf_main}/scripts/xetex/ +%{_texmf_main}/web2c/xetex.pool +%{_texmf_main}/tex/generic/ifxetex/ +%{_texmf_main}/tex/generic/xetexconfig/ %files doc %defattr(-,root,root,-) %doc %{_texmf_main}/doc/ %changelog +* Mon Mar 03 2008 Jindrich Novy - 2007-16 +- update texlive package list to ship complete upstream XeTeX + TeXLive distribution +- introduce new texlive-texmf-xetex subpackage +- move context bits to its subpackage, add missing styles from + upstream collection-context + * Sat Mar 01 2008 Jindrich Novy - 2007-15 - require texlive-texmf in texlive-texmf-fonts (#431255) - add missing post/postun scriptlets for texlive-texmf-latex Index: texlive.2007.zip.list =================================================================== RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive.2007.zip.list,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- texlive.2007.zip.list 19 Feb 2008 15:48:44 -0000 1.2 +++ texlive.2007.zip.list 3 Mar 2008 16:45:06 -0000 1.3 @@ -11,6 +11,7 @@ amscls.zip amsfonts.zip amsmath.zip +amsrefs.zip amstex.zip ams.zip antp.zip @@ -23,6 +24,7 @@ atqolive.zip avantgar.zip babel.zip +babelbib.zip barcode2.zip bbm.zip bbold.zip @@ -80,6 +82,7 @@ charter.zip chemcono.zip cite.zip +citeref.zip clarendo.zip clefval.zip cmap.zip @@ -101,6 +104,7 @@ cslatex.zip csplain.zip cs.zip +ctable.zip currvita.zip curves.zip custom-bib.zip @@ -133,6 +137,7 @@ eskd.zip eso-pic.zip etex.zip +euenc.zip eulervm.zip euler.zip eurosym.zip @@ -144,6 +149,7 @@ facsimile.zip fancyhdr.zip fancynum.zip +fancyref.zip fancyvrb.zip FAQ-en.zip fax.zip @@ -153,6 +159,7 @@ float.zip fontinst.zip fontname.zip +fontspec.zip footbib.zip footmisc.zip footnpag.zip @@ -209,6 +216,7 @@ hyphen-ukenglish.zip hyphen-usorbian.zip hyphen-welsh.zip +ifxetex.zip impatient-fr.zip impatient.zip index.zip @@ -236,6 +244,7 @@ lineno.zip listings.zip lm.zip +lmextra.zip localloc.zip logpap.zip lshort-russian.zip @@ -304,6 +313,7 @@ pdftricks.zip pecha.zip pgf.zip +philokalia.zip picinpar.zip pict2e.zip pictex.zip @@ -314,6 +324,7 @@ plnfss.zip pl.zip polyglot.zip +powerdot.zip prelim2e.zip preprint.zip preview.zip @@ -352,6 +363,7 @@ qobitree.zip qpxqtx.zip ragged2e.zip +rcs.zip revtex.zip rotating.zip rotfloat.zip @@ -406,6 +418,7 @@ txfonts.zip type1cm.zip typedref.zip +ucs.zip ukrhyph.zip umlaute.zip uml.zip @@ -426,11 +439,14 @@ wrapfig.zip xbmc.zip xcolor.zip +xetex.zip xetexconfig.zip xetexurl.zip xkeyval.zip +xltxtra.zip xtab.zip xu-hyphen.zip +xunicode.zip xypic.zip yfonts.zip zapfchan.zip From fedora-extras-commits at redhat.com Mon Mar 3 16:47:08 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Mon, 3 Mar 2008 16:47:08 GMT Subject: rpms/xterm/devel .cvsignore, 1.27, 1.28 sources, 1.27, 1.28 xterm.spec, 1.65, 1.66 Message-ID: <200803031647.m23Gl8sR025016@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/xterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24966 Modified Files: .cvsignore sources xterm.spec Log Message: - update to 234 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 27 Feb 2008 11:28:00 -0000 1.27 +++ .cvsignore 3 Mar 2008 16:46:30 -0000 1.28 @@ -1,2 +1,2 @@ 16colors.txt -xterm-233.tgz +xterm-234.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 27 Feb 2008 11:28:00 -0000 1.27 +++ sources 3 Mar 2008 16:46:30 -0000 1.28 @@ -1,2 +1,2 @@ 6093439b8d79089f4ff1cdfed358b401 16colors.txt -6a51209459b85c84d51b77356e33e139 xterm-233.tgz +8091157c4a62f282f879339d1e5dc219 xterm-234.tgz Index: xterm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- xterm.spec 27 Feb 2008 11:28:00 -0000 1.65 +++ xterm.spec 3 Mar 2008 16:46:30 -0000 1.66 @@ -1,6 +1,6 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 233 +Version: 234 Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT @@ -81,6 +81,9 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Mon Mar 03 2008 Miroslav Lichvar 234-1 +- update to 234 + * Wed Feb 27 2008 Miroslav Lichvar 233-1 - update to 233 From fedora-extras-commits at redhat.com Mon Mar 3 16:47:36 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 3 Mar 2008 16:47:36 GMT Subject: rpms/texlive/devel texlive.spec,1.29,1.30 Message-ID: <200803031647.m23GlaIW025058@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/texlive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24996 Modified Files: texlive.spec Log Message: * Mon Mar 03 2008 Jindrich Novy - 2007-22 - specify required version more properly for subpackages - move xelatex to texlive-xetex Index: texlive.spec =================================================================== RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- texlive.spec 1 Mar 2008 13:31:41 -0000 1.29 +++ texlive.spec 3 Mar 2008 16:46:59 -0000 1.30 @@ -27,7 +27,7 @@ Name: texlive Version: %{texlive_ver} -Release: 21%{?dist} +Release: 22%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -228,6 +228,7 @@ Summary: TeX typesetting engine using Unicode with OpenType or AAT support Group: Applications/Publishing Requires: texlive = %{version}-%{release} +Requires: texlive-texmf-xetex = %{version} Requires: dvipdfmx %description xetex @@ -1007,6 +1008,7 @@ %files xetex %defattr(-,root,root,-) %{_bindir}/xetex +%{_bindir}/xelatex %files afm %defattr(-,root,root,-) @@ -1085,7 +1087,6 @@ %defattr(-,root,root,-) %{_bindir}/latex %{_bindir}/pdflatex -%{_bindir}/xelatex %{_bindir}/platex %{_bindir}/pslatex %{_mandir}/man1/latex.1* @@ -1225,6 +1226,10 @@ %{_mandir}/man1/texutil.1* %changelog +* Mon Mar 03 2008 Jindrich Novy - 2007-22 +- specify required version more properly for subpackages +- move xelatex to texlive-xetex + * Sat Mar 01 2008 Jindrich Novy - 2007-21 - require texlive-utils in texlive-latex From fedora-extras-commits at redhat.com Mon Mar 3 16:50:12 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Mon, 3 Mar 2008 16:50:12 GMT Subject: rpms/xterm/F-8 .cvsignore, 1.26, 1.27 sources, 1.26, 1.27 xterm.spec, 1.64, 1.65 Message-ID: <200803031650.m23GoC5a025198@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/xterm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25164 Modified Files: .cvsignore sources xterm.spec Log Message: - update to 234 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-8/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 29 Feb 2008 11:59:08 -0000 1.26 +++ .cvsignore 3 Mar 2008 16:49:38 -0000 1.27 @@ -1,2 +1,2 @@ 16colors.txt -xterm-233.tgz +xterm-234.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-8/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Feb 2008 11:59:08 -0000 1.26 +++ sources 3 Mar 2008 16:49:38 -0000 1.27 @@ -1,2 +1,2 @@ 6093439b8d79089f4ff1cdfed358b401 16colors.txt -6a51209459b85c84d51b77356e33e139 xterm-233.tgz +8091157c4a62f282f879339d1e5dc219 xterm-234.tgz Index: xterm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-8/xterm.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- xterm.spec 29 Feb 2008 11:59:08 -0000 1.64 +++ xterm.spec 3 Mar 2008 16:49:38 -0000 1.65 @@ -1,6 +1,6 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 233 +Version: 234 Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT @@ -81,6 +81,9 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Mon Mar 03 2008 Miroslav Lichvar 234-1 +- update to 234 + * Wed Feb 27 2008 Miroslav Lichvar 233-1 - update to 233 From fedora-extras-commits at redhat.com Mon Mar 3 16:51:03 2008 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 3 Mar 2008 16:51:03 GMT Subject: rpms/seq24/devel seq24-gcc43.patch,1.1,1.2 seq24.spec,1.6,1.7 Message-ID: <200803031651.m23Gp3Wu025272@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/seq24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25246 Modified Files: seq24-gcc43.patch seq24.spec Log Message: More gcc 4.3 fixes seq24-gcc43.patch: Index: seq24-gcc43.patch =================================================================== RCS file: /cvs/extras/rpms/seq24/devel/seq24-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- seq24-gcc43.patch 28 Feb 2008 13:34:49 -0000 1.1 +++ seq24-gcc43.patch 3 Mar 2008 16:50:57 -0000 1.2 @@ -1,11 +1,263 @@ ---- src/event.cpp~ 2006-06-01 23:20:20.000000000 -0400 -+++ src/event.cpp 2008-02-28 08:21:16.000000000 -0500 -@@ -19,6 +19,8 @@ +--- src/font_w.xpm-dist 2007-10-22 15:52:50.000000000 +0200 ++++ src/font_w.xpm 2007-10-22 15:53:09.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * font_w_xpm[] = { ++static const char * font_w_xpm[] = { + "145 209 2 1", + " c #000000", + ". c #FFFFFF", +--- src/zoom.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/zoom.xpm 2007-10-22 15:56:20.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * zoom_xpm[] = { ++static const char * zoom_xpm[] = { + "16 14 10 1", + " c None", + ". c #000000", +--- src/play2.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/play2.xpm 2007-10-22 15:55:30.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * play2_xpm[] = { ++static const char * play2_xpm[] = { + "16 11 5 1", + " c None", + ". c #000000", +--- src/length.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/length.xpm 2007-10-22 15:54:52.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * length_xpm[] = { ++static const char * length_xpm[] = { + "36 11 2 1", + " c None", + ". c #000000", +--- src/undo.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/undo.xpm 2007-10-22 15:56:16.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * undo_xpm[] = { ++static const char * undo_xpm[] = { + "16 14 3 1", + " c None", + ". c #000000", +--- src/copy.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/copy.xpm 2007-10-22 15:54:32.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * copy_xpm[] = { ++static const char * copy_xpm[] = { + "33 11 4 1", + " c None", + ". c #000000", +--- src/event.cpp-dist 2007-10-22 15:46:20.000000000 +0200 ++++ src/event.cpp 2007-10-22 15:47:03.000000000 +0200 +@@ -18,6 +18,7 @@ + // //----------------------------------------------------------------------------- #include "event.h" - +#include -+ + event::event() { - m_timestamp = 0; +--- src/midi.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/midi.xpm 2007-10-22 15:55:12.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * midi_xpm[] = { ++static const char * midi_xpm[] = { + "14 14 4 1", + " c None", + ". c #000000", +--- src/stop.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/stop.xpm 2007-10-22 15:56:03.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * stop_xpm[] = { ++static const char * stop_xpm[] = { + "15 11 5 1", + " c None", + ". c #000000", +--- src/menu_empty.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/menu_empty.xpm 2007-10-22 15:55:02.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * menu_empty_xpm[] = { ++static const char * menu_empty_xpm[] = { + "10 10 2 1", + " c None", + ". c #000000", +--- src/note_length.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/note_length.xpm 2007-10-22 15:55:17.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * note_length_xpm[] = { ++static const char * note_length_xpm[] = { + "29 12 2 1", + " c None", + ". c #000000", +--- src/expand.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/expand.xpm 2007-10-22 15:54:42.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * expand_xpm[] = { ++static const char * expand_xpm[] = { + "33 11 4 1", + " c None", + ". c #000000", +--- src/rec.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/rec.xpm 2007-10-22 15:55:38.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * rec_xpm[] = { ++static const char * rec_xpm[] = { + "36 14 10 1", + " c None", + ". c #000000", +--- src/collapse.xpm-dist 2007-10-22 15:54:15.000000000 +0200 ++++ src/collapse.xpm 2007-10-22 15:54:19.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * collapse_xpm[] = { ++static const char * collapse_xpm[] = { + "27 11 3 1", + " c None", + ". c #000000", +--- src/tools.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/tools.xpm 2007-10-22 15:56:12.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * tools_xpm[] = { ++static const char * tools_xpm[] = { + "13 14 5 1", + " c None", + ". c #000000", +--- src/seq24.xpm-dist 2007-10-22 15:53:53.000000000 +0200 ++++ src/seq24.xpm 2007-10-22 15:53:58.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * seq24_xpm[] = { ++static const char * seq24_xpm[] = { + "124 32 3 1", + " c None", + ". c None", +--- src/loop.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/loop.xpm 2007-10-22 15:54:58.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * loop_xpm[] = { ++static const char * loop_xpm[] = { + "33 12 3 1", + " c None", + ". c #000000", +--- src/scale.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/scale.xpm 2007-10-22 15:55:43.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * scale_xpm[] = { ++static const char * scale_xpm[] = { + "30 14 2 1", + " c None", + ". c #000000", +--- src/key.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/key.xpm 2007-10-22 15:54:48.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * key_xpm[] = { ++static const char * key_xpm[] = { + "13 14 3 1", + " c None", + ". c #000000", +--- src/font.cpp-dist 2007-10-22 15:52:30.000000000 +0200 ++++ src/font.cpp 2007-10-22 15:52:43.000000000 +0200 +@@ -25,6 +25,7 @@ + #include "font_b.xpm" + + #include ++#include + + font::font( ) + { +--- src/down.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/down.xpm 2007-10-22 15:54:36.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * down_xpm[] = { ++static const char * down_xpm[] = { + "7 14 2 1", + " c None", + ". c #000000", +--- src/snap.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/snap.xpm 2007-10-22 15:55:59.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * snap_xpm[] = { ++static const char * snap_xpm[] = { + "29 12 5 1", + " c None", + ". c #000000", +--- src/font_b.xpm-dist 2007-10-22 15:52:48.000000000 +0200 ++++ src/font_b.xpm 2007-10-22 15:53:04.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * font_b_xpm[] = { ++static const char * font_b_xpm[] = { + "145 209 3 1", + " c None", + ". c #000000", +--- src/bus.xpm-dist 2007-10-22 15:54:08.000000000 +0200 ++++ src/bus.xpm 2007-10-22 15:54:12.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * bus_xpm[] = { ++static const char * bus_xpm[] = { + "36 14 4 1", + " c None", + ". c #000000", +--- src/perfedit.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/perfedit.xpm 2007-10-22 15:55:25.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * perfedit_xpm[] = { ++static const char * perfedit_xpm[] = { + "23 14 11 1", + " c None", + ". c #000000", +--- src/thru.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/thru.xpm 2007-10-22 15:56:08.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * thru_xpm[] = { ++static const char * thru_xpm[] = { + "62 14 10 1", + " c None", + ". c #000000", +--- src/play.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/play.xpm 2007-10-22 15:55:34.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * play_xpm[] = { ++static const char * play_xpm[] = { + "36 14 10 1", + " c None", + ". c #000000", +--- src/sequences.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/sequences.xpm 2007-10-22 15:55:55.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * sequences_xpm[] = { ++static const char * sequences_xpm[] = { + "30 14 3 1", + " c None", + ". c #000000", +--- src/menu_full.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/menu_full.xpm 2007-10-22 15:55:07.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * menu_full_xpm[] = { ++static const char * menu_full_xpm[] = { + "10 10 2 1", + " c None", + ". c #000000", Index: seq24.spec =================================================================== RCS file: /cvs/extras/rpms/seq24/devel/seq24.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- seq24.spec 28 Feb 2008 13:37:14 -0000 1.6 +++ seq24.spec 3 Mar 2008 16:50:57 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Real-time midi sequencer Name: seq24 Version: 0.8.7 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.filter24.org/seq24/ @@ -67,6 +67,9 @@ %{_datadir}/icons/hicolor/64x64/apps/seq24.png %changelog +* Mon Mar 03 2008 Anthony Green 0.8.7-11 +- Update gcc 4.3 patch. + * Thu Feb 28 2008 Anthony Green 0.8.7-10 - Update for gcc 4.3. From fedora-extras-commits at redhat.com Mon Mar 3 16:52:23 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Mon, 3 Mar 2008 16:52:23 GMT Subject: rpms/xterm/F-7 .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 xterm.spec, 1.61, 1.62 Message-ID: <200803031652.m23GqNAs025401@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/xterm/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25359 Modified Files: .cvsignore sources xterm.spec Log Message: - update to 234 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-7/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 29 Feb 2008 11:56:21 -0000 1.24 +++ .cvsignore 3 Mar 2008 16:51:38 -0000 1.25 @@ -1,2 +1,2 @@ 16colors.txt -xterm-233.tgz +xterm-234.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-7/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 29 Feb 2008 11:56:21 -0000 1.24 +++ sources 3 Mar 2008 16:51:38 -0000 1.25 @@ -1,2 +1,2 @@ 6093439b8d79089f4ff1cdfed358b401 16colors.txt -6a51209459b85c84d51b77356e33e139 xterm-233.tgz +8091157c4a62f282f879339d1e5dc219 xterm-234.tgz Index: xterm.spec =================================================================== RCS file: /cvs/pkgs/rpms/xterm/F-7/xterm.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- xterm.spec 29 Feb 2008 11:56:21 -0000 1.61 +++ xterm.spec 3 Mar 2008 16:51:38 -0000 1.62 @@ -1,6 +1,6 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 233 +Version: 234 Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT @@ -81,6 +81,9 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Mon Mar 03 2008 Miroslav Lichvar 234-1 +- update to 234 + * Wed Feb 27 2008 Miroslav Lichvar 233-1 - update to 233 From fedora-extras-commits at redhat.com Mon Mar 3 16:56:01 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Mon, 3 Mar 2008 16:56:01 GMT Subject: rpms/libvirt/devel libvirt-0.4.1-qemud1.patch, NONE, 1.1 libvirt-0.4.1-qemud2.patch, NONE, 1.1 libvirt.spec, 1.75, 1.76 Message-ID: <200803031656.m23Gu1uw025554@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25499 Modified Files: libvirt.spec Added Files: libvirt-0.4.1-qemud1.patch libvirt-0.4.1-qemud2.patch Log Message: 2 bugs found just after the release, Daniel libvirt-0.4.1-qemud1.patch: --- NEW FILE libvirt-0.4.1-qemud1.patch --- Avoid segfault upon early libvirtd failure. * qemud/qemud.c (main): Don't call qemudCleanup on an uninitialized pointer. By the way, even though this evoked a warning from gcc, "make distcheck" passes. Obviously, that means the distcheck rule is inadequate. I'll fix it so that it turns on -Werror for the final build. Signed-off-by: Jim Meyering --- qemud/qemud.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 96fdf32..b6b82ed 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2025,7 +2025,7 @@ libvirt management daemon:\n\ #define MAX_LISTEN 5 int main(int argc, char **argv) { - struct qemud_server *server; + struct qemud_server *server = NULL; struct sigaction sig_action; int sigpipe[2]; const char *pid_file = NULL; @@ -2180,7 +2180,8 @@ int main(int argc, char **argv) { unlink (pid_file); error1: - qemudCleanup(server); + if (server) + qemudCleanup(server); return ret; } libvirt-0.4.1-qemud2.patch: --- NEW FILE libvirt-0.4.1-qemud2.patch --- Don't use first byte of string as a pointer. * src/qemu_conf.c (qemudReportError): Use the pointer, errorMessage, not its first byte, errorMessage[0]. Signed-off-by: Jim Meyering --- src/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index eead0bc..e54da5b 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -68,7 +68,7 @@ void qemudReportError(virConnectPtr conn, errorMessage[0] = '\0'; } - virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage[0] : NULL)); + virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL)); __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); } Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- libvirt.spec 3 Mar 2008 16:03:24 -0000 1.75 +++ libvirt.spec 3 Mar 2008 16:55:24 -0000 1.76 @@ -21,10 +21,12 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.4.1 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz +Patch0: libvirt-0.4.1-qemud1.patch +Patch1: libvirt-0.4.1-qemud2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -136,6 +138,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build # Xen is available only on i386 x86_64 ia64 @@ -276,6 +280,9 @@ %doc docs/examples/python %changelog +* Mon Mar 3 2008 Daniel Veillard - 0.4.1-2.fc9 +- 2 patches found just after the release + * Mon Mar 3 2008 Daniel Veillard - 0.4.1-1.fc9 - Release of 0.4.1 - Storage APIs From fedora-extras-commits at redhat.com Mon Mar 3 17:15:38 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Mon, 3 Mar 2008 17:15:38 GMT Subject: rpms/system-config-printer/devel system-config-printer-0.7.82.1.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.160, 1.161 sources, 1.165, 1.166 system-config-printer.spec, 1.170, 1.171 system-config-printer-0.7.82.tar.bz2.sig, 1.1, NONE Message-ID: <200803031715.m23HFc6I000513@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv486 Modified Files: .cvsignore sources system-config-printer.spec Added Files: system-config-printer-0.7.82.1.tar.bz2.sig Removed Files: system-config-printer-0.7.82.tar.bz2.sig Log Message: - 0.7.82.1: - More trouble-shooting improvements. - applet: notify user about failed jobs (bug #168370). --- NEW FILE system-config-printer-0.7.82.1.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- .cvsignore 19 Feb 2008 17:28:41 -0000 1.160 +++ .cvsignore 3 Mar 2008 17:15:00 -0000 1.161 @@ -156,3 +156,4 @@ system-config-printer-0.7.81.tar.bz2 pycups-1.9.35.tar.bz2 system-config-printer-0.7.82.tar.bz2 +system-config-printer-0.7.82.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- sources 19 Feb 2008 17:28:41 -0000 1.165 +++ sources 3 Mar 2008 17:15:00 -0000 1.166 @@ -1,2 +1,2 @@ aeebcfee89f1f2d23ab4ec9e94f773fc pycups-1.9.35.tar.bz2 -a85efc175c58506239f3613baf992fca system-config-printer-0.7.82.tar.bz2 +e67b3580834d807cdb4e03a46317dcdb system-config-printer-0.7.82.1.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- system-config-printer.spec 3 Mar 2008 13:40:45 -0000 1.170 +++ system-config-printer.spec 3 Mar 2008 17:15:00 -0000 1.171 @@ -4,7 +4,7 @@ Summary: A printer administration tool Name: system-config-printer -Version: 0.7.82 +Version: 0.7.82.1 Release: 1%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ @@ -131,8 +131,11 @@ exit 0 %changelog -* Mon Mar 3 2008 Tim Waugh +* Mon Mar 3 2008 Tim Waugh 0.7.82.1-1 - Requires /usr/bin/system-install-packages not pirut (bug #435622). +- 0.7.82.1: + - More trouble-shooting improvements. + - applet: notify user about failed jobs (bug #168370). * Tue Feb 19 2008 Tim Waugh 0.7.82-1 - Updated to pycups-1.9.35. --- system-config-printer-0.7.82.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 17:20:50 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 3 Mar 2008 17:20:50 GMT Subject: rpms/wpa_supplicant/devel wpa_supplicant-0.5.10-dbus-service-file.patch, NONE, 1.1 wpa_supplicant-0.6.3-wpa-gui-fixes.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 wpa_supplicant-0.5.7-flush-debug-output.patch, 1.1, 1.2 wpa_supplicant-0.5.7-qmake-location.patch, 1.1, 1.2 wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch, 1.1, 1.2 wpa_supplicant-assoc-timeout.patch, 1.1, 1.2 wpa_supplicant.spec, 1.41, 1.42 fi.epitest.hostap.WPASupplicant.service, 1.1, NONE wpa_supplicant-0.5.7-always-scan.patch, 1.1, NONE wpa_supplicant-0.5.7-dbus-blobs.patch, 1.2, NONE wpa_supplicant-0.5.7-dbus-iface-segfault-fix.patch, 1.1, NONE wpa_supplicant-0.5.7-dbus-permissions-fix.patch, 1.1, NONE wpa_supplicant-0.5.7-debug-file.patch, 1.1, NONE wpa_supplicant-0.5.7-fix-dynamic-wep-with-mac80211.patch, 1.1, NONE wpa_supplicant-0.5.7-fix-signal-leaks.patch, 1.1, NONE wpa_supplicant-0.5.7-ignore-dup-ca-cert-addition.patch, 1.1, NONE wpa_supplicant-0.5.7-include-stdlib.h, 1.2, NONE wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch, 1.1, NONE wpa_supplicant-0.5.9-adhoc-frequency.patch, 1.1, NONE wpa_supplicant-driver-wext-debug.patch, 1.2, NONE wpa_supplicant-fix-deprecated-dbus-function.patch, 1.1, NONE wpa_supplicant-wep-key-fix.patch, 1.1, NONE Message-ID: <200803031720.m23HKo7r000964@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/wpa_supplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv838 Modified Files: .cvsignore sources wpa_supplicant-0.5.7-flush-debug-output.patch wpa_supplicant-0.5.7-qmake-location.patch wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch wpa_supplicant-assoc-timeout.patch wpa_supplicant.spec Added Files: wpa_supplicant-0.5.10-dbus-service-file.patch wpa_supplicant-0.6.3-wpa-gui-fixes.patch Removed Files: fi.epitest.hostap.WPASupplicant.service wpa_supplicant-0.5.7-always-scan.patch wpa_supplicant-0.5.7-dbus-blobs.patch wpa_supplicant-0.5.7-dbus-iface-segfault-fix.patch wpa_supplicant-0.5.7-dbus-permissions-fix.patch wpa_supplicant-0.5.7-debug-file.patch wpa_supplicant-0.5.7-fix-dynamic-wep-with-mac80211.patch wpa_supplicant-0.5.7-fix-signal-leaks.patch wpa_supplicant-0.5.7-ignore-dup-ca-cert-addition.patch wpa_supplicant-0.5.7-include-stdlib.h wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch wpa_supplicant-0.5.9-adhoc-frequency.patch wpa_supplicant-driver-wext-debug.patch wpa_supplicant-fix-deprecated-dbus-function.patch wpa_supplicant-wep-key-fix.patch Log Message: * Mon Mar 3 2008 Dan Williams - 1:0.6.3-1 - Update to latest development release; remove upstreamed patches wpa_supplicant-0.5.10-dbus-service-file.patch: --- NEW FILE wpa_supplicant-0.5.10-dbus-service-file.patch --- diff -up wpa_supplicant-0.6.3/wpa_supplicant/dbus-wpa_supplicant.service.fedora wpa_supplicant-0.6.3/wpa_supplicant/dbus-wpa_supplicant.service --- wpa_supplicant-0.6.3/wpa_supplicant/dbus-wpa_supplicant.service.fedora 2008-03-02 20:58:35.000000000 -0500 +++ wpa_supplicant-0.6.3/wpa_supplicant/dbus-wpa_supplicant.service 2008-03-02 20:58:41.000000000 -0500 @@ -1,4 +1,4 @@ [D-BUS Service] Name=fi.epitest.hostap.WPASupplicant -Exec=/sbin/wpa_supplicant -u +Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f /var/log/wpa_supplicant.log User=root wpa_supplicant-0.6.3-wpa-gui-fixes.patch: --- NEW FILE wpa_supplicant-0.6.3-wpa-gui-fixes.patch --- diff -up wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/networkconfig.ui.h.atoi wpa_supplicant-0.5.7/wpa_gui/networkconfig.ui.h --- wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/networkconfig.ui.h.atoi 2006-12-09 19:38:48.000000000 -0500 +++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/networkconfig.ui.h 2008-02-22 11:51:28.000000000 -0500 @@ -10,6 +10,7 @@ ** destructor. *****************************************************************************/ +#include enum { AUTH_NONE = 0, diff -up wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/wpagui.ui.h.atoi wpa_supplicant-0.5.7/wpa_gui/wpagui.ui.h --- wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/wpagui.ui.h.atoi 2008-02-22 14:39:19.000000000 -0500 +++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/wpagui.ui.h 2008-02-22 14:39:31.000000000 -0500 @@ -16,6 +16,7 @@ #include #endif +#include void WpaGui::init() { diff -up wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/userdatarequest.ui.h.atoi wpa_supplicant-0.5.7/wpa_gui/userdatarequest.ui.h --- wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/userdatarequest.ui.h.atoi 2008-02-22 14:38:32.000000000 -0500 +++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/userdatarequest.ui.h 2008-02-22 14:38:56.000000000 -0500 @@ -10,6 +10,8 @@ ** destructor. *****************************************************************************/ +#include + int UserDataRequest::setParams(WpaGui *_wpagui, const char *reqMsg) { char *tmp, *pos, *pos2; diff -up wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/wpamsg.h.fix wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/wpamsg.h --- wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/wpamsg.h.fix 2008-03-03 11:58:18.000000000 -0500 +++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_gui/wpamsg.h 2008-03-03 11:58:33.000000000 -0500 @@ -14,6 +14,7 @@ typedef QValueList WpaMsgList; class WpaMsg { public: + WpaMsg() {} WpaMsg(const QString &_msg, int _priority = 2) : msg(_msg), priority(_priority) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 15 Mar 2007 18:48:00 -0000 1.7 +++ .cvsignore 3 Mar 2008 17:20:11 -0000 1.8 @@ -5,3 +5,4 @@ madwifi-headers-r1475.tar.bz2 wpa_supplicant-0.4.9.tar.gz wpa_supplicant-0.5.7.tar.gz +wpa_supplicant-0.6.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 15 Mar 2007 18:48:00 -0000 1.7 +++ sources 3 Mar 2008 17:20:11 -0000 1.8 @@ -1,2 +1,2 @@ b82289b140cc1c66db11564bde248d8a madwifi-headers-r1475.tar.bz2 -bd2436392ad3c6d2513da701a12f2d27 wpa_supplicant-0.5.7.tar.gz +b51b2975f21006f85f7297f3fb1acde1 wpa_supplicant-0.6.3.tar.gz wpa_supplicant-0.5.7-flush-debug-output.patch: Index: wpa_supplicant-0.5.7-flush-debug-output.patch =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant-0.5.7-flush-debug-output.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wpa_supplicant-0.5.7-flush-debug-output.patch 17 Aug 2007 21:29:43 -0000 1.1 +++ wpa_supplicant-0.5.7-flush-debug-output.patch 3 Mar 2008 17:20:11 -0000 1.2 @@ -1,5 +1,5 @@ ---- wpa_supplicant-0.5.7/common.c.flush-debug 2007-07-30 23:15:34.000000000 -0400 -+++ wpa_supplicant-0.5.7/common.c 2007-07-30 23:17:06.000000000 -0400 +--- wpa_supplicant-0.6.3/src/utils/wpa_debug.c.flush-debug 2007-07-30 23:15:34.000000000 -0400 ++++ wpa_supplicant-0.6.3/src/utils/wpa_debug.c 2007-07-30 23:17:06.000000000 -0400 @@ -157,6 +157,7 @@ void wpa_debug_print_timestamp(void) if (out_file) { fprintf(out_file, "%ld.%06u: ", (long) tv.sec, wpa_supplicant-0.5.7-qmake-location.patch: Index: wpa_supplicant-0.5.7-qmake-location.patch =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant-0.5.7-qmake-location.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wpa_supplicant-0.5.7-qmake-location.patch 17 Aug 2007 21:29:43 -0000 1.1 +++ wpa_supplicant-0.5.7-qmake-location.patch 3 Mar 2008 17:20:11 -0000 1.2 @@ -1,5 +1,5 @@ ---- wpa_supplicant-0.5.7/Makefile.qmake 2007-07-30 22:17:29.000000000 -0400 -+++ wpa_supplicant-0.5.7/Makefile 2007-07-30 22:17:46.000000000 -0400 +--- wpa_supplicant-0.6.3/wpa_supplicant/Makefile.qmake 2007-07-30 22:17:29.000000000 -0400 ++++ wpa_supplicant-0.6.3/wpa_supplicant/Makefile 2007-07-30 22:17:46.000000000 -0400 @@ -818,7 +818,7 @@ windows-bin: $(WINALL) $(STRIP) $(WINALL) wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch: Index: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch 13 Nov 2007 21:19:45 -0000 1.1 +++ wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch 3 Mar 2008 17:20:11 -0000 1.2 @@ -1,7 +1,7 @@ -Index: wpa_supplicant-0.4.8/driver_wext.c +Index: wpa_supplicant-0.6.3/src/drivers/driver_wext.c =================================================================== ---- wpa_supplicant-0.4.8.orig/driver_wext.c 2006-07-13 11:23:05.000000000 +0200 -+++ wpa_supplicant-0.4.8/driver_wext.c 2006-07-13 11:23:57.000000000 +0200 +--- wpa_supplicant-0.6.3/src/drivers/driver_wext.c.orig 2006-07-13 11:23:05.000000000 +0200 ++++ wpa_supplicant-0.6.3/src/drivers/driver_wext.c 2006-07-13 11:23:57.000000000 +0200 @@ -1280,6 +1280,7 @@ static int wpa_driver_wext_set_key_ext(v memset(&iwr, 0, sizeof(iwr)); strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ); wpa_supplicant-assoc-timeout.patch: Index: wpa_supplicant-assoc-timeout.patch =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant-assoc-timeout.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wpa_supplicant-assoc-timeout.patch 4 Mar 2006 07:24:18 -0000 1.1 +++ wpa_supplicant-assoc-timeout.patch 3 Mar 2008 17:20:11 -0000 1.2 @@ -1,5 +1,5 @@ ---- wpa_supplicant-0.4.8/wpa_supplicant.c.timeout 2006-03-03 22:26:13.000000000 -0500 -+++ wpa_supplicant-0.4.8/wpa_supplicant.c 2006-03-03 22:26:45.000000000 -0500 +--- wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c.timeout 2006-03-03 22:26:13.000000000 -0500 ++++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c 2006-03-03 22:26:45.000000000 -0500 @@ -1252,9 +1252,9 @@ /* Timeout for IEEE 802.11 authentication and association */ int timeout; Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- wpa_supplicant.spec 22 Feb 2008 19:45:26 -0000 1.41 +++ wpa_supplicant.spec 3 Mar 2008 17:20:11 -0000 1.42 @@ -1,8 +1,8 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant Name: wpa_supplicant Epoch: 1 -Version: 0.5.7 -Release: 23%{?dist} +Version: 0.6.3 +Release: 1%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -11,34 +11,15 @@ Source3: %{name}.init.d Source4: %{name}.sysconfig Source5: madwifi-headers-r1475.tar.bz2 -Source6: fi.epitest.hostap.WPASupplicant.service -Source7: %{name}.logrotate +Source6: %{name}.logrotate + Patch0: wpa_supplicant-assoc-timeout.patch -Patch1: wpa_supplicant-driver-wext-debug.patch -Patch2: wpa_supplicant-wep-key-fix.patch -# http://hostap.epitest.fi/bugz/show_bug.cgi?id=192 -# Upstream -Patch3: wpa_supplicant-fix-deprecated-dbus-function.patch -# Upstream -Patch4: wpa_supplicant-0.5.7-debug-file.patch -Patch5: wpa_supplicant-0.5.7-qmake-location.patch -# Upstream -Patch6: wpa_supplicant-0.5.7-flush-debug-output.patch -# Rejected by upstream -Patch7: wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch -Patch8: wpa_supplicant-0.5.7-always-scan.patch -# Upstream -Patch9: wpa_supplicant-0.5.7-dbus-iface-segfault-fix.patch -Patch10: wpa_supplicant-0.5.7-dbus-blobs.patch -Patch11: wpa_supplicant-0.5.7-dbus-permissions-fix.patch -Patch12: wpa_supplicant-0.5.7-ignore-dup-ca-cert-addition.patch -# Upstream -Patch13: wpa_supplicant-0.5.7-fix-dynamic-wep-with-mac80211.patch -Patch14: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch -# Upstream -Patch15: wpa_supplicant-0.5.7-fix-signal-leaks.patch -Patch16: wpa_supplicant-0.5.9-adhoc-frequency.patch -Patch17: wpa_supplicant-0.5.7-include-stdlib.h +Patch1: wpa_supplicant-0.6.3-wpa-gui-fixes.patch +Patch2: wpa_supplicant-0.5.7-qmake-location.patch +Patch3: wpa_supplicant-0.5.7-flush-debug-output.patch +Patch4: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch +Patch5: wpa_supplicant-0.5.10-dbus-service-file.patch + URL: http://w1.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,31 +47,24 @@ %prep %setup -q %patch0 -p1 -b .assoc-timeout -%patch1 -p1 -b .driver-wext-debug -%patch2 -p1 -b .wep-key-fix -%patch3 -p0 -b .fix-deprecated-dbus-functions -%patch4 -p1 -b .debug-file -%patch5 -p1 -b .qmake-location -%patch6 -p1 -b .flush-debug-output -%patch7 -p1 -b .sigusr1-changes-debuglevel -%patch8 -p1 -b .always-scan -%patch9 -p1 -b .dbus-iface-segfault-fix -%patch10 -p2 -b .dbus-blobs -%patch11 -p1 -b .dbus-permissions-fix -%patch12 -p1 -b .ignore-dup-ca-cert-addition -%patch13 -p1 -b .fix-dynamic-wep-with-mac80211 -%patch14 -p1 -b .use-IW_ENCODE_TEMP -%patch15 -p1 -b .signal-leak-fixes -%patch16 -p2 -b .adhoc-freq -%patch17 -p1 -b .stdlib +%patch1 -p1 -b .wpa-gui-fixes +%patch2 -p1 -b .qmake-location +%patch3 -p1 -b .flush-debug-output +%patch4 -p1 -b .use-IW_ENCODE_TEMP +%patch5 -p1 -b .dbus-service-file %build -cp %{SOURCE1} ./.config -tar -xjf %{SOURCE5} -CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; -CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; -make %{_smp_mflags} -QTDIR=%{_libdir}/qt-3.3 make wpa_gui %{_smp_mflags} +pushd src + tar -xjf %{SOURCE5} +popd + +pushd wpa_supplicant + cp %{SOURCE1} ./.config + CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; + CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; + make %{_smp_mflags} + QTDIR=%{_libdir}/qt-3.3 make wpa_gui %{_smp_mflags} +popd %install rm -rf %{buildroot} @@ -101,7 +75,7 @@ install -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/rc.d/init.d/%{name} install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/%{name} install -d %{buildroot}/%{_sysconfdir}/logrotate.d -install -m 0644 %{SOURCE7} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} +install -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} # config install -d %{buildroot}/%{_sysconfdir}/%{name} @@ -109,29 +83,29 @@ # binary install -d %{buildroot}/%{_sbindir} -install -m 0755 wpa_passphrase %{buildroot}/%{_sbindir} -install -m 0755 wpa_cli %{buildroot}/%{_sbindir} -install -m 0755 wpa_supplicant %{buildroot}/%{_sbindir} +install -m 0755 %{name}/wpa_passphrase %{buildroot}/%{_sbindir} +install -m 0755 %{name}/wpa_cli %{buildroot}/%{_sbindir} +install -m 0755 %{name}/wpa_supplicant %{buildroot}/%{_sbindir} install -d %{buildroot}/%{_sysconfdir}/dbus-1/system.d/ -install -m 0644 dbus-wpa_supplicant.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf +install -m 0644 %{name}/dbus-wpa_supplicant.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf install -d %{buildroot}/%{_datadir}/dbus-1/system-services/ -install -m 0644 %{SOURCE6} %{buildroot}/%{_datadir}/dbus-1/system-services +install -m 0644 %{name}/dbus-wpa_supplicant.service %{buildroot}/%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service # gui install -d %{buildroot}/%{_bindir} -install -m 0755 wpa_gui/wpa_gui %{buildroot}/%{_bindir} +install -m 0755 %{name}/wpa_gui/wpa_gui %{buildroot}/%{_bindir} # running mkdir -p %{buildroot}/%{_localstatedir}/run/%{name} # man pages install -d %{buildroot}%{_mandir}/man{5,8} -install -m 0644 doc/docbook/*.8 %{buildroot}%{_mandir}/man8 -install -m 0644 doc/docbook/*.5 %{buildroot}%{_mandir}/man5 +install -m 0644 %{name}/doc/docbook/*.8 %{buildroot}%{_mandir}/man8 +install -m 0644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 # some cleanup in docs -rm -f doc/.cvsignore -rm -rf doc/docbook +rm -f %{name}/doc/.cvsignore +rm -rf %{name}/doc/docbook %clean @@ -151,7 +125,7 @@ %files %defattr(-, root, root) -%doc COPYING ChangeLog README eap_testing.txt todo.txt wpa_supplicant.conf examples +%doc COPYING %{name}/ChangeLog README %{name}/eap_testing.txt %{name}/todo.txt %{name}/wpa_supplicant.conf %{name}/examples %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} @@ -171,6 +145,9 @@ %{_bindir}/wpa_gui %changelog +* Mon Mar 3 2008 Dan Williams - 1:0.6.3-1 +- Update to latest development release; remove upstreamed patches + * Fri Feb 22 2008 Dan Williams 1:0.5.7-23 - Fix gcc 4.3 rebuild issues --- fi.epitest.hostap.WPASupplicant.service DELETED --- --- wpa_supplicant-0.5.7-always-scan.patch DELETED --- --- wpa_supplicant-0.5.7-dbus-blobs.patch DELETED --- --- wpa_supplicant-0.5.7-dbus-iface-segfault-fix.patch DELETED --- --- wpa_supplicant-0.5.7-dbus-permissions-fix.patch DELETED --- --- wpa_supplicant-0.5.7-debug-file.patch DELETED --- --- wpa_supplicant-0.5.7-fix-dynamic-wep-with-mac80211.patch DELETED --- --- wpa_supplicant-0.5.7-fix-signal-leaks.patch DELETED --- --- wpa_supplicant-0.5.7-ignore-dup-ca-cert-addition.patch DELETED --- --- wpa_supplicant-0.5.7-include-stdlib.h DELETED --- --- wpa_supplicant-0.5.7-sigusr1-changes-debuglevel.patch DELETED --- --- wpa_supplicant-0.5.9-adhoc-frequency.patch DELETED --- --- wpa_supplicant-driver-wext-debug.patch DELETED --- --- wpa_supplicant-fix-deprecated-dbus-function.patch DELETED --- --- wpa_supplicant-wep-key-fix.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 17:25:25 2008 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 3 Mar 2008 17:25:25 GMT Subject: rpms/suitesparse/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 suitesparse.spec, 1.5, 1.6 Message-ID: <200803031725.m23HPPg0001191@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/suitesparse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1169 Modified Files: .cvsignore sources suitesparse.spec Log Message: Update to release 3.1.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/suitesparse/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jul 2007 16:03:53 -0000 1.2 +++ .cvsignore 3 Mar 2008 17:24:42 -0000 1.3 @@ -1 +1 @@ -SuiteSparse-3.0.0.tar.gz +SuiteSparse-3.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/suitesparse/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jul 2007 16:03:53 -0000 1.2 +++ sources 3 Mar 2008 17:24:42 -0000 1.3 @@ -1 +1 @@ -4eecd769cf236be413699b2984c39f97 SuiteSparse-3.0.0.tar.gz +58d90444feef92fc7c265cbd11a757c6 SuiteSparse-3.1.0.tar.gz Index: suitesparse.spec =================================================================== RCS file: /cvs/extras/rpms/suitesparse/devel/suitesparse.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- suitesparse.spec 19 Feb 2008 20:30:30 -0000 1.5 +++ suitesparse.spec 3 Mar 2008 17:24:42 -0000 1.6 @@ -1,6 +1,6 @@ Name: suitesparse -Version: 3.0.0 -Release: 4%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: A collection of sparse matrix libraries Group: System Environment/Libraries @@ -62,25 +62,25 @@ %build %define amd_version 2.2 %define amd_version_major 2 -%define btf_version 1.0 +%define btf_version 1.0.1 %define btf_version_major 1 %define camd_version 2.2 %define camd_version_major 2 -%define ccolamd_version 2.7 +%define ccolamd_version 2.7.1 %define ccolamd_version_major 2 -%define cholmod_version 1.5 +%define cholmod_version 1.6 %define cholmod_version_major 1 %define colamd_version 2.7 %define colamd_version_major 2 -%define csparse_version 2.2.0 +%define csparse_version 2.2.1 %define csparse_version_major 2 -%define cxsparse_version 2.2.0 +%define cxsparse_version 2.2.1 %define cxsparse_version_major 2 %define klu_version 1.0 %define klu_version_major 1 %define ldl_version 2.0 %define ldl_version_major 2 -%define umfpack_version 5.0.2 +%define umfpack_version 5.2.0 %define umfpack_version_major 5 ### CHOLMOD can also be compiled to use the METIS library, but it is not ### used here because its licensing terms exclude it from Fedora Extras. @@ -224,7 +224,7 @@ popd cp Lib/*.a Lib/*.so* ../Lib cp Include/*.h ../Include - cp README.txt Doc/License Doc/ChangeLog Doc/lesser.txt ../Doc/UMFPACK + cp README.txt Doc/License Doc/ChangeLog Doc/gpl.txt ../Doc/UMFPACK cp Doc/*.pdf ../Devel/UMFPACK popd @@ -298,6 +298,9 @@ %{_libdir}/lib*.a %changelog +* Mon Mar 3 2008 Quentin Spencer 3.1.0-1 +- Update to release 3.1.0. + * Tue Feb 19 2008 Fedora Release Engineering - 3.0.0-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 17:36:22 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Mon, 3 Mar 2008 17:36:22 GMT Subject: rpms/isdn4k-utils/devel isdn4k-utils-gcc3x.patch, NONE, 1.1 isdn4k-utils.spec, 1.72, 1.73 Message-ID: <200803031736.m23HaMjL001432@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/isdn4k-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1399 Modified Files: isdn4k-utils.spec Added Files: isdn4k-utils-gcc3x.patch Log Message: fix build issue with new gcc isdn4k-utils-gcc3x.patch: --- NEW FILE isdn4k-utils-gcc3x.patch --- diff -up isdn4k-utils-CVS-2006-07-20/capi20/capi20.h.orig isdn4k-utils-CVS-2006-07-20/capi20/capi20.h --- isdn4k-utils-CVS-2006-07-20/capi20/capi20.h.orig 2008-03-03 18:14:50.000000000 +0100 +++ isdn4k-utils-CVS-2006-07-20/capi20/capi20.h 2008-03-03 18:17:31.000000000 +0100 @@ -20,6 +20,7 @@ #ifndef __CAPI20_H__ #define __CAPI20_H__ +#include #include #ifdef __cplusplus Index: isdn4k-utils.spec =================================================================== RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- isdn4k-utils.spec 15 Feb 2008 21:13:41 -0000 1.72 +++ isdn4k-utils.spec 3 Mar 2008 17:35:46 -0000 1.73 @@ -15,7 +15,7 @@ Summary: Utilities for configuring an ISDN subsystem. Name: isdn4k-utils Version: 3.2 -Release: 57%{?dist} +Release: 58%{?dist} License: GPL Group: Applications/System @@ -40,7 +40,7 @@ Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch Patch13: isdn4k-utils-capiinit.patch Patch14: isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch -Patch15: isdn4k-utils-CVS-2006-07-20-glibc.patch +Patch15: isdn4k-utils-gcc3x.patch BuildRoot: %{_tmppath}/%name-%{version}-%{release}-root @@ -500,6 +500,9 @@ %doc xmonisdn/README %changelog +* Mon Mar 03 2008 Than Ngo 3.2-58 +- fix build issue with new gcc + * Fri Feb 15 2008 Than Ngo 3.2-57 - rebuild against gcc 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 17:39:58 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 3 Mar 2008 17:39:58 GMT Subject: rpms/evolution-rss/F-8 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200803031739.m23HdwaG001606@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1577 Modified Files: .cvsignore sources Log Message: new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2008 08:13:21 -0000 1.2 +++ .cvsignore 3 Mar 2008 17:39:17 -0000 1.3 @@ -1 +1 @@ -evolution-rss-0.0.7.tar.gz +evolution-rss-0.0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2008 08:13:21 -0000 1.2 +++ sources 3 Mar 2008 17:39:17 -0000 1.3 @@ -1 +1 @@ -01635af0e33b4dab0a4855160352512c evolution-rss-0.0.7.tar.gz +c5adce093e332573bc1fcfaf23c1f8b6 evolution-rss-0.0.8.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 17:41:55 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 3 Mar 2008 17:41:55 GMT Subject: rpms/evolution-rss/F-8 evolution-rss.spec,1.1,1.2 Message-ID: <200803031741.m23Hftee001677@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1623 Modified Files: evolution-rss.spec Log Message: updated to 0.0.8 Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-8/evolution-rss.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-rss.spec 19 Feb 2008 08:13:21 -0000 1.1 +++ evolution-rss.spec 3 Mar 2008 17:41:20 -0000 1.2 @@ -1,15 +1,12 @@ Summary: Evolution RSS Reader Name: evolution-rss -Version: 0.0.7 -Release: 8%{?dist} +Version: 0.0.8 +Release: 1%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin -Patch0: evolution-rss-0.0.7-fix-detect.patch -Patch1: evolution-rss-0.0.7-libsoup-2.4.patch -Patch2: evolution-rss-0.0.7-autoreconf.patch Requires: evolution Requires(pre): GConf2 @@ -20,7 +17,7 @@ BuildRequires: evolution-devel BuildRequires: evolution-data-server-devel BuildRequires: dbus-glib-devel -#BuildRequires: gecko-devel +BuildRequires: gecko-devel BuildRequires: perl(XML::Parser) BuildRequires: libtool @@ -34,8 +31,8 @@ %patch2 -p1 -b autoreconf %build -autoreconf -i -f -%configure --disable-webkit --disable-gecko +#autoreconf -i -f +%configure --disable-webkit make %{?_smp_mflags} %install @@ -92,6 +89,9 @@ %doc TODO %changelog +* Tue Mar 3 2008 Lucian Langa - 0.0.8-1 +-Updated to 0.0.8 version + * Tue Feb 19 2008 Lucian Langa - 0.0.7-8 -Misc cleanups From fedora-extras-commits at redhat.com Mon Mar 3 17:43:29 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 3 Mar 2008 17:43:29 GMT Subject: rpms/evolution-rss/F-8 evolution-rss.spec,1.2,1.3 Message-ID: <200803031743.m23HhTkG001753@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1726 Modified Files: evolution-rss.spec Log Message: misc cleanups Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-8/evolution-rss.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- evolution-rss.spec 3 Mar 2008 17:41:20 -0000 1.2 +++ evolution-rss.spec 3 Mar 2008 17:42:43 -0000 1.3 @@ -26,12 +26,8 @@ %prep %setup -q -n evolution-rss-%{version} -%patch0 -p1 -b fixdetect -%patch1 -p1 -b libsoup24 -%patch2 -p1 -b autoreconf %build -#autoreconf -i -f %configure --disable-webkit make %{?_smp_mflags} From fedora-extras-commits at redhat.com Mon Mar 3 17:45:46 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 3 Mar 2008 17:45:46 GMT Subject: rpms/evolution-rss/F-8 evolution-rss.spec,1.3,1.4 Message-ID: <200803031745.m23Hjk54001907@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1881 Modified Files: evolution-rss.spec Log Message: misc cleanups Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-8/evolution-rss.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- evolution-rss.spec 3 Mar 2008 17:42:43 -0000 1.3 +++ evolution-rss.spec 3 Mar 2008 17:45:09 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Evolution RSS Reader Name: evolution-rss Version: 0.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz @@ -85,7 +85,8 @@ %doc TODO %changelog -* Tue Mar 3 2008 Lucian Langa - 0.0.8-1 +* Tue Mar 3 2008 Lucian Langa - 0.0.8-2 +-Misc cleanups -Updated to 0.0.8 version * Tue Feb 19 2008 Lucian Langa - 0.0.7-8 From fedora-extras-commits at redhat.com Mon Mar 3 17:49:13 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Mon, 3 Mar 2008 17:49:13 GMT Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.55,1.56 Message-ID: <200803031749.m23HnDwn002092@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1980 Modified Files: java-1.7.0-icedtea.spec Log Message: Updated changelog entry and added a comment about ExcludeArch: ppc. Index: java-1.7.0-icedtea.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- java-1.7.0-icedtea.spec 3 Mar 2008 15:50:11 -0000 1.55 +++ java-1.7.0-icedtea.spec 3 Mar 2008 17:48:31 -0000 1.56 @@ -121,6 +121,8 @@ Source7: mauve_tests Patch0: java-1.7.0-icedtea-win32.patch Patch1: java-1.7.0-icedtea-jhat.patch +# Excluding ppc as a workaround for this bug: +#https://bugzilla.redhat.com/show_bug.cgi?id=435337 ExcludeArch: ppc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -746,7 +748,8 @@ %changelog * Mon Mar 03 2008 Lillian Angel - 1.7.0.0-0.28.b24 -- ExcludeArch ppc added. +- ExcludeArch ppc added as a workaround for this bug: + https://bugzilla.redhat.com/show_bug.cgi?id=435337 - Updated release. * Tue Feb 19 2008 Lillian Angel - 1.7.0.0-0.27.b24 From fedora-extras-commits at redhat.com Mon Mar 3 17:55:59 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 3 Mar 2008 17:55:59 GMT Subject: rpms/mysql/devel mysql.spec,1.103,1.104 Message-ID: <200803031755.m23HtxNN002361@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325 Modified Files: mysql.spec Log Message: add sparc multilib and dualbuilding handling Index: mysql.spec =================================================================== RCS file: /cvs/extras/rpms/mysql/devel/mysql.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- mysql.spec 28 Feb 2008 21:23:49 -0000 1.103 +++ mysql.spec 3 Mar 2008 17:55:21 -0000 1.104 @@ -1,6 +1,6 @@ Name: mysql Version: 5.0.45 -Release: 9%{?dist} +Release: 10%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -191,7 +191,7 @@ %if %runselftest # hack to let 32- and 64-bit tests run concurrently on same build machine case `uname -m` in - ppc64 | s390x | x86_64) + ppc64 | s390x | x86_64 | sparc64 ) MTR_BUILD_THREAD=7 ;; *) @@ -211,7 +211,7 @@ # multilib header hack # we only apply this to known Red Hat multilib arches, per bug #181335 case `uname -i` in - i386 | x86_64 | ppc | ppc64 | s390 | s390x) + i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparcv9 | sparc64 ) install -m 644 include/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/ ;; @@ -484,6 +484,10 @@ %{_mandir}/man1/mysql_client_test.1* %changelog +* Mon Mar 03 2008 Dennis Gilmore 5.0.45-10 +- add sparc64 to 64 bit arches for test suite checking +- add sparc, sparcv9 and sparc64 to multilib handling + * Thu Feb 28 2008 Tom Lane 5.0.45-9 - Fix the stack overflow problem encountered in January. It seems the real issue is that the buildfarm machines were moved to RHEL5, which uses 64K not From fedora-extras-commits at redhat.com Mon Mar 3 18:03:40 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 3 Mar 2008 18:03:40 GMT Subject: rpms/gnome-panel/devel polkit-fix.patch, NONE, 1.1 gnome-panel.spec, 1.270, 1.271 Message-ID: <200803031803.m23I3eRK009787@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9701 Modified Files: gnome-panel.spec Added Files: polkit-fix.patch Log Message: Some upstream clock applet fixes polkit-fix.patch: --- NEW FILE polkit-fix.patch --- diff -up gnome-panel-2.21.92/applets/clock/set-timezone.c.polkit-fix gnome-panel-2.21.92/applets/clock/set-timezone.c --- gnome-panel-2.21.92/applets/clock/set-timezone.c.polkit-fix 2008-03-03 12:10:34.000000000 -0500 +++ gnome-panel-2.21.92/applets/clock/set-timezone.c 2008-03-03 12:10:50.000000000 -0500 @@ -75,6 +75,40 @@ get_system_bus (void) return bus; } +static gboolean +pk_io_watch_have_data (GIOChannel *channel, GIOCondition condition, gpointer user_data) +{ + int fd; + PolKitContext *pk_context = user_data; + fd = g_io_channel_unix_get_fd (channel); + polkit_context_io_func (pk_context, fd); + return TRUE; +} + +static int +pk_io_add_watch_fn (PolKitContext *pk_context, int fd) +{ + guint id = 0; + GIOChannel *channel; + channel = g_io_channel_unix_new (fd); + if (channel == NULL) + goto out; + id = g_io_add_watch (channel, G_IO_IN, pk_io_watch_have_data, pk_context); + if (id == 0) { + g_io_channel_unref (channel); + goto out; + } + g_io_channel_unref (channel); +out: + return id; +} + +static void +pk_io_remove_watch_fn (PolKitContext *pk_context, int watch_id) +{ + g_source_remove (watch_id); +} + static PolKitContext * get_pk_context (void) { @@ -82,6 +116,9 @@ get_pk_context (void) if (pk_context == NULL) { pk_context = polkit_context_new (); +// polkit_context_set_io_watch_functions (pk_context, +// pk_io_add_watch_fn, +// pk_io_remove_watch_fn); if (!polkit_context_init (pk_context, NULL)) { polkit_context_unref (pk_context); pk_context = NULL; @@ -126,22 +163,19 @@ can_do (const gchar *pk_action_id) pk_result = polkit_context_can_caller_do_action (pk_context, pk_action, pk_caller); switch (pk_result) { - default: case POLKIT_RESULT_UNKNOWN: case POLKIT_RESULT_NO: res = 0; break; - case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH: - case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION: - case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_ALWAYS: - case POLKIT_RESULT_ONLY_VIA_SELF_AUTH: - case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION: - case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS: - res = 1; - break; case POLKIT_RESULT_YES: res = 2; break; + default: + /* This covers all the POLKIT_RESULT_ONLY_VIA_[SELF|ADMIN]_AUTH_* cases as more of these + * may be added in the future. + */ + res = 1; + break; } out: diff -up gnome-panel-2.21.92/applets/clock/clock.c.polkit-fix gnome-panel-2.21.92/applets/clock/clock.c --- gnome-panel-2.21.92/applets/clock/clock.c.polkit-fix 2008-03-03 12:10:23.000000000 -0500 +++ gnome-panel-2.21.92/applets/clock/clock.c 2008-03-03 12:10:45.000000000 -0500 @@ -2266,11 +2266,15 @@ clock_migrate_to_26 (ClockData *clock) else if (hourformat == 24) clock->format = CLOCK_FORMAT_24; - panel_applet_gconf_set_string (PANEL_APPLET (clock->applet), - KEY_FORMAT, - gconf_enum_to_string (format_type_enum_map, - clock->format), - NULL); + /* It's still possible that we have none of the old keys, in which case + * we're not migrating from 2.6, but the config is simply wrong. So + * don't set the format key in this case. */ + if (clock->format != CLOCK_FORMAT_INVALID) + panel_applet_gconf_set_string (PANEL_APPLET (clock->applet), + KEY_FORMAT, + gconf_enum_to_string (format_type_enum_map, + clock->format), + NULL); } static void Index: gnome-panel.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- gnome-panel.spec 3 Mar 2008 15:57:27 -0000 1.270 +++ gnome-panel.spec 3 Mar 2008 18:02:59 -0000 1.271 @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.21.92 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2 @@ -108,6 +108,7 @@ Patch14: gnome-panel-2.21.5-ck-shutdown.patch +Patch22: polkit-fix.patch Patch23: sunrise.patch # http://bugzilla.gnome.org/show_bug.cgi?id=520111 @@ -158,6 +159,7 @@ %patch10 -p1 -b .preferred-apps %patch11 -p1 -b .applet-error %patch14 -p1 -b .ck-shutdown +%patch22 -p1 -b .polkit-fix %patch23 -p1 -b .sunrise %patch24 -p1 -b .allow-spurious-view-done-signals @@ -344,6 +346,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 3 2008 Matthias Clasen - 2.21.92-3 +- Some upstream clock applet fixes + * Mon Mar 3 2008 Ray Strode - 2.21.92-2 - Don't crash with Zimbra connector (bug 435355) From fedora-extras-commits at redhat.com Mon Mar 3 18:04:52 2008 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 3 Mar 2008 18:04:52 GMT Subject: rpms/eclipse/devel eclipse.spec,1.515,1.516 Message-ID: <200803031804.m23I4qrB009883@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/pkgs/rpms/eclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9826 Modified Files: eclipse.spec Log Message: * Mon Mar 03 2008 Andrew Overholt 3.3.1.1-17 - Mark eclipse.ini as %config. Index: eclipse.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.515 retrieving revision 1.516 diff -u -r1.515 -r1.516 --- eclipse.spec 19 Feb 2008 17:29:27 -0000 1.515 +++ eclipse.spec 3 Mar 2008 18:04:15 -0000 1.516 @@ -19,7 +19,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 16%{?dist} +Release: 17%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1392,7 +1392,7 @@ %files platform -f %{name}-platform.install %defattr(-,root,root) %attr(0755,root,root) %{_bindir}/%{name} -%{_libdir}/%{name}/eclipse.ini +%config %{_libdir}/%{name}/eclipse.ini %{_libdir}/%{name}/eclipse %{_datadir}/applications/* %{_datadir}/pixmaps/* @@ -1622,6 +1622,9 @@ %endif %changelog +* Mon Mar 03 2008 Andrew Overholt 3.3.1.1-17 +- Mark eclipse.ini as %%config. + * Tue Feb 19 2008 Fedora Release Engineering - 1:3.3.1.1-16 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 18:05:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim)) Date: Mon, 3 Mar 2008 18:05:01 GMT Subject: rpms/postgresql-plruby/devel .cvsignore, 1.2, 1.3 postgresql-plruby.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803031805.m23I51YG009904@cvs-int.fedora.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-plruby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9822 Modified Files: .cvsignore postgresql-plruby.spec sources Log Message: Update to 0.5.3 to fix PostgreSQL 8.3 + GCC 4.3 problems. 0.5.2 had a problem with PostgreSQL version detection, so author kindly released 0.5.3 for this issue. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/postgresql-plruby/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Jan 2008 02:35:30 -0000 1.2 +++ .cvsignore 3 Mar 2008 18:04:16 -0000 1.3 @@ -1 +1 @@ -plruby-0.5.1.tar.gz +plruby-0.5.3.tar.gz Index: postgresql-plruby.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-plruby/devel/postgresql-plruby.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- postgresql-plruby.spec 19 Feb 2008 01:28:36 -0000 1.3 +++ postgresql-plruby.spec 3 Mar 2008 18:04:16 -0000 1.4 @@ -3,8 +3,8 @@ Summary: PostgreSQL Ruby Procedural Language Name: postgresql-%{sname} -Version: 0.5.1 -Release: 6%{?dist}.1 +Version: 0.5.3 +Release: 1%{?dist} Source0: ftp://moulon.inra.fr/pub/ruby/%{sname}-%{version}.tar.gz License: Ruby or GPL+ Group: Applications/Databases @@ -44,12 +44,10 @@ %build ruby extconf.rb --with-pgsql-include=%{_includedir}/pgsql/server -make %{?_smp_mflags} \ - CC="%{__cc} -I%{_includedir}/pgsql -I%{_includedir}/pgsql/server" %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} install +CC="%{__cc} -I%{_includedir}/pgsql -I%{_includedir}/pgsql/server" make DESTDIR=%{buildroot} %{?_smp_mflags} install %clean rm -rf %{buildroot} @@ -66,6 +64,11 @@ %doc docs/plruby.rb %changelog +* Mon Mar 3 2008 Devrim GUNDUZ - 0.5.3-1 +- Update to 0.5.3 to fix PostgreSQL 8.3 + GCC 4.3 problems. 0.5.2 had + a problem with PostgreSQL version detection, so author kindly released + 0.5.3 for this issue. + * Mon Feb 18 2008 Fedora Release Engineering - 0.5.1-6.1 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/postgresql-plruby/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Jan 2008 02:35:30 -0000 1.2 +++ sources 3 Mar 2008 18:04:16 -0000 1.3 @@ -1 +1 @@ -ffe71918648707cdde277939936c8172 plruby-0.5.1.tar.gz +9411bb29e1aa5521c5327e4d916de934 plruby-0.5.3.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 18:06:02 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 3 Mar 2008 18:06:02 GMT Subject: rpms/evolution-rss/F-8 evolution-rss-0.0.7-autoreconf.patch, 1.1, NONE evolution-rss-0.0.7-fix-detect.patch, 1.1, NONE evolution-rss-0.0.7-libsoup-2.4.patch, 1.1, NONE Message-ID: <200803031806.m23I62YD010062@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10046/F-8 Removed Files: evolution-rss-0.0.7-autoreconf.patch evolution-rss-0.0.7-fix-detect.patch evolution-rss-0.0.7-libsoup-2.4.patch Log Message: update to 0.0.8 --- evolution-rss-0.0.7-autoreconf.patch DELETED --- --- evolution-rss-0.0.7-fix-detect.patch DELETED --- --- evolution-rss-0.0.7-libsoup-2.4.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 18:17:16 2008 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 3 Mar 2008 18:17:16 GMT Subject: rpms/adminutil/F-8 .cvsignore, 1.6, 1.7 adminutil.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200803031817.m23IHG9o010529@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/adminutil/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10409/F-8 Modified Files: .cvsignore adminutil.spec sources Log Message: Resolves bug 245248 - dsgw doesn\'t escape filename in error message - The new dsgw hasn\'t been released yet, and the old one doesn't use this code Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adminutil/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Oct 2007 16:28:40 -0000 1.6 +++ .cvsignore 3 Mar 2008 18:16:41 -0000 1.7 @@ -1 +1,2 @@ adminutil-1.1.5.tar.bz2 +adminutil-1.1.6.tar.bz2 Index: adminutil.spec =================================================================== RCS file: /cvs/extras/rpms/adminutil/F-8/adminutil.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- adminutil.spec 18 Oct 2007 16:28:40 -0000 1.7 +++ adminutil.spec 3 Mar 2008 18:16:41 -0000 1.8 @@ -6,7 +6,7 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} License: LGPL URL: http://directory.fedoraproject.org/wiki/AdminUtil @@ -84,6 +84,11 @@ %{_includedir}/libadmsslutil %changelog +* Mon Mar 3 2008 Rich Megginson - 1.1.6-1 +- Resolves bug 245248 - dsgw doesn't escape filename in error message +- The new dsgw hasn't been released yet, and the old one doesn't use +- this code. + * Thu Oct 18 2007 Rich Megginson - 1.1.5-1 - bump version to 1.1.5 - fix icu linking issue Index: sources =================================================================== RCS file: /cvs/extras/rpms/adminutil/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Oct 2007 16:28:40 -0000 1.6 +++ sources 3 Mar 2008 18:16:41 -0000 1.7 @@ -1 +1,2 @@ 1ce95159db07040d7095b805e9b3b533 adminutil-1.1.5.tar.bz2 +b01d441f81d3d260ba84e4f0d5311721 adminutil-1.1.6.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 18:17:26 2008 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 3 Mar 2008 18:17:26 GMT Subject: rpms/adminutil/FC-6 .cvsignore, 1.6, 1.7 adminutil.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200803031817.m23IHQUV010541@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/adminutil/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10409/FC-6 Modified Files: .cvsignore adminutil.spec sources Log Message: Resolves bug 245248 - dsgw doesn\'t escape filename in error message - The new dsgw hasn\'t been released yet, and the old one doesn't use this code Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adminutil/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Oct 2007 16:28:38 -0000 1.6 +++ .cvsignore 3 Mar 2008 18:16:46 -0000 1.7 @@ -1 +1,2 @@ adminutil-1.1.5.tar.bz2 +adminutil-1.1.6.tar.bz2 Index: adminutil.spec =================================================================== RCS file: /cvs/extras/rpms/adminutil/FC-6/adminutil.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- adminutil.spec 18 Oct 2007 16:28:38 -0000 1.5 +++ adminutil.spec 3 Mar 2008 18:16:46 -0000 1.6 @@ -6,7 +6,7 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} License: LGPL URL: http://directory.fedoraproject.org/wiki/AdminUtil @@ -84,6 +84,11 @@ %{_includedir}/libadmsslutil %changelog +* Mon Mar 3 2008 Rich Megginson - 1.1.6-1 +- Resolves bug 245248 - dsgw doesn't escape filename in error message +- The new dsgw hasn't been released yet, and the old one doesn't use +- this code. + * Thu Oct 18 2007 Rich Megginson - 1.1.5-1 - bump version to 1.1.5 - fix icu linking issue Index: sources =================================================================== RCS file: /cvs/extras/rpms/adminutil/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Oct 2007 16:28:38 -0000 1.6 +++ sources 3 Mar 2008 18:16:46 -0000 1.7 @@ -1 +1,2 @@ 1ce95159db07040d7095b805e9b3b533 adminutil-1.1.5.tar.bz2 +b01d441f81d3d260ba84e4f0d5311721 adminutil-1.1.6.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 18:17:40 2008 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 3 Mar 2008 18:17:40 GMT Subject: rpms/adminutil/F-7 .cvsignore, 1.6, 1.7 adminutil.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200803031817.m23IHePk010550@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/adminutil/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10409/F-7 Modified Files: .cvsignore adminutil.spec sources Log Message: Resolves bug 245248 - dsgw doesn\'t escape filename in error message - The new dsgw hasn\'t been released yet, and the old one doesn't use this code Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adminutil/F-7/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Oct 2007 16:28:34 -0000 1.6 +++ .cvsignore 3 Mar 2008 18:16:20 -0000 1.7 @@ -1 +1,2 @@ adminutil-1.1.5.tar.bz2 +adminutil-1.1.6.tar.bz2 Index: adminutil.spec =================================================================== RCS file: /cvs/extras/rpms/adminutil/F-7/adminutil.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- adminutil.spec 18 Oct 2007 16:28:34 -0000 1.5 +++ adminutil.spec 3 Mar 2008 18:16:20 -0000 1.6 @@ -6,7 +6,7 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} License: LGPL URL: http://directory.fedoraproject.org/wiki/AdminUtil @@ -84,6 +84,11 @@ %{_includedir}/libadmsslutil %changelog +* Mon Mar 3 2008 Rich Megginson - 1.1.6-1 +- Resolves bug 245248 - dsgw doesn't escape filename in error message +- The new dsgw hasn't been released yet, and the old one doesn't use +- this code. + * Thu Oct 18 2007 Rich Megginson - 1.1.5-1 - bump version to 1.1.5 - fix icu linking issue Index: sources =================================================================== RCS file: /cvs/extras/rpms/adminutil/F-7/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Oct 2007 16:28:34 -0000 1.6 +++ sources 3 Mar 2008 18:16:20 -0000 1.7 @@ -1 +1,2 @@ 1ce95159db07040d7095b805e9b3b533 adminutil-1.1.5.tar.bz2 +b01d441f81d3d260ba84e4f0d5311721 adminutil-1.1.6.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 18:17:41 2008 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 3 Mar 2008 18:17:41 GMT Subject: rpms/adminutil/devel .cvsignore, 1.6, 1.7 adminutil.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200803031817.m23IHfD4010555@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/adminutil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10409/devel Modified Files: .cvsignore adminutil.spec sources Log Message: Resolves bug 245248 - dsgw doesn\'t escape filename in error message - The new dsgw hasn\'t been released yet, and the old one doesn't use this code Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adminutil/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Oct 2007 16:28:40 -0000 1.6 +++ .cvsignore 3 Mar 2008 18:16:56 -0000 1.7 @@ -1 +1,2 @@ adminutil-1.1.5.tar.bz2 +adminutil-1.1.6.tar.bz2 Index: adminutil.spec =================================================================== RCS file: /cvs/extras/rpms/adminutil/devel/adminutil.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- adminutil.spec 19 Feb 2008 21:44:05 -0000 1.8 +++ adminutil.spec 3 Mar 2008 18:16:56 -0000 1.9 @@ -6,8 +6,8 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.5 -Release: 2%{?dist} +Version: 1.1.6 +Release: 1%{?dist} License: LGPL URL: http://directory.fedoraproject.org/wiki/AdminUtil Group: Development/Libraries @@ -84,6 +84,11 @@ %{_includedir}/libadmsslutil %changelog +* Mon Mar 3 2008 Rich Megginson - 1.1.6-1 +- Resolves bug 245248 - dsgw doesn't escape filename in error message +- The new dsgw hasn't been released yet, and the old one doesn't use +- this code. + * Tue Feb 19 2008 Fedora Release Engineering - 1.1.5-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/adminutil/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Oct 2007 16:28:40 -0000 1.6 +++ sources 3 Mar 2008 18:16:56 -0000 1.7 @@ -1 +1,2 @@ 1ce95159db07040d7095b805e9b3b533 adminutil-1.1.5.tar.bz2 +b01d441f81d3d260ba84e4f0d5311721 adminutil-1.1.6.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 18:22:54 2008 From: fedora-extras-commits at redhat.com (Matt Wringe (mwringe)) Date: Mon, 3 Mar 2008 18:22:54 GMT Subject: rpms/jflex/devel jflex.spec,1.3,1.4 Message-ID: <200803031822.m23IMsGr010642@cvs-int.fedora.redhat.com> Author: mwringe Update of /cvs/pkgs/rpms/jflex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10612 Modified Files: jflex.spec Log Message: Add missing br on java_cup Index: jflex.spec =================================================================== RCS file: /cvs/pkgs/rpms/jflex/devel/jflex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jflex.spec 22 Feb 2008 22:15:52 -0000 1.3 +++ jflex.spec 3 Mar 2008 18:22:17 -0000 1.4 @@ -33,7 +33,7 @@ Summary: Fast Scanner Generator Name: jflex Version: 1.4.1 -Release: 0jpp.1%{?dist} +Release: 0jpp.2%{?dist} Epoch: 0 License: GPLv2 URL: http://jflex.de/ @@ -44,6 +44,7 @@ BuildRequires: ant BuildRequires: junit BuildRequires: java-devel +BuildRequires: java_cup Requires: java BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -124,6 +125,9 @@ # ----------------------------------------------------------------------------- %changelog +* Mon Mar 03 2008 Matt Wringe - 0:1.4.1-0jpp.2 +- Add missing buildrequires on java_cup + * Fri Feb 22 2008 Matt Wringe - 0:1.4.1-0jpp.1 - Patch build file to allow bootstrap building From fedora-extras-commits at redhat.com Mon Mar 3 18:25:57 2008 From: fedora-extras-commits at redhat.com (Milan Crha (mcrha)) Date: Mon, 3 Mar 2008 18:25:57 GMT Subject: rpms/evolution/F-8 evolution-2.12.3-no-drag-finish.patch, NONE, 1.1 evolution.spec, 1.306, 1.307 Message-ID: <200803031825.m23IPv8i010836@cvs-int.fedora.redhat.com> Author: mcrha Update of /cvs/pkgs/rpms/evolution/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10756 Modified Files: evolution.spec Added Files: evolution-2.12.3-no-drag-finish.patch Log Message: * Mon Mar 03 2008 Milan Crha - 2.12.3-2.fc8 - Add patch for GNOME bug #351672 (dragging IMAP messages locks X) evolution-2.12.3-no-drag-finish.patch: --- NEW FILE evolution-2.12.3-no-drag-finish.patch --- diff -up evolution-2.12.3/mail/em-folder-tree.c.no-drag-finish evolution-2.12.3/mail/em-folder-tree.c --- evolution-2.12.3/mail/em-folder-tree.c.no-drag-finish 2008-03-03 18:34:41.000000000 +0100 +++ evolution-2.12.3/mail/em-folder-tree.c 2008-03-03 18:34:45.000000000 +0100 @@ -927,23 +927,6 @@ emft_drop_async__exec (struct _DragDataR } static void -emft_drop_async__done (struct _DragDataReceivedAsync *m) -{ - gboolean success, delete; - - /* ?? */ - if (m->aborted) { - success = FALSE; - delete = FALSE; - } else { - success = !camel_exception_is_set (&m->base.ex); - delete = success && m->move && !m->moved; - } - - gtk_drag_finish (m->context, success, delete, GDK_CURRENT_TIME); -} - -static void emft_drop_async__free (struct _DragDataReceivedAsync *m) { g_object_unref(m->context); @@ -958,7 +941,7 @@ static MailMsgInfo emft_drop_async_info sizeof (struct _DragDataReceivedAsync), (MailMsgDescFunc) emft_drop_async__desc, (MailMsgExecFunc) emft_drop_async__exec, - (MailMsgDoneFunc) emft_drop_async__done, + NULL, (MailMsgFreeFunc) emft_drop_async__free }; Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/F-8/evolution.spec,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- evolution.spec 7 Jan 2008 17:31:48 -0000 1.306 +++ evolution.spec 3 Mar 2008 18:25:07 -0000 1.307 @@ -46,7 +46,7 @@ Name: evolution Version: 2.12.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -123,6 +123,9 @@ # GNOME bug #454465 Patch37: evolution-2.12.1-source-changed-event.patch +# GNOME bug #351672 +Patch38: evolution-2.12.3-no-drag-finish.patch + ## Dependencies ### Requires(post): GConf2 @@ -265,6 +268,7 @@ %patch35 -p1 -b .mail-attachment %patch36 -p1 -b .icon-names %patch37 -p1 -b .source-changed-event +%patch38 -p1 -b .no-drag-finish mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -715,6 +719,9 @@ %dir %{_datadir}/omf/evolution %changelog +* Mon Mar 03 2008 Milan Crha - 2.12.3-2.fc8 +- Add patch for GNOME bug #351672 (dragging IMAP messages locks X) + * Mon Jan 07 2008 Milan Crha - 2.12.3-1.fc8 - Update to 2.12.3 - Removed patch for RH bug #215467 / GNOME bug #380644 (fixed upstream). From fedora-extras-commits at redhat.com Mon Mar 3 18:34:55 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Mon, 3 Mar 2008 18:34:55 GMT Subject: devel/vim vi_help.txt,NONE,1.1 vim.spec,1.193,1.194 Message-ID: <200803031834.m23IYtMx011138@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11102 Modified Files: vim.spec Added Files: vi_help.txt Log Message: - patchlevel 266 - add minimal help page for /bin/vi (#173974) --- NEW FILE vi_help.txt --- *vi-help.txt* For Vim version 7.1. Last change: 2008 Mar 03 VIM - minimal help file (NOTE: This is a minimal help file and many tags won't work. Use 'vim' or 'gvim' to read the complete help docs.) k Move around: Use the cursor keys, or "h" to go left, h l "j" to go down, "k" to go up, "l" to go right. j Close this window: Use ":q". Get out of Vim: Use ":qa!" (careful, all changes are lost!). Jump to a subject: Position the cursor on a tag between |bars| and hit CTRL-]. Jump back: Type CTRL-T or CTRL-O (repeat to go further back). Get specific help: It is possible to go directly to whatever you want help on, by giving an argument to the ":help" command |:help|. It is possible to further specify the context: *vi-help-context* WHAT PREPEND EXAMPLE ~ Normal mode command (nothing) :help x Insert mode command i_ :help i_ Command-line command : :help :quit Command-line editing c_ :help c_ Vim command argument - :help -r Option ' :help 'textwidth' Search for help: Type ":help word", then hit CTRL-D to see matching help entries for "word". VIM stands for Vi IMproved. Most of VIM was made by Bram Moolenaar, but only through the help of many others. See |vi-credits|. ------------------------------------------------------------------------------ 3. Credits *vi-credits* *vi-author* *vi-Bram* *vi-Moolenaar* Most of Vim was written by Bram Moolenaar . Parts of the documentation come from several Vi manuals, written by: W.N. Joy Alan P.W. Hewett Mark Horton The Vim editor is based on Stevie and includes (ideas from) other software, worked on by the people mentioned here. Other people helped by sending me patches, suggestions and giving feedback about what is good and bad in Vim. Vim would never have become what it is now, without the help of these people! Ron Aaron Win32 GUI changes Zoltan Arpadffy work on VMS port Tony Andrews Stevie Gert van Antwerpen changes for DJGPP on MS-DOS Berkeley DB(3) ideas for swap file implementation Keith Bostic Nvi Walter Briscoe Makefile updates, various patches Ralf Brown SPAWNO library for MS-DOS Robert Colon many useful remarks Marcin Dalecki GTK+ GUI port, toolbar icons, gettext() Kayhan Demirel sent me news in Uganda Chris & John Downey xvi (ideas for multi-windows version) Henk Elbers first VMS port Daniel Elstner GTK+ 2 port Eric Fischer Mac port, 'cindent', and other improvements Benji Fisher Answering lots of user questions Bill Foster Athena GUI port Loic Grenie xvim (ideas for multi windows version) Sven Guckes Vim promotor and previous WWW page maintainer Darren Hiebert Exuberant ctags Jason Hildebrand GTK+ 2 port Bruce Hunsaker improvements for VMS port Andy Kahn Cscope support, GTK+ GUI port Oezguer Kesim Maintainer of Vim Mailing Lists Axel Kielhorn work on the Macintosh port Steve Kirkendall Elvis Roger Knobbe original port to Windows NT Sergey Laskavy Vim's help from Moscow Felix von Leitner Maintainer of Vim Mailing Lists David Leonard Port of Python extensions to Unix Avner Lottem Edit in right-to-left windows Flemming Madsen X11 client-server, various features and patches MicroSoft Gave me a copy of DevStudio to compile Vim with Paul Moore Python interface extensions, many patches Katsuhito Nagano Work on multi-byte versions Sung-Hyun Nam Work on multi-byte versions Vince Negri Win32 GUI and generic console enhancements Steve Oualline Author of the first Vim book |frombook| George V. Reilly Win32 port, Win32 GUI start-off Stephen Riehm bug collector Stefan Roemer various patches and help to users Ralf Schandl IBM OS/390 port Olaf Seibert DICE and BeBox version, regexp improvements Mortaza Shiran Farsi patches Peter da Silva termlib Paul Slootman OS/2 port Henry Spencer regular expressions Dany St-Amant Macintosh port Tim Thompson Stevie G. R. (Fred) Walter Stevie Sven Verdoolaege Perl interface Robert Webb Command-line completion, GUI versions, and lots of patches Ingo Wilken Tcl interface Mike Williams PostScript printing Juergen Weigert Lattice version, AUX improvements, UNIX and MS-DOS ports, autoconf Stefan 'Sec' Zehl Maintainer of vim.org I wish to thank all the people that sent me bug reports and suggestions. The list is too long to mention them all here. Vim would not be the same without the ideas from all these people: They keep Vim alive! ------------------------------------------------------------------------------ *vi-doc-file-list* *V_ct* BASIC: |copying| About copyrights |iccf| Helping poor children in Uganda |sponsor| Sponsor Vim development, become a registered Vim user |www| Vim on the World Wide Web |bugs| Where to send bug reports ------------------------------------------------------------------------------ Now that you've jumped here with CTRL-] or a double mouse click, you can use CTRL-T, CTRL-O, g, or to go back to where you were. ------------------------------------------------------------------------------ vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl: Index: vim.spec =================================================================== RCS file: /cvs/extras/devel/vim/vim.spec,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- vim.spec 25 Feb 2008 16:56:37 -0000 1.193 +++ vim.spec 3 Mar 2008 18:34:13 -0000 1.194 @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim71%{?beta} -%define patchlevel 262 +%define patchlevel 266 Summary: The VIM editor URL: http://www.vim.org/ @@ -38,7 +38,7 @@ Source9: gvim48.png Source10: gvim64.png Source11: Changelog.rpm -#Source12: vi-help.txt +Source12: vi_help.txt %if %{withvimspell} Source13: vim-spell-files.tar.bz2 %endif @@ -316,6 +316,10 @@ Patch260: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.260 Patch261: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.261 Patch262: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.262 +Patch263: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.263 +Patch264: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.264 +Patch265: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.265 +Patch266: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.266 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -713,6 +717,10 @@ %patch260 -p0 %patch261 -p0 %patch262 -p0 +%patch263 -p0 +%patch264 -p0 +%patch265 -p0 +%patch266 -p0 # install spell files @@ -791,7 +799,7 @@ cp vim enhanced-vim make clean -#perl -pi -e "s/help.txt/vi-help.txt/" os_unix.h ex_cmds.c +perl -pi -e "s/help.txt/vi_help.txt/" os_unix.h ex_cmds.c perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/" os_unix.h %configure --prefix=%{_prefix} --with-features=small --with-x=no \ --enable-multibyte \ @@ -815,7 +823,6 @@ cd src make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/%{_bindir}/xxd -make installmacros DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps install -m755 gvim $RPM_BUILD_ROOT/%{_bindir}/gvim install -p -m644 %{SOURCE7} \ @@ -915,9 +922,16 @@ install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/virc (cd $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{vimdir}/doc; gzip -9 *.txt - gzip -d help.txt.gz - cat tags | sed -e 's/\t\(.*.txt\)\t/\t\1.gz\t/;s/\thelp.txt.gz\t/\thelp.txt\t/' > tags.new; mv -f tags.new tags -# cp %{SOURCE12} . + gzip -d help.txt.gz version7.txt.gz sponsor.txt.gz + cp %{SOURCE12} . + cat tags | sed -e 's/\t\(.*.txt\)\t/\t\1.gz\t/;s/\thelp.txt.gz\t/\thelp.txt\t/;s/\tversion7.txt.gz\t/\tversion7.txt\t/;s/\tsponsor.txt.gz\t/\tsponsor.txt\t/' > tags.new; mv -f tags.new tags +cat >> tags << EOF +vi_help.txt vi_help.txt /*vi_help.txt* +vi-author.txt vi_help.txt /*vi-author* +vi-Bram.txt vi_help.txt /*vi-Bram* +vi-Moolenaar.txt vi_help.txt /*vi-Moolenaar* +vi-credits.txt vi_help.txt /*vi-credits* +EOF ) (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) rm -f $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c @@ -963,7 +977,6 @@ %{_datadir}/%{name}/%{vimdir}/colors %{_datadir}/%{name}/%{vimdir}/compiler %{_datadir}/%{name}/%{vimdir}/doc -#exclude /%{_bindir}/vim/%{vimdir}/doc/vi-help.txt %{_datadir}/%{name}/%{vimdir}/*.vim %{_datadir}/%{name}/%{vimdir}/ftplugin %{_datadir}/%{name}/%{vimdir}/indent @@ -1079,7 +1092,6 @@ /bin/view /bin/rvi /bin/rview -#%{_datadir}/%{name}/%{vimdir}/doc/vi-help.txt %files enhanced %defattr(-,root,root) @@ -1111,6 +1123,10 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Feb 03 2008 Karsten Hopp 7.1.266-1 +- patchlevel 266 +- add minimal help page for /bin/vi (#173974) + * Mon Feb 25 2008 Karsten Hopp 7.1.262-1 - patchlevel 262 - add fix for #231124, BOM was ignored From fedora-extras-commits at redhat.com Mon Mar 3 18:36:42 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Mon, 3 Mar 2008 18:36:42 GMT Subject: devel/vim vim.spec,1.194,1.195 Message-ID: <200803031836.m23IagtI011206@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11176 Modified Files: vim.spec Log Message: fix CL date Index: vim.spec =================================================================== RCS file: /cvs/extras/devel/vim/vim.spec,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- vim.spec 3 Mar 2008 18:34:13 -0000 1.194 +++ vim.spec 3 Mar 2008 18:36:04 -0000 1.195 @@ -1123,7 +1123,7 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog -* Mon Feb 03 2008 Karsten Hopp 7.1.266-1 +* Mon Mar 03 2008 Karsten Hopp 7.1.266-1 - patchlevel 266 - add minimal help page for /bin/vi (#173974) From fedora-extras-commits at redhat.com Mon Mar 3 18:52:12 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Mon, 3 Mar 2008 18:52:12 GMT Subject: rpms/nfs-utils/F-8 .cvsignore, 1.20, 1.21 nfs-utils-1.1.0-exp-subtree-warn-off.patch, 1.1, 1.2 nfs-utils.spec, 1.158, 1.159 nfslock.init, 1.18, 1.19 sources, 1.21, 1.22 nfs-utils-1.0.12-mtab-mis-unlock.patch, 1.1, NONE nfs-utils-1.0.12-nfsd-macargs.patch, 1.1, NONE nfs-utils-1.1.0-exportfs-open.patch, 1.1, NONE nfs-utils-1.1.0-gssglue.patch, 1.1, NONE nfs-utils-1.1.0-mount-nosharecache.patch, 1.1, NONE nfs-utils-1.1.0-mount-v4-errors.patch, 1.1, NONE Message-ID: <200803031852.m23IqCfA011464@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11433 Modified Files: .cvsignore nfs-utils-1.1.0-exp-subtree-warn-off.patch nfs-utils.spec nfslock.init sources Removed Files: nfs-utils-1.0.12-mtab-mis-unlock.patch nfs-utils-1.0.12-nfsd-macargs.patch nfs-utils-1.1.0-exportfs-open.patch nfs-utils-1.1.0-gssglue.patch nfs-utils-1.1.0-mount-nosharecache.patch nfs-utils-1.1.0-mount-v4-errors.patch Log Message: - Updated to latest upstream release, nfs-utils-1.1.1 - Added the removal of sm-notify.pid to nfslock init script. - Changed spec file to use condrestart instead of condstop when calling init scripts. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 30 Jul 2007 10:10:07 -0000 1.20 +++ .cvsignore 3 Mar 2008 18:51:35 -0000 1.21 @@ -10,3 +10,4 @@ nfs-utils-1.0.11.tar.bz2 nfs-utils-1.0.12.tar.bz2 nfs-utils-1.1.0.tar.bz2 +nfs-utils-1.1.1.tar.bz2 nfs-utils-1.1.0-exp-subtree-warn-off.patch: Index: nfs-utils-1.1.0-exp-subtree-warn-off.patch =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/nfs-utils-1.1.0-exp-subtree-warn-off.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nfs-utils-1.1.0-exp-subtree-warn-off.patch 30 Jul 2007 10:10:07 -0000 1.1 +++ nfs-utils-1.1.0-exp-subtree-warn-off.patch 3 Mar 2008 18:51:35 -0000 1.2 @@ -1,11 +1,12 @@ ---- nfs-utils-1.1.0/support/nfs/exports.c.orig 2007-05-10 23:40:57.000000000 -0400 -+++ nfs-utils-1.1.0/support/nfs/exports.c 2007-07-16 09:13:40.000000000 -0400 -@@ -355,7 +355,7 @@ static int valid_uuid(char *uuid) - static int +diff -up nfs-utils-1.1.1/support/nfs/exports.c.orig nfs-utils-1.1.1/support/nfs/exports.c +--- nfs-utils-1.1.1/support/nfs/exports.c.orig 2008-03-03 13:14:34.558044000 -0500 ++++ nfs-utils-1.1.1/support/nfs/exports.c 2008-03-03 13:15:39.380142000 -0500 +@@ -484,7 +484,7 @@ static int parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr) { + struct sec_entry *p; - int had_subtree_opt = 0; + int had_subtree_opt = 1; char *flname = efname?efname:"command line"; int flline = efp?efp->x_line:0; - + unsigned int active = 0; Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/nfs-utils.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- nfs-utils.spec 7 Jan 2008 19:04:11 -0000 1.158 +++ nfs-utils.spec 3 Mar 2008 18:51:35 -0000 1.159 @@ -1,8 +1,8 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Name: nfs-utils URL: http://sourceforge.net/projects/nfs -Version: 1.1.0 -Release: 7%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Epoch: 1 # group all 32bit related archs @@ -26,18 +26,12 @@ Patch01: nfs-utils-1.0.6-mountd.patch Patch02: nfs-utils-1.0.6-gssd_mixed_case.patch Patch03: nfs-utils-1.0.12-mountd-memleak.patch -Patch04: nfs-utils-1.0.12-nfsd-macargs.patch -Patch05: nfs-utils-1.0.12-mtab-mis-unlock.patch -Patch06: nfs-utils-1.1.0-exp-subtree-warn-off.patch -Patch07: nfs-utils-1.1.0-showmount-rpcerror.patch -Patch08: nfs-utils-1.1.0-mount-v4-errors.patch -Patch09: nfs-utils-1.1.0-mount-nosharecache.patch -Patch10: nfs-utils-1.1.0-exportfs-open.patch -Patch11: nfs-utils-1.1.0-smnotify-path.patch -Patch12: nfs-utils-1.1.0-exportfs-man-update.patch -Patch13: nfs-utils-1.1.0-gssglue.patch -Patch14: nfs-utils-1.1.1-mountd-man.patch -Patch15: nfs-utils-1.1.0-fsloc-nohide.patch +Patch04: nfs-utils-1.1.0-showmount-rpcerror.patch +Patch05: nfs-utils-1.1.0-exp-subtree-warn-off.patch +Patch06: nfs-utils-1.1.0-smnotify-path.patch +Patch07: nfs-utils-1.1.0-exportfs-man-update.patch +Patch08: nfs-utils-1.1.1-mountd-man.patch +Patch09: nfs-utils-1.1.0-fsloc-nohide.patch %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch @@ -100,12 +94,6 @@ %patch07 -p1 %patch08 -p1 %patch09 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 %if %{enablefscache} %patch90 -p1 @@ -203,10 +191,10 @@ %preun if [ "$1" = "0" ]; then - /etc/rc.d/init.d/nfs condstop - /etc/rc.d/init.d/rpcgssd condstop - /etc/rc.d/init.d/rpcidmapd condstop - /etc/rc.d/init.d/nfslock condstop + /etc/rc.d/init.d/nfs condrestart + /etc/rc.d/init.d/rpcgssd condrestart + /etc/rc.d/init.d/rpcidmapd condrestart + /etc/rc.d/init.d/nfslock condrestart /sbin/chkconfig --del rpcidmapd /sbin/chkconfig --del rpcgssd /sbin/chkconfig --del rpcsvcgssd @@ -276,6 +264,12 @@ %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Mon Mar 3 2008 Steve Dickson 1.1.1-1 +- Updated to latest upstream release, nfs-utils-1.1.1 +- Added the removal of sm-notify.pid to nfslock init script. +- Changed spec file to use condrestart instead of condstop + when calling init scripts. + * Mon Jan 7 2008 Steve Dickson 1.1.0-7 - Fixed typo in rpc.mountd man page - Turn on 'nohide' automatically for all refer exports (bz 313561) Index: nfslock.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/nfslock.init,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nfslock.init 30 Jul 2007 10:10:07 -0000 1.18 +++ nfslock.init 3 Mar 2008 18:51:35 -0000 1.19 @@ -54,6 +54,10 @@ start() { if [ ! -f /var/lock/subsys/nfslock ]; then # Start daemons. + + # Make sure locks are recovered + rm -f /var/run/sm-notify.pid + if [ "$USERLAND_LOCKD" ]; then echo -n $"Starting NFS locking: " daemon rpc.lockd @@ -98,6 +102,7 @@ RETVAL=$? echo rm -f /var/lock/subsys/nfslock + rm -f /var/run/sm-notify.pid return $RETVAL } Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 30 Jul 2007 10:10:07 -0000 1.21 +++ sources 3 Mar 2008 18:51:35 -0000 1.22 @@ -1,2 +1,2 @@ ae7db9c61c5ad04f83bb99e5caed73da nfs.doc.tar.gz -42d92ed97f7d4071a017ccac8055cf51 nfs-utils-1.1.0.tar.bz2 +d2a7815329405172b29f051fcffe3c94 nfs-utils-1.1.1.tar.bz2 --- nfs-utils-1.0.12-mtab-mis-unlock.patch DELETED --- --- nfs-utils-1.0.12-nfsd-macargs.patch DELETED --- --- nfs-utils-1.1.0-exportfs-open.patch DELETED --- --- nfs-utils-1.1.0-gssglue.patch DELETED --- --- nfs-utils-1.1.0-mount-nosharecache.patch DELETED --- --- nfs-utils-1.1.0-mount-v4-errors.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 18:53:43 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros)) Date: Mon, 3 Mar 2008 18:53:43 GMT Subject: rpms/python-exif/devel EXIF,1.1,1.2 python-exif.spec,1.6,1.7 Message-ID: <200803031853.m23IrhE1011512@cvs-int.fedora.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-exif/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11483 Modified Files: EXIF python-exif.spec Log Message: * Mon Mar 3 2008 Terje Rosten - 1.0.7-4 - Fix script (bz #435758) Index: EXIF =================================================================== RCS file: /cvs/extras/rpms/python-exif/devel/EXIF,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- EXIF 11 Feb 2008 09:02:32 -0000 1.1 +++ EXIF 3 Mar 2008 18:53:06 -0000 1.2 @@ -3,4 +3,5 @@ PY_DIR=$(python -c "from distutils.sysconfig import get_python_lib as py_dir; print py_dir()") -python $PY_DIR/EXIF.py +python $PY_DIR/EXIF.py "$@" + Index: python-exif.spec =================================================================== RCS file: /cvs/extras/rpms/python-exif/devel/python-exif.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-exif.spec 11 Feb 2008 09:02:32 -0000 1.6 +++ python-exif.spec 3 Mar 2008 18:53:06 -0000 1.7 @@ -7,7 +7,7 @@ Name: python-exif # Remember to update setup.py Version: 1.0.7 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Development/Libraries URL: http://sourceforge.net/projects/%{oname}/ @@ -47,6 +47,9 @@ %{python_sitelib}/EXIF* %changelog +* Mon Mar 3 2008 Terje Rosten - 1.0.7-4 +- Fix script (bz #435758) + * Mon Feb 11 2008 Terje Rosten - 1.0.7-3 - add script and changes.txt From fedora-extras-commits at redhat.com Mon Mar 3 18:56:02 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros)) Date: Mon, 3 Mar 2008 18:56:02 GMT Subject: rpms/python-exif/F-7 EXIF,1.1,1.2 python-exif.spec,1.4,1.5 Message-ID: <200803031856.m23Iu289011627@cvs-int.fedora.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-exif/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11578/F-7 Modified Files: EXIF python-exif.spec Log Message: * Mon Mar 3 2008 Terje Rosten - 1.0.7-4 - Fix script (bz #435758) Index: EXIF =================================================================== RCS file: /cvs/extras/rpms/python-exif/F-7/EXIF,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- EXIF 11 Feb 2008 09:15:59 -0000 1.1 +++ EXIF 3 Mar 2008 18:55:16 -0000 1.2 @@ -3,4 +3,5 @@ PY_DIR=$(python -c "from distutils.sysconfig import get_python_lib as py_dir; print py_dir()") -python $PY_DIR/EXIF.py +python $PY_DIR/EXIF.py "$@" + Index: python-exif.spec =================================================================== RCS file: /cvs/extras/rpms/python-exif/F-7/python-exif.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-exif.spec 11 Feb 2008 09:15:59 -0000 1.4 +++ python-exif.spec 3 Mar 2008 18:55:16 -0000 1.5 @@ -7,7 +7,7 @@ Name: python-exif # Remember to update setup.py Version: 1.0.7 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Development/Libraries URL: http://sourceforge.net/projects/%{oname}/ @@ -47,6 +47,9 @@ %{python_sitelib}/EXIF* %changelog +* Mon Mar 3 2008 Terje Rosten - 1.0.7-4 +- Fix script (bz #435758) + * Mon Feb 11 2008 Terje Rosten - 1.0.7-3 - add script and changes.txt From fedora-extras-commits at redhat.com Mon Mar 3 18:56:06 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros)) Date: Mon, 3 Mar 2008 18:56:06 GMT Subject: rpms/python-exif/F-8 EXIF,1.1,1.2 python-exif.spec,1.5,1.6 Message-ID: <200803031856.m23Iu6ee011631@cvs-int.fedora.redhat.com> Author: terjeros Update of /cvs/extras/rpms/python-exif/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11578/F-8 Modified Files: EXIF python-exif.spec Log Message: * Mon Mar 3 2008 Terje Rosten - 1.0.7-4 - Fix script (bz #435758) Index: EXIF =================================================================== RCS file: /cvs/extras/rpms/python-exif/F-8/EXIF,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- EXIF 11 Feb 2008 09:16:04 -0000 1.1 +++ EXIF 3 Mar 2008 18:55:32 -0000 1.2 @@ -3,4 +3,5 @@ PY_DIR=$(python -c "from distutils.sysconfig import get_python_lib as py_dir; print py_dir()") -python $PY_DIR/EXIF.py +python $PY_DIR/EXIF.py "$@" + Index: python-exif.spec =================================================================== RCS file: /cvs/extras/rpms/python-exif/F-8/python-exif.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-exif.spec 11 Feb 2008 09:16:04 -0000 1.5 +++ python-exif.spec 3 Mar 2008 18:55:32 -0000 1.6 @@ -7,7 +7,7 @@ Name: python-exif # Remember to update setup.py Version: 1.0.7 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Development/Libraries URL: http://sourceforge.net/projects/%{oname}/ @@ -47,6 +47,9 @@ %{python_sitelib}/EXIF* %changelog +* Mon Mar 3 2008 Terje Rosten - 1.0.7-4 +- Fix script (bz #435758) + * Mon Feb 11 2008 Terje Rosten - 1.0.7-3 - add script and changes.txt From fedora-extras-commits at redhat.com Mon Mar 3 19:02:17 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 3 Mar 2008 19:02:17 GMT Subject: rpms/evolution-rss/F-7 .cvsignore, 1.2, 1.3 evolution-rss.spec, 1.1, 1.2 sources, 1.2, 1.3 evolution-rss-0.0.7-autoreconf.patch, 1.1, NONE evolution-rss-0.0.7-fix-detect.patch, 1.1, NONE evolution-rss-0.0.7-libsoup-2.4.patch, 1.1, NONE Message-ID: <200803031902.m23J2HeU018968@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18939/F-7 Modified Files: .cvsignore evolution-rss.spec sources Removed Files: evolution-rss-0.0.7-autoreconf.patch evolution-rss-0.0.7-fix-detect.patch evolution-rss-0.0.7-libsoup-2.4.patch Log Message: updated to 0.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2008 06:44:22 -0000 1.2 +++ .cvsignore 3 Mar 2008 19:01:42 -0000 1.3 @@ -1 +1 @@ -evolution-rss-0.0.7.tar.gz +evolution-rss-0.0.8.tar.gz Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-7/evolution-rss.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-rss.spec 19 Feb 2008 06:44:22 -0000 1.1 +++ evolution-rss.spec 3 Mar 2008 19:01:42 -0000 1.2 @@ -1,15 +1,12 @@ Summary: Evolution RSS Reader Name: evolution-rss -Version: 0.0.7 -Release: 8%{?dist} +Version: 0.0.8 +Release: 2%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin -Patch0: evolution-rss-0.0.7-fix-detect.patch -Patch1: evolution-rss-0.0.7-libsoup-2.4.patch -Patch2: evolution-rss-0.0.7-autoreconf.patch Requires: evolution Requires(pre): GConf2 @@ -20,7 +17,7 @@ BuildRequires: evolution-devel BuildRequires: evolution-data-server-devel BuildRequires: dbus-glib-devel -#BuildRequires: gecko-devel +BuildRequires: gecko-devel BuildRequires: perl(XML::Parser) BuildRequires: libtool @@ -29,13 +26,9 @@ %prep %setup -q -n evolution-rss-%{version} -%patch0 -p1 -b fixdetect -%patch1 -p1 -b libsoup24 -%patch2 -p1 -b autoreconf %build -autoreconf -i -f -%configure --disable-webkit --disable-gecko +%configure --disable-webkit make %{?_smp_mflags} %install @@ -92,6 +85,10 @@ %doc TODO %changelog +* Tue Mar 3 2008 Lucian Langa - 0.0.8-2 +-Misc cleanups +-Updated to 0.0.8 version + * Tue Feb 19 2008 Lucian Langa - 0.0.7-8 -Misc cleanups Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2008 06:44:22 -0000 1.2 +++ sources 3 Mar 2008 19:01:42 -0000 1.3 @@ -1 +1 @@ -01635af0e33b4dab0a4855160352512c evolution-rss-0.0.7.tar.gz +c5adce093e332573bc1fcfaf23c1f8b6 evolution-rss-0.0.8.tar.gz --- evolution-rss-0.0.7-autoreconf.patch DELETED --- --- evolution-rss-0.0.7-fix-detect.patch DELETED --- --- evolution-rss-0.0.7-libsoup-2.4.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 19:03:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 19:03:38 GMT Subject: rpms/perl-Newt/devel perl-Newt.spec,1.4,1.5 Message-ID: <200803031903.m23J3cG1019066@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Newt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19023/perl-Newt/devel Modified Files: perl-Newt.spec Log Message: new perl Index: perl-Newt.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Newt/devel/perl-Newt.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Newt.spec 19 Feb 2008 07:12:06 -0000 1.4 +++ perl-Newt.spec 3 Mar 2008 19:03:00 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Perl bindings for the Newt library Name: perl-Newt Version: 1.08 -Release: 19 +Release: 20 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot URL: http://search.cpan.org/~amedina/Newt-1.08/ @@ -54,6 +54,9 @@ %{_mandir}/man3/Newt* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 1.08-20 +- Rebuild for new perl (again) + * Tue Feb 19 2008 Fedora Release Engineering - 1.08-19 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 19:03:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 19:03:43 GMT Subject: rpms/crypto-utils/devel crypto-utils.spec,1.37,1.38 Message-ID: <200803031903.m23J3hb1019069@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/crypto-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19023/crypto-utils/devel Modified Files: crypto-utils.spec Log Message: new perl Index: crypto-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/crypto-utils/devel/crypto-utils.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- crypto-utils.spec 19 Feb 2008 07:03:49 -0000 1.37 +++ crypto-utils.spec 3 Mar 2008 19:03:09 -0000 1.38 @@ -4,7 +4,7 @@ Summary: SSL certificate and key management utilities Name: crypto-utils Version: 2.3 -Release: 9 +Release: 10 Source: crypto-rand-%{crver}.tar.gz Source1: genkey.pl Source2: certwatch.c @@ -110,6 +110,9 @@ %{perl_vendorarch}/auto/Crypt %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 2.3-10 +- rebuild for new perl again + * Tue Feb 19 2008 Fedora Release Engineering - 2.3-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 19:05:19 2008 From: fedora-extras-commits at redhat.com (Eric Munson (emunson)) Date: Mon, 3 Mar 2008 19:05:19 GMT Subject: rpms/libvpd/F-8 .cvsignore, 1.2, 1.3 libvpd.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803031905.m23J5Jjq019245@cvs-int.fedora.redhat.com> Author: emunson Update of /cvs/pkgs/rpms/libvpd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19164/F-8 Modified Files: .cvsignore libvpd.spec sources Log Message: Updating Fedora 8 build with libvpd 2.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvpd/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Jan 2008 16:13:05 -0000 1.2 +++ .cvsignore 3 Mar 2008 19:04:42 -0000 1.3 @@ -1 +1 @@ -libvpd-1.5.0.tar.gz +libvpd-2.0.0.tar.gz Index: libvpd.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvpd/F-8/libvpd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libvpd.spec 25 Jan 2008 16:13:05 -0000 1.1 +++ libvpd.spec 3 Mar 2008 19:04:42 -0000 1.2 @@ -1,9 +1,9 @@ %define name libvpd -%define version 1.5.0 +%define version 2.0.0 Name: %{name} Version: %{version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: VPD Database access library for lsvpd Group: System Environment/Libraries @@ -12,7 +12,7 @@ Source: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: db4-devel zlib-devel libstdc++-devel +BuildRequires: sqlite-devel zlib-devel libstdc++-devel %description The libvpd package contains the classes that are used to access a vpd database @@ -21,7 +21,7 @@ %package devel Summary: Header files for libvpd Group: Development/Libraries -Requires: %{name} = %{version}-%{release} db4-devel pkgconfig +Requires: %{name} = %{version}-%{release} sqlite-devel pkgconfig %description devel Contains header files for building with libvpd. @@ -47,19 +47,28 @@ %defattr(-,root,root,-) %doc COPYING NEWS README TODO AUTHORS %exclude %{_libdir}/*.la -%{_libdir}/libvpd_cxx-1.5.so.* -%{_libdir}/libvpd-1.5.so.* +%{_libdir}/libvpd_cxx-2.0.so.* +%{_libdir}/libvpd-2.0.so.* %files devel %defattr(-,root,root,-) %exclude %{_libdir}/*.la -%{_includedir}/libvpd-1 +%{_includedir}/libvpd-2 %{_libdir}/libvpd_cxx.so %{_libdir}/libvpd.so -%{_libdir}/pkgconfig/libvpd-1.pc -%{_libdir}/pkgconfig/libvpd_cxx-1.pc +%{_libdir}/pkgconfig/libvpd-2.pc +%{_libdir}/pkgconfig/libvpd_cxx-2.pc %changelog +* Tue Feb 26 2008 Eric Munson 2.0.0-2 +- Updating release number for new build in FC + +* Mon Feb 25 2008 Eric Munson 2.0.0-1 +- Updated library to use sqlite instead of berkeley db. + +* Mon Feb 18 2008 Fedora Release Engineering - 1.5.0-2 +- Autorebuild for GCC 4.3 + * Mon Jan 7 2008 Eric Munson -1.5.0-1 - Moved pkgconfig to devel Requires - Updated %%defattrs to -,root,root,- Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvpd/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Jan 2008 16:13:05 -0000 1.2 +++ sources 3 Mar 2008 19:04:42 -0000 1.3 @@ -1 +1 @@ -00e1cfb4f9197112c9779522d18bef9e libvpd-1.5.0.tar.gz +cbc029d69be5b133f8238d2a0d1b746c libvpd-2.0.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 19:09:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 19:09:56 GMT Subject: rpms/perl-SDL/devel perl-SDL.spec,1.7,1.8 Message-ID: <200803031909.m23J9u61019507@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SDL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19466/perl-SDL/devel Modified Files: perl-SDL.spec Log Message: new perl Index: perl-SDL.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SDL/devel/perl-SDL.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-SDL.spec 19 Feb 2008 09:27:42 -0000 1.7 +++ perl-SDL.spec 3 Mar 2008 19:09:19 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-SDL Version: 2.1.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: SDL bindings for the Perl language Group: Development/Libraries License: LGPLv2+ @@ -76,6 +76,9 @@ %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 2.1.3-9 +- rebuild for new perl (again) + * Tue Feb 19 2008 Fedora Release Engineering - 2.1.3-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 19:10:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 19:10:18 GMT Subject: rpms/frozen-bubble/devel frozen-bubble.spec,1.10,1.11 Message-ID: <200803031910.m23JAIPI019518@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/frozen-bubble/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19466/frozen-bubble/devel Modified Files: frozen-bubble.spec Log Message: new perl Index: frozen-bubble.spec =================================================================== RCS file: /cvs/pkgs/rpms/frozen-bubble/devel/frozen-bubble.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- frozen-bubble.spec 20 Feb 2008 04:05:39 -0000 1.10 +++ frozen-bubble.spec 3 Mar 2008 19:09:26 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Frozen Bubble arcade game Name: frozen-bubble Version: 2.1.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: Amusements/Games URL: http://www.frozen-bubble.org/ @@ -159,6 +159,9 @@ %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 2.1.0-8 +- rebuild for new perl (again) + * Tue Feb 19 2008 Fedora Release Engineering - 2.1.0-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 19:12:00 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Mon, 3 Mar 2008 19:12:00 GMT Subject: rpms/nfs-utils/F-8 nfs-utils-1.1.1-gssd-mcred.patch, NONE, 1.1 nfs-utils-1.1.1-idmapd-validasc.patch, NONE, 1.1 nfs-utils-1.1.1-mountd-crossmnt-cleanup.patch, NONE, 1.1 nfs-utils-1.1.1-mountd-crossmnt.patch, NONE, 1.1 nfs-utils-1.1.1-xlog-valist.patch, NONE, 1.1 nfs-utils.spec, 1.159, 1.160 Message-ID: <200803031912.m23JC0qL019658@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19608 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.1.1-gssd-mcred.patch nfs-utils-1.1.1-idmapd-validasc.patch nfs-utils-1.1.1-mountd-crossmnt-cleanup.patch nfs-utils-1.1.1-mountd-crossmnt.patch nfs-utils-1.1.1-xlog-valist.patch Log Message: Added a few critical 1.1.1 patches. nfs-utils-1.1.1-gssd-mcred.patch: --- NEW FILE nfs-utils-1.1.1-gssd-mcred.patch --- commit 46d439b17f22216ce8f9257a982c6ade5d1c5931 Author: Vince Busam Date: Tue Feb 26 13:04:52 2008 -0500 Stop gssd from ignoring the machine credential cache defined by the -d flag Signed-off-by: Steve Dickson Signed-off-by: Kevin Coffman diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c index bf8690e..3cf27ca 100644 --- a/utils/gssd/krb5_util.c +++ b/utils/gssd/krb5_util.c @@ -404,7 +404,7 @@ gssd_get_single_krb5_cred(krb5_context context, cache_type = "FILE"; snprintf(cc_name, sizeof(cc_name), "%s:%s/%s%s_%s", cache_type, - GSSD_DEFAULT_CRED_DIR, GSSD_DEFAULT_CRED_PREFIX, + ccachedir, GSSD_DEFAULT_CRED_PREFIX, GSSD_DEFAULT_MACHINE_CRED_SUFFIX, ple->realm); ple->endtime = my_creds.times.endtime; if (ple->ccname != NULL) nfs-utils-1.1.1-idmapd-validasc.patch: --- NEW FILE nfs-utils-1.1.1-idmapd-validasc.patch --- commit bcd0fcaf0966c546da5043be700587f73174ae25 Author: NeilBrown Date: Tue Feb 26 13:57:39 2008 -0500 If validateascii is passed a string containing only non-zero 7bit values, then the loop with exit with i == len, and the following test will access beyond the end of the array. So add an extra test to fix this. Found by Marcus Meissner . Signed-off-by: NeilBrown Signed-off-by: Steve Dickson diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c index 355c6e1..6b5971c 100644 --- a/utils/idmapd/idmapd.c +++ b/utils/idmapd/idmapd.c @@ -848,7 +848,7 @@ validateascii(char *string, u_int32_t len) return (-1); } - if (string[i] != '\0') + if ((i >= len) || string[i] != '\0') return (-1); return (i + 1); nfs-utils-1.1.1-mountd-crossmnt-cleanup.patch: --- NEW FILE nfs-utils-1.1.1-mountd-crossmnt-cleanup.patch --- commit 7a817c45eaeb6aa93fdb5ca4d81c363b4e4218f0 Author: Frank Filz Date: Sat Feb 9 07:48:48 2008 -0500 Cleaned up some typos that were found in the various places in the mountd code. Signed-off-by: Steve Dickson Signed-off-by: Frank Filz diff -up nfs-utils-1.1.1/utils/mountd/cache.c.orig nfs-utils-1.1.1/utils/mountd/cache.c --- nfs-utils-1.1.1/utils/mountd/cache.c.orig 2008-02-09 09:52:40.000000000 -0500 +++ nfs-utils-1.1.1/utils/mountd/cache.c 2008-02-09 09:53:45.000000000 -0500 @@ -111,7 +111,7 @@ void auth_unix_ip(FILE *f) else if (client) qword_print(f, *client?client:"DEFAULT"); qword_eol(f); - xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, *client?client: "DEFAULT"); + xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT"); if (client) free(client); free(he); @@ -516,8 +516,10 @@ void nfsd_fh(FILE *f) qword_print(f, found->e_path); qword_eol(f); out: - free(found_path); - free(he); + if (found_path) + free(found_path); + if (he) + free(he); free(dom); xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL); return; @@ -667,9 +669,9 @@ void nfsd_export(FILE *f) } /* If one is a CROSSMOUNT, then prefer the longest path */ if (((found->m_export.e_flags & NFSEXP_CROSSMOUNT) || - (found->m_export.e_flags & NFSEXP_CROSSMOUNT)) && + (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)) && strlen(found->m_export.e_path) != - strlen(found->m_export.e_path)) { + strlen(exp->m_export.e_path)) { if (strlen(exp->m_export.e_path) > strlen(found->m_export.e_path)) { nfs-utils-1.1.1-mountd-crossmnt.patch: --- NEW FILE nfs-utils-1.1.1-mountd-crossmnt.patch --- commit 2d77e3a27b7b211f303fcc3a813a044838dad970 Author: Steve Dickson Date: Sat Jan 19 07:59:26 2008 -0500 Fix bug when both crossmnt and fsid are set. When exported a filesystems with option inherited (by the crossmnt option) from a higherlevel filesystem, ignore filesystem specific options like FSID and explicit UUID. Signed-off-by: NeilBrown Signed-off-by: Steve Dickson diff -up nfs-utils-1.1.1/utils/mountd/cache.c.orig nfs-utils-1.1.1/utils/mountd/cache.c --- nfs-utils-1.1.1/utils/mountd/cache.c.orig 2008-01-22 14:15:12.000000000 -0500 +++ nfs-utils-1.1.1/utils/mountd/cache.c 2008-01-22 14:16:48.000000000 -0500 @@ -571,20 +571,25 @@ static int dump_to_cache(FILE *f, char * qword_print(f, path); qword_printint(f, time(0)+30*60); if (exp) { - qword_printint(f, exp->e_flags); + int different_fs = strcmp(path, exp->e_path) != 0; + + if (different_fs) + qword_printint(f, exp->e_flags & ~NFSEXP_FSID); + else + qword_printint(f, exp->e_flags); qword_printint(f, exp->e_anonuid); qword_printint(f, exp->e_anongid); qword_printint(f, exp->e_fsid); write_fsloc(f, exp, path); write_secinfo(f, exp); #if USE_BLKID - if (exp->e_uuid == NULL) { + if (exp->e_uuid == NULL || different_fs) { char u[16]; if (get_uuid(path, NULL, 16, u)) { qword_print(f, "uuid"); qword_printhex(f, u, 16); } - } else if (exp->e_uuid) { + } else { qword_print(f, "uuid"); qword_printhex(f, exp->e_uuid, 16); } nfs-utils-1.1.1-xlog-valist.patch: --- NEW FILE nfs-utils-1.1.1-xlog-valist.patch --- commit 399cc3dad0cdfe8dca4a0ae9035a0554d7223eb2 Author: Steve Dickson Date: Thu Jan 17 11:25:37 2008 -0500 Stop segfaults on amd64 during warnings messages by creating a second va_list in xlog_backend() and then use that va_list to print messages on stderr. Signed-off-by: Steinar H. Gunderson Signed-off-by: Steve Langasek Signed-off-by: Steve Dickson diff -up nfs-utils-1.1.1/support/nfs/xlog.c.orig nfs-utils-1.1.1/support/nfs/xlog.c --- nfs-utils-1.1.1/support/nfs/xlog.c.orig 2007-10-18 23:07:28.000000000 -0400 +++ nfs-utils-1.1.1/support/nfs/xlog.c 2008-01-22 14:13:36.000000000 -0500 @@ -133,9 +133,14 @@ xlog_enabled(int fac) void xlog_backend(int kind, const char *fmt, va_list args) { + va_list args2; + if (!(kind & (L_ALL)) && !(logging && (kind & logmask))) return; + if (log_stderr) + va_copy(args2, args); + if (log_syslog) { switch (kind) { case L_FATAL: @@ -171,9 +176,9 @@ xlog_backend(int kind, const char *fmt, #else fprintf(stderr, "%s: ", log_name); #endif - - vfprintf(stderr, fmt, args); + vfprintf(stderr, fmt, args2); fprintf(stderr, "\n"); + va_end(args2); } if (kind == L_FATAL) Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/nfs-utils.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- nfs-utils.spec 3 Mar 2008 18:51:35 -0000 1.159 +++ nfs-utils.spec 3 Mar 2008 19:11:14 -0000 1.160 @@ -32,6 +32,11 @@ Patch07: nfs-utils-1.1.0-exportfs-man-update.patch Patch08: nfs-utils-1.1.1-mountd-man.patch Patch09: nfs-utils-1.1.0-fsloc-nohide.patch +Patch10: nfs-utils-1.1.1-xlog-valist.patch +Patch11: nfs-utils-1.1.1-mountd-crossmnt.patch +Patch12: nfs-utils-1.1.1-mountd-crossmnt-cleanup.patch +Patch13: nfs-utils-1.1.1-gssd-mcred.patch +Patch14: nfs-utils-1.1.1-idmapd-validasc.patch %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch @@ -94,6 +99,11 @@ %patch07 -p1 %patch08 -p1 %patch09 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %if %{enablefscache} %patch90 -p1 From fedora-extras-commits at redhat.com Mon Mar 3 19:14:34 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 3 Mar 2008 19:14:34 GMT Subject: rpms/evolution-rss/F-7 evolution-rss.spec,1.2,1.3 Message-ID: <200803031914.m23JEY6M019752@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19695 Modified Files: evolution-rss.spec Log Message: update to 0.0.8 for F-7 Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/F-7/evolution-rss.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- evolution-rss.spec 3 Mar 2008 19:01:42 -0000 1.2 +++ evolution-rss.spec 3 Mar 2008 19:13:41 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Evolution RSS Reader Name: evolution-rss Version: 0.0.8 -Release: 2%{?dist} +Release: 1%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz @@ -85,7 +85,7 @@ %doc TODO %changelog -* Tue Mar 3 2008 Lucian Langa - 0.0.8-2 +* Tue Mar 3 2008 Lucian Langa - 0.0.8-1 -Misc cleanups -Updated to 0.0.8 version From fedora-extras-commits at redhat.com Mon Mar 3 19:15:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 19:15:55 GMT Subject: rpms/perl-GSSAPI/devel perl-GSSAPI.spec,1.9,1.10 Message-ID: <200803031915.m23JFthC019903@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-GSSAPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19823/perl-GSSAPI/devel Modified Files: perl-GSSAPI.spec Log Message: new perl Index: perl-GSSAPI.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-GSSAPI/devel/perl-GSSAPI.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-GSSAPI.spec 20 Feb 2008 02:57:15 -0000 1.9 +++ perl-GSSAPI.spec 3 Mar 2008 19:15:14 -0000 1.10 @@ -6,7 +6,7 @@ Name: perl-GSSAPI Version: 0.24 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl extension providing access to the GSSAPIv2 library Group: Development/Libraries @@ -64,6 +64,9 @@ %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 0.24-6 +- rebuild for new perl (again) + * Tue Feb 19 2008 Fedora Release Engineering - 0.24-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 19:16:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 19:16:18 GMT Subject: rpms/perl-Time-modules/devel perl-Time-modules.spec,1.9,1.10 Message-ID: <200803031916.m23JGI1t019913@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Time-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19823/perl-Time-modules/devel Modified Files: perl-Time-modules.spec Log Message: new perl Index: perl-Time-modules.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Time-modules/devel/perl-Time-modules.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Time-modules.spec 17 Feb 2008 04:17:05 -0000 1.9 +++ perl-Time-modules.spec 3 Mar 2008 19:15:25 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Time-modules Version: 2006.0814 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl modules for parsing dates and times Group: Development/Libraries License: Copyright only and Public Domain @@ -43,6 +43,9 @@ %{_mandir}/man3/*.3* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 2006.0814-2 +- rebuild for new perl (again) + * Sat Feb 16 2008 Chris Ricker 2006.0814-1 - New upstream release From fedora-extras-commits at redhat.com Mon Mar 3 19:20:18 2008 From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed)) Date: Mon, 3 Mar 2008 19:20:18 GMT Subject: rpms/qtpfsgui/devel .cvsignore, 1.6, 1.7 qtpfsgui.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200803031920.m23JKIu6020103@cvs-int.fedora.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/qtpfsgui/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20063 Modified Files: .cvsignore qtpfsgui.spec sources Log Message: * Mon Mar 03 2008 Douglas E. Warner 1.9.1-1 - update to 1.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtpfsgui/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Dec 2007 13:50:15 -0000 1.6 +++ .cvsignore 3 Mar 2008 19:19:26 -0000 1.7 @@ -1 +1 @@ -qtpfsgui-1.9.0.tar.gz +qtpfsgui-1.9.1.tar.gz Index: qtpfsgui.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtpfsgui/devel/qtpfsgui.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qtpfsgui.spec 20 Feb 2008 00:01:34 -0000 1.10 +++ qtpfsgui.spec 3 Mar 2008 19:19:26 -0000 1.11 @@ -1,7 +1,7 @@ Summary: A graphical tool for creating and tone-mapping HDR images Name: qtpfsgui -Version: 1.9.0 -Release: 2%{?dist} +Version: 1.9.1 +Release: 1%{?dist} #Epoch: 1 License: GPLv2+ Group: Applications/Productivity @@ -59,6 +59,9 @@ %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog +* Mon Mar 03 2008 Douglas E. Warner 1.9.1-1 +- update to 1.9.1 + * Tue Feb 19 2008 Fedora Release Engineering - 1.9.0-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtpfsgui/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Dec 2007 13:50:15 -0000 1.6 +++ sources 3 Mar 2008 19:19:26 -0000 1.7 @@ -1 +1 @@ -cd4dd10e2d757fba4b8edbc31a5ec128 qtpfsgui-1.9.0.tar.gz +ab95c404992a666681434ae57983b295 qtpfsgui-1.9.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 19:22:06 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 3 Mar 2008 19:22:06 GMT Subject: rpms/evolution-rss/devel evolution-rss.spec,1.4,1.5 Message-ID: <200803031922.m23JM66K020185@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20163 Modified Files: evolution-rss.spec Log Message: update to 0.0.8 Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- evolution-rss.spec 28 Feb 2008 19:21:55 -0000 1.4 +++ evolution-rss.spec 3 Mar 2008 19:21:31 -0000 1.5 @@ -1,15 +1,12 @@ Summary: Evolution RSS Reader Name: evolution-rss -Version: 0.0.7 -Release: 9%{?dist} +Version: 0.0.8 +Release: 1%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin -Patch0: evolution-rss-0.0.7-fix-detect.patch -Patch1: evolution-rss-0.0.7-libsoup-2.4.patch -Patch2: evolution-rss-0.0.7-autoreconf.patch Requires: evolution Requires(pre): GConf2 @@ -29,9 +26,6 @@ %prep %setup -q -n evolution-rss-%{version} -%patch0 -p1 -b fixdetect -%patch1 -p1 -b libsoup24 -%patch2 -p1 -b autoreconf %build autoreconf -i -f @@ -92,6 +86,9 @@ %doc TODO %changelog +* Thu Mar 3 2008 Lucian Langa - 0.0.8-1 +-Update to 0.0.8 release + * Thu Feb 28 2008 Lucian Langa - 0.0.7-9 -Build against xulrunner From fedora-extras-commits at redhat.com Mon Mar 3 19:22:57 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Mon, 3 Mar 2008 19:22:57 GMT Subject: rpms/yum/devel .cvsignore, 1.67, 1.68 sources, 1.70, 1.71 yum.spec, 1.194, 1.195 Message-ID: <200803031922.m23JMv8E020289@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20201 Modified Files: .cvsignore sources yum.spec Log Message: 3.2.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum/devel/.cvsignore,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- .cvsignore 8 Feb 2008 21:37:40 -0000 1.67 +++ .cvsignore 3 Mar 2008 19:22:19 -0000 1.68 @@ -1 +1 @@ -yum-3.2.11.tar.gz +yum-3.2.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum/devel/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- sources 8 Feb 2008 21:37:40 -0000 1.70 +++ sources 3 Mar 2008 19:22:19 -0000 1.71 @@ -1 +1 @@ -f7e3144694d4735209da7ad7dcef4c69 yum-3.2.11.tar.gz +9a54cb93a0fa78f456ad4b09f1aea28b yum-3.2.12.tar.gz Index: yum.spec =================================================================== RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- yum.spec 8 Feb 2008 21:37:40 -0000 1.194 +++ yum.spec 3 Mar 2008 19:22:19 -0000 1.195 @@ -2,7 +2,7 @@ Summary: RPM installer/updater Name: yum -Version: 3.2.11 +Version: 3.2.12 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -97,6 +97,9 @@ %dir /usr/lib/yum-plugins %changelog +* Mon Mar 3 2008 Seth Vidal - 3.2.12-1 +- 3.2.12 + * Fri Feb 8 2008 Seth Vidal - 3.2.11-1 - 3.2.11 From fedora-extras-commits at redhat.com Mon Mar 3 19:23:42 2008 From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed)) Date: Mon, 3 Mar 2008 19:23:42 GMT Subject: rpms/qtpfsgui/F-8 .cvsignore, 1.6, 1.7 qtpfsgui.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200803031923.m23JNgo8020385@cvs-int.fedora.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/qtpfsgui/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20245 Modified Files: .cvsignore qtpfsgui.spec sources Log Message: * Mon Mar 03 2008 Douglas E. Warner 1.9.1-1 - update to 1.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtpfsgui/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Dec 2007 18:37:13 -0000 1.6 +++ .cvsignore 3 Mar 2008 19:22:50 -0000 1.7 @@ -1 +1 @@ -qtpfsgui-1.9.0.tar.gz +qtpfsgui-1.9.1.tar.gz Index: qtpfsgui.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtpfsgui/F-8/qtpfsgui.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qtpfsgui.spec 17 Dec 2007 18:37:13 -0000 1.8 +++ qtpfsgui.spec 3 Mar 2008 19:22:50 -0000 1.9 @@ -1,6 +1,6 @@ Summary: A graphical tool for creating and tone-mapping HDR images Name: qtpfsgui -Version: 1.9.0 +Version: 1.9.1 Release: 1%{?dist} #Epoch: 1 License: GPLv2+ @@ -59,6 +59,9 @@ %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog +* Mon Mar 03 2008 Douglas E. Warner 1.9.1-1 +- update to 1.9.1 + * Tue Dec 16 2007 Douglas E. Warner 1.9.0-1 - update to version 1.9.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtpfsgui/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Dec 2007 18:37:13 -0000 1.6 +++ sources 3 Mar 2008 19:22:50 -0000 1.7 @@ -1 +1 @@ -cd4dd10e2d757fba4b8edbc31a5ec128 qtpfsgui-1.9.0.tar.gz +ab95c404992a666681434ae57983b295 qtpfsgui-1.9.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 19:24:55 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 3 Mar 2008 19:24:55 GMT Subject: rpms/evolution-rss/devel evolution-rss-0.0.7-autoreconf.patch, 1.1, NONE evolution-rss-0.0.7-fix-detect.patch, 1.1, NONE evolution-rss-0.0.7-libsoup-2.4.patch, 1.1, NONE Message-ID: <200803031924.m23JOtVB020552@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20508 Removed Files: evolution-rss-0.0.7-autoreconf.patch evolution-rss-0.0.7-fix-detect.patch evolution-rss-0.0.7-libsoup-2.4.patch Log Message: updated to 0.0.8 --- evolution-rss-0.0.7-autoreconf.patch DELETED --- --- evolution-rss-0.0.7-fix-detect.patch DELETED --- --- evolution-rss-0.0.7-libsoup-2.4.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 19:25:09 2008 From: fedora-extras-commits at redhat.com (Douglas E. Warner (silfreed)) Date: Mon, 3 Mar 2008 19:25:09 GMT Subject: rpms/qtpfsgui/F-7 .cvsignore, 1.6, 1.7 qtpfsgui.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200803031925.m23JP9Aa020596@cvs-int.fedora.redhat.com> Author: silfreed Update of /cvs/pkgs/rpms/qtpfsgui/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20499 Modified Files: .cvsignore qtpfsgui.spec sources Log Message: * Mon Mar 03 2008 Douglas E. Warner 1.9.1-1 - update to 1.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtpfsgui/F-7/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Dec 2007 18:38:20 -0000 1.6 +++ .cvsignore 3 Mar 2008 19:24:35 -0000 1.7 @@ -1 +1 @@ -qtpfsgui-1.9.0.tar.gz +qtpfsgui-1.9.1.tar.gz Index: qtpfsgui.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtpfsgui/F-7/qtpfsgui.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qtpfsgui.spec 17 Dec 2007 18:38:20 -0000 1.6 +++ qtpfsgui.spec 3 Mar 2008 19:24:35 -0000 1.7 @@ -1,6 +1,6 @@ Summary: A graphical tool for creating and tone-mapping HDR images Name: qtpfsgui -Version: 1.9.0 +Version: 1.9.1 Release: 1%{?dist} #Epoch: 1 License: GPLv2+ @@ -59,6 +59,9 @@ %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog +* Mon Mar 03 2008 Douglas E. Warner 1.9.1-1 +- update to 1.9.1 + * Tue Dec 16 2007 Douglas E. Warner 1.9.0-1 - update to version 1.9.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtpfsgui/F-7/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Dec 2007 18:38:20 -0000 1.6 +++ sources 3 Mar 2008 19:24:35 -0000 1.7 @@ -1 +1 @@ -cd4dd10e2d757fba4b8edbc31a5ec128 qtpfsgui-1.9.0.tar.gz +ab95c404992a666681434ae57983b295 qtpfsgui-1.9.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 19:25:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 19:25:21 GMT Subject: rpms/perl-IO-AIO/devel perl-IO-AIO.spec,1.3,1.4 Message-ID: <200803031925.m23JPLAe020646@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-AIO/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20533 Modified Files: perl-IO-AIO.spec Log Message: new perl Index: perl-IO-AIO.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-AIO/devel/perl-IO-AIO.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-IO-AIO.spec 9 Feb 2008 13:21:09 -0000 1.3 +++ perl-IO-AIO.spec 3 Mar 2008 19:24:45 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-IO-AIO Version: 2.51 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Asynchronous Input/Output License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 03 2008 Tom "spot" Callaway 2.51-2 +- rebuild for new perl (again) + * Sat Feb 09 2008 Ruben Kerkhof 2.51-1 - Sync with upstream From fedora-extras-commits at redhat.com Mon Mar 3 19:26:21 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 3 Mar 2008 19:26:21 GMT Subject: rpms/asterisk/devel asterisk.spec,1.14,1.15 Message-ID: <200803031926.m23JQL84020718@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20689 Modified Files: asterisk.spec Log Message: Package the directory used to store monitor recordings. Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- asterisk.spec 27 Feb 2008 04:26:10 -0000 1.14 +++ asterisk.spec 3 Mar 2008 19:25:34 -0000 1.15 @@ -4,7 +4,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.6.0 -Release: 0.2.beta4%{?dist} +Release: 0.3.beta4%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -501,6 +501,7 @@ mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/ mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/ +mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/ mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/ # We're not going to package any of the sample AGI scripts @@ -799,6 +800,7 @@ %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-custom/ %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/ +%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/ %attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/ %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/ %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/ @@ -1008,6 +1010,9 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Mon Mar 3 2008 Jeffrey C. Ollie - 1.6.0-0.3.beta4 +- Package the directory used to store monitor recordings. + * Tue Feb 26 2008 Jeffrey C. Ollie - 1.6.0-0.2.beta4 - Add patch from David Woodhouse that fixes building on PPC64. From fedora-extras-commits at redhat.com Mon Mar 3 19:30:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 19:30:50 GMT Subject: rpms/perl-BSD-Resource/devel perl-BSD-Resource.spec,1.27,1.28 Message-ID: <200803031930.m23JUovF020900@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-BSD-Resource/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20831/perl-BSD-Resource/devel Modified Files: perl-BSD-Resource.spec Log Message: new perl Index: perl-BSD-Resource.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- perl-BSD-Resource.spec 19 Feb 2008 21:53:02 -0000 1.27 +++ perl-BSD-Resource.spec 3 Mar 2008 19:29:55 -0000 1.28 @@ -1,6 +1,6 @@ Name: perl-BSD-Resource Version: 1.28 -Release: 5%{?dist} +Release: 6%{?dist} Summary: BSD process resource limit and priority functions Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.28-6 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 1.28-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 19:31:24 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Mon, 3 Mar 2008 19:31:24 GMT Subject: rpms/evolution-rss/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200803031931.m23JVOQJ020930@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20894/devel Modified Files: .cvsignore sources Log Message: updated to 0.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2008 05:54:20 -0000 1.2 +++ .cvsignore 3 Mar 2008 19:30:48 -0000 1.3 @@ -1 +1 @@ -evolution-rss-0.0.7.tar.gz +evolution-rss-0.0.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2008 05:54:20 -0000 1.2 +++ sources 3 Mar 2008 19:30:48 -0000 1.3 @@ -1 +1 @@ -01635af0e33b4dab0a4855160352512c evolution-rss-0.0.7.tar.gz +c5adce093e332573bc1fcfaf23c1f8b6 evolution-rss-0.0.8.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 19:37:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 19:37:00 GMT Subject: rpms/perl-File-MMagic-XS/devel perl-File-MMagic-XS.spec,1.7,1.8 Message-ID: <200803031937.m23Jb010021258@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-MMagic-XS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21223/perl-File-MMagic-XS/devel Modified Files: perl-File-MMagic-XS.spec Log Message: new perl Index: perl-File-MMagic-XS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-MMagic-XS/devel/perl-File-MMagic-XS.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-File-MMagic-XS.spec 20 Feb 2008 01:34:12 -0000 1.7 +++ perl-File-MMagic-XS.spec 3 Mar 2008 19:36:23 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-File-MMagic-XS Version: 0.09003 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Guess file type with XS Group: Development/Libraries License: ASL 2.0 and (GPL+ or Artistic) @@ -54,6 +54,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.09003-4 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 0.09003-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 19:39:21 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 3 Mar 2008 19:39:21 GMT Subject: rpms/totem/devel totem-bin-backend-ondemand.sh, NONE, 1.1 totem.spec, 1.165, 1.166 Message-ID: <200803031939.m23JdLpw021546@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21364 Modified Files: totem.spec Added Files: totem-bin-backend-ondemand.sh Log Message: * Mon Mar 03 2008 - Bastien Nocera - 2.21.96-1 - Update to 2.21.96 - Add ppc and ppc64 to ExcludeArch as liboil is crashing on us (#435771) - Add big patch from Stewart Adam to allow switching between the GStreamer and the xine-lib backends at run-time, see #327211 for details --- NEW FILE totem-bin-backend-ondemand.sh --- #!/bin/sh # setup some variables BIN=totem ARCH="$(uname -m)" if [ "$ARCH" == "x86_64" ];then _LIBDIR="/usr/lib64" elif [ "$ARCH" == "ppc64" ];then _LIBDIR="/usr/lib64" else _LIBDIR="/usr/lib" fi # start functions setBackend() { TOTEM_BACKEND=$1 # Default to GStreamer if there's no config if [ -z $TOTEM_BACKEND ] ; then TOTEM_BACKEND=gstreamer fi # Default to GStreamer if the backend is invalid if [ $TOTEM_BACKEND != "xine" -a $TOTEM_BACKEND != "gstreamer" ] ; then TOTEM_BACKEND=gstreamer fi if [ "$UID" -eq "0" ];then ln -sf totem-plugin-viewer-$TOTEM_BACKEND /usr/libexec/totem-plugin-viewer ln -sf ../../libtotem-properties-page-$TOTEM_BACKEND.so ${_LIBDIR}/nautilus/extensions-2.0/libtotem-properties-page.so fi gconftool-2 -s /apps/totem/backend $TOTEM_BACKEND --type string exit 0 } # end functions # start execution if [ "$1" == "-b" ];then # if we are setting backend, do so and exit setBackend $2 elif [ -z $TOTEM_BACKEND ] ; then # Default to GStreamer if there's no config TOTEM_BACKEND=gstreamer elif [ $TOTEM_BACKEND != "xine" -a $TOTEM_BACKEND != "gstreamer" ] ; then # Default to GStreamer if the backend is invalid TOTEM_BACKEND=gstreamer fi # if no opts are passed, do this TOTEM_BACKEND="$(gconftool-2 -g /apps/totem/backend)" exec $BIN-$TOTEM_BACKEND "$@" exit $? Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- totem.spec 26 Feb 2008 18:36:16 -0000 1.165 +++ totem.spec 3 Mar 2008 19:38:44 -0000 1.166 @@ -1,17 +1,22 @@ -%define gstreamer_version 0.10.1 -%define gstreamer_plugins_base_version 0.10.14-3 -%define gstreamer_plugins_good_version 0.10.0 -%define gtk2_version 2.12.1 -%define gecko_version 1.9 +%define with_gstreamer 1 +%define with_xine 1 + +%define gstreamer_version 0.10.1 +%define gstreamer_plugins_base_version 0.10.14-3 +%define gstreamer_plugins_good_version 0.10.0 +%define gtk2_version 2.12.1 +%define gecko_version 1.9 +%define xine_version 1.1.7 Summary: Movie player for GNOME Name: totem -Version: 2.21.95 +Version: 2.21.96 Release: 1%{?dist} License: GPLv2 with exception Group: Applications/Multimedia URL: http://www.gnome.org/projects/totem/ Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.21/totem-%{version}.tar.bz2 +Source1: totem-bin-backend-ondemand.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): GConf2 >= 2.14 @@ -23,17 +28,14 @@ Requires(postun): scrollkeeper Requires: gnome-desktop >= 2.6.0 -Requires: gstreamer >= %gstreamer_version -Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version -Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version Requires: iso-codes Requires: gnome-themes Requires: gtk2 >= %gtk2_version +# FIXME? +#Requires: %{name}-backend = %{version}-%{release} +Requires: %{name}-gstreamer BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper -BuildRequires: gstreamer-devel >= %gstreamer_version -BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version -BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel BuildRequires: perl(XML::Parser) BuildRequires: iso-codes-devel @@ -60,14 +62,51 @@ Obsoletes: nautilus-media +# See bug 435771 +ExcludeArch: ppc ppc64 + # http://bugzilla.gnome.org/show_bug.cgi?id=458324 Patch0: totem-xul-4.patch +Patch1: totem-2.21.95-backend-schema.patch +Patch2: totem-2.21.95-svnhead.patch +Patch3: totem-2.21.95-nohelp.patch %description Totem is simple movie player for the Gnome desktop. It features a simple playlist, a full-screen mode, seek and volume controls, as well as a pretty complete keyboard navigation. +%if %{with_gstreamer} +%package gstreamer +Summary: Gstreamer backend for Totem +Group: Applications/Multimedia +Provides: %{name}-backend +Requires: %{name} = %{version} +Requires: gstreamer >= %gstreamer_version +Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version +Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version +BuildRequires: gstreamer-devel >= %gstreamer_version +BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version +BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version + +%description gstreamer +This package provides the gstreamer backend for the Totem media player. +%endif + +%if %{with_xine} +%package xine +Summary: Gstreamer backend for Totem +Group: Applications/Multimedia +Provides: %{name}-backend +Requires: %{name} = %{version} +Requires: xine-lib >= %{xine_version} +BuildRequires: xine-lib-devel >= %{xine_version} +Obsoletes: totem-xine-plparser <= %{version}-%{release} + +%description xine +This package provides the xine backend for the Totem media player. +%endif + %package mozplugin Summary: Mozilla plugin for Totem Group: Applications/Internet @@ -135,48 +174,141 @@ A plugin to allow you to share your current playlist (and the files included in that playlist) with other Totems on the same local network. -%package nautilus +%if %{with_gstreamer} +%package nautilus-gstreamer Summary: Video and Audio Properties tab for Nautilus Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -%description nautilus +%description nautilus-gstreamer A Nautilus extension that shows the properties of audio and video files in -the properties dialogue. +the properties dialogue. This package provides the plugin linked against the +gstreamer backend. +%endif + +%if %{with_xine} +%package nautilus-xine +Summary: Video and Audio Properties tab for Nautilus +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} + +%description nautilus-xine +A Nautilus extension that shows the properties of audio and video files in +the properties dialogue. This package provides the plugin linked against the +xine backend. +%endif %prep -%setup -q +%setup -q -c +# Whatever needs to be changed in both copies do here +## remember to update me when changing %doc +for i in AUTHORS COPYING NEWS README TODO;do + cp totem-%{version}/$i . +done +pushd totem-%{version} %patch0 -p0 -b .xulrunner + +# regen automake autoconf +popd + +# duplicate sources +cp -a totem-%{version} xine +mv totem-%{version} gstreamer %build + +%if %{with_gstreamer} +pushd gstreamer # try to work around a problem where gst-inspect does # not find playbin the first time around /usr/bin/gst-inspect-0.10 --print-all > /dev/null export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins +%configure \ + --enable-gstreamer \ + --enable-mozilla \ + --enable-nautilus \ + --disable-scrollkeeper \ + --disable-nvtv \ + --program-suffix '-gstreamer' -%configure \ - --enable-gstreamer \ - --enable-mozilla \ - --enable-nautilus \ - --disable-scrollkeeper \ - --disable-nvtv +make %{?_smp_mflags} +popd +%endif + +%if %{with_xine} +pushd xine +# works around a bug where xine compilation fails due to gnome-keyring.h not +# being found ** this seems to be fixed now ** +#export CFLAGS="-I/usr/include/gnome-keyring-1/" +export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins +%configure \ + --enable-xine \ + --disable-gstreamer \ + --enable-mozilla \ + --enable-nautilus \ + --disable-scrollkeeper \ + --disable-nvtv \ + --program-suffix '-xine' make %{?_smp_mflags} +popd +%endif %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/*.{a,la} \ - $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/*.{a,la} \ - $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la} +%if %{with_gstreamer} +# GSTREAMER INSTALL +pushd gstreamer/ +make install DESTDIR=$RPM_BUILD_ROOT +# language hack +%find_lang %{name} --with-gnome +mv %{name}.lang ../ +# nautilus plugin doesn't use --program-suffix: copy manually +install -m755 ./src/.libs/libtotem-properties-page.so $RPM_BUILD_ROOT%{_libdir}/libtotem-properties-page-gstreamer.so +popd +%endif + +%if %{with_xine} +# XINE INSTALL +pushd xine +make install DESTDIR=$RPM_BUILD_ROOT +# nautilus plugin doesn't use --program-suffix :/ +# copy manually +install -m755 ./src/.libs/libtotem-properties-page.so $RPM_BUILD_ROOT%{_libdir}/libtotem-properties-page-xine.so +popd +%endif + +rm -f $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/*.{a,la} \ + $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/*.{a,la} \ + $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la} + +# nautilus plugin doesn't use --program-suffix :/ +# remove binary file so we can symlink it +rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/libtotem-properties-page.so +mkdir -p $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/ +ln -sf ../../libtotem-properties-page-gstreamer.so $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/libtotem-properties-page.so %find_lang %{name} --with-gnome +# these man pages are one and the same... so make one copy +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{name}*xine* +mv $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-gstreamer.1 \ + $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +mv $RPM_BUILD_ROOT%{_mandir}/man1/totem-video-thumbnailer-gstreamer.1 \ + $RPM_BUILD_ROOT%{_mandir}/man1/totem-video-thumbnailer.1 + +install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name} +# link other binaries +ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-video-thumbnailer +ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-video-indexer +ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-audio-preview +ln -sf %{name}-plugin-viewer-gstreamer $RPM_BUILD_ROOT%{_libexecdir}/%{name}-plugin-viewer + %clean rm -rf $RPM_BUILD_ROOT @@ -185,10 +317,10 @@ update-desktop-database -q export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/totem.schemas \ - %{_sysconfdir}/gconf/schemas/totem-handlers.schemas \ - %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas \ - >& /dev/null || : + %{_sysconfdir}/gconf/schemas/totem.schemas \ + %{_sysconfdir}/gconf/schemas/totem-handlers.schemas \ + %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas \ + >& /dev/null || : touch %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor @@ -197,21 +329,21 @@ %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/totem.schemas \ - %{_sysconfdir}/gconf/schemas/totem-handlers.schemas \ - %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas \ - >& /dev/null || : + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/totem.schemas \ + %{_sysconfdir}/gconf/schemas/totem-handlers.schemas \ + %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas \ + >& /dev/null || : fi %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/totem.schemas \ - %{_sysconfdir}/gconf/schemas/totem-handlers.schemas \ - %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas \ - >& /dev/null || : + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/totem.schemas \ + %{_sysconfdir}/gconf/schemas/totem-handlers.schemas \ + %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas \ + >& /dev/null || : fi %postun @@ -226,15 +358,15 @@ %post mythtv export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas \ - >& /dev/null || : + %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas \ + >& /dev/null || : %pre mythtv if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` if [ -f %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas ] ; then - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas \ + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas \ >& /dev/null || : fi fi @@ -243,8 +375,8 @@ if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` if [ -f %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas ] ; then - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas \ + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas \ >& /dev/null || : fi fi @@ -256,8 +388,13 @@ %config %{_sysconfdir}/gconf/schemas/totem-handlers.schemas %config %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas %{_bindir}/%{name} +%{_bindir}/%{name}-video-thumbnailer +%{_bindir}/%{name}-video-indexer +%{_bindir}/%{name}-audio-preview %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/ +%{_libdir}/nautilus/extensions-2.0/*.so* +%dir %{_libexecdir}/totem %dir %{_libdir}/totem/plugins %{_libdir}/totem/plugins/gromit %{_libdir}/totem/plugins/ontop @@ -268,9 +405,6 @@ %{_libdir}/totem/plugins/totem %{_libdir}/totem/plugins/thumbnail #%{_libdir}/totem/plugins/bemused -%{_bindir}/%{name}-video-thumbnailer -%{_bindir}/%{name}-video-indexer -%{_bindir}/%{name}-audio-preview %{_datadir}/icons/hicolor/*/apps/totem.png %{_datadir}/icons/hicolor/scalable/apps/totem.svg %{_mandir}/man1/%{name}.1* @@ -306,11 +440,44 @@ %defattr(-, root, root) %{_libdir}/totem/plugins/publish -%files nautilus +%if %{with_gstreamer} +%files gstreamer +%{_bindir}/%{name}-gstreamer +%{_bindir}/%{name}-video-thumbnailer-gstreamer +%{_bindir}/%{name}-video-indexer-gstreamer +%{_bindir}/%{name}-audio-preview-gstreamer +%{_libexecdir}/totem-plugin-viewer-gstreamer +%{_libexecdir}/totem/*gstreamer* + +%files nautilus-gstreamer %defattr(-, root, root) -%{_libdir}/nautilus/extensions-*/*.so* +# installed to libdir so we can symlink the real spot +%{_libdir}/libtotem*gstreamer*.so* +%endif + +%if %{with_xine} +%files xine +%{_bindir}/%{name}-xine +%{_bindir}/%{name}-video-thumbnailer-xine +%{_bindir}/%{name}-video-indexer-xine +%{_bindir}/%{name}-audio-preview-xine +%{_libexecdir}/totem-plugin-viewer-xine +%{_libexecdir}/totem/*xine* + +%files nautilus-xine +%defattr(-, root, root) +# installed to libdir so we can symlink the real spot +%{_libdir}/libtotem*xine*.so* +%endif %changelog +* Mon Mar 03 2008 - Bastien Nocera - 2.21.96-1 +- Update to 2.21.96 +- Add ppc and ppc64 to ExcludeArch as liboil is crashing on us (#435771) +- Add big patch from Stewart Adam to allow + switching between the GStreamer and the xine-lib backends at + run-time, see #327211 for details + * Tue Feb 26 2008 - Bastien Nocera - 2.21.95-1 - Update to 2.21.95 @@ -350,7 +517,7 @@ * Sun Dec 9 2007 Matthias Clasen - 2.21.5-2 - Make it build -* Sun Dec 09 2007 - Bastien Nocera - 2.21.5-1 +* Sun Dec 09 2007 - Bastien Nocera - 2.21.5-1 - Update to 2.21.5 - Remove -devel and -plparser subpackages, they're in totem-pl-parser now From fedora-extras-commits at redhat.com Mon Mar 3 19:42:58 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 3 Mar 2008 19:42:58 GMT Subject: rpms/vavoom/devel vavoom.spec,1.8,1.9 Message-ID: <200803031942.m23JgwAY022113@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/vavoom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21990 Modified Files: vavoom.spec Log Message: * Mon Mar 3 2008 Hans de Goede 1.26-3 - Change Requires: timidity++ to timidity++-patches, as we just need the patches Index: vavoom.spec =================================================================== RCS file: /cvs/extras/rpms/vavoom/devel/vavoom.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- vavoom.spec 17 Feb 2008 21:03:19 -0000 1.8 +++ vavoom.spec 3 Mar 2008 19:42:14 -0000 1.9 @@ -1,6 +1,6 @@ Name: vavoom Version: 1.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -26,7 +26,7 @@ BuildRequires: SDL_mixer-devel SDL_net-devel libpng-devel libjpeg-devel BuildRequires: libvorbis-devel mikmod-devel flac-devel openal-devel BuildRequires: libGLU-devel wxGTK-devel desktop-file-utils -Requires: timidity++ hicolor-icon-theme autodownloader +Requires: timidity++-patches hicolor-icon-theme autodownloader %description Vavoom is an enhanced open-source port of Doom. Allowing you to play not only @@ -124,6 +124,10 @@ %changelog +* Mon Mar 3 2008 Hans de Goede 1.26-3 +- Change Requires: timidity++ to timidity++-patches, as we just need the + patches + * Sun Feb 17 2008 Hans de Goede 1.26-2 - Rebuild for new libmikmod - Rebuild with gcc 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 19:50:31 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 3 Mar 2008 19:50:31 GMT Subject: rpms/totem/devel .cvsignore,1.57,1.58 sources,1.57,1.58 Message-ID: <200803031950.m23JoV01023153@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23007 Modified Files: .cvsignore sources Log Message: And don't forget the new sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 26 Feb 2008 18:36:16 -0000 1.57 +++ .cvsignore 3 Mar 2008 19:49:53 -0000 1.58 @@ -1 +1 @@ -totem-2.21.95.tar.bz2 +totem-2.21.96.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 26 Feb 2008 18:36:16 -0000 1.57 +++ sources 3 Mar 2008 19:49:53 -0000 1.58 @@ -1 +1 @@ -251ebe8365f80fbde9689f5f88c41b4d totem-2.21.95.tar.bz2 +b30afe9ea4ed467ac97bfb44fc9d34ad totem-2.21.96.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 19:59:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 19:59:42 +0000 Subject: [pkgdb] gimp-lqr-plugin was added for ics Message-ID: <200803032000.m23K0TpO013173@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package gimp-lqr-plugin with summary Content-aware resizing plug-in for the GIMP Kevin Fenzi (kevin) has approved Package gimp-lqr-plugin Kevin Fenzi (kevin) has added a Fedora devel branch for gimp-lqr-plugin with an owner of ics Kevin Fenzi (kevin) has approved gimp-lqr-plugin in Fedora devel Kevin Fenzi (kevin) has approved Package gimp-lqr-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gimp-lqr-plugin (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gimp-lqr-plugin (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gimp-lqr-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gimp-lqr-plugin From fedora-extras-commits at redhat.com Mon Mar 3 20:00:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:00:17 +0000 Subject: [pkgdb] gimp-lqr-plugin (Fedora, 8) updated by kevin Message-ID: <200803032001.m23K1Bqa013272@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for gimp-lqr-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gimp-lqr-plugin (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gimp-lqr-plugin (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gimp-lqr-plugin (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on gimp-lqr-plugin (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gimp-lqr-plugin From fedora-extras-commits at redhat.com Mon Mar 3 20:00:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:00:17 +0000 Subject: [pkgdb] gimp-lqr-plugin (Fedora, 7) updated by kevin Message-ID: <200803032001.m23K1Bqd013272@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for gimp-lqr-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on gimp-lqr-plugin (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on gimp-lqr-plugin (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on gimp-lqr-plugin (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on gimp-lqr-plugin (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gimp-lqr-plugin From fedora-extras-commits at redhat.com Mon Mar 3 20:00:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:00:17 +0000 Subject: [pkgdb] gimp-lqr-plugin (Fedora, devel) updated by kevin Message-ID: <200803032001.m23K1Bqg013272@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on gimp-lqr-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gimp-lqr-plugin From fedora-extras-commits at redhat.com Mon Mar 3 20:00:27 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 3 Mar 2008 20:00:27 GMT Subject: rpms/gnucash/devel .cvsignore, 1.31, 1.32 gnucash.spec, 1.85, 1.86 sources, 1.33, 1.34 gnucash-2.2.3-newglib.patch, 1.1, NONE Message-ID: <200803032000.m23K0RAj024530@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gnucash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24399 Modified Files: .cvsignore gnucash.spec sources Removed Files: gnucash-2.2.3-newglib.patch Log Message: update to 2.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnucash/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 9 Jan 2008 03:38:22 -0000 1.31 +++ .cvsignore 3 Mar 2008 19:59:37 -0000 1.32 @@ -1 +1 @@ -gnucash-2.2.3.tar.bz2 +gnucash-2.2.4.tar.bz2 Index: gnucash.spec =================================================================== RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- gnucash.spec 19 Feb 2008 16:21:51 -0000 1.85 +++ gnucash.spec 3 Mar 2008 19:59:37 -0000 1.86 @@ -2,9 +2,9 @@ Name: gnucash Summary: GnuCash is an application to keep track of your finances -Version: 2.2.3 +Version: 2.2.4 URL: http://gnucash.org/ -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2 @@ -16,7 +16,6 @@ BuildRequires: desktop-file-utils, texinfo BuildRequires: gettext, slib >= 3a1-5, libtool, intltool Patch: gnucash-quiet.patch -Patch2: gnucash-2.2.3-newglib.patch Requires: gnucash-docs >= 2.2.0 Requires: slib >= 3a1-5 Requires: perl(Finance::Quote) @@ -38,7 +37,6 @@ %prep %setup -q %patch -p1 -%patch2 -p1 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \; %build @@ -130,6 +128,9 @@ %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Mon Mar 3 2008 Bill Nottingham - 2.2.4-1 +- update to 2.2.4 + * Tue Feb 19 2008 Fedora Release Engineering - 2.2.3-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnucash/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 9 Jan 2008 03:38:22 -0000 1.33 +++ sources 3 Mar 2008 19:59:37 -0000 1.34 @@ -1 +1 @@ -a90e2d01e3c487d36e9a5f5fd82d2149 gnucash-2.2.3.tar.bz2 +f521cea858ee7223325114ec98de86ca gnucash-2.2.4.tar.bz2 --- gnucash-2.2.3-newglib.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 20:01:23 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:01:23 GMT Subject: rpms/gimp-lqr-plugin - New directory Message-ID: <200803032001.m23K1Nfv027260@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gimp-lqr-plugin In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24545/rpms/gimp-lqr-plugin Log Message: Directory /cvs/extras/rpms/gimp-lqr-plugin added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:01:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:01:46 GMT Subject: rpms/gimp-lqr-plugin/devel - New directory Message-ID: <200803032001.m23K1kAt031340@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gimp-lqr-plugin/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24545/rpms/gimp-lqr-plugin/devel Log Message: Directory /cvs/extras/rpms/gimp-lqr-plugin/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:01:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:01:55 GMT Subject: rpms/gimp-lqr-plugin Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803032001.m23K1tIx031944@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gimp-lqr-plugin In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24545/rpms/gimp-lqr-plugin Added Files: Makefile import.log Log Message: Setup of module gimp-lqr-plugin --- NEW FILE Makefile --- # Top level Makefile for module gimp-lqr-plugin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Mar 3 20:02:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:02:07 +0000 Subject: [pkgdb] grib_api was added for pertusus Message-ID: <200803032002.m23K2rl6013460@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package grib_api with summary ECMWF encoding/decoding GRIB software Kevin Fenzi (kevin) has approved Package grib_api Kevin Fenzi (kevin) has added a Fedora devel branch for grib_api with an owner of pertusus Kevin Fenzi (kevin) has approved grib_api in Fedora devel Kevin Fenzi (kevin) has approved Package grib_api Kevin Fenzi (kevin) has set commit to Approved for cvsextras on grib_api (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on grib_api (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on grib_api (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grib_api From fedora-extras-commits at redhat.com Mon Mar 3 20:02:01 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 3 Mar 2008 20:02:01 GMT Subject: rpms/gnucash/F-8 .cvsignore, 1.31, 1.32 gnucash.spec, 1.83, 1.84 sources, 1.33, 1.34 Message-ID: <200803032002.m23K2126032023@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gnucash/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24774 Modified Files: .cvsignore gnucash.spec sources Log Message: update to 2.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnucash/F-8/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 9 Jan 2008 03:38:09 -0000 1.31 +++ .cvsignore 3 Mar 2008 20:01:10 -0000 1.32 @@ -1 +1 @@ -gnucash-2.2.3.tar.bz2 +gnucash-2.2.4.tar.bz2 Index: gnucash.spec =================================================================== RCS file: /cvs/extras/rpms/gnucash/F-8/gnucash.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- gnucash.spec 9 Jan 2008 03:38:09 -0000 1.83 +++ gnucash.spec 3 Mar 2008 20:01:10 -0000 1.84 @@ -2,7 +2,7 @@ Name: gnucash Summary: GnuCash is an application to keep track of your finances -Version: 2.2.3 +Version: 2.2.4 URL: http://gnucash.org/ Release: 1%{?dist} License: GPLv2+ @@ -128,6 +128,9 @@ %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Mon Mar 3 2008 Bill Nottingham - 2.2.4-1 +- update to 2.2.4 + * Tue Jan 8 2008 Bill Nottingham - 2.2.3-1 - update to 2.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnucash/F-8/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 9 Jan 2008 03:38:09 -0000 1.33 +++ sources 3 Mar 2008 20:01:10 -0000 1.34 @@ -1 +1 @@ -a90e2d01e3c487d36e9a5f5fd82d2149 gnucash-2.2.3.tar.bz2 +f521cea858ee7223325114ec98de86ca gnucash-2.2.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 20:02:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:02:01 +0000 Subject: [pkgdb] grib_api (Fedora, devel) updated by kevin Message-ID: <200803032002.m23K2tEP013485@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on grib_api (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/grib_api From fedora-extras-commits at redhat.com Mon Mar 3 20:02:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:02:15 GMT Subject: rpms/gimp-lqr-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803032002.m23K2Fed032051@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/gimp-lqr-plugin/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24545/rpms/gimp-lqr-plugin/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gimp-lqr-plugin --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: gimp-lqr-plugin # $Id: Makefile,v 1.1 2008/03/03 20:01:55 kevin Exp $ NAME := gimp-lqr-plugin SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Mar 3 20:03:40 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:03:40 GMT Subject: rpms/grib_api - New directory Message-ID: <200803032003.m23K3eBT032489@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/grib_api In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd32396/rpms/grib_api Log Message: Directory /cvs/extras/rpms/grib_api added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:03:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:03:45 GMT Subject: rpms/grib_api/devel - New directory Message-ID: <200803032003.m23K3jnY032514@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/grib_api/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd32396/rpms/grib_api/devel Log Message: Directory /cvs/extras/rpms/grib_api/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:03:50 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 3 Mar 2008 20:03:50 GMT Subject: rpms/gnucash/EL-5 .cvsignore, 1.29, 1.30 gnucash.spec, 1.79, 1.80 sources, 1.31, 1.32 Message-ID: <200803032003.m23K3ofN032548@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/gnucash/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32359 Modified Files: .cvsignore gnucash.spec sources Log Message: update to 2.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnucash/EL-5/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 9 Jan 2008 03:37:31 -0000 1.29 +++ .cvsignore 3 Mar 2008 20:03:12 -0000 1.30 @@ -1 +1 @@ -gnucash-2.2.3.tar.bz2 +gnucash-2.2.4.tar.bz2 Index: gnucash.spec =================================================================== RCS file: /cvs/extras/rpms/gnucash/EL-5/gnucash.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- gnucash.spec 9 Jan 2008 03:37:31 -0000 1.79 +++ gnucash.spec 3 Mar 2008 20:03:12 -0000 1.80 @@ -2,7 +2,7 @@ Name: gnucash Summary: GnuCash is an application to keep track of your finances -Version: 2.2.3 +Version: 2.2.4 URL: http://gnucash.org/ Release: 1%{?dist} License: GPLv2+ @@ -128,6 +128,9 @@ %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Mon Mar 3 2008 Bill Nottingham - 2.2.4-1 +- update to 2.2.4 + * Tue Jan 8 2008 Bill Nottingham - 2.2.3-1 - update to 2.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnucash/EL-5/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 9 Jan 2008 03:37:31 -0000 1.31 +++ sources 3 Mar 2008 20:03:12 -0000 1.32 @@ -1 +1 @@ -a90e2d01e3c487d36e9a5f5fd82d2149 gnucash-2.2.3.tar.bz2 +f521cea858ee7223325114ec98de86ca gnucash-2.2.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 3 20:03:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:03:58 GMT Subject: rpms/grib_api Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803032003.m23K3w0K032578@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/grib_api In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd32396/rpms/grib_api Added Files: Makefile import.log Log Message: Setup of module grib_api --- NEW FILE Makefile --- # Top level Makefile for module grib_api all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Mar 3 20:04:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:04:07 GMT Subject: rpms/grib_api/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803032004.m23K47qC032648@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/grib_api/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd32396/rpms/grib_api/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module grib_api --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: grib_api # $Id: Makefile,v 1.1 2008/03/03 20:03:58 kevin Exp $ NAME := grib_api SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Mar 3 20:04:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:04:58 +0000 Subject: [pkgdb] ocaml-perl4caml was added for rjones Message-ID: <200803032005.m23K5qOM013760@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-perl4caml with summary OCaml library for calling Perl libraries and code Kevin Fenzi (kevin) has approved Package ocaml-perl4caml Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-perl4caml with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-perl4caml in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-perl4caml Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-perl4caml (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-perl4caml (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-perl4caml (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml From fedora-extras-commits at redhat.com Mon Mar 3 20:05:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:05:25 +0000 Subject: [pkgdb] ocaml-perl4caml (Fedora, 8) updated by kevin Message-ID: <200803032006.m23K6CDw013791@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-perl4caml Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-perl4caml (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-perl4caml (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-perl4caml (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-perl4caml (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml From fedora-extras-commits at redhat.com Mon Mar 3 20:05:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:05:25 +0000 Subject: [pkgdb] ocaml-perl4caml (Fedora, devel) updated by kevin Message-ID: <200803032006.m23K6CE1013791@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-perl4caml (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml From fedora-extras-commits at redhat.com Mon Mar 3 20:06:14 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:06:14 GMT Subject: rpms/ocaml-perl4caml - New directory Message-ID: <200803032006.m23K6EqQ000508@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-perl4caml In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEgM392/rpms/ocaml-perl4caml Log Message: Directory /cvs/extras/rpms/ocaml-perl4caml added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:06:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:06:14 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803032007.m23K78RA013860@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the watchbugzilla acl on mingetty (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 20:06:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:06:15 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803032007.m23K78RG013860@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the commit acl on mingetty (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 20:06:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:06:15 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803032007.m23K78RD013860@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the watchcommits acl on mingetty (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 20:06:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:06:19 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803032007.m23K7DrR013930@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the approveacls acl on mingetty (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Mon Mar 3 20:06:24 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:06:24 GMT Subject: rpms/ocaml-perl4caml/devel - New directory Message-ID: <200803032006.m23K6Ose000545@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-perl4caml/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEgM392/rpms/ocaml-perl4caml/devel Log Message: Directory /cvs/extras/rpms/ocaml-perl4caml/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:06:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:06:33 GMT Subject: rpms/ocaml-perl4caml Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803032006.m23K6XHc000586@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-perl4caml In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEgM392/rpms/ocaml-perl4caml Added Files: Makefile import.log Log Message: Setup of module ocaml-perl4caml --- NEW FILE Makefile --- # Top level Makefile for module ocaml-perl4caml all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Mar 3 20:06:48 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:06:48 GMT Subject: rpms/ocaml-perl4caml/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803032006.m23K6m4x000630@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-perl4caml/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEgM392/rpms/ocaml-perl4caml/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-perl4caml --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-perl4caml # $Id: Makefile,v 1.1 2008/03/03 20:06:33 kevin Exp $ NAME := ocaml-perl4caml SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Mar 3 20:07:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:07:39 +0000 Subject: [pkgdb] ocrad was added for tsmetana Message-ID: <200803032008.m23K8XFL014051@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocrad with summary An Optical Character Recognition program Kevin Fenzi (kevin) has approved Package ocrad Kevin Fenzi (kevin) has added a Fedora devel branch for ocrad with an owner of tsmetana Kevin Fenzi (kevin) has approved ocrad in Fedora devel Kevin Fenzi (kevin) has approved Package ocrad Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocrad (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocrad (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocrad (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocrad From fedora-extras-commits at redhat.com Mon Mar 3 20:08:06 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 3 Mar 2008 20:08:06 GMT Subject: rpms/xorg-x11-drv-rendition/devel commitid, NONE, 1.1 make-git-snapshot.sh, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-rendition.spec, 1.20, 1.21 Message-ID: <200803032008.m23K86uN000933@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-rendition/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv803/devel Modified Files: .cvsignore sources xorg-x11-drv-rendition.spec Added Files: commitid make-git-snapshot.sh Log Message: git snapshot for pciaccess fixes. --- NEW FILE commitid --- 99011b4380991cd56987f75a6d48ee609d931b2a --- NEW FILE make-git-snapshot.sh --- #!/bin/sh DIRNAME=xf86-video-rendition-$( date +%Y%m%d ) rm -rf $DIRNAME git clone git://git.freedesktop.org/git/xorg/driver/xf86-video-rendition $DIRNAME cd $DIRNAME if [ -z "$1" ]; then git log | head -1 else git checkout $1 fi git log | head -1 | awk '{ print $2 }' > ../commitid git repack -a -d cd .. tar jcf $DIRNAME.tar.bz2 $DIRNAME rm -rf $DIRNAME Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-rendition/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Jan 2007 05:09:00 -0000 1.8 +++ .cvsignore 3 Mar 2008 20:07:27 -0000 1.9 @@ -1 +1 @@ -xf86-video-rendition-4.1.3.tar.bz2 +xf86-video-rendition-20080303.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-rendition/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Jan 2007 05:09:02 -0000 1.8 +++ sources 3 Mar 2008 20:07:27 -0000 1.9 @@ -1 +1 @@ -a8b97feccb32184820d5856fe78d34db xf86-video-rendition-4.1.3.tar.bz2 +a0e629b7cb2816455df3f276993c7f35 xf86-video-rendition-20080303.tar.bz2 Index: xorg-x11-drv-rendition.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-rendition/devel/xorg-x11-drv-rendition.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xorg-x11-drv-rendition.spec 20 Feb 2008 07:40:10 -0000 1.20 +++ xorg-x11-drv-rendition.spec 3 Mar 2008 20:07:27 -0000 1.21 @@ -2,32 +2,39 @@ %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers +%define gitdate 20080303 + Summary: Xorg X11 rendition video driver Name: xorg-x11-drv-rendition Version: 4.1.3 -Release: 6%{?dist} +Release: 7.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 -Source1: rendition.xinf +#Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +Source0: xf86-video-rendition-%{gitdate}.tar.bz2 +Source1: rendition.xinf +Source2: make-git-snapshot.sh +Source3: commitid ExcludeArch: s390 s390x -BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6 +BuildRequires: autoconf automake libtool +BuildRequires: xorg-x11-server-sdk >= 1.4.99.1 Requires: hwdata -Requires: xorg-x11-server-Xorg >= 1.3.0.0-6 +Requires: xorg-x11-server-Xorg >= 1.4.99.1 %description X.Org X11 rendition video driver. %prep -%setup -q -n %{tarball}-%{version} +%setup -q -n %{tarball}-%{gitdate} %build +autoreconf -v --install || exit 1 %configure --disable-static make @@ -54,6 +61,9 @@ %{_mandir}/man4/rendition.4* %changelog +* Mon Mar 03 2008 Adam Jackson 4.1.3-7.20080303 +- Git snapshot for pciaccess lovin. + * Wed Feb 20 2008 Fedora Release Engineering - 4.1.3-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 20:08:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:08:16 +0000 Subject: [pkgdb] ocrad (Fedora, 8) updated by kevin Message-ID: <200803032009.m23K93C1014100@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocrad Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocrad (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocrad (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocrad (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocrad (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocrad From fedora-extras-commits at redhat.com Mon Mar 3 20:08:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:08:16 +0000 Subject: [pkgdb] ocrad (Fedora, 7) updated by kevin Message-ID: <200803032009.m23K93C4014100@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for ocrad Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocrad (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocrad (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocrad (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocrad (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocrad From fedora-extras-commits at redhat.com Mon Mar 3 20:08:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:08:17 +0000 Subject: [pkgdb] ocrad (Fedora, devel) updated by kevin Message-ID: <200803032009.m23K93C7014100@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocrad (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocrad From fedora-extras-commits at redhat.com Mon Mar 3 20:09:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:09:19 GMT Subject: rpms/ocrad - New directory Message-ID: <200803032009.m23K9JwM001190@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocrad In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMr1048/rpms/ocrad Log Message: Directory /cvs/extras/rpms/ocrad added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:09:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:09:33 GMT Subject: rpms/ocrad/devel - New directory Message-ID: <200803032009.m23K9X02001238@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocrad/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMr1048/rpms/ocrad/devel Log Message: Directory /cvs/extras/rpms/ocrad/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:09:47 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:09:47 GMT Subject: rpms/ocrad Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803032009.m23K9lW0001292@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocrad In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMr1048/rpms/ocrad Added Files: Makefile import.log Log Message: Setup of module ocrad --- NEW FILE Makefile --- # Top level Makefile for module ocrad all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Mar 3 20:09:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:09:55 GMT Subject: rpms/ocrad/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803032009.m23K9tZE001328@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocrad/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMr1048/rpms/ocrad/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocrad --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocrad # $Id: Makefile,v 1.1 2008/03/03 20:09:47 kevin Exp $ NAME := ocrad SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Mar 3 20:10:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:10:19 +0000 Subject: [pkgdb] lbrickbuster2 was added for jwrdegoede Message-ID: <200803032011.m23KB6dB014377@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package lbrickbuster2 with summary Brickbuster arcade game Kevin Fenzi (kevin) has approved Package lbrickbuster2 Kevin Fenzi (kevin) has added a Fedora devel branch for lbrickbuster2 with an owner of jwrdegoede Kevin Fenzi (kevin) has approved lbrickbuster2 in Fedora devel Kevin Fenzi (kevin) has approved Package lbrickbuster2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lbrickbuster2 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lbrickbuster2 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lbrickbuster2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lbrickbuster2 From fedora-extras-commits at redhat.com Mon Mar 3 20:10:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:10:31 +0000 Subject: [pkgdb] lbrickbuster2 (Fedora, 8) updated by kevin Message-ID: <200803032011.m23KBPWx014417@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for lbrickbuster2 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lbrickbuster2 (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lbrickbuster2 (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lbrickbuster2 (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on lbrickbuster2 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lbrickbuster2 From fedora-extras-commits at redhat.com Mon Mar 3 20:10:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:10:31 +0000 Subject: [pkgdb] lbrickbuster2 (Fedora, devel) updated by kevin Message-ID: <200803032011.m23KBPX2014417@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on lbrickbuster2 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lbrickbuster2 From fedora-extras-commits at redhat.com Mon Mar 3 20:11:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:11:38 GMT Subject: rpms/lbrickbuster2 - New directory Message-ID: <200803032011.m23KBceZ001755@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lbrickbuster2 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIg1671/rpms/lbrickbuster2 Log Message: Directory /cvs/extras/rpms/lbrickbuster2 added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:11:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:11:46 GMT Subject: rpms/lbrickbuster2/devel - New directory Message-ID: <200803032011.m23KBkEE001788@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lbrickbuster2/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIg1671/rpms/lbrickbuster2/devel Log Message: Directory /cvs/extras/rpms/lbrickbuster2/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:11:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:11:56 GMT Subject: rpms/lbrickbuster2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803032011.m23KBu8W001836@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lbrickbuster2 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIg1671/rpms/lbrickbuster2 Added Files: Makefile import.log Log Message: Setup of module lbrickbuster2 --- NEW FILE Makefile --- # Top level Makefile for module lbrickbuster2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Mar 3 20:12:02 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:12:02 GMT Subject: rpms/lbrickbuster2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803032012.m23KC2SZ001870@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lbrickbuster2/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIg1671/rpms/lbrickbuster2/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lbrickbuster2 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: lbrickbuster2 # $Id: Makefile,v 1.1 2008/03/03 20:11:57 kevin Exp $ NAME := lbrickbuster2 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Mar 3 20:13:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:13:38 +0000 Subject: [pkgdb] xfhell was added for bjensen Message-ID: <200803032014.m23KEPKP014722@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xfhell with summary GTK based Ham Radio application for the Hellschreiber communications mode Kevin Fenzi (kevin) has approved Package xfhell Kevin Fenzi (kevin) has added a Fedora devel branch for xfhell with an owner of bjensen Kevin Fenzi (kevin) has approved xfhell in Fedora devel Kevin Fenzi (kevin) has approved Package xfhell Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfhell (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfhell (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfhell (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfhell From fedora-extras-commits at redhat.com Mon Mar 3 20:14:00 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 3 Mar 2008 20:14:00 GMT Subject: rpms/totem/devel totem.spec,1.166,1.167 Message-ID: <200803032014.m23KE0s6002220@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2057 Modified Files: totem.spec Log Message: Remove unused patches mentioned in the .spec Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- totem.spec 3 Mar 2008 19:38:44 -0000 1.166 +++ totem.spec 3 Mar 2008 20:12:56 -0000 1.167 @@ -67,9 +67,6 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=458324 Patch0: totem-xul-4.patch -Patch1: totem-2.21.95-backend-schema.patch -Patch2: totem-2.21.95-svnhead.patch -Patch3: totem-2.21.95-nohelp.patch %description Totem is simple movie player for the Gnome desktop. It features a From fedora-extras-commits at redhat.com Mon Mar 3 20:14:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:14:07 +0000 Subject: [pkgdb] xfhell (Fedora, 8) updated by kevin Message-ID: <200803032015.m23KF1Nv014793@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xfhell Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfhell (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfhell (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfhell (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on xfhell (Fedora 8) for sindrepb Kevin Fenzi (kevin) approved watchcommits on xfhell (Fedora 8) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on xfhell (Fedora 8) for sconklin Kevin Fenzi (kevin) approved watchcommits on xfhell (Fedora 8) for sconklin Kevin Fenzi (kevin) approved commit on xfhell (Fedora 8) for sconklin Kevin Fenzi (kevin) approved build on xfhell (Fedora 8) for sconklin Kevin Fenzi (kevin) approved approveacls on xfhell (Fedora 8) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on xfhell (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfhell From fedora-extras-commits at redhat.com Mon Mar 3 20:14:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:14:07 +0000 Subject: [pkgdb] xfhell (Fedora, 7) updated by kevin Message-ID: <200803032015.m23KF1Nx014793@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for xfhell Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfhell (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfhell (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfhell (Fedora 7) Kevin Fenzi (kevin) approved watchbugzilla on xfhell (Fedora 7) for sindrepb Kevin Fenzi (kevin) approved watchcommits on xfhell (Fedora 7) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on xfhell (Fedora 7) for sconklin Kevin Fenzi (kevin) approved watchcommits on xfhell (Fedora 7) for sconklin Kevin Fenzi (kevin) approved commit on xfhell (Fedora 7) for sconklin Kevin Fenzi (kevin) approved build on xfhell (Fedora 7) for sconklin Kevin Fenzi (kevin) approved approveacls on xfhell (Fedora 7) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on xfhell (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfhell From fedora-extras-commits at redhat.com Mon Mar 3 20:14:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 03 Mar 2008 20:14:08 +0000 Subject: [pkgdb] xfhell (Fedora, devel) updated by kevin Message-ID: <200803032015.m23KF1O1014793@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on xfhell (Fedora devel) for sindrepb Kevin Fenzi (kevin) approved watchcommits on xfhell (Fedora devel) for sindrepb Kevin Fenzi (kevin) approved watchbugzilla on xfhell (Fedora devel) for sconklin Kevin Fenzi (kevin) approved watchcommits on xfhell (Fedora devel) for sconklin Kevin Fenzi (kevin) approved commit on xfhell (Fedora devel) for sconklin Kevin Fenzi (kevin) approved build on xfhell (Fedora devel) for sconklin Kevin Fenzi (kevin) approved approveacls on xfhell (Fedora devel) for sconklin Kevin Fenzi (kevin) Approved cvsextras for commit access on xfhell (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfhell From fedora-extras-commits at redhat.com Mon Mar 3 20:14:52 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:14:52 GMT Subject: rpms/xfhell - New directory Message-ID: <200803032014.m23KEqTH002404@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfhell In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCp2314/rpms/xfhell Log Message: Directory /cvs/extras/rpms/xfhell added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:15:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:15:08 GMT Subject: rpms/xfhell/devel - New directory Message-ID: <200803032015.m23KF8Xt002453@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfhell/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCp2314/rpms/xfhell/devel Log Message: Directory /cvs/extras/rpms/xfhell/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 3 20:15:14 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:15:14 GMT Subject: rpms/xfhell Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803032015.m23KFEiT002493@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfhell In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCp2314/rpms/xfhell Added Files: Makefile import.log Log Message: Setup of module xfhell --- NEW FILE Makefile --- # Top level Makefile for module xfhell all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Mar 3 20:15:27 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 3 Mar 2008 20:15:27 GMT Subject: rpms/xfhell/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803032015.m23KFRFT002535@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfhell/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCp2314/rpms/xfhell/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfhell --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xfhell # $Id: Makefile,v 1.1 2008/03/03 20:15:15 kevin Exp $ NAME := xfhell SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Mar 3 20:20:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:20:07 GMT Subject: rpms/perl-Text-CSV_XS/devel perl-Text-CSV_XS.spec,1.11,1.12 Message-ID: <200803032020.m23KK76Y003345@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-CSV_XS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3190/perl-Text-CSV_XS/devel Modified Files: perl-Text-CSV_XS.spec Log Message: new perl Index: perl-Text-CSV_XS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CSV_XS/devel/perl-Text-CSV_XS.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Text-CSV_XS.spec 19 Feb 2008 22:13:41 -0000 1.11 +++ perl-Text-CSV_XS.spec 3 Mar 2008 20:19:20 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Text-CSV_XS Version: 0.30 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Comma-separated values manipulation routines Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.30-5 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 0.30-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 20:20:22 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Mon, 3 Mar 2008 20:20:22 GMT Subject: rpms/binutils/devel binutils-2.18.50.0.4-aranges-revert.patch, NONE, 1.1 binutils-2.18.50.0.4-shared-test.patch, NONE, 1.1 binutils.spec, 1.129, 1.130 Message-ID: <200803032020.m23KKMJp003385@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/binutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3264 Modified Files: binutils.spec Added Files: binutils-2.18.50.0.4-aranges-revert.patch binutils-2.18.50.0.4-shared-test.patch Log Message: 2.18.50.0.4-2 binutils-2.18.50.0.4-aranges-revert.patch: --- NEW FILE binutils-2.18.50.0.4-aranges-revert.patch --- 2008-02-12 Alan Modra PR 5303, 5755 * arange-set.c: Delete. * arange-set.h: Delete. * dwarf2.c: Revert 2007-09-21 changes. * Makefile.am: Likewise. * Makefile.in: Regenerate. * po/SRC-POTFILES.in: Regenerate. --- bfd/Makefile.am 8 Nov 2007 13:51:06 -0000 1.208 +++ bfd/Makefile.am 12 Feb 2008 00:25:59 -0000 1.209 @@ -42,7 +42,7 @@ BFD32_LIBS = \ format.lo init.lo libbfd.lo opncls.lo reloc.lo \ section.lo syms.lo targets.lo hash.lo linker.lo \ srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo \ - merge.lo dwarf2.lo simple.lo arange-set.lo + merge.lo dwarf2.lo simple.lo BFD64_LIBS = archive64.lo @@ -52,7 +52,7 @@ BFD32_LIBS_CFILES = \ format.c init.c libbfd.c opncls.c reloc.c \ section.c syms.c targets.c hash.c linker.c \ srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \ - merge.c dwarf2.c simple.c arange-set.c + merge.c dwarf2.c simple.c BFD64_LIBS_CFILES = archive64.c @@ -665,8 +665,8 @@ CFILES = $(SOURCE_CFILES) $(BUILD_CFILES ## This is a list of all .h files which are in the source tree. SOURCE_HFILES = \ - arange-set.h aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h \ - ecoffswap.h elf-bfd.h elf-hppa.h elf32-hppa.h \ + aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \ + elf-bfd.h elf-hppa.h elf32-hppa.h \ elf64-hppa.h elfcode.h elfcore.h \ freebsd.h genlink.h go32stub.h \ libaout.h libbfd.h libcoff.h libecoff.h libhppa.h libieee.h \ @@ -1049,11 +1049,9 @@ merge.lo: merge.c $(INCDIR)/filenames.h dwarf2.lo: dwarf2.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/dwarf2.h arange-set.h + $(INCDIR)/elf/dwarf2.h simple.lo: simple.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/bfdlink.h -arange-set.lo: arange-set.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ - $(INCDIR)/hashtab.h arange-set.h $(INCDIR)/splay-tree.h archive64.lo: archive64.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/aout/ar.h cpu-alpha.lo: cpu-alpha.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h --- bfd/Makefile.in 8 Nov 2007 13:51:06 -0000 1.229 +++ bfd/Makefile.in 12 Feb 2008 00:25:59 -0000 1.230 @@ -84,7 +84,7 @@ am__objects_1 = archive.lo archures.lo b cache.lo coffgen.lo corefile.lo format.lo init.lo libbfd.lo \ opncls.lo reloc.lo section.lo syms.lo targets.lo hash.lo \ linker.lo srec.lo binary.lo tekhex.lo ihex.lo stabs.lo \ - stab-syms.lo merge.lo dwarf2.lo simple.lo arange-set.lo + stab-syms.lo merge.lo dwarf2.lo simple.lo am_libbfd_la_OBJECTS = $(am__objects_1) libbfd_la_OBJECTS = $(am_libbfd_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. @@ -292,7 +292,7 @@ BFD32_LIBS = \ format.lo init.lo libbfd.lo opncls.lo reloc.lo \ section.lo syms.lo targets.lo hash.lo linker.lo \ srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo \ - merge.lo dwarf2.lo simple.lo arange-set.lo + merge.lo dwarf2.lo simple.lo BFD64_LIBS = archive64.lo BFD32_LIBS_CFILES = \ @@ -301,7 +301,7 @@ BFD32_LIBS_CFILES = \ format.c init.c libbfd.c opncls.c reloc.c \ section.c syms.c targets.c hash.c linker.c \ srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \ - merge.c dwarf2.c simple.c arange-set.c + merge.c dwarf2.c simple.c BFD64_LIBS_CFILES = archive64.c @@ -915,8 +915,8 @@ BUILD_CFILES = \ CFILES = $(SOURCE_CFILES) $(BUILD_CFILES) SOURCE_HFILES = \ - arange-set.h aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h \ - ecoffswap.h elf-bfd.h elf-hppa.h elf32-hppa.h \ + aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \ + elf-bfd.h elf-hppa.h elf32-hppa.h \ elf64-hppa.h elfcode.h elfcore.h \ freebsd.h genlink.h go32stub.h \ libaout.h libbfd.h libcoff.h libecoff.h libhppa.h libieee.h \ @@ -1629,11 +1629,9 @@ merge.lo: merge.c $(INCDIR)/filenames.h dwarf2.lo: dwarf2.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ - $(INCDIR)/elf/dwarf2.h arange-set.h + $(INCDIR)/elf/dwarf2.h simple.lo: simple.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/bfdlink.h -arange-set.lo: arange-set.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ - $(INCDIR)/hashtab.h arange-set.h $(INCDIR)/splay-tree.h archive64.lo: archive64.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/aout/ar.h cpu-alpha.lo: cpu-alpha.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h --- bfd/dwarf2.c 21 Sep 2007 16:16:17 -0000 1.102 +++ bfd/dwarf2.c 12 Feb 2008 00:25:59 -0000 1.103 @@ -36,7 +36,6 @@ #include "libbfd.h" #include "elf-bfd.h" #include "elf/dwarf2.h" -#include "arange-set.h" /* The data in the .debug_line statement prologue looks like this. */ @@ -90,9 +89,6 @@ struct dwarf2_debug /* Last comp unit in list above. */ struct comp_unit *last_comp_unit; - /* Number of comp units. */ - int comp_unit_count; - /* The next unread compilation unit within the .debug_info section. Zero indicates that the .debug_info section has not been loaded into a buffer yet. */ @@ -167,33 +163,11 @@ struct dwarf2_debug #define STASH_INFO_HASH_OFF 0 #define STASH_INFO_HASH_ON 1 #define STASH_INFO_HASH_DISABLED 2 - - /* Arange-set for fast lookup. The aranges in this set have pointers - to compilation units containing them. In the unlikely case that there - are multiple compilation units associated with an arange, the arange-set - is a NULL pointer and we need to fall back to sequential search. */ - arange_set comp_unit_arange_set; - - /* Status of global arange set. */ - int arange_set_status; -#define STASH_ARANGE_SET_OFF 0 -#define STASH_ARANGE_SET_ON 1 -#define STASH_ARANGE_SET_DISABLED 2 - - /* Build a whole binary arange-set for compilation unit look-up - if there are at least this many compilation units. */ -#define STASH_ARANGE_SET_TRIGGER 500 }; -/* Simple singly linked list for aranges. We now use a more scalable - arange-set for aranges in compilation units. For functions, we still - use this since it is more efficient for simple cases. */ - struct arange { struct arange *next; - /* The lowest and highest addresses contained a compilation - unit as specified in the compilation unit's header. */ bfd_vma low; bfd_vma high; }; @@ -213,8 +187,9 @@ struct comp_unit /* Keep the bfd convenient (for memory allocation). */ bfd *abfd; - /* The set of aranges in a compilation unit. */ - arange_set arange_set; + /* The lowest and highest addresses contained in this compilation + unit as specified in the compilation unit header. */ + struct arange arange; /* The DW_AT_name attribute (for error messages). */ char *name; @@ -895,8 +870,8 @@ struct line_info_table char *comp_dir; char **dirs; struct fileinfo* files; - struct line_info* last_line; /* Largest VMA. */ - struct line_info* lcl_head; /* Local head; used in 'add_line_info'. */ + struct line_info* last_line; /* largest VMA */ + struct line_info* lcl_head; /* local head; used in 'add_line_info' */ }; /* Remember some information about each function. If the function is @@ -906,121 +881,35 @@ struct line_info_table struct funcinfo { - struct funcinfo *prev_func; /* Pointer to previous function in list of all functions. */ - struct funcinfo *caller_func; /* Pointer to function one scope higher. */ - char *caller_file; /* Source location file name where caller_func inlines this func. */ - int caller_line; /* Source location line number where caller_func inlines this func. */ - char *file; /* Source location file name. */ - int line; /* Source location line number. */ + struct funcinfo *prev_func; /* Pointer to previous function in list of all functions */ + struct funcinfo *caller_func; /* Pointer to function one scope higher */ + char *caller_file; /* Source location file name where caller_func inlines this func */ + int caller_line; /* Source location line number where caller_func inlines this func */ + char *file; /* Source location file name */ + int line; /* Source location line number */ int tag; char *name; struct arange arange; - asection *sec; /* Where the symbol is defined. */ + asection *sec; /* Where the symbol is defined */ }; struct varinfo { - /* Pointer to previous variable in list of all variables. */ + /* Pointer to previous variable in list of all variables */ struct varinfo *prev_var; - /* Source location file name. */ + /* Source location file name */ char *file; - /* Source location line number. */ + /* Source location line number */ int line; int tag; char *name; bfd_vma addr; - /* Where the symbol is defined. */ + /* Where the symbol is defined */ asection *sec; - /* Is this a stack variable? */ + /* Is this a stack variable? */ unsigned int stack: 1; }; -/* Arange-sets: - - To handle extremely large binaries, we want to use a more efficient data - structure than a singly-linked list to represent aranges. So instead we - use an arange-set, which supports efficient insertions and queries. We - use a simple arange-set with no values attached to represent the aranges - in a compilation unit and we also use a global arange-set to store all - the aranges in all the compilation units. The global arange-set stores - values which are pointers to the compilation units. - - Normally aranges in the global set do not overlap, but this can happen. - To simplify things and to prevent excessive memory usage, an arange in - the global set can only point to at most one compilation unit. In case - of an overlap, the pointer is set to NULL, meaning that there are more - than one compilation units containing that arange. Code that looks up - the global set should fall back to searching all compilation units if - that happens. */ - -/* Allocate memory for an arange set. */ - -static void * -dwarf2_arange_set_allocate (int size, void *data) -{ - return bfd_alloc ((bfd *) data, size); -} - -/* Deallocate memory of an arange set. */ - -static void -dwarf2_arange_set_deallocate (void *object ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) -{ - /* Do nothing. Let BFD clean up when it's done. */ -} - -/* Combine two comp unit pointers. If they are the same, - return either one, otherwise return NULL. */ - -static arange_value_type -dwarf2_combine_arange_value (arange_value_type value1, - arange_value_type value2, - void *data ATTRIBUTE_UNUSED) -{ - return ((value1 == value2) ? value1 : 0); -} - -/* Create a simple arange set that does not store values. */ - -static arange_set -dwarf2_arange_set_new (bfd *abfd) -{ - return arange_set_new (dwarf2_arange_set_allocate, - dwarf2_arange_set_deallocate, - FALSE, NULL, NULL, NULL, NULL, (void *) abfd); -} - -/* Create an arange set that stores pointers to compilation units. */ - -static arange_set -dwarf2_arange_set_with_value_new (bfd *abfd) -{ - return arange_set_new (dwarf2_arange_set_allocate, - dwarf2_arange_set_deallocate, - TRUE, NULL, NULL, dwarf2_combine_arange_value, - NULL, (void *) abfd); -} - -/* Add an arange to a compilation unit. Add the arange to both the - unit's valueless arange set and the global arange set. */ - -static void -dwarf2_comp_unit_arange_add (struct comp_unit *unit, - bfd_vma low, - bfd_vma high) -{ - /* Add arange to unit's local arange set. */ - arange_set_insert (unit->arange_set, low, high - 1, 0); - - if (unit->stash->arange_set_status == STASH_ARANGE_SET_ON) - { - BFD_ASSERT (unit->stash->comp_unit_arange_set); - arange_set_insert (unit->stash->comp_unit_arange_set, low, high - 1, - (arange_value_type) unit); - } -} - /* Return TRUE if NEW_LINE should sort after LINE. */ static inline bfd_boolean @@ -1046,7 +935,7 @@ add_line_info (struct line_info_table *t int end_sequence) { bfd_size_type amt = sizeof (struct line_info); - struct line_info * info = bfd_alloc (table->abfd, amt); + struct line_info* info = bfd_alloc (table->abfd, amt); /* Set member data of 'info'. */ info->address = address; @@ -1090,9 +979,9 @@ add_line_info (struct line_info_table *t table->last_line = info; } else if (!table->last_line - || new_line_sorts_after (info, table->last_line)) + || new_line_sorts_after (info, table->last_line)) { - /* Normal case: add 'info' to the beginning of the list. */ + /* Normal case: add 'info' to the beginning of the list */ info->prev_line = table->last_line; table->last_line = info; @@ -1112,7 +1001,7 @@ add_line_info (struct line_info_table *t { /* Abnormal and hard: Neither 'last_line' nor 'lcl_head' are valid heads for 'info'. Reset 'lcl_head'. */ - struct line_info* li2 = table->last_line; /* Always non-NULL. */ + struct line_info* li2 = table->last_line; /* always non-NULL */ struct line_info* li1 = li2->prev_line; while (li1) @@ -1121,7 +1010,7 @@ add_line_info (struct line_info_table *t && new_line_sorts_after (info, li1)) break; - li2 = li1; /* Always non-NULL. */ + li2 = li1; /* always non-NULL */ li1 = li1->prev_line; } table->lcl_head = li2; @@ -1195,12 +1084,11 @@ concat_filename (struct line_info_table } static void -arange_add (bfd *abfd, struct arange *first_arange, bfd_vma low_pc, - bfd_vma high_pc) +arange_add (bfd *abfd, struct arange *first_arange, bfd_vma low_pc, bfd_vma high_pc) { struct arange *arange; - /* If the first arange is empty, use it. */ + /* If the first arange is empty, use it. */ if (first_arange->high == 0) { first_arange->low = low_pc; @@ -1227,7 +1115,7 @@ arange_add (bfd *abfd, struct arange *fi while (arange); /* Need to allocate a new arange and insert it into the arange list. - Order isn't significant, so just insert after the first arange. */ + Order isn't significant, so just insert after the first arange. */ arange = bfd_zalloc (abfd, sizeof (*arange)); arange->low = low_pc; arange->high = high_pc; @@ -1462,7 +1350,7 @@ decode_line_info (struct comp_unit *unit low_pc = address; if (address > high_pc) high_pc = address; - dwarf2_comp_unit_arange_add (unit, low_pc, high_pc); + arange_add (unit->abfd, &unit->arange, low_pc, high_pc); break; case DW_LNE_set_address: address = read_address (unit, line_ptr); @@ -1879,44 +1767,11 @@ find_abstract_instance_name (struct comp } } } - return name; -} - -/* Type of callback function used in read_rangelist below. */ - -typedef void (*read_rangelist_callback_t)(struct comp_unit*, bfd_vma, - bfd_vma, void*); - -/* Call back to add an arange to the old-style arange list. */ - -static void -read_rangelist_insert_arange_list (struct comp_unit *unit, - bfd_vma low, - bfd_vma high, - void *data) -{ - arange_add (unit->abfd, (struct arange*) data, low, high); + return (name); } -/* Callback to add an arange in the arange set of a compilation unit. */ - -static void -read_rangelist_comp_unit_arange_add (struct comp_unit *unit, - bfd_vma low, - bfd_vma high, - void *data ATTRIBUTE_UNUSED) -{ - dwarf2_comp_unit_arange_add (unit, low, high); -} - -/* Read ARANGE list of a compilation unit. For each read arange, - call the supplied callback function for further processing. */ - static void -read_rangelist (struct comp_unit *unit, - bfd_uint64_t offset, - read_rangelist_callback_t callback, - void *callback_data) +read_rangelist (struct comp_unit *unit, struct arange *arange, bfd_uint64_t offset) { bfd_byte *ranges_ptr; bfd_vma base_address = unit->base_address; @@ -1952,9 +1807,7 @@ read_rangelist (struct comp_unit *unit, if (low_pc == -1UL && high_pc != -1UL) base_address = high_pc; else - /* Call callback to process new arange. */ - (callback) (unit, base_address + low_pc, base_address + high_pc, - callback_data); + arange_add (unit->abfd, arange, base_address + low_pc, base_address + high_pc); } } @@ -2087,9 +1940,7 @@ scan_unit_for_symbols (struct comp_unit break; case DW_AT_ranges: - read_rangelist (unit, attr.u.val, - read_rangelist_insert_arange_list, - & func->arange); + read_rangelist (unit, &func->arange, attr.u.val); break; case DW_AT_decl_file: @@ -2291,7 +2142,6 @@ parse_comp_unit (struct dwarf2_debug *st unit->end_ptr = end_ptr; unit->stash = stash; unit->info_ptr_unit = info_ptr_unit; - unit->arange_set = dwarf2_arange_set_new (abfd); for (i = 0; i < abbrev->num_attrs; ++i) { @@ -2323,14 +2173,12 @@ parse_comp_unit (struct dwarf2_debug *st break; case DW_AT_ranges: - read_rangelist (unit, attr.u.val, - read_rangelist_comp_unit_arange_add, NULL); + read_rangelist (unit, &unit->arange, attr.u.val); break; case DW_AT_comp_dir: { char *comp_dir = attr.u.str; - if (comp_dir) { /* Irix 6.2 native cc prepends .: to the compilation @@ -2348,9 +2196,10 @@ parse_comp_unit (struct dwarf2_debug *st break; } } - if (high_pc != 0) - dwarf2_comp_unit_arange_add (unit, low_pc, high_pc); + { + arange_add (unit->abfd, &unit->arange, low_pc, high_pc); + } unit->first_child_die_ptr = info_ptr; return unit; @@ -2365,7 +2214,21 @@ parse_comp_unit (struct dwarf2_debug *st static bfd_boolean comp_unit_contains_address (struct comp_unit *unit, bfd_vma addr) { - return arange_set_lookup_address (unit->arange_set, addr, NULL, NULL, NULL); + struct arange *arange; + + if (unit->error) + return FALSE; + + arange = &unit->arange; + do + { + if (addr >= arange->low && addr < arange->high) + return TRUE; + arange = arange->next; + } + while (arange); + + return FALSE; } /* If UNIT contains ADDR, set the output parameters to the values for @@ -2937,107 +2800,6 @@ stash_find_line_fast (struct dwarf2_debu filename_ptr, linenumber_ptr); } -typedef struct -{ - struct dwarf2_debug * stash; - arange_set set; - struct comp_unit * unit; -} stash_copy_local_aranges_data_t; - -static int -stash_copy_local_aranges (bfd_vma low, - bfd_vma high, - arange_value_type data ATTRIBUTE_UNUSED, - void *info) -{ - bfd_boolean status; - - stash_copy_local_aranges_data_t *copy_data = info; - status = arange_set_insert (copy_data->set, low, high, - (arange_value_type) copy_data->unit); - - return status ? 0 : 1; -} - -static bfd_boolean -stash_maybe_enable_arange_set (bfd *abfd, struct dwarf2_debug *stash) -{ - struct comp_unit *unit; - stash_copy_local_aranges_data_t copy_data; - - if (stash->arange_set_status != STASH_ARANGE_SET_OFF) - return TRUE; - - if (stash->comp_unit_count < STASH_ARANGE_SET_TRIGGER) - return TRUE; - - if (stash->comp_unit_arange_set == NULL) - { - stash->comp_unit_arange_set = - dwarf2_arange_set_with_value_new (abfd); - if (!stash->comp_unit_arange_set) - { - stash->arange_set_status = STASH_ARANGE_SET_DISABLED; - return FALSE; - } - } - - copy_data.stash = stash; - copy_data.set = stash->comp_unit_arange_set; - for (unit = stash->all_comp_units; unit; unit = unit->next_unit) - { - copy_data.unit = unit; - if (arange_set_foreach (unit->arange_set, stash_copy_local_aranges, - & copy_data)) - { - stash->arange_set_status = STASH_ARANGE_SET_DISABLED; - return FALSE; - } - } - stash->arange_set_status = STASH_ARANGE_SET_ON; - return TRUE; -} - -/* Find the nearest line to a given address and record filename, - function name and line number if found. Return TRUE if a line is - found or FALSE otherwise. */ - -static bfd_boolean ATTRIBUTE_UNUSED -stash_find_nearest_line_fast (struct dwarf2_debug *stash, - bfd_vma addr, - const char **filename_ptr, - const char **functionname_ptr, - unsigned int *linenumber_ptr) -{ - arange_value_type value; - struct comp_unit *unit; - - /* Try looking up global arange set first. */ - if (stash->arange_set_status == STASH_ARANGE_SET_ON - && arange_set_lookup_address (stash->comp_unit_arange_set, addr, NULL, - NULL, &value)) - { - if ((unit = (struct comp_unit *) value) != NULL) - /* There is only one compilation unit containing this address. */ - return comp_unit_find_nearest_line (unit, addr, filename_ptr, - functionname_ptr, linenumber_ptr, - stash); - } - - /* The arange set is not available or there are multiple compilation - units containing this address. Search all compilation units. */ - for (unit = stash->all_comp_units; unit; unit = unit->next_unit) - { - if (comp_unit_contains_address (unit, addr) - && comp_unit_find_nearest_line (unit, addr, filename_ptr, - functionname_ptr, - linenumber_ptr, stash)) - return TRUE; - } - - return FALSE; -} - /* Find the source code location of SYMBOL. If SYMBOL is NULL then find the nearest source code location corresponding to the address SECTION + OFFSET. @@ -3240,13 +3002,17 @@ find_line (bfd *abfd, } else { - if (stash->arange_set_status == STASH_ARANGE_SET_OFF) - stash_maybe_enable_arange_set (abfd, stash); - - found = stash_find_nearest_line_fast (stash, addr, filename_ptr, - functionname_ptr, linenumber_ptr); - if (found) - goto done; + for (each = stash->all_comp_units; each; each = each->next_unit) + { + found = (comp_unit_contains_address (each, addr) + && comp_unit_find_nearest_line (each, addr, + filename_ptr, + functionname_ptr, + linenumber_ptr, + stash)); + if (found) + goto done; + } } /* The DWARF2 spec says that the initial length field, and the @@ -3320,22 +3086,22 @@ find_line (bfd *abfd, each->next_unit = stash->all_comp_units; stash->all_comp_units = each; - stash->comp_unit_count++; /* DW_AT_low_pc and DW_AT_high_pc are optional for - compilation units. If we don't have them, we need to - consult the line info table to see if a compilation unit - contains the given address. */ + compilation units. If we don't have them (i.e., + unit->high == 0), we need to consult the line info + table to see if a compilation unit contains the given + address. */ if (do_line) found = (((symbol->flags & BSF_FUNCTION) == 0 - || arange_set_empty_p (each->arange_set) + || each->arange.high == 0 || comp_unit_contains_address (each, addr)) && comp_unit_find_line (each, symbol, addr, filename_ptr, linenumber_ptr, stash)); else - found = ((arange_set_empty_p (each->arange_set) + found = ((each->arange.high == 0 || comp_unit_contains_address (each, addr)) && comp_unit_find_nearest_line (each, addr, filename_ptr, --- bfd/po/SRC-POTFILES.in 24 Oct 2007 04:54:38 -0000 1.44 +++ bfd/po/SRC-POTFILES.in 12 Feb 2008 00:26:00 -0000 1.45 @@ -12,8 +12,6 @@ aout-sparcle.c aout-target.h aout-tic30.c aoutx.h -arange-set.c -arange-set.h archive64.c archive.c archures.c binutils-2.18.50.0.4-shared-test.patch: --- NEW FILE binutils-2.18.50.0.4-shared-test.patch --- 2008-02-14 H.J. Lu * ld-shared/sh1.c (shlib_overriddencall2): Moved to ... * ld-shared/sh2.c (shlib_overriddencall2): Here. New. --- ld/testsuite/ld-shared/sh1.c 9 Jun 1999 03:04:03 -0000 1.2 +++ ld/testsuite/ld-shared/sh1.c 14 Feb 2008 20:23:27 -0000 1.3 @@ -71,12 +71,6 @@ shlib_shlibcall2 () { return shlib_overriddencall2 (); } - -int -shlib_overriddencall2 () -{ - return 7; -} #endif /* This function calls a function defined by the main program. */ --- ld/testsuite/ld-shared/sh2.c 3 May 1999 07:29:09 -0000 1.1.1.1 +++ ld/testsuite/ld-shared/sh2.c 14 Feb 2008 20:23:27 -0000 1.2 @@ -12,3 +12,11 @@ shlib_shlibcalled () { return 5; } + +#ifndef XCOFF_TEST +int +shlib_overriddencall2 () +{ + return 7; +} +#endif Index: binutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- binutils.spec 29 Feb 2008 17:04:07 -0000 1.129 +++ binutils.spec 3 Mar 2008 20:19:45 -0000 1.130 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.18.50.0.4 -Release: 1 +Release: 2 License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -14,6 +14,8 @@ Patch6: binutils-2.18.50.0.4-symbolic-envvar-revert.patch Patch7: binutils-2.18.50.0.4-version.patch Patch8: binutils-2.18.50.0.4-bz5788.patch +Patch9: binutils-2.18.50.0.4-aranges-revert.patch +Patch10: binutils-2.18.50.0.4-shared-test.patch Buildroot: %{_tmppath}/binutils-root BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison @@ -67,6 +69,8 @@ %patch6 -p0 -b .symbolic-envvar-revert~ %patch7 -p0 -b .version~ %patch8 -p0 -b .bz5788~ +%patch9 -p0 -b .aranges-revert~ +%patch10 -p0 -b .shared-test~ # On ppc64 we might use 64K pages sed -i -e '/#define.*ELF_COMMONPAGESIZE/s/0x1000$/0x10000/' bfd/elf*ppc.c @@ -217,6 +221,10 @@ %{_infodir}/bfd*info* %changelog +* Mon Mar 3 2008 Jakub Jelinek 2.18.50.0.4-2 +- revert aranges optimization (Alan Modra, BZ#5303, BZ#5755) +- fix ld-shared testcase for GCC 4.3 (H.J. Lu) + * Fri Feb 29 2008 Jakub Jelinek 2.18.50.0.4-1 - update to 2.18.50.0.4 From fedora-extras-commits at redhat.com Mon Mar 3 20:28:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:28:08 GMT Subject: rpms/perl-Bit-Vector/devel perl-Bit-Vector.spec,1.25,1.26 Message-ID: <200803032028.m23KS8SN004469@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Bit-Vector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4340/perl-Bit-Vector/devel Modified Files: perl-Bit-Vector.spec Log Message: new perl Index: perl-Bit-Vector.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Bit-Vector/devel/perl-Bit-Vector.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- perl-Bit-Vector.spec 19 Feb 2008 21:54:06 -0000 1.25 +++ perl-Bit-Vector.spec 3 Mar 2008 20:27:15 -0000 1.26 @@ -1,6 +1,6 @@ Name: perl-Bit-Vector Version: 6.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Efficient bit vector, set of integers and "big int" math library Group: Development/Libraries @@ -69,6 +69,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 6.4-8 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 6.4-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 20:31:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:31:08 GMT Subject: rpms/git/devel git.spec,1.55,1.56 Message-ID: <200803032031.m23KV8Lw004919@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/git/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4795/git/devel Modified Files: git.spec Log Message: new perl Index: git.spec =================================================================== RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- git.spec 24 Feb 2008 14:57:54 -0000 1.55 +++ git.spec 3 Mar 2008 20:30:21 -0000 1.56 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -253,6 +253,9 @@ # No files for you! %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 1.5.4.3-3 +- rebuild for new perl (again) + * Sun Feb 24 2008 Bernardo Innocenti 1.5.4.3-2 - Do not silently overwrite /etc/httpd/conf.d/git.conf From fedora-extras-commits at redhat.com Mon Mar 3 20:32:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:32:10 GMT Subject: rpms/perl-Alien-wxWidgets/devel perl-Alien-wxWidgets.spec, 1.17, 1.18 Message-ID: <200803032032.m23KWAUk005131@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Alien-wxWidgets/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4979 Modified Files: perl-Alien-wxWidgets.spec Log Message: new perl Index: perl-Alien-wxWidgets.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Alien-wxWidgets.spec 20 Feb 2008 01:28:59 -0000 1.17 +++ perl-Alien-wxWidgets.spec 3 Mar 2008 20:31:33 -0000 1.18 @@ -1,6 +1,6 @@ Name: perl-Alien-wxWidgets Version: 0.32 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Building, finding and using wxWidgets binaries Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 0.32-4 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 0.32-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 20:38:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:38:56 GMT Subject: rpms/foomatic/devel foomatic.spec,1.181,1.182 Message-ID: <200803032038.m23KcuFD006078@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/foomatic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5963/foomatic/devel Modified Files: foomatic.spec Log Message: new perl Index: foomatic.spec =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- foomatic.spec 13 Feb 2008 11:54:06 -0000 1.181 +++ foomatic.spec 3 Mar 2008 20:38:10 -0000 1.182 @@ -6,7 +6,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 56%{?dist} +Release: 57%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -39,7 +39,6 @@ # Handle non-UTF-8 encodings in imported PPD files. Patch15: foomatic-bad-utf8.patch - # Missing IEEE 1284 IDs. Patch16: foomatic-ieee1284.patch @@ -244,6 +243,9 @@ %{_var}/cache/foomatic %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 3.0.2-57 +- rebuild for new perl (again) + * Wed Feb 13 2008 Tim Waugh 3.0.2-56 - Updated filters to 3.0-20080211. - Updated db-hpijs to 20080211. From fedora-extras-commits at redhat.com Mon Mar 3 20:40:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:40:50 GMT Subject: rpms/subversion/devel subversion.spec,1.108,1.109 Message-ID: <200803032040.m23KeojY006424@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/subversion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6283 Modified Files: subversion.spec Log Message: new perl Index: subversion.spec =================================================================== RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- subversion.spec 21 Feb 2008 12:20:21 -0000 1.108 +++ subversion.spec 3 Mar 2008 20:40:14 -0000 1.109 @@ -15,7 +15,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.4.6 -Release: 5 +Release: 6 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -278,6 +278,9 @@ %endif %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 1.4.6-6 +- rebuild for new perl (again) + * Thu Feb 21 2008 Lubomir Kundrak 1.4.6-5 - Correct install location of java stuff (#433295) From fedora-extras-commits at redhat.com Mon Mar 3 20:41:50 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Mon, 3 Mar 2008 20:41:50 GMT Subject: rpms/e2fsprogs/devel e2fsprogs-resize-fix.patch, NONE, 1.1 e2fsprogs.spec, 1.104, 1.105 Message-ID: <200803032041.m23KfoRR006649@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/e2fsprogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6511 Modified Files: e2fsprogs.spec Added Files: e2fsprogs-resize-fix.patch Log Message: * Mon Mar 03 2008 Eric Sandeen 1.40.7-2 - second try at fixing resize2fs vs. large inodes... (#434893) e2fsprogs-resize-fix.patch: --- NEW FILE e2fsprogs-resize-fix.patch --- Index: e2fsprogs-1.40.7/resize/resize2fs.c =================================================================== --- e2fsprogs-1.40.7.orig/resize/resize2fs.c +++ e2fsprogs-1.40.7/resize/resize2fs.c @@ -1168,11 +1168,12 @@ static errcode_t inode_scan_and_fix(ext2 * elsewhere in the inode table */ while (1) { - retval = ext2fs_get_next_inode(scan, &ino, &inode); + retval = ext2fs_get_next_inode_full(scan, &ino, buf, inode_size); if (retval) goto errout; if (!ino) break; + memcpy(&inode, buf, sizeof(struct ext2_inode)); if (inode.i_links_count == 0 && ino != EXT2_RESIZE_INO) continue; /* inode not in use */ @@ -1221,10 +1222,7 @@ static errcode_t inode_scan_and_fix(ext2 } } ext2fs_mark_inode_bitmap(rfs->new_fs->inode_map, new_inode); - memcpy(buf, &inode, sizeof(struct ext2_inode)); large_inode = (struct ext2_inode_large *)buf; - large_inode->i_extra_isize = sizeof(struct ext2_inode_large) - - EXT2_GOOD_OLD_INODE_SIZE; if (pb.changed) { /* Get the new version of the inode */ retval = ext2fs_read_inode_full(rfs->old_fs, ino, Index: e2fsprogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- e2fsprogs.spec 29 Feb 2008 22:12:19 -0000 1.104 +++ e2fsprogs.spec 3 Mar 2008 20:41:09 -0000 1.105 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems Name: e2fsprogs Version: 1.40.7 -Release: 1%{?dist} +Release: 2%{?dist} # License based on upstream-modified COPYING file, # which clearly states "V2" intent. License: GPLv2 @@ -16,6 +16,7 @@ Patch1: e2fsprogs-1.38-etcblkid.patch Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch Patch3: e2fsprogs-1.40.7-swap-inode-full-fix.patch +Patch4: e2fsprogs-resize-fix.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -94,6 +95,8 @@ %patch2 -p1 -b .featurecheck # fix in-inode ea swapping in swap_inode_full %patch3 -p1 -b .swapinode +# resize2fs vs. large inodes, take 2 +%patch4 -p1 -b .resizelarge %build %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux @@ -281,6 +284,9 @@ %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid %changelog +* Mon Mar 03 2008 Eric Sandeen 1.40.7-2 +- second try at fixing resize2fs vs. large inodes... (#434893) + * Fri Feb 29 2008 Eric Sandeen 1.40.7-1 - New upstream version, special leap-day edition - Fix resize2fs losing inline xattrs when shrinking (#434893) From fedora-extras-commits at redhat.com Mon Mar 3 20:42:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:42:26 GMT Subject: rpms/perl-Cairo/devel perl-Cairo.spec,1.18,1.19 Message-ID: <200803032042.m23KgQEh006744@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Cairo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6595 Modified Files: perl-Cairo.spec Log Message: new perl Index: perl-Cairo.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Cairo/devel/perl-Cairo.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Cairo.spec 20 Feb 2008 01:29:59 -0000 1.18 +++ perl-Cairo.spec 3 Mar 2008 20:41:32 -0000 1.19 @@ -6,7 +6,7 @@ Name: perl-Cairo Version: 1.044 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl interface to the cairo library Group: Development/Libraries @@ -63,6 +63,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.044-4 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 1.044-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 20:43:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:43:34 GMT Subject: rpms/perl-Glib/devel perl-Glib.spec,1.27,1.28 Message-ID: <200803032043.m23KhYeg006949@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6837 Modified Files: perl-Glib.spec Log Message: new perl Index: perl-Glib.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Glib/devel/perl-Glib.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- perl-Glib.spec 20 Feb 2008 01:36:29 -0000 1.27 +++ perl-Glib.spec 3 Mar 2008 20:42:50 -0000 1.28 @@ -1,6 +1,6 @@ Name: perl-Glib Version: 1.162 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl interface to GLib Group: Development/Libraries @@ -68,6 +68,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.162-5 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 1.162-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 20:44:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:44:29 GMT Subject: rpms/perl-libintl/devel perl-libintl.spec,1.9,1.10 Message-ID: <200803032044.m23KiTlH007078@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-libintl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6980 Modified Files: perl-libintl.spec Log Message: new perl Index: perl-libintl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-libintl/devel/perl-libintl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-libintl.spec 20 Feb 2008 04:30:38 -0000 1.9 +++ perl-libintl.spec 3 Mar 2008 20:43:48 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Internationalization library for Perl, compatible with gettext Name: perl-libintl Version: 1.16 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/libintl-perl/ @@ -55,6 +55,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.16-8 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 1.16-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 20:45:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:45:57 GMT Subject: rpms/perl-Event/devel perl-Event.spec,1.9,1.10 Message-ID: <200803032045.m23KjvqU007332@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Event/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7222 Modified Files: perl-Event.spec Log Message: new perl Index: perl-Event.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Event/devel/perl-Event.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Event.spec 18 Feb 2008 23:13:03 -0000 1.9 +++ perl-Event.spec 3 Mar 2008 20:45:22 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Event Version: 1.09 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Event loop processing Group: Development/Libraries @@ -86,6 +86,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.09-5 +- Rebuild for perl 5.10 (again) + * Mon Feb 18 2008 Fedora Release Engineering - 1.09-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 20:46:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:46:23 GMT Subject: rpms/perl-Gtk2/devel perl-Gtk2.spec,1.27,1.28 Message-ID: <200803032046.m23KkNam007438@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7296 Modified Files: perl-Gtk2.spec Log Message: new perl Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- perl-Gtk2.spec 20 Feb 2008 01:37:31 -0000 1.27 +++ perl-Gtk2.spec 3 Mar 2008 20:45:48 -0000 1.28 @@ -6,7 +6,7 @@ Name: perl-Gtk2 Version: 1.162 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library Group: Development/Libraries @@ -86,6 +86,9 @@ %changelog +* Wed Feb 27 2008 Tom "spot" Callaway - 1.162-4 +- Rebuild for perl 5.10 (again) + * Tue Feb 19 2008 Fedora Release Engineering - 1.162-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 20:49:20 2008 From: fedora-extras-commits at redhat.com (Karol Trzcionka (karlik)) Date: Mon, 3 Mar 2008 20:49:20 GMT Subject: rpms/warzone2100/F-8 warzone2100-ppcbuild.patch, NONE, 1.1 warzone2100.spec, 1.18, 1.19 Message-ID: <200803032049.m23KnKT9007865@cvs-int.fedora.redhat.com> Author: karlik Update of /cvs/pkgs/rpms/warzone2100/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7751 Modified Files: warzone2100.spec Added Files: warzone2100-ppcbuild.patch Log Message: Fix ppc build warzone2100-ppcbuild.patch: --- NEW FILE warzone2100-ppcbuild.patch --- --- src/game.c 2008-02-11 17:36:18.000000000 +0100 +++ src/game.c 2008-03-03 21:41:59.000000000 +0100 @@ -6490,13 +6490,13 @@ { for(i = 0;i < psSaveDroid->numWeaps;i++) { - endian_uword(&psSaveDroid->sMove.iAttackRuns[i]); + endian_udword(&psSaveDroid->sMove.iAttackRuns[i]); } //endian_uword(&psSaveDroid->sMove.iGuardRadius); } else { - endian_uword(&psSaveDroid->sMove.iAttackRuns[0]); + endian_udword(&psSaveDroid->sMove.iAttackRuns[0]); } for(i = 0; i < TEMP_DROID_MAXPROGS; i++) { /* SAVE_WEAPON */ Index: warzone2100.spec =================================================================== RCS file: /cvs/pkgs/rpms/warzone2100/F-8/warzone2100.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- warzone2100.spec 2 Mar 2008 22:53:57 -0000 1.18 +++ warzone2100.spec 3 Mar 2008 20:48:44 -0000 1.19 @@ -1,12 +1,13 @@ Name: warzone2100 Version: 2.1.0 -Release: 0.3.beta1%{?dist} +Release: 0.4.beta1%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games License: GPLv2+ URL: http://wz2100.net/ Source0: http://download.gna.org/warzone/releases/2.0/%{name}-2.1_beta1.tar.bz2 +Patch0: warzone2100-ppcbuild.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #ExcludeArch: x86_64 ppc64 sparc64 alpha @@ -26,6 +27,7 @@ %prep %setup -q -n %{name}-2.1_beta1 +%patch0 -p0 %build %configure --disable-mp3 --with-distributor="Fedora" @@ -54,6 +56,8 @@ %doc ABOUT-NLS AUTHORS ChangeLog COPYING COPYING.README %changelog +* Mon Mar 03 2008 Karol Trzcionka - 2.1.0-0.4.beta1 +- Fix ppc build * Sun Mar 02 2008 Karol Trzcionka - 2.1.0-0.3.beta1 - add translations * Sun Mar 02 2008 Karol Trzcionka - 2.1.0-0.2.beta1 From fedora-extras-commits at redhat.com Mon Mar 3 20:49:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:49:19 GMT Subject: rpms/xchat/devel xchat.spec,1.88,1.89 Message-ID: <200803032049.m23KnJBU007863@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xchat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7676/xchat/devel Modified Files: xchat.spec Log Message: new perl Index: xchat.spec =================================================================== RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- xchat.spec 18 Feb 2008 02:54:33 -0000 1.88 +++ xchat.spec 3 Mar 2008 20:48:13 -0000 1.89 @@ -3,7 +3,7 @@ Summary: A popular and easy to use graphical IRC (chat) client Name: xchat Version: 2.8.4 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 Group: Applications/Internet License: GPLv2+ @@ -162,6 +162,9 @@ %{_libdir}/xchat/plugins/tcl.so %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 1:2.8.4-14 +- rebuild for new perl + * Mon Feb 18 2008 Christopher Aillon - 1:2.8.4-13 - Rebuild to celebrate my birthday (and GCC 4.3) From fedora-extras-commits at redhat.com Mon Mar 3 20:50:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:50:14 GMT Subject: rpms/rrdtool/devel rrdtool.spec,1.52,1.53 Message-ID: <200803032050.m23KoEia008050@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/rrdtool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7905 Modified Files: rrdtool.spec Log Message: new perl Index: rrdtool.spec =================================================================== RCS file: /cvs/pkgs/rpms/rrdtool/devel/rrdtool.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- rrdtool.spec 13 Feb 2008 21:09:21 -0000 1.52 +++ rrdtool.spec 3 Mar 2008 20:49:37 -0000 1.53 @@ -10,7 +10,7 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.3 -Release: 0.8.%{betaver}%{?dist} +Release: 0.9.%{betaver}%{?dist} License: GPLv2+ with exceptions Group: Applications/Databases URL: http://oss.oetiker.ch/rrdtool/ @@ -316,6 +316,9 @@ %endif %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 1.3.0-0.9.beta4 +- rebuild for new perl (again) + * Wed Feb 13 2008 Jarod Wilson 1.3.0-0.8.beta4 - Update to rrdtool 1.3 beta4 From fedora-extras-commits at redhat.com Mon Mar 3 20:58:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 20:58:34 GMT Subject: rpms/perl-IPC-ShareLite/devel .cvsignore, 1.2, 1.3 perl-IPC-ShareLite.spec, 1.16, 1.17 sources, 1.2, 1.3 Message-ID: <200803032058.m23KwYhW009248@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IPC-ShareLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9149 Modified Files: .cvsignore perl-IPC-ShareLite.spec sources Log Message: 0.12 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-IPC-ShareLite/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:02:44 -0000 1.2 +++ .cvsignore 3 Mar 2008 20:57:57 -0000 1.3 @@ -1 +1 @@ -IPC-ShareLite-0.09.tar.gz +IPC-ShareLite-0.12.tar.gz Index: perl-IPC-ShareLite.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IPC-ShareLite/devel/perl-IPC-ShareLite.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-IPC-ShareLite.spec 20 Feb 2008 02:58:09 -0000 1.16 +++ perl-IPC-ShareLite.spec 3 Mar 2008 20:57:57 -0000 1.17 @@ -1,15 +1,13 @@ Name: perl-IPC-ShareLite -Version: 0.09 -Release: 12%{?dist} +Version: 0.12 +Release: 1%{?dist} Summary: Light-weight interface to shared memory License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IPC-ShareLite/ -Source0: http://www.cpan.org/authors/id/M/MA/MAURICE/IPC-ShareLite-%{version}.tar.gz -Patch0: IPC-ShareLite-0.09-64bit.patch -Patch1: IPC-ShareLite-0.09-string.patch +Source0: http://search.cpan.org/CPAN/authors/id/A/AN/ANDYA/IPC-ShareLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::MakeMaker), perl(Test::More), perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -18,11 +16,9 @@ %prep %setup -q -n IPC-ShareLite-%{version} -%patch0 -p1 -%patch1 -p1 %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" < /dev/null +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install @@ -44,12 +40,15 @@ %files %defattr(-,root,root,-) -%doc Changes README TODO +%doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/IPC* %{_mandir}/man3/* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 0.12-1 +- 0.12, works right now + * Tue Feb 19 2008 Fedora Release Engineering - 0.09-12 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-IPC-ShareLite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:02:44 -0000 1.2 +++ sources 3 Mar 2008 20:57:57 -0000 1.3 @@ -1 +1 @@ -3942a55cfc5e6d3b612a46cc1a9515b9 IPC-ShareLite-0.09.tar.gz +07d43fb778d99e96bc76ff935e1b0f17 IPC-ShareLite-0.12.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 21:02:55 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 3 Mar 2008 21:02:55 GMT Subject: rpms/asterisk/F-8 asterisk.spec,1.9,1.10 Message-ID: <200803032102.m23L2tZa017045@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16931 Modified Files: asterisk.spec Log Message: Package the directory used to store monitor recordings. Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/F-8/asterisk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- asterisk.spec 27 Feb 2008 22:12:02 -0000 1.9 +++ asterisk.spec 3 Mar 2008 21:02:14 -0000 1.10 @@ -3,7 +3,7 @@ Summary: The Open Source PBX Name: asterisk Version: 1.4.18 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -428,6 +428,7 @@ mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/ mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/ +mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/ mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/ # We're not going to package any of the sample AGI scripts @@ -732,6 +733,7 @@ %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-custom/ %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/ +%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/ %attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/ %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/ %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/ @@ -900,7 +902,10 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog -* Wed Feb 27 2008 - 1.4.18-2 +* Mon Mar 3 2008 Jeffrey C. Ollie - 1.4.18-3 +- Package the directory used to store monitor recordings. + +* Wed Feb 27 2008 Jeffrey C. Ollie - 1.4.18-2 - Add patch from David Woodhouse to fix building on PPC64. * Wed Feb 13 2008 Jeffrey C. Ollie - 1.4.18-1 From fedora-extras-commits at redhat.com Mon Mar 3 21:08:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 21:08:36 GMT Subject: rpms/perl-YAML-Syck/devel perl-YAML-Syck.spec,1.13,1.14 Message-ID: <200803032108.m23L8aoJ017960@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-YAML-Syck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17824 Modified Files: perl-YAML-Syck.spec Log Message: new perl Index: perl-YAML-Syck.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-YAML-Syck/devel/perl-YAML-Syck.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-YAML-Syck.spec 20 Feb 2008 16:40:50 -0000 1.13 +++ perl-YAML-Syck.spec 3 Mar 2008 21:07:58 -0000 1.14 @@ -1,6 +1,6 @@ Name: perl-YAML-Syck Version: 1.04 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast, lightweight YAML loader and dumper License: MIT Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 1.04-2 +- rebuild for new perl (again) + * Wed Feb 20 2008 Steven Pritchard 1.04-1 - Update to 1.04. From fedora-extras-commits at redhat.com Mon Mar 3 21:09:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 21:09:34 GMT Subject: rpms/perl-Devel-Leak/devel perl-Devel-Leak.spec,1.6,1.7 Message-ID: <200803032109.m23L9YV1018134@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Devel-Leak/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18001 Modified Files: perl-Devel-Leak.spec Log Message: new perl Index: perl-Devel-Leak.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Devel-Leak/devel/perl-Devel-Leak.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Devel-Leak.spec 20 Feb 2008 02:55:21 -0000 1.6 +++ perl-Devel-Leak.spec 3 Mar 2008 21:08:53 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Devel-Leak Version: 0.03 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Utility for looking for perl objects that are not reclaimed License: GPL+ or Artistic Group: Development/Libraries @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 0.03-7 +- rebuild for new perl (again) + * Tue Feb 19 2008 Fedora Release Engineering - 0.03-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 21:13:29 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Mon, 3 Mar 2008 21:13:29 GMT Subject: rpms/kernel/devel kernel.spec, 1.469, 1.470 linux-2.6-firewire-git-pending.patch, 1.10, 1.11 linux-2.6-firewire-git-update.patch, 1.7, 1.8 Message-ID: <200803032113.m23LDT8x018811@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18680 Modified Files: kernel.spec linux-2.6-firewire-git-pending.patch linux-2.6-firewire-git-update.patch Log Message: * Mon Mar 03 2008 Jarod Wilson - Rebase firewire to latest linux1394-2.6.git tree - firewire-sbp2: permit drives to suspend (#243210) - firewire: restore bus power on resume on older PowerPC Macs Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.469 retrieving revision 1.470 diff -u -r1.469 -r1.470 --- kernel.spec 3 Mar 2008 16:05:03 -0000 1.469 +++ kernel.spec 3 Mar 2008 21:12:45 -0000 1.470 @@ -1144,11 +1144,11 @@ #ApplyPatch linux-2.6-ext4-stable-queue.patch # linux1394 git patches -#ApplyPatch linux-2.6-firewire-git-update.patch -#C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}') -#if [ "$C" -gt 10 ]; then -#ApplyPatch linux-2.6-firewire-git-pending.patch -#fi +ApplyPatch linux-2.6-firewire-git-update.patch +C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}') +if [ "$C" -gt 10 ]; then +ApplyPatch linux-2.6-firewire-git-pending.patch +fi # usb video ApplyPatch linux-2.6-uvcvideo.patch @@ -1744,6 +1744,11 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Mon Mar 03 2008 Jarod Wilson +- Rebase firewire to latest linux1394-2.6.git tree +- firewire-sbp2: permit drives to suspend (#243210) +- firewire: restore bus power on resume on older PowerPC Macs + * Mon Mar 03 2008 Kyle McMartin - Add virtio_blk patch from Jeremy Katz linux-2.6-firewire-git-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.10 -r 1.11 linux-2.6-firewire-git-pending.patch Index: linux-2.6-firewire-git-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linux-2.6-firewire-git-pending.patch 2 Mar 2008 05:54:10 -0000 1.10 +++ linux-2.6-firewire-git-pending.patch 3 Mar 2008 21:12:45 -0000 1.11 @@ -3,1722 +3,485 @@ # tree, which we think we're going to want... # -The generation of incoming requests was filled in in wrong byte order on -machines with big endian CPU. +read_bus_info_block() is repeatedly called by workqueue jobs. +These will step on each others toes eventually if there are multiple +workqueue threads, and we end up with corrupt config ROM images. Signed-off-by: Stefan Richter -Cc: sparclinux at vger.kernel.org -Cc: linuxppc-dev at ozlabs.org -Signed-off-by: Jarod Wilson --- + drivers/firewire/fw-device.c | 41 +++++++++++++++++++++++------------ + 1 file changed, 27 insertions(+), 14 deletions(-) -This patch is a shot in the dark, based on a warning when building with -C=1 CHECKFLAGS="-D__CHECK_ENDIAN__". Is it really a fix, or was the -previous code accidentally correct? - -This needs to be tested on different big endian PCs, if possible with -the Apple Uninorth FireWire controller and other types of controllers. -One test which involves ohci->request_generation is simply with an SBP-2 -device (harddisk, CD-ROM...). Does SBP-2 login etc. work? - -If possible, also test whether the device remains accessible after -forcing a bus reset, e.g. by "echo br short > firecontrol". You need -the easy to build utility firecontrol and a libraw1394 with "juju" -backend. See wiki.linux1394.org for directions. - - - drivers/firewire/fw-ohci.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: linux/drivers/firewire/fw-ohci.c -=================================================================== ---- linux.orig/drivers/firewire/fw-ohci.c -+++ linux/drivers/firewire/fw-ohci.c -@@ -375,7 +375,7 @@ static __le32 *handle_ar_packet(struct a - */ - - if (p.ack + 16 == 0x09) -- ohci->request_generation = (buffer[2] >> 16) & 0xff; -+ ohci->request_generation = (p.header[2] >> 16) & 0xff; - else if (ctx == &ohci->ar_request_ctx) - fw_core_handle_request(&ohci->card, &p); - else - --- -Stefan Richter --=====-==--- --=- =-=== -http://arcgraph.de/sr/ - - -Kills warnings from 'make C=1 CHECKFLAGS="-D__CHECK_ENDIAN__" modules': - -drivers/firewire/fw-transaction.c:771:10: warning: incorrect type in assignment (different base types) -drivers/firewire/fw-transaction.c:771:10: expected unsigned int [unsigned] [usertype] -drivers/firewire/fw-transaction.c:771:10: got restricted unsigned int [usertype] -drivers/firewire/fw-transaction.h:93:10: warning: incorrect type in assignment (different base types) -drivers/firewire/fw-transaction.h:93:10: expected unsigned int [unsigned] [usertype] -drivers/firewire/fw-transaction.h:93:10: got restricted unsigned int [usertype] -drivers/firewire/fw-ohci.c:1490:8: warning: restricted degrades to integer -drivers/firewire/fw-ohci.c:1490:35: warning: restricted degrades to integer -drivers/firewire/fw-ohci.c:1516:5: warning: cast to restricted type - -Signed-off-by: Stefan Richter -Cc: sparclinux at vger.kernel.org -Cc: linuxppc-dev at ozlabs.org -Signed-off-by: Jarod Wilson ---- - drivers/firewire/fw-ohci.c | 4 ++-- - drivers/firewire/fw-transaction.c | 2 +- - drivers/firewire/fw-transaction.h | 6 +++--- - 3 files changed, 6 insertions(+), 6 deletions(-) - -Index: linux/drivers/firewire/fw-ohci.c -=================================================================== ---- linux.orig/drivers/firewire/fw-ohci.c -+++ linux/drivers/firewire/fw-ohci.c -@@ -1487,7 +1487,7 @@ static int handle_ir_dualbuffer_packet(s - void *p, *end; - int i; - -- if (db->first_res_count > 0 && db->second_res_count > 0) { -+ if (db->first_res_count != 0 && db->second_res_count != 0) { - if (ctx->excess_bytes <= le16_to_cpu(db->second_req_count)) { - /* This descriptor isn't done yet, stop iteration. */ - return 0; -@@ -1513,7 +1513,7 @@ static int handle_ir_dualbuffer_packet(s - memcpy(ctx->header + i + 4, p + 8, ctx->base.header_size - 4); - i += ctx->base.header_size; - ctx->excess_bytes += -- (le32_to_cpu(*(u32 *)(p + 4)) >> 16) & 0xffff; -+ (le32_to_cpu(*(__le32 *)(p + 4)) >> 16) & 0xffff; - p += ctx->base.header_size + 4; - } - ctx->header_length = i; -Index: linux/drivers/firewire/fw-transaction.c -=================================================================== ---- linux.orig/drivers/firewire/fw-transaction.c -+++ linux/drivers/firewire/fw-transaction.c -@@ -751,7 +751,7 @@ handle_topology_map(struct fw_card *card - void *payload, size_t length, void *callback_data) - { - int i, start, end; -- u32 *map; -+ __be32 *map; - - if (!TCODE_IS_READ_REQUEST(tcode)) { - fw_send_response(card, request, RCODE_TYPE_ERROR); -Index: linux/drivers/firewire/fw-transaction.h -=================================================================== ---- linux.orig/drivers/firewire/fw-transaction.h -+++ linux/drivers/firewire/fw-transaction.h -@@ -85,12 +85,12 @@ - static inline void - fw_memcpy_from_be32(void *_dst, void *_src, size_t size) - { -- u32 *dst = _dst; -- u32 *src = _src; -+ u32 *dst = _dst; -+ __be32 *src = _src; - int i; - - for (i = 0; i < size / 4; i++) -- dst[i] = cpu_to_be32(src[i]); -+ dst[i] = be32_to_cpu(src[i]); - } - - static inline void - --- -Stefan Richter --=====-==--- --=- =-=== -http://arcgraph.de/sr/ - - -Patch "firewire: fw-sbp2: fix NULL pointer deref. in scsi_remove_device" -had the unintended effect that firewire-sbp2 could not be unloaded -anymore until all SBP-2 devices were unplugged. - -We now fix the NULL pointer bug by reacquiring a reference to the sdev -instead of holding a reference to the sdev (and to the module) all the -time. - -Signed-off-by: Stefan Richter ---- - -This applies on top of current linux-2.6.git master as well as on top of -linux1394-2.6.git master. - - - drivers/firewire/fw-sbp2.c | 46 +++++++++++++++++++++---------------- - 1 file changed, 27 insertions(+), 19 deletions(-) - -Index: linux/drivers/firewire/fw-sbp2.c +Index: linux/drivers/firewire/fw-device.c =================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -122,7 +122,6 @@ static const char sbp2_driver_name[] = " - struct sbp2_logical_unit { - struct sbp2_target *tgt; - struct list_head link; -- struct scsi_device *sdev; - struct fw_address_handler address_handler; - struct list_head orb_list; - -@@ -139,6 +138,7 @@ struct sbp2_logical_unit { - int generation; - int retries; - struct delayed_work work; -+ bool has_sdev; - bool blocked; - }; - -@@ -751,20 +751,33 @@ static void sbp2_unblock(struct sbp2_tar - scsi_unblock_requests(shost); +--- linux.orig/drivers/firewire/fw-device.c ++++ linux/drivers/firewire/fw-device.c +@@ -400,6 +400,9 @@ read_rom(struct fw_device *device, int g + return callback_data.rcode; } -+static int sbp2_lun2int(u16 lun) -+{ -+ struct scsi_lun eight_bytes_lun; -+ -+ memset(&eight_bytes_lun, 0, sizeof(eight_bytes_lun)); [...1727 lines suppressed...] -Shut up two "may be used uninitialised in this function" warnings due to -PPC32's implementation of dma_alloc_coherent(). - -Signed-off-by: Stefan Richter ---- - -Wasn't there a macro somewhere for this? - -Also, could this be better done in PPC32's dma_alloc_coherent()? -At least this kind of workaround here doesn't add anything to the -compiled result. - - drivers/firewire/fw-ohci.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: linux-2.6.25-rc3/drivers/firewire/fw-ohci.c -=================================================================== ---- linux-2.6.25-rc3.orig/drivers/firewire/fw-ohci.c -+++ linux-2.6.25-rc3/drivers/firewire/fw-ohci.c -@@ -544,7 +544,7 @@ static int - context_add_buffer(struct context *ctx) - { - struct descriptor_buffer *desc; -- dma_addr_t bus_addr; -+ dma_addr_t uninitialized_var(bus_addr); - int offset; - /* -@@ -1334,7 +1334,7 @@ ohci_set_config_rom(struct fw_card *card - unsigned long flags; - int retval = -EBUSY; - __be32 *next_config_rom; -- dma_addr_t next_config_rom_bus; -+ dma_addr_t uninitialized_var(next_config_rom_bus); - - ohci = fw_ohci(card); - - --- -Stefan Richter --=====-==--- --== ----= -http://arcgraph.de/sr/ - - -This way firewire-ohci can be used for remote debugging like ohci1394. - -Signed-off-by: Stefan Richter ---- - Documentation/debugging-via-ohci1394.txt | 13 ++++++++----- - drivers/firewire/fw-ohci.c | 9 +++++++++ - lib/Kconfig.debug | 10 ++++++++++ - 3 files changed, 27 insertions(+), 5 deletions(-) - -Index: linux/Documentation/debugging-via-ohci1394.txt -=================================================================== ---- linux.orig/Documentation/debugging-via-ohci1394.txt -+++ linux/Documentation/debugging-via-ohci1394.txt -@@ -41,11 +41,14 @@ to a working state and enables physical - This can be turned off by ohci1394's module parameter phys_dma=0. - - The alternative firewire-ohci driver in drivers/firewire uses filtered physical --DMA, hence is not yet suitable for remote debugging. -- --Because ohci1394 depends on the PCI enumeration to be completed, an --initialization routine which runs pretty early (long before console_init() --which makes the printk buffer appear on the console can be called) was written. -+DMA by default, which is more secure but not suitable for remote debugging. -+Compile the driver with CONFIG_FIREWIRE_OHCI_REMOTE_DMA to get unfiltered -+physical DMA. -+ -+Because ohci1394 and firewire-ohci depend on the PCI enumeration to be -+completed, an initialization routine which runs pretty early has been -+implemented for x86. This routine runs long before console_init() can be -+called, i.e. before the printk buffer appears on the console. - - To activate it, enable CONFIG_PROVIDE_OHCI1394_DMA_INIT (Kernel hacking menu: - Provide code for enabling DMA over FireWire early on boot) and pass the -Index: linux/drivers/firewire/fw-ohci.c ++ case FW_NODE_INITIATED_RESET: ++ device = node->data; ++ if (device == NULL) ++ goto create; ++ ++ device->node_id = node->node_id; ++ smp_wmb(); /* update node_id before generation */ ++ device->generation = card->generation; ++ if (atomic_cmpxchg(&device->state, ++ FW_DEVICE_RUNNING, ++ FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) { ++ PREPARE_DELAYED_WORK(&device->work, fw_device_refresh); ++ schedule_delayed_work(&device->work, INITIAL_DELAY); ++ } ++ break; ++ + case FW_NODE_UPDATED: + if (!node->link_on || node->data == NULL) + break; +Index: linux/drivers/firewire/fw-topology.c =================================================================== ---- linux.orig/drivers/firewire/fw-ohci.c -+++ linux/drivers/firewire/fw-ohci.c -@@ -1091,6 +1091,11 @@ static void bus_reset_tasklet(unsigned l - reg_write(ohci, OHCI1394_ConfigROMhdr, ohci->next_header); - } - -+#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA -+ reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0); -+ reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0); -+#endif -+ - spin_unlock_irqrestore(&ohci->lock, flags); - - if (free_rom) -@@ -1429,6 +1434,9 @@ static int ohci_cancel_packet(struct fw_ - static int - ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation) - { -+#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA -+ return 0; -+#else - struct fw_ohci *ohci = fw_ohci(card); - unsigned long flags; - int n, retval = 0; -@@ -1460,6 +1468,7 @@ ohci_enable_phys_dma(struct fw_card *car - out: - spin_unlock_irqrestore(&ohci->lock, flags); - return retval; -+#endif /* CONFIG_FIREWIRE_OHCI_REMOTE_DMA */ - } +--- linux.orig/drivers/firewire/fw-topology.c ++++ linux/drivers/firewire/fw-topology.c +@@ -107,6 +107,7 @@ static struct fw_node *fw_node_create(u3 + node->node_id = LOCAL_BUS | SELF_ID_PHY_ID(sid); + node->link_on = SELF_ID_LINK_ON(sid); + node->phy_speed = SELF_ID_PHY_SPEED(sid); ++ node->initiated_reset = SELF_ID_PHY_INITIATOR(sid); + node->port_count = port_count; + + atomic_set(&node->ref_count, 1); +@@ -430,6 +431,8 @@ update_tree(struct fw_card *card, struct + event = FW_NODE_LINK_OFF; + else if (!node0->link_on && node1->link_on) + event = FW_NODE_LINK_ON; ++ else if (node1->initiated_reset && node1->link_on) ++ event = FW_NODE_INITIATED_RESET; + else + event = FW_NODE_UPDATED; + +Index: linux/drivers/firewire/fw-topology.h +=================================================================== +--- linux.orig/drivers/firewire/fw-topology.h ++++ linux/drivers/firewire/fw-topology.h +@@ -20,11 +20,12 @@ + #define __fw_topology_h + + enum { +- FW_NODE_CREATED = 0x00, +- FW_NODE_UPDATED = 0x01, +- FW_NODE_DESTROYED = 0x02, +- FW_NODE_LINK_ON = 0x03, +- FW_NODE_LINK_OFF = 0x04, ++ FW_NODE_CREATED, ++ FW_NODE_UPDATED, ++ FW_NODE_DESTROYED, ++ FW_NODE_LINK_ON, ++ FW_NODE_LINK_OFF, ++ FW_NODE_INITIATED_RESET, + }; - static u64 -Index: linux/lib/Kconfig.debug -=================================================================== ---- linux.orig/lib/Kconfig.debug -+++ linux/lib/Kconfig.debug -@@ -592,6 +592,16 @@ config LATENCYTOP - Enable this option if you want to use the LatencyTOP tool - to find out which userspace is blocking on what kernel operations. - -+config FIREWIRE_OHCI_REMOTE_DMA -+ bool "Remote debugging via firewire-ohci" -+ depends on FIREWIRE_OHCI -+ help -+ This option lets you use the FireWire bus for remote debugging. -+ It enables unfiltered remote DMA in the firewire-ohci driver. -+ See Documentation/debugging-via-ohci1394.txt for more information. -+ -+ If unsure, say N. -+ - config PROVIDE_OHCI1394_DMA_INIT - bool "Provide code for enabling DMA over FireWire early on boot" - depends on PCI && X86 + struct fw_node { -- Stefan Richter --=====-==--- --=- ===-- +-=====-==--- --== ---== http://arcgraph.de/sr/ linux-2.6-firewire-git-update.patch: Index: linux-2.6-firewire-git-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-update.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-firewire-git-update.patch 21 Feb 2008 04:40:21 -0000 1.7 +++ linux-2.6-firewire-git-update.patch 3 Mar 2008 21:12:45 -0000 1.8 @@ -1,905 +1,1102 @@ -git diff in linux1394-git tree vs. 2.6.25-rc1, 02/20/2008 +git diff in linux1394-git tree vs. 2.6.25-rc3-git4, 03/03/2008 - Documentation/debugging-via-ohci1394.txt | 17 +- - drivers/firewire/fw-cdev.c | 8 +- - drivers/firewire/fw-device.c | 48 +++-- - drivers/firewire/fw-device.h | 2 +- - drivers/firewire/fw-sbp2.c | 358 +++++++++++++++++++++++------- - drivers/ieee1394/sbp2.c | 22 ++- - drivers/ieee1394/sbp2.h | 2 + - 7 files changed, 345 insertions(+), 112 deletions(-) - ---- + Documentation/debugging-via-ohci1394.txt | 13 ++- + drivers/firewire/fw-card.c | 38 ---------- + drivers/firewire/fw-device.h | 27 ++++--- + drivers/firewire/fw-ohci.c | 114 +++++++++++++++++++++------- + drivers/firewire/fw-sbp2.c | 120 ++++++++++++------------------ + drivers/firewire/fw-transaction.c | 2 +- + drivers/firewire/fw-transaction.h | 10 +-- + drivers/ieee1394/csr.c | 6 +- + drivers/ieee1394/dv1394.c | 3 +- + drivers/ieee1394/nodemgr.c | 6 +- + drivers/ieee1394/ohci1394.c | 109 ++++++++++++--------------- + drivers/ieee1394/raw1394.c | 1 - + drivers/ieee1394/sbp2.c | 7 +- + drivers/ieee1394/video1394.c | 3 +- + lib/Kconfig.debug | 10 +++ + 15 files changed, 233 insertions(+), 236 deletions(-) diff --git a/Documentation/debugging-via-ohci1394.txt b/Documentation/debugging-via-ohci1394.txt -index de4804e..c360d4e 100644 +index c360d4e..371ba27 100644 --- a/Documentation/debugging-via-ohci1394.txt +++ b/Documentation/debugging-via-ohci1394.txt -@@ -36,14 +36,15 @@ available (notebooks) or too slow for extensive debug information (like ACPI). - Drivers - ------- - --The OHCI-1394 drivers in drivers/firewire and drivers/ieee1394 initialize --the OHCI-1394 controllers to a working state and can be used to enable --physical DMA. By default you only have to load the driver, and physical --DMA access will be granted to all remote nodes, but it can be turned off --when using the ohci1394 driver. -- --Because these drivers depend on the PCI enumeration to be completed, an --initialization routine which can runs pretty early (long before console_init(), -+The ohci1394 driver in drivers/ieee1394 initializes the OHCI-1394 controllers -+to a working state and enables physical DMA by default for all remote nodes. -+This can be turned off by ohci1394's module parameter phys_dma=0. -+ -+The alternative firewire-ohci driver in drivers/firewire uses filtered physical -+DMA, hence is not yet suitable for remote debugging. -+ -+Because ohci1394 depends on the PCI enumeration to be completed, an -+initialization routine which runs pretty early (long before console_init() - which makes the printk buffer appear on the console can be called) was written. +@@ -41,11 +41,14 @@ to a working state and enables physical DMA by default for all remote nodes. + This can be turned off by ohci1394's module parameter phys_dma=0. + + The alternative firewire-ohci driver in drivers/firewire uses filtered physical +-DMA, hence is not yet suitable for remote debugging. +- +-Because ohci1394 depends on the PCI enumeration to be completed, an +-initialization routine which runs pretty early (long before console_init() +-which makes the printk buffer appear on the console can be called) was written. ++DMA by default, which is more secure but not suitable for remote debugging. ++Compile the driver with CONFIG_FIREWIRE_OHCI_REMOTE_DMA to get unfiltered ++physical DMA. ++ ++Because ohci1394 and firewire-ohci depend on the PCI enumeration to be ++completed, an initialization routine which runs pretty early has been ++implemented for x86. This routine runs long before console_init() can be ++called, i.e. before the printk buffer appears on the console. To activate it, enable CONFIG_PROVIDE_OHCI1394_DMA_INIT (Kernel hacking menu: -diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c -index 7e73cba..44ccee2 100644 ---- a/drivers/firewire/fw-cdev.c -+++ b/drivers/firewire/fw-cdev.c -@@ -109,15 +109,17 @@ static int fw_device_op_open(struct inode *inode, struct file *file) - struct client *client; - unsigned long flags; + Provide code for enabling DMA over FireWire early on boot) and pass the +diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c +index a034627..140b34d 100644 +--- a/drivers/firewire/fw-card.c ++++ b/drivers/firewire/fw-card.c +@@ -398,7 +398,6 @@ fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver, + { + static atomic_t index = ATOMIC_INIT(-1); -- device = fw_device_from_devt(inode->i_rdev); -+ device = fw_device_get_by_devt(inode->i_rdev); - if (device == NULL) - return -ENODEV; - - client = kzalloc(sizeof(*client), GFP_KERNEL); -- if (client == NULL) -+ if (client == NULL) { -+ fw_device_put(device); - return -ENOMEM; -+ } +- kref_init(&card->kref); + atomic_set(&card->device_count, 0); + card->index = atomic_inc_return(&index); + card->driver = driver; +@@ -429,12 +428,6 @@ fw_card_add(struct fw_card *card, + card->link_speed = link_speed; + card->guid = guid; + +- /* +- * The subsystem grabs a reference when the card is added and +- * drops it when the driver calls fw_core_remove_card. +- */ +- fw_card_get(card); +- + mutex_lock(&card_mutex); + config_rom = generate_config_rom(card, &length); + list_add_tail(&card->link, &card_list); +@@ -540,40 +533,9 @@ fw_core_remove_card(struct fw_card *card) + cancel_delayed_work_sync(&card->work); + fw_flush_transactions(card); + del_timer_sync(&card->flush_timer); +- +- fw_card_put(card); + } + EXPORT_SYMBOL(fw_core_remove_card); + +-struct fw_card * +-fw_card_get(struct fw_card *card) +-{ +- kref_get(&card->kref); +- +- return card; +-} +-EXPORT_SYMBOL(fw_card_get); +- +-static void +-release_card(struct kref *kref) +-{ +- struct fw_card *card = container_of(kref, struct fw_card, kref); +- +- kfree(card); +-} +- +-/* +- * An assumption for fw_card_put() is that the card driver allocates +- * the fw_card struct with kalloc and that it has been shut down +- * before the last ref is dropped. +- */ +-void +-fw_card_put(struct fw_card *card) +-{ +- kref_put(&card->kref, release_card); +-} +-EXPORT_SYMBOL(fw_card_put); +- + int + fw_core_initiate_bus_reset(struct fw_card *card, int short_reset) + { +diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h +index 78ecd39..0d771fd 100644 +--- a/drivers/firewire/fw-device.h ++++ b/drivers/firewire/fw-device.h +@@ -64,28 +64,24 @@ struct fw_device { + struct fw_attribute_group attribute_group; + }; -- client->device = fw_device_get(device); -+ client->device = device; - INIT_LIST_HEAD(&client->event_list); - INIT_LIST_HEAD(&client->resource_list); - spin_lock_init(&client->lock); -diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c -index de9066e..2ab13e0 100644 ---- a/drivers/firewire/fw-device.c -+++ b/drivers/firewire/fw-device.c -@@ -358,12 +358,9 @@ static ssize_t - guid_show(struct device *dev, struct device_attribute *attr, char *buf) - { - struct fw_device *device = fw_device(dev); -- u64 guid; - -- guid = ((u64)device->config_rom[3] << 32) | device->config_rom[4]; -- -- return snprintf(buf, PAGE_SIZE, "0x%016llx\n", -- (unsigned long long)guid); -+ return snprintf(buf, PAGE_SIZE, "0x%08x%08x\n", -+ device->config_rom[3], device->config_rom[4]); - } - - static struct device_attribute fw_device_attributes[] = { -@@ -610,12 +607,14 @@ static DECLARE_RWSEM(idr_rwsem); - static DEFINE_IDR(fw_device_idr); - int fw_cdev_major; +-static inline struct fw_device * +-fw_device(struct device *dev) ++static inline struct fw_device *fw_device(struct device *dev) + { + return container_of(dev, struct fw_device, device); + } --struct fw_device *fw_device_from_devt(dev_t devt) -+struct fw_device *fw_device_get_by_devt(dev_t devt) +-static inline int +-fw_device_is_shutdown(struct fw_device *device) ++static inline int fw_device_is_shutdown(struct fw_device *device) { - struct fw_device *device; + return atomic_read(&device->state) == FW_DEVICE_SHUTDOWN; + } - down_read(&idr_rwsem); - device = idr_find(&fw_device_idr, MINOR(devt)); -+ if (device) -+ fw_device_get(device); - up_read(&idr_rwsem); +-static inline struct fw_device * +-fw_device_get(struct fw_device *device) ++static inline struct fw_device *fw_device_get(struct fw_device *device) + { + get_device(&device->device); return device; -@@ -627,13 +626,14 @@ static void fw_device_shutdown(struct work_struct *work) - container_of(work, struct fw_device, work.work); - int minor = MINOR(device->device.devt); + } -- down_write(&idr_rwsem); -- idr_remove(&fw_device_idr, minor); -- up_write(&idr_rwsem); -- - fw_device_cdev_remove(device); - device_for_each_child(&device->device, NULL, shutdown_unit); - device_unregister(&device->device); -+ -+ down_write(&idr_rwsem); -+ idr_remove(&fw_device_idr, minor); -+ up_write(&idr_rwsem); -+ fw_device_put(device); +-static inline void +-fw_device_put(struct fw_device *device) ++static inline void fw_device_put(struct fw_device *device) + { + put_device(&device->device); } +@@ -104,12 +100,23 @@ struct fw_unit { + struct fw_attribute_group attribute_group; + }; - static struct device_type fw_device_type = { -@@ -682,10 +682,13 @@ static void fw_device_init(struct work_struct *work) - } +-static inline struct fw_unit * +-fw_unit(struct device *dev) ++static inline struct fw_unit *fw_unit(struct device *dev) + { + return container_of(dev, struct fw_unit, device); + } - err = -ENOMEM; ++static inline struct fw_unit *fw_unit_get(struct fw_unit *unit) ++{ ++ get_device(&unit->device); + -+ fw_device_get(device); - down_write(&idr_rwsem); - if (idr_pre_get(&fw_device_idr, GFP_KERNEL)) - err = idr_get_new(&fw_device_idr, device, &minor); - up_write(&idr_rwsem); ++ return unit; ++} + - if (err < 0) - goto error; ++static inline void fw_unit_put(struct fw_unit *unit) ++{ ++ put_device(&unit->device); ++} ++ + #define CSR_OFFSET 0x40 + #define CSR_LEAF 0x80 + #define CSR_DIRECTORY 0xc0 +diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c +index 7ebad3c..28ea78c 100644 +--- a/drivers/firewire/fw-ohci.c ++++ b/drivers/firewire/fw-ohci.c +@@ -33,6 +33,10 @@ + #include + #include + ++#ifdef CONFIG_PPC_PMAC ++#include ++#endif ++ + #include "fw-ohci.h" + #include "fw-transaction.h" -@@ -717,13 +720,22 @@ static void fw_device_init(struct work_struct *work) +@@ -175,6 +179,7 @@ struct fw_ohci { + int generation; + int request_generation; + u32 bus_seconds; ++ bool old_uninorth; + + /* + * Spinlock for accessing fw_ohci data. Never call out of +@@ -311,15 +316,22 @@ static int ar_context_add_page(struct ar_context *ctx) + return 0; + } + ++#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32) ++#define cond_le32_to_cpu(v) \ ++ (ohci->old_uninorth ? (__force __u32)(v) : le32_to_cpu(v)) ++#else ++#define cond_le32_to_cpu(v) le32_to_cpu(v) ++#endif ++ + static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + { + struct fw_ohci *ohci = ctx->ohci; + struct fw_packet p; + u32 status, length, tcode; + +- p.header[0] = le32_to_cpu(buffer[0]); +- p.header[1] = le32_to_cpu(buffer[1]); +- p.header[2] = le32_to_cpu(buffer[2]); ++ p.header[0] = cond_le32_to_cpu(buffer[0]); ++ p.header[1] = cond_le32_to_cpu(buffer[1]); ++ p.header[2] = cond_le32_to_cpu(buffer[2]); + + tcode = (p.header[0] >> 4) & 0x0f; + switch (tcode) { +@@ -331,7 +343,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + break; + + case TCODE_READ_BLOCK_REQUEST : +- p.header[3] = le32_to_cpu(buffer[3]); ++ p.header[3] = cond_le32_to_cpu(buffer[3]); + p.header_length = 16; + p.payload_length = 0; + break; +@@ -340,7 +352,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + case TCODE_READ_BLOCK_RESPONSE: + case TCODE_LOCK_REQUEST: + case TCODE_LOCK_RESPONSE: +- p.header[3] = le32_to_cpu(buffer[3]); ++ p.header[3] = cond_le32_to_cpu(buffer[3]); + p.header_length = 16; + p.payload_length = p.header[3] >> 16; + break; +@@ -357,7 +369,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + + /* FIXME: What to do about evt_* errors? */ + length = (p.header_length + p.payload_length + 3) / 4; +- status = le32_to_cpu(buffer[length]); ++ status = cond_le32_to_cpu(buffer[length]); + + p.ack = ((status >> 16) & 0x1f) - 16; + p.speed = (status >> 21) & 0x7; +@@ -375,7 +387,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) */ - if (atomic_cmpxchg(&device->state, - FW_DEVICE_INITIALIZING, -- FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) -+ FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) { - fw_device_shutdown(&device->work.work); -- else -- fw_notify("created new fw device %s " -- "(%d config rom retries, S%d00)\n", -- device->device.bus_id, device->config_rom_retries, -- 1 << device->max_speed); -+ } else { -+ if (device->config_rom_retries) -+ fw_notify("created device %s: GUID %08x%08x, S%d00, " -+ "%d config ROM retries\n", -+ device->device.bus_id, -+ device->config_rom[3], device->config_rom[4], -+ 1 << device->max_speed, -+ device->config_rom_retries); -+ else -+ fw_notify("created device %s: GUID %08x%08x, S%d00\n", -+ device->device.bus_id, -+ device->config_rom[3], device->config_rom[4], -+ 1 << device->max_speed); -+ } + + if (p.ack + 16 == 0x09) +- ohci->request_generation = (buffer[2] >> 16) & 0xff; ++ ohci->request_generation = (p.header[2] >> 16) & 0xff; + else if (ctx == &ohci->ar_request_ctx) + fw_core_handle_request(&ohci->card, &p); + else +@@ -532,7 +544,7 @@ static int + context_add_buffer(struct context *ctx) + { + struct descriptor_buffer *desc; +- dma_addr_t bus_addr; ++ dma_addr_t uninitialized_var(bus_addr); + int offset; /* - * Reschedule the IRM work if we just finished reading the -@@ -741,7 +753,9 @@ static void fw_device_init(struct work_struct *work) - idr_remove(&fw_device_idr, minor); - up_write(&idr_rwsem); - error: -- put_device(&device->device); -+ fw_device_put(device); /* fw_device_idr's reference */ +@@ -1022,13 +1034,14 @@ static void bus_reset_tasklet(unsigned long data) + */ + + self_id_count = (reg_read(ohci, OHCI1394_SelfIDCount) >> 3) & 0x3ff; +- generation = (le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff; ++ generation = (cond_le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff; + rmb(); + + for (i = 1, j = 0; j < self_id_count; i += 2, j++) { + if (ohci->self_id_cpu[i] != ~ohci->self_id_cpu[i + 1]) + fw_error("inconsistent self IDs\n"); +- ohci->self_id_buffer[j] = le32_to_cpu(ohci->self_id_cpu[i]); ++ ohci->self_id_buffer[j] = ++ cond_le32_to_cpu(ohci->self_id_cpu[i]); + } + rmb(); + +@@ -1091,6 +1104,11 @@ static void bus_reset_tasklet(unsigned long data) + reg_write(ohci, OHCI1394_ConfigROMhdr, ohci->next_header); + } + ++#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA ++ reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0); ++ reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0); ++#endif + -+ put_device(&device->device); /* our reference */ + spin_unlock_irqrestore(&ohci->lock, flags); + + if (free_rom) +@@ -1316,7 +1334,7 @@ ohci_set_config_rom(struct fw_card *card, u32 *config_rom, size_t length) + unsigned long flags; + int retval = -EBUSY; + __be32 *next_config_rom; +- dma_addr_t next_config_rom_bus; ++ dma_addr_t uninitialized_var(next_config_rom_bus); + + ohci = fw_ohci(card); + +@@ -1429,6 +1447,9 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet) + static int + ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation) + { ++#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA ++ return 0; ++#else + struct fw_ohci *ohci = fw_ohci(card); + unsigned long flags; + int n, retval = 0; +@@ -1460,6 +1481,7 @@ ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation) + out: + spin_unlock_irqrestore(&ohci->lock, flags); + return retval; ++#endif /* CONFIG_FIREWIRE_OHCI_REMOTE_DMA */ } - static int update_unit(struct device *dev, void *data) -diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h -index 0854fe2..43808c0 100644 ---- a/drivers/firewire/fw-device.h -+++ b/drivers/firewire/fw-device.h -@@ -77,13 +77,13 @@ fw_device_is_shutdown(struct fw_device *device) + static u64 +@@ -1487,7 +1509,7 @@ static int handle_ir_dualbuffer_packet(struct context *context, + void *p, *end; + int i; + +- if (db->first_res_count > 0 && db->second_res_count > 0) { ++ if (db->first_res_count != 0 && db->second_res_count != 0) { + if (ctx->excess_bytes <= le16_to_cpu(db->second_req_count)) { + /* This descriptor isn't done yet, stop iteration. */ + return 0; +@@ -1513,7 +1535,7 @@ static int handle_ir_dualbuffer_packet(struct context *context, + memcpy(ctx->header + i + 4, p + 8, ctx->base.header_size - 4); + i += ctx->base.header_size; + ctx->excess_bytes += +- (le32_to_cpu(*(u32 *)(p + 4)) >> 16) & 0xffff; ++ (le32_to_cpu(*(__le32 *)(p + 4)) >> 16) & 0xffff; + p += ctx->base.header_size + 4; + } + ctx->header_length = i; +@@ -2039,6 +2061,35 @@ static const struct fw_card_driver ohci_driver = { + .stop_iso = ohci_stop_iso, + }; + ++#ifdef CONFIG_PPC_PMAC ++static void ohci_pmac_on(struct pci_dev *dev) ++{ ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(dev); ++ ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1); ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); ++ } ++ } ++} ++ ++static void ohci_pmac_off(struct pci_dev *dev) ++{ ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(dev); ++ ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); ++ } ++ } ++} ++#else ++#define ohci_pmac_on(dev) ++#define ohci_pmac_off(dev) ++#endif /* CONFIG_PPC_PMAC */ ++ + static int __devinit + pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + { +@@ -2048,6 +2099,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + int err; + size_t size; + ++ ohci_pmac_on(dev); ++ + ohci = kzalloc(sizeof(*ohci), GFP_KERNEL); + if (ohci == NULL) { + fw_error("Could not malloc fw_ohci data.\n"); +@@ -2059,13 +2112,17 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + err = pci_enable_device(dev); + if (err) { + fw_error("Failed to enable OHCI hardware.\n"); +- goto fail_put_card; ++ goto fail_free; + } + + pci_set_master(dev); + pci_write_config_dword(dev, OHCI1394_PCI_HCI_Control, 0); + pci_set_drvdata(dev, ohci); + ++#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32) ++ ohci->old_uninorth = dev->vendor == PCI_VENDOR_ID_APPLE && ++ dev->device == PCI_DEVICE_ID_APPLE_UNI_N_FW; ++#endif + spin_lock_init(&ohci->lock); + + tasklet_init(&ohci->bus_reset_tasklet, +@@ -2151,8 +2208,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + pci_release_region(dev, 0); + fail_disable: + pci_disable_device(dev); +- fail_put_card: +- fw_card_put(&ohci->card); ++ fail_free: ++ kfree(&ohci->card); + + return err; } +@@ -2180,39 +2237,42 @@ static void pci_remove(struct pci_dev *dev) + pci_iounmap(dev, ohci->registers); + pci_release_region(dev, 0); + pci_disable_device(dev); +- fw_card_put(&ohci->card); ++ ohci_pmac_off(dev); ++ kfree(&ohci->card); - struct fw_device *fw_device_get(struct fw_device *device); -+struct fw_device *fw_device_get_by_devt(dev_t devt); - void fw_device_put(struct fw_device *device); - int fw_device_enable_phys_dma(struct fw_device *device); + fw_notify("Removed fw-ohci device.\n"); + } - void fw_device_cdev_update(struct fw_device *device); - void fw_device_cdev_remove(struct fw_device *device); + #ifdef CONFIG_PM +-static int pci_suspend(struct pci_dev *pdev, pm_message_t state) ++static int pci_suspend(struct pci_dev *dev, pm_message_t state) + { +- struct fw_ohci *ohci = pci_get_drvdata(pdev); ++ struct fw_ohci *ohci = pci_get_drvdata(dev); + int err; + + software_reset(ohci); +- free_irq(pdev->irq, ohci); +- err = pci_save_state(pdev); ++ free_irq(dev->irq, ohci); ++ err = pci_save_state(dev); + if (err) { + fw_error("pci_save_state failed\n"); + return err; + } +- err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); ++ err = pci_set_power_state(dev, pci_choose_state(dev, state)); + if (err) + fw_error("pci_set_power_state failed with %d\n", err); ++ ohci_pmac_off(dev); --struct fw_device *fw_device_from_devt(dev_t devt); - extern int fw_cdev_major; + return 0; + } - struct fw_unit { +-static int pci_resume(struct pci_dev *pdev) ++static int pci_resume(struct pci_dev *dev) + { +- struct fw_ohci *ohci = pci_get_drvdata(pdev); ++ struct fw_ohci *ohci = pci_get_drvdata(dev); + int err; + +- pci_set_power_state(pdev, PCI_D0); +- pci_restore_state(pdev); +- err = pci_enable_device(pdev); ++ ohci_pmac_on(dev); ++ pci_set_power_state(dev, PCI_D0); ++ pci_restore_state(dev); ++ err = pci_enable_device(dev); + if (err) { + fw_error("pci_enable_device failed\n"); + return err; diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c -index 19ece9b..5259491 100644 +index 03069a4..d6d62c6 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c -@@ -28,14 +28,15 @@ - * and many others. - */ - -+#include -+#include -+#include -+#include - #include -+#include - #include - #include --#include --#include - #include --#include --#include - #include - #include - #include -@@ -47,9 +48,9 @@ - #include - #include - --#include "fw-transaction.h" --#include "fw-topology.h" - #include "fw-device.h" -+#include "fw-topology.h" -+#include "fw-transaction.h" +@@ -174,9 +174,6 @@ struct sbp2_target { + #define SBP2_ORB_NULL 0x80000000 + #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 - /* - * So far only bridges from Oxford Semiconductor are known to support -@@ -82,6 +83,9 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device " - * Avoids access beyond actual disk limits on devices with an off-by-one bug. - * Don't use this with devices which don't have this bug. - * -+ * - delay inquiry -+ * Wait extra SBP2_INQUIRY_DELAY seconds after login before SCSI inquiry. -+ * - * - override internal blacklist - * Instead of adding to the built-in blacklist, use only the workarounds - * specified in the module load parameter. -@@ -91,6 +95,8 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device " - #define SBP2_WORKAROUND_INQUIRY_36 0x2 - #define SBP2_WORKAROUND_MODE_SENSE_8 0x4 - #define SBP2_WORKAROUND_FIX_CAPACITY 0x8 -+#define SBP2_WORKAROUND_DELAY_INQUIRY 0x10 -+#define SBP2_INQUIRY_DELAY 12 - #define SBP2_WORKAROUND_OVERRIDE 0x100 - - static int sbp2_param_workarounds; -@@ -100,6 +106,7 @@ MODULE_PARM_DESC(workarounds, "Work around device bugs (default = 0" - ", 36 byte inquiry = " __stringify(SBP2_WORKAROUND_INQUIRY_36) - ", skip mode page 8 = " __stringify(SBP2_WORKAROUND_MODE_SENSE_8) - ", fix capacity = " __stringify(SBP2_WORKAROUND_FIX_CAPACITY) -+ ", delay inquiry = " __stringify(SBP2_WORKAROUND_DELAY_INQUIRY) - ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE) - ", or a combination)"); +-#define SBP2_DIRECTION_TO_MEDIA 0x0 +-#define SBP2_DIRECTION_FROM_MEDIA 0x1 +- + /* Unit directory keys */ + #define SBP2_CSR_UNIT_CHARACTERISTICS 0x3a + #define SBP2_CSR_FIRMWARE_REVISION 0x3c +@@ -223,8 +220,8 @@ struct sbp2_status { + }; -@@ -132,6 +139,7 @@ struct sbp2_logical_unit { - int generation; - int retries; - struct delayed_work work; -+ bool blocked; + struct sbp2_pointer { +- u32 high; +- u32 low; ++ __be32 high; ++ __be32 low; }; - /* -@@ -141,16 +149,18 @@ struct sbp2_logical_unit { - struct sbp2_target { - struct kref kref; - struct fw_unit *unit; -+ const char *bus_id; -+ struct list_head lu_list; + struct sbp2_orb { +@@ -252,8 +249,8 @@ struct sbp2_management_orb { + struct { + struct sbp2_pointer password; + struct sbp2_pointer response; +- u32 misc; +- u32 length; ++ __be32 misc; ++ __be32 length; + struct sbp2_pointer status_fifo; + } request; + __be32 response[4]; +@@ -262,20 +259,17 @@ struct sbp2_management_orb { + struct sbp2_status status; + }; - u64 management_agent_address; - int directory_id; - int node_id; - int address_high; +-#define LOGIN_RESPONSE_GET_LOGIN_ID(v) ((v).misc & 0xffff) +-#define LOGIN_RESPONSE_GET_LENGTH(v) (((v).misc >> 16) & 0xffff) - -- unsigned workarounds; -- struct list_head lu_list; -- -+ unsigned int workarounds; - unsigned int mgt_orb_timeout; -+ -+ int dont_block; /* counter for each logical unit */ -+ int blocked; /* ditto */ + struct sbp2_login_response { +- u32 misc; ++ __be32 misc; + struct sbp2_pointer command_block_agent; +- u32 reconnect_hold; ++ __be32 reconnect_hold; }; + #define COMMAND_ORB_DATA_SIZE(v) ((v)) + #define COMMAND_ORB_PAGE_SIZE(v) ((v) << 16) + #define COMMAND_ORB_PAGE_TABLE_PRESENT ((1) << 19) + #define COMMAND_ORB_MAX_PAYLOAD(v) ((v) << 20) + #define COMMAND_ORB_SPEED(v) ((v) << 24) +-#define COMMAND_ORB_DIRECTION(v) ((v) << 27) ++#define COMMAND_ORB_DIRECTION ((1) << 27) + #define COMMAND_ORB_REQUEST_FORMAT(v) ((v) << 29) + #define COMMAND_ORB_NOTIFY ((1) << 31) + +@@ -284,7 +278,7 @@ struct sbp2_command_orb { + struct { + struct sbp2_pointer next; + struct sbp2_pointer data_descriptor; +- u32 misc; ++ __be32 misc; + u8 command_block[12]; + } request; + struct scsi_cmnd *cmd; +@@ -453,8 +447,7 @@ sbp2_send_orb(struct sbp2_orb *orb, struct sbp2_logical_unit *lu, + unsigned long flags; + + orb->pointer.high = 0; +- orb->pointer.low = orb->request_bus; +- fw_memcpy_to_be32(&orb->pointer, &orb->pointer, sizeof(orb->pointer)); ++ orb->pointer.low = cpu_to_be32(orb->request_bus); + + spin_lock_irqsave(&device->card->lock, flags); + list_add_tail(&orb->link, &lu->orb_list); +@@ -530,31 +523,31 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, + if (dma_mapping_error(orb->response_bus)) + goto fail_mapping_response; + +- orb->request.response.high = 0; +- orb->request.response.low = orb->response_bus; ++ orb->request.response.high = 0; ++ orb->request.response.low = cpu_to_be32(orb->response_bus); + +- orb->request.misc = ++ orb->request.misc = cpu_to_be32( + MANAGEMENT_ORB_NOTIFY | + MANAGEMENT_ORB_FUNCTION(function) | +- MANAGEMENT_ORB_LUN(lun_or_login_id); +- orb->request.length = +- MANAGEMENT_ORB_RESPONSE_LENGTH(sizeof(orb->response)); ++ MANAGEMENT_ORB_LUN(lun_or_login_id)); ++ orb->request.length = cpu_to_be32( ++ MANAGEMENT_ORB_RESPONSE_LENGTH(sizeof(orb->response))); + +- orb->request.status_fifo.high = lu->address_handler.offset >> 32; +- orb->request.status_fifo.low = lu->address_handler.offset; ++ orb->request.status_fifo.high = ++ cpu_to_be32(lu->address_handler.offset >> 32); ++ orb->request.status_fifo.low = ++ cpu_to_be32(lu->address_handler.offset); + + if (function == SBP2_LOGIN_REQUEST) { + /* Ask for 2^2 == 4 seconds reconnect grace period */ +- orb->request.misc |= ++ orb->request.misc |= cpu_to_be32( + MANAGEMENT_ORB_RECONNECT(2) | +- MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login); ++ MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login)); + timeout = lu->tgt->mgt_orb_timeout; + } else { + timeout = SBP2_ORB_TIMEOUT; + } + +- fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request)); +- + init_completion(&orb->done); + orb->base.callback = complete_management_orb; + +@@ -599,8 +592,7 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, + sizeof(orb->response), DMA_FROM_DEVICE); + fail_mapping_response: + if (response) +- fw_memcpy_from_be32(response, +- orb->response, sizeof(orb->response)); ++ memcpy(response, orb->response, sizeof(orb->response)); + kref_put(&orb->base.kref, free_orb); + + return retval; +@@ -695,10 +687,8 @@ static void sbp2_conditionally_block(struct sbp2_logical_unit *lu) + if (!tgt->dont_block && !lu->blocked && + lu->generation != card->generation) { + lu->blocked = true; +- if (++tgt->blocked == 1) { ++ if (++tgt->blocked == 1) + scsi_block_requests(shost); +- fw_notify("blocked %s\n", lu->tgt->bus_id); +- } + } + spin_unlock_irqrestore(&card->lock, flags); + } +@@ -725,10 +715,8 @@ static void sbp2_conditionally_unblock(struct sbp2_logical_unit *lu) + } + spin_unlock_irqrestore(&card->lock, flags); + +- if (unblock) { ++ if (unblock) + scsi_unblock_requests(shost); +- fw_notify("unblocked %s\n", lu->tgt->bus_id); +- } + } /* -@@ -160,7 +170,7 @@ struct sbp2_target { - */ - #define SBP2_MIN_LOGIN_ORB_TIMEOUT 5000U /* Timeout in ms */ - #define SBP2_MAX_LOGIN_ORB_TIMEOUT 40000U /* Timeout in ms */ --#define SBP2_ORB_TIMEOUT 2000 /* Timeout in ms */ -+#define SBP2_ORB_TIMEOUT 2000U /* Timeout in ms */ - #define SBP2_ORB_NULL 0x80000000 - #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 +@@ -790,7 +778,7 @@ static void sbp2_release_target(struct kref *kref) + scsi_remove_host(shost); + fw_notify("released %s\n", tgt->bus_id); -@@ -297,7 +307,7 @@ struct sbp2_command_orb { - static const struct { - u32 firmware_revision; - u32 model; -- unsigned workarounds; -+ unsigned int workarounds; - } sbp2_workarounds_table[] = { - /* DViCO Momobay CX-1 with TSB42AA9 bridge */ { - .firmware_revision = 0x002800, -@@ -305,6 +315,11 @@ static const struct { - .workarounds = SBP2_WORKAROUND_INQUIRY_36 | - SBP2_WORKAROUND_MODE_SENSE_8, - }, -+ /* DViCO Momobay FX-3A with TSB42AA9A bridge */ { -+ .firmware_revision = 0x002800, -+ .model = 0x000000, -+ .workarounds = SBP2_WORKAROUND_DELAY_INQUIRY, -+ }, - /* Initio bridges, actually only needed for some older ones */ { - .firmware_revision = 0x000200, - .model = ~0, -@@ -501,6 +516,9 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, - unsigned int timeout; - int retval = -ENOMEM; +- put_device(&tgt->unit->device); ++ fw_unit_put(tgt->unit); + scsi_host_put(shost); + fw_device_put(device); + } +@@ -855,11 +843,10 @@ static void sbp2_login(struct work_struct *work) + tgt->address_high = local_node_id << 16; + sbp2_set_generation(lu, generation); -+ if (function == SBP2_LOGOUT_REQUEST && fw_device_is_shutdown(device)) -+ return 0; -+ - orb = kzalloc(sizeof(*orb), GFP_ATOMIC); - if (orb == NULL) - return -ENOMEM; -@@ -553,20 +571,20 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, - - retval = -EIO; - if (sbp2_cancel_orbs(lu) == 0) { -- fw_error("orb reply timed out, rcode=0x%02x\n", -- orb->base.rcode); -+ fw_error("%s: orb reply timed out, rcode=0x%02x\n", -+ lu->tgt->bus_id, orb->base.rcode); - goto out; +- /* Get command block agent offset and login id. */ + lu->command_block_agent_address = +- ((u64) (response.command_block_agent.high & 0xffff) << 32) | +- response.command_block_agent.low; +- lu->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response); ++ ((u64)(be32_to_cpu(response.command_block_agent.high) & 0xffff) ++ << 32) | be32_to_cpu(response.command_block_agent.low); ++ lu->login_id = be32_to_cpu(response.misc) & 0xffff; + + fw_notify("%s: logged in to LUN %04x (%d retries)\n", + tgt->bus_id, lu->lun, lu->retries); +@@ -1091,6 +1078,7 @@ static int sbp2_probe(struct device *dev) + goto fail_shost_put; + + fw_device_get(device); ++ fw_unit_get(unit); + + /* Initialize to values that won't match anything in our table. */ + firmware_revision = 0xff000000; +@@ -1106,8 +1094,6 @@ static int sbp2_probe(struct device *dev) + + sbp2_init_workarounds(tgt, model, firmware_revision); + +- get_device(&unit->device); +- + /* Do the login in a workqueue so we can easily reschedule retries. */ + list_for_each_entry(lu, &tgt->lu_list, link) + sbp2_queue_work(lu, 0); +@@ -1339,9 +1325,12 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, + * tables. + */ + if (count == 1 && sg_dma_len(sg) < SBP2_MAX_SG_ELEMENT_LENGTH) { +- orb->request.data_descriptor.high = lu->tgt->address_high; +- orb->request.data_descriptor.low = sg_dma_address(sg); +- orb->request.misc |= COMMAND_ORB_DATA_SIZE(sg_dma_len(sg)); ++ orb->request.data_descriptor.high = ++ cpu_to_be32(lu->tgt->address_high); ++ orb->request.data_descriptor.low = ++ cpu_to_be32(sg_dma_address(sg)); ++ orb->request.misc |= ++ cpu_to_be32(COMMAND_ORB_DATA_SIZE(sg_dma_len(sg))); + return 0; } - if (orb->base.rcode != RCODE_COMPLETE) { -- fw_error("management write failed, rcode 0x%02x\n", -- orb->base.rcode); -+ fw_error("%s: management write failed, rcode 0x%02x\n", -+ lu->tgt->bus_id, orb->base.rcode); - goto out; +@@ -1362,16 +1351,14 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, + goto fail_page_table; + } + l = min(sg_len, SBP2_MAX_SG_ELEMENT_LENGTH); +- orb->page_table[j].low = sg_addr; +- orb->page_table[j].high = (l << 16); ++ orb->page_table[j].low = cpu_to_be32(sg_addr); ++ orb->page_table[j].high = cpu_to_be32(l << 16); + sg_addr += l; + sg_len -= l; + j++; + } } - if (STATUS_GET_RESPONSE(orb->status) != 0 || - STATUS_GET_SBP_STATUS(orb->status) != 0) { -- fw_error("error status: %d:%d\n", -+ fw_error("%s: error status: %d:%d\n", lu->tgt->bus_id, - STATUS_GET_RESPONSE(orb->status), - STATUS_GET_SBP_STATUS(orb->status)); +- fw_memcpy_to_be32(orb->page_table, orb->page_table, +- sizeof(orb->page_table[0]) * j); + orb->page_table_bus = + dma_map_single(device->card->device, orb->page_table, + sizeof(orb->page_table), DMA_TO_DEVICE); +@@ -1385,11 +1372,10 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, + * initiator (i.e. us), but data_descriptor can refer to data + * on other nodes so we need to put our ID in descriptor.high. + */ +- orb->request.data_descriptor.high = lu->tgt->address_high; +- orb->request.data_descriptor.low = orb->page_table_bus; +- orb->request.misc |= +- COMMAND_ORB_PAGE_TABLE_PRESENT | +- COMMAND_ORB_DATA_SIZE(j); ++ orb->request.data_descriptor.high = cpu_to_be32(lu->tgt->address_high); ++ orb->request.data_descriptor.low = cpu_to_be32(orb->page_table_bus); ++ orb->request.misc |= cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT | ++ COMMAND_ORB_DATA_SIZE(j)); + + return 0; + +@@ -1435,8 +1421,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done) + orb->done = done; + orb->cmd = cmd; + +- orb->request.next.high = SBP2_ORB_NULL; +- orb->request.next.low = 0x0; ++ orb->request.next.high = cpu_to_be32(SBP2_ORB_NULL); + /* + * At speed 100 we can do 512 bytes per packet, at speed 200, + * 1024 bytes per packet etc. The SBP-2 max_payload field +@@ -1445,25 +1430,17 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done) + */ + max_payload = min(device->max_speed + 7, + device->card->max_receive - 1); +- orb->request.misc = ++ orb->request.misc = cpu_to_be32( + COMMAND_ORB_MAX_PAYLOAD(max_payload) | + COMMAND_ORB_SPEED(device->max_speed) | +- COMMAND_ORB_NOTIFY; ++ COMMAND_ORB_NOTIFY); + + if (cmd->sc_data_direction == DMA_FROM_DEVICE) +- orb->request.misc |= +- COMMAND_ORB_DIRECTION(SBP2_DIRECTION_FROM_MEDIA); +- else if (cmd->sc_data_direction == DMA_TO_DEVICE) +- orb->request.misc |= +- COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA); ++ orb->request.misc |= cpu_to_be32(COMMAND_ORB_DIRECTION); + + if (scsi_sg_count(cmd) && sbp2_map_scatterlist(orb, device, lu) < 0) goto out; -@@ -590,29 +608,147 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, - static void - complete_agent_reset_write(struct fw_card *card, int rcode, -- void *payload, size_t length, void *data) -+ void *payload, size_t length, void *done) -+{ -+ complete(done); -+} -+ -+static void sbp2_agent_reset(struct sbp2_logical_unit *lu) +- fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request)); +- +- memset(orb->request.command_block, +- 0, sizeof(orb->request.command_block)); + memcpy(orb->request.command_block, cmd->cmnd, COMMAND_SIZE(*cmd->cmnd)); + + orb->base.callback = complete_command_orb; +@@ -1491,11 +1468,8 @@ static int sbp2_scsi_slave_alloc(struct scsi_device *sdev) + + sdev->allow_restart = 1; + +- /* +- * Update the dma alignment (minimum alignment requirements for +- * start and end of DMA transfers) to be a sector +- */ +- blk_queue_update_dma_alignment(sdev->request_queue, 511); ++ /* SBP-2 requires quadlet alignment of the data buffers. */ ++ blk_queue_update_dma_alignment(sdev->request_queue, 4 - 1); + + if (lu->tgt->workarounds & SBP2_WORKAROUND_INQUIRY_36) + sdev->inquiry_len = 36; +diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c +index 7fcc59d..99529e5 100644 +--- a/drivers/firewire/fw-transaction.c ++++ b/drivers/firewire/fw-transaction.c +@@ -751,7 +751,7 @@ handle_topology_map(struct fw_card *card, struct fw_request *request, + void *payload, size_t length, void *callback_data) { -- struct fw_transaction *t = data; -+ struct fw_device *device = fw_device(lu->tgt->unit->device.parent); -+ DECLARE_COMPLETION_ONSTACK(done); -+ struct fw_transaction t; -+ static u32 z; -+ -+ fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST, -+ lu->tgt->node_id, lu->generation, device->max_speed, -+ lu->command_block_agent_address + SBP2_AGENT_RESET, -+ &z, sizeof(z), complete_agent_reset_write, &done); -+ wait_for_completion(&done); -+} + int i, start, end; +- u32 *map; ++ __be32 *map; + + if (!TCODE_IS_READ_REQUEST(tcode)) { + fw_send_response(card, request, RCODE_TYPE_ERROR); +diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h +index 09cb728..1a22a23 100644 +--- a/drivers/firewire/fw-transaction.h ++++ b/drivers/firewire/fw-transaction.h +@@ -86,12 +86,12 @@ + static inline void + fw_memcpy_from_be32(void *_dst, void *_src, size_t size) + { +- u32 *dst = _dst; +- u32 *src = _src; ++ u32 *dst = _dst; ++ __be32 *src = _src; + int i; -- kfree(t); -+static void -+complete_agent_reset_write_no_wait(struct fw_card *card, int rcode, -+ void *payload, size_t length, void *data) -+{ -+ kfree(data); + for (i = 0; i < size / 4; i++) +- dst[i] = cpu_to_be32(src[i]); ++ dst[i] = be32_to_cpu(src[i]); } --static int sbp2_agent_reset(struct sbp2_logical_unit *lu) -+static void sbp2_agent_reset_no_wait(struct sbp2_logical_unit *lu) - { - struct fw_device *device = fw_device(lu->tgt->unit->device.parent); - struct fw_transaction *t; -- static u32 zero; -+ static u32 z; - -- t = kzalloc(sizeof(*t), GFP_ATOMIC); -+ t = kmalloc(sizeof(*t), GFP_ATOMIC); - if (t == NULL) -- return -ENOMEM; -+ return; - - fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST, - lu->tgt->node_id, lu->generation, device->max_speed, - lu->command_block_agent_address + SBP2_AGENT_RESET, -- &zero, sizeof(zero), complete_agent_reset_write, t); -+ &z, sizeof(z), complete_agent_reset_write_no_wait, t); -+} + static inline void +@@ -221,7 +221,6 @@ struct fw_card { + const struct fw_card_driver *driver; + struct device *device; + atomic_t device_count; +- struct kref kref; -- return 0; -+static void sbp2_set_generation(struct sbp2_logical_unit *lu, int generation) -+{ -+ struct fw_card *card = fw_device(lu->tgt->unit->device.parent)->card; -+ unsigned long flags; -+ -+ /* serialize with comparisons of lu->generation and card->generation */ -+ spin_lock_irqsave(&card->lock, flags); -+ lu->generation = generation; -+ spin_unlock_irqrestore(&card->lock, flags); -+} -+ -+static inline void sbp2_allow_block(struct sbp2_logical_unit *lu) -+{ -+ /* -+ * We may access dont_block without taking card->lock here: -+ * All callers of sbp2_allow_block() and all callers of sbp2_unblock() -+ * are currently serialized against each other. -+ * And a wrong result in sbp2_conditionally_block()'s access of -+ * dont_block is rather harmless, it simply misses its first chance. -+ */ -+ --lu->tgt->dont_block; -+} + int node_id; + int generation; +@@ -263,9 +262,6 @@ struct fw_card { + int bm_generation; + }; + +-struct fw_card *fw_card_get(struct fw_card *card); +-void fw_card_put(struct fw_card *card); +- + /* + * The iso packet format allows for an immediate header/payload part + * stored in 'header' immediately after the packet info plus an +diff --git a/drivers/ieee1394/csr.c b/drivers/ieee1394/csr.c +index 52ac83e..c90be40 100644 +--- a/drivers/ieee1394/csr.c ++++ b/drivers/ieee1394/csr.c +@@ -133,8 +133,7 @@ static void host_reset(struct hpsb_host *host) + host->csr.state &= ~0x100; + } + +- host->csr.topology_map[1] = +- cpu_to_be32(be32_to_cpu(host->csr.topology_map[1]) + 1); ++ be32_add_cpu(&host->csr.topology_map[1], 1); + host->csr.topology_map[2] = cpu_to_be32(host->node_count << 16 + | host->selfid_count); + host->csr.topology_map[0] = +@@ -142,8 +141,7 @@ static void host_reset(struct hpsb_host *host) + | csr_crc16(host->csr.topology_map + 1, + host->selfid_count + 2)); + +- host->csr.speed_map[1] = +- cpu_to_be32(be32_to_cpu(host->csr.speed_map[1]) + 1); ++ be32_add_cpu(&host->csr.speed_map[1], 1); + host->csr.speed_map[0] = cpu_to_be32(0x3f1 << 16 + | csr_crc16(host->csr.speed_map+1, + 0x3f1)); +diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c +index 6572211..8c72f36 100644 +--- a/drivers/ieee1394/dv1394.c ++++ b/drivers/ieee1394/dv1394.c +@@ -2179,8 +2179,7 @@ static struct ieee1394_device_id dv1394_id_table[] = { + MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); + + static struct hpsb_protocol_driver dv1394_driver = { +- .name = "dv1394", +- .id_table = dv1394_id_table, ++ .name = "dv1394", + }; + + +diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c +index 511e432..70afa37 100644 +--- a/drivers/ieee1394/nodemgr.c ++++ b/drivers/ieee1394/nodemgr.c +@@ -701,7 +701,11 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv) + return 0; + + driver = container_of(drv, struct hpsb_protocol_driver, driver); +- for (id = driver->id_table; id->match_flags != 0; id++) { ++ id = driver->id_table; ++ if (!id) ++ return 0; + -+/* -+ * Blocks lu->tgt if all of the following conditions are met: -+ * - Login, INQUIRY, and high-level SCSI setup of all of the target's -+ * logical units have been finished (indicated by dont_block == 0). -+ * - lu->generation is stale. -+ * -+ * Note, scsi_block_requests() must be called while holding card->lock, -+ * otherwise it might foil sbp2_[conditionally_]unblock()'s attempt to -+ * unblock the target. -+ */ -+static void sbp2_conditionally_block(struct sbp2_logical_unit *lu) ++ for (; id->match_flags != 0; id++) { + if ((id->match_flags & IEEE1394_MATCH_VENDOR_ID) && + id->vendor_id != ud->vendor_id) + continue; +diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c +index 969de2a..29b8910 100644 +--- a/drivers/ieee1394/ohci1394.c ++++ b/drivers/ieee1394/ohci1394.c +@@ -2993,15 +2993,9 @@ do { \ + return err; \ + } while (0) + +-static int __devinit ohci1394_pci_probe(struct pci_dev *dev, +- const struct pci_device_id *ent) +-{ +- struct hpsb_host *host; +- struct ti_ohci *ohci; /* shortcut to currently handled device */ +- resource_size_t ohci_base; +- + #ifdef CONFIG_PPC_PMAC +- /* Necessary on some machines if ohci1394 was loaded/ unloaded before */ ++static void ohci1394_pmac_on(struct pci_dev *dev) +{ -+ struct sbp2_target *tgt = lu->tgt; -+ struct fw_card *card = fw_device(tgt->unit->device.parent)->card; -+ struct Scsi_Host *shost = -+ container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -+ unsigned long flags; -+ -+ spin_lock_irqsave(&card->lock, flags); -+ if (!tgt->dont_block && !lu->blocked && -+ lu->generation != card->generation) { -+ lu->blocked = true; -+ if (++tgt->blocked == 1) { -+ scsi_block_requests(shost); -+ fw_notify("blocked %s\n", lu->tgt->bus_id); -+ } -+ } -+ spin_unlock_irqrestore(&card->lock, flags); + if (machine_is(powermac)) { + struct device_node *ofn = pci_device_to_OF_node(dev); + +@@ -3010,8 +3004,32 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, + pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); + } + } +} + -+/* -+ * Unblocks lu->tgt as soon as all its logical units can be unblocked. -+ * Note, it is harmless to run scsi_unblock_requests() outside the -+ * card->lock protected section. On the other hand, running it inside -+ * the section might clash with shost->host_lock. -+ */ -+static void sbp2_conditionally_unblock(struct sbp2_logical_unit *lu) ++static void ohci1394_pmac_off(struct pci_dev *dev) +{ -+ struct sbp2_target *tgt = lu->tgt; -+ struct fw_card *card = fw_device(tgt->unit->device.parent)->card; -+ struct Scsi_Host *shost = -+ container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -+ unsigned long flags; -+ bool unblock = false; -+ -+ spin_lock_irqsave(&card->lock, flags); -+ if (lu->blocked && lu->generation == card->generation) { -+ lu->blocked = false; -+ unblock = --tgt->blocked == 0; -+ } -+ spin_unlock_irqrestore(&card->lock, flags); ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(dev); + -+ if (unblock) { -+ scsi_unblock_requests(shost); -+ fw_notify("unblocked %s\n", lu->tgt->bus_id); ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); ++ } + } +} -+ -+/* -+ * Prevents future blocking of tgt and unblocks it. -+ * Note, it is harmless to run scsi_unblock_requests() outside the -+ * card->lock protected section. On the other hand, running it inside -+ * the section might clash with shost->host_lock. -+ */ -+static void sbp2_unblock(struct sbp2_target *tgt) -+{ -+ struct fw_card *card = fw_device(tgt->unit->device.parent)->card; -+ struct Scsi_Host *shost = -+ container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -+ unsigned long flags; -+ -+ spin_lock_irqsave(&card->lock, flags); -+ ++tgt->dont_block; -+ spin_unlock_irqrestore(&card->lock, flags); -+ -+ scsi_unblock_requests(shost); - } - - static void sbp2_release_target(struct kref *kref) -@@ -621,23 +757,24 @@ static void sbp2_release_target(struct kref *kref) - struct sbp2_logical_unit *lu, *next; - struct Scsi_Host *shost = - container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -- struct fw_device *device = fw_device(tgt->unit->device.parent); -+ -+ /* prevent deadlocks */ -+ sbp2_unblock(tgt); - - list_for_each_entry_safe(lu, next, &tgt->lu_list, link) { -- if (lu->sdev) -+ if (lu->sdev) { - scsi_remove_device(lu->sdev); -- -- if (!fw_device_is_shutdown(device)) -- sbp2_send_management_orb(lu, tgt->node_id, -- lu->generation, SBP2_LOGOUT_REQUEST, -- lu->login_id, NULL); -+ scsi_device_put(lu->sdev); -+ } -+ sbp2_send_management_orb(lu, tgt->node_id, lu->generation, -+ SBP2_LOGOUT_REQUEST, lu->login_id, NULL); ++#else ++#define ohci1394_pmac_on(dev) ++#define ohci1394_pmac_off(dev) + #endif /* CONFIG_PPC_PMAC */ - fw_core_remove_address_handler(&lu->address_handler); - list_del(&lu->link); - kfree(lu); - } - scsi_remove_host(shost); -- fw_notify("released %s\n", tgt->unit->device.bus_id); -+ fw_notify("released %s\n", tgt->bus_id); ++static int __devinit ohci1394_pci_probe(struct pci_dev *dev, ++ const struct pci_device_id *ent) ++{ ++ struct hpsb_host *host; ++ struct ti_ohci *ohci; /* shortcut to currently handled device */ ++ resource_size_t ohci_base; ++ ++ ohci1394_pmac_on(dev); + if (pci_enable_device(dev)) + FAIL(-ENXIO, "Failed to enable OHCI hardware"); + pci_set_master(dev); +@@ -3203,16 +3221,16 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, + #undef FAIL + } - put_device(&tgt->unit->device); - scsi_host_put(shost); -@@ -666,33 +803,43 @@ static void sbp2_login(struct work_struct *work) +-static void ohci1394_pci_remove(struct pci_dev *pdev) ++static void ohci1394_pci_remove(struct pci_dev *dev) { - struct sbp2_logical_unit *lu = - container_of(work, struct sbp2_logical_unit, work.work); -- struct Scsi_Host *shost = -- container_of((void *)lu->tgt, struct Scsi_Host, hostdata[0]); -+ struct sbp2_target *tgt = lu->tgt; -+ struct fw_device *device = fw_device(tgt->unit->device.parent); -+ struct Scsi_Host *shost; - struct scsi_device *sdev; - struct scsi_lun eight_bytes_lun; -- struct fw_unit *unit = lu->tgt->unit; -- struct fw_device *device = fw_device(unit->device.parent); - struct sbp2_login_response response; - int generation, node_id, local_node_id; - -+ if (fw_device_is_shutdown(device)) -+ goto out; -+ - generation = device->generation; - smp_rmb(); /* node_id must not be older than generation */ - node_id = device->node_id; - local_node_id = device->card->node_id; - -+ /* If this is a re-login attempt, log out, or we might be rejected. */ -+ if (lu->sdev) -+ sbp2_send_management_orb(lu, device->node_id, generation, -+ SBP2_LOGOUT_REQUEST, lu->login_id, NULL); -+ - if (sbp2_send_management_orb(lu, node_id, generation, - SBP2_LOGIN_REQUEST, lu->lun, &response) < 0) { -- if (lu->retries++ < 5) -+ if (lu->retries++ < 5) { - sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5)); -- else -- fw_error("failed to login to %s LUN %04x\n", -- unit->device.bus_id, lu->lun); -+ } else { -+ fw_error("%s: failed to login to LUN %04x\n", -+ tgt->bus_id, lu->lun); -+ /* Let any waiting I/O fail from now on. */ -+ sbp2_unblock(lu->tgt); -+ } - goto out; + struct ti_ohci *ohci; +- struct device *dev; ++ struct device *device; + +- ohci = pci_get_drvdata(pdev); ++ ohci = pci_get_drvdata(dev); + if (!ohci) + return; + +- dev = get_device(&ohci->host->device); ++ device = get_device(&ohci->host->device); + + switch (ohci->init_state) { + case OHCI_INIT_DONE: +@@ -3246,7 +3264,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) + /* Soft reset before we start - this disables + * interrupts and clears linkEnable and LPS. */ + ohci_soft_reset(ohci); +- free_irq(ohci->dev->irq, ohci); ++ free_irq(dev->irq, ohci); + + case OHCI_INIT_HAVE_TXRX_BUFFERS__MAYBE: + /* The ohci_soft_reset() stops all DMA contexts, so we +@@ -3257,12 +3275,12 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) + free_dma_trm_ctx(&ohci->at_resp_context); + + case OHCI_INIT_HAVE_SELFID_BUFFER: +- pci_free_consistent(ohci->dev, OHCI1394_SI_DMA_BUF_SIZE, ++ pci_free_consistent(dev, OHCI1394_SI_DMA_BUF_SIZE, + ohci->selfid_buf_cpu, + ohci->selfid_buf_bus); + + case OHCI_INIT_HAVE_CONFIG_ROM_BUFFER: +- pci_free_consistent(ohci->dev, OHCI_CONFIG_ROM_LEN, ++ pci_free_consistent(dev, OHCI_CONFIG_ROM_LEN, + ohci->csr_config_rom_cpu, + ohci->csr_config_rom_bus); + +@@ -3270,35 +3288,24 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) + iounmap(ohci->registers); + + case OHCI_INIT_HAVE_MEM_REGION: +- release_mem_region(pci_resource_start(ohci->dev, 0), ++ release_mem_region(pci_resource_start(dev, 0), + OHCI1394_REGISTER_SIZE); + +-#ifdef CONFIG_PPC_PMAC +- /* On UniNorth, power down the cable and turn off the chip clock +- * to save power on laptops */ +- if (machine_is(powermac)) { +- struct device_node* ofn = pci_device_to_OF_node(ohci->dev); +- +- if (ofn) { +- pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); +- pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); +- } +- } +-#endif /* CONFIG_PPC_PMAC */ ++ ohci1394_pmac_off(dev); + + case OHCI_INIT_ALLOC_HOST: +- pci_set_drvdata(ohci->dev, NULL); ++ pci_set_drvdata(dev, NULL); } -- lu->generation = generation; -- lu->tgt->node_id = node_id; -- lu->tgt->address_high = local_node_id << 16; -+ tgt->node_id = node_id; -+ tgt->address_high = local_node_id << 16; -+ sbp2_set_generation(lu, generation); - - /* Get command block agent offset and login id. */ - lu->command_block_agent_address = -@@ -700,8 +847,8 @@ static void sbp2_login(struct work_struct *work) - response.command_block_agent.low; - lu->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response); - -- fw_notify("logged in to %s LUN %04x (%d retries)\n", -- unit->device.bus_id, lu->lun, lu->retries); -+ fw_notify("%s: logged in to LUN %04x (%d retries)\n", -+ tgt->bus_id, lu->lun, lu->retries); - - #if 0 - /* FIXME: The linux1394 sbp2 does this last step. */ -@@ -711,26 +858,62 @@ static void sbp2_login(struct work_struct *work) - PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect); - sbp2_agent_reset(lu); - -+ /* This was a re-login. */ -+ if (lu->sdev) { -+ sbp2_cancel_orbs(lu); -+ sbp2_conditionally_unblock(lu); -+ goto out; -+ } -+ -+ if (lu->tgt->workarounds & SBP2_WORKAROUND_DELAY_INQUIRY) -+ ssleep(SBP2_INQUIRY_DELAY); -+ - memset(&eight_bytes_lun, 0, sizeof(eight_bytes_lun)); - eight_bytes_lun.scsi_lun[0] = (lu->lun >> 8) & 0xff; - eight_bytes_lun.scsi_lun[1] = lu->lun & 0xff; -+ shost = container_of((void *)tgt, struct Scsi_Host, hostdata[0]); - - sdev = __scsi_add_device(shost, 0, 0, - scsilun_to_int(&eight_bytes_lun), lu); -- if (IS_ERR(sdev)) { -- sbp2_send_management_orb(lu, node_id, generation, -- SBP2_LOGOUT_REQUEST, lu->login_id, NULL); -- /* -- * Set this back to sbp2_login so we fall back and -- * retry login on bus reset. -- */ -- PREPARE_DELAYED_WORK(&lu->work, sbp2_login); -- } else { -- lu->sdev = sdev; -+ /* -+ * FIXME: We are unable to perform reconnects while in sbp2_login(). -+ * Therefore __scsi_add_device() will get into trouble if a bus reset -+ * happens in parallel. It will either fail or leave us with an -+ * unusable sdev. As a workaround we check for this and retry the -+ * whole login and SCSI probing. -+ */ -+ -+ /* Reported error during __scsi_add_device() */ -+ if (IS_ERR(sdev)) -+ goto out_logout_login; -+ -+ /* Unreported error during __scsi_add_device() */ -+ smp_rmb(); /* get current card generation */ -+ if (generation != device->card->generation) { -+ scsi_remove_device(sdev); - scsi_device_put(sdev); -+ goto out_logout_login; - } -+ -+ /* No error during __scsi_add_device() */ -+ lu->sdev = sdev; -+ sbp2_allow_block(lu); -+ goto out; -+ -+ out_logout_login: -+ smp_rmb(); /* generation may have changed */ -+ generation = device->generation; -+ smp_rmb(); /* node_id must not be older than generation */ -+ -+ sbp2_send_management_orb(lu, device->node_id, generation, -+ SBP2_LOGOUT_REQUEST, lu->login_id, NULL); -+ /* -+ * If a bus reset happened, sbp2_update will have requeued -+ * lu->work already. Reset the work from reconnect to login. -+ */ -+ PREPARE_DELAYED_WORK(&lu->work, sbp2_login); - out: -- sbp2_target_put(lu->tgt); -+ sbp2_target_put(tgt); +- if (dev) +- put_device(dev); ++ if (device) ++ put_device(device); } - static int sbp2_add_logical_unit(struct sbp2_target *tgt, int lun_entry) -@@ -755,6 +938,8 @@ static int sbp2_add_logical_unit(struct sbp2_target *tgt, int lun_entry) - lu->sdev = NULL; - lu->lun = lun_entry & 0xffff; - lu->retries = 0; -+ lu->blocked = false; -+ ++tgt->dont_block; - INIT_LIST_HEAD(&lu->orb_list); - INIT_DELAYED_WORK(&lu->work, sbp2_login); - -@@ -813,7 +998,7 @@ static int sbp2_scan_unit_dir(struct sbp2_target *tgt, u32 *directory, - if (timeout > tgt->mgt_orb_timeout) - fw_notify("%s: config rom contains %ds " - "management ORB timeout, limiting " -- "to %ds\n", tgt->unit->device.bus_id, -+ "to %ds\n", tgt->bus_id, - timeout / 1000, - tgt->mgt_orb_timeout / 1000); - break; -@@ -836,12 +1021,12 @@ static void sbp2_init_workarounds(struct sbp2_target *tgt, u32 model, - u32 firmware_revision) - { - int i; -- unsigned w = sbp2_param_workarounds; -+ unsigned int w = sbp2_param_workarounds; - - if (w) - fw_notify("Please notify linux1394-devel at lists.sourceforge.net " - "if you need the workarounds parameter for %s\n", -- tgt->unit->device.bus_id); -+ tgt->bus_id); - - if (w & SBP2_WORKAROUND_OVERRIDE) - goto out; -@@ -863,8 +1048,7 @@ static void sbp2_init_workarounds(struct sbp2_target *tgt, u32 model, - if (w) - fw_notify("Workarounds for %s: 0x%x " - "(firmware_revision 0x%06x, model_id 0x%06x)\n", -- tgt->unit->device.bus_id, -- w, firmware_revision, model); -+ tgt->bus_id, w, firmware_revision, model); - tgt->workarounds = w; - } - -@@ -888,6 +1072,7 @@ static int sbp2_probe(struct device *dev) - tgt->unit = unit; - kref_init(&tgt->kref); - INIT_LIST_HEAD(&tgt->lu_list); -+ tgt->bus_id = unit->device.bus_id; - - if (fw_device_enable_phys_dma(device) < 0) - goto fail_shost_put; -@@ -938,10 +1123,13 @@ static void sbp2_reconnect(struct work_struct *work) + #ifdef CONFIG_PM +-static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state) ++static int ohci1394_pci_suspend(struct pci_dev *dev, pm_message_t state) { - struct sbp2_logical_unit *lu = - container_of(work, struct sbp2_logical_unit, work.work); -- struct fw_unit *unit = lu->tgt->unit; -- struct fw_device *device = fw_device(unit->device.parent); -+ struct sbp2_target *tgt = lu->tgt; -+ struct fw_device *device = fw_device(tgt->unit->device.parent); - int generation, node_id, local_node_id; - -+ if (fw_device_is_shutdown(device)) -+ goto out; -+ - generation = device->generation; - smp_rmb(); /* node_id must not be older than generation */ - node_id = device->node_id; -@@ -950,10 +1138,17 @@ static void sbp2_reconnect(struct work_struct *work) - if (sbp2_send_management_orb(lu, node_id, generation, - SBP2_RECONNECT_REQUEST, - lu->login_id, NULL) < 0) { -- if (lu->retries++ >= 5) { -- fw_error("failed to reconnect to %s\n", -- unit->device.bus_id); -- /* Fall back and try to log in again. */ -+ /* -+ * If reconnect was impossible even though we are in the -+ * current generation, fall back and try to log in again. -+ * -+ * We could check for "Function rejected" status, but -+ * looking at the bus generation as simpler and more general. -+ */ -+ smp_rmb(); /* get current card generation */ -+ if (generation == device->card->generation || -+ lu->retries++ >= 5) { -+ fw_error("%s: failed to reconnect\n", tgt->bus_id); - lu->retries = 0; - PREPARE_DELAYED_WORK(&lu->work, sbp2_login); - } -@@ -961,17 +1156,18 @@ static void sbp2_reconnect(struct work_struct *work) - goto out; + int err; +- struct ti_ohci *ohci = pci_get_drvdata(pdev); ++ struct ti_ohci *ohci = pci_get_drvdata(dev); + + if (!ohci) { + printk(KERN_ERR "%s: tried to suspend nonexisting host\n", +@@ -3326,32 +3333,23 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state) + ohci_devctl(ohci->host, RESET_BUS, LONG_RESET_NO_FORCE_ROOT); + ohci_soft_reset(ohci); + +- err = pci_save_state(pdev); ++ err = pci_save_state(dev); + if (err) { + PRINT(KERN_ERR, "pci_save_state failed with %d", err); + return err; } +- err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); ++ err = pci_set_power_state(dev, pci_choose_state(dev, state)); + if (err) + DBGMSG("pci_set_power_state failed with %d", err); +- +-/* PowerMac suspend code comes last */ +-#ifdef CONFIG_PPC_PMAC +- if (machine_is(powermac)) { +- struct device_node *ofn = pci_device_to_OF_node(pdev); +- +- if (ofn) +- pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); +- } +-#endif /* CONFIG_PPC_PMAC */ ++ ohci1394_pmac_off(dev); -- lu->generation = generation; -- lu->tgt->node_id = node_id; -- lu->tgt->address_high = local_node_id << 16; -+ tgt->node_id = node_id; -+ tgt->address_high = local_node_id << 16; -+ sbp2_set_generation(lu, generation); - -- fw_notify("reconnected to %s LUN %04x (%d retries)\n", -- unit->device.bus_id, lu->lun, lu->retries); -+ fw_notify("%s: reconnected to LUN %04x (%d retries)\n", -+ tgt->bus_id, lu->lun, lu->retries); - - sbp2_agent_reset(lu); - sbp2_cancel_orbs(lu); -+ sbp2_conditionally_unblock(lu); - out: -- sbp2_target_put(lu->tgt); -+ sbp2_target_put(tgt); + return 0; } - static void sbp2_update(struct fw_unit *unit) -@@ -986,6 +1182,7 @@ static void sbp2_update(struct fw_unit *unit) - * Iteration over tgt->lu_list is therefore safe here. - */ - list_for_each_entry(lu, &tgt->lu_list, link) { -+ sbp2_conditionally_block(lu); - lu->retries = 0; - sbp2_queue_work(lu, 0); - } -@@ -1063,7 +1260,7 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status) - - if (status != NULL) { - if (STATUS_GET_DEAD(*status)) -- sbp2_agent_reset(orb->lu); -+ sbp2_agent_reset_no_wait(orb->lu); - - switch (STATUS_GET_RESPONSE(*status)) { - case SBP2_STATUS_REQUEST_COMPLETE: -@@ -1089,6 +1286,7 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status) - * or when sending the write (less likely). - */ - result = DID_BUS_BUSY << 16; -+ sbp2_conditionally_block(orb->lu); - } - - dma_unmap_single(device->card->device, orb->base.request_bus, -@@ -1197,7 +1395,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done) - struct sbp2_logical_unit *lu = cmd->device->hostdata; - struct fw_device *device = fw_device(lu->tgt->unit->device.parent); - struct sbp2_command_orb *orb; -- unsigned max_payload; -+ unsigned int max_payload; - int retval = SCSI_MLQUEUE_HOST_BUSY; - - /* -@@ -1275,6 +1473,10 @@ static int sbp2_scsi_slave_alloc(struct scsi_device *sdev) +-static int ohci1394_pci_resume(struct pci_dev *pdev) ++static int ohci1394_pci_resume(struct pci_dev *dev) { - struct sbp2_logical_unit *lu = sdev->hostdata; - -+ /* (Re-)Adding logical units via the SCSI stack is not supported. */ -+ if (!lu) -+ return -ENOSYS; -+ - sdev->allow_restart = 1; - - /* -@@ -1319,7 +1521,7 @@ static int sbp2_scsi_abort(struct scsi_cmnd *cmd) - { - struct sbp2_logical_unit *lu = cmd->device->hostdata; + int err; +- struct ti_ohci *ohci = pci_get_drvdata(pdev); ++ struct ti_ohci *ohci = pci_get_drvdata(dev); + + if (!ohci) { + printk(KERN_ERR "%s: tried to resume nonexisting host\n", +@@ -3360,19 +3358,10 @@ static int ohci1394_pci_resume(struct pci_dev *pdev) + } + DBGMSG("resume called"); -- fw_notify("sbp2_scsi_abort\n"); -+ fw_notify("%s: sbp2_scsi_abort\n", lu->tgt->bus_id); - sbp2_agent_reset(lu); - sbp2_cancel_orbs(lu); +-/* PowerMac resume code comes first */ +-#ifdef CONFIG_PPC_PMAC +- if (machine_is(powermac)) { +- struct device_node *ofn = pci_device_to_OF_node(pdev); +- +- if (ofn) +- pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); +- } +-#endif /* CONFIG_PPC_PMAC */ +- +- pci_set_power_state(pdev, PCI_D0); +- pci_restore_state(pdev); +- err = pci_enable_device(pdev); ++ ohci1394_pmac_on(dev); ++ pci_set_power_state(dev, PCI_D0); ++ pci_restore_state(dev); ++ err = pci_enable_device(dev); + if (err) { + PRINT(KERN_ERR, "pci_enable_device failed with %d", err); + return err; +diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c +index 37e7e10..3634785 100644 +--- a/drivers/ieee1394/raw1394.c ++++ b/drivers/ieee1394/raw1394.c +@@ -2959,7 +2959,6 @@ MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); + + static struct hpsb_protocol_driver raw1394_driver = { + .name = "raw1394", +- .id_table = raw1394_id_table, + }; + /******************************************************************************/ diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c -index 28e155a..29e6663 100644 +index 9e2b196..29e6663 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c -@@ -183,6 +183,9 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device " - * Avoids access beyond actual disk limits on devices with an off-by-one bug. - * Don't use this with devices which don't have this bug. - * -+ * - delay inquiry -+ * Wait extra SBP2_INQUIRY_DELAY seconds after login before SCSI inquiry. -+ * - * - override internal blacklist - * Instead of adding to the built-in blacklist, use only the workarounds - * specified in the module load parameter. -@@ -195,6 +198,7 @@ MODULE_PARM_DESC(workarounds, "Work around device bugs (default = 0" - ", 36 byte inquiry = " __stringify(SBP2_WORKAROUND_INQUIRY_36) - ", skip mode page 8 = " __stringify(SBP2_WORKAROUND_MODE_SENSE_8) - ", fix capacity = " __stringify(SBP2_WORKAROUND_FIX_CAPACITY) -+ ", delay inquiry = " __stringify(SBP2_WORKAROUND_DELAY_INQUIRY) - ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE) - ", or a combination)"); - -@@ -357,6 +361,11 @@ static const struct { - .workarounds = SBP2_WORKAROUND_INQUIRY_36 | - SBP2_WORKAROUND_MODE_SENSE_8, - }, -+ /* DViCO Momobay FX-3A with TSB42AA9A bridge */ { -+ .firmware_revision = 0x002800, -+ .model_id = 0x000000, -+ .workarounds = SBP2_WORKAROUND_DELAY_INQUIRY, -+ }, - /* Initio bridges, actually only needed for some older ones */ { - .firmware_revision = 0x000200, - .model_id = SBP2_ROM_VALUE_WILDCARD, -@@ -914,6 +923,9 @@ static int sbp2_start_device(struct sbp2_lu *lu) - sbp2_agent_reset(lu, 1); - sbp2_max_speed_and_size(lu); - -+ if (lu->workarounds & SBP2_WORKAROUND_DELAY_INQUIRY) -+ ssleep(SBP2_INQUIRY_DELAY); -+ - error = scsi_add_device(lu->shost, 0, lu->ud->id, 0); - if (error) { - SBP2_ERR("scsi_add_device failed"); -@@ -1962,14 +1974,14 @@ static int sbp2scsi_slave_alloc(struct scsi_device *sdev) - { - struct sbp2_lu *lu = (struct sbp2_lu *)sdev->host->hostdata[0]; - -+ if (sdev->lun != 0 || sdev->id != lu->ud->id || sdev->channel != 0) -+ return -ENODEV; -+ +@@ -1980,11 +1980,8 @@ static int sbp2scsi_slave_alloc(struct scsi_device *sdev) lu->sdev = sdev; sdev->allow_restart = 1; @@ -913,16 +1110,38 @@ if (lu->workarounds & SBP2_WORKAROUND_INQUIRY_36) sdev->inquiry_len = 36; -diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h -index d2ecb0d..80d8e09 100644 ---- a/drivers/ieee1394/sbp2.h -+++ b/drivers/ieee1394/sbp2.h -@@ -343,6 +343,8 @@ enum sbp2lu_state_types { - #define SBP2_WORKAROUND_INQUIRY_36 0x2 - #define SBP2_WORKAROUND_MODE_SENSE_8 0x4 - #define SBP2_WORKAROUND_FIX_CAPACITY 0x8 -+#define SBP2_WORKAROUND_DELAY_INQUIRY 0x10 -+#define SBP2_INQUIRY_DELAY 12 - #define SBP2_WORKAROUND_OVERRIDE 0x100 +diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c +index bd28adf..cc240b2 100644 +--- a/drivers/ieee1394/video1394.c ++++ b/drivers/ieee1394/video1394.c +@@ -1315,8 +1315,7 @@ static struct ieee1394_device_id video1394_id_table[] = { + MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); + + static struct hpsb_protocol_driver video1394_driver = { +- .name = VIDEO1394_DRIVER_NAME, +- .id_table = video1394_id_table, ++ .name = VIDEO1394_DRIVER_NAME, + }; + - #endif /* SBP2_H */ +diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug +index 0796c1a..4e370e1 100644 +--- a/lib/Kconfig.debug ++++ b/lib/Kconfig.debug +@@ -592,6 +592,16 @@ config LATENCYTOP + Enable this option if you want to use the LatencyTOP tool + to find out which userspace is blocking on what kernel operations. + ++config FIREWIRE_OHCI_REMOTE_DMA ++ bool "Remote debugging via firewire-ohci" ++ depends on FIREWIRE_OHCI ++ help ++ This option lets you use the FireWire bus for remote debugging. ++ It enables unfiltered remote DMA in the firewire-ohci driver. ++ See Documentation/debugging-via-ohci1394.txt for more information. ++ ++ If unsure, say N. ++ + config PROVIDE_OHCI1394_DMA_INIT + bool "Provide code for enabling DMA over FireWire early on boot" + depends on PCI && X86 From fedora-extras-commits at redhat.com Mon Mar 3 21:23:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 21:23:59 GMT Subject: rpms/perl-WWW-Search/devel perl-WWW-Search.spec,1.3,1.4 Message-ID: <200803032123.m23LNxVe020273@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-WWW-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20150 Modified Files: perl-WWW-Search.spec Log Message: new perl Index: perl-WWW-Search.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-WWW-Search/devel/perl-WWW-Search.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-WWW-Search.spec 16 Feb 2008 13:28:34 -0000 1.3 +++ perl-WWW-Search.spec 3 Mar 2008 21:23:16 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-WWW-Search Version: 2.497 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual base class for WWW searches @@ -77,6 +77,9 @@ %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 2.497-2 +- rebuild for new perl (again) + * Fri Feb 15 2008 Xavier Bachelot - 2.497-1 - New upstream version. From fedora-extras-commits at redhat.com Mon Mar 3 21:40:37 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 3 Mar 2008 21:40:37 GMT Subject: rpms/rpmlint/devel rpmlint.config,1.18,1.19 rpmlint.spec,1.42,1.43 Message-ID: <200803032140.m23LebEe022706@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/rpmlint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22507 Modified Files: rpmlint.config rpmlint.spec Log Message: * Mon Mar 3 2008 Ville Skytt?? - 0.82-3 - Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690). Index: rpmlint.config =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- rpmlint.config 6 Dec 2007 12:44:51 -0000 1.18 +++ rpmlint.config 3 Mar 2008 21:39:58 -0000 1.19 @@ -28,7 +28,7 @@ setOption("ValidLicenses", ( # These are the short names for all of the Fedora approved licenses. # The master list is kept here: http://fedoraproject.org/wiki/Licensing - # Last synced with Revision 0.61 (Wiki revision 98) of that page. + # Last synced with Revision 0.69 (Wiki revision 110) of that page. 'Adobe', 'AFL', 'AGPLv1', @@ -86,11 +86,15 @@ 'ISC', 'Jabber', 'JasPer', + 'LBNL BSD', 'LGPLv2', 'LGPLv2 with exceptions', 'LGPLv2+', + 'LGPLv2+ with exceptions', 'LGPLv3', + 'LGPLv3 with exceptions', 'LGPLv3+', + 'LGPLv3+ with exceptions', 'libtiff', 'LPL', 'LPPL', Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- rpmlint.spec 6 Dec 2007 12:44:51 -0000 1.42 +++ rpmlint.spec 3 Mar 2008 21:39:58 -0000 1.43 @@ -1,6 +1,6 @@ Name: rpmlint Version: 0.82 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -70,6 +70,9 @@ %changelog +* Mon Mar 3 2008 Ville Skytt?? - 0.82-3 +- Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690). + * Thu Dec 6 2007 Ville Skytt?? - 0.82-2 - Remove leftover "Affero GPL" from last license list sync (Todd Zullinger). From fedora-extras-commits at redhat.com Mon Mar 3 21:43:47 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 3 Mar 2008 21:43:47 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.49, 1.50 sources, 1.61, 1.62 system-config-services.spec, 1.60, 1.61 Message-ID: <200803032143.m23Lhlhn023634@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23406 Modified Files: .cvsignore sources system-config-services.spec Log Message: use gettext directly instead of rhpl add popup menu for enabling SysV services in specific runlevels display help enable custom runlevels via customization dialog Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 29 Feb 2008 13:03:42 -0000 1.49 +++ .cvsignore 3 Mar 2008 21:43:10 -0000 1.50 @@ -1 +1 @@ -system-config-services-0.99.3.tar.bz2 +system-config-services-0.99.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 29 Feb 2008 13:03:42 -0000 1.61 +++ sources 3 Mar 2008 21:43:10 -0000 1.62 @@ -1 +1 @@ -6d4ca0007d56d72317795a07d12ca92f system-config-services-0.99.3.tar.bz2 +2b3160b6fb1205122a010f000ccd7df3 system-config-services-0.99.4.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- system-config-services.spec 29 Feb 2008 13:03:42 -0000 1.60 +++ system-config-services.spec 3 Mar 2008 21:43:10 -0000 1.61 @@ -16,7 +16,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.3 +Version: 0.99.4 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -45,7 +45,6 @@ Requires: pygtk2 Requires: pygtk2-libglade Requires: python >= 2.3.0 -Requires: rhpl %if %{with console_util} Requires: usermode >= 1.94 %else @@ -108,6 +107,12 @@ %{_mandir}/*/system-config-services.8* %changelog +* Mon Mar 03 2008 Nils Philippsen - 0.99.4-1 +- use gettext directly instead of rhpl +- add popup menu for enabling SysV services in specific runlevels +- display help +- enable custom runlevels via customization dialog + * Fri Feb 29 2008 Nils Philippsen - 0.99.3-1 - add gamin-python requirement (#435068) - monitor /proc/ for services with known pidfile(s) From fedora-extras-commits at redhat.com Mon Mar 3 21:49:54 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Mon, 3 Mar 2008 21:49:54 GMT Subject: rpms/cryptsetup-luks/devel cryptsetup-1.0.6-pre2-key_slot_num_fix.patch, NONE, 1.1 cryptsetup-1.0.6-pre2-luksRemoveKey.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 cryptsetup-luks.spec, 1.54, 1.55 sources, 1.9, 1.10 cryptsetup-1.0.5-luksInit_header.patch, 1.1, NONE cryptsetup-1.0.5-readonly_detection.patch, 1.1, NONE cryptsetup-luks-1.0.1-proto.patch, 1.1, NONE Message-ID: <200803032149.m23LnsSQ024580@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/cryptsetup-luks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24449 Modified Files: .cvsignore cryptsetup-luks.spec sources Added Files: cryptsetup-1.0.6-pre2-key_slot_num_fix.patch cryptsetup-1.0.6-pre2-luksRemoveKey.patch Removed Files: cryptsetup-1.0.5-luksInit_header.patch cryptsetup-1.0.5-readonly_detection.patch cryptsetup-luks-1.0.1-proto.patch Log Message: * Mon Mar 03 2008 Till Maas - 1.0.6-0.1.pre2 - Update to new version with several bugfixes - remove patches that have been merged upstream - add patch from cryptsetup newsgroup - fix typo / missing luksRemoveKey in manpage (patch) cryptsetup-1.0.6-pre2-key_slot_num_fix.patch: --- NEW FILE cryptsetup-1.0.6-pre2-key_slot_num_fix.patch --- >From message <20080302124900.3f4fe49f at v3405.naf.net.ru> on the dm-crypt mailing gmane newsgroup by Nikolay A. Fetisov Fix wrong usage of 'i' as a key slot number diff -up cryptsetup-1.0.6-pre2/lib/setup.c.key_slot_num_fix cryptsetup-1.0.6-pre2/lib/setup.c --- cryptsetup-1.0.6-pre2/lib/setup.c.key_slot_num_fix 2008-03-01 14:37:41.000000000 +0100 +++ cryptsetup-1.0.6-pre2/lib/setup.c 2008-03-03 20:47:41.000000000 +0100 @@ -583,7 +583,7 @@ static int __crypt_luks_add_key(int arg, options->icb->log(CRYPT_LOG_ERROR,"No key available with this passphrase.\n"); r = -EPERM; goto out; } else - logger(options, CRYPT_LOG_NORMAL,"key slot %d unlocked.\n",i); + logger(options, CRYPT_LOG_NORMAL,"key slot %d unlocked.\n",r); safe_free(password); cryptsetup-1.0.6-pre2-luksRemoveKey.patch: --- NEW FILE cryptsetup-1.0.6-pre2-luksRemoveKey.patch --- Author: Till Maas - Fix typo in luksRemoveKey help message "]" -> ">" - show some info about luksRemoveKey in the manpage (maye with explanation needs to be added) diff -up cryptsetup-1.0.6-pre2/src/cryptsetup.c.luksRemoveKey cryptsetup-1.0.6-pre2/src/cryptsetup.c --- cryptsetup-1.0.6-pre2/src/cryptsetup.c.luksRemoveKey 2008-03-01 17:10:40.000000000 +0100 +++ cryptsetup-1.0.6-pre2/src/cryptsetup.c 2008-03-03 21:21:49.000000000 +0100 @@ -64,7 +64,7 @@ static struct action_type { { "luksFormat", action_luksFormat, 0, 1, N_(" []"), N_("formats a LUKS device") }, { "luksOpen", action_luksOpen, 0, 2, N_(" "), N_("open LUKS device as mapping ") }, { "luksAddKey", action_luksAddKey, 0, 1, N_(" []"), N_("add key to LUKS device") }, - { "luksRemoveKey", action_luksRemoveKey, 0, 1, N_(" [ []"), N_("removes supplied key or key file from LUKS device") }, { "luksKillSlot", action_luksKillSlot, 0, 2, N_(" "), N_("wipes key with number from LUKS device") }, { "luksUUID", action_luksUUID, 0, 1, N_(""), N_("print UUID of LUKS device") }, { "isLuks", action_isLuks, 0, 1, N_(""), N_("tests for LUKS partition header") }, diff -up cryptsetup-1.0.6-pre2/man/cryptsetup.8.luksRemoveKey cryptsetup-1.0.6-pre2/man/cryptsetup.8 --- cryptsetup-1.0.6-pre2/man/cryptsetup.8.luksRemoveKey 2008-03-01 10:17:23.000000000 +0100 +++ cryptsetup-1.0.6-pre2/man/cryptsetup.8 2008-03-03 21:21:14.000000000 +0100 @@ -54,6 +54,10 @@ identical to \fIremove\fR. .IP add a new key file/passphrase. An existing passphrase or key file (via \-\-key-file) must be supplied. The key file with the new material is supplied as a positional argument. can be [\-\-key-file, \-\-key-slot]. .PP +\fIluksRemoveKey\fR [] +.IP +remove supplied key or key file from LUKS device +.PP \fIluksKillSlot\fR .IP wipe key with number from LUKS device. A remaining passphrase or key file (via \-\-key-file) must be supplied. can be [\-\-key-file]. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 13 Jun 2007 21:43:10 -0000 1.9 +++ .cvsignore 3 Mar 2008 21:49:17 -0000 1.10 @@ -1 +1 @@ -cryptsetup-1.0.5.tar.bz2 +cryptsetup-1.0.6-pre2.tar.bz2 Index: cryptsetup-luks.spec =================================================================== RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- cryptsetup-luks.spec 19 Feb 2008 19:40:13 -0000 1.54 +++ cryptsetup-luks.spec 3 Mar 2008 21:49:17 -0000 1.55 @@ -1,14 +1,15 @@ +%define devrelease pre2 + Summary: A utility for setting up encrypted filesystems Name: cryptsetup-luks -Version: 1.0.5 -Release: 9%{?dist} +Version: 1.0.6 +Release: 0.1%{?devrelease:.%{devrelease}}%{?dist} License: GPLv2 Group: Applications/System URL: http://luks.endorphin.org/ -Source: http://luks.endorphin.org/source/cryptsetup-%{version}.tar.bz2 -Patch: cryptsetup-luks-1.0.1-proto.patch -Patch1: cryptsetup-1.0.5-readonly_detection.patch -Patch3: cryptsetup-1.0.5-luksInit_header.patch +Source: http://luks.endorphin.org/source/cryptsetup-%{version}%{?devrelease:-%{devrelease}}.tar.bz2 +Patch1: cryptsetup-1.0.6-pre2-key_slot_num_fix.patch +Patch2: cryptsetup-1.0.6-pre2-luksRemoveKey.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel BuildRequires: libgpg-error-devel, e2fsprogs-devel, libsepol-devel @@ -17,31 +18,37 @@ Provides: cryptsetup = %{version}-%{release} Obsoletes: cryptsetup <= 0.1 + %description This package contains cryptsetup, a utility for setting up encrypted filesystems using Device Mapper and the dm-crypt target. + %package devel Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, e2fsprogs-devel Summary: Headers and libraries for using encrypted filesystems + %description devel The cryptsetup-luks-devel package contain libraries and header files used for writing code that makes use of encrypted filesystems. %prep -%setup -q -n cryptsetup-%{version} -%patch -p1 -%patch3 -p1 +%setup -q -n cryptsetup-%{version}%{?devrelease:-%{devrelease}} +%patch1 -p1 -b .key_slot_num_fix +%patch2 -p1 -b .luksRemoveKey + recode latin1..utf-8 ChangeLog + %build %configure --sbindir=/sbin --libdir=/%{_lib} make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -75,7 +82,14 @@ %clean rm -rf $RPM_BUILD_ROOT + %changelog +* Mon Mar 03 2008 Till Maas - 1.0.6-0.1.pre2 +- Update to new version with several bugfixes +- remove patches that have been merged upstream +- add patch from cryptsetup newsgroup +- fix typo / missing luksRemoveKey in manpage (patch) + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.5-9 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 13 Jun 2007 21:43:10 -0000 1.9 +++ sources 3 Mar 2008 21:49:17 -0000 1.10 @@ -1 +1 @@ -0aa2f94c39123f1a0352983e5366179c cryptsetup-1.0.5.tar.bz2 +1ce62e5a6c3117ac4826e12abef3e2dd cryptsetup-1.0.6-pre2.tar.bz2 --- cryptsetup-1.0.5-luksInit_header.patch DELETED --- --- cryptsetup-1.0.5-readonly_detection.patch DELETED --- --- cryptsetup-luks-1.0.1-proto.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 21:50:38 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Mon, 3 Mar 2008 21:50:38 GMT Subject: rpms/ocaml-ocamlnet/devel ocaml-ocamlnet.spec,1.3,1.4 Message-ID: <200803032150.m23Locvo024704@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-ocamlnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24585 Modified Files: ocaml-ocamlnet.spec Log Message: * Mon Mar 3 2008 Richard W.M. Jones - 2.2.9-4 - Do not strip binaries (bz 435559). Index: ocaml-ocamlnet.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ocaml-ocamlnet.spec 1 Mar 2008 10:13:06 -0000 1.3 +++ ocaml-ocamlnet.spec 3 Mar 2008 21:50:00 -0000 1.4 @@ -3,7 +3,7 @@ Name: ocaml-ocamlnet Version: 2.2.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network protocols for OCaml Group: Development/Libraries @@ -152,9 +152,10 @@ # be deleted safely. This avoids an rpmlint warning. rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/rpc-generator/dummy.mli -# Strip libraries and binaries. +# Strip libraries. strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so -strip $RPM_BUILD_ROOT%{_bindir}/* +# NB. Do NOT strip the binaries. +# (https://bugzilla.redhat.com/show_bug.cgi?id=435559) %clean @@ -232,6 +233,9 @@ %changelog +* Mon Mar 3 2008 Richard W.M. Jones - 2.2.9-4 +- Do not strip binaries (bz 435559). + * Sat Mar 1 2008 Richard W.M. Jones - 2.2.9-3 - Rebuild for ppc64. From fedora-extras-commits at redhat.com Mon Mar 3 22:03:29 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Mon, 3 Mar 2008 22:03:29 GMT Subject: rpms/kernel/devel kernel.spec, 1.470, 1.471 linux-2.6-wireless-pending.patch, 1.31, 1.32 Message-ID: <200803032203.m23M3TGt001216@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1010 Modified Files: kernel.spec linux-2.6-wireless-pending.patch Log Message: latest round of wireless updates Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.470 retrieving revision 1.471 diff -u -r1.470 -r1.471 --- kernel.spec 3 Mar 2008 21:12:45 -0000 1.470 +++ kernel.spec 3 Mar 2008 22:02:24 -0000 1.471 @@ -1744,6 +1744,25 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Mon Mar 03 2008 John W. Linville +- ssb: Add CHIPCO IRQ access functions +- p54: print unknown eeprom fields +- rt2x00: Check for 5GHz band in link tuner +- rt2x00: Release rt2x00 2.1.3 +- mac80211: rework TX filtered frame code +- mac80211: atomically check whether STA exists already +- mac80211: Disallow concurrent IBSS/STA mode interfaces +- mac80211: fix debugfs_sta print_mac() warning +- mac80211: fix IBSS code +- adm8211: fix cfg80211 band API conversion +- mac80211: clarify use of TX status/RX callbacks +- mac80211: safely free beacon in ieee80211_if_reinit +- mac80211: remove STA infos last_ack stuff +- mac80211: split ieee80211_key_alloc/free +- mac80211: fix key replacing, hw accel +- b43legacy: Fix nondebug build +- ath5k: fix all endian issues reported by sparse + * Mon Mar 03 2008 Jarod Wilson - Rebase firewire to latest linux1394-2.6.git tree - firewire-sbp2: permit drives to suspend (#243210) linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.31 -r 1.32 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- linux-2.6-wireless-pending.patch 21 Feb 2008 19:33:48 -0000 1.31 +++ linux-2.6-wireless-pending.patch 3 Mar 2008 22:02:24 -0000 1.32 @@ -1,3 +1,260 @@ +commit e4861829072c61883114c64a3af61f305a789ff0 +Author: Johannes Berg +Date: Wed Feb 27 13:39:00 2008 +0100 + + mac80211: fix key replacing, hw accel + + Even though I thought about it a lot and had also tested it, some + of my recent changes in the key code broke replacing keys, making + the kernel oops because a key is removed from a list while not on + it. + + This patch fixes that using the list as an indication whether or + not the key is on it (an empty list means it's not on any list.) + + Also, this patch fixes hw accel enabling, the check for not doing + hw accel when the interface is down was lost and is restored by + this. + + Additionally, move adding the key to the list into the function + __ieee80211_key_replace() for more consistency. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit db4d1169d0b893bfb7923b6526748fe2c5a7373f +Author: Johannes Berg +Date: Mon Feb 25 16:27:45 2008 +0100 + + mac80211: split ieee80211_key_alloc/free + + In order to RCU-ify sta_info, we need to be able to allocate + a key without linking it to an sdata/sta structure (because + allocation cannot be done in an rcu critical section). This + patch splits up ieee80211_key_alloc() and updates all users + appropriately. + + While at it, this patch fixes a number of race conditions + such as finally making key replacement atomic, unfortunately + at the expense of more complex code. + + Note that this patch documents /existing/ bugs with sta info + and key interaction, there is currently a race condition + when a sta info is freed without holding the RTNL. This will + finally be fixed by a followup patch. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 6f48422a29714ed92f6136d9e7d3ff39c75607d7 +Author: Johannes Berg +Date: Mon Feb 25 16:27:44 2008 +0100 + + mac80211: remove STA infos last_ack stuff + + These things aren't used and the only possible use is within + rate control algorithms, however those can, if they need it, + keep track of it in their private data. last_ack_ms isn't + even updated so completely useless. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit e6a5ddf20886206caf1c4a2431f6ff01198ab0f7 +Author: Johannes Berg +Date: Mon Feb 25 16:27:42 2008 +0100 + + mac80211: safely free beacon in ieee80211_if_reinit + + If ieee80211_if_reinit() is called from ieee80211_unregister_hw() + then it is possible that the driver will still request a beacon + (it is allowed to until ieee80211_unregister_hw() has returned.) + This means we need to use an RCU-protected write to the beacon + information even in this function. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 2485f7105f20f85c2dbebc67be6b2cb97175fa7e +Author: Johannes Berg +Date: Mon Feb 25 16:27:41 2008 +0100 + + mac80211: clarify use of TX status/RX callbacks + + This patch clarifies the use of the irqsafe vs. non-irq-safe + functions and their respective locking requirements. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 38c07b430b50172b803fe4c7f76cba580ba9931f +Author: Pavel Roskin +Date: Tue Feb 26 17:59:14 2008 -0500 + + ath5k: fix all endian issues reported by sparse + + Changes-licensed-under: ISC + Signed-off-by: Pavel Roskin + Acked-by: Luis R. Rodriguez + Acked-by: Nick Kossifidis + Signed-off-by: John W. Linville + +commit e6084239d39a10bac1186611fe7c523cea92c9ec +Author: Ivo van Doorn +Date: Mon Feb 25 23:22:13 2008 +0100 + + rt2x00: Release rt2x00 2.1.3 + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 1497074ad79009f8fb465d795f9e0d2a428b7fa2 +Author: Ivo van Doorn +Date: Mon Feb 25 23:20:33 2008 +0100 + + rt2x00: Check for 5GHz band in link tuner + + Fix a typo in the link tuner where accidently the + 2GHz band was checked instead of the 5GHz band. + This forced the link tuner to work in an invalid + range for the currently active band. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 58e307398317ab55470547a7d72859c89edd187d +Author: Florian Fainelli +Date: Mon Feb 25 17:51:53 2008 +0100 + + p54: print unknown eeprom fields + + This patch allows p54common to print the + uknown EEPROM fields, which can help + when debugging/testing devices. + + Signed-off-by: Florian Fainelli + Signed-off-by: John W. Linville + +commit 9a89c839f79395426b84cf6da9d56773402b4c0e +Author: Johannes Berg +Date: Mon Feb 25 11:12:18 2008 +0100 + + adm8211: fix cfg80211 band API conversion + + Insert a missing band assignment. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 8f300ae5b819f7655197925cdb1954edfd906a87 +Author: Michael Buesch +Date: Sun Feb 24 14:42:29 2008 +0100 + + b43legacy: Fix nondebug build + + Fix a typo. + + Signed-off-by: Michael Buesch + Acked-by: Stefano Brivio + Signed-off-by: John W. Linville + +commit 28de57d1a9eb7e67badb731297197fcbef0cc19e +Author: Aurelien Jarno +Date: Fri Feb 22 16:14:58 2008 +0100 + + ssb: Add CHIPCO IRQ access functions + + This patch adds functions to setup and read the CHIPCO IRQ. + + Signed-off-by: Aurelien Jarno + Signed-off-by: Michael Buesch + Signed-off-by: John W. Linville + +commit fba4a1e63723b5ef16c21a90f06520ae37c5da98 +Author: Johannes Berg +Date: Thu Feb 21 11:08:33 2008 +0100 + + mac80211: fix IBSS code + + This patch fixes two errors introduced by + + commit 19d35612f3cd7f60dd9174c0100584e21f5a1025 + Author: Bruno Randolf + Date: Mon Feb 18 11:21:36 2008 +0900 + + mac80211: enable IBSS merging + + The first error is an endianness problem that sparse found and + the second is a build failure when CONFIG_MAC80211_IBSS_DEBUG + is not set. + + Signed-off-by: Johannes Berg [...5109 lines suppressed...] * its 14 bytes. Note we use the control rate and not the -@@ -533,7 +532,7 @@ static inline void ath5k_hw_write_rate_d + * actual rate for this rate. See mac80211 tx.c * ieee80211_duration() for a brief description of * what rate we should choose to TX ACKs. */ - tx_time = ieee80211_generic_frame_duration(sc->hw, +- tx_time = ieee80211_generic_frame_duration(sc->hw, - sc->vif, 10, control_rate->rate_kbps/100); -+ sc->vif, 10, &srate); ++ tx_time = le16_to_cpu(ieee80211_generic_frame_duration(sc->hw, ++ sc->vif, 10, &srate)); ath5k_hw_reg_write(ah, tx_time, reg); @@ -32056,8 +33415,8 @@ /****************\ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-03-03 16:42:46.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c 2008-03-03 16:46:20.000000000 -0500 @@ -1317,8 +1317,10 @@ int ath5k_hw_write_initvals(struct ath5k /* For AR5211 */ } else if (ah->ah_version == AR5K_AR5211) { @@ -32072,8 +33431,8 @@ } diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-02-21 08:21:48.545426467 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig 2008-02-21 14:02:20.000000000 -0500 +--- /dev/null 2008-03-03 08:19:02.806638585 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig 2008-03-03 16:46:20.000000000 -0500 @@ -0,0 +1,37 @@ +config ATH5K + tristate "Atheros 5xxx wireless cards support" @@ -32113,8 +33472,8 @@ + modprobe ath5k debug=0x00000400 + diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-03-03 16:42:46.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c 2008-03-03 16:47:32.000000000 -0500 @@ -80,7 +80,7 @@ MODULE_AUTHOR("Nick Kossifidis"); MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards."); MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards"); @@ -32641,6 +34000,30 @@ if (ret) goto err_unmap; +@@ -1660,11 +1717,11 @@ ath5k_check_ibss_hw_merge(struct ath5k_s + u32 hw_tu; + struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data; + +- if ((mgmt->frame_control & IEEE80211_FCTL_FTYPE) == ++ if ((le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_FTYPE) == + IEEE80211_FTYPE_MGMT && +- (mgmt->frame_control & IEEE80211_FCTL_STYPE) == ++ (le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE) == + IEEE80211_STYPE_BEACON && +- mgmt->u.beacon.capab_info & WLAN_CAPABILITY_IBSS && ++ le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS && + memcmp(mgmt->bssid, sc->ah->ah_bssid, ETH_ALEN) == 0) { + /* + * Received an IBSS beacon with the same BSSID. Hardware might +@@ -1673,7 +1730,7 @@ ath5k_check_ibss_hw_merge(struct ath5k_s + hw_tu = TSF_TO_TU(ath5k_hw_get_tsf64(sc->ah)); + if (hw_tu >= sc->nexttbtt) { + ath5k_beacon_update_timers(sc, +- mgmt->u.beacon.timestamp); ++ le64_to_cpu(mgmt->u.beacon.timestamp)); + ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, + "detected HW merge from received beacon\n"); + } @@ -1791,9 +1848,8 @@ accept: rxs.mactime = ath5k_extend_tsf(sc->ah, ds->ds_rxstat.rs_tstamp); rxs.flag |= RX_FLAG_TSFT; @@ -32760,8 +34143,8 @@ case ALG_CCMP: return -EOPNOTSUPP; diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-03-03 16:42:46.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c 2008-03-03 16:46:20.000000000 -0500 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -32851,8 +34234,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-03-03 16:42:46.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h 2008-03-03 16:46:20.000000000 -0500 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -32898,8 +34281,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-03-03 16:42:47.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-03-03 16:46:20.000000000 -0500 @@ -78,8 +78,9 @@ static void max2820_rf_set_channel(struc struct ieee80211_conf *conf) { @@ -32913,8 +34296,8 @@ /* While philips SA2400 drive the PA bias from diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-03-03 16:42:46.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-03-03 16:47:32.000000000 -0500 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -33066,25 +34449,26 @@ dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */ priv->retry_limit = 3; -@@ -1917,14 +1930,7 @@ static int __devinit adm8211_probe(struc +@@ -1917,14 +1930,9 @@ static int __devinit adm8211_probe(struc goto err_free_desc; } - priv->channel = priv->modes[0].channels[0].chan; -- ++ priv->channel = 1; + - err = ieee80211_register_hwmode(dev, &priv->modes[0]); - if (err) { - printk(KERN_ERR "%s (adm8211): Can't register hwmode\n", - pci_name(pdev)); - goto err_free_desc; - } -+ priv->channel = 1; ++ dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band; err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c ---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-02-21 13:44:10.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-03 16:42:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-03 16:46:20.000000000 -0500 @@ -172,6 +172,22 @@ static int select_core_and_segment(struc return 0; } @@ -33141,8 +34525,8 @@ .write32 = ssb_pcmcia_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c ---- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-02-21 14:00:25.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-03 16:42:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-03 16:46:20.000000000 -0500 @@ -505,6 +505,14 @@ error: return err; } @@ -33185,8 +34569,8 @@ .write32 = ssb_ssb_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c ---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-02-21 13:44:10.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-03 16:42:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-03 16:46:20.000000000 -0500 @@ -572,6 +572,19 @@ static inline int ssb_pci_assert_buspowe } #endif /* DEBUG */ @@ -33238,3 +34622,23 @@ .write16 = ssb_pci_write16, .write32 = ssb_pci_write32, }; +diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c +--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-03 16:42:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-03 16:47:32.000000000 -0500 +@@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc + chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks); + } + ++void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value) ++{ ++ chipco_write32_masked(cc, SSB_CHIPCO_IRQMASK, mask, value); ++} ++ ++u32 ssb_chipco_irq_status(struct ssb_chipcommon *cc, u32 mask) ++{ ++ return chipco_read32(cc, SSB_CHIPCO_IRQSTAT) & mask; ++} ++ + u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask) + { + return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask; From fedora-extras-commits at redhat.com Mon Mar 3 22:03:59 2008 From: fedora-extras-commits at redhat.com (Alexandru Ciobanu (ics)) Date: Mon, 3 Mar 2008 22:03:59 GMT Subject: rpms/gimp-lqr-plugin/devel gimp-lqr-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803032203.m23M3xA3001282@cvs-int.fedora.redhat.com> Author: ics Update of /cvs/pkgs/rpms/gimp-lqr-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1146/devel Modified Files: .cvsignore sources Added Files: gimp-lqr-plugin.spec Log Message: initial import --- NEW FILE gimp-lqr-plugin.spec --- %define codeversion 0.4.0 %define tarversion 4 Name: gimp-lqr-plugin Version: %{codeversion}.%{tarversion} Release: 2%{?dist} Summary: Content-aware resizing plug-in for the GIMP Group: Applications/Multimedia License: GPLv2+ URL: http://liquidrescale.wikidot.com/ Source0: http://liquidrescale.wikidot.com/local--files/en:download-page/%{name}-%{codeversion}-%{tarversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) BuildRequires: gimp-devel >= 2.4 perl(XML::Parser), gettext, liblqr-1-devel >= 0.1.0 Requires: gimp >= 2.4 %description This package is a plug-in for the GIMP 2.4. It implements the algorithm described in the paper "Seam Carving for Content-Aware Image Resizing" by Shai Avidan and Ariel Shamir, which can be found at http://www.faculty.idc.ac.il/arik/imret.pdf %prep %setup -q -n gimp-lqr-plugin-%{codeversion} %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang gimp20-lqr-plugin %clean rm -rf $RPM_BUILD_ROOT %files -f gimp20-lqr-plugin.lang %defattr(-,root,root,-) %doc README ChangeLog TODO COPYING AUTHORS NEWS %{_libdir}/gimp/2.0/plug-ins/gimp-lqr-plugin %{_datadir}/gimp-lqr-plugin/ %changelog * Sun Mar 02 2008 Alexandru Ciobanu - 0.4.0.4-2 - Fixed typos, buildrequires and requires. * Wed Feb 20 2008 Alexandru Ciobanu - 0.4.0.4-1 - Remove hyphen from versioning. * Tue Feb 19 2008 Alexandru Ciobanu - 0.4.0-3 - Fixed licensing issue. * Mon Feb 4 2008 Alexandru Ciobanu - 0.4.0-2 - Removed CFLAGS. - Fixed ownership issues. * Thu Jan 17 2008 Alexandru Ciobanu - 0.4.0-1 - Update to 0.4.0-3. - Added liblqr dependency. * Mon Dec 10 2007 Alexandru Ciobanu - 0.4.0-0 - Update to 0.4.0. * Wed Nov 22 2007 Alexandru Ciobanu - 0.3.0-1 - Updated languages. - Removed DEBUG flag. http://liquidrescale.wikidot.com/forum/t-23531/bugfix - Cleaned .spec file to meet Fedora Guidelines. * Fri Oct 12 2007 Alexandru Ciobanu - 0.3.0-0 - Update to latest upstream release. * Fri Oct 5 2007 Alexandru Ciobanu - 0.2.1-4 - Added more translation: Romanian, Spanish Spanish, Serbian. * Wed Oct 3 2007 Alexandru Ciobanu - 0.2.1-3 - Added Basque, Chinese, Argentinian Spanish, Hungarian translations. * Tue Oct 2 2007 Alexandru Ciobanu - 0.2.1-2 - Added German translation. * Tue Oct 2 2007 Alexandru Ciobanu - 0.2.1-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2008 20:01:55 -0000 1.1 +++ .cvsignore 3 Mar 2008 22:03:24 -0000 1.2 @@ -0,0 +1 @@ +gimp-lqr-plugin-0.4.0-4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2008 20:01:55 -0000 1.1 +++ sources 3 Mar 2008 22:03:24 -0000 1.2 @@ -0,0 +1 @@ +1d34e517cdbf8b2f358e0febea0467f5 gimp-lqr-plugin-0.4.0-4.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 22:06:19 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Mon, 3 Mar 2008 22:06:19 GMT Subject: rpms/kernel/F-8 linux-2.6-x86-dont-use-p6-nops.patch, NONE, 1.1 kernel.spec, 1.359, 1.360 Message-ID: <200803032206.m23M6JQv001649@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1529 Modified Files: kernel.spec Added Files: linux-2.6-x86-dont-use-p6-nops.patch Log Message: * Mon Mar 03 2008 Chuck Ebbert 2.6.24.3-14 - Allow i686 kernel to boot on Via C3/C7 processors (#435609) linux-2.6-x86-dont-use-p6-nops.patch: --- NEW FILE linux-2.6-x86-dont-use-p6-nops.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=959b3be64cab9160cd74532a49b89cdd918d38e9 Commit: 959b3be64cab9160cd74532a49b89cdd918d38e9 Parent: 7343b3b3a627eb30e24e921f004f659c8ebb91c5 Author: H. Peter Anvin AuthorDate: Thu Feb 14 14:56:45 2008 -0800 Committer: Ingo Molnar CommitDate: Tue Feb 26 12:55:51 2008 +0100 x86: don't use P6_NOPs if compiling with CONFIG_X86_GENERIC P6_NOPs are definitely not supported on some VIA CPUs, and possibly (unverified) on AMD K7s. It is also the only thing that prevents a 686 kernel from running on Transmeta TM3x00/5x00 (Crusoe) series. The performance benefit over generic NOPs is very small, so when building for generic consumption, avoid using them. Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner [cebbert at redhat.com: backport] --- include/asm-x86/processor_32.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- linux-2.6.24.noarch.orig/include/asm-x86/processor_32.h +++ linux-2.6.24.noarch/include/asm-x86/processor_32.h @@ -714,7 +714,8 @@ static inline unsigned int cpuid_edx(uns #define ASM_NOP8 K7_NOP8 #elif defined(CONFIG_M686) || defined(CONFIG_MPENTIUMII) || \ defined(CONFIG_MPENTIUMIII) || defined(CONFIG_MPENTIUMM) || \ - defined(CONFIG_MCORE2) || defined(CONFIG_PENTIUM4) + defined(CONFIG_MCORE2) || defined(CONFIG_PENTIUM4) && \ + !defined(CONFIG_X86_GENERIC) #define ASM_NOP1 P6_NOP1 #define ASM_NOP2 P6_NOP2 #define ASM_NOP3 P6_NOP3 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.359 retrieving revision 1.360 diff -u -r1.359 -r1.360 --- kernel.spec 28 Feb 2008 03:18:34 -0000 1.359 +++ kernel.spec 3 Mar 2008 22:05:39 -0000 1.360 @@ -587,6 +587,7 @@ # Patch61: linux-2.6-x86-setup-add-near-jump.patch Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch Patch75: linux-2.6-x86-debug-boot.patch +Patch76: linux-2.6-x86-dont-use-p6-nops.patch Patch86: linux-2.6-alsa-support-sis7019.patch Patch87: linux-2.6-alsa-hda-stac-dmic.patch @@ -1057,14 +1058,12 @@ # x86(-64) # Compile 686 kernels tuned for Pentium4. ApplyPatch linux-2.6-x86-tune-generic.patch -# x86: fix boot on 486 -# ApplyPatch linux-2.6-x86-setup-add-near-jump.patch # Suppress APIC errors on UP x86-64. #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch -# fix x86 tsc clock calibration # debug early boot #ApplyPatch linux-2.6-x86-debug-boot.patch -# shorter i386 oops reports (scheduled for 2.6.24) +# allow i686 kernel to boot on non-mainstream processors +ApplyPatch linux-2.6-x86-dont-use-p6-nops.patch # # PowerPC @@ -1914,6 +1913,9 @@ %changelog +* Mon Mar 03 2008 Chuck Ebbert 2.6.24.3-14 +- Allow i686 kernel to boot on Via C3/C7 processors (#435609) + * Wed Feb 27 2008 John W. Linville 2.6.24.3-13 - rt2x00: correct address calc for queue private data - mac80211: better definition of mactime From fedora-extras-commits at redhat.com Mon Mar 3 22:08:14 2008 From: fedora-extras-commits at redhat.com (Alexandru Ciobanu (ics)) Date: Mon, 3 Mar 2008 22:08:14 GMT Subject: rpms/gimp-lqr-plugin/F-8 gimp-lqr-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803032208.m23M8EV7001940@cvs-int.fedora.redhat.com> Author: ics Update of /cvs/pkgs/rpms/gimp-lqr-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1807/F-8 Modified Files: .cvsignore sources Added Files: gimp-lqr-plugin.spec Log Message: initial import --- NEW FILE gimp-lqr-plugin.spec --- %define codeversion 0.4.0 %define tarversion 4 Name: gimp-lqr-plugin Version: %{codeversion}.%{tarversion} Release: 2%{?dist} Summary: Content-aware resizing plug-in for the GIMP Group: Applications/Multimedia License: GPLv2+ URL: http://liquidrescale.wikidot.com/ Source0: http://liquidrescale.wikidot.com/local--files/en:download-page/%{name}-%{codeversion}-%{tarversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) BuildRequires: gimp-devel >= 2.4 perl(XML::Parser), gettext, liblqr-1-devel >= 0.1.0 Requires: gimp >= 2.4 %description This package is a plug-in for the GIMP 2.4. It implements the algorithm described in the paper "Seam Carving for Content-Aware Image Resizing" by Shai Avidan and Ariel Shamir, which can be found at http://www.faculty.idc.ac.il/arik/imret.pdf %prep %setup -q -n gimp-lqr-plugin-%{codeversion} %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang gimp20-lqr-plugin %clean rm -rf $RPM_BUILD_ROOT %files -f gimp20-lqr-plugin.lang %defattr(-,root,root,-) %doc README ChangeLog TODO COPYING AUTHORS NEWS %{_libdir}/gimp/2.0/plug-ins/gimp-lqr-plugin %{_datadir}/gimp-lqr-plugin/ %changelog * Sun Mar 02 2008 Alexandru Ciobanu - 0.4.0.4-2 - Fixed typos, buildrequires and requires. * Wed Feb 20 2008 Alexandru Ciobanu - 0.4.0.4-1 - Remove hyphen from versioning. * Tue Feb 19 2008 Alexandru Ciobanu - 0.4.0-3 - Fixed licensing issue. * Mon Feb 4 2008 Alexandru Ciobanu - 0.4.0-2 - Removed CFLAGS. - Fixed ownership issues. * Thu Jan 17 2008 Alexandru Ciobanu - 0.4.0-1 - Update to 0.4.0-3. - Added liblqr dependency. * Mon Dec 10 2007 Alexandru Ciobanu - 0.4.0-0 - Update to 0.4.0. * Wed Nov 22 2007 Alexandru Ciobanu - 0.3.0-1 - Updated languages. - Removed DEBUG flag. http://liquidrescale.wikidot.com/forum/t-23531/bugfix - Cleaned .spec file to meet Fedora Guidelines. * Fri Oct 12 2007 Alexandru Ciobanu - 0.3.0-0 - Update to latest upstream release. * Fri Oct 5 2007 Alexandru Ciobanu - 0.2.1-4 - Added more translation: Romanian, Spanish Spanish, Serbian. * Wed Oct 3 2007 Alexandru Ciobanu - 0.2.1-3 - Added Basque, Chinese, Argentinian Spanish, Hungarian translations. * Tue Oct 2 2007 Alexandru Ciobanu - 0.2.1-2 - Added German translation. * Tue Oct 2 2007 Alexandru Ciobanu - 0.2.1-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2008 20:01:55 -0000 1.1 +++ .cvsignore 3 Mar 2008 22:07:37 -0000 1.2 @@ -0,0 +1 @@ +gimp-lqr-plugin-0.4.0-4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2008 20:01:55 -0000 1.1 +++ sources 3 Mar 2008 22:07:37 -0000 1.2 @@ -0,0 +1 @@ +1d34e517cdbf8b2f358e0febea0467f5 gimp-lqr-plugin-0.4.0-4.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 22:10:32 2008 From: fedora-extras-commits at redhat.com (Alexandru Ciobanu (ics)) Date: Mon, 3 Mar 2008 22:10:32 GMT Subject: rpms/gimp-lqr-plugin/F-7 gimp-lqr-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803032210.m23MAWPx002312@cvs-int.fedora.redhat.com> Author: ics Update of /cvs/pkgs/rpms/gimp-lqr-plugin/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2167/F-7 Modified Files: .cvsignore sources Added Files: gimp-lqr-plugin.spec Log Message: initial import --- NEW FILE gimp-lqr-plugin.spec --- %define codeversion 0.4.0 %define tarversion 4 Name: gimp-lqr-plugin Version: %{codeversion}.%{tarversion} Release: 2%{?dist} Summary: Content-aware resizing plug-in for the GIMP Group: Applications/Multimedia License: GPLv2+ URL: http://liquidrescale.wikidot.com/ Source0: http://liquidrescale.wikidot.com/local--files/en:download-page/%{name}-%{codeversion}-%{tarversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) BuildRequires: gimp-devel >= 2.4 perl(XML::Parser), gettext, liblqr-1-devel >= 0.1.0 Requires: gimp >= 2.4 %description This package is a plug-in for the GIMP 2.4. It implements the algorithm described in the paper "Seam Carving for Content-Aware Image Resizing" by Shai Avidan and Ariel Shamir, which can be found at http://www.faculty.idc.ac.il/arik/imret.pdf %prep %setup -q -n gimp-lqr-plugin-%{codeversion} %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang gimp20-lqr-plugin %clean rm -rf $RPM_BUILD_ROOT %files -f gimp20-lqr-plugin.lang %defattr(-,root,root,-) %doc README ChangeLog TODO COPYING AUTHORS NEWS %{_libdir}/gimp/2.0/plug-ins/gimp-lqr-plugin %{_datadir}/gimp-lqr-plugin/ %changelog * Sun Mar 02 2008 Alexandru Ciobanu - 0.4.0.4-2 - Fixed typos, buildrequires and requires. * Wed Feb 20 2008 Alexandru Ciobanu - 0.4.0.4-1 - Remove hyphen from versioning. * Tue Feb 19 2008 Alexandru Ciobanu - 0.4.0-3 - Fixed licensing issue. * Mon Feb 4 2008 Alexandru Ciobanu - 0.4.0-2 - Removed CFLAGS. - Fixed ownership issues. * Thu Jan 17 2008 Alexandru Ciobanu - 0.4.0-1 - Update to 0.4.0-3. - Added liblqr dependency. * Mon Dec 10 2007 Alexandru Ciobanu - 0.4.0-0 - Update to 0.4.0. * Wed Nov 22 2007 Alexandru Ciobanu - 0.3.0-1 - Updated languages. - Removed DEBUG flag. http://liquidrescale.wikidot.com/forum/t-23531/bugfix - Cleaned .spec file to meet Fedora Guidelines. * Fri Oct 12 2007 Alexandru Ciobanu - 0.3.0-0 - Update to latest upstream release. * Fri Oct 5 2007 Alexandru Ciobanu - 0.2.1-4 - Added more translation: Romanian, Spanish Spanish, Serbian. * Wed Oct 3 2007 Alexandru Ciobanu - 0.2.1-3 - Added Basque, Chinese, Argentinian Spanish, Hungarian translations. * Tue Oct 2 2007 Alexandru Ciobanu - 0.2.1-2 - Added German translation. * Tue Oct 2 2007 Alexandru Ciobanu - 0.2.1-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2008 20:01:55 -0000 1.1 +++ .cvsignore 3 Mar 2008 22:09:43 -0000 1.2 @@ -0,0 +1 @@ +gimp-lqr-plugin-0.4.0-4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gimp-lqr-plugin/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2008 20:01:55 -0000 1.1 +++ sources 3 Mar 2008 22:09:43 -0000 1.2 @@ -0,0 +1 @@ +1d34e517cdbf8b2f358e0febea0467f5 gimp-lqr-plugin-0.4.0-4.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 22:14:43 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Mon, 3 Mar 2008 22:14:43 GMT Subject: rpms/aircrack-ng/F-8 aircrack-ng.spec, 1.11, 1.12 sources, 1.9, 1.10 aircrack-ng-0.9.2-include_limits.patch, 1.1, NONE Message-ID: <200803032214.m23MEhvd002949@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/aircrack-ng/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2855 Modified Files: aircrack-ng.spec sources Removed Files: aircrack-ng-0.9.2-include_limits.patch Log Message: * Sat Mar 01 2008 Till Maas - 0.9.3-1 - update to latest version - remove patch that was merged upstream Index: aircrack-ng.spec =================================================================== RCS file: /cvs/pkgs/rpms/aircrack-ng/F-8/aircrack-ng.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- aircrack-ng.spec 13 Feb 2008 18:31:47 -0000 1.11 +++ aircrack-ng.spec 3 Mar 2008 22:14:10 -0000 1.12 @@ -1,7 +1,7 @@ #%define svndate 20070418 Name: aircrack-ng -Version: 0.9.2 +Version: 0.9.3 #Release: 0.3.%{svndate}svn%{?dist} Release: 1%{?dist} Summary: 802.11 (wireless) sniffer and WEP/WPA-PSK key cracker @@ -12,7 +12,6 @@ URL: http://www.aircrack-ng.org/ Source0: http://download.aircrack-ng.org/aircrack-ng-%{version}.tar.gz Source1: %{name}-tarball -Patch0: aircrack-ng-0.9.2-include_limits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +26,6 @@ %prep #%setup -q -n aircrack-ng-%{svndate} %setup -q -n aircrack-ng-%{version} -%patch0 -p1 -b .include_limits %build @@ -71,6 +69,10 @@ %changelog +* Sat Mar 01 2008 Till Maas - 0.9.3-1 +- update to latest version +- remove patch that was merged upstream + * Wed Feb 13 2008 Till Maas - 0.9.2-1 - update to latest version - remove patch that was merged upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/aircrack-ng/F-8/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 13 Feb 2008 18:31:47 -0000 1.9 +++ sources 3 Mar 2008 22:14:10 -0000 1.10 @@ -1 +1 @@ -13fbe2f39730eb5f48f256b20714e2b4 aircrack-ng-0.9.2.tar.gz +f37fdb000d8bad77da6a0a43bc2ef67a aircrack-ng-0.9.3.tar.gz --- aircrack-ng-0.9.2-include_limits.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 22:17:40 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Mon, 3 Mar 2008 22:17:40 GMT Subject: rpms/aircrack-ng/F-7 aircrack-ng.spec, 1.9, 1.10 sources, 1.9, 1.10 aircrack-ng-0.9.2-include_limits.patch, 1.1, NONE Message-ID: <200803032217.m23MHewB003394@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/aircrack-ng/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3285 Modified Files: aircrack-ng.spec sources Removed Files: aircrack-ng-0.9.2-include_limits.patch Log Message: * Sat Mar 01 2008 Till Maas - 0.9.3-1 - update to latest version - remove patch that was merged upstream Index: aircrack-ng.spec =================================================================== RCS file: /cvs/pkgs/rpms/aircrack-ng/F-7/aircrack-ng.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- aircrack-ng.spec 13 Feb 2008 18:29:36 -0000 1.9 +++ aircrack-ng.spec 3 Mar 2008 22:16:59 -0000 1.10 @@ -1,7 +1,7 @@ #%define svndate 20070418 Name: aircrack-ng -Version: 0.9.2 +Version: 0.9.3 #Release: 0.3.%{svndate}svn%{?dist} Release: 1%{?dist} Summary: 802.11 (wireless) sniffer and WEP/WPA-PSK key cracker @@ -12,7 +12,6 @@ URL: http://www.aircrack-ng.org/ Source0: http://download.aircrack-ng.org/aircrack-ng-%{version}.tar.gz Source1: %{name}-tarball -Patch0: aircrack-ng-0.9.2-include_limits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +26,6 @@ %prep #%setup -q -n aircrack-ng-%{svndate} %setup -q -n aircrack-ng-%{version} -%patch0 -p1 -b .include_limits %build @@ -71,6 +69,10 @@ %changelog +* Sat Mar 01 2008 Till Maas - 0.9.3-1 +- update to latest version +- remove patch that was merged upstream + * Wed Feb 13 2008 Till Maas - 0.9.2-1 - update to latest version - remove patch that was merged upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/aircrack-ng/F-7/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 13 Feb 2008 18:29:36 -0000 1.9 +++ sources 3 Mar 2008 22:16:59 -0000 1.10 @@ -1 +1 @@ -13fbe2f39730eb5f48f256b20714e2b4 aircrack-ng-0.9.2.tar.gz +f37fdb000d8bad77da6a0a43bc2ef67a aircrack-ng-0.9.3.tar.gz --- aircrack-ng-0.9.2-include_limits.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 22:30:29 2008 From: fedora-extras-commits at redhat.com (Tom Lane (tgl)) Date: Mon, 3 Mar 2008 22:30:29 GMT Subject: rpms/mysql/devel mysql-stack-guard.patch, 1.1, 1.2 mysql.init, 1.21, 1.22 mysql.spec, 1.104, 1.105 Message-ID: <200803032230.m23MUTg0004829@cvs-int.fedora.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4781 Modified Files: mysql-stack-guard.patch mysql.init mysql.spec Log Message: Second try at stack-guard patch, also apply fix for bug #435494 mysql-stack-guard.patch: Index: mysql-stack-guard.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-stack-guard.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mysql-stack-guard.patch 28 Feb 2008 21:23:49 -0000 1.1 +++ mysql-stack-guard.patch 3 Mar 2008 22:30:11 -0000 1.2 @@ -1,26 +1,84 @@ mysql is not accounting for the "guard page" when setting thread stack size requests. This is fatal on PPC systems, which may use guard pages as large -as 64K. I'll bet a good deal that the hacks it uses for IA64 are a result -of misdiagnosis of a similar problem, so remove them. +as 64K. This patch also documents the IA64 situation a bit better. -It is not at this point entirely clear whether mysql is wrong in ignoring -the guard page, or whether this is a RHEL bug (see our bz#435337). So not -reporting this upstream yet. But we need the patch now, so we can build mysql -in rawhide (the build machines are using RHEL5 kernels). +Note: there are quite a few other setstacksize calls besides the two in +mysqld.cc; is it important to fix any of the others? diff -Naur mysql-5.0.45.orig/sql/mysqld.cc mysql-5.0.45/sql/mysqld.cc --- mysql-5.0.45.orig/sql/mysqld.cc 2007-07-04 09:06:03.000000000 -0400 -+++ mysql-5.0.45/sql/mysqld.cc 2008-02-28 15:17:20.000000000 -0500 -@@ -2286,6 +2286,7 @@ - { - int error; - pthread_attr_t thr_attr; ++++ mysql-5.0.45/sql/mysqld.cc 2008-03-03 17:16:25.000000000 -0500 +@@ -2281,6 +2281,68 @@ + DBUG_VOID_RETURN; + } + ++/* pthread_attr_setstacksize without so much platform-dependency */ ++/* returns the actual stack size if possible */ ++static size_t my_setstacksize(pthread_attr_t *attr, size_t stacksize) ++{ + size_t guard_size = 0; - DBUG_ENTER("start_signal_handler"); ++ ++#if defined(__ia64__) || defined(__ia64) ++ /* ++ On IA64, half of the requested stack size is used for "normal stack" ++ and half for "register stack". The space measured by check_stack_overrun ++ is the "normal stack", so double the request to make sure we have the ++ caller-expected amount of normal stack. ++ ++ NOTE: there is no guarantee that the register stack can't grow faster ++ than normal stack, so it's very unclear that we won't dump core due to ++ stack overrun despite check_stack_overrun's efforts. Experimentation ++ shows that in the execution_constants test, the register stack grows ++ less than half as fast as normal stack, but perhaps other scenarios are ++ less forgiving. If it turns out that more space is needed for the ++ register stack, that could be forced (rather inefficiently) by using a ++ multiplier higher than 2 here. ++ */ ++ stacksize *= 2; ++#endif ++ ++ /* ++ On many machines, the "guard space" is subtracted from the requested ++ stack size, and that space is quite large on some platforms. So add ++ it to our request, if we can find out what it is. ++ ++ FIXME: autoconfiscate use of pthread_attr_getguardsize ++ */ ++ if (pthread_attr_getguardsize(attr, &guard_size)) ++ guard_size = 0; /* if can't find it out, treat as 0 */ ++ ++ pthread_attr_setstacksize(attr, stacksize + guard_size); ++ ++ /* Retrieve actual stack size if possible */ ++#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE ++ { ++ size_t real_stack_size= 0; ++ /* We must ignore real_stack_size = 0 as Solaris 2.9 can return 0 here */ ++ if (pthread_attr_getstacksize(attr, &real_stack_size) == 0 && ++ real_stack_size > guard_size) ++ { ++ real_stack_size -= guard_size; ++ if (real_stack_size < stacksize) ++ { ++ if (global_system_variables.log_warnings) ++ sql_print_warning("Asked for %ld thread stack, but got %ld", ++ (long) stacksize, (long) real_stack_size); ++ stacksize= real_stack_size; ++ } ++ } ++ } ++#endif ++ ++#if defined(__ia64__) || defined(__ia64) ++ stacksize /= 2; ++#endif ++ return stacksize; ++} - (void) pthread_attr_init(&thr_attr); -@@ -2294,15 +2295,9 @@ + static void start_signal_handler(void) + { +@@ -2294,15 +2356,7 @@ (void) pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED); if (!(opt_specialflag & SPECIAL_NO_PRIOR)) my_pthread_attr_setprio(&thr_attr,INTERRUPT_PRIOR); @@ -33,13 +91,11 @@ -#else - pthread_attr_setstacksize(&thr_attr,thread_stack); -#endif -+ -+ pthread_attr_getguardsize(&thr_attr, &guard_size); -+ pthread_attr_setstacksize(&thr_attr, thread_stack + guard_size); ++ (void) my_setstacksize(&thr_attr,thread_stack); #endif (void) pthread_mutex_lock(&LOCK_thread_count); -@@ -3499,37 +3494,29 @@ +@@ -3499,41 +3553,12 @@ init_signals(); if (!(opt_specialflag & SPECIAL_NO_PRIOR)) my_pthread_setprio(pthread_self(),CONNECT_PRIOR); @@ -53,27 +109,17 @@ - pthread_attr_setstacksize(&connection_attrib,thread_stack); -#endif -#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE -+ - { -+ size_t guard_size = 0; -+ size_t stack_size = 0; -+ -+ pthread_attr_getguardsize(&connection_attrib, &guard_size); -+ -+ pthread_attr_setstacksize(&connection_attrib, thread_stack + guard_size); -+ -+#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE - /* Retrieve used stack size; Needed for checking stack overflows */ +- { +- /* Retrieve used stack size; Needed for checking stack overflows */ - size_t stack_size= 0; - pthread_attr_getstacksize(&connection_attrib, &stack_size); +- pthread_attr_getstacksize(&connection_attrib, &stack_size); -#if defined(__ia64__) || defined(__ia64) - stack_size/= 2; -#endif - /* We must check if stack_size = 0 as Solaris 2.9 can return 0 here */ +- /* We must check if stack_size = 0 as Solaris 2.9 can return 0 here */ - if (stack_size && stack_size < thread_stack) -+ if (stack_size && stack_size < thread_stack + guard_size) - { - if (global_system_variables.log_warnings) +- { +- if (global_system_variables.log_warnings) - sql_print_warning("Asked for %lu thread stack, but got %ld", - thread_stack, (long) stack_size); -#if defined(__ia64__) || defined(__ia64) @@ -81,14 +127,16 @@ -#else - thread_stack= stack_size; -#endif -+ sql_print_warning("Asked for %lu+%lu thread stack, but got %ld", -+ thread_stack, (long) guard_size, (long) stack_size); -+ thread_stack= stack_size - guard_size; - } +- } - } - #endif -+ } +-#endif + #ifdef __NETWARE__ /* Increasing stacksize of threads on NetWare */ +- + pthread_attr_setstacksize(&connection_attrib, NW_THD_STACKSIZE); ++#else ++ thread_stack = my_setstacksize(&connection_attrib,thread_stack); + #endif + (void) thr_setconcurrency(concurrency); // 10 by default Index: mysql.init =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.init,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mysql.init 29 Mar 2007 22:47:48 -0000 1.21 +++ mysql.init 3 Mar 2008 22:30:11 -0000 1.22 @@ -68,7 +68,7 @@ if [ $ret -eq 0 ]; then STARTTIMEOUT=30 while [ $STARTTIMEOUT -gt 0 ]; do - RESPONSE=`/usr/bin/mysqladmin -uUNKNOWN_MYSQL_USER ping 2>&1` && break + RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break echo "$RESPONSE" | grep -q "Access denied for user" && break sleep 1 let STARTTIMEOUT=${STARTTIMEOUT}-1 Index: mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- mysql.spec 3 Mar 2008 17:55:21 -0000 1.104 +++ mysql.spec 3 Mar 2008 22:30:11 -0000 1.105 @@ -1,6 +1,6 @@ Name: mysql Version: 5.0.45 -Release: 10%{?dist} +Release: 11%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -484,8 +484,13 @@ %{_mandir}/man1/mysql_client_test.1* %changelog +* Mon Mar 3 2008 Tom Lane 5.0.45-11 +- Fix mysql-stack-guard patch to work correctly on IA64 +- Fix mysql.init to wait correctly when socket is not in default place +Related: #435494 + * Mon Mar 03 2008 Dennis Gilmore 5.0.45-10 -- add sparc64 to 64 bit arches for test suite checking +- add sparc64 to 64 bit arches for test suite checking - add sparc, sparcv9 and sparc64 to multilib handling * Thu Feb 28 2008 Tom Lane 5.0.45-9 From fedora-extras-commits at redhat.com Mon Mar 3 22:31:26 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 3 Mar 2008 22:31:26 GMT Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.29,1.30 Message-ID: <200803032231.m23MVQuI004978@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drivers/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4850 Modified Files: xorg-x11-drivers.spec Log Message: * Mon Mar 03 2008 Adam Jackson 7.3-3 - Drop magictouch, it can not work and can never have worked. Index: xorg-x11-drivers.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- xorg-x11-drivers.spec 22 Feb 2008 17:58:36 -0000 1.29 +++ xorg-x11-drivers.spec 3 Mar 2008 22:30:42 -0000 1.30 @@ -1,7 +1,7 @@ Summary: X.Org X11 driver installation package Name: xorg-x11-drivers Version: 7.3 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,7 +48,6 @@ Requires: xorg-x11-drv-jamstudio Requires: xorg-x11-drv-keyboard Requires: xorg-x11-drv-magellan -Requires: xorg-x11-drv-magictouch Requires: xorg-x11-drv-mga Requires: xorg-x11-drv-microtouch Requires: xorg-x11-drv-mouse @@ -131,6 +130,9 @@ %defattr(-,root,root,-) %changelog +* Mon Mar 03 2008 Adam Jackson 7.3-3 +- Drop magictouch, it can not work and can never have worked. + * Fri Feb 22 2008 Adam Jackson 7.3-2 - xorg-x11-drv-diamondtouch. From fedora-extras-commits at redhat.com Mon Mar 3 22:36:55 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Mon, 3 Mar 2008 22:36:55 GMT Subject: rpms/kernel/F-8 kernel.spec, 1.360, 1.361 linux-2.6-wireless-pending.patch, 1.29, 1.30 Message-ID: <200803032236.m23Mate0005530@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5459 Modified Files: kernel.spec linux-2.6-wireless-pending.patch Log Message: latest round of wireless updates Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.360 retrieving revision 1.361 diff -u -r1.360 -r1.361 --- kernel.spec 3 Mar 2008 22:05:39 -0000 1.360 +++ kernel.spec 3 Mar 2008 22:36:06 -0000 1.361 @@ -1913,6 +1913,25 @@ %changelog +* Mon Mar 03 2008 John W. Linville 2.6.24.3-15 +- ssb: Add CHIPCO IRQ access functions +- p54: print unknown eeprom fields +- rt2x00: Check for 5GHz band in link tuner +- rt2x00: Release rt2x00 2.1.3 +- mac80211: rework TX filtered frame code +- mac80211: atomically check whether STA exists already +- mac80211: Disallow concurrent IBSS/STA mode interfaces +- mac80211: fix debugfs_sta print_mac() warning +- mac80211: fix IBSS code +- adm8211: fix cfg80211 band API conversion +- mac80211: clarify use of TX status/RX callbacks +- mac80211: safely free beacon in ieee80211_if_reinit +- mac80211: remove STA infos last_ack stuff +- mac80211: split ieee80211_key_alloc/free +- mac80211: fix key replacing, hw accel +- b43legacy: Fix nondebug build +- ath5k: fix all endian issues reported by sparse + * Mon Mar 03 2008 Chuck Ebbert 2.6.24.3-14 - Allow i686 kernel to boot on Via C3/C7 processors (#435609) linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.29 -r 1.30 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending.patch,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- linux-2.6-wireless-pending.patch 28 Feb 2008 03:18:34 -0000 1.29 +++ linux-2.6-wireless-pending.patch 3 Mar 2008 22:36:06 -0000 1.30 @@ -1,3 +1,260 @@ +commit e4861829072c61883114c64a3af61f305a789ff0 +Author: Johannes Berg +Date: Wed Feb 27 13:39:00 2008 +0100 + + mac80211: fix key replacing, hw accel + + Even though I thought about it a lot and had also tested it, some + of my recent changes in the key code broke replacing keys, making + the kernel oops because a key is removed from a list while not on + it. + + This patch fixes that using the list as an indication whether or + not the key is on it (an empty list means it's not on any list.) + + Also, this patch fixes hw accel enabling, the check for not doing + hw accel when the interface is down was lost and is restored by + this. + + Additionally, move adding the key to the list into the function + __ieee80211_key_replace() for more consistency. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit db4d1169d0b893bfb7923b6526748fe2c5a7373f +Author: Johannes Berg +Date: Mon Feb 25 16:27:45 2008 +0100 + + mac80211: split ieee80211_key_alloc/free + + In order to RCU-ify sta_info, we need to be able to allocate + a key without linking it to an sdata/sta structure (because + allocation cannot be done in an rcu critical section). This + patch splits up ieee80211_key_alloc() and updates all users + appropriately. + + While at it, this patch fixes a number of race conditions + such as finally making key replacement atomic, unfortunately + at the expense of more complex code. + + Note that this patch documents /existing/ bugs with sta info + and key interaction, there is currently a race condition + when a sta info is freed without holding the RTNL. This will + finally be fixed by a followup patch. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 6f48422a29714ed92f6136d9e7d3ff39c75607d7 +Author: Johannes Berg +Date: Mon Feb 25 16:27:44 2008 +0100 + + mac80211: remove STA infos last_ack stuff + + These things aren't used and the only possible use is within + rate control algorithms, however those can, if they need it, + keep track of it in their private data. last_ack_ms isn't + even updated so completely useless. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit e6a5ddf20886206caf1c4a2431f6ff01198ab0f7 +Author: Johannes Berg +Date: Mon Feb 25 16:27:42 2008 +0100 + + mac80211: safely free beacon in ieee80211_if_reinit + + If ieee80211_if_reinit() is called from ieee80211_unregister_hw() + then it is possible that the driver will still request a beacon + (it is allowed to until ieee80211_unregister_hw() has returned.) + This means we need to use an RCU-protected write to the beacon + information even in this function. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 2485f7105f20f85c2dbebc67be6b2cb97175fa7e +Author: Johannes Berg +Date: Mon Feb 25 16:27:41 2008 +0100 + + mac80211: clarify use of TX status/RX callbacks + + This patch clarifies the use of the irqsafe vs. non-irq-safe + functions and their respective locking requirements. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 38c07b430b50172b803fe4c7f76cba580ba9931f +Author: Pavel Roskin +Date: Tue Feb 26 17:59:14 2008 -0500 + + ath5k: fix all endian issues reported by sparse + + Changes-licensed-under: ISC + Signed-off-by: Pavel Roskin + Acked-by: Luis R. Rodriguez + Acked-by: Nick Kossifidis + Signed-off-by: John W. Linville + +commit e6084239d39a10bac1186611fe7c523cea92c9ec +Author: Ivo van Doorn +Date: Mon Feb 25 23:22:13 2008 +0100 + + rt2x00: Release rt2x00 2.1.3 + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 1497074ad79009f8fb465d795f9e0d2a428b7fa2 +Author: Ivo van Doorn +Date: Mon Feb 25 23:20:33 2008 +0100 + + rt2x00: Check for 5GHz band in link tuner + + Fix a typo in the link tuner where accidently the + 2GHz band was checked instead of the 5GHz band. + This forced the link tuner to work in an invalid + range for the currently active band. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 58e307398317ab55470547a7d72859c89edd187d +Author: Florian Fainelli +Date: Mon Feb 25 17:51:53 2008 +0100 + + p54: print unknown eeprom fields + + This patch allows p54common to print the + uknown EEPROM fields, which can help + when debugging/testing devices. + + Signed-off-by: Florian Fainelli + Signed-off-by: John W. Linville + +commit 9a89c839f79395426b84cf6da9d56773402b4c0e +Author: Johannes Berg +Date: Mon Feb 25 11:12:18 2008 +0100 + + adm8211: fix cfg80211 band API conversion + + Insert a missing band assignment. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 8f300ae5b819f7655197925cdb1954edfd906a87 +Author: Michael Buesch +Date: Sun Feb 24 14:42:29 2008 +0100 + + b43legacy: Fix nondebug build + + Fix a typo. + + Signed-off-by: Michael Buesch + Acked-by: Stefano Brivio + Signed-off-by: John W. Linville + +commit 28de57d1a9eb7e67badb731297197fcbef0cc19e +Author: Aurelien Jarno +Date: Fri Feb 22 16:14:58 2008 +0100 + + ssb: Add CHIPCO IRQ access functions + + This patch adds functions to setup and read the CHIPCO IRQ. + + Signed-off-by: Aurelien Jarno + Signed-off-by: Michael Buesch + Signed-off-by: John W. Linville + +commit fba4a1e63723b5ef16c21a90f06520ae37c5da98 +Author: Johannes Berg +Date: Thu Feb 21 11:08:33 2008 +0100 + + mac80211: fix IBSS code + + This patch fixes two errors introduced by + + commit 19d35612f3cd7f60dd9174c0100584e21f5a1025 + Author: Bruno Randolf + Date: Mon Feb 18 11:21:36 2008 +0900 + + mac80211: enable IBSS merging + + The first error is an endianness problem that sparse found and + the second is a build failure when CONFIG_MAC80211_IBSS_DEBUG + is not set. + + Signed-off-by: Johannes Berg [...5109 lines suppressed...] * its 14 bytes. Note we use the control rate and not the -@@ -533,7 +532,7 @@ static inline void ath5k_hw_write_rate_d + * actual rate for this rate. See mac80211 tx.c * ieee80211_duration() for a brief description of * what rate we should choose to TX ACKs. */ - tx_time = ieee80211_generic_frame_duration(sc->hw, +- tx_time = ieee80211_generic_frame_duration(sc->hw, - sc->vif, 10, control_rate->rate_kbps/100); -+ sc->vif, 10, &srate); ++ tx_time = le16_to_cpu(ieee80211_generic_frame_duration(sc->hw, ++ sc->vif, 10, &srate)); ath5k_hw_reg_write(ah, tx_time, reg); @@ -32056,8 +33415,8 @@ /****************\ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-03-03 16:42:46.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c 2008-03-03 16:46:20.000000000 -0500 @@ -1317,8 +1317,10 @@ int ath5k_hw_write_initvals(struct ath5k /* For AR5211 */ } else if (ah->ah_version == AR5K_AR5211) { @@ -32072,8 +33431,8 @@ } diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-02-21 08:21:48.545426467 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig 2008-02-21 14:02:20.000000000 -0500 +--- /dev/null 2008-03-03 08:19:02.806638585 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig 2008-03-03 16:46:20.000000000 -0500 @@ -0,0 +1,37 @@ +config ATH5K + tristate "Atheros 5xxx wireless cards support" @@ -32113,8 +33472,8 @@ + modprobe ath5k debug=0x00000400 + diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-03-03 16:42:46.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c 2008-03-03 16:47:32.000000000 -0500 @@ -80,7 +80,7 @@ MODULE_AUTHOR("Nick Kossifidis"); MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards."); MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards"); @@ -32641,6 +34000,30 @@ if (ret) goto err_unmap; +@@ -1660,11 +1717,11 @@ ath5k_check_ibss_hw_merge(struct ath5k_s + u32 hw_tu; + struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data; + +- if ((mgmt->frame_control & IEEE80211_FCTL_FTYPE) == ++ if ((le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_FTYPE) == + IEEE80211_FTYPE_MGMT && +- (mgmt->frame_control & IEEE80211_FCTL_STYPE) == ++ (le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE) == + IEEE80211_STYPE_BEACON && +- mgmt->u.beacon.capab_info & WLAN_CAPABILITY_IBSS && ++ le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS && + memcmp(mgmt->bssid, sc->ah->ah_bssid, ETH_ALEN) == 0) { + /* + * Received an IBSS beacon with the same BSSID. Hardware might +@@ -1673,7 +1730,7 @@ ath5k_check_ibss_hw_merge(struct ath5k_s + hw_tu = TSF_TO_TU(ath5k_hw_get_tsf64(sc->ah)); + if (hw_tu >= sc->nexttbtt) { + ath5k_beacon_update_timers(sc, +- mgmt->u.beacon.timestamp); ++ le64_to_cpu(mgmt->u.beacon.timestamp)); + ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, + "detected HW merge from received beacon\n"); + } @@ -1791,9 +1848,8 @@ accept: rxs.mactime = ath5k_extend_tsf(sc->ah, ds->ds_rxstat.rs_tstamp); rxs.flag |= RX_FLAG_TSFT; @@ -32760,8 +34143,8 @@ case ALG_CCMP: return -EOPNOTSUPP; diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-03-03 16:42:46.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c 2008-03-03 16:46:20.000000000 -0500 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -32851,8 +34234,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-03-03 16:42:46.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h 2008-03-03 16:46:20.000000000 -0500 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -32898,8 +34281,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-03-03 16:42:47.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-03-03 16:46:20.000000000 -0500 @@ -78,8 +78,9 @@ static void max2820_rf_set_channel(struc struct ieee80211_conf *conf) { @@ -32913,8 +34296,8 @@ /* While philips SA2400 drive the PA bias from diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-03-03 16:42:46.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-03-03 16:47:32.000000000 -0500 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -33066,25 +34449,26 @@ dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */ priv->retry_limit = 3; -@@ -1917,14 +1930,7 @@ static int __devinit adm8211_probe(struc +@@ -1917,14 +1930,9 @@ static int __devinit adm8211_probe(struc goto err_free_desc; } - priv->channel = priv->modes[0].channels[0].chan; -- ++ priv->channel = 1; + - err = ieee80211_register_hwmode(dev, &priv->modes[0]); - if (err) { - printk(KERN_ERR "%s (adm8211): Can't register hwmode\n", - pci_name(pdev)); - goto err_free_desc; - } -+ priv->channel = 1; ++ dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band; err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c ---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-02-21 13:44:10.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-03 16:42:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-03 16:46:20.000000000 -0500 @@ -172,6 +172,22 @@ static int select_core_and_segment(struc return 0; } @@ -33141,8 +34525,8 @@ .write32 = ssb_pcmcia_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c ---- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-02-21 14:00:25.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-03 16:42:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-03 16:46:20.000000000 -0500 @@ -505,6 +505,14 @@ error: return err; } @@ -33185,8 +34569,8 @@ .write32 = ssb_ssb_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c ---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-02-21 13:44:10.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-03 16:42:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-03 16:46:20.000000000 -0500 @@ -572,6 +572,19 @@ static inline int ssb_pci_assert_buspowe } #endif /* DEBUG */ @@ -33238,3 +34622,23 @@ .write16 = ssb_pci_write16, .write32 = ssb_pci_write32, }; +diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c +--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-03 16:42:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-03 16:47:32.000000000 -0500 +@@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc + chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks); + } + ++void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value) ++{ ++ chipco_write32_masked(cc, SSB_CHIPCO_IRQMASK, mask, value); ++} ++ ++u32 ssb_chipco_irq_status(struct ssb_chipcommon *cc, u32 mask) ++{ ++ return chipco_read32(cc, SSB_CHIPCO_IRQSTAT) & mask; ++} ++ + u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask) + { + return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask; From fedora-extras-commits at redhat.com Mon Mar 3 22:38:03 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 3 Mar 2008 22:38:03 GMT Subject: rpms/xorg-x11-drv-magictouch/devel dead.package,NONE,1.1 Message-ID: <200803032238.m23Mc3e9005647@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-magictouch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5612 Added Files: dead.package Log Message: dead package --- NEW FILE dead.package --- This input driver has never worked, can never have worked, and is not maintained. From fedora-extras-commits at redhat.com Mon Mar 3 22:38:37 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 3 Mar 2008 22:38:37 GMT Subject: rpms/xorg-x11-drv-magictouch/devel Makefile, 1.2, NONE sources, 1.6, NONE xorg-x11-drv-magictouch.spec, 1.17, NONE Message-ID: <200803032238.m23Mcbxr005718@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-magictouch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5698 Removed Files: Makefile sources xorg-x11-drv-magictouch.spec Log Message: dead package --- Makefile DELETED --- --- sources DELETED --- --- xorg-x11-drv-magictouch.spec DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 22:49:28 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 3 Mar 2008 22:49:28 GMT Subject: rpms/xorg-x11-drv-i128/devel commitid, NONE, 1.1 make-git-snapshot.sh, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-i128.spec, 1.18, 1.19 Message-ID: <200803032249.m23MnSAY006500@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-i128/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6421/devel Modified Files: .cvsignore sources xorg-x11-drv-i128.spec Added Files: commitid make-git-snapshot.sh Log Message: git snapshot --- NEW FILE commitid --- 64987900b7398943005d0a43f6b39ce3c2d1f4f1 --- NEW FILE make-git-snapshot.sh --- #!/bin/sh DIRNAME=xf86-video-i128-$( date +%Y%m%d ) rm -rf $DIRNAME git clone git://git.freedesktop.org/git/xorg/driver/xf86-video-i128 $DIRNAME cd $DIRNAME if [ -z "$1" ]; then git log | head -1 else git checkout $1 fi git log | head -1 | awk '{ print $2 }' > ../commitid git repack -a -d cd .. tar jcf $DIRNAME.tar.bz2 $DIRNAME rm -rf $DIRNAME Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i128/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 24 Aug 2007 13:04:46 -0000 1.8 +++ .cvsignore 3 Mar 2008 22:48:39 -0000 1.9 @@ -1 +1 @@ -xf86-video-i128-1.2.1.tar.bz2 +xf86-video-i128-20080303.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i128/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Aug 2007 13:04:46 -0000 1.8 +++ sources 3 Mar 2008 22:48:39 -0000 1.9 @@ -1 +1 @@ -d0080732eaa15059b0a953aa3522185a xf86-video-i128-1.2.1.tar.bz2 +9e08e407877d6d9fdd596ecb26c9e646 xf86-video-i128-20080303.tar.bz2 Index: xorg-x11-drv-i128.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i128/devel/xorg-x11-drv-i128.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xorg-x11-drv-i128.spec 20 Feb 2008 07:25:16 -0000 1.18 +++ xorg-x11-drv-i128.spec 3 Mar 2008 22:48:39 -0000 1.19 @@ -2,36 +2,43 @@ %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers +%define gitdate 20080303 + Summary: Xorg X11 i128 video driver Name: xorg-x11-drv-i128 Version: 1.2.1 -Release: 2%{?dist} +Release: 3.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 -Source1: i128.xinf +#Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +Source0: xf86-video-i128-%{gitdate}.tar.bz2 +Source1: i128.xinf +Source2: make-git-snapshot.sh +Source3: commitid Patch0: i128-1.2.0-1600sw-range-hack.patch ExcludeArch: s390 s390x -BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6 +BuildRequires: autoconf automake libtool +BuildRequires: xorg-x11-server-sdk >= 1.4.99.1 Requires: hwdata -Requires: xorg-x11-server-Xorg >= 1.3.0.0-6 +Requires: xorg-x11-server-Xorg >= 1.4.99.1 %description X.Org X11 i128 video driver. %prep -%setup -q -n %{tarball}-%{version} +%setup -q -n %{tarball}-%{gitdate} %patch0 -p1 -b .1600sw-hack %build +autoreconf -v --install || exit 1 %configure --disable-static make @@ -57,6 +64,9 @@ %{_mandir}/man4/i128.4* %changelog +* Mon Mar 03 2008 Adam Jackson 1.2.1-3.20080303 +- git snapshot for pciaccess support + * Wed Feb 20 2008 Fedora Release Engineering - 1.2.1-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 22:50:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 22:50:12 GMT Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec,1.8,1.9 Message-ID: <200803032250.m23MoCi5006599@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6536 Modified Files: perl-Crypt-Blowfish.spec Log Message: new perl Index: perl-Crypt-Blowfish.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Blowfish/devel/perl-Crypt-Blowfish.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Crypt-Blowfish.spec 19 Feb 2008 05:20:51 -0000 1.8 +++ perl-Crypt-Blowfish.spec 3 Mar 2008 22:49:31 -0000 1.9 @@ -1,7 +1,7 @@ Summary: XS Blowfish implementation for Perl Name: perl-Crypt-Blowfish Version: 2.10 -Release: 5%{?dist} +Release: 6%{?dist} License: Copyright only Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-Blowfish/ @@ -47,6 +47,9 @@ %{_mandir}/man3/*.3* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 2.10-6 +- rebuild for new perl (again) + * Tue Feb 19 2008 Fedora Release Engineering - 2.10-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 22:53:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 22:53:02 GMT Subject: rpms/perl-Test-File/devel .cvsignore, 1.2, 1.3 perl-Test-File.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200803032253.m23Mr21d006849@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-File/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6781 Modified Files: .cvsignore perl-Test-File.spec sources Log Message: missing source found Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-File/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Sep 2006 17:02:44 -0000 1.2 +++ .cvsignore 3 Mar 2008 22:52:26 -0000 1.3 @@ -1 +1 @@ -Test-File-1.16.tar.gz +Test-File-1.22.tar.gz Index: perl-Test-File.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-File/devel/perl-Test-File.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Test-File.spec 8 Feb 2008 18:10:33 -0000 1.4 +++ perl-Test-File.spec 3 Mar 2008 22:52:26 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Test-File Version: 1.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Test file attributes Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 1.22-3 +- helps if you upload new source + * Fri Feb 8 2008 Tom "spot" Callaway - 1.22-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-File/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Sep 2006 17:02:44 -0000 1.2 +++ sources 3 Mar 2008 22:52:26 -0000 1.3 @@ -1 +1 @@ -8997fa36af7b22d81c221d5325b46930 Test-File-1.16.tar.gz +9b757d50c8fd6526ac21c5c389bba2a1 Test-File-1.22.tar.gz From fedora-extras-commits at redhat.com Mon Mar 3 22:54:38 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Mon, 3 Mar 2008 22:54:38 GMT Subject: rpms/nss_db/devel nss_db.spec,1.38,1.39 Message-ID: <200803032254.m23Msc9r007042@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/nss_db/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6980 Modified Files: nss_db.spec Log Message: add a dist tag to make pushing this same package as an update easier Index: nss_db.spec =================================================================== RCS file: /cvs/pkgs/rpms/nss_db/devel/nss_db.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- nss_db.spec 19 Feb 2008 15:54:51 -0000 1.38 +++ nss_db.spec 3 Mar 2008 22:54:05 -0000 1.39 @@ -2,7 +2,7 @@ Summary: An NSS library for the Berkeley DB Name: nss_db Version: 2.2 -Release: 40 +Release: 40%{?dist} Source: ftp://sources.redhat.com/pub/glibc/releases/nss_db-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz Source2: db-getent-Makefile @@ -116,6 +116,9 @@ %config(noreplace) /var/db/Makefile %changelog +* Mon Mar 3 2008 Nalin Dahyabhai - 2.2-40%{?dist} +- add a dist tag to make pushing this same package as an update easier + * Tue Feb 19 2008 Fedora Release Engineering - 2.2-40 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 22:55:57 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Mon, 3 Mar 2008 22:55:57 GMT Subject: rpms/valgrind/devel valgrind-3.3.0-glibc27-dlhack.patch, NONE, 1.1 valgrind.spec, 1.55, 1.56 Message-ID: <200803032255.m23Mtvb8007243@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/valgrind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7134 Modified Files: valgrind.spec Added Files: valgrind-3.3.0-glibc27-dlhack.patch Log Message: 3.3.0-2 valgrind-3.3.0-glibc27-dlhack.patch: --- NEW FILE valgrind-3.3.0-glibc27-dlhack.patch --- --- valgrind-3.3.0/glibc-2.7.supp.jj 2007-12-10 18:18:47.000000000 -0500 +++ valgrind-3.3.0/glibc-2.7.supp 2008-03-03 17:53:38.000000000 -0500 @@ -22,6 +22,13 @@ # if Param: name of system call param { + dl-hack1 + Memcheck:Cond + fun:_dl_start + fun:_start +} + +{ dl-hack3-1 Memcheck:Cond obj:/lib*/ld-2.7*.so* Index: valgrind.spec =================================================================== RCS file: /cvs/pkgs/rpms/valgrind/devel/valgrind.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- valgrind.spec 3 Mar 2008 12:58:38 -0000 1.55 +++ valgrind.spec 3 Mar 2008 22:55:13 -0000 1.56 @@ -1,7 +1,7 @@ Summary: Tool for finding memory management bugs in programs Name: valgrind Version: 3.3.0 -Release: 1 +Release: 2 Epoch: 1 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2 Patch1: valgrind-3.3.0-cachegrind-improvements.patch @@ -9,6 +9,7 @@ Patch3: valgrind-3.3.0-power5+-6.patch Patch4: valgrind-3.3.0-openat.patch Patch5: valgrind-3.3.0-helgrind-p_b_w.patch +Patch6: valgrind-3.3.0-glibc27-dlhack.patch License: GPLv2 URL: http://www.valgrind.org/ Group: Development/Debuggers @@ -67,6 +68,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %ifarch x86_64 ppc64 @@ -162,6 +164,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Mar 3 2008 Jakub Jelinek 3.3.0-2 +- add _dl_start suppression for ppc/ppc64 + * Mon Mar 3 2008 Jakub Jelinek 3.3.0-1 - update to 3.3.0 - split off devel bits into valgrind-devel subpackage From fedora-extras-commits at redhat.com Mon Mar 3 22:56:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 3 Mar 2008 22:56:05 GMT Subject: rpms/perl-Crypt-DES/devel perl-Crypt-DES.spec,1.6,1.7 Message-ID: <200803032256.m23Mu5Kb007296@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-DES/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7184 Modified Files: perl-Crypt-DES.spec Log Message: new perl Index: perl-Crypt-DES.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-DES/devel/perl-Crypt-DES.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Crypt-DES.spec 20 Feb 2008 02:51:35 -0000 1.6 +++ perl-Crypt-DES.spec 3 Mar 2008 22:55:30 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Crypt-DES Version: 2.05 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl DES encryption module License: BSD Group: Development/Libraries @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 2.05-7 +- rebuild for new perl (again) + * Tue Feb 19 2008 Fedora Release Engineering - 2.05-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 3 22:57:25 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Mon, 3 Mar 2008 22:57:25 GMT Subject: rpms/nss_db/F-8 fail-setfscreatecon.c, NONE, 1.1 .cvsignore, 1.7, 1.8 nss_db-2.2-selinux.patch, 1.3, 1.4 nss_db.spec, 1.36, 1.37 sources, 1.7, 1.8 nss_db-2.2-compat.patch, 1.2, NONE Message-ID: <200803032257.m23MvPMS007420@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/nss_db/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7326/F-8 Modified Files: .cvsignore nss_db-2.2-selinux.patch nss_db.spec sources Added Files: fail-setfscreatecon.c Removed Files: nss_db-2.2-compat.patch Log Message: - pull back the raw hide version to fix file labeling --- NEW FILE fail-setfscreatecon.c --- int setfscreatecon(void) { return -1; } Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nss_db/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 13 Aug 2007 22:21:18 -0000 1.7 +++ .cvsignore 3 Mar 2008 22:56:37 -0000 1.8 @@ -1,6 +1,2 @@ -db-4.0.14.tar.gz -nss_db-2.2.tar.gz -db-4.3.27.tar.gz -db-4.3.28.tar.gz -db-4.5.20.tar.gz db-4.6.18.tar.gz +nss_db-2.2.tar.gz nss_db-2.2-selinux.patch: Index: nss_db-2.2-selinux.patch =================================================================== RCS file: /cvs/pkgs/rpms/nss_db/F-8/nss_db-2.2-selinux.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nss_db-2.2-selinux.patch 28 Feb 2005 18:25:36 -0000 1.3 +++ nss_db-2.2-selinux.patch 3 Mar 2008 22:56:37 -0000 1.4 @@ -102,7 +102,7 @@ if (status) error (EXIT_FAILURE, 0, gettext ("cannot open output file `%s': %s"), output_name, db_strerror (status)); -@@ -388,3 +400,44 @@ +@@ -388,3 +400,55 @@ return EXIT_SUCCESS; } @@ -112,7 +112,7 @@ +static void +set_file_creation_context (const char *outname, mode_t mode) +{ -+ static int enabled = -1; ++ static int enabled = -1, enforcing = -1; + security_context_t ctx; + /* Handle the "reset the context" case. */ + if (outname == NULL) @@ -129,19 +129,30 @@ + { + return; + } -+ /* Determine the context which the file should have. */ -+ ctx = NULL; -+ if (matchpathcon (outname, S_IFREG | mode, &ctx) != 0) ++ /* Check if SELinux is enforcing, and remember. */ ++ if (enforcing == -1) + { -+ error (EXIT_FAILURE, 0, -+ gettext ("cannot determine file context for `%s'"), outname); ++ enforcing = security_getenforce(); + } -+ if (ctx != NULL) ++ /* Determine the context which the file should have. */ ++ ctx = NULL; ++ if ((matchpathcon (outname, S_IFREG | mode, &ctx) == 0) && ++ (ctx != NULL)) + { + if (setfscreatecon (ctx) != 0) + { -+ error (EXIT_FAILURE, 0, -+ gettext ("cannot set file creation context for `%s'"), outname); ++ if (enforcing) ++ { ++ error (EXIT_FAILURE, 0, ++ gettext ("cannot set file creation context for `%s'"), ++ outname); ++ } ++ else ++ { ++ error (0, 0, ++ gettext ("cannot set file creation context for `%s'"), ++ outname); ++ } + } + freecon (ctx); + } Index: nss_db.spec =================================================================== RCS file: /cvs/pkgs/rpms/nss_db/F-8/nss_db.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- nss_db.spec 14 Aug 2007 14:15:04 -0000 1.36 +++ nss_db.spec 3 Mar 2008 22:56:37 -0000 1.37 @@ -2,10 +2,11 @@ Summary: An NSS library for the Berkeley DB Name: nss_db Version: 2.2 -Release: 38 +Release: 40%{?dist} Source: ftp://sources.redhat.com/pub/glibc/releases/nss_db-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz Source2: db-getent-Makefile +Source3: fail-setfscreatecon.c URL: http://sources.redhat.com/glibc/ Patch0: nss_db-2.2-external.patch Patch1: nss_db-2.2-automake.patch @@ -115,6 +116,17 @@ %config(noreplace) /var/db/Makefile %changelog +* Mon Mar 3 2008 Nalin Dahyabhai - 2.2-40%{?dist} +- add a dist tag to make pushing this same package as an update easier + +* Tue Feb 19 2008 Fedora Release Engineering - 2.2-40 +- Autorebuild for GCC 4.3 + +* Tue Nov 6 2007 Nalin Dahyabhai - 2.2-39 +- when setting file contexts for creation of new files, only fail outright + if we were in enforcing mode and the file needed to be given a specific + label (#368501) + * Tue Aug 14 2007 Nalin Dahyabhai - 2.2-38 - adapt to open-is-a-macro cases Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nss_db/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 13 Aug 2007 22:21:18 -0000 1.7 +++ sources 3 Mar 2008 22:56:37 -0000 1.8 @@ -1,2 +1,2 @@ -c2565cbd4a941ba70e41391693c3252d nss_db-2.2.tar.gz 95768bd92fd48951a427fbab37b9088f db-4.6.18.tar.gz +c2565cbd4a941ba70e41391693c3252d nss_db-2.2.tar.gz --- nss_db-2.2-compat.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 23:00:52 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Mon, 3 Mar 2008 23:00:52 GMT Subject: rpms/nss_db/F-7 db-4.6.18-glibc.patch, NONE, 1.1 fail-setfscreatecon.c, NONE, 1.1 nss_db-2.2-glibc.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 nss_db-2.2-selinux.patch, 1.3, 1.4 nss_db.spec, 1.34, 1.35 sources, 1.6, 1.7 nss_db-2.2-compat.patch, 1.2, NONE Message-ID: <200803032300.m23N0qFH007850@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/nss_db/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7759/F-7 Modified Files: .cvsignore nss_db-2.2-selinux.patch nss_db.spec sources Added Files: db-4.6.18-glibc.patch fail-setfscreatecon.c nss_db-2.2-glibc.patch Removed Files: nss_db-2.2-compat.patch Log Message: - pull in the version from raw hide to fix labeling problems db-4.6.18-glibc.patch: --- NEW FILE db-4.6.18-glibc.patch --- --- db-4.6.18/tcl/tcl_db_pkg.c.glibc 2007-07-09 19:38:45.000000000 +0200 +++ db-4.6.18/tcl/tcl_db_pkg.c 2007-08-06 16:25:43.000000000 +0200 @@ -1377,7 +1377,7 @@ bdb_EnvOpen(interp, objc, objv, ip, env) * Now open the environment. */ _debug_check(); - ret = (*env)->open(*env, home, open_flags, mode); + ret = ((*env)->open)(*env, home, open_flags, mode); result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "env open"); if (rep_flags != 0 && result == TCL_OK) { @@ -2215,7 +2215,7 @@ bdb_DbOpen(interp, objc, objv, ip, dbp) _debug_check(); /* Open the database. */ - ret = (*dbp)->open(*dbp, txn, db, subdb, type, open_flags, mode); + ret = ((*dbp)->open)(*dbp, txn, db, subdb, type, open_flags, mode); result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "db open"); error: @@ -2476,7 +2476,7 @@ bdb_SeqOpen(interp, objc, objv, ip, seqp ret, DB_RETOK_STD(ret), "sequence init")) != TCL_OK) goto error; } - ret = (*seqp)->open(*seqp, txn, &key, oflags); + ret = ((*seqp)->open)(*seqp, txn, &key, oflags); if ((result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "sequence open")) != TCL_OK) goto error; --- db-4.6.18/tcl/tcl_mp.c.glibc 2007-06-22 19:41:45.000000000 +0200 +++ db-4.6.18/tcl/tcl_mp.c 2007-08-06 16:26:17.000000000 +0200 @@ -275,7 +275,7 @@ tcl_Mp(interp, objc, objv, envp, envip) * XXX * Interface doesn't currently support DB_MPOOLFILE configuration. */ - if ((ret = mpf->open(mpf, file, flag, mode, (size_t)pgsize)) != 0) { + if ((ret = (mpf->open)(mpf, file, flag, mode, (size_t)pgsize)) != 0) { result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "mpool"); _DeleteInfo(ip); --- db-4.6.18/dbm/dbm.c.glibc 2007-05-17 17:15:07.000000000 +0200 +++ db-4.6.18/dbm/dbm.c 2007-08-06 15:26:11.000000000 +0200 @@ -230,7 +230,7 @@ __db_ndbm_open(file, oflags, mode) if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 || (ret = dbp->set_h_ffactor(dbp, 40)) != 0 || (ret = dbp->set_h_nelem(dbp, 1)) != 0 || - (ret = dbp->open(dbp, NULL, + (ret = (dbp->open)(dbp, NULL, path, NULL, DB_HASH, __db_oflags(oflags), mode)) != 0) { __os_set_errno(ret); return (NULL); --- db-4.6.18/db_hotbackup/db_hotbackup.c.glibc 2007-05-17 17:15:01.000000000 +0200 +++ db-4.6.18/db_hotbackup/db_hotbackup.c 2007-08-06 15:26:11.000000000 +0200 @@ -418,9 +418,9 @@ env_init(dbenvp, home, log_dirp, data_di * We try to attach to a pre-existing environment; if that * fails, we create a private environment and try again. */ - if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && + if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && (ret == DB_VERSION_MISMATCH || - (ret = dbenv->open(dbenv, home, DB_CREATE | + (ret = (dbenv->open)(dbenv, home, DB_CREATE | DB_INIT_LOG | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open: %s", home); @@ -445,7 +445,7 @@ env_init(dbenvp, home, log_dirp, data_di ret, "DB_ENV->set_cachesize: %s", home); return (1); } - if ((ret = dbenv->open(dbenv, home, DB_CREATE | + if ((ret = (dbenv->open)(dbenv, home, DB_CREATE | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_PRIVATE | DB_RECOVER_FATAL | DB_USE_ENVIRON, 0)) != 0) { dbenv->err(dbenv, ret, "DB_ENV->open: %s", home); --- db-4.6.18/db_checkpoint/db_checkpoint.c.glibc 2007-05-17 17:14:58.000000000 +0200 +++ db-4.6.18/db_checkpoint/db_checkpoint.c 2007-08-06 15:26:11.000000000 +0200 @@ -141,9 +141,9 @@ main(argc, argv) * If attaching to a pre-existing environment fails, create a * private one and try again. */ - if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && + if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && (!once || ret == DB_VERSION_MISMATCH || - (ret = dbenv->open(dbenv, home, + (ret = (dbenv->open)(dbenv, home, DB_CREATE | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open"); goto shutdown; --- db-4.6.18/db_deadlock/db_deadlock.c.glibc 2007-05-17 19:17:42.000000000 +0200 +++ db-4.6.18/db_deadlock/db_deadlock.c 2007-08-06 15:26:11.000000000 +0200 @@ -157,7 +157,7 @@ main(argc, argv) } /* An environment is required. */ - if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0) { + if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0) { dbenv->err(dbenv, ret, "open"); goto shutdown; } --- db-4.6.18/libdb_java/db_java_wrap.c.glibc 2007-06-28 16:23:38.000000000 +0200 +++ db-4.6.18/libdb_java/db_java_wrap.c 2007-08-06 15:59:38.000000000 +0200 @@ -2501,7 +2501,7 @@ SWIGINTERN db_ret_t Db_key_range(struct return self->key_range(self, txnid, key, key_range, flags); } SWIGINTERN db_ret_t Db_open(struct Db *self,DB_TXN *txnid,char const *file,char const *database,DBTYPE type,u_int32_t flags,int mode){ - return self->open(self, txnid, file, database, + return (self->open)(self, txnid, file, database, type, flags, mode); } SWIGINTERN int Db_pget(struct Db *self,DB_TXN *txnid,DBT *key,DBT *pkey,DBT *data,u_int32_t flags){ @@ -2723,7 +2723,7 @@ SWIGINTERN db_ret_t DbEnv_lsn_reset(stru return self->lsn_reset(self, file, flags); } SWIGINTERN db_ret_t DbEnv_open(struct DbEnv *self,char const *db_home,u_int32_t flags,int mode){ - return self->open(self, db_home, flags, mode); + return (self->open)(self, db_home, flags, mode); } SWIGINTERN db_ret_t DbEnv_remove(struct DbEnv *self,char const *db_home,u_int32_t flags){ return self->remove(self, db_home, flags); @@ -3278,7 +3278,7 @@ SWIGINTERN db_ret_t DbSequence_initial_v return self->initial_value(self, val); } SWIGINTERN db_ret_t DbSequence_open(struct DbSequence *self,DB_TXN *txnid,DBT *key,u_int32_t flags){ - return self->open(self, txnid, key, flags); + return (self->open)(self, txnid, key, flags); } SWIGINTERN db_ret_t DbSequence_remove(struct DbSequence *self,DB_TXN *txnid,u_int32_t flags){ return self->remove(self, txnid, flags); --- db-4.6.18/rpc_server/cxx/db_server_cxxproc.cpp.glibc 2007-06-28 16:01:21.000000000 +0200 +++ db-4.6.18/rpc_server/cxx/db_server_cxxproc.cpp 2007-08-06 16:36:12.000000000 +0200 @@ -336,7 +336,7 @@ __env_open_proc( replyp->envcl_id = new_ctp->ct_id; ret = __env_close_int(dbenvcl_id, 0, 0); } else { - ret = dbenv->open(fullhome->home, newflags, mode); + ret = (dbenv->open)(fullhome->home, newflags, mode); dbenv_ctp->ct_envdp.home = fullhome; dbenv_ctp->ct_envdp.envflags = shareflags; } @@ -1187,7 +1187,7 @@ __db_open_proc( ret = __db_close_int(dbpcl_id, 0); goto out; } - ret = dbp->open(txnp, name, subdb, (DBTYPE)type, flags, mode); + ret = (dbp->open)(txnp, name, subdb, (DBTYPE)type, flags, mode); if (ret == 0) { (void)dbp->get_type(&dbtype); replyp->type = dbtype; --- db-4.6.18/rpc_server/cxx/db_server_cxxutil.cpp.glibc 2007-05-17 17:15:52.000000000 +0200 +++ db-4.6.18/rpc_server/cxx/db_server_cxxutil.cpp 2007-08-06 16:36:26.000000000 +0200 @@ -730,7 +730,7 @@ env_recover(char *progname) printf("Running recovery on %s\n", hp->home); flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER; - if ((ret = dbenv->open(hp->home, flags, 0)) != 0) { + if ((ret = (dbenv->open)(hp->home, flags, 0)) != 0) { dbenv->err(ret, "DbEnv->open"); goto error; } --- db-4.6.18/rpc_server/c/db_server_util.c.glibc 2007-05-17 17:15:52.000000000 +0200 +++ db-4.6.18/rpc_server/c/db_server_util.c 2007-08-06 16:35:47.000000000 +0200 @@ -802,7 +802,7 @@ env_recover(progname) printf("Running recovery on %s\n", hp->home); flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER; - if ((ret = dbenv->open(dbenv, hp->home, flags, 0)) != 0) { + if ((ret = (dbenv->open)(dbenv, hp->home, flags, 0)) != 0) { dbenv->err(dbenv, ret, "DB_ENV->open"); goto error; } --- db-4.6.18/rpc_server/c/db_server_proc.c.glibc 2007-06-28 15:59:24.000000000 +0200 +++ db-4.6.18/rpc_server/c/db_server_proc.c 2007-08-06 16:35:28.000000000 +0200 @@ -394,7 +394,7 @@ __env_open_proc(dbenvcl_id, home, flags, replyp->envcl_id = new_ctp->ct_id; ret = __env_close_int(dbenvcl_id, 0, 0); } else { - ret = dbenv->open(dbenv, fullhome->home, newflags, mode); + ret = (dbenv->open)(dbenv, fullhome->home, newflags, mode); dbenv_ctp->ct_envdp.home = fullhome; dbenv_ctp->ct_envdp.envflags = shareflags; } @@ -1392,7 +1392,7 @@ __db_open_proc(dbpcl_id, txnpcl_id, name ret = __db_close_int(dbpcl_id, 0); goto out; } - ret = dbp->open(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode); + ret = (dbp->open)(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode); if (ret == 0) { (void)dbp->get_type(dbp, &dbtype); replyp->type = dbtype; --- db-4.6.18/db_dump/db_dump.c.glibc 2007-05-17 17:14:59.000000000 +0200 +++ db-4.6.18/db_dump/db_dump.c 2007-08-06 15:26:11.000000000 +0200 @@ -199,7 +199,7 @@ retry: if ((ret = db_env_create(&dbenv, goto done; } - if ((ret = dbp->open(dbp, NULL, + if ((ret = (dbp->open)(dbp, NULL, argv[0], subname, DB_UNKNOWN, DB_RDONLY, 0)) != 0) { dbp->err(dbp, ret, "open: %s", argv[0]); goto err; @@ -296,7 +296,7 @@ db_init(dbenv, home, is_salvage, cache, * before we create our own. */ *is_privatep = 0; - if ((ret = dbenv->open(dbenv, home, + if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON | (is_salvage ? DB_INIT_MPOOL : 0), 0)) == 0) return (0); if (ret == DB_VERSION_MISMATCH) @@ -314,7 +314,7 @@ db_init(dbenv, home, is_salvage, cache, */ *is_privatep = 1; if ((ret = dbenv->set_cachesize(dbenv, 0, cache, 1)) == 0 && - (ret = dbenv->open(dbenv, home, + (ret = (dbenv->open)(dbenv, home, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) == 0) return (0); @@ -367,7 +367,7 @@ dump_sub(dbenv, parent_dbp, parent_name, free(subdb); return (1); } - if ((ret = dbp->open(dbp, NULL, + if ((ret = (dbp->open)(dbp, NULL, parent_name, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0) dbp->err(dbp, ret, "DB->open: %s:%s", parent_name, subdb); --- db-4.6.18/db_codegen/code_capi.c.glibc 2007-06-05 16:06:25.000000000 +0200 +++ db-4.6.18/db_codegen/code_capi.c 2007-08-06 15:26:11.000000000 +0200 @@ -368,7 +368,7 @@ static int\nbdb_env_startup(env_list_t * \tif (ep->transaction)\n\ \t open_flags |= DB_INIT_LOCK |\n\ \t DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER;\n\ -\tif ((ret = dbenv->open(dbenv, ep->home, open_flags, 0)) != 0) {\n\ +\tif ((ret = (dbenv->open)(dbenv, ep->home, open_flags, 0)) != 0) {\n\ \t dbenv->err(dbenv, ret, \"DB_ENV->open: %%s\", ep->home);\n\ \t goto err;\n\ \t}\n\ @@ -487,7 +487,7 @@ api_c_db() fprintf(of, "\ \n\ -\tif ((ret = dbp->open(dbp, NULL, dp->name, NULL, dp->type,\n\ +\tif ((ret = (dbp->open)(dbp, NULL, dp->name, NULL, dp->type,\n\ \t (dp->transaction ? DB_AUTO_COMMIT : 0) |\n\ \t DB_CREATE | DB_THREAD, 0)) != 0) {\n\ \t\tdbp->err(dbp, ret, \"DB->open: %%s\", dp->name);\n\ --- db-4.6.18/db_upgrade/db_upgrade.c.glibc 2007-05-17 17:15:04.000000000 +0200 +++ db-4.6.18/db_upgrade/db_upgrade.c 2007-08-06 15:26:11.000000000 +0200 @@ -119,9 +119,9 @@ main(argc, argv) * If attaching to a pre-existing environment fails, create a * private one and try again. */ - if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && + if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && (ret == DB_VERSION_MISMATCH || - (ret = dbenv->open(dbenv, home, + (ret = (dbenv->open)(dbenv, home, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open"); --- db-4.6.18/db_archive/db_archive.c.glibc 2007-05-17 17:14:58.000000000 +0200 +++ db-4.6.18/db_archive/db_archive.c 2007-08-06 15:26:11.000000000 +0200 @@ -119,9 +119,9 @@ main(argc, argv) * If attaching to a pre-existing environment fails, create a * private one and try again. */ - if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && + if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && (ret == DB_VERSION_MISMATCH || - (ret = dbenv->open(dbenv, home, DB_CREATE | + (ret = (dbenv->open)(dbenv, home, DB_CREATE | DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open"); goto shutdown; --- db-4.6.18/db_printlog/db_printlog.c.glibc 2007-06-01 17:36:50.000000000 +0200 +++ db-4.6.18/db_printlog/db_printlog.c 2007-08-06 15:26:11.000000000 +0200 @@ -173,18 +173,18 @@ main(argc, argv) * with logging, because we don't want to log the opens. */ if (repflag) { - if ((ret = dbenv->open(dbenv, home, + if ((ret = (dbenv->open)(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0 && (ret == DB_VERSION_MISMATCH || - (ret = dbenv->open(dbenv, home, + (ret = (dbenv->open)(dbenv, home, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open"); goto shutdown; } - } else if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && + } else if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && (ret == DB_VERSION_MISMATCH || - (ret = dbenv->open(dbenv, home, + (ret = (dbenv->open)(dbenv, home, DB_CREATE | DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open"); goto shutdown; @@ -544,7 +544,7 @@ open_rep_db(dbenv, dbpp, dbcp) dbp = *dbpp; if ((ret = - dbp->open(dbp, NULL, REPDBNAME, NULL, DB_BTREE, 0, 0)) != 0) { + (dbp->open)(dbp, NULL, REPDBNAME, NULL, DB_BTREE, 0, 0)) != 0) { dbenv->err(dbenv, ret, "DB->open"); goto err; } --- db-4.6.18/hsearch/hsearch.c.glibc 2007-05-17 17:15:39.000000000 +0200 +++ db-4.6.18/hsearch/hsearch.c 2007-08-06 15:26:11.000000000 +0200 @@ -75,7 +75,7 @@ __db_hcreate(nel) if ((ret = dbp->set_pagesize(dbp, 512)) != 0 || (ret = dbp->set_h_ffactor(dbp, 16)) != 0 || (ret = dbp->set_h_nelem(dbp, (u_int32_t)nel)) != 0 || - (ret = dbp->open(dbp, NULL, + (ret = (dbp->open)(dbp, NULL, NULL, NULL, DB_HASH, DB_CREATE, __db_omode(OWNER_RW))) != 0) __os_set_errno(ret); --- db-4.6.18/db_recover/db_recover.c.glibc 2007-05-17 17:15:03.000000000 +0200 +++ db-4.6.18/db_recover/db_recover.c 2007-08-06 15:26:11.000000000 +0200 @@ -138,7 +138,7 @@ main(argc, argv) DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON); LF_SET(fatal_recover ? DB_RECOVER_FATAL : DB_RECOVER); LF_SET(retain_env ? DB_INIT_LOCK : DB_PRIVATE); - if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0) { + if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0) { dbenv->err(dbenv, ret, "DB_ENV->open"); goto shutdown; } --- db-4.6.18/db185/db185.c.glibc 2007-05-17 17:14:57.000000000 +0200 +++ db-4.6.18/db185/db185.c 2007-08-06 15:37:39.000000000 +0200 @@ -227,7 +227,7 @@ __db185_open(file, oflags, mode, type, o dbp->api_internal = db185p; /* Open the database. */ - if ((ret = dbp->open(dbp, NULL, + if ((ret = (dbp->open)(dbp, NULL, file, NULL, type, __db_oflags(oflags), mode)) != 0) goto err; --- db-4.6.18/db_stat/db_stat.c.glibc 2007-07-06 17:43:57.000000000 +0200 +++ db-4.6.18/db_stat/db_stat.c 2007-08-06 15:26:11.000000000 +0200 @@ -282,9 +282,9 @@ retry: if ((ret = db_env_create(&dbenv, * hash databases for which we don't know the hash function). */ dbenv->set_errfile(dbenv, NULL); - ret = dbp->open(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0); + ret = (dbp->open)(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0); dbenv->set_errfile(dbenv, stderr); - if (ret != 0 && (ret = dbp->open( + if (ret != 0 && (ret = (dbp->open)( dbp, NULL, db, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0) { dbenv->err(dbenv, ret, "DB->open: %s", db); goto err; @@ -392,7 +392,7 @@ db_init(dbenv, home, ttype, cache, is_pr * error, I think. */ *is_private = 0; - if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) == 0) + if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) == 0) return (0); if (ret == DB_VERSION_MISMATCH) goto err; @@ -422,7 +422,7 @@ db_init(dbenv, home, ttype, cache, is_pr oflags |= DB_INIT_MPOOL; if (ttype == T_LOG) oflags |= DB_INIT_LOG; - if ((ret = dbenv->open(dbenv, home, oflags, 0)) == 0) + if ((ret = (dbenv->open)(dbenv, home, oflags, 0)) == 0) return (0); /* An environment is required. */ --- db-4.6.18/db_verify/db_verify.c.glibc 2007-05-17 17:15:05.000000000 +0200 +++ db-4.6.18/db_verify/db_verify.c 2007-08-06 15:26:11.000000000 +0200 @@ -129,7 +129,7 @@ retry: if ((ret = db_env_create(&dbenv, */ private = 0; if ((ret = - dbenv->open(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) { + (dbenv->open)(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) { if (ret != DB_VERSION_MISMATCH) { if ((ret = dbenv->set_cachesize(dbenv, 0, cache, 1)) != 0) { @@ -137,7 +137,7 @@ retry: if ((ret = db_env_create(&dbenv, goto shutdown; } private = 1; - ret = dbenv->open(dbenv, home, DB_CREATE | + ret = (dbenv->open)(dbenv, home, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0); } if (ret != 0) { @@ -186,7 +186,7 @@ retry: if ((ret = db_env_create(&dbenv, goto shutdown; } - ret = dbp1->open(dbp1, + ret = (dbp1->open)(dbp1, NULL, argv[0], NULL, DB_UNKNOWN, DB_RDONLY, 0); /* --- db-4.6.18/db_load/db_load.c.glibc 2007-05-17 19:17:42.000000000 +0200 +++ db-4.6.18/db_load/db_load.c 2007-08-06 15:26:11.000000000 +0200 @@ -394,7 +394,7 @@ retry_db: #endif /* Open the DB file. */ - if ((ret = dbp->open(dbp, NULL, name, subdb, dbtype, + if ((ret = (dbp->open)(dbp, NULL, name, subdb, dbtype, DB_CREATE | (TXN_ON(dbenv) ? DB_AUTO_COMMIT : 0), __db_omode("rw-rw-rw-"))) != 0) { dbp->err(dbp, ret, "DB->open: %s", name); @@ -608,7 +608,7 @@ db_init(dbenv, home, cache, is_private) /* We may be loading into a live environment. Try and join. */ flags = DB_USE_ENVIRON | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN; - if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0) + if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0) return (0); if (ret == DB_VERSION_MISMATCH) goto err; @@ -632,7 +632,7 @@ db_init(dbenv, home, cache, is_private) dbenv->err(dbenv, ret, "set_cachesize"); return (1); } - if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0) + if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0) return (0); /* An environment is required. */ --- db-4.6.18/xa/xa_db.c.glibc 2007-05-17 17:16:00.000000000 +0200 +++ db-4.6.18/xa/xa_db.c 2007-08-06 15:49:57.000000000 +0200 @@ -131,7 +131,7 @@ __xa_open(dbp, txn, name, subdb, type, f if ((ret = __xa_set_txn(dbp, &txn, LF_ISSET(DB_AUTO_COMMIT) ? 1 : 0)) != 0) return (ret); - if ((ret = xam->open(dbp, txn, name, subdb, type, flags, mode)) != 0) + if ((ret = (xam->open)(dbp, txn, name, subdb, type, flags, mode)) != 0) return (ret); /* Wrap any DB handle method that takes a TXN ID as an argument. */ --- db-4.6.18/xa/xa.c.glibc 2007-06-29 02:25:02.000000000 +0200 +++ db-4.6.18/xa/xa.c 2007-08-06 15:43:44.000000000 +0200 @@ -206,7 +206,7 @@ __db_xa_open(xa_info, rmid, arg_flags) /* Open a new environment. */ if (db_env_create(&dbenv, 0) != 0) return (XAER_RMERR); - if (dbenv->open(dbenv, xa_info, XA_FLAGS, 0) != 0) + if ((dbenv->open)(dbenv, xa_info, XA_FLAGS, 0) != 0) goto err; /* Create the mapping. */ --- NEW FILE fail-setfscreatecon.c --- int setfscreatecon(void) { return -1; } nss_db-2.2-glibc.patch: --- NEW FILE nss_db-2.2-glibc.patch --- Avoid macro expansion if open() is a macro. diff -up nss_db-2.2/db-compat.c nss_db-2.2/db-compat.c --- nss_db-2.2/db-compat.c 2007-08-14 10:05:07.000000000 -0400 +++ nss_db-2.2/db-compat.c 2007-08-14 10:05:09.000000000 -0400 @@ -39,7 +39,7 @@ db_open (const char *file, DBTYPE type, if (err) return err; - err = db->open (db, NULL, file, NULL, type, flags, mode); + err = (db->open) (db, NULL, file, NULL, type, flags, mode); if (err) { db->close (db, 0); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nss_db/F-7/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Feb 2007 21:09:40 -0000 1.6 +++ .cvsignore 3 Mar 2008 23:00:16 -0000 1.7 @@ -1,5 +1,2 @@ -db-4.0.14.tar.gz nss_db-2.2.tar.gz -db-4.3.27.tar.gz -db-4.3.28.tar.gz -db-4.5.20.tar.gz +db-4.6.18.tar.gz nss_db-2.2-selinux.patch: Index: nss_db-2.2-selinux.patch =================================================================== RCS file: /cvs/pkgs/rpms/nss_db/F-7/nss_db-2.2-selinux.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nss_db-2.2-selinux.patch 28 Feb 2005 18:25:36 -0000 1.3 +++ nss_db-2.2-selinux.patch 3 Mar 2008 23:00:16 -0000 1.4 @@ -102,7 +102,7 @@ if (status) error (EXIT_FAILURE, 0, gettext ("cannot open output file `%s': %s"), output_name, db_strerror (status)); -@@ -388,3 +400,44 @@ +@@ -388,3 +400,55 @@ return EXIT_SUCCESS; } @@ -112,7 +112,7 @@ +static void +set_file_creation_context (const char *outname, mode_t mode) +{ -+ static int enabled = -1; ++ static int enabled = -1, enforcing = -1; + security_context_t ctx; + /* Handle the "reset the context" case. */ + if (outname == NULL) @@ -129,19 +129,30 @@ + { + return; + } -+ /* Determine the context which the file should have. */ -+ ctx = NULL; -+ if (matchpathcon (outname, S_IFREG | mode, &ctx) != 0) ++ /* Check if SELinux is enforcing, and remember. */ ++ if (enforcing == -1) + { -+ error (EXIT_FAILURE, 0, -+ gettext ("cannot determine file context for `%s'"), outname); ++ enforcing = security_getenforce(); + } -+ if (ctx != NULL) ++ /* Determine the context which the file should have. */ ++ ctx = NULL; ++ if ((matchpathcon (outname, S_IFREG | mode, &ctx) == 0) && ++ (ctx != NULL)) + { + if (setfscreatecon (ctx) != 0) + { -+ error (EXIT_FAILURE, 0, -+ gettext ("cannot set file creation context for `%s'"), outname); ++ if (enforcing) ++ { ++ error (EXIT_FAILURE, 0, ++ gettext ("cannot set file creation context for `%s'"), ++ outname); ++ } ++ else ++ { ++ error (0, 0, ++ gettext ("cannot set file creation context for `%s'"), ++ outname); ++ } + } + freecon (ctx); + } Index: nss_db.spec =================================================================== RCS file: /cvs/pkgs/rpms/nss_db/F-7/nss_db.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- nss_db.spec 26 Feb 2007 19:30:28 -0000 1.34 +++ nss_db.spec 3 Mar 2008 23:00:16 -0000 1.35 @@ -1,11 +1,12 @@ -%define db_version 4.5.20 +%define db_version 4.6.18 Summary: An NSS library for the Berkeley DB Name: nss_db Version: 2.2 -Release: 36 +Release: 40%{?dist} Source: ftp://sources.redhat.com/pub/glibc/releases/nss_db-%{version}.tar.gz -Source1: http://www.sleepycat.com/update/%{db_version}/db-%{db_version}.tar.gz +Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz Source2: db-getent-Makefile +Source3: fail-setfscreatecon.c URL: http://sources.redhat.com/glibc/ Patch0: nss_db-2.2-external.patch Patch1: nss_db-2.2-automake.patch @@ -16,7 +17,11 @@ Patch7: nss_db-2.2-initialize.patch Patch8: nss_db-2.2-order.patch Patch9: nss_db-2.2-lib64.patch -License: GPL +Patch10: nss_db-2.2-glibc.patch +Patch100: db-4.6.18-glibc.patch +# DB is under the Sleepycat (Oracle) license. +# nss_db is under the LGPLv2+ license. +License: Sleepycat,LGPLv2+ Group: System Environment/Libraries BuildRequires: autoconf, automake15, ed, libtool, libselinux-devel Conflicts: glibc < 2.2 @@ -46,9 +51,14 @@ %patch7 -p1 -b .initialize %patch8 -p1 -b .order %patch9 -p1 -b .lib64 +%patch10 -p1 -b .glibc rm -f config.guess config.sub ltmain.sh autoreconf -i +pushd db-%{db_version} +%patch100 -p1 -b .glibc +popd + mkdir db-build %build @@ -106,6 +116,24 @@ %config(noreplace) /var/db/Makefile %changelog +* Mon Mar 3 2008 Nalin Dahyabhai - 2.2-40%{?dist} +- add a dist tag to make pushing this same package as an update easier + +* Tue Feb 19 2008 Fedora Release Engineering - 2.2-40 +- Autorebuild for GCC 4.3 + +* Tue Nov 6 2007 Nalin Dahyabhai - 2.2-39 +- when setting file contexts for creation of new files, only fail outright + if we were in enforcing mode and the file needed to be given a specific + label (#368501) + +* Tue Aug 14 2007 Nalin Dahyabhai - 2.2-38 +- adapt to open-is-a-macro cases + +* Mon Aug 13 2007 Nalin Dahyabhai - 2.2-37 +- update to use DB 4.6.18, swiping needed patches from the db4 package +- clarify license tag + * Mon Feb 19 2007 Nalin Dahyabhai - 2.2-36 - update to use DB 4.5.20 - make our obsoletion of nss_db-compat a versioned one Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nss_db/F-7/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Feb 2007 19:30:28 -0000 1.6 +++ sources 3 Mar 2008 23:00:16 -0000 1.7 @@ -1,2 +1,2 @@ c2565cbd4a941ba70e41391693c3252d nss_db-2.2.tar.gz -b0f1c777708cb8e9d37fb47e7ed3312d db-4.5.20.tar.gz +95768bd92fd48951a427fbab37b9088f db-4.6.18.tar.gz --- nss_db-2.2-compat.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 3 23:18:24 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Mon, 3 Mar 2008 23:18:24 GMT Subject: rpms/rhythmbox/devel rb-activate-generic-players-from-uri.patch, NONE, 1.1 rhythmbox.spec, 1.171, 1.172 Message-ID: <200803032318.m23NIObh016270@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/rhythmbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16176 Modified Files: rhythmbox.spec Added Files: rb-activate-generic-players-from-uri.patch Log Message: * Mon Mar 03 2008 - Bastien Nocera - 0.11.4-10 - Add a patch to fix activating audio players with a directory instead of a device path (GNOME bug #519737) rb-activate-generic-players-from-uri.patch: --- NEW FILE rb-activate-generic-players-from-uri.patch --- Index: sources/rb-removable-media-source.c =================================================================== --- sources/rb-removable-media-source.c (revision 5601) +++ sources/rb-removable-media-source.c (working copy) @@ -62,6 +62,8 @@ static void impl_paste (RBSource *source, GList *entries); #endif static gboolean impl_receive_drag (RBSource *asource, GtkSelectionData *data); +static guint impl_want_uri (RBSource *source, const char *uri); +static gboolean impl_uri_is_source (RBSource *source, const char *uri); typedef struct { @@ -102,6 +104,8 @@ source_class->impl_delete = NULL; source_class->impl_get_config_widget = NULL; source_class->impl_show_popup = (RBSourceFeatureFunc) rb_false_function; + source_class->impl_want_uri = impl_want_uri; + source_class->impl_uri_is_source = impl_uri_is_source; browser_source_class->impl_get_paned_key = NULL; browser_source_class->impl_has_drop_support = (RBBrowserSourceFeatureFunc) rb_false_function; @@ -367,6 +371,50 @@ #endif +static guint +impl_want_uri (RBSource *source, const char *uri) +{ + GnomeVFSVolume *volume; + char *activation_uri; + int retval, len; + + retval = 0; + + /* A default version for use with the audio players + * that use mass storage */ + if (g_str_has_prefix (uri, "file://") == FALSE) + return 0; + + g_object_get (G_OBJECT (source), + "volume", &volume, + NULL); + if (volume == NULL) + return 0; + + activation_uri = gnome_vfs_volume_get_activation_uri (volume); + if (activation_uri == NULL) + return 0; + + len = strlen (uri); + if (uri[len - 1] == '/') { + if (strncmp (uri, activation_uri, len - 1) == 0) + retval = 100; + } else if (strcmp (uri, activation_uri) == 0) + retval = 100; + + g_free (activation_uri); + + return retval; +} + +static gboolean +impl_uri_is_source (RBSource *source, const char *uri) +{ + if (impl_want_uri (source, uri) == 100) + return TRUE; + return FALSE; +} + static RhythmDB * get_db_for_source (RBSource *source) { Index: shell/rb-shell.c =================================================================== --- shell/rb-shell.c (revision 5601) +++ shell/rb-shell.c (working copy) @@ -3327,6 +3327,14 @@ uri, error)) return FALSE; } + } else if (result == TOTEM_PL_PARSER_RESULT_IGNORED && rb_uri_is_local (uri)) { + /* That happens for directories */ + playlist_source = rb_shell_guess_source_for_uri (shell, uri); + if (playlist_source == NULL || rb_source_want_uri (playlist_source, uri) < 100) { + rb_debug ("%s is a directory, but doesn't have a source, adding as a dir", uri); + if (!rb_shell_add_uri (shell, uri, NULL, NULL, error)) + return FALSE; + } } else { rb_debug ("%s didn't parse as a playlist", uri); if (!rb_shell_add_uri (shell, uri, NULL, NULL, error)) Index: rhythmbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- rhythmbox.spec 19 Feb 2008 03:39:57 -0000 1.171 +++ rhythmbox.spec 3 Mar 2008 23:17:47 -0000 1.172 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.11.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Multimedia URL: http://www.gnome.org/projects/rhythmbox/ @@ -49,7 +49,8 @@ # For the libsoup 2.4 patch BuildRequires: intltool autoconf automake17 libtool gettext check-devel -ExcludeArch: s390 s390x +# Added ppc and ppc64 for https://bugzilla.redhat.com/show_bug.cgi?id=435771 +ExcludeArch: s390 s390x ppc ppc64 # https://bugzilla.redhat.com/show_bug.cgi?id=428034 Patch0: rb-disable-power-plugin-by-default.patch @@ -64,6 +65,9 @@ Patch5: rb-automake-warning.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=519737 +Patch6: rb-activate-generic-players-from-uri.patch + %description Rhythmbox is an integrated music management application based on the powerful GStreamer media framework. It has a number of features, including an easy to @@ -97,6 +101,7 @@ %patch3 -p1 -b .soup24 %patch4 -p0 -b .gsd %patch5 -p0 -b .automake +%patch6 -p0 -b .player-activate %build autoconf @@ -214,6 +219,10 @@ %{_libdir}/rhythmbox/plugins/upnp_coherence %changelog +* Mon Mar 03 2008 - Bastien Nocera - 0.11.4-10 +- Add a patch to fix activating audio players with a directory instead + of a device path (GNOME bug #519737) + * Mon Feb 18 2008 Matthias Clasen - 0.11.4-9 - Fix the media player patch to work From fedora-extras-commits at redhat.com Mon Mar 3 23:30:18 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Mon, 3 Mar 2008 23:30:18 GMT Subject: rpms/kernel/F-8 linux-2.6-isdn-hisax-fix-request_irq-oops.patch, NONE, 1.1 kernel.spec, 1.361, 1.362 Message-ID: <200803032330.m23NUImI017199@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17135 Modified Files: kernel.spec Added Files: linux-2.6-isdn-hisax-fix-request_irq-oops.patch Log Message: * Mon Mar 03 2008 Chuck Ebbert 2.6.24.3-16 - ISDN: don't oops on driver load (#362621) linux-2.6-isdn-hisax-fix-request_irq-oops.patch: --- NEW FILE linux-2.6-isdn-hisax-fix-request_irq-oops.patch --- After a quick glance at the code, we're getting the DEBUG_SHIRQ spurious interrupt before we have the adapter template filled in. Real interrupts appear to be turned on by fcpci*_init(), so move request_irq until just before that. Signed-off-by: Kyle McMartin --- diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c index 7993e01..76043de 100644 --- a/drivers/isdn/hisax/hisax_fcpcipnp.c +++ b/drivers/isdn/hisax/hisax_fcpcipnp.c @@ -725,23 +725,6 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter) switch (adapter->type) { case AVM_FRITZ_PCIV2: - retval = request_irq(adapter->irq, fcpci2_irq, IRQF_SHARED, - "fcpcipnp", adapter); - break; - case AVM_FRITZ_PCI: - retval = request_irq(adapter->irq, fcpci_irq, IRQF_SHARED, - "fcpcipnp", adapter); - break; - case AVM_FRITZ_PNP: - retval = request_irq(adapter->irq, fcpci_irq, 0, - "fcpcipnp", adapter); - break; - } - if (retval) - goto err_region; - - switch (adapter->type) { - case AVM_FRITZ_PCIV2: case AVM_FRITZ_PCI: val = inl(adapter->io); break; @@ -796,6 +779,23 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter) switch (adapter->type) { case AVM_FRITZ_PCIV2: + retval = request_irq(adapter->irq, fcpci2_irq, IRQF_SHARED, + "fcpcipnp", adapter); + break; + case AVM_FRITZ_PCI: + retval = request_irq(adapter->irq, fcpci_irq, IRQF_SHARED, + "fcpcipnp", adapter); + break; + case AVM_FRITZ_PNP: + retval = request_irq(adapter->irq, fcpci_irq, 0, + "fcpcipnp", adapter); + break; + } + if (retval) + goto err_region; + + switch (adapter->type) { + case AVM_FRITZ_PCIV2: fcpci2_init(adapter); isacsx_setup(&adapter->isac); break; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- kernel.spec 3 Mar 2008 22:36:06 -0000 1.361 +++ kernel.spec 3 Mar 2008 23:29:42 -0000 1.362 @@ -679,6 +679,7 @@ Patch1103: linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch Patch1308: linux-2.6-usb-ehci-hcd-respect-nousb.patch +Patch1320: linux-2.6-isdn-hisax-fix-request_irq-oops.patch Patch1400: linux-2.6-smarter-relatime.patch Patch1504: linux-2.6-xfs-optimize-away-realtime-tests.patch @@ -1280,6 +1281,10 @@ # some usb disks spin down automatically and need allow_restart ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch +# ISDN +# fix request_irq oops +ApplyPatch linux-2.6-isdn-hisax-fix-request_irq-oops.patch + # implement smarter atime updates support. ApplyPatch linux-2.6-smarter-relatime.patch @@ -1913,6 +1918,9 @@ %changelog +* Mon Mar 03 2008 Chuck Ebbert 2.6.24.3-16 +- ISDN: don't oops on driver load (#362621) + * Mon Mar 03 2008 John W. Linville 2.6.24.3-15 - ssb: Add CHIPCO IRQ access functions - p54: print unknown eeprom fields From fedora-extras-commits at redhat.com Mon Mar 3 23:38:49 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 3 Mar 2008 23:38:49 GMT Subject: rpms/xorg-x11-drv-voodoo/devel commitid, NONE, 1.1 make-git-snapshot.sh, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-voodoo.spec, 1.18, 1.19 Message-ID: <200803032338.m23NcnIF017850@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17770/devel Modified Files: .cvsignore sources xorg-x11-drv-voodoo.spec Added Files: commitid make-git-snapshot.sh Log Message: git snapshot --- NEW FILE commitid --- 2a2703732fb045f2f87d80eb56c8d9c1a58031f2 --- NEW FILE make-git-snapshot.sh --- #!/bin/sh DIRNAME=xf86-video-voodoo-$( date +%Y%m%d ) rm -rf $DIRNAME git clone git://git.freedesktop.org/git/xorg/driver/xf86-video-voodoo $DIRNAME cd $DIRNAME if [ -z "$1" ]; then git log | head -1 else git checkout $1 fi git log | head -1 | awk '{ print $2 }' > ../commitid git repack -a -d cd .. tar jcf $DIRNAME.tar.bz2 $DIRNAME rm -rf $DIRNAME Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 24 Sep 2007 21:46:54 -0000 1.8 +++ .cvsignore 3 Mar 2008 23:38:00 -0000 1.9 @@ -1 +1 @@ -xf86-video-voodoo-1.1.1.tar.bz2 +xf86-video-voodoo-20080303.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Sep 2007 21:46:54 -0000 1.8 +++ sources 3 Mar 2008 23:38:00 -0000 1.9 @@ -1 +1 @@ -bc878e795688b49a595b355482d27174 xf86-video-voodoo-1.1.1.tar.bz2 +b8ed6a70ff0eb4fece0f76b89025bced xf86-video-voodoo-20080303.tar.bz2 Index: xorg-x11-drv-voodoo.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/xorg-x11-drv-voodoo.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xorg-x11-drv-voodoo.spec 20 Feb 2008 08:01:43 -0000 1.18 +++ xorg-x11-drv-voodoo.spec 3 Mar 2008 23:38:00 -0000 1.19 @@ -1,33 +1,39 @@ %define tarball xf86-video-voodoo %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers +%define gitdate 20080303 Summary: Xorg X11 voodoo video driver Name: xorg-x11-drv-voodoo Version: 1.1.1 -Release: 2%{?dist} +Release: 3.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 -Source1: voodoo.xinf +#Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +Source0: xf86-video-voodoo-%{gitdate}.tar.bz2 +Source1: voodoo.xinf +Source2: make-git-snapshot.sh +Source3: commitid ExcludeArch: s390 s390x -BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6 +BuildRequires: autoconf automake libtool +BuildRequires: xorg-x11-server-sdk >= 1.4.99.1 Requires: hwdata -Requires: xorg-x11-server-Xorg >= 1.3.0.0-6 +Requires: xorg-x11-server-Xorg >= 1.4.99.1 %description X.Org X11 voodoo video driver. %prep -%setup -q -n %{tarball}-%{version} +%setup -q -n %{tarball}-%{gitdate} %build +autoreconf -v --install || exit 1 %configure --disable-static make @@ -53,6 +59,9 @@ %{_mandir}/man4/voodoo.4* %changelog +* Mon Mar 03 2008 Adam Jackson 1.1.1-3.20080303 +- git snapshot for pciaccess conversion + * Wed Feb 20 2008 Fedora Release Engineering - 1.1.1-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 00:00:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 00:00:05 GMT Subject: rpms/subversion/devel subversion.spec,1.109,1.110 Message-ID: <200803040000.m24005Tl019338@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/subversion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19271 Modified Files: subversion.spec Log Message: disable broken tests Index: subversion.spec =================================================================== RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- subversion.spec 3 Mar 2008 20:40:14 -0000 1.109 +++ subversion.spec 3 Mar 2008 23:59:22 -0000 1.110 @@ -1,5 +1,5 @@ # set to zero to avoid running test suite -%define make_check 1 +%define make_check 0 %define with_java 1 @@ -15,7 +15,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.4.6 -Release: 6 +Release: 7 License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -278,6 +278,9 @@ %endif %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 1.4.6-7 +- tests are randomly failing, unrelated to new perl, disabled tests + * Mon Mar 3 2008 Tom "spot" Callaway 1.4.6-6 - rebuild for new perl (again) From fedora-extras-commits at redhat.com Tue Mar 4 00:03:23 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Tue, 4 Mar 2008 00:03:23 GMT Subject: rpms/rpmlint/EL-5 rpmlint.config,1.7,1.8 rpmlint.spec,1.32,1.33 Message-ID: <200803040003.m2403NnB026717@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/rpmlint/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26645 Modified Files: rpmlint.config rpmlint.spec Log Message: * Mon Mar 3 2008 Manuel Wolfshant - 0.82-3 - Sync with rawhide: -- Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690). Index: rpmlint.config =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.config,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rpmlint.config 6 Oct 2007 18:30:35 -0000 1.7 +++ rpmlint.config 4 Mar 2008 00:02:34 -0000 1.8 @@ -28,10 +28,12 @@ setOption("ValidLicenses", ( # These are the short names for all of the Fedora approved licenses. # The master list is kept here: http://fedoraproject.org/wiki/Licensing - # Last synced with Revision 0.55 (Wiki revision 92) of that page. + # Last synced with Revision 0.69 (Wiki revision 110) of that page. 'Adobe', - 'Affero GPL', 'AFL', + 'AGPLv1', + 'AGPLv3', + 'AMPAS BSD', 'ARL', 'ASL 1.0', 'ASL 1.0+', @@ -84,11 +86,15 @@ 'ISC', 'Jabber', 'JasPer', + 'LBNL BSD', 'LGPLv2', 'LGPLv2 with exceptions', 'LGPLv2+', + 'LGPLv2+ with exceptions', 'LGPLv3', + 'LGPLv3 with exceptions', 'LGPLv3+', + 'LGPLv3+ with exceptions', 'libtiff', 'LPL', 'LPPL', @@ -161,6 +167,7 @@ 'Bitstream Vera', 'mplus', 'OFL', + 'STIX', 'Utopia', 'XANO', # Others Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- rpmlint.spec 14 Jan 2008 11:15:45 -0000 1.32 +++ rpmlint.spec 4 Mar 2008 00:02:34 -0000 1.33 @@ -1,6 +1,6 @@ Name: rpmlint Version: 0.82 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -70,7 +70,11 @@ %changelog -* Sun Jan 13 2008 Manuel Wolfshant - 0.82-1 +* Mon Mar 3 2008 Manuel Wolfshant - 0.82-3 +- Sync with rawhide: +-- Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690). + +* Sun Jan 13 2008 Manuel Wolfshant - 0.82-1 - Sync with current rawhide: -- 0.82, fixes #362441, #388881, #399871, #409941. -- Sync Fedora license list with Revision 0.61 (Wiki rev 98). From fedora-extras-commits at redhat.com Tue Mar 4 00:06:34 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 4 Mar 2008 00:06:34 GMT Subject: rpms/gnome-panel/devel current.patch, NONE, 1.1 gnome-panel.spec, 1.271, 1.272 Message-ID: <200803040006.m2406YoM027010@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26886 Modified Files: gnome-panel.spec Added Files: current.patch Log Message: Make the clock applet handle multiple locations in the same timezone meaningfully current.patch: --- NEW FILE current.patch --- diff -up gnome-panel-2.21.92/applets/clock/clock-location.h.current gnome-panel-2.21.92/applets/clock/clock-location.h --- gnome-panel-2.21.92/applets/clock/clock-location.h.current 2008-02-26 08:17:49.000000000 -0500 +++ gnome-panel-2.21.92/applets/clock/clock-location.h 2008-03-03 17:53:43.000000000 -0500 @@ -27,6 +27,8 @@ typedef struct GObjectClass g_object_class; void (* weather_updated) (ClockLocation *location, WeatherInfo *info); + + void (* set_current) (ClockLocation *location); } ClockLocationClass; GType clock_location_get_type (void); @@ -40,7 +42,7 @@ ClockLocation *clock_location_new_from_e gchar *clock_location_get_tzname (ClockLocation *loc); -gchar *clock_location_get_name (ClockLocation *loc); +const gchar *clock_location_get_name (ClockLocation *loc); void clock_location_set_name (ClockLocation *loc, const gchar *name); gchar *clock_location_get_timezone (ClockLocation *loc); @@ -56,6 +58,7 @@ void clock_location_make_current (ClockL GFunc callback, gpointer data, GDestroyNotify destroy); +gboolean clock_location_is_current_timezone (ClockLocation *loc); const gchar *clock_location_get_weather_code (ClockLocation *loc); void clock_location_set_weather_code (ClockLocation *loc, const gchar *code); diff -up gnome-panel-2.21.92/applets/clock/clock-location-tile.c.current gnome-panel-2.21.92/applets/clock/clock-location-tile.c --- gnome-panel-2.21.92/applets/clock/clock-location-tile.c.current 2008-03-03 13:52:38.000000000 -0500 +++ gnome-panel-2.21.92/applets/clock/clock-location-tile.c 2008-03-03 18:59:59.000000000 -0500 @@ -19,7 +19,6 @@ G_DEFINE_TYPE (ClockLocationTile, clock_ enum { TILE_PRESSED, - TIMEZONE_SET, NEED_CLOCK_FORMAT, LAST_SIGNAL }; @@ -106,14 +105,6 @@ clock_location_tile_class_init (ClockLoc NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[TIMEZONE_SET] = g_signal_new ("timezone-set", - G_TYPE_FROM_CLASS (g_obj_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (ClockLocationTileClass, timezone_set), - NULL, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format", G_TYPE_FROM_CLASS (g_obj_class), G_SIGNAL_RUN_LAST, @@ -180,13 +171,9 @@ press_on_tile (GtkWidget static void make_current_cb (gpointer data, GError *error) { - ClockLocationTile *tile = data; GtkWidget *dialog; - if (error == NULL) { - g_signal_emit (tile, signals[TIMEZONE_SET], 0); - } - else { + if (error) { dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, @@ -232,7 +219,10 @@ enter_or_leave_tile (GtkWidget if (event->type == GDK_ENTER_NOTIFY) { gint can_set; - can_set = can_set_system_timezone (); + if (clock_location_is_current_timezone (priv->location)) + can_set = 2; + else + can_set = can_set_system_timezone (); if (can_set != 0) { gtk_label_set_markup (GTK_LABEL (priv->current_label), can_set == 1 ? @@ -317,6 +307,7 @@ clock_location_tile_fill (ClockLocationT gtk_widget_show (priv->current_label); gtk_widget_set_no_show_all (priv->current_button, TRUE); gtk_container_add (GTK_CONTAINER (priv->current_button), priv->current_label); + /* FIXME: this needs to talk about locations, not timezones */ gtk_widget_set_tooltip_text (priv->current_button, _("Set as current timezone for this computer")); priv->current_marker = gtk_image_new_from_icon_name ("go-home", GTK_ICON_SIZE_BUTTON); diff -up gnome-panel-2.21.92/applets/clock/clock.c.current gnome-panel-2.21.92/applets/clock/clock.c --- gnome-panel-2.21.92/applets/clock/clock.c.current 2008-03-03 15:51:48.000000000 -0500 +++ gnome-panel-2.21.92/applets/clock/clock.c 2008-03-03 19:01:31.000000000 -0500 @@ -237,6 +237,7 @@ static void applet_change_orient (PanelA ClockData *cd); static void edit_hide (GtkWidget *unused, ClockData *cd); +static void save_cities_store (ClockData *cd); static void unfix_size (ClockData *cd) @@ -962,8 +963,8 @@ sort_locations_by_name (gconstpointer a, ClockLocation *loc_a = (ClockLocation *) a; ClockLocation *loc_b = (ClockLocation *) b; - char *name_a = clock_location_get_name (loc_a); - char *name_b = clock_location_get_name (loc_b); + const char *name_a = clock_location_get_name (loc_a); + const char *name_b = clock_location_get_name (loc_b); return strcmp (name_a, name_b); } @@ -1069,15 +1070,6 @@ location_tile_pressed_cb (ClockLocationT } static void -location_tile_timezone_set_cb (ClockLocationTile *tile, gpointer data) -{ - ClockData *cd = data; - - clock_map_refresh (CLOCK_MAP (cd->map_widget)); - update_location_tiles (cd); -} - -static void location_tile_weather_updated_cb (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char *temperature, gpointer data) { ClockData *cd = data; @@ -1131,8 +1123,6 @@ create_cities_section (ClockData *cd) city = clock_location_tile_new (loc, CLOCK_FACE_SMALL); g_signal_connect (city, "tile-pressed", G_CALLBACK (location_tile_pressed_cb), cd); - g_signal_connect (city, "timezone-set", - G_CALLBACK (location_tile_timezone_set_cb), cd); g_signal_connect (city, "need-clock-format", G_CALLBACK (location_tile_need_clock_format_cb), cd); @@ -2064,6 +2054,21 @@ location_weather_updated_cb (ClockLocati } static void +location_set_current_cb (ClockLocation *loc, + gpointer data) +{ + ClockData *cd = data; + WeatherInfo *info; + + info = clock_location_get_weather_info (loc); + location_weather_updated_cb (loc, info, cd); + + clock_map_refresh (CLOCK_MAP (cd->map_widget)); + update_location_tiles (cd); + save_cities_store (cd); +} + +static void locations_changed (ClockData *cd) { GList *l; @@ -2078,6 +2083,8 @@ locations_changed (ClockData *cd) id = g_signal_connect (loc, "weather-updated", G_CALLBACK (location_weather_updated_cb), cd); g_object_set_data (G_OBJECT (loc), "weather-updated", GINT_TO_POINTER (id)); + g_signal_connect (loc, "set-current", + G_CALLBACK (location_set_current_cb), cd); } } @@ -2122,6 +2129,7 @@ location_start_element (GMarkupParseCont gfloat latitude = 0.0; gfloat longitude = 0.0; gchar *code = NULL; + gboolean current = FALSE; int index = 0; @@ -2147,6 +2155,11 @@ location_start_element (GMarkupParseCont } else if (strcmp (att_name, "code") == 0) { code = (gchar *)attribute_values[index]; } + else if (strcmp (att_name, "current") == 0) { + if (strcmp (attribute_values[index], "true") == 0) { + current = TRUE; + } + } } setlocale (LC_NUMERIC, ""); @@ -2157,6 +2170,9 @@ location_start_element (GMarkupParseCont loc = clock_location_new (name, timezone, latitude, longitude, code, &prefs); + if (current) + clock_location_make_current (loc, NULL, NULL, NULL); + data->cities = g_list_append (data->cities, loc); } @@ -2912,13 +2928,14 @@ loc_to_string (ClockLocation *loc) clock_location_get_coords (loc, &latitude, &longitude); prev_locale = setlocale (LC_NUMERIC, "POSIX"); - + ret = g_markup_printf_escaped - ("", + ("", clock_location_get_name (loc), clock_location_get_timezone (loc), latitude, longitude, - clock_location_get_weather_code (loc)); + clock_location_get_weather_code (loc), + clock_location_is_current (loc) ? "true" : "false"); setlocale (LC_NUMERIC, ""); diff -up gnome-panel-2.21.92/applets/clock/clock-location-tile.h.current gnome-panel-2.21.92/applets/clock/clock-location-tile.h --- gnome-panel-2.21.92/applets/clock/clock-location-tile.h.current 2008-03-03 18:58:50.000000000 -0500 +++ gnome-panel-2.21.92/applets/clock/clock-location-tile.h 2008-03-03 18:58:58.000000000 -0500 @@ -26,7 +26,6 @@ typedef struct GtkAlignmentClass parent_class; void (* tile_pressed) (ClockLocationTile *tile); - void (* timezone_set) (ClockLocationTile *tile); int (* need_clock_format) (ClockLocationTile *tile); } ClockLocationTileClass; diff -up gnome-panel-2.21.92/applets/clock/clock-location.c.current gnome-panel-2.21.92/applets/clock/clock-location.c --- gnome-panel-2.21.92/applets/clock/clock-location.c.current 2008-02-26 08:17:49.000000000 -0500 +++ gnome-panel-2.21.92/applets/clock/clock-location.c 2008-03-03 19:01:45.000000000 -0500 @@ -51,6 +51,7 @@ typedef struct { enum { WEATHER_UPDATED, + SET_CURRENT, LAST_SIGNAL }; @@ -232,6 +233,7 @@ guess_zone_from_tree (const gchar *local } static gchar *current_zone = NULL; +static ClockLocation *current_location = NULL; static GFileMonitor *monitor = NULL; static void @@ -409,6 +411,15 @@ clock_location_class_init (ClockLocation _clock_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + location_signals[SET_CURRENT] = + g_signal_new ("set-current", + G_OBJECT_CLASS_TYPE (g_obj_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ClockLocationClass, set_current), + NULL, NULL, + _clock_marshal_VOID__VOID, + G_TYPE_NONE, 0); + g_type_class_add_private (this_class, sizeof (ClockLocationPrivate)); } @@ -482,7 +493,7 @@ clock_location_finalize (GObject *g_obj) G_OBJECT_CLASS (clock_location_parent_class)->finalize (g_obj); } -gchar * +const gchar * clock_location_get_name (ClockLocation *loc) { ClockLocationPrivate *priv = PRIVATE (loc); @@ -629,15 +640,37 @@ clock_location_localtime (ClockLocation } gboolean -clock_location_is_current (ClockLocation *loc) +clock_location_is_current_timezone (ClockLocation *loc) { ClockLocationPrivate *priv = PRIVATE (loc); const char *zone; - if ((zone = zone_from_etc_sysconfig_clock ())) + if ((zone = zone_from_etc_sysconfig_clock ())) { return strcmp (zone, priv->timezone) == 0; + } + else { + return clock_location_get_offset (loc) == 0; + } +} - return clock_location_get_offset (loc) == 0; +gboolean +clock_location_is_current (ClockLocation *loc) +{ + + if (current_location == loc) + return TRUE; + else if (current_location != NULL) + return FALSE; + + if (clock_location_is_current_timezone (loc)) { + current_location = loc; + g_object_add_weak_pointer (G_OBJECT (current_location), + (gpointer *)¤t_location); + + return TRUE; + } + + return FALSE; } @@ -700,6 +733,15 @@ make_current_cb (gpointer data, GError * */ g_free (current_zone); current_zone = g_strdup (priv->timezone); + + if (current_location) + g_object_remove_weak_pointer (G_OBJECT (current_location), + (gpointer *)¤t_location); + current_location = mcdata->location; + g_object_add_weak_pointer (G_OBJECT (current_location), + (gpointer *)¤t_location); + g_signal_emit (current_location, location_signals[SET_CURRENT], + 0, NULL); } if (mcdata->callback) @@ -730,6 +772,22 @@ clock_location_make_current (ClockLocati gchar *filename; MakeCurrentData *mcdata; + if (clock_location_is_current_timezone (loc)) { + if (current_location) + g_object_remove_weak_pointer (G_OBJECT (current_location), + (gpointer *)¤t_location); + current_location = loc; + g_object_add_weak_pointer (G_OBJECT (current_location), + (gpointer *)¤t_location); + g_signal_emit (current_location, location_signals[SET_CURRENT], + 0, NULL); + if (callback) + callback (data, NULL); + if (destroy) + destroy (data); + return; + } + mcdata = g_new (MakeCurrentData, 1); mcdata->location = g_object_ref (loc); Index: gnome-panel.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- gnome-panel.spec 3 Mar 2008 18:02:59 -0000 1.271 +++ gnome-panel.spec 4 Mar 2008 00:05:50 -0000 1.272 @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.21.92 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2 @@ -114,6 +114,8 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=520111 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch +Patch25: current.patch + Conflicts: gnome-power-manager < 2.15.3 %description @@ -162,6 +164,7 @@ %patch22 -p1 -b .polkit-fix %patch23 -p1 -b .sunrise %patch24 -p1 -b .allow-spurious-view-done-signals +%patch25 -p1 -b .current . %{SOURCE6} @@ -346,6 +349,10 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 3 2008 Matthias Clasen - 2.21.92-4 +- Make the clock applet handle multiple locations in the + same timezone meaningfully + * Mon Mar 3 2008 Matthias Clasen - 2.21.92-3 - Some upstream clock applet fixes From fedora-extras-commits at redhat.com Tue Mar 4 00:22:23 2008 From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy)) Date: Tue, 4 Mar 2008 00:22:23 GMT Subject: rpms/rpmlint/EL-4 rpmlint.config,1.1,1.2 rpmlint.spec,1.16,1.17 Message-ID: <200803040022.m240MNlq028150@cvs-int.fedora.redhat.com> Author: wolfy Update of /cvs/pkgs/rpms/rpmlint/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28073 Modified Files: rpmlint.config rpmlint.spec Log Message: * Mon Mar 3 2008 Manuel Wolfshant - 0.82-3 - Sync with rawhide: -- Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690). Index: rpmlint.config =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/rpmlint.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rpmlint.config 4 Mar 2007 08:18:46 -0000 1.1 +++ rpmlint.config 4 Mar 2008 00:21:43 -0000 1.2 @@ -19,10 +19,162 @@ "/usr/bin/perl", "/usr/bin/python", )) + setOption("DanglingSymlinkExceptions", ( ['consolehelper$', 'usermode'], ['consolehelper-gtk$', 'usermode-gtk'], )) + +setOption("ValidLicenses", ( + # These are the short names for all of the Fedora approved licenses. + # The master list is kept here: http://fedoraproject.org/wiki/Licensing + # Last synced with Revision 0.69 (Wiki revision 110) of that page. + 'Adobe', + 'AFL', + 'AGPLv1', + 'AGPLv3', + 'AMPAS BSD', + 'ARL', + 'ASL 1.0', + 'ASL 1.0+', + 'ASL 1.1', + 'ASL 1.1+', + 'ASL 2.0', + 'ASL 2.0+', + 'APSL 2.0', + 'APSL 2.0+', + 'Artistic 2.0', + 'Artistic clarified', + 'BitTorrent', + 'Boost', + 'BSD', + 'BSD with advertising', + 'CeCILL', + 'CDDL', + 'CPL', + 'Condor', + 'Copyright only', + 'Cryptix', + 'Crystal Stacker', + 'EPL', + 'eCos', + 'EFL 2.0', + 'EFL 2.0+', + 'EU Datagrid', + 'FTL', + 'Giftware', + 'Glide', + 'gnuplot', + 'GPL+', + 'GPL+ or Artistic', + 'GPLv2+ or Artistic', + 'GPLv2', + 'GPLv2 with exceptions', + 'GPLv2+', + 'GPLv2+ with exceptions', + 'GPLv3', + 'GPLv3 with exceptions', + 'GPLv3+', + 'GPLv3+ with exceptions', + 'IBM', + 'IJG', + 'ImageMagick', + 'iMatix', + 'Imlib2', + 'Intel ACPI', + 'Interbase', + 'ISC', + 'Jabber', + 'JasPer', + 'LBNL BSD', + 'LGPLv2', + 'LGPLv2 with exceptions', + 'LGPLv2+', + 'LGPLv2+ with exceptions', + 'LGPLv3', + 'LGPLv3 with exceptions', + 'LGPLv3+', + 'LGPLv3+ with exceptions', + 'libtiff', + 'LPL', + 'LPPL', + 'mecab-ipadic', + 'MIT', + 'MPLv1.0', + 'MPLv1.0+', + 'MPLv1.1', + 'MPLv1.1+', + 'NCSA', + 'NGPL', + 'NOSL', + 'Netscape', + 'Nokia', + 'OpenLDAP', + 'OpenPBS', + 'OReilly', + 'OSL 1.0', + 'OSL 1.0+', + 'OSL 1.1', + 'OSL 1.1+', + 'OSL 2.0', + 'OSL 2.0+', + 'OSL 3.0', + 'OSL 3.0+', + 'OpenSSL', + 'Phorum', + 'PHP', + 'Public Domain', + 'Python', + 'QPL', + 'RPSL', + 'Ruby', + 'Sleepycat', + 'SISSL', + 'SLIB', + 'SPL', + 'TCL', + 'UCD', + 'Vim', + 'VNLSL', + 'VSL', + 'W3C', + 'WTFPL', + 'wxWindows', + 'xinetd', + 'Zend', + 'ZPLv1.0', + 'ZPLv1.0+', + 'ZPLv2.0', + 'ZPLv2.0+', + 'ZPLv2.1', + 'ZPLv2.1+', + 'zlib', + # Documentation licenses + 'CDL', + 'FBSDDL', + 'GFDL', + 'IEEE', + 'OFSFDL', + 'Open Publication', + # Content licenses + 'CC-BY', + 'CC-BY-SA', + 'DSL', + 'Free Art', + # Font licenses + 'Arphic', + 'Baekmuk', + 'Bitstream Vera', + 'mplus', + 'OFL', + 'STIX', + 'Utopia', + 'XANO', + # Others + 'Redistributable, no modification permitted', + 'Freely redistributable without restriction', +)) + # Standard users & groups from the setup package: setOption("StandardUsers", ("root", "bin", "daemon", "adm", "lp", "sync", "shutdown", "halt", @@ -52,7 +204,9 @@ addFilter("jar-not-indexed") addFilter("invalid-(lc-messages|locale-man)-dir") addFilter("outside-libdir-files") -addFilter("-debuginfo no-documentation") -addFilter("-debuginfo [^ ]+ /usr/lib/debug/") +addFilter("-debuginfo.* no-documentation") +addFilter("-debuginfo.* /usr/lib/debug/") addFilter("non-standard-dir-in-usr libexec") -addFilter(" gpg-pubkey ") +addFilter("^gpg-pubkey:") +addFilter(" doc-file-dependency .* /bin/sh$") +addFilter("hardcoded-library-path .*/lib/udev(/|$)") Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/rpmlint.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- rpmlint.spec 14 Jan 2008 16:20:45 -0000 1.16 +++ rpmlint.spec 4 Mar 2008 00:21:43 -0000 1.17 @@ -1,6 +1,6 @@ Name: rpmlint Version: 0.82 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -70,7 +70,11 @@ %changelog -* Sun Jan 13 2008 Manuel Wolfshant - 0.82-1 +* Mon Mar 3 2008 Manuel Wolfshant - 0.82-3 +- Sync with rawhide: +-- Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690). + +* Sun Jan 13 2008 Manuel Wolfshant - 0.82-1 - Sync with current rawhide: -- 0.82, fixes #362441, #388881, #399871, #409941. -- Sync Fedora license list with Revision 0.61 (Wiki rev 98). From fedora-extras-commits at redhat.com Tue Mar 4 00:24:18 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 00:24:18 GMT Subject: rpms/sound-juicer/devel sound-juicer.spec,1.91,1.92 Message-ID: <200803040024.m240OIPM028333@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/sound-juicer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28251 Modified Files: sound-juicer.spec Log Message: * Tue Mar 04 2008 - Bastien Nocera - 2.21.92-2 - ExcludeArch ppc and ppc64 added (#435771) Index: sound-juicer.spec =================================================================== RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- sound-juicer.spec 27 Feb 2008 13:56:13 -0000 1.91 +++ sound-juicer.spec 4 Mar 2008 00:23:36 -0000 1.92 @@ -13,7 +13,7 @@ Name: sound-juicer Summary: Clean and lean CD ripper Version: 2.21.92 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia Source: http://download.gnome.org/sources/sound-juicer/2.21/%{name}-%{version}.tar.bz2 @@ -46,7 +46,8 @@ BuildRequires: gettext BuildRequires: perl(XML::Parser) -ExcludeArch: s390 s390x +# ppc and ppc64 added for https://bugzilla.redhat.com/show_bug.cgi?id=435771 +ExcludeArch: s390 s390x ppc ppc64 %description GStreamer-based CD ripping tool. Saves audio CDs to Ogg/vorbis. @@ -121,6 +122,9 @@ %{_mandir}/man1/* %changelog +* Tue Mar 04 2008 - Bastien Nocera - 2.21.92-2 +- ExcludeArch ppc and ppc64 added (#435771) + * Tue Feb 26 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 From fedora-extras-commits at redhat.com Tue Mar 4 00:35:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Tue, 4 Mar 2008 00:35:26 GMT Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.26, 1.27 sources, 1.27, 1.28 xorg-x11-drv-i810.spec, 1.77, 1.78 Message-ID: <200803040035.m240ZQOV029035@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29009 Modified Files: .cvsignore sources xorg-x11-drv-i810.spec Log Message: * Mon Mar 3 2008 Kristian H??gsberg - 2.2.1-4 - Bump intel-batchbuffer to latest snapshot, rebuild against new server ABI. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 27 Feb 2008 22:32:21 -0000 1.26 +++ .cvsignore 4 Mar 2008 00:34:50 -0000 1.27 @@ -1,2 +1,2 @@ xf86-video-intel-2.2.1.tar.bz2 -xf86-video-intel-2.2.0-185-g11adf8c.tar.bz2 +xf86-video-intel-2.2.0-188-g49af3c4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 27 Feb 2008 22:32:21 -0000 1.27 +++ sources 4 Mar 2008 00:34:50 -0000 1.28 @@ -1,2 +1,2 @@ 3334dc5142871b78fc609fd1b3dac3f2 xf86-video-intel-2.2.1.tar.bz2 -596cd1e9415bfa7c4dbfa2dddf996a15 xf86-video-intel-2.2.0-185-g11adf8c.tar.bz2 +3bcc678c80ccc98f3cd5e5da450f0545 xf86-video-intel-2.2.0-188-g49af3c4.tar.bz2 Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- xorg-x11-drv-i810.spec 2 Mar 2008 23:32:26 -0000 1.77 +++ xorg-x11-drv-i810.spec 4 Mar 2008 00:34:50 -0000 1.78 @@ -1,11 +1,11 @@ %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define batchbuffer_version 2.2.0-185-g11adf8c +%define batchbuffer_version 2.2.0-188-g49af3c4 Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-i810 Version: 2.2.1 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -126,6 +126,9 @@ %{_libdir}/libI810XvMC.so %changelog +* Mon Mar 3 2008 Kristian H??gsberg - 2.2.1-4 +- Bump intel-batchbuffer to latest snapshot, rebuild against new server ABI. + * Mon Mar 03 2008 Dave Airlie 2.2.1-3 - update for new server abi From fedora-extras-commits at redhat.com Tue Mar 4 00:44:43 2008 From: fedora-extras-commits at redhat.com (Tom Lane (tgl)) Date: Tue, 4 Mar 2008 00:44:43 GMT Subject: rpms/mysql/devel mysql-stack-guard.patch,1.2,1.3 Message-ID: <200803040044.m240ihm6029187@cvs-int.fedora.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29163 Modified Files: mysql-stack-guard.patch Log Message: Add link to upstream bug report mysql-stack-guard.patch: Index: mysql-stack-guard.patch =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-stack-guard.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mysql-stack-guard.patch 3 Mar 2008 22:30:11 -0000 1.2 +++ mysql-stack-guard.patch 4 Mar 2008 00:44:31 -0000 1.3 @@ -5,6 +5,8 @@ Note: there are quite a few other setstacksize calls besides the two in mysqld.cc; is it important to fix any of the others? +Filed upstream at http://bugs.mysql.com/bug.php?id=35019 + diff -Naur mysql-5.0.45.orig/sql/mysqld.cc mysql-5.0.45/sql/mysqld.cc --- mysql-5.0.45.orig/sql/mysqld.cc 2007-07-04 09:06:03.000000000 -0400 From fedora-extras-commits at redhat.com Tue Mar 4 00:49:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 00:49:18 GMT Subject: rpms/perl-Mail-Box/devel perl-Mail-Box.spec,1.5,1.6 Message-ID: <200803040049.m240nIMG029275@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Mail-Box/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29246 Modified Files: perl-Mail-Box.spec Log Message: rebuild pass 2, Email::Abstract, tests enabled Index: perl-Mail-Box.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-Box/devel/perl-Mail-Box.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Mail-Box.spec 2 Mar 2008 15:58:11 -0000 1.5 +++ perl-Mail-Box.spec 4 Mar 2008 00:48:37 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Mail-Box Version: 2.073 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Manage a mailbox, a folder with messages Group: Development/Libraries License: GPL+ or Artistic @@ -17,7 +17,7 @@ BuildRequires: perl(Sys::Hostname), perl(Test::More), perl(Test::Harness), perl(MIME::Base64) BuildRequires: perl(URI), perl(IO::Scalar), perl(Digest::HMAC_MD5), perl(User::Identity) BuildRequires: perl(Time::Zone), perl(Email::Simple) -# BuildRequires: perl(Email::Abstract) +BuildRequires: perl(Email::Abstract) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -63,7 +63,7 @@ recode $RPM_BUILD_ROOT%{_mandir}/man3/Mail::Message::Field.3pm iso-8859-1 %check -# make test +make test %clean rm -rf $RPM_BUILD_ROOT @@ -75,6 +75,9 @@ %{_mandir}/man3/*.3* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 2.073-5 +- Rebuild second pass, tests enabled + * Sun Mar 2 2008 Tom "spot" Callaway - 2.073-4 - Rebuild, first pass, disable tests, BR on Email::Abstract From fedora-extras-commits at redhat.com Tue Mar 4 00:55:18 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 00:55:18 GMT Subject: rpms/gstreamer/devel .cvsignore, 1.30, 1.31 gstreamer.spec, 1.73, 1.74 sources, 1.31, 1.32 Message-ID: <200803040055.m240tIeW029427@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gstreamer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29403 Modified Files: .cvsignore gstreamer.spec sources Log Message: * Tue Mar 04 2008 - Bastien Nocera - 0.10.17.2-1 - Update to 0.10.17.2 pre-release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 30 Jan 2008 15:19:19 -0000 1.30 +++ .cvsignore 4 Mar 2008 00:54:34 -0000 1.31 @@ -1 +1 @@ -gstreamer-0.10.17.tar.bz2 +gstreamer-0.10.17.2.tar.bz2 Index: gstreamer.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- gstreamer.spec 18 Feb 2008 18:55:28 -0000 1.73 +++ gstreamer.spec 4 Mar 2008 00:54:34 -0000 1.74 @@ -5,8 +5,8 @@ %define _libxml2 2.4.0 Name: %{gstreamer} -Version: 0.10.17 -Release: 2%{?dist} +Version: 0.10.17.2 +Release: 1%{?dist} Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia @@ -198,6 +198,9 @@ %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/* %changelog +* Tue Mar 04 2008 - Bastien Nocera - 0.10.17.2-1 +- Update to 0.10.17.2 pre-release + * Mon Feb 18 2008 Fedora Release Engineering - 0.10.17-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 30 Jan 2008 15:19:19 -0000 1.31 +++ sources 4 Mar 2008 00:54:34 -0000 1.32 @@ -1 +1 @@ -3232416ea6fceab628236d67a7d0a44a gstreamer-0.10.17.tar.bz2 +8744e49321f6d68dee05fbfa80deb342 gstreamer-0.10.17.2.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 00:57:56 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 00:57:56 GMT Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.44, 1.45 Message-ID: <200803040057.m240vukI029502@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29482 Modified Files: gstreamer-plugins-base.spec Log Message: * Tue Mar 04 2008 - Bastien Nocera - 0.10.17.2-1 - Update to 0.10.17.2 pre-release Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- gstreamer-plugins-base.spec 18 Feb 2008 18:56:27 -0000 1.44 +++ gstreamer-plugins-base.spec 4 Mar 2008 00:57:02 -0000 1.45 @@ -4,8 +4,8 @@ %define _gst 0.10.16 Name: %{gstreamer}-plugins-base -Version: 0.10.17 -Release: 2%{?dist} +Version: 0.10.17.2 +Release: 1%{?dist} Summary: GStreamer streaming media framework base plug-ins Group: Applications/Multimedia @@ -240,6 +240,9 @@ %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Tue Mar 04 2008 - Bastien Nocera - 0.10.17.2-1 +- Update to 0.10.17.2 pre-release + * Mon Feb 18 2008 Fedora Release Engineering - 0.10.17-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 01:09:00 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 4 Mar 2008 01:09:00 GMT Subject: rpms/evince/devel evince.spec,1.113,1.114 Message-ID: <200803040109.m24190bY004393@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/evince/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4368 Modified Files: evince.spec Log Message: Rebuild Index: evince.spec =================================================================== RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- evince.spec 13 Feb 2008 03:06:10 -0000 1.113 +++ evince.spec 4 Mar 2008 01:08:09 -0000 1.114 @@ -6,7 +6,7 @@ Name: evince Version: 2.21.91 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Document viewer License: GPLv2+ and GFDL+ @@ -215,6 +215,9 @@ %{_libdir}/evince/backends/djvudocument.evince-backend %changelog +* Mon Mar 3 2008 Matthias Clasen - 2.21.91-2 +- Rebuild + * Tue Feb 12 2008 Matthias Clasen - 2.21.91-1 - Update to 2.21.91 From fedora-extras-commits at redhat.com Tue Mar 4 01:10:52 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 01:10:52 GMT Subject: rpms/gstreamer/devel gstreamer.spec,1.74,1.75 Message-ID: <200803040110.m241AqCc004490@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gstreamer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4452 Modified Files: gstreamer.spec Log Message: Try to remove aliasing errors Index: gstreamer.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- gstreamer.spec 4 Mar 2008 00:54:34 -0000 1.74 +++ gstreamer.spec 4 Mar 2008 01:10:09 -0000 1.75 @@ -96,6 +96,7 @@ %build # 0.10.0: manuals do not build due to an openjade error; disable for now +export CFLAGS=-fno-strict-aliasing %configure \ --with-package-name='Fedora Core gstreamer package' \ --with-package-origin='http://download.fedora.redhat.com/fedora' \ From fedora-extras-commits at redhat.com Tue Mar 4 01:16:27 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Tue, 4 Mar 2008 01:16:27 GMT Subject: rpms/mesa/devel .cvsignore, 1.21, 1.22 make-git-snapshot.sh, 1.1, 1.2 mesa.spec, 1.170, 1.171 sources, 1.20, 1.21 mesa-7.1-dri-drivers.patch, 1.7, NONE Message-ID: <200803040116.m241GR30004590@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/mesa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4553 Modified Files: .cvsignore make-git-snapshot.sh mesa.spec sources Removed Files: mesa-7.1-dri-drivers.patch Log Message: * Mon Mar 3 2008 Kristian H??gsberg - 7.1-0.19 - Bump to latest git snapshot. - Drop mesa-7.1-dri-drivers.patch, it's upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 21 Feb 2008 02:05:31 -0000 1.21 +++ .cvsignore 4 Mar 2008 01:15:35 -0000 1.22 @@ -1,3 +1,2 @@ gl-manpages-1.0.1.tar.bz2 -mesa-20080215.tar.bz2 -mesa-20080218.tar.bz2 +mesa-20080303.tar.bz2 Index: make-git-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/make-git-snapshot.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- make-git-snapshot.sh 15 Feb 2008 23:21:58 -0000 1.1 +++ make-git-snapshot.sh 4 Mar 2008 01:15:35 -0000 1.2 @@ -1,17 +1,22 @@ #!/bin/sh +# Usage: ./make-git-snapshot.sh [COMMIT] +# +# to make a snapshot of the given tag/branch. Defaults to HEAD. +# Point env var REF to a local mesa repo to reduce clone time. + DIRNAME=mesa-$( date +%Y%m%d ) +echo REF ${REF:+--reference $REF} +echo DIRNAME $DIRNAME +echo HEAD ${1:-HEAD} + rm -rf $DIRNAME -git clone git://git.freedesktop.org/git/mesa/mesa $DIRNAME -cd $DIRNAME -if [ -z "$1" ]; then - git log | head -1 -else - git checkout $1 -fi -git log | head -1 | awk '{ print $2 }' > ../commitid -git repack -a -d -cd .. -tar jcf $DIRNAME.tar.bz2 $DIRNAME -rm -rf $DIRNAME + +git clone ${REF:+--reference $REF} \ + git://git.freedesktop.org/git/mesa/mesa $DIRNAME + +GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ + | bzip2 > $DIRNAME.tar.bz2 + +# rm -rf $DIRNAME Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- mesa.spec 3 Mar 2008 02:52:48 -0000 1.170 +++ mesa.spec 4 Mar 2008 01:15:35 -0000 1.171 @@ -10,12 +10,12 @@ %endif %define manpages gl-manpages-1.0.1 -%define gitdate 20080218 +%define gitdate 20080303 Summary: Mesa graphics libraries Name: mesa Version: 7.1 -Release: 0.18%{?dist} +Release: 0.19%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -28,7 +28,6 @@ Source3: make-git-snapshot.sh Patch0: mesa-7.1pre-osmesa-version.patch -Patch1: mesa-7.1-dri-drivers.patch Patch2: mesa-7.1pre-nukeglthread-debug.patch BuildRequires: pkgconfig autoconf automake @@ -151,7 +150,6 @@ #%setup -q -n Mesa-%{version}pre -b1 -b2 %setup -q -n mesa-%{gitdate} -b2 %patch0 -p1 -b .osmesa -%patch1 -p1 -b .dri-drivers %patch2 -p1 -b .intel-glthread # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT @@ -395,6 +393,10 @@ %{_libdir}/mesa-demos-data %changelog +* Mon Mar 3 2008 Kristian H??gsberg - 7.1-0.19 +- Bump to latest git snapshot. +- Drop mesa-7.1-dri-drivers.patch, it's upstream. + * Mon Mar 03 2008 Dave Airlie 7.1-0.18 - fix i915 build due to symbol visibility Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 21 Feb 2008 02:05:31 -0000 1.20 +++ sources 4 Mar 2008 01:15:35 -0000 1.21 @@ -1,2 +1,2 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -0faf6afeee7f2ef78efeb681690c0c25 mesa-20080218.tar.bz2 +2b1a09d87cd56f4601265993ac747db3 mesa-20080303.tar.bz2 --- mesa-7.1-dri-drivers.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 01:29:44 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 4 Mar 2008 01:29:44 GMT Subject: rpms/gnome-panel/devel expose.patch, NONE, 1.1 gnome-panel.spec, 1.272, 1.273 Message-ID: <200803040129.m241Tioq004788@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4762 Modified Files: gnome-panel.spec Added Files: expose.patch Log Message: fix a redraw problem expose.patch: --- NEW FILE expose.patch --- diff -up gnome-panel-2.21.92/applets/clock/clock-map.c.expose gnome-panel-2.21.92/applets/clock/clock-map.c --- gnome-panel-2.21.92/applets/clock/clock-map.c.expose 2008-03-03 20:26:50.000000000 -0500 +++ gnome-panel-2.21.92/applets/clock/clock-map.c 2008-03-03 20:26:55.000000000 -0500 @@ -247,8 +247,9 @@ clock_map_expose (GtkWidget *this, GdkEv /* draw a simple outline */ cairo_rectangle ( cr, - region.x + 0.5, region.y + 0.5, - region.width - 1, region.height - 1); + allocation.x + 0.5, allocation.y + 0.5, + gdk_pixbuf_get_width (priv->rotated_map_pixbuf) - 1, + gdk_pixbuf_get_height (priv->rotated_map_pixbuf) - 1); cairo_set_source_rgb ( cr, Index: gnome-panel.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- gnome-panel.spec 4 Mar 2008 00:05:50 -0000 1.272 +++ gnome-panel.spec 4 Mar 2008 01:29:05 -0000 1.273 @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.21.92 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2 @@ -115,6 +115,7 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch Patch25: current.patch +Patch26: expose.patch Conflicts: gnome-power-manager < 2.15.3 @@ -165,6 +166,7 @@ %patch23 -p1 -b .sunrise %patch24 -p1 -b .allow-spurious-view-done-signals %patch25 -p1 -b .current +%patch26 -p1 -b .expose . %{SOURCE6} @@ -349,6 +351,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 3 2008 Matthias Clasen - 2.21.92-5 +- Fix a redraw problem with the clock map + * Mon Mar 3 2008 Matthias Clasen - 2.21.92-4 - Make the clock applet handle multiple locations in the same timezone meaningfully From fedora-extras-commits at redhat.com Tue Mar 4 01:32:54 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 01:32:54 GMT Subject: rpms/gstreamer/devel gstreamer.spec,1.75,1.76 Message-ID: <200803040132.m241Ws26004886@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gstreamer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4857 Modified Files: gstreamer.spec Log Message: update error flags work-around Index: gstreamer.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- gstreamer.spec 4 Mar 2008 01:10:09 -0000 1.75 +++ gstreamer.spec 4 Mar 2008 01:32:19 -0000 1.76 @@ -96,7 +96,6 @@ %build # 0.10.0: manuals do not build due to an openjade error; disable for now -export CFLAGS=-fno-strict-aliasing %configure \ --with-package-name='Fedora Core gstreamer package' \ --with-package-origin='http://download.fedora.redhat.com/fedora' \ @@ -106,7 +105,7 @@ #make %{?_smp_mflags} # FIXME: docs building doesn't work with smp yet -make +make ERROR_CFLAGS="" %install rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Tue Mar 4 01:44:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Tue, 4 Mar 2008 01:44:01 GMT Subject: rpms/libdrm/devel .cvsignore, 1.11, 1.12 libdrm.spec, 1.33, 1.34 make-git-snapshot.sh, 1.1, 1.2 sources, 1.11, 1.12 Message-ID: <200803040144.m241i1CT005103@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/libdrm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5069 Modified Files: .cvsignore libdrm.spec make-git-snapshot.sh sources Log Message: * Mon Mar 3 2008 Kristian H??gsberg - 2.4.0-0.5 - What he said. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 15 Feb 2008 19:17:14 -0000 1.11 +++ .cvsignore 4 Mar 2008 01:42:54 -0000 1.12 @@ -1 +1 @@ -libdrm-20080215.tar.bz2 +libdrm-20080303.tar.bz2 Index: libdrm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- libdrm.spec 15 Feb 2008 19:17:14 -0000 1.33 +++ libdrm.spec 4 Mar 2008 01:42:54 -0000 1.34 @@ -1,9 +1,9 @@ -%define gitdate 20080215 +%define gitdate 20080303 Summary: Direct Rendering Manager runtime library Name: libdrm Version: 2.4.0 -Release: 0.4%{?dist} +Release: 0.5%{?dist} License: MIT Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/libdrm.pc %changelog +* Mon Mar 3 2008 Kristian H??gsberg - 2.4.0-0.5 +- What he said. + * Fri Feb 15 2008 Adam Jackson 2.4.0-0.4 - Today's git snapshot for updated headers. Index: make-git-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/make-git-snapshot.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- make-git-snapshot.sh 15 Feb 2008 19:17:14 -0000 1.1 +++ make-git-snapshot.sh 4 Mar 2008 01:42:54 -0000 1.2 @@ -1,17 +1,22 @@ #!/bin/sh +# Usage: ./make-git-snapshot.sh [COMMIT] +# +# to make a snapshot of the given tag/branch. Defaults to HEAD. +# Point env var REF to a local mesa repo to reduce clone time. + DIRNAME=libdrm-$( date +%Y%m%d ) +echo REF ${REF:+--reference $REF} +echo DIRNAME $DIRNAME +echo HEAD ${1:-HEAD} + rm -rf $DIRNAME -git clone git://git.freedesktop.org/git/mesa/drm $DIRNAME -cd $DIRNAME -if [ -z "$1" ]; then - git log | head -1 -else - git checkout $1 -fi -git log | head -1 | awk '{ print $2 }' > ../commitid -git repack -a -d -cd .. -tar jcf $DIRNAME.tar.bz2 $DIRNAME -rm -rf $DIRNAME + +git clone ${REF:+--reference $REF} \ + git://git.freedesktop.org/git/mesa/drm $DIRNAME + +GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ + | bzip2 > $DIRNAME.tar.bz2 + +# rm -rf $DIRNAME Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 15 Feb 2008 19:17:14 -0000 1.11 +++ sources 4 Mar 2008 01:42:54 -0000 1.12 @@ -1 +1 @@ -8fc14f6cff3639da43d9b57a5143a675 libdrm-20080215.tar.bz2 +ead994b34decae8a63407147b640acc6 libdrm-20080303.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 01:50:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Tue, 4 Mar 2008 01:50:26 GMT Subject: rpms/mesa/devel mesa.spec,1.171,1.172 Message-ID: <200803040150.m241oQ0a005562@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/mesa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5529 Modified Files: mesa.spec Log Message: * Mon Mar 3 2008 Kristian H??gsberg - 7.1-0.19 - Bump to latest git snapshot. - Drop mesa-7.1-dri-drivers.patch, it's upstream. Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- mesa.spec 4 Mar 2008 01:15:35 -0000 1.171 +++ mesa.spec 4 Mar 2008 01:49:32 -0000 1.172 @@ -32,7 +32,7 @@ BuildRequires: pkgconfig autoconf automake %if %{with_dri} -BuildRequires: libdrm-devel >= 2.4.0-0.4 +BuildRequires: libdrm-devel >= 2.4.0-0.5 %endif BuildRequires: libXxf86vm-devel BuildRequires: expat-devel >= 2.0 @@ -396,6 +396,7 @@ * Mon Mar 3 2008 Kristian H??gsberg - 7.1-0.19 - Bump to latest git snapshot. - Drop mesa-7.1-dri-drivers.patch, it's upstream. +- Require libdrm-devel >= 2.4.0-0.5 * Mon Mar 03 2008 Dave Airlie 7.1-0.18 - fix i915 build due to symbol visibility From fedora-extras-commits at redhat.com Tue Mar 4 01:55:34 2008 From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie)) Date: Tue, 4 Mar 2008 01:55:34 GMT Subject: rpms/python-gasp/devel python-gasp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803040155.m241tYMq005699@cvs-int.fedora.redhat.com> Author: bernie Update of /cvs/pkgs/rpms/python-gasp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5668/devel Modified Files: .cvsignore sources Added Files: python-gasp.spec Log Message: Initial import --- NEW FILE python-gasp.spec --- # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")} Name: python-gasp Version: 0.1.1 Release: 0%{?dist} Summary: API wrapper on top of pygame Group: Development/Libraries License: GPLv3+ URL: http://wiki.laptop.org/go/GASP Source0: http://dev.laptop.org/pub/gasp/releases/SOURCES/python-gasp-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: python-pygame BuildRequires: python-devel BuildRequires: python-setuptools %description GASP provides a simple, procedural graphics API for beginning students using Python. It allows for the easy creation of 1980's style games with litle or no prior programming experince. It is a wrapper around pygame. %prep %setup -q -n %{name}-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYRIGHT TODO THANKS %dir %{python_sitelib}/gasp %{python_sitelib}/gasp/* %dir %{python_sitelib}/gasp-%{version}-py%{python_version}.egg-info %{python_sitelib}/gasp-%{version}-py%{python_version}.egg-info/* %changelog * Mon Feb 04 2008 ffm - 0.1.1-0 - Image support added/fixed, they can now be used anywhere. * Wed Jan 30 2008 ffm - 0.1-5 - FEDORA: Fixed package URL, again * Tue Jan 18 2008 ffm - 0.1-4 - FEDORA: Fixed package URL * Tue Jan 18 2008 ffm - 0.1-3 - More fixes for Fedora packaging. * Sat Jan 18 2008 ffm - 0.1-2 - Removed python as a dependency from the package per the fedora packaging guidelines. * Sat Jan 18 2008 ffm - 0.1-1 - Initial release for packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-gasp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Jan 2008 04:43:55 -0000 1.1 +++ .cvsignore 4 Mar 2008 01:54:59 -0000 1.2 @@ -0,0 +1 @@ +python-gasp-0.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-gasp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Jan 2008 04:43:55 -0000 1.1 +++ sources 4 Mar 2008 01:54:59 -0000 1.2 @@ -0,0 +1 @@ +3888db5e8d7059fd9e7cf5143cf31621 python-gasp-0.1.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 02:05:13 2008 From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie)) Date: Tue, 4 Mar 2008 02:05:13 GMT Subject: rpms/python-gasp/OLPC-2 python-gasp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803040205.m2425DdX013265@cvs-int.fedora.redhat.com> Author: bernie Update of /cvs/pkgs/rpms/python-gasp/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13111/OLPC-2 Modified Files: .cvsignore sources Added Files: python-gasp.spec Log Message: Initial import. --- NEW FILE python-gasp.spec --- # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_version: %define python_version %(%{__python} -c "import sys; print sys.version[0:3]")} Name: python-gasp Version: 0.1.1 Release: 0%{?dist} Summary: API wrapper on top of pygame Group: Development/Libraries License: GPLv3+ URL: http://wiki.laptop.org/go/GASP Source0: http://dev.laptop.org/pub/gasp/releases/SOURCES/python-gasp-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: python-pygame BuildRequires: python-devel BuildRequires: python-setuptools %description GASP provides a simple, procedural graphics API for beginning students using Python. It allows for the easy creation of 1980's style games with litle or no prior programming experince. It is a wrapper around pygame. %prep %setup -q -n %{name}-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYRIGHT TODO THANKS %dir %{python_sitelib}/gasp %{python_sitelib}/gasp/* %dir %{python_sitelib}/gasp-%{version}-py%{python_version}.egg-info %{python_sitelib}/gasp-%{version}-py%{python_version}.egg-info/* %changelog * Mon Feb 04 2008 ffm - 0.1.1-0 - Image support added/fixed, they can now be used anywhere. * Wed Jan 30 2008 ffm - 0.1-5 - FEDORA: Fixed package URL, again * Tue Jan 18 2008 ffm - 0.1-4 - FEDORA: Fixed package URL * Tue Jan 18 2008 ffm - 0.1-3 - More fixes for Fedora packaging. * Sat Jan 18 2008 ffm - 0.1-2 - Removed python as a dependency from the package per the fedora packaging guidelines. * Sat Jan 18 2008 ffm - 0.1-1 - Initial release for packaging Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-gasp/OLPC-2/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Jan 2008 04:43:55 -0000 1.1 +++ .cvsignore 4 Mar 2008 02:04:36 -0000 1.2 @@ -0,0 +1 @@ +python-gasp-0.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-gasp/OLPC-2/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Jan 2008 04:43:55 -0000 1.1 +++ sources 4 Mar 2008 02:04:36 -0000 1.2 @@ -0,0 +1 @@ +3888db5e8d7059fd9e7cf5143cf31621 python-gasp-0.1.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 02:05:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 02:05:54 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803040206.m2426qxx027743@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the watchbugzilla acl on mingetty (Fedora OLPC 2) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Tue Mar 4 02:06:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 02:06:03 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803040206.m2426rVm027762@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the watchcommits acl on mingetty (Fedora OLPC 2) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Tue Mar 4 02:05:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 02:05:56 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803040206.m2426q02027743@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the commit acl on mingetty (Fedora OLPC 2) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Tue Mar 4 02:06:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 02:06:05 +0000 Subject: [pkgdb] mingetty had acl change status Message-ID: <200803040206.m2426rVp027762@bastion.fedora.phx.redhat.com> Bernardo Innocenti (bernie) has set the approveacls acl on mingetty (Fedora OLPC 2) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mingetty From fedora-extras-commits at redhat.com Tue Mar 4 02:24:03 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 02:24:03 GMT Subject: rpms/gstreamer-plugins-base/devel .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 Message-ID: <200803040224.m242O31E013859@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13831 Modified Files: .cvsignore sources Log Message: More missing sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 30 Jan 2008 15:20:50 -0000 1.14 +++ .cvsignore 4 Mar 2008 02:23:24 -0000 1.15 @@ -1 +1 @@ -gst-plugins-base-0.10.17.tar.bz2 +gst-plugins-base-0.10.17.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 30 Jan 2008 15:20:50 -0000 1.15 +++ sources 4 Mar 2008 02:23:24 -0000 1.16 @@ -1 +1 @@ -151b66228e08ab0c7601713030fb1c3f gst-plugins-base-0.10.17.tar.bz2 +b106f6c4ea370d8cba299102452872b2 gst-plugins-base-0.10.17.2.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 02:42:54 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 02:42:54 GMT Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.45, 1.46 Message-ID: <200803040242.m242gsbJ014890@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14783 Modified Files: gstreamer-plugins-base.spec Log Message: Disabled -Werror Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gstreamer-plugins-base.spec 4 Mar 2008 00:57:02 -0000 1.45 +++ gstreamer-plugins-base.spec 4 Mar 2008 02:42:16 -0000 1.46 @@ -56,7 +56,7 @@ --with-package-origin='http://download.fedora.redhat.com/fedora' \ --disable-gtk-doc -make %{?_smp_mflags} +make %{?_smp_mflags} ERROR_CFLAGS="" %install rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Tue Mar 4 02:43:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 02:43:57 GMT Subject: rpms/perl-Crypt-CBC/devel perl-Crypt-CBC.spec,1.7,1.8 Message-ID: <200803040243.m242hvQB015054@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14962 Modified Files: perl-Crypt-CBC.spec Log Message: new perl Index: perl-Crypt-CBC.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-CBC/devel/perl-Crypt-CBC.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Crypt-CBC.spec 8 Feb 2008 18:22:23 -0000 1.7 +++ perl-Crypt-CBC.spec 4 Mar 2008 02:43:11 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Encrypt Data with Cipher Block Chaining Mode Name: perl-Crypt-CBC Version: 2.22 -Release: 2%{?dist} +Release: 3%{?dist} License: Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-CBC/ @@ -46,6 +46,9 @@ %{_mandir}/man3/*.3* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 2.22-3 +- work around buildsystem burp + * Fri Feb 8 2008 Tom "spot" Callaway - 2.22-2 - rebuild for new perl From fedora-extras-commits at redhat.com Tue Mar 4 02:47:32 2008 From: fedora-extras-commits at redhat.com (Tom Lane (tgl)) Date: Tue, 4 Mar 2008 02:47:32 GMT Subject: rpms/mysql/devel mysql-ssl.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 mysql.spec, 1.105, 1.106 sources, 1.31, 1.32 mysql-rename-bug.patch, 1.1, NONE mysql-view-bug.patch, 1.1, NONE Message-ID: <200803040247.m242lW2u015518@cvs-int.fedora.redhat.com> Author: tgl Update of /cvs/pkgs/rpms/mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15441 Modified Files: .cvsignore mysql.spec sources Added Files: mysql-ssl.patch Removed Files: mysql-rename-bug.patch mysql-view-bug.patch Log Message: Update to mysql version 5.0.51a mysql-ssl.patch: --- NEW FILE mysql-ssl.patch --- Repair 5.0.50 SSL breakage, per upstream bug http://bugs.mysql.com/bug.php?id=33050 diff -Naur mysql-5.0.54a.orig/vio/viossl.c mysql-5.0.54a/vio/viossl.c --- mysql-5.0.54a.orig/vio/viossl.c 2008-01-11 09:08:38.000000000 -0500 +++ mysql-5.0.54a/vio/viossl.c 2008-02-12 15:30:42.000000000 -0500 @@ -172,20 +172,15 @@ vio_delete(vio); } -int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout) -{ - DBUG_ENTER("sslaccept"); - DBUG_RETURN(sslconnect(ptr, vio, timeout)); -} - -int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout) +static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, + int (*connect_accept_func)(SSL*)) { SSL *ssl; my_bool unused; my_bool was_blocking; - DBUG_ENTER("sslconnect"); + DBUG_ENTER("ssl_do"); DBUG_PRINT("enter", ("ptr: 0x%lx, sd: %d ctx: 0x%lx", (long) ptr, vio->sd, (long) ptr->ssl_context)); @@ -204,13 +199,9 @@ SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout); SSL_set_fd(ssl, vio->sd); - /* - SSL_do_handshake will select between SSL_connect - or SSL_accept depending on server or client side - */ - if (SSL_do_handshake(ssl) < 1) + if (connect_accept_func(ssl) < 1) { - DBUG_PRINT("error", ("SSL_do_handshake failure")); + DBUG_PRINT("error", ("SSL_connect/accept failure")); report_errors(ssl); SSL_free(ssl); vio_blocking(vio, was_blocking, &unused); @@ -259,6 +250,20 @@ } +int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout) +{ + DBUG_ENTER("sslaccept"); + DBUG_RETURN(ssl_do(ptr, vio, timeout, SSL_accept)); +} + + +int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout) +{ + DBUG_ENTER("sslconnect"); + DBUG_RETURN(ssl_do(ptr, vio, timeout, SSL_connect)); +} + + int vio_ssl_blocking(Vio *vio __attribute__((unused)), my_bool set_blocking_mode, my_bool *old_mode) @@ -269,4 +274,6 @@ return (set_blocking_mode ? 0 : 1); } + + #endif /* HAVE_OPENSSL */ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 22 Jul 2007 20:35:24 -0000 1.31 +++ .cvsignore 4 Mar 2008 02:46:54 -0000 1.32 @@ -1 +1 @@ -mysql-5.0.45.tar.gz +mysql-5.0.51a.tar.gz Index: mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- mysql.spec 3 Mar 2008 22:30:11 -0000 1.105 +++ mysql.spec 4 Mar 2008 02:46:54 -0000 1.106 @@ -1,6 +1,6 @@ Name: mysql -Version: 5.0.45 -Release: 11%{?dist} +Version: 5.0.51a +Release: 1%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -29,8 +29,7 @@ Patch9: mysql-bdb-link.patch Patch10: mysql-bdb-open.patch Patch11: mysql-innodb-crash.patch -Patch12: mysql-rename-bug.patch -Patch13: mysql-view-bug.patch +Patch12: mysql-ssl.patch Patch14: mysql-ss-test.patch Patch15: mysql-stack-guard.patch @@ -140,7 +139,6 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch13 -p1 %patch14 -p1 %patch15 -p1 @@ -254,6 +252,7 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mi_test_all* rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ndb-config-2-node.ini rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql.server +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysqld_multi.server rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/MySQL-shared-compat.spec rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/*.plist rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/preinstall @@ -484,6 +483,9 @@ %{_mandir}/man1/mysql_client_test.1* %changelog +* Mon Mar 3 2008 Tom Lane 5.0.51a-1 +- Update to mysql version 5.0.51a + * Mon Mar 3 2008 Tom Lane 5.0.45-11 - Fix mysql-stack-guard patch to work correctly on IA64 - Fix mysql.init to wait correctly when socket is not in default place Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mysql/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 22 Jul 2007 20:35:24 -0000 1.31 +++ sources 4 Mar 2008 02:46:54 -0000 1.32 @@ -1 +1 @@ -a2a1c5a82bb22b45ab76a8ecab94e10d mysql-5.0.45.tar.gz +a83dbdbb91267daf73d2297a9c283dd1 mysql-5.0.51a.tar.gz --- mysql-rename-bug.patch DELETED --- --- mysql-view-bug.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 02:56:09 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 02:56:09 GMT Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.46, 1.47 Message-ID: <200803040256.m242u952016199@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16179 Modified Files: gstreamer-plugins-base.spec Log Message: * Tue Mar 04 2008 - Bastien Nocera - 0.10.17.2-2 - Enable the GIO plugin Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gstreamer-plugins-base.spec 4 Mar 2008 02:42:16 -0000 1.46 +++ gstreamer-plugins-base.spec 4 Mar 2008 02:55:07 -0000 1.47 @@ -5,7 +5,7 @@ Name: %{gstreamer}-plugins-base Version: 0.10.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer streaming media framework base plug-ins Group: Applications/Multimedia @@ -54,7 +54,8 @@ %configure \ --with-package-name='Fedora Core gstreamer-plugins-base package' \ --with-package-origin='http://download.fedora.redhat.com/fedora' \ - --disable-gtk-doc + --disable-gtk-doc \ + --enable-experimental make %{?_smp_mflags} ERROR_CFLAGS="" @@ -122,6 +123,7 @@ %{_libdir}/gstreamer-%{majorminor}/libgstaudioresample.so %{_libdir}/gstreamer-%{majorminor}/libgstgdp.so %{_libdir}/gstreamer-%{majorminor}/libgstqueue2.so +%{_libdir}/gstreamer-%{majorminor}/libgstgio.so # base plugins with dependencies %{_libdir}/gstreamer-%{majorminor}/libgstalsa.so @@ -240,6 +242,9 @@ %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Tue Mar 04 2008 - Bastien Nocera - 0.10.17.2-2 +- Enable the GIO plugin + * Tue Mar 04 2008 - Bastien Nocera - 0.10.17.2-1 - Update to 0.10.17.2 pre-release From fedora-extras-commits at redhat.com Tue Mar 4 02:58:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 02:58:07 +0000 Subject: [pkgdb] kmid was added for svahl Message-ID: <200803040259.m242x5Fd029359@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package kmid with summary A midi/karaoke player for KDE 4 Kevin Fenzi (kevin) has approved Package kmid Kevin Fenzi (kevin) has added a Fedora devel branch for kmid with an owner of svahl Kevin Fenzi (kevin) has approved kmid in Fedora devel Kevin Fenzi (kevin) has approved Package kmid Kevin Fenzi (kevin) has set commit to Approved for cvsextras on kmid (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on kmid (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on kmid (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kmid From fedora-extras-commits at redhat.com Tue Mar 4 02:58:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 02:58:18 +0000 Subject: [pkgdb] kmid (Fedora, devel) updated by kevin Message-ID: <200803040259.m242x99x029381@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on kmid (Fedora devel) for than Kevin Fenzi (kevin) approved watchcommits on kmid (Fedora devel) for than Kevin Fenzi (kevin) approved commit on kmid (Fedora devel) for than Kevin Fenzi (kevin) approved build on kmid (Fedora devel) for than Kevin Fenzi (kevin) approved approveacls on kmid (Fedora devel) for than Kevin Fenzi (kevin) approved watchbugzilla on kmid (Fedora devel) for rdieter Kevin Fenzi (kevin) approved watchcommits on kmid (Fedora devel) for rdieter Kevin Fenzi (kevin) approved commit on kmid (Fedora devel) for rdieter Kevin Fenzi (kevin) approved build on kmid (Fedora devel) for rdieter Kevin Fenzi (kevin) approved approveacls on kmid (Fedora devel) for rdieter Kevin Fenzi (kevin) approved watchbugzilla on kmid (Fedora devel) for kkofler Kevin Fenzi (kevin) approved watchcommits on kmid (Fedora devel) for kkofler Kevin Fenzi (kevin) approved commit on kmid (Fedora devel) for kkofler Kevin Fenzi (kevin) approved build on kmid (Fedora devel) for kkofler Kevin Fenzi (kevin) approved approveacls on kmid (Fedora devel) for kkofler Kevin Fenzi (kevin) approved watchbugzilla on kmid (Fedora devel) for ltinkl Kevin Fenzi (kevin) approved watchcommits on kmid (Fedora devel) for ltinkl Kevin Fenzi (kevin) approved commit on kmid (Fedora devel) for ltinkl Kevin Fenzi (kevin) approved build on kmid (Fedora devel) for ltinkl Kevin Fenzi (kevin) approved approveacls on kmid (Fedora devel) for ltinkl Kevin Fenzi (kevin) Denied cvsextras for commit access on kmid (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kmid From fedora-extras-commits at redhat.com Tue Mar 4 02:59:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 02:59:05 GMT Subject: rpms/kmid - New directory Message-ID: <200803040259.m242x5HW016370@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kmid In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16325/rpms/kmid Log Message: Directory /cvs/extras/rpms/kmid added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 02:59:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 02:59:17 +0000 Subject: [pkgdb] xfce4-gsynaptics-mcs-plugin was added for cwickert Message-ID: <200803040300.m2430GuS029479@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xfce4-gsynaptics-mcs-plugin with summary GSynaptics icon for the Xfce Settings Manager Kevin Fenzi (kevin) has approved Package xfce4-gsynaptics-mcs-plugin Kevin Fenzi (kevin) has added a Fedora devel branch for xfce4-gsynaptics-mcs-plugin with an owner of cwickert Kevin Fenzi (kevin) has approved xfce4-gsynaptics-mcs-plugin in Fedora devel Kevin Fenzi (kevin) has approved Package xfce4-gsynaptics-mcs-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfce4-gsynaptics-mcs-plugin (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfce4-gsynaptics-mcs-plugin (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfce4-gsynaptics-mcs-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-gsynaptics-mcs-plugin From fedora-extras-commits at redhat.com Tue Mar 4 02:59:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 02:59:20 GMT Subject: rpms/kmid/devel - New directory Message-ID: <200803040259.m242xKDN016388@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kmid/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16325/rpms/kmid/devel Log Message: Directory /cvs/extras/rpms/kmid/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 02:59:26 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 02:59:26 GMT Subject: rpms/kmid Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803040259.m242xQSV016417@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kmid In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16325/rpms/kmid Added Files: Makefile import.log Log Message: Setup of module kmid --- NEW FILE Makefile --- # Top level Makefile for module kmid all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Mar 4 02:59:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 02:59:41 GMT Subject: rpms/kmid/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803040259.m242xfQq016444@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kmid/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16325/rpms/kmid/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kmid --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: kmid # $Id: Makefile,v 1.1 2008/03/04 02:59:26 kevin Exp $ NAME := kmid SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Mar 4 02:59:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 02:59:55 +0000 Subject: [pkgdb] xfce4-gsynaptics-mcs-plugin (Fedora, 8) updated by kevin Message-ID: <200803040300.m2430rDK029570@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xfce4-gsynaptics-mcs-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfce4-gsynaptics-mcs-plugin (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfce4-gsynaptics-mcs-plugin (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfce4-gsynaptics-mcs-plugin (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on xfce4-gsynaptics-mcs-plugin (Fedora 8) for kevin Kevin Fenzi (kevin) approved watchcommits on xfce4-gsynaptics-mcs-plugin (Fedora 8) for kevin Kevin Fenzi (kevin) Approved cvsextras for commit access on xfce4-gsynaptics-mcs-plugin (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-gsynaptics-mcs-plugin From fedora-extras-commits at redhat.com Tue Mar 4 02:59:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 02:59:55 +0000 Subject: [pkgdb] xfce4-gsynaptics-mcs-plugin (Fedora, 7) updated by kevin Message-ID: <200803040300.m2430rDN029570@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for xfce4-gsynaptics-mcs-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfce4-gsynaptics-mcs-plugin (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfce4-gsynaptics-mcs-plugin (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfce4-gsynaptics-mcs-plugin (Fedora 7) Kevin Fenzi (kevin) approved watchbugzilla on xfce4-gsynaptics-mcs-plugin (Fedora 7) for kevin Kevin Fenzi (kevin) approved watchcommits on xfce4-gsynaptics-mcs-plugin (Fedora 7) for kevin Kevin Fenzi (kevin) Approved cvsextras for commit access on xfce4-gsynaptics-mcs-plugin (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-gsynaptics-mcs-plugin From fedora-extras-commits at redhat.com Tue Mar 4 02:59:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 02:59:55 +0000 Subject: [pkgdb] xfce4-gsynaptics-mcs-plugin (Fedora, devel) updated by kevin Message-ID: <200803040300.m2430rDQ029570@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on xfce4-gsynaptics-mcs-plugin (Fedora devel) for kevin Kevin Fenzi (kevin) approved watchcommits on xfce4-gsynaptics-mcs-plugin (Fedora devel) for kevin Kevin Fenzi (kevin) Approved cvsextras for commit access on xfce4-gsynaptics-mcs-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-gsynaptics-mcs-plugin From fedora-extras-commits at redhat.com Tue Mar 4 03:00:14 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 4 Mar 2008 03:00:14 GMT Subject: rpms/tomboy/devel .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 tomboy.spec, 1.75, 1.76 Message-ID: <200803040300.m2430EA9016504@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/tomboy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16437 Modified Files: .cvsignore sources tomboy.spec Log Message: 0.9.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 26 Feb 2008 05:39:57 -0000 1.28 +++ .cvsignore 4 Mar 2008 02:59:39 -0000 1.29 @@ -1 +1 @@ -tomboy-0.9.7.tar.bz2 +tomboy-0.9.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 26 Feb 2008 05:39:57 -0000 1.28 +++ sources 4 Mar 2008 02:59:39 -0000 1.29 @@ -1 +1 @@ -aeb838a5e7d5b36b270fb4b4c5b8da63 tomboy-0.9.7.tar.bz2 +e091169130f3af024148f25d7fe4aba3 tomboy-0.9.8.tar.bz2 Index: tomboy.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- tomboy.spec 26 Feb 2008 05:50:36 -0000 1.75 +++ tomboy.spec 4 Mar 2008 02:59:39 -0000 1.76 @@ -1,5 +1,5 @@ Name: tomboy -Version: 0.9.7 +Version: 0.9.8 Release: 1%{?dist} Summary: Tomboy is a desktop note-taking application for Linux and Unix @@ -116,6 +116,9 @@ %changelog +* Mon Mar 3 2008 Matthias Clasen - 0.9.8-1 +- Update to 0.9.8 + * Tue Feb 26 2008 Matthias Clasen - 0.9.7-1 - Update to 0.9.7 From fedora-extras-commits at redhat.com Tue Mar 4 03:00:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 03:00:39 GMT Subject: rpms/xfce4-gsynaptics-mcs-plugin - New directory Message-ID: <200803040300.m2430dBO016540@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-gsynaptics-mcs-plugin In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16483/rpms/xfce4-gsynaptics-mcs-plugin Log Message: Directory /cvs/extras/rpms/xfce4-gsynaptics-mcs-plugin added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 03:00:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 03:00:44 GMT Subject: rpms/xfce4-gsynaptics-mcs-plugin/devel - New directory Message-ID: <200803040300.m2430iF9016558@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-gsynaptics-mcs-plugin/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16483/rpms/xfce4-gsynaptics-mcs-plugin/devel Log Message: Directory /cvs/extras/rpms/xfce4-gsynaptics-mcs-plugin/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 03:00:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 03:00:59 GMT Subject: rpms/xfce4-gsynaptics-mcs-plugin Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200803040300.m2430xON016591@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-gsynaptics-mcs-plugin In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16483/rpms/xfce4-gsynaptics-mcs-plugin Added Files: Makefile import.log Log Message: Setup of module xfce4-gsynaptics-mcs-plugin --- NEW FILE Makefile --- # Top level Makefile for module xfce4-gsynaptics-mcs-plugin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Mar 4 03:01:06 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 03:01:06 GMT Subject: rpms/xfce4-gsynaptics-mcs-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803040301.m24316xG018447@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-gsynaptics-mcs-plugin/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy16483/rpms/xfce4-gsynaptics-mcs-plugin/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfce4-gsynaptics-mcs-plugin --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xfce4-gsynaptics-mcs-plugin # $Id: Makefile,v 1.1 2008/03/04 03:00:59 kevin Exp $ NAME := xfce4-gsynaptics-mcs-plugin SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Mar 4 03:01:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 03:01:49 +0000 Subject: [pkgdb] midisport-firmware was added for davej Message-ID: <200803040302.m2432dOP029870@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package midisport-firmware with summary firmware for M-Audio/Midiman USB MIDI & Audio device Kevin Fenzi (kevin) has approved Package midisport-firmware Kevin Fenzi (kevin) has added a Fedora devel branch for midisport-firmware with an owner of davej Kevin Fenzi (kevin) has approved midisport-firmware in Fedora devel Kevin Fenzi (kevin) has approved Package midisport-firmware Kevin Fenzi (kevin) has set commit to Approved for cvsextras on midisport-firmware (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on midisport-firmware (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on midisport-firmware (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/midisport-firmware From fedora-extras-commits at redhat.com Tue Mar 4 03:01:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 03:01:44 +0000 Subject: [pkgdb] midisport-firmware (Fedora, devel) updated by kevin Message-ID: <200803040302.m2432gT6029889@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on midisport-firmware (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/midisport-firmware From fedora-extras-commits at redhat.com Tue Mar 4 03:02:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 03:02:41 GMT Subject: rpms/midisport-firmware - New directory Message-ID: <200803040302.m2432ftV024002@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/midisport-firmware In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23760/rpms/midisport-firmware Log Message: Directory /cvs/extras/rpms/midisport-firmware added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 03:02:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 03:02:44 GMT Subject: rpms/midisport-firmware/devel - New directory Message-ID: <200803040302.m2432i10024018@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/midisport-firmware/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23760/rpms/midisport-firmware/devel Log Message: Directory /cvs/extras/rpms/midisport-firmware/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 03:03:02 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 03:03:02 GMT Subject: rpms/midisport-firmware Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803040303.m24332Qg024045@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/midisport-firmware In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23760/rpms/midisport-firmware Added Files: Makefile import.log Log Message: Setup of module midisport-firmware --- NEW FILE Makefile --- # Top level Makefile for module midisport-firmware all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Mar 4 03:03:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 03:03:20 GMT Subject: rpms/midisport-firmware/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803040303.m2433KsT024061@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/midisport-firmware/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR23760/rpms/midisport-firmware/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module midisport-firmware --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: midisport-firmware # $Id: Makefile,v 1.1 2008/03/04 03:03:02 kevin Exp $ NAME := midisport-firmware SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Mar 4 03:13:58 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Tue, 4 Mar 2008 03:13:58 GMT Subject: rpms/e2fsprogs/devel e2fsprogs-resize-fix.patch,1.1,1.2 Message-ID: <200803040313.m243DwfR024203@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/e2fsprogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24172 Modified Files: e2fsprogs-resize-fix.patch Log Message: one more try e2fsprogs-resize-fix.patch: Index: e2fsprogs-resize-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs-resize-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- e2fsprogs-resize-fix.patch 3 Mar 2008 20:41:09 -0000 1.1 +++ e2fsprogs-resize-fix.patch 4 Mar 2008 03:13:49 -0000 1.2 @@ -2,29 +2,107 @@ =================================================================== --- e2fsprogs-1.40.7.orig/resize/resize2fs.c +++ e2fsprogs-1.40.7/resize/resize2fs.c -@@ -1168,11 +1168,12 @@ static errcode_t inode_scan_and_fix(ext2 +@@ -1109,8 +1109,7 @@ static errcode_t inode_scan_and_fix(ext2 + { + struct process_block_struct pb; + ext2_ino_t ino, new_inode; +- struct ext2_inode inode, *buf = NULL; +- struct ext2_inode_large *large_inode; ++ struct ext2_inode *inode = NULL; + ext2_inode_scan scan = NULL; + errcode_t retval; + int group; +@@ -1154,12 +1153,12 @@ static errcode_t inode_scan_and_fix(ext2 + } + ext2fs_set_inode_callback(scan, progress_callback, (void *) rfs); + pb.rfs = rfs; +- pb.inode = &inode; ++ pb.inode = inode; + pb.error = 0; + new_inode = EXT2_FIRST_INODE(rfs->new_fs->super); + inode_size = EXT2_INODE_SIZE(rfs->new_fs->super); +- buf = malloc(inode_size); +- if (!buf) { ++ inode = malloc(inode_size); ++ if (!inode) { + retval = ENOMEM; + goto errout; + } +@@ -1168,29 +1167,29 @@ static errcode_t inode_scan_and_fix(ext2 * elsewhere in the inode table */ while (1) { - retval = ext2fs_get_next_inode(scan, &ino, &inode); -+ retval = ext2fs_get_next_inode_full(scan, &ino, buf, inode_size); ++ retval = ext2fs_get_next_inode_full(scan, &ino, inode, inode_size); if (retval) goto errout; if (!ino) break; -+ memcpy(&inode, buf, sizeof(struct ext2_inode)); - if (inode.i_links_count == 0 && ino != EXT2_RESIZE_INO) +- if (inode.i_links_count == 0 && ino != EXT2_RESIZE_INO) ++ if (inode->i_links_count == 0 && ino != EXT2_RESIZE_INO) continue; /* inode not in use */ -@@ -1221,10 +1222,7 @@ static errcode_t inode_scan_and_fix(ext2 +- pb.is_dir = LINUX_S_ISDIR(inode.i_mode); ++ pb.is_dir = LINUX_S_ISDIR(inode->i_mode); + pb.changed = 0; + +- if (inode.i_file_acl && rfs->bmap) { ++ if (inode->i_file_acl && rfs->bmap) { + new_block = ext2fs_extent_translate(rfs->bmap, +- inode.i_file_acl); ++ inode->i_file_acl); + if (new_block) { +- inode.i_file_acl = new_block; +- retval = ext2fs_write_inode(rfs->old_fs, +- ino, &inode); ++ inode->i_file_acl = new_block; ++ retval = ext2fs_write_inode_full(rfs->old_fs, ++ ino, inode, inode_size); + if (retval) goto errout; + } + } + +- if (ext2fs_inode_has_valid_blocks(&inode) && ++ if (ext2fs_inode_has_valid_blocks(inode) && + (rfs->bmap || pb.is_dir)) { + pb.ino = ino; + retval = ext2fs_block_iterate2(rfs->old_fs, +@@ -1221,23 +1220,19 @@ static errcode_t inode_scan_and_fix(ext2 } } ext2fs_mark_inode_bitmap(rfs->new_fs->inode_map, new_inode); - memcpy(buf, &inode, sizeof(struct ext2_inode)); - large_inode = (struct ext2_inode_large *)buf; +- large_inode = (struct ext2_inode_large *)buf; - large_inode->i_extra_isize = sizeof(struct ext2_inode_large) - - EXT2_GOOD_OLD_INODE_SIZE; if (pb.changed) { /* Get the new version of the inode */ retval = ext2fs_read_inode_full(rfs->old_fs, ino, - +- buf, inode_size); ++ inode, inode_size); + if (retval) goto errout; + } +- inode.i_ctime = time(0); ++ inode->i_ctime = time(0); + retval = ext2fs_write_inode_full(rfs->old_fs, new_inode, +- buf, inode_size); ++ inode, inode_size); + if (retval) goto errout; + + group = (new_inode-1) / EXT2_INODES_PER_GROUP(rfs->new_fs->super); +- if (LINUX_S_ISDIR(inode.i_mode)) ++ if (LINUX_S_ISDIR(inode->i_mode)) + rfs->new_fs->group_desc[group].bg_used_dirs_count++; + + #ifdef RESIZE2FS_DEBUG +@@ -1263,8 +1258,8 @@ errout: + ext2fs_close_inode_scan(scan); + if (block_buf) + ext2fs_free_mem(&block_buf); +- if (buf) +- free(buf); ++ if (inode) ++ free(inode); + return retval; + } + From fedora-extras-commits at redhat.com Tue Mar 4 03:27:02 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Tue, 4 Mar 2008 03:27:02 GMT Subject: rpms/mediawiki/F-7 .cvsignore, 1.12, 1.13 mediawiki.spec, 1.18, 1.19 sources, 1.12, 1.13 Message-ID: <200803040327.m243R2hd024669@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/mediawiki/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24608/F-7 Modified Files: .cvsignore mediawiki.spec sources Log Message: Update to 1.10.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki/F-7/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 12 Sep 2007 18:10:52 -0000 1.12 +++ .cvsignore 4 Mar 2008 03:26:26 -0000 1.13 @@ -1,2 +1,3 @@ mediawiki-1.9.1-commoncode.patch -mediawiki-1.9.4.tar.gz +mediawiki-1.10.3.tar.gz +mediawiki-1.10.4.tar.gz Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/F-7/mediawiki.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mediawiki.spec 12 Sep 2007 18:10:52 -0000 1.18 +++ mediawiki.spec 4 Mar 2008 03:26:26 -0000 1.19 @@ -1,11 +1,11 @@ Summary: A wiki engine Name: mediawiki -Version: 1.9.4 -Release: 35%{?dist} +Version: 1.10.4 +Release: 38%{?dist} License: GPL Group: Development/Tools -URL: http://wikipedia.sourceforge.net/ -Source0: http://download.wikimedia.org/mediawiki/1.9/%{name}-%{version}.tar.gz +URL: http://www.mediawiki.org/ +Source0: http://download.wikimedia.org/mediawiki/1.10/%{name}-%{version}.tar.gz Patch0: mediawiki-1.9.1-commoncode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ocaml >= 3.06 @@ -88,14 +88,21 @@ /var/www/wiki/config/* %changelog -* Wed Sep 12 2007 Ville Skytt?? - 1.9.4-35 -- Update to 1.9.4 (security; http://secunia.com/advisories/26772/, #287881) +* Tue Mar 4 2008 Axel Thimm - 1.10.4-38 +- Update to 1.10.4. -* Mon Aug 6 2007 Axel Thimm - 1.9.3-34.0.1 -- Bump release to please koji/CVS. +* Tue Feb 17 2008 Axel Thimm - 1.10.3-37 +- Update to 1.10.3. +- Fixes CVE-2008-0460 (bug #430286). + +* Wed Sep 12 2007 Ville Skytt?? - 1.10.2-36 +- Update to 1.10.2 (security; http://secunia.com/advisories/26772/, #287881) + +* Wed May 9 2007 Axel Thimm - 1.10.0-35 +- Update to 1.10.0. * Thu Feb 22 2007 Axel Thimm - 1.9.3-34 -- Update to 1.9.3. +- Update to 1.9.4. * Mon Feb 5 2007 Axel Thimm - 1.9.2-33 - Update to 1.9.2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki/F-7/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 12 Sep 2007 18:10:52 -0000 1.12 +++ sources 4 Mar 2008 03:26:26 -0000 1.13 @@ -1,2 +1,2 @@ d2fa9f438e9af6cc88ded2cf2af3a07c mediawiki-1.9.1-commoncode.patch -e97a74e17fe2f067b7c3fc040e1eddee mediawiki-1.9.4.tar.gz +d81e5607a365b71f09496864e0aa93bb mediawiki-1.10.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 03:27:07 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Tue, 4 Mar 2008 03:27:07 GMT Subject: rpms/mediawiki/F-8 .cvsignore, 1.13, 1.14 mediawiki.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200803040327.m243R7im024674@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/mediawiki/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24608/F-8 Modified Files: .cvsignore mediawiki.spec sources Log Message: Update to 1.10.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki/F-8/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 12 Sep 2007 18:03:47 -0000 1.13 +++ .cvsignore 4 Mar 2008 03:26:32 -0000 1.14 @@ -1,2 +1,3 @@ mediawiki-1.9.1-commoncode.patch -mediawiki-1.10.2.tar.gz +mediawiki-1.10.3.tar.gz +mediawiki-1.10.4.tar.gz Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/F-8/mediawiki.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mediawiki.spec 12 Sep 2007 18:03:47 -0000 1.18 +++ mediawiki.spec 4 Mar 2008 03:26:32 -0000 1.19 @@ -1,7 +1,7 @@ Summary: A wiki engine Name: mediawiki -Version: 1.10.2 -Release: 36%{?dist} +Version: 1.10.4 +Release: 38%{?dist} License: GPL Group: Development/Tools URL: http://www.mediawiki.org/ @@ -88,6 +88,13 @@ /var/www/wiki/config/* %changelog +* Tue Mar 4 2008 Axel Thimm - 1.10.4-38 +- Update to 1.10.4. + +* Tue Feb 17 2008 Axel Thimm - 1.10.3-37 +- Update to 1.10.3. +- Fixes CVE-2008-0460 (bug #430286). + * Wed Sep 12 2007 Ville Skytt?? - 1.10.2-36 - Update to 1.10.2 (security; http://secunia.com/advisories/26772/, #287881) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki/F-8/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 12 Sep 2007 18:03:47 -0000 1.13 +++ sources 4 Mar 2008 03:26:32 -0000 1.14 @@ -1,2 +1,2 @@ d2fa9f438e9af6cc88ded2cf2af3a07c mediawiki-1.9.1-commoncode.patch -f1a5659624444c7101f258c7d43b03a0 mediawiki-1.10.2.tar.gz +d81e5607a365b71f09496864e0aa93bb mediawiki-1.10.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 03:27:15 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Tue, 4 Mar 2008 03:27:15 GMT Subject: rpms/mediawiki/devel .cvsignore, 1.13, 1.14 mediawiki.spec, 1.19, 1.20 sources, 1.13, 1.14 Message-ID: <200803040327.m243RFdD024679@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/mediawiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24608/devel Modified Files: .cvsignore mediawiki.spec sources Log Message: Update to 1.10.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 12 Sep 2007 18:03:47 -0000 1.13 +++ .cvsignore 4 Mar 2008 03:26:38 -0000 1.14 @@ -1,2 +1,3 @@ mediawiki-1.9.1-commoncode.patch -mediawiki-1.10.2.tar.gz +mediawiki-1.10.3.tar.gz +mediawiki-1.10.4.tar.gz Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mediawiki.spec 18 Feb 2008 19:39:26 -0000 1.19 +++ mediawiki.spec 4 Mar 2008 03:26:38 -0000 1.20 @@ -1,7 +1,7 @@ Summary: A wiki engine Name: mediawiki -Version: 1.10.2 -Release: 37%{?dist} +Version: 1.10.4 +Release: 38%{?dist} License: GPL Group: Development/Tools URL: http://www.mediawiki.org/ @@ -88,8 +88,12 @@ /var/www/wiki/config/* %changelog -* Mon Feb 18 2008 Fedora Release Engineering - 1.10.2-37 -- Autorebuild for GCC 4.3 +* Tue Mar 4 2008 Axel Thimm - 1.10.4-38 +- Update to 1.10.4. + +* Tue Feb 17 2008 Axel Thimm - 1.10.3-37 +- Update to 1.10.3. +- Fixes CVE-2008-0460 (bug #430286). * Wed Sep 12 2007 Ville Skytt?? - 1.10.2-36 - Update to 1.10.2 (security; http://secunia.com/advisories/26772/, #287881) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 12 Sep 2007 18:03:47 -0000 1.13 +++ sources 4 Mar 2008 03:26:38 -0000 1.14 @@ -1,2 +1,2 @@ d2fa9f438e9af6cc88ded2cf2af3a07c mediawiki-1.9.1-commoncode.patch -f1a5659624444c7101f258c7d43b03a0 mediawiki-1.10.2.tar.gz +d81e5607a365b71f09496864e0aa93bb mediawiki-1.10.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 03:40:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 03:40:06 GMT Subject: rpms/perl-Pugs-Compiler-Rule/devel perl-Pugs-Compiler-Rule.spec, 1.7, 1.8 Message-ID: <200803040340.m243e6iU024906@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Pugs-Compiler-Rule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24878 Modified Files: perl-Pugs-Compiler-Rule.spec Log Message: new perl Index: perl-Pugs-Compiler-Rule.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Pugs-Compiler-Rule/devel/perl-Pugs-Compiler-Rule.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Pugs-Compiler-Rule.spec 22 Feb 2008 00:25:35 -0000 1.7 +++ perl-Pugs-Compiler-Rule.spec 4 Mar 2008 03:39:26 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Pugs-Compiler-Rule Version: 0.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compiler for Perl 6 Rules License: GPL+ or Artistic Group: Development/Libraries @@ -67,6 +67,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 0.28-2 +- rebuild for new perl (again) + * Wed Feb 20 2008 Steven Pritchard 0.28-1 - Update to 0.28. - Update License tag. From fedora-extras-commits at redhat.com Tue Mar 4 03:51:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 03:51:34 GMT Subject: rpms/fontforge/devel fontforge.spec,1.30,1.31 Message-ID: <200803040351.m243pY4K025307@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fontforge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25269 Modified Files: fontforge.spec Log Message: Update to upstream 20080302 Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- fontforge.spec 3 Mar 2008 01:05:31 -0000 1.30 +++ fontforge.spec 4 Mar 2008 03:50:41 -0000 1.31 @@ -1,9 +1,9 @@ -%define docs_version 20080203 +%define docs_version 20080302 %define gettext_package FontForge Name: fontforge -Version: 20080203 -Release: 2%{?dist} +Version: 20080302 +Release: 1%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -27,7 +27,6 @@ BuildRequires: libXt-devel BuildRequires: xorg-x11-proto-devel BuildRequires: gettext -BuildRequires: libtool Obsoletes: pfaedit Provides: pfaedit @@ -67,7 +66,11 @@ %build %configure --with-freetype-bytecode=no -make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} + +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -123,6 +126,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 03 2008 Kevin Fenzi - 20080302-1 +- Update to upstream 20080302 + * Sun Mar 02 2008 Kevin Fenzi - 20080203-2 - Change Requires from htmlview to xdg-utils (bz 312691) From fedora-extras-commits at redhat.com Tue Mar 4 03:54:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 03:54:19 GMT Subject: rpms/perl-Convert-Binary-C/devel perl-Convert-Binary-C.spec, 1.8, 1.9 Message-ID: <200803040354.m243sJxp025403@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Convert-Binary-C/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25379 Modified Files: perl-Convert-Binary-C.spec Log Message: new perl Index: perl-Convert-Binary-C.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-Binary-C/devel/perl-Convert-Binary-C.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Convert-Binary-C.spec 23 Feb 2008 07:56:53 -0000 1.8 +++ perl-Convert-Binary-C.spec 4 Mar 2008 03:53:44 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Convert-Binary-C Version: 0.70 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Binary data conversion using C types License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 0.70-5 +- rebuild for new perl (again) + * Sat Feb 23 2008 Alex Lancaster - 0.70-4 - Bump release to fix koji problem that prevented tagging the previous (correct) build. From fedora-extras-commits at redhat.com Tue Mar 4 04:02:40 2008 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Tue, 4 Mar 2008 04:02:40 GMT Subject: rpms/papyrus/devel papyrus.patch,NONE,1.1 papyrus.spec,1.13,1.14 Message-ID: <200803040402.m2442eYm000549@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/papyrus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32649 Modified Files: papyrus.spec Added Files: papyrus.patch Log Message: papyrus.patch: --- NEW FILE papyrus.patch --- diff -r -U 5 papyrus-0.7.1.orig/demos/papyrus-demo/demowindow.cc papyrus-0.7.1/demos/papyrus-demo/demowindow.cc --- papyrus-0.7.1.orig/demos/papyrus-demo/demowindow.cc 2007-02-24 17:08:42.000000000 -0700 +++ papyrus-0.7.1/demos/papyrus-demo/demowindow.cc 2008-03-03 20:46:57.000000000 -0700 @@ -29,10 +29,11 @@ #include "demos.h" #include #include #include #include +#include #ifdef NEED_FLOCKFILE_PROTO extern "C" void flockfile (FILE *); #endif #ifdef NEED_FUNLOCKFILE_PROTO diff -r -U 5 papyrus-0.7.1.orig/demos/papyrus-demo/textwidget.cc papyrus-0.7.1/demos/papyrus-demo/textwidget.cc --- papyrus-0.7.1.orig/demos/papyrus-demo/textwidget.cc 2007-02-24 17:08:42.000000000 -0700 +++ papyrus-0.7.1/demos/papyrus-demo/textwidget.cc 2008-03-03 20:49:40.000000000 -0700 @@ -19,10 +19,11 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "textwidget.h" #include "pangomm/fontdescription.h" +#include TextWidget::TextWidget(bool is_source) { set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); diff -r -U 5 papyrus-0.7.1.orig/demos/papyrusmm-demo/demowindow.cc papyrus-0.7.1/demos/papyrusmm-demo/demowindow.cc --- papyrus-0.7.1.orig/demos/papyrusmm-demo/demowindow.cc 2007-02-24 17:08:57.000000000 -0700 +++ papyrus-0.7.1/demos/papyrusmm-demo/demowindow.cc 2008-03-03 20:47:18.000000000 -0700 @@ -29,10 +29,11 @@ #include "demos.h" #include #include #include #include +#include #ifdef NEED_FLOCKFILE_PROTO extern "C" void flockfile (FILE *); #endif #ifdef NEED_FUNLOCKFILE_PROTO diff -r -U 5 papyrus-0.7.1.orig/demos/papyrusmm-demo/textwidget.cc papyrus-0.7.1/demos/papyrusmm-demo/textwidget.cc --- papyrus-0.7.1.orig/demos/papyrusmm-demo/textwidget.cc 2007-02-24 17:08:58.000000000 -0700 +++ papyrus-0.7.1/demos/papyrusmm-demo/textwidget.cc 2008-03-03 20:49:54.000000000 -0700 @@ -19,10 +19,11 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "textwidget.h" #include "pangomm/fontdescription.h" +#include TextWidget::TextWidget(bool is_source) { set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); diff -r -U 5 papyrus-0.7.1.orig/papyrus/handlebox.cpp papyrus-0.7.1/papyrus/handlebox.cpp --- papyrus-0.7.1.orig/papyrus/handlebox.cpp 2007-02-24 16:05:14.000000000 -0700 +++ papyrus-0.7.1/papyrus/handlebox.cpp 2008-03-03 20:34:48.000000000 -0700 @@ -19,10 +19,12 @@ #include "handlebox.h" #include "circle.h" #include "rgba.h" +#include + namespace Papyrus { Handlebox::Handlebox(Handles handles) : Boxed(), m_initializing(true) { Index: papyrus.spec =================================================================== RCS file: /cvs/extras/rpms/papyrus/devel/papyrus.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- papyrus.spec 19 Feb 2008 22:55:12 -0000 1.13 +++ papyrus.spec 4 Mar 2008 04:02:03 -0000 1.14 @@ -2,13 +2,14 @@ Summary: Papyrus is a C++ canvas library similar to the Gnome canvas Name: papyrus Version: 0.7.1 -Release: 2%{?dist} -License: LGPL +Release: 3%{?dist} +License: LGPLv2 URL: http://libpapyrus.sourceforge.net/ Group: System Environment/Libraries Source: http://download.sourceforge.net/libpapyrus/%{name}-%{version}.tar.bz2 +Patch0: papyrus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 pkgconfig m4 +BuildRequires: gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 boost-devel pkgconfig m4 %description Papyrus is a C++ canvas library similar in scope @@ -29,6 +30,7 @@ %prep %setup -q +%patch -p1 %build %configure --enable-static=no @@ -66,6 +68,10 @@ %{_datadir}/papyrusmm-0.7.1/ %changelog +* Mon Mar 03 2008 Rick L Vinyard Jr - 0.7.1-3 +- Added boost-devel dependency +- Added INT_MAX patch + * Tue Feb 19 2008 Fedora Release Engineering - 0.7.1-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 04:07:27 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 04:07:27 GMT Subject: rpms/fontforge/devel sources, 1.16, 1.17 .cvsignore, 1.16, 1.17 fontforge.spec, 1.31, 1.32 Message-ID: <200803040407.m2447RTD001497@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fontforge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1286 Modified Files: sources .cvsignore fontforge.spec Log Message: commit the sources too Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 2 Mar 2008 16:29:16 -0000 1.16 +++ sources 4 Mar 2008 04:06:43 -0000 1.17 @@ -1,2 +1,2 @@ -c5a309c85821804424abbc3b8e78839d fontforge_full-20080203.tar.bz2 -1f2a227d350c03a1c1b336b97cf55ab6 fontforge_htdocs-20080203.tar.bz2 +9b1e527648301f79f43becd4c0087a0a fontforge_full-20080302.tar.bz2 +dfe77acaa6c0c3140baa9dc499af9066 fontforge_htdocs-20080302.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 2 Mar 2008 16:29:16 -0000 1.16 +++ .cvsignore 4 Mar 2008 04:06:43 -0000 1.17 @@ -1,2 +1,2 @@ -fontforge_full-20080203.tar.bz2 -fontforge_htdocs-20080203.tar.bz2 +fontforge_full-20080302.tar.bz2 +fontforge_htdocs-20080302.tar.bz2 Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- fontforge.spec 4 Mar 2008 03:50:41 -0000 1.31 +++ fontforge.spec 4 Mar 2008 04:06:43 -0000 1.32 @@ -3,7 +3,7 @@ Name: fontforge Version: 20080302 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -126,6 +126,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 03 2008 Kevin Fenzi - 20080302-2 +- Commit new sources + * Mon Mar 03 2008 Kevin Fenzi - 20080302-1 - Update to upstream 20080302 From fedora-extras-commits at redhat.com Tue Mar 4 04:08:50 2008 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Tue, 4 Mar 2008 04:08:50 GMT Subject: rpms/papyrus/devel .cvsignore,1.9,1.10 sources,1.9,1.10 Message-ID: <200803040408.m2448oXl001803@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/papyrus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1630 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/papyrus/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 11 Mar 2007 18:09:55 -0000 1.9 +++ .cvsignore 4 Mar 2008 04:08:01 -0000 1.10 @@ -1 +1,2 @@ papyrus-0.7.1.tar.bz2 +papyrus.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/papyrus/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 11 Mar 2007 18:09:55 -0000 1.9 +++ sources 4 Mar 2008 04:08:01 -0000 1.10 @@ -1 +1,2 @@ d25b6df97378549840ce7f4bad6a64dd papyrus-0.7.1.tar.bz2 +acc829df7aafb169747bc00eed7535c1 papyrus.patch From fedora-extras-commits at redhat.com Tue Mar 4 04:16:26 2008 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Tue, 4 Mar 2008 04:16:26 GMT Subject: rpms/clipsmm/devel clipsmm.spec,1.2,1.3 Message-ID: <200803040416.m244GQsC003037@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clipsmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2916 Modified Files: clipsmm.spec Log Message: Index: clipsmm.spec =================================================================== RCS file: /cvs/extras/rpms/clipsmm/devel/clipsmm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clipsmm.spec 19 Feb 2008 22:50:16 -0000 1.2 +++ clipsmm.spec 4 Mar 2008 04:15:47 -0000 1.3 @@ -2,13 +2,13 @@ Summary: Clipsmm is a C++ wrapper for the CLIPS C library Name: clipsmm Version: 0.0.7 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2 URL: http://clipsmm.sourceforge.net Group: System Environment/Libraries Source: http://download.sourceforge.net/clipsmm/clipsmm-0.0.7.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: clips-devel >= 6.24 glibmm24-devel >= 2.6.0 cppunit-devel >= 1.11 pkgconfig m4 +BuildRequires: clips-devel >= 6.24 glibmm24-devel >= 2.6.0 cppunit-devel >= 1.11 boost-devel pkgconfig m4 %description The clipsmm library provides a C++ interface to the CLIPS C library. @@ -61,6 +61,9 @@ %changelog +* Mon Mar 03 2008 Rick L Vinyard Jr - 0.0.7-3 +- Added boost-devel dependency + * Tue Feb 19 2008 Fedora Release Engineering - 0.0.7-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 04:20:42 2008 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Tue, 4 Mar 2008 04:20:42 GMT Subject: rpms/clipsmm/devel clipsmm.spec,1.3,1.4 Message-ID: <200803040420.m244KgOr003800@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/clipsmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3654 Modified Files: clipsmm.spec Log Message: Index: clipsmm.spec =================================================================== RCS file: /cvs/extras/rpms/clipsmm/devel/clipsmm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clipsmm.spec 4 Mar 2008 04:15:47 -0000 1.3 +++ clipsmm.spec 4 Mar 2008 04:19:53 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Clipsmm is a C++ wrapper for the CLIPS C library Name: clipsmm Version: 0.0.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: http://clipsmm.sourceforge.net Group: System Environment/Libraries @@ -61,6 +61,9 @@ %changelog +* Mon Mar 03 2008 Rick L Vinyard Jr - 0.0.7-4 +- Bump release for make-tag error + * Mon Mar 03 2008 Rick L Vinyard Jr - 0.0.7-3 - Added boost-devel dependency From fedora-extras-commits at redhat.com Tue Mar 4 04:25:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 04:25:04 GMT Subject: rpms/perl-Unicode-Map/devel perl-Unicode-Map.spec,1.13,1.14 Message-ID: <200803040425.m244P4fF004639@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Unicode-Map/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4531 Modified Files: perl-Unicode-Map.spec Log Message: new perl Index: perl-Unicode-Map.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Unicode-Map/devel/perl-Unicode-Map.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Unicode-Map.spec 18 Feb 2008 18:23:04 -0000 1.13 +++ perl-Unicode-Map.spec 4 Mar 2008 04:24:29 -0000 1.14 @@ -2,7 +2,7 @@ Name: perl-Unicode-Map Version: 0.112 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Perl module for mapping charsets from and to utf16 unicode @@ -75,6 +75,9 @@ %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 0.112-14 +- rebuild for new perl (again) + * Mon Feb 18 2008 Fedora Release Engineering - 0.112-13 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 04:26:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 04:26:57 GMT Subject: rpms/perl-Proc-ProcessTable/devel perl-Proc-ProcessTable.spec, 1.3, 1.4 Message-ID: <200803040426.m244QvDl004991@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Proc-ProcessTable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4862 Modified Files: perl-Proc-ProcessTable.spec Log Message: new perl Index: perl-Proc-ProcessTable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Proc-ProcessTable/devel/perl-Proc-ProcessTable.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Proc-ProcessTable.spec 19 Feb 2008 05:22:50 -0000 1.3 +++ perl-Proc-ProcessTable.spec 4 Mar 2008 04:26:13 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Proc-ProcessTable Version: 0.41 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl extension to access the unix process table License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 0.41-4 +- rebuild for new perl (again) + * Tue Feb 19 2008 Fedora Release Engineering - 0.41-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 04:38:11 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Tue, 4 Mar 2008 04:38:11 GMT Subject: rpms/gdm/devel gdm.spec,1.337,1.338 Message-ID: <200803040438.m244cBHR006797@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6596 Modified Files: gdm.spec Log Message: - Be more explicit in file list; use less globs - Don't package user-switcher in both packages! Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.337 retrieving revision 1.338 diff -u -r1.337 -r1.338 --- gdm.spec 29 Feb 2008 22:04:23 -0000 1.337 +++ gdm.spec 4 Mar 2008 04:37:14 -0000 1.338 @@ -19,7 +19,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.21.9 -Release: 0.2008.02.29.1%{?dist} +Release: 0.2008.02.29.2%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -97,7 +97,7 @@ %package user-switch-applet Summary: GDM User Switcher Panel Applet Group: User Interface/Desktops -Requires: gdm >= 0:2.21.9 +Requires: gdm >= 0:2.21.9-0 Obsoletes: fast-user-switch-applet Provides: fast-user-switch-applet = %{epoch}:%{version}-%{release} @@ -276,9 +276,20 @@ %{_datadir}/pixmaps/faces/*.png %{_datadir}/pixmaps/faces/*.jpg %{_datadir}/icons/hicolor/*/apps/*.png -%{_libexecdir}/* -%{_sbindir}/* -%{_bindir}/* +%{_libexecdir}/gdm-factory-slave +%{_libexecdir}/gdm-host-chooser +%{_libexecdir}/gdm-product-slave +%{_libexecdir}/gdm-session-worker +%{_libexecdir}/gdm-simple-chooser +%{_libexecdir}/gdm-simple-greeter +%{_libexecdir}/gdm-simple-slave +%{_libexecdir}/gdm-xdmcp-chooser-slave +%{_sbindir}/gdm +%{_sbindir}/gdm-binary +%{_sbindir}/gdm-restart +%{_sbindir}/gdm-safe-restart +%{_sbindir}/gdm-stop +%{_bindir}/gdmflexiserver %{_datadir}/gdm/*.glade %{_sysconfdir}/gconf/schemas/*.schemas %dir %{_datadir}/gdm @@ -299,6 +310,10 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Mon Mar 3 2008 Ray Strode - 1:2.21.9-0.2008.02.29.2 +- Be more explicit in file list; use less globs +- Don't package user-switcher in both packages! + * Fri Feb 29 2008 Ray Strode - 1:2.21.9-0.2008.02.29.1 - Update to snapshot - Split user-switcher out From fedora-extras-commits at redhat.com Tue Mar 4 04:39:32 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Tue, 4 Mar 2008 04:39:32 GMT Subject: rpms/scim/devel scim-1.4.7-fix-gdm.patch, NONE, 1.1 scim.spec, 1.108, 1.109 Message-ID: <200803040439.m244dW1G007046@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6907 Modified Files: scim.spec Added Files: scim-1.4.7-fix-gdm.patch Log Message: Let scim gtkim context work with gtk plug widget #251878. scim-1.4.7-fix-gdm.patch: --- NEW FILE scim-1.4.7-fix-gdm.patch --- diff -up scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp.fix-gdm scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp --- scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp.fix-gdm 2008-03-04 11:53:56.000000000 +0800 +++ scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp 2008-03-04 11:56:59.000000000 +0800 @@ -63,6 +63,8 @@ #include "scim_x11_utils.h" #endif +#define SEND_EVENT_MASK 0x02 + using namespace scim; #include "gtkimcontextscim.h" @@ -1024,7 +1026,7 @@ gtk_scim_key_snooper (GtkWidget *grab gboolean ret = FALSE; - if (_focused_ic && _focused_ic->impl && (event->type == GDK_KEY_PRESS || event->type == GDK_KEY_RELEASE) && !event->send_event) { + if (_focused_ic && _focused_ic->impl && (event->type == GDK_KEY_PRESS || event->type == GDK_KEY_RELEASE) && !(event->send_event & SEND_EVENT_MASK)) { _focused_widget = grab_widget; KeyEvent key = keyevent_gdk_to_scim (_focused_ic, *event); @@ -1054,7 +1056,7 @@ gtk_scim_key_snooper (GtkWidget *grab } else { SCIM_DEBUG_FRONTEND(3) << "Failed snooper: " << ((!_focused_ic || !_focused_ic->impl) ? "Invalid focused ic" : - (event->send_event ? "send event is set" : "unknown")) + ((event->send_event & SEND_EVENT_MASK) ? "send event is set" : "unknown")) << "\n"; } @@ -1639,7 +1641,7 @@ keyevent_scim_to_gdk (const GtkIMContext gdkevent.type = (scimkey.is_key_release () ? GDK_KEY_RELEASE : GDK_KEY_PRESS); gdkevent.window = ((ic && ic->impl) ? ic->impl->client_window : 0); - gdkevent.send_event = TRUE; + gdkevent.send_event |= SEND_EVENT_MASK; gdkevent.time = get_time (); gdkevent.keyval = scimkey.code; gdkevent.length = 0; Index: scim.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- scim.spec 3 Mar 2008 10:21:33 -0000 1.108 +++ scim.spec 4 Mar 2008 04:38:54 -0000 1.109 @@ -3,7 +3,7 @@ Name: scim Version: 1.4.7 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Smart Common Input Method platform License: LGPLv2+ @@ -40,6 +40,7 @@ Patch19: scim-1.4.7-remove-locale.patch Patch20: scim-1.4.7-fix-fallback.patch Patch21: scim-1.4.7-fix-capslock.patch +Patch22: scim-1.4.7-fix-gdm.patch %description SCIM is a user friendly and full featured input method user interface and @@ -159,7 +160,8 @@ %patch18 -p1 -b .18-sinhala~ %patch19 -p1 -b .19-remove-locale~ %patch20 -p1 -b .20-fix-fallback -%patch21 -p1 -b .20-fix-capslock +%patch21 -p1 -b .21-fix-capslock +%patch22 -p1 -b .22-fix-gdm %if %{snapshot} ./bootstrap @@ -297,6 +299,9 @@ %changelog +* Tue Mar 4 2008 Huang Peng - 1.4.7-15 +- Let scim gtkim context work with gtk plug widget #251878. + * Mon Mar 3 2008 Huang Peng - 1.4.7-14 - Fix capslock problem #431222. From fedora-extras-commits at redhat.com Tue Mar 4 04:39:42 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 4 Mar 2008 04:39:42 GMT Subject: devel/kvm kvm-62-defaults.patch,NONE,1.1 kvm.spec,1.44,1.45 Message-ID: <200803040439.m244dg8w007075@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/kvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6961 Modified Files: kvm.spec Added Files: kvm-62-defaults.patch Log Message: * Mon Mar 3 2008 Jeremy Katz - 62-3 - Default to vmwaresvga now that it's been fixed to work kvm-62-defaults.patch: --- NEW FILE kvm-62-defaults.patch --- diff -up kvm-62/qemu/vl.c.defaults kvm-62/qemu/vl.c --- kvm-62/qemu/vl.c.defaults 2008-03-03 23:33:25.000000000 -0500 +++ kvm-62/qemu/vl.c 2008-03-03 23:33:48.000000000 -0500 @@ -190,8 +190,8 @@ NICInfo nd_table[MAX_NICS]; int vm_running; int rtc_utc = 1; int rtc_start_date = -1; /* -1 means now */ -int cirrus_vga_enabled = 1; -int vmsvga_enabled = 0; +int cirrus_vga_enabled = 0; +int vmsvga_enabled = 1; #ifdef TARGET_SPARC int graphic_width = 1024; int graphic_height = 768; Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- kvm.spec 28 Feb 2008 00:37:13 -0000 1.44 +++ kvm.spec 4 Mar 2008 04:39:06 -0000 1.45 @@ -1,12 +1,13 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 62 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.modules +Patch0: kvm-62-defaults.patch Patch1: %{name}-bootmenu.patch Patch2: %{name}-62-block-rw-range-check.patch # patches from upstream qemu @@ -37,6 +38,7 @@ %prep %setup -q +%patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -93,6 +95,9 @@ %{_sysconfdir}/sysconfig/modules/%{name}.modules %changelog +* Mon Mar 3 2008 Jeremy Katz - 62-3 +- Default to vmwaresvga now that it's been fixed to work + * Wed Feb 27 2008 Daniel P. Berrange - 62-2.fc9 - Fix block device checks for extendable disk formats (rhbz #434978) From fedora-extras-commits at redhat.com Tue Mar 4 04:42:22 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 4 Mar 2008 04:42:22 GMT Subject: devel/booty .cvsignore, 1.66, 1.67 booty.spec, 1.71, 1.72 sources, 1.70, 1.71 Message-ID: <200803040442.m244gMhX007642@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/booty In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7527 Modified Files: .cvsignore booty.spec sources Log Message: * Mon Mar 3 2008 Jeremy Katz - 0.98-1 - Change default perms for ia64 (#435750) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/booty/.cvsignore,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- .cvsignore 24 Feb 2008 21:24:31 -0000 1.66 +++ .cvsignore 4 Mar 2008 04:41:48 -0000 1.67 @@ -1 +1 @@ -booty-0.97.tar.bz2 +booty-0.98.tar.bz2 Index: booty.spec =================================================================== RCS file: /cvs/pkgs/devel/booty/booty.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- booty.spec 24 Feb 2008 21:24:31 -0000 1.71 +++ booty.spec 4 Mar 2008 04:41:48 -0000 1.72 @@ -1,6 +1,6 @@ Summary: simple python bootloader config lib Name: booty -Version: 0.97 +Version: 0.98 Release: 1%{?dist} License: LGPL Source0: %{name}-%{version}.tar.bz2 @@ -35,6 +35,9 @@ %changelog +* Mon Mar 3 2008 Jeremy Katz - 0.98-1 +- Change default perms for ia64 (#435750) + * Sun Feb 24 2008 Jeremy Katz - 0.97-1 - Fix for LUKS devices (dlehman, #432009) - Use UUID= to specify the root Index: sources =================================================================== RCS file: /cvs/pkgs/devel/booty/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- sources 24 Feb 2008 21:24:31 -0000 1.70 +++ sources 4 Mar 2008 04:41:48 -0000 1.71 @@ -1 +1 @@ -717dc7d33711e3d3b76b28a523b1d0cd booty-0.97.tar.bz2 +61350f1dc89337a9aae1367b6184ba9d booty-0.98.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 04:46:15 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 4 Mar 2008 04:46:15 GMT Subject: devel/anaconda .cvsignore, 1.499, 1.500 anaconda.spec, 1.639, 1.640 sources, 1.631, 1.632 Message-ID: <200803040446.m244kFWP008318@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/anaconda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8198 Modified Files: .cvsignore anaconda.spec sources Log Message: * Mon Mar 03 2008 Jeremy Katz - 11.4.0.43-1 - Only use UUID= for devices we would have labeled. Related to #435228 (katzj) - If we don't find a kernel package, then give a better error (katzj) - Translation updates (cs, de) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v retrieving revision 1.499 retrieving revision 1.500 diff -u -r1.499 -r1.500 --- .cvsignore 2 Mar 2008 22:18:17 -0000 1.499 +++ .cvsignore 4 Mar 2008 04:45:39 -0000 1.500 @@ -1 +1 @@ -anaconda-11.4.0.42.tar.bz2 +anaconda-11.4.0.43.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v retrieving revision 1.639 retrieving revision 1.640 diff -u -r1.639 -r1.640 --- anaconda.spec 2 Mar 2008 22:18:17 -0000 1.639 +++ anaconda.spec 4 Mar 2008 04:45:39 -0000 1.640 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.42 +Version: 11.4.0.43 Release: 1 License: GPLv2+ Group: Applications/System @@ -209,6 +209,11 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Mar 03 2008 Jeremy Katz - 11.4.0.43-1 +- Only use UUID= for devices we would have labeled. Related to #435228 (katzj) +- If we don't find a kernel package, then give a better error (katzj) +- Translation updates (cs, de) + * Sun Mar 02 2008 Jeremy Katz - 11.4.0.42-1 - Fix a traceback when we have an error. Related to #433658 (katzj) - Add virtio_pci in hopes of getting virtio working (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/devel/anaconda/sources,v retrieving revision 1.631 retrieving revision 1.632 diff -u -r1.631 -r1.632 --- sources 2 Mar 2008 22:18:17 -0000 1.631 +++ sources 4 Mar 2008 04:45:39 -0000 1.632 @@ -1 +1 @@ -d942dab4fa44a17f6d6b0d833a187433 anaconda-11.4.0.42.tar.bz2 +aacaa6770b25ea669dabc5e759dd7544 anaconda-11.4.0.43.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 04:52:19 2008 From: fedora-extras-commits at redhat.com (Yuan Yijun (bbbush)) Date: Tue, 4 Mar 2008 04:52:19 GMT Subject: rpms/chmsee/F-7 chmsee.spec,1.14,1.15 Message-ID: <200803040452.m244qJ7g009377@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/extras/rpms/chmsee/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9224 Modified Files: chmsee.spec Log Message: re-add firefox-version Index: chmsee.spec =================================================================== RCS file: /cvs/extras/rpms/chmsee/F-7/chmsee.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- chmsee.spec 8 Feb 2008 17:57:57 -0000 1.14 +++ chmsee.spec 4 Mar 2008 04:51:41 -0000 1.15 @@ -1,8 +1,9 @@ %define gecko_version 1.8.1.12 +%define firefox_version 2.0.0.12 Name: chmsee Version: 1.0.0 -Release: 1.28%{?dist} +Release: 1.29%{?dist} Summary(zh_CN): CHM ??????????????????, ?????? Gtk2+ Summary: A Gtk+2 CHM document viewer Group: Applications/Publishing @@ -117,27 +118,10 @@ %{_datadir}/icons/hicolor/*/apps/chmsee.png %changelog -* Fri Feb 8 2008 Christopher Aillon - 1.0.0-1.28 -- Rebuild against newer gecko +* Tue Mar 04 2008 bbbush - 1.0.0-1.29 +- re-add firefox_version -* Tue Nov 27 2007 Christopher Aillon - 1.0.0-1.27 +* Fri Feb 8 2008 Christopher Aillon - 1.0.0-1.28 - Rebuild against newer gecko -* Fri Nov 16 2007 bbbush - 1.0.0-1.26 -- build for firefox-2.0.0.9 - -* Sat Aug 11 2007 bbbush - 1.0.0-1.23 -- update to 1.0.0 -- update License field to GPLv2 - -* Sat Jul 21 2007 bbbush - 1.0.0-0.22.beta2 -- fix desktop file - -* Sun Apr 15 2007 bbbush - 1.0.0-0.17.beta2 -- update to beta2 -- use pkg-config to find gecko, don't use RPATH -- add "auto detect charset" to option dialog for those HTML with no encoding -- add popup for URL links -- add "zoom in/out" button - From fedora-extras-commits at redhat.com Tue Mar 4 04:52:38 2008 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Tue, 4 Mar 2008 04:52:38 GMT Subject: rpms/conexus/devel conexus.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 conexus.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200803040452.m244qcqR009481@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/extras/rpms/conexus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9280 Modified Files: .cvsignore conexus.spec sources Added Files: conexus.patch Log Message: conexus.patch: --- NEW FILE conexus.patch --- diff -r -U 5 conexus-0.5.3.orig/conexus/data.cpp conexus-0.5.3/conexus/data.cpp --- conexus-0.5.3.orig/conexus/data.cpp 2007-03-13 19:31:19.000000000 -0600 +++ conexus-0.5.3/conexus/data.cpp 2008-03-03 21:40:26.000000000 -0700 @@ -15,10 +15,11 @@ * License along with this library; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "data.h" +#include namespace Conexus { Data::Data( const void* d, size_t s, unsigned priority, DataMode mode ) throw ( std::bad_alloc ) diff -r -U 5 conexus-0.5.3.orig/conexus/except.h conexus-0.5.3/conexus/except.h --- conexus-0.5.3.orig/conexus/except.h 2007-03-10 14:29:34.000000000 -0700 +++ conexus-0.5.3/conexus/except.h 2008-03-03 21:31:31.000000000 -0700 @@ -24,10 +24,11 @@ */ #include #include #include +#include namespace Conexus { /** diff -r -U 5 conexus-0.5.3.orig/conexus/except_socket.h conexus-0.5.3/conexus/except_socket.h --- conexus-0.5.3.orig/conexus/except_socket.h 2007-03-10 14:29:33.000000000 -0700 +++ conexus-0.5.3/conexus/except_socket.h 2008-03-03 20:08:36.000000000 -0700 @@ -18,10 +18,11 @@ ***************************************************************************/ #ifndef CONEXUSEXCEPT_SOCKET_H #define CONEXUSEXCEPT_SOCKET_H #include +#include namespace Conexus { /** diff -r -U 5 conexus-0.5.3.orig/conexus/ipv4_address.cpp conexus-0.5.3/conexus/ipv4_address.cpp --- conexus-0.5.3.orig/conexus/ipv4_address.cpp 2007-02-06 10:16:38.000000000 -0700 +++ conexus-0.5.3/conexus/ipv4_address.cpp 2008-03-03 21:39:30.000000000 -0700 @@ -23,10 +23,11 @@ #include #include #include #include +#include namespace Conexus { namespace IPv4 @@ -87,11 +88,11 @@ m_port( 0 ), m_prefix_length( 32 ) { uint32_t ipv4addr; if ( ipv6addr.is_ipv4_compatible() ) { - ipv4addr = ipv6addr.address().in6_u.u6_addr32[ 3 ]; + ipv4addr = ipv6addr.address().__in6_u.__u6_addr32[ 3 ]; this->set_address( ipv4addr ); m_sockaddr.ipv4.sin_port = htons( ipv6addr.port() ); } else throw( exception::address::ipv6_not_ipv4_compatible() ); } diff -r -U 5 conexus-0.5.3.orig/conexus/ll_address.cpp conexus-0.5.3/conexus/ll_address.cpp --- conexus-0.5.3.orig/conexus/ll_address.cpp 2007-01-31 14:03:09.000000000 -0700 +++ conexus-0.5.3/conexus/ll_address.cpp 2008-03-03 21:32:07.000000000 -0700 @@ -19,10 +19,11 @@ #include "ll_address.h" #include #include #include +#include namespace Conexus { namespace LL { diff -r -U 5 conexus-0.5.3.orig/conexus/ll_packet.cpp conexus-0.5.3/conexus/ll_packet.cpp --- conexus-0.5.3.orig/conexus/ll_packet.cpp 2007-03-08 14:10:31.000000000 -0700 +++ conexus-0.5.3/conexus/ll_packet.cpp 2008-03-03 20:09:06.000000000 -0700 @@ -19,10 +19,11 @@ #include "ll_packet.h" #include #include #include +#include namespace Conexus { namespace LL { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/conexus/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Mar 2007 02:14:30 -0000 1.8 +++ .cvsignore 4 Mar 2008 04:52:00 -0000 1.9 @@ -1 +1,2 @@ conexus-0.5.3.tar.bz2 +conexus.patch Index: conexus.spec =================================================================== RCS file: /cvs/extras/rpms/conexus/devel/conexus.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- conexus.spec 19 Feb 2008 22:51:08 -0000 1.11 +++ conexus.spec 4 Mar 2008 04:52:00 -0000 1.12 @@ -1,13 +1,14 @@ Summary: C++ network and serial communication library Name: conexus Version: 0.5.3 -Release: 3%{?dist} -License: LGPL +Release: 4%{?dist} +License: LGPLv2 URL: http://conexus.sourceforge.net Group: System Environment/Libraries Source: http://download.sourceforge.net/conexus/conexus-0.5.3.tar.bz2 +Patch0: conexus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glibmm24-devel >= 2.6.0 boost-devel >= 1.32.0 cppunit-devel >= 1.11 pkgconfig m4 +BuildRequires: glibmm24-devel >= 2.6.0 boost-devel >= 1.32.0 cppunit-devel >= 1.11 popt-devel pkgconfig m4 %description Conexus is a generalized C++ I/O library that includes support for BSD @@ -26,6 +27,7 @@ %prep %setup -q +%patch -p1 %build %configure --enable-static=no @@ -59,6 +61,10 @@ %changelog +* Mon Mar 03 2008 Rick L Vinyard Jr - 0.5.3-4 +- Added cstring patch +- Added popt-devel requires + * Tue Feb 19 2008 Fedora Release Engineering - 0.5.3-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/conexus/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Mar 2007 02:14:30 -0000 1.8 +++ sources 4 Mar 2008 04:52:00 -0000 1.9 @@ -1 +1,2 @@ bde0c8fe11be8079407098137f346f0c conexus-0.5.3.tar.bz2 +0184eaf7e5decd0d4eaba34803cdedde conexus.patch From fedora-extras-commits at redhat.com Tue Mar 4 04:53:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 04:53:08 GMT Subject: rpms/perl-XML-LibXSLT/devel perl-XML-LibXSLT.spec,1.12,1.13 Message-ID: <200803040453.m244r8go009611@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-LibXSLT/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9451 Modified Files: perl-XML-LibXSLT.spec Log Message: new perl Index: perl-XML-LibXSLT.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-LibXSLT/devel/perl-XML-LibXSLT.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-XML-LibXSLT.spec 19 Feb 2008 23:56:32 -0000 1.12 +++ perl-XML-LibXSLT.spec 4 Mar 2008 04:52:33 -0000 1.13 @@ -2,7 +2,7 @@ Name: perl-XML-LibXSLT Version: 1.63 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl module for interfacing to GNOME's libxslt @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 1.63-5 +- rebuild for new perl (again) + * Tue Feb 19 2008 Fedora Release Engineering - 1.63-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 04:56:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 04:56:47 GMT Subject: rpms/perl-Spreadsheet-ParseExcel/devel perl-Spreadsheet-ParseExcel.spec, 1.12, 1.13 Message-ID: <200803040456.m244ul20010256@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10117 Modified Files: perl-Spreadsheet-ParseExcel.spec Log Message: new perl Index: perl-Spreadsheet-ParseExcel.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel/perl-Spreadsheet-ParseExcel.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Spreadsheet-ParseExcel.spec 20 Feb 2008 03:00:52 -0000 1.12 +++ perl-Spreadsheet-ParseExcel.spec 4 Mar 2008 04:56:05 -0000 1.13 @@ -6,7 +6,7 @@ Name: perl-Spreadsheet-ParseExcel Version: 0.3200 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Get information from an Excel file License: GPL+ or Artistic Group: Development/Libraries @@ -59,6 +59,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 0.3200-5 +- rebuild for new perl (again) + * Tue Feb 19 2008 Fedora Release Engineering - 0.3200-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 04:58:22 2008 From: fedora-extras-commits at redhat.com (Yuan Yijun (bbbush)) Date: Tue, 4 Mar 2008 04:58:22 GMT Subject: rpms/chmsee/F-8 chmsee.spec,1.14,1.15 Message-ID: <200803040458.m244wMaf010583@cvs-int.fedora.redhat.com> Author: bbbush Update of /cvs/extras/rpms/chmsee/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10435 Modified Files: chmsee.spec Log Message: re-add firefox-version Index: chmsee.spec =================================================================== RCS file: /cvs/extras/rpms/chmsee/F-8/chmsee.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- chmsee.spec 8 Feb 2008 17:58:41 -0000 1.14 +++ chmsee.spec 4 Mar 2008 04:57:42 -0000 1.15 @@ -1,8 +1,9 @@ %define gecko_version 1.8.1.12 +%define firefox_version 2.0.0.12 Name: chmsee Version: 1.0.0 -Release: 1.28%{?dist} +Release: 1.29%{?dist} Summary(zh_CN): CHM ??????????????????, ?????? Gtk2+ Summary: A Gtk+2 CHM document viewer Group: Applications/Publishing @@ -117,28 +118,11 @@ %{_datadir}/icons/hicolor/*/apps/chmsee.png %changelog -* Fri Feb 8 2008 Christopher Aillon - 1.0.0-1.28 -- Rebuild against newer gecko +* Tue Mar 04 2008 bbbush - 1.0.0-1.29 +- re-add firefox_version -* Tue Nov 27 2007 Christopher Aillon - 1.0.0-1.27 +* Fri Feb 8 2008 Christopher Aillon - 1.0.0-1.28 - Rebuild against newer gecko -* Sat Nov 10 2007 bbbush - 1.0.0-1.26 -- build for firefox-2.0.0.9 - -* Sat Aug 11 2007 bbbush - 1.0.0-1.23 -- update to 1.0.0 -- build for firefox-2.0.0.6 -- update License field to GPLv2 - -* Sat Jul 21 2007 bbbush - 1.0.0-0.22.beta2 -- fix desktop file - -* Sun Apr 15 2007 bbbush - 1.0.0-0.17.beta2 -- update to beta2 -- use pkg-config to find gecko, don't use RPATH -- add "auto detect charset" to option dialog for those HTML with no encoding -- add popup for URL links -- add "zoom in/out" button From fedora-extras-commits at redhat.com Tue Mar 4 04:58:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 04:58:38 GMT Subject: rpms/perl-PostScript/devel perl-PostScript.spec,1.2,1.3 Message-ID: <200803040458.m244wcst010674@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-PostScript/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501 Modified Files: perl-PostScript.spec Log Message: new perl Index: perl-PostScript.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PostScript/devel/perl-PostScript.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-PostScript.spec 4 Sep 2007 09:51:12 -0000 1.2 +++ perl-PostScript.spec 4 Mar 2008 04:57:59 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-PostScript Version: 0.06 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PostScript Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 03 2008 Tom "spot" Callaway 0.06-3 +- rebuild for new perl + * Tue Sep 04 2007 Alex Lancaster 0.06-2 - Clarified license terms: GPL+ or Artistic From fedora-extras-commits at redhat.com Tue Mar 4 05:00:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:00:59 GMT Subject: rpms/perl-Set-Scalar/devel perl-Set-Scalar.spec,1.3,1.4 Message-ID: <200803040500.m2450xm6011107@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Set-Scalar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11001 Modified Files: perl-Set-Scalar.spec Log Message: new perl Index: perl-Set-Scalar.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Set-Scalar/devel/perl-Set-Scalar.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Set-Scalar.spec 19 Dec 2007 19:04:08 -0000 1.3 +++ perl-Set-Scalar.spec 4 Mar 2008 05:00:24 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Set-Scalar Version: 1.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Basic set operations Group: Development/Libraries @@ -50,6 +50,9 @@ %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 1.22-2 +- rebuild for new perl + * Wed Dec 19 2007 Tom "spot" Callaway - 1.22-1 - 1.22 From fedora-extras-commits at redhat.com Tue Mar 4 05:02:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:02:41 GMT Subject: rpms/perl-SOAP-Lite/devel perl-SOAP-Lite.spec,1.9,1.10 Message-ID: <200803040502.m2452fwD018558@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SOAP-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18411 Modified Files: perl-SOAP-Lite.spec Log Message: new perl Index: perl-SOAP-Lite.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SOAP-Lite/devel/perl-SOAP-Lite.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-SOAP-Lite.spec 18 Oct 2007 14:56:07 -0000 1.9 +++ perl-SOAP-Lite.spec 4 Mar 2008 05:01:59 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-SOAP-Lite Version: 0.68 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Client and server side SOAP implementation License: GPL+ or Artistic Group: Development/Libraries @@ -75,6 +75,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 3 2008 Tom "spot" Callaway - 0.68-6 +- rebuild for new perl + * Thu Oct 18 2007 Mike McGrath - 0.68-5 - Fixed build requires From fedora-extras-commits at redhat.com Tue Mar 4 05:03:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:03:37 GMT Subject: rpms/perl-Curses/devel perl-Curses.spec,1.10,1.11 Message-ID: <200803040503.m2453bJE018788@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Curses/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18600 Modified Files: perl-Curses.spec Log Message: new perl Index: perl-Curses.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Curses/devel/perl-Curses.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Curses.spec 14 Feb 2008 22:08:23 -0000 1.10 +++ perl-Curses.spec 4 Mar 2008 05:02:56 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-Curses Version: 1.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl bindings for ncurses Group: Development/Libraries @@ -67,6 +67,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 1.20-3 +- rebuild for new perl + * Thu Feb 14 2008 Garrick Staples 1.20-2 - forgot to update tarball, building From fedora-extras-commits at redhat.com Tue Mar 4 05:03:54 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Tue, 4 Mar 2008 05:03:54 GMT Subject: rpms/kernel/F-8 config-generic, 1.49, 1.50 kernel.spec, 1.362, 1.363 linux-2.6-firewire-git-pending.patch, 1.1, 1.2 linux-2.6-firewire-git-update.patch, 1.3, 1.4 Message-ID: <200803040503.m2453sEC018846@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18709 Modified Files: config-generic kernel.spec linux-2.6-firewire-git-pending.patch linux-2.6-firewire-git-update.patch Log Message: * Mon Mar 03 2008 Jarod Wilson 2.6.24.3-17 - firewire-sbp2: permit drives to suspend (#243210) - firewire: fix suspend/resume on older PowerPC Macs (#312871) - firewire: restore bus power on resume on older PowerPC Macs - firewire: support for first-gen Apple UniNorth controller - firewire: fix crashes in workqueue jobs Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- config-generic 21 Feb 2008 19:11:27 -0000 1.49 +++ config-generic 4 Mar 2008 05:03:17 -0000 1.50 @@ -3357,3 +3357,4 @@ # CONFIG_WRITABLE_DEVMEM is not set # CONFIG_WRITABLE_DEVKMEM is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.362 retrieving revision 1.363 diff -u -r1.362 -r1.363 --- kernel.spec 3 Mar 2008 23:29:42 -0000 1.362 +++ kernel.spec 4 Mar 2008 05:03:17 -0000 1.363 @@ -700,7 +700,6 @@ Patch1805: linux-2.6-git-initial-r500-drm.patch # Updated firewire stack from linux1394 git -# snap from http://me.in-berlin.de/~s5r6/linux1394/updates/2.6.23/ Patch1910: linux-2.6-firewire-git-update.patch Patch1911: linux-2.6-firewire-git-pending.patch # fix thinkpad key events for volume/brightness @@ -1313,6 +1312,7 @@ ApplyPatch linux-2.6-dcdbas-autoload.patch # FireWire updates and fixes +# snap from http://me.in-berlin.de/~s5r6/linux1394/updates/ ApplyPatch linux-2.6-firewire-git-update.patch ApplyPatch linux-2.6-firewire-git-pending.patch @@ -1918,6 +1918,13 @@ %changelog +* Mon Mar 03 2008 Jarod Wilson 2.6.24.3-17 +- firewire-sbp2: permit drives to suspend (#243210) +- firewire: fix suspend/resume on older PowerPC Macs (#312871) +- firewire: restore bus power on resume on older PowerPC Macs +- firewire: support for first-gen Apple UniNorth controller +- firewire: fix crashes in workqueue jobs + * Mon Mar 03 2008 Chuck Ebbert 2.6.24.3-16 - ISDN: don't oops on driver load (#362621) linux-2.6-firewire-git-pending.patch: Index: linux-2.6-firewire-git-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-firewire-git-pending.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-firewire-git-pending.patch 15 Feb 2008 23:58:52 -0000 1.1 +++ linux-2.6-firewire-git-pending.patch 4 Mar 2008 05:03:18 -0000 1.2 @@ -3,1216 +3,485 @@ # tree, which we think we're going to want... # -If a device is being unplugged while fw-sbp2 had a login or reconnect on -schedule, it would take about half a minute to shut the fw_unit down: - -Jan 27 18:34:54 stein firewire_sbp2: logged in to fw2.0 LUN 0000 (0 retries) - -Jan 27 18:34:59 stein firewire_sbp2: sbp2_scsi_abort -Jan 27 18:34:59 stein scsi 25:0:0:0: Device offlined - not ready after error recovery -Jan 27 18:35:01 stein firewire_sbp2: orb reply timed out, rcode=0x11 -Jan 27 18:35:06 stein firewire_sbp2: orb reply timed out, rcode=0x11 -Jan 27 18:35:12 stein firewire_sbp2: orb reply timed out, rcode=0x11 -Jan 27 18:35:17 stein firewire_sbp2: orb reply timed out, rcode=0x11 -Jan 27 18:35:22 stein firewire_sbp2: orb reply timed out, rcode=0x11 -Jan 27 18:35:27 stein firewire_sbp2: orb reply timed out, rcode=0x11 -Jan 27 18:35:32 stein firewire_sbp2: orb reply timed out, rcode=0x11 -Jan 27 18:35:32 stein firewire_sbp2: failed to login to fw2.0 LUN 0000 -Jan 27 18:35:32 stein firewire_sbp2: released fw2.0 - -After this patch, typically only a few seconds spent in __scsi_add_device -remain: - -Jan 27 19:05:50 stein firewire_sbp2: logged in to fw2.0 LUN 0000 (0 retries) - -Jan 27 19:05:56 stein firewire_sbp2: sbp2_scsi_abort -Jan 27 19:05:56 stein scsi 33:0:0:0: Device offlined - not ready after error recovery -Jan 27 19:05:56 stein firewire_sbp2: released fw2.0 - -The benefit of this is negligible on simple setups. But on buses with -several devices, we should avoid any unnecessary blockade of fw-sbp2's -workqueue thread. +read_bus_info_block() is repeatedly called by workqueue jobs. +These will step on each others toes eventually if there are multiple +workqueue threads, and we end up with corrupt config ROM images. Signed-off-by: Stefan Richter -Signed-off-by: Jarod Wilson --- - drivers/firewire/fw-sbp2.c | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -Index: linux/drivers/firewire/fw-sbp2.c -=================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -499,6 +499,9 @@ sbp2_send_management_orb(struct sbp2_log - unsigned int timeout; - int retval = -ENOMEM; - -+ if (function == SBP2_LOGOUT_REQUEST && fw_device_is_shutdown(device)) -+ return 0; -+ - orb = kzalloc(sizeof(*orb), GFP_ATOMIC); - if (orb == NULL) - return -ENOMEM; -@@ -619,16 +622,13 @@ static void sbp2_release_target(struct k - struct sbp2_logical_unit *lu, *next; - struct Scsi_Host *shost = - container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -- struct fw_device *device = fw_device(tgt->unit->device.parent); - - list_for_each_entry_safe(lu, next, &tgt->lu_list, link) { - if (lu->sdev) - scsi_remove_device(lu->sdev); - -- if (!fw_device_is_shutdown(device)) -- sbp2_send_management_orb(lu, tgt->node_id, -- lu->generation, SBP2_LOGOUT_REQUEST, -- lu->login_id, NULL); -+ sbp2_send_management_orb(lu, tgt->node_id, lu->generation, -+ SBP2_LOGOUT_REQUEST, lu->login_id, NULL); - - fw_core_remove_address_handler(&lu->address_handler); - list_del(&lu->link); -@@ -673,6 +673,9 @@ static void sbp2_login(struct work_struc - struct sbp2_login_response response; - int generation, node_id, local_node_id; - -+ if (fw_device_is_shutdown(device)) -+ goto out; -+ - generation = device->generation; - smp_rmb(); /* node_id must not be older than generation */ - node_id = device->node_id; -@@ -968,6 +971,9 @@ static void sbp2_reconnect(struct work_s - struct fw_device *device = fw_device(unit->device.parent); - int generation, node_id, local_node_id; - -+ if (fw_device_is_shutdown(device)) -+ goto out; -+ - generation = device->generation; - smp_rmb(); /* node_id must not be older than generation */ - node_id = device->node_id; - --- -Stefan Richter --=====-==--- ---= ==-== -http://arcgraph.de/sr/ - - -There is a race between shutdown and creation of devices: fw-core may -attempt to add a device with the same name of an already existing -device. http://bugzilla.kernel.org/show_bug.cgi?id=9828 - -Impact of the bug: Happens rarely (when shutdown of a device coincides -with creation of another), forces the user to unplug and replug the new -device to get it working. - -The fix is obvious: Free the minor number *after* instead of *before* -device_unregister(). This requires to take an additional reference of -the fw_device as long as the IDR tree points to it. - -And while we are at it, we fix an additional race condition: -fw_device_op_open() took its reference of the fw_device a little bit too -late, hence was in danger to access an already invalid fw_device. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-cdev.c | 8 +++++--- - drivers/firewire/fw-device.c | 20 ++++++++++++++------ - drivers/firewire/fw-device.h | 2 +- - 3 files changed, 20 insertions(+), 10 deletions(-) + drivers/firewire/fw-device.c | 41 +++++++++++++++++++++++------------ + 1 file changed, 27 insertions(+), 14 deletions(-) Index: linux/drivers/firewire/fw-device.c =================================================================== --- linux.orig/drivers/firewire/fw-device.c +++ linux/drivers/firewire/fw-device.c -@@ -610,12 +610,14 @@ static DECLARE_RWSEM(idr_rwsem); - static DEFINE_IDR(fw_device_idr); - int fw_cdev_major; - --struct fw_device *fw_device_from_devt(dev_t devt) -+struct fw_device *fw_device_get_by_devt(dev_t devt) - { - struct fw_device *device; - - down_read(&idr_rwsem); - device = idr_find(&fw_device_idr, MINOR(devt)); -+ if (device) -+ fw_device_get(device); - up_read(&idr_rwsem); - - return device; -@@ -627,13 +629,14 @@ static void fw_device_shutdown(struct wo - container_of(work, struct fw_device, work.work); - int minor = MINOR(device->device.devt); - -- down_write(&idr_rwsem); -- idr_remove(&fw_device_idr, minor); -- up_write(&idr_rwsem); -- - fw_device_cdev_remove(device); - device_for_each_child(&device->device, NULL, shutdown_unit); - device_unregister(&device->device); -+ -+ down_write(&idr_rwsem); -+ idr_remove(&fw_device_idr, minor); -+ up_write(&idr_rwsem); -+ fw_device_put(device); +@@ -400,6 +400,9 @@ read_rom(struct fw_device *device, int g + return callback_data.rcode; } - static struct device_type fw_device_type = { -@@ -682,10 +685,13 @@ static void fw_device_init(struct work_s - } - - err = -ENOMEM; -+ -+ fw_device_get(device); - down_write(&idr_rwsem); - if (idr_pre_get(&fw_device_idr, GFP_KERNEL)) - err = idr_get_new(&fw_device_idr, device, &minor); - up_write(&idr_rwsem); -+ - if (err < 0) - goto error; - -@@ -741,7 +747,9 @@ static void fw_device_init(struct work_s - idr_remove(&fw_device_idr, minor); - up_write(&idr_rwsem); - error: -- put_device(&device->device); -+ fw_device_put(device); /* fw_device_idr's reference */ ++#define READ_BIB_ROM_SIZE 256 ++#define READ_BIB_STACK_SIZE 16 + -+ put_device(&device->device); /* our reference */ - } - - static int update_unit(struct device *dev, void *data) -Index: linux/drivers/firewire/fw-cdev.c -=================================================================== ---- linux.orig/drivers/firewire/fw-cdev.c -+++ linux/drivers/firewire/fw-cdev.c -@@ -109,15 +109,17 @@ static int fw_device_op_open(struct inod - struct client *client; - unsigned long flags; - -- device = fw_device_from_devt(inode->i_rdev); -+ device = fw_device_get_by_devt(inode->i_rdev); - if (device == NULL) - return -ENODEV; - - client = kzalloc(sizeof(*client), GFP_KERNEL); -- if (client == NULL) -+ if (client == NULL) { -+ fw_device_put(device); - return -ENOMEM; -+ } - -- client->device = fw_device_get(device); -+ client->device = device; - INIT_LIST_HEAD(&client->event_list); - INIT_LIST_HEAD(&client->resource_list); - spin_lock_init(&client->lock); -Index: linux/drivers/firewire/fw-device.h -=================================================================== ---- linux.orig/drivers/firewire/fw-device.h -+++ linux/drivers/firewire/fw-device.h -@@ -77,13 +77,13 @@ fw_device_is_shutdown(struct fw_device * - } - - struct fw_device *fw_device_get(struct fw_device *device); -+struct fw_device *fw_device_get_by_devt(dev_t devt); - void fw_device_put(struct fw_device *device); - int fw_device_enable_phys_dma(struct fw_device *device); - - void fw_device_cdev_update(struct fw_device *device); - void fw_device_cdev_remove(struct fw_device *device); + /* + * Read the bus info block, perform a speed probe, and read all of the rest of + * the config ROM. We do all this with a cached bus generation. If the bus +@@ -409,16 +412,23 @@ read_rom(struct fw_device *device, int g + */ + static int read_bus_info_block(struct fw_device *device, int generation) + { +- static u32 rom[256]; +- u32 stack[16], sp, key; +- int i, end, length; ++ u32 *rom, *stack; ++ u32 sp, key; ++ int i, end, length, ret = -1; ++ ++ rom = kmalloc(sizeof(*rom) * READ_BIB_ROM_SIZE + ++ sizeof(*stack) * READ_BIB_STACK_SIZE, GFP_KERNEL); ++ if (rom == NULL) ++ return -ENOMEM; ++ ++ stack = &rom[READ_BIB_ROM_SIZE]; + + device->max_speed = SCODE_100; + + /* First read the bus info block. */ + for (i = 0; i < 5; i++) { + if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE) +- return -1; ++ goto out; + /* + * As per IEEE1212 7.2, during power-up, devices can + * reply with a 0 for the first quadlet of the config +@@ -428,7 +438,7 @@ static int read_bus_info_block(struct fw + * retry mechanism will try again later. + */ + if (i == 0 && rom[i] == 0) +- return -1; ++ goto out; + } --struct fw_device *fw_device_from_devt(dev_t devt); - extern int fw_cdev_major; + device->max_speed = device->node->max_speed; +@@ -478,26 +488,26 @@ static int read_bus_info_block(struct fw + */ + key = stack[--sp]; + i = key & 0xffffff; +- if (i >= ARRAY_SIZE(rom)) ++ if (i >= READ_BIB_ROM_SIZE) + /* + * The reference points outside the standard + * config rom area, something's fishy. + */ +- return -1; ++ goto out; + + /* Read header quadlet for the block to get the length. */ + if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE) +- return -1; ++ goto out; + end = i + (rom[i] >> 16) + 1; + i++; +- if (end > ARRAY_SIZE(rom)) ++ if (end > READ_BIB_ROM_SIZE) + /* + * This block extends outside standard config + * area (and the array we're reading it + * into). That's broken, so ignore this + * device. + */ +- return -1; ++ goto out; + + /* + * Now read in the block. If this is a directory +@@ -507,9 +517,9 @@ static int read_bus_info_block(struct fw + while (i < end) { + if (read_rom(device, generation, i, &rom[i]) != + RCODE_COMPLETE) +- return -1; ++ goto out; + if ((key >> 30) == 3 && (rom[i] >> 30) > 1 && +- sp < ARRAY_SIZE(stack)) ++ sp < READ_BIB_STACK_SIZE) + stack[sp++] = i + rom[i]; + i++; + } +@@ -519,11 +529,14 @@ static int read_bus_info_block(struct fw - struct fw_unit { - --- -Stefan Richter --=====-==--- --=- ---=- -http://arcgraph.de/sr/ - - -This should help to interpret user reports. E.g. one can look up the -vendor OUI (first three bytes of the GUID) and thus tell what is what. - -Also simplifies the math in the GUID sysfs attribute. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-device.c | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -Index: linux/drivers/firewire/fw-device.c -=================================================================== ---- linux.orig/drivers/firewire/fw-device.c -+++ linux/drivers/firewire/fw-device.c -@@ -358,12 +358,9 @@ static ssize_t - guid_show(struct device *dev, struct device_attribute *attr, char *buf) - { - struct fw_device *device = fw_device(dev); -- u64 guid; + device->config_rom = kmalloc(length * 4, GFP_KERNEL); + if (device->config_rom == NULL) +- return -1; ++ goto out; + memcpy(device->config_rom, rom, length * 4); + device->config_rom_length = length; ++ ret = 0; ++ out: ++ kfree(rom); -- guid = ((u64)device->config_rom[3] << 32) | device->config_rom[4]; -- -- return snprintf(buf, PAGE_SIZE, "0x%016llx\n", -- (unsigned long long)guid); -+ return snprintf(buf, PAGE_SIZE, "0x%08x%08x\n", -+ device->config_rom[3], device->config_rom[4]); +- return 0; ++ return ret; } - static struct device_attribute fw_device_attributes[] = { -@@ -723,13 +720,22 @@ static void fw_device_init(struct work_s - */ - if (atomic_cmpxchg(&device->state, - FW_DEVICE_INITIALIZING, -- FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) -+ FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) { - fw_device_shutdown(&device->work.work); -- else -- fw_notify("created new fw device %s " -- "(%d config rom retries, S%d00)\n", -- device->device.bus_id, device->config_rom_retries, -- 1 << device->max_speed); -+ } else { -+ if (device->config_rom_retries) -+ fw_notify("created device %s: GUID %08x%08x, S%d00, " -+ "%d config ROM retries\n", -+ device->device.bus_id, -+ device->config_rom[3], device->config_rom[4], -+ 1 << device->max_speed, -+ device->config_rom_retries); -+ else -+ fw_notify("created device %s: GUID %08x%08x, S%d00\n", -+ device->device.bus_id, -+ device->config_rom[3], device->config_rom[4], -+ 1 << device->max_speed); -+ } - - /* - * Reschedule the IRM work if we just finished reading the + static void fw_unit_release(struct device *dev) -- Stefan Richter --=====-==--- --=- ---== +-=====-==--- --== ---=- http://arcgraph.de/sr/ -Several different SBP-2 bridges accept a login early while the IDE -device is still powering up. They are therefore unable to respond to -SCSI INQUIRY immediately, and the SCSI core has to retry the INQUIRY. -One of these retries is typically successful, and all is well. +When a device changes its configuration ROM, it announces this with a +bus reset. firewire-core has to check which node initiated a bus reset +and whether any unit directories went away or were added on this node. -But in case of Momobay FX-3A, the INQUIRY retries tend to fail entirely. -This can usually be avoided by waiting a little while after login before -letting the SCSI core send the INQUIRY. The old sbp2 driver handles -this more gracefully for as yet unknown reasons (perhaps because it -waits for fetch agent resets to complete, unlike fw-sbp2 which quickly -proceeds after requesting the agent reset). Therefore the workaround is -not as much necessary for sbp2. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-sbp2.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -Index: linux/drivers/firewire/fw-sbp2.c -=================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -82,6 +83,9 @@ MODULE_PARM_DESC(exclusive_login, "Exclu - * Avoids access beyond actual disk limits on devices with an off-by-one bug. - * Don't use this with devices which don't have this bug. - * -+ * - delay inquiry -+ * Wait extra SBP2_INQUIRY_DELAY seconds after login before SCSI inquiry. -+ * - * - override internal blacklist - * Instead of adding to the built-in blacklist, use only the workarounds - * specified in the module load parameter. -@@ -91,6 +95,8 @@ MODULE_PARM_DESC(exclusive_login, "Exclu - #define SBP2_WORKAROUND_INQUIRY_36 0x2 - #define SBP2_WORKAROUND_MODE_SENSE_8 0x4 - #define SBP2_WORKAROUND_FIX_CAPACITY 0x8 -+#define SBP2_WORKAROUND_DELAY_INQUIRY 0x10 -+#define SBP2_INQUIRY_DELAY 12 - #define SBP2_WORKAROUND_OVERRIDE 0x100 - - static int sbp2_param_workarounds; -@@ -100,6 +106,7 @@ MODULE_PARM_DESC(workarounds, "Work arou - ", 36 byte inquiry = " __stringify(SBP2_WORKAROUND_INQUIRY_36) - ", skip mode page 8 = " __stringify(SBP2_WORKAROUND_MODE_SENSE_8) - ", fix capacity = " __stringify(SBP2_WORKAROUND_FIX_CAPACITY) -+ ", delay inquiry = " __stringify(SBP2_WORKAROUND_DELAY_INQUIRY) - ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE) - ", or a combination)"); - -@@ -303,6 +310,11 @@ static const struct { - .workarounds = SBP2_WORKAROUND_INQUIRY_36 | - SBP2_WORKAROUND_MODE_SENSE_8, - }, -+ /* DViCO Momobay FX-3A with TSB42AA9A bridge */ { -+ .firmware_revision = 0x002800, -+ .model = 0x000000, -+ .workarounds = SBP2_WORKAROUND_DELAY_INQUIRY, -+ }, - /* Initio bridges, actually only needed for some older ones */ { - .firmware_revision = 0x000200, - .model = ~0, -@@ -712,6 +724,9 @@ static void sbp2_login(struct work_struc - PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect); - sbp2_agent_reset(lu); - -+ if (lu->tgt->workarounds & SBP2_WORKAROUND_DELAY_INQUIRY) -+ ssleep(SBP2_INQUIRY_DELAY); -+ - memset(&eight_bytes_lun, 0, sizeof(eight_bytes_lun)); - eight_bytes_lun.scsi_lun[0] = (lu->lun >> 8) & 0xff; - eight_bytes_lun.scsi_lun[1] = lu->lun & 0xff; - --- -Stefan Richter --=====-==--- --=- ---== -http://arcgraph.de/sr/ +Tested with an IOI FWB-IDE01AB which has its link-on bit set if bus +power is available but does not respond to ROM read requests if self +power is off. This implements + - recognition of the units if self power is switched on after fw-core + gave up the initial attempt to read the config ROM, + - shutdown of the units when self power is switched off. - -Add the same workaround as found in fw-sbp2 for feature parity and -compatibility of the workarounds module parameter. +Also tested with a second PC running Linux/ieee1394. When the eth1394 +driver is inserted and removed on that node, fw-core now notices the +addition and removal of the IPv4 unit on the ieee1394 node. Signed-off-by: Stefan Richter --- - drivers/ieee1394/sbp2.c | 12 ++++++++++++ - drivers/ieee1394/sbp2.h | 2 ++ - 2 files changed, 14 insertions(+) - -Index: linux/drivers/ieee1394/sbp2.c -=================================================================== ---- linux.orig/drivers/ieee1394/sbp2.c -+++ linux/drivers/ieee1394/sbp2.c -@@ -183,6 +183,9 @@ MODULE_PARM_DESC(exclusive_login, "Exclu - * Avoids access beyond actual disk limits on devices with an off-by-one bug. - * Don't use this with devices which don't have this bug. - * -+ * - delay inquiry -+ * Wait extra SBP2_INQUIRY_DELAY seconds after login before SCSI inquiry. -+ * - * - override internal blacklist - * Instead of adding to the built-in blacklist, use only the workarounds - * specified in the module load parameter. -@@ -195,6 +198,7 @@ MODULE_PARM_DESC(workarounds, "Work arou - ", 36 byte inquiry = " __stringify(SBP2_WORKAROUND_INQUIRY_36) - ", skip mode page 8 = " __stringify(SBP2_WORKAROUND_MODE_SENSE_8) - ", fix capacity = " __stringify(SBP2_WORKAROUND_FIX_CAPACITY) -+ ", delay inquiry = " __stringify(SBP2_WORKAROUND_DELAY_INQUIRY) - ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE) - ", or a combination)"); - -@@ -357,6 +361,11 @@ static const struct { - .workarounds = SBP2_WORKAROUND_INQUIRY_36 | - SBP2_WORKAROUND_MODE_SENSE_8, - }, -+ /* DViCO Momobay FX-3A with TSB42AA9A bridge */ { -+ .firmware_revision = 0x002800, -+ .model_id = 0x000000, -+ .workarounds = SBP2_WORKAROUND_DELAY_INQUIRY, -+ }, - /* Initio bridges, actually only needed for some older ones */ { - .firmware_revision = 0x000200, - .model_id = SBP2_ROM_VALUE_WILDCARD, -@@ -914,6 +923,9 @@ static int sbp2_start_device(struct sbp2 - sbp2_agent_reset(lu, 1); - sbp2_max_speed_and_size(lu); - -+ if (lu->workarounds & SBP2_WORKAROUND_DELAY_INQUIRY) -+ ssleep(SBP2_INQUIRY_DELAY); -+ - error = scsi_add_device(lu->shost, 0, lu->ud->id, 0); - if (error) { - SBP2_ERR("scsi_add_device failed"); -Index: linux/drivers/ieee1394/sbp2.h -=================================================================== ---- linux.orig/drivers/ieee1394/sbp2.h -+++ linux/drivers/ieee1394/sbp2.h -@@ -343,6 +343,8 @@ enum sbp2lu_state_types { - #define SBP2_WORKAROUND_INQUIRY_36 0x2 - #define SBP2_WORKAROUND_MODE_SENSE_8 0x4 - #define SBP2_WORKAROUND_FIX_CAPACITY 0x8 -+#define SBP2_WORKAROUND_DELAY_INQUIRY 0x10 -+#define SBP2_INQUIRY_DELAY 12 - #define SBP2_WORKAROUND_OVERRIDE 0x100 - - #endif /* SBP2_H */ - --- -Stefan Richter --=====-==--- --=- ---== -http://arcgraph.de/sr/ - -Like the old sbp2 driver, wait for the write transaction to the -AGENT_RESET to complete before proceeding (after login, after reconnect, -or in SCSI error handling). +Applies after "firewire: replace static ROM cache by allocated cache". -There is one occasion where AGENT_RESET is written to from atomic -context when getting DEAD status for a command ORB. There we still -continue without waiting for the transaction to complete because this -is more difficult to fix... + drivers/firewire/fw-cdev.c | 18 ++-- + drivers/firewire/fw-device.c | 147 ++++++++++++++++++++++++++++++--- + drivers/firewire/fw-topology.c | 3 + drivers/firewire/fw-topology.h | 11 +- + 4 files changed, 158 insertions(+), 21 deletions(-) -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-sbp2.c | 39 ++++++++++++++++++++++++++----------- - 1 file changed, 28 insertions(+), 11 deletions(-) - -Index: linux/drivers/firewire/fw-sbp2.c +Index: linux/drivers/firewire/fw-cdev.c =================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -603,29 +603,46 @@ sbp2_send_management_orb(struct sbp2_log - - static void - complete_agent_reset_write(struct fw_card *card, int rcode, -- void *payload, size_t length, void *data) -+ void *payload, size_t length, void *done) +--- linux.orig/drivers/firewire/fw-cdev.c ++++ linux/drivers/firewire/fw-cdev.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include "fw-transaction.h" +@@ -269,20 +270,25 @@ static int ioctl_get_info(struct client { -- struct fw_transaction *t = data; -+ complete(done); -+} -+ -+static void sbp2_agent_reset(struct sbp2_logical_unit *lu) -+{ -+ struct fw_device *device = fw_device(lu->tgt->unit->device.parent); -+ DECLARE_COMPLETION_ONSTACK(done); -+ struct fw_transaction t; -+ static u32 z; - -- kfree(t); -+ fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST, -+ lu->tgt->node_id, lu->generation, device->max_speed, -+ lu->command_block_agent_address + SBP2_AGENT_RESET, -+ &z, sizeof(z), complete_agent_reset_write, &done); -+ wait_for_completion(&done); - } + struct fw_cdev_get_info *get_info = buffer; + struct fw_cdev_event_bus_reset bus_reset; ++ struct fw_device *device = client->device; ++ unsigned long ret = 0; + + client->version = get_info->version; + get_info->version = FW_CDEV_VERSION; + ++ down(&device->device.sem); + if (get_info->rom != 0) { + void __user *uptr = u64_to_uptr(get_info->rom); + size_t want = get_info->rom_length; +- size_t have = client->device->config_rom_length * 4; ++ size_t have; + +- if (copy_to_user(uptr, client->device->config_rom, +- min(want, have))) +- return -EFAULT; ++ have = device->config_rom_length * 4; ++ ret = copy_to_user(uptr, device->config_rom, min(want, have)); + } +- get_info->rom_length = client->device->config_rom_length * 4; ++ get_info->rom_length = device->config_rom_length * 4; ++ up(&device->device.sem); ++ if (ret != 0) ++ return -EFAULT; + + client->bus_reset_closure = get_info->bus_reset_closure; + if (get_info->bus_reset != 0) { +@@ -293,7 +299,7 @@ static int ioctl_get_info(struct client + return -EFAULT; + } --static int sbp2_agent_reset(struct sbp2_logical_unit *lu) -+static void -+complete_agent_reset_write_no_wait(struct fw_card *card, int rcode, -+ void *payload, size_t length, void *data) -+{ -+ kfree(data); -+} -+ -+static void sbp2_agent_reset_no_wait(struct sbp2_logical_unit *lu) - { - struct fw_device *device = fw_device(lu->tgt->unit->device.parent); - struct fw_transaction *t; -- static u32 zero; -+ static u32 z; - -- t = kzalloc(sizeof(*t), GFP_ATOMIC); -+ t = kmalloc(sizeof(*t), GFP_ATOMIC); - if (t == NULL) -- return -ENOMEM; -+ return; +- get_info->card = client->device->card->index; ++ get_info->card = device->card->index; - fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST, - lu->tgt->node_id, lu->generation, device->max_speed, - lu->command_block_agent_address + SBP2_AGENT_RESET, -- &zero, sizeof(zero), complete_agent_reset_write, t); -- -- return 0; -+ &z, sizeof(z), complete_agent_reset_write_no_wait, t); + return 0; } - - static void sbp2_release_target(struct kref *kref) -@@ -1110,7 +1127,7 @@ complete_command_orb(struct sbp2_orb *ba - - if (status != NULL) { - if (STATUS_GET_DEAD(*status)) -- sbp2_agent_reset(orb->lu); -+ sbp2_agent_reset_no_wait(orb->lu); - - switch (STATUS_GET_RESPONSE(*status)) { - case SBP2_STATUS_REQUEST_COMPLETE: - --- -Stefan Richter --=====-==--- --=- ---== -http://arcgraph.de/sr/ - - -for easier readable logs if more than one SBP-2 device is present. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-sbp2.c | 66 ++++++++++++++++++------------------- - 1 file changed, 33 insertions(+), 33 deletions(-) - -Index: linux/drivers/firewire/fw-sbp2.c +Index: linux/drivers/firewire/fw-device.c =================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -149,6 +149,7 @@ struct sbp2_target { - struct kref kref; - struct fw_unit *unit; - struct list_head lu_list; -+ const char *bus_id; - - u64 management_agent_address; - int directory_id; -@@ -566,20 +567,20 @@ sbp2_send_management_orb(struct sbp2_log - - retval = -EIO; - if (sbp2_cancel_orbs(lu) == 0) { -- fw_error("orb reply timed out, rcode=0x%02x\n", -- orb->base.rcode); -+ fw_error("%s: orb reply timed out, rcode=0x%02x\n", -+ lu->tgt->bus_id, orb->base.rcode); - goto out; - } - - if (orb->base.rcode != RCODE_COMPLETE) { -- fw_error("management write failed, rcode 0x%02x\n", -- orb->base.rcode); -+ fw_error("%s: management write failed, rcode 0x%02x\n", -+ lu->tgt->bus_id, orb->base.rcode); - goto out; - } - - if (STATUS_GET_RESPONSE(orb->status) != 0 || - STATUS_GET_SBP_STATUS(orb->status) != 0) { -- fw_error("error status: %d:%d\n", -+ fw_error("%s: error status: %d:%d\n", lu->tgt->bus_id, - STATUS_GET_RESPONSE(orb->status), - STATUS_GET_SBP_STATUS(orb->status)); - goto out; -@@ -664,7 +665,7 @@ static void sbp2_release_target(struct k - kfree(lu); - } - scsi_remove_host(shost); -- fw_notify("released %s\n", tgt->unit->device.bus_id); -+ fw_notify("released %s\n", tgt->bus_id); - - put_device(&tgt->unit->device); - scsi_host_put(shost); -@@ -693,12 +694,11 @@ static void sbp2_login(struct work_struc - { - struct sbp2_logical_unit *lu = - container_of(work, struct sbp2_logical_unit, work.work); -- struct Scsi_Host *shost = -- container_of((void *)lu->tgt, struct Scsi_Host, hostdata[0]); -+ struct sbp2_target *tgt = lu->tgt; -+ struct fw_device *device = fw_device(tgt->unit->device.parent); -+ struct Scsi_Host *shost; - struct scsi_device *sdev; - struct scsi_lun eight_bytes_lun; -- struct fw_unit *unit = lu->tgt->unit; -- struct fw_device *device = fw_device(unit->device.parent); - struct sbp2_login_response response; - int generation, node_id, local_node_id; - -@@ -715,14 +715,14 @@ static void sbp2_login(struct work_struc - if (lu->retries++ < 5) - sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5)); - else -- fw_error("failed to login to %s LUN %04x\n", -- unit->device.bus_id, lu->lun); -+ fw_error("%s: failed to login to LUN %04x\n", -+ tgt->bus_id, lu->lun); - goto out; - } - -- lu->generation = generation; -- lu->tgt->node_id = node_id; -- lu->tgt->address_high = local_node_id << 16; -+ lu->generation = generation; -+ tgt->node_id = node_id; -+ tgt->address_high = local_node_id << 16; - - /* Get command block agent offset and login id. */ - lu->command_block_agent_address = -@@ -730,8 +730,8 @@ static void sbp2_login(struct work_struc - response.command_block_agent.low; - lu->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response); - -- fw_notify("logged in to %s LUN %04x (%d retries)\n", -- unit->device.bus_id, lu->lun, lu->retries); -+ fw_notify("%s: logged in to LUN %04x (%d retries)\n", -+ tgt->bus_id, lu->lun, lu->retries); - - #if 0 - /* FIXME: The linux1394 sbp2 does this last step. */ -@@ -747,6 +747,7 @@ static void sbp2_login(struct work_struc - memset(&eight_bytes_lun, 0, sizeof(eight_bytes_lun)); - eight_bytes_lun.scsi_lun[0] = (lu->lun >> 8) & 0xff; - eight_bytes_lun.scsi_lun[1] = lu->lun & 0xff; -+ shost = container_of((void *)tgt, struct Scsi_Host, hostdata[0]); - - sdev = __scsi_add_device(shost, 0, 0, - scsilun_to_int(&eight_bytes_lun), lu); -@@ -791,7 +792,7 @@ static void sbp2_login(struct work_struc +--- linux.orig/drivers/firewire/fw-device.c ++++ linux/drivers/firewire/fw-device.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -160,9 +161,9 @@ static void fw_device_release(struct dev + * Take the card lock so we don't set this to NULL while a + * FW_NODE_UPDATED callback is being handled. */ - PREPARE_DELAYED_WORK(&lu->work, sbp2_login); - out: -- sbp2_target_put(lu->tgt); -+ sbp2_target_put(tgt); - } - - static int sbp2_add_logical_unit(struct sbp2_target *tgt, int lun_entry) -@@ -874,7 +875,7 @@ static int sbp2_scan_unit_dir(struct sbp - if (timeout > tgt->mgt_orb_timeout) - fw_notify("%s: config rom contains %ds " - "management ORB timeout, limiting " -- "to %ds\n", tgt->unit->device.bus_id, -+ "to %ds\n", tgt->bus_id, - timeout / 1000, - tgt->mgt_orb_timeout / 1000); - break; -@@ -902,7 +903,7 @@ static void sbp2_init_workarounds(struct - if (w) - fw_notify("Please notify linux1394-devel at lists.sourceforge.net " - "if you need the workarounds parameter for %s\n", -- tgt->unit->device.bus_id); -+ tgt->bus_id); - - if (w & SBP2_WORKAROUND_OVERRIDE) - goto out; -@@ -924,8 +925,7 @@ static void sbp2_init_workarounds(struct - if (w) - fw_notify("Workarounds for %s: 0x%x " - "(firmware_revision 0x%06x, model_id 0x%06x)\n", -- tgt->unit->device.bus_id, -- w, firmware_revision, model); -+ tgt->bus_id, w, firmware_revision, model); - tgt->workarounds = w; - } - -@@ -949,6 +949,7 @@ static int sbp2_probe(struct device *dev - tgt->unit = unit; - kref_init(&tgt->kref); - INIT_LIST_HEAD(&tgt->lu_list); -+ tgt->bus_id = unit->device.bus_id; - - if (fw_device_enable_phys_dma(device) < 0) - goto fail_shost_put; -@@ -999,8 +1000,8 @@ static void sbp2_reconnect(struct work_s +- spin_lock_irqsave(&device->card->lock, flags); ++ spin_lock_irqsave(&card->lock, flags); + device->node->data = NULL; +- spin_unlock_irqrestore(&device->card->lock, flags); ++ spin_unlock_irqrestore(&card->lock, flags); + + fw_node_put(device->node); + kfree(device->config_rom); +@@ -337,10 +338,14 @@ static ssize_t + config_rom_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct sbp2_logical_unit *lu = - container_of(work, struct sbp2_logical_unit, work.work); -- struct fw_unit *unit = lu->tgt->unit; -- struct fw_device *device = fw_device(unit->device.parent); -+ struct sbp2_target *tgt = lu->tgt; -+ struct fw_device *device = fw_device(tgt->unit->device.parent); - int generation, node_id, local_node_id; - - if (fw_device_is_shutdown(device)) -@@ -1015,8 +1016,7 @@ static void sbp2_reconnect(struct work_s - SBP2_RECONNECT_REQUEST, - lu->login_id, NULL) < 0) { - if (lu->retries++ >= 5) { -- fw_error("failed to reconnect to %s\n", -- unit->device.bus_id); -+ fw_error("%s: failed to reconnect\n", tgt->bus_id); - /* Fall back and try to log in again. */ - lu->retries = 0; - PREPARE_DELAYED_WORK(&lu->work, sbp2_login); -@@ -1025,17 +1025,17 @@ static void sbp2_reconnect(struct work_s - goto out; - } + struct fw_device *device = fw_device(dev); ++ size_t length; -- lu->generation = generation; -- lu->tgt->node_id = node_id; -- lu->tgt->address_high = local_node_id << 16; -+ lu->generation = generation; -+ tgt->node_id = node_id; -+ tgt->address_high = local_node_id << 16; - -- fw_notify("reconnected to %s LUN %04x (%d retries)\n", -- unit->device.bus_id, lu->lun, lu->retries); -+ fw_notify("%s: reconnected to LUN %04x (%d retries)\n", -+ tgt->bus_id, lu->lun, lu->retries); +- memcpy(buf, device->config_rom, device->config_rom_length * 4); ++ down(&dev->sem); ++ length = device->config_rom_length * 4; ++ memcpy(buf, device->config_rom, length); ++ up(&dev->sem); - sbp2_agent_reset(lu); - sbp2_cancel_orbs(lu); - out: -- sbp2_target_put(lu->tgt); -+ sbp2_target_put(tgt); +- return device->config_rom_length * 4; ++ return length; } - static void sbp2_update(struct fw_unit *unit) -@@ -1377,7 +1377,7 @@ static int sbp2_scsi_abort(struct scsi_c + static ssize_t +@@ -412,7 +417,7 @@ read_rom(struct fw_device *device, int g + */ + static int read_bus_info_block(struct fw_device *device, int generation) { - struct sbp2_logical_unit *lu = cmd->device->hostdata; - -- fw_notify("sbp2_scsi_abort\n"); -+ fw_notify("%s: sbp2_scsi_abort\n", lu->tgt->bus_id); - sbp2_agent_reset(lu); - sbp2_cancel_orbs(lu); +- u32 *rom, *stack; ++ u32 *rom, *stack, *old_rom, *new_rom; + u32 sp, key; + int i, end, length, ret = -1; + +@@ -527,11 +532,18 @@ static int read_bus_info_block(struct fw + length = i; + } - --- -Stefan Richter --=====-==--- --=- ---== -http://arcgraph.de/sr/ - - -When a reconnect failed but re-login succeeded, __scsi_add_device was -called again. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-sbp2.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: linux/drivers/firewire/fw-sbp2.c -=================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -741,6 +741,12 @@ static void sbp2_login(struct work_struc - PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect); - sbp2_agent_reset(lu); - -+ /* This was a re-login. */ -+ if (lu->sdev) { -+ sbp2_cancel_orbs(lu); -+ goto out; -+ } +- device->config_rom = kmalloc(length * 4, GFP_KERNEL); +- if (device->config_rom == NULL) ++ old_rom = device->config_rom; ++ new_rom = kmemdup(rom, length * 4, GFP_KERNEL); ++ if (new_rom == NULL) + goto out; +- memcpy(device->config_rom, rom, length * 4); + - if (lu->tgt->workarounds & SBP2_WORKAROUND_DELAY_INQUIRY) - ssleep(SBP2_INQUIRY_DELAY); - - --- -Stefan Richter --=====-==--- --=- ---== -http://arcgraph.de/sr/ - - -If fw-sbp2 was too late with requesting the reconnect, the target would -reject this. In this case, log out before attempting the reconnect. -Else several firmwares will deny the re-login because they somehow -didn't invalidate the old login. - -Also, don't retry reconnects in this situation. The retries won't -succeed either. - -These changes improve chances for successful re-login and shorten the -period during which the logical unit is inaccessible. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-sbp2.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -Index: linux/drivers/firewire/fw-sbp2.c -=================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -710,6 +710,11 @@ static void sbp2_login(struct work_struc - node_id = device->node_id; - local_node_id = device->card->node_id; - -+ /* If this is a re-login attempt, log out, or we might be rejected. */ -+ if (lu->sdev) -+ sbp2_send_management_orb(lu, device->node_id, generation, -+ SBP2_LOGOUT_REQUEST, lu->login_id, NULL); -+ - if (sbp2_send_management_orb(lu, node_id, generation, - SBP2_LOGIN_REQUEST, lu->lun, &response) < 0) { - if (lu->retries++ < 5) -@@ -1021,9 +1026,17 @@ static void sbp2_reconnect(struct work_s - if (sbp2_send_management_orb(lu, node_id, generation, - SBP2_RECONNECT_REQUEST, - lu->login_id, NULL) < 0) { -- if (lu->retries++ >= 5) { -+ /* -+ * If reconnect was impossible even though we are in the -+ * current generation, fall back and try to log in again. -+ * -+ * We could check for "Function rejected" status, but -+ * looking at the bus generation as simpler and more general. -+ */ -+ smp_rmb(); /* get current card generation */ -+ if (generation == device->card->generation || -+ lu->retries++ >= 5) { - fw_error("%s: failed to reconnect\n", tgt->bus_id); -- /* Fall back and try to log in again. */ - lu->retries = 0; - PREPARE_DELAYED_WORK(&lu->work, sbp2_login); - } - --- -Stefan Richter --=====-==--- --=- ---== -http://arcgraph.de/sr/ - - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-sbp2.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -Index: linux/drivers/firewire/fw-sbp2.c -=================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -28,15 +28,15 @@ - * and many others. - */ - -+#include -+#include -+#include -+#include - #include -+#include - #include - #include --#include --#include --#include - #include --#include --#include - #include - #include - #include -@@ -48,9 +48,9 @@ - #include - #include - --#include "fw-transaction.h" --#include "fw-topology.h" - #include "fw-device.h" -+#include "fw-topology.h" -+#include "fw-transaction.h" - - /* - * So far only bridges from Oxford Semiconductor are known to support - --- -Stefan Richter --=====-==--- --=- ---== -http://arcgraph.de/sr/ - - -While fw-sbp2 takes the necessary time to reconnect to a logical unit -after bus reset, the SCSI core keeps sending new commands. They are all -immediately completed with host busy status, and application clients or -filesystems will break quickly. The SCSI device might even be taken -offline: http://bugzilla.kernel.org/show_bug.cgi?id=9734 - -The only remedy seems to be to block the SCSI device until reconnect. -Alas the SCSI core has no useful API to block only one logical unit i.e. -the scsi_device, therefore we block the entire Scsi_Host. This -currently corresponds to an SBP-2 target. In case of targets with -multiple logical units, we need to satisfy the dependencies between -logical units by carefully tracking the blocking state of the target and -its units. We block all logical units of a target as soon as one of -them needs to be blocked, and keep them blocked until all of them are -ready to be unblocked. - -Furthermore, as the history of the old sbp2 driver has shown, the -scsi_block_requests() API is a minefield with high potential of -deadlocks. We therefore take extra measures to keep logical units -unblocked during __scsi_add_device() and during shutdown. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-sbp2.c | 71 +++++++++++++++++++++++++++++++++++-- - 1 file changed, 69 insertions(+), 2 deletions(-) - -Index: linux/drivers/firewire/fw-sbp2.c -=================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -41,6 +41,8 @@ - #include - #include - #include -+#include -+#include - - #include - #include -@@ -139,6 +140,7 @@ struct sbp2_logical_unit { - int generation; - int retries; - struct delayed_work work; -+ atomic_t blocked; - }; - - /* -@@ -157,6 +159,9 @@ struct sbp2_target { - int address_high; - unsigned int workarounds; - unsigned int mgt_orb_timeout; ++ /* serialize with readers via sysfs or ioctl */ ++ down(&device->device.sem); ++ device->config_rom = new_rom; + device->config_rom_length = length; ++ up(&device->device.sem); + -+ atomic_t dont_block; -+ atomic_t blocked; - }; ++ kfree(old_rom); + ret = 0; + out: + kfree(rom); +@@ -724,7 +736,7 @@ static void fw_device_init(struct work_s + if (atomic_cmpxchg(&device->state, + FW_DEVICE_INITIALIZING, + FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) { +- fw_device_shutdown(&device->work.work); ++ fw_device_shutdown(work); + } else { + if (device->config_rom_retries) + fw_notify("created device %s: GUID %08x%08x, S%d00, " +@@ -738,6 +750,7 @@ static void fw_device_init(struct work_s + device->device.bus_id, + device->config_rom[3], device->config_rom[4], + 1 << device->max_speed); ++ device->config_rom_retries = 0; + } - /* -@@ -646,6 +651,53 @@ static void sbp2_agent_reset_no_wait(str - &z, sizeof(z), complete_agent_reset_write_no_wait, t); + /* +@@ -784,6 +797,104 @@ static void fw_device_update(struct work + device_for_each_child(&device->device, NULL, update_unit); } -+/* -+ * Blocks lu->tgt if all of the following conditions are met: -+ * - Login, INQUIRY, and high-level SCSI setup of all logical units of the -+ * target have been successfully finished (indicated by dont_block == 0). -+ * - The lu->generation is stale. sbp2_reconnect will unblock lu later. -+ */ -+static void sbp2_conditionally_block(struct sbp2_logical_unit *lu) ++enum { ++ REREAD_BIB_ERROR, ++ REREAD_BIB_GONE, ++ REREAD_BIB_UNCHANGED, ++ REREAD_BIB_CHANGED, ++}; ++ ++/* Reread and compare bus info block and header of root directory */ ++static int reread_bus_info_block(struct fw_device *device, int generation) +{ -+ struct fw_card *card = fw_device(lu->tgt->unit->device.parent)->card; ++ u32 q; ++ int i; + -+ if (!atomic_read(&lu->tgt->dont_block) && -+ lu->generation != card->generation && -+ atomic_cmpxchg(&lu->blocked, 0, 1) == 0) { -+ -+ /* raise the block count of the target */ -+ if (atomic_inc_return(&lu->tgt->blocked) == 1) { -+ scsi_block_requests(lu->sdev->host); -+ fw_notify("blocked %s\n", lu->tgt->bus_id); -+ } ++ for (i = 0; i < 6; i++) { ++ if (read_rom(device, generation, i, &q) != RCODE_COMPLETE) ++ return REREAD_BIB_ERROR; ++ ++ if (i == 0 && q == 0) ++ return REREAD_BIB_GONE; ++ ++ if (i > device->config_rom_length || q != device->config_rom[i]) ++ return REREAD_BIB_CHANGED; + } ++ ++ return REREAD_BIB_UNCHANGED; +} + -+/* Unblocks lu->tgt as soon as all its logical units can be unblocked. */ -+static void sbp2_conditionally_unblock(struct sbp2_logical_unit *lu) ++static void fw_device_refresh(struct work_struct *work) +{ -+ if (atomic_cmpxchg(&lu->blocked, 1, 0) == 1) { ++ struct fw_device *device = ++ container_of(work, struct fw_device, work.work); ++ struct fw_card *card = device->card; ++ int node_id = device->node_id; ++ ++ switch (reread_bus_info_block(device, device->generation)) { ++ case REREAD_BIB_ERROR: ++ if (device->config_rom_retries < MAX_RETRIES / 2 && ++ atomic_read(&device->state) == FW_DEVICE_INITIALIZING) { ++ device->config_rom_retries++; ++ schedule_delayed_work(&device->work, RETRY_DELAY / 2); + -+ /* lower the block count of the target */ -+ if (atomic_dec_and_test(&lu->tgt->blocked)) { -+ scsi_unblock_requests(lu->sdev->host); -+ fw_notify("unblocked %s\n", lu->tgt->bus_id); ++ return; + } -+ } -+} ++ goto give_up; + ++ case REREAD_BIB_GONE: ++ goto gone; + -+/* Prevents future blocking of tgt and then unblocks it. */ -+static void sbp2_unblock(struct sbp2_target *tgt) -+{ -+ struct Scsi_Host *shost = -+ container_of((void *)tgt, struct Scsi_Host, hostdata[0]); ++ case REREAD_BIB_UNCHANGED: ++ if (atomic_cmpxchg(&device->state, ++ FW_DEVICE_INITIALIZING, ++ FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) ++ goto gone; + -+ atomic_inc(&tgt->dont_block); -+ smp_wmb(); -+ scsi_unblock_requests(shost); -+} ++ fw_device_update(work); ++ device->config_rom_retries = 0; ++ ++ return; ++ } + - static void sbp2_release_target(struct kref *kref) - { - struct sbp2_target *tgt = container_of(kref, struct sbp2_target, kref); -@@ -653,6 +705,12 @@ static void sbp2_release_target(struct k - struct Scsi_Host *shost = - container_of((void *)tgt, struct Scsi_Host, hostdata[0]); - + /* -+ * Make sure that the target is unblocked and won't be blocked anymore -+ * before scsi_remove_device() is called. Else it will deadlock. ++ * Something changed. We keep things simple and don't investigate ++ * further. We just destroy all previous units and create new ones. + */ -+ sbp2_unblock(tgt); ++ device_for_each_child(&device->device, NULL, shutdown_unit); ++ ++ if (read_bus_info_block(device, device->generation) < 0) { ++ if (device->config_rom_retries < MAX_RETRIES && ++ atomic_read(&device->state) == FW_DEVICE_INITIALIZING) { ++ device->config_rom_retries++; ++ schedule_delayed_work(&device->work, RETRY_DELAY); + - list_for_each_entry_safe(lu, next, &tgt->lu_list, link) { - if (lu->sdev) - scsi_remove_device(lu->sdev); -@@ -717,11 +775,14 @@ static void sbp2_login(struct work_struc - - if (sbp2_send_management_orb(lu, node_id, generation, - SBP2_LOGIN_REQUEST, lu->lun, &response) < 0) { -- if (lu->retries++ < 5) -+ if (lu->retries++ < 5) { - sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5)); -- else -+ } else { - fw_error("%s: failed to login to LUN %04x\n", - tgt->bus_id, lu->lun); -+ /* Let any waiting I/O fail from now on. */ -+ sbp2_unblock(lu->tgt); ++ return; + } - goto out; - } - -@@ -749,6 +810,7 @@ static void sbp2_login(struct work_struc - /* This was a re-login. */ - if (lu->sdev) { - sbp2_cancel_orbs(lu); -+ sbp2_conditionally_unblock(lu); - goto out; - } - -@@ -786,6 +848,8 @@ static void sbp2_login(struct work_struc - * Can you believe it? Everything went well. - */ - lu->sdev = sdev; -+ smp_wmb(); /* We need lu->sdev when we want to block lu. */ -+ atomic_dec(&lu->tgt->dont_block); - scsi_device_put(sdev); - goto out; - } -@@ -828,6 +892,7 @@ static int sbp2_add_logical_unit(struct - lu->sdev = NULL; - lu->lun = lun_entry & 0xffff; - lu->retries = 0; -+ atomic_inc(&tgt->dont_block); - INIT_LIST_HEAD(&lu->orb_list); - INIT_DELAYED_WORK(&lu->work, sbp2_login); - -@@ -1053,6 +1118,7 @@ static void sbp2_reconnect(struct work_s - - sbp2_agent_reset(lu); - sbp2_cancel_orbs(lu); -+ sbp2_conditionally_unblock(lu); - out: - sbp2_target_put(tgt); - } -@@ -1172,6 +1238,7 @@ complete_command_orb(struct sbp2_orb *ba - * or when sending the write (less likely). - */ - result = DID_BUS_BUSY << 16; -+ sbp2_conditionally_block(orb->lu); - } - - dma_unmap_single(device->card->device, orb->base.request_bus, - --- -Stefan Richter --=====-==--- --=- ---== -http://arcgraph.de/sr/ - -Since "fw-sbp2: fix I/O errors during reconnect", a Scsi_Host will be -blocked as soon as a command failed due to bus generation change. Now -we also block it when fw-core signalled a bus reset via sbp2_update. -This will avoid some command failures and retries (but not all because -commands are injected from tasklet context while sbp2_update runs from -workqueue thread context). - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-sbp2.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux/drivers/firewire/fw-sbp2.c -=================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -1135,6 +1135,7 @@ static void sbp2_update(struct fw_unit * - * Iteration over tgt->lu_list is therefore safe here. - */ - list_for_each_entry(lu, &tgt->lu_list, link) { -+ sbp2_conditionally_block(lu); - lu->retries = 0; - sbp2_queue_work(lu, 0); - } - --- -Stefan Richter --=====-==--- --=- --==- -http://arcgraph.de/sr/ - - -fw-sbp2 is unable to reconnect while performing __scsi_add_device -because there is only a single workqueue thread context available for -both at the moment. This should be fixed eventually. - -An actual failure of __scsi_add_device is easy to handle, but an -incomplete execution of __scsi_add_device with an sdev returned would -remain undetected and leave the SBP-2 target unusable. - -Therefore we use a workaround: If there was a bus reset during -__scsi_add_device (i.e. during the SCSI probe), we remove the new sdev -immediately, log out, and attempt login and SCSI probe again. - -Signed-off-by: Stefan Richter -Signed-off-by: Jarod Wilson ---- - -The previous patch "firewire: fw-sbp2: retry login if scsi_device was -offlined early" should be folded into this one before upstream -submission. - - drivers/firewire/fw-sbp2.c | 43 ++++++++++++++++--------------------- - 1 file changed, 19 insertions(+), 24 deletions(-) - -Index: linux/drivers/firewire/fw-sbp2.c -=================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -824,36 +824,31 @@ static void sbp2_login(struct work_struc - - sdev = __scsi_add_device(shost, 0, 0, - scsilun_to_int(&eight_bytes_lun), lu); -- if (IS_ERR(sdev)) { -- /* -- * The most frequent cause for __scsi_add_device() to fail -- * is a bus reset while sending the SCSI INQUIRY. Try again. -- */ -+ /* -+ * FIXME: We are unable to perform reconnects while in sbp2_login(). -+ * Therefore __scsi_add_device() will get into trouble if a bus reset -+ * happens in parallel. It will either fail or leave us with an -+ * unusable sdev. As a workaround we check for this and retry the -+ * whole login and SCSI probing. -+ */ ++ goto give_up; ++ } + -+ if (IS_ERR(sdev)) - goto out_logout_login; - -- } else if (sdev->sdev_state == SDEV_OFFLINE) { -- /* -- * FIXME: We are unable to perform reconnects while in -- * sbp2_login(). Therefore __scsi_add_device() will get -- * into trouble if a bus reset happens in parallel. -- * It will either fail (that's OK, see above) or take sdev -- * offline. Here is a crude workaround for the latter. -- */ -- scsi_device_put(sdev); -+ scsi_device_put(sdev); -+ -+ smp_rmb(); /* get current card generation */ -+ if (generation != device->card->generation) { - scsi_remove_device(sdev); - goto out_logout_login; -- -- } else { -- /* -- * Can you believe it? Everything went well. -- */ -- lu->sdev = sdev; -- smp_wmb(); /* We need lu->sdev when we want to block lu. */ -- atomic_dec(&lu->tgt->dont_block); -- scsi_device_put(sdev); -- goto out; - } - -+ /* Everything went well. */ -+ lu->sdev = sdev; -+ smp_wmb(); /* We need lu->sdev when we want to block lu. */ -+ atomic_dec(&lu->tgt->dont_block); ++ create_units(device); ++ ++ if (atomic_cmpxchg(&device->state, ++ FW_DEVICE_INITIALIZING, ++ FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) ++ goto gone; ++ ++ fw_notify("refreshed device %s\n", device->device.bus_id); ++ device->config_rom_retries = 0; + goto out; + - out_logout_login: - smp_rmb(); /* generation may have changed */ - generation = device->generation; ++ give_up: ++ fw_notify("giving up on refresh of device %s\n", device->device.bus_id); ++ gone: ++ atomic_set(&device->state, FW_DEVICE_SHUTDOWN); ++ fw_device_shutdown(work); ++ out: ++ if (node_id == card->root_node->node_id) ++ schedule_delayed_work(&card->work, 0); ++} ++ + void fw_node_event(struct fw_card *card, struct fw_node *node, int event) + { + struct fw_device *device; +@@ -793,7 +904,7 @@ void fw_node_event(struct fw_card *card, + case FW_NODE_LINK_ON: + if (!node->link_on) + break; +- ++ create: + device = kzalloc(sizeof(*device), GFP_ATOMIC); + if (device == NULL) + break; +@@ -832,6 +943,22 @@ void fw_node_event(struct fw_card *card, + schedule_delayed_work(&device->work, INITIAL_DELAY); + break; + ++ case FW_NODE_INITIATED_RESET: ++ device = node->data; ++ if (device == NULL) ++ goto create; ++ ++ device->node_id = node->node_id; ++ smp_wmb(); /* update node_id before generation */ ++ device->generation = card->generation; ++ if (atomic_cmpxchg(&device->state, ++ FW_DEVICE_RUNNING, ++ FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) { ++ PREPARE_DELAYED_WORK(&device->work, fw_device_refresh); ++ schedule_delayed_work(&device->work, INITIAL_DELAY); ++ } ++ break; ++ + case FW_NODE_UPDATED: + if (!node->link_on || node->data == NULL) + break; +Index: linux/drivers/firewire/fw-topology.c +=================================================================== +--- linux.orig/drivers/firewire/fw-topology.c ++++ linux/drivers/firewire/fw-topology.c +@@ -107,6 +107,7 @@ static struct fw_node *fw_node_create(u3 + node->node_id = LOCAL_BUS | SELF_ID_PHY_ID(sid); + node->link_on = SELF_ID_LINK_ON(sid); + node->phy_speed = SELF_ID_PHY_SPEED(sid); ++ node->initiated_reset = SELF_ID_PHY_INITIATOR(sid); + node->port_count = port_count; + + atomic_set(&node->ref_count, 1); +@@ -430,6 +431,8 @@ update_tree(struct fw_card *card, struct + event = FW_NODE_LINK_OFF; + else if (!node0->link_on && node1->link_on) + event = FW_NODE_LINK_ON; ++ else if (node1->initiated_reset && node1->link_on) ++ event = FW_NODE_INITIATED_RESET; + else + event = FW_NODE_UPDATED; + +Index: linux/drivers/firewire/fw-topology.h +=================================================================== +--- linux.orig/drivers/firewire/fw-topology.h ++++ linux/drivers/firewire/fw-topology.h +@@ -20,11 +20,12 @@ + #define __fw_topology_h + + enum { +- FW_NODE_CREATED = 0x00, +- FW_NODE_UPDATED = 0x01, +- FW_NODE_DESTROYED = 0x02, +- FW_NODE_LINK_ON = 0x03, +- FW_NODE_LINK_OFF = 0x04, ++ FW_NODE_CREATED, ++ FW_NODE_UPDATED, ++ FW_NODE_DESTROYED, ++ FW_NODE_LINK_ON, ++ FW_NODE_LINK_OFF, ++ FW_NODE_INITIATED_RESET, + }; + + struct fw_node { -- Stefan Richter --=====-==--- --=- -=--- +-=====-==--- --== ---== http://arcgraph.de/sr/ linux-2.6-firewire-git-update.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6-firewire-git-update.patch Index: linux-2.6-firewire-git-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-firewire-git-update.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-firewire-git-update.patch 15 Feb 2008 23:58:52 -0000 1.3 +++ linux-2.6-firewire-git-update.patch 4 Mar 2008 05:03:18 -0000 1.4 @@ -1,251 +1,3201 @@ -diff -Naurp linux-2.6-git/drivers/firewire/fw-cdev.c firewire-git/drivers/firewire/fw-cdev.c ---- linux-2.6-git/drivers/firewire/fw-cdev.c 2008-01-01 22:50:33.000000000 -0500 -+++ firewire-git/drivers/firewire/fw-cdev.c 2008-01-25 12:41:22.000000000 -0500 -@@ -206,12 +206,13 @@ fill_bus_reset_event(struct fw_cdev_even +IEEE 1394 updates for Linux 2.6.24 (v659 2008-03-02) + + MAINTAINERS | 4 + drivers/firewire/fw-card.c | 99 +-- + drivers/firewire/fw-cdev.c | 20 + drivers/firewire/fw-device.c | 107 ++-- + drivers/firewire/fw-device.h | 49 + + drivers/firewire/fw-ohci.c | 494 ++++++++++++------- + drivers/firewire/fw-sbp2.c | 588 +++++++++++++++-------- + drivers/firewire/fw-topology.c | 7 + drivers/firewire/fw-transaction.c | 6 + drivers/firewire/fw-transaction.h | 12 + drivers/ieee1394/dma.c | 37 - + drivers/ieee1394/dv1394.c | 3 + drivers/ieee1394/ieee1394_transactions.c | 68 -- + drivers/ieee1394/nodemgr.c | 6 + drivers/ieee1394/ohci1394.c | 121 ++-- + drivers/ieee1394/raw1394.c | 5 + drivers/ieee1394/sbp2.c | 67 +- + drivers/ieee1394/sbp2.h | 3 + drivers/ieee1394/video1394.c | 3 + lib/Kconfig.debug | 11 + 20 files changed, 1042 insertions(+), 668 deletions(-) + +======================================================================== +Date: Sat, 1 Mar 2008 12:36:42 +0100 (CET) +From: Stefan Richter +Subject: ieee1394: ohci1394: refactor probe, remove, suspend, resume + +Clean up shared code and variable names. + +Signed-off-by: Stefan Richter +--- + drivers/ieee1394/ohci1394.c | 113 +++++++++++++++++++------------------------- + 1 file changed, 49 insertions(+), 64 deletions(-) + +======================================================================== +Date: Sat, 1 Mar 2008 12:36:06 +0100 (CET) +From: Stefan Richter +Subject: ieee1394: ohci1394: switch on bus power after resume on PPC PMac + +The platform feature calls in the suspend method switched off cable +power, but the calls in the resume method did not switch it back on. + +Add the necessary feature call to .resume. Also add the corresponding +call to .suspend to make .suspend's behavior explicitly the same on all +PMacs. + +Signed-off-by: Stefan Richter +--- + drivers/ieee1394/ohci1394.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +======================================================================== +Date: Sat, 1 Mar 2008 12:35:29 +0100 (CET) +From: Stefan Richter +Subject: firewire: fw-ohci: refactor probe, remove, suspend, resume + +Clean up shared code and variable names. + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-ohci.c | 100 ++++++++++++++++++--------------------------- + 1 file changed, 42 insertions(+), 58 deletions(-) + +======================================================================== +Date: Sat, 1 Mar 2008 12:34:50 +0100 (CET) +From: Stefan Richter +Subject: firewire: fw-ohci: switch on bus power after resume on PPC PMac + +The platform feature calls in the suspend method switched off cable +power, but the calls in the resume method did not switch it back on. + +Add the necessary feature call to .resume. Also add the corresponding +call to .suspend to make .suspend's behavior explicitly the same on all +PMacs. + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-ohci.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +======================================================================== +Date: Sat, 1 Mar 2008 12:21:47 +0100 (CET) +From: Stefan Richter +Subject: firewire: fw-ohci: shut up false compiler warning on PPC32 + +Shut up two "may be used uninitialised in this function" warnings due to +PPC32's implementation of dma_alloc_coherent(). + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-ohci.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +======================================================================== +Date: Sat, 1 Mar 2008 02:47:15 +0100 (CET) +From: Stefan Richter +Subject: firewire: fw-ohci: Apple UniNorth 1st generation support + +Mostly copied from ohci1394.c. Necessary for some older Macs, e.g. +PowerBook G3 Pismo and early PowerBook G4 Titanium. + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-ohci.c | 29 +++++++++++++++++++++-------- + 1 file changed, 21 insertions(+), 8 deletions(-) + +======================================================================== +Date: Sat, 1 Mar 2008 02:42:56 +0100 (CET) +From: Stefan Richter +Subject: firewire: fw-ohci: PPC PMac platform code + +Copied from ohci1394.c. This code is necessary to prevent machine check +exceptions when reloading or resuming the driver. + +Tested on a 1st generation PowerBook G4 Titanium, which also needs the +pci_probe() hunk. + +Signed-off-by: Stefan Richter + +I was able to reproduce the system exception on resume with a 3rd-gen +Titanium PowerBook G4 667, and this patch does let the system resume +successfully now. + +Not quite clear if there was possibly an updated version coming using +pci_enable_device() instead of the pair of pmac_call_feature() calls, +but either way, this is a definite must-have, at least for older ppc +macs -- my Aluminum PowerBook G4/1.67 suspends and resumes without this +patch just fine. + +Signed-off-by: Jarod Wilson +Acked-by: Benjamin Herrenschmidt +--- + drivers/firewire/fw-ohci.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 50 insertions(+) + +======================================================================== +Date: Thu, 28 Feb 2008 20:54:43 +0100 (CET) +From: Stefan Richter +Subject: firewire: fw-ohci: add option for remote debugging + +This way firewire-ohci can be used for remote debugging like ohci1394. + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-ohci.c | 9 +++++++++ + lib/Kconfig.debug | 11 +++++++++++ + 2 files changed, 20 insertions(+) + +======================================================================== +Date: Thu, 28 Feb 2008 20:53:45 +0100 (CET) +From: Stefan Richter +Subject: firewire: fw-sbp2: reduce log noise + +The block/unblock logic is now sufficiently tested. + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-sbp2.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +======================================================================== +Date: Thu, 28 Feb 2008 20:52:43 +0100 (CET) +From: Stefan Richter +Subject: firewire: fw-sbp2: remove unnecessary memset + +orb came from kzalloc. + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-sbp2.c | 3 --- + 1 file changed, 3 deletions(-) + +======================================================================== +Date: Thu, 28 Feb 2008 20:52:02 +0100 (CET) +From: Stefan Richter +Subject: firewire: fw-sbp2: simplify some macros + +How hard can it be to switch on one bit? :-) + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-sbp2.c | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +======================================================================== [...4685 lines suppressed...] + goto out; ++ } else if (root_device->config_rom[2] & BIB_CMC) { + /* + * FIXME: I suppose we should set the cmstr bit in the + * STATE_CLEAR register of this node, as described in +@@ -332,7 +345,7 @@ fw_card_bm_work(struct work_struct *work + * successfully read the config rom, but it's not + * cycle master capable. + */ +- new_root_id = card->local_node->node_id; ++ new_root_id = local_node->node_id; } - lu->generation = generation; -@@ -930,8 +995,8 @@ static void sbp2_reconnect(struct work_s + pick_me: +@@ -341,8 +354,8 @@ fw_card_bm_work(struct work_struct *work + * the typically much larger 1394b beta repeater delays though. + */ + if (!card->beta_repeaters_present && +- card->root_node->max_hops < ARRAY_SIZE(gap_count_table)) +- gap_count = gap_count_table[card->root_node->max_hops]; ++ root_node->max_hops < ARRAY_SIZE(gap_count_table)) ++ gap_count = gap_count_table[root_node->max_hops]; + else + gap_count = 63; - sbp2_agent_reset(lu); - sbp2_cancel_orbs(lu); -- -- kref_put(&lu->tgt->kref, sbp2_release_target); +@@ -364,6 +377,11 @@ fw_card_bm_work(struct work_struct *work + fw_send_phy_config(card, new_root_id, generation, gap_count); + fw_core_initiate_bus_reset(card, 1); + } + out: -+ sbp2_target_put(lu->tgt); ++ if (root_device) ++ fw_device_put(root_device); ++ fw_node_put(root_node); ++ fw_node_put(local_node); } - static void sbp2_update(struct fw_unit *unit) -@@ -947,8 +1012,7 @@ static void sbp2_update(struct fw_unit * - */ - list_for_each_entry(lu, &tgt->lu_list, link) { - lu->retries = 0; -- if (queue_delayed_work(sbp2_wq, &lu->work, 0)) -- kref_get(&tgt->kref); -+ sbp2_queue_work(lu, 0); - } - } + static void +@@ -380,7 +398,7 @@ fw_card_initialize(struct fw_card *card, + { + static atomic_t index = ATOMIC_INIT(-1); -@@ -1103,9 +1167,9 @@ sbp2_map_scatterlist(struct sbp2_command - * elements larger than 65535 bytes, some IOMMUs may merge sg elements - * during DMA mapping, and Linux currently doesn't prevent this. - */ -- for (i = 0, j = 0; i < count; i++) { -- sg_len = sg_dma_len(sg + i); -- sg_addr = sg_dma_address(sg + i); -+ for (i = 0, j = 0; i < count; i++, sg = sg_next(sg)) { -+ sg_len = sg_dma_len(sg); -+ sg_addr = sg_dma_address(sg); - while (sg_len) { - /* FIXME: This won't get us out of the pinch. */ - if (unlikely(j >= ARRAY_SIZE(orb->page_table))) { -@@ -1158,7 +1222,7 @@ static int sbp2_scsi_queuecommand(struct - struct sbp2_logical_unit *lu = cmd->device->hostdata; - struct fw_device *device = fw_device(lu->tgt->unit->device.parent); - struct sbp2_command_orb *orb; -- unsigned max_payload; -+ unsigned int max_payload; - int retval = SCSI_MLQUEUE_HOST_BUSY; +- kref_init(&card->kref); ++ atomic_set(&card->device_count, 0); + card->index = atomic_inc_return(&index); + card->driver = driver; + card->device = device; +@@ -410,12 +428,6 @@ fw_card_add(struct fw_card *card, + card->link_speed = link_speed; + card->guid = guid; - /* -diff -Naurp linux-2.6-git/drivers/firewire/fw-topology.c firewire-git/drivers/firewire/fw-topology.c ---- linux-2.6-git/drivers/firewire/fw-topology.c 2008-01-01 22:50:33.000000000 -0500 -+++ firewire-git/drivers/firewire/fw-topology.c 2008-01-25 12:41:22.000000000 -0500 -@@ -518,6 +518,11 @@ fw_core_handle_bus_reset(struct fw_card - card->bm_retries = 0; +- /* +- * The subsystem grabs a reference when the card is added and +- * drops it when the driver calls fw_core_remove_card. +- */ +- fw_card_get(card); +- + mutex_lock(&card_mutex); + config_rom = generate_config_rom(card, &length); + list_add_tail(&card->link, &card_list); +@@ -511,44 +523,19 @@ fw_core_remove_card(struct fw_card *card + card->driver = &dummy_driver; - card->node_id = node_id; + fw_destroy_nodes(card); +- flush_scheduled_work(); + /* -+ * Update node_id before generation to prevent anybody from using -+ * a stale node_id together with a current generation. ++ * Wait for all device workqueue jobs to finish. Otherwise the ++ * firewire-core module could be unloaded before the jobs ran. + */ -+ smp_wmb(); - card->generation = generation; - card->reset_jiffies = jiffies; - schedule_delayed_work(&card->work, 0); -diff -Naurp linux-2.6-git/drivers/firewire/fw-transaction.c firewire-git/drivers/firewire/fw-transaction.c ---- linux-2.6-git/drivers/firewire/fw-transaction.c 2008-01-01 22:50:33.000000000 -0500 -+++ firewire-git/drivers/firewire/fw-transaction.c 2008-01-25 12:41:24.000000000 -0500 -@@ -153,7 +153,7 @@ fw_fill_request(struct fw_packet *packet - int ext_tcode; ++ while (atomic_read(&card->device_count) > 0) ++ msleep(100); - if (tcode > 0x10) { -- ext_tcode = tcode - 0x10; -+ ext_tcode = tcode & ~0x10; - tcode = TCODE_LOCK_REQUEST; - } else - ext_tcode = 0; -@@ -650,7 +650,7 @@ fw_core_handle_request(struct fw_card *c - HEADER_GET_OFFSET_HIGH(p->header[1]) << 32) | p->header[2]; - tcode = HEADER_GET_TCODE(p->header[0]); - destination = HEADER_GET_DESTINATION(p->header[0]); -- source = HEADER_GET_SOURCE(p->header[0]); -+ source = HEADER_GET_SOURCE(p->header[1]); ++ cancel_delayed_work_sync(&card->work); + fw_flush_transactions(card); + del_timer_sync(&card->flush_timer); +- +- fw_card_put(card); + } + EXPORT_SYMBOL(fw_core_remove_card); - spin_lock_irqsave(&address_handler_lock, flags); - handler = lookup_enclosing_address_handler(&address_handler_list, +-struct fw_card * +-fw_card_get(struct fw_card *card) +-{ +- kref_get(&card->kref); +- +- return card; +-} +-EXPORT_SYMBOL(fw_card_get); +- +-static void +-release_card(struct kref *kref) +-{ +- struct fw_card *card = container_of(kref, struct fw_card, kref); +- +- kfree(card); +-} +- +-/* +- * An assumption for fw_card_put() is that the card driver allocates +- * the fw_card struct with kalloc and that it has been shut down +- * before the last ref is dropped. +- */ +-void +-fw_card_put(struct fw_card *card) +-{ +- kref_put(&card->kref, release_card); +-} +-EXPORT_SYMBOL(fw_card_put); +- + int + fw_core_initiate_bus_reset(struct fw_card *card, int short_reset) + { +Index: linux-2.6.24/lib/Kconfig.debug +=================================================================== +--- linux-2.6.24.orig/lib/Kconfig.debug ++++ linux-2.6.24/lib/Kconfig.debug +@@ -517,4 +517,15 @@ config FAULT_INJECTION_STACKTRACE_FILTER + help + Provide stacktrace filter for fault-injection capabilities + ++config FIREWIRE_OHCI_REMOTE_DMA ++ bool "Remote debugging via firewire-ohci" ++ depends on FIREWIRE_OHCI ++ help ++ This option lets you use the FireWire bus for remote debugging. ++ It enables unfiltered remote DMA in the firewire-ohci driver. ++ See Documentation/debugging-via-ohci1394.txt in linux-2.6.25 or ++ later for more information. ++ ++ If unsure, say N. ++ + source "samples/Kconfig" From fedora-extras-commits at redhat.com Tue Mar 4 05:05:26 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Tue, 4 Mar 2008 05:05:26 GMT Subject: rpms/scim-bridge/devel scim-bridge-0.4.15-fix-gdm.patch, NONE, 1.1 scim-bridge.spec, 1.56, 1.57 Message-ID: <200803040505.m2455QVd019061@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim-bridge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18961 Modified Files: scim-bridge.spec Added Files: scim-bridge-0.4.15-fix-gdm.patch Log Message: - Update to 0.4.15. - Let scim-bridge gtkim context can work with gtkplug widget #251787. scim-bridge-0.4.15-fix-gdm.patch: --- NEW FILE scim-bridge-0.4.15-fix-gdm.patch --- diff -up scim-bridge-0.4.15/client-gtk/scim-bridge-client-imcontext-gtk.c.fix-gdm scim-bridge-0.4.15/client-gtk/scim-bridge-client-imcontext-gtk.c --- scim-bridge-0.4.15/client-gtk/scim-bridge-client-imcontext-gtk.c.fix-gdm 2007-06-23 20:58:40.000000000 +0800 +++ scim-bridge-0.4.15/client-gtk/scim-bridge-client-imcontext-gtk.c 2008-03-04 13:00:49.000000000 +0800 @@ -37,6 +37,8 @@ #include "scim-bridge-output.h" #include "scim-bridge-string.h" +#define SEND_EVENT_MASK 0x02 + /* Typedef */ struct _ScimBridgeClientIMContext { @@ -202,7 +204,7 @@ static gboolean key_snooper (GtkWidget * { scim_bridge_pdebugln (7, "key_snooper ()"); - if (!event->send_event && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) { + if (!(event->send_event & SEND_EVENT_MASK) && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) { if (focused_imcontext->client_window != NULL) { int new_window_x; int new_window_y; @@ -558,7 +560,7 @@ void scim_bridge_client_imcontext_forwar { GdkEventKey gdk_event; scim_bridge_key_event_bridge_to_gdk (&gdk_event, imcontext->client_window, key_event); - gdk_event.send_event = TRUE; + gdk_event.send_event |= SEND_EVENT_MASK; if (imcontext == focused_imcontext && focused_widget != NULL) { const char *signal_name = NULL; if (scim_bridge_key_event_is_pressed (key_event)) { @@ -764,7 +766,7 @@ gboolean scim_bridge_client_imcontext_fi ScimBridgeClientIMContext *imcontext = SCIM_BRIDGE_CLIENT_IMCONTEXT (context); - if (!event->send_event && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) { + if (!(event->send_event & SEND_EVENT_MASK) && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) { if (imcontext->client_window != NULL) { int new_window_x; Index: scim-bridge.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- scim-bridge.spec 19 Feb 2008 19:24:52 -0000 1.56 +++ scim-bridge.spec 4 Mar 2008 05:04:51 -0000 1.57 @@ -4,8 +4,8 @@ %define build_qt 1 Name: scim-bridge -Version: 0.4.14 -Release: 2%{?dist} +Version: 0.4.15 +Release: 1%{?dist} Summary: SCIM Bridge Gtk IM module Group: System Environment/Libraries @@ -23,6 +23,8 @@ %endif Requires: scim >= 1.4.6 +Patch0: scim-bridge-0.4.15-fix-gdm.patch + %description SCIM Bridge is a C implementation of a Gtk IM module for SCIM. @@ -68,6 +70,7 @@ %prep %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} +%patch0 -p1 -b .0-fix-gdm %if %{snapshot} mkdir m4 @@ -138,6 +141,10 @@ %changelog +* Tue Mar 04 2008 Huang Peng - 0.4.15-1 +- Update to 0.4.15. +- Let scim-bridge gtkim context can work with gtkplug widget #251787. + * Tue Feb 19 2008 Fedora Release Engineering - 0.4.14-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 05:06:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:06:54 GMT Subject: rpms/perl-POE/devel perl-POE.spec,1.10,1.11 Message-ID: <200803040506.m2456sO7019350@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19202 Modified Files: perl-POE.spec Log Message: new perl Index: perl-POE.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE/devel/perl-POE.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-POE.spec 2 Jun 2007 18:17:08 -0000 1.10 +++ perl-POE.spec 4 Mar 2008 05:06:19 -0000 1.11 @@ -1,10 +1,10 @@ Name: perl-POE Version: 0.9989 -Release: 1%{?dist} +Release: 2%{?dist} Summary: POE - portable multitasking and networking framework for Perl Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/POE/ Source0: http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -130,6 +130,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.9989-2 +- rebuild for new perl + * Sat May 19 2007 Chris Weyl - spec cleanups, tweaks - add t/ to doc From fedora-extras-commits at redhat.com Tue Mar 4 05:07:30 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Tue, 4 Mar 2008 05:07:30 GMT Subject: rpms/scim-bridge/devel .cvsignore,1.30,1.31 sources,1.30,1.31 Message-ID: <200803040507.m2457Uqn019467@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim-bridge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19343 Modified Files: .cvsignore sources Log Message: upload tarball 0.4.15 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/scim-bridge/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 23 Dec 2007 16:06:54 -0000 1.30 +++ .cvsignore 4 Mar 2008 05:06:54 -0000 1.31 @@ -1 +1 @@ -scim-bridge-0.4.14.tar.gz +scim-bridge-0.4.15.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/scim-bridge/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 23 Dec 2007 16:06:54 -0000 1.30 +++ sources 4 Mar 2008 05:06:54 -0000 1.31 @@ -1 +1 @@ -e973802933bdcba1a30af3adbe688e76 scim-bridge-0.4.14.tar.gz +03015dfdc01f8aa6ad933c695f47077b scim-bridge-0.4.15.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 05:09:52 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:09:52 GMT Subject: rpms/perl-Devel-Size/devel perl-Devel-Size.spec,1.6,1.7 Message-ID: <200803040509.m2459qso020022@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Devel-Size/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19923 Modified Files: perl-Devel-Size.spec Log Message: new perl Index: perl-Devel-Size.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Devel-Size/devel/perl-Devel-Size.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Devel-Size.spec 18 Feb 2008 23:12:10 -0000 1.6 +++ perl-Devel-Size.spec 4 Mar 2008 05:09:18 -0000 1.7 @@ -1,8 +1,8 @@ Name: perl-Devel-Size Version: 0.68 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl extension for finding the memory usage of Perl variables -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Devel-Size/ @@ -60,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.68-4 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.68-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 05:11:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:11:07 GMT Subject: rpms/perl-POE-Component-Client-DNS/devel perl-POE-Component-Client-DNS.spec, 1.4, 1.5 Message-ID: <200803040511.m245B7fx020300@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-Client-DNS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20093 Modified Files: perl-POE-Component-Client-DNS.spec Log Message: new perl Index: perl-POE-Component-Client-DNS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-DNS/devel/perl-POE-Component-Client-DNS.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-POE-Component-Client-DNS.spec 11 Jan 2007 18:22:38 -0000 1.4 +++ perl-POE-Component-Client-DNS.spec 4 Mar 2008 05:10:20 -0000 1.5 @@ -1,16 +1,15 @@ Name: perl-POE-Component-Client-DNS Version: 1.00 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Non-blocking/concurrent DNS queries using Net::DNS and POE Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/POE-Component-Client-DNS Source0: http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-Client-DNS-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(POE) >= 0.31, perl(Net::DNS) >= 0.59 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -60,6 +59,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 1.00-2 +- rebuild for new perl + * Thu Jan 11 2007 Chris Weyl 1.00-1 - update to 1.00 - bump br on Net::DNS to >= 0.59 From fedora-extras-commits at redhat.com Tue Mar 4 05:12:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:12:10 GMT Subject: rpms/perl-POE-Component-Client-Keepalive/devel perl-POE-Component-Client-Keepalive.spec, 1.5, 1.6 Message-ID: <200803040512.m245CAas020523@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-Client-Keepalive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20384 Modified Files: perl-POE-Component-Client-Keepalive.spec Log Message: new perl Index: perl-POE-Component-Client-Keepalive.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-Keepalive/devel/perl-POE-Component-Client-Keepalive.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-POE-Component-Client-Keepalive.spec 13 May 2007 17:39:23 -0000 1.5 +++ perl-POE-Component-Client-Keepalive.spec 4 Mar 2008 05:11:37 -0000 1.6 @@ -1,10 +1,10 @@ Name: perl-POE-Component-Client-Keepalive Version: 0.1000 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manages and keeps alive client connections Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/POE-Component-Client-Keepalive Source0: http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.1000-2 +- rebuild for new perl + * Sun May 13 2007 Chris Weyl 0.1000-1 - update to 0.1000 - add t/ to %doc From fedora-extras-commits at redhat.com Tue Mar 4 05:13:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:13:22 GMT Subject: rpms/perl-POE-Component-Client-HTTP/devel perl-POE-Component-Client-HTTP.spec, 1.9, 1.10 Message-ID: <200803040513.m245DMAq020760@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-Client-HTTP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20611 Modified Files: perl-POE-Component-Client-HTTP.spec Log Message: new perl Index: perl-POE-Component-Client-HTTP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-HTTP/devel/perl-POE-Component-Client-HTTP.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-POE-Component-Client-HTTP.spec 21 Apr 2007 19:45:18 -0000 1.9 +++ perl-POE-Component-Client-HTTP.spec 4 Mar 2008 05:12:44 -0000 1.10 @@ -11,11 +11,11 @@ Name: perl-POE-Component-Client-HTTP Version: 0.82 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A non-blocking/parallel web requests engine for POE Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/POE-Component-Client-HTTP Source0: http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-Client-HTTP-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +87,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.82-2 +- rebuild for new perl + * Sat Apr 21 2007 Chris Weyl 0.82-1 - update to 0.82 - additional BR's for perl splittage From fedora-extras-commits at redhat.com Tue Mar 4 05:14:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:14:11 GMT Subject: rpms/perl-POE-Component-Child/devel perl-POE-Component-Child.spec, 1.4, 1.5 Message-ID: <200803040514.m245EBk7020937@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-Child/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20795 Modified Files: perl-POE-Component-Child.spec Log Message: new perl Index: perl-POE-Component-Child.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-Child/devel/perl-POE-Component-Child.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-POE-Component-Child.spec 10 Jan 2008 07:39:22 -0000 1.4 +++ perl-POE-Component-Child.spec 4 Mar 2008 05:13:34 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-POE-Component-Child Version: 1.39 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Child management component for POE Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 1.39-4 +- rebuild for new perl + * Thu Jan 10 2008 Ralf Cors??pius 1.39-3 - Update License-tag. - BR: perl(Test::Simple) (BZ 419631). From fedora-extras-commits at redhat.com Tue Mar 4 05:15:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:15:10 GMT Subject: rpms/perl-POE-API-Peek/devel perl-POE-API-Peek.spec,1.5,1.6 Message-ID: <200803040515.m245FAhI021131@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-API-Peek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21001 Modified Files: perl-POE-API-Peek.spec Log Message: new perl Index: perl-POE-API-Peek.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-API-Peek/devel/perl-POE-API-Peek.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-POE-API-Peek.spec 2 Jan 2008 13:05:59 -0000 1.5 +++ perl-POE-API-Peek.spec 4 Mar 2008 05:14:37 -0000 1.6 @@ -11,7 +11,7 @@ Name: perl-POE-API-Peek Version: 1.0802 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Peek into the internals of a running POE environment License: BSD Group: Development/Libraries @@ -79,6 +79,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 1.0802-3 +- rebuild for new perl + * Wed Jan 02 2008 Ralf Cors??pius 1.0802-2 - Add BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Tue Mar 4 05:18:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:18:15 GMT Subject: rpms/perl-Devel-Size/devel .cvsignore, 1.4, 1.5 perl-Devel-Size.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200803040518.m245IFmO021713@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Devel-Size/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21569 Modified Files: .cvsignore perl-Devel-Size.spec sources Log Message: 0.69 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Devel-Size/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Aug 2007 23:58:06 -0000 1.4 +++ .cvsignore 4 Mar 2008 05:17:39 -0000 1.5 @@ -1 +1 @@ -Devel-Size-0.68.tar.gz +Devel-Size-0.69.tar.gz Index: perl-Devel-Size.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Devel-Size/devel/perl-Devel-Size.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Devel-Size.spec 4 Mar 2008 05:09:18 -0000 1.7 +++ perl-Devel-Size.spec 4 Mar 2008 05:17:39 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Devel-Size -Version: 0.68 -Release: 4%{?dist} +Version: 0.69 +Release: 1%{?dist} Summary: Perl extension for finding the memory usage of Perl variables License: GPL+ or Artistic Group: Development/Libraries @@ -60,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.69-1 +- update to 0.69 + * Tue Mar 4 2008 Tom "spot" Callaway 0.68-4 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Devel-Size/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Aug 2007 23:58:06 -0000 1.4 +++ sources 4 Mar 2008 05:17:39 -0000 1.5 @@ -1 +1 @@ -e67327aebb98a25ecffe631d07a9c8b0 Devel-Size-0.68.tar.gz +07ea62080f40a7cc7dd2e519ba4f4143 Devel-Size-0.69.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 05:23:14 2008 From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard)) Date: Tue, 4 Mar 2008 05:23:14 GMT Subject: rpms/bit/devel bit.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 bit.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200803040523.m245NESp022691@cvs-int.fedora.redhat.com> Author: rvinyard Update of /cvs/pkgs/rpms/bit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22569 Modified Files: .cvsignore bit.spec sources Added Files: bit.patch Log Message: bit.patch: --- NEW FILE bit.patch --- diff -r -U 5 bit-0.4.1.orig/bit/buffer.h bit-0.4.1/bit/buffer.h --- bit-0.4.1.orig/bit/buffer.h 2007-03-12 12:25:10.000000000 -0600 +++ bit-0.4.1/bit/buffer.h 2008-03-03 22:15:12.000000000 -0700 @@ -19,10 +19,11 @@ #ifndef BITBUFFER_H #define BITBUFFER_H #include #include +#include /** * @defgroup buffers "Data Buffers" * Buffers provide an interface for storage of data that is not necessarily octet aligned. */ diff -r -U 5 bit-0.4.1.orig/bit/data.cpp bit-0.4.1/bit/data.cpp --- bit-0.4.1.orig/bit/data.cpp 2007-03-13 19:27:43.000000000 -0600 +++ bit-0.4.1/bit/data.cpp 2008-03-03 22:17:57.000000000 -0700 @@ -15,10 +15,11 @@ * License along with this library; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "data.h" +#include namespace bit { Data::Data( const void* d, size_t s, DataMode mode ) throw ( std::bad_alloc ) { Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bit/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 14 Mar 2007 02:18:14 -0000 1.4 +++ .cvsignore 4 Mar 2008 05:22:40 -0000 1.5 @@ -1 +1,2 @@ bit-0.4.1.tar.bz2 +bit.patch Index: bit.spec =================================================================== RCS file: /cvs/pkgs/rpms/bit/devel/bit.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bit.spec 19 Feb 2008 22:46:15 -0000 1.8 +++ bit.spec 4 Mar 2008 05:22:40 -0000 1.9 @@ -2,13 +2,14 @@ Summary: bit is a C++ library to simplify bit stream parsing Name: bit Version: 0.4.1 -Release: 2%{?dist} -License: LGPL +Release: 3%{?dist} +License: LGPLv2 URL: http://libbit.sourceforge.net Group: System Environment/Libraries Source: http://download.sourceforge.net/libbit/bit-0.4.1.tar.bz2 +Patch0: bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libxml++-devel >= 2.10.0 libsigc++20-devel >= 2.0.0 cppunit-devel +BuildRequires: libxml++-devel >= 2.10.0 libsigc++20-devel >= 2.0.0 boost-devel cppunit-devel %description The purpose of the bit library is to simplify the parsing of data streams into @@ -18,7 +19,7 @@ Summary: Headers for developing programs that will use bit Group: Development/Libraries Requires: bit = %{version}-%{release} -Requires: libxml++-devel >= 2.10.0 libsigc++20-devel >= 2.0.0 pkgconfig +Requires: libxml++-devel >= 2.10.0 libsigc++20-devel >= 2.0.0 boost-devel pkgconfig %description devel This package contains the libraries and header files needed for @@ -26,6 +27,7 @@ %prep %setup -q +%patch -p1 %build %configure --enable-static=no @@ -60,6 +62,10 @@ %changelog +* Mon Mar 03 2008 Rick L Vinyard Jr - 0.4.1-3 +- Added boost-devel to requires +- Added bit.patch + * Tue Feb 19 2008 Fedora Release Engineering - 0.4.1-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bit/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 14 Mar 2007 02:18:14 -0000 1.4 +++ sources 4 Mar 2008 05:22:40 -0000 1.5 @@ -1 +1,2 @@ 665cac6b663234127ce439bcb704ce01 bit-0.4.1.tar.bz2 +3524163ab82bb4bc71bf938e60f9720f bit.patch From fedora-extras-commits at redhat.com Tue Mar 4 05:30:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:30:00 GMT Subject: rpms/perl-XML-DOM-XPath/devel perl-XML-DOM-XPath.spec,1.2,1.3 Message-ID: <200803040530.m245U02q023772@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-DOM-XPath/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23656 Modified Files: perl-XML-DOM-XPath.spec Log Message: new perl Index: perl-XML-DOM-XPath.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-DOM-XPath/devel/perl-XML-DOM-XPath.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-XML-DOM-XPath.spec 4 Sep 2007 10:00:41 -0000 1.2 +++ perl-XML-DOM-XPath.spec 4 Mar 2008 05:29:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-XML-DOM-XPath Version: 0.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension to add XPath support to XML::DOM, using XML::XPath engine License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 0.13-3 +- rebuild for new perl + * Tue Sep 04 2007 Alex Lancaster 0.13-2 - Clarified license terms: GPL+ or Artistic From fedora-extras-commits at redhat.com Tue Mar 4 05:31:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:31:06 GMT Subject: rpms/perl-Text-Shellwords/devel perl-Text-Shellwords.spec,1.5,1.6 Message-ID: <200803040531.m245V68k024012@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Shellwords/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23859 Modified Files: perl-Text-Shellwords.spec Log Message: new perl Index: perl-Text-Shellwords.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Shellwords/devel/perl-Text-Shellwords.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Text-Shellwords.spec 15 Oct 2007 10:12:39 -0000 1.5 +++ perl-Text-Shellwords.spec 4 Mar 2008 05:30:32 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Text-Shellwords Version: 1.08 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A thin wrapper around the shellwords.pl package Group: Development/Libraries @@ -62,6 +62,9 @@ %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 1.08-4 +- rebuild for new perl + * Mon Oct 15 2007 Alex Lancaster 1.08-3 - Add missing BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Tue Mar 4 05:31:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 05:31:30 +0000 Subject: [pkgdb] idioskopos ownership updated Message-ID: <200803040532.m245WURo002967@bastion.fedora.phx.redhat.com> Package idioskopos in Fedora devel was orphaned by Rick L. Vinyard, Jr. (rvinyard) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/idioskopos From fedora-extras-commits at redhat.com Tue Mar 4 05:33:55 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 4 Mar 2008 05:33:55 GMT Subject: rpms/soprano/devel .cvsignore, 1.7, 1.8 soprano.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200803040533.m245XtjI024563@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24407/devel Modified Files: .cvsignore soprano.spec sources Log Message: * Tue Mar 4 2008 Kevin Kofler 2.0.3-1 - update to 2.0.3 (bugfix release) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Feb 2008 08:46:32 -0000 1.7 +++ .cvsignore 4 Mar 2008 05:33:14 -0000 1.8 @@ -1 +1 @@ -soprano-2.0.2.tar.bz2 +soprano-2.0.3.tar.bz2 Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- soprano.spec 22 Feb 2008 08:46:32 -0000 1.14 +++ soprano.spec 4 Mar 2008 05:33:14 -0000 1.15 @@ -5,7 +5,7 @@ Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Group: System Environment/Libraries @@ -81,6 +81,9 @@ %changelog +* Tue Mar 4 2008 Kevin Kofler 2.0.3-1 +- update to 2.0.3 (bugfix release) + * Fri Feb 22 2008 Kevin Kofler 2.0.2-1 - update to 2.0.2 (bugfix release) - drop glibc/open (missing mode) patch (fixed upstream) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Feb 2008 08:46:32 -0000 1.7 +++ sources 4 Mar 2008 05:33:14 -0000 1.8 @@ -1 +1 @@ -3863508b700bd1651633fe1853d5f858 soprano-2.0.2.tar.bz2 +3f33799c6ebd03048621057d268fb62f soprano-2.0.3.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 05:34:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:34:18 GMT Subject: rpms/perl-AutoClass/devel perl-AutoClass.spec,1.3,1.4 Message-ID: <200803040534.m245YINb024658@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-AutoClass/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24508 Modified Files: perl-AutoClass.spec Log Message: new perl Index: perl-AutoClass.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-AutoClass/devel/perl-AutoClass.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-AutoClass.spec 4 Sep 2007 09:31:20 -0000 1.3 +++ perl-AutoClass.spec 4 Mar 2008 05:33:44 -0000 1.4 @@ -1,11 +1,11 @@ Name: perl-AutoClass -Version: 1_01 -Release: 4%{?dist} +Version: 1.01 +Release: 6%{?dist} Summary: Automatically define classes and objects for Perl License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/autoclass/ -Source0: http://www.cpan.org/modules/by-module/Class/autoclass_v%{version}.tgz +Source0: http://www.cpan.org/modules/by-module/Class/autoclass_v1_01.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(IO::Scalar) @@ -49,6 +49,10 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 1.01-6 +- rebuild for new perl +- use sane version + * Tue Sep 04 2007 Alex Lancaster 1_01-4 - Add missing BuildRequires: perl(Test::More) From fedora-extras-commits at redhat.com Tue Mar 4 05:38:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:38:47 GMT Subject: rpms/perl-AutoClass/devel perl-AutoClass.spec,1.4,1.5 Message-ID: <200803040538.m245cldc025491@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-AutoClass/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25360 Modified Files: perl-AutoClass.spec Log Message: revert version change Index: perl-AutoClass.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-AutoClass/devel/perl-AutoClass.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-AutoClass.spec 4 Mar 2008 05:33:44 -0000 1.4 +++ perl-AutoClass.spec 4 Mar 2008 05:38:12 -0000 1.5 @@ -1,11 +1,11 @@ Name: perl-AutoClass -Version: 1.01 -Release: 6%{?dist} +Version: 1_01 +Release: 7%{?dist} Summary: Automatically define classes and objects for Perl License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/autoclass/ -Source0: http://www.cpan.org/modules/by-module/Class/autoclass_v1_01.tgz +Source0: http://www.cpan.org/modules/by-module/Class/autoclass_v%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(IO::Scalar) @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 1_01-7 +- revert version change (-6 never built) + * Tue Mar 4 2008 Tom "spot" Callaway 1.01-6 - rebuild for new perl - use sane version From fedora-extras-commits at redhat.com Tue Mar 4 05:38:53 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Tue, 4 Mar 2008 05:38:53 GMT Subject: rpms/hal/devel .cvsignore, 1.51, 1.52 hal.spec, 1.143, 1.144 sources, 1.53, 1.54 hal-0.5.10-fdi-cache-regen.patch, 1.1, NONE hal-0.5.10-fdi-empty-match-rule.patch, 1.1, NONE hal-0.5.10-fdi-endless-loop.patch, 1.1, NONE Message-ID: <200803040538.m245crtP025516@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/hal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25325 Modified Files: .cvsignore hal.spec sources Removed Files: hal-0.5.10-fdi-cache-regen.patch hal-0.5.10-fdi-empty-match-rule.patch hal-0.5.10-fdi-endless-loop.patch Log Message: * Tue Mar 4 2008 David Zeuthen - 0.5.11-0.git20080304%{?dist} - Drop patches as they were committed upstream - Ship a git snapshot that should fix a number of issues - ps3, virtio, iscsi support - ACL's are not always restored - multiple batteries are shown (and other battery related bugs) - /sbin/umount.hal is always returning 1 - other general bugfixes Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 11 Oct 2007 22:52:59 -0000 1.51 +++ .cvsignore 4 Mar 2008 05:38:10 -0000 1.52 @@ -44,3 +44,4 @@ hal-0.5.10rc2.tar.gz hal-0.5.10.git20070925.tar.gz hal-0.5.10.tar.gz +hal-0.5.11.git20080304.tar.gz Index: hal.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- hal.spec 3 Mar 2008 00:34:58 -0000 1.143 +++ hal.spec 4 Mar 2008 05:38:10 -0000 1.144 @@ -25,14 +25,10 @@ Summary: Hardware Abstraction Layer Name: hal -Version: 0.5.10 -Release: 6%{?dist} +Version: 0.5.11 +Release: 0.git20080304%{?dist} URL: http://www.freedesktop.org/Software/hal -Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz - -Patch0: hal-0.5.10-fdi-endless-loop.patch -Patch1: hal-0.5.10-fdi-cache-regen.patch -Patch2: hal-0.5.10-fdi-empty-match-rule.patch +Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20080304.tar.gz License: AFL/GPL Group: System Environment/Libraries @@ -125,9 +121,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject @@ -243,6 +236,15 @@ %{_datadir}/gtk-doc/html/libhal-storage/* %changelog +* Tue Mar 4 2008 David Zeuthen - 0.5.11-0.git20080304%{?dist} +- Drop patches as they were committed upstream +- Ship a git snapshot that should fix a number of issues + - ps3, virtio, iscsi support + - ACL's are not always restored + - multiple batteries are shown (and other battery related bugs) + - /sbin/umount.hal is always returning 1 + - other general bugfixes + * Mon Mar 03 2008 - Bastien Nocera - 0.5.10-5%{?dist} - Require smbios-utils, not libsmbios-bin Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 11 Oct 2007 22:52:59 -0000 1.53 +++ sources 4 Mar 2008 05:38:10 -0000 1.54 @@ -1 +1 @@ -fce852c428e7cda0b937087c79eec63f hal-0.5.10.tar.gz +79640b62d07b48c54923c436ef51ca7b hal-0.5.11.git20080304.tar.gz --- hal-0.5.10-fdi-cache-regen.patch DELETED --- --- hal-0.5.10-fdi-empty-match-rule.patch DELETED --- --- hal-0.5.10-fdi-endless-loop.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 05:39:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:39:45 GMT Subject: rpms/perl-bioperl/devel perl-bioperl.spec,1.8,1.9 Message-ID: <200803040539.m245djJi025744@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-bioperl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25528 Modified Files: perl-bioperl.spec Log Message: new perl Index: perl-bioperl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-bioperl/devel/perl-bioperl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-bioperl.spec 15 Oct 2007 10:53:14 -0000 1.8 +++ perl-bioperl.spec 4 Mar 2008 05:38:57 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-bioperl Version: 1.5.2_102 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Perl tools for computational molecular biology Group: Development/Libraries @@ -106,6 +106,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 1.5.2_102-10 +- rebuild for new perl + * Mon Oct 15 2007 Alex Lancaster 1.5.2_102-9 - Add missing BR: perl(Test::More) - Clarified license terms: GPL+ or Artistic From fedora-extras-commits at redhat.com Tue Mar 4 05:41:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:41:07 GMT Subject: rpms/perl-bioperl-run/devel perl-bioperl-run.spec,1.1,1.2 Message-ID: <200803040541.m245f7lT026003@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-bioperl-run/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25855 Modified Files: perl-bioperl-run.spec Log Message: new perl Index: perl-bioperl-run.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-bioperl-run/devel/perl-bioperl-run.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-bioperl-run.spec 19 Apr 2007 21:50:37 -0000 1.1 +++ perl-bioperl-run.spec 4 Mar 2008 05:40:28 -0000 1.2 @@ -1,10 +1,10 @@ Name: perl-bioperl-run Version: 1.5.2_100 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Modules to provide a Perl interface to various bioinformatics applications Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://bioperl.org Source0: http://bioperl.org/DIST/bioperl-run-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,6 +70,9 @@ %{_mandir}/man1/*.1* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 1.5.2_100-3 +- rebuild for new perl + * Tue Apr 18 2007 Alex Lancaster 1.5.2_100-2 - Remove deprecated modules that depend on non-existent Bio::Root::AccessorMaker From fedora-extras-commits at redhat.com Tue Mar 4 05:45:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 05:45:46 GMT Subject: rpms/perl-Date-Calc/devel perl-Date-Calc.spec,1.23,1.24 Message-ID: <200803040545.m245jke4026767@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Date-Calc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26614 Modified Files: perl-Date-Calc.spec Log Message: new perl Index: perl-Date-Calc.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Date-Calc/devel/perl-Date-Calc.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- perl-Date-Calc.spec 19 Feb 2008 22:03:23 -0000 1.23 +++ perl-Date-Calc.spec 4 Mar 2008 05:44:52 -0000 1.24 @@ -1,6 +1,6 @@ Name: perl-Date-Calc Version: 5.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A module for extended and efficient date calculations in Perl Group: Development/Libraries @@ -79,6 +79,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 5.4-6 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 5.4-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 06:30:59 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Tue, 4 Mar 2008 06:30:59 GMT Subject: rpms/kernel/devel linux-2.6-ia32-syscall-restart.patch, NONE, 1.1 kernel.spec, 1.471, 1.472 Message-ID: <200803040630.m246Ux31008367@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8215 Modified Files: kernel.spec Added Files: linux-2.6-ia32-syscall-restart.patch Log Message: * Mon Mar 3 2008 Roland McGrath - x86_64: fix 32-bit process syscall restart (#434995) linux-2.6-ia32-syscall-restart.patch: --- NEW FILE linux-2.6-ia32-syscall-restart.patch --- >From 702b92b212afb1cb9d9590f5a9133113c2b4168c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 28 Feb 2008 19:40:17 -0800 Subject: [PATCH] x86_64 ia32 syscall restart fix The code to restart syscalls after signals depends on checking for a negative orig_ax, and for particular negative -ERESTART* values in ax. These fields are 64 bits and for a 32-bit task they get zero-extended. The syscall restart behavior is lost, a regression from a native 32-bit kernel and from 64-bit tasks' behavior. This patch fixes the problem by doing sign-extension where it matters. For orig_ax, the only time the value should be -1 but winds up as 0x0ffffffff is via a 32-bit ptrace call. So the patch changes ptrace to sign-extend the 32-bit orig_eax value when it's stored; it doesn't change the checks on orig_ax, though it uses the new current_syscall() inline to better document the subtle importance of the used of signedness there. The ax value is stored a lot of ways and it seems hard to get them all sign-extended at their origins. So for that, we use the current_syscall_ret() to sign-extend it only for 32-bit tasks at the time of the -ERESTART* comparisons. Signed-off-by: Roland McGrath --- arch/x86/kernel/ptrace.c | 9 ++++++++- arch/x86/kernel/signal_64.c | 38 +++++++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index f41fdc9..f8eed1b 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -1045,10 +1045,17 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 value) R32(esi, si); R32(ebp, bp); R32(eax, ax); - R32(orig_eax, orig_ax); R32(eip, ip); R32(esp, sp); + case offsetof(struct user32, regs.orig_eax): + /* + * Sign-extend the value so that orig_eax = -1 + * causes (long)orig_ax < 0 tests to fire correctly. + */ + regs->orig_ax = (long) (s32) value; + break; + case offsetof(struct user32, regs.eflags): return set_flags(child, value); diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index 7347bb1..ce317ee 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c @@ -311,6 +311,35 @@ give_sigsegv: } /* + * Return -1L or the syscall number that @regs is executing. + */ +static long current_syscall(struct pt_regs *regs) +{ + /* + * We always sign-extend a -1 value being set here, + * so this is always either -1L or a syscall number. + */ + return regs->orig_ax; +} + +/* + * Return a value that is -EFOO if the system call in @regs->orig_ax + * returned an error. This only works for @regs from @current. + */ +static long current_syscall_ret(struct pt_regs *regs) +{ +#ifdef CONFIG_IA32_EMULATION + if (test_thread_flag(TIF_IA32)) + /* + * Sign-extend the value so (int)-EFOO becomes (long)-EFOO + * and will match correctly in comparisons. + */ + return (int) regs->ax; +#endif + return regs->ax; +} + +/* * OK, we're invoking a handler */ @@ -327,9 +356,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, #endif /* Are we from a system call? */ - if ((long)regs->orig_ax >= 0) { + if (current_syscall(regs) >= 0) { /* If so, check system call restarting.. */ - switch (regs->ax) { + switch (current_syscall_ret(regs)) { case -ERESTART_RESTARTBLOCK: case -ERESTARTNOHAND: regs->ax = -EINTR; @@ -426,10 +455,9 @@ static void do_signal(struct pt_regs *regs) } /* Did we come from a system call? */ - if ((long)regs->orig_ax >= 0) { + if (current_syscall(regs) >= 0) { /* Restart the system call - no handlers present */ - long res = regs->ax; - switch (res) { + switch (current_syscall_ret(regs)) { case -ERESTARTNOHAND: case -ERESTARTSYS: case -ERESTARTNOINTR: -- 1.5.4.1 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.471 retrieving revision 1.472 diff -u -r1.471 -r1.472 --- kernel.spec 3 Mar 2008 22:02:24 -0000 1.471 +++ kernel.spec 4 Mar 2008 06:30:07 -0000 1.472 @@ -579,6 +579,8 @@ Patch42: linux-2.6-x86-tune-generic.patch Patch75: linux-2.6-x86-debug-boot.patch +Patch80: linux-2.6-ia32-syscall-restart.patch + Patch123: linux-2.6-ppc-rtc.patch Patch140: linux-2.6-ps3-ehci-iso.patch Patch141: linux-2.6-ps3-storage-alias.patch @@ -1009,6 +1011,8 @@ # Compile 686 kernels tuned for Pentium4. ApplyPatch linux-2.6-x86-tune-generic.patch +ApplyPatch linux-2.6-ia32-syscall-restart.patch + # # PowerPC # @@ -1744,6 +1748,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Mon Mar 3 2008 Roland McGrath +- x86_64: fix 32-bit process syscall restart (#434995) + * Mon Mar 03 2008 John W. Linville - ssb: Add CHIPCO IRQ access functions - p54: print unknown eeprom fields From fedora-extras-commits at redhat.com Tue Mar 4 06:39:09 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 4 Mar 2008 06:39:09 GMT Subject: rpms/xorg-x11-server/devel .cvsignore, 1.35, 1.36 commitid, 1.8, 1.9 make-git-snapshot.sh, 1.1, 1.2 sources, 1.30, 1.31 xorg-x11-server.spec, 1.299, 1.300 xserver-1.3.0-honor-displaysize.patch, 1.2, NONE xserver-1.3.0-randr12-config-hack.patch, 1.3, NONE xserver-1.3.0-xnest-exposures.patch, 1.2, NONE xserver-1.4.99-selinux-fix.patch, 1.1, NONE Message-ID: <200803040639.m246d9pj009672@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9515/devel Modified Files: .cvsignore commitid make-git-snapshot.sh sources xorg-x11-server.spec Removed Files: xserver-1.3.0-honor-displaysize.patch xserver-1.3.0-randr12-config-hack.patch xserver-1.3.0-xnest-exposures.patch xserver-1.4.99-selinux-fix.patch Log Message: yet another git snapshot. vt switch works now, i promise. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 27 Feb 2008 17:02:34 -0000 1.35 +++ .cvsignore 4 Mar 2008 06:38:31 -0000 1.36 @@ -1 +1 @@ -xorg-server-20080227.tar.bz2 +xorg-server-20080303.tar.bz2 Index: commitid =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- commitid 27 Feb 2008 17:02:34 -0000 1.8 +++ commitid 4 Mar 2008 06:38:31 -0000 1.9 @@ -1 +1 @@ -d74b0327e8355546e6b41e8ce684f461d65fa9dc +1bda57a41ea3bb3a624a5e75f421160ac98a0804 Index: make-git-snapshot.sh =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/make-git-snapshot.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- make-git-snapshot.sh 12 Nov 2007 20:41:56 -0000 1.1 +++ make-git-snapshot.sh 4 Mar 2008 06:38:31 -0000 1.2 @@ -6,7 +6,7 @@ git clone -n git://git.freedesktop.org/git/xorg/xserver $DIRNAME cd $DIRNAME if [ -z "$1" ]; then - git log | head -1 + git checkout --track -b server-1.5-branch origin/server-1.5-branch else git checkout $1 fi Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 27 Feb 2008 17:02:34 -0000 1.30 +++ sources 4 Mar 2008 06:38:31 -0000 1.31 @@ -1 +1 @@ -240a7d59f892bdbcd7fb098159e8c7f0 xorg-server-20080227.tar.bz2 +bbe69d049ba5bd8d764787e10a95dfd3 xorg-server-20080303.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.299 retrieving revision 1.300 diff -u -r1.299 -r1.300 --- xorg-x11-server.spec 28 Feb 2008 21:53:32 -0000 1.299 +++ xorg-x11-server.spec 4 Mar 2008 06:38:31 -0000 1.300 @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080227 +%define gitdate 20080303 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.4.99.1 -Release: 0.26.%{?gitdate}%{?dist} +Version: 1.4.99.900 +Release: 0.27.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -36,10 +36,6 @@ Source0: ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2 %endif -Patch10: xserver-1.4.99-selinux-fix.patch -# general bug fixes -Patch19: xserver-1.3.0-xnest-exposures.patch - # OpenGL compositing manager feature/optimization patches. Patch100: xorg-x11-server-1.1.0-no-move-damage.patch Patch101: xserver-1.4.99-dont-backfill-bg-none.patch @@ -53,8 +49,6 @@ Patch1010: xserver-1.3.0-no-prerelease-warning.patch Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch -Patch2004: xserver-1.3.0-honor-displaysize.patch -Patch2007: xserver-1.3.0-randr12-config-hack.patch Patch2013: xserver-1.4.99-document-fontpath-correctly.patch # Trivial things to maybe merge upstream at next rebase @@ -272,7 +266,7 @@ %setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %if 0%{gitdate} -git checkout -b fedora-%{version}-%{release} +git checkout -b fedora # make it something you can push to. sed -i 's/git/&+ssh/' .git/config %else @@ -510,6 +504,9 @@ %changelog +* Mon Mar 03 2008 Adam Jackson 1.4.99.900-0.27.20080303 +- Switch to 1.5 branch and rebase. + * Thu Feb 28 2008 Jeremy Katz - 1.4.99.1-0.26 - Pull in another SELinux fix from upstream --- xserver-1.3.0-honor-displaysize.patch DELETED --- --- xserver-1.3.0-randr12-config-hack.patch DELETED --- --- xserver-1.3.0-xnest-exposures.patch DELETED --- --- xserver-1.4.99-selinux-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 07:17:18 2008 From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd)) Date: Tue, 4 Mar 2008 07:17:18 GMT Subject: rpms/libopenraw/devel .cvsignore, 1.4, 1.5 libopenraw.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200803040717.m247HIE9022799@cvs-int.fedora.redhat.com> Author: trondd Update of /cvs/pkgs/rpms/libopenraw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22672 Modified Files: .cvsignore libopenraw.spec sources Log Message: * Tue Mar 04 2008 Trond Danielsen - 0.0.5-1 - New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libopenraw/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Jan 2008 18:06:51 -0000 1.4 +++ .cvsignore 4 Mar 2008 07:16:38 -0000 1.5 @@ -1 +1 @@ -libopenraw-0.0.4.tar.gz +libopenraw-0.0.5.tar.gz Index: libopenraw.spec =================================================================== RCS file: /cvs/pkgs/rpms/libopenraw/devel/libopenraw.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libopenraw.spec 20 Feb 2008 05:49:03 -0000 1.5 +++ libopenraw.spec 4 Mar 2008 07:16:38 -0000 1.6 @@ -1,6 +1,6 @@ Name: libopenraw -Version: 0.0.4 -Release: 3%{?dist} +Version: 0.0.5 +Release: 1%{?dist} Summary: Decode camera RAW files Group: System Environment/Libraries @@ -111,6 +111,9 @@ %changelog +* Tue Mar 04 2008 Trond Danielsen - 0.0.5-1 +- New upstream version. + * Wed Feb 20 2008 Fedora Release Engineering - 0.0.4-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libopenraw/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Jan 2008 18:06:51 -0000 1.4 +++ sources 4 Mar 2008 07:16:38 -0000 1.5 @@ -1 +1 @@ -7560748d26d8a98605826a1b837833e4 libopenraw-0.0.4.tar.gz +90f9038cc6b47374ea1dd9aa347dfe5a libopenraw-0.0.5.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 07:27:09 2008 From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd)) Date: Tue, 4 Mar 2008 07:27:09 GMT Subject: rpms/libopenraw/devel libopenraw.spec,1.6,1.7 Message-ID: <200803040727.m247R9BO024364@cvs-int.fedora.redhat.com> Author: trondd Update of /cvs/pkgs/rpms/libopenraw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24257 Modified Files: libopenraw.spec Log Message: Minor update to the chrpath command Index: libopenraw.spec =================================================================== RCS file: /cvs/pkgs/rpms/libopenraw/devel/libopenraw.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libopenraw.spec 4 Mar 2008 07:16:38 -0000 1.6 +++ libopenraw.spec 4 Mar 2008 07:26:32 -0000 1.7 @@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -chrpath --delete $RPM_BUILD_ROOT/%{_libdir}/libopenrawgnome.so.1.3.0 +chrpath --delete $RPM_BUILD_ROOT/%{_libdir}/libopenrawgnome.so.1.4.0 %clean rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Tue Mar 4 08:07:06 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Tue, 4 Mar 2008 08:07:06 GMT Subject: rpms/kmid/devel kmid-2.0-svn-cmakelists.patch, NONE, 1.1 kmid-2.0-svn-docsdir.patch, NONE, 1.1 kmid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803040807.m2487660005085@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/kmid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4907/devel Modified Files: .cvsignore sources Added Files: kmid-2.0-svn-cmakelists.patch kmid-2.0-svn-docsdir.patch kmid.spec Log Message: initial import kmid-2.0-svn-cmakelists.patch: --- NEW FILE kmid-2.0-svn-cmakelists.patch --- diff -Naur kmid-767336/CMakeLists.txt kmid-767336.new/CMakeLists.txt --- kmid-767336/CMakeLists.txt 2007-12-08 12:52:37.000000000 +0100 +++ kmid-767336.new/CMakeLists.txt 2008-01-27 22:31:44.000000000 +0100 @@ -1,5 +1,9 @@ project(kmid) +find_package(KDE4 REQUIRED) +include (KDE4Defaults) +include_directories (${KDE4_INCLUDES}) + macro_optional_find_package(Alsa) alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) kmid-2.0-svn-docsdir.patch: --- NEW FILE kmid-2.0-svn-docsdir.patch --- diff -Naur kmid-2.0-svn/doc/CMakeLists.txt kmid-2.0-svn.new/doc/CMakeLists.txt --- kmid-2.0-svn/doc/CMakeLists.txt 2008-02-04 03:39:31.000000000 +0100 +++ kmid-2.0-svn.new/doc/CMakeLists.txt 2008-02-11 23:57:33.000000000 +0100 @@ -1,2 +1,2 @@ ########### install files ############### -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmid) --- NEW FILE kmid.spec --- %define svn_date 20080213 Name: kmid Version: 2.0 Release: 0.4.%{svn_date}svn%{?dist} Summary: A midi/karaoke player for KDE Group: Applications/Multimedia License: GPLv2+ URL: http://extragear.kde.org # Creation of tarball from svn # # Kevin Kofler enhanced the create_tarball.rb script from upstream to also support kmid # This script also download the translations and docs # To use it you will need the script itself and a config.ini in the same directory # # http://repo.calcforge.org/f9/kde4-tarballs/create_tarball.rb # http://repo.calcforge.org/f9/kde4-tarballs/config.ini # # To create a new checkout use it with anonymous svn access # ./create_tarball.rb -n # At the prompt you have to enter "kmid" (without brackets) # remove content with unknown copyright status # # kmid is shipping some non-code content with unknown copyright status # these files are removed here and the CMakelists.txt is patched for this: # # rm -rf kmid-2.0-svn # tar xjf kmid-2.0-svn.tar.bz2 # rm -rf kmid-2.0-svn/examples # sed -i -e '/add_subdirectory( examples )/d' kmid-2.0-svn/CMakeLists.txt # tar cjf kmid-2.0-svn-patched.tar.bz2 kmid-2.0-svn Source0: %{name}-%{version}-svn-patched.tar.bz2 # fix CMakeLists.txt so this builds as a standalone directory (without all of extragear-multimedia) Patch0: kmid-2.0-svn-cmakelists.patch Patch1: kmid-2.0-svn-docsdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs4-devel >= 4 BuildRequires: kde-filesystem >= 4 BuildRequires: cmake BuildRequires: alsa-lib-devel BuildRequires: gettext BuildRequires: desktop-file-utils %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } Requires: kdelibs4 >= %{version} Requires: oxygen-icon-theme Requires(post): /sbin/ldconfig xdg-utils Requires(postun): /sbin/ldconfig xdg-utils %description KMid is a midi/karaoke file player, with configurable midi mapper, real Session Management, drag & drop, customizable fonts, etc. It has a very nice interface which let you easily follow the tune while changing the color of the lyrics. It supports output through external synthesizers, AWE, FM and GUS cards. It also has a keyboard view to see the notes played by each instrument. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Development files for %{name} %prep %setup -qn %{name}-%{version}-svn %patch0 -p1 -b .cmakelists %patch1 -p1 -b .docsdir %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd make %{?_smp_mflags} -C %{_target_platform} %install rm -rf %{buildroot} mkdir %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} desktop-file-install --vendor "" \ --dir %{buildroot}%{_datadir}/applications/kde4 \ %{buildroot}%{_datadir}/applications/kde4/kmid.desktop %find_lang %{name} %clean rm -rf %{buildroot} %post /sbin/ldconfig ||: xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : %postun /sbin/ldconfig ||: xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING COPYING.DOC COPYING.LIB PEOPLE README %{_docdir}/HTML/en/kmid/ %{_kde4_bindir}/kmid %{_kde4_appsdir}/kmid/ %{_kde4_datadir}/applications/kde4/kmid.desktop %{_kde4_datadir}/kde4/servicetypes/* %{_kde4_datadir}/dbus-1/interfaces/org.kde.KMid.xml %{_kde4_iconsdir}/hicolor/*/apps/kmid.png %{_kde4_libdir}/libkmidlib.so.* %{_kde4_libdir}/liblibkmid.so.* %{_kde4_libdir}/kde4/* %files devel %defattr(-,root,root,-) %{_kde4_includedir}/libkmid/ %{_kde4_libdir}/libkmidlib.so %{_kde4_libdir}/liblibkmid.so %changelog * Mon Mar 03 2008 Sebastian Vahl - 2.0-0.4.20080213svn - add default %%defattr(-,root,root,-) also for devel files - include "svn" in release tag - remove non-code content with unknown copyright status from tarball and package - remove KDE version from summary * Fri Feb 15 2008 Sebastian Vahl - 2.0-0.3.20080213 - Requires: kdelibs4 >= %%{version} - Requires: oxygen-icon-theme * Wed Feb 13 2008 Sebastian Vahl - 2.0-0.2.20080213 - prepare spec for review - new svn checkout: 2008-02-13 - license is GPLv2+ - rename patches * Sun Feb 10 2008 Sebastian Vahl - 2.0-0.2.20080203 - use tarball created by Kevin Kofler - switch to %%{svn_date} instead of svn revision * Sun Jan 27 2008 Sebastian Vahl - 2.0-0.1.767336 - svn revision 767336 - Initial version kmid from extragear for KDE4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kmid/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 02:59:26 -0000 1.1 +++ .cvsignore 4 Mar 2008 08:06:14 -0000 1.2 @@ -0,0 +1 @@ +kmid-2.0-svn-patched.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kmid/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 02:59:26 -0000 1.1 +++ sources 4 Mar 2008 08:06:14 -0000 1.2 @@ -0,0 +1 @@ +96921b94c3684e5b863ad7a96bc1c940 kmid-2.0-svn-patched.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 08:19:02 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Tue, 4 Mar 2008 08:19:02 GMT Subject: rpms/lxpanel/F-7 .cvsignore, 1.2, 1.3 lxpanel-default.patch, 1.1, 1.2 lxpanel.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803040819.m248J2N8006989@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/lxpanel/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6848/F-7 Modified Files: .cvsignore lxpanel-default.patch lxpanel.spec sources Log Message: update to 0.2.6 also for f7/f8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jan 2007 10:34:28 -0000 1.2 +++ .cvsignore 4 Mar 2008 08:18:24 -0000 1.3 @@ -1 +1 @@ -lxpanel-0.2.4.tar.gz +lxpanel-0.2.6.tar.gz lxpanel-default.patch: Index: lxpanel-default.patch =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-7/lxpanel-default.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lxpanel-default.patch 9 Jan 2007 10:34:28 -0000 1.1 +++ lxpanel-default.patch 4 Mar 2008 08:18:24 -0000 1.2 @@ -1,6 +1,7 @@ ---- lxpanel-0.2.4/data/default.in.orig 2006-12-17 10:52:35.000000000 +0100 -+++ lxpanel-0.2.4/data/default.in 2006-12-17 10:52:55.000000000 +0100 -@@ -134,13 +134,10 @@ +diff -Naur lxpanel-0.2.6/data/default/config.in lxpanel-0.2.6.new/data/default/config.in +--- lxpanel-0.2.6/data/default/config.in 2008-02-24 19:01:58.000000000 +0100 ++++ lxpanel-0.2.6.new/data/default/config.in 2008-02-25 23:30:59.000000000 +0100 +@@ -146,13 +146,10 @@ type = launchbar config { button { Index: lxpanel.spec =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-7/lxpanel.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lxpanel.spec 16 Aug 2007 10:10:01 -0000 1.3 +++ lxpanel.spec 4 Mar 2008 08:18:24 -0000 1.4 @@ -1,6 +1,9 @@ +# Review Request: +# https://bugzilla.redhat.com/show_bug.cgi?id=219930 + Name: lxpanel -Version: 0.2.4 -Release: 5%{?dist} +Version: 0.2.6 +Release: 1%{?dist} Summary: A lightweight X11 desktop panel Group: User Interface/Desktops @@ -11,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libXpm-devel libXmu-devel gettext startup-notification-devel -#Requires: %description lxpanel is a lightweight X11 desktop panel. It works with any ICCCM / NETWM @@ -20,7 +22,7 @@ %prep %setup -q -%patch1 -p1 -b .1 +%patch1 -p1 %build %configure @@ -46,6 +48,13 @@ %changelog +* Mon Feb 25 2008 Sebastian Vahl 0.2.6-1 +- new upstream version: 0.2.6 +- update lxpanel-default.patch + +* Sat Feb 09 2008 Sebastian Vahl 0.2.4-6 +- rebuild for new gcc-4.3 + * Thu Aug 16 2007 Sebastian Vahl - 0.2.4-5 - Change License to GPLv2+ Index: sources =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jan 2007 10:34:28 -0000 1.2 +++ sources 4 Mar 2008 08:18:24 -0000 1.3 @@ -1 +1 @@ -37d0e9f2993fc63d9e7e1684552e10b4 lxpanel-0.2.4.tar.gz +37386f127ba89022587a4779ce70076b lxpanel-0.2.6.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 08:19:09 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Tue, 4 Mar 2008 08:19:09 GMT Subject: rpms/lxpanel/F-8 .cvsignore, 1.2, 1.3 lxpanel-default.patch, 1.1, 1.2 lxpanel.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803040819.m248J9DB007014@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/lxpanel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6848/F-8 Modified Files: .cvsignore lxpanel-default.patch lxpanel.spec sources Log Message: update to 0.2.6 also for f7/f8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jan 2007 10:34:28 -0000 1.2 +++ .cvsignore 4 Mar 2008 08:18:32 -0000 1.3 @@ -1 +1 @@ -lxpanel-0.2.4.tar.gz +lxpanel-0.2.6.tar.gz lxpanel-default.patch: Index: lxpanel-default.patch =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-8/lxpanel-default.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lxpanel-default.patch 9 Jan 2007 10:34:28 -0000 1.1 +++ lxpanel-default.patch 4 Mar 2008 08:18:32 -0000 1.2 @@ -1,6 +1,7 @@ ---- lxpanel-0.2.4/data/default.in.orig 2006-12-17 10:52:35.000000000 +0100 -+++ lxpanel-0.2.4/data/default.in 2006-12-17 10:52:55.000000000 +0100 -@@ -134,13 +134,10 @@ +diff -Naur lxpanel-0.2.6/data/default/config.in lxpanel-0.2.6.new/data/default/config.in +--- lxpanel-0.2.6/data/default/config.in 2008-02-24 19:01:58.000000000 +0100 ++++ lxpanel-0.2.6.new/data/default/config.in 2008-02-25 23:30:59.000000000 +0100 +@@ -146,13 +146,10 @@ type = launchbar config { button { Index: lxpanel.spec =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-8/lxpanel.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lxpanel.spec 16 Aug 2007 10:10:09 -0000 1.3 +++ lxpanel.spec 4 Mar 2008 08:18:32 -0000 1.4 @@ -1,6 +1,9 @@ +# Review Request: +# https://bugzilla.redhat.com/show_bug.cgi?id=219930 + Name: lxpanel -Version: 0.2.4 -Release: 5%{?dist} +Version: 0.2.6 +Release: 1%{?dist} Summary: A lightweight X11 desktop panel Group: User Interface/Desktops @@ -11,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libXpm-devel libXmu-devel gettext startup-notification-devel -#Requires: %description lxpanel is a lightweight X11 desktop panel. It works with any ICCCM / NETWM @@ -20,7 +22,7 @@ %prep %setup -q -%patch1 -p1 -b .1 +%patch1 -p1 %build %configure @@ -46,6 +48,13 @@ %changelog +* Mon Feb 25 2008 Sebastian Vahl 0.2.6-1 +- new upstream version: 0.2.6 +- update lxpanel-default.patch + +* Sat Feb 09 2008 Sebastian Vahl 0.2.4-6 +- rebuild for new gcc-4.3 + * Thu Aug 16 2007 Sebastian Vahl - 0.2.4-5 - Change License to GPLv2+ Index: sources =================================================================== RCS file: /cvs/extras/rpms/lxpanel/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jan 2007 10:34:28 -0000 1.2 +++ sources 4 Mar 2008 08:18:32 -0000 1.3 @@ -1 +1 @@ -37d0e9f2993fc63d9e7e1684552e10b4 lxpanel-0.2.4.tar.gz +37386f127ba89022587a4779ce70076b lxpanel-0.2.6.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 08:40:16 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 4 Mar 2008 08:40:16 GMT Subject: rpms/mythes-de/devel mythes-de.spec,1.5,1.6 sources,1.6,1.7 Message-ID: <200803040840.m248eGNL010432@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/mythes-de/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10307 Modified Files: mythes-de.spec sources Log Message: latest version Index: mythes-de.spec =================================================================== RCS file: /cvs/pkgs/rpms/mythes-de/devel/mythes-de.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mythes-de.spec 3 Feb 2008 14:41:31 -0000 1.5 +++ mythes-de.spec 4 Mar 2008 08:39:41 -0000 1.6 @@ -1,6 +1,6 @@ Name: mythes-de Summary: German thesarus -%define upstreamid 20080203 +%define upstreamid 20080304 Version: 0.%{upstreamid} Release: 1%{?dist} Source: http://www.openthesaurus.de/download/thes_de_DE_v2.zip @@ -44,6 +44,9 @@ %{_datadir}/mythes/* %changelog +* Tue Mar 04 2008 Caolan McNamara - 0.20080304-1 +- latest version + * Sun Feb 03 2008 Caolan McNamara - 0.20080203-1 - latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mythes-de/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Feb 2008 14:41:31 -0000 1.6 +++ sources 4 Mar 2008 08:39:41 -0000 1.7 @@ -1 +1 @@ -efbb70d1db790156a836146a196fa450 thes_de_DE_v2.zip +5ffbcca29d03fc4c3e5be866bf924df5 thes_de_DE_v2.zip From fedora-extras-commits at redhat.com Tue Mar 4 08:54:39 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 4 Mar 2008 08:54:39 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch, NONE, 1.1 openoffice.org.spec, 1.1438, 1.1439 openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch, 1.4, NONE Message-ID: <200803040854.m248sdmN012673@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12484 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch Removed Files: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch Log Message: upstream libxul fixes openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch: --- NEW FILE openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch --- --- openoffice.org.orig/config_office/configure.in 2008-01-08 15:33:40.000000000 +0000 +++ openoffice.org/config_office/configure.in 2008-01-08 15:34:32.000000000 +0000 @@ -3736,7 +3736,7 @@ tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst();'` AC_MSG_RESULT($tmp) - PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom ) + PKG_CHECK_MODULES( MOZILLAXPCOM, libxul ) if $PKG_CONFIG --exists nspr ; then PKG_CHECK_MODULES( MOZ_NSPR, nspr ) @@ -3767,8 +3767,8 @@ CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" - MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom` - MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom` + MOZ_INC=`$PKG_CONFIG --variable=includedir libxul` + MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`/lib MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap]) Index: source/plugin/util/makefile.pmk =================================================================== RCS file: /cvs/util/extensions/source/plugin/util/makefile.pmk,v retrieving revision 1.6 diff -u -r1.6 makefile.pmk --- openoffice.org.orig/extensions/source/plugin/util/makefile.pmk 6 Feb 2007 12:59:38 -0000 1.6 +++ openoffice.org/extensions/source/plugin/util/makefile.pmk 9 Jan 2008 16:15:21 -0000 @@ -39,6 +39,6 @@ .IF "$(SYSTEM_MOZILLA)" == "YES" CFLAGS+=-DSYSTEM_MOZILLA -PKGCONFIG_MODULES=$(MOZ_FLAVOUR)-plugin +PKGCONFIG_MODULES=mozilla-plugin .INCLUDE : pkg_config.mk .ENDIF Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1438 retrieving revision 1.1439 diff -u -r1.1438 -r1.1439 --- openoffice.org.spec 28 Feb 2008 08:43:14 -0000 1.1438 +++ openoffice.org.spec 4 Mar 2008 08:53:36 -0000 1.1439 @@ -129,7 +129,7 @@ Patch55: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch Patch56: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch Patch57: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch -Patch58: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch +Patch58: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch Patch59: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch Patch60: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch Patch61: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch @@ -1087,7 +1087,7 @@ %patch55 -p1 -b .ooo84621.sw.insertexcel.patch %patch56 -p1 -b .ooo84770.svx.eventsmismatch.patch %patch57 -p1 -b .ooo85054.stlport.noorigs.patch -%patch58 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch +%patch58 -p1 -b .ooo86670.config_office.xpcomasxul.patch %patch59 -p1 -b .ooo85097.desktop.pagein.patch %patch60 -p1 %patch61 -p1 -b .rh133741.alwaysgtk.vcl.patch --- openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 09:13:17 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 09:13:17 GMT Subject: rpms/ocaml-perl4caml/F-8 ocaml-perl4caml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803040913.m249DHUv021869@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-perl4caml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21786/F-8 Modified Files: .cvsignore sources Added Files: ocaml-perl4caml.spec Log Message: Initial CVS import. --- NEW FILE ocaml-perl4caml.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-perl4caml Version: 0.9.5 Release: 1%{?dist} Summary: OCaml library for calling Perl libraries and code Group: Development/Libraries License: LGPLv2+ with exceptions URL: http://merjis.com/developers/perl4caml Source0: http://merjis.com/_file/perl4caml-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc BuildRequires: perl >= 5.8 BuildRequires: perl-ExtUtils-Embed BuildRequires: chrpath # Perl4caml provides type-safe wrappers for these Perl modules: #Requires: perl-Date-Calc ##Requires: perl-Date-Format ##Requires: perl-Date-Parse ##Requires: perl-Net-Google ##Requires: perl-HTML-Element #Requires: perl-HTML-Parser #Requires: perl-HTML-Tree #Requires: perl-libwww-perl #Requires: perl-Template-Toolkit #Requires: perl-URI #Requires: perl-WWW-Mechanize %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description Perl4caml allows you to use Perl code within Objective CAML (OCaml), thus neatly side-stepping the (old) problem with OCaml which was that it lacked a comprehensive set of libraries. Well now you can use any part of CPAN in your OCaml code. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n perl4caml-%{version} find -name .cvsignore -exec rm {} \; %build make EXTRA_EXTRA_CFLAGS="$RPM_OPT_FLAGS" rm -f examples/*.{cmi,cmo,cmx,o,bc,opt} %check # This fails if perl4caml is installed. The bytecode programs # load dllperl4caml.so from OCaml's stublibs, instead of the # one we just built. Since dllperl4caml.so in stublibs # (wrongly) lacks an rpath for libperl.so, it won't find # libperl.so in the obscure directory where it resides. # Monkeying around with LD_LIBRARY_PATH doesn't help because # ocamlrun uses $libdir/ocaml/ld.conf to find directories # containing the stublibs. make test ||: %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT mkdir -p $DESTDIR/%{_libdir}/ocaml/stublibs make install strip $DESTDIR/%{_libdir}/ocaml/stublibs/dll*.so # Deleting the rpath in this shared library is wrong because # it means it can't find libperl.so, but Fedora policy requires # us to do it ... chrpath --delete $DESTDIR/%{_libdir}/ocaml/stublibs/dll*.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING.LIB %{_libdir}/ocaml/perl %if %opt %exclude %{_libdir}/ocaml/perl/*.a %exclude %{_libdir}/ocaml/perl/*.cmxa %endif %exclude %{_libdir}/ocaml/perl/*.mli %exclude %{_libdir}/ocaml/perl/*.ml %{_libdir}/ocaml/stublibs/*.so %files devel %defattr(-,root,root,-) %doc COPYING.LIB AUTHORS doc/* examples html README %if %opt %{_libdir}/ocaml/perl/*.a %{_libdir}/ocaml/perl/*.cmxa %endif %{_libdir}/ocaml/perl/*.mli %{_libdir}/ocaml/perl/*.ml %changelog * Sat Mar 1 2008 Richard W.M. Jones - 0.9.5-1 - New upstream release 0.9.5. - Clarify license is LGPLv2+ with exceptions - Remove excessive BuildRequires - Perl modules not needed for building. - Pass RPM C flags to the make. - 'make test' fails where perl4caml is already installed. * Sat Feb 23 2008 Richard W.M. Jones - 0.9.4-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-perl4caml/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2008 20:06:33 -0000 1.1 +++ .cvsignore 4 Mar 2008 09:12:33 -0000 1.2 @@ -0,0 +1 @@ +perl4caml-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-perl4caml/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2008 20:06:33 -0000 1.1 +++ sources 4 Mar 2008 09:12:33 -0000 1.2 @@ -0,0 +1 @@ +96c8587582b078f4c92c275431dace15 perl4caml-0.9.5.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 09:15:48 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 09:15:48 GMT Subject: rpms/ocaml-perl4caml/devel ocaml-perl4caml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803040915.m249Fm8Y022154@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-perl4caml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22083/devel Modified Files: .cvsignore sources Added Files: ocaml-perl4caml.spec Log Message: Initial CVS import. --- NEW FILE ocaml-perl4caml.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-perl4caml Version: 0.9.5 Release: 1%{?dist} Summary: OCaml library for calling Perl libraries and code Group: Development/Libraries License: LGPLv2+ with exceptions URL: http://merjis.com/developers/perl4caml Source0: http://merjis.com/_file/perl4caml-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc BuildRequires: perl >= 5.8 BuildRequires: perl-ExtUtils-Embed BuildRequires: chrpath # Perl4caml provides type-safe wrappers for these Perl modules: #Requires: perl-Date-Calc ##Requires: perl-Date-Format ##Requires: perl-Date-Parse ##Requires: perl-Net-Google ##Requires: perl-HTML-Element #Requires: perl-HTML-Parser #Requires: perl-HTML-Tree #Requires: perl-libwww-perl #Requires: perl-Template-Toolkit #Requires: perl-URI #Requires: perl-WWW-Mechanize %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description Perl4caml allows you to use Perl code within Objective CAML (OCaml), thus neatly side-stepping the (old) problem with OCaml which was that it lacked a comprehensive set of libraries. Well now you can use any part of CPAN in your OCaml code. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n perl4caml-%{version} find -name .cvsignore -exec rm {} \; %build make EXTRA_EXTRA_CFLAGS="$RPM_OPT_FLAGS" rm -f examples/*.{cmi,cmo,cmx,o,bc,opt} %check # This fails if perl4caml is installed. The bytecode programs # load dllperl4caml.so from OCaml's stublibs, instead of the # one we just built. Since dllperl4caml.so in stublibs # (wrongly) lacks an rpath for libperl.so, it won't find # libperl.so in the obscure directory where it resides. # Monkeying around with LD_LIBRARY_PATH doesn't help because # ocamlrun uses $libdir/ocaml/ld.conf to find directories # containing the stublibs. make test ||: %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT mkdir -p $DESTDIR/%{_libdir}/ocaml/stublibs make install strip $DESTDIR/%{_libdir}/ocaml/stublibs/dll*.so # Deleting the rpath in this shared library is wrong because # it means it can't find libperl.so, but Fedora policy requires # us to do it ... chrpath --delete $DESTDIR/%{_libdir}/ocaml/stublibs/dll*.so %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING.LIB %{_libdir}/ocaml/perl %if %opt %exclude %{_libdir}/ocaml/perl/*.a %exclude %{_libdir}/ocaml/perl/*.cmxa %endif %exclude %{_libdir}/ocaml/perl/*.mli %exclude %{_libdir}/ocaml/perl/*.ml %{_libdir}/ocaml/stublibs/*.so %files devel %defattr(-,root,root,-) %doc COPYING.LIB AUTHORS doc/* examples html README %if %opt %{_libdir}/ocaml/perl/*.a %{_libdir}/ocaml/perl/*.cmxa %endif %{_libdir}/ocaml/perl/*.mli %{_libdir}/ocaml/perl/*.ml %changelog * Sat Mar 1 2008 Richard W.M. Jones - 0.9.5-1 - New upstream release 0.9.5. - Clarify license is LGPLv2+ with exceptions - Remove excessive BuildRequires - Perl modules not needed for building. - Pass RPM C flags to the make. - 'make test' fails where perl4caml is already installed. * Sat Feb 23 2008 Richard W.M. Jones - 0.9.4-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-perl4caml/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2008 20:06:33 -0000 1.1 +++ .cvsignore 4 Mar 2008 09:15:13 -0000 1.2 @@ -0,0 +1 @@ +perl4caml-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-perl4caml/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2008 20:06:33 -0000 1.1 +++ sources 4 Mar 2008 09:15:13 -0000 1.2 @@ -0,0 +1 @@ +96c8587582b078f4c92c275431dace15 perl4caml-0.9.5.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 09:17:53 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 09:17:53 GMT Subject: rpms/ocaml-perl4caml/devel ocaml-perl4caml.spec,1.1,1.2 Message-ID: <200803040917.m249Hr96022406@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-perl4caml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22297 Modified Files: ocaml-perl4caml.spec Log Message: * Tue Mar 4 2008 Richard W.M. Jones - 0.9.5-2 - Rebuild for ppc64. Index: ocaml-perl4caml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-perl4caml/devel/ocaml-perl4caml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-perl4caml.spec 4 Mar 2008 09:15:13 -0000 1.1 +++ ocaml-perl4caml.spec 4 Mar 2008 09:17:08 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-perl4caml Version: 0.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for calling Perl libraries and code Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://merjis.com/developers/perl4caml Source0: http://merjis.com/_file/perl4caml-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc @@ -119,6 +118,9 @@ %changelog +* Tue Mar 4 2008 Richard W.M. Jones - 0.9.5-2 +- Rebuild for ppc64. + * Sat Mar 1 2008 Richard W.M. Jones - 0.9.5-1 - New upstream release 0.9.5. - Clarify license is LGPLv2+ with exceptions From fedora-extras-commits at redhat.com Tue Mar 4 09:21:01 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Tue, 4 Mar 2008 09:21:01 GMT Subject: rpms/kcoloredit/devel .cvsignore, 1.2, 1.3 kcoloredit.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803040921.m249L1VI022756@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/kcoloredit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22663 Modified Files: .cvsignore kcoloredit.spec sources Log Message: * Tue Mar 04 2008 Sebastian Vahl 4.0.2-1 - new upstream version: 4.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kcoloredit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Feb 2008 09:11:28 -0000 1.2 +++ .cvsignore 4 Mar 2008 09:20:16 -0000 1.3 @@ -1 +1 @@ -kcoloredit-4.0.1.tar.bz2 +kcoloredit-4.0.2.tar.bz2 Index: kcoloredit.spec =================================================================== RCS file: /cvs/extras/rpms/kcoloredit/devel/kcoloredit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kcoloredit.spec 14 Feb 2008 07:49:45 -0000 1.3 +++ kcoloredit.spec 4 Mar 2008 09:20:16 -0000 1.4 @@ -2,8 +2,8 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=432137 Name: kcoloredit -Version: 4.0.1 -Release: 2%{?dist} +Version: 4.0.2 +Release: 1%{?dist} Summary: A color palette Editor Group: Applications/Publishing @@ -75,6 +75,9 @@ %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png %changelog +* Tue Mar 04 2008 Sebastian Vahl 4.0.2-1 +- new upstream version: 4.0.2 + * Thu Feb 14 2008 Sebastian Vahl 4.0.1-2 - remove reference to KDE 4 in summary Index: sources =================================================================== RCS file: /cvs/extras/rpms/kcoloredit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Feb 2008 09:11:28 -0000 1.2 +++ sources 4 Mar 2008 09:20:16 -0000 1.3 @@ -1 +1 @@ -77f69d70f105f83713e427ae0c8f1e5b kcoloredit-4.0.1.tar.bz2 +99b08f4db17bbbbec7149ff896e7d2d8 kcoloredit-4.0.2.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 09:24:12 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Tue, 4 Mar 2008 09:24:12 GMT Subject: rpms/offlineimap/devel .cvsignore, 1.4, 1.5 offlineimap.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200803040924.m249OCKi023124@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/offlineimap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23035 Modified Files: .cvsignore offlineimap.spec sources Log Message: * Tue Mar 04 2008 Till Maas - 5.99.6-1 - Update to latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/offlineimap/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Oct 2007 18:33:43 -0000 1.4 +++ .cvsignore 4 Mar 2008 09:23:36 -0000 1.5 @@ -1 +1 @@ -offlineimap_5.99.4.tar.gz +offlineimap_5.99.6.tar.gz Index: offlineimap.spec =================================================================== RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- offlineimap.spec 7 Jan 2008 20:22:24 -0000 1.13 +++ offlineimap.spec 4 Mar 2008 09:23:36 -0000 1.14 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: offlineimap -Version: 5.99.4 -Release: 2%{?dist} +Version: 5.99.6 +Release: 1%{?dist} Summary: Powerful IMAP/Maildir synchronization and reader support License: GPLv2+ @@ -63,6 +63,9 @@ %changelog +* Tue Mar 04 2008 Till Maas - 5.99.6-1 +- Update to latest version + * Mon Jan 07 2008 Till Maas - 5.99.4-2 - add egg-info to %%files Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/offlineimap/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Oct 2007 18:33:43 -0000 1.4 +++ sources 4 Mar 2008 09:23:36 -0000 1.5 @@ -1 +1 @@ -077f861f164d73aee2eb5df6b975415e offlineimap_5.99.4.tar.gz +d042ea91b01953883c8022269199c797 offlineimap_5.99.6.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 09:24:27 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Tue, 4 Mar 2008 09:24:27 GMT Subject: rpms/system-config-firewall/devel .cvsignore, 1.19, 1.20 sources, 1.20, 1.21 system-config-firewall.spec, 1.26, 1.27 Message-ID: <200803040924.m249ORau023150@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/system-config-firewall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23052 Modified Files: .cvsignore sources system-config-firewall.spec Log Message: - new ICMP filter to block specified ICMP types - fixed minor problem in lokkit (initialize old_config) - set starting diretory for custom rules files to /etc/sysconfig - more build environment changes for git - use gtk.CellRendererToggle instead of own CellRendererCheck - several parser changes for transparent error handling and output - some minor enhancements - translation updates Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 20 Feb 2008 17:57:13 -0000 1.19 +++ .cvsignore 4 Mar 2008 09:23:47 -0000 1.20 @@ -1,18 +1 @@ -system-config-firewall-1.0.3.tar.bz2 -system-config-firewall-1.0.4.tar.bz2 -system-config-firewall-1.0.5.tar.bz2 -system-config-firewall-1.0.7.tar.bz2 -system-config-firewall-1.0.8.tar.bz2 -system-config-firewall-1.0.9.tar.bz2 -system-config-firewall-1.0.10.tar.bz2 -system-config-firewall-1.0.11.tar.bz2 -system-config-firewall-1.0.12.tar.bz2 -system-config-firewall-1.1.0.tar.bz2 -system-config-firewall-1.1.1.tar.bz2 -system-config-firewall-1.1.3.tar.bz2 -system-config-firewall-1.2.0.tar.bz2 -system-config-firewall-1.2.1.tar.bz2 -system-config-firewall-1.2.2.tar.bz2 -system-config-firewall-1.2.3.tar.bz2 -system-config-firewall-1.2.4.tar.bz2 -system-config-firewall-1.2.5.tar.bz2 +system-config-firewall-1.2.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 20 Feb 2008 17:57:13 -0000 1.20 +++ sources 4 Mar 2008 09:23:47 -0000 1.21 @@ -1 +1 @@ -4a098811a62587b22c8e145163605a9e system-config-firewall-1.2.5.tar.bz2 +2b7aede551b344fbd50083c1dfb26e3c system-config-firewall-1.2.6.tar.bz2 Index: system-config-firewall.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- system-config-firewall.spec 20 Feb 2008 17:57:13 -0000 1.26 +++ system-config-firewall.spec 4 Mar 2008 09:23:47 -0000 1.27 @@ -1,6 +1,6 @@ Summary: A graphical interface for basic firewall setup Name: system-config-firewall -Version: 1.2.5 +Version: 1.2.6 Release: 1%{?dist} URL: http://fedorahosted.org/system-config-firewall License: GPLv2+ @@ -107,6 +107,7 @@ %{_datadir}/system-config-firewall/fw_compat.* %{_datadir}/system-config-firewall/fw_config.* %{_datadir}/system-config-firewall/fw_functions.* +%{_datadir}/system-config-firewall/fw_icmp.* %{_datadir}/system-config-firewall/fw_iptables.* %{_datadir}/system-config-firewall/fw_parser.* %{_datadir}/system-config-firewall/fw_selinux.* @@ -117,6 +118,16 @@ %ghost %config(missingok,noreplace) /etc/sysconfig/system-config-firewall %changelog +* Tue Mar 4 2008 Thomas Woerner 1.2.6-1 +- new ICMP filter to block specified ICMP types +- fixed minor problem in lokkit (initialize old_config) +- set starting diretory for custom rules files to /etc/sysconfig +- more build environment changes for git +- use gtk.CellRendererToggle instead of own CellRendererCheck +- several parser changes for transparent error handling and output +- some minor enhancements +- translation updates + * Wed Feb 20 2008 Thomas Woerner 1.2.5-1 - dropped system-config-securitylevel compatibility files - project moved to git.fedoraproject.org From fedora-extras-commits at redhat.com Tue Mar 4 09:33:50 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Tue, 4 Mar 2008 09:33:50 GMT Subject: rpms/kiconedit/devel .cvsignore, 1.2, 1.3 kiconedit.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803040933.m249XopI024031@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/kiconedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23941 Modified Files: .cvsignore kiconedit.spec sources Log Message: * Tue Mar 04 2008 Sebastian Vahl 4.0.2-1 - new upstream version: 4.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kiconedit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Feb 2008 09:09:12 -0000 1.2 +++ .cvsignore 4 Mar 2008 09:33:15 -0000 1.3 @@ -1 +1 @@ -kiconedit-4.0.1.tar.bz2 +kiconedit-4.0.2.tar.bz2 Index: kiconedit.spec =================================================================== RCS file: /cvs/extras/rpms/kiconedit/devel/kiconedit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kiconedit.spec 14 Feb 2008 07:52:25 -0000 1.3 +++ kiconedit.spec 4 Mar 2008 09:33:15 -0000 1.4 @@ -2,8 +2,8 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=432139 Name: kiconedit -Version: 4.0.1 -Release: 2%{?dist} +Version: 4.0.2 +Release: 1%{?dist} Summary: An icon editor Group: Applications/Publishing @@ -77,6 +77,9 @@ %{_kde4_iconsdir}/hicolor/*/*/kiconedit.png %changelog +* Tue Mar 04 2008 Sebastian Vahl 4.0.2-1 +- new upstream version: 4.0.2 + * Thu Feb 14 2008 Sebastian Vahl 4.0.1-2 - remove reference to KDE 4 in summary Index: sources =================================================================== RCS file: /cvs/extras/rpms/kiconedit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Feb 2008 09:09:12 -0000 1.2 +++ sources 4 Mar 2008 09:33:15 -0000 1.3 @@ -1 +1 @@ -778bd7dbb95855b36050c444fa7705f1 kiconedit-4.0.1.tar.bz2 +c3ce4ef8a29656e764e9551bac0a7982 kiconedit-4.0.2.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 09:34:07 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 09:34:07 GMT Subject: rpms/ocaml-dbus/devel .cvsignore, 1.4, 1.5 ocaml-dbus.spec, 1.4, 1.5 sources, 1.4, 1.5 ocaml-dbus-no-fail-unknown-type.patch, 1.1, NONE Message-ID: <200803040934.m249Y7D0024090@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-dbus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23949/devel Modified Files: .cvsignore ocaml-dbus.spec sources Removed Files: ocaml-dbus-no-fail-unknown-type.patch Log Message: * Tue Mar 4 2008 Richard W.M. Jones - 0.06-1 - New upstream release 0.06. - All patches are now upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 3 Mar 2008 13:35:33 -0000 1.4 +++ .cvsignore 4 Mar 2008 09:33:19 -0000 1.5 @@ -1 +1 @@ -ocaml_dbus-0.05.tar.bz2 +ocaml_dbus-0.06.tar.bz2 Index: ocaml-dbus.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/ocaml-dbus.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ocaml-dbus.spec 3 Mar 2008 13:35:33 -0000 1.4 +++ ocaml-dbus.spec 4 Mar 2008 09:33:20 -0000 1.5 @@ -2,7 +2,7 @@ %define debug_package %{nil} Name: ocaml-dbus -Version: 0.05 +Version: 0.06 Release: 1%{?dist} Summary: OCaml library for using D-Bus @@ -12,8 +12,6 @@ Source0: http://tab.snarc.org/download/ocaml/ocaml_dbus-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: ocaml-dbus-no-fail-unknown-type.patch - BuildRequires: ocaml >= 3.10.0-7, ocaml-findlib BuildRequires: dbus-devel @@ -40,7 +38,6 @@ %prep %setup -q -n ocaml_dbus-%{version} -%patch0 -p0 %build @@ -97,6 +94,10 @@ %changelog +* Tue Mar 4 2008 Richard W.M. Jones - 0.06-1 +- New upstream release 0.06. +- All patches are now upstream. + * Mon Mar 3 2008 Richard W.M. Jones - 0.05-1 - New upstream release 0.05. - Include 'THANKS' file in doc. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 3 Mar 2008 13:35:33 -0000 1.4 +++ sources 4 Mar 2008 09:33:20 -0000 1.5 @@ -1 +1 @@ -88fa86074ba4d14c5be75f1cfd991fd3 ocaml_dbus-0.05.tar.bz2 +872d5967ba5f20ea2795ced1c6a305ce ocaml_dbus-0.06.tar.bz2 --- ocaml-dbus-no-fail-unknown-type.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 09:41:52 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 09:41:52 GMT Subject: rpms/fRaBs/devel frabs210-lisp-fixes.patch, NONE, 1.1 fRaBs.desktop, 1.3, 1.4 fRaBs.spec, 1.5, 1.6 Message-ID: <200803040941.m249fqG5024834@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/fRaBs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24737 Modified Files: fRaBs.desktop fRaBs.spec Added Files: frabs210-lisp-fixes.patch Log Message: * Tue Mar 4 2008 Hans de Goede 2.11-1 - Sync with upstream 2.11 release (backport 2 small addon lisp fixes), but keep using the old tarbal as the new one contains a dos version, with dos exectuables, line-endings and various filename upper/lowercase mismatches. - Update .desktop file for new 0.7.1 abuse release (binary name changed) frabs210-lisp-fixes.patch: --- NEW FILE frabs210-lisp-fixes.patch --- --- frabs210_unix.src/addon/leon/leon.lsp 2002-01-23 18:34:07.000000000 +0100 +++ frabs210_unix.src/addon/leon/leon.lsp 2008-03-03 22:40:02.000000000 +0100 @@ -54,7 +54,7 @@ (load "addon/leon/lisp/text.lsp") (load "addon/leon/lisp/nextlev3.lsp") (load "addon/leon/lisp/lnant.lsp") -(load "addon/leon/lisp/lnisc.lsp") +(load "addon/leon/lisp/lmisc.lsp") (load "addon/leon/lisp/grenade.lsp") (load "addon/leon/lisp/nguns.lsp") (load "addon/leon/lisp/rain.lsp") diff -ur frabs210_unix.src/addon/twist/lisp/chars.lsp abuse-frabs-2.11/addon/twist/lisp/chars.lsp --- frabs210_unix.src/addon/twist/lisp/chars.lsp 2002-01-23 18:34:07.000000000 +0100 +++ frabs210_unix.src/addon/twist/lisp/chars.lsp 2008-03-03 22:40:02.000000000 +0100 @@ -331,7 +331,7 @@ (damage_fun guner_damage)) (abilities (run_top_speed 12) (start_hp 60)) - (flags (hurtable T) (can_block F)) + (flags (hurtable T) (can_block (not T))) (range 300 100) (vars fire_delay burst_delay burst_total burst_wait burst_left max_xvel max_yvel smoke_time fire_time) Index: fRaBs.desktop =================================================================== RCS file: /cvs/extras/rpms/fRaBs/devel/fRaBs.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fRaBs.desktop 6 Aug 2007 12:00:51 -0000 1.3 +++ fRaBs.desktop 4 Mar 2008 09:41:17 -0000 1.4 @@ -1,8 +1,7 @@ [Desktop Entry] -Encoding=UTF-8 Name=Abuse (fRaBs) Comment=Abuse with free datafiles -Exec=abuse.sdl -fullscreen -datadir /usr/share/fRaBs +Exec=abuse -fullscreen -datadir /usr/share/fRaBs Icon=fRaBs.png Terminal=false Type=Application Index: fRaBs.spec =================================================================== RCS file: /cvs/extras/rpms/fRaBs/devel/fRaBs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fRaBs.spec 6 Aug 2007 12:00:51 -0000 1.5 +++ fRaBs.spec 4 Mar 2008 09:41:17 -0000 1.6 @@ -1,20 +1,23 @@ %define _version 210 +# we need atleast ubuse-0.7.1 as with 0.7.1 abuse.sdl was renamed to abuse +%define min_abuse_version 0.7.1 Name: fRaBs -Version: 2.10 -Release: 3%{?dist} +Version: 2.11 +Release: 1%{?dist} Group: Amusements/Games License: Public Domain Summary: Free data files for abuse the game -# upstream is no longer -URL: http://web.archive.org/web/20021208173222/http://www.cs.uidaho.edu/~cass0664/fRaBs/ +URL: http://abuse.zoy.org/ +# we use an older version no longer available, see changelog for rationale Source0: frabs%{_version}_unix.src.tar.bz2 Source1: %{name}.desktop +Patch0: frabs210-lisp-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ImageMagick desktop-file-utils BuildArch: noarch -Requires: abuse hicolor-icon-theme -Provides: abuse-data +Requires: abuse >= %{min_abuse_version}, hicolor-icon-theme +Provides: abuse-data = %{min_abuse_version} Provides: frabs = %{version}-%{release} %description @@ -23,6 +26,7 @@ %prep %setup -q -n frabs%{_version}_unix.src +%patch0 -p1 %build @@ -73,6 +77,12 @@ %changelog +* Tue Mar 4 2008 Hans de Goede 2.11-1 +- Sync with upstream 2.11 release (backport 2 small addon lisp fixes), but keep + using the old tarbal as the new one contains a dos version, with dos + exectuables, line-endings and various filename upper/lowercase mismatches. +- Update .desktop file for new 0.7.1 abuse release (binary name changed) + * Fri Aug 3 2007 Hans de Goede 2.10-3 - Fixup .desktop file categories for games-menus usage From fedora-extras-commits at redhat.com Tue Mar 4 09:41:55 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 09:41:55 GMT Subject: rpms/abuse/devel .cvsignore, 1.2, 1.3 abuse.spec, 1.7, 1.8 abuse_sdl-0.7.0-fixes.patch, 1.1, 1.2 sources, 1.2, 1.3 abuse_sdl-0.7.0-debian.patch, 1.1, NONE Message-ID: <200803040941.m249ftNo024850@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/abuse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24713 Modified Files: .cvsignore abuse.spec abuse_sdl-0.7.0-fixes.patch sources Removed Files: abuse_sdl-0.7.0-debian.patch Log Message: * Mon Mar 3 2008 Hans de Goede 0.7.1-1 - Upstream is alive again, new upstream release 0.7.1, yeah! Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abuse/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Aug 2006 05:27:25 -0000 1.2 +++ .cvsignore 4 Mar 2008 09:41:07 -0000 1.3 @@ -1 +1 @@ -abuse_sdl-0.7.0.tar.bz2 +abuse-0.7.1.tar.gz Index: abuse.spec =================================================================== RCS file: /cvs/extras/rpms/abuse/devel/abuse.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- abuse.spec 19 Feb 2008 07:47:39 -0000 1.7 +++ abuse.spec 4 Mar 2008 09:41:07 -0000 1.8 @@ -1,18 +1,20 @@ Name: abuse -Version: 0.7.0 -Release: 6%{?dist} +Version: 0.7.1 +Release: 1%{?dist} Summary: The classic Crack-Dot-Com game Group: Amusements/Games -License: GPL+ -URL: http://happypenguin.org/show?Abuse-SDL -# no URL upstream's site is gone -Source0: abuse_sdl-%{version}.tar.bz2 -Patch0: abuse_sdl-0.7.0-debian.patch +License: GPLv2+ +URL: http://abuse.zoy.org/ +# no URL, as downloading requires a parameter, this file is: +# http://abuse.zoy.org/attachment/wiki/Downloads/abuse-0.7.1.tar.gz?format=raw +Source0: %{name}-%{version}.tar.gz Patch1: abuse_sdl-0.7.0-fixes.patch Patch2: abuse_sdl-0.7.0-exit-intro-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel alsa-lib-devel libGLU-devel -Requires: abuse-data hicolor-icon-theme +# abuse-data >= 0.7.1 as the included desktop files needs to be updated for the +# fact thar out binary was renamed from abuse.sdl to just abuse +Requires: abuse-data >= 0.7.1, hicolor-icon-theme %description This is the SDL version of Abuse, the classic Crack-Dot-Com game. It can run in @@ -20,8 +22,7 @@ %prep -%setup -q -n abuse_sdl-%{version} -%patch0 -p1 -z .deb +%setup -q %patch1 -p1 -z .fix %patch2 -p1 -z .intro @@ -60,12 +61,15 @@ %files %defattr(-,root,root,-) %doc AUTHORS README TODO COPYING -%{_bindir}/%{name}.sdl -%{_mandir}/man6/%{name}-sdl.6.gz +%{_bindir}/%{name} +%{_mandir}/man6/%{name}.6.gz %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %changelog +* Mon Mar 3 2008 Hans de Goede 0.7.1-1 +- Upstream is alive again, new upstream release 0.7.1, yeah! + * Tue Feb 19 2008 Fedora Release Engineering - 0.7.0-6 - Autorebuild for GCC 4.3 abuse_sdl-0.7.0-fixes.patch: Index: abuse_sdl-0.7.0-fixes.patch =================================================================== RCS file: /cvs/extras/rpms/abuse/devel/abuse_sdl-0.7.0-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abuse_sdl-0.7.0-fixes.patch 18 Aug 2006 05:27:25 -0000 1.1 +++ abuse_sdl-0.7.0-fixes.patch 4 Mar 2008 09:41:07 -0000 1.2 @@ -1,59 +1,17 @@ -diff -ur abuse_sdl-0.7.0.orig/src/include/stack.hpp abuse_sdl-0.7.0/src/include/stack.hpp ---- abuse_sdl-0.7.0.orig/src/include/stack.hpp 2002-12-15 06:00:32.000000000 +0100 -+++ abuse_sdl-0.7.0/src/include/stack.hpp 2006-08-16 16:54:58.000000000 +0200 -@@ -13,20 +13,38 @@ - { - public : - T **sdata; -- long son; -- -- grow_stack(int max_size) { sdata=(T **)jmalloc(max_size,"pointer stack"); son=0; } -+ unsigned int son, _max_size; +--- abuse-0.7.1/src/stack.hpp.fix 2008-03-02 15:23:26.000000000 +0100 ++++ abuse-0.7.1/src/stack.hpp 2008-03-03 22:24:25.000000000 +0100 +@@ -25,7 +25,12 @@ template class grow_stack + long son; + long smax; + + /* the max_size parameter is the number of bytes of the pointerstack + instead of the number of entries which it ofcourse should have been. + This breaks on 64 bit since the caller assumes 4 bytes per pointer and + thus on 64 bit allocates not enough memory. Instead of fixing all callers + we work around this by multiplying maxsize by 2 on 64 bit. */ -+ grow_stack(unsigned int max_size) -+ { -+ max_size *= sizeof(void*)/sizeof(int); -+ sdata = (T **)jmalloc(max_size, "pointer stack"); -+ son=0; -+ _max_size=max_size; -+ } -+ - void push(T *data) - { - sdata[son]=data; - son++; -+ if (son >= (_max_size/sizeof(int))) -+ { -+ lbreak("stack overflow\n"); -+ exit(0); -+ } + grow_stack(int max_size) { +- smax=max_size; ++ smax=max_size/sizeof(int32_t); + son=0; + sdata=(T **)jmalloc(sizeof(T *)*smax,"pointer stack"); } - -- T *pop(long total) -- { if (total>son) { lbreak("stack underflow\n"); exit(0); } -+ T *pop(unsigned int total) -+ { -+ if (total>son) { lbreak("stack underflow\n"); exit(0); } - son-=total; - return sdata[son]; - } -+ - void clean_up() - { - if (son!=0) fprintf(stderr,"Warning cleaning up stack and not empty\n"); -diff -ur abuse_sdl-0.7.0.orig/src/light.cpp abuse_sdl-0.7.0/src/light.cpp ---- abuse_sdl-0.7.0.orig/src/light.cpp 2006-08-16 16:56:33.000000000 +0200 -+++ abuse_sdl-0.7.0/src/light.cpp 2006-08-16 16:36:07.000000000 +0200 -@@ -348,7 +348,7 @@ - // f->write(green_light,256*64); - for (int i=0;iwrite(tints[i],256); -- fp->write(bright_tint,256); -+ f->write(bright_tint,256); - // f.write(trans_table,256*256); - } - delete f; Index: sources =================================================================== RCS file: /cvs/extras/rpms/abuse/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Aug 2006 05:27:25 -0000 1.2 +++ sources 4 Mar 2008 09:41:07 -0000 1.3 @@ -1 +1 @@ -59ea4498886642aa975f04233cc92558 abuse_sdl-0.7.0.tar.bz2 +439b607f291560a8f9698a2f09cffa63 abuse-0.7.1.tar.gz --- abuse_sdl-0.7.0-debian.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 10:17:11 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 4 Mar 2008 10:17:11 GMT Subject: rpms/system-config-date/devel .cvsignore, 1.82, 1.83 sources, 1.89, 1.90 system-config-date.spec, 1.93, 1.94 Message-ID: <200803041017.m24AHBNa002394@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-date/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2313 Modified Files: .cvsignore sources system-config-date.spec Log Message: handle ntpdate service (#229217, patch by Miroslav Lichvar) change all runlevels instead of only 3 and 5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- .cvsignore 5 Feb 2008 08:51:35 -0000 1.82 +++ .cvsignore 4 Mar 2008 10:16:32 -0000 1.83 @@ -1 +1 @@ -system-config-date-1.9.22.tar.bz2 +system-config-date-1.9.23.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- sources 5 Feb 2008 08:51:35 -0000 1.89 +++ sources 4 Mar 2008 10:16:32 -0000 1.90 @@ -1 +1 @@ -bd17995fca0794c22f045d22c547bbf9 system-config-date-1.9.22.tar.bz2 +afbbfd4a661eab33f22f70b1ffda9d62 system-config-date-1.9.23.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- system-config-date.spec 5 Feb 2008 08:51:35 -0000 1.93 +++ system-config-date.spec 4 Mar 2008 10:16:32 -0000 1.94 @@ -20,7 +20,7 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.9.22 +Version: 1.9.23 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/date License: GPLv2+ @@ -134,6 +134,10 @@ %config(noreplace) %{_sysconfdir}/ntp/ntpservers %changelog +* Tue Mar 04 2008 Nils Philippsen - 1.9.23-1 +- handle ntpdate service (#229217, patch by Miroslav Lichvar) +- change all runlevels instead of only 3 and 5 + * Tue Feb 05 2008 Nils Philippsen - 1.9.22-1 - keep UTC info in /etc/adjtime, drop ARC support (patch by Bill Nottingham) From fedora-extras-commits at redhat.com Tue Mar 4 10:22:34 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 4 Mar 2008 10:22:34 GMT Subject: rpms/lighttpd/F-8 lighttpd-1.4.18-Fix-372-and-1562.patch, NONE, 1.1 lighttpd-1.4.18-mod_cgi-fix.patch, NONE, 1.1 lighttpd.spec, 1.40, 1.41 Message-ID: <200803041022.m24AMYiA002921@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2817/F-8 Modified Files: lighttpd.spec Added Files: lighttpd-1.4.18-Fix-372-and-1562.patch lighttpd-1.4.18-mod_cgi-fix.patch Log Message: Include security patches. lighttpd-1.4.18-Fix-372-and-1562.patch: --- NEW FILE lighttpd-1.4.18-Fix-372-and-1562.patch --- >From 6b77fd21b58b6bfc10bd01fd0ce4e5f4ced0d5d9 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Stefan=20B=C3=BChler?= Date: Wed, 13 Feb 2008 00:07:22 +0100 Subject: [PATCH] Fix #372 + #1562 --- src/fdevent_solaris_devpoll.c | 2 +- src/server.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c index f77daef..76414a4 100644 --- a/src/fdevent_solaris_devpoll.c +++ b/src/fdevent_solaris_devpoll.c @@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll(fdevents *ev, int timeout_ms) { int ret; dopoll.dp_timeout = timeout_ms; - dopoll.dp_nfds = ev->maxfds; + dopoll.dp_nfds = ev->maxfds - 1; dopoll.dp_fds = ev->devpollfds; ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll); diff --git a/src/server.c b/src/server.c index 052130a..585a973 100644 --- a/src/server.c +++ b/src/server.c @@ -697,9 +697,6 @@ int main (int argc, char **argv) { } } - /* #372: solaris need some fds extra for devpoll */ - if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10; - if (srv->event_handler == FDEVENT_HANDLER_SELECT) { srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200; } else { -- 1.5.3.8 lighttpd-1.4.18-mod_cgi-fix.patch: --- NEW FILE lighttpd-1.4.18-mod_cgi-fix.patch --- Index: lighttpd-1.4.x/src/mod_cgi.c =================================================================== --- lighttpd-1.4.x/src/mod_cgi.c (revision 2065) +++ lighttpd-1.4.x/src/mod_cgi.c (revision 2107) @@ -1005,4 +1005,5 @@ /* error */ log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno)); + return -1; break; default: { Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/F-8/lighttpd.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- lighttpd.spec 31 Oct 2007 11:39:23 -0000 1.40 +++ lighttpd.spec 4 Mar 2008 10:21:57 -0000 1.41 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.18 -Release: 3%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -18,6 +18,9 @@ Source101: lighttpd-mod_geoip.txt Patch0: lighttpd-1.4.17-defaultconf.patch Patch1: lighttpd-1.4.18-mod_geoip.patch +# Security fixes +Patch10: lighttpd-1.4.18-Fix-372-and-1562.patch +Patch11: lighttpd-1.4.18-mod_cgi-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: system-logos >= 7.92.1 Requires(pre): /usr/sbin/useradd @@ -86,6 +89,8 @@ %setup -q %patch0 -p1 -b .defaultconf %patch1 -p1 -b .mod_geoip +%patch10 -p1 -b .Fix-372-and-1562 +%patch11 -p1 -b .mod_cgi-fix %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt @@ -210,6 +215,16 @@ %changelog +* Tue Mar 4 2008 Matthias Saou 1.4.18-6 +- Include patch for CVE-2008-0983 (crash when low on file descriptors). +- Include patch for CVE-2008-1111 (cgi source disclosure). + +* Tue Feb 19 2008 Fedora Release Engineering +- Autorebuild for GCC 4.3 + +* Wed Dec 05 2007 Release Engineering + - Rebuild for deps + * Wed Oct 31 2007 Matthias Saou 1.4.18-3 - Update mod_geoip source to fix segfault upon stopping lighttpd. From fedora-extras-commits at redhat.com Tue Mar 4 10:22:41 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 4 Mar 2008 10:22:41 GMT Subject: rpms/lighttpd/devel lighttpd-1.4.18-Fix-372-and-1562.patch, NONE, 1.1 lighttpd-1.4.18-mod_cgi-fix.patch, NONE, 1.1 lighttpd.spec, 1.42, 1.43 Message-ID: <200803041022.m24AMfnr002932@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2817/devel Modified Files: lighttpd.spec Added Files: lighttpd-1.4.18-Fix-372-and-1562.patch lighttpd-1.4.18-mod_cgi-fix.patch Log Message: Include security patches. lighttpd-1.4.18-Fix-372-and-1562.patch: --- NEW FILE lighttpd-1.4.18-Fix-372-and-1562.patch --- >From 6b77fd21b58b6bfc10bd01fd0ce4e5f4ced0d5d9 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Stefan=20B=C3=BChler?= Date: Wed, 13 Feb 2008 00:07:22 +0100 Subject: [PATCH] Fix #372 + #1562 --- src/fdevent_solaris_devpoll.c | 2 +- src/server.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c index f77daef..76414a4 100644 --- a/src/fdevent_solaris_devpoll.c +++ b/src/fdevent_solaris_devpoll.c @@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll(fdevents *ev, int timeout_ms) { int ret; dopoll.dp_timeout = timeout_ms; - dopoll.dp_nfds = ev->maxfds; + dopoll.dp_nfds = ev->maxfds - 1; dopoll.dp_fds = ev->devpollfds; ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll); diff --git a/src/server.c b/src/server.c index 052130a..585a973 100644 --- a/src/server.c +++ b/src/server.c @@ -697,9 +697,6 @@ int main (int argc, char **argv) { } } - /* #372: solaris need some fds extra for devpoll */ - if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10; - if (srv->event_handler == FDEVENT_HANDLER_SELECT) { srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200; } else { -- 1.5.3.8 lighttpd-1.4.18-mod_cgi-fix.patch: --- NEW FILE lighttpd-1.4.18-mod_cgi-fix.patch --- Index: lighttpd-1.4.x/src/mod_cgi.c =================================================================== --- lighttpd-1.4.x/src/mod_cgi.c (revision 2065) +++ lighttpd-1.4.x/src/mod_cgi.c (revision 2107) @@ -1005,4 +1005,5 @@ /* error */ log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno)); + return -1; break; default: { Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- lighttpd.spec 20 Feb 2008 04:21:31 -0000 1.42 +++ lighttpd.spec 4 Mar 2008 10:22:05 -0000 1.43 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.18 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -18,6 +18,9 @@ Source101: lighttpd-mod_geoip.txt Patch0: lighttpd-1.4.17-defaultconf.patch Patch1: lighttpd-1.4.18-mod_geoip.patch +# Security fixes +Patch10: lighttpd-1.4.18-Fix-372-and-1562.patch +Patch11: lighttpd-1.4.18-mod_cgi-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: system-logos >= 7.92.1 Requires(pre): /usr/sbin/useradd @@ -86,6 +89,8 @@ %setup -q %patch0 -p1 -b .defaultconf %patch1 -p1 -b .mod_geoip +%patch10 -p1 -b .Fix-372-and-1562 +%patch11 -p1 -b .mod_cgi-fix %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt @@ -210,10 +215,14 @@ %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 1.4.18-5 +* Tue Mar 4 2008 Matthias Saou 1.4.18-6 +- Include patch for CVE-2008-0983 (crash when low on file descriptors). +- Include patch for CVE-2008-1111 (cgi source disclosure). + +* Tue Feb 19 2008 Fedora Release Engineering - Autorebuild for GCC 4.3 -* Wed Dec 05 2007 Release Engineering - 1.4.18-4 +* Wed Dec 05 2007 Release Engineering - Rebuild for deps * Wed Oct 31 2007 Matthias Saou 1.4.18-3 From fedora-extras-commits at redhat.com Tue Mar 4 10:28:20 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Tue, 4 Mar 2008 10:28:20 GMT Subject: rpms/sudo/devel sudo-1.6.9p13-audit.patch, 1.1, 1.2 sudo.spec, 1.61, 1.62 Message-ID: <200803041028.m24ASKqq003409@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/sudo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3369 Modified Files: sudo-1.6.9p13-audit.patch sudo.spec Log Message: audit support improvement sudo-1.6.9p13-audit.patch: Index: sudo-1.6.9p13-audit.patch =================================================================== RCS file: /cvs/extras/rpms/sudo/devel/sudo-1.6.9p13-audit.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sudo-1.6.9p13-audit.patch 21 Feb 2008 15:10:42 -0000 1.1 +++ sudo-1.6.9p13-audit.patch 4 Mar 2008 10:28:10 -0000 1.2 @@ -1,6 +1,6 @@ diff -up sudo-1.6.9p13/set_perms.c.audit sudo-1.6.9p13/set_perms.c --- sudo-1.6.9p13/set_perms.c.audit 2007-11-28 00:41:23.000000000 +0100 -+++ sudo-1.6.9p13/set_perms.c 2008-02-21 14:03:02.000000000 +0100 ++++ sudo-1.6.9p13/set_perms.c 2008-03-04 11:18:45.000000000 +0100 @@ -53,6 +53,10 @@ #ifdef HAVE_LOGIN_CAP_H # include @@ -67,8 +67,8 @@ case PERM_SUDOERS: /* assume euid == ROOT_UID, ruid == user */ diff -up sudo-1.6.9p13/sudo.c.audit sudo-1.6.9p13/sudo.c ---- sudo-1.6.9p13/sudo.c.audit 2008-02-21 14:03:02.000000000 +0100 -+++ sudo-1.6.9p13/sudo.c 2008-02-21 14:03:02.000000000 +0100 +--- sudo-1.6.9p13/sudo.c.audit 2008-03-04 11:18:45.000000000 +0100 ++++ sudo-1.6.9p13/sudo.c 2008-03-04 11:21:54.000000000 +0100 @@ -100,6 +100,10 @@ # include #endif @@ -91,119 +91,54 @@ /* * Look up the timestamp dir owner if one is specified. */ -@@ -305,9 +313,13 @@ main(argc, argv, envp) - pw = getpwuid(atoi(def_timestampowner + 1)); - else - pw = getpwnam(def_timestampowner); -- if (!pw) -+ if (!pw) { -+#if defined(WITH_AUDIT) -+ audit_logger(AUDIT_USER_CMD, user_cmnd, 0); -+#endif - log_error(0, "timestamp owner (%s): No such user", - def_timestampowner); -+ } - timestamp_uid = pw->pw_uid; - } - -@@ -317,15 +329,22 @@ main(argc, argv, envp) - exit(0); - } - -- if (ISSET(validated, VALIDATE_ERROR)) -+ if (ISSET(validated, VALIDATE_ERROR)) { -+#if defined(WITH_AUDIT) -+ audit_logger(AUDIT_USER_CMD, user_cmnd, 0); -+#endif - log_error(0, "parse error in %s near line %d", _PATH_SUDOERS, - errorlineno); -+ } - - /* Is root even allowed to run sudo? */ - if (user_uid == 0 && !def_root_sudo) { - (void) fprintf(stderr, - "Sorry, %s has been configured to not allow root to run it.\n", - getprogname()); -+#if defined(WITH_AUDIT) -+ audit_logger(AUDIT_USER_CMD, user_cmnd, 0); -+#endif - exit(1); - } - -@@ -339,8 +358,12 @@ main(argc, argv, envp) - - /* Bail if a tty is required and we don't have one. */ - if (def_requiretty) { -- if ((fd = open(_PATH_TTY, O_RDWR|O_NOCTTY)) == -1) -+ if ((fd = open(_PATH_TTY, O_RDWR|O_NOCTTY)) == -1) { -+#if defined(WITH_AUDIT) -+ audit_logger(AUDIT_USER_CMD, user_cmnd, 0); -+#endif - log_error(NO_MAIL, "sorry, you must have a tty to run sudo"); -+ } - else - (void) close(fd); - } -@@ -373,17 +396,27 @@ main(argc, argv, envp) - /* Finally tell the user if the command did not exist. */ - if (cmnd_status == NOT_FOUND_DOT) { - warnx("ignoring `%s' found in '.'\nUse `sudo ./%s' if this is the `%s' you wish to run.", user_cmnd, user_cmnd, user_cmnd); -+#if defined(WITH_AUDIT) -+ audit_logger(AUDIT_USER_CMD, user_cmnd, 0); -+#endif - exit(1); - } else if (cmnd_status == NOT_FOUND) { - warnx("%s: command not found", user_cmnd); -+#if defined(WITH_AUDIT) -+ audit_logger(AUDIT_USER_CMD, user_cmnd, 0); -+#endif - exit(1); - } - - /* If user specified env vars make sure sudoers allows it. */ - if (ISSET(sudo_mode, MODE_RUN) && !ISSET(validated, FLAG_SETENV)) { -- if (ISSET(sudo_mode, MODE_PRESERVE_ENV)) -+ if (ISSET(sudo_mode, MODE_PRESERVE_ENV)) { -+#if defined(WITH_AUDIT) -+ audit_logger(AUDIT_USER_CMD, user_cmnd, 0); -+#endif - log_error(NO_MAIL, - "sorry, you are not allowed to preserve the environment"); -+ } - else - validate_env_vars(sudo_user.env_vars); - } -@@ -442,6 +475,17 @@ main(argc, argv, envp) +@@ -442,6 +450,17 @@ main(argc, argv, envp) (void) sigaction(SIGTSTP, &saved_sa_tstp, NULL); (void) sigaction(SIGCHLD, &saved_sa_chld, NULL); + if (access(safe_cmnd, X_OK) != 0) { + warn ("unable to execute %s", safe_cmnd); +#ifdef WITH_AUDIT -+ audit_logger(AUDIT_USER_CMD, safe_cmnd, 0); ++ audit_logger(AUDIT_USER_CMD, safe_cmnd, user_args, 0); +#endif + exit(127); + } +#ifdef WITH_AUDIT -+ audit_logger(AUDIT_USER_CMD, safe_cmnd, 1); ++ audit_logger(AUDIT_USER_CMD, safe_cmnd, user_args, 1); +#endif + #ifndef PROFILING if (ISSET(sudo_mode, MODE_BACKGROUND) && fork() > 0) exit(0); -@@ -465,6 +509,9 @@ main(argc, argv, envp) +@@ -465,10 +484,16 @@ main(argc, argv, envp) NewArgv[1] = safe_cmnd; execve(_PATH_BSHELL, NewArgv, environ); } +#ifdef WITH_AUDIT -+ audit_logger(AUDIT_USER_CMD, safe_cmnd, 0); ++ audit_logger(AUDIT_USER_CMD, safe_cmnd, user_args, 0); +#endif warn("unable to execute %s", safe_cmnd); exit(127); } else if (ISSET(validated, FLAG_NO_USER) || (validated & FLAG_NO_HOST)) { + log_auth(validated, 1); ++#ifdef WITH_AUDIT ++ audit_logger(AUDIT_USER_CMD, safe_cmnd, user_args, 0); ++#endif + exit(1); + } else if (ISSET(validated, VALIDATE_NOT_OK)) { + if (def_path_info) { +@@ -489,6 +514,9 @@ main(argc, argv, envp) + /* Just tell the user they are not allowed to run foo. */ + log_auth(validated, 1); + } ++#ifdef WITH_AUDIT ++ audit_logger(AUDIT_USER_CMD, safe_cmnd, user_args, 0); ++#endif + exit(1); + } else { + /* should never get here */ diff -up sudo-1.6.9p13/configure.in.audit sudo-1.6.9p13/configure.in ---- sudo-1.6.9p13/configure.in.audit 2008-02-21 14:03:02.000000000 +0100 -+++ sudo-1.6.9p13/configure.in 2008-02-21 14:03:02.000000000 +0100 +--- sudo-1.6.9p13/configure.in.audit 2008-03-04 11:18:45.000000000 +0100 ++++ sudo-1.6.9p13/configure.in 2008-03-04 11:18:45.000000000 +0100 @@ -166,6 +166,10 @@ dnl dnl Options for --with dnl @@ -243,8 +178,8 @@ dnl diff -up /dev/null sudo-1.6.9p13/audit_help.c --- /dev/null 2008-02-05 17:16:01.642928004 +0100 -+++ sudo-1.6.9p13/audit_help.c 2008-02-21 14:20:56.000000000 +0100 -@@ -0,0 +1,124 @@ ++++ sudo-1.6.9p13/audit_help.c 2008-03-04 11:21:15.000000000 +0100 +@@ -0,0 +1,140 @@ +/* + * Audit helper functions used throughout sudo + * @@ -285,6 +220,7 @@ +#include +#include +#include ++#include +#include +#include + @@ -314,22 +250,36 @@ + * + * type - type of message: AUDIT_USER_CMD + * command - the command being logged ++ * params - parames of the command + * result - 1 is "success" and 0 is "failed" + * + */ -+void audit_logger (int type, const char *command, int result) ++void audit_logger (int type, const char *command, const char *params, int result) +{ + int err; ++ char *msg; + -+ if (audit_fd < 0) ++ if( audit_fd < 0 ) + return; + else { -+ err = audit_log_user_command (audit_fd, type, command, NULL, result); -+ /* The kernel supports auditing and we had ++ ++ if( params ) ++ err = asprintf(&msg, "%s %s", command, params); ++ else ++ err = asprintf(&msg, "%s", command); ++ if (err < 0) { ++ fprintf (stderr, "Memory allocation for audit message wasn???t possible.\n"); ++ return; ++ } ++ ++ err = audit_log_user_command (audit_fd, type, msg, NULL, result); ++ /* The kernel supports auditing and we had + enough privilege to write to the socket. */ -+ if( err <= 0 && !(errno == EPERM && getuid() != 0) ) { -+ perror("audit_log_user_command()"); -+ } ++ if( err <= 0 && !(errno == EPERM && getuid() != 0) ) { ++ perror("audit_log_user_command()"); ++ } ++ ++ free(msg); + } +} + @@ -353,6 +303,7 @@ + + rc = audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE, + msg, NULL, NULL, ttyn, success); ++ + if (rc <= 0) { + fprintf(stderr, "Error sending audit message.\n"); + rc = -1; @@ -371,7 +322,7 @@ + diff -up sudo-1.6.9p13/Makefile.in.audit sudo-1.6.9p13/Makefile.in --- sudo-1.6.9p13/Makefile.in.audit 2008-02-19 19:13:10.000000000 +0100 -+++ sudo-1.6.9p13/Makefile.in 2008-02-21 14:03:02.000000000 +0100 ++++ sudo-1.6.9p13/Makefile.in 2008-03-04 11:18:45.000000000 +0100 @@ -120,11 +120,13 @@ HDRS = compat.h def_data.h defaults.h in AUTH_OBJS = sudo_auth.o @AUTH_OBJS@ @@ -398,8 +349,8 @@ @rm -f $(srcdir)/$@ ( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudo.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudo.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" | perl -p sudo.man.pl >> $@ ) diff -up sudo-1.6.9p13/sudo.h.audit sudo-1.6.9p13/sudo.h ---- sudo-1.6.9p13/sudo.h.audit 2008-02-21 14:03:02.000000000 +0100 -+++ sudo-1.6.9p13/sudo.h 2008-02-21 14:03:02.000000000 +0100 +--- sudo-1.6.9p13/sudo.h.audit 2008-03-04 11:18:45.000000000 +0100 ++++ sudo-1.6.9p13/sudo.h 2008-03-04 11:18:45.000000000 +0100 @@ -23,6 +23,8 @@ #ifndef _SUDO_SUDO_H #define _SUDO_SUDO_H @@ -416,7 +367,7 @@ +#ifdef WITH_AUDIT +extern int audit_fd; +extern void audit_help_open (void); -+extern void audit_logger (int, const char *, int); ++extern void audit_logger (int, const char *, const char *, int); +#endif + #endif /* _SUDO_SUDO_H */ Index: sudo.spec =================================================================== RCS file: /cvs/extras/rpms/sudo/devel/sudo.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sudo.spec 21 Feb 2008 15:10:42 -0000 1.61 +++ sudo.spec 4 Mar 2008 10:28:10 -0000 1.62 @@ -1,7 +1,7 @@ Summary: Allows restricted root access for specified users Name: sudo Version: 1.6.9p13 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/System URL: http://www.courtesan.com/sudo/ @@ -129,6 +129,9 @@ /bin/chmod 0440 /etc/sudoers || : %changelog +* Tue Mar 04 2008 Peter Vrabec 1.6.9p13-2 +- audit support improvement + * Thu Feb 21 2008 Peter Vrabec 1.6.9p13-1 - upgrade to the latest upstream release From fedora-extras-commits at redhat.com Tue Mar 4 10:44:52 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 4 Mar 2008 10:44:52 GMT Subject: rpms/lighttpd/F-7 lighttpd-1.4.18-Fix-372-and-1562.patch, NONE, 1.1 lighttpd-1.4.18-mod_cgi-fix.patch, NONE, 1.1 lighttpd.spec, 1.35, 1.36 Message-ID: <200803041044.m24AiqFe004910@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4829 Modified Files: lighttpd.spec Added Files: lighttpd-1.4.18-Fix-372-and-1562.patch lighttpd-1.4.18-mod_cgi-fix.patch Log Message: Include security patches. lighttpd-1.4.18-Fix-372-and-1562.patch: --- NEW FILE lighttpd-1.4.18-Fix-372-and-1562.patch --- >From 6b77fd21b58b6bfc10bd01fd0ce4e5f4ced0d5d9 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Stefan=20B=C3=BChler?= Date: Wed, 13 Feb 2008 00:07:22 +0100 Subject: [PATCH] Fix #372 + #1562 --- src/fdevent_solaris_devpoll.c | 2 +- src/server.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c index f77daef..76414a4 100644 --- a/src/fdevent_solaris_devpoll.c +++ b/src/fdevent_solaris_devpoll.c @@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll(fdevents *ev, int timeout_ms) { int ret; dopoll.dp_timeout = timeout_ms; - dopoll.dp_nfds = ev->maxfds; + dopoll.dp_nfds = ev->maxfds - 1; dopoll.dp_fds = ev->devpollfds; ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll); diff --git a/src/server.c b/src/server.c index 052130a..585a973 100644 --- a/src/server.c +++ b/src/server.c @@ -697,9 +697,6 @@ int main (int argc, char **argv) { } } - /* #372: solaris need some fds extra for devpoll */ - if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10; - if (srv->event_handler == FDEVENT_HANDLER_SELECT) { srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200; } else { -- 1.5.3.8 lighttpd-1.4.18-mod_cgi-fix.patch: --- NEW FILE lighttpd-1.4.18-mod_cgi-fix.patch --- Index: lighttpd-1.4.x/src/mod_cgi.c =================================================================== --- lighttpd-1.4.x/src/mod_cgi.c (revision 2065) +++ lighttpd-1.4.x/src/mod_cgi.c (revision 2107) @@ -1005,4 +1005,5 @@ /* error */ log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno)); + return -1; break; default: { Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/F-7/lighttpd.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- lighttpd.spec 10 Sep 2007 15:45:39 -0000 1.35 +++ lighttpd.spec 4 Mar 2008 10:44:13 -0000 1.36 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.18 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -16,6 +16,9 @@ Source13: http://www.lighttpd.net/light_button.png Source14: http://www.lighttpd.net/light_logo.png Patch0: lighttpd-1.4.17-defaultconf.patch +# Security fixes +Patch10: lighttpd-1.4.18-Fix-372-and-1562.patch +Patch11: lighttpd-1.4.18-mod_cgi-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig @@ -72,6 +75,8 @@ %prep %setup -q %patch0 -p1 -b .defaultconf +%patch10 -p1 -b .Fix-372-and-1562 +%patch11 -p1 -b .mod_cgi-fix %build @@ -184,6 +189,10 @@ %changelog +* Tue Mar 4 2008 Matthias Saou 1.4.18-2 +- Include patch for CVE-2008-0983 (crash when low on file descriptors). +- Include patch for CVE-2008-1111 (cgi source disclosure). + * Mon Sep 10 2007 Matthias Saou 1.4.18-1 - Update to 1.4.18. - Include newly installed lighttpd-angel ("angel" process meant to always run From fedora-extras-commits at redhat.com Tue Mar 4 10:57:38 2008 From: fedora-extras-commits at redhat.com (Stu Tomlinson (nosnilmot)) Date: Tue, 4 Mar 2008 10:57:38 GMT Subject: rpms/libsilc/devel .cvsignore, 1.4, 1.5 libsilc.spec, 1.19, 1.20 sources, 1.4, 1.5 silc-toolkit-1.1.5-fingerprint.patch, 1.1, NONE Message-ID: <200803041057.m24Avcrg005990@cvs-int.fedora.redhat.com> Author: nosnilmot Update of /cvs/pkgs/rpms/libsilc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5903 Modified Files: .cvsignore libsilc.spec sources Removed Files: silc-toolkit-1.1.5-fingerprint.patch Log Message: - Update to 1.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libsilc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Dec 2007 01:59:45 -0000 1.4 +++ .cvsignore 4 Mar 2008 10:56:50 -0000 1.5 @@ -1 +1 @@ -silc-toolkit-1.1.5.tar.bz2 +silc-toolkit-1.1.6.tar.bz2 Index: libsilc.spec =================================================================== RCS file: /cvs/pkgs/rpms/libsilc/devel/libsilc.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libsilc.spec 9 Feb 2008 16:35:59 -0000 1.19 +++ libsilc.spec 4 Mar 2008 10:56:50 -0000 1.20 @@ -1,7 +1,7 @@ Summary: SILC Client Library Name: libsilc -Version: 1.1.5 -Release: 3%{dist} +Version: 1.1.6 +Release: 1%{dist} License: GPLv2 or BSD Group: System Environment/Libraries URL: http://www.silcnet.org/ @@ -10,7 +10,6 @@ Patch0: silc-toolkit-1.1-wordsize.patch Patch1: silc-toolkit-1.1.5-libidn.patch Patch2: silc-toolkit-1.1.5-docinst.patch -Patch3: silc-toolkit-1.1.5-fingerprint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libidn-devel BuildRequires: libtool, autoconf, automake @@ -44,7 +43,6 @@ %patch0 -p1 -b .wordsize %patch1 -p1 -b .libidn %patch2 -p1 -b .docinst -%patch3 -p1 -b .fprint %build autoreconf @@ -126,6 +124,9 @@ %changelog +* Tue Mar 04 2008 Stu Tomlinson 1.1.6-1 +- Update to 1.1.6 + * Sat Feb 09 2008 Stu Tomlinson 1.1.5-3 - Rebuild for gcc 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libsilc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Dec 2007 01:59:45 -0000 1.4 +++ sources 4 Mar 2008 10:56:50 -0000 1.5 @@ -1 +1 @@ -b8e3d70ea2080e37fade45ef20a0d71f silc-toolkit-1.1.5.tar.bz2 +0c0b7f4f4c42707a8dce1c1ecb7d0631 silc-toolkit-1.1.6.tar.bz2 --- silc-toolkit-1.1.5-fingerprint.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 11:01:06 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Tue, 4 Mar 2008 11:01:06 GMT Subject: rpms/boo/devel boo.spec,1.15,1.16 Message-ID: <200803041101.m24B166g012343@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/boo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6261 Modified Files: boo.spec Log Message: * Tue Mar 4 2008 Alex Lancaster - 0.8.1.2865-3 - Rebuild for new nant (causes broken deps) Index: boo.spec =================================================================== RCS file: /cvs/pkgs/rpms/boo/devel/boo.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- boo.spec 23 Feb 2008 16:32:02 -0000 1.15 +++ boo.spec 4 Mar 2008 11:00:23 -0000 1.16 @@ -3,7 +3,7 @@ Summary: Boo is an OO statically typed language for CLI Name: boo Version: 0.8.1.2865 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,6 +72,9 @@ %{monodir}/pkgconfig/boo.pc %changelog +* Tue Mar 4 2008 Alex Lancaster - 0.8.1.2865-3 +- Rebuild for new nant (causes broken deps) + * Sat Feb 23 2008 David Nielsen - 0.8.1-2865-2 - Nope, ppc still broken (#434631) From fedora-extras-commits at redhat.com Tue Mar 4 11:08:39 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 4 Mar 2008 11:08:39 GMT Subject: rpms/lighttpd/EL-4 lighttpd-1.4.18-Fix-372-and-1562.patch, NONE, 1.1 lighttpd-1.4.18-mod_cgi-fix.patch, NONE, 1.1 lighttpd-1.4.18-mod_geoip.patch, NONE, 1.1 lighttpd-mod_geoip.c, NONE, 1.1 lighttpd-mod_geoip.txt, NONE, 1.1 lighttpd.spec, 1.9, 1.10 Message-ID: <200803041108.m24B8dF4014179@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13946/EL-4 Modified Files: lighttpd.spec Added Files: lighttpd-1.4.18-Fix-372-and-1562.patch lighttpd-1.4.18-mod_cgi-fix.patch lighttpd-1.4.18-mod_geoip.patch lighttpd-mod_geoip.c lighttpd-mod_geoip.txt Log Message: Include security fixes, and backport geoip module from Fedora branches. lighttpd-1.4.18-Fix-372-and-1562.patch: --- NEW FILE lighttpd-1.4.18-Fix-372-and-1562.patch --- >From 6b77fd21b58b6bfc10bd01fd0ce4e5f4ced0d5d9 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Stefan=20B=C3=BChler?= Date: Wed, 13 Feb 2008 00:07:22 +0100 Subject: [PATCH] Fix #372 + #1562 --- src/fdevent_solaris_devpoll.c | 2 +- src/server.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c index f77daef..76414a4 100644 --- a/src/fdevent_solaris_devpoll.c +++ b/src/fdevent_solaris_devpoll.c @@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll(fdevents *ev, int timeout_ms) { int ret; dopoll.dp_timeout = timeout_ms; - dopoll.dp_nfds = ev->maxfds; + dopoll.dp_nfds = ev->maxfds - 1; dopoll.dp_fds = ev->devpollfds; ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll); diff --git a/src/server.c b/src/server.c index 052130a..585a973 100644 --- a/src/server.c +++ b/src/server.c @@ -697,9 +697,6 @@ int main (int argc, char **argv) { } } - /* #372: solaris need some fds extra for devpoll */ - if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10; - if (srv->event_handler == FDEVENT_HANDLER_SELECT) { srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200; } else { -- 1.5.3.8 lighttpd-1.4.18-mod_cgi-fix.patch: --- NEW FILE lighttpd-1.4.18-mod_cgi-fix.patch --- Index: lighttpd-1.4.x/src/mod_cgi.c =================================================================== --- lighttpd-1.4.x/src/mod_cgi.c (revision 2065) +++ lighttpd-1.4.x/src/mod_cgi.c (revision 2107) @@ -1005,4 +1005,5 @@ /* error */ log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno)); + return -1; break; default: { lighttpd-1.4.18-mod_geoip.patch: --- NEW FILE lighttpd-1.4.18-mod_geoip.patch --- diff -Naupr lighttpd-1.4.18.orig/src/Makefile.am lighttpd-1.4.18/src/Makefile.am --- lighttpd-1.4.18.orig/src/Makefile.am 2007-09-03 00:23:53.000000000 +0200 +++ lighttpd-1.4.18/src/Makefile.am 2007-10-16 19:13:56.000000000 +0200 @@ -241,6 +241,11 @@ mod_accesslog_la_SOURCES = mod_accesslog mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_accesslog_la_LIBADD = $(common_libadd) +lib_LTLIBRARIES += mod_geoip.la +mod_geoip_la_SOURCES = mod_geoip.c +mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP + hdr = server.h buffer.h network.h log.h keyvalue.h \ response.h request.h fastcgi.h chunk.h \ diff -Naupr lighttpd-1.4.18.orig/src/Makefile.in lighttpd-1.4.18/src/Makefile.in --- lighttpd-1.4.18.orig/src/Makefile.in 2007-09-09 21:55:29.000000000 +0200 +++ lighttpd-1.4.18/src/Makefile.in 2007-10-16 19:16:47.000000000 +0200 @@ -126,6 +126,12 @@ mod_accesslog_la_OBJECTS = $(am_mod_acce mod_accesslog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(mod_accesslog_la_LDFLAGS) $(LDFLAGS) -o $@ +mod_geoip_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_mod_geoip_la_OBJECTS = mod_geoip.lo +mod_geoip_la_OBJECTS = $(am_mod_geoip_la_OBJECTS) +mod_geoip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(mod_geoip_la_LDFLAGS) $(LDFLAGS) -o $@ mod_alias_la_DEPENDENCIES = $(am__DEPENDENCIES_2) am_mod_alias_la_OBJECTS = mod_alias.lo mod_alias_la_OBJECTS = $(am_mod_alias_la_OBJECTS) @@ -413,7 +419,7 @@ SOURCES = $(liblightcomp_la_SOURCES) $(m $(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \ $(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \ $(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \ - $(spawn_fcgi_SOURCES) + $(spawn_fcgi_SOURCES) $(mod_geoip_la_SOURCES) DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \ $(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \ $(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \ @@ -433,7 +439,7 @@ DIST_SOURCES = $(am__liblightcomp_la_SOU $(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \ $(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \ $(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \ - $(spawn_fcgi_SOURCES) + $(spawn_fcgi_SOURCES) $(mod_geoip_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -614,7 +620,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \ mod_simple_vhost.la mod_fastcgi.la mod_extforward.la \ mod_access.la mod_compress.la mod_auth.la mod_rewrite.la \ - mod_redirect.la mod_status.la mod_accesslog.la + mod_redirect.la mod_status.la mod_accesslog.la mod_geoip.la @NO_RDYNAMIC_TRUE at liblightcomp_la_SOURCES = $(common_src) @NO_RDYNAMIC_TRUE at liblightcomp_la_CFLAGS = $(AM_CFLAGS) @NO_RDYNAMIC_TRUE at liblightcomp_la_LDFLAGS = -avoid-version -no-undefined @@ -721,6 +727,9 @@ mod_status_la_LIBADD = $(common_libadd) mod_accesslog_la_SOURCES = mod_accesslog.c mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_accesslog_la_LIBADD = $(common_libadd) +mod_geoip_la_SOURCES = mod_geoip.c +mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP hdr = server.h buffer.h network.h log.h keyvalue.h \ response.h request.h fastcgi.h chunk.h \ settings.h http_chunk.h http_auth_digest.h \ @@ -822,6 +831,8 @@ mod_access.la: $(mod_access_la_OBJECTS) $(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_la_LIBADD) $(LIBS) mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES) $(mod_accesslog_la_LINK) -rpath $(libdir) $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_LIBADD) $(LIBS) +mod_geoip.la: $(mod_geoip_la_OBJECTS) $(mod_geoip_la_DEPENDENCIES) + $(mod_geoip_la_LINK) -rpath $(libdir) $(mod_geoip_la_OBJECTS) $(mod_geoip_la_LIBADD) $(LIBS) mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES) $(mod_alias_la_LINK) -rpath $(libdir) $(mod_alias_la_OBJECTS) $(mod_alias_la_LIBADD) $(LIBS) mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES) @@ -1043,6 +1054,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_access.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_accesslog.Plo at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_geoip.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_alias.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_auth.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_cgi.Plo at am__quote@ --- NEW FILE lighttpd-mod_geoip.c --- #include #include #include #include #include #include "base.h" #include "log.h" #include "buffer.h" #include "plugin.h" #ifdef HAVE_CONFIG_H #include "config.h" #endif /** * * $mod_geoip.c (v2.0) (13.09.2006 00:29:11) * * Name: * mod_geoip.c * * Description: * GeoIP module (plugin) for lighttpd. * the module loads a geoip database of type "country" or "city" and * sets new ENV vars based on ip record lookups. * * country db env's: * GEOIP_COUNTRY_CODE * GEOIP_COUNTRY_CODE3 * GEOIP_COUNTRY_NAME * * city db env's: * GEOIP_COUNTRY_CODE * GEOIP_COUNTRY_CODE3 * GEOIP_COUNTRY_NAME * GEOIP_CITY_NAME * GEOIP_CITY_POSTAL_CODE * GEOIP_CITY_LATITUDE * GEOIP_CITY_LONG_LATITUDE * GEOIP_CITY_DMA_CODE * GEOIP_CITY_AREA_CODE * * Usage (configuration options): * geoip.db-filename = * geoip.memory-cache = : default disabled * if enabled, mod_geoip will load the database binary file to * memory for very fast lookups. the only penalty is memory usage. * * Author: * Ami E. Bizamcher (amix) * duke.amix at gmail.com * * Note: * GeoIP Library and API must be installed! */ /* plugin config for all request/connections */ typedef struct { unsigned short mem_cache; buffer *db_name; GeoIP *gi; } plugin_config; typedef struct { PLUGIN_DATA; plugin_config **config_storage; plugin_config conf; } plugin_data; /* init the plugin data */ INIT_FUNC(mod_geoip_init) { plugin_data *p; p = calloc(1, sizeof(*p)); return p; } /* detroy the plugin data */ FREE_FUNC(mod_geoip_free) { plugin_data *p = p_d; UNUSED(srv); if (!p) return HANDLER_GO_ON; if (p->config_storage) { size_t i; for (i = 0; i < srv->config_context->used; i++) { plugin_config *s = p->config_storage[i]; if (!s) continue; buffer_free(s->db_name); /* clean up */ GeoIP_delete(s->gi); free(s); } free(p->config_storage); } free(p); return HANDLER_GO_ON; } /* handle plugin config and check values */ SETDEFAULTS_FUNC(mod_geoip_set_defaults) { plugin_data *p = p_d; size_t i = 0; config_values_t cv[] = { { "geoip.db-filename", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 0 */ { "geoip.memory-cache", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */ { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } }; if (!p) return HANDLER_ERROR; p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; int mode; s = calloc(1, sizeof(plugin_config)); s->db_name = buffer_init(); s->mem_cache = 0; /* default: do not load db to cache */ s->gi = NULL; cv[0].destination = s->db_name; cv[1].destination = &(s->mem_cache); p->config_storage[i] = s; if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv)) { return HANDLER_ERROR; } mode = GEOIP_STANDARD | GEOIP_CHECK_CACHE; /* country db filename is requeried! */ if (!buffer_is_empty(s->db_name)) { /* let's start cooking */ if (s->mem_cache != 0) mode = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE; if (NULL == (s->gi = GeoIP_open(s->db_name->ptr, mode))) { log_error_write(srv, __FILE__, __LINE__, "s", "failed to open GeoIP database!!!"); return HANDLER_ERROR; } /* is the db supported ? */ if (s->gi->databaseType != GEOIP_COUNTRY_EDITION && s->gi->databaseType != GEOIP_CITY_EDITION_REV0 && s->gi->databaseType != GEOIP_CITY_EDITION_REV1) { log_error_write(srv, __FILE__, __LINE__, "s", "GeoIP database is of unsupported type!!!"); } } } return HANDLER_GO_ON; } #define PATCH(x) \ p->conf.x = s->x; static int mod_geoip_patch_connection(server *srv, connection *con, plugin_data *p) { size_t i, j; plugin_config *s = p->config_storage[0]; PATCH(db_name); PATCH(mem_cache); PATCH(gi); /* skip the first, the global context */ for (i = 1; i < srv->config_context->used; i++) { data_config *dc = (data_config *)srv->config_context->data[i]; s = p->config_storage[i]; /* condition didn't match */ if (!config_check_cond(srv, con, dc)) continue; /* merge config */ for (j = 0; j < dc->value->used; j++) { data_unset *du = dc->value->data[j]; if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.db-filename"))) { PATCH(db_name); } if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.memory-cache"))) { PATCH(mem_cache); } } } return 0; } #undef PATCH URIHANDLER_FUNC(mod_geoip_subrequest) { plugin_data *p = p_d; mod_geoip_patch_connection(srv, con, p); if (!buffer_is_empty(p->conf.db_name)) { const char *remote_ip; GeoIP *gi; data_string *ds; const char *returnedCountry; remote_ip = inet_ntop_cache_get_ip(srv, &(con->dst_addr)); if (p->conf.gi->databaseType == GEOIP_COUNTRY_EDITION) { /* get the country code 2 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE"))) { if (NULL != (returnedCountry = GeoIP_country_code_by_addr(p->conf.gi, remote_ip))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE"); buffer_copy_string(ds->value, returnedCountry); array_insert_unique(con->environment, (data_unset *)ds); } } /* get the country code 3 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE3"))) { if (NULL != (returnedCountry = GeoIP_country_code3_by_addr(p->conf.gi, remote_ip))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE3"); buffer_copy_string(ds->value, returnedCountry); array_insert_unique(con->environment, (data_unset *)ds); } } /* get the country name */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_NAME"))) { if (NULL != (returnedCountry = GeoIP_country_name_by_addr(p->conf.gi, remote_ip))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_NAME"); buffer_copy_string(ds->value, returnedCountry); array_insert_unique(con->environment, (data_unset *)ds); } } /* go on... */ return HANDLER_GO_ON; } /* if we are here, geo city is in use */ GeoIPRecord * gir; if (NULL != (gir = GeoIP_record_by_addr(p->conf.gi, remote_ip))) { /* get the country code 2 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE"); buffer_copy_string(ds->value, gir->country_code); array_insert_unique(con->environment, (data_unset *)ds); } /* get the country code 3 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE3"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE3"); buffer_copy_string(ds->value, gir->country_code3); array_insert_unique(con->environment, (data_unset *)ds); } /* get the country name */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_NAME"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_NAME"); buffer_copy_string(ds->value, gir->country_name); array_insert_unique(con->environment, (data_unset *)ds); } /* get the city region */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_REGION"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_CITY_REGION"); buffer_copy_string(ds->value, gir->region); array_insert_unique(con->environment, (data_unset *)ds); } /* get the city */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_NAME"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_CITY_NAME"); buffer_copy_string(ds->value, gir->city); array_insert_unique(con->environment, (data_unset *)ds); } /* get the postal code */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_POSTAL_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_CITY_POSTAL_CODE"); buffer_copy_string(ds->value, gir->postal_code); array_insert_unique(con->environment, (data_unset *)ds); } /* get the latitude */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_LATITUDE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char latitude[32]; sprintf(&latitude, "%f", gir->latitude); buffer_copy_string(ds->key, "GEOIP_CITY_LATITUDE"); buffer_copy_string(ds->value, latitude); array_insert_unique(con->environment, (data_unset *)ds); } /* get the long latitude */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_LONG_LATITUDE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char long_latitude[32]; sprintf(&long_latitude, "%f", gir->longitude); buffer_copy_string(ds->key, "GEOIP_CITY_LONG_LATITUDE"); buffer_copy_string(ds->value, long_latitude); array_insert_unique(con->environment, (data_unset *)ds); } /* get the dma code */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_DMA_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char dc[5]; sprintf(&dc, "%i", gir->dma_code); buffer_copy_string(ds->key, "GEOIP_CITY_DMA_CODE"); buffer_copy_string(ds->value, dc); array_insert_unique(con->environment, (data_unset *)ds); } /* get the area code */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_AREA_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char ac[5]; sprintf(&ac, "%i", gir->area_code); buffer_copy_string(ds->key, "GEOIP_CITY_AREA_CODE"); buffer_copy_string(ds->value, ac); array_insert_unique(con->environment, (data_unset *)ds); } } } /* keep walking... (johnnie walker style ;) */ return HANDLER_GO_ON; } /* this function is called at dlopen() time and inits the callbacks */ int mod_geoip_plugin_init(plugin *p) { p->version = LIGHTTPD_VERSION_ID; p->name = buffer_init_string("geoip"); p->init = mod_geoip_init; p->handle_subrequest_start = mod_geoip_subrequest; p->set_defaults = mod_geoip_set_defaults; p->cleanup = mod_geoip_free; p->data = NULL; return 0; } --- NEW FILE lighttpd-mod_geoip.txt --- ============================== ip based geographic lookups... ============================== ----------------- Module: mod_geoip ----------------- .. contents:: Table of Contents Requirements ============ :Packages: GeoIP C API & Library (http://www.maxmind.com/download/geoip/api/c/) Overview ============ mod_geoip is a module for fast ip/location lookups. It uses MaxMind GeoIP / GeoCity databases. If the ip was found in the database the module sets the appropriate environments variables to the request, thus making other modules/fcgi be informed. .. note:: Currently only country/city databases are supported because they have a free version that i can test. (http://www.maxmind.com/download/geoip/database/ - GeoIP.dat.gz for Countries, GeoLiteCity.dat.gz for Countries & Cities) Installation ============ NOTE: As of 1.4.14 the lighttpd distribution does not include the compile file required to perform a automake in the source directory. Use "automake -a" instead. 1) Download mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c) - (for lighttpd 1.5 use http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.4.c and rename it to mod_geoip.c) 2) Copy mod_geoip.c into lighttpd src directory. 3) Edit your src/Makefile.am and add this after the last module: :: lib_LTLIBRARIES += mod_geoip.la mod_geoip_la_SOURCES = mod_geoip.c mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP 4) Go back to lighttpd root directory and first do: aclocal && automake -a && autoconf, after that do: make clean; ./configure --enable-maintainer-mode; make; make install Note: the command of 'make clean' gives error on Fedora 4 and may not be necessary to compile properly. [j lightstone//GlobalAdSales.company] 5) Make sure /usr/local/lib is in your ld.so.conf file and rebuld the ld database (using: ldconfig). 6) Add to the config file server.modules = ("mod_geoip") [j lightstone//GlobalAdSales.company] Configuration Options ======================== NOTE: in lighttpd 1.5.x add the config vars only to the global config - adding into a vhost crashes lighty! mod_geoip uses two configuration options. 1) geoip.db-filename = 2) geoip.memory-cache = : default disabled if enabled, mod_geoip will load the database binary file to memory for very fast lookups. the only penalty is memory usage. .. note:: mod_geoip will determine the database type automatically so if you enter GeoCity databse path it will load GeoCity Env. Environment =========== Every database sets it's own ENV: GeoIP (Country): ---------------- :: GEOIP_COUNTRY_CODE GEOIP_COUNTRY_CODE3 GEOIP_COUNTRY_NAME GeoCity: -------- :: GEOIP_COUNTRY_CODE GEOIP_COUNTRY_CODE3 GEOIP_COUNTRY_NAME GEOIP_CITY_NAME GEOIP_CITY_POSTAL_CODE GEOIP_CITY_LATITUDE GEOIP_CITY_LONG_LATITUDE GEOIP_CITY_DMA_CODE GEOIP_CITY_AREA_CODE Examples ======== mod_geoip + php --------------- NOTE: in lighttpd 1.5.x add the config vars only to the global config - adding into a vhost crashes lighty! when using fastcgi (not only php) you can access mod_geoip env and do as you please. this example just prints all mod_geoip envs to the client, html. Config-file :: geoip.db-filename = "/your-geoip-db-path/GeoLiteCity.dat" geoip.memory-cache = "enable" index.php :: \n\n\t
\n"; echo 'Country Code: ' . $country_code . '
'; echo 'Country Code 3: ' . $country_code3 . '
'; echo 'Country Name: ' . $country_name . '
'; echo '
'; echo 'City Region: ' . $city_region . '
'; echo 'City Name: ' . $city_name . '
'; echo 'City Postal Code: ' . $city_postal_code . '
'; echo 'City Latitude: ' . $city_latitude . '
'; echo 'City Long Latitude: ' . $city_long_latitude . '
'; echo 'City DMA Code: ' . $city_dma_code . '
'; echo 'City Area Code: ' . $city_area_code . '
'; echo "\n"; ?> country based redirect ---------------------- Config-file :: $HTTP["host"] =~ "www.domain.com" { url.rewrite = ( "" => "/redirect.php") } redirect.php :: .. note:: Currently it is not possible to redirect based on mod_geoip directly in lighttpd config file. But i believe with the relase of lighttpd mod_magnet it would be. (mod_magnet will be available in lighttpd 1.4.12+) Downloads ========= mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c) mod_geoip.c for lighttpd 1.5.x (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.4.c) Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/EL-4/lighttpd.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lighttpd.spec 10 Sep 2007 15:45:33 -0000 1.9 +++ lighttpd.spec 4 Mar 2008 11:08:03 -0000 1.10 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.18 -Release: 1%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -15,7 +15,13 @@ Source12: powered_by_fedora.png Source13: http://www.lighttpd.net/light_button.png Source14: http://www.lighttpd.net/light_logo.png +Source100: lighttpd-mod_geoip.c +Source101: lighttpd-mod_geoip.txt Patch0: lighttpd-1.4.17-defaultconf.patch +Patch1: lighttpd-1.4.18-mod_geoip.patch +# Security fixes +Patch10: lighttpd-1.4.18-Fix-372-and-1562.patch +Patch11: lighttpd-1.4.18-mod_cgi-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig @@ -48,16 +54,6 @@ --without : ldap gdbm lua (cml) -%package mod_mysql_vhost -Summary: Virtual host module for lighttpd that uses a MySQL database -Group: System Environment/Daemons -Requires: %{name} = %{version} -BuildRequires: mysql-devel - -%description mod_mysql_vhost -Virtual host module for lighttpd that uses a MySQL database. - - %package fastcgi Summary: FastCGI module and spawning helper for lighttpd and PHP configuration Group: System Environment/Daemons @@ -69,9 +65,34 @@ defaults needed for correct FastCGI behavior. +%package mod_geoip +Summary: GeoIP module for lighttpd to use for location lookups +Group: System Environment/Daemons +Requires: %{name} = %{version} +BuildRequires: GeoIP-devel + +%description mod_geoip +GeoIP module for lighttpd to use for location lookups. + + +%package mod_mysql_vhost +Summary: Virtual host module for lighttpd that uses a MySQL database +Group: System Environment/Daemons +Requires: %{name} = %{version} +BuildRequires: mysql-devel + +%description mod_mysql_vhost +Virtual host module for lighttpd that uses a MySQL database. + + %prep %setup -q %patch0 -p1 -b .defaultconf +%patch1 -p1 -b .mod_geoip +%patch10 -p1 -b .Fix-372-and-1562 +%patch11 -p1 -b .mod_cgi-fix +%{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c +%{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt %build @@ -161,18 +182,13 @@ %{_libdir}/lighttpd/ %exclude %{_libdir}/lighttpd/*.la %exclude %{_libdir}/lighttpd/mod_fastcgi.so +%exclude %{_libdir}/lighttpd/mod_geoip.so %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so %{_mandir}/man1/lighttpd.1* %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/ %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/ %{webroot}/ -%files mod_mysql_vhost -%defattr(-,root,root,-) -%doc doc/mysqlvhost.txt -%dir %{_libdir}/lighttpd/ -%{_libdir}/lighttpd/mod_mysql_vhost.so - %files fastcgi %defattr(-,root,root,-) %doc doc/fastcgi*.txt @@ -182,8 +198,28 @@ %{_libdir}/lighttpd/mod_fastcgi.so %{_mandir}/man1/spawn-fcgi.1* +%files mod_geoip +%defattr(-,root,root,-) +%doc mod_geoip.txt +%dir %{_libdir}/lighttpd/ +%{_libdir}/lighttpd/mod_geoip.so + +%files mod_mysql_vhost +%defattr(-,root,root,-) +%doc doc/mysqlvhost.txt +%dir %{_libdir}/lighttpd/ +%{_libdir}/lighttpd/mod_mysql_vhost.so + %changelog +* Tue Mar 4 2008 Matthias Saou 1.4.18-3 +- Include patch for CVE-2008-0983 (crash when low on file descriptors). +- Include patch for CVE-2008-1111 (cgi source disclosure). + +* Tue Oct 16 2007 Matthias Saou 1.4.18-2 +- Include mod_geoip additional source, make it an optional sub-package. +- Reorder sub-packages alphabetically in spec file. + * Mon Sep 10 2007 Matthias Saou 1.4.18-1 - Update to 1.4.18. - Include newly installed lighttpd-angel ("angel" process meant to always run From fedora-extras-commits at redhat.com Tue Mar 4 11:08:45 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 4 Mar 2008 11:08:45 GMT Subject: rpms/lighttpd/F-7 lighttpd-1.4.18-mod_geoip.patch, NONE, 1.1 lighttpd-mod_geoip.c, NONE, 1.1 lighttpd-mod_geoip.txt, NONE, 1.1 lighttpd.spec, 1.36, 1.37 Message-ID: <200803041108.m24B8jfY014189@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14024 Modified Files: lighttpd.spec Added Files: lighttpd-1.4.18-mod_geoip.patch lighttpd-mod_geoip.c lighttpd-mod_geoip.txt Log Message: Backport geoip module from F-8/devel branches. lighttpd-1.4.18-mod_geoip.patch: --- NEW FILE lighttpd-1.4.18-mod_geoip.patch --- diff -Naupr lighttpd-1.4.18.orig/src/Makefile.am lighttpd-1.4.18/src/Makefile.am --- lighttpd-1.4.18.orig/src/Makefile.am 2007-09-03 00:23:53.000000000 +0200 +++ lighttpd-1.4.18/src/Makefile.am 2007-10-16 19:13:56.000000000 +0200 @@ -241,6 +241,11 @@ mod_accesslog_la_SOURCES = mod_accesslog mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_accesslog_la_LIBADD = $(common_libadd) +lib_LTLIBRARIES += mod_geoip.la +mod_geoip_la_SOURCES = mod_geoip.c +mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP + hdr = server.h buffer.h network.h log.h keyvalue.h \ response.h request.h fastcgi.h chunk.h \ diff -Naupr lighttpd-1.4.18.orig/src/Makefile.in lighttpd-1.4.18/src/Makefile.in --- lighttpd-1.4.18.orig/src/Makefile.in 2007-09-09 21:55:29.000000000 +0200 +++ lighttpd-1.4.18/src/Makefile.in 2007-10-16 19:16:47.000000000 +0200 @@ -126,6 +126,12 @@ mod_accesslog_la_OBJECTS = $(am_mod_acce mod_accesslog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(mod_accesslog_la_LDFLAGS) $(LDFLAGS) -o $@ +mod_geoip_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_mod_geoip_la_OBJECTS = mod_geoip.lo +mod_geoip_la_OBJECTS = $(am_mod_geoip_la_OBJECTS) +mod_geoip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(mod_geoip_la_LDFLAGS) $(LDFLAGS) -o $@ mod_alias_la_DEPENDENCIES = $(am__DEPENDENCIES_2) am_mod_alias_la_OBJECTS = mod_alias.lo mod_alias_la_OBJECTS = $(am_mod_alias_la_OBJECTS) @@ -413,7 +419,7 @@ SOURCES = $(liblightcomp_la_SOURCES) $(m $(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \ $(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \ $(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \ - $(spawn_fcgi_SOURCES) + $(spawn_fcgi_SOURCES) $(mod_geoip_la_SOURCES) DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \ $(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \ $(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \ @@ -433,7 +439,7 @@ DIST_SOURCES = $(am__liblightcomp_la_SOU $(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \ $(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \ $(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \ - $(spawn_fcgi_SOURCES) + $(spawn_fcgi_SOURCES) $(mod_geoip_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -614,7 +620,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \ mod_simple_vhost.la mod_fastcgi.la mod_extforward.la \ mod_access.la mod_compress.la mod_auth.la mod_rewrite.la \ - mod_redirect.la mod_status.la mod_accesslog.la + mod_redirect.la mod_status.la mod_accesslog.la mod_geoip.la @NO_RDYNAMIC_TRUE at liblightcomp_la_SOURCES = $(common_src) @NO_RDYNAMIC_TRUE at liblightcomp_la_CFLAGS = $(AM_CFLAGS) @NO_RDYNAMIC_TRUE at liblightcomp_la_LDFLAGS = -avoid-version -no-undefined @@ -721,6 +727,9 @@ mod_status_la_LIBADD = $(common_libadd) mod_accesslog_la_SOURCES = mod_accesslog.c mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_accesslog_la_LIBADD = $(common_libadd) +mod_geoip_la_SOURCES = mod_geoip.c +mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP hdr = server.h buffer.h network.h log.h keyvalue.h \ response.h request.h fastcgi.h chunk.h \ settings.h http_chunk.h http_auth_digest.h \ @@ -822,6 +831,8 @@ mod_access.la: $(mod_access_la_OBJECTS) $(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_la_LIBADD) $(LIBS) mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES) $(mod_accesslog_la_LINK) -rpath $(libdir) $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_LIBADD) $(LIBS) +mod_geoip.la: $(mod_geoip_la_OBJECTS) $(mod_geoip_la_DEPENDENCIES) + $(mod_geoip_la_LINK) -rpath $(libdir) $(mod_geoip_la_OBJECTS) $(mod_geoip_la_LIBADD) $(LIBS) mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES) $(mod_alias_la_LINK) -rpath $(libdir) $(mod_alias_la_OBJECTS) $(mod_alias_la_LIBADD) $(LIBS) mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES) @@ -1043,6 +1054,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_access.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_accesslog.Plo at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_geoip.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_alias.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_auth.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_cgi.Plo at am__quote@ --- NEW FILE lighttpd-mod_geoip.c --- #include #include #include #include #include #include "base.h" #include "log.h" #include "buffer.h" #include "plugin.h" #ifdef HAVE_CONFIG_H #include "config.h" #endif /** * * $mod_geoip.c (v2.0) (13.09.2006 00:29:11) * * Name: * mod_geoip.c * * Description: * GeoIP module (plugin) for lighttpd. * the module loads a geoip database of type "country" or "city" and * sets new ENV vars based on ip record lookups. * * country db env's: * GEOIP_COUNTRY_CODE * GEOIP_COUNTRY_CODE3 * GEOIP_COUNTRY_NAME * * city db env's: * GEOIP_COUNTRY_CODE * GEOIP_COUNTRY_CODE3 * GEOIP_COUNTRY_NAME * GEOIP_CITY_NAME * GEOIP_CITY_POSTAL_CODE * GEOIP_CITY_LATITUDE * GEOIP_CITY_LONG_LATITUDE * GEOIP_CITY_DMA_CODE * GEOIP_CITY_AREA_CODE * * Usage (configuration options): * geoip.db-filename = * geoip.memory-cache = : default disabled * if enabled, mod_geoip will load the database binary file to * memory for very fast lookups. the only penalty is memory usage. * * Author: * Ami E. Bizamcher (amix) * duke.amix at gmail.com * * Note: * GeoIP Library and API must be installed! */ /* plugin config for all request/connections */ typedef struct { unsigned short mem_cache; buffer *db_name; GeoIP *gi; } plugin_config; typedef struct { PLUGIN_DATA; plugin_config **config_storage; plugin_config conf; } plugin_data; /* init the plugin data */ INIT_FUNC(mod_geoip_init) { plugin_data *p; p = calloc(1, sizeof(*p)); return p; } /* detroy the plugin data */ FREE_FUNC(mod_geoip_free) { plugin_data *p = p_d; UNUSED(srv); if (!p) return HANDLER_GO_ON; if (p->config_storage) { size_t i; for (i = 0; i < srv->config_context->used; i++) { plugin_config *s = p->config_storage[i]; if (!s) continue; buffer_free(s->db_name); /* clean up */ GeoIP_delete(s->gi); free(s); } free(p->config_storage); } free(p); return HANDLER_GO_ON; } /* handle plugin config and check values */ SETDEFAULTS_FUNC(mod_geoip_set_defaults) { plugin_data *p = p_d; size_t i = 0; config_values_t cv[] = { { "geoip.db-filename", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 0 */ { "geoip.memory-cache", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */ { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } }; if (!p) return HANDLER_ERROR; p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; int mode; s = calloc(1, sizeof(plugin_config)); s->db_name = buffer_init(); s->mem_cache = 0; /* default: do not load db to cache */ s->gi = NULL; cv[0].destination = s->db_name; cv[1].destination = &(s->mem_cache); p->config_storage[i] = s; if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv)) { return HANDLER_ERROR; } mode = GEOIP_STANDARD | GEOIP_CHECK_CACHE; /* country db filename is requeried! */ if (!buffer_is_empty(s->db_name)) { /* let's start cooking */ if (s->mem_cache != 0) mode = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE; if (NULL == (s->gi = GeoIP_open(s->db_name->ptr, mode))) { log_error_write(srv, __FILE__, __LINE__, "s", "failed to open GeoIP database!!!"); return HANDLER_ERROR; } /* is the db supported ? */ if (s->gi->databaseType != GEOIP_COUNTRY_EDITION && s->gi->databaseType != GEOIP_CITY_EDITION_REV0 && s->gi->databaseType != GEOIP_CITY_EDITION_REV1) { log_error_write(srv, __FILE__, __LINE__, "s", "GeoIP database is of unsupported type!!!"); } } } return HANDLER_GO_ON; } #define PATCH(x) \ p->conf.x = s->x; static int mod_geoip_patch_connection(server *srv, connection *con, plugin_data *p) { size_t i, j; plugin_config *s = p->config_storage[0]; PATCH(db_name); PATCH(mem_cache); PATCH(gi); /* skip the first, the global context */ for (i = 1; i < srv->config_context->used; i++) { data_config *dc = (data_config *)srv->config_context->data[i]; s = p->config_storage[i]; /* condition didn't match */ if (!config_check_cond(srv, con, dc)) continue; /* merge config */ for (j = 0; j < dc->value->used; j++) { data_unset *du = dc->value->data[j]; if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.db-filename"))) { PATCH(db_name); } if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.memory-cache"))) { PATCH(mem_cache); } } } return 0; } #undef PATCH URIHANDLER_FUNC(mod_geoip_subrequest) { plugin_data *p = p_d; mod_geoip_patch_connection(srv, con, p); if (!buffer_is_empty(p->conf.db_name)) { const char *remote_ip; GeoIP *gi; data_string *ds; const char *returnedCountry; remote_ip = inet_ntop_cache_get_ip(srv, &(con->dst_addr)); if (p->conf.gi->databaseType == GEOIP_COUNTRY_EDITION) { /* get the country code 2 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE"))) { if (NULL != (returnedCountry = GeoIP_country_code_by_addr(p->conf.gi, remote_ip))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE"); buffer_copy_string(ds->value, returnedCountry); array_insert_unique(con->environment, (data_unset *)ds); } } /* get the country code 3 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE3"))) { if (NULL != (returnedCountry = GeoIP_country_code3_by_addr(p->conf.gi, remote_ip))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE3"); buffer_copy_string(ds->value, returnedCountry); array_insert_unique(con->environment, (data_unset *)ds); } } /* get the country name */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_NAME"))) { if (NULL != (returnedCountry = GeoIP_country_name_by_addr(p->conf.gi, remote_ip))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_NAME"); buffer_copy_string(ds->value, returnedCountry); array_insert_unique(con->environment, (data_unset *)ds); } } /* go on... */ return HANDLER_GO_ON; } /* if we are here, geo city is in use */ GeoIPRecord * gir; if (NULL != (gir = GeoIP_record_by_addr(p->conf.gi, remote_ip))) { /* get the country code 2 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE"); buffer_copy_string(ds->value, gir->country_code); array_insert_unique(con->environment, (data_unset *)ds); } /* get the country code 3 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE3"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE3"); buffer_copy_string(ds->value, gir->country_code3); array_insert_unique(con->environment, (data_unset *)ds); } /* get the country name */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_NAME"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_NAME"); buffer_copy_string(ds->value, gir->country_name); array_insert_unique(con->environment, (data_unset *)ds); } /* get the city region */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_REGION"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_CITY_REGION"); buffer_copy_string(ds->value, gir->region); array_insert_unique(con->environment, (data_unset *)ds); } /* get the city */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_NAME"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_CITY_NAME"); buffer_copy_string(ds->value, gir->city); array_insert_unique(con->environment, (data_unset *)ds); } /* get the postal code */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_POSTAL_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_CITY_POSTAL_CODE"); buffer_copy_string(ds->value, gir->postal_code); array_insert_unique(con->environment, (data_unset *)ds); } /* get the latitude */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_LATITUDE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char latitude[32]; sprintf(&latitude, "%f", gir->latitude); buffer_copy_string(ds->key, "GEOIP_CITY_LATITUDE"); buffer_copy_string(ds->value, latitude); array_insert_unique(con->environment, (data_unset *)ds); } /* get the long latitude */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_LONG_LATITUDE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char long_latitude[32]; sprintf(&long_latitude, "%f", gir->longitude); buffer_copy_string(ds->key, "GEOIP_CITY_LONG_LATITUDE"); buffer_copy_string(ds->value, long_latitude); array_insert_unique(con->environment, (data_unset *)ds); } /* get the dma code */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_DMA_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char dc[5]; sprintf(&dc, "%i", gir->dma_code); buffer_copy_string(ds->key, "GEOIP_CITY_DMA_CODE"); buffer_copy_string(ds->value, dc); array_insert_unique(con->environment, (data_unset *)ds); } /* get the area code */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_AREA_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char ac[5]; sprintf(&ac, "%i", gir->area_code); buffer_copy_string(ds->key, "GEOIP_CITY_AREA_CODE"); buffer_copy_string(ds->value, ac); array_insert_unique(con->environment, (data_unset *)ds); } } } /* keep walking... (johnnie walker style ;) */ return HANDLER_GO_ON; } /* this function is called at dlopen() time and inits the callbacks */ int mod_geoip_plugin_init(plugin *p) { p->version = LIGHTTPD_VERSION_ID; p->name = buffer_init_string("geoip"); p->init = mod_geoip_init; p->handle_subrequest_start = mod_geoip_subrequest; p->set_defaults = mod_geoip_set_defaults; p->cleanup = mod_geoip_free; p->data = NULL; return 0; } --- NEW FILE lighttpd-mod_geoip.txt --- ============================== ip based geographic lookups... ============================== ----------------- Module: mod_geoip ----------------- .. contents:: Table of Contents Requirements ============ :Packages: GeoIP C API & Library (http://www.maxmind.com/download/geoip/api/c/) Overview ============ mod_geoip is a module for fast ip/location lookups. It uses MaxMind GeoIP / GeoCity databases. If the ip was found in the database the module sets the appropriate environments variables to the request, thus making other modules/fcgi be informed. .. note:: Currently only country/city databases are supported because they have a free version that i can test. (http://www.maxmind.com/download/geoip/database/ - GeoIP.dat.gz for Countries, GeoLiteCity.dat.gz for Countries & Cities) Installation ============ NOTE: As of 1.4.14 the lighttpd distribution does not include the compile file required to perform a automake in the source directory. Use "automake -a" instead. 1) Download mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c) - (for lighttpd 1.5 use http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.4.c and rename it to mod_geoip.c) 2) Copy mod_geoip.c into lighttpd src directory. 3) Edit your src/Makefile.am and add this after the last module: :: lib_LTLIBRARIES += mod_geoip.la mod_geoip_la_SOURCES = mod_geoip.c mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP 4) Go back to lighttpd root directory and first do: aclocal && automake -a && autoconf, after that do: make clean; ./configure --enable-maintainer-mode; make; make install Note: the command of 'make clean' gives error on Fedora 4 and may not be necessary to compile properly. [j lightstone//GlobalAdSales.company] 5) Make sure /usr/local/lib is in your ld.so.conf file and rebuld the ld database (using: ldconfig). 6) Add to the config file server.modules = ("mod_geoip") [j lightstone//GlobalAdSales.company] Configuration Options ======================== NOTE: in lighttpd 1.5.x add the config vars only to the global config - adding into a vhost crashes lighty! mod_geoip uses two configuration options. 1) geoip.db-filename = 2) geoip.memory-cache = : default disabled if enabled, mod_geoip will load the database binary file to memory for very fast lookups. the only penalty is memory usage. .. note:: mod_geoip will determine the database type automatically so if you enter GeoCity databse path it will load GeoCity Env. Environment =========== Every database sets it's own ENV: GeoIP (Country): ---------------- :: GEOIP_COUNTRY_CODE GEOIP_COUNTRY_CODE3 GEOIP_COUNTRY_NAME GeoCity: -------- :: GEOIP_COUNTRY_CODE GEOIP_COUNTRY_CODE3 GEOIP_COUNTRY_NAME GEOIP_CITY_NAME GEOIP_CITY_POSTAL_CODE GEOIP_CITY_LATITUDE GEOIP_CITY_LONG_LATITUDE GEOIP_CITY_DMA_CODE GEOIP_CITY_AREA_CODE Examples ======== mod_geoip + php --------------- NOTE: in lighttpd 1.5.x add the config vars only to the global config - adding into a vhost crashes lighty! when using fastcgi (not only php) you can access mod_geoip env and do as you please. this example just prints all mod_geoip envs to the client, html. Config-file :: geoip.db-filename = "/your-geoip-db-path/GeoLiteCity.dat" geoip.memory-cache = "enable" index.php :: \n\n\t
\n"; echo 'Country Code: ' . $country_code . '
'; echo 'Country Code 3: ' . $country_code3 . '
'; echo 'Country Name: ' . $country_name . '
'; echo '
'; echo 'City Region: ' . $city_region . '
'; echo 'City Name: ' . $city_name . '
'; echo 'City Postal Code: ' . $city_postal_code . '
'; echo 'City Latitude: ' . $city_latitude . '
'; echo 'City Long Latitude: ' . $city_long_latitude . '
'; echo 'City DMA Code: ' . $city_dma_code . '
'; echo 'City Area Code: ' . $city_area_code . '
'; echo "\n"; ?> country based redirect ---------------------- Config-file :: $HTTP["host"] =~ "www.domain.com" { url.rewrite = ( "" => "/redirect.php") } redirect.php :: .. note:: Currently it is not possible to redirect based on mod_geoip directly in lighttpd config file. But i believe with the relase of lighttpd mod_magnet it would be. (mod_magnet will be available in lighttpd 1.4.12+) Downloads ========= mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c) mod_geoip.c for lighttpd 1.5.x (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.4.c) Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/F-7/lighttpd.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- lighttpd.spec 4 Mar 2008 10:44:13 -0000 1.36 +++ lighttpd.spec 4 Mar 2008 11:07:50 -0000 1.37 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.18 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -15,7 +15,10 @@ Source12: powered_by_fedora.png Source13: http://www.lighttpd.net/light_button.png Source14: http://www.lighttpd.net/light_logo.png +Source100: lighttpd-mod_geoip.c +Source101: lighttpd-mod_geoip.txt Patch0: lighttpd-1.4.17-defaultconf.patch +Patch1: lighttpd-1.4.18-mod_geoip.patch # Security fixes Patch10: lighttpd-1.4.18-Fix-372-and-1562.patch Patch11: lighttpd-1.4.18-mod_cgi-fix.patch @@ -51,16 +54,6 @@ --without : ldap gdbm lua (cml) -%package mod_mysql_vhost -Summary: Virtual host module for lighttpd that uses a MySQL database -Group: System Environment/Daemons -Requires: %{name} = %{version} -BuildRequires: mysql-devel - -%description mod_mysql_vhost -Virtual host module for lighttpd that uses a MySQL database. - - %package fastcgi Summary: FastCGI module and spawning helper for lighttpd and PHP configuration Group: System Environment/Daemons @@ -72,11 +65,34 @@ defaults needed for correct FastCGI behavior. +%package mod_geoip +Summary: GeoIP module for lighttpd to use for location lookups +Group: System Environment/Daemons +Requires: %{name} = %{version} +BuildRequires: GeoIP-devel + +%description mod_geoip +GeoIP module for lighttpd to use for location lookups. + + +%package mod_mysql_vhost +Summary: Virtual host module for lighttpd that uses a MySQL database +Group: System Environment/Daemons +Requires: %{name} = %{version} +BuildRequires: mysql-devel + +%description mod_mysql_vhost +Virtual host module for lighttpd that uses a MySQL database. + + %prep %setup -q %patch0 -p1 -b .defaultconf +%patch1 -p1 -b .mod_geoip %patch10 -p1 -b .Fix-372-and-1562 %patch11 -p1 -b .mod_cgi-fix +%{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c +%{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt %build @@ -166,18 +182,13 @@ %{_libdir}/lighttpd/ %exclude %{_libdir}/lighttpd/*.la %exclude %{_libdir}/lighttpd/mod_fastcgi.so +%exclude %{_libdir}/lighttpd/mod_geoip.so %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so %{_mandir}/man1/lighttpd.1* %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/ %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/ %{webroot}/ -%files mod_mysql_vhost -%defattr(-,root,root,-) -%doc doc/mysqlvhost.txt -%dir %{_libdir}/lighttpd/ -%{_libdir}/lighttpd/mod_mysql_vhost.so - %files fastcgi %defattr(-,root,root,-) %doc doc/fastcgi*.txt @@ -187,12 +198,28 @@ %{_libdir}/lighttpd/mod_fastcgi.so %{_mandir}/man1/spawn-fcgi.1* +%files mod_geoip +%defattr(-,root,root,-) +%doc mod_geoip.txt +%dir %{_libdir}/lighttpd/ +%{_libdir}/lighttpd/mod_geoip.so + +%files mod_mysql_vhost +%defattr(-,root,root,-) +%doc doc/mysqlvhost.txt +%dir %{_libdir}/lighttpd/ +%{_libdir}/lighttpd/mod_mysql_vhost.so + %changelog -* Tue Mar 4 2008 Matthias Saou 1.4.18-2 +* Tue Mar 4 2008 Matthias Saou 1.4.18-3 - Include patch for CVE-2008-0983 (crash when low on file descriptors). - Include patch for CVE-2008-1111 (cgi source disclosure). +* Tue Oct 16 2007 Matthias Saou 1.4.18-2 +- Include mod_geoip additional source, make it an optional sub-package. +- Reorder sub-packages alphabetically in spec file. + * Mon Sep 10 2007 Matthias Saou 1.4.18-1 - Update to 1.4.18. - Include newly installed lighttpd-angel ("angel" process meant to always run From fedora-extras-commits at redhat.com Tue Mar 4 11:09:05 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 4 Mar 2008 11:09:05 GMT Subject: rpms/lighttpd/EL-5 lighttpd-1.4.18-Fix-372-and-1562.patch, NONE, 1.1 lighttpd-1.4.18-mod_cgi-fix.patch, NONE, 1.1 lighttpd-1.4.18-mod_geoip.patch, NONE, 1.1 lighttpd-mod_geoip.c, NONE, 1.1 lighttpd-mod_geoip.txt, NONE, 1.1 lighttpd.spec, 1.35, 1.36 Message-ID: <200803041109.m24B95bV014253@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13946/EL-5 Modified Files: lighttpd.spec Added Files: lighttpd-1.4.18-Fix-372-and-1562.patch lighttpd-1.4.18-mod_cgi-fix.patch lighttpd-1.4.18-mod_geoip.patch lighttpd-mod_geoip.c lighttpd-mod_geoip.txt Log Message: Include security fixes, and backport geoip module from Fedora branches. lighttpd-1.4.18-Fix-372-and-1562.patch: --- NEW FILE lighttpd-1.4.18-Fix-372-and-1562.patch --- >From 6b77fd21b58b6bfc10bd01fd0ce4e5f4ced0d5d9 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Stefan=20B=C3=BChler?= Date: Wed, 13 Feb 2008 00:07:22 +0100 Subject: [PATCH] Fix #372 + #1562 --- src/fdevent_solaris_devpoll.c | 2 +- src/server.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c index f77daef..76414a4 100644 --- a/src/fdevent_solaris_devpoll.c +++ b/src/fdevent_solaris_devpoll.c @@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll(fdevents *ev, int timeout_ms) { int ret; dopoll.dp_timeout = timeout_ms; - dopoll.dp_nfds = ev->maxfds; + dopoll.dp_nfds = ev->maxfds - 1; dopoll.dp_fds = ev->devpollfds; ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll); diff --git a/src/server.c b/src/server.c index 052130a..585a973 100644 --- a/src/server.c +++ b/src/server.c @@ -697,9 +697,6 @@ int main (int argc, char **argv) { } } - /* #372: solaris need some fds extra for devpoll */ - if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10; - if (srv->event_handler == FDEVENT_HANDLER_SELECT) { srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200; } else { -- 1.5.3.8 lighttpd-1.4.18-mod_cgi-fix.patch: --- NEW FILE lighttpd-1.4.18-mod_cgi-fix.patch --- Index: lighttpd-1.4.x/src/mod_cgi.c =================================================================== --- lighttpd-1.4.x/src/mod_cgi.c (revision 2065) +++ lighttpd-1.4.x/src/mod_cgi.c (revision 2107) @@ -1005,4 +1005,5 @@ /* error */ log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno)); + return -1; break; default: { lighttpd-1.4.18-mod_geoip.patch: --- NEW FILE lighttpd-1.4.18-mod_geoip.patch --- diff -Naupr lighttpd-1.4.18.orig/src/Makefile.am lighttpd-1.4.18/src/Makefile.am --- lighttpd-1.4.18.orig/src/Makefile.am 2007-09-03 00:23:53.000000000 +0200 +++ lighttpd-1.4.18/src/Makefile.am 2007-10-16 19:13:56.000000000 +0200 @@ -241,6 +241,11 @@ mod_accesslog_la_SOURCES = mod_accesslog mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_accesslog_la_LIBADD = $(common_libadd) +lib_LTLIBRARIES += mod_geoip.la +mod_geoip_la_SOURCES = mod_geoip.c +mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP + hdr = server.h buffer.h network.h log.h keyvalue.h \ response.h request.h fastcgi.h chunk.h \ diff -Naupr lighttpd-1.4.18.orig/src/Makefile.in lighttpd-1.4.18/src/Makefile.in --- lighttpd-1.4.18.orig/src/Makefile.in 2007-09-09 21:55:29.000000000 +0200 +++ lighttpd-1.4.18/src/Makefile.in 2007-10-16 19:16:47.000000000 +0200 @@ -126,6 +126,12 @@ mod_accesslog_la_OBJECTS = $(am_mod_acce mod_accesslog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(mod_accesslog_la_LDFLAGS) $(LDFLAGS) -o $@ +mod_geoip_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_mod_geoip_la_OBJECTS = mod_geoip.lo +mod_geoip_la_OBJECTS = $(am_mod_geoip_la_OBJECTS) +mod_geoip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(mod_geoip_la_LDFLAGS) $(LDFLAGS) -o $@ mod_alias_la_DEPENDENCIES = $(am__DEPENDENCIES_2) am_mod_alias_la_OBJECTS = mod_alias.lo mod_alias_la_OBJECTS = $(am_mod_alias_la_OBJECTS) @@ -413,7 +419,7 @@ SOURCES = $(liblightcomp_la_SOURCES) $(m $(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \ $(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \ $(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \ - $(spawn_fcgi_SOURCES) + $(spawn_fcgi_SOURCES) $(mod_geoip_la_SOURCES) DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \ $(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \ $(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \ @@ -433,7 +439,7 @@ DIST_SOURCES = $(am__liblightcomp_la_SOU $(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \ $(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \ $(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \ - $(spawn_fcgi_SOURCES) + $(spawn_fcgi_SOURCES) $(mod_geoip_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -614,7 +620,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \ mod_simple_vhost.la mod_fastcgi.la mod_extforward.la \ mod_access.la mod_compress.la mod_auth.la mod_rewrite.la \ - mod_redirect.la mod_status.la mod_accesslog.la + mod_redirect.la mod_status.la mod_accesslog.la mod_geoip.la @NO_RDYNAMIC_TRUE at liblightcomp_la_SOURCES = $(common_src) @NO_RDYNAMIC_TRUE at liblightcomp_la_CFLAGS = $(AM_CFLAGS) @NO_RDYNAMIC_TRUE at liblightcomp_la_LDFLAGS = -avoid-version -no-undefined @@ -721,6 +727,9 @@ mod_status_la_LIBADD = $(common_libadd) mod_accesslog_la_SOURCES = mod_accesslog.c mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_accesslog_la_LIBADD = $(common_libadd) +mod_geoip_la_SOURCES = mod_geoip.c +mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP hdr = server.h buffer.h network.h log.h keyvalue.h \ response.h request.h fastcgi.h chunk.h \ settings.h http_chunk.h http_auth_digest.h \ @@ -822,6 +831,8 @@ mod_access.la: $(mod_access_la_OBJECTS) $(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_la_LIBADD) $(LIBS) mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES) $(mod_accesslog_la_LINK) -rpath $(libdir) $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_LIBADD) $(LIBS) +mod_geoip.la: $(mod_geoip_la_OBJECTS) $(mod_geoip_la_DEPENDENCIES) + $(mod_geoip_la_LINK) -rpath $(libdir) $(mod_geoip_la_OBJECTS) $(mod_geoip_la_LIBADD) $(LIBS) mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES) $(mod_alias_la_LINK) -rpath $(libdir) $(mod_alias_la_OBJECTS) $(mod_alias_la_LIBADD) $(LIBS) mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES) @@ -1043,6 +1054,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_access.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_accesslog.Plo at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_geoip.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_alias.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_auth.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_cgi.Plo at am__quote@ --- NEW FILE lighttpd-mod_geoip.c --- #include #include #include #include #include #include "base.h" #include "log.h" #include "buffer.h" #include "plugin.h" #ifdef HAVE_CONFIG_H #include "config.h" #endif /** * * $mod_geoip.c (v2.0) (13.09.2006 00:29:11) * * Name: * mod_geoip.c * * Description: * GeoIP module (plugin) for lighttpd. * the module loads a geoip database of type "country" or "city" and * sets new ENV vars based on ip record lookups. * * country db env's: * GEOIP_COUNTRY_CODE * GEOIP_COUNTRY_CODE3 * GEOIP_COUNTRY_NAME * * city db env's: * GEOIP_COUNTRY_CODE * GEOIP_COUNTRY_CODE3 * GEOIP_COUNTRY_NAME * GEOIP_CITY_NAME * GEOIP_CITY_POSTAL_CODE * GEOIP_CITY_LATITUDE * GEOIP_CITY_LONG_LATITUDE * GEOIP_CITY_DMA_CODE * GEOIP_CITY_AREA_CODE * * Usage (configuration options): * geoip.db-filename = * geoip.memory-cache = : default disabled * if enabled, mod_geoip will load the database binary file to * memory for very fast lookups. the only penalty is memory usage. * * Author: * Ami E. Bizamcher (amix) * duke.amix at gmail.com * * Note: * GeoIP Library and API must be installed! */ /* plugin config for all request/connections */ typedef struct { unsigned short mem_cache; buffer *db_name; GeoIP *gi; } plugin_config; typedef struct { PLUGIN_DATA; plugin_config **config_storage; plugin_config conf; } plugin_data; /* init the plugin data */ INIT_FUNC(mod_geoip_init) { plugin_data *p; p = calloc(1, sizeof(*p)); return p; } /* detroy the plugin data */ FREE_FUNC(mod_geoip_free) { plugin_data *p = p_d; UNUSED(srv); if (!p) return HANDLER_GO_ON; if (p->config_storage) { size_t i; for (i = 0; i < srv->config_context->used; i++) { plugin_config *s = p->config_storage[i]; if (!s) continue; buffer_free(s->db_name); /* clean up */ GeoIP_delete(s->gi); free(s); } free(p->config_storage); } free(p); return HANDLER_GO_ON; } /* handle plugin config and check values */ SETDEFAULTS_FUNC(mod_geoip_set_defaults) { plugin_data *p = p_d; size_t i = 0; config_values_t cv[] = { { "geoip.db-filename", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 0 */ { "geoip.memory-cache", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */ { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } }; if (!p) return HANDLER_ERROR; p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; int mode; s = calloc(1, sizeof(plugin_config)); s->db_name = buffer_init(); s->mem_cache = 0; /* default: do not load db to cache */ s->gi = NULL; cv[0].destination = s->db_name; cv[1].destination = &(s->mem_cache); p->config_storage[i] = s; if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv)) { return HANDLER_ERROR; } mode = GEOIP_STANDARD | GEOIP_CHECK_CACHE; /* country db filename is requeried! */ if (!buffer_is_empty(s->db_name)) { /* let's start cooking */ if (s->mem_cache != 0) mode = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE; if (NULL == (s->gi = GeoIP_open(s->db_name->ptr, mode))) { log_error_write(srv, __FILE__, __LINE__, "s", "failed to open GeoIP database!!!"); return HANDLER_ERROR; } /* is the db supported ? */ if (s->gi->databaseType != GEOIP_COUNTRY_EDITION && s->gi->databaseType != GEOIP_CITY_EDITION_REV0 && s->gi->databaseType != GEOIP_CITY_EDITION_REV1) { log_error_write(srv, __FILE__, __LINE__, "s", "GeoIP database is of unsupported type!!!"); } } } return HANDLER_GO_ON; } #define PATCH(x) \ p->conf.x = s->x; static int mod_geoip_patch_connection(server *srv, connection *con, plugin_data *p) { size_t i, j; plugin_config *s = p->config_storage[0]; PATCH(db_name); PATCH(mem_cache); PATCH(gi); /* skip the first, the global context */ for (i = 1; i < srv->config_context->used; i++) { data_config *dc = (data_config *)srv->config_context->data[i]; s = p->config_storage[i]; /* condition didn't match */ if (!config_check_cond(srv, con, dc)) continue; /* merge config */ for (j = 0; j < dc->value->used; j++) { data_unset *du = dc->value->data[j]; if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.db-filename"))) { PATCH(db_name); } if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.memory-cache"))) { PATCH(mem_cache); } } } return 0; } #undef PATCH URIHANDLER_FUNC(mod_geoip_subrequest) { plugin_data *p = p_d; mod_geoip_patch_connection(srv, con, p); if (!buffer_is_empty(p->conf.db_name)) { const char *remote_ip; GeoIP *gi; data_string *ds; const char *returnedCountry; remote_ip = inet_ntop_cache_get_ip(srv, &(con->dst_addr)); if (p->conf.gi->databaseType == GEOIP_COUNTRY_EDITION) { /* get the country code 2 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE"))) { if (NULL != (returnedCountry = GeoIP_country_code_by_addr(p->conf.gi, remote_ip))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE"); buffer_copy_string(ds->value, returnedCountry); array_insert_unique(con->environment, (data_unset *)ds); } } /* get the country code 3 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE3"))) { if (NULL != (returnedCountry = GeoIP_country_code3_by_addr(p->conf.gi, remote_ip))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE3"); buffer_copy_string(ds->value, returnedCountry); array_insert_unique(con->environment, (data_unset *)ds); } } /* get the country name */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_NAME"))) { if (NULL != (returnedCountry = GeoIP_country_name_by_addr(p->conf.gi, remote_ip))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_NAME"); buffer_copy_string(ds->value, returnedCountry); array_insert_unique(con->environment, (data_unset *)ds); } } /* go on... */ return HANDLER_GO_ON; } /* if we are here, geo city is in use */ GeoIPRecord * gir; if (NULL != (gir = GeoIP_record_by_addr(p->conf.gi, remote_ip))) { /* get the country code 2 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE"); buffer_copy_string(ds->value, gir->country_code); array_insert_unique(con->environment, (data_unset *)ds); } /* get the country code 3 chars */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE3"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE3"); buffer_copy_string(ds->value, gir->country_code3); array_insert_unique(con->environment, (data_unset *)ds); } /* get the country name */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_NAME"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_COUNTRY_NAME"); buffer_copy_string(ds->value, gir->country_name); array_insert_unique(con->environment, (data_unset *)ds); } /* get the city region */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_REGION"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_CITY_REGION"); buffer_copy_string(ds->value, gir->region); array_insert_unique(con->environment, (data_unset *)ds); } /* get the city */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_NAME"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_CITY_NAME"); buffer_copy_string(ds->value, gir->city); array_insert_unique(con->environment, (data_unset *)ds); } /* get the postal code */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_POSTAL_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } buffer_copy_string(ds->key, "GEOIP_CITY_POSTAL_CODE"); buffer_copy_string(ds->value, gir->postal_code); array_insert_unique(con->environment, (data_unset *)ds); } /* get the latitude */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_LATITUDE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char latitude[32]; sprintf(&latitude, "%f", gir->latitude); buffer_copy_string(ds->key, "GEOIP_CITY_LATITUDE"); buffer_copy_string(ds->value, latitude); array_insert_unique(con->environment, (data_unset *)ds); } /* get the long latitude */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_LONG_LATITUDE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char long_latitude[32]; sprintf(&long_latitude, "%f", gir->longitude); buffer_copy_string(ds->key, "GEOIP_CITY_LONG_LATITUDE"); buffer_copy_string(ds->value, long_latitude); array_insert_unique(con->environment, (data_unset *)ds); } /* get the dma code */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_DMA_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char dc[5]; sprintf(&dc, "%i", gir->dma_code); buffer_copy_string(ds->key, "GEOIP_CITY_DMA_CODE"); buffer_copy_string(ds->value, dc); array_insert_unique(con->environment, (data_unset *)ds); } /* get the area code */ if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_AREA_CODE"))) { if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { ds = data_string_init(); } char ac[5]; sprintf(&ac, "%i", gir->area_code); buffer_copy_string(ds->key, "GEOIP_CITY_AREA_CODE"); buffer_copy_string(ds->value, ac); array_insert_unique(con->environment, (data_unset *)ds); } } } /* keep walking... (johnnie walker style ;) */ return HANDLER_GO_ON; } /* this function is called at dlopen() time and inits the callbacks */ int mod_geoip_plugin_init(plugin *p) { p->version = LIGHTTPD_VERSION_ID; p->name = buffer_init_string("geoip"); p->init = mod_geoip_init; p->handle_subrequest_start = mod_geoip_subrequest; p->set_defaults = mod_geoip_set_defaults; p->cleanup = mod_geoip_free; p->data = NULL; return 0; } --- NEW FILE lighttpd-mod_geoip.txt --- ============================== ip based geographic lookups... ============================== ----------------- Module: mod_geoip ----------------- .. contents:: Table of Contents Requirements ============ :Packages: GeoIP C API & Library (http://www.maxmind.com/download/geoip/api/c/) Overview ============ mod_geoip is a module for fast ip/location lookups. It uses MaxMind GeoIP / GeoCity databases. If the ip was found in the database the module sets the appropriate environments variables to the request, thus making other modules/fcgi be informed. .. note:: Currently only country/city databases are supported because they have a free version that i can test. (http://www.maxmind.com/download/geoip/database/ - GeoIP.dat.gz for Countries, GeoLiteCity.dat.gz for Countries & Cities) Installation ============ NOTE: As of 1.4.14 the lighttpd distribution does not include the compile file required to perform a automake in the source directory. Use "automake -a" instead. 1) Download mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c) - (for lighttpd 1.5 use http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.4.c and rename it to mod_geoip.c) 2) Copy mod_geoip.c into lighttpd src directory. 3) Edit your src/Makefile.am and add this after the last module: :: lib_LTLIBRARIES += mod_geoip.la mod_geoip_la_SOURCES = mod_geoip.c mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP 4) Go back to lighttpd root directory and first do: aclocal && automake -a && autoconf, after that do: make clean; ./configure --enable-maintainer-mode; make; make install Note: the command of 'make clean' gives error on Fedora 4 and may not be necessary to compile properly. [j lightstone//GlobalAdSales.company] 5) Make sure /usr/local/lib is in your ld.so.conf file and rebuld the ld database (using: ldconfig). 6) Add to the config file server.modules = ("mod_geoip") [j lightstone//GlobalAdSales.company] Configuration Options ======================== NOTE: in lighttpd 1.5.x add the config vars only to the global config - adding into a vhost crashes lighty! mod_geoip uses two configuration options. 1) geoip.db-filename = 2) geoip.memory-cache = : default disabled if enabled, mod_geoip will load the database binary file to memory for very fast lookups. the only penalty is memory usage. .. note:: mod_geoip will determine the database type automatically so if you enter GeoCity databse path it will load GeoCity Env. Environment =========== Every database sets it's own ENV: GeoIP (Country): ---------------- :: GEOIP_COUNTRY_CODE GEOIP_COUNTRY_CODE3 GEOIP_COUNTRY_NAME GeoCity: -------- :: GEOIP_COUNTRY_CODE GEOIP_COUNTRY_CODE3 GEOIP_COUNTRY_NAME GEOIP_CITY_NAME GEOIP_CITY_POSTAL_CODE GEOIP_CITY_LATITUDE GEOIP_CITY_LONG_LATITUDE GEOIP_CITY_DMA_CODE GEOIP_CITY_AREA_CODE Examples ======== mod_geoip + php --------------- NOTE: in lighttpd 1.5.x add the config vars only to the global config - adding into a vhost crashes lighty! when using fastcgi (not only php) you can access mod_geoip env and do as you please. this example just prints all mod_geoip envs to the client, html. Config-file :: geoip.db-filename = "/your-geoip-db-path/GeoLiteCity.dat" geoip.memory-cache = "enable" index.php :: \n\n\t
\n"; echo 'Country Code: ' . $country_code . '
'; echo 'Country Code 3: ' . $country_code3 . '
'; echo 'Country Name: ' . $country_name . '
'; echo '
'; echo 'City Region: ' . $city_region . '
'; echo 'City Name: ' . $city_name . '
'; echo 'City Postal Code: ' . $city_postal_code . '
'; echo 'City Latitude: ' . $city_latitude . '
'; echo 'City Long Latitude: ' . $city_long_latitude . '
'; echo 'City DMA Code: ' . $city_dma_code . '
'; echo 'City Area Code: ' . $city_area_code . '
'; echo "\n"; ?> country based redirect ---------------------- Config-file :: $HTTP["host"] =~ "www.domain.com" { url.rewrite = ( "" => "/redirect.php") } redirect.php :: .. note:: Currently it is not possible to redirect based on mod_geoip directly in lighttpd config file. But i believe with the relase of lighttpd mod_magnet it would be. (mod_magnet will be available in lighttpd 1.4.12+) Downloads ========= mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c) mod_geoip.c for lighttpd 1.5.x (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.4.c) Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/EL-5/lighttpd.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- lighttpd.spec 10 Sep 2007 15:45:36 -0000 1.35 +++ lighttpd.spec 4 Mar 2008 11:08:09 -0000 1.36 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.18 -Release: 1%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -15,7 +15,13 @@ Source12: powered_by_fedora.png Source13: http://www.lighttpd.net/light_button.png Source14: http://www.lighttpd.net/light_logo.png +Source100: lighttpd-mod_geoip.c +Source101: lighttpd-mod_geoip.txt Patch0: lighttpd-1.4.17-defaultconf.patch +Patch1: lighttpd-1.4.18-mod_geoip.patch +# Security fixes +Patch10: lighttpd-1.4.18-Fix-372-and-1562.patch +Patch11: lighttpd-1.4.18-mod_cgi-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig @@ -48,16 +54,6 @@ --without : ldap gdbm lua (cml) -%package mod_mysql_vhost -Summary: Virtual host module for lighttpd that uses a MySQL database -Group: System Environment/Daemons -Requires: %{name} = %{version} -BuildRequires: mysql-devel - -%description mod_mysql_vhost -Virtual host module for lighttpd that uses a MySQL database. - - %package fastcgi Summary: FastCGI module and spawning helper for lighttpd and PHP configuration Group: System Environment/Daemons @@ -69,9 +65,34 @@ defaults needed for correct FastCGI behavior. +%package mod_geoip +Summary: GeoIP module for lighttpd to use for location lookups +Group: System Environment/Daemons +Requires: %{name} = %{version} +BuildRequires: GeoIP-devel + +%description mod_geoip +GeoIP module for lighttpd to use for location lookups. + + +%package mod_mysql_vhost +Summary: Virtual host module for lighttpd that uses a MySQL database +Group: System Environment/Daemons +Requires: %{name} = %{version} +BuildRequires: mysql-devel + +%description mod_mysql_vhost +Virtual host module for lighttpd that uses a MySQL database. + + %prep %setup -q %patch0 -p1 -b .defaultconf +%patch1 -p1 -b .mod_geoip +%patch10 -p1 -b .Fix-372-and-1562 +%patch11 -p1 -b .mod_cgi-fix +%{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c +%{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt %build @@ -161,18 +182,13 @@ %{_libdir}/lighttpd/ %exclude %{_libdir}/lighttpd/*.la %exclude %{_libdir}/lighttpd/mod_fastcgi.so +%exclude %{_libdir}/lighttpd/mod_geoip.so %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so %{_mandir}/man1/lighttpd.1* %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/ %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/ %{webroot}/ -%files mod_mysql_vhost -%defattr(-,root,root,-) -%doc doc/mysqlvhost.txt -%dir %{_libdir}/lighttpd/ -%{_libdir}/lighttpd/mod_mysql_vhost.so - %files fastcgi %defattr(-,root,root,-) %doc doc/fastcgi*.txt @@ -182,8 +198,28 @@ %{_libdir}/lighttpd/mod_fastcgi.so %{_mandir}/man1/spawn-fcgi.1* +%files mod_geoip +%defattr(-,root,root,-) +%doc mod_geoip.txt +%dir %{_libdir}/lighttpd/ +%{_libdir}/lighttpd/mod_geoip.so + +%files mod_mysql_vhost +%defattr(-,root,root,-) +%doc doc/mysqlvhost.txt +%dir %{_libdir}/lighttpd/ +%{_libdir}/lighttpd/mod_mysql_vhost.so + %changelog +* Tue Mar 4 2008 Matthias Saou 1.4.18-3 +- Include patch for CVE-2008-0983 (crash when low on file descriptors). +- Include patch for CVE-2008-1111 (cgi source disclosure). + +* Tue Oct 16 2007 Matthias Saou 1.4.18-2 +- Include mod_geoip additional source, make it an optional sub-package. +- Reorder sub-packages alphabetically in spec file. + * Mon Sep 10 2007 Matthias Saou 1.4.18-1 - Update to 1.4.18. - Include newly installed lighttpd-angel ("angel" process meant to always run From fedora-extras-commits at redhat.com Tue Mar 4 11:22:51 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 11:22:51 GMT Subject: rpms/ghostscript/devel .cvsignore, 1.25, 1.26 ghostscript.spec, 1.164, 1.165 sources, 1.29, 1.30 ghostscript-8.57-ijs-krgb.patch, 1.2, NONE ghostscript-gsbug689577.patch, 1.1, NONE Message-ID: <200803041122.m24BMp17015428@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/ghostscript/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15342 Modified Files: .cvsignore ghostscript.spec sources Removed Files: ghostscript-8.57-ijs-krgb.patch ghostscript-gsbug689577.patch Log Message: * Tue Mar 4 2008 Tim Waugh 8.62-1 - 8.62. No longer need IJS KRGB patch, or patch for gs bug 689577. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 23 Nov 2007 10:11:06 -0000 1.25 +++ .cvsignore 4 Mar 2008 11:22:12 -0000 1.26 @@ -21,3 +21,4 @@ ghostscript-8.60-r8117.tar.bz2 ghostscript-8.60.tar.bz2 ghostscript-8.61.tar.bz2 +ghostscript-8.62.tar.bz2 Index: ghostscript.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- ghostscript.spec 27 Feb 2008 17:11:11 -0000 1.164 +++ ghostscript.spec 4 Mar 2008 11:22:12 -0000 1.165 @@ -1,11 +1,11 @@ -%define gs_ver 8.61 -%define gs_dot_ver 8.61 +%define gs_ver 8.62 +%define gs_dot_ver 8.62 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}} Summary: A PostScript(TM) interpreter and renderer. Name: ghostscript Version: %{gs_ver} -Release: 10%{?dist} +Release: 1%{?dist} License: GPLv2 URL: http://www.ghostscript.com/ @@ -18,9 +18,7 @@ Patch2: ghostscript-scripts.patch Patch3: ghostscript-noopt.patch Patch4: ghostscript-fPIC.patch -Patch5: http://www.openprinting.org/download/printing/esp-gpl-ghostscript-merge/ghostscript-8.57-ijs-krgb.patch Patch6: ghostscript-runlibfileifexists.patch -Patch7: ghostscript-gsbug689577.patch Patch8: ghostscript-system-jasper.patch Patch9: ghostscript-CVE-2008-0411.patch @@ -90,15 +88,9 @@ # Fix shared library build. %patch4 -p1 -b .fPIC -# IJS KRGB patch. -%patch5 -p1 -b .ijs-krgb - # Define .runlibfileifexists. %patch6 -p1 -b .runlibfileifexists -# Upstream patch for bug #416321. -%patch7 -p1 -b .gsbug689577 - %patch8 -p1 -b .system-jasper %patch9 -p1 -b .CVE-2008-0411 @@ -273,6 +265,9 @@ %{_libdir}/libgs.so %changelog +* Tue Mar 4 2008 Tim Waugh 8.62-1 +- 8.62. No longer need IJS KRGB patch, or patch for gs bug 689577. + * Wed Feb 27 2008 Tim Waugh 8.61-10 - Applied patch to fix CVE-2008-0411 (bug #431536). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 23 Nov 2007 10:11:06 -0000 1.29 +++ sources 4 Mar 2008 11:22:12 -0000 1.30 @@ -1,3 +1,3 @@ 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz -abff0506cd249cba3ad862d8fe4f6474 ghostscript-8.61.tar.bz2 +40d673a3c6e11d2bf14f972b84551104 ghostscript-8.62.tar.bz2 --- ghostscript-8.57-ijs-krgb.patch DELETED --- --- ghostscript-gsbug689577.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 11:25:24 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 11:25:24 GMT Subject: rpms/ghostscript/devel ghostscript.spec,1.165,1.166 Message-ID: <200803041125.m24BPOJf015665@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/ghostscript/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15595 Modified Files: ghostscript.spec Log Message: Renumbered patches. Index: ghostscript.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- ghostscript.spec 4 Mar 2008 11:22:12 -0000 1.165 +++ ghostscript.spec 4 Mar 2008 11:24:42 -0000 1.166 @@ -18,9 +18,9 @@ Patch2: ghostscript-scripts.patch Patch3: ghostscript-noopt.patch Patch4: ghostscript-fPIC.patch -Patch6: ghostscript-runlibfileifexists.patch -Patch8: ghostscript-system-jasper.patch -Patch9: ghostscript-CVE-2008-0411.patch +Patch5: ghostscript-runlibfileifexists.patch +Patch6: ghostscript-system-jasper.patch +Patch7: ghostscript-CVE-2008-0411.patch Requires: urw-fonts >= 1.1, ghostscript-fonts BuildRequires: libjpeg-devel, libXt-devel @@ -89,11 +89,11 @@ %patch4 -p1 -b .fPIC # Define .runlibfileifexists. -%patch6 -p1 -b .runlibfileifexists +%patch5 -p1 -b .runlibfileifexists -%patch8 -p1 -b .system-jasper +%patch6 -p1 -b .system-jasper -%patch9 -p1 -b .CVE-2008-0411 +%patch7 -p1 -b .CVE-2008-0411 # Convert manual pages to UTF-8 from8859_1() { From fedora-extras-commits at redhat.com Tue Mar 4 11:45:01 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 4 Mar 2008 11:45:01 GMT Subject: rpms/lighttpd/EL-4 lighttpd.spec,1.10,1.11 Message-ID: <200803041145.m24Bj1tQ017338@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17253 Modified Files: lighttpd.spec Log Message: Disable lua on EL4 because the EPEL lua version is too old. Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/EL-4/lighttpd.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- lighttpd.spec 4 Mar 2008 11:08:03 -0000 1.10 +++ lighttpd.spec 4 Mar 2008 11:44:14 -0000 1.11 @@ -1,5 +1,8 @@ %define webroot /srv/www/lighttpd +# LUA support requires >= 5.1 but EPEL4 provides only 5.0, so disable +%{?el4: %define _without_lua foo} + Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.18 @@ -33,11 +36,11 @@ %{?_with_gamin:BuildRequires: gamin-devel} %{!?_without_gdbm:BuildRequires: gdbm-devel} %{!?_without_lua:BuildRequires: lua-devel} -# On Fedora <= 6 (and RHEL?), we still need this because of the "broken" lua +# On Fedora <= 6 (and RHEL5), we still need this because of the "broken" lua %if %{!?fedora:0}%{?fedora} <= 6 BuildRequires: readline-devel %endif -%if 0%{?el} <= 6 +%if 0%{?el} <= 5 BuildRequires: readline-devel %endif @@ -106,7 +109,7 @@ %{?_with_webdavlocks:--with-webdav-locks} \ %{!?_without_gdbm:--with-gdbm} \ %{?_with_memcache:--with-memcache} \ - %{?!_without_lua:--with-lua} + %{!?_without_lua:--with-lua} %{__make} %{?_smp_mflags} @@ -215,6 +218,7 @@ * Tue Mar 4 2008 Matthias Saou 1.4.18-3 - Include patch for CVE-2008-0983 (crash when low on file descriptors). - Include patch for CVE-2008-1111 (cgi source disclosure). +- Disable lua on EL4 because the EPEL lua version is too old. * Tue Oct 16 2007 Matthias Saou 1.4.18-2 - Include mod_geoip additional source, make it an optional sub-package. From fedora-extras-commits at redhat.com Tue Mar 4 11:47:05 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 11:47:05 GMT Subject: rpms/lbrickbuster2/devel lbrickbuster2-callback-fix.patch, NONE, 1.1 lbrickbuster2-default-fullscreen.patch, NONE, 1.1 lbrickbuster2-rebrand-images.patch, NONE, 1.1 lbrickbuster2-save-shared-hiscore.patch, NONE, 1.1 lbrickbuster2.desktop, NONE, 1.1 lbrickbuster2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041147.m24Bl5mJ017592@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lbrickbuster2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17483/devel Modified Files: .cvsignore sources Added Files: lbrickbuster2-callback-fix.patch lbrickbuster2-default-fullscreen.patch lbrickbuster2-rebrand-images.patch lbrickbuster2-save-shared-hiscore.patch lbrickbuster2.desktop lbrickbuster2.spec Log Message: initial lbrickbuster2 import lbrickbuster2-callback-fix.patch: --- NEW FILE lbrickbuster2-callback-fix.patch --- --- lbreakout2-2.6beta-7/client/menu.c 2005-02-16 22:07:31.000000000 +0100 +++ lbreakout2-2.6beta-7.new/client/menu.c 2008-02-28 22:20:46.000000000 +0100 @@ -201,6 +201,9 @@ case SDLK_RIGHT: if ( !menu->cur_item ) break; item_used = 1; + /* callback */ + callback = menu->cur_item->callback; + /* action */ switch ( menu->cur_item->type ) { case ITEM_SWITCH: case ITEM_SWITCH_X: @@ -210,13 +213,18 @@ default: item_used = 0; break; } #ifdef AUDIO_ENABLED - if ( item_used ) + if ( item_used ) { stk_sound_play( wav_menu_click ); #endif + if ( callback ) (callback)(); + } break; case SDLK_LEFT: if ( !menu->cur_item ) break; item_used = 1; + /* callback */ + callback = menu->cur_item->callback; + /* action */ switch ( menu->cur_item->type ) { case ITEM_SWITCH: case ITEM_SWITCH_X: @@ -226,9 +234,11 @@ default: item_used = 0; break; } #ifdef AUDIO_ENABLED - if ( item_used ) + if ( item_used ) { stk_sound_play( wav_menu_click ); #endif + if ( callback ) (callback)(); + } break; case SDLK_UP: menu_up( menu ); lbrickbuster2-default-fullscreen.patch: --- NEW FILE lbrickbuster2-default-fullscreen.patch --- diff -up lbreakout2-2.6beta-7/client/config.c~ lbreakout2-2.6beta-7/client/config.c --- lbreakout2-2.6beta-7/client/config.c~ 2008-03-04 11:47:59.000000000 +0100 +++ lbreakout2-2.6beta-7/client/config.c 2008-03-04 11:47:59.000000000 +0100 @@ -104,7 +104,7 @@ void config_reset() config.audio_buffer_size = 512; /* graphics */ config.anim = 2; - config.fullscreen = 0; + config.fullscreen = 1; config.fade = 1; config.bonus_info = 1; config.fps = 0; lbrickbuster2-rebrand-images.patch: --- NEW FILE lbrickbuster2-rebrand-images.patch --- diff -up lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.am~ lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.am --- lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.am~ 2008-02-28 20:31:45.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.am 2008-02-28 20:31:45.000000000 +0100 @@ -1,6 +1,5 @@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png back5.png \ -bricks.png extras.png fr_left.png fr_right.png fr_top.png \ -life.png menuback.png paddle.png shot.png weapon.png \ +bricks.png extras.png life.png paddle.png shot.png weapon.png \ ABOUT README install-data-local: diff -up lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.am~ lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.am --- lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.am~ 2008-02-28 20:32:27.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.am 2008-02-28 20:32:27.000000000 +0100 @@ -1,6 +1,5 @@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png back5.png \ -bricks.png extras.png fr_left.png fr_right.png fr_top.png \ -fr_mp_left.png fr_mp_right.png \ +bricks.png extras.png \ life.png paddle.png \ ABOUT diff -up lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.am~ lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.am --- lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.am~ 2008-02-28 20:32:47.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.am 2008-02-28 20:32:47.000000000 +0100 @@ -1,5 +1,5 @@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png \ -bricks.png fr_left.png fr_right.png fr_top.png \ +bricks.png \ life.png paddle.png \ README diff -up lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.in~ lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.in --- lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.in~ 2008-02-28 20:32:05.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.in 2008-02-28 20:32:05.000000000 +0100 @@ -195,8 +195,7 @@ warp_flag = @warp_flag@ win32_deps = @win32_deps@ win32_inst_script = @win32_inst_script@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png back5.png \ -bricks.png extras.png fr_left.png fr_right.png fr_top.png \ -life.png menuback.png paddle.png shot.png weapon.png \ +bricks.png extras.png life.png paddle.png shot.png weapon.png \ ABOUT README all: all-am diff -up lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.in~ lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.in --- lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.in~ 2008-02-28 20:32:37.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.in 2008-02-28 20:32:37.000000000 +0100 @@ -195,8 +195,7 @@ warp_flag = @warp_flag@ win32_deps = @win32_deps@ win32_inst_script = @win32_inst_script@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png back5.png \ -bricks.png extras.png fr_left.png fr_right.png fr_top.png \ -fr_mp_left.png fr_mp_right.png \ +bricks.png extras.png \ life.png paddle.png \ ABOUT diff -up lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.in~ lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.in --- lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.in~ 2008-02-28 20:32:55.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.in 2008-02-28 20:32:55.000000000 +0100 @@ -195,7 +195,7 @@ warp_flag = @warp_flag@ win32_deps = @win32_deps@ win32_inst_script = @win32_inst_script@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png \ -bricks.png fr_left.png fr_right.png fr_top.png \ +bricks.png \ life.png paddle.png \ README lbrickbuster2-save-shared-hiscore.patch: --- NEW FILE lbrickbuster2-save-shared-hiscore.patch --- diff -up lbreakout2-2.6beta-7/client/main.c~ lbreakout2-2.6beta-7/client/main.c --- lbreakout2-2.6beta-7/client/main.c~ 2008-02-29 19:06:20.000000000 +0100 +++ lbreakout2-2.6beta-7/client/main.c 2008-02-29 19:23:55.000000000 +0100 @@ -19,6 +19,11 @@ #include #endif +#ifdef __unix__ +#define _GNU_SOURCE /* this must be done before the first include of unistd.h */ +#include +#endif + #include "lbreakout.h" #include "../game/game.h" #include "file.h" @@ -34,6 +39,8 @@ #include "client.h" #include "../gui/gui.h" +#define CHART_FILE_NAME "lbrickbuster2.hscr" + extern int stk_quit_request; extern SDL_Surface *stk_display; extern Config config; @@ -49,6 +56,8 @@ extern int gameSeed; char msgbuf[MAX_MSG_SIZE]; int msglen = 0; +FILE *hi_dir_chart_file = NULL; + int main(int argc, char *argv[]) { int result = ACTION_NONE; @@ -56,6 +65,19 @@ int main(int argc, char *argv[]) char *editor_file = 0; char path[512]; SDL_Surface *loading; +#ifdef __unix__ + gid_t realgid; + + hi_dir_chart_file = fopen(HI_DIR "/" CHART_FILE_NAME, "r+"); + + /* This is where we drop our setuid/setgid privileges. + */ + realgid = getgid(); + if (setresgid(-1, realgid, realgid) != 0) { + perror("Could not drop setgid privileges. Aborting."); + exit(1); + } +#endif /* i18n */ #ifdef ENABLE_NLS @@ -211,6 +233,9 @@ int main(int argc, char *argv[]) stk_surface_free( &loading ); config_save(); + + if (hi_dir_chart_file) + fclose(hi_dir_chart_file); return EXIT_SUCCESS; } diff -up lbreakout2-2.6beta-7/client/chart.c~ lbreakout2-2.6beta-7/client/chart.c --- lbreakout2-2.6beta-7/client/chart.c~ 2008-02-29 19:10:47.000000000 +0100 +++ lbreakout2-2.6beta-7/client/chart.c 2008-02-29 19:20:48.000000000 +0100 @@ -31,6 +31,7 @@ int chart_level_offset = 0; /* level off extern SDL_Surface *stk_display; extern Config config; extern StkFont *cfont, *chfont, *ccfont; /* normal, highlight and caption font */ +extern FILE *hi_dir_chart_file; /* ==================================================================== @@ -121,8 +122,16 @@ int chart_load_from_path( char *path ) sprintf( file_name, "%s/%s", path, CHART_FILE_NAME ); /* clear chart list */ list_clear( charts ); - /* open file */ - file = fopen( file_name, "rb" ); + + if (!strcmp(path, HI_DIR) && hi_dir_chart_file) { + file = hi_dir_chart_file; + rewind(hi_dir_chart_file); + } + else { + /* open file */ + file = fopen( file_name, "rb" ); + } + if ( file ) { /* test if it's new format or old one. */ fread( aux, sizeof( char ), 3, file ); aux[3] = 0; @@ -152,20 +161,23 @@ int chart_load_from_path( char *path ) chart_read_entries( file, file_name, chart ); list_add( charts, chart ); } - fclose( file ); + if (file != hi_dir_chart_file) + fclose( file ); } else { fprintf( stderr, _("Highscore chart doesn't exist in '%s'... creating new one.\n"), path ); chart = chart_set_create( "LBreakout2" ); list_add( charts, chart ); } - /* test if writing is allowed without changing actual contents */ - if ( ( file = fopen( file_name, "a" ) ) == 0 ) { - fprintf( stderr, _("Write permission for '%s' denied.\n"), file_name ); - return 0; + if (file != hi_dir_chart_file) { + /* test if writing is allowed without changing actual contents */ + if ( ( file = fopen( file_name, "a" ) ) == 0 ) { + fprintf( stderr, _("Write permission for '%s' denied.\n"), file_name ); + return 0; + } + else + fclose( file ); } - else - fclose( file ); strcpy( chart_path, path ); chart_loaded = 1; return 1; @@ -232,8 +244,16 @@ void chart_save() if ( !chart_loaded ) return; /* full file name */ sprintf( file_name, "%s/%s", chart_path, CHART_FILE_NAME ); - /* open file */ - file = fopen( file_name, "w" ); + + if (!strcmp(chart_path, HI_DIR) && hi_dir_chart_file) { + file = hi_dir_chart_file; + rewind(hi_dir_chart_file); + } + else { + /* open file */ + file = fopen( file_name, "w" ); + } + if ( !file ) { fprintf( stderr, _("??? Highscore chart loaded properly but cannot save? (%s)\n"),file_name ); return; @@ -245,7 +265,9 @@ void chart_save() for ( i = 0; i < CHART_ENTRY_COUNT; i++ ) fprintf( file, "%s\n%i\n%i\n", chart->entries[i].name, chart->entries[i].level, chart->entries[i].score ); } - fclose( file ); + + if (file != hi_dir_chart_file) + fclose( file ); } /* ==================================================================== --- NEW FILE lbrickbuster2.desktop --- [Desktop Entry] Name=Linux Brickbuster 2 Comment=Brickbuster arcade game Exec=lbrickbuster2 Icon=lbrickbuster2 Terminal=false Type=Application Categories=Game;ArcadeGame;BlocksGame; --- NEW FILE lbrickbuster2.spec --- # we ship lbreakout2 under a different name because of trademark concerns %define realname lbreakout2 %define prever beta-7 %define _prever beta7 Name: lbrickbuster2 Version: 2.6 Release: 0.9.%{_prever}%{?dist} Summary: Brickbuster arcade game License: GPLv2+ Group: Amusements/Games URL: http://lgames.sourceforge.net/ Source0: http://downloads.sourceforge.net/lgames/%{realname}-%{version}%{prever}.tar.gz # replacement art changing the logos from lbreakout2 to lbrickbuster2 Source1: %{name}-art.tar.gz Source2: %{name}.desktop Patch0: lbrickbuster2-rebrand-images.patch Patch1: lbrickbuster2-callback-fix.patch Patch2: lbrickbuster2-save-shared-hiscore.patch Patch3: lbrickbuster2-default-fullscreen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel libpng-devel ImageMagick desktop-file-utils BuildRequires: gettext Requires: hicolor-icon-theme # obsolete non rebranded freshrpms version Obsoletes: lbreakout2 <= %{version}-%{release} Provides: lbreakout2 = %{version}-%{release} %description The successor to LBrickBuster offers you a new challenge in more than 50 levels with loads of new bonuses (goldshower, joker, explosive balls, bonus magnet ...), maluses (chaos, darkness, weak balls, malus magnet ...) and special bricks (growing bricks, explosive bricks, regenerative bricks ...). If you are still hungry for more after that you can create your own levelsets with the integrated level editor. %prep %setup -q -a 1 -n %{realname}-%{version}%{prever} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 # fully automated rebrand to lbrickbuster for i in `find -type f -not -name "*.png" -not -name "*.wav"`; do touch -r $i $i.stamp sed -i -e 's/Breakout/Brickbuster/g' -e 's/breakout/brickbuster/g' $i touch -r $i.stamp $i rm $i.stamp done # and rename some files to match mv client/lbreakout.h client/lbrickbuster.h mv client/levels/LBreakout1 client/levels/LBrickbuster1 mv client/levels/LBreakout2 client/levels/LBrickbuster2 # install replacement art and remove themes overrides mv fr_top.png menuback.png client/gfx/AbsoluteB mv client/gfx/AbsoluteB/fr_*.png client/gfx/AbsoluteB/menuback.png client/gfx rm client/gfx/Oz/fr_*.png client/gfx/Moiree/fr_*.png # rebranding done, other fixes / cleanups below sed -i 's|/usr/doc/%{name}|%{_defaultdocdir}/%{name}|g' po/*.po client/help.c iconv -f ISO_8859-1 -t utf-8 ChangeLog > ChangeLog.tmp touch -r ChangeLog ChangeLog.tmp mv ChangeLog.tmp ChangeLog %build %configure --localstatedir=%{_var}/games --with-docdir=%{_defaultdocdir} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -p -m 644 AUTHORS COPYING ChangeLog README TODO \ $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} %find_lang %{name} # Install desktop entry mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} convert lbreakout48.gif \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png touch -r lbreakout48.gif \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc %{_defaultdocdir}/%{name} %attr(2755, root, games) %{_bindir}/%{name} %{_bindir}/%{name}server %{_datadir}/%{name} %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/applications/fedora-%{name}.desktop %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) %{_var}/games/%{name}.hscr %changelog * Thu Feb 28 2008 Hans de Goede 2.6-0.9.beta7 - Rebrand to lbrickbuster2 to avoid potential trademark issues - Cleanup specfile - Submit for Fedora inclusion * Tue Aug 28 2006 Matthias Saou 2.6-0.8.beta - Update to 2.6beta-7. * Mon May 29 2006 Matthias Saou 2.6-0.7.beta - Update to 2.6beta-6. * Fri Mar 17 2006 Matthias Saou 2.6-0.6.beta - Release bump to drop the disttag number in FC5 build. * Wed Nov 30 2005 Matthias Saou 2.6-0.5.beta - Update to 2.6beta-5. * Mon Nov 14 2005 Matthias Saou 2.6-0.4.beta - Update to 2.6beta-4. - No longer override datadir to datadir/games/ to get the locales installed. - Include translations. * Fri Oct 21 2005 Matthias Saou 2.6-0.3.beta - Update to 2.6beta-3. * Thu Oct 20 2005 Matthias Saou 2.6-0.2.beta - Update to 2.6beta-2 (use ugly temp "-2" instead of complex macros). - Missing common/gettext.h, doesn't build, reported upstream, so beta-3 out. * Tue May 17 2005 Matthias Saou 2.6-0.1.beta - Update to 2.6beta. * Fri Jan 14 2005 Matthias Saou 2.5.2-1 - Update to 2.5.2. * Sun Sep 26 2004 Matthias Saou 2.5.1-1 - Update to 2.5.1. * Mon Aug 9 2004 Matthias Saou 2.5-1 - Update to 2.5 final. * Mon Jun 21 2004 Matthias Saou 2.5-0.beta8.1 - Update to 2.5beta-8. * Mon Jun 14 2004 Matthias Saou 2.5-0.beta6.1 - Update to 2.5beta-6. * Tue May 18 2004 Matthias Saou 2.5-0.beta5.1 - Update to 2.5beta-5. - Change the gif pixmap to png. * Fri Nov 7 2003 Matthias Saou 2.5-0.beta3.1 - Update to 2.5beta-3. - Added missing zlib and libpng dependencies. - Rebuild for Fedora Core 1. * Mon Mar 31 2003 Matthias Saou - Rebuilt for Red Hat Linux 9. * Sun Mar 9 2003 Matthias Saou - Update to 2.4.1. * Fri Jan 3 2003 Matthias Saou - Update to 2.4. * Sat Oct 26 2002 Matthias Saou - Fixed the menu entry, thanks to Erwin J. Prinz. * Sat Sep 28 2002 Matthias Saou - Rebuilt for Red Hat Linux 8.0. - New menu entry with icon. * Mon Sep 23 2002 Matthias Saou - Update to 2.3.5. * Tue Sep 10 2002 Matthias Saou - Update to 2.3.3. * Tue Sep 10 2002 Matthias Saou - Update to 2.3.3. * Mon Aug 19 2002 Matthias Saou - Update to 2.3.2. * Wed Aug 14 2002 Matthias Saou - Update to 2.3.1. * Thu May 2 2002 Matthias Saou - Rebuilt against Red Hat Linux 7.3. - Added the %{?_smp_mflags} expansion. * Sun Feb 24 2002 Matthias Saou - Update to 2.2.2. * Tue Feb 5 2002 Matthias Saou - Update to 2.2.1. * Mon Jan 28 2002 Matthias Saou - Update to 2.2. * Sun Jan 6 2002 Matthias Saou - Update to 2.1.2. * Tue Jan 1 2002 Matthias Saou - Update to 2.1.1. * Sat Dec 8 2001 Matthias Saou - Update to 2.0.1. * Thu Nov 29 2001 Matthias Saou - Update to 2.0-pre2. * Thu Nov 22 2001 Matthias Saou - Update to 2.0beta2. * Tue Apr 10 2001 Matthias Saou - Update to 010315. * Mon Nov 27 2000 Matthias Saou - Initial RPM release for RedHat 7.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lbrickbuster2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2008 20:11:57 -0000 1.1 +++ .cvsignore 4 Mar 2008 11:46:30 -0000 1.2 @@ -0,0 +1,2 @@ +lbreakout2-2.6beta-7.tar.gz +lbrickbuster2-art.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lbrickbuster2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2008 20:11:57 -0000 1.1 +++ sources 4 Mar 2008 11:46:30 -0000 1.2 @@ -0,0 +1,2 @@ +bccede972d2f73612c47ca6a5aa9770e lbreakout2-2.6beta-7.tar.gz +ba46348775c0aa51532c0c06e23615f8 lbrickbuster2-art.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 11:53:59 2008 From: fedora-extras-commits at redhat.com (Paul Lindner (plindner)) Date: Tue, 4 Mar 2008 11:53:59 GMT Subject: rpms/memcached/devel .cvsignore, 1.3, 1.4 memcached.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200803041153.m24Brxnp018227@cvs-int.fedora.redhat.com> Author: plindner Update of /cvs/pkgs/rpms/memcached/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18117 Modified Files: .cvsignore memcached.spec sources Log Message: Upgrade to memcached-1.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/memcached/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2007 12:26:17 -0000 1.3 +++ .cvsignore 4 Mar 2008 11:53:21 -0000 1.4 @@ -1,2 +1 @@ -memcached-1.2.3.tar.gz -memcached-1.2.4.tar.gz +memcached-1.2.5.tar.gz Index: memcached.spec =================================================================== RCS file: /cvs/pkgs/rpms/memcached/devel/memcached.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- memcached.spec 19 Feb 2008 19:52:32 -0000 1.10 +++ memcached.spec 4 Mar 2008 11:53:21 -0000 1.11 @@ -6,8 +6,8 @@ %define groupname memcached Name: memcached -Version: 1.2.4 -Release: 4%{?dist} +Version: 1.2.5 +Release: 1%{?dist} Summary: High Performance, Distributed Memory Object Cache Group: System Environment/Daemons @@ -196,6 +196,9 @@ %changelog +* Tue Mar 4 2008 Paul Lindner - 1.2.5-1 +- Upgrade to memcached-1.2.5 + * Tue Feb 19 2008 Fedora Release Engineering - 1.2.4-4 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/memcached/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2007 12:26:17 -0000 1.3 +++ sources 4 Mar 2008 11:53:21 -0000 1.4 @@ -1,2 +1 @@ -efbc9ef1cf7dbc93a3ddceea541968c9 memcached-1.2.3.tar.gz -b80db034f951b296b2672b243022c061 memcached-1.2.4.tar.gz +8ac0d1749ded88044f0f850fad979e4d memcached-1.2.5.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 11:58:12 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Tue, 4 Mar 2008 11:58:12 GMT Subject: rpms/color-filesystem/devel color-filesystem.spec,1.1,1.2 Message-ID: <200803041158.m24BwCRp018634@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/color-filesystem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18498 Modified Files: color-filesystem.spec Log Message: - Add settings color dir Index: color-filesystem.spec =================================================================== RCS file: /cvs/pkgs/rpms/color-filesystem/devel/color-filesystem.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- color-filesystem.spec 18 Feb 2008 01:05:12 -0000 1.1 +++ color-filesystem.spec 4 Mar 2008 11:57:38 -0000 1.2 @@ -1,6 +1,6 @@ Name: color-filesystem Version: 1 -Release: 1 +Release: 2 Summary: Color filesystem layout Group: System Environment/Base @@ -26,6 +26,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/color/icc mkdir -p $RPM_BUILD_ROOT%{_datadir}/color/cmms +mkdir -p $RPM_BUILD_ROOT%{_datadir}/color/settings # rpm macros mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ @@ -46,9 +47,13 @@ %dir %{_datadir}/color %dir %{_datadir}/color/icc %dir %{_datadir}/color/cmms +%dir %{_datadir}/color/settings %config %{_sysconfdir}/rpm/macros.color %changelog +* Tue Mar 4 2008 kwizart < kwizart at gmail.com > - 1-2 +- Add settings color dir + * Sat Feb 2 2008 kwizart < kwizart at gmail.com > - 1-1 - Initial package. From fedora-extras-commits at redhat.com Tue Mar 4 11:58:19 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Radek_Vok=C3=A1l?= (rvokal)) Date: Tue, 4 Mar 2008 11:58:19 GMT Subject: rpms/net-tools/devel net-tools-1.60-statistics_buffer.patch, NONE, 1.1 net-tools.spec, 1.90, 1.91 Message-ID: <200803041158.m24BwJZs018647@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/net-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18545 Modified Files: net-tools.spec Added Files: net-tools-1.60-statistics_buffer.patch Log Message: - fix buffer for newer kernels (#435554) net-tools-1.60-statistics_buffer.patch: --- NEW FILE net-tools-1.60-statistics_buffer.patch --- diff -up net-tools-1.60/statistics.c.old net-tools-1.60/statistics.c --- net-tools-1.60/statistics.c.old 2008-03-04 10:44:41.000000000 +0100 +++ net-tools-1.60/statistics.c 2008-03-04 10:44:11.000000000 +0100 @@ -352,7 +352,7 @@ struct tabtab *newtable(struct tabtab *t void process_fd(FILE *f,int file_desc) // added file_desc to show propriate error mesg { - char buf1[1024], buf2[1024]; + char buf1[2048], buf2[2048]; char *sp, *np, *p; while (fgets(buf1, sizeof buf1, f)) { int endflag; Index: net-tools.spec =================================================================== RCS file: /cvs/extras/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- net-tools.spec 25 Feb 2008 08:08:33 -0000 1.90 +++ net-tools.spec 4 Mar 2008 11:57:44 -0000 1.91 @@ -3,7 +3,7 @@ Summary: Basic networking tools Name: net-tools Version: 1.60 -Release: 86%{?dist} +Release: 87%{?dist} License: GPL+ Group: System Environment/Base URL: http://www.tazenda.demon.co.uk/phil/net-tools/ @@ -75,6 +75,7 @@ Patch62: net-tools-1.60-netstat-interfaces-crash.patch Patch63: net-tools-1.60-netplugd_init.patch Patch64: net-tools-1.60-ec_hw_null.patch +Patch65: net-tools-1.60-statistics_buffer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig @@ -150,6 +151,7 @@ %patch62 -p1 -b .iface-crash %patch63 -p1 %patch64 -p1 +%patch65 -p1 -b .buffer cp %SOURCE2 ./config.h cp %SOURCE3 ./config.make @@ -265,6 +267,9 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Tue Mar 4 2008 Radek Vok??l - 1.80-87 +- fix buffer for newer kernels (#435554) + * Mon Feb 25 2008 Radek Vokal - 1.60-86 - fix for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 12:01:53 2008 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Tue, 4 Mar 2008 12:01:53 GMT Subject: rpms/hal/F-8 hal-0.5.10-acltool-serialize.patch, NONE, 1.1 hal.spec, 1.139, 1.140 hal-0.5.10-ck-acl.patch, 1.1, NONE Message-ID: <200803041201.m24C1rL8026112@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/hal/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18862/F-8 Modified Files: hal.spec Added Files: hal-0.5.10-acltool-serialize.patch Removed Files: hal-0.5.10-ck-acl.patch Log Message: Replace my #384271 patch with David's. Huzzzaaah! hal-0.5.10-acltool-serialize.patch: --- NEW FILE hal-0.5.10-acltool-serialize.patch --- From: David Zeuthen Date: Tue, 4 Mar 2008 05:10:22 +0000 (-0500) Subject: properly serialize the calls to 'hal-acl-tool --reconfigure' X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=f047f03869b2f5d20de1eafdae02d4ebc6eddc06 properly serialize the calls to 'hal-acl-tool --reconfigure' This fixes a long standing bug where ACL's were sometimes wrong when VT switching and when resuming from STR or STD. The problem was that we would get a bunch of events from ConsoleKit at once, say 1. Session1 -> Inactive 2. Session2 -> Active 3. Session2 -> Inactive 4. Session1 -> Active So for events 1-4 we would spawn 'hal-acl-tool --reconfigure' with a carefully prepared environment reflecting the ConsoleKit state. All four copies would start at once and race to get the lock. Which means that it was undefined what other they execute in. It's very easy to reproduce this; just try running # chvt 1; chvt 7; sleep 1; getfacl /dev/snd/pcmC0D0p (or some other device node) a few times and observe that sometimes you wouldn't get an ACL. This patch serializes the events and fixes this bug. --- --- a/hald/hald_dbus.c +++ b/hald/hald_dbus.c @@ -5280,9 +5280,9 @@ local_server_message_handler (DBusConnec GSList *i; GSList *j; - HAL_INFO (("************************")); - HAL_INFO (("Client to local_server was disconnected for %x", connection)); - HAL_INFO (("************************")); + //HAL_INFO (("************************")); + //HAL_INFO (("Client to local_server was disconnected for %x", connection)); + //HAL_INFO (("************************")); for (i = helper_interface_handlers; i != NULL; i = j) { HelperInterfaceHandler *hih = i->data; @@ -5324,9 +5324,9 @@ local_server_message_handler (DBusConnec static void local_server_unregister_handler (DBusConnection *connection, void *user_data) { - HAL_INFO (("***************************")); - HAL_INFO (("********* unregistered %x", connection)); - HAL_INFO (("***************************")); + //HAL_INFO (("***************************")); + //HAL_INFO (("********* unregistered %x", connection)); + //HAL_INFO (("***************************")); } static void @@ -5338,9 +5338,9 @@ local_server_handle_connection (DBusServ &local_server_message_handler, NULL, NULL, NULL, NULL}; - HAL_INFO (("***************************")); - HAL_INFO (("********* got a connection %x", new_connection)); - HAL_INFO (("***************************")); + //HAL_INFO (("***************************")); + //HAL_INFO (("********* got a connection %x", new_connection)); + //HAL_INFO (("***************************")); /*dbus_connection_add_filter (new_connection, server_filter_function, NULL, NULL);*/ @@ -5405,96 +5405,6 @@ hald_dbus_local_server_shutdown (void) #ifdef HAVE_CONKIT static void -hald_dbus_session_added (CKTracker *tracker, CKSession *session, void *user_data) -{ - HalDevice *d; - char **programs; - char *extra_env[5] = {"HALD_ACTION=session_add", - NULL /* "HALD_SESSION_ADD_SESSION_ID=" */, - NULL /* "HALD_SESSION_ADD_SESSION_UID=" */, - NULL /* "HALD_SESSION_ADD_SESSION_IS_ACTIVE=" */, - NULL}; - - HAL_INFO (("In hald_dbus_session_added for session '%s' on seat '%s'", - ck_session_get_id (session), - ck_session_get_seat (session) != NULL ? ck_seat_get_id (ck_session_get_seat (session)) : "(NONE)")); - - d = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer"); - if (d == NULL) { - d = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer"); - } - if (d == NULL) { - goto out; - } - - programs = hal_device_property_dup_strlist_as_strv (d, "info.callouts.session_add"); - if (programs == NULL) { - goto out; - } - - extra_env[1] = g_strdup_printf ("HALD_SESSION_ADD_SESSION_ID=%s", ck_session_get_id (session)); - extra_env[2] = g_strdup_printf ("HALD_SESSION_ADD_SESSION_UID=%d", ck_session_get_user (session)); - extra_env[3] = g_strdup_printf ("HALD_SESSION_ADD_SESSION_IS_ACTIVE=%s", - ck_session_is_active (session) ? "true" : "false"); - hal_callout_device (d, - NULL /* callback */, - NULL /* userdata1 */, - NULL /* userdata2 */, - programs, - extra_env); - g_free (extra_env[1]); - g_free (extra_env[2]); - g_free (extra_env[3]); -out: - ; -} - -static void -hald_dbus_session_removed (CKTracker *tracker, CKSession *session, void *user_data) -{ - HalDevice *d; - char **programs; - char *extra_env[5] = {"HALD_ACTION=session_remove", - NULL /* "HALD_SESSION_REMOVE_SESSION_ID=" */, - NULL /* "HALD_SESSION_REMOVE_SESSION_UID=" */, - NULL /* "HALD_SESSION_REMOVE_SESSION_IS_ACTIVE=" */, - NULL}; - - HAL_INFO (("In hald_dbus_session_removed for session '%s' on seat '%s'", - ck_session_get_id (session), - ck_session_get_seat (session) != NULL ? ck_seat_get_id (ck_session_get_seat (session)) : "(NONE)")); - - d = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer"); - if (d == NULL) { - d = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer"); - } - if (d == NULL) { - goto out; - } - - programs = hal_device_property_dup_strlist_as_strv (d, "info.callouts.session_remove"); - if (programs == NULL) { - goto out; - } - - extra_env[1] = g_strdup_printf ("HALD_SESSION_REMOVE_SESSION_ID=%s", ck_session_get_id (session)); - extra_env[2] = g_strdup_printf ("HALD_SESSION_REMOVE_SESSION_UID=%d", ck_session_get_user (session)); - extra_env[3] = g_strdup_printf ("HALD_SESSION_REMOVE_SESSION_IS_ACTIVE=%s", - ck_session_is_active (session) ? "true" : "false"); - hal_callout_device (d, - NULL /* callback */, - NULL /* userdata1 */, - NULL /* userdata2 */, - programs, - extra_env); - g_free (extra_env[1]); - g_free (extra_env[2]); - g_free (extra_env[3]); -out: - ; -} - -static void hald_dbus_seat_added (CKTracker *tracker, CKSeat *seat, void *user_data) { /* TODO: we could run callouts here... but they wouldn't do anything useful right now */ @@ -5593,6 +5503,87 @@ reconfigure_all_policy (void) reconfigure_acl (); } + +typedef struct { + HalDevice *d; + char **programs; + char **extra_env; +} SessionChangesEntry; + +static GList *session_changes_queue = NULL; +gboolean session_changes_is_running = FALSE; + +static void session_changes_process_queue (void); + +static void +session_changes_done_cb (HalDevice *d, gpointer userdata1, gpointer userdata2) +{ + SessionChangesEntry *entry = userdata1; + + HAL_INFO (("session_changes_done_cb")); + + g_assert (entry->d == d); + + /* hal_callout_device takes ownership of entry->programs so we don't free it here */ + g_object_unref (entry->d); + g_strfreev (entry->extra_env); + g_free (entry); + + session_changes_is_running = FALSE; + + session_changes_process_queue (); +} + +static void +session_changes_process_queue (void) +{ + SessionChangesEntry *entry; + + HAL_INFO (("session_changes_process_queue")); + + /* nothing to run */ + if (session_changes_queue == NULL) + return; + + /* something is already running; wait for it to terminate */ + if (session_changes_is_running) + return; + + HAL_INFO ((" running element in queue")); + + /* pop the first element */ + entry = session_changes_queue->data; + session_changes_queue = g_list_remove (session_changes_queue, entry); + + hal_callout_device (entry->d, + session_changes_done_cb, /* callback */ + entry, /* userdata1 */ + NULL, /* userdata2 */ + entry->programs, + entry->extra_env); + + session_changes_is_running = TRUE; +} + +static void +session_changes_push (HalDevice *d, char **programs, char **extra_env) +{ + SessionChangesEntry *entry; + + HAL_INFO (("session_changes_push")); + + entry = g_new0 (SessionChangesEntry, 1); + entry->d = g_object_ref (d); + entry->programs = g_strdupv (programs); + entry->extra_env = g_strdupv (extra_env); + + /* push to end of queue */ + session_changes_queue = g_list_append (session_changes_queue, entry); + + /* only process the queue if there we are the only element */ + session_changes_process_queue (); +} + static void hald_dbus_session_active_changed (CKTracker *tracker, CKSession *session, void *user_data) { @@ -5631,12 +5622,93 @@ hald_dbus_session_active_changed (CKTrac extra_env[2] = g_strdup_printf ("HALD_SESSION_ACTIVE_CHANGED_SESSION_UID=%d", ck_session_get_user (session)); extra_env[3] = g_strdup_printf ("HALD_SESSION_ACTIVE_CHANGED_SESSION_IS_ACTIVE=%s", ck_session_is_active (session) ? "true" : "false"); - hal_callout_device (d, - NULL /* callback */, - NULL /* userdata1 */, - NULL /* userdata2 */, - programs, - extra_env); + + session_changes_push (d, programs, extra_env); + + g_free (extra_env[1]); + g_free (extra_env[2]); + g_free (extra_env[3]); +out: + ; +} + +static void +hald_dbus_session_added (CKTracker *tracker, CKSession *session, void *user_data) +{ + HalDevice *d; + char **programs; + char *extra_env[5] = {"HALD_ACTION=session_add", + NULL /* "HALD_SESSION_ADD_SESSION_ID=" */, + NULL /* "HALD_SESSION_ADD_SESSION_UID=" */, + NULL /* "HALD_SESSION_ADD_SESSION_IS_ACTIVE=" */, + NULL}; + + HAL_INFO (("In hald_dbus_session_added for session '%s' on seat '%s'", + ck_session_get_id (session), + ck_session_get_seat (session) != NULL ? ck_seat_get_id (ck_session_get_seat (session)) : "(NONE)")); + + d = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer"); + if (d == NULL) { + d = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer"); + } + if (d == NULL) { + goto out; + } + + programs = hal_device_property_dup_strlist_as_strv (d, "info.callouts.session_add"); + if (programs == NULL) { + goto out; + } + + extra_env[1] = g_strdup_printf ("HALD_SESSION_ADD_SESSION_ID=%s", ck_session_get_id (session)); + extra_env[2] = g_strdup_printf ("HALD_SESSION_ADD_SESSION_UID=%d", ck_session_get_user (session)); + extra_env[3] = g_strdup_printf ("HALD_SESSION_ADD_SESSION_IS_ACTIVE=%s", + ck_session_is_active (session) ? "true" : "false"); + + session_changes_push (d, programs, extra_env); + + g_free (extra_env[1]); + g_free (extra_env[2]); + g_free (extra_env[3]); +out: + ; +} + +static void +hald_dbus_session_removed (CKTracker *tracker, CKSession *session, void *user_data) +{ + HalDevice *d; + char **programs; + char *extra_env[5] = {"HALD_ACTION=session_remove", + NULL /* "HALD_SESSION_REMOVE_SESSION_ID=" */, + NULL /* "HALD_SESSION_REMOVE_SESSION_UID=" */, + NULL /* "HALD_SESSION_REMOVE_SESSION_IS_ACTIVE=" */, + NULL}; + + HAL_INFO (("In hald_dbus_session_removed for session '%s' on seat '%s'", + ck_session_get_id (session), + ck_session_get_seat (session) != NULL ? ck_seat_get_id (ck_session_get_seat (session)) : "(NONE)")); + + d = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer"); + if (d == NULL) { + d = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer"); + } + if (d == NULL) { + goto out; + } + + programs = hal_device_property_dup_strlist_as_strv (d, "info.callouts.session_remove"); + if (programs == NULL) { + goto out; + } + + extra_env[1] = g_strdup_printf ("HALD_SESSION_REMOVE_SESSION_ID=%s", ck_session_get_id (session)); + extra_env[2] = g_strdup_printf ("HALD_SESSION_REMOVE_SESSION_UID=%d", ck_session_get_user (session)); + extra_env[3] = g_strdup_printf ("HALD_SESSION_REMOVE_SESSION_IS_ACTIVE=%s", + ck_session_is_active (session) ? "true" : "false"); + + session_changes_push (d, programs, extra_env); + g_free (extra_env[1]); g_free (extra_env[2]); g_free (extra_env[3]); --- a/tools/hal-acl-tool.c +++ b/tools/hal-acl-tool.c @@ -1175,7 +1175,9 @@ tryagain: goto tryagain; return FALSE; } - + + printf ("\n"); + printf ("****************************************************\n"); printf ("%d: got lock on " PACKAGE_LOCALSTATEDIR "/lib/hal/acl-list\n", getpid ()); return TRUE; } @@ -1183,6 +1185,9 @@ tryagain: static void acl_unlock (void) { + printf ("\n"); + printf ("****************************************************\n"); + printf ("%d: releasing lock on " PACKAGE_LOCALSTATEDIR "/lib/hal/acl-list\n", getpid ()); #if sun lockf (lock_acl_fd, F_ULOCK, 0); #else @@ -1190,7 +1195,6 @@ acl_unlock (void) #endif close (lock_acl_fd); lock_acl_fd = -1; - printf ("%d: released lock on " PACKAGE_LOCALSTATEDIR "/lib/hal/acl-list\n", getpid ()); } int Index: hal.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal/F-8/hal.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- hal.spec 26 Feb 2008 08:29:34 -0000 1.139 +++ hal.spec 4 Mar 2008 12:00:48 -0000 1.140 @@ -26,10 +26,10 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.10 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 URL: http://www.freedesktop.org/Software/hal Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz -Patch0: hal-0.5.10-ck-acl.patch +Patch0: hal-0.5.10-acltool-serialize.patch License: AFL/GPL Group: System Environment/Libraries @@ -121,7 +121,7 @@ %prep %setup -q -%patch0 -p1 -b .ck-acl +%patch0 -p1 -b .serialize-acl %build %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject @@ -234,6 +234,9 @@ %{_datadir}/gtk-doc/html/libhal-storage/* %changelog +* Tue Mar 04 2008 Lubomir Kundrak - 0.5.10-1.2 +- Replace patch added in previous revision with upstream one (#384271) + * Tue Feb 26 2008 Lubomir Kundrak - 0.5.10-1.1 - Call ConsoleKit for session/seat enumeration in -acl-tool (#384271) --- hal-0.5.10-ck-acl.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 12:04:35 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Tue, 4 Mar 2008 12:04:35 GMT Subject: rpms/coreutils/devel coreutils-6.10-verbose.patch, 1.1, 1.2 coreutils-colorls.csh, 1.10, 1.11 coreutils.spec, 1.196, 1.197 Message-ID: <200803041204.m24C4ZiV026398@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26365 Modified Files: coreutils-6.10-verbose.patch coreutils-colorls.csh coreutils.spec Log Message: colorls csh missing doublequotes + fixed localization of verbose stdout outputs coreutils-6.10-verbose.patch: Index: coreutils-6.10-verbose.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-verbose.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coreutils-6.10-verbose.patch 3 Mar 2008 14:00:19 -0000 1.1 +++ coreutils-6.10-verbose.patch 4 Mar 2008 12:04:31 -0000 1.2 @@ -21,7 +21,7 @@ @item -x @itemx --exact diff --git a/src/install.c b/src/install.c -index db08751..95e37fc 100644 +index db08751..6925c55 100644 --- a/src/install.c +++ b/src/install.c @@ -1,5 +1,5 @@ @@ -31,17 +31,37 @@ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -@@ -762,7 +762,7 @@ announce_mkdir (char const *dir, void *options) +@@ -160,6 +160,19 @@ static struct option const long_options[] = + {NULL, 0, NULL, 0} + }; + ++/* Verbose formatted output of variable count of arguments. */ ++static void ++verbose_output (FILE *fp, char const *fmt, ...) ++{ ++ va_list ap; ++ fputs (program_name, fp); ++ fputs (": ", fp); ++ va_start (ap, fmt); ++ vfprintf (fp, fmt, ap); ++ va_end (ap); ++ fputc ('\n', fp); ++} ++ + static void + cp_option_init (struct cp_options *x) + { +@@ -762,7 +775,7 @@ announce_mkdir (char const *dir, void *options) { struct cp_options const *x = options; if (x->verbose) - error (0, 0, _("creating directory %s"), quote (dir)); -+ printf (_("%s: creating directory %s\n"), program_name, quote (dir)); ++ verbose_output (stdout,_("creating directory %s"), quote (dir)); } /* Make ancestor directory DIR, whose last file name component is diff --git a/src/rmdir.c b/src/rmdir.c -index bb1a0c8..609c387 100644 +index bb1a0c8..1f17f6a 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -1,6 +1,6 @@ @@ -52,21 +72,41 @@ Foundation, Inc. This program is free software: you can redistribute it and/or modify -@@ -134,7 +134,7 @@ remove_parents (char *dir) +@@ -72,6 +72,19 @@ static struct option const longopts[] = + {NULL, 0, NULL, 0} + }; + ++/* Verbose formatted output of variable count of arguments. */ ++static void ++verbose_output (FILE *fp, char const *fmt, ...) ++{ ++ va_list ap; ++ fputs (program_name, fp); ++ fputs (": ", fp); ++ va_start (ap, fmt); ++ vfprintf (fp, fmt, ap); ++ va_end (ap); ++ fputc ('\n', fp); ++} ++ + /* Return true if ERROR_NUMBER is one of the values associated + with a failed rmdir due to non-empty target directory. */ + static bool +@@ -134,7 +147,7 @@ remove_parents (char *dir) /* Give a diagnostic for each attempted removal if --verbose. */ if (verbose) - error (0, 0, _("removing directory, %s"), quote (dir)); -+ printf(_("%s: removing directory, %s\n"), program_name, quote (dir)); ++ verbose_output (stdout,_("removing directory, %s"), quote (dir)); ok = (rmdir (dir) == 0); -@@ -233,7 +233,7 @@ main (int argc, char **argv) +@@ -233,7 +246,7 @@ main (int argc, char **argv) /* Give a diagnostic for each attempted removal if --verbose. */ if (verbose) - error (0, 0, _("removing directory, %s"), dir); -+ printf(_("%s: removing directory, %s\n"), program_name, dir); ++ verbose_output(stdout, _("removing directory, %s"), dir); if (rmdir (dir) != 0) { Index: coreutils-colorls.csh =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-colorls.csh,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- coreutils-colorls.csh 18 Feb 2008 14:37:04 -0000 1.10 +++ coreutils-colorls.csh 4 Mar 2008 12:04:31 -0000 1.11 @@ -1,7 +1,7 @@ #! /bin/csh -f # color-ls initialization if ( $?LS_COLORS ) then - if ( $LS_COLORS != "" ) then + if ( "$LS_COLORS" != "" ) then #do not override user specified LS_COLORS and use them goto finish endif Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- coreutils.spec 3 Mar 2008 14:00:19 -0000 1.196 +++ coreutils.spec 4 Mar 2008 12:04:31 -0000 1.197 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.10 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -18,7 +18,7 @@ Source203: coreutils-runuser-l.pamd # From upstream -Patch1:coreutils-6.10-verbose.patch +Patch1: coreutils-6.10-verbose.patch # Our patches Patch100: coreutils-chgrp.patch @@ -293,6 +293,10 @@ /sbin/runuser %changelog +* Tue Mar 4 2008 Ondrej Vasik - 6.10-10 +- colorls.csh missing doublequotes (#435789) +- fixed possibility to localize verbose outputs + * Mon Mar 3 2008 Ondrej Vasik - 6.10-9 - consolidation of verbose output to stdout (upstream) From fedora-extras-commits at redhat.com Tue Mar 4 12:19:33 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 12:19:33 GMT Subject: rpms/cups/devel cups.spec, 1.398, 1.399 cups-1.1.15-initscript.patch, 1.9, NONE Message-ID: <200803041219.m24CJXjc027325@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301 Modified Files: cups.spec Removed Files: cups-1.1.15-initscript.patch Log Message: Don't need this patch. Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.398 retrieving revision 1.399 diff -u -r1.398 -r1.399 --- cups.spec 28 Feb 2008 22:35:18 -0000 1.398 +++ cups.spec 4 Mar 2008 12:18:57 -0000 1.399 @@ -24,7 +24,6 @@ Source13: pdftops.conf Source14: textonly.filter Source15: textonly.ppd -Patch1: cups-1.1.15-initscript.patch Patch2: cups-no-gzip-man.patch Patch3: cups-1.1.16-system-auth.patch Patch4: cups-multilib.patch @@ -140,7 +139,6 @@ %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -b .noinit %patch2 -p1 -b .no-gzip-man %patch3 -p1 -b .system-auth %patch4 -p1 -b .multilib @@ -195,7 +193,6 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{initdir} make BUILDROOT=$RPM_BUILD_ROOT install @@ -205,6 +202,10 @@ # Serial backend needs to run as root (bug #212577). chmod 700 $RPM_BUILD_ROOT%{cups_serverbin}/backend/serial +rm -rf $RPM_BUILD_ROOT%{initdir} \ + $RPM_BUILD_ROOT%{_sysconfdir}/init.d \ + $RPM_BUILD_ROOT%{_sysconfdir}/rc?.d +mkdir -p $RPM_BUILD_ROOT%{initdir} install -m 755 $RPM_SOURCE_DIR/cups.init $RPM_BUILD_ROOT%{initdir}/cups find $RPM_BUILD_ROOT/usr/share/cups/model -name "*.ppd" |xargs gzip -n9f --- cups-1.1.15-initscript.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 12:25:20 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 12:25:20 GMT Subject: rpms/ghostscript/F-8 .cvsignore, 1.25, 1.26 ghostscript.spec, 1.155, 1.156 sources, 1.30, 1.31 ghostscript-8.57-ijs-krgb.patch, 1.2, NONE ghostscript-gsbug689577.patch, 1.1, NONE Message-ID: <200803041225.m24CPKpC027426@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/ghostscript/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27402 Modified Files: .cvsignore ghostscript.spec sources Removed Files: ghostscript-8.57-ijs-krgb.patch ghostscript-gsbug689577.patch Log Message: * Tue Mar 4 2008 Tim Waugh 8.62-1 - 8.62. No longer need IJS KRGB patch, or patch for gs bug 689577. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/F-8/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 28 Nov 2007 13:49:07 -0000 1.25 +++ .cvsignore 4 Mar 2008 12:24:49 -0000 1.26 @@ -21,3 +21,4 @@ ghostscript-8.60-r8117.tar.bz2 ghostscript-8.60.tar.bz2 ghostscript-8.61.tar.bz2 +ghostscript-8.62.tar.bz2 Index: ghostscript.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/F-8/ghostscript.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- ghostscript.spec 27 Feb 2008 17:15:34 -0000 1.155 +++ ghostscript.spec 4 Mar 2008 12:24:49 -0000 1.156 @@ -1,11 +1,11 @@ -%define gs_ver 8.61 -%define gs_dot_ver 8.61 +%define gs_ver 8.62 +%define gs_dot_ver 8.62 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}} Summary: A PostScript(TM) interpreter and renderer. Name: ghostscript Version: %{gs_ver} -Release: 8%{?dist} +Release: 1%{?dist} License: GPLv2 URL: http://www.ghostscript.com/ @@ -18,9 +18,7 @@ Patch2: ghostscript-scripts.patch Patch3: ghostscript-noopt.patch Patch4: ghostscript-fPIC.patch -Patch5: http://www.openprinting.org/download/printing/esp-gpl-ghostscript-merge/ghostscript-8.57-ijs-krgb.patch Patch6: ghostscript-runlibfileifexists.patch -Patch7: ghostscript-gsbug689577.patch Patch8: ghostscript-system-jasper.patch Patch9: ghostscript-CVE-2008-0411.patch @@ -90,15 +88,9 @@ # Fix shared library build. %patch4 -p1 -b .fPIC -# IJS KRGB patch. -%patch5 -p1 -b .ijs-krgb - # Define .runlibfileifexists. %patch6 -p1 -b .runlibfileifexists -# Upstream patch for bug #416321. -%patch7 -p1 -b .gsbug689577 - %patch8 -p1 -b .system-jasper %patch9 -p1 -b .CVE-2008-0411 @@ -274,6 +266,9 @@ %{_libdir}/libgs.so %changelog +* Tue Mar 4 2008 Tim Waugh 8.62-1 +- 8.62. No longer need IJS KRGB patch, or patch for gs bug 689577. + * Wed Feb 27 2008 Tim Waugh 8.61-8 - Applied patch to fix CVE-2008-0411 (bug #431536). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/F-8/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 29 Nov 2007 10:31:51 -0000 1.30 +++ sources 4 Mar 2008 12:24:49 -0000 1.31 @@ -1,3 +1,3 @@ 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz -abff0506cd249cba3ad862d8fe4f6474 ghostscript-8.61.tar.bz2 +40d673a3c6e11d2bf14f972b84551104 ghostscript-8.62.tar.bz2 --- ghostscript-8.57-ijs-krgb.patch DELETED --- --- ghostscript-gsbug689577.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 12:31:39 2008 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Tue, 4 Mar 2008 12:31:39 GMT Subject: rpms/gmrun/devel gmrun-gmrunrc.patch,1.1,1.2 gmrun.spec,1.7,1.8 Message-ID: <200803041231.m24CVdvB027533@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/pkgs/rpms/gmrun/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27498 Modified Files: gmrun-gmrunrc.patch gmrun.spec Log Message: gmrun-gmrunrc.patch: Index: gmrun-gmrunrc.patch =================================================================== RCS file: /cvs/pkgs/rpms/gmrun/devel/gmrun-gmrunrc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gmrun-gmrunrc.patch 15 Feb 2007 10:59:04 -0000 1.1 +++ gmrun-gmrunrc.patch 4 Mar 2008 12:31:24 -0000 1.2 @@ -9,14 +9,14 @@ TermExec = ${Terminal} -e AlwaysInTerm = ssh telnet ftp lynx mc vi vim pine centericq perldoc man -@@ -32,18 +32,13 @@ +@@ -32,18 +32,14 @@ # - %u gets replaced with the whole URL ("http://www.google.com") # - %s gets replaced with "//www.google.com". This is useful for URL-s # like "man:printf" --> %s will get replaced with "printf" -URL_http = mozilla -remote "openURL(%u, new-window)" -URL_mailto = mozilla -remote "mailto(%s)" -+URL_http = htmlview %u -+URL_mailto = htmlview %u ++URL_http = xdg-open %u ++URL_mailto = xdg-email %u +URL_file = xdg-open %s URL_man = ${TermExec} 'man %s' URL_info = ${TermExec} 'info %s' @@ -25,7 +25,7 @@ -URL_readme = ${TermExec} 'less /usr/doc/%s/README' -URL_info = ${TermExec} 'info %s' -URL_sh = sh -c '%s' -+URL_search = htmlview 'http://www.google.co.il/search?q=%s' ++URL_search = xdg-open 'http://www.google.com/search?q=%s' # extension handlers -EXT:doc,rtf = AbiWord %s Index: gmrun.spec =================================================================== RCS file: /cvs/pkgs/rpms/gmrun/devel/gmrun.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gmrun.spec 19 Feb 2008 04:01:11 -0000 1.7 +++ gmrun.spec 4 Mar 2008 12:31:24 -0000 1.8 @@ -57,8 +57,8 @@ %changelog -* Mon Feb 18 2008 Fedora Release Engineering - 0.9.2-13 -- Autorebuild for GCC 4.3 +* Thu Mar 04 2008 Gilboa Davara - 0.9.2-13 +- Reapply Ville's xdg-utils patch. * Thu Jan 17 2008 Gilboa Davara - 0.9.2-11 - Replace htmlview with xdg-utils. (#388441, Patch by Ville Skytta) From fedora-extras-commits at redhat.com Tue Mar 4 12:36:08 2008 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Tue, 4 Mar 2008 12:36:08 GMT Subject: rpms/gmrun/devel gmrun.spec,1.8,1.9 Message-ID: <200803041236.m24Ca82l027643@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/pkgs/rpms/gmrun/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27623 Modified Files: gmrun.spec Log Message: Index: gmrun.spec =================================================================== RCS file: /cvs/pkgs/rpms/gmrun/devel/gmrun.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gmrun.spec 4 Mar 2008 12:31:24 -0000 1.8 +++ gmrun.spec 4 Mar 2008 12:35:26 -0000 1.9 @@ -1,6 +1,6 @@ Name: gmrun Version: 0.9.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Lightweight "Run program" dialog box with search history and tab completion Group: User Interface/Desktops @@ -57,9 +57,12 @@ %changelog -* Thu Mar 04 2008 Gilboa Davara - 0.9.2-13 +* Thu Mar 04 2008 Gilboa Davara - 0.9.2-14 - Reapply Ville's xdg-utils patch. +* Mon Feb 18 2008 Fedora Release Engineering - 0.9.2-13 +- Autorebuild for GCC 4.3 + * Thu Jan 17 2008 Gilboa Davara - 0.9.2-11 - Replace htmlview with xdg-utils. (#388441, Patch by Ville Skytta) - gcc4.3 compile fix. From fedora-extras-commits at redhat.com Tue Mar 4 12:50:33 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 4 Mar 2008 12:50:33 GMT Subject: rpms/qhull/devel qhull-2003.1-alias.patch, NONE, 1.1 qhull.spec, 1.11, 1.12 Message-ID: <200803041250.m24CoXvN027827@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/qhull/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27798 Modified Files: qhull.spec Added Files: qhull-2003.1-alias.patch Log Message: * Tue Mar 04 2008 Ralf Cors??pius - 2003.1-10 - Add qhull-2003.1-alias.patch (BZ 432309) Thanks to Orion Poplawski (orion at cora.nwra.com). qhull-2003.1-alias.patch: --- NEW FILE qhull-2003.1-alias.patch --- --- qhull-2003.1/src/qset.c.alias 2008-02-27 14:46:42.000000000 -0700 +++ qhull-2003.1/src/qset.c 2008-02-28 16:44:20.000000000 -0700 @@ -126,8 +126,7 @@ */ void qh_setappend(setT **setp, void *newelem) { - int *sizep; - void **endp; + int *sizep, end_idx; if (!newelem) return; @@ -135,8 +134,9 @@ qh_setlarger(setp); sizep= SETsizeaddr_(*setp); } - *(endp= &((*setp)->e[(*sizep)++ - 1].p))= newelem; - *(++endp)= NULL; + end_idx = (*sizep)++ - 1; + (*setp)->e[end_idx].p = newelem; + (*setp)->e[end_idx + 1].p = NULL; } /* setappend */ /*- - 2003.1-10 +- Add qhull-2003.1-alias.patch (BZ 432309) + Thanks to Orion Poplawski (orion at cora.nwra.com). + * Sun Feb 10 2008 Ralf Cors??pius - 2003.1-9 - Rebuild for gcc43. From fedora-extras-commits at redhat.com Tue Mar 4 12:54:24 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Tue, 4 Mar 2008 12:54:24 GMT Subject: rpms/coreutils/F-8 coreutils-5.2.1-runuser.patch, 1.16, 1.17 coreutils-colorls.csh, 1.4, 1.5 coreutils-split-pam.patch, 1.1, 1.2 coreutils.spec, 1.183, 1.184 Message-ID: <200803041254.m24CsO9S027920@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27890 Modified Files: coreutils-5.2.1-runuser.patch coreutils-colorls.csh coreutils-split-pam.patch coreutils.spec Log Message: fixed missing doublequotes in colorls.csh, a bit documented su-l/runuser-l pam files usage coreutils-5.2.1-runuser.patch: Index: coreutils-5.2.1-runuser.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils-5.2.1-runuser.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- coreutils-5.2.1-runuser.patch 14 Aug 2007 10:21:12 -0000 1.16 +++ coreutils-5.2.1-runuser.patch 4 Mar 2008 12:54:13 -0000 1.17 @@ -330,7 +330,7 @@ +to set user ID, the command will fail. +.TP +-, \fB\-l\fR, \fB\-\-login\fR -+make the shell a login shell ++make the shell a login shell, uses runuser-l PAM file instead of default one. +.TP +\fB\-c\fR, \fB\-\-commmand\fR=\fICOMMAND\fR +pass a single COMMAND to the shell with \fB\-c\fR Index: coreutils-colorls.csh =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils-colorls.csh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- coreutils-colorls.csh 19 Feb 2008 12:34:54 -0000 1.4 +++ coreutils-colorls.csh 4 Mar 2008 12:54:13 -0000 1.5 @@ -1,6 +1,6 @@ # color-ls initialization if ( $?LS_COLORS ) then - if ( $LS_COLORS != "" ) then + if ( "$LS_COLORS" != "" ) then #do not override user specified LS_COLORS and use them goto finish endif coreutils-split-pam.patch: Index: coreutils-split-pam.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils-split-pam.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coreutils-split-pam.patch 13 Jul 2006 12:01:32 -0000 1.1 +++ coreutils-split-pam.patch 4 Mar 2008 12:54:13 -0000 1.2 @@ -28,3 +28,30 @@ PAM_BAIL_P; #ifndef RUNUSER +diff -urp coreutils-6.9-orig/doc/coreutils.info coreutils-6.10/doc/coreutils.info +--- coreutils-6.9-orig/doc/coreutils.info ++++ coreutils-6.9/doc/coreutils.info +@@ -11006,7 +11006,8 @@ options::. + set, even for the super-user, as described above), and set `PATH' + to a compiled-in default value. Change to USER's home directory. + Prepend `-' to the shell's name, intended to make it read its +- login startup file(s). ++ login startup file(s). When this option is given, /etc/pam.d/su-l ++ PAM file is used instead of the default one. + + `-m' + `-p' +diff -urp coreutils-6.10-orig/doc/coreutils.texi coreutils-6.10/doc/coreutils.texi +--- coreutils-6.9-orig/doc/coreutils.texi ++++ coreutils-6.9/doc/coreutils.texi +@@ -13670,7 +13670,9 @@ the exit status of @var{command} otherwi + + @command{su} allows one user to temporarily become another user. It runs a + command (often an interactive shell) with the real and effective user +-ID, group ID, and supplemental groups of a given @var{user}. Synopsis: ++ID, group ID, and supplemental groups of a given @var{user}. When the -l ++option is given, the su-l PAM file is used instead of the default su PAM file. ++Synopsis: + + @example + su [@var{option}]@dots{} [@var{user} [@var{arg}]@dots{}] Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils.spec,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- coreutils.spec 19 Feb 2008 12:34:54 -0000 1.183 +++ coreutils.spec 4 Mar 2008 12:54:13 -0000 1.184 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.9 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -293,6 +293,10 @@ /sbin/runuser %changelog +* Tue Mar 4 2008 Ondrej Vasik - 6.9-14 +- fixed missing doublequotes in colorls.csh (#435789) +- su-l/runuser-l pam file usage a bit documented(#368721) + * Tue Feb 19 2008 Ondrej Vasik - 6.9-13 - added several missing colored TERMS(#239266) - added several missing image/compressed file extensions From fedora-extras-commits at redhat.com Tue Mar 4 13:02:07 2008 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Tue, 4 Mar 2008 13:02:07 GMT Subject: rpms/gmrun/devel gmrun.spec,1.9,1.10 Message-ID: <200803041302.m24D27XD002664@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/pkgs/rpms/gmrun/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27682 Modified Files: gmrun.spec Log Message: Index: gmrun.spec =================================================================== RCS file: /cvs/pkgs/rpms/gmrun/devel/gmrun.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gmrun.spec 4 Mar 2008 12:35:26 -0000 1.9 +++ gmrun.spec 4 Mar 2008 13:01:27 -0000 1.10 @@ -1,6 +1,6 @@ Name: gmrun Version: 0.9.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Lightweight "Run program" dialog box with search history and tab completion Group: User Interface/Desktops @@ -57,7 +57,7 @@ %changelog -* Thu Mar 04 2008 Gilboa Davara - 0.9.2-14 +* Thu Mar 04 2008 Gilboa Davara - 0.9.2-15 - Reapply Ville's xdg-utils patch. * Mon Feb 18 2008 Fedora Release Engineering - 0.9.2-13 From fedora-extras-commits at redhat.com Tue Mar 4 13:05:04 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Tue, 4 Mar 2008 13:05:04 GMT Subject: rpms/time/devel time-1.7-verbose.patch, NONE, 1.1 time.spec, 1.22, 1.23 Message-ID: <200803041305.m24D54cU002763@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/time/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2719 Modified Files: time.spec Added Files: time-1.7-verbose.patch Log Message: Less nonverbose output time-1.7-verbose.patch: --- NEW FILE time-1.7-verbose.patch --- --- time-1.7/time.c.verbose Fri Jun 14 05:38:21 1996 +++ time-1.7/time.c Sun Nov 4 16:21:09 2001 @@ -327,6 +327,8 @@ unsigned long r; /* Elapsed real milliseconds. */ unsigned long v; /* Elapsed virtual (CPU) milliseconds. */ + if (verbose) + { if (WIFSTOPPED (resp->waitstatus)) fprintf (fp, "Command stopped by signal %d\n", WSTOPSIG (resp->waitstatus)); @@ -336,6 +338,7 @@ else if (WIFEXITED (resp->waitstatus) && WEXITSTATUS (resp->waitstatus)) fprintf (fp, "Command exited with non-zero status %d\n", WEXITSTATUS (resp->waitstatus)); + } /* Convert all times to milliseconds. Occasionally, one of these values comes out as zero. Dividing by zero causes problems, so we first Index: time.spec =================================================================== RCS file: /cvs/extras/rpms/time/devel/time.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- time.spec 19 Feb 2008 10:43:13 -0000 1.22 +++ time.spec 4 Mar 2008 13:04:13 -0000 1.23 @@ -1,12 +1,13 @@ Summary: A GNU utility for monitoring a program's use of system resources Name: time Version: 1.7 -Release: 32%{?dist} +Release: 33%{?dist} License: GPLv2+ Group: Applications/System Url: http://www.gnu.org/software/time/ Source: ftp://prep.ai.mit.edu/pub/gnu/%{name}/%{name}-%{version}.tar.gz Patch: time-1.7-destdir.patch +Patch1: time-1.7-verbose.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -19,6 +20,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build echo "ac_cv_func_wait3=\${ac_cv_func_wait3='yes'}" >> config.cache @@ -49,6 +51,9 @@ %{_infodir}/time.info* %changelog +* Tue Mar 4 2008 Roman Rakus - 1.7-33 +- Added patch from JW (redhat at zacglen.com), less nonverbose output + * Tue Feb 19 2008 Fedora Release Engineering - 1.7-32 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 13:08:25 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Tue, 4 Mar 2008 13:08:25 GMT Subject: rpms/tclx/devel tclx.spec,1.21,1.22 Message-ID: <200803041308.m24D8Pwp002859@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/tclx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2835 Modified Files: tclx.spec Log Message: Fix typo in spec file description. Index: tclx.spec =================================================================== RCS file: /cvs/pkgs/rpms/tclx/devel/tclx.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- tclx.spec 19 Feb 2008 14:34:42 -0000 1.21 +++ tclx.spec 4 Mar 2008 13:07:38 -0000 1.22 @@ -26,7 +26,7 @@ %description Extended Tcl (TclX) is a set of extensions to the Tcl programming language. Extended Tcl is oriented towards system programming tasks and large -application development. TclX provides additional interfaces to the +application development. TclX provides additional interfaces to the operating system, and adds many new programming constructs, text manipulation and debugging tools. This package contains the tclx documentation. From fedora-extras-commits at redhat.com Tue Mar 4 13:09:47 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 13:09:47 GMT Subject: rpms/cups/devel cups.spec,1.399,1.400 cups-locale.patch,1.2,NONE Message-ID: <200803041309.m24D9lrD002900@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2872 Modified Files: cups.spec Removed Files: cups-locale.patch Log Message: Don't need this patch. Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.399 retrieving revision 1.400 diff -u -r1.399 -r1.400 --- cups.spec 4 Mar 2008 12:18:57 -0000 1.399 +++ cups.spec 4 Mar 2008 13:09:10 -0000 1.400 @@ -31,7 +31,6 @@ Patch6: cups-includeifexists.patch Patch7: cups-banners.patch Patch8: cups-serverbin-compat.patch -Patch9: cups-locale.patch Patch10: cups-no-export-ssllibs.patch Patch11: cups-paps.patch Patch12: cups-wbuffer.patch @@ -146,7 +145,6 @@ %patch6 -p1 -b .includeifexists %patch7 -p1 -b .banners %patch8 -p1 -b .serverbin-compat -%patch9 -p1 -b .locale %patch10 -p1 -b .no-export-ssllibs %patch11 -p1 -b .paps %patch12 -p1 -b .wbuffer --- cups-locale.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 13:16:16 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 13:16:16 GMT Subject: rpms/lbrickbuster2/F-8 lbrickbuster2-callback-fix.patch, NONE, 1.1 lbrickbuster2-default-fullscreen.patch, NONE, 1.1 lbrickbuster2-rebrand-images.patch, NONE, 1.1 lbrickbuster2-save-shared-hiscore.patch, NONE, 1.1 lbrickbuster2.desktop, NONE, 1.1 lbrickbuster2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041316.m24DGGU8003073@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lbrickbuster2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3032 Modified Files: .cvsignore sources Added Files: lbrickbuster2-callback-fix.patch lbrickbuster2-default-fullscreen.patch lbrickbuster2-rebrand-images.patch lbrickbuster2-save-shared-hiscore.patch lbrickbuster2.desktop lbrickbuster2.spec Log Message: * Thu Feb 28 2008 Hans de Goede 2.6-0.9.beta7 - Rebrand to lbrickbuster2 to avoid potential trademark issues - Cleanup specfile - Submit for Fedora inclusion lbrickbuster2-callback-fix.patch: --- NEW FILE lbrickbuster2-callback-fix.patch --- --- lbreakout2-2.6beta-7/client/menu.c 2005-02-16 22:07:31.000000000 +0100 +++ lbreakout2-2.6beta-7.new/client/menu.c 2008-02-28 22:20:46.000000000 +0100 @@ -201,6 +201,9 @@ case SDLK_RIGHT: if ( !menu->cur_item ) break; item_used = 1; + /* callback */ + callback = menu->cur_item->callback; + /* action */ switch ( menu->cur_item->type ) { case ITEM_SWITCH: case ITEM_SWITCH_X: @@ -210,13 +213,18 @@ default: item_used = 0; break; } #ifdef AUDIO_ENABLED - if ( item_used ) + if ( item_used ) { stk_sound_play( wav_menu_click ); #endif + if ( callback ) (callback)(); + } break; case SDLK_LEFT: if ( !menu->cur_item ) break; item_used = 1; + /* callback */ + callback = menu->cur_item->callback; + /* action */ switch ( menu->cur_item->type ) { case ITEM_SWITCH: case ITEM_SWITCH_X: @@ -226,9 +234,11 @@ default: item_used = 0; break; } #ifdef AUDIO_ENABLED - if ( item_used ) + if ( item_used ) { stk_sound_play( wav_menu_click ); #endif + if ( callback ) (callback)(); + } break; case SDLK_UP: menu_up( menu ); lbrickbuster2-default-fullscreen.patch: --- NEW FILE lbrickbuster2-default-fullscreen.patch --- diff -up lbreakout2-2.6beta-7/client/config.c~ lbreakout2-2.6beta-7/client/config.c --- lbreakout2-2.6beta-7/client/config.c~ 2008-03-04 11:47:59.000000000 +0100 +++ lbreakout2-2.6beta-7/client/config.c 2008-03-04 11:47:59.000000000 +0100 @@ -104,7 +104,7 @@ void config_reset() config.audio_buffer_size = 512; /* graphics */ config.anim = 2; - config.fullscreen = 0; + config.fullscreen = 1; config.fade = 1; config.bonus_info = 1; config.fps = 0; lbrickbuster2-rebrand-images.patch: --- NEW FILE lbrickbuster2-rebrand-images.patch --- diff -up lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.am~ lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.am --- lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.am~ 2008-02-28 20:31:45.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.am 2008-02-28 20:31:45.000000000 +0100 @@ -1,6 +1,5 @@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png back5.png \ -bricks.png extras.png fr_left.png fr_right.png fr_top.png \ -life.png menuback.png paddle.png shot.png weapon.png \ +bricks.png extras.png life.png paddle.png shot.png weapon.png \ ABOUT README install-data-local: diff -up lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.am~ lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.am --- lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.am~ 2008-02-28 20:32:27.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.am 2008-02-28 20:32:27.000000000 +0100 @@ -1,6 +1,5 @@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png back5.png \ -bricks.png extras.png fr_left.png fr_right.png fr_top.png \ -fr_mp_left.png fr_mp_right.png \ +bricks.png extras.png \ life.png paddle.png \ ABOUT diff -up lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.am~ lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.am --- lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.am~ 2008-02-28 20:32:47.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.am 2008-02-28 20:32:47.000000000 +0100 @@ -1,5 +1,5 @@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png \ -bricks.png fr_left.png fr_right.png fr_top.png \ +bricks.png \ life.png paddle.png \ README diff -up lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.in~ lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.in --- lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.in~ 2008-02-28 20:32:05.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/AbsoluteB/Makefile.in 2008-02-28 20:32:05.000000000 +0100 @@ -195,8 +195,7 @@ warp_flag = @warp_flag@ win32_deps = @win32_deps@ win32_inst_script = @win32_inst_script@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png back5.png \ -bricks.png extras.png fr_left.png fr_right.png fr_top.png \ -life.png menuback.png paddle.png shot.png weapon.png \ +bricks.png extras.png life.png paddle.png shot.png weapon.png \ ABOUT README all: all-am diff -up lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.in~ lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.in --- lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.in~ 2008-02-28 20:32:37.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/Moiree/Makefile.in 2008-02-28 20:32:37.000000000 +0100 @@ -195,8 +195,7 @@ warp_flag = @warp_flag@ win32_deps = @win32_deps@ win32_inst_script = @win32_inst_script@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png back5.png \ -bricks.png extras.png fr_left.png fr_right.png fr_top.png \ -fr_mp_left.png fr_mp_right.png \ +bricks.png extras.png \ life.png paddle.png \ ABOUT diff -up lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.in~ lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.in --- lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.in~ 2008-02-28 20:32:55.000000000 +0100 +++ lbreakout2-2.6beta-7/client/gfx/Oz/Makefile.in 2008-02-28 20:32:55.000000000 +0100 @@ -195,7 +195,7 @@ warp_flag = @warp_flag@ win32_deps = @win32_deps@ win32_inst_script = @win32_inst_script@ EXTRA_DIST = back0.png back1.png back2.png back3.png back4.png \ -bricks.png fr_left.png fr_right.png fr_top.png \ +bricks.png \ life.png paddle.png \ README lbrickbuster2-save-shared-hiscore.patch: --- NEW FILE lbrickbuster2-save-shared-hiscore.patch --- diff -up lbreakout2-2.6beta-7/client/main.c~ lbreakout2-2.6beta-7/client/main.c --- lbreakout2-2.6beta-7/client/main.c~ 2008-02-29 19:06:20.000000000 +0100 +++ lbreakout2-2.6beta-7/client/main.c 2008-02-29 19:23:55.000000000 +0100 @@ -19,6 +19,11 @@ #include #endif +#ifdef __unix__ +#define _GNU_SOURCE /* this must be done before the first include of unistd.h */ +#include +#endif + #include "lbreakout.h" #include "../game/game.h" #include "file.h" @@ -34,6 +39,8 @@ #include "client.h" #include "../gui/gui.h" +#define CHART_FILE_NAME "lbrickbuster2.hscr" + extern int stk_quit_request; extern SDL_Surface *stk_display; extern Config config; @@ -49,6 +56,8 @@ extern int gameSeed; char msgbuf[MAX_MSG_SIZE]; int msglen = 0; +FILE *hi_dir_chart_file = NULL; + int main(int argc, char *argv[]) { int result = ACTION_NONE; @@ -56,6 +65,19 @@ int main(int argc, char *argv[]) char *editor_file = 0; char path[512]; SDL_Surface *loading; +#ifdef __unix__ + gid_t realgid; + + hi_dir_chart_file = fopen(HI_DIR "/" CHART_FILE_NAME, "r+"); + + /* This is where we drop our setuid/setgid privileges. + */ + realgid = getgid(); + if (setresgid(-1, realgid, realgid) != 0) { + perror("Could not drop setgid privileges. Aborting."); + exit(1); + } +#endif /* i18n */ #ifdef ENABLE_NLS @@ -211,6 +233,9 @@ int main(int argc, char *argv[]) stk_surface_free( &loading ); config_save(); + + if (hi_dir_chart_file) + fclose(hi_dir_chart_file); return EXIT_SUCCESS; } diff -up lbreakout2-2.6beta-7/client/chart.c~ lbreakout2-2.6beta-7/client/chart.c --- lbreakout2-2.6beta-7/client/chart.c~ 2008-02-29 19:10:47.000000000 +0100 +++ lbreakout2-2.6beta-7/client/chart.c 2008-02-29 19:20:48.000000000 +0100 @@ -31,6 +31,7 @@ int chart_level_offset = 0; /* level off extern SDL_Surface *stk_display; extern Config config; extern StkFont *cfont, *chfont, *ccfont; /* normal, highlight and caption font */ +extern FILE *hi_dir_chart_file; /* ==================================================================== @@ -121,8 +122,16 @@ int chart_load_from_path( char *path ) sprintf( file_name, "%s/%s", path, CHART_FILE_NAME ); /* clear chart list */ list_clear( charts ); - /* open file */ - file = fopen( file_name, "rb" ); + + if (!strcmp(path, HI_DIR) && hi_dir_chart_file) { + file = hi_dir_chart_file; + rewind(hi_dir_chart_file); + } + else { + /* open file */ + file = fopen( file_name, "rb" ); + } + if ( file ) { /* test if it's new format or old one. */ fread( aux, sizeof( char ), 3, file ); aux[3] = 0; @@ -152,20 +161,23 @@ int chart_load_from_path( char *path ) chart_read_entries( file, file_name, chart ); list_add( charts, chart ); } - fclose( file ); + if (file != hi_dir_chart_file) + fclose( file ); } else { fprintf( stderr, _("Highscore chart doesn't exist in '%s'... creating new one.\n"), path ); chart = chart_set_create( "LBreakout2" ); list_add( charts, chart ); } - /* test if writing is allowed without changing actual contents */ - if ( ( file = fopen( file_name, "a" ) ) == 0 ) { - fprintf( stderr, _("Write permission for '%s' denied.\n"), file_name ); - return 0; + if (file != hi_dir_chart_file) { + /* test if writing is allowed without changing actual contents */ + if ( ( file = fopen( file_name, "a" ) ) == 0 ) { + fprintf( stderr, _("Write permission for '%s' denied.\n"), file_name ); + return 0; + } + else + fclose( file ); } - else - fclose( file ); strcpy( chart_path, path ); chart_loaded = 1; return 1; @@ -232,8 +244,16 @@ void chart_save() if ( !chart_loaded ) return; /* full file name */ sprintf( file_name, "%s/%s", chart_path, CHART_FILE_NAME ); - /* open file */ - file = fopen( file_name, "w" ); + + if (!strcmp(chart_path, HI_DIR) && hi_dir_chart_file) { + file = hi_dir_chart_file; + rewind(hi_dir_chart_file); + } + else { + /* open file */ + file = fopen( file_name, "w" ); + } + if ( !file ) { fprintf( stderr, _("??? Highscore chart loaded properly but cannot save? (%s)\n"),file_name ); return; @@ -245,7 +265,9 @@ void chart_save() for ( i = 0; i < CHART_ENTRY_COUNT; i++ ) fprintf( file, "%s\n%i\n%i\n", chart->entries[i].name, chart->entries[i].level, chart->entries[i].score ); } - fclose( file ); + + if (file != hi_dir_chart_file) + fclose( file ); } /* ==================================================================== --- NEW FILE lbrickbuster2.desktop --- [Desktop Entry] Name=Linux Brickbuster 2 Comment=Brickbuster arcade game Exec=lbrickbuster2 Icon=lbrickbuster2 Terminal=false Type=Application Categories=Game;ArcadeGame;BlocksGame; --- NEW FILE lbrickbuster2.spec --- # we ship lbreakout2 under a different name because of trademark concerns %define realname lbreakout2 %define prever beta-7 %define _prever beta7 Name: lbrickbuster2 Version: 2.6 Release: 0.9.%{_prever}%{?dist} Summary: Brickbuster arcade game License: GPLv2+ Group: Amusements/Games URL: http://lgames.sourceforge.net/ Source0: http://downloads.sourceforge.net/lgames/%{realname}-%{version}%{prever}.tar.gz # replacement art changing the logos from lbreakout2 to lbrickbuster2 Source1: %{name}-art.tar.gz Source2: %{name}.desktop Patch0: lbrickbuster2-rebrand-images.patch Patch1: lbrickbuster2-callback-fix.patch Patch2: lbrickbuster2-save-shared-hiscore.patch Patch3: lbrickbuster2-default-fullscreen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel libpng-devel ImageMagick desktop-file-utils BuildRequires: gettext Requires: hicolor-icon-theme # obsolete non rebranded freshrpms version Obsoletes: lbreakout2 <= %{version}-%{release} Provides: lbreakout2 = %{version}-%{release} %description The successor to LBrickBuster offers you a new challenge in more than 50 levels with loads of new bonuses (goldshower, joker, explosive balls, bonus magnet ...), maluses (chaos, darkness, weak balls, malus magnet ...) and special bricks (growing bricks, explosive bricks, regenerative bricks ...). If you are still hungry for more after that you can create your own levelsets with the integrated level editor. %prep %setup -q -a 1 -n %{realname}-%{version}%{prever} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 # fully automated rebrand to lbrickbuster for i in `find -type f -not -name "*.png" -not -name "*.wav"`; do touch -r $i $i.stamp sed -i -e 's/Breakout/Brickbuster/g' -e 's/breakout/brickbuster/g' $i touch -r $i.stamp $i rm $i.stamp done # and rename some files to match mv client/lbreakout.h client/lbrickbuster.h mv client/levels/LBreakout1 client/levels/LBrickbuster1 mv client/levels/LBreakout2 client/levels/LBrickbuster2 # install replacement art and remove themes overrides mv fr_top.png menuback.png client/gfx/AbsoluteB mv client/gfx/AbsoluteB/fr_*.png client/gfx/AbsoluteB/menuback.png client/gfx rm client/gfx/Oz/fr_*.png client/gfx/Moiree/fr_*.png # rebranding done, other fixes / cleanups below sed -i 's|/usr/doc/%{name}|%{_defaultdocdir}/%{name}|g' po/*.po client/help.c iconv -f ISO_8859-1 -t utf-8 ChangeLog > ChangeLog.tmp touch -r ChangeLog ChangeLog.tmp mv ChangeLog.tmp ChangeLog %build %configure --localstatedir=%{_var}/games --with-docdir=%{_defaultdocdir} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -p -m 644 AUTHORS COPYING ChangeLog README TODO \ $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} %find_lang %{name} # Install desktop entry mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} convert lbreakout48.gif \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png touch -r lbreakout48.gif \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc %{_defaultdocdir}/%{name} %attr(2755, root, games) %{_bindir}/%{name} %{_bindir}/%{name}server %{_datadir}/%{name} %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/applications/fedora-%{name}.desktop %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) %{_var}/games/%{name}.hscr %changelog * Thu Feb 28 2008 Hans de Goede 2.6-0.9.beta7 - Rebrand to lbrickbuster2 to avoid potential trademark issues - Cleanup specfile - Submit for Fedora inclusion * Tue Aug 28 2006 Matthias Saou 2.6-0.8.beta - Update to 2.6beta-7. * Mon May 29 2006 Matthias Saou 2.6-0.7.beta - Update to 2.6beta-6. * Fri Mar 17 2006 Matthias Saou 2.6-0.6.beta - Release bump to drop the disttag number in FC5 build. * Wed Nov 30 2005 Matthias Saou 2.6-0.5.beta - Update to 2.6beta-5. * Mon Nov 14 2005 Matthias Saou 2.6-0.4.beta - Update to 2.6beta-4. - No longer override datadir to datadir/games/ to get the locales installed. - Include translations. * Fri Oct 21 2005 Matthias Saou 2.6-0.3.beta - Update to 2.6beta-3. * Thu Oct 20 2005 Matthias Saou 2.6-0.2.beta - Update to 2.6beta-2 (use ugly temp "-2" instead of complex macros). - Missing common/gettext.h, doesn't build, reported upstream, so beta-3 out. * Tue May 17 2005 Matthias Saou 2.6-0.1.beta - Update to 2.6beta. * Fri Jan 14 2005 Matthias Saou 2.5.2-1 - Update to 2.5.2. * Sun Sep 26 2004 Matthias Saou 2.5.1-1 - Update to 2.5.1. * Mon Aug 9 2004 Matthias Saou 2.5-1 - Update to 2.5 final. * Mon Jun 21 2004 Matthias Saou 2.5-0.beta8.1 - Update to 2.5beta-8. * Mon Jun 14 2004 Matthias Saou 2.5-0.beta6.1 - Update to 2.5beta-6. * Tue May 18 2004 Matthias Saou 2.5-0.beta5.1 - Update to 2.5beta-5. - Change the gif pixmap to png. * Fri Nov 7 2003 Matthias Saou 2.5-0.beta3.1 - Update to 2.5beta-3. - Added missing zlib and libpng dependencies. - Rebuild for Fedora Core 1. * Mon Mar 31 2003 Matthias Saou - Rebuilt for Red Hat Linux 9. * Sun Mar 9 2003 Matthias Saou - Update to 2.4.1. * Fri Jan 3 2003 Matthias Saou - Update to 2.4. * Sat Oct 26 2002 Matthias Saou - Fixed the menu entry, thanks to Erwin J. Prinz. * Sat Sep 28 2002 Matthias Saou - Rebuilt for Red Hat Linux 8.0. - New menu entry with icon. * Mon Sep 23 2002 Matthias Saou - Update to 2.3.5. * Tue Sep 10 2002 Matthias Saou - Update to 2.3.3. * Tue Sep 10 2002 Matthias Saou - Update to 2.3.3. * Mon Aug 19 2002 Matthias Saou - Update to 2.3.2. * Wed Aug 14 2002 Matthias Saou - Update to 2.3.1. * Thu May 2 2002 Matthias Saou - Rebuilt against Red Hat Linux 7.3. - Added the %{?_smp_mflags} expansion. * Sun Feb 24 2002 Matthias Saou - Update to 2.2.2. * Tue Feb 5 2002 Matthias Saou - Update to 2.2.1. * Mon Jan 28 2002 Matthias Saou - Update to 2.2. * Sun Jan 6 2002 Matthias Saou - Update to 2.1.2. * Tue Jan 1 2002 Matthias Saou - Update to 2.1.1. * Sat Dec 8 2001 Matthias Saou - Update to 2.0.1. * Thu Nov 29 2001 Matthias Saou - Update to 2.0-pre2. * Thu Nov 22 2001 Matthias Saou - Update to 2.0beta2. * Tue Apr 10 2001 Matthias Saou - Update to 010315. * Mon Nov 27 2000 Matthias Saou - Initial RPM release for RedHat 7.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lbrickbuster2/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2008 20:11:57 -0000 1.1 +++ .cvsignore 4 Mar 2008 13:15:42 -0000 1.2 @@ -0,0 +1,2 @@ +lbreakout2-2.6beta-7.tar.gz +lbrickbuster2-art.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lbrickbuster2/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2008 20:11:57 -0000 1.1 +++ sources 4 Mar 2008 13:15:42 -0000 1.2 @@ -0,0 +1,2 @@ +bccede972d2f73612c47ca6a5aa9770e lbreakout2-2.6beta-7.tar.gz +ba46348775c0aa51532c0c06e23615f8 lbrickbuster2-art.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 13:41:54 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Tue, 4 Mar 2008 13:41:54 GMT Subject: rpms/coreutils/F-7 coreutils-6.9-longoptions.patch, NONE, 1.1 coreutils-5.2.1-runuser.patch, 1.16, 1.17 coreutils-DIR_COLORS, 1.1, 1.2 coreutils-DIR_COLORS.xterm, 1.1, 1.2 coreutils-colorls.csh, 1.3, 1.4 coreutils-colorls.sh, 1.3, 1.4 coreutils-split-pam.patch, 1.1, 1.2 coreutils.spec, 1.176, 1.177 Message-ID: <200803041341.m24DfsMu003345@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3294 Modified Files: coreutils-5.2.1-runuser.patch coreutils-DIR_COLORS coreutils-DIR_COLORS.xterm coreutils-colorls.csh coreutils-colorls.sh coreutils-split-pam.patch coreutils.spec Added Files: coreutils-6.9-longoptions.patch Log Message: Various changes - backport from F8/Devel, see changelog for details coreutils-6.9-longoptions.patch: --- NEW FILE coreutils-6.9-longoptions.patch --- diff -urp coreutils-6.9-orig/src/echo.c coreutils-6.9/src/echo.c --- coreutils-6.9-orig/src/echo.c +++ coreutils-6.9/src/echo.c @@ -163,6 +163,10 @@ main (int argc, char **argv) { case 'e': case 'E': case 'n': break; + case '-': + /* end of short options(allows to print -n,-e or -E) */ + argc--; + argv++; default: goto just_echo; } diff -urp coreutils-6.9-orig/lib/long-options.c coreutils-6.9/lib/long-options.c --- coreutils-6.9-orig/lib/long-options.c +++ coreutils-6.9/lib/long-options.c @@ -57,8 +57,7 @@ parse_long_options (int argc, /* Don't print an error message for unrecognized options. */ opterr = 0; - if (argc == 2 - && (c = getopt_long (argc, argv, "+", long_options, NULL)) != -1) + while ((c = getopt_long (argc, argv, "+", long_options, NULL)) != -1) { switch (c) { coreutils-5.2.1-runuser.patch: Index: coreutils-5.2.1-runuser.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-7/coreutils-5.2.1-runuser.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- coreutils-5.2.1-runuser.patch 25 Oct 2007 11:21:09 -0000 1.16 +++ coreutils-5.2.1-runuser.patch 4 Mar 2008 13:41:39 -0000 1.17 @@ -330,7 +330,7 @@ +to set user ID, the command will fail. +.TP +-, \fB\-l\fR, \fB\-\-login\fR -+make the shell a login shell ++make the shell a login shell, uses runuser-l PAM file instead of default one. +.TP +\fB\-c\fR, \fB\-\-commmand\fR=\fICOMMAND\fR +pass a single COMMAND to the shell with \fB\-c\fR Index: coreutils-DIR_COLORS =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-7/coreutils-DIR_COLORS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coreutils-DIR_COLORS 14 Feb 2007 12:33:54 -0000 1.1 +++ coreutils-DIR_COLORS 4 Mar 2008 13:41:39 -0000 1.2 @@ -15,8 +15,9 @@ OPTIONS -F -T 0 # Below, there should be one TERM entry for each termtype that is colorizable -TERM linux -TERM console +TERM Eterm +TERM ansi +TERM color-xterm TERM con132x25 TERM con132x30 TERM con132x43 @@ -28,20 +29,34 @@ TERM con80x50 TERM con80x60 TERM cons25 -TERM xterm -TERM rxvt -TERM xterm-color -TERM color-xterm -TERM vt100 +TERM console +TERM cygwin TERM dtterm -TERM color_xterm -TERM ansi -TERM screen -TERM screen.linux -TERM kon -TERM kterm +TERM eterm-color TERM gnome TERM konsole +TERM kterm +TERM linux +TERM linux-c +TERM mach-color +TERM mlterm +TERM putty +TERM rxvt +TERM rxvt-cygwin +TERM rxvt-cygwin-native +TERM rxvt-unicode +TERM screen +TERM screen-256color +TERM screen-bce +TERM screen-w +TERM screen.linux +TERM vt100 +TERM xterm +TERM xterm-16color +TERM xterm-256color +TERM xterm-88color +TERM xterm-color +TERM xterm-debian # EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output) EIGHTBIT 1 @@ -78,24 +93,71 @@ .bat 01;32 .sh 01;32 .csh 01;32 -.tar 01;31 # archives or compressed (bright red) +# archives or compressed (bright red) +.tar 01;31 .tgz 01;31 +.svgz 01;31 .arj 01;31 .taz 01;31 .lzh 01;31 +.lzma 01;31 .zip 01;31 .z 01;31 .Z 01;31 +.dz 01;31 .gz 01;31 .bz2 01;31 +.tbz2 01;31 .bz 01;31 .tz 01;31 +.deb 01;31 .rpm 01;31 +.jar 01;31 +.rar 01;31 +.ace 01;31 +.zoo 01;31 .cpio 01;31 -.jpg 01;35 # image formats +.7z 01;31 +.rz 01;31 +# image formats (magenta) +.jpg 01;35 +.jpeg 01;35 .gif 01;35 .bmp 01;35 +.pbm 01;35 +.pgm 01;35 +.ppm 01;35 +.tga 01;35 .xbm 01;35 .xpm 01;35 -.png 01;35 .tif 01;35 +.tiff 01;35 +.png 01;35 +.mng 01;35 +.pcx 01;35 +.mov 01;35 +.mpg 01;35 +.mpeg 01;35 +.m2v 01;35 +.mkv 01;35 +.ogm 01;35 +.mp4 01;35 +.m4v 01;35 +.mp4v 01;35 +.vob 01;35 +.qt 01;35 +.nuv 01;35 +.wmv 01;35 +.asf 01;35 +.rm 01;35 +.rmvb 01;35 +.flc 01;35 +.avi 01;35 +.fli 01;35 +.gl 01;35 +.dl 01;35 +.xcf 01;35 +.xwd 01;35 +.yuv 01;35 +.svg 01;35 + Index: coreutils-DIR_COLORS.xterm =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-7/coreutils-DIR_COLORS.xterm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coreutils-DIR_COLORS.xterm 14 Feb 2007 12:33:54 -0000 1.1 +++ coreutils-DIR_COLORS.xterm 4 Mar 2008 13:41:39 -0000 1.2 @@ -29,7 +29,11 @@ TERM con80x60 TERM cons25 TERM xterm +TERM xterm-16color +TERM xterm-88color +TERM xterm-256color TERM rxvt +TERM rxvt-unicode TERM xterm-color TERM color-xterm TERM vt100 @@ -71,24 +75,70 @@ .bat 00;32 .sh 00;32 .csh 00;32 -.tar 00;31 # archives or compressed (red) +# archives or compressed (red) +.tar 00;31 .tgz 00;31 +.svgz 00;31 .arj 00;31 .taz 00;31 .lzh 00;31 +.lzma 00;31 .zip 00;31 .z 00;31 .Z 00;31 +.dz 00;31 .gz 00;31 .bz2 00;31 +.tbz2 00;31 .bz 00;31 .tz 00;31 +.deb 00;31 .rpm 00;31 +.jar 00;31 +.rar 00;31 +.ace 00;31 +.zoo 00;31 .cpio 00;31 -.jpg 00;35 # image formats +.7z 00;31 +.rz 00;31 +# image formats +.jpg 00;35 +.jpeg 00;35 .gif 00;35 .bmp 00;35 +.pbm 00;35 +.pgm 00;35 +.ppm 00;35 +.tga 00;35 .xbm 00;35 .xpm 00;35 -.png 00;35 .tif 00;35 +.tiff 00;35 +.png 00;35 +.mng 00;35 +.pcx 00;35 +.mov 00;35 +.mpg 00;35 +.mpeg 00;35 +.m2v 00;35 +.mkv 00;35 +.ogm 00;35 +.mp4 00;35 +.m4v 00;35 +.mp4v 00;35 +.vob 00;35 +.qt 00;35 +.nuv 00;35 +.wmv 00;35 +.asf 00;35 +.rm 00;35 +.rmvb 00;35 +.flc 00;35 +.avi 00;35 +.fli 00;35 +.gl 00;35 +.dl 00;35 +.xcf 00;35 +.xwd 00;35 +.yuv 00;35 +.svg 00;35 Index: coreutils-colorls.csh =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-7/coreutils-colorls.csh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- coreutils-colorls.csh 26 Feb 2007 13:04:00 -0000 1.3 +++ coreutils-colorls.csh 4 Mar 2008 13:41:39 -0000 1.4 @@ -1,4 +1,11 @@ # color-ls initialization +if ( $?LS_COLORS ) then + if ( "$LS_COLORS" != "" ) then + #do not override user specified LS_COLORS and use them + goto finish + endif +endif + alias ll 'ls -l' alias l. 'ls -d .*' @@ -7,11 +14,9 @@ if ( -e "/etc/DIR_COLORS.$TERM" ) set COLORS="/etc/DIR_COLORS.$TERM" endif if ( -f ~/.dircolors ) set COLORS=~/.dircolors -if ($?TERM) then - if ( -f ~/.dircolors."$TERM" ) set COLORS=~/.dircolors."$TERM" -endif if ( -f ~/.dir_colors ) set COLORS=~/.dir_colors if ($?TERM) then + if ( -f ~/.dircolors."$TERM" ) set COLORS=~/.dircolors."$TERM" if ( -f ~/.dir_colors."$TERM" ) set COLORS=~/.dir_colors."$TERM" endif @@ -19,14 +24,16 @@ eval `dircolors -c $COLORS` -if ( "$LS_COLORS" == '' ) then - exit -endif +if ( "$LS_COLORS" == '' ) exit set color_none=`sed -n '/^COLOR.*none/Ip' < $COLORS` -if ( "$color_none" == '' ) then -alias ll 'ls -l --color=tty' -alias l. 'ls -d .* --color=tty' -alias ls 'ls --color=tty' +if ( "$color_none" != '' ) then + unset color_none + exit endif unset color_none + +finish: +alias ll 'ls -l --color=auto' +alias l. 'ls -d .* --color=auto' +alias ls 'ls --color=auto' Index: coreutils-colorls.sh =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-7/coreutils-colorls.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- coreutils-colorls.sh 26 Feb 2007 13:04:00 -0000 1.3 +++ coreutils-colorls.sh 4 Mar 2008 13:41:39 -0000 1.4 @@ -1,21 +1,36 @@ # color-ls initialization -alias ll='ls -l' 2>/dev/null -alias l.='ls -d .*' 2>/dev/null +#do not override user LS_COLORS, but use them. +if [ -z "$LS_COLORS" ]; then + + alias ll='ls -l' 2>/dev/null + alias l.='ls -d .*' 2>/dev/null -COLORS=/etc/DIR_COLORS -[ -e "/etc/DIR_COLORS.$TERM" ] && COLORS="/etc/DIR_COLORS.$TERM" -[ -e "$HOME/.dircolors" ] && COLORS="$HOME/.dircolors" -[ -e "$HOME/.dircolors.$TERM" ] && COLORS="$HOME/.dircolors.$TERM" -[ -e "$HOME/.dir_colors" ] && COLORS="$HOME/.dir_colors" -[ -e "$HOME/.dir_colors.$TERM" ] && COLORS="$HOME/.dir_colors.$TERM" -[ -e "$COLORS" ] || return - -eval `dircolors --sh "$COLORS"` -[ -z "$LS_COLORS" ] && return - -if ! egrep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null ; then - alias ll='ls -l --color=tty' 2>/dev/null - alias l.='ls -d .* --color=tty' 2>/dev/null - alias ls='ls --color=tty' 2>/dev/null + + # Skip the rest for noninteractive shells. + [ -z "$PS1" ] && return + + COLORS= + + for colors in "$HOME/.dir_colors.$TERM" "$HOME/.dircolors.$TERM" \ + "$HOME/.dir_colors" "$HOME/.dircolors"; do + [ -e "$colors" ] && COLORS="$colors" && break + done + + if [ -z "$COLORS" ]; then + for colors in "/etc/DIR_COLORS.$TERM" "/etc/DIR_COLORS" ; do + [ -e "$colors" ] && COLORS="$colors" && break + done + fi + + # Existence of $COLORS already checked above. + [ -n "$COLORS" ] || return + + eval `dircolors --sh "$COLORS" 2>/dev/null` + [ -z "$LS_COLORS" ] && return + egrep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return fi + +alias ll='ls -l --color=auto' 2>/dev/null +alias l.='ls -d .* --color=auto' 2>/dev/null +alias ls='ls --color=auto' 2>/dev/null coreutils-split-pam.patch: Index: coreutils-split-pam.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-7/coreutils-split-pam.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coreutils-split-pam.patch 13 Jul 2006 12:01:32 -0000 1.1 +++ coreutils-split-pam.patch 4 Mar 2008 13:41:39 -0000 1.2 @@ -28,3 +28,30 @@ PAM_BAIL_P; #ifndef RUNUSER +diff -urp coreutils-6.9-orig/doc/coreutils.info coreutils-6.10/doc/coreutils.info +--- coreutils-6.9-orig/doc/coreutils.info ++++ coreutils-6.9/doc/coreutils.info +@@ -11006,7 +11006,8 @@ options::. + set, even for the super-user, as described above), and set `PATH' + to a compiled-in default value. Change to USER's home directory. + Prepend `-' to the shell's name, intended to make it read its +- login startup file(s). ++ login startup file(s). When this option is given, /etc/pam.d/su-l ++ PAM file is used instead of the default one. + + `-m' + `-p' +diff -urp coreutils-6.10-orig/doc/coreutils.texi coreutils-6.10/doc/coreutils.texi +--- coreutils-6.9-orig/doc/coreutils.texi ++++ coreutils-6.9/doc/coreutils.texi +@@ -13670,7 +13670,9 @@ the exit status of @var{command} otherwi + + @command{su} allows one user to temporarily become another user. It runs a + command (often an interactive shell) with the real and effective user +-ID, group ID, and supplemental groups of a given @var{user}. Synopsis: ++ID, group ID, and supplemental groups of a given @var{user}. When the -l ++option is given, the su-l PAM file is used instead of the default su PAM file. ++Synopsis: + + @example + su [@var{option}]@dots{} [@var{user} [@var{arg}]@dots{}] Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-7/coreutils.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- coreutils.spec 5 Dec 2007 13:53:39 -0000 1.176 +++ coreutils.spec 4 Mar 2008 13:41:39 -0000 1.177 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.9 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -25,6 +25,7 @@ # Our patches Patch100: coreutils-chgrp.patch Patch101: coreutils-getdateYYYYMMDD.patch +Patch102: coreutils-6.9-longoptions.patch # sh-utils Patch703: sh-utils-2.0.11-dateman.patch @@ -98,6 +99,7 @@ # Our patches %patch100 -p1 -b .chgrp %patch101 -p1 -b .getdate +%patch102 -p1 -b .longopts # sh-utils %patch703 -p1 -b .dateman @@ -283,6 +285,19 @@ /sbin/runuser %changelog +* Tue Mar 04 2008 Ondrej Vasik 6.9-7 +- su-l/runuser-l pam file usage a bit documented(#368721) +- added several missing colored TERMS(#239266) +- added several missing image/compressed file extensions +- some optimalizations of colorls.sh + (#430813, #430827, #430823, #430189, #433190) +- fix unability of echo to display certain strings( + added -- separator, #431005) , do not require only one + long_opt for certain commands like sleep, yes - but + use first usable (#431005) +- keep old csh/sh usermodified colorls shell scripts + (#432154) + * Wed Dec 05 2007 Ondrej Vasik 6.9-6 - fixed bug in handling YYYYMMDD date format with relative signed offset(#377821) From fedora-extras-commits at redhat.com Tue Mar 4 14:05:59 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 14:05:59 GMT Subject: rpms/bluez-gnome/devel bluez-gnome.spec,1.43,1.44 Message-ID: <200803041405.m24E5x8l010759@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10670 Modified Files: bluez-gnome.spec Log Message: * Tue Mar 04 2008 - Bastien Nocera - 0.23-2 - Add dependency on a gvfs with ObexFTP support Index: bluez-gnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- bluez-gnome.spec 24 Feb 2008 19:13:42 -0000 1.43 +++ bluez-gnome.spec 4 Mar 2008 14:05:05 -0000 1.44 @@ -1,6 +1,6 @@ Name: bluez-gnome Version: 0.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bluetooth pairing and control applet Group: Applications/System @@ -21,8 +21,7 @@ Obsoletes: bluez-pin Provides: dbus-bluez-pin-helper -#FIXME we should require a version of gvfs with obexftp support instead -#Requires: gnome-vfs2-obexftp +Requires: gvfs >= 0.1.9 Requires: obex-data-server Requires(post): shared-mime-info @@ -139,6 +138,9 @@ %{_datadir}/man/man1/bluetooth-analyzer.1.gz %changelog +* Tue Mar 04 2008 - Bastien Nocera - 0.23-2 +- Add dependency on a gvfs with ObexFTP support + * Sun Feb 24 2008 - Bastien Nocera - 0.23-1 - Update to 0.23 From fedora-extras-commits at redhat.com Tue Mar 4 14:07:00 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Tue, 4 Mar 2008 14:07:00 GMT Subject: rpms/stalonetray/F-7 stalonetray.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041407.m24E70lN010860@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/stalonetray/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10810/F-7 Modified Files: .cvsignore sources Added Files: stalonetray.spec Log Message: import also on f7/f8 --- NEW FILE stalonetray.spec --- # Review request: # https://bugzilla.redhat.com/show_bug.cgi?id=434593 Name: stalonetray Version: 0.7.6 Release: 2%{?dist} Summary: A stand alone notification area Group: User Interface/Desktops # License is only mentioned in COPYING License: GPLv2+ URL: http://stalonetray.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel %description The stalonetray is a STAnd-aLONE system TRAY (notification area). It has minimal build and run-time dependencies: the Xlib only. The XEMBED support is planned. Stalonetray runs under virtually any window manager. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %doc stalonetrayrc.sample stalonetray.html stalonetray.xml %{_bindir}/stalonetray %{_mandir}/man1/stalonetray.* %changelog * Wed Feb 27 2008 Sebastian Vahl - 0.7.6-2 - license is GPLv2+ - some minor changes in spec * Tue Jan 15 2008 Sebastian Vahl - 0.7.6-1 - New upstream version: 0.7.6 * Wed Oct 31 2007 Sebastian Vahl - 0.7.3-1 - New upstream version: 0.7.3 * Tue Sep 25 2007 Sebastian Vahl - 0.7-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stalonetray/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2008 18:53:47 -0000 1.1 +++ .cvsignore 4 Mar 2008 14:06:21 -0000 1.2 @@ -0,0 +1 @@ +stalonetray-0.7.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/stalonetray/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2008 18:53:47 -0000 1.1 +++ sources 4 Mar 2008 14:06:21 -0000 1.2 @@ -0,0 +1 @@ +eebb46182b64d75b89776bbfc867f470 stalonetray-0.7.6.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 14:07:14 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl)) Date: Tue, 4 Mar 2008 14:07:14 GMT Subject: rpms/stalonetray/F-8 stalonetray.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041407.m24E7ElD010869@cvs-int.fedora.redhat.com> Author: svahl Update of /cvs/extras/rpms/stalonetray/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10810/F-8 Modified Files: .cvsignore sources Added Files: stalonetray.spec Log Message: import also on f7/f8 --- NEW FILE stalonetray.spec --- # Review request: # https://bugzilla.redhat.com/show_bug.cgi?id=434593 Name: stalonetray Version: 0.7.6 Release: 2%{?dist} Summary: A stand alone notification area Group: User Interface/Desktops # License is only mentioned in COPYING License: GPLv2+ URL: http://stalonetray.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel %description The stalonetray is a STAnd-aLONE system TRAY (notification area). It has minimal build and run-time dependencies: the Xlib only. The XEMBED support is planned. Stalonetray runs under virtually any window manager. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %doc stalonetrayrc.sample stalonetray.html stalonetray.xml %{_bindir}/stalonetray %{_mandir}/man1/stalonetray.* %changelog * Wed Feb 27 2008 Sebastian Vahl - 0.7.6-2 - license is GPLv2+ - some minor changes in spec * Tue Jan 15 2008 Sebastian Vahl - 0.7.6-1 - New upstream version: 0.7.6 * Wed Oct 31 2007 Sebastian Vahl - 0.7.3-1 - New upstream version: 0.7.3 * Tue Sep 25 2007 Sebastian Vahl - 0.7-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stalonetray/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Feb 2008 18:53:47 -0000 1.1 +++ .cvsignore 4 Mar 2008 14:06:30 -0000 1.2 @@ -0,0 +1 @@ +stalonetray-0.7.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/stalonetray/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Feb 2008 18:53:47 -0000 1.1 +++ sources 4 Mar 2008 14:06:30 -0000 1.2 @@ -0,0 +1 @@ +eebb46182b64d75b89776bbfc867f470 stalonetray-0.7.6.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 14:34:16 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 4 Mar 2008 14:34:16 GMT Subject: rpms/python-lxml/EL-5 .cvsignore, 1.9, 1.10 python-lxml.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200803041434.m24EYGuD011315@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11290 Modified Files: .cvsignore python-lxml.spec sources Log Message: Update to 2.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Dec 2007 00:04:24 -0000 1.9 +++ .cvsignore 4 Mar 2008 14:33:40 -0000 1.10 @@ -1 +1 @@ -lxml-1.3.6.tgz +lxml-2.0.2.tgz Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/python-lxml.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- python-lxml.spec 16 Dec 2007 00:04:24 -0000 1.11 +++ python-lxml.spec 4 Mar 2008 14:33:40 -0000 1.12 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 1.3.6 +Version: 2.0.2 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -11,9 +11,13 @@ Source0: http://codespeak.net/lxml/lxml-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel BuildRequires: libxslt-devel -BuildRequires: python-setuptools-devel + +%if 0%{?fedora} >= 8 +BuildRequires: python-setuptools-devel +%else +BuildRequires: python-setuptools +%endif %description lxml provides a Python binding to the libxslt and libxml2 libraries. @@ -29,11 +33,11 @@ chmod a-x doc/rest2html.py %build -CFLAGS="%{optflags}" %{__python} setup.py build +CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} -%{__python} setup.py install --skip-build --root %{buildroot} +%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} %clean rm -rf %{buildroot} @@ -44,6 +48,15 @@ %{python_sitearch}/* %changelog +* Sat Feb 23 2008 Jeffrey C. Ollie - 2.0.2-1 +- Update to 2.0.2 + +* Tue Feb 19 2008 Jeffrey C. Ollie - 2.0.1-1 +- Update to 2.0.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.3.6-2 +- Autorebuild for GCC 4.3 + * Mon Nov 4 2007 Jeffrey C. Ollie - 1.3.6-1 - Update to 1.3.6. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Dec 2007 00:04:24 -0000 1.9 +++ sources 4 Mar 2008 14:33:40 -0000 1.10 @@ -1 +1 @@ -a66f3b9669ee4fd2f98b6be920ac583c lxml-1.3.6.tgz +ddfa5354726d4bb5de54a8685bdc87a2 lxml-2.0.2.tgz From fedora-extras-commits at redhat.com Tue Mar 4 14:42:27 2008 From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch)) Date: Tue, 4 Mar 2008 14:42:27 GMT Subject: rpms/gdb/devel gdb-6.3-rh-testversion-20041202.patch, 1.1, 1.2 gdb.spec, 1.272, 1.273 gdb-6.3-rh-changelogs-20041202.patch, 1.2, NONE Message-ID: <200803041442.m24EgRJa011574@cvs-int.fedora.redhat.com> Author: jkratoch Update of /cvs/pkgs/rpms/gdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11526 Modified Files: gdb-6.3-rh-testversion-20041202.patch gdb.spec Removed Files: gdb-6.3-rh-changelogs-20041202.patch Log Message: * Tue Mar 4 2008 Jan Kratochvil - 6.7.50.20080227-2 - Drop the unused `ChangeLog.RedHat' file stubs. - New rpm option `--with upstream' to drop the Fedora patches for testing. - Drop some no longer valid .spec file comments. - Include the Fortran dynamic arrays entry for %changlog of 6.7.50.20080227-1. gdb-6.3-rh-testversion-20041202.patch: Index: gdb-6.3-rh-testversion-20041202.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.3-rh-testversion-20041202.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-rh-testversion-20041202.patch 2 Dec 2004 15:42:08 -0000 1.1 +++ gdb-6.3-rh-testversion-20041202.patch 4 Mar 2008 14:42:19 -0000 1.2 @@ -9,8 +9,8 @@ -re ".\[0-9\]+ = +.+ +0x.*\[0-9.\]+.*$gdb_prompt $" { pass "printed version with cast" } -+ -re ".\[0-9\]+ = .Red Hat Linux \[\\(\\)0-9.a-z\\-\]+.*$gdb_prompt $" { -+ pass "printed version Red Had Linux only" ++ -re ".\[0-9\]+ = .Fedora \[\\(\\)0-9.a-z\\-\]+.*$gdb_prompt $" { ++ pass "printed version Fedora only" + } -re ".*$gdb_prompt $" { fail "printed version" } timeout { fail "(timeout) printed version" } Index: gdb.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- gdb.spec 3 Mar 2008 16:13:47 -0000 1.272 +++ gdb.spec 4 Mar 2008 14:42:19 -0000 1.273 @@ -1,6 +1,7 @@ # rpmbuild parameters: # --with testsuite: Run the testsuite (biarch if possible). Default is without. # --with debug: Build without optimizations and without splitting the debuginfo. +# --with upstream: No Fedora specific patches get applied. Summary: A GNU source-level debugger for C, C++, Java and other languages Name: gdb%{?_with_debug:-debug} @@ -11,7 +12,8 @@ Version: 6.7.50.20080227 # The release always contains a leading reserved number, start it at 1. -Release: 1%{?dist} +# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. +Release: 2%{?_with_upstream:.upstream}%{?dist} License: GPL Group: Development/Debuggers @@ -40,34 +42,25 @@ Obsoletes: pstack < 1.2-7.2.2.1 Provides: pstack = 1.2-7.2.2.1 -# GDB patches have the format gdb--bz-.patch; -# should include the ChangeLog.RedHat change-log entry; and should be -# created using diff -u ./gdb (not gdb-6.3/gdb). +# GDB patches have the format `gdb--bz-.patch'. +# They should be created using patch level 1: diff -up ./gdb (or gdb-6.3/gdb). -# Red Hat local patches +# Cleanup any leftover testsuite processes as it may stuck mock(1) builds. +Source2: gdb-orphanripper.c -Patch0: gdb-6.3-rh-changelogs-20041202.patch +# Man page for gstack(1). +Source3: gdb-gstack.man # Work around out-of-date dejagnu that does not have KFAIL Patch1: gdb-6.3-rh-dummykfail-20041202.patch -# Match Red Hat's version info +# Match the Fedora's version info. Patch2: gdb-6.3-rh-testversion-20041202.patch # Check that libunwind works - new test then fix Patch3: gdb-6.3-rh-testlibunwind-20041202.patch Patch4: gdb-6.3-rh-testlibunwind1fix-20041202.patch -# Cleanup any leftover testsuite processes as it may stuck mock(1) builds. -Source2: gdb-orphanripper.c - -# Man page for gstack(1). -Source3: gdb-gstack.man - -# ------------------------------------------ - -# Add fixes starting at 100 - # Recognize i386 signal trampolines before CFI. Ensures that signal # frames are identified as signal frames. Patch101: gdb-6.3-sigx86-20040621.patch @@ -406,10 +399,13 @@ # Apply patches defined above. +# Match the Fedora's version info. +%patch2 -p1 + +%if 0%{!?_with_upstream:1} + #%patch232 -p1 -%patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -508,6 +504,8 @@ find -name "*.orig" | xargs rm -f ! find -name "*.rej" # Should not happen. +%endif # 1%{?_with_upstream:0} + # Change the version that gets printed at GDB startup, so it is Fedora # specific. cat > gdb/version.in << _FOO @@ -537,29 +535,29 @@ g77="`which gfortran 2>/dev/null || true`" test -z "$g77" || ln -s "$g77" ./g77 -# FIXME: The configure option --enable-gdb-build-warnings=,-Werror -# below can conflict with user settings. For instance, passing a -# combination of -Wall and -O0 from the file rpmrc will always cause -# at least one warning, and stop the compilation. The whole configury -# line needs to be cleaned up. - export CFLAGS="$RPM_OPT_FLAGS" %if 0%{?_with_debug:1} +# --enable-werror could conflict with `-Wall -O0' but this is no longer true +# for recent GCCs. CFLAGS="$CFLAGS -O0 -ggdb2" %endif -enable_build_warnings="--enable-gdb-build-warnings=,-Wno-unused" -%ifarch %{ix86} alpha ia64 ppc s390 s390x x86_64 ppc64 -enable_build_warnings="$enable_build_warnings,-Werror" -%endif - ../configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --sysconfdir=%{_sysconfdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ - $enable_build_warnings \ + --enable-gdb-build-warnings=,-Wno-unused \ +%ifnarch %{ix86} alpha ia64 ppc s390 s390x x86_64 ppc64 + --disable-werror \ +%else +%if 0%{?_with_upstream:1} + --disable-werror \ +%else + --enable-werror \ +%endif +%endif --with-separate-debug-dir=/usr/lib/debug \ --disable-sim \ --disable-rpath \ @@ -737,6 +735,12 @@ %{_mandir}/*/gdbserver.1* %changelog +* Tue Mar 4 2008 Jan Kratochvil - 6.7.50.20080227-2 +- Drop the unused `ChangeLog.RedHat' file stubs. +- New rpm option `--with upstream' to drop the Fedora patches for testing. +- Drop some no longer valid .spec file comments. +- Include the Fortran dynamic arrays entry for %%changlog of 6.7.50.20080227-1. + * Mon Mar 3 2008 Jan Kratochvil - 6.7.50.20080227-1 - Upgrade to the upstream gdb-6.8 prerelease. - Cleanup the leftover `.orig' files during %%prep. @@ -744,6 +748,7 @@ - `--with testsuite' now also BuildRequires: fpc - Backport fix of a segfault + PIE regression since 6.7.1 on PIE executables. - Update the printed GDB version string to be Fedora specific. +- Fix/implement the Fortran dynamic arrays support (BZ 377541). * Sat Mar 1 2008 Jan Kratochvil - 6.7.1-16 - Run the full testsuite also in the `-fPIE -pie' mode. --- gdb-6.3-rh-changelogs-20041202.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 14:43:27 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Tue, 4 Mar 2008 14:43:27 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.2-Gestures.patch, NONE, 1.1 kdebase-workspace.spec, 1.42, 1.43 Message-ID: <200803041443.m24EhRO4011670@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11629 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.2-Gestures.patch Log Message: disable gestures as default kdebase-workspace-4.0.2-Gestures.patch: --- NEW FILE kdebase-workspace-4.0.2-Gestures.patch --- diff -up kdebase-workspace-4.0.2/doc/ksysguard/index.docbook.orig kdebase-workspace-4.0.2/doc/ksysguard/index.docbook diff -up kdebase-workspace-4.0.2/kcontrol/access/kcmaccess.cpp.orig kdebase-workspace-4.0.2/kcontrol/access/kcmaccess.cpp --- kdebase-workspace-4.0.2/kcontrol/access/kcmaccess.cpp.orig 2008-03-04 15:31:22.000000000 +0100 +++ kdebase-workspace-4.0.2/kcontrol/access/kcmaccess.cpp 2008-03-04 15:32:18.000000000 +0100 @@ -697,7 +697,7 @@ void KAccessConfig::load() bounceKeysDelay->setValue(keyboardGroup.readEntry("BounceKeysDelay", 500)); bounceKeysRejectBeep->setChecked(keyboardGroup.readEntry("BounceKeysRejectBeep", true)); - gestures->setChecked(keyboardGroup.readEntry("Gestures", true)); + gestures->setChecked(keyboardGroup.readEntry("Gestures", false)); timeout->setChecked(keyboardGroup.readEntry("AccessXTimeout", false)); timeoutDelay->setValue(keyboardGroup.readEntry("AccessXTimeoutDelay", 30)); Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- kdebase-workspace.spec 3 Mar 2008 13:38:38 -0000 1.42 +++ kdebase-workspace.spec 4 Mar 2008 14:42:51 -0000 1.43 @@ -6,7 +6,7 @@ Name: kdebase-workspace Version: 4.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -15,11 +15,13 @@ Patch1: kdebase-workspace-4.0.1-redhat-startkde.patch Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch +Patch3: kdebase-workspace-4.0.2-Gestures.patch + # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu) # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886 -Patch3: kdebase-workspace-4.0.2-kde#155362.patch +Patch100: kdebase-workspace-4.0.2-kde#155362.patch # upstream patch -Patch4: kdebase-workspace-4.0.x-kcontrol-crash.patch +Patch101: kdebase-workspace-4.0.x-kcontrol-crash.patch # upgrade path for former kde-redhat'ers Obsoletes: kdebase-kdm < 6:%{version}-%{release} @@ -106,8 +108,9 @@ %patch1 -p1 -b .redhat-startkde # ConsoleKit support for KDM (#228111, kde#147790) %patch2 -p1 -b .consolekit -%patch3 -p1 -b .kde#155362 -%patch4 -p0 -b .kcontrol-crash +%patch3 -p1 -b .gestures +%patch100 -p1 -b .kde#155362 +%patch101 -p0 -b .kcontrol-crash %build @@ -220,6 +223,9 @@ %changelog +* Tue Mar 04 2008 Than Ngo 4.0.2-4 +- disable gestures as default + * Mon Mar 03 2008 Than Ngo 4.0.2-3 - apply upstream patch to fix crash in khotkeys From fedora-extras-commits at redhat.com Tue Mar 4 14:47:19 2008 From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek)) Date: Tue, 4 Mar 2008 14:47:19 GMT Subject: rpms/gvfs/devel .cvsignore, 1.9, 1.10 gvfs.spec, 1.23, 1.24 sources, 1.9, 1.10 Message-ID: <200803041447.m24ElJW7011781@cvs-int.fedora.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11753 Modified Files: .cvsignore gvfs.spec sources Log Message: * Tue Mar 04 2008 Tomas Bzatek - 0.1.9-1 - Update to 0.1.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 25 Feb 2008 21:02:35 -0000 1.9 +++ .cvsignore 4 Mar 2008 14:46:30 -0000 1.10 @@ -1 +1 @@ -gvfs-0.1.8.tar.bz2 +gvfs-0.1.9.tar.bz2 Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gvfs.spec 26 Feb 2008 13:44:02 -0000 1.23 +++ gvfs.spec 4 Mar 2008 14:46:30 -0000 1.24 @@ -1,6 +1,6 @@ Summary: Backends for the gio framework in GLib Name: gvfs -Version: 0.1.8 +Version: 0.1.9 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -24,8 +24,8 @@ BuildRequires: perl(XML::Parser) BuildRequires: GConf2-devel -# From head: -Patch1: gvfs-libxml.patch +## From head: +# Patch1: gvfs-libxml.patch %description The gvfs package provides backend implementations for the gio @@ -43,12 +43,12 @@ %prep %setup -q -# Don't trigger autoregen: -touch -r configure time1 -touch -r configure.ac time2 -%patch1 -p1 -b .libxml -touch -r time1 configure -touch -r time2 configure.ac +## Don't trigger autoregen: +# touch -r configure time1 +# touch -r configure.ac time2 +# %patch1 -p1 -b .libxml +# touch -r time1 configure +# touch -r time2 configure.ac %build %configure @@ -92,6 +92,8 @@ %{_datadir}/gvfs/mounts/dns-sd.mount %{_datadir}/gvfs/mounts/gphoto2.mount %{_datadir}/gvfs/mounts/network.mount +%{_datadir}/gvfs/mounts/obexftp.mount +%{_datadir}/gvfs/mounts/ftp.mount %{_datadir}/dbus-1/services/gvfs-daemon.service %{_libdir}/libgvfscommon.so.* %{_libdir}/gio/modules/libgiohal-volume-monitor.so @@ -113,6 +115,8 @@ %{_libexecdir}/gvfsd-dnssd %{_libexecdir}/gvfsd-gphoto2 %{_libexecdir}/gvfsd-network +%{_libexecdir}/gvfsd-obexftp +%{_libexecdir}/gvfsd-ftp %{_bindir}/gvfs-cat %{_bindir}/gvfs-copy %{_bindir}/gvfs-info @@ -138,6 +142,9 @@ %{_libdir}/libgvfscommon.so %changelog +* Tue Mar 04 2008 Tomas Bzatek - 0.1.9-1 +- Update to 0.1.9 + * Mon Feb 25 2008 Alexander Larsson - 0.1.8-1 - Update to 0.1.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 25 Feb 2008 21:02:35 -0000 1.9 +++ sources 4 Mar 2008 14:46:30 -0000 1.10 @@ -1 +1 @@ -2bcfd0d39d27397be4fbb7ff42a57aab gvfs-0.1.8.tar.bz2 +f7ba11755f84fdc00b0c1e39e97fb695 gvfs-0.1.9.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 14:58:47 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 4 Mar 2008 14:58:47 GMT Subject: rpms/desktop-file-utils/devel .cvsignore, 1.12, 1.13 desktop-file-utils.spec, 1.46, 1.47 sources, 1.12, 1.13 Message-ID: <200803041458.m24EwlSx011930@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/desktop-file-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11896 Modified Files: .cvsignore desktop-file-utils.spec sources Log Message: 0.15 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/desktop-file-utils/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 30 Nov 2007 19:36:29 -0000 1.12 +++ .cvsignore 4 Mar 2008 14:57:55 -0000 1.13 @@ -1 +1 @@ -desktop-file-utils-0.14.tar.gz +desktop-file-utils-0.15.tar.gz Index: desktop-file-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- desktop-file-utils.spec 19 Feb 2008 22:36:24 -0000 1.46 +++ desktop-file-utils.spec 4 Mar 2008 14:57:55 -0000 1.47 @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.14 -Release: 3%{?dist} +Version: 0.15 +Release: 1%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz # https://bugs.freedesktop.org/show_bug.cgi?id=12018 @@ -46,6 +46,9 @@ %{_datadir}/emacs/site-lisp/ %changelog +* Tue Mar 4 2008 Matthias Clasen - 0.15-1 +- Update to 0.15 + * Tue Feb 19 2008 Fedora Release Engineering - 0.14-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/desktop-file-utils/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Nov 2007 19:36:29 -0000 1.12 +++ sources 4 Mar 2008 14:57:55 -0000 1.13 @@ -1 +1 @@ -e0b5057a4e3166f34635ac6f27c712c0 desktop-file-utils-0.14.tar.gz +2fe8ebe222fc33cd4a959415495b7eed desktop-file-utils-0.15.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 15:00:53 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 4 Mar 2008 15:00:53 GMT Subject: rpms/python-lxml/EL-4 .cvsignore, 1.9, 1.10 python-lxml.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <200803041500.m24F0rTv011998@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11952 Modified Files: .cvsignore python-lxml.spec sources Log Message: Update to 2.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 15 Dec 2007 23:54:37 -0000 1.9 +++ .cvsignore 4 Mar 2008 15:00:02 -0000 1.10 @@ -1 +1 @@ -lxml-1.3.6.tgz +lxml-2.0.2.tgz Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/python-lxml.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- python-lxml.spec 15 Dec 2007 23:54:37 -0000 1.12 +++ python-lxml.spec 4 Mar 2008 15:00:02 -0000 1.13 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 1.3.6 +Version: 2.0.2 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -11,9 +11,13 @@ Source0: http://codespeak.net/lxml/lxml-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel BuildRequires: libxslt-devel -BuildRequires: python-setuptools-devel + +%if 0%{?fedora} >= 8 +BuildRequires: python-setuptools-devel +%else +BuildRequires: python-setuptools +%endif %description lxml provides a Python binding to the libxslt and libxml2 libraries. @@ -29,11 +33,11 @@ chmod a-x doc/rest2html.py %build -CFLAGS="%{optflags}" %{__python} setup.py build +CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} -%{__python} setup.py install --skip-build --root %{buildroot} +%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} %clean rm -rf %{buildroot} @@ -44,6 +48,15 @@ %{python_sitearch}/* %changelog +* Sat Feb 23 2008 Jeffrey C. Ollie - 2.0.2-1 +- Update to 2.0.2 + +* Tue Feb 19 2008 Jeffrey C. Ollie - 2.0.1-1 +- Update to 2.0.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.3.6-2 +- Autorebuild for GCC 4.3 + * Mon Nov 4 2007 Jeffrey C. Ollie - 1.3.6-1 - Update to 1.3.6. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/EL-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 15 Dec 2007 23:54:37 -0000 1.9 +++ sources 4 Mar 2008 15:00:02 -0000 1.10 @@ -1 +1 @@ -a66f3b9669ee4fd2f98b6be920ac583c lxml-1.3.6.tgz +ddfa5354726d4bb5de54a8685bdc87a2 lxml-2.0.2.tgz From fedora-extras-commits at redhat.com Tue Mar 4 15:01:38 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 4 Mar 2008 15:01:38 GMT Subject: rpms/desktop-file-utils/devel desktop-file-utils.spec,1.47,1.48 Message-ID: <200803041501.m24F1cev019162@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/desktop-file-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11984 Modified Files: desktop-file-utils.spec Log Message: 0.15 Index: desktop-file-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- desktop-file-utils.spec 4 Mar 2008 14:57:55 -0000 1.47 +++ desktop-file-utils.spec 4 Mar 2008 15:00:48 -0000 1.48 @@ -14,8 +14,6 @@ Obsoletes: desktop-file-validator -Patch0: desktop-file-utils-0.14-make-icon-extension-non-fatal.patch - %description .desktop files are used to describe an application for inclusion in GNOME or KDE menus. This package contains desktop-file-validate which @@ -26,7 +24,6 @@ %prep %setup -q -%patch0 -p1 -b .make-icon-extension-non-fatal %build %configure @@ -48,6 +45,7 @@ %changelog * Tue Mar 4 2008 Matthias Clasen - 0.15-1 - Update to 0.15 +- Drop upstreamed patch * Tue Feb 19 2008 Fedora Release Engineering - 0.14-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 15:03:15 2008 From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek)) Date: Tue, 4 Mar 2008 15:03:15 GMT Subject: rpms/gvfs/devel gvfs.spec,1.24,1.25 Message-ID: <200803041503.m24F3Fjm019296@cvs-int.fedora.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19204 Modified Files: gvfs.spec Log Message: adding bluez-libs-devel dependency Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gvfs.spec 4 Mar 2008 14:46:30 -0000 1.24 +++ gvfs.spec 4 Mar 2008 15:02:39 -0000 1.25 @@ -23,6 +23,7 @@ BuildRequires: gettext-devel BuildRequires: perl(XML::Parser) BuildRequires: GConf2-devel +BuildRequires: bluez-libs-devel >= 3.12 ## From head: # Patch1: gvfs-libxml.patch From fedora-extras-commits at redhat.com Tue Mar 4 15:03:22 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 4 Mar 2008 15:03:22 GMT Subject: rpms/python-lxml/F-8 .cvsignore, 1.9, 1.10 python-lxml.spec, 1.14, 1.15 sources, 1.9, 1.10 Message-ID: <200803041503.m24F3MBs019303@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19228 Modified Files: .cvsignore python-lxml.spec sources Log Message: Update to 2.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-8/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 15 Dec 2007 23:50:16 -0000 1.9 +++ .cvsignore 4 Mar 2008 15:02:47 -0000 1.10 @@ -1 +1 @@ -lxml-1.3.6.tgz +lxml-2.0.2.tgz Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-8/python-lxml.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-lxml.spec 15 Dec 2007 23:50:16 -0000 1.14 +++ python-lxml.spec 4 Mar 2008 15:02:47 -0000 1.15 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 1.3.6 +Version: 2.0.2 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -11,9 +11,13 @@ Source0: http://codespeak.net/lxml/lxml-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel BuildRequires: libxslt-devel -BuildRequires: python-setuptools-devel + +%if 0%{?fedora} >= 8 +BuildRequires: python-setuptools-devel +%else +BuildRequires: python-setuptools +%endif %description lxml provides a Python binding to the libxslt and libxml2 libraries. @@ -29,11 +33,11 @@ chmod a-x doc/rest2html.py %build -CFLAGS="%{optflags}" %{__python} setup.py build +CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} -%{__python} setup.py install --skip-build --root %{buildroot} +%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} %clean rm -rf %{buildroot} @@ -44,6 +48,15 @@ %{python_sitearch}/* %changelog +* Sat Feb 23 2008 Jeffrey C. Ollie - 2.0.2-1 +- Update to 2.0.2 + +* Tue Feb 19 2008 Jeffrey C. Ollie - 2.0.1-1 +- Update to 2.0.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.3.6-2 +- Autorebuild for GCC 4.3 + * Mon Nov 4 2007 Jeffrey C. Ollie - 1.3.6-1 - Update to 1.3.6. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-8/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 15 Dec 2007 23:50:16 -0000 1.9 +++ sources 4 Mar 2008 15:02:47 -0000 1.10 @@ -1 +1 @@ -a66f3b9669ee4fd2f98b6be920ac583c lxml-1.3.6.tgz +ddfa5354726d4bb5de54a8685bdc87a2 lxml-2.0.2.tgz From fedora-extras-commits at redhat.com Tue Mar 4 15:04:34 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 4 Mar 2008 15:04:34 GMT Subject: rpms/python-lxml/F-7 .cvsignore, 1.9, 1.10 python-lxml.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200803041504.m24F4YiD019432@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19383 Modified Files: .cvsignore python-lxml.spec sources Log Message: Update to 2.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-7/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Dec 2007 00:02:56 -0000 1.9 +++ .cvsignore 4 Mar 2008 15:03:48 -0000 1.10 @@ -1 +1 @@ -lxml-1.3.6.tgz +lxml-2.0.2.tgz Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-7/python-lxml.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- python-lxml.spec 16 Dec 2007 00:02:56 -0000 1.11 +++ python-lxml.spec 4 Mar 2008 15:03:48 -0000 1.12 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 1.3.6 +Version: 2.0.2 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -11,9 +11,13 @@ Source0: http://codespeak.net/lxml/lxml-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel BuildRequires: libxslt-devel -BuildRequires: python-setuptools-devel + +%if 0%{?fedora} >= 8 +BuildRequires: python-setuptools-devel +%else +BuildRequires: python-setuptools +%endif %description lxml provides a Python binding to the libxslt and libxml2 libraries. @@ -29,11 +33,11 @@ chmod a-x doc/rest2html.py %build -CFLAGS="%{optflags}" %{__python} setup.py build +CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} -%{__python} setup.py install --skip-build --root %{buildroot} +%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} %clean rm -rf %{buildroot} @@ -44,6 +48,15 @@ %{python_sitearch}/* %changelog +* Sat Feb 23 2008 Jeffrey C. Ollie - 2.0.2-1 +- Update to 2.0.2 + +* Tue Feb 19 2008 Jeffrey C. Ollie - 2.0.1-1 +- Update to 2.0.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.3.6-2 +- Autorebuild for GCC 4.3 + * Mon Nov 4 2007 Jeffrey C. Ollie - 1.3.6-1 - Update to 1.3.6. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-7/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Dec 2007 00:02:56 -0000 1.9 +++ sources 4 Mar 2008 15:03:48 -0000 1.10 @@ -1 +1 @@ -a66f3b9669ee4fd2f98b6be920ac583c lxml-1.3.6.tgz +ddfa5354726d4bb5de54a8685bdc87a2 lxml-2.0.2.tgz From fedora-extras-commits at redhat.com Tue Mar 4 15:09:49 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 4 Mar 2008 15:09:49 GMT Subject: rpms/wpa_supplicant/F-8 wpa_supplicant-fix-deprecated-dbus-function.patch, 1.1, 1.2 wpa_supplicant.spec, 1.44, 1.45 Message-ID: <200803041509.m24F9neQ019615@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/wpa_supplicant/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19590 Modified Files: wpa_supplicant-fix-deprecated-dbus-function.patch wpa_supplicant.spec Log Message: * Tue Mar 4 2008 Dan Williams - 0.5.10-2 - Fix a potential use-after-free in the D-Bus byte array demarshalling code wpa_supplicant-fix-deprecated-dbus-function.patch: Index: wpa_supplicant-fix-deprecated-dbus-function.patch =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant-fix-deprecated-dbus-function.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wpa_supplicant-fix-deprecated-dbus-function.patch 15 Mar 2007 18:48:00 -0000 1.1 +++ wpa_supplicant-fix-deprecated-dbus-function.patch 4 Mar 2008 15:09:40 -0000 1.2 @@ -65,7 +65,7 @@ + /* Zero-length arrays are valid. */ + if (entry->array_len == 0) { + free(entry->bytearray_value); -+ entry->strarray_value = NULL; ++ entry->bytearray_value = NULL; + } + success = TRUE; Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- wpa_supplicant.spec 3 Mar 2008 16:22:12 -0000 1.44 +++ wpa_supplicant.spec 4 Mar 2008 15:09:40 -0000 1.45 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.5.10 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -141,6 +141,9 @@ %{_bindir}/wpa_gui %changelog +* Tue Mar 4 2008 Dan Williams - 0.5.10-2 +- Fix a potential use-after-free in the D-Bus byte array demarshalling code + * Sun Mar 2 2008 Dan Williams - 0.5.10-1 - Update to latest stable release; remove upstreamed patches From fedora-extras-commits at redhat.com Tue Mar 4 15:11:16 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 4 Mar 2008 15:11:16 GMT Subject: rpms/pigment/devel .cvsignore, 1.5, 1.6 pigment.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200803041511.m24FBGBG019743@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/pigment/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19669 Modified Files: .cvsignore pigment.spec sources Log Message: Update to 0.3.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pigment/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Feb 2008 19:08:36 -0000 1.5 +++ .cvsignore 4 Mar 2008 15:10:34 -0000 1.6 @@ -1 +1 @@ -pigment-0.3.4.tar.gz +pigment-0.3.5.tar.gz Index: pigment.spec =================================================================== RCS file: /cvs/extras/rpms/pigment/devel/pigment.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pigment.spec 23 Feb 2008 23:41:59 -0000 1.6 +++ pigment.spec 4 Mar 2008 15:10:34 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Media Center Toolkit Name: pigment -Version: 0.3.4 +Version: 0.3.5 Release: 1%{?dist} License: LGPLv2+ Group: Applications/Multimedia @@ -91,6 +91,9 @@ %changelog +* Tue Mar 4 2008 Matthias Saou 0.3.5-1 +- Update to 0.3.5. + * Fri Feb 8 2008 Matthias Saou 0.3.4-1 - Update to 0.3.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pigment/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Feb 2008 19:08:36 -0000 1.5 +++ sources 4 Mar 2008 15:10:34 -0000 1.6 @@ -1 +1 @@ -612acbe8a6c8ca1a2a268c08d05d92e0 pigment-0.3.4.tar.gz +d63d4e59741af7aa6b5cf8e032643342 pigment-0.3.5.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 15:11:38 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 4 Mar 2008 15:11:38 GMT Subject: rpms/wpa_supplicant/devel wpa_supplicant-0.6.3-fix-dbus-use-after-free.patch, NONE, 1.1 wpa_supplicant.spec, 1.42, 1.43 Message-ID: <200803041511.m24FBc9x019764@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/wpa_supplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19713 Modified Files: wpa_supplicant.spec Added Files: wpa_supplicant-0.6.3-fix-dbus-use-after-free.patch Log Message: * Tue Mar 4 2008 Dan Williams - 1:0.6.3-2 - Fix a potential use-after-free in the D-Bus byte array demarshalling code wpa_supplicant-0.6.3-fix-dbus-use-after-free.patch: --- NEW FILE wpa_supplicant-0.6.3-fix-dbus-use-after-free.patch --- diff --git a/wpa_supplicant/dbus_dict_helpers.c b/wpa_supplicant/dbus_dict_helpers.c index 1232ab2..d810979 100644 --- a/wpa_supplicant/dbus_dict_helpers.c +++ b/wpa_supplicant/dbus_dict_helpers.c @@ -674,7 +674,7 @@ static dbus_bool_t _wpa_dbus_dict_entry_get_byte_array( /* Zero-length arrays are valid. */ if (entry->array_len == 0) { free(entry->bytearray_value); - entry->strarray_value = NULL; + entry->bytearray_value = NULL; } success = TRUE; Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- wpa_supplicant.spec 3 Mar 2008 17:20:11 -0000 1.42 +++ wpa_supplicant.spec 4 Mar 2008 15:11:01 -0000 1.43 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.6.3 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -19,6 +19,7 @@ Patch3: wpa_supplicant-0.5.7-flush-debug-output.patch Patch4: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch Patch5: wpa_supplicant-0.5.10-dbus-service-file.patch +Patch6: wpa_supplicant-0.6.3-fix-dbus-use-after-free.patch URL: http://w1.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +53,7 @@ %patch3 -p1 -b .flush-debug-output %patch4 -p1 -b .use-IW_ENCODE_TEMP %patch5 -p1 -b .dbus-service-file +%patch6 -p1 -b .use-after-free %build pushd src @@ -145,6 +147,9 @@ %{_bindir}/wpa_gui %changelog +* Tue Mar 4 2008 Dan Williams - 1:0.6.3-2 +- Fix a potential use-after-free in the D-Bus byte array demarshalling code + * Mon Mar 3 2008 Dan Williams - 1:0.6.3-1 - Update to latest development release; remove upstreamed patches From fedora-extras-commits at redhat.com Tue Mar 4 15:12:21 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 4 Mar 2008 15:12:21 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.50, 1.51 sources, 1.62, 1.63 system-config-services.spec, 1.61, 1.62 Message-ID: <200803041512.m24FCLRw019823@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19758 Modified Files: .cvsignore sources system-config-services.spec Log Message: implement custom runlevel menu Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 3 Mar 2008 21:43:10 -0000 1.50 +++ .cvsignore 4 Mar 2008 15:11:35 -0000 1.51 @@ -1 +1 @@ -system-config-services-0.99.4.tar.bz2 +system-config-services-0.99.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 3 Mar 2008 21:43:10 -0000 1.62 +++ sources 4 Mar 2008 15:11:35 -0000 1.63 @@ -1 +1 @@ -2b3160b6fb1205122a010f000ccd7df3 system-config-services-0.99.4.tar.bz2 +ff1b10d7e71f15c6248f96e350835b34 system-config-services-0.99.5.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- system-config-services.spec 3 Mar 2008 21:43:10 -0000 1.61 +++ system-config-services.spec 4 Mar 2008 15:11:35 -0000 1.62 @@ -16,7 +16,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.4 +Version: 0.99.5 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -107,6 +107,9 @@ %{_mandir}/*/system-config-services.8* %changelog +* Tue Mar 04 2008 Nils Philippsen - 0.99.5-1 +- implement custom runlevel menu + * Mon Mar 03 2008 Nils Philippsen - 0.99.4-1 - use gettext directly instead of rhpl - add popup menu for enabling SysV services in specific runlevels From fedora-extras-commits at redhat.com Tue Mar 4 15:13:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 15:13:34 +0000 Subject: [pkgdb] xorg-x11-server had acl change status Message-ID: <200803041514.m24FEWff021136@bastion.fedora.phx.redhat.com> Adam Jackson (ajax) has set the watchcommits acl on xorg-x11-server (Fedora devel) to Approved for Adam Jackson (ajax) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-server From fedora-extras-commits at redhat.com Tue Mar 4 15:13:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 15:13:39 +0000 Subject: [pkgdb] xorg-x11-server had acl change status Message-ID: <200803041514.m24FEWfi021136@bastion.fedora.phx.redhat.com> Adam Jackson (ajax) has set the watchcommits acl on xorg-x11-server (Fedora 7) to Approved for Adam Jackson (ajax) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-server From fedora-extras-commits at redhat.com Tue Mar 4 15:13:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 15:13:51 +0000 Subject: [pkgdb] xorg-x11-server had acl change status Message-ID: <200803041514.m24FEWfl021136@bastion.fedora.phx.redhat.com> Adam Jackson (ajax) has set the watchcommits acl on xorg-x11-server (Fedora 8) to Approved for Adam Jackson (ajax) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-server From fedora-extras-commits at redhat.com Tue Mar 4 15:16:36 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 4 Mar 2008 15:16:36 GMT Subject: rpms/pigment-python/devel .cvsignore, 1.2, 1.3 pigment-python.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803041516.m24FGaHs020043@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/pigment-python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19981 Modified Files: .cvsignore pigment-python.spec sources Log Message: Update to 0.3.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pigment-python/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Feb 2008 23:31:48 -0000 1.2 +++ .cvsignore 4 Mar 2008 15:16:02 -0000 1.3 @@ -1 +1 @@ -pigment-python-0.3.2.tar.gz +pigment-python-0.3.3.tar.gz Index: pigment-python.spec =================================================================== RCS file: /cvs/extras/rpms/pigment-python/devel/pigment-python.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pigment-python.spec 23 Feb 2008 23:31:48 -0000 1.1 +++ pigment-python.spec 4 Mar 2008 15:16:02 -0000 1.2 @@ -3,8 +3,8 @@ Summary: Python bindings to the Pigment Media Center Toolkit Name: pigment-python -Version: 0.3.2 -Release: 2%{?dist} +Version: 0.3.3 +Release: 1%{?dist} License: LGPLv2+ Group: Applications/Multimedia URL: http://elisa.fluendo.com/ @@ -12,9 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gstreamer-python Requires: pygtk2 -Requires: pigment >= 0.3.4 +Requires: pigment >= 0.3.5 BuildRequires: glib2-devel -BuildRequires: pigment-devel >= 0.3.4 +BuildRequires: pigment-devel >= 0.3.5 BuildRequires: python-devel BuildRequires: pygtk2-devel BuildRequires: gstreamer-devel @@ -62,9 +62,13 @@ %doc AUTHORS ChangeLog COPYING README TODO _tmp/examples/ %{python_sitelib}/pgm/ %{python_sitearch}/_pgm*.so +%{_datadir}/pigment-python/ %changelog +* Tue Mar 4 2008 Matthias Saou 0.3.3-1 +- Update to 0.3.3. + * Wed Feb 13 2008 Matthias Saou 0.3.2-2 - Add INSTALL="install -p" to the make install line, to preserve timestamps. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pigment-python/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Feb 2008 23:31:48 -0000 1.2 +++ sources 4 Mar 2008 15:16:02 -0000 1.3 @@ -1 +1 @@ -9d19b1a9c7055e551df5a0bd7cc0421c pigment-python-0.3.2.tar.gz +bfbc1976812f07436b57200574369926 pigment-python-0.3.3.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 15:16:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 15:16:51 GMT Subject: rpms/perl-Pod-Tests/devel perl-Pod-Tests.spec,1.6,1.7 Message-ID: <200803041516.m24FGpCl020085@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Pod-Tests/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19995 Modified Files: perl-Pod-Tests.spec Log Message: new perl Index: perl-Pod-Tests.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Pod-Tests/devel/perl-Pod-Tests.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Pod-Tests.spec 4 Sep 2007 12:36:50 -0000 1.6 +++ perl-Pod-Tests.spec 4 Mar 2008 15:16:06 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Pod-Tests Version: 0.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Extract embedded tests and code examples from POD License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 0.18-6 +- rebuild for new perl + * Tue Sep 04 2007 Ralf Cors??pius - 0.18-5 - Update license tag. - BR: perl(ExtUtils::MakeMaker). From fedora-extras-commits at redhat.com Tue Mar 4 15:19:46 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Tue, 4 Mar 2008 15:19:46 GMT Subject: rpms/kernel/devel patch-2.6.25-rc3-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.772, 1.773 kernel.spec, 1.472, 1.473 sources, 1.732, 1.733 upstream, 1.654, 1.655 patch-2.6.25-rc3-git4.bz2.sign, 1.1, NONE Message-ID: <200803041519.m24FJkjW020210@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20162 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.25-rc3-git5.bz2.sign Removed Files: patch-2.6.25-rc3-git4.bz2.sign Log Message: * Tue Mar 04 2008 Kyle McMartin - Linux 2.6.25-rc3-git5 --- NEW FILE patch-2.6.25-rc3-git5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBHzPRkyGugalF9Dw4RAhnhAJ4umDPYB/K8HS/ZYjlTQHJAaTOKAgCfRI1g 0W8cIJdwmy+7BM/A7CcqXwU= =HR4f -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.772 retrieving revision 1.773 diff -u -r1.772 -r1.773 --- .cvsignore 3 Mar 2008 15:09:40 -0000 1.772 +++ .cvsignore 4 Mar 2008 15:19:02 -0000 1.773 @@ -5,4 +5,4 @@ kernel-2.6.24 linux-2.6.24.tar.bz2 patch-2.6.25-rc3.bz2 -patch-2.6.25-rc3-git4.bz2 +patch-2.6.25-rc3-git5.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.472 retrieving revision 1.473 diff -u -r1.472 -r1.473 --- kernel.spec 4 Mar 2008 06:30:07 -0000 1.472 +++ kernel.spec 4 Mar 2008 15:19:02 -0000 1.473 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 3 # The git snapshot level -%define gitrev 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1748,6 +1748,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Tue Mar 04 2008 Kyle McMartin +- Linux 2.6.25-rc3-git5 + * Mon Mar 3 2008 Roland McGrath - x86_64: fix 32-bit process syscall restart (#434995) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.732 retrieving revision 1.733 diff -u -r1.732 -r1.733 --- sources 3 Mar 2008 15:09:40 -0000 1.732 +++ sources 4 Mar 2008 15:19:02 -0000 1.733 @@ -1,3 +1,3 @@ 3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2 01b1f6c7b35ba356129c121a81a77991 patch-2.6.25-rc3.bz2 -098e75ab0b399f89f36f07073207033f patch-2.6.25-rc3-git4.bz2 +502371869de4621e3b5c7c3027539032 patch-2.6.25-rc3-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.654 retrieving revision 1.655 diff -u -r1.654 -r1.655 --- upstream 3 Mar 2008 15:09:40 -0000 1.654 +++ upstream 4 Mar 2008 15:19:02 -0000 1.655 @@ -1,3 +1,3 @@ linux-2.6.24.tar.bz2 patch-2.6.25-rc3.bz2 -patch-2.6.25-rc3-git4.bz2 +patch-2.6.25-rc3-git5.bz2 --- patch-2.6.25-rc3-git4.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 15:19:50 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Tue, 4 Mar 2008 15:19:50 GMT Subject: rpms/elilo/devel .cvsignore, 1.10, 1.11 elilo.spec, 1.27, 1.28 sources, 1.11, 1.12 Message-ID: <200803041519.m24FJobc020215@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/elilo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20171 Modified Files: .cvsignore elilo.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/elilo/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 10 Jan 2008 14:25:35 -0000 1.10 +++ .cvsignore 4 Mar 2008 15:19:16 -0000 1.11 @@ -1,2 +1,3 @@ elilo-3.4.tar.gz elilo-3.6.src.tgz +fpswa.tar.gz Index: elilo.spec =================================================================== RCS file: /cvs/pkgs/rpms/elilo/devel/elilo.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- elilo.spec 18 Feb 2008 22:57:49 -0000 1.27 +++ elilo.spec 4 Mar 2008 15:19:16 -0000 1.28 @@ -3,17 +3,18 @@ Group: System Environment/Base Obsoletes: eli Version: 3.6 -Release: 8 +Release: 9 License: GPL URL: http://elilo.sourceforge.net Source: http://downloads.sf.net/%{name}/%{name}-%{version}.src.tgz -Source1: fpswa.tar +Source1: fpswa.tar.gz Patch0: %{name}-3.6-makefile.patch BuildRequires: gnu-efi >= 3.0d-2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 i386 +Requires: efibootmgr Obsoletes: elilo <= 3.6-5 Conflicts: elilo <= 3.6-5 @@ -46,6 +47,10 @@ /boot/efi %changelog +* Tue Mar 04 2008 Chris Lumens 3.6-9 +- Add a Requires: efibootmgr (#435753). +- Fix the build (#434034). + * Mon Feb 18 2008 Fedora Release Engineering - 3.6-8 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/elilo/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 Jan 2008 14:25:35 -0000 1.11 +++ sources 4 Mar 2008 15:19:16 -0000 1.12 @@ -1 +1,2 @@ 5fa5d3d1ac2f29e3b56a4e82b752ecd6 elilo-3.6.src.tgz +2b00a6d182f12ee7d5690d66bbb8dde4 fpswa.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 15:22:55 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Tue, 4 Mar 2008 15:22:55 GMT Subject: rpms/texlive/devel texlive.spec,1.30,1.31 Message-ID: <200803041522.m24FMtB1020441@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/texlive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20390 Modified Files: texlive.spec Log Message: * Tue Mar 04 2008 Jindrich Novy - 2007-23 - move MetaPost back to the main package from texlive-context - don't package dvipdfmx, it is now packaged separately (#433225) Index: texlive.spec =================================================================== RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- texlive.spec 3 Mar 2008 16:46:59 -0000 1.30 +++ texlive.spec 4 Mar 2008 15:22:16 -0000 1.31 @@ -7,8 +7,8 @@ %define pdvipsk_ver p1.7a %define mendexk_ver 2.6e %define dvipdfm_ver 0.13.2d -%define dvipdfmx_ver 0 %if %{f8_packaging} +%define dvipdfmx_ver 0 %define dvipng_ver 1.9 %endif @@ -27,7 +27,7 @@ Name: texlive Version: %{texlive_ver} -Release: 22%{?dist} +Release: 23%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -229,7 +229,7 @@ Group: Applications/Publishing Requires: texlive = %{version}-%{release} Requires: texlive-texmf-xetex = %{version} -Requires: dvipdfmx +#Requires: dvipdfmx %description xetex XeTeX is a TeX typesetting engine using Unicode and supporting modern @@ -384,6 +384,7 @@ %description -n dvipdfm DVI to PDF translator. +%if %{f8_packaging} %package -n dvipdfmx Summary: Extended version of the dvipdfm DVI to PDF translator Version: %{dvipdfmx_ver} @@ -405,6 +406,7 @@ This project is a combined work of the dvipdfm-jpn project by Shunsaku Hirata and its modified one, dvipdfm-kor, by Jin-Hwan Cho. +%endif # without this define, the version is overriden by separated subpackages # versions @@ -487,6 +489,7 @@ %endif ## Japanese pTeX +%if %{f8_packaging} # create customized cid-x.map for dvipdfmx (#418091) cat <> texk/dvipdfmx/data/config/cid-x.map %% @@ -499,6 +502,7 @@ rmlv V !Ryumin-Light gbmv V !GothicBBB-Medium EOF +%endif # set platex to Japanese pLaTeX. original one is moved to platex-pl sed -e s/^platex/platex-pl/g \ @@ -720,6 +724,13 @@ %if !%{f8_packaging} # remove dvipng, it's now packaged separately (#431356) rm %{buildroot}%{_bindir}/dvipng %{buildroot}%{_mandir}/man1/dvipng.1* %{buildroot}%{_infodir}/dvipng.info* + +# remove dvipdfmx, it's now packaged separately (#433225) +rm -rf %{buildroot}%{_texmf_main}/texk/dvipdfmx/ \ + %{buildroot}%{_texmf_main}/dvipdfm/ \ + %{buildroot}%{_texmf_conf}/dvipdfm/ +rm %{buildroot}%{_bindir}/dvipdfmx +rm %{buildroot}%{_bindir}/xdvipdfmx %endif @@ -823,6 +834,8 @@ %{_bindir}/ctangle %{_bindir}/ctie %{_bindir}/cweave +%{_bindir}/dmp +%{_bindir}/dvitomp %{_bindir}/etex %{_bindir}/fmtutil %{_bindir}/fmtutil-sys @@ -842,6 +855,7 @@ %{_bindir}/lamed %{_bindir}/mag %{_bindir}/makeindex +%{_bindir}/makempx %{_bindir}/mf-nowin %{_bindir}/mft %{_bindir}/mkindex @@ -851,6 +865,8 @@ %{_bindir}/mktexlsr %{_bindir}/mktexmf %{_bindir}/mktextfm +%{_bindir}/mpost +%{_bindir}/mpto %{_bindir}/newer %{_bindir}/ofm2opl %{_bindir}/omega @@ -910,6 +926,8 @@ %{_mandir}/man1/ctie.1* %{_mandir}/man1/cweave.1* %{_mandir}/man1/cweb.1* +%{_mandir}/man1/dmp.1* +%{_mandir}/man1/dvitomp.1* %{_mandir}/man1/eplain.1* %{_mandir}/man1/etex.1* %{_mandir}/man1/fmtutil.1* @@ -929,6 +947,7 @@ %{_mandir}/man1/lambda.1* %{_mandir}/man1/mag.1* %{_mandir}/man1/makeindex.1* +%{_mandir}/man1/makempx.1* %{_mandir}/man1/mf-nowin.1* %{_mandir}/man1/mft.1* %{_mandir}/man1/mkindex.1* @@ -938,6 +957,8 @@ %{_mandir}/man1/mktexlsr.1* %{_mandir}/man1/mktexmf.1* %{_mandir}/man1/mktextfm.1* +%{_mandir}/man1/mpost.1* +%{_mandir}/man1/mpto.1* %{_mandir}/man1/newer.1* %{_mandir}/man1/ofm2opl.1* %{_mandir}/man1/omega.1* @@ -1137,6 +1158,7 @@ %{_mandir}/man1/dvipdfm.1* %{_mandir}/man1/dvipdft.1* +%if %{f8_packaging} %files -n dvipdfmx %defattr(-,root,root,-) %doc texk/dvipdfmx/AUTHORS texk/dvipdfmx/ChangeLog @@ -1146,6 +1168,7 @@ %{_bindir}/dvipdfmx %{_bindir}/xdvipdfmx %{_texmf_main}/dvipdfm/ +%endif %files east-asian %doc %{_texmf_main}/doc/pdvipsk/ @@ -1187,15 +1210,10 @@ %files context %{_bindir}/ctxtools -%{_bindir}/dvitomp -%{_bindir}/dmp %{_bindir}/exatools %{_bindir}/luatools -%{_bindir}/makempx %{_bindir}/makempy -%{_bindir}/mpost %{_bindir}/mpstools -%{_bindir}/mpto %{_bindir}/mptopdf %{_bindir}/mtxtools %{_bindir}/pdftools @@ -1210,12 +1228,7 @@ %{_bindir}/tmftools %{_bindir}/xmltools %{_mandir}/man1/ctxtools.1* -%{_mandir}/man1/dvitomp.1* -%{_mandir}/man1/dmp.1* -%{_mandir}/man1/makempx.1* %{_mandir}/man1/makempy.1* -%{_mandir}/man1/mpost.1* -%{_mandir}/man1/mpto.1* %{_mandir}/man1/mptopdf.1* %{_mandir}/man1/pdftools.1* %{_mandir}/man1/pstopdf.1* @@ -1226,6 +1239,10 @@ %{_mandir}/man1/texutil.1* %changelog +* Tue Mar 04 2008 Jindrich Novy - 2007-23 +- move MetaPost back to the main package from texlive-context +- don't package dvipdfmx, it is now packaged separately (#433225) + * Mon Mar 03 2008 Jindrich Novy - 2007-22 - specify required version more properly for subpackages - move xelatex to texlive-xetex From fedora-extras-commits at redhat.com Tue Mar 4 15:23:02 2008 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 4 Mar 2008 15:23:02 GMT Subject: rpms/dvdisaster/devel .cvsignore, 1.6, 1.7 dvdisaster.spec, 1.24, 1.25 sources, 1.9, 1.10 Message-ID: <200803041523.m24FN2SD020449@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20414 Modified Files: .cvsignore dvdisaster.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Sep 2006 13:49:19 -0000 1.6 +++ .cvsignore 4 Mar 2008 15:22:28 -0000 1.7 @@ -1 +1 @@ -dvdisaster-0.70.1.tar.bz2 +dvdisaster-0.70.5.tar.bz2 Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- dvdisaster.spec 18 Feb 2008 21:42:07 -0000 1.24 +++ dvdisaster.spec 4 Mar 2008 15:22:28 -0000 1.25 @@ -1,7 +1,7 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media -Version: 0.70.4 -Release: 4%{?dist} +Version: 0.70.5 +Release: 1%{?dist} Group: Applications/Archiving License: GPLv2+ URL: http://www.dvdisaster.com @@ -118,6 +118,9 @@ %changelog +* Tue Mar 4 2008 Dmitry Butskoy - 0.70.5-1 +- update to 0.70.5 + * Mon Feb 18 2008 Fedora Release Engineering - 0.70.4-4 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Feb 2007 13:28:00 -0000 1.9 +++ sources 4 Mar 2008 15:22:28 -0000 1.10 @@ -1 +1 @@ -5794b01d62ca6fa45d1f1e4ec381b567 dvdisaster-0.70.4.tar.bz2 +400cd917dd0617f80d2340878bf84608 dvdisaster-0.70.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 15:26:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 15:26:15 GMT Subject: rpms/perl-Carp-Assert/devel perl-Carp-Assert.spec,1.5,1.6 Message-ID: <200803041526.m24FQFrP020624@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Carp-Assert/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20595 Modified Files: perl-Carp-Assert.spec Log Message: new perl Index: perl-Carp-Assert.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Carp-Assert/devel/perl-Carp-Assert.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Carp-Assert.spec 28 Nov 2007 18:32:09 -0000 1.5 +++ perl-Carp-Assert.spec 4 Mar 2008 15:25:36 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Carp-Assert Version: 0.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Executable comments Group: Development/Libraries @@ -50,6 +50,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 0.20-2 +- rebuild for new perl + * Fri Jan 12 2007 Jose Pedro Oliveira - 0.20-1 - Update to 0.20. From fedora-extras-commits at redhat.com Tue Mar 4 15:32:57 2008 From: fedora-extras-commits at redhat.com (Michael E Brown (mebrown)) Date: Tue, 4 Mar 2008 15:32:57 GMT Subject: rpms/libsmbios/devel libsmbios.spec,1.11,1.12 Message-ID: <200803041532.m24FWvZA020777@cvs-int.fedora.redhat.com> Author: mebrown Update of /cvs/extras/rpms/libsmbios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20753/devel Modified Files: libsmbios.spec Log Message: fix date for changelog entry. Index: libsmbios.spec =================================================================== RCS file: /cvs/extras/rpms/libsmbios/devel/libsmbios.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libsmbios.spec 3 Mar 2008 14:53:58 -0000 1.11 +++ libsmbios.spec 4 Mar 2008 15:32:18 -0000 1.12 @@ -152,7 +152,7 @@ # ./ChangeLog is appended by configure %changelog -* Wed Feb 13 2008 Michael E Brown - 2.0.1-2 +* Mon Mar 3 2008 Michael E Brown - 2.0.1-2 - properly obsolete older versions * Wed Feb 13 2008 Michael E Brown - 2.0.1 From fedora-extras-commits at redhat.com Tue Mar 4 15:45:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 15:45:13 GMT Subject: rpms/perl-ExtUtils-AutoInstall/devel eai.patch, NONE, 1.1 perl-ExtUtils-AutoInstall.spec, 1.7, 1.8 Message-ID: <200803041545.m24FjDkR020989@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20954 Modified Files: perl-ExtUtils-AutoInstall.spec Added Files: eai.patch Log Message: get this building in rawhide eai.patch: --- NEW FILE eai.patch --- diff -rN -u old-ExtUtils-AutoInstall-0.61/lib/ExtUtils/AutoInstall.pm new-ExtUtils-AutoInstall-0.61/lib/ExtUtils/AutoInstall.pm --- old-ExtUtils-AutoInstall-0.61/lib/ExtUtils/AutoInstall.pm 2004-10-18 23:53:40.000000000 -0700 +++ new-ExtUtils-AutoInstall-0.61/lib/ExtUtils/AutoInstall.pm 2005-03-21 20:06:24.000000000 -0800 @@ -873,9 +873,14 @@ } $args{test}{TESTS} ||= 't/*.t'; - $args{test}{TESTS} = join(' ', grep { - !exists($DisabledTests{$_}) - } map { glob($_) } split(/\s+/, $args{test}{TESTS})); + + # Only expand the list of tests if we absolutely have to to avoid + # blowing over command line limits. + if( keys %DisabledTests ) { + $args{test}{TESTS} = join(' ', grep { + !exists($DisabledTests{$_}) + } map { glob($_) } split(/\s+/, $args{test}{TESTS})); + } my $missing = join(',', @Missing); my $config = join(',', Index: perl-ExtUtils-AutoInstall.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-AutoInstall/devel/perl-ExtUtils-AutoInstall.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-ExtUtils-AutoInstall.spec 8 Feb 2008 18:14:55 -0000 1.7 +++ perl-ExtUtils-AutoInstall.spec 4 Mar 2008 15:44:35 -0000 1.8 @@ -1,17 +1,18 @@ Name: perl-ExtUtils-AutoInstall Version: 0.63 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Automatic install of dependencies via CPAN License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/ExtUtils-AutoInstall/ Source: http://search.cpan.org/CPAN/authors/id/A/AU/AUTRIJUS/ExtUtils-AutoInstall-%{version}.tar.gz +Patch0: eai.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch -%{?_with_perl_CPANPLUS:BuildRequires: perl(CPANPLUS) >= 0.043} +BuildRequires: perl(CPANPLUS) >= 0.043 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Sort::Versions) >= 1.2 BuildRequires: perl(LWP::Simple) @@ -24,6 +25,7 @@ %prep %setup -q -n ExtUtils-AutoInstall-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor --defaultdeps @@ -50,6 +52,10 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 0.63-8 +- do not expand the glob if there are no disabled tests (#11960) +- enable CPANPLUS BR by default + * Fri Feb 08 2008 Tom "spot" Callaway - 0.63-7 - rebuild for new perl From fedora-extras-commits at redhat.com Tue Mar 4 15:47:17 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 4 Mar 2008 15:47:17 GMT Subject: rpms/extragear-plasma/devel extragear-plasma.spec,1.4,1.5 Message-ID: <200803041547.m24FlHqC021106@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/extragear-plasma/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21082/devel Modified Files: extragear-plasma.spec Log Message: * Tue Mar 04 2008 Kevin Kofler 4.0.1-2 - rebuild against KDE 4.0.2 (mainly to make sure it still builds) Index: extragear-plasma.spec =================================================================== RCS file: /cvs/pkgs/rpms/extragear-plasma/devel/extragear-plasma.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- extragear-plasma.spec 31 Jan 2008 19:48:06 -0000 1.4 +++ extragear-plasma.spec 4 Mar 2008 15:46:41 -0000 1.5 @@ -1,7 +1,7 @@ Name: extragear-plasma Version: 4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plasmoids for KDE Group: User Interface/Desktops @@ -69,6 +69,9 @@ %changelog +* Tue Mar 04 2008 Kevin Kofler 4.0.1-2 +- rebuild against KDE 4.0.2 (mainly to make sure it still builds) + * Thu Jan 31 2008 Rex Dieter 4.0.1-1 - kde-4.0.1 From fedora-extras-commits at redhat.com Tue Mar 4 15:49:49 2008 From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek)) Date: Tue, 4 Mar 2008 15:49:49 GMT Subject: rpms/gvfs/devel gvfsfusedaemon_debug.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gvfs.spec, 1.25, 1.26 sources, 1.10, 1.11 Message-ID: <200803041549.m24FnnMX021220@cvs-int.fedora.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21186 Modified Files: .cvsignore gvfs.spec sources Added Files: gvfsfusedaemon_debug.patch Log Message: * Tue Mar 04 2008 Tomas Bzatek - 0.1.10-1 - Update to 0.1.10 gvfsfusedaemon_debug.patch: --- NEW FILE gvfsfusedaemon_debug.patch --- --- trunk/client/gvfsfusedaemon.c 2008/02/19 09:41:06 1302 +++ trunk/client/gvfsfusedaemon.c 2008/03/04 15:21:22 1539 @@ -102,7 +102,7 @@ static void debug_print (const gchar *message, ...) { -#ifdef DEBUG_ENABLED +#if DEBUG_ENABLED static FILE *debug_fhd = NULL; va_list var_args; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 4 Mar 2008 14:46:30 -0000 1.10 +++ .cvsignore 4 Mar 2008 15:49:08 -0000 1.11 @@ -1 +1 @@ -gvfs-0.1.9.tar.bz2 +gvfs-0.1.10.tar.bz2 Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gvfs.spec 4 Mar 2008 15:02:39 -0000 1.25 +++ gvfs.spec 4 Mar 2008 15:49:08 -0000 1.26 @@ -1,6 +1,6 @@ Summary: Backends for the gio framework in GLib Name: gvfs -Version: 0.1.9 +Version: 0.1.10 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -24,9 +24,10 @@ BuildRequires: perl(XML::Parser) BuildRequires: GConf2-devel BuildRequires: bluez-libs-devel >= 3.12 +BuildRequires: expat-devel -## From head: -# Patch1: gvfs-libxml.patch +# From head: +Patch1: gvfsfusedaemon_debug.patch %description The gvfs package provides backend implementations for the gio @@ -44,12 +45,7 @@ %prep %setup -q -## Don't trigger autoregen: -# touch -r configure time1 -# touch -r configure.ac time2 -# %patch1 -p1 -b .libxml -# touch -r time1 configure -# touch -r time2 configure.ac +%patch1 -p1 -b .fusedebug %build %configure @@ -143,8 +139,8 @@ %{_libdir}/libgvfscommon.so %changelog -* Tue Mar 04 2008 Tomas Bzatek - 0.1.9-1 -- Update to 0.1.9 +* Tue Mar 04 2008 Tomas Bzatek - 0.1.10-1 +- Update to 0.1.10 * Mon Feb 25 2008 Alexander Larsson - 0.1.8-1 - Update to 0.1.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 4 Mar 2008 14:46:30 -0000 1.10 +++ sources 4 Mar 2008 15:49:08 -0000 1.11 @@ -1 +1 @@ -f7ba11755f84fdc00b0c1e39e97fb695 gvfs-0.1.9.tar.bz2 +e77f82dadda8ad481dbfc5383bcde06d gvfs-0.1.10.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 15:58:13 2008 From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek)) Date: Tue, 4 Mar 2008 15:58:13 GMT Subject: rpms/gvfs/devel ghalvolumemonitor_free_mounts.patch, NONE, 1.1 gvfs.spec, 1.26, 1.27 Message-ID: <200803041558.m24FwDQK021343@cvs-int.fedora.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21320 Modified Files: gvfs.spec Added Files: ghalvolumemonitor_free_mounts.patch Log Message: adding crash fix from head ghalvolumemonitor_free_mounts.patch: --- NEW FILE ghalvolumemonitor_free_mounts.patch --- --- trunk/hal/ghalvolumemonitor.c 2008/03/04 15:08:53 1536 +++ trunk/hal/ghalvolumemonitor.c 2008/03/04 15:48:55 1540 @@ -159,7 +159,9 @@ list_free (monitor->last_drive_devices); list_free (monitor->last_volume_devices); list_free (monitor->last_mountpoints); - list_free (monitor->last_mounts); + g_list_foreach (monitor->last_mounts, + (GFunc)g_unix_mount_free, NULL); + g_list_free (monitor->last_mounts); list_free (monitor->drives); list_free (monitor->volumes); Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gvfs.spec 4 Mar 2008 15:49:08 -0000 1.26 +++ gvfs.spec 4 Mar 2008 15:57:21 -0000 1.27 @@ -28,6 +28,7 @@ # From head: Patch1: gvfsfusedaemon_debug.patch +Patch2: ghalvolumemonitor_free_mounts.patch %description The gvfs package provides backend implementations for the gio @@ -46,6 +47,7 @@ %setup -q %patch1 -p1 -b .fusedebug +%patch2 -p1 -b .halmonitor %build %configure From fedora-extras-commits at redhat.com Tue Mar 4 16:19:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 16:19:53 GMT Subject: rpms/perl-POE/devel .cvsignore, 1.7, 1.8 perl-POE.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200803041619.m24GJr8R028745@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28716 Modified Files: .cvsignore perl-POE.spec sources Log Message: 0.9999 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Mar 2007 03:22:50 -0000 1.7 +++ .cvsignore 4 Mar 2008 16:19:13 -0000 1.8 @@ -1 +1 @@ -POE-0.9989.tar.gz +POE-0.9999.tar.gz Index: perl-POE.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE/devel/perl-POE.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-POE.spec 4 Mar 2008 05:06:19 -0000 1.11 +++ perl-POE.spec 4 Mar 2008 16:19:13 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-POE -Version: 0.9989 -Release: 2%{?dist} +Version: 0.9999 +Release: 1%{?dist} Summary: POE - portable multitasking and networking framework for Perl Group: Development/Libraries @@ -61,16 +61,6 @@ find t/ -type f -exec chmod -c -x {} + find t/ -type f -name '*.t' -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} + -# Filter unwanted Provides: -cat << \EOF > %{name}-prov -#!/bin/sh -%{__perl_provides} $* |\ - sed -e '/perl(POE::Kernel)/d; /perl(POE::Loop::Tk)/d' -EOF - -%define __perl_provides %{_builddir}/POE-%{version}/%{name}-prov -chmod +x %{__perl_provides} - # Filter unwanted Requires: cat << \EOF > %{name}-req #!/bin/sh @@ -130,6 +120,10 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.9999-1 +- update to 0.9999 +- don't filter out POE::Kernel, POE::Loop::Tk (it actually is provided) + * Tue Mar 4 2008 Tom "spot" Callaway 0.9989-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Mar 2007 03:22:50 -0000 1.7 +++ sources 4 Mar 2008 16:19:13 -0000 1.8 @@ -1 +1 @@ -c4d7c842ac5a9a36acab08f43f6f6a97 POE-0.9989.tar.gz +6672a43075cd597ed1011db5b45f1f1d POE-0.9999.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 16:31:04 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 4 Mar 2008 16:31:04 GMT Subject: rpms/bluez-libs/devel .cvsignore, 1.33, 1.34 bluez-libs.spec, 1.49, 1.50 sources, 1.33, 1.34 Message-ID: <200803041631.m24GV4Vw029010@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/bluez-libs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28975 Modified Files: .cvsignore bluez-libs.spec sources Log Message: update to 3.27 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 11 Feb 2008 12:30:19 -0000 1.33 +++ .cvsignore 4 Mar 2008 16:30:28 -0000 1.34 @@ -1 +1 @@ -bluez-libs-3.26.tar.gz +bluez-libs-3.27.tar.gz Index: bluez-libs.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/devel/bluez-libs.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- bluez-libs.spec 11 Feb 2008 12:30:19 -0000 1.49 +++ bluez-libs.spec 4 Mar 2008 16:30:28 -0000 1.50 @@ -1,6 +1,6 @@ Summary: Bluetooth libraries Name: bluez-libs -Version: 3.26 +Version: 3.27 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -62,6 +62,9 @@ %{_libdir}/pkgconfig/bluez.pc %changelog +* Tue Mar 04 2008 - David Woodhouse - 3.27-1 +- Update to 3.27 + * Mon Feb 11 2008 - Bastien Nocera - 3.26-1 - Update to 3.26 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez-libs/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 11 Feb 2008 12:30:19 -0000 1.33 +++ sources 4 Mar 2008 16:30:28 -0000 1.34 @@ -1 +1 @@ -90f34fb7b0432712d89689372ca80f33 bluez-libs-3.26.tar.gz +d94f7cdbc48039208dc631aabc34783a bluez-libs-3.27.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 16:42:25 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 4 Mar 2008 16:42:25 GMT Subject: rpms/bluez-hcidump/devel .cvsignore, 1.17, 1.18 bluez-hcidump.spec, 1.30, 1.31 sources, 1.17, 1.18 Message-ID: <200803041642.m24GgPHh029309@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/bluez-hcidump/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29243 Modified Files: .cvsignore bluez-hcidump.spec sources Log Message: 1.41 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez-hcidump/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 22 Aug 2007 17:26:17 -0000 1.17 +++ .cvsignore 4 Mar 2008 16:41:45 -0000 1.18 @@ -1 +1 @@ -bluez-hcidump-1.40.tar.gz +bluez-hcidump-1.41.tar.gz Index: bluez-hcidump.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- bluez-hcidump.spec 19 Feb 2008 01:55:49 -0000 1.30 +++ bluez-hcidump.spec 4 Mar 2008 16:41:45 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Bluetooth HCI protocol analyser Name: bluez-hcidump -Version: 1.40 -Release: 2%{?dist} +Version: 1.41 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -41,6 +41,9 @@ %{_mandir}/man8/hcidump.8.gz %changelog +* Tue Mar 04 2008 David Woodhouse - 1.41-1 +- update to bluez-hcidump 1.41 + * Mon Feb 18 2008 Fedora Release Engineering - 1.40-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez-hcidump/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 22 Aug 2007 17:26:17 -0000 1.17 +++ sources 4 Mar 2008 16:41:45 -0000 1.18 @@ -1 +1 @@ -c5793b79c3e7fea3a367c08c26c8e23c bluez-hcidump-1.40.tar.gz +b747f8d0b48e1f39080bcefb857c6fd8 bluez-hcidump-1.41.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 16:42:51 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 4 Mar 2008 16:42:51 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.51, 1.52 sources, 1.63, 1.64 system-config-services.spec, 1.62, 1.63 Message-ID: <200803041642.m24GgptM029350@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29285 Modified Files: .cvsignore sources system-config-services.spec Log Message: use ListStore instead of TreeStore add some extra padding for fixed width columns in TreeView Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 4 Mar 2008 15:11:35 -0000 1.51 +++ .cvsignore 4 Mar 2008 16:42:14 -0000 1.52 @@ -1 +1 @@ -system-config-services-0.99.5.tar.bz2 +system-config-services-0.99.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 4 Mar 2008 15:11:35 -0000 1.63 +++ sources 4 Mar 2008 16:42:14 -0000 1.64 @@ -1 +1 @@ -ff1b10d7e71f15c6248f96e350835b34 system-config-services-0.99.5.tar.bz2 +cd3bd69703e8c385b5f8907522060c06 system-config-services-0.99.6.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- system-config-services.spec 4 Mar 2008 15:11:35 -0000 1.62 +++ system-config-services.spec 4 Mar 2008 16:42:14 -0000 1.63 @@ -16,7 +16,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.5 +Version: 0.99.6 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -107,6 +107,10 @@ %{_mandir}/*/system-config-services.8* %changelog +* Tue Mar 04 2008 Nils Philippsen - 0.99.6-1 +- use ListStore instead of TreeStore +- add some extra padding for fixed width columns in TreeView + * Tue Mar 04 2008 Nils Philippsen - 0.99.5-1 - implement custom runlevel menu From fedora-extras-commits at redhat.com Tue Mar 4 16:48:51 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 16:48:51 GMT Subject: rpms/hplip/devel hplip-marker-supply.patch, 1.6, 1.7 hplip.spec, 1.172, 1.173 Message-ID: <200803041648.m24Gmpml029521@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29491 Modified Files: hplip-marker-supply.patch hplip.spec Log Message: * Tue Mar 4 2008 Tim Waugh 2.7.12-6 - Fixed marker-supply-low strings. hplip-marker-supply.patch: Index: hplip-marker-supply.patch =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-marker-supply.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hplip-marker-supply.patch 16 Jul 2007 17:21:04 -0000 1.6 +++ hplip-marker-supply.patch 4 Mar 2008 16:48:32 -0000 1.7 @@ -5,12 +5,12 @@ case WARN_LOW_INK_MULTIPLE_PENS: { - bug ("STATE: marker-supply-low\n"); -+ bug ("STATE: marker-supply-low-warning\n"); ++ bug ("STATE: +marker-supply-low-warning\n"); break; } default: - bug ("STATE: -marker-supply-low"); -+ bug ("STATE: -marker-supply-low-warning"); ++ bug ("STATE: -marker-supply-low-warning\n"); } } Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- hplip.spec 13 Feb 2008 10:59:39 -0000 1.172 +++ hplip.spec 4 Mar 2008 16:48:32 -0000 1.173 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 2.7.12 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -284,6 +284,9 @@ exit 0 %changelog +* Tue Mar 4 2008 Tim Waugh 2.7.12-6 +- Fixed marker-supply-low strings. + * Wed Feb 13 2008 Tim Waugh 2.7.12-5 - Rebuild for GCC 4.3. From fedora-extras-commits at redhat.com Tue Mar 4 16:49:59 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 4 Mar 2008 16:49:59 GMT Subject: rpms/bluez-utils/devel .cvsignore, 1.31, 1.32 bluez-utils.spec, 1.94, 1.95 sources, 1.31, 1.32 Message-ID: <200803041649.m24Gnx9o029617@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bluez-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29572 Modified Files: .cvsignore bluez-utils.spec sources Log Message: 3.27 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluez-utils/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 11 Feb 2008 12:38:59 -0000 1.31 +++ .cvsignore 4 Mar 2008 16:49:26 -0000 1.32 @@ -1 +1 @@ -bluez-utils-3.26.tar.gz +bluez-utils-3.27.tar.gz Index: bluez-utils.spec =================================================================== RCS file: /cvs/extras/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- bluez-utils.spec 11 Feb 2008 12:38:59 -0000 1.94 +++ bluez-utils.spec 4 Mar 2008 16:49:26 -0000 1.95 @@ -1,6 +1,6 @@ Summary: Bluetooth utilities Name: bluez-utils -Version: 3.26 +Version: 3.27 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -80,7 +80,7 @@ --enable-all --disable-bcm203x --enable-alsa --enable-bccmd \ --enable-avctrl --enable-glib --enable-input --enable-echo \ --enable-serial --disable-sdpd --enable-audio --disable-sync \ - --disable-obex + --disable-obex --enable-network make %install @@ -100,6 +100,9 @@ install -m0755 daemon/passkey-agent $RPM_BUILD_ROOT/%{_bindir}/passkey-agent install -m0755 daemon/auth-agent $RPM_BUILD_ROOT/%{_bindir}/auth-agent +install -m0644 audio/audio.conf $RPM_BUILD_ROOT/%{_sysconfdir}/bluetooth/audio.conf +install -m0644 network/network.conf $RPM_BUILD_ROOT/%{_sysconfdir}/bluetooth/network.conf + rm -f $RPM_BUILD_ROOT/%{_libdir}/*/*.la %clean @@ -157,6 +160,11 @@ %{_libdir}/alsa-lib/*.so %changelog +* Thu Sep 20 2008 David Woodhouse - 3.27-1 +- Update to 3.27 +- Ship audio.conf (#278831) +- Ship network service + * Mon Feb 11 2008 - Bastien Nocera - 3.26-1 - Update to 3.26 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluez-utils/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 11 Feb 2008 12:38:59 -0000 1.31 +++ sources 4 Mar 2008 16:49:26 -0000 1.32 @@ -1 +1 @@ -88ba2fabd62e993014613ca0611d89ad bluez-utils-3.26.tar.gz +e7a6ec6616291f6be90b6ef77077459f bluez-utils-3.27.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 16:50:52 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 16:50:52 GMT Subject: rpms/hplip/F-8 hplip-marker-supply.patch, 1.6, 1.7 hplip.spec, 1.167, 1.168 Message-ID: <200803041650.m24GoquH029682@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29659 Modified Files: hplip-marker-supply.patch hplip.spec Log Message: * Tue Mar 4 2008 Tim Waugh 2.7.12-5 - Fixed marker-supply-low strings. hplip-marker-supply.patch: Index: hplip-marker-supply.patch =================================================================== RCS file: /cvs/pkgs/rpms/hplip/F-8/hplip-marker-supply.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hplip-marker-supply.patch 16 Jul 2007 17:21:04 -0000 1.6 +++ hplip-marker-supply.patch 4 Mar 2008 16:50:44 -0000 1.7 @@ -5,12 +5,12 @@ case WARN_LOW_INK_MULTIPLE_PENS: { - bug ("STATE: marker-supply-low\n"); -+ bug ("STATE: marker-supply-low-warning\n"); ++ bug ("STATE: +marker-supply-low-warning\n"); break; } default: - bug ("STATE: -marker-supply-low"); -+ bug ("STATE: -marker-supply-low-warning"); ++ bug ("STATE: -marker-supply-low-warning\n"); } } Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/F-8/hplip.spec,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- hplip.spec 25 Jan 2008 12:37:20 -0000 1.167 +++ hplip.spec 4 Mar 2008 16:50:44 -0000 1.168 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 2.7.12 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -284,6 +284,9 @@ exit 0 %changelog +* Tue Mar 4 2008 Tim Waugh 2.7.12-5 +- Fixed marker-supply-low strings. + * Fri Jan 25 2008 Tim Waugh 2.7.12-4 - The hpijs compression module doesn't allocate enough memory (bug #428536). From fedora-extras-commits at redhat.com Tue Mar 4 16:52:02 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 16:52:02 GMT Subject: rpms/hplip/F-8 hplip.spec,1.168,1.169 Message-ID: <200803041652.m24Gq2YL029740@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29707 Modified Files: hplip.spec Log Message: No need for new build. Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/F-8/hplip.spec,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- hplip.spec 4 Mar 2008 16:50:44 -0000 1.168 +++ hplip.spec 4 Mar 2008 16:51:19 -0000 1.169 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 2.7.12 -Release: 5%{?dist} +Release: 4%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -284,7 +284,7 @@ exit 0 %changelog -* Tue Mar 4 2008 Tim Waugh 2.7.12-5 +* Tue Mar 4 2008 Tim Waugh - Fixed marker-supply-low strings. * Fri Jan 25 2008 Tim Waugh 2.7.12-4 From fedora-extras-commits at redhat.com Tue Mar 4 16:53:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 16:53:24 GMT Subject: rpms/perl-Carp-Assert-More/devel perl-Carp-Assert-More.spec, 1.5, 1.6 Message-ID: <200803041653.m24GrOgk029828@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Carp-Assert-More/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29801 Modified Files: perl-Carp-Assert-More.spec Log Message: new perl Index: perl-Carp-Assert-More.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Carp-Assert-More/devel/perl-Carp-Assert-More.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Carp-Assert-More.spec 28 Nov 2007 18:32:13 -0000 1.5 +++ perl-Carp-Assert-More.spec 4 Mar 2008 16:52:48 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Carp-Assert-More Version: 1.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Convenience wrappers around Carp::Assert Group: Development/Libraries @@ -52,6 +52,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 1.12-4 +- rebuild for new perl + * Sat Sep 9 2006 Jose Pedro Oliveira - 1.12-3 - Rebuild for FC6. From fedora-extras-commits at redhat.com Tue Mar 4 16:56:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:56:34 +0000 Subject: [pkgdb] perl-Ace (Fedora, 7) updated by tibbs Message-ID: <200803041657.m24GvWnv024638@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Ace (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Ace (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Ace From fedora-extras-commits at redhat.com Tue Mar 4 16:56:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:56:34 +0000 Subject: [pkgdb] perl-Ace (Fedora, 8) updated by tibbs Message-ID: <200803041657.m24GvWo0024638@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Ace (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Ace (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Ace From fedora-extras-commits at redhat.com Tue Mar 4 16:56:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:56:34 +0000 Subject: [pkgdb] perl-Ace (Fedora, devel) updated by tibbs Message-ID: <200803041657.m24GvWo3024638@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Ace (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Ace (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Ace From fedora-extras-commits at redhat.com Tue Mar 4 16:56:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:56:51 +0000 Subject: [pkgdb] perl-AutoClass (Fedora, 7) updated by tibbs Message-ID: <200803041657.m24GvwxH024717@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-AutoClass (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-AutoClass (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-AutoClass From fedora-extras-commits at redhat.com Tue Mar 4 16:56:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:56:51 +0000 Subject: [pkgdb] perl-AutoClass (Fedora, 8) updated by tibbs Message-ID: <200803041658.m24GvwxK024717@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-AutoClass (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-AutoClass (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-AutoClass From fedora-extras-commits at redhat.com Tue Mar 4 16:56:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:56:51 +0000 Subject: [pkgdb] perl-AutoClass (Fedora, devel) updated by tibbs Message-ID: <200803041658.m24GvwxN024717@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-AutoClass (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-AutoClass (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-AutoClass From fedora-extras-commits at redhat.com Tue Mar 4 16:57:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:57:52 +0000 Subject: [pkgdb] perl-Bio-ASN1-EntrezGene (Fedora, 7) updated by tibbs Message-ID: <200803041658.m24GwoIT024810@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Bio-ASN1-EntrezGene (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Bio-ASN1-EntrezGene (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Bio-ASN1-EntrezGene From fedora-extras-commits at redhat.com Tue Mar 4 16:57:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:57:52 +0000 Subject: [pkgdb] perl-Bio-ASN1-EntrezGene (Fedora, 8) updated by tibbs Message-ID: <200803041658.m24GwoIW024810@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Bio-ASN1-EntrezGene (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Bio-ASN1-EntrezGene (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Bio-ASN1-EntrezGene From fedora-extras-commits at redhat.com Tue Mar 4 16:57:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:57:52 +0000 Subject: [pkgdb] perl-Bio-ASN1-EntrezGene (Fedora, devel) updated by tibbs Message-ID: <200803041658.m24GwoIZ024810@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Bio-ASN1-EntrezGene (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Bio-ASN1-EntrezGene (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Bio-ASN1-EntrezGene From fedora-extras-commits at redhat.com Tue Mar 4 16:58:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:58:03 +0000 Subject: [pkgdb] perl-bioperl (Fedora, 7) updated by tibbs Message-ID: <200803041659.m24GxAI4024888@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-bioperl (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-bioperl (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-bioperl From fedora-extras-commits at redhat.com Tue Mar 4 16:58:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:58:03 +0000 Subject: [pkgdb] perl-bioperl (Fedora, 8) updated by tibbs Message-ID: <200803041659.m24GxAI7024888@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-bioperl (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-bioperl (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-bioperl From fedora-extras-commits at redhat.com Tue Mar 4 16:58:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:58:04 +0000 Subject: [pkgdb] perl-bioperl (Fedora, devel) updated by tibbs Message-ID: <200803041659.m24GxAIA024888@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-bioperl (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-bioperl (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-bioperl From fedora-extras-commits at redhat.com Tue Mar 4 16:58:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:58:45 +0000 Subject: [pkgdb] perl-bioperl-run (Fedora, 7) updated by tibbs Message-ID: <200803041659.m24GxhQB024971@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-bioperl-run (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-bioperl-run (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-bioperl-run From fedora-extras-commits at redhat.com Tue Mar 4 16:58:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:58:45 +0000 Subject: [pkgdb] perl-bioperl-run (Fedora, 8) updated by tibbs Message-ID: <200803041659.m24GxhQE024971@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-bioperl-run (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-bioperl-run (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-bioperl-run From fedora-extras-commits at redhat.com Tue Mar 4 16:58:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:58:45 +0000 Subject: [pkgdb] perl-bioperl-run (Fedora, devel) updated by tibbs Message-ID: <200803041659.m24GxhQH024971@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-bioperl-run (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-bioperl-run (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-bioperl-run From fedora-extras-commits at redhat.com Tue Mar 4 16:58:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:58:59 +0000 Subject: [pkgdb] perl-Convert-Binary-C (Fedora, 7) updated by tibbs Message-ID: <200803041700.m24H066r025077@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Convert-Binary-C (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Convert-Binary-C (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Convert-Binary-C From fedora-extras-commits at redhat.com Tue Mar 4 16:58:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:58:59 +0000 Subject: [pkgdb] perl-Convert-Binary-C (Fedora, 8) updated by tibbs Message-ID: <200803041700.m24H066u025077@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Convert-Binary-C (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Convert-Binary-C (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Convert-Binary-C From fedora-extras-commits at redhat.com Tue Mar 4 16:58:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:58:59 +0000 Subject: [pkgdb] perl-Convert-Binary-C (Fedora, devel) updated by tibbs Message-ID: <200803041700.m24H066x025077@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Convert-Binary-C (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Convert-Binary-C (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Convert-Binary-C From fedora-extras-commits at redhat.com Tue Mar 4 16:59:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:59:15 +0000 Subject: [pkgdb] perl-Data-Stag (Fedora, 7) updated by tibbs Message-ID: <200803041700.m24H0Mfk025136@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Data-Stag (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Data-Stag (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Stag From fedora-extras-commits at redhat.com Tue Mar 4 16:59:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:59:15 +0000 Subject: [pkgdb] perl-Data-Stag (Fedora, 8) updated by tibbs Message-ID: <200803041700.m24H0Mfn025136@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Data-Stag (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Data-Stag (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Stag From fedora-extras-commits at redhat.com Tue Mar 4 16:59:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:59:15 +0000 Subject: [pkgdb] perl-Data-Stag (Fedora, devel) updated by tibbs Message-ID: <200803041700.m24H0Mfq025136@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Data-Stag (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Data-Stag (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Stag From fedora-extras-commits at redhat.com Tue Mar 4 16:59:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:59:34 +0000 Subject: [pkgdb] perl-GD-SVG (Fedora, 7) updated by tibbs Message-ID: <200803041700.m24H0Wub025209@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-GD-SVG (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-GD-SVG (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-GD-SVG From fedora-extras-commits at redhat.com Tue Mar 4 16:59:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:59:34 +0000 Subject: [pkgdb] perl-GD-SVG (Fedora, 8) updated by tibbs Message-ID: <200803041700.m24H0Wue025209@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-GD-SVG (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-GD-SVG (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-GD-SVG From fedora-extras-commits at redhat.com Tue Mar 4 16:59:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:59:34 +0000 Subject: [pkgdb] perl-GD-SVG (Fedora, devel) updated by tibbs Message-ID: <200803041700.m24H0Wuh025209@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-GD-SVG (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-GD-SVG (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-GD-SVG From fedora-extras-commits at redhat.com Tue Mar 4 16:59:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:59:51 +0000 Subject: [pkgdb] PersonalCopy-Lite-soundfont was added for jwrdegoede Message-ID: <200803041700.m24H0Wuk025209@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package PersonalCopy-Lite-soundfont with summary Lite version of the PersonalCopy General Midi soundfont Kevin Fenzi (kevin) has approved Package PersonalCopy-Lite-soundfont Kevin Fenzi (kevin) has added a Fedora devel branch for PersonalCopy-Lite-soundfont with an owner of jwrdegoede Kevin Fenzi (kevin) has approved PersonalCopy-Lite-soundfont in Fedora devel Kevin Fenzi (kevin) has approved Package PersonalCopy-Lite-soundfont Kevin Fenzi (kevin) has set commit to Approved for cvsextras on PersonalCopy-Lite-soundfont (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on PersonalCopy-Lite-soundfont (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on PersonalCopy-Lite-soundfont (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PersonalCopy-Lite-soundfont From fedora-extras-commits at redhat.com Tue Mar 4 16:59:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:59:58 +0000 Subject: [pkgdb] PersonalCopy-Lite-soundfont (Fedora, 8) updated by kevin Message-ID: <200803041701.m24H16i3025396@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for PersonalCopy-Lite-soundfont Kevin Fenzi (kevin) has set commit to Approved for cvsextras on PersonalCopy-Lite-soundfont (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on PersonalCopy-Lite-soundfont (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on PersonalCopy-Lite-soundfont (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on PersonalCopy-Lite-soundfont (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PersonalCopy-Lite-soundfont From fedora-extras-commits at redhat.com Tue Mar 4 16:59:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:59:58 +0000 Subject: [pkgdb] PersonalCopy-Lite-soundfont (Fedora, devel) updated by kevin Message-ID: <200803041701.m24H16i9025396@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on PersonalCopy-Lite-soundfont (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PersonalCopy-Lite-soundfont From fedora-extras-commits at redhat.com Tue Mar 4 16:59:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 16:59:58 +0000 Subject: [pkgdb] PersonalCopy-Lite-soundfont (Fedora, 7) updated by kevin Message-ID: <200803041701.m24H16i6025396@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for PersonalCopy-Lite-soundfont Kevin Fenzi (kevin) has set commit to Approved for cvsextras on PersonalCopy-Lite-soundfont (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on PersonalCopy-Lite-soundfont (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on PersonalCopy-Lite-soundfont (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on PersonalCopy-Lite-soundfont (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/PersonalCopy-Lite-soundfont From fedora-extras-commits at redhat.com Tue Mar 4 17:00:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:00:55 +0000 Subject: [pkgdb] perl-Graph (Fedora, 7) updated by tibbs Message-ID: <200803041702.m24H16iC025396@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Graph (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Graph (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Graph From fedora-extras-commits at redhat.com Tue Mar 4 17:00:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:00:55 +0000 Subject: [pkgdb] perl-Graph (Fedora, 8) updated by tibbs Message-ID: <200803041702.m24H23eD025525@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Graph (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Graph (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Graph From fedora-extras-commits at redhat.com Tue Mar 4 17:00:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:00:55 +0000 Subject: [pkgdb] perl-Graph (Fedora, devel) updated by tibbs Message-ID: <200803041702.m24H23eG025525@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Graph (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Graph (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Graph From fedora-extras-commits at redhat.com Tue Mar 4 17:01:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:05 +0000 Subject: [pkgdb] perl-Math-Derivative (Fedora, 7) updated by tibbs Message-ID: <200803041702.m24H23eJ025525@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Math-Derivative (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Math-Derivative (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Derivative From fedora-extras-commits at redhat.com Tue Mar 4 17:01:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:06 +0000 Subject: [pkgdb] perl-Math-Derivative (Fedora, 8) updated by tibbs Message-ID: <200803041702.m24H2EJ4025596@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Math-Derivative (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Math-Derivative (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Derivative From fedora-extras-commits at redhat.com Tue Mar 4 17:01:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:06 +0000 Subject: [pkgdb] perl-Math-Derivative (Fedora, devel) updated by tibbs Message-ID: <200803041702.m24H2EJ7025596@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Math-Derivative (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Math-Derivative (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Derivative From fedora-extras-commits at redhat.com Tue Mar 4 17:01:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:14 +0000 Subject: [pkgdb] perl-Math-Spline (Fedora, 8) updated by tibbs Message-ID: <200803041702.m24H2LQ2025644@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Math-Spline (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Math-Spline (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Spline From fedora-extras-commits at redhat.com Tue Mar 4 17:01:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:14 +0000 Subject: [pkgdb] perl-Math-Spline (Fedora, devel) updated by tibbs Message-ID: <200803041702.m24H2LQ5025644@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Math-Spline (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Math-Spline (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Spline From fedora-extras-commits at redhat.com Tue Mar 4 17:01:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:14 +0000 Subject: [pkgdb] perl-Math-Spline (Fedora, 7) updated by tibbs Message-ID: <200803041702.m24H2LPx025644@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Math-Spline (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Math-Spline (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Spline From fedora-extras-commits at redhat.com Tue Mar 4 17:01:20 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:01:20 GMT Subject: rpms/PersonalCopy-Lite-soundfont - New directory Message-ID: <200803041701.m24H1Ksw004720@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/PersonalCopy-Lite-soundfont In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU30045/rpms/PersonalCopy-Lite-soundfont Log Message: Directory /cvs/extras/rpms/PersonalCopy-Lite-soundfont added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:01:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:24 +0000 Subject: [pkgdb] perl-PostScript (Fedora, 7) updated by tibbs Message-ID: <200803041702.m24H2Vpr025726@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-PostScript (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-PostScript (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-PostScript From fedora-extras-commits at redhat.com Tue Mar 4 17:01:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:24 +0000 Subject: [pkgdb] perl-PostScript (Fedora, 8) updated by tibbs Message-ID: <200803041702.m24H2Vpu025726@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-PostScript (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-PostScript (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-PostScript From fedora-extras-commits at redhat.com Tue Mar 4 17:01:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:24 +0000 Subject: [pkgdb] perl-PostScript (Fedora, devel) updated by tibbs Message-ID: <200803041702.m24H2Vpx025726@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-PostScript (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-PostScript (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-PostScript From fedora-extras-commits at redhat.com Tue Mar 4 17:01:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:36 +0000 Subject: [pkgdb] perl-SVG (Fedora, 7) updated by tibbs Message-ID: <200803041702.m24H2Yug025790@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-SVG (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-SVG (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SVG From fedora-extras-commits at redhat.com Tue Mar 4 17:01:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:36 +0000 Subject: [pkgdb] perl-SVG (Fedora, devel) updated by tibbs Message-ID: <200803041702.m24H2Yum025790@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-SVG (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-SVG (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SVG From fedora-extras-commits at redhat.com Tue Mar 4 17:01:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:36 +0000 Subject: [pkgdb] perl-SVG (Fedora, 8) updated by tibbs Message-ID: <200803041702.m24H2Yuj025790@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-SVG (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-SVG (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SVG From fedora-extras-commits at redhat.com Tue Mar 4 17:01:32 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:01:32 GMT Subject: rpms/PersonalCopy-Lite-soundfont/devel - New directory Message-ID: <200803041701.m24H1WIc004786@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/PersonalCopy-Lite-soundfont/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU30045/rpms/PersonalCopy-Lite-soundfont/devel Log Message: Directory /cvs/extras/rpms/PersonalCopy-Lite-soundfont/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:01:37 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:01:37 GMT Subject: rpms/PersonalCopy-Lite-soundfont Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200803041701.m24H1bSK004812@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/PersonalCopy-Lite-soundfont In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU30045/rpms/PersonalCopy-Lite-soundfont Added Files: Makefile import.log Log Message: Setup of module PersonalCopy-Lite-soundfont --- NEW FILE Makefile --- # Top level Makefile for module PersonalCopy-Lite-soundfont all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Mar 4 17:01:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:37 +0000 Subject: [pkgdb] perl-SVG-Graph (Fedora, 7) updated by tibbs Message-ID: <200803041702.m24H2EJA025596@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-SVG-Graph (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-SVG-Graph (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SVG-Graph From fedora-extras-commits at redhat.com Tue Mar 4 17:01:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:38 +0000 Subject: [pkgdb] perl-SVG-Graph (Fedora, 8) updated by tibbs Message-ID: <200803041702.m24H2kPH025914@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-SVG-Graph (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-SVG-Graph (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SVG-Graph From fedora-extras-commits at redhat.com Tue Mar 4 17:01:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:38 +0000 Subject: [pkgdb] perl-SVG-Graph (Fedora, devel) updated by tibbs Message-ID: <200803041702.m24H2kPK025914@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-SVG-Graph (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-SVG-Graph (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-SVG-Graph From fedora-extras-commits at redhat.com Tue Mar 4 17:01:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:54 +0000 Subject: [pkgdb] perl-Text-Shellwords (Fedora, 8) updated by tibbs Message-ID: <200803041702.m24H2rBJ025967@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Text-Shellwords (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Text-Shellwords (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Shellwords From fedora-extras-commits at redhat.com Tue Mar 4 17:01:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:54 +0000 Subject: [pkgdb] perl-Text-Shellwords (Fedora, 7) updated by tibbs Message-ID: <200803041702.m24H2rBG025967@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Text-Shellwords (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Text-Shellwords (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Shellwords From fedora-extras-commits at redhat.com Tue Mar 4 17:01:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:01:54 +0000 Subject: [pkgdb] perl-Text-Shellwords (Fedora, devel) updated by tibbs Message-ID: <200803041702.m24H2rBM025967@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-Text-Shellwords (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-Text-Shellwords (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Shellwords From fedora-extras-commits at redhat.com Tue Mar 4 17:01:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:01:56 GMT Subject: rpms/PersonalCopy-Lite-soundfont/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803041701.m24H1uBc004830@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/PersonalCopy-Lite-soundfont/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU30045/rpms/PersonalCopy-Lite-soundfont/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module PersonalCopy-Lite-soundfont --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: PersonalCopy-Lite-soundfont # $Id: Makefile,v 1.1 2008/03/04 17:01:37 kevin Exp $ NAME := PersonalCopy-Lite-soundfont SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Mar 4 17:02:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:01 +0000 Subject: [pkgdb] dayplanner was added for kurzawa Message-ID: <200803041703.m24H2kPN025914@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package dayplanner with summary An easy and clean Day Planner Kevin Fenzi (kevin) has approved Package dayplanner Kevin Fenzi (kevin) has added a Fedora devel branch for dayplanner with an owner of kurzawa Kevin Fenzi (kevin) has approved dayplanner in Fedora devel Kevin Fenzi (kevin) has approved Package dayplanner Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dayplanner (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dayplanner (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dayplanner (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner From fedora-extras-commits at redhat.com Tue Mar 4 17:02:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:04 +0000 Subject: [pkgdb] perl-XML-DOM-XPath (Fedora, 7) updated by tibbs Message-ID: <200803041703.m24H2kPQ025914@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-XML-DOM-XPath (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-XML-DOM-XPath (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-DOM-XPath From fedora-extras-commits at redhat.com Tue Mar 4 17:02:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:05 +0000 Subject: [pkgdb] perl-XML-DOM-XPath (Fedora, 8) updated by tibbs Message-ID: <200803041703.m24H3DR1026113@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-XML-DOM-XPath (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-XML-DOM-XPath (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-DOM-XPath From fedora-extras-commits at redhat.com Tue Mar 4 17:02:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:05 +0000 Subject: [pkgdb] perl-XML-DOM-XPath (Fedora, devel) updated by tibbs Message-ID: <200803041703.m24H3DR4026113@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-XML-DOM-XPath (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-XML-DOM-XPath (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-DOM-XPath From fedora-extras-commits at redhat.com Tue Mar 4 17:02:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:31 +0000 Subject: [pkgdb] dayplanner (Fedora, 8) updated by kevin Message-ID: <200803041703.m24H3Tnt026210@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for dayplanner Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dayplanner (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dayplanner (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dayplanner (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on dayplanner (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner From fedora-extras-commits at redhat.com Tue Mar 4 17:02:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:31 +0000 Subject: [pkgdb] dayplanner (Fedora, 7) updated by kevin Message-ID: <200803041703.m24H3Tnw026210@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for dayplanner Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dayplanner (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dayplanner (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dayplanner (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on dayplanner (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner From fedora-extras-commits at redhat.com Tue Mar 4 17:02:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:31 +0000 Subject: [pkgdb] dayplanner (Fedora, devel) updated by kevin Message-ID: <200803041703.m24H3To1026210@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on dayplanner (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dayplanner From fedora-extras-commits at redhat.com Tue Mar 4 17:02:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:23 +0000 Subject: [pkgdb] perl-XML-Writer (Fedora, 8) updated by tibbs Message-ID: <200803041703.m24H3VbH026274@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-XML-Writer (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-XML-Writer (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Writer From fedora-extras-commits at redhat.com Tue Mar 4 17:02:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:23 +0000 Subject: [pkgdb] perl-XML-Writer (Fedora, devel) updated by tibbs Message-ID: <200803041703.m24H3VbK026274@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-XML-Writer (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-XML-Writer (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Writer From fedora-extras-commits at redhat.com Tue Mar 4 17:02:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:23 +0000 Subject: [pkgdb] perl-XML-Writer (Fedora, 7) updated by tibbs Message-ID: <200803041703.m24H3VbE026274@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-XML-Writer (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-XML-Writer (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-Writer From fedora-extras-commits at redhat.com Tue Mar 4 17:02:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:51 +0000 Subject: [pkgdb] perl-XML-XPathEngine (Fedora, 7) updated by tibbs Message-ID: <200803041703.m24H3To4026210@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-XML-XPathEngine (Fedora 7) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-XML-XPathEngine (Fedora 7) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-XPathEngine From fedora-extras-commits at redhat.com Tue Mar 4 17:02:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:51 +0000 Subject: [pkgdb] perl-XML-XPathEngine (Fedora, 8) updated by tibbs Message-ID: <200803041703.m24H3ncG026377@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-XML-XPathEngine (Fedora 8) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-XML-XPathEngine (Fedora 8) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-XPathEngine From fedora-extras-commits at redhat.com Tue Mar 4 17:02:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:02:51 +0000 Subject: [pkgdb] perl-XML-XPathEngine (Fedora, devel) updated by tibbs Message-ID: <200803041703.m24H3ncJ026377@bastion.fedora.phx.redhat.com> Jason ???? (tibbs) approved watchbugzilla on perl-XML-XPathEngine (Fedora devel) for perl-sig Jason ???? (tibbs) approved watchcommits on perl-XML-XPathEngine (Fedora devel) for perl-sig To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-XML-XPathEngine From fedora-extras-commits at redhat.com Tue Mar 4 17:03:04 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:03:04 GMT Subject: rpms/dayplanner - New directory Message-ID: <200803041703.m24H34Mu005082@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dayplanner In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszC5045/rpms/dayplanner Log Message: Directory /cvs/extras/rpms/dayplanner added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:03:13 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:03:13 GMT Subject: rpms/dayplanner/devel - New directory Message-ID: <200803041703.m24H3DtU005098@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dayplanner/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszC5045/rpms/dayplanner/devel Log Message: Directory /cvs/extras/rpms/dayplanner/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:03:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:03:19 GMT Subject: rpms/dayplanner Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803041703.m24H3JOT005123@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dayplanner In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszC5045/rpms/dayplanner Added Files: Makefile import.log Log Message: Setup of module dayplanner --- NEW FILE Makefile --- # Top level Makefile for module dayplanner all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Mar 4 17:03:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:03:34 GMT Subject: rpms/dayplanner/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803041703.m24H3YEt005141@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dayplanner/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszC5045/rpms/dayplanner/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dayplanner --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: dayplanner # $Id: Makefile,v 1.1 2008/03/04 17:03:19 kevin Exp $ NAME := dayplanner SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Mar 4 17:04:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:04:31 +0000 Subject: [pkgdb] libgcroots was added for tagoh Message-ID: <200803041705.m24H5TCc026630@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package libgcroots with summary Root acquisition library for Garbage Collector Kevin Fenzi (kevin) has approved Package libgcroots Kevin Fenzi (kevin) has added a Fedora devel branch for libgcroots with an owner of tagoh Kevin Fenzi (kevin) has approved libgcroots in Fedora devel Kevin Fenzi (kevin) has approved Package libgcroots Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libgcroots (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libgcroots (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libgcroots (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libgcroots From fedora-extras-commits at redhat.com Tue Mar 4 17:04:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:04:32 +0000 Subject: [pkgdb] libgcroots (Fedora, devel) updated by kevin Message-ID: <200803041705.m24H5TCf026630@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on libgcroots (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libgcroots From fedora-extras-commits at redhat.com Tue Mar 4 17:05:22 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:05:22 GMT Subject: rpms/libgcroots - New directory Message-ID: <200803041705.m24H5MFK005376@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libgcroots In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsca5333/rpms/libgcroots Log Message: Directory /cvs/extras/rpms/libgcroots added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:05:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:05:51 GMT Subject: rpms/libgcroots/devel - New directory Message-ID: <200803041705.m24H5pPP005395@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libgcroots/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsca5333/rpms/libgcroots/devel Log Message: Directory /cvs/extras/rpms/libgcroots/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:05:57 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:05:57 GMT Subject: rpms/libgcroots Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803041705.m24H5vHN005425@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libgcroots In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsca5333/rpms/libgcroots Added Files: Makefile import.log Log Message: Setup of module libgcroots --- NEW FILE Makefile --- # Top level Makefile for module libgcroots all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Mar 4 17:06:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:06:21 GMT Subject: rpms/libgcroots/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803041706.m24H6L6N005445@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libgcroots/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsca5333/rpms/libgcroots/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libgcroots --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libgcroots # $Id: Makefile,v 1.1 2008/03/04 17:05:57 kevin Exp $ NAME := libgcroots SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Mar 4 17:06:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:06:54 +0000 Subject: [pkgdb] ocaml-xmlrpc-light was added for rjones Message-ID: <200803041707.m24H7qXv026819@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-xmlrpc-light with summary OCaml library for writing XML-RPC clients and servers Kevin Fenzi (kevin) has approved Package ocaml-xmlrpc-light Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-xmlrpc-light with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-xmlrpc-light in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-xmlrpc-light Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-xmlrpc-light (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-xmlrpc-light (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-xmlrpc-light (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light From fedora-extras-commits at redhat.com Tue Mar 4 17:06:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:06:55 +0000 Subject: [pkgdb] ocaml-xmlrpc-light (Fedora, 8) updated by kevin Message-ID: <200803041708.m24H82fI026840@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-xmlrpc-light Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-xmlrpc-light (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-xmlrpc-light (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-xmlrpc-light (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-xmlrpc-light (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light From fedora-extras-commits at redhat.com Tue Mar 4 17:06:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:06:55 +0000 Subject: [pkgdb] ocaml-xmlrpc-light (Fedora, devel) updated by kevin Message-ID: <200803041708.m24H82fL026840@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-xmlrpc-light (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light From fedora-extras-commits at redhat.com Tue Mar 4 17:07:50 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:07:50 GMT Subject: rpms/ocaml-xmlrpc-light - New directory Message-ID: <200803041707.m24H7o3C005541@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-xmlrpc-light In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVR5472/rpms/ocaml-xmlrpc-light Log Message: Directory /cvs/extras/rpms/ocaml-xmlrpc-light added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:07:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:07:52 +0000 Subject: [pkgdb] ocaml-postgresql was added for rjones Message-ID: <200803041708.m24H82fO026840@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-postgresql with summary OCaml library for accessing PostreSQL databases Kevin Fenzi (kevin) has approved Package ocaml-postgresql Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-postgresql with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-postgresql in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-postgresql Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-postgresql (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-postgresql (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-postgresql (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql From fedora-extras-commits at redhat.com Tue Mar 4 17:07:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:07:55 GMT Subject: rpms/ocaml-xmlrpc-light/devel - New directory Message-ID: <200803041707.m24H7thl005559@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-xmlrpc-light/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVR5472/rpms/ocaml-xmlrpc-light/devel Log Message: Directory /cvs/extras/rpms/ocaml-xmlrpc-light/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:08:07 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Tue, 4 Mar 2008 17:08:07 GMT Subject: rpms/sdcc/F-8 sdcc.spec,1.3,1.4 Message-ID: <200803041708.m24H87if005598@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/sdcc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5508 Modified Files: sdcc.spec Log Message: no ppc build, rebuilding... Index: sdcc.spec =================================================================== RCS file: /cvs/pkgs/rpms/sdcc/F-8/sdcc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sdcc.spec 8 Apr 2007 08:05:26 -0000 1.3 +++ sdcc.spec 4 Mar 2008 17:07:30 -0000 1.4 @@ -1,6 +1,6 @@ Name: sdcc Version: 2.6.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Small Device C Compiler Group: Applications/Engineering @@ -66,7 +66,7 @@ %build %configure --enable-doc --enable-libgc STRIP=: -make %{?_smp_mflags} Q= +make Q= %install @@ -113,6 +113,9 @@ %{_datadir}/%{name}/lib/*/*.asm %changelog +* Tue Mar 04 2008 Marek Mahut 2.6.0-11 +- PowerPC build is missing, rebuilding. + * Sat Apr 07 2007 Trond Danielsen - 2.6.0-10 - Added patch to fix a problem with sdccman.lyx that caused lyx to fail. From fedora-extras-commits at redhat.com Tue Mar 4 17:08:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:08:09 GMT Subject: rpms/ocaml-xmlrpc-light Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803041708.m24H8962005602@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-xmlrpc-light In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVR5472/rpms/ocaml-xmlrpc-light Added Files: Makefile import.log Log Message: Setup of module ocaml-xmlrpc-light --- NEW FILE Makefile --- # Top level Makefile for module ocaml-xmlrpc-light all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Mar 4 17:08:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:08:10 +0000 Subject: [pkgdb] ocaml-postgresql (Fedora, 8) updated by kevin Message-ID: <200803041709.m24H9HEB027007@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-postgresql Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-postgresql (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-postgresql (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-postgresql (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-postgresql (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql From fedora-extras-commits at redhat.com Tue Mar 4 17:08:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:08:10 +0000 Subject: [pkgdb] ocaml-postgresql (Fedora, devel) updated by kevin Message-ID: <200803041709.m24H9HEE027007@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-postgresql (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql From fedora-extras-commits at redhat.com Tue Mar 4 17:08:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:08:15 GMT Subject: rpms/ocaml-xmlrpc-light/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803041708.m24H8Ft3005618@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-xmlrpc-light/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVR5472/rpms/ocaml-xmlrpc-light/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-xmlrpc-light --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-xmlrpc-light # $Id: Makefile,v 1.1 2008/03/04 17:08:09 kevin Exp $ NAME := ocaml-xmlrpc-light SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Mar 4 17:08:29 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 4 Mar 2008 17:08:29 GMT Subject: rpms/yum/devel yum-mutual-obsoletes-providers.patch, NONE, 1.1 yum.spec, 1.195, 1.196 Message-ID: <200803041708.m24H8TQ9005733@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5491 Modified Files: yum.spec Added Files: yum-mutual-obsoletes-providers.patch Log Message: mutual obsoleting providers doomage patch yum-mutual-obsoletes-providers.patch: --- NEW FILE yum-mutual-obsoletes-providers.patch --- --- yum/depsolve.py~ 2008-03-03 13:22:32.000000000 -0500 +++ yum/depsolve.py 2008-03-04 11:57:03.000000000 -0500 @@ -938,59 +938,100 @@ return x.sourcerpm == y.sourcerpm for po in pkgs: + self.verbose_logger.log(logginglevels.DEBUG_4, + _("Comparing best: %s to po: %s") %(bestpkg, po)) + if po == bestpkg: # if we're comparing the same one, skip it + self.verbose_logger.log(logginglevels.DEBUG_4, + _("Same: best %s == po: %s") %(bestpkg, po)) + continue # if best is obsoleted by any of the packages, then the obsoleter # is the new best for obs in po.obsoletes: if bestpkg.inPrcoRange('provides', obs): + # make sure the best doesn't obsolete this po - if it does we're done + # we do this b/c it is possible for two entries to oscillate in this + # test - obsolete should trump no matter what + # NOTE: mutually obsoleting providers is completely and utterly doom + # but this should 'break the loop' + for obs in bestpkg.obsoletes: + if po.inPrcoRange('provides', obs): + self.verbose_logger.log(logginglevels.DEBUG_4, + _("best %s obsoletes po: %s") %(bestpkg, po)) + return bestpkg + self.verbose_logger.log(logginglevels.DEBUG_4, + _("po %s obsoletes best: %s") %(po, bestpkg)) + return po - # make sure the best doesn't obsolete this po - if it does we're done - # we do this b/c it is possible for two entries to oscillate in this - # test - obsolete should trump no matter what - # NOTE: mutually obsoleting providers is completely and utterly doom + # just check if best obsoletes po for obs in bestpkg.obsoletes: if po.inPrcoRange('provides', obs): + self.verbose_logger.log(logginglevels.DEBUG_4, + _("best %s obsoletes po: %s") %(bestpkg, po)) return bestpkg + if reqpo.arch != 'noarch': best_dist = archDifference(reqpo.arch, bestpkg.arch) if isMultiLibArch(): # only go to the next one if we're multilib - i686 can satisfy i386 deps if best_dist == 0: # can't really use best's arch anyway... + self.verbose_logger.log(logginglevels.DEBUG_4, + _("better arch in po %s") %(po)) return po # just try the next one - can't be much worse po_dist = archDifference(reqpo.arch, po.arch) if po_dist > 0 and best_dist > po_dist: + self.verbose_logger.log(logginglevels.DEBUG_4, + _("better arch in po %s") %(po)) + return po if best_dist == po_dist: if (not _common_sourcerpm(reqpo, bestpkg) and _common_sourcerpm(reqpo, po)): + self.verbose_logger.log(logginglevels.DEBUG_4, + _("po %s shares a sourcerpm with %s") %(po, reqpo)) return po + cplp = _common_prefix_len(reqpo.name, po.name) cplb = _common_prefix_len(reqpo.name, bestpkg.name) if cplp > cplb: + self.verbose_logger.log(logginglevels.DEBUG_4, + _("po %s shares more of the name prefix with %s") %(po, reqpo)) return po if cplp == cplb and len(po.name) < len(bestpkg.name): + self.verbose_logger.log(logginglevels.DEBUG_4, + _("po %s has a shorter name than best %s") %(po, bestpkg)) return po elif (not _common_sourcerpm(reqpo, bestpkg) and _common_sourcerpm(reqpo, po)): + self.verbose_logger.log(logginglevels.DEBUG_4, + _("po %s shares a sourcerpm with %s") %(po, reqpo)) return po elif (_common_prefix_len(reqpo.name, po.name) > _common_prefix_len(reqpo.name, bestpkg.name)): + self.verbose_logger.log(logginglevels.DEBUG_4, + _("po %s shares more of the name prefix with %s") %(po, reqpo)) return po elif (_common_prefix_len(reqpo.name, po.name) < _common_prefix_len(reqpo.name, bestpkg.name)): + self.verbose_logger.log(logginglevels.DEBUG_4, + _("bestpkg %s shares more of the name prefix with %s") %(bestpkg, reqpo)) return bestpkg elif len(po.name) < len(bestpkg.name): + self.verbose_logger.log(logginglevels.DEBUG_4, + _("po %s has a shorter name than best %s") %(po, bestpkg)) return po elif len(po.name) == len(bestpkg.name): # compare arch arch = rpmUtils.arch.getBestArchFromList([po.arch, bestpkg.arch]) if arch == po.arch: + self.verbose_logger.log(logginglevels.DEBUG_4, + _("better arch in po %s") %(po)) return po # Nothing else was better, so this is it Index: yum.spec =================================================================== RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- yum.spec 3 Mar 2008 19:22:19 -0000 1.195 +++ yum.spec 4 Mar 2008 17:07:23 -0000 1.196 @@ -3,13 +3,14 @@ Summary: RPM installer/updater Name: yum Version: 3.2.12 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz Source1: yum.conf.fedora Source2: yum-updatesd.conf.fedora Patch0: installonlyn-enable.patch +Patch1: yum-mutual-obsoletes-providers.patch URL: http://linux.duke.edu/yum/ BuildArch: noarch @@ -49,6 +50,7 @@ %prep %setup -q %patch0 -p0 -b .installonly +%patch1 -p0 %build make @@ -97,6 +99,9 @@ %dir /usr/lib/yum-plugins %changelog +* Tue Mar 4 2008 Seth Vidal 3.2.12-2 +- fix mutually obsoleting providers (like glibc!) + * Mon Mar 3 2008 Seth Vidal - 3.2.12-1 - 3.2.12 From fedora-extras-commits at redhat.com Tue Mar 4 17:09:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:09:39 GMT Subject: rpms/ocaml-postgresql - New directory Message-ID: <200803041709.m24H9din005836@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-postgresql In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXY5797/rpms/ocaml-postgresql Log Message: Directory /cvs/extras/rpms/ocaml-postgresql added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:09:43 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:09:43 GMT Subject: rpms/ocaml-postgresql/devel - New directory Message-ID: <200803041709.m24H9hcY005850@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-postgresql/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXY5797/rpms/ocaml-postgresql/devel Log Message: Directory /cvs/extras/rpms/ocaml-postgresql/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:10:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:10:02 +0000 Subject: [pkgdb] ocaml-mysql was added for rjones Message-ID: <200803041711.m24HB0Bc027239@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-mysql with summary OCaml library for accessing MySQL databases Kevin Fenzi (kevin) has approved Package ocaml-mysql Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-mysql with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-mysql in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-mysql Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-mysql (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-mysql (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-mysql (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql From fedora-extras-commits at redhat.com Tue Mar 4 17:10:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:10:05 GMT Subject: rpms/ocaml-postgresql Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803041710.m24HA53o005878@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-postgresql In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXY5797/rpms/ocaml-postgresql Added Files: Makefile import.log Log Message: Setup of module ocaml-postgresql --- NEW FILE Makefile --- # Top level Makefile for module ocaml-postgresql all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Mar 4 17:10:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:10:08 +0000 Subject: [pkgdb] ocaml-mysql (Fedora, 8) updated by kevin Message-ID: <200803041711.m24HBF03027288@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-mysql Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-mysql (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-mysql (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-mysql (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-mysql (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql From fedora-extras-commits at redhat.com Tue Mar 4 17:10:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 04 Mar 2008 17:10:08 +0000 Subject: [pkgdb] ocaml-mysql (Fedora, devel) updated by kevin Message-ID: <200803041711.m24HBF06027288@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-mysql (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql From fedora-extras-commits at redhat.com Tue Mar 4 17:10:11 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:10:11 GMT Subject: rpms/ocaml-postgresql/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803041710.m24HABcC005894@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-postgresql/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXY5797/rpms/ocaml-postgresql/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-postgresql --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-postgresql # $Id: Makefile,v 1.1 2008/03/04 17:10:05 kevin Exp $ NAME := ocaml-postgresql SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Mar 4 17:11:13 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:11:13 GMT Subject: rpms/ocaml-mysql - New directory Message-ID: <200803041711.m24HBD3c006028@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-mysql In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRK5991/rpms/ocaml-mysql Log Message: Directory /cvs/extras/rpms/ocaml-mysql added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:11:21 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:11:21 GMT Subject: rpms/ocaml-mysql/devel - New directory Message-ID: <200803041711.m24HBLLH006042@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-mysql/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRK5991/rpms/ocaml-mysql/devel Log Message: Directory /cvs/extras/rpms/ocaml-mysql/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 4 17:11:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:11:35 GMT Subject: rpms/ocaml-mysql Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803041711.m24HBZj8006068@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-mysql In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRK5991/rpms/ocaml-mysql Added Files: Makefile import.log Log Message: Setup of module ocaml-mysql --- NEW FILE Makefile --- # Top level Makefile for module ocaml-mysql all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Mar 4 17:11:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 17:11:44 GMT Subject: rpms/ocaml-mysql/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803041711.m24HBi0V006086@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-mysql/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRK5991/rpms/ocaml-mysql/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-mysql --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-mysql # $Id: Makefile,v 1.1 2008/03/04 17:11:38 kevin Exp $ NAME := ocaml-mysql SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Mar 4 17:19:15 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 17:19:15 GMT Subject: rpms/rhythmbox/devel rb-ipod-save-artwork.patch, NONE, 1.1 rhythmbox.spec, 1.172, 1.173 Message-ID: <200803041719.m24HJFQ7006328@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/rhythmbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6288 Modified Files: rhythmbox.spec Added Files: rb-ipod-save-artwork.patch Log Message: * Tue Mar 04 2008 - Bastien Nocera - 0.11.4-11 - Add patch to save the album artwork onto the iPod (#435952) rb-ipod-save-artwork.patch: --- NEW FILE rb-ipod-save-artwork.patch --- --- trunk/plugins/ipod/rb-ipod-source.c 2008/01/01 14:11:29 5526 +++ trunk/plugins/ipod/rb-ipod-source.c 2008/01/02 12:08:13 5527 @@ -48,15 +48,11 @@ #include "rhythmdb.h" #include "rb-cut-and-paste-code.h" -static GObject *rb_ipod_source_constructor (GType type, +static GObject *rb_ipod_source_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties); static void rb_ipod_source_dispose (GObject *object); -static GObject *rb_ipod_source_constructor (GType type, guint n_construct_properties, - GObjectConstructParam *construct_properties); -static void rb_ipod_source_dispose (GObject *object); - static gboolean impl_show_popup (RBSource *source); static void impl_move_to_trash (RBSource *asource); static void rb_ipod_load_songs (RBiPodSource *source); @@ -82,6 +78,11 @@ const gchar *extension); static gchar* ipod_path_from_unix_path (const gchar *mount_point, const gchar *unix_path); +static gboolean rb_ipod_song_artwork_add_cb (RhythmDB *db, + RhythmDBEntry *entry, + const gchar *property_name, + const GValue *metadata, + RBiPodSource *isource); #endif static RhythmDB *get_db_for_source (RBiPodSource *source); @@ -108,6 +109,13 @@ GQueue *offline_plays; } RBiPodSourcePrivate; +#ifdef ENABLE_IPOD_WRITING +typedef struct { + RBiPodSourcePrivate *priv; + GdkPixbuf *pixbuf; +} RBiPodSongArtworkAddData; +#endif + RB_PLUGIN_DEFINE_TYPE(RBiPodSource, rb_ipod_source, RB_TYPE_REMOVABLE_MEDIA_SOURCE) @@ -186,6 +194,15 @@ rb_ipod_load_songs (source); +#ifdef ENABLE_IPOD_WRITING + RhythmDB *db = get_db_for_source (RB_IPOD_SOURCE (source)); + g_signal_connect_object (db, + "entry-extra-metadata-notify::rb:coverArt", + G_CALLBACK (rb_ipod_song_artwork_add_cb), + RB_IPOD_SOURCE(source), 0); + g_object_unref (G_OBJECT (db)); +#endif + return G_OBJECT (source); } @@ -1140,6 +1157,82 @@ g_hash_table_remove (priv->artwork_request_map, entry); } +static gboolean +rb_add_artwork_whole_album_cb (GtkTreeModel *query_model, + GtkTreePath *path, + GtkTreeIter *iter, + RBiPodSongArtworkAddData *artwork_data) +{ + RhythmDBEntry *entry; + Itdb_Track *song; + + entry = rhythmdb_query_model_iter_to_entry (RHYTHMDB_QUERY_MODEL (query_model), iter); + + song = g_hash_table_lookup (artwork_data->priv->entry_map, entry); + + if (song->has_artwork == 0x01) { + return FALSE; + } + + rb_ipod_db_set_thumbnail (artwork_data->priv->ipod_db, song, artwork_data->pixbuf); + + return FALSE; +} + +static gboolean +rb_ipod_song_artwork_add_cb (RhythmDB *db, + RhythmDBEntry *entry, + const gchar *property_name, + const GValue *metadata, + RBiPodSource *isource) +{ + RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (isource); + Itdb_Device *device; + Itdb_Track *song; + GdkPixbuf *pixbuf; + GtkTreeModel *query_model; + RBiPodSongArtworkAddData artwork_data; + + if (metadata == NULL) { + return FALSE; + } + + if (G_VALUE_HOLDS (metadata, GDK_TYPE_PIXBUF) == FALSE) { + return FALSE; + } + + song = g_hash_table_lookup (priv->entry_map, entry); + if (song == NULL) { + return FALSE; + } + + device = rb_ipod_db_get_device (priv->ipod_db); + if (device == NULL || itdb_device_supports_artwork (device) == FALSE) { + return FALSE; + } + + pixbuf = GDK_PIXBUF (g_value_get_object (metadata)); + + query_model = GTK_TREE_MODEL (rhythmdb_query_model_new_empty (db)); + + rhythmdb_do_full_query (db, RHYTHMDB_QUERY_RESULTS (query_model), + RHYTHMDB_QUERY_PROP_EQUALS, + RHYTHMDB_PROP_ARTIST, song->artist, + RHYTHMDB_QUERY_PROP_EQUALS, + RHYTHMDB_PROP_ALBUM, song->album, + RHYTHMDB_QUERY_END); + + artwork_data.priv = priv; + artwork_data.pixbuf = pixbuf; + + gtk_tree_model_foreach (query_model, + (GtkTreeModelForeachFunc) rb_add_artwork_whole_album_cb, + &artwork_data); + + g_object_unref(query_model); + return FALSE; +} + static void request_artwork (RBiPodSource *isource, RhythmDBEntry *entry, --- trunk/plugins/ipod/rb-ipod-source.c 2008/01/02 12:08:13 5527 +++ trunk/plugins/ipod/rb-ipod-source.c 2008/01/02 13:34:52 5528 @@ -1169,7 +1169,8 @@ entry = rhythmdb_query_model_iter_to_entry (RHYTHMDB_QUERY_MODEL (query_model), iter); song = g_hash_table_lookup (artwork_data->priv->entry_map, entry); - + g_return_val_if_fail (song != NULL, FALSE); + if (song->has_artwork == 0x01) { return FALSE; } @@ -1192,7 +1193,8 @@ GdkPixbuf *pixbuf; GtkTreeModel *query_model; RBiPodSongArtworkAddData artwork_data; - + RhythmDBEntryType entry_type; + if (metadata == NULL) { return FALSE; } @@ -1210,12 +1212,16 @@ if (device == NULL || itdb_device_supports_artwork (device) == FALSE) { return FALSE; } - + + g_object_get (G_OBJECT (isource), "entry-type", &entry_type, NULL); + pixbuf = GDK_PIXBUF (g_value_get_object (metadata)); query_model = GTK_TREE_MODEL (rhythmdb_query_model_new_empty (db)); rhythmdb_do_full_query (db, RHYTHMDB_QUERY_RESULTS (query_model), + RHYTHMDB_QUERY_PROP_EQUALS, + RHYTHMDB_PROP_ENTRY_ID, entry_type, RHYTHMDB_QUERY_PROP_EQUALS, RHYTHMDB_PROP_ARTIST, song->artist, RHYTHMDB_QUERY_PROP_EQUALS, @@ -1228,7 +1234,7 @@ gtk_tree_model_foreach (query_model, (GtkTreeModelForeachFunc) rb_add_artwork_whole_album_cb, &artwork_data); - + g_boxed_free (RHYTHMDB_TYPE_ENTRY_TYPE, entry_type); g_object_unref(query_model); return FALSE; } --- trunk/plugins/ipod/rb-ipod-source.c 2008/02/02 19:24:40 5558 +++ trunk/plugins/ipod/rb-ipod-source.c 2008/02/14 14:11:22 5579 @@ -1233,7 +1233,7 @@ rhythmdb_do_full_query (db, RHYTHMDB_QUERY_RESULTS (query_model), RHYTHMDB_QUERY_PROP_EQUALS, - RHYTHMDB_PROP_ENTRY_ID, entry_type, + RHYTHMDB_PROP_TYPE, entry_type, RHYTHMDB_QUERY_PROP_EQUALS, RHYTHMDB_PROP_ARTIST, song->artist, RHYTHMDB_QUERY_PROP_EQUALS, Index: rhythmbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- rhythmbox.spec 3 Mar 2008 23:17:47 -0000 1.172 +++ rhythmbox.spec 4 Mar 2008 17:18:31 -0000 1.173 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.11.4 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Multimedia URL: http://www.gnome.org/projects/rhythmbox/ @@ -68,6 +68,9 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=519737 Patch6: rb-activate-generic-players-from-uri.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=493996 +Patch7: rb-ipod-save-artwork.patch + %description Rhythmbox is an integrated music management application based on the powerful GStreamer media framework. It has a number of features, including an easy to @@ -102,6 +105,7 @@ %patch4 -p0 -b .gsd %patch5 -p0 -b .automake %patch6 -p0 -b .player-activate +%patch7 -p1 -b .ipod-artwork %build autoconf @@ -219,6 +223,9 @@ %{_libdir}/rhythmbox/plugins/upnp_coherence %changelog +* Tue Mar 04 2008 - Bastien Nocera - 0.11.4-11 +- Add patch to save the album artwork onto the iPod (#435952) + * Mon Mar 03 2008 - Bastien Nocera - 0.11.4-10 - Add a patch to fix activating audio players with a directory instead of a device path (GNOME bug #519737) From fedora-extras-commits at redhat.com Tue Mar 4 17:36:32 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 4 Mar 2008 17:36:32 GMT Subject: rpms/kdewebdev/devel kdewebdev.spec,1.47,1.48 Message-ID: <200803041736.m24HaWSn006673@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdewebdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6644 Modified Files: kdewebdev.spec Log Message: * Tue Mar 04 2008 Rex Dieter - 6:3.5.9-2 - -libs: Requires: %name, fixes "yum update removes kdewebdev" (#435956) Index: kdewebdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdewebdev/devel/kdewebdev.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- kdewebdev.spec 15 Feb 2008 09:46:02 -0000 1.47 +++ kdewebdev.spec 4 Mar 2008 17:35:58 -0000 1.48 @@ -10,7 +10,7 @@ Summary: Web development applications Epoch: 6 Version: 3.5.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Url: http://kdewebdev.org/ @@ -89,8 +89,7 @@ Requires: kdelibs3 >= %{version} # helps multilib upgrades Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release} -# include to be paranoid, installing libs-only is still mostly untested -- Rex -#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description libs %{summary}. %endif @@ -221,6 +220,9 @@ %changelog +* Tue Mar 04 2008 Rex Dieter - 6:3.5.9-2 +- -libs: Requires: %%name, fixes "yum update removes kdewebdev" (#435956) + * Fri Feb 15 2008 Kevin Kofler - 6:3.5.9-1 - update to 3.5.9 - drop rename-arrow patch (fixed upstream, arrow icon is now app-local) From fedora-extras-commits at redhat.com Tue Mar 4 17:38:05 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 4 Mar 2008 17:38:05 GMT Subject: rpms/kdewebdev/F-8 kdewebdev.spec,1.42,1.43 Message-ID: <200803041738.m24Hc57N006751@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdewebdev/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6727 Modified Files: kdewebdev.spec Log Message: * Tue Mar 04 2008 Rex Dieter - 6:3.5.9-2 - -libs: Requires: %name, fixes "yum update removes kdewebdev" (#435956) Index: kdewebdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdewebdev/F-8/kdewebdev.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- kdewebdev.spec 16 Feb 2008 04:10:54 -0000 1.42 +++ kdewebdev.spec 4 Mar 2008 17:37:29 -0000 1.43 @@ -10,7 +10,7 @@ Summary: Web development applications Epoch: 6 Version: 3.5.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Url: http://kdewebdev.org/ @@ -89,8 +89,7 @@ Requires: kdelibs3 >= %{version} # helps multilib upgrades Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release} -# include to be paranoid, installing libs-only is still mostly untested -- Rex -#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description libs %{summary}. %endif @@ -221,6 +220,9 @@ %changelog +* Tue Mar 04 2008 Rex Dieter - 6:3.5.9-2 +- -libs: Requires: %%name, fixes "yum update removes kdewebdev" (#435956) + * Fri Feb 15 2008 Kevin Kofler - 6:3.5.9-1 - update to 3.5.9 - drop rename-arrow patch (fixed upstream, arrow icon is now app-local) From fedora-extras-commits at redhat.com Tue Mar 4 17:39:57 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 4 Mar 2008 17:39:57 GMT Subject: rpms/kdewebdev/F-7 kdewebdev.spec,1.42,1.43 Message-ID: <200803041739.m24HdvBM006826@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdewebdev/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6806 Modified Files: kdewebdev.spec Log Message: * Tue Mar 04 2008 Rex Dieter - 6:3.5.9-2 - -libs: Requires: %name, fixes "yum update removes kdewebdev" (#435956) Index: kdewebdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdewebdev/F-7/kdewebdev.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- kdewebdev.spec 16 Feb 2008 04:10:48 -0000 1.42 +++ kdewebdev.spec 4 Mar 2008 17:39:16 -0000 1.43 @@ -10,7 +10,7 @@ Summary: Web development applications Epoch: 6 Version: 3.5.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Url: http://kdewebdev.org/ @@ -89,8 +89,7 @@ Requires: kdelibs3 >= %{version} # helps multilib upgrades Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release} -# include to be paranoid, installing libs-only is still mostly untested -- Rex -#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description libs %{summary}. %endif @@ -221,6 +220,9 @@ %changelog +* Tue Mar 04 2008 Rex Dieter - 6:3.5.9-2 +- -libs: Requires: %%name, fixes "yum update removes kdewebdev" (#435956) + * Fri Feb 15 2008 Kevin Kofler - 6:3.5.9-1 - update to 3.5.9 - drop rename-arrow patch (fixed upstream, arrow icon is now app-local) From fedora-extras-commits at redhat.com Tue Mar 4 17:44:22 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 4 Mar 2008 17:44:22 GMT Subject: rpms/perl-PDL/devel perl-PDL-2.4.3-gsl.patch, NONE, 1.1 perl-PDL.spec, 1.37, 1.38 Message-ID: <200803041744.m24HiMm9006999@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/perl-PDL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6932 Modified Files: perl-PDL.spec Added Files: perl-PDL-2.4.3-gsl.patch Log Message: * Tue Mar 04 2008 Orion Poplawski - 2.4.3-7 - Add patch to build GSL support with GSL 1.10 - unset DISPLAY in %check for mock builds perl-PDL-2.4.3-gsl.patch: --- NEW FILE perl-PDL-2.4.3-gsl.patch --- --- PDL-2.4.3/Lib/GSL/Makefile.PL.gsl 2004-01-12 13:00:06.000000000 -0700 +++ PDL-2.4.3/Lib/GSL/Makefile.PL 2008-03-04 10:05:54.000000000 -0700 @@ -29,11 +29,16 @@ return ($inc,$lib); } +sub decimate { # version string -> number + $_[0] =~ /(\d+)\.(\d+)/; + return int($1*100 + $2); +} + # these will be used in the subdirs ($GSL_includes, $GSL_libs) = get_gsl_libs(); # Version check -my $MINVERSION = "1.3"; +my $MINVERSION = decimate("1.3"); my $version = `gsl-config --version`; chomp $version; @@ -41,7 +46,7 @@ warn "\tno GSL version info found (gsl-config not installed?)\n\n"; $version = 'UNKNOWN VERSION'; } -if ($version =~ /UNKNOWN VERSION/ || $version lt "$MINVERSION") { +if ($version =~ /UNKNOWN VERSION/ || decimate($version) lt "$MINVERSION") { warn "\n Not building GSL modules: GSL version $version found, need at least $MINVERSION\n\n"; write_dummy_make("Not building GSL modules: GSL version $version found, but need at least $MINVERSION"); } else { Index: perl-PDL.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- perl-PDL.spec 26 Feb 2008 08:27:49 -0000 1.37 +++ perl-PDL.spec 4 Mar 2008 17:43:36 -0000 1.38 @@ -1,6 +1,6 @@ Name: perl-PDL Version: 2.4.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Perl Data Language Group: Development/Libraries @@ -15,7 +15,8 @@ Patch5: perl-PDL-2.4.3-hdf.patch Patch6: perl-PDL-2.4.3-Xext.patch Patch7: perl-PDL-2.4.3-fortran.patch -Patch8: perl-PDL-2.4.3-test_hdf.patch +Patch8: perl-PDL-2.4.3-test_hdf.patch +Patch9: perl-PDL-2.4.3-gsl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -59,6 +60,7 @@ %patch6 -p1 -b .Xext %patch7 -p1 -b .fortran %patch8 -p1 -b .patch_hdf +%patch9 -p1 -b .gsl # Provides: explicitly filter perl(Inline) cat <<__EOF__ > %{name}-findperlprovides @@ -120,6 +122,7 @@ %endif %check +unset DISPLAY export PERL5LIB=`pwd`/blib/lib make test @@ -139,6 +142,10 @@ %changelog +* Tue Mar 04 2008 Orion Poplawski - 2.4.3-7 +- Add patch to build GSL support with GSL 1.10 +- unset DISPLAY in %%check for mock builds + * Tue Feb 26 2008 Marcela Maslanova - 2.4.3-6 - remove two of hdf test for some time, because can't be build From fedora-extras-commits at redhat.com Tue Mar 4 17:44:41 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 17:44:41 GMT Subject: rpms/ghostscript/F-8 ghostscript.spec, 1.156, 1.157 ghostscript-CVE-2008-0411.patch, 1.1, NONE Message-ID: <200803041744.m24HifW5007046@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/ghostscript/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6981 Modified Files: ghostscript.spec Removed Files: ghostscript-CVE-2008-0411.patch Log Message: * Tue Mar 4 2008 Tim Waugh 8.62-2 - No longer need CVE-2008-0411 patch. Index: ghostscript.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/F-8/ghostscript.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- ghostscript.spec 4 Mar 2008 12:24:49 -0000 1.156 +++ ghostscript.spec 4 Mar 2008 17:44:08 -0000 1.157 @@ -5,7 +5,7 @@ Name: ghostscript Version: %{gs_ver} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.ghostscript.com/ @@ -18,9 +18,8 @@ Patch2: ghostscript-scripts.patch Patch3: ghostscript-noopt.patch Patch4: ghostscript-fPIC.patch -Patch6: ghostscript-runlibfileifexists.patch -Patch8: ghostscript-system-jasper.patch -Patch9: ghostscript-CVE-2008-0411.patch +Patch5: ghostscript-runlibfileifexists.patch +Patch6: ghostscript-system-jasper.patch Requires: urw-fonts >= 1.1, ghostscript-fonts BuildRequires: libjpeg-devel, libXt-devel @@ -89,11 +88,9 @@ %patch4 -p1 -b .fPIC # Define .runlibfileifexists. -%patch6 -p1 -b .runlibfileifexists +%patch5 -p1 -b .runlibfileifexists -%patch8 -p1 -b .system-jasper - -%patch9 -p1 -b .CVE-2008-0411 +%patch6 -p1 -b .system-jasper # Convert manual pages to UTF-8 from8859_1() { @@ -266,6 +263,9 @@ %{_libdir}/libgs.so %changelog +* Tue Mar 4 2008 Tim Waugh 8.62-2 +- No longer need CVE-2008-0411 patch. + * Tue Mar 4 2008 Tim Waugh 8.62-1 - 8.62. No longer need IJS KRGB patch, or patch for gs bug 689577. --- ghostscript-CVE-2008-0411.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 17:45:32 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 17:45:32 GMT Subject: rpms/ghostscript/devel ghostscript.spec, 1.166, 1.167 ghostscript-CVE-2008-0411.patch, 1.1, NONE Message-ID: <200803041745.m24HjWdE007137@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/ghostscript/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7098 Modified Files: ghostscript.spec Removed Files: ghostscript-CVE-2008-0411.patch Log Message: * Tue Mar 4 2008 Tim Waugh 8.62-2 - No longer need CVE-2008-0411 patch. Index: ghostscript.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- ghostscript.spec 4 Mar 2008 11:24:42 -0000 1.166 +++ ghostscript.spec 4 Mar 2008 17:44:54 -0000 1.167 @@ -20,7 +20,6 @@ Patch4: ghostscript-fPIC.patch Patch5: ghostscript-runlibfileifexists.patch Patch6: ghostscript-system-jasper.patch -Patch7: ghostscript-CVE-2008-0411.patch Requires: urw-fonts >= 1.1, ghostscript-fonts BuildRequires: libjpeg-devel, libXt-devel @@ -93,8 +92,6 @@ %patch6 -p1 -b .system-jasper -%patch7 -p1 -b .CVE-2008-0411 - # Convert manual pages to UTF-8 from8859_1() { iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" @@ -265,6 +262,9 @@ %{_libdir}/libgs.so %changelog +* Tue Mar 4 2008 Tim Waugh 8.62-2 +- No longer need CVE-2008-0411 patch. + * Tue Mar 4 2008 Tim Waugh 8.62-1 - 8.62. No longer need IJS KRGB patch, or patch for gs bug 689577. --- ghostscript-CVE-2008-0411.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 17:46:52 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 4 Mar 2008 17:46:52 GMT Subject: rpms/extragear-plasma/devel extragear-plasma.spec,1.5,1.6 Message-ID: <200803041746.m24HkqUA007223@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/extragear-plasma/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7188/devel Modified Files: extragear-plasma.spec Log Message: * Tue Mar 04 2008 Kevin Kofler 4.0.1-3 - disable broken bluemarble applet (crashes Plasma when no OpenGL, #435656) Index: extragear-plasma.spec =================================================================== RCS file: /cvs/pkgs/rpms/extragear-plasma/devel/extragear-plasma.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- extragear-plasma.spec 4 Mar 2008 15:46:41 -0000 1.5 +++ extragear-plasma.spec 4 Mar 2008 17:46:17 -0000 1.6 @@ -1,7 +1,7 @@ Name: extragear-plasma Version: 4.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Additional plasmoids for KDE Group: User Interface/Desktops @@ -30,6 +30,8 @@ %prep %setup -q +# disable broken bluemarble applet (crashes Plasma when no OpenGL, #435656) +sed -i -e 's/add_subdirectory(bluemarble)/#add_subdirectory(bluemarble)/g' applets/CMakeLists.txt %build @@ -63,12 +65,15 @@ %files -f %{name}-all.lang %defattr(-,root,root,-) %{_kde4_appsdir}/desktoptheme/* -%{_kde4_appsdir}/plasma-bluemarble/* +#%{_kde4_appsdir}/plasma-bluemarble/* %{_kde4_datadir}/kde4/services/* %{_kde4_libdir}/kde4/* %changelog +* Tue Mar 04 2008 Kevin Kofler 4.0.1-3 +- disable broken bluemarble applet (crashes Plasma when no OpenGL, #435656) + * Tue Mar 04 2008 Kevin Kofler 4.0.1-2 - rebuild against KDE 4.0.2 (mainly to make sure it still builds) From fedora-extras-commits at redhat.com Tue Mar 4 17:48:01 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 17:48:01 GMT Subject: rpms/ghostscript/devel ghostscript.spec,1.167,1.168 Message-ID: <200803041748.m24Hm1xX007274@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/ghostscript/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7242 Modified Files: ghostscript.spec Log Message: 8.62-2 Index: ghostscript.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- ghostscript.spec 4 Mar 2008 17:44:54 -0000 1.167 +++ ghostscript.spec 4 Mar 2008 17:47:22 -0000 1.168 @@ -5,7 +5,7 @@ Name: ghostscript Version: %{gs_ver} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.ghostscript.com/ From fedora-extras-commits at redhat.com Tue Mar 4 18:01:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:01:17 GMT Subject: rpms/perl-File-chmod/devel perl-File-chmod.spec,1.2,1.3 Message-ID: <200803041801.m24I1HY5014682@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-chmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7547 Modified Files: perl-File-chmod.spec Log Message: new perl Index: perl-File-chmod.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-chmod/devel/perl-File-chmod.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-File-chmod.spec 29 Aug 2007 10:02:33 -0000 1.2 +++ perl-File-chmod.spec 4 Mar 2008 18:00:42 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-File-chmod Version: 0.32 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Implements symbolic and ls chmod modes Group: Development/Libraries @@ -49,6 +49,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 0.32-3 +- rebuild for new perl + * Wed Aug 29 2007 Ralf Cors??pius - 0.32-2 - Update License. From fedora-extras-commits at redhat.com Tue Mar 4 18:02:34 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 18:02:34 GMT Subject: rpms/ghostscript/F-8 ghostscript.spec,1.157,1.158 Message-ID: <200803041802.m24I2Yt3014764@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/ghostscript/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14704 Modified Files: ghostscript.spec Log Message: * Tue Mar 4 2008 Tim Waugh 8.62-2 - No longer need CVE-2008-0411 patch. - Don't ship URW fonts; we already have them. Index: ghostscript.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/F-8/ghostscript.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- ghostscript.spec 4 Mar 2008 17:44:08 -0000 1.157 +++ ghostscript.spec 4 Mar 2008 18:01:57 -0000 1.158 @@ -201,6 +201,9 @@ # Don't ship two copies of Resource. Just the versioned one will do. rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/Resource +# Don't ship URW fonts; we already have them. +rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Font + mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/conf.d mkdir -p $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver} touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/Fontmap.local @@ -265,6 +268,7 @@ %changelog * Tue Mar 4 2008 Tim Waugh 8.62-2 - No longer need CVE-2008-0411 patch. +- Don't ship URW fonts; we already have them. * Tue Mar 4 2008 Tim Waugh 8.62-1 - 8.62. No longer need IJS KRGB patch, or patch for gs bug 689577. From fedora-extras-commits at redhat.com Tue Mar 4 18:03:00 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 18:03:00 GMT Subject: rpms/hplip/devel .cvsignore, 1.23, 1.24 hplip-marker-supply.patch, 1.7, 1.8 hplip.spec, 1.173, 1.174 sources, 1.23, 1.24 hplip-media-empty.patch, 1.4, NONE hplip-unload-traceback.patch, 1.1, NONE Message-ID: <200803041803.m24I30s5014832@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14737 Modified Files: .cvsignore hplip-marker-supply.patch hplip.spec sources Removed Files: hplip-media-empty.patch hplip-unload-traceback.patch Log Message: * Tue Mar 4 2008 Tim Waugh 2.8.2-1 - 2.8.2. No longer need alloc, unload-traceback or media-empty patches. - Ship cupsddk driver. The hpijs sub-package now requires cupsddk-drivers. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 18 Jan 2008 14:42:45 -0000 1.23 +++ .cvsignore 4 Mar 2008 18:02:20 -0000 1.24 @@ -20,3 +20,4 @@ hplip-2.7.9.tar.gz hplip-2.7.10.tar.gz hplip-2.7.12.tar.gz +hplip-2.8.2.tar.gz hplip-marker-supply.patch: Index: hplip-marker-supply.patch =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-marker-supply.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hplip-marker-supply.patch 4 Mar 2008 16:48:32 -0000 1.7 +++ hplip-marker-supply.patch 4 Mar 2008 18:02:20 -0000 1.8 @@ -1,16 +1,17 @@ ---- hplip-2.7.6/prnt/hpijs/hpijs.cpp.marker-supply 2007-07-16 18:19:31.000000000 +0100 -+++ hplip-2.7.6/prnt/hpijs/hpijs.cpp 2007-07-16 18:19:43.000000000 +0100 -@@ -534,11 +534,11 @@ +diff -up hplip-2.8.2/prnt/hpijs/hpijs.cpp.marker-supply hplip-2.8.2/prnt/hpijs/hpijs.cpp +--- hplip-2.8.2/prnt/hpijs/hpijs.cpp.marker-supply 2008-02-08 19:36:38.000000000 +0000 ++++ hplip-2.8.2/prnt/hpijs/hpijs.cpp 2008-03-04 17:51:02.000000000 +0000 +@@ -541,11 +541,11 @@ int main (int argc, char *argv[], char * case WARN_LOW_INK_YELLOW: case WARN_LOW_INK_MULTIPLE_PENS: - { -- bug ("STATE: marker-supply-low\n"); -+ bug ("STATE: +marker-supply-low-warning\n"); - break; - } + { +- bug ("STATE: marker-supply-low-warning\n"); ++ bug ("STATE: +marker-supply-low-warning\n"); + break; + } default: -- bug ("STATE: -marker-supply-low"); -+ bug ("STATE: -marker-supply-low-warning\n"); +- bug ("STATE: -marker-supply-low-warning"); ++ bug ("STATE: -marker-supply-low-warning\n"); } } Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- hplip.spec 4 Mar 2008 16:48:32 -0000 1.173 +++ hplip.spec 4 Mar 2008 18:02:20 -0000 1.174 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 2.7.12 -Release: 6%{?dist} +Version: 2.8.2 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -19,10 +19,7 @@ Patch3: hplip-quiet.patch Patch4: hplip-marker-supply.patch Patch5: hplip-libm.patch -Patch6: hplip-alloc.patch Patch8: hplip-libsane.patch -Patch9: hplip-media-empty.patch -Patch11: hplip-unload-traceback.patch Patch12: hplip-no-root-config.patch Patch13: hplip-ui-optional.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -71,6 +68,7 @@ Epoch: %{hpijs_epoch} Requires: python-reportlab Requires: net-snmp +Requires: cupsddk-drivers %description -n hpijs hpijs is a collection of optimized drivers for HP printers. @@ -109,18 +107,9 @@ # libhpip should link against libm (bug #197599). %patch5 -p1 -b .libm -# The hpijs compression module doesn't allocate enough memory (bug #428536). -%patch6 -p1 -b .alloc - # Link libsane-hpaio against libsane (bug #234813). %patch8 -p1 -b .libsane -# Clear the media-empty-error printer state. -%patch9 -p1 -b .media-empty - -# Prevent a traceback when unloading a photo card (bug #238617). -%patch11 -p1 -b .unload-traceback - # Prevent SELinux audit message from the CUPS backends (bug #241776) %patch12 -p1 -b .no-root-config @@ -131,7 +120,8 @@ %build %configure --disable-foomatic-xml-install --disable-cups-install \ - --enable-scan-build --enable-gui-build --enable-fax-build + --enable-scan-build --enable-gui-build --enable-fax-build \ + --disable-foomatic-rip-hplip-install make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP %install @@ -257,6 +247,7 @@ %{_libdir}/libhpmud.so* %{_bindir}/hpijs %{_datadir}/foomatic/db/source/PPD/HP +%{_datadir}/cups/drv/* %files -n libsane-hpaio %defattr(-,root,root) @@ -284,6 +275,10 @@ exit 0 %changelog +* Tue Mar 4 2008 Tim Waugh 2.8.2-1 +- 2.8.2. No longer need alloc, unload-traceback or media-empty patches. +- Ship cupsddk driver. The hpijs sub-package now requires cupsddk-drivers. + * Tue Mar 4 2008 Tim Waugh 2.7.12-6 - Fixed marker-supply-low strings. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 18 Jan 2008 14:42:45 -0000 1.23 +++ sources 4 Mar 2008 18:02:20 -0000 1.24 @@ -1 +1 @@ -ba00337ccf1b520509518bffbec960db hplip-2.7.12.tar.gz +ea57b92483622d3eae359994c5fd3dc3 hplip-2.8.2.tar.gz --- hplip-media-empty.patch DELETED --- --- hplip-unload-traceback.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 18:03:28 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 18:03:28 GMT Subject: rpms/ghostscript/devel ghostscript.spec,1.168,1.169 Message-ID: <200803041803.m24I3Ssi014905@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/ghostscript/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14808 Modified Files: ghostscript.spec Log Message: * Tue Mar 4 2008 Tim Waugh 8.62-2 - No longer need CVE-2008-0411 patch. - Don't ship URW fonts; we already have them. Index: ghostscript.spec =================================================================== RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- ghostscript.spec 4 Mar 2008 17:47:22 -0000 1.168 +++ ghostscript.spec 4 Mar 2008 18:02:50 -0000 1.169 @@ -200,6 +200,9 @@ # Don't ship two copies of Resource. Just the versioned one will do. rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/Resource +# Don't ship URW fonts; we already have them. +rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Font + mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/conf.d mkdir -p $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver} touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/Fontmap.local @@ -264,6 +267,7 @@ %changelog * Tue Mar 4 2008 Tim Waugh 8.62-2 - No longer need CVE-2008-0411 patch. +- Don't ship URW fonts; we already have them. * Tue Mar 4 2008 Tim Waugh 8.62-1 - 8.62. No longer need IJS KRGB patch, or patch for gs bug 689577. From fedora-extras-commits at redhat.com Tue Mar 4 18:06:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:06:31 GMT Subject: rpms/perl-Algorithm-Dependency/devel perl-Algorithm-Dependency.spec, 1.12, 1.13 Message-ID: <200803041806.m24I6Vpw015051@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Algorithm-Dependency/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15019 Modified Files: perl-Algorithm-Dependency.spec Log Message: new perl Index: perl-Algorithm-Dependency.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Algorithm-Dependency/devel/perl-Algorithm-Dependency.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Algorithm-Dependency.spec 21 Jan 2008 14:01:20 -0000 1.12 +++ perl-Algorithm-Dependency.spec 4 Mar 2008 18:05:55 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-Algorithm-Dependency Version: 1.106 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Algorithmic framework for implementing dependency trees License: GPL+ or Artistic Group: Development/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 1.106-2 +- rebuild for new perl + * Mon Jan 21 2008 Ralf Cors??pius - 1.106-1 - Upstream update. From fedora-extras-commits at redhat.com Tue Mar 4 18:13:01 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:13:01 GMT Subject: rpms/ocaml-libvirt/devel ocaml-libvirt.spec,1.13,1.14 Message-ID: <200803041813.m24ID1wG015312@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15273 Modified Files: ocaml-libvirt.spec Log Message: * Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-1 - New upstream release 0.4.1.0. - Upstream now requires ocaml-dbus >= 0.06, ocaml-lablgtk >= 2.10.0, gnome-icon-theme. - Enable virt-df. Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ocaml-libvirt.spec 1 Mar 2008 10:23:04 -0000 1.13 +++ ocaml-libvirt.spec 4 Mar 2008 18:12:15 -0000 1.14 @@ -5,12 +5,12 @@ %define build_mlvirsh 1 %define build_virt_ctrl 1 %define build_virt_top 1 -%define build_virt_df 0 +%define build_virt_df 1 %define build_full_featured_virt_top 1 Name: ocaml-libvirt -Version: 0.4.0.3 -Release: 3%{?dist} +Version: 0.4.1.0 +Release: 1%{?dist} Summary: OCaml binding for libvirt Group: Development/Libraries @@ -22,10 +22,15 @@ BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel + %if %build_virt_ctrl -BuildRequires: ocaml-lablgtk-devel +BuildRequires: ocaml-lablgtk-devel >= 2.10.0 BuildRequires: gtk2-devel +BuildRequires: gnome-icon-theme +BuildRequires: ocaml-dbus-devel >= 0.06 +BuildRequires: dbus-devel %endif + %if %build_virt_top BuildRequires: ocaml-curses-devel BuildRequires: ocaml-extlib-devel @@ -35,6 +40,7 @@ BuildRequires: ocaml-calendar-devel %endif %endif + BuildRequires: libvirt-devel >= 0.2.1 BuildRequires: perl BuildRequires: gawk @@ -134,7 +140,7 @@ strip virt-top/virt-top.opt %endif %if %build_virt_df -strip virt-top/virt-df.opt +strip virt-df/virt-df.opt %endif %endif @@ -219,7 +225,7 @@ %defattr(-,root,root,-) %doc COPYING README TODO.virt-top ChangeLog %{_bindir}/virt-top -%{_mandir}/man1/*.1.gz +%{_mandir}/man1/virt-top.1.gz %endif @@ -228,10 +234,18 @@ %defattr(-,root,root,-) %doc COPYING README ChangeLog %{_bindir}/virt-df +# Because of a bug in the upstream package, this isn't built yet. +#%{_mandir}/man1/virt-df.1.gz %endif %changelog +* Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-1 +- New upstream release 0.4.1.0. +- Upstream now requires ocaml-dbus >= 0.06, ocaml-lablgtk >= 2.10.0, + gnome-icon-theme. +- Enable virt-df. + * Sat Mar 1 2008 Richard W.M. Jones - 0.4.0.3-3 - Rebuild for ppc64. From fedora-extras-commits at redhat.com Tue Mar 4 18:15:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:15:03 GMT Subject: rpms/perl-File-Flat/devel perl-File-Flat.spec,1.8,1.9 Message-ID: <200803041815.m24IF3BT015525@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-Flat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15453 Modified Files: perl-File-Flat.spec Log Message: new perl Index: perl-File-Flat.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Flat/devel/perl-File-Flat.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-File-Flat.spec 2 Sep 2007 06:22:06 -0000 1.8 +++ perl-File-Flat.spec 4 Mar 2008 18:14:27 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-File-Flat Version: 1.00 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Implements a flat filesystem License: GPL+ or Artistic Group: Development/Libraries @@ -59,6 +59,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 1.00-3 +- rebuild for new perl + * Sun Sep 02 2007 Ralf Cors??pius - 1.00-2 - License update. From fedora-extras-commits at redhat.com Tue Mar 4 18:16:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:16:26 GMT Subject: rpms/perl-Class-Autouse/devel perl-Class-Autouse.spec,1.12,1.13 Message-ID: <200803041816.m24IGQB9015661@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Autouse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15602 Modified Files: perl-Class-Autouse.spec Log Message: new perl Index: perl-Class-Autouse.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Class-Autouse.spec 25 Nov 2007 08:00:06 -0000 1.12 +++ perl-Class-Autouse.spec 4 Mar 2008 18:15:50 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-Class-Autouse Version: 1.29 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Run-time class loading on first method call License: GPL+ or Artistic Group: Development/Libraries @@ -57,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 1.29-3 +- rebuild for new perl + * Sun Nov 25 2007 Ralf Cors??pius - 1.29-2 - Add BR: perl(Test-MinimumVersion). From fedora-extras-commits at redhat.com Tue Mar 4 18:16:47 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 18:16:47 GMT Subject: rpms/system-config-printer/F-8 pycups-1.9.35.tar.bz2.sig, NONE, 1.1 system-config-printer-0.7.74.11.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.156, 1.157 sources, 1.161, 1.162 system-config-printer.spec, 1.158, 1.159 pycups-1.9.32.tar.bz2.sig, 1.1, NONE system-config-printer-0.7.74.10.tar.bz2.sig, 1.1, NONE system-config-printer-0.7.74.x.patch, 1.7, NONE Message-ID: <200803041816.m24IGlb6015711@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15631 Modified Files: .cvsignore sources system-config-printer.spec Added Files: pycups-1.9.35.tar.bz2.sig system-config-printer-0.7.74.11.tar.bz2.sig Removed Files: pycups-1.9.32.tar.bz2.sig system-config-printer-0.7.74.10.tar.bz2.sig system-config-printer-0.7.74.x.patch Log Message: * Tue Mar 4 2008 Tim Waugh 0.7.74.11-1 - Updated pycups to 1.9.35. - 0.7.74.11: - Fixed my-default-printer. --- NEW FILE pycups-1.9.35.tar.bz2.sig --- ?? --- NEW FILE system-config-printer-0.7.74.11.tar.bz2.sig --- ?? Q??x??_I2???V??? Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/.cvsignore,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- .cvsignore 24 Jan 2008 11:00:51 -0000 1.156 +++ .cvsignore 4 Mar 2008 18:16:01 -0000 1.157 @@ -152,3 +152,5 @@ system-config-printer-0.7.74.9.tar.bz2 pycups-1.9.33.tar.bz2 system-config-printer-0.7.74.10.tar.bz2 +system-config-printer-0.7.74.11.tar.bz2 +pycups-1.9.35.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/sources,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- sources 24 Jan 2008 11:00:52 -0000 1.161 +++ sources 4 Mar 2008 18:16:01 -0000 1.162 @@ -1,2 +1,2 @@ -f976bcb6669118d0b87662901a91f996 pycups-1.9.33.tar.bz2 -ee5601b98ba5e26355d793240c94c699 system-config-printer-0.7.74.10.tar.bz2 +cd61cc2d58520e71d22be60d88d6884d system-config-printer-0.7.74.11.tar.bz2 +aeebcfee89f1f2d23ab4ec9e94f773fc pycups-1.9.35.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- system-config-printer.spec 2 Feb 2008 11:12:25 -0000 1.158 +++ system-config-printer.spec 4 Mar 2008 18:16:01 -0000 1.159 @@ -1,9 +1,9 @@ -%define pycups_version 1.9.33 +%define pycups_version 1.9.35 Summary: A printer administration tool Name: system-config-printer -Version: 0.7.74.10 -Release: 3%{?dist} +Version: 0.7.74.11 +Release: 1%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -11,7 +11,6 @@ Source1: pycups-%{pycups_version}.tar.bz2 Source2: system-config-printer.pam Source3: system-config-printer.console -Patch0: system-config-printer-0.7.74.x.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -53,7 +52,6 @@ %prep %setup -q -a 1 -%patch0 -p1 -b .0.7.74.x %build %configure @@ -124,6 +122,11 @@ exit 0 %changelog +* Tue Mar 4 2008 Tim Waugh 0.7.74.11-1 +- Updated pycups to 1.9.35. +- 0.7.74.11: + - Fixed my-default-printer. + * Sat Feb 2 2008 Tim Waugh 0.7.74.10-3 - Added missing debugprint function (bug #431252). --- pycups-1.9.32.tar.bz2.sig DELETED --- --- system-config-printer-0.7.74.10.tar.bz2.sig DELETED --- --- system-config-printer-0.7.74.x.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 18:17:35 2008 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Tue, 4 Mar 2008 18:17:35 GMT Subject: rpms/alsa-plugins/devel alsa-plugins-1.0.15-pulsehint.patch, NONE, 1.1 alsa-plugins.spec, 1.9, 1.10 Message-ID: <200803041817.m24IHZO4015794@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/alsa-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15759/devel Modified Files: alsa-plugins.spec Added Files: alsa-plugins-1.0.15-pulsehint.patch Log Message: Be a bit more verbose alsa-plugins-1.0.15-pulsehint.patch: --- NEW FILE alsa-plugins-1.0.15-pulsehint.patch --- --- alsa-plugins-1.0.15/pulse/pulse.c.orig 2008-03-04 18:56:22.000000000 +0100 +++ alsa-plugins-1.0.15/pulse/pulse.c 2008-03-04 18:58:33.000000000 +0100 @@ -204,7 +204,10 @@ int pulse_connect(snd_pulse_t *p, const return 0; error: - fprintf(stderr, "*** PULSEAUDIO: Unable to connect: %s\n", + fprintf(stderr, + "*** PULSEAUDIO: Unable to connect: %s\n" + "*** Is your sound server running?\n" + "*** See: http://www.pulseaudio.org/wiki/Troubleshooting\n", pa_strerror(pa_context_errno(p->context))); pa_threaded_mainloop_unlock(p->mainloop); Index: alsa-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- alsa-plugins.spec 19 Feb 2008 02:28:00 -0000 1.9 +++ alsa-plugins.spec 4 Mar 2008 18:16:56 -0000 1.10 @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ License: GPLv2+ and LGPLv2+ @@ -16,6 +16,7 @@ Patch0: 1.0.14-buffer-attr.patch Patch1: 1.0.14-state-xrun.patch Patch2: 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch +Patch3: alsa-plugins-1.0.15-pulsehint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -100,6 +101,7 @@ %patch0 -p1 -b .buffer_attr %patch1 -p1 -b .state_xrun %patch2 -p1 -b .pulse-SND_PCM_STATE_PREPARED +%patch3 -p1 -b .pulsehint %build %configure --disable-static \ @@ -173,6 +175,10 @@ %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Tue Mar 04 2008 Lubomir Kundrak - 1.0.15-4 +- Be more heplful when there's PulseAudio trouble. +- This may save us some bogus bug reports + * Mon Feb 18 2008 Fedora Release Engineering - 1.0.15-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 18:22:04 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:22:04 GMT Subject: rpms/ocaml-xmlrpc-light/F-8 ocaml-xmlrpc-light.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041822.m24IM412016219@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-xmlrpc-light/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16014/F-8 Modified Files: .cvsignore sources Added Files: ocaml-xmlrpc-light.spec Log Message: Initial CVS import. --- NEW FILE ocaml-xmlrpc-light.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-xmlrpc-light Version: 0.6 Release: 2%{?dist} Summary: OCaml library for writing XML-RPC clients and servers Group: Development/Libraries License: LGPLv2 with exceptions URL: http://code.google.com/p/xmlrpc-light/ Source0: http://xmlrpc-light.googlecode.com/files/xmlrpc-light-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-xml-light-devel BuildRequires: ocaml-ocamlnet-devel BuildRequires: ocaml-ocamlnet-nethttpd-devel BuildRequires: dos2unix %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description XmlRpc-Light is an XmlRpc library written in OCaml. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n xmlrpc-light-%{version} dos2unix LICENSE dos2unix README.txt %build make %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/xmlrpc-light %if %opt %exclude %{_libdir}/ocaml/xmlrpc-light/*.a %exclude %{_libdir}/ocaml/xmlrpc-light/*.cmxa %endif %exclude %{_libdir}/ocaml/xmlrpc-light/*.mli %files devel %defattr(-,root,root,-) %doc LICENSE doc/xmlrpc-light/{html,latex} README.txt %if %opt %{_libdir}/ocaml/xmlrpc-light/*.a %{_libdir}/ocaml/xmlrpc-light/*.cmxa %endif %{_libdir}/ocaml/xmlrpc-light/*.mli %changelog * Mon Mar 3 2008 Richard W.M. Jones - 0.6-2 - Added missing BR ocaml-ocamlnet-nethttpd-devel. - Test build in mock. - Removed ExcludeArch: ppc64. * Sat Feb 23 2008 Richard W.M. Jones - 0.6-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-xmlrpc-light/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:08:09 -0000 1.1 +++ .cvsignore 4 Mar 2008 18:21:27 -0000 1.2 @@ -0,0 +1 @@ +xmlrpc-light-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-xmlrpc-light/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:08:09 -0000 1.1 +++ sources 4 Mar 2008 18:21:27 -0000 1.2 @@ -0,0 +1 @@ +ebfef786bc39c38f4a36f4404d9a7d16 xmlrpc-light-0.6.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 18:22:08 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:22:08 GMT Subject: rpms/ocaml-xmlrpc-light/devel ocaml-xmlrpc-light.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041822.m24IM8HG016244@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-xmlrpc-light/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16022/devel Modified Files: .cvsignore sources Added Files: ocaml-xmlrpc-light.spec Log Message: Initial CVS import. --- NEW FILE ocaml-xmlrpc-light.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-xmlrpc-light Version: 0.6 Release: 2%{?dist} Summary: OCaml library for writing XML-RPC clients and servers Group: Development/Libraries License: LGPLv2 with exceptions URL: http://code.google.com/p/xmlrpc-light/ Source0: http://xmlrpc-light.googlecode.com/files/xmlrpc-light-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-xml-light-devel BuildRequires: ocaml-ocamlnet-devel BuildRequires: ocaml-ocamlnet-nethttpd-devel BuildRequires: dos2unix %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description XmlRpc-Light is an XmlRpc library written in OCaml. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n xmlrpc-light-%{version} dos2unix LICENSE dos2unix README.txt %build make %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/xmlrpc-light %if %opt %exclude %{_libdir}/ocaml/xmlrpc-light/*.a %exclude %{_libdir}/ocaml/xmlrpc-light/*.cmxa %endif %exclude %{_libdir}/ocaml/xmlrpc-light/*.mli %files devel %defattr(-,root,root,-) %doc LICENSE doc/xmlrpc-light/{html,latex} README.txt %if %opt %{_libdir}/ocaml/xmlrpc-light/*.a %{_libdir}/ocaml/xmlrpc-light/*.cmxa %endif %{_libdir}/ocaml/xmlrpc-light/*.mli %changelog * Mon Mar 3 2008 Richard W.M. Jones - 0.6-2 - Added missing BR ocaml-ocamlnet-nethttpd-devel. - Test build in mock. - Removed ExcludeArch: ppc64. * Sat Feb 23 2008 Richard W.M. Jones - 0.6-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-xmlrpc-light/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:08:09 -0000 1.1 +++ .cvsignore 4 Mar 2008 18:21:32 -0000 1.2 @@ -0,0 +1 @@ +xmlrpc-light-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-xmlrpc-light/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:08:09 -0000 1.1 +++ sources 4 Mar 2008 18:21:32 -0000 1.2 @@ -0,0 +1 @@ +ebfef786bc39c38f4a36f4404d9a7d16 xmlrpc-light-0.6.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 18:22:12 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:22:12 GMT Subject: rpms/ocaml-postgresql/devel ocaml-postgresql.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041822.m24IMCwZ016291@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16041/devel Modified Files: .cvsignore sources Added Files: ocaml-postgresql.spec Log Message: Initial CVS import. --- NEW FILE ocaml-postgresql.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-postgresql Version: 1.7.0 Release: 2%{?dist} Summary: OCaml library for accessing PostreSQL databases Group: Development/Libraries License: LGPLv2+ with exceptions URL: http://www.ocaml.info/home/ocaml_sources.html#toc13 Source0: http://www.ocaml.info/ocaml_sources/postgresql-ocaml-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: postgresql-devel BuildRequires: chrpath %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description This OCaml-library provides an interface to PostgreSQL, an efficient and reliable, open source, relational database. Almost all functionality available through the C-API (libpq) is replicated in a type-safe way. This library uses objects for representing database connections and results of queries. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n postgresql-ocaml-%{version} %build make strip lib/dll*.so chrpath --delete lib/dll*.so %install # These rules work if the library uses 'ocamlfind install' to install itself. rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/postgresql %if %opt %exclude %{_libdir}/ocaml/postgresql/*.a %exclude %{_libdir}/ocaml/postgresql/*.cmxa %endif %exclude %{_libdir}/ocaml/postgresql/*.mli %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) %doc LICENSE AUTHORS Changes README examples %if %opt %{_libdir}/ocaml/postgresql/*.a %{_libdir}/ocaml/postgresql/*.cmxa %endif %{_libdir}/ocaml/postgresql/*.mli %changelog * Mon Mar 3 2008 Richard W.M. Jones - 1.7.0-2 - Only include LICENSE doc in main package. - Include extra documentation and examples in devel package. - Check it builds in mock. * Sun Feb 24 2008 Richard W.M. Jones - 1.7.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:10:05 -0000 1.1 +++ .cvsignore 4 Mar 2008 18:21:36 -0000 1.2 @@ -0,0 +1 @@ +postgresql-ocaml-1.7.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:10:05 -0000 1.1 +++ sources 4 Mar 2008 18:21:36 -0000 1.2 @@ -0,0 +1 @@ +c79dbef491646610cfb22559e0fc2c16 postgresql-ocaml-1.7.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 18:22:14 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 18:22:14 GMT Subject: rpms/hplip/F-8 .cvsignore, 1.21, 1.22 hplip.spec, 1.169, 1.170 sources, 1.21, 1.22 hplip-alloc.patch, 1.1, NONE hplip-media-empty.patch, 1.4, NONE hplip-unload-traceback.patch, 1.1, NONE Message-ID: <200803041822.m24IMEpp016328@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16077 Modified Files: .cvsignore hplip.spec sources Removed Files: hplip-alloc.patch hplip-media-empty.patch hplip-unload-traceback.patch Log Message: * Tue Mar 4 2008 Tim Waugh 2.8.2-1 - 2.8.2. No longer need alloc, unload-traceback or media-empty patches. - Ship cupsddk driver. The hpijs sub-package now requires cupsddk-drivers. - Fixed marker-supply-low strings. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hplip/F-8/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 18 Jan 2008 15:16:12 -0000 1.21 +++ .cvsignore 4 Mar 2008 18:21:36 -0000 1.22 @@ -18,3 +18,4 @@ hplip-2.7.6.tar.gz hplip-2.7.7.tar.gz hplip-2.7.12.tar.gz +hplip-2.8.2.tar.gz Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/F-8/hplip.spec,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- hplip.spec 4 Mar 2008 16:51:19 -0000 1.169 +++ hplip.spec 4 Mar 2008 18:21:36 -0000 1.170 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 2.7.12 -Release: 4%{?dist} +Version: 2.8.2 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -19,10 +19,7 @@ Patch3: hplip-quiet.patch Patch4: hplip-marker-supply.patch Patch5: hplip-libm.patch -Patch6: hplip-alloc.patch Patch8: hplip-libsane.patch -Patch9: hplip-media-empty.patch -Patch11: hplip-unload-traceback.patch Patch12: hplip-no-root-config.patch Patch13: hplip-ui-optional.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -71,6 +68,7 @@ Epoch: %{hpijs_epoch} Requires: python-reportlab Requires: net-snmp +Requires: cupsddk-drivers %description -n hpijs hpijs is a collection of optimized drivers for HP printers. @@ -109,18 +107,9 @@ # libhpip should link against libm (bug #197599). %patch5 -p1 -b .libm -# The hpijs compression module doesn't allocate enough memory (bug #428536). -%patch6 -p1 -b .alloc - # Link libsane-hpaio against libsane (bug #234813). %patch8 -p1 -b .libsane -# Clear the media-empty-error printer state. -%patch9 -p1 -b .media-empty - -# Prevent a traceback when unloading a photo card (bug #238617). -%patch11 -p1 -b .unload-traceback - # Prevent SELinux audit message from the CUPS backends (bug #241776) %patch12 -p1 -b .no-root-config @@ -131,7 +120,8 @@ %build %configure --disable-foomatic-xml-install --disable-cups-install \ - --enable-scan-build --enable-gui-build --enable-fax-build + --enable-scan-build --enable-gui-build --enable-fax-build \ + --disable-foomatic-rip-hplip-install make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP %install @@ -257,6 +247,7 @@ %{_libdir}/libhpmud.so* %{_bindir}/hpijs %{_datadir}/foomatic/db/source/PPD/HP +%{_datadir}/cups/drv/* %files -n libsane-hpaio %defattr(-,root,root) @@ -284,7 +275,9 @@ exit 0 %changelog -* Tue Mar 4 2008 Tim Waugh +* Tue Mar 4 2008 Tim Waugh 2.8.2-1 +- 2.8.2. No longer need alloc, unload-traceback or media-empty patches. +- Ship cupsddk driver. The hpijs sub-package now requires cupsddk-drivers. - Fixed marker-supply-low strings. * Fri Jan 25 2008 Tim Waugh 2.7.12-4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hplip/F-8/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 18 Jan 2008 15:16:12 -0000 1.21 +++ sources 4 Mar 2008 18:21:36 -0000 1.22 @@ -1 +1 @@ -ba00337ccf1b520509518bffbec960db hplip-2.7.12.tar.gz +ea57b92483622d3eae359994c5fd3dc3 hplip-2.8.2.tar.gz --- hplip-alloc.patch DELETED --- --- hplip-media-empty.patch DELETED --- --- hplip-unload-traceback.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 18:22:19 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:22:19 GMT Subject: rpms/ocaml-postgresql/F-8 ocaml-postgresql.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041822.m24IMJQZ016396@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16040/F-8 Modified Files: .cvsignore sources Added Files: ocaml-postgresql.spec Log Message: Initial CVS import. --- NEW FILE ocaml-postgresql.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-postgresql Version: 1.7.0 Release: 2%{?dist} Summary: OCaml library for accessing PostreSQL databases Group: Development/Libraries License: LGPLv2+ with exceptions URL: http://www.ocaml.info/home/ocaml_sources.html#toc13 Source0: http://www.ocaml.info/ocaml_sources/postgresql-ocaml-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: postgresql-devel BuildRequires: chrpath %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description This OCaml-library provides an interface to PostgreSQL, an efficient and reliable, open source, relational database. Almost all functionality available through the C-API (libpq) is replicated in a type-safe way. This library uses objects for representing database connections and results of queries. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n postgresql-ocaml-%{version} %build make strip lib/dll*.so chrpath --delete lib/dll*.so %install # These rules work if the library uses 'ocamlfind install' to install itself. rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/postgresql %if %opt %exclude %{_libdir}/ocaml/postgresql/*.a %exclude %{_libdir}/ocaml/postgresql/*.cmxa %endif %exclude %{_libdir}/ocaml/postgresql/*.mli %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) %doc LICENSE AUTHORS Changes README examples %if %opt %{_libdir}/ocaml/postgresql/*.a %{_libdir}/ocaml/postgresql/*.cmxa %endif %{_libdir}/ocaml/postgresql/*.mli %changelog * Mon Mar 3 2008 Richard W.M. Jones - 1.7.0-2 - Only include LICENSE doc in main package. - Include extra documentation and examples in devel package. - Check it builds in mock. * Sun Feb 24 2008 Richard W.M. Jones - 1.7.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:10:05 -0000 1.1 +++ .cvsignore 4 Mar 2008 18:21:41 -0000 1.2 @@ -0,0 +1 @@ +postgresql-ocaml-1.7.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:10:05 -0000 1.1 +++ sources 4 Mar 2008 18:21:41 -0000 1.2 @@ -0,0 +1 @@ +c79dbef491646610cfb22559e0fc2c16 postgresql-ocaml-1.7.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 18:22:33 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:22:33 GMT Subject: rpms/ocaml-mysql/devel ocaml-mysql.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041822.m24IMXA5016460@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16188/devel Modified Files: .cvsignore sources Added Files: ocaml-mysql.spec Log Message: Initial CVS import. --- NEW FILE ocaml-mysql.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-mysql Version: 1.0.4 Release: 2%{?dist} Summary: OCaml library for accessing MySQL databases Group: Development/Libraries License: LGPLv2+ with exceptions URL: http://raevnos.pennmush.org/code/ocaml-mysql/ Source0: http://raevnos.pennmush.org/code/ocaml-mysql/ocaml-mysql-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel BuildRequires: mysql-devel BuildRequires: chrpath %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description ocaml-mysql is a package for ocaml that provides access to mysql databases. It consists of low level functions implemented in C and a module Mysql intended for application development. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q ./configure --libdir=%{_libdir} %build make %if %opt make opt %endif strip dll*.so chrpath --delete dll*.so %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/ocaml/mysql %if %opt %exclude %{_libdir}/ocaml/mysql/*.a %exclude %{_libdir}/ocaml/mysql/*.cmxa %exclude %{_libdir}/ocaml/mysql/*.cmx %endif %exclude %{_libdir}/ocaml/mysql/*.mli %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) %doc COPYING CHANGES doc/html README VERSION %if %opt %{_libdir}/ocaml/mysql/*.a %{_libdir}/ocaml/mysql/*.cmxa %{_libdir}/ocaml/mysql/*.cmx %endif %{_libdir}/ocaml/mysql/*.mli %changelog * Mon Mar 3 2008 Richard W.M. Jones - 1.0.4-2 - Don't need 'ExcludeArch: ppc64' any more. - Add missing BR for ocaml-camlp4-devel. - Test build in mock. * Sun Feb 24 2008 Richard W.M. Jones - 1.0.4-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mysql/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:11:38 -0000 1.1 +++ .cvsignore 4 Mar 2008 18:21:59 -0000 1.2 @@ -0,0 +1 @@ +ocaml-mysql-1.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mysql/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:11:38 -0000 1.1 +++ sources 4 Mar 2008 18:21:59 -0000 1.2 @@ -0,0 +1 @@ +76f1282bb7299012669bf40cde78216b ocaml-mysql-1.0.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 18:22:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:22:35 GMT Subject: rpms/perl-Test-Inline/devel perl-Test-Inline.spec,1.10,1.11 Message-ID: <200803041822.m24IMZ2L016466@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-Inline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16193 Modified Files: perl-Test-Inline.spec Log Message: new perl Index: perl-Test-Inline.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Inline/devel/perl-Test-Inline.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Test-Inline.spec 2 Jan 2008 08:46:48 -0000 1.10 +++ perl-Test-Inline.spec 4 Mar 2008 18:21:59 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-Test-Inline Version: 2.208 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Test::Inline Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -79,6 +79,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 2.208-2 +- rebuild for new perl + * Wed Jan 02 2008 Ralf Cors??pius - 2.208-1 - Upstream update. - Update build deps. From fedora-extras-commits at redhat.com Tue Mar 4 18:22:40 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:22:40 GMT Subject: rpms/ocaml-mysql/F-8 ocaml-mysql.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041822.m24IMeXs016505@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-mysql/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16189/F-8 Modified Files: .cvsignore sources Added Files: ocaml-mysql.spec Log Message: Initial CVS import. --- NEW FILE ocaml-mysql.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-mysql Version: 1.0.4 Release: 2%{?dist} Summary: OCaml library for accessing MySQL databases Group: Development/Libraries License: LGPLv2+ with exceptions URL: http://raevnos.pennmush.org/code/ocaml-mysql/ Source0: http://raevnos.pennmush.org/code/ocaml-mysql/ocaml-mysql-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel BuildRequires: mysql-devel BuildRequires: chrpath %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description ocaml-mysql is a package for ocaml that provides access to mysql databases. It consists of low level functions implemented in C and a module Mysql intended for application development. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q ./configure --libdir=%{_libdir} %build make %if %opt make opt %endif strip dll*.so chrpath --delete dll*.so %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/ocaml/mysql %if %opt %exclude %{_libdir}/ocaml/mysql/*.a %exclude %{_libdir}/ocaml/mysql/*.cmxa %exclude %{_libdir}/ocaml/mysql/*.cmx %endif %exclude %{_libdir}/ocaml/mysql/*.mli %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) %doc COPYING CHANGES doc/html README VERSION %if %opt %{_libdir}/ocaml/mysql/*.a %{_libdir}/ocaml/mysql/*.cmxa %{_libdir}/ocaml/mysql/*.cmx %endif %{_libdir}/ocaml/mysql/*.mli %changelog * Mon Mar 3 2008 Richard W.M. Jones - 1.0.4-2 - Don't need 'ExcludeArch: ppc64' any more. - Add missing BR for ocaml-camlp4-devel. - Test build in mock. * Sun Feb 24 2008 Richard W.M. Jones - 1.0.4-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mysql/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:11:38 -0000 1.1 +++ .cvsignore 4 Mar 2008 18:22:05 -0000 1.2 @@ -0,0 +1 @@ +ocaml-mysql-1.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mysql/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:11:38 -0000 1.1 +++ sources 4 Mar 2008 18:22:05 -0000 1.2 @@ -0,0 +1 @@ +76f1282bb7299012669bf40cde78216b ocaml-mysql-1.0.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 18:25:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:25:27 GMT Subject: rpms/perl-Params-Coerce/devel perl-Params-Coerce.spec,1.3,1.4 Message-ID: <200803041825.m24IPRs2016694@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Params-Coerce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16621 Modified Files: perl-Params-Coerce.spec Log Message: new perl Index: perl-Params-Coerce.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Params-Coerce/devel/perl-Params-Coerce.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Params-Coerce.spec 15 Oct 2006 19:33:15 -0000 1.3 +++ perl-Params-Coerce.spec 4 Mar 2008 18:24:50 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-Params-Coerce Version: 0.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Allows your classes to do coercion of parameters -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Params-Coerce/ Source0: http://www.cpan.org/authors/id/A/AD/ADAMK/Params-Coerce-%{version}.tar.gz @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.14-2 +- rebuild for new perl + * Sun Oct 15 2006 Chris Weyl 0.14-1 - update to 0.14 From fedora-extras-commits at redhat.com Tue Mar 4 18:27:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:27:32 GMT Subject: rpms/perl-Wx/devel perl-Wx.spec,1.21,1.22 Message-ID: <200803041827.m24IRWhP016947@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Wx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16911 Modified Files: perl-Wx.spec Log Message: new perl Index: perl-Wx.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Wx/devel/perl-Wx.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- perl-Wx.spec 20 Feb 2008 01:43:32 -0000 1.21 +++ perl-Wx.spec 4 Mar 2008 18:26:54 -0000 1.22 @@ -6,7 +6,7 @@ Name: perl-Wx Version: 0.80 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Interface to the wxWidgets cross-platform GUI toolkit Group: Development/Libraries @@ -88,6 +88,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 0.80-4 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.80-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 18:28:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:28:50 GMT Subject: rpms/perl-PPI-Tester/devel perl-PPI-Tester.spec,1.2,1.3 Message-ID: <200803041828.m24ISoTh017015@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-PPI-Tester/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16987 Modified Files: perl-PPI-Tester.spec Log Message: new perl Index: perl-PPI-Tester.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PPI-Tester/devel/perl-PPI-Tester.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-PPI-Tester.spec 28 Nov 2007 18:33:10 -0000 1.2 +++ perl-PPI-Tester.spec 4 Mar 2008 18:28:10 -0000 1.3 @@ -6,7 +6,7 @@ Name: perl-PPI-Tester Version: 0.06 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A wxPerl-based interactive PPI debugger/tester Group: Development/Libraries @@ -61,6 +61,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 0.06-3 +- rebuild for new perl + * Wed Oct 4 2006 Jose Pedro Oliveira - 0.06-2 - Added missing BR perl(ExtUtils::AutoInstall). - Changed the build process: Build.PL -> Makefile.PL From fedora-extras-commits at redhat.com Tue Mar 4 18:29:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:29:59 GMT Subject: rpms/perl-Want/devel perl-Want.spec,1.12,1.13 Message-ID: <200803041829.m24ITxIv017098@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17059 Modified Files: perl-Want.spec Log Message: new perl Index: perl-Want.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Want/devel/perl-Want.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Want.spec 6 Feb 2008 13:08:03 -0000 1.12 +++ perl-Want.spec 4 Mar 2008 18:29:16 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-Want Version: 0.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 0.18-2 +- rebuild for new perl + * Wed Feb 06 2008 Ralf Cors??pius - 0.18-1 - Upstream update. From fedora-extras-commits at redhat.com Tue Mar 4 18:32:28 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Tue, 4 Mar 2008 18:32:28 GMT Subject: rpms/hplip/F-8 hplip-marker-supply.patch,1.7,1.8 Message-ID: <200803041832.m24IWSEQ017259@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17233 Modified Files: hplip-marker-supply.patch Log Message: Fixed marker-supply patch. hplip-marker-supply.patch: Index: hplip-marker-supply.patch =================================================================== RCS file: /cvs/pkgs/rpms/hplip/F-8/hplip-marker-supply.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hplip-marker-supply.patch 4 Mar 2008 16:50:44 -0000 1.7 +++ hplip-marker-supply.patch 4 Mar 2008 18:32:23 -0000 1.8 @@ -1,16 +1,17 @@ ---- hplip-2.7.6/prnt/hpijs/hpijs.cpp.marker-supply 2007-07-16 18:19:31.000000000 +0100 -+++ hplip-2.7.6/prnt/hpijs/hpijs.cpp 2007-07-16 18:19:43.000000000 +0100 -@@ -534,11 +534,11 @@ +diff -up hplip-2.8.2/prnt/hpijs/hpijs.cpp.marker-supply hplip-2.8.2/prnt/hpijs/hpijs.cpp +--- hplip-2.8.2/prnt/hpijs/hpijs.cpp.marker-supply 2008-02-08 19:36:38.000000000 +0000 ++++ hplip-2.8.2/prnt/hpijs/hpijs.cpp 2008-03-04 17:51:02.000000000 +0000 +@@ -541,11 +541,11 @@ int main (int argc, char *argv[], char * case WARN_LOW_INK_YELLOW: case WARN_LOW_INK_MULTIPLE_PENS: - { -- bug ("STATE: marker-supply-low\n"); -+ bug ("STATE: +marker-supply-low-warning\n"); - break; - } + { +- bug ("STATE: marker-supply-low-warning\n"); ++ bug ("STATE: +marker-supply-low-warning\n"); + break; + } default: -- bug ("STATE: -marker-supply-low"); -+ bug ("STATE: -marker-supply-low-warning\n"); +- bug ("STATE: -marker-supply-low-warning"); ++ bug ("STATE: -marker-supply-low-warning\n"); } } From fedora-extras-commits at redhat.com Tue Mar 4 18:32:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:32:48 GMT Subject: rpms/perl-Contextual-Return/devel perl-Contextual-Return.spec, 1.5, 1.6 Message-ID: <200803041832.m24IWmAN017320@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Contextual-Return/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17206 Modified Files: perl-Contextual-Return.spec Log Message: new perl Index: perl-Contextual-Return.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Contextual-Return/devel/perl-Contextual-Return.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Contextual-Return.spec 30 Mar 2007 15:15:27 -0000 1.5 +++ perl-Contextual-Return.spec 4 Mar 2008 18:32:13 -0000 1.6 @@ -1,13 +1,13 @@ Name: perl-Contextual-Return -Version: v0.2.1 -Release: 1%{?dist} +Version: 0.2.1 +Release: 2%{?dist} Summary: Create context-senstive return values Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Contextual-Return -Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Contextual-Return-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Contextual-Return-v%{version}.tar.gz Source98: filter-provides.sh %define __perl_provides %{SOURCE98} @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl, perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More), perl(Want), perl(version) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) @@ -27,7 +27,7 @@ %prep -%setup -q -n Contextual-Return-%{version} +%setup -q -n Contextual-Return-v%{version} %build @@ -61,6 +61,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.2.1-2 +- rebuild for new perl + * Fri Mar 30 2007 Chris Weyl v0.2.1-1 - update to v0.2.1 From fedora-extras-commits at redhat.com Tue Mar 4 18:33:01 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 4 Mar 2008 18:33:01 GMT Subject: rpms/gvfs/devel .cvsignore, 1.11, 1.12 gvfs.spec, 1.27, 1.28 sources, 1.11, 1.12 Message-ID: <200803041833.m24IX1HF017361@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17230 Modified Files: .cvsignore gvfs.spec sources Log Message: Update to 0.1.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 4 Mar 2008 15:49:08 -0000 1.11 +++ .cvsignore 4 Mar 2008 18:32:27 -0000 1.12 @@ -1 +1 @@ -gvfs-0.1.10.tar.bz2 +gvfs-0.1.11.tar.bz2 Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gvfs.spec 4 Mar 2008 15:57:21 -0000 1.27 +++ gvfs.spec 4 Mar 2008 18:32:27 -0000 1.28 @@ -1,6 +1,6 @@ Summary: Backends for the gio framework in GLib Name: gvfs -Version: 0.1.10 +Version: 0.1.11 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -141,6 +141,9 @@ %{_libdir}/libgvfscommon.so %changelog +* Tue Mar 4 2008 Matthias Clasen - 0.1.11-1 +- Update to 0.1.11 + * Tue Mar 04 2008 Tomas Bzatek - 0.1.10-1 - Update to 0.1.10 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 Mar 2008 15:49:08 -0000 1.11 +++ sources 4 Mar 2008 18:32:27 -0000 1.12 @@ -1 +1 @@ -e77f82dadda8ad481dbfc5383bcde06d gvfs-0.1.10.tar.bz2 +fd55418c31bb95f7f5f217f475887e86 gvfs-0.1.11.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 18:33:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:33:45 GMT Subject: rpms/perl-Test-Class/devel perl-Test-Class.spec,1.2,1.3 Message-ID: <200803041833.m24IXjc4017422@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17404 Modified Files: perl-Test-Class.spec Log Message: new perl Index: perl-Test-Class.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Class/devel/perl-Test-Class.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-Class.spec 28 Jan 2008 19:13:43 -0000 1.2 +++ perl-Test-Class.spec 4 Mar 2008 18:33:10 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-Class Version: 0.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easily create test classes in an xUnit/JUnit style License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.28-2 +- rebuild for new perl + * Mon Jan 28 2008 Steven Pritchard 0.28-1 - Update to 0.28. - Update License tag. From fedora-extras-commits at redhat.com Tue Mar 4 18:37:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:37:27 GMT Subject: rpms/perl-Object-InsideOut/devel perl-Object-InsideOut.spec, 1.7, 1.8 Message-ID: <200803041837.m24IbR5F017596@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Object-InsideOut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17562 Modified Files: perl-Object-InsideOut.spec Log Message: new perl Index: perl-Object-InsideOut.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Object-InsideOut/devel/perl-Object-InsideOut.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Object-InsideOut.spec 11 Oct 2006 02:28:44 -0000 1.7 +++ perl-Object-InsideOut.spec 4 Mar 2008 18:36:50 -0000 1.8 @@ -1,10 +1,10 @@ Name: perl-Object-InsideOut Version: 2.06 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Comprehensive inside-out object support module Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Object-InsideOut Source0: http://search.cpan.org/CPAN/authors/id/J/JD/JDHEDDEN/Object-InsideOut-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -13,7 +13,6 @@ %define __perl_provides %{SOURCE98} BuildArch: noarch -BuildRequires: perl BuildRequires: perl(Exception::Class) >= 1.22 BuildRequires: perl(Want) >= 0.12 BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) @@ -66,6 +65,9 @@ %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 2.06-2 +- rebuild for new perl + * Tue Oct 10 2006 Chris Weyl 2.06-1 - update to 2.06 - add additional BRs: perl(Test::Pod[::Coverage]) From fedora-extras-commits at redhat.com Tue Mar 4 18:38:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:38:41 GMT Subject: rpms/perl-Math-Random-MT-Auto/devel perl-Math-Random-MT-Auto.spec, 1.4, 1.5 Message-ID: <200803041838.m24Icf3M017673@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Math-Random-MT-Auto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17640 Modified Files: perl-Math-Random-MT-Auto.spec Log Message: new perl Index: perl-Math-Random-MT-Auto.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Random-MT-Auto/devel/perl-Math-Random-MT-Auto.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Math-Random-MT-Auto.spec 18 Feb 2008 23:28:01 -0000 1.4 +++ perl-Math-Random-MT-Auto.spec 4 Mar 2008 18:38:06 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Math-Random-MT-Auto Version: 6.02 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Auto-seeded Mersenne Twister PRNGs License: BSD Group: Development/Libraries @@ -64,6 +64,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 6.02-4 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 6.02-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 18:41:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:41:29 GMT Subject: rpms/perl-Class-ReturnValue/devel perl-Class-ReturnValue.spec, 1.8, 1.9 Message-ID: <200803041841.m24IfT8W017846@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-ReturnValue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17747 Modified Files: perl-Class-ReturnValue.spec Log Message: new perl Index: perl-Class-ReturnValue.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-ReturnValue/devel/perl-Class-ReturnValue.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Class-ReturnValue.spec 6 Sep 2007 16:41:30 -0000 1.8 +++ perl-Class-ReturnValue.spec 4 Mar 2008 18:40:53 -0000 1.9 @@ -1,7 +1,7 @@ Name: perl-Class-ReturnValue Summary: Class::ReturnValue Perl module Version: 0.55 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-ReturnValue @@ -44,6 +44,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 0.55-2 +- rebuild for new perl + * Thu Sep 06 2007 Ralf Cors??pius - 0.55-1 - Upstream update. - Spec cleanup. From fedora-extras-commits at redhat.com Tue Mar 4 18:41:45 2008 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 4 Mar 2008 18:41:45 GMT Subject: rpms/graphviz/devel graphviz.spec,1.45,1.46 Message-ID: <200803041841.m24IfjBm017906@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/pkgs/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17781 Modified Files: graphviz.spec Log Message: * Tue Mar 04 2008 Patrick Jima Laughton 2.16.1-0.4 - Disable R support Index: graphviz.spec =================================================================== RCS file: /cvs/pkgs/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- graphviz.spec 3 Mar 2008 16:05:19 -0000 1.45 +++ graphviz.spec 4 Mar 2008 18:41:07 -0000 1.46 @@ -8,7 +8,7 @@ Summary: Graph Visualization Tools Version: 2.16.1 -%define truerelease 0.2 +%define truerelease 0.4 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -150,8 +150,8 @@ BuildRequires: gd gd-devel perl-devel DevIL-devel %endif %if "%fedora" >= "8" -%define R_LANG 1 -BuildRequires: R swig >= 1.3.33 +#define R_LANG 1 +#BuildRequires: R-devel swig >= 1.3.33 %endif %if "%fedora" >= "9" %define MING 0 @@ -619,6 +619,9 @@ #-- changelog -------------------------------------------------- %changelog +* Tue Mar 04 2008 Patrick "Jima" Laughton 2.16.1-0.4 +- Disable R support + * Mon Mar 03 2008 Patrick "Jima" Laughton 2.16.1-0.2 - New upstream release (fixes BZ#433205, BZ#427376) - Merged spec changes in from upstream From fedora-extras-commits at redhat.com Tue Mar 4 18:41:55 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 18:41:55 GMT Subject: comps comps-f8.xml.in,1.228,1.229 comps-f9.xml.in,1.288,1.289 Message-ID: <200803041841.m24Iftae017917@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17802 Modified Files: comps-f8.xml.in comps-f9.xml.in Log Message: add lbrickbuster2 to comps Index: comps-f8.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f8.xml.in,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- comps-f8.xml.in 3 Mar 2008 11:49:10 -0000 1.228 +++ comps-f8.xml.in 4 Mar 2008 18:41:25 -0000 1.229 @@ -1532,6 +1532,7 @@ ksirk ksudoku lacewing + lbrickbuster2 lincity-ng liquidwar lmarbles Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.288 retrieving revision 1.289 diff -u -r1.288 -r1.289 --- comps-f9.xml.in 3 Mar 2008 11:49:10 -0000 1.288 +++ comps-f9.xml.in 4 Mar 2008 18:41:25 -0000 1.289 @@ -1536,6 +1536,7 @@ koules ksirk lacewing + lbrickbuster2 lincity-ng liquidwar lmarbles From fedora-extras-commits at redhat.com Tue Mar 4 18:43:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:43:38 GMT Subject: rpms/perl-capitalization/devel perl-capitalization.spec,1.6,1.7 Message-ID: <200803041843.m24IhcqV018034@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-capitalization/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17993 Modified Files: perl-capitalization.spec Log Message: new perl Index: perl-capitalization.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-capitalization/devel/perl-capitalization.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-capitalization.spec 17 Aug 2007 04:39:00 -0000 1.6 +++ perl-capitalization.spec 4 Mar 2008 18:43:04 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-capitalization Version: 0.03 -Release: 5%{?dist} +Release: 6%{?dist} Summary: No capitalization on method names Group: Development/Libraries @@ -52,6 +52,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 0.03-6 +- rebuild for new perl + * Fri Aug 17 2007 Ralf Cors??pius - 0.03-5 - Update license tag. - Reflect perl module split. @@ -71,4 +74,4 @@ * Tue Oct 10 2005 Ralf Cors??pius - 0.03-1 - Initial package. - FE submission. - \ No newline at end of file + From fedora-extras-commits at redhat.com Tue Mar 4 18:44:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:44:32 GMT Subject: rpms/perl-Cache-Simple-TimedExpiry/devel perl-Cache-Simple-TimedExpiry.spec, 1.7, 1.8 Message-ID: <200803041844.m24IiWqn018131@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18075 Modified Files: perl-Cache-Simple-TimedExpiry.spec Log Message: new perl Index: perl-Cache-Simple-TimedExpiry.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Cache-Simple-TimedExpiry/devel/perl-Cache-Simple-TimedExpiry.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Cache-Simple-TimedExpiry.spec 4 Sep 2007 13:56:55 -0000 1.7 +++ perl-Cache-Simple-TimedExpiry.spec 4 Mar 2008 18:43:57 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Cache-Simple-TimedExpiry Version: 0.27 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A lightweight cache with timed expiration License: GPL+ or Artistic Group: Development/Libraries @@ -43,6 +43,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 0.27-4 +- rebuild for new perl + * Tue Sep 04 2007 Ralf Cors??pius - 0.27-3 - BR: perl(Test::More). From fedora-extras-commits at redhat.com Tue Mar 4 18:46:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:46:08 GMT Subject: rpms/perl-DBIx-DBSchema/devel perl-DBIx-DBSchema.spec,1.12,1.13 Message-ID: <200803041846.m24Ik8MM018280@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18219 Modified Files: perl-DBIx-DBSchema.spec Log Message: new perl Index: perl-DBIx-DBSchema.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBIx-DBSchema/devel/perl-DBIx-DBSchema.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-DBIx-DBSchema.spec 22 Dec 2007 03:30:16 -0000 1.12 +++ perl-DBIx-DBSchema.spec 4 Mar 2008 18:45:24 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-DBIx-DBSchema Version: 0.36 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Database-independent schema objects Group: Development/Libraries @@ -64,6 +64,9 @@ %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 0.36-2 +- rebuild for new perl + * Sat Dec 22 2007 Ralf Cors??pius - 0.36-1 - Upstream update. - Remove DBIx-DBSchema-0.28-version.diff. @@ -102,4 +105,4 @@ * Tue Oct 10 2005 Ralf Cors??pius - 0.27-1 - Initial package. - FE submission. - \ No newline at end of file + From fedora-extras-commits at redhat.com Tue Mar 4 18:46:09 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 4 Mar 2008 18:46:09 GMT Subject: rpms/gvfs/devel gvfs.spec,1.28,1.29 Message-ID: <200803041846.m24Ik9qK018283@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18228 Modified Files: gvfs.spec Log Message: drop upstream patches Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gvfs.spec 4 Mar 2008 18:32:27 -0000 1.28 +++ gvfs.spec 4 Mar 2008 18:45:35 -0000 1.29 @@ -26,10 +26,6 @@ BuildRequires: bluez-libs-devel >= 3.12 BuildRequires: expat-devel -# From head: -Patch1: gvfsfusedaemon_debug.patch -Patch2: ghalvolumemonitor_free_mounts.patch - %description The gvfs package provides backend implementations for the gio framework in GLib. It includes ftp, sftp, cifs. @@ -46,9 +42,6 @@ %prep %setup -q -%patch1 -p1 -b .fusedebug -%patch2 -p1 -b .halmonitor - %build %configure make # %{?_smp_mflags} From fedora-extras-commits at redhat.com Tue Mar 4 18:26:07 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:26:07 GMT Subject: rpms/ocaml-mysql/F-8 ocaml-mysql.spec,1.1,1.2 Message-ID: <200803041826.m24IQ7bc016848@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-mysql/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16697 Modified Files: ocaml-mysql.spec Log Message: * Tue Mar 4 2008 Richard W.M. Jones - 1.0.4-3 - Need to excludearch ppc64 on F-8 only. Index: ocaml-mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mysql/F-8/ocaml-mysql.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-mysql.spec 4 Mar 2008 18:22:05 -0000 1.1 +++ ocaml-mysql.spec 4 Mar 2008 18:25:32 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-mysql Version: 1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for accessing MySQL databases Group: Development/Libraries @@ -11,6 +11,7 @@ URL: http://raevnos.pennmush.org/code/ocaml-mysql/ Source0: http://raevnos.pennmush.org/code/ocaml-mysql/ocaml-mysql-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel @@ -94,6 +95,9 @@ %changelog +* Tue Mar 4 2008 Richard W.M. Jones - 1.0.4-3 +- Need to excludearch ppc64 on F-8 only. + * Mon Mar 3 2008 Richard W.M. Jones - 1.0.4-2 - Don't need 'ExcludeArch: ppc64' any more. - Add missing BR for ocaml-camlp4-devel. From fedora-extras-commits at redhat.com Tue Mar 4 18:13:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:13:59 GMT Subject: rpms/perl-prefork/devel perl-prefork.spec,1.7,1.8 Message-ID: <200803041813.m24IDxGD015383@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-prefork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15325 Modified Files: perl-prefork.spec Log Message: new perl Index: perl-prefork.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-prefork/devel/perl-prefork.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-prefork.spec 25 Nov 2007 15:22:35 -0000 1.7 +++ perl-prefork.spec 4 Mar 2008 18:13:17 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-prefork Version: 1.02 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Optimized module loading for forking or non-forking processes License: GPL+ or Artistic Group: Development/Libraries @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 1.02-2 +- rebuild for new perl + * Sun Nov 25 2007 Ralf Cors??pius - 1.02-1 - Upstream update. - Add BR: perl(Test::MinimumVersion). From fedora-extras-commits at redhat.com Tue Mar 4 18:25:54 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:25:54 GMT Subject: rpms/ocaml-postgresql/devel ocaml-postgresql.spec,1.1,1.2 Message-ID: <200803041825.m24IPsCF016796@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16673 Modified Files: ocaml-postgresql.spec Log Message: * Tue Mar 4 2008 Richard W.M. Jones - 1.7.0-3 - Rebuild for ppc64. Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/ocaml-postgresql.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-postgresql.spec 4 Mar 2008 18:21:36 -0000 1.1 +++ ocaml-postgresql.spec 4 Mar 2008 18:25:21 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-postgresql Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for accessing PostreSQL databases Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://www.ocaml.info/home/ocaml_sources.html#toc13 Source0: http://www.ocaml.info/ocaml_sources/postgresql-ocaml-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel @@ -91,6 +90,9 @@ %changelog +* Tue Mar 4 2008 Richard W.M. Jones - 1.7.0-3 +- Rebuild for ppc64. + * Mon Mar 3 2008 Richard W.M. Jones - 1.7.0-2 - Only include LICENSE doc in main package. - Include extra documentation and examples in devel package. From fedora-extras-commits at redhat.com Tue Mar 4 18:36:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 18:36:00 GMT Subject: rpms/perl-IO-Prompt/devel perl-IO-Prompt.spec,1.3,1.4 Message-ID: <200803041836.m24Ia0NB017513@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-Prompt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17475 Modified Files: perl-IO-Prompt.spec Log Message: new perl Index: perl-IO-Prompt.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Prompt/devel/perl-IO-Prompt.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-IO-Prompt.spec 1 Sep 2006 04:15:00 -0000 1.3 +++ perl-IO-Prompt.spec 4 Mar 2008 18:35:18 -0000 1.4 @@ -1,14 +1,14 @@ # $Id$ Name: perl-IO-Prompt -Version: v0.99.4 -Release: 2%{?dist} +Version: 0.99.4 +Release: 3%{?dist} Summary: Interactively prompt for user input Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/IO-Prompt -Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/IO-Prompt-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/IO-Prompt-v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,7 +25,7 @@ %prep -%setup -q -n IO-Prompt-%{version} +%setup -q -n IO-Prompt-v%{version} # exec + doc == bad cd examples @@ -62,6 +62,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.99.4-3 +- rebuild for new perl + * Thu Aug 31 2006 Chris Weyl v0.99.4-2 - bump for mass rebuild From fedora-extras-commits at redhat.com Tue Mar 4 18:25:40 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:25:40 GMT Subject: rpms/ocaml-xmlrpc-light/F-8 ocaml-xmlrpc-light.spec,1.1,1.2 Message-ID: <200803041825.m24IPex1016747@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-xmlrpc-light/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16650 Modified Files: ocaml-xmlrpc-light.spec Log Message: * Tue Mar 4 2008 Richard W.M. Jones - 0.6-3 - Need to excludearch ppc64 on F-8 only. Index: ocaml-xmlrpc-light.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-xmlrpc-light/F-8/ocaml-xmlrpc-light.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-xmlrpc-light.spec 4 Mar 2008 18:21:27 -0000 1.1 +++ ocaml-xmlrpc-light.spec 4 Mar 2008 18:25:07 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-xmlrpc-light Version: 0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for writing XML-RPC clients and servers Group: Development/Libraries @@ -11,6 +11,7 @@ URL: http://code.google.com/p/xmlrpc-light/ Source0: http://xmlrpc-light.googlecode.com/files/xmlrpc-light-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel @@ -83,6 +84,9 @@ %changelog +* Tue Mar 4 2008 Richard W.M. Jones - 0.6-3 +- Need to excludearch ppc64 on F-8 only. + * Mon Mar 3 2008 Richard W.M. Jones - 0.6-2 - Added missing BR ocaml-ocamlnet-nethttpd-devel. - Test build in mock. From fedora-extras-commits at redhat.com Tue Mar 4 18:14:52 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 18:14:52 GMT Subject: rpms/ocaml-libvirt/devel .cvsignore, 1.10, 1.11 ocaml-libvirt.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <200803041814.m24IEqp5015481@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15375/devel Modified Files: .cvsignore ocaml-libvirt.spec sources Log Message: * Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-1 - New upstream release 0.4.1.0. - Upstream now requires ocaml-dbus >= 0.06, ocaml-lablgtk >= 2.10.0, gnome-icon-theme. - Enable virt-df. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Feb 2008 00:34:50 -0000 1.10 +++ .cvsignore 4 Mar 2008 18:14:08 -0000 1.11 @@ -1 +1 @@ -ocaml-libvirt-0.4.0.3.tar.gz +ocaml-libvirt-0.4.1.0.tar.gz Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ocaml-libvirt.spec 4 Mar 2008 18:12:15 -0000 1.14 +++ ocaml-libvirt.spec 4 Mar 2008 18:14:08 -0000 1.15 @@ -243,7 +243,7 @@ * Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-1 - New upstream release 0.4.1.0. - Upstream now requires ocaml-dbus >= 0.06, ocaml-lablgtk >= 2.10.0, - gnome-icon-theme. + ocaml-dbus-devel. - Enable virt-df. * Sat Mar 1 2008 Richard W.M. Jones - 0.4.0.3-3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 13 Feb 2008 00:34:50 -0000 1.10 +++ sources 4 Mar 2008 18:14:08 -0000 1.11 @@ -1 +1 @@ -d9f3319dfc05bf5e2a873a90e80f1e9c ocaml-libvirt-0.4.0.3.tar.gz +d0798559af74524a58d98b523d36744e ocaml-libvirt-0.4.1.0.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 19:02:40 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Tue, 4 Mar 2008 19:02:40 GMT Subject: rpms/kerneloops/F-8 kerneloops-fix-manfile-name.patch, NONE, 1.1 kerneloops-ignore-module-list.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kerneloops.spec, 1.1, 1.2 Message-ID: <200803041902.m24J2e9l026663@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kerneloops/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26536 Modified Files: .cvsignore kerneloops.spec Added Files: kerneloops-fix-manfile-name.patch kerneloops-ignore-module-list.patch Log Message: * Tue Mar 04 2008 Chuck Ebbert 0.10-3 - Ignore "Modules linked in" when scanning for oopses. - Fix the manfile name. kerneloops-fix-manfile-name.patch: --- NEW FILE kerneloops-fix-manfile-name.patch --- --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- kerneloops-0.10.orig/Makefile +++ kerneloops-0.10/Makefile @@ -20,7 +20,7 @@ MY_CFLAGS := `pkg-config --cflags libnot LDF_A := -Wl,--as-needed `pkg-config --libs libnotify gtk+-2.0` LDF_D := -Wl,--as-needed `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs` -Wl,"-z relro" -Wl,"-z now" -all: kerneloops kerneloops-applet kerneloops.1.gz +all: kerneloops kerneloops-applet kerneloops.8.gz .c.o: $(CC) $(CFLAGS) $(MY_CFLAGS) -c -o $@ $< @@ -33,18 +33,18 @@ kerneloops: kerneloops.o submit.o dmesg. kerneloops-applet: kerneloops-applet.o gcc kerneloops-applet.o $(LDF_A)-o kerneloops-applet -kerneloops.1.gz: kerneloops.1 +kerneloops.8.gz: kerneloops.1 gzip -9 -c $< > $@ clean: - rm -f *~ *.o *.ko DEADJOE kerneloops kerneloops-applet *.out */*~ kerneloops.1.gz + rm -f *~ *.o *.ko DEADJOE kerneloops kerneloops-applet *.out */*~ kerneloops.8.gz @(cd po/ && $(MAKE) $@) dist: clean rm -rf .git .gitignore push.sh .*~ */*~ test/*dbg -install: kerneloops kerneloops-applet kerneloops.1.gz +install: kerneloops kerneloops-applet kerneloops.8.gz mkdir -p $(DESTDIR)/usr/sbin/ $(DESTDIR)/etc/xdg/autostart mkdir -p $(DESTDIR)/usr/share/kerneloops $(DESTDIR)/etc/dbus-1/system.d/ mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) @@ -53,7 +53,7 @@ install: kerneloops kerneloops-applet ke install -m 0644 kerneloops.conf $(DESTDIR)/etc/kerneloops.conf desktop-file-install -m 0644 --dir=$(DESTDIR)/etc/xdg/autostart/ kerneloops-applet.desktop install -m 0644 kerneloops.dbus $(DESTDIR)/etc/dbus-1/system.d/ - install -m 0644 kerneloops.1.gz $(DESTDIR)$(MANDIR) + install -m 0644 kerneloops.8.gz $(DESTDIR)$(MANDIR) install -m 0644 icon.png $(DESTDIR)/usr/share/kerneloops/icon.png @(cd po/ && env LOCALESDIR=$(LOCALESDIR) DESTDIR=$(DESTDIR) $(MAKE) $@) kerneloops-ignore-module-list.patch: --- NEW FILE kerneloops-ignore-module-list.patch --- Module list also shows up in sysrq-p output, so ignore it. Index: kerneloops-0.10/dmesg.c =================================================================== --- kerneloops-0.10.orig/dmesg.c +++ kerneloops-0.10/dmesg.c @@ -174,8 +174,6 @@ static void extract_oops(char *buffer, i oopsstart = i; if (strstr(linepointer[i], "------------[ cut here ]------------")) oopsstart = i; - if (strstr(linepointer[i], "Modules linked in:") && i >= 4) - oopsstart = i-4; if (strstr(linepointer[i], "Oops:") && i >= 3) oopsstart = i-3; if (oopsstart >= 0 && testmode) { Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jan 2008 00:51:13 -0000 1.2 +++ .cvsignore 4 Mar 2008 19:02:06 -0000 1.3 @@ -1 +1,2 @@ +kerneloops-0.10 kerneloops-0.10.tar.gz Index: kerneloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/F-8/kerneloops.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kerneloops.spec 9 Jan 2008 00:51:13 -0000 1.1 +++ kerneloops.spec 4 Mar 2008 19:02:06 -0000 1.2 @@ -1,6 +1,6 @@ Name: kerneloops Version: 0.10 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Tool to automatically collect and submit kernel crash signatures Group: System Environment/Base @@ -8,6 +8,9 @@ URL: http://www.kerneloops.org Source0: http://www.kerneloops.org/download/%{name}-%{version}.tar.gz +Patch0: kerneloops-fix-manfile-name.patch +Patch1: kerneloops-ignore-module-list.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: curl-devel @@ -28,6 +31,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -70,6 +75,10 @@ %{_mandir}/man8/kerneloops.1.gz %changelog +* Tue Mar 04 2008 Chuck Ebbert 0.10-3 +- Ignore "Modules linked in" when scanning for oopses. +- Fix the manfile name. + * Sat Jan 5 2008 Arjan van de Ven - 0.10-1 - fix some bugs caught by the fedora review process * Tue Jan 1 2008 Arjan van de Ven - 0.9-1 From fedora-extras-commits at redhat.com Tue Mar 4 19:05:39 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 4 Mar 2008 19:05:39 GMT Subject: rpms/xfce4-gsynaptics-mcs-plugin/devel xfce4-gsynaptics-mcs-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041905.m24J5d0s027147@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26902/devel Modified Files: .cvsignore sources Added Files: xfce4-gsynaptics-mcs-plugin.spec Log Message: initial import --- NEW FILE xfce4-gsynaptics-mcs-plugin.spec --- Name: xfce4-gsynaptics-mcs-plugin Version: 1.0.0 Release: 1%{?dist} Summary: GSynaptics icon for the Xfce Settings Manager Group: User Interface/Desktops License: GPLv2 URL: http://goodies.xfce.org/projects/mcs-plugins/gsynaptics-mcs-plugin Source0: http://goodies.xfce.org/releases/gsynaptics-mcs-plugin/gsynaptics-mcs-plugin-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce-mcs-manager-devel >= 4.3.99.2 BuildRequires: gettext, perl(XML::Parser) BuildRequires: libgnomeui-devel BuildRequires: gsynaptics Requires: xfce-mcs-manager >= 4.4.0, gsynaptics %description A simple MCS plugin for Xfce that starts gsynaptics when invoked and launches gsynaptics-init once loaded by the MCS manager. %prep %setup -qn gsynaptics-mcs-plugin-%{version} %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/gsynaptics_plugin.la %find_lang gsynaptics-mcs-plugin %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT %files -f gsynaptics-mcs-plugin.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/xfce4/mcs-plugins/gsynaptics_plugin.so %{_datadir}/icons/hicolor/*/apps/gsynaptics-mcs-plugin.png %{_datadir}/icons/hicolor/scalable/apps/gsynaptics-mcs-plugin.svg %changelog * Sat Feb 24 2007 Christoph Wickert - 1.0.0-1 - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 03:00:59 -0000 1.1 +++ .cvsignore 4 Mar 2008 19:04:58 -0000 1.2 @@ -0,0 +1 @@ +gsynaptics-mcs-plugin-1.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 03:00:59 -0000 1.1 +++ sources 4 Mar 2008 19:04:58 -0000 1.2 @@ -0,0 +1 @@ +57ecdd4983ab55614019d4b5a581398e gsynaptics-mcs-plugin-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 19:07:49 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Tue, 4 Mar 2008 19:07:49 GMT Subject: rpms/kerneloops/devel kerneloops-ignore-module-list.patch, NONE, 1.1 kerneloops.spec, 1.3, 1.4 Message-ID: <200803041907.m24J7n4G027512@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kerneloops/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27389 Modified Files: kerneloops.spec Added Files: kerneloops-ignore-module-list.patch Log Message: * Tue Mar 04 2008 Chuck Ebbert 0.10-4 - Ignore "Modules linked in" when scanning for oopses. kerneloops-ignore-module-list.patch: --- NEW FILE kerneloops-ignore-module-list.patch --- Module list also shows up in sysrq-p output, so ignore it. Index: kerneloops-0.10/dmesg.c =================================================================== --- kerneloops-0.10.orig/dmesg.c +++ kerneloops-0.10/dmesg.c @@ -174,8 +174,6 @@ static void extract_oops(char *buffer, i oopsstart = i; if (strstr(linepointer[i], "------------[ cut here ]------------")) oopsstart = i; - if (strstr(linepointer[i], "Modules linked in:") && i >= 4) - oopsstart = i-4; if (strstr(linepointer[i], "Oops:") && i >= 3) oopsstart = i-3; if (oopsstart >= 0 && testmode) { Index: kerneloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/devel/kerneloops.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kerneloops.spec 18 Feb 2008 22:23:32 -0000 1.3 +++ kerneloops.spec 4 Mar 2008 19:07:13 -0000 1.4 @@ -1,6 +1,6 @@ Name: kerneloops Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool to automatically collect and submit kernel crash signatures Group: System Environment/Base @@ -8,6 +8,7 @@ URL: http://www.kerneloops.org Source0: http://www.kerneloops.org/download/%{name}-%{version}.tar.gz Patch0: kerneloops-fix-manfile-name.patch +Patch1: kerneloops-ignore-module-list.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -30,6 +31,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -72,6 +74,9 @@ %doc %{_mandir}/man8/kerneloops.8.gz %changelog +* Tue Mar 04 2008 Chuck Ebbert 0.10-4 +- Ignore "Modules linked in" when scanning for oopses. + * Mon Feb 18 2008 Fedora Release Engineering - 0.10-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 19:08:53 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Tue, 4 Mar 2008 19:08:53 GMT Subject: rpms/kerneloops/F-8 .cvsignore,1.3,1.4 kerneloops.spec,1.2,1.3 Message-ID: <200803041908.m24J8rGX027708@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kerneloops/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27590 Modified Files: .cvsignore kerneloops.spec Log Message: * Tue Mar 04 2008 Chuck Ebbert 0.10-4 - Bump rev to 4 to match rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Mar 2008 19:02:06 -0000 1.3 +++ .cvsignore 4 Mar 2008 19:08:18 -0000 1.4 @@ -1,2 +1,3 @@ +clog kerneloops-0.10 kerneloops-0.10.tar.gz Index: kerneloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/F-8/kerneloops.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kerneloops.spec 4 Mar 2008 19:02:06 -0000 1.2 +++ kerneloops.spec 4 Mar 2008 19:08:18 -0000 1.3 @@ -1,6 +1,6 @@ Name: kerneloops Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool to automatically collect and submit kernel crash signatures Group: System Environment/Base @@ -75,6 +75,9 @@ %{_mandir}/man8/kerneloops.1.gz %changelog +* Tue Mar 04 2008 Chuck Ebbert 0.10-4 +- Bump rev to 4 to match rawhide. + * Tue Mar 04 2008 Chuck Ebbert 0.10-3 - Ignore "Modules linked in" when scanning for oopses. - Fix the manfile name. From fedora-extras-commits at redhat.com Tue Mar 4 19:11:22 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 4 Mar 2008 19:11:22 GMT Subject: rpms/keepassx/F-8 keepassx-0.3.0-xdg.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 keepassx.spec, 1.4, 1.5 sources, 1.3, 1.4 keepass-0.2.2-htmlview.patch, 1.2, NONE Message-ID: <200803041911.m24JBMYl028179@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/keepassx/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28014/F-8 Modified Files: .cvsignore keepassx.spec sources Added Files: keepassx-0.3.0-xdg.patch Removed Files: keepass-0.2.2-htmlview.patch Log Message: * Sun Mar 02 2008 Aurelien Bompard 0.3.0-1 - version 0.3.0 - drop helpwindow patch (feature dropped upstream) keepassx-0.3.0-xdg.patch: --- NEW FILE keepassx-0.3.0-xdg.patch --- diff -up ./src/PwmConfig.cpp.xdg ./src/PwmConfig.cpp --- ./src/PwmConfig.cpp.xdg 2008-02-15 17:03:24.000000000 +0100 +++ ./src/PwmConfig.cpp 2008-03-02 08:21:47.000000000 +0100 @@ -53,7 +53,7 @@ bool CConfig::loadFromIni(QString filena BannerTextColor=ParseColorString(QSTR(ini.GetValue("Options","BannerTextColor","222,222,222"))); ShowPasswords=ini.GetValueB("Options","ShowPasswords",false); ShowPasswordsPasswordDlg=ini.GetValueB("Options","ShowPasswordsPasswordDlg",false); - OpenUrlCommand=QSTR(ini.GetValue("Options","UrlCmd","kfmclient openURL %1")); + OpenUrlCommand=QSTR(ini.GetValue("Options","UrlCmd","xdg-open %1")); Language=QSTR(ini.GetValue("Options","LangFile","")); ParseBoolString(QSTR(ini.GetValue("Options","SearchOptions",(const char*)defaultSearchOptions.toUtf8())),defaultSearchOptions,SearchOptions,9); ListView_HidePasswords=ini.GetValueB("UI","HidePasswords",true); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Jun 2007 20:28:03 -0000 1.3 +++ .cvsignore 4 Mar 2008 19:10:44 -0000 1.4 @@ -1,2 +1 @@ -KeePassX-0.2.2.tar.gz -KeePassX_logo_100x100.png +KeePassX-0.3.0.tar.gz Index: keepassx.spec =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/F-8/keepassx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- keepassx.spec 7 Oct 2007 17:49:50 -0000 1.4 +++ keepassx.spec 4 Mar 2008 19:10:44 -0000 1.5 @@ -1,15 +1,13 @@ Name: keepassx -Version: 0.2.2 -Release: 4%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Cross-platform password manager Group: User Interface/Desktops License: GPLv2+ URL: http://keepassx.sourceforge.net Source0: http://download.sf.net/keepassx/KeePassX-%{version}.tar.gz -Source1: http://keepassx.sourceforge.net/images/logos/KeePassX_logo_100x100.png -Patch0: keepass-0.2.2-htmlview.patch -Patch1: keepassx-0.2.2-helpurl.patch +Patch0: keepassx-0.3.0-xdg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel > 4.1, libXtst-devel, ImageMagick, desktop-file-utils @@ -35,9 +33,8 @@ %prep -%setup -q -%patch0 -p0 -b .htmlview -%patch1 -p0 -b .helpurl +%setup -q -n KeePassX-%{version} +%patch0 -p0 -b .xdg %build @@ -51,31 +48,20 @@ rm -rf $RPM_BUILD_ROOT make install INSTALL_ROOT=$RPM_BUILD_ROOT -# Icons -for size in 16 22 24 32 48 64 96 128; do - mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps - convert -resize ${size}x${size} %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/keepassx.png -done -# Fix permissions -chmod -x $RPM_BUILD_ROOT%{_datadir}/keepass/icons/*.png +# Use png in _datadir/icons/hicolor instead of xpm in pixmaps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ +convert $RPM_BUILD_ROOT%{_datadir}/pixmaps/keepassx.xpm \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/keepassx.png +rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/keepassx.xpm # Menu -cat > %{name}.desktop << EOF -[Desktop Entry] -Name=KeePassX -Comment=Password manager -Exec=keepass %f -Icon=keepassx.png -Type=Application -MimeType=application/x-keepass; -EOF -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +sed -i -e 's/keepassx.xpm/keepassx.png/g' -e 's/^Exec=keepassx$/Exec=keepassx %f/g' \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category Utility \ - --add-category Qt \ - %{name}.desktop + --delete-original \ + --add-mime-type application/x-keepass \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop # Associate KDB files cat > x-keepass.desktop << EOF @@ -112,15 +98,22 @@ %files %defattr(-,root,root,-) -%doc share/keepass/license.html -%{_bindir}/keepass -%{_datadir}/keepass +%doc share/keepassx/license.html +%{_bindir}/keepassx +%{_datadir}/keepassx %{_datadir}/applications/*.desktop %{_datadir}/mimelnk/application/*.desktop %{_datadir}/icons/hicolor/*/apps/keepassx.png %changelog +* Sun Mar 02 2008 Aurelien Bompard 0.3.0-1 +- version 0.3.0 +- drop helpwindow patch (feature dropped upstream) + +* Mon Feb 18 2008 Fedora Release Engineering - 0.2.2-5 +- Autorebuild for GCC 4.3 + * Sun Oct 07 2007 Aurelien Bompard 0.2.2-4 - use xdg-open instead of htmlview Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Jun 2007 20:28:03 -0000 1.3 +++ sources 4 Mar 2008 19:10:44 -0000 1.4 @@ -1,2 +1 @@ -5ee945ab12c2667ef5c4013a0636c26f KeePassX-0.2.2.tar.gz -f3e94f6715798d1f241007e2f882dc0a KeePassX_logo_100x100.png +c210b0b33cb01a5b55d87166d9b56242 KeePassX-0.3.0.tar.gz --- keepass-0.2.2-htmlview.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 19:11:27 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 4 Mar 2008 19:11:27 GMT Subject: rpms/keepassx/devel keepassx-0.3.0-xdg.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 keepassx.spec, 1.5, 1.6 sources, 1.3, 1.4 keepass-0.2.2-htmlview.patch, 1.2, NONE Message-ID: <200803041911.m24JBRHA028194@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/keepassx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28014/devel Modified Files: .cvsignore keepassx.spec sources Added Files: keepassx-0.3.0-xdg.patch Removed Files: keepass-0.2.2-htmlview.patch Log Message: * Sun Mar 02 2008 Aurelien Bompard 0.3.0-1 - version 0.3.0 - drop helpwindow patch (feature dropped upstream) keepassx-0.3.0-xdg.patch: --- NEW FILE keepassx-0.3.0-xdg.patch --- diff -up ./src/PwmConfig.cpp.xdg ./src/PwmConfig.cpp --- ./src/PwmConfig.cpp.xdg 2008-02-15 17:03:24.000000000 +0100 +++ ./src/PwmConfig.cpp 2008-03-02 08:21:47.000000000 +0100 @@ -53,7 +53,7 @@ bool CConfig::loadFromIni(QString filena BannerTextColor=ParseColorString(QSTR(ini.GetValue("Options","BannerTextColor","222,222,222"))); ShowPasswords=ini.GetValueB("Options","ShowPasswords",false); ShowPasswordsPasswordDlg=ini.GetValueB("Options","ShowPasswordsPasswordDlg",false); - OpenUrlCommand=QSTR(ini.GetValue("Options","UrlCmd","kfmclient openURL %1")); + OpenUrlCommand=QSTR(ini.GetValue("Options","UrlCmd","xdg-open %1")); Language=QSTR(ini.GetValue("Options","LangFile","")); ParseBoolString(QSTR(ini.GetValue("Options","SearchOptions",(const char*)defaultSearchOptions.toUtf8())),defaultSearchOptions,SearchOptions,9); ListView_HidePasswords=ini.GetValueB("UI","HidePasswords",true); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Jun 2007 20:28:03 -0000 1.3 +++ .cvsignore 4 Mar 2008 19:10:52 -0000 1.4 @@ -1,2 +1 @@ -KeePassX-0.2.2.tar.gz -KeePassX_logo_100x100.png +KeePassX-0.3.0.tar.gz Index: keepassx.spec =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/devel/keepassx.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- keepassx.spec 18 Feb 2008 18:15:52 -0000 1.5 +++ keepassx.spec 4 Mar 2008 19:10:52 -0000 1.6 @@ -1,15 +1,13 @@ Name: keepassx -Version: 0.2.2 -Release: 5%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Cross-platform password manager Group: User Interface/Desktops License: GPLv2+ URL: http://keepassx.sourceforge.net Source0: http://download.sf.net/keepassx/KeePassX-%{version}.tar.gz -Source1: http://keepassx.sourceforge.net/images/logos/KeePassX_logo_100x100.png -Patch0: keepass-0.2.2-htmlview.patch -Patch1: keepassx-0.2.2-helpurl.patch +Patch0: keepassx-0.3.0-xdg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel > 4.1, libXtst-devel, ImageMagick, desktop-file-utils @@ -35,9 +33,8 @@ %prep -%setup -q -%patch0 -p0 -b .htmlview -%patch1 -p0 -b .helpurl +%setup -q -n KeePassX-%{version} +%patch0 -p0 -b .xdg %build @@ -51,31 +48,20 @@ rm -rf $RPM_BUILD_ROOT make install INSTALL_ROOT=$RPM_BUILD_ROOT -# Icons -for size in 16 22 24 32 48 64 96 128; do - mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps - convert -resize ${size}x${size} %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/keepassx.png -done -# Fix permissions -chmod -x $RPM_BUILD_ROOT%{_datadir}/keepass/icons/*.png +# Use png in _datadir/icons/hicolor instead of xpm in pixmaps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ +convert $RPM_BUILD_ROOT%{_datadir}/pixmaps/keepassx.xpm \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/keepassx.png +rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/keepassx.xpm # Menu -cat > %{name}.desktop << EOF -[Desktop Entry] -Name=KeePassX -Comment=Password manager -Exec=keepass %f -Icon=keepassx.png -Type=Application -MimeType=application/x-keepass; -EOF -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +sed -i -e 's/keepassx.xpm/keepassx.png/g' -e 's/^Exec=keepassx$/Exec=keepassx %f/g' \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category Utility \ - --add-category Qt \ - %{name}.desktop + --delete-original \ + --add-mime-type application/x-keepass \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop # Associate KDB files cat > x-keepass.desktop << EOF @@ -112,15 +98,19 @@ %files %defattr(-,root,root,-) -%doc share/keepass/license.html -%{_bindir}/keepass -%{_datadir}/keepass +%doc share/keepassx/license.html +%{_bindir}/keepassx +%{_datadir}/keepassx %{_datadir}/applications/*.desktop %{_datadir}/mimelnk/application/*.desktop %{_datadir}/icons/hicolor/*/apps/keepassx.png %changelog +* Sun Mar 02 2008 Aurelien Bompard 0.3.0-1 +- version 0.3.0 +- drop helpwindow patch (feature dropped upstream) + * Mon Feb 18 2008 Fedora Release Engineering - 0.2.2-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Jun 2007 20:28:03 -0000 1.3 +++ sources 4 Mar 2008 19:10:52 -0000 1.4 @@ -1,2 +1 @@ -5ee945ab12c2667ef5c4013a0636c26f KeePassX-0.2.2.tar.gz -f3e94f6715798d1f241007e2f882dc0a KeePassX_logo_100x100.png +c210b0b33cb01a5b55d87166d9b56242 KeePassX-0.3.0.tar.gz --- keepass-0.2.2-htmlview.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 19:14:57 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Tue, 4 Mar 2008 19:14:57 GMT Subject: rpms/ocaml-libvirt/devel ocaml-libvirt.spec,1.15,1.16 Message-ID: <200803041914.m24JEv9f028767@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28655 Modified Files: ocaml-libvirt.spec Log Message: * Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-2 - Fix source URL. - Install virt-df manpage. Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/devel/ocaml-libvirt.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ocaml-libvirt.spec 4 Mar 2008 18:14:08 -0000 1.15 +++ ocaml-libvirt.spec 4 Mar 2008 19:14:22 -0000 1.16 @@ -10,13 +10,13 @@ Name: ocaml-libvirt Version: 0.4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml binding for libvirt Group: Development/Libraries License: LGPLv2+ URL: http://libvirt.org/ocaml/ -Source0: http://libvirt.org/sources/ocaml/ocaml-libvirt/%{name}-%{version}.tar.gz +Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.1 @@ -161,6 +161,13 @@ gzip $RPM_BUILD_ROOT%{_mandir}/man1/virt-top.1 %endif +%if %build_virt_df +# Install virt-df manpage by hand for now. +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0644 virt-df/virt-df.1 $RPM_BUILD_ROOT%{_mandir}/man1 +gzip $RPM_BUILD_ROOT%{_mandir}/man1/virt-df.1 +%endif + %if !%build_mlvirsh rm -f $RPM_BUILD_ROOT%{_bindir}/mlvirsh %endif @@ -234,12 +241,15 @@ %defattr(-,root,root,-) %doc COPYING README ChangeLog %{_bindir}/virt-df -# Because of a bug in the upstream package, this isn't built yet. -#%{_mandir}/man1/virt-df.1.gz +%{_mandir}/man1/virt-df.1.gz %endif %changelog +* Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-2 +- Fix source URL. +- Install virt-df manpage. + * Tue Mar 4 2008 Richard W.M. Jones - 0.4.1.0-1 - New upstream release 0.4.1.0. - Upstream now requires ocaml-dbus >= 0.06, ocaml-lablgtk >= 2.10.0, From fedora-extras-commits at redhat.com Tue Mar 4 19:24:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 19:24:22 GMT Subject: rpms/perl-Math-Round/devel perl-Math-Round.spec,1.5,1.6 Message-ID: <200803041924.m24JOMmM029617@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Math-Round/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29531 Modified Files: perl-Math-Round.spec Log Message: new perl Index: perl-Math-Round.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Round/devel/perl-Math-Round.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Math-Round.spec 16 Oct 2007 21:13:38 -0000 1.5 +++ perl-Math-Round.spec 4 Mar 2008 19:23:40 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Math-Round Version: 0.06 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Perl extension for rounding numbers Group: Development/Libraries @@ -10,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -57,6 +56,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.06-2 +- rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway 0.06-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Tue Mar 4 19:25:49 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Tue, 4 Mar 2008 19:25:49 GMT Subject: rpms/evolution-rss/devel evolution-rss.spec,1.5,1.6 Message-ID: <200803041925.m24JPnNJ029734@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29708 Modified Files: evolution-rss.spec Log Message: build against libxul Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- evolution-rss.spec 3 Mar 2008 19:21:31 -0000 1.5 +++ evolution-rss.spec 4 Mar 2008 19:25:11 -0000 1.6 @@ -17,7 +17,7 @@ BuildRequires: evolution-devel BuildRequires: evolution-data-server-devel BuildRequires: dbus-glib-devel -BuildRequires: gecko-devel = 1.9 +BuildRequires: gecko-libs = 1.9 BuildRequires: perl(XML::Parser) BuildRequires: libtool @@ -29,7 +29,7 @@ %build autoreconf -i -f -%configure --disable-webkit --with-gecko=xulrunner +%configure --disable-webkit make %{?_smp_mflags} %install From fedora-extras-commits at redhat.com Tue Mar 4 19:26:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 19:26:37 GMT Subject: rpms/perl-Locale-SubCountry/devel perl-Locale-SubCountry.spec, 1.4, 1.5 Message-ID: <200803041926.m24JQbFe029787@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Locale-SubCountry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29744 Modified Files: perl-Locale-SubCountry.spec Log Message: new perl Index: perl-Locale-SubCountry.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Locale-SubCountry/devel/perl-Locale-SubCountry.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Locale-SubCountry.spec 5 Dec 2006 16:20:54 -0000 1.4 +++ perl-Locale-SubCountry.spec 4 Mar 2008 19:26:03 -0000 1.5 @@ -1,16 +1,15 @@ Name: perl-Locale-SubCountry Version: 1.38 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ISO 3166-2 two letter subcountry codes Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Locale-SubCountry Source0: http://search.cpan.org/CPAN/authors/id/K/KI/KIMRYAN/Locale-SubCountry-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -64,6 +63,9 @@ %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 1.38-2 +- rebuild for new perl + * Tue Dec 05 2006 Chris Weyl 1.38-1 - update to 1.38 - minor specfile tweaks From fedora-extras-commits at redhat.com Tue Mar 4 19:27:17 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 19:27:17 GMT Subject: rpms/PersonalCopy-Lite-soundfont/devel LICENSE.txt, NONE, 1.1 PersonalCopy-Lite-soundfont.spec, NONE, 1.1 license-permission.eml, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803041927.m24JRH3p029870@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/PersonalCopy-Lite-soundfont/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29778 Modified Files: .cvsignore sources Added Files: LICENSE.txt PersonalCopy-Lite-soundfont.spec license-permission.eml Log Message: * Mon Mar 3 2008 Hans de Goede 4.1-3 - Fix version this is version 4.1 not 4.2 (oops) --- NEW FILE LICENSE.txt --- The PersonalCopy sound fonts by Jim Roe may be freely (re)distributed and used under the following conditions: 1) This license text must always be included in the distribution 2a) They must be distributed in their original form 2b) As an exception to 2a they may be distributed converted into an other soundfont format such as for example the Gravis Ultrasound .pat format 3) Neither the PersonalCopy soundfonts nor any of their individual components, in Original or Modified Versions, may be sold by itself. --- NEW FILE PersonalCopy-Lite-soundfont.spec --- Name: PersonalCopy-Lite-soundfont Version: 4.1 Release: 3%{?dist} Summary: Lite version of the PersonalCopy General Midi soundfont Group: Applications/Multimedia License: Redistributable, no modification permitted URL: http://www.personalcopy.com/sfarkfonts1.htm # This is ftp://ftp.personalcopy.net/pub/PCLite.sfArk.exe after running this # self extracting executable under wine Source0: PCLite.sf2 Source1: LICENSE.txt Source2: license-permission.eml BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: soundfont-utils BuildArch: noarch # Virtual soundfont2 provides for easy querying of all sf2 packages Provides: soundfont2 %description Lite (smaller) version of the PersonalCopy General Midi soundfont in soundfont 2.0 (.sf2) format. %package -n PersonalCopy-Lite-patches Summary: PersonalCopy Lite General Midi soundfont in GUS patch format Group: Applications/Multimedia Provides: timidity++-patches = %{version}-%{release} Obsoletes: timidity++-patches <= %{version}-%{release} %description -n PersonalCopy-Lite-patches Lite (smaller) version of the PersonalCopy General Midi soundfont in GUS (Gravis Ultrasound) patch (.pat) format. %prep %setup -q -c -T cp -p %{SOURCE1} %{SOURCE2} . %build unsf %{SOURCE0} # The gus patches get used by a lot of different programs and some need the # path to the patches to be absolute sed -i 's|PCLite-|%{_datadir}/PersonalCopy-Lite-patches/PCLite-|g' PCLite.cfg %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/soundfonts mkdir -p $RPM_BUILD_ROOT%{_datadir}/PersonalCopy-Lite-patches install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/soundfonts cp -a PCLite-* $RPM_BUILD_ROOT%{_datadir}/PersonalCopy-Lite-patches install -p -m 644 PCLite.cfg $RPM_BUILD_ROOT%{_sysconfdir}/timidity.cfg %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt license-permission.eml %{_datadir}/soundfonts %files -n PersonalCopy-Lite-patches %defattr(-,root,root,-) %doc LICENSE.txt license-permission.eml %config(noreplace) %{_sysconfdir}/timidity.cfg %{_datadir}/PersonalCopy-Lite-patches %changelog * Mon Mar 3 2008 Hans de Goede 4.1-3 - Fix version this is version 4.1 not 4.2 (oops) * Thu Feb 28 2008 Hans de Goede 4.1-2 - Stop providing timidity++-soundfont and /etc/timidity++.cfg, instead timidity++ itself will come with an /etc/timidity++.cfg and Require its default soundfont (bz 430417) * Sun Jan 27 2008 Hans de Goede 4.1-1 - Initial Fedora Package --- NEW FILE license-permission.eml --- Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 84316366 for j.w.r.degoede at hhs.nl; Fri, 25 Jan 2008 13:02:31 +0100 Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62) (envelope-from ) id 1JINGN-0000Cu-Vm for j.w.r.degoede at hhs.nl; Fri, 25 Jan 2008 13:02:31 +0100 X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on koko.hhs.nl X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_50 autolearn=ham version=3.1.8 Received: from [147.202.35.95] (port=43277 helo=ns1.personalcopy.net) by koko.hhs.nl with esmtp (Exim 4.62) (envelope-from ) id 1JINDe-0007oH-8R for j.w.r.degoede at hhs.nl; Fri, 25 Jan 2008 12:59:38 +0100 Received: (qmail 4862 invoked from network); 25 Jan 2008 11:59:37 -0000 Received: from host-69-95-108-220.cwon.choiceone.net (HELO NOMAD) (69.95.108.220) by personalcopy.net with SMTP; 25 Jan 2008 06:59:37 -0500 Message-ID: <002801c85f49$c7494be0$9865fea9 at NOMAD> From: "Jim Roe" To: "Hans de Goede" References: <47999228.1080603 at hhs.nl> Subject: Re: PersonalCopy soundfonts license proposal Date: Fri, 25 Jan 2008 06:59:45 -0500 MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=response Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.3138 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 --- begin proposed license --- The PersonalCopy sound fonts by Jim Roe may be freely (re)distributed and used under the following conditions: 1) This license text must always be included in the distribution 2a) They must be distributed in their original form 2b) As an exception to 2a they may be distributed converted into an other soundfont format such as for example the Gravis Ultrasound .pat format 3) Neither the PersonalCopy soundfonts nor any of their individual components, in Original or Modified Versions, may be sold by itself. --- end proposed license --- I agree to the distribution of PersonalCopy soundfonts under these terms and conditions. James R Roe. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/PersonalCopy-Lite-soundfont/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:01:37 -0000 1.1 +++ .cvsignore 4 Mar 2008 19:26:35 -0000 1.2 @@ -0,0 +1 @@ +PCLite.sf2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/PersonalCopy-Lite-soundfont/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:01:37 -0000 1.1 +++ sources 4 Mar 2008 19:26:35 -0000 1.2 @@ -0,0 +1 @@ +629732b7552c12a8fae5b046d306273a PCLite.sf2 From fedora-extras-commits at redhat.com Tue Mar 4 19:27:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 19:27:34 GMT Subject: rpms/perl-DateTime-Format-HTTP/devel perl-DateTime-Format-HTTP.spec, 1.4, 1.5 Message-ID: <200803041927.m24JRY5l029942@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Format-HTTP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29844 Modified Files: perl-DateTime-Format-HTTP.spec Log Message: new perl Index: perl-DateTime-Format-HTTP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-HTTP/devel/perl-DateTime-Format-HTTP.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DateTime-Format-HTTP.spec 1 Sep 2006 04:00:47 -0000 1.4 +++ perl-DateTime-Format-HTTP.spec 4 Mar 2008 19:26:59 -0000 1.5 @@ -1,16 +1,15 @@ Name: perl-DateTime-Format-HTTP Version: 0.37 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP protocol date conversion routines Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/DateTime-Format-HTTP Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/DateTime-Format-HTTP-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(DateTime) >= 0.17, perl(HTTP::Date) => 1.44 BuildRequires: perl(Test::More) >= 0.47, perl(Module::Build) BuildRequires: perl(File::Find::Rule) @@ -59,6 +58,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.37-3 +- rebuild for new perl + * Thu Aug 31 2006 Chris Weyl 0.37-2 - bump for mass rebuild From fedora-extras-commits at redhat.com Tue Mar 4 19:28:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 19:28:49 GMT Subject: rpms/perl-DateTime-Format-Strptime/devel perl-DateTime-Format-Strptime.spec, 1.4, 1.5 Message-ID: <200803041928.m24JSn0B030048@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Format-Strptime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29989 Modified Files: perl-DateTime-Format-Strptime.spec Log Message: new perl Index: perl-DateTime-Format-Strptime.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Strptime/devel/perl-DateTime-Format-Strptime.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DateTime-Format-Strptime.spec 3 Jan 2008 17:28:37 -0000 1.4 +++ perl-DateTime-Format-Strptime.spec 4 Mar 2008 19:28:12 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-DateTime-Format-Strptime Version: 1.0702 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parse and format strp and strf time patterns License: GPL+ or Artistic Group: Development/Libraries @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 1.0702-2 +- rebuild for new perl + * Thu Jan 03 2008 Steven Pritchard 1.0702-1 - Update to 1.0702. - Drop charset patch. From fedora-extras-commits at redhat.com Tue Mar 4 19:29:10 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Tue, 4 Mar 2008 19:29:10 GMT Subject: rpms/evolution-rss/devel evolution-rss.spec,1.6,1.7 Message-ID: <200803041929.m24JTAe5030089@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/evolution-rss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30023 Modified Files: evolution-rss.spec Log Message: build against libxul Index: evolution-rss.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-rss/devel/evolution-rss.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- evolution-rss.spec 4 Mar 2008 19:25:11 -0000 1.6 +++ evolution-rss.spec 4 Mar 2008 19:28:36 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Evolution RSS Reader Name: evolution-rss Version: 0.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz @@ -86,6 +86,9 @@ %doc TODO %changelog +* Thu Mar 4 2008 Lucian Langa - 0.0.8-2 +-Rebuild against libxul + * Thu Mar 3 2008 Lucian Langa - 0.0.8-1 -Update to 0.0.8 release From fedora-extras-commits at redhat.com Tue Mar 4 19:31:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 19:31:48 GMT Subject: rpms/perl-DateTime-Format-IBeat/devel perl-DateTime-Format-IBeat.spec, 1.4, 1.5 Message-ID: <200803041931.m24JVm34030223@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Format-IBeat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30153 Modified Files: perl-DateTime-Format-IBeat.spec Log Message: new perl Index: perl-DateTime-Format-IBeat.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-IBeat/devel/perl-DateTime-Format-IBeat.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DateTime-Format-IBeat.spec 1 Sep 2006 04:01:04 -0000 1.4 +++ perl-DateTime-Format-IBeat.spec 4 Mar 2008 19:31:14 -0000 1.5 @@ -1,16 +1,15 @@ Name: perl-DateTime-Format-IBeat Version: 0.161 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Format times in .beat notation Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/DateTime-Format-IBeat Source0: http://search.cpan.org/CPAN/authors/id/E/EM/EMARTIN/DateTime-Format-IBeat-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(DateTime) >= 0.18, perl(Test::More) >= 0.47 BuildRequires: perl(Test::Pod) >= 1.00 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -59,6 +58,9 @@ %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 0.161-5 +- rebuild for new perl + * Thu Aug 31 2006 Chris Weyl 0.161-4 - bump for mass rebuild From fedora-extras-commits at redhat.com Tue Mar 4 19:32:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 19:32:48 GMT Subject: rpms/perl-Class-Factory-Util/devel perl-Class-Factory-Util.spec, 1.5, 1.6 Message-ID: <200803041932.m24JWmbq030314@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Factory-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30266 Modified Files: perl-Class-Factory-Util.spec Log Message: new perl Index: perl-Class-Factory-Util.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Factory-Util/devel/perl-Class-Factory-Util.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-Factory-Util.spec 1 Jan 2008 11:15:52 -0000 1.5 +++ perl-Class-Factory-Util.spec 4 Mar 2008 19:32:04 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Class-Factory-Util Version: 1.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Provide utility methods for factory classes Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 1.7-3 +- rebuild for new perl + * Tue Jan 01 2008 Ralf Cors??pius 1.7-2 - Adjust License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Tue Mar 4 19:33:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 19:33:59 GMT Subject: rpms/perl-DateTime-Format-Builder/devel perl-DateTime-Format-Builder.spec, 1.4, 1.5 Message-ID: <200803041933.m24JXxJI030391@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Format-Builder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30359 Modified Files: perl-DateTime-Format-Builder.spec Log Message: new perl Index: perl-DateTime-Format-Builder.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Builder/devel/perl-DateTime-Format-Builder.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DateTime-Format-Builder.spec 26 Jan 2008 19:24:15 -0000 1.4 +++ perl-DateTime-Format-Builder.spec 4 Mar 2008 19:33:23 -0000 1.5 @@ -12,7 +12,7 @@ Name: perl-DateTime-Format-Builder Version: 0.7901 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Create DateTime parser classes and objects Group: Development/Libraries @@ -25,7 +25,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) ## core -BuildRequires: perl BuildRequires: perl(Test::More) ## non-core BuildRequires: perl(Module::Build) @@ -115,6 +114,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.7901-2 +- rebuild for new perl + * Sat Jan 26 2008 Chris Weyl 0.7901-1 - update to 0.7901 - additional docs From fedora-extras-commits at redhat.com Tue Mar 4 19:35:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 19:35:00 GMT Subject: rpms/perl-DateTime-Format-MySQL/devel perl-DateTime-Format-MySQL.spec, 1.5, 1.6 Message-ID: <200803041935.m24JZ0bj030461@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Format-MySQL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30431 Modified Files: perl-DateTime-Format-MySQL.spec Log Message: new perl Index: perl-DateTime-Format-MySQL.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-MySQL/devel/perl-DateTime-Format-MySQL.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-DateTime-Format-MySQL.spec 1 Jan 2008 17:37:51 -0000 1.5 +++ perl-DateTime-Format-MySQL.spec 4 Mar 2008 19:34:17 -0000 1.6 @@ -12,7 +12,7 @@ Name: perl-DateTime-Format-MySQL Version: 0.04 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Parse and format MySQL dates and times Group: Development/Libraries @@ -79,6 +79,9 @@ %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 0.04-6 +- rebuild for new perl + * Tue Jan 01 2008 Ralf Cors??pius 0.04-5 - Adjust License-tag. - Add BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Tue Mar 4 19:35:52 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 19:35:52 GMT Subject: rpms/perl-List-Compare/devel perl-List-Compare.spec,1.5,1.6 Message-ID: <200803041935.m24JZqFx030545@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-List-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30509 Modified Files: perl-List-Compare.spec Log Message: new perl Index: perl-List-Compare.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-List-Compare/devel/perl-List-Compare.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-List-Compare.spec 16 Oct 2007 21:30:48 -0000 1.5 +++ perl-List-Compare.spec 4 Mar 2008 19:35:13 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-List-Compare Version: 0.33 -Release: 2%{?dist}.2 +Release: 3%{?dist} Summary: Compare elements of two or more lists Group: Development/Libraries @@ -10,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Simple) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -55,6 +54,9 @@ %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 0.33-3 +- rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway 0.33-2.2 - add BR: perl(Test::Simple) From fedora-extras-commits at redhat.com Tue Mar 4 19:37:09 2008 From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie)) Date: Tue, 4 Mar 2008 19:37:09 GMT Subject: rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-ca-fr.patch, NONE, 1.1 xkeyboard-config.spec, 1.20, 1.21 Message-ID: <200803041937.m24Jb9Ga030628@cvs-int.fedora.redhat.com> Author: bernie Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30598 Modified Files: xkeyboard-config.spec Added Files: xkeyboard-config-olpc-ca-fr.patch Log Message: * Tue Mar 04 2008 Bernardo Innocenti 1.1-11.20071130cvs - Replace bogus xkeyboard-config-olpc-fr.patch with xkeyboard-config-olpc-ca-fr.patch xkeyboard-config-olpc-ca-fr.patch: --- NEW FILE xkeyboard-config-olpc-ca-fr.patch --- Index: rules/base.lists.part =================================================================== RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.lists.part,v retrieving revision 1.61 diff -u -p -u -p -r1.61 base.lists.part --- rules/base.lists.part 3 Mar 2008 20:48:21 -0000 1.61 +++ rules/base.lists.part 4 Mar 2008 19:32:38 -0000 @@ -15,7 +15,7 @@ ! $pcgeometries = abnt2 latitude jp106 kr106 // Layouts that provide further specializations for the OLPC -! $olpclayouts = af am ara br es et fr it kh kz in mn np ru th tr us +! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 ! $maclaptop = ibook powerbook macbook78 macbook79 Index: symbols/ca =================================================================== RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/ca,v retrieving revision 1.16 diff -u -p -u -p -r1.16 ca --- symbols/ca 30 Jan 2008 21:28:12 -0000 1.16 +++ symbols/ca 4 Mar 2008 19:32:38 -0000 @@ -478,3 +478,11 @@ xkb_symbols "shs" { include "level3(ralt_switch)" }; + +// OLPC Section +xkb_symbols "olpc" { + + include "fr" + + key { [ 3, slash, ograve, Ograve ] }; +}; Index: symbols/fr =================================================================== RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/fr,v retrieving revision 1.18 diff -u -p -u -p -r1.18 fr --- symbols/fr 3 Mar 2008 20:36:02 -0000 1.18 +++ symbols/fr 4 Mar 2008 19:32:38 -0000 @@ -755,10 +755,3 @@ xkb_symbols "geo" { }; -// OLPC Section -xkb_symbols "olpc" { - - include "basic" - - key { [ 3, slash, ograve, Ograve ] }; -}; Index: xkeyboard-config.spec =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xkeyboard-config.spec 3 Mar 2008 13:29:56 -0000 1.20 +++ xkeyboard-config.spec 4 Mar 2008 19:36:29 -0000 1.21 @@ -5,7 +5,7 @@ Summary: xkeyboard-config alternative xkb data files Name: xkeyboard-config Version: 1.1 -Release: 12.%{cvsdate}%{?dist} +Release: 13.%{cvsdate}%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -26,7 +26,7 @@ Patch10: xkeyboard-config-olpc-misc.patch Patch11: xkeyboard-config-olpc-af-AE09.patch Patch12: xkeyboard-config-olpc-kh-olpc-section-add.patch -Patch13: xkeyboard-config-olpc-fr.patch +Patch13: xkeyboard-config-olpc-ca-fr.patch Patch14: xkeyboard-config-olpc-it.patch BuildArch: noarch @@ -69,7 +69,7 @@ %patch10 -p0 -b .misc %patch11 -p0 -b .ae09 %patch12 -p0 -b .kh -%patch13 -p0 -b .fr +%patch13 -p0 -b .ca %patch14 -p0 -b .it %build @@ -110,6 +110,10 @@ %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Tue Mar 04 2008 Bernardo Innocenti 1.1-11.20071130cvs +- Replace bogus xkeyboard-config-olpc-fr.patch with + xkeyboard-config-olpc-ca-fr.patch + * Mon Mar 03 2008 Bernardo Innocenti 1.1-11.20071130cvs - Add xkeyboard-config-olpc-fr.patch - Add xkeyboard-config-olpc-it.patch From fedora-extras-commits at redhat.com Tue Mar 4 19:42:44 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 4 Mar 2008 19:42:44 GMT Subject: rpms/hunspell-ga/devel hunspell-ga.spec,1.4,1.5 sources,1.4,1.5 Message-ID: <200803041942.m24Jgiww030827@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-ga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30795 Modified Files: hunspell-ga.spec sources Log Message: update the .aff Index: hunspell-ga.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ga/devel/hunspell-ga.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hunspell-ga.spec 5 Nov 2007 09:03:32 -0000 1.4 +++ hunspell-ga.spec 4 Mar 2008 19:42:10 -0000 1.5 @@ -1,7 +1,7 @@ Name: hunspell-ga Summary: Irish hunspell dictionaries Version: 4.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://borel.slu.edu/ispell/ispell-gaeilge-%{version}.tar.gz Source1: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ga_IE.zip Group: Applications/Text @@ -39,6 +39,9 @@ %{_datadir}/myspell/* %changelog +* Tue Mar 04 2008 Caolan McNamara - 4.3-2 +- update to latest .aff + * Mon Nov 05 2007 Caolan McNamara - 4.3-1 - latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ga/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Nov 2007 09:03:32 -0000 1.4 +++ sources 4 Mar 2008 19:42:10 -0000 1.5 @@ -1,2 +1,2 @@ -bf115e31b0618268001c28c4bb638444 ga_IE.zip eb7e6fb7ce5e74b5848ccf9b7d958b69 ispell-gaeilge-4.3.tar.gz +963e28e6a1b469f53fbc98e15ebda766 ga_IE.zip From fedora-extras-commits at redhat.com Tue Mar 4 19:49:08 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 4 Mar 2008 19:49:08 GMT Subject: rpms/hunspell-pl/devel .cvsignore, 1.31, 1.32 hunspell-pl.spec, 1.34, 1.35 sources, 1.31, 1.32 Message-ID: <200803041949.m24Jn82n031012@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30973 Modified Files: .cvsignore hunspell-pl.spec sources Log Message: tarball name changed Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 13 Feb 2008 10:43:25 -0000 1.31 +++ .cvsignore 4 Mar 2008 19:48:32 -0000 1.32 @@ -1 +1 @@ -alt-myspell-pl-20080213.zip +sjp-myspell-pl-20080304.zip Index: hunspell-pl.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/hunspell-pl.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- hunspell-pl.spec 13 Feb 2008 10:43:25 -0000 1.34 +++ hunspell-pl.spec 4 Mar 2008 19:48:32 -0000 1.35 @@ -1,9 +1,9 @@ Name: hunspell-pl Summary: Polish hunspell dictionaries -%define upstreamid 20080213 +%define upstreamid 20080304 Version: 0.%{upstreamid} Release: 1%{?dist} -Source: http://www.kurnik.pl/dictionary/alt-myspell-pl-%{upstreamid}.zip +Source: http://sjp.pl/slownik/ort/sjp-myspell-pl-%{upstreamid}.zip Group: Applications/Text URL: http://www.kurnik.pl/dictionary/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,6 +35,9 @@ %{_datadir}/myspell/* %changelog +* Tue Mar 04 2008 Caolan McNamara - 0.20080304-1 +- source file name changed, update to latest version + * Wed Feb 13 2008 Caolan McNamara - 0.20080213-1 - new version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 13 Feb 2008 10:43:25 -0000 1.31 +++ sources 4 Mar 2008 19:48:32 -0000 1.32 @@ -1 +1 @@ -3ca923e998a60ac88981b55daa58ff92 alt-myspell-pl-20080213.zip +318146a203cd874d8782a942fda610ce sjp-myspell-pl-20080304.zip From fedora-extras-commits at redhat.com Tue Mar 4 19:51:32 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 19:51:32 GMT Subject: rpms/timidity++/devel TiMidity++-2.13.2-cfgfile-name.patch, NONE, 1.1 timidity++.spec, 1.26, 1.27 Message-ID: <200803041951.m24JpWjv031140@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/timidity++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31109 Modified Files: timidity++.spec Added Files: TiMidity++-2.13.2-cfgfile-name.patch Log Message: * Mon Mar 3 2008 Hans de Goede 2.13.2-13 - Merge review fixes (bz 226492) - merge patch0 into patch16, drop patch0 - Make License tag just GPLv2 - Unify macros usage TiMidity++-2.13.2-cfgfile-name.patch: --- NEW FILE TiMidity++-2.13.2-cfgfile-name.patch --- diff -up TiMidity++-2.13.2/timidity/timidity.c~ TiMidity++-2.13.2/timidity/timidity.c --- TiMidity++-2.13.2/timidity/timidity.c~ 2008-02-28 13:25:00.000000000 +0100 +++ TiMidity++-2.13.2/timidity/timidity.c 2008-02-28 13:25:00.000000000 +0100 @@ -5170,7 +5170,9 @@ MAIN_INTERFACE int timidity_pre_load_con #else /* UNIX */ - if(!read_config_file(CONFIG_FILE, 0)) + if(!read_config_file(CONFIG_FILE1, 0)) + got_a_configuration = 1; + else if(!read_config_file(CONFIG_FILE2, 0)) got_a_configuration = 1; #endif @@ -5240,7 +5240,9 @@ MAIN_INTERFACE int timidity_post_load_co if(!got_a_configuration) { - if(try_config_again && !read_config_file(CONFIG_FILE, 0)) + if(try_config_again && !read_config_file(CONFIG_FILE1, 0)) + got_a_configuration = 1; + else if(try_config_again && !read_config_file(CONFIG_FILE2, 0)) got_a_configuration = 1; } @@ -5695,7 +5697,7 @@ int main(int argc, char **argv) #else ctl->cmsg(CMSG_FATAL, VERB_NORMAL, "%s: Error reading configuration file.\nPlease check " - CONFIG_FILE, program_name); + CONFIG_FILE1 " or " CONFIG_FILE2, program_name); #endif /* __W32__ */ } else diff -up TiMidity++-2.13.2/timidity/timidity.h~ TiMidity++-2.13.2/timidity/timidity.h --- TiMidity++-2.13.2/timidity/timidity.h~ 2008-02-28 13:19:29.000000000 +0100 +++ TiMidity++-2.13.2/timidity/timidity.h 2008-02-28 13:19:29.000000000 +0100 @@ -41,14 +41,8 @@ /* You could specify a complete path, e.g. "/etc/timidity.cfg", and then specify the library directory in the configuration file. */ -/* #define CONFIG_FILE "/etc/timidity.cfg" */ -#ifndef CONFIG_FILE -# ifdef DEFAULT_PATH -# define CONFIG_FILE DEFAULT_PATH "/timidity.cfg" -# else -# define CONFIG_FILE PKGDATADIR "/timidity.cfg" -# endif /* DEFAULT_PATH */ -#endif /* CONFIG_FILE */ +#define CONFIG_FILE1 "/etc/timidity++.cfg" +#define CONFIG_FILE2 "/etc/timidity.cfg" /* Filename extension, followed by command to run decompressor so that Index: timidity++.spec =================================================================== RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- timidity++.spec 21 Feb 2008 12:03:17 -0000 1.26 +++ timidity++.spec 4 Mar 2008 19:50:58 -0000 1.27 @@ -1,16 +1,11 @@ Summary: A software wavetable MIDI synthesizer Name: timidity++ Version: 2.13.2 -Release: 11%{?dist} +Release: 13%{?dist} Group: Applications/Multimedia Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2 -Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2 -Source2: timidity.cfg -Source3: http://www.stardate.bc.ca/eawpatches/eawpats/britepno.pat.bz2 -Source4: http://www.stardate.bc.ca/eawpatches/eawpats/pistol.pat.bz2 -Source5: fedora-timidity.desktop +Source1: fedora-timidity.desktop URL: http://timidity.sourceforge.net -Patch: TiMidity++-2.13.0-redhat.patch Patch3: TiMidity++-2.13.0-detect.patch Patch5: TiMidity++-2.13.0-64bit.patch Patch6: TiMidity++-2.13.0-warnings.patch @@ -25,8 +20,9 @@ # end Debian patches Patch14: TiMidity++-2.13.2-ipv6.patch Patch15: TiMidity++-2.13.2-dynlibroot.patch +Patch16: TiMidity++-2.13.2-cfgfile-name.patch -License: GPLv2 and MIT and BSD +License: GPLv2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: arts-devel esound-devel alsa-lib-devel ncurses-devel gtk2-devel BuildRequires: libao-devel libvorbis-devel flac-devel speex-devel @@ -34,7 +30,7 @@ BuildRequires: jack-audio-connection-kit-devel %endif BuildRequires: desktop-file-utils -Requires: %{name}-patches = %{version}-%{release}, hicolor-icon-theme +Requires: PersonalCopy-Lite-soundfont hicolor-icon-theme %description TiMidity++ is a MIDI format to wave table format converter and @@ -42,21 +38,8 @@ sound card does not natively support wave table format. -%package patches -Summary: Instrument (patch) files for %{name} -Group: Applications/Multimedia - -%description patches -This package contains samples of instruments (called patches) for use in -wavetable midi synthesizers like %{name}. These patches are in the Gravis -Ultasound .pat format and can be used by any wavetable midi synthesizer which -understands this format. - - %prep %setup -q -n TiMidity++-%{version} -# Put config files etc. to sane locations -%patch -p1 -b .redhat # Autodetect whether we should use aRts, esd, or neither %patch3 -p1 -b .detect # fix for x86_64 and s390x @@ -71,10 +54,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 - -# Ensure that we are actually using %%_sysconfdir -sed -i -e 's|/etc/timidity\.cfg|%{_sysconfdir}/timidity.cfg|' \ -timidity/timidity.h +%patch16 -p1 %build @@ -91,22 +71,16 @@ %install rm -rf $RPM_BUILD_ROOT - make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/timidity $RPM_BUILD_ROOT/etc -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/timidity.cfg -ln -s /etc/timidity.cfg $RPM_BUILD_ROOT%{_datadir}/timidity/timidity.cfg -pushd $RPM_BUILD_ROOT%{_datadir}/timidity -tar xjf %{SOURCE1} -bzip2 -dck %{SOURCE3} >instruments/britepno.pat -bzip2 -dck %{SOURCE4} >instruments/pistol.pat -popd +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} +echo "soundfont %{_datadir}/soundfonts/PCLite.sf2" > \ + $RPM_BUILD_ROOT/%{_sysconfdir}/timidity++.cfg mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE5} + %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 interface/pixmaps/timidity.xpm \ @@ -135,18 +109,35 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README NEWS ChangeLog +%config(noreplace) %{_sysconfdir}/timidity++.cfg %{_bindir}/* %{_mandir}/*/* %{_datadir}/applications/fedora-timidity.desktop %{_datadir}/icons/hicolor/48x48/apps/timidity.xpm -%files patches -%defattr(-,root,root,-) -%config(noreplace) /etc/timidity.cfg -%{_datadir}/timidity - %changelog +* Mon Mar 3 2008 Hans de Goede 2.13.2-13 +- Merge review fixes (bz 226492) + - merge patch0 into patch16, drop patch0 + - Make License tag just GPLv2 + - Unify macros usage + +* Thu Feb 28 2008 Hans de Goede 2.13.2-12 +- Stop shipping a timidity++-patches package, investigation into the license + of the included patches has turned up doubts about the rights of the author + of the midas SGI midi player to release these into the Public Domain +- Instead require PersonalCopy-Lite-soundfont, and point to PCLite.sf2 in + timidity++.cfg +- Note PersonalCopy-Lite-soundfont also has a PersonalCopy-Lite-patches + sub-package with the .sf2 file converted to GUS patch format for other + applications who require timidity++-patches to get GUS format patches, this + package contains an /etc/timidity.cfg file pointing to the gus patches, + therefor the timidity++ package now ships a timidty++.cfg instead of a + timidity.cfg +- Check for /etc/timidity++.cfg before trying /etc/timidity.cfg, see above for + rationale + * Thu Feb 21 2008 Jindrich Novy 2.13.2-11 - rebuild From fedora-extras-commits at redhat.com Tue Mar 4 19:57:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 19:57:19 GMT Subject: rpms/perl-WWW-Myspace/devel perl-WWW-Myspace.spec,1.14,1.15 Message-ID: <200803041957.m24JvJk8031277@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-WWW-Myspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31241 Modified Files: perl-WWW-Myspace.spec Log Message: new perl Index: perl-WWW-Myspace.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-WWW-Myspace/devel/perl-WWW-Myspace.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-WWW-Myspace.spec 21 Nov 2006 19:44:07 -0000 1.14 +++ perl-WWW-Myspace.spec 4 Mar 2008 19:56:28 -0000 1.15 @@ -12,11 +12,11 @@ Name: perl-WWW-Myspace Version: 0.60 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Access your myspace.com profile in Perl! Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/WWW-Myspace Source0: http://search.cpan.org/CPAN/authors/id/G/GR/GRANTG/WWW-Myspace-%{version}.tar.gz @@ -26,7 +26,6 @@ %define __perl_requires %{SOURCE99} BuildArch: noarch -BuildRequires: perl BuildRequires: perl(Test::More), perl(Spiffy) >= 0.24, perl(YAML) >= 0.39 BuildRequires: perl(File::Spec::Functions), perl(Contextual::Return) BuildRequires: perl(Class::DBI::AbstractSearch), perl(Config::General) @@ -97,6 +96,9 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.60-2 +- rebuild for new perl + * Tue Nov 21 2006 Chris Weyl 0.60-1 - update to 0.60 From fedora-extras-commits at redhat.com Tue Mar 4 20:00:08 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 4 Mar 2008 20:00:08 GMT Subject: rpms/plplot/devel plplot.spec,1.55,1.56 Message-ID: <200803042000.m24K08S5031410@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31332 Modified Files: plplot.spec Log Message: Fix ada dir typo Index: plplot.spec =================================================================== RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- plplot.spec 27 Feb 2008 16:58:31 -0000 1.55 +++ plplot.spec 4 Mar 2008 19:59:26 -0000 1.56 @@ -447,7 +447,7 @@ %files ada-devel %defattr(-,root,root,-) #Until we find an owner for %{_libdir}/ada/adalib/ -%{_datadir}/ada/ +%{_libdir}/ada/ #%{_libdir}/ada/adalib/plplotadad/ %{_libdir}/libplplotadad.so %{_libdir}/pkgconfig/plplotd-ada.pc From fedora-extras-commits at redhat.com Tue Mar 4 20:06:34 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Tue, 4 Mar 2008 20:06:34 GMT Subject: rpms/kerneloops/F-8 kerneloops-require-syslog-on-shutdown.patch, NONE, 1.1 kerneloops.spec, 1.3, 1.4 Message-ID: <200803042006.m24K6YNE006279@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kerneloops/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6236 Modified Files: kerneloops.spec Added Files: kerneloops-require-syslog-on-shutdown.patch Log Message: * Tue Mar 04 2008 Chuck Ebbert 0.10-5 - Require syslog to be running when shutting down. (F9#433413) kerneloops-require-syslog-on-shutdown.patch: --- NEW FILE kerneloops-require-syslog-on-shutdown.patch --- Index: kerneloops-0.10/kerneloops.init =================================================================== --- kerneloops-0.10.orig/kerneloops.init +++ kerneloops-0.10/kerneloops.init @@ -14,7 +14,7 @@ # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Required-Start: $local_fs $remote_fs $named $network $time $syslog -# Required-Stop: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs $syslog # Short-Description: Tool to automatically collect and submit kernel crash signatures # Description: A tool that collects and submits kernel crash # signatures to the kerneloops.org website for use by the Linux Index: kerneloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/F-8/kerneloops.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kerneloops.spec 4 Mar 2008 19:08:18 -0000 1.3 +++ kerneloops.spec 4 Mar 2008 20:05:51 -0000 1.4 @@ -1,6 +1,6 @@ Name: kerneloops Version: 0.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool to automatically collect and submit kernel crash signatures Group: System Environment/Base @@ -10,6 +10,7 @@ Patch0: kerneloops-fix-manfile-name.patch Patch1: kerneloops-ignore-module-list.patch +Patch2: kerneloops-require-syslog-on-shutdown.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -31,8 +32,10 @@ %prep %setup -q + %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -75,6 +78,9 @@ %{_mandir}/man8/kerneloops.1.gz %changelog +* Tue Mar 04 2008 Chuck Ebbert 0.10-5 +- Require syslog to be running when shutting down. (F9#433413) + * Tue Mar 04 2008 Chuck Ebbert 0.10-4 - Bump rev to 4 to match rawhide. From fedora-extras-commits at redhat.com Tue Mar 4 20:12:46 2008 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Tue, 4 Mar 2008 20:12:46 GMT Subject: rpms/ipe/devel ipe.spec,1.17,1.18 Message-ID: <200803042012.m24KCkbt006417@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/pkgs/rpms/ipe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6381 Modified Files: ipe.spec Log Message: Fix the URL: tag (after the email "source file audit - 2008-03-01"). Index: ipe.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipe/devel/ipe.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ipe.spec 14 Feb 2008 15:10:00 -0000 1.17 +++ ipe.spec 4 Mar 2008 20:12:06 -0000 1.18 @@ -2,7 +2,7 @@ Name: ipe Version: 6.0 -Release: 0.24.pre%{preversion}%{?dist} +Release: 0.25.pre%{preversion}%{?dist} Summary: The Ipe extensible drawing editor Group: Applications/Publishing @@ -11,7 +11,7 @@ License: GPLv2+ with exceptions # URL: http://tclab.kaist.ac.kr/ipe/ -Source0: http://tclab.kaist.ac.kr/ipe/%{name}-%{version}pre%{preversion}-src.tar.gz +Source0: http://luaforge.net/frs/download.php/2727/ipe-6.0pre30-src.tar.gz Patch1: ipe-6.0pre30-gcc43.patch Patch10: ipe-6.0pre28-no-freetype-version-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -171,6 +171,9 @@ %{_datadir}/ipe/%{version}/doc %changelog +* Tue Mar 4 2008 Laurent Rineau - 6.0-0.25.pre30%{?dist} +- Fix the URL: tag. (rebuild needed) + * Thu Feb 14 2008 Laurent Rineau - 6.0-0.24.pre30%{?dist} - Fixes for gcc-4.3. From fedora-extras-commits at redhat.com Tue Mar 4 20:12:47 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Tue, 4 Mar 2008 20:12:47 GMT Subject: rpms/hal/devel .cvsignore, 1.52, 1.53 hal.spec, 1.144, 1.145 sources, 1.54, 1.55 Message-ID: <200803042012.m24KClKH006422@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/hal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6372 Modified Files: .cvsignore hal.spec sources Log Message: * Tue Mar 4 2008 David Zeuthen - 0.5.11-0.git20080304.2%{?dist} - Another git snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 4 Mar 2008 05:38:10 -0000 1.52 +++ .cvsignore 4 Mar 2008 20:12:01 -0000 1.53 @@ -45,3 +45,4 @@ hal-0.5.10.git20070925.tar.gz hal-0.5.10.tar.gz hal-0.5.11.git20080304.tar.gz +hal-0.5.11.git20080304.2.tar.gz Index: hal.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- hal.spec 4 Mar 2008 05:38:10 -0000 1.144 +++ hal.spec 4 Mar 2008 20:12:02 -0000 1.145 @@ -26,9 +26,9 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.11 -Release: 0.git20080304%{?dist} +Release: 0.git20080304.2%{?dist} URL: http://www.freedesktop.org/Software/hal -Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20080304.tar.gz +Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20080304.2.tar.gz License: AFL/GPL Group: System Environment/Libraries @@ -236,6 +236,9 @@ %{_datadir}/gtk-doc/html/libhal-storage/* %changelog +* Tue Mar 4 2008 David Zeuthen - 0.5.11-0.git20080304.2%{?dist} +- Another git snapshot + * Tue Mar 4 2008 David Zeuthen - 0.5.11-0.git20080304%{?dist} - Drop patches as they were committed upstream - Ship a git snapshot that should fix a number of issues Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 4 Mar 2008 05:38:10 -0000 1.54 +++ sources 4 Mar 2008 20:12:02 -0000 1.55 @@ -1 +1 @@ -79640b62d07b48c54923c436ef51ca7b hal-0.5.11.git20080304.tar.gz +63f7ef41ead14da1447ff30f1e37a4dc hal-0.5.11.git20080304.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 20:23:26 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 4 Mar 2008 20:23:26 GMT Subject: rpms/xfce4-gsynaptics-mcs-plugin/devel xfce4-gsynaptics-mcs-plugin.spec, 1.1, 1.2 Message-ID: <200803042023.m24KNQxK006658@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6615 Modified Files: xfce4-gsynaptics-mcs-plugin.spec Log Message: exclude ppc64 builds because synaptic is not available Index: xfce4-gsynaptics-mcs-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/devel/xfce4-gsynaptics-mcs-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-gsynaptics-mcs-plugin.spec 4 Mar 2008 19:04:58 -0000 1.1 +++ xfce4-gsynaptics-mcs-plugin.spec 4 Mar 2008 20:22:51 -0000 1.2 @@ -1,3 +1,5 @@ +# Review at https://bugzilla.redhat.com/show_bug.cgi?id=433892 + Name: xfce4-gsynaptics-mcs-plugin Version: 1.0.0 Release: 1%{?dist} @@ -15,6 +17,14 @@ BuildRequires: gsynaptics Requires: xfce-mcs-manager >= 4.4.0, gsynaptics +# Use ExclusiveArch just as synaptics does; see +# http://cvs.fedora.redhat.com/viewcvs/rpms/synaptics/devel/synaptics.spec?root=extras&view=markup +# ExcludeArch tracker for now (until proper solution is found): +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=242323 +# This is what it should be, but the buildsystem is a disaster +# ExcludeArch: s390 s390x +ExclusiveArch: %{ix86} x86_64 ppc + %description A simple MCS plugin for Xfce that starts gsynaptics when invoked and launches gsynaptics-init once loaded by the MCS manager. From fedora-extras-commits at redhat.com Tue Mar 4 20:23:43 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 4 Mar 2008 20:23:43 GMT Subject: rpms/blender/devel blender.spec,1.70,1.71 Message-ID: <200803042023.m24KNhcj006663@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/blender/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6638 Modified Files: blender.spec Log Message: Enable yafray batch only for 64-bit systems Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- blender.spec 28 Feb 2008 21:20:24 -0000 1.70 +++ blender.spec 4 Mar 2008 20:23:06 -0000 1.71 @@ -3,7 +3,7 @@ Name: blender Version: 2.45 -Release: 8%{?dist} +Release: 9%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -72,7 +72,10 @@ %patch1 -p1 -b .org %patch2 -p1 -b .bid %patch3 -p1 -b .gcc43 + +%if "%{?_lib}" == "lib64" %patch4 -p1 +%endif PYVER=$(%{__python} -c "import sys ; print sys.version[:3]") @@ -176,13 +179,16 @@ %{_datadir}/mime/packages/blender.xml %changelog -* Thu Feb 28 2008 Jochen Schmitt - 2.45-8 +* Tue Mar 4 2008 Jochen Schmitt 2.45-9 +- Apply yafray patch only on 64-bit systems + +* Thu Feb 28 2008 Jochen Schmitt 2.45-8 - Fix yafray load bug (#451571) * Sun Feb 10 2008 Jochen Schmitt 2.45-7 - Rebuild for gcc-4.3 -* Sat Jan 26 2008 Alex Lancaster - 2.45-6 +* Sat Jan 26 2008 Alex Lancaster 2.45-6 - Rebuild for new gettext * Thu Jan 17 2008 Jochen Schmitt 2.45-5 From fedora-extras-commits at redhat.com Tue Mar 4 20:35:13 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Tue, 4 Mar 2008 20:35:13 GMT Subject: rpms/kerneloops/F-8 kerneloops.spec,1.4,1.5 Message-ID: <200803042035.m24KZDNZ006875@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kerneloops/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6850 Modified Files: kerneloops.spec Log Message: fix install file list Index: kerneloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/F-8/kerneloops.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kerneloops.spec 4 Mar 2008 20:05:51 -0000 1.4 +++ kerneloops.spec 4 Mar 2008 20:34:38 -0000 1.5 @@ -75,7 +75,7 @@ %{_sysconfdir}/xdg/autostart/kerneloops-applet.desktop %{_datadir}/kerneloops/ %{_bindir}/kerneloops-applet -%{_mandir}/man8/kerneloops.1.gz +%{_mandir}/man8/kerneloops.8.gz %changelog * Tue Mar 04 2008 Chuck Ebbert 0.10-5 From fedora-extras-commits at redhat.com Tue Mar 4 20:42:35 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 4 Mar 2008 20:42:35 GMT Subject: rpms/blender/F-8 blender.spec,1.68,1.69 Message-ID: <200803042042.m24KgZQP007091@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/blender/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7063 Modified Files: blender.spec Log Message: Enable yafray patch only for 64-bit systems Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/F-8/blender.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- blender.spec 28 Feb 2008 21:48:11 -0000 1.68 +++ blender.spec 4 Mar 2008 20:42:01 -0000 1.69 @@ -3,7 +3,7 @@ Name: blender Version: 2.45 -Release: 8%{?dist}.1 +Release: 9%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -70,7 +70,10 @@ %setup -q %patch1 -p1 -b .org %patch2 -p1 -b .bid + +%if "%{?_lib}" == "lib64" %patch4 -p1 +%endif PYVER=$(%{__python} -c "import sys ; print sys.version[:3]") @@ -174,13 +177,16 @@ %{_datadir}/mime/packages/blender.xml %changelog -* Thu Feb 28 2008 Jochen Schmitt - 2.45-8.1 +* Tue Mar 4 2008 Jochen Schmitt 2.45-9 +- Enable yafray patch only on 64-bit systems + +* Thu Feb 28 2008 Jochen Schmitt 2.45-8.1 - Fix yafray load bug (#451571) * Sun Feb 10 2008 Jochen Schmitt 2.45-7 - Rebuild for gcc-4.3 -* Sat Jan 26 2008 Alex Lancaster - 2.45-6 +* Sat Jan 26 2008 Alex Lancaster 2.45-6 - Rebuild for new gettext * Thu Jan 17 2008 Jochen Schmitt 2.45-5 From fedora-extras-commits at redhat.com Tue Mar 4 20:44:01 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 4 Mar 2008 20:44:01 GMT Subject: rpms/xorg-x11-server/devel .cvsignore, 1.36, 1.37 commitid, 1.9, 1.10 sources, 1.31, 1.32 xorg-x11-server.spec, 1.300, 1.301 Message-ID: <200803042044.m24Ki1kl007210@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7147/devel Modified Files: .cvsignore commitid sources xorg-x11-server.spec Log Message: new git snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 4 Mar 2008 06:38:31 -0000 1.36 +++ .cvsignore 4 Mar 2008 20:43:03 -0000 1.37 @@ -1 +1 @@ -xorg-server-20080303.tar.bz2 +xorg-server-20080304.tar.bz2 Index: commitid =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- commitid 4 Mar 2008 06:38:31 -0000 1.9 +++ commitid 4 Mar 2008 20:43:03 -0000 1.10 @@ -1 +1 @@ -1bda57a41ea3bb3a624a5e75f421160ac98a0804 +e4d92a13e83b4327067c97d8c9fe151a1c0b35af Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 4 Mar 2008 06:38:31 -0000 1.31 +++ sources 4 Mar 2008 20:43:03 -0000 1.32 @@ -1 +1 @@ -bbe69d049ba5bd8d764787e10a95dfd3 xorg-server-20080303.tar.bz2 +e81f00d089163f9a88bc89e73da0b2c3 xorg-server-20080304.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- xorg-x11-server.spec 4 Mar 2008 06:38:31 -0000 1.300 +++ xorg-x11-server.spec 4 Mar 2008 20:43:03 -0000 1.301 @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080303 +%define gitdate 20080304 Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.900 -Release: 0.27.%{gitdate}%{?dist} +Release: 0.28.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -159,6 +159,8 @@ # These drivers were dropped in F7 for being broken, so uninstall them. Obsoletes: xorg-x11-drv-elo2300 <= 1.1.0-2.fc7 Obsoletes: xorg-x11-drv-joystick <= 1.1.0-2.fc7 +# Dropped from F9 for being broken, uninstall it. +Obsoletes: xorg-x11-drv-magictouch <= 1.0.0.5-5.fc8 # Force sufficiently new libpciaccess Conflicts: libpciaccess < 0.9.1-2 @@ -504,6 +506,10 @@ %changelog +* Tue Mar 04 2008 Adam Jackson 1.4.99.900-0.28.20080304 +- Today's 1.5 snapshot. +- Obsolete: xorg-x11-drv-magictouch to get it uninstalled. + * Mon Mar 03 2008 Adam Jackson 1.4.99.900-0.27.20080303 - Switch to 1.5 branch and rebase. From fedora-extras-commits at redhat.com Tue Mar 4 20:44:20 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 4 Mar 2008 20:44:20 GMT Subject: rpms/blender/F-7 blender.spec,1.63,1.64 Message-ID: <200803042044.m24KiKiM007247@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/blender/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7182 Modified Files: blender.spec Log Message: Enable yafray patch only for 64-bit systems Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/F-7/blender.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- blender.spec 28 Feb 2008 21:46:37 -0000 1.63 +++ blender.spec 4 Mar 2008 20:43:41 -0000 1.64 @@ -3,7 +3,7 @@ Name: blender Version: 2.45 -Release: 8%{?dist}.1 +Release: 9%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -68,7 +68,10 @@ %prep %setup -q %patch1 -p1 -b .org + +%if "%{?_lib}" == "lib64" %patch4 -p1 +%endif PYVER=$(%{__python} -c "import sys ; print sys.version[:3]") @@ -172,13 +175,16 @@ %{_datadir}/mime/packages/blender.xml %changelog -* Thu Feb 28 2008 Jochen Schmitt - 2.45-8.1 +* Tue Mar 4 2008 Jochen Schmitt 2.45-9 +- Enable yafray patch only for 64 bit systems + +* Thu Feb 28 2008 Jochen Schmitt 2.45-8.1 - Fix yafray load bug (#451571) * Sun Feb 10 2008 Jochen Schmitt 2.45-7 - Rebuild for gcc-4.3 -* Sat Jan 26 2008 Alex Lancaster - 2.45-6 +* Sat Jan 26 2008 Alex Lancaster 2.45-6 - Rebuild for new gettext * Thu Jan 17 2008 Jochen Schmitt 2.45-5 From fedora-extras-commits at redhat.com Tue Mar 4 21:01:00 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 4 Mar 2008 21:01:00 GMT Subject: rpms/xfce4-gsynaptics-mcs-plugin/F-7 xfce4-gsynaptics-mcs-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803042101.m24L10hm007621@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7569/F-7 Modified Files: .cvsignore sources Added Files: xfce4-gsynaptics-mcs-plugin.spec Log Message: * Sat Feb 24 2007 Christoph Wickert - 1.0.0-1 - Initial packaging. --- NEW FILE xfce4-gsynaptics-mcs-plugin.spec --- # Review at https://bugzilla.redhat.com/show_bug.cgi?id=433892 Name: xfce4-gsynaptics-mcs-plugin Version: 1.0.0 Release: 1%{?dist} Summary: GSynaptics icon for the Xfce Settings Manager Group: User Interface/Desktops License: GPLv2 URL: http://goodies.xfce.org/projects/mcs-plugins/gsynaptics-mcs-plugin Source0: http://goodies.xfce.org/releases/gsynaptics-mcs-plugin/gsynaptics-mcs-plugin-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce-mcs-manager-devel >= 4.3.99.2 BuildRequires: gettext, perl(XML::Parser) BuildRequires: libgnomeui-devel BuildRequires: gsynaptics Requires: xfce-mcs-manager >= 4.4.0, gsynaptics # Use ExclusiveArch just as synaptics does; see # http://cvs.fedora.redhat.com/viewcvs/rpms/synaptics/devel/synaptics.spec?root=extras&view=markup # ExcludeArch tracker for now (until proper solution is found): # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=242323 # This is what it should be, but the buildsystem is a disaster # ExcludeArch: s390 s390x ExclusiveArch: %{ix86} x86_64 ppc %description A simple MCS plugin for Xfce that starts gsynaptics when invoked and launches gsynaptics-init once loaded by the MCS manager. %prep %setup -qn gsynaptics-mcs-plugin-%{version} %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/gsynaptics_plugin.la %find_lang gsynaptics-mcs-plugin %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT %files -f gsynaptics-mcs-plugin.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/xfce4/mcs-plugins/gsynaptics_plugin.so %{_datadir}/icons/hicolor/*/apps/gsynaptics-mcs-plugin.png %{_datadir}/icons/hicolor/scalable/apps/gsynaptics-mcs-plugin.svg %changelog * Sat Feb 24 2007 Christoph Wickert - 1.0.0-1 - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 03:00:59 -0000 1.1 +++ .cvsignore 4 Mar 2008 21:00:19 -0000 1.2 @@ -0,0 +1 @@ +gsynaptics-mcs-plugin-1.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 03:00:59 -0000 1.1 +++ sources 4 Mar 2008 21:00:19 -0000 1.2 @@ -0,0 +1 @@ +57ecdd4983ab55614019d4b5a581398e gsynaptics-mcs-plugin-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 21:01:10 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 4 Mar 2008 21:01:10 GMT Subject: rpms/xfce4-gsynaptics-mcs-plugin/F-8 xfce4-gsynaptics-mcs-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803042101.m24L1AcG014213@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7569/F-8 Modified Files: .cvsignore sources Added Files: xfce4-gsynaptics-mcs-plugin.spec Log Message: * Sat Feb 24 2007 Christoph Wickert - 1.0.0-1 - Initial packaging. --- NEW FILE xfce4-gsynaptics-mcs-plugin.spec --- # Review at https://bugzilla.redhat.com/show_bug.cgi?id=433892 Name: xfce4-gsynaptics-mcs-plugin Version: 1.0.0 Release: 1%{?dist} Summary: GSynaptics icon for the Xfce Settings Manager Group: User Interface/Desktops License: GPLv2 URL: http://goodies.xfce.org/projects/mcs-plugins/gsynaptics-mcs-plugin Source0: http://goodies.xfce.org/releases/gsynaptics-mcs-plugin/gsynaptics-mcs-plugin-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce-mcs-manager-devel >= 4.3.99.2 BuildRequires: gettext, perl(XML::Parser) BuildRequires: libgnomeui-devel BuildRequires: gsynaptics Requires: xfce-mcs-manager >= 4.4.0, gsynaptics # Use ExclusiveArch just as synaptics does; see # http://cvs.fedora.redhat.com/viewcvs/rpms/synaptics/devel/synaptics.spec?root=extras&view=markup # ExcludeArch tracker for now (until proper solution is found): # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=242323 # This is what it should be, but the buildsystem is a disaster # ExcludeArch: s390 s390x ExclusiveArch: %{ix86} x86_64 ppc %description A simple MCS plugin for Xfce that starts gsynaptics when invoked and launches gsynaptics-init once loaded by the MCS manager. %prep %setup -qn gsynaptics-mcs-plugin-%{version} %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/gsynaptics_plugin.la %find_lang gsynaptics-mcs-plugin %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT %files -f gsynaptics-mcs-plugin.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/xfce4/mcs-plugins/gsynaptics_plugin.so %{_datadir}/icons/hicolor/*/apps/gsynaptics-mcs-plugin.png %{_datadir}/icons/hicolor/scalable/apps/gsynaptics-mcs-plugin.svg %changelog * Sat Feb 24 2007 Christoph Wickert - 1.0.0-1 - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 03:00:59 -0000 1.1 +++ .cvsignore 4 Mar 2008 21:00:30 -0000 1.2 @@ -0,0 +1 @@ +gsynaptics-mcs-plugin-1.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-gsynaptics-mcs-plugin/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 03:00:59 -0000 1.1 +++ sources 4 Mar 2008 21:00:30 -0000 1.2 @@ -0,0 +1 @@ +57ecdd4983ab55614019d4b5a581398e gsynaptics-mcs-plugin-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 21:04:22 2008 From: fedora-extras-commits at redhat.com (Stephen J Smoogen (smooge)) Date: Tue, 4 Mar 2008 21:04:22 GMT Subject: rpms/apg/EL-4 apg-2.3.0b-gen_rand_pass.patch, NONE, 1.1 apg.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200803042104.m24L4MuY014864@cvs-int.fedora.redhat.com> Author: smooge Update of /cvs/pkgs/rpms/apg/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14791 Modified Files: apg.spec sources Added Files: apg-2.3.0b-gen_rand_pass.patch Log Message: Updating EL-4 patches to match EL-5 and F-x systems. apg-2.3.0b-gen_rand_pass.patch: --- NEW FILE apg-2.3.0b-gen_rand_pass.patch --- diff -Nur apg-2.3.0b-orig/apg.c apg-2.3.0b/apg.c --- apg-2.3.0b-orig/apg.c 2003-08-07 17:40:39.000000000 +0200 +++ apg-2.3.0b/apg.c 2005-07-30 22:48:22.000000000 +0200 @@ -709,7 +709,7 @@ */ char * crypt_passstring (const char *p) { - char salt[10]; + char salt[11]; gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB); return (crypt(p, salt)); } Index: apg.spec =================================================================== RCS file: /cvs/pkgs/rpms/apg/EL-4/apg.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apg.spec 11 Apr 2005 12:37:22 -0000 1.5 +++ apg.spec 4 Mar 2008 21:03:34 -0000 1.6 @@ -2,14 +2,14 @@ Name: apg Version: 2.3.0b -Release: 1 - -License: GPL +Release: 5%{?dist} +License: BSD Group: System Environment/Base URL: http://www.adel.nursat.kz/%{name}/ Source0: http://www.adel.nursat.kz/%{name}/download/%{name}-%{version}.tar.gz Source1: apg.xinetd +Patch0: apg-2.3.0b-gen_rand_pass.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,13 +20,14 @@ %prep %setup -q +%patch0 -p1 -b .gen_rand_pass %build # Build server -make %{?_smp_mflags} cliserv +make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} cliserv # Build standalone files -make %{?_smp_mflags} standalone +make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} standalone %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -59,6 +60,27 @@ %{_sysconfdir}/xinetd.d/apgd %changelog +* Tue Mar 4 2008 Stephen John Smoogen - 2.3.0b-5 +- Synced up with EL-5 spec file. + +* Tue Aug 21 2007 Kevin Fenzi - 2.3.0b-5 +- Fix incorrect license tag +- Fix incorrect sources + +* Sun Aug 27 2006 Kevin Fenzi - 2.3.0b-4 +- Rebuild for fc6 + +* Thu Feb 16 2006 Kevin Fenzi - 2.3.0b-3 +- Rebuild for fc5 + +* Sat Jul 30 2005 Michael Schwendt - 2.3.0b-2 +- Fix -y segfault (#164698). +- Make with CFLAGS and FLAGS to build with RPM optflags to + repair debuginfo package. + +* Fri Apr 22 2005 Oliver Falk - 2.3.0b-1_FC4 +- Add FC4 to the release tag, so it's newer than the FC3 package + * Mon Apr 11 2005 Oliver Falk - 2.3.0b-1 - Merge FC devel specfile with lkernAT specfile (=> update) - Has now support for xinetd Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/apg/EL-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Apr 2005 12:37:22 -0000 1.3 +++ sources 4 Mar 2008 21:03:34 -0000 1.4 @@ -1 +1 @@ -3f9301ab654e15ea258d3904c8669a25 apg-2.3.0b.tar.gz +bd82400a5a731070ce895313576afe24 apg-2.3.0b.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 21:05:30 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 21:05:30 GMT Subject: rpms/PersonalCopy-Lite-soundfont/F-8 LICENSE.txt, NONE, 1.1 PersonalCopy-Lite-soundfont.spec, NONE, 1.1 license-permission.eml, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803042105.m24L5U4Z014935@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/PersonalCopy-Lite-soundfont/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14898 Modified Files: .cvsignore sources Added Files: LICENSE.txt PersonalCopy-Lite-soundfont.spec license-permission.eml Log Message: * Mon Mar 3 2008 Hans de Goede 4.1-3 - Fix version this is version 4.1 not 4.2 (oops) --- NEW FILE LICENSE.txt --- The PersonalCopy sound fonts by Jim Roe may be freely (re)distributed and used under the following conditions: 1) This license text must always be included in the distribution 2a) They must be distributed in their original form 2b) As an exception to 2a they may be distributed converted into an other soundfont format such as for example the Gravis Ultrasound .pat format 3) Neither the PersonalCopy soundfonts nor any of their individual components, in Original or Modified Versions, may be sold by itself. --- NEW FILE PersonalCopy-Lite-soundfont.spec --- Name: PersonalCopy-Lite-soundfont Version: 4.1 Release: 3%{?dist} Summary: Lite version of the PersonalCopy General Midi soundfont Group: Applications/Multimedia License: Redistributable, no modification permitted URL: http://www.personalcopy.com/sfarkfonts1.htm # This is ftp://ftp.personalcopy.net/pub/PCLite.sfArk.exe after running this # self extracting executable under wine Source0: PCLite.sf2 Source1: LICENSE.txt Source2: license-permission.eml BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: soundfont-utils BuildArch: noarch # Virtual soundfont2 provides for easy querying of all sf2 packages Provides: soundfont2 %description Lite (smaller) version of the PersonalCopy General Midi soundfont in soundfont 2.0 (.sf2) format. %package -n PersonalCopy-Lite-patches Summary: PersonalCopy Lite General Midi soundfont in GUS patch format Group: Applications/Multimedia Provides: timidity++-patches = %{version}-%{release} Obsoletes: timidity++-patches <= %{version}-%{release} %description -n PersonalCopy-Lite-patches Lite (smaller) version of the PersonalCopy General Midi soundfont in GUS (Gravis Ultrasound) patch (.pat) format. %prep %setup -q -c -T cp -p %{SOURCE1} %{SOURCE2} . %build unsf %{SOURCE0} # The gus patches get used by a lot of different programs and some need the # path to the patches to be absolute sed -i 's|PCLite-|%{_datadir}/PersonalCopy-Lite-patches/PCLite-|g' PCLite.cfg %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/soundfonts mkdir -p $RPM_BUILD_ROOT%{_datadir}/PersonalCopy-Lite-patches install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/soundfonts cp -a PCLite-* $RPM_BUILD_ROOT%{_datadir}/PersonalCopy-Lite-patches install -p -m 644 PCLite.cfg $RPM_BUILD_ROOT%{_sysconfdir}/timidity.cfg %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt license-permission.eml %{_datadir}/soundfonts %files -n PersonalCopy-Lite-patches %defattr(-,root,root,-) %doc LICENSE.txt license-permission.eml %config(noreplace) %{_sysconfdir}/timidity.cfg %{_datadir}/PersonalCopy-Lite-patches %changelog * Mon Mar 3 2008 Hans de Goede 4.1-3 - Fix version this is version 4.1 not 4.2 (oops) * Thu Feb 28 2008 Hans de Goede 4.1-2 - Stop providing timidity++-soundfont and /etc/timidity++.cfg, instead timidity++ itself will come with an /etc/timidity++.cfg and Require its default soundfont (bz 430417) * Sun Jan 27 2008 Hans de Goede 4.1-1 - Initial Fedora Package --- NEW FILE license-permission.eml --- Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 84316366 for j.w.r.degoede at hhs.nl; Fri, 25 Jan 2008 13:02:31 +0100 Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62) (envelope-from ) id 1JINGN-0000Cu-Vm for j.w.r.degoede at hhs.nl; Fri, 25 Jan 2008 13:02:31 +0100 X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on koko.hhs.nl X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_50 autolearn=ham version=3.1.8 Received: from [147.202.35.95] (port=43277 helo=ns1.personalcopy.net) by koko.hhs.nl with esmtp (Exim 4.62) (envelope-from ) id 1JINDe-0007oH-8R for j.w.r.degoede at hhs.nl; Fri, 25 Jan 2008 12:59:38 +0100 Received: (qmail 4862 invoked from network); 25 Jan 2008 11:59:37 -0000 Received: from host-69-95-108-220.cwon.choiceone.net (HELO NOMAD) (69.95.108.220) by personalcopy.net with SMTP; 25 Jan 2008 06:59:37 -0500 Message-ID: <002801c85f49$c7494be0$9865fea9 at NOMAD> From: "Jim Roe" To: "Hans de Goede" References: <47999228.1080603 at hhs.nl> Subject: Re: PersonalCopy soundfonts license proposal Date: Fri, 25 Jan 2008 06:59:45 -0500 MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=response Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.3138 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 --- begin proposed license --- The PersonalCopy sound fonts by Jim Roe may be freely (re)distributed and used under the following conditions: 1) This license text must always be included in the distribution 2a) They must be distributed in their original form 2b) As an exception to 2a they may be distributed converted into an other soundfont format such as for example the Gravis Ultrasound .pat format 3) Neither the PersonalCopy soundfonts nor any of their individual components, in Original or Modified Versions, may be sold by itself. --- end proposed license --- I agree to the distribution of PersonalCopy soundfonts under these terms and conditions. James R Roe. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/PersonalCopy-Lite-soundfont/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:01:37 -0000 1.1 +++ .cvsignore 4 Mar 2008 21:04:51 -0000 1.2 @@ -0,0 +1 @@ +PCLite.sf2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/PersonalCopy-Lite-soundfont/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:01:37 -0000 1.1 +++ sources 4 Mar 2008 21:04:51 -0000 1.2 @@ -0,0 +1 @@ +629732b7552c12a8fae5b046d306273a PCLite.sf2 From fedora-extras-commits at redhat.com Tue Mar 4 21:06:24 2008 From: fedora-extras-commits at redhat.com (Dan Smith (danms)) Date: Tue, 4 Mar 2008 21:06:24 GMT Subject: rpms/libvirt-cim/devel .cvsignore, 1.3, 1.4 libvirt-cim.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200803042106.m24L6O8t015044@cvs-int.fedora.redhat.com> Author: danms Update of /cvs/pkgs/rpms/libvirt-cim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14985 Modified Files: .cvsignore libvirt-cim.spec sources Log Message: Updated to 0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Feb 2008 18:25:38 -0000 1.3 +++ .cvsignore 4 Mar 2008 21:05:46 -0000 1.4 @@ -1 +1 @@ -libvirt-cim-0.2.tar.gz +libvirt-cim-0.3.tar.gz Index: libvirt-cim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libvirt-cim.spec 15 Feb 2008 18:25:38 -0000 1.8 +++ libvirt-cim.spec 4 Mar 2008 21:05:46 -0000 1.9 @@ -2,7 +2,7 @@ Summary: A CIM provider for libvirt Name: libvirt-cim -Version: 0.2 +Version: 0.3 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/CIM/ Requires: unzip -BuildRequires: libcmpiutil >= 0.2 +BuildRequires: libcmpiutil >= 0.3 BuildRequires: tog-pegasus-devel BuildRequires: libvirt-devel >= 0.3.2 BuildRequires: e2fsprogs-devel @@ -99,6 +99,9 @@ /etc/ld.so.conf.d/libvirt-cim.conf %changelog +* Mon Mar 03 2008 Dan Smith - 0.3-1 +- Updated to latest upstream source + * Wed Feb 13 2008 Dan Smith - 0.2-1 - Updated to latest upstream source Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Feb 2008 18:25:38 -0000 1.4 +++ sources 4 Mar 2008 21:05:46 -0000 1.5 @@ -1 +1 @@ -3edb64112b2c978b2103e64d263c1728 libvirt-cim-0.2.tar.gz +528908c9daf98c077f90b7df6fdf1c0a libvirt-cim-0.3.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 21:06:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 21:06:41 GMT Subject: rpms/perl-DBIx-SearchBuilder/devel perl-DBIx-SearchBuilder.spec, 1.15, 1.16 Message-ID: <200803042106.m24L6fqm015091@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15015 Modified Files: perl-DBIx-SearchBuilder.spec Log Message: new perl Index: perl-DBIx-SearchBuilder.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-DBIx-SearchBuilder.spec 21 Jan 2008 15:17:01 -0000 1.15 +++ perl-DBIx-SearchBuilder.spec 4 Mar 2008 21:05:59 -0000 1.16 @@ -7,7 +7,7 @@ Name: perl-DBIx-SearchBuilder Version: 1.51 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Encapsulate SQL queries and rows in simple perl objects License: GPL+ or Artistic Group: Development/Libraries @@ -91,6 +91,9 @@ %endif %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 1.51-2 +- rebuild for new perl + * Mon Jan 21 2008 Ralf Cors??pius - 1.51-1 - Upstream update. From fedora-extras-commits at redhat.com Tue Mar 4 21:09:53 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 4 Mar 2008 21:09:53 GMT Subject: rpms/cdparanoia/devel cdparanoia-III-alpha9.8.scsi-setspeed.patch, NONE, 1.1 cdparanoia.spec, 1.28, 1.29 Message-ID: <200803042109.m24L9r55015204@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/cdparanoia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15179 Modified Files: cdparanoia.spec Added Files: cdparanoia-III-alpha9.8.scsi-setspeed.patch Log Message: * Tue Mar 04 2008 Adam Jackson alpha9.8-29 - cdparanoia-III-alpha9.8.scsi-setspeed.patch: Allow setting the speed of SCSI CD drives. (#431178) cdparanoia-III-alpha9.8.scsi-setspeed.patch: --- NEW FILE cdparanoia-III-alpha9.8.scsi-setspeed.patch --- --- cdparanoia-III-alpha9.8/interface/scsi_interface.c_orig 2008-02-02 21:14:07.000000000 +0100 +++ cdparanoia-III-alpha9.8/interface/scsi_interface.c 2008-02-02 21:13:41.000000000 +0100 @@ -1565,6 +1565,15 @@ return ret; } +/* Set operating speed */ +static int scsi_setspeed(cdrom_drive *d, int speed) +{ + if(d->cdda_fd!=-1) + return ioctl(d->cdda_fd, CDROM_SELECT_SPEED, speed); + else + return 0; +} + int scsi_init_drive(cdrom_drive *d){ int ret, is_sgio; @@ -1609,7 +1618,7 @@ d->read_toc = (!memcmp(d->drive_model, "IMS", 3) && !d->is_atapi) ? scsi_read_toc2 : scsi_read_toc; - d->set_speed = NULL; + d->set_speed = scsi_setspeed; if(!d->is_atapi){ Index: cdparanoia.spec =================================================================== RCS file: /cvs/pkgs/rpms/cdparanoia/devel/cdparanoia.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- cdparanoia.spec 19 Feb 2008 19:39:18 -0000 1.28 +++ cdparanoia.spec 4 Mar 2008 21:09:05 -0000 1.29 @@ -3,7 +3,7 @@ Name: cdparanoia Version: %{realver} -Release: 28.2 +Release: 29 License: GPL Group: Applications/Multimedia Source: http://www.xiph.org/paranoia/download/%{name}-III-%{realver}.src.tgz @@ -18,6 +18,7 @@ Patch8: cdparanoia-III-alpha9.8.env.patch Patch9: cdparanoia-III-alpha9.8.smalldma.patch Patch10: cdparanoia-III-alpha9.8.lm.patch +Patch11: cdparanoia-III-alpha9.8.scsi-setspeed.patch Url: http://www.xiph.org/paranoia/index.html BuildRoot: %{_tmppath}/cdparanoia-%{version}-root Requires: cdparanoia-libs = %{version}-%{release} @@ -64,6 +65,7 @@ %patch8 -p1 -b .env %patch9 -p1 -b .smalldma %patch10 -p1 -b .lm +%patch11 -p1 -b .setspeed %build rm -rf $RPM_BUILD_ROOT @@ -123,6 +125,10 @@ %{_libdir}/*.a %changelog +* Tue Mar 04 2008 Adam Jackson alpha9.8-29 +- cdparanoia-III-alpha9.8.scsi-setspeed.patch: Allow setting the speed of + SCSI CD drives. (#431178) + * Tue Feb 19 2008 Fedora Release Engineering - alpha9.8-28.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 21:10:32 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 4 Mar 2008 21:10:32 GMT Subject: comps comps-f7.xml.in, 1.316, 1.317 comps-f8.xml.in, 1.229, 1.230 comps-f9.xml.in, 1.289, 1.290 Message-ID: <200803042110.m24LAW3J015262@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15203 Modified Files: comps-f7.xml.in comps-f8.xml.in comps-f9.xml.in Log Message: add xfce4-gsynaptics-mcs-plugin Index: comps-f7.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- comps-f7.xml.in 3 Mar 2008 11:49:10 -0000 1.316 +++ comps-f7.xml.in 4 Mar 2008 21:10:01 -0000 1.317 @@ -3925,6 +3925,7 @@ xfce4-eyes-plugin xfce4-fsguard-plugin xfce4-genmon-plugin + xfce4-gsynaptics-mcs xfce4-minicmd-plugin xfce4-mount-plugin xfce4-netload-plugin Index: comps-f8.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- comps-f8.xml.in 4 Mar 2008 18:41:25 -0000 1.229 +++ comps-f8.xml.in 4 Mar 2008 21:10:01 -0000 1.230 @@ -4193,6 +4193,7 @@ xfce4-eyes-plugin xfce4-fsguard-plugin xfce4-genmon-plugin + xfce4-gsynaptics-mcs-plugin xfce4-minicmd-plugin xfce4-mount-plugin xfce4-netload-plugin Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.289 retrieving revision 1.290 diff -u -r1.289 -r1.290 --- comps-f9.xml.in 4 Mar 2008 18:41:25 -0000 1.289 +++ comps-f9.xml.in 4 Mar 2008 21:10:01 -0000 1.290 @@ -4247,6 +4247,7 @@ xfce4-eyes-plugin xfce4-fsguard-plugin xfce4-genmon-plugin + xfce4-gsynaptics-mcs-plugin xfce4-minicmd-plugin xfce4-mount-plugin xfce4-netload-plugin From fedora-extras-commits at redhat.com Tue Mar 4 21:17:42 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 4 Mar 2008 21:17:42 GMT Subject: rpms/R-multcomp/devel .cvsignore, 1.4, 1.5 R-multcomp.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200803042117.m24LHgXY015394@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-multcomp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15362 Modified Files: .cvsignore R-multcomp.spec sources Log Message: * Tue Mar 4 2008 Orion Poplawski - 0.993-1 - Update to 0.993-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Feb 2008 16:13:26 -0000 1.4 +++ .cvsignore 4 Mar 2008 21:16:59 -0000 1.5 @@ -1 +1 @@ -multcomp_0.992-8.tar.gz +multcomp_0.993-1.tar.gz Index: R-multcomp.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- R-multcomp.spec 15 Feb 2008 16:13:26 -0000 1.3 +++ R-multcomp.spec 4 Mar 2008 21:16:59 -0000 1.4 @@ -1,10 +1,10 @@ %define packname multcomp -%define packrel 8 +%define packrel 1 Summary: Simultaneous inference for general linear hypotheses R Package Name: R-%{packname} -Version: 0.992 -Release: 4%{?dist} +Version: 0.993 +Release: 1%{?dist} License: GPLv2 Group: Applications/Engineering Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz @@ -77,6 +77,9 @@ %changelog +* Tue Mar 4 2008 Orion Poplawski - 0.993-1 +- Update to 0.993-1 + * Fri Feb 15 2008 Orion Poplawski - 0.992-4 - Update to 0.992-8 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Feb 2008 16:13:26 -0000 1.4 +++ sources 4 Mar 2008 21:16:59 -0000 1.5 @@ -1 +1 @@ -7fa552b608fd11791be586a26dd1345e multcomp_0.992-8.tar.gz +8fbc8ee7d86ef56db5640127f26d1589 multcomp_0.993-1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 21:18:28 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 21:18:28 GMT Subject: rpms/PersonalCopy-Lite-soundfont/F-7 LICENSE.txt, NONE, 1.1 PersonalCopy-Lite-soundfont.spec, NONE, 1.1 license-permission.eml, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803042118.m24LISVr015477@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/PersonalCopy-Lite-soundfont/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15439 Modified Files: .cvsignore sources Added Files: LICENSE.txt PersonalCopy-Lite-soundfont.spec license-permission.eml Log Message: * Mon Mar 3 2008 Hans de Goede 4.1-3 - Fix version this is version 4.1 not 4.2 (oops) --- NEW FILE LICENSE.txt --- The PersonalCopy sound fonts by Jim Roe may be freely (re)distributed and used under the following conditions: 1) This license text must always be included in the distribution 2a) They must be distributed in their original form 2b) As an exception to 2a they may be distributed converted into an other soundfont format such as for example the Gravis Ultrasound .pat format 3) Neither the PersonalCopy soundfonts nor any of their individual components, in Original or Modified Versions, may be sold by itself. --- NEW FILE PersonalCopy-Lite-soundfont.spec --- Name: PersonalCopy-Lite-soundfont Version: 4.1 Release: 3%{?dist} Summary: Lite version of the PersonalCopy General Midi soundfont Group: Applications/Multimedia License: Redistributable, no modification permitted URL: http://www.personalcopy.com/sfarkfonts1.htm # This is ftp://ftp.personalcopy.net/pub/PCLite.sfArk.exe after running this # self extracting executable under wine Source0: PCLite.sf2 Source1: LICENSE.txt Source2: license-permission.eml BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: soundfont-utils BuildArch: noarch # Virtual soundfont2 provides for easy querying of all sf2 packages Provides: soundfont2 %description Lite (smaller) version of the PersonalCopy General Midi soundfont in soundfont 2.0 (.sf2) format. %package -n PersonalCopy-Lite-patches Summary: PersonalCopy Lite General Midi soundfont in GUS patch format Group: Applications/Multimedia Provides: timidity++-patches = %{version}-%{release} Obsoletes: timidity++-patches <= %{version}-%{release} %description -n PersonalCopy-Lite-patches Lite (smaller) version of the PersonalCopy General Midi soundfont in GUS (Gravis Ultrasound) patch (.pat) format. %prep %setup -q -c -T cp -p %{SOURCE1} %{SOURCE2} . %build unsf %{SOURCE0} # The gus patches get used by a lot of different programs and some need the # path to the patches to be absolute sed -i 's|PCLite-|%{_datadir}/PersonalCopy-Lite-patches/PCLite-|g' PCLite.cfg %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/soundfonts mkdir -p $RPM_BUILD_ROOT%{_datadir}/PersonalCopy-Lite-patches install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/soundfonts cp -a PCLite-* $RPM_BUILD_ROOT%{_datadir}/PersonalCopy-Lite-patches install -p -m 644 PCLite.cfg $RPM_BUILD_ROOT%{_sysconfdir}/timidity.cfg %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt license-permission.eml %{_datadir}/soundfonts %files -n PersonalCopy-Lite-patches %defattr(-,root,root,-) %doc LICENSE.txt license-permission.eml %config(noreplace) %{_sysconfdir}/timidity.cfg %{_datadir}/PersonalCopy-Lite-patches %changelog * Mon Mar 3 2008 Hans de Goede 4.1-3 - Fix version this is version 4.1 not 4.2 (oops) * Thu Feb 28 2008 Hans de Goede 4.1-2 - Stop providing timidity++-soundfont and /etc/timidity++.cfg, instead timidity++ itself will come with an /etc/timidity++.cfg and Require its default soundfont (bz 430417) * Sun Jan 27 2008 Hans de Goede 4.1-1 - Initial Fedora Package --- NEW FILE license-permission.eml --- Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 84316366 for j.w.r.degoede at hhs.nl; Fri, 25 Jan 2008 13:02:31 +0100 Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62) (envelope-from ) id 1JINGN-0000Cu-Vm for j.w.r.degoede at hhs.nl; Fri, 25 Jan 2008 13:02:31 +0100 X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on koko.hhs.nl X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_50 autolearn=ham version=3.1.8 Received: from [147.202.35.95] (port=43277 helo=ns1.personalcopy.net) by koko.hhs.nl with esmtp (Exim 4.62) (envelope-from ) id 1JINDe-0007oH-8R for j.w.r.degoede at hhs.nl; Fri, 25 Jan 2008 12:59:38 +0100 Received: (qmail 4862 invoked from network); 25 Jan 2008 11:59:37 -0000 Received: from host-69-95-108-220.cwon.choiceone.net (HELO NOMAD) (69.95.108.220) by personalcopy.net with SMTP; 25 Jan 2008 06:59:37 -0500 Message-ID: <002801c85f49$c7494be0$9865fea9 at NOMAD> From: "Jim Roe" To: "Hans de Goede" References: <47999228.1080603 at hhs.nl> Subject: Re: PersonalCopy soundfonts license proposal Date: Fri, 25 Jan 2008 06:59:45 -0500 MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=response Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.3138 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 --- begin proposed license --- The PersonalCopy sound fonts by Jim Roe may be freely (re)distributed and used under the following conditions: 1) This license text must always be included in the distribution 2a) They must be distributed in their original form 2b) As an exception to 2a they may be distributed converted into an other soundfont format such as for example the Gravis Ultrasound .pat format 3) Neither the PersonalCopy soundfonts nor any of their individual components, in Original or Modified Versions, may be sold by itself. --- end proposed license --- I agree to the distribution of PersonalCopy soundfonts under these terms and conditions. James R Roe. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/PersonalCopy-Lite-soundfont/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:01:37 -0000 1.1 +++ .cvsignore 4 Mar 2008 21:17:54 -0000 1.2 @@ -0,0 +1 @@ +PCLite.sf2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/PersonalCopy-Lite-soundfont/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:01:37 -0000 1.1 +++ sources 4 Mar 2008 21:17:54 -0000 1.2 @@ -0,0 +1 @@ +629732b7552c12a8fae5b046d306273a PCLite.sf2 From fedora-extras-commits at redhat.com Tue Mar 4 21:23:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 21:23:54 GMT Subject: rpms/perl-Wx/devel .cvsignore, 1.17, 1.18 perl-Wx.spec, 1.22, 1.23 sources, 1.17, 1.18 Message-ID: <200803042123.m24LNsQN015733@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Wx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15655 Modified Files: .cvsignore perl-Wx.spec sources Log Message: 0.81 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Wx/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 28 Nov 2007 21:37:53 -0000 1.17 +++ .cvsignore 4 Mar 2008 21:23:16 -0000 1.18 @@ -1 +1 @@ -Wx-0.80.tar.gz +Wx-0.81.tar.gz Index: perl-Wx.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Wx/devel/perl-Wx.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- perl-Wx.spec 4 Mar 2008 18:26:54 -0000 1.22 +++ perl-Wx.spec 4 Mar 2008 21:23:16 -0000 1.23 @@ -5,8 +5,8 @@ # Name: perl-Wx -Version: 0.80 -Release: 4%{?dist} +Version: 0.81 +Release: 1%{?dist} Summary: Interface to the wxWidgets cross-platform GUI toolkit Group: Development/Libraries @@ -55,13 +55,13 @@ chmod +x %{__perl_requires} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL --wx-unicode --wx-version=`wx-config --version` --wx-toolkit=gtk2 INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' @@ -88,6 +88,10 @@ %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 0.81-1 +- 0.81 +- minor packaging cleanups + * Tue Mar 4 2008 Tom "spot" Callaway - 0.80-4 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Wx/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 28 Nov 2007 21:37:53 -0000 1.17 +++ sources 4 Mar 2008 21:23:16 -0000 1.18 @@ -1 +1 @@ -81dad4cbcb1e0063971164f7b7545e76 Wx-0.80.tar.gz +3b39d839f358380bb50c665b887b93a6 Wx-0.81.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 21:24:32 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 21:24:32 GMT Subject: rpms/timidity++/devel .cvsignore,1.7,1.8 sources,1.7,1.8 Message-ID: <200803042124.m24LOWc0015847@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/timidity++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15741 Modified Files: .cvsignore sources Log Message: remove no longer used files from sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/timidity++/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Feb 2005 17:40:56 -0000 1.7 +++ .cvsignore 4 Mar 2008 21:23:57 -0000 1.8 @@ -1,5 +1 @@ -TiMidity++-2.13.0.tar.bz2 -britepno.pat.bz2 -instruments.tar.bz2 -pistol.pat.bz2 TiMidity++-2.13.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/timidity++/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Feb 2005 17:40:56 -0000 1.7 +++ sources 4 Mar 2008 21:23:57 -0000 1.8 @@ -1,4 +1 @@ -324e265362f812883024b58cf3470d1a britepno.pat.bz2 -3ff4264e611f89094a47940e4988ae81 instruments.tar.bz2 -f961325db679de6e0ea402ebe6a268f9 pistol.pat.bz2 a82ceeb2245e22f4de2b41da21eaee32 TiMidity++-2.13.2.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 21:25:44 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 21:25:44 GMT Subject: rpms/timidity++/devel TiMidity++-2.13.0-redhat.patch,1.1,NONE Message-ID: <200803042125.m24LPi8Q015881@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/timidity++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15874 Removed Files: TiMidity++-2.13.0-redhat.patch Log Message: remove no longer used pathc file --- TiMidity++-2.13.0-redhat.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 21:27:16 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 4 Mar 2008 21:27:16 GMT Subject: rpms/gdl/devel gdl.spec,1.31,1.32 Message-ID: <200803042127.m24LRG2Z015977@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15925 Modified Files: gdl.spec Log Message: * Tue Mar 4 2008 - Orion Poplawski - 0.9-0.pre6.1 - Rebuild for gcc 4.3, and add patch for gcc 4.3 support - Add patch to build against plplot 5.9.0 - Add cvs patch to update to latest cvs Index: gdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gdl.spec 19 Feb 2008 17:03:40 -0000 1.31 +++ gdl.spec 4 Mar 2008 21:26:42 -0000 1.32 @@ -1,6 +1,6 @@ Name: gdl Version: 0.9 -Release: 1.pre6%{?dist} +Release: 0.pre6.1%{?dist} Summary: GNU Data Language Group: Applications/Engineering @@ -9,7 +9,10 @@ Source0: http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}pre6.tar.gz Source1: gdl.csh Source2: gdl.sh -Patch0: gdl-0.9pre5-ppc64.patch +Patch0: gdl-0.9pre6-cvs.patch +Patch1: gdl-0.9pre5-ppc64.patch +Patch2: gdl-0.9pre6-gcc43.patch +Patch3: gdl-0.9pre6-plplot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, ncurses-devel @@ -27,10 +30,15 @@ %prep %setup -q -n %{name}-%{version}pre6 -%patch -p1 -b .ppc64 +%patch0 -p1 -b .cvs +%patch1 -p1 -b .ppc64 +%patch2 -p1 -b .gcc43 +%patch3 -p1 -b .plplot +find -name \*.cvs | xargs chmod 644 %build +export CPPFLAGS="-DH5_USE_16_API" %configure --disable-dependency-tracking --disable-static --with-fftw \ INCLUDES="-I/usr/include/netcdf-3 -I/usr/include/hdf" \ LIBS="-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf" @@ -65,8 +73,10 @@ %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 0.9-1.pre6 -- Autorebuild for GCC 4.3 +* Tue Mar 4 2008 - Orion Poplawski - 0.9-0.pre6.1 +- Rebuild for gcc 4.3, and add patch for gcc 4.3 support +- Add patch to build against plplot 5.9.0 +- Add cvs patch to update to latest cvs * Fri Nov 1 2007 - Orion Poplawski - 0.9-0.pre6 - Update to 0.9pre6 From fedora-extras-commits at redhat.com Tue Mar 4 21:27:43 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 21:27:43 GMT Subject: rpms/timidity++/F-8 TiMidity++-2.13.2-cfgfile-name.patch, NONE, 1.1 TiMidity++-2.13.2-dynlibroot.patch, NONE, 1.1 TiMidity++-2.13.2-ipv6.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 timidity++.spec, 1.19, 1.20 TiMidity++-2.13.0-redhat.patch, 1.1, NONE Message-ID: <200803042127.m24LRh9w016021@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/timidity++/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15948 Modified Files: .cvsignore sources timidity++.spec Added Files: TiMidity++-2.13.2-cfgfile-name.patch TiMidity++-2.13.2-dynlibroot.patch TiMidity++-2.13.2-ipv6.patch Removed Files: TiMidity++-2.13.0-redhat.patch Log Message: * Mon Mar 3 2008 Hans de Goede 2.13.2-13 - Merge review fixes (bz 226492) - merge patch0 into patch16, drop patch0 - Make License tag just GPLv2 - Unify macros usage TiMidity++-2.13.2-cfgfile-name.patch: --- NEW FILE TiMidity++-2.13.2-cfgfile-name.patch --- diff -up TiMidity++-2.13.2/timidity/timidity.c~ TiMidity++-2.13.2/timidity/timidity.c --- TiMidity++-2.13.2/timidity/timidity.c~ 2008-02-28 13:25:00.000000000 +0100 +++ TiMidity++-2.13.2/timidity/timidity.c 2008-02-28 13:25:00.000000000 +0100 @@ -5170,7 +5170,9 @@ MAIN_INTERFACE int timidity_pre_load_con #else /* UNIX */ - if(!read_config_file(CONFIG_FILE, 0)) + if(!read_config_file(CONFIG_FILE1, 0)) + got_a_configuration = 1; + else if(!read_config_file(CONFIG_FILE2, 0)) got_a_configuration = 1; #endif @@ -5240,7 +5240,9 @@ MAIN_INTERFACE int timidity_post_load_co if(!got_a_configuration) { - if(try_config_again && !read_config_file(CONFIG_FILE, 0)) + if(try_config_again && !read_config_file(CONFIG_FILE1, 0)) + got_a_configuration = 1; + else if(try_config_again && !read_config_file(CONFIG_FILE2, 0)) got_a_configuration = 1; } @@ -5695,7 +5697,7 @@ int main(int argc, char **argv) #else ctl->cmsg(CMSG_FATAL, VERB_NORMAL, "%s: Error reading configuration file.\nPlease check " - CONFIG_FILE, program_name); + CONFIG_FILE1 " or " CONFIG_FILE2, program_name); #endif /* __W32__ */ } else diff -up TiMidity++-2.13.2/timidity/timidity.h~ TiMidity++-2.13.2/timidity/timidity.h --- TiMidity++-2.13.2/timidity/timidity.h~ 2008-02-28 13:19:29.000000000 +0100 +++ TiMidity++-2.13.2/timidity/timidity.h 2008-02-28 13:19:29.000000000 +0100 @@ -41,14 +41,8 @@ /* You could specify a complete path, e.g. "/etc/timidity.cfg", and then specify the library directory in the configuration file. */ -/* #define CONFIG_FILE "/etc/timidity.cfg" */ -#ifndef CONFIG_FILE -# ifdef DEFAULT_PATH -# define CONFIG_FILE DEFAULT_PATH "/timidity.cfg" -# else -# define CONFIG_FILE PKGDATADIR "/timidity.cfg" -# endif /* DEFAULT_PATH */ -#endif /* CONFIG_FILE */ +#define CONFIG_FILE1 "/etc/timidity++.cfg" +#define CONFIG_FILE2 "/etc/timidity.cfg" /* Filename extension, followed by command to run decompressor so that TiMidity++-2.13.2-dynlibroot.patch: --- NEW FILE TiMidity++-2.13.2-dynlibroot.patch --- diff -up TiMidity++-2.13.2/timidity/timidity.c.dynlibroot TiMidity++-2.13.2/timidity/timidity.c --- TiMidity++-2.13.2/timidity/timidity.c.dynlibroot 2008-02-21 12:41:09.000000000 +0100 +++ TiMidity++-2.13.2/timidity/timidity.c 2008-02-21 12:49:55.000000000 +0100 @@ -554,7 +554,7 @@ MAIN_INTERFACE struct URL_module *url_mo #ifndef SHARED_LIB_PATH #define SHARED_LIB_PATH PKGLIBDIR #endif /* SHARED_LIB_PATH */ -static char *dynamic_lib_root = SHARED_LIB_PATH; +static char *dynamic_lib_root = NULL; #endif /* IA_DYNAMIC */ #ifndef MAXPATHLEN @@ -2970,8 +2970,7 @@ static inline int parse_opt_d(const char { /* dynamic lib root */ #ifdef IA_DYNAMIC - if (dynamic_lib_root) - free(dynamic_lib_root); + free(dynamic_lib_root); dynamic_lib_root = safe_strdup(arg); return 0; #else @@ -3893,6 +3892,8 @@ static inline int parse_opt_h(const char cmp->id_character, cmp->id_name); #endif /* IA_DYNAMIC */ #ifdef IA_DYNAMIC + if (!dynamic_lib_root) + dynamic_lib_root = safe_strdup(SHARED_LIB_PATH); fprintf(fp, "Supported dynamic load interfaces (%s):" NLS, dynamic_lib_root); memset(mark, 0, sizeof(mark)); @@ -3997,6 +3998,8 @@ static inline char *dynamic_interface_in int fd, n; char *nl; + if (!dynamic_lib_root) + dynamic_lib_root = safe_strdup(SHARED_LIB_PATH); sprintf(libinfo, "%s" PATH_STRING "interface_%c.txt", dynamic_lib_root, id); if ((fd = open(libinfo, 0)) < 0) @@ -4021,6 +4024,8 @@ char *dynamic_interface_module(int id) static char shared_library[MAXPATHLEN]; int fd; + if (!dynamic_lib_root) + dynamic_lib_root = safe_strdup(SHARED_LIB_PATH); sprintf(shared_library, "%s" PATH_STRING "interface_%c%s", dynamic_lib_root, id, SHARED_LIB_EXT); if ((fd = open(shared_library, 0)) < 0) TiMidity++-2.13.2-ipv6.patch: --- NEW FILE TiMidity++-2.13.2-ipv6.patch --- diff -up TiMidity++-2.13.2/utils/net.c.ipv6 TiMidity++-2.13.2/utils/net.c --- TiMidity++-2.13.2/utils/net.c.ipv6 2002-07-19 02:46:14.000000000 +0200 +++ TiMidity++-2.13.2/utils/net.c 2008-02-01 14:44:46.000000000 +0100 @@ -58,7 +58,9 @@ SOCKET open_socket(char *host, unsigned short port) { SOCKET fd; - struct sockaddr_in in; + struct addrinfo hints, *result, *rp; + char service[NI_MAXSERV]; + int s; #if defined(WINSOCK) static int first = 1; @@ -69,27 +71,33 @@ SOCKET open_socket(char *host, unsigned } #endif - memset(&in, 0, sizeof(in)); - if((in.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) - { - struct hostent *hp; - if((hp = gethostbyname(host)) == NULL) - return (SOCKET)-1; - memcpy(&in.sin_addr, hp->h_addr, hp->h_length); - } - in.sin_port = htons(port); - in.sin_family = AF_INET; + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_ADDRCONFIG; + + snprintf(service, sizeof(service), "%d", port); - if((fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) - return (SOCKET)-1; + s = getaddrinfo(host, service, &hints, &result); - if(connect(fd, (struct sockaddr *)&in, sizeof(in)) == SOCKET_ERROR) + if (s) + return (SOCKET)-1; + + for (rp = result; rp != NULL; rp = rp->ai_next) { - closesocket(fd); - return (SOCKET)-1; + fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + + if (fd != -1 && connect(fd, rp->ai_addr, rp->ai_addrlen) != -1) + break; + + if (fd != -1) { + close(fd); + fd = -1; + } } - return fd; + freeaddrinfo(result); + return (SOCKET) fd; } #if !defined(__W32__) || defined(__CYGWIN32__) diff -up TiMidity++-2.13.2/libarc/url_news.c.ipv6 TiMidity++-2.13.2/libarc/url_news.c --- TiMidity++-2.13.2/libarc/url_news.c.ipv6 2002-07-19 02:09:22.000000000 +0200 +++ TiMidity++-2.13.2/libarc/url_news.c 2008-02-01 14:44:46.000000000 +0100 @@ -288,8 +288,17 @@ URL url_news_open(char *name) buff[sizeof(buff) - 1] = '\0'; host = buff; - for(p = host; *p && *p != ':' && *p != '/'; p++) - ; + if (host[0] == '[') + { + if (!(p = strchr(host, ']'))) + return NULL; + *p = '\0'; + ++host; + ++p; + } else + for(p = host; *p && *p != ':' && *p != '/'; p++) + ; + if(*p == ':') { *p++ = '\0'; /* terminate `host' string */ diff -up TiMidity++-2.13.2/libarc/url_ftp.c.ipv6 TiMidity++-2.13.2/libarc/url_ftp.c --- TiMidity++-2.13.2/libarc/url_ftp.c.ipv6 2002-01-15 11:53:19.000000000 +0100 +++ TiMidity++-2.13.2/libarc/url_ftp.c 2008-02-01 14:44:46.000000000 +0100 @@ -234,6 +234,14 @@ URL url_ftp_open(char *name) *passwd++ = '\0'; } + if (host[0] == '[') + { + if (!(p = strchr(host, ']'))) + return NULL; + *p = '\0'; + ++host; + } + #ifdef DEBUG printf("open(host=`%s', port=`%d')\n", host, port); #endif /* DEBUG */ diff -up TiMidity++-2.13.2/libarc/url_http.c.ipv6 TiMidity++-2.13.2/libarc/url_http.c --- TiMidity++-2.13.2/libarc/url_http.c.ipv6 2002-01-15 11:53:19.000000000 +0100 +++ TiMidity++-2.13.2/libarc/url_http.c 2008-02-01 14:44:46.000000000 +0100 @@ -133,8 +133,15 @@ URL url_http_open(char *name) p = name; if(strncmp(p, "http://", 7) == 0) p += 7; - for(q = p; *q && *q != ':' && *q != '/'; q++) - ; + if (p[0] == '[') + { + if (!(q = strchr(p, ']'))) + return NULL; + *q = '\0'; + ++p; + } else + for(q = p; *q && *q != ':' && *q != '/'; q++) + ; len = q - p; if(len >= sizeof(wwwserver) - 1) { /* What?? */ strcpy(wwwserver, "localhost"); @@ -158,8 +165,18 @@ URL url_http_open(char *name) memcpy(buff, name, n + 1); host = buff; - for(p = host; *p && *p != ':' && *p != '/'; p++) - ; + + if (host[0] == '[') + { + if (!(p = strchr(host, ']'))) + return NULL; + *p = '\0'; + ++host; + ++p; + } else + for(p = host; *p && *p != ':' && *p != '/'; p++) + ; + if(*p == ':') { char *pp; diff -up TiMidity++-2.13.2/interface/server_c.c.ipv6 TiMidity++-2.13.2/interface/server_c.c --- TiMidity++-2.13.2/interface/server_c.c.ipv6 2004-09-27 01:40:13.000000000 +0200 +++ TiMidity++-2.13.2/interface/server_c.c 2008-02-01 14:44:46.000000000 +0100 @@ -50,6 +50,7 @@ #include #include #include +#include #ifndef NO_STRING_H #include #else @@ -227,7 +228,7 @@ static double start_time; static int tmr_running; static int is_system_prefix = 0; -static struct sockaddr_in control_client; +static struct sockaddr_storage control_client; static double low_time_at = 0.3; static double high_time_at = 0.5; static FILE *outfp; @@ -294,34 +295,58 @@ static void ctl_event(CtlEvent *e) static int pasv_open(int *port) { - int sfd; - struct sockaddr_in server; + int sfd, s; + struct sockaddr_storage server; + struct addrinfo hints, *result, *rp; + char service[NI_MAXSERV]; - if((sfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_PASSIVE; + + sprintf(service, "%d", *port); + + s = getaddrinfo(NULL, service, &hints, &result); + if (s) { - perror("socket"); - return -1; + fprintf(stderr, "getaddrinfo ", gai_strerror(s)); + return -1; } - memset(&server, 0, sizeof(server)); - server.sin_port = htons(*port); - server.sin_family = AF_INET; - server.sin_addr.s_addr = htonl(INADDR_ANY); + for (rp = result; rp != NULL; rp = rp->ai_next) + { + sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + + if (sfd == -1) + continue; #ifdef SO_REUSEADDR - { - int on = 1; - setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (caddr_t)&on, sizeof(on)); - } + { + int on = 1; + setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (caddr_t)&on, sizeof(on)); + } #endif /* SO_REUSEADDR */ - ctl.cmsg(CMSG_INFO, VERB_DEBUG, "Bind TCP/IP port=%d", *port); - if(bind(sfd, (struct sockaddr *)&server, sizeof(server)) < 0) + ctl.cmsg(CMSG_INFO, VERB_DEBUG, "Bind TCP/IP port=%d", *port); + if (bind(sfd, rp->ai_addr, rp->ai_addrlen) != 0) { + perror("bind"); + close(sfd); + } else + break; + + close(sfd); + } + + if (rp == NULL) { - perror("bind"); - close(sfd); - return -1; + fprintf(stderr, "Could not bind\n"); + freeaddrinfo(result); + return -1; } + + freeaddrinfo(result); + if(*port == 0) { int len = sizeof(server); @@ -331,7 +356,17 @@ static int pasv_open(int *port) close(sfd); return -1; } - *port = ntohs(server.sin_port); + + /* Not quite protocol independent */ + switch (((struct sockaddr *) &server)->sa_family) + { + case AF_INET: + *port = ntohs(((struct sockaddr_in *) &server)->sin_port); + break; + case AF_INET6: + *port = ntohs(((struct sockaddr_in6 *) &server)->sin6_port); + break; + } } /* Set it up to wait for connections. */ @@ -847,7 +882,7 @@ static int cmd_help(int argc, char **arg static int cmd_open(int argc, char **argv) { int sock; - struct sockaddr_in in; + struct sockaddr_storage in; int addrlen; int port; @@ -881,8 +916,20 @@ static int cmd_open(int argc, char **arg } close(sock); - if(control_client.sin_addr.s_addr != in.sin_addr.s_addr) - return send_status(513, "Security violation: Address mismatch"); + /* Not quite protocol independent */ + switch (((struct sockaddr *) &control_client)->sa_family) + { + case AF_INET: + if (((struct sockaddr_in *) &control_client)->sin_addr.s_addr != + ((struct sockaddr_in *) &in)->sin_addr.s_addr) + return send_status(513, "Security violation: Address mismatch"); + break; + case AF_INET6: + if (((struct sockaddr_in6 *) &control_client)->sin6_addr.s6_addr != + ((struct sockaddr_in6 *) &in)->sin6_addr.s6_addr) + return send_status(513, "Security violation: Address mismatch"); + break; + } send_status(200, "Ready data connection"); data_buffer_len = 0; diff -up TiMidity++-2.13.2/timidity/timidity.c.ipv6 TiMidity++-2.13.2/timidity/timidity.c --- TiMidity++-2.13.2/timidity/timidity.c.ipv6 2008-02-01 15:07:26.000000000 +0100 +++ TiMidity++-2.13.2/timidity/timidity.c 2008-02-01 15:03:32.000000000 +0100 @@ -1489,6 +1489,8 @@ MAIN_INTERFACE int read_config_file(char /* #extension HTTPproxy hostname:port */ else if(strcmp(w[0], "HTTPproxy") == 0) { + char r_bracket, l_bracket; + if(words < 2) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, @@ -1500,7 +1502,7 @@ MAIN_INTERFACE int read_config_file(char /* If network is not supported, this extension is ignored. */ #ifdef SUPPORT_SOCKET url_http_proxy_host = safe_strdup(w[1]); - if((cp = strchr(url_http_proxy_host, ':')) == NULL) + if((cp = strrchr(url_http_proxy_host, ':')) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: line %d: Syntax error", name, line); @@ -1516,11 +1518,30 @@ MAIN_INTERFACE int read_config_file(char CHECKERRLIMIT; continue; } + + l_bracket = url_http_proxy_host[0]; + r_bracket = url_http_proxy_host[strlen(url_http_proxy_host) - 1]; + + if (l_bracket == '[' || r_bracket == ']') + { + if (l_bracket != '[' || r_bracket != ']') + { + ctl->cmsg(CMSG_ERROR, VERB_NORMAL, + "%s: line %d: Malformed IPv6 address", + name, line); + CHECKERRLIMIT; + continue; + } + url_http_proxy_host++; + url_http_proxy_host[strlen(url_http_proxy_host) - 1] = '\0'; + } #endif } /* #extension FTPproxy hostname:port */ else if(strcmp(w[0], "FTPproxy") == 0) { + char l_bracket, r_bracket; + if(words < 2) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, @@ -1532,7 +1553,7 @@ MAIN_INTERFACE int read_config_file(char /* If network is not supported, this extension is ignored. */ #ifdef SUPPORT_SOCKET url_ftp_proxy_host = safe_strdup(w[1]); - if((cp = strchr(url_ftp_proxy_host, ':')) == NULL) + if((cp = strrchr(url_ftp_proxy_host, ':')) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: line %d: Syntax error", name, line); @@ -1548,6 +1569,23 @@ MAIN_INTERFACE int read_config_file(char CHECKERRLIMIT; continue; } + + l_bracket = url_ftp_proxy_host[0]; + r_bracket = url_ftp_proxy_host[strlen(url_ftp_proxy_host) - 1]; + + if (l_bracket == '[' || r_bracket == ']') + { + if (l_bracket != '[' || r_bracket != ']') + { + ctl->cmsg(CMSG_ERROR, VERB_NORMAL, + "%s: line %d: Malformed IPv6 address", + name, line); + CHECKERRLIMIT; + continue; + } + url_ftp_proxy_host++; + url_ftp_proxy_host[strlen(url_ftp_proxy_host) - 1] = '\0'; + } #endif } /* #extension mailaddr somebody at someware.domain.com */ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/timidity++/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Feb 2005 17:40:56 -0000 1.7 +++ .cvsignore 4 Mar 2008 21:27:09 -0000 1.8 @@ -1,5 +1 @@ -TiMidity++-2.13.0.tar.bz2 -britepno.pat.bz2 -instruments.tar.bz2 -pistol.pat.bz2 TiMidity++-2.13.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/timidity++/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Feb 2005 17:40:56 -0000 1.7 +++ sources 4 Mar 2008 21:27:09 -0000 1.8 @@ -1,4 +1 @@ -324e265362f812883024b58cf3470d1a britepno.pat.bz2 -3ff4264e611f89094a47940e4988ae81 instruments.tar.bz2 -f961325db679de6e0ea402ebe6a268f9 pistol.pat.bz2 a82ceeb2245e22f4de2b41da21eaee32 TiMidity++-2.13.2.tar.bz2 Index: timidity++.spec =================================================================== RCS file: /cvs/extras/rpms/timidity++/F-8/timidity++.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- timidity++.spec 11 Dec 2007 10:31:27 -0000 1.19 +++ timidity++.spec 4 Mar 2008 21:27:09 -0000 1.20 @@ -1,16 +1,11 @@ Summary: A software wavetable MIDI synthesizer Name: timidity++ Version: 2.13.2 -Release: 6%{?dist} +Release: 13%{?dist} Group: Applications/Multimedia Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2 -Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2 -Source2: timidity.cfg -Source3: http://www.stardate.bc.ca/eawpatches/eawpats/britepno.pat.bz2 -Source4: http://www.stardate.bc.ca/eawpatches/eawpats/pistol.pat.bz2 -Source5: fedora-timidity.desktop +Source1: fedora-timidity.desktop URL: http://timidity.sourceforge.net -Patch: TiMidity++-2.13.0-redhat.patch Patch3: TiMidity++-2.13.0-detect.patch Patch5: TiMidity++-2.13.0-64bit.patch Patch6: TiMidity++-2.13.0-warnings.patch @@ -22,17 +17,20 @@ Patch11: TiMidity++-2.13.2-misc-fixes.patch Patch12: TiMidity++-2.13.2-mlutil.patch Patch13: TiMidity++-2.13.2-flac.patch +# end Debian patches +Patch14: TiMidity++-2.13.2-ipv6.patch +Patch15: TiMidity++-2.13.2-dynlibroot.patch +Patch16: TiMidity++-2.13.2-cfgfile-name.patch License: GPLv2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: timidity++-X11 BuildRequires: arts-devel esound-devel alsa-lib-devel ncurses-devel gtk2-devel BuildRequires: libao-devel libvorbis-devel flac-devel speex-devel %ifnarch ppc64 BuildRequires: jack-audio-connection-kit-devel %endif BuildRequires: desktop-file-utils -Requires: %{name}-patches = %{version}-%{release}, hicolor-icon-theme +Requires: PersonalCopy-Lite-soundfont hicolor-icon-theme %description TiMidity++ is a MIDI format to wave table format converter and @@ -40,21 +38,8 @@ sound card does not natively support wave table format. -%package patches -Summary: Instrument (patch) files for %{name} -Group: Applications/Multimedia - -%description patches -This package contains samples of instruments (called patches) for use in -wavetable midi synthesizers like %{name}. These patches are in the Gravis -Ultasound .pat format and can be used by any wavetable midi synthesizer which -understands this format. - - %prep %setup -q -n TiMidity++-%{version} -# Put config files etc. to sane locations -%patch -p1 -b .redhat # Autodetect whether we should use aRts, esd, or neither %patch3 -p1 -b .detect # fix for x86_64 and s390x @@ -67,41 +52,38 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 %build -export EXTRACFLAGS="$RPM_OPT_FLAGS" +export EXTRACFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure --enable-dynamic --disable-dependency-tracking \ - --enable-interface=ncurses,vt100,alsaseq,server,network,gtk \ + --enable-interface=ncurses,vt100,alsaseq,server,network,gtk \ %ifnarch ppc64 - --enable-audio=oss,arts,alsa,esd,ao,jack,vorbis,speex,flac + --enable-audio=oss,arts,alsa,esd,ao,jack,vorbis,speex,flac %else - --enable-audio=oss,arts,alsa,esd,ao,vorbis,speex,flac + --enable-audio=oss,arts,alsa,esd,ao,vorbis,speex,flac %endif -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT - make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/timidity $RPM_BUILD_ROOT/etc -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/timidity.cfg -ln -s /etc/timidity.cfg $RPM_BUILD_ROOT%{_datadir}/timidity/timidity.cfg -pushd $RPM_BUILD_ROOT%{_datadir}/timidity -tar xvjf %{SOURCE1} -bzip2 -dck %{SOURCE3} >instruments/britepno.pat -bzip2 -dck %{SOURCE4} >instruments/pistol.pat -popd +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} +echo "soundfont %{_datadir}/soundfonts/PCLite.sf2" > \ + $RPM_BUILD_ROOT/%{_sysconfdir}/timidity++.cfg mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE5} + %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -install -m 644 interface/pixmaps/timidity.xpm \ +install -p -m 644 interface/pixmaps/timidity.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/timidity.xpm @@ -126,18 +108,58 @@ %files %defattr(-,root,root,-) +%doc AUTHORS COPYING README NEWS ChangeLog +%config(noreplace) %{_sysconfdir}/timidity++.cfg %{_bindir}/* %{_mandir}/*/* %{_datadir}/applications/fedora-timidity.desktop %{_datadir}/icons/hicolor/48x48/apps/timidity.xpm -%files patches -%defattr(-,root,root,-) -%config(noreplace) /etc/timidity.cfg -%{_datadir}/timidity - %changelog +* Mon Mar 3 2008 Hans de Goede 2.13.2-13 +- Merge review fixes (bz 226492) + - merge patch0 into patch16, drop patch0 + - Make License tag just GPLv2 + - Unify macros usage + +* Thu Feb 28 2008 Hans de Goede 2.13.2-12 +- Stop shipping a timidity++-patches package, investigation into the license + of the included patches has turned up doubts about the rights of the author + of the midas SGI midi player to release these into the Public Domain +- Instead require PersonalCopy-Lite-soundfont, and point to PCLite.sf2 in + timidity++.cfg +- Note PersonalCopy-Lite-soundfont also has a PersonalCopy-Lite-patches + sub-package with the .sf2 file converted to GUS patch format for other + applications who require timidity++-patches to get GUS format patches, this + package contains an /etc/timidity.cfg file pointing to the gus patches, + therefor the timidity++ package now ships a timidty++.cfg instead of a + timidity.cfg +- Check for /etc/timidity++.cfg before trying /etc/timidity.cfg, see above for + rationale + +* Thu Feb 21 2008 Jindrich Novy 2.13.2-11 +- rebuild + +* Thu Feb 21 2008 Jindrich Novy 2.13.2-10 +- don't free a constant string if -d is specified (#433756), + thanks to Andrew Bartlett + +* Wed Feb 20 2008 Hans de Goede 2.13.2-9 +- Add IPv6 support, patch by Milan Zazrivec (bz 198467) + +* Tue Feb 19 2008 Fedora Release Engineering - 2.13.2-8 +- Autorebuild for GCC 4.3 + +* Thu Jan 24 2008 Jindrich Novy 2.13.2-7 +- merge review fixes, thanks to Mamoru Tasaka: (#226492) + - update License tag (still unclear what to do with GUS patches) + - remove useless unversioned obsolete timidity++-X11 + - substitute /etc with %%{_sysconfdir} + - enable parallel build + - preserve timestamps, tar unpacking is no more verbose + - add docs + * Tue Dec 11 2007 Hans de Goede 2.13.2-6 - Disable building of the jack output on powerpc64, as that mysteriously fails to build there. --- TiMidity++-2.13.0-redhat.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 21:32:59 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 4 Mar 2008 21:32:59 GMT Subject: rpms/gstreamer-plugins-base/devel gstpb-0.10.15-cd-speed.patch, NONE, 1.1 gstreamer-plugins-base.spec, 1.47, 1.48 Message-ID: <200803042132.m24LWxnq016217@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16124 Modified Files: gstreamer-plugins-base.spec Added Files: gstpb-0.10.15-cd-speed.patch Log Message: * Tue Mar 04 2008 Adam Jackson 0.10.17.2-3 - gstpb-0.10.15-cd-speed.patch: Set default CD read speed to something sensible. (#431178) - s/Fedora Core/Fedora/ - Don't even bother building static libs. gstpb-0.10.15-cd-speed.patch: --- NEW FILE gstpb-0.10.15-cd-speed.patch --- --- gst-plugins-base-0.10.15/ext/cdparanoia/gstcdparanoiasrc.c_orig 2008-02-02 21:22:47.000000000 +0100 +++ gst-plugins-base-0.10.15/ext/cdparanoia/gstcdparanoiasrc.c 2008-02-02 21:23:23.000000000 +0100 @@ -46,7 +46,7 @@ PROP_GENERIC_DEVICE }; -#define DEFAULT_READ_SPEED -1 +#define DEFAULT_READ_SPEED 4 /* avoid mad spinning ad noise */ #define DEFAULT_SEARCH_OVERLAP -1 #define DEFAULT_PARANOIA_MODE PARANOIA_MODE_FRAGMENT #define DEFAULT_GENERIC_DEVICE NULL Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gstreamer-plugins-base.spec 4 Mar 2008 02:55:07 -0000 1.47 +++ gstreamer-plugins-base.spec 4 Mar 2008 21:32:04 -0000 1.48 @@ -5,7 +5,7 @@ Name: %{gstreamer}-plugins-base Version: 0.10.17.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GStreamer streaming media framework base plug-ins Group: Applications/Multimedia @@ -14,6 +14,8 @@ Source: http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: gstpb-0.10.15-cd-speed.patch + Requires: %{gstreamer} >= %{_gst} Requires: liboil >= 0.3.12-9 BuildRequires: %{gstreamer}-devel >= %{_gst} @@ -49,13 +51,15 @@ %prep %setup -q -n gst-plugins-base-%{version} +%patch0 -p1 -b .cd-speed %build %configure \ - --with-package-name='Fedora Core gstreamer-plugins-base package' \ + --with-package-name='Fedora gstreamer-plugins-base package' \ --with-package-origin='http://download.fedora.redhat.com/fedora' \ --disable-gtk-doc \ - --enable-experimental + --enable-experimental \ + --disable-static make %{?_smp_mflags} ERROR_CFLAGS="" @@ -242,6 +246,12 @@ %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Tue Mar 04 2008 Adam Jackson 0.10.17.2-3 +- gstpb-0.10.15-cd-speed.patch: Set default CD read speed to something + sensible. (#431178) +- s/Fedora Core/Fedora/ +- Don't even bother building static libs. + * Tue Mar 04 2008 - Bastien Nocera - 0.10.17.2-2 - Enable the GIO plugin From fedora-extras-commits at redhat.com Tue Mar 4 21:33:12 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 4 Mar 2008 21:33:12 GMT Subject: rpms/timidity++/F-7 TiMidity++-2.13.2-cfgfile-name.patch, NONE, 1.1 TiMidity++-2.13.2-dynlibroot.patch, NONE, 1.1 TiMidity++-2.13.2-flac-detect.patch, NONE, 1.1 TiMidity++-2.13.2-flac.patch, NONE, 1.1 TiMidity++-2.13.2-ipv6.patch, NONE, 1.1 TiMidity++-2.13.2-libao-first.patch, NONE, 1.1 TiMidity++-2.13.2-man-pages.patch, NONE, 1.1 TiMidity++-2.13.2-misc-fixes.patch, NONE, 1.1 TiMidity++-2.13.2-mlutil.patch, NONE, 1.1 TiMidity++-2.13.2-speex.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 timidity++.spec, 1.14, 1.15 TiMidity++-2.13.0-redhat.patch, 1.1, NONE Message-ID: <200803042133.m24LXCnj016258@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/timidity++/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16154 Modified Files: .cvsignore sources timidity++.spec Added Files: TiMidity++-2.13.2-cfgfile-name.patch TiMidity++-2.13.2-dynlibroot.patch TiMidity++-2.13.2-flac-detect.patch TiMidity++-2.13.2-flac.patch TiMidity++-2.13.2-ipv6.patch TiMidity++-2.13.2-libao-first.patch TiMidity++-2.13.2-man-pages.patch TiMidity++-2.13.2-misc-fixes.patch TiMidity++-2.13.2-mlutil.patch TiMidity++-2.13.2-speex.patch Removed Files: TiMidity++-2.13.0-redhat.patch Log Message: * Mon Mar 3 2008 Hans de Goede 2.13.2-13 - Merge review fixes (bz 226492) - merge patch0 into patch16, drop patch0 - Make License tag just GPLv2 - Unify macros usage TiMidity++-2.13.2-cfgfile-name.patch: --- NEW FILE TiMidity++-2.13.2-cfgfile-name.patch --- diff -up TiMidity++-2.13.2/timidity/timidity.c~ TiMidity++-2.13.2/timidity/timidity.c --- TiMidity++-2.13.2/timidity/timidity.c~ 2008-02-28 13:25:00.000000000 +0100 +++ TiMidity++-2.13.2/timidity/timidity.c 2008-02-28 13:25:00.000000000 +0100 @@ -5170,7 +5170,9 @@ MAIN_INTERFACE int timidity_pre_load_con #else /* UNIX */ - if(!read_config_file(CONFIG_FILE, 0)) + if(!read_config_file(CONFIG_FILE1, 0)) + got_a_configuration = 1; + else if(!read_config_file(CONFIG_FILE2, 0)) got_a_configuration = 1; #endif @@ -5240,7 +5240,9 @@ MAIN_INTERFACE int timidity_post_load_co if(!got_a_configuration) { - if(try_config_again && !read_config_file(CONFIG_FILE, 0)) + if(try_config_again && !read_config_file(CONFIG_FILE1, 0)) + got_a_configuration = 1; + else if(try_config_again && !read_config_file(CONFIG_FILE2, 0)) got_a_configuration = 1; } @@ -5695,7 +5697,7 @@ int main(int argc, char **argv) #else ctl->cmsg(CMSG_FATAL, VERB_NORMAL, "%s: Error reading configuration file.\nPlease check " - CONFIG_FILE, program_name); + CONFIG_FILE1 " or " CONFIG_FILE2, program_name); #endif /* __W32__ */ } else diff -up TiMidity++-2.13.2/timidity/timidity.h~ TiMidity++-2.13.2/timidity/timidity.h --- TiMidity++-2.13.2/timidity/timidity.h~ 2008-02-28 13:19:29.000000000 +0100 +++ TiMidity++-2.13.2/timidity/timidity.h 2008-02-28 13:19:29.000000000 +0100 @@ -41,14 +41,8 @@ /* You could specify a complete path, e.g. "/etc/timidity.cfg", and then specify the library directory in the configuration file. */ -/* #define CONFIG_FILE "/etc/timidity.cfg" */ -#ifndef CONFIG_FILE -# ifdef DEFAULT_PATH -# define CONFIG_FILE DEFAULT_PATH "/timidity.cfg" -# else -# define CONFIG_FILE PKGDATADIR "/timidity.cfg" -# endif /* DEFAULT_PATH */ -#endif /* CONFIG_FILE */ +#define CONFIG_FILE1 "/etc/timidity++.cfg" +#define CONFIG_FILE2 "/etc/timidity.cfg" /* Filename extension, followed by command to run decompressor so that TiMidity++-2.13.2-dynlibroot.patch: --- NEW FILE TiMidity++-2.13.2-dynlibroot.patch --- diff -up TiMidity++-2.13.2/timidity/timidity.c.dynlibroot TiMidity++-2.13.2/timidity/timidity.c --- TiMidity++-2.13.2/timidity/timidity.c.dynlibroot 2008-02-21 12:41:09.000000000 +0100 +++ TiMidity++-2.13.2/timidity/timidity.c 2008-02-21 12:49:55.000000000 +0100 @@ -554,7 +554,7 @@ MAIN_INTERFACE struct URL_module *url_mo #ifndef SHARED_LIB_PATH #define SHARED_LIB_PATH PKGLIBDIR #endif /* SHARED_LIB_PATH */ -static char *dynamic_lib_root = SHARED_LIB_PATH; +static char *dynamic_lib_root = NULL; #endif /* IA_DYNAMIC */ #ifndef MAXPATHLEN @@ -2970,8 +2970,7 @@ static inline int parse_opt_d(const char { /* dynamic lib root */ #ifdef IA_DYNAMIC - if (dynamic_lib_root) - free(dynamic_lib_root); + free(dynamic_lib_root); dynamic_lib_root = safe_strdup(arg); return 0; #else @@ -3893,6 +3892,8 @@ static inline int parse_opt_h(const char cmp->id_character, cmp->id_name); #endif /* IA_DYNAMIC */ #ifdef IA_DYNAMIC + if (!dynamic_lib_root) + dynamic_lib_root = safe_strdup(SHARED_LIB_PATH); fprintf(fp, "Supported dynamic load interfaces (%s):" NLS, dynamic_lib_root); memset(mark, 0, sizeof(mark)); @@ -3997,6 +3998,8 @@ static inline char *dynamic_interface_in int fd, n; char *nl; + if (!dynamic_lib_root) + dynamic_lib_root = safe_strdup(SHARED_LIB_PATH); sprintf(libinfo, "%s" PATH_STRING "interface_%c.txt", dynamic_lib_root, id); if ((fd = open(libinfo, 0)) < 0) @@ -4021,6 +4024,8 @@ char *dynamic_interface_module(int id) static char shared_library[MAXPATHLEN]; int fd; + if (!dynamic_lib_root) + dynamic_lib_root = safe_strdup(SHARED_LIB_PATH); sprintf(shared_library, "%s" PATH_STRING "interface_%c%s", dynamic_lib_root, id, SHARED_LIB_EXT); if ((fd = open(shared_library, 0)) < 0) TiMidity++-2.13.2-flac-detect.patch: --- NEW FILE TiMidity++-2.13.2-flac-detect.patch --- diff -up TiMidity++-2.13.2/configure.in~ TiMidity++-2.13.2/configure.in --- TiMidity++-2.13.2/configure.in~ 2007-12-10 00:26:48.000000000 +0100 +++ TiMidity++-2.13.2/configure.in 2007-12-10 00:26:48.000000000 +0100 @@ -1212,15 +1212,10 @@ else AC_MSG_RESULT([yes, configuring flac]) SYSEXTRAS="$SYSEXTRAS flac_a.c" AM_PATH_LIBFLAC([ - EXTRADEFS="$EXTRADEFS -DAU_FLAC" + EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_OGGFLAC" EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS) LIBS="$LIBS $LIBFLAC_LIBS" ]) - AM_PATH_LIBOGGFLAC([ - EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC" - EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS) - LIBS="$LIBS $LIBOGGFLAC_LIBS" - ]) else AC_MSG_RESULT(no) fi diff -up TiMidity++-2.13.2/configure~ TiMidity++-2.13.2/configure --- TiMidity++-2.13.2/configure~ 2007-12-10 00:26:47.000000000 +0100 +++ TiMidity++-2.13.2/configure 2007-12-10 00:26:47.000000000 +0100 @@ -14471,7 +14471,7 @@ fi echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - EXTRADEFS="$EXTRADEFS -DAU_FLAC" + EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_OGGFLAC" for f in $LIBFLAC_CFLAGS; do case ".$f" in .-I?*|.-D?*) CPPFLAGS="$CPPFLAGS $f" ;; @@ -14562,211 +14562,6 @@ rm -f conftest.err conftest.$ac_objext \ rm -f conf.libFLACtest -# Check whether --with-libOggFLAC or --without-libOggFLAC was given. -if test "${with_libOggFLAC+set}" = set; then - withval="$with_libOggFLAC" - libOggFLAC_prefix="$withval" -else - libOggFLAC_prefix="" -fi; - -# Check whether --with-libOggFLAC-libraries or --without-libOggFLAC-libraries was given. -if test "${with_libOggFLAC_libraries+set}" = set; then - withval="$with_libOggFLAC_libraries" - libOggFLAC_libraries="$withval" -else - libOggFLAC_libraries="" -fi; - -# Check whether --with-libOggFLAC-includes or --without-libOggFLAC-includes was given. -if test "${with_libOggFLAC_includes+set}" = set; then - withval="$with_libOggFLAC_includes" - libOggFLAC_includes="$withval" -else - libOggFLAC_includes="" -fi; -# Check whether --enable-libOggFLACtest or --disable-libOggFLACtest was given. -if test "${enable_libOggFLACtest+set}" = set; then - enableval="$enable_libOggFLACtest" - -else - enable_libOggFLACtest=yes -fi; - - if test "x$libOggFLAC_libraries" != "x" ; then - LIBOGGFLAC_LIBS="-L$libOggFLAC_libraries" - elif test "x$libOggFLAC_prefix" != "x" ; then - LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - LIBOGGFLAC_LIBS="-L$prefix/lib" - fi - - LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm" - - if test "x$libOggFLAC_includes" != "x" ; then - LIBOGGFLAC_CFLAGS="-I$libOggFLAC_includes" - elif test "x$libOggFLAC_prefix" != "x" ; then - LIBOGGFLAC_CFLAGS="-I$libOggFLAC_prefix/include" - elif test "$prefix" != "xNONE"; then - LIBOGGFLAC_CFLAGS="-I$prefix/include" - fi - - echo "$as_me:$LINENO: checking for libOggFLAC" >&5 -echo $ECHO_N "checking for libOggFLAC... $ECHO_C" >&6 - no_libOggFLAC="" - - - if test "x$enable_libOggFLACtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" - CXXFLAGS="$CXXFLAGS $LIBOGGFLAC_CFLAGS" - LIBS="$LIBS $LIBOGGFLAC_LIBS" - rm -f conf.libOggFLACtest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -#include -#include - -int main () -{ - system("touch conf.libOggFLACtest"); - return 0; -} - - -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -no_libOggFLAC=yes -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_libOggFLAC" = "x" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - - EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC" - for f in $LIBOGGFLAC_CFLAGS; do - case ".$f" in - .-I?*|.-D?*) CPPFLAGS="$CPPFLAGS $f" ;; - *) CFLAGS="$CPPFLAGS $f" ;; - esac -done - - LIBS="$LIBS $LIBOGGFLAC_LIBS" - - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - if test -f conf.libOggFLACtest ; then - : - else - echo "*** Could not run libOggFLAC test program, checking why..." - CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" - LIBS="$LIBS $LIBOGGFLAC_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding libOggFLAC or finding the wrong" - echo "*** version of libOggFLAC. If it is not finding libOggFLAC, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means libOggFLAC was incorrectly installed" - echo "*** or that you have moved libOggFLAC since it was installed. In the latter case, you" - echo "*** may want to edit the libOggFLAC-config script: $LIBOGGFLAC_CONFIG" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - LIBOGGFLAC_CFLAGS="" - LIBOGGFLAC_LIBS="" - : - fi - - - rm -f conf.libOggFLACtest - else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 TiMidity++-2.13.2-flac.patch: --- NEW FILE TiMidity++-2.13.2-flac.patch --- --- timidity-2.13.2.orig/timidity/flac_a.c +++ timidity-2.13.2/timidity/flac_a.c @@ -45,9 +45,6 @@ #endif #include -#ifdef AU_OGGFLAC -#include -#endif #ifdef AU_FLAC_DLL #include "w32_libFLAC_dll_g.h" @@ -78,11 +75,7 @@ DEFAULT_RATE, PE_SIGNED|PE_16BIT, PF_PCM_STREAM, -1, {0}, /* default: get all the buffer fragments you can */ -#ifndef AU_OGGFLAC - "FLAC", 'F', -#else "FLAC / OggFLAC", 'F', -#endif /* AU_OGGFLAC */ NULL, open_output, close_output, @@ -100,28 +93,22 @@ unsigned long out_bytes; union { FLAC__StreamEncoderState flac; - FLAC__SeekableStreamEncoderState s_flac; -#ifdef AU_OGGFLAC - OggFLAC__StreamEncoderState ogg; -#endif + FLAC__StreamEncoderState s_flac; + FLAC__StreamEncoderState ogg; } state; union { union { FLAC__StreamEncoder *stream; - FLAC__SeekableStreamEncoder *s_stream; + FLAC__StreamEncoder *s_stream; } flac; -#ifdef AU_OGGFLAC union { - OggFLAC__StreamEncoder *stream; + FLAC__StreamEncoder *stream; } ogg; -#endif } encoder; } FLAC_ctx; typedef struct { -#ifdef AU_OGGFLAC int isogg; -#endif int verify; int padding; int blocksize; @@ -138,9 +125,7 @@ /* default compress level is 5 */ FLAC_options flac_options = { -#ifdef AU_OGGFLAC 0, /* isogg */ -#endif 0, /* verify */ 4096, /* padding */ 4608, /* blocksize */ @@ -158,13 +143,11 @@ static long serial_number = 0; FLAC_ctx *flac_ctx = NULL; -#ifdef AU_OGGFLAC static FLAC__StreamEncoderWriteStatus -ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder, +ogg_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data); -#endif static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], @@ -174,13 +157,10 @@ const FLAC__StreamMetadata *metadata, void *client_data); static FLAC__StreamEncoderWriteStatus -flac_seekable_stream_encoder_write_callback(const FLAC__SeekableStreamEncoder *encoder, +flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data); -static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder, - const FLAC__StreamMetadata *metadata, - void *client_data); /* preset */ void flac_set_compression_level(int compression_level) @@ -278,12 +258,10 @@ { flac_options.verify = verify; } -#ifdef AU_OGGFLAC void flac_set_option_oggflac(int isogg) { flac_options.isogg = isogg; } -#endif static int flac_session_close() { @@ -295,19 +273,17 @@ dpm.fd = -1; if (ctx != NULL) { -#ifdef AU_OGGFLAC if (flac_options.isogg) { if (ctx->encoder.ogg.stream) { - OggFLAC__stream_encoder_finish(ctx->encoder.ogg.stream); - OggFLAC__stream_encoder_delete(ctx->encoder.ogg.stream); + FLAC__stream_encoder_finish(ctx->encoder.ogg.stream); + FLAC__stream_encoder_delete(ctx->encoder.ogg.stream); } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { if (ctx->encoder.flac.s_stream) { - FLAC__seekable_stream_encoder_finish(ctx->encoder.flac.s_stream); - FLAC__seekable_stream_encoder_delete(ctx->encoder.flac.s_stream); + FLAC__stream_encoder_finish(ctx->encoder.flac.s_stream); + FLAC__stream_encoder_delete(ctx->encoder.flac.s_stream); } } else @@ -371,17 +347,16 @@ metadata[num_metadata++] = &padding; } -#ifdef AU_OGGFLAC if (flac_options.isogg) { - if ((ctx->encoder.ogg.stream = OggFLAC__stream_encoder_new()) == NULL) { + if ((ctx->encoder.ogg.stream = FLAC__stream_encoder_new()) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create OggFLAC stream"); flac_session_close(); return -1; } - OggFLAC__stream_encoder_set_channels(ctx->encoder.ogg.stream, nch); + FLAC__stream_encoder_set_channels(ctx->encoder.ogg.stream, nch); /* 16bps only */ - OggFLAC__stream_encoder_set_bits_per_sample(ctx->encoder.ogg.stream, 16); + FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.ogg.stream, 16); /* set sequential number for serial */ serial_number++; @@ -389,9 +364,9 @@ srand(time(NULL)); serial_number = rand(); } - OggFLAC__stream_encoder_set_serial_number(ctx->encoder.ogg.stream, serial_number); + FLAC__stream_encoder_set_ogg_serial_number(ctx->encoder.ogg.stream, serial_number); - OggFLAC__stream_encoder_set_verify(ctx->encoder.ogg.stream, flac_options.verify); + FLAC__stream_encoder_set_verify(ctx->encoder.ogg.stream, flac_options.verify); if (!FLAC__format_sample_rate_is_valid(dpm.rate)) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d", @@ -399,53 +374,52 @@ flac_session_close(); return -1; } - OggFLAC__stream_encoder_set_sample_rate(ctx->encoder.ogg.stream, dpm.rate); + FLAC__stream_encoder_set_sample_rate(ctx->encoder.ogg.stream, dpm.rate); - OggFLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision); + FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision); /* expensive! */ - OggFLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision_search); + FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision_search); if (nch == 2) { - OggFLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.mid_side); - OggFLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.adaptive_mid_side); + FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.mid_side); + FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.adaptive_mid_side); } - OggFLAC__stream_encoder_set_max_lpc_order(ctx->encoder.ogg.stream, flac_options.max_lpc_order); - OggFLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.ogg.stream, flac_options.min_residual_partition_order); - OggFLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.ogg.stream, flac_options.max_residual_partition_order); - - OggFLAC__stream_encoder_set_blocksize(ctx->encoder.ogg.stream, flac_options.blocksize); + FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.ogg.stream, flac_options.max_lpc_order); + FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.ogg.stream, flac_options.min_residual_partition_order); + FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.ogg.stream, flac_options.max_residual_partition_order); - OggFLAC__stream_encoder_set_client_data(ctx->encoder.ogg.stream, ctx); + FLAC__stream_encoder_set_blocksize(ctx->encoder.ogg.stream, flac_options.blocksize); if (0 < num_metadata) - OggFLAC__stream_encoder_set_metadata(ctx->encoder.ogg.stream, metadata, num_metadata); - - /* set callback */ - OggFLAC__stream_encoder_set_write_callback(ctx->encoder.ogg.stream, ogg_stream_encoder_write_callback); + FLAC__stream_encoder_set_metadata(ctx->encoder.ogg.stream, metadata, num_metadata); - ctx->state.ogg = OggFLAC__stream_encoder_init(ctx->encoder.ogg.stream); - if (ctx->state.ogg != OggFLAC__STREAM_ENCODER_OK) { + ctx->state.ogg = FLAC__stream_encoder_init_ogg_stream(ctx->encoder.ogg.stream, + 0, + ogg_stream_encoder_write_callback, + 0, 0, 0, + ctx); + if (ctx->state.ogg != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create OggFLAC state (%s)", - OggFLAC__StreamEncoderStateString[ctx->state.ogg]); + FLAC__StreamEncoderStateString[ctx->state.ogg]); flac_session_close(); return -1; } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { - if ((ctx->encoder.flac.s_stream = FLAC__seekable_stream_encoder_new()) == NULL) { + /* FLAC SEEKABLE STREAM */ + if ((ctx->encoder.flac.s_stream = FLAC__stream_encoder_new()) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream"); flac_session_close(); return -1; } - FLAC__seekable_stream_encoder_set_channels(ctx->encoder.flac.s_stream, nch); + FLAC__stream_encoder_set_channels(ctx->encoder.flac.s_stream, nch); /* 16bps only */ - FLAC__seekable_stream_encoder_set_bits_per_sample(ctx->encoder.flac.s_stream, 16); + FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.flac.s_stream, 16); - FLAC__seekable_stream_encoder_set_verify(ctx->encoder.flac.s_stream, flac_options.verify); + FLAC__stream_encoder_set_verify(ctx->encoder.flac.s_stream, flac_options.verify); if (!FLAC__format_sample_rate_is_valid(dpm.rate)) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d", @@ -453,44 +427,40 @@ flac_session_close(); return -1; } - FLAC__seekable_stream_encoder_set_sample_rate(ctx->encoder.flac.s_stream, dpm.rate); + FLAC__stream_encoder_set_sample_rate(ctx->encoder.flac.s_stream, dpm.rate); - FLAC__seekable_stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision); + FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision); /* expensive! */ - FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision_search); + FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision_search); if (nch == 2) { - FLAC__seekable_stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.mid_side); - FLAC__seekable_stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.adaptive_mid_side); + FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.mid_side); + FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.adaptive_mid_side); } - FLAC__seekable_stream_encoder_set_max_lpc_order(ctx->encoder.flac.s_stream, flac_options.max_lpc_order); - FLAC__seekable_stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.min_residual_partition_order); - FLAC__seekable_stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.max_residual_partition_order); + FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.flac.s_stream, flac_options.max_lpc_order); + FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.min_residual_partition_order); + FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.max_residual_partition_order); - FLAC__seekable_stream_encoder_set_blocksize(ctx->encoder.flac.s_stream, flac_options.blocksize); - FLAC__seekable_stream_encoder_set_client_data(ctx->encoder.flac.s_stream, ctx); + FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.s_stream, flac_options.blocksize); if (0 < num_metadata) - FLAC__seekable_stream_encoder_set_metadata(ctx->encoder.flac.s_stream, metadata, num_metadata); + FLAC__stream_encoder_set_metadata(ctx->encoder.flac.s_stream, metadata, num_metadata); - /* set callback */ -/* FLAC__seekable_stream_encoder_set_metadata_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_metadata_callback); /* */ -#ifndef __BORLANDC__ - FLAC__stream_encoder_set_metadata_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_metadata_callback); /* */ -#endif - FLAC__seekable_stream_encoder_set_write_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_write_callback); + ctx->state.s_flac = FLAC__stream_encoder_init_stream( + ctx->encoder.flac.s_stream, + flac_stream_encoder_write_callback, + 0, 0, 0, + ctx); - ctx->state.s_flac = FLAC__seekable_stream_encoder_init(ctx->encoder.flac.s_stream); - if (ctx->state.s_flac != FLAC__SEEKABLE_STREAM_ENCODER_OK) { + if (ctx->state.s_flac != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC state (%s)", - FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]); + FLAC__StreamEncoderStateString[ctx->state.s_flac]); flac_session_close(); return -1; } - } - else - { + } else { + /* NON SEEKABLE STREAM */ if ((ctx->encoder.flac.stream = FLAC__stream_encoder_new()) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream"); flac_session_close(); @@ -525,16 +495,16 @@ FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.stream, flac_options.max_residual_partition_order); FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.stream, flac_options.blocksize); - FLAC__stream_encoder_set_client_data(ctx->encoder.flac.stream, ctx); if (0 < num_metadata) FLAC__stream_encoder_set_metadata(ctx->encoder.flac.stream, metadata, num_metadata); - /* set callback */ - FLAC__stream_encoder_set_metadata_callback(ctx->encoder.flac.stream, flac_stream_encoder_metadata_callback); - FLAC__stream_encoder_set_write_callback(ctx->encoder.flac.stream, flac_stream_encoder_write_callback); - - ctx->state.flac = FLAC__stream_encoder_init(ctx->encoder.flac.stream); + ctx->state.flac = FLAC__stream_encoder_init_stream(ctx->encoder.flac.stream, + flac_stream_encoder_write_callback, + 0, + 0, + flac_stream_encoder_metadata_callback, + ctx); if (ctx->state.flac != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC state (%s)", FLAC__StreamEncoderStateString[ctx->state.flac]); @@ -550,7 +520,6 @@ { char *output_filename; -#ifdef AU_OGGFLAC if (flac_options.isogg) { #ifndef __W32G__ output_filename = create_auto_output_name(input_filename, "ogg", NULL, 0); @@ -559,7 +528,6 @@ #endif } else -#endif /* AU_OGGFLAC */ { #ifndef __W32G__ output_filename = create_auto_output_name(input_filename, "flac", NULL, 0); @@ -608,12 +576,10 @@ exclude_enc |= PE_BYTESWAP | PE_24BIT; dpm.encoding = validate_encoding(dpm.encoding, include_enc, exclude_enc); -#ifdef AU_OGGFLAC if (flac_options.isogg) { ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "*** cannot write back seekpoints when encoding to Ogg yet ***"); ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "*** and stream end will not be written. ***"); } -#endif #ifndef __W32G__ if(dpm.name == NULL) { @@ -638,9 +604,8 @@ return 0; } -#ifdef AU_OGGFLAC static FLAC__StreamEncoderWriteStatus -ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder, +ogg_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) @@ -654,7 +619,6 @@ else return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR; } -#endif static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], @@ -675,26 +639,6 @@ void *client_data) { } -static FLAC__StreamEncoderWriteStatus -flac_seekable_stream_encoder_write_callback(const FLAC__SeekableStreamEncoder *encoder, - const FLAC__byte buffer[], - unsigned bytes, unsigned samples, - unsigned current_frame, void *client_data) -{ - FLAC_ctx *ctx = (FLAC_ctx *)client_data; - - ctx->out_bytes += bytes; - - if (write(dpm.fd, buffer, bytes) == bytes) - return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; - else - return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR; -} -static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder, - const FLAC__StreamMetadata *metadata, - void *client_data) -{ -} static int output_data(char *buf, int32 nbytes) { @@ -723,21 +667,18 @@ oggbuf[i] = *s++; } -#ifdef AU_OGGFLAC if (flac_options.isogg) { - ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream); - if (ctx->state.ogg != OggFLAC__STREAM_ENCODER_OK) { - if (ctx->state.ogg == OggFLAC__STREAM_ENCODER_FLAC_STREAM_ENCODER_ERROR) { + ctx->state.ogg = FLAC__stream_encoder_get_state(ctx->encoder.ogg.stream); + if (ctx->state.ogg != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)", - FLAC__StreamDecoderStateString[OggFLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.ogg.stream)]); - } + FLAC__StreamEncoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.ogg.stream)]); ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode OggFLAC stream (%s)", - OggFLAC__StreamEncoderStateString[ctx->state.ogg]); + FLAC__StreamEncoderStateString[ctx->state.ogg]); flac_session_close(); return -1; } - if (!OggFLAC__stream_encoder_process_interleaved(ctx->encoder.ogg.stream, oggbuf, + if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.ogg.stream, oggbuf, nbytes / nch / 2)) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode OggFLAC stream"); flac_session_close(); @@ -745,24 +686,23 @@ } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { - ctx->state.s_flac = FLAC__seekable_stream_encoder_get_state(ctx->encoder.flac.s_stream); + ctx->state.s_flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.s_stream); if (ctx->state.s_flac != FLAC__STREAM_ENCODER_OK) { if (ctx->state.s_flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR | FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)", - FLAC__SeekableStreamDecoderStateString[FLAC__seekable_stream_encoder_get_verify_decoder_state(ctx->encoder.flac.s_stream)]); + FLAC__StreamDecoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.flac.s_stream)]); } else { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream (%s)", - FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]); + FLAC__StreamEncoderStateString[ctx->state.s_flac]); } flac_session_close(); return -1; } - if (!FLAC__seekable_stream_encoder_process_interleaved(ctx->encoder.flac.s_stream, oggbuf, + if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.flac.s_stream, oggbuf, nbytes / nch / 2 )) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream"); flac_session_close(); @@ -814,19 +754,17 @@ } if (flac_options.isogg) { -#ifdef AU_OGGFLAC - if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) { + if ((ctx->state.ogg = FLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "OggFLAC stream encoder is invalid (%s)", - OggFLAC__StreamEncoderStateString[ctx->state.ogg]); + FLAC__StreamEncoderStateString[ctx->state.ogg]); /* fall through */ } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { - if ((ctx->state.s_flac = FLAC__seekable_stream_encoder_get_state(ctx->encoder.flac.s_stream)) != FLAC__SEEKABLE_STREAM_ENCODER_OK) { + if ((ctx->state.s_flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.s_stream)) != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream encoder is invalid (%s)", - FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]); + FLAC__StreamEncoderStateString[ctx->state.s_flac]); /* fall through */ } } TiMidity++-2.13.2-ipv6.patch: --- NEW FILE TiMidity++-2.13.2-ipv6.patch --- diff -up TiMidity++-2.13.2/utils/net.c.ipv6 TiMidity++-2.13.2/utils/net.c --- TiMidity++-2.13.2/utils/net.c.ipv6 2002-07-19 02:46:14.000000000 +0200 +++ TiMidity++-2.13.2/utils/net.c 2008-02-01 14:44:46.000000000 +0100 @@ -58,7 +58,9 @@ SOCKET open_socket(char *host, unsigned short port) { SOCKET fd; - struct sockaddr_in in; + struct addrinfo hints, *result, *rp; + char service[NI_MAXSERV]; + int s; #if defined(WINSOCK) static int first = 1; @@ -69,27 +71,33 @@ SOCKET open_socket(char *host, unsigned } #endif - memset(&in, 0, sizeof(in)); - if((in.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) - { - struct hostent *hp; - if((hp = gethostbyname(host)) == NULL) - return (SOCKET)-1; - memcpy(&in.sin_addr, hp->h_addr, hp->h_length); - } - in.sin_port = htons(port); - in.sin_family = AF_INET; + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_ADDRCONFIG; + + snprintf(service, sizeof(service), "%d", port); - if((fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET) - return (SOCKET)-1; + s = getaddrinfo(host, service, &hints, &result); - if(connect(fd, (struct sockaddr *)&in, sizeof(in)) == SOCKET_ERROR) + if (s) + return (SOCKET)-1; + + for (rp = result; rp != NULL; rp = rp->ai_next) { - closesocket(fd); - return (SOCKET)-1; + fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + + if (fd != -1 && connect(fd, rp->ai_addr, rp->ai_addrlen) != -1) + break; + + if (fd != -1) { + close(fd); + fd = -1; + } } - return fd; + freeaddrinfo(result); + return (SOCKET) fd; } #if !defined(__W32__) || defined(__CYGWIN32__) diff -up TiMidity++-2.13.2/libarc/url_news.c.ipv6 TiMidity++-2.13.2/libarc/url_news.c --- TiMidity++-2.13.2/libarc/url_news.c.ipv6 2002-07-19 02:09:22.000000000 +0200 +++ TiMidity++-2.13.2/libarc/url_news.c 2008-02-01 14:44:46.000000000 +0100 @@ -288,8 +288,17 @@ URL url_news_open(char *name) buff[sizeof(buff) - 1] = '\0'; host = buff; - for(p = host; *p && *p != ':' && *p != '/'; p++) - ; + if (host[0] == '[') + { + if (!(p = strchr(host, ']'))) + return NULL; + *p = '\0'; + ++host; + ++p; + } else + for(p = host; *p && *p != ':' && *p != '/'; p++) + ; + if(*p == ':') { *p++ = '\0'; /* terminate `host' string */ diff -up TiMidity++-2.13.2/libarc/url_ftp.c.ipv6 TiMidity++-2.13.2/libarc/url_ftp.c --- TiMidity++-2.13.2/libarc/url_ftp.c.ipv6 2002-01-15 11:53:19.000000000 +0100 +++ TiMidity++-2.13.2/libarc/url_ftp.c 2008-02-01 14:44:46.000000000 +0100 @@ -234,6 +234,14 @@ URL url_ftp_open(char *name) *passwd++ = '\0'; } + if (host[0] == '[') + { + if (!(p = strchr(host, ']'))) + return NULL; + *p = '\0'; + ++host; + } + #ifdef DEBUG printf("open(host=`%s', port=`%d')\n", host, port); #endif /* DEBUG */ diff -up TiMidity++-2.13.2/libarc/url_http.c.ipv6 TiMidity++-2.13.2/libarc/url_http.c --- TiMidity++-2.13.2/libarc/url_http.c.ipv6 2002-01-15 11:53:19.000000000 +0100 +++ TiMidity++-2.13.2/libarc/url_http.c 2008-02-01 14:44:46.000000000 +0100 @@ -133,8 +133,15 @@ URL url_http_open(char *name) p = name; if(strncmp(p, "http://", 7) == 0) p += 7; - for(q = p; *q && *q != ':' && *q != '/'; q++) - ; + if (p[0] == '[') + { + if (!(q = strchr(p, ']'))) + return NULL; + *q = '\0'; + ++p; + } else + for(q = p; *q && *q != ':' && *q != '/'; q++) + ; len = q - p; if(len >= sizeof(wwwserver) - 1) { /* What?? */ strcpy(wwwserver, "localhost"); @@ -158,8 +165,18 @@ URL url_http_open(char *name) memcpy(buff, name, n + 1); host = buff; - for(p = host; *p && *p != ':' && *p != '/'; p++) - ; + + if (host[0] == '[') + { + if (!(p = strchr(host, ']'))) + return NULL; + *p = '\0'; + ++host; + ++p; + } else + for(p = host; *p && *p != ':' && *p != '/'; p++) + ; + if(*p == ':') { char *pp; diff -up TiMidity++-2.13.2/interface/server_c.c.ipv6 TiMidity++-2.13.2/interface/server_c.c --- TiMidity++-2.13.2/interface/server_c.c.ipv6 2004-09-27 01:40:13.000000000 +0200 +++ TiMidity++-2.13.2/interface/server_c.c 2008-02-01 14:44:46.000000000 +0100 @@ -50,6 +50,7 @@ #include #include #include +#include #ifndef NO_STRING_H #include #else @@ -227,7 +228,7 @@ static double start_time; static int tmr_running; static int is_system_prefix = 0; -static struct sockaddr_in control_client; +static struct sockaddr_storage control_client; static double low_time_at = 0.3; static double high_time_at = 0.5; static FILE *outfp; @@ -294,34 +295,58 @@ static void ctl_event(CtlEvent *e) static int pasv_open(int *port) { - int sfd; - struct sockaddr_in server; + int sfd, s; + struct sockaddr_storage server; + struct addrinfo hints, *result, *rp; + char service[NI_MAXSERV]; - if((sfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_PASSIVE; + + sprintf(service, "%d", *port); + + s = getaddrinfo(NULL, service, &hints, &result); + if (s) { - perror("socket"); - return -1; + fprintf(stderr, "getaddrinfo ", gai_strerror(s)); + return -1; } - memset(&server, 0, sizeof(server)); - server.sin_port = htons(*port); - server.sin_family = AF_INET; - server.sin_addr.s_addr = htonl(INADDR_ANY); + for (rp = result; rp != NULL; rp = rp->ai_next) + { + sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + + if (sfd == -1) + continue; #ifdef SO_REUSEADDR - { - int on = 1; - setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (caddr_t)&on, sizeof(on)); - } + { + int on = 1; + setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (caddr_t)&on, sizeof(on)); + } #endif /* SO_REUSEADDR */ - ctl.cmsg(CMSG_INFO, VERB_DEBUG, "Bind TCP/IP port=%d", *port); - if(bind(sfd, (struct sockaddr *)&server, sizeof(server)) < 0) + ctl.cmsg(CMSG_INFO, VERB_DEBUG, "Bind TCP/IP port=%d", *port); + if (bind(sfd, rp->ai_addr, rp->ai_addrlen) != 0) { + perror("bind"); + close(sfd); + } else + break; + + close(sfd); + } + + if (rp == NULL) { - perror("bind"); - close(sfd); - return -1; + fprintf(stderr, "Could not bind\n"); + freeaddrinfo(result); + return -1; } + + freeaddrinfo(result); + if(*port == 0) { int len = sizeof(server); @@ -331,7 +356,17 @@ static int pasv_open(int *port) close(sfd); return -1; } - *port = ntohs(server.sin_port); + + /* Not quite protocol independent */ + switch (((struct sockaddr *) &server)->sa_family) + { + case AF_INET: + *port = ntohs(((struct sockaddr_in *) &server)->sin_port); + break; + case AF_INET6: + *port = ntohs(((struct sockaddr_in6 *) &server)->sin6_port); + break; + } } /* Set it up to wait for connections. */ @@ -847,7 +882,7 @@ static int cmd_help(int argc, char **arg static int cmd_open(int argc, char **argv) { int sock; - struct sockaddr_in in; + struct sockaddr_storage in; int addrlen; int port; @@ -881,8 +916,20 @@ static int cmd_open(int argc, char **arg } close(sock); - if(control_client.sin_addr.s_addr != in.sin_addr.s_addr) - return send_status(513, "Security violation: Address mismatch"); + /* Not quite protocol independent */ + switch (((struct sockaddr *) &control_client)->sa_family) + { + case AF_INET: + if (((struct sockaddr_in *) &control_client)->sin_addr.s_addr != + ((struct sockaddr_in *) &in)->sin_addr.s_addr) + return send_status(513, "Security violation: Address mismatch"); + break; + case AF_INET6: + if (((struct sockaddr_in6 *) &control_client)->sin6_addr.s6_addr != + ((struct sockaddr_in6 *) &in)->sin6_addr.s6_addr) + return send_status(513, "Security violation: Address mismatch"); + break; + } send_status(200, "Ready data connection"); data_buffer_len = 0; diff -up TiMidity++-2.13.2/timidity/timidity.c.ipv6 TiMidity++-2.13.2/timidity/timidity.c --- TiMidity++-2.13.2/timidity/timidity.c.ipv6 2008-02-01 15:07:26.000000000 +0100 +++ TiMidity++-2.13.2/timidity/timidity.c 2008-02-01 15:03:32.000000000 +0100 @@ -1489,6 +1489,8 @@ MAIN_INTERFACE int read_config_file(char /* #extension HTTPproxy hostname:port */ else if(strcmp(w[0], "HTTPproxy") == 0) { + char r_bracket, l_bracket; + if(words < 2) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, @@ -1500,7 +1502,7 @@ MAIN_INTERFACE int read_config_file(char /* If network is not supported, this extension is ignored. */ #ifdef SUPPORT_SOCKET url_http_proxy_host = safe_strdup(w[1]); - if((cp = strchr(url_http_proxy_host, ':')) == NULL) + if((cp = strrchr(url_http_proxy_host, ':')) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: line %d: Syntax error", name, line); @@ -1516,11 +1518,30 @@ MAIN_INTERFACE int read_config_file(char CHECKERRLIMIT; continue; } + + l_bracket = url_http_proxy_host[0]; + r_bracket = url_http_proxy_host[strlen(url_http_proxy_host) - 1]; + + if (l_bracket == '[' || r_bracket == ']') + { + if (l_bracket != '[' || r_bracket != ']') + { + ctl->cmsg(CMSG_ERROR, VERB_NORMAL, + "%s: line %d: Malformed IPv6 address", + name, line); + CHECKERRLIMIT; + continue; + } + url_http_proxy_host++; + url_http_proxy_host[strlen(url_http_proxy_host) - 1] = '\0'; + } #endif } /* #extension FTPproxy hostname:port */ else if(strcmp(w[0], "FTPproxy") == 0) { + char l_bracket, r_bracket; + if(words < 2) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, @@ -1532,7 +1553,7 @@ MAIN_INTERFACE int read_config_file(char /* If network is not supported, this extension is ignored. */ #ifdef SUPPORT_SOCKET url_ftp_proxy_host = safe_strdup(w[1]); - if((cp = strchr(url_ftp_proxy_host, ':')) == NULL) + if((cp = strrchr(url_ftp_proxy_host, ':')) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: line %d: Syntax error", name, line); @@ -1548,6 +1569,23 @@ MAIN_INTERFACE int read_config_file(char CHECKERRLIMIT; continue; } + + l_bracket = url_ftp_proxy_host[0]; + r_bracket = url_ftp_proxy_host[strlen(url_ftp_proxy_host) - 1]; + + if (l_bracket == '[' || r_bracket == ']') + { + if (l_bracket != '[' || r_bracket != ']') + { + ctl->cmsg(CMSG_ERROR, VERB_NORMAL, + "%s: line %d: Malformed IPv6 address", + name, line); + CHECKERRLIMIT; + continue; + } + url_ftp_proxy_host++; + url_ftp_proxy_host[strlen(url_ftp_proxy_host) - 1] = '\0'; + } #endif } /* #extension mailaddr somebody at someware.domain.com */ TiMidity++-2.13.2-libao-first.patch: --- NEW FILE TiMidity++-2.13.2-libao-first.patch --- diff -up TiMidity++-2.13.2/timidity/output.c~ TiMidity++-2.13.2/timidity/output.c --- TiMidity++-2.13.2/timidity/output.c~ 2007-12-10 16:55:05.000000000 +0100 +++ TiMidity++-2.13.2/timidity/output.c 2007-12-10 16:55:05.000000000 +0100 @@ -133,6 +133,10 @@ extern PlayMode gogo_play_mode; extern PlayMode modmidi_play_mode; PlayMode *play_mode_list[] = { +#if defined(AU_AO) /* Try libao first as that will give us pulseaudio */ + &ao_play_mode, +#endif /* AU_AO */ + #if defined(AU_ARTS) &arts_play_mode, #endif /* AU_ARTS */ @@ -171,10 +175,6 @@ PlayMode *play_mode_list[] = { &nas_play_mode, #endif /* AU_NAS */ -#if defined(AU_AO) - &ao_play_mode, -#endif /* AU_PORTAUDIO */ - #ifndef __MACOS__ &wave_play_mode, &raw_play_mode, diff -ur TiMidity++-2.13.2/timidity/ao_a.c TiMidity++-2.13.2.new/timidity/ao_a.c --- TiMidity++-2.13.2/timidity/ao_a.c 2004-04-12 19:44:03.000000000 +0200 +++ TiMidity++-2.13.2.new/timidity/ao_a.c 2007-12-10 20:28:14.000000000 +0100 @@ -42,6 +42,7 @@ static void close_output(void); static int output_data(char *buf, int32 nbytes); static int acntl(int request, void *arg); +static int detect(void); /* export the playback mode */ @@ -56,7 +57,8 @@ open_output, close_output, output_data, - acntl + acntl, + detect }; static ao_device *ao_device_ctx; @@ -167,3 +169,29 @@ } return -1; } + +static int detect(void) +{ + int driver_id, result = 0; + ao_sample_format ao_sample_format_ctx; + ao_device *ao_device_ctx; + + ao_initialize(); + + /* Only succeed in autodetect mode when pulseaudio is available! */ + driver_id = ao_driver_id("pulse"); + + ao_sample_format_ctx.rate = 44100; + ao_sample_format_ctx.bits = 16; + ao_sample_format_ctx.channels = 2; + ao_sample_format_ctx.byte_format = AO_FMT_NATIVE; + + if ((ao_device_ctx = ao_open_live(driver_id, &ao_sample_format_ctx, NULL))) { + result = 1; + ao_close(ao_device_ctx); + } + + ao_shutdown(); + + return result; +} TiMidity++-2.13.2-man-pages.patch: --- NEW FILE TiMidity++-2.13.2-man-pages.patch --- --- timidity-2.13.2.orig/doc/C/timidity.1 +++ timidity-2.13.2/doc/C/timidity.1 @@ -199,7 +199,7 @@ .RE .TP .B \-a, \-\-[no\-]anti\-alias -Turns on antialiasing. Samples are run through a lowpass filter +Turns on anti-aliasing. Samples are run through a lowpass filter before playing, which reduces aliasing noise at low resampling frequencies. .TP @@ -269,7 +269,7 @@ Sets the system manufacturer ID to \fIHH\fP (where \fIHH\fP are two hex\-digits). .br -In this option, the manufacuture ID is set unchangable. Manufacuture +In this option, the manufacture ID is set unchangeable. Manufacture ID from the input file would be ignored. .TP .BI b n ", \-\-default\-bank=" n @@ -516,10 +516,10 @@ Launch \fBTiMidity++\fP as ALSA sequencer client. .TP .B \-iW -Windodws synthesizer interface +Windows synthesizer interface .TP .B \-iw -Windodws GUI interface +Windows GUI interface .TP .B \-iP PortMIDI synthesizer interface @@ -740,7 +740,7 @@ .B \-Oj JACK .TP -.B \-Or +.B \-OR aRts .TP .B \-OA @@ -1064,8 +1064,7 @@ \fBTiMidity++\fP Debug .RE .SH SEE ALSO -lsmidiprog(1), mididump(1), patinfo(1), sf2text(1), wav2pat(1), -timidity.cfg(5) +sf2text(1), timidity.cfg(5) .SH COPYRIGHT Copyright (C) 1999\-2004 Masanao Izumo .br --- timidity-2.13.2.orig/doc/C/timidity.cfg.5 +++ timidity-2.13.2/doc/C/timidity.cfg.5 @@ -4,7 +4,7 @@ .SH DESCRIPTION The file \fBtimidity.cfg\fP describes the runtime environments of timidity(1): that are the path of sound font, instruments -configurations or else. +configurations, etc. .br \fBTiMidity++\fP looks for the configuration file \fBtimidity.cfg\fP at startup, before processing any options. If it can't be accessed, @@ -30,7 +30,7 @@ ${variable} # same as $variable .sp For the moment, the command which newly defines variables is not -prepared. The undifined variable is transposed to null string. +prepared. The undefined variable is transposed to null string. .br The variable defined as a regular variable is the next only one. .TP @@ -89,13 +89,13 @@ .BI "bank " "[MapID1] number" Selects the tone bank to modify. Patch mappings that follow will affect this tone bank. You can indicate specific map as a target, by -specifing any ofthe following to \fIMapID1\fP: \fBgm2\fP, \fBsc55\fP, +specifying any of the following to \fIMapID1\fP: \fBgm2\fP, \fBsc55\fP, \fBsc88\fP, \fBsc88pro\fP, \fBsc8850\fP, \fBxg\fP and \fBxgsfx64\fP. .TP .BI "drumset " "[MapID2] number" Selects the drum set to modify. Patch mappings that follow will affect this drum set. You can indicate specific map as a target, by -specifing any ofthe following to \fIMapID2\fP: \fBgm2drum\fP, +specifying any ofthe following to \fIMapID2\fP: \fBgm2drum\fP, \fBsc55drum\fP, \fBsc88drum\fP, \fBsc88prodrum\fP, \fBsc8850drum\fP, \fBxgdrum\fP and \fBxgsfx126\fP. .TP @@ -363,7 +363,7 @@ .TP .BI "#extension timeout " "program second" Specifies the time\-out value of the \fIprogram\fP. If any notes -played with the tone number \fIprogram\fP are suspended more than +played with the tone number \fIprogram\fP are suspended for more than \fIsecond\fP seconds, \fBTiMidity++\fP kills the notes. .TP .BI "#extension copydrumset " drumset @@ -470,9 +470,7 @@ will read from the output of cat fild.mid. .SH FILES .TP -.B /etc/timidity.cfg -.TP -.B /usr/local/share/timidity/timidity.cfg +.B /etc/timidity/timidity.cfg .SH SEE ALSO timidity(1), lsmidiprog(1), mididump(1), patinfo(1), sf2text(1), wav2pat(1) .SH COPYRIGHT --- timidity-2.13.2.orig/doc/ja_JP.eucJP/timidity.1 +++ timidity-2.13.2/doc/ja_JP.eucJP/timidity.1 @@ -745,7 +745,7 @@ .B \-Oj JACK .TP -.B \-Or +.B \-OR aRts .TP .B \-OA --- timidity-2.13.2.orig/doc/ja_JP.eucJP/timidity.cfg.5 +++ timidity-2.13.2/doc/ja_JP.eucJP/timidity.cfg.5 @@ -466,8 +466,6 @@ .SH ???????? .TP .B /etc/timidity.cfg -.TP -.B /usr/local/share/timidity/timidity.cfg .SH ???????? timidity(1), lsmidiprog(1), mididump(1), patinfo(1), sf2text(1), wav2pat(1) .SH ?????? TiMidity++-2.13.2-misc-fixes.patch: --- NEW FILE TiMidity++-2.13.2-misc-fixes.patch --- --- timidity-2.13.2.orig/timidity/aq.c +++ timidity-2.13.2/timidity/aq.c @@ -87,7 +87,7 @@ /* effect.c */ extern void init_effect(void); -extern int do_effect(int32* buf, int32 count); +extern void do_effect(int32* buf, int32 count); int aq_calc_fragsize(void) { --- timidity-2.13.2.orig/timidity/common.c +++ timidity-2.13.2/timidity/common.c @@ -405,7 +411,8 @@ } /* First try the given name */ - strncpy(current_filename, url_unexpand_home_dir(name), 1023); + /* strncpy(current_filename, url_unexpand_home_dir(name), 1023); */ + strncpy(current_filename, name, 1023); current_filename[1023]='\0'; if(noise_mode) --- timidity-2.13.2.orig/timidity/mod2midi.c +++ timidity-2.13.2/timidity/mod2midi.c @@ -195,7 +195,8 @@ if (period < 14 || period > 13696) { - ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "BAD period %d\n", period); + ctl->cmsg(CMSG_WARNING, VERB_NOISY, "BAD period %d", period); + *finetune = 0; return -1; } @@ -266,11 +267,13 @@ return; new_noteon = period2note (ModV[v].period, &bend); + if (new_noteon >= 0) { #ifndef TRACE_SLIDE_NOTES - bend += (new_noteon - ModV[v].noteon) << 13; - new_noteon = ModV[v].noteon; + bend += (new_noteon - ModV[v].noteon) << 13; + new_noteon = ModV[v].noteon; #endif - bend = WHEEL_VALUE(bend); + bend = WHEEL_VALUE(bend); + } if (ModV[v].noteon != new_noteon) { @@ -278,7 +281,7 @@ if (new_noteon < 0) { - ctl->cmsg(CMSG_WARNING, VERB_VERBOSE, + ctl->cmsg(CMSG_WARNING, VERB_NOISY, "Strange period %d", ModV[v].period); return; @@ -330,13 +333,13 @@ Voice_Stop (v); new_noteon = period2note (ModV[v].period, &bend); - bend = WHEEL_VALUE(bend); if (new_noteon < 0) { - ctl->cmsg(CMSG_WARNING, VERB_VERBOSE, + ctl->cmsg(CMSG_WARNING, VERB_NOISY, "Strange period %d", ModV[v].period); return; } + bend = WHEEL_VALUE(bend); ModV[v].noteon = new_noteon; ModV[v].time = at; @@ -590,9 +593,13 @@ special_patch[i]->sample = sp = (Sample *)safe_malloc(sizeof(Sample)); memset(sp, 0, sizeof(Sample)); - strncpy(name, s->samplename, 22); - name[22] = '\0'; - code_convert(name, NULL, 23, NULL, "ASCII"); + memset(name, 0, 23 * sizeof(char)); + if (s->samplename != NULL) + { + strncpy(name, s->samplename, 22); + name[22] = '\0'; + code_convert(name, NULL, 23, NULL, "ASCII"); + } if(name[0] == '\0') special_patch[i]->name = NULL; else --- timidity-2.13.2.orig/timidity/reverb.c +++ timidity-2.13.2/timidity/reverb.c @@ -1624,8 +1624,8 @@ buf[i] += r; buf[++i] += l; - if (++index0 == buf_size) {index0 = 0;} - if (++buf_index == buf_size) {buf_index = 0;} + if (index0++ == buf_size) {index0 = 0;} + if (buf_index++ == buf_size) {buf_index = 0;} } memset(reverb_effect_buffer, 0, sizeof(int32) * count); info->index[0] = index0; --- timidity-2.13.2.orig/timidity/tables.c +++ timidity-2.13.2/timidity/tables.c @@ -1682,4 +1682,4 @@ 420.0, 416.0, 412.0, 408.0, 405.0, 401.0, 397.0, 394.0, 390.0, 387.0, 383.0, 380.0, 377.0, 374.0, 371.0, 368.0, 364.0, 361.0, 359.0, 356.0, 353.0, 350.0, 347.0, 345.0, -}; \ No newline at end of file +}; --- timidity-2.13.2.orig/timidity/timidity.c +++ timidity-2.13.2/timidity/timidity.c @@ -5466,14 +5446,14 @@ static int CoInitializeOK = 0; #endif -static inline bool directory_p(const char* path) +static inline int directory_p(const char* path) { #if defined ( IA_W32GUI ) || defined ( IA_W32G_SYN ) return is_directory(path); #else struct stat st; if(stat(path, &st) != -1) return S_ISDIR(st.st_mode); - return false; + return 0; #endif } @@ -5649,11 +5629,11 @@ } ctl->cmsg(CMSG_FATAL, VERB_NORMAL, - "%s: Can't read any configuration file.\nPlease check " + "%s: Error reading configuration file.\nPlease check " "%s or %s", program_name, config1, config2); #else ctl->cmsg(CMSG_FATAL, VERB_NORMAL, - "%s: Can't read any configuration file.\nPlease check " + "%s: Error reading configuration file.\nPlease check " CONFIG_FILE, program_name); #endif /* __W32__ */ } --- timidity-2.13.2.orig/timidity/wrd.h +++ timidity-2.13.2/timidity/wrd.h @@ -148,6 +148,7 @@ #endif #include #include "mblock.h" +#include "common.h" #include "controls.h" static inline void print_ecmd(char *cmd, int *args, int narg) { --- timidity-2.13.2.orig/timidity/wrd_read.c +++ timidity-2.13.2/timidity/wrd_read.c @@ -1765,7 +1765,10 @@ #ifdef ENABLE_SHERRY /*******************************************************************************/ +#if 0 +/* for mac only */ #pragma mark - +#endif static int sherry_started; /* 0 - before start command 0x01*/ /* 1 - after start command 0x01*/ TiMidity++-2.13.2-mlutil.patch: --- NEW FILE TiMidity++-2.13.2-mlutil.patch --- --- timidity-2.13.2.orig/libunimod/mlutil.c +++ timidity-2.13.2/libunimod/mlutil.c @@ -321,6 +321,7 @@ if (flags & UF_LINEAR) { period = lintab[period % 768] >> (period / 768); + if (period < 1) period = 1; period = (8363L * 1712L) / period; } TiMidity++-2.13.2-speex.patch: --- NEW FILE TiMidity++-2.13.2-speex.patch --- diff -up TiMidity++-2.13.2/configure~ TiMidity++-2.13.2/configure --- TiMidity++-2.13.2/configure~ 2007-12-10 13:22:49.000000000 +0100 +++ TiMidity++-2.13.2/configure 2007-12-10 13:22:49.000000000 +0100 @@ -14580,7 +14580,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include #include int diff -up TiMidity++-2.13.2/configure.in~ TiMidity++-2.13.2/configure.in --- TiMidity++-2.13.2/configure.in~ 2007-12-10 13:23:01.000000000 +0100 +++ TiMidity++-2.13.2/configure.in 2007-12-10 13:23:01.000000000 +0100 @@ -1225,7 +1225,7 @@ AC_MSG_CHECKING(enable_audio=speex) if test "x$au_enable_speex" = xyes; then AC_CACHE_VAL(have_speex, [AC_TRY_LINK([ - #include + #include #include ], [ diff -up TiMidity++-2.13.2/timidity/speex_a.c~ TiMidity++-2.13.2/timidity/speex_a.c --- TiMidity++-2.13.2/timidity/speex_a.c~ 2007-12-10 13:23:13.000000000 +0100 +++ TiMidity++-2.13.2/timidity/speex_a.c 2007-12-10 13:23:13.000000000 +0100 @@ -33,8 +33,8 @@ #include #endif -#include -#include +#include +#include #include #include "timidity.h" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/timidity++/F-7/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Feb 2005 17:40:56 -0000 1.7 +++ .cvsignore 4 Mar 2008 21:32:39 -0000 1.8 @@ -1,5 +1 @@ -TiMidity++-2.13.0.tar.bz2 -britepno.pat.bz2 -instruments.tar.bz2 -pistol.pat.bz2 TiMidity++-2.13.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/timidity++/F-7/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Feb 2005 17:40:56 -0000 1.7 +++ sources 4 Mar 2008 21:32:39 -0000 1.8 @@ -1,4 +1 @@ -324e265362f812883024b58cf3470d1a britepno.pat.bz2 -3ff4264e611f89094a47940e4988ae81 instruments.tar.bz2 -f961325db679de6e0ea402ebe6a268f9 pistol.pat.bz2 a82ceeb2245e22f4de2b41da21eaee32 TiMidity++-2.13.2.tar.bz2 Index: timidity++.spec =================================================================== RCS file: /cvs/extras/rpms/timidity++/F-7/timidity++.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- timidity++.spec 14 Oct 2007 20:01:35 -0000 1.14 +++ timidity++.spec 4 Mar 2008 21:32:39 -0000 1.15 @@ -1,25 +1,36 @@ Summary: A software wavetable MIDI synthesizer Name: timidity++ Version: 2.13.2 -Release: 4%{?dist} +Release: 13%{?dist} Group: Applications/Multimedia Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2 -Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2 -Source2: timidity.cfg -Source3: http://www.stardate.bc.ca/eawpatches/eawpats/britepno.pat.bz2 -Source4: http://www.stardate.bc.ca/eawpatches/eawpats/pistol.pat.bz2 -Source5: fedora-timidity.desktop +Source1: fedora-timidity.desktop URL: http://timidity.sourceforge.net -Patch: TiMidity++-2.13.0-redhat.patch Patch3: TiMidity++-2.13.0-detect.patch Patch5: TiMidity++-2.13.0-64bit.patch Patch6: TiMidity++-2.13.0-warnings.patch +Patch7: TiMidity++-2.13.2-flac-detect.patch +Patch8: TiMidity++-2.13.2-speex.patch +Patch9: TiMidity++-2.13.2-libao-first.patch +# The following patches are courtesy of Debian +Patch10: TiMidity++-2.13.2-man-pages.patch +Patch11: TiMidity++-2.13.2-misc-fixes.patch +Patch12: TiMidity++-2.13.2-mlutil.patch +Patch13: TiMidity++-2.13.2-flac.patch +# end Debian patches +Patch14: TiMidity++-2.13.2-ipv6.patch +Patch15: TiMidity++-2.13.2-dynlibroot.patch +Patch16: TiMidity++-2.13.2-cfgfile-name.patch + License: GPLv2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: timidity++-X11 BuildRequires: arts-devel esound-devel alsa-lib-devel ncurses-devel gtk2-devel +BuildRequires: libao-devel libvorbis-devel flac-devel speex-devel +%ifnarch ppc64 +BuildRequires: jack-audio-connection-kit-devel +%endif BuildRequires: desktop-file-utils -Requires: %{name}-patches = %{version}-%{release}, hicolor-icon-theme +Requires: PersonalCopy-Lite-soundfont hicolor-icon-theme %description TiMidity++ is a MIDI format to wave table format converter and @@ -27,58 +38,52 @@ sound card does not natively support wave table format. -%package patches -Summary: Instrument (patch) files for %{name} -Group: Applications/Multimedia - -%description patches -This package contains samples of instruments (called patches) for use in -wavetable midi synthesizers like %{name}. These patches are in the Gravis -Ultasound .pat format and can be used by any wavetable midi synthesizer which -understands this format. - - %prep %setup -q -n TiMidity++-%{version} -# Put config files etc. to sane locations -%patch -p1 -b .redhat # Autodetect whether we should use aRts, esd, or neither %patch3 -p1 -b .detect # fix for x86_64 and s390x %patch5 -p1 -b .64bit %patch6 -p1 -b .warnings +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 %build -export EXTRACFLAGS="$RPM_OPT_FLAGS" +export EXTRACFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure --enable-dynamic --disable-dependency-tracking \ - --enable-interface=ncurses,slang,vt100,alsaseq,server,network,gtk \ - --enable-audio=oss,arts,alsa,esd,vorbis \ - --enable-gtk -make + --enable-interface=ncurses,vt100,alsaseq,server,network,gtk \ +%ifnarch ppc64 + --enable-audio=oss,arts,alsa,esd,ao,jack,vorbis,speex,flac +%else + --enable-audio=oss,arts,alsa,esd,ao,vorbis,speex,flac +%endif +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT - make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/timidity $RPM_BUILD_ROOT/etc -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/timidity.cfg -ln -s /etc/timidity.cfg $RPM_BUILD_ROOT%{_datadir}/timidity/timidity.cfg -pushd $RPM_BUILD_ROOT%{_datadir}/timidity -tar xvjf %{SOURCE1} -bzip2 -dck %{SOURCE3} >instruments/britepno.pat -bzip2 -dck %{SOURCE4} >instruments/pistol.pat -popd +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} +echo "soundfont %{_datadir}/soundfonts/PCLite.sf2" > \ + $RPM_BUILD_ROOT/%{_sysconfdir}/timidity++.cfg mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE5} + %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -install -m 644 interface/pixmaps/timidity.xpm \ +install -p -m 644 interface/pixmaps/timidity.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/timidity.xpm @@ -103,18 +108,68 @@ %files %defattr(-,root,root,-) +%doc AUTHORS COPYING README NEWS ChangeLog +%config(noreplace) %{_sysconfdir}/timidity++.cfg %{_bindir}/* %{_mandir}/*/* %{_datadir}/applications/fedora-timidity.desktop %{_datadir}/icons/hicolor/48x48/apps/timidity.xpm -%files patches -%defattr(-,root,root,-) -%config(noreplace) /etc/timidity.cfg -%{_datadir}/timidity - %changelog +* Mon Mar 3 2008 Hans de Goede 2.13.2-13 +- Merge review fixes (bz 226492) + - merge patch0 into patch16, drop patch0 + - Make License tag just GPLv2 + - Unify macros usage + +* Thu Feb 28 2008 Hans de Goede 2.13.2-12 +- Stop shipping a timidity++-patches package, investigation into the license + of the included patches has turned up doubts about the rights of the author + of the midas SGI midi player to release these into the Public Domain +- Instead require PersonalCopy-Lite-soundfont, and point to PCLite.sf2 in + timidity++.cfg +- Note PersonalCopy-Lite-soundfont also has a PersonalCopy-Lite-patches + sub-package with the .sf2 file converted to GUS patch format for other + applications who require timidity++-patches to get GUS format patches, this + package contains an /etc/timidity.cfg file pointing to the gus patches, + therefor the timidity++ package now ships a timidty++.cfg instead of a + timidity.cfg +- Check for /etc/timidity++.cfg before trying /etc/timidity.cfg, see above for + rationale + +* Thu Feb 21 2008 Jindrich Novy 2.13.2-11 +- rebuild + +* Thu Feb 21 2008 Jindrich Novy 2.13.2-10 +- don't free a constant string if -d is specified (#433756), + thanks to Andrew Bartlett + +* Wed Feb 20 2008 Hans de Goede 2.13.2-9 +- Add IPv6 support, patch by Milan Zazrivec (bz 198467) + +* Tue Feb 19 2008 Fedora Release Engineering - 2.13.2-8 +- Autorebuild for GCC 4.3 + +* Thu Jan 24 2008 Jindrich Novy 2.13.2-7 +- merge review fixes, thanks to Mamoru Tasaka: (#226492) + - update License tag (still unclear what to do with GUS patches) + - remove useless unversioned obsolete timidity++-X11 + - substitute /etc with %%{_sysconfdir} + - enable parallel build + - preserve timestamps, tar unpacking is no more verbose + - add docs + +* Tue Dec 11 2007 Hans de Goede 2.13.2-6 +- Disable building of the jack output on powerpc64, as that mysteriously fails + to build there. + +* Mon Dec 10 2007 Hans de Goede 2.13.2-5 +- Add patches to fix detect and compile of speex and flac outputs +- Add various bugfixes from Debian +- Enable ogg, flac, speex, libao and jack output formats (bz 412431) +- Make libao the default output as libao support pulseaudio directly + * Sat Oct 13 2007 Hans de Goede 2.13.2-4 - Split the patches of into a seperate sub package so that they can be used by other wavetable midi synthesizers, without dragging in a bunch of unwanted --- TiMidity++-2.13.0-redhat.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 4 21:33:47 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 4 Mar 2008 21:33:47 GMT Subject: rpms/yum/devel yum-mirror-priority.patch, NONE, 1.1 yum.spec, 1.196, 1.197 Message-ID: <200803042133.m24LXlMF016323@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16212 Modified Files: yum.spec Added Files: yum-mirror-priority.patch Log Message: failovermethod == 'priority' yum-mirror-priority.patch: --- NEW FILE yum-mirror-priority.patch --- --- yum/config.py~ 2008-03-04 16:21:49.000000000 -0500 +++ yum/config.py 2008-03-04 16:21:49.000000000 -0500 @@ -582,7 +582,7 @@ commands = ListOption() exclude = ListOption() - failovermethod = Option('roundrobin') + failovermethod = Option('priority') proxy = UrlOption(schemes=('http', 'ftp', 'https'), allow_none=True) proxy_username = Option() proxy_password = Option() --- docs/yum.conf.5~ 2008-03-04 16:29:48.000000000 -0500 +++ docs/yum.conf.5 2008-03-04 16:29:48.000000000 -0500 @@ -381,7 +381,7 @@ `priority' starts from the first baseurl listed and reads through them sequentially. -\fBfailovermethod\fR defaults to `roundrobin' if not specified. +\fBfailovermethod\fR defaults to `priority' if not specified. .IP \fBkeepalive\fR Either `1' or `0'. This tells yum whether or not HTTP/1.1 keepalive should be Index: yum.spec =================================================================== RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- yum.spec 4 Mar 2008 17:07:23 -0000 1.196 +++ yum.spec 4 Mar 2008 21:33:09 -0000 1.197 @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 3.2.12 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Source2: yum-updatesd.conf.fedora Patch0: installonlyn-enable.patch Patch1: yum-mutual-obsoletes-providers.patch +Patch2: yum-mirror-priority.patch URL: http://linux.duke.edu/yum/ BuildArch: noarch @@ -51,6 +52,7 @@ %setup -q %patch0 -p0 -b .installonly %patch1 -p0 +%patch2 -p0 %build make @@ -99,6 +101,9 @@ %dir /usr/lib/yum-plugins %changelog +* Tue Mar 4 2008 Seth Vidal 3.2.12-3 +- set failovermethod to 'priority' to make jkeating happy + * Tue Mar 4 2008 Seth Vidal 3.2.12-2 - fix mutually obsoleting providers (like glibc!) From fedora-extras-commits at redhat.com Tue Mar 4 21:34:46 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 4 Mar 2008 21:34:46 GMT Subject: rpms/R-multcomp/devel R-multcomp.spec,1.4,1.5 Message-ID: <200803042134.m24LYkLL016414@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-multcomp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16377 Modified Files: R-multcomp.spec Log Message: Add deprecated directory Index: R-multcomp.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- R-multcomp.spec 4 Mar 2008 21:16:59 -0000 1.4 +++ R-multcomp.spec 4 Mar 2008 21:34:09 -0000 1.5 @@ -61,6 +61,7 @@ %defattr(-, root, root, -) %dir %{_datadir}/R/library/%{packname} %doc %{_datadir}/R/library/%{packname}/latex +%doc %{_datadir}/R/library/%{packname}/deprecated %doc %{_datadir}/R/library/%{packname}/doc %doc %{_datadir}/R/library/%{packname}/html %doc %{_datadir}/R/library/%{packname}/man From fedora-extras-commits at redhat.com Tue Mar 4 21:37:18 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 4 Mar 2008 21:37:18 GMT Subject: rpms/selinux-policy/F-8 policy-20070703.patch, 1.189, 1.190 selinux-policy.spec, 1.615, 1.616 Message-ID: <200803042137.m24LbIo8016580@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16514 Modified Files: policy-20070703.patch selinux-policy.spec Log Message: * Tue Mar 4 2008 Dan Walsh 3.0.8-90 - Allow mozilla to auth_use_nsswitch - Change location of mock - Fix context on /usr/sbin/validate - allow vbetool to map low kernel memory - Allow fail2ban to connect to whois port - Allow bitlbee to read locale files - Allow clamd to execute shell - dontaudit setroubleshoot reading cifs and nfs files policy-20070703.patch: Index: policy-20070703.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- policy-20070703.patch 27 Feb 2008 02:34:01 -0000 1.189 +++ policy-20070703.patch 4 Mar 2008 21:37:10 -0000 1.190 @@ -1124,7 +1124,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-3.0.8/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2007-10-22 13:21:42.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/admin/bootloader.te 2008-01-17 09:03:07.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/admin/bootloader.te 2008-02-27 23:26:06.000000000 -0500 @@ -215,3 +215,7 @@ userdom_dontaudit_search_staff_home_dirs(bootloader_t) userdom_dontaudit_search_sysadm_home_dirs(bootloader_t) @@ -2507,8 +2507,17 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.0.8/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2007-10-22 13:21:42.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/admin/vbetool.te 2008-01-17 09:03:07.000000000 -0500 -@@ -33,4 +33,5 @@ ++++ serefpolicy-3.0.8/policy/modules/admin/vbetool.te 2008-03-04 15:48:23.000000000 -0500 +@@ -23,6 +23,8 @@ + dev_rwx_zero(vbetool_t) + dev_read_sysfs(vbetool_t) + ++domain_mmap_low(vbetool_t) ++ + term_use_unallocated_ttys(vbetool_t) + + libs_use_ld_so(vbetool_t) +@@ -33,4 +35,5 @@ optional_policy(` hal_rw_pid_files(vbetool_t) hal_write_log(vbetool_t) @@ -3444,7 +3453,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.0.8/policy/modules/apps/mozilla.if --- nsaserefpolicy/policy/modules/apps/mozilla.if 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/apps/mozilla.if 2008-01-21 12:59:59.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/apps/mozilla.if 2008-03-04 10:34:00.000000000 -0500 @@ -36,6 +36,8 @@ gen_require(` type mozilla_conf_t, mozilla_exec_t; @@ -3477,7 +3486,12 @@ allow $1_mozilla_t self:fifo_file rw_fifo_file_perms; allow $1_mozilla_t self:shm { unix_read unix_write read write destroy create }; allow $1_mozilla_t self:sem create_sem_perms; -@@ -71,6 +81,11 @@ +@@ -66,11 +76,15 @@ + allow $1_mozilla_t self:unix_stream_socket { listen accept }; + # Browse the web, connect to printer + allow $1_mozilla_t self:tcp_socket create_socket_perms; +- allow $1_mozilla_t self:netlink_route_socket r_netlink_socket_perms; + # for bash - old mozilla binary can_exec($1_mozilla_t, mozilla_exec_t) @@ -3489,7 +3503,7 @@ # X access, Home files manage_dirs_pattern($1_mozilla_t,$1_mozilla_home_t,$1_mozilla_home_t) manage_files_pattern($1_mozilla_t,$1_mozilla_home_t,$1_mozilla_home_t) -@@ -96,15 +111,41 @@ +@@ -96,15 +110,41 @@ relabel_files_pattern($2,$1_mozilla_home_t,$1_mozilla_home_t) relabel_lnk_files_pattern($2,$1_mozilla_home_t,$1_mozilla_home_t) @@ -3538,7 +3552,7 @@ # Unrestricted inheritance from the caller. allow $2 $1_mozilla_t:process { noatsecure siginh rlimitinh }; -@@ -112,11 +153,13 @@ +@@ -112,11 +152,13 @@ ps_process_pattern($2,$1_mozilla_t) allow $2 $1_mozilla_t:process signal_perms; @@ -3554,7 +3568,7 @@ # Look for plugins corecmd_list_bin($1_mozilla_t) -@@ -165,10 +208,23 @@ +@@ -165,13 +207,28 @@ files_read_var_files($1_mozilla_t) files_read_var_symlinks($1_mozilla_t) files_dontaudit_getattr_boot_dirs($1_mozilla_t) @@ -3578,10 +3592,19 @@ term_dontaudit_getattr_pty_dirs($1_mozilla_t) -@@ -184,12 +240,8 @@ - sysnet_dns_name_resolve($1_mozilla_t) - sysnet_read_config($1_mozilla_t) - ++ auth_use_nsswitch($1_mozilla_t) ++ + libs_use_ld_so($1_mozilla_t) + libs_use_shared_libs($1_mozilla_t) + +@@ -180,16 +237,8 @@ + miscfiles_read_fonts($1_mozilla_t) + miscfiles_read_localization($1_mozilla_t) + +- # Browse the web, connect to printer +- sysnet_dns_name_resolve($1_mozilla_t) +- sysnet_read_config($1_mozilla_t) +- - userdom_manage_user_home_content_dirs($1,$1_mozilla_t) - userdom_manage_user_home_content_files($1,$1_mozilla_t) - userdom_manage_user_home_content_symlinks($1,$1_mozilla_t) @@ -3593,7 +3616,7 @@ xserver_user_client_template($1,$1_mozilla_t,$1_mozilla_tmpfs_t) xserver_dontaudit_read_xdm_tmp_files($1_mozilla_t) -@@ -211,131 +263,8 @@ +@@ -211,131 +260,8 @@ fs_manage_cifs_symlinks($1_mozilla_t) ') @@ -3727,7 +3750,7 @@ ') optional_policy(` -@@ -350,21 +279,27 @@ +@@ -350,21 +276,27 @@ optional_policy(` cups_read_rw_config($1_mozilla_t) cups_dbus_chat($1_mozilla_t) @@ -3759,7 +3782,14 @@ ') optional_policy(` -@@ -384,25 +319,6 @@ +@@ -377,32 +309,9 @@ + ') + + optional_policy(` +- nscd_socket_use($1_mozilla_t) +- ') +- +- optional_policy(` thunderbird_domtrans_user_thunderbird($1, $1_mozilla_t) ') @@ -3785,7 +3815,7 @@ ') ######################################## -@@ -575,3 +491,27 @@ +@@ -575,3 +484,27 @@ allow $2 $1_mozilla_t:tcp_socket rw_socket_perms; ') @@ -4294,7 +4324,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.0.8/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2007-10-22 13:21:41.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/kernel/corenetwork.te.in 2008-02-20 17:16:46.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/kernel/corenetwork.te.in 2008-03-04 16:32:54.000000000 -0500 @@ -55,6 +55,11 @@ type reserved_port_t, port_type, reserved_port_type; @@ -4387,10 +4417,11 @@ type socks_port_t, port_type; dnl network_port(socks) # no defined portcon type stunnel_port_t, port_type; dnl network_port(stunnel) # no defined portcon in current strict network_port(squid, udp,3401,s0, tcp,3401,s0, udp,4827,s0, tcp,4827,s0) # snmp and htcp -@@ -160,13 +175,19 @@ +@@ -160,13 +175,20 @@ type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon network_port(uucpd, tcp,540,s0) network_port(vnc, tcp,5900,s0) ++network_port(whois, tcp,43,s0, udp,43,s0) +network_port(wccp, udp,2048,s0) +network_port(xdmcp, udp,177,s0, tcp,177,s0) network_port(xen, tcp,8002,s0) @@ -4410,7 +4441,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.0.8/policy/modules/kernel/devices.fc --- nsaserefpolicy/policy/modules/kernel/devices.fc 2007-10-22 13:21:42.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/kernel/devices.fc 2008-02-20 08:52:30.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/kernel/devices.fc 2008-02-27 17:11:36.000000000 -0500 @@ -1,8 +1,9 @@ /dev -d gen_context(system_u:object_r:device_t,s0) @@ -4476,7 +4507,7 @@ /dev/par.* -c gen_context(system_u:object_r:printer_device_t,s0) /dev/patmgr[01] -c gen_context(system_u:object_r:sound_device_t,s0) /dev/pmu -c gen_context(system_u:object_r:power_device_t,s0) -@@ -65,9 +83,8 @@ +@@ -65,14 +83,14 @@ /dev/sonypi -c gen_context(system_u:object_r:v4l_device_t,s0) /dev/tlk[0-3] -c gen_context(system_u:object_r:v4l_device_t,s0) /dev/urandom -c gen_context(system_u:object_r:urandom_device_t,s0) @@ -4488,7 +4519,13 @@ /dev/usblp.* -c gen_context(system_u:object_r:printer_device_t,s0) ifdef(`distro_suse', ` /dev/usbscanner -c gen_context(system_u:object_r:scanner_device_t,s0) -@@ -94,12 +111,23 @@ + ') + /dev/vbi.* -c gen_context(system_u:object_r:v4l_device_t,s0) ++/dev/vboxadd.* -c gen_context(system_u:object_r:xserver_misc_device_t,s0) + /dev/vmmon -c gen_context(system_u:object_r:vmware_device_t,s0) + /dev/vmnet.* -c gen_context(system_u:object_r:vmware_device_t,s0) + /dev/video.* -c gen_context(system_u:object_r:v4l_device_t,s0) +@@ -94,12 +112,23 @@ /dev/dvb/.* -c gen_context(system_u:object_r:v4l_device_t,s0) @@ -4512,7 +4549,7 @@ /dev/pts(/.*)? <> -@@ -113,14 +141,9 @@ +@@ -113,14 +142,9 @@ /dev/xen/blktap.* -c gen_context(system_u:object_r:xen_device_t,s0) /dev/xen/evtchn -c gen_context(system_u:object_r:xen_device_t,s0) @@ -7683,8 +7720,8 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.te serefpolicy-3.0.8/policy/modules/services/bitlbee.te --- nsaserefpolicy/policy/modules/services/bitlbee.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.0.8/policy/modules/services/bitlbee.te 2008-02-26 16:46:48.000000000 -0500 -@@ -0,0 +1,75 @@ ++++ serefpolicy-3.0.8/policy/modules/services/bitlbee.te 2008-03-03 11:03:14.000000000 -0500 +@@ -0,0 +1,77 @@ + +policy_module(bitlbee, 1.0.0) + @@ -7754,6 +7791,8 @@ +libs_legacy_use_shared_libs(bitlbee_t) +libs_use_ld_so(bitlbee_t) + ++miscfiles_read_localization(bitlbee_t) ++ +sysnet_dns_name_resolve(bitlbee_t) + +optional_policy(` @@ -7850,7 +7889,7 @@ /var/spool/amavisd/clamd\.sock -s gen_context(system_u:object_r:clamd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.0.8/policy/modules/services/clamav.te --- nsaserefpolicy/policy/modules/services/clamav.te 2007-10-22 13:21:36.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/clamav.te 2008-01-17 09:03:07.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/clamav.te 2008-03-03 09:51:53.000000000 -0500 @@ -1,5 +1,5 @@ -policy_module(clamav,1.4.1) @@ -7858,24 +7897,27 @@ ######################################## # -@@ -87,6 +87,7 @@ +@@ -87,6 +87,9 @@ kernel_dontaudit_list_proc(clamd_t) kernel_read_sysctl(clamd_t) kernel_read_kernel_sysctls(clamd_t) +kernel_read_system_state(clamd_t) ++ ++corecmd_exec_shell(clamd_t) corenet_all_recvfrom_unlabeled(clamd_t) corenet_all_recvfrom_netlabel(clamd_t) -@@ -120,6 +121,8 @@ +@@ -120,6 +123,9 @@ cron_use_system_job_fds(clamd_t) cron_rw_pipes(clamd_t) +mta_read_config(clamd_t) ++mta_send_mail(clamd_t) + optional_policy(` amavis_read_lib_files(clamd_t) amavis_read_spool_files(clamd_t) -@@ -127,6 +130,10 @@ +@@ -127,6 +133,10 @@ amavis_create_pid_files(clamd_t) ') @@ -7886,7 +7928,7 @@ ######################################## # # Freshclam local policy -@@ -233,3 +240,7 @@ +@@ -233,3 +243,7 @@ optional_policy(` apache_read_sys_content(clamscan_t) ') @@ -10087,16 +10129,25 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.fc serefpolicy-3.0.8/policy/modules/services/fail2ban.fc --- nsaserefpolicy/policy/modules/services/fail2ban.fc 2007-10-22 13:21:36.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/fail2ban.fc 2008-02-01 10:04:19.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/fail2ban.fc 2008-03-04 16:30:22.000000000 -0500 @@ -1,3 +1,5 @@ -+/usr/bin/fail2ban-server -- gen_context(system_u:object_r:fail2ban_exec_t,s0) /usr/bin/fail2ban -- gen_context(system_u:object_r:fail2ban_exec_t,s0) - /var/log/fail2ban.log -- gen_context(system_u:object_r:fail2ban_log_t,s0) - /var/run/fail2ban.pid -- gen_context(system_u:object_r:fail2ban_var_run_t,s0) +-/var/log/fail2ban.log -- gen_context(system_u:object_r:fail2ban_log_t,s0) +-/var/run/fail2ban.pid -- gen_context(system_u:object_r:fail2ban_var_run_t,s0) ++/usr/bin/fail2ban-server -- gen_context(system_u:object_r:fail2ban_exec_t,s0) ++/var/log/fail2ban\.log -- gen_context(system_u:object_r:fail2ban_log_t,s0) ++/var/run/fail2ban\.pid -- gen_context(system_u:object_r:fail2ban_var_run_t,s0) +/var/run/fail2ban\.sock -s gen_context(system_u:object_r:fail2ban_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.0.8/policy/modules/services/fail2ban.te --- nsaserefpolicy/policy/modules/services/fail2ban.te 2007-10-22 13:21:36.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/fail2ban.te 2008-02-01 07:42:49.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/fail2ban.te 2008-03-04 16:29:48.000000000 -0500 +@@ -1,5 +1,5 @@ + +-policy_module(fail2ban,1.0.0) ++policy_module(fail2ban,1.1.0) + + ######################################## + # @@ -33,8 +33,9 @@ logging_log_filetrans(fail2ban_t,fail2ban_log_t,file) @@ -10108,7 +10159,20 @@ kernel_read_system_state(fail2ban_t) -@@ -55,6 +56,8 @@ +@@ -47,14 +48,20 @@ + + files_read_etc_files(fail2ban_t) + files_read_usr_files(fail2ban_t) ++files_list_var(fail2ban_t) ++files_search_var_lib(fail2ban_t) ++ ++fs_list_inotifyfs(fail2ban_t) + + libs_use_ld_so(fail2ban_t) + libs_use_shared_libs(fail2ban_t) + +-logging_read_generic_logs(fail2ban_t) ++logging_read_all_logs(fail2ban_t) miscfiles_read_localization(fail2ban_t) @@ -15514,7 +15578,7 @@ -') dnl end TODO diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.0.8/policy/modules/services/setroubleshoot.te --- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2007-10-22 13:21:39.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/setroubleshoot.te 2008-02-15 15:40:37.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/setroubleshoot.te 2008-02-29 09:08:55.000000000 -0500 @@ -1,5 +1,5 @@ -policy_module(setroubleshoot,1.4.1) @@ -15551,7 +15615,7 @@ corecmd_exec_bin(setroubleshootd_t) corecmd_exec_shell(setroubleshootd_t) -@@ -67,16 +72,22 @@ +@@ -67,16 +72,24 @@ corenet_sendrecv_smtp_client_packets(setroubleshootd_t) dev_read_urand(setroubleshootd_t) @@ -15572,10 +15636,12 @@ fs_getattr_all_dirs(setroubleshootd_t) fs_getattr_all_files(setroubleshootd_t) +fs_read_fusefs_symlinks(setroubleshootd_t) ++fs_dontaudit_read_nfs_files(setroubleshootd_t) ++fs_dontaudit_read_cifs_files(setroubleshootd_t) selinux_get_enforce_mode(setroubleshootd_t) selinux_validate_context(setroubleshootd_t) -@@ -96,17 +107,23 @@ +@@ -96,17 +109,23 @@ locallogin_dontaudit_use_fds(setroubleshootd_t) @@ -17184,7 +17250,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.8/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2007-10-22 13:21:36.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/xserver.te 2008-01-24 13:40:36.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/xserver.te 2008-02-27 23:18:23.000000000 -0500 @@ -16,6 +16,13 @@ ## @@ -17513,16 +17579,18 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.0.8/policy/modules/system/authlogin.fc --- nsaserefpolicy/policy/modules/system/authlogin.fc 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/authlogin.fc 2008-01-29 09:14:26.000000000 -0500 -@@ -14,6 +14,7 @@ ++++ serefpolicy-3.0.8/policy/modules/system/authlogin.fc 2008-03-04 15:32:46.000000000 -0500 +@@ -13,7 +13,9 @@ + /sbin/pam_console_apply -- gen_context(system_u:object_r:pam_console_exec_t,s0) /sbin/pam_timestamp_check -- gen_context(system_u:object_r:pam_exec_t,s0) /sbin/unix_chkpwd -- gen_context(system_u:object_r:chkpwd_exec_t,s0) ++/usr/sbin/validate -- gen_context(system_u:object_r:chkpwd_exec_t,s0) /sbin/unix_verify -- gen_context(system_u:object_r:chkpwd_exec_t,s0) +/sbin/unix_update -- gen_context(system_u:object_r:updpwd_exec_t,s0) ifdef(`distro_suse', ` /sbin/unix2_chkpwd -- gen_context(system_u:object_r:chkpwd_exec_t,s0) ') -@@ -38,5 +39,9 @@ +@@ -38,5 +40,9 @@ /var/log/wtmp.* -- gen_context(system_u:object_r:wtmp_t,s0) /var/run/console(/.*)? gen_context(system_u:object_r:pam_var_console_t,s0) @@ -18157,7 +18225,7 @@ /sbin/partx -- gen_context(system_u:object_r:fsadm_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.0.8/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/fstools.te 2008-01-17 09:03:07.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/system/fstools.te 2008-02-27 23:25:25.000000000 -0500 @@ -109,8 +109,7 @@ term_use_console(fsadm_t) @@ -18597,7 +18665,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.8/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/init.te 2008-01-17 09:03:07.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/system/init.te 2008-02-27 23:24:47.000000000 -0500 @@ -10,6 +10,20 @@ # Declarations # @@ -18827,7 +18895,15 @@ ') optional_policy(` -@@ -749,6 +803,12 @@ +@@ -738,6 +792,7 @@ + + optional_policy(` + unconfined_domain(initrc_t) ++ unconfined_domain(init_t) + + ifdef(`distro_redhat',` + # system-config-services causes avc messages that should be dontaudited +@@ -749,6 +804,12 @@ ') ') @@ -19283,7 +19359,7 @@ +/var/run/audispd_events -s gen_context(system_u:object_r:audisp_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.0.8/policy/modules/system/logging.if --- nsaserefpolicy/policy/modules/system/logging.if 2007-10-22 13:21:39.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/logging.if 2008-02-15 15:38:14.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/system/logging.if 2008-02-29 15:22:06.000000000 -0500 @@ -34,6 +34,51 @@ # interface(`logging_send_audit_msgs',` @@ -19400,7 +19476,7 @@ ') ######################################## -@@ -597,3 +657,270 @@ +@@ -597,3 +657,272 @@ files_search_var($1) manage_files_pattern($1,var_log_t,var_log_t) ') @@ -19666,10 +19742,12 @@ +interface(`logging_stream_connect_audisp',` + gen_require(` + type audisp_t, audisp_var_run_t; ++ type auditd_t, auditd_var_run_t; + ') + + files_search_pids($1) + stream_connect_pattern($1,audisp_var_run_t,audisp_var_run_t,audisp_t) ++ stream_connect_pattern($1,auditd_var_run_t,auditd_var_run_t,auditd_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.0.8/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2007-10-22 13:21:40.000000000 -0400 @@ -19917,7 +19995,7 @@ /etc/lvm/lock(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.8/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/lvm.te 2008-01-17 09:03:07.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/system/lvm.te 2008-02-27 23:24:15.000000000 -0500 @@ -44,9 +44,9 @@ # Cluster LVM daemon local policy # @@ -19987,18 +20065,23 @@ userdom_dontaudit_use_unpriv_user_fds(clvmd_t) userdom_dontaudit_search_sysadm_home_dirs(clvmd_t) -@@ -131,10 +144,6 @@ +@@ -131,12 +144,12 @@ ') optional_policy(` - nis_use_ypbind(clvmd_t) --') -- --optional_policy(` - ricci_dontaudit_rw_modcluster_pipes(clvmd_t) - ricci_dontaudit_use_modcluster_fds(clvmd_t) ++ ricci_dontaudit_rw_modcluster_pipes(clvmd_t) ++ ricci_dontaudit_use_modcluster_fds(clvmd_t) ') -@@ -150,7 +159,8 @@ + + optional_policy(` +- ricci_dontaudit_rw_modcluster_pipes(clvmd_t) +- ricci_dontaudit_use_modcluster_fds(clvmd_t) ++ unconfined_domain(clvmd_t) + ') + + optional_policy(` +@@ -150,7 +163,8 @@ # DAC overrides and mknod for modifying /dev entries (vgmknodes) # rawio needed for dmraid @@ -20008,7 +20091,7 @@ dontaudit lvm_t self:capability sys_tty_config; allow lvm_t self:process { sigchld sigkill sigstop signull signal }; # LVM will complain a lot if it cannot set its priority. -@@ -160,7 +170,8 @@ +@@ -160,7 +174,8 @@ allow lvm_t self:unix_dgram_socket create_socket_perms; allow lvm_t self:netlink_kobject_uevent_socket create_socket_perms; @@ -20018,7 +20101,7 @@ manage_dirs_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t) manage_files_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t) -@@ -208,7 +219,6 @@ +@@ -208,7 +223,6 @@ selinux_compute_user_contexts(lvm_t) dev_create_generic_chr_files(lvm_t) @@ -20026,7 +20109,7 @@ dev_read_rand(lvm_t) dev_read_urand(lvm_t) dev_rw_lvm_control(lvm_t) -@@ -228,6 +238,8 @@ +@@ -228,6 +242,8 @@ dev_dontaudit_getattr_generic_blk_files(lvm_t) dev_dontaudit_getattr_generic_pipes(lvm_t) dev_create_generic_dirs(lvm_t) @@ -20035,7 +20118,7 @@ fs_getattr_xattr_fs(lvm_t) fs_search_auto_mountpoints(lvm_t) -@@ -246,6 +258,7 @@ +@@ -246,6 +262,7 @@ storage_dev_filetrans_fixed_disk(lvm_t) # Access raw devices and old /dev/lvm (c 109,0). Is this needed? storage_manage_fixed_disk(lvm_t) @@ -20043,7 +20126,7 @@ term_getattr_all_user_ttys(lvm_t) term_list_ptys(lvm_t) -@@ -254,10 +267,12 @@ +@@ -254,10 +271,12 @@ domain_use_interactive_fds(lvm_t) @@ -20056,7 +20139,7 @@ init_use_fds(lvm_t) init_dontaudit_getattr_initctl(lvm_t) -@@ -275,6 +290,8 @@ +@@ -275,6 +294,8 @@ seutil_search_default_contexts(lvm_t) seutil_sigchld_newrole(lvm_t) @@ -20065,7 +20148,7 @@ ifdef(`distro_redhat',` # this is from the initrd: files_rw_isid_type_dirs(lvm_t) -@@ -293,5 +310,18 @@ +@@ -293,5 +314,18 @@ ') optional_policy(` @@ -21292,7 +21375,7 @@ xen_append_log(ifconfig_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.0.8/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/udev.te 2008-01-17 09:03:07.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/system/udev.te 2008-02-27 23:27:54.000000000 -0500 @@ -132,6 +132,7 @@ init_read_utmp(udev_t) @@ -21337,7 +21420,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.0.8/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-10-22 13:21:39.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc 2008-01-22 09:29:20.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc 2008-03-04 10:18:00.000000000 -0500 @@ -7,6 +7,10 @@ /usr/bin/vncserver -- gen_context(system_u:object_r:unconfined_exec_t,s0) @@ -21348,7 +21431,7 @@ /usr/local/RealPlayer/realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) +/usr/bin/rhythmbox -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) +/usr/bin/sbcl -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) -+/usr/bin/mock -- gen_context(system_u:object_r:unconfined_notrans_exec_t,s0) ++/usr/sbin/mock -- gen_context(system_u:object_r:unconfined_notrans_exec_t,s0) +/usr/sbin/sysreport -- gen_context(system_u:object_r:unconfined_notrans_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.8/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2007-10-22 13:21:40.000000000 -0400 @@ -24123,7 +24206,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.8/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/xen.te 2008-01-17 09:03:07.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/system/xen.te 2008-02-27 23:16:42.000000000 -0500 @@ -45,9 +45,7 @@ type xenstored_t; Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/selinux-policy.spec,v retrieving revision 1.615 retrieving revision 1.616 diff -u -r1.615 -r1.616 --- selinux-policy.spec 26 Feb 2008 23:02:12 -0000 1.615 +++ selinux-policy.spec 4 Mar 2008 21:37:10 -0000 1.616 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.0.8 -Release: 89%{?dist} +Release: 90%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -381,6 +381,17 @@ %endif %changelog +* Tue Mar 4 2008 Dan Walsh 3.0.8-90 +- Allow mozilla to auth_use_nsswitch +- Change location of mock +- Fix context on /usr/sbin/validate +- allow vbetool to map low kernel memory +- Allow fail2ban to connect to whois port +- Allow bitlbee to read locale files +- Allow clamd to execute shell +- dontaudit setroubleshoot reading cifs and nfs files + + * Thu Feb 21 2008 Dan Walsh 3.0.8-89 - Add jkubin changes for nx and groupadd - Add isns port From fedora-extras-commits at redhat.com Tue Mar 4 21:37:54 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 4 Mar 2008 21:37:54 GMT Subject: rpms/gdl/devel gdl-0.9pre6-cvs.patch, NONE, 1.1 gdl-0.9pre6-gcc43.patch, NONE, 1.1 gdl-0.9pre6-plplot.patch, NONE, 1.1 Message-ID: <200803042137.m24LbsUZ016655@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16630 Added Files: gdl-0.9pre6-cvs.patch gdl-0.9pre6-gcc43.patch gdl-0.9pre6-plplot.patch Log Message: Add the patches gdl-0.9pre6-cvs.patch: --- NEW FILE gdl-0.9pre6-cvs.patch --- diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9pre6/aclocal.m4 cvs/gdl/aclocal.m4 --- gdl-0.9pre6/aclocal.m4 2007-10-29 17:10:49.000000000 -0600 +++ cvs/gdl/aclocal.m4 2007-11-08 16:13:07.000000000 -0700 @@ -1,7 +1,7 @@ -# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,6706 +11,7445 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) -AC_PREREQ([2.52]) -# serial 6 +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. We must strip everything past the first ":", -# and everything past the last "/". +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL -# _AM_DIRNAME(PATH) -# ----------------- -# Like AS_DIRNAME, only do it during macro expansion -AC_DEFUN([_AM_DIRNAME], - [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, - m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, - m4_if(regexp([$1], [^/.*]), -1, - [.], - patsubst([$1], [^\(/\).*], [\1])), - patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), - patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl -])# _AM_DIRNAME - - -# The stamp files are numbered to have different names. -# We could number them on a directory basis, but that's additional -# complications, let's have a unique counter. -m4_define([_AM_STAMP_Count], [0]) +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -# _AM_STAMP(HEADER) -# ----------------- -# The name of the stamp file for HEADER. -AC_DEFUN([_AM_STAMP], -[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl -AS_ESCAPE(_AM_DIRNAME(patsubst([$1], - [:.*])))/stamp-h[]_AM_STAMP_Count]) +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl -# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) -# ------------------------------------------------------------ -# We used to try to get a real timestamp in stamp-h. But the fear is that -# that will cause unnecessary cvs conflicts. -AC_DEFUN([_AM_CONFIG_HEADER], -[# Add the stamp file to the list of files AC keeps track of, -# along with our hook. -AC_CONFIG_HEADERS([$1], - [# update the timestamp -echo 'timestamp for $1' >"_AM_STAMP([$1])" -$2], - [$3]) -])# _AM_CONFIG_HEADER - - -# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) -# -------------------------------------------------------------- -AC_DEFUN([AM_CONFIG_HEADER], -[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) -])# AM_CONFIG_HEADER +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL -# Do all the work for Automake. -*- Autoconf -*- -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH [...38815 lines suppressed...] + +; +; complex title with greek and math... +; +pro titre1, full=full, ymargin=ymargin, charsize=charsize + +t1='!6F(s) = (2!4p)!e-1/2!n !mi!s!a!e!m' + STRING(36b) +t1=t1+'!r!b!i-!m' + STRING(36b) + '!nF(x)e!e-i2!4p!3xs!ndx' + +if KEYWORD_SET(full) then t1b=t1 else t1b='' +if N_ELEMENTS(ymargin) EQ 0 then ymargin=[3,5] +if N_ELEMENTS(charsize) EQ 0 then charsize=2. + +plot, findgen(10), charsize=charsize, /nodata, ymargin=ymargin, $ + title=t1, xtitle=t1b, ytitle=t1b, subtitle=t1b + +xyouts, 0.2, 0.5, charsize=3, t1,/normal +xyouts, 1, 2, charsize=2.2, t1,/data +end + + +pro titre2 + +t2='!MI!S!A!E!8x!R!B!Ip!N !7q!Ii!N!8U!S!E2!R!Ii!Ndx' + +if KEYWORD_SET(full) then t2b=t2 else t2b='' + +plot, findgen(10),/nodata, ymargin=[3,5], charsize=2, title=t2, $ + xtitle=t2b, ytitle=t2b, subtitle=t2b + +XYOUTS, 0.5, .5, t2, $ + charSIZE = 8, /NORMAL +end + +; +; exemple basic de superposition +; +pro titre3 + +t3='!S!3dessous!rDESSUS n!Son!rOUI' +plot, findgen(10), charsize=3, ymargin=[5,8], title=t3 +end +; +; les differents indices ... +; +pro titre4 + +t4='!3!n niveauref!LlL!n!DdD!n!IiI!n!AaA!n!BbB!n!EeE!n!UuU!UuU' +plot, findgen(10), charsize=3, ymargin=[5,8], title=t4 + +t4b='!3!n!scou!r!uca !n!scou!r!Lca' +plot, findgen(10), charsize=3, ymargin=[5,8], title=t4b + +end + +; +; testing and adjusting aligment +; +pro TITRE5, charsize=charsize +; +if N_ELEMENTS(charsize) NE 1 then charsize=2 +; +title='aAa!iaiA!uaUA!n!iaA!nDD!dadDA!nttt!lalLA!naa' +plot, ymargin=[3,6], findgen(10), title=title, charsize=charsize + +rep='' +read, 'suite (rc)', rep +; +; testing the "sub" index capabilities +; +title='aAa!iaiA!uaUA!n!iaA!nDD!dadDA!nttt!lalLA!naa' +title=title+'!eaa!ubb!ecc!n!daa!euu' +plot, ymargin=[3,6], findgen(10), title=title, charsize=charsize + +rep='' +read, 'suite (rc)', rep +title='aAa!iaiA!uaUA!n!iaA!nDD!dadDA!nttt!lalLA!naa' +plot, ymargin=[3,6], findgen(10), title=title, charsize=charsize + +end +; +; ---------------------------------------- +; showing the effects of positioning commands (!U, !L, !M ...) +; +pro TITLE_FORMATING_EXAMPLE, postscript=postscript, title=title +; +if KEYWORD_SET(postscript) then begin + set_plot, 'ps' + device, filename='title_example.ps' +endif +; +PcharRef=!p.charsize +if (!p.charsize LT 1e-6) then begin + !p.charsize=2 + print, 'You can play with !p.charsize to test other Char Sizes ...' +endif +; +if (N_ELEMENTS(title) EQ 0) then begin + title='!3RefLevel' + title=title+'!LLower!S!EExponent!R!IIndex!N Normal' + title=title+'!S!EExp!R!IInd!N!S!U Up!R!D Down!N!S!A Above!R!B Below' +endif +; +plot, findgen(10), title=title, $ + xtitle=title, ytitle=title, subtitle=title +; +; remember size= does not exist in GDL +; +XYOUTS, 1, 5, title +; +if KEYWORD_SET(postscript) then begin + device,/close + print, 'PostScript File "title_example.ps" generated' + set_plot, 'x' +endif +; +!p.charsize=PcharRef +; +end +; +; ----------------------------------------------- +; AC le 20/01/2008 +; we alway have to check the effect with !p.multi ... +; +pro TEST_TITLES_PMULTI, all_titles=all_titles, title=title, help=help +; +if KEYWORD_SET(help) then begin + print, 'pro TEST_TITLES_PMULTI, all_titles=all_titles, $' + print, ' title=title, help=help' + print, '' + print, 'Advices: we can used external parameters (!p.charsize ...)' + print, 'to play with other options' + return +endif +; +device,/decomposed +; +if (N_ELEMENTS(title) EQ 0) then title='gaspQWERTYassdsfgagfafd' +; +xtitle='' +ytitle='' +subtitle='' +if KEYWORD_SET(all_titles) then begin + xtitle=title + ytitle=title + subtitle=title +endif +; +window, 0 +!p.multi=0 +plot, findgen(10), title=title, subtitle=subtitle, xtitle=xtitle, ytitle=ytitle +oplot, 10-findgen(10), color='ff'x +; +window, 1 +!p.multi=[0,2,2] +plot, findgen(10), title=title, subtitle=subtitle, xtitle=xtitle, ytitle=ytitle +oplot, 10-findgen(10), color='ff'x + +plot, findgen(10), title=title, subtitle=subtitle, xtitle=xtitle, ytitle=ytitle +oplot, 10-findgen(10), color='ff00'x + +!p.multi=0 + +end +; +; --------------------------------- +; calling hub +; +pro TEST_TITLES, all=all +; +s='' +TITLE_FORMATING_EXAMPLE +READ, 'Please type any key to continue', s +; +TEST_TITLES_PMULTI, /all +READ, 'Please type any key to continue', s +; +TITRE1 +READ, 'Please type any key to continue', s +; +if NOT(keyword_set(all)) then begin + print, 'To go further, you have to run individually the examples' + print, 'or to call them via /all keyword' + return +endif +; +TITRE2 +READ, 'Please type any key to continue', s +; +TITRE3 +READ, 'Please type any key to continue', s +; +TITRE4 +READ, 'Please type any key to continue', s +; +TITRE5 +READ, 'Please type any key to continue', s +; +end + gdl-0.9pre6-gcc43.patch: --- NEW FILE gdl-0.9pre6-gcc43.patch --- --- gdl-0.9pre6/src/antlr/CharScanner.hpp.gcc43 2007-10-29 17:10:45.000000000 -0600 +++ gdl-0.9pre6/src/antlr/CharScanner.hpp 2008-02-13 10:55:14.000000000 -0700 @@ -10,6 +10,8 @@ #include +#include +#include #include #ifdef HAS_NOT_CCTYPE_H --- gdl-0.9pre6/src/antlr/Parser.cpp.gcc 2007-10-29 17:10:45.000000000 -0600 +++ gdl-0.9pre6/src/antlr/Parser.cpp 2008-02-13 11:18:20.000000000 -0700 @@ -11,6 +11,7 @@ #include "antlr/TokenBuffer.hpp" #include "antlr/MismatchedTokenException.hpp" //#include "antlr/ASTFactory.hpp" +#include #include #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE --- gdl-0.9pre6/src/antlr/TreeParser.cpp.gcc43 2007-10-29 17:10:45.000000000 -0600 +++ gdl-0.9pre6/src/antlr/TreeParser.cpp 2008-02-13 11:20:28.000000000 -0700 @@ -8,6 +8,7 @@ #include "antlr/TreeParser.hpp" #include "antlr/ASTNULLType.hpp" #include "antlr/MismatchedTokenException.hpp" +#include #include #include --- gdl-0.9pre6/src/basic_pro.cpp.gcc43 2007-10-29 17:10:47.000000000 -0600 +++ gdl-0.9pre6/src/basic_pro.cpp 2008-02-13 11:30:20.000000000 -0700 @@ -19,6 +19,7 @@ #include #include +#include #include #include --- gdl-0.9pre6/src/gdlgstream.cpp.gcc43 2007-10-29 17:10:47.000000000 -0600 +++ gdl-0.9pre6/src/gdlgstream.cpp 2008-02-13 11:36:14.000000000 -0700 @@ -25,12 +25,12 @@ using namespace std; -void PLPlotAbortHandler(char *c) +void PLPlotAbortHandler(const char *c) { cout << "PLPlot abort handler: " << c << endl; } -int PLPlotExitHandler(char *c) +int PLPlotExitHandler(const char *c) { cout << "PLPlot exit handler: " << c << endl; return 0; gdl-0.9pre6-plplot.patch: --- NEW FILE gdl-0.9pre6-plplot.patch --- --- gdl-0.9pre6/src/plot3d_nr.cpp.plplot 2007-10-29 17:10:47.000000000 -0600 +++ gdl-0.9pre6/src/plot3d_nr.cpp 2008-02-27 09:39:56.000000000 -0700 @@ -217,7 +217,7 @@ zmin = (zmax_in > zmin_in) ? zmin_in: zmax_in; zmax = (zmax_in > zmin_in) ? zmax_in: zmin_in; - pldtik(zmin, zmax, &tick, &nsub); + pldtik(zmin, zmax, &tick, &nsub, FALSE); tp = tick * floor(zmin / tick) + tick; pl3upv = 0; From fedora-extras-commits at redhat.com Tue Mar 4 21:38:22 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 4 Mar 2008 21:38:22 GMT Subject: rpms/selinux-policy/devel policy-20071130.patch, 1.87, 1.88 selinux-policy.spec, 1.624, 1.625 Message-ID: <200803042138.m24LcMb2016736@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16711 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Mon Mar 3 2008 Dan Walsh 3.3.1-10 - Allow bitlebee to read locale_t policy-20071130.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.87 -r 1.88 policy-20071130.patch Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- policy-20071130.patch 29 Feb 2008 22:33:21 -0000 1.87 +++ policy-20071130.patch 4 Mar 2008 21:38:18 -0000 1.88 @@ -2613,7 +2613,7 @@ ####################################### diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te --- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2007-10-02 09:54:52.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te 2008-03-04 16:24:35.000000000 -0500 @@ -28,6 +28,7 @@ files_purge_tmp(tmpreaper_t) # why does it need setattr? @@ -2622,7 +2622,7 @@ mls_file_read_all_levels(tmpreaper_t) mls_file_write_all_levels(tmpreaper_t) -@@ -42,6 +43,19 @@ +@@ -42,6 +43,22 @@ cron_system_entry(tmpreaper_t,tmpreaper_exec_t) @@ -2630,6 +2630,9 @@ +userdom_delete_all_users_home_content_files(tmpreaper_t) +userdom_delete_all_users_home_content_symlinks(tmpreaper_t) + ++files_delete_isid_type_dirs(tmpreaper_t) ++files_delete_isid_type_files(tmpreaper_t) ++ +optional_policy(` + amavis_manage_spool_files(tmpreaper_t) +') @@ -2698,6 +2701,18 @@ rpm_use_fds(useradd_t) rpm_rw_pipes(useradd_t) ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.3.1/policy/modules/admin/vbetool.te +--- nsaserefpolicy/policy/modules/admin/vbetool.te 2007-12-19 05:32:18.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/admin/vbetool.te 2008-03-04 16:04:15.000000000 -0500 +@@ -23,6 +23,8 @@ + dev_rwx_zero(vbetool_t) + dev_read_sysfs(vbetool_t) + ++domain_mmap_low(vbetool_t) ++ + term_use_unallocated_ttys(vbetool_t) + + libs_use_ld_so(vbetool_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-3.3.1/policy/modules/admin/vpn.te --- nsaserefpolicy/policy/modules/admin/vpn.te 2008-02-18 14:30:19.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/admin/vpn.te 2008-02-26 08:29:22.000000000 -0500 @@ -3924,7 +3939,7 @@ +/usr/bin/octave-[^/]* -- gen_context(system_u:object_r:java_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.3.1/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 2007-10-12 08:56:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/apps/java.if 2008-02-26 21:21:39.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/apps/java.if 2008-03-03 08:25:05.000000000 -0500 @@ -32,7 +32,7 @@ ## ## @@ -4019,7 +4034,7 @@ userdom_manage_user_home_content_dirs($1,$1_javaplugin_t) userdom_manage_user_home_content_files($1,$1_javaplugin_t) userdom_manage_user_home_content_symlinks($1,$1_javaplugin_t) -@@ -156,15 +162,67 @@ +@@ -156,16 +162,63 @@ ') optional_policy(` @@ -4029,8 +4044,11 @@ - optional_policy(` - nscd_socket_use($1_javaplugin_t) +- ') +') -+ + +- optional_policy(` +- xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t) +####################################### +## +## The per role template for the java module. @@ -4062,7 +4080,7 @@ + gen_require(` + type java_exec_t; ') - ++ + type $1_java_t; + domain_type($1_java_t) + domain_entry_file($1_java_t,java_exec_t) @@ -4083,15 +4101,10 @@ + dev_read_rand($1_java_t) + + fs_dontaudit_rw_tmpfs_files($1_java_t) -+ - optional_policy(` -- xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t) -+ xserver_user_x_domain_template($1,$1_java,$1_java_t,$1_tmpfs_t) -+ xserver_xdm_rw_shm($1_java_t) - ') ') -@@ -219,3 +277,67 @@ + ######################################## +@@ -219,3 +272,67 @@ corecmd_search_bin($1) domtrans_pattern($1, java_exec_t, java_t) ') @@ -4223,8 +4236,8 @@ +userdom_dontaudit_write_unpriv_user_home_content_files(loadkeys_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.3.1/policy/modules/apps/mono.if --- nsaserefpolicy/policy/modules/apps/mono.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/apps/mono.if 2008-02-26 08:29:22.000000000 -0500 -@@ -18,3 +18,109 @@ ++++ serefpolicy-3.3.1/policy/modules/apps/mono.if 2008-03-03 08:24:51.000000000 -0500 +@@ -18,3 +18,101 @@ corecmd_search_bin($1) domtrans_pattern($1, mono_exec_t, mono_t) ') @@ -4325,14 +4338,6 @@ + domtrans_pattern($2, mono_exec_t, $1_mono_t) + + fs_dontaudit_rw_tmpfs_files($1_mono_t) -+ -+ optional_policy(` -+ gen_require(` -+ type $1_tmpfs_t; -+ ') -+ xserver_user_x_domain_template($1,$1_mono,$1_mono_t,$1_tmpfs_t) -+ xserver_xdm_rw_shm($1_mono_t) -+ ') +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.3.1/policy/modules/apps/mono.te --- nsaserefpolicy/policy/modules/apps/mono.te 2007-12-19 05:32:09.000000000 -0500 @@ -4373,7 +4378,7 @@ # /bin diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.3.1/policy/modules/apps/mozilla.if --- nsaserefpolicy/policy/modules/apps/mozilla.if 2007-10-29 07:52:48.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/apps/mozilla.if 2008-02-27 13:16:07.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/apps/mozilla.if 2008-03-04 10:33:57.000000000 -0500 @@ -35,7 +35,10 @@ template(`mozilla_per_role_template',` gen_require(` @@ -4417,7 +4422,12 @@ allow $1_mozilla_t self:fifo_file rw_fifo_file_perms; allow $1_mozilla_t self:shm { unix_read unix_write read write destroy create }; allow $1_mozilla_t self:sem create_sem_perms; -@@ -71,10 +80,15 @@ +@@ -66,15 +75,19 @@ + allow $1_mozilla_t self:unix_stream_socket { listen accept }; + # Browse the web, connect to printer + allow $1_mozilla_t self:tcp_socket create_socket_perms; +- allow $1_mozilla_t self:netlink_route_socket r_netlink_socket_perms; + # for bash - old mozilla binary can_exec($1_mozilla_t, mozilla_exec_t) @@ -4436,7 +4446,7 @@ userdom_search_user_home_dirs($1,$1_mozilla_t) # Mozpluggerrc -@@ -89,22 +103,48 @@ +@@ -89,22 +102,48 @@ allow $2 $1_mozilla_t:unix_stream_socket connectto; # X access, Home files @@ -4498,7 +4508,7 @@ # Unrestricted inheritance from the caller. allow $2 $1_mozilla_t:process { noatsecure siginh rlimitinh }; -@@ -112,11 +152,13 @@ +@@ -112,11 +151,13 @@ ps_process_pattern($2,$1_mozilla_t) allow $2 $1_mozilla_t:process signal_perms; @@ -4514,7 +4524,7 @@ # Look for plugins corecmd_list_bin($1_mozilla_t) -@@ -165,10 +207,23 @@ +@@ -165,13 +206,28 @@ files_read_var_files($1_mozilla_t) files_read_var_symlinks($1_mozilla_t) files_dontaudit_getattr_boot_dirs($1_mozilla_t) @@ -4538,9 +4548,20 @@ term_dontaudit_getattr_pty_dirs($1_mozilla_t) -@@ -184,14 +239,10 @@ - sysnet_dns_name_resolve($1_mozilla_t) - sysnet_read_config($1_mozilla_t) ++ auth_use_nsswitch($1_mozilla_t) ++ + libs_use_ld_so($1_mozilla_t) + libs_use_shared_libs($1_mozilla_t) [...1854 lines suppressed...] interface(`userdom_relabelto_staff_home_dirs',` gen_require(` @@ -30643,7 +30843,7 @@ ## users home directory. ## ## -@@ -4307,12 +4438,27 @@ +@@ -4307,12 +4439,27 @@ ## ## # @@ -30674,7 +30874,7 @@ ') ######################################## -@@ -4327,13 +4473,13 @@ +@@ -4327,13 +4474,13 @@ # interface(`userdom_read_staff_home_content_files',` gen_require(` @@ -30692,7 +30892,7 @@ ') ######################################## -@@ -4531,10 +4677,10 @@ +@@ -4531,10 +4678,10 @@ # interface(`userdom_getattr_sysadm_home_dirs',` gen_require(` @@ -30705,7 +30905,7 @@ ') ######################################## -@@ -4551,10 +4697,10 @@ +@@ -4551,10 +4698,10 @@ # interface(`userdom_dontaudit_getattr_sysadm_home_dirs',` gen_require(` @@ -30718,7 +30918,7 @@ ') ######################################## -@@ -4569,10 +4715,10 @@ +@@ -4569,10 +4716,10 @@ # interface(`userdom_search_sysadm_home_dirs',` gen_require(` @@ -30731,7 +30931,7 @@ ') ######################################## -@@ -4588,10 +4734,10 @@ +@@ -4588,10 +4735,10 @@ # interface(`userdom_dontaudit_search_sysadm_home_dirs',` gen_require(` @@ -30744,7 +30944,7 @@ ') ######################################## -@@ -4606,10 +4752,10 @@ +@@ -4606,10 +4753,10 @@ # interface(`userdom_list_sysadm_home_dirs',` gen_require(` @@ -30757,7 +30957,7 @@ ') ######################################## -@@ -4625,10 +4771,10 @@ +@@ -4625,10 +4772,10 @@ # interface(`userdom_dontaudit_list_sysadm_home_dirs',` gen_require(` @@ -30770,7 +30970,7 @@ ') ######################################## -@@ -4644,12 +4790,11 @@ +@@ -4644,12 +4791,11 @@ # interface(`userdom_dontaudit_read_sysadm_home_content_files',` gen_require(` @@ -30786,7 +30986,7 @@ ') ######################################## -@@ -4676,10 +4821,10 @@ +@@ -4676,10 +4822,10 @@ # interface(`userdom_sysadm_home_dir_filetrans',` gen_require(` @@ -30799,7 +30999,7 @@ ') ######################################## -@@ -4694,10 +4839,10 @@ +@@ -4694,10 +4840,10 @@ # interface(`userdom_search_sysadm_home_content_dirs',` gen_require(` @@ -30812,7 +31012,7 @@ ') ######################################## -@@ -4712,13 +4857,13 @@ +@@ -4712,13 +4858,13 @@ # interface(`userdom_read_sysadm_home_content_files',` gen_require(` @@ -30830,7 +31030,7 @@ ') ######################################## -@@ -4754,11 +4899,49 @@ +@@ -4754,11 +4900,49 @@ # interface(`userdom_search_all_users_home_dirs',` gen_require(` @@ -30881,7 +31081,7 @@ ') ######################################## -@@ -4778,6 +4961,14 @@ +@@ -4778,6 +4962,14 @@ files_list_home($1) allow $1 home_dir_type:dir list_dir_perms; @@ -30896,7 +31096,7 @@ ') ######################################## -@@ -4839,6 +5030,26 @@ +@@ -4839,6 +5031,26 @@ ######################################## ## @@ -30923,7 +31123,7 @@ ## Create, read, write, and delete all directories ## in all users home directories. ## -@@ -4859,6 +5070,25 @@ +@@ -4859,6 +5071,25 @@ ######################################## ## @@ -30949,7 +31149,7 @@ ## Create, read, write, and delete all files ## in all users home directories. ## -@@ -4879,6 +5109,26 @@ +@@ -4879,6 +5110,26 @@ ######################################## ## @@ -30976,7 +31176,7 @@ ## Create, read, write, and delete all symlinks ## in all users home directories. ## -@@ -5115,7 +5365,7 @@ +@@ -5115,7 +5366,7 @@ # interface(`userdom_relabelto_generic_user_home_dirs',` gen_require(` @@ -30985,7 +31185,7 @@ ') files_search_home($1) -@@ -5304,6 +5554,50 @@ +@@ -5304,6 +5555,50 @@ ######################################## ## @@ -31036,7 +31236,7 @@ ## Create, read, write, and delete directories in ## unprivileged users home directories. ## -@@ -5509,6 +5803,42 @@ +@@ -5509,6 +5804,42 @@ ######################################## ## @@ -31079,7 +31279,7 @@ ## Read and write unprivileged user ttys. ## ## -@@ -5674,6 +6004,42 @@ +@@ -5674,6 +6005,42 @@ ######################################## ## @@ -31122,7 +31322,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5704,3 +6070,368 @@ +@@ -5704,3 +6071,368 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.624 retrieving revision 1.625 diff -u -r1.624 -r1.625 --- selinux-policy.spec 29 Feb 2008 22:33:22 -0000 1.624 +++ selinux-policy.spec 4 Mar 2008 21:38:18 -0000 1.625 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -388,6 +388,9 @@ %endif %changelog +* Mon Mar 3 2008 Dan Walsh 3.3.1-10 +- Allow bitlebee to read locale_t + * Fri Feb 29 2008 Dan Walsh 3.3.1-9 - More xselinux rules From fedora-extras-commits at redhat.com Tue Mar 4 21:40:37 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Tue, 4 Mar 2008 21:40:37 GMT Subject: rpms/memtest86+/devel memtest-setup,1.1,1.2 Message-ID: <200803042140.m24Lebia016829@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/memtest86+/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16797 Modified Files: memtest-setup Log Message: Don't install memtest on EFI platforms. Index: memtest-setup =================================================================== RCS file: /cvs/extras/rpms/memtest86+/devel/memtest-setup,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- memtest-setup 9 Sep 2004 08:25:45 -0000 1.1 +++ memtest-setup 4 Mar 2008 21:39:54 -0000 1.2 @@ -1,5 +1,10 @@ #!/bin/bash +if [ -d /sys/firmware/efi ]; then + echo "memtest86+ does not support EFI platforms." + exit 254 +fi + MTVERSION=`rpm -q --qf '%{version}' memtest86+` MTPATH="/boot/memtest86+-$MTVERSION" From fedora-extras-commits at redhat.com Tue Mar 4 21:42:26 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Tue, 4 Mar 2008 21:42:26 GMT Subject: rpms/memtest86+/devel memtest86+.spec,1.34,1.35 Message-ID: <200803042142.m24LgQrr016894@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/memtest86+/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16868 Modified Files: memtest86+.spec Log Message: * Tue Mar 04 2008 Peter Jones - 2.01-2 - Don't install memtest86+ in bootloader configs on EFI platforms. Index: memtest86+.spec =================================================================== RCS file: /cvs/extras/rpms/memtest86+/devel/memtest86+.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- memtest86+.spec 21 Feb 2008 20:15:21 -0000 1.34 +++ memtest86+.spec 4 Mar 2008 21:41:51 -0000 1.35 @@ -6,7 +6,7 @@ Summary: Stand-alone memory tester for x86 and x86-64 computers Name: memtest86+ Version: 2.01 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 ExclusiveArch: %{ix86} x86_64 Group: System Environment/Base @@ -62,6 +62,9 @@ /sbin/new-memtest-pkg --remove %{version} %changelog +* Tue Mar 04 2008 Peter Jones - 2.01-2 +- Don't install memtest86+ in bootloader configs on EFI platforms. + * Thu Feb 21 2008 Warren Togami - 2.01-1 - 2.01 major bugfix release From fedora-extras-commits at redhat.com Tue Mar 4 21:46:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 21:46:26 GMT Subject: rpms/perl-Module-Refresh/devel perl-Module-Refresh.spec,1.9,1.10 Message-ID: <200803042146.m24LkQuS017018@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-Refresh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16988 Modified Files: perl-Module-Refresh.spec Log Message: new perl Index: perl-Module-Refresh.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Refresh/devel/perl-Module-Refresh.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Module-Refresh.spec 6 Sep 2007 08:19:19 -0000 1.9 +++ perl-Module-Refresh.spec 4 Mar 2008 21:45:48 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Module-Refresh Version: 0.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Refresh %INC files when updated on disk License: GPL+ or Artistic Group: Development/Libraries @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 0.13-3 +- rebuild for new perl + * Thu Sep 06 2007 Ralf Cors??pius < - 0.13-2 - Update license tag. From fedora-extras-commits at redhat.com Tue Mar 4 21:48:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 21:48:02 GMT Subject: rpms/perl-DBM-Deep/devel perl-DBM-Deep.spec,1.2,1.3 Message-ID: <200803042148.m24Lm2kx017146@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBM-Deep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17087 Modified Files: perl-DBM-Deep.spec Log Message: new perl Index: perl-DBM-Deep.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBM-Deep/devel/perl-DBM-Deep.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBM-Deep.spec 8 Sep 2006 17:43:25 -0000 1.2 +++ perl-DBM-Deep.spec 4 Mar 2008 21:47:25 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-DBM-Deep Version: 0.983 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A pure perl multi-level hash/array DBM -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DBM-Deep/ Source0: http://www.cpan.org/modules/by-module/DBM/DBM-Deep-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 0.983-3 +- rebuild for new perl + * Fri Sep 08 2006 Andreas Thienemann - 0.983-2 - FE6 Rebuild From fedora-extras-commits at redhat.com Tue Mar 4 21:48:20 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Tue, 4 Mar 2008 21:48:20 GMT Subject: rpms/grub/devel grub.spec,1.66,1.67 Message-ID: <200803042148.m24LmKgr017181@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17118 Modified Files: grub.spec Log Message: * Tue Mar 04 2008 Peter Jones - 0.97-26 - Move grub.efi to a more useful location. Index: grub.spec =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- grub.spec 28 Feb 2008 00:17:17 -0000 1.66 +++ grub.spec 4 Mar 2008 21:47:42 -0000 1.67 @@ -1,6 +1,6 @@ Name: grub Version: 0.97 -Release: 25%{?dist} +Release: 26%{?dist} Summary: GRUB - the Grand Unified Boot Loader. Group: System Environment/Base License: GPLv2+ @@ -41,7 +41,9 @@ make rm -fr $RPM_BUILD_ROOT %makeinstall sbindir=${RPM_BUILD_ROOT}/sbin -#mv ${RPM_BUILD_ROOT}/sbin/grub ${RPM_BUILD_ROOT}/sbin/grub-efi +# is there a better way to do this? +mkdir -m 0755 -p ${RPM_BUILD_ROOT}/boot/efi/EFI/redhat/ +mv ${RPM_BUILD_ROOT}/%{_datadir}/grub/*/grub.efi ${RPM_BUILD_ROOT}/boot/efi/EFI/redhat/grub.efi make clean autoreconf autoconf @@ -75,6 +77,8 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog NEWS README COPYING TODO docs/menu.lst /boot/grub +/boot/efi/EFI/redhat +/boot/efi/EFI/redhat/grub.efi /sbin/grub /sbin/grub-install /sbin/grub-terminfo @@ -84,9 +88,11 @@ %{_infodir}/multiboot* %{_mandir}/man*/* %{_datadir}/grub -#/sbin/grub-efi %changelog +* Tue Mar 04 2008 Peter Jones - 0.97-26 +- Move grub.efi to a more useful location. + * Wed Feb 27 2008 Peter Jones - 0.97-25 - Fix memory allocation bug in EFI on i386 and x86_64. From fedora-extras-commits at redhat.com Tue Mar 4 21:49:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 21:49:21 GMT Subject: rpms/perl-Algorithm-C3/devel perl-Algorithm-C3.spec,1.4,1.5 Message-ID: <200803042149.m24LnLBE017232@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Algorithm-C3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17193 Modified Files: perl-Algorithm-C3.spec Log Message: new perl Index: perl-Algorithm-C3.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Algorithm-C3/devel/perl-Algorithm-C3.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Algorithm-C3.spec 31 May 2007 22:38:56 -0000 1.4 +++ perl-Algorithm-C3.spec 4 Mar 2008 21:48:47 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-Algorithm-C3 Version: 0.07 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Module for merging hierarchies using the C3 algorithm -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Algorithm-C3/ Source0: http://www.cpan.org/authors/id/B/BL/BLBLACK/Algorithm-C3-%{version}.tar.gz @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 0.07-2 +- rebuild for new perl + * Thu May 31 2007 Chris Weyl 0.07-1 - update to 0.07 - include t/ in doc From fedora-extras-commits at redhat.com Tue Mar 4 21:50:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 21:50:27 GMT Subject: rpms/perl-Class-C3-XS/devel perl-Class-C3-XS.spec,1.7,1.8 Message-ID: <200803042150.m24LoRUw017357@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-C3-XS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17282 Modified Files: perl-Class-C3-XS.spec Log Message: new perl Index: perl-Class-C3-XS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-C3-XS/devel/perl-Class-C3-XS.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Class-C3-XS.spec 18 Feb 2008 23:08:27 -0000 1.7 +++ perl-Class-C3-XS.spec 4 Mar 2008 21:49:51 -0000 1.8 @@ -1,8 +1,8 @@ Name: perl-Class-C3-XS Version: 0.08 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XS speedups for Class::C3 -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-C3-XS/ Source0: http://www.cpan.org/authors/id/B/BL/BLBLACK/Class-C3-XS-%{version}.tar.gz @@ -71,6 +71,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 0.08-4 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.08-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 21:53:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 21:53:32 GMT Subject: rpms/perl-Sub-Name/devel perl-Sub-Name.spec,1.5,1.6 Message-ID: <200803042153.m24LrWLg017457@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Sub-Name/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17428 Modified Files: perl-Sub-Name.spec Log Message: new perl Index: perl-Sub-Name.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sub-Name/devel/perl-Sub-Name.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Sub-Name.spec 18 Feb 2008 23:32:30 -0000 1.5 +++ perl-Sub-Name.spec 4 Mar 2008 21:52:52 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Sub-Name Version: 0.02 -Release: 4%{?dist}.1 +Release: 5%{?dist} Summary: Name -- or rename -- a sub License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway - 0.02-5 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.02-4.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 22:06:38 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Tue, 4 Mar 2008 22:06:38 GMT Subject: rpms/kerneloops/F-8 kerneloops.spec,1.5,1.6 Message-ID: <200803042206.m24M6cZR024862@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kerneloops/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24835 Modified Files: kerneloops.spec Log Message: * Tue Mar 04 2008 Chuck Ebbert 0.10-6 - Fix the preun script to use a numeric comparison. Index: kerneloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/F-8/kerneloops.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kerneloops.spec 4 Mar 2008 20:34:38 -0000 1.5 +++ kerneloops.spec 4 Mar 2008 22:06:01 -0000 1.6 @@ -1,6 +1,6 @@ Name: kerneloops Version: 0.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tool to automatically collect and submit kernel crash signatures Group: System Environment/Base @@ -57,14 +57,12 @@ %post /sbin/chkconfig --add %{name} - %preun -if [ $1 = 0 ]; then +if [ $1 -eq 0 ]; then /sbin/service %{name} stop > /dev/null 2>&1 /sbin/chkconfig --del %{name} fi - %files -f %{name}.lang %defattr(-,root,root) %doc COPYING Changelog @@ -78,6 +76,9 @@ %{_mandir}/man8/kerneloops.8.gz %changelog +* Tue Mar 04 2008 Chuck Ebbert 0.10-6 +- Fix the preun script to use a numeric comparison. + * Tue Mar 04 2008 Chuck Ebbert 0.10-5 - Require syslog to be running when shutting down. (F9#433413) From fedora-extras-commits at redhat.com Tue Mar 4 22:08:13 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Tue, 4 Mar 2008 22:08:13 GMT Subject: rpms/selinux-policy/F-8 policy-20070703.patch, 1.190, 1.191 selinux-policy.spec, 1.616, 1.617 Message-ID: <200803042208.m24M8DK3024945@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24922 Modified Files: policy-20070703.patch selinux-policy.spec Log Message: * Tue Mar 4 2008 Dan Walsh 3.0.8-91 - Allow rpc.mountd to write to lvm_control_t chr_file policy-20070703.patch: Index: policy-20070703.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- policy-20070703.patch 4 Mar 2008 21:37:10 -0000 1.190 +++ policy-20070703.patch 4 Mar 2008 22:08:07 -0000 1.191 @@ -14343,7 +14343,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.0.8/policy/modules/services/rpc.te --- nsaserefpolicy/policy/modules/services/rpc.te 2007-10-22 13:21:39.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/rpc.te 2008-01-30 09:24:12.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/rpc.te 2008-03-04 17:02:21.000000000 -0500 @@ -59,10 +59,14 @@ manage_files_pattern(rpcd_t,rpcd_var_run_t,rpcd_var_run_t) files_pid_filetrans(rpcd_t,rpcd_var_run_t,file) @@ -14389,7 +14389,7 @@ +dev_dontaudit_getattr_all_blk_files(nfsd_t) +dev_dontaudit_getattr_all_chr_files(nfsd_t) -+dev_read_lvm_control(nfsd_t) ++dev_rw_lvm_control(nfsd_t) +storage_dontaudit_raw_read_fixed_disk(nfsd_t) + # for /proc/fs/nfs/exports - should we have a new type? Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/selinux-policy.spec,v retrieving revision 1.616 retrieving revision 1.617 diff -u -r1.616 -r1.617 --- selinux-policy.spec 4 Mar 2008 21:37:10 -0000 1.616 +++ selinux-policy.spec 4 Mar 2008 22:08:07 -0000 1.617 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.0.8 -Release: 90%{?dist} +Release: 91%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -381,6 +381,9 @@ %endif %changelog +* Tue Mar 4 2008 Dan Walsh 3.0.8-91 +- Allow rpc.mountd to write to lvm_control_t chr_file + * Tue Mar 4 2008 Dan Walsh 3.0.8-90 - Allow mozilla to auth_use_nsswitch - Change location of mock From fedora-extras-commits at redhat.com Tue Mar 4 22:13:34 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 4 Mar 2008 22:13:34 GMT Subject: rpms/R-multcomp/devel R-multcomp.spec,1.5,1.6 Message-ID: <200803042213.m24MDYDu025087@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-multcomp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25062 Modified Files: R-multcomp.spec Log Message: Use --no-latex in check Index: R-multcomp.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- R-multcomp.spec 4 Mar 2008 21:34:09 -0000 1.5 +++ R-multcomp.spec 4 Mar 2008 22:12:59 -0000 1.6 @@ -42,7 +42,10 @@ %check -%{_bindir}/R CMD check --no-install %{packname} +#We have to use --no-install because we don't have all of the suggested +#dependencies +#We use --no-latex because it is broken with --no-install +%{_bindir}/R CMD check --no-install --no-latex %{packname} %clean From fedora-extras-commits at redhat.com Tue Mar 4 22:16:20 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Tue, 4 Mar 2008 22:16:20 GMT Subject: rpms/gnustep-make/F-7 gnustep-make.spec,1.2,1.3 Message-ID: <200803042216.m24MGKuN025234@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/gnustep-make/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25176/F-7 Modified Files: gnustep-make.spec Log Message: Fix #435924 Index: gnustep-make.spec =================================================================== RCS file: /cvs/extras/rpms/gnustep-make/F-7/gnustep-make.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnustep-make.spec 23 Feb 2008 10:38:03 -0000 1.2 +++ gnustep-make.spec 4 Mar 2008 22:15:40 -0000 1.3 @@ -3,7 +3,7 @@ Summary: GNUstep makefile package Name: gnustep-make Version: 2.0.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Development/Tools URL: http://www.gnustep.org/ @@ -38,6 +38,7 @@ %if %{with docs} make -C Documentation GNUSTEP_MAKEFILES=%{buildroot}%{_datadir}/GNUstep/Makefiles make -C Documentation install GNUSTEP_MAKEFILES=%{buildroot}%{_datadir}/GNUstep/Makefiles DESTDIR=%{buildroot} +mv %{buildroot}%{_infodir}/make.info %{buildroot}%{_infodir}/gnustep-make.info %else mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} %endif @@ -61,6 +62,9 @@ %endif %changelog +* Tue Mar 4 2008 Axel Thimm - 2.0.4-9 +- Really fix the make.info clash. + * Fri Feb 22 2008 Axel Thimm - 2.0.4-8 - Rename make.info to avoid clash with GNU make. From fedora-extras-commits at redhat.com Tue Mar 4 22:16:29 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Tue, 4 Mar 2008 22:16:29 GMT Subject: rpms/gnustep-make/F-8 gnustep-make.spec,1.3,1.4 Message-ID: <200803042216.m24MGTCE025237@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/gnustep-make/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25176/F-8 Modified Files: gnustep-make.spec Log Message: Fix #435924 Index: gnustep-make.spec =================================================================== RCS file: /cvs/extras/rpms/gnustep-make/F-8/gnustep-make.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnustep-make.spec 23 Feb 2008 10:38:13 -0000 1.3 +++ gnustep-make.spec 4 Mar 2008 22:15:50 -0000 1.4 @@ -3,7 +3,7 @@ Summary: GNUstep makefile package Name: gnustep-make Version: 2.0.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Development/Tools URL: http://www.gnustep.org/ @@ -38,6 +38,7 @@ %if %{with docs} make -C Documentation GNUSTEP_MAKEFILES=%{buildroot}%{_datadir}/GNUstep/Makefiles make -C Documentation install GNUSTEP_MAKEFILES=%{buildroot}%{_datadir}/GNUstep/Makefiles DESTDIR=%{buildroot} +mv %{buildroot}%{_infodir}/make.info %{buildroot}%{_infodir}/gnustep-make.info %else mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} %endif @@ -61,6 +62,9 @@ %endif %changelog +* Tue Mar 4 2008 Axel Thimm - 2.0.4-9 +- Really fix the make.info clash. + * Fri Feb 22 2008 Axel Thimm - 2.0.4-8 - Rename make.info to avoid clash with GNU make. From fedora-extras-commits at redhat.com Tue Mar 4 22:16:38 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Tue, 4 Mar 2008 22:16:38 GMT Subject: rpms/gnustep-make/devel gnustep-make.spec,1.4,1.5 Message-ID: <200803042216.m24MGc3t025247@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/gnustep-make/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25176/devel Modified Files: gnustep-make.spec Log Message: Fix #435924 Index: gnustep-make.spec =================================================================== RCS file: /cvs/extras/rpms/gnustep-make/devel/gnustep-make.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnustep-make.spec 23 Feb 2008 10:38:18 -0000 1.4 +++ gnustep-make.spec 4 Mar 2008 22:15:59 -0000 1.5 @@ -3,7 +3,7 @@ Summary: GNUstep makefile package Name: gnustep-make Version: 2.0.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Development/Tools URL: http://www.gnustep.org/ @@ -38,6 +38,7 @@ %if %{with docs} make -C Documentation GNUSTEP_MAKEFILES=%{buildroot}%{_datadir}/GNUstep/Makefiles make -C Documentation install GNUSTEP_MAKEFILES=%{buildroot}%{_datadir}/GNUstep/Makefiles DESTDIR=%{buildroot} +mv %{buildroot}%{_infodir}/make.info %{buildroot}%{_infodir}/gnustep-make.info %else mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} %endif @@ -61,6 +62,9 @@ %endif %changelog +* Tue Mar 4 2008 Axel Thimm - 2.0.4-9 +- Really fix the make.info clash. + * Fri Feb 22 2008 Axel Thimm - 2.0.4-8 - Rename make.info to avoid clash with GNU make. From fedora-extras-commits at redhat.com Tue Mar 4 22:27:42 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Tue, 4 Mar 2008 22:27:42 GMT Subject: rpms/kerneloops/devel kerneloops-require-syslog-on-shutdown.patch, NONE, 1.1 kerneloops.spec, 1.4, 1.5 Message-ID: <200803042227.m24MRgF9025534@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kerneloops/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25507 Modified Files: kerneloops.spec Added Files: kerneloops-require-syslog-on-shutdown.patch Log Message: * Tue Mar 04 2008 Chuck Ebbert 0.10-6 - Fix the preun script to use a numeric comparison. - Require syslog to be running when shutting down. (#433413) kerneloops-require-syslog-on-shutdown.patch: --- NEW FILE kerneloops-require-syslog-on-shutdown.patch --- Index: kerneloops-0.10/kerneloops.init =================================================================== --- kerneloops-0.10.orig/kerneloops.init +++ kerneloops-0.10/kerneloops.init @@ -14,7 +14,7 @@ # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 # Required-Start: $local_fs $remote_fs $named $network $time $syslog -# Required-Stop: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs $syslog # Short-Description: Tool to automatically collect and submit kernel crash signatures # Description: A tool that collects and submits kernel crash # signatures to the kerneloops.org website for use by the Linux Index: kerneloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/kerneloops/devel/kerneloops.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kerneloops.spec 4 Mar 2008 19:07:13 -0000 1.4 +++ kerneloops.spec 4 Mar 2008 22:27:04 -0000 1.5 @@ -1,6 +1,6 @@ Name: kerneloops Version: 0.10 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Tool to automatically collect and submit kernel crash signatures Group: System Environment/Base @@ -9,6 +9,7 @@ Source0: http://www.kerneloops.org/download/%{name}-%{version}.tar.gz Patch0: kerneloops-fix-manfile-name.patch Patch1: kerneloops-ignore-module-list.patch +Patch2: kerneloops-require-syslog-on-shutdown.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -32,6 +33,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -53,9 +55,8 @@ %post /sbin/chkconfig --add %{name} - %preun -if [ $1 = 0 ]; then +if [ $1 -eq 0 ]; then /sbin/service %{name} stop > /dev/null 2>&1 /sbin/chkconfig --del %{name} fi @@ -74,6 +75,10 @@ %doc %{_mandir}/man8/kerneloops.8.gz %changelog +* Tue Mar 04 2008 Chuck Ebbert 0.10-6 +- Fix the preun script to use a numeric comparison. +- Require syslog to be running when shutting down. (#433413) + * Tue Mar 04 2008 Chuck Ebbert 0.10-4 - Ignore "Modules linked in" when scanning for oopses. From fedora-extras-commits at redhat.com Tue Mar 4 22:36:04 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 4 Mar 2008 22:36:04 GMT Subject: rpms/totem/devel .cvsignore,1.58,1.59 sources,1.58,1.59 Message-ID: <200803042236.m24Ma4W0025745@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25705 Modified Files: .cvsignore sources Log Message: Updated sources for 2.23.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- .cvsignore 3 Mar 2008 19:49:53 -0000 1.58 +++ .cvsignore 4 Mar 2008 22:35:27 -0000 1.59 @@ -1 +1 @@ -totem-2.21.96.tar.bz2 +totem-2.23.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 3 Mar 2008 19:49:53 -0000 1.58 +++ sources 4 Mar 2008 22:35:27 -0000 1.59 @@ -1 +1 @@ -b30afe9ea4ed467ac97bfb44fc9d34ad totem-2.21.96.tar.bz2 +c9b8e98223ab0dcc71251d479b04cea6 totem-2.23.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 4 22:38:46 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Tue, 4 Mar 2008 22:38:46 GMT Subject: rpms/synaptics/devel synaptics.spec,1.29,1.30 Message-ID: <200803042238.m24MckQX025975@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/synaptics/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25923 Modified Files: synaptics.spec Log Message: * Wed Mar 05 2008 Dave Airlie 0.14.6-3 - rebuild for ppc64 Index: synaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/synaptics/devel/synaptics.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- synaptics.spec 19 Feb 2008 10:25:49 -0000 1.29 +++ synaptics.spec 4 Mar 2008 22:38:08 -0000 1.30 @@ -2,7 +2,7 @@ Name: synaptics Version: 0.14.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Synaptics Touchpad Driver Group: User Interface/X Hardware Support @@ -18,7 +18,7 @@ Requires: xorg-x11-server-Xorg >= 1.0.99.901 # This is what it should be, but the buildsystem is a disaster # ExcludeArch: s390 s390x -ExclusiveArch: %{ix86} x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc ppc64 %description This is a driver for the Synaptics TouchPad for XOrg/XFree86 4.x. A Synaptics @@ -73,6 +73,9 @@ %{_mandir}/man?/* %changelog +* Wed Mar 05 2008 Dave Airlie 0.14.6-3 +- rebuild for ppc64 + * Tue Feb 19 2008 Fedora Release Engineering - 0.14.6-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 4 22:38:46 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Tue, 4 Mar 2008 22:38:46 GMT Subject: rpms/synaptics/F-8 synaptics.spec,1.27,1.28 Message-ID: <200803042238.m24MckDO025978@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/synaptics/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25911 Modified Files: synaptics.spec Log Message: * Wed Mar 05 2008 Dave Airlie 0.14.6-2 - rebuild for ppc64 Index: synaptics.spec =================================================================== RCS file: /cvs/pkgs/rpms/synaptics/F-8/synaptics.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- synaptics.spec 7 Jan 2008 16:42:39 -0000 1.27 +++ synaptics.spec 4 Mar 2008 22:37:58 -0000 1.28 @@ -2,7 +2,7 @@ Name: synaptics Version: 0.14.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Synaptics Touchpad Driver Group: User Interface/X Hardware Support @@ -18,7 +18,7 @@ Requires: xorg-x11-server-Xorg >= 1.0.99.901 # This is what it should be, but the buildsystem is a disaster # ExcludeArch: s390 s390x -ExclusiveArch: %{ix86} x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc ppc64 %description This is a driver for the Synaptics TouchPad for XOrg/XFree86 4.x. A Synaptics @@ -73,6 +73,9 @@ %{_mandir}/man?/* %changelog +* Wed Mar 05 2008 Dave Airlie 0.14.6-2 +- rebuild for ppc64 + * Mon Jan 07 2008 Jarod Wilson 0.14.6-1 - Update to 0.14.6 w/permission from krh - Adds two-finger scrolling capability on supported hardware From fedora-extras-commits at redhat.com Tue Mar 4 22:39:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Tue, 4 Mar 2008 22:39:55 GMT Subject: rpms/kvm/devel kvm-62-e1000-default.patch, NONE, 1.1 kvm.spec, 1.45, 1.46 Message-ID: <200803042239.m24MdtVa026126@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/kvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26035 Modified Files: kvm.spec Added Files: kvm-62-e1000-default.patch Log Message: Make e1000 the default network driver kvm-62-e1000-default.patch: --- NEW FILE kvm-62-e1000-default.patch --- diff -Nur kvm-62.orig/kvm kvm-62/kvm --- kvm-62.orig/kvm 2008-02-25 04:30:14.000000000 -0500 +++ kvm-62/kvm 2008-03-04 00:11:05.000000000 -0500 @@ -58,7 +58,7 @@ optparser.add_option('--nictype', help = 'use this specific nic type (vendor)', dest = 'nictype', - default = 'rtl8139', + default = 'e1000', ) optparser.add_option('--mac', diff -Nur kvm-62.orig/qemu/hw/pc.c kvm-62/qemu/hw/pc.c --- kvm-62.orig/qemu/hw/pc.c 2008-02-25 04:30:14.000000000 -0500 +++ kvm-62/qemu/hw/pc.c 2008-03-04 12:56:50.000000000 -0500 @@ -1000,7 +1000,7 @@ nd = &nd_table[i]; if (!nd->model) { if (pci_enabled) { - nd->model = "rtl8139"; + nd->model = "e1000"; } else { nd->model = "ne2k_isa"; } diff -Nur kvm-62.orig/qemu/vl.c kvm-62/qemu/vl.c --- kvm-62.orig/qemu/vl.c 2008-03-04 00:08:22.000000000 -0500 +++ kvm-62/qemu/vl.c 2008-03-04 01:00:36.000000000 -0500 @@ -9450,7 +9450,7 @@ char buf[1024]; if (net_boot & (1 << i)) { if (model == NULL) - model = "rtl8139"; + model = "e1000"; snprintf(buf, sizeof(buf), "%s/pxe-%s.bin", bios_dir, model); if (get_image_size(buf) > 0) { if (nb_option_roms >= MAX_OPTION_ROMS) { Index: kvm.spec =================================================================== RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- kvm.spec 4 Mar 2008 04:39:06 -0000 1.45 +++ kvm.spec 4 Mar 2008 22:39:18 -0000 1.46 @@ -1,7 +1,7 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 62 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net @@ -10,6 +10,7 @@ Patch0: kvm-62-defaults.patch Patch1: %{name}-bootmenu.patch Patch2: %{name}-62-block-rw-range-check.patch +Patch3: %{name}-62-e1000-default.patch # patches from upstream qemu BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -41,6 +42,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # we need to install the data bits in a different path @@ -95,6 +97,9 @@ %{_sysconfdir}/sysconfig/modules/%{name}.modules %changelog +* Tue Mar 4 2008 Kevin Fenzi - 62-4 +- Make e1000 the default network driver + * Mon Mar 3 2008 Jeremy Katz - 62-3 - Default to vmwaresvga now that it's been fixed to work From fedora-extras-commits at redhat.com Tue Mar 4 22:40:02 2008 From: fedora-extras-commits at redhat.com (Till Maas (till)) Date: Tue, 4 Mar 2008 22:40:02 GMT Subject: rpms/offlineimap/devel .cvsignore, 1.5, 1.6 offlineimap.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200803042240.m24Me2jh026134@cvs-int.fedora.redhat.com> Author: till Update of /cvs/pkgs/rpms/offlineimap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26096 Modified Files: .cvsignore offlineimap.spec sources Log Message: * Tue Mar 04 2008 Till Maas - 5.99.7-1 - Update to latest version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/offlineimap/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Mar 2008 09:23:36 -0000 1.5 +++ .cvsignore 4 Mar 2008 22:39:28 -0000 1.6 @@ -1 +1 @@ -offlineimap_5.99.6.tar.gz +offlineimap_5.99.7.tar.gz Index: offlineimap.spec =================================================================== RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- offlineimap.spec 4 Mar 2008 09:23:36 -0000 1.14 +++ offlineimap.spec 4 Mar 2008 22:39:28 -0000 1.15 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: offlineimap -Version: 5.99.6 +Version: 5.99.7 Release: 1%{?dist} Summary: Powerful IMAP/Maildir synchronization and reader support @@ -63,6 +63,9 @@ %changelog +* Tue Mar 04 2008 Till Maas - 5.99.7-1 +- Update to latest version + * Tue Mar 04 2008 Till Maas - 5.99.6-1 - Update to latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/offlineimap/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Mar 2008 09:23:36 -0000 1.5 +++ sources 4 Mar 2008 22:39:28 -0000 1.6 @@ -1 +1 @@ -d042ea91b01953883c8022269199c797 offlineimap_5.99.6.tar.gz +326363648efa7ecaa16a36e52c4a6e05 offlineimap_5.99.7.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 22:42:33 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 4 Mar 2008 22:42:33 GMT Subject: rpms/glest-data/F-8 .cvsignore, 1.6, 1.7 glest-data.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200803042242.m24MgXgN026306@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/glest-data/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/F-8 Modified Files: .cvsignore glest-data.spec sources Log Message: * Tue Mar 04 2008 Aurelien Bompard 3.1.2-1 - version 3.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glest-data/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Feb 2008 06:50:08 -0000 1.6 +++ .cvsignore 4 Mar 2008 22:42:00 -0000 1.7 @@ -1,2 +1,2 @@ -glest_data_3.1.1.zip -glest-translations-3.1.1.tar.gz +glest_data_3.1.2.zip +glest-translations-3.1.2.tar.gz Index: glest-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/glest-data/F-8/glest-data.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- glest-data.spec 27 Feb 2008 06:50:08 -0000 1.9 +++ glest-data.spec 4 Mar 2008 22:42:00 -0000 1.10 @@ -1,5 +1,5 @@ Name: glest-data -Version: 3.1.1 +Version: 3.1.2 Release: 1%{?dist} Summary: Data files for the game Glest @@ -79,6 +79,9 @@ %changelog +* Tue Mar 04 2008 Aurelien Bompard 3.1.2-1 +- version 3.1.2 + * Tue Feb 26 2008 Aurelien Bompard 3.1.1-1 - version 3.1.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glest-data/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Feb 2008 06:50:08 -0000 1.6 +++ sources 4 Mar 2008 22:42:00 -0000 1.7 @@ -1,2 +1,2 @@ -105ff9beae823cdf8b93f8193b8a3304 glest_data_3.1.1.zip -39df445a8baa1525bcf46bd7e7180413 glest-translations-3.1.1.tar.gz +0b1d463c6c7a838d8737728eaff07a81 glest_data_3.1.2.zip +f8dad413229a6b1d5effbd274c1f2b4a glest-translations-3.1.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 22:42:44 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 4 Mar 2008 22:42:44 GMT Subject: rpms/glest-data/devel .cvsignore, 1.6, 1.7 glest-data.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200803042242.m24MgilR026311@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/glest-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/devel Modified Files: .cvsignore glest-data.spec sources Log Message: * Tue Mar 04 2008 Aurelien Bompard 3.1.2-1 - version 3.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glest-data/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Feb 2008 06:50:12 -0000 1.6 +++ .cvsignore 4 Mar 2008 22:42:04 -0000 1.7 @@ -1,2 +1,2 @@ -glest_data_3.1.1.zip -glest-translations-3.1.1.tar.gz +glest_data_3.1.2.zip +glest-translations-3.1.2.tar.gz Index: glest-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/glest-data/devel/glest-data.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- glest-data.spec 27 Feb 2008 06:50:12 -0000 1.9 +++ glest-data.spec 4 Mar 2008 22:42:04 -0000 1.10 @@ -1,5 +1,5 @@ Name: glest-data -Version: 3.1.1 +Version: 3.1.2 Release: 1%{?dist} Summary: Data files for the game Glest @@ -79,6 +79,9 @@ %changelog +* Tue Mar 04 2008 Aurelien Bompard 3.1.2-1 +- version 3.1.2 + * Tue Feb 26 2008 Aurelien Bompard 3.1.1-1 - version 3.1.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glest-data/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Feb 2008 06:50:12 -0000 1.6 +++ sources 4 Mar 2008 22:42:04 -0000 1.7 @@ -1,2 +1,2 @@ -105ff9beae823cdf8b93f8193b8a3304 glest_data_3.1.1.zip -39df445a8baa1525bcf46bd7e7180413 glest-translations-3.1.1.tar.gz +0b1d463c6c7a838d8737728eaff07a81 glest_data_3.1.2.zip +f8dad413229a6b1d5effbd274c1f2b4a glest-translations-3.1.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 22:49:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 22:49:40 GMT Subject: rpms/perl-Object-InsideOut/devel .cvsignore, 1.7, 1.8 perl-Object-InsideOut.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <200803042249.m24MneCg026465@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Object-InsideOut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26426 Modified Files: .cvsignore perl-Object-InsideOut.spec sources Log Message: 3.38 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Object-InsideOut/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Oct 2006 02:28:44 -0000 1.7 +++ .cvsignore 4 Mar 2008 22:49:05 -0000 1.8 @@ -1 +1 @@ -Object-InsideOut-2.06.tar.gz +Object-InsideOut-3.38.tar.gz Index: perl-Object-InsideOut.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Object-InsideOut/devel/perl-Object-InsideOut.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Object-InsideOut.spec 4 Mar 2008 18:36:50 -0000 1.8 +++ perl-Object-InsideOut.spec 4 Mar 2008 22:49:05 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Object-InsideOut -Version: 2.06 -Release: 2%{?dist} +Version: 3.38 +Release: 1%{?dist} Summary: Comprehensive inside-out object support module Group: Development/Libraries @@ -33,6 +33,15 @@ %prep %setup -q -n Object-InsideOut-%{version} +# Filter unwanted Requires, have to break the loop +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ + sed -e '/perl(Math::Random::MT::Auto)/d' +EOF + +%define __perl_requires %{_builddir}/Object-InsideOut-%{version}/%{name}-req +chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -65,6 +74,9 @@ %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 3.38-1 +- 3.38 + * Tue Mar 04 2008 Tom "spot" Callaway 2.06-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Object-InsideOut/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Oct 2006 02:28:44 -0000 1.7 +++ sources 4 Mar 2008 22:49:05 -0000 1.8 @@ -1 +1 @@ -e2d461cf6248f8b934e7b0d50ee403e9 Object-InsideOut-2.06.tar.gz +9293b3ebf776b696f14addd5cd4a3b04 Object-InsideOut-3.38.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 22:50:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 22:50:47 GMT Subject: rpms/perl-Math-Random-MT-Auto/devel .cvsignore, 1.3, 1.4 perl-Math-Random-MT-Auto.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200803042250.m24MolOv026537@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Math-Random-MT-Auto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26510 Modified Files: .cvsignore perl-Math-Random-MT-Auto.spec sources Log Message: 6.12 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Random-MT-Auto/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Aug 2007 21:59:26 -0000 1.3 +++ .cvsignore 4 Mar 2008 22:50:05 -0000 1.4 @@ -1 +1 @@ -Math-Random-MT-Auto-6.02.tar.gz +Math-Random-MT-Auto-6.12.tar.gz Index: perl-Math-Random-MT-Auto.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Random-MT-Auto/devel/perl-Math-Random-MT-Auto.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Math-Random-MT-Auto.spec 4 Mar 2008 18:38:06 -0000 1.5 +++ perl-Math-Random-MT-Auto.spec 4 Mar 2008 22:50:05 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Math-Random-MT-Auto -Version: 6.02 -Release: 4%{?dist} +Version: 6.12 +Release: 1%{?dist} Summary: Auto-seeded Mersenne Twister PRNGs License: BSD Group: Development/Libraries @@ -64,6 +64,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway - 6.12-1 +- 6.12 + * Tue Mar 04 2008 Tom "spot" Callaway - 6.02-4 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Random-MT-Auto/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Aug 2007 21:59:26 -0000 1.3 +++ sources 4 Mar 2008 22:50:05 -0000 1.4 @@ -1 +1 @@ -d857b4b7628f4fba24182614cb9a6f0e Math-Random-MT-Auto-6.02.tar.gz +e7cdbbadbe316aecb2fa390bc3285f22 Math-Random-MT-Auto-6.12.tar.gz From fedora-extras-commits at redhat.com Tue Mar 4 22:53:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 22:53:00 GMT Subject: rpms/perl-Class-C3/devel perl-Class-C3.spec,1.7,1.8 Message-ID: <200803042253.m24Mr08M026641@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-C3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26611 Modified Files: perl-Class-C3.spec Log Message: new perl Index: perl-Class-C3.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-C3/devel/perl-Class-C3.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Class-C3.spec 24 Oct 2007 06:33:49 -0000 1.7 +++ perl-Class-C3.spec 4 Mar 2008 22:52:18 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Class-C3 Version: 0.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Pragma to use the C3 method resolution order algorithm License: GPL+ or Artistic Group: Development/Libraries @@ -74,6 +74,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 0.19-2 +- rebuild for new perl + * Wed Oct 10 2007 Chris Weyl 0.19-1 - update to 0.19 From fedora-extras-commits at redhat.com Tue Mar 4 22:53:52 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 22:53:52 GMT Subject: rpms/perl-Class-C3-Componentised/devel perl-Class-C3-Componentised.spec, 1.2, 1.3 Message-ID: <200803042253.m24MrqrA026712@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-C3-Componentised/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26683 Modified Files: perl-Class-C3-Componentised.spec Log Message: new perl Index: perl-Class-C3-Componentised.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-C3-Componentised/devel/perl-Class-C3-Componentised.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-C3-Componentised.spec 6 Dec 2007 21:53:59 -0000 1.2 +++ perl-Class-C3-Componentised.spec 4 Mar 2008 22:53:18 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Class-C3-Componentised Version: 1.0001 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Load mix-ins or components to your C3-based class License: GPL+ or Artistic Group: Development/Libraries @@ -72,6 +72,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 1.0001-5 +- rebuild for new perl + * Thu Dec 06 2007 Chris Weyl 1.0001-4 - bump From fedora-extras-commits at redhat.com Tue Mar 4 22:55:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 22:55:24 GMT Subject: rpms/perl-Sub-Identify/devel perl-Sub-Identify.spec,1.4,1.5 Message-ID: <200803042255.m24MtOR2026846@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Sub-Identify/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26785 Modified Files: perl-Sub-Identify.spec Log Message: new perl Index: perl-Sub-Identify.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sub-Identify/devel/perl-Sub-Identify.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Sub-Identify.spec 17 Oct 2007 03:42:12 -0000 1.4 +++ perl-Sub-Identify.spec 4 Mar 2008 22:54:41 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Sub-Identify Version: 0.02 -Release: 2%{?dist}.2 +Release: 3%{?dist} Summary: Retrieve names of code references License: GPL+ or Artistic Group: Development/Libraries @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 0.02-3 +- rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway 0.02-2.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Tue Mar 4 22:55:50 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Tue, 4 Mar 2008 22:55:50 GMT Subject: rpms/gtk-sharp2/devel gtk-sharp2-2.10.3-assemblydir.patch, NONE, 1.1 gtk-sharp2.spec, 1.27, 1.28 Message-ID: <200803042255.m24Mtox7026907@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gtk-sharp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26825 Modified Files: gtk-sharp2.spec Added Files: gtk-sharp2-2.10.3-assemblydir.patch Log Message: updated files & added new patch gtk-sharp2-2.10.3-assemblydir.patch: --- NEW FILE gtk-sharp2-2.10.3-assemblydir.patch --- diff -up gtk-sharp-2.10.3/gdk/Makefile.in.old gtk-sharp-2.10.3/gdk/Makefile.in --- gtk-sharp-2.10.3/gdk/Makefile.in.old 2008-03-04 19:30:47.000000000 +0100 +++ gtk-sharp-2.10.3/gdk/Makefile.in 2008-03-04 19:31:18.000000000 +0100 @@ -296,7 +296,7 @@ build_symbols = $(addprefix --symbols=$( build_customs = $(addprefix $(srcdir)/, $(customs)) api_includes = $(addprefix -I:, $(INCLUDE_API)) build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS) +build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll @PLATFORM_WIN32_FALSE at GAPI_CDECL_INSERT = @PLATFORM_WIN32_TRUE at GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY) all: all-recursive diff -up gtk-sharp-2.10.3/Makefile.include.old gtk-sharp-2.10.3/Makefile.include --- gtk-sharp-2.10.3/Makefile.include.old 2008-03-04 19:26:03.000000000 +0100 +++ gtk-sharp-2.10.3/Makefile.include 2008-03-04 19:26:43.000000000 +0100 @@ -54,7 +54,7 @@ $(POLICY_ASSEMBLIES): $(top_builddir)/po done build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS) +build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll if PLATFORM_WIN32 GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY) diff -up gtk-sharp-2.10.3/parser/Makefile.in.old gtk-sharp-2.10.3/parser/Makefile.in --- gtk-sharp-2.10.3/parser/Makefile.in.old 2008-03-04 22:56:24.000000000 +0100 +++ gtk-sharp-2.10.3/parser/Makefile.in 2008-03-04 22:56:52.000000000 +0100 @@ -209,7 +209,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -assemblydir = $(prefix)/lib/gtk-sharp-2.0 +assemblydir = $(libdir)/gtk-sharp-2.0 pkgconfigdir = $(libdir)/pkgconfig assembly_DATA = gapi-fixup.exe gapi-parser.exe pkgconfig_DATA = gapi-2.0.pc diff -up gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in.old gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in --- gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in.old 2008-03-04 19:29:17.000000000 +0100 +++ gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in 2008-03-04 19:29:48.000000000 +0100 @@ -194,7 +194,7 @@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll -references = $(addprefix /r:, $(assemblies)) @MONO_CAIRO_LIBS@ +references = $(addprefix /r:, $(assemblies)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll TARGETS = GtkDemo.exe DEBUGS = $(addsuffix .mdb, $(TARGETS)) CLEANFILES = $(TARGETS) $(DEBUGS) diff -up gtk-sharp-2.10.3/pango/Makefile.in.old gtk-sharp-2.10.3/pango/Makefile.in --- gtk-sharp-2.10.3/pango/Makefile.in.old 2008-03-03 14:14:07.000000000 +0100 +++ gtk-sharp-2.10.3/pango/Makefile.in 2008-03-03 14:19:10.000000000 +0100 @@ -282,7 +282,7 @@ build_symbols = $(addprefix --symbols=$( build_customs = $(addprefix $(srcdir)/, $(customs)) api_includes = $(addprefix -I:, $(INCLUDE_API)) build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS) +build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll @PLATFORM_WIN32_FALSE at GAPI_CDECL_INSERT = @PLATFORM_WIN32_TRUE at GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY) all: all-recursive diff -up gtk-sharp-2.10.3/generator/Makefile.in.old gtk-sharp-2.10.3/generator/Makefile.in --- gtk-sharp-2.10.3/generator/Makefile.in.old 2008-03-04 22:57:56.000000000 +0100 +++ gtk-sharp-2.10.3/generator/Makefile.in 2008-03-04 22:58:16.000000000 +0100 @@ -205,7 +205,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -assemblydir = $(prefix)/lib/gtk-sharp-2.0 +assemblydir = $(libdir)/gtk-sharp-2.0 assembly_DATA = gapi_codegen.exe bin_SCRIPTS = gapi2-codegen CLEANFILES = gapi_codegen.exe diff -up gtk-sharp-2.10.3/glade/Makefile.in.old gtk-sharp-2.10.3/glade/Makefile.in --- gtk-sharp-2.10.3/glade/Makefile.in.old 2008-03-04 19:26:56.000000000 +0100 +++ gtk-sharp-2.10.3/glade/Makefile.in 2008-03-04 19:27:33.000000000 +0100 @@ -255,7 +255,7 @@ build_symbols = $(addprefix --symbols=$( build_customs = $(addprefix $(srcdir)/, $(customs)) api_includes = $(addprefix -I:, $(INCLUDE_API)) build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS) +build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll @PLATFORM_WIN32_FALSE at GAPI_CDECL_INSERT = @PLATFORM_WIN32_TRUE at GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY) all: all-recursive diff -up gtk-sharp-2.10.3/gtk/Makefile.in.old gtk-sharp-2.10.3/gtk/Makefile.in --- gtk-sharp-2.10.3/gtk/Makefile.in.old 2008-03-04 19:28:23.000000000 +0100 +++ gtk-sharp-2.10.3/gtk/Makefile.in 2008-03-04 19:28:55.000000000 +0100 @@ -365,7 +365,7 @@ build_symbols = $(addprefix --symbols=$( build_customs = $(addprefix $(srcdir)/, $(customs)) api_includes = $(addprefix -I:, $(INCLUDE_API)) build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS) +build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll @PLATFORM_WIN32_FALSE at GAPI_CDECL_INSERT = @PLATFORM_WIN32_TRUE at GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY) all: all-recursive diff -up gtk-sharp-2.10.3/atk/Makefile.in.old gtk-sharp-2.10.3/atk/Makefile.in --- gtk-sharp-2.10.3/atk/Makefile.in.old 2008-03-04 19:24:11.000000000 +0100 +++ gtk-sharp-2.10.3/atk/Makefile.in 2008-03-04 19:25:47.000000000 +0100 @@ -230,7 +230,7 @@ build_symbols = $(addprefix --symbols=$( build_customs = $(addprefix $(srcdir)/, $(customs)) api_includes = $(addprefix -I:, $(INCLUDE_API)) build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS) +build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll @PLATFORM_WIN32_FALSE at GAPI_CDECL_INSERT = @PLATFORM_WIN32_TRUE at GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY) all: all-am Index: gtk-sharp2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gtk-sharp2.spec 28 Feb 2008 00:05:01 -0000 1.27 +++ gtk-sharp2.spec 4 Mar 2008 22:55:15 -0000 1.28 @@ -1,6 +1,6 @@ Name: gtk-sharp2 Version: 2.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries @@ -12,6 +12,7 @@ #Patch1: gtk-sharp-2.9.0-monodir.patch Patch2: gtk-sharp2-2.10.3-libdir.patch Patch3: gtk-sharp-2.8.2-docfix.patch +Patch4: gtk-sharp2-2.10.3-assemblydir.patch BuildRequires: mono-devel gtk2-devel libglade2-devel BuildRequires: automake, libtool @@ -61,13 +62,11 @@ #%patch1 -p1 -b .monodir %patch2 -p1 -b .libdir %patch3 -p1 -b .docfix +%patch4 -p1 -b .assemblydir -#fix mono_dir -sed -i 's|@prefix@/lib|%{_libdir}|g' parser/gapi2-parser.in parser/gapi2-fixup.in %build -autoreconf --force --install - +#autoreconf --force --install export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure make @@ -76,6 +75,8 @@ %{__rm} -rf $RPM_BUILD_ROOT export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacdir %{_libdir} /root ${RPM_BUILD_ROOT}%{_libdir}" + +#Remove libtool archive %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.*a install -d $RPM_BUILD_ROOT%{_libdir}/monodoc/sources/ @@ -119,6 +120,9 @@ %{_libdir}/monodoc %changelog +* Mon Mar 03 2008 Xavier Lamien - 2.10.3-2 +- Fixed Assembly_dir on Rawhide (bug #434286). + * Wed Feb 27 2008 Xavier Lamien - 2.10.3-1 - Updated Release. - Updated -libdir.patch against new release. From fedora-extras-commits at redhat.com Tue Mar 4 22:56:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 4 Mar 2008 22:56:13 GMT Subject: rpms/perl-SUPER/devel perl-SUPER.spec,1.5,1.6 Message-ID: <200803042256.m24MuDTS026916@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SUPER/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26886 Modified Files: perl-SUPER.spec Log Message: new perl Index: perl-SUPER.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SUPER/devel/perl-SUPER.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-SUPER.spec 2 Jan 2008 03:46:15 -0000 1.5 +++ perl-SUPER.spec 4 Mar 2008 22:55:32 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-SUPER Version: 1.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Sane superclass method dispatcher License: GPL+ or Artistic Group: Development/Libraries @@ -56,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 1.16-3 +- rebuild for new perl + * Wed Jan 02 2008 Ralf Cors??pius 1.16-2 - Adjust License-tag. - BR: perl(Test::Simple) (BZ 419631). From fedora-extras-commits at redhat.com Tue Mar 4 22:57:43 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Tue, 4 Mar 2008 22:57:43 GMT Subject: rpms/gtk-sharp2/devel gtk-sharp2-2.10.3-libdir.patch,1.1,1.2 Message-ID: <200803042257.m24Mvhkv027000@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gtk-sharp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26977 Modified Files: gtk-sharp2-2.10.3-libdir.patch Log Message: . gtk-sharp2-2.10.3-libdir.patch: Index: gtk-sharp2-2.10.3-libdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/gtk-sharp2-2.10.3-libdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtk-sharp2-2.10.3-libdir.patch 28 Feb 2008 00:22:08 -0000 1.1 +++ gtk-sharp2-2.10.3-libdir.patch 4 Mar 2008 22:57:30 -0000 1.2 @@ -1,30 +1,85 @@ -diff -up gtk-sharp-2.10.3/parser/Makefile.am.old gtk-sharp-2.10.3/parser/Makefile.am ---- gtk-sharp-2.10.3/parser/Makefile.am.old 2008-02-28 00:41:27.000000000 +0100 -+++ gtk-sharp-2.10.3/parser/Makefile.am 2008-02-28 00:41:49.000000000 +0100 +diff -up gtk-sharp-2.10.3/parser/gapi2-parser.in.false gtk-sharp-2.10.3/parser/gapi2-parser.in +--- gtk-sharp-2.10.3/parser/gapi2-parser.in.false 2008-03-01 11:24:23.000000000 +0100 ++++ gtk-sharp-2.10.3/parser/gapi2-parser.in 2008-03-01 11:25:44.000000000 +0100 +@@ -1,3 +1,3 @@ + #!/bin/sh +-export PATH=@prefix@/lib/gtk-sharp-2.0:$PATH +- at RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi-parser.exe "$@" ++export PATH=@libdir@/gtk-sharp-2.0:$PATH ++ at RUNTIME@ @libdir@/gtk-sharp-2.0/gapi-parser.exe "$@" +diff -up gtk-sharp-2.10.3/parser/gapi2-fixup.in.false gtk-sharp-2.10.3/parser/gapi2-fixup.in +--- gtk-sharp-2.10.3/parser/gapi2-fixup.in.false 2008-03-01 11:23:55.000000000 +0100 ++++ gtk-sharp-2.10.3/parser/gapi2-fixup.in 2008-03-01 11:24:16.000000000 +0100 +@@ -1,2 +1,2 @@ + #!/bin/sh +- at RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi-fixup.exe "$@" ++ at RUNTIME@ @libdir@/gtk-sharp-2.0/gapi-fixup.exe "$@" +diff -up gtk-sharp-2.10.3/parser/Makefile.am.false gtk-sharp-2.10.3/parser/Makefile.am +--- gtk-sharp-2.10.3/parser/Makefile.am.false 2008-03-01 11:19:12.000000000 +0100 ++++ gtk-sharp-2.10.3/parser/Makefile.am 2008-03-01 11:19:26.000000000 +0100 @@ -1,4 +1,4 @@ -assemblydir = $(prefix)/lib/gtk-sharp-2.0 +assemblydir = $(libdir)/gtk-sharp-2.0 pkgconfigdir = $(libdir)/pkgconfig assembly_DATA = gapi-fixup.exe gapi-parser.exe pkgconfig_DATA = gapi-2.0.pc -diff -up gtk-sharp-2.10.3/glib/glib-sharp-2.0.pc.in.old gtk-sharp-2.10.3/glib/glib-sharp-2.0.pc.in ---- gtk-sharp-2.10.3/glib/glib-sharp-2.0.pc.in.old 2008-02-28 00:42:18.000000000 +0100 -+++ gtk-sharp-2.10.3/glib/glib-sharp-2.0.pc.in 2008-02-28 00:43:19.000000000 +0100 +diff -up gtk-sharp-2.10.3/glib/glib-sharp-2.0.pc.in.false gtk-sharp-2.10.3/glib/glib-sharp-2.0.pc.in +--- gtk-sharp-2.10.3/glib/glib-sharp-2.0.pc.in.false 2008-03-01 11:05:20.000000000 +0100 ++++ gtk-sharp-2.10.3/glib/glib-sharp-2.0.pc.in 2008-03-01 11:06:18.000000000 +0100 @@ -1,6 +1,6 @@ --prefix=${pcfiledir}/../.. -+prefix=@prefix@ + prefix=${pcfiledir}/../.. exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@libdir@ gapidir=${prefix}/share/gapi-2.0 -diff -up gtk-sharp-2.10.3/generator/Makefile.am.old gtk-sharp-2.10.3/generator/Makefile.am ---- gtk-sharp-2.10.3/generator/Makefile.am.old 2008-02-28 00:43:38.000000000 +0100 -+++ gtk-sharp-2.10.3/generator/Makefile.am 2008-02-28 00:44:18.000000000 +0100 +diff -up gtk-sharp-2.10.3/generator/gapi2-codegen.in.false gtk-sharp-2.10.3/generator/gapi2-codegen.in +--- gtk-sharp-2.10.3/generator/gapi2-codegen.in.false 2008-03-01 11:15:16.000000000 +0100 ++++ gtk-sharp-2.10.3/generator/gapi2-codegen.in 2008-03-01 11:15:55.000000000 +0100 +@@ -1,2 +1,2 @@ + #!/bin/sh +- at RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi_codegen.exe "$@" ++ at RUNTIME@ @libdir@/gtk-sharp-2.0/gapi_codegen.exe "$@" +diff -up gtk-sharp-2.10.3/generator/Makefile.am.false gtk-sharp-2.10.3/generator/Makefile.am +--- gtk-sharp-2.10.3/generator/Makefile.am.false 2008-03-01 11:16:12.000000000 +0100 ++++ gtk-sharp-2.10.3/generator/Makefile.am 2008-03-01 11:18:08.000000000 +0100 @@ -1,4 +1,4 @@ -assemblydir = $(prefix)/lib/gtk-sharp-2.0 +assemblydir = $(libdir)/gtk-sharp-2.0 assembly_DATA = gapi_codegen.exe bin_SCRIPTS = gapi2-codegen CLEANFILES = gapi_codegen.exe +diff -up gtk-sharp-2.10.3/gtkdotnet/gtk-dotnet-2.0.pc.in.false gtk-sharp-2.10.3/gtkdotnet/gtk-dotnet-2.0.pc.in +--- gtk-sharp-2.10.3/gtkdotnet/gtk-dotnet-2.0.pc.in.false 2008-03-01 11:09:30.000000000 +0100 ++++ gtk-sharp-2.10.3/gtkdotnet/gtk-dotnet-2.0.pc.in 2008-03-01 11:09:45.000000000 +0100 +@@ -1,6 +1,6 @@ + prefix=${pcfiledir}/../.. + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=@libdir@ + + + Name: Gtk.DotNet +diff -up gtk-sharp-2.10.3/glade/glade-sharp-2.0.pc.in.false gtk-sharp-2.10.3/glade/glade-sharp-2.0.pc.in +--- gtk-sharp-2.10.3/glade/glade-sharp-2.0.pc.in.false 2008-03-01 11:08:59.000000000 +0100 ++++ gtk-sharp-2.10.3/glade/glade-sharp-2.0.pc.in 2008-03-01 11:09:14.000000000 +0100 +@@ -1,6 +1,6 @@ + prefix=${pcfiledir}/../.. + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=@libdir@ + gapidir=${prefix}/share/gapi-2.0 + + +diff -up gtk-sharp-2.10.3/gtk/gtk-sharp-2.0.pc.in.false gtk-sharp-2.10.3/gtk/gtk-sharp-2.0.pc.in +--- gtk-sharp-2.10.3/gtk/gtk-sharp-2.0.pc.in.false 2008-03-01 11:07:04.000000000 +0100 ++++ gtk-sharp-2.10.3/gtk/gtk-sharp-2.0.pc.in 2008-03-01 11:08:46.000000000 +0100 +@@ -1,6 +1,6 @@ + prefix=${pcfiledir}/../.. + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=@libdir@ + gapidir=${prefix}/share/gapi-2.0 + + From fedora-extras-commits at redhat.com Tue Mar 4 23:04:51 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Tue, 4 Mar 2008 23:04:51 GMT Subject: rpms/nx/F-7 nx.spec,1.14,1.15 Message-ID: <200803042304.m24N4ppQ001973@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/nx/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1932/F-7 Modified Files: nx.spec Log Message: Upgrade to 3.1.0. Index: nx.spec =================================================================== RCS file: /cvs/extras/rpms/nx/F-7/nx.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- nx.spec 23 Feb 2008 11:04:51 -0000 1.14 +++ nx.spec 4 Mar 2008 23:04:14 -0000 1.15 @@ -8,7 +8,7 @@ Summary: Proxy system for X11 Name: nx Version: 3.1.0 -Release: 25%{?dist} +Release: 25.1%{?dist} License: GPL, MIT/X11 for X11 bits Group: Applications/Internet URL: http://www.nomachine.com @@ -42,6 +42,11 @@ # Better mention what we really require on a file basis. # Requires: xorg-x11-utils +# Fails with +# Core.o: relocation R_X86_64_32S against `vtable for CorePoller' can not be used when making a shared object; recompile with -fPIC +# but Core.o has been built with -fPIC :( +ExcludeArch: x86_64 + %description NX provides a proxy system for the X Window System. From fedora-extras-commits at redhat.com Tue Mar 4 23:08:07 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 4 Mar 2008 23:08:07 GMT Subject: rpms/kdelibs3/devel kdelibs3.spec,1.18,1.19 Message-ID: <200803042308.m24N87cs002044@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2017/devel Modified Files: kdelibs3.spec Log Message: * Tue Mar 04 2008 Kevin Kofler - 3.5.9-4 - hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs) Index: kdelibs3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- kdelibs3.spec 27 Feb 2008 08:34:09 -0000 1.18 +++ kdelibs3.spec 4 Mar 2008 23:07:30 -0000 1.19 @@ -9,8 +9,10 @@ %define arts_version 1.5.9 %define qt_epoch 1 -%define qt_version 3.3.8 -%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +%define qt_version 3.3.8b +# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8 +#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +%define qt_ver %{qt_version} %define qtdocdir %{_docdir}/qt-devel-%{qt_ver} %define kde_major_version 3 @@ -21,7 +23,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.9 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -569,6 +571,9 @@ %changelog +* Tue Mar 04 2008 Kevin Kofler - 3.5.9-4 +- hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs) + * Tue Feb 26 2008 Luk???? Tinkl - 3.5.9-3 - #230979: Writes ServerBin into cupsd.conf - #416101: unable to print after configuring printing in KDE From fedora-extras-commits at redhat.com Tue Mar 4 23:10:32 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 4 Mar 2008 23:10:32 GMT Subject: rpms/kdelibs/F-7 kdelibs.spec,1.231,1.232 Message-ID: <200803042310.m24NAWcd002158@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2114/F-7 Modified Files: kdelibs.spec Log Message: Sync from devel: * Tue Mar 04 2008 Kevin Kofler - 3.5.9-4 - hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs) Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kdelibs.spec,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- kdelibs.spec 27 Feb 2008 08:35:54 -0000 1.231 +++ kdelibs.spec 4 Mar 2008 23:09:52 -0000 1.232 @@ -9,8 +9,10 @@ %define arts_version 1.5.9 %define qt_epoch 1 -%define qt_version 3.3.8 -%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +%define qt_version 3.3.8b +# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8 +#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +%define qt_ver %{qt_version} %define qtdocdir %{_docdir}/qt-devel-%{qt_ver} %define kde_major_version 3 @@ -21,7 +23,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.9 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -569,6 +571,9 @@ %changelog +* Tue Mar 04 2008 Kevin Kofler - 3.5.9-4 +- hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs) + * Tue Feb 26 2008 Luk???? Tinkl - 3.5.9-3 - #230979: Writes ServerBin into cupsd.conf - #416101: unable to print after configuring printing in KDE From fedora-extras-commits at redhat.com Tue Mar 4 23:10:40 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 4 Mar 2008 23:10:40 GMT Subject: rpms/kdelibs/F-8 kdelibs.spec,1.249,1.250 Message-ID: <200803042310.m24NAeGX002197@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2114/F-8 Modified Files: kdelibs.spec Log Message: Sync from devel: * Tue Mar 04 2008 Kevin Kofler - 3.5.9-4 - hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs) Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/F-8/kdelibs.spec,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- kdelibs.spec 27 Feb 2008 08:36:03 -0000 1.249 +++ kdelibs.spec 4 Mar 2008 23:10:00 -0000 1.250 @@ -9,8 +9,10 @@ %define arts_version 1.5.9 %define qt_epoch 1 -%define qt_version 3.3.8 -%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +%define qt_version 3.3.8b +# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8 +#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +%define qt_ver %{qt_version} %define qtdocdir %{_docdir}/qt-devel-%{qt_ver} %define kde_major_version 3 @@ -21,7 +23,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.9 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -569,6 +571,9 @@ %changelog +* Tue Mar 04 2008 Kevin Kofler - 3.5.9-4 +- hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs) + * Tue Feb 26 2008 Luk???? Tinkl - 3.5.9-3 - #230979: Writes ServerBin into cupsd.conf - #416101: unable to print after configuring printing in KDE From fedora-extras-commits at redhat.com Tue Mar 4 23:36:40 2008 From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie)) Date: Tue, 4 Mar 2008 23:36:40 GMT Subject: rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-ca-fr.patch, 1.1, 1.2 xkeyboard-config.spec, 1.21, 1.22 Message-ID: <200803042336.m24Naecg002737@cvs-int.fedora.redhat.com> Author: bernie Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2709 Modified Files: xkeyboard-config-olpc-ca-fr.patch xkeyboard-config.spec Log Message: * Tue Mar 04 2008 Bernardo Innocenti 1.1-11.20071130cvs - Rebase xkeyboard-config-olpc-ca-fr.patch xkeyboard-config-olpc-ca-fr.patch: Index: xkeyboard-config-olpc-ca-fr.patch =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config-olpc-ca-fr.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xkeyboard-config-olpc-ca-fr.patch 4 Mar 2008 19:36:29 -0000 1.1 +++ xkeyboard-config-olpc-ca-fr.patch 4 Mar 2008 23:36:30 -0000 1.2 @@ -9,7 +9,7 @@ ! $pcgeometries = abnt2 latitude jp106 kr106 // Layouts that provide further specializations for the OLPC --! $olpclayouts = af am ara br es et fr it kh kz in mn np ru th tr us +-! $olpclayouts = af am ara br es et it kh kz in mn np ru th tr us +! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 @@ -33,21 +33,3 @@ + + key { [ 3, slash, ograve, Ograve ] }; +}; -Index: symbols/fr -=================================================================== -RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/fr,v -retrieving revision 1.18 -diff -u -p -u -p -r1.18 fr ---- symbols/fr 3 Mar 2008 20:36:02 -0000 1.18 -+++ symbols/fr 4 Mar 2008 19:32:38 -0000 -@@ -755,10 +755,3 @@ xkb_symbols "geo" { - - }; - --// OLPC Section --xkb_symbols "olpc" { -- -- include "basic" -- -- key { [ 3, slash, ograve, Ograve ] }; --}; Index: xkeyboard-config.spec =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xkeyboard-config.spec 4 Mar 2008 19:36:29 -0000 1.21 +++ xkeyboard-config.spec 4 Mar 2008 23:36:30 -0000 1.22 @@ -5,7 +5,7 @@ Summary: xkeyboard-config alternative xkb data files Name: xkeyboard-config Version: 1.1 -Release: 13.%{cvsdate}%{?dist} +Release: 14.%{cvsdate}%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -111,6 +111,9 @@ %changelog * Tue Mar 04 2008 Bernardo Innocenti 1.1-11.20071130cvs +- Rebase xkeyboard-config-olpc-ca-fr.patch + +* Tue Mar 04 2008 Bernardo Innocenti 1.1-11.20071130cvs - Replace bogus xkeyboard-config-olpc-fr.patch with xkeyboard-config-olpc-ca-fr.patch From fedora-extras-commits at redhat.com Tue Mar 4 23:36:44 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 4 Mar 2008 23:36:44 GMT Subject: rpms/kdevelop/devel kdevelop.spec,1.72,1.73 Message-ID: <200803042336.m24Nai3v002740@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdevelop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2688/devel Modified Files: kdevelop.spec Log Message: * Tue Mar 04 2008 Kevin Kofler - 9:3.5.1-4 - BR kdelibs3-apidocs instead of kdelibs-apidocs - hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 Index: kdevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- kdevelop.spec 28 Feb 2008 18:45:58 -0000 1.72 +++ kdevelop.spec 4 Mar 2008 23:36:10 -0000 1.73 @@ -2,8 +2,11 @@ %define debug 0 %define final 1 -%define kde_version 3.5.8 -%define qt_version 3.3.8 +%define kde_version 3.5.9 +%define qt_version 3.3.8b +# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8 +#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +%define qt_ver %{qt_version} %define make_cvs 1 @@ -56,15 +59,14 @@ ## Skip these, for now -- Rex #Requires(hint): htdig #Source3: kdevelop-htdig.conf -#Requires(hint): kdelibs-apidocs +#Requires(hint): kdelibs3-apidocs #Requires(hint): ark %if %{make_cvs} BuildRequires: automake libtool %endif BuildRequires: kdelibs3-devel >= %{kde_version} -BuildRequires: kdelibs-apidocs qt-devel-docs -%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +BuildRequires: kdelibs3-apidocs qt-devel-docs BuildRequires: db4-devel BuildRequires: flex # FIXME: No CVS support in KDevelop? This is going to suck... @@ -243,6 +245,10 @@ %changelog +* Tue Mar 04 2008 Kevin Kofler - 9:3.5.1-4 +- BR kdelibs3-apidocs instead of kdelibs-apidocs +- hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 + * Thu Feb 28 2008 Than Ngo 9:3.5.1-3 - apply upstream patch to fix outputview From fedora-extras-commits at redhat.com Wed Mar 5 00:00:39 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 5 Mar 2008 00:00:39 GMT Subject: rpms/totem/devel totem-bin-backend-ondemand.sh, 1.1, 1.2 totem.spec, 1.167, 1.168 Message-ID: <200803050000.m2500dif003370@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3342 Modified Files: totem-bin-backend-ondemand.sh totem.spec Log Message: * Tue Mar 04 2008 - Bastien Nocera - 2.23.0-1 - Update to 2.23.0, rework the -gstreamer/-xine backend split to switch libraries instead of having replacements for all the binaries Index: totem-bin-backend-ondemand.sh =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem-bin-backend-ondemand.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- totem-bin-backend-ondemand.sh 3 Mar 2008 19:38:44 -0000 1.1 +++ totem-bin-backend-ondemand.sh 5 Mar 2008 00:00:03 -0000 1.2 @@ -1,51 +1,67 @@ #!/bin/sh -# setup some variables -BIN=totem -ARCH="$(uname -m)" - -if [ "$ARCH" == "x86_64" ];then - _LIBDIR="/usr/lib64" -elif [ "$ARCH" == "ppc64" ];then - _LIBDIR="/usr/lib64" -else - _LIBDIR="/usr/lib" -fi - # start functions -setBackend() { -TOTEM_BACKEND=$1 -# Default to GStreamer if there's no config -if [ -z $TOTEM_BACKEND ] ; then - TOTEM_BACKEND=gstreamer -fi -# Default to GStreamer if the backend is invalid -if [ $TOTEM_BACKEND != "xine" -a $TOTEM_BACKEND != "gstreamer" ] ; then - TOTEM_BACKEND=gstreamer -fi +usage() { + echo "Usage:" + echo "- As root, to set the default backend, system-wide:" + echo " $0 -b " + echo + echo "- As a normal user, to run a program with a specific backend:" + echo " $0 -b [program options...]" + echo + echo "- \"backend name\" is one of gstreamer or xine" + echo "- \"program name\" is one of totem, totem-audio-preview," + echo " totem-video-indexer or totem-video-thumbnailer" + echo + exit 1 +} - if [ "$UID" -eq "0" ];then - ln -sf totem-plugin-viewer-$TOTEM_BACKEND /usr/libexec/totem-plugin-viewer - ln -sf ../../libtotem-properties-page-$TOTEM_BACKEND.so ${_LIBDIR}/nautilus/extensions-2.0/libtotem-properties-page.so - fi - gconftool-2 -s /apps/totem/backend $TOTEM_BACKEND --type string - exit 0 +set_backend() { + TOTEM_BACKEND=$1 + # Default to GStreamer if there's no config + if [ -z $TOTEM_BACKEND ] ; then + echo "*** No backend name passed ***" + usage + fi + # Default to GStreamer if the backend is invalid + if [ $TOTEM_BACKEND != "xine" -a $TOTEM_BACKEND != "gstreamer" ] ; then + echo "*** Invalid backend name ***" + usage + fi + + # FIXME if someone can explain update-alternatives to me + + exit 0 } # end functions -# start execution -if [ "$1" == "-b" ];then - # if we are setting backend, do so and exit - setBackend $2 -elif [ -z $TOTEM_BACKEND ] ; then - # Default to GStreamer if there's no config - TOTEM_BACKEND=gstreamer -elif [ $TOTEM_BACKEND != "xine" -a $TOTEM_BACKEND != "gstreamer" ] ; then - # Default to GStreamer if the backend is invalid - TOTEM_BACKEND=gstreamer +# If root, just try to set the default backend +if [ "$UID" -eq "0" ] ; then + if [ "$1" != "-b" -o -z "$2" ] ; then + usage; + fi + set_backend $2 +else + if [ "$1" != "-b" -o -z "$2" ] ; then + usage; + fi + TOTEM_BACKEND=$2 + + if [ $TOTEM_BACKEND != "xine" -a $TOTEM_BACKEND != "gstreamer" ] ; then + echo "*** Invalid backend name passed ***" + usage + fi + + BIN=$3 + if [ -z "$BIN" ] ; then + echo "*** No program name passed ***" + usage + fi + if [ $BIN != "totem" -a $BIN != "totem-audio-preview" -a $BIN != "totem-video-indexer" -a $BIN != "totem-video-thumbnailer" ] ; then + echo "*** Wrong program name ***" + usage + fi + shift 3 + LD_PRELOAD=libgdk-x11-2.0.so.0:libbaconvideowidget-$TOTEM_BACKEND.so.0.0.0 exec $BIN "$@" fi -# if no opts are passed, do this -TOTEM_BACKEND="$(gconftool-2 -g /apps/totem/backend)" -exec $BIN-$TOTEM_BACKEND "$@" -exit $? Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- totem.spec 3 Mar 2008 20:12:56 -0000 1.167 +++ totem.spec 5 Mar 2008 00:00:03 -0000 1.168 @@ -1,4 +1,3 @@ -%define with_gstreamer 1 %define with_xine 1 %define gstreamer_version 0.10.1 @@ -10,7 +9,7 @@ Summary: Movie player for GNOME Name: totem -Version: 2.21.96 +Version: 2.23.0 Release: 1%{?dist} License: GPLv2 with exception Group: Applications/Multimedia @@ -73,7 +72,6 @@ simple playlist, a full-screen mode, seek and volume controls, as well as a pretty complete keyboard navigation. -%if %{with_gstreamer} %package gstreamer Summary: Gstreamer backend for Totem Group: Applications/Multimedia @@ -88,7 +86,6 @@ %description gstreamer This package provides the gstreamer backend for the Totem media player. -%endif %if %{with_xine} %package xine @@ -98,7 +95,6 @@ Requires: %{name} = %{version} Requires: xine-lib >= %{xine_version} BuildRequires: xine-lib-devel >= %{xine_version} -Obsoletes: totem-xine-plparser <= %{version}-%{release} %description xine This package provides the xine backend for the Totem media player. @@ -171,29 +167,14 @@ A plugin to allow you to share your current playlist (and the files included in that playlist) with other Totems on the same local network. -%if %{with_gstreamer} -%package nautilus-gstreamer +%package nautilus Summary: Video and Audio Properties tab for Nautilus Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -%description nautilus-gstreamer -A Nautilus extension that shows the properties of audio and video files in -the properties dialogue. This package provides the plugin linked against the -gstreamer backend. -%endif - -%if %{with_xine} -%package nautilus-xine -Summary: Video and Audio Properties tab for Nautilus -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} - -%description nautilus-xine -A Nautilus extension that shows the properties of audio and video files in -the properties dialogue. This package provides the plugin linked against the -xine backend. -%endif +%description nautilus +A Nautilus extension that shows the properties of audio and video files in??? +the properties dialogue. %prep %setup -q -c @@ -217,7 +198,6 @@ %build -%if %{with_gstreamer} pushd gstreamer # try to work around a problem where gst-inspect does # not find playbin the first time around @@ -228,28 +208,24 @@ --enable-mozilla \ --enable-nautilus \ --disable-scrollkeeper \ - --disable-nvtv \ - --program-suffix '-gstreamer' + --disable-nvtv make %{?_smp_mflags} popd -%endif %if %{with_xine} +# Build the xine-lib backend with minimum dependencies pushd xine -# works around a bug where xine compilation fails due to gnome-keyring.h not -# being found ** this seems to be fixed now ** -#export CFLAGS="-I/usr/include/gnome-keyring-1/" export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins %configure \ --enable-xine \ --disable-gstreamer \ - --enable-mozilla \ - --enable-nautilus \ + --disable-mozilla \ + --disable-nautilus \ --disable-scrollkeeper \ - --disable-nvtv \ - --program-suffix '-xine' + --disable-nvtv +cd src/backend/ make %{?_smp_mflags} popd %endif @@ -258,53 +234,35 @@ rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%if %{with_gstreamer} # GSTREAMER INSTALL pushd gstreamer/ make install DESTDIR=$RPM_BUILD_ROOT +# move the backend library away +mv $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0 # language hack %find_lang %{name} --with-gnome mv %{name}.lang ../ -# nautilus plugin doesn't use --program-suffix: copy manually -install -m755 ./src/.libs/libtotem-properties-page.so $RPM_BUILD_ROOT%{_libdir}/libtotem-properties-page-gstreamer.so popd -%endif %if %{with_xine} # XINE INSTALL -pushd xine +pushd xine/src/backend make install DESTDIR=$RPM_BUILD_ROOT -# nautilus plugin doesn't use --program-suffix :/ -# copy manually -install -m755 ./src/.libs/libtotem-properties-page.so $RPM_BUILD_ROOT%{_libdir}/libtotem-properties-page-xine.so +mv $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget-xine.so.0.0.0 popd %endif +# Restore the default backend +ln -sf %{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget.so.0.0.0 + rm -f $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/*.{a,la} \ $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/*.{a,la} \ - $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la} - -# nautilus plugin doesn't use --program-suffix :/ -# remove binary file so we can symlink it -rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/libtotem-properties-page.so -mkdir -p $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/ -ln -sf ../../libtotem-properties-page-gstreamer.so $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/libtotem-properties-page.so + $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la} \ + $RPM_BUILD_ROOT%{_libdir}/libbaconvideowidget*.{a,la} %find_lang %{name} --with-gnome -# these man pages are one and the same... so make one copy -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{name}*xine* -mv $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-gstreamer.1 \ - $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 -mv $RPM_BUILD_ROOT%{_mandir}/man1/totem-video-thumbnailer-gstreamer.1 \ - $RPM_BUILD_ROOT%{_mandir}/man1/totem-video-thumbnailer.1 - -install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name} -# link other binaries -ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-video-thumbnailer -ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-video-indexer -ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-audio-preview -ln -sf %{name}-plugin-viewer-gstreamer $RPM_BUILD_ROOT%{_libexecdir}/%{name}-plugin-viewer +install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-backend %clean rm -rf $RPM_BUILD_ROOT @@ -323,6 +281,10 @@ /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi +%post gstreamer -p /sbin/ldconfig + +%post xine -p /sbin/ldconfig + %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -332,7 +294,7 @@ %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas \ >& /dev/null || : fi - + %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -352,6 +314,10 @@ /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi +%postun gstreamer -p /sbin/ldconfig + +%postun xine -p /sbin/ldconfig + %post mythtv export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ @@ -385,6 +351,7 @@ %config %{_sysconfdir}/gconf/schemas/totem-handlers.schemas %config %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas %{_bindir}/%{name} +%{_bindir}/%{name}-backend %{_bindir}/%{name}-video-thumbnailer %{_bindir}/%{name}-video-indexer %{_bindir}/%{name}-audio-preview @@ -392,6 +359,8 @@ %{_datadir}/%{name}/ %{_libdir}/nautilus/extensions-2.0/*.so* %dir %{_libexecdir}/totem +%{_libexecdir}/totem/totem-bugreport.py* +%{_libdir}/libbaconvideowidget.so* %dir %{_libdir}/totem/plugins %{_libdir}/totem/plugins/gromit %{_libdir}/totem/plugins/ontop @@ -437,37 +406,21 @@ %defattr(-, root, root) %{_libdir}/totem/plugins/publish -%if %{with_gstreamer} %files gstreamer -%{_bindir}/%{name}-gstreamer -%{_bindir}/%{name}-video-thumbnailer-gstreamer -%{_bindir}/%{name}-video-indexer-gstreamer -%{_bindir}/%{name}-audio-preview-gstreamer -%{_libexecdir}/totem-plugin-viewer-gstreamer -%{_libexecdir}/totem/*gstreamer* - -%files nautilus-gstreamer -%defattr(-, root, root) -# installed to libdir so we can symlink the real spot -%{_libdir}/libtotem*gstreamer*.so* -%endif +%{_libdir}/libbaconvideowidget.so.0.0.0 +%{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0 %if %{with_xine} %files xine -%{_bindir}/%{name}-xine -%{_bindir}/%{name}-video-thumbnailer-xine -%{_bindir}/%{name}-video-indexer-xine -%{_bindir}/%{name}-audio-preview-xine -%{_libexecdir}/totem-plugin-viewer-xine -%{_libexecdir}/totem/*xine* - -%files nautilus-xine -%defattr(-, root, root) -# installed to libdir so we can symlink the real spot -%{_libdir}/libtotem*xine*.so* +%{_libdir}/libbaconvideowidget-xine.so.0.0.0 %endif %changelog +* Tue Mar 04 2008 - Bastien Nocera - 2.23.0-1 +- Update to 2.23.0, rework the -gstreamer/-xine backend split to + switch libraries instead of having replacements for all the + binaries + * Mon Mar 03 2008 - Bastien Nocera - 2.21.96-1 - Update to 2.21.96 - Add ppc and ppc64 to ExcludeArch as liboil is crashing on us (#435771) From fedora-extras-commits at redhat.com Wed Mar 5 00:03:22 2008 From: fedora-extras-commits at redhat.com (Bernardo Innocenti (bernie)) Date: Wed, 5 Mar 2008 00:03:22 GMT Subject: rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-ca-fr.patch, 1.2, 1.3 xkeyboard-config-olpc-it.patch, 1.1, 1.2 xkeyboard-config.spec, 1.22, 1.23 Message-ID: <200803050003.m2503MZs010609@cvs-int.fedora.redhat.com> Author: bernie Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10579 Modified Files: xkeyboard-config-olpc-ca-fr.patch xkeyboard-config-olpc-it.patch xkeyboard-config.spec Log Message: * Tue Mar 04 2008 Bernardo Innocenti 1.1-11.20071130cvs - Grr... really make these last damn patches apply in the right order xkeyboard-config-olpc-ca-fr.patch: Index: xkeyboard-config-olpc-ca-fr.patch =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config-olpc-ca-fr.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xkeyboard-config-olpc-ca-fr.patch 4 Mar 2008 23:36:30 -0000 1.2 +++ xkeyboard-config-olpc-ca-fr.patch 5 Mar 2008 00:03:13 -0000 1.3 @@ -9,8 +9,8 @@ ! $pcgeometries = abnt2 latitude jp106 kr106 // Layouts that provide further specializations for the OLPC --! $olpclayouts = af am ara br es et it kh kz in mn np ru th tr us -+! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us +-! $olpclayouts = af am ara br es et kh kz in mn np ru th tr us ++! $olpclayouts = af am ara br ca es et kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 ! $maclaptop = ibook powerbook macbook78 macbook79 @@ -22,9 +22,9 @@ --- symbols/ca 30 Jan 2008 21:28:12 -0000 1.16 +++ symbols/ca 4 Mar 2008 19:32:38 -0000 @@ -478,3 +478,11 @@ xkb_symbols "shs" { - - include "level3(ralt_switch)" + include "level5(rctrl_switch)" }; + + +// OLPC Section +xkb_symbols "olpc" { xkeyboard-config-olpc-it.patch: Index: xkeyboard-config-olpc-it.patch =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config-olpc-it.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xkeyboard-config-olpc-it.patch 3 Mar 2008 13:29:56 -0000 1.1 +++ xkeyboard-config-olpc-it.patch 5 Mar 2008 00:03:13 -0000 1.2 @@ -9,8 +9,8 @@ ! $pcgeometries = abnt2 latitude jp106 kr106 // Layouts that provide further specializations for the OLPC --! $olpclayouts = af am ara br es et fr kh kz in mn np ru th tr us -+! $olpclayouts = af am ara br es et fr it kh kz in mn np ru th tr us +-! $olpclayouts = af am ara br ca es et kh kz in mn np ru th tr us ++! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us ! $macbooks = macbook78 macbook79 ! $maclaptop = ibook powerbook macbook78 macbook79 Index: xkeyboard-config.spec =================================================================== RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xkeyboard-config.spec 4 Mar 2008 23:36:30 -0000 1.22 +++ xkeyboard-config.spec 5 Mar 2008 00:03:13 -0000 1.23 @@ -5,7 +5,7 @@ Summary: xkeyboard-config alternative xkb data files Name: xkeyboard-config Version: 1.1 -Release: 14.%{cvsdate}%{?dist} +Release: 15.%{cvsdate}%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -111,6 +111,9 @@ %changelog * Tue Mar 04 2008 Bernardo Innocenti 1.1-11.20071130cvs +- Grr... really make these last damn patches apply in the right order + +* Tue Mar 04 2008 Bernardo Innocenti 1.1-11.20071130cvs - Rebase xkeyboard-config-olpc-ca-fr.patch * Tue Mar 04 2008 Bernardo Innocenti 1.1-11.20071130cvs From fedora-extras-commits at redhat.com Wed Mar 5 00:18:20 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Wed, 5 Mar 2008 00:18:20 GMT Subject: comps/po cs.po,1.5,1.6 Message-ID: <200803050018.m250IKq6011135@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/po Modified Files: cs.po Log Message: Updated cs.po Index: cs.po =================================================================== RCS file: /cvs/pkgs/comps/po/cs.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cs.po 17 Sep 2007 19:22:12 -0000 1.5 +++ cs.po 5 Mar 2008 00:17:50 -0000 1.6 @@ -1,611 +1,184 @@ # translation of comps-po to Czech language # # Copyright (C) 2002, FSF -# Miloslav Trmac , 2002 - 2005. +# Miloslav Trma?? , 2002 - 2005, 2008. # Nikola ??tohanzl , 2006. # Milan Ker??l??ger , 2007. # msgid "" msgstr "" -"Project-Id-Version: cs\n" +"Project-Id-Version: comps VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-17 15:18-0400\n" -"PO-Revision-Date: 2007-02-23 01:38+0100\n" -"Last-Translator: Milan Kerslager \n" +"POT-Creation-Date: 2008-02-28 17:42-0700\n" +"PO-Revision-Date: 2008-03-03 06:05+0100\n" +"Last-Translator: Miloslav Trma?? \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1 -#: ../comps-f8.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." msgstr "Odleh??en?? prost??ed?? desktopu, kter?? je vhodn?? pro slab???? po????ta??e." -#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2 -#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 +#: ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "N??stroje pro administraci" -#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5 -#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +# CS OK +#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +msgid "Afrikaans Support" +msgstr "Afrik??n??tina (ji??n?? Afrika)" + +#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +msgid "Albanian Support" +msgstr "Alb??n??tina" + +#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 +#: ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "Aplikace" -#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3 -#: ../comps-el5.xml.in.h:3 -msgid "Applications for a variety of tasks" +#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +msgid "Applications to perform a variety of tasks" msgstr "Aplikace pro nejr??zn??j???? ????ely" -#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7 -#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 +#: ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "Arab??tina" -#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8 -#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 +#: ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "Arm??n??tina" -#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10 -#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 -msgid "Authoring and Publishing" -msgstr "Tvorba dokumentace a sazba" - -#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12 -#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 -msgid "Base System" -msgstr "Z??kladn?? programy" - -#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31 -#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 -msgid "Desktop Environments" -msgstr "Grafick?? prost??ed??" - -#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32 -#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 -msgid "Desktop environments" -msgstr "Grafick?? prost??ed??" - -#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33 -#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 -msgid "Development" -msgstr "V??voj aplikac??" - -#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35 -#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 -msgid "Development Tools" -msgstr "V??vojov?? n??stroje" - -#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12 -#: ../comps-el5.xml.in.h:13 -msgid "Dialup Networking Support" -msgstr "Vyt????en?? p??ipojen?? k Internetu" - -#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39 -#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 -msgid "Editors" -msgstr "Editory" - -#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40 -#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 -msgid "Educational Software" -msgstr "V??ukov?? programy" - -#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41 -#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 -msgid "Educational software for learning" -msgstr "Programy pro v??uku" - -#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42 -#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 -msgid "Engineering and Scientific" -msgstr "V??deck?? n??stroje" - -#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46 -#: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 -msgid "FTP Server" -msgstr "FTP server" - -#: ../comps-fe5.xml.in.h:19 ../comps-fe6.xml.in.h:20 ../comps-f7.xml.in.h:51 -#: ../comps-f8.xml.in.h:54 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 -msgid "" -"From CD recording to playing audio CDs and multimedia files, this package " -"group allows you to work with sound and video on the system." -msgstr "" -"Tato skupina bal????k?? v??m umo????uje pracovat se zvukem a videem od vypalov??n?? " -"CD po p??ehr??v??n?? zvukov??ch CD a multimedi??ln??ch soubor??." - -#: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52 -#: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 -msgid "GNOME Desktop Environment" -msgstr "GNOME" - -#: ../comps-fe5.xml.in.h:21 ../comps-fe6.xml.in.h:22 ../comps-f7.xml.in.h:53 -#: ../comps-f8.xml.in.h:56 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 -msgid "GNOME Software Development" -msgstr "GNOME - v??voj" - -#: ../comps-fe5.xml.in.h:22 ../comps-fe6.xml.in.h:23 ../comps-el4.xml.in.h:21 -#: ../comps-el5.xml.in.h:22 -msgid "" -"GNOME is a powerful, graphical user interface which includes a panel, " -"desktop, system icons, and a graphical file manager." -msgstr "" -"GNOME je v??konn?? grafick?? u??ivatelsk?? prost??ed??, kter?? zahrnuje panel, " -"prost??ed?? pracovn?? plochy, syst??mov?? ikony a grafick??ho spr??vce soubor??." - -#: ../comps-fe5.xml.in.h:23 ../comps-fe6.xml.in.h:24 ../comps-f7.xml.in.h:57 -#: ../comps-f8.xml.in.h:60 ../comps-el5.xml.in.h:23 -msgid "Games and Entertainment" -msgstr "Hry a z??bava" - -#: ../comps-fe5.xml.in.h:24 ../comps-fe6.xml.in.h:25 ../comps-f7.xml.in.h:60 -#: ../comps-f8.xml.in.h:63 ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24 -msgid "Graphical Internet" -msgstr "Internet - grafick?? aplikace" - -#: ../comps-fe5.xml.in.h:25 ../comps-fe6.xml.in.h:26 ../comps-f7.xml.in.h:61 -#: ../comps-f8.xml.in.h:64 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 -msgid "Graphics" -msgstr "Grafika" - -#: ../comps-fe5.xml.in.h:26 ../comps-fe6.xml.in.h:27 ../comps-f7.xml.in.h:64 -#: ../comps-f8.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26 -msgid "Hardware Support" -msgstr "Podpora hardware" - -#: ../comps-fe5.xml.in.h:27 ../comps-fe6.xml.in.h:28 ../comps-f7.xml.in.h:65 -#: ../comps-f8.xml.in.h:68 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27 -msgid "Hebrew Support" -msgstr "Hebrej??tina (Izrael)" - -#: ../comps-fe5.xml.in.h:28 ../comps-fe6.xml.in.h:29 ../comps-f7.xml.in.h:70 -#: ../comps-f8.xml.in.h:73 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28 -msgid "" -"Install these packages in order to develop GTK+ and GNOME graphical " -"applications." -msgstr "Bal????ky pro v??voj grafick??ch aplikac?? pro GTK+ a GNOME." - -#: ../comps-fe5.xml.in.h:29 ../comps-fe6.xml.in.h:30 ../comps-f7.xml.in.h:71 -#: ../comps-f8.xml.in.h:74 -msgid "" -"Install these packages in order to develop GTK+ and XFCE graphical " -"applications." -msgstr "Bal????ky pro v??voj grafick??ch aplikac?? v GTK+ a XFCE." - -#: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:72 -#: ../comps-f8.xml.in.h:75 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29 -msgid "Install these packages to develop QT and KDE graphical applications." -msgstr "Bal????ky pro v??voj grafick??ch aplikac?? pro QT a KDE." - -#: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74 -#: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30 -msgid "" -"Install this group of packages to use the base graphical (X) user interface." -msgstr "" -"Tuto skupinu bal????k?? nainstalujte pro pou??it?? grafick??ho (X) u??ivatelsk??ho " -"prost??ed??." - -#: ../comps-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:78 -#: ../comps-f8.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 -msgid "Japanese Support" -msgstr "Japon??tina" - -#: ../comps-fe5.xml.in.h:33 ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 -#: ../comps-el4.xml.in.h:30 -msgid "Java" -msgstr "Java" - -#: ../comps-fe5.xml.in.h:34 ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 -#: ../comps-el4.xml.in.h:31 -msgid "Java Development" -msgstr "Java - v??voj" - -#: ../comps-fe5.xml.in.h:35 ../comps-fe6.xml.in.h:34 ../comps-f7.xml.in.h:81 -#: ../comps-f8.xml.in.h:85 ../comps-el4.xml.in.h:32 ../comps-el5.xml.in.h:32 -msgid "KDE (K Desktop Environment)" -msgstr "KDE" - -#: ../comps-fe5.xml.in.h:36 ../comps-fe6.xml.in.h:35 ../comps-f7.xml.in.h:82 -#: ../comps-f8.xml.in.h:86 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33 -msgid "KDE Software Development" -msgstr "KDE - v??voj" - -#: ../comps-fe5.xml.in.h:37 ../comps-fe6.xml.in.h:36 ../comps-el4.xml.in.h:34 -#: ../comps-el5.xml.in.h:34 -msgid "" -"KDE is a powerful, graphical user interface which includes a panel, desktop, " -"system icons, and a graphical file manager." -msgstr "" -"KDE je v??konn?? grafick?? u??ivatelsk?? prost??ed??, kter?? zahrnuje panel, " -"prost??ed?? pracovn?? plochy, syst??mov?? ikony a grafick??ho spr??vce soubor??." - -#: ../comps-fe5.xml.in.h:38 ../comps-fe6.xml.in.h:37 ../comps-f7.xml.in.h:94 -#: ../comps-f8.xml.in.h:100 ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 -msgid "Mail Server" -msgstr "Po??tovn?? server" - -#: ../comps-fe5.xml.in.h:39 ../comps-fe6.xml.in.h:38 ../comps-f7.xml.in.h:100 -#: ../comps-f8.xml.in.h:108 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 -msgid "Network Servers" -msgstr "S????ov?? servery" - -#: ../comps-fe5.xml.in.h:40 ../comps-fe6.xml.in.h:39 ../comps-f7.xml.in.h:101 -#: ../comps-f8.xml.in.h:109 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 -msgid "News Server" -msgstr "News server" - -#: ../comps-fe5.xml.in.h:41 ../comps-fe6.xml.in.h:40 ../comps-f7.xml.in.h:104 -#: ../comps-f8.xml.in.h:112 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 -msgid "Office/Productivity" -msgstr "Kancel???? a organizace ??asu" - -#: ../comps-fe5.xml.in.h:42 ../comps-fe6.xml.in.h:41 ../comps-f7.xml.in.h:106 -#: ../comps-f8.xml.in.h:115 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 -msgid "" -"Packages which provide functionality for developing and building " -"applications." -msgstr "Bal????ky poskytuj??c?? funkcionalitu pro v??voj a sestavov??n?? aplikac??" - -#: ../comps-fe5.xml.in.h:43 ../comps-fe6.xml.in.h:42 ../comps-f7.xml.in.h:119 -#: ../comps-f8.xml.in.h:128 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 -msgid "Servers" -msgstr "Servery" - -#: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120 -#: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 -msgid "" -"Simple window managers that aren't part of a larger desktop environment." -msgstr "" -"Jednodu???? spr??vci oken, kte???? nejsou sou????st?? velk??ch desktopov??ch prost??ed??." - -#: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125 -#: ../comps-f8.xml.in.h:134 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 -msgid "Software used for running network servers" -msgstr "Software pro s????ov?? servery" - -#: ../comps-fe5.xml.in.h:46 ../comps-fe6.xml.in.h:45 ../comps-el4.xml.in.h:43 -#: ../comps-el5.xml.in.h:43 -msgid "" -"Sometimes called text editors, these are programs that allow you to create " -"and edit files. These include Emacs and Vi." -msgstr "" -"N??kdy ozna??ovan?? jako textov?? editory, tyto programy v??m umo??n?? vytv????et a " -"upravovat soubory. Tato skupina zahrnuje Emacs a Vi." - -#: ../comps-fe5.xml.in.h:47 ../comps-fe6.xml.in.h:46 ../comps-f7.xml.in.h:128 -#: ../comps-f8.xml.in.h:137 ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 -msgid "Sound and Video" -msgstr "Zvuk a video" - -#: ../comps-fe5.xml.in.h:48 ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 -#: ../comps-el4.xml.in.h:45 -msgid "Support for developing programs in the Java programming language." -msgstr "Podpora pro v??voj program?? v programovac??m jazyku Java." - -#: ../comps-fe5.xml.in.h:49 ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 -#: ../comps-el4.xml.in.h:46 -msgid "Support for running programs written in the Java programming language." -msgstr "" -"Podpora pro b??h program?? napsan??ch v programovac??m jazyce Java (runtime " -"environment)." - -#: ../comps-fe5.xml.in.h:50 ../comps-fe6.xml.in.h:47 ../comps-f7.xml.in.h:136 -#: ../comps-f8.xml.in.h:145 ../comps-el4.xml.in.h:47 ../comps-el5.xml.in.h:45 -msgid "System Tools" -msgstr "Syst??mov?? n??stroje" - -#: ../comps-fe5.xml.in.h:51 ../comps-fe6.xml.in.h:48 ../comps-f7.xml.in.h:140 -#: ../comps-f8.xml.in.h:149 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 -msgid "Text-based Internet" -msgstr "Internet - textov?? aplikace" - -#: ../comps-fe5.xml.in.h:52 ../comps-fe6.xml.in.h:49 ../comps-el4.xml.in.h:49 -#: ../comps-el5.xml.in.h:47 -msgid "The XEmacs text editor." -msgstr "Textov?? editor XEmacs." - -#: ../comps-fe5.xml.in.h:53 ../comps-fe6.xml.in.h:50 ../comps-f7.xml.in.h:143 -#: ../comps-f8.xml.in.h:151 ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 -msgid "The applications include office suites, PDF viewers, and more." -msgstr "Aplikace zahrnuj?? kancel????sk?? bal??ky, prohl????e??e PDF atd." - -#: ../comps-fe5.xml.in.h:54 ../comps-fe6.xml.in.h:51 ../comps-f7.xml.in.h:145 -#: ../comps-f8.xml.in.h:153 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 -msgid "These packages allow you to configure an IMAP or SMTP mail server." -msgstr "Bal????ky pro provoz po??tovn??ho serveru (SMTP, IMAP, POP3)." - -#: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147 -#: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 -msgid "" -"These packages are helpful when developing web applications or web pages." -msgstr "Bal????ky pro podporu WWW str??nek a Webov??ch aplikac??." - -#: ../comps-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53 -#: ../comps-el5.xml.in.h:51 -msgid "" -"These tools allow you to create documentation in the DocBook format and " -"convert them to HTML, PDF, Postscript, and text." -msgstr "" -"N??stroje pro vytv????en?? dokumentace ve form??tu DocBook a jej?? konverze do " -"form??t?? HTML, PDF, Postscriptu i ??ist??ho textu." - -#: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:154 -#: ../comps-f8.xml.in.h:162 ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 -msgid "These tools allow you to run a Web server on the system." -msgstr "N??stroje pro podporu b??hu WWW serveru." - -#: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:155 -#: ../comps-f8.xml.in.h:163 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 -msgid "These tools allow you to run an FTP server on the system." -msgstr "N??stroje pro podporu b??hu FTP serveru." - -#: ../comps-fe5.xml.in.h:59 ../comps-fe6.xml.in.h:56 ../comps-f7.xml.in.h:156 -#: ../comps-f8.xml.in.h:164 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 -msgid "" -"These tools include core development tools such as automake, gcc, perl, " -"python, and debuggers." -msgstr "" -"Z??kladn?? v??vojov?? n??stroje, nap??. automake, gcc, perl, python a lad??c?? " -"n??stroje." - -#: ../comps-fe5.xml.in.h:60 ../comps-fe6.xml.in.h:57 ../comps-f7.xml.in.h:157 -#: ../comps-f8.xml.in.h:165 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 -msgid "This group allows you to configure the system as a news server." -msgstr "Tato skupina v??m umo??n?? nakonfigurovat po????ta?? jako news server." - -#: ../comps-fe5.xml.in.h:61 ../comps-fe6.xml.in.h:58 ../comps-f7.xml.in.h:160 -#: ../comps-f8.xml.in.h:168 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 -msgid "This group includes graphical email, Web, and chat clients." -msgstr "Tato skupina obsahuje grafick?? klienty pro email, WWW a chat." - -#: ../comps-fe5.xml.in.h:62 ../comps-fe6.xml.in.h:59 ../comps-f7.xml.in.h:161 -#: ../comps-f8.xml.in.h:169 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 -msgid "" -"This group includes packages for performing mathematical and scientific " -"computations and plotting, as well as unit conversion." -msgstr "" -"Tato skupina obsahuje bal????ky pro prov??d??n?? matematick??ch a v??deck??ch " -"v??po??t??, tvorbu graf?? a p??evod mezi jednotkami." - -#: ../comps-fe5.xml.in.h:63 ../comps-fe6.xml.in.h:60 ../comps-f7.xml.in.h:162 -#: ../comps-f8.xml.in.h:170 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 -msgid "This group includes packages to help you manipulate and scan images." -msgstr "" -"Tato skupina obsahuje bal????ky, kter?? v??m pomohou pracovat s obr??zky a " -"skenovat je." - -#: ../comps-fe5.xml.in.h:64 ../comps-fe6.xml.in.h:61 ../comps-f7.xml.in.h:163 -#: ../comps-f8.xml.in.h:171 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 -msgid "" -"This group includes text-based email, Web, and chat clients. These " -"applications do not require the X Window System." -msgstr "" -"Skupina obsahuje textov?? klienty pro email, WWW a chat, kter?? nepot??ebuj?? " -"grafick?? prost??ed?? X Window System." - -#: ../comps-fe5.xml.in.h:65 ../comps-fe6.xml.in.h:62 ../comps-f7.xml.in.h:164 -#: ../comps-f8.xml.in.h:172 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 -msgid "" -"This group is a collection of graphical administration tools for the system, " -"such as for managing user accounts and configuring system hardware." -msgstr "" -"Tato skupina je soubor grafick??ch n??stroj?? administrace, nap??. pro spr??vu " -"u??ivatelsk??ch ????t?? a nastaven?? hardware po????ta??e." - -#: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63 -#: ../comps-el5.xml.in.h:61 -#, fuzzy -msgid "This group is a collection of network servers for specific purposes" -msgstr "" -"Skupina n??stroj?? a aplikac?? pro podporu nejr??zn??j????ho hardware (za????zen??)." - -#: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64 -#: ../comps-el5.xml.in.h:62 -#, fuzzy -msgid "" -"This group is a collection of tools and resources of Arabic environments." -msgstr "Skupina n??stroj?? a aplikac?? pro podporu Arm??n??tiny." - -#: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165 -#: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 -msgid "" -"This group is a collection of tools and resources of Armenian environments." -msgstr "Skupina n??stroj?? a aplikac?? pro podporu Arm??n??tiny." - -#: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66 -#: ../comps-el5.xml.in.h:65 -#, fuzzy -msgid "" -"This group is a collection of tools and resources of Hebrew environments." -msgstr "Skupina n??stroj?? a aplikac?? pro podporu Arm??n??tiny." - -#: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67 -#: ../comps-el5.xml.in.h:66 -#, fuzzy -msgid "" -"This group is a collection of tools and resources of Japanese environments." -msgstr "Skupina n??stroj?? a aplikac?? pro podporu Arm??n??tiny." - -#: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166 -#: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 -msgid "" -"This group is a collection of tools for various hardware specific utilities." -msgstr "" -"Skupina n??stroj?? a aplikac?? pro podporu nejr??zn??j????ho hardware (za????zen??)." - -#: ../comps-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167 -#: ../comps-f8.xml.in.h:175 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 -msgid "" -"This group is a collection of various tools for the system, such as the " -"client for connecting to SMB shares and tools to monitor network traffic." -msgstr "" -"Tato skupina je soubor r??zn??ch syst??mov??ch n??stroj??, nap??. klient pro " -"p??ipojen?? ke svazk??m SMB a n??stroje pro sledov??n?? s????ov??ho provozu." - -#: ../comps-fe5.xml.in.h:73 ../comps-fe6.xml.in.h:71 ../comps-f7.xml.in.h:179 -#: ../comps-f8.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 -msgid "Various core pieces of the system." -msgstr "R??zn?? z??kladn?? sou????sti syst??mu." - -#: ../comps-fe5.xml.in.h:74 ../comps-fe6.xml.in.h:72 ../comps-f7.xml.in.h:180 -#: ../comps-f8.xml.in.h:188 ../comps-el5.xml.in.h:70 -msgid "Various ways to relax and spend your free time." -msgstr "R??zn?? zp??soby, jak relaxovat a tr??vit voln?? ??as." - -#: ../comps-fe5.xml.in.h:75 ../comps-fe6.xml.in.h:73 ../comps-f7.xml.in.h:184 -#: ../comps-f8.xml.in.h:192 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71 -msgid "Web Development" -msgstr "WWW - v??voj" - -#: ../comps-fe5.xml.in.h:76 ../comps-fe6.xml.in.h:74 ../comps-f7.xml.in.h:185 -#: ../comps-f8.xml.in.h:193 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72 -msgid "Web Server" -msgstr "WWW server" - -#: ../comps-fe5.xml.in.h:77 ../comps-fe6.xml.in.h:75 ../comps-f7.xml.in.h:187 -#: ../comps-f8.xml.in.h:195 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 -msgid "Window Managers" -msgstr "Spr??vci oken" - -#: ../comps-fe5.xml.in.h:78 ../comps-fe6.xml.in.h:76 ../comps-f7.xml.in.h:190 -#: ../comps-f8.xml.in.h:198 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 -msgid "X Window System" -msgstr "X Window System" - -#: ../comps-fe5.xml.in.h:79 ../comps-fe6.xml.in.h:77 ../comps-el4.xml.in.h:75 -#: ../comps-el5.xml.in.h:75 -msgid "XEmacs" -msgstr "XEmacs" - -#: ../comps-fe5.xml.in.h:80 ../comps-fe6.xml.in.h:78 ../comps-f7.xml.in.h:191 -#: ../comps-f8.xml.in.h:199 -msgid "XFCE" -msgstr "XFCE" - -#: ../comps-fe5.xml.in.h:81 ../comps-fe6.xml.in.h:79 ../comps-f7.xml.in.h:192 -#: ../comps-f8.xml.in.h:200 -msgid "XFCE Software Development" -msgstr "XFCE - v??voj" - -#: ../comps-fe6.xml.in.h:9 ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 -#: ../comps-el5.xml.in.h:8 -msgid "Czech Support" -msgstr "??e??tina" - -#: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64 -#, fuzzy -msgid "" -"This group is a collection of tools and resources of Czech environments." -msgstr "Skupina n??stroj?? a aplikac?? pro podporu Arm??n??tiny." - -# CS OK -#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 -msgid "Afrikaans Support" -msgstr "Afrik??n??tina (ji??n?? Afrika)" - -#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 -#, fuzzy -msgid "Albanian Support" -msgstr "Arm??n??tina" - -#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 -msgid "Applications to perform a variety of tasks" -msgstr "Aplikace pro nejr??zn??j???? ????ely" - # CS OK -#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 +#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 msgid "Assamese Support" msgstr "??s??m??tina (Indie)" -#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 +#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 +#: ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 +msgid "Authoring and Publishing" +msgstr "Tvorba dokumentace a sazba" + +#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 msgid "Base" msgstr "Z??kladn?? instalace" -#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 +#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 +#: ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 +msgid "Base System" +msgstr "Z??kladn?? programy" + +#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 msgid "Basic support for the Ruby programming language." msgstr "Z??kladn?? podpora pro programovac?? jazyk Ruby." # CS OK -#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 +#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 msgid "Basque Support" msgstr "Baski??tina (??pan??lsko)" -#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 -#, fuzzy +#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 msgid "Belarusian Support" -msgstr "Bulhar??tina" +msgstr "B??loru??tina" # CS OK -#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 +#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 msgid "Bengali Support" msgstr "Beng??l??tina (Indie)" -#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 +#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 #, fuzzy msgid "Bhutanese Support" msgstr "????n??tina" -#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 -#, fuzzy +#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 msgid "Bosnian Support" -msgstr "Eston??tina" +msgstr "Bosen??tina" -#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 +#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19 msgid "Brazilian Portuguese Support" msgstr "Brazilsk?? portugal??tina" -#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 +#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20 msgid "Breton Support" msgstr "Breton??tina (Francie)" -#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 +#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22 msgid "Bulgarian Support" msgstr "Bulhar??tina" # CS OK -#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 +#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23 msgid "Catalan Support" msgstr "Katal??n??tina (??pan??lsko)" -#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 +#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24 msgid "Chinese Support" msgstr "????n??tina" -#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 +#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25 msgid "Clustering" msgstr "Clustery" -#: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 +#: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26 msgid "Clustering Support" msgstr "Clustery" -#: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 +#: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27 msgid "Core" msgstr "Z??klad" -#: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 +#: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28 msgid "Croatian Support" msgstr "Chorvat??tina" -#: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 +#: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29 +#: ../comps-el5.xml.in.h:8 +msgid "Czech Support" +msgstr "??e??tina" + +#: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30 msgid "DNS Name Server" msgstr "DNS server" -#: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 +#: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31 msgid "Danish Support" msgstr "D??n??tina" -#: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 +#: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32 +#: ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 +msgid "Desktop Environments" +msgstr "Grafick?? prost??ed??" + +#: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33 +#: ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 +msgid "Desktop environments" +msgstr "Grafick?? prost??ed??" + +#: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34 +#: ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 +msgid "Development" +msgstr "V??voj aplikac??" + +#: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35 msgid "Development Libraries" msgstr "Bal????ky pro v??voj" -#: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 +#: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36 +#: ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 +msgid "Development Tools" +msgstr "V??vojov?? n??stroje" + +#: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37 msgid "Dial-up Networking Support" msgstr "Vyt????en?? p??ipojen?? k Internetu" -#: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 +#: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38 msgid "Dutch Support" msgstr "Holand??tina" @@ -613,38 +186,87 @@ msgid "Eclipse" msgstr "Eclipse" -#: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 +#: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39 +#: ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 +msgid "Editors" +msgstr "Editory" + +#: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40 +#: ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 +msgid "Educational Software" +msgstr "V??ukov?? programy" + +#: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41 +#: ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 +msgid "Educational software for learning" +msgstr "Programy pro v??uku" + +#: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42 +#: ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 +msgid "Engineering and Scientific" +msgstr "V??deck?? n??stroje" + +#: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43 msgid "English (UK) Support" msgstr "Angli??tina (UK)" -#: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 +#: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:44 msgid "Estonian Support" msgstr "Eston??tina" -#: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 +#: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:45 msgid "Ethiopic Support" msgstr "Etiop??tina" +#: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:46 +#: ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 +msgid "FTP Server" +msgstr "FTP server" + # CS OK -#: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 +#: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:47 msgid "Faeroese Support" msgstr "Faer??tina (D??nsko)" +#: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:49 +#: ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 +msgid "Fedora Packager" +msgstr "Tv??rce bal????k?? Fedory" + # CS OK -#: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 +#: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:50 #, fuzzy msgid "Filipino Support" msgstr "Galicij??tina (??pan??lsko)" -#: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 +#: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:51 msgid "Finnish Support" msgstr "Fin??tina" -#: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:53 +#: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:54 msgid "French Support" msgstr "Francouz??tina" -#: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 +#: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:55 +#: ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 +msgid "" +"From CD recording to playing audio CDs and multimedia files, this package " +"group allows you to work with sound and video on the system." +msgstr "" +"Tato skupina bal????k?? v??m umo????uje pracovat se zvukem a videem od vypalov??n?? " +"CD po p??ehr??v??n?? zvukov??ch CD a multimedi??ln??ch soubor??." + +#: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:56 +#: ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 +msgid "GNOME Desktop Environment" +msgstr "GNOME" + +#: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:57 +#: ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22 +msgid "GNOME Software Development" +msgstr "GNOME - v??voj" + +#: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:58 msgid "" "GNOME is a powerful graphical user interface which includes a panel, " "desktop, system icons, and a graphical file manager." @@ -653,74 +275,149 @@ "prost??ed?? pracovn?? plochy, syst??mov?? ikony a grafick??ho spr??vce soubor??." # FIXME: neni CS ekvivalent -#: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 +#: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:59 msgid "Gaelic Support" msgstr "Gaelic (Irsko, Skotsko)" # CS OK -#: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 +#: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:60 msgid "Galician Support" msgstr "Galicij??tina (??pan??lsko)" -#: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 -#, fuzzy +#: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:61 +#: ../comps-el5.xml.in.h:24 +msgid "Games and Entertainment" +msgstr "Hry a z??bava" + +#: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:62 msgid "Georgian Support" -msgstr "N??m??ina" +msgstr "Gruzij??tina" -#: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 +#: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:63 msgid "German Support" msgstr "N??m??ina" -#: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 +#: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:64 +#: ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 +msgid "Graphical Internet" +msgstr "Internet - grafick?? aplikace" + +#: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:65 +#: ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26 +msgid "Graphics" +msgstr "Grafika" + +#: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:66 msgid "Greek Support" msgstr "??e??tina" # CS OK -#: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 +#: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:67 msgid "Gujarati Support" msgstr "Gud??ar??t??tina (Indie)" +#: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:68 +#: ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27 +msgid "Hardware Support" +msgstr "Podpora hardware" + +#: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:69 +#: ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28 +msgid "Hebrew Support" +msgstr "Hebrej??tina (Izrael)" + # CS OK -#: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 +#: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:70 msgid "Hindi Support" msgstr "Hind??tina (Indie)" -#: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 +#: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:71 msgid "Hungarian Support" msgstr "Ma??ar??tina" # CS OK -#: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 +#: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:72 msgid "Icelandic Support" msgstr "Island??tina" -# FIXME -#: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 -msgid "Indonesian Support" -msgstr "Indon??s??tina" +# FIXME +#: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:73 +msgid "Indonesian Support" +msgstr "Indon??s??tina" + +#: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:74 +#: ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29 +msgid "" +"Install these packages in order to develop GTK+ and GNOME graphical " +"applications." +msgstr "Bal????ky pro v??voj grafick??ch aplikac?? pro GTK+ a GNOME." + +#: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:75 +msgid "" +"Install these packages in order to develop GTK+ and XFCE graphical " +"applications." +msgstr "Bal????ky pro v??voj grafick??ch aplikac?? v GTK+ a XFCE." + +#: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:76 +#: ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30 +msgid "Install these packages to develop QT and KDE graphical applications." +msgstr "Bal????ky pro v??voj grafick??ch aplikac?? pro QT a KDE." -#: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 +#: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:77 msgid "" "Install these tools to enable the system to print or act as a print server." msgstr "" "Nainstalov??n??m t??chto n??stroj?? umo??n??te va??emu po????ta??i tisknout nebo " "vystupovat jako tiskov?? server." +#: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:78 +#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 +msgid "" +"Install this group of packages to use the base graphical (X) user interface." +msgstr "" +"Tuto skupinu bal????k?? nainstalujte pro pou??it?? grafick??ho (X) u??ivatelsk??ho " +"prost??ed??." + # FIXME -#: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:79 +#: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:80 #, fuzzy msgid "Inuktitut Support" msgstr "Zulu (ji??n?? Afrika)" -#: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 +#: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:81 msgid "Irish Support" msgstr "Ir??tina" -#: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 +#: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:82 msgid "Italian Support" msgstr "Ital??tina" -#: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 +#: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:83 +#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32 +msgid "Japanese Support" +msgstr "Japon??tina" + +#: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:84 +#: ../comps-el4.xml.in.h:31 +msgid "Java" +msgstr "Java" + +#: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:85 +#: ../comps-el4.xml.in.h:32 +msgid "Java Development" +msgstr "Java - v??voj" + +#: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:86 +#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33 +msgid "KDE (K Desktop Environment)" +msgstr "KDE" + +#: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:87 +#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34 +msgid "KDE Software Development" +msgstr "KDE - v??voj" + +#: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:88 msgid "" "KDE is a powerful graphical user interface which includes a panel, desktop, " "system icons, and a graphical file manager." @@ -728,163 +425,205 @@ "KDE je v??konn?? grafick?? u??ivatelsk?? prost??ed??, kter?? zahrnuje panel, " "prost??ed?? pracovn?? plochy, syst??mov?? ikony a grafick??ho spr??vce soubor??." -#: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 +#: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:89 msgid "Kannada Support" msgstr "Kannada (Indie)" -#: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 +#: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:90 #, fuzzy msgid "Khmer Support" msgstr "Hebrej??tina (Izrael)" -#: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 +#: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:91 msgid "Korean Support" msgstr "Korej??tina" -#: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 +#: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:92 msgid "Languages" msgstr "Jazyky" # FIXME -#: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 +#: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:93 #, fuzzy msgid "Lao Support" msgstr "Thaj??tina" -#: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 +#: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:94 #, fuzzy msgid "Latvian Support" msgstr "Chorvat??tina" -#: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95 +#: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:96 msgid "Legacy Network Server" msgstr "Star???? s????ov?? servery" -#: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 +#: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:97 msgid "Legacy Software Development" msgstr "Star???? aplikace - v??voj" -#: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 +#: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:98 msgid "Legacy Software Support" msgstr "Star???? aplikace" -#: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 +#: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:99 msgid "Lithuanian Support" msgstr "Litev??tina" -#: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 +#: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:101 +#: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 +msgid "Mail Server" +msgstr "Po??tovn?? server" + +#: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:102 msgid "Malay Support" msgstr "Malaj??tina" # CS OK -#: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 +#: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:103 msgid "Malayalam Support" msgstr "Malaj??lam??tina (Indie)" # FIXME -#: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 +#: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:104 #, fuzzy msgid "Maori Support" msgstr "Marathi (Indie)" # FIXME -#: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 +#: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:105 msgid "Marathi Support" msgstr "Marathi (Indie)" -#: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:106 +#: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:107 msgid "MySQL Database" msgstr "MySQL datab??ze" +#: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:109 +#: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 +msgid "Network Servers" +msgstr "S????ov?? servery" + +#: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:110 +#: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 +msgid "News Server" +msgstr "News server" + # FIXME -#: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 +#: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:111 msgid "Northern Sotho Support" msgstr "Sotho severn?? (ji??n?? Afrika)" -#: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 +#: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:112 msgid "Norwegian Support" msgstr "Nor??tina" +#: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:113 +#: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 +msgid "Office/Productivity" +msgstr "Kancel???? a organizace ??asu" + # FIXME -#: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:114 +#: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:115 msgid "Oriya Support" msgstr "Oriya (ji??n?? Afrika)" -#: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 +#: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:116 +#: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 +msgid "" +"Packages which provide functionality for developing and building " +"applications." +msgstr "Bal????ky poskytuj??c?? funkcionalitu pro v??voj a sestavov??n?? aplikac??" + +#: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:117 #, fuzzy msgid "Persian Support" msgstr "Srb??tina" -#: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 +#: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:118 msgid "Polish Support" msgstr "Pol??tina" -#: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 +#: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:119 msgid "Portuguese Support" msgstr "Portugal??tina" -#: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 +#: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:120 msgid "PostgreSQL Database" msgstr "PostgreSQL datab??ze" -#: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 +#: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:121 msgid "Printing Support" msgstr "Tisk" # FIXME -#: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 +#: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:122 msgid "Punjabi Support" msgstr "Punjabi (Indie, P??kist??n)" -#: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 +#: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:123 msgid "Romanian Support" msgstr "Rumun??tina" -#: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 +#: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:124 msgid "Ruby" msgstr "Ruby" -#: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 +#: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:125 msgid "Russian Support" msgstr "Ru??tina" -#: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 +#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:126 #, fuzzy msgid "Samoan Support" msgstr "N??m??ina" -#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 +#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:127 msgid "Serbian Support" msgstr "Srb??tina" -#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 +#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:128 msgid "Server Configuration Tools" msgstr "N??stroje pro konfiguraci serveru" +#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:129 +#: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 +msgid "Servers" +msgstr "Servery" + +#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:130 +#: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 +msgid "" +"Simple window managers that aren't part of a larger desktop environment." +msgstr "" +"Jednodu???? spr??vci oken, kte???? nejsou sou????st?? velk??ch desktopov??ch prost??ed??." + # FIXME -#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 +#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:131 msgid "Sinhala Support" msgstr "Sinhala (Sr?? Lanka)" -#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 +#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:132 msgid "Slovak Support" msgstr "Sloven??tina" -#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 +#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:133 msgid "Slovenian Support" msgstr "Slovin??tina" -#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 +#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:134 msgid "Smallest possible installation" msgstr "Nejmen???? mo??n?? instalace" -# FIXME -#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 -#, fuzzy +#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:135 +#: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 +msgid "Software used for running network servers" +msgstr "Software pro s????ov?? servery" + +#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:136 msgid "Somali Support" -msgstr "Swati (P??kist??n)" +msgstr "Som??l??tina" -#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 +#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:137 msgid "" "Sometimes called text editors, these are programs that allow you to create " "and edit text files. This includes Emacs and Vi." @@ -892,87 +631,130 @@ "Skupina obsahuje textov?? editory, kter?? umo????uj?? vytv????et a upravovat " "soubory. Obsahuje Emacs a Vi (ViM)." +#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:138 +#: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 +msgid "Sound and Video" +msgstr "Zvuk a video" + # FIXME -#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 +#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:139 msgid "Southern Ndebele Support" msgstr "Ndebele ji??n?? (ji??n?? Afrika)" # FIXME -#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 +#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:140 msgid "Southern Sotho Support" msgstr "Sotho ji??n?? (ji??n?? Afrika)" -#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 +#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:141 msgid "Spanish Support" msgstr "??pan??l??tina" +#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:142 +#: ../comps-el4.xml.in.h:46 +msgid "Support for developing programs in the Java programming language." +msgstr "Podpora pro v??voj program?? v programovac??m jazyku Java." + +#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:143 +#: ../comps-el4.xml.in.h:47 +msgid "Support for running programs written in the Java programming language." +msgstr "" +"Podpora pro b??h program?? napsan??ch v programovac??m jazyce Java (runtime " +"environment)." + # FIXME -#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 +#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:144 msgid "Swati Support" msgstr "Swati (P??kist??n)" -#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 +#: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:145 msgid "Swedish Support" msgstr "??v??d??tina" +#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:146 +#: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 +msgid "System Tools" +msgstr "Syst??mov?? n??stroje" + # FIXME -#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 +#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:147 #, fuzzy msgid "Tagalog Support" msgstr "Tamil (ji??n?? Asie)" # FIXME -#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 +#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:148 msgid "Tamil Support" msgstr "Tamil (ji??n?? Asie)" # FIXME -#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 +#: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:149 msgid "Telugu Support" msgstr "Telugu (Indie)" +#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:150 +#: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 +msgid "Text-based Internet" +msgstr "Internet - textov?? aplikace" + # FIXME -#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 +#: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:151 msgid "Thai Support" msgstr "Thaj??tina" -#: ../comps-f7.xml.in.h:142 +#: ../comps-f7.xml.in.h:143 msgid "The Eclipse Integrated Development Environment." msgstr "Integrovan?? v??vojov?? prost??ed?? Eclipse." -#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 +#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:152 +#: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 +msgid "The applications include office suites, PDF viewers, and more." +msgstr "Aplikace zahrnuj?? kancel????sk?? bal??ky, prohl????e??e PDF atd." + +#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:153 msgid "" "The packages in this group are core libraries needed to develop applications." msgstr "" "Bal????ky v t??to skupin?? jsou z??kladn?? knihovny pot??ebn?? pro v??voj aplikac??." -#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 +#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:154 +#: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 +msgid "These packages allow you to configure an IMAP or SMTP mail server." +msgstr "Bal????ky pro provoz po??tovn??ho serveru (SMTP, IMAP, POP3)." + +#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:155 msgid "" "These packages allow you to develop applications for the X Window System." msgstr "Bal????ky pro v??voj aplikac?? pro grafick?? prost??ed?? X Window System." -#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 +#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:156 +#: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 +msgid "" +"These packages are helpful when developing web applications or web pages." +msgstr "Bal????ky pro podporu WWW str??nek a Webov??ch aplikac??." + +#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:157 msgid "" "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "Bal????ky se s????ov??mi servery - nap??. DHCP, Kerberos a NIS." -#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 +#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:158 msgid "" "These packages include servers for old network protocols such as rsh and " "telnet." msgstr "Bal????ky s podporou pro star?? s????ov?? protokoly - nap??. rsh a telnet." -#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 +#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:159 msgid "These packages provide a virtualization environment." msgstr "Podpora virtualizace." -#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 +#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:160 msgid "These packages provide compatibility with previous releases." msgstr "" "Bal????ky, kter?? poskytuj?? podporu pro spou??t??n?? aplikac?? ur??en??ch pro " "p??edchoz?? star???? verze syst??mu." -#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 +#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:161 msgid "" "These packages provide support for various locales including fonts and input " "methods." @@ -980,7 +762,7 @@ "Bal????ky, kter?? poskytuj?? podporu pro r??zn?? locale (r??zn?? jazykov?? prost??ed??) " "v??etn?? p??sem a r??zn??ch vstupn??ch metod." -#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 +#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:162 msgid "" "These tools allow you to create documents in the DocBook format and convert " "them into HTML, PDF, Postscript, and text." @@ -988,13 +770,37 @@ "N??stroje pro vytv????en?? dokumentace ve form??tu DocBook a jej?? n??sledn?? " "konverze do form??tu HTML, PDF, Postscriptu i hol??ho textu." -#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 +#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:163 +#: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 +msgid "These tools allow you to run a Web server on the system." +msgstr "N??stroje pro podporu b??hu WWW serveru." + +#: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:164 +#: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 +msgid "These tools allow you to run an FTP server on the system." +msgstr "N??stroje pro podporu b??hu FTP serveru." + +#: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:165 +#: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 +msgid "" +"These tools include core development tools such as automake, gcc, perl, " +"python, and debuggers." +msgstr "" +"Z??kladn?? v??vojov?? n??stroje, nap??. automake, gcc, perl, python a lad??c?? " +"n??stroje." + +#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:166 +#: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 +msgid "This group allows you to configure the system as a news server." +msgstr "Tato skupina v??m umo??n?? nakonfigurovat po????ta?? jako news server." + +#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:167 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "" "Tato skupina obsahuje v??echny n??stroje pro konfiguraci serveru od " "spole??nosti Red Hat." -#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 +#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:168 msgid "" "This group includes a minimal set of packages. Useful for creating small " "router/firewall boxes, for example." @@ -1002,14 +808,75 @@ "Tato skupina obsahuje minim??ln?? mno??inu bal????k??. Je u??ite??n?? nap????klad pro " "instalaci mal??ch router??/firewall??." -#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 +#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:169 +#: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 +msgid "This group includes graphical email, Web, and chat clients." +msgstr "Tato skupina obsahuje grafick?? klienty pro email, WWW a chat." + +#: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:170 +#: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 +msgid "" +"This group includes packages for performing mathematical and scientific " +"computations and plotting, as well as unit conversion." +msgstr "" +"Tato skupina obsahuje bal????ky pro prov??d??n?? matematick??ch a v??deck??ch " +"v??po??t??, tvorbu graf?? a p??evod mezi jednotkami." + +#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:171 +#: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 +msgid "This group includes packages to help you manipulate and scan images." +msgstr "" +"Tato skupina obsahuje bal????ky, kter?? v??m pomohou pracovat s obr??zky a " +"skenovat je." + +#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:172 +#: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 +msgid "" +"This group includes text-based email, Web, and chat clients. These " +"applications do not require the X Window System." +msgstr "" +"Skupina obsahuje textov?? klienty pro email, WWW a chat, kter?? nepot??ebuj?? " +"grafick?? prost??ed?? X Window System." + +#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:173 +#: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 +msgid "" +"This group is a collection of graphical administration tools for the system, " +"such as for managing user accounts and configuring system hardware." +msgstr "" +"Tato skupina je soubor grafick??ch n??stroj?? administrace, nap??. pro spr??vu " +"u??ivatelsk??ch ????t?? a nastaven?? hardware po????ta??e." + +#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:174 +#: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 +msgid "" +"This group is a collection of tools and resources of Armenian environments." +msgstr "Skupina n??stroj?? a aplikac?? pro podporu Arm??n??tiny." + +#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:175 +#: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 +msgid "" +"This group is a collection of tools for various hardware specific utilities." +msgstr "" +"Skupina n??stroj?? a aplikac?? pro podporu nejr??zn??j????ho hardware (za????zen??)." + +#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:176 +#: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 +msgid "" +"This group is a collection of various tools for the system, such as the " +"client for connecting to SMB shares and tools to monitor network traffic." +msgstr "" +"Tato skupina je soubor r??zn??ch syst??mov??ch n??stroj??, nap??. klient pro " +"p??ipojen?? ke svazk??m SMB a n??stroje pro sledov??n?? s????ov??ho provozu." + +#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:177 msgid "" "This package group allows you to run a DNS name server (BIND) on the system." msgstr "" "Tato skupina bal????k?? v??m umo??n?? na po????ta??i provozovat jmenn?? server DNS " "(BIND)." -#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 +#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:178 msgid "" "This package group allows you to share files between Linux and MS Windows" "(tm) systems." @@ -1017,136 +884,236 @@ "Tato skupina bal????k?? v??m umo??n?? sd??let soubory mezi syst??my Linux a MS " "Windows(tm)." -#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 +#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:179 msgid "This package group contains packages useful for use with MySQL." msgstr "Tato skupina bal????k?? obsahuje bal????ky u??ite??n?? ve spojen?? s MySQL." -#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 +#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:180 msgid "This package group includes packages useful for use with Postgresql." msgstr "Tato skupina obsahuje bal????ky u??ite??n?? ve spojen?? s Postgresql." -#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 -#, fuzzy +#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:181 msgid "Tibetan Support" -msgstr "N??m??ina" +msgstr "Tibet??tina" -#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 +#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:182 #, fuzzy msgid "Tonga Support" msgstr "Tsonga" -#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 +#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:183 +#: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 +msgid "Tools and Utilities needed by a Fedora Packager" +msgstr "N??stroje a pom??cky pot??ebn?? pro tv??rce bal????k?? Fedory" + +#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:184 msgid "Tsonga Support" msgstr "Tsonga" -#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 +#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:185 msgid "Tswana Support" msgstr "Tswana" -#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 +#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:186 msgid "Turkish Support" msgstr "Ture??tina" -#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 +#: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:187 msgid "Ukrainian Support" msgstr "Ukrajin??tina" # FIXME -#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 +#: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:188 #, fuzzy msgid "Urdu Support" msgstr "Zulu (ji??n?? Afrika)" -#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 +#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:189 +#: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 +msgid "Various core pieces of the system." +msgstr "R??zn?? z??kladn?? sou????sti syst??mu." + +#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:190 +#: ../comps-el5.xml.in.h:72 +msgid "Various ways to relax and spend your free time." +msgstr "R??zn?? zp??soby, jak relaxovat a tr??vit voln?? ??as." + +#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:191 msgid "Venda Support" msgstr "Venda (ji??n?? Afrika)" -#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 -#, fuzzy +#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:192 msgid "Vietnamese Support" -msgstr "????n??tina" +msgstr "Vietnam??tina" -#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 +#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:193 msgid "Virtualization" msgstr "Virtualizace" +#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:194 +#: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 +msgid "Web Development" +msgstr "WWW - v??voj" + +#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:195 +#: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 +msgid "Web Server" +msgstr "WWW server" + # CS OK -#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 +#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:196 msgid "Welsh Support" msgstr "Vel??tina (Anglie)" -#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 +#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:197 +#: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 +msgid "Window Managers" +msgstr "Spr??vci oken" + +#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:198 msgid "Windows File Server" msgstr "Sd??len?? soubor?? pro Windows" -#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 +#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:199 msgid "X Software Development" msgstr "X Window - v??voj" +#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:200 +#: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 +msgid "X Window System" +msgstr "X Window System" + +#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:201 +msgid "XFCE" +msgstr "XFCE" + +#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:202 +msgid "XFCE Software Development" +msgstr "XFCE - v??voj" + # FIXME -#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 +#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:203 msgid "Xhosa Support" msgstr "Xhosa (ji??n?? Afrika)" # FIXME -#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 +#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:204 msgid "Zulu Support" msgstr "Zulu (ji??n?? Afrika)" -#: ../comps-f8.xml.in.h:21 +#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 msgid "Buildsystem building group" -msgstr "" +msgstr "Skupina pro tvorbu kompiluj??c??ho syst??mu" -#: ../comps-f8.xml.in.h:48 -#, fuzzy +#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:48 msgid "Fedora Eclipse" -msgstr "Eclipse" +msgstr "Fedora Eclipse" -#: ../comps-f8.xml.in.h:51 +#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:52 msgid "Fonts" -msgstr "" +msgstr "P??sma" -#: ../comps-f8.xml.in.h:52 +#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:53 msgid "Fonts packages for rendering text on the desktop." -msgstr "" +msgstr "Bal????ky p??sem pro psan?? textu na obrazovce." -#: ../comps-f8.xml.in.h:78 -#, fuzzy +#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:79 msgid "Integrated Development Environments based on Eclipse." -msgstr "Integrovan?? v??vojov?? prost??ed?? Eclipse." +msgstr "Integrovan?? v??vojov?? prost??ed?? zalo??en?? na Eclipse." -#: ../comps-f8.xml.in.h:94 +#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:95 msgid "Legacy Fonts" -msgstr "" +msgstr "Star???? p??sma" # FIXME -#: ../comps-f8.xml.in.h:99 +#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:100 #, fuzzy msgid "Low Saxon Support" msgstr "Thaj??tina" -#: ../comps-f8.xml.in.h:105 -#, fuzzy +#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:106 msgid "Mongolian Support" -msgstr "Eston??tina" +msgstr "Mongol??tina" -# CS OK -#: ../comps-f8.xml.in.h:107 -#, fuzzy +#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:108 msgid "Nepali Support" -msgstr "Beng??l??tina (Indie)" +msgstr "Nep??l??tina" -#: ../comps-f8.xml.in.h:113 +#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:114 msgid "Older bitmap and vector fonts packages" +msgstr "Star???? bal????ky bitmapov??ch a vektorov??ch p??sem" + +#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +msgid "Applications for a variety of tasks" +msgstr "Aplikace pro nejr??zn??j???? ????ely" + +#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +msgid "Dialup Networking Support" +msgstr "Vyt????en?? p??ipojen?? k Internetu" + +#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 +msgid "" +"GNOME is a powerful, graphical user interface which includes a panel, " +"desktop, system icons, and a graphical file manager." msgstr "" +"GNOME je v??konn?? grafick?? u??ivatelsk?? prost??ed??, kter?? zahrnuje panel, " +"prost??ed?? pracovn?? plochy, syst??mov?? ikony a grafick??ho spr??vce soubor??." -# FIXME -#, fuzzy -#~ msgid "Somail Support" -#~ msgstr "Swati (P??kist??n)" +#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 +msgid "" +"KDE is a powerful, graphical user interface which includes a panel, desktop, " +"system icons, and a graphical file manager." +msgstr "" +"KDE je v??konn?? grafick?? u??ivatelsk?? prost??ed??, kter?? zahrnuje panel, " +"prost??ed?? pracovn?? plochy, syst??mov?? ikony a grafick??ho spr??vce soubor??." + +#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 +msgid "" +"Sometimes called text editors, these are programs that allow you to create " +"and edit files. These include Emacs and Vi." +msgstr "" +"N??kdy ozna??ovan?? jako textov?? editory, tyto programy v??m umo??n?? vytv????et a " +"upravovat soubory. Tato skupina zahrnuje Emacs a Vi." + +#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +msgid "The XEmacs text editor." +msgstr "Textov?? editor XEmacs." + +#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 +msgid "" +"These tools allow you to create documentation in the DocBook format and " +"convert them to HTML, PDF, Postscript, and text." +msgstr "" +"N??stroje pro vytv????en?? dokumentace ve form??tu DocBook a jej?? konverze do " +"form??t?? HTML, PDF, Postscriptu i ??ist??ho textu." + +#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +msgid "This group is a collection of network servers for specific purposes" +msgstr "Tato skupina je soubor s????ov??ch server?? pro konkr??tn?? ????ely." + +#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 +msgid "" +"This group is a collection of tools and resources of Arabic environments." +msgstr "Tato skupina je soubor n??stroj?? a zdroj?? pro arabsk?? prost??ed??." + +#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 +msgid "" +"This group is a collection of tools and resources of Hebrew environments." +msgstr "Tato skupina je soubor n??stroj?? a zdroj?? pro hebrejsk?? prost??ed??." + +#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 +msgid "" +"This group is a collection of tools and resources of Japanese environments." +msgstr "Tato skupina je soubor n??stroj?? a zdroj?? pro japonsk?? prost??ed??." + +#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +msgid "XEmacs" +msgstr "XEmacs" -#~ msgid "Emacs" -#~ msgstr "Emacs" +#: ../comps-el5.xml.in.h:65 +msgid "" +"This group is a collection of tools and resources of Czech environments." +msgstr "Tato skupina je soubor n??stroj?? a zdroj?? pro ??esk?? prost??ed??." #~ msgid "The GNU Emacs text editor." #~ msgstr "Textov?? editor GNU Emacs." @@ -1175,30 +1142,9 @@ #~ msgid "Desktops" #~ msgstr "Grafick?? u??ivatelsk?? prost??ed??" -#~ msgid "GNOME" -#~ msgstr "GNOME" - -#~ msgid "ISO8859-14 Support" -#~ msgstr "ISO-8859-14 (Gael??tina, Breton??tina)" - -#~ msgid "ISO8859-15 Support" -#~ msgstr "ISO-8859-15 (z??padn?? Evropa, Euro)" - -#~ msgid "ISO8859-2 Support" -#~ msgstr "ISO-8859-2 (st??edn?? Evropa)" - -#~ msgid "ISO8859-9 Support" -#~ msgstr "ISO-8859-9 (Turecko)" - #~ msgid "Install these packages to recompile the kernel." #~ msgstr "Bal????ky pro kompilaci j??dra opera??n??ho syst??mu Linux." -#~ msgid "KDE" -#~ msgstr "KDE" - -#~ msgid "KDE Desktop Environment" -#~ msgstr "KDE" - #~ msgid "Kernel Development" #~ msgstr "J??dro - v??voj" @@ -1459,10 +1405,6 @@ #~ msgid "Virtualization Support." #~ msgstr "Podpora virtualizace." -# FIXME -#~ msgid "Compatibility Arch" -#~ msgstr "P??edchoz?? verze:" - #~ msgid "Compatibility Arch Libraries" #~ msgstr "Knihovny pro p??edchoz?? verze" From fedora-extras-commits at redhat.com Wed Mar 5 00:44:05 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 5 Mar 2008 00:44:05 GMT Subject: rpms/kdevelop/devel kdevelop.spec,1.73,1.74 Message-ID: <200803050044.m250i5k8011553@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdevelop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11495/devel Modified Files: kdevelop.spec Log Message: Actually bump Release. Index: kdevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- kdevelop.spec 4 Mar 2008 23:36:10 -0000 1.73 +++ kdevelop.spec 5 Mar 2008 00:43:30 -0000 1.74 @@ -19,7 +19,7 @@ Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 3.5.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ From fedora-extras-commits at redhat.com Wed Mar 5 00:51:17 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Wed, 5 Mar 2008 00:51:17 GMT Subject: rpms/libdrm/devel libdrm-modesetting.patch, NONE, 1.1 libdrm.spec, 1.34, 1.35 Message-ID: <200803050051.m250pHuu011671@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/libdrm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11635 Modified Files: libdrm.spec Added Files: libdrm-modesetting.patch Log Message: * Wed Mar 05 2008 Dave Airlie 2.4.0-0.6 - add initial modesetting headers to the mix - this API isn't stable libdrm-modesetting.patch: --- NEW FILE libdrm-modesetting.patch --- diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am index e7e07e4..24c3203 100644 --- a/libdrm/Makefile.am +++ b/libdrm/Makefile.am @@ -23,9 +23,9 @@ libdrm_ladir = $(libdir) libdrm_la_LDFLAGS = -version-number 2:3:0 -no-undefined AM_CFLAGS = -I$(top_srcdir)/shared-core -libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c +libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c xf86drmMode.c libdrmincludedir = ${includedir} -libdrminclude_HEADERS = xf86drm.h xf86mm.h +libdrminclude_HEADERS = xf86drm.h xf86mm.h xf86drmMode.h EXTRA_DIST = ChangeLog TODO diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index fb8f1c6..bcf562d 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -87,6 +87,9 @@ #define DRM_MSG_VERBOSITY 3 +#define DRM_NODE_CONTROL 0 +#define DRM_NODE_RENDER 1 + static drmServerInfoPtr drm_server_info; void drmSetServerInfo(drmServerInfoPtr info) @@ -264,7 +267,7 @@ static int drmMatchBusID(const char *id1, const char *id2) * special file node with the major and minor numbers specified by \p dev and * parent directory if necessary and was called by root. */ -static int drmOpenDevice(long dev, int minor) +static int drmOpenDevice(long dev, int minor, int type) { stat_t st; char buf[64]; @@ -274,7 +277,7 @@ static int drmOpenDevice(long dev, int minor) uid_t user = DRM_DEV_UID; gid_t group = DRM_DEV_GID, serv_group; - sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor); + sprintf(buf, type ? DRM_DEV_NAME : DRM_CONTROL_DEV_NAME, DRM_DIR_NAME, minor); drmMsg("drmOpenDevice: node name is %s\n", buf); if (drm_server_info) { @@ -348,15 +351,15 @@ static int drmOpenDevice(long dev, int minor) * Calls drmOpenDevice() if \p create is set, otherwise assembles the device * name from \p minor and opens it. */ -static int drmOpenMinor(int minor, int create) +static int drmOpenMinor(int minor, int create, int type) { int fd; char buf[64]; if (create) - return drmOpenDevice(makedev(DRM_MAJOR, minor), minor); + return drmOpenDevice(makedev(DRM_MAJOR, minor), minor, type); - sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor); + sprintf(buf, type ? DRM_DEV_NAME : DRM_CONTROL_DEV_NAME, DRM_DIR_NAME, minor); if ((fd = open(buf, O_RDWR, 0)) >= 0) return fd; return -errno; @@ -379,7 +382,7 @@ int drmAvailable(void) int retval = 0; int fd; - if ((fd = drmOpenMinor(0, 1)) < 0) { + if ((fd = drmOpenMinor(0, 1, DRM_NODE_RENDER)) < 0) { #ifdef __linux__ /* Try proc for backward Linux compatibility */ if (!access("/proc/dri/0", R_OK)) @@ -420,7 +423,7 @@ static int drmOpenByBusid(const char *busid) drmMsg("drmOpenByBusid: Searching for BusID %s\n", busid); for (i = 0; i < DRM_MAX_MINOR; i++) { - fd = drmOpenMinor(i, 1); + fd = drmOpenMinor(i, 1, DRM_NODE_RENDER); drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); if (fd >= 0) { sv.drm_di_major = 1; @@ -482,7 +485,7 @@ static int drmOpenByName(const char *name) * already in use. If it's in use it will have a busid assigned already. */ for (i = 0; i < DRM_MAX_MINOR; i++) { - if ((fd = drmOpenMinor(i, 1)) >= 0) { + if ((fd = drmOpenMinor(i, 1, DRM_NODE_RENDER)) >= 0) { if ((version = drmGetVersion(fd))) { if (!strcmp(version->name, name)) { drmFreeVersion(version); @@ -526,7 +529,7 @@ static int drmOpenByName(const char *name) if (*pt) { /* Found busid */ return drmOpenByBusid(++pt); } else { /* No busid */ - return drmOpenDevice(strtol(devstring, NULL, 0),i); + return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_RENDER); } } } @@ -576,6 +579,10 @@ int drmOpen(const char *name, const char *busid) return -1; } +int drmOpenControl(int minor) +{ + return drmOpenMinor(minor, 0, DRM_NODE_CONTROL); +} /** * Free the version information returned by drmGetVersion(). @@ -2871,6 +2878,21 @@ int drmMMUnlock(int fd, unsigned memType, int unlockBM) return drmIoctlTimeout(fd, DRM_IOCTL_MM_UNLOCK, &arg); } +int drmMMInfo(int fd, unsigned memType, uint64_t *size) +{ + struct drm_mm_info_arg arg; + + memset(&arg, 0, sizeof(arg)); + + arg.mem_type = memType; + + if (ioctl(fd, DRM_IOCTL_MM_INFO, &arg)) + return -errno; + + *size = arg.p_size; + return 0; +} + int drmBOVersion(int fd, unsigned int *major, unsigned int *minor, unsigned int *patchlevel) diff --git a/libdrm/xf86drm.h b/libdrm/xf86drm.h index 230f54c..7b41860 100644 --- a/libdrm/xf86drm.h +++ b/libdrm/xf86drm.h @@ -49,6 +49,7 @@ #define DRM_DIR_NAME "/dev/dri" #define DRM_DEV_NAME "%s/card%d" +#define DRM_CONTROL_DEV_NAME "%s/controlD%d" #define DRM_PROC_NAME "/proc/dri/" /* For backward Linux compatibility */ #define DRM_ERR_NO_DEVICE (-1001) @@ -508,6 +509,7 @@ do { register unsigned int __old __asm("o0"); \ /* General user-level programmer's API: unprivileged */ extern int drmAvailable(void); extern int drmOpen(const char *name, const char *busid); +extern int drmOpenControl(int minor); extern int drmClose(int fd); extern drmVersionPtr drmGetVersion(int fd); extern drmVersionPtr drmGetLibVersion(int fd); diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c new file mode 100644 index 0000000..07b14db --- /dev/null +++ b/libdrm/xf86drmMode.c @@ -0,0 +1,594 @@ +/* + * \file xf86drmMode.c + * Header for DRM modesetting interface. + * + * \author Jakob Bornecrantz + * + * \par Acknowledgements: + * Feb 2007, Dave Airlie + */ + +/* + * Copyright (c) + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + */ + +/* + * TODO the types we are after are defined in diffrent headers on diffrent + * platforms find which headers to include to get uint32_t + */ +#include +#include +#include + +#include "xf86drmMode.h" +#include "xf86drm.h" +#include +#include +#include +#include + +#define U642VOID(x) ((void *)(unsigned long)(x)) +#define VOID2U64(x) ((uint64_t)(unsigned long)(x)) + +/* + * Util functions + */ + +void* drmAllocCpy(void *array, int count, int entry_size) +{ + char *r; + int i; + + if (!count || !array || !entry_size) + return 0; + + if (!(r = drmMalloc(count*entry_size))) + return 0; + + for (i = 0; i < count; i++) + memcpy(r+(entry_size*i), array+(entry_size*i), entry_size); + + return r; +} + +/* + * A couple of free functions. + */ + +void drmModeFreeModeInfo(struct drm_mode_modeinfo *ptr) +{ + if (!ptr) + return; + + drmFree(ptr); +} + +void drmModeFreeResources(drmModeResPtr ptr) +{ + if (!ptr) + return; + + drmFree(ptr); + +} + +void drmModeFreeFB(drmModeFBPtr ptr) +{ + if (!ptr) + return; + + /* we might add more frees later. */ + drmFree(ptr); +} + +void drmModeFreeCrtc(drmModeCrtcPtr ptr) +{ + if (!ptr) + return; + + drmFree(ptr); + +} + +void drmModeFreeOutput(drmModeOutputPtr ptr) +{ + if (!ptr) + return; + + drmFree(ptr->modes); + drmFree(ptr); + +} + +/* + * ModeSetting functions. + */ + +drmModeResPtr drmModeGetResources(int fd) +{ + struct drm_mode_card_res res; + drmModeResPtr r = 0; + + memset(&res, 0, sizeof(struct drm_mode_card_res)); + + if (ioctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res)) + return 0; + + if (res.count_fbs) + res.fb_id_ptr = VOID2U64(drmMalloc(res.count_fbs*sizeof(uint32_t))); + if (res.count_crtcs) + res.crtc_id_ptr = VOID2U64(drmMalloc(res.count_crtcs*sizeof(uint32_t))); + if (res.count_outputs) + res.output_id_ptr = VOID2U64(drmMalloc(res.count_outputs*sizeof(uint32_t))); + + if (ioctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res)) { + r = NULL; + goto err_allocs; + } + + /* + * return + */ + + + if (!(r = drmMalloc(sizeof(*r)))) + return 0; + + r->min_width = res.min_width; + r->max_width = res.max_width; + r->min_height = res.min_height; + r->max_height = res.max_height; + r->count_fbs = res.count_fbs; + r->count_crtcs = res.count_crtcs; + r->count_outputs = res.count_outputs; + /* TODO we realy should test if these allocs fails. */ + r->fbs = drmAllocCpy(U642VOID(res.fb_id_ptr), res.count_fbs, sizeof(uint32_t)); + r->crtcs = drmAllocCpy(U642VOID(res.crtc_id_ptr), res.count_crtcs, sizeof(uint32_t)); + r->outputs = drmAllocCpy(U642VOID(res.output_id_ptr), res.count_outputs, sizeof(uint32_t)); + +err_allocs: + drmFree(U642VOID(res.fb_id_ptr)); + drmFree(U642VOID(res.crtc_id_ptr)); + drmFree(U642VOID(res.output_id_ptr)); + + return r; +} + +uint32_t drmModeGetHotplug(int fd) +{ + struct drm_mode_hotplug arg; + arg.counter = 0; + + ioctl(fd, DRM_IOCTL_MODE_HOTPLUG, &arg); + return arg.counter; +} + +int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth, + uint8_t bpp, uint32_t pitch, uint32_t bo_handle, + uint32_t *buf_id) +{ + struct drm_mode_fb_cmd f; + int ret; + + f.width = width; + f.height = height; + f.pitch = pitch; + f.bpp = bpp; + f.depth = depth; + f.handle = bo_handle; + + if ((ret = ioctl(fd, DRM_IOCTL_MODE_ADDFB, &f))) + return ret; + + *buf_id = f.buffer_id; + return 0; +} + +int drmModeRmFB(int fd, uint32_t bufferId) +{ + return ioctl(fd, DRM_IOCTL_MODE_RMFB, &bufferId); + + +} + +drmModeFBPtr drmModeGetFB(int fd, uint32_t buf) +{ + struct drm_mode_fb_cmd info; + drmModeFBPtr r; + + info.buffer_id = buf; + + if (ioctl(fd, DRM_IOCTL_MODE_GETFB, &info)) + return NULL; + + if (!(r = drmMalloc(sizeof(*r)))) + return NULL; + + r->buffer_id = info.buffer_id; + r->width = info.width; + r->height = info.height; + r->pitch = info.pitch; + r->bpp = info.bpp; + r->handle = info.handle; + r->depth = info.depth; + + return r; +} + + +/* + * Crtc functions + */ + +drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId) +{ + struct drm_mode_crtc crtc; + drmModeCrtcPtr r; + + crtc.count_outputs = 0; + crtc.outputs = 0; + crtc.count_possibles = 0; + crtc.possibles = 0; + crtc.crtc_id = crtcId; + + if (ioctl(fd, DRM_IOCTL_MODE_GETCRTC, &crtc)) + return 0; + + /* + * return + */ + + if (!(r = drmMalloc(sizeof(*r)))) + return 0; + + r->crtc_id = crtc.crtc_id; + r->x = crtc.x; + r->y = crtc.y; + r->mode_valid = crtc.mode_valid; + if (r->mode_valid) + memcpy(&r->mode, &crtc.mode, sizeof(struct drm_mode_modeinfo)); + r->buffer_id = crtc.fb_id; + r->gamma_size = crtc.gamma_size; + r->count_outputs = crtc.count_outputs; + r->count_possibles = crtc.count_possibles; + /* TODO we realy should test if these alloc & cpy fails. */ + r->outputs = crtc.outputs; + r->possibles = crtc.possibles; + + return r; +} + + +int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId, + uint32_t x, uint32_t y, uint32_t *outputs, int count, + struct drm_mode_modeinfo *mode) +{ + struct drm_mode_crtc crtc; + + crtc.count_outputs = 0; + crtc.outputs = 0; + crtc.count_possibles = 0; + crtc.possibles = 0; + + crtc.x = x; + crtc.y = y; + crtc.crtc_id = crtcId; + crtc.fb_id = bufferId; + crtc.set_outputs_ptr = VOID2U64(outputs); + crtc.count_outputs = count; + if (mode) { + memcpy(&crtc.mode, mode, sizeof(struct drm_mode_modeinfo)); + crtc.mode_valid = 1; + } else + crtc.mode_valid = 0; + + return ioctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc); +} + +/* + * Cursor manipulation + */ + +int drmModeSetCursor(int fd, uint32_t crtcId, drmBO *bo, uint32_t width, uint32_t height) +{ + struct drm_mode_cursor arg; + + arg.flags = DRM_MODE_CURSOR_BO; + arg.crtc = crtcId; + arg.width = width; + arg.height = height; + if (bo) + arg.handle = bo->handle; + else + arg.handle = 0; + + return ioctl(fd, DRM_IOCTL_MODE_CURSOR, &arg); +} + +int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y) +{ + struct drm_mode_cursor arg; + + arg.flags = DRM_MODE_CURSOR_MOVE; + arg.crtc = crtcId; + arg.x = x; + arg.y = y; + + return ioctl(fd, DRM_IOCTL_MODE_CURSOR, &arg); +} + +/* + * Output manipulation + */ + +drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id) +{ + struct drm_mode_get_output out; + drmModeOutputPtr r = NULL; + + out.output = output_id; + out.output_type_id = 0; + out.output_type = 0; + out.count_crtcs = 0; + out.crtcs = 0; + out.count_clones = 0; + out.clones = 0; + out.count_modes = 0; + out.modes_ptr = 0; + out.count_props = 0; + out.props_ptr = 0; + out.prop_values_ptr = 0; + + if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out)) + return 0; + + if (out.count_props) { + out.props_ptr = VOID2U64(drmMalloc(out.count_props*sizeof(uint32_t))); + out.prop_values_ptr = VOID2U64(drmMalloc(out.count_props*sizeof(uint64_t))); + } + + if (out.count_modes) + out.modes_ptr = VOID2U64(drmMalloc(out.count_modes*sizeof(struct drm_mode_modeinfo))); + + if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out)) + goto err_allocs; + + if(!(r = drmMalloc(sizeof(*r)))) { + goto err_allocs; + } + + r->output_id = out.output; + r->crtc = out.crtc; + r->connection = out.connection; + r->mmWidth = out.mm_width; + r->mmHeight = out.mm_height; + r->subpixel = out.subpixel; + r->count_crtcs = out.count_crtcs; + r->count_clones = out.count_clones; + r->count_modes = out.count_modes; + /* TODO we should test if these alloc & cpy fails. */ + r->crtcs = out.crtcs; + r->clones = out.clones; + r->count_props = out.count_props; + r->props = drmAllocCpy(U642VOID(out.props_ptr), out.count_props, sizeof(uint32_t)); + r->prop_values = drmAllocCpy(U642VOID(out.prop_values_ptr), out.count_props, sizeof(uint64_t)); + r->modes = drmAllocCpy(U642VOID(out.modes_ptr), out.count_modes, sizeof(struct drm_mode_modeinfo)); + r->output_type = out.output_type; + r->output_type_id = out.output_type_id; + +err_allocs: + drmFree(U642VOID(out.prop_values_ptr)); + drmFree(U642VOID(out.props_ptr)); + drmFree(U642VOID(out.modes_ptr)); + + return r; +} + +int drmModeAttachMode(int fd, uint32_t output_id, struct drm_mode_modeinfo *mode_info) +{ + struct drm_mode_mode_cmd res; + + memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo)); + res.output_id = output_id; + + return ioctl(fd, DRM_IOCTL_MODE_ATTACHMODE, &res); +} + +int drmModeDetachMode(int fd, uint32_t output_id, struct drm_mode_modeinfo *mode_info) +{ + struct drm_mode_mode_cmd res; + + memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo)); + res.output_id = output_id; + + return ioctl(fd, DRM_IOCTL_MODE_DETACHMODE, &res); +} + + +drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id) +{ + struct drm_mode_get_property prop; + drmModePropertyPtr r; + + prop.prop_id = property_id; + prop.count_enum_blobs = 0; + prop.count_values = 0; + prop.flags = 0; + prop.enum_blob_ptr = 0; + prop.values_ptr = 0; + + if (ioctl(fd, DRM_IOCTL_MODE_GETPROPERTY, &prop)) + return 0; + + if (prop.count_values) + prop.values_ptr = VOID2U64(drmMalloc(prop.count_values * sizeof(uint64_t))); + + if (prop.count_enum_blobs && (prop.flags & DRM_MODE_PROP_ENUM)) + prop.enum_blob_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(struct drm_mode_property_enum))); + + if (prop.count_enum_blobs && (prop.flags & DRM_MODE_PROP_BLOB)) { + prop.values_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(uint32_t))); + prop.enum_blob_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(uint32_t))); + } + + if (ioctl(fd, DRM_IOCTL_MODE_GETPROPERTY, &prop)) { + r = NULL; + goto err_allocs; + } + + if (!(r = drmMalloc(sizeof(*r)))) + return NULL; + + r->prop_id = prop.prop_id; + r->count_values = prop.count_values; + + r->flags = prop.flags; + if (prop.count_values) + r->values = drmAllocCpy(U642VOID(prop.values_ptr), prop.count_values, sizeof(uint64_t)); + if (prop.flags & DRM_MODE_PROP_ENUM) { + r->count_enums = prop.count_enum_blobs; + r->enums = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(struct drm_mode_property_enum)); + } else if (prop.flags & DRM_MODE_PROP_ENUM) { + r->values = drmAllocCpy(U642VOID(prop.values_ptr), prop.count_enum_blobs, sizeof(uint32_t)); + r->blob_ids = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(uint32_t)); + r->count_blobs = prop.count_enum_blobs; + } + strncpy(r->name, prop.name, DRM_PROP_NAME_LEN); + r->name[DRM_PROP_NAME_LEN-1] = 0; + +err_allocs: + drmFree(U642VOID(prop.values_ptr)); + drmFree(U642VOID(prop.enum_blob_ptr)); + + return r; +} + +void drmModeFreeProperty(drmModePropertyPtr ptr) +{ + if (!ptr) + return; + + drmFree(ptr->values); + drmFree(ptr->enums); + drmFree(ptr); +} + +drmModePropertyBlobPtr drmModeGetPropertyBlob(int fd, uint32_t blob_id) +{ + struct drm_mode_get_blob blob; + drmModePropertyBlobPtr r; + + blob.length = 0; + blob.data = 0; + blob.blob_id = blob_id; + + if (ioctl(fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob)) + return NULL; + + if (blob.length) + blob.data = VOID2U64(drmMalloc(blob.length)); + + if (ioctl(fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob)) { + r = NULL; + goto err_allocs; + } + + if (!(r = drmMalloc(sizeof(*r)))) + return NULL; + + r->id = blob.blob_id; + r->length = blob.length; + r->data = drmAllocCpy(U642VOID(blob.data), 1, blob.length); + +err_allocs: + drmFree(U642VOID(blob.data)); + return r; +} + +void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr) +{ + if (!ptr) + return; + + drmFree(ptr->data); + drmFree(ptr); +} + +int drmModeOutputSetProperty(int fd, uint32_t output_id, uint32_t property_id, + uint64_t value) +{ + struct drm_mode_output_set_property osp; + int ret; + + osp.output_id = output_id; + osp.prop_id = property_id; + osp.value = value; + + if ((ret = ioctl(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp))) + return ret; + + return 0; +} + +/* + * checks if a modesetting capable driver has attached to the pci id + * returns 0 if modesetting supported. + * -EINVAL or invalid bus id + * -ENOSYS if no modesetting support +*/ +int drmCheckModesettingSupported(const char *busid) +{ +#ifdef __linux__ + char pci_dev_dir[1024]; + int domain, bus, dev, func; + DIR *sysdir; + struct dirent *dent; + int found = 0, ret; + + ret = sscanf(busid, "pci:%04x:%02x:%02x.%d", &domain, &bus, &dev, &func); + if (ret != 4) + return -EINVAL; + + sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/", + domain, bus, dev, func); + + sysdir = opendir(pci_dev_dir); + if (!sysdir) + return -EINVAL; + + dent = readdir(sysdir); + while (dent) { + if (!strncmp(dent->d_name, "drm:controlD", 12)) { + found = 1; + break; + } + + dent = readdir(sysdir); + } + + closedir(sysdir); + if (found) + return 0; +#endif + return -ENOSYS; + +} diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h new file mode 100644 index 0000000..edf9efe --- /dev/null +++ b/libdrm/xf86drmMode.h @@ -0,0 +1,246 @@ +/* + * \file xf86drmMode.h + * Header for DRM modesetting interface. + * + * \author Jakob Bornecrantz + * + * \par Acknowledgements: + * Feb 2007, Dave Airlie + */ + +/* + * Copyright (c) + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + */ + +#include +#include "xf86mm.h" + +/* + * This is the interface for modesetting for drm. + * + * In order to use this interface you must include either or another + * header defining uint32_t, int32_t and uint16_t. + * + * It aims to provide a randr1.2 compatible interface for modesettings in the + * kernel, the interface is also ment to be used by libraries like EGL. + * + * More information can be found in randrproto.txt which can be found here: + * http://gitweb.freedesktop.org/?p=xorg/proto/randrproto.git + * + * There are some major diffrences to be noted. Unlike the randr1.2 proto you + * need to create the memory object of the framebuffer yourself with the ttm + * buffer object interface. This object needs to be pinned. + */ + + +typedef struct _drmModeRes { + + int count_fbs; + uint32_t *fbs; + + int count_crtcs; + uint32_t *crtcs; + + int count_outputs; + uint32_t *outputs; + + uint32_t min_width, max_width; + uint32_t min_height, max_height; +} drmModeRes, *drmModeResPtr; + +typedef struct drm_mode_fb_cmd drmModeFB, *drmModeFBPtr; + +typedef struct _drmModePropertyBlob { + uint32_t id; + uint32_t length; + void *data; +} drmModePropertyBlobRes, *drmModePropertyBlobPtr; + +typedef struct _drmModeProperty { + unsigned int prop_id; + unsigned int flags; + char name[DRM_PROP_NAME_LEN]; + int count_values; + uint64_t *values; // store the blob lengths + int count_enums; + struct drm_mode_property_enum *enums; + int count_blobs; + uint32_t *blob_ids; // store the blob IDs +} drmModePropertyRes, *drmModePropertyPtr; + +typedef struct _drmModeCrtc { + unsigned int crtc_id; + unsigned int buffer_id; /**< FB id to connect to 0 = disconnect*/ + + uint32_t x, y; /**< Position on the frameuffer */ + uint32_t width, height; + int mode_valid; + struct drm_mode_modeinfo mode; + + int count_outputs; + uint32_t outputs; /**< Outputs that are connected */ + + int count_possibles; + uint32_t possibles; /**< Outputs that can be connected */ + + int gamma_size; /**< Number of gamma stops */ + +} drmModeCrtc, *drmModeCrtcPtr; + +typedef enum { + DRM_MODE_CONNECTED = 1, + DRM_MODE_DISCONNECTED = 2, + DRM_MODE_UNKNOWNCONNECTION = 3 +} drmModeConnection; + +typedef enum { + DRM_MODE_SUBPIXEL_UNKNOWN = 1, + DRM_MODE_SUBPIXEL_HORIZONTAL_RGB = 2, + DRM_MODE_SUBPIXEL_HORIZONTAL_BGR = 3, + DRM_MODE_SUBPIXEL_VERTICAL_RGB = 4, + DRM_MODE_SUBPIXEL_VERTICAL_BGR = 5, + DRM_MODE_SUBPIXEL_NONE = 6 +} drmModeSubPixel; + +typedef struct _drmModeOutput { + unsigned int output_id; + + unsigned int crtc; /**< Crtc currently connected to */ + unsigned int output_type; + unsigned int output_type_id; + drmModeConnection connection; + uint32_t mmWidth, mmHeight; /**< HxW in millimeters */ + drmModeSubPixel subpixel; + + int count_crtcs; + uint32_t crtcs; /**< Possible crtc to connect to */ + + int count_clones; + uint32_t clones; /**< Mask of clones */ + + int count_modes; + struct drm_mode_modeinfo *modes; + + int count_props; + uint32_t *props; /**< List of property ids */ + uint64_t *prop_values; /**< List of property values */ + +} drmModeOutput, *drmModeOutputPtr; + + + +extern void drmModeFreeModeInfo( struct drm_mode_modeinfo *ptr ); +extern void drmModeFreeResources( drmModeResPtr ptr ); +extern void drmModeFreeFB( drmModeFBPtr ptr ); +extern void drmModeFreeCrtc( drmModeCrtcPtr ptr ); +extern void drmModeFreeOutput( drmModeOutputPtr ptr ); + +/** + * Retrives all of the resources associated with a card. + */ +extern drmModeResPtr drmModeGetResources(int fd); + +/** + * Retrives the hotplug counter + */ +extern uint32_t drmModeGetHotplug(int fd); + +/* + * FrameBuffer manipulation. + */ + +/** + * Retrive information about framebuffer bufferId + */ +extern drmModeFBPtr drmModeGetFB(int fd, uint32_t bufferId); + +/** + * Creates a new framebuffer with an buffer object as its scanout buffer. + */ +extern int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth, + uint8_t bpp, uint32_t pitch, uint32_t bo_handle, + uint32_t *buf_id); +/** + * Destroies the given framebuffer. + */ +extern int drmModeRmFB(int fd, uint32_t bufferId); + + +/* + * Crtc functions + */ + +/** + * Retrive information about the ctrt crtcId + */ +extern drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId); + +/** + * Set the mode on a crtc crtcId with the given mode modeId. + */ +int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId, + uint32_t x, uint32_t y, uint32_t *outputs, int count, + struct drm_mode_modeinfo *mode); + +/* + * Cursor functions + */ + +/** + * Set the cursor on crtc + */ +int drmModeSetCursor(int fd, uint32_t crtcId, drmBO *bo, uint32_t width, uint32_t height); + +/** + * Move the cursor on crtc + */ +int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y); + +/* + * Output manipulation + */ + +/** + * Retrive information about the output outputId. + */ +extern drmModeOutputPtr drmModeGetOutput(int fd, + uint32_t outputId); + +/** + * Attaches the given mode to an output. + */ +extern int drmModeAttachMode(int fd, uint32_t outputId, struct drm_mode_modeinfo *mode_info); + +/** + * Detaches a mode from the output + * must be unused, by the given mode. + */ +extern int drmModeDetachMode(int fd, uint32_t outputId, struct drm_mode_modeinfo *mode_info); + +extern drmModePropertyPtr drmModeGetProperty(int fd, uint32_t propertyId); +extern void drmModeFreeProperty(drmModePropertyPtr ptr); + +extern drmModePropertyBlobPtr drmModeGetPropertyBlob(int fd, uint32_t blob_id); +extern void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr); +extern int drmModeOutputSetProperty(int fd, uint32_t output_id, uint32_t property_id, + uint64_t value); +extern int drmCheckModesettingSupported(const char *busid); diff --git a/libdrm/xf86mm.h b/libdrm/xf86mm.h index c80288a..bb57340 100644 --- a/libdrm/xf86mm.h +++ b/libdrm/xf86mm.h @@ -172,6 +172,7 @@ extern int drmMMInit(int fd, unsigned long pOffset, unsigned long pSize, extern int drmMMTakedown(int fd, unsigned memType); extern int drmMMLock(int fd, unsigned memType, int lockBM, int ignoreNoEvict); extern int drmMMUnlock(int fd, unsigned memType, int unlockBM); +extern int drmMMInfo(int fd, unsigned memType, uint64_t *size); extern int drmBOSetStatus(int fd, drmBO *buf, uint64_t flags, uint64_t mask, unsigned int hint, diff --git a/shared-core/drm.h b/shared-core/drm.h index 663696c..cbe83fd 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -955,6 +950,180 @@ struct drm_mm_init_arg { uint64_t p_size; }; +struct drm_mm_info_arg { + unsigned int mem_type; + uint64_t p_size; +}; + + +/* + * Drm mode setting + */ +#define DRM_DISPLAY_INFO_LEN 32 +#define DRM_OUTPUT_NAME_LEN 32 +#define DRM_DISPLAY_MODE_LEN 32 +#define DRM_PROP_NAME_LEN 32 + +#define DRM_MODE_TYPE_BUILTIN (1<<0) +#define DRM_MODE_TYPE_CLOCK_C ((1<<1) | DRM_MODE_TYPE_BUILTIN) +#define DRM_MODE_TYPE_CRTC_C ((1<<2) | DRM_MODE_TYPE_BUILTIN) +#define DRM_MODE_TYPE_PREFERRED (1<<3) +#define DRM_MODE_TYPE_DEFAULT (1<<4) +#define DRM_MODE_TYPE_USERDEF (1<<5) +#define DRM_MODE_TYPE_DRIVER (1<<6) + +struct drm_mode_modeinfo { + unsigned int clock; + unsigned short hdisplay, hsync_start, hsync_end, htotal, hskew; + unsigned short vdisplay, vsync_start, vsync_end, vtotal, vscan; + + unsigned int vrefresh; /* vertical refresh * 1000 */ + + unsigned int flags; + unsigned int type; + char name[DRM_DISPLAY_MODE_LEN]; +}; + +struct drm_mode_card_res { + uint64_t fb_id_ptr; + uint64_t crtc_id_ptr; + uint64_t output_id_ptr; + int count_fbs; + int count_crtcs; + int count_outputs; + int min_width, max_width; + int min_height, max_height; +}; + +struct drm_mode_crtc { + uint64_t set_outputs_ptr; + + unsigned int crtc_id; /**< Id */ + unsigned int fb_id; /**< Id of framebuffer */ + + int x, y; /**< Position on the frameuffer */ + + int count_outputs; + unsigned int outputs; /**< Outputs that are connected */ + + int count_possibles; + unsigned int possibles; /**< Outputs that can be connected */ + int gamma_size; + int mode_valid; + struct drm_mode_modeinfo mode; +}; + +#define DRM_MODE_OUTPUT_NONE 0 +#define DRM_MODE_OUTPUT_DAC 1 +#define DRM_MODE_OUTPUT_TMDS 2 +#define DRM_MODE_OUTPUT_LVDS 3 +#define DRM_MODE_OUTPUT_TVDAC 4 + +struct drm_mode_get_output { + + uint64_t modes_ptr; + uint64_t props_ptr; + uint64_t prop_values_ptr; + + int count_modes; + int count_props; + unsigned int output; /**< Id */ + unsigned int crtc; /**< Id of crtc */ + unsigned int output_type; + unsigned int output_type_id; + + unsigned int connection; + unsigned int mm_width, mm_height; /**< HxW in millimeters */ + unsigned int subpixel; + int count_crtcs; + int count_clones; + unsigned int crtcs; /**< possible crtc to connect to */ + unsigned int clones; /**< list of clones */ +}; + +#define DRM_MODE_PROP_PENDING (1<<0) +#define DRM_MODE_PROP_RANGE (1<<1) +#define DRM_MODE_PROP_IMMUTABLE (1<<2) +#define DRM_MODE_PROP_ENUM (1<<3) // enumerated type with text strings +#define DRM_MODE_PROP_BLOB (1<<4) + +struct drm_mode_property_enum { + uint64_t value; + unsigned char name[DRM_PROP_NAME_LEN]; +}; + +struct drm_mode_get_property { + uint64_t values_ptr; /* values and blob lengths */ + uint64_t enum_blob_ptr; /* enum and blob id ptrs */ + + unsigned int prop_id; + unsigned int flags; + unsigned char name[DRM_PROP_NAME_LEN]; + + int count_values; + int count_enum_blobs; +}; + +struct drm_mode_output_set_property { + uint64_t value; + unsigned int prop_id; + unsigned int output_id; +}; + +struct drm_mode_get_blob { + uint32_t blob_id; + uint32_t length; + uint64_t data; +}; + +struct drm_mode_fb_cmd { + unsigned int buffer_id; + unsigned int width, height; + unsigned int pitch; + unsigned int bpp; + unsigned int handle; + unsigned int depth; +}; + +struct drm_mode_mode_cmd { + unsigned int output_id; + struct drm_mode_modeinfo mode; +}; + +#define DRM_MODE_CURSOR_BO 0x01 +#define DRM_MODE_CURSOR_MOVE 0x02 + +/* + * depending on the value in flags diffrent members are used. + * + * CURSOR_BO uses + * crtc + * width + * height + * handle - if 0 turns the cursor of + * + * CURSOR_MOVE uses + * crtc + * x + * y + */ +struct drm_mode_cursor { + unsigned int flags; + unsigned int crtc; + int x; + int y; + uint32_t width; + uint32_t height; + unsigned int handle; +}; + +/* + * oh so ugly hotplug + */ +struct drm_mode_hotplug { + uint32_t counter; +}; + /** * \name Ioctls Definitions */ @@ -1046,6 +1215,24 @@ struct drm_mm_init_arg { #define DRM_IOCTL_BO_INFO DRM_IOWR(0xd4, struct drm_bo_reference_info_arg) #define DRM_IOCTL_BO_WAIT_IDLE DRM_IOWR(0xd5, struct drm_bo_map_wait_idle_arg) #define DRM_IOCTL_BO_VERSION DRM_IOR(0xd6, struct drm_bo_version_arg) +#define DRM_IOCTL_MM_INFO DRM_IOWR(0xd7, struct drm_mm_info_arg) + +#define DRM_IOCTL_MODE_GETRESOURCES DRM_IOWR(0xA0, struct drm_mode_card_res) +#define DRM_IOCTL_MODE_GETCRTC DRM_IOWR(0xA1, struct drm_mode_crtc) +#define DRM_IOCTL_MODE_GETOUTPUT DRM_IOWR(0xA2, struct drm_mode_get_output) +#define DRM_IOCTL_MODE_SETCRTC DRM_IOWR(0xA3, struct drm_mode_crtc) +#define DRM_IOCTL_MODE_ADDFB DRM_IOWR(0xA4, struct drm_mode_fb_cmd) +#define DRM_IOCTL_MODE_RMFB DRM_IOWR(0xA5, unsigned int) +#define DRM_IOCTL_MODE_GETFB DRM_IOWR(0xA6, struct drm_mode_fb_cmd) + +#define DRM_IOCTL_MODE_SETPROPERTY DRM_IOWR(0xA7, struct drm_mode_output_set_property) +#define DRM_IOCTL_MODE_GETPROPBLOB DRM_IOWR(0xA8, struct drm_mode_get_blob) +#define DRM_IOCTL_MODE_ATTACHMODE DRM_IOWR(0xA9, struct drm_mode_mode_cmd) +#define DRM_IOCTL_MODE_DETACHMODE DRM_IOWR(0xAA, struct drm_mode_mode_cmd) + +#define DRM_IOCTL_MODE_GETPROPERTY DRM_IOWR(0xAB, struct drm_mode_get_property) +#define DRM_IOCTL_MODE_CURSOR DRM_IOWR(0xAC, struct drm_mode_cursor) +#define DRM_IOCTL_MODE_HOTPLUG DRM_IOWR(0xAD, struct drm_mode_hotplug) /*@}*/ diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h index b93df67..a40cabd 100644 --- a/shared-core/i915_drm.h +++ b/shared-core/i915_drm.h @@ -39,7 +39,7 @@ * of chars for next/prev indices */ #define I915_LOG_MIN_TEX_REGION_SIZE 14 -typedef struct _drm_i915_init { +typedef struct drm_i915_init { enum { I915_INIT_DMA = 0x01, I915_CLEANUP_DMA = 0x02, @@ -223,7 +223,7 @@ typedef struct drm_i915_batchbuffer { /* As above, but pass a pointer to userspace buffer which can be * validated by the kernel prior to sending to hardware. */ -typedef struct _drm_i915_cmdbuffer { +typedef struct drm_i915_cmdbuffer { char __user *buf; /* pointer to userspace command buffer */ int sz; /* nr bytes in buf */ int DR1; /* hw flags for GFX_OP_DRAWRECT_INFO */ @@ -326,6 +326,8 @@ typedef struct drm_i915_vblank_swap { #define MMIO_REGS_CL_INVOCATION_COUNT 6 #define MMIO_REGS_PS_INVOCATION_COUNT 7 #define MMIO_REGS_PS_DEPTH_COUNT 8 +#define MMIO_REGS_DOVSTA 9 +#define MMIO_REGS_GAMMA 10 typedef struct drm_i915_mmio_entry { unsigned int flag; diff --git a/tests/dristat.c b/tests/dristat.c index 8985316..48c3b51 100644 --- a/tests/dristat.c +++ b/tests/dristat.c @@ -263,7 +263,7 @@ int main(int argc, char **argv) for (i = 0; i < 16; i++) if (!minor || i == minor) { sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, i); - fd = drmOpenMinor(i, 1); + fd = drmOpenMinor(i, 1, DRM_NODE_RENDER); if (fd >= 0) { printf("%s\n", buf); if (mask & DRM_BUSID) getbusid(fd); Index: libdrm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- libdrm.spec 4 Mar 2008 01:42:54 -0000 1.34 +++ libdrm.spec 5 Mar 2008 00:50:26 -0000 1.35 @@ -3,7 +3,7 @@ Summary: Direct Rendering Manager runtime library Name: libdrm Version: 2.4.0 -Release: 0.5%{?dist} +Release: 0.6%{?dist} License: MIT Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -14,6 +14,7 @@ BuildRequires: pkgconfig automake autoconf libtool +Patch1: libdrm-modesetting.patch Patch2: libdrm-2.4.0-no-freaking-mknod.patch %description @@ -29,6 +30,7 @@ %prep %setup -q -n %{name}-%{gitdate} +%patch1 -p1 -b .modesetting #patch2 -p1 -b .mknod %build @@ -75,11 +77,15 @@ %{_includedir}/drm/xgi_drm.h # FIXME should be in drm/ too %{_includedir}/xf86drm.h +%{_includedir}/xf86drmMode.h %{_includedir}/xf86mm.h %{_libdir}/libdrm.so %{_libdir}/pkgconfig/libdrm.pc %changelog +* Wed Mar 05 2008 Dave Airlie 2.4.0-0.6 +- add initial modesetting headers to the mix - this API isn't stable + * Mon Mar 3 2008 Kristian H??gsberg - 2.4.0-0.5 - What he said. From fedora-extras-commits at redhat.com Wed Mar 5 00:54:40 2008 From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk)) Date: Wed, 5 Mar 2008 00:54:40 GMT Subject: rpms/linuxwacom/devel .cvsignore, 1.11, 1.12 linuxwacom-0.7.6.3-delibcwrap.patch, 1.1, 1.2 linuxwacom-0.7.8.3-sdk-me-harder.patch, 1.1, 1.2 linuxwacom-disable_stack_protector.patch, 1.1, 1.2 linuxwacom.spec, 1.51, 1.52 sources, 1.11, 1.12 Message-ID: <200803050054.m250sekj011811@cvs-int.fedora.redhat.com> Author: arozansk Update of /cvs/pkgs/rpms/linuxwacom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11721 Modified Files: .cvsignore linuxwacom-0.7.6.3-delibcwrap.patch linuxwacom-0.7.8.3-sdk-me-harder.patch linuxwacom-disable_stack_protector.patch linuxwacom.spec sources Log Message: * updating to 0.7.9-7 * build fixed * configuration tools enabled Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 2 Jan 2008 20:33:26 -0000 1.11 +++ .cvsignore 5 Mar 2008 00:53:44 -0000 1.12 @@ -1 +1 @@ -linuxwacom-0.7.9-4.tar.bz2 +linuxwacom-0.7.9-8.tar.bz2 linuxwacom-0.7.6.3-delibcwrap.patch: Index: linuxwacom-0.7.6.3-delibcwrap.patch =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom-0.7.6.3-delibcwrap.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linuxwacom-0.7.6.3-delibcwrap.patch 27 Nov 2006 22:50:40 -0000 1.1 +++ linuxwacom-0.7.6.3-delibcwrap.patch 5 Mar 2008 00:53:44 -0000 1.2 @@ -1,6 +1,10 @@ ---- linuxwacom-0.7.6-3/src/xdrv/xf86Wacom.h.delibcwrap 2006-11-21 19:20:15.000000000 -0500 -+++ linuxwacom-0.7.6-3/src/xdrv/xf86Wacom.h 2006-11-27 17:28:12.000000000 -0500 -@@ -57,17 +57,17 @@ +--- + src/xdrv/xf86Wacom.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- linuxwacom-0.7.9-7.orig/src/xdrv/xf86Wacom.h 2008-01-22 14:22:31.000000000 -0500 ++++ linuxwacom-0.7.9-7/src/xdrv/xf86Wacom.h 2008-02-14 10:39:19.000000000 -0500 +@@ -53,10 +53,11 @@ * XFree86 V4.x Headers ****************************************************************************/ @@ -14,10 +18,3 @@ #include #include - #define NEED_XF86_TYPES - #if !defined(DGUX) - #include --#include - #endif - #include - #include linuxwacom-0.7.8.3-sdk-me-harder.patch: Index: linuxwacom-0.7.8.3-sdk-me-harder.patch =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom-0.7.8.3-sdk-me-harder.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linuxwacom-0.7.8.3-sdk-me-harder.patch 14 Nov 2007 19:01:56 -0000 1.1 +++ linuxwacom-0.7.8.3-sdk-me-harder.patch 5 Mar 2008 00:53:44 -0000 1.2 @@ -1,23 +1,25 @@ -diff -up linuxwacom-0.7.8-3/src/xdrv/Makefile.am.jx linuxwacom-0.7.8-3/src/xdrv/Makefile.am ---- linuxwacom-0.7.8-3/src/xdrv/Makefile.am.jx 2007-08-14 19:12:39.000000000 -0400 -+++ linuxwacom-0.7.8-3/src/xdrv/Makefile.am 2007-11-14 13:24:42.000000000 -0500 -@@ -25,7 +25,7 @@ ARCHITECTURE =@WCM_ARCH@ - XSERVER64 =@WCM_XSERVER64@ +--- + configure.in | 3 +++ + src/xdrv/Makefile.am | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +--- linuxwacom-0.7.9-7.orig/src/xdrv/Makefile.am 2008-02-14 10:45:23.000000000 -0500 ++++ linuxwacom-0.7.9-7/src/xdrv/Makefile.am 2008-02-14 10:50:50.000000000 -0500 +@@ -15,7 +15,7 @@ EXTRA_DIST = xf86Wacom.c wcmXCommand.c x + ../include/Xwacom.h if WCM_ENV_XORGSDK --DRIVER_INCLUDES = -I$(XORGSDK_DIR) $(X_CFLAGS) -DWCM_XORG -+DRIVER_INCLUDES = -I$(XORGSDK_DIR) $(X_CFLAGS) -DWCM_XORG @XORG_CFLAGS@ +-DRIVER_INCLUDES = -I$(WCM_XORGSDK_DIR) $(X_CFLAGS) ++DRIVER_INCLUDES = -I$(WCM_XORGSDK_DIR) $(X_CFLAGS) @XORG_CFLAGS@ endif - if WCM_ENV_XF86 -diff -up linuxwacom-0.7.8-3/configure.in.jx linuxwacom-0.7.8-3/configure.in ---- linuxwacom-0.7.8-3/configure.in.jx 2007-08-14 19:12:39.000000000 -0400 -+++ linuxwacom-0.7.8-3/configure.in 2007-11-14 13:23:49.000000000 -0500 -@@ -40,6 +40,10 @@ fi - dnl Check for X source or X SDK - AC_WCM_CHECK_XSOURCE - AC_WCM_CHECK_XORG_SDK -+ + if WCM_ENV_XFREE86 +--- linuxwacom-0.7.9-7.orig/configure.in 2008-01-22 14:22:31.000000000 -0500 ++++ linuxwacom-0.7.9-7/configure.in 2008-02-14 10:55:26.000000000 -0500 +@@ -445,6 +445,9 @@ if test "$WCM_ENV_XFREE86" != yes; then + fi + AM_CONDITIONAL(WCM_ENV_XORGSDK, [test "$WCM_ENV_XORGSDK" = yes]) + +PKG_CHECK_MODULES(XORG, [xorg-server]) +AC_SUBST([XORG_CFLAGS]) + linuxwacom-disable_stack_protector.patch: Index: linuxwacom-disable_stack_protector.patch =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom-disable_stack_protector.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linuxwacom-disable_stack_protector.patch 21 Aug 2007 15:37:18 -0000 1.1 +++ linuxwacom-disable_stack_protector.patch 5 Mar 2008 00:53:44 -0000 1.2 @@ -1,12 +1,15 @@ -Index: linuxwacom-0.7.8-3/src/xdrv/Makefile.in -=================================================================== ---- linuxwacom-0.7.8-3.orig/src/xdrv/Makefile.in -+++ linuxwacom-0.7.8-3/src/xdrv/Makefile.in -@@ -447,6 +447,7 @@ wcmFilter.o: wcmFilter.c wcmFilter.h +--- + src/xdrv/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linuxwacom-0.7.9-7.orig/src/xdrv/Makefile.am 2008-01-22 14:22:31.000000000 -0500 ++++ linuxwacom-0.7.9-7/src/xdrv/Makefile.am 2008-02-14 10:45:23.000000000 -0500 +@@ -32,7 +32,7 @@ DRIVER_INCLUDES = \ + endif - $(XF86OBJS): xf86Wacom.h ../include/Xwacom.h Makefile - $(CC) $(CFLAGS) $(DEPFLAGS) $(DLLOADER) -pipe -ansi \ -+ -fno-stack-protector \ - -pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \ - -I$(srcdir) $(DRIVER_INCLUDES) -Dlinux \ - -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \ + NO_MERGE_CONSTANTS=@WCM_NO_MERGE_CONSTANTS@ +-NO_STACK_PROTECTOR=@WCM_NO_STACK_PROTECTOR@ ++NO_STACK_PROTECTOR=-fno-stack-protector + WCM_CLEVEL=@WCM_CLEVEL@ + + if WCM_DLLOADER Index: linuxwacom.spec =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- linuxwacom.spec 18 Feb 2008 19:28:16 -0000 1.51 +++ linuxwacom.spec 5 Mar 2008 00:53:44 -0000 1.52 @@ -1,10 +1,9 @@ -%define _x11sdkdir %(pkg-config --variable=sdkdir xorg-server) -%define tarname %{name}-0.7.9-4 +%define tarname %{name}-0.7.9-8 # Upstream's versioning is goofy. Note the mapping from tarname to version. Name: linuxwacom -Version: 0.7.9.4 -Release: 2%{?dist} +Version: 0.7.9.8 +Release: 1%{?dist} Summary: Wacom Drivers from Linux Wacom Project Group: User Interface/X Hardware Support @@ -15,12 +14,13 @@ Patch1: linuxwacom-0.7.6.3-delibcwrap.patch Patch2: linuxwacom-disable_stack_protector.patch Patch3: linuxwacom-0.7.8.3-sdk-me-harder.patch +Patch4: linuxwacom-0.7.9.7-fix_build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRequires: libX11-devel libXi-devel ncurses-devel BuildRequires: xorg-x11-server-sdk >= 1.4.99.1 -BuildRequires: autoconf automake libtool -Requires: xorg-x11-server-Xorg >= 1.4.99.1, udev >= 030-21 +BuildRequires: autoconf automake libtool tk-devel tcl-devel xorg-x11-server-Xorg +Requires: xorg-x11-server-Xorg >= 1.4.99.1, udev >= 030-21 tk tcl ExclusiveArch: %{ix86} x86_64 alpha ia64 ppc ppc64 sparc sparc64 %description @@ -44,6 +44,7 @@ #patch1 -p1 -b .delibcwrap %patch2 -p1 %patch3 -p1 -b .sdk +%patch4 -p1 %build @@ -56,10 +57,7 @@ fi export RPM_LIBDIR=%{_lib} -%configure --without-gtk --without-tcl --without-tk \ - --disable-wacomxi --disable-libwacomxi \ - --with-xorg-sdk=/usr --with-xlib=%{_libdir} \ - --enable-dlloader $XSERVER64 +%configure --without-gtk --enable-dlloader $XSERVER64 export CFLAGS="$RPM_OPT_FLAGS" make @@ -91,7 +89,10 @@ %{_bindir}/wacdump %{_bindir}/xidump %{_bindir}/xsetwacom +%{_bindir}/wacomcpl +%{_bindir}/wacomcpl-exec %{_libdir}/libwacomcfg*so.* +%{_libdir}/TkXInput/* %{_mandir}/man4/wacom.4* %{_sysconfdir}/udev/rules.d/60-wacom.rules @@ -103,6 +104,14 @@ %{_libdir}/libwacomcfg*.so %changelog +* Fri Feb 22 2008 Aristeu Rozanski - 0.7.9.8-1 +- Fixed build +- New upstream version +- Enabled configuration tools +- the xorg-server is on the list of buildrequires otherwise the dumb configure + scripts will think there's no support for X modules and will build a .o + instead of .so. I need to fix this in the future. + * Mon Feb 18 2008 Fedora Release Engineering - 0.7.9.4-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 2 Jan 2008 20:33:26 -0000 1.11 +++ sources 5 Mar 2008 00:53:44 -0000 1.12 @@ -1 +1 @@ -3fd0c86652f85653a61b88c6c582f026 linuxwacom-0.7.9-4.tar.bz2 +8cb221a7ac21d92fa4ddcc3a709ce22c linuxwacom-0.7.9-8.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 00:55:51 2008 From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk)) Date: Wed, 5 Mar 2008 00:55:51 GMT Subject: rpms/linuxwacom/devel linuxwacom-0.7.9.7-fix_build.patch,NONE,1.1 Message-ID: <200803050055.m250tpdf011850@cvs-int.fedora.redhat.com> Author: arozansk Update of /cvs/pkgs/rpms/linuxwacom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11838 Added Files: linuxwacom-0.7.9.7-fix_build.patch Log Message: * adding build fix patch linuxwacom-0.7.9.7-fix_build.patch: --- NEW FILE linuxwacom-0.7.9.7-fix_build.patch --- --- src/xdrv/xf86Wacom.h | 1 + 1 file changed, 1 insertion(+) --- linuxwacom-0.7.9-7.orig/src/xdrv/xf86Wacom.h 2008-01-22 14:22:31.000000000 -0500 +++ linuxwacom-0.7.9-7/src/xdrv/xf86Wacom.h 2008-02-22 15:24:43.000000000 -0500 @@ -59,6 +59,7 @@ #endif #include +#define inline __inline__ #include #define NEED_XF86_TYPES #if !defined(DGUX) From fedora-extras-commits at redhat.com Wed Mar 5 01:09:26 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Wed, 5 Mar 2008 01:09:26 GMT Subject: rpms/kernel/devel linux-2.6-wireless-pending-too.patch, 1.3, 1.4 kernel.spec, 1.473, 1.474 linux-2.6-wireless-pending.patch, 1.32, 1.33 linux-2.6-wireless.patch, 1.25, 1.26 Message-ID: <200803050109.m2519QZL019215@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19168 Modified Files: kernel.spec linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Added Files: linux-2.6-wireless-pending-too.patch Log Message: today's round of wireless fixes, plus a couple extra to correct memory corruption from yesterday's round linux-2.6-wireless-pending-too.patch: Index: linux-2.6-wireless-pending-too.patch =================================================================== RCS file: linux-2.6-wireless-pending-too.patch diff -N linux-2.6-wireless-pending-too.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-wireless-pending-too.patch 5 Mar 2008 01:09:02 -0000 1.4 @@ -0,0 +1,68 @@ +This is an a backport of two fixes which are based on top of the open11s +patches which are not yet in Rawhide. They will disappear when those +later patches get merged to net-2.6.26 (probably in a few days). + + mac80211: always insert key into list + mac80211: fix hardware scan completion + +diff -up linux-2.6.24.noarch/net/mac80211/key.c.orig linux-2.6.24.noarch/net/mac80211/key.c +--- linux-2.6.24.noarch/net/mac80211/key.c.orig 2008-03-04 19:40:41.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/key.c 2008-03-04 19:43:13.000000000 -0500 +@@ -174,6 +174,9 @@ static void __ieee80211_key_replace(stru + { + int idx, defkey; + ++ if (new) ++ list_add(&new->list, &sdata->key_list); ++ + if (sta) { + rcu_assign_pointer(sta->key, new); + } else { +@@ -190,9 +193,6 @@ static void __ieee80211_key_replace(stru + ieee80211_set_default_key(sdata, -1); + + rcu_assign_pointer(sdata->keys[idx], new); +- if (new) +- list_add(&new->list, &sdata->key_list); +- + if (defkey && new) + ieee80211_set_default_key(sdata, new->conf.keyidx); + } +diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c +--- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-03-04 19:40:41.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-03-04 19:48:19.000000000 -0500 +@@ -3401,22 +3401,27 @@ void ieee80211_scan_completed(struct iee + + rcu_read_lock(); + list_for_each_entry_rcu(sdata, &local->interfaces, list) { +- + /* No need to wake the master device. */ + if (sdata->dev == local->mdev) + continue; + +- if (sdata->vif.type == IEEE80211_IF_TYPE_STA) { +- if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) +- ieee80211_send_nullfunc(local, sdata, 0); +- ieee80211_sta_timer((unsigned long)sdata); +- } ++ /* Tell AP we're back */ ++ if (sdata->vif.type == IEEE80211_IF_TYPE_STA && ++ sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) ++ ieee80211_send_nullfunc(local, sdata, 0); + + netif_wake_queue(sdata->dev); + } +- rcu_read_unlock(); + + done: ++ /* Restart STA timer for both SW and HW scan cases */ ++ list_for_each_entry_rcu(sdata, &local->interfaces, list) { ++ if (sdata->vif.type == IEEE80211_IF_TYPE_STA) ++ ieee80211_sta_timer((unsigned long)sdata); ++ } ++ ++ rcu_read_unlock(); ++ + sdata = IEEE80211_DEV_TO_SUB_IF(dev); + if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { + struct ieee80211_if_sta *ifsta = &sdata->u.sta; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.473 retrieving revision 1.474 diff -u -r1.473 -r1.474 --- kernel.spec 4 Mar 2008 15:19:02 -0000 1.473 +++ kernel.spec 5 Mar 2008 01:09:02 -0000 1.474 @@ -609,6 +609,7 @@ Patch680: linux-2.6-wireless.patch Patch681: linux-2.6-wireless-pending.patch +Patch682: linux-2.6-wireless-pending-too.patch Patch690: linux-2.6-at76.patch Patch820: linux-2.6-compile-fixes.patch @@ -1106,9 +1107,11 @@ ApplyPatch linux-2.6-ata-quirk.patch # wireless patches headed for 2.6.25 -#ApplyPatch linux-2.6-wireless.patch +ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.26 ApplyPatch linux-2.6-wireless-pending.patch +# temporary backport of some later wireless patches +ApplyPatch linux-2.6-wireless-pending-too.patch # Add misc wireless bits from upstream wireless tree ApplyPatch linux-2.6-at76.patch @@ -1748,6 +1751,18 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Tue Mar 04 2008 John W. Linville +- libertas: fix sanity check on sequence number in command response +- p54: fix EEPROM structure endianness +- p54: fix eeprom parser length sanity checks +- rndis_wlan: fix broken data copy +- b43legacy: Fix module init message +- libertas: compare the current command with response +- rc80211-pid: fix rate adjustment +- ssb: Add pcibios_enable_device() return value check +- mac80211: always insert key into list (temporary backport) +- mac80211: fix hardware scan completion (temporary backport) + * Tue Mar 04 2008 Kyle McMartin - Linux 2.6.25-rc3-git5 linux-2.6-wireless-pending.patch: Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- linux-2.6-wireless-pending.patch 3 Mar 2008 22:02:24 -0000 1.32 +++ linux-2.6-wireless-pending.patch 5 Mar 2008 01:09:02 -0000 1.33 @@ -2315,8 +2315,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.24.noarch/include/linux/nl80211.h.orig linux-2.6.24.noarch/include/linux/nl80211.h ---- linux-2.6.24.noarch/include/linux/nl80211.h.orig 2008-03-03 16:42:49.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/nl80211.h 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/nl80211.h.orig 2008-03-04 19:28:34.000000000 -0500 ++++ linux-2.6.24.noarch/include/linux/nl80211.h 2008-03-04 19:35:31.000000000 -0500 @@ -161,6 +161,12 @@ enum nl80211_commands { * given for %NL80211_CMD_GET_STATION, nested attribute containing * info as possible, see &enum nl80211_sta_stats. @@ -2436,8 +2436,8 @@ + #endif /* __LINUX_NL80211_H */ diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig 2008-03-03 16:42:49.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig 2008-03-04 19:28:34.000000000 -0500 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-03-04 19:35:31.000000000 -0500 @@ -390,6 +390,10 @@ extern void ssb_chipco_set_clockmode(str extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks); @@ -2450,8 +2450,8 @@ u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask); u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value); diff -up linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig 2008-03-03 16:42:49.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb.h 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig 2008-03-04 19:28:34.000000000 -0500 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb.h 2008-03-04 19:35:31.000000000 -0500 @@ -72,8 +72,10 @@ struct ssb_device; /* Lowlevel read/write operations on the device MMIO. * Internal, don't use that outside of ssb. */ @@ -2487,7 +2487,7 @@ dev->ops->write16(dev, offset, value); diff -up linux-2.6.24.noarch/include/net/wireless.h.orig linux-2.6.24.noarch/include/net/wireless.h --- linux-2.6.24.noarch/include/net/wireless.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/net/wireless.h 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/include/net/wireless.h 2008-03-04 19:35:31.000000000 -0500 @@ -13,6 +13,162 @@ #include @@ -2676,8 +2676,8 @@ + #endif /* __NET_WIRELESS_H */ diff -up linux-2.6.24.noarch/include/net/cfg80211.h.orig linux-2.6.24.noarch/include/net/cfg80211.h ---- linux-2.6.24.noarch/include/net/cfg80211.h.orig 2008-03-03 16:42:49.000000000 -0500 -+++ linux-2.6.24.noarch/include/net/cfg80211.h 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/include/net/cfg80211.h.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/include/net/cfg80211.h 2008-03-04 19:35:31.000000000 -0500 @@ -163,6 +163,26 @@ struct station_stats { u32 tx_bytes; }; @@ -2719,8 +2719,8 @@ int (*add_key)(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, u8 *mac_addr, diff -up linux-2.6.24.noarch/include/net/mac80211.h.orig linux-2.6.24.noarch/include/net/mac80211.h ---- linux-2.6.24.noarch/include/net/mac80211.h.orig 2008-03-03 16:42:49.000000000 -0500 -+++ linux-2.6.24.noarch/include/net/mac80211.h 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/include/net/mac80211.h.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/include/net/mac80211.h 2008-03-04 19:35:31.000000000 -0500 @@ -38,7 +38,11 @@ * called in hardware interrupt context. The low-level driver must not call any * other functions in hardware interrupt context. If there is a need for such @@ -3384,7 +3384,7 @@ #endif /* MAC80211_H */ diff -up linux-2.6.24.noarch/net/mac80211/wme.h.orig linux-2.6.24.noarch/net/mac80211/wme.h --- linux-2.6.24.noarch/net/mac80211/wme.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wme.h 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wme.h 2008-03-04 19:35:31.000000000 -0500 @@ -24,6 +24,8 @@ #define QOS_CONTROL_TAG1D_MASK 0x07 @@ -3431,7 +3431,7 @@ return 0; diff -up linux-2.6.24.noarch/net/mac80211/wep.h.orig linux-2.6.24.noarch/net/mac80211/wep.h --- linux-2.6.24.noarch/net/mac80211/wep.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wep.h 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wep.h 2008-03-04 19:35:31.000000000 -0500 @@ -28,9 +28,9 @@ int ieee80211_wep_decrypt(struct ieee802 struct ieee80211_key *key); u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key); @@ -3445,8 +3445,8 @@ #endif /* WEP_H */ diff -up linux-2.6.24.noarch/net/mac80211/rx.c.orig linux-2.6.24.noarch/net/mac80211/rx.c ---- linux-2.6.24.noarch/net/mac80211/rx.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/rx.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/rx.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/rx.c 2008-03-04 19:35:31.000000000 -0500 @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ @@ -4615,8 +4615,8 @@ rcu_read_unlock(); } diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c 2008-03-04 19:35:31.000000000 -0500 @@ -118,6 +118,8 @@ void ieee80211_if_set_type(struct net_de sdata->bss = NULL; sdata->vif.type = type; @@ -4656,8 +4656,8 @@ while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) { local->total_ps_buffered--; diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c 2008-03-04 19:35:31.000000000 -0500 @@ -33,8 +33,8 @@ static int ieee80211_set_encryption(stru size_t key_len) { @@ -5022,7 +5022,7 @@ if (local->hw.conf.power_level != new_power_level) { diff -up linux-2.6.24.noarch/net/mac80211/debugfs_sta.c.orig linux-2.6.24.noarch/net/mac80211/debugfs_sta.c --- linux-2.6.24.noarch/net/mac80211/debugfs_sta.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/debugfs_sta.c 2008-03-03 16:47:32.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/debugfs_sta.c 2008-03-04 19:35:31.000000000 -0500 @@ -33,25 +33,16 @@ static ssize_t sta_ ##name## _read(struc #define STA_READ_LU(name, field) STA_READ(name, 20, field, "%lu\n") #define STA_READ_S(name, field) STA_READ(name, 20, field, "%s\n") @@ -5272,8 +5272,8 @@ debugfs_remove(sta->debugfs.dir); sta->debugfs.dir = NULL; diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c 2008-03-04 19:35:31.000000000 -0500 @@ -163,7 +163,8 @@ static void rate_control_release(struct } @@ -5309,8 +5309,8 @@ } } diff -up linux-2.6.24.noarch/net/mac80211/Makefile.orig linux-2.6.24.noarch/net/mac80211/Makefile ---- linux-2.6.24.noarch/net/mac80211/Makefile.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/Makefile 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/Makefile.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/Makefile 2008-03-04 19:35:31.000000000 -0500 @@ -19,7 +19,6 @@ mac80211-y := \ ieee80211_iface.o \ ieee80211_rate.o \ @@ -5321,7 +5321,7 @@ cfg.o \ diff -up linux-2.6.24.noarch/net/mac80211/regdomain.c.orig linux-2.6.24.noarch/net/mac80211/regdomain.c --- linux-2.6.24.noarch/net/mac80211/regdomain.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/regdomain.c 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/regdomain.c 2008-03-04 19:35:31.000000000 -0500 @@ -1,152 +0,0 @@ -/* - * Copyright 2002-2005, Instant802 Networks, Inc. @@ -5476,134 +5476,72 @@ -} - diff -up linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c ---- linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c 2008-03-03 16:47:32.000000000 -0500 -@@ -2,7 +2,7 @@ - * Copyright 2002-2005, Instant802 Networks, Inc. - * Copyright 2005, Devicescape Software, Inc. - * Copyright 2007, Mattias Nissler -- * Copyright 2007, Stefano Brivio -+ * Copyright 2007-2008, Stefano Brivio - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as -@@ -64,71 +64,66 @@ +--- linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-03-04 19:32:48.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c 2008-03-04 19:37:37.000000000 -0500 +@@ -63,6 +63,7 @@ + * RC_PID_ARITH_SHIFT. */ - --/* Shift the adjustment so that we won't switch to a lower rate if it exhibited -- * a worse failed frames behaviour and we'll choose the highest rate whose -- * failed frames behaviour is not worse than the one of the original rate -- * target. While at it, check that the adjustment is within the ranges. Then, -- * provide the new rate index. */ --static int rate_control_pid_shift_adjust(struct rc_pid_rateinfo *r, -- int adj, int cur, int l) --{ -- int i, j, k, tmp; -- -- j = r[cur].rev_index; -- i = j + adj; -- -- if (i < 0) -- return r[0].index; -- if (i >= l - 1) -- return r[l - 1].index; -- -- tmp = i; -- -- if (adj < 0) { -- for (k = j; k >= i; k--) -- if (r[k].diff <= r[j].diff) -- tmp = k; -- } else { -- for (k = i + 1; k + i < l; k++) -- if (r[k].diff <= r[i].diff) -- tmp = k; -- } -- -- return r[tmp].index; --} -- -+/* Adjust the rate while ensuring that we won't switch to a lower rate if it -+ * exhibited a worse failed frames behaviour and we'll choose the highest rate -+ * whose failed frames behaviour is not worse than the one of the original rate -+ * target. While at it, check that the new rate is valid. */ - static void rate_control_pid_adjust_rate(struct ieee80211_local *local, - struct sta_info *sta, int adj, ++ + /* Adjust the rate while ensuring that we won't switch to a lower rate if it + * exhibited a worse failed frames behaviour and we'll choose the highest rate + * whose failed frames behaviour is not worse than the one of the original rate +@@ -72,14 +73,14 @@ static void rate_control_pid_adjust_rate struct rc_pid_rateinfo *rinfo) { struct ieee80211_sub_if_data *sdata; - struct ieee80211_hw_mode *mode; -- int newidx; -- int maxrate; -- int back = (adj > 0) ? 1 : -1; +- int cur_sorted, new_sorted, probe, tmp, n_bitrates; +- int cur = sta->txrate; + struct ieee80211_supported_band *sband; + int cur_sorted, new_sorted, probe, tmp, n_bitrates, band; + int cur = sta->txrate_idx; sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); +- +- mode = local->oper_hw_mode; +- n_bitrates = mode->num_rates; + sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; + band = sband->band; + n_bitrates = sband->n_bitrates; -+ -+ /* Map passed arguments to sorted values. */ -+ cur_sorted = rinfo[cur].rev_index; -+ new_sorted = cur_sorted + adj; -+ -+ /* Check limits. */ -+ if (new_sorted < 0) -+ new_sorted = rinfo[0].rev_index; -+ else if (new_sorted >= n_bitrates) -+ new_sorted = rinfo[n_bitrates - 1].rev_index; - -- mode = local->oper_hw_mode; -- maxrate = sdata->bss ? sdata->bss->max_ratectrl_rateidx : -1; -+ tmp = new_sorted; -- newidx = rate_control_pid_shift_adjust(rinfo, adj, sta->txrate, -- mode->num_rates); -+ if (adj < 0) { -+ /* Ensure that the rate decrease isn't disadvantageous. */ -+ for (probe = cur_sorted; probe >= new_sorted; probe--) -+ if (rinfo[probe].diff <= rinfo[cur_sorted].diff && + /* Map passed arguments to sorted values. */ + cur_sorted = rinfo[cur].rev_index; +@@ -97,20 +98,20 @@ static void rate_control_pid_adjust_rate + /* Ensure that the rate decrease isn't disadvantageous. */ + for (probe = cur_sorted; probe >= new_sorted; probe--) + if (rinfo[probe].diff <= rinfo[cur_sorted].diff && +- rate_supported(sta, mode, rinfo[probe].index)) + rate_supported(sta, band, rinfo[probe].index)) -+ tmp = probe; -+ } else { -+ /* Look for rate increase with zero (or below) cost. */ -+ for (probe = new_sorted + 1; probe < n_bitrates; probe++) -+ if (rinfo[probe].diff <= rinfo[new_sorted].diff && + tmp = probe; + } else { + /* Look for rate increase with zero (or below) cost. */ + for (probe = new_sorted + 1; probe < n_bitrates; probe++) + if (rinfo[probe].diff <= rinfo[new_sorted].diff && +- rate_supported(sta, mode, rinfo[probe].index)) + rate_supported(sta, band, rinfo[probe].index)) -+ tmp = probe; -+ } + tmp = probe; + } -- while (newidx != sta->txrate) { -- if (rate_supported(sta, mode, newidx) && -- (maxrate < 0 || newidx <= maxrate)) { -- sta->txrate = newidx; -+ /* Fit the rate found to the nearest supported rate. */ -+ do { + /* Fit the rate found to the nearest supported rate. */ + do { +- if (rate_supported(sta, mode, rinfo[tmp].index)) { +- sta->txrate = rinfo[tmp].index; + if (rate_supported(sta, band, rinfo[tmp].index)) { + sta->txrate_idx = rinfo[tmp].index; break; } -- -- newidx += back; -- } -+ if (adj < 0) -+ tmp--; -+ else -+ tmp++; -+ } while (tmp < n_bitrates && tmp >= 0); - + if (adj < 0) +@@ -122,7 +123,7 @@ static void rate_control_pid_adjust_rate #ifdef CONFIG_MAC80211_DEBUGFS rate_control_pid_event_rate_change( &((struct rc_pid_sta_info *)sta->rate_ctrl_priv)->events, -- newidx, mode->rates[newidx].rate); +- cur, mode->rates[cur].rate); + sta->txrate_idx, sband->bitrates[sta->txrate_idx].bitrate); #endif } -@@ -155,7 +150,7 @@ static void rate_control_pid_sample(stru +@@ -149,7 +150,7 @@ static void rate_control_pid_sample(stru { struct rc_pid_sta_info *spinfo = sta->rate_ctrl_priv; struct rc_pid_rateinfo *rinfo = pinfo->rinfo; @@ -5612,7 +5550,7 @@ u32 pf; s32 err_avg; u32 err_prop; -@@ -164,7 +159,7 @@ static void rate_control_pid_sample(stru +@@ -158,7 +159,7 @@ static void rate_control_pid_sample(stru int adj, i, j, tmp; unsigned long period; @@ -5621,7 +5559,7 @@ spinfo = sta->rate_ctrl_priv; /* In case nothing happened during the previous control interval, turn -@@ -190,18 +185,18 @@ static void rate_control_pid_sample(stru +@@ -184,18 +185,18 @@ static void rate_control_pid_sample(stru spinfo->tx_num_failed = 0; /* If we just switched rate, update the rate behaviour info. */ @@ -5644,7 +5582,7 @@ /* Compute the proportional, integral and derivative errors. */ err_prop = (pinfo->target << RC_PID_ARITH_SHIFT) - pf; -@@ -242,8 +237,10 @@ static void rate_control_pid_tx_status(v +@@ -236,8 +237,10 @@ static void rate_control_pid_tx_status(v struct sta_info *sta; struct rc_pid_sta_info *spinfo; unsigned long period; @@ -5655,7 +5593,7 @@ if (!sta) return; -@@ -251,13 +248,13 @@ static void rate_control_pid_tx_status(v +@@ -245,13 +248,13 @@ static void rate_control_pid_tx_status(v /* Don't update the state if we're not controlling the rate. */ sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); if (sdata->bss && sdata->bss->force_unicast_rateidx > -1) { @@ -5671,7 +5609,7 @@ goto ignore; spinfo = sta->rate_ctrl_priv; -@@ -283,9 +280,6 @@ static void rate_control_pid_tx_status(v +@@ -277,9 +280,6 @@ static void rate_control_pid_tx_status(v sta->tx_num_consecutive_failures++; sta->tx_num_mpdu_fail++; } else { @@ -5681,7 +5619,7 @@ sta->tx_num_consecutive_failures = 0; sta->tx_num_mpdu_ok++; } -@@ -304,7 +298,7 @@ ignore: +@@ -298,7 +298,7 @@ ignore: } static void rate_control_pid_get_rate(void *priv, struct net_device *dev, @@ -5690,7 +5628,7 @@ struct sk_buff *skb, struct rate_selection *sel) { -@@ -322,7 +316,7 @@ static void rate_control_pid_get_rate(vo +@@ -316,7 +316,7 @@ static void rate_control_pid_get_rate(vo fc = le16_to_cpu(hdr->frame_control); if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA || is_multicast_ether_addr(hdr->addr1) || !sta) { @@ -5699,7 +5637,7 @@ if (sta) sta_info_put(sta); return; -@@ -331,23 +325,23 @@ static void rate_control_pid_get_rate(vo +@@ -325,23 +325,23 @@ static void rate_control_pid_get_rate(vo /* If a forced rate is in effect, select it. */ sdata = IEEE80211_DEV_TO_SUB_IF(dev); if (sdata->bss && sdata->bss->force_unicast_rateidx > -1) @@ -5730,7 +5668,7 @@ #endif } -@@ -359,28 +353,32 @@ static void rate_control_pid_rate_init(v +@@ -353,28 +353,32 @@ static void rate_control_pid_rate_init(v * as we need to have IEEE 802.1X auth succeed immediately after assoc.. * Until that method is implemented, we will use the lowest supported * rate as a workaround. */ @@ -5768,7 +5706,7 @@ if (!rinfo) { kfree(pinfo); return NULL; -@@ -389,7 +387,7 @@ static void *rate_control_pid_alloc(stru +@@ -383,7 +387,7 @@ static void *rate_control_pid_alloc(stru /* Sort the rates. This is optimized for the most common case (i.e. * almost-sorted CCK+OFDM rates). Kind of bubble-sort with reversed * mapping too. */ @@ -5777,7 +5715,7 @@ rinfo[i].index = i; rinfo[i].rev_index = i; if (pinfo->fast_start) -@@ -397,11 +395,11 @@ static void *rate_control_pid_alloc(stru +@@ -391,11 +395,11 @@ static void *rate_control_pid_alloc(stru else rinfo[i].diff = i * pinfo->norm_offset; } @@ -5795,7 +5733,7 @@ rinfo[j + 1].index = tmp; diff -up linux-2.6.24.noarch/net/mac80211/debugfs.c.orig linux-2.6.24.noarch/net/mac80211/debugfs.c --- linux-2.6.24.noarch/net/mac80211/debugfs.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/debugfs.c 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/debugfs.c 2008-03-04 19:35:35.000000000 -0500 @@ -19,41 +19,6 @@ int mac80211_open_file_generic(struct in return 0; } @@ -5896,8 +5834,8 @@ DEBUGFS_STATS_DEL(transmitted_fragment_count); DEBUGFS_STATS_DEL(multicast_transmitted_frame_count); diff -up linux-2.6.24.noarch/net/mac80211/key.c.orig linux-2.6.24.noarch/net/mac80211/key.c ---- linux-2.6.24.noarch/net/mac80211/key.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/key.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/key.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/key.c 2008-03-04 19:35:35.000000000 -0500 @@ -13,6 +13,7 @@ #include #include @@ -6169,8 +6107,8 @@ ieee80211_key_disable_hw_accel(key); } diff -up linux-2.6.24.noarch/net/mac80211/ieee80211.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211.c 2008-03-04 19:35:35.000000000 -0500 @@ -67,9 +67,19 @@ static void ieee80211_configure_filter(s new_flags |= FIF_ALLMULTI; @@ -7245,8 +7183,8 @@ return 0; diff -up linux-2.6.24.noarch/net/mac80211/wme.c.orig linux-2.6.24.noarch/net/mac80211/wme.c ---- linux-2.6.24.noarch/net/mac80211/wme.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wme.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/wme.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wme.c 2008-03-04 19:35:35.000000000 -0500 @@ -19,10 +19,13 @@ #include "wme.h" @@ -7447,7 +7385,7 @@ +} diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_key.h.orig linux-2.6.24.noarch/net/mac80211/ieee80211_key.h --- linux-2.6.24.noarch/net/mac80211/ieee80211_key.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_key.h 2008-03-03 16:47:32.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_key.h 2008-03-04 19:35:35.000000000 -0500 @@ -13,6 +13,7 @@ #include #include @@ -7499,8 +7437,8 @@ void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx); void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata); diff -up linux-2.6.24.noarch/net/mac80211/rc80211_simple.c.orig linux-2.6.24.noarch/net/mac80211/rc80211_simple.c ---- linux-2.6.24.noarch/net/mac80211/rc80211_simple.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/rc80211_simple.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/rc80211_simple.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/rc80211_simple.c 2008-03-04 19:35:35.000000000 -0500 @@ -7,6 +7,7 @@ * published by the Free Software Foundation. */ @@ -7676,8 +7614,8 @@ diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h.orig linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h ---- linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h 2008-03-04 19:35:35.000000000 -0500 @@ -18,6 +18,7 @@ #include "ieee80211_i.h" #include "sta_info.h" @@ -7753,8 +7691,8 @@ diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_i.h.orig linux-2.6.24.noarch/net/mac80211/ieee80211_i.h ---- linux-2.6.24.noarch/net/mac80211/ieee80211_i.h.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_i.h 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_i.h.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_i.h 2008-03-04 19:35:35.000000000 -0500 @@ -79,8 +79,7 @@ struct ieee80211_sta_bss { u8 ssid[IEEE80211_MAX_SSID_LEN]; size_t ssid_len; @@ -8161,8 +8099,8 @@ void ieee80211_tx_pending(unsigned long data); int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev); diff -up linux-2.6.24.noarch/net/mac80211/cfg.c.orig linux-2.6.24.noarch/net/mac80211/cfg.c ---- linux-2.6.24.noarch/net/mac80211/cfg.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/cfg.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/cfg.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/cfg.c 2008-03-04 19:35:35.000000000 -0500 @@ -34,10 +34,13 @@ nl80211_type_to_mac80211_type(enum nl802 } @@ -8337,8 +8275,8 @@ sta->dev = sdata->dev; if (sdata->vif.type == IEEE80211_IF_TYPE_VLAN || diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-03-04 19:35:35.000000000 -0500 @@ -74,7 +74,7 @@ static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst, u8 *ssid, size_t ssid_len); @@ -9882,8 +9820,8 @@ rate_control_rate_init(sta, local); diff -up linux-2.6.24.noarch/net/mac80211/sta_info.h.orig linux-2.6.24.noarch/net/mac80211/sta_info.h ---- linux-2.6.24.noarch/net/mac80211/sta_info.h.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/sta_info.h 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/sta_info.h.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/sta_info.h 2008-03-04 19:35:35.000000000 -0500 @@ -15,31 +15,72 @@ #include #include "ieee80211_key.h" @@ -10078,8 +10016,8 @@ + #endif /* STA_INFO_H */ diff -up linux-2.6.24.noarch/net/mac80211/tx.c.orig linux-2.6.24.noarch/net/mac80211/tx.c ---- linux-2.6.24.noarch/net/mac80211/tx.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/tx.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/tx.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/tx.c 2008-03-04 19:35:35.000000000 -0500 @@ -92,9 +92,13 @@ static u16 ieee80211_duration(struct iee int rate, mrate, erp, dur, i; struct ieee80211_rate *txrate = tx->u.tx.rate; @@ -10948,8 +10886,8 @@ skb = NULL; } diff -up linux-2.6.24.noarch/net/mac80211/sta_info.c.orig linux-2.6.24.noarch/net/mac80211/sta_info.c ---- linux-2.6.24.noarch/net/mac80211/sta_info.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/sta_info.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/sta_info.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/sta_info.c 2008-03-04 19:35:35.000000000 -0500 @@ -55,48 +55,34 @@ static int sta_info_hash_del(struct ieee return -ENOENT; } @@ -11243,8 +11181,8 @@ * sta_info_flush - flush matching STA entries from the STA table * @local: local interface data diff -up linux-2.6.24.noarch/net/mac80211/wep.c.orig linux-2.6.24.noarch/net/mac80211/wep.c ---- linux-2.6.24.noarch/net/mac80211/wep.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wep.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/wep.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wep.c 2008-03-04 19:35:35.000000000 -0500 @@ -305,13 +305,13 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_ return NULL; } @@ -11312,7 +11250,7 @@ } diff -up linux-2.6.24.noarch/net/mac80211/wpa.h.orig linux-2.6.24.noarch/net/mac80211/wpa.h --- linux-2.6.24.noarch/net/mac80211/wpa.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wpa.h 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wpa.h 2008-03-04 19:35:35.000000000 -0500 @@ -13,19 +13,19 @@ #include #include "ieee80211_i.h" @@ -11340,8 +11278,8 @@ #endif /* WPA_H */ diff -up linux-2.6.24.noarch/net/mac80211/util.c.orig linux-2.6.24.noarch/net/mac80211/util.c ---- linux-2.6.24.noarch/net/mac80211/util.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/util.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/util.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/util.c 2008-03-04 19:35:35.000000000 -0500 @@ -41,92 +41,6 @@ const unsigned char bridge_tunnel_header { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; @@ -11544,8 +11482,8 @@ { struct ieee80211_local *local = hw_to_local(hw); diff -up linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c.orig linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c ---- linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c 2008-03-04 19:35:35.000000000 -0500 @@ -91,7 +91,6 @@ static const struct file_operations name /* common attributes */ IEEE80211_IF_FILE(channel_use, channel_use, DEC); @@ -11619,8 +11557,8 @@ static void del_monitor_files(struct ieee80211_sub_if_data *sdata) diff -up linux-2.6.24.noarch/net/mac80211/wpa.c.orig linux-2.6.24.noarch/net/mac80211/wpa.c ---- linux-2.6.24.noarch/net/mac80211/wpa.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wpa.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/wpa.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wpa.c 2008-03-04 19:35:35.000000000 -0500 @@ -70,7 +70,7 @@ static int ieee80211_get_hdr_info(const } @@ -11887,8 +11825,8 @@ + return RX_CONTINUE; } diff -up linux-2.6.24.noarch/net/wireless/nl80211.c.orig linux-2.6.24.noarch/net/wireless/nl80211.c ---- linux-2.6.24.noarch/net/wireless/nl80211.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/wireless/nl80211.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/wireless/nl80211.c.orig 2008-03-04 19:28:36.000000000 -0500 ++++ linux-2.6.24.noarch/net/wireless/nl80211.c 2008-03-04 19:35:35.000000000 -0500 @@ -82,6 +82,7 @@ static struct nla_policy nl80211_policy[ [NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY, .len = NL80211_MAX_SUPP_RATES }, @@ -12065,7 +12003,7 @@ unlock: diff -up linux-2.6.24.noarch/net/wireless/Makefile.orig linux-2.6.24.noarch/net/wireless/Makefile --- linux-2.6.24.noarch/net/wireless/Makefile.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/wireless/Makefile 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/wireless/Makefile 2008-03-04 19:35:35.000000000 -0500 @@ -1,5 +1,5 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o @@ -12074,8 +12012,8 @@ +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o cfg80211-$(CONFIG_NL80211) += nl80211.o diff -up /dev/null linux-2.6.24.noarch/net/wireless/reg.c ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/net/wireless/reg.c 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/net/wireless/reg.c 2008-03-04 19:35:35.000000000 -0500 @@ -0,0 +1,159 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -12238,7 +12176,7 @@ +} diff -up linux-2.6.24.noarch/net/wireless/core.h.orig linux-2.6.24.noarch/net/wireless/core.h --- linux-2.6.24.noarch/net/wireless/core.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/wireless/core.h 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/net/wireless/core.h 2008-03-04 19:35:35.000000000 -0500 @@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv, char *newname); @@ -12248,8 +12186,8 @@ + #endif /* __NET_WIRELESS_CORE_H */ diff -up linux-2.6.24.noarch/net/wireless/core.c.orig linux-2.6.24.noarch/net/wireless/core.c ---- linux-2.6.24.noarch/net/wireless/core.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/wireless/core.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/net/wireless/core.c.orig 2008-03-04 19:28:36.000000000 -0500 ++++ linux-2.6.24.noarch/net/wireless/core.c 2008-03-04 19:35:35.000000000 -0500 @@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy) { struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy); @@ -12299,8 +12237,8 @@ mutex_lock(&cfg80211_drv_mutex); diff -up /dev/null linux-2.6.24.noarch/net/wireless/util.c ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/net/wireless/util.c 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/net/wireless/util.c 2008-03-04 19:35:35.000000000 -0500 @@ -0,0 +1,98 @@ +/* + * Wireless utility functions @@ -12401,8 +12339,8 @@ + set_mandatory_flags_band(wiphy->bands[band], band); +} diff -up linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig linux-2.6.24.noarch/drivers/net/wireless/p54common.h ---- linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/p54common.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig 2008-03-04 19:32:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54common.h 2008-03-04 19:35:36.000000000 -0500 @@ -251,79 +251,4 @@ struct p54_tx_control_vdcf { __le16 frameburst; } __attribute__ ((packed)); @@ -12484,8 +12422,8 @@ - #endif /* PRISM54COMMON_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig linux-2.6.24.noarch/drivers/net/wireless/p54common.c ---- linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/p54common.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig 2008-03-04 19:32:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54common.c 2008-03-04 19:35:36.000000000 -0500 @@ -27,6 +27,46 @@ MODULE_DESCRIPTION("Softmac Prism54 comm MODULE_LICENSE("GPL"); MODULE_ALIAS("prism54common"); @@ -12533,9 +12471,9 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw) { struct p54_common *priv = dev->priv; -@@ -251,6 +291,10 @@ int p54_parse_eeprom(struct ieee80211_hw - case PDR_END: - i = len; +@@ -257,6 +297,10 @@ int p54_parse_eeprom(struct ieee80211_hw + /* make it overrun */ + entry_len = len; break; + default: + printk(KERN_INFO "p54: unknown eeprom code : 0x%x\n", @@ -12544,7 +12482,7 @@ } entry = (void *)entry + (entry_len + 1)*2; -@@ -308,10 +352,10 @@ static void p54_rx_data(struct ieee80211 +@@ -312,10 +356,10 @@ static void p54_rx_data(struct ieee80211 u16 freq = le16_to_cpu(hdr->freq); rx_status.ssi = hdr->rssi; @@ -12558,7 +12496,7 @@ rx_status.antenna = hdr->antenna; rx_status.mactime = le64_to_cpu(hdr->timestamp); rx_status.flag |= RX_FLAG_TSFT; -@@ -349,7 +393,7 @@ static void p54_rx_frame_sent(struct iee +@@ -353,7 +397,7 @@ static void p54_rx_frame_sent(struct iee while (entry != (struct sk_buff *)&priv->tx_queue) { range = (struct memrecord *)&entry->cb; if (range->start_addr == addr) { @@ -12567,7 +12505,7 @@ struct p54_control_hdr *entry_hdr; struct p54_tx_control_allocdata *entry_data; int pad = 0; -@@ -365,6 +409,7 @@ static void p54_rx_frame_sent(struct iee +@@ -369,6 +413,7 @@ static void p54_rx_frame_sent(struct iee kfree_skb(entry); break; } @@ -12575,7 +12513,7 @@ memcpy(&status.control, range->control, sizeof(status.control)); kfree(range->control); -@@ -547,7 +592,9 @@ static int p54_tx(struct ieee80211_hw *d +@@ -551,7 +596,9 @@ static int p54_tx(struct ieee80211_hw *d txhdr->padding2 = 0; /* TODO: add support for alternate retry TX rates */ @@ -12586,7 +12524,7 @@ if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) rate |= 0x40; else if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) -@@ -717,13 +764,12 @@ static int p54_set_leds(struct ieee80211 +@@ -721,13 +768,12 @@ static int p54_set_leds(struct ieee80211 return 0; } @@ -12602,7 +12540,7 @@ } while(0) static void p54_init_vdcf(struct ieee80211_hw *dev) -@@ -741,10 +787,10 @@ static void p54_init_vdcf(struct ieee802 +@@ -745,10 +791,10 @@ static void p54_init_vdcf(struct ieee802 vdcf = (struct p54_tx_control_vdcf *) hdr->data; @@ -12617,7 +12555,7 @@ } static void p54_set_vdcf(struct ieee80211_hw *dev) -@@ -849,7 +895,7 @@ static int p54_config(struct ieee80211_h +@@ -853,7 +899,7 @@ static int p54_config(struct ieee80211_h { int ret; @@ -12626,7 +12564,7 @@ p54_set_vdcf(dev); return ret; } -@@ -897,7 +943,7 @@ static int p54_conf_tx(struct ieee80211_ +@@ -901,7 +947,7 @@ static int p54_conf_tx(struct ieee80211_ if ((params) && !((queue < 0) || (queue > 4))) { P54_SET_QUEUE(vdcf->queue[queue], params->aifs, @@ -12635,7 +12573,7 @@ } else return -EINVAL; -@@ -944,7 +990,6 @@ struct ieee80211_hw *p54_init_common(siz +@@ -948,7 +994,6 @@ struct ieee80211_hw *p54_init_common(siz { struct ieee80211_hw *dev; struct p54_common *priv; @@ -12643,7 +12581,7 @@ dev = ieee80211_alloc_hw(priv_data_len, &p54_ops); if (!dev) -@@ -953,18 +998,7 @@ struct ieee80211_hw *p54_init_common(siz +@@ -957,18 +1002,7 @@ struct ieee80211_hw *p54_init_common(siz priv = dev->priv; priv->mode = IEEE80211_IF_TYPE_INVALID; skb_queue_head_init(&priv->tx_queue); @@ -12663,7 +12601,7 @@ dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | /* not sure */ IEEE80211_HW_RX_INCLUDES_FCS; dev->channel_change_time = 1000; /* TODO: find actual value */ -@@ -986,14 +1020,6 @@ struct ieee80211_hw *p54_init_common(siz +@@ -990,14 +1024,6 @@ struct ieee80211_hw *p54_init_common(siz p54_init_vdcf(dev); @@ -12679,8 +12617,8 @@ } EXPORT_SYMBOL_GPL(p54_init_common); diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c 2008-03-04 19:35:36.000000000 -0500 @@ -80,8 +80,9 @@ static void sa2400_rf_set_channel(struct struct ieee80211_conf *conf) { @@ -12695,7 +12633,7 @@ diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.h --- linux-2.6.24.noarch/drivers/net/wireless/adm8211.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.h 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.h 2008-03-04 19:35:36.000000000 -0500 @@ -534,61 +534,6 @@ struct adm8211_eeprom { u8 cis_data[0]; /* 0x80, 384 bytes */ } __attribute__ ((packed)); @@ -12783,8 +12721,8 @@ {1, 11}, /* FCC */ {1, 11}, /* IC */ diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/main.c ---- linux-2.6.24.noarch/drivers/net/wireless/b43/main.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/main.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43/main.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43/main.c 2008-03-04 19:35:36.000000000 -0500 @@ -96,25 +96,29 @@ MODULE_DEVICE_TABLE(ssb, b43_ssb_tbl); * data in there. This data is the same for all devices, so we don't * get concurrency issues */ @@ -13388,8 +13326,8 @@ goto err_powerdown; diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c ---- linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c 2008-03-04 19:35:36.000000000 -0500 @@ -32,46 +32,48 @@ #include "dma.h" @@ -13599,8 +13537,8 @@ default: B43_WARN_ON(1); diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/main.h.orig linux-2.6.24.noarch/drivers/net/wireless/b43/main.h ---- linux-2.6.24.noarch/drivers/net/wireless/b43/main.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/main.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43/main.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43/main.h 2008-03-04 19:35:36.000000000 -0500 @@ -95,8 +95,8 @@ u16 b43_shm_read16(struct b43_wldev *dev void b43_shm_write32(struct b43_wldev *dev, u16 routing, u16 offset, u32 value); void b43_shm_write16(struct b43_wldev *dev, u16 routing, u16 offset, u16 value); @@ -13614,7 +13552,7 @@ diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/sysfs.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/sysfs.c --- linux-2.6.24.noarch/drivers/net/wireless/b43/sysfs.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/sysfs.c 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43/sysfs.c 2008-03-04 19:35:36.000000000 -0500 @@ -47,29 +47,6 @@ static int get_integer(const char *buf, return ret; } @@ -13730,8 +13668,8 @@ device_remove_file(dev, &dev_attr_interference); } diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h ---- linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h 2008-03-04 19:35:36.000000000 -0500 @@ -144,7 +144,8 @@ enum { #define B43_SHM_SH_PHYTYPE 0x0052 /* PHY type */ #define B43_SHM_SH_ANTSWAP 0x005C /* Antenna swap threshold */ @@ -13844,7 +13782,7 @@ bool suspend_in_progress; /* TRUE, if we are in a suspend/resume cycle */ diff -up linux-2.6.24.noarch/drivers/net/wireless/strip.c.orig linux-2.6.24.noarch/drivers/net/wireless/strip.c --- linux-2.6.24.noarch/drivers/net/wireless/strip.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/strip.c 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/strip.c 2008-03-04 19:35:36.000000000 -0500 @@ -962,12 +962,12 @@ static char *time_delta(char buffer[], l /* get Nth element of the linked list */ static struct strip *strip_get_idx(loff_t pos) @@ -13862,8 +13800,8 @@ } return NULL; diff -up linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c ---- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c 2008-03-04 19:35:36.000000000 -0500 @@ -771,10 +771,10 @@ static int zd1211b_hw_init_hmac(struct z { static const struct zd_ioreq32 ioreqs[] = { @@ -13919,8 +13857,8 @@ goto out; /* Disabling interrupts is certainly a smart thing here. diff -up linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h ---- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h 2008-03-04 19:35:36.000000000 -0500 @@ -625,11 +625,10 @@ enum { #define CR_S_MD CTL_REG(0x0830) @@ -13938,8 +13876,8 @@ #define CR_ZD1211B_AIFS_CTL2 CTL_REG(0x0b14) #define CR_ZD1211B_TXOP CTL_REG(0x0b20) diff -up linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c.orig linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c ---- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c 2008-03-04 19:35:36.000000000 -0500 @@ -65,16 +65,14 @@ static const struct channel_range *zd_ch static void unmask_bg_channels(struct ieee80211_hw *hw, @@ -13970,8 +13908,8 @@ } diff -up linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h ---- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h 2008-03-04 19:35:36.000000000 -0500 @@ -185,7 +185,7 @@ struct zd_mac { struct sk_buff_head ack_wait_queue; struct ieee80211_channel channels[14]; @@ -13982,8 +13920,8 @@ /* Short preamble (used for RTS/CTS) */ unsigned int short_preamble:1; diff -up linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c ---- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c 2008-03-04 19:35:36.000000000 -0500 @@ -34,76 +34,61 @@ /* This table contains the hardware specific values for the modulation rates. */ @@ -14226,8 +14164,8 @@ housekeeping_init(mac); INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler); diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c ---- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-03-04 19:32:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c 2008-03-04 19:35:36.000000000 -0500 @@ -95,28 +95,29 @@ MODULE_DEVICE_TABLE(ssb, b43legacy_ssb_t * data in there. This data is the same for all devices, so we don't * get concurrency issues */ @@ -14868,8 +14806,8 @@ return 0; diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c ---- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c 2008-03-04 19:35:36.000000000 -0500 @@ -37,45 +37,48 @@ @@ -15045,8 +14983,8 @@ default: b43legacywarn(dev->wl, "Unexpected value for chanstat (0x%X)\n", diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h ---- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-03-04 19:35:36.000000000 -0500 @@ -130,13 +130,19 @@ #define B43legacy_SHM_SH_HOSTFHI 0x0060 /* Hostflags ucode opts (high) */ /* SHM_SHARED crypto engine */ @@ -15155,8 +15093,8 @@ struct b43legacy_firmware fw; diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c 2008-03-04 19:35:36.000000000 -0500 @@ -261,8 +261,8 @@ static void rtl8225_rf_set_tx_power(stru u32 reg; int i; @@ -15199,7 +15137,7 @@ if (conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME) { diff -up linux-2.6.24.noarch/drivers/net/wireless/p54.h.orig linux-2.6.24.noarch/drivers/net/wireless/p54.h --- linux-2.6.24.noarch/drivers/net/wireless/p54.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/p54.h 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54.h 2008-03-04 19:35:36.000000000 -0500 @@ -64,10 +64,6 @@ struct p54_common { unsigned int tx_hdr_len; void *cached_vdcf; @@ -15212,8 +15150,8 @@ }; diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c 2008-03-04 19:35:36.000000000 -0500 @@ -45,6 +45,38 @@ static struct usb_device_id rtl8187_tabl MODULE_DEVICE_TABLE(usb, rtl8187_table); @@ -15367,8 +15305,8 @@ eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_BASE, diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h.orig linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h ---- linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h 2008-03-04 19:35:36.000000000 -0500 @@ -175,74 +175,4 @@ struct rtl818x_rf_ops { void (*set_chan)(struct ieee80211_hw *, struct ieee80211_conf *); }; @@ -15445,8 +15383,8 @@ - #endif /* RTL818X_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/atmel.c.orig linux-2.6.24.noarch/drivers/net/wireless/atmel.c ---- linux-2.6.24.noarch/drivers/net/wireless/atmel.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/atmel.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/atmel.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/atmel.c 2008-03-04 19:35:36.000000000 -0500 @@ -66,6 +66,7 @@ #include #include @@ -15474,8 +15412,8 @@ priv->last_survey = jiffies; diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c 2008-03-04 19:35:36.000000000 -0500 @@ -73,8 +73,9 @@ static void grf5101_rf_set_channel(struc struct ieee80211_conf *conf) { @@ -15489,8 +15427,8 @@ /* set TX power */ write_grf5101(dev, 0x15, 0x0); diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h 2008-03-04 19:35:36.000000000 -0500 @@ -143,9 +143,12 @@ struct lbs_private { wait_queue_head_t waitq; struct workqueue_struct *work_thread; @@ -15513,8 +15451,8 @@ }; diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h 2008-03-04 19:35:36.000000000 -0500 @@ -7,6 +7,5 @@ void lbs_association_worker(struct work_struct *work); @@ -15523,8 +15461,8 @@ #endif /* _LBS_ASSOC_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c 2008-03-04 19:35:36.000000000 -0500 @@ -985,6 +985,18 @@ out: lbs_deb_leave(LBS_DEB_CMD); } @@ -15554,8 +15492,8 @@ sprintf(priv->mesh_ssid, "mesh"); priv->mesh_ssid_len = 4; diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c 2008-03-04 19:35:36.000000000 -0500 @@ -315,7 +315,7 @@ static ssize_t lbs_setuserscan(struct fi lbs_scan_networks(priv, scan_cfg, 1); @@ -15566,8 +15504,8 @@ if (priv->surpriseremoved) goto out_scan_cfg; diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c 2008-03-04 19:35:36.000000000 -0500 @@ -1153,9 +1153,9 @@ static void lbs_submit_command(struct lb command == CMD_802_11_AUTHENTICATE) timeo = 10 * HZ; @@ -15630,8 +15568,8 @@ } EXPORT_SYMBOL_GPL(lbs_cmd_copyback); diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h 2008-03-04 19:35:36.000000000 -0500 @@ -48,6 +48,4 @@ int lbs_send_deauthentication(struct lbs int lbs_associate(struct lbs_private *priv, struct assoc_request *assoc_req); @@ -15640,8 +15578,8 @@ - #endif diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c 2008-03-04 19:35:36.000000000 -0500 @@ -99,23 +99,6 @@ static void lbs_set_basic_rate_flags(u8 } @@ -15677,8 +15615,8 @@ priv->NF[TYPE_RXPD][TYPE_AVG] = 0; diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c 2008-03-04 19:35:36.000000000 -0500 @@ -73,6 +73,23 @@ static const u8 bcastmac[ETH_ALEN] = { 0 /* */ /*********************************************************************/ @@ -15764,8 +15702,8 @@ /* Update RSSI if current BSS is a locally created ad-hoc BSS */ diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-04 19:32:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-04 19:35:36.000000000 -0500 @@ -74,7 +74,7 @@ void lbs_mac_event_disconnected(struct l lbs_deb_cmd("disconnected, so exit PS mode\n"); lbs_ps_wakeup(priv, 0); @@ -15775,7 +15713,7 @@ } /** -@@ -568,9 +568,9 @@ int lbs_process_rx_command(struct lbs_pr +@@ -566,9 +566,9 @@ int lbs_process_rx_command(struct lbs_pr respcmd = le16_to_cpu(resp->command); result = le16_to_cpu(resp->result); @@ -15785,11 +15723,11 @@ - lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len); + lbs_deb_hex(LBS_DEB_CMD, "CMD_RESP", (void *) resp, priv->upld_len); - if (resp->seqnum != resp->seqnum) { + if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) { lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n", diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c 2008-03-04 19:35:36.000000000 -0500 @@ -181,17 +181,6 @@ int lbs_update_channel(struct lbs_privat return ret; } @@ -15842,8 +15780,8 @@ lbs_prepare_and_send_command(priv, CMD_802_11_RSSI, diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h 2008-03-04 19:35:36.000000000 -0500 @@ -71,7 +71,7 @@ struct rtl8187_priv { /* rtl8187 specific */ struct ieee80211_channel channels[14]; @@ -15854,8 +15792,8 @@ u32 rx_conf; u16 txpwr_base; diff -up linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c ---- linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2008-03-04 19:35:36.000000000 -0500 @@ -165,7 +165,7 @@ prism54_update_stats(struct work_struct struct obj_bss bss, *bss2; union oid_res_t r; @@ -16045,8 +15983,8 @@ void diff -up linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h ---- linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h 2008-03-04 19:35:36.000000000 -0500 @@ -55,7 +55,7 @@ struct islpci_acl { enum { MAC_POLICY_OPEN=0, MAC_POLICY_ACCEPT=1, MAC_POLICY_REJECT=2 } policy; struct list_head mac_list; /* a list of mac_entry */ @@ -16075,8 +16013,8 @@ size_t wpa_ie_len; diff -up linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c ---- linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c 2008-03-04 19:35:36.000000000 -0500 @@ -864,7 +864,7 @@ islpci_setup(struct pci_dev *pdev) mutex_init(&priv->mgmt_lock); priv->mgmt_received = NULL; @@ -16087,8 +16025,8 @@ /* init state machine with off#1 state */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c 2008-03-04 19:35:36.000000000 -0500 @@ -283,8 +283,8 @@ static void rtl8225_rf_set_tx_power(stru u32 reg; int i; @@ -16130,8 +16068,8 @@ } diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c 2008-03-04 19:35:36.000000000 -0500 @@ -49,6 +49,41 @@ static struct pci_device_id rtl8180_tabl MODULE_DEVICE_TABLE(pci, rtl8180_table); @@ -16313,8 +16251,8 @@ } diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h 2008-03-04 19:35:36.000000000 -0500 @@ -102,7 +102,7 @@ struct rtl8180_priv { struct rtl8180_tx_ring tx_ring[4]; struct ieee80211_channel channels[14]; @@ -16325,8 +16263,8 @@ u32 rx_conf; diff -up linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/Kconfig 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/Kconfig 2008-03-04 19:35:36.000000000 -0500 @@ -146,12 +146,15 @@ config IPW2100 configure your card: @@ -16394,8 +16332,8 @@ source "drivers/net/wireless/hostap/Kconfig" source "drivers/net/wireless/bcm43xx/Kconfig" diff -up linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c.orig linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c ---- linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c 2008-03-04 19:35:36.000000000 -0500 @@ -10349,9 +10349,7 @@ static int ipw_tx_skb(struct ipw_priv *p remaining_bytes, PCI_DMA_TODEVICE)); @@ -16408,8 +16346,8 @@ } diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h 2008-03-04 19:35:36.000000000 -0500 @@ -515,14 +515,20 @@ struct iwl3945_qosparam_cmd { #define STA_CONTROL_MODIFY_MSK 0x01 @@ -16447,8 +16385,8 @@ } __attribute__ ((packed)); diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h 2008-03-04 19:35:36.000000000 -0500 @@ -727,14 +727,20 @@ struct iwl4965_qosparam_cmd { #define STA_CONTROL_MODIFY_MSK 0x01 @@ -16524,8 +16462,8 @@ __le16 scd_ssn; } __attribute__ ((packed)); diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h 2008-03-04 19:35:36.000000000 -0500 @@ -59,28 +59,28 @@ * */ @@ -16601,8 +16539,8 @@ #define iwl4965_poll_direct_bit _iwl4965_poll_direct_bit #endif diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c 2008-03-04 19:35:36.000000000 -0500 @@ -83,7 +83,7 @@ struct iwl4965_rate_scale_data { /** * struct iwl4965_scale_tbl_info -- tx params and success history for all rates @@ -17324,8 +17262,8 @@ sta_info_put(sta); return cnt; diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-03-04 19:35:36.000000000 -0500 @@ -247,7 +247,7 @@ static void iwl3945_add_radiotap(struct * the information provided in the skb from the hardware */ s8 signal = stats->ssi; @@ -17455,8 +17393,8 @@ } diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-03-04 19:35:36.000000000 -0500 @@ -90,7 +90,7 @@ int iwl4965_param_amsdu_size_8K; /* de #define VS #endif @@ -18842,8 +18780,8 @@ iwl4965_rate_control_register(priv->hw); err = ieee80211_register_hw(priv->hw); diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2008-03-04 19:35:36.000000000 -0500 @@ -79,6 +79,30 @@ const struct iwl4965_rate_info iwl4965_r IWL_DECLARE_RATE_INFO(60, 60, 48, INV, 48, INV, 48, INV),/* 60mbps */ }; @@ -20064,8 +20002,8 @@ priv->statistics_periodic.data = (unsigned long)priv; priv->statistics_periodic.function = iwl4965_bg_statistics_periodic; diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h 2008-03-04 19:35:36.000000000 -0500 @@ -212,6 +212,18 @@ enum { #define LQ_SIZE 2 /* 2 mode tables: "Active" and "Search" */ @@ -20086,8 +20024,8 @@ enum iwl4965_table_type { diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig 2008-03-04 19:35:36.000000000 -0500 @@ -24,18 +24,10 @@ config IWL4965 say M here and read . The module will be called iwl4965.ko. @@ -20123,8 +20061,8 @@ bool "Enable Spectrum Measurement in iwl3945 drivers" depends on IWL3945 diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h 2008-03-04 19:35:36.000000000 -0500 @@ -413,7 +413,6 @@ struct iwl4965_eeprom { /*=== CSR (control and status registers) ===*/ #define CSR_BASE (0x000) @@ -20134,8 +20072,8 @@ #define CSR_INT_COALESCING (CSR_BASE+0x004) /* accum ints, 32-usec units */ #define CSR_INT (CSR_BASE+0x008) /* host interrupt status/ack */ diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h 2008-03-04 19:35:36.000000000 -0500 @@ -206,7 +206,7 @@ struct iwl4965_channel_info { u8 group_index; /* 0-4, maps channel to group1/2/3/4/5 */ @@ -20405,8 +20343,8 @@ /* Requires full declaration of iwl4965_priv before including */ #include "iwl-4965-io.h" diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h 2008-03-04 19:35:36.000000000 -0500 @@ -195,7 +195,7 @@ struct iwl3945_channel_info { u8 group_index; /* 0-4, maps channel to group1/2/3/4/5 */ @@ -20506,8 +20444,8 @@ /* Requires full declaration of iwl3945_priv before including */ #include "iwl-3945-io.h" diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h 2008-03-04 19:35:36.000000000 -0500 @@ -59,28 +59,28 @@ * */ @@ -20583,8 +20521,8 @@ #define iwl3945_poll_direct_bit _iwl3945_poll_direct_bit #endif diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h 2008-03-04 19:35:36.000000000 -0500 @@ -324,7 +324,6 @@ struct iwl3945_eeprom { /*=== CSR (control and status registers) ===*/ #define CSR_BASE (0x000) @@ -20594,8 +20532,8 @@ #define CSR_INT_COALESCING (CSR_BASE+0x004) /* accum ints, 32-usec units */ #define CSR_INT (CSR_BASE+0x008) /* host interrupt status/ack */ diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-03-04 19:35:36.000000000 -0500 @@ -91,7 +91,7 @@ int iwl3945_param_queues_num = IWL_MAX_N #define VS #endif @@ -21533,8 +21471,8 @@ iwl3945_rate_control_register(priv->hw); err = ieee80211_register_hw(priv->hw); diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c 2008-03-04 19:35:36.000000000 -0500 @@ -100,14 +100,6 @@ static struct iwl3945_tpt_entry iwl3945_ {-89, IWL_RATE_6M_INDEX} }; @@ -21767,8 +21705,8 @@ IWL_DEBUG_RATE("leave: rssi %d assign rate index: " "%d (plcp 0x%x)\n", rssi, rs_sta->start_rate, diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -22328,8 +22266,8 @@ /* * TX descriptor initializer diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -22898,8 +22836,8 @@ +MODULE_DESCRIPTION("rt2x00 usb library"); MODULE_LICENSE("GPL"); diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -22965,8 +22903,8 @@ #define MIN_TXPOWER 0 #define MAX_TXPOWER 31 diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -24306,8 +24244,8 @@ return 0; diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -25057,7 +24995,7 @@ #ifdef CONFIG_RT2X00_LIB_DEBUGFS diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Makefile.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Makefile --- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Makefile.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Makefile 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Makefile 2008-03-04 19:35:36.000000000 -0500 @@ -1,22 +1,17 @@ -rt2x00lib-objs := rt2x00dev.o rt2x00mac.o rt2x00config.o +rt2x00lib-y += rt2x00dev.o @@ -25098,8 +25036,8 @@ +obj-$(CONFIG_RT2500USB) += rt2500usb.o +obj-$(CONFIG_RT73USB) += rt73usb.o diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -25937,8 +25875,8 @@ .hw = &rt2500usb_mac80211_ops, #ifdef CONFIG_RT2X00_LIB_DEBUGFS diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -26071,8 +26009,8 @@ + #endif /* RT2X00LIB_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -26166,8 +26104,8 @@ - #endif /* RT2X00REG_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -26405,8 +26343,8 @@ if (flags & CONFIG_UPDATE_ANTENNA) { diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -26638,8 +26576,8 @@ void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev); diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -26877,8 +26815,8 @@ debugfs_remove(intf->rf_off_entry); debugfs_remove(intf->bbp_val_entry); diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,290 +0,0 @@ -/* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -27171,8 +27109,8 @@ - -#endif /* RT2X00RING_H */ diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.h ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.h 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.h 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,63 @@ +/* + Copyright (C) 2004 - 2008 rt2x00 SourceForge Project @@ -27238,8 +27176,8 @@ + +#endif /* RT2X00LEDS_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -27650,8 +27588,8 @@ return 0; } diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -27660,8 +27598,8 @@ This program is free software; you can redistribute it and/or modify diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -27759,8 +27697,8 @@ #define MIN_TXPOWER 0 #define MAX_TXPOWER 31 diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -27786,8 +27724,8 @@ #define MIN_TXPOWER 31 #define MAX_TXPOWER 62 diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.h ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.h 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.h 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,457 @@ +/* + Copyright (C) 2004 - 2008 rt2x00 SourceForge Project @@ -28247,8 +28185,8 @@ + +#endif /* RT2X00QUEUE_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28285,8 +28223,8 @@ #define MIN_TXPOWER 0 #define MAX_TXPOWER 31 diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28306,8 +28244,8 @@ #define MIN_TXPOWER 0 #define MAX_TXPOWER 31 diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28316,8 +28254,8 @@ This program is free software; you can redistribute it and/or modify diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28347,7 +28285,7 @@ __le32 timestamp_sec; diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Kconfig --- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Kconfig.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Kconfig 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Kconfig 2008-03-04 19:35:36.000000000 -0500 @@ -5,29 +5,29 @@ config RT2X00 This will enable the experimental support for the Ralink drivers, developed in the rt2x00 project . @@ -28492,8 +28430,8 @@ +endif diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28574,8 +28512,8 @@ retval = rt2x00lib_request_firmware(rt2x00dev); if (retval) diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -29333,8 +29271,8 @@ .hw = &rt2500pci_mac80211_ops, #ifdef CONFIG_RT2X00_LIB_DEBUGFS diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.c ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.c 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.c 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,217 @@ +/* + Copyright (C) 2004 - 2008 rt2x00 SourceForge Project @@ -29554,8 +29492,8 @@ + led_classdev_resume(&rt2x00dev->led_qual.led_dev); +} diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.c ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.c 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.c 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,299 @@ +/* + Copyright (C) 2004 - 2008 rt2x00 SourceForge Project @@ -29857,8 +29795,8 @@ + rt2x00dev->bcn = NULL; +} diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -31022,8 +30960,8 @@ .hw = &rt61pci_mac80211_ops, #ifdef CONFIG_RT2X00_LIB_DEBUGFS diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -31474,8 +31412,8 @@ +MODULE_DESCRIPTION("rt2x00 pci library"); MODULE_LICENSE("GPL"); diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -31586,8 +31524,8 @@ /* * Device initialization handlers. diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -32503,8 +32441,8 @@ .hw = &rt73usb_mac80211_ops, #ifdef CONFIG_RT2X00_LIB_DEBUGFS diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c 2008-03-04 19:35:36.000000000 -0500 @@ -1018,7 +1018,7 @@ static int ath5k_hw_rf5111_rfregs(struct int obdb = -1, bank = -1; u32 ee_mode; @@ -32711,8 +32649,8 @@ AR5K_PHY_PAPD_PROBE_TXPOWER) | AR5K_PHY_PAPD_PROBE_TX_NEXT, AR5K_PHY_PAPD_PROBE); diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-03-04 19:35:36.000000000 -0500 @@ -30,7 +30,6 @@ #include @@ -32910,8 +32848,8 @@ extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result); diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile 2008-03-04 19:35:36.000000000 -0500 @@ -1,2 +1,6 @@ -ath5k-objs = base.o hw.o regdom.o initvals.o phy.o debug.o -obj-$(CONFIG_ATH5K) += ath5k.o @@ -32922,8 +32860,8 @@ +ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o +obj-$(CONFIG_ATH5K) += ath5k.o diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h 2008-03-04 19:35:36.000000000 -0500 @@ -61,11 +61,6 @@ #ifndef _ATH5K_DEBUG_H #define _ATH5K_DEBUG_H @@ -33000,8 +32938,8 @@ #endif /* ifndef _ATH5K_DEBUG_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c 2008-03-04 19:35:36.000000000 -0500 @@ -140,9 +140,6 @@ struct ath5k_hw *ath5k_hw_attach(struct * HW information */ @@ -33415,8 +33353,8 @@ /****************\ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c 2008-03-04 19:35:36.000000000 -0500 @@ -1317,8 +1317,10 @@ int ath5k_hw_write_initvals(struct ath5k /* For AR5211 */ } else if (ah->ah_version == AR5K_AR5211) { @@ -33431,8 +33369,8 @@ } diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,37 @@ +config ATH5K + tristate "Atheros 5xxx wireless cards support" @@ -33472,8 +33410,8 @@ + modprobe ath5k debug=0x00000400 + diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c 2008-03-04 19:35:36.000000000 -0500 @@ -80,7 +80,7 @@ MODULE_AUTHOR("Nick Kossifidis"); MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards."); MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards"); @@ -34143,8 +34081,8 @@ case ALG_CCMP: return -EOPNOTSUPP; diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c 2008-03-04 19:35:36.000000000 -0500 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -34234,8 +34172,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h 2008-03-04 19:35:36.000000000 -0500 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -34281,8 +34219,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-03-04 19:35:36.000000000 -0500 @@ -78,8 +78,9 @@ static void max2820_rf_set_channel(struc struct ieee80211_conf *conf) { @@ -34296,8 +34234,8 @@ /* While philips SA2400 drive the PA bias from diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-03-04 19:35:36.000000000 -0500 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -34467,8 +34405,8 @@ err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c ---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-03 16:42:48.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-04 19:35:36.000000000 -0500 @@ -172,6 +172,22 @@ static int select_core_and_segment(struc return 0; } @@ -34525,8 +34463,8 @@ .write32 = ssb_pcmcia_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c ---- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-03 16:42:48.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-04 19:35:36.000000000 -0500 @@ -505,6 +505,14 @@ error: return err; } @@ -34569,8 +34507,8 @@ .write32 = ssb_ssb_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c ---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-03 16:42:48.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -572,6 +572,19 @@ static inline int ssb_pci_assert_buspowe } #endif /* DEBUG */ @@ -34623,8 +34561,8 @@ .write32 = ssb_pci_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c ---- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-03 16:42:48.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-04 19:35:36.000000000 -0500 @@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks); } linux-2.6-wireless.patch: Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless.patch,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- linux-2.6-wireless.patch 28 Feb 2008 02:06:24 -0000 1.25 +++ linux-2.6-wireless.patch 5 Mar 2008 01:09:02 -0000 1.26 @@ -1,706 +1,391 @@ -commit c2893054cc823e05c723114378244c8caba084c0 -Author: Alexey Zaytsev -Date: Sat Feb 23 13:33:07 2008 +0300 - - Don't build bcm43xx if SSB is static and b43 PCI-SSB bridge is enabled. - - This may happen e.g. when the ssb is statically enables by the b44 driver, - and the b43 pci-ssb bridge is enbled by the b43/b43legacy drivers, or the - b43/b43legacy drivers are built statically. - - Signed-off-by: Alexey Zaytsev - Acked-by: Larry Finger - Signed-off-by: John W. Linville - -commit 82928757f3e9451c1ae520f46d327d6110a4eec1 -Author: Alexey Zaytsev -Date: Sat Feb 23 12:59:26 2008 +0300 +commit c256e05b7b30fab484deacb4f8cff59ce649c75e +Author: Michael Buesch +Date: Tue Mar 4 20:31:13 2008 +0100 - Use a separate config option for the b43 pci to ssb bridge. + b43legacy: Fix module init message - The bridge code was unnecessary enabled by the b44 - driver, but it prevents the bcm43xx driver from - being loaded, as the bridge claims the same pci ids. + This fixes the module init message to tell that the legacy + driver loaded. This makes it less confusing, in case both drivers are loaded. - Now we enable the birdge only if the b43{legacy} - drivers are selected. - - Signed-off-by: Alexey Zaytsev - Acked-by: Larry Finger + Signed-off-by: Michael Buesch Signed-off-by: John W. Linville -commit e668b6729ca1c7f88c7ea1789fb0ed4503c384ce -Author: Roland Dreier -Date: Tue Feb 26 15:26:56 2008 +0100 +commit cdb2a9fe63575dd1eb82b724bbd0aa5e0dd89fa0 +Author: Jussi Kivilinna +Date: Tue Mar 4 20:05:27 2008 +0200 - libertas: Remove unused exports - - The libertas driver exports a number of symbols with no in-tree users; - remove these unused exports. lbs_reset_device() is completely unused, with - no callers at all, so remove the function completely. + rndis_wlan: fix broken data copy - A couple of these unused exported symbols are static, which causes the - following build error on ia64 with gcc 4.2.3: + Replace broken code that attempted to copy 6 byte array to 64-bit + integer. Due to missing cast to 64-bit integer, left shift operation + were 32-bit and lead to bytes been copied over each other. New code + uses simple memcpy, for greater readability and efficiency. - drivers/net/wireless/libertas/main.c:1375: error: __ksymtab_lbs_remove_mesh causes a section type conflict - drivers/net/wireless/libertas/main.c:1354: error: __ksymtab_lbs_add_mesh causes a section type conflict - - Signed-off-by: Roland Dreier - Acked-by: Holger Schurig - Acked-by: Dan Williams + Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville -commit 7e0a589e4de9278215da894ba8e41ba0943e7aca -Author: Johannes Berg -Date: Tue Feb 26 00:39:28 2008 +0100 +commit 8a96df80b3ddb2410045a26ea19eeccb5f2d2d11 +Author: Sebastian Siewior +Date: Tue Mar 4 18:22:27 2008 +0100 - mac80211: fix kmalloc vs. net_ratelimit + libertas: compare the current command with response - The "goto end;" part definitely must not be rate limited. + instead of with itself. - Signed-off-by: Johannes Berg + Signed-off-by: Sebastian Siewior Signed-off-by: John W. Linville -commit 702ebfa36437c98a60ea21ac2a18b159e6aa16c6 -Author: Ivo van Doorn -Date: Mon Feb 25 23:15:13 2008 +0100 +commit 6305f498604df6c66bdb4cc533ce6332fa5ab61f +Author: David Woodhouse +Date: Mon Mar 3 12:20:12 2008 +0100 - rt2x00: Fix rt2x00lib_reset_link_tuner() - - rt2x00lib_reset_link_tuner() can be called from within - the link tuner itself. This means that it should - _not_ call rt2x00lib_stop_link_tuner() since that will - cause the thread to hang. + libertas: fix sanity check on sequence number in command response - Reorder the things that should be done during a - link tuner reset and during a link tuner start. + Slightly more useful if we compare it against the sequence number of the + command we have outstanding, rather than comparing the reply with itself. - Also make antenna tuning the last step of the link - tuner since it could possibly reset some statistical - information which we need for average calculation. + Doh. Pointed out by Sebastian Siewior - Signed-off-by: Ivo van Doorn + Signed-off-by: David Woodhouse + Acked-by: Dan Williams Signed-off-by: John W. Linville -commit 4460423f7cd0e1c5c0cf92e6159f151ba16e518f -Author: Ivo van Doorn -Date: Mon Feb 25 23:15:08 2008 +0100 +commit c2f2d3a06f8b628d444cf4f396d6c6ddd47e1d1f +Author: Johannes Berg +Date: Fri Feb 29 23:28:25 2008 +0100 - rt2x00: Don't switch to antenna with low rssi - - When rssi_a > rssi_b is true and the current antenna - was already antenna A, then rt2x00 incorrectly jumped - to antenna B. + p54: fix eeprom parser length sanity checks - Also don't configure the antenna when there has been - no change in the antenna setup. - - Signed-off-by: Ivo van Doorn - Signed-off-by: John W. Linville - -commit 50cbbe9cf17c52588a6b709273547c93b7c3d329 -Author: Ivo van Doorn -Date: Mon Feb 25 23:15:05 2008 +0100 - - rt2x00: Add link tuner safe RX toggle states - - This adds 2 new states which both are used to toggle - the RX. These new states are required for usage - inside the link tuner thread, because the normal - RX toggling will stop the link tuner thread. - While it is possible that the link tuner thread itself - is the caller of the RX toggle (when using software - antenna diversity). + When I called p54_parse_eeprom() on a hand-coded structure + I managed to make a small mistake with wrap->len which caused + a segfault a few lines down when trying to read entry->len. + This patch changes the validation code to avoid such problems. - Signed-off-by: Ivo van Doorn + Signed-off-by: Johannes Berg + Tested-by: Florian Fainelli Signed-off-by: John W. Linville -commit b268ed34199317e1c627106f1bc60317f2d5c44c -Author: Ivo van Doorn -Date: Mon Feb 25 23:15:01 2008 +0100 +commit 8c28293f5514f64ba064bac7946aebeda4a663c6 +Author: Johannes Berg +Date: Fri Feb 29 13:56:33 2008 +0100 - rt2x00: Fix antenna diversity - - Fix 2 issues in antenna diversity selection. - - 1) the following statement will always return true. - if ((rssi_curr - rssi_old) > -5 || (rssi_curr - rssi_old) < 5) - It is cleaner to check if the absolute value is smaller then 5. + p54: fix EEPROM structure endianness - 2) Only enable software diversity when default antenna setup - indicates support for it. Don't select it when the hardware - does not indicate support for it... + Since the EEPROM structure is read from hardware, it is + always little endian, annotate that in the struct and + make sure to convert where applicable. - Signed-off-by: Ivo van Doorn - Signed-off-by: John W. Linville - -commit 57b7ed05c7e68e1b14cc7da232cba2967fb670a7 -Author: Sebastian Siewior -Date: Sat Feb 23 21:46:31 2008 +0100 - - gelic wireless driver needs WIRELESS_EXT support - - | CC drivers/net/ps3_gelic_wireless.o - | /home/bigeasy/git/linux-2.6/drivers/net/ps3_gelic_wireless.c: In function 'gelic_wl_setup_netdev_ops': - | /home/bigeasy/git/linux-2.6/drivers/net/ps3_gelic_wireless.c:2660: error: 'struct net_device' has no member named 'wireless_data' - | /home/bigeasy/git/linux-2.6/drivers/net/ps3_gelic_wireless.c:2661: error: 'struct net_device' has no member named 'wireless_handlers' - | make[3]: *** [drivers/net/ps3_gelic_wireless.o] Error 1 - | make[2]: *** [drivers/net] Error 2 - | make[1]: *** [drivers] Error 2 - | make[1]: *** Waiting for unfinished jobs.... - | make: *** [sub-make] Error 2 - - Signed-off-by: Sebastian Siewior - Acked-by: Masakazu Mokuno + Signed-off-by: Johannes Berg + Cc: Michael Wu + Tested-by: Florian Fainelli Signed-off-by: John W. Linville -commit 3da83bba86f2aef628919469db5707db6a785868 -Author: Masakazu Mokuno -Date: Fri Feb 22 16:45:26 2008 +0900 +commit dc63644b0ee3b447e879ef8e124657b40e9ea81c +Author: Yoichi Yuasa +Date: Fri Feb 29 11:09:31 2008 +0100 - PS3: gelic: Link the wireless net_device structure to the corresponding device structure - - Link the net_device structure of the wireless part to the - corresponding device structure. + ssb: Add pcibios_enable_device() return value check - Without this, the sysfs node for this net_device would not have - 'device' link. + This patch has added pcibios_enable_device() return value check. - Signed-off-by: Masakazu Mokuno - Acked-by: Dan Williams + Signed-off-by: Yoichi Yuasa + Signed-off-by: Michael Buesch Signed-off-by: John W. Linville -commit 04d0a24457e249388ec3ee32b345617d1bc6ebf2 -Author: Johannes Berg -Date: Wed Feb 20 11:47:45 2008 +0100 +commit 1d60ab0574fae362b1cca0ef52181ef75fd46832 +Author: Stefano Brivio +Date: Sun Mar 2 11:33:10 2008 +0100 - rndis_wlan: fix sparse warnings + rc80211-pid: fix rate adjustment - It is obviously wrong to use an enum in a little endian struct, - and those other enums should be declared differently. + Merge rate_control_pid_shift_adjust() to rate_control_pid_adjust_rate() + in order to make the learning algorithm aware of constraints on rates. Also + add some comments and rename variables. - Signed-off-by: Johannes Berg - Acked-by: Jussi Kivilinna - Signed-off-by: John W. Linville - -commit 7672b302058148f0e9a4a2be36c851510ff9cb88 -Author: Gordon Farquharson -Date: Sat Feb 23 03:14:23 2008 -0700 - - Fix b43 driver build for arm - - Align the members of the SSB device structure to a 32 bit boundary so - that the b43 driver can be built for arm using a cross compiler. This - alignment is required so that the test in scripts/mod/file2alias.c - that checks that the size of the device ID type against the size of - the section in the object file succeeds (see comment and - http://lkml.org/lkml/2008/2/18/481 for explanation). + This fixes a bug which prevented 802.11b/g non-AP STAs from working with + 802.11b only AP STAs. - Signed-off-by: Gordon Farquharson - Acked-by: Michael Buesch + This patch was originally destined for 2.6.26, and is being backported + to fix a user reported problem in post-2.6.24 kernels. + + Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville -diff -up linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig linux-2.6.24.noarch/include/linux/mod_devicetable.h ---- linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig 2008-02-27 20:46:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/mod_devicetable.h 2008-02-27 20:47:51.000000000 -0500 -@@ -351,7 +351,13 @@ struct sdio_device_id { - struct ssb_device_id { - __u16 vendor; - __u16 coreid; -- __u8 revision; -+ /* Explicit padding to support a broken sanity check in file2alias.c. -+ * The check compares the size of the structure in the kernel -+ * object file to the size of the structure reported in userspace for -+ * the system on which the kernel is compiled. The check breaks on -+ * cross-compilation, and the padding is a workaround for this. */ -+ __u8 revision -+ __attribute__((aligned(sizeof(__u32)))); - }; - #define SSB_DEVICE(_vendor, _coreid, _revision) \ - { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } -diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-02-27 20:46:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1116,9 +1116,10 @@ static void ieee80211_sta_process_addba_ - /* prepare reordering buffer */ - tid_agg_rx->reorder_buf = - kmalloc(buf_size * sizeof(struct sk_buf *), GFP_ATOMIC); -- if ((!tid_agg_rx->reorder_buf) && net_ratelimit()) { -- printk(KERN_ERR "can not allocate reordering buffer " -- "to tid %d\n", tid); -+ if (!tid_agg_rx->reorder_buf) { -+ if (net_ratelimit()) -+ printk(KERN_ERR "can not allocate reordering buffer " -+ "to tid %d\n", tid); - goto end; - } - memset(tid_agg_rx->reorder_buf, 0, -diff -up linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c.orig linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c ---- linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c 2008-02-27 20:47:51.000000000 -0500 -@@ -2690,6 +2690,7 @@ int gelic_wl_driver_probe(struct gelic_c - return -ENOMEM; - - /* setup net_device structure */ -+ SET_NETDEV_DEV(netdev, &card->dev->core); - gelic_wl_setup_netdev_ops(netdev); - - /* setup some of net_device and register it */ -diff -up linux-2.6.24.noarch/drivers/net/Kconfig.orig linux-2.6.24.noarch/drivers/net/Kconfig ---- linux-2.6.24.noarch/drivers/net/Kconfig.orig 2008-02-27 20:46:43.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/Kconfig 2008-02-27 20:47:51.000000000 -0500 -@@ -2374,6 +2374,7 @@ config GELIC_NET - config GELIC_WIRELESS - bool "PS3 Wireless support" - depends on GELIC_NET -+ select WIRELESS_EXT - help - This option adds the support for the wireless feature of PS3. - If you have the wireless-less model of PS3 or have no plan to -diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/b43/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/b43/Kconfig.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/Kconfig 2008-02-27 20:47:51.000000000 -0500 -@@ -32,6 +32,7 @@ config B43_PCI_AUTOSELECT - bool - depends on B43 && SSB_PCIHOST_POSSIBLE - select SSB_PCIHOST -+ select SSB_B43_PCI_BRIDGE - default y - - # Auto-select SSB PCICORE driver, if possible -diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/Kconfig.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/Kconfig 2008-02-27 20:47:51.000000000 -0500 -@@ -25,6 +25,7 @@ config B43LEGACY_PCI_AUTOSELECT - bool - depends on B43LEGACY && SSB_PCIHOST_POSSIBLE - select SSB_PCIHOST -+ select SSB_B43_PCI_BRIDGE - default y - - # Auto-select SSB PCICORE driver, if possible -diff -up linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c ---- linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c 2008-02-27 20:47:51.000000000 -0500 -@@ -228,9 +228,9 @@ struct NDIS_WLAN_BSSID_EX { - struct NDIS_802_11_SSID Ssid; - __le32 Privacy; - __le32 Rssi; -- enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; -+ __le32 NetworkTypeInUse; - struct NDIS_802_11_CONFIGURATION Configuration; -- enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; -+ __le32 InfrastructureMode; - u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX]; - __le32 IELength; - u8 IEs[0]; -@@ -279,11 +279,11 @@ struct RNDIS_CONFIG_PARAMETER_INFOBUFFER - } __attribute__((packed)); +diff -up linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c +--- linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c 2008-03-04 19:30:56.000000000 -0500 +@@ -2,7 +2,7 @@ + * Copyright 2002-2005, Instant802 Networks, Inc. + * Copyright 2005, Devicescape Software, Inc. + * Copyright 2007, Mattias Nissler +- * Copyright 2007, Stefano Brivio ++ * Copyright 2007-2008, Stefano Brivio + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as +@@ -63,72 +63,66 @@ + * RC_PID_ARITH_SHIFT. + */ - /* these have to match what is in wpa_supplicant */ --enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP } wpa_alg; --enum { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP, CIPHER_WEP104 } -- wpa_cipher; --enum { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE, KEY_MGMT_802_1X_NO_WPA, -- KEY_MGMT_WPA_NONE } wpa_key_mgmt; -+enum wpa_alg { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP }; -+enum wpa_cipher { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP, -+ CIPHER_WEP104 }; -+enum wpa_key_mgmt { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE, -+ KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE }; - - /* - * private data -diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1351,8 +1351,6 @@ done: - lbs_deb_leave_args(LBS_DEB_MESH, "ret %d", ret); - return ret; - } --EXPORT_SYMBOL_GPL(lbs_add_mesh); - - - static void lbs_remove_mesh(struct lbs_private *priv) - { -@@ -1372,7 +1370,6 @@ static void lbs_remove_mesh(struct lbs_p - free_netdev(mesh_dev); - lbs_deb_leave(LBS_DEB_MESH); - } --EXPORT_SYMBOL_GPL(lbs_remove_mesh); - - /** - * @brief This function finds the CFP in -@@ -1458,20 +1455,6 @@ void lbs_interrupt(struct lbs_private *p - } - EXPORT_SYMBOL_GPL(lbs_interrupt); - --int lbs_reset_device(struct lbs_private *priv) +-/* Shift the adjustment so that we won't switch to a lower rate if it exhibited +- * a worse failed frames behaviour and we'll choose the highest rate whose +- * failed frames behaviour is not worse than the one of the original rate +- * target. While at it, check that the adjustment is within the ranges. Then, +- * provide the new rate index. */ +-static int rate_control_pid_shift_adjust(struct rc_pid_rateinfo *r, +- int adj, int cur, int l) -{ -- int ret; +- int i, j, k, tmp; +- +- j = r[cur].rev_index; +- i = j + adj; - -- lbs_deb_enter(LBS_DEB_MAIN); -- ret = lbs_prepare_and_send_command(priv, CMD_802_11_RESET, -- CMD_ACT_HALT, 0, 0, NULL); -- msleep_interruptible(10); +- if (i < 0) +- return r[0].index; +- if (i >= l - 1) +- return r[l - 1].index; - -- lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret); -- return ret; +- tmp = i; +- +- if (adj < 0) { +- for (k = j; k >= i; k--) +- if (r[k].diff <= r[j].diff) +- tmp = k; +- } else { +- for (k = i + 1; k + i < l; k++) +- if (r[k].diff <= r[i].diff) +- tmp = k; +- } +- +- return r[tmp].index; -} --EXPORT_SYMBOL_GPL(lbs_reset_device); - - static int __init lbs_init_module(void) ++/* Adjust the rate while ensuring that we won't switch to a lower rate if it ++ * exhibited a worse failed frames behaviour and we'll choose the highest rate ++ * whose failed frames behaviour is not worse than the one of the original rate ++ * target. While at it, check that the new rate is valid. */ + static void rate_control_pid_adjust_rate(struct ieee80211_local *local, + struct sta_info *sta, int adj, + struct rc_pid_rateinfo *rinfo) { - lbs_deb_enter(LBS_DEB_MAIN); -diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1040,7 +1040,6 @@ int lbs_mesh_access(struct lbs_private * - lbs_deb_leave(LBS_DEB_CMD); - return ret; - } --EXPORT_SYMBOL_GPL(lbs_mesh_access); + struct ieee80211_sub_if_data *sdata; + struct ieee80211_hw_mode *mode; +- int newidx; +- int maxrate; +- int back = (adj > 0) ? 1 : -1; ++ int cur_sorted, new_sorted, probe, tmp, n_bitrates; ++ int cur = sta->txrate; + + sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); + + mode = local->oper_hw_mode; +- maxrate = sdata->bss ? sdata->bss->max_ratectrl_rateidx : -1; ++ n_bitrates = mode->num_rates; + +- newidx = rate_control_pid_shift_adjust(rinfo, adj, sta->txrate, +- mode->num_rates); ++ /* Map passed arguments to sorted values. */ ++ cur_sorted = rinfo[cur].rev_index; ++ new_sorted = cur_sorted + adj; ++ ++ /* Check limits. */ ++ if (new_sorted < 0) ++ new_sorted = rinfo[0].rev_index; ++ else if (new_sorted >= n_bitrates) ++ new_sorted = rinfo[n_bitrates - 1].rev_index; + +- while (newidx != sta->txrate) { +- if (rate_supported(sta, mode, newidx) && +- (maxrate < 0 || newidx <= maxrate)) { +- sta->txrate = newidx; +- break; +- } ++ tmp = new_sorted; + +- newidx += back; ++ if (adj < 0) { ++ /* Ensure that the rate decrease isn't disadvantageous. */ ++ for (probe = cur_sorted; probe >= new_sorted; probe--) ++ if (rinfo[probe].diff <= rinfo[cur_sorted].diff && ++ rate_supported(sta, mode, rinfo[probe].index)) ++ tmp = probe; ++ } else { ++ /* Look for rate increase with zero (or below) cost. */ ++ for (probe = new_sorted + 1; probe < n_bitrates; probe++) ++ if (rinfo[probe].diff <= rinfo[new_sorted].diff && ++ rate_supported(sta, mode, rinfo[probe].index)) ++ tmp = probe; + } - int lbs_mesh_config(struct lbs_private *priv, uint16_t enable, uint16_t chan) - { -@@ -1576,7 +1575,6 @@ done: - lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret); - return ret; ++ /* Fit the rate found to the nearest supported rate. */ ++ do { ++ if (rate_supported(sta, mode, rinfo[tmp].index)) { ++ sta->txrate = rinfo[tmp].index; ++ break; ++ } ++ if (adj < 0) ++ tmp--; ++ else ++ tmp++; ++ } while (tmp < n_bitrates && tmp >= 0); ++ + #ifdef CONFIG_MAC80211_DEBUGFS + rate_control_pid_event_rate_change( + &((struct rc_pid_sta_info *)sta->rate_ctrl_priv)->events, +- newidx, mode->rates[newidx].rate); ++ cur, mode->rates[cur].rate); + #endif } --EXPORT_SYMBOL_GPL(lbs_prepare_and_send_command); - /** - * @brief This function allocates the command buffer and link -diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/decl.h.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/decl.h ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/decl.h.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/decl.h 2008-02-27 20:47:51.000000000 -0500 -@@ -69,7 +69,6 @@ struct lbs_private *lbs_add_card(void *c - int lbs_remove_card(struct lbs_private *priv); - int lbs_start_card(struct lbs_private *priv); - int lbs_stop_card(struct lbs_private *priv); --int lbs_reset_device(struct lbs_private *priv); - void lbs_host_to_card_done(struct lbs_private *priv); - - int lbs_update_channel(struct lbs_private *priv); -diff -up linux-2.6.24.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/bcm43xx/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/bcm43xx/Kconfig 2008-02-27 20:47:51.000000000 -0500 -@@ -1,6 +1,6 @@ - config BCM43XX - tristate "Broadcom BCM43xx wireless support (DEPRECATED)" -- depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL -+ depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && (!SSB_B43_PCI_BRIDGE || SSB != y) && EXPERIMENTAL - select WIRELESS_EXT - select FW_LOADER - select HW_RANDOM -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-02-27 20:47:51.000000000 -0500 -@@ -61,11 +61,33 @@ EXPORT_SYMBOL_GPL(rt2x00lib_get_ring); - /* - * Link tuning handlers - */ --static void rt2x00lib_start_link_tuner(struct rt2x00_dev *rt2x00dev) -+void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev) - { -+ if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) -+ return; +diff -up linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig linux-2.6.24.noarch/drivers/net/wireless/p54common.h +--- linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54common.h 2008-03-04 19:30:56.000000000 -0500 +@@ -53,10 +53,10 @@ struct pda_entry { + } __attribute__ ((packed)); + + struct eeprom_pda_wrap { +- u32 magic; +- u16 pad; +- u16 len; +- u32 arm_opcode; ++ __le32 magic; ++ __le16 pad; ++ __le16 len; ++ __le32 arm_opcode; + u8 data[0]; + } __attribute__ ((packed)); + +diff -up linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig linux-2.6.24.noarch/drivers/net/wireless/p54common.c +--- linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54common.c 2008-03-04 19:30:56.000000000 -0500 +@@ -166,18 +166,23 @@ int p54_parse_eeprom(struct ieee80211_hw + struct p54_common *priv = dev->priv; + struct eeprom_pda_wrap *wrap = NULL; + struct pda_entry *entry; +- int i = 0; + unsigned int data_len, entry_len; + void *tmp; + int err; ++ u8 *end = (u8 *)eeprom + len; + + wrap = (struct eeprom_pda_wrap *) eeprom; +- entry = (void *)wrap->data + wrap->len; +- i += 2; +- i += le16_to_cpu(entry->len)*2; +- while (i < len) { ++ entry = (void *)wrap->data + le16_to_cpu(wrap->len); + -+ /* -+ * Reset link information. -+ * Both the currently active vgc level as well as -+ * the link tuner counter should be reset. Resetting -+ * the counter is important for devices where the -+ * device should only perform link tuning during the -+ * first minute after being enabled. -+ */ - rt2x00dev->link.count = 0; - rt2x00dev->link.vgc_level = 0; - -+ /* -+ * Reset the link tuner. -+ */ -+ rt2x00dev->ops->lib->reset_tuner(rt2x00dev); -+} ++ /* verify that at least the entry length/code fits */ ++ while ((u8 *)entry <= end - sizeof(*entry)) { + entry_len = le16_to_cpu(entry->len); + data_len = ((entry_len - 1) << 1); + -+static void rt2x00lib_start_link_tuner(struct rt2x00_dev *rt2x00dev) -+{ -+ /* -+ * Clear all (possibly) pre-existing quality statistics. -+ */ - memset(&rt2x00dev->link.qual, 0, sizeof(rt2x00dev->link.qual)); - - /* -@@ -79,10 +101,7 @@ static void rt2x00lib_start_link_tuner(s - rt2x00dev->link.qual.rx_percentage = 50; - rt2x00dev->link.qual.tx_percentage = 50; - -- /* -- * Reset the link tuner. -- */ -- rt2x00dev->ops->lib->reset_tuner(rt2x00dev); -+ rt2x00lib_reset_link_tuner(rt2x00dev); - - queue_delayed_work(rt2x00dev->hw->workqueue, - &rt2x00dev->link.work, LINK_TUNE_INTERVAL); -@@ -93,15 +112,6 @@ static void rt2x00lib_stop_link_tuner(st - cancel_delayed_work_sync(&rt2x00dev->link.work); - } - --void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev) --{ -- if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) -- return; -- -- rt2x00lib_stop_link_tuner(rt2x00dev); -- rt2x00lib_start_link_tuner(rt2x00dev); --} -- - /* - * Ring initialization - */ -@@ -260,19 +270,11 @@ static void rt2x00lib_evaluate_antenna_s - if (sample_a == sample_b) - return; - -- if (rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY) { -- if (sample_a > sample_b && rx == ANTENNA_B) -- rx = ANTENNA_A; -- else if (rx == ANTENNA_A) -- rx = ANTENNA_B; -- } -+ if (rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY) -+ rx = (sample_a > sample_b) ? ANTENNA_A : ANTENNA_B; ++ /* abort if entry exceeds whole structure */ ++ if ((u8 *)entry + sizeof(*entry) + data_len > end) ++ break; ++ + switch (le16_to_cpu(entry->code)) { + case PDR_MAC_ADDRESS: + SET_IEEE80211_PERM_ADDR(dev, entry->data); +@@ -249,13 +254,12 @@ int p54_parse_eeprom(struct ieee80211_hw + priv->version = *(u8 *)(entry->data + 1); + break; + case PDR_END: +- i = len; ++ /* make it overrun */ ++ entry_len = len; + break; + } + + entry = (void *)entry + (entry_len + 1)*2; +- i += 2; +- i += entry_len*2; + } -- if (rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY) { -- if (sample_a > sample_b && tx == ANTENNA_B) -- tx = ANTENNA_A; -- else if (tx == ANTENNA_A) -- tx = ANTENNA_B; -- } -+ if (rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY) -+ tx = (sample_a > sample_b) ? ANTENNA_A : ANTENNA_B; + if (!priv->iq_autocal || !priv->output_limit || !priv->curve_data) { +diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c +--- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c 2008-03-04 19:30:56.000000000 -0500 +@@ -3829,7 +3829,7 @@ static void b43legacy_print_driverinfo(v + #ifdef CONFIG_B43LEGACY_DMA + feat_dma = "D"; + #endif +- printk(KERN_INFO "Broadcom 43xx driver loaded " ++ printk(KERN_INFO "Broadcom 43xx-legacy driver loaded " + "[ Features: %s%s%s%s%s, Firmware-ID: " + B43legacy_SUPPORTED_FIRMWARE_ID " ]\n", + feat_pci, feat_leds, feat_rfkill, feat_pio, feat_dma); +diff -up linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c 2008-03-04 19:30:56.000000000 -0500 +@@ -260,7 +260,7 @@ struct NDIS_802_11_KEY { + __le32 KeyLength; + u8 Bssid[6]; + u8 Padding[6]; +- __le64 KeyRSC; ++ u8 KeyRSC[8]; + u8 KeyMaterial[32]; + } __attribute__((packed)); - rt2x00lib_config_antenna(rt2x00dev, rx, tx); - } -@@ -293,7 +295,7 @@ static void rt2x00lib_evaluate_antenna_e - * sample the rssi from the other antenna to make a valid - * comparison between the 2 antennas. - */ -- if ((rssi_curr - rssi_old) > -5 || (rssi_curr - rssi_old) < 5) -+ if (abs(rssi_curr - rssi_old) < 5) - return; - - rt2x00dev->link.ant.flags |= ANTENNA_MODE_SAMPLE; -@@ -319,15 +321,15 @@ static void rt2x00lib_evaluate_antenna(s - rt2x00dev->link.ant.flags &= ~ANTENNA_TX_DIVERSITY; - - if (rt2x00dev->hw->conf.antenna_sel_rx == 0 && -- rt2x00dev->default_ant.rx != ANTENNA_SW_DIVERSITY) -+ rt2x00dev->default_ant.rx == ANTENNA_SW_DIVERSITY) - rt2x00dev->link.ant.flags |= ANTENNA_RX_DIVERSITY; - if (rt2x00dev->hw->conf.antenna_sel_tx == 0 && -- rt2x00dev->default_ant.tx != ANTENNA_SW_DIVERSITY) -+ rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY) - rt2x00dev->link.ant.flags |= ANTENNA_TX_DIVERSITY; - - if (!(rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY) && - !(rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY)) { -- rt2x00dev->link.ant.flags &= ~ANTENNA_MODE_SAMPLE; -+ rt2x00dev->link.ant.flags = 0; - return; +@@ -1508,7 +1508,7 @@ static int rndis_iw_set_encode_ext(struc + struct usbnet *usbdev = dev->priv; + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev); + struct NDIS_802_11_KEY ndis_key; +- int i, keyidx, ret; ++ int keyidx, ret; + u8 *addr; + + keyidx = wrqu->encoding.flags & IW_ENCODE_INDEX; +@@ -1543,9 +1543,7 @@ static int rndis_iw_set_encode_ext(struc + ndis_key.KeyIndex = cpu_to_le32(keyidx); + + if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) { +- for (i = 0; i < 6; i++) +- ndis_key.KeyRSC |= +- cpu_to_le64(ext->rx_seq[i] << (i * 8)); ++ memcpy(ndis_key.KeyRSC, ext->rx_seq, 6); + ndis_key.KeyIndex |= cpu_to_le32(1 << 29); } -@@ -441,17 +443,18 @@ static void rt2x00lib_link_tuner(struct - rt2x00dev->ops->lib->link_tuner(rt2x00dev); +diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-04 19:30:56.000000000 -0500 +@@ -562,9 +562,7 @@ int lbs_process_rx_command(struct lbs_pr + } - /* -- * Evaluate antenna setup. -- */ -- rt2x00lib_evaluate_antenna(rt2x00dev); + resp = (void *)priv->upld_buf; - -- /* - * Precalculate a portion of the link signal which is - * in based on the tx/rx success/failure counters. - */ - rt2x00lib_precalculate_link_signal(&rt2x00dev->link.qual); - - /* -+ * Evaluate antenna setup, make this the last step since this could -+ * possibly reset some statistics. -+ */ -+ rt2x00lib_evaluate_antenna(rt2x00dev); -+ -+ /* - * Increase tuner counter, and reschedule the next link tuner run. - */ - rt2x00dev->link.count++; -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2008-02-27 20:47:51.000000000 -0500 -@@ -960,8 +960,12 @@ static int rt2400pci_set_device_state(st - rt2400pci_disable_radio(rt2x00dev); - break; - case STATE_RADIO_RX_ON: -+ case STATE_RADIO_RX_ON_LINK: -+ rt2400pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ break; - case STATE_RADIO_RX_OFF: -- rt2400pci_toggle_rx(rt2x00dev, state); -+ case STATE_RADIO_RX_OFF_LINK: -+ rt2400pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); - break; - case STATE_DEEP_SLEEP: - case STATE_SLEEP: -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1001,8 +1001,12 @@ static int rt2500usb_set_device_state(st - rt2500usb_disable_radio(rt2x00dev); - break; - case STATE_RADIO_RX_ON: -+ case STATE_RADIO_RX_ON_LINK: -+ rt2500usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ break; - case STATE_RADIO_RX_OFF: -- rt2500usb_toggle_rx(rt2x00dev, state); -+ case STATE_RADIO_RX_OFF_LINK: -+ rt2500usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); - break; - case STATE_DEEP_SLEEP: - case STATE_SLEEP: -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h 2008-02-27 20:47:51.000000000 -0500 -@@ -85,6 +85,8 @@ enum dev_state { - STATE_RADIO_OFF, - STATE_RADIO_RX_ON, - STATE_RADIO_RX_OFF, -+ STATE_RADIO_RX_ON_LINK, -+ STATE_RADIO_RX_OFF_LINK, - STATE_RADIO_IRQ_ON, - STATE_RADIO_IRQ_OFF, - }; -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c 2008-02-27 20:47:51.000000000 -0500 -@@ -97,12 +97,16 @@ void rt2x00lib_config_antenna(struct rt2 - libconf.ant.rx = rx; - libconf.ant.tx = tx; - -+ if (rx == rt2x00dev->link.ant.active.rx && -+ tx == rt2x00dev->link.ant.active.tx) +- curcmd = le16_to_cpu(resp->command); +- ++ curcmd = le16_to_cpu(priv->cur_cmd->cmdbuf->command); + respcmd = le16_to_cpu(resp->command); + result = le16_to_cpu(resp->result); + +@@ -572,9 +570,9 @@ int lbs_process_rx_command(struct lbs_pr + respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies); + lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len); + +- if (resp->seqnum != resp->seqnum) { ++ if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) { + lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n", +- le16_to_cpu(resp->seqnum), le16_to_cpu(resp->seqnum)); ++ le16_to_cpu(resp->seqnum), le16_to_cpu(priv->cur_cmd->cmdbuf->seqnum)); + spin_unlock_irqrestore(&priv->driver_lock, flags); + ret = -1; + goto done; +diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c +--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-04 19:30:56.000000000 -0500 +@@ -111,7 +111,10 @@ static void __init ssb_fixup_pcibridge(s + + /* Enable PCI bridge bus mastering and memory space */ + pci_set_master(dev); +- pcibios_enable_device(dev, ~0); ++ if (pcibios_enable_device(dev, ~0) < 0) { ++ ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n"); + return; -+ - /* - * Antenna setup changes require the RX to be disabled, - * else the changes will be ignored by the device. - */ - if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) -- rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); -+ rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF_LINK); - - /* - * Write new antenna setup to device and reset the link tuner. -@@ -116,7 +120,7 @@ void rt2x00lib_config_antenna(struct rt2 - rt2x00dev->link.ant.active.tx = libconf.ant.tx; - - if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) -- rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON_LINK); - } ++ } - void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1112,8 +1112,12 @@ static int rt2500pci_set_device_state(st - rt2500pci_disable_radio(rt2x00dev); - break; - case STATE_RADIO_RX_ON: -+ case STATE_RADIO_RX_ON_LINK: -+ rt2500pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ break; - case STATE_RADIO_RX_OFF: -- rt2500pci_toggle_rx(rt2x00dev, state); -+ case STATE_RADIO_RX_OFF_LINK: -+ rt2500pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); - break; - case STATE_DEEP_SLEEP: - case STATE_SLEEP: -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1482,8 +1482,12 @@ static int rt61pci_set_device_state(stru - rt61pci_disable_radio(rt2x00dev); - break; - case STATE_RADIO_RX_ON: -+ case STATE_RADIO_RX_ON_LINK: -+ rt61pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ break; - case STATE_RADIO_RX_OFF: -- rt61pci_toggle_rx(rt2x00dev, state); -+ case STATE_RADIO_RX_OFF_LINK: -+ rt61pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); - break; - case STATE_DEEP_SLEEP: - case STATE_SLEEP: -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1208,8 +1208,12 @@ static int rt73usb_set_device_state(stru - rt73usb_disable_radio(rt2x00dev); - break; - case STATE_RADIO_RX_ON: -+ case STATE_RADIO_RX_ON_LINK: -+ rt73usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ break; - case STATE_RADIO_RX_OFF: -- rt73usb_toggle_rx(rt2x00dev, state); -+ case STATE_RADIO_RX_OFF_LINK: -+ rt73usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); - break; - case STATE_DEEP_SLEEP: - case STATE_SLEEP: -diff -up linux-2.6.24.noarch/drivers/ssb/Makefile.orig linux-2.6.24.noarch/drivers/ssb/Makefile ---- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-02-27 20:46:35.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-02-27 20:47:51.000000000 -0500 -@@ -14,6 +14,6 @@ ssb-$(CONFIG_SSB_DRIVER_PCICORE) += driv - - # b43 pci-ssb-bridge driver - # Not strictly a part of SSB, but kept here for convenience --ssb-$(CONFIG_SSB_PCIHOST) += b43_pci_bridge.o -+ssb-$(CONFIG_SSB_B43_PCI_BRIDGE) += b43_pci_bridge.o - - obj-$(CONFIG_SSB) += ssb.o -diff -up linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig linux-2.6.24.noarch/drivers/ssb/ssb_private.h ---- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-02-27 20:47:51.000000000 -0500 -@@ -120,10 +120,10 @@ extern int ssb_devices_thaw(struct ssb_b - extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev); - - /* b43_pci_bridge.c */ --#ifdef CONFIG_SSB_PCIHOST -+#ifdef CONFIG_SSB_B43_PCI_BRIDGE - extern int __init b43_pci_ssb_bridge_init(void); - extern void __exit b43_pci_ssb_bridge_exit(void); --#else /* CONFIG_SSB_PCIHOST */ -+#else /* CONFIG_SSB_B43_PCI_BRIDGR */ - static inline int b43_pci_ssb_bridge_init(void) - { - return 0; -diff -up linux-2.6.24.noarch/drivers/ssb/Kconfig.orig linux-2.6.24.noarch/drivers/ssb/Kconfig ---- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-02-27 20:46:35.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-02-27 20:47:51.000000000 -0500 -@@ -35,6 +35,11 @@ config SSB_PCIHOST - - If unsure, say Y - -+config SSB_B43_PCI_BRIDGE -+ bool -+ depends on SSB_PCIHOST -+ default n -+ - config SSB_PCMCIAHOST_POSSIBLE - bool - depends on SSB && (PCMCIA = y || PCMCIA = SSB) && EXPERIMENTAL + /* Enable PCI bridge BAR1 prefetch and burst */ + pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3); From fedora-extras-commits at redhat.com Wed Mar 5 01:13:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 01:13:13 GMT Subject: rpms/perl-Bio-ASN1-EntrezGene/devel perl-Bio-ASN1-EntrezGene.spec, 1.3, 1.4 Message-ID: <200803050113.m251DDK2019371@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Bio-ASN1-EntrezGene/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19343 Modified Files: perl-Bio-ASN1-EntrezGene.spec Log Message: new perl Index: perl-Bio-ASN1-EntrezGene.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Bio-ASN1-EntrezGene/devel/perl-Bio-ASN1-EntrezGene.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Bio-ASN1-EntrezGene.spec 4 Sep 2007 08:50:59 -0000 1.3 +++ perl-Bio-ASN1-EntrezGene.spec 5 Mar 2008 01:12:36 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Bio-ASN1-EntrezGene Version: 1.091 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Regular expression-based Perl Parser for NCBI Entrez Gene License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 04 2008 Tom "spot" Callaway 1.091-5 +- rebuild for new perl + * Tue Sep 04 2007 Alex Lancaster 1.091-4 - Clarified license terms: GPL+ or Artistic From fedora-extras-commits at redhat.com Wed Mar 5 01:18:04 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 5 Mar 2008 01:18:04 GMT Subject: rpms/librsvg2/devel .cvsignore, 1.34, 1.35 librsvg2.spec, 1.69, 1.70 sources, 1.35, 1.36 Message-ID: <200803050118.m251I4bX019482@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/librsvg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19448 Modified Files: .cvsignore librsvg2.spec sources Log Message: 2.22.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/librsvg2/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 24 Feb 2008 21:44:21 -0000 1.34 +++ .cvsignore 5 Mar 2008 01:17:28 -0000 1.35 @@ -1 +1 @@ -librsvg-2.22.1.tar.bz2 +librsvg-2.22.2.tar.bz2 Index: librsvg2.spec =================================================================== RCS file: /cvs/extras/rpms/librsvg2/devel/librsvg2.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- librsvg2.spec 24 Feb 2008 21:44:21 -0000 1.69 +++ librsvg2.spec 5 Mar 2008 01:17:28 -0000 1.70 @@ -12,7 +12,7 @@ Name: librsvg2 Summary: An SVG library based on cairo -Version: 2.22.1 +Version: 2.22.2 Release: 1%{?dist} License: LGPLv2+ @@ -118,6 +118,9 @@ %doc %{_datadir}/gtk-doc/html/rsvg %changelog +* Tue Mar 4 2008 Matthias Clasen - 2.22.2-1 +- Update to 2.22.2 + * Sun Feb 24 2008 Matthias Clasen - 2.22.1-1 - Update to 2.22.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/librsvg2/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 24 Feb 2008 21:44:21 -0000 1.35 +++ sources 5 Mar 2008 01:17:28 -0000 1.36 @@ -1 +1 @@ -f363c95cf329742b396133ab8da0bc22 librsvg-2.22.1.tar.bz2 +aae602677ce201b1a0ed6a0c18c207f2 librsvg-2.22.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 01:41:58 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Wed, 5 Mar 2008 01:41:58 GMT Subject: rpms/kernel/F-8 linux-2.6-wireless-pending-too.patch, 1.4, 1.5 config-generic, 1.50, 1.51 kernel.spec, 1.363, 1.364 linux-2.6-rndis_wlan.patch, 1.3, 1.4 linux-2.6-wireless-pending.patch, 1.30, 1.31 linux-2.6-wireless.patch, 1.26, 1.27 Message-ID: <200803050141.m251fwrF019867@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19803 Modified Files: config-generic kernel.spec linux-2.6-rndis_wlan.patch linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Added Files: linux-2.6-wireless-pending-too.patch Log Message: today's round of wireless fixes, plus a couple extra to correct memory corruption from yesterday's round linux-2.6-wireless-pending-too.patch: Index: linux-2.6-wireless-pending-too.patch =================================================================== RCS file: linux-2.6-wireless-pending-too.patch diff -N linux-2.6-wireless-pending-too.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-wireless-pending-too.patch 5 Mar 2008 01:41:44 -0000 1.5 @@ -0,0 +1,68 @@ +This is an a backport of two fixes which are based on top of the open11s +patches which are not yet in Rawhide. They will disappear when those +later patches get merged to net-2.6.26 (probably in a few days). + + mac80211: always insert key into list + mac80211: fix hardware scan completion + +diff -up linux-2.6.24.noarch/net/mac80211/key.c.orig linux-2.6.24.noarch/net/mac80211/key.c +--- linux-2.6.24.noarch/net/mac80211/key.c.orig 2008-03-04 19:40:41.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/key.c 2008-03-04 19:43:13.000000000 -0500 +@@ -174,6 +174,9 @@ static void __ieee80211_key_replace(stru + { + int idx, defkey; + ++ if (new) ++ list_add(&new->list, &sdata->key_list); ++ + if (sta) { + rcu_assign_pointer(sta->key, new); + } else { +@@ -190,9 +193,6 @@ static void __ieee80211_key_replace(stru + ieee80211_set_default_key(sdata, -1); + + rcu_assign_pointer(sdata->keys[idx], new); +- if (new) +- list_add(&new->list, &sdata->key_list); +- + if (defkey && new) + ieee80211_set_default_key(sdata, new->conf.keyidx); + } +diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c +--- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-03-04 19:40:41.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-03-04 19:48:19.000000000 -0500 +@@ -3401,22 +3401,27 @@ void ieee80211_scan_completed(struct iee + + rcu_read_lock(); + list_for_each_entry_rcu(sdata, &local->interfaces, list) { +- + /* No need to wake the master device. */ + if (sdata->dev == local->mdev) + continue; + +- if (sdata->vif.type == IEEE80211_IF_TYPE_STA) { +- if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) +- ieee80211_send_nullfunc(local, sdata, 0); +- ieee80211_sta_timer((unsigned long)sdata); +- } ++ /* Tell AP we're back */ ++ if (sdata->vif.type == IEEE80211_IF_TYPE_STA && ++ sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) ++ ieee80211_send_nullfunc(local, sdata, 0); + + netif_wake_queue(sdata->dev); + } +- rcu_read_unlock(); + + done: ++ /* Restart STA timer for both SW and HW scan cases */ ++ list_for_each_entry_rcu(sdata, &local->interfaces, list) { ++ if (sdata->vif.type == IEEE80211_IF_TYPE_STA) ++ ieee80211_sta_timer((unsigned long)sdata); ++ } ++ ++ rcu_read_unlock(); ++ + sdata = IEEE80211_DEV_TO_SUB_IF(dev); + if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { + struct ieee80211_if_sta *ifsta = &sdata->u.sta; Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- config-generic 4 Mar 2008 05:03:17 -0000 1.50 +++ config-generic 5 Mar 2008 01:41:44 -0000 1.51 @@ -1278,12 +1278,10 @@ CONFIG_IWL4965_DEBUG=y CONFIG_IWL4965_SENSITIVITY=y CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y -CONFIG_IWL4965_QOS=y CONFIG_IWL4965_HT=y CONFIG_IWL3945=m CONFIG_IWL3945_DEBUG=y CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_IWL3945_QOS=y CONFIG_NORTEL_HERMES=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.363 retrieving revision 1.364 diff -u -r1.363 -r1.364 --- kernel.spec 4 Mar 2008 05:03:17 -0000 1.363 +++ kernel.spec 5 Mar 2008 01:41:44 -0000 1.364 @@ -659,6 +659,7 @@ Patch680: linux-2.6-wireless.patch Patch681: linux-2.6-wireless-pending.patch Patch682: linux-2.6-wireless-pending-fixups.patch +Patch683: linux-2.6-wireless-pending-too.patch Patch690: linux-2.6-at76.patch Patch691: linux-2.6-rndis_wlan.patch Patch700: linux-2.6-cfg80211-extras.patch @@ -1236,6 +1237,8 @@ # wireless patches staged for 2.6.26 ApplyPatch linux-2.6-wireless-pending.patch ApplyPatch linux-2.6-wireless-pending-fixups.patch +# temporary backport of some later wireless patches +ApplyPatch linux-2.6-wireless-pending-too.patch # Add misc wireless bits from upstream wireless tree ApplyPatch linux-2.6-at76.patch @@ -1918,6 +1921,18 @@ %changelog +* Tue Mar 04 2008 John W. Linville 2.6.24.3-18 +- libertas: fix sanity check on sequence number in command response +- p54: fix EEPROM structure endianness +- p54: fix eeprom parser length sanity checks +- rndis_wlan: fix broken data copy +- b43legacy: Fix module init message +- libertas: compare the current command with response +- rc80211-pid: fix rate adjustment +- ssb: Add pcibios_enable_device() return value check +- mac80211: always insert key into list (temporary backport) +- mac80211: fix hardware scan completion (temporary backport) + * Mon Mar 03 2008 Jarod Wilson 2.6.24.3-17 - firewire-sbp2: permit drives to suspend (#243210) - firewire: fix suspend/resume on older PowerPC Macs (#312871) linux-2.6-rndis_wlan.patch: Index: linux-2.6-rndis_wlan.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-rndis_wlan.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-rndis_wlan.patch 28 Feb 2008 03:18:34 -0000 1.3 +++ linux-2.6-rndis_wlan.patch 5 Mar 2008 01:41:44 -0000 1.4 @@ -1,3 +1,17 @@ +commit cdb2a9fe63575dd1eb82b724bbd0aa5e0dd89fa0 +Author: Jussi Kivilinna +Date: Tue Mar 4 20:05:27 2008 +0200 + + rndis_wlan: fix broken data copy + + Replace broken code that attempted to copy 6 byte array to 64-bit + integer. Due to missing cast to 64-bit integer, left shift operation + were 32-bit and lead to bytes been copied over each other. New code + uses simple memcpy, for greater readability and efficiency. + + Signed-off-by: Jussi Kivilinna + Signed-off-by: John W. Linville + commit 04d0a24457e249388ec3ee32b345617d1bc6ebf2 Author: Johannes Berg Date: Wed Feb 20 11:47:45 2008 +0100 @@ -243,8 +257,8 @@ Signed-off-by: David S. Miller diff -up /dev/null linux-2.6.24.noarch/include/linux/usb/usbnet.h ---- /dev/null 2008-02-27 08:31:30.805858387 -0500 -+++ linux-2.6.24.noarch/include/linux/usb/usbnet.h 2008-02-27 21:23:51.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/include/linux/usb/usbnet.h 2008-03-04 20:22:12.000000000 -0500 @@ -0,0 +1,214 @@ +/* + * USB Networking Link Interface @@ -461,8 +475,8 @@ + +#endif /* __USBNET_H */ diff -up /dev/null linux-2.6.24.noarch/include/linux/usb/rndis_host.h ---- /dev/null 2008-02-27 08:31:30.805858387 -0500 -+++ linux-2.6.24.noarch/include/linux/usb/rndis_host.h 2008-02-27 21:23:51.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/include/linux/usb/rndis_host.h 2008-03-04 20:22:12.000000000 -0500 @@ -0,0 +1,274 @@ +/* + * Host Side support for RNDIS Networking Links @@ -739,8 +753,8 @@ +#endif /* __RNDIS_HOST_H */ + diff -up linux-2.6.24.noarch/MAINTAINERS.orig linux-2.6.24.noarch/MAINTAINERS ---- linux-2.6.24.noarch/MAINTAINERS.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/MAINTAINERS 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/MAINTAINERS.orig 2008-03-04 20:21:04.000000000 -0500 ++++ linux-2.6.24.noarch/MAINTAINERS 2008-03-04 20:22:13.000000000 -0500 @@ -4067,6 +4067,12 @@ L: video4linux-list at redhat.com W: http://www.linux-projects.org S: Maintained @@ -755,8 +769,8 @@ P: Luca Risolia M: luca.risolia at studio.unibo.it diff -up linux-2.6.24.noarch/drivers/net/usb/rndis_host.c.orig linux-2.6.24.noarch/drivers/net/usb/rndis_host.c ---- linux-2.6.24.noarch/drivers/net/usb/rndis_host.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/rndis_host.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/rndis_host.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/rndis_host.c 2008-03-04 20:22:13.000000000 -0500 @@ -29,8 +29,8 @@ #include #include @@ -1197,8 +1211,8 @@ static const struct driver_info rndis_info = { diff -up linux-2.6.24.noarch/drivers/net/usb/usbnet.c.orig linux-2.6.24.noarch/drivers/net/usb/usbnet.c ---- linux-2.6.24.noarch/drivers/net/usb/usbnet.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/usbnet.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/usbnet.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/usbnet.c 2008-03-04 20:22:13.000000000 -0500 @@ -41,8 +41,7 @@ #include #include @@ -1220,8 +1234,8 @@ /* maybe the remote can't receive an Ethernet MTU */ if (net->mtu > (dev->hard_mtu - net->hard_header_len)) diff -up linux-2.6.24.noarch/drivers/net/usb/plusb.c.orig linux-2.6.24.noarch/drivers/net/usb/plusb.c ---- linux-2.6.24.noarch/drivers/net/usb/plusb.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/plusb.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/plusb.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/plusb.c 2008-03-04 20:22:13.000000000 -0500 @@ -28,8 +28,7 @@ #include #include @@ -1233,8 +1247,8 @@ /* diff -up linux-2.6.24.noarch/drivers/net/usb/gl620a.c.orig linux-2.6.24.noarch/drivers/net/usb/gl620a.c ---- linux-2.6.24.noarch/drivers/net/usb/gl620a.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/gl620a.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/gl620a.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/gl620a.c 2008-03-04 20:22:13.000000000 -0500 @@ -29,8 +29,7 @@ #include #include @@ -1246,8 +1260,8 @@ /* diff -up linux-2.6.24.noarch/drivers/net/usb/usbnet.h.orig linux-2.6.24.noarch/drivers/net/usb/usbnet.h ---- linux-2.6.24.noarch/drivers/net/usb/usbnet.h.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/usbnet.h 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/usbnet.h.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/usbnet.h 2008-03-04 20:22:13.000000000 -0500 @@ -1,202 +0,0 @@ -/* - * USB Networking Link Interface @@ -1452,8 +1466,8 @@ - -#endif /* __USBNET_H */ diff -up linux-2.6.24.noarch/drivers/net/usb/zaurus.c.orig linux-2.6.24.noarch/drivers/net/usb/zaurus.c ---- linux-2.6.24.noarch/drivers/net/usb/zaurus.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/zaurus.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/zaurus.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/zaurus.c 2008-03-04 20:22:13.000000000 -0500 @@ -29,8 +29,7 @@ #include #include @@ -1465,8 +1479,8 @@ /* diff -up linux-2.6.24.noarch/drivers/net/usb/net1080.c.orig linux-2.6.24.noarch/drivers/net/usb/net1080.c ---- linux-2.6.24.noarch/drivers/net/usb/net1080.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/net1080.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/net1080.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/net1080.c 2008-03-04 20:22:13.000000000 -0500 @@ -28,11 +28,10 @@ #include #include @@ -1481,8 +1495,8 @@ /* * Netchip 1080 driver ... http://www.netchip.com diff -up linux-2.6.24.noarch/drivers/net/usb/asix.c.orig linux-2.6.24.noarch/drivers/net/usb/asix.c ---- linux-2.6.24.noarch/drivers/net/usb/asix.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/asix.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/asix.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/asix.c 2008-03-04 20:22:13.000000000 -0500 @@ -33,8 +33,7 @@ #include #include @@ -1494,8 +1508,8 @@ #define DRIVER_VERSION "14-Jun-2006" static const char driver_name [] = "asix"; diff -up linux-2.6.24.noarch/drivers/net/usb/mcs7830.c.orig linux-2.6.24.noarch/drivers/net/usb/mcs7830.c ---- linux-2.6.24.noarch/drivers/net/usb/mcs7830.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/mcs7830.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/mcs7830.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/mcs7830.c 2008-03-04 20:22:13.000000000 -0500 @@ -31,8 +31,7 @@ #include #include @@ -1507,8 +1521,8 @@ /* requests */ #define MCS7830_RD_BMREQ (USB_DIR_IN | USB_TYPE_VENDOR | \ diff -up linux-2.6.24.noarch/drivers/net/usb/cdc_subset.c.orig linux-2.6.24.noarch/drivers/net/usb/cdc_subset.c ---- linux-2.6.24.noarch/drivers/net/usb/cdc_subset.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/cdc_subset.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/cdc_subset.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/cdc_subset.c 2008-03-04 20:22:13.000000000 -0500 @@ -26,8 +26,7 @@ #include #include @@ -1520,8 +1534,8 @@ /* diff -up linux-2.6.24.noarch/drivers/net/usb/cdc_ether.c.orig linux-2.6.24.noarch/drivers/net/usb/cdc_ether.c ---- linux-2.6.24.noarch/drivers/net/usb/cdc_ether.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/cdc_ether.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/cdc_ether.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/cdc_ether.c 2008-03-04 20:22:13.000000000 -0500 @@ -31,8 +31,7 @@ #include #include @@ -1562,8 +1576,8 @@ * * Communications Device Class, Ethernet Control model diff -up linux-2.6.24.noarch/drivers/net/usb/dm9601.c.orig linux-2.6.24.noarch/drivers/net/usb/dm9601.c ---- linux-2.6.24.noarch/drivers/net/usb/dm9601.c.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/usb/dm9601.c 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/usb/dm9601.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/usb/dm9601.c 2008-03-04 20:22:13.000000000 -0500 @@ -20,8 +20,7 @@ #include #include @@ -1575,8 +1589,8 @@ /* datasheet: http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-P01-930914.pdf diff -up linux-2.6.24.noarch/drivers/net/wireless/Makefile.orig linux-2.6.24.noarch/drivers/net/wireless/Makefile ---- linux-2.6.24.noarch/drivers/net/wireless/Makefile.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/Makefile 2008-02-27 21:23:51.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/Makefile.orig 2008-03-04 20:21:04.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/Makefile 2008-03-04 20:22:13.000000000 -0500 @@ -46,6 +46,8 @@ obj-$(CONFIG_ZD1211RW) += zd1211rw/ obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o @@ -1587,9 +1601,9 @@ obj-$(CONFIG_LIBERTAS) += libertas/ diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c ---- /dev/null 2008-02-27 08:31:30.805858387 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c 2008-02-27 21:24:21.000000000 -0500 -@@ -0,0 +1,2753 @@ +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c 2008-03-04 20:22:53.000000000 -0500 +@@ -0,0 +1,2751 @@ +/* + * Driver for RNDIS based wireless USB devices. + * @@ -1852,7 +1866,7 @@ + __le32 KeyLength; + u8 Bssid[6]; + u8 Padding[6]; -+ __le64 KeyRSC; ++ u8 KeyRSC[8]; + u8 KeyMaterial[32]; +} __attribute__((packed)); + @@ -3100,7 +3114,7 @@ + struct usbnet *usbdev = dev->priv; + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev); + struct NDIS_802_11_KEY ndis_key; -+ int i, keyidx, ret; ++ int keyidx, ret; + u8 *addr; + + keyidx = wrqu->encoding.flags & IW_ENCODE_INDEX; @@ -3135,9 +3149,7 @@ + ndis_key.KeyIndex = cpu_to_le32(keyidx); + + if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) { -+ for (i = 0; i < 6; i++) -+ ndis_key.KeyRSC |= -+ cpu_to_le64(ext->rx_seq[i] << (i * 8)); ++ memcpy(ndis_key.KeyRSC, ext->rx_seq, 6); + ndis_key.KeyIndex |= cpu_to_le32(1 << 29); + } + @@ -4344,9 +4356,9 @@ +MODULE_LICENSE("GPL"); + diff -up linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig 2008-02-27 21:23:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/Kconfig 2008-02-27 21:23:51.000000000 -0500 -@@ -553,6 +553,34 @@ config USB_ZD1201 +--- linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig 2008-03-04 20:21:04.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/Kconfig 2008-03-04 20:22:13.000000000 -0500 +@@ -559,6 +559,34 @@ config USB_ZD1201 To compile this driver as a module, choose M here: the module will be called zd1201. linux-2.6-wireless-pending.patch: Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending.patch,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- linux-2.6-wireless-pending.patch 3 Mar 2008 22:36:06 -0000 1.30 +++ linux-2.6-wireless-pending.patch 5 Mar 2008 01:41:44 -0000 1.31 @@ -2315,8 +2315,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.24.noarch/include/linux/nl80211.h.orig linux-2.6.24.noarch/include/linux/nl80211.h ---- linux-2.6.24.noarch/include/linux/nl80211.h.orig 2008-03-03 16:42:49.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/nl80211.h 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/nl80211.h.orig 2008-03-04 19:28:34.000000000 -0500 ++++ linux-2.6.24.noarch/include/linux/nl80211.h 2008-03-04 19:35:31.000000000 -0500 @@ -161,6 +161,12 @@ enum nl80211_commands { * given for %NL80211_CMD_GET_STATION, nested attribute containing * info as possible, see &enum nl80211_sta_stats. @@ -2436,8 +2436,8 @@ + #endif /* __LINUX_NL80211_H */ diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig 2008-03-03 16:42:49.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig 2008-03-04 19:28:34.000000000 -0500 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-03-04 19:35:31.000000000 -0500 @@ -390,6 +390,10 @@ extern void ssb_chipco_set_clockmode(str extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks); @@ -2450,8 +2450,8 @@ u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask); u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value); diff -up linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig 2008-03-03 16:42:49.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb.h 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig 2008-03-04 19:28:34.000000000 -0500 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb.h 2008-03-04 19:35:31.000000000 -0500 @@ -72,8 +72,10 @@ struct ssb_device; /* Lowlevel read/write operations on the device MMIO. * Internal, don't use that outside of ssb. */ @@ -2487,7 +2487,7 @@ dev->ops->write16(dev, offset, value); diff -up linux-2.6.24.noarch/include/net/wireless.h.orig linux-2.6.24.noarch/include/net/wireless.h --- linux-2.6.24.noarch/include/net/wireless.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/net/wireless.h 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/include/net/wireless.h 2008-03-04 19:35:31.000000000 -0500 @@ -13,6 +13,162 @@ #include @@ -2676,8 +2676,8 @@ + #endif /* __NET_WIRELESS_H */ diff -up linux-2.6.24.noarch/include/net/cfg80211.h.orig linux-2.6.24.noarch/include/net/cfg80211.h ---- linux-2.6.24.noarch/include/net/cfg80211.h.orig 2008-03-03 16:42:49.000000000 -0500 -+++ linux-2.6.24.noarch/include/net/cfg80211.h 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/include/net/cfg80211.h.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/include/net/cfg80211.h 2008-03-04 19:35:31.000000000 -0500 @@ -163,6 +163,26 @@ struct station_stats { u32 tx_bytes; }; @@ -2719,8 +2719,8 @@ int (*add_key)(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, u8 *mac_addr, diff -up linux-2.6.24.noarch/include/net/mac80211.h.orig linux-2.6.24.noarch/include/net/mac80211.h ---- linux-2.6.24.noarch/include/net/mac80211.h.orig 2008-03-03 16:42:49.000000000 -0500 -+++ linux-2.6.24.noarch/include/net/mac80211.h 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/include/net/mac80211.h.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/include/net/mac80211.h 2008-03-04 19:35:31.000000000 -0500 @@ -38,7 +38,11 @@ * called in hardware interrupt context. The low-level driver must not call any * other functions in hardware interrupt context. If there is a need for such @@ -3384,7 +3384,7 @@ #endif /* MAC80211_H */ diff -up linux-2.6.24.noarch/net/mac80211/wme.h.orig linux-2.6.24.noarch/net/mac80211/wme.h --- linux-2.6.24.noarch/net/mac80211/wme.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wme.h 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wme.h 2008-03-04 19:35:31.000000000 -0500 @@ -24,6 +24,8 @@ #define QOS_CONTROL_TAG1D_MASK 0x07 @@ -3431,7 +3431,7 @@ return 0; diff -up linux-2.6.24.noarch/net/mac80211/wep.h.orig linux-2.6.24.noarch/net/mac80211/wep.h --- linux-2.6.24.noarch/net/mac80211/wep.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wep.h 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wep.h 2008-03-04 19:35:31.000000000 -0500 @@ -28,9 +28,9 @@ int ieee80211_wep_decrypt(struct ieee802 struct ieee80211_key *key); u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key); @@ -3445,8 +3445,8 @@ #endif /* WEP_H */ diff -up linux-2.6.24.noarch/net/mac80211/rx.c.orig linux-2.6.24.noarch/net/mac80211/rx.c ---- linux-2.6.24.noarch/net/mac80211/rx.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/rx.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/rx.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/rx.c 2008-03-04 19:35:31.000000000 -0500 @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ @@ -4615,8 +4615,8 @@ rcu_read_unlock(); } diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_iface.c 2008-03-04 19:35:31.000000000 -0500 @@ -118,6 +118,8 @@ void ieee80211_if_set_type(struct net_de sdata->bss = NULL; sdata->vif.type = type; @@ -4656,8 +4656,8 @@ while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) { local->total_ps_buffered--; diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_ioctl.c 2008-03-04 19:35:31.000000000 -0500 @@ -33,8 +33,8 @@ static int ieee80211_set_encryption(stru size_t key_len) { @@ -5022,7 +5022,7 @@ if (local->hw.conf.power_level != new_power_level) { diff -up linux-2.6.24.noarch/net/mac80211/debugfs_sta.c.orig linux-2.6.24.noarch/net/mac80211/debugfs_sta.c --- linux-2.6.24.noarch/net/mac80211/debugfs_sta.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/debugfs_sta.c 2008-03-03 16:47:32.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/debugfs_sta.c 2008-03-04 19:35:31.000000000 -0500 @@ -33,25 +33,16 @@ static ssize_t sta_ ##name## _read(struc #define STA_READ_LU(name, field) STA_READ(name, 20, field, "%lu\n") #define STA_READ_S(name, field) STA_READ(name, 20, field, "%s\n") @@ -5272,8 +5272,8 @@ debugfs_remove(sta->debugfs.dir); sta->debugfs.dir = NULL; diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_rate.c 2008-03-04 19:35:31.000000000 -0500 @@ -163,7 +163,8 @@ static void rate_control_release(struct } @@ -5309,8 +5309,8 @@ } } diff -up linux-2.6.24.noarch/net/mac80211/Makefile.orig linux-2.6.24.noarch/net/mac80211/Makefile ---- linux-2.6.24.noarch/net/mac80211/Makefile.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/Makefile 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/Makefile.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/Makefile 2008-03-04 19:35:31.000000000 -0500 @@ -19,7 +19,6 @@ mac80211-y := \ ieee80211_iface.o \ ieee80211_rate.o \ @@ -5321,7 +5321,7 @@ cfg.o \ diff -up linux-2.6.24.noarch/net/mac80211/regdomain.c.orig linux-2.6.24.noarch/net/mac80211/regdomain.c --- linux-2.6.24.noarch/net/mac80211/regdomain.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/regdomain.c 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/regdomain.c 2008-03-04 19:35:31.000000000 -0500 @@ -1,152 +0,0 @@ -/* - * Copyright 2002-2005, Instant802 Networks, Inc. @@ -5476,134 +5476,72 @@ -} - diff -up linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c ---- linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c 2008-03-03 16:47:32.000000000 -0500 -@@ -2,7 +2,7 @@ - * Copyright 2002-2005, Instant802 Networks, Inc. - * Copyright 2005, Devicescape Software, Inc. - * Copyright 2007, Mattias Nissler -- * Copyright 2007, Stefano Brivio -+ * Copyright 2007-2008, Stefano Brivio - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as -@@ -64,71 +64,66 @@ +--- linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-03-04 19:32:48.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c 2008-03-04 19:37:37.000000000 -0500 +@@ -63,6 +63,7 @@ + * RC_PID_ARITH_SHIFT. */ - --/* Shift the adjustment so that we won't switch to a lower rate if it exhibited -- * a worse failed frames behaviour and we'll choose the highest rate whose -- * failed frames behaviour is not worse than the one of the original rate -- * target. While at it, check that the adjustment is within the ranges. Then, -- * provide the new rate index. */ --static int rate_control_pid_shift_adjust(struct rc_pid_rateinfo *r, -- int adj, int cur, int l) --{ -- int i, j, k, tmp; -- -- j = r[cur].rev_index; -- i = j + adj; -- -- if (i < 0) -- return r[0].index; -- if (i >= l - 1) -- return r[l - 1].index; -- -- tmp = i; -- -- if (adj < 0) { -- for (k = j; k >= i; k--) -- if (r[k].diff <= r[j].diff) -- tmp = k; -- } else { -- for (k = i + 1; k + i < l; k++) -- if (r[k].diff <= r[i].diff) -- tmp = k; -- } -- -- return r[tmp].index; --} -- -+/* Adjust the rate while ensuring that we won't switch to a lower rate if it -+ * exhibited a worse failed frames behaviour and we'll choose the highest rate -+ * whose failed frames behaviour is not worse than the one of the original rate -+ * target. While at it, check that the new rate is valid. */ - static void rate_control_pid_adjust_rate(struct ieee80211_local *local, - struct sta_info *sta, int adj, ++ + /* Adjust the rate while ensuring that we won't switch to a lower rate if it + * exhibited a worse failed frames behaviour and we'll choose the highest rate + * whose failed frames behaviour is not worse than the one of the original rate +@@ -72,14 +73,14 @@ static void rate_control_pid_adjust_rate struct rc_pid_rateinfo *rinfo) { struct ieee80211_sub_if_data *sdata; - struct ieee80211_hw_mode *mode; -- int newidx; -- int maxrate; -- int back = (adj > 0) ? 1 : -1; +- int cur_sorted, new_sorted, probe, tmp, n_bitrates; +- int cur = sta->txrate; + struct ieee80211_supported_band *sband; + int cur_sorted, new_sorted, probe, tmp, n_bitrates, band; + int cur = sta->txrate_idx; sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); +- +- mode = local->oper_hw_mode; +- n_bitrates = mode->num_rates; + sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; + band = sband->band; + n_bitrates = sband->n_bitrates; -+ -+ /* Map passed arguments to sorted values. */ -+ cur_sorted = rinfo[cur].rev_index; -+ new_sorted = cur_sorted + adj; -+ -+ /* Check limits. */ -+ if (new_sorted < 0) -+ new_sorted = rinfo[0].rev_index; -+ else if (new_sorted >= n_bitrates) -+ new_sorted = rinfo[n_bitrates - 1].rev_index; - -- mode = local->oper_hw_mode; -- maxrate = sdata->bss ? sdata->bss->max_ratectrl_rateidx : -1; -+ tmp = new_sorted; -- newidx = rate_control_pid_shift_adjust(rinfo, adj, sta->txrate, -- mode->num_rates); -+ if (adj < 0) { -+ /* Ensure that the rate decrease isn't disadvantageous. */ -+ for (probe = cur_sorted; probe >= new_sorted; probe--) -+ if (rinfo[probe].diff <= rinfo[cur_sorted].diff && + /* Map passed arguments to sorted values. */ + cur_sorted = rinfo[cur].rev_index; +@@ -97,20 +98,20 @@ static void rate_control_pid_adjust_rate + /* Ensure that the rate decrease isn't disadvantageous. */ + for (probe = cur_sorted; probe >= new_sorted; probe--) + if (rinfo[probe].diff <= rinfo[cur_sorted].diff && +- rate_supported(sta, mode, rinfo[probe].index)) + rate_supported(sta, band, rinfo[probe].index)) -+ tmp = probe; -+ } else { -+ /* Look for rate increase with zero (or below) cost. */ -+ for (probe = new_sorted + 1; probe < n_bitrates; probe++) -+ if (rinfo[probe].diff <= rinfo[new_sorted].diff && + tmp = probe; + } else { + /* Look for rate increase with zero (or below) cost. */ + for (probe = new_sorted + 1; probe < n_bitrates; probe++) + if (rinfo[probe].diff <= rinfo[new_sorted].diff && +- rate_supported(sta, mode, rinfo[probe].index)) + rate_supported(sta, band, rinfo[probe].index)) -+ tmp = probe; -+ } + tmp = probe; + } -- while (newidx != sta->txrate) { -- if (rate_supported(sta, mode, newidx) && -- (maxrate < 0 || newidx <= maxrate)) { -- sta->txrate = newidx; -+ /* Fit the rate found to the nearest supported rate. */ -+ do { + /* Fit the rate found to the nearest supported rate. */ + do { +- if (rate_supported(sta, mode, rinfo[tmp].index)) { +- sta->txrate = rinfo[tmp].index; + if (rate_supported(sta, band, rinfo[tmp].index)) { + sta->txrate_idx = rinfo[tmp].index; break; } -- -- newidx += back; -- } -+ if (adj < 0) -+ tmp--; -+ else -+ tmp++; -+ } while (tmp < n_bitrates && tmp >= 0); - + if (adj < 0) +@@ -122,7 +123,7 @@ static void rate_control_pid_adjust_rate #ifdef CONFIG_MAC80211_DEBUGFS rate_control_pid_event_rate_change( &((struct rc_pid_sta_info *)sta->rate_ctrl_priv)->events, -- newidx, mode->rates[newidx].rate); +- cur, mode->rates[cur].rate); + sta->txrate_idx, sband->bitrates[sta->txrate_idx].bitrate); #endif } -@@ -155,7 +150,7 @@ static void rate_control_pid_sample(stru +@@ -149,7 +150,7 @@ static void rate_control_pid_sample(stru { struct rc_pid_sta_info *spinfo = sta->rate_ctrl_priv; struct rc_pid_rateinfo *rinfo = pinfo->rinfo; @@ -5612,7 +5550,7 @@ u32 pf; s32 err_avg; u32 err_prop; -@@ -164,7 +159,7 @@ static void rate_control_pid_sample(stru +@@ -158,7 +159,7 @@ static void rate_control_pid_sample(stru int adj, i, j, tmp; unsigned long period; @@ -5621,7 +5559,7 @@ spinfo = sta->rate_ctrl_priv; /* In case nothing happened during the previous control interval, turn -@@ -190,18 +185,18 @@ static void rate_control_pid_sample(stru +@@ -184,18 +185,18 @@ static void rate_control_pid_sample(stru spinfo->tx_num_failed = 0; /* If we just switched rate, update the rate behaviour info. */ @@ -5644,7 +5582,7 @@ /* Compute the proportional, integral and derivative errors. */ err_prop = (pinfo->target << RC_PID_ARITH_SHIFT) - pf; -@@ -242,8 +237,10 @@ static void rate_control_pid_tx_status(v +@@ -236,8 +237,10 @@ static void rate_control_pid_tx_status(v struct sta_info *sta; struct rc_pid_sta_info *spinfo; unsigned long period; @@ -5655,7 +5593,7 @@ if (!sta) return; -@@ -251,13 +248,13 @@ static void rate_control_pid_tx_status(v +@@ -245,13 +248,13 @@ static void rate_control_pid_tx_status(v /* Don't update the state if we're not controlling the rate. */ sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); if (sdata->bss && sdata->bss->force_unicast_rateidx > -1) { @@ -5671,7 +5609,7 @@ goto ignore; spinfo = sta->rate_ctrl_priv; -@@ -283,9 +280,6 @@ static void rate_control_pid_tx_status(v +@@ -277,9 +280,6 @@ static void rate_control_pid_tx_status(v sta->tx_num_consecutive_failures++; sta->tx_num_mpdu_fail++; } else { @@ -5681,7 +5619,7 @@ sta->tx_num_consecutive_failures = 0; sta->tx_num_mpdu_ok++; } -@@ -304,7 +298,7 @@ ignore: +@@ -298,7 +298,7 @@ ignore: } static void rate_control_pid_get_rate(void *priv, struct net_device *dev, @@ -5690,7 +5628,7 @@ struct sk_buff *skb, struct rate_selection *sel) { -@@ -322,7 +316,7 @@ static void rate_control_pid_get_rate(vo +@@ -316,7 +316,7 @@ static void rate_control_pid_get_rate(vo fc = le16_to_cpu(hdr->frame_control); if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA || is_multicast_ether_addr(hdr->addr1) || !sta) { @@ -5699,7 +5637,7 @@ if (sta) sta_info_put(sta); return; -@@ -331,23 +325,23 @@ static void rate_control_pid_get_rate(vo +@@ -325,23 +325,23 @@ static void rate_control_pid_get_rate(vo /* If a forced rate is in effect, select it. */ sdata = IEEE80211_DEV_TO_SUB_IF(dev); if (sdata->bss && sdata->bss->force_unicast_rateidx > -1) @@ -5730,7 +5668,7 @@ #endif } -@@ -359,28 +353,32 @@ static void rate_control_pid_rate_init(v +@@ -353,28 +353,32 @@ static void rate_control_pid_rate_init(v * as we need to have IEEE 802.1X auth succeed immediately after assoc.. * Until that method is implemented, we will use the lowest supported * rate as a workaround. */ @@ -5768,7 +5706,7 @@ if (!rinfo) { kfree(pinfo); return NULL; -@@ -389,7 +387,7 @@ static void *rate_control_pid_alloc(stru +@@ -383,7 +387,7 @@ static void *rate_control_pid_alloc(stru /* Sort the rates. This is optimized for the most common case (i.e. * almost-sorted CCK+OFDM rates). Kind of bubble-sort with reversed * mapping too. */ @@ -5777,7 +5715,7 @@ rinfo[i].index = i; rinfo[i].rev_index = i; if (pinfo->fast_start) -@@ -397,11 +395,11 @@ static void *rate_control_pid_alloc(stru +@@ -391,11 +395,11 @@ static void *rate_control_pid_alloc(stru else rinfo[i].diff = i * pinfo->norm_offset; } @@ -5795,7 +5733,7 @@ rinfo[j + 1].index = tmp; diff -up linux-2.6.24.noarch/net/mac80211/debugfs.c.orig linux-2.6.24.noarch/net/mac80211/debugfs.c --- linux-2.6.24.noarch/net/mac80211/debugfs.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/debugfs.c 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/debugfs.c 2008-03-04 19:35:35.000000000 -0500 @@ -19,41 +19,6 @@ int mac80211_open_file_generic(struct in return 0; } @@ -5896,8 +5834,8 @@ DEBUGFS_STATS_DEL(transmitted_fragment_count); DEBUGFS_STATS_DEL(multicast_transmitted_frame_count); diff -up linux-2.6.24.noarch/net/mac80211/key.c.orig linux-2.6.24.noarch/net/mac80211/key.c ---- linux-2.6.24.noarch/net/mac80211/key.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/key.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/key.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/key.c 2008-03-04 19:35:35.000000000 -0500 @@ -13,6 +13,7 @@ #include #include @@ -6169,8 +6107,8 @@ ieee80211_key_disable_hw_accel(key); } diff -up linux-2.6.24.noarch/net/mac80211/ieee80211.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211.c 2008-03-04 19:35:35.000000000 -0500 @@ -67,9 +67,19 @@ static void ieee80211_configure_filter(s new_flags |= FIF_ALLMULTI; @@ -7245,8 +7183,8 @@ return 0; diff -up linux-2.6.24.noarch/net/mac80211/wme.c.orig linux-2.6.24.noarch/net/mac80211/wme.c ---- linux-2.6.24.noarch/net/mac80211/wme.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wme.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/wme.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wme.c 2008-03-04 19:35:35.000000000 -0500 @@ -19,10 +19,13 @@ #include "wme.h" @@ -7447,7 +7385,7 @@ +} diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_key.h.orig linux-2.6.24.noarch/net/mac80211/ieee80211_key.h --- linux-2.6.24.noarch/net/mac80211/ieee80211_key.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_key.h 2008-03-03 16:47:32.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_key.h 2008-03-04 19:35:35.000000000 -0500 @@ -13,6 +13,7 @@ #include #include @@ -7499,8 +7437,8 @@ void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx); void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata); diff -up linux-2.6.24.noarch/net/mac80211/rc80211_simple.c.orig linux-2.6.24.noarch/net/mac80211/rc80211_simple.c ---- linux-2.6.24.noarch/net/mac80211/rc80211_simple.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/rc80211_simple.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/rc80211_simple.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/rc80211_simple.c 2008-03-04 19:35:35.000000000 -0500 @@ -7,6 +7,7 @@ * published by the Free Software Foundation. */ @@ -7676,8 +7614,8 @@ diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h.orig linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h ---- linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_rate.h 2008-03-04 19:35:35.000000000 -0500 @@ -18,6 +18,7 @@ #include "ieee80211_i.h" #include "sta_info.h" @@ -7753,8 +7691,8 @@ diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_i.h.orig linux-2.6.24.noarch/net/mac80211/ieee80211_i.h ---- linux-2.6.24.noarch/net/mac80211/ieee80211_i.h.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_i.h 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_i.h.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_i.h 2008-03-04 19:35:35.000000000 -0500 @@ -79,8 +79,7 @@ struct ieee80211_sta_bss { u8 ssid[IEEE80211_MAX_SSID_LEN]; size_t ssid_len; @@ -8161,8 +8099,8 @@ void ieee80211_tx_pending(unsigned long data); int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev); diff -up linux-2.6.24.noarch/net/mac80211/cfg.c.orig linux-2.6.24.noarch/net/mac80211/cfg.c ---- linux-2.6.24.noarch/net/mac80211/cfg.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/cfg.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/cfg.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/cfg.c 2008-03-04 19:35:35.000000000 -0500 @@ -34,10 +34,13 @@ nl80211_type_to_mac80211_type(enum nl802 } @@ -8337,8 +8275,8 @@ sta->dev = sdata->dev; if (sdata->vif.type == IEEE80211_IF_TYPE_VLAN || diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-03-04 19:35:35.000000000 -0500 @@ -74,7 +74,7 @@ static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst, u8 *ssid, size_t ssid_len); @@ -9882,8 +9820,8 @@ rate_control_rate_init(sta, local); diff -up linux-2.6.24.noarch/net/mac80211/sta_info.h.orig linux-2.6.24.noarch/net/mac80211/sta_info.h ---- linux-2.6.24.noarch/net/mac80211/sta_info.h.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/sta_info.h 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/sta_info.h.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/sta_info.h 2008-03-04 19:35:35.000000000 -0500 @@ -15,31 +15,72 @@ #include #include "ieee80211_key.h" @@ -10078,8 +10016,8 @@ + #endif /* STA_INFO_H */ diff -up linux-2.6.24.noarch/net/mac80211/tx.c.orig linux-2.6.24.noarch/net/mac80211/tx.c ---- linux-2.6.24.noarch/net/mac80211/tx.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/tx.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/tx.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/tx.c 2008-03-04 19:35:35.000000000 -0500 @@ -92,9 +92,13 @@ static u16 ieee80211_duration(struct iee int rate, mrate, erp, dur, i; struct ieee80211_rate *txrate = tx->u.tx.rate; @@ -10948,8 +10886,8 @@ skb = NULL; } diff -up linux-2.6.24.noarch/net/mac80211/sta_info.c.orig linux-2.6.24.noarch/net/mac80211/sta_info.c ---- linux-2.6.24.noarch/net/mac80211/sta_info.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/sta_info.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/sta_info.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/sta_info.c 2008-03-04 19:35:35.000000000 -0500 @@ -55,48 +55,34 @@ static int sta_info_hash_del(struct ieee return -ENOENT; } @@ -11243,8 +11181,8 @@ * sta_info_flush - flush matching STA entries from the STA table * @local: local interface data diff -up linux-2.6.24.noarch/net/mac80211/wep.c.orig linux-2.6.24.noarch/net/mac80211/wep.c ---- linux-2.6.24.noarch/net/mac80211/wep.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wep.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/wep.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wep.c 2008-03-04 19:35:35.000000000 -0500 @@ -305,13 +305,13 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_ return NULL; } @@ -11312,7 +11250,7 @@ } diff -up linux-2.6.24.noarch/net/mac80211/wpa.h.orig linux-2.6.24.noarch/net/mac80211/wpa.h --- linux-2.6.24.noarch/net/mac80211/wpa.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wpa.h 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wpa.h 2008-03-04 19:35:35.000000000 -0500 @@ -13,19 +13,19 @@ #include #include "ieee80211_i.h" @@ -11340,8 +11278,8 @@ #endif /* WPA_H */ diff -up linux-2.6.24.noarch/net/mac80211/util.c.orig linux-2.6.24.noarch/net/mac80211/util.c ---- linux-2.6.24.noarch/net/mac80211/util.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/util.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/util.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/util.c 2008-03-04 19:35:35.000000000 -0500 @@ -41,92 +41,6 @@ const unsigned char bridge_tunnel_header { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; @@ -11544,8 +11482,8 @@ { struct ieee80211_local *local = hw_to_local(hw); diff -up linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c.orig linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c ---- linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/debugfs_netdev.c 2008-03-04 19:35:35.000000000 -0500 @@ -91,7 +91,6 @@ static const struct file_operations name /* common attributes */ IEEE80211_IF_FILE(channel_use, channel_use, DEC); @@ -11619,8 +11557,8 @@ static void del_monitor_files(struct ieee80211_sub_if_data *sdata) diff -up linux-2.6.24.noarch/net/mac80211/wpa.c.orig linux-2.6.24.noarch/net/mac80211/wpa.c ---- linux-2.6.24.noarch/net/mac80211/wpa.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/wpa.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/mac80211/wpa.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/wpa.c 2008-03-04 19:35:35.000000000 -0500 @@ -70,7 +70,7 @@ static int ieee80211_get_hdr_info(const } @@ -11887,8 +11825,8 @@ + return RX_CONTINUE; } diff -up linux-2.6.24.noarch/net/wireless/nl80211.c.orig linux-2.6.24.noarch/net/wireless/nl80211.c ---- linux-2.6.24.noarch/net/wireless/nl80211.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/wireless/nl80211.c 2008-03-03 16:46:19.000000000 -0500 +--- linux-2.6.24.noarch/net/wireless/nl80211.c.orig 2008-03-04 19:28:36.000000000 -0500 ++++ linux-2.6.24.noarch/net/wireless/nl80211.c 2008-03-04 19:35:35.000000000 -0500 @@ -82,6 +82,7 @@ static struct nla_policy nl80211_policy[ [NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY, .len = NL80211_MAX_SUPP_RATES }, @@ -12065,7 +12003,7 @@ unlock: diff -up linux-2.6.24.noarch/net/wireless/Makefile.orig linux-2.6.24.noarch/net/wireless/Makefile --- linux-2.6.24.noarch/net/wireless/Makefile.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/wireless/Makefile 2008-03-03 16:46:19.000000000 -0500 ++++ linux-2.6.24.noarch/net/wireless/Makefile 2008-03-04 19:35:35.000000000 -0500 @@ -1,5 +1,5 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o obj-$(CONFIG_CFG80211) += cfg80211.o @@ -12074,8 +12012,8 @@ +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o cfg80211-$(CONFIG_NL80211) += nl80211.o diff -up /dev/null linux-2.6.24.noarch/net/wireless/reg.c ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/net/wireless/reg.c 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/net/wireless/reg.c 2008-03-04 19:35:35.000000000 -0500 @@ -0,0 +1,159 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -12238,7 +12176,7 @@ +} diff -up linux-2.6.24.noarch/net/wireless/core.h.orig linux-2.6.24.noarch/net/wireless/core.h --- linux-2.6.24.noarch/net/wireless/core.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/wireless/core.h 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/net/wireless/core.h 2008-03-04 19:35:35.000000000 -0500 @@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv, char *newname); @@ -12248,8 +12186,8 @@ + #endif /* __NET_WIRELESS_CORE_H */ diff -up linux-2.6.24.noarch/net/wireless/core.c.orig linux-2.6.24.noarch/net/wireless/core.c ---- linux-2.6.24.noarch/net/wireless/core.c.orig 2008-03-03 16:42:50.000000000 -0500 -+++ linux-2.6.24.noarch/net/wireless/core.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/net/wireless/core.c.orig 2008-03-04 19:28:36.000000000 -0500 ++++ linux-2.6.24.noarch/net/wireless/core.c 2008-03-04 19:35:35.000000000 -0500 @@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy) { struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy); @@ -12299,8 +12237,8 @@ mutex_lock(&cfg80211_drv_mutex); diff -up /dev/null linux-2.6.24.noarch/net/wireless/util.c ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/net/wireless/util.c 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/net/wireless/util.c 2008-03-04 19:35:35.000000000 -0500 @@ -0,0 +1,98 @@ +/* + * Wireless utility functions @@ -12401,8 +12339,8 @@ + set_mandatory_flags_band(wiphy->bands[band], band); +} diff -up linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig linux-2.6.24.noarch/drivers/net/wireless/p54common.h ---- linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/p54common.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig 2008-03-04 19:32:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54common.h 2008-03-04 19:35:36.000000000 -0500 @@ -251,79 +251,4 @@ struct p54_tx_control_vdcf { __le16 frameburst; } __attribute__ ((packed)); @@ -12484,8 +12422,8 @@ - #endif /* PRISM54COMMON_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig linux-2.6.24.noarch/drivers/net/wireless/p54common.c ---- linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/p54common.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig 2008-03-04 19:32:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54common.c 2008-03-04 19:35:36.000000000 -0500 @@ -27,6 +27,46 @@ MODULE_DESCRIPTION("Softmac Prism54 comm MODULE_LICENSE("GPL"); MODULE_ALIAS("prism54common"); @@ -12533,9 +12471,9 @@ void p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw) { struct p54_common *priv = dev->priv; -@@ -251,6 +291,10 @@ int p54_parse_eeprom(struct ieee80211_hw - case PDR_END: - i = len; +@@ -257,6 +297,10 @@ int p54_parse_eeprom(struct ieee80211_hw + /* make it overrun */ + entry_len = len; break; + default: + printk(KERN_INFO "p54: unknown eeprom code : 0x%x\n", @@ -12544,7 +12482,7 @@ } entry = (void *)entry + (entry_len + 1)*2; -@@ -308,10 +352,10 @@ static void p54_rx_data(struct ieee80211 +@@ -312,10 +356,10 @@ static void p54_rx_data(struct ieee80211 u16 freq = le16_to_cpu(hdr->freq); rx_status.ssi = hdr->rssi; @@ -12558,7 +12496,7 @@ rx_status.antenna = hdr->antenna; rx_status.mactime = le64_to_cpu(hdr->timestamp); rx_status.flag |= RX_FLAG_TSFT; -@@ -349,7 +393,7 @@ static void p54_rx_frame_sent(struct iee +@@ -353,7 +397,7 @@ static void p54_rx_frame_sent(struct iee while (entry != (struct sk_buff *)&priv->tx_queue) { range = (struct memrecord *)&entry->cb; if (range->start_addr == addr) { @@ -12567,7 +12505,7 @@ struct p54_control_hdr *entry_hdr; struct p54_tx_control_allocdata *entry_data; int pad = 0; -@@ -365,6 +409,7 @@ static void p54_rx_frame_sent(struct iee +@@ -369,6 +413,7 @@ static void p54_rx_frame_sent(struct iee kfree_skb(entry); break; } @@ -12575,7 +12513,7 @@ memcpy(&status.control, range->control, sizeof(status.control)); kfree(range->control); -@@ -547,7 +592,9 @@ static int p54_tx(struct ieee80211_hw *d +@@ -551,7 +596,9 @@ static int p54_tx(struct ieee80211_hw *d txhdr->padding2 = 0; /* TODO: add support for alternate retry TX rates */ @@ -12586,7 +12524,7 @@ if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) rate |= 0x40; else if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) -@@ -717,13 +764,12 @@ static int p54_set_leds(struct ieee80211 +@@ -721,13 +768,12 @@ static int p54_set_leds(struct ieee80211 return 0; } @@ -12602,7 +12540,7 @@ } while(0) static void p54_init_vdcf(struct ieee80211_hw *dev) -@@ -741,10 +787,10 @@ static void p54_init_vdcf(struct ieee802 +@@ -745,10 +791,10 @@ static void p54_init_vdcf(struct ieee802 vdcf = (struct p54_tx_control_vdcf *) hdr->data; @@ -12617,7 +12555,7 @@ } static void p54_set_vdcf(struct ieee80211_hw *dev) -@@ -849,7 +895,7 @@ static int p54_config(struct ieee80211_h +@@ -853,7 +899,7 @@ static int p54_config(struct ieee80211_h { int ret; @@ -12626,7 +12564,7 @@ p54_set_vdcf(dev); return ret; } -@@ -897,7 +943,7 @@ static int p54_conf_tx(struct ieee80211_ +@@ -901,7 +947,7 @@ static int p54_conf_tx(struct ieee80211_ if ((params) && !((queue < 0) || (queue > 4))) { P54_SET_QUEUE(vdcf->queue[queue], params->aifs, @@ -12635,7 +12573,7 @@ } else return -EINVAL; -@@ -944,7 +990,6 @@ struct ieee80211_hw *p54_init_common(siz +@@ -948,7 +994,6 @@ struct ieee80211_hw *p54_init_common(siz { struct ieee80211_hw *dev; struct p54_common *priv; @@ -12643,7 +12581,7 @@ dev = ieee80211_alloc_hw(priv_data_len, &p54_ops); if (!dev) -@@ -953,18 +998,7 @@ struct ieee80211_hw *p54_init_common(siz +@@ -957,18 +1002,7 @@ struct ieee80211_hw *p54_init_common(siz priv = dev->priv; priv->mode = IEEE80211_IF_TYPE_INVALID; skb_queue_head_init(&priv->tx_queue); @@ -12663,7 +12601,7 @@ dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | /* not sure */ IEEE80211_HW_RX_INCLUDES_FCS; dev->channel_change_time = 1000; /* TODO: find actual value */ -@@ -986,14 +1020,6 @@ struct ieee80211_hw *p54_init_common(siz +@@ -990,14 +1024,6 @@ struct ieee80211_hw *p54_init_common(siz p54_init_vdcf(dev); @@ -12679,8 +12617,8 @@ } EXPORT_SYMBOL_GPL(p54_init_common); diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_sa2400.c 2008-03-04 19:35:36.000000000 -0500 @@ -80,8 +80,9 @@ static void sa2400_rf_set_channel(struct struct ieee80211_conf *conf) { @@ -12695,7 +12633,7 @@ diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.h --- linux-2.6.24.noarch/drivers/net/wireless/adm8211.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.h 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.h 2008-03-04 19:35:36.000000000 -0500 @@ -534,61 +534,6 @@ struct adm8211_eeprom { u8 cis_data[0]; /* 0x80, 384 bytes */ } __attribute__ ((packed)); @@ -12783,8 +12721,8 @@ {1, 11}, /* FCC */ {1, 11}, /* IC */ diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/main.c ---- linux-2.6.24.noarch/drivers/net/wireless/b43/main.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/main.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43/main.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43/main.c 2008-03-04 19:35:36.000000000 -0500 @@ -96,25 +96,29 @@ MODULE_DEVICE_TABLE(ssb, b43_ssb_tbl); * data in there. This data is the same for all devices, so we don't * get concurrency issues */ @@ -13388,8 +13326,8 @@ goto err_powerdown; diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c ---- linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43/xmit.c 2008-03-04 19:35:36.000000000 -0500 @@ -32,46 +32,48 @@ #include "dma.h" @@ -13599,8 +13537,8 @@ default: B43_WARN_ON(1); diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/main.h.orig linux-2.6.24.noarch/drivers/net/wireless/b43/main.h ---- linux-2.6.24.noarch/drivers/net/wireless/b43/main.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/main.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43/main.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43/main.h 2008-03-04 19:35:36.000000000 -0500 @@ -95,8 +95,8 @@ u16 b43_shm_read16(struct b43_wldev *dev void b43_shm_write32(struct b43_wldev *dev, u16 routing, u16 offset, u32 value); void b43_shm_write16(struct b43_wldev *dev, u16 routing, u16 offset, u16 value); @@ -13614,7 +13552,7 @@ diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/sysfs.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43/sysfs.c --- linux-2.6.24.noarch/drivers/net/wireless/b43/sysfs.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/sysfs.c 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43/sysfs.c 2008-03-04 19:35:36.000000000 -0500 @@ -47,29 +47,6 @@ static int get_integer(const char *buf, return ret; } @@ -13730,8 +13668,8 @@ device_remove_file(dev, &dev_attr_interference); } diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h ---- linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43/b43.h 2008-03-04 19:35:36.000000000 -0500 @@ -144,7 +144,8 @@ enum { #define B43_SHM_SH_PHYTYPE 0x0052 /* PHY type */ #define B43_SHM_SH_ANTSWAP 0x005C /* Antenna swap threshold */ @@ -13844,7 +13782,7 @@ bool suspend_in_progress; /* TRUE, if we are in a suspend/resume cycle */ diff -up linux-2.6.24.noarch/drivers/net/wireless/strip.c.orig linux-2.6.24.noarch/drivers/net/wireless/strip.c --- linux-2.6.24.noarch/drivers/net/wireless/strip.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/strip.c 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/strip.c 2008-03-04 19:35:36.000000000 -0500 @@ -962,12 +962,12 @@ static char *time_delta(char buffer[], l /* get Nth element of the linked list */ static struct strip *strip_get_idx(loff_t pos) @@ -13862,8 +13800,8 @@ } return NULL; diff -up linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c ---- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.c 2008-03-04 19:35:36.000000000 -0500 @@ -771,10 +771,10 @@ static int zd1211b_hw_init_hmac(struct z { static const struct zd_ioreq32 ioreqs[] = { @@ -13919,8 +13857,8 @@ goto out; /* Disabling interrupts is certainly a smart thing here. diff -up linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h ---- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_chip.h 2008-03-04 19:35:36.000000000 -0500 @@ -625,11 +625,10 @@ enum { #define CR_S_MD CTL_REG(0x0830) @@ -13938,8 +13876,8 @@ #define CR_ZD1211B_AIFS_CTL2 CTL_REG(0x0b14) #define CR_ZD1211B_TXOP CTL_REG(0x0b20) diff -up linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c.orig linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c ---- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_ieee80211.c 2008-03-04 19:35:36.000000000 -0500 @@ -65,16 +65,14 @@ static const struct channel_range *zd_ch static void unmask_bg_channels(struct ieee80211_hw *hw, @@ -13970,8 +13908,8 @@ } diff -up linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h ---- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.h 2008-03-04 19:35:36.000000000 -0500 @@ -185,7 +185,7 @@ struct zd_mac { struct sk_buff_head ack_wait_queue; struct ieee80211_channel channels[14]; @@ -13982,8 +13920,8 @@ /* Short preamble (used for RTS/CTS) */ unsigned int short_preamble:1; diff -up linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c ---- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/zd1211rw/zd_mac.c 2008-03-04 19:35:36.000000000 -0500 @@ -34,76 +34,61 @@ /* This table contains the hardware specific values for the modulation rates. */ @@ -14226,8 +14164,8 @@ housekeeping_init(mac); INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler); diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c ---- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-03-04 19:32:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c 2008-03-04 19:35:36.000000000 -0500 @@ -95,28 +95,29 @@ MODULE_DEVICE_TABLE(ssb, b43legacy_ssb_t * data in there. This data is the same for all devices, so we don't * get concurrency issues */ @@ -14868,8 +14806,8 @@ return 0; diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c ---- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/xmit.c 2008-03-04 19:35:36.000000000 -0500 @@ -37,45 +37,48 @@ @@ -15045,8 +14983,8 @@ default: b43legacywarn(dev->wl, "Unexpected value for chanstat (0x%X)\n", diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h ---- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-03-04 19:35:36.000000000 -0500 @@ -130,13 +130,19 @@ #define B43legacy_SHM_SH_HOSTFHI 0x0060 /* Hostflags ucode opts (high) */ /* SHM_SHARED crypto engine */ @@ -15155,8 +15093,8 @@ struct b43legacy_firmware fw; diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_rtl8225.c 2008-03-04 19:35:36.000000000 -0500 @@ -261,8 +261,8 @@ static void rtl8225_rf_set_tx_power(stru u32 reg; int i; @@ -15199,7 +15137,7 @@ if (conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME) { diff -up linux-2.6.24.noarch/drivers/net/wireless/p54.h.orig linux-2.6.24.noarch/drivers/net/wireless/p54.h --- linux-2.6.24.noarch/drivers/net/wireless/p54.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/p54.h 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54.h 2008-03-04 19:35:36.000000000 -0500 @@ -64,10 +64,6 @@ struct p54_common { unsigned int tx_hdr_len; void *cached_vdcf; @@ -15212,8 +15150,8 @@ }; diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187_dev.c 2008-03-04 19:35:36.000000000 -0500 @@ -45,6 +45,38 @@ static struct usb_device_id rtl8187_tabl MODULE_DEVICE_TABLE(usb, rtl8187_table); @@ -15367,8 +15305,8 @@ eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_BASE, diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h.orig linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h ---- linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl818x.h 2008-03-04 19:35:36.000000000 -0500 @@ -175,74 +175,4 @@ struct rtl818x_rf_ops { void (*set_chan)(struct ieee80211_hw *, struct ieee80211_conf *); }; @@ -15445,8 +15383,8 @@ - #endif /* RTL818X_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/atmel.c.orig linux-2.6.24.noarch/drivers/net/wireless/atmel.c ---- linux-2.6.24.noarch/drivers/net/wireless/atmel.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/atmel.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/atmel.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/atmel.c 2008-03-04 19:35:36.000000000 -0500 @@ -66,6 +66,7 @@ #include #include @@ -15474,8 +15412,8 @@ priv->last_survey = jiffies; diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_grf5101.c 2008-03-04 19:35:36.000000000 -0500 @@ -73,8 +73,9 @@ static void grf5101_rf_set_channel(struc struct ieee80211_conf *conf) { @@ -15489,8 +15427,8 @@ /* set TX power */ write_grf5101(dev, 0x15, 0x0); diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/dev.h 2008-03-04 19:35:36.000000000 -0500 @@ -143,9 +143,12 @@ struct lbs_private { wait_queue_head_t waitq; struct workqueue_struct *work_thread; @@ -15513,8 +15451,8 @@ }; diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.h 2008-03-04 19:35:36.000000000 -0500 @@ -7,6 +7,5 @@ void lbs_association_worker(struct work_struct *work); @@ -15523,8 +15461,8 @@ #endif /* _LBS_ASSOC_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c 2008-03-04 19:35:36.000000000 -0500 @@ -985,6 +985,18 @@ out: lbs_deb_leave(LBS_DEB_CMD); } @@ -15554,8 +15492,8 @@ sprintf(priv->mesh_ssid, "mesh"); priv->mesh_ssid_len = 4; diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/debugfs.c 2008-03-04 19:35:36.000000000 -0500 @@ -315,7 +315,7 @@ static ssize_t lbs_setuserscan(struct fi lbs_scan_networks(priv, scan_cfg, 1); @@ -15566,8 +15504,8 @@ if (priv->surpriseremoved) goto out_scan_cfg; diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c 2008-03-04 19:35:36.000000000 -0500 @@ -1153,9 +1153,9 @@ static void lbs_submit_command(struct lb command == CMD_802_11_AUTHENTICATE) timeo = 10 * HZ; @@ -15630,8 +15568,8 @@ } EXPORT_SYMBOL_GPL(lbs_cmd_copyback); diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/join.h 2008-03-04 19:35:36.000000000 -0500 @@ -48,6 +48,4 @@ int lbs_send_deauthentication(struct lbs int lbs_associate(struct lbs_private *priv, struct assoc_request *assoc_req); @@ -15640,8 +15578,8 @@ - #endif diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/join.c 2008-03-04 19:35:36.000000000 -0500 @@ -99,23 +99,6 @@ static void lbs_set_basic_rate_flags(u8 } @@ -15677,8 +15615,8 @@ priv->NF[TYPE_RXPD][TYPE_AVG] = 0; diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/scan.c 2008-03-04 19:35:36.000000000 -0500 @@ -73,6 +73,23 @@ static const u8 bcastmac[ETH_ALEN] = { 0 /* */ /*********************************************************************/ @@ -15764,8 +15702,8 @@ /* Update RSSI if current BSS is a locally created ad-hoc BSS */ diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-04 19:32:48.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-04 19:35:36.000000000 -0500 @@ -74,7 +74,7 @@ void lbs_mac_event_disconnected(struct l lbs_deb_cmd("disconnected, so exit PS mode\n"); lbs_ps_wakeup(priv, 0); @@ -15775,7 +15713,7 @@ } /** -@@ -568,9 +568,9 @@ int lbs_process_rx_command(struct lbs_pr +@@ -566,9 +566,9 @@ int lbs_process_rx_command(struct lbs_pr respcmd = le16_to_cpu(resp->command); result = le16_to_cpu(resp->result); @@ -15785,11 +15723,11 @@ - lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len); + lbs_deb_hex(LBS_DEB_CMD, "CMD_RESP", (void *) resp, priv->upld_len); - if (resp->seqnum != resp->seqnum) { + if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) { lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n", diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/assoc.c 2008-03-04 19:35:36.000000000 -0500 @@ -181,17 +181,6 @@ int lbs_update_channel(struct lbs_privat return ret; } @@ -15842,8 +15780,8 @@ lbs_prepare_and_send_command(priv, CMD_802_11_RSSI, diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187.h 2008-03-04 19:35:36.000000000 -0500 @@ -71,7 +71,7 @@ struct rtl8187_priv { /* rtl8187 specific */ struct ieee80211_channel channels[14]; @@ -15854,8 +15792,8 @@ u32 rx_conf; u16 txpwr_base; diff -up linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c ---- linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2008-03-04 19:35:36.000000000 -0500 @@ -165,7 +165,7 @@ prism54_update_stats(struct work_struct struct obj_bss bss, *bss2; union oid_res_t r; @@ -16045,8 +15983,8 @@ void diff -up linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h ---- linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.h 2008-03-04 19:35:36.000000000 -0500 @@ -55,7 +55,7 @@ struct islpci_acl { enum { MAC_POLICY_OPEN=0, MAC_POLICY_ACCEPT=1, MAC_POLICY_REJECT=2 } policy; struct list_head mac_list; /* a list of mac_entry */ @@ -16075,8 +16013,8 @@ size_t wpa_ie_len; diff -up linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c ---- linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/prism54/islpci_dev.c 2008-03-04 19:35:36.000000000 -0500 @@ -864,7 +864,7 @@ islpci_setup(struct pci_dev *pdev) mutex_init(&priv->mgmt_lock); priv->mgmt_received = NULL; @@ -16087,8 +16025,8 @@ /* init state machine with off#1 state */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8187_rtl8225.c 2008-03-04 19:35:36.000000000 -0500 @@ -283,8 +283,8 @@ static void rtl8225_rf_set_tx_power(stru u32 reg; int i; @@ -16130,8 +16068,8 @@ } diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_dev.c 2008-03-04 19:35:36.000000000 -0500 @@ -49,6 +49,41 @@ static struct pci_device_id rtl8180_tabl MODULE_DEVICE_TABLE(pci, rtl8180_table); @@ -16313,8 +16251,8 @@ } diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180.h 2008-03-04 19:35:36.000000000 -0500 @@ -102,7 +102,7 @@ struct rtl8180_priv { struct rtl8180_tx_ring tx_ring[4]; struct ieee80211_channel channels[14]; @@ -16325,8 +16263,8 @@ u32 rx_conf; diff -up linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/Kconfig 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/Kconfig 2008-03-04 19:35:36.000000000 -0500 @@ -146,12 +146,15 @@ config IPW2100 configure your card: @@ -16394,8 +16332,8 @@ source "drivers/net/wireless/hostap/Kconfig" source "drivers/net/wireless/bcm43xx/Kconfig" diff -up linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c.orig linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c ---- linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ipw2200.c 2008-03-04 19:35:36.000000000 -0500 @@ -10349,9 +10349,7 @@ static int ipw_tx_skb(struct ipw_priv *p remaining_bytes, PCI_DMA_TODEVICE)); @@ -16408,8 +16346,8 @@ } diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h 2008-03-04 19:35:36.000000000 -0500 @@ -515,14 +515,20 @@ struct iwl3945_qosparam_cmd { #define STA_CONTROL_MODIFY_MSK 0x01 @@ -16447,8 +16385,8 @@ } __attribute__ ((packed)); diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h 2008-03-04 19:35:36.000000000 -0500 @@ -727,14 +727,20 @@ struct iwl4965_qosparam_cmd { #define STA_CONTROL_MODIFY_MSK 0x01 @@ -16524,8 +16462,8 @@ __le16 scd_ssn; } __attribute__ ((packed)); diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h 2008-03-04 19:35:36.000000000 -0500 @@ -59,28 +59,28 @@ * */ @@ -16601,8 +16539,8 @@ #define iwl4965_poll_direct_bit _iwl4965_poll_direct_bit #endif diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c 2008-03-04 19:35:36.000000000 -0500 @@ -83,7 +83,7 @@ struct iwl4965_rate_scale_data { /** * struct iwl4965_scale_tbl_info -- tx params and success history for all rates @@ -17324,8 +17262,8 @@ sta_info_put(sta); return cnt; diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-03-04 19:35:36.000000000 -0500 @@ -247,7 +247,7 @@ static void iwl3945_add_radiotap(struct * the information provided in the skb from the hardware */ s8 signal = stats->ssi; @@ -17455,8 +17393,8 @@ } diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-03-04 19:35:36.000000000 -0500 @@ -90,7 +90,7 @@ int iwl4965_param_amsdu_size_8K; /* de #define VS #endif @@ -18842,8 +18780,8 @@ iwl4965_rate_control_register(priv->hw); err = ieee80211_register_hw(priv->hw); diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2008-03-04 19:35:36.000000000 -0500 @@ -79,6 +79,30 @@ const struct iwl4965_rate_info iwl4965_r IWL_DECLARE_RATE_INFO(60, 60, 48, INV, 48, INV, 48, INV),/* 60mbps */ }; @@ -20064,8 +20002,8 @@ priv->statistics_periodic.data = (unsigned long)priv; priv->statistics_periodic.function = iwl4965_bg_statistics_periodic; diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h 2008-03-04 19:35:36.000000000 -0500 @@ -212,6 +212,18 @@ enum { #define LQ_SIZE 2 /* 2 mode tables: "Active" and "Search" */ @@ -20086,8 +20024,8 @@ enum iwl4965_table_type { diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/Kconfig 2008-03-04 19:35:36.000000000 -0500 @@ -24,18 +24,10 @@ config IWL4965 say M here and read . The module will be called iwl4965.ko. @@ -20123,8 +20061,8 @@ bool "Enable Spectrum Measurement in iwl3945 drivers" depends on IWL3945 diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h 2008-03-04 19:35:36.000000000 -0500 @@ -413,7 +413,6 @@ struct iwl4965_eeprom { /*=== CSR (control and status registers) ===*/ #define CSR_BASE (0x000) @@ -20134,8 +20072,8 @@ #define CSR_INT_COALESCING (CSR_BASE+0x004) /* accum ints, 32-usec units */ #define CSR_INT (CSR_BASE+0x008) /* host interrupt status/ack */ diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h 2008-03-04 19:35:36.000000000 -0500 @@ -206,7 +206,7 @@ struct iwl4965_channel_info { u8 group_index; /* 0-4, maps channel to group1/2/3/4/5 */ @@ -20405,8 +20343,8 @@ /* Requires full declaration of iwl4965_priv before including */ #include "iwl-4965-io.h" diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h 2008-03-04 19:35:36.000000000 -0500 @@ -195,7 +195,7 @@ struct iwl3945_channel_info { u8 group_index; /* 0-4, maps channel to group1/2/3/4/5 */ @@ -20506,8 +20444,8 @@ /* Requires full declaration of iwl3945_priv before including */ #include "iwl-3945-io.h" diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h 2008-03-04 19:35:36.000000000 -0500 @@ -59,28 +59,28 @@ * */ @@ -20583,8 +20521,8 @@ #define iwl3945_poll_direct_bit _iwl3945_poll_direct_bit #endif diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h 2008-03-04 19:35:36.000000000 -0500 @@ -324,7 +324,6 @@ struct iwl3945_eeprom { /*=== CSR (control and status registers) ===*/ #define CSR_BASE (0x000) @@ -20594,8 +20532,8 @@ #define CSR_INT_COALESCING (CSR_BASE+0x004) /* accum ints, 32-usec units */ #define CSR_INT (CSR_BASE+0x008) /* host interrupt status/ack */ diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-03-04 19:35:36.000000000 -0500 @@ -91,7 +91,7 @@ int iwl3945_param_queues_num = IWL_MAX_N #define VS #endif @@ -21533,8 +21471,8 @@ iwl3945_rate_control_register(priv->hw); err = ieee80211_register_hw(priv->hw); diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c 2008-03-04 19:35:36.000000000 -0500 @@ -100,14 +100,6 @@ static struct iwl3945_tpt_entry iwl3945_ {-89, IWL_RATE_6M_INDEX} }; @@ -21767,8 +21705,8 @@ IWL_DEBUG_RATE("leave: rssi %d assign rate index: " "%d (plcp 0x%x)\n", rssi, rs_sta->start_rate, diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -22328,8 +22266,8 @@ /* * TX descriptor initializer diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -22898,8 +22836,8 @@ +MODULE_DESCRIPTION("rt2x00 usb library"); MODULE_LICENSE("GPL"); diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -22965,8 +22903,8 @@ #define MIN_TXPOWER 0 #define MAX_TXPOWER 31 diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -24306,8 +24244,8 @@ return 0; diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -25057,7 +24995,7 @@ #ifdef CONFIG_RT2X00_LIB_DEBUGFS diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Makefile.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Makefile --- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Makefile.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Makefile 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Makefile 2008-03-04 19:35:36.000000000 -0500 @@ -1,22 +1,17 @@ -rt2x00lib-objs := rt2x00dev.o rt2x00mac.o rt2x00config.o +rt2x00lib-y += rt2x00dev.o @@ -25098,8 +25036,8 @@ +obj-$(CONFIG_RT2500USB) += rt2500usb.o +obj-$(CONFIG_RT73USB) += rt73usb.o diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -25937,8 +25875,8 @@ .hw = &rt2500usb_mac80211_ops, #ifdef CONFIG_RT2X00_LIB_DEBUGFS diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -26071,8 +26009,8 @@ + #endif /* RT2X00LIB_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -26166,8 +26104,8 @@ - #endif /* RT2X00REG_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -26405,8 +26343,8 @@ if (flags & CONFIG_UPDATE_ANTENNA) { diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -26638,8 +26576,8 @@ void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev); diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -26877,8 +26815,8 @@ debugfs_remove(intf->rf_off_entry); debugfs_remove(intf->bbp_val_entry); diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,290 +0,0 @@ -/* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -27171,8 +27109,8 @@ - -#endif /* RT2X00RING_H */ diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.h ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.h 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.h 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,63 @@ +/* + Copyright (C) 2004 - 2008 rt2x00 SourceForge Project @@ -27238,8 +27176,8 @@ + +#endif /* RT2X00LEDS_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -27650,8 +27588,8 @@ return 0; } diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -27660,8 +27598,8 @@ This program is free software; you can redistribute it and/or modify diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -27759,8 +27697,8 @@ #define MIN_TXPOWER 0 #define MAX_TXPOWER 31 diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -27786,8 +27724,8 @@ #define MIN_TXPOWER 31 #define MAX_TXPOWER 62 diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.h ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.h 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.h 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,457 @@ +/* + Copyright (C) 2004 - 2008 rt2x00 SourceForge Project @@ -28247,8 +28185,8 @@ + +#endif /* RT2X00QUEUE_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28285,8 +28223,8 @@ #define MIN_TXPOWER 0 #define MAX_TXPOWER 31 diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28306,8 +28244,8 @@ #define MIN_TXPOWER 0 #define MAX_TXPOWER 31 diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28316,8 +28254,8 @@ This program is free software; you can redistribute it and/or modify diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dump.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28347,7 +28285,7 @@ __le32 timestamp_sec; diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Kconfig --- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Kconfig.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Kconfig 2008-03-03 16:46:20.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/Kconfig 2008-03-04 19:35:36.000000000 -0500 @@ -5,29 +5,29 @@ config RT2X00 This will enable the experimental support for the Ralink drivers, developed in the rt2x00 project . @@ -28492,8 +28430,8 @@ +endif diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00firmware.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28574,8 +28512,8 @@ retval = rt2x00lib_request_firmware(rt2x00dev); if (retval) diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -29333,8 +29271,8 @@ .hw = &rt2500pci_mac80211_ops, #ifdef CONFIG_RT2X00_LIB_DEBUGFS diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.c ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.c 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00leds.c 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,217 @@ +/* + Copyright (C) 2004 - 2008 rt2x00 SourceForge Project @@ -29554,8 +29492,8 @@ + led_classdev_resume(&rt2x00dev->led_qual.led_dev); +} diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.c ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.c 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00queue.c 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,299 @@ +/* + Copyright (C) 2004 - 2008 rt2x00 SourceForge Project @@ -29857,8 +29795,8 @@ + rt2x00dev->bcn = NULL; +} diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -31022,8 +30960,8 @@ .hw = &rt61pci_mac80211_ops, #ifdef CONFIG_RT2X00_LIB_DEBUGFS diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -31474,8 +31412,8 @@ +MODULE_DESCRIPTION("rt2x00 pci library"); MODULE_LICENSE("GPL"); diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -31586,8 +31524,8 @@ /* * Device initialization handlers. diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-03-03 16:42:51.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-03-04 19:35:36.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -32503,8 +32441,8 @@ .hw = &rt73usb_mac80211_ops, #ifdef CONFIG_RT2X00_LIB_DEBUGFS diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/phy.c 2008-03-04 19:35:36.000000000 -0500 @@ -1018,7 +1018,7 @@ static int ath5k_hw_rf5111_rfregs(struct int obdb = -1, bank = -1; u32 ee_mode; @@ -32711,8 +32649,8 @@ AR5K_PHY_PAPD_PROBE_TXPOWER) | AR5K_PHY_PAPD_PROBE_TX_NEXT, AR5K_PHY_PAPD_PROBE); diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-03-04 19:35:36.000000000 -0500 @@ -30,7 +30,6 @@ #include @@ -32910,8 +32848,8 @@ extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result); diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Makefile 2008-03-04 19:35:36.000000000 -0500 @@ -1,2 +1,6 @@ -ath5k-objs = base.o hw.o regdom.o initvals.o phy.o debug.o -obj-$(CONFIG_ATH5K) += ath5k.o @@ -32922,8 +32860,8 @@ +ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o +obj-$(CONFIG_ATH5K) += ath5k.o diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.h 2008-03-04 19:35:36.000000000 -0500 @@ -61,11 +61,6 @@ #ifndef _ATH5K_DEBUG_H #define _ATH5K_DEBUG_H @@ -33000,8 +32938,8 @@ #endif /* ifndef _ATH5K_DEBUG_H */ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/hw.c 2008-03-04 19:35:36.000000000 -0500 @@ -140,9 +140,6 @@ struct ath5k_hw *ath5k_hw_attach(struct * HW information */ @@ -33415,8 +33353,8 @@ /****************\ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c 2008-03-04 19:35:36.000000000 -0500 @@ -1317,8 +1317,10 @@ int ath5k_hw_write_initvals(struct ath5k /* For AR5211 */ } else if (ah->ah_version == AR5K_AR5211) { @@ -33431,8 +33369,8 @@ } diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-03-03 08:19:02.806638585 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig 2008-03-03 16:46:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,37 @@ +config ATH5K + tristate "Atheros 5xxx wireless cards support" @@ -33472,8 +33410,8 @@ + modprobe ath5k debug=0x00000400 + diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c 2008-03-04 19:35:36.000000000 -0500 @@ -80,7 +80,7 @@ MODULE_AUTHOR("Nick Kossifidis"); MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards."); MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards"); @@ -34143,8 +34081,8 @@ case ALG_CCMP: return -EOPNOTSUPP; diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c 2008-03-04 19:35:36.000000000 -0500 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -34234,8 +34172,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h 2008-03-04 19:35:36.000000000 -0500 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -34281,8 +34219,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-03-03 16:42:47.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-03-04 19:35:36.000000000 -0500 @@ -78,8 +78,9 @@ static void max2820_rf_set_channel(struc struct ieee80211_conf *conf) { @@ -34296,8 +34234,8 @@ /* While philips SA2400 drive the PA bias from diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-03-03 16:42:46.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-03-04 19:35:36.000000000 -0500 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -34467,8 +34405,8 @@ err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c ---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-03 16:42:48.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-04 19:35:36.000000000 -0500 @@ -172,6 +172,22 @@ static int select_core_and_segment(struc return 0; } @@ -34525,8 +34463,8 @@ .write32 = ssb_pcmcia_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c ---- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-03 16:42:48.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-04 19:35:36.000000000 -0500 @@ -505,6 +505,14 @@ error: return err; } @@ -34569,8 +34507,8 @@ .write32 = ssb_ssb_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c ---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-03 16:42:48.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-03 16:46:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -572,6 +572,19 @@ static inline int ssb_pci_assert_buspowe } #endif /* DEBUG */ @@ -34623,8 +34561,8 @@ .write32 = ssb_pci_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c ---- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-03 16:42:48.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-03 16:47:32.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-04 19:35:36.000000000 -0500 @@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks); } linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.26 -r 1.27 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless.patch,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- linux-2.6-wireless.patch 28 Feb 2008 03:18:34 -0000 1.26 +++ linux-2.6-wireless.patch 5 Mar 2008 01:41:45 -0000 1.27 @@ -1,3 +1,102 @@ +commit c256e05b7b30fab484deacb4f8cff59ce649c75e +Author: Michael Buesch +Date: Tue Mar 4 20:31:13 2008 +0100 + + b43legacy: Fix module init message + + This fixes the module init message to tell that the legacy + driver loaded. This makes it less confusing, in case both drivers are loaded. + + Signed-off-by: Michael Buesch + Signed-off-by: John W. Linville + +commit 8a96df80b3ddb2410045a26ea19eeccb5f2d2d11 +Author: Sebastian Siewior +Date: Tue Mar 4 18:22:27 2008 +0100 + + libertas: compare the current command with response + + instead of with itself. + + Signed-off-by: Sebastian Siewior + Signed-off-by: John W. Linville + +commit 6305f498604df6c66bdb4cc533ce6332fa5ab61f +Author: David Woodhouse +Date: Mon Mar 3 12:20:12 2008 +0100 + + libertas: fix sanity check on sequence number in command response + + Slightly more useful if we compare it against the sequence number of the + command we have outstanding, rather than comparing the reply with itself. + + Doh. Pointed out by Sebastian Siewior + + Signed-off-by: David Woodhouse + Acked-by: Dan Williams + Signed-off-by: John W. Linville + +commit c2f2d3a06f8b628d444cf4f396d6c6ddd47e1d1f +Author: Johannes Berg +Date: Fri Feb 29 23:28:25 2008 +0100 + + p54: fix eeprom parser length sanity checks + + When I called p54_parse_eeprom() on a hand-coded structure + I managed to make a small mistake with wrap->len which caused + a segfault a few lines down when trying to read entry->len. + This patch changes the validation code to avoid such problems. + + Signed-off-by: Johannes Berg + Tested-by: Florian Fainelli + Signed-off-by: John W. Linville + +commit 8c28293f5514f64ba064bac7946aebeda4a663c6 +Author: Johannes Berg +Date: Fri Feb 29 13:56:33 2008 +0100 + + p54: fix EEPROM structure endianness + + Since the EEPROM structure is read from hardware, it is + always little endian, annotate that in the struct and + make sure to convert where applicable. + + Signed-off-by: Johannes Berg + Cc: Michael Wu + Tested-by: Florian Fainelli + Signed-off-by: John W. Linville + +commit dc63644b0ee3b447e879ef8e124657b40e9ea81c +Author: Yoichi Yuasa +Date: Fri Feb 29 11:09:31 2008 +0100 + + ssb: Add pcibios_enable_device() return value check + + This patch has added pcibios_enable_device() return value check. + + Signed-off-by: Yoichi Yuasa + Signed-off-by: Michael Buesch + Signed-off-by: John W. Linville + +commit 1d60ab0574fae362b1cca0ef52181ef75fd46832 +Author: Stefano Brivio +Date: Sun Mar 2 11:33:10 2008 +0100 + + rc80211-pid: fix rate adjustment + + Merge rate_control_pid_shift_adjust() to rate_control_pid_adjust_rate() + in order to make the learning algorithm aware of constraints on rates. Also + add some comments and rename variables. + + This fixes a bug which prevented 802.11b/g non-AP STAs from working with + 802.11b only AP STAs. + + This patch was originally destined for 2.6.26, and is being backported + to fix a user reported problem in post-2.6.24 kernels. + + Signed-off-by: Stefano Brivio + Signed-off-by: John W. Linville + commit c2893054cc823e05c723114378244c8caba084c0 Author: Alexey Zaytsev Date: Sat Feb 23 13:33:07 2008 +0300 @@ -134,19 +233,6 @@ Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville -commit 04d0a24457e249388ec3ee32b345617d1bc6ebf2 -Author: Johannes Berg -Date: Wed Feb 20 11:47:45 2008 +0100 - - rndis_wlan: fix sparse warnings - - It is obviously wrong to use an enum in a little endian struct, - and those other enums should be declared differently. - - Signed-off-by: Johannes Berg - Acked-by: Jussi Kivilinna - Signed-off-by: John W. Linville - commit 7672b302058148f0e9a4a2be36c851510ff9cb88 Author: Gordon Farquharson Date: Sat Feb 23 03:14:23 2008 -0700 @@ -552,19 +638,6 @@ Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville -commit a97b1f3d203d0fe5503578c6ee8bfdb89ed72679 -Author: Jussi Kivilinna -Date: Wed Feb 6 15:36:10 2008 +0200 - - rndis_wlan: enable stall workaround by link quality instead of link speed - - Enable workaround for poor link stalls by link quality instead of link - speed. Using link speed caused workaround be active always on 802.11b - networks which reduced performance and not even catch all stalls. - - Signed-off-by: Jussi Kivilinna - Signed-off-by: John W. Linville - commit 281c56dd276e587a7b4a65764ac68ae250e73235 Author: Bruno Randolf Date: Tue Feb 5 18:44:55 2008 +0900 @@ -8147,8 +8220,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.24.noarch/include/linux/nl80211.h.orig linux-2.6.24.noarch/include/linux/nl80211.h ---- linux-2.6.24.noarch/include/linux/nl80211.h.orig 2008-02-27 21:18:02.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/nl80211.h 2008-02-27 21:18:07.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/nl80211.h.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/include/linux/nl80211.h 2008-03-04 20:16:04.000000000 -0500 @@ -7,6 +7,18 @@ */ @@ -8350,8 +8423,8 @@ + #endif /* __LINUX_NL80211_H */ diff -up linux-2.6.24.noarch/include/linux/wireless.h.orig linux-2.6.24.noarch/include/linux/wireless.h ---- linux-2.6.24.noarch/include/linux/wireless.h.orig 2008-02-27 21:18:02.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/wireless.h 2008-02-27 21:18:07.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/wireless.h.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/include/linux/wireless.h 2008-03-04 20:16:04.000000000 -0500 @@ -541,6 +541,16 @@ /* Maximum size of returned data */ #define IW_SCAN_MAX_DATA 4096 /* In bytes */ @@ -8380,8 +8453,8 @@ __u32 event_capa[6]; diff -up linux-2.6.24.noarch/include/linux/input.h.orig linux-2.6.24.noarch/include/linux/input.h ---- linux-2.6.24.noarch/include/linux/input.h.orig 2008-02-27 21:18:02.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/input.h 2008-02-27 21:18:07.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/input.h.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/include/linux/input.h 2008-03-04 20:16:04.000000000 -0500 @@ -371,6 +371,8 @@ struct input_absinfo { #define KEY_BRIGHTNESS_ZERO 244 /* brightness off, use ambient */ #define KEY_DISPLAY_OFF 245 /* display device to off state */ @@ -8393,7 +8466,7 @@ #define BTN_1 0x101 diff -up linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig linux-2.6.24.noarch/include/linux/mod_devicetable.h --- linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/mod_devicetable.h 2008-02-27 21:18:24.000000000 -0500 ++++ linux-2.6.24.noarch/include/linux/mod_devicetable.h 2008-03-04 20:16:04.000000000 -0500 @@ -350,7 +350,13 @@ struct sdio_device_id { struct ssb_device_id { __u16 vendor; @@ -8410,8 +8483,8 @@ #define SSB_DEVICE(_vendor, _coreid, _revision) \ { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } diff -up linux-2.6.24.noarch/include/linux/pci_ids.h.orig linux-2.6.24.noarch/include/linux/pci_ids.h ---- linux-2.6.24.noarch/include/linux/pci_ids.h.orig 2008-02-27 21:18:02.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/pci_ids.h 2008-02-27 21:18:07.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/pci_ids.h.orig 2008-01-24 17:58:37.000000000 -0500 [...3324 lines suppressed...] enum { PRISM2_RX_MONITOR, PRISM2_RX_MGMT, PRISM2_RX_NON_ASSOC, diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-02-27 21:18:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-03-04 20:16:08.000000000 -0500 @@ -84,7 +84,7 @@ static int prism2_get_datarates(struct n if (len < 2) return 0; @@ -129455,8 +129582,8 @@ reason = cpu_to_le16(param->u.mlme.reason_code); switch (param->u.mlme.cmd) { diff -up linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c.orig linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c ---- linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c 2008-02-27 21:18:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c 2008-03-04 20:16:08.000000000 -0500 @@ -27,6 +27,8 @@ static const struct pci_device_id b43_pc { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) }, @@ -129467,8 +129594,8 @@ }; MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl); diff -up linux-2.6.24.noarch/drivers/ssb/Makefile.orig linux-2.6.24.noarch/drivers/ssb/Makefile ---- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-02-27 21:18:24.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-03-04 20:16:08.000000000 -0500 @@ -1,5 +1,6 @@ # core ssb-y += main.o scan.o @@ -129485,8 +129612,8 @@ obj-$(CONFIG_SSB) += ssb.o diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c ---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-02-27 21:18:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-04 20:16:08.000000000 -0500 @@ -94,7 +94,6 @@ int ssb_pcmcia_switch_core(struct ssb_bu struct ssb_device *dev) { @@ -129637,8 +129764,8 @@ } diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c ---- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-02-27 21:18:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-04 20:16:08.000000000 -0500 @@ -557,6 +557,7 @@ static int ssb_fetch_invariants(struct s goto out; memcpy(&bus->boardinfo, &iv.boardinfo, sizeof(iv.boardinfo)); @@ -129683,7 +129810,7 @@ return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23); diff -up linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig linux-2.6.24.noarch/drivers/ssb/ssb_private.h --- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-02-27 21:18:24.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-03-04 20:16:08.000000000 -0500 @@ -120,10 +120,10 @@ extern int ssb_devices_thaw(struct ssb_b extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev); @@ -129698,8 +129825,8 @@ { return 0; diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c ---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-02-27 21:18:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-04 20:16:08.000000000 -0500 @@ -212,29 +212,29 @@ static inline u8 ssb_crc8(u8 crc, u8 dat return t[crc ^ data]; } @@ -130145,8 +130272,8 @@ err = -EINVAL; goto out_kfree; diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c ---- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-02-27 21:18:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-04 20:16:08.000000000 -0500 @@ -39,12 +39,14 @@ static inline void chipco_write32(struct ssb_write32(cc->dev, offset, value); } @@ -130268,8 +130395,8 @@ else uart_regs += (i * 256); diff -up linux-2.6.24.noarch/drivers/ssb/Kconfig.orig linux-2.6.24.noarch/drivers/ssb/Kconfig ---- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-02-27 21:18:24.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-03-04 20:16:08.000000000 -0500 @@ -35,6 +35,11 @@ config SSB_PCIHOST If unsure, say Y @@ -130296,8 +130423,8 @@ bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)" depends on SSB_DRIVER_MIPS && EXPERIMENTAL diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/embedded.c ---- /dev/null 2008-02-27 08:31:30.805858387 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/embedded.c 2008-02-27 21:18:08.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/embedded.c 2008-03-04 20:16:08.000000000 -0500 @@ -0,0 +1,132 @@ +/* + * Sonics Silicon Backplane @@ -130432,8 +130559,8 @@ +} +EXPORT_SYMBOL(ssb_gpio_polarity); diff -up linux-2.6.24.noarch/drivers/ssb/driver_extif.c.orig linux-2.6.24.noarch/drivers/ssb/driver_extif.c ---- linux-2.6.24.noarch/drivers/ssb/driver_extif.c.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/driver_extif.c 2008-02-27 21:18:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/driver_extif.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_extif.c 2008-03-04 20:16:08.000000000 -0500 @@ -27,12 +27,14 @@ static inline void extif_write32(struct ssb_write32(extif->dev, offset, value); } @@ -130490,8 +130617,8 @@ + return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value); +} diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c ---- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-02-27 21:18:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-04 20:16:58.000000000 -0500 @@ -11,6 +11,7 @@ #include #include @@ -130527,7 +130654,7 @@ if (res->end) { size = res->end - res->start + 1; if (*base & (size - 1)) -@@ -88,10 +102,12 @@ int pcibios_plat_dev_init(struct pci_dev +@@ -88,20 +102,28 @@ int pcibios_plat_dev_init(struct pci_dev static void __init ssb_fixup_pcibridge(struct pci_dev *dev) { @@ -130541,7 +130668,13 @@ /* Enable PCI bridge bus mastering and memory space */ pci_set_master(dev); -@@ -101,7 +117,10 @@ static void __init ssb_fixup_pcibridge(s +- pcibios_enable_device(dev, ~0); ++ if (pcibios_enable_device(dev, ~0) < 0) { ++ ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n"); ++ return; ++ } + + /* Enable PCI bridge BAR1 prefetch and burst */ pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3); /* Make sure our latency is high enough to handle the devices behind us */ @@ -130553,7 +130686,7 @@ } DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_fixup_pcibridge); -@@ -117,8 +136,10 @@ static u32 get_cfgspace_addr(struct ssb_ +@@ -117,8 +139,10 @@ static u32 get_cfgspace_addr(struct ssb_ u32 addr = 0; u32 tmp; @@ -130565,7 +130698,7 @@ if (bus == 0) { /* Type 0 transaction */ if (unlikely(dev >= SSB_PCI_SLOT_MAX)) -@@ -279,14 +300,14 @@ static struct resource ssb_pcicore_mem_r +@@ -279,14 +303,14 @@ static struct resource ssb_pcicore_mem_r .name = "SSB PCIcore external memory", .start = SSB_PCI_DMA, .end = SSB_PCI_DMA + SSB_PCI_DMA_SZ - 1, @@ -130582,7 +130715,7 @@ }; static struct pci_controller ssb_pcicore_controller = { -@@ -318,7 +339,16 @@ static void ssb_pcicore_init_hostmode(st +@@ -318,7 +342,16 @@ static void ssb_pcicore_init_hostmode(st pcicore_write32(pc, SSB_PCICORE_ARBCTL, val); udelay(1); /* Assertion time demanded by the PCI standard */ @@ -130600,7 +130733,7 @@ /* 64MB I/O window */ pcicore_write32(pc, SSB_PCICORE_SBTOPCI0, -@@ -344,7 +374,8 @@ static void ssb_pcicore_init_hostmode(st +@@ -344,7 +377,8 @@ static void ssb_pcicore_init_hostmode(st /* Ok, ready to run, register it to the system. * The following needs change, if we want to port hostmode * to non-MIPS platform. */ @@ -130611,8 +130744,8 @@ * values. Not waiting at this point causes crashes of the machine. */ mdelay(10); diff -up linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt ---- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-02-27 21:18:03.000000000 -0500 -+++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-02-27 21:18:08.000000000 -0500 +--- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-03-04 20:16:08.000000000 -0500 @@ -332,4 +332,36 @@ Why: This driver has been marked obsolet 2.4 or later kernels, provides richer features and is more robust. Who: Stephen Hemminger From fedora-extras-commits at redhat.com Wed Mar 5 02:09:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 02:09:07 GMT Subject: rpms/perl-bioperl/devel perl-bioperl.spec,1.9,1.10 Message-ID: <200803050209.m25297LH027279@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-bioperl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27257 Modified Files: perl-bioperl.spec Log Message: new perl Index: perl-bioperl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-bioperl/devel/perl-bioperl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-bioperl.spec 4 Mar 2008 05:38:57 -0000 1.9 +++ perl-bioperl.spec 5 Mar 2008 02:08:32 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-bioperl Version: 1.5.2_102 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Perl tools for computational molecular biology Group: Development/Libraries @@ -56,6 +56,17 @@ %setup -q -n bioperl-%{version} %patch0 -p1 +# Temporary hack for bootstrapping +# Filter unwanted Requires: +cat << \EOF > %{_builddir}/bioperl-%{version}/%{name}-req +#!/bin/sh +%{__perl_requires} $* |\ + sed -e '/perl(Bio::Tools::Run::$/d' +EOF + +%define __perl_requires %{_builddir}/bioperl-%{version}/%{name}-req +chmod +x %{__perl_requires} + # remove all execute bits from the doc stuff find examples -type f -exec chmod -x {} 2>/dev/null ';' @@ -106,6 +117,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 1.5.2_102-11 +- disable bioperl-run requires for bootstrapping + * Tue Mar 4 2008 Tom "spot" Callaway 1.5.2_102-10 - rebuild for new perl From fedora-extras-commits at redhat.com Wed Mar 5 02:22:50 2008 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 5 Mar 2008 02:22:50 GMT Subject: rpms/libgcroots/devel libgcroots.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803050222.m252MofA027527@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/libgcroots/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27480/devel Modified Files: .cvsignore sources Added Files: libgcroots.spec Log Message: initial import. --- NEW FILE libgcroots.spec --- Name: libgcroots Version: 0.2.1 Release: 2%{?dist} License: BSD URL: http://code.google.com/p/sigscheme/wiki/libgcroots BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://sigscheme.googlecode.com/files/%{name}-%{version}.tar.bz2 Summary: Roots acquisition library for Garbage Collector Group: Development/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description libgcroots abstracts architecture-dependent part of garbage collector roots acquisition such as register windows of SPARC and register stack backing store of IA-64. This library encourages to have own GC such as for small-footprint, some application-specific optimizations, just learning or to test experimental ideas. %package devel Summary: Development files for libgcroots Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel libgcroots abstracts architecture-dependent part of garbage collector roots acquisition such as register windows of SPARC and register stack backing store of IA-64. This package contains a header file and development library to help you to develop any own GC. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Remove unnecessary files rmdir $RPM_BUILD_ROOT%{_includedir}/libgcroots rm $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr (-, root, root, -) %doc COPYING ChangeLog README %{_libdir}/libgcroots.so.* %files devel %defattr (-, root, root, -) %doc COPYING ChangeLog README %{_includedir}/gcroots.h %{_libdir}/libgcroots.so %{_libdir}/pkgconfig/gcroots.pc %changelog * Wed Feb 27 2008 Akira TAGOH - 0.2.1-2 - Add the appropriate requires. * Thu Feb 21 2008 Akira TAGOH - 0.2.1-1 - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgcroots/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:05:57 -0000 1.1 +++ .cvsignore 5 Mar 2008 02:22:13 -0000 1.2 @@ -0,0 +1 @@ +libgcroots-0.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgcroots/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:05:57 -0000 1.1 +++ sources 5 Mar 2008 02:22:13 -0000 1.2 @@ -0,0 +1 @@ +f5fa9b60e506c70a041ef03ab26dbd18 libgcroots-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 02:24:23 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 02:24:23 GMT Subject: rpms/cbios/devel cbios.spec,1.2,1.3 Message-ID: <200803050224.m252ONDA027593@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/pkgs/rpms/cbios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27566 Modified Files: cbios.spec Log Message: Index: cbios.spec =================================================================== RCS file: /cvs/pkgs/rpms/cbios/devel/cbios.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cbios.spec 28 Aug 2007 19:56:31 -0000 1.2 +++ cbios.spec 5 Mar 2008 02:23:37 -0000 1.3 @@ -7,7 +7,7 @@ Group: Applications/Emulators License: BSD URL: http://cbios.sourceforge.net/ -Source0: http://downloads.sourcedorge.net/%{name}/%{name}-%{version}.zip +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: sjasm From fedora-extras-commits at redhat.com Wed Mar 5 02:25:55 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 02:25:55 GMT Subject: rpms/cbios/F-8 cbios.spec,1.2,1.3 Message-ID: <200803050225.m252Pttw027635@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/pkgs/rpms/cbios/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27604 Modified Files: cbios.spec Log Message: Index: cbios.spec =================================================================== RCS file: /cvs/pkgs/rpms/cbios/F-8/cbios.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cbios.spec 28 Aug 2007 19:56:31 -0000 1.2 +++ cbios.spec 5 Mar 2008 02:25:19 -0000 1.3 @@ -7,7 +7,7 @@ Group: Applications/Emulators License: BSD URL: http://cbios.sourceforge.net/ -Source0: http://downloads.sourcedorge.net/%{name}/%{name}-%{version}.zip +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: sjasm From fedora-extras-commits at redhat.com Wed Mar 5 02:27:10 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 02:27:10 GMT Subject: rpms/cbios/F-7 cbios.spec,1.2,1.3 Message-ID: <200803050227.m252RASa027690@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/pkgs/rpms/cbios/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27661 Modified Files: cbios.spec Log Message: Index: cbios.spec =================================================================== RCS file: /cvs/pkgs/rpms/cbios/F-7/cbios.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cbios.spec 28 Aug 2007 22:54:13 -0000 1.2 +++ cbios.spec 5 Mar 2008 02:26:33 -0000 1.3 @@ -7,7 +7,7 @@ Group: Applications/Emulators License: BSD URL: http://cbios.sourceforge.net/ -Source0: http://downloads.sourcedorge.net/%{name}/%{name}-%{version}.zip +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: sjasm From fedora-extras-commits at redhat.com Wed Mar 5 02:29:19 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 02:29:19 GMT Subject: rpms/kdetv/devel kdetv.spec,1.7,1.8 Message-ID: <200803050229.m252TJmi027759@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/kdetv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27730 Modified Files: kdetv.spec Log Message: Index: kdetv.spec =================================================================== RCS file: /cvs/extras/rpms/kdetv/devel/kdetv.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kdetv.spec 19 Feb 2008 16:44:54 -0000 1.7 +++ kdetv.spec 5 Mar 2008 02:28:41 -0000 1.8 @@ -10,7 +10,7 @@ License: GPLv2+ and LGPLv2+ and GFDL # Original URL was http://www.kdetv.org, but this appears no longer active. URL: http://dziegel.free.fr/releases/ -Source0: http://dziegel.free.fr/releases/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://dziegel.free.fr/releases/%{name}-%{version}.tar.bz2 Source1: %{name}-%{version}-indexcaches.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -74,7 +74,7 @@ %post /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi @@ -82,7 +82,7 @@ %postun /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi From fedora-extras-commits at redhat.com Wed Mar 5 02:36:56 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 02:36:56 GMT Subject: rpms/kcometen3/devel kcometen3.spec,1.4,1.5 Message-ID: <200803050236.m252auQJ027933@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/kcometen3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27886 Modified Files: kcometen3.spec Log Message: Index: kcometen3.spec =================================================================== RCS file: /cvs/extras/rpms/kcometen3/devel/kcometen3.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kcometen3.spec 19 Feb 2008 16:43:42 -0000 1.4 +++ kcometen3.spec 5 Mar 2008 02:36:20 -0000 1.5 @@ -6,7 +6,8 @@ License: GPLv2+ URL: http://user.cs.tu-berlin.de/~pmueller/ # At the time of writing (20070822) upstream source appears to be corrupt. -Source0: http://user.cs.tu-berlin.de/~pmueller/%{name}-%{version}.tar.gz +# Original URL: http://user.cs.tu-berlin.de/~pmueller/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: kdelibs3-devel From fedora-extras-commits at redhat.com Wed Mar 5 02:37:18 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 02:37:18 GMT Subject: rpms/kdetv/F-8 kdetv.spec,1.6,1.7 Message-ID: <200803050237.m252bIFp027936@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/pkgs/rpms/kdetv/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27913 Modified Files: kdetv.spec Log Message: Index: kdetv.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdetv/F-8/kdetv.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kdetv.spec 6 Jan 2008 22:30:20 -0000 1.6 +++ kdetv.spec 5 Mar 2008 02:36:42 -0000 1.7 @@ -1,6 +1,6 @@ Name: kdetv Version: 0.8.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: KDE application for watching TV Group: Applications/Multimedia # Licensing Notes: @@ -10,7 +10,7 @@ License: GPLv2+ and LGPLv2+ and GFDL # Original URL was http://www.kdetv.org, but this appears no longer active. URL: http://dziegel.free.fr/releases/ -Source0: http://dziegel.free.fr/releases/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://dziegel.free.fr/releases/%{name}-%{version}.tar.bz2 Source1: %{name}-%{version}-indexcaches.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -74,7 +74,7 @@ %post /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi @@ -82,7 +82,7 @@ %postun /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi @@ -108,6 +108,9 @@ %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.8.9-10 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 Ian Chapman 0.8.9-9 - Use kdelibs3-devel now instead of kdelibs-devel From fedora-extras-commits at redhat.com Wed Mar 5 02:38:12 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 02:38:12 GMT Subject: rpms/kdetv/F-7 kdetv.spec,1.5,1.6 Message-ID: <200803050238.m252cCOs027984@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/kdetv/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27942 Modified Files: kdetv.spec Log Message: Index: kdetv.spec =================================================================== RCS file: /cvs/extras/rpms/kdetv/F-7/kdetv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kdetv.spec 6 Jan 2008 22:31:23 -0000 1.5 +++ kdetv.spec 5 Mar 2008 02:37:35 -0000 1.6 @@ -1,6 +1,6 @@ Name: kdetv Version: 0.8.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: KDE application for watching TV Group: Applications/Multimedia # Licensing Notes: @@ -10,7 +10,7 @@ License: GPLv2+ and LGPLv2+ and GFDL # Original URL was http://www.kdetv.org, but this appears no longer active. URL: http://dziegel.free.fr/releases/ -Source0: http://dziegel.free.fr/releases/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://dziegel.free.fr/releases/%{name}-%{version}.tar.bz2 Source1: %{name}-%{version}-indexcaches.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -74,7 +74,7 @@ %post /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi @@ -82,7 +82,7 @@ %postun /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi @@ -108,6 +108,9 @@ %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.8.9-10 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 Ian Chapman 0.8.9-9 - Use kdelibs3-devel now instead of kdelibs-devel From fedora-extras-commits at redhat.com Wed Mar 5 02:38:22 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 02:38:22 GMT Subject: rpms/kcometen3/F-8 kcometen3.spec,1.3,1.4 Message-ID: <200803050238.m252cMWW027991@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/pkgs/rpms/kcometen3/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27946 Modified Files: kcometen3.spec Log Message: Index: kcometen3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kcometen3/F-8/kcometen3.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kcometen3.spec 6 Jan 2008 23:43:07 -0000 1.3 +++ kcometen3.spec 5 Mar 2008 02:37:40 -0000 1.4 @@ -1,12 +1,13 @@ Name: kcometen3 Version: 1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An OpenGL screensaver for KDE Group: Amusements/Graphics License: GPLv2+ URL: http://user.cs.tu-berlin.de/~pmueller/ # At the time of writing (20070822) upstream source appears to be corrupt. -Source0: http://user.cs.tu-berlin.de/~pmueller/%{name}-%{version}.tar.gz +# Original URL: http://user.cs.tu-berlin.de/~pmueller/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: kdelibs3-devel @@ -49,6 +50,9 @@ %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 1.1-7 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 Ian Chapman 1.1-6 - Use kdelibs3-devel now instead of kdelibs-devel - Source qt.sh From fedora-extras-commits at redhat.com Wed Mar 5 02:38:59 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 02:38:59 GMT Subject: rpms/kcometen3/F-7 kcometen3.spec,1.2,1.3 Message-ID: <200803050238.m252cxdf028013@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/kcometen3/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27990 Modified Files: kcometen3.spec Log Message: Index: kcometen3.spec =================================================================== RCS file: /cvs/extras/rpms/kcometen3/F-7/kcometen3.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kcometen3.spec 6 Jan 2008 23:43:11 -0000 1.2 +++ kcometen3.spec 5 Mar 2008 02:38:25 -0000 1.3 @@ -1,12 +1,13 @@ Name: kcometen3 Version: 1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An OpenGL screensaver for KDE Group: Amusements/Graphics License: GPLv2+ URL: http://user.cs.tu-berlin.de/~pmueller/ # At the time of writing (20070822) upstream source appears to be corrupt. -Source0: http://user.cs.tu-berlin.de/~pmueller/%{name}-%{version}.tar.gz +# Original URL: http://user.cs.tu-berlin.de/~pmueller/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: kdelibs3-devel @@ -49,6 +50,9 @@ %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 1.1-7 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 Ian Chapman 1.1-6 - Use kdelibs3-devel now instead of kdelibs-devel - Source qt.sh From fedora-extras-commits at redhat.com Wed Mar 5 02:43:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 02:43:19 GMT Subject: rpms/perl-bioperl/devel perl-bioperl.spec,1.10,1.11 Message-ID: <200803050243.m252hJAP028184@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-bioperl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28157 Modified Files: perl-bioperl.spec Log Message: new perl Index: perl-bioperl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-bioperl/devel/perl-bioperl.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-bioperl.spec 5 Mar 2008 02:08:32 -0000 1.10 +++ perl-bioperl.spec 5 Mar 2008 02:42:38 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-bioperl Version: 1.5.2_102 -Release: 11%{?dist} +Release: 11%{?dist}.1 Summary: Perl tools for computational molecular biology Group: Development/Libraries @@ -61,7 +61,7 @@ cat << \EOF > %{_builddir}/bioperl-%{version}/%{name}-req #!/bin/sh %{__perl_requires} $* |\ - sed -e '/perl(Bio::Tools::Run::$/d' + sed -e '/perl(Bio::Tools::Run::Alignment::Clustalw)/d; /perl(Bio::Tools::Run::GenericParameters)/d; /perl(Bio::Tools::Run::Phylo::Molphy::ProtML)/d; /perl(Bio::Tools::Run::Phylo::Phylip::Neighbor)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtDist)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtPars)/d' EOF %define __perl_requires %{_builddir}/bioperl-%{version}/%{name}-req @@ -117,6 +117,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 1.5.2_102-11.1 +- actually disable bioperl-run requires for bootstrapping + * Tue Mar 4 2008 Tom "spot" Callaway 1.5.2_102-11 - disable bioperl-run requires for bootstrapping From fedora-extras-commits at redhat.com Wed Mar 5 02:54:54 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 5 Mar 2008 02:54:54 GMT Subject: devel/mkinitrd .cvsignore, 1.171, 1.172 mkinitrd.spec, 1.249, 1.250 sources, 1.213, 1.214 Message-ID: <200803050254.m252ssTF028426@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/mkinitrd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28391 Modified Files: .cvsignore mkinitrd.spec sources Log Message: * Tue Mar 4 2008 Jeremy Katz - 6.0.32-1 - Support keymaps for encrypted root devices (dlehman) - Add persistence bits to mkliveinitrd (based on changes by Douglas McClendon) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/mkinitrd/.cvsignore,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- .cvsignore 26 Feb 2008 22:32:55 -0000 1.171 +++ .cvsignore 5 Mar 2008 02:54:19 -0000 1.172 @@ -1 +1 @@ -mkinitrd-6.0.31.tar.bz2 +mkinitrd-6.0.32.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/pkgs/devel/mkinitrd/mkinitrd.spec,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- mkinitrd.spec 26 Feb 2008 22:32:55 -0000 1.249 +++ mkinitrd.spec 5 Mar 2008 02:54:19 -0000 1.250 @@ -2,7 +2,7 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 6.0.31 +Version: 6.0.32 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -115,6 +115,10 @@ %{_libdir}/libbdevid.so.* %changelog +* Tue Mar 4 2008 Jeremy Katz - 6.0.32-1 +- Support keymaps for encrypted root devices (dlehman) +- Add persistence bits to mkliveinitrd (based on changes by Douglas McClendon) + * Tue Feb 26 2008 Jeremy Katz - 6.0.31-1 - Add mkliveinitrd Index: sources =================================================================== RCS file: /cvs/pkgs/devel/mkinitrd/sources,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- sources 26 Feb 2008 22:32:55 -0000 1.213 +++ sources 5 Mar 2008 02:54:19 -0000 1.214 @@ -1 +1 @@ -5a936c4e6522cbb3f9378d705174aff8 mkinitrd-6.0.31.tar.bz2 +ed2bd2fe3c04aed2e784db2d128b1cdc mkinitrd-6.0.32.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 02:56:57 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 5 Mar 2008 02:56:57 GMT Subject: devel/anaconda .cvsignore, 1.500, 1.501 anaconda.spec, 1.640, 1.641 sources, 1.632, 1.633 Message-ID: <200803050256.m252uv7p028513@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/anaconda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28488 Modified Files: .cvsignore anaconda.spec sources Log Message: * Tue Mar 04 2008 Jeremy Katz - 11.4.0.44-1 - Add --archlist to repoquery call. (jkeating) - Translation updates (pl, nl, ja) - Handle efibootmgr and grub.efi in upd-instroot. (pjones) - Merge in branch to implement stage2= parameter. (clumens) - Revert the memtest86 bits for EFI, since this gets run on multiple arches. (pjones) - Use iutil.isEfi() instead of testing for ia64-ness. (pjones) - Only do gptsync if we're not using EFI. (pjones) - Don't do gptsync if we're using EFI. (pjones) - Use gpt on all efi platforms. (pjones) - Rework isEfi() to be slightly more conservative. (pjones) - Test for using efi rather than arch==ia64 (pjones) - Don't copy memtest86 in on EFI since it won't work. (pjones) - Add comment regarding usage of elilo (pjones) - Free some variables so we can http GET twice if needed. (clumens) - Change the method config prompts. (clumens) - Support stage2= for CD installs in loader. (clumens) - Support stage2= for HD installs. (clumens) - Support stage2= for NFS installs. (clumens) - Support stage2= for URL installs. (clumens) - Update the method string handling for NFS and URL installs. (clumens) - mountStage2 now needs to take an extra argument for updates. (clumens) - If stage2= is given, it overrides the check for a CD stage2 image. (clumens) - Support the stage2= parameter, and add a flag for it. (clumens) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v retrieving revision 1.500 retrieving revision 1.501 diff -u -r1.500 -r1.501 --- .cvsignore 4 Mar 2008 04:45:39 -0000 1.500 +++ .cvsignore 5 Mar 2008 02:56:22 -0000 1.501 @@ -1 +1 @@ -anaconda-11.4.0.43.tar.bz2 +anaconda-11.4.0.44.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v retrieving revision 1.640 retrieving revision 1.641 diff -u -r1.640 -r1.641 --- anaconda.spec 4 Mar 2008 04:45:39 -0000 1.640 +++ anaconda.spec 5 Mar 2008 02:56:22 -0000 1.641 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.43 +Version: 11.4.0.44 Release: 1 License: GPLv2+ Group: Applications/System @@ -209,6 +209,31 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Mar 04 2008 Jeremy Katz - 11.4.0.44-1 +- Add --archlist to repoquery call. (jkeating) +- Translation updates (pl, nl, ja) +- Handle efibootmgr and grub.efi in upd-instroot. (pjones) +- Merge in branch to implement stage2= parameter. (clumens) +- Revert the memtest86 bits for EFI, since this gets run on multiple arches. (pjones) +- Use iutil.isEfi() instead of testing for ia64-ness. (pjones) +- Only do gptsync if we're not using EFI. (pjones) +- Don't do gptsync if we're using EFI. (pjones) +- Use gpt on all efi platforms. (pjones) +- Rework isEfi() to be slightly more conservative. (pjones) +- Test for using efi rather than arch==ia64 (pjones) +- Don't copy memtest86 in on EFI since it won't work. (pjones) +- Add comment regarding usage of elilo (pjones) +- Free some variables so we can http GET twice if needed. (clumens) +- Change the method config prompts. (clumens) +- Support stage2= for CD installs in loader. (clumens) +- Support stage2= for HD installs. (clumens) +- Support stage2= for NFS installs. (clumens) +- Support stage2= for URL installs. (clumens) +- Update the method string handling for NFS and URL installs. (clumens) +- mountStage2 now needs to take an extra argument for updates. (clumens) +- If stage2= is given, it overrides the check for a CD stage2 image. (clumens) +- Support the stage2= parameter, and add a flag for it. (clumens) + * Mon Mar 03 2008 Jeremy Katz - 11.4.0.43-1 - Only use UUID= for devices we would have labeled. Related to #435228 (katzj) - If we don't find a kernel package, then give a better error (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/devel/anaconda/sources,v retrieving revision 1.632 retrieving revision 1.633 diff -u -r1.632 -r1.633 --- sources 4 Mar 2008 04:45:39 -0000 1.632 +++ sources 5 Mar 2008 02:56:22 -0000 1.633 @@ -1 +1 @@ -aacaa6770b25ea669dabc5e759dd7544 anaconda-11.4.0.43.tar.bz2 +82ae849323c123c831e6562b470e9dfe anaconda-11.4.0.44.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 02:59:06 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Wed, 5 Mar 2008 02:59:06 GMT Subject: rpms/gnonlin/devel gnonlin.spec,1.17,1.18 Message-ID: <200803050259.m252x6iu028610@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/gnonlin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28581 Modified Files: gnonlin.spec Log Message: Update source URL, but no rebuild for now. Index: gnonlin.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnonlin/devel/gnonlin.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnonlin.spec 9 Feb 2008 00:09:27 -0000 1.17 +++ gnonlin.spec 5 Mar 2008 02:58:29 -0000 1.18 @@ -3,13 +3,13 @@ Name: gnonlin Version: 0.10.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GStreamer extension library for non-linear editing Group: System Environment/Libraries License: LGPLv2+ URL: http://gnonlin.sourceforge.net/ -Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source: http://gstreamer.freedesktop.org/src/gnonlin/gnonlin-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gstreamer-devel >= %{gst_req} @@ -51,6 +51,9 @@ %changelog +* Tue Mar 4 2008 Jeffrey C. Ollie - 0.10.9-4 +- Update source url. + * Fri Feb 8 2008 Brian Pepple - 0.10.9-3 - Rebuild for gcc-4.3. From fedora-extras-commits at redhat.com Wed Mar 5 03:02:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 03:02:50 GMT Subject: rpms/perl-bioperl/devel perl-bioperl.spec,1.11,1.12 Message-ID: <200803050302.m2532ocR003351@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-bioperl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3330 Modified Files: perl-bioperl.spec Log Message: new perl Index: perl-bioperl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-bioperl/devel/perl-bioperl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-bioperl.spec 5 Mar 2008 02:42:38 -0000 1.11 +++ perl-bioperl.spec 5 Mar 2008 03:02:05 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-bioperl Version: 1.5.2_102 -Release: 11%{?dist}.1 +Release: 11%{?dist}.2 Summary: Perl tools for computational molecular biology Group: Development/Libraries @@ -61,7 +61,7 @@ cat << \EOF > %{_builddir}/bioperl-%{version}/%{name}-req #!/bin/sh %{__perl_requires} $* |\ - sed -e '/perl(Bio::Tools::Run::Alignment::Clustalw)/d; /perl(Bio::Tools::Run::GenericParameters)/d; /perl(Bio::Tools::Run::Phylo::Molphy::ProtML)/d; /perl(Bio::Tools::Run::Phylo::Phylip::Neighbor)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtDist)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtPars)/d' + sed -e '/perl(Bio::Tools::Run::Alignment::Clustalw)/d; /perl(Bio::Tools::Run::GenericParameters)/d; /perl(Bio::Tools::Run::Phylo::Molphy::ProtML)/d; /perl(Bio::Tools::Run::Phylo::Phylip::Neighbor)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtDist)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtPars)/d; /perl(Bio::Tools::Run::RemoteBlast)/d' EOF %define __perl_requires %{_builddir}/bioperl-%{version}/%{name}-req @@ -117,6 +117,9 @@ %{_mandir}/man3/*.3* %changelog +* Tue Mar 4 2008 Tom "spot" Callaway 1.5.2_102-11.2 +- missed one + * Tue Mar 4 2008 Tom "spot" Callaway 1.5.2_102-11.1 - actually disable bioperl-run requires for bootstrapping From fedora-extras-commits at redhat.com Wed Mar 5 03:13:29 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 5 Mar 2008 03:13:29 GMT Subject: rpms/WebKit/F-8 .cvsignore, 1.2, 1.3 WebKit.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803050313.m253DTXM003567@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3537/F-8 Modified Files: .cvsignore WebKit.spec sources Log Message: Sync with devel, updating to SVN 30667 and fixing some bugs. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Dec 2007 00:40:47 -0000 1.2 +++ .cvsignore 5 Mar 2008 03:12:54 -0000 1.3 @@ -1 +1 @@ -WebKit-r28482.tar.bz2 +WebKit-r30667.tar.bz2 Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-8/WebKit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- WebKit.spec 12 Dec 2007 00:40:47 -0000 1.1 +++ WebKit.spec 5 Mar 2008 03:12:54 -0000 1.2 @@ -3,11 +3,11 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \ echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list -%define svn_revision 28482 +%define svn_revision 30667 Name: WebKit Version: 1.0.0 -Release: 0.3.svn%{svn_revision}%{?dist} +Release: 0.6.svn%{svn_revision}%{?dist} Summary: Web content engine library Group: Development/Libraries @@ -18,11 +18,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## Currently does not build by default on PPC due to some assembly issues in -## the JavaScriptCore/wtf/TCSystemAlloc.cpp code. We disable the assembly -## usage and opt for using the portable pthread implementation instead. -Patch0: %{name}-TCSpinLock-use-pthread-stubs.patch - BuildRequires: bison BuildRequires: curl-devel BuildRequires: flex @@ -35,7 +30,7 @@ BuildRequires: sqlite-devel %description -WebKit is an open source web browser engine. +WebKit is an open source web browser engine. %package gtk Summary: GTK+ port of WebKit @@ -98,7 +93,6 @@ %prep %setup -qn "%{name}-r%{svn_revision}" -%patch0 -p0 -b .TCSpinLock-pthread-stubs %build ## We don't like pre-built binaries, especially ones for other OSes. =) @@ -119,7 +113,7 @@ VERSION=%{version} \ CONFIG-=qt \ CONFIG+=gtk-port \ - WEBKIT_INC_DIR=%{_includedir}/WebKit \ + WEBKIT_INC_DIR=%{_includedir}/webkit \ WEBKIT_LIB_DIR=%{_libdir} \ ../WebKit.pro make %{?_smp_mflags} @@ -138,7 +132,6 @@ VERSION=%{version} \ CONFIG-=gtk \ CONFIG+=qt-port \ - WEBKIT_INC_DIR=%{_includedir}/WebKit \ WEBKIT_LIB_DIR=%{_libdir} \ ../WebKit.pro make %{?_smp_mflags} @@ -168,6 +161,7 @@ ## Finally, copy over and rename the various files for %%doc inclusion. rm -f docfiles.list +%add_to_doc_files JavaScriptCore/COPYING.LIB %add_to_doc_files JavaScriptCore/icu/LICENSE %add_to_doc_files JavaScriptGlue/LICENSE %add_to_doc_files WebKit/LICENSE @@ -176,12 +170,13 @@ %add_to_doc_files WebCore/icu/LICENSE %add_to_doc_files JavaScriptCore/icu/README -%add_to_doc_files WebCore/README %add_to_doc_files WebCore/icu/README %add_to_doc_files JavaScriptCore/AUTHORS %add_to_doc_files JavaScriptCore/pcre/AUTHORS +%add_to_doc_files JavaScriptCore/THANKS + %clean rm -rf %{buildroot} @@ -206,8 +201,10 @@ %files gtk-devel %defattr(-,root,root,-) -%{_includedir}/WebKit -%{_libdir}/libWebKitGtk.prl +## The .prl file stores information only on how the library was built, and is +## not needed for linking. +%exclude %{_libdir}/libWebKitGtk.prl +%{_includedir}/webkit %{_libdir}/libWebKitGtk.so %{_libdir}/pkgconfig/WebKitGtk.pc @@ -232,6 +229,17 @@ %changelog +* Sat Mar 01 2008 Peter Gordon 1.0.0-0.6.svn30667 +- Fix include directory naming. Resolves: bug 435561 (Header file <> header + file location mismatch) +- Remove qt4-devel runtime dependency and .prl file from WebKit-gtk-devel. + Resolves: bug 433138 (WebKit-gtk-devel has a requirement on qt4-devel) + +* Fri Feb 29 2008 Peter Gordon 1.0.0-0.5.svn30667 +- Update to new upstream snapshot (SVN 30667) +- Drop TCSpinLock pthread workaround (fixed upstream): + - TCSpinLock-use-pthread-stubs.patch + * Thu Dec 06 2007 Peter Gordon 1.0.0-0.3.svn28482 - Add proper %%defattr line to qt, qt-devel, and doc subpackages. - Add patch to forcibly build the TCSpinLock code using the pthread Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Dec 2007 00:40:47 -0000 1.2 +++ sources 5 Mar 2008 03:12:54 -0000 1.3 @@ -1 +1 @@ -e2e8dcae34e6c06aa410c3abefc3fff0 WebKit-r28482.tar.bz2 +d5047727add37bdbba6a4642b0a9c0f4 WebKit-r30667.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 03:21:28 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 5 Mar 2008 03:21:28 GMT Subject: devel/anaconda .cvsignore, 1.501, 1.502 anaconda.spec, 1.641, 1.642 sources, 1.633, 1.634 Message-ID: <200803050321.m253LSjX003709@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/anaconda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3679 Modified Files: .cvsignore anaconda.spec sources Log Message: * Tue Mar 04 2008 Jeremy Katz - 11.4.0.45-1 - Fix the build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v retrieving revision 1.501 retrieving revision 1.502 diff -u -r1.501 -r1.502 --- .cvsignore 5 Mar 2008 02:56:22 -0000 1.501 +++ .cvsignore 5 Mar 2008 03:20:49 -0000 1.502 @@ -1 +1 @@ -anaconda-11.4.0.44.tar.bz2 +anaconda-11.4.0.45.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v retrieving revision 1.641 retrieving revision 1.642 diff -u -r1.641 -r1.642 --- anaconda.spec 5 Mar 2008 02:56:22 -0000 1.641 +++ anaconda.spec 5 Mar 2008 03:20:49 -0000 1.642 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.44 +Version: 11.4.0.45 Release: 1 License: GPLv2+ Group: Applications/System @@ -209,6 +209,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Mar 04 2008 Jeremy Katz - 11.4.0.45-1 +- Fix the build. + * Tue Mar 04 2008 Jeremy Katz - 11.4.0.44-1 - Add --archlist to repoquery call. (jkeating) - Translation updates (pl, nl, ja) Index: sources =================================================================== RCS file: /cvs/pkgs/devel/anaconda/sources,v retrieving revision 1.633 retrieving revision 1.634 diff -u -r1.633 -r1.634 --- sources 5 Mar 2008 02:56:22 -0000 1.633 +++ sources 5 Mar 2008 03:20:49 -0000 1.634 @@ -1 +1 @@ -82ae849323c123c831e6562b470e9dfe anaconda-11.4.0.44.tar.bz2 +85af662ab06fe70ee30f4cc34e2cb60a anaconda-11.4.0.45.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 03:43:54 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 5 Mar 2008 03:43:54 GMT Subject: rpms/xulrunner/devel .cvsignore, 1.32, 1.33 sources, 1.33, 1.34 xulrunner.spec, 1.83, 1.84 Message-ID: <200803050343.m253hs5j004083@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4040 Modified Files: .cvsignore sources xulrunner.spec Log Message: * Tue Mar 4 2008 Christopher Aillon 1.9-0.beta4.34 - Update to latest trunk (2008-03-04) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 3 Mar 2008 03:27:42 -0000 1.32 +++ .cvsignore 5 Mar 2008 03:43:15 -0000 1.33 @@ -1 +1 @@ -mozilla-20080302.tar.bz2 +mozilla-20080304.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 3 Mar 2008 03:27:42 -0000 1.33 +++ sources 5 Mar 2008 03:43:15 -0000 1.34 @@ -1 +1 @@ -1466d3cd204dde4716c9732313f0ce0c mozilla-20080302.tar.bz2 +c487d5d5ce437b43f342a5a8657e0527 mozilla-20080304.tar.bz2 Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- xulrunner.spec 3 Mar 2008 03:27:42 -0000 1.83 +++ xulrunner.spec 5 Mar 2008 03:43:15 -0000 1.84 @@ -7,14 +7,14 @@ %define version_internal 1.9pre %if ! %{official_branding} -%define cvsdate 20080302 +%define cvsdate 20080304 %define nightly .nightly%{cvsdate} %endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.beta3.33%{?nightly}%{?dist} +Release: 0.beta4.34%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -400,6 +400,9 @@ #--------------------------------------------------------------------- %changelog +* Tue Mar 4 2008 Christopher Aillon 1.9-0.beta4.34 +- Update to latest trunk (2008-03-04) + * Sun Mar 2 2008 Christopher Aillon 1.9-0.beta3.33 - Update to latest trunk (2008-03-02) From fedora-extras-commits at redhat.com Wed Mar 5 03:44:46 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 5 Mar 2008 03:44:46 GMT Subject: rpms/firefox/devel .cvsignore, 1.62, 1.63 firefox.spec, 1.266, 1.267 sources, 1.73, 1.74 Message-ID: <200803050344.m253ikUd004160@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4130 Modified Files: .cvsignore firefox.spec sources Log Message: * Tue Mar 4 2008 Christopher Aillon 3.0-0.beta3.34 - Update to latest trunk (2008-03-04) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 3 Mar 2008 03:28:00 -0000 1.62 +++ .cvsignore 5 Mar 2008 03:44:01 -0000 1.63 @@ -1 +1 @@ -mozilla-20080302.tar.bz2 +mozilla-20080304.tar.bz2 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- firefox.spec 3 Mar 2008 03:28:00 -0000 1.266 +++ firefox.spec 5 Mar 2008 03:44:01 -0000 1.267 @@ -3,24 +3,24 @@ %define desktop_file_utils_version 0.9 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -%define version_internal 3.0b4pre +%define version_internal 3.0b5pre %define mozappdir %{_libdir}/%{name}-%{version_internal} %define gecko_version 1.9 -%define xulrunner_version 1.9-0.beta3.33 +%define xulrunner_version 1.9-0.beta4.34 %define official_branding 0 %define build_langpacks 0 %if ! %{official_branding} -%define cvsdate 20080302 +%define cvsdate 20080304 %define nightly .nightly%{cvsdate} %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.beta3.33%{?nightly}%{?dist} +Release: 0.beta3.34%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -315,6 +315,9 @@ #--------------------------------------------------------------------- %changelog +* Tue Mar 4 2008 Christopher Aillon 3.0-0.beta3.34 +- Update to latest trunk (2008-03-04) + * Sun Mar 2 2008 Christopher Aillon 3.0-0.beta3.33 - Update to latest trunk (2008-03-02) Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/sources,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- sources 3 Mar 2008 03:28:00 -0000 1.73 +++ sources 5 Mar 2008 03:44:01 -0000 1.74 @@ -1 +1 @@ -1466d3cd204dde4716c9732313f0ce0c mozilla-20080302.tar.bz2 +c487d5d5ce437b43f342a5a8657e0527 mozilla-20080304.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 03:49:59 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 5 Mar 2008 03:49:59 GMT Subject: rpms/firefox/devel firefox.spec,1.267,1.268 Message-ID: <200803050350.m253nxXj004368@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4345 Modified Files: firefox.spec Log Message: post-beta4 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- firefox.spec 5 Mar 2008 03:44:01 -0000 1.267 +++ firefox.spec 5 Mar 2008 03:49:21 -0000 1.268 @@ -20,7 +20,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.beta3.34%{?nightly}%{?dist} +Release: 0.beta4.34%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet From fedora-extras-commits at redhat.com Wed Mar 5 03:51:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 03:51:19 +0000 Subject: [pkgdb] udev: airlied has requested commit Message-ID: <200803050352.m253qXIO017280@bastion.fedora.phx.redhat.com> Dave Airlie (airlied) has requested the commit acl on udev (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/udev From fedora-extras-commits at redhat.com Wed Mar 5 03:53:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 03:53:04 +0000 Subject: [pkgdb] udev: airlied has given up commit Message-ID: <200803050354.m253sIlw017314@bastion.fedora.phx.redhat.com> Dave Airlie (airlied) has given up the commit acl on udev (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/udev From fedora-extras-commits at redhat.com Wed Mar 5 03:55:44 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 5 Mar 2008 03:55:44 GMT Subject: rpms/gtk2/devel lpoptions.patch,NONE,1.1 gtk2.spec,1.282,1.283 Message-ID: <200803050355.m253tijV004509@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4484 Modified Files: gtk2.spec Added Files: lpoptions.patch Log Message: Honor cups user default options from ~/.cups/lpoptions lpoptions.patch: --- NEW FILE lpoptions.patch --- diff -up gtk+-2.12.8/modules/printbackends/cups/gtkprintbackendcups.c.lpoptions gtk+-2.12.8/modules/printbackends/cups/gtkprintbackendcups.c --- gtk+-2.12.8/modules/printbackends/cups/gtkprintbackendcups.c.lpoptions 2008-03-04 22:52:25.000000000 -0500 +++ gtk+-2.12.8/modules/printbackends/cups/gtkprintbackendcups.c 2008-03-04 22:52:50.000000000 -0500 @@ -20,6 +20,7 @@ */ #include +#include #include #include #include @@ -1403,6 +1404,158 @@ cups_request_ppd (GtkPrinter *printer) (GDestroyNotify)get_ppd_data_free); } +/* Ordering matters for default preference */ +static const char *lpoptions_locations[] = { + "/etc/cups/lpoptions", + ".lpoptions", + ".cups/lpoptions" +}; + +static void +cups_parse_user_default_printer (const char *filename, + char **printer_name) +{ + FILE *fp; + char line[1024], *lineptr, *defname = NULL; + + if ((fp = g_fopen (filename, "r")) == NULL) + return; + + while (fgets (line, sizeof (line), fp) != NULL) + { + if (strncasecmp (line, "default", 7) != 0 || !isspace (line[7])) + continue; + + lineptr = line + 8; + while (isspace (*lineptr)) + lineptr++; + + if (!*lineptr) + continue; + + defname = lineptr; + while (!isspace (*lineptr) && *lineptr && *lineptr != '/') + lineptr++; + + *lineptr = '\0'; + + if (*printer_name != NULL) + g_free (*printer_name); + + *printer_name = g_strdup (defname); + } + + fclose (fp); +} + +static void +cups_get_user_default_printer (char **printer_name) +{ + int i; + + for (i = 0; i < G_N_ELEMENTS (lpoptions_locations); i++) + { + if (g_path_is_absolute (lpoptions_locations[i])) + { + cups_parse_user_default_printer (lpoptions_locations[i], + printer_name); + } + else + { + char *filename; + + filename = g_build_filename (g_get_home_dir (), + lpoptions_locations[i], NULL); + cups_parse_user_default_printer (filename, printer_name); + g_free (filename); + } + } +} + +static int +cups_parse_user_options (const char *filename, + const char *printer_name, + int num_options, + cups_option_t **options) +{ + FILE *fp; + gchar line[1024], *lineptr, *name; + + if ((fp = g_fopen (filename, "r")) == NULL) + return num_options; + + while (fgets (line, sizeof (line), fp) != NULL) + { + if (strncasecmp (line, "dest", 4) == 0 && isspace (line[4])) + lineptr = line + 4; + else if (strncasecmp (line, "default", 7) == 0 && isspace (line[7])) + lineptr = line + 7; + else + continue; + + /* Skip leading whitespace */ + while (isspace (*lineptr)) + lineptr++; + + if (!*lineptr) + continue; + + /* NUL-terminate the name, stripping the instance name */ + name = lineptr; + while (!isspace (*lineptr) && *lineptr) + { + if (*lineptr == '/') + *lineptr = '\0'; + lineptr++; + } + + if (!*lineptr) + continue; + + *lineptr++ = '\0'; + + if (strncasecmp (name, printer_name, strlen (printer_name)) != 0) + continue; + + /* We found our printer, parse the options */ + num_options = cupsParseOptions (lineptr, num_options, options); + } + + fclose (fp); + + return num_options; +} + +static int +cups_get_user_options (const char *printer_name, + int num_options, + cups_option_t **options) +{ + int i; + + for (i = 0; i < sizeof (lpoptions_locations); i++) + { + if (g_path_is_absolute (lpoptions_locations[i])) + { + num_options = cups_parse_user_options (lpoptions_locations[i], + printer_name, + num_options, + options); + } + else + { + char *filename; + + filename = g_build_filename (g_get_home_dir (), + lpoptions_locations[i], NULL); + num_options = cups_parse_user_options (filename, printer_name, + num_options, options); + g_free (filename); + } + } + + return num_options; +} static void cups_request_default_printer_cb (GtkPrintBackendCups *print_backend, @@ -1431,6 +1584,7 @@ cups_request_default_printer (GtkPrintBa { GtkCupsRequest *request; const char *str; + char *name = NULL; if ((str = g_getenv ("LPDEST")) != NULL) { @@ -1446,6 +1600,15 @@ cups_request_default_printer (GtkPrintBa return; } + /* Figure out user setting for default printer */ + cups_get_user_default_printer (&name); + if (name != NULL) + { + print_backend->default_printer = name; + print_backend->got_default_printer = TRUE; + return; + } + request = gtk_cups_request_new (NULL, GTK_CUPS_POST, CUPS_GET_DEFAULT, @@ -2214,6 +2377,9 @@ cups_printer_get_options (GtkPrinter char *prio_display[] = {N_("Urgent"), N_("High"), N_("Medium"), N_("Low") }; char *cover[] = {"none", "classified", "confidential", "secret", "standard", "topsecret", "unclassified" }; char *cover_display[] = {N_("None"), N_("Classified"), N_("Confidential"), N_("Secret"), N_("Standard"), N_("Top Secret"), N_("Unclassified"),}; + char *name; + int num_opts; + cups_option_t *opts = NULL; set = gtk_printer_option_set_new (); @@ -2310,6 +2476,23 @@ cups_printer_get_options (GtkPrinter handle_group (set, ppd_file, &ppd_file->groups[i], &ppd_file->groups[i], settings); } + /* Now honor the user set defaults for this printer */ + num_opts = cups_get_user_options (gtk_printer_get_name (printer), 0, &opts); + + for (i = 0; i < num_opts; i++) + { + if (STRING_IN_TABLE (opts->name, cups_option_blacklist)) + continue; + + name = get_option_name (opts[i].name); + option = gtk_printer_option_set_lookup (set, name); + if (option) + gtk_printer_option_set (option, opts[i].value); + g_free (name); + } + + cupsFreeOptions (num_opts, opts); + return set; } Index: gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.282 retrieving revision 1.283 diff -u -r1.282 -r1.283 --- gtk2.spec 26 Feb 2008 06:19:48 -0000 1.282 +++ gtk2.spec 5 Mar 2008 03:55:09 -0000 1.283 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2 @@ -40,6 +40,9 @@ # fixed upstream Patch5: libbeagle.patch +# fixed in upstream svn +Patch6: lpoptions.patch + BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -120,6 +123,7 @@ %patch3 -p1 -b .system-log-crash %patch4 -p1 -b .im-setting %patch5 -p1 -b .libbeagle +%patch6 -p1 -b .lpoptions for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -302,6 +306,9 @@ %{_datadir}/gtk-2.0 %changelog +* Tue Mar 4 2008 Matthias Clasen - 2.12.8-3 +- Honor cups user default options from ~/.cups/lpoptions + * Tue Feb 26 2008 Matthias Clasen - 2.12.8-2 - Work with libbeagle.so.1 From fedora-extras-commits at redhat.com Wed Mar 5 04:04:04 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 5 Mar 2008 04:04:04 GMT Subject: rpms/WebKit/F-7 .cvsignore, 1.2, 1.3 WebKit.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803050404.m25444fQ012203@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12028/F-7 Modified Files: .cvsignore WebKit.spec sources Log Message: Sync with devel, updating to SVN 30667 and fixing some bugs. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Dec 2007 00:42:30 -0000 1.2 +++ .cvsignore 5 Mar 2008 04:03:26 -0000 1.3 @@ -1 +1 @@ -WebKit-r28482.tar.bz2 +WebKit-r30667.tar.bz2 Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-7/WebKit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- WebKit.spec 12 Dec 2007 00:42:30 -0000 1.1 +++ WebKit.spec 5 Mar 2008 04:03:26 -0000 1.2 @@ -3,11 +3,11 @@ cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \ echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list -%define svn_revision 28482 +%define svn_revision 30667 Name: WebKit Version: 1.0.0 -Release: 0.3.svn%{svn_revision}%{?dist} +Release: 0.6.svn%{svn_revision}%{?dist} Summary: Web content engine library Group: Development/Libraries @@ -18,11 +18,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## Currently does not build by default on PPC due to some assembly issues in -## the JavaScriptCore/wtf/TCSystemAlloc.cpp code. We disable the assembly -## usage and opt for using the portable pthread implementation instead. -Patch0: %{name}-TCSpinLock-use-pthread-stubs.patch - BuildRequires: bison BuildRequires: curl-devel BuildRequires: flex @@ -35,7 +30,7 @@ BuildRequires: sqlite-devel %description -WebKit is an open source web browser engine. +WebKit is an open source web browser engine. %package gtk Summary: GTK+ port of WebKit @@ -98,7 +93,6 @@ %prep %setup -qn "%{name}-r%{svn_revision}" -%patch0 -p0 -b .TCSpinLock-pthread-stubs %build ## We don't like pre-built binaries, especially ones for other OSes. =) @@ -119,7 +113,7 @@ VERSION=%{version} \ CONFIG-=qt \ CONFIG+=gtk-port \ - WEBKIT_INC_DIR=%{_includedir}/WebKit \ + WEBKIT_INC_DIR=%{_includedir}/webkit \ WEBKIT_LIB_DIR=%{_libdir} \ ../WebKit.pro make %{?_smp_mflags} @@ -138,7 +132,6 @@ VERSION=%{version} \ CONFIG-=gtk \ CONFIG+=qt-port \ - WEBKIT_INC_DIR=%{_includedir}/WebKit \ WEBKIT_LIB_DIR=%{_libdir} \ ../WebKit.pro make %{?_smp_mflags} @@ -168,6 +161,7 @@ ## Finally, copy over and rename the various files for %%doc inclusion. rm -f docfiles.list +%add_to_doc_files JavaScriptCore/COPYING.LIB %add_to_doc_files JavaScriptCore/icu/LICENSE %add_to_doc_files JavaScriptGlue/LICENSE %add_to_doc_files WebKit/LICENSE @@ -176,12 +170,13 @@ %add_to_doc_files WebCore/icu/LICENSE %add_to_doc_files JavaScriptCore/icu/README -%add_to_doc_files WebCore/README %add_to_doc_files WebCore/icu/README %add_to_doc_files JavaScriptCore/AUTHORS %add_to_doc_files JavaScriptCore/pcre/AUTHORS +%add_to_doc_files JavaScriptCore/THANKS + %clean rm -rf %{buildroot} @@ -206,8 +201,10 @@ %files gtk-devel %defattr(-,root,root,-) -%{_includedir}/WebKit -%{_libdir}/libWebKitGtk.prl +## The .prl file stores information only on how the library was built, and is +## not needed for linking. +%exclude %{_libdir}/libWebKitGtk.prl +%{_includedir}/webkit %{_libdir}/libWebKitGtk.so %{_libdir}/pkgconfig/WebKitGtk.pc @@ -232,6 +229,17 @@ %changelog +* Sat Mar 01 2008 Peter Gordon 1.0.0-0.6.svn30667 +- Fix include directory naming. Resolves: bug 435561 (Header file <> header + file location mismatch) +- Remove qt4-devel runtime dependency and .prl file from WebKit-gtk-devel. + Resolves: bug 433138 (WebKit-gtk-devel has a requirement on qt4-devel) + +* Fri Feb 29 2008 Peter Gordon 1.0.0-0.5.svn30667 +- Update to new upstream snapshot (SVN 30667) +- Drop TCSpinLock pthread workaround (fixed upstream): + - TCSpinLock-use-pthread-stubs.patch + * Thu Dec 06 2007 Peter Gordon 1.0.0-0.3.svn28482 - Add proper %%defattr line to qt, qt-devel, and doc subpackages. - Add patch to forcibly build the TCSpinLock code using the pthread @@ -248,4 +256,4 @@ - Add various AUTHORS, README, and LICENSE files (via the doc subpackage). * Tue Dec 04 2007 Peter Gordon 1.0.0-0.1.svn28383 -- Initial packaging for Fedora. \ No newline at end of file +- Initial packaging for Fedora. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Dec 2007 00:42:30 -0000 1.2 +++ sources 5 Mar 2008 04:03:26 -0000 1.3 @@ -1 +1 @@ -e2e8dcae34e6c06aa410c3abefc3fff0 WebKit-r28482.tar.bz2 +d5047727add37bdbba6a4642b0a9c0f4 WebKit-r30667.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 04:05:26 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 5 Mar 2008 04:05:26 GMT Subject: rpms/libgnomecups/devel lpoptions.patch, NONE, 1.1 libgnomecups.spec, 1.51, 1.52 Message-ID: <200803050405.m2545QC8012292@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgnomecups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12194 Modified Files: libgnomecups.spec Added Files: lpoptions.patch Log Message: Honor cups user default options from ~/.cups/lpoptions lpoptions.patch: --- NEW FILE lpoptions.patch --- --- libgnomecups-0.2.2.orig/libgnomecups/gnome-cups-printer.c +++ libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c @@ -510,6 +510,10 @@ num_dests = cups_get_dests (filename, num_dests, dests); g_free (filename); + filename = g_build_filename (g_get_home_dir (), ".cups", "lpoptions", NULL); + num_dests = cups_get_dests (filename, num_dests, dests); + g_free (filename); + return num_dests; } Index: libgnomecups.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomecups/devel/libgnomecups.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- libgnomecups.spec 19 Feb 2008 00:30:13 -0000 1.51 +++ libgnomecups.spec 5 Mar 2008 04:04:33 -0000 1.52 @@ -1,7 +1,7 @@ Summary: GNOME library for CUPS integration Name: libgnomecups Version: 0.2.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2 Group: Development/Libraries URL: http://www.gnome.org @@ -19,6 +19,7 @@ Patch2: libgnomecups-no-gnome-common.patch Patch3: libgnomecups-dbus.patch Patch5: libgnomecups-0.1.14-go-direct.patch +Patch6: libgnomecups-lpoptions.patch %description GNOME library for CUPS integration @@ -38,6 +39,7 @@ %patch2 -p1 -b .no-gnome-common %patch3 -p1 -b .dbus %patch5 -p1 -b .go-direct +%patch6 -p1 -b .lpoptions %build @@ -72,6 +74,9 @@ %{_libdir}/*.so %changelog +* Tue Mar 4 2008 Matthias Clasen - 0.2.3-3 +- Honor cups user default options from ~/.cups/lpoptions + * Mon Feb 18 2008 Fedora Release Engineering - 0.2.3-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 04:05:54 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Wed, 5 Mar 2008 04:05:54 GMT Subject: rpms/scim/devel scim.spec,1.109,1.110 Message-ID: <200803050405.m2545sYE012318@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12272 Modified Files: scim.spec Log Message: Remove scim-restart script for fixing #435889. Index: scim.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- scim.spec 4 Mar 2008 04:38:54 -0000 1.109 +++ scim.spec 5 Mar 2008 04:05:12 -0000 1.110 @@ -3,7 +3,7 @@ Name: scim Version: 1.4.7 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Smart Common Input Method platform License: LGPLv2+ @@ -148,7 +148,7 @@ %prep %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} -a2 -%patch1 -p1 -b .1-restart~ +# %patch1 -p1 -b .1-restart~ %patch6 -p1 -b .6-config~ %patch7 -p1 -b .7-emacs-ccmode~ %patch8 -p1 -b .8-hotkey~ @@ -299,6 +299,9 @@ %changelog +* Wed Mar 5 2008 Huang Peng - 1.4.7-16 +- Remove scim-restart script for fixing #435889. + * Tue Mar 4 2008 Huang Peng - 1.4.7-15 - Let scim gtkim context work with gtk plug widget #251878. From fedora-extras-commits at redhat.com Wed Mar 5 04:08:13 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 5 Mar 2008 04:08:13 GMT Subject: rpms/libgnomecups/devel libgnomecups-lpoptions.patch,NONE,1.1 Message-ID: <200803050408.m2548DMU012472@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgnomecups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12461 Added Files: libgnomecups-lpoptions.patch Log Message: add patch libgnomecups-lpoptions.patch: --- NEW FILE libgnomecups-lpoptions.patch --- --- libgnomecups-0.2.2.orig/libgnomecups/gnome-cups-printer.c +++ libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c @@ -510,6 +510,10 @@ num_dests = cups_get_dests (filename, num_dests, dests); g_free (filename); + filename = g_build_filename (g_get_home_dir (), ".cups", "lpoptions", NULL); + num_dests = cups_get_dests (filename, num_dests, dests); + g_free (filename); + return num_dests; } From fedora-extras-commits at redhat.com Wed Mar 5 04:14:02 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Wed, 5 Mar 2008 04:14:02 GMT Subject: rpms/libdrm/devel 91-drm-modeset.rules, NONE, 1.1 libdrm.spec, 1.35, 1.36 Message-ID: <200803050414.m254E2Gn012628@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/libdrm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12605 Modified Files: libdrm.spec Added Files: 91-drm-modeset.rules Log Message: * Wed Mar 05 2008 Dave Airlie 2.4.0-0.7 - add udev rules for modesetting nodes. --- NEW FILE 91-drm-modeset.rules --- KERNEL=="controlD[0-9]*", NAME="dri/%k", MODE="0666" Index: libdrm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- libdrm.spec 5 Mar 2008 00:50:26 -0000 1.35 +++ libdrm.spec 5 Mar 2008 04:13:07 -0000 1.36 @@ -3,7 +3,7 @@ Summary: Direct Rendering Manager runtime library Name: libdrm Version: 2.4.0 -Release: 0.6%{?dist} +Release: 0.7%{?dist} License: MIT Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -14,6 +14,8 @@ BuildRequires: pkgconfig automake autoconf libtool +Source2: 91-drm-modeset.rules + Patch1: libdrm-modesetting.patch Patch2: libdrm-2.4.0-no-freaking-mknod.patch @@ -41,6 +43,8 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ +install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ # NOTE: We intentionally don't ship *.la files find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || : @@ -56,6 +60,7 @@ %doc README %{_libdir}/libdrm.so.2 %{_libdir}/libdrm.so.2.3.0 +%{_sysconfdir}/udev/rules.d/91-drm-modeset.rules %files devel %defattr(-,root,root,-) @@ -83,6 +88,9 @@ %{_libdir}/pkgconfig/libdrm.pc %changelog +* Wed Mar 05 2008 Dave Airlie 2.4.0-0.7 +- add udev rules for modesetting nodes. + * Wed Mar 05 2008 Dave Airlie 2.4.0-0.6 - add initial modesetting headers to the mix - this API isn't stable From fedora-extras-commits at redhat.com Wed Mar 5 04:19:16 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 5 Mar 2008 04:19:16 GMT Subject: rpms/libgnomecups/devel libgnomecups.spec,1.52,1.53 Message-ID: <200803050419.m254JGfD012733@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgnomecups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12711 Modified Files: libgnomecups.spec Log Message: add bug ref Index: libgnomecups.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomecups/devel/libgnomecups.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- libgnomecups.spec 5 Mar 2008 04:04:33 -0000 1.52 +++ libgnomecups.spec 5 Mar 2008 04:18:25 -0000 1.53 @@ -19,6 +19,7 @@ Patch2: libgnomecups-no-gnome-common.patch Patch3: libgnomecups-dbus.patch Patch5: libgnomecups-0.1.14-go-direct.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=520449 Patch6: libgnomecups-lpoptions.patch %description From fedora-extras-commits at redhat.com Wed Mar 5 05:51:10 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 05:51:10 GMT Subject: rpms/xscreensaver/devel xscreensaver-5.05-addopts-jwz.patch, NONE, 1.1 xscreensaver.spec, 1.66, 1.67 xscreensaver-5.05-addopts.patch, 1.1, NONE Message-ID: <200803050551.m255pAxX021016@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20993 Modified Files: xscreensaver.spec Added Files: xscreensaver-5.05-addopts-jwz.patch Removed Files: xscreensaver-5.05-addopts.patch Log Message: * Wed Mar 5 2008 Mamoru Tasaka - 1:5.05-2 - Replace addopts.patch with the patch from jwz xscreensaver-5.05-addopts-jwz.patch: --- NEW FILE xscreensaver-5.05-addopts-jwz.patch --- --- xscreensaver-5.05/configure.in.opts 2008-03-02 07:14:30.000000000 +0900 +++ xscreensaver-5.05/configure.in 2008-03-05 14:45:12.000000000 +0900 @@ -389,6 +389,7 @@ ac_cv_gcc_accepts_[$1]=no else ac_cv_gcc_accepts_[$1]=yes + CC="$CC [$2]" fi]) ac_gcc_accepts_[$1]="$ac_cv_gcc_accepts_[$1]" fi @@ -400,6 +401,11 @@ AC_DEFUN(AC_NO_MISPLACED_DECLARATIONS, [AC_CHECK_GCC_ARG(no_decl_after, -Wdeclaration-after-statement)]) +# Need to disable Objective C extensions in ANSI C on MacOS X to work +# around an Apple-specific gcc bug. +# +AC_DEFUN(AC_NO_OBJECTIVE_C, + [AC_CHECK_GCC_ARG(no_cpp_precomp, -no-cpp-precomp)]) ############################################################################### # @@ -447,7 +453,8 @@ # before they were in the ANSI C 99 spec... (gcc 2.96 permits // # with -std=gnu89 but not with -std=c89.) # - CC="$CC -std=c89 -U__STRICT_ANSI__" + # $CC already contains "-std=c89" via AC_GCC_ACCEPTS_STD + CC="$CC -U__STRICT_ANSI__" else # The old way: CC="$CC -Wp,-lang-c89" @@ -458,27 +465,6 @@ ############################################################################### # -# Function to figure out how to turn off Objective C on MacOS X. -# (We have to do this to work around an Apple-specific gcc bug.) -# -############################################################################### - -AC_DEFUN(AC_GCC_ACCEPTS_NO_CPP_PRECOMP, - [AC_CHECK_GCC_ARG(no_cpp_precomp, -no-cpp-precomp)]) - -AC_DEFUN(AC_NO_OBJECTIVE_C, - [if test -n "$GCC"; then - AC_GCC_ACCEPTS_NO_CPP_PRECOMP - if test "$ac_gcc_accepts_no_cpp_precomp" = yes ; then - AC_MSG_RESULT(Disabling Objective C extensions in ANSI C code.) - CC="$CC -no-cpp-precomp" - fi - fi -]) - - -############################################################################### -# # Function to figure out how to create directory trees. # ############################################################################### Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- xscreensaver.spec 2 Mar 2008 14:16:58 -0000 1.66 +++ xscreensaver.spec 5 Mar 2008 05:50:27 -0000 1.67 @@ -5,7 +5,7 @@ %define modular_conf 1 -%define fedora_rel 1 +%define fedora_rel 2 %define extrarel %{nil} @@ -31,7 +31,7 @@ Source10: update-xscreensaver-hacks %endif Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -Patch3: xscreensaver-5.05-addopts.patch +Patch3: xscreensaver-5.05-addopts-jwz.patch Patch21: xscreensaver-5.05-webcollage-default-nonet.patch Requires: xscreensaver-base = %{epoch}:%{version}-%{release} Requires: xscreensaver-extras = %{epoch}:%{version}-%{release} @@ -560,6 +560,9 @@ %defattr(-,root,root,-) %changelog +* Wed Mar 5 2008 Mamoru Tasaka - 1:5.05-2 +- Replace addopts.patch with the patch from jwz + * Sun Mar 2 2008 Mamoru Tasaka - 1:5.05-1 - Update to 5.05 --- xscreensaver-5.05-addopts.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 5 05:55:24 2008 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 5 Mar 2008 05:55:24 GMT Subject: rpms/libgcroots/devel libgcroots.spec,1.1,1.2 Message-ID: <200803050555.m255tObi021116@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/libgcroots/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21091 Modified Files: libgcroots.spec Log Message: * Wed Mar 5 2008 Akira TAGOH - 0.2.1-3 - Get rid of explicit dependency of ldconfig. - Correct License. Index: libgcroots.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgcroots/devel/libgcroots.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgcroots.spec 5 Mar 2008 02:22:13 -0000 1.1 +++ libgcroots.spec 5 Mar 2008 05:54:51 -0000 1.2 @@ -1,7 +1,7 @@ Name: libgcroots Version: 0.2.1 -Release: 2%{?dist} -License: BSD +Release: 3%{?dist} +License: MIT URL: http://code.google.com/p/sigscheme/wiki/libgcroots BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -10,8 +10,6 @@ Summary: Roots acquisition library for Garbage Collector Group: Development/Libraries -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig %description libgcroots abstracts architecture-dependent part of garbage collector @@ -71,6 +69,10 @@ %{_libdir}/pkgconfig/gcroots.pc %changelog +* Wed Mar 5 2008 Akira TAGOH - 0.2.1-3 +- Get rid of explicit dependency of ldconfig. +- Correct License. + * Wed Feb 27 2008 Akira TAGOH - 0.2.1-2 - Add the appropriate requires. From fedora-extras-commits at redhat.com Wed Mar 5 06:03:03 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 5 Mar 2008 06:03:03 GMT Subject: rpms/glabels/devel .cvsignore, 1.6, 1.7 glabels.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <200803050603.m256333N028374@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/glabels/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28347/devel Modified Files: .cvsignore glabels.spec sources Log Message: Update to 2.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glabels/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 Jan 2008 05:34:18 -0000 1.6 +++ .cvsignore 5 Mar 2008 06:02:10 -0000 1.7 @@ -1 +1 @@ -glabels-2.2.1.tar.gz +glabels-2.2.2.tar.gz Index: glabels.spec =================================================================== RCS file: /cvs/pkgs/rpms/glabels/devel/glabels.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- glabels.spec 19 Feb 2008 19:17:09 -0000 1.15 +++ glabels.spec 5 Mar 2008 06:02:10 -0000 1.16 @@ -1,6 +1,6 @@ Name: glabels -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Summary: A program for creating labels and business cards for GNOME Group: Applications/Publishing @@ -158,6 +158,9 @@ %changelog +* Tue Mar 04 2008 Peter Gordon - 2.2.2-1 +- Update to new upstream bug-fix release (2.2.2). + * Tue Feb 19 2008 Fedora Release Engineering - 2.2.1-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glabels/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 Jan 2008 05:34:18 -0000 1.6 +++ sources 5 Mar 2008 06:02:10 -0000 1.7 @@ -1 +1 @@ -0828bd732ba4c541616ca121407723f2 glabels-2.2.1.tar.gz +ee9f8687904b070715dac59efe7a7dc5 glabels-2.2.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 06:11:45 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 06:11:45 GMT Subject: rpms/pcmanfm/F-7 .cvsignore, 1.5, 1.6 pcmanfm.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200803050611.m256Bjxc028594@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28522/F-7 Modified Files: .cvsignore pcmanfm.spec sources Log Message: * Wed Mar 5 2008 Mamoru Tasaka - 0.3.9-1 - 0.3.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-7/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Feb 2008 08:59:39 -0000 1.5 +++ .cvsignore 5 Mar 2008 06:11:10 -0000 1.6 @@ -1 +1 @@ -pcmanfm-0.3.6.1.tar.gz +pcmanfm-0.3.9.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-7/pcmanfm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pcmanfm.spec 29 Feb 2008 08:59:39 -0000 1.5 +++ pcmanfm.spec 5 Mar 2008 06:11:10 -0000 1.6 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.3.6.1 +Version: 0.3.9 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -91,6 +91,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Wed Mar 5 2008 Mamoru Tasaka - 0.3.9-1 +- 0.3.9 + * Fri Feb 29 2008 Mamoru Tasaka - 0.3.6.1-1 - 0.3.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-7/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Feb 2008 08:59:39 -0000 1.5 +++ sources 5 Mar 2008 06:11:10 -0000 1.6 @@ -1 +1 @@ -ec15baedfef6694a3c93a270fe9a1cdc pcmanfm-0.3.6.1.tar.gz +065e103a222a591e51076d37bfd6eaa7 pcmanfm-0.3.9.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 06:11:54 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 06:11:54 GMT Subject: rpms/pcmanfm/F-8 .cvsignore, 1.5, 1.6 pcmanfm.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200803050611.m256Bs5m028604@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28522/F-8 Modified Files: .cvsignore pcmanfm.spec sources Log Message: * Wed Mar 5 2008 Mamoru Tasaka - 0.3.9-1 - 0.3.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Feb 2008 08:59:44 -0000 1.5 +++ .cvsignore 5 Mar 2008 06:11:16 -0000 1.6 @@ -1 +1 @@ -pcmanfm-0.3.6.1.tar.gz +pcmanfm-0.3.9.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/pcmanfm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pcmanfm.spec 29 Feb 2008 08:59:44 -0000 1.5 +++ pcmanfm.spec 5 Mar 2008 06:11:16 -0000 1.6 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.3.6.1 +Version: 0.3.9 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -91,6 +91,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Wed Mar 5 2008 Mamoru Tasaka - 0.3.9-1 +- 0.3.9 + * Fri Feb 29 2008 Mamoru Tasaka - 0.3.6.1-1 - 0.3.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Feb 2008 08:59:44 -0000 1.5 +++ sources 5 Mar 2008 06:11:16 -0000 1.6 @@ -1 +1 @@ -ec15baedfef6694a3c93a270fe9a1cdc pcmanfm-0.3.6.1.tar.gz +065e103a222a591e51076d37bfd6eaa7 pcmanfm-0.3.9.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 06:12:01 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 06:12:01 GMT Subject: rpms/pcmanfm/devel .cvsignore, 1.5, 1.6 pcmanfm.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200803050612.m256C1QQ028614@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/pcmanfm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28522/devel Modified Files: .cvsignore pcmanfm.spec sources Log Message: * Wed Mar 5 2008 Mamoru Tasaka - 0.3.9-1 - 0.3.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Feb 2008 08:59:47 -0000 1.5 +++ .cvsignore 5 Mar 2008 06:11:24 -0000 1.6 @@ -1 +1 @@ -pcmanfm-0.3.6.1.tar.gz +pcmanfm-0.3.9.tar.gz Index: pcmanfm.spec =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pcmanfm.spec 29 Feb 2008 08:59:47 -0000 1.5 +++ pcmanfm.spec 5 Mar 2008 06:11:24 -0000 1.6 @@ -2,7 +2,7 @@ %define enable_hal 1 Name: pcmanfm -Version: 0.3.6.1 +Version: 0.3.9 Release: 1%{?dist} Summary: Extremly fast and lightweight file manager @@ -91,6 +91,9 @@ %{_datadir}/mime/packages/*.xml %changelog +* Wed Mar 5 2008 Mamoru Tasaka - 0.3.9-1 +- 0.3.9 + * Fri Feb 29 2008 Mamoru Tasaka - 0.3.6.1-1 - 0.3.6.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcmanfm/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Feb 2008 08:59:47 -0000 1.5 +++ sources 5 Mar 2008 06:11:24 -0000 1.6 @@ -1 +1 @@ -ec15baedfef6694a3c93a270fe9a1cdc pcmanfm-0.3.6.1.tar.gz +065e103a222a591e51076d37bfd6eaa7 pcmanfm-0.3.9.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 06:57:57 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 5 Mar 2008 06:57:57 GMT Subject: rpms/dejavu-fonts/devel .cvsignore, 1.46, 1.47 dejavu-fonts.spec, 1.76, 1.77 sources, 1.46, 1.47 Message-ID: <200803050657.m256vvLw029180@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29154/devel Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: 2.24 rc1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 20 Jan 2008 19:28:22 -0000 1.46 +++ .cvsignore 5 Mar 2008 06:57:22 -0000 1.47 @@ -1 +1 @@ -dejavu-fonts-2.23.tar.bz2 +dejavu-fonts-2.23-20080305-2191.tar.bz2 Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- dejavu-fonts.spec 20 Jan 2008 19:28:22 -0000 1.76 +++ dejavu-fonts.spec 5 Mar 2008 06:57:22 -0000 1.77 @@ -4,11 +4,11 @@ %define archivename %{name}-%{archiveversion} -#define alphatag .20071206svn2135 -#define alphatag .rc1 +#define alphatag .20080228svn2189 +%define alphatag .rc1 -#define archiveversion 2.21-20071206-2135 -%define archiveversion %{version} +%define archiveversion 2.23-20080305-2191 +#define archiveversion %{version} # Let the perl maintainer worry about Unicode.org data files @@ -16,8 +16,8 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: %{fontname}-fonts -Version: 2.23 -Release: 1%{?alphatag}%{?dist} +Version: 2.24 +Release: 0.2%{?alphatag}%{?dist} Summary: DejaVu fonts, mature typefaces Group: User Interface/X @@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Older fontforge versions will not work due to sfd format changes -BuildRequires: fontforge > 20070501 +BuildRequires: fontforge > 20080110 BuildRequires: perl(Font::TTF) # Needed to compute unicode coverage BuildRequires: %{Blocks} %{UnicodeData} @@ -185,6 +185,14 @@ %changelog +* Mon Mar 4 2008 +??? 2.24-0.2.rc1 +??? rc time + +* Mon Mar 3 2008 +??? 2.24-0.1.20080228svn2189 +??? early 2.24 test build, check new fontforge + * Sun Jan 20 2008 ??? 2.23-1 ??? 2.23 final Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 20 Jan 2008 19:28:22 -0000 1.46 +++ sources 5 Mar 2008 06:57:22 -0000 1.47 @@ -1 +1 @@ -b302559a71700e94a5b082fc4cb11740 dejavu-fonts-2.23.tar.bz2 +0dd52a6dbefc8d49de85f509679bff9d dejavu-fonts-2.23-20080305-2191.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 07:03:45 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 5 Mar 2008 07:03:45 GMT Subject: rpms/glabels/F-8 .cvsignore, 1.5, 1.6 glabels.spec, 1.13, 1.14 sources, 1.5, 1.6 Message-ID: <200803050703.m2573jG6003985@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/glabels/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3955/F-8 Modified Files: .cvsignore glabels.spec sources Log Message: Update to 2.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glabels/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2008 05:55:51 -0000 1.5 +++ .cvsignore 5 Mar 2008 07:03:05 -0000 1.6 @@ -1 +1 @@ -glabels-2.2.1.tar.gz +glabels-2.2.2.tar.gz Index: glabels.spec =================================================================== RCS file: /cvs/pkgs/rpms/glabels/F-8/glabels.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- glabels.spec 29 Jan 2008 05:55:51 -0000 1.13 +++ glabels.spec 5 Mar 2008 07:03:05 -0000 1.14 @@ -1,5 +1,5 @@ Name: glabels -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} Summary: A program for creating labels and business cards for GNOME @@ -158,6 +158,9 @@ %changelog +* Tue Mar 04 2008 Peter Gordon - 2.2.2-1 +- Update to new upstream bug-fix release (2.2.2). + * Mon Jan 28 2008 Peter Gordon - 2.2.1-1 - Update to new upstream bug-fix release (2.2.1). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glabels/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2008 05:55:51 -0000 1.5 +++ sources 5 Mar 2008 07:03:05 -0000 1.6 @@ -1 +1 @@ -0828bd732ba4c541616ca121407723f2 glabels-2.2.1.tar.gz +ee9f8687904b070715dac59efe7a7dc5 glabels-2.2.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 07:29:32 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 5 Mar 2008 07:29:32 GMT Subject: rpms/glabels/F-7 .cvsignore, 1.5, 1.6 glabels.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200803050729.m257TWjZ004482@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/glabels/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4415/F-7 Modified Files: .cvsignore glabels.spec sources Log Message: Update to 2.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glabels/F-7/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jan 2008 06:09:46 -0000 1.5 +++ .cvsignore 5 Mar 2008 07:28:54 -0000 1.6 @@ -1 +1 @@ -glabels-2.2.1.tar.gz +glabels-2.2.2.tar.gz Index: glabels.spec =================================================================== RCS file: /cvs/pkgs/rpms/glabels/F-7/glabels.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- glabels.spec 29 Jan 2008 06:09:46 -0000 1.10 +++ glabels.spec 5 Mar 2008 07:28:54 -0000 1.11 @@ -1,5 +1,5 @@ Name: glabels -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} Summary: A program for creating labels and business cards for GNOME @@ -161,6 +161,9 @@ %changelog +* Tue Mar 04 2008 Peter Gordon - 2.2.2-1 +- Update to new upstream bug-fix release (2.2.2). + * Mon Jan 28 2008 Peter Gordon - 2.2.1-1 - Update to new upstream bug-fix release (2.2.1). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glabels/F-7/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jan 2008 06:09:46 -0000 1.5 +++ sources 5 Mar 2008 07:28:54 -0000 1.6 @@ -1 +1 @@ -0828bd732ba4c541616ca121407723f2 glabels-2.2.1.tar.gz +ee9f8687904b070715dac59efe7a7dc5 glabels-2.2.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 07:30:26 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 5 Mar 2008 07:30:26 GMT Subject: rpms/clamav/devel sources,1.35,1.36 Message-ID: <200803050730.m257UQit004569@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4488 Modified Files: sources Log Message: updated to 0.93rc1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 11 Feb 2008 22:30:35 -0000 1.35 +++ sources 5 Mar 2008 07:29:47 -0000 1.36 @@ -1 +1 @@ -aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 +7d7b2be9783f20956b7e090437105699 clamav-0.93rc1-norar.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 07:31:43 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 5 Mar 2008 07:31:43 GMT Subject: rpms/keepassx/F-8 keepassx.spec,1.5,1.6 Message-ID: <200803050731.m257VhEQ004713@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/keepassx/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4615/F-8 Modified Files: keepassx.spec Log Message: * Wed Mar 05 2008 Aurelien Bompard 0.3.0-2 - patch for gcc 4.3 Index: keepassx.spec =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/F-8/keepassx.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- keepassx.spec 4 Mar 2008 19:10:44 -0000 1.5 +++ keepassx.spec 5 Mar 2008 07:31:07 -0000 1.6 @@ -1,6 +1,6 @@ Name: keepassx Version: 0.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform password manager Group: User Interface/Desktops @@ -8,6 +8,7 @@ URL: http://keepassx.sourceforge.net Source0: http://download.sf.net/keepassx/KeePassX-%{version}.tar.gz Patch0: keepassx-0.3.0-xdg.patch +Patch1: keepassx-0.3.0-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel > 4.1, libXtst-devel, ImageMagick, desktop-file-utils @@ -35,6 +36,7 @@ %prep %setup -q -n KeePassX-%{version} %patch0 -p0 -b .xdg +%patch1 -p0 -b .gcc43 %build @@ -107,6 +109,9 @@ %changelog +* Wed Mar 05 2008 Aurelien Bompard 0.3.0-2 +- patch for gcc 4.3 + * Sun Mar 02 2008 Aurelien Bompard 0.3.0-1 - version 0.3.0 - drop helpwindow patch (feature dropped upstream) From fedora-extras-commits at redhat.com Wed Mar 5 07:31:44 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 5 Mar 2008 07:31:44 GMT Subject: rpms/clamav/devel clamav.spec,1.67,1.68 Message-ID: <200803050731.m257Vi2t004717@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4594 Modified Files: clamav.spec Log Message: - updated to 0.93rc1 - fixed rpath issues Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- clamav.spec 11 Feb 2008 22:30:35 -0000 1.67 +++ clamav.spec 5 Mar 2008 07:30:58 -0000 1.68 @@ -1,5 +1,7 @@ ## $Id$ +%global snapshot rc1 + ## Fedora Extras specific customization below... %bcond_without fedora %bcond_with unrar @@ -18,26 +20,21 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92.1 -Release: %release_func 1 +Version: 0.93 +Release: %release_func 0.0%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net %if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz.sig %else # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by -# -# zcat clamav-$V.tar.gz | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > clamav-$V-norar.tar.bz2 -# -# or -# -# make clean-sources [TARBALL=] -Source0: %name-%version-norar.tar.bz2 +# make clean-sources [TARBALL=] [VERSION=] +Source0: %name-%version%{?snapshot}-norar.tar.bz2 %endif Source1: clamd-wrapper Source2: clamd.sysconfig @@ -253,7 +250,7 @@ ## ------------------------------------------------------------ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?snapshot} %patch21 -p1 -b .path %patch22 -p1 -b .initoff @@ -284,12 +281,13 @@ export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --enable-milter --disable-static \ + --disable-rpath \ %{!?with_unrar:--disable-unrar} # build with --as-needed and disable rpath sed -i \ -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ libtool @@ -555,6 +553,10 @@ %changelog +* Tue Mar 4 2008 Enrico Scholz - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + * Mon Feb 11 2008 Enrico Scholz - 0.92.1-1 - updated to 0.92.1 From fedora-extras-commits at redhat.com Wed Mar 5 07:31:52 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 5 Mar 2008 07:31:52 GMT Subject: rpms/glest/F-8 .cvsignore, 1.6, 1.7 glest.spec, 1.18, 1.19 sources, 1.6, 1.7 Message-ID: <200803050731.m257VqO2004727@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/glest/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4659/F-8 Modified Files: .cvsignore glest.spec sources Log Message: * Wed Mar 05 2008 Aurelien Bompard 3.1.2-1 - version 3.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glest/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Feb 2008 06:49:18 -0000 1.6 +++ .cvsignore 5 Mar 2008 07:31:17 -0000 1.7 @@ -1 +1 @@ -glest-source-3.1.1.tar.bz2 +glest-source-3.1.2.tar.bz2 Index: glest.spec =================================================================== RCS file: /cvs/pkgs/rpms/glest/F-8/glest.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- glest.spec 27 Feb 2008 06:49:18 -0000 1.18 +++ glest.spec 5 Mar 2008 07:31:17 -0000 1.19 @@ -1,5 +1,5 @@ Name: glest -Version: 3.1.1 +Version: 3.1.2 Release: 1%{?dist} Summary: 3D real time strategy game @@ -121,6 +121,9 @@ %changelog +* Wed Mar 05 2008 Aurelien Bompard 3.1.2-1 +- version 3.1.2 + * Tue Feb 26 2008 Aurelien Bompard 3.1.1-1 - version 3.1.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glest/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Feb 2008 06:49:18 -0000 1.6 +++ sources 5 Mar 2008 07:31:17 -0000 1.7 @@ -1 +1 @@ -1b8b9c8f85d51a02fd516cf3ddbab85d glest-source-3.1.1.tar.bz2 +e72ec79dacdf7ff5a27c2f5b74ffc01e glest-source-3.1.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 07:31:53 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 5 Mar 2008 07:31:53 GMT Subject: rpms/keepassx/devel keepassx.spec,1.6,1.7 Message-ID: <200803050731.m257VrE5004730@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/keepassx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4615/devel Modified Files: keepassx.spec Log Message: * Wed Mar 05 2008 Aurelien Bompard 0.3.0-2 - patch for gcc 4.3 Index: keepassx.spec =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/devel/keepassx.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- keepassx.spec 4 Mar 2008 19:10:52 -0000 1.6 +++ keepassx.spec 5 Mar 2008 07:31:13 -0000 1.7 @@ -1,6 +1,6 @@ Name: keepassx Version: 0.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform password manager Group: User Interface/Desktops @@ -8,6 +8,7 @@ URL: http://keepassx.sourceforge.net Source0: http://download.sf.net/keepassx/KeePassX-%{version}.tar.gz Patch0: keepassx-0.3.0-xdg.patch +Patch1: keepassx-0.3.0-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt4-devel > 4.1, libXtst-devel, ImageMagick, desktop-file-utils @@ -35,6 +36,7 @@ %prep %setup -q -n KeePassX-%{version} %patch0 -p0 -b .xdg +%patch1 -p0 -b .gcc43 %build @@ -107,6 +109,9 @@ %changelog +* Wed Mar 05 2008 Aurelien Bompard 0.3.0-2 +- patch for gcc 4.3 + * Sun Mar 02 2008 Aurelien Bompard 0.3.0-1 - version 0.3.0 - drop helpwindow patch (feature dropped upstream) From fedora-extras-commits at redhat.com Wed Mar 5 07:31:59 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 5 Mar 2008 07:31:59 GMT Subject: rpms/glest/devel .cvsignore, 1.6, 1.7 glest.spec, 1.19, 1.20 sources, 1.6, 1.7 Message-ID: <200803050731.m257Vx8h004771@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/glest/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4659/devel Modified Files: .cvsignore glest.spec sources Log Message: * Wed Mar 05 2008 Aurelien Bompard 3.1.2-1 - version 3.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glest/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Feb 2008 06:49:25 -0000 1.6 +++ .cvsignore 5 Mar 2008 07:31:22 -0000 1.7 @@ -1 +1 @@ -glest-source-3.1.1.tar.bz2 +glest-source-3.1.2.tar.bz2 Index: glest.spec =================================================================== RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- glest.spec 27 Feb 2008 06:49:25 -0000 1.19 +++ glest.spec 5 Mar 2008 07:31:22 -0000 1.20 @@ -1,5 +1,5 @@ Name: glest -Version: 3.1.1 +Version: 3.1.2 Release: 1%{?dist} Summary: 3D real time strategy game @@ -121,6 +121,9 @@ %changelog +* Wed Mar 05 2008 Aurelien Bompard 3.1.2-1 +- version 3.1.2 + * Tue Feb 26 2008 Aurelien Bompard 3.1.1-1 - version 3.1.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glest/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Feb 2008 06:49:25 -0000 1.6 +++ sources 5 Mar 2008 07:31:22 -0000 1.7 @@ -1 +1 @@ -1b8b9c8f85d51a02fd516cf3ddbab85d glest-source-3.1.1.tar.bz2 +e72ec79dacdf7ff5a27c2f5b74ffc01e glest-source-3.1.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 07:40:55 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 07:40:55 GMT Subject: rpms/kazehakase/F-7 kazehakase.spec,1.29,1.30 Message-ID: <200803050740.m257etRA005101@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5023/F-7 Modified Files: kazehakase.spec Log Message: * Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-2 - Support WebGTK Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-7/kazehakase.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- kazehakase.spec 29 Feb 2008 15:49:47 -0000 1.29 +++ kazehakase.spec 5 Mar 2008 07:40:17 -0000 1.30 @@ -4,6 +4,12 @@ # $ mv trunk %%name-%%version-svn%%svnver # $ tar czf %%name-%%version-svn%%svnver.tar.gz %%name-%%version-svn%%svnver +%define support_anthy 0 +%define support_ruby 1 +%define rubyabi 1.8 +%define support_webkit 1 + + %if 0%{?fedora} == 9 %define Geckover 1.9 %endif @@ -15,12 +21,6 @@ %endif %define obsolete_plugin_ver 0.4.5-1 -%define support_anthy 0 -%define support_ruby 1 -%define rubyabi 1.8 -# WebKitWebSettings not implemented on Fedora yet -%define support_webkit 0 - %define repoid 29695 %define svnver 3410_trunk @@ -31,7 +31,7 @@ %endif -%define fedorarel 1 +%define fedorarel 2 %define _release %{fedorarel}%{?usesvn:.svn%svnver} @@ -49,9 +49,8 @@ Source1: gscripttable.h.gz Patch0: kazehakase-svn3235-3237-diff.patch.gz %endif -%if 0%{?fedora} >= 9 -Patch15: kazehakase-0.5.2-svn3410_trunk-verup.patch -%endif +# Upstream forgot to package this? +Source2: kz-webkit-gtk.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel @@ -72,8 +71,9 @@ BuildRequires: ruby %endif %if %{support_webkit} -BuildRequires: WebKit-gtk-devel -%endif +# Bug 435562 +BuildRequires: WebKit-gtk-devel >= 1.0.0-0.6.svn30667 +%endif BuildRequires: desktop-file-utils BuildRequires: gettext @@ -141,7 +141,17 @@ %description ruby This package contains the binding of Kazehakase for Ruby interpretter. -%endif +%endif + +%if %{support_webkit} +%package webkit +Summary: WebKit embed module of Kazehakase +Group: Application/Internet +Requires: %{name} = %{version}-%{release} + +%description webkit +This package contains WebKit embed module of Kazehakase. +%endif %prep %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver} @@ -155,9 +165,6 @@ %{__gzip} -d *gz cd ../.. %endif -%if 0%{?fedora} == 9 -%{__patch} -p1 -s -Z -b --suffix .ver < %PATCH15 -%endif %if 0%{?fedora} < 8 || 0%{?usesvn} > 0 sh autogen.sh @@ -170,17 +177,17 @@ %if %{support_anthy} %{__sed} -i.anthy -e '/^anthy_available/d' configure %endif + %if %{support_webkit} +cp -p %{SOURCE2} module/embed/webkit-gtk/ %{__sed} -i.WebKit -e 's|webkit-1.0|WebKitGtk|' configure -%{__sed} -i.WebKit -e 's|webkit/webkit.h|webkit.h|' \ - module/embed/webkit-gtk/kz-webkit-gtk.h %endif %build # ??? perhaps bugs for WebKit-gtk %if %{support_webkit} -CFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`" -CXXFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`" +CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`" +CXXFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`" LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`" %endif @@ -285,7 +292,16 @@ %{_datadir}/%{name}/ext/ruby/ %endif +%if %{support_webkit} +%files webkit +%defattr(-,root,root,-) +%{_libdir}/%{name}/embed/webkit_gtk.so +%endif + %changelog +* Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-2 +- Support WebGTK + * Sat Mar 1 2008 Mamoru Tasaka - 0.5.3-1 - 0.5.3 From fedora-extras-commits at redhat.com Wed Mar 5 07:41:09 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 07:41:09 GMT Subject: rpms/kazehakase/F-8 kazehakase.spec,1.46,1.47 Message-ID: <200803050741.m257f9J3005106@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5023/F-8 Modified Files: kazehakase.spec Log Message: * Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-2 - Support WebGTK Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- kazehakase.spec 29 Feb 2008 15:49:53 -0000 1.46 +++ kazehakase.spec 5 Mar 2008 07:40:25 -0000 1.47 @@ -4,6 +4,12 @@ # $ mv trunk %%name-%%version-svn%%svnver # $ tar czf %%name-%%version-svn%%svnver.tar.gz %%name-%%version-svn%%svnver +%define support_anthy 0 +%define support_ruby 1 +%define rubyabi 1.8 +%define support_webkit 1 + + %if 0%{?fedora} == 9 %define Geckover 1.9 %endif @@ -15,12 +21,6 @@ %endif %define obsolete_plugin_ver 0.4.5-1 -%define support_anthy 0 -%define support_ruby 1 -%define rubyabi 1.8 -# WebKitWebSettings not implemented on Fedora yet -%define support_webkit 0 - %define repoid 29695 %define svnver 3410_trunk @@ -31,7 +31,7 @@ %endif -%define fedorarel 1 +%define fedorarel 2 %define _release %{fedorarel}%{?usesvn:.svn%svnver} @@ -49,9 +49,8 @@ Source1: gscripttable.h.gz Patch0: kazehakase-svn3235-3237-diff.patch.gz %endif -%if 0%{?fedora} >= 9 -Patch15: kazehakase-0.5.2-svn3410_trunk-verup.patch -%endif +# Upstream forgot to package this? +Source2: kz-webkit-gtk.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel @@ -72,8 +71,9 @@ BuildRequires: ruby %endif %if %{support_webkit} -BuildRequires: WebKit-gtk-devel -%endif +# Bug 435562 +BuildRequires: WebKit-gtk-devel >= 1.0.0-0.6.svn30667 +%endif BuildRequires: desktop-file-utils BuildRequires: gettext @@ -141,7 +141,17 @@ %description ruby This package contains the binding of Kazehakase for Ruby interpretter. -%endif +%endif + +%if %{support_webkit} +%package webkit +Summary: WebKit embed module of Kazehakase +Group: Application/Internet +Requires: %{name} = %{version}-%{release} + +%description webkit +This package contains WebKit embed module of Kazehakase. +%endif %prep %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver} @@ -155,9 +165,6 @@ %{__gzip} -d *gz cd ../.. %endif -%if 0%{?fedora} == 9 -%{__patch} -p1 -s -Z -b --suffix .ver < %PATCH15 -%endif %if 0%{?fedora} < 8 || 0%{?usesvn} > 0 sh autogen.sh @@ -170,17 +177,17 @@ %if %{support_anthy} %{__sed} -i.anthy -e '/^anthy_available/d' configure %endif + %if %{support_webkit} +cp -p %{SOURCE2} module/embed/webkit-gtk/ %{__sed} -i.WebKit -e 's|webkit-1.0|WebKitGtk|' configure -%{__sed} -i.WebKit -e 's|webkit/webkit.h|webkit.h|' \ - module/embed/webkit-gtk/kz-webkit-gtk.h %endif %build # ??? perhaps bugs for WebKit-gtk %if %{support_webkit} -CFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`" -CXXFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`" +CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`" +CXXFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`" LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`" %endif @@ -285,7 +292,16 @@ %{_datadir}/%{name}/ext/ruby/ %endif +%if %{support_webkit} +%files webkit +%defattr(-,root,root,-) +%{_libdir}/%{name}/embed/webkit_gtk.so +%endif + %changelog +* Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-2 +- Support WebGTK + * Sat Mar 1 2008 Mamoru Tasaka - 0.5.3-1 - 0.5.3 From fedora-extras-commits at redhat.com Wed Mar 5 07:41:11 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Wed, 5 Mar 2008 07:41:11 GMT Subject: rpms/vala/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 vala.spec, 1.23, 1.24 Message-ID: <200803050741.m257fBuh005111@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/vala/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5036 Modified Files: .cvsignore sources vala.spec Log Message: vala-0.1.7 for Rawhide Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vala/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 19 Jan 2008 20:36:16 -0000 1.9 +++ .cvsignore 5 Mar 2008 07:40:31 -0000 1.10 @@ -1 +1 @@ -vala-0.1.6.tar.bz2 +vala-0.1.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vala/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 19 Jan 2008 20:36:16 -0000 1.9 +++ sources 5 Mar 2008 07:40:31 -0000 1.10 @@ -1 +1 @@ -e4dd3df55cd9d568d126a3452ebd152b vala-0.1.6.tar.bz2 +40c4b55c2ee16993b25cd96d464a0f68 vala-0.1.7.tar.bz2 Index: vala.spec =================================================================== RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- vala.spec 19 Feb 2008 23:25:07 -0000 1.23 +++ vala.spec 5 Mar 2008 07:40:31 -0000 1.24 @@ -1,6 +1,6 @@ Name: vala -Version: 0.1.6 -Release: 2%{?dist} +Version: 0.1.7 +Release: 1%{?dist} Summary: A modern programming language for GNOME Group: Development/Languages @@ -49,8 +49,7 @@ Group: Development/Languages License: LGPLv2+ Requires: %{name} = %{version}-%{release} -# automake should be pulled in by gtk2-devel -#Requires: automake +Requires: gnome-common intltool libtool Provides: %{name}-vapigen = %{version}-%{release} Obsoletes: %{name}-vapigen < %{version}-%{release} @@ -135,6 +134,11 @@ %changelog +* Wed Mar 5 2008 Michel Salim - 0.1.7-1 +- Update to 0.1.7 +- -tool subpackage now requires gnome-common, intltool and libtoolize + for out-of-the-box vala-gen-project support + * Tue Feb 19 2008 Fedora Release Engineering - 0.1.6-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 07:41:16 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 07:41:16 GMT Subject: rpms/kazehakase/devel kazehakase.spec,1.48,1.49 Message-ID: <200803050741.m257fGCk005118@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5023/devel Modified Files: kazehakase.spec Log Message: * Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-2 - Support WebGTK Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- kazehakase.spec 29 Feb 2008 15:50:02 -0000 1.48 +++ kazehakase.spec 5 Mar 2008 07:40:40 -0000 1.49 @@ -4,6 +4,12 @@ # $ mv trunk %%name-%%version-svn%%svnver # $ tar czf %%name-%%version-svn%%svnver.tar.gz %%name-%%version-svn%%svnver +%define support_anthy 0 +%define support_ruby 1 +%define rubyabi 1.8 +%define support_webkit 1 + + %if 0%{?fedora} == 9 %define Geckover 1.9 %endif @@ -15,12 +21,6 @@ %endif %define obsolete_plugin_ver 0.4.5-1 -%define support_anthy 0 -%define support_ruby 1 -%define rubyabi 1.8 -# WebKitWebSettings not implemented on Fedora yet -%define support_webkit 0 - %define repoid 29695 %define svnver 3410_trunk @@ -31,7 +31,7 @@ %endif -%define fedorarel 1 +%define fedorarel 2 %define _release %{fedorarel}%{?usesvn:.svn%svnver} @@ -49,9 +49,8 @@ Source1: gscripttable.h.gz Patch0: kazehakase-svn3235-3237-diff.patch.gz %endif -%if 0%{?fedora} >= 9 -Patch15: kazehakase-0.5.2-svn3410_trunk-verup.patch -%endif +# Upstream forgot to package this? +Source2: kz-webkit-gtk.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel @@ -72,8 +71,9 @@ BuildRequires: ruby %endif %if %{support_webkit} -BuildRequires: WebKit-gtk-devel -%endif +# Bug 435562 +BuildRequires: WebKit-gtk-devel >= 1.0.0-0.6.svn30667 +%endif BuildRequires: desktop-file-utils BuildRequires: gettext @@ -141,7 +141,17 @@ %description ruby This package contains the binding of Kazehakase for Ruby interpretter. -%endif +%endif + +%if %{support_webkit} +%package webkit +Summary: WebKit embed module of Kazehakase +Group: Application/Internet +Requires: %{name} = %{version}-%{release} + +%description webkit +This package contains WebKit embed module of Kazehakase. +%endif %prep %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver} @@ -155,9 +165,6 @@ %{__gzip} -d *gz cd ../.. %endif -%if 0%{?fedora} == 9 -%{__patch} -p1 -s -Z -b --suffix .ver < %PATCH15 -%endif %if 0%{?fedora} < 8 || 0%{?usesvn} > 0 sh autogen.sh @@ -170,17 +177,17 @@ %if %{support_anthy} %{__sed} -i.anthy -e '/^anthy_available/d' configure %endif + %if %{support_webkit} +cp -p %{SOURCE2} module/embed/webkit-gtk/ %{__sed} -i.WebKit -e 's|webkit-1.0|WebKitGtk|' configure -%{__sed} -i.WebKit -e 's|webkit/webkit.h|webkit.h|' \ - module/embed/webkit-gtk/kz-webkit-gtk.h %endif %build # ??? perhaps bugs for WebKit-gtk %if %{support_webkit} -CFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`" -CXXFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`" +CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`" +CXXFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`" LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`" %endif @@ -285,7 +292,16 @@ %{_datadir}/%{name}/ext/ruby/ %endif +%if %{support_webkit} +%files webkit +%defattr(-,root,root,-) +%{_libdir}/%{name}/embed/webkit_gtk.so +%endif + %changelog +* Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-2 +- Support WebGTK + * Sat Mar 1 2008 Mamoru Tasaka - 0.5.3-1 - 0.5.3 From fedora-extras-commits at redhat.com Wed Mar 5 08:01:32 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 08:01:32 GMT Subject: rpms/kazehakase/F-7 kz-webkit-gtk.h, NONE, 1.1 kazehakase.spec, 1.30, 1.31 Message-ID: <200803050801.m2581Wtr012645@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5478/F-7 Modified Files: kazehakase.spec Added Files: kz-webkit-gtk.h Log Message: Forgot to add files, orz --- NEW FILE kz-webkit-gtk.h --- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Copyright (C) 2008 g?????? Hiroyuki Ikezoe * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ #ifndef __KZ_WEBKIT_GTK_H__ #define __KZ_WEBKIT_GTK_H__ #include G_BEGIN_DECLS #define KZ_TYPE_WEBKIT_GTK (kz_webkit_gtk_get_type ()) #define KZ_WEBKIT_GTK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), KZ_TYPE_WEBKIT_GTK, KzGtkWebcore)) #define KZ_WEBKIT_GTK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), KZ_TYPE_WEBKIT_GTK, KzWebKitGtkClass)) #define KZ_IS_WEBKIT_GTK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KZ_TYPE_WEBKIT_GTK)) #define KZ_IS_WEBKIT_GTK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), KZ_TYPE_WEBKIT_GTK)) #define KZ_WEBKIT_GTK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), KZ_TYPE_WEBKIT_GTK, KzWebKitGtkClass)) typedef struct _KzWebKitGtk KzWebKitGtk; typedef struct _KzWebKitGtkClass KzWebKitGtkClass; struct _KzWebKitGtk { WebKitWebView parent; }; struct _KzWebKitGtkClass { WebKitWebViewClass parent_class; }; GType kz_webkit_gtk_get_type (void) G_GNUC_CONST; void kz_webkit_gtk_register_type (GTypeModule *module); G_END_DECLS #endif /* __KZ_WEBKIT_GTK_H__ */ Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-7/kazehakase.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- kazehakase.spec 5 Mar 2008 07:40:17 -0000 1.30 +++ kazehakase.spec 5 Mar 2008 08:00:48 -0000 1.31 @@ -31,7 +31,7 @@ %endif -%define fedorarel 2 +%define fedorarel 3 %define _release %{fedorarel}%{?usesvn:.svn%svnver} @@ -299,7 +299,7 @@ %endif %changelog -* Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-2 +* Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-3 - Support WebGTK * Sat Mar 1 2008 Mamoru Tasaka - 0.5.3-1 From fedora-extras-commits at redhat.com Wed Mar 5 08:01:44 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 08:01:44 GMT Subject: rpms/kazehakase/F-8 kz-webkit-gtk.h, NONE, 1.1 kazehakase.spec, 1.47, 1.48 Message-ID: <200803050801.m2581i2L012650@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5478/F-8 Modified Files: kazehakase.spec Added Files: kz-webkit-gtk.h Log Message: Forgot to add files, orz --- NEW FILE kz-webkit-gtk.h --- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Copyright (C) 2008 g?????? Hiroyuki Ikezoe * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ #ifndef __KZ_WEBKIT_GTK_H__ #define __KZ_WEBKIT_GTK_H__ #include G_BEGIN_DECLS #define KZ_TYPE_WEBKIT_GTK (kz_webkit_gtk_get_type ()) #define KZ_WEBKIT_GTK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), KZ_TYPE_WEBKIT_GTK, KzGtkWebcore)) #define KZ_WEBKIT_GTK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), KZ_TYPE_WEBKIT_GTK, KzWebKitGtkClass)) #define KZ_IS_WEBKIT_GTK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KZ_TYPE_WEBKIT_GTK)) #define KZ_IS_WEBKIT_GTK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), KZ_TYPE_WEBKIT_GTK)) #define KZ_WEBKIT_GTK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), KZ_TYPE_WEBKIT_GTK, KzWebKitGtkClass)) typedef struct _KzWebKitGtk KzWebKitGtk; typedef struct _KzWebKitGtkClass KzWebKitGtkClass; struct _KzWebKitGtk { WebKitWebView parent; }; struct _KzWebKitGtkClass { WebKitWebViewClass parent_class; }; GType kz_webkit_gtk_get_type (void) G_GNUC_CONST; void kz_webkit_gtk_register_type (GTypeModule *module); G_END_DECLS #endif /* __KZ_WEBKIT_GTK_H__ */ Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- kazehakase.spec 5 Mar 2008 07:40:25 -0000 1.47 +++ kazehakase.spec 5 Mar 2008 08:01:02 -0000 1.48 @@ -31,7 +31,7 @@ %endif -%define fedorarel 2 +%define fedorarel 3 %define _release %{fedorarel}%{?usesvn:.svn%svnver} @@ -299,7 +299,7 @@ %endif %changelog -* Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-2 +* Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-3 - Support WebGTK * Sat Mar 1 2008 Mamoru Tasaka - 0.5.3-1 From fedora-extras-commits at redhat.com Wed Mar 5 08:02:00 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 08:02:00 GMT Subject: rpms/kazehakase/devel kz-webkit-gtk.h, NONE, 1.1 kazehakase.spec, 1.49, 1.50 Message-ID: <200803050802.m2582052012660@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5478/devel Modified Files: kazehakase.spec Added Files: kz-webkit-gtk.h Log Message: Forgot to add files, orz --- NEW FILE kz-webkit-gtk.h --- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Copyright (C) 2008 g?????? Hiroyuki Ikezoe * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ #ifndef __KZ_WEBKIT_GTK_H__ #define __KZ_WEBKIT_GTK_H__ #include G_BEGIN_DECLS #define KZ_TYPE_WEBKIT_GTK (kz_webkit_gtk_get_type ()) #define KZ_WEBKIT_GTK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), KZ_TYPE_WEBKIT_GTK, KzGtkWebcore)) #define KZ_WEBKIT_GTK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), KZ_TYPE_WEBKIT_GTK, KzWebKitGtkClass)) #define KZ_IS_WEBKIT_GTK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KZ_TYPE_WEBKIT_GTK)) #define KZ_IS_WEBKIT_GTK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), KZ_TYPE_WEBKIT_GTK)) #define KZ_WEBKIT_GTK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), KZ_TYPE_WEBKIT_GTK, KzWebKitGtkClass)) typedef struct _KzWebKitGtk KzWebKitGtk; typedef struct _KzWebKitGtkClass KzWebKitGtkClass; struct _KzWebKitGtk { WebKitWebView parent; }; struct _KzWebKitGtkClass { WebKitWebViewClass parent_class; }; GType kz_webkit_gtk_get_type (void) G_GNUC_CONST; void kz_webkit_gtk_register_type (GTypeModule *module); G_END_DECLS #endif /* __KZ_WEBKIT_GTK_H__ */ Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- kazehakase.spec 5 Mar 2008 07:40:40 -0000 1.49 +++ kazehakase.spec 5 Mar 2008 08:01:15 -0000 1.50 @@ -31,7 +31,7 @@ %endif -%define fedorarel 2 +%define fedorarel 3 %define _release %{fedorarel}%{?usesvn:.svn%svnver} @@ -299,7 +299,7 @@ %endif %changelog -* Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-2 +* Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-3 - Support WebGTK * Sat Mar 1 2008 Mamoru Tasaka - 0.5.3-1 From fedora-extras-commits at redhat.com Wed Mar 5 08:10:16 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Wed, 5 Mar 2008 08:10:16 GMT Subject: rpms/ocrad/devel ocrad-0.17-gcc43.patch, NONE, 1.1 ocrad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803050810.m258AGtS012877@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/ocrad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12843 Modified Files: .cvsignore sources Added Files: ocrad-0.17-gcc43.patch ocrad.spec Log Message: initial import ocrad-0.17-gcc43.patch: --- NEW FILE ocrad-0.17-gcc43.patch --- diff -up ocrad-0.17/textblock.cc.gcc43 ocrad-0.17/textblock.cc --- ocrad-0.17/textblock.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textblock.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/page_image_layout.cc.gcc43 ocrad-0.17/page_image_layout.cc --- ocrad-0.17/page_image_layout.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/page_image_layout.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/track.cc.gcc43 ocrad-0.17/track.cc --- ocrad-0.17/track.cc.gcc43 2008-02-19 19:37:08.000000000 +0100 +++ ocrad-0.17/track.cc 2008-02-19 19:37:30.000000000 +0100 @@ -17,6 +17,7 @@ #include #include +#include #include "common.h" #include "rectangle.h" diff -up ocrad-0.17/textline.cc.gcc43 ocrad-0.17/textline.cc --- ocrad-0.17/textline.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textline.cc 2008-02-19 19:36:25.000000000 +0100 @@ -19,6 +19,7 @@ #include #include #include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/common.cc.gcc43 ocrad-0.17/common.cc --- ocrad-0.17/common.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/common.cc 2008-02-19 19:36:25.000000000 +0100 @@ -17,6 +17,7 @@ #include #include +#include #include #include "common.h" diff -up ocrad-0.17/textpage.cc.gcc43 ocrad-0.17/textpage.cc --- ocrad-0.17/textpage.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textpage.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include "common.h" #include "rectangle.h" diff -up ocrad-0.17/textline_r2.cc.gcc43 ocrad-0.17/textline_r2.cc --- ocrad-0.17/textline_r2.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textline_r2.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include "common.h" #include "rectangle.h" diff -up ocrad-0.17/page_image.cc.gcc43 ocrad-0.17/page_image.cc --- ocrad-0.17/page_image.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/page_image.cc 2008-02-19 19:36:25.000000000 +0100 @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/character_r12.cc.gcc43 ocrad-0.17/character_r12.cc --- ocrad-0.17/character_r12.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/character_r12.cc 2008-02-19 19:36:25.000000000 +0100 @@ -17,6 +17,7 @@ #include #include +#include #include "common.h" #include "rectangle.h" #include "ucs.h" --- NEW FILE ocrad.spec --- Summary: An Optical Character Recognition program Name: ocrad Version: 0.17 Release: 3%{?dist} License: GPLv3+ Group: Applications/Multimedia Source: ftp://ftp.gnu.org/gnu/ocrad/%{name}-%{version}.tar.bz2 Patch0: ocrad-0.17-gcc43.patch URL: http://www.gnu.org/software/ocrad/ocrad.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description GNU Ocrad is an OCR (Optical Character Recognition) program based on a feature extraction method. It reads images in pbm (bitmap), pgm (greyscale) or ppm (color) formats and produces text in byte (8-bit) or UTF-8 formats. Also includes a layout analyser able to separate the columns or blocks of text normally found on printed pages. Ocrad can be used as a stand-alone console application, or as a backend to other programs. %prep %setup -q %patch0 -p1 -b .gcc43 %build %configure make CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 install -p doc/ocrad.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/install-info %{_infodir}/ocrad.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/ocrad.info.gz %{_infodir}/dir || : fi %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_bindir}/ocrad %attr(0644,root,root) %{_mandir}/man1/* %attr(0644,root,root) %{_infodir}/ocrad.info.gz %changelog * Mon Mar 03 2008 Tomas Smetana 0.17-3 - remove unpackaged file * Fri Feb 29 2008 Tomas Smetana 0.17-2 - fix spec file - fix compilation issues with gcc-4.3 * Fri Feb 29 2008 Tomas Smetana 0.17-1 - Spec file created Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocrad/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2008 20:09:47 -0000 1.1 +++ .cvsignore 5 Mar 2008 08:09:34 -0000 1.2 @@ -0,0 +1 @@ +ocrad-0.17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocrad/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2008 20:09:47 -0000 1.1 +++ sources 5 Mar 2008 08:09:34 -0000 1.2 @@ -0,0 +1 @@ +687c213b3334d5a6c2dcef97805c5882 ocrad-0.17.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 08:12:48 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Wed, 5 Mar 2008 08:12:48 GMT Subject: rpms/ocrad/F-8 ocrad-0.17-gcc43.patch, NONE, 1.1 ocrad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803050812.m258Cm9s012931@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/ocrad/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12905 Modified Files: .cvsignore sources Added Files: ocrad-0.17-gcc43.patch ocrad.spec Log Message: initial import ocrad-0.17-gcc43.patch: --- NEW FILE ocrad-0.17-gcc43.patch --- diff -up ocrad-0.17/textblock.cc.gcc43 ocrad-0.17/textblock.cc --- ocrad-0.17/textblock.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textblock.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/page_image_layout.cc.gcc43 ocrad-0.17/page_image_layout.cc --- ocrad-0.17/page_image_layout.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/page_image_layout.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/track.cc.gcc43 ocrad-0.17/track.cc --- ocrad-0.17/track.cc.gcc43 2008-02-19 19:37:08.000000000 +0100 +++ ocrad-0.17/track.cc 2008-02-19 19:37:30.000000000 +0100 @@ -17,6 +17,7 @@ #include #include +#include #include "common.h" #include "rectangle.h" diff -up ocrad-0.17/textline.cc.gcc43 ocrad-0.17/textline.cc --- ocrad-0.17/textline.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textline.cc 2008-02-19 19:36:25.000000000 +0100 @@ -19,6 +19,7 @@ #include #include #include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/common.cc.gcc43 ocrad-0.17/common.cc --- ocrad-0.17/common.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/common.cc 2008-02-19 19:36:25.000000000 +0100 @@ -17,6 +17,7 @@ #include #include +#include #include #include "common.h" diff -up ocrad-0.17/textpage.cc.gcc43 ocrad-0.17/textpage.cc --- ocrad-0.17/textpage.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textpage.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include "common.h" #include "rectangle.h" diff -up ocrad-0.17/textline_r2.cc.gcc43 ocrad-0.17/textline_r2.cc --- ocrad-0.17/textline_r2.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textline_r2.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include "common.h" #include "rectangle.h" diff -up ocrad-0.17/page_image.cc.gcc43 ocrad-0.17/page_image.cc --- ocrad-0.17/page_image.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/page_image.cc 2008-02-19 19:36:25.000000000 +0100 @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/character_r12.cc.gcc43 ocrad-0.17/character_r12.cc --- ocrad-0.17/character_r12.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/character_r12.cc 2008-02-19 19:36:25.000000000 +0100 @@ -17,6 +17,7 @@ #include #include +#include #include "common.h" #include "rectangle.h" #include "ucs.h" --- NEW FILE ocrad.spec --- Summary: An Optical Character Recognition program Name: ocrad Version: 0.17 Release: 3%{?dist} License: GPLv3+ Group: Applications/Multimedia Source: ftp://ftp.gnu.org/gnu/ocrad/%{name}-%{version}.tar.bz2 Patch0: ocrad-0.17-gcc43.patch URL: http://www.gnu.org/software/ocrad/ocrad.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description GNU Ocrad is an OCR (Optical Character Recognition) program based on a feature extraction method. It reads images in pbm (bitmap), pgm (greyscale) or ppm (color) formats and produces text in byte (8-bit) or UTF-8 formats. Also includes a layout analyser able to separate the columns or blocks of text normally found on printed pages. Ocrad can be used as a stand-alone console application, or as a backend to other programs. %prep %setup -q %patch0 -p1 -b .gcc43 %build %configure make CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 install -p doc/ocrad.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/install-info %{_infodir}/ocrad.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/ocrad.info.gz %{_infodir}/dir || : fi %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_bindir}/ocrad %attr(0644,root,root) %{_mandir}/man1/* %attr(0644,root,root) %{_infodir}/ocrad.info.gz %changelog * Mon Mar 03 2008 Tomas Smetana 0.17-3 - remove unpackaged file * Fri Feb 29 2008 Tomas Smetana 0.17-2 - fix spec file - fix compilation issues with gcc-4.3 * Fri Feb 29 2008 Tomas Smetana 0.17-1 - Spec file created Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocrad/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2008 20:09:47 -0000 1.1 +++ .cvsignore 5 Mar 2008 08:12:09 -0000 1.2 @@ -0,0 +1 @@ +ocrad-0.17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocrad/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2008 20:09:47 -0000 1.1 +++ sources 5 Mar 2008 08:12:09 -0000 1.2 @@ -0,0 +1 @@ +687c213b3334d5a6c2dcef97805c5882 ocrad-0.17.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 08:16:15 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Wed, 5 Mar 2008 08:16:15 GMT Subject: rpms/ocrad/F-7 ocrad-0.17-gcc43.patch, NONE, 1.1 ocrad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803050816.m258GF9p012989@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/ocrad/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12959 Modified Files: .cvsignore sources Added Files: ocrad-0.17-gcc43.patch ocrad.spec Log Message: initial import ocrad-0.17-gcc43.patch: --- NEW FILE ocrad-0.17-gcc43.patch --- diff -up ocrad-0.17/textblock.cc.gcc43 ocrad-0.17/textblock.cc --- ocrad-0.17/textblock.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textblock.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/page_image_layout.cc.gcc43 ocrad-0.17/page_image_layout.cc --- ocrad-0.17/page_image_layout.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/page_image_layout.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/track.cc.gcc43 ocrad-0.17/track.cc --- ocrad-0.17/track.cc.gcc43 2008-02-19 19:37:08.000000000 +0100 +++ ocrad-0.17/track.cc 2008-02-19 19:37:30.000000000 +0100 @@ -17,6 +17,7 @@ #include #include +#include #include "common.h" #include "rectangle.h" diff -up ocrad-0.17/textline.cc.gcc43 ocrad-0.17/textline.cc --- ocrad-0.17/textline.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textline.cc 2008-02-19 19:36:25.000000000 +0100 @@ -19,6 +19,7 @@ #include #include #include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/common.cc.gcc43 ocrad-0.17/common.cc --- ocrad-0.17/common.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/common.cc 2008-02-19 19:36:25.000000000 +0100 @@ -17,6 +17,7 @@ #include #include +#include #include #include "common.h" diff -up ocrad-0.17/textpage.cc.gcc43 ocrad-0.17/textpage.cc --- ocrad-0.17/textpage.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textpage.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include "common.h" #include "rectangle.h" diff -up ocrad-0.17/textline_r2.cc.gcc43 ocrad-0.17/textline_r2.cc --- ocrad-0.17/textline_r2.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/textline_r2.cc 2008-02-19 19:36:25.000000000 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include "common.h" #include "rectangle.h" diff -up ocrad-0.17/page_image.cc.gcc43 ocrad-0.17/page_image.cc --- ocrad-0.17/page_image.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/page_image.cc 2008-02-19 19:36:25.000000000 +0100 @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include "common.h" #include "rational.h" diff -up ocrad-0.17/character_r12.cc.gcc43 ocrad-0.17/character_r12.cc --- ocrad-0.17/character_r12.cc.gcc43 2007-06-29 14:29:13.000000000 +0200 +++ ocrad-0.17/character_r12.cc 2008-02-19 19:36:25.000000000 +0100 @@ -17,6 +17,7 @@ #include #include +#include #include "common.h" #include "rectangle.h" #include "ucs.h" --- NEW FILE ocrad.spec --- Summary: An Optical Character Recognition program Name: ocrad Version: 0.17 Release: 3%{?dist} License: GPLv3+ Group: Applications/Multimedia Source: ftp://ftp.gnu.org/gnu/ocrad/%{name}-%{version}.tar.bz2 Patch0: ocrad-0.17-gcc43.patch URL: http://www.gnu.org/software/ocrad/ocrad.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description GNU Ocrad is an OCR (Optical Character Recognition) program based on a feature extraction method. It reads images in pbm (bitmap), pgm (greyscale) or ppm (color) formats and produces text in byte (8-bit) or UTF-8 formats. Also includes a layout analyser able to separate the columns or blocks of text normally found on printed pages. Ocrad can be used as a stand-alone console application, or as a backend to other programs. %prep %setup -q %patch0 -p1 -b .gcc43 %build %configure make CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 install -p doc/ocrad.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/install-info %{_infodir}/ocrad.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/ocrad.info.gz %{_infodir}/dir || : fi %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_bindir}/ocrad %attr(0644,root,root) %{_mandir}/man1/* %attr(0644,root,root) %{_infodir}/ocrad.info.gz %changelog * Mon Mar 03 2008 Tomas Smetana 0.17-3 - remove unpackaged file * Fri Feb 29 2008 Tomas Smetana 0.17-2 - fix spec file - fix compilation issues with gcc-4.3 * Fri Feb 29 2008 Tomas Smetana 0.17-1 - Spec file created Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocrad/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2008 20:09:47 -0000 1.1 +++ .cvsignore 5 Mar 2008 08:15:39 -0000 1.2 @@ -0,0 +1 @@ +ocrad-0.17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocrad/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2008 20:09:47 -0000 1.1 +++ sources 5 Mar 2008 08:15:39 -0000 1.2 @@ -0,0 +1 @@ +687c213b3334d5a6c2dcef97805c5882 ocrad-0.17.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 09:47:57 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 5 Mar 2008 09:47:57 GMT Subject: rpms/hunspell/devel .cvsignore, 1.13, 1.14 hunspell.spec, 1.34, 1.35 sources, 1.13, 1.14 Message-ID: <200803050947.m259lvLZ021357@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21333 Modified Files: .cvsignore hunspell.spec sources Log Message: add ispellaff2myspell to devel package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 5 Nov 2007 14:36:04 -0000 1.13 +++ .cvsignore 5 Mar 2008 09:47:16 -0000 1.14 @@ -1 +1,2 @@ hunspell-1.2.1.tar.gz +ispellaff2myspell Index: hunspell.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/hunspell.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- hunspell.spec 18 Feb 2008 22:18:41 -0000 1.34 +++ hunspell.spec 5 Mar 2008 09:47:16 -0000 1.35 @@ -1,8 +1,9 @@ Name: hunspell Summary: Hunspell is a spell checker and morphological analyzer library Version: 1.2.1 -Release: 5%{?dist} -Source: http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz +Release: 6%{?dist} +Source0: http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz +Source1: http://people.debian.org/~agmartin/misc/ispellaff2myspell Group: System Environment/Libraries URL: http://hunspell.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,6 +31,15 @@ %setup -q %patch1 -p1 -b .pkgconfig.patch %patch2 -p1 -b .1863239.badstructs.patch +# Filter unwanted Requires for the use explicitely string in ispellaff2myspell +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ + sed -e '/perl(explicitely)/d' +EOF + +%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req +chmod +x %{__perl_requires} %build libtoolize --automake --force @@ -52,6 +62,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/example mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell mv $RPM_BUILD_ROOT/%{_includedir}/*munch* $RPM_BUILD_ROOT/%{_includedir}/%{name} +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/ispellaff2myspell %clean rm -rf $RPM_BUILD_ROOT @@ -79,9 +90,13 @@ %{_bindir}/unmunch %{_bindir}/analyze %{_bindir}/chmorph +%{_bindir}/ispellaff2myspell %{_libdir}/pkgconfig/hunspell.pc %changelog +* Wed Mar 05 2008 Caolan McNamara - 1.2.1-6 +- add ispellaff2myspell to devel + * Mon Feb 18 2008 Fedora Release Engineering - 1.2.1-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 5 Nov 2007 14:36:04 -0000 1.13 +++ sources 5 Mar 2008 09:47:16 -0000 1.14 @@ -1 +1,2 @@ c504f9c2065f697e586593992dd74dae hunspell-1.2.1.tar.gz +1c5ea5ecd2481ddc116d65ea294acae3 ispellaff2myspell From fedora-extras-commits at redhat.com Wed Mar 5 10:05:46 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 5 Mar 2008 10:05:46 GMT Subject: rpms/system-config-printer/devel pycups-1.9.36.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.161, 1.162 sources, 1.166, 1.167 system-config-printer.spec, 1.171, 1.172 pycups-1.9.35.tar.bz2.sig, 1.1, NONE Message-ID: <200803051005.m25A5kui028834@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28789 Modified Files: .cvsignore sources system-config-printer.spec Added Files: pycups-1.9.36.tar.bz2.sig Removed Files: pycups-1.9.35.tar.bz2.sig Log Message: * Wed Mar 5 2008 Tim Waugh - Updated pycups to 1.9.36. --- NEW FILE pycups-1.9.36.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- .cvsignore 3 Mar 2008 17:15:00 -0000 1.161 +++ .cvsignore 5 Mar 2008 10:05:08 -0000 1.162 @@ -157,3 +157,4 @@ pycups-1.9.35.tar.bz2 system-config-printer-0.7.82.tar.bz2 system-config-printer-0.7.82.1.tar.bz2 +pycups-1.9.36.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- sources 3 Mar 2008 17:15:00 -0000 1.166 +++ sources 5 Mar 2008 10:05:08 -0000 1.167 @@ -1,2 +1,2 @@ -aeebcfee89f1f2d23ab4ec9e94f773fc pycups-1.9.35.tar.bz2 e67b3580834d807cdb4e03a46317dcdb system-config-printer-0.7.82.1.tar.bz2 +6f8fd2a5d8690ad2c0619f2aac52179e pycups-1.9.36.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- system-config-printer.spec 3 Mar 2008 17:15:00 -0000 1.171 +++ system-config-printer.spec 5 Mar 2008 10:05:08 -0000 1.172 @@ -1,4 +1,4 @@ -%define pycups_version 1.9.35 +%define pycups_version 1.9.36 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} @@ -131,6 +131,9 @@ exit 0 %changelog +* Wed Mar 5 2008 Tim Waugh +- Updated pycups to 1.9.36. + * Mon Mar 3 2008 Tim Waugh 0.7.82.1-1 - Requires /usr/bin/system-install-packages not pirut (bug #435622). - 0.7.82.1: --- pycups-1.9.35.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Wed Mar 5 10:08:43 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 5 Mar 2008 10:08:43 GMT Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.172, 1.173 Message-ID: <200803051008.m25A8hTI028913@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28865 Modified Files: system-config-printer.spec Log Message: - Some fixes from upstream. Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- system-config-printer.spec 5 Mar 2008 10:05:08 -0000 1.172 +++ system-config-printer.spec 5 Mar 2008 10:08:06 -0000 1.173 @@ -5,7 +5,7 @@ Summary: A printer administration tool Name: system-config-printer Version: 0.7.82.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -13,6 +13,7 @@ Source1: pycups-%{pycups_version}.tar.bz2 Source2: system-config-printer.pam Source3: system-config-printer.console +Patch0: system-config-printer-0.7.82.x.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -57,6 +58,7 @@ %prep %setup -q -a 1 +%patch0 -p1 -z .0.7.82.x %build %configure @@ -131,8 +133,9 @@ exit 0 %changelog -* Wed Mar 5 2008 Tim Waugh +* Wed Mar 5 2008 Tim Waugh 0.7.82.1-2 - Updated pycups to 1.9.36. +- Some fixes from upstream. * Mon Mar 3 2008 Tim Waugh 0.7.82.1-1 - Requires /usr/bin/system-install-packages not pirut (bug #435622). From fedora-extras-commits at redhat.com Wed Mar 5 10:09:13 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 5 Mar 2008 10:09:13 GMT Subject: rpms/system-config-printer/F-8 sources, 1.162, 1.163 system-config-printer.spec, 1.159, 1.160 Message-ID: <200803051009.m25A9Dt4028956@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28894 Modified Files: sources system-config-printer.spec Log Message: * Wed Mar 5 2008 Tim Waugh - Updated pycups to 1.9.36. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/sources,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- sources 4 Mar 2008 18:16:01 -0000 1.162 +++ sources 5 Mar 2008 10:08:26 -0000 1.163 @@ -1,2 +1,2 @@ cd61cc2d58520e71d22be60d88d6884d system-config-printer-0.7.74.11.tar.bz2 -aeebcfee89f1f2d23ab4ec9e94f773fc pycups-1.9.35.tar.bz2 +6f8fd2a5d8690ad2c0619f2aac52179e pycups-1.9.36.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- system-config-printer.spec 4 Mar 2008 18:16:01 -0000 1.159 +++ system-config-printer.spec 5 Mar 2008 10:08:26 -0000 1.160 @@ -1,4 +1,4 @@ -%define pycups_version 1.9.35 +%define pycups_version 1.9.36 Summary: A printer administration tool Name: system-config-printer @@ -122,6 +122,9 @@ exit 0 %changelog +* Wed Mar 5 2008 Tim Waugh +- Updated pycups to 1.9.36. + * Tue Mar 4 2008 Tim Waugh 0.7.74.11-1 - Updated pycups to 1.9.35. - 0.7.74.11: From fedora-extras-commits at redhat.com Wed Mar 5 10:14:15 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 5 Mar 2008 10:14:15 GMT Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.173, 1.174 Message-ID: <200803051014.m25AEF17029053@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29026 Modified Files: system-config-printer.spec Log Message: Fixed spec file. Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- system-config-printer.spec 5 Mar 2008 10:08:06 -0000 1.173 +++ system-config-printer.spec 5 Mar 2008 10:13:37 -0000 1.174 @@ -58,7 +58,7 @@ %prep %setup -q -a 1 -%patch0 -p1 -z .0.7.82.x +%patch0 -p1 -b .0.7.82.x %build %configure From fedora-extras-commits at redhat.com Wed Mar 5 10:14:50 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 5 Mar 2008 10:14:50 GMT Subject: rpms/system-config-printer/F-8 system-config-printer.spec, 1.160, 1.161 Message-ID: <200803051014.m25AEo3T029105@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29047 Modified Files: system-config-printer.spec Log Message: - Include state-reasons work-around fix. Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- system-config-printer.spec 5 Mar 2008 10:08:26 -0000 1.160 +++ system-config-printer.spec 5 Mar 2008 10:14:10 -0000 1.161 @@ -11,6 +11,7 @@ Source1: pycups-%{pycups_version}.tar.bz2 Source2: system-config-printer.pam Source3: system-config-printer.console +Patch0: system-config-printer-state-reasons.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -52,6 +53,7 @@ %prep %setup -q -a 1 +%patch0 -p1 -b .state-reasons %build %configure @@ -124,6 +126,7 @@ %changelog * Wed Mar 5 2008 Tim Waugh - Updated pycups to 1.9.36. +- Include state-reasons work-around fix. * Tue Mar 4 2008 Tim Waugh 0.7.74.11-1 - Updated pycups to 1.9.35. From fedora-extras-commits at redhat.com Wed Mar 5 10:15:07 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 5 Mar 2008 10:15:07 GMT Subject: rpms/system-config-printer/F-8 system-config-printer-state-reasons.patch, NONE, 1.1 Message-ID: <200803051015.m25AF7Nf029125@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29116 Added Files: system-config-printer-state-reasons.patch Log Message: - Include state-reasons work-around fix. system-config-printer-state-reasons.patch: --- NEW FILE system-config-printer-state-reasons.patch --- diff -up system-config-printer-0.7.74.11/applet.py.state-reasons system-config-printer-0.7.74.11/applet.py --- system-config-printer-0.7.74.11/applet.py.state-reasons 2008-03-03 17:52:19.000000000 +0000 +++ system-config-printer-0.7.74.11/applet.py 2008-03-05 10:12:33.000000000 +0000 @@ -127,7 +127,7 @@ def collect_printer_state_reasons (conne printers = connection.getPrinters () for name, printer in printers.iteritems (): reasons = printer["printer-state-reasons"] - if type (reasons) == str: + if type (reasons) != list: # Work around a bug that was fixed in pycups-1.9.20. reasons = [reasons] for reason in reasons: diff -U0 system-config-printer-0.7.74.11/ChangeLog.state-reasons system-config-printer-0.7.74.11/ChangeLog --- system-config-printer-0.7.74.11/ChangeLog.state-reasons 2008-03-03 17:52:19.000000000 +0000 +++ system-config-printer-0.7.74.11/ChangeLog 2008-03-05 10:12:33.000000000 +0000 @@ -0,0 +1,4 @@ +2008-03-05 Tim Waugh + + * applet.py (collect_printer_state_reasons): Fix work-around. + From fedora-extras-commits at redhat.com Wed Mar 5 10:15:44 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 5 Mar 2008 10:15:44 GMT Subject: rpms/system-config-printer/devel system-config-printer-0.7.82.x.patch, NONE, 1.1 Message-ID: <200803051015.m25AFiJ9029155@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29146 Added Files: system-config-printer-0.7.82.x.patch Log Message: Include patch. system-config-printer-0.7.82.x.patch: --- NEW FILE system-config-printer-0.7.82.x.patch --- diff -up system-config-printer-0.7.82.1/po/de.po.0.7.82.x system-config-printer-0.7.82.1/po/de.po --- system-config-printer-0.7.82.1/po/de.po.0.7.82.x 2008-03-03 17:08:18.000000000 +0000 +++ system-config-printer-0.7.82.1/po/de.po 2008-03-05 10:06:03.000000000 +0000 @@ -13,12 +13,12 @@ # msgid "" msgstr "" -"Project-Id-Version: system-config-printer 0.7.81\n" +"Project-Id-Version: system-config-printer\n" "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n" -"POT-Creation-Date: 2008-03-03 17:02+0000\n" -"PO-Revision-Date: 2008-02-29 11:39+0100\n" +"POT-Creation-Date: 2008-03-03 17:04+0000\n" +"PO-Revision-Date: 2008-03-04 00:11+0100\n" "Last-Translator: Fabian Affolter \n" -"Language-Team: German Translation Team \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,7 +31,9 @@ msgstr "" msgid "Idle" msgstr "Unt??tig" -#: ../cupshelpers.py:34 ../troubleshoot/PrintTestPage.py:35 ../applet.py:885 +#: ../cupshelpers.py:34 +#: ../troubleshoot/PrintTestPage.py:35 +#: ../applet.py:885 msgid "Processing" msgstr "Ausf??hrend" @@ -39,38 +41,49 @@ msgstr "Ausf??hrend" msgid "Busy" msgstr "Besch??ftigt" -#: ../cupshelpers.py:36 ../troubleshoot/PrintTestPage.py:36 ../applet.py:886 +#: ../cupshelpers.py:36 +#: ../troubleshoot/PrintTestPage.py:36 +#: ../applet.py:886 msgid "Stopped" msgstr "Angehalten" -#: ../cupshelpers.py:53 ../troubleshoot/ChooseNetworkPrinter.py:96 +#: ../cupshelpers.py:53 +#: ../troubleshoot/ChooseNetworkPrinter.py:96 #: ../troubleshoot/ChooseNetworkPrinter.py:97 #: ../troubleshoot/ChooseNetworkPrinter.py:100 #: ../troubleshoot/ChooseNetworkPrinter.py:101 -#: ../troubleshoot/ChoosePrinter.py:85 ../troubleshoot/ChoosePrinter.py:86 -#: ../troubleshoot/ChoosePrinter.py:89 ../troubleshoot/ChoosePrinter.py:90 +#: ../troubleshoot/ChoosePrinter.py:85 +#: ../troubleshoot/ChoosePrinter.py:86 +#: ../troubleshoot/ChoosePrinter.py:89 +#: ../troubleshoot/ChoosePrinter.py:90 #: ../applet.py:895 msgid "Unknown" msgstr "Unbekannt" -#: ../my-default-printer.py:136 ../my-default-printer.desktop.in.h:1 +#: ../my-default-printer.py:136 +#: ../my-default-printer.desktop.in.h:1 msgid "Default Printer" msgstr "Standarddrucker" -#: ../my-default-printer.py:140 ../my-default-printer.py:171 +#: ../my-default-printer.py:140 +#: ../my-default-printer.py:171 msgid "_Use System Default" msgstr "Standardeinstell_ung des Systems verwenden" -#: ../my-default-printer.py:141 ../my-default-printer.py:173 +#: ../my-default-printer.py:141 +#: ../my-default-printer.py:173 msgid "_Set Default" msgstr "_Standard setzen" -#: ../my-default-printer.py:151 ../troubleshoot/PrintTestPage.py:73 -#: ../applet.py:119 ../applet.py:159 +#: ../my-default-printer.py:151 +#: ../troubleshoot/PrintTestPage.py:73 +#: ../applet.py:119 +#: ../applet.py:159 msgid "Printer" msgstr "Drucker" -#: ../my-default-printer.py:155 ../system-config-printer.py:2373 +#: ../my-default-printer.py:155 +#: ../system-config-printer.py:2373 #: ../troubleshoot/ChooseNetworkPrinter.py:37 #: ../troubleshoot/ChoosePrinter.py:38 msgid "Location" @@ -84,11 +97,13 @@ msgstr "Konflikte mit:" msgid "Server Settings" msgstr "Serveroptionen" -#: ../system-config-printer.py:366 ../system-config-printer.py:368 +#: ../system-config-printer.py:366 +#: ../system-config-printer.py:368 msgid "Members of this class" msgstr "Mitglieder dieser Klasse" -#: ../system-config-printer.py:367 ../system-config-printer.py:369 +#: ../system-config-printer.py:367 +#: ../system-config-printer.py:369 msgid "Others" msgstr "Andere" @@ -108,7 +123,8 @@ msgstr "Modelle" msgid "Drivers" msgstr "Treiber" -#: ../system-config-printer.py:374 ../system-config-printer.glade.h:107 +#: ../system-config-printer.py:374 +#: ../system-config-printer.glade.h:107 msgid "Downloadable Drivers" msgstr "Herunterladbare Treiber" @@ -130,7 +146,8 @@ msgstr "Druckerkonfiguration - %s" msgid "Connected to %s" msgstr "Verbunden mit %s" -#: ../system-config-printer.py:561 ../system-config-printer.py:1273 +#: ../system-config-printer.py:561 +#: ../system-config-printer.py:1273 msgid "Not connected" msgstr "Nicht verbunden" @@ -163,7 +180,8 @@ msgstr "" msgid "Installable Options" msgstr "Installierbare Optionen" -#: ../system-config-printer.py:1203 ../system-config-printer.glade.h:209 +#: ../system-config-printer.py:1203 +#: ../system-config-printer.glade.h:209 msgid "Printer Options" msgstr "Druckeroptionen" @@ -177,32 +195,32 @@ msgstr "" "??nderungen k??nnen nur ??bernommen werden,\n" "nachdem diese Konflikte gel??st wurden." -#: ../system-config-printer.py:1241 ../system-config-printer.py:1257 +#: ../system-config-printer.py:1241 +#: ../system-config-printer.py:1257 #: ../applet.py:292 msgid "Not authorized" msgstr "Nicht berechtigt" -#: ../system-config-printer.py:1242 ../applet.py:293 +#: ../system-config-printer.py:1242 +#: ../applet.py:293 msgid "The password may be incorrect." msgstr "Das Passwort ist m??glicherweise falsch." -#: ../system-config-printer.py:1245 ../system-config-printer.py:1278 +#: ../system-config-printer.py:1245 +#: ../system-config-printer.py:1278 #: ../applet.py:296 msgid "CUPS server error" msgstr "Fehlder des CUPS-Servers" -#: ../system-config-printer.py:1246 ../applet.py:297 +#: ../system-config-printer.py:1246 +#: ../applet.py:297 #, python-format msgid "There was an error during the CUPS operation: '%s'." msgstr "Beim Betrieb von CUPS trat ein Fehler auf: '%s'." #: ../system-config-printer.py:1258 -msgid "" -"The password may be incorrect, or the server may be configured to deny " -"remote administration." -msgstr "" -"Das Passwort ist m??glicherweise falsch oder der Server ist so konfiguriert, " -"dass er Administration aus der Ferne verweigert." +msgid "The password may be incorrect, or the server may be configured to deny remote administration." +msgstr "Das Passwort ist m??glicherweise falsch oder der Server ist so konfiguriert, dass er Administration aus der Ferne verweigert." #: ../system-config-printer.py:1263 msgid "Bad request" @@ -242,7 +260,8 @@ msgstr "Damit wird diese Klasse gel??sch msgid "Proceed anyway?" msgstr "Trotzdem durchf??hren?" -#: ../system-config-printer.py:1518 ../system-config-printer.py:1552 +#: ../system-config-printer.py:1518 +#: ../system-config-printer.py:1552 msgid "Submitted" msgstr "??bertragen" @@ -251,25 +270,24 @@ msgstr "??bertragen" msgid "Test page submitted as job %d" msgstr "Testseite als Auftrag %d ??bertragen" -#: ../system-config-printer.py:1530 ../system-config-printer.py:1562 +#: ../system-config-printer.py:1530 +#: ../system-config-printer.py:1562 #: ../system-config-printer.py:3482 msgid "Not possible" msgstr "Nicht m??glich" -#: ../system-config-printer.py:1531 ../system-config-printer.py:1563 -msgid "" -"The remote server did not accept the print job, most likely because the " -"printer is not shared." -msgstr "" -"Der entfernte Server akzeptiert keine Auftr??ge. Wahrscheinlich liegt es " -"daran, dass der Drucker nicht freigegeben ist." +#: ../system-config-printer.py:1531 +#: ../system-config-printer.py:1563 +msgid "The remote server did not accept the print job, most likely because the printer is not shared." +msgstr "Der entfernte Server akzeptiert keine Auftr??ge. Wahrscheinlich liegt es daran, dass der Drucker nicht freigegeben ist." #: ../system-config-printer.py:1553 #, python-format msgid "Maintenance command submitted as job %d" msgstr "Wartungsbefehl als Auftrag %d ??bertragen" -#: ../system-config-printer.py:1649 ../system-config-printer.py:1791 +#: ../system-config-printer.py:1649 +#: ../system-config-printer.py:1791 msgid "Error" msgstr "Fehler" @@ -295,7 +313,8 @@ msgid "Cancel Tests" msgstr "Tests abbrechen" #. Not more than 25 characters -#: ../system-config-printer.py:1836 ../system-config-printer.glade.h:208 +#: ../system-config-printer.py:1836 +#: ../system-config-printer.glade.h:208 #: ../troubleshoot/PrintTestPage.py:61 msgid "Print Test Page" msgstr "Testseite drucken" @@ -325,27 +344,26 @@ msgid "Queue" msgstr "Warteschlange" #: ../system-config-printer.py:2381 -msgid "" -"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." -"PPD.GZ)" -msgstr "" -"PostScript Drucker-Beschreibungsdatei (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." -"PPD.GZ)" +msgid "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" +msgstr "PostScript Drucker-Beschreibungsdatei (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" #: ../system-config-printer.py:2390 msgid "All files (*)" msgstr "Alle Dateien (*)" -#: ../system-config-printer.py:2425 ../system-config-printer.py:3741 +#: ../system-config-printer.py:2425 +#: ../system-config-printer.py:3741 #: ../system-config-printer.py:3775 msgid "Search" msgstr "Suche" -#: ../system-config-printer.py:2428 ../system-config-printer.glade.h:155 +#: ../system-config-printer.py:2428 +#: ../system-config-printer.glade.h:155 msgid "New Printer" msgstr "Neuer Drucker" -#: ../system-config-printer.py:2438 ../system-config-printer.glade.h:154 +#: ../system-config-printer.py:2438 +#: ../system-config-printer.glade.h:154 msgid "New Class" msgstr "Neue Klasse" @@ -357,12 +375,15 @@ msgstr "Ger??te-URI ??ndern" msgid "Change Driver" msgstr "Treiber ??ndern" -#: ../system-config-printer.py:2551 ../system-config-printer.py:2775 -#: ../system-config-printer.py:2941 ../system-config-printer.py:3764 +#: ../system-config-printer.py:2551 +#: ../system-config-printer.py:2775 +#: ../system-config-printer.py:2941 +#: ../system-config-printer.py:3764 msgid "Searching" msgstr "Suchen" -#: ../system-config-printer.py:2552 ../system-config-printer.py:2776 +#: ../system-config-printer.py:2552 +#: ../system-config-printer.py:2776 msgid "Searching for drivers" msgstr "Suche nach Treibern" @@ -378,31 +399,34 @@ msgstr "Sonstiges" msgid " (Current)" msgstr " (aktuell)" -#: ../system-config-printer.py:3188 ../system-config-printer.py:3449 +#: ../system-config-printer.py:3188 +#: ../system-config-printer.py:3449 msgid "Scanning..." msgstr "Absuchen???" -#: ../system-config-printer.py:3360 ../system-config-printer.py:3427 +#: ../system-config-printer.py:3360 +#: ../system-config-printer.py:3427 msgid "Verified" msgstr "verifiziert" -#: ../system-config-printer.py:3361 ../system-config-printer.py:3428 +#: ../system-config-printer.py:3361 +#: ../system-config-printer.py:3428 msgid "This print share is accessible." msgstr "Auf diese Drucker-Freigabe kann zugegriffen werden." -#: ../system-config-printer.py:3368 ../system-config-printer.py:3434 +#: ../system-config-printer.py:3368 +#: ../system-config-printer.py:3434 msgid "Inaccessible" msgstr "Zugriff verweigert" -#: ../system-config-printer.py:3369 ../system-config-printer.py:3435 +#: ../system-config-printer.py:3369 +#: ../system-config-printer.py:3435 msgid "This print share is not accessible." msgstr "Auf diese Drucker-Freigabe kann nicht zugegriffen werden." #: ../system-config-printer.py:3483 msgid "It is not possible to obtain a list of queues from this host." -msgstr "" -"Es ist nicht m??glich, von diesem Host eine Liste der Warteschlangen zu " -"erhalten." +msgstr "Es ist nicht m??glich, von diesem Host eine Liste der Warteschlangen zu erhalten." #: ../system-config-printer.py:3487 msgid "No queues" @@ -421,25 +445,16 @@ msgid "A printer connected to a USB port msgstr "Ein am USB-Port angeschlossener Drucker." #: ../system-config-printer.py:3549 -msgid "" -"HPLIP software driving a printer, or the printer function of a multi-" -"function device." -msgstr "" -"HPLIP-Software, die einen Drucker betreibt oder die Druckerfunktion eines " -"multifunktionalen Ger??ts." +msgid "HPLIP software driving a printer, or the printer function of a multi-function device." +msgstr "HPLIP-Software, die einen Drucker betreibt oder die Druckerfunktion eines multifunktionalen Ger??ts." #: ../system-config-printer.py:3552 -msgid "" -"HPLIP software driving a fax machine, or the fax function of a multi-" -"function device." -msgstr "" -"HPLIP-Software, die eine Fax-Maschine betreibt oder die Fax-Funktion eines " -"multifunktionalen Ger??ts." +msgid "HPLIP software driving a fax machine, or the fax function of a multi-function device." +msgstr "HPLIP-Software, die eine Fax-Maschine betreibt oder die Fax-Funktion eines multifunktionalen Ger??ts." #: ../system-config-printer.py:3555 msgid "Local printer detected by the Hardware Abstraction Layer (HAL)." -msgstr "" -"Lokaler Drucker, der vom Hardware Abstraction Layer (HAL) erkannt wurde." +msgstr "Lokaler Drucker, der vom Hardware Abstraction Layer (HAL) erkannt wurde." #: ../system-config-printer.py:3787 msgid "-- Select printer model --" @@ -507,11 +522,10 @@ msgstr "Herunterladbare Treiber" #: ../system-config-printer.py:4065 msgid "Support for downloadable drivers is not yet completed." -msgstr "" -"Unterst??tzung f??r herunterladbare Treiber ist momentan noch nicht " -"vollst??ndig." +msgstr "Unterst??tzung f??r herunterladbare Treiber ist momentan noch nicht vollst??ndig." -#: ../system-config-printer.py:4115 ../system-config-printer.py:4152 +#: ../system-config-printer.py:4115 +#: ../system-config-printer.py:4152 msgid "No Installable Options" msgstr "Keine installierbaren Optionen" @@ -530,9 +544,7 @@ msgstr "Treiber installieren" #: ../system-config-printer.py:4353 #, python-format msgid "Printer '%s' requires the %s package but it is not currently installed." -msgstr "" -"Der Drucker ??%s?? ben??tigt das Paket %s, welches derzeit nicht installiert " -"ist." +msgstr "Der Drucker ??%s?? ben??tigt das Paket %s, welches derzeit nicht installiert ist." #: ../system-config-printer.py:4360 msgid "Missing driver" @@ -540,12 +552,8 @@ msgstr "Fehlender Treiber" #: ../system-config-printer.py:4361 #, python-format -msgid "" -"Printer '%s' requires the '%s' program but it is not currently installed. " -"Please install it before using this printer." -msgstr "" -"Der Drucker ??%s?? ben??tigt das Programm ??%s??, welches derzeit nicht " -"installiert ist. Bitte installieren Sie es, bevor Sie den Drucker verwenden." +msgid "Printer '%s' requires the '%s' program but it is not currently installed. Please install it before using this printer." +msgstr "Der Drucker ??%s?? ben??tigt das Programm ??%s??, welches derzeit nicht installiert ist. Bitte installieren Sie es, bevor Sie den Drucker verwenden." #: ../system-config-printer.glade.h:1 msgid " " @@ -695,11 +703,11 @@ msgid "" msgstr "" "??nderungen anwenden?\n" "\n" -"Jegliche von Ihnen gemachte ??nderungen gehen verloren, wenn Sie sie nicht " -"anwenden." +"Jegliche von Ihnen gemachte ??nderungen gehen verloren, wenn Sie sie nicht anwenden." #. Why doesn't __del__ work? -#: ../system-config-printer.glade.h:41 ../applet.glade.h:1 +#: ../system-config-printer.glade.h:41 +#: ../applet.glade.h:1 msgid "" "Password required\n" "\n" @@ -737,9 +745,7 @@ msgstr "Administration aus der Ferne erl #: ../system-config-printer.glade.h:51 msgid "Allow users to cancel any job (not just their own)" -msgstr "" -"Benutzern das L??schen jeglicher Druckauftr??ge erlauben (nicht nur der " -"eigenen)" +msgstr "Benutzern das L??schen jeglicher Druckauftr??ge erlauben (nicht nur der eigenen)" #: ../system-config-printer.glade.h:52 msgid "Authentication required" @@ -962,10 +968,8 @@ msgid "Flow Control" msgstr "Ablaufsteuerung" #: ../system-config-printer.glade.h:117 -msgid "" -"For the printer you have selected there are drivers available for download." -msgstr "" -"F??r den von Ihnen gew??hlten Drucker sind herunterladbare Treiber verf??gbar." +msgid "For the printer you have selected there are drivers available for download." +msgstr "F??r den von Ihnen gew??hlten Drucker sind herunterladbare Treiber verf??gbar." #: ../system-config-printer.glade.h:118 msgid "Gamma:" @@ -1072,9 +1076,7 @@ msgstr "Marke und Modell:" msgid "" "May contain any printable characters except \"/\", \"#\", and space.\n" "Name must be unique on the local machine!" -msgstr "" -"Diese Dokument enth??lt wahrscheinlich nicht druckbare Zeichen au??er ??/??, ??#?? " -"und Leerzeichen. Der Name muss auf der lokalen Maschine einmalig sein!" +msgstr "Diese Dokument enth??lt wahrscheinlich nicht druckbare Zeichen au??er ??/??, ??#?? und Leerzeichen. Der Name muss auf der lokalen Maschine einmalig sein!" #: ../system-config-printer.glade.h:149 msgid "Media:" @@ -1198,7 +1200,8 @@ msgstr "Seiten pro Seite:" msgid "Parity" msgstr "Parit??t" -#: ../system-config-printer.glade.h:195 ../troubleshoot/Welcome.py:64 +#: ../system-config-printer.glade.h:195 +#: ../troubleshoot/Welcome.py:64 #: ../applet.glade.h:5 msgid "Password:" msgstr "Passwort:" @@ -1228,14 +1231,8 @@ msgstr "" "Invertiertes Hochformat (180??)" #: ../system-config-printer.glade.h:203 -msgid "" -"PostScript Printer Description (PPD) files can often be found on the driver " -"disk that comes with the printer. For PostScript printers they are often " -"part of the Windows?? driver." -msgstr "" -"PostScript Printer Description (PPD) Dateien sind h??ufig auf der Treiber-CD " -"zu finden, die dem Drucker beiliegt. F??r PostScript-Drucker sind sie h??ufig " -"Teil der Windows??-Treiber." +msgid "PostScript Printer Description (PPD) files can often be found on the driver disk that comes with the printer. For PostScript printers they are often part of the Windows?? driver." +msgstr "PostScript Printer Description (PPD) Dateien sind h??ufig auf der Treiber-CD zu finden, die dem Drucker beiliegt. F??r PostScript-Drucker sind sie h??ufig Teil der Windows??-Treiber." #: ../system-config-printer.glade.h:204 msgid "Pretty print" @@ -1355,15 +1352,8 @@ msgid "Sides:" msgstr "Seiten:" #: ../system-config-printer.glade.h:237 -msgid "" -"Specify the default job options for this printer. Jobs arriving at this " -"print server will have these options added if they are not already set by " -"the application." -msgstr "" -"Geben Sie die standardm????igen Auftragsoptionen f??r diesen Drucker an. " -"Auftr??gen, die ??ber diesen Druckserver an diesen Drucker gerichtet werden, " -"werden diese Optionen hinzugef??gt, falls sie nicht bereits von der Anwendung " -"gesetzt wurden." +msgid "Specify the default job options for this printer. Jobs arriving at this print server will have these options added if they are not already set by the application." +msgstr "Geben Sie die standardm????igen Auftragsoptionen f??r diesen Drucker an. Auftr??gen, die ??ber diesen Druckserver an diesen Drucker gerichtet werden, werden diese Optionen hinzugef??gt, falls sie nicht bereits von der Anwendung gesetzt wurden." #: ../system-config-printer.glade.h:238 msgid "Starting Banner:" @@ -1378,92 +1368,42 @@ msgid "System-Config-Printer" msgstr "System-Config-Printer" #: ../system-config-printer.glade.h:241 -msgid "" -"The foomatic printer database contains various manufacturer provided " -"PostScript Printer Description (PPD) files and also can generate PPD files " -"for a large number of (non PostScript) printers. But in general manufacturer " -"provided PPD files provide better access to the specific features of the " -"printer." -msgstr "" -"Die foomatic-Druckerdatenbank beinhaltet verschiedene PostScript Printer " -"Description (PPD)-Dateien, die von Herstellern zur Verf??gung gestellt " -"werden. Sie kann weiterhin PPD-Dateien f??r eine gro??e Anzahl von (nicht-" -"PostScript-)Druckern erstellen. Allerdings bieten die von den Herstellern " -"zur Verf??gung gestellten Dateien im Allgemeinen einen besseren Zugriff zu " -"bestimmten Funktionen des Druckers." +msgid "The foomatic printer database contains various manufacturer provided PostScript Printer Description (PPD) files and also can generate PPD files for a large number of (non PostScript) printers. But in general manufacturer provided PPD files provide better access to the specific features of the printer." +msgstr "Die foomatic-Druckerdatenbank beinhaltet verschiedene PostScript Printer Description (PPD)-Dateien, die von Herstellern zur Verf??gung gestellt werden. Sie kann weiterhin PPD-Dateien f??r eine gro??e Anzahl von (nicht-PostScript-)Druckern erstellen. Allerdings bieten die von den Herstellern zur Verf??gung gestellten Dateien im Allgemeinen einen besseren Zugriff zu bestimmten Funktionen des Druckers." #: ../system-config-printer.glade.h:242 -msgid "" -"These drivers do not come from your operating system supplier and will not " -"be covered by their commercial support. See the support and license terms " -"of the driver's supplier." -msgstr "" -"Diese Treiber kommen nicht von Betriebssystem-Lieferanten und werden nicht " -"durch dessen kommerzielle Unterst??tzung abgedeckt. Lesen Sie die " -"Unterst??tzungs- und Lizenzbedingungen der Treiberherstellers." +msgid "These drivers do not come from your operating system supplier and will not be covered by their commercial support. See the support and license terms of the driver's supplier." +msgstr "Diese Treiber kommen nicht von Betriebssystem-Lieferanten und werden nicht durch dessen kommerzielle Unterst??tzung abgedeckt. Lesen Sie die Unterst??tzungs- und Lizenzbedingungen der Treiberherstellers." #: ../system-config-printer.glade.h:243 -msgid "" -"This driver supports additional hardware that may be installed in the " -"printer." -msgstr "" -"Dieser Treiber unterst??tzt zus??tzliche Hardware, welche im Drucker " -"installiert sein k??nnte." +msgid "This driver supports additional hardware that may be installed in the printer." +msgstr "Dieser Treiber unterst??tzt zus??tzliche Hardware, welche im Drucker installiert sein k??nnte." #: ../system-config-printer.glade.h:244 -msgid "" -"This is done by assuming that options with the same name do have the same " -"meaning. Settings of options that are not present in the new PPD will be " -"lost and options only present in the new PPD will be set to default." -msgstr "" -"Dies wird auf der Annahme durchgef??hrt, dass Optionen mit gleichen Namen die " -"gleiche Bedeutung haben. Einstellungen von Optionen, die nicht im neuen PPD " -"vorhanden sind, gehen verloren und nur Optionen, die im neuen PPD vorhanden " -"sind, werden als Standard gesetzt." +msgid "This is done by assuming that options with the same name do have the same meaning. Settings of options that are not present in the new PPD will be lost and options only present in the new PPD will be set to default." +msgstr "Dies wird auf der Annahme durchgef??hrt, dass Optionen mit gleichen Namen die gleiche Bedeutung haben. Einstellungen von Optionen, die nicht im neuen PPD vorhanden sind, gehen verloren und nur Optionen, die im neuen PPD vorhanden sind, werden als Standard gesetzt." #: ../system-config-printer.glade.h:245 msgid "" -"This program is free software; you can redistribute it and/or modify it " -"under the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " -"any later version.\n" +"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n" "\n" -"This program is distributed in the hope that it will be useful, but WITHOUT " -"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " -"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " -"more details.\n" +"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n" "\n" -"You should have received a copy of the GNU General Public License along with " -"this program; if not, write to the Free Software Foundation, Inc., 675 Mass " -"Ave, Cambridge, MA 02139, USA." +"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." msgstr "" -"This program is free software; you can redistribute it and/or modify it " -"under the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " -"any later version.\n" +"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n" "\n" -"This program is distributed in the hope that it will be useful, but WITHOUT " -"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " -"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " -"more details.\n" +"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n" "\n" -"You should have received a copy of the GNU General Public License along with " -"this program; if not, write to the Free Software Foundation, Inc., 675 Mass " -"Ave, Cambridge, MA 02139, USA." +"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." #: ../system-config-printer.glade.h:250 -msgid "" -"This way all current option settings will be lost. The default settings of " -"the new PPD will be used. " -msgstr "" -"Auf diesem Weg gehen alle derzeitigen Einstellungsoptionen verloren. Die " -"Voreinstellungen der neuen PPD werden verwendet." +msgid "This way all current option settings will be lost. The default settings of the new PPD will be used. " +msgstr "Auf diesem Weg gehen alle derzeitigen Einstellungsoptionen verloren. Die Voreinstellungen der neuen PPD werden verwendet." #: ../system-config-printer.glade.h:251 msgid "To add a new option, enter its name in the box below and click to add." -msgstr "" -"Um eine neue Option hinzuzuf??gen, geben Sie den Namen im unten aufgef??hrten " -"Kasten an und klicken, um sie hinzuzuf??gen." +msgstr "Um eine neue Option hinzuzuf??gen, geben Sie den Namen im unten aufgef??hrten Kasten an und klicken, um sie hinzuzuf??gen." #: ../system-config-printer.glade.h:252 msgid "Top margin:" @@ -1490,12 +1430,8 @@ msgid "Username:" msgstr "Benutzername:" #: ../system-config-printer.glade.h:258 -msgid "" -"With this choice no driver download will be performed. In the next steps a " -"locally installed driver will be selected." -msgstr "" -"Mit dieser Wahl werden keine Treiber heruntergeladen. Im n??chsten Schritt " -"wird ein lokal-installierter Treiber ausgew??hlt." +msgid "With this choice no driver download will be performed. In the next steps a locally installed driver will be selected." +msgstr "Mit dieser Wahl werden keine Treiber heruntergeladen. Im n??chsten Schritt wird ein lokal-installierter Treiber ausgew??hlt." #: ../system-config-printer.glade.h:259 msgid "Word wrap" @@ -1513,7 +1449,8 @@ msgstr "Nicht anwen_den" msgid "_Edit" msgstr "B_earbeiten" -#: ../system-config-printer.glade.h:263 ../applet.glade.h:10 +#: ../system-config-printer.glade.h:263 +#: ../applet.glade.h:10 msgid "_File" msgstr "_Datei" @@ -1680,7 +1617,8 @@ msgstr "Nicht angeschlossen?" msgid "Printer '%s' may not be connected." msgstr "Drucker ??%s?? ist ggf. nicht angeschlossen." -#: ../statereason.py:93 ../statereason.py:105 +#: ../statereason.py:93 +#: ../statereason.py:105 msgid "Printer error" msgstr "Drucker-Fehler" @@ -1707,25 +1645,16 @@ msgid "Printing troubleshooter" msgstr "Drucker-Fehlersuche" #: ../troubleshoot/base.py:33 -msgid "" -"To start this tool, select System->Administration->Printing from the main " -"menu." -msgstr "" -"Zum Starten dieses Werkzeuges, w??hlen Sie System->Administration->Drucken " -"aus dem Hauptmen??." +msgid "To start this tool, select System->Administration->Printing from the main menu." +msgstr "Zum Starten dieses Werkzeuges, w??hlen Sie System->Administration->Drucken aus dem Hauptmen??." #: ../troubleshoot/ChooseNetworkPrinter.py:29 msgid "Choose Network Printer" msgstr "Netzwerk-Drucker w??hlen" #: ../troubleshoot/ChooseNetworkPrinter.py:30 -msgid "" -"Please select the network printer you are trying to use from the list below. " -"If it does not appear in the list, select 'Not listed'." -msgstr "" -"Bitte w??hlen Sie den Netzdrucker, den sie verwenden m??chten, aus der " -"folgenden Liste aus. Falls er nicht in der Liste auftaucht, w??hlen Sie " -"??Nicht aufgef??hrt??." +msgid "Please select the network printer you are trying to use from the list below. If it does not appear in the list, select 'Not listed'." +msgstr "Bitte w??hlen Sie den Netzdrucker, den sie verwenden m??chten, aus der folgenden Liste aus. Falls er nicht in der Liste auftaucht, w??hlen Sie ??Nicht aufgef??hrt??." #: ../troubleshoot/ChooseNetworkPrinter.py:35 #: ../troubleshoot/ChoosePrinter.py:36 @@ -1747,13 +1676,8 @@ msgid "Choose Printer" msgstr "Drucker w??hlen" #: ../troubleshoot/ChoosePrinter.py:31 -msgid "" -"Please select the printer you are trying to use from the list below. If it " -"does not appear in the list, select 'Not listed'." -msgstr "" -"Bitte w??hlen Sie den Drucker, den Sie verwenden wollen, aus der folgenden " -"Liste aus. Falls er nicht in der Liste auftaucht, w??hlen Sie ??Nicht " -"aufgef??hrt??." +msgid "Please select the printer you are trying to use from the list below. If it does not appear in the list, select 'Not listed'." +msgstr "Bitte w??hlen Sie den Drucker, den Sie verwenden wollen, aus der folgenden Liste aus. Falls er nicht in der Liste auftaucht, w??hlen Sie ??Nicht aufgef??hrt??." #: ../troubleshoot/ErrorLogCheckpoint.py:30 #: ../troubleshoot/ErrorLogFetch.py:30 @@ -1761,12 +1685,8 @@ msgid "Debugging" msgstr "Deaktiviere Debugging" #: ../troubleshoot/ErrorLogCheckpoint.py:31 -msgid "" -"I would like to enable debugging output from the CUPS scheduler. This may " -"cause the scheduler to restart. Click the button below to enable debugging." -msgstr "" -"Ich m??chte das Debugging f??r die Ausgabe des CUPS-Planer aktivieren. Dies " -"startet den Planers neu. Klicken Sie unten, um Debugging zu aktivieren." +msgid "I would like to enable debugging output from the CUPS scheduler. This may cause the scheduler to restart. Click the button below to enable debugging." +msgstr "Ich m??chte das Debugging f??r die Ausgabe des CUPS-Planer aktivieren. Dies startet den Planers neu. Klicken Sie unten, um Debugging zu aktivieren." #: ../troubleshoot/ErrorLogCheckpoint.py:35 msgid "Enable Debugging" @@ -1781,12 +1701,8 @@ msgid "Debug logging was already enabled msgstr "Debug-Logging war schon aktiviert." #: ../troubleshoot/ErrorLogFetch.py:31 -msgid "" -"I would like to disable debugging output from the CUPS scheduler. This may " -"cause the scheduler to restart. Click the button below to disable debugging." -msgstr "" -"Ich m??chte das Debugging f??r die Ausgabe des CUPS-Planer deaktivieren. Dies " -"startet den Planers neu. Klicken Sie unten, um Debugging zu deaktivieren." +msgid "I would like to disable debugging output from the CUPS scheduler. This may cause the scheduler to restart. Click the button below to disable debugging." +msgstr "Ich m??chte das Debugging f??r die Ausgabe des CUPS-Planer deaktivieren. Dies startet den Planers neu. Klicken Sie unten, um Debugging zu deaktivieren." #: ../troubleshoot/ErrorLogFetch.py:35 msgid "Disable Debugging" @@ -1814,8 +1730,7 @@ msgstr "Drucker-Standort" #: ../troubleshoot/LocalOrRemote.py:28 msgid "Is the printer connected to this computer or available on the network?" -msgstr "" -"Ist der Drucker an diesen Computer angeschlossen oder im Netzwerk verf??gbar?" +msgstr "Ist der Drucker an diesen Computer angeschlossen oder im Netzwerk verf??gbar?" #: ../troubleshoot/LocalOrRemote.py:30 msgid "Locally connected printer" @@ -1839,9 +1754,7 @@ msgstr "Status-Nachricht" #: ../troubleshoot/PrinterStateReasons.py:30 msgid "There are status messages associated with this queue." -msgstr "" -"Dies sind die Status-Nachrichten, die in Zusammenhang mit dieser " -"Warteschlange stehen." +msgstr "Dies sind die Status-Nachrichten, die in Zusammenhang mit dieser Warteschlange stehen." #: ../troubleshoot/PrinterStateReasons.py:53 #, python-format @@ -1856,23 +1769,28 @@ msgstr "Die Fehler sind unten aufgeliste msgid "Warnings are listed below:" msgstr "DIe Warnungen sind unten aufgelistet:" -#: ../troubleshoot/PrintTestPage.py:33 ../applet.py:883 +#: ../troubleshoot/PrintTestPage.py:33 +#: ../applet.py:883 msgid "Pending" msgstr "Ausstehend" -#: ../troubleshoot/PrintTestPage.py:34 ../applet.py:884 +#: ../troubleshoot/PrintTestPage.py:34 +#: ../applet.py:884 msgid "Held" msgstr "Angehalten" -#: ../troubleshoot/PrintTestPage.py:37 ../applet.py:887 +#: ../troubleshoot/PrintTestPage.py:37 +#: ../applet.py:887 msgid "Canceled" msgstr "Abgebrochen" -#: ../troubleshoot/PrintTestPage.py:38 ../applet.py:888 +#: ../troubleshoot/PrintTestPage.py:38 +#: ../applet.py:888 msgid "Aborted" msgstr "Abgebrochen" -#: ../troubleshoot/PrintTestPage.py:39 ../applet.py:889 +#: ../troubleshoot/PrintTestPage.py:39 +#: ../applet.py:889 msgid "Completed" msgstr "Abgeschlossen" @@ -1881,13 +1799,8 @@ msgid "Test Page" msgstr "Testseite" #: ../troubleshoot/PrintTestPage.py:49 -msgid "" -"Now print a test page. If you are having problems printing a specific " -"document, print that document now and mark the print job below." -msgstr "" -"Drucken Sie jetzt eine Testseite. Wenn Sie Probleme beim Drucken eines " -"speziellen Dokumentes haben, drucken Sie dieses Dokument jetzt und markieren " -"Sie den Auftrag unten." +msgid "Now print a test page. If you are having problems printing a specific document, print that document now and mark the print job below." +msgstr "Drucken Sie jetzt eine Testseite. Wenn Sie Probleme beim Drucken eines speziellen Dokumentes haben, drucken Sie dieses Dokument jetzt und markieren Sie den Auftrag unten." #: ../troubleshoot/PrintTestPage.py:64 msgid "Cancel All Jobs" @@ -1897,15 +1810,18 @@ msgstr "Alle Auftr??ge abbrechen" msgid "Test" msgstr "Pr??fen" -#: ../troubleshoot/PrintTestPage.py:71 ../applet.py:117 +#: ../troubleshoot/PrintTestPage.py:71 +#: ../applet.py:117 msgid "Job" msgstr "Auftrag" -#: ../troubleshoot/PrintTestPage.py:75 ../applet.py:118 +#: ../troubleshoot/PrintTestPage.py:75 +#: ../applet.py:118 msgid "Document" msgstr "Dokument" -#: ../troubleshoot/PrintTestPage.py:76 ../applet.py:122 +#: ../troubleshoot/PrintTestPage.py:76 +#: ../applet.py:122 msgid "Status" msgstr "Status" @@ -1929,9 +1845,7 @@ msgstr "Der angegebene Grund lautet: ??% #: ../troubleshoot/QueueNotEnabled.py:59 msgid "This may be due to the printer being disconnected or switched off." -msgstr "" -"Dies kann daran liegen, dass der Drucker nicht angeschlossen oder " -"ausgeschaltet ist." +msgstr "Dies kann daran liegen, dass der Drucker nicht angeschlossen oder ausgeschaltet ist." #: ../troubleshoot/QueueNotEnabled.py:63 msgid "Queue Not Enabled" @@ -1943,12 +1857,8 @@ msgid "The queue `%s' is not enabled." msgstr "Die Warteschlange ??%s?? ist nicht aktiviert." #: ../troubleshoot/QueueNotEnabled.py:72 -msgid "" -"To enable it, select the `Enabled' checkbox in the `Policies' tab for the " -"printer in the printer administration tool." -msgstr "" -"Um sie zu aktivieren, w??hlen Sie im Drucker-Administrationswerkzeug " -"??Aktiviert?? f??r den Drucker aus." +msgid "To enable it, select the `Enabled' checkbox in the `Policies' tab for the printer in the printer administration tool." +msgstr "Um sie zu aktivieren, w??hlen Sie im Drucker-Administrationswerkzeug ??Aktiviert?? f??r den Drucker aus." #: ../troubleshoot/QueueRejectingJobs.py:32 msgid "Queue Rejecting Jobs" @@ -1960,25 +1870,16 @@ msgid "The queue `%s' is rejecting jobs. msgstr "Die Warteschlange ??%s?? verwirft Auftr??ge." #: ../troubleshoot/QueueRejectingJobs.py:71 -msgid "" -"To make the queue accept jobs, select the `Accepting Jobs' checkbox in the " -"`Policies' tab for the printer in the printer administration tool." -msgstr "" -"Damit die Warteschlange Auftr??ge akzeptiert, w??hlen Sie im Drucker-" -"Administrationswerkzeug ??Akzeptiere Druckauftr??ge?? im Reiter ??Richtlinien?? " -"f??r den Drucker aus." +msgid "To make the queue accept jobs, select the `Accepting Jobs' checkbox in the `Policies' tab for the printer in the printer administration tool." +msgstr "Damit die Warteschlange Auftr??ge akzeptiert, w??hlen Sie im Drucker-Administrationswerkzeug ??Akzeptiere Druckauftr??ge?? im Reiter ??Richtlinien?? f??r den Drucker aus." #: ../troubleshoot/RemoteAddress.py:27 msgid "Remote Address" msgstr "Entfernte Adresse" #: ../troubleshoot/RemoteAddress.py:28 -msgid "" -"Please enter as many details as you can about the network address of this " -"printer." -msgstr "" -"Bitte geben Sie so viele Details wie m??glich ??ber die Netzadresse dieses " -"Druckers ein." +msgid "Please enter as many details as you can about the network address of this printer." +msgstr "Bitte geben Sie so viele Details wie m??glich ??ber die Netzadresse dieses Druckers ein." #: ../troubleshoot/RemoteAddress.py:36 msgid "Server name:" @@ -1993,14 +1894,8 @@ msgid "CUPS Service Stopped" msgstr "CUPS-Service gestoppt" #: ../troubleshoot/SchedulerNotRunning.py:29 -msgid "" -"The CUPS print spooler does not appear to be running. To correct this, " -"choose System->Administration->Services from the main menu and look for the " -"`cups' service." -msgstr "" -"Der CUPS-Drucker-Zwischenspeicher (??Spooler??) scheint nicht zu laufen. Um " -"dies zu beheben, w??hlen Sie System->Administration->Service aus dem " -"Hauptmen?? und suchen Sie nach dem ??CUPS??-Service." +msgid "The CUPS print spooler does not appear to be running. To correct this, choose System->Administration->Services from the main menu and look for the `cups' service." +msgstr "Der CUPS-Drucker-Zwischenspeicher (??Spooler??) scheint nicht zu laufen. Um dies zu beheben, w??hlen Sie System->Administration->Service aus dem Hauptmen?? und suchen Sie nach dem ??CUPS??-Service." #: ../troubleshoot/ServerFirewalled.py:27 msgid "Check Server Firewall" @@ -2012,24 +1907,16 @@ msgstr "Es kann keine Verbindung zum Ser #: ../troubleshoot/ServerFirewalled.py:43 #, python-format -msgid "" -"Please check to see if a firewall or router configuration is blocking TCP " -"port %d on server `%s'." -msgstr "" -"Bitte pr??fen Sie, ob eine Firewall oder Router-Konfiguration TCP-Port %d auf " -"dem Server ??%s?? blockiert." +msgid "Please check to see if a firewall or router configuration is blocking TCP port %d on server `%s'." +msgstr "Bitte pr??fen Sie, ob eine Firewall oder Router-Konfiguration TCP-Port %d auf dem Server ??%s?? blockiert." #: ../troubleshoot/Shrug.py:27 msgid "Sorry!" msgstr "Entschuldigung!" #: ../troubleshoot/Shrug.py:28 -msgid "" -"I have not been able to work out what the problem is, but I have collected " -"some useful information to put in a bug report." -msgstr "" -"Ich konnte das Problem nicht ermitteln, aber ich habe einige n??tzliche Daten " -"gesammelt, die Sie in einen Fehlerbericht einf??gen k??nnen." +msgid "I have not been able to work out what the problem is, but I have collected some useful information to put in a bug report." +msgstr "Ich konnte das Problem nicht ermitteln, aber ich habe einige n??tzliche Daten gesammelt, die Sie in einen Fehlerbericht einf??gen k??nnen." #: ../troubleshoot/Welcome.py:41 msgid "Authentication" @@ -2044,13 +1931,8 @@ msgid "Trouble-shooting Printing" msgstr "Fehlersuche beim Drucken" #: ../troubleshoot/Welcome.py:97 -msgid "" -"In the next few screens I will ask you some questions about your problem " -"with printing. Based on your answers I will try to suggest a solution." -msgstr "" -"Auf den n??chsten paar Bildschirmen werde ich Ihnen ein paar Frgen ??ber Ihr " -"Problem beim Drucken stellen. Basierend auf Ihren Antworten werde ich " -"versuchen, eine L??sung vorzuschlagen." +msgid "In the next few screens I will ask you some questions about your problem with printing. Based on your answers I will try to suggest a solution." +msgstr "Auf den n??chsten paar Bildschirmen werde ich Ihnen ein paar Frgen ??ber Ihr Problem beim Drucken stellen. Basierend auf Ihren Antworten werde ich versuchen, eine L??sung vorzuschlagen." #: ../troubleshoot/Welcome.py:101 msgid "Click 'Forward' to begin." @@ -2106,34 +1988,34 @@ msgid "%d minutes ago" msgstr "Vor %d Minuten" #: ../applet.py:703 -#, fuzzy, python-format +#, python-format msgid "There was a problem sending document `%s' (job %d) to the printer." -msgstr "Bei der Verbindung mit dem CUPS-Server trat ein Fehler auf." +msgstr "Es gab ein Problem mit dem Senden des Dokuments `%s' (Auftrag %d) an den Drucker." #: ../applet.py:706 -#, fuzzy, python-format +#, python-format msgid "There was a problem processing document `%s' (job %d)." -msgstr "Es gibt ein Problem mit dem Drucker `%s'." +msgstr "Es gab ein Problem mit der Verabreitung des Dokuments `%s' (Auftrag %d)." #. Give up and use the untranslated provided. #: ../applet.py:710 -#, fuzzy, python-format +#, python-format msgid "There was a problem printing document `%s' (job %d): `%s'." -msgstr "Es gibt ein Problem mit dem Drucker `%s'." +msgstr "Es gab ein Problem mit dem Drucken des Dokuments `%s' (Auftrag %d): `%s'." -#: ../applet.py:715 ../applet.py:731 -#, fuzzy +#: ../applet.py:715 +#: ../applet.py:731 msgid "Print Error" msgstr "Drucker-Fehler" #: ../applet.py:716 msgid "_Diagnose" -msgstr "" +msgstr "_Diagnose" #: ../applet.py:737 -#, fuzzy, python-format +#, python-format msgid "The printer called `%s' has been disabled." -msgstr "Die Warteschlange ??%s?? ist nicht aktiviert." +msgstr "Der Drucker `%s' wurde deaktiviert." #: ../applet.py:816 msgid "No documents queued" @@ -2250,100 +2132,70 @@ msgstr "Standarddrucker w??hlen" #~ msgid "Queue Not Accepting Jobs" #~ msgstr "Warteschlange nimmt keine Auftr??ge an" - #~ msgid "The CUPS printer on the server is not accepting jobs." #~ msgstr "Der CUPS-Drucker auf diesem Server akzeptiert keine Auftr??ge." - #~ msgid "The CUPS printer on the server is not enabled." #~ msgstr "Der CUPS-Drucker auf diesem Server ist nicht aktiviert." - #~ msgid "Printer's state reasons:" #~ msgstr "Drucker-Status-Gr??nde:" - #~ msgid " The reason given is: `%s'." #~ msgstr " Der angegebene Grund ist: ??%s??." - #~ msgid "No License" #~ msgstr "Keine Lizenz" - #~ msgid "No license information is available for this driver." #~ msgstr "Keine Lizenz-Informationen f??r diesen Treiber verf??gbar." - #~ msgid "Printer Drivers Available for Download" #~ msgstr "Drucker-Treiber zum Herunterladen verf??gbar" - #~ msgid "Accept License" #~ msgstr "Akzeptiere Lizenz" - #~ msgid "Accept license terms?" #~ msgstr "Akzeptiere Lizenzbedingungen" - #~ msgid "Select Locally Installed Printer Driver" #~ msgstr "W??hle lokal installierten Drucker-Treiber" - #~ msgid "" #~ "THe remote server did not accept the print job, most likely because the " #~ "printer is not shared." #~ msgstr "" #~ "Der entfernte Server akzeptiert keine Auftr??ge, wahrscheinlich weil der " #~ "Drucker nicht freigegeben ist." - #~ msgid "Hostname" #~ msgstr "Rechnername" - #~ msgid "Printername" #~ msgstr "Druckername" - #~ msgid "Default printer is %s" #~ msgstr "Der Standard-Drucker ist %s" - #~ msgid "Going to create a new class %s." #~ msgstr "Werde neue Klasse %s erstellen." - #~ msgid " PPD " #~ msgstr " PPD " - #~ msgid "Comment about the Printer" #~ msgstr "Kommentar zum Drucker" - #~ msgid "Information about the PPD" #~ msgstr "Informationen zu PPD" - #~ msgid "About" #~ msgstr "Info" - #~ msgid "About System-Config-Printer" #~ msgstr "??ber System-Config-Printer" - #~ msgid "Apply" #~ msgstr "??bernehmen" - #~ msgid "Authors" #~ msgstr "Autoren" - #~ msgid "Change PPD" #~ msgstr "PPD ??ndern" - #~ msgid "Class Members" #~ msgstr "Mitglieder der Klasse" - #~ msgid "Comments: " #~ msgstr "Kommentare: " - #~ msgid "Copyright" #~ msgstr "Copyright" - #~ msgid "Device" #~ msgstr "Ger??t" - #~ msgid "Driver" #~ msgstr "Treiber" - #~ msgid "Make Default Printer" #~ msgstr "Marke des Standarddruckers" - #~ msgid "PPD" #~ msgstr "PPD" - #~ msgid "System-Config-Printer %s" #~ msgstr "System-Config-Printer %s" + diff -up system-config-printer-0.7.82.1/po/pl.po.0.7.82.x system-config-printer-0.7.82.1/po/pl.po --- system-config-printer-0.7.82.1/po/pl.po.0.7.82.x 2008-03-03 17:08:18.000000000 +0000 +++ system-config-printer-0.7.82.1/po/pl.po 2008-03-05 10:06:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n" "POT-Creation-Date: 2008-03-03 17:02+0000\n" -"PO-Revision-Date: 2008-02-19 23:30+0200\n" +"PO-Revision-Date: 2008-03-03 22:33+0200\n" "Last-Translator: Piotr Dr??g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -1630,14 +1630,13 @@ msgid "Printer '%s' has no ink left." msgstr "Drukarce \"%s\" nie ma ju?? tuszu." #: ../statereason.py:89 -#, fuzzy msgid "Printer off-line" -msgstr "Po??o??enie drukarki" +msgstr "Drukarka jest off-line" #: ../statereason.py:90 -#, fuzzy, python-format +#, python-format msgid "Printer `%s' is currently off-line." -msgstr "Drukarce \"%s\" sko??czy?? si?? papier." +msgstr "Drukarce `%s' jest obecnie off-line." #: ../statereason.py:91 msgid "Not connected?" @@ -1653,9 +1652,9 @@ msgid "Printer error" msgstr "B????d drukarki" #: ../statereason.py:94 -#, fuzzy, python-format +#, python-format msgid "There is a problem on printer `%s'." -msgstr "Drzwiczki drukarki \"%s\" s?? otwarte." +msgstr "Wyst??pi?? problem z drukark?? `%s'." #: ../statereason.py:101 msgid "Printer report" @@ -2065,34 +2064,34 @@ msgid "%d minutes ago" msgstr "%d minut temu" #: ../applet.py:703 -#, fuzzy, python-format +#, python-format msgid "There was a problem sending document `%s' (job %d) to the printer." -msgstr "Wyst??pi?? problem podczas ????czenia si?? z serwerem CUPS." +msgstr "" +"Wyst??pi?? problem podczas wysy??ania dokumentu `%s' (zadanie %d) do drukarki." #: ../applet.py:706 #, python-format msgid "There was a problem processing document `%s' (job %d)." -msgstr "" +msgstr "Wyst??pi?? problem podczas przetwarzania dokumentu `%s' (zadanie %d)." #. Give up and use the untranslated provided. #: ../applet.py:710 #, python-format msgid "There was a problem printing document `%s' (job %d): `%s'." -msgstr "" +msgstr "Wyst??pi?? problem podczas drukowania dokumentu `%s' (zadanie %d): `%s'." #: ../applet.py:715 ../applet.py:731 -#, fuzzy msgid "Print Error" -msgstr "B????d drukarki" +msgstr "B????d druku" #: ../applet.py:716 msgid "_Diagnose" -msgstr "" +msgstr "_Diagnozuj" #: ../applet.py:737 -#, fuzzy, python-format +#, python-format msgid "The printer called `%s' has been disabled." -msgstr "Kolejka `%s' jest wy????czona." +msgstr "Drukarka o nazwie `%s' zosta??a wy????czona." #: ../applet.py:816 msgid "No documents queued" diff -U0 system-config-printer-0.7.82.1/ChangeLog.0.7.82.x system-config-printer-0.7.82.1/ChangeLog --- system-config-printer-0.7.82.1/ChangeLog.0.7.82.x 2008-03-03 17:08:18.000000000 +0000 +++ system-config-printer-0.7.82.1/ChangeLog 2008-03-05 10:06:03.000000000 +0000 @@ -0,0 +1,9 @@ +2008-03-05 Tim Waugh + + * applet.py (collect_printer_state_reasons): Fix work-around. + (JobManager.get_notifications): Likewise. + + * system-config-printer.py + (NewPrinterGUI.on_btnIPPVerify_clicked): Prevent traceback when + failing to fetch printer attributes. + diff -up system-config-printer-0.7.82.1/applet.py.0.7.82.x system-config-printer-0.7.82.1/applet.py --- system-config-printer-0.7.82.1/applet.py.0.7.82.x 2008-03-03 17:08:18.000000000 +0000 +++ system-config-printer-0.7.82.1/applet.py 2008-03-05 10:06:03.000000000 +0000 @@ -54,7 +54,7 @@ def collect_printer_state_reasons (conne printers = connection.getPrinters () for name, printer in printers.iteritems (): reasons = printer["printer-state-reasons"] - if type (reasons) == str: + if type (reasons) != list: # Work around a bug that was fixed in pycups-1.9.20. reasons = [reasons] for reason in reasons: @@ -639,7 +639,7 @@ class JobManager: del self.printer_state_reasons[name] else: printer_state_reasons = event['printer-state-reasons'] - if type (printer_state_reasons) == str: + if type (printer_state_reasons) != list: # Work around a bug in pycups < 1.9.36 printer_state_reasons = [printer_state_reasons] diff -up system-config-printer-0.7.82.1/system-config-printer.py.0.7.82.x system-config-printer-0.7.82.1/system-config-printer.py --- system-config-printer-0.7.82.1/system-config-printer.py.0.7.82.x 2008-03-03 17:08:18.000000000 +0000 +++ system-config-printer-0.7.82.1/system-config-printer.py 2008-03-05 10:06:03.000000000 +0000 @@ -3416,7 +3416,7 @@ class NewPrinterGUI(GtkGUI): attributes = c.getPrinterAttributes (match.group (4)) verified = True except cups.IPPError, (e, msg): - debugprint ("Failed to get attributes: " + e + " " + msg) + debugprint ("Failed to get attributes: %s (%d)" % (msg, e)) except: nonfatalException () else: From fedora-extras-commits at redhat.com Wed Mar 5 10:16:39 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 5 Mar 2008 10:16:39 GMT Subject: rpms/system-config-printer/F-8 system-config-printer.spec, 1.161, 1.162 Message-ID: <200803051016.m25AGdSD029230@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29204 Modified Files: system-config-printer.spec Log Message: 0.7.74.11-2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- system-config-printer.spec 5 Mar 2008 10:14:10 -0000 1.161 +++ system-config-printer.spec 5 Mar 2008 10:15:54 -0000 1.162 @@ -3,7 +3,7 @@ Summary: A printer administration tool Name: system-config-printer Version: 0.7.74.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -124,7 +124,7 @@ exit 0 %changelog -* Wed Mar 5 2008 Tim Waugh +* Wed Mar 5 2008 Tim Waugh 0.7.74.11-2 - Updated pycups to 1.9.36. - Include state-reasons work-around fix. From fedora-extras-commits at redhat.com Wed Mar 5 10:23:13 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Mar 2008 10:23:13 GMT Subject: rpms/audacity README,1.9,1.10 Message-ID: <200803051023.m25AND3F029369@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/audacity In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29340 Modified Files: README Log Message: comment on cvs snapshot 2008-01-23 Index: README =================================================================== RCS file: /cvs/pkgs/rpms/audacity/README,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- README 3 Jan 2008 14:48:52 -0000 1.9 +++ README 5 Mar 2008 10:22:25 -0000 1.10 @@ -1,3 +1,11 @@ +CVS snapshot from 2008-01-23 has had positive feedback, too, but could +need more testing. + +----- +CVS snapshot from 2008-01-11 does not suffer from the many audio problems +described below. + +----- Changes in upstream cvs are said to improve ALSA/JACK support (2008-01-03) ----- From fedora-extras-commits at redhat.com Wed Mar 5 10:24:18 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Mar 2008 10:24:18 GMT Subject: rpms/audacity README,1.10,1.11 Message-ID: <200803051024.m25AOIMQ029395@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/audacity In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29375 Modified Files: README Log Message: comment on CVE-2007-6061 Index: README =================================================================== RCS file: /cvs/pkgs/rpms/audacity/README,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- README 5 Mar 2008 10:22:25 -0000 1.10 +++ README 5 Mar 2008 10:23:36 -0000 1.11 @@ -1,3 +1,6 @@ +CVE-2007-6061 is being discussed on audacity-devel. + +----- CVS snapshot from 2008-01-23 has had positive feedback, too, but could need more testing. From fedora-extras-commits at redhat.com Wed Mar 5 10:27:46 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Wed, 5 Mar 2008 10:27:46 GMT Subject: rpms/logwatch/devel logwatch-7.3.6-dovecot_back.patch, NONE, 1.1 logwatch.spec, 1.88, 1.89 logwatch-7.3.6-dovecot.patch, 1.1, NONE Message-ID: <200803051027.m25ARkfs029469@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/logwatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29435 Modified Files: logwatch.spec Added Files: logwatch-7.3.6-dovecot_back.patch Removed Files: logwatch-7.3.6-dovecot.patch Log Message: - resolves 436058 dovecot script for logwatch needs fix for IPv6 logwatch-7.3.6-dovecot_back.patch: --- NEW FILE logwatch-7.3.6-dovecot_back.patch --- diff -up logwatch-7.3.6/scripts/services/dovecot.pom logwatch-7.3.6/scripts/services/dovecot --- logwatch-7.3.6/scripts/services/dovecot.pom 2007-03-17 20:13:13.000000000 +0100 +++ logwatch-7.3.6/scripts/services/dovecot 2008-03-05 11:12:56.000000000 +0100 @@ -1,7 +1,16 @@ ######################################################## -# $Id: dovecot,v 1.6 2007/03/17 19:13:13 bjorn Exp $ +# $Id: dovecot,v 1.9 2008/02/14 18:19:51 mike Exp $ ######################################################## # $Log: dovecot,v $ +# Revision 1.9 2008/02/14 18:19:51 mike +# Patch from Gilles Detillieux summarize pop3/imap -mgt +# +# Revision 1.8 2008/01/16 20:11:04 bjorn +# Filtering dovecot start-up message, by Gilles Detillieux. +# +# Revision 1.7 2007/06/18 03:54:45 bjorn +# Better printing of IPv6 addresses, by Patrick Vande Walle. +# # Revision 1.6 2007/03/17 19:13:13 bjorn # Now handling dovecot starts/kills. # @@ -56,18 +65,20 @@ while (defined($ThisLine = )) { # We don't care about these } elsif ( $ThisLine =~ /Killed with signal /) { $End++; - } elsif ( $ThisLine =~ /Dovecot starting up$/) { + } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up$/) { $Restarts++; $End = 0; } elsif ( ($User, $Host) = ( $ThisLine =~ /^pop3-login: Login: (.*?) \[(.*)\]/ ) ) { if ($Host !~ /$IgnoreHost/) { $Login{$User}{$Host}++; + $LoginPOP3{$User}++; $ConnectionPOP3{$Host}++; $Connection{$Host}++; } } elsif ( ($User, $Host) = ( $ThisLine =~ /^imap-login: Login: (.*?) \[(.*)\]/ ) ) { if ($Host !~ /$IgnoreHost/) { $Login{$User}{$Host}++; + $LoginIMAP{$User}++; $ConnectionIMAP{$Host}++; $Connection{$Host}++; } @@ -76,12 +87,14 @@ while (defined($ThisLine = )) { } elsif ( ($User, $Host) = ( $ThisLine =~ /^dovecot: pop3-login: Login: user=\<(.*?)\>.*rip=(.*)\, lip=/ ) ) { if ($Host !~ /$IgnoreHost/) { $Login{$User}{$Host}++; + $LoginPOP3{$User}++; $ConnectionPOP3{$Host}++; $Connection{$Host}++; } } elsif ( ($User, $Host) = ( $ThisLine =~ /^dovecot: imap-login: Login: user=\<(.*?)\>.*rip=(.*)\, lip=/) ) { if ($Host !~ /$IgnoreHost/) { $Login{$User}{$Host}++; + $LoginIMAP{$User}++; $ConnectionIMAP{$Host}++; $Connection{$Host}++; } @@ -132,8 +145,8 @@ if ( ( $Detail >=5 ) and $Restarts ) { if ( ( $Detail >= 5 ) and (keys %Connection)) { print "\n[Dovecot IMAP and POP3] Connections:". "\n====================================". - "\n Host | POP3 | IMAP | Total ". - "\n-------------------------- | ----------- |--------- | ---------"; + "\n Host | POP3 | IMAP | Total ". + "\n-------------------------------------- | --------- |--------- | ---------"; $TLSInitFail = 0; foreach $Host (sort keys %Connection) { @@ -151,9 +164,9 @@ if ( ( $Detail >= 5 ) and (keys %Connect # Cleanly display IPv4 addresses $Host=~ s/::ffff://; $HostLength = length($Host); - $HostSpaceLength = 26 - $HostLength; + $HostSpaceLength = 38 - $HostLength; $CountLength = length("$Conns"); - $CountSpaceLength = 12 - $CountLength; + $CountSpaceLength = 10 - $CountLength; $IMAPLength = length("$IMAP"); $IMAPSpaceLength = 9 - $IMAPLength; $TotalLenght = length("$Total"); @@ -165,12 +178,12 @@ if ( ( $Detail >= 5 ) and (keys %Connect $TotalCount += $Total; } $POP3Length = length("$POP3Count"); - $POP3SpaceLength = 40 - $POP3Length; + $POP3SpaceLength = 50 - $POP3Length; $IMAPLength = length("$IMAPCount"); $IMAPSpaceLength = 9 - $IMAPLength; $TotalLength = length("$TotalCount"); $totalSpaceLength = 10 - $TotalLength; - print "\n" . "-" x 63; + print "\n" . "-" x 73; print "\n" . " " x $POP3SpaceLength . $POP3Count . " |" . " " x $IMAPSpaceLength . $IMAPCount . " |" . " " x $totalSpaceLength . $TotalCount . "\n"; } @@ -180,6 +193,13 @@ if ( ( $Detail >= 10 ) and (keys %Login) $LoginCount = 0; foreach my $User (keys %Login) { print "\n\n User $User:"; + if ($LoginPOP3{$User} > 0 || $LoginIMAP{$User} > 0) { + print " ("; + if ($LoginPOP3{$User} > 0) { print "$LoginPOP3{$User} POP3"; }; + if ($LoginPOP3{$User} > 0 && $LoginIMAP{$User} > 0) { print "/"; }; + if ($LoginIMAP{$User} > 0) { print "$LoginIMAP{$User} IMAP"; }; + print ")"; + } $UserCount = 0; $NumHosts = 0; foreach $Host (keys %{$Login{$User}}) { Index: logwatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- logwatch.spec 14 Feb 2008 13:57:29 -0000 1.88 +++ logwatch.spec 5 Mar 2008 10:27:07 -0000 1.89 @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.3.6 -Release: 19%{?dist} +Release: 20%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -28,7 +28,6 @@ Patch22: logwatch-7.3.6-sshd1.patch Patch23: logwatch-7.3.6-clamav-milter.patch Patch24: logwatch-7.3.6-conf.patch -Patch25: logwatch-7.3.6-dovecot.patch Patch26: logwatch-7.3.6-amavis.patch Patch27: logwatch-7.3.6-oldfiles.patch Patch28: logwatch-7.3.6-usage.patch @@ -37,6 +36,7 @@ Patch31: logwatch-7.3.6-openvpn.patch Patch32: logwatch-7.3.6-postfix.patch Patch33: logwatch-7.3.6-cron4.patch +Patch34: logwatch-7.3.6-dovecot_back.patch Requires: textutils sh-utils grep mailx Requires: perl(Date::Manip) @@ -73,7 +73,6 @@ %patch22 -p1 %patch23 -p1 %patch24 -p1 -%patch25 -p1 %patch26 -p1 %patch27 -p1 %patch28 -p1 @@ -82,6 +81,7 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 rm -f scripts/services/*.orig %build @@ -195,12 +195,16 @@ %doc License project/CHANGES %changelog +* Wed Mar 5 2008 Ivana Varekova 7.3.6-20 +- resolves 436058 + dovecot script for logwatch needs fix for IPv6 + * Thu Feb 14 2008 Ivana Varekova 7.3.6-19 - resolves cron service problem (#432766) * Mon Jan 28 2008 Ivana Varekova 7.3.6-18 -- resolves: #429933 fix postfix script - thanks Benjamin Gordon +- resolves: #429933 fix postfix script + thanks Benjamin Gordon * Mon Jan 21 2008 Ivana Varekova 7.3.6-17 - Resolves: #427734 --- logwatch-7.3.6-dovecot.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 5 10:33:17 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Wed, 5 Mar 2008 10:33:17 GMT Subject: rpms/glibc/devel .cvsignore, 1.231, 1.232 glibc-fedora.patch, 1.257, 1.258 glibc.spec, 1.343, 1.344 sources, 1.256, 1.257 Message-ID: <200803051033.m25AXH6G029771@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/glibc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29570/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: 2.7.90-8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- .cvsignore 16 Feb 2008 17:47:51 -0000 1.231 +++ .cvsignore 5 Mar 2008 10:32:39 -0000 1.232 @@ -1,2 +1,2 @@ -glibc-20080216T1726.tar.bz2 -glibc-fedora-20080216T1726.tar.bz2 +glibc-20080305T0857.tar.bz2 +glibc-fedora-20080305T0857.tar.bz2 glibc-fedora.patch: Index: glibc-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- glibc-fedora.patch 16 Feb 2008 17:47:51 -0000 1.257 +++ glibc-fedora.patch 5 Mar 2008 10:32:39 -0000 1.258 @@ -1,6 +1,6 @@ ---- glibc-20080216T1726/ChangeLog 15 Feb 2008 15:49:15 -0000 1.11078 -+++ glibc-20080216T1726-fedora/ChangeLog 16 Feb 2008 17:31:43 -0000 1.8782.2.288 -@@ -3759,6 +3759,13 @@ +--- glibc-20080305T0857/ChangeLog 5 Mar 2008 07:05:13 -0000 1.11088 ++++ glibc-20080305T0857-fedora/ChangeLog 5 Mar 2008 09:37:39 -0000 1.8782.2.289 +@@ -3857,6 +3857,13 @@ * include/sys/cdefs.h: Redefine __nonnull so that test for incorrect parameters in the libc code itself are not omitted. @@ -14,7 +14,7 @@ 2007-05-09 Jakub Jelinek * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow -@@ -4054,6 +4061,10 @@ +@@ -4152,6 +4159,10 @@ [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -25,7 +25,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -5311,6 +5322,15 @@ +@@ -5409,6 +5420,15 @@ separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -41,8 +41,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-20080216T1726/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20080216T1726-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 +--- glibc-20080305T0857/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20080305T0857-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -108,8 +108,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20080216T1726/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 -+++ glibc-20080216T1726-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 +--- glibc-20080305T0857/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 ++++ glibc-20080305T0857-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 @@ -171,6 +171,11 @@ [BZ #2611] * stdio-common/renameat.c (renameat): Fix typo. @@ -281,8 +281,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20080216T1726/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 -+++ glibc-20080216T1726-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 +--- glibc-20080305T0857/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 ++++ glibc-20080305T0857-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -293,8 +293,8 @@ vpath initfini.c $(sysdirs) ---- glibc-20080216T1726/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20080216T1726-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20080305T0857/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20080305T0857-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -319,8 +319,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20080216T1726/debug/tst-chk1.c 26 Sep 2007 20:45:09 -0000 1.18 -+++ glibc-20080216T1726-fedora/debug/tst-chk1.c 29 Sep 2007 19:10:47 -0000 1.1.2.18 +--- glibc-20080305T0857/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 ++++ glibc-20080305T0857-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -331,7 +331,7 @@ #include #include #include -@@ -238,7 +241,7 @@ do_test (void) +@@ -242,7 +245,7 @@ do_test (void) if (memcmp (a.buf1, "aabcdabcjj", 10)) FAIL (); @@ -340,7 +340,7 @@ /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2 and sufficient GCC support, as the string operations overflow from a.buf1 into a.buf2. */ -@@ -353,7 +356,7 @@ do_test (void) +@@ -357,7 +360,7 @@ do_test (void) memset (a.buf1 + 9, 'j', l0 + 2); CHK_FAIL_END @@ -349,8 +349,8 @@ # define O 0 # else # define O 1 ---- glibc-20080216T1726/elf/ldconfig.c 2 Jan 2008 19:25:22 -0000 1.62 -+++ glibc-20080216T1726-fedora/elf/ldconfig.c 3 Jan 2008 20:20:40 -0000 1.47.2.17 +--- glibc-20080305T0857/elf/ldconfig.c 2 Jan 2008 19:25:22 -0000 1.62 ++++ glibc-20080305T0857-fedora/elf/ldconfig.c 3 Jan 2008 20:20:40 -0000 1.47.2.17 @@ -1000,17 +1000,19 @@ search_dirs (void) @@ -432,8 +432,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-20080216T1726/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20080216T1726-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20080305T0857/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20080305T0857-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -458,8 +458,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20080216T1726/include/features.h 17 Oct 2007 20:26:55 -0000 1.49 -+++ glibc-20080216T1726-fedora/include/features.h 17 Oct 2007 20:33:39 -0000 1.35.2.19 +--- glibc-20080305T0857/include/features.h 17 Oct 2007 20:26:55 -0000 1.49 ++++ glibc-20080305T0857-fedora/include/features.h 17 Oct 2007 20:33:39 -0000 1.35.2.19 @@ -282,8 +282,13 @@ #endif @@ -476,16 +476,16 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-20080216T1726/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20080305T0857/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20080216T1726/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20080305T0857/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20080216T1726/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 -+++ glibc-20080216T1726-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 +--- glibc-20080305T0857/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 ++++ glibc-20080305T0857-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -495,8 +495,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20080216T1726/libio/stdio.h 8 Jan 2008 01:18:40 -0000 1.92 -+++ glibc-20080216T1726-fedora/libio/stdio.h 11 Jan 2008 07:45:13 -0000 1.78.2.13 +--- glibc-20080305T0857/libio/stdio.h 8 Jan 2008 01:18:40 -0000 1.92 ++++ glibc-20080305T0857-fedora/libio/stdio.h 11 Jan 2008 07:45:13 -0000 1.78.2.13 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -510,8 +510,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20080216T1726/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 -+++ glibc-20080216T1726-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 +--- glibc-20080305T0857/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 ++++ glibc-20080305T0857-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -603,8 +603,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20080216T1726/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 -+++ glibc-20080216T1726-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 +--- glibc-20080305T0857/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 ++++ glibc-20080305T0857-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -636,8 +636,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-20080216T1726/localedata/Makefile 2 Oct 2007 17:19:40 -0000 1.107 -+++ glibc-20080216T1726-fedora/localedata/Makefile 3 Oct 2007 19:32:27 -0000 1.101.2.7 +--- glibc-20080305T0857/localedata/Makefile 2 Oct 2007 17:19:40 -0000 1.107 ++++ glibc-20080305T0857-fedora/localedata/Makefile 3 Oct 2007 19:32:27 -0000 1.101.2.7 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -646,8 +646,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20080216T1726/localedata/SUPPORTED 6 Nov 2007 18:26:22 -0000 1.108 -+++ glibc-20080216T1726-fedora/localedata/SUPPORTED 12 Dec 2007 18:13:23 -0000 1.71.2.20 +--- glibc-20080305T0857/localedata/SUPPORTED 4 Mar 2008 22:10:33 -0000 1.109 ++++ glibc-20080305T0857-fedora/localedata/SUPPORTED 5 Mar 2008 09:37:42 -0000 1.71.2.21 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -681,7 +681,7 @@ nr_ZA/UTF-8 \ nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ -@@ -351,6 +356,7 @@ sv_FI/ISO-8859-1 \ +@@ -352,6 +357,7 @@ sv_FI/ISO-8859-1 \ sv_FI at euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -689,8 +689,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20080216T1726/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20080216T1726-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20080305T0857/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20080305T0857-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -705,8 +705,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20080216T1726/localedata/locales/en_GB 30 Sep 2007 18:24:20 -0000 1.15 -+++ glibc-20080216T1726-fedora/localedata/locales/en_GB 3 Oct 2007 19:32:28 -0000 1.10.2.5 +--- glibc-20080305T0857/localedata/locales/en_GB 30 Sep 2007 18:24:20 -0000 1.15 ++++ glibc-20080305T0857-fedora/localedata/locales/en_GB 3 Oct 2007 19:32:28 -0000 1.10.2.5 @@ -116,8 +116,8 @@ mon "" d_fmt "" @@ -718,8 +718,8 @@ date_fmt "/ / " ---- glibc-20080216T1726/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20080305T0857/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -790,8 +790,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20080216T1726/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20080216T1726-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20080305T0857/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20080305T0857-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -819,8 +819,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20080216T1726/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 -+++ glibc-20080216T1726-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 +--- glibc-20080305T0857/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 ++++ glibc-20080305T0857-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 @@ -24,9 +24,25 @@ # include # include @@ -896,8 +896,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20080216T1726/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43 -+++ glibc-20080216T1726-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20080305T0857/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43 ++++ glibc-20080305T0857-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -953,8 +953,8 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20080216T1726/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 -+++ glibc-20080216T1726-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 +--- glibc-20080305T0857/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 ++++ glibc-20080305T0857-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -964,8 +964,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-20080216T1726/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 -+++ glibc-20080216T1726-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 +--- glibc-20080305T0857/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 ++++ glibc-20080305T0857-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1009,16 +1009,16 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-20080216T1726/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 -+++ glibc-20080216T1726-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 +--- glibc-20080305T0857/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 ++++ glibc-20080305T0857-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-20080216T1726/nptl/ChangeLog 1 Feb 2008 00:01:32 -0000 1.1056 -+++ glibc-20080216T1726-fedora/nptl/ChangeLog 1 Feb 2008 10:19:38 -0000 1.706.2.147 +--- glibc-20080305T0857/nptl/ChangeLog 1 Feb 2008 00:01:32 -0000 1.1056 ++++ glibc-20080305T0857-fedora/nptl/ChangeLog 1 Feb 2008 10:19:38 -0000 1.706.2.147 @@ -3107,6 +3107,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1059,8 +1059,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20080216T1726/nptl/Makefile 1 Feb 2008 00:01:18 -0000 1.193 -+++ glibc-20080216T1726-fedora/nptl/Makefile 1 Feb 2008 10:19:38 -0000 1.157.2.35 +--- glibc-20080305T0857/nptl/Makefile 1 Feb 2008 00:01:18 -0000 1.193 ++++ glibc-20080305T0857-fedora/nptl/Makefile 1 Feb 2008 10:19:38 -0000 1.157.2.35 @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1093,8 +1093,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20080216T1726/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20080216T1726-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20080305T0857/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20080305T0857-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1119,8 +1119,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20080216T1726/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20080305T0857/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1128,8 +1128,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20080216T1726/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 -+++ glibc-20080216T1726-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 +--- glibc-20080305T0857/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 ++++ glibc-20080305T0857-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1139,8 +1139,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-20080216T1726/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 -+++ glibc-20080216T1726-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 +--- glibc-20080305T0857/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 ++++ glibc-20080305T0857-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1197,8 +1197,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-20080216T1726/posix/Makefile 20 Nov 2007 00:41:16 -0000 1.203 -+++ glibc-20080216T1726-fedora/posix/Makefile 12 Dec 2007 18:13:30 -0000 1.171.2.27 +--- glibc-20080305T0857/posix/Makefile 20 Nov 2007 00:41:16 -0000 1.203 ++++ glibc-20080305T0857-fedora/posix/Makefile 12 Dec 2007 18:13:30 -0000 1.171.2.27 @@ -301,11 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1215,8 +1215,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-20080216T1726/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20080305T0857/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1233,8 +1233,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20080216T1726/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20080216T1726-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20080305T0857/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20080305T0857-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1250,8 +1250,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20080216T1726/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20 -+++ glibc-20080216T1726-fedora/sysdeps/i386/Makefile 30 Jun 2006 09:16:34 -0000 1.16.2.4 +--- glibc-20080305T0857/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20 ++++ glibc-20080305T0857-fedora/sysdeps/i386/Makefile 30 Jun 2006 09:16:34 -0000 1.16.2.4 @@ -64,4 +64,12 @@ endif ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) @@ -1265,8 +1265,8 @@ +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS +CFLAGS-.oS += -mno-tls-direct-seg-refs endif ---- glibc-20080216T1726/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20080216T1726-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20080305T0857/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20080305T0857-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1278,8 +1278,8 @@ endif endif ---- glibc-20080216T1726/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20080216T1726-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20080305T0857/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20080305T0857-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1631,8 +1631,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20080216T1726/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20080305T0857/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1718,8 +1718,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20080216T1726/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 -+++ glibc-20080216T1726-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 +--- glibc-20080305T0857/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 ++++ glibc-20080305T0857-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1728,8 +1728,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20080216T1726/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 -+++ glibc-20080216T1726-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 +--- glibc-20080305T0857/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 ++++ glibc-20080305T0857-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1744,8 +1744,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 @@ -27,13 +27,10 @@ #include #include @@ -1761,8 +1761,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/configure 28 Oct 2006 06:42:16 -0000 1.93 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/configure 12 Dec 2007 23:01:37 -0000 1.88.2.4 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/configure 28 Oct 2006 06:42:16 -0000 1.93 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/configure 12 Dec 2007 23:01:37 -0000 1.88.2.4 @@ -22,23 +22,170 @@ if test -n "$sysheaders"; then fi @@ -2000,8 +2000,8 @@ fi fi ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/dl-osinfo.h 15 Sep 2007 22:54:08 -0000 1.26 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 18 Sep 2007 19:57:21 -0000 1.14.2.12 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/dl-osinfo.h 15 Sep 2007 22:54:08 -0000 1.26 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 18 Sep 2007 19:57:21 -0000 1.14.2.12 @@ -19,11 +19,14 @@ 02111-1307 USA. */ @@ -2049,8 +2049,8 @@ + ret ^= stk; return ret; } ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2093,8 +2093,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 @@ -25,6 +25,24 @@ #include @@ -2120,8 +2120,8 @@ struct netlink_res { ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2131,8 +2131,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -2178,8 +2178,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -2198,8 +2198,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2260,8 +2260,8 @@ + } while (0) + +#include_next ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2294,29 +2294,29 @@ + } while (0) + #include_next ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 @@ -89,9 +89,6 @@ L(pseudo_end): ret Index: glibc.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v retrieving revision 1.343 retrieving revision 1.344 diff -u -r1.343 -r1.344 --- glibc.spec 16 Feb 2008 17:47:51 -0000 1.343 +++ glibc.spec 5 Mar 2008 10:32:39 -0000 1.344 @@ -1,9 +1,7 @@ -%define glibcdate 20080216T1726 +%define glibcdate 20080305T0857 %define glibcname glibc -%define glibcsrcdir glibc-20080216T1726 +%define glibcsrcdir glibc-20080305T0857 %define glibc_release_tarballs 0 -%define glibcversion 2.7.90 -%define glibcrelease 7 %define run_glibc_tests 1 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6 %define xenarches i686 athlon @@ -22,10 +20,10 @@ %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x %define debuginfocommonarches %{ix86} alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v %define _unpackaged_files_terminate_build 0 -Summary: The GNU libc libraries. +Summary: The GNU libc libraries Name: glibc -Version: %{glibcversion} -Release: %{glibcrelease} +Version: 2.7.90 +Release: 8 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -33,6 +31,7 @@ # libraries without restrictions. License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ Group: System Environment/Libraries +URL: http://sources.redhat.com/glibc/ Source0: %{glibcsrcdir}.tar.bz2 %if %{glibc_release_tarballs} Source1: %(echo %{glibcsrcdir} | sed s/glibc-/glibc-linuxthreads-/).tar.bz2 @@ -42,39 +41,22 @@ Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2 Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ia64-lib64.patch -Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root -Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, -Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: glibc-profile < 2.4 Provides: ldconfig # The dynamic linker supports DT_GNU_HASH Provides: rtld(GNU_HASH) -Autoreq: false Requires: glibc-common = %{version}-%{release} -%ifarch sparc -Obsoletes: libc -%endif # Require libgcc in case some program calls pthread_cancel in its %%post -Prereq: basesystem, libgcc +Requires(pre): basesystem, libgcc # This is for building auxiliary programs like memusage, nscd # For initial glibc bootstraps it can be commented out -BuildPreReq: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3 -BuildPreReq: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext -BuildPreReq: /bin/ps, /bin/kill, /bin/awk +BuildRequires: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3 +BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext +BuildRequires: /bin/ps, /bin/kill, /bin/awk # This is to ensure that __frame_state_for is exported by glibc # will be compatible with egcs 1.x.y -BuildPreReq: gcc >= 3.2 -Conflicts: rpm <= 4.0-0.65 -Conflicts: glibc-devel < 2.2.3 -Conflicts: gcc4 <= 4.0.0-0.6 -%ifarch x86_64 %{ix86} -# Need gdb that understands DW_CFA_val_expression -Conflicts: gdb < 6.3.0.0-1.111 -%endif -# Earlier shadow-utils packages had too restrictive permissions on -# /etc/default -Conflicts: shadow-utils < 2:4.0.3-20 -Conflicts: nscd < 2.3.3-52 -Conflicts: kernel < 2.6.9 +BuildRequires: gcc >= 3.2 %define enablekernel 2.6.9 %ifarch i386 %define nptl_target_cpu i486 @@ -89,8 +71,8 @@ BuildRequires: gcc >= 4.1.0-0.17 %endif %if "%{_enable_debug_packages}" == "1" -BuildPreReq: elfutils >= 0.72 -BuildPreReq: rpm >= 4.2-0.56 +BuildRequires: elfutils >= 0.72 +BuildRequires: rpm >= 4.2-0.56 %endif %define __find_provides %{_builddir}/%{glibcsrcdir}/find_provides.sh %define _filter_GLIBC_PRIVATE 1 @@ -121,20 +103,9 @@ %package devel Summary: Object files for development using standard C libraries. Group: Development/Libraries -Conflicts: texinfo < 3.11 -# Need AS_NEEDED directive -Conflicts: binutils < 2.15.94.0.2-1 -Prereq: /sbin/install-info -Obsoletes: libc-debug, libc-headers, libc-devel, linuxthreads-devel -Obsoletes: glibc-debug, nptl-devel -Prereq: %{name}-headers -Requires: %{name}-headers = %{version}-%{release}, %{name} = %{version}-%{release} -%ifarch %{ix86} -# Earlier gcc's had atexit reference in crtendS.o, which does not -# work with this glibc where atexit is in libc_nonshared.a -Conflicts: gcc < 2.96-79 -%endif -Autoreq: true +Requires(pre): /sbin/install-info +Requires(pre): %{name}-headers = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel The glibc-devel package contains the object files necessary @@ -156,11 +127,9 @@ # have to be installed, not i386 ones. Obsoletes: %{name}-headers(i386) %endif -Obsoletes: libc-debug, libc-headers, libc-devel -Prereq: kernel-headers +Requires(pre): kernel-headers Requires: kernel-headers >= 2.2.1, %{name} = %{version}-%{release} BuildRequires: kernel-headers >= 2.6.22 -Autoreq: true %description headers The glibc-headers package contains the header files necessary @@ -175,9 +144,7 @@ %package common Summary: Common binaries and locale data for glibc -Conflicts: %{name} < %{version} -Conflicts: %{name} > %{version} -Autoreq: false +Requires: %{name}-%{version}-%{release} Requires: tzdata >= 2003a Group: System Environment/Base @@ -188,11 +155,8 @@ %package -n nscd Summary: A Name Service Caching Daemon (nscd). Group: System Environment/Daemons -Conflicts: kernel < 2.2.0 Requires: libselinux >= 1.17.10-1, audit-libs >= 1.1.3 -Conflicts: selinux-policy-targeted < 1.17.30-2.2 -Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils -Autoreq: true +Requires(pre): /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils %description -n nscd Nscd caches name service lookups and can dramatically improve @@ -201,7 +165,7 @@ %package utils Summary: Development utilities from GNU C library Group: Development/Tools -Requires: glibc = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description utils The glibc-utils package contains memusage, a memory usage profiler, @@ -377,14 +341,14 @@ cd build-%{nptl_target_cpu}-linuxnptl $GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \ - -DNO_SIZE_OPTIMIZATION \ + -DNO_SIZE_OPTIMIZATION \ %ifarch i386 - -DARCH_386 \ + -DARCH_386 \ %endif - '-DLIBTLS="/%{_lib}/tls/"' \ - '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \ - '-DLD_SO_CONF="/etc/ld.so.conf"' \ - '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"' + '-DLIBTLS="/%{_lib}/tls/"' \ + '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \ + '-DLD_SO_CONF="/etc/ld.so.conf"' \ + '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"' cd .. %install @@ -395,8 +359,8 @@ make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s %ifnarch %{auxarches} cd build-%{nptl_target_cpu}-linuxnptl && \ - make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ - cd .. + make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ + cd .. %endif librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` @@ -479,9 +443,9 @@ cp -a fedora/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then - mkdir -p $RPM_BUILD_ROOT%{_infodir} - mv -f $RPM_BUILD_ROOT%{_prefix}/info/* $RPM_BUILD_ROOT%{_infodir} - rm -rf $RPM_BUILD_ROOT%{_prefix}/info + mkdir -p $RPM_BUILD_ROOT%{_infodir} + mv -f $RPM_BUILD_ROOT%{_prefix}/info/* $RPM_BUILD_ROOT%{_infodir} + rm -rf $RPM_BUILD_ROOT%{_prefix}/info fi gzip -9nvf $RPM_BUILD_ROOT%{_infodir}/libc* @@ -574,15 +538,15 @@ # BUILD THE FILE LIST find $RPM_BUILD_ROOT -type f -or -type l | - sed -e 's|.*/etc|%config &|' \ - -e 's|.*/gconv/gconv-modules$|%verify(not md5 size mtime) %config(noreplace) &|' \ - -e 's|.*/gconv/gconv-modules.cache|%verify(not md5 size mtime) &|' \ - -e '/lib\/debug/d' > rpm.filelist.in + sed -e 's|.*/etc|%config &|' \ + -e 's|.*/gconv/gconv-modules$|%verify(not md5 size mtime) %config(noreplace) &|' \ + -e 's|.*/gconv/gconv-modules.cache|%verify(not md5 size mtime) &|' \ + -e '/lib\/debug/d' > rpm.filelist.in for n in %{_prefix}/share %{_prefix}/include %{_prefix}/lib/locale; do - find ${RPM_BUILD_ROOT}${n} -type d | \ - grep -v '%{_prefix}/share$' | \ - grep -v '%{_infodir}' | \ - sed "s/^/%dir /" >> rpm.filelist.in + find ${RPM_BUILD_ROOT}${n} -type d | \ + grep -v '%{_prefix}/share$' | \ + grep -v '%{_infodir}' | \ + sed "s/^/%dir /" >> rpm.filelist.in done # primary filelist @@ -592,10 +556,10 @@ # languages very well, temporarily disable LIB_LANG='' sed -e "s|$RPM_BUILD_ROOT||" -e "$LIB_LANG" -e "$SHARE_LANG" < rpm.filelist.in | - grep -v '/etc/\(localtime\|nsswitch.conf\|ld.so.conf\|ld.so.cache\|default\)' | \ - grep -v '/%{_lib}/lib\(pcprofile\|memusage\).so' | \ - grep -v 'bin/\(memusage\|mtrace\|xtrace\|pcprofiledump\)' | \ - sort > rpm.filelist + grep -v '/etc/\(localtime\|nsswitch.conf\|ld.so.conf\|ld.so.cache\|default\)' | \ + grep -v '/%{_lib}/lib\(pcprofile\|memusage\).so' | \ + grep -v 'bin/\(memusage\|mtrace\|xtrace\|pcprofiledump\)' | \ + sort > rpm.filelist mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_lib} mv -f $RPM_BUILD_ROOT/%{_lib}/lib{pcprofile,memusage}.so $RPM_BUILD_ROOT%{_prefix}/%{_lib} @@ -613,12 +577,12 @@ grep '%{_prefix}/include/gnu/stubs-[32164]\+\.h' < rpm.filelist >> devel.filelist || : grep '%{_prefix}/include' < rpm.filelist | - egrep -v '%{_prefix}/include/(linuxthreads|gnu/stubs-[32164]+\.h)' \ - > headers.filelist + egrep -v '%{_prefix}/include/(linuxthreads|gnu/stubs-[32164]+\.h)' \ + > headers.filelist mv rpm.filelist rpm.filelist.full grep -v '%{_prefix}/%{_lib}/lib.*_p.a' rpm.filelist.full | - egrep -v "(%{_prefix}/include)|(%{_infodir})" > rpm.filelist + egrep -v "(%{_prefix}/include)|(%{_infodir})" > rpm.filelist grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist >> devel.filelist grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist @@ -626,24 +590,24 @@ mv rpm.filelist rpm.filelist.full grep -v '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist.full | - grep -v '%{_prefix}/%{_lib}/.*\.o' | - grep -v '%{_prefix}/%{_lib}/lib.*\.so'| - grep -v '%{_prefix}/%{_lib}/linuxthreads' | - grep -v 'nscd' > rpm.filelist + grep -v '%{_prefix}/%{_lib}/.*\.o' | + grep -v '%{_prefix}/%{_lib}/lib.*\.so'| + grep -v '%{_prefix}/%{_lib}/linuxthreads' | + grep -v 'nscd' > rpm.filelist grep '%{_prefix}/bin' < rpm.filelist >> common.filelist #grep '%{_prefix}/lib/locale' < rpm.filelist | grep -v /locale-archive.tmpl >> common.filelist grep '%{_prefix}/libexec/pt_chown' < rpm.filelist >> common.filelist grep '%{_prefix}/sbin/[^gi]' < rpm.filelist >> common.filelist -grep '%{_prefix}/share' < rpm.filelist \ - | grep -v '%{_prefix}/share/zoneinfo' >> common.filelist +grep '%{_prefix}/share' < rpm.filelist | \ + grep -v '%{_prefix}/share/zoneinfo' >> common.filelist mv rpm.filelist rpm.filelist.full grep -v '%{_prefix}/bin' < rpm.filelist.full | - grep -v '%{_prefix}/lib/locale' | - grep -v '%{_prefix}/libexec/pt_chown' | - grep -v '%{_prefix}/sbin/[^gi]' | - grep -v '%{_prefix}/share' > rpm.filelist + grep -v '%{_prefix}/lib/locale' | + grep -v '%{_prefix}/libexec/pt_chown' | + grep -v '%{_prefix}/sbin/[^gi]' | + grep -v '%{_prefix}/share' > rpm.filelist > nosegneg.filelist %if %{xenpackage} @@ -816,7 +780,7 @@ egrep "$auxarches_debugsources" debuginfocommon.sources >> debuginfo.filelist egrep -v "$auxarches_debugsources" \ - debuginfocommon.sources >> debuginfocommon.filelist + debuginfocommon.sources >> debuginfocommon.filelist %ifarch %{auxarches} %else # non-aux arches when there is a debuginfo-common @@ -841,7 +805,7 @@ echo Cutting down the list of unpackaged files >> debuginfocommon.filelist sed -e '/%%dir/d;/%%config/d;/%%verify/d;s/%%lang([^)]*) //;s#^/*##' \ - common.filelist devel.filelist headers.filelist \ + common.filelist devel.filelist headers.filelist \ utils.filelist nscd.filelist debuginfocommon.filelist | (cd $RPM_BUILD_ROOT; xargs --no-run-if-empty rm -f 2> /dev/null || :) @@ -873,12 +837,12 @@ %pre headers # this used to be a link and it is causing nightmares now if [ -L %{_prefix}/include/scsi ] ; then - rm -f %{_prefix}/include/scsi + rm -f %{_prefix}/include/scsi fi %preun devel if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/libc.info.gz %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/libc.info.gz %{_infodir}/dir || : fi %post utils -p /sbin/ldconfig @@ -887,23 +851,23 @@ %pre -n nscd /usr/sbin/useradd -M -o -r -d / -s /sbin/nologin \ - -c "NSCD Daemon" -u 28 nscd > /dev/null 2>&1 || : + -c "NSCD Daemon" -u 28 nscd > /dev/null 2>&1 || : %post -n nscd /sbin/chkconfig --add nscd %preun -n nscd if [ $1 = 0 ] ; then - service nscd stop > /dev/null 2>&1 - /sbin/chkconfig --del nscd + service nscd stop > /dev/null 2>&1 + /sbin/chkconfig --del nscd fi %postun -n nscd if [ $1 = 0 ] ; then - /usr/sbin/userdel nscd > /dev/null 2>&1 || : + /usr/sbin/userdel nscd > /dev/null 2>&1 || : fi if [ "$1" -ge "1" ]; then - service nscd condrestart > /dev/null 2>&1 || : + service nscd condrestart > /dev/null 2>&1 || : fi %if %{xenpackage} @@ -1016,6 +980,14 @@ %endif %changelog +* Wed Mar 5 2008 Jakub Jelinek 2.7.90-8 +- update to trunk + - {,v}{as,d}printf and obstack_{,v}printf fortification (#435905) + - fix getnameinfo/gethostbyaddr (#428067, BZ#5790) + - fix yp_order (#435519, BZ#5854) + - misc fixes (BZ#5779, BZ#5736, BZ#5627, BZ#5818, BZ#5012) +- merge review cleanup (Tom Callaway, #225806) + * Sat Feb 16 2008 Jakub Jelinek 2.7.90-7 - update to trunk - make NI_MAXHOST and NI_MAXSERV available even in BSDish Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- sources 16 Feb 2008 17:47:51 -0000 1.256 +++ sources 5 Mar 2008 10:32:39 -0000 1.257 @@ -1,2 +1,2 @@ -ae813ad20cc570e7f7014f61ddcbdfd6 glibc-20080216T1726.tar.bz2 -91cb1481dfa1a9ff6bcde016f120c86d glibc-fedora-20080216T1726.tar.bz2 +ff459ea32a78605fe34138cdb4cd3226 glibc-20080305T0857.tar.bz2 +9780da910ede69450840a97775a63523 glibc-fedora-20080305T0857.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 10:39:49 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Wed, 5 Mar 2008 10:39:49 GMT Subject: rpms/logwatch/F-8 logwatch-7.3.6-dovecot_back.patch, NONE, 1.1 logwatch.spec, 1.86, 1.87 Message-ID: <200803051039.m25AdnZY030069@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/logwatch/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30030 Modified Files: logwatch.spec Added Files: logwatch-7.3.6-dovecot_back.patch Log Message: - resolves 436058 dovecot script for logwatch needs fix for IPv6 logwatch-7.3.6-dovecot_back.patch: --- NEW FILE logwatch-7.3.6-dovecot_back.patch --- diff -up logwatch-7.3.6/scripts/services/dovecot.pom logwatch-7.3.6/scripts/services/dovecot --- logwatch-7.3.6/scripts/services/dovecot.pom 2008-02-20 16:29:17.000000000 +0100 +++ logwatch-7.3.6/scripts/services/dovecot 2008-03-05 11:12:56.000000000 +0100 @@ -1,7 +1,16 @@ ######################################################## -# $Id: dovecot,v 1.6 2007/03/17 19:13:13 bjorn Exp $ +# $Id: dovecot,v 1.9 2008/02/14 18:19:51 mike Exp $ ######################################################## # $Log: dovecot,v $ +# Revision 1.9 2008/02/14 18:19:51 mike +# Patch from Gilles Detillieux summarize pop3/imap -mgt +# +# Revision 1.8 2008/01/16 20:11:04 bjorn +# Filtering dovecot start-up message, by Gilles Detillieux. +# +# Revision 1.7 2007/06/18 03:54:45 bjorn +# Better printing of IPv6 addresses, by Patrick Vande Walle. +# # Revision 1.6 2007/03/17 19:13:13 bjorn # Now handling dovecot starts/kills. # @@ -62,12 +71,14 @@ while (defined($ThisLine = )) { } elsif ( ($User, $Host) = ( $ThisLine =~ /^pop3-login: Login: (.*?) \[(.*)\]/ ) ) { if ($Host !~ /$IgnoreHost/) { $Login{$User}{$Host}++; + $LoginPOP3{$User}++; $ConnectionPOP3{$Host}++; $Connection{$Host}++; } } elsif ( ($User, $Host) = ( $ThisLine =~ /^imap-login: Login: (.*?) \[(.*)\]/ ) ) { if ($Host !~ /$IgnoreHost/) { $Login{$User}{$Host}++; + $LoginIMAP{$User}++; $ConnectionIMAP{$Host}++; $Connection{$Host}++; } @@ -76,12 +87,14 @@ while (defined($ThisLine = )) { } elsif ( ($User, $Host) = ( $ThisLine =~ /^dovecot: pop3-login: Login: user=\<(.*?)\>.*rip=(.*)\, lip=/ ) ) { if ($Host !~ /$IgnoreHost/) { $Login{$User}{$Host}++; + $LoginPOP3{$User}++; $ConnectionPOP3{$Host}++; $Connection{$Host}++; } } elsif ( ($User, $Host) = ( $ThisLine =~ /^dovecot: imap-login: Login: user=\<(.*?)\>.*rip=(.*)\, lip=/) ) { if ($Host !~ /$IgnoreHost/) { $Login{$User}{$Host}++; + $LoginIMAP{$User}++; $ConnectionIMAP{$Host}++; $Connection{$Host}++; } @@ -132,8 +145,8 @@ if ( ( $Detail >=5 ) and $Restarts ) { if ( ( $Detail >= 5 ) and (keys %Connection)) { print "\n[Dovecot IMAP and POP3] Connections:". "\n====================================". - "\n Host | POP3 | IMAP | Total ". - "\n-------------------------- | ----------- |--------- | ---------"; + "\n Host | POP3 | IMAP | Total ". + "\n-------------------------------------- | --------- |--------- | ---------"; $TLSInitFail = 0; foreach $Host (sort keys %Connection) { @@ -151,9 +164,9 @@ if ( ( $Detail >= 5 ) and (keys %Connect # Cleanly display IPv4 addresses $Host=~ s/::ffff://; $HostLength = length($Host); - $HostSpaceLength = 26 - $HostLength; + $HostSpaceLength = 38 - $HostLength; $CountLength = length("$Conns"); - $CountSpaceLength = 12 - $CountLength; + $CountSpaceLength = 10 - $CountLength; $IMAPLength = length("$IMAP"); $IMAPSpaceLength = 9 - $IMAPLength; $TotalLenght = length("$Total"); @@ -165,12 +178,12 @@ if ( ( $Detail >= 5 ) and (keys %Connect $TotalCount += $Total; } $POP3Length = length("$POP3Count"); - $POP3SpaceLength = 40 - $POP3Length; + $POP3SpaceLength = 50 - $POP3Length; $IMAPLength = length("$IMAPCount"); $IMAPSpaceLength = 9 - $IMAPLength; $TotalLength = length("$TotalCount"); $totalSpaceLength = 10 - $TotalLength; - print "\n" . "-" x 63; + print "\n" . "-" x 73; print "\n" . " " x $POP3SpaceLength . $POP3Count . " |" . " " x $IMAPSpaceLength . $IMAPCount . " |" . " " x $totalSpaceLength . $TotalCount . "\n"; } @@ -180,6 +193,13 @@ if ( ( $Detail >= 10 ) and (keys %Login) $LoginCount = 0; foreach my $User (keys %Login) { print "\n\n User $User:"; + if ($LoginPOP3{$User} > 0 || $LoginIMAP{$User} > 0) { + print " ("; + if ($LoginPOP3{$User} > 0) { print "$LoginPOP3{$User} POP3"; }; + if ($LoginPOP3{$User} > 0 && $LoginIMAP{$User} > 0) { print "/"; }; + if ($LoginIMAP{$User} > 0) { print "$LoginIMAP{$User} IMAP"; }; + print ")"; + } $UserCount = 0; $NumHosts = 0; foreach $Host (keys %{$Login{$User}}) { Index: logwatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/logwatch/F-8/logwatch.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- logwatch.spec 20 Feb 2008 15:47:37 -0000 1.86 +++ logwatch.spec 5 Mar 2008 10:39:09 -0000 1.87 @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.3.6 -Release: 15%{?dist} +Release: 16%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -34,6 +34,7 @@ Patch28: logwatch-7.3.6-usage.patch Patch29: logwatch-7.3.6-maillog.patch Patch30: logwatch-7.3.6-cron4.patch +Patch31: logwatch-7.3.6-dovecot_back.patch Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +76,7 @@ %patch28 -p1 %patch29 -p1 %patch30 -p1 +%patch31 -p1 rm -f scripts/services/*.orig %build @@ -188,6 +190,11 @@ %doc License project/CHANGES %changelog +* Wed Mar 5 2008 Ivana Varekova 7.3.6-16 +- Resolves: #436058 + dovecot script for logwatch needs fix for IPv6 + NOT BUILD YET + * Wed Feb 20 2008 Ivana Varekova 7.3.6-15 - Resolves: #427596 fix mailto setting From fedora-extras-commits at redhat.com Wed Mar 5 11:16:42 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 11:16:42 GMT Subject: rpms/kazehakase/devel kazehakase.spec, 1.50, 1.51 kazehakase-0.5.2-svn3410_trunk-verup.patch, 1.1, NONE Message-ID: <200803051116.m25BGgeZ005236@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5200 Modified Files: kazehakase.spec Removed Files: kazehakase-0.5.2-svn3410_trunk-verup.patch Log Message: Once rebuild with no tag Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- kazehakase.spec 5 Mar 2008 08:01:15 -0000 1.50 +++ kazehakase.spec 5 Mar 2008 11:16:02 -0000 1.51 @@ -234,7 +234,7 @@ %{__rm} -f ${f}.tmp done -%if 1 +%if 0 %if 0%{?fedora} == 9 : This package builds, but does not work at all!! : Disabling build intentionally --- kazehakase-0.5.2-svn3410_trunk-verup.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 5 11:46:25 2008 From: fedora-extras-commits at redhat.com (David Nielsen (dnielsen)) Date: Wed, 5 Mar 2008 11:46:25 GMT Subject: rpms/beagle/devel beagleIndexer.conf.sample, NONE, 1.1 beagleIndexer.ephy-extension, NONE, 1.1 beagleIndexer.py, NONE, 1.1 beagle.spec, 1.127, 1.128 Message-ID: <200803051146.m25BkPfS005979@cvs-int.fedora.redhat.com> Author: dnielsen Update of /cvs/pkgs/rpms/beagle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5936/devel Modified Files: beagle.spec Added Files: beagleIndexer.conf.sample beagleIndexer.ephy-extension beagleIndexer.py Log Message: Beagle spec rework try 1, probably not suitable for building with the beta freeze coming up --- NEW FILE beagleIndexer.conf.sample --- #beagle extension for epiphany (python version) config file #auto index (True or False) #turn this off , if you only want to index the page when you #click the menu item auto_index = True #prompt for keyword when on-demand index prompt_keyword = False #default action is index ?(True or False) default_index=True #white list first ? (True or False) #when a ur match both black list and white list white_list_first=True #index https pages (True or False) index_https=True #black list (regular expression list) #a line for a regular expression #alwasy add a ',' at the end of the line black_list = [ '.*debian.org*', '.*not_index_this_site_another.com.*', ] #white list (regular expression list) white_list=[ '.*google.com.*', ] --- NEW FILE beagleIndexer.ephy-extension --- [Epiphany Extension] Name=Beagle Indexer Description=Index the pages you visited Authors=Tao Fei Version=1 URL=http://beagle-project.org/Browser_Extension#Epiphany_Extension [Loader] Type=python Module=beagleIndexer --- NEW FILE beagleIndexer.py --- #!/usr/bin/env python #vim:fileencoding=utf8 # Index Web pages when you visist them using beagle # Copyright (C) 2007 Tao Fei # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import gtk import epiphany import md5 import os import ConfigParser import re import string import mimetypes import gettext #these are constant beagle_data_path = os.environ["HOME"] + "/.beagle/ToIndex/" config_file_path = os.environ["HOME"] + "/.gnome2/epiphany/extensions/beagleIndexer.conf" #The following is about config class Config(dict): def __getattr__(self, name): return self[name] def __setattr__(self, name,value): self[name] = value def load(fullpath, default={}): '''Load a config file as a Config Object''' module = type(os) try: code = open(fullpath).read() except IOError: return Config(default) #raise ImportError, 'No module named %s' %fullpath filename = os.path.basename(fullpath) m = module(filename) exec compile(code, filename, 'exec') in m.__dict__ for item in default.items(): m.__dict__.setdefault(item[0],item[1]) return Config(m.__dict__) def save(fullpath,config): '''Save a Config Object to a config file''' try: outfile = open(fullpath,'w') except IOError: print "beagle save config file to to %s error " %fullpath return for key in config.keys(): if key[0] == '_': continue outfile.write(key + '=') value = config[key] if type(value) == type(True): outfile.write(str(value) + '\n') elif type(value) == type([]): outfile.write('[\n') for li in value: outfile.write('"' + li + '",\n') outfile.write(']\n') else: outfile.write('"Not supported type"\n') outfile.close() #default config value _ConfigDefault = { 'auto_index':True, 'prompt_keyword':False, 'index_https':False, 'default_index':True, 'white_list_first':True, 'white_list':[], 'black_list':[], } #load config config = load(config_file_path,_ConfigDefault) #i18n init try: gettext.install('py_beagle_for_epiphany',config.locale_dir_path) except: gettext.install('py_beagle_for_epiphany') #The following code is about menu item _ui_str = """ """ # we use window.get_active_tab(): we want the menu entries to reflect the active # tab, not necessarily the one which fired a signal. def _update_action(window): '''update action for PyBeagleExtIndexThisPage (enabe after page loaded)''' index_this_page_action = window.get_ui_manager().get_action('/menubar/ToolsMenu/BeagleMenu/PyBeagleExtIndexThisPage') tab = window.get_active_tab() # Tab is None when a window is first opened sensitive = (tab != None and tab.get_load_status() != True) index_this_page_action.set_sensitive(sensitive) def _switch_page_cb(notebook, page, page_num, window): '''update the action (index this page ) when swith page''' _update_action(window) def _index_this_page_cb(action, window): '''callback for index_this_page action''' tab = window.get_active_tab() embed = tab.get_embed() index_embed(tab,embed,True) set_status_label(window,_("beagle is indexing %s") % embed.get_location(True)) def _toggle_auto_cb(action,window): '''enable/diable auto index ''' if config.auto_index != action.get_active(): config.auto_index = action.get_active() save(config_file_path, config) def _toggle_prompt_keywords_cb(action,window): '''enable/diable prompt for keyword''' if config.prompt_keyword != action.get_active(): config.prompt_keyword = action.get_active() def _index_link_cb(action,window): '''callback for index_link action''' event = window.get_context_event() if event is None: return value = event.get_event_property("link") index_link(value) set_status_label(window,_("beagle is indexing link %s") %value) pass def _load_status_cb(tab,event,window): ''' Callback for load_status chanage the load_status == false means the page is loaded. So we will do our job ''' _update_action(window) if not config.auto_index: print "Auto Index is turned off. No index " return #page is loaded if tab != None and tab.get_load_status() != True: embed = tab.get_embed() url = embed.get_location(True) if should_index(url) == False: print "%s will NOT be indexed." % url return index_embed(tab,embed,False) set_status_label(window,"beagle will index %s " % url) def _reload_config_cb(action,window): '''reaload config file ''' config = load(config_file_path,_ConfigDefault) init_ui(window) # This is to pass to gtk.ActionGroup.add_actions() _actions = [ ('BeagleMenuAction',None,'Beagle',None,None,None), ('PyBeagleExtIndexThisPageAction', None, _('Index This Page'), None, None, _index_this_page_cb), ('PyBeagleExtIndexLinkAction',None, _('Index Link'), None, None, _index_link_cb), ('PyBeagleExtReloadConfigAction',None, _('Reload Config File'), None, None, _reload_config_cb), ] _toggle_actions = [ ("PyBeagleExtAutoAction",None, _("Auto Index"),None,None,_toggle_auto_cb), ("PyBeagleExtPromptKeywordAction",None, _("Prompt key words when index on demand"),None,None,_toggle_prompt_keywords_cb), ] def set_status_label(window,msg): '''set status label with msg''' statusbar = window.get_statusbar() context_id = statusbar.get_context_id("beagle") statusbar.pop(context_id) statusbar.push(context_id,msg) def init_ui(window): '''ui set auto-index and prompt-keyword action to active/no-active''' auto_index_action = window.get_ui_manager().get_action('/menubar/ToolsMenu/BeagleMenu/PyBeagleExtAuto') auto_index_action.set_active(config.auto_index) prompt_keyword_action = window.get_ui_manager().get_action('/menubar/ToolsMenu/BeagleMenu/PyBeagleExtPromptKeyword') prompt_keyword_action.set_active(config.prompt_keyword) def prompt_for_keyword(): '''open a dialgo , ask for extra keyword to index''' dialog = gtk.Dialog("Keywords",None,gtk.DIALOG_MODAL, (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT) ) dialog.set_default_response(gtk.RESPONSE_ACCEPT) label = gtk.Label(_("Extra keywords to index")) entry = gtk.Entry() dialog.vbox.pack_start(label) dialog.vbox.pack_start(entry) label.show() entry.show() response = dialog.run() if response == gtk.RESPONSE_ACCEPT: ret = entry.get_text() else: ret = "" dialog.destroy() return ret def should_index(url): '''check weahter we should index the url''' url = url.lower() if not config.index_https and url.find("https") == 0: return False in_blacklist = False for item in config.black_list: if re.match(item,url): in_blacklist = True break in_whitelist = False for item in config.white_list: if re.match(item,url): in_whitelist = True break if in_blacklist and in_whitelist: return config.default_index if (not in_blacklist) and (not in_whitelist): return config.white_list_first return in_whitelist def index_embed(tab,embed,ondemand=True): '''index the page (in tab,embed)''' url = embed.get_location(True) print "beagle index embed " + url md5_hash = md5.new(url).hexdigest() beagle_content_path = beagle_data_path + "epiphany-" + md5_hash beagle_meta_path = beagle_data_path + ".epiphany-" + md5_hash write_content(embed, beagle_content_path) meta = get_meta_from_embed(url,embed,tab) if ondemand and config.prompt_keyword: keywords = prompt_for_keyword() if keywords != "": meta.append("t:dc:keyword:%s" % keywords) write_raw_meta(meta, beagle_meta_path) def index_link(url, ondemand=True): '''index the linked file''' md5_hash = md5.new(url).hexdigest() beagle_content_path = beagle_data_path + "epiphany-" + md5_hash beagle_meta_path = beagle_data_path + ".epiphany-" + md5_hash write_file(url, beagle_content_path) meta = get_meta_from_url(url) if ondemand and config.prompt_keyword: keywords = prompt_for_keyword() if keywords != "": meta.append("t:dc:keyword:%s" % keywords) write_raw_meta(meta, beagle_meta_path) def write_file(url,path): '''save file from url to path''' persist = epiphany.ephy_embed_factory_new_object("EphyEmbedPersist") persist.set_flags(epiphany.EMBED_PERSIST_NO_VIEW) persist.set_source(url) persist.set_dest(path) def save_completed_cb(persist,url): print "save completed for %s" %url persist.connect("completed",save_completed_cb,url) persist.save() def write_content(embed,path): '''write embed to path''' persist = epiphany.ephy_embed_factory_new_object("EphyEmbedPersist") persist.set_flags(epiphany.EMBED_PERSIST_NO_VIEW |epiphany.EMBED_PERSIST_COPY_PAGE |epiphany.EMBED_PERSIST_MAINDOC |epiphany.EMBED_PERSIST_FROM_CACHE) persist.set_embed(embed) persist.set_dest(path) persist.save() def get_meta_from_url(url): '''get mata data from url , the cotnent type is "guessed"''' return [ url, "WebHistory", guess_content_type(url), ] def get_meta_from_embed(url,embed,tab): '''get mata data from embed "''' #guess content type here content_type = "" doc_type = tab.get_document_type() if doc_type == epiphany.EMBED_DOCUMENT_HTML: content_type = "text/html" elif doc_type == epiphany.EMBED_DOCUMENT_XML: content_type = "text/xml" else: content_type = guess_content_type(url) return [ url, "WebHistory", content_type, "k:_unindexed:encoding="+embed.get_encoding() ] def write_raw_meta(metas,path): '''write raw meta''' meta_file = open(path,'w') for meta in metas: meta_file.write(meta + '\n') meta_file.close() def guess_content_type(url): '''guess content type that's not reliabe. but I found no API to get the contenttype ''' type,encoding = mimetypes.guess_type(url) if type is None: return "" else: return type def check_env(): '''check environment , just make sure there is ~/.beagle/ToIndex''' return os.path.isdir(beagle_data_path) #Implement epiphany extension interface def attach_window(window): if not check_env(): print "Not Found Beagle" return ui_manager = window.get_ui_manager() group = gtk.ActionGroup('PyBeagleExt') group.add_actions(_actions, window) group.add_toggle_actions(_toggle_actions, window) ui_manager.insert_action_group(group, -1) ui_id = ui_manager.add_ui_from_string(_ui_str) window._py_beagle_window_data = (group, ui_id) notebook = window.get_notebook() sig = notebook.connect('switch_page', _switch_page_cb, window) notebook._py_beagle_sig = sig init_ui(window) def detach_window(window): notebook = window.get_notebook() if hasattr(notebook,"_py_beagle_sig"): notebook.disconnect(notebook._py_beagle_sig) del notebook._py_beagle_sig if hasattr(window,"_py_beagle_window_data"): group, ui_id = window._py_beagle_window_data del window._py_beagle_window_data ui_manager = window.get_ui_manager() ui_manager.remove_ui(ui_id) ui_manager.remove_action_group(group) ui_manager.ensure_update() def attach_tab(window,tab): if not check_env(): print "Not Found Beagle" return sig = tab.connect("notify::load-status",_load_status_cb,window) tab._python_load_status_sig = sig def detach_tab(window,tab): if hasattr(tab,"_python_beagle_load_status_sig"): tab.disconnect(tab._python_beagle_load_status_sig) del tab._python_beagle_load_status_sig Index: beagle.spec =================================================================== RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- beagle.spec 25 Feb 2008 13:59:31 -0000 1.127 +++ beagle.spec 5 Mar 2008 11:45:48 -0000 1.128 @@ -1,12 +1,31 @@ +# Set the epiphany plugin version according to shipped version +%if "%{fedora}" == "7" + %define epiphany_version 2.18 +%elseif "%{fedora} == "8" + %define epiphany_version 2.20 +%else + %define epiphany_version 2.22 +%endif + +# firefox app if for beagle firefox extension +%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} + Name: beagle Version: 0.3.3 -Release: 8%{?dist} +Release: 10%{?dist} Summary: The Beagle Search Infrastructure Group: User Interface/Desktops # see COPYING for details License: ASL 2.0 and MIT and BSD and CC-BY and LGPLv2+ and (AFL or LGPLv2+) URL: http://beagle-project.org/ Source0: http://download.gnome.org/sources/beagle/0.3/%{name}-%{version}.tar.bz2 + +# Working Epiphany Backend +# http://browser-extension-for-beagle.googlecode.com/svn/trunk/py-epiphany-extension/ +Source1: beagleIndexer.conf.sample +Source2: beagleIndexer.ephy-extension +Source3: beagleIndexer.py + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel @@ -28,7 +47,7 @@ BuildRequires: autoconf BuildRequires: perl(XML::Parser) BuildRequires: desktop-file-utils -BuildRequires: libbeagle-devel >= 0.3.0 +BuildRequires: libbeagle-devel >= 0.3.0 BuildRequires: ndesk-dbus-glib-devel %ifarch ia64 BuildRequires: libunwind-devel @@ -37,9 +56,12 @@ Requires: mono-core >= 1.1.13.5 Requires: zip unzip sed grep poppler-utils Requires: libbeagle -# This should be picked up automatically by dep, but there is -# a problem with it. See bug #230212 -Requires: gsf-sharp + +# deep hack, banshee autoprovides ndesk-dbus(-glib) +# this will go away but for now +# suck in these to avoid installing banshee +Requires: ndesk-dbus +Requires: ndesk-dbus-glib # 4.0.17-5 fixes bug #201991 Requires(pre): shadow-utils >= 4.0.17-5 @@ -51,22 +73,27 @@ Patch6: beagle-monodoc.patch Patch7: beagle-0.3.3-buildfix.patch -# Mono is not available on these arches -ExcludeArch: s390 s390x sparc64 ppc64 - -#Firefox APP ID, for the beagle firefox extension -%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} +# JIT only availible on these: +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha +# Fedora 9 and above ships xulrunner +%if "%{fedora}" > "8" +BuildRequires: xulrunner-devel +%else +BuildRequires: firefox-devel +%endif %description A general infrastructure for making your data easy to find. -%package gui -Summary: Beagle search system user interface +%package gnome +Summary: Beagle search system user interface for GNOME Group: User Interface/Desktops Requires: beagle = %{version}-%{release} +Obsoletes: beagle-gui < 0.3.3-9 +Provides: beagle-gui = 0.3.3-9 -%description gui +%description gnome User interface for doing beagle searches %package evolution @@ -81,16 +108,33 @@ %description evolution Beagle indexing backend for evolution +%package thunderbird +Summary: Beagle backend for Thunderbird +Group: User Interface/Desktops +Requires: beagle = %{version}-%{release} + +Requires: Thunderbird + +%description thunderbird +Beagle backend for Thunderbird + %package firefox Summary: Beagle Indexer Extension for Firefox Group: User Interface/Desktops Requires: beagle = %{version}-%{release} -Requires: xulrunner - %description firefox Beagle Indexer Extension for Firefox +%package epiphany +Summary: Beagle backend for Epiphany +Group: User Interface/Desktops +Requires: beagle = %{version}-%{release} +Requires: epiphany-extensions + +%description epiphany +Beagle backend for Epiphany + %package devel Summary: Development files for the Beagle search infrastructure Group: Development/Libraries @@ -117,7 +161,9 @@ %build autoconf export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} -%configure --enable-wv1 +%configure --enable-wv1 + + make %{?_smp_mflags} %install @@ -131,10 +177,16 @@ # don't autostart the search gui rm -f $RPM_BUILD_ROOT/etc/xdg/autostart/beagle-search-autostart.desktop +# Fedora 9 and above ships xulrunner +%if "%{fedora}" > "8" +# No support for 3.0 api yet - this is ugly I know +rm -rf firefox-extension/beagle.xpi +%else # TODO: Isn't there a better place to install this? mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id} install -m 644 firefox-extension/beagle.xpi \ $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id} +%endif desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -152,19 +204,17 @@ %find_lang %{name} -rm -f $RPM_BUILD_ROOT%{_libdir}/beagle/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/beagle/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*/*.dll chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*.dll chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*.exe -#Disable the Thunderbird backend for now (#205985) -rm -f $RPM_BUILD_ROOT%{_libdir}/beagle/Backends/ThunderbirdBackends.dll* +mkdir -p $RPM_BUILD_ROOT%{_libdir}/epiphany/%{epiphany_version}/extensions/ +cp %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/epiphany/%{epiphany_version}/extensions/ +cp %{SOURCE2} $RPM_BUILD_ROOT%{_libdir}/epiphany/%{epiphany_version}/extensions/ +cp %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/epiphany/%{epiphany_version}/extensions/ %pre %define beagle_user_uid 58 @@ -238,8 +288,6 @@ %{_libdir}/beagle/libbeagleglue* %{_libdir}/beagle/Filters/* %{_libdir}/beagle/DocExtractor.exe* -#Disabled for now (#205985) -#%{_libdir}/beagle/Backends/ThunderbirdBackends.dll* %{_datadir}/beagle %{_mandir}/*/* %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle @@ -247,10 +295,22 @@ %{_sysconfdir}/xdg/autostart/beagled-autostart.desktop %files firefox +%defattr(-, root, root,-) +# Fedora 9 and above ships xulrunner, ugly hack since we don't support API 3.0 +%if "%{fedora}" <= "8" %{_libdir}/mozilla/extensions/%{firefox_app_id}/ +%endif -%files gui -%defattr(-, root, root) +%files thunderbird +%defattr(-, root, root,-) +%{_libdir}/beagle/Backends/ThunderbirdBackends.dll* + +%files epiphany +%defattr(-, root, root,-) +%{_libdir}/epiphany/%{epiphany_version}/extensions/ + +%files gnome +%defattr(-, root, root,-) %{_bindir}/beagle-imlogviewer %{_bindir}/beagle-search %{_bindir}/beagle-settings @@ -273,6 +333,14 @@ %{_libdir}/pkgconfig/beagle*.pc %changelog +* Tue Feb 26 2008 David Nielsen - 0.3.3-10 +- Add Epiphany plugin +- replace beagle-gui with beagle-gnome +- no firefox plugin on devel only supports < 2.0 + +* Tue Feb 26 2008 David Nielsen - 0.3.3-9 +- Build Thunderbird plugin + * Mon Feb 25 2008 David Nielsen - 0.3.3-8 - do the former right From fedora-extras-commits at redhat.com Wed Mar 5 12:12:26 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 5 Mar 2008 12:12:26 GMT Subject: rpms/totem/devel totem.spec,1.168,1.169 Message-ID: <200803051212.m25CCQLJ013362@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13314 Modified Files: totem.spec Log Message: Work-around D-Bus trying to assert when it doesn't have a machine UUID Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- totem.spec 5 Mar 2008 00:00:03 -0000 1.168 +++ totem.spec 5 Mar 2008 12:11:23 -0000 1.169 @@ -201,7 +201,7 @@ pushd gstreamer # try to work around a problem where gst-inspect does # not find playbin the first time around -/usr/bin/gst-inspect-0.10 --print-all > /dev/null +DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins %configure \ --enable-gstreamer \ From fedora-extras-commits at redhat.com Wed Mar 5 12:22:23 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 5 Mar 2008 12:22:23 GMT Subject: rpms/qt4/devel .cvsignore, 1.26, 1.27 qt4.spec, 1.90, 1.91 sources, 1.22, 1.23 Message-ID: <200803051222.m25CMNwF013506@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13477 Modified Files: .cvsignore qt4.spec sources Log Message: - upstream patch to fix 4.3 regression Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 22 Feb 2008 21:22:55 -0000 1.26 +++ .cvsignore 5 Mar 2008 12:21:48 -0000 1.27 @@ -3,3 +3,4 @@ hi48-app-qt4-logo.png qt-x11-opensource-src-4.3.4.tar.gz qt-copy-patches-20080219svn.tar.bz2 +qt-copy-patches-20080305svn.tar.bz2 Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- qt4.spec 29 Feb 2008 16:17:49 -0000 1.90 +++ qt4.spec 5 Mar 2008 12:21:48 -0000 1.91 @@ -4,7 +4,7 @@ Summary: Qt toolkit Name: qt4 Version: 4.3.4 -Release: 3%{?dist} +Release: 4%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -660,6 +660,9 @@ %changelog +* Wed Mar 05 2008 Than Ngo 4.3.4-4 +- upstream patch to fix 4.3 regression + * Fri Feb 29 2008 Than Ngo 4.3.4-3 - respin aliasing.patch, it's safer Index: sources =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Feb 2008 21:22:55 -0000 1.22 +++ sources 5 Mar 2008 12:21:48 -0000 1.23 @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png 9499101ec54eb7b0de195b3c5e3ffa93 qt-x11-opensource-src-4.3.4.tar.gz -9a4849a007bd6c8ed64e3cdcb4619cf5 qt-copy-patches-20080219svn.tar.bz2 +e07759e773b8ec38ce222b6fd5e9f0c5 qt-copy-patches-20080305svn.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 12:26:35 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 5 Mar 2008 12:26:35 GMT Subject: rpms/qt4/devel qt4.spec,1.91,1.92 Message-ID: <200803051226.m25CQZZB013609@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13585 Modified Files: qt4.spec Log Message: upstream patch to fix 4.3 regression Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- qt4.spec 5 Mar 2008 12:21:48 -0000 1.91 +++ qt4.spec 5 Mar 2008 12:26:00 -0000 1.92 @@ -34,7 +34,7 @@ Patch4: qt-x11-opensource-src-4.3.4-aliasing.patch ## qt-copy patches -%define qt_copy 20080219 +%define qt-copy 20080305 Source1: qt-copy-patches-svn_checkout.sh Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2 %{?qt_copy:Provides: %{name}-copy = %{qt_copy}} From fedora-extras-commits at redhat.com Wed Mar 5 12:33:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 12:33:34 GMT Subject: rpms/perl-bioperl/devel perl-bioperl.spec,1.12,1.13 Message-ID: <200803051233.m25CXYKp013751@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-bioperl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13729 Modified Files: perl-bioperl.spec Log Message: new perl Index: perl-bioperl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-bioperl/devel/perl-bioperl.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-bioperl.spec 5 Mar 2008 03:02:05 -0000 1.12 +++ perl-bioperl.spec 5 Mar 2008 12:32:54 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-bioperl Version: 1.5.2_102 -Release: 11%{?dist}.2 +Release: 12%{?dist} Summary: Perl tools for computational molecular biology Group: Development/Libraries @@ -58,14 +58,14 @@ # Temporary hack for bootstrapping # Filter unwanted Requires: -cat << \EOF > %{_builddir}/bioperl-%{version}/%{name}-req -#!/bin/sh -%{__perl_requires} $* |\ - sed -e '/perl(Bio::Tools::Run::Alignment::Clustalw)/d; /perl(Bio::Tools::Run::GenericParameters)/d; /perl(Bio::Tools::Run::Phylo::Molphy::ProtML)/d; /perl(Bio::Tools::Run::Phylo::Phylip::Neighbor)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtDist)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtPars)/d; /perl(Bio::Tools::Run::RemoteBlast)/d' -EOF - -%define __perl_requires %{_builddir}/bioperl-%{version}/%{name}-req -chmod +x %{__perl_requires} +# cat << \EOF > %{_builddir}/bioperl-%{version}/%{name}-req +# #!/bin/sh +# %{__perl_requires} $* |\ +# sed -e '/perl(Bio::Tools::Run::Alignment::Clustalw)/d; /perl(Bio::Tools::Run::GenericParameters)/d; /perl(Bio::Tools::Run::Phylo::Molphy::ProtML)/d; /perl(Bio::Tools::Run::Phylo::Phylip::Neighbor)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtDist)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtPars)/d; /perl(Bio::Tools::Run::RemoteBlast)/d' +# EOF +# +# %%define __perl_requires %{_builddir}/bioperl-%{version}/%{name}-req +# chmod +x %{__perl_requires} # remove all execute bits from the doc stuff find examples -type f -exec chmod -x {} 2>/dev/null ';' @@ -117,6 +117,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.5.2_102-12 +- bootstrapping done, building normally + * Tue Mar 4 2008 Tom "spot" Callaway 1.5.2_102-11.2 - missed one From fedora-extras-commits at redhat.com Wed Mar 5 12:35:51 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 5 Mar 2008 12:35:51 GMT Subject: rpms/qt4/devel qt4.spec,1.92,1.93 Message-ID: <200803051235.m25CZpq2013866@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13822 Modified Files: qt4.spec Log Message: upstream patch to fix 4.3 regression Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- qt4.spec 5 Mar 2008 12:26:00 -0000 1.92 +++ qt4.spec 5 Mar 2008 12:35:07 -0000 1.93 @@ -34,7 +34,7 @@ Patch4: qt-x11-opensource-src-4.3.4-aliasing.patch ## qt-copy patches -%define qt-copy 20080305 +%define qt_copy 20080305 Source1: qt-copy-patches-svn_checkout.sh Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2 %{?qt_copy:Provides: %{name}-copy = %{qt_copy}} From fedora-extras-commits at redhat.com Wed Mar 5 12:35:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 12:35:56 GMT Subject: rpms/perl-Class-MOP/devel perl-Class-MOP.spec,1.12,1.13 Message-ID: <200803051235.m25CZuaT013897@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-MOP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13831 Modified Files: perl-Class-MOP.spec Log Message: new perl Index: perl-Class-MOP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Class-MOP.spec 18 Feb 2008 23:09:25 -0000 1.12 +++ perl-Class-MOP.spec 5 Mar 2008 12:35:19 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-Class-MOP Version: 0.49 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Metaobject programming model for Perl License: GPL+ or Artistic Group: Development/Libraries @@ -78,6 +78,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.49-3 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.49-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 12:38:34 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Wed, 5 Mar 2008 12:38:34 GMT Subject: devel/privoxy privoxy.spec,1.23,1.24 Message-ID: <200803051238.m25CcYIX013985@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/privoxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13963 Modified Files: privoxy.spec Log Message: - fix source URL Index: privoxy.spec =================================================================== RCS file: /cvs/extras/devel/privoxy/privoxy.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- privoxy.spec 25 Feb 2008 14:43:21 -0000 1.23 +++ privoxy.spec 5 Mar 2008 12:38:00 -0000 1.24 @@ -5,10 +5,10 @@ Name: privoxy Version: 3.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Privoxy - privacy enhancing proxy License: GPLv2+ -Source0: http://dl.sf.net/ijbswa/%{name}/%{name}-%{version}-stable%{?snapshot}-src.tar.gz +Source0: http://downloads.sourceforge.net/ijbswa/%{name}-%{version}-stable%{?snapshot}-src.tar.gz Patch: privoxy-3.0.3-service.patch Patch1: privoxy-3.0.6%{?snapshot}-stripchangelog.patch #Patch2: privoxy-3.0.6%{?snapshot}-dynamic-pcre.patch @@ -117,6 +117,9 @@ %doc doc/webserver %changelog +* Wed Mar 05 2008 Karsten Hopp 3.0.8-2 +- fix source URL + * Mon Feb 25 2008 Karsten Hopp 3.0.8-1 - privoxy-3.0.8 From fedora-extras-commits at redhat.com Wed Mar 5 12:42:38 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?= (jsafrane)) Date: Wed, 5 Mar 2008 12:42:38 GMT Subject: rpms/openldap/devel openldap.spec,1.119,1.120 Message-ID: <200803051242.m25Cgcsg014194@cvs-int.fedora.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/openldap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14159 Modified Files: openldap.spec Log Message: - reworked the upgrade logic, slapcat/slapadd of the whole database is needed only if minor version changes (2.3.x -> 2.4.y) - do not try to save database in LDIF format, if openldap-servers package is being removed (it's up to the admin to do so manually) Index: openldap.spec =================================================================== RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- openldap.spec 29 Feb 2008 08:40:16 -0000 1.119 +++ openldap.spec 5 Mar 2008 12:41:56 -0000 1.120 @@ -8,7 +8,7 @@ Summary: The configuration files, libraries, and documentation for OpenLDAP Name: openldap Version: %{version} -Release: 2%{?dist} +Release: 3%{?dist} License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz @@ -415,20 +415,27 @@ done fi fi -# (the below is copied from the preun servers scriptlet below) -# Save an ldif of the database where the "% post servers" scriptlet can -# restore it. Also save the database files to a "rpmorig" directory -# Just In Case (TM) -files=$(echo /var/lib/ldap/{log.*,__db.*,[a]lock}) -if [ "$files" != '/var/lib/ldap/log.* /var/lib/ldap/__db.* /var/lib/ldap/[a]lock' ] ; then - if /usr/sbin/slapcat -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then - if [ -f /var/lib/ldap/upgrade.ldif ] ; then - /bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || : - mkdir /var/lib/ldap/rpmorig - mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || : - cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || : - else - /bin/rm -f /var/lib/ldap/upgrade.ldif + +if [ "$1" = "2" ]; then + OLD_VERSION=$( rpm -q --qf "%{VERSION}" openldap-servers | sed 's/\.[0-9]*$//' ) + NEW_VERSION=$( echo %{version} | sed 's/\.[0-9]*$//' ) + if [ "$OLD_VERSION" != "$NEW_VERSION" ]; then + # Minor version number has changed -> slapcat/slapadd of the BDB database + # is necessary. Save an ldif of the database where the "% post servers" + # scriptlet can restore it. Also save the database files to a "rpmorig" + # directory - Just In Case (TM) + files=$(echo /var/lib/ldap/{log.*,__db.*,[a]lock}) + if [ "$files" != '/var/lib/ldap/log.* /var/lib/ldap/__db.* /var/lib/ldap/[a]lock' ] ; then + if /usr/sbin/slapcat -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then + if [ -f /var/lib/ldap/upgrade.ldif ] ; then + /bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || : + mkdir /var/lib/ldap/rpmorig + mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || : + cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || : + else + /bin/rm -f /var/lib/ldap/upgrade.ldif + fi + fi fi fi fi @@ -437,7 +444,7 @@ /sbin/ldconfig /sbin/chkconfig --add ldap # If there's a /var/lib/ldap/upgrade.ldif file, slapadd it and delete it. -# It was created by the uninstall of the previous version. +# It was created by the % pre above. if [ -f /var/lib/ldap/upgrade.ldif ] ; then /sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 rm /var/lib/ldap/upgrade.ldif @@ -465,18 +472,11 @@ if [ "$1" = "0" ] ; then /sbin/service ldap stop > /dev/null 2>&1 || : /sbin/chkconfig --del ldap -# Save an ldif of the database where the "% post servers" scriptlet can -# restore it. Also save the database files to a "rpmorig" directory -# Just In Case (TM) - files="/var/lib/ldap/log.* /var/lib/ldap/__db.* /var/lib/ldap/[a]lock" - if [ "$files" != '/var/lib/ldap/log.* /var/lib/ldap/__db.* /var/lib/ldap/[a]lock' ] ; then - if /usr/sbin/slapcat -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then - /bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || : - mkdir /var/lib/ldap/rpmorig - mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || : - cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || : - fi - fi +# Openldap-servers are being removed from system. +# Do not touch the database! Older versions of this +# package attempted to store database in LDIF format, so +# it can be restored later - but it's up to the administrator +# to save the database, if he/she wants so. fi %postun servers @@ -561,6 +561,12 @@ %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog +* Wed Mar 5 2008 Jan Safranek 2.4.8-3 +- reworked the upgrade logic, slapcat/slapadd of the whole database + is needed only if minor version changes (2.3.x -> 2.4.y) +- do not try to save database in LDIF format, if openldap-servers package + is being removed (it's up to the admin to do so manually) + * Thu Feb 28 2008 Jan Safranek 2.4.8-2 - migration tools carved out to standalone package "migrationtools" (#236697) From fedora-extras-commits at redhat.com Wed Mar 5 12:44:21 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Wed, 5 Mar 2008 12:44:21 GMT Subject: devel/automake15 .cvsignore, 1.2, 1.3 automake15.spec, 1.20, 1.21 sources, 1.2, 1.3 Message-ID: <200803051244.m25CiLnx014243@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/automake15 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14218 Modified Files: .cvsignore automake15.spec sources Log Message: - fix source URL Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/automake15/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Sep 2004 03:22:13 -0000 1.2 +++ .cvsignore 5 Mar 2008 12:43:43 -0000 1.3 @@ -1 +1 @@ -automake-1.5.tar.bz2 +automake-1.5.tar.gz Index: automake15.spec =================================================================== RCS file: /cvs/extras/devel/automake15/automake15.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- automake15.spec 16 Apr 2007 12:32:32 -0000 1.20 +++ automake15.spec 5 Mar 2008 12:43:43 -0000 1.21 @@ -1,11 +1,11 @@ Summary: A GNU tool for automatically creating Makefiles Name: automake15 Version: 1.5 -Release: 22 +Release: 23 License: GPL Group: Development/Tools URL: http://sources.redhat.com/automake -Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2 +Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.gz Source10: filter-provides-automake.sh Source11: filter-requires-automake.sh Patch1: automake-1.5-depout-mf.patch @@ -102,6 +102,9 @@ %dir %{_datadir}/aclocal %changelog +* Wed Mar 05 2008 Karsten Hopp 1.5-23 +- fix source URL + * Mon Apr 16 2007 Karsten Hopp 1.5-22 - update subdirs patch (#225299) - don't run autotools during build Index: sources =================================================================== RCS file: /cvs/extras/devel/automake15/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 03:22:13 -0000 1.2 +++ sources 5 Mar 2008 12:43:43 -0000 1.3 @@ -1 +1 @@ -e4951556f135a28134000068072f0656 automake-1.5.tar.bz2 +74a22ac0581378e807ecb334a55c5bab automake-1.5.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 12:51:35 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Wed, 5 Mar 2008 12:51:35 GMT Subject: devel/hdparm .cvsignore, 1.18, 1.19 hdparm.spec, 1.42, 1.43 sources, 1.19, 1.20 Message-ID: <200803051251.m25CpZ3t014445@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/hdparm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14409 Modified Files: .cvsignore hdparm.spec sources Log Message: - update to 8.6 - fix source URL Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/hdparm/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 25 Feb 2008 14:23:37 -0000 1.18 +++ .cvsignore 5 Mar 2008 12:51:01 -0000 1.19 @@ -1 +1 @@ -hdparm-8.5.tar.gz +hdparm-8.6.tar.gz Index: hdparm.spec =================================================================== RCS file: /cvs/extras/devel/hdparm/hdparm.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- hdparm.spec 25 Feb 2008 14:23:37 -0000 1.42 +++ hdparm.spec 5 Mar 2008 12:51:01 -0000 1.43 @@ -1,11 +1,11 @@ Summary: A utility for displaying and/or setting hard disk parameters Name: hdparm -Version: 8.5 +Version: 8.6 Release: 1%{?dist} License: BSD Group: Applications/System URL: http://sourceforge.net/projects/hdparm/ -Source: http://hdparm.sourceforge.net/sourceforge/hdparm/hdparm-%{version}.tar.gz +Source: http://download.sourceforge.net/hdparm/hdparm-%{version}.tar.gz Patch0: hdparm-8.4-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: s390 s390x @@ -41,6 +41,10 @@ %{_mandir}/man8/hdparm.8* %changelog +* Wed Mar 05 2008 Karsten Hopp 8.6-1 +- update to 8.6 +- fix source URL + * Mon Feb 25 2008 Karsten Hopp 8.5-1 - version 8.5, fixes u8->u16 bug in security commands Index: sources =================================================================== RCS file: /cvs/extras/devel/hdparm/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 25 Feb 2008 14:23:37 -0000 1.19 +++ sources 5 Mar 2008 12:51:01 -0000 1.20 @@ -1 +1 @@ -3f33e79d3b404906d1442986c14db468 hdparm-8.5.tar.gz +237fbceeeba6318b987983fd858994df hdparm-8.6.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 13:40:39 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 5 Mar 2008 13:40:39 GMT Subject: rpms/kernel/devel linux-2.6-vio-modalias.patch, NONE, 1.1 kernel.spec, 1.474, 1.475 Message-ID: <200803051340.m25DedfW022111@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22079 Modified Files: kernel.spec Added Files: linux-2.6-vio-modalias.patch Log Message: add modalias attr for vio devices in sysfs linux-2.6-vio-modalias.patch: --- NEW FILE linux-2.6-vio-modalias.patch --- diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index f988672..12a0851 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c @@ -294,9 +294,27 @@ static ssize_t devspec_show(struct device *dev, return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none"); } +static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + const struct vio_dev *vio_dev = to_vio_dev(dev); + struct device_node *dn; + const char *cp; + + dn = dev->archdata.of_node; + if (!dn) + return -ENODEV; + cp = of_get_property(dn, "compatible", NULL); + if (!cp) + return -ENODEV; + + return sprintf(buf, "vio:T%sS%s", vio_dev->type, cp); +} + static struct device_attribute vio_dev_attrs[] = { __ATTR_RO(name), __ATTR_RO(devspec), + __ATTR_RO(modalias), __ATTR_NULL }; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.474 retrieving revision 1.475 diff -u -r1.474 -r1.475 --- kernel.spec 5 Mar 2008 01:09:02 -0000 1.474 +++ kernel.spec 5 Mar 2008 13:39:49 -0000 1.475 @@ -586,6 +586,7 @@ Patch141: linux-2.6-ps3-storage-alias.patch Patch142: linux-2.6-ps3-legacy-bootloader-hack.patch Patch143: linux-2.6-g5-therm-shutdown.patch +Patch144: linux-2.6-vio-modalias.patch Patch160: linux-2.6-execshield.patch Patch250: linux-2.6-debug-sizeof-structs.patch @@ -1031,6 +1032,8 @@ ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch # Alleviate G5 thermal shutdown problems ApplyPatch linux-2.6-g5-therm-shutdown.patch +# Provide modalias in sysfs for vio devices +ApplyPatch linux-2.6-vio-modalias.patch # # Exec shield @@ -1751,6 +1754,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Wed Mar 05 2008 David Woodhouse +- Add modalias in sysfs for vio devices (#431045) + * Tue Mar 04 2008 John W. Linville - libertas: fix sanity check on sequence number in command response - p54: fix EEPROM structure endianness From fedora-extras-commits at redhat.com Wed Mar 5 13:45:51 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 5 Mar 2008 13:45:51 GMT Subject: rpms/authd/devel authd.spec,1.44,1.45 Message-ID: <200803051345.m25DjpcI022174@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/authd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22154 Modified Files: authd.spec Log Message: Added URL and dist tag Index: authd.spec =================================================================== RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- authd.spec 27 Feb 2008 14:15:17 -0000 1.44 +++ authd.spec 5 Mar 2008 13:45:10 -0000 1.45 @@ -1,9 +1,10 @@ Summary: A RFC 1413 ident protocol daemon Name: authd Version: 1.4.3 -Release: 14 +Release: 15%{?dist} License: GPLv2+ Group: System Environment/Daemons +URL: https://fedorahosted.org/authd/ Obsoletes: pidentd <= 3.2 Provides: pidentd = 3.2 Requires(post): openssl @@ -72,6 +73,10 @@ %{_sbindir}/in.authd %changelog +* Wed Mar 5 2008 Roman Rakus - 1.4.3-15 +- added dist tag +- added URL + * Tue Feb 26 2008 Roman Rakus - 1.4.3-14 - fix 234262 bug From fedora-extras-commits at redhat.com Wed Mar 5 13:49:44 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 13:49:44 GMT Subject: rpms/kazehakase/F-7 kazehakase.spec,1.31,1.32 Message-ID: <200803051349.m25DniAY022305@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22242/F-7 Modified Files: kazehakase.spec Log Message: * Wed Mar 5 2008 Mamoru Tasaka - 0.5.3-4 - Create kazehakase-base, split gecko.so from -base package so that users can install only WebKit based package. Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-7/kazehakase.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- kazehakase.spec 5 Mar 2008 08:00:48 -0000 1.31 +++ kazehakase.spec 5 Mar 2008 13:49:05 -0000 1.32 @@ -31,7 +31,7 @@ %endif -%define fedorarel 3 +%define fedorarel 4 %define _release %{fedorarel}%{?usesvn:.svn%svnver} @@ -39,7 +39,7 @@ Name: kazehakase Version: 0.5.3 Release: %{_release}%{?dist} -Summary: Kazehakase browser +Summary: Kazehakase browser using Gecko rendering engine Group: Applications/Internet License: GPLv2+ @@ -78,6 +78,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext +Requires: %{name}-base = %{version}-%{release} + # GLib version dependency # Borrowed from pidgin spec file @@ -104,10 +106,24 @@ Kazehakase is a Web browser which aims to provide a user interface that is truly user-friendly & fully customizable. +This package uses Gecko for HTML rendering engine. +If you want to use WebKit for HTML rendering engine, install +"kazehakase-webkit" rpm instead. + +%package base +Summary: Base package of Kazehakase +Group: Application/Internet + +%description base +This package contains base files for Kazehakase. +To use Kazehakase, you also need to install a package +containing HTML rendering engine module for Kazehakase. + + %package hyperestraier Summary: Kazehakase search engine of hyperestraier Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} Obsoletes: %{name}-plugins < %{obsolete_plugin_ver} Obsoletes: %{name}-plugins-hyperestraier < %{obsolete_plugin_ver} Provides: %{name}-plugins = %{version}-%{release} @@ -121,7 +137,7 @@ %package anthy Summary: Kazehakase search engine of Anthy Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} Obsoletes: %{name}-plugins-anthy < %{obsolete_plugin_ver} Provides: %{name}-plugins-anthy = %{version}-%{release} @@ -134,7 +150,7 @@ %package ruby Summary: Ruby interpretter support for Kazehakase Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} Requires: ruby(gtk2) Requires: ruby(abi) = %{rubyabi} @@ -145,12 +161,15 @@ %if %{support_webkit} %package webkit -Summary: WebKit embed module of Kazehakase +Summary: Kazehakase browser using WebKit rendering engine Group: Application/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} %description webkit -This package contains WebKit embed module of Kazehakase. +Kazehakase is a Web browser which aims to provide +a user interface that is truly user-friendly & fully customizable. + +This package uses WebKit for HTML rendering engine. %endif %prep @@ -234,7 +253,7 @@ %{__rm} -f ${f}.tmp done -%if 1 +%if 0 %if 0%{?fedora} == 9 : This package builds, but does not work at all!! : Disabling build intentionally @@ -245,7 +264,7 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT -%files -f %{name}.lang +%files -f %{name}.lang base %defattr(-,root,root,-) %doc AUTHORS COPYING* README* TODO* @@ -260,7 +279,6 @@ %dir %{_libdir}/%{name}/embed/ %dir %{_libdir}/%{name}/search/ %{_libdir}/%{name}/libkazehakase.so.* -%{_libdir}/%{name}/embed/gecko.so %dir %{_datadir}/%{name}/ %if %{support_ruby} @@ -292,6 +310,11 @@ %{_datadir}/%{name}/ext/ruby/ %endif +%files +%defattr(-,root,root,-) +%{_libdir}/%{name}/embed/gecko.so + + %if %{support_webkit} %files webkit %defattr(-,root,root,-) @@ -299,6 +322,10 @@ %endif %changelog +* Wed Mar 5 2008 Mamoru Tasaka - 0.5.3-4 +- Create kazehakase-base, split gecko.so from -base package + so that users can install only WebKit based package. + * Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-3 - Support WebGTK From fedora-extras-commits at redhat.com Wed Mar 5 13:49:50 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 13:49:50 GMT Subject: rpms/kazehakase/F-8 kazehakase.spec,1.48,1.49 Message-ID: <200803051349.m25DnoMe022308@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22242/F-8 Modified Files: kazehakase.spec Log Message: * Wed Mar 5 2008 Mamoru Tasaka - 0.5.3-4 - Create kazehakase-base, split gecko.so from -base package so that users can install only WebKit based package. Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/F-8/kazehakase.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- kazehakase.spec 5 Mar 2008 08:01:02 -0000 1.48 +++ kazehakase.spec 5 Mar 2008 13:49:14 -0000 1.49 @@ -31,7 +31,7 @@ %endif -%define fedorarel 3 +%define fedorarel 4 %define _release %{fedorarel}%{?usesvn:.svn%svnver} @@ -39,7 +39,7 @@ Name: kazehakase Version: 0.5.3 Release: %{_release}%{?dist} -Summary: Kazehakase browser +Summary: Kazehakase browser using Gecko rendering engine Group: Applications/Internet License: GPLv2+ @@ -78,6 +78,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext +Requires: %{name}-base = %{version}-%{release} + # GLib version dependency # Borrowed from pidgin spec file @@ -104,10 +106,24 @@ Kazehakase is a Web browser which aims to provide a user interface that is truly user-friendly & fully customizable. +This package uses Gecko for HTML rendering engine. +If you want to use WebKit for HTML rendering engine, install +"kazehakase-webkit" rpm instead. + +%package base +Summary: Base package of Kazehakase +Group: Application/Internet + +%description base +This package contains base files for Kazehakase. +To use Kazehakase, you also need to install a package +containing HTML rendering engine module for Kazehakase. + + %package hyperestraier Summary: Kazehakase search engine of hyperestraier Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} Obsoletes: %{name}-plugins < %{obsolete_plugin_ver} Obsoletes: %{name}-plugins-hyperestraier < %{obsolete_plugin_ver} Provides: %{name}-plugins = %{version}-%{release} @@ -121,7 +137,7 @@ %package anthy Summary: Kazehakase search engine of Anthy Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} Obsoletes: %{name}-plugins-anthy < %{obsolete_plugin_ver} Provides: %{name}-plugins-anthy = %{version}-%{release} @@ -134,7 +150,7 @@ %package ruby Summary: Ruby interpretter support for Kazehakase Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} Requires: ruby(gtk2) Requires: ruby(abi) = %{rubyabi} @@ -145,12 +161,15 @@ %if %{support_webkit} %package webkit -Summary: WebKit embed module of Kazehakase +Summary: Kazehakase browser using WebKit rendering engine Group: Application/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} %description webkit -This package contains WebKit embed module of Kazehakase. +Kazehakase is a Web browser which aims to provide +a user interface that is truly user-friendly & fully customizable. + +This package uses WebKit for HTML rendering engine. %endif %prep @@ -234,7 +253,7 @@ %{__rm} -f ${f}.tmp done -%if 1 +%if 0 %if 0%{?fedora} == 9 : This package builds, but does not work at all!! : Disabling build intentionally @@ -245,7 +264,7 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT -%files -f %{name}.lang +%files -f %{name}.lang base %defattr(-,root,root,-) %doc AUTHORS COPYING* README* TODO* @@ -260,7 +279,6 @@ %dir %{_libdir}/%{name}/embed/ %dir %{_libdir}/%{name}/search/ %{_libdir}/%{name}/libkazehakase.so.* -%{_libdir}/%{name}/embed/gecko.so %dir %{_datadir}/%{name}/ %if %{support_ruby} @@ -292,6 +310,11 @@ %{_datadir}/%{name}/ext/ruby/ %endif +%files +%defattr(-,root,root,-) +%{_libdir}/%{name}/embed/gecko.so + + %if %{support_webkit} %files webkit %defattr(-,root,root,-) @@ -299,6 +322,10 @@ %endif %changelog +* Wed Mar 5 2008 Mamoru Tasaka - 0.5.3-4 +- Create kazehakase-base, split gecko.so from -base package + so that users can install only WebKit based package. + * Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-3 - Support WebGTK From fedora-extras-commits at redhat.com Wed Mar 5 13:49:58 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 13:49:58 GMT Subject: rpms/kazehakase/devel kazehakase.spec,1.51,1.52 Message-ID: <200803051349.m25DnwuF022314@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/kazehakase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22242/devel Modified Files: kazehakase.spec Log Message: * Wed Mar 5 2008 Mamoru Tasaka - 0.5.3-4 - Create kazehakase-base, split gecko.so from -base package so that users can install only WebKit based package. Index: kazehakase.spec =================================================================== RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- kazehakase.spec 5 Mar 2008 11:16:02 -0000 1.51 +++ kazehakase.spec 5 Mar 2008 13:49:20 -0000 1.52 @@ -31,7 +31,7 @@ %endif -%define fedorarel 3 +%define fedorarel 4 %define _release %{fedorarel}%{?usesvn:.svn%svnver} @@ -39,7 +39,7 @@ Name: kazehakase Version: 0.5.3 Release: %{_release}%{?dist} -Summary: Kazehakase browser +Summary: Kazehakase browser using Gecko rendering engine Group: Applications/Internet License: GPLv2+ @@ -78,6 +78,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext +Requires: %{name}-base = %{version}-%{release} + # GLib version dependency # Borrowed from pidgin spec file @@ -104,10 +106,24 @@ Kazehakase is a Web browser which aims to provide a user interface that is truly user-friendly & fully customizable. +This package uses Gecko for HTML rendering engine. +If you want to use WebKit for HTML rendering engine, install +"kazehakase-webkit" rpm instead. + +%package base +Summary: Base package of Kazehakase +Group: Application/Internet + +%description base +This package contains base files for Kazehakase. +To use Kazehakase, you also need to install a package +containing HTML rendering engine module for Kazehakase. + + %package hyperestraier Summary: Kazehakase search engine of hyperestraier Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} Obsoletes: %{name}-plugins < %{obsolete_plugin_ver} Obsoletes: %{name}-plugins-hyperestraier < %{obsolete_plugin_ver} Provides: %{name}-plugins = %{version}-%{release} @@ -121,7 +137,7 @@ %package anthy Summary: Kazehakase search engine of Anthy Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} Obsoletes: %{name}-plugins-anthy < %{obsolete_plugin_ver} Provides: %{name}-plugins-anthy = %{version}-%{release} @@ -134,7 +150,7 @@ %package ruby Summary: Ruby interpretter support for Kazehakase Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} Requires: ruby(gtk2) Requires: ruby(abi) = %{rubyabi} @@ -145,12 +161,15 @@ %if %{support_webkit} %package webkit -Summary: WebKit embed module of Kazehakase +Summary: Kazehakase browser using WebKit rendering engine Group: Application/Internet -Requires: %{name} = %{version}-%{release} +Requires: %{name}-base = %{version}-%{release} %description webkit -This package contains WebKit embed module of Kazehakase. +Kazehakase is a Web browser which aims to provide +a user interface that is truly user-friendly & fully customizable. + +This package uses WebKit for HTML rendering engine. %endif %prep @@ -245,7 +264,7 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT -%files -f %{name}.lang +%files -f %{name}.lang base %defattr(-,root,root,-) %doc AUTHORS COPYING* README* TODO* @@ -260,7 +279,6 @@ %dir %{_libdir}/%{name}/embed/ %dir %{_libdir}/%{name}/search/ %{_libdir}/%{name}/libkazehakase.so.* -%{_libdir}/%{name}/embed/gecko.so %dir %{_datadir}/%{name}/ %if %{support_ruby} @@ -292,6 +310,11 @@ %{_datadir}/%{name}/ext/ruby/ %endif +%files +%defattr(-,root,root,-) +%{_libdir}/%{name}/embed/gecko.so + + %if %{support_webkit} %files webkit %defattr(-,root,root,-) @@ -299,6 +322,10 @@ %endif %changelog +* Wed Mar 5 2008 Mamoru Tasaka - 0.5.3-4 +- Create kazehakase-base, split gecko.so from -base package + so that users can install only WebKit based package. + * Sun Mar 2 2008 Mamoru Tasaka - 0.5.3-3 - Support WebGTK From fedora-extras-commits at redhat.com Wed Mar 5 14:02:04 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Wed, 5 Mar 2008 14:02:04 GMT Subject: rpms/kernel-xen-2.6/devel linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch, NONE, 1.1.2.1 linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch, NONE, 1.1.2.1 linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch, NONE, 1.1.2.1 linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch, NONE, 1.1.2.1 linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch, NONE, 1.1.2.1 linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch, NONE, 1.1.2.1 linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch, NONE, 1.1.2.1 linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch, NONE, 1.1.2.1 linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch, NONE, 1.1.2.1 linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch, NONE, 1.1.2.1 linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch, NONE, 1.1.2.1 Makefile, 1.2.6.2, 1.2.6.3 Makefile.config, 1.2.4.2, 1.2.4.3 config-xen-generic, 1.2.4.2, 1.2.4.3 config-xen-x86_64, 1.2.4.1, 1.2.4.2 kernel.spec, 1.11.2.12, 1.11.2.13 linux-2.6-xen-0002-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch, 1.1.2.3, NONE linux-2.6-xen-0003-fbdev-Make-deferred-I-O-work-as-advertized.patch, 1.1.2.3, NONE linux-2.6-xen-0004-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch, 1.1.2.3, NONE linux-2.6-xen-0005-xen-Module-autoprobing-support-for-frontend-drivers.patch, 1.1.2.2, NONE linux-2.6-xen-0006-xen-Add-compatibility-aliases-for-frontend-drivers.patch, 1.1.2.2, NONE linux-2.6-xen-0007-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch, 1.1.2.2, NONE linux-2.6-xen-0008-xen-dom0-Initialize-xenbus-for-dom0.patch, 1.1.2.2, NONE linux-2.6-xen-0009-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch, 1.1.2.2, NONE linux-2.6-xen-0010-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch, 1.1.2.2, NONE linux-2.6-xen-0011-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch, 1.1.2.2, NONE linux-2.6-xen-0012-xen-acpi-Enable-early-access-to-ACPI-tables.patch, 1.1.2.2, NONE linux-2.6-xen-0013-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch, 1.1.2.2, NONE linux-2.6-xen-0014-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch, 1.1.2.2, NONE linux-2.6-xen-0015-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch, 1.1.2.2, NONE linux-2.6-xen-0016-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch, 1.1.2.2, NONE linux-2.6-xen-0017-xen-mtrr-set-cpu-in-cpu_callout_map.patch, 1.1.2.2, NONE linux-2.6-xen-0018-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch, 1.1.2.2, NONE linux-2.6-xen-0019-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch, 1.1.2.2, NONE linux-2.6-xen-0020-xen-mtrr-Kill-some-unneccessary-includes.patch, 1.1.2.2, NONE linux-2.6-xen-0021-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch, 1.1.2.2, NONE linux-2.6-xen-0022-xen-mtrr-Use-generic_validate_add_page.patch, 1.1.2.2, NONE linux-2.6-xen-0023-xen-mtrr-Implement-xen_get_free_region.patch, 1.1.2.2, NONE linux-2.6-xen-0024-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch, 1.1.2.2, NONE linux-2.6-xen-0025-irq2.diff-from-Juan-Quintela.patch, 1.1.2.2, NONE linux-2.6-xen-0026-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch, 1.1.2.2, NONE linux-2.6-xen-0027-xen-debug-Diagnose-bind_virq_to_irq-errors.patch, 1.1.2.2, NONE linux-2.6-xen-0028-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch, 1.1.2.2, NONE linux-2.6-xen-0029-xen-debug-Move-init_apic_mappings-after-trap-init.patch, 1.1.2.2, NONE linux-2.6-xen-0030-xen-debug-Trace-progress-in-trap_init-around-init.patch, 1.1.2.2, NONE linux-2.6-xen-0031-xen-apic-Disable-init_apic_mappings-when-under-CO.patch, 1.1.2.2, NONE linux-2.6-xen-0032-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch, 1.1.2.2, NONE linux-2.6-xen-0033-xen-debug-Log-bind_virq_to_irq-events.patch, 1.1.2.2, NONE linux-2.6-xen-0034-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch, 1.1.2.2, NONE linux-2.6-xen-0035-Remove-duplicated-dma_alloc-free_noncoherent-define.patch, 1.1.2.2, NONE linux-2.6-xen-0036-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch, 1.1.2.2, NONE linux-2.6-xen-0037-xen-dom0-add-virt_to_pfn-macro.patch, 1.1.2.2, NONE linux-2.6-xen-0038-xen-dom0-use-virt_to_pfn-where-appropriate.patch, 1.1.2.2, NONE linux-2.6-xen-0039-xen-dom0-Add-contiguous-region-support.patch, 1.1.2.2, NONE linux-2.6-xen-0040-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch, 1.1.2.2, NONE linux-2.6-xen-0041-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch, 1.1.2.2, NONE linux-2.6-xen-0042-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch, 1.1.2.2, NONE linux-2.6-xen-0043-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch, 1.1.2.2, NONE linux-2.6-xen-0044-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch, 1.1.2.2, NONE linux-2.6-xen-0045-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch, 1.1.2.2, NONE linux-2.6-xen-0046-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch, 1.1.2.2, NONE linux-2.6-xen-0047-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch, 1.1.2.2, NONE linux-2.6-xen-0048-xen-dma-Add-xen_alloc-free_coherent.patch, 1.1.2.2, NONE linux-2.6-xen-0049-xen-dma-Don-t-merge-bios-on-xen-pvops.patch, 1.1.2.2, NONE linux-2.6-xen-0050-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch, 1.1.2.2, NONE linux-2.6-xen-0051-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch, 1.1.2.2, NONE linux-2.6-xen-0052-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch, 1.1.2.2, NONE linux-2.6-xen-0053-xen-dom0-Reserve-ISA-address-space-earlier.patch, 1.1.2.2, NONE linux-2.6-xen-0054-xen-Add-empty-xenctrl-module.patch, 1.1.2.2, NONE linux-2.6-xen-0055-xen-dom0-Add-proc-xen-capabilities.patch, 1.1.2.2, NONE linux-2.6-xen-0056-xen-Add-proc-xen-privcmd.patch, 1.1.2.2, NONE linux-2.6-xen-0057-xen-dom0-Add-proc-xen-xsd_-port-kva.patch, 1.1.2.2, NONE linux-2.6-xen-0058-xen-Add-proc-xen-xenbus.patch, 1.1.2.2, NONE linux-2.6-xen-0059-xen-Add-dev-xen-evtchn.patch, 1.1.2.2, NONE linux-2.6-xen-0060-xen-Add-__init-__exit-notations-to-xenctrl-function.patch, 1.1.2.2, NONE linux-2.6-xen-0061-xen-Add-Xen-s-sys-hypervisor-interface.patch, 1.1.2.2, NONE linux-2.6-xen-0062-xen-dom0-Add-basic-proc-xen-balloon.patch, 1.1.2.2, NONE linux-2.6-xen-0063-xen-dom0-Re-work-privcmd_ioctl-a-little.patch, 1.1.2.2, NONE linux-2.6-xen-0064-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch, 1.1.2.2, NONE linux-2.6-xen-0065-xen-dom0-Add-a-vmlinuz-target.patch, 1.1.2.2, NONE linux-2.6-xen-0066-xen-dom0-Don-t-use-fixmaps-for-ACPI-mappings-in-ISA.patch, 1.1.2.1, NONE linux-2.6-xen-0067-x86-Do-not-scan-for-DMI-if-the-DMI-region-is-marked.patch, 1.1.2.1, NONE linux-2.6-xen-0068-xen-dom0-Fix-DMI-scanning.patch, 1.1.2.1, NONE linux-2.6-xen-0069-ata-scsi-Use-dma_alloc_coherent-for-ATAPI-drain-b.patch, 1.1.2.1, NONE linux-2.6-xen-0070-xen-Make-hvc0-the-preferred-console-in-domU.patch, 1.1.2.1, NONE Message-ID: <200803051402.m25E24YA029879@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29803 Modified Files: Tag: private-markmc-pv-ops-branch Makefile Makefile.config config-xen-generic config-xen-x86_64 kernel.spec Added Files: Tag: private-markmc-pv-ops-branch linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch Removed Files: Tag: private-markmc-pv-ops-branch linux-2.6-xen-0002-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch linux-2.6-xen-0003-fbdev-Make-deferred-I-O-work-as-advertized.patch linux-2.6-xen-0004-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch linux-2.6-xen-0005-xen-Module-autoprobing-support-for-frontend-drivers.patch linux-2.6-xen-0006-xen-Add-compatibility-aliases-for-frontend-drivers.patch linux-2.6-xen-0007-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch linux-2.6-xen-0008-xen-dom0-Initialize-xenbus-for-dom0.patch linux-2.6-xen-0009-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch linux-2.6-xen-0010-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch linux-2.6-xen-0011-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch linux-2.6-xen-0012-xen-acpi-Enable-early-access-to-ACPI-tables.patch linux-2.6-xen-0013-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch linux-2.6-xen-0014-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch linux-2.6-xen-0015-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch linux-2.6-xen-0016-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch linux-2.6-xen-0017-xen-mtrr-set-cpu-in-cpu_callout_map.patch linux-2.6-xen-0018-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch linux-2.6-xen-0019-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch linux-2.6-xen-0020-xen-mtrr-Kill-some-unneccessary-includes.patch linux-2.6-xen-0021-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch linux-2.6-xen-0022-xen-mtrr-Use-generic_validate_add_page.patch linux-2.6-xen-0023-xen-mtrr-Implement-xen_get_free_region.patch linux-2.6-xen-0024-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch linux-2.6-xen-0025-irq2.diff-from-Juan-Quintela.patch linux-2.6-xen-0026-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch linux-2.6-xen-0027-xen-debug-Diagnose-bind_virq_to_irq-errors.patch linux-2.6-xen-0028-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch linux-2.6-xen-0029-xen-debug-Move-init_apic_mappings-after-trap-init.patch linux-2.6-xen-0030-xen-debug-Trace-progress-in-trap_init-around-init.patch linux-2.6-xen-0031-xen-apic-Disable-init_apic_mappings-when-under-CO.patch linux-2.6-xen-0032-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch linux-2.6-xen-0033-xen-debug-Log-bind_virq_to_irq-events.patch linux-2.6-xen-0034-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch linux-2.6-xen-0035-Remove-duplicated-dma_alloc-free_noncoherent-define.patch linux-2.6-xen-0036-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch linux-2.6-xen-0037-xen-dom0-add-virt_to_pfn-macro.patch linux-2.6-xen-0038-xen-dom0-use-virt_to_pfn-where-appropriate.patch linux-2.6-xen-0039-xen-dom0-Add-contiguous-region-support.patch linux-2.6-xen-0040-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch linux-2.6-xen-0041-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch linux-2.6-xen-0042-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch linux-2.6-xen-0043-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch linux-2.6-xen-0044-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch linux-2.6-xen-0045-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch linux-2.6-xen-0046-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch linux-2.6-xen-0047-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch linux-2.6-xen-0048-xen-dma-Add-xen_alloc-free_coherent.patch linux-2.6-xen-0049-xen-dma-Don-t-merge-bios-on-xen-pvops.patch linux-2.6-xen-0050-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch linux-2.6-xen-0051-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch linux-2.6-xen-0052-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch linux-2.6-xen-0053-xen-dom0-Reserve-ISA-address-space-earlier.patch linux-2.6-xen-0054-xen-Add-empty-xenctrl-module.patch linux-2.6-xen-0055-xen-dom0-Add-proc-xen-capabilities.patch linux-2.6-xen-0056-xen-Add-proc-xen-privcmd.patch linux-2.6-xen-0057-xen-dom0-Add-proc-xen-xsd_-port-kva.patch linux-2.6-xen-0058-xen-Add-proc-xen-xenbus.patch linux-2.6-xen-0059-xen-Add-dev-xen-evtchn.patch linux-2.6-xen-0060-xen-Add-__init-__exit-notations-to-xenctrl-function.patch linux-2.6-xen-0061-xen-Add-Xen-s-sys-hypervisor-interface.patch linux-2.6-xen-0062-xen-dom0-Add-basic-proc-xen-balloon.patch linux-2.6-xen-0063-xen-dom0-Re-work-privcmd_ioctl-a-little.patch linux-2.6-xen-0064-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch linux-2.6-xen-0065-xen-dom0-Add-a-vmlinuz-target.patch linux-2.6-xen-0066-xen-dom0-Don-t-use-fixmaps-for-ACPI-mappings-in-ISA.patch linux-2.6-xen-0067-x86-Do-not-scan-for-DMI-if-the-DMI-region-is-marked.patch linux-2.6-xen-0068-xen-dom0-Fix-DMI-scanning.patch linux-2.6-xen-0069-ata-scsi-Use-dma_alloc_coherent-for-ATAPI-drain-b.patch linux-2.6-xen-0070-xen-Make-hvc0-the-preferred-console-in-domU.patch Log Message: * Wed Mar 05 2008 Mark McLoughlin - Re-base to kernel-2_6_25-0_78_rc3_git1_fc9 - Revert the execshield patch for now - Include xen pv fb and kbd drivers - Add support for auto-probing frontend drivers - Add module aliases for xennet and xenblk - Add first round of x86_64 xen pv_ops patches linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch: --- NEW FILE linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch --- >From c1181dd0e4f28b0423877b66527c3d950b23855e Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 28 Feb 2008 23:16:49 +0000 Subject: [PATCH] x86/xen: Construct e820 map with a hole between 640K-1M. Prevents pagetables from being allocated in the 640K-1M and dmi_scan_machine() trying to remap them as read-write. Signed-off-by: Ian Campbell Signed-off-by: Mark McLoughlin --- arch/x86/xen/setup.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 3bad477..2341492 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -38,7 +38,8 @@ char * __init xen_memory_setup(void) unsigned long max_pfn = xen_start_info->nr_pages; e820.nr_map = 0; - add_memory_region(0, PFN_PHYS(max_pfn), E820_RAM); + add_memory_region(0, LOWMEMSIZE(), E820_RAM); + add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM); return "Xen"; } -- 1.5.4.1 linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch: --- NEW FILE linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch --- >From 633826fa85ea9487f1b1298c06255836e98be944 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 5 Mar 2008 12:50:50 +0000 Subject: [PATCH] squashfs: Fix build without CONFIG_SMP wait_event() needs various definitions from With CONFIG_SMP, pulls in , but without CONFIG_SMP it fails to build. Signed-off-by: Mark McLoughlin --- fs/squashfs/inode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c index f578528..f5829f2 100644 --- a/fs/squashfs/inode.c +++ b/fs/squashfs/inode.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "squashfs.h" -- 1.5.4.1 linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch: --- NEW FILE linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch --- >From e66d97b053a6fb83b28f7c61e1ecd3b990c4da2c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 29 Feb 2008 17:37:43 +0000 Subject: [PATCH] xen: Make hvc0 the preferred console in domU This makes the Xen console just work. Before, you had to ask for it on the kernel command line with console=hvc0 Signed-off-by: Markus Armbruster Signed-off-by: Mark McLoughlin --- arch/x86/xen/enlighten.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 49e5358..df63185 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -1209,6 +1210,9 @@ asmlinkage void __init xen_start_kernel(void) ? __pa(xen_start_info->mod_start) : 0; boot_params.hdr.ramdisk_size = xen_start_info->mod_len; + if (!is_initial_xendomain()) + add_preferred_console("hvc", 0, NULL); + /* Start the world */ start_kernel(); } -- 1.5.4.1 linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch: --- NEW FILE linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch --- >From 4245d02ba99d20815fff65a28aadf77d96e3f07a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 25 Feb 2008 14:02:24 +0100 Subject: [PATCH] xen: Make xen-blkfront write its protocol ABI to xenstore Frontends are expected to write their protocol ABI to xenstore. Since the protocol ABI defaults to the backend's native ABI, things work fine without that as long as the frontend's native ABI is identical to the backend's native ABI. This is not the case for xen-blkfront running 32-on-64, because its ABI differs between 32 and 64 bit, and thus needs this fix. Based on http://xenbits.xensource.com/xen-unstable.hg?rev/c545932a18f3 and http://xenbits.xensource.com/xen-unstable.hg?rev/ffe52263b430 by Gerd Hoffmann Signed-off-by: Markus Armbruster --- drivers/block/xen-blkfront.c | 7 +++++++ include/xen/interface/io/protocols.h | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) create mode 100644 include/xen/interface/io/protocols.h diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 9c6f3f9..2e7c81e 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -47,6 +47,7 @@ #include #include +#include #include @@ -614,6 +615,12 @@ again: message = "writing event-channel"; goto abort_transaction; } + err = xenbus_printf(xbt, dev->nodename, "protocol", "%s", + XEN_IO_PROTO_ABI_NATIVE); + if (err) { + message = "writing protocol"; + goto abort_transaction; + } err = xenbus_transaction_end(xbt, 0); if (err) { diff --git a/include/xen/interface/io/protocols.h b/include/xen/interface/io/protocols.h new file mode 100644 index 0000000..01fc8ae --- /dev/null +++ b/include/xen/interface/io/protocols.h @@ -0,0 +1,21 @@ +#ifndef __XEN_PROTOCOLS_H__ +#define __XEN_PROTOCOLS_H__ + +#define XEN_IO_PROTO_ABI_X86_32 "x86_32-abi" +#define XEN_IO_PROTO_ABI_X86_64 "x86_64-abi" +#define XEN_IO_PROTO_ABI_IA64 "ia64-abi" +#define XEN_IO_PROTO_ABI_POWERPC64 "powerpc64-abi" + +#if defined(__i386__) +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32 +#elif defined(__x86_64__) +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_64 +#elif defined(__ia64__) +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64 +#elif defined(__powerpc64__) +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64 +#else +# error arch fixup needed here +#endif + +#endif -- 1.5.4.1 linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch: --- NEW FILE linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch --- >From 7f5fb8b38e6c620b1906f5a4ae755e531112bf7a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 25 Feb 2008 14:03:52 +0100 Subject: [PATCH] fbdev: Make deferred I/O work as advertized Deferred I/O was utterly broken. Reading the mmap()ed framebuffer worked, but writing it made the VM endlessly invoke vm_ops.page_mkwrite(). That happened because we failed to set page->mapping and page->index. The fix is to set them, and clean up properly before the framebuffer gets released. Fix extracted from this linux-fbdev-devel message: Subject: [PATCH 1/1 2.6.24] fbdev: defio and Metronomefb From: Jaya Kumar Date: 2008-02-18 13:41:26 Signed-off-by: Jaya Kumar Signed-off-by: Markus Armbruster --- drivers/video/fb_defio.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index 0f8cfb9..24843fd 100644 --- a/drivers/video/fb_defio.c +++ b/drivers/video/fb_defio.c @@ -4,7 +4,7 @@ * Copyright (C) 2006 Jaya Kumar * * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive + * License. See the file COPYING in the main directory of this archive * for more details. */ @@ -31,7 +31,7 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma, unsigned long offset; struct page *page; struct fb_info *info = vma->vm_private_data; - /* info->screen_base is in System RAM */ + /* info->screen_base is virtual memory */ void *screen_base = (void __force *) info->screen_base; offset = vmf->pgoff << PAGE_SHIFT; @@ -43,6 +43,15 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma, return VM_FAULT_SIGBUS; get_page(page); + + if (vma->vm_file) + page->mapping = vma->vm_file->f_mapping; + else + printk(KERN_ERR "no mapping available\n"); + + BUG_ON(!page->mapping); + page->index = vmf->pgoff; + vmf->page = page; return 0; } @@ -138,11 +147,20 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_init); void fb_deferred_io_cleanup(struct fb_info *info) { + void *screen_base = (void __force *) info->screen_base; struct fb_deferred_io *fbdefio = info->fbdefio; + struct page *page; + int i; BUG_ON(!fbdefio); cancel_delayed_work(&info->deferred_work); flush_scheduled_work(); + + /* clear out the mapping that we setup */ + for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) { + page = vmalloc_to_page(screen_base + i); + page->mapping = NULL; + } } EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup); -- 1.5.4.1 linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch: --- NEW FILE linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch --- >From 655bf28ff2f6d480a52a01de187c9de01c18fc44 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 25 Feb 2008 14:06:46 +0100 Subject: [PATCH] xen pvfb: Para-virtual framebuffer, keyboard and pointer driver This is a pair of Xen para-virtual frontend device drivers: drivers/video/xen-fbfront.c provides a framebuffer, and drivers/input/xen-kbdfront provides keyboard and mouse. The backends run in dom0 user space. The two drivers are not in two separate patches, because the intermediate step (one driver, not the other) is somewhat problematic: the backend in dom0 needs both drivers, and will refuse to complete device initialization unless they're both present. Signed-off-by: Markus Armbruster --- drivers/input/Kconfig | 9 + drivers/input/Makefile | 2 + drivers/input/xen-kbdfront.c | 340 +++++++++++++++++++++++ drivers/video/Kconfig | 14 + drivers/video/Makefile | 1 + drivers/video/xen-fbfront.c | 550 ++++++++++++++++++++++++++++++++++++++ include/xen/interface/io/fbif.h | 124 +++++++++ include/xen/interface/io/kbdif.h | 114 ++++++++ 8 files changed, 1154 insertions(+), 0 deletions(-) create mode 100644 drivers/input/xen-kbdfront.c create mode 100644 drivers/video/xen-fbfront.c create mode 100644 include/xen/interface/io/fbif.h create mode 100644 include/xen/interface/io/kbdif.h diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index d84ac4a..747633c 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -149,6 +149,15 @@ config INPUT_APMPOWER To compile this driver as a module, choose M here: the module will be called apm-power. +config XEN_KBDDEV_FRONTEND + tristate "Xen virtual keyboard and mouse support" + depends on XEN_FBDEV_FRONTEND + default y + help + This driver implements the front-end of the Xen virtual + keyboard and mouse device driver. It communicates with a back-end + in another domain. + comment "Input Device Drivers" source "drivers/input/keyboard/Kconfig" diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 24bdec1..606e1b9 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -24,3 +24,5 @@ obj-$(CONFIG_INPUT_MISC) += misc/ obj-$(CONFIG_INPUT_LIRC) += lirc/ obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o + +obj-$(CONFIG_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c new file mode 100644 index 0000000..0f47f46 --- /dev/null +++ b/drivers/input/xen-kbdfront.c @@ -0,0 +1,340 @@ +/* + * Xen para-virtual input device + * + * Copyright (C) 2005 Anthony Liguori + * Copyright (C) 2006-2008 Red Hat, Inc., Markus Armbruster + * + * Based on linux/drivers/input/mouse/sermouse.c + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +/* + * TODO: + * + * Switch to grant tables together with xen-fbfront.c. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct xenkbd_info { + struct input_dev *kbd; + struct input_dev *ptr; + struct xenkbd_page *page; + int irq; + struct xenbus_device *xbdev; + char phys[32]; +}; + +static int xenkbd_remove(struct xenbus_device *); +static int xenkbd_connect_backend(struct xenbus_device *, struct xenkbd_info *); +static void xenkbd_disconnect_backend(struct xenkbd_info *); + +/* + * Note: if you need to send out events, see xenfb_do_update() for how + * to do that. + */ + +static irqreturn_t input_handler(int rq, void *dev_id) +{ + struct xenkbd_info *info = dev_id; + struct xenkbd_page *page = info->page; + __u32 cons, prod; + + prod = page->in_prod; + if (prod == page->in_cons) + return IRQ_HANDLED; + rmb(); /* ensure we see ring contents up to prod */ + for (cons = page->in_cons; cons != prod; cons++) { + union xenkbd_in_event *event; + struct input_dev *dev; + event = &XENKBD_IN_RING_REF(page, cons); + + dev = info->ptr; + switch (event->type) { + case XENKBD_TYPE_MOTION: + input_report_rel(dev, REL_X, event->motion.rel_x); + input_report_rel(dev, REL_Y, event->motion.rel_y); + break; + case XENKBD_TYPE_KEY: + dev = NULL; + if (test_bit(event->key.keycode, info->kbd->keybit)) + dev = info->kbd; + if (test_bit(event->key.keycode, info->ptr->keybit)) + dev = info->ptr; + if (dev) + input_report_key(dev, event->key.keycode, + event->key.pressed); + else + printk(KERN_WARNING + "xenkbd: unhandled keycode 0x%x\n", + event->key.keycode); + break; + case XENKBD_TYPE_POS: + input_report_abs(dev, ABS_X, event->pos.abs_x); + input_report_abs(dev, ABS_Y, event->pos.abs_y); + break; + } + if (dev) + input_sync(dev); + } + mb(); /* ensure we got ring contents */ + page->in_cons = cons; + notify_remote_via_irq(info->irq); + + return IRQ_HANDLED; +} + +static int __devinit xenkbd_probe(struct xenbus_device *dev, + const struct xenbus_device_id *id) +{ + int ret, i; + struct xenkbd_info *info; + struct input_dev *kbd, *ptr; + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (!info) { + xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure"); + return -ENOMEM; + } + dev->dev.driver_data = info; + info->xbdev = dev; + info->irq = -1; + snprintf(info->phys, sizeof(info->phys), "xenbus/%s", dev->nodename); + + info->page = (void *)__get_free_page(GFP_KERNEL | __GFP_ZERO); + if (!info->page) + goto error_nomem; + + /* keyboard */ + kbd = input_allocate_device(); + if (!kbd) + goto error_nomem; + kbd->name = "Xen Virtual Keyboard"; + kbd->phys = info->phys; + kbd->id.bustype = BUS_PCI; + kbd->id.vendor = 0x5853; + kbd->id.product = 0xffff; + kbd->evbit[0] = BIT(EV_KEY); + for (i = KEY_ESC; i < KEY_UNKNOWN; i++) + set_bit(i, kbd->keybit); + for (i = KEY_OK; i < KEY_MAX; i++) + set_bit(i, kbd->keybit); + + ret = input_register_device(kbd); + if (ret) { + input_free_device(kbd); + xenbus_dev_fatal(dev, ret, "input_register_device(kbd)"); + goto error; + } + info->kbd = kbd; + + /* pointing device */ + ptr = input_allocate_device(); + if (!ptr) + goto error_nomem; + ptr->name = "Xen Virtual Pointer"; + ptr->phys = info->phys; + ptr->id.bustype = BUS_PCI; + ptr->id.vendor = 0x5853; + ptr->id.product = 0xfffe; + ptr->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS); + for (i = BTN_LEFT; i <= BTN_TASK; i++) + set_bit(i, ptr->keybit); + ptr->relbit[0] = BIT(REL_X) | BIT(REL_Y); + input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0); + input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0); + + ret = input_register_device(ptr); + if (ret) { + input_free_device(ptr); + xenbus_dev_fatal(dev, ret, "input_register_device(ptr)"); + goto error; + } + info->ptr = ptr; + + ret = xenkbd_connect_backend(dev, info); + if (ret < 0) + goto error; + + return 0; + + error_nomem: + ret = -ENOMEM; + xenbus_dev_fatal(dev, ret, "allocating device memory"); + error: + xenkbd_remove(dev); + return ret; +} + +static int xenkbd_resume(struct xenbus_device *dev) +{ + struct xenkbd_info *info = dev->dev.driver_data; + + xenkbd_disconnect_backend(info); + memset(info->page, 0, PAGE_SIZE); + return xenkbd_connect_backend(dev, info); +} + +static int xenkbd_remove(struct xenbus_device *dev) +{ + struct xenkbd_info *info = dev->dev.driver_data; + + xenkbd_disconnect_backend(info); + if (info->kbd) + input_unregister_device(info->kbd); + if (info->ptr) + input_unregister_device(info->ptr); + free_page((unsigned long)info->page); + kfree(info); + return 0; +} + +static int xenkbd_connect_backend(struct xenbus_device *dev, + struct xenkbd_info *info) +{ + int ret, evtchn; + struct xenbus_transaction xbt; + + ret = xenbus_alloc_evtchn(dev, &evtchn); + if (ret) + return ret; + ret = bind_evtchn_to_irqhandler(evtchn, input_handler, + 0, dev->devicetype, info); + if (ret < 0) { + xenbus_free_evtchn(dev, evtchn); + xenbus_dev_fatal(dev, ret, "bind_evtchn_to_irqhandler"); + return ret; + } + info->irq = ret; + + again: + ret = xenbus_transaction_start(&xbt); + if (ret) { + xenbus_dev_fatal(dev, ret, "starting transaction"); + return ret; + } + ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu", + virt_to_mfn(info->page)); + if (ret) + goto error_xenbus; + ret = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", + evtchn); + if (ret) + goto error_xenbus; + ret = xenbus_transaction_end(xbt, 0); + if (ret) { + if (ret == -EAGAIN) + goto again; + xenbus_dev_fatal(dev, ret, "completing transaction"); + return ret; + } + + xenbus_switch_state(dev, XenbusStateInitialised); + return 0; + + error_xenbus: + xenbus_transaction_end(xbt, 1); + xenbus_dev_fatal(dev, ret, "writing xenstore"); + return ret; +} + +static void xenkbd_disconnect_backend(struct xenkbd_info *info) +{ + if (info->irq >= 0) + unbind_from_irqhandler(info->irq, info); + info->irq = -1; +} + +static void xenkbd_backend_changed(struct xenbus_device *dev, + enum xenbus_state backend_state) +{ + struct xenkbd_info *info = dev->dev.driver_data; + int ret, val; + + switch (backend_state) { + case XenbusStateInitialising: + case XenbusStateInitialised: + case XenbusStateUnknown: + case XenbusStateClosed: + break; + + case XenbusStateInitWait: +InitWait: + ret = xenbus_scanf(XBT_NIL, info->xbdev->otherend, + "feature-abs-pointer", "%d", &val); + if (ret < 0) + val = 0; + if (val) { + ret = xenbus_printf(XBT_NIL, info->xbdev->nodename, + "request-abs-pointer", "1"); + if (ret) + printk(KERN_WARNING + "xenkbd: can't request abs-pointer"); + } + xenbus_switch_state(dev, XenbusStateConnected); + break; + + case XenbusStateConnected: + /* + * Work around xenbus race condition: If backend goes + * through InitWait to Connected fast enough, we can + * get Connected twice here. + */ + if (dev->state != XenbusStateConnected) + goto InitWait; /* no InitWait seen yet, fudge it */ + break; + + case XenbusStateClosing: + xenbus_frontend_closed(dev); + break; + } +} + +static struct xenbus_device_id xenkbd_ids[] = { + { "vkbd" }, + { "" } +}; + +static struct xenbus_driver xenkbd = { + .name = "vkbd", + .owner = THIS_MODULE, + .ids = xenkbd_ids, + .probe = xenkbd_probe, + .remove = xenkbd_remove, + .resume = xenkbd_resume, + .otherend_changed = xenkbd_backend_changed, +}; + +static int __init xenkbd_init(void) +{ + if (!is_running_on_xen()) + return -ENODEV; + + /* Nothing to do if running in dom0. */ + if (is_initial_xendomain()) + return -ENODEV; + + return xenbus_register_frontend(&xenkbd); +} + +static void __exit xenkbd_cleanup(void) +{ + xenbus_unregister_driver(&xenkbd); +} + +module_init(xenkbd_init); +module_exit(xenkbd_cleanup); + +MODULE_LICENSE("GPL"); diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 758435f..67de177 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -1903,6 +1903,20 @@ config FB_VIRTUAL If unsure, say N. +config XEN_FBDEV_FRONTEND + tristate "Xen virtual frame buffer support" + depends on FB && XEN + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS + select FB_DEFERRED_IO + default y + help + This driver implements the front-end of the Xen virtual + frame buffer driver. It communicates with a back-end + in another domain. + source "drivers/video/omap/Kconfig" source "drivers/video/backlight/Kconfig" diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 83e02b3..d3ab9b2 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -113,6 +113,7 @@ obj-$(CONFIG_FB_PS3) += ps3fb.o obj-$(CONFIG_FB_SM501) += sm501fb.o obj-$(CONFIG_FB_XILINX) += xilinxfb.o obj-$(CONFIG_FB_OMAP) += omap/ +obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o # Platform or fallback drivers go here obj-$(CONFIG_FB_UVESA) += uvesafb.o diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c new file mode 100644 index 0000000..619a6f8 --- /dev/null +++ b/drivers/video/xen-fbfront.c @@ -0,0 +1,550 @@ +/* + * Xen para-virtual frame buffer device + * + * Copyright (C) 2005-2006 Anthony Liguori + * Copyright (C) 2006-2008 Red Hat, Inc., Markus Armbruster + * + * Based on linux/drivers/video/q40fb.c + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +/* + * TODO: + * + * Switch to grant tables when they become capable of dealing with the + * frame buffer. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct xenfb_info { + unsigned char *fb; + struct fb_info *fb_info; + int x1, y1, x2, y2; /* dirty rectangle, + protected by dirty_lock */ + spinlock_t dirty_lock; + int nr_pages; + int irq; + struct xenfb_page *page; + unsigned long *mfns; + int update_wanted; /* XENFB_TYPE_UPDATE wanted */ + + struct xenbus_device *xbdev; +}; + +static u32 xenfb_mem_len = XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH / 8; + +static int xenfb_remove(struct xenbus_device *); +static void xenfb_init_shared_page(struct xenfb_info *); +static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *); +static void xenfb_disconnect_backend(struct xenfb_info *); + +static void xenfb_do_update(struct xenfb_info *info, + int x, int y, int w, int h) +{ + union xenfb_out_event event; + u32 prod; + + event.type = XENFB_TYPE_UPDATE; + event.update.x = x; + event.update.y = y; + event.update.width = w; + event.update.height = h; + + prod = info->page->out_prod; + /* caller ensures !xenfb_queue_full() */ + mb(); /* ensure ring space available */ + XENFB_OUT_RING_REF(info->page, prod) = event; + wmb(); /* ensure ring contents visible */ + info->page->out_prod = prod + 1; + + notify_remote_via_irq(info->irq); +} + +static int xenfb_queue_full(struct xenfb_info *info) +{ + u32 cons, prod; + + prod = info->page->out_prod; + cons = info->page->out_cons; + return prod - cons == XENFB_OUT_RING_LEN; +} + +static void xenfb_refresh(struct xenfb_info *info, + int x1, int y1, int w, int h) +{ + unsigned long flags; + int y2 = y1 + h - 1; + int x2 = x1 + w - 1; + + if (!info->update_wanted) + return; + + spin_lock_irqsave(&info->dirty_lock, flags); + + /* Combine with dirty rectangle: */ + if (info->y1 < y1) + y1 = info->y1; + if (info->y2 > y2) + y2 = info->y2; + if (info->x1 < x1) + x1 = info->x1; + if (info->x2 > x2) + x2 = info->x2; + + if (xenfb_queue_full(info)) { + /* Can't send right now, stash it in the dirty rectangle */ + info->x1 = x1; + info->x2 = x2; + info->y1 = y1; + info->y2 = y2; + spin_unlock_irqrestore(&info->dirty_lock, flags); + return; + } + + /* Clear dirty rectangle: */ + info->x1 = info->y1 = INT_MAX; + info->x2 = info->y2 = 0; + + spin_unlock_irqrestore(&info->dirty_lock, flags); + + if (x1 <= x2 && y1 <= y2) + xenfb_do_update(info, x1, y1, x2 - x1 + 1, y2 - y1 + 1); +} + +static void xenfb_deferred_io(struct fb_info *fb_info, + struct list_head *pagelist) +{ + struct xenfb_info *info = fb_info->par; + struct page *page; + unsigned long beg, end; + int y1, y2, miny, maxy; + + miny = INT_MAX; + maxy = 0; + list_for_each_entry(page, pagelist, lru) { + beg = page->index << PAGE_SHIFT; + end = beg + PAGE_SIZE - 1; + y1 = beg / fb_info->fix.line_length; + y2 = end / fb_info->fix.line_length; + if (y2 >= fb_info->var.yres) + y2 = fb_info->var.yres - 1; + if (miny > y1) + miny = y1; + if (maxy < y2) + maxy = y2; + } + xenfb_refresh(info, 0, miny, fb_info->var.xres, maxy - miny + 1); +} + +static struct fb_deferred_io xenfb_defio = { + .delay = HZ / 20, + .deferred_io = xenfb_deferred_io, +}; + +static int xenfb_setcolreg(unsigned regno, unsigned red, unsigned green, + unsigned blue, unsigned transp, + struct fb_info *info) +{ + u32 v; + + if (regno > info->cmap.len) + return 1; + +#define CNVT_TOHW(val, width) ((((val)<<(width))+0x7FFF-(val))>>16) + red = CNVT_TOHW(red, info->var.red.length); + green = CNVT_TOHW(green, info->var.green.length); + blue = CNVT_TOHW(blue, info->var.blue.length); + transp = CNVT_TOHW(transp, info->var.transp.length); +#undef CNVT_TOHW + + v = (red << info->var.red.offset) | + (green << info->var.green.offset) | + (blue << info->var.blue.offset); + + switch (info->var.bits_per_pixel) { + case 16: + case 24: + case 32: + ((u32 *)info->pseudo_palette)[regno] = v; + break; + } + + return 0; +} + +static void xenfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) +{ + struct xenfb_info *info = p->par; + + sys_fillrect(p, rect); + xenfb_refresh(info, rect->dx, rect->dy, rect->width, rect->height); +} + +static void xenfb_imageblit(struct fb_info *p, const struct fb_image *image) +{ + struct xenfb_info *info = p->par; + + sys_imageblit(p, image); + xenfb_refresh(info, image->dx, image->dy, image->width, image->height); +} + +static void xenfb_copyarea(struct fb_info *p, const struct fb_copyarea *area) +{ + struct xenfb_info *info = p->par; + + sys_copyarea(p, area); + xenfb_refresh(info, area->dx, area->dy, area->width, area->height); +} + +static ssize_t xenfb_write(struct fb_info *p, const char __user *buf, + size_t count, loff_t *ppos) +{ + struct xenfb_info *info = p->par; + ssize_t res; + + res = fb_sys_write(p, buf, count, ppos); + xenfb_refresh(info, 0, 0, info->page->width, info->page->height); + return res; +} + +static struct fb_ops xenfb_fb_ops = { + .owner = THIS_MODULE, + .fb_read = fb_sys_read, + .fb_write = xenfb_write, + .fb_setcolreg = xenfb_setcolreg, + .fb_fillrect = xenfb_fillrect, + .fb_copyarea = xenfb_copyarea, + .fb_imageblit = xenfb_imageblit, +}; + +static irqreturn_t xenfb_event_handler(int rq, void *dev_id) +{ + /* + * No in events recognized, simply ignore them all. + * If you need to recognize some, see xen-kbdfront's + * input_handler() for how to do that. + */ + struct xenfb_info *info = dev_id; + struct xenfb_page *page = info->page; + + if (page->in_cons != page->in_prod) { + info->page->in_cons = info->page->in_prod; + notify_remote_via_irq(info->irq); + } + + /* Flush dirty rectangle: */ + xenfb_refresh(info, INT_MAX, INT_MAX, -INT_MAX, -INT_MAX); + + return IRQ_HANDLED; +} + +static int __devinit xenfb_probe(struct xenbus_device *dev, + const struct xenbus_device_id *id) +{ + struct xenfb_info *info; + struct fb_info *fb_info; + int ret; + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (info == NULL) { + xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure"); + return -ENOMEM; + } + dev->dev.driver_data = info; + info->xbdev = dev; + info->irq = -1; + info->x1 = info->y1 = INT_MAX; + spin_lock_init(&info->dirty_lock); + + info->fb = vmalloc(xenfb_mem_len); + if (info->fb == NULL) + goto error_nomem; + memset(info->fb, 0, xenfb_mem_len); + + info->nr_pages = (xenfb_mem_len + PAGE_SIZE - 1) >> PAGE_SHIFT; + + info->mfns = vmalloc(sizeof(unsigned long) * info->nr_pages); + if (!info->mfns) + goto error_nomem; + + /* set up shared page */ + info->page = (void *)__get_free_page(GFP_KERNEL | __GFP_ZERO); + if (!info->page) + goto error_nomem; + + xenfb_init_shared_page(info); + + /* abusing framebuffer_alloc() to allocate pseudo_palette */ + fb_info = framebuffer_alloc(sizeof(u32) * 256, NULL); + if (fb_info == NULL) + goto error_nomem; + + /* complete the abuse: */ + fb_info->pseudo_palette = fb_info->par; + fb_info->par = info; + + fb_info->screen_base = info->fb; + + fb_info->fbops = &xenfb_fb_ops; + fb_info->var.xres_virtual = fb_info->var.xres = info->page->width; + fb_info->var.yres_virtual = fb_info->var.yres = info->page->height; + fb_info->var.bits_per_pixel = info->page->depth; + + fb_info->var.red = (struct fb_bitfield){16, 8, 0}; + fb_info->var.green = (struct fb_bitfield){8, 8, 0}; + fb_info->var.blue = (struct fb_bitfield){0, 8, 0}; + + fb_info->var.activate = FB_ACTIVATE_NOW; + fb_info->var.height = -1; + fb_info->var.width = -1; + fb_info->var.vmode = FB_VMODE_NONINTERLACED; + + fb_info->fix.visual = FB_VISUAL_TRUECOLOR; + fb_info->fix.line_length = info->page->line_length; + fb_info->fix.smem_start = 0; + fb_info->fix.smem_len = xenfb_mem_len; + strcpy(fb_info->fix.id, "xen"); + fb_info->fix.type = FB_TYPE_PACKED_PIXELS; + fb_info->fix.accel = FB_ACCEL_NONE; + + fb_info->flags = FBINFO_FLAG_DEFAULT; + + ret = fb_alloc_cmap(&fb_info->cmap, 256, 0); + if (ret < 0) { + framebuffer_release(fb_info); + xenbus_dev_fatal(dev, ret, "fb_alloc_cmap"); + goto error; + } + + fb_info->fbdefio = &xenfb_defio; + fb_deferred_io_init(fb_info); + + ret = register_framebuffer(fb_info); + if (ret) { + fb_deferred_io_cleanup(fb_info); + fb_dealloc_cmap(&fb_info->cmap); + framebuffer_release(fb_info); + xenbus_dev_fatal(dev, ret, "register_framebuffer"); + goto error; + } + info->fb_info = fb_info; + + ret = xenfb_connect_backend(dev, info); + if (ret < 0) + goto error; + + return 0; + + error_nomem: + ret = -ENOMEM; + xenbus_dev_fatal(dev, ret, "allocating device memory"); + error: + xenfb_remove(dev); + return ret; +} + +static int xenfb_resume(struct xenbus_device *dev) +{ + struct xenfb_info *info = dev->dev.driver_data; + + xenfb_disconnect_backend(info); + xenfb_init_shared_page(info); + return xenfb_connect_backend(dev, info); +} + +static int xenfb_remove(struct xenbus_device *dev) +{ + struct xenfb_info *info = dev->dev.driver_data; + + xenfb_disconnect_backend(info); + if (info->fb_info) { + fb_deferred_io_cleanup(info->fb_info); + unregister_framebuffer(info->fb_info); + fb_dealloc_cmap(&info->fb_info->cmap); + framebuffer_release(info->fb_info); + } + free_page((unsigned long)info->page); + vfree(info->mfns); + vfree(info->fb); + kfree(info); + + return 0; +} + +static unsigned long vmalloc_to_mfn(void *address) +{ + return pfn_to_mfn(vmalloc_to_pfn(address)); +} + +static void xenfb_init_shared_page(struct xenfb_info *info) +{ + int i; + + for (i = 0; i < info->nr_pages; i++) + info->mfns[i] = vmalloc_to_mfn(info->fb + i * PAGE_SIZE); + + info->page->pd[0] = vmalloc_to_mfn(info->mfns); + info->page->pd[1] = 0; + info->page->width = XENFB_WIDTH; + info->page->height = XENFB_HEIGHT; + info->page->depth = XENFB_DEPTH; + info->page->line_length = (info->page->depth / 8) * info->page->width; + info->page->mem_length = xenfb_mem_len; + info->page->in_cons = info->page->in_prod = 0; + info->page->out_cons = info->page->out_prod = 0; +} + +static int xenfb_connect_backend(struct xenbus_device *dev, + struct xenfb_info *info) +{ + int ret, evtchn; + struct xenbus_transaction xbt; + + ret = xenbus_alloc_evtchn(dev, &evtchn); + if (ret) + return ret; + ret = bind_evtchn_to_irqhandler(evtchn, xenfb_event_handler, + 0, dev->devicetype, info); + if (ret < 0) { + xenbus_free_evtchn(dev, evtchn); + xenbus_dev_fatal(dev, ret, "bind_evtchn_to_irqhandler"); + return ret; + } + info->irq = ret; + + again: + ret = xenbus_transaction_start(&xbt); + if (ret) { + xenbus_dev_fatal(dev, ret, "starting transaction"); + return ret; + } + ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu", + virt_to_mfn(info->page)); + if (ret) + goto error_xenbus; + ret = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", + evtchn); + if (ret) + goto error_xenbus; + ret = xenbus_printf(xbt, dev->nodename, "protocol", "%s", + XEN_IO_PROTO_ABI_NATIVE); + if (ret) + goto error_xenbus; + ret = xenbus_printf(xbt, dev->nodename, "feature-update", "1"); + if (ret) + goto error_xenbus; + ret = xenbus_transaction_end(xbt, 0); + if (ret) { + if (ret == -EAGAIN) + goto again; + xenbus_dev_fatal(dev, ret, "completing transaction"); + return ret; + } + + xenbus_switch_state(dev, XenbusStateInitialised); + return 0; + + error_xenbus: + xenbus_transaction_end(xbt, 1); + xenbus_dev_fatal(dev, ret, "writing xenstore"); + return ret; +} + +static void xenfb_disconnect_backend(struct xenfb_info *info) +{ + if (info->irq >= 0) + unbind_from_irqhandler(info->irq, info); + info->irq = -1; +} + +static void xenfb_backend_changed(struct xenbus_device *dev, + enum xenbus_state backend_state) +{ + struct xenfb_info *info = dev->dev.driver_data; + int val; + + switch (backend_state) { + case XenbusStateInitialising: + case XenbusStateInitialised: + case XenbusStateUnknown: + case XenbusStateClosed: + break; + + case XenbusStateInitWait: +InitWait: + xenbus_switch_state(dev, XenbusStateConnected); + break; + + case XenbusStateConnected: + /* + * Work around xenbus race condition: If backend goes + * through InitWait to Connected fast enough, we can + * get Connected twice here. + */ + if (dev->state != XenbusStateConnected) + goto InitWait; /* no InitWait seen yet, fudge it */ + + if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, + "request-update", "%d", &val) < 0) + val = 0; + if (val) + info->update_wanted = 1; + break; + + case XenbusStateClosing: + xenbus_frontend_closed(dev); + break; + } +} + +static struct xenbus_device_id xenfb_ids[] = { + { "vfb" }, + { "" } +}; + +static struct xenbus_driver xenfb = { + .name = "vfb", + .owner = THIS_MODULE, + .ids = xenfb_ids, + .probe = xenfb_probe, + .remove = xenfb_remove, + .resume = xenfb_resume, + .otherend_changed = xenfb_backend_changed, +}; + +static int __init xenfb_init(void) +{ + if (!is_running_on_xen()) + return -ENODEV; + + /* Nothing to do if running in dom0. */ + if (is_initial_xendomain()) + return -ENODEV; + + return xenbus_register_frontend(&xenfb); +} + +static void __exit xenfb_cleanup(void) +{ + xenbus_unregister_driver(&xenfb); +} + +module_init(xenfb_init); +module_exit(xenfb_cleanup); + +MODULE_LICENSE("GPL"); diff --git a/include/xen/interface/io/fbif.h b/include/xen/interface/io/fbif.h new file mode 100644 index 0000000..5a934dd --- /dev/null +++ b/include/xen/interface/io/fbif.h @@ -0,0 +1,124 @@ +/* + * fbif.h -- Xen virtual frame buffer device + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (C) 2005 Anthony Liguori + * Copyright (C) 2006 Red Hat, Inc., Markus Armbruster + */ + +#ifndef __XEN_PUBLIC_IO_FBIF_H__ +#define __XEN_PUBLIC_IO_FBIF_H__ + +/* Out events (frontend -> backend) */ + +/* + * Out events may be sent only when requested by backend, and receipt + * of an unknown out event is an error. + */ + +/* Event type 1 currently not used */ +/* + * Framebuffer update notification event + * Capable frontend sets feature-update in xenstore. + * Backend requests it by setting request-update in xenstore. + */ +#define XENFB_TYPE_UPDATE 2 + +struct xenfb_update { + uint8_t type; /* XENFB_TYPE_UPDATE */ + int32_t x; /* source x */ + int32_t y; /* source y */ + int32_t width; /* rect width */ + int32_t height; /* rect height */ +}; + +#define XENFB_OUT_EVENT_SIZE 40 + +union xenfb_out_event { + uint8_t type; + struct xenfb_update update; + char pad[XENFB_OUT_EVENT_SIZE]; +}; + +/* In events (backend -> frontend) */ + +/* + * Frontends should ignore unknown in events. + * No in events currently defined. + */ + +#define XENFB_IN_EVENT_SIZE 40 + +union xenfb_in_event { + uint8_t type; + char pad[XENFB_IN_EVENT_SIZE]; +}; + +/* shared page */ + +#define XENFB_IN_RING_SIZE 1024 +#define XENFB_IN_RING_LEN (XENFB_IN_RING_SIZE / XENFB_IN_EVENT_SIZE) +#define XENFB_IN_RING_OFFS 1024 +#define XENFB_IN_RING(page) \ + ((union xenfb_in_event *)((char *)(page) + XENFB_IN_RING_OFFS)) +#define XENFB_IN_RING_REF(page, idx) \ + (XENFB_IN_RING((page))[(idx) % XENFB_IN_RING_LEN]) + +#define XENFB_OUT_RING_SIZE 2048 +#define XENFB_OUT_RING_LEN (XENFB_OUT_RING_SIZE / XENFB_OUT_EVENT_SIZE) +#define XENFB_OUT_RING_OFFS (XENFB_IN_RING_OFFS + XENFB_IN_RING_SIZE) +#define XENFB_OUT_RING(page) \ + ((union xenfb_out_event *)((char *)(page) + XENFB_OUT_RING_OFFS)) +#define XENFB_OUT_RING_REF(page, idx) \ + (XENFB_OUT_RING((page))[(idx) % XENFB_OUT_RING_LEN]) + +struct xenfb_page { + uint32_t in_cons, in_prod; + uint32_t out_cons, out_prod; + + int32_t width; /* width of the framebuffer (in pixels) */ + int32_t height; /* height of the framebuffer (in pixels) */ + uint32_t line_length; /* length of a row of pixels (in bytes) */ + uint32_t mem_length; /* length of the framebuffer (in bytes) */ + uint8_t depth; /* depth of a pixel (in bits) */ + + /* + * Framebuffer page directory + * + * Each directory page holds PAGE_SIZE / sizeof(*pd) + * framebuffer pages, and can thus map up to PAGE_SIZE * + * PAGE_SIZE / sizeof(*pd) bytes. With PAGE_SIZE == 4096 and + * sizeof(unsigned long) == 4, that's 4 Megs. Two directory + * pages should be enough for a while. + */ + unsigned long pd[2]; +}; + +/* + * Wart: xenkbd needs to know resolution. Put it here until a better + * solution is found, but don't leak it to the backend. + */ +#ifdef __KERNEL__ +#define XENFB_WIDTH 800 +#define XENFB_HEIGHT 600 +#define XENFB_DEPTH 32 +#endif + +#endif diff --git a/include/xen/interface/io/kbdif.h b/include/xen/interface/io/kbdif.h new file mode 100644 index 0000000..fb97f42 --- /dev/null +++ b/include/xen/interface/io/kbdif.h @@ -0,0 +1,114 @@ +/* + * kbdif.h -- Xen virtual keyboard/mouse + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (C) 2005 Anthony Liguori + * Copyright (C) 2006 Red Hat, Inc., Markus Armbruster + */ + +#ifndef __XEN_PUBLIC_IO_KBDIF_H__ +#define __XEN_PUBLIC_IO_KBDIF_H__ + +/* In events (backend -> frontend) */ + +/* + * Frontends should ignore unknown in events. + */ + +/* Pointer movement event */ +#define XENKBD_TYPE_MOTION 1 +/* Event type 2 currently not used */ +/* Key event (includes pointer buttons) */ +#define XENKBD_TYPE_KEY 3 +/* + * Pointer position event + * Capable backend sets feature-abs-pointer in xenstore. + * Frontend requests ot instead of XENKBD_TYPE_MOTION by setting + * request-abs-update in xenstore. + */ +#define XENKBD_TYPE_POS 4 + +struct xenkbd_motion { + uint8_t type; /* XENKBD_TYPE_MOTION */ + int32_t rel_x; /* relative X motion */ + int32_t rel_y; /* relative Y motion */ +}; + +struct xenkbd_key { + uint8_t type; /* XENKBD_TYPE_KEY */ + uint8_t pressed; /* 1 if pressed; 0 otherwise */ + uint32_t keycode; /* KEY_* from linux/input.h */ +}; + +struct xenkbd_position { + uint8_t type; /* XENKBD_TYPE_POS */ + int32_t abs_x; /* absolute X position (in FB pixels) */ + int32_t abs_y; /* absolute Y position (in FB pixels) */ +}; + +#define XENKBD_IN_EVENT_SIZE 40 + +union xenkbd_in_event { + uint8_t type; + struct xenkbd_motion motion; + struct xenkbd_key key; + struct xenkbd_position pos; + char pad[XENKBD_IN_EVENT_SIZE]; +}; + +/* Out events (frontend -> backend) */ + +/* + * Out events may be sent only when requested by backend, and receipt + * of an unknown out event is an error. + * No out events currently defined. + */ + +#define XENKBD_OUT_EVENT_SIZE 40 + +union xenkbd_out_event { + uint8_t type; + char pad[XENKBD_OUT_EVENT_SIZE]; +}; + +/* shared page */ + +#define XENKBD_IN_RING_SIZE 2048 +#define XENKBD_IN_RING_LEN (XENKBD_IN_RING_SIZE / XENKBD_IN_EVENT_SIZE) +#define XENKBD_IN_RING_OFFS 1024 +#define XENKBD_IN_RING(page) \ + ((union xenkbd_in_event *)((char *)(page) + XENKBD_IN_RING_OFFS)) +#define XENKBD_IN_RING_REF(page, idx) \ + (XENKBD_IN_RING((page))[(idx) % XENKBD_IN_RING_LEN]) + +#define XENKBD_OUT_RING_SIZE 1024 +#define XENKBD_OUT_RING_LEN (XENKBD_OUT_RING_SIZE / XENKBD_OUT_EVENT_SIZE) +#define XENKBD_OUT_RING_OFFS (XENKBD_IN_RING_OFFS + XENKBD_IN_RING_SIZE) +#define XENKBD_OUT_RING(page) \ + ((union xenkbd_out_event *)((char *)(page) + XENKBD_OUT_RING_OFFS)) +#define XENKBD_OUT_RING_REF(page, idx) \ + (XENKBD_OUT_RING((page))[(idx) % XENKBD_OUT_RING_LEN]) + +struct xenkbd_page { + uint32_t in_cons, in_prod; + uint32_t out_cons, out_prod; +}; + +#endif -- 1.5.4.1 linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch: --- NEW FILE linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch --- >From c6d9804064e6c203a6b66d906c264e63e5727e38 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 22 Feb 2008 12:42:52 +0000 Subject: [PATCH] xen: Module autoprobing support for frontend drivers Add module aliases to support autoprobing modules for xen frontend devices. Signed-off-by: Mark McLoughlin --- drivers/block/xen-blkfront.c | 1 + drivers/net/xen-netfront.c | 1 + drivers/xen/xenbus/xenbus_probe.c | 27 +++++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 2e7c81e..0c47c02 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1005,3 +1005,4 @@ module_exit(xlblk_exit); MODULE_DESCRIPTION("Xen virtual block device frontend"); MODULE_LICENSE("GPL"); MODULE_ALIAS_BLOCKDEV_MAJOR(XENVBD_MAJOR); +MODULE_ALIAS("xen:vbd"); diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 7483d45..b3fa27e 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1809,3 +1809,4 @@ module_exit(netif_exit); MODULE_DESCRIPTION("Xen virtual network device frontend"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("xen:vif"); diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 4750de3..336363c 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -88,6 +88,16 @@ int xenbus_match(struct device *_dev, struct device_driver *_drv) return match_device(drv->ids, to_xenbus_device(_dev)) != NULL; } +static int xenbus_uevent(struct device *_dev, struct kobj_uevent_env *env) +{ + struct xenbus_device *dev = to_xenbus_device(_dev); + + if (add_uevent_var(env, "MODALIAS=xen:%s", dev->devicetype)) + return -ENOMEM; + + return 0; +} + /* device// => - */ static int frontend_bus_id(char bus_id[BUS_ID_SIZE], const char *nodename) { @@ -166,6 +176,7 @@ static struct xen_bus_type xenbus_frontend = { .bus = { .name = "xen", .match = xenbus_match, + .uevent = xenbus_uevent, .probe = xenbus_dev_probe, .remove = xenbus_dev_remove, .shutdown = xenbus_dev_shutdown, @@ -438,6 +449,12 @@ static ssize_t xendev_show_devtype(struct device *dev, } DEVICE_ATTR(devtype, S_IRUSR | S_IRGRP | S_IROTH, xendev_show_devtype, NULL); +static ssize_t xendev_show_modalias(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "xen:%s\n", to_xenbus_device(dev)->devicetype); +} +DEVICE_ATTR(modalias, S_IRUSR | S_IRGRP | S_IROTH, xendev_show_modalias, NULL); int xenbus_probe_node(struct xen_bus_type *bus, const char *type, @@ -492,10 +509,16 @@ int xenbus_probe_node(struct xen_bus_type *bus, err = device_create_file(&xendev->dev, &dev_attr_devtype); if (err) - goto fail_remove_file; + goto fail_remove_nodename; + + err = device_create_file(&xendev->dev, &dev_attr_modalias); + if (err) + goto fail_remove_devtype; return 0; -fail_remove_file: +fail_remove_devtype: + device_remove_file(&xendev->dev, &dev_attr_devtype); +fail_remove_nodename: device_remove_file(&xendev->dev, &dev_attr_nodename); fail_unregister: device_unregister(&xendev->dev); -- 1.5.4.1 linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch: --- NEW FILE linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch --- >From 4f83bc3295a85cc1451393dfff9a3db4520a58cf Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 21 Feb 2008 11:13:12 +0000 Subject: [PATCH] xen: Add compatibility aliases for frontend drivers Before getting merged, xen-blkfront was xenblk and xen-netfront was xennet. Add compatibility module aliases to ease upgrades. Signed-off-by: Mark McLoughlin --- drivers/block/xen-blkfront.c | 1 + drivers/net/xen-netfront.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 0c47c02..8ce168d 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1006,3 +1006,4 @@ MODULE_DESCRIPTION("Xen virtual block device frontend"); MODULE_LICENSE("GPL"); MODULE_ALIAS_BLOCKDEV_MAJOR(XENVBD_MAJOR); MODULE_ALIAS("xen:vbd"); +MODULE_ALIAS("xenblk"); diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index b3fa27e..e62018a 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1810,3 +1810,4 @@ module_exit(netif_exit); MODULE_DESCRIPTION("Xen virtual network device frontend"); MODULE_LICENSE("GPL"); MODULE_ALIAS("xen:vif"); +MODULE_ALIAS("xennet"); -- 1.5.4.1 linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch: --- NEW FILE linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch --- >From a552ba0377ead54568ec4f7946546ece97159d66 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 19 Feb 2008 15:34:32 +0000 Subject: [PATCH] xen dom0: Add a vmlinuz target Although patches are in progress to allow Xen boot a DomU using a bzImage, support for booting a Dom0 using a bzImage is still a ways off. For now, just add a target to build a gzip-ed ELF file which Xen can use to boot Dom0. Signed-off-by: Mark McLoughlin --- arch/x86/Makefile | 9 +++++++++ arch/x86/boot/.gitignore | 1 + arch/x86/boot/Makefile | 9 +++++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index f1e739a..14a752e 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -206,6 +206,15 @@ boot := arch/x86/boot PHONY += zImage bzImage compressed zlilo bzlilo \ zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install +ifdef CONFIG_XEN +PHONY += vmlinuz +all: vmlinuz + +vmlinuz: KBUILD_IMAGE := $(boot)/vmlinuz +vmlinuz: vmlinux + $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) +endif + # Default kernel to build all: bzImage diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore index b1bdc4c..35e7956 100644 --- a/arch/x86/boot/.gitignore +++ b/arch/x86/boot/.gitignore @@ -5,3 +5,4 @@ setup.bin setup.elf cpustr.h mkcpustr +vmlinuz diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index f88458e..61bba92 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -26,6 +26,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA #RAMDISK := -DRAMDISK=512 targets := vmlinux.bin setup.bin setup.elf zImage bzImage +targets += vmlinuz vmlinux-stripped subdir- := compressed setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o @@ -105,6 +106,14 @@ $(obj)/setup.bin: $(obj)/setup.elf FORCE $(obj)/compressed/vmlinux: FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@ +$(obj)/vmlinuz: $(obj)/vmlinux-stripped FORCE + $(call if_changed,gzip) + @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' + +$(obj)/vmlinux-stripped: OBJCOPYFLAGS := -g --strip-unneeded +$(obj)/vmlinux-stripped: vmlinux FORCE + $(call if_changed,objcopy) + # Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel FDARGS = # Set this if you want an initrd included with the zdisk/fdimage/isoimage kernel -- 1.5.4.1 linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch: --- NEW FILE linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch --- >From f322926f33a4a0f10713f7ae3cdc47815c5a5062 Mon Sep 17 00:00:00 2001 From: Stephen Tweedie Date: Wed, 21 Nov 2007 18:40:31 +0000 Subject: [PATCH] xen debug: Add xprintk to log directly via hypercall For early debugging, it is useful to have a way of doing debugging output direct to the hypervisor without having to rely on console being fully initialised. Signed-off-by: Stephen Tweedie --- arch/x86/xen/enlighten.c | 32 ++++++++++++++++++++++++++++++++ include/xen/hvc-console.h | 1 + 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index df63185..44629d4 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -142,6 +143,37 @@ static void __init xen_banner(void) printk(KERN_INFO "Hypervisor signature: %s\n", xen_start_info->magic); } +static void kcons_write_dom0(const char *s, unsigned int count) +{ + int rc; + + while ((count > 0) && + ((rc = HYPERVISOR_console_io( + CONSOLEIO_write, count, (char *)s)) > 0)) { + count -= rc; + s += rc; + } +} + + +/*** Useful function for console debugging -- goes straight to Xen. ***/ +asmlinkage int xprintk(const char *fmt, ...) +{ + va_list args; + int printk_len; + static char printk_buf[1024]; + + /* Emit the output into the temporary buffer */ + va_start(args, fmt); + printk_len = vsnprintf(printk_buf, sizeof(printk_buf), fmt, args); + va_end(args); + + /* Send the processed output directly to Xen. */ + kcons_write_dom0(printk_buf, printk_len); + + return 0; +} + static void xen_cpuid(unsigned int *ax, unsigned int *bx, unsigned int *cx, unsigned int *dx) { diff --git a/include/xen/hvc-console.h b/include/xen/hvc-console.h index 21c0ecf..cb7a3c9 100644 --- a/include/xen/hvc-console.h +++ b/include/xen/hvc-console.h @@ -2,5 +2,6 @@ #define XEN_HVC_CONSOLE_H extern struct console xenboot_console; +extern asmlinkage int xprintk(const char *fmt, ...); #endif /* XEN_HVC_CONSOLE_H */ -- 1.5.4.1 linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch: --- NEW FILE linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch --- >From aadd2db42c85ad8796b9304164d67a7a492f7fd7 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 4 Mar 2008 17:59:50 +0000 Subject: [PATCH] xen x86_64: Initial x86_64 support for Xen paravirt_ops Signed-off-by: Eduardo Habkost Signed-off-by: Mark McLoughlin --- arch/x86/Kconfig | 3 +- arch/x86/kernel/acpi/boot.c | 4 +- arch/x86/kernel/apic_32.c | 4 +- arch/x86/kernel/apic_64.c | 2 +- arch/x86/kernel/asm-offsets_64.c | 15 + arch/x86/kernel/early_printk.c | 5 +- arch/x86/kernel/efi_64.c | 4 +- arch/x86/kernel/entry_32.S | 83 +----- arch/x86/kernel/entry_64.S | 72 ++++- arch/x86/kernel/genapic_64.c | 12 + arch/x86/kernel/head64.c | 4 + arch/x86/kernel/head_64.S | 23 ++ arch/x86/kernel/hpet.c | 4 +- arch/x86/kernel/io_apic_64.c | 2 +- arch/x86/kernel/irq_64.c | 5 + arch/x86/kernel/mpparse_32.c | 4 +- arch/x86/kernel/mpparse_64.c | 4 +- arch/x86/kernel/paravirt.c | 3 + arch/x86/kernel/process_64.c | 9 + arch/x86/kernel/setup64.c | 5 + arch/x86/kernel/setup_64.c | 41 +++- arch/x86/kernel/smpboot_64.c | 4 +- arch/x86/kernel/vsyscall_64.c | 31 ++- arch/x86/mach-visws/traps.c | 10 +- arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 558 ++++++++++++++++++++++++++++++++-- arch/x86/mm/ioremap.c | 4 +- arch/x86/mm/pgtable_32.c | 25 ++- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/vdso/vdso32-setup.c | 6 +- arch/x86/xen/Kconfig | 1 - arch/x86/xen/Makefile | 6 + arch/x86/xen/enlighten.c | 268 +++++++++++----- arch/x86/xen/entry.S | 5 + arch/x86/xen/entry_32.S | 81 +++++ arch/x86/xen/entry_64.S | 68 ++++ arch/x86/xen/events.c | 13 +- arch/x86/xen/genapic.c | 190 ++++++++++++ arch/x86/xen/init.h | 20 ++ arch/x86/xen/init_32.c | 3 + arch/x86/xen/init_64.c | 181 +++++++++++ arch/x86/xen/mmu.c | 407 ++++++++++++++++++------- arch/x86/xen/mmu.h | 46 ++-- arch/x86/xen/multicalls.c | 9 +- arch/x86/xen/setup.c | 22 ++ arch/x86/xen/smp.c | 16 + arch/x86/xen/xen-asm.S | 219 +++----------- arch/x86/xen/xen-asm_32.S | 184 +++++++++++ arch/x86/xen/xen-asm_64.S | 75 +++++ arch/x86/xen/xen-head.S | 21 +- arch/x86/xen/xen-ops.h | 11 + drivers/acpi/thermal.c | 5 + drivers/char/hvc_xen.c | 6 + drivers/ieee1394/init_ohci1394_dma.c | 2 +- drivers/serial/8250_early.c | 2 +- include/asm-x86/asm-hack.h | 27 ++ include/asm-x86/cmpxchg_64.h | 36 +++ include/asm-x86/desc_defs.h | 4 + include/asm-x86/fixmap_32.h | 22 +- include/asm-x86/fixmap_64.h | 31 ++- include/asm-x86/mmu_context_64.h | 6 +- include/asm-x86/page_64.h | 2 +- include/asm-x86/paravirt.h | 46 ++- include/asm-x86/percpu.h | 32 ++ include/asm-x86/pgalloc_64.h | 69 ++++- include/asm-x86/pgtable.h | 15 +- include/asm-x86/pgtable_64.h | 3 +- include/asm-x86/proto.h | 1 + include/asm-x86/smp_64.h | 3 + include/asm-x86/system.h | 3 +- include/asm-x86/xen/hypercall.h | 205 ++++++++++--- include/asm-x86/xen/hypervisor.h | 3 - include/asm-x86/xen/interface.h | 35 ++- include/linux/dmi.h | 1 + include/linux/elfnote.h | 2 +- include/xen/events.h | 2 + include/xen/interface/elfnote.h | 16 + include/xen/page.h | 34 ++- init/main.c | 10 + mm/slab.c | 8 +- 80 files changed, 2759 insertions(+), 668 deletions(-) create mode 100644 arch/x86/xen/entry.S create mode 100644 arch/x86/xen/entry_32.S create mode 100644 arch/x86/xen/entry_64.S create mode 100644 arch/x86/xen/genapic.c create mode 100644 arch/x86/xen/init.h create mode 100644 arch/x86/xen/init_32.c create mode 100644 arch/x86/xen/init_64.c create mode 100644 arch/x86/xen/xen-asm_32.S create mode 100644 arch/x86/xen/xen-asm_64.S create mode 100644 include/asm-x86/asm-hack.h diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4a88cf7..1f0d4ae 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -91,7 +91,7 @@ config ARCH_MAY_HAVE_PC_FDC def_bool y config DMI - def_bool y + def_bool !XEN config RWSEM_GENERIC_SPINLOCK def_bool !X86_XADD @@ -329,6 +329,7 @@ config X86_RDC321X config X86_VSMP bool "Support for ScaleMP vSMP" + depends on !XEN depends on X86_64 && PCI help Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 2cdc9de..cfc79ac 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -141,7 +141,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) offset = phys & (PAGE_SIZE - 1); mapped_size = PAGE_SIZE - offset; - set_fixmap(FIX_ACPI_END, phys); + set_fixmap_ma(FIX_ACPI_END, phys); base = fix_to_virt(FIX_ACPI_END); /* @@ -152,7 +152,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) if (--idx < FIX_ACPI_BEGIN) return NULL; /* cannot handle this */ phys += PAGE_SIZE; - set_fixmap(idx, phys); + set_fixmap_ma(idx, phys); mapped_size += PAGE_SIZE; } diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 35a568e..40fc1b3 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -1138,7 +1138,7 @@ void __init init_apic_mappings(void) } else apic_phys = mp_lapic_addr; - set_fixmap_nocache(FIX_APIC_BASE, apic_phys); + set_fixmap_ma_nocache(FIX_APIC_BASE, apic_phys); printk(KERN_DEBUG "mapped APIC to %08lx (%08lx)\n", APIC_BASE, apic_phys); @@ -1172,7 +1172,7 @@ fake_ioapic_page: alloc_bootmem_pages(PAGE_SIZE); ioapic_phys = __pa(ioapic_phys); } - set_fixmap_nocache(idx, ioapic_phys); + set_fixmap_ma_nocache(idx, ioapic_phys); printk(KERN_DEBUG "mapped IOAPIC to %08lx (%08lx)\n", __fix_to_virt(idx), ioapic_phys); idx++; diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index d8d03e0..a611520 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -877,7 +877,7 @@ void __init init_apic_mappings(void) } else apic_phys = mp_lapic_addr; - set_fixmap_nocache(FIX_APIC_BASE, apic_phys); + set_fixmap_ma_nocache(FIX_APIC_BASE, apic_phys); apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", APIC_BASE, apic_phys); diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index 494e1e0..d0fabfd 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -25,6 +25,8 @@ #define OFFSET(sym, str, mem) \ DEFINE(sym, offsetof(struct str, mem)) +#include + #define __NO_STUBS 1 #undef __SYSCALL #undef _ASM_X86_64_UNISTD_H_ @@ -92,6 +94,13 @@ int main(void) offsetof (struct rt_sigframe32, uc.uc_mcontext)); BLANK(); #endif + +#ifdef CONFIG_XEN + BLANK(); + OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); [...5539 lines suppressed...] -#define ELFNOTE(name, type, desc) \ +#define ELFNOTE(name, type, desc...) \ ELFNOTE_START(name, type, "") \ desc ; \ ELFNOTE_END diff --git a/include/xen/events.h b/include/xen/events.h index 2bde54d..c18d2bf 100644 --- a/include/xen/events.h +++ b/include/xen/events.h @@ -3,6 +3,8 @@ #include +#include +#include #include #include diff --git a/include/xen/interface/elfnote.h b/include/xen/interface/elfnote.h index a64d3df..ee5501d 100644 --- a/include/xen/interface/elfnote.h +++ b/include/xen/interface/elfnote.h @@ -120,6 +120,22 @@ */ #define XEN_ELFNOTE_BSD_SYMTAB 11 +/* + * The lowest address the hypervisor hole can begin at (numeric). + * + * This must not be set higher than HYPERVISOR_VIRT_START. Its presence + * also indicates to the hypervisor that the kernel can deal with the + * hole starting at a higher address. + */ +#define XEN_ELFNOTE_HV_START_LOW 12 + +/* + * List of maddr_t-sized mask/value pairs describing how to recognize + * (non-present) L1 page table entries carrying valid MFNs (numeric). + */ +#define XEN_ELFNOTE_L1_MFN_VALID 13 + + #endif /* __XEN_PUBLIC_ELFNOTE_H__ */ /* diff --git a/include/xen/page.h b/include/xen/page.h index 031ef22..158fb60 100644 --- a/include/xen/page.h +++ b/include/xen/page.h @@ -8,6 +8,10 @@ #include +#include + +#include + #ifdef CONFIG_X86_PAE /* Xen machine address */ typedef struct xmaddr { @@ -70,6 +74,8 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) #endif pfn = 0; + //xprintk("mfn_to_pfn(%lx):\n", mfn); + /* * The array access can fail (e.g., device space beyond end of RAM). * In such cases it doesn't matter what we return (we return garbage), @@ -77,6 +83,7 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) */ __get_user(pfn, &machine_to_phys_mapping[mfn]); + //xprintk("mfn_to_pfn(%lx) = %lx\n", mfn, pfn); return pfn; } @@ -143,34 +150,29 @@ static inline void set_phys_to_machine(unsigned long pfn, unsigned long mfn) static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot) { - pte_t pte; - - pte.pte_high = (page_nr >> (32 - PAGE_SHIFT)) | - (pgprot_val(pgprot) >> 32); - pte.pte_high &= (__supported_pte_mask >> 32); - pte.pte_low = ((page_nr << PAGE_SHIFT) | pgprot_val(pgprot)); - pte.pte_low &= __supported_pte_mask; - - return pte; + pteval_t val; + + val = (page_nr << PAGE_SHIFT) | pgprot_val(pgprot); + val &= __supported_pte_mask; + return native_make_pte(val); } -static inline unsigned long long pte_val_ma(pte_t x) +static inline pteval_t pte_val_ma(pte_t x) { - return x.pte; + return native_pte_val(x); } -#define pmd_val_ma(v) ((v).pmd) -#define pud_val_ma(v) ((v).pgd.pgd) -#define __pte_ma(x) ((pte_t) { .pte = (x) }) +#define __pte_ma(x) (native_make_pte(x)) #define __pmd_ma(x) ((pmd_t) { (x) } ) #else /* !X86_PAE */ -#define pte_mfn(_pte) ((_pte).pte_low >> PAGE_SHIFT) +#define pte_mfn(_pte) ((native_pte_val(_pte) & __PHYSICAL_MASK) >> PAGE_SHIFT) #define mfn_pte(pfn, prot) __pte_ma(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) #define pte_val_ma(x) ((x).pte) -#define pmd_val_ma(v) ((v).pud.pgd.pgd) #define __pte_ma(x) ((pte_t) { (x) } ) #endif /* CONFIG_X86_PAE */ #define pgd_val_ma(x) ((x).pgd) +#define pmd_val_ma(x) (native_pmd_val((x))) +#define pud_val_ma(x) (native_pud_val((x))) xmaddr_t arbitrary_virt_to_machine(unsigned long address); diff --git a/init/main.c b/init/main.c index 384bc45..2661b20 100644 --- a/init/main.c +++ b/init/main.c @@ -590,17 +590,25 @@ asmlinkage void __init start_kernel(void) rcu_init(); init_IRQ(); pidhash_init(); + printk("init_timers:\n"); init_timers(); hrtimers_init(); softirq_init(); + printk("timekeeping:\n"); timekeeping_init(); + printk("time:\n"); time_init(); + printk("profile:\n"); profile_init(); + printk("irqs_disabled:\n"); if (!irqs_disabled()) printk("start_kernel(): bug: interrupts were enabled early\n"); + printk("early_boot_irqs_on:\n"); early_boot_irqs_on(); + printk("local_irq_enable:\n"); local_irq_enable(); + printk("console_init:\n"); /* * HACK ALERT! This is early. We're enabling the console before * we've done PCI setups etc, and console_init() must be aware of @@ -637,7 +645,9 @@ asmlinkage void __init start_kernel(void) numa_policy_init(); if (late_time_init) late_time_init(); + printk("calibrate_delay:\n"); calibrate_delay(); + printk("pidmap_init:\n"); pidmap_init(); pgtable_cache_init(); prio_tree_init(); diff --git a/mm/slab.c b/mm/slab.c index e499669..c18daa3 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3202,6 +3202,8 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags) STATS_INC_ALLOCHIT(cachep); ac->touched = 1; objp = ac->entry[--ac->avail]; + if (!objp) + printk("really weird: avail objp for cache %s is null\n", cachep->name); } else { STATS_INC_ALLOCMISS(cachep); objp = cache_alloc_refill(cachep, flags); @@ -3464,8 +3466,10 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller) unsigned long save_flags; void *objp; - if (should_failslab(cachep, flags)) + if (should_failslab(cachep, flags)) { + printk("cache %s should fail\n", cachep->name); return NULL; + } cache_alloc_debugcheck_before(cachep, flags); local_irq_save(save_flags); @@ -3477,6 +3481,8 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller) if (unlikely((flags & __GFP_ZERO) && objp)) memset(objp, 0, obj_size(cachep)); + if (!objp) + printk("allocation from cache %s failed!!!\n", cachep->name); return objp; } -- 1.5.4.1 Index: config-xen-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-generic,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -u -r1.2.4.2 -r1.2.4.3 --- config-xen-generic 21 Feb 2008 13:36:23 -0000 1.2.4.2 +++ config-xen-generic 5 Mar 2008 14:01:21 -0000 1.2.4.3 @@ -1,6 +1,5 @@ CONFIG_XEN=y CONFIG_HVC_XEN=y -CONFIG_XENCTRL=y CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_NETDEV_FRONTEND=m Index: config-xen-x86_64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-x86_64,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -u -r1.2.4.1 -r1.2.4.2 --- config-xen-x86_64 18 Feb 2008 16:55:16 -0000 1.2.4.1 +++ config-xen-x86_64 5 Mar 2008 14:01:21 -0000 1.2.4.2 @@ -0,0 +1,4 @@ +CONFIG_PARAVIRT_GUEST=y +# CONFIG_SMP is not set +# CONFIG_NUMA is not set +# CONFIG_NEED_MULTIPLE_NODES is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.11.2.12 retrieving revision 1.11.2.13 diff -u -r1.11.2.12 -r1.11.2.13 --- kernel.spec 3 Mar 2008 11:58:02 -0000 1.11.2.12 +++ kernel.spec 5 Mar 2008 14:01:21 -0000 1.11.2.13 @@ -233,8 +233,8 @@ %define with_pae 0 %endif -# xen only builds on i686 -%ifnarch i686 +# xen only builds on i686 and x86_64 +%ifnarch i686 x86_64 %define with_xen 0 %endif @@ -457,7 +457,7 @@ Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD -ExclusiveArch: noarch i686 +ExclusiveArch: noarch i686 x86_64 ExclusiveOS: Linux %kernel_reqprovconf @@ -664,77 +664,17 @@ # kernel-xen patches start Patch5000: linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch-from-kernel-2_6_25.patch -Patch5001: linux-2.6-xen-0002-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch -Patch5002: linux-2.6-xen-0003-fbdev-Make-deferred-I-O-work-as-advertized.patch -Patch5003: linux-2.6-xen-0004-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch -Patch5004: linux-2.6-xen-0005-xen-Module-autoprobing-support-for-frontend-drivers.patch -Patch5005: linux-2.6-xen-0006-xen-Add-compatibility-aliases-for-frontend-drivers.patch -Patch5006: linux-2.6-xen-0007-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch -Patch5007: linux-2.6-xen-0008-xen-dom0-Initialize-xenbus-for-dom0.patch -Patch5008: linux-2.6-xen-0009-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch -Patch5009: linux-2.6-xen-0010-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch -Patch5010: linux-2.6-xen-0011-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch -Patch5011: linux-2.6-xen-0012-xen-acpi-Enable-early-access-to-ACPI-tables.patch -Patch5012: linux-2.6-xen-0013-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch -Patch5013: linux-2.6-xen-0014-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch -Patch5014: linux-2.6-xen-0015-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch -Patch5015: linux-2.6-xen-0016-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch -Patch5016: linux-2.6-xen-0017-xen-mtrr-set-cpu-in-cpu_callout_map.patch -Patch5017: linux-2.6-xen-0018-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch -Patch5018: linux-2.6-xen-0019-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch -Patch5019: linux-2.6-xen-0020-xen-mtrr-Kill-some-unneccessary-includes.patch -Patch5020: linux-2.6-xen-0021-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch -Patch5021: linux-2.6-xen-0022-xen-mtrr-Use-generic_validate_add_page.patch -Patch5022: linux-2.6-xen-0023-xen-mtrr-Implement-xen_get_free_region.patch -Patch5023: linux-2.6-xen-0024-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch -Patch5024: linux-2.6-xen-0025-irq2.diff-from-Juan-Quintela.patch -Patch5025: linux-2.6-xen-0026-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch -Patch5026: linux-2.6-xen-0027-xen-debug-Diagnose-bind_virq_to_irq-errors.patch -Patch5027: linux-2.6-xen-0028-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch -Patch5028: linux-2.6-xen-0029-xen-debug-Move-init_apic_mappings-after-trap-init.patch -Patch5029: linux-2.6-xen-0030-xen-debug-Trace-progress-in-trap_init-around-init.patch -Patch5030: linux-2.6-xen-0031-xen-apic-Disable-init_apic_mappings-when-under-CO.patch -Patch5031: linux-2.6-xen-0032-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch -Patch5032: linux-2.6-xen-0033-xen-debug-Log-bind_virq_to_irq-events.patch -Patch5033: linux-2.6-xen-0034-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch -Patch5034: linux-2.6-xen-0035-Remove-duplicated-dma_alloc-free_noncoherent-define.patch -Patch5035: linux-2.6-xen-0036-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch -Patch5036: linux-2.6-xen-0037-xen-dom0-add-virt_to_pfn-macro.patch -Patch5037: linux-2.6-xen-0038-xen-dom0-use-virt_to_pfn-where-appropriate.patch -Patch5038: linux-2.6-xen-0039-xen-dom0-Add-contiguous-region-support.patch -Patch5039: linux-2.6-xen-0040-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch -Patch5040: linux-2.6-xen-0041-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch -Patch5041: linux-2.6-xen-0042-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch -Patch5042: linux-2.6-xen-0043-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch -Patch5043: linux-2.6-xen-0044-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch -Patch5044: linux-2.6-xen-0045-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch -Patch5045: linux-2.6-xen-0046-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch -Patch5046: linux-2.6-xen-0047-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch -Patch5047: linux-2.6-xen-0048-xen-dma-Add-xen_alloc-free_coherent.patch -Patch5048: linux-2.6-xen-0049-xen-dma-Don-t-merge-bios-on-xen-pvops.patch -Patch5049: linux-2.6-xen-0050-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch -Patch5050: linux-2.6-xen-0051-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch -Patch5051: linux-2.6-xen-0052-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch -Patch5052: linux-2.6-xen-0053-xen-dom0-Reserve-ISA-address-space-earlier.patch -Patch5053: linux-2.6-xen-0054-xen-Add-empty-xenctrl-module.patch -Patch5054: linux-2.6-xen-0055-xen-dom0-Add-proc-xen-capabilities.patch -Patch5055: linux-2.6-xen-0056-xen-Add-proc-xen-privcmd.patch -Patch5056: linux-2.6-xen-0057-xen-dom0-Add-proc-xen-xsd_-port-kva.patch -Patch5057: linux-2.6-xen-0058-xen-Add-proc-xen-xenbus.patch -Patch5058: linux-2.6-xen-0059-xen-Add-dev-xen-evtchn.patch -Patch5059: linux-2.6-xen-0060-xen-Add-__init-__exit-notations-to-xenctrl-function.patch -Patch5060: linux-2.6-xen-0061-xen-Add-Xen-s-sys-hypervisor-interface.patch -Patch5061: linux-2.6-xen-0062-xen-dom0-Add-basic-proc-xen-balloon.patch -Patch5062: linux-2.6-xen-0063-xen-dom0-Re-work-privcmd_ioctl-a-little.patch -Patch5063: linux-2.6-xen-0064-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch -Patch5064: linux-2.6-xen-0065-xen-dom0-Add-a-vmlinuz-target.patch -Patch5065: linux-2.6-xen-0066-xen-dom0-Don-t-use-fixmaps-for-ACPI-mappings-in-ISA.patch -Patch5066: linux-2.6-xen-0067-x86-Do-not-scan-for-DMI-if-the-DMI-region-is-marked.patch -Patch5067: linux-2.6-xen-0068-xen-dom0-Fix-DMI-scanning.patch -Patch5068: linux-2.6-xen-0069-ata-scsi-Use-dma_alloc_coherent-for-ATAPI-drain-b.patch -Patch5069: linux-2.6-xen-0070-xen-Make-hvc0-the-preferred-console-in-domU.patch - - +Patch5001: linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch +Patch5002: linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch +Patch5003: linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch +Patch5004: linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch +Patch5005: linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch +Patch5006: linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch +Patch5007: linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch +Patch5008: linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch +Patch5009: linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch +Patch5010: linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch +Patch5011: linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch # kernel-xen patches end # Xen hypervisor patches (20000+) @@ -1272,77 +1212,19 @@ # kernel-xen apply start ApplyPatch linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch-from-kernel-2_6_25.patch -ApplyPatch linux-2.6-xen-0002-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch -ApplyPatch linux-2.6-xen-0003-fbdev-Make-deferred-I-O-work-as-advertized.patch -ApplyPatch linux-2.6-xen-0004-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch -ApplyPatch linux-2.6-xen-0005-xen-Module-autoprobing-support-for-frontend-drivers.patch -ApplyPatch linux-2.6-xen-0006-xen-Add-compatibility-aliases-for-frontend-drivers.patch -ApplyPatch linux-2.6-xen-0007-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch -ApplyPatch linux-2.6-xen-0008-xen-dom0-Initialize-xenbus-for-dom0.patch -ApplyPatch linux-2.6-xen-0009-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch -ApplyPatch linux-2.6-xen-0010-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch -ApplyPatch linux-2.6-xen-0011-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch -ApplyPatch linux-2.6-xen-0012-xen-acpi-Enable-early-access-to-ACPI-tables.patch -ApplyPatch linux-2.6-xen-0013-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch -ApplyPatch linux-2.6-xen-0014-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch -ApplyPatch linux-2.6-xen-0015-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch -ApplyPatch linux-2.6-xen-0016-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch -ApplyPatch linux-2.6-xen-0017-xen-mtrr-set-cpu-in-cpu_callout_map.patch -ApplyPatch linux-2.6-xen-0018-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch -ApplyPatch linux-2.6-xen-0019-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch -ApplyPatch linux-2.6-xen-0020-xen-mtrr-Kill-some-unneccessary-includes.patch -ApplyPatch linux-2.6-xen-0021-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch -ApplyPatch linux-2.6-xen-0022-xen-mtrr-Use-generic_validate_add_page.patch -ApplyPatch linux-2.6-xen-0023-xen-mtrr-Implement-xen_get_free_region.patch -ApplyPatch linux-2.6-xen-0024-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch -ApplyPatch linux-2.6-xen-0025-irq2.diff-from-Juan-Quintela.patch -ApplyPatch linux-2.6-xen-0026-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch -ApplyPatch linux-2.6-xen-0027-xen-debug-Diagnose-bind_virq_to_irq-errors.patch -ApplyPatch linux-2.6-xen-0028-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch -ApplyPatch linux-2.6-xen-0029-xen-debug-Move-init_apic_mappings-after-trap-init.patch -ApplyPatch linux-2.6-xen-0030-xen-debug-Trace-progress-in-trap_init-around-init.patch -ApplyPatch linux-2.6-xen-0031-xen-apic-Disable-init_apic_mappings-when-under-CO.patch -ApplyPatch linux-2.6-xen-0032-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch -ApplyPatch linux-2.6-xen-0033-xen-debug-Log-bind_virq_to_irq-events.patch -ApplyPatch linux-2.6-xen-0034-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch -ApplyPatch linux-2.6-xen-0035-Remove-duplicated-dma_alloc-free_noncoherent-define.patch -ApplyPatch linux-2.6-xen-0036-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch -ApplyPatch linux-2.6-xen-0037-xen-dom0-add-virt_to_pfn-macro.patch -ApplyPatch linux-2.6-xen-0038-xen-dom0-use-virt_to_pfn-where-appropriate.patch -ApplyPatch linux-2.6-xen-0039-xen-dom0-Add-contiguous-region-support.patch -ApplyPatch linux-2.6-xen-0040-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch -ApplyPatch linux-2.6-xen-0041-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch -ApplyPatch linux-2.6-xen-0042-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch -ApplyPatch linux-2.6-xen-0043-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch -ApplyPatch linux-2.6-xen-0044-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch -ApplyPatch linux-2.6-xen-0045-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch -ApplyPatch linux-2.6-xen-0046-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch -ApplyPatch linux-2.6-xen-0047-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch -ApplyPatch linux-2.6-xen-0048-xen-dma-Add-xen_alloc-free_coherent.patch -ApplyPatch linux-2.6-xen-0049-xen-dma-Don-t-merge-bios-on-xen-pvops.patch -ApplyPatch linux-2.6-xen-0050-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch -ApplyPatch linux-2.6-xen-0051-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch -ApplyPatch linux-2.6-xen-0052-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch -ApplyPatch linux-2.6-xen-0053-xen-dom0-Reserve-ISA-address-space-earlier.patch -ApplyPatch linux-2.6-xen-0054-xen-Add-empty-xenctrl-module.patch -ApplyPatch linux-2.6-xen-0055-xen-dom0-Add-proc-xen-capabilities.patch -ApplyPatch linux-2.6-xen-0056-xen-Add-proc-xen-privcmd.patch -ApplyPatch linux-2.6-xen-0057-xen-dom0-Add-proc-xen-xsd_-port-kva.patch -ApplyPatch linux-2.6-xen-0058-xen-Add-proc-xen-xenbus.patch -ApplyPatch linux-2.6-xen-0059-xen-Add-dev-xen-evtchn.patch -ApplyPatch linux-2.6-xen-0060-xen-Add-__init-__exit-notations-to-xenctrl-function.patch -ApplyPatch linux-2.6-xen-0061-xen-Add-Xen-s-sys-hypervisor-interface.patch -ApplyPatch linux-2.6-xen-0062-xen-dom0-Add-basic-proc-xen-balloon.patch -ApplyPatch linux-2.6-xen-0063-xen-dom0-Re-work-privcmd_ioctl-a-little.patch -ApplyPatch linux-2.6-xen-0064-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch -ApplyPatch linux-2.6-xen-0065-xen-dom0-Add-a-vmlinuz-target.patch -ApplyPatch linux-2.6-xen-0066-xen-dom0-Don-t-use-fixmaps-for-ACPI-mappings-in-ISA.patch -ApplyPatch linux-2.6-xen-0067-x86-Do-not-scan-for-DMI-if-the-DMI-region-is-marked.patch -ApplyPatch linux-2.6-xen-0068-xen-dom0-Fix-DMI-scanning.patch -ApplyPatch linux-2.6-xen-0069-ata-scsi-Use-dma_alloc_coherent-for-ATAPI-drain-b.patch -ApplyPatch linux-2.6-xen-0070-xen-Make-hvc0-the-preferred-console-in-domU.patch - - +ApplyPatch linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch +ApplyPatch linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch +ApplyPatch linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch +ApplyPatch linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch +ApplyPatch linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch +ApplyPatch linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch +ApplyPatch linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch +ApplyPatch linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch +ApplyPatch linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch +ApplyPatch linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch +%ifarch x86_64 +ApplyPatch linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch +%endif # kernel-xen apply end # END OF PATCH APPLICATIONS @@ -1942,23 +1824,13 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog -* Fri Feb 29 2008 Mark McLoughlin +* Wed Mar 05 2008 Mark McLoughlin - Re-base to kernel-2_6_25-0_78_rc3_git1_fc9 - -* Fri Feb 22 2008 Mark McLoughlin -- Add support for auto-probing frontend drivers - -* Thu Feb 21 2008 Mark McLoughlin +- Revert the execshield patch for now - Include xen pv fb and kbd drivers +- Add support for auto-probing frontend drivers - Add module aliases for xennet and xenblk - -* Wed Feb 20 2008 Mark McLoughlin -- Revert the execshield patch for now -- Add a couple of contiguous region fixes - -* Mon Feb 18 2008 Mark McLoughlin -- Re-base to kernel-2_6_24-23_fc9 -- Add first round of dom0 pv_ops patches +- Add first round of x86_64 xen pv_ops patches * Fri Feb 15 2008 Mark McLoughlin - Add e1000e driver (bug #360691) --- linux-2.6-xen-0002-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch DELETED --- --- linux-2.6-xen-0003-fbdev-Make-deferred-I-O-work-as-advertized.patch DELETED --- --- linux-2.6-xen-0004-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch DELETED --- --- linux-2.6-xen-0005-xen-Module-autoprobing-support-for-frontend-drivers.patch DELETED --- --- linux-2.6-xen-0006-xen-Add-compatibility-aliases-for-frontend-drivers.patch DELETED --- --- linux-2.6-xen-0007-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch DELETED --- --- linux-2.6-xen-0008-xen-dom0-Initialize-xenbus-for-dom0.patch DELETED --- --- linux-2.6-xen-0009-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch DELETED --- --- linux-2.6-xen-0010-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch DELETED --- --- linux-2.6-xen-0011-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch DELETED --- --- linux-2.6-xen-0012-xen-acpi-Enable-early-access-to-ACPI-tables.patch DELETED --- --- linux-2.6-xen-0013-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch DELETED --- --- linux-2.6-xen-0014-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch DELETED --- --- linux-2.6-xen-0015-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch DELETED --- --- linux-2.6-xen-0016-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch DELETED --- --- linux-2.6-xen-0017-xen-mtrr-set-cpu-in-cpu_callout_map.patch DELETED --- --- linux-2.6-xen-0018-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch DELETED --- --- linux-2.6-xen-0019-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch DELETED --- --- linux-2.6-xen-0020-xen-mtrr-Kill-some-unneccessary-includes.patch DELETED --- --- linux-2.6-xen-0021-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch DELETED --- --- linux-2.6-xen-0022-xen-mtrr-Use-generic_validate_add_page.patch DELETED --- --- linux-2.6-xen-0023-xen-mtrr-Implement-xen_get_free_region.patch DELETED --- --- linux-2.6-xen-0024-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch DELETED --- --- linux-2.6-xen-0025-irq2.diff-from-Juan-Quintela.patch DELETED --- --- linux-2.6-xen-0026-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch DELETED --- --- linux-2.6-xen-0027-xen-debug-Diagnose-bind_virq_to_irq-errors.patch DELETED --- --- linux-2.6-xen-0028-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch DELETED --- --- linux-2.6-xen-0029-xen-debug-Move-init_apic_mappings-after-trap-init.patch DELETED --- --- linux-2.6-xen-0030-xen-debug-Trace-progress-in-trap_init-around-init.patch DELETED --- --- linux-2.6-xen-0031-xen-apic-Disable-init_apic_mappings-when-under-CO.patch DELETED --- --- linux-2.6-xen-0032-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch DELETED --- --- linux-2.6-xen-0033-xen-debug-Log-bind_virq_to_irq-events.patch DELETED --- --- linux-2.6-xen-0034-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch DELETED --- --- linux-2.6-xen-0035-Remove-duplicated-dma_alloc-free_noncoherent-define.patch DELETED --- --- linux-2.6-xen-0036-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch DELETED --- --- linux-2.6-xen-0037-xen-dom0-add-virt_to_pfn-macro.patch DELETED --- --- linux-2.6-xen-0038-xen-dom0-use-virt_to_pfn-where-appropriate.patch DELETED --- --- linux-2.6-xen-0039-xen-dom0-Add-contiguous-region-support.patch DELETED --- --- linux-2.6-xen-0040-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch DELETED --- --- linux-2.6-xen-0041-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch DELETED --- --- linux-2.6-xen-0042-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch DELETED --- --- linux-2.6-xen-0043-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch DELETED --- --- linux-2.6-xen-0044-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch DELETED --- --- linux-2.6-xen-0045-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch DELETED --- --- linux-2.6-xen-0046-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch DELETED --- --- linux-2.6-xen-0047-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch DELETED --- --- linux-2.6-xen-0048-xen-dma-Add-xen_alloc-free_coherent.patch DELETED --- --- linux-2.6-xen-0049-xen-dma-Don-t-merge-bios-on-xen-pvops.patch DELETED --- --- linux-2.6-xen-0050-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch DELETED --- --- linux-2.6-xen-0051-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch DELETED --- --- linux-2.6-xen-0052-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch DELETED --- --- linux-2.6-xen-0053-xen-dom0-Reserve-ISA-address-space-earlier.patch DELETED --- --- linux-2.6-xen-0054-xen-Add-empty-xenctrl-module.patch DELETED --- --- linux-2.6-xen-0055-xen-dom0-Add-proc-xen-capabilities.patch DELETED --- --- linux-2.6-xen-0056-xen-Add-proc-xen-privcmd.patch DELETED --- --- linux-2.6-xen-0057-xen-dom0-Add-proc-xen-xsd_-port-kva.patch DELETED --- --- linux-2.6-xen-0058-xen-Add-proc-xen-xenbus.patch DELETED --- --- linux-2.6-xen-0059-xen-Add-dev-xen-evtchn.patch DELETED --- --- linux-2.6-xen-0060-xen-Add-__init-__exit-notations-to-xenctrl-function.patch DELETED --- --- linux-2.6-xen-0061-xen-Add-Xen-s-sys-hypervisor-interface.patch DELETED --- --- linux-2.6-xen-0062-xen-dom0-Add-basic-proc-xen-balloon.patch DELETED --- --- linux-2.6-xen-0063-xen-dom0-Re-work-privcmd_ioctl-a-little.patch DELETED --- --- linux-2.6-xen-0064-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch DELETED --- --- linux-2.6-xen-0065-xen-dom0-Add-a-vmlinuz-target.patch DELETED --- --- linux-2.6-xen-0066-xen-dom0-Don-t-use-fixmaps-for-ACPI-mappings-in-ISA.patch DELETED --- --- linux-2.6-xen-0067-x86-Do-not-scan-for-DMI-if-the-DMI-region-is-marked.patch DELETED --- --- linux-2.6-xen-0068-xen-dom0-Fix-DMI-scanning.patch DELETED --- --- linux-2.6-xen-0069-ata-scsi-Use-dma_alloc_coherent-for-ATAPI-drain-b.patch DELETED --- --- linux-2.6-xen-0070-xen-Make-hvc0-the-preferred-console-in-domU.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 5 14:29:46 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 5 Mar 2008 14:29:46 GMT Subject: rpms/hunspell-sv/devel hunspell-sv.spec,1.5,1.6 sources,1.4,1.5 Message-ID: <200803051429.m25ETkKO030275@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-sv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30243 Modified Files: hunspell-sv.spec sources Log Message: latest version Index: hunspell-sv.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sv/devel/hunspell-sv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hunspell-sv.spec 3 Aug 2007 09:56:24 -0000 1.5 +++ hunspell-sv.spec 5 Mar 2008 14:29:08 -0000 1.6 @@ -1,7 +1,7 @@ Name: hunspell-sv Summary: Swedish hunspell dictionaries -Version: 1.22 -Release: 2%{?dist} +Version: 1.23 +Release: 1%{?dist} Source: http://hem.bredband.net/dsso1/sv_SE.zip Group: Applications/Text URL: http://dsso.se/ @@ -42,6 +42,9 @@ %{_datadir}/myspell/* %changelog +* Wed Mar 05 2008 Caolan McNamara - 1.23-1 +- latest version + * Fri Aug 03 2007 Caolan McNamara - 1.22-2 - clarify license version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sv/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Jul 2007 16:51:39 -0000 1.4 +++ sources 5 Mar 2008 14:29:08 -0000 1.5 @@ -1 +1 @@ -520bca9b1eb5a68a58bfaedecb905646 sv_SE.zip +e951a9d4a55d137fb821bf007ee63105 sv_SE.zip From fedora-extras-commits at redhat.com Wed Mar 5 14:42:31 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Wed, 5 Mar 2008 14:42:31 GMT Subject: rpms/kernel/devel patch-2.6.25-rc3-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.773, 1.774 kernel.spec, 1.475, 1.476 sources, 1.733, 1.734 upstream, 1.655, 1.656 patch-2.6.25-rc3-git5.bz2.sign, 1.1, NONE Message-ID: <200803051442.m25EgVeB030593@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30560 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.25-rc3-git6.bz2.sign Removed Files: patch-2.6.25-rc3-git5.bz2.sign Log Message: * Wed Mar 05 2008 Kyle McMartin - Linux 2.6.25-rc3-git6 --- NEW FILE patch-2.6.25-rc3-git6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBHzZysyGugalF9Dw4RAq6UAJ93GTZRBwg7FKOEm5x98Qrs5j7lTgCfdatu jVd22VEC7tFTAt4WvaPIkns= =mTJs -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.773 retrieving revision 1.774 diff -u -r1.773 -r1.774 --- .cvsignore 4 Mar 2008 15:19:02 -0000 1.773 +++ .cvsignore 5 Mar 2008 14:41:55 -0000 1.774 @@ -6,3 +6,4 @@ linux-2.6.24.tar.bz2 patch-2.6.25-rc3.bz2 patch-2.6.25-rc3-git5.bz2 +patch-2.6.25-rc3-git6.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.475 retrieving revision 1.476 diff -u -r1.475 -r1.476 --- kernel.spec 5 Mar 2008 13:39:49 -0000 1.475 +++ kernel.spec 5 Mar 2008 14:41:55 -0000 1.476 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 3 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1754,6 +1754,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Wed Mar 05 2008 Kyle McMartin +- Linux 2.6.25-rc3-git6 + * Wed Mar 05 2008 David Woodhouse - Add modalias in sysfs for vio devices (#431045) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.733 retrieving revision 1.734 diff -u -r1.733 -r1.734 --- sources 4 Mar 2008 15:19:02 -0000 1.733 +++ sources 5 Mar 2008 14:41:55 -0000 1.734 @@ -1,3 +1,3 @@ 3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2 01b1f6c7b35ba356129c121a81a77991 patch-2.6.25-rc3.bz2 -502371869de4621e3b5c7c3027539032 patch-2.6.25-rc3-git5.bz2 +ed013b8ac33b75031a9312248c53aa6f patch-2.6.25-rc3-git6.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.655 retrieving revision 1.656 diff -u -r1.655 -r1.656 --- upstream 4 Mar 2008 15:19:02 -0000 1.655 +++ upstream 5 Mar 2008 14:41:55 -0000 1.656 @@ -1,3 +1,3 @@ linux-2.6.24.tar.bz2 patch-2.6.25-rc3.bz2 -patch-2.6.25-rc3-git5.bz2 +patch-2.6.25-rc3-git6.bz2 --- patch-2.6.25-rc3-git5.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Wed Mar 5 14:47:39 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 5 Mar 2008 14:47:39 GMT Subject: rpms/kernel/devel linux-2.6-vio-modalias.patch,1.1,1.2 Message-ID: <200803051447.m25Eldgg030694@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30673 Modified Files: linux-2.6-vio-modalias.patch Log Message: add newline to vio modalias linux-2.6-vio-modalias.patch: Index: linux-2.6-vio-modalias.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-vio-modalias.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-vio-modalias.patch 5 Mar 2008 13:39:49 -0000 1.1 +++ linux-2.6-vio-modalias.patch 5 Mar 2008 14:47:33 -0000 1.2 @@ -20,7 +20,7 @@ + if (!cp) + return -ENODEV; + -+ return sprintf(buf, "vio:T%sS%s", vio_dev->type, cp); ++ return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp); +} + static struct device_attribute vio_dev_attrs[] = { From fedora-extras-commits at redhat.com Wed Mar 5 14:56:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 14:56:24 GMT Subject: rpms/perl-aliased/devel perl-aliased.spec,1.3,1.4 Message-ID: <200803051456.m25EuO0n030860@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-aliased/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30802 Modified Files: perl-aliased.spec Log Message: new perl Index: perl-aliased.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-aliased/devel/perl-aliased.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-aliased.spec 30 Mar 2007 15:58:44 -0000 1.3 +++ perl-aliased.spec 5 Mar 2008 14:55:50 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-aliased Version: 0.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Use shorter versions of class names -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/aliased/ Source0: http://www.cpan.org/authors/id/O/OV/OVID/aliased-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.21-2 +- rebuild for new perl + * Fri Mar 30 2007 Chris Weyl 0.21-1 - update to 0.21 From fedora-extras-commits at redhat.com Wed Mar 5 14:57:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 14:57:28 GMT Subject: rpms/perl-Declare-Constraints-Simple/devel perl-Declare-Constraints-Simple.spec, 1.2, 1.3 Message-ID: <200803051457.m25EvSq9030947@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Declare-Constraints-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30915 Modified Files: perl-Declare-Constraints-Simple.spec Log Message: new perl Index: perl-Declare-Constraints-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Declare-Constraints-Simple/devel/perl-Declare-Constraints-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Declare-Constraints-Simple.spec 4 May 2007 15:02:12 -0000 1.2 +++ perl-Declare-Constraints-Simple.spec 5 Mar 2008 14:56:48 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Declare-Constraints-Simple Version: 0.03 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Declarative Validation of Data Structures -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Declare-Constraints-Simple/ Source0: http://www.cpan.org/authors/id/P/PH/PHAYLON/Declare-Constraints-Simple-%{version}.tar.gz @@ -67,6 +67,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.03-3 +- rebuild for new perl + * Fri May 04 2007 Chris Weyl 0.03-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 14:58:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 14:58:36 GMT Subject: rpms/perl-Test-LongString/devel perl-Test-LongString.spec,1.9,1.10 Message-ID: <200803051458.m25EwaBY031070@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-LongString/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31013 Modified Files: perl-Test-LongString.spec Log Message: new perl Index: perl-Test-LongString.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-LongString/devel/perl-Test-LongString.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Test-LongString.spec 5 Sep 2007 23:38:21 -0000 1.9 +++ perl-Test-LongString.spec 5 Mar 2008 14:57:53 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Test-LongString Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module to test long strings License: GPL+ or Artistic Group: Development/Libraries @@ -57,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.11-3 +- rebuild for new perl + * Thu Sep 06 2007 Ralf Cors??pius - 0.11-2 - BR: perl(ExtUtils::MakeMaker). - Update license tag. From fedora-extras-commits at redhat.com Wed Mar 5 15:00:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:00:05 GMT Subject: rpms/perl-CSS-Squish/devel perl-CSS-Squish.spec,1.1,1.2 Message-ID: <200803051500.m25F05B1031173@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CSS-Squish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31140 Modified Files: perl-CSS-Squish.spec Log Message: new perl Index: perl-CSS-Squish.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CSS-Squish/devel/perl-CSS-Squish.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-CSS-Squish.spec 2 Feb 2008 02:43:04 -0000 1.1 +++ perl-CSS-Squish.spec 5 Mar 2008 14:59:29 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-CSS-Squish Version: 0.07 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compact many CSS files into one big file License: GPL+ or Artistic Group: Development/Libraries @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.07-2 +- rebuild for new perl + * Thu Jan 31 2008 Ralf Cors??pius 0.07-1 - Manually tweak spec. - Specfile autogenerated by cpanspec 1.74. From fedora-extras-commits at redhat.com Wed Mar 5 15:01:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:01:14 GMT Subject: rpms/perl-Moose/devel perl-Moose.spec,1.18,1.19 Message-ID: <200803051501.m25F1EoR005905@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Moose/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31223 Modified Files: perl-Moose.spec Log Message: new perl Index: perl-Moose.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Moose/devel/perl-Moose.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Moose.spec 7 Jan 2008 16:40:12 -0000 1.18 +++ perl-Moose.spec 5 Mar 2008 15:00:40 -0000 1.19 @@ -1,6 +1,6 @@ Name: perl-Moose Version: 0.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Complete modern object system for Perl 5 License: GPL+ or Artistic Group: Development/Libraries @@ -111,6 +111,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.33-3 +- rebuild for new perl + * Mon Jan 07 2008 Chris Weyl 0.33-2 - remove *.orig files from t/ (BZ#427754) From fedora-extras-commits at redhat.com Wed Mar 5 15:01:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:01:59 GMT Subject: rpms/perl-Moose-Policy/devel perl-Moose-Policy.spec,1.3,1.4 Message-ID: <200803051501.m25F1xwx006012@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Moose-Policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5984 Modified Files: perl-Moose-Policy.spec Log Message: new perl Index: perl-Moose-Policy.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Moose-Policy/devel/perl-Moose-Policy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Moose-Policy.spec 16 Apr 2007 15:55:08 -0000 1.3 +++ perl-Moose-Policy.spec 5 Mar 2008 15:01:21 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-Moose-Policy Version: 0.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Police your project/company-wide Moose policies -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Moose-Policy/ Source0: http://www.cpan.org/authors/id/S/ST/STEVAN/Moose-Policy-%{version}.tar.gz @@ -60,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.03-2 +- rebuild for new perl + * Mon Apr 16 2007 Chris Weyl 0.03-1 - update to 0.03 From fedora-extras-commits at redhat.com Wed Mar 5 15:03:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:03:19 GMT Subject: rpms/perl-MooseX-AttributeHelpers/devel perl-MooseX-AttributeHelpers.spec, 1.4, 1.5 Message-ID: <200803051503.m25F3JRK006092@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MooseX-AttributeHelpers/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6070 Modified Files: perl-MooseX-AttributeHelpers.spec Log Message: new perl Index: perl-MooseX-AttributeHelpers.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MooseX-AttributeHelpers/devel/perl-MooseX-AttributeHelpers.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-MooseX-AttributeHelpers.spec 6 Jan 2008 05:08:14 -0000 1.4 +++ perl-MooseX-AttributeHelpers.spec 5 Mar 2008 15:02:45 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-MooseX-AttributeHelpers Version: 0.07 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extended Moose attribute interfaces License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.07-2 +- rebuild for new perl + * Sat Jan 05 2008 Chris Weyl 0.07-1 - update to 0.07 From fedora-extras-commits at redhat.com Wed Mar 5 15:05:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:05:02 GMT Subject: rpms/perl-MooseX-Getopt/devel perl-MooseX-Getopt.spec,1.3,1.4 Message-ID: <200803051505.m25F520p006215@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MooseX-Getopt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6176 Modified Files: perl-MooseX-Getopt.spec Log Message: new perl Index: perl-MooseX-Getopt.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MooseX-Getopt/devel/perl-MooseX-Getopt.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-MooseX-Getopt.spec 11 Aug 2007 01:35:10 -0000 1.3 +++ perl-MooseX-Getopt.spec 5 Mar 2008 15:04:28 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-MooseX-Getopt Version: 0.05 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Moose role for processing command line options License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.05-2 +- rebuild for new perl + * Fri Aug 10 2007 Chris Weyl 0.05-1 - update to 0.05 - license tag: GPL -> GPL+ From fedora-extras-commits at redhat.com Wed Mar 5 15:05:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:05:55 GMT Subject: rpms/perl-MooseX-Object-Pluggable/devel perl-MooseX-Object-Pluggable.spec, 1.3, 1.4 Message-ID: <200803051505.m25F5txv006292@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MooseX-Object-Pluggable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6260 Modified Files: perl-MooseX-Object-Pluggable.spec Log Message: new perl Index: perl-MooseX-Object-Pluggable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MooseX-Object-Pluggable/devel/perl-MooseX-Object-Pluggable.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-MooseX-Object-Pluggable.spec 19 Apr 2007 15:51:41 -0000 1.3 +++ perl-MooseX-Object-Pluggable.spec 5 Mar 2008 15:05:21 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-MooseX-Object-Pluggable Version: 0.0005 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Make your Moose classes pluggable -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MooseX-Object-Pluggable/ Source0: http://www.cpan.org/authors/id/G/GR/GRODITI/MooseX-Object-Pluggable-%{version}.tar.gz @@ -61,6 +61,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.0005-2 +- rebuild for new perl + * Thu Apr 19 2007 Chris Weyl 0.0005-1 - update to 0.0005 - update BR's From fedora-extras-commits at redhat.com Wed Mar 5 15:06:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:06:55 GMT Subject: rpms/perl-MooseX-Params-Validate/devel perl-MooseX-Params-Validate.spec, 1.4, 1.5 Message-ID: <200803051506.m25F6tVu006377@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MooseX-Params-Validate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6335 Modified Files: perl-MooseX-Params-Validate.spec Log Message: new perl Index: perl-MooseX-Params-Validate.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MooseX-Params-Validate/devel/perl-MooseX-Params-Validate.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-MooseX-Params-Validate.spec 23 Oct 2007 06:54:38 -0000 1.4 +++ perl-MooseX-Params-Validate.spec 5 Mar 2008 15:06:14 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-MooseX-Params-Validate Version: 0.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extension of Params::Validate using Moose's types License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.03-2 +- rebuild for new perl + * Mon Oct 22 2007 Chris Weyl 0.03-1 - update to 0.03 - license tag update: GPL -> GPL+ From fedora-extras-commits at redhat.com Wed Mar 5 15:08:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:08:31 GMT Subject: rpms/perl-HTTP-Server-Simple/devel perl-HTTP-Server-Simple.spec, 1.13, 1.14 Message-ID: <200803051508.m25F8VHO006467@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436 Modified Files: perl-HTTP-Server-Simple.spec Log Message: new perl Index: perl-HTTP-Server-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel/perl-HTTP-Server-Simple.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-HTTP-Server-Simple.spec 28 Nov 2007 18:32:49 -0000 1.13 +++ perl-HTTP-Server-Simple.spec 5 Mar 2008 15:07:55 -0000 1.14 @@ -1,6 +1,6 @@ Name: perl-HTTP-Server-Simple Version: 0.27 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Very simple standalone HTTP daemon Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.27-2 +- rebuild for new perl + * Sat Jan 20 2007 Jose Pedro Oliveira - 0.27-1 - Update to 0.27. From fedora-extras-commits at redhat.com Wed Mar 5 15:09:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:09:17 GMT Subject: rpms/perl-HTTP-Server-Simple-Mason/devel perl-HTTP-Server-Simple-Mason.spec, 1.5, 1.6 Message-ID: <200803051509.m25F9HRF006574@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6509 Modified Files: perl-HTTP-Server-Simple-Mason.spec Log Message: new perl Index: perl-HTTP-Server-Simple-Mason.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/devel/perl-HTTP-Server-Simple-Mason.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-HTTP-Server-Simple-Mason.spec 6 Sep 2007 10:54:14 -0000 1.5 +++ perl-HTTP-Server-Simple-Mason.spec 5 Mar 2008 15:08:38 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-HTTP-Server-Simple-Mason Version: 0.09 -Release: 6%{?dist} +Release: 7%{?dist} Summary: HTTP::Server::Simple::Mason Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -55,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway - 0.09-7 +- rebuild for new perl + * Thu Sep 06 2007 Ralf Cors??pius - 0.09-6 - Update license tag. From fedora-extras-commits at redhat.com Wed Mar 5 15:09:22 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 5 Mar 2008 15:09:22 GMT Subject: rpms/glibc/devel glibc.spec,1.344,1.345 Message-ID: <200803051509.m25F9MMk006612@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/glibc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6522 Modified Files: glibc.spec Log Message: * Wed Mar 05 2008 Jesse Keating - 2.7.90-9 - Correct glibc-common requires. Index: glibc.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v retrieving revision 1.344 retrieving revision 1.345 diff -u -r1.344 -r1.345 --- glibc.spec 5 Mar 2008 10:32:39 -0000 1.344 +++ glibc.spec 5 Mar 2008 15:08:48 -0000 1.345 @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: 2.7.90 -Release: 8 +Release: 9 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -144,7 +144,7 @@ %package common Summary: Common binaries and locale data for glibc -Requires: %{name}-%{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: tzdata >= 2003a Group: System Environment/Base @@ -980,6 +980,9 @@ %endif %changelog +* Wed Mar 05 2008 Jesse Keating - 2.7.90-9 +- Correct glibc-common requires. + * Wed Mar 5 2008 Jakub Jelinek 2.7.90-8 - update to trunk - {,v}{as,d}printf and obstack_{,v}printf fortification (#435905) From fedora-extras-commits at redhat.com Wed Mar 5 15:10:28 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Wed, 5 Mar 2008 15:10:28 GMT Subject: rpms/evolution/F-7 evolution-2.10.3-CVE-2008-0072.patch, NONE, 1.1 evolution.spec, 1.271, 1.272 Message-ID: <200803051510.m25FASBb006781@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6618 Modified Files: evolution.spec Added Files: evolution-2.10.3-CVE-2008-0072.patch Log Message: * Tue Mar 04 2008 Matthew Barnes - 2.10.3-8.fc7 - Add patch for CVE-2008-0072 (format string vulnerability). evolution-2.10.3-CVE-2008-0072.patch: --- NEW FILE evolution-2.10.3-CVE-2008-0072.patch --- diff -up evolution-2.10.3/mail/em-format.c.CVE-2008-0072 evolution-2.10.3/mail/em-format.c --- evolution-2.10.3/mail/em-format.c.CVE-2008-0072 2008-03-04 15:44:32.000000000 -0500 +++ evolution-2.10.3/mail/em-format.c 2008-03-04 15:45:23.000000000 -0500 @@ -1155,7 +1155,7 @@ emf_application_xpkcs7mime(EMFormat *emf opart = camel_mime_part_new(); valid = camel_cipher_decrypt(context, part, opart, ex); if (valid == NULL) { - em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); + em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); em_format_part_as(emf, stream, part, NULL); } else { if (emfc == NULL) @@ -1305,7 +1305,7 @@ emf_multipart_encrypted(EMFormat *emf, C if (valid == NULL) { em_format_format_error(emf, stream, ex->desc?("Could not parse S/MIME message"):_("Could not parse S/MIME message: Unknown error")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_part_as(emf, stream, part, "multipart/mixed"); } else { if (emfc == NULL) @@ -1470,7 +1470,7 @@ emf_multipart_signed(EMFormat *emf, Came if (valid == NULL) { em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_part_as(emf, stream, part, "multipart/mixed"); } else { if (emfc == NULL) @@ -1536,7 +1536,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came if (!valid) { em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_format_source(emf, stream, ipart); /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ camel_exception_free(ex); @@ -1607,7 +1607,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C if (!valid) { em_format_format_error(emf, stream, ex->desc?("Could not parse S/MIME message"):_("Could not parse S/MIME message: Unknown error")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_format_source(emf, stream, ipart); /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ camel_exception_free(ex); Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/F-7/evolution.spec,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- evolution.spec 3 Nov 2007 19:26:30 -0000 1.271 +++ evolution.spec 5 Mar 2008 15:09:49 -0000 1.272 @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.3 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -179,6 +179,9 @@ # RH bug #249640 / GNOME bug #442329 Patch57: evolution-2.10.3-todo-conduit.patch +# CVE-2008-0072 +Patch58: evolution-2.10.3-CVE-2008-0072.patch + ## Dependencies ### Requires(post): GConf2 @@ -338,6 +341,7 @@ %patch55 -p1 -b .version-checks %patch56 -p1 -b .ETreeTableAdapter-idle-crash %patch57 -p1 -b .todo-conduit +%patch58 -p1 -b .CVE-2008-0072 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -759,6 +763,9 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Mar 04 2008 Matthew Barnes - 2.10.3-8.fc7 +- Add patch for CVE-2008-0072 (format string vulnerability). + * Sat Nov 03 2007 Matthew Barnes - 2.10.3-7.fc7 - Add patch for RH bug #249640 (todo conduit crash). From fedora-extras-commits at redhat.com Wed Mar 5 15:10:34 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Wed, 5 Mar 2008 15:10:34 GMT Subject: rpms/evolution/devel evolution-2.21.92-CVE-2008-0072.patch, NONE, 1.1 evolution.spec, 1.324, 1.325 Message-ID: <200803051510.m25FAYx8006821@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6560 Modified Files: evolution.spec Added Files: evolution-2.21.92-CVE-2008-0072.patch Log Message: * Tue Mar 04 2008 Matthew Barnes - 2.21.92-2.fc9 - Add patch for CVE-2008-0072 (format string vulnerability). evolution-2.21.92-CVE-2008-0072.patch: --- NEW FILE evolution-2.21.92-CVE-2008-0072.patch --- diff -up evolution-2.21.92/mail/em-format.c.CVE-2008-0072 evolution-2.21.92/mail/em-format.c --- evolution-2.21.92/mail/em-format.c.CVE-2008-0072 2008-01-27 22:59:48.000000000 -0500 +++ evolution-2.21.92/mail/em-format.c 2008-03-04 15:40:29.000000000 -0500 @@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf opart = camel_mime_part_new(); valid = camel_cipher_decrypt(context, part, opart, ex); if (valid == NULL) { - em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); + em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); em_format_part_as(emf, stream, part, NULL); } else { if (emfc == NULL) @@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C if (valid == NULL) { em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_part_as(emf, stream, part, "multipart/mixed"); } else { if (emfc == NULL) @@ -1515,7 +1515,7 @@ emf_multipart_signed(EMFormat *emf, Came if (valid == NULL) { em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_part_as(emf, stream, part, "multipart/mixed"); } else { if (emfc == NULL) @@ -1586,7 +1586,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came if (!valid) { em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_format_source(emf, stream, ipart); /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ camel_exception_free(ex); @@ -1658,7 +1658,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C if (!valid) { em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_format_source(emf, stream, ipart); /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ camel_exception_free(ex); Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- evolution.spec 25 Feb 2008 19:43:55 -0000 1.324 +++ evolution.spec 5 Mar 2008 15:09:45 -0000 1.325 @@ -46,7 +46,7 @@ Name: evolution Version: 2.21.92 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -81,6 +81,9 @@ # RH bug #176400 Patch15: evolution-2.9.1-im-context-reset.patch +# CVE-2008-0072 +Patch16: evolution-2.21.92-CVE-2008-0072.patch + ## Dependencies ### Requires(post): GConf2 @@ -223,6 +226,7 @@ %patch13 -p1 -b .fix-conduit-dir %patch14 -p1 -b .no-gnome-common %patch15 -p1 -b .im-context-reset +%patch16 -p1 -b .CVE-2008-0072 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -650,6 +654,9 @@ %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Tue Mar 04 2008 Matthew Barnes - 2.21.92-2.fc9 +- Add patch for CVE-2008-0072 (format string vulnerability). + * Mon Feb 25 2008 Matthew Barnes - 2.21.92-1.fc9 - Update to 2.21.92 - Bump eds_version to 2.21.92. From fedora-extras-commits at redhat.com Wed Mar 5 15:10:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:10:44 GMT Subject: rpms/perl-Test-WWW-Mechanize/devel perl-Test-WWW-Mechanize.spec, 1.6, 1.7 Message-ID: <200803051510.m25FAikL006870@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-WWW-Mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6697 Modified Files: perl-Test-WWW-Mechanize.spec Log Message: new perl Index: perl-Test-WWW-Mechanize.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-WWW-Mechanize/devel/perl-Test-WWW-Mechanize.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Test-WWW-Mechanize.spec 7 Jun 2007 15:58:13 -0000 1.6 +++ perl-Test-WWW-Mechanize.spec 5 Mar 2008 15:10:00 -0000 1.7 @@ -1,10 +1,10 @@ Name: perl-Test-WWW-Mechanize Version: 1.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Testing-specific WWW::Mechanize subclass Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Test-WWW-Mechanize/ Source0: http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,6 +55,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 1.14-2 +- rebuild for new perl + * Thu Jun 7 2007 Jose Pedro Oliveira - 1.14-1 - Update to 1.14. From fedora-extras-commits at redhat.com Wed Mar 5 15:12:19 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Wed, 5 Mar 2008 15:12:19 GMT Subject: rpms/evolution/F-8 evolution-2.12.3-CVE-2008-0072.patch, NONE, 1.1 evolution.spec, 1.307, 1.308 Message-ID: <200803051512.m25FCJFq006971@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6919 Modified Files: evolution.spec Added Files: evolution-2.12.3-CVE-2008-0072.patch Log Message: * Tue Mar 04 2008 Matthew Barnes - 2.12.3-3.fc8 - Add patch for CVE-2008-0072 (format string vulnerability). evolution-2.12.3-CVE-2008-0072.patch: --- NEW FILE evolution-2.12.3-CVE-2008-0072.patch --- diff -up evolution-2.12.3/mail/em-format.c.CVE-2008-0072 evolution-2.12.3/mail/em-format.c --- evolution-2.12.3/mail/em-format.c.CVE-2008-0072 2007-10-12 02:56:01.000000000 -0400 +++ evolution-2.12.3/mail/em-format.c 2008-03-04 15:59:30.000000000 -0500 @@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf opart = camel_mime_part_new(); valid = camel_cipher_decrypt(context, part, opart, ex); if (valid == NULL) { - em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); + em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); em_format_part_as(emf, stream, part, NULL); } else { if (emfc == NULL) @@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C if (valid == NULL) { em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_part_as(emf, stream, part, "multipart/mixed"); } else { if (emfc == NULL) @@ -1515,7 +1515,7 @@ emf_multipart_signed(EMFormat *emf, Came if (valid == NULL) { em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_part_as(emf, stream, part, "multipart/mixed"); } else { if (emfc == NULL) @@ -1586,7 +1586,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came if (!valid) { em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_format_source(emf, stream, ipart); /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ camel_exception_free(ex); @@ -1657,7 +1657,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C if (!valid) { em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error")); if (ex->desc) - em_format_format_error(emf, stream, ex->desc); + em_format_format_error(emf, stream, "%s", ex->desc); em_format_format_source(emf, stream, ipart); /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ camel_exception_free(ex); Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/F-8/evolution.spec,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- evolution.spec 3 Mar 2008 18:25:07 -0000 1.307 +++ evolution.spec 5 Mar 2008 15:11:19 -0000 1.308 @@ -46,7 +46,7 @@ Name: evolution Version: 2.12.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -126,6 +126,9 @@ # GNOME bug #351672 Patch38: evolution-2.12.3-no-drag-finish.patch +# CVE-2008-0072 +Patch39: evolution-2.12.3-CVE-2008-0072.patch + ## Dependencies ### Requires(post): GConf2 @@ -269,6 +272,7 @@ %patch36 -p1 -b .icon-names %patch37 -p1 -b .source-changed-event %patch38 -p1 -b .no-drag-finish +%patch39 -p1 -b .CVE-2008-0027 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -719,6 +723,9 @@ %dir %{_datadir}/omf/evolution %changelog +* Tue Mar 04 2008 Matthew Barnes - 2.12.3-3.fc8 +- Add patch for CVE-2008-0072 (format string vulnerability). + * Mon Mar 03 2008 Milan Crha - 2.12.3-2.fc8 - Add patch for GNOME bug #351672 (dragging IMAP messages locks X) From fedora-extras-commits at redhat.com Wed Mar 5 15:12:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:12:55 GMT Subject: rpms/perl-Path-Class/devel perl-Path-Class.spec,1.2,1.3 Message-ID: <200803051512.m25FCtDa007073@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Path-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6981 Modified Files: perl-Path-Class.spec Log Message: new perl Index: perl-Path-Class.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Path-Class/devel/perl-Path-Class.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Path-Class.spec 16 Aug 2007 17:53:52 -0000 1.2 +++ perl-Path-Class.spec 5 Mar 2008 15:12:21 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Path-Class Version: 0.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cross-platform path specification manipulation -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Path-Class/ Source0: http://www.cpan.org/modules/by-module/Path/Path-Class-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.16-3 +- rebuild for new perl + * Thu Aug 16 2007 Ian Burrell - 0.16-2 - Fix BuildRequires From fedora-extras-commits at redhat.com Wed Mar 5 15:13:23 2008 From: fedora-extras-commits at redhat.com (Kyle McMartin (kyle)) Date: Wed, 5 Mar 2008 15:13:23 GMT Subject: rpms/kernel/devel patch-2.6.25-rc4.bz2.sign, NONE, 1.1 .cvsignore, 1.774, 1.775 config-generic, 1.77, 1.78 config-powerpc-generic, 1.14, 1.15 kernel.spec, 1.476, 1.477 linux-2.6-debug-taint-vm.patch, 1.20, 1.21 linux-2.6-silence-noise.patch, 1.12, 1.13 sources, 1.734, 1.735 upstream, 1.656, 1.657 patch-2.6.25-rc3-git6.bz2.sign, 1.1, NONE patch-2.6.25-rc3.bz2.sign, 1.1, NONE Message-ID: <200803051513.m25FDNqB007145@cvs-int.fedora.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7037 Modified Files: .cvsignore config-generic config-powerpc-generic kernel.spec linux-2.6-debug-taint-vm.patch linux-2.6-silence-noise.patch sources upstream Added Files: patch-2.6.25-rc4.bz2.sign Removed Files: patch-2.6.25-rc3-git6.bz2.sign patch-2.6.25-rc3.bz2.sign Log Message: * Wed Mar 05 2008 Kyle McMartin - Linux 2.6.25-rc4 --- NEW FILE patch-2.6.25-rc4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBHzihsyGugalF9Dw4RAmvmAJ9ksQ5jf9yUO9KIUeo1adCPfKJrMQCfa3Ob 5SYdhp9yFKCV9a4cvu3nF70= =9t/0 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.774 retrieving revision 1.775 diff -u -r1.774 -r1.775 --- .cvsignore 5 Mar 2008 14:41:55 -0000 1.774 +++ .cvsignore 5 Mar 2008 15:12:35 -0000 1.775 @@ -4,6 +4,4 @@ temp-* kernel-2.6.24 linux-2.6.24.tar.bz2 -patch-2.6.25-rc3.bz2 -patch-2.6.25-rc3-git5.bz2 -patch-2.6.25-rc3-git6.bz2 +patch-2.6.25-rc4.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- config-generic 2 Mar 2008 05:08:48 -0000 1.77 +++ config-generic 5 Mar 2008 15:12:35 -0000 1.78 @@ -1984,6 +1984,7 @@ CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_V3020=m CONFIG_RTC_DRV_STK17TA8=m +# CONFIG_RTC_DRV_S35390A is not set CONFIG_DTLK=m CONFIG_R3964=m @@ -3149,6 +3150,7 @@ CONFIG_PROC_PID_CPUSET=y # CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set CONFIG_RELAY=y # CONFIG_PRINTK_TIME is not set @@ -3461,5 +3463,6 @@ CONFIG_FAIR_GROUP_SCHED=y # CONFIG_RT_GROUP_SCHED is not set CONFIG_CGROUP_SCHED=y +# CONFIG_CGROUP_MEM_RES_CTLR is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- config-powerpc-generic 12 Feb 2008 06:18:04 -0000 1.14 +++ config-powerpc-generic 5 Mar 2008 15:12:35 -0000 1.15 @@ -218,3 +218,6 @@ CONFIG_THERMAL=y # CONFIG_MEMORY_HOTREMOVE is not set + +CONFIG_DMADEVICES=y +# CONFIG_FSL_DMA is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.476 retrieving revision 1.477 diff -u -r1.476 -r1.477 --- kernel.spec 5 Mar 2008 14:41:55 -0000 1.476 +++ kernel.spec 5 Mar 2008 15:12:35 -0000 1.477 @@ -43,9 +43,9 @@ # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(expr %{base_sublevel} + 1) # The rc snapshot level -%define rcrev 3 +%define rcrev 4 # The git snapshot level -%define gitrev 6 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1110,7 +1110,7 @@ ApplyPatch linux-2.6-ata-quirk.patch # wireless patches headed for 2.6.25 -ApplyPatch linux-2.6-wireless.patch +#ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.26 ApplyPatch linux-2.6-wireless-pending.patch # temporary backport of some later wireless patches @@ -1755,6 +1755,9 @@ %changelog * Wed Mar 05 2008 Kyle McMartin +- Linux 2.6.25-rc4 + +* Wed Mar 05 2008 Kyle McMartin - Linux 2.6.25-rc3-git6 * Wed Mar 05 2008 David Woodhouse linux-2.6-debug-taint-vm.patch: Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- linux-2.6-debug-taint-vm.patch 12 Feb 2008 06:18:04 -0000 1.20 +++ linux-2.6-debug-taint-vm.patch 5 Mar 2008 15:12:35 -0000 1.21 @@ -10,25 +10,6 @@ void add_taint(unsigned flag) { -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index b5a58d4..7a0c25d 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -221,12 +221,12 @@ static inline int bad_range(struct zone *zone, struct page *page) - static void bad_page(struct page *page) - { - printk(KERN_EMERG "Bad page state in process '%s'\n" -- KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n" -+ KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n" - KERN_EMERG "Trying to fix it up, but a reboot is needed\n" - KERN_EMERG "Backtrace:\n", - current->comm, page, (int)(2*sizeof(unsigned long)), - (unsigned long)page->flags, page->mapping, -- page_mapcount(page), page_count(page)); -+ page_mapcount(page), page_count(page), print_tainted()); - dump_stack(); - page->flags &= ~(1 << PG_lru | - 1 << PG_private | diff --git a/mm/slab.c b/mm/slab.c index 2e338a5..e5627f9 100644 --- a/mm/slab.c @@ -83,3 +64,20 @@ print_modules(); dump_stack(); print_oops_end_marker(); +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index 402a504..2085092 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -225,10 +225,10 @@ static void bad_page(struct page *page) + void *pc = page_get_page_cgroup(page); + + printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG +- "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n", ++ "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n", + current->comm, page, (int)(2*sizeof(unsigned long)), + (unsigned long)page->flags, page->mapping, +- page_mapcount(page), page_count(page)); ++ page_mapcount(page), page_count(page), print_tainted()); + if (pc) { + printk(KERN_EMERG "cgroup:%p\n", pc); + page_reset_bad_cgroup(page); linux-2.6-silence-noise.patch: Index: linux-2.6-silence-noise.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-noise.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6-silence-noise.patch 12 Feb 2008 06:18:04 -0000 1.12 +++ linux-2.6-silence-noise.patch 5 Mar 2008 15:12:35 -0000 1.13 @@ -78,19 +78,24 @@ pci_restore_msi_state(dev); ---- linux-2.6.22.noarch/drivers/base/power/main.c~ 2007-07-13 15:44:37.000000000 -0400 -+++ linux-2.6.22.noarch/drivers/base/power/main.c 2007-07-13 15:44:44.000000000 -0400 -@@ -37,6 +37,3 @@ int device_pm_add(struct device *dev) +diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c +index d887d5c..80be564 100644 +--- a/drivers/base/power/main.c ++++ b/drivers/base/power/main.c +@@ -64,9 +64,6 @@ int (*platform_enable_wakeup)(struct device *dev, int is_on); + */ + void device_pm_add(struct device *dev) { - pr_debug("PM: Adding info for %s:%s\n", - dev->bus ? dev->bus->name : "No Bus", - kobject_name(&dev->kobj)); mutex_lock(&dpm_list_mtx); list_add_tail(&dev->power.entry, &dpm_active); -@@ -51,9 +48,6 @@ int device_pm_add(struct device *dev) - down(&dev->sem); - } - } + mutex_unlock(&dpm_list_mtx); +@@ -80,9 +77,6 @@ void device_pm_add(struct device *dev) + */ + void device_pm_remove(struct device *dev) + { - pr_debug("PM: Removing info for %s:%s\n", - dev->bus ? dev->bus->name : "No Bus", - kobject_name(&dev->kobj)); Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.734 retrieving revision 1.735 diff -u -r1.734 -r1.735 --- sources 5 Mar 2008 14:41:55 -0000 1.734 +++ sources 5 Mar 2008 15:12:35 -0000 1.735 @@ -1,3 +1,2 @@ 3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2 -01b1f6c7b35ba356129c121a81a77991 patch-2.6.25-rc3.bz2 -ed013b8ac33b75031a9312248c53aa6f patch-2.6.25-rc3-git6.bz2 +a4cc0fd5bda60e498246b6d69c873895 patch-2.6.25-rc4.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.656 retrieving revision 1.657 diff -u -r1.656 -r1.657 --- upstream 5 Mar 2008 14:41:55 -0000 1.656 +++ upstream 5 Mar 2008 15:12:35 -0000 1.657 @@ -1,3 +1,2 @@ linux-2.6.24.tar.bz2 -patch-2.6.25-rc3.bz2 -patch-2.6.25-rc3-git6.bz2 +patch-2.6.25-rc4.bz2 --- patch-2.6.25-rc3-git6.bz2.sign DELETED --- --- patch-2.6.25-rc3.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Wed Mar 5 15:13:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:13:55 GMT Subject: rpms/perl-Tree-Simple/devel perl-Tree-Simple.spec,1.8,1.9 Message-ID: <200803051513.m25FDtCE007179@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Tree-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7126 Modified Files: perl-Tree-Simple.spec Log Message: new perl Index: perl-Tree-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tree-Simple/devel/perl-Tree-Simple.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Tree-Simple.spec 19 Nov 2007 15:11:45 -0000 1.8 +++ perl-Tree-Simple.spec 5 Mar 2008 15:13:18 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Tree-Simple Version: 1.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tree::Simple Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 1.18-2 +- rebuild for new perl + * Mon Nov 19 2007 Ralf Cors??pius - 1.18-1 - Upstream bugfix. From fedora-extras-commits at redhat.com Wed Mar 5 15:15:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:15:15 GMT Subject: rpms/perl-Tree-Simple-VisitorFactory/devel perl-Tree-Simple-VisitorFactory.spec, 1.2, 1.3 Message-ID: <200803051515.m25FFFXV007318@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Tree-Simple-VisitorFactory/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7274 Modified Files: perl-Tree-Simple-VisitorFactory.spec Log Message: new perl Index: perl-Tree-Simple-VisitorFactory.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tree-Simple-VisitorFactory/devel/perl-Tree-Simple-VisitorFactory.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Tree-Simple-VisitorFactory.spec 30 Apr 2007 16:02:16 -0000 1.2 +++ perl-Tree-Simple-VisitorFactory.spec 5 Mar 2008 15:14:29 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Tree-Simple-VisitorFactory Version: 0.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Factory object for dispensing Visitor objects -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Tree-Simple-VisitorFactory/ Source0: http://www.cpan.org/authors/id/S/ST/STEVAN/Tree-Simple-VisitorFactory-%{version}.tar.gz @@ -56,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.10-3 +- rebuild for new perl + * Mon Apr 30 2007 Chris Weyl 0.10-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 15:15:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:15:45 GMT Subject: rpms/perl-Digest-MD2/devel perl-Digest-MD2.spec,1.7,1.8 Message-ID: <200803051515.m25FFjE5007384@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Digest-MD2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7312 Modified Files: perl-Digest-MD2.spec Log Message: new perl Index: perl-Digest-MD2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Digest-MD2/devel/perl-Digest-MD2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Digest-MD2.spec 19 Feb 2008 19:08:10 -0000 1.7 +++ perl-Digest-MD2.spec 5 Mar 2008 15:15:11 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Perl interface to the MD2 Algorithm Name: perl-Digest-MD2 Version: 2.03 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Digest-MD2/ @@ -48,6 +48,9 @@ %{_mandir}/man3/Digest::MD2.3pm* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 2.03-7 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 2.03-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 15:17:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:17:15 GMT Subject: rpms/perl-File-Modified/devel perl-File-Modified.spec,1.2,1.3 Message-ID: <200803051517.m25FHFRD007476@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-Modified/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7445 Modified Files: perl-File-Modified.spec Log Message: new perl Index: perl-File-Modified.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Modified/devel/perl-File-Modified.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-File-Modified.spec 4 May 2007 01:00:25 -0000 1.2 +++ perl-File-Modified.spec 5 Mar 2008 15:16:40 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-File-Modified Version: 0.07 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Checks intelligently if files have changed -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/File-Modified/ Source0: http://www.cpan.org/authors/id/C/CO/CORION/File-Modified-%{version}.tar.gz @@ -71,6 +71,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.07-5 +- rebuild for new perl + * Thu May 03 2007 Chris Weyl 0.07-4 - bump From fedora-extras-commits at redhat.com Wed Mar 5 15:18:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:18:01 GMT Subject: rpms/perl-Data-Dump/devel perl-Data-Dump.spec,1.3,1.4 Message-ID: <200803051518.m25FI15K007552@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Data-Dump/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7517 Modified Files: perl-Data-Dump.spec Log Message: new perl Index: perl-Data-Dump.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-Dump/devel/perl-Data-Dump.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Data-Dump.spec 23 Oct 2007 02:15:50 -0000 1.3 +++ perl-Data-Dump.spec 5 Mar 2008 15:17:25 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Data-Dump Version: 1.08 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Pretty printing of data structures License: GPL+ or Artistic Group: Development/Libraries @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 1.08-4 +- rebuild for new perl + * Mon Oct 22 2007 Chris Weyl 1.08-3 - update license tag: GPL -> GPL+ From fedora-extras-commits at redhat.com Wed Mar 5 15:20:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:20:05 GMT Subject: rpms/perl-GTop/devel perl-GTop.spec,1.6,1.7 Message-ID: <200803051520.m25FK5sk007664@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-GTop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7608 Modified Files: perl-GTop.spec Log Message: new perl Index: perl-GTop.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-GTop/devel/perl-GTop.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-GTop.spec 18 Feb 2008 23:15:47 -0000 1.6 +++ perl-GTop.spec 5 Mar 2008 15:19:10 -0000 1.7 @@ -1,8 +1,8 @@ Name: perl-GTop Version: 0.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl interface to libgtop -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/GTop/ Source0: http://www.cpan.org/authors/id/M/MJ/MJH/GTop-%{version}.tar.gz @@ -62,6 +62,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.16-6 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.16-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 15:20:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:20:32 GMT Subject: rpms/perl-Text-SimpleTable/devel perl-Text-SimpleTable.spec, 1.2, 1.3 Message-ID: <200803051520.m25FKW14007715@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-SimpleTable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7643 Modified Files: perl-Text-SimpleTable.spec Log Message: new perl Index: perl-Text-SimpleTable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-SimpleTable/devel/perl-Text-SimpleTable.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Text-SimpleTable.spec 4 May 2007 14:57:10 -0000 1.2 +++ perl-Text-SimpleTable.spec 5 Mar 2008 15:19:58 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Text-SimpleTable Version: 0.03 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple Eyecandy ASCII Tables -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-SimpleTable/ Source0: http://www.cpan.org/authors/id/S/SR/SRI/Text-SimpleTable-%{version}.tar.gz @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.03-3 +- rebuild for new perl + * Fri May 04 2007 Chris Weyl 0.03-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 15:22:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:22:47 GMT Subject: rpms/perl-HTTP-Request-AsCGI/devel perl-HTTP-Request-AsCGI.spec, 1.2, 1.3 Message-ID: <200803051522.m25FMliq007853@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTTP-Request-AsCGI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7802 Modified Files: perl-HTTP-Request-AsCGI.spec Log Message: new perl Index: perl-HTTP-Request-AsCGI.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTTP-Request-AsCGI/devel/perl-HTTP-Request-AsCGI.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-HTTP-Request-AsCGI.spec 28 Apr 2007 04:55:11 -0000 1.2 +++ perl-HTTP-Request-AsCGI.spec 5 Mar 2008 15:22:07 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-HTTP-Request-AsCGI Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Setup a CGI enviroment from a HTTP::Request -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTTP-Request-AsCGI/ Source0: http://www.cpan.org/authors/id/C/CH/CHANSEN/HTTP-Request-AsCGI-%{version}.tar.gz @@ -55,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.5-3 +- rebuild for new perl + * Fri Apr 27 2007 Chris Weyl 0.5-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 15:25:50 2008 From: fedora-extras-commits at redhat.com (David Cantrell (dcantrel)) Date: Wed, 5 Mar 2008 15:25:50 GMT Subject: rpms/dhcpv6/devel .cvsignore, 1.15, 1.16 dhcpv6.spec, 1.83, 1.84 sources, 1.15, 1.16 Message-ID: <200803051525.m25FPoXM007987@cvs-int.fedora.redhat.com> Author: dcantrel Update of /cvs/pkgs/rpms/dhcpv6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7959 Modified Files: .cvsignore dhcpv6.spec sources Log Message: * Wed Mar 05 2008 David Cantrell - 1.0.14-1 - Upgrade to dhcpv6-1.0.14, which renames some function calls that were missed in the 1.0.13 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 2 Mar 2008 21:31:22 -0000 1.15 +++ .cvsignore 5 Mar 2008 15:25:12 -0000 1.16 @@ -1 +1 @@ -dhcpv6-1.0.13.tar.gz +dhcpv6-1.0.14.tar.gz Index: dhcpv6.spec =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- dhcpv6.spec 2 Mar 2008 21:31:22 -0000 1.83 +++ dhcpv6.spec 5 Mar 2008 15:25:12 -0000 1.84 @@ -3,7 +3,7 @@ Summary: DHCPv6 - DHCP server and client for IPv6 Name: dhcpv6 -Version: 1.0.13 +Version: 1.0.14 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Daemons @@ -157,6 +157,10 @@ %{_libdir}/libdhcp6client.a %changelog +* Wed Mar 05 2008 David Cantrell - 1.0.14-1 +- Upgrade to dhcpv6-1.0.14, which renames some function calls that were + missed in the 1.0.13 release + * Sun Mar 02 2008 David Cantrell - 1.0.13-1 - Upgrade to dhcpv6-1.0.13, major changes: Actually remove -fvisibility=hidden Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 2 Mar 2008 21:31:22 -0000 1.15 +++ sources 5 Mar 2008 15:25:12 -0000 1.16 @@ -1 +1 @@ -92554560f198a630688d893274698158 dhcpv6-1.0.13.tar.gz +05d9bc9433fcad9b31cf7fe244ec3c26 dhcpv6-1.0.14.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 15:35:14 2008 From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg)) Date: Wed, 5 Mar 2008 15:35:14 GMT Subject: rpms/granule/F-7 granule.spec,1.8,1.9 sources,1.5,1.6 Message-ID: <200803051535.m25FZEdV008251@cvs-int.fedora.redhat.com> Author: vlg Update of /cvs/extras/rpms/granule/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8197 Modified Files: granule.spec sources Log Message: F-7: granule build 1 Index: granule.spec =================================================================== RCS file: /cvs/extras/rpms/granule/F-7/granule.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- granule.spec 10 Feb 2008 20:55:20 -0000 1.8 +++ granule.spec 5 Mar 2008 15:34:35 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Flashcards program based on Leitner methodology Name: granule Version: 1.3.0 -Release: 0%{?dist} +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://granule.sourceforge.net/ Index: sources =================================================================== RCS file: /cvs/extras/rpms/granule/F-7/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Feb 2008 20:55:20 -0000 1.5 +++ sources 5 Mar 2008 15:34:35 -0000 1.6 @@ -1 +1 @@ -0448084abbfe40884dd8e13f56b3b87e granule-1.3.0.tar.gz +7d19feaee6d6702bde84441b1b9c5fb3 granule-1.3.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 15:35:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:35:17 GMT Subject: rpms/perl-Catalyst-Runtime/devel perl-Catalyst-Runtime.spec, 1.3, 1.4 Message-ID: <200803051535.m25FZHba008256@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Catalyst-Runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8206 Modified Files: perl-Catalyst-Runtime.spec Log Message: new perl Index: perl-Catalyst-Runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Runtime/devel/perl-Catalyst-Runtime.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Catalyst-Runtime.spec 1 Mar 2008 19:21:20 -0000 1.3 +++ perl-Catalyst-Runtime.spec 5 Mar 2008 15:34:43 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Catalyst-Runtime Version: 5.7012 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Catalyst core modules License: GPL+ or Artistic Group: Development/Libraries @@ -107,6 +107,9 @@ %exclude %{_mandir}/man1/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 5.7012-2 +- rebuild for new perl + * Sat Mar 01 2008 Chris Weyl 5.7012-1 - update to 5.7012 From fedora-extras-commits at redhat.com Wed Mar 5 15:36:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:36:18 GMT Subject: rpms/perl-Catalyst-Plugin-SubRequest/devel perl-Catalyst-Plugin-SubRequest.spec, 1.2, 1.3 Message-ID: <200803051536.m25FaI26008366@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-SubRequest/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8304 Modified Files: perl-Catalyst-Plugin-SubRequest.spec Log Message: new perl Index: perl-Catalyst-Plugin-SubRequest.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-SubRequest/devel/perl-Catalyst-Plugin-SubRequest.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Catalyst-Plugin-SubRequest.spec 5 Jun 2007 15:50:04 -0000 1.2 +++ perl-Catalyst-Plugin-SubRequest.spec 5 Mar 2008 15:35:43 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Catalyst-Plugin-SubRequest Version: 0.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Make subrequests to actions in Catalyst -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-SubRequest/ Source0: http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-SubRequest-%{version}.tar.gz @@ -78,6 +78,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.11-4 +- rebuild for new perl + * Tue Jun 05 2007 Chris Weyl 0.11-3 - bump From fedora-extras-commits at redhat.com Wed Mar 5 15:37:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:37:11 GMT Subject: rpms/perl-Catalyst-Plugin-Static-Simple/devel perl-Catalyst-Plugin-Static-Simple.spec, 1.5, 1.6 Message-ID: <200803051537.m25FbB1G008431@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Static-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8406 Modified Files: perl-Catalyst-Plugin-Static-Simple.spec Log Message: new perl Index: perl-Catalyst-Plugin-Static-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Static-Simple/devel/perl-Catalyst-Plugin-Static-Simple.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Catalyst-Plugin-Static-Simple.spec 1 Mar 2008 18:53:07 -0000 1.5 +++ perl-Catalyst-Plugin-Static-Simple.spec 5 Mar 2008 15:36:35 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Catalyst-Plugin-Static-Simple Version: 0.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Make serving static pages painless License: GPL+ or Artistic Group: Development/Libraries @@ -83,6 +83,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.20-2 +- rebuild for new perl + * Sat Mar 01 2008 Chris Weyl 0.20-1 - update to 0.20 From fedora-extras-commits at redhat.com Wed Mar 5 15:38:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:38:03 GMT Subject: rpms/perl-UNIVERSAL-isa/devel perl-UNIVERSAL-isa.spec,1.6,1.7 Message-ID: <200803051538.m25Fc3D7008498@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-UNIVERSAL-isa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8472 Modified Files: perl-UNIVERSAL-isa.spec Log Message: new perl Index: perl-UNIVERSAL-isa.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-isa/devel/perl-UNIVERSAL-isa.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-UNIVERSAL-isa.spec 2 Jan 2008 13:55:49 -0000 1.6 +++ perl-UNIVERSAL-isa.spec 5 Mar 2008 15:37:24 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-UNIVERSAL-isa Version: 0.06 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Hack around module authors using UNIVERSAL::isa as a function Group: Development/Libraries @@ -60,6 +60,9 @@ %changelog +* Wed Mar 05 2008 Tom "spot" Callaway - 0.06-5 +- rebuild for new perl + * Wed Jan 02 2008 Ralf Cors??pius - 0.06-4 - Update License-tag. From fedora-extras-commits at redhat.com Wed Mar 5 15:39:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:39:17 GMT Subject: rpms/perl-UNIVERSAL-can/devel perl-UNIVERSAL-can.spec,1.3,1.4 Message-ID: <200803051539.m25FdHnF008573@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-UNIVERSAL-can/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8536 Modified Files: perl-UNIVERSAL-can.spec Log Message: new perl Index: perl-UNIVERSAL-can.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-can/devel/perl-UNIVERSAL-can.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-UNIVERSAL-can.spec 28 Nov 2007 18:33:47 -0000 1.3 +++ perl-UNIVERSAL-can.spec 5 Mar 2008 15:38:38 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-UNIVERSAL-can Version: 1.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Hack around people calling UNIVERSAL::can() as a function Group: Development/Libraries @@ -59,6 +59,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 1.12-2 +- rebuild for new perl + * Wed Apr 5 2006 Jose Pedro Oliveira - 1.12-1 - Update to 1.12. From fedora-extras-commits at redhat.com Wed Mar 5 15:40:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:40:06 GMT Subject: rpms/perl-Test-MockObject/devel perl-Test-MockObject.spec, 1.16, 1.17 Message-ID: <200803051540.m25Fe6WO008649@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-MockObject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8611 Modified Files: perl-Test-MockObject.spec Log Message: new perl Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Test-MockObject.spec 28 Nov 2007 18:33:19 -0000 1.16 +++ perl-Test-MockObject.spec 5 Mar 2008 15:39:31 -0000 1.17 @@ -1,6 +1,6 @@ Name: perl-Test-MockObject Version: 1.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Wed Mar 05 2008 Tom "spot" Callaway - 1.08-2 +- rebuild for new perl + * Fri Jun 29 2007 Jose Pedro Oliveira - 1.08-1 - Update to 1.08. From fedora-extras-commits at redhat.com Wed Mar 5 15:41:34 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Wed, 5 Mar 2008 15:41:34 GMT Subject: rpms/evolution/F-7 evolution.spec,1.272,1.273 Message-ID: <200803051541.m25FfY2W008771@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8704 Modified Files: evolution.spec Log Message: Add a Bugzilla reference for CVE-2008-0072. Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/F-7/evolution.spec,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- evolution.spec 5 Mar 2008 15:09:49 -0000 1.272 +++ evolution.spec 5 Mar 2008 15:40:58 -0000 1.273 @@ -179,7 +179,7 @@ # RH bug #249640 / GNOME bug #442329 Patch57: evolution-2.10.3-todo-conduit.patch -# CVE-2008-0072 +# RH bug #436080 / CVE-2008-0072 Patch58: evolution-2.10.3-CVE-2008-0072.patch ## Dependencies ### From fedora-extras-commits at redhat.com Wed Mar 5 15:41:38 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Wed, 5 Mar 2008 15:41:38 GMT Subject: rpms/evolution/F-8 evolution.spec,1.308,1.309 Message-ID: <200803051541.m25FfcvK008774@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8640 Modified Files: evolution.spec Log Message: Add a Bugzilla reference for CVE-2008-0072. Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/F-8/evolution.spec,v retrieving revision 1.308 retrieving revision 1.309 diff -u -r1.308 -r1.309 --- evolution.spec 5 Mar 2008 15:11:19 -0000 1.308 +++ evolution.spec 5 Mar 2008 15:41:01 -0000 1.309 @@ -126,7 +126,7 @@ # GNOME bug #351672 Patch38: evolution-2.12.3-no-drag-finish.patch -# CVE-2008-0072 +# RH bug #436081 / CVE-2008-0072 Patch39: evolution-2.12.3-CVE-2008-0072.patch ## Dependencies ### From fedora-extras-commits at redhat.com Wed Mar 5 15:41:51 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Wed, 5 Mar 2008 15:41:51 GMT Subject: rpms/evolution/devel evolution.spec,1.325,1.326 Message-ID: <200803051541.m25Ffpp3008790@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8548 Modified Files: evolution.spec Log Message: Add a Bugzilla reference for CVE-2008-0072. Index: evolution.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v retrieving revision 1.325 retrieving revision 1.326 diff -u -r1.325 -r1.326 --- evolution.spec 5 Mar 2008 15:09:45 -0000 1.325 +++ evolution.spec 5 Mar 2008 15:41:03 -0000 1.326 @@ -81,7 +81,7 @@ # RH bug #176400 Patch15: evolution-2.9.1-im-context-reset.patch -# CVE-2008-0072 +# RH bug #436082 / CVE-2008-0072 Patch16: evolution-2.21.92-CVE-2008-0072.patch ## Dependencies ### From fedora-extras-commits at redhat.com Wed Mar 5 15:42:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:42:33 GMT Subject: rpms/perl-Test-use-ok/devel perl-Test-use-ok.spec,1.2,1.3 Message-ID: <200803051542.m25FgXmM008835@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-use-ok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8803 Modified Files: perl-Test-use-ok.spec Log Message: new perl Index: perl-Test-use-ok.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-use-ok/devel/perl-Test-use-ok.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-use-ok.spec 30 Apr 2007 20:38:07 -0000 1.2 +++ perl-Test-use-ok.spec 5 Mar 2008 15:41:58 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-use-ok Version: 0.02 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Alternative to Test::More::use_ok License: MIT Group: Development/Libraries @@ -60,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.02-4 +- rebuild for new perl + * Mon Apr 30 2007 Chris Weyl 0.02-3 - bump From fedora-extras-commits at redhat.com Wed Mar 5 15:44:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 15:44:16 GMT Subject: rpms/perl-Data-Visitor/devel perl-Data-Visitor.spec,1.3,1.4 Message-ID: <200803051544.m25FiGHC008936@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Data-Visitor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8893 Modified Files: perl-Data-Visitor.spec Log Message: new perl Index: perl-Data-Visitor.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-Visitor/devel/perl-Data-Visitor.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Data-Visitor.spec 21 Oct 2007 19:47:09 -0000 1.3 +++ perl-Data-Visitor.spec 5 Mar 2008 15:43:36 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Data-Visitor Version: 0.09 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Visitor style traversal of Perl data structures License: GPL+ or Artistic Group: Development/Libraries @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.09-2 +- rebuild for new perl + * Sun Oct 21 2007 Chris Weyl 0.09-1 - update to 0.09 - update license tag: GPL -> GPL+ From fedora-extras-commits at redhat.com Wed Mar 5 15:44:18 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Wed, 5 Mar 2008 15:44:18 GMT Subject: rpms/kernel-xen-2.6/devel Makefile, 1.2.6.3, 1.2.6.4 Makefile.config, 1.2.4.3, 1.2.4.4 config-xen-x86_64, 1.2.4.2, 1.2.4.3 Message-ID: <200803051544.m25FiILX008973@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8885 Modified Files: Tag: private-markmc-pv-ops-branch Makefile Makefile.config config-xen-x86_64 Log Message: Fix issue with x86_64 config generation on noarch/i686 Index: config-xen-x86_64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-x86_64,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -u -r1.2.4.2 -r1.2.4.3 --- config-xen-x86_64 5 Mar 2008 14:01:21 -0000 1.2.4.2 +++ config-xen-x86_64 5 Mar 2008 15:43:41 -0000 1.2.4.3 @@ -1,3 +1,4 @@ +CONFIG_PARAVIRT=y CONFIG_PARAVIRT_GUEST=y # CONFIG_SMP is not set # CONFIG_NUMA is not set From fedora-extras-commits at redhat.com Wed Mar 5 15:45:02 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 5 Mar 2008 15:45:02 GMT Subject: rpms/bridge-utils/devel bridge-utils-1.2-foreach.patch, NONE, 1.1 bridge-utils.spec, 1.27, 1.28 Message-ID: <200803051545.m25Fj2Wc009055@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/bridge-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8976 Modified Files: bridge-utils.spec Added Files: bridge-utils-1.2-foreach.patch Log Message: fix 436120 bridge-utils-1.2-foreach.patch: --- NEW FILE bridge-utils-1.2-foreach.patch --- --- bridge-utils-1.2/libbridge/libbridge_init.c~ 2007-08-22 14:22:49.000000000 +0100 +++ bridge-utils-1.2/libbridge/libbridge_init.c 2008-03-05 15:40:42.000000000 +0000 @@ -49,8 +49,8 @@ static int isbridge(const struct dirent char path[SYSFS_PATH_MAX]; struct stat st; - snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge", entry->d_name); - return stat(path, &st) == 0 && S_ISDIR(st.st_mode); + snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/bridge_id", entry->d_name); + return stat(path, &st) == 0 && S_ISREG(st.st_mode); } /* Index: bridge-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/bridge-utils/devel/bridge-utils.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- bridge-utils.spec 19 Feb 2008 01:56:48 -0000 1.27 +++ bridge-utils.spec 5 Mar 2008 15:44:20 -0000 1.28 @@ -1,13 +1,14 @@ Summary: Utilities for configuring the linux ethernet bridge Name: bridge-utils Version: 1.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://bridge.sourceforge.net/ Group: System Environment/Base Source: http://dl.sf.net/bridge/bridge-utils-%{version}.tar.gz Patch0: bridge-utils-1.0.4-inc.patch Patch1: bridge-utils-1.2-show-ports.patch +Patch2: bridge-utils-1.2-foreach.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: libsysfs-devel autoconf @@ -27,6 +28,7 @@ %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build autoconf @@ -47,6 +49,9 @@ %{_mandir}/man8/brctl.8* %changelog +* Wed Mar 05 2008 David Woodhouse 1.2-5 +- Fix handling of bridge named 'bridge' (#436120) + * Mon Feb 18 2008 Fedora Release Engineering - 1.2-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 15:54:10 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 5 Mar 2008 15:54:10 GMT Subject: devel/lvm2 lvm2-vio-disk.patch,NONE,1.1 lvm2.spec,1.131,1.132 Message-ID: <200803051554.m25FsAwx009349@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/lvm2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9304 Modified Files: lvm2.spec Added Files: lvm2-vio-disk.patch Log Message: * Wed Mar 5 2008 Jeremy Katz - 2.02.33-10 - recognize vio disks lvm2-vio-disk.patch: --- NEW FILE lvm2-vio-disk.patch --- diff -up LVM2.2.02.33/lib/filters/filter.c.vio LVM2.2.02.33/lib/filters/filter.c --- LVM2.2.02.33/lib/filters/filter.c.vio 2008-03-05 10:47:06.000000000 -0500 +++ LVM2.2.02.33/lib/filters/filter.c 2008-03-05 10:49:43.000000000 -0500 @@ -77,6 +77,7 @@ static const device_info_t device_info[] {"xvd", 16}, /* Xen virtual block device */ {"vdisk", 8}, /* SUN's LDOM virtual block device */ {"ps3disk", 16}, /* PlayStation 3 internal disk */ + {"vd", 8}, /* VirtIO disk */ {NULL, 0} }; Index: lvm2.spec =================================================================== RCS file: /cvs/pkgs/devel/lvm2/lvm2.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- lvm2.spec 31 Jan 2008 12:44:02 -0000 1.131 +++ lvm2.spec 5 Mar 2008 15:53:33 -0000 1.132 @@ -6,13 +6,14 @@ Summary: Userland logical volume management tools Name: lvm2 Version: 2.02.33 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 Source0: LVM2.%{version}.tgz Source1: device-mapper.%{device_mapper_version}.tgz Patch0: cluster-locking-built-in.patch +Patch1: lvm2-vio-disk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel BuildRequires: ncurses-devel @@ -36,6 +37,7 @@ %setup -q -n LVM2.%{version} %setup -q -T -D -a 1 -n LVM2.%{version} %patch -p1 -b .locking +%patch1 -p1 %build cd device-mapper.%{device_mapper_version} @@ -267,6 +269,9 @@ %changelog +* Wed Mar 5 2008 Jeremy Katz - 2.02.33-10 +- recognize vio disks + * Thu Jan 31 2008 Alasdair Kergon > - 2.02.33-9 - Improve internal label caching performance while locks are held. - Fix mirror log name construction during lvconvert. From fedora-extras-commits at redhat.com Wed Mar 5 15:55:36 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Wed, 5 Mar 2008 15:55:36 GMT Subject: rpms/tzdata/F-7 tzdata-2007k-chile.patch, NONE, 1.1 tzdata.spec, 1.52, 1.53 Message-ID: <200803051555.m25FtaRv009480@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/tzdata/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9401/F-7 Modified Files: tzdata.spec Added Files: tzdata-2007k-chile.patch Log Message: Add Chile patches. tzdata-2007k-chile.patch: --- NEW FILE tzdata-2007k-chile.patch --- diff -urp tzdata/tzdata2007k/southamerica tzdata-pm/tzdata2007k/southamerica --- tzdata/tzdata2007k/southamerica 2007-12-31 16:24:53.000000000 +0100 +++ tzdata-pm/tzdata2007k/southamerica 2008-03-04 21:34:35.000000000 +0100 @@ -790,6 +790,7 @@ Rule Chile 1998 only - Sep 27 4:00u 1:00 Rule Chile 1999 only - Apr 4 3:00u 0 - Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S -Rule Chile 2000 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - +Rule Chile 2008 max - Mar Sun>=29 3:00u 0 - # IATA SSIM anomalies: (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these. # Zone NAME GMTOFF RULES FORMAT [UNTIL] --- tzdata-pm/tzdata2007k/antarctica 2007-11-19 23:33:32.000000000 +0100 +++ tzdata/tzdata2007k/antarctica 2008-03-04 22:23:38.000000000 +0100 @@ -53,7 +53,8 @@ Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S Rule ChileAQ 1999 only - Apr 4 3:00u 0 - Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S -Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2000 2007 - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2008 max - Mar Sun>=29 3:00u 0 - # Argentina - year-round bases Index: tzdata.spec =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/F-7/tzdata.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- tzdata.spec 3 Jan 2008 13:14:48 -0000 1.52 +++ tzdata.spec 5 Mar 2008 15:55:01 -0000 1.53 @@ -3,13 +3,14 @@ Version: 2007k %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain, LGPLv2+ Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Patch1: tzdata-2007k-chile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl BuildRequires: glibc-common >= 2.5.90-7 @@ -29,6 +30,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig +%patch1 -p1 %build make @@ -55,6 +57,10 @@ %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Tue Mar 4 2008 Petr Machata - 2007k-2 +- Chile moves DST to 29/Mar +- Related: #435959 + * Thu Jan 3 2008 Petr Machata - 2007k-1 - Upstream 2007k - Argentina readopted the daylight saving time From fedora-extras-commits at redhat.com Wed Mar 5 15:55:42 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Wed, 5 Mar 2008 15:55:42 GMT Subject: rpms/tzdata/F-8 tzdata-2007k-chile.patch, NONE, 1.1 tzdata.spec, 1.57, 1.58 Message-ID: <200803051555.m25FtgWh009485@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/tzdata/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9401/F-8 Modified Files: tzdata.spec Added Files: tzdata-2007k-chile.patch Log Message: Add Chile patches. tzdata-2007k-chile.patch: --- NEW FILE tzdata-2007k-chile.patch --- diff -urp tzdata/tzdata2007k/southamerica tzdata-pm/tzdata2007k/southamerica --- tzdata/tzdata2007k/southamerica 2007-12-31 16:24:53.000000000 +0100 +++ tzdata-pm/tzdata2007k/southamerica 2008-03-04 21:34:35.000000000 +0100 @@ -790,6 +790,7 @@ Rule Chile 1998 only - Sep 27 4:00u 1:00 Rule Chile 1999 only - Apr 4 3:00u 0 - Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S -Rule Chile 2000 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - +Rule Chile 2008 max - Mar Sun>=29 3:00u 0 - # IATA SSIM anomalies: (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these. # Zone NAME GMTOFF RULES FORMAT [UNTIL] --- tzdata-pm/tzdata2007k/antarctica 2007-11-19 23:33:32.000000000 +0100 +++ tzdata/tzdata2007k/antarctica 2008-03-04 22:23:38.000000000 +0100 @@ -53,7 +53,8 @@ Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S Rule ChileAQ 1999 only - Apr 4 3:00u 0 - Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S -Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2000 2007 - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2008 max - Mar Sun>=29 3:00u 0 - # Argentina - year-round bases Index: tzdata.spec =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/F-8/tzdata.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- tzdata.spec 3 Jan 2008 13:14:06 -0000 1.57 +++ tzdata.spec 5 Mar 2008 15:55:06 -0000 1.58 @@ -3,13 +3,14 @@ Version: 2007k %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain, LGPLv2+ Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Patch1: tzdata-2007k-chile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl BuildRequires: glibc-common >= 2.5.90-7 @@ -41,6 +42,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig +%patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -102,6 +104,10 @@ %{_datadir}/javazi %changelog +* Tue Mar 4 2008 Petr Machata - 2007k-2 +- Chile moves DST to 29/Mar +- Related: #435959 + * Thu Jan 3 2008 Petr Machata - 2007k-1 - Upstream 2007k - Argentina readopted the daylight saving time From fedora-extras-commits at redhat.com Wed Mar 5 15:55:54 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Wed, 5 Mar 2008 15:55:54 GMT Subject: rpms/tzdata/devel tzdata-2007k-chile.patch, NONE, 1.1 tzdata.spec, 1.60, 1.61 Message-ID: <200803051555.m25Ftsb6009488@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/tzdata/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9401/devel Modified Files: tzdata.spec Added Files: tzdata-2007k-chile.patch Log Message: Add Chile patches. tzdata-2007k-chile.patch: --- NEW FILE tzdata-2007k-chile.patch --- diff -urp tzdata/tzdata2007k/southamerica tzdata-pm/tzdata2007k/southamerica --- tzdata/tzdata2007k/southamerica 2007-12-31 16:24:53.000000000 +0100 +++ tzdata-pm/tzdata2007k/southamerica 2008-03-04 21:34:35.000000000 +0100 @@ -790,6 +790,7 @@ Rule Chile 1998 only - Sep 27 4:00u 1:00 Rule Chile 1999 only - Apr 4 3:00u 0 - Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S -Rule Chile 2000 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - +Rule Chile 2008 max - Mar Sun>=29 3:00u 0 - # IATA SSIM anomalies: (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these. # Zone NAME GMTOFF RULES FORMAT [UNTIL] --- tzdata-pm/tzdata2007k/antarctica 2007-11-19 23:33:32.000000000 +0100 +++ tzdata/tzdata2007k/antarctica 2008-03-04 22:23:38.000000000 +0100 @@ -53,7 +53,8 @@ Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S Rule ChileAQ 1999 only - Apr 4 3:00u 0 - Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S -Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2000 2007 - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2008 max - Mar Sun>=29 3:00u 0 - # Argentina - year-round bases Index: tzdata.spec =================================================================== RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- tzdata.spec 7 Jan 2008 15:32:59 -0000 1.60 +++ tzdata.spec 5 Mar 2008 15:55:13 -0000 1.61 @@ -3,7 +3,7 @@ Version: 2007k %define tzdata_version %{version} %define tzcode_version %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://elsie.nci.nih.gov/pub/ @@ -16,6 +16,7 @@ # These are official upstream. Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Patch1: tzdata-2007k-chile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl @@ -47,6 +48,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig +%patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -108,6 +110,10 @@ %{_datadir}/javazi %changelog +* Tue Mar 4 2008 Petr Machata - 2007k-2 +- Chile moves DST to 29/Mar +- Related: #435959 + * Thu Jan 3 2008 Petr Machata - 2007k-1 - Upstream 2007k - Argentina readopted the daylight saving time From fedora-extras-commits at redhat.com Wed Mar 5 16:00:54 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Wed, 5 Mar 2008 16:00:54 GMT Subject: rpms/authd/devel authd.spec,1.45,1.46 Message-ID: <200803051600.m25G0sxR009697@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/authd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9664 Modified Files: authd.spec Log Message: fixed source0 Index: authd.spec =================================================================== RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- authd.spec 5 Mar 2008 13:45:10 -0000 1.45 +++ authd.spec 5 Mar 2008 16:00:04 -0000 1.46 @@ -1,14 +1,15 @@ Summary: A RFC 1413 ident protocol daemon Name: authd Version: 1.4.3 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://fedorahosted.org/authd/ Obsoletes: pidentd <= 3.2 Provides: pidentd = 3.2 Requires(post): openssl -Source0: %{name}-%{version}.tar.gz +Source0: https://fedorahosted.org/authd/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz +#Source0: %{name}-%{version}.tar.gz Patch0: authd-1.4.3-gcc4.patch Patch1: authd-1.4.3-disable.patch Patch2: authd-1.4.3-ipv6-mapping.patch @@ -73,6 +74,9 @@ %{_sbindir}/in.authd %changelog +* Wed Mar 5 2008 Roman Rakus - 1.4.3-16 +- fixed Source0 + * Wed Mar 5 2008 Roman Rakus - 1.4.3-15 - added dist tag - added URL From fedora-extras-commits at redhat.com Wed Mar 5 16:05:09 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 5 Mar 2008 16:05:09 GMT Subject: rpms/paraview/devel paraview-3.2.1-hdf5.patch, NONE, 1.1 paraview-3.2.1-gcc43.patch, 1.2, 1.3 paraview.spec, 1.22, 1.23 Message-ID: <200803051605.m25G59ul017376@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/paraview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17327 Modified Files: paraview-3.2.1-gcc43.patch paraview.spec Added Files: paraview-3.2.1-hdf5.patch Log Message: * Wed Mar 5 2008 - Orion Poplawski - 3.2.1-5 - Rebuild for hdf5 1.8.0 using compatability API define and new patch paraview-3.2.1-hdf5.patch: --- NEW FILE paraview-3.2.1-hdf5.patch --- --- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.hdf5 2008-02-29 22:13:27.000000000 -0700 +++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-03-04 16:16:27.000000000 -0700 @@ -346,10 +346,17 @@ HCoordinates[i] = Coordinates[i]; } #if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>6)||((H5_VERS_MINOR==6)&&(H5_VERS_RELEASE>=4)))) +# if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>6)||((H5_VERS_MINOR==6)&&(H5_VERS_RELEASE>=7)))) +status = H5Sselect_elements( this->DataSpace, + H5S_SELECT_SET, + NElements, + ( const hsize_t *)HCoordinates); +# else status = H5Sselect_elements( this->DataSpace, H5S_SELECT_SET, NElements, ( const hsize_t **)HCoordinates); +# endif #else status = H5Sselect_elements( this->DataSpace, H5S_SELECT_SET, paraview-3.2.1-gcc43.patch: Index: paraview-3.2.1-gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/paraview/devel/paraview-3.2.1-gcc43.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- paraview-3.2.1-gcc43.patch 1 Mar 2008 04:24:51 -0000 1.2 +++ paraview-3.2.1-gcc43.patch 5 Mar 2008 16:05:01 -0000 1.3 @@ -96,16 +96,6 @@ // typedef XdmfPointer XdmfXmlNode; struct _xmlNode; ---- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700 -+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-02-18 11:40:41.000000000 -0700 -@@ -23,6 +23,7 @@ - /* */ - /*******************************************************************/ - #include "XdmfDataDesc.h" -+#include - - XdmfDataDesc::XdmfDataDesc() { - H5dont_atexit(); --- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfObject.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700 +++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfObject.cxx 2008-02-18 11:42:04.000000000 -0700 @@ -23,6 +23,7 @@ @@ -137,3 +127,14 @@ #define XDMF_LONGEST_LENGTH (XdmfInt64)~0 #define XDMF_ARRAY_TAG_LENGTH 80 +--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.gcc43 2007-11-07 13:51:40.000000000 -0700 ++++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-02-29 22:13:27.000000000 -0700 +@@ -23,6 +23,8 @@ + /* */ + /*******************************************************************/ + #include "XdmfDataDesc.h" ++#include ++#include + + XdmfDataDesc::XdmfDataDesc() { + H5dont_atexit(); Index: paraview.spec =================================================================== RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- paraview.spec 29 Feb 2008 22:58:38 -0000 1.22 +++ paraview.spec 5 Mar 2008 16:05:01 -0000 1.23 @@ -22,6 +22,7 @@ Patch4: paraview-3.2.1-assistant-qt4.patch Patch5: paraview-3.2.1-make.patch Patch6: paraview-3.2.1-gcc43.patch +Patch7: paraview-3.2.1-hdf5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -126,6 +127,7 @@ %patch4 -p1 -b .assistant-qt4 %patch5 -p0 -b .make %patch6 -p1 -b .gcc43 +%patch7 -p1 -b .hdf5 %build @@ -368,8 +370,8 @@ %changelog -* Fri Feb 29 2008 - Orion Poplawski - 3.2.1-5 -- Rebuild for hdf5 1.8.0 using compatability API define +* Wed Mar 5 2008 - Orion Poplawski - 3.2.1-5 +- Rebuild for hdf5 1.8.0 using compatability API define and new patch * Mon Feb 18 2008 - Orion Poplawski - 3.2.1-4 - Add patch to compile with gcc 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 16:16:53 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 5 Mar 2008 16:16:53 GMT Subject: rpms/bridge-utils/devel bridge-utils-1.2-foreach.patch,1.1,1.2 Message-ID: <200803051616.m25GGrCR018005@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/bridge-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982 Modified Files: bridge-utils-1.2-foreach.patch Log Message: cleaner fix bridge-utils-1.2-foreach.patch: Index: bridge-utils-1.2-foreach.patch =================================================================== RCS file: /cvs/pkgs/rpms/bridge-utils/devel/bridge-utils-1.2-foreach.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bridge-utils-1.2-foreach.patch 5 Mar 2008 15:44:20 -0000 1.1 +++ bridge-utils-1.2-foreach.patch 5 Mar 2008 16:16:44 -0000 1.2 @@ -1,13 +1,17 @@ ---- bridge-utils-1.2/libbridge/libbridge_init.c~ 2007-08-22 14:22:49.000000000 +0100 -+++ bridge-utils-1.2/libbridge/libbridge_init.c 2008-03-05 15:40:42.000000000 +0000 -@@ -49,8 +49,8 @@ static int isbridge(const struct dirent +diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c +index a7473bd..d093bb1 100644 +--- a/libbridge/libbridge_init.c ++++ b/libbridge/libbridge_init.c +@@ -49,6 +49,12 @@ static int isbridge(const struct dirent *entry) char path[SYSFS_PATH_MAX]; struct stat st; -- snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge", entry->d_name); -- return stat(path, &st) == 0 && S_ISDIR(st.st_mode); -+ snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/bridge_id", entry->d_name); -+ return stat(path, &st) == 0 && S_ISREG(st.st_mode); ++ /* Ignore "." and ".." entries. */ ++ if (entry->d_name[0] == '.' && ++ (entry->d_name[1] == 0 || ++ (entry->d_name[1] == '.' && entry->d_name[2] == 0))) ++ return 0; ++ + snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge", entry->d_name); + return stat(path, &st) == 0 && S_ISDIR(st.st_mode); } - - /* From fedora-extras-commits at redhat.com Wed Mar 5 16:20:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:20:22 GMT Subject: rpms/perl-Catalyst-Action-RenderView/devel perl-Catalyst-Action-RenderView.spec, 1.3, 1.4 Message-ID: <200803051620.m25GKMjp018138@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Catalyst-Action-RenderView/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18055 Modified Files: perl-Catalyst-Action-RenderView.spec Log Message: new perl Index: perl-Catalyst-Action-RenderView.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Action-RenderView/devel/perl-Catalyst-Action-RenderView.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Catalyst-Action-RenderView.spec 23 Oct 2007 02:02:03 -0000 1.3 +++ perl-Catalyst-Action-RenderView.spec 5 Mar 2008 16:19:37 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Catalyst-Action-RenderView Version: 0.07 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Sensible default end action for view renders License: GPL+ or Artistic Group: Development/Libraries @@ -92,6 +92,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.07-2 +- rebuild for new perl + * Sun Oct 21 2007 Chris Weyl 0.07-1 - update to 0.07 - update license tag: GPL -> GPL+ From fedora-extras-commits at redhat.com Wed Mar 5 16:20:34 2008 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Wed, 5 Mar 2008 16:20:34 GMT Subject: rpms/hal/devel hal-0.5.11-vio.patch,NONE,1.1 hal.spec,1.145,1.146 Message-ID: <200803051620.m25GKYXQ018178@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/hal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18044 Modified Files: hal.spec Added Files: hal-0.5.11-vio.patch Log Message: * Wed Mar 5 2008 David Zeuthen - 0.5.11-0.git20080304.3%{?dist} - vio support (#431045, thanks dwmw2) hal-0.5.11-vio.patch: --- NEW FILE hal-0.5.11-vio.patch --- diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml index 1fd72b6..afad7c6 100644 --- a/doc/spec/hal-spec-properties.xml +++ b/doc/spec/hal-spec-properties.xml @@ -2993,6 +2993,40 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'} + + + + virtio namespace + + + Devices on the IBM pSeries/iSeries 'vio' bus are represented + by device objects where info.subsystem + equals vio. The following properties are + available for such device objects. + + + + + + Key (type) + Values + Mandatory + Description + + + + + + vio.id (string) + + example: 30000003 + Yes + Device identification + + + + + diff --git a/hald/linux/device.c b/hald/linux/device.c index 1026b2a..e4aae0c 100644 --- a/hald/linux/device.c +++ b/hald/linux/device.c @@ -3610,6 +3610,52 @@ virtio_compute_udi (HalDevice *d) /*--------------------------------------------------------------------------------------------------------------*/ static HalDevice * +vio_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, + const gchar *sysfs_path_in_devices) +{ + HalDevice *d; + const gchar *dev_id; + gchar buf[64]; + + d = hal_device_new (); + hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path); + hal_device_property_set_string (d, "info.subsystem", "vio"); + hal_device_property_set_string (d, "info.bus", "vio"); + if (parent_dev != NULL) { + hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev)); + } else { + hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer"); + } + + hal_util_set_driver (d, "info.linux.driver", sysfs_path); + + dev_id = hal_util_get_last_element (sysfs_path); + + hal_device_property_set_string (d, "vio.id", dev_id); + + g_snprintf (buf, sizeof (buf), "Vio Device (%s)", hal_device_property_get_string (d, "vio.id")); + hal_device_property_set_string (d, "info.product", buf); + + return d; +} + +static gboolean +vio_compute_udi (HalDevice *d) +{ + gchar udi[256]; + + hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi), + "/org/freedesktop/Hal/devices/vio_%s", + hal_device_property_get_string (d, "vio.id")); + hal_device_set_udi (d, udi); + hal_device_property_set_string (d, "info.udi", udi); + + return TRUE; +} + +/*--------------------------------------------------------------------------------------------------------------*/ + +static HalDevice * pseudo_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) { HalDevice *d; @@ -3977,6 +4023,14 @@ static DevHandler dev_handler_virtio = .remove = dev_remove }; +static DevHandler dev_handler_vio = +{ + .subsystem = "vio", + .add = vio_add, + .compute_udi = vio_compute_udi, + .remove = dev_remove +}; + /* SCSI debug, to test thousends of fake devices */ static DevHandler dev_handler_pseudo = { .subsystem = "pseudo", @@ -4024,6 +4078,7 @@ static DevHandler *dev_handlers[] = { &dev_handler_drm, &dev_handler_ps3_system_bus, &dev_handler_virtio, + &dev_handler_vio, NULL }; Index: hal.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- hal.spec 4 Mar 2008 20:12:02 -0000 1.145 +++ hal.spec 5 Mar 2008 16:19:57 -0000 1.146 @@ -26,9 +26,10 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.11 -Release: 0.git20080304.2%{?dist} +Release: 0.git20080304.3%{?dist} URL: http://www.freedesktop.org/Software/hal Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20080304.2.tar.gz +Patch0: hal-0.5.11-vio.patch License: AFL/GPL Group: System Environment/Libraries @@ -121,6 +122,7 @@ %prep %setup -q +%patch0 -p1 -b .vio %build %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject @@ -236,6 +238,9 @@ %{_datadir}/gtk-doc/html/libhal-storage/* %changelog +* Wed Mar 5 2008 David Zeuthen - 0.5.11-0.git20080304.3%{?dist} +- vio support (#431045, thanks dwmw2) + * Tue Mar 4 2008 David Zeuthen - 0.5.11-0.git20080304.2%{?dist} - Another git snapshot From fedora-extras-commits at redhat.com Wed Mar 5 16:20:43 2008 From: fedora-extras-commits at redhat.com (Robin Norwood (rnorwood)) Date: Wed, 5 Mar 2008 16:20:43 GMT Subject: rpms/PackageKit/devel .cvsignore, 1.9, 1.10 PackageKit.spec, 1.14, 1.15 sources, 1.9, 1.10 Message-ID: <200803051620.m25GKh9K018188@cvs-int.fedora.redhat.com> Author: rnorwood Update of /cvs/pkgs/rpms/PackageKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095 Modified Files: .cvsignore PackageKit.spec sources Log Message: Update to latest version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 21 Feb 2008 20:42:26 -0000 1.9 +++ .cvsignore 5 Mar 2008 16:20:03 -0000 1.10 @@ -1 +1 @@ -PackageKit-0.1.8.tar.gz +PackageKit-0.1.9.tar.gz Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- PackageKit.spec 21 Feb 2008 20:42:26 -0000 1.14 +++ PackageKit.spec 5 Mar 2008 16:20:03 -0000 1.15 @@ -7,7 +7,7 @@ Summary: System daemon that is a DBUS abstraction layer for package management Name: PackageKit -Version: 0.1.8 +Version: 0.1.9 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -60,6 +60,15 @@ %description libs Libraries for accessing PackageKit. +%package cron +Summary: Cron job and related utilities for PackageKit +Group: System Environment/Base +Requires: cronie +Requires: %{name} = %{version}-%{release} + +%description cron +Crontab and utilities for running PackageKit as a cron job. + %package devel Summary: Libraries and headers for PackageKit Group: Development/Libraries @@ -75,7 +84,7 @@ %setup -q %build -%configure --enable-yum --with-default-backend=yum +%configure --enable-yum --enable-yum2 --with-default-backend=yum make %{?_smp_mflags} @@ -90,6 +99,9 @@ install -m644 docs/spec/pk-structure.png $RPM_BUILD_ROOT%{_datadir}/doc/packagekit/ +chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/yumDBUSBackend.py +chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py + %clean rm -rf $RPM_BUILD_ROOT @@ -123,8 +135,8 @@ %{_bindir}/pk-import-desktop %{_bindir}/pk-import-specspo %{_bindir}/packagekit-bugreport.sh -%{_libdir}/libpackagekit*.so.* -%{_libdir}/packagekit-backend/*.so +%exclude %{_libdir}/libpackagekit*.so.* +%exclude %{_libdir}/packagekit-backend/*.so %ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db %ghost %verify(not md5 size mtime) %{_localstatedir}/run/PackageKit/job_count.dat %{_datadir}/dbus-1/system-services/*.service @@ -143,6 +155,11 @@ %{_libdir}/*packagekit*.so.* %{_libdir}/packagekit-backend/*.so +%files cron +%defattr(-,root,root,-) +%config %{_sysconfdir}/cron.daily/packagekit-background.cron +%config %{_sysconfdir}/sysconfig/packagekit-background + %files devel %defattr(-,root,root,-) @@ -152,6 +169,10 @@ %changelog +* Wed Mar 5 2008 Robin Norwood - 0.1.9-1 +- Update to latest upstream version: 0.1.9 +- Enable yum2 backend, but leave old yum backend the default for now + * Thu Feb 21 2008 Robin Norwood - 0.1.8-1 - Update to latest upstream version: 0.1.8 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 21 Feb 2008 20:42:26 -0000 1.9 +++ sources 5 Mar 2008 16:20:03 -0000 1.10 @@ -1 +1 @@ -47f60d925f4bfad5c300c4cb5f444c75 PackageKit-0.1.8.tar.gz +26de3ac62ee1aa4f6b69d1ce5a8bab3f PackageKit-0.1.9.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 16:21:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:21:56 GMT Subject: rpms/perl-Catalyst-Manual/devel perl-Catalyst-Manual.spec,1.2,1.3 Message-ID: <200803051621.m25GLuJ4018315@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Catalyst-Manual/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18281 Modified Files: perl-Catalyst-Manual.spec Log Message: new perl Index: perl-Catalyst-Manual.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Manual/devel/perl-Catalyst-Manual.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Catalyst-Manual.spec 5 Jun 2007 15:47:38 -0000 1.2 +++ perl-Catalyst-Manual.spec 5 Mar 2008 16:21:15 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Catalyst-Manual Version: 5.700701 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Catalyst web framework manual -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Manual/ Source0: http://www.cpan.org/authors/id/J/JR/JROCKWAY/Catalyst-Manual-%{version}.tar.gz @@ -51,6 +51,9 @@ %exclude %{_mandir}/man3/Catalyst::Manual.3* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 5.700701-3 +- rebuild for new perl + * Tue Jun 05 2007 Chris Weyl 5.700701-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 16:22:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:22:56 GMT Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/devel perl-Catalyst-Plugin-ConfigLoader.spec, 1.2, 1.3 Message-ID: <200803051622.m25GMu6O018398@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-ConfigLoader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18361 Modified Files: perl-Catalyst-Plugin-ConfigLoader.spec Log Message: new perl Index: perl-Catalyst-Plugin-ConfigLoader.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/perl-Catalyst-Plugin-ConfigLoader.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Catalyst-Plugin-ConfigLoader.spec 16 May 2007 23:53:20 -0000 1.2 +++ perl-Catalyst-Plugin-ConfigLoader.spec 5 Mar 2008 16:22:19 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Catalyst-Plugin-ConfigLoader Version: 0.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Load config files of various types -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Catalyst-Plugin-ConfigLoader/ Source0: http://www.cpan.org/authors/id/B/BR/BRICAS/Catalyst-Plugin-ConfigLoader-%{version}.tar.gz @@ -59,6 +59,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.14-4 +- rebuild for new perl + * Wed May 16 2007 Chris Weyl 0.14-3 - bump From fedora-extras-commits at redhat.com Wed Mar 5 16:23:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:23:55 GMT Subject: rpms/perl-Module-ScanDeps/devel perl-Module-ScanDeps.spec, 1.19, 1.20 Message-ID: <200803051623.m25GNt8N018474@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18448 Modified Files: perl-Module-ScanDeps.spec Log Message: new perl Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- perl-Module-ScanDeps.spec 29 Jan 2008 01:31:29 -0000 1.19 +++ perl-Module-ScanDeps.spec 5 Mar 2008 16:23:09 -0000 1.20 @@ -1,6 +1,6 @@ Name: perl-Module-ScanDeps Version: 0.82 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Recursively scan Perl code for dependencies License: GPL+ or Artistic Group: Development/Libraries @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.82-2 +- rebuild for new perl + * Mon Jan 28 2008 Steven Pritchard 0.82-1 - Update to 0.82. - BR version. From fedora-extras-commits at redhat.com Wed Mar 5 16:25:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:25:23 GMT Subject: rpms/perl-Module-Install/devel perl-Module-Install.spec,1.8,1.9 Message-ID: <200803051625.m25GPNQx018555@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-Install/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18515 Modified Files: perl-Module-Install.spec Log Message: new perl Index: perl-Module-Install.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Install/devel/perl-Module-Install.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Module-Install.spec 28 Jan 2008 20:57:31 -0000 1.8 +++ perl-Module-Install.spec 5 Mar 2008 16:24:41 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Module-Install Version: 0.68 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Standalone, extensible Perl module installer License: GPL+ or Artistic Group: Development/Libraries @@ -68,6 +68,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.68-2 +- rebuild for new perl + * Mon Jan 28 2008 Steven Pritchard 0.68-1 - Update to 0.68. - Explicitly require Archive::Tar and ExtUtils::ParseXS. From fedora-extras-commits at redhat.com Wed Mar 5 16:27:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:27:01 GMT Subject: rpms/perl-Catalyst-Devel/devel perl-Catalyst-Devel.spec,1.3,1.4 Message-ID: <200803051627.m25GR1Mg018662@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Catalyst-Devel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18623 Modified Files: perl-Catalyst-Devel.spec Log Message: new perl Index: perl-Catalyst-Devel.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Catalyst-Devel/devel/perl-Catalyst-Devel.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Catalyst-Devel.spec 1 Mar 2008 19:29:53 -0000 1.3 +++ perl-Catalyst-Devel.spec 5 Mar 2008 16:26:19 -0000 1.4 @@ -1,7 +1,7 @@ %define runtime_version 5.7012 Name: perl-Catalyst-Devel Version: 1.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Catalyst Development Tools License: GPL+ or Artistic Group: Development/Libraries @@ -82,6 +82,9 @@ %{_bindir}/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 1.03-2 +- rebuild for new perl + * Sat Mar 01 2008 Chris Weyl 1.03-1 - update to 1.03 (runtime to 5.7012) From fedora-extras-commits at redhat.com Wed Mar 5 16:27:30 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Wed, 5 Mar 2008 16:27:30 GMT Subject: rpms/cups/devel cups.spec,1.400,1.401 Message-ID: <200803051627.m25GRUOQ018704@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18644 Modified Files: cups.spec Log Message: Make building svn snapshots easier, for testing Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.400 retrieving revision 1.401 diff -u -r1.400 -r1.401 --- cups.spec 4 Mar 2008 13:09:10 -0000 1.400 +++ cups.spec 5 Mar 2008 16:26:51 -0000 1.401 @@ -1,3 +1,4 @@ +#define svn 7356 %define initdir /etc/rc.d/init.d %define use_alternatives 1 %define lspp 1 @@ -6,10 +7,10 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.6 -Release: 5%{?dist} +Release: 5%{?svn:.svn%{svn}}%{?dist} License: GPLv2 Group: System Environment/Daemons -Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2 +Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2 Source1: cups.init Source2: cupsprinter.png Source3: http://www.openprinting.org/download/printing/dnssd @@ -137,7 +138,7 @@ lpd emulation. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}%{?svn:svn-r%{svn}} %patch2 -p1 -b .no-gzip-man %patch3 -p1 -b .system-auth %patch4 -p1 -b .multilib @@ -182,6 +183,7 @@ %if %lspp --enable-lspp \ %endif + %{?svn:--enable-pdftops} \ --with-log-file-perm=0600 --enable-pie --enable-relro \ --with-dbusdir=%{_sysconfdir}/dbus-1 \ localedir=%{_datadir}/locale @@ -273,6 +275,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop rm -rf $RPM_BUILD_ROOT%{_datadir}/icons +%if %{?svn:1}%{!?svn:0} +rm -f $RPM_BUILD_ROOT%{_bindir}/ppd{c,html,i,merge,po} +rm -rf $RPM_BUILD_ROOT%{_datadir}/cups/ppdc +%endif %post /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore @@ -358,6 +364,8 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/cups %{_datadir}/%{name}/www/favicon.* %{_datadir}/%{name}/www/images +%if %{?svn:1}%{!?svn:0} +%else %{_datadir}/%{name}/www/de %{_datadir}/%{name}/www/es %{_datadir}/%{name}/www/et @@ -368,6 +376,7 @@ %{_datadir}/%{name}/www/pl %{_datadir}/%{name}/www/sv %{_datadir}/%{name}/www/zh_TW +%endif %{_datadir}/%{name}/www/*.css %doc %{_datadir}/%{name}/www/index.html %doc %{_datadir}/%{name}/www/help From fedora-extras-commits at redhat.com Wed Mar 5 16:30:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:30:09 GMT Subject: rpms/perl-Template-Alloy/devel perl-Template-Alloy.spec,1.3,1.4 Message-ID: <200803051630.m25GU9d7018747@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Template-Alloy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18717 Modified Files: perl-Template-Alloy.spec Log Message: new perl Index: perl-Template-Alloy.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Template-Alloy/devel/perl-Template-Alloy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Template-Alloy.spec 5 Nov 2007 16:22:25 -0000 1.3 +++ perl-Template-Alloy.spec 5 Mar 2008 16:29:34 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Template-Alloy Version: 1.008 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Templating tool supporting multiple markup formats # see lib/Template/Alloy.pod License: GPL+ or Artistic @@ -70,6 +70,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 1.008-2 +- rebuild for new perl + * Mon Nov 05 2007 Chris Weyl 1.008-1 - update to 1.008 - add br on perl(Digest::MD5) From fedora-extras-commits at redhat.com Wed Mar 5 16:31:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:31:42 GMT Subject: rpms/perl-Hash-WithDefaults/devel perl-Hash-WithDefaults.spec, 1.2, 1.3 Message-ID: <200803051631.m25GVgmP018863@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Hash-WithDefaults/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18811 Modified Files: perl-Hash-WithDefaults.spec Log Message: new perl Index: perl-Hash-WithDefaults.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Hash-WithDefaults/devel/perl-Hash-WithDefaults.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Hash-WithDefaults.spec 25 Apr 2007 20:26:19 -0000 1.2 +++ perl-Hash-WithDefaults.spec 5 Mar 2008 16:30:48 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Hash-WithDefaults Version: 0.04 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Class for hashes with key-casing requirements supporting defaults -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Hash-WithDefaults/ Source0: http://www.cpan.org/authors/id/J/JE/JENDA/Hash-WithDefaults-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.04-3 +- rebuild for new perl + * Wed Apr 25 2007 Chris Weyl 0.04-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 16:32:45 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 16:32:45 GMT Subject: rpms/ruby-mechanize/F-7 .cvsignore, 1.4, 1.5 ruby-mechanize.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200803051632.m25GWjRl018981@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-mechanize/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18915/F-7 Modified Files: .cvsignore ruby-mechanize.spec sources Log Message: * Thu Mar 6 2008 Mamoru Tasaka - 0.7.1-1 - 0.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-7/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jan 2008 18:38:31 -0000 1.4 +++ .cvsignore 5 Mar 2008 16:32:10 -0000 1.5 @@ -1 +1 @@ -mechanize-0.7.0.tgz +mechanize-0.7.1.tgz Index: ruby-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-7/ruby-mechanize.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ruby-mechanize.spec 16 Jan 2008 18:38:31 -0000 1.3 +++ ruby-mechanize.spec 5 Mar 2008 16:32:10 -0000 1.4 @@ -1,12 +1,12 @@ %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 -%define repoid 30778 +%define repoid 33421 %define modname mechanize Name: ruby-%{modname} -Version: 0.7.0 +Version: 0.7.1 Release: 1%{?dist} Summary: A handy web browsing ruby object Group: Development/Languages @@ -70,6 +70,9 @@ %{ruby_sitelib}/www/ %changelog +* Thu Mar 6 2008 Mamoru Tasaka - 0.7.1-1 +- 0.7.1 + * Thu Jan 17 2008 Mamoru Tasaka - 0.7.0-1 - 0.7.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-7/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jan 2008 18:38:31 -0000 1.4 +++ sources 5 Mar 2008 16:32:10 -0000 1.5 @@ -1 +1 @@ -89c4a5518255383459cb6b4f594dc73a mechanize-0.7.0.tgz +9f84c32e69e07b3bcb8350db8e0917f2 mechanize-0.7.1.tgz From fedora-extras-commits at redhat.com Wed Mar 5 16:32:52 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 16:32:52 GMT Subject: rpms/ruby-mechanize/F-8 .cvsignore, 1.4, 1.5 ruby-mechanize.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200803051632.m25GWqfh018986@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-mechanize/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18915/F-8 Modified Files: .cvsignore ruby-mechanize.spec sources Log Message: * Thu Mar 6 2008 Mamoru Tasaka - 0.7.1-1 - 0.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jan 2008 18:38:32 -0000 1.4 +++ .cvsignore 5 Mar 2008 16:32:15 -0000 1.5 @@ -1 +1 @@ -mechanize-0.7.0.tgz +mechanize-0.7.1.tgz Index: ruby-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-8/ruby-mechanize.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ruby-mechanize.spec 16 Jan 2008 18:38:32 -0000 1.3 +++ ruby-mechanize.spec 5 Mar 2008 16:32:15 -0000 1.4 @@ -1,12 +1,12 @@ %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 -%define repoid 30778 +%define repoid 33421 %define modname mechanize Name: ruby-%{modname} -Version: 0.7.0 +Version: 0.7.1 Release: 1%{?dist} Summary: A handy web browsing ruby object Group: Development/Languages @@ -70,6 +70,9 @@ %{ruby_sitelib}/www/ %changelog +* Thu Mar 6 2008 Mamoru Tasaka - 0.7.1-1 +- 0.7.1 + * Thu Jan 17 2008 Mamoru Tasaka - 0.7.0-1 - 0.7.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jan 2008 18:38:32 -0000 1.4 +++ sources 5 Mar 2008 16:32:15 -0000 1.5 @@ -1 +1 @@ -89c4a5518255383459cb6b4f594dc73a mechanize-0.7.0.tgz +9f84c32e69e07b3bcb8350db8e0917f2 mechanize-0.7.1.tgz From fedora-extras-commits at redhat.com Wed Mar 5 16:32:59 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 5 Mar 2008 16:32:59 GMT Subject: rpms/ruby-mechanize/devel .cvsignore, 1.4, 1.5 ruby-mechanize.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200803051632.m25GWx1h018993@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/ruby-mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18915/devel Modified Files: .cvsignore ruby-mechanize.spec sources Log Message: * Thu Mar 6 2008 Mamoru Tasaka - 0.7.1-1 - 0.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jan 2008 18:38:32 -0000 1.4 +++ .cvsignore 5 Mar 2008 16:32:22 -0000 1.5 @@ -1 +1 @@ -mechanize-0.7.0.tgz +mechanize-0.7.1.tgz Index: ruby-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/devel/ruby-mechanize.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ruby-mechanize.spec 16 Jan 2008 18:38:32 -0000 1.3 +++ ruby-mechanize.spec 5 Mar 2008 16:32:22 -0000 1.4 @@ -1,12 +1,12 @@ %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} %define rubyabi 1.8 -%define repoid 30778 +%define repoid 33421 %define modname mechanize Name: ruby-%{modname} -Version: 0.7.0 +Version: 0.7.1 Release: 1%{?dist} Summary: A handy web browsing ruby object Group: Development/Languages @@ -70,6 +70,9 @@ %{ruby_sitelib}/www/ %changelog +* Thu Mar 6 2008 Mamoru Tasaka - 0.7.1-1 +- 0.7.1 + * Thu Jan 17 2008 Mamoru Tasaka - 0.7.0-1 - 0.7.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-mechanize/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jan 2008 18:38:32 -0000 1.4 +++ sources 5 Mar 2008 16:32:22 -0000 1.5 @@ -1 +1 @@ -89c4a5518255383459cb6b4f594dc73a mechanize-0.7.0.tgz +9f84c32e69e07b3bcb8350db8e0917f2 mechanize-0.7.1.tgz From fedora-extras-commits at redhat.com Wed Mar 5 16:39:01 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 5 Mar 2008 16:39:01 GMT Subject: rpms/hunspell-ga/devel .cvsignore, 1.4, 1.5 hunspell-ga.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200803051639.m25Gd12t019287@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-ga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243 Modified Files: .cvsignore hunspell-ga.spec sources Log Message: build the .aff from gaeilge.aff and ispellaff2myspell Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ga/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Nov 2007 09:03:32 -0000 1.4 +++ .cvsignore 5 Mar 2008 16:38:28 -0000 1.5 @@ -1,2 +1,3 @@ -ga_IE.zip ispell-gaeilge-4.3.tar.gz +myspell-header +hunspell-header Index: hunspell-ga.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ga/devel/hunspell-ga.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hunspell-ga.spec 4 Mar 2008 19:42:10 -0000 1.5 +++ hunspell-ga.spec 5 Mar 2008 16:38:28 -0000 1.6 @@ -1,9 +1,10 @@ Name: hunspell-ga Summary: Irish hunspell dictionaries Version: 4.3 -Release: 2%{?dist} +Release: 3%{?dist} Source0: http://borel.slu.edu/ispell/ispell-gaeilge-%{version}.tar.gz -Source1: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/ga_IE.zip +Source1: myspell-header +Source2: hunspell-header Group: Applications/Text URL: http://borel.slu.edu/ispell/index.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,13 +19,13 @@ %prep %setup -q -n ispell-gaeilge-%{version} -unzip %{SOURCE1} %patch1 -p1 -b .buildhunspell.patch %build make -chmod -x * - +cat %{SOURCE1} %{SOURCE2} > header +export LANG=en_IE.UTF-8 +ispellaff2myspell gaeilge.aff --myheader header | sed -e "s/\"\"/0/g" | sed -e "s/\"//g" > ga_IE.aff %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell @@ -35,10 +36,13 @@ %files %defattr(-,root,root,-) -%doc README_ga_IE.txt +%doc README COPYING ChangeLog %{_datadir}/myspell/* %changelog +* Wed Mar 05 2008 Caolan McNamara - 4.3-3 +- build the .aff from gaeilge.aff and ispellaff2myspell + * Tue Mar 04 2008 Caolan McNamara - 4.3-2 - update to latest .aff Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-ga/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Mar 2008 19:42:10 -0000 1.5 +++ sources 5 Mar 2008 16:38:28 -0000 1.6 @@ -1,2 +1,3 @@ eb7e6fb7ce5e74b5848ccf9b7d958b69 ispell-gaeilge-4.3.tar.gz -963e28e6a1b469f53fbc98e15ebda766 ga_IE.zip +53d9056c90f3954ee6451d5800354132 myspell-header +68a48ee26585b7ad8cfb14147f9198b4 hunspell-header From fedora-extras-commits at redhat.com Wed Mar 5 16:43:33 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 5 Mar 2008 16:43:33 GMT Subject: rpms/cmake/devel cmake.spec,1.27,1.28 Message-ID: <200803051643.m25GhXjW019454@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/cmake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19426 Modified Files: cmake.spec Log Message: Add bootstrapping notes. Index: cmake.spec =================================================================== RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- cmake.spec 19 Feb 2008 17:01:48 -0000 1.27 +++ cmake.spec 5 Mar 2008 16:42:49 -0000 1.28 @@ -1,18 +1,25 @@ Name: cmake Version: 2.4.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cross-platform make system Group: Development/Tools License: BSD URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz +Source1: cmake-init-fedora Source2: macros.cmake Patch0: cmake-2.4.2-fedora.patch Patch1: cmake-2.4.5-xmlrpc.patch +Patch2: cmake-2.4.8-CMakeSetup-unicode.patch +Patch3: cmake-2.4.8-wxdialog.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, libX11-devel -BuildRequires: curl-devel, expat-devel, xmlrpc-c-devel, zlib-devel +BuildRequires: curl-devel, expat-devel, zlib-devel, wxGTK-devel +# To bootstrap on a new architecture/release, you must comment out the +# xmlrpc-c-devel BR and xmlrpc patch. Build cmake then xmlrpc-c. Then +# undo the cmake changes and rebuild cmake. +BuildRequires: xmlrpc-c-devel Requires: rpm @@ -25,16 +32,27 @@ generation, code generation, and template instantiation. +%package -n cmakesetup +Summary: CMakeSetup +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description -n cmakesetup +wxWidgets based CMake tool. + + %prep %setup -q %patch -p1 -b .fedora %patch1 -p1 -b .xmlrpc +%patch2 -p1 -b .unicode +%patch3 -p1 -b .wxdialog %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" -./bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \ +./bootstrap --init=%SOURCE1 --prefix=%{_prefix} --datadir=/share/%{name} \ --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \ --system-libs make VERBOSE=1 %{?_smp_mflags} @@ -68,8 +86,15 @@ %{_mandir}/man1/*.1* %{_datadir}/emacs/ +%files -n cmakesetup +%defattr(-,root,root,-) +%{_bindir}/CMakeSetup + %changelog +* Fri Feb 8 2008 Laurent Rineau - 2.4.8-3 +- Enable the wxWidgets version of CMakeSetup (bug #431953). + * Tue Feb 19 2008 Fedora Release Engineering - 2.4.8-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 16:44:57 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 5 Mar 2008 16:44:57 GMT Subject: rpms/at-spi/devel at-spi-1.21.92-firefoxperf1.patch, NONE, 1.1 at-spi-1.21.92-firefoxperf2.patch, NONE, 1.1 at-spi.spec, 1.82, 1.83 Message-ID: <200803051644.m25Givu6019536@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/at-spi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19479 Modified Files: at-spi.spec Added Files: at-spi-1.21.92-firefoxperf1.patch at-spi-1.21.92-firefoxperf2.patch Log Message: * Wed Mar 5 2008 Christopher Aillon - 1.21-92-2 - Perf improvement work from Ginn Chen to help a11y-enabled-firefox3 at-spi-1.21.92-firefoxperf1.patch: --- NEW FILE at-spi-1.21.92-firefoxperf1.patch --- http://bugzilla.gnome.org/show_bug.cgi?id=350552 https://bugzilla.mozilla.org/show_bug.cgi?id=418845#c28 https://bugzilla.mozilla.org/show_bug.cgi?id=418845#c41 (part 2) Index: atk-bridge/bridge.c =================================================================== --- atk-bridge/bridge.c (revision 988) +++ atk-bridge/bridge.c (working copy) @@ -1160,13 +1160,22 @@ else if ((signal_query.signal_id == atk_signal_children_changed) && gobject) { detail1 = g_value_get_uint (param_values + 1); - ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), - detail1); - if (ao) - { - s_ao = spi_accessible_new (ao); - c_obj = BONOBO_OBJREF (s_ao); - spi_atk_bridge_init_object (&any, ATK_OBJECT (gobject), &c_obj); + gpointer child = g_value_get_pointer (param_values + 2); + if (ATK_IS_OBJECT (child)) + { + ao = ATK_OBJECT (child); + g_object_ref (ao); + } + else + { + ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), + detail1); + } + if (ao) + { + s_ao = spi_accessible_new (ao); + c_obj = BONOBO_OBJREF (s_ao); + spi_atk_bridge_init_object (&any, ATK_OBJECT (gobject), &c_obj); g_object_unref (ao); } else at-spi-1.21.92-firefoxperf2.patch: --- NEW FILE at-spi-1.21.92-firefoxperf2.patch --- http://bugzilla.gnome.org/show_bug.cgi?id=520490 https://bugzilla.mozilla.org/show_bug.cgi?id=418845#41 (part 4 of analysis) diff -up at-spi-1.21.92/atk-bridge/bridge.c.firefoxperf at-spi-1.21.92/atk-bridge/bridge.c --- at-spi-1.21.92/atk-bridge/bridge.c.firefoxperf 2008-03-05 11:28:24.000000000 -0500 +++ at-spi-1.21.92/atk-bridge/bridge.c 2008-03-05 11:31:01.000000000 -0500 @@ -745,7 +745,6 @@ spi_atk_emit_eventv (const GObject AtkObject *aobject; SpiAccessible *source = NULL; Accessibility_Registry registry; - const gchar *name; #ifdef SPI_BRIDGE_DEBUG CORBA_string s = NULL; #endif @@ -773,7 +772,6 @@ spi_atk_emit_eventv (const GObject va_end (args); return; } - name = atk_object_get_name (aobject); e.type = g_strdup_vprintf (format, args); if (source) e.source = BONOBO_OBJREF (source); e.detail1 = detail1; Index: at-spi.spec =================================================================== RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- at-spi.spec 25 Feb 2008 20:38:36 -0000 1.82 +++ at-spi.spec 5 Mar 2008 16:44:23 -0000 1.83 @@ -10,7 +10,7 @@ Summary: Assistive Technology Service Provider Interface Name: at-spi Version: 1.21.92 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://developer.gnome.org/projects/gap/ Source0: http://download.gnome.org/sources/at-spi/1.21/%{name}-%{version}.tar.bz2 @@ -37,6 +37,9 @@ BuildRequires: libXevie-devel BuildRequires: libXt-devel +Patch1: at-spi-1.21.92-firefoxperf1.patch +Patch2: at-spi-1.21.92-firefoxperf2.patch + %description at-spi allows assistive technologies to access GTK-based applications. Essentially it exposes the internals of applications for @@ -71,6 +74,8 @@ %prep %setup -q +%patch1 -p0 -b .firefoxperf1 +%patch2 -p1 -b .firefoxperf2 %build @@ -117,6 +122,9 @@ %changelog +* Wed Mar 5 2008 Christopher Aillon - 1.21-92-2 +- Perf improvement work from Ginn Chen to help a11y-enabled-firefox3 + * Mon Feb 25 2008 Matthias Clasen - 1.21.92-1 - Update to 1.21.92 From fedora-extras-commits at redhat.com Wed Mar 5 16:46:30 2008 From: fedora-extras-commits at redhat.com (Robin Norwood (rnorwood)) Date: Wed, 5 Mar 2008 16:46:30 GMT Subject: rpms/PackageKit/devel PackageKit.spec,1.15,1.16 Message-ID: <200803051646.m25GkUuE019695@cvs-int.fedora.redhat.com> Author: rnorwood Update of /cvs/pkgs/rpms/PackageKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19632 Modified Files: PackageKit.spec Log Message: Add another BuildRequires. Index: PackageKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- PackageKit.spec 5 Mar 2008 16:20:03 -0000 1.15 +++ PackageKit.spec 5 Mar 2008 16:45:54 -0000 1.16 @@ -34,6 +34,7 @@ BuildRequires: docbook-utils BuildRequires: gnome-doc-utils BuildRequires: python-devel +BuildRequires: perl(XML::Parser) %description PackageKit is a D-Bus abstraction layer that allows the session user From fedora-extras-commits at redhat.com Wed Mar 5 16:49:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:49:54 GMT Subject: rpms/perl-Hash-Case/devel perl-Hash-Case.spec,1.2,1.3 Message-ID: <200803051649.m25GnsR0019855@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Hash-Case/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19827 Modified Files: perl-Hash-Case.spec Log Message: new perl Index: perl-Hash-Case.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Hash-Case/devel/perl-Hash-Case.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Hash-Case.spec 19 Apr 2007 18:35:38 -0000 1.2 +++ perl-Hash-Case.spec 5 Mar 2008 16:49:20 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Hash-Case Version: 1.003 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Base class for hashes with key-casing requirements -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Hash-Case/ Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/Hash-Case-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.003-3 +- rebuild for new perl + * Thu Apr 19 2007 Chris Weyl 1.003-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 16:51:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:51:32 GMT Subject: rpms/perl-Config-IniHash/devel perl-Config-IniHash.spec,1.2,1.3 Message-ID: <200803051651.m25GpW8J019946@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Config-IniHash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19912 Modified Files: perl-Config-IniHash.spec Log Message: new perl Index: perl-Config-IniHash.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-IniHash/devel/perl-Config-IniHash.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Config-IniHash.spec 28 Apr 2007 04:52:40 -0000 1.2 +++ perl-Config-IniHash.spec 5 Mar 2008 16:50:52 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Config-IniHash Version: 2.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension for reading and writing INI files -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Config-IniHash/ Source0: http://www.cpan.org/authors/id/J/JE/JENDA/Config-IniHash-%{version}.tar.gz @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 2.9.0-3 +- rebuild for new perl + * Fri Apr 27 2007 Chris Weyl 2.9.0-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 16:52:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:52:20 GMT Subject: rpms/perl-JSON/devel perl-JSON.spec,1.6,1.7 Message-ID: <200803051652.m25GqKDu020018@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-JSON/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19984 Modified Files: perl-JSON.spec Log Message: new perl Index: perl-JSON.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON/devel/perl-JSON.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-JSON.spec 27 Nov 2007 02:17:02 -0000 1.6 +++ perl-JSON.spec 5 Mar 2008 16:51:42 -0000 1.7 @@ -1,8 +1,8 @@ Name: perl-JSON Version: 1.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parse and convert to JSON (JavaScript Object Notation) -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JSON/ Source0: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-%{version}.tar.gz @@ -77,6 +77,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.15-2 +- rebuild for new perl + * Mon Nov 26 2007 Chris Weyl 1.15-1 - update to 1.15 From fedora-extras-commits at redhat.com Wed Mar 5 16:55:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:55:43 GMT Subject: rpms/perl-CGI-Ex/devel perl-CGI-Ex.spec,1.6,1.7 Message-ID: <200803051655.m25GthpH020108@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CGI-Ex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20080 Modified Files: perl-CGI-Ex.spec Log Message: new perl Index: perl-CGI-Ex.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CGI-Ex/devel/perl-CGI-Ex.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-CGI-Ex.spec 5 Nov 2007 16:11:07 -0000 1.6 +++ perl-CGI-Ex.spec 5 Mar 2008 16:55:06 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-CGI-Ex Version: 2.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CGI utility suite - makes powerful application writing fun and easy License: GPL+ or Artistic Group: Development/Libraries @@ -71,6 +71,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 2.21-2 +- rebuild for new perl + * Mon Nov 05 2007 Chris Weyl 2.21-1 - update to 2.21 - license tag: GPL -> GPL+ From fedora-extras-commits at redhat.com Wed Mar 5 16:56:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:56:29 GMT Subject: rpms/perl-CGI-FastTemplate/devel perl-CGI-FastTemplate.spec, 1.2, 1.3 Message-ID: <200803051656.m25GuTX0020190@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CGI-FastTemplate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20158 Modified Files: perl-CGI-FastTemplate.spec Log Message: new perl Index: perl-CGI-FastTemplate.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CGI-FastTemplate/devel/perl-CGI-FastTemplate.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-CGI-FastTemplate.spec 16 Jun 2007 04:06:05 -0000 1.2 +++ perl-CGI-FastTemplate.spec 5 Mar 2008 16:55:53 -0000 1.3 @@ -1,10 +1,10 @@ Name: perl-CGI-FastTemplate Version: 1.09 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl extension for managing templates and performing variable interpolation Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/CGI-FastTemplate/ Source0: http://search.cpan.org/CPAN/authors/id/J/JM/JMOORE/CGI-FastTemplate-1.09.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +46,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 1.09-4 +- rebuild for new perl + * Fri Jun 15 2007 Jeffrey C. Ollie - 1.09-3 - Fix grammar in summary. From fedora-extras-commits at redhat.com Wed Mar 5 16:57:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:57:19 GMT Subject: rpms/perl-CGI-Session/devel perl-CGI-Session.spec,1.2,1.3 Message-ID: <200803051657.m25GvJLs020291@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CGI-Session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20233 Modified Files: perl-CGI-Session.spec Log Message: new perl Index: perl-CGI-Session.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CGI-Session/devel/perl-CGI-Session.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-CGI-Session.spec 27 Jan 2008 21:35:15 -0000 1.2 +++ perl-CGI-Session.spec 5 Mar 2008 16:56:44 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-CGI-Session Version: 4.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Persistent session data in CGI applications License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 4.20-4 +- rebuild for new perl + * Sun Jan 27 2008 Andreas Thienemann 4.20-3 - Added Test::More to the BuildReqs From fedora-extras-commits at redhat.com Wed Mar 5 16:57:42 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 5 Mar 2008 16:57:42 GMT Subject: rpms/python-paste/EL-5 .cvsignore, 1.5, 1.6 python-paste.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200803051657.m25GvgRQ020329@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-paste/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20266 Modified Files: .cvsignore python-paste.spec sources Log Message: 1.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-paste/EL-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Mar 2007 02:00:01 -0000 1.5 +++ .cvsignore 5 Mar 2008 16:57:08 -0000 1.6 @@ -1 +1 @@ -Paste-1.2.1.tar.gz +Paste-1.4.2.tar.gz Index: python-paste.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-paste/EL-5/python-paste.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-paste.spec 4 Mar 2007 02:00:01 -0000 1.6 +++ python-paste.spec 5 Mar 2008 16:57:08 -0000 1.7 @@ -2,7 +2,7 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: python-paste -Version: 1.2.1 +Version: 1.4.2 Release: 1%{?dist} Summary: Tools for using a Web Server Gateway Interface stack Group: System Environment/Libraries @@ -12,7 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-setuptools python-devel +BuildRequires: python-setuptools-devel python-devel + %description These provide several pieces of "middleware" (or filters) that can be nested @@ -27,7 +28,7 @@ # clean docs directory pushd docs -rm StyleGuide.txt *.css */*.css template.tmpl */*.js +rm StyleGuide.txt *.css */*.css */*.js popd %build @@ -60,6 +61,15 @@ %changelog +* Wed Oct 3 2007 Luke Macken - 1.4.2-1 +- 1.4.2 + +* Sun Sep 2 2007 Luke Macken - 1.4-2 +- Update for python-setuptools changes in rawhide + +* Sat Jul 8 2007 Luke Macken - 1.4-1 +- 1.4 + * Sat Mar 3 2007 Luke Macken - 1.2.1-1 - 1.2.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-paste/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Mar 2007 02:00:01 -0000 1.5 +++ sources 5 Mar 2008 16:57:08 -0000 1.6 @@ -1 +1 @@ -7d391d1b5ba8531b69958746a0734934 Paste-1.2.1.tar.gz +109bd6b0edd6de3a5ee5feaf42acd6aa Paste-1.4.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 16:58:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:58:39 GMT Subject: rpms/perl-CGI-FormBuilder/devel perl-CGI-FormBuilder.spec,1.1,1.2 Message-ID: <200803051658.m25GwdHL020411@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CGI-FormBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20373 Modified Files: perl-CGI-FormBuilder.spec Log Message: new perl Index: perl-CGI-FormBuilder.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CGI-FormBuilder/devel/perl-CGI-FormBuilder.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-CGI-FormBuilder.spec 21 Jun 2007 03:30:04 -0000 1.1 +++ perl-CGI-FormBuilder.spec 5 Mar 2008 16:57:51 -0000 1.2 @@ -1,10 +1,10 @@ Name: perl-CGI-FormBuilder Version: 3.0501 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easily generate and process stateful forms Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/CGI-FormBuilder/ Source0: http://search.cpan.org/CPAN/authors/id/N/NW/NWIGER/CGI-FormBuilder-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %{_mandir}/man3/*.3* %changelog +* Wed Mar 5 2008 Tom "spot" Callway - 3.0501-5 +- rebuild for new perl + * Wed Jun 20 2007 Jeffrey C. Ollie - 3.0501-4 - Trim the description to something reasonable. - Delete odd .orig file From fedora-extras-commits at redhat.com Wed Mar 5 16:59:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 16:59:17 GMT Subject: rpms/perl-Class-Prototyped/devel perl-Class-Prototyped.spec, 1.2, 1.3 Message-ID: <200803051659.m25GxHud020480@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Prototyped/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20422 Modified Files: perl-Class-Prototyped.spec Log Message: new perl Index: perl-Class-Prototyped.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Prototyped/devel/perl-Class-Prototyped.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Prototyped.spec 30 Apr 2007 15:34:23 -0000 1.2 +++ perl-Class-Prototyped.spec 5 Mar 2008 16:58:44 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Class-Prototyped Version: 1.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast prototype-based OO programming in Perl -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-Prototyped/ Source0: http://www.cpan.org/authors/id/T/TE/TEVERETT/Class-Prototyped-%{version}.tar.gz @@ -44,6 +44,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.10-3 +- rebuild for new perl + * Mon Apr 30 2007 Chris Weyl 1.10-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 17:01:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 17:01:24 GMT Subject: rpms/perl-CGI-Prototype/devel perl-CGI-Prototype.spec,1.2,1.3 Message-ID: <200803051701.m25H1OuW027662@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CGI-Prototype/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20532 Modified Files: perl-CGI-Prototype.spec Log Message: new perl Index: perl-CGI-Prototype.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CGI-Prototype/devel/perl-CGI-Prototype.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-CGI-Prototype.spec 4 May 2007 03:50:33 -0000 1.2 +++ perl-CGI-Prototype.spec 5 Mar 2008 17:00:34 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-CGI-Prototype Version: 0.9053 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Create a CGI application by subclassing -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/CGI-Prototype/ Source0: http://www.cpan.org/authors/id/M/ME/MERLYN/CGI-Prototype-%{version}.tar.gz @@ -89,6 +89,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.9053-5 +- rebuild for new perl + * Thu May 03 2007 Chris Weyl 0.9053-4 - bump From fedora-extras-commits at redhat.com Wed Mar 5 17:03:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 17:03:25 GMT Subject: rpms/perl-MRO-Compat/devel perl-MRO-Compat.spec,1.2,1.3 Message-ID: <200803051703.m25H3PRs027790@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MRO-Compat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27734 Modified Files: perl-MRO-Compat.spec Log Message: new perl Index: perl-MRO-Compat.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MRO-Compat/devel/perl-MRO-Compat.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MRO-Compat.spec 6 Dec 2007 21:50:07 -0000 1.2 +++ perl-MRO-Compat.spec 5 Mar 2008 17:02:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-MRO-Compat Version: 0.05 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Mro::* interface compatibility for Perls < 5.9.5 License: GPL+ or Artistic Group: Development/Libraries @@ -69,6 +69,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.05-6 +- rebuild for new perl + * Thu Dec 06 2007 Chris Weyl 0.05-5 - bump From fedora-extras-commits at redhat.com Wed Mar 5 17:04:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 17:04:10 GMT Subject: rpms/perl-Class-Accessor-Grouped/devel perl-Class-Accessor-Grouped.spec, 1.2, 1.3 Message-ID: <200803051704.m25H4AEw027847@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Accessor-Grouped/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27780 Modified Files: perl-Class-Accessor-Grouped.spec Log Message: new perl Index: perl-Class-Accessor-Grouped.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Accessor-Grouped/devel/perl-Class-Accessor-Grouped.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Accessor-Grouped.spec 9 Dec 2007 00:57:42 -0000 1.2 +++ perl-Class-Accessor-Grouped.spec 5 Mar 2008 17:03:17 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Class-Accessor-Grouped Version: 0.07000 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lets you build groups of accessors License: GPL+ or Artistic Group: Development/Libraries @@ -79,6 +79,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.07000-3 +- rebuild for new perl + * Sat Dec 08 2007 Chris Weyl 0.07000-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 17:09:38 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Wed, 5 Mar 2008 17:09:38 GMT Subject: rpms/Pixie/devel Pixie-src-2.2.3-arches.patch, NONE, 1.1 sources, 1.4, 1.5 Pixie.spec, 1.6, 1.7 Message-ID: <200803051709.m25H9cOc028017@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/Pixie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27985 Modified Files: sources Pixie.spec Added Files: Pixie-src-2.2.3-arches.patch Log Message: - Update to 2.2.3 (final) - Backport condionnal arches from r1144. Pixie-src-2.2.3-arches.patch: --- NEW FILE Pixie-src-2.2.3-arches.patch --- diff -up Pixie/src/ri/atomic.h.arches Pixie/src/ri/atomic.h --- Pixie/src/ri/atomic.h.arches 2007-11-22 04:45:08.000000000 +0100 +++ Pixie/src/ri/atomic.h 2008-03-05 17:14:32.000000000 +0100 @@ -79,8 +79,8 @@ inline int atomicDecrement(int32_t *ptr) } /////////////////////////////////////////////////////////////// -// GCC (i386) -#elif defined(__i386__) && defined(__GNUC__) +// GCC (i386 or x86_64) +#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) inline int atomicIncrement(volatile int *ptr) { unsigned char ret; @@ -106,7 +106,8 @@ inline int atomicDecrement(volatile int /////////////////////////////////////////////////////////////// // GCC (MIPS) -#elif defined(__GNUC__) +#elif defined(__GNUC__) && defined( __PPC__) + inline int atomicIncrement(volatile int *ptr) { register int ret; @@ -140,6 +141,7 @@ inline int atomicDecrement(volatile int #define ATOMIC_UNSUPPORTED +#warning Atomic Instructions are not supported on this platform, defaulting to generic implementation // Have a cross platform solution here inline int atomicIncrement(volatile int *ptr) { Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/Pixie/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Feb 2008 14:56:21 -0000 1.4 +++ sources 5 Mar 2008 17:09:00 -0000 1.5 @@ -1 +1 @@ -c4360ceca89319bcf60a15be96cbd245 Pixie-src-2.2.2.tgz +08fb16c406d191254afbf55689ff8352 Pixie-src-2.2.3.tgz Index: Pixie.spec =================================================================== RCS file: /cvs/pkgs/rpms/Pixie/devel/Pixie.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Pixie.spec 9 Feb 2008 14:56:21 -0000 1.6 +++ Pixie.spec 5 Mar 2008 17:09:00 -0000 1.7 @@ -1,12 +1,13 @@ Name: Pixie -Version: 2.2.2 -Release: 5%{?dist} +Version: 2.2.3 +Release: 1%{?dist} Summary: 3D renderer Renderman compliant Group: Applications/Multimedia License: LGPLv2+ -URL: http://www.cs.utexas.edu/~okan/Pixie/pixie.htm +URL: http://www.renderpixie.com/ Source0: http://downloads.sourceforge.net/pixie/%{name}-src-%{version}.tgz +Patch0: Pixie-src-2.2.3-arches.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: autoconf, automake, libtool, tcsh @@ -48,6 +49,7 @@ %prep %setup -q -n %{name} +%patch0 -p1 -b .arches # Use autotool to prevent to do special tweaks #csh makeunix @@ -63,7 +65,6 @@ --enable-shared \ --disable-static-fltk \ --disable-selfcontained \ - --enable-openexr-threads \ --with-x @@ -120,8 +121,9 @@ %changelog -* Sat Feb 9 2008 kwizart < kwizart at gmail.com > - 2.2.2-5 -- Rebuild for gcc43 +* Wed Mar 5 2008 kwizart < kwizart at gmail.com > - 2.2.3-1 +- Update to 2.2.3 (final) +- Backport condionnal arches from r1144. * Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 2.2.2-4 - Fix namespace with show (renamed to Pixie_show). From fedora-extras-commits at redhat.com Wed Mar 5 17:12:09 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Wed, 5 Mar 2008 17:12:09 GMT Subject: rpms/Pixie/devel Pixie.spec,1.7,1.8 Message-ID: <200803051712.m25HC9qj028180@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/Pixie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28145 Modified Files: Pixie.spec Log Message: Bump tag as previous one fails Index: Pixie.spec =================================================================== RCS file: /cvs/pkgs/rpms/Pixie/devel/Pixie.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Pixie.spec 5 Mar 2008 17:09:00 -0000 1.7 +++ Pixie.spec 5 Mar 2008 17:11:31 -0000 1.8 @@ -1,6 +1,6 @@ Name: Pixie Version: 2.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D renderer Renderman compliant Group: Applications/Multimedia @@ -121,7 +121,7 @@ %changelog -* Wed Mar 5 2008 kwizart < kwizart at gmail.com > - 2.2.3-1 +* Wed Mar 5 2008 kwizart < kwizart at gmail.com > - 2.2.3-2 - Update to 2.2.3 (final) - Backport condionnal arches from r1144. From fedora-extras-commits at redhat.com Wed Mar 5 17:25:38 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 5 Mar 2008 17:25:38 GMT Subject: devel/mkinitrd .cvsignore, 1.172, 1.173 mkinitrd.spec, 1.250, 1.251 sources, 1.214, 1.215 Message-ID: <200803051725.m25HPcme028579@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/mkinitrd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28549 Modified Files: .cvsignore mkinitrd.spec sources Log Message: * Wed Mar 5 2008 Jeremy Katz - 6.0.33-1 - Fix the non-persistent overlay case Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/mkinitrd/.cvsignore,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- .cvsignore 5 Mar 2008 02:54:19 -0000 1.172 +++ .cvsignore 5 Mar 2008 17:25:04 -0000 1.173 @@ -1 +1 @@ -mkinitrd-6.0.32.tar.bz2 +mkinitrd-6.0.33.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/pkgs/devel/mkinitrd/mkinitrd.spec,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- mkinitrd.spec 5 Mar 2008 02:54:19 -0000 1.250 +++ mkinitrd.spec 5 Mar 2008 17:25:04 -0000 1.251 @@ -2,7 +2,7 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 6.0.32 +Version: 6.0.33 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -115,6 +115,9 @@ %{_libdir}/libbdevid.so.* %changelog +* Wed Mar 5 2008 Jeremy Katz - 6.0.33-1 +- Fix the non-persistent overlay case + * Tue Mar 4 2008 Jeremy Katz - 6.0.32-1 - Support keymaps for encrypted root devices (dlehman) - Add persistence bits to mkliveinitrd (based on changes by Douglas McClendon) Index: sources =================================================================== RCS file: /cvs/pkgs/devel/mkinitrd/sources,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- sources 5 Mar 2008 02:54:19 -0000 1.214 +++ sources 5 Mar 2008 17:25:04 -0000 1.215 @@ -1 +1 @@ -ed2bd2fe3c04aed2e784db2d128b1cdc mkinitrd-6.0.32.tar.bz2 +5e49d0d9579a45b9aeabd6aa96c5a7e9 mkinitrd-6.0.33.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 17:27:18 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Wed, 5 Mar 2008 17:27:18 GMT Subject: rpms/Pixie/devel Pixie.spec,1.8,1.9 Message-ID: <200803051727.m25HRIVQ028668@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/Pixie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28554 Modified Files: Pixie.spec Log Message: I feel 2.2.3-3 is more aesthetic Index: Pixie.spec =================================================================== RCS file: /cvs/pkgs/rpms/Pixie/devel/Pixie.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Pixie.spec 5 Mar 2008 17:11:31 -0000 1.8 +++ Pixie.spec 5 Mar 2008 17:26:45 -0000 1.9 @@ -1,6 +1,6 @@ Name: Pixie Version: 2.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D renderer Renderman compliant Group: Applications/Multimedia @@ -65,7 +65,7 @@ --enable-shared \ --disable-static-fltk \ --disable-selfcontained \ - --with-x + --enable-openexr-threads # remove rpath from libtool @@ -121,7 +121,7 @@ %changelog -* Wed Mar 5 2008 kwizart < kwizart at gmail.com > - 2.2.3-2 +* Wed Mar 5 2008 kwizart < kwizart at gmail.com > - 2.2.3-3 - Update to 2.2.3 (final) - Backport condionnal arches from r1144. From fedora-extras-commits at redhat.com Wed Mar 5 17:29:28 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Wed, 5 Mar 2008 17:29:28 GMT Subject: rpms/mgetty/devel mgetty-1.1.33-turn.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 mgetty.spec, 1.46, 1.47 sources, 1.8, 1.9 Message-ID: <200803051729.m25HTSdD028772@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/mgetty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28738 Modified Files: .cvsignore mgetty.spec sources Added Files: mgetty-1.1.33-turn.patch Log Message: * Wed Mar 05 2008 Martin Nagy - 1.1.33-16 - fix -t option of g32pbm (#188028) - move g32pbm and g3cat from mgetty-sendfax to mgetty (#190179) - some whitespace changes (#263641) - added faxq-helper man page (#243293) mgetty-1.1.33-turn.patch: --- NEW FILE mgetty-1.1.33-turn.patch --- diff -up mgetty-1.1.33/g3/g32pbm.c.turn mgetty-1.1.33/g3/g32pbm.c --- mgetty-1.1.33/g3/g32pbm.c.turn 2008-03-05 15:25:12.000000000 +0100 +++ mgetty-1.1.33/g3/g32pbm.c 2008-03-05 15:27:42.000000000 +0100 @@ -194,7 +194,8 @@ int byte, bit; *rows = nr; *cols = nc; *bperrow = newbperrow; - return newmap; + o_turn--; + return turnbm( cols, rows, newmap, bperrow ); } int main _P2( (argc, argv), int argc, char ** argv ) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mgetty/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 18 Feb 2008 15:23:21 -0000 1.9 +++ .cvsignore 5 Mar 2008 17:28:42 -0000 1.10 @@ -1,2 +1,3 @@ +faxq-helper.8 mgetty1.1.33-Apr10.tar.gz mgetty1.1.33-Apr10.tar.gz.asc Index: mgetty.spec =================================================================== RCS file: /cvs/extras/rpms/mgetty/devel/mgetty.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mgetty.spec 18 Feb 2008 15:23:21 -0000 1.46 +++ mgetty.spec 5 Mar 2008 17:28:42 -0000 1.47 @@ -1,13 +1,14 @@ Summary: A getty replacement for use with data and fax modems Name: mgetty Version: 1.1.33 -Release: 15%{?dist} +Release: 16%{?dist} Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz.asc Source2: logrotate.mgetty Source3: logrotate.sendfax Source4: logrotate.vgetty Source5: logrotate.vm +Source6: faxq-helper.8 Patch0: mgetty-1.1.29-config.patch Patch1: mgetty-1.1.26-policy.patch #Patch2: mgetty-1.1.25-faxprint.patch @@ -29,6 +30,7 @@ Patch18: mgetty-1.1.33-bug_63843.patch Patch19: mgetty-1.1.33-167830_tty_access.patch Patch20: mgetty-1.1.33-167830.patch +Patch21: mgetty-1.1.33-turn.patch License: GPLv2+ Group: Applications/Communications @@ -59,18 +61,18 @@ %description The mgetty package contains a "smart" getty which allows logins over a -serial line (i.e., through a modem). If you're using a Class 2 or 2.0 -modem, mgetty can receive faxes. If you also need to send faxes, +serial line (i.e., through a modem). If you're using a Class 2 or 2.0 +modem, mgetty can receive faxes. If you also need to send faxes, you'll need to install the sendfax program. If you'll be dialing in to your system using a modem, you should -install the mgetty package. If you'd like to send faxes using mgetty -and your modem, you'll need to install the mgetty-sendfax program. If +install the mgetty package. If you'd like to send faxes using mgetty +and your modem, you'll need to install the mgetty-sendfax program. If you need a viewer for faxes, you'll also need to install the mgetty-viewfax package. %description sendfax -Sendfax is a standalone backend program for sending fax files. The +Sendfax is a standalone backend program for sending fax files. The mgetty program (a getty replacement for handling logins over a serial line) plus sendfax will allow you to send faxes through a Class 2 modem. @@ -80,8 +82,8 @@ %description voice The mgetty-voice package contains the vgetty system, which enables -mgetty and your modem to support voice capabilities. In simple terms, -vgetty lets your modem act as an answering machine. How well the +mgetty and your modem to support voice capabilities. In simple terms, +vgetty lets your modem act as an answering machine. How well the system will work depends upon your modem, which may or may not be able to handle this kind of implementation. @@ -118,6 +120,7 @@ %patch18 -p1 -b .bug_63843 %patch19 -p1 -b .167830_tty_access %patch20 -p1 -b .167830 +%patch21 -p1 -b .turn %build %define makeflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP -D_FILE_OFFSET_BITS=64" prefix=%{_prefix} spool=%{_var}/spool BINDIR=%{_bindir} SBINDIR=%{_sbindir} LIBDIR=%{_libdir}/mgetty+sendfax HELPDIR=%{_libdir}/mgetty+sendfax CONFDIR=%{_sysconfdir}/mgetty+sendfax MANDIR=%{_mandir} MAN1DIR=%{_mandir}/man1 MAN4DIR=%{_mandir}/man4 MAN5DIR=%{_mandir}/man5 MAN8DIR=%{_mandir}/man8 INFODIR=%{_infodir} ECHO='"echo -e"' INSTALL=%{__install} @@ -167,6 +170,9 @@ install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vgetty install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vm +# add missing man page +install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man8/faxq-helper.8 + # remove file droppings from $RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_bindir}/cutbl @@ -186,14 +192,18 @@ %pre sendfax /usr/sbin/useradd -c "mgetty fax spool user" -u 78 \ - -s /sbin/nologin -r -d /var/spool/fax fax 2> /dev/null || : + -s /sbin/nologin -r -d /var/spool/fax fax 2> /dev/null || : %files %defattr(-,root,root) -%doc BUGS ChangeLog README.1st Recommend THANKS doc/modems.db samples +%doc BUGS ChangeLog README.1st Recommend THANKS doc/modems.db samples %doc doc/mgetty.ps doc/*.txt +%{_bindir}/g3cat +%{_bindir}/g32pbm /sbin/mgetty %{_sbindir}/callback +%{_mandir}/man1/g32pbm.1* +%{_mandir}/man1/g3cat.1* %{_mandir}/man4/mgettydefs.4* %{_mandir}/man8/mgetty.8* %{_mandir}/man8/callback.8* @@ -214,8 +224,6 @@ %{_bindir}/faxrm %{_bindir}/faxrunq %{_bindir}/faxspool -%{_bindir}/g3cat -%{_bindir}/g32pbm %{_bindir}/kvg %{_bindir}/newslock %{_bindir}/pbm2g3 @@ -226,9 +234,7 @@ %{_libdir}/mgetty+sendfax/cour25.pbm %{_libdir}/mgetty+sendfax/cour25n.pbm %attr(04711,fax,root) %{_libdir}/mgetty+sendfax/faxq-helper -%{_mandir}/man1/g32pbm.1* %{_mandir}/man1/pbm2g3.1* -%{_mandir}/man1/g3cat.1* %{_mandir}/man1/mgetty_fax.1* %{_mandir}/man1/faxspool.1* %{_mandir}/man1/faxrunq.1* @@ -237,6 +243,7 @@ %{_mandir}/man1/coverpg.1* %{_mandir}/man1/sff2g3.1* %{_mandir}/man5/faxqueue.5* +%{_mandir}/man8/faxq-helper.8* %{_mandir}/man8/faxrunqd.8* %{_mandir}/man8/sendfax.8* %dir %{_sysconfdir}/mgetty+sendfax @@ -319,6 +326,12 @@ %{_mandir}/man1/viewfax.1* %changelog +* Wed Mar 05 2008 Martin Nagy - 1.1.33-16 +- fix -t option of g32pbm (#188028) +- move g32pbm and g3cat from mgetty-sendfax to mgetty (#190179) +- some whitespace changes (#263641) +- added faxq-helper man page (#243293) + * Mon Feb 18 2008 Jindrich Novy - 1.1.33-15 - fix BuildRoot, License tag - fix policy and issue patches @@ -370,8 +383,8 @@ * Fri Jul 22 2005 Jason Vas Dias 1.1.33-3_FC5 - fix bug 162174: prevent uninterruptable hang on exit() when direct line disconnected (kernel bug 164002) - do tcflush(1,TCOFLUSH) before exit() in sig_goodbye() - block signals before entering syslog() + do tcflush(1,TCOFLUSH) before exit() in sig_goodbye() + block signals before entering syslog() workaround build system 'buffer overflow checks' bug: use memcpy instead of sprintf in record.c, line 53 @@ -611,7 +624,7 @@ * Fri Apr 10 1998 Cristian Gafton - updated to 1.1.14 - AutoPPP patch - + * Thu Dec 18 1997 Mike Wangsmo - added more of the documentation files to the rpm Index: sources =================================================================== RCS file: /cvs/extras/rpms/mgetty/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 25 Apr 2005 18:54:17 -0000 1.8 +++ sources 5 Mar 2008 17:28:42 -0000 1.9 @@ -1,2 +1,3 @@ +3765cb20a2a17d388096b232c1e29046 faxq-helper.8 d61a2bd343111be35250496710393bd5 mgetty1.1.33-Apr10.tar.gz 06d71de7d8c95a521f8e7e5fa872998c mgetty1.1.33-Apr10.tar.gz.asc From fedora-extras-commits at redhat.com Wed Mar 5 17:30:10 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 5 Mar 2008 17:30:10 GMT Subject: rpms/WebKit/devel WebKit.spec,1.5,1.6 Message-ID: <200803051730.m25HUAKN028816@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28778 Modified Files: WebKit.spec Log Message: Fix bug 436073 Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- WebKit.spec 2 Mar 2008 09:29:19 -0000 1.5 +++ WebKit.spec 5 Mar 2008 17:29:36 -0000 1.6 @@ -160,6 +160,8 @@ sed -i -e "s/^Libs:.*$/Libs: -L\${libdir} -l${WEBKIT_LIB}/" ${WEBKIT_LIB}.pc done popd +## The WebKitGtk pkgconfig data should depend on gtk+-2.0 for its cflags/libs. +echo 'Requires: gtk+-2.0' >> %{buildroot}%{_libdir}/pkgconfig/WebKitGtk.pc ## Finally, copy over and rename the various files for %%doc inclusion. rm -f docfiles.list @@ -231,6 +233,11 @@ %changelog +* Wed Mar 05 2008 Peter Gordon 1.0.0-0.7.svn30667 +- Fix the WebKitGtk pkgconfig data (should depend on gtk+-2.0). Resolves + bug 436073 (Requires: gtk+-2.0 missing from WebKitGtk.pc). +- Thanks to Mamoru Tasaka for helping find and squash these many bugs. + * Sat Mar 01 2008 Peter Gordon 1.0.0-0.6.svn30667 - Fix include directory naming. Resolves: bug 435561 (Header file <> header file location mismatch) From fedora-extras-commits at redhat.com Wed Mar 5 17:31:34 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 5 Mar 2008 17:31:34 GMT Subject: rpms/WebKit/devel WebKit.spec,1.6,1.7 Message-ID: <200803051731.m25HVY1t028960@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/WebKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28876 Modified Files: WebKit.spec Log Message: Bumpity-bump... Index: WebKit.spec =================================================================== RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- WebKit.spec 5 Mar 2008 17:29:36 -0000 1.6 +++ WebKit.spec 5 Mar 2008 17:31:01 -0000 1.7 @@ -7,7 +7,7 @@ Name: WebKit Version: 1.0.0 -Release: 0.6.svn%{svn_revision}%{?dist} +Release: 0.7.svn%{svn_revision}%{?dist} Summary: Web content engine library Group: Development/Libraries From fedora-extras-commits at redhat.com Wed Mar 5 18:06:15 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Wed, 5 Mar 2008 18:06:15 GMT Subject: rpms/kadu/F-7 .cvsignore, 1.10, 1.11 kadu.spec, 1.21, 1.22 sources, 1.12, 1.13 Message-ID: <200803051806.m25I6F1D004238@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/kadu/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4206 Modified Files: .cvsignore kadu.spec sources Log Message: * Thu Feb 28 2008 Micha?? Bentkowski - 0.6.0-1 - Stable - New versions of osdhints_notify, audacious_mediaplayer, filtering, mediaplayer and panelkadu Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kadu/F-7/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 Jan 2007 20:33:34 -0000 1.10 +++ .cvsignore 5 Mar 2008 18:05:32 -0000 1.11 @@ -1,6 +1,26 @@ -kadu-20061029.tar.bz2 -advanced_userlist-20061010.tar.bz2 -kadu-osdhints_notify-0.3.2.1.tar.gz -screenshot-0.4.4.tar.gz -kadu-0.5.0-rc2.tar.bz2 -kadu-0.5.0.tar.bz2 +agent-0.4.4.tar.gz +amarok_mediaplayer-20071220.tar.bz2 +ao_sound-20060424.tar.bz2 +audacious_mediaplayer-20080224.tar.bz2 +dcopexport-0.11.3-20071129-0.6.0.tar.bz2 +falf_mediaplayer-20071225.tar.bz2 +filedesc-20080104.tar.bz2 +filtering-20080224.tar.bz2 +kadu-0.6.0.tar.bz2 +kadu-firewall-0.7.5.tar.bz2 +kadu-osdhints_notify-0.4.0.9.tar.bz2 +kadu-pcspeaker-0.6.0.3.tar.bz2 +kadu-profiles-0.3.1.tar.bz2 +kadu-tabs-1.1.4.tar.bz2 +led_notify-0.18.tar.bz2 +mail-0.3.3.tar.bz2 +mediaplayer-20080224.tar.bz2 +miastoplusa_sms-0.6-1.3.9.tar.gz +mime_tex-1.4.1.tar.bz2 +mx610_notify-0.3.1.tar.bz2 +panelkadu-0.6-beta3.tar.gz +screenshot-20080104.tar.bz2 +spellchecker-20071230.tar.bz2 +water_notify-0.1.1-try2.tar.bz2 +weather-3.13.tar.bz2 +xmms_mediaplayer-20080116.tar.bz2 Index: kadu.spec =================================================================== RCS file: /cvs/extras/rpms/kadu/F-7/kadu.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- kadu.spec 5 Apr 2007 09:42:12 -0000 1.21 +++ kadu.spec 5 Mar 2008 18:05:32 -0000 1.22 @@ -1,312 +1,778 @@ +# unpack_module_source(): +# we check if we should build a given package +# if so, we unpack sources and add entry to config +# %1 - source number +# %2 - subpackage name + +%define unpack_module_source() \ +%if %{with %2}\ +%setup -q -D -T -a %1 -n kadu/modules\ +sed "s#^module_%2=.#module_%2=m#" -i ../.config\ +%endif\ +%nil + +# module_files(): +# both internal and external modules have at least their .so, .ui, +# .desc and .qm files. In order to simplify things, this macro +# creates a simple %files section +# %1 - module/subpackage name +# if parameter -d is specified, module owns its data dir +# +# all modules have very similar directory and files structure, so +# this macro is created to make it possible to simplify %files +# sections. All modules have .desc and .so files, a lot of them +# has configurations and translations or data dirs. We use +# respectively -c, -t and -d parameters to know which files +# a module owns. + +%define module_files(d,c,t) \ +%{_libdir}/kadu/modules/%1.so\ +%{_datadir}/kadu/modules/%1.desc\ +%if "%{-c}" \ +%{_datadir}/kadu/modules/configuration/%1.ui\ +%endif\ +%if "%{-t}" \ +%{_datadir}/kadu/modules/translations/%{1}_*.qm\ +%endif\ +%if "%{-d}" \ +%{_datadir}/kadu/modules/data/%1\ +%endif\ +%nil + +# kadu.spec +# table to make it possible to find out quickly which +# subpackage has which source's number +# LAST NUMBER: 125 +# 116 agent +# 101 amarok_mediaplayer +# 102 ao_sound +# 103 audacious_mediaplayer +# 104 dcopexport +# 117 falf_mediaplayer +# 105 filedesc +# 121 filtering +# 122 firewall +# 106 led_notify +# 118 mail +# 107 mediaplayer +# 108 miastoplusa_sms +# 119 mime_tex +# 120 mx610_notify +# 124 osdhints_notify +# 123 panelkadu +# 109 pcspeaker +# 110 profiles +# 111 screenshot +# 112 spellchecker +# 113 tabs +# 125 water_notify +# 114 weather +# 115 xmms_mediaplayer +# the modules above aren't all external modules +# so here's the full list +# agent +# alsa_sound +# amarok_mediaplayer +# ao_sound +# arts_sound +# audacious_mediaplayer +# dcopexport +# esd_sound +# filedesc +# filtering +# firewall +# led_notify +# mediaplayer +# miastoplusa_sms +# osdhints_notify +# panelkadu +# pcspeaker +# profiles +# screenshot +# spellchecker +# tabs +# water_notify +# weather +# xmms_mediaplayer + +# whether we want to build certain subpackages or not +# by default, we want them all +%bcond_without agent +%bcond_without alsa_sound +%bcond_without amarok_mediaplayer +%bcond_without ao_sound +%bcond_without arts_sound +%bcond_without audacious_mediaplayer +%bcond_without dcopexport +%bcond_without esd_sound +%bcond_without falf_mediaplayer +%bcond_without filedesc +%bcond_without filtering +%bcond_without firewall +%bcond_without led_notify +%bcond_without mail +%bcond_without mediaplayer +%bcond_without mime_tex +%bcond_without miastoplusa_sms +%bcond_without mx610_notify +%bcond_without osdhints_notify +%bcond_without panelkadu +%bcond_without pcspeaker +%bcond_without profiles +%bcond_without screenshot +%bcond_without spellchecker +%bcond_without tabs +%bcond_without water_notify +%bcond_without weather +%bcond_without xmms_mediaplayer # doesn't build right now +%bcond_without existing_libgadu # current release of libgadu is too old + # to work properly. Until there's no new release, we must use + # internal libgadu of kadu. + + Name: kadu -Version: 0.5.0 -Release: 2%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: An Gadu-Gadu client for online messaging +Summary(pl): Klient Gadu-Gadu Group: Applications/Internet -License: GPL +License: GPLv2 URL: http://www.kadu.net -Source0: http://www.kadu.net/download/stable/kadu-0.5.0.tar.bz2 +Source0: http://www.kadu.net/download/stable/kadu-%{version}.tar.bz2 Source3: kadu.desktop -# Sources 100-149 are external modules -Source100: http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.32.tar.gz -Source101: http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.19.tar.gz -Source102: http://scripts.one.pl/filedesc/devel/0.5.0/filedesc-1.12.tar.gz -Source103: http://www.kadu.net/download/modules_mirror/mail-current.tar.gz -Source104: http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.18.tar.gz -Source105: http://kadu.net/~blysk/weather-3.03.tar.bz2 -Source106: http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta9.tar.bz2 -Source107: http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2 -Source108: http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.5-1.3.5.tar.gz -Source109: http://www.kadu.net/download/modules_mirror/tabs-current.tar.gz -Source110: http://kadu.net/~blysk/led_notify-0.9.tar.bz2 -Source111: http://www.kadu.net/~pan_wojtas/iwait4u/download/kadu-iwait4u-1.3.tar.gz -Source112: http://www.kadu.net/~joi/exec_notify/packages/exec_notify-20060424.tar.bz2 -Source113: http://www.kadu.net/~patryk/powerkadu/powerkadu-20061026.tar.gz -Source114: http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz -Source115: http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2 -Source116: http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz -Source117: http://www.kadu.net/~joi/advanced_userlist/packages/advanced_userlist-20061010.tar.bz2 -Source118: http://www.kadu.net/~pan_wojtas/osdhints_notify/download/kadu-osdhints_notify-0.3.2.1.tar.gz -Source119: http://scripts.one.pl/screenshot/devel/0.5.0/screenshot-0.4.4.tar.gz - -Patch0: kadu-0.5.0-tabs_patch.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libpng-devel qt-devel libsndfile-devel openssl-devel libgadu-devel -%define _kadudir %{_datadir}/kadu -%define _kadulib %{_libdir}/kadu -%define _modlib %{_kadulib}/modules -%define _moddata %{_kadudir}/modules -%define _modtrans %{_moddata}/translations -%define _themesdir %{_datadir}/%{name}/themes -%define _translationsdir %{_kadudir}/translations - - -%define mod_files() %files %1 \ - %defattr(-,root,root,-) \ - %{_moddata}/%1.desc \ - %{_modlib}/%1.so \ - %{_modtrans}/%{1}*.qm \ - - -# -%define mod_files2() %files %1 \ - %defattr(-,root,root,-) \ - %{_moddata}/%1.desc \ - %{_modlib}/%1.so \ - %{_modtrans}/%{1}*.qm \ - %{_moddata}/data/%1 \ +# external modules: +%if %{with agent} +Source116: http://misiek.jah.pl/assets/2008/2/8/agent-0.4.4.tar.gz +%endif +%if %{with amarok_mediaplayer} +Source101: http://www.kadu.net/download/modules_extra/amarok_mediaplayer/amarok_mediaplayer-20071220.tar.bz2 +%endif +%if %{with ao_sound} +Source102: http://www.kadu.net/~joi/ao_sound/packages/ao_sound-20060424.tar.bz2 +%endif +%if %{with audacious_mediaplayer} +Source103: http://www.kadu.net/download/modules_extra/audacious_mediaplayer/audacious_mediaplayer-20080224.tar.bz2 +%endif +%if %{with dcopexport} +Source104: http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.3-20071129-0.6.0.tar.bz2 +%endif +%if %{with falf_mediaplayer} +Source117: http://www.kadu.net/download/modules_extra/falf_mediaplayer/falf_mediaplayer-20071225.tar.bz2 +%endif +%if %{with filedesc} +Source105: http://www.kadu.net/download/modules_extra/filedesc/filedesc-20080104.tar.bz2 +%endif +%if %{with filtering} +Source121: http://www.kadu.net/download/modules_extra/filtering/filtering-20080224.tar.bz2 +%endif +%if %{with firewall} +Source122: http://www.kadu.net/~dorr/moduly/kadu-firewall-0.7.5.tar.bz2 +%endif +%if %{with led_notify} +Source106: http://kadu.net/~blysk/led_notify-0.18.tar.bz2 +%endif +%if %{with mail} +Source118: http://www.kadu.net/~weagle/mail/mail-0.3.3.tar.bz2 +%endif +%if %{with mediaplayer} +Source107: http://www.kadu.net/download/modules_extra/mediaplayer/mediaplayer-20080224.tar.bz2 +%endif +%if %{with miastoplusa_sms} +Source108: http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.6-1.3.9.tar.gz +%endif +%if %{with mime_tex} +Source119: http://kadu.net/~patryk/mime_tex/mime_tex-1.4.1.tar.bz2 +%endif +%if %{with mx610_notify} +Source120: http://kadu.jarzebski.pl/mx610_notify-0.3.1.tar.bz2 +%endif +%if %{with osdhints_notify} +Source124: http://www.kadu.net/~dorr/moduly/kadu-osdhints_notify-0.4.0.9.tar.bz2 +%endif +%if %{with panelkadu} +Source123: http://www.ultr.pl/kadu/panelkadu-0.6-beta3.tar.gz +%endif +%if %{with pcspeaker} +Source109: http://kadu.net/~dorr/moduly/kadu-pcspeaker-0.6.0.3.tar.bz2 +%endif +%if %{with profiles} +Source110: http://www.kadu.net/~dorr/moduly/kadu-profiles-0.3.1.tar.bz2 +%endif +%if %{with screenshot} +Source111: http://www.kadu.net/download/modules_extra/screenshot/screenshot-20080104.tar.bz2 +%endif +%if %{with spellchecker} +Source112: http://www.kadu.net/download/modules_extra/spellchecker/spellchecker-20071230.tar.bz2 +%endif +%if %{with tabs} +Source113: http://www.kadu.net/~arvenil/tabs/download/0.6.0/kadu-tabs-1.1.4.tar.bz2 +%endif +%if %{with water_notify} +Source125: http://kadu.jarzebski.pl/water_notify-0.1.1-try2.tar.bz2 +%endif +%if %{with weather} +Source114: http://kadu.net/~blysk/weather-3.13.tar.bz2 +%endif +%if %{with xmms_mediaplayer} +Source115: http://www.kadu.net/download/modules_extra/xmms_mediaplayer/xmms_mediaplayer-20080116.tar.bz2 +%endif -#above is two macros to make easier creating files section of modules +#Patch0: kadu-0.6.0-xmmsfix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libpng-devel qt-devel libsndfile-devel openssl-devel +%if %{with existing_libgadu} +BuildRequires: libgadu-devel +%endif +Obsoletes: kadu-extinfo < 0.6.0-0.1.alpha1 +Obsoletes: kadu-iwait4u < 0.6.0-0.1.alpha1 +Obsoletes: kadu-powerkadu < 0.6.0-0.1.alpha1 +Obsoletes: kadu-advanced_userlist < 0.6.0-0.1.alpha1 +Provides: kadu-advanced_userlist = %{version}-%{release} +Obsoletes: kadu-exec_notify < 0.6.0-0.1.alpha1 +Provides: kadu-exec_notify = %{version}-%{release} %description -Kadu is client of Gadu-Gadu 6.1 protocol. It's an Internet Messager for Linux -and UN*X or Mac OS X. +Kadu is a dynamically evolving instant messenger compatible with the Gadu-Gadu +protocol. + +%description -l pl +Kadu to dynamicznie rozwijaj??cy si?? komunikator internetowy kompatybilny z +protoko??em Gadu-Gadu. %package devel Summary: Development headers for Kadu +Summary(pl): Pliki nag????wkowe dla Kadu Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: qt-devel +Requires: pkgconfig %description devel -Develpoment headers for Kadu. +Kadu is a dynamically evolving instant messenger compatible with the Gadu-Gadu +protocol. +This package contains develpoment headers for Kadu. +%description devel -l pl +Kadu to dynamicznie rozwijaj??cy si?? komunikator internetowy kompatybilny z +protoko??em Gadu-Gadu. +Ten pakiet zawiera pliki nag????wkowe dla Kadu. + +%if %{with agent} +%package agent +Summary: Who has me on userlist +Summary(pl): Kto ma mnie na li??cie u??ytkownik??w +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description agent +Agent is a module to let an user find out who has him on userlist. + +%description agent -l pl +Agent to modu?? umo??liwiaj??cy dowiedzenie si?? u??ytkownikowi kto go ma na +swojej li??cie kontakt??w. -%package arts_sound -Summary: Arts module for Kadu -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -BuildRequires: arts-devel -%description arts_sound -aRts module for Kadu. - -%package esd_sound -Summary: ESD module for Kadu -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -BuildRequires: esound-devel -%description esd_sound -ESD module for Kadu. +%endif +%if %{with alsa_sound} %package alsa_sound -Summary: ALSA module for Kadu +Summary: ALSA sound support +Summary(pl): Obs??uga d??wi??ku przez ALSA Group: Applications/Internet Requires: %{name} = %{version}-%{release} BuildRequires: alsa-lib-devel %description alsa_sound -ALSA module for Kadu. +Alsa_sound is a module to support sound with ALSA. -%package xmms -Summary: Xmms module for Kadu -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -Requires: xmms -BuildRequires: xmms-devel -%description xmms -xmms player support. +%description alsa_sound -l pl +Alsa_sound to modu?? umo??liwiaj??cy obs??ug?? d??wi??ku przez ALSA. -%package amarok -Summary: Amarok module for Kadu -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -Requires: kdelibs amarok -BuildRequires: kdelibs-devel -%description amarok -amaroK player support. +%endif -%package filedesc -Summary: Filedesc module for Kadu +%if %{with amarok_mediaplayer} +%package amarok_mediaplayer +Summary: Amarok support in mediaplayer module +Summary(pl): Wsparcie dla Amaroka w module mediaplayer Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description filedesc -Description from file module. +Requires: kadu-mediaplayer = %{version}-%{release} +Obsoletes: kadu-amarok < 0.6.0-0.1.alpha1 +Provides: kadu-amarok = %{version}-%{release} +BuildRequires: kdelibs3-devel +%description amarok_mediaplayer +Amarok_mediaplayer is a module to put title of current song from Amarok in +your status. -%package weather -Summary: Weather module for Kadu -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -%description weather -Weather checking. +%description amarok_mediaplayer -l pl +Amarok_mediaplayer to modu?? umo??liwiaj??cy umieszczenie tytu??u aktualnie +s??uchanej piosenki w Amaroku w opisie. -%package mail -Summary: mail module for Kadu +%endif + +%if %{with ao_sound} +%package ao_sound +Summary: AO library sound module +Summary(pl): Modu?? obs??uguj??cy d??wi??k przy pomocy libao Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description mail -Mail checker module. +BuildRequires: libao-devel +%description ao_sound +Ao_sound is a module to support sound using libao. -%package spellchecker -Summary: Spellchecker module for Kadu +%description ao_sound -l pl +Ao_sound to modu?? umo??liwiaj??cy obs??ug?? d??wi??ku przy u??yciu libao. + +%endif + +%if %{with arts_sound} +%package arts_sound +Summary: ARts sound support +Summary(pl): Obs??uga d??wi??ku przez aRts Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Requires: aspell -BuildRequires: aspell-devel -%description spellchecker -Spellchecking in chat window. +BuildRequires: arts-devel -%package ext_info -Summary: Ext_info module for Kadu +%description arts_sound +Alsa_sound is a module to support sound with aRts. + +%description arts_sound -l pl +Alsa_sound to modu?? umo??liwiaj??cy obs??ug?? d??wi??ku przez aRts. + +%endif + +%if %{with audacious_mediaplayer} +%package audacious_mediaplayer +Summary: Audacious support in mediaplayer module +Summary(pl): Wsparcie dla Audacious w module mediaplayer Group: Applications/Internet +BuildRequires: audacious-devel dbus-glib-devel Requires: %{name} = %{version}-%{release} -%description ext_info -Additional contact info, birthday and name-day notifier. +Requires: kadu-mediaplayer = %{version}-%{release} + +%description audacious_mediaplayer +Audacious_mediaplayer is a module to put title of current song from +Audacious in your status. + +%description audacious_mediaplayer -l pl +Audacious_mediaplayer to modu?? umo??liwiaj??cy umieszczenie tytu??u aktualnie +s??uchanej piosenki w Audacious w opisie. +%endif + +%if %{with dcopexport} %package dcopexport -Summary: Dcopexport module for Kadu +Summary: Export some functions via DCOP +Summary(pl): Eksport kilku funkcji poprzez DCOP Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Requires: kdelibs -BuildRequires: kdelibs-devel +BuildRequires: kdelibs3-devel %description dcopexport -Export some functions via DCOP. +Dcopexport is a module to export some Kadu functions using DCOP, e.g. +it allows you to use gg://xxx links. -%package miastoplusa_sms -Summary: Miastoplusa_sms module for Kadu +%description dcopexport -l pl +Dcopexport to modu?? eksportuj??cy cz?????? funkcji Kadu poprzez DCOP, m. in. +umo??liwia obs??ug?? link??w typu gg://xxx. + +%endif + +%if %{with esd_sound} +%package esd_sound +Summary: ESD sound support +Summary(pl): Obs??uga d??wi??ku przez ESD Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Requires: curl openssl -BuildRequires: curl-devel openssl-devel -%description miastoplusa_sms -Miasto Plusa SMS Gateway support. +BuildRequires: esound-devel +%description esd_sound +Alsa_sound is a module to support sound with ESD. -%package tabs -Summary: Tabs module for Kadu +%description esd_sound -l pl +Alsa_sound to modu?? umo??liwiaj??cy obs??ug?? d??wi??ku przez ESD. + +%endif + +%if %{with falf_mediaplayer} +%package falf_mediaplayer +Summary: FALF support in mediaplayer module +Summary(pl): Wsparcie dla FALF w module mediaplayer +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description falf_mediaplayer +Falf_mediaplayer is a module to put title of current song from +FALF in your status + +%description falf_mediaplayer -l pl +Falf_mediaplayer to modu?? umo??liwiaj??cy umieszczenie tytu??u aktualnie +s??uchanej piosenki w FALF w opisie. + +%endif + +%if %{with filedesc} +%package filedesc +Summary: Get status from file +Summary(pl): Pobieranie opis??w z pliku Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Requires: curl openssl -BuildRequires: curl-devel -%description tabs -Tabbed chat dialog module. +%description filedesc +Filedesc is a module to get your status text from a given file. + +%description filedesc -l pl +Filedesc to modu?? umo??liwiaj??cy pobieranie tekstu opisu z pliku. + +%endif + +%if %{with filtering} +%package filtering +Summary: User list filtering +Summary(pl): Filtrowanie listy kontakt??w +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description filtering +Filtering is a module to filter visible contacts in user list. + +%description filtering -l pl +Filtering to modu?? umo??liwiaj??cy filtrowanie widocznych +kontakt??w na li??cie. +%endif + +%if %{with firewall} +%package firewall +Summary: Protection against unwanted chats +Summary(pl): Ochrona przed niechcianymi rozmowami +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description firewall +Firewall is a module to ask a simple question to unknown +interlocutor. + +%description firewall -l pl +Firwall to modu?? zadaj??cy proste, zdefiniowane pytanie +nieznajomym rozm??wcom. + +%endif + +%if %{with led_notify} %package led_notify -Summary: Led_notify module for Kadu +Summary: Notification by Scroll Lock LED +Summary(pl): Powiadamianie diod?? Scroll Lock Group: Applications/Internet Requires: %{name} = %{version}-%{release} %description led_notify -Notification by Scroll Lock LED. +Led_notify is a module to notify user of some events using Scroll Lock +LED. + + +%description led_notify -l pl +Led_notify to modu?? umo??liwiaj??cy powiadamianie u??ytkownika o pewnych +zdarzenia przy u??yciu diody Scroll Lock. + +%endif + +%if %{with mail} +%package mail +Summary: Mail checking module +Summary(pl): Modu?? do sprawdzania poczty +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description mail +Mail is a module to check whether there are new mails. + +%description mail -l pl +Mail to modu?? do sprawdzania czy s?? nowe maile. + +%endif -%package iwait4u -Summary: Iwait4u module for Kadu +%if %{with mediaplayer} +%package mediaplayer +Summary: Put a current song name in status +Summary(pl): Wstawianie tytu??u s??uchanej piosenki w opisie Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description iwait4u -Shows message, when user you're waiting for is online. +%description mediaplayer +Mediaplayer is a module to put title of current song in status. -%package exec_notify -Summary: Exec_notify module for Kadu +%description mediaplayer -l pl +Mediaplayer to modu?? umo??liwiaj??cy umieszczenie tytu??u obecnie s??uchanej +piosenki w opisie. + +%endif + +%if %{with miastoplusa_sms} +%package miastoplusa_sms +Summary: Miasto Plusa SMS gateway support +Summary(pl): Obs??uga bramki SMS Miasto Plusa Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description exec_notify -Notification by external commands module. +BuildRequires: curl-devel +%description miastoplusa_sms +Miastoplusa_sms is a module to support Miasto Plusa SMS Gateway. + +%description miastoplusa_sms -l pl +Miastoplusa_sms to modu?? umo??liwiaj??cy obs??ug?? bramki SMS-owej "Miasto +Plusa". + +%endif + +%if %{with mime_tex} +%package mime_tex +Summary: TeX formulas support +Summary(pl): Obs??uga formu?? matematycznych TeX +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description mime_tex +Mime_tex is a module to edit TeX mathematic formulas in chat window. -%package powerkadu -Summary: Powerkadu module for Kadu +%description mime_tex -l pl +Mime_tex to modu?? umo??liwiaj??cy edycj?? formu?? matematycznych TeX +w oknie rozmowy. + +%endif + +%if %{with mx610_notify} +%package mx610_notify +Summary: Notify with LED on Logitech MX610 mouse +Summary(pl): Powiadamianie diodami LED w myszce Logitech MX610 +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description mx610_notify +Mx610_notify is a module to notify user of some events using LED +on Logitech MX610 mouse. + +%description mx610_notify -l pl +Mx610_notify to modu?? umo??liwiaj??cy powiadamianie u??ytkownika +o pewnych zdarzeniach przy pomocy diod LED myszki Logitech MX610. + +%endif + +%if %{with osdhints_notify} +%package osdhints_notify +Summary: Notification by OSD-like hints +Summary(pl): Powiadamanie o zdarzeniach przy pomocy dymk??w typu OSD +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description osdhints_notify +Osdhints_notify is a module to notify users about some events +with OSD-like hints. + +%description osdhints_notify -l pl +Osdhints_notify to modu?? umo??liwiaj??cy powiadamianie u??ytkownika +o pewnych zdarzeniach przy pomocy dymk??w typu OSD. + +%endif + + +%if %{with panelkadu} +%package panelkadu +Summary: Makes a panel from Kadu main window +Summary(pl): Zamienia Kadu w panel na skraju ekranu +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description panelkadu +Panelkadu is a module to make a panel from Kadu main window. + +%description panelkadu -l pl +Panelkadu to modu?? zamieniaj??cy kadu w panel na skraju ekranu. + +%endif + + +%if %{with pcspeaker} +%package pcspeaker +Summary: Notify by PC Speaker +Summary(pl): Powiadamianie przy pomocy PC Speakera Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description powerkadu -Improvement of Kadu capabilities. +%description pcspeaker +Pcspeaker is a module to notify user of some events using PC Speaker. + +%description pcspeaker -l pl +Pcspeaker to modu?? umo??liwiaj??cy powiadamianie u??ytkownika o pewnych +zdarzeniach przy pomocy PC Speakera. + +%endif + +%if %{with profiles} %package profiles -Summary: Profiles module for kadu +Summary: Profiles support +Summary(pl): Obs??uga profili Group: Applications/Internet Requires: %{name} = %{version}-%{release} %description profiles -Profiles support +Profiles is a module to quick and comfortable support of multiple +profiles. -%package filtering -Summary: Filtering module for kadu +%description profiles -l pl +Profiles to modu?? umo??liwiaj??cy szybk?? i wygodn?? obs??ug?? wielu +profili. + +%endif + +%if %{with screenshot} +%package screenshot +Summary: Make a screenshot and send it +Summary(pl): Tworzenie zrzutu ekranu i wys??anie go Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description filtering -User list filtering +%description screenshot +Screenshot is a module to select a part of the screen and send an +image with its content. -%package firewall -Summary: Firewall module for Kadu +%description screenshot -l pl +Screenshot to modu?? umo??liwiaj??cy zaznaczenie cz????ci ekranu +i wys??ania obrazka z jego zawarto??ci??. + +%endif + +%if %{with spellchecker} +%package spellchecker +Summary: Spellchecking in chat window +Summary(pl): Sprawdzanie pisowni w oknie rozmowy Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description firewall -Protection against unwanted chats +BuildRequires: aspell-devel +%description spellchecker +Spellchecker is a module to check spelling in chat window. -%package wmaker_docking -Summary: Wmaker_docking module for Kadu +%description spellchecker -l pl +Spellchecker to modu?? umo??liwiaj??cy sprawdzanie pisowni w oknie +rozmowy. + +%endif + +%if %{with tabs} +%package tabs +Summary: Tabbed chat dialog +Summary(pl): Okno rozmowy z zak??adkami Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description wmaker_docking -WindowMaker docking module +%description tabs +Tabs is a module to add a feature to use one window to talk with all +people and use cards to switch them. + +%description tabs -l pl +Tabs to modu?? dodaj??cy mo??liwo???? prowadzenia rozm??w w jednym oknie, +w kt??rym pomi??dzy poszczeg??lnymi rozm??wcami prze????cza si?? przy pomocy +zak??adek. + +%endif + +%if %{with water_notify} +%package water_notify +Summary: Notifications by Water Compiz plugin +Summary(pl): Powiadomienia kroplami wody w Compiz +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +BuildRequires: dbus-devel +%description water_notify +Water_notify is a module to notify user about some events with +Water Compiz plugin. + +%description water_notify -l pl +Water_notify to modu?? umo??liwiaj??cy powiadamianie u??ytkownika +o pewnych zdarzeniach przy u??yciu wtyczki Woda z Compiza. + +%endif -%package advanced_userlist -Summary: Advanced_userlist module for Kadu + +%if %{with weather} +%package weather +Summary: Weather checking +Summary(pl): Sprawdzanie pogody Group: Applications/Internet Requires: %{name} = %{version}-%{release} -%description advanced_userlist -User list: support for priorities (VIP/NIP) and -changing order of sorting functions. - -%package osdhints_notify -Summary: Osdhints_notify module for Kadu +%description weather +Weather is a module to check weather forecast for a few nearest days. +It also allows to check weather for people in contact list and any other +city that is available. + +%description weather -l pl +Modu?? pobiera i wy??wietla informacje pogodowe oraz prognoz?? na nast??pne +dni. Umo??liwia wy??wietlenie pogody dla wybranego kontaktu na li??cie +kontakt??w oraz dla dowolnego miasta, dla kt??rego dost??pna jest prognoza. + +%endif + +%if %{with xmms_mediaplayer} +%package xmms_mediaplayer +Summary: Xmms support in mediaplayer module +Summary(pl): Wsparcie dla Xmms w module mediaplayer Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -%description osdhints_notify -Notification by OSD-like hints +BuildRequires: xmms-devel +Requires: %{name} = %{version}-%{release} +Requires: kadu-mediaplayer = %{version}-%{release} +Obsoletes: kadu-xmms < 0.6.0-0.1.alpha1 +Provides: kadu-xmms = %{version}-%{release} +%description xmms_mediaplayer +Xmms_mediaplayer is a module to put title of current song from xmms in +your status. + +%description xmms_mediaplayer -l pl +Xmms_mediaplayer to modu?? umo??liwiaj??cy umieszczenie tytu??u aktualnie +s??uchanej piosenki w xmms w opisie. + +%endif -%package screenshot -Summary: Screenshot module for Kadu -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -%description screenshot -Adds a possibility to select a screen's fragment -and send image with its content. %prep %setup -q -n kadu -%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -a 117 -a 118 -a 119 -n kadu/modules +#%setup -q -D -T -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -n kadu/modules +%unpack_module_source 101 amarok_mediaplayer +%unpack_module_source 102 ao_sound +%unpack_module_source 103 audacious_mediaplayer +%unpack_module_source 104 dcopexport +%unpack_module_source 105 filedesc +%unpack_module_source 106 led_notify +%unpack_module_source 107 mediaplayer +%unpack_module_source 108 miastoplusa_sms +%unpack_module_source 109 pcspeaker +%unpack_module_source 110 profiles +%unpack_module_source 111 screenshot +%unpack_module_source 112 spellchecker +%unpack_module_source 113 tabs +%unpack_module_source 114 weather +%unpack_module_source 115 xmms_mediaplayer +%unpack_module_source 116 agent +%unpack_module_source 117 falf_mediaplayer +%unpack_module_source 118 mail +%unpack_module_source 119 mime_tex +%unpack_module_source 120 mx610_notify +%unpack_module_source 121 filtering +%unpack_module_source 122 firewall +%unpack_module_source 123 panelkadu +%unpack_module_source 124 osdhints_notify +%unpack_module_source 125 water_notify %setup -q -D -T -n kadu -%patch0 -p1 -b tabs_patch - -##==some changes in .config file -#1. compile something as shared... -# module_mail \ -SHARED_CHANGES="module_alsa_sound \ - module_arts_sound \ - module_esd_sound \ - module_xmms \ - module_amarok \ - module_filedesc \ - module_spellchecker \ - module_weather \ - module_ext_info \ - module_dcopexport \ - module_miastoplusa_sms \ - module_tabs\ - module_led_notify \ - module_iwait4u\ - module_powerkadu \ - module_filtering \ - module_profiles \ - module_mail \ - module_exec_notify \ - module_firewall \ - module_advanced_userlist \ - module_osdhints_notify \ - module_screenshot \ - module_wmaker_docking" -for change in $SHARED_CHANGES; do -sed s/^$change=.$/$change=m/ -i .config -done - -##==add shellbang to beginning of file -sed 1i\#\!/bin/sh -i modules/dcopexport/bin/install-konqueror-setAsKaduDesc.sh -#+ +%if %{with alsa_sound} +sed "s#^module_alsa_sound=.#module_alsa_sound=m#" -i .config +%endif +%if %{with arts_sound} +sed "s#^module_arts_sound=.#module_arts_sound=m#" -i .config +%endif +%if %{with esd_sound} +sed "s#^module_esd_sound=.#module_esd_sound=m#" -i .config +%endif + +%if %{with audacious_mediaplayer} +pushd modules/audacious_mediaplayer +sed 's#cflags`#cflags` -I/usr/include/dbus-1.0#' -i spec +# above adds missing include path +popd +%endif %build +%if %{with existing_libgadu} +%define _with_existing_libgadu 1 +%endif unset QTDIR || : ; . /etc/profile.d/qt.sh -%configure --enable-debug --disable-dependency-tracking --with-existing-libgadu +%configure --enable-debug \ + %{?_with_existing_libgadu:--with-existing-libgadu} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/kadu.desktop ##==change permissions of .so files: for binary in `find $RPM_BUILD_ROOT -type f -name *.so`; do chmod a+x $binary @@ -314,10 +780,7 @@ #+ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - --add-category Application \ %{SOURCE3} - %clean rm -rf $RPM_BUILD_ROOT @@ -328,168 +791,325 @@ %{_bindir}/kadu %{_bindir}/kadu-mozilla %{_datadir}/applications/fedora-kadu.desktop -%dir %{_kadulib} -%dir %{_modlib} -%{_modlib}/account_management.so -%{_modlib}/arts_sound.so -%{_modlib}/autoaway.so -%{_modlib}/autoresponder.so -%{_modlib}/config_wizard.so -%{_modlib}/dcc.so -%{_modlib}/default_sms.so -%{_modlib}/dsp_sound.so -%{_modlib}/encryption.so -%{_modlib}/ext_sound.so -%{_modlib}/hints.so -%{_modlib}/migration.so -%{_modlib}/sms.so -%{_modlib}/voice.so -%{_modlib}/window_notify.so -%{_modlib}/x11_docking.so -%dir %{_modlib}/bin -%ghost %{_datadir}/applnk/Internet/kadu.desktop -%dir %{_kadudir} -%{_kadudir}/AUTHORS -%{_kadudir}/ChangeLog -%{_kadudir}/COPYING -%{_kadudir}/HISTORY -%{_kadudir}/README -%{_kadudir}/THANKS -%dir %{_moddata} -%{_moddata}/account_management.desc -%{_moddata}/arts_sound.desc -%{_moddata}/autoaway.desc -%{_moddata}/autoresponder.desc -%{_moddata}/config_wizard.desc -%{_moddata}/dcc.desc -%{_moddata}/default_sms.desc -%{_moddata}/dsp_sound.desc -%{_moddata}/encryption.desc -%{_moddata}/ext_sound.desc -%{_moddata}/hints.desc -%{_moddata}/migration.desc -%{_moddata}/sms.desc -%{_moddata}/voice.desc -%{_moddata}/window_notify.desc -%{_moddata}/x11_docking.desc -%{_moddata}/docking.desc -%{_moddata}/notify.desc -%{_moddata}/sound.desc -%dir %{_moddata}/data -%{_moddata}/data/config_wizard -%dir %{_modtrans} -%{_modtrans}/account_management_*.qm -%{_modtrans}/autoaway_*.qm -%{_modtrans}/autoresponder_*.qm -%{_modtrans}/config_wizard_*.qm -%{_modtrans}/dcc_*.qm -%{_modtrans}/default_sms_*.qm -%{_modtrans}/dsp_sound_*.qm -%{_modtrans}/encryption_*.qm -%{_modtrans}/ext_sound_*.qm -%{_modtrans}/hints_*.qm -%{_modtrans}/migration_*.qm -%{_modtrans}/sms_*.qm -%{_modtrans}/voice_*.qm -%{_modtrans}/window_notify_*.qm -%{_modtrans}/x11_docking_*.qm -%{_modtrans}/docking_*.qm -%{_modtrans}/notify_*.qm -%{_modtrans}/sound_*.qm -%dir %{_themesdir} -%dir %{_themesdir}/emoticons -%{_themesdir}/emoticons/penguins -%dir %{_themesdir}/icons -%{_themesdir}/icons/default -%dir %{_themesdir}/sounds -%{_themesdir}/sounds/default -%{_translationsdir} +%dir %{_libdir}/kadu +%dir %{_libdir}/kadu/modules +%dir %{_libdir}/kadu/modules/bin +%dir %{_datadir}/kadu +%{_datadir}/kadu/syntax +%{_datadir}/kadu/AUTHORS +%{_datadir}/kadu/ChangeLog +%{_datadir}/kadu/COPYING +%{_datadir}/kadu/HISTORY +%{_datadir}/kadu/README +%{_datadir}/kadu/THANKS +%{_datadir}/kadu/configuration +%dir %{_datadir}/kadu/modules +%dir %{_datadir}/kadu/modules/configuration +%dir %{_datadir}/kadu/modules/data +%dir %{_datadir}/kadu/modules/translations +%dir %{_datadir}/kadu/themes +%dir %{_datadir}/kadu/themes/emoticons +%{_datadir}/kadu/themes/emoticons/penguins +%dir %{_datadir}/kadu/themes/icons +%{_datadir}/kadu/themes/icons/default +%dir %{_datadir}/kadu/themes/sounds +%{_datadir}/kadu/themes/sounds/default +%{_datadir}/kadu/translations %{_datadir}/pixmaps/kadu*.png +%{_datadir}/kadu/modules/docking.desc +%{_datadir}/kadu/modules/configuration/docking.ui +%{_datadir}/kadu/modules/translations/docking_*.qm +%{_datadir}/kadu/modules/notify.desc +%{_datadir}/kadu/modules/configuration/notify.ui +%{_datadir}/kadu/modules/translations/notify_*.qm +%{_datadir}/kadu/modules/sound.desc +%{_datadir}/kadu/modules/configuration/sound.ui +%{_datadir}/kadu/modules/translations/sound_*.qm +%if ! %{with existing_libgadu} +%exclude %{_libdir}/libgadu*a +%endif + +# internal modules: +%module_files account_management -t +%module_files advanced_userlist -ct +%module_files autoaway -ct +%module_files autoresponder -ct +%module_files config_wizard -td +%module_files dcc -ct +%module_files default_sms -ct +%module_files dsp_sound -ct +%module_files encryption -ct +%module_files exec_notify -t +%module_files ext_sound -ct +%module_files hints -ct +%module_files history -ct +%module_files migration -t +%module_files sms -ct +%module_files voice -ct +%module_files window_notify -t +%module_files x11_docking -t %files devel %defattr(-,root,root,-) %{_bindir}/kadu-config %{_includedir}/kadu +%if ! %{with existing_libgadu} +%exclude %{_includedir}/libgadu.h +%exclude %{_libdir}/pkgconfig/libgadu.pc +%exclude %{_libdir}/libgadu* +%endif +# external modules: + +%if %{with agent} +%files agent +%defattr(-, root, root, -) +%module_files agent -t +%endif + +%if %{with amarok_mediaplayer} +%files amarok_mediaplayer +%defattr(-, root, root, -) +%module_files amarok_mediaplayer +%endif -%files arts_sound -%defattr(-,root,root,-) -%{_moddata}/arts_sound.desc -%{_modlib}/arts_sound.so -%{_modlib}/bin/arts_sound - -%files esd_sound -%defattr(-,root,root,-) -%{_moddata}/esd_sound.desc -%{_modlib}/esd_sound.so - -%files wmaker_docking -%defattr(-,root,root,-) -%{_moddata}/wmaker_docking.desc -%{_modlib}/wmaker_docking.so - +%if %{with alsa_sound} %files alsa_sound -%defattr(-,root,root,-) -%{_moddata}/alsa_sound.desc -%{_modlib}/alsa_sound.so -%{_modtrans}/alsa_sound_*.qm - -%mod_files2 xmms - - -%mod_files2 amarok +%defattr(-, root, root, -) +%module_files alsa_sound -ct +%endif + +%if %{with ao_sound} +%files ao_sound +%defattr(-, root, root, -) +%module_files ao_sound +%endif +%if %{with arts_sound} +%files arts_sound +%defattr(-, root, root, -) +%module_files arts_sound +%{_libdir}/kadu/modules/bin/arts_sound +%endif + +%if %{with audacious_mediaplayer} +%files audacious_mediaplayer +%defattr(-, root, root, -) +%module_files audacious_mediaplayer +%endif + +%if %{with dcopexport} +%files dcopexport +%defattr(-, root, root, -) +%module_files dcopexport -dt +%{_libdir}/kadu/modules/bin/dcopexport +%endif -%mod_files2 filedesc - -%mod_files2 spellchecker - -%mod_files2 ext_info - -%mod_files2 dcopexport - -%{_modlib}/bin/dcopexport - -%mod_files2 miastoplusa_sms - -%mod_files2 tabs - -%mod_files2 powerkadu - -%{_modlib}/bin/powerkadu - -%mod_files2 filtering - -%mod_files2 firewall - - -%mod_files profiles - -%mod_files led_notify - -%mod_files iwait4u - -%mod_files exec_notify - -%mod_files mail - -%files advanced_userlist -%defattr(-,root,root,-) -%{_modlib}/advanced_userlist.so -%{_moddata}/advanced_userlist.desc - -%mod_files2 osdhints_notify +%if %{with esd_sound} +%files esd_sound +%defattr(-, root, root, -) +%module_files esd_sound +%endif + +%if %{with falf_mediaplayer} +%files falf_mediaplayer +%defattr(-, root, root, -) +%module_files falf_mediaplayer +%endif + +%if %{with filedesc} +%files filedesc +%defattr(-, root, root, -) +%module_files filedesc -cdt +%endif + +%if %{with filtering} +%files filtering +%defattr(-, root, root, -) +%module_files filtering -cdt +%endif + +%if %{with firewall} +%files firewall +%defattr(-, root, root, -) +%module_files firewall -ct +%endif + +%if %{with led_notify} +%files led_notify +%defattr(-, root, root, -) +%module_files led_notify -ct +%endif + +%if %{with mail} +%files mail +%defattr(-, root, root, -) +%module_files mail -ct +%endif + +%if %{with mediaplayer} +%files mediaplayer +%defattr(-, root, root, -) +%module_files mediaplayer -cdt +%endif + +%if %{with miastoplusa_sms} +%files miastoplusa_sms +%defattr(-, root, root, -) +%module_files miastoplusa_sms -cdt +%endif + +%if %{with mime_tex} +%files mime_tex +%defattr(-, root, root, -) +%module_files mime_tex -cdt +%{_libdir}/kadu/modules/bin/mime_tex +%endif + +%if %{with mx610_notify} +%files mx610_notify +%defattr(-, root, root, -) +%module_files mx610_notify -ct +%endif + +%if %{with osdhints_notify} +%files osdhints_notify +%defattr(-, root, root, -) +%module_files osdhints_notify -cdt +%endif + +%if %{with panelkadu} +%files panelkadu +%defattr(-, root, root, -) +%module_files panelkadu -ct +%endif + + +%if %{with pcspeaker} +%files pcspeaker +%defattr(-, root, root, -) +%module_files pcspeaker -ct +%endif + +%if %{with profiles} +%files profiles +%defattr(-, root, root, -) +%module_files profiles -t +%endif + +%if %{with screenshot} +%files screenshot +%defattr(-, root, root, -) +%module_files screenshot -cdt +%endif + +%if %{with spellchecker} +%files spellchecker +%defattr(-, root, root, -) +%module_files spellchecker -cdt +%endif + +%if %{with tabs} +%files tabs +%defattr(-, root, root, -) +%module_files tabs -ct +%endif + +%if %{with water_notify} +%files water_notify +%defattr(-, root, root, -) +%module_files water_notify -ct +%endif -%mod_files2 screenshot +%if %{with weather} %files weather -%defattr(-,root,root,-) -%{_modlib}/weather.so -%{_moddata}/weather.desc -%{_moddata}/data/weather +%defattr(-, root, root, -) +%module_files weather -cdt +%endif + +%if %{with xmms_mediaplayer} +%files xmms_mediaplayer +%defattr(-, root, root, -) +%module_files xmms_mediaplayer +%endif + %changelog +* Thu Feb 28 2008 Micha?? Bentkowski - 0.6.0-1 +- Stable +- New versions of osdhints_notify, audacious_mediaplayer, filtering, +mediaplayer and panelkadu + +* Mon Feb 18 2008 Micha?? Bentkowski - 0.6.0-0.12.rc4 +- rc4 +- Add modules: water_notify, osdhints_notify, panelkadu + +* Wed Feb 13 2008 Micha?? Bentkowski - 0.6.0-0.11.rc3 +- rc3 +- New firewall module +- New versions of some modules + +* Sun Feb 03 2008 Micha?? Bentkowski - 0.6.0-0.10.rc2.try2 +- rc2-try2 + +* Sun Feb 03 2008 Micha?? Bentkowski - 0.6.0-0.9.rc2 +- rc2 +- New versions of led_notify, weather, pcspeaker, mime_tex, tabs, +mediaplayer, xmms_mediaplayer and mail modules +- Add filtering module +- Get rid of xmmsfix patch +- Fix mail module + +* Sun Jan 13 2008 Micha?? Bentkowski - 0.6.0-0.8.rc1 +- rc1 +- New mx610_notify, falf_mediaplayer, mail and mime_tex modules. +- New versions of some modules + +* Sun Jan 06 2008 Micha?? Bentkowski - 0.6.0-0.7.beta2 +- Fix bug 427679 (add forgotten %% symbol in one place) + +* Sun Jan 06 2008 Micha?? Bentkowski - 0.6.0-0.6.beta2 +- Now forgot to include that one source changed its name + +* Sun Jan 06 2008 Micha?? Bentkowski - 0.6.0-0.5.beta2 +- Forgot to upload some sources... + +* Sat Jan 05 2008 Micha?? Bentkowski - 0.6.0-0.4.beta2 +- beta2 +- Add kadu-agent + +* Fri Dec 21 2007 Micha?? Bentkowski - 0.6.0-0.3.beta1 +- 0.6.0-beta1 +- Changes of almost everything, spec file has been completely rewritten +- Get rid of stupid macros including %%{_kadudir} and %%{_modtrans} +- Make it possible to build any subpackages whoever wants, no need to build +all +- Add Polish descriptions to all subpackages and change English ones +- There are too many changes to list all of them ;-) +- Hope it's now much more readable and user-friendly + +* Wed Dec 19 2007 Micha?? Bentkowski - 0.6.0-0.2.alpha2 +- 0.6.0-alpha2 +- New pcspeaker module +- New version of miastoplusa_sms, profiles, dcopexport + +* Sat Dec 01 2007 Micha?? Bentkowski - 0.6.0-0.1.alpha1 +- 0.6.0-alpha1 +- remove xmms, amarok, mail, extinfo, iwait4u, powerkadu, advanced_userlist, osdhints_notify, screenshot, firewall, filedesc +- update spellchecker, weather, dcopexport, miastopolusa_sms, tabs, led_notify, filtering +- get rid of tabs patch +- add filedesc, spellchecker and firewall patches +- exec_notify is now built-in + +* Fri Aug 24 2007 Micha?? Bentkowski - 0.5.0-4 +- Fix desktop file + +* Fri Aug 24 2007 Micha?? Bentkowski - 0.5.0-3 +- BuildID rebuild +- Fix License tag + * Thu Apr 05 2007 Micha?? Bentkowski - 0.5.0-2 -- Own %%{_moddata}/data (BZ: 233855) +- Own %%{_datadir}/kadu/modules/data (BZ: 233855) * Tue Jan 02 2007 Micha?? Bentkowski - 0.5.0-1 - Finally a stable release Index: sources =================================================================== RCS file: /cvs/extras/rpms/kadu/F-7/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 2 Jan 2007 20:33:34 -0000 1.12 +++ sources 5 Mar 2008 18:05:32 -0000 1.13 @@ -1,21 +1,26 @@ -62913be4ecb267b9bbf6d87dbb3e67e6 kadu-firewall-0.6.3.tar.gz -9b0622b02a7190502519b2e3034ccec4 dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2 -15e6ba4e7ec1cacce3290525cd51e696 exec_notify-20060424.tar.bz2 -d5e5718f3a64f33874a869b235bbdff7 filedesc-1.12.tar.gz -e9d8676608f8c731f665ffc5c5288ad0 filtering-0.3.2-20060727-0.5.0.tar.bz2 -6233a8ef21d901fc5fb91c0db40d0e32 kadu-iwait4u-1.3.tar.gz -739e2c76fdae17f570d1f4934958cae6 kadu-profiles-0.1.tar.gz -3f9e347fd775324f4077f2f6849a0de7 led_notify-0.9.tar.bz2 -fae1f6bd3d4aca845ef5a57403b5b58c miastoplusa_sms-0.5-1.3.5.tar.gz -6bf19f183eb4e5ea48e2a27d04da2ead spellchecker-0.18.tar.gz -ef56085ab7d8e60be15d86d2c5f4a424 tabs-current.tar.gz -30833253a9f94eedc892767c1267536a weather-3.03.tar.bz2 -270c19fc9fb3e96bcbce76c2077d3ec2 mail-current.tar.gz -11436971c7c45bb4b70f3d6ed569f95c powerkadu-20061026.tar.gz -69424cd8731b08962073c232c0505cfb ext_info-2.0beta9.tar.bz2 -e4ac1276f5326c5b17ef086ad2448e91 xmms-1.32.tar.gz -139e50cbe9ff2014ca35e9b3b4be1f67 amarok-1.19.tar.gz -403490d44e9650261809cdbca0de816a advanced_userlist-20061010.tar.bz2 -4568a1cf1b242642a1fc6629969d05dd kadu-osdhints_notify-0.3.2.1.tar.gz -c6da85999cfebef413d228dca9c7d91f screenshot-0.4.4.tar.gz -895f7c88d36dbb188e8bc26664fbf430 kadu-0.5.0.tar.bz2 +4401e0e3c509af347cb14a89236301ea agent-0.4.4.tar.gz +51d304e335e814f3d8c0f1654007a7d7 amarok_mediaplayer-20071220.tar.bz2 +95809d330e48e61f58ec961ddbf0b529 ao_sound-20060424.tar.bz2 +aa427d5b87fcc48cdd799cf19fe92da1 audacious_mediaplayer-20080224.tar.bz2 +b36fcfcf4756285f30cbb6c2b6c2a2da dcopexport-0.11.3-20071129-0.6.0.tar.bz2 +927db40f7136ff86b3e83307b5cec2d9 falf_mediaplayer-20071225.tar.bz2 +8d11979fa8a3795f7ab20fbb1fb8bdbb filedesc-20080104.tar.bz2 +a672d4ef9ce113196e4689b9141b4aef filtering-20080224.tar.bz2 +8f1ee07558c82573d2c6e7ccd05f224f kadu-0.6.0.tar.bz2 +9b0f04b4254b4ff08254b15e59a81be7 kadu-firewall-0.7.5.tar.bz2 +f515d2dd54d4a5948f691b05d13be70d kadu-osdhints_notify-0.4.0.9.tar.bz2 +4b8abfe0c57efabb49ba8c6c71a316f2 kadu-pcspeaker-0.6.0.3.tar.bz2 +d7ec7f808d15308d10ed76d1e3743f37 kadu-profiles-0.3.1.tar.bz2 +57e4c970f496ba81495d59d7b96bcdf1 kadu-tabs-1.1.4.tar.bz2 +786a0ee40a3aef03b51e2d89a2bceda5 led_notify-0.18.tar.bz2 +898561b215ac10a99be62fa4e3a50a55 mail-0.3.3.tar.bz2 +8a27d4873e6896d63f7c8193029b24ca mediaplayer-20080224.tar.bz2 +e5c4d5cd94cef40730e281b9a6c9ed37 miastoplusa_sms-0.6-1.3.9.tar.gz +d640b2ba650fb5aa0f3502ad7379b14b mime_tex-1.4.1.tar.bz2 +08bba105d9307bbf1a8e8482529441a4 mx610_notify-0.3.1.tar.bz2 +0070c9bb4559ec29bb1195acdc5c5967 panelkadu-0.6-beta3.tar.gz +47d3d5564b272a186667c1507e19844f screenshot-20080104.tar.bz2 +a46eab2f3d9c31cee13ccf3a441bceec spellchecker-20071230.tar.bz2 +10320f9b96366422bbcd7ec76d4e85a1 water_notify-0.1.1-try2.tar.bz2 +41a6edd1356a36e4606e432d0bc856f6 weather-3.13.tar.bz2 +97dd4c9cd19b69b9ab6d38a20cd37a2e xmms_mediaplayer-20080116.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 18:16:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 18:16:30 GMT Subject: rpms/perl-Class-Prototyped/devel .cvsignore, 1.2, 1.3 perl-Class-Prototyped.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803051816.m25IGUSX004439@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Prototyped/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4403 Modified Files: .cvsignore perl-Class-Prototyped.spec sources Log Message: 1.11 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Prototyped/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Apr 2007 22:46:01 -0000 1.2 +++ .cvsignore 5 Mar 2008 18:15:56 -0000 1.3 @@ -1 +1 @@ -Class-Prototyped-1.10.tar.gz +Class-Prototyped-1.11.tar.gz Index: perl-Class-Prototyped.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Prototyped/devel/perl-Class-Prototyped.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-Prototyped.spec 5 Mar 2008 16:58:44 -0000 1.3 +++ perl-Class-Prototyped.spec 5 Mar 2008 18:15:56 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Class-Prototyped -Version: 1.10 -Release: 3%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Fast prototype-based OO programming in Perl License: GPL+ or Artistic Group: Development/Libraries @@ -44,6 +44,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.11-1 +- 1.11 + * Wed Mar 5 2008 Tom "spot" Callaway 1.10-3 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Prototyped/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Apr 2007 22:46:01 -0000 1.2 +++ sources 5 Mar 2008 18:15:56 -0000 1.3 @@ -1 +1 @@ -82d22ef4628e276b2eb7d4debabdf31d Class-Prototyped-1.10.tar.gz +886c8f04a8c4eded5355fe7bca989ba6 Class-Prototyped-1.11.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 18:28:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 18:28:51 GMT Subject: rpms/perl-Crypt-OpenSSL-Bignum/devel perl-Crypt-OpenSSL-Bignum.spec, 1.6, 1.7 Message-ID: <200803051828.m25ISpdS004731@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Bignum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4677 Modified Files: perl-Crypt-OpenSSL-Bignum.spec Log Message: new perl Index: perl-Crypt-OpenSSL-Bignum.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Bignum/devel/perl-Crypt-OpenSSL-Bignum.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Crypt-OpenSSL-Bignum.spec 19 Feb 2008 04:46:24 -0000 1.6 +++ perl-Crypt-OpenSSL-Bignum.spec 5 Mar 2008 18:28:17 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Crypt-OpenSSL-Bignum Version: 0.04 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl interface to OpenSSL for Bignum License: GPL+ or Artistic Group: Development/Libraries @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.04-4 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.04-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 18:29:12 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 5 Mar 2008 18:29:12 GMT Subject: rpms/midisport-firmware/devel 81-midisport.rules, NONE, 1.1 midisport-firmware.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803051829.m25ITCXB004772@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/midisport-firmware/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4707/devel Modified Files: .cvsignore sources Added Files: 81-midisport.rules midisport-firmware.spec Log Message: Initial import --- NEW FILE 81-midisport.rules --- # do not edit this file, it will be overwritten on update ACTION!="add", GOTO="drivers_end" SUBSYSTEM=="usb", ENV{PRODUCT}=="763/1010/*", RUN+="/sbin/fxload -D $env{DEVNAME} -s /lib/firmware/MidiSportLoader.ihx -I /lib/firmware/MidiSport1x1.ihx" SUBSYSTEM=="usb", ENV{PRODUCT}=="763/1020/*", RUN+="/sbin/fxload -D $env{DEVNAME} -s /lib/firmware/MidiSportLoader.ihx -I /lib/firmware/MidiSport4x4.ihx" LABEL="drivers_end" --- NEW FILE midisport-firmware.spec --- Name: midisport-firmware Version: 1.2 Release: 1 Summary: Firmware for the M-Audio/Midiman USB MIDI and Audio devices Group: System Environment/Kernel License: GPLv2+ URL: http://usb-midi-fw.sourceforge.net/ Source0: http://download.sourceforge.net/usb-midi-fw/midisport-firmware-%{version}.tar.gz Source1: 81-midisport.rules BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: fxload %description This package contains the firmware for M-Audio/Midiman USB MIDI & Audio devices %prep %setup -q %build # Nothing to build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/lib/firmware install -pm 0644 *.ihx $RPM_BUILD_ROOT/lib/firmware mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ install -pm 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE README Changelog /lib/firmware/MidiSport1x1.ihx /lib/firmware/MidiSport2x2.ihx /lib/firmware/MidiSport4x4.ihx /lib/firmware/MidiSportKS.ihx /lib/firmware/MidiSportLoader.ihx /lib/firmware/MidiSport8x8-2.10.ihx /lib/firmware/MidiSport8x8-2.21.ihx %config %{_sysconfdir}/udev/rules.d/81-midisport.rules %changelog * Thu Feb 28 2008 Dave Jones - 1.2-1 - Initial import. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/midisport-firmware/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 03:03:02 -0000 1.1 +++ .cvsignore 5 Mar 2008 18:28:38 -0000 1.2 @@ -0,0 +1 @@ +midisport-firmware-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/midisport-firmware/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 03:03:02 -0000 1.1 +++ sources 5 Mar 2008 18:28:38 -0000 1.2 @@ -0,0 +1 @@ +b1e4976b68f396a50e92491caa6f36bc midisport-firmware-1.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 18:30:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 18:30:17 GMT Subject: rpms/perl-Crypt-OpenSSL-Random/devel perl-Crypt-OpenSSL-Random.spec, 1.3, 1.4 Message-ID: <200803051830.m25IUHWJ004883@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Random/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4850 Modified Files: perl-Crypt-OpenSSL-Random.spec Log Message: new perl Index: perl-Crypt-OpenSSL-Random.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Random/devel/perl-Crypt-OpenSSL-Random.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Crypt-OpenSSL-Random.spec 19 Feb 2008 04:50:06 -0000 1.3 +++ perl-Crypt-OpenSSL-Random.spec 5 Mar 2008 18:29:40 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-Crypt-OpenSSL-Random Version: 0.04 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl interface to OpenSSL for Random -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-OpenSSL-Random/ Source0: http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.04-5 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.04-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 18:31:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 18:31:40 GMT Subject: rpms/perl-Crypt-OpenSSL-RSA/devel perl-Crypt-OpenSSL-RSA.spec, 1.4, 1.5 Message-ID: <200803051831.m25IVeLP004977@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-RSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4948 Modified Files: perl-Crypt-OpenSSL-RSA.spec Log Message: new perl Index: perl-Crypt-OpenSSL-RSA.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-RSA/devel/perl-Crypt-OpenSSL-RSA.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Crypt-OpenSSL-RSA.spec 19 Feb 2008 04:49:09 -0000 1.4 +++ perl-Crypt-OpenSSL-RSA.spec 5 Mar 2008 18:31:07 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-Crypt-OpenSSL-RSA Version: 0.25 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl interface to OpenSSL for RSA -License: Artistic or GPL +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-OpenSSL-RSA/ Source0: http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-RSA-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.25-5 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.25-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 18:35:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 18:35:00 GMT Subject: rpms/perl-Math-Pari/devel perl-Math-Pari.spec,1.10,1.11 Message-ID: <200803051835.m25IZ02E005077@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Math-Pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5050 Modified Files: perl-Math-Pari.spec Log Message: new perl Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Math-Pari.spec 19 Feb 2008 19:10:53 -0000 1.10 +++ perl-Math-Pari.spec 5 Mar 2008 18:34:21 -0000 1.11 @@ -14,7 +14,7 @@ # testing with a development version of PARI, as this expression evaluates # the latest version of GP/PARI the perl module was tested with. %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e') -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Math-Pari/ @@ -74,6 +74,9 @@ %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 2.010709-5 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 2.010709-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 18:41:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 18:41:34 GMT Subject: rpms/perl-Class-Loader/devel perl-Class-Loader.spec,1.6,1.7 Message-ID: <200803051841.m25IfY98005291@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Loader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5201 Modified Files: perl-Class-Loader.spec Log Message: new perl Index: perl-Class-Loader.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Loader/devel/perl-Class-Loader.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Class-Loader.spec 10 Aug 2007 21:01:16 -0000 1.6 +++ perl-Class-Loader.spec 5 Mar 2008 18:41:01 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Load modules and create objects on demand Name: perl-Class-Loader Version: 2.03 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Class-Loader/ @@ -53,6 +53,9 @@ %{_mandir}/man3/Class::Loader.3pm* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 2.03-6 +- rebuild for new perl + * Fri Aug 10 2007 Paul Howarth 2.03-5 - Clarify license as GPL v1 or later, or Artistic (same as perl) From fedora-extras-commits at redhat.com Wed Mar 5 18:42:01 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Wed, 5 Mar 2008 18:42:01 GMT Subject: rpms/kernel-xen-2.6/devel linux-2.6-drm-git-i915-remove-priv-access.patch, NONE, 1.1.2.1 linux-2.6-drm-git-mm-revert-nopfn.patch, NONE, 1.1.2.1 linux-2.6-ia32-syscall-restart.patch, NONE, 1.1.2.1 linux-2.6-vio-modalias.patch, NONE, 1.1.2.1 linux-2.6-virtio_blk-fix-sysfs-bits.patch, NONE, 1.1.2.1 linux-2.6-wireless-pending-too.patch, NONE, 1.1.2.1 linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch, NONE, 1.1.2.1 linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch, NONE, 1.1.2.1 linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch, NONE, 1.1.2.1 linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch, NONE, 1.1.2.1 linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch, NONE, 1.1.2.1 linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch, NONE, 1.1.2.1 linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch, NONE, 1.1.2.1 linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch, NONE, 1.1.2.1 linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch, NONE, 1.1.2.1 linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch, NONE, 1.1.2.1 linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch, NONE, 1.1.2.1 patch-2.6.25-rc4.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.11.2.2, 1.11.2.3 .gitignore, 1.1.2.2, 1.1.2.3 Makefile, 1.2.6.4, 1.2.6.5 Makefile.config, 1.2.4.4, 1.2.4.5 config-generic, 1.2.4.2, 1.2.4.3 config-powerpc-generic, 1.2.4.2, 1.2.4.3 kernel.spec, 1.11.2.13, 1.11.2.14 linux-2.6-debug-taint-vm.patch, 1.3.8.2, 1.3.8.3 linux-2.6-firewire-git-pending.patch, 1.1.2.2, 1.1.2.3 linux-2.6-firewire-git-update.patch, 1.1.2.2, 1.1.2.3 linux-2.6-silence-noise.patch, 1.3.8.2, 1.3.8.3 linux-2.6-wireless-pending.patch, 1.1.2.2, 1.1.2.3 linux-2.6-wireless.patch, 1.2.8.2, 1.2.8.3 sources, 1.11.2.2, 1.11.2.3 upstream, 1.1.2.2, 1.1.2.3 linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch-from-kernel-2_6_25.patch, 1.1.2.1, NONE linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch, 1.1.2.1, NONE linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch, 1.1.2.1, NONE linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch, 1.1.2.1, NONE linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch, 1.1.2.1, NONE linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch, 1.1.2.1, NONE linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch, 1.1.2.1, NONE linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch, 1.1.2.1, NONE linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch, 1.1.2.1, NONE linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch, 1.1.2.1, NONE linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch, 1.1.2.1, NONE linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch, 1.1.2.1, NONE patch-2.6.25-rc3-git1.bz2.sign, 1.1.2.1, NONE patch-2.6.25-rc3.bz2.sign, 1.1.2.1, NONE Message-ID: <200803051842.m25Ig1uj005381@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5197 Modified Files: Tag: private-markmc-pv-ops-branch .cvsignore .gitignore Makefile Makefile.config config-generic config-powerpc-generic kernel.spec linux-2.6-debug-taint-vm.patch linux-2.6-firewire-git-pending.patch linux-2.6-firewire-git-update.patch linux-2.6-silence-noise.patch linux-2.6-wireless-pending.patch linux-2.6-wireless.patch sources upstream Added Files: Tag: private-markmc-pv-ops-branch linux-2.6-drm-git-i915-remove-priv-access.patch linux-2.6-drm-git-mm-revert-nopfn.patch linux-2.6-ia32-syscall-restart.patch linux-2.6-vio-modalias.patch linux-2.6-virtio_blk-fix-sysfs-bits.patch linux-2.6-wireless-pending-too.patch linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch patch-2.6.25-rc4.bz2.sign Removed Files: Tag: private-markmc-pv-ops-branch linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch-from-kernel-2_6_25.patch linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch patch-2.6.25-rc3-git1.bz2.sign patch-2.6.25-rc3.bz2.sign Log Message: * Wed Mar 05 2008 Mark McLoughlin - Re-base to kernel-2_6_25-0_93_rc4_fc9 linux-2.6-drm-git-i915-remove-priv-access.patch: --- NEW FILE linux-2.6-drm-git-i915-remove-priv-access.patch --- diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c index d2b7d3f..30ab367 100644 --- a/drivers/char/drm/i915_dma.c +++ b/drivers/char/drm/i915_dma.c @@ -51,7 +51,7 @@ int i915_wait_ring(struct drm_device *dev, int n, const char *caller) if (ring->space >= n) return 0; - dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; + //dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; if (ring->head != last_head) i = 0; @@ -73,8 +73,8 @@ void i915_kernel_lost_context(struct drm_device *dev) if (ring->space < 0) ring->space += ring->Size; - if (ring->head == ring->tail) - dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY; +// if (ring->head == ring->tail) +// dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY; } static int i915_dma_cleanup(struct drm_device *dev) linux-2.6-drm-git-mm-revert-nopfn.patch: --- NEW FILE linux-2.6-drm-git-mm-revert-nopfn.patch --- commit 4825484968daa23b3a55446c5f40f4d35fb6ff21 Author: Dave Airlie Date: Mon Mar 3 13:29:52 2008 +1000 Revert "drm: reimplement nopfn callers with fault" This reverts commit ae0bdbd7e1d02e978323640256125f8a5391510a. diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index 6184b98..3cd0b1c 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/char/drm/drm_vm.c @@ -679,8 +679,8 @@ EXPORT_SYMBOL(drm_mmap); * \c Pagefault method for buffer objects. * * \param vma Virtual memory area. - * \param vmf vm fault data - * \return Error or VM_FAULT_NOPAGE: the pfn is manually inserted. + * \param address File offset. + * \return Error or refault. The pfn is manually inserted. * * It's important that pfns are inserted while holding the bo->mutex lock. * otherwise we might race with unmap_mapping_range() which is always @@ -692,7 +692,8 @@ EXPORT_SYMBOL(drm_mmap); * protected by the bo->mutex lock. */ -static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +static unsigned long drm_bo_vm_nopfn(struct vm_area_struct *vma, + unsigned long address) { struct drm_buffer_object *bo = (struct drm_buffer_object *) vma->vm_private_data; unsigned long page_offset; @@ -704,22 +705,25 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) unsigned long bus_base; unsigned long bus_offset; unsigned long bus_size; - unsigned long ret = VM_FAULT_NOPAGE; + unsigned long ret = NOPFN_REFAULT; + + if (address > vma->vm_end) + return NOPFN_SIGBUS; dev = bo->dev; err = drm_bo_read_lock(&dev->bm.bm_lock); if (err) - return VM_FAULT_NOPAGE; + return NOPFN_REFAULT; err = mutex_lock_interruptible(&bo->mutex); if (err) { drm_bo_read_unlock(&dev->bm.bm_lock); - return VM_FAULT_NOPAGE; + return NOPFN_REFAULT; } err = drm_bo_wait(bo, 0, 0, 0); if (err) { - ret = (err != -EAGAIN) ? VM_FAULT_SIGBUS : VM_FAULT_NOPAGE; + ret = (err != -EAGAIN) ? NOPFN_SIGBUS : NOPFN_REFAULT; goto out_unlock; } @@ -734,7 +738,7 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) DRM_BO_FLAG_FORCE_MAPPABLE; err = drm_bo_move_buffer(bo, new_flags, 0, 0); if (err) { - ret = (err != -EAGAIN) ? VM_FAULT_SIGBUS : VM_FAULT_NOPAGE; + ret = (err != -EAGAIN) ? NOPFN_SIGBUS : NOPFN_REFAULT; goto out_unlock; } } @@ -743,12 +747,11 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) &bus_size); if (err) { - ret = VM_FAULT_SIGBUS; + ret = NOPFN_SIGBUS; goto out_unlock; } - /* XXX: vmf->pgoff may work here, but it adds on vma->vm_pgoff */ - page_offset = ((unsigned long)vmf->virtual_address - vma->vm_start) >> PAGE_SHIFT; + page_offset = (address - vma->vm_start) >> PAGE_SHIFT; if (bus_size) { struct drm_mem_type_manager *man = &dev->bm.man[bo->mem.mem_type]; @@ -761,7 +764,7 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) drm_ttm_fixup_caching(ttm); page = drm_ttm_get_page(ttm, page_offset); if (!page) { - ret = VM_FAULT_OOM; + ret = NOPFN_OOM; goto out_unlock; } pfn = page_to_pfn(page); @@ -770,9 +773,9 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) drm_io_prot(_DRM_TTM, vma); } - err = vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn); + err = vm_insert_pfn(vma, address, pfn); if (err) { - ret = (err != -EAGAIN) ? VM_FAULT_OOM : VM_FAULT_NOPAGE; + ret = (err != -EAGAIN) ? NOPFN_OOM : NOPFN_REFAULT; goto out_unlock; } out_unlock: @@ -827,7 +830,7 @@ static void drm_bo_vm_close(struct vm_area_struct *vma) } static struct vm_operations_struct drm_bo_vm_ops = { - .fault = drm_bo_vm_fault, + .nopfn = drm_bo_vm_nopfn, .open = drm_bo_vm_open, .close = drm_bo_vm_close, }; linux-2.6-ia32-syscall-restart.patch: --- NEW FILE linux-2.6-ia32-syscall-restart.patch --- >From 702b92b212afb1cb9d9590f5a9133113c2b4168c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 28 Feb 2008 19:40:17 -0800 Subject: [PATCH] x86_64 ia32 syscall restart fix The code to restart syscalls after signals depends on checking for a negative orig_ax, and for particular negative -ERESTART* values in ax. These fields are 64 bits and for a 32-bit task they get zero-extended. The syscall restart behavior is lost, a regression from a native 32-bit kernel and from 64-bit tasks' behavior. This patch fixes the problem by doing sign-extension where it matters. For orig_ax, the only time the value should be -1 but winds up as 0x0ffffffff is via a 32-bit ptrace call. So the patch changes ptrace to sign-extend the 32-bit orig_eax value when it's stored; it doesn't change the checks on orig_ax, though it uses the new current_syscall() inline to better document the subtle importance of the used of signedness there. The ax value is stored a lot of ways and it seems hard to get them all sign-extended at their origins. So for that, we use the current_syscall_ret() to sign-extend it only for 32-bit tasks at the time of the -ERESTART* comparisons. Signed-off-by: Roland McGrath --- arch/x86/kernel/ptrace.c | 9 ++++++++- arch/x86/kernel/signal_64.c | 38 +++++++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index f41fdc9..f8eed1b 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -1045,10 +1045,17 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 value) R32(esi, si); R32(ebp, bp); R32(eax, ax); - R32(orig_eax, orig_ax); R32(eip, ip); R32(esp, sp); + case offsetof(struct user32, regs.orig_eax): + /* + * Sign-extend the value so that orig_eax = -1 + * causes (long)orig_ax < 0 tests to fire correctly. + */ + regs->orig_ax = (long) (s32) value; + break; + case offsetof(struct user32, regs.eflags): return set_flags(child, value); diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index 7347bb1..ce317ee 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c @@ -311,6 +311,35 @@ give_sigsegv: } /* + * Return -1L or the syscall number that @regs is executing. + */ +static long current_syscall(struct pt_regs *regs) +{ + /* + * We always sign-extend a -1 value being set here, + * so this is always either -1L or a syscall number. + */ + return regs->orig_ax; +} + +/* + * Return a value that is -EFOO if the system call in @regs->orig_ax + * returned an error. This only works for @regs from @current. + */ +static long current_syscall_ret(struct pt_regs *regs) +{ +#ifdef CONFIG_IA32_EMULATION + if (test_thread_flag(TIF_IA32)) + /* + * Sign-extend the value so (int)-EFOO becomes (long)-EFOO + * and will match correctly in comparisons. + */ + return (int) regs->ax; +#endif + return regs->ax; +} + +/* * OK, we're invoking a handler */ @@ -327,9 +356,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, #endif /* Are we from a system call? */ - if ((long)regs->orig_ax >= 0) { + if (current_syscall(regs) >= 0) { /* If so, check system call restarting.. */ - switch (regs->ax) { + switch (current_syscall_ret(regs)) { case -ERESTART_RESTARTBLOCK: case -ERESTARTNOHAND: regs->ax = -EINTR; @@ -426,10 +455,9 @@ static void do_signal(struct pt_regs *regs) } /* Did we come from a system call? */ - if ((long)regs->orig_ax >= 0) { + if (current_syscall(regs) >= 0) { /* Restart the system call - no handlers present */ - long res = regs->ax; - switch (res) { + switch (current_syscall_ret(regs)) { case -ERESTARTNOHAND: case -ERESTARTSYS: case -ERESTARTNOINTR: -- 1.5.4.1 linux-2.6-vio-modalias.patch: --- NEW FILE linux-2.6-vio-modalias.patch --- diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index f988672..12a0851 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c @@ -294,9 +294,27 @@ static ssize_t devspec_show(struct device *dev, return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none"); } +static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + const struct vio_dev *vio_dev = to_vio_dev(dev); + struct device_node *dn; + const char *cp; + + dn = dev->archdata.of_node; + if (!dn) + return -ENODEV; + cp = of_get_property(dn, "compatible", NULL); + if (!cp) + return -ENODEV; + + return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp); +} + static struct device_attribute vio_dev_attrs[] = { __ATTR_RO(name), __ATTR_RO(devspec), + __ATTR_RO(modalias), __ATTR_NULL }; linux-2.6-virtio_blk-fix-sysfs-bits.patch: --- NEW FILE linux-2.6-virtio_blk-fix-sysfs-bits.patch --- From: Jeremy Katz To: rusty at rustcorp.com.au Cc: Jeremy Katz Subject: [PATCH] Fix sysfs bits to have proper block symlink Date: Sun, 2 Mar 2008 17:00:15 -0500 Fix up so that the virtio_blk devices in sysfs link correctly to their block device. This then allows them to be detected by hal, etc Signed-off-by: Jeremy Katz --- drivers/block/virtio_blk.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 3b1a68d..0cfbe8c 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -238,6 +238,7 @@ static int virtblk_probe(struct virtio_device *vdev) vblk->disk->first_minor = index_to_minor(index); vblk->disk->private_data = vblk; vblk->disk->fops = &virtblk_fops; + vblk->disk->driverfs_dev = &vdev->dev; index++; /* If barriers are supported, tell block layer that queue is ordered */ linux-2.6-wireless-pending-too.patch: --- NEW FILE linux-2.6-wireless-pending-too.patch --- This is an a backport of two fixes which are based on top of the open11s patches which are not yet in Rawhide. They will disappear when those later patches get merged to net-2.6.26 (probably in a few days). mac80211: always insert key into list mac80211: fix hardware scan completion diff -up linux-2.6.24.noarch/net/mac80211/key.c.orig linux-2.6.24.noarch/net/mac80211/key.c --- linux-2.6.24.noarch/net/mac80211/key.c.orig 2008-03-04 19:40:41.000000000 -0500 +++ linux-2.6.24.noarch/net/mac80211/key.c 2008-03-04 19:43:13.000000000 -0500 @@ -174,6 +174,9 @@ static void __ieee80211_key_replace(stru { int idx, defkey; + if (new) + list_add(&new->list, &sdata->key_list); + if (sta) { rcu_assign_pointer(sta->key, new); } else { @@ -190,9 +193,6 @@ static void __ieee80211_key_replace(stru ieee80211_set_default_key(sdata, -1); rcu_assign_pointer(sdata->keys[idx], new); - if (new) - list_add(&new->list, &sdata->key_list); - if (defkey && new) ieee80211_set_default_key(sdata, new->conf.keyidx); } diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c --- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-03-04 19:40:41.000000000 -0500 +++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-03-04 19:48:19.000000000 -0500 @@ -3401,22 +3401,27 @@ void ieee80211_scan_completed(struct iee rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) { - /* No need to wake the master device. */ if (sdata->dev == local->mdev) continue; - if (sdata->vif.type == IEEE80211_IF_TYPE_STA) { - if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) - ieee80211_send_nullfunc(local, sdata, 0); - ieee80211_sta_timer((unsigned long)sdata); - } + /* Tell AP we're back */ + if (sdata->vif.type == IEEE80211_IF_TYPE_STA && + sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) + ieee80211_send_nullfunc(local, sdata, 0); netif_wake_queue(sdata->dev); } - rcu_read_unlock(); done: + /* Restart STA timer for both SW and HW scan cases */ + list_for_each_entry_rcu(sdata, &local->interfaces, list) { + if (sdata->vif.type == IEEE80211_IF_TYPE_STA) + ieee80211_sta_timer((unsigned long)sdata); + } + + rcu_read_unlock(); + sdata = IEEE80211_DEV_TO_SUB_IF(dev); if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { struct ieee80211_if_sta *ifsta = &sdata->u.sta; linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch: --- NEW FILE linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch --- >From 77198032633b5660879bb89bae9f1682fd0ec24c Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 5 Mar 2008 17:20:11 +0000 Subject: [PATCH] Revert linux-2.6-execshield.patch Signed-off-by: Mark McLoughlin --- arch/x86/kernel/cpu/common.c | 14 ----- arch/x86/kernel/process_32.c | 39 +-------------- arch/x86/kernel/setup64.c | 40 +++++++++++++++ arch/x86/kernel/smp_32.c | 3 - arch/x86/kernel/traps_32.c | 106 +--------------------------------------- arch/x86/mm/init_32.c | 20 ++++---- arch/x86/mm/mmap.c | 4 +- arch/x86/vdso/vdso32-setup.c | 2 +- fs/binfmt_elf.c | 21 +------- fs/proc/array.c | 8 +-- include/asm-ia64/pgalloc.h | 4 -- include/asm-powerpc/pgalloc.h | 5 -- include/asm-ppc/pgalloc.h | 5 -- include/asm-s390/pgalloc.h | 4 -- include/asm-sparc/pgalloc.h | 4 -- include/asm-sparc64/pgalloc.h | 4 -- include/asm-x86/desc.h | 16 ------ include/asm-x86/elf.h | 2 + include/asm-x86/mmu.h | 6 -- include/asm-x86/pgalloc_64.h | 7 --- include/asm-x86/processor.h | 6 -- include/linux/mm.h | 8 +--- include/linux/mm_types.h | 3 - include/linux/resource.h | 5 +-- include/linux/sched.h | 7 --- kernel/sysctl.c | 28 ----------- mm/mmap.c | 107 +++------------------------------------- mm/mprotect.c | 9 +--- mm/mremap.c | 4 +- 29 files changed, 74 insertions(+), 417 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 53cb84e..a38aafa 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -478,20 +478,6 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) * we do "generic changes." */ - /* - * emulation of NX with segment limits unfortunately means - * we have to disable the fast system calls, due to the way that - * sysexit clears the segment limits on return. - * If we have either disabled exec-shield on the boot command line, - * or we have NX, then we don't need to do this. - */ - if (exec_shield != 0) { -#ifdef CONFIG_X86_PAE - if (!test_bit(X86_FEATURE_NX, c->x86_capability)) -#endif - clear_bit(X86_FEATURE_SEP, c->x86_capability); - } - /* If the model name is still unset, do table lookup. */ if ( !c->x86_model_id[0] ) { char *p; diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index db271a2..be3c7a2 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -679,8 +679,7 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); - if (next_p->mm) - load_user_cs_desc(cpu, next_p->mm); + /* we're going to use this soon, after a few expensive things */ if (next_p->fpu_counter > 5) @@ -850,39 +849,3 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) unsigned long range_end = mm->brk + 0x02000000; return randomize_range(mm->brk, range_end, 0) ? : mm->brk; } - -static void modify_cs(struct mm_struct *mm, unsigned long limit) -{ - mm->context.exec_limit = limit; - set_user_cs(&mm->context.user_cs, limit); - if (mm == current->mm) { - preempt_disable(); - load_user_cs_desc(smp_processor_id(), mm); - preempt_enable(); - } -} - -void arch_add_exec_range(struct mm_struct *mm, unsigned long limit) -{ - if (limit > mm->context.exec_limit) - modify_cs(mm, limit); -} - -void arch_remove_exec_range(struct mm_struct *mm, unsigned long old_end) -{ - struct vm_area_struct *vma; - unsigned long limit = PAGE_SIZE; - - if (old_end == mm->context.exec_limit) { - for (vma = mm->mmap; vma; vma = vma->vm_next) - if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) - limit = vma->vm_end; - modify_cs(mm, limit); - } -} - -void arch_flush_exec_range(struct mm_struct *mm) -{ - mm->context.exec_limit = 0; - set_user_cs(&mm->context.user_cs, 0); -} diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c index 8a940dc..309366f 100644 --- a/arch/x86/kernel/setup64.c +++ b/arch/x86/kernel/setup64.c @@ -45,6 +45,46 @@ EXPORT_SYMBOL_GPL(__supported_pte_mask); static int do_not_nx __cpuinitdata = 0; +/* noexec=on|off +Control non executable mappings for 64bit processes. + +on Enable(default) +off Disable +*/ +static int __init nonx_setup(char *str) +{ + if (!str) + return -EINVAL; + if (!strncmp(str, "on", 2)) { + __supported_pte_mask |= _PAGE_NX; + do_not_nx = 0; + } else if (!strncmp(str, "off", 3)) { + do_not_nx = 1; + __supported_pte_mask &= ~_PAGE_NX; + } + return 0; +} +early_param("noexec", nonx_setup); + +int force_personality32 = 0; + +/* noexec32=on|off +Control non executable heap for 32bit processes. +To control the stack too use noexec=off + +on PROT_READ does not imply PROT_EXEC for 32bit processes +off PROT_READ implies PROT_EXEC (default) +*/ +static int __init nonx32_setup(char *str) +{ + if (!strcmp(str, "on")) + force_personality32 &= ~READ_IMPLIES_EXEC; + else if (!strcmp(str, "off")) + force_personality32 |= READ_IMPLIES_EXEC; + return 1; +} +__setup("noexec32=", nonx32_setup); + /* * Copy data used in early init routines from the initial arrays to the * per cpu data areas. These arrays then become expendable and the diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c index cca75b4..dc0cde9 100644 --- a/arch/x86/kernel/smp_32.c +++ b/arch/x86/kernel/smp_32.c @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -317,8 +316,6 @@ void smp_invalidate_interrupt(struct pt_regs *regs) unsigned long cpu; cpu = get_cpu(); - if (current->active_mm) - load_user_cs_desc(cpu, current->active_mm); if (!cpu_isset(cpu, flush_cpumask)) goto out; diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index 7865615..b22c01e 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c @@ -592,91 +592,7 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) - -/* - * lazy-check for CS validity on exec-shield binaries: - * - * the original non-exec stack patch was written by - * Solar Designer . Thanks! - */ -static int -check_lazy_exec_limit(int cpu, struct pt_regs *regs, long error_code) -{ - struct desc_struct *desc1, *desc2; - struct vm_area_struct *vma; - unsigned long limit; - - if (current->mm == NULL) - return 0; - - limit = -1UL; - if (current->mm->context.exec_limit != -1UL) { - limit = PAGE_SIZE; - spin_lock(¤t->mm->page_table_lock); - for (vma = current->mm->mmap; vma; vma = vma->vm_next) - if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) - limit = vma->vm_end; - vma = get_gate_vma(current); - if (vma && (vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) - limit = vma->vm_end; - spin_unlock(¤t->mm->page_table_lock); - if (limit >= TASK_SIZE) - limit = -1UL; - current->mm->context.exec_limit = limit; - } - set_user_cs(¤t->mm->context.user_cs, limit); - - desc1 = ¤t->mm->context.user_cs; - desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; - - if (desc1->a != desc2->a || desc1->b != desc2->b) { - /* - * The CS was not in sync - reload it and retry the - * instruction. If the instruction still faults then - * we won't hit this branch next time around. - */ - if (print_fatal_signals >= 2) { - printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n", - error_code, error_code/8, regs->ip, smp_processor_id()); - printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x, CPU_cs: %08x/%08x.\n", - current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b); - } - load_user_cs_desc(cpu, current->mm); - return 1; - } - - return 0; -} - -/* - * The fixup code for errors in iret jumps to here (iret_exc). It loses - * the original trap number and error code. The bogus trap 32 and error - * code 0 are what the vanilla kernel delivers via: - * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1) - * - * NOTE: Because of the final "1" in the macro we need to enable interrupts. - * - * In case of a general protection fault in the iret instruction, we - * need to check for a lazy CS update for exec-shield. - */ -void do_iret_error(struct pt_regs *regs, long error_code) -{ - int ok; - local_irq_enable(); - ok = check_lazy_exec_limit(get_cpu(), regs, error_code); - put_cpu(); - if (!ok && notify_die(DIE_TRAP, "iret exception", regs, - error_code, 32, SIGSEGV) != NOTIFY_STOP) { - siginfo_t info; - info.si_signo = SIGSEGV; - info.si_errno = 0; - info.si_code = ILL_BADSTK; - info.si_addr = 0; - do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code, - &info); - } -} - +DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1) void __kprobes do_general_protection(struct pt_regs * regs, long error_code) @@ -684,7 +600,6 @@ void __kprobes do_general_protection(struct pt_regs * regs, int cpu = get_cpu(); struct tss_struct *tss = &per_cpu(init_tss, cpu); struct thread_struct *thread = ¤t->thread; - int ok; /* * Perform the lazy TSS's I/O bitmap copy. If the TSS has an @@ -711,6 +626,7 @@ void __kprobes do_general_protection(struct pt_regs * regs, put_cpu(); return; } + put_cpu(); if (regs->flags & VM_MASK) goto gp_in_vm86; @@ -718,22 +634,6 @@ void __kprobes do_general_protection(struct pt_regs * regs, if (!user_mode(regs)) goto gp_in_kernel; - ok = check_lazy_exec_limit(cpu, regs, error_code); - - put_cpu(); - - if (ok) - return; - - if (print_fatal_signals) { - printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code, - error_code/8, regs->ip, smp_processor_id()); - printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x.\n", - current->mm->context.exec_limit, - current->mm->context.user_cs.a, - current->mm->context.user_cs.b); - } - current->thread.error_code = error_code; current->thread.trap_no = 13; if (show_unhandled_signals && unhandled_signal(current, SIGSEGV) && @@ -750,13 +650,11 @@ void __kprobes do_general_protection(struct pt_regs * regs, return; gp_in_vm86: - put_cpu(); local_irq_enable(); handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code); return; gp_in_kernel: - put_cpu(); if (!fixup_exception(regs)) { current->thread.error_code = error_code; current->thread.trap_no = 13; diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index f5926ae..ee1091a 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -474,7 +474,7 @@ static int disable_nx __initdata; * Control non executable mappings. * * on Enable - * off Disable (disables exec-shield too) + * off Disable */ static int __init noexec_setup(char *str) { @@ -483,12 +483,14 @@ static int __init noexec_setup(char *str) __supported_pte_mask |= _PAGE_NX; disable_nx = 0; } - } else if (!strcmp(str, "off")) { - disable_nx = 1; - __supported_pte_mask &= ~_PAGE_NX; - exec_shield = 0; - } else - return -EINVAL; + } else { + if (!strcmp(str, "off")) { + disable_nx = 1; + __supported_pte_mask &= ~_PAGE_NX; + } else { + return -EINVAL; + } + } return 0; } @@ -526,10 +528,6 @@ void __init paging_init(void) if (nx_enabled) printk(KERN_INFO "NX (Execute Disable) protection: active\n"); #endif - if (exec_shield) - printk(KERN_INFO "Using x86 segment limits to approximate " - "NX protection\n"); - pagetable_init(); load_cr3(swapper_pg_dir); diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index ec932ae..56fe712 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c @@ -111,15 +111,13 @@ static unsigned long mmap_legacy_base(void) */ void arch_pick_mmap_layout(struct mm_struct *mm) { - if (!(2 & exec_shield) && mmap_is_legacy()) { + if (mmap_is_legacy()) { mm->mmap_base = mmap_legacy_base(); mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } else { mm->mmap_base = mmap_base(); mm->get_unmapped_area = arch_get_unmapped_area_topdown; - if (!(current->personality & READ_IMPLIES_EXEC)) - mm->get_unmapped_exec_area = arch_get_unmapped_exec_area; mm->unmap_area = arch_unmap_area_topdown; } } diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c index 0bd5f44..348f134 100644 --- a/arch/x86/vdso/vdso32-setup.c +++ b/arch/x86/vdso/vdso32-setup.c @@ -336,7 +336,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack) if (compat) addr = VDSO_HIGH_BASE; else { - addr = get_unmapped_area_prot(NULL, 0, PAGE_SIZE, 0, 0, 1); + addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0); if (IS_ERR_VALUE(addr)) { ret = addr; goto up_fail; diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 1fc8940..5e1a4fb 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -81,7 +81,7 @@ static struct linux_binfmt elf_format = { .hasvdso = 1 }; -#define BAD_ADDR(x) IS_ERR_VALUE(x) +#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE) static int set_brk(unsigned long start, unsigned long end) { @@ -709,11 +709,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) break; } - if (current->personality == PER_LINUX && (exec_shield & 2)) { - executable_stack = EXSTACK_DISABLE_X; - current->flags |= PF_RANDOMIZE; - } - /* Some simple consistency checks for the interpreter */ if (elf_interpreter) { retval = -ELIBBAD; @@ -733,15 +728,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) if (retval) goto out_free_dentry; -#ifdef CONFIG_X86_32 - /* - * Turn off the CS limit completely if exec-shield disabled or - * NX active: - */ - if (!exec_shield || executable_stack != EXSTACK_DISABLE_X || nx_enabled) - arch_add_exec_range(current->mm, -1); -#endif - /* Discard our unneeded old files struct */ if (files) { put_files_struct(files); @@ -755,8 +741,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) /* Do this immediately, since STACK_TOP as used in setup_arg_pages may depend on the personality. */ SET_PERSONALITY(loc->elf_ex, 0); - if (!(exec_shield & 2) && - elf_read_implies_exec(loc->elf_ex, executable_stack)) + if (elf_read_implies_exec(loc->elf_ex, executable_stack)) current->personality |= READ_IMPLIES_EXEC; if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) @@ -921,7 +906,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) interpreter, &interp_map_addr, load_bias); - if (!BAD_ADDR(elf_entry)) { + if (!IS_ERR((void *)elf_entry)) { /* * load_elf_interp() returns relocation * adjustment diff --git a/fs/proc/array.c b/fs/proc/array.c index 46adc3b..07d6c48 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -471,12 +471,8 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, } rcu_read_unlock(); - if (!whole || num_threads < 2) { - wchan = 0; - if (current->uid == task->uid || current->euid == task->uid || - capable(CAP_SYS_NICE)) - wchan = get_wchan(task); - } + if (!whole || num_threads < 2) + wchan = get_wchan(task); if (!whole) { min_flt = task->min_flt; maj_flt = task->maj_flt; diff --git a/include/asm-ia64/pgalloc.h b/include/asm-ia64/pgalloc.h index 24f183a..b9ac1a6 100644 --- a/include/asm-ia64/pgalloc.h +++ b/include/asm-ia64/pgalloc.h @@ -1,10 +1,6 @@ #ifndef _ASM_IA64_PGALLOC_H #define _ASM_IA64_PGALLOC_H -#define arch_add_exec_range(mm, limit) do { ; } while (0) -#define arch_flush_exec_range(mm) do { ; } while (0) -#define arch_remove_exec_range(mm, limit) do { ; } while (0) - /* * This file contains the functions and defines necessary to allocate * page tables. diff --git a/include/asm-powerpc/pgalloc.h b/include/asm-powerpc/pgalloc.h index 25068ae..b4505ed 100644 --- a/include/asm-powerpc/pgalloc.h +++ b/include/asm-powerpc/pgalloc.h @@ -2,11 +2,6 @@ #define _ASM_POWERPC_PGALLOC_H #ifdef __KERNEL__ -/* Dummy functions since we don't support execshield on ppc */ -#define arch_add_exec_range(mm, limit) do { ; } while (0) -#define arch_flush_exec_range(mm) do { ; } while (0) -#define arch_remove_exec_range(mm, limit) do { ; } while (0) - #ifdef CONFIG_PPC64 #include #else diff --git a/include/asm-ppc/pgalloc.h b/include/asm-ppc/pgalloc.h index de55ad5..fd4d1d7 100644 --- a/include/asm-ppc/pgalloc.h +++ b/include/asm-ppc/pgalloc.h @@ -41,10 +41,5 @@ extern void pte_free(struct mm_struct *mm, pgtable_t pte); #define check_pgt_cache() do { } while (0) -#define arch_add_exec_range(mm, limit) do { ; } while (0) -#define arch_flush_exec_range(mm) do { ; } while (0) -#define arch_remove_exec_range(mm, limit) do { ; } while (0) - - #endif /* _PPC_PGALLOC_H */ #endif /* __KERNEL__ */ diff --git a/include/asm-s390/pgalloc.h b/include/asm-s390/pgalloc.h index a43f0ec..f5b2bf3 100644 --- a/include/asm-s390/pgalloc.h +++ b/include/asm-s390/pgalloc.h @@ -17,10 +17,6 @@ #include #include -#define arch_add_exec_range(mm, limit) do { ; } while (0) -#define arch_flush_exec_range(mm) do { ; } while (0) -#define arch_remove_exec_range(mm, limit) do { ; } while (0) - #define check_pgt_cache() do {} while (0) unsigned long *crst_table_alloc(struct mm_struct *, int); diff --git a/include/asm-sparc/pgalloc.h b/include/asm-sparc/pgalloc.h index 2632807..6292cd0 100644 --- a/include/asm-sparc/pgalloc.h +++ b/include/asm-sparc/pgalloc.h @@ -66,8 +66,4 @@ BTFIXUPDEF_CALL(void, pte_free, pgtable_t ) #define pte_free(mm, pte) BTFIXUP_CALL(pte_free)(pte) #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte) -#define arch_add_exec_range(mm, limit) do { ; } while (0) -#define arch_flush_exec_range(mm) do { ; } while (0) -#define arch_remove_exec_range(mm, limit) do { ; } while (0) - #endif /* _SPARC_PGALLOC_H */ diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h index c998da2..3ee2d40 100644 --- a/include/asm-sparc64/pgalloc.h +++ b/include/asm-sparc64/pgalloc.h @@ -79,8 +79,4 @@ static inline void check_pgt_cache(void) quicklist_trim(0, NULL, 25, 16); } -#define arch_add_exec_range(mm, limit) do { ; } while (0) -#define arch_flush_exec_range(mm) do { ; } while (0) -#define arch_remove_exec_range(mm, limit) do { ; } while (0) - #endif /* _SPARC64_PGALLOC_H */ diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index 7ad80b9..5b6a05d 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h @@ -353,22 +353,6 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist) _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS); } -static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) -{ - limit = (limit - 1) / PAGE_SIZE; - desc->a = limit & 0xffff; - desc->b = (limit & 0xf0000) | 0x00c0fb00; -} - -#define load_user_cs_desc(cpu, mm) \ - get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs - -#ifdef CONFIG_X86_32 -extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); -extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); -extern void arch_flush_exec_range(struct mm_struct *mm); -#endif /* CONFIG_X86_32 */ - #else /* * GET_DESC_BASE reads the descriptor base of the specified segment. diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h index 001b577..fb62f99 100644 --- a/include/asm-x86/elf.h +++ b/include/asm-x86/elf.h @@ -185,6 +185,7 @@ static inline void elf_common_init(struct thread_struct *t, clear_thread_flag(TIF_ABI_PENDING); \ else \ set_thread_flag(TIF_ABI_PENDING); \ + current->personality |= force_personality32; \ } while (0) #define COMPAT_ELF_PLATFORM ("i686") @@ -229,6 +230,7 @@ static inline void elf_common_init(struct thread_struct *t, #define ELF_PLATFORM ("x86_64") extern void set_personality_64bit(void); extern unsigned int sysctl_vsyscall32; +extern int force_personality32; #endif /* !CONFIG_X86_32 */ diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h index db9b109..efa962c 100644 --- a/include/asm-x86/mmu.h +++ b/include/asm-x86/mmu.h @@ -9,8 +9,6 @@ * we put the segment information here. * * cpu_vm_mask is used to optimize ldt flushing. - * exec_limit is used to track the range PROT_EXEC - * mappings span. */ typedef struct { void *ldt; @@ -20,10 +18,6 @@ typedef struct { int size; struct mutex lock; void *vdso; -#ifdef CONFIG_X86_32 - struct desc_struct user_cs; - unsigned long exec_limit; -#endif } mm_context_t; #ifdef CONFIG_SMP diff --git a/include/asm-x86/pgalloc_64.h b/include/asm-x86/pgalloc_64.h index 982e1cb..8d67223 100644 --- a/include/asm-x86/pgalloc_64.h +++ b/include/asm-x86/pgalloc_64.h @@ -5,13 +5,6 @@ #include #include -#define arch_add_exec_range(mm, limit) \ - do { (void)(mm), (void)(limit); } while (0) -#define arch_flush_exec_range(mm) \ - do { (void)(mm); } while (0) -#define arch_remove_exec_range(mm, limit) \ - do { (void)(mm), (void)(limit); } while (0) - #define pmd_populate_kernel(mm, pmd, pte) \ set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte))) #define pud_populate(mm, pud, pmd) \ diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index ef01196..45a2f0a 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h @@ -674,9 +674,6 @@ extern int bootloader_type; extern char ignore_fpu_irq; #define cache_line_size() (boot_cpu_data.x86_cache_alignment) -#define __HAVE_ARCH_ALIGN_STACK -extern unsigned long arch_align_stack(unsigned long sp); - #define HAVE_ARCH_PICK_MMAP_LAYOUT 1 #define ARCH_HAS_PREFETCHW #define ARCH_HAS_SPINLOCK_PREFETCH @@ -754,9 +751,6 @@ static inline void prefetchw(const void *x) regs->cs = __USER_CS; \ regs->ip = new_eip; \ regs->sp = new_esp; \ - preempt_disable(); \ - load_user_cs_desc(smp_processor_id(), current->mm); \ - preempt_enable(); \ } while (0) diff --git a/include/linux/mm.h b/include/linux/mm.h index 4b74dc8..3f3ccfe 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1043,13 +1043,7 @@ extern int install_special_mapping(struct mm_struct *mm, unsigned long addr, unsigned long len, unsigned long flags, struct page **pages); -extern unsigned long get_unmapped_area_prot(struct file *, unsigned long, unsigned long, unsigned long, unsigned long, int); - -static inline unsigned long get_unmapped_area(struct file *file, unsigned long addr, - unsigned long len, unsigned long pgoff, unsigned long flags) -{ - return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); -} +extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 1f430ab..af190ce 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -163,9 +163,6 @@ struct mm_struct { unsigned long (*get_unmapped_area) (struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); - unsigned long (*get_unmapped_exec_area) (struct file *filp, - unsigned long addr, unsigned long len, - unsigned long pgoff, unsigned long flags); void (*unmap_area) (struct mm_struct *mm, unsigned long addr); unsigned long mmap_base; /* base of mmap area */ unsigned long task_size; /* size of task vm space */ diff --git a/include/linux/resource.h b/include/linux/resource.h index 14757af..ae13db7 100644 --- a/include/linux/resource.h +++ b/include/linux/resource.h @@ -54,11 +54,8 @@ struct rlimit { /* * Limit the stack by to some sane default: root can always * increase this limit if needed.. 8MB seems reasonable. - * - * (2MB more to cover randomization effects.) */ -#define _STK_LIM (10*1024*1024) -#define EXEC_STACK_BIAS (2*1024*1024) +#define _STK_LIM (8*1024*1024) /* * GPG wants 32kB of mlocked memory, to make sure pass phrases diff --git a/include/linux/sched.h b/include/linux/sched.h index a4b1a64..6361cff 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -98,9 +98,6 @@ struct futex_pi_state; struct robust_list_head; struct bio; -extern int exec_shield; -extern int print_fatal_signals; - /* * List of flags we want to share for kernel threads, * if only because they are not used by them anyway. @@ -346,10 +343,6 @@ extern int sysctl_max_map_count; extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); - -extern unsigned long -arch_get_unmapped_exec_area(struct file *, unsigned long, unsigned long, - unsigned long, unsigned long); extern unsigned long arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, diff --git a/kernel/sysctl.c b/kernel/sysctl.c index ea74b8c..2d35d6e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -82,26 +82,6 @@ extern int maps_protect; extern int sysctl_stat_interval; extern int latencytop_enabled; -int exec_shield = (1<<0); -/* exec_shield is a bitmask: - * 0: off; vdso at STACK_TOP, 1 page below TASK_SIZE - * (1<<0) 1: on [also on if !=0] - * (1<<1) 2: force noexecstack regardless of PT_GNU_STACK - * The old settings - * (1<<2) 4: vdso just below .text of main (unless too low) - * (1<<3) 8: vdso just below .text of PT_INTERP (unless too low) - * are ignored because the vdso is placed completely randomly - */ - -static int __init setup_exec_shield(char *str) -{ - get_option(&str, &exec_shield); - - return 1; -} - -__setup("exec-shield=", setup_exec_shield); - /* Constants used for minimum and maximum */ #if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM) static int one = 1; @@ -386,14 +366,6 @@ static struct ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { - .ctl_name = CTL_UNNUMBERED, - .procname = "exec-shield", - .data = &exec_shield, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_dointvec, - }, - { .ctl_name = KERN_CORE_USES_PID, .procname = "core_uses_pid", .data = &core_uses_pid, diff --git a/mm/mmap.c b/mm/mmap.c index d7c2c9d..a32d28c 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include @@ -378,8 +377,6 @@ static inline void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *prev, struct rb_node *rb_parent) { - if (vma->vm_flags & VM_EXEC) - arch_add_exec_range(mm, vma->vm_end); if (prev) { vma->vm_next = prev->vm_next; prev->vm_next = vma; @@ -483,8 +480,6 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma, rb_erase(&vma->vm_rb, &mm->mm_rb); if (mm->mmap_cache == vma) mm->mmap_cache = prev; - if (vma->vm_flags & VM_EXEC) - arch_remove_exec_range(mm, vma->vm_end); } /* @@ -790,8 +785,6 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, } else /* cases 2, 5, 7 */ vma_adjust(prev, prev->vm_start, end, prev->vm_pgoff, NULL); - if (prev->vm_flags & VM_EXEC) - arch_add_exec_range(mm, prev->vm_end); return prev; } @@ -947,8 +940,7 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr, /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ - addr = get_unmapped_area_prot(file, addr, len, pgoff, flags, - prot & PROT_EXEC); + addr = get_unmapped_area(file, addr, len, pgoff, flags); if (addr & ~PAGE_MASK) return addr; @@ -1418,17 +1410,13 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) } unsigned long -get_unmapped_area_prot(struct file *file, unsigned long addr, unsigned long len, - unsigned long pgoff, unsigned long flags, int exec) +get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, + unsigned long pgoff, unsigned long flags) { unsigned long (*get_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); - if (exec && current->mm->get_unmapped_exec_area) - get_area = current->mm->get_unmapped_exec_area; - else - get_area = current->mm->get_unmapped_area; - + get_area = current->mm->get_unmapped_area; if (file && file->f_op && file->f_op->get_unmapped_area) get_area = file->f_op->get_unmapped_area; addr = get_area(file, addr, len, pgoff, flags); @@ -1442,74 +1430,8 @@ get_unmapped_area_prot(struct file *file, unsigned long addr, unsigned long len, return arch_rebalance_pgtables(addr, len); } -EXPORT_SYMBOL(get_unmapped_area_prot); - -#define SHLIB_BASE 0x00110000 - -unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0, - unsigned long len0, unsigned long pgoff, unsigned long flags) -{ - unsigned long addr = addr0, len = len0; - struct mm_struct *mm = current->mm; - struct vm_area_struct *vma; - unsigned long tmp; - - if (len > TASK_SIZE) - return -ENOMEM; - - if (flags & MAP_FIXED) - return addr; - - if (!addr) { - addr = randomize_range(SHLIB_BASE, 0x01000000, len); - } else { - addr = PAGE_ALIGN(addr); - vma = find_vma(mm, addr); - if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vma->vm_start)) - return addr; - } - - addr = SHLIB_BASE; - for (vma = find_vma(mm, addr); ; vma = vma->vm_next) { - /* At this point: (!vma || addr < vma->vm_end). */ - if (TASK_SIZE - len < addr) - return -ENOMEM; - - if (!vma || addr + len <= vma->vm_start) { - /* - * Must not let a PROT_EXEC mapping get into the - * brk area: - */ - if (addr + len > mm->brk) - goto failed; - - /* - * Up until the brk area we randomize addresses - * as much as possible: - */ - if (addr >= 0x01000000) { - tmp = randomize_range(0x01000000, - PAGE_ALIGN(max(mm->start_brk, - (unsigned long)0x08000000)), len); - vma = find_vma(mm, tmp); - if (TASK_SIZE - len >= tmp && - (!vma || tmp + len <= vma->vm_start)) - return tmp; - } - /* - * Ok, randomization didnt work out - return - * the result of the linear search: - */ - return addr; - } - addr = vma->vm_end; - } - -failed: - return current->mm->get_unmapped_area(filp, addr0, len0, pgoff, flags); -} +EXPORT_SYMBOL(get_unmapped_area); /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr) @@ -1584,14 +1506,6 @@ out: return prev ? prev->vm_next : vma; } -static int over_stack_limit(unsigned long sz) -{ - if (sz < EXEC_STACK_BIAS) - return 0; - return (sz - EXEC_STACK_BIAS) > - current->signal->rlim[RLIMIT_STACK].rlim_cur; -} - /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the @@ -1608,7 +1522,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un return -ENOMEM; /* Stack limit test */ - if (over_stack_limit(size)) + if (size > rlim[RLIMIT_STACK].rlim_cur) return -ENOMEM; /* mlock limit tests */ @@ -1912,14 +1826,10 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); - if (new_below) { - unsigned long old_end = vma->vm_end; - + if (new_below) vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff + ((addr - new->vm_start) >> PAGE_SHIFT), new); - if (vma->vm_flags & VM_EXEC) - arch_remove_exec_range(mm, old_end); - } else + else vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; @@ -2138,7 +2048,6 @@ void exit_mmap(struct mm_struct *mm) vm_unacct_memory(nr_accounted); free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); tlb_finish_mmu(tlb, 0, end); - arch_flush_exec_range(mm); /* * Walk the list again, actually closing and freeing it, diff --git a/mm/mprotect.c b/mm/mprotect.c index 6d822ad..4de5468 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -23,12 +23,8 @@ #include #include #include -#include #include #include -#ifdef CONFIG_X86 -#include -#endif static void change_pte_range(struct mm_struct *mm, pmd_t *pmd, unsigned long addr, unsigned long end, pgprot_t newprot, @@ -138,7 +134,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, struct mm_struct *mm = vma->vm_mm; unsigned long oldflags = vma->vm_flags; long nrpages = (end - start) >> PAGE_SHIFT; - unsigned long charged = 0, old_end = vma->vm_end; + unsigned long charged = 0; pgoff_t pgoff; int error; int dirty_accountable = 0; @@ -202,9 +198,6 @@ success: dirty_accountable = 1; } - if (oldflags & VM_EXEC) - arch_remove_exec_range(current->mm, old_end); - if (is_vm_hugetlb_page(vma)) hugetlb_change_protection(vma, start, end, vma->vm_page_prot); else diff --git a/mm/mremap.c b/mm/mremap.c index 101f885..08e3c7f 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -392,8 +392,8 @@ unsigned long do_mremap(unsigned long addr, if (vma->vm_flags & VM_MAYSHARE) map_flags |= MAP_SHARED; - new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len, - vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC); + new_addr = get_unmapped_area(vma->vm_file, 0, new_len, + vma->vm_pgoff, map_flags); if (new_addr & ~PAGE_MASK) { ret = new_addr; goto out; -- 1.5.4.1 linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch: --- NEW FILE linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch --- >From 1fa2a8ec8dd7f0a05035b50dec00a92710dab698 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 5 Mar 2008 12:50:50 +0000 Subject: [PATCH] squashfs: Fix build without CONFIG_SMP wait_event() needs various definitions from With CONFIG_SMP, pulls in , but without CONFIG_SMP it fails to build. Signed-off-by: Mark McLoughlin --- fs/squashfs/inode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c index f578528..f5829f2 100644 --- a/fs/squashfs/inode.c +++ b/fs/squashfs/inode.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "squashfs.h" -- 1.5.4.1 linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch: --- NEW FILE linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch --- >From 8085f21aff0de59e5c2f6937823040dff8a003ed Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 29 Feb 2008 17:37:43 +0000 Subject: [PATCH] xen: Make hvc0 the preferred console in domU This makes the Xen console just work. Before, you had to ask for it on the kernel command line with console=hvc0 Signed-off-by: Markus Armbruster Signed-off-by: Mark McLoughlin --- arch/x86/xen/enlighten.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 8b9ee27..a94605e 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -1210,6 +1211,9 @@ asmlinkage void __init xen_start_kernel(void) ? __pa(xen_start_info->mod_start) : 0; boot_params.hdr.ramdisk_size = xen_start_info->mod_len; + if (!is_initial_xendomain()) + add_preferred_console("hvc", 0, NULL); + /* Start the world */ start_kernel(); } -- 1.5.4.1 linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch: --- NEW FILE linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch --- >From 6007e6d44bea69bc39ddb3a45185a1b4f3d42f06 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 25 Feb 2008 14:02:24 +0100 Subject: [PATCH] xen: Make xen-blkfront write its protocol ABI to xenstore Frontends are expected to write their protocol ABI to xenstore. Since the protocol ABI defaults to the backend's native ABI, things work fine without that as long as the frontend's native ABI is identical to the backend's native ABI. This is not the case for xen-blkfront running 32-on-64, because its ABI differs between 32 and 64 bit, and thus needs this fix. Based on http://xenbits.xensource.com/xen-unstable.hg?rev/c545932a18f3 and http://xenbits.xensource.com/xen-unstable.hg?rev/ffe52263b430 by Gerd Hoffmann Signed-off-by: Markus Armbruster --- drivers/block/xen-blkfront.c | 7 +++++++ include/xen/interface/io/protocols.h | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) create mode 100644 include/xen/interface/io/protocols.h diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 9c6f3f9..2e7c81e 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -47,6 +47,7 @@ #include #include +#include #include @@ -614,6 +615,12 @@ again: message = "writing event-channel"; goto abort_transaction; } + err = xenbus_printf(xbt, dev->nodename, "protocol", "%s", + XEN_IO_PROTO_ABI_NATIVE); + if (err) { + message = "writing protocol"; + goto abort_transaction; + } err = xenbus_transaction_end(xbt, 0); if (err) { diff --git a/include/xen/interface/io/protocols.h b/include/xen/interface/io/protocols.h new file mode 100644 index 0000000..01fc8ae --- /dev/null +++ b/include/xen/interface/io/protocols.h @@ -0,0 +1,21 @@ +#ifndef __XEN_PROTOCOLS_H__ +#define __XEN_PROTOCOLS_H__ + +#define XEN_IO_PROTO_ABI_X86_32 "x86_32-abi" +#define XEN_IO_PROTO_ABI_X86_64 "x86_64-abi" +#define XEN_IO_PROTO_ABI_IA64 "ia64-abi" +#define XEN_IO_PROTO_ABI_POWERPC64 "powerpc64-abi" + +#if defined(__i386__) +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32 +#elif defined(__x86_64__) +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_64 +#elif defined(__ia64__) +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64 +#elif defined(__powerpc64__) +# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64 +#else +# error arch fixup needed here +#endif + +#endif -- 1.5.4.1 linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch: --- NEW FILE linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch --- >From 014bae01b0076eb96cd5ba1013253623dba06254 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 25 Feb 2008 14:03:52 +0100 Subject: [PATCH] fbdev: Make deferred I/O work as advertized Deferred I/O was utterly broken. Reading the mmap()ed framebuffer worked, but writing it made the VM endlessly invoke vm_ops.page_mkwrite(). That happened because we failed to set page->mapping and page->index. The fix is to set them, and clean up properly before the framebuffer gets released. Fix extracted from this linux-fbdev-devel message: Subject: [PATCH 1/1 2.6.24] fbdev: defio and Metronomefb From: Jaya Kumar Date: 2008-02-18 13:41:26 Signed-off-by: Jaya Kumar Signed-off-by: Markus Armbruster --- drivers/video/fb_defio.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index 0f8cfb9..24843fd 100644 --- a/drivers/video/fb_defio.c +++ b/drivers/video/fb_defio.c @@ -4,7 +4,7 @@ * Copyright (C) 2006 Jaya Kumar * * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive + * License. See the file COPYING in the main directory of this archive * for more details. */ @@ -31,7 +31,7 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma, unsigned long offset; struct page *page; struct fb_info *info = vma->vm_private_data; - /* info->screen_base is in System RAM */ + /* info->screen_base is virtual memory */ void *screen_base = (void __force *) info->screen_base; offset = vmf->pgoff << PAGE_SHIFT; @@ -43,6 +43,15 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma, return VM_FAULT_SIGBUS; get_page(page); + + if (vma->vm_file) + page->mapping = vma->vm_file->f_mapping; + else + printk(KERN_ERR "no mapping available\n"); + + BUG_ON(!page->mapping); + page->index = vmf->pgoff; + vmf->page = page; return 0; } @@ -138,11 +147,20 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_init); void fb_deferred_io_cleanup(struct fb_info *info) { + void *screen_base = (void __force *) info->screen_base; struct fb_deferred_io *fbdefio = info->fbdefio; + struct page *page; + int i; BUG_ON(!fbdefio); cancel_delayed_work(&info->deferred_work); flush_scheduled_work(); + + /* clear out the mapping that we setup */ + for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) { + page = vmalloc_to_page(screen_base + i); + page->mapping = NULL; + } } EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup); -- 1.5.4.1 linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch: --- NEW FILE linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch --- >From 38a7237d6e5d70a4deafc7ef14e90c76b391834f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 25 Feb 2008 14:06:46 +0100 Subject: [PATCH] xen pvfb: Para-virtual framebuffer, keyboard and pointer driver This is a pair of Xen para-virtual frontend device drivers: drivers/video/xen-fbfront.c provides a framebuffer, and drivers/input/xen-kbdfront provides keyboard and mouse. The backends run in dom0 user space. The two drivers are not in two separate patches, because the intermediate step (one driver, not the other) is somewhat problematic: the backend in dom0 needs both drivers, and will refuse to complete device initialization unless they're both present. Signed-off-by: Markus Armbruster --- drivers/input/Kconfig | 9 + drivers/input/Makefile | 2 + drivers/input/xen-kbdfront.c | 340 +++++++++++++++++++++++ drivers/video/Kconfig | 14 + drivers/video/Makefile | 1 + drivers/video/xen-fbfront.c | 550 ++++++++++++++++++++++++++++++++++++++ include/xen/interface/io/fbif.h | 124 +++++++++ include/xen/interface/io/kbdif.h | 114 ++++++++ 8 files changed, 1154 insertions(+), 0 deletions(-) create mode 100644 drivers/input/xen-kbdfront.c create mode 100644 drivers/video/xen-fbfront.c create mode 100644 include/xen/interface/io/fbif.h create mode 100644 include/xen/interface/io/kbdif.h diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index d84ac4a..747633c 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -149,6 +149,15 @@ config INPUT_APMPOWER To compile this driver as a module, choose M here: the module will be called apm-power. +config XEN_KBDDEV_FRONTEND + tristate "Xen virtual keyboard and mouse support" + depends on XEN_FBDEV_FRONTEND + default y + help + This driver implements the front-end of the Xen virtual + keyboard and mouse device driver. It communicates with a back-end + in another domain. + comment "Input Device Drivers" source "drivers/input/keyboard/Kconfig" diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 24bdec1..606e1b9 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -24,3 +24,5 @@ obj-$(CONFIG_INPUT_MISC) += misc/ obj-$(CONFIG_INPUT_LIRC) += lirc/ obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o + +obj-$(CONFIG_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c new file mode 100644 index 0000000..0f47f46 --- /dev/null +++ b/drivers/input/xen-kbdfront.c @@ -0,0 +1,340 @@ +/* + * Xen para-virtual input device + * + * Copyright (C) 2005 Anthony Liguori + * Copyright (C) 2006-2008 Red Hat, Inc., Markus Armbruster + * + * Based on linux/drivers/input/mouse/sermouse.c + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +/* + * TODO: + * + * Switch to grant tables together with xen-fbfront.c. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct xenkbd_info { + struct input_dev *kbd; + struct input_dev *ptr; + struct xenkbd_page *page; + int irq; + struct xenbus_device *xbdev; + char phys[32]; +}; + +static int xenkbd_remove(struct xenbus_device *); +static int xenkbd_connect_backend(struct xenbus_device *, struct xenkbd_info *); +static void xenkbd_disconnect_backend(struct xenkbd_info *); + +/* + * Note: if you need to send out events, see xenfb_do_update() for how + * to do that. + */ + +static irqreturn_t input_handler(int rq, void *dev_id) +{ + struct xenkbd_info *info = dev_id; + struct xenkbd_page *page = info->page; + __u32 cons, prod; + + prod = page->in_prod; + if (prod == page->in_cons) + return IRQ_HANDLED; + rmb(); /* ensure we see ring contents up to prod */ + for (cons = page->in_cons; cons != prod; cons++) { + union xenkbd_in_event *event; + struct input_dev *dev; + event = &XENKBD_IN_RING_REF(page, cons); + + dev = info->ptr; + switch (event->type) { + case XENKBD_TYPE_MOTION: + input_report_rel(dev, REL_X, event->motion.rel_x); + input_report_rel(dev, REL_Y, event->motion.rel_y); + break; + case XENKBD_TYPE_KEY: + dev = NULL; + if (test_bit(event->key.keycode, info->kbd->keybit)) + dev = info->kbd; + if (test_bit(event->key.keycode, info->ptr->keybit)) + dev = info->ptr; + if (dev) + input_report_key(dev, event->key.keycode, + event->key.pressed); + else + printk(KERN_WARNING + "xenkbd: unhandled keycode 0x%x\n", + event->key.keycode); + break; + case XENKBD_TYPE_POS: + input_report_abs(dev, ABS_X, event->pos.abs_x); + input_report_abs(dev, ABS_Y, event->pos.abs_y); + break; + } + if (dev) + input_sync(dev); + } + mb(); /* ensure we got ring contents */ + page->in_cons = cons; + notify_remote_via_irq(info->irq); + + return IRQ_HANDLED; +} + +static int __devinit xenkbd_probe(struct xenbus_device *dev, + const struct xenbus_device_id *id) +{ + int ret, i; + struct xenkbd_info *info; + struct input_dev *kbd, *ptr; + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (!info) { + xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure"); + return -ENOMEM; + } + dev->dev.driver_data = info; + info->xbdev = dev; + info->irq = -1; + snprintf(info->phys, sizeof(info->phys), "xenbus/%s", dev->nodename); + + info->page = (void *)__get_free_page(GFP_KERNEL | __GFP_ZERO); + if (!info->page) + goto error_nomem; + + /* keyboard */ + kbd = input_allocate_device(); + if (!kbd) + goto error_nomem; + kbd->name = "Xen Virtual Keyboard"; + kbd->phys = info->phys; + kbd->id.bustype = BUS_PCI; + kbd->id.vendor = 0x5853; + kbd->id.product = 0xffff; + kbd->evbit[0] = BIT(EV_KEY); + for (i = KEY_ESC; i < KEY_UNKNOWN; i++) + set_bit(i, kbd->keybit); + for (i = KEY_OK; i < KEY_MAX; i++) + set_bit(i, kbd->keybit); + + ret = input_register_device(kbd); + if (ret) { + input_free_device(kbd); + xenbus_dev_fatal(dev, ret, "input_register_device(kbd)"); + goto error; + } + info->kbd = kbd; + + /* pointing device */ + ptr = input_allocate_device(); + if (!ptr) + goto error_nomem; + ptr->name = "Xen Virtual Pointer"; + ptr->phys = info->phys; + ptr->id.bustype = BUS_PCI; + ptr->id.vendor = 0x5853; + ptr->id.product = 0xfffe; + ptr->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS); + for (i = BTN_LEFT; i <= BTN_TASK; i++) + set_bit(i, ptr->keybit); + ptr->relbit[0] = BIT(REL_X) | BIT(REL_Y); + input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0); + input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0); + + ret = input_register_device(ptr); + if (ret) { + input_free_device(ptr); + xenbus_dev_fatal(dev, ret, "input_register_device(ptr)"); + goto error; + } + info->ptr = ptr; + + ret = xenkbd_connect_backend(dev, info); + if (ret < 0) + goto error; + + return 0; + + error_nomem: + ret = -ENOMEM; + xenbus_dev_fatal(dev, ret, "allocating device memory"); + error: + xenkbd_remove(dev); + return ret; +} + +static int xenkbd_resume(struct xenbus_device *dev) +{ + struct xenkbd_info *info = dev->dev.driver_data; + + xenkbd_disconnect_backend(info); + memset(info->page, 0, PAGE_SIZE); + return xenkbd_connect_backend(dev, info); +} + +static int xenkbd_remove(struct xenbus_device *dev) +{ + struct xenkbd_info *info = dev->dev.driver_data; + + xenkbd_disconnect_backend(info); + if (info->kbd) + input_unregister_device(info->kbd); + if (info->ptr) + input_unregister_device(info->ptr); + free_page((unsigned long)info->page); + kfree(info); + return 0; +} + +static int xenkbd_connect_backend(struct xenbus_device *dev, + struct xenkbd_info *info) +{ + int ret, evtchn; + struct xenbus_transaction xbt; + + ret = xenbus_alloc_evtchn(dev, &evtchn); + if (ret) + return ret; + ret = bind_evtchn_to_irqhandler(evtchn, input_handler, + 0, dev->devicetype, info); + if (ret < 0) { + xenbus_free_evtchn(dev, evtchn); + xenbus_dev_fatal(dev, ret, "bind_evtchn_to_irqhandler"); + return ret; + } + info->irq = ret; + + again: + ret = xenbus_transaction_start(&xbt); + if (ret) { + xenbus_dev_fatal(dev, ret, "starting transaction"); + return ret; + } + ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu", + virt_to_mfn(info->page)); + if (ret) + goto error_xenbus; + ret = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", + evtchn); + if (ret) + goto error_xenbus; + ret = xenbus_transaction_end(xbt, 0); + if (ret) { + if (ret == -EAGAIN) + goto again; + xenbus_dev_fatal(dev, ret, "completing transaction"); + return ret; + } + + xenbus_switch_state(dev, XenbusStateInitialised); + return 0; + + error_xenbus: + xenbus_transaction_end(xbt, 1); + xenbus_dev_fatal(dev, ret, "writing xenstore"); + return ret; +} + +static void xenkbd_disconnect_backend(struct xenkbd_info *info) +{ + if (info->irq >= 0) + unbind_from_irqhandler(info->irq, info); + info->irq = -1; +} + +static void xenkbd_backend_changed(struct xenbus_device *dev, + enum xenbus_state backend_state) +{ + struct xenkbd_info *info = dev->dev.driver_data; + int ret, val; + + switch (backend_state) { + case XenbusStateInitialising: + case XenbusStateInitialised: + case XenbusStateUnknown: + case XenbusStateClosed: + break; + + case XenbusStateInitWait: +InitWait: + ret = xenbus_scanf(XBT_NIL, info->xbdev->otherend, + "feature-abs-pointer", "%d", &val); + if (ret < 0) + val = 0; + if (val) { + ret = xenbus_printf(XBT_NIL, info->xbdev->nodename, + "request-abs-pointer", "1"); + if (ret) + printk(KERN_WARNING + "xenkbd: can't request abs-pointer"); + } + xenbus_switch_state(dev, XenbusStateConnected); + break; + + case XenbusStateConnected: + /* + * Work around xenbus race condition: If backend goes + * through InitWait to Connected fast enough, we can + * get Connected twice here. + */ + if (dev->state != XenbusStateConnected) + goto InitWait; /* no InitWait seen yet, fudge it */ + break; + + case XenbusStateClosing: + xenbus_frontend_closed(dev); + break; + } +} + +static struct xenbus_device_id xenkbd_ids[] = { + { "vkbd" }, + { "" } +}; + +static struct xenbus_driver xenkbd = { + .name = "vkbd", + .owner = THIS_MODULE, + .ids = xenkbd_ids, + .probe = xenkbd_probe, + .remove = xenkbd_remove, + .resume = xenkbd_resume, + .otherend_changed = xenkbd_backend_changed, +}; + +static int __init xenkbd_init(void) +{ + if (!is_running_on_xen()) + return -ENODEV; + + /* Nothing to do if running in dom0. */ + if (is_initial_xendomain()) + return -ENODEV; + + return xenbus_register_frontend(&xenkbd); +} + +static void __exit xenkbd_cleanup(void) +{ + xenbus_unregister_driver(&xenkbd); +} + +module_init(xenkbd_init); +module_exit(xenkbd_cleanup); + +MODULE_LICENSE("GPL"); diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 758435f..67de177 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -1903,6 +1903,20 @@ config FB_VIRTUAL If unsure, say N. +config XEN_FBDEV_FRONTEND + tristate "Xen virtual frame buffer support" + depends on FB && XEN + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS + select FB_DEFERRED_IO + default y + help + This driver implements the front-end of the Xen virtual + frame buffer driver. It communicates with a back-end + in another domain. + source "drivers/video/omap/Kconfig" source "drivers/video/backlight/Kconfig" diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 83e02b3..d3ab9b2 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -113,6 +113,7 @@ obj-$(CONFIG_FB_PS3) += ps3fb.o obj-$(CONFIG_FB_SM501) += sm501fb.o obj-$(CONFIG_FB_XILINX) += xilinxfb.o obj-$(CONFIG_FB_OMAP) += omap/ +obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o # Platform or fallback drivers go here obj-$(CONFIG_FB_UVESA) += uvesafb.o diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c new file mode 100644 index 0000000..619a6f8 --- /dev/null +++ b/drivers/video/xen-fbfront.c @@ -0,0 +1,550 @@ +/* + * Xen para-virtual frame buffer device + * + * Copyright (C) 2005-2006 Anthony Liguori + * Copyright (C) 2006-2008 Red Hat, Inc., Markus Armbruster + * + * Based on linux/drivers/video/q40fb.c + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +/* + * TODO: + * + * Switch to grant tables when they become capable of dealing with the + * frame buffer. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct xenfb_info { + unsigned char *fb; + struct fb_info *fb_info; + int x1, y1, x2, y2; /* dirty rectangle, + protected by dirty_lock */ + spinlock_t dirty_lock; + int nr_pages; + int irq; + struct xenfb_page *page; + unsigned long *mfns; + int update_wanted; /* XENFB_TYPE_UPDATE wanted */ + + struct xenbus_device *xbdev; +}; + +static u32 xenfb_mem_len = XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH / 8; + +static int xenfb_remove(struct xenbus_device *); +static void xenfb_init_shared_page(struct xenfb_info *); +static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *); +static void xenfb_disconnect_backend(struct xenfb_info *); + +static void xenfb_do_update(struct xenfb_info *info, + int x, int y, int w, int h) +{ + union xenfb_out_event event; + u32 prod; + + event.type = XENFB_TYPE_UPDATE; + event.update.x = x; + event.update.y = y; + event.update.width = w; + event.update.height = h; + + prod = info->page->out_prod; + /* caller ensures !xenfb_queue_full() */ + mb(); /* ensure ring space available */ + XENFB_OUT_RING_REF(info->page, prod) = event; + wmb(); /* ensure ring contents visible */ + info->page->out_prod = prod + 1; + + notify_remote_via_irq(info->irq); +} + +static int xenfb_queue_full(struct xenfb_info *info) +{ + u32 cons, prod; + + prod = info->page->out_prod; + cons = info->page->out_cons; + return prod - cons == XENFB_OUT_RING_LEN; +} + +static void xenfb_refresh(struct xenfb_info *info, + int x1, int y1, int w, int h) +{ + unsigned long flags; + int y2 = y1 + h - 1; + int x2 = x1 + w - 1; + + if (!info->update_wanted) + return; + + spin_lock_irqsave(&info->dirty_lock, flags); + + /* Combine with dirty rectangle: */ + if (info->y1 < y1) + y1 = info->y1; + if (info->y2 > y2) + y2 = info->y2; + if (info->x1 < x1) + x1 = info->x1; + if (info->x2 > x2) + x2 = info->x2; + + if (xenfb_queue_full(info)) { + /* Can't send right now, stash it in the dirty rectangle */ + info->x1 = x1; + info->x2 = x2; + info->y1 = y1; + info->y2 = y2; + spin_unlock_irqrestore(&info->dirty_lock, flags); + return; + } + + /* Clear dirty rectangle: */ + info->x1 = info->y1 = INT_MAX; + info->x2 = info->y2 = 0; + + spin_unlock_irqrestore(&info->dirty_lock, flags); + + if (x1 <= x2 && y1 <= y2) + xenfb_do_update(info, x1, y1, x2 - x1 + 1, y2 - y1 + 1); +} + +static void xenfb_deferred_io(struct fb_info *fb_info, + struct list_head *pagelist) +{ + struct xenfb_info *info = fb_info->par; + struct page *page; + unsigned long beg, end; + int y1, y2, miny, maxy; + + miny = INT_MAX; + maxy = 0; + list_for_each_entry(page, pagelist, lru) { + beg = page->index << PAGE_SHIFT; + end = beg + PAGE_SIZE - 1; + y1 = beg / fb_info->fix.line_length; + y2 = end / fb_info->fix.line_length; + if (y2 >= fb_info->var.yres) + y2 = fb_info->var.yres - 1; + if (miny > y1) + miny = y1; + if (maxy < y2) + maxy = y2; + } + xenfb_refresh(info, 0, miny, fb_info->var.xres, maxy - miny + 1); +} + +static struct fb_deferred_io xenfb_defio = { + .delay = HZ / 20, + .deferred_io = xenfb_deferred_io, +}; + +static int xenfb_setcolreg(unsigned regno, unsigned red, unsigned green, + unsigned blue, unsigned transp, + struct fb_info *info) +{ + u32 v; + + if (regno > info->cmap.len) + return 1; + +#define CNVT_TOHW(val, width) ((((val)<<(width))+0x7FFF-(val))>>16) + red = CNVT_TOHW(red, info->var.red.length); + green = CNVT_TOHW(green, info->var.green.length); + blue = CNVT_TOHW(blue, info->var.blue.length); + transp = CNVT_TOHW(transp, info->var.transp.length); +#undef CNVT_TOHW + + v = (red << info->var.red.offset) | + (green << info->var.green.offset) | + (blue << info->var.blue.offset); + + switch (info->var.bits_per_pixel) { + case 16: + case 24: + case 32: + ((u32 *)info->pseudo_palette)[regno] = v; + break; + } + + return 0; +} + +static void xenfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) +{ + struct xenfb_info *info = p->par; + + sys_fillrect(p, rect); + xenfb_refresh(info, rect->dx, rect->dy, rect->width, rect->height); +} + +static void xenfb_imageblit(struct fb_info *p, const struct fb_image *image) +{ + struct xenfb_info *info = p->par; + + sys_imageblit(p, image); + xenfb_refresh(info, image->dx, image->dy, image->width, image->height); +} + +static void xenfb_copyarea(struct fb_info *p, const struct fb_copyarea *area) +{ + struct xenfb_info *info = p->par; + + sys_copyarea(p, area); + xenfb_refresh(info, area->dx, area->dy, area->width, area->height); +} + +static ssize_t xenfb_write(struct fb_info *p, const char __user *buf, + size_t count, loff_t *ppos) +{ + struct xenfb_info *info = p->par; + ssize_t res; + + res = fb_sys_write(p, buf, count, ppos); + xenfb_refresh(info, 0, 0, info->page->width, info->page->height); + return res; +} + +static struct fb_ops xenfb_fb_ops = { + .owner = THIS_MODULE, + .fb_read = fb_sys_read, + .fb_write = xenfb_write, + .fb_setcolreg = xenfb_setcolreg, + .fb_fillrect = xenfb_fillrect, + .fb_copyarea = xenfb_copyarea, + .fb_imageblit = xenfb_imageblit, +}; + +static irqreturn_t xenfb_event_handler(int rq, void *dev_id) +{ + /* + * No in events recognized, simply ignore them all. + * If you need to recognize some, see xen-kbdfront's + * input_handler() for how to do that. + */ + struct xenfb_info *info = dev_id; + struct xenfb_page *page = info->page; + + if (page->in_cons != page->in_prod) { + info->page->in_cons = info->page->in_prod; + notify_remote_via_irq(info->irq); + } + + /* Flush dirty rectangle: */ + xenfb_refresh(info, INT_MAX, INT_MAX, -INT_MAX, -INT_MAX); + + return IRQ_HANDLED; +} + +static int __devinit xenfb_probe(struct xenbus_device *dev, + const struct xenbus_device_id *id) +{ + struct xenfb_info *info; + struct fb_info *fb_info; + int ret; + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (info == NULL) { + xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure"); + return -ENOMEM; + } + dev->dev.driver_data = info; + info->xbdev = dev; + info->irq = -1; + info->x1 = info->y1 = INT_MAX; + spin_lock_init(&info->dirty_lock); + + info->fb = vmalloc(xenfb_mem_len); + if (info->fb == NULL) + goto error_nomem; + memset(info->fb, 0, xenfb_mem_len); + + info->nr_pages = (xenfb_mem_len + PAGE_SIZE - 1) >> PAGE_SHIFT; + + info->mfns = vmalloc(sizeof(unsigned long) * info->nr_pages); + if (!info->mfns) + goto error_nomem; + + /* set up shared page */ + info->page = (void *)__get_free_page(GFP_KERNEL | __GFP_ZERO); + if (!info->page) + goto error_nomem; + + xenfb_init_shared_page(info); + + /* abusing framebuffer_alloc() to allocate pseudo_palette */ + fb_info = framebuffer_alloc(sizeof(u32) * 256, NULL); + if (fb_info == NULL) + goto error_nomem; + + /* complete the abuse: */ + fb_info->pseudo_palette = fb_info->par; + fb_info->par = info; + + fb_info->screen_base = info->fb; + + fb_info->fbops = &xenfb_fb_ops; + fb_info->var.xres_virtual = fb_info->var.xres = info->page->width; + fb_info->var.yres_virtual = fb_info->var.yres = info->page->height; + fb_info->var.bits_per_pixel = info->page->depth; + + fb_info->var.red = (struct fb_bitfield){16, 8, 0}; + fb_info->var.green = (struct fb_bitfield){8, 8, 0}; + fb_info->var.blue = (struct fb_bitfield){0, 8, 0}; + + fb_info->var.activate = FB_ACTIVATE_NOW; + fb_info->var.height = -1; + fb_info->var.width = -1; + fb_info->var.vmode = FB_VMODE_NONINTERLACED; + + fb_info->fix.visual = FB_VISUAL_TRUECOLOR; + fb_info->fix.line_length = info->page->line_length; + fb_info->fix.smem_start = 0; + fb_info->fix.smem_len = xenfb_mem_len; + strcpy(fb_info->fix.id, "xen"); + fb_info->fix.type = FB_TYPE_PACKED_PIXELS; + fb_info->fix.accel = FB_ACCEL_NONE; + + fb_info->flags = FBINFO_FLAG_DEFAULT; + + ret = fb_alloc_cmap(&fb_info->cmap, 256, 0); + if (ret < 0) { + framebuffer_release(fb_info); + xenbus_dev_fatal(dev, ret, "fb_alloc_cmap"); + goto error; + } + + fb_info->fbdefio = &xenfb_defio; + fb_deferred_io_init(fb_info); + + ret = register_framebuffer(fb_info); + if (ret) { + fb_deferred_io_cleanup(fb_info); + fb_dealloc_cmap(&fb_info->cmap); + framebuffer_release(fb_info); + xenbus_dev_fatal(dev, ret, "register_framebuffer"); + goto error; + } + info->fb_info = fb_info; + + ret = xenfb_connect_backend(dev, info); + if (ret < 0) + goto error; + + return 0; + + error_nomem: + ret = -ENOMEM; + xenbus_dev_fatal(dev, ret, "allocating device memory"); + error: + xenfb_remove(dev); + return ret; +} + +static int xenfb_resume(struct xenbus_device *dev) +{ + struct xenfb_info *info = dev->dev.driver_data; + + xenfb_disconnect_backend(info); + xenfb_init_shared_page(info); + return xenfb_connect_backend(dev, info); +} + +static int xenfb_remove(struct xenbus_device *dev) +{ + struct xenfb_info *info = dev->dev.driver_data; + + xenfb_disconnect_backend(info); + if (info->fb_info) { + fb_deferred_io_cleanup(info->fb_info); + unregister_framebuffer(info->fb_info); + fb_dealloc_cmap(&info->fb_info->cmap); + framebuffer_release(info->fb_info); + } + free_page((unsigned long)info->page); + vfree(info->mfns); + vfree(info->fb); + kfree(info); + + return 0; +} + +static unsigned long vmalloc_to_mfn(void *address) +{ + return pfn_to_mfn(vmalloc_to_pfn(address)); +} + +static void xenfb_init_shared_page(struct xenfb_info *info) +{ + int i; + + for (i = 0; i < info->nr_pages; i++) + info->mfns[i] = vmalloc_to_mfn(info->fb + i * PAGE_SIZE); + + info->page->pd[0] = vmalloc_to_mfn(info->mfns); + info->page->pd[1] = 0; + info->page->width = XENFB_WIDTH; + info->page->height = XENFB_HEIGHT; + info->page->depth = XENFB_DEPTH; + info->page->line_length = (info->page->depth / 8) * info->page->width; + info->page->mem_length = xenfb_mem_len; + info->page->in_cons = info->page->in_prod = 0; + info->page->out_cons = info->page->out_prod = 0; +} + +static int xenfb_connect_backend(struct xenbus_device *dev, + struct xenfb_info *info) +{ + int ret, evtchn; + struct xenbus_transaction xbt; + + ret = xenbus_alloc_evtchn(dev, &evtchn); + if (ret) + return ret; + ret = bind_evtchn_to_irqhandler(evtchn, xenfb_event_handler, + 0, dev->devicetype, info); + if (ret < 0) { + xenbus_free_evtchn(dev, evtchn); + xenbus_dev_fatal(dev, ret, "bind_evtchn_to_irqhandler"); + return ret; + } + info->irq = ret; + + again: + ret = xenbus_transaction_start(&xbt); + if (ret) { + xenbus_dev_fatal(dev, ret, "starting transaction"); + return ret; + } + ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu", + virt_to_mfn(info->page)); + if (ret) + goto error_xenbus; + ret = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", + evtchn); + if (ret) + goto error_xenbus; + ret = xenbus_printf(xbt, dev->nodename, "protocol", "%s", + XEN_IO_PROTO_ABI_NATIVE); + if (ret) + goto error_xenbus; + ret = xenbus_printf(xbt, dev->nodename, "feature-update", "1"); + if (ret) + goto error_xenbus; + ret = xenbus_transaction_end(xbt, 0); + if (ret) { + if (ret == -EAGAIN) + goto again; + xenbus_dev_fatal(dev, ret, "completing transaction"); + return ret; + } + + xenbus_switch_state(dev, XenbusStateInitialised); + return 0; + + error_xenbus: + xenbus_transaction_end(xbt, 1); + xenbus_dev_fatal(dev, ret, "writing xenstore"); + return ret; +} + +static void xenfb_disconnect_backend(struct xenfb_info *info) +{ + if (info->irq >= 0) + unbind_from_irqhandler(info->irq, info); + info->irq = -1; +} + +static void xenfb_backend_changed(struct xenbus_device *dev, + enum xenbus_state backend_state) +{ + struct xenfb_info *info = dev->dev.driver_data; + int val; + + switch (backend_state) { + case XenbusStateInitialising: + case XenbusStateInitialised: + case XenbusStateUnknown: + case XenbusStateClosed: + break; + + case XenbusStateInitWait: +InitWait: + xenbus_switch_state(dev, XenbusStateConnected); + break; + + case XenbusStateConnected: + /* + * Work around xenbus race condition: If backend goes + * through InitWait to Connected fast enough, we can + * get Connected twice here. + */ + if (dev->state != XenbusStateConnected) + goto InitWait; /* no InitWait seen yet, fudge it */ + + if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, + "request-update", "%d", &val) < 0) + val = 0; + if (val) + info->update_wanted = 1; + break; + + case XenbusStateClosing: + xenbus_frontend_closed(dev); + break; + } +} + +static struct xenbus_device_id xenfb_ids[] = { + { "vfb" }, + { "" } +}; + +static struct xenbus_driver xenfb = { + .name = "vfb", + .owner = THIS_MODULE, + .ids = xenfb_ids, + .probe = xenfb_probe, + .remove = xenfb_remove, + .resume = xenfb_resume, + .otherend_changed = xenfb_backend_changed, +}; + +static int __init xenfb_init(void) +{ + if (!is_running_on_xen()) + return -ENODEV; + + /* Nothing to do if running in dom0. */ + if (is_initial_xendomain()) + return -ENODEV; + + return xenbus_register_frontend(&xenfb); +} + +static void __exit xenfb_cleanup(void) +{ + xenbus_unregister_driver(&xenfb); +} + +module_init(xenfb_init); +module_exit(xenfb_cleanup); + +MODULE_LICENSE("GPL"); diff --git a/include/xen/interface/io/fbif.h b/include/xen/interface/io/fbif.h new file mode 100644 index 0000000..5a934dd --- /dev/null +++ b/include/xen/interface/io/fbif.h @@ -0,0 +1,124 @@ +/* + * fbif.h -- Xen virtual frame buffer device + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (C) 2005 Anthony Liguori + * Copyright (C) 2006 Red Hat, Inc., Markus Armbruster + */ + +#ifndef __XEN_PUBLIC_IO_FBIF_H__ +#define __XEN_PUBLIC_IO_FBIF_H__ + +/* Out events (frontend -> backend) */ + +/* + * Out events may be sent only when requested by backend, and receipt + * of an unknown out event is an error. + */ + +/* Event type 1 currently not used */ +/* + * Framebuffer update notification event + * Capable frontend sets feature-update in xenstore. + * Backend requests it by setting request-update in xenstore. + */ +#define XENFB_TYPE_UPDATE 2 + +struct xenfb_update { + uint8_t type; /* XENFB_TYPE_UPDATE */ + int32_t x; /* source x */ + int32_t y; /* source y */ + int32_t width; /* rect width */ + int32_t height; /* rect height */ +}; + +#define XENFB_OUT_EVENT_SIZE 40 + +union xenfb_out_event { + uint8_t type; + struct xenfb_update update; + char pad[XENFB_OUT_EVENT_SIZE]; +}; + +/* In events (backend -> frontend) */ + +/* + * Frontends should ignore unknown in events. + * No in events currently defined. + */ + +#define XENFB_IN_EVENT_SIZE 40 + +union xenfb_in_event { + uint8_t type; + char pad[XENFB_IN_EVENT_SIZE]; +}; + +/* shared page */ + +#define XENFB_IN_RING_SIZE 1024 +#define XENFB_IN_RING_LEN (XENFB_IN_RING_SIZE / XENFB_IN_EVENT_SIZE) +#define XENFB_IN_RING_OFFS 1024 +#define XENFB_IN_RING(page) \ + ((union xenfb_in_event *)((char *)(page) + XENFB_IN_RING_OFFS)) +#define XENFB_IN_RING_REF(page, idx) \ + (XENFB_IN_RING((page))[(idx) % XENFB_IN_RING_LEN]) + +#define XENFB_OUT_RING_SIZE 2048 +#define XENFB_OUT_RING_LEN (XENFB_OUT_RING_SIZE / XENFB_OUT_EVENT_SIZE) +#define XENFB_OUT_RING_OFFS (XENFB_IN_RING_OFFS + XENFB_IN_RING_SIZE) +#define XENFB_OUT_RING(page) \ + ((union xenfb_out_event *)((char *)(page) + XENFB_OUT_RING_OFFS)) +#define XENFB_OUT_RING_REF(page, idx) \ + (XENFB_OUT_RING((page))[(idx) % XENFB_OUT_RING_LEN]) + +struct xenfb_page { + uint32_t in_cons, in_prod; + uint32_t out_cons, out_prod; + + int32_t width; /* width of the framebuffer (in pixels) */ + int32_t height; /* height of the framebuffer (in pixels) */ + uint32_t line_length; /* length of a row of pixels (in bytes) */ + uint32_t mem_length; /* length of the framebuffer (in bytes) */ + uint8_t depth; /* depth of a pixel (in bits) */ + + /* + * Framebuffer page directory + * + * Each directory page holds PAGE_SIZE / sizeof(*pd) + * framebuffer pages, and can thus map up to PAGE_SIZE * + * PAGE_SIZE / sizeof(*pd) bytes. With PAGE_SIZE == 4096 and + * sizeof(unsigned long) == 4, that's 4 Megs. Two directory + * pages should be enough for a while. + */ + unsigned long pd[2]; +}; + +/* + * Wart: xenkbd needs to know resolution. Put it here until a better + * solution is found, but don't leak it to the backend. + */ +#ifdef __KERNEL__ +#define XENFB_WIDTH 800 +#define XENFB_HEIGHT 600 +#define XENFB_DEPTH 32 +#endif + +#endif diff --git a/include/xen/interface/io/kbdif.h b/include/xen/interface/io/kbdif.h new file mode 100644 index 0000000..fb97f42 --- /dev/null +++ b/include/xen/interface/io/kbdif.h @@ -0,0 +1,114 @@ +/* + * kbdif.h -- Xen virtual keyboard/mouse + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (C) 2005 Anthony Liguori + * Copyright (C) 2006 Red Hat, Inc., Markus Armbruster + */ + +#ifndef __XEN_PUBLIC_IO_KBDIF_H__ +#define __XEN_PUBLIC_IO_KBDIF_H__ + +/* In events (backend -> frontend) */ + +/* + * Frontends should ignore unknown in events. + */ + +/* Pointer movement event */ +#define XENKBD_TYPE_MOTION 1 +/* Event type 2 currently not used */ +/* Key event (includes pointer buttons) */ +#define XENKBD_TYPE_KEY 3 +/* + * Pointer position event + * Capable backend sets feature-abs-pointer in xenstore. + * Frontend requests ot instead of XENKBD_TYPE_MOTION by setting + * request-abs-update in xenstore. + */ +#define XENKBD_TYPE_POS 4 + +struct xenkbd_motion { + uint8_t type; /* XENKBD_TYPE_MOTION */ + int32_t rel_x; /* relative X motion */ + int32_t rel_y; /* relative Y motion */ +}; + +struct xenkbd_key { + uint8_t type; /* XENKBD_TYPE_KEY */ + uint8_t pressed; /* 1 if pressed; 0 otherwise */ + uint32_t keycode; /* KEY_* from linux/input.h */ +}; + +struct xenkbd_position { + uint8_t type; /* XENKBD_TYPE_POS */ + int32_t abs_x; /* absolute X position (in FB pixels) */ + int32_t abs_y; /* absolute Y position (in FB pixels) */ +}; + +#define XENKBD_IN_EVENT_SIZE 40 + +union xenkbd_in_event { + uint8_t type; + struct xenkbd_motion motion; + struct xenkbd_key key; + struct xenkbd_position pos; + char pad[XENKBD_IN_EVENT_SIZE]; +}; + +/* Out events (frontend -> backend) */ + +/* + * Out events may be sent only when requested by backend, and receipt + * of an unknown out event is an error. + * No out events currently defined. + */ + +#define XENKBD_OUT_EVENT_SIZE 40 + +union xenkbd_out_event { + uint8_t type; + char pad[XENKBD_OUT_EVENT_SIZE]; +}; + +/* shared page */ + +#define XENKBD_IN_RING_SIZE 2048 +#define XENKBD_IN_RING_LEN (XENKBD_IN_RING_SIZE / XENKBD_IN_EVENT_SIZE) +#define XENKBD_IN_RING_OFFS 1024 +#define XENKBD_IN_RING(page) \ + ((union xenkbd_in_event *)((char *)(page) + XENKBD_IN_RING_OFFS)) +#define XENKBD_IN_RING_REF(page, idx) \ + (XENKBD_IN_RING((page))[(idx) % XENKBD_IN_RING_LEN]) + +#define XENKBD_OUT_RING_SIZE 1024 +#define XENKBD_OUT_RING_LEN (XENKBD_OUT_RING_SIZE / XENKBD_OUT_EVENT_SIZE) +#define XENKBD_OUT_RING_OFFS (XENKBD_IN_RING_OFFS + XENKBD_IN_RING_SIZE) +#define XENKBD_OUT_RING(page) \ + ((union xenkbd_out_event *)((char *)(page) + XENKBD_OUT_RING_OFFS)) +#define XENKBD_OUT_RING_REF(page, idx) \ + (XENKBD_OUT_RING((page))[(idx) % XENKBD_OUT_RING_LEN]) + +struct xenkbd_page { + uint32_t in_cons, in_prod; + uint32_t out_cons, out_prod; +}; + +#endif -- 1.5.4.1 linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch: --- NEW FILE linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch --- >From 422407af4fdf82e12748b36174a17d857f08ebee Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 22 Feb 2008 12:42:52 +0000 Subject: [PATCH] xen: Module autoprobing support for frontend drivers Add module aliases to support autoprobing modules for xen frontend devices. Signed-off-by: Mark McLoughlin --- drivers/block/xen-blkfront.c | 1 + drivers/net/xen-netfront.c | 1 + drivers/xen/xenbus/xenbus_probe.c | 27 +++++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 2e7c81e..0c47c02 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1005,3 +1005,4 @@ module_exit(xlblk_exit); MODULE_DESCRIPTION("Xen virtual block device frontend"); MODULE_LICENSE("GPL"); MODULE_ALIAS_BLOCKDEV_MAJOR(XENVBD_MAJOR); +MODULE_ALIAS("xen:vbd"); diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 7483d45..b3fa27e 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1809,3 +1809,4 @@ module_exit(netif_exit); MODULE_DESCRIPTION("Xen virtual network device frontend"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("xen:vif"); diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 4750de3..336363c 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -88,6 +88,16 @@ int xenbus_match(struct device *_dev, struct device_driver *_drv) return match_device(drv->ids, to_xenbus_device(_dev)) != NULL; } +static int xenbus_uevent(struct device *_dev, struct kobj_uevent_env *env) +{ + struct xenbus_device *dev = to_xenbus_device(_dev); + + if (add_uevent_var(env, "MODALIAS=xen:%s", dev->devicetype)) + return -ENOMEM; + + return 0; +} + /* device// => - */ static int frontend_bus_id(char bus_id[BUS_ID_SIZE], const char *nodename) { @@ -166,6 +176,7 @@ static struct xen_bus_type xenbus_frontend = { .bus = { .name = "xen", .match = xenbus_match, + .uevent = xenbus_uevent, .probe = xenbus_dev_probe, .remove = xenbus_dev_remove, .shutdown = xenbus_dev_shutdown, @@ -438,6 +449,12 @@ static ssize_t xendev_show_devtype(struct device *dev, } DEVICE_ATTR(devtype, S_IRUSR | S_IRGRP | S_IROTH, xendev_show_devtype, NULL); +static ssize_t xendev_show_modalias(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "xen:%s\n", to_xenbus_device(dev)->devicetype); +} +DEVICE_ATTR(modalias, S_IRUSR | S_IRGRP | S_IROTH, xendev_show_modalias, NULL); int xenbus_probe_node(struct xen_bus_type *bus, const char *type, @@ -492,10 +509,16 @@ int xenbus_probe_node(struct xen_bus_type *bus, err = device_create_file(&xendev->dev, &dev_attr_devtype); if (err) - goto fail_remove_file; + goto fail_remove_nodename; + + err = device_create_file(&xendev->dev, &dev_attr_modalias); + if (err) + goto fail_remove_devtype; return 0; -fail_remove_file: +fail_remove_devtype: + device_remove_file(&xendev->dev, &dev_attr_devtype); +fail_remove_nodename: device_remove_file(&xendev->dev, &dev_attr_nodename); fail_unregister: device_unregister(&xendev->dev); -- 1.5.4.1 linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch: --- NEW FILE linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch --- >From 6025fff31cba456d0e44e6120af376454658890d Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 21 Feb 2008 11:13:12 +0000 Subject: [PATCH] xen: Add compatibility aliases for frontend drivers Before getting merged, xen-blkfront was xenblk and xen-netfront was xennet. Add compatibility module aliases to ease upgrades. Signed-off-by: Mark McLoughlin --- drivers/block/xen-blkfront.c | 1 + drivers/net/xen-netfront.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 0c47c02..8ce168d 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1006,3 +1006,4 @@ MODULE_DESCRIPTION("Xen virtual block device frontend"); MODULE_LICENSE("GPL"); MODULE_ALIAS_BLOCKDEV_MAJOR(XENVBD_MAJOR); MODULE_ALIAS("xen:vbd"); +MODULE_ALIAS("xenblk"); diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index b3fa27e..e62018a 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1810,3 +1810,4 @@ module_exit(netif_exit); MODULE_DESCRIPTION("Xen virtual network device frontend"); MODULE_LICENSE("GPL"); MODULE_ALIAS("xen:vif"); +MODULE_ALIAS("xennet"); -- 1.5.4.1 linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch: --- NEW FILE linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch --- >From 4fb0e1246a57f5b97b6912c0c806c7fa26bba634 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 19 Feb 2008 15:34:32 +0000 Subject: [PATCH] xen dom0: Add a vmlinuz target Although patches are in progress to allow Xen boot a DomU using a bzImage, support for booting a Dom0 using a bzImage is still a ways off. For now, just add a target to build a gzip-ed ELF file which Xen can use to boot Dom0. Signed-off-by: Mark McLoughlin --- arch/x86/Makefile | 9 +++++++++ arch/x86/boot/.gitignore | 1 + arch/x86/boot/Makefile | 9 +++++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index f1e739a..14a752e 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -206,6 +206,15 @@ boot := arch/x86/boot PHONY += zImage bzImage compressed zlilo bzlilo \ zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install +ifdef CONFIG_XEN +PHONY += vmlinuz +all: vmlinuz + +vmlinuz: KBUILD_IMAGE := $(boot)/vmlinuz +vmlinuz: vmlinux + $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) +endif + # Default kernel to build all: bzImage diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore index b1bdc4c..35e7956 100644 --- a/arch/x86/boot/.gitignore +++ b/arch/x86/boot/.gitignore @@ -5,3 +5,4 @@ setup.bin setup.elf cpustr.h mkcpustr +vmlinuz diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index f88458e..61bba92 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -26,6 +26,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA #RAMDISK := -DRAMDISK=512 targets := vmlinux.bin setup.bin setup.elf zImage bzImage +targets += vmlinuz vmlinux-stripped subdir- := compressed setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o @@ -105,6 +106,14 @@ $(obj)/setup.bin: $(obj)/setup.elf FORCE $(obj)/compressed/vmlinux: FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@ +$(obj)/vmlinuz: $(obj)/vmlinux-stripped FORCE + $(call if_changed,gzip) + @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' + +$(obj)/vmlinux-stripped: OBJCOPYFLAGS := -g --strip-unneeded +$(obj)/vmlinux-stripped: vmlinux FORCE + $(call if_changed,objcopy) + # Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel FDARGS = # Set this if you want an initrd included with the zdisk/fdimage/isoimage kernel -- 1.5.4.1 linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch: --- NEW FILE linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch --- >From fbd13951ece893daa2e4444750cd04d10abeb4f7 Mon Sep 17 00:00:00 2001 From: Stephen Tweedie Date: Wed, 21 Nov 2007 18:40:31 +0000 Subject: [PATCH] xen debug: Add xprintk to log directly via hypercall For early debugging, it is useful to have a way of doing debugging output direct to the hypervisor without having to rely on console being fully initialised. Signed-off-by: Stephen Tweedie --- arch/x86/xen/enlighten.c | 32 ++++++++++++++++++++++++++++++++ include/xen/hvc-console.h | 1 + 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index a94605e..e1702e1 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -142,6 +143,37 @@ static void __init xen_banner(void) printk(KERN_INFO "Hypervisor signature: %s\n", xen_start_info->magic); } +static void kcons_write_dom0(const char *s, unsigned int count) +{ + int rc; + + while ((count > 0) && + ((rc = HYPERVISOR_console_io( + CONSOLEIO_write, count, (char *)s)) > 0)) { + count -= rc; + s += rc; + } +} + + +/*** Useful function for console debugging -- goes straight to Xen. ***/ +asmlinkage int xprintk(const char *fmt, ...) +{ + va_list args; + int printk_len; + static char printk_buf[1024]; + + /* Emit the output into the temporary buffer */ + va_start(args, fmt); + printk_len = vsnprintf(printk_buf, sizeof(printk_buf), fmt, args); + va_end(args); + + /* Send the processed output directly to Xen. */ + kcons_write_dom0(printk_buf, printk_len); + + return 0; +} + static void xen_cpuid(unsigned int *ax, unsigned int *bx, unsigned int *cx, unsigned int *dx) { diff --git a/include/xen/hvc-console.h b/include/xen/hvc-console.h index 21c0ecf..cb7a3c9 100644 --- a/include/xen/hvc-console.h +++ b/include/xen/hvc-console.h @@ -2,5 +2,6 @@ #define XEN_HVC_CONSOLE_H extern struct console xenboot_console; +extern asmlinkage int xprintk(const char *fmt, ...); #endif /* XEN_HVC_CONSOLE_H */ -- 1.5.4.1 linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch: --- NEW FILE linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch --- >From 6d1e8fc91a0e533f42f7141e5032082e932e3387 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 4 Mar 2008 17:59:50 +0000 Subject: [PATCH] xen x86_64: Initial x86_64 support for Xen paravirt_ops Signed-off-by: Eduardo Habkost Signed-off-by: Mark McLoughlin --- arch/x86/Kconfig | 3 +- arch/x86/kernel/acpi/boot.c | 4 +- arch/x86/kernel/apic_32.c | 4 +- arch/x86/kernel/apic_64.c | 2 +- arch/x86/kernel/asm-offsets_64.c | 15 + arch/x86/kernel/early_printk.c | 5 +- arch/x86/kernel/efi_64.c | 4 +- arch/x86/kernel/entry_32.S | 83 +----- arch/x86/kernel/entry_64.S | 72 ++++- arch/x86/kernel/genapic_64.c | 12 + arch/x86/kernel/head64.c | 4 + arch/x86/kernel/head_64.S | 23 ++ arch/x86/kernel/hpet.c | 4 +- arch/x86/kernel/io_apic_64.c | 2 +- arch/x86/kernel/irq_64.c | 5 + arch/x86/kernel/mpparse_32.c | 4 +- arch/x86/kernel/mpparse_64.c | 4 +- arch/x86/kernel/paravirt.c | 3 + arch/x86/kernel/process_64.c | 9 + arch/x86/kernel/setup64.c | 5 + arch/x86/kernel/setup_64.c | 41 +++- arch/x86/kernel/smpboot_64.c | 4 +- arch/x86/kernel/vsyscall_64.c | 31 ++- arch/x86/mach-visws/traps.c | 10 +- arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 558 ++++++++++++++++++++++++++++++++-- arch/x86/mm/ioremap.c | 4 +- arch/x86/mm/pgtable_32.c | 25 ++- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/vdso/vdso32-setup.c | 6 +- arch/x86/xen/Kconfig | 1 - arch/x86/xen/Makefile | 6 + arch/x86/xen/enlighten.c | 268 +++++++++++----- arch/x86/xen/entry.S | 5 + arch/x86/xen/entry_32.S | 81 +++++ arch/x86/xen/entry_64.S | 68 ++++ arch/x86/xen/events.c | 13 +- arch/x86/xen/genapic.c | 190 ++++++++++++ arch/x86/xen/init.h | 20 ++ arch/x86/xen/init_32.c | 3 + arch/x86/xen/init_64.c | 181 +++++++++++ arch/x86/xen/mmu.c | 407 ++++++++++++++++++------- arch/x86/xen/mmu.h | 46 ++-- arch/x86/xen/multicalls.c | 9 +- arch/x86/xen/setup.c | 22 ++ arch/x86/xen/smp.c | 16 + arch/x86/xen/xen-asm.S | 219 +++----------- arch/x86/xen/xen-asm_32.S | 184 +++++++++++ arch/x86/xen/xen-asm_64.S | 75 +++++ arch/x86/xen/xen-head.S | 21 +- arch/x86/xen/xen-ops.h | 11 + drivers/acpi/thermal.c | 5 + drivers/char/hvc_xen.c | 6 + drivers/ieee1394/init_ohci1394_dma.c | 2 +- drivers/serial/8250_early.c | 2 +- include/asm-x86/asm-hack.h | 27 ++ include/asm-x86/cmpxchg_64.h | 36 +++ include/asm-x86/desc_defs.h | 4 + include/asm-x86/fixmap_32.h | 22 +- include/asm-x86/fixmap_64.h | 31 ++- include/asm-x86/mmu_context_64.h | 6 +- include/asm-x86/page_64.h | 2 +- include/asm-x86/paravirt.h | 46 ++- include/asm-x86/percpu.h | 32 ++ include/asm-x86/pgalloc_64.h | 69 ++++- include/asm-x86/pgtable.h | 15 +- include/asm-x86/pgtable_64.h | 3 +- include/asm-x86/proto.h | 1 + include/asm-x86/smp_64.h | 3 + include/asm-x86/system.h | 3 +- include/asm-x86/xen/hypercall.h | 205 ++++++++++--- include/asm-x86/xen/hypervisor.h | 3 - include/asm-x86/xen/interface.h | 35 ++- include/linux/dmi.h | 1 + include/linux/elfnote.h | 2 +- include/xen/events.h | 2 + include/xen/interface/elfnote.h | 16 + include/xen/page.h | 34 ++- init/main.c | 10 + mm/slab.c | 8 +- 80 files changed, 2759 insertions(+), 668 deletions(-) create mode 100644 arch/x86/xen/entry.S create mode 100644 arch/x86/xen/entry_32.S create mode 100644 arch/x86/xen/entry_64.S create mode 100644 arch/x86/xen/genapic.c create mode 100644 arch/x86/xen/init.h create mode 100644 arch/x86/xen/init_32.c create mode 100644 arch/x86/xen/init_64.c create mode 100644 arch/x86/xen/xen-asm_32.S create mode 100644 arch/x86/xen/xen-asm_64.S create mode 100644 include/asm-x86/asm-hack.h diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f41c953..6f466aa 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -92,7 +92,7 @@ config ARCH_MAY_HAVE_PC_FDC def_bool y config DMI - def_bool y + def_bool !XEN config RWSEM_GENERIC_SPINLOCK def_bool !X86_XADD @@ -330,6 +330,7 @@ config X86_RDC321X config X86_VSMP bool "Support for ScaleMP vSMP" + depends on !XEN depends on X86_64 && PCI help Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 2cdc9de..cfc79ac 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -141,7 +141,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) offset = phys & (PAGE_SIZE - 1); mapped_size = PAGE_SIZE - offset; - set_fixmap(FIX_ACPI_END, phys); + set_fixmap_ma(FIX_ACPI_END, phys); base = fix_to_virt(FIX_ACPI_END); /* @@ -152,7 +152,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) if (--idx < FIX_ACPI_BEGIN) return NULL; /* cannot handle this */ phys += PAGE_SIZE; - set_fixmap(idx, phys); + set_fixmap_ma(idx, phys); mapped_size += PAGE_SIZE; } diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 35a568e..40fc1b3 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -1138,7 +1138,7 @@ void __init init_apic_mappings(void) } else apic_phys = mp_lapic_addr; - set_fixmap_nocache(FIX_APIC_BASE, apic_phys); + set_fixmap_ma_nocache(FIX_APIC_BASE, apic_phys); printk(KERN_DEBUG "mapped APIC to %08lx (%08lx)\n", APIC_BASE, apic_phys); @@ -1172,7 +1172,7 @@ fake_ioapic_page: alloc_bootmem_pages(PAGE_SIZE); ioapic_phys = __pa(ioapic_phys); } - set_fixmap_nocache(idx, ioapic_phys); + set_fixmap_ma_nocache(idx, ioapic_phys); printk(KERN_DEBUG "mapped IOAPIC to %08lx (%08lx)\n", __fix_to_virt(idx), ioapic_phys); idx++; diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index d8d03e0..a611520 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -877,7 +877,7 @@ void __init init_apic_mappings(void) } else apic_phys = mp_lapic_addr; - set_fixmap_nocache(FIX_APIC_BASE, apic_phys); + set_fixmap_ma_nocache(FIX_APIC_BASE, apic_phys); apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", APIC_BASE, apic_phys); diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index 494e1e0..d0fabfd 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -25,6 +25,8 @@ #define OFFSET(sym, str, mem) \ DEFINE(sym, offsetof(struct str, mem)) +#include + #define __NO_STUBS 1 #undef __SYSCALL #undef _ASM_X86_64_UNISTD_H_ @@ -92,6 +94,13 @@ int main(void) offsetof (struct rt_sigframe32, uc.uc_mcontext)); BLANK(); #endif + +#ifdef CONFIG_XEN + BLANK(); + OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); [...5539 lines suppressed...] -#define ELFNOTE(name, type, desc) \ +#define ELFNOTE(name, type, desc...) \ ELFNOTE_START(name, type, "") \ desc ; \ ELFNOTE_END diff --git a/include/xen/events.h b/include/xen/events.h index 2bde54d..c18d2bf 100644 --- a/include/xen/events.h +++ b/include/xen/events.h @@ -3,6 +3,8 @@ #include +#include +#include #include #include diff --git a/include/xen/interface/elfnote.h b/include/xen/interface/elfnote.h index a64d3df..ee5501d 100644 --- a/include/xen/interface/elfnote.h +++ b/include/xen/interface/elfnote.h @@ -120,6 +120,22 @@ */ #define XEN_ELFNOTE_BSD_SYMTAB 11 +/* + * The lowest address the hypervisor hole can begin at (numeric). + * + * This must not be set higher than HYPERVISOR_VIRT_START. Its presence + * also indicates to the hypervisor that the kernel can deal with the + * hole starting at a higher address. + */ +#define XEN_ELFNOTE_HV_START_LOW 12 + +/* + * List of maddr_t-sized mask/value pairs describing how to recognize + * (non-present) L1 page table entries carrying valid MFNs (numeric). + */ +#define XEN_ELFNOTE_L1_MFN_VALID 13 + + #endif /* __XEN_PUBLIC_ELFNOTE_H__ */ /* diff --git a/include/xen/page.h b/include/xen/page.h index 031ef22..158fb60 100644 --- a/include/xen/page.h +++ b/include/xen/page.h @@ -8,6 +8,10 @@ #include +#include + +#include + #ifdef CONFIG_X86_PAE /* Xen machine address */ typedef struct xmaddr { @@ -70,6 +74,8 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) #endif pfn = 0; + //xprintk("mfn_to_pfn(%lx):\n", mfn); + /* * The array access can fail (e.g., device space beyond end of RAM). * In such cases it doesn't matter what we return (we return garbage), @@ -77,6 +83,7 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) */ __get_user(pfn, &machine_to_phys_mapping[mfn]); + //xprintk("mfn_to_pfn(%lx) = %lx\n", mfn, pfn); return pfn; } @@ -143,34 +150,29 @@ static inline void set_phys_to_machine(unsigned long pfn, unsigned long mfn) static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot) { - pte_t pte; - - pte.pte_high = (page_nr >> (32 - PAGE_SHIFT)) | - (pgprot_val(pgprot) >> 32); - pte.pte_high &= (__supported_pte_mask >> 32); - pte.pte_low = ((page_nr << PAGE_SHIFT) | pgprot_val(pgprot)); - pte.pte_low &= __supported_pte_mask; - - return pte; + pteval_t val; + + val = (page_nr << PAGE_SHIFT) | pgprot_val(pgprot); + val &= __supported_pte_mask; + return native_make_pte(val); } -static inline unsigned long long pte_val_ma(pte_t x) +static inline pteval_t pte_val_ma(pte_t x) { - return x.pte; + return native_pte_val(x); } -#define pmd_val_ma(v) ((v).pmd) -#define pud_val_ma(v) ((v).pgd.pgd) -#define __pte_ma(x) ((pte_t) { .pte = (x) }) +#define __pte_ma(x) (native_make_pte(x)) #define __pmd_ma(x) ((pmd_t) { (x) } ) #else /* !X86_PAE */ -#define pte_mfn(_pte) ((_pte).pte_low >> PAGE_SHIFT) +#define pte_mfn(_pte) ((native_pte_val(_pte) & __PHYSICAL_MASK) >> PAGE_SHIFT) #define mfn_pte(pfn, prot) __pte_ma(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) #define pte_val_ma(x) ((x).pte) -#define pmd_val_ma(v) ((v).pud.pgd.pgd) #define __pte_ma(x) ((pte_t) { (x) } ) #endif /* CONFIG_X86_PAE */ #define pgd_val_ma(x) ((x).pgd) +#define pmd_val_ma(x) (native_pmd_val((x))) +#define pud_val_ma(x) (native_pud_val((x))) xmaddr_t arbitrary_virt_to_machine(unsigned long address); diff --git a/init/main.c b/init/main.c index 80f5aaf..4a84f60 100644 --- a/init/main.c +++ b/init/main.c @@ -590,17 +590,25 @@ asmlinkage void __init start_kernel(void) rcu_init(); init_IRQ(); pidhash_init(); + printk("init_timers:\n"); init_timers(); hrtimers_init(); softirq_init(); + printk("timekeeping:\n"); timekeeping_init(); + printk("time:\n"); time_init(); + printk("profile:\n"); profile_init(); + printk("irqs_disabled:\n"); if (!irqs_disabled()) printk("start_kernel(): bug: interrupts were enabled early\n"); + printk("early_boot_irqs_on:\n"); early_boot_irqs_on(); + printk("local_irq_enable:\n"); local_irq_enable(); + printk("console_init:\n"); /* * HACK ALERT! This is early. We're enabling the console before * we've done PCI setups etc, and console_init() must be aware of @@ -637,7 +645,9 @@ asmlinkage void __init start_kernel(void) numa_policy_init(); if (late_time_init) late_time_init(); + printk("calibrate_delay:\n"); calibrate_delay(); + printk("pidmap_init:\n"); pidmap_init(); pgtable_cache_init(); prio_tree_init(); diff --git a/mm/slab.c b/mm/slab.c index e499669..c18daa3 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3202,6 +3202,8 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags) STATS_INC_ALLOCHIT(cachep); ac->touched = 1; objp = ac->entry[--ac->avail]; + if (!objp) + printk("really weird: avail objp for cache %s is null\n", cachep->name); } else { STATS_INC_ALLOCMISS(cachep); objp = cache_alloc_refill(cachep, flags); @@ -3464,8 +3466,10 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller) unsigned long save_flags; void *objp; - if (should_failslab(cachep, flags)) + if (should_failslab(cachep, flags)) { + printk("cache %s should fail\n", cachep->name); return NULL; + } cache_alloc_debugcheck_before(cachep, flags); local_irq_save(save_flags); @@ -3477,6 +3481,8 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller) if (unlikely((flags & __GFP_ZERO) && objp)) memset(objp, 0, obj_size(cachep)); + if (!objp) + printk("allocation from cache %s failed!!!\n", cachep->name); return objp; } -- 1.5.4.1 --- NEW FILE patch-2.6.25-rc4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBHzihsyGugalF9Dw4RAmvmAJ9ksQ5jf9yUO9KIUeo1adCPfKJrMQCfa3Ob 5SYdhp9yFKCV9a4cvu3nF70= =9t/0 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/.cvsignore,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -r1.11.2.2 -r1.11.2.3 --- .cvsignore 29 Feb 2008 18:58:22 -0000 1.11.2.2 +++ .cvsignore 5 Mar 2008 18:41:17 -0000 1.11.2.3 @@ -4,7 +4,5 @@ temp-* kernel-2.6.24 linux-2.6.24.tar.bz2 -patch-2.6.25-rc3.bz2 -patch-2.6.25-rc2-git7.bz2 -patch-2.6.25-rc3-git1.bz2 +patch-2.6.25-rc4.bz2 xen-3.2.0.tar.gz Index: .gitignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/.gitignore,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- .gitignore 29 Feb 2008 18:58:22 -0000 1.1.2.2 +++ .gitignore 5 Mar 2008 18:41:17 -0000 1.1.2.3 @@ -4,7 +4,5 @@ temp-* kernel-2.6.24 linux-2.6.24.tar.bz2 -patch-2.6.25-rc3.bz2 -patch-2.6.25-rc2-git7.bz2 -patch-2.6.25-rc3-git1.bz2 +patch-2.6.25-rc4.bz2 xen-3.2.0.tar.gz Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-generic,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -u -r1.2.4.2 -r1.2.4.3 --- config-generic 29 Feb 2008 18:58:22 -0000 1.2.4.2 +++ config-generic 5 Mar 2008 18:41:17 -0000 1.2.4.3 @@ -1984,6 +1984,7 @@ CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_V3020=m CONFIG_RTC_DRV_STK17TA8=m +# CONFIG_RTC_DRV_S35390A is not set CONFIG_DTLK=m CONFIG_R3964=m @@ -3149,6 +3150,7 @@ CONFIG_PROC_PID_CPUSET=y # CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set CONFIG_RELAY=y # CONFIG_PRINTK_TIME is not set @@ -3461,4 +3463,6 @@ CONFIG_FAIR_GROUP_SCHED=y # CONFIG_RT_GROUP_SCHED is not set CONFIG_CGROUP_SCHED=y +# CONFIG_CGROUP_MEM_RES_CTLR is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-powerpc-generic,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -u -r1.2.4.2 -r1.2.4.3 --- config-powerpc-generic 29 Feb 2008 18:58:22 -0000 1.2.4.2 +++ config-powerpc-generic 5 Mar 2008 18:41:17 -0000 1.2.4.3 @@ -218,3 +218,6 @@ CONFIG_THERMAL=y # CONFIG_MEMORY_HOTREMOVE is not set + +CONFIG_DMADEVICES=y +# CONFIG_FSL_DMA is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.11.2.13 retrieving revision 1.11.2.14 diff -u -r1.11.2.13 -r1.11.2.14 --- kernel.spec 5 Mar 2008 14:01:21 -0000 1.11.2.13 +++ kernel.spec 5 Mar 2008 18:41:17 -0000 1.11.2.14 @@ -20,7 +20,7 @@ # kernel spec when the kernel is rebased, so fedora_build automatically # works out to the offset from the rebase, so it doesn't get too ginormous. # -%define fedora_cvs_origin 78 +%define fedora_cvs_origin 93 %define private_markmc_pv_ops_branch 1.11.2. %define fedora_build %(R="$Revision$"; R="${R%% \$}"; echo "%{fedora_cvs_origin}.${R##: %{private_markmc_pv_ops_branch}}") @@ -44,9 +44,9 @@ # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(expr %{base_sublevel} + 1) # The rc snapshot level -%define rcrev 3 +%define rcrev 4 # The git snapshot level -%define gitrev 1 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -594,11 +594,14 @@ Patch42: linux-2.6-x86-tune-generic.patch Patch75: linux-2.6-x86-debug-boot.patch +Patch80: linux-2.6-ia32-syscall-restart.patch + Patch123: linux-2.6-ppc-rtc.patch Patch140: linux-2.6-ps3-ehci-iso.patch Patch141: linux-2.6-ps3-storage-alias.patch Patch142: linux-2.6-ps3-legacy-bootloader-hack.patch Patch143: linux-2.6-g5-therm-shutdown.patch +Patch144: linux-2.6-vio-modalias.patch Patch160: linux-2.6-execshield.patch Patch250: linux-2.6-debug-sizeof-structs.patch @@ -622,6 +625,7 @@ Patch680: linux-2.6-wireless.patch Patch681: linux-2.6-wireless-pending.patch +Patch682: linux-2.6-wireless-pending-too.patch Patch690: linux-2.6-at76.patch Patch820: linux-2.6-compile-fixes.patch @@ -634,6 +638,8 @@ Patch1801: linux-2.6-drm-git-mm.patch Patch1802: linux-2.6-ppc32-ucmpdi2.patch Patch1803: nouveau-drm.patch +Patch1804: linux-2.6-drm-git-mm-revert-nopfn.patch +Patch1805: linux-2.6-drm-git-i915-remove-priv-access.patch # kludge to make ich9 e1000 work Patch2000: linux-2.6-e1000-ich9.patch @@ -659,22 +665,23 @@ Patch2501: linux-2.6-ppc-use-libgcc.patch +Patch2503: linux-2.6-virtio_blk-fix-sysfs-bits.patch + ### HACK ### Patch2502: linux-2.6-blkcipher-depend-on-chainiv.patch # kernel-xen patches start -Patch5000: linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch-from-kernel-2_6_25.patch -Patch5001: linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch -Patch5002: linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch -Patch5003: linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch -Patch5004: linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch -Patch5005: linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch -Patch5006: linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch -Patch5007: linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch -Patch5008: linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch -Patch5009: linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch -Patch5010: linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch -Patch5011: linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch +Patch5000: linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch +Patch5001: linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch +Patch5002: linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch +Patch5003: linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch +Patch5004: linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch +Patch5005: linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch +Patch5006: linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch +Patch5007: linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch +Patch5008: linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch +Patch5009: linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch +Patch5010: linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch # kernel-xen patches end # Xen hypervisor patches (20000+) @@ -1062,6 +1069,8 @@ # Compile 686 kernels tuned for Pentium4. ApplyPatch linux-2.6-x86-tune-generic.patch +ApplyPatch linux-2.6-ia32-syscall-restart.patch + # # PowerPC # @@ -1079,6 +1088,8 @@ ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch # Alleviate G5 thermal shutdown problems ApplyPatch linux-2.6-g5-therm-shutdown.patch +# Provide modalias in sysfs for vio devices +ApplyPatch linux-2.6-vio-modalias.patch # # Exec shield @@ -1155,9 +1166,11 @@ ApplyPatch linux-2.6-ata-quirk.patch # wireless patches headed for 2.6.25 -ApplyPatch linux-2.6-wireless.patch +#ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.26 ApplyPatch linux-2.6-wireless-pending.patch +# temporary backport of some later wireless patches +ApplyPatch linux-2.6-wireless-pending-too.patch # Add misc wireless bits from upstream wireless tree ApplyPatch linux-2.6-at76.patch @@ -1190,12 +1203,14 @@ ApplyPatch linux-2.6-drm-git-mm.patch ApplyPatch linux-2.6-ppc32-ucmpdi2.patch ApplyPatch nouveau-drm.patch +ApplyPatch linux-2.6-drm-git-mm-revert-nopfn.patch +ApplyPatch linux-2.6-drm-git-i915-remove-priv-access.patch # ext4dev stable patch queue, slated for 2.6.25 #ApplyPatch linux-2.6-ext4-stable-queue.patch # linux1394 git patches -#ApplyPatch linux-2.6-firewire-git-update.patch +ApplyPatch linux-2.6-firewire-git-update.patch C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}') if [ "$C" -gt 10 ]; then ApplyPatch linux-2.6-firewire-git-pending.patch @@ -1206,24 +1221,25 @@ ApplyPatch linux-2.6-ppc-use-libgcc.patch +ApplyPatch linux-2.6-virtio_blk-fix-sysfs-bits.patch + ApplyPatch linux-2.6-blkcipher-depend-on-chainiv.patch # ---------- below all scheduled for 2.6.24 ----------------- # kernel-xen apply start -ApplyPatch linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch-from-kernel-2_6_25.patch -ApplyPatch linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch -ApplyPatch linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch -ApplyPatch linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch -ApplyPatch linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch -ApplyPatch linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch -ApplyPatch linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch -ApplyPatch linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch -ApplyPatch linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch -ApplyPatch linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch -ApplyPatch linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch +ApplyPatch linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch +ApplyPatch linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch +ApplyPatch linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch +ApplyPatch linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch +ApplyPatch linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch +ApplyPatch linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch +ApplyPatch linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch +ApplyPatch linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch +ApplyPatch linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch +ApplyPatch linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch %ifarch x86_64 -ApplyPatch linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch +ApplyPatch linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch %endif # kernel-xen apply end @@ -1377,6 +1393,7 @@ fi $CopyKernel $KernelImage \ $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer + chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer @@ -1825,6 +1842,9 @@ %changelog * Wed Mar 05 2008 Mark McLoughlin +- Re-base to kernel-2_6_25-0_93_rc4_fc9 + +* Wed Mar 05 2008 Mark McLoughlin - Re-base to kernel-2_6_25-0_78_rc3_git1_fc9 - Revert the execshield patch for now - Include xen pv fb and kbd drivers linux-2.6-debug-taint-vm.patch: Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.3.8.2 retrieving revision 1.3.8.3 diff -u -r1.3.8.2 -r1.3.8.3 --- linux-2.6-debug-taint-vm.patch 29 Feb 2008 18:58:22 -0000 1.3.8.2 +++ linux-2.6-debug-taint-vm.patch 5 Mar 2008 18:41:17 -0000 1.3.8.3 @@ -10,25 +10,6 @@ void add_taint(unsigned flag) { -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index b5a58d4..7a0c25d 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -221,12 +221,12 @@ static inline int bad_range(struct zone *zone, struct page *page) - static void bad_page(struct page *page) - { - printk(KERN_EMERG "Bad page state in process '%s'\n" -- KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n" -+ KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n" - KERN_EMERG "Trying to fix it up, but a reboot is needed\n" - KERN_EMERG "Backtrace:\n", - current->comm, page, (int)(2*sizeof(unsigned long)), - (unsigned long)page->flags, page->mapping, -- page_mapcount(page), page_count(page)); -+ page_mapcount(page), page_count(page), print_tainted()); - dump_stack(); - page->flags &= ~(1 << PG_lru | - 1 << PG_private | diff --git a/mm/slab.c b/mm/slab.c index 2e338a5..e5627f9 100644 --- a/mm/slab.c @@ -83,3 +64,20 @@ print_modules(); dump_stack(); print_oops_end_marker(); +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index 402a504..2085092 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -225,10 +225,10 @@ static void bad_page(struct page *page) + void *pc = page_get_page_cgroup(page); + + printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG +- "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n", ++ "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n", + current->comm, page, (int)(2*sizeof(unsigned long)), + (unsigned long)page->flags, page->mapping, +- page_mapcount(page), page_count(page)); ++ page_mapcount(page), page_count(page), print_tainted()); + if (pc) { + printk(KERN_EMERG "cgroup:%p\n", pc); + page_reset_bad_cgroup(page); linux-2.6-firewire-git-pending.patch: Index: linux-2.6-firewire-git-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-firewire-git-pending.patch,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- linux-2.6-firewire-git-pending.patch 29 Feb 2008 18:58:22 -0000 1.1.2.2 +++ linux-2.6-firewire-git-pending.patch 5 Mar 2008 18:41:17 -0000 1.1.2.3 @@ -3,988 +3,485 @@ # tree, which we think we're going to want... # -The generation of incoming requests was filled in in wrong byte order on -machines with big endian CPU. +read_bus_info_block() is repeatedly called by workqueue jobs. +These will step on each others toes eventually if there are multiple +workqueue threads, and we end up with corrupt config ROM images. Signed-off-by: Stefan Richter -Cc: sparclinux at vger.kernel.org -Cc: linuxppc-dev at ozlabs.org --- + drivers/firewire/fw-device.c | 41 +++++++++++++++++++++++------------ + 1 file changed, 27 insertions(+), 14 deletions(-) -This patch is a shot in the dark, based on a warning when building with -C=1 CHECKFLAGS="-D__CHECK_ENDIAN__". Is it really a fix, or was the -previous code accidentally correct? - -This needs to be tested on different big endian PCs, if possible with -the Apple Uninorth FireWire controller and other types of controllers. -One test which involves ohci->request_generation is simply with an SBP-2 -device (harddisk, CD-ROM...). Does SBP-2 login etc. work? - -If possible, also test whether the device remains accessible after -forcing a bus reset, e.g. by "echo br short > firecontrol". You need -the easy to build utility firecontrol and a libraw1394 with "juju" -backend. See wiki.linux1394.org for directions. - - - drivers/firewire/fw-ohci.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: linux/drivers/firewire/fw-ohci.c -=================================================================== ---- linux.orig/drivers/firewire/fw-ohci.c -+++ linux/drivers/firewire/fw-ohci.c -@@ -375,7 +375,7 @@ static __le32 *handle_ar_packet(struct a - */ - - if (p.ack + 16 == 0x09) -- ohci->request_generation = (buffer[2] >> 16) & 0xff; -+ ohci->request_generation = (p.header[2] >> 16) & 0xff; - else if (ctx == &ohci->ar_request_ctx) - fw_core_handle_request(&ohci->card, &p); - else - --- -Stefan Richter --=====-==--- --=- =-=== -http://arcgraph.de/sr/ - - -Kills warnings from 'make C=1 CHECKFLAGS="-D__CHECK_ENDIAN__" modules': - -drivers/firewire/fw-transaction.c:771:10: warning: incorrect type in assignment (different base types) -drivers/firewire/fw-transaction.c:771:10: expected unsigned int [unsigned] [usertype] -drivers/firewire/fw-transaction.c:771:10: got restricted unsigned int [usertype] -drivers/firewire/fw-transaction.h:93:10: warning: incorrect type in assignment (different base types) -drivers/firewire/fw-transaction.h:93:10: expected unsigned int [unsigned] [usertype] -drivers/firewire/fw-transaction.h:93:10: got restricted unsigned int [usertype] -drivers/firewire/fw-ohci.c:1490:8: warning: restricted degrades to integer -drivers/firewire/fw-ohci.c:1490:35: warning: restricted degrades to integer -drivers/firewire/fw-ohci.c:1516:5: warning: cast to restricted type - -Signed-off-by: Stefan Richter -Cc: sparclinux at vger.kernel.org -Cc: linuxppc-dev at ozlabs.org ---- - drivers/firewire/fw-ohci.c | 4 ++-- - drivers/firewire/fw-transaction.c | 2 +- - drivers/firewire/fw-transaction.h | 6 +++--- - 3 files changed, 6 insertions(+), 6 deletions(-) - -Index: linux/drivers/firewire/fw-ohci.c -=================================================================== ---- linux.orig/drivers/firewire/fw-ohci.c -+++ linux/drivers/firewire/fw-ohci.c -@@ -1487,7 +1487,7 @@ static int handle_ir_dualbuffer_packet(s - void *p, *end; - int i; - -- if (db->first_res_count > 0 && db->second_res_count > 0) { -+ if (db->first_res_count != 0 && db->second_res_count != 0) { - if (ctx->excess_bytes <= le16_to_cpu(db->second_req_count)) { - /* This descriptor isn't done yet, stop iteration. */ - return 0; -@@ -1513,7 +1513,7 @@ static int handle_ir_dualbuffer_packet(s - memcpy(ctx->header + i + 4, p + 8, ctx->base.header_size - 4); - i += ctx->base.header_size; - ctx->excess_bytes += -- (le32_to_cpu(*(u32 *)(p + 4)) >> 16) & 0xffff; -+ (le32_to_cpu(*(__le32 *)(p + 4)) >> 16) & 0xffff; - p += ctx->base.header_size + 4; - } - ctx->header_length = i; -Index: linux/drivers/firewire/fw-transaction.c -=================================================================== ---- linux.orig/drivers/firewire/fw-transaction.c -+++ linux/drivers/firewire/fw-transaction.c -@@ -751,7 +751,7 @@ handle_topology_map(struct fw_card *card - void *payload, size_t length, void *callback_data) - { - int i, start, end; -- u32 *map; -+ __be32 *map; - - if (!TCODE_IS_READ_REQUEST(tcode)) { - fw_send_response(card, request, RCODE_TYPE_ERROR); -Index: linux/drivers/firewire/fw-transaction.h -=================================================================== ---- linux.orig/drivers/firewire/fw-transaction.h -+++ linux/drivers/firewire/fw-transaction.h -@@ -85,12 +85,12 @@ - static inline void - fw_memcpy_from_be32(void *_dst, void *_src, size_t size) - { -- u32 *dst = _dst; -- u32 *src = _src; -+ u32 *dst = _dst; -+ __be32 *src = _src; - int i; - - for (i = 0; i < size / 4; i++) -- dst[i] = cpu_to_be32(src[i]); -+ dst[i] = be32_to_cpu(src[i]); - } - - static inline void - --- -Stefan Richter --=====-==--- --=- =-=== -http://arcgraph.de/sr/ - - -Patch "firewire: fw-sbp2: fix NULL pointer deref. in scsi_remove_device" -had the unintended effect that firewire-sbp2 could not be unloaded -anymore until all SBP-2 devices were unplugged. - -We now fix the NULL pointer bug by reacquiring a reference to the sdev -instead of holding a reference to the sdev (and to the module) all the -time. - -Signed-off-by: Stefan Richter ---- - -This applies on top of current linux-2.6.git master as well as on top of -linux1394-2.6.git master. - - - drivers/firewire/fw-sbp2.c | 46 +++++++++++++++++++++---------------- - 1 file changed, 27 insertions(+), 19 deletions(-) - -Index: linux/drivers/firewire/fw-sbp2.c +Index: linux/drivers/firewire/fw-device.c =================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -122,7 +122,6 @@ static const char sbp2_driver_name[] = " - struct sbp2_logical_unit { - struct sbp2_target *tgt; - struct list_head link; -- struct scsi_device *sdev; - struct fw_address_handler address_handler; - struct list_head orb_list; - -@@ -139,6 +138,7 @@ struct sbp2_logical_unit { - int generation; - int retries; - struct delayed_work work; -+ bool has_sdev; - bool blocked; - }; - -@@ -751,20 +751,33 @@ static void sbp2_unblock(struct sbp2_tar - scsi_unblock_requests(shost); +--- linux.orig/drivers/firewire/fw-device.c ++++ linux/drivers/firewire/fw-device.c +@@ -400,6 +400,9 @@ read_rom(struct fw_device *device, int g + return callback_data.rcode; } -+static int sbp2_lun2int(u16 lun) -+{ -+ struct scsi_lun eight_bytes_lun; ++#define READ_BIB_ROM_SIZE 256 ++#define READ_BIB_STACK_SIZE 16 + -+ memset(&eight_bytes_lun, 0, sizeof(eight_bytes_lun)); -+ eight_bytes_lun.scsi_lun[0] = (lun >> 8) & 0xff; -+ eight_bytes_lun.scsi_lun[1] = lun & 0xff; -+ -+ return scsilun_to_int(&eight_bytes_lun); -+} -+ - static void sbp2_release_target(struct kref *kref) - { - struct sbp2_target *tgt = container_of(kref, struct sbp2_target, kref); - struct sbp2_logical_unit *lu, *next; - struct Scsi_Host *shost = - container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -+ struct scsi_device *sdev; - - /* prevent deadlocks */ - sbp2_unblock(tgt); - - list_for_each_entry_safe(lu, next, &tgt->lu_list, link) { -- if (lu->sdev) { -- scsi_remove_device(lu->sdev); -- scsi_device_put(lu->sdev); -+ sdev = scsi_device_lookup(shost, 0, 0, sbp2_lun2int(lu->lun)); -+ if (sdev) { -+ scsi_remove_device(sdev); -+ scsi_device_put(sdev); - } - sbp2_send_management_orb(lu, tgt->node_id, lu->generation, - SBP2_LOGOUT_REQUEST, lu->login_id, NULL); -@@ -807,7 +820,6 @@ static void sbp2_login(struct work_struc - struct fw_device *device = fw_device(tgt->unit->device.parent); - struct Scsi_Host *shost; - struct scsi_device *sdev; -- struct scsi_lun eight_bytes_lun; - struct sbp2_login_response response; - int generation, node_id, local_node_id; - -@@ -820,7 +832,7 @@ static void sbp2_login(struct work_struc - local_node_id = device->card->node_id; - - /* If this is a re-login attempt, log out, or we might be rejected. */ -- if (lu->sdev) -+ if (lu->has_sdev) - sbp2_send_management_orb(lu, device->node_id, generation, - SBP2_LOGOUT_REQUEST, lu->login_id, NULL); - -@@ -859,7 +871,7 @@ static void sbp2_login(struct work_struc - sbp2_agent_reset(lu); - - /* This was a re-login. */ -- if (lu->sdev) { -+ if (lu->has_sdev) { - sbp2_cancel_orbs(lu); - sbp2_conditionally_unblock(lu); - goto out; -@@ -868,13 +880,8 @@ static void sbp2_login(struct work_struc - if (lu->tgt->workarounds & SBP2_WORKAROUND_DELAY_INQUIRY) - ssleep(SBP2_INQUIRY_DELAY); - -- memset(&eight_bytes_lun, 0, sizeof(eight_bytes_lun)); -- eight_bytes_lun.scsi_lun[0] = (lu->lun >> 8) & 0xff; -- eight_bytes_lun.scsi_lun[1] = lu->lun & 0xff; - shost = container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -- -- sdev = __scsi_add_device(shost, 0, 0, -- scsilun_to_int(&eight_bytes_lun), lu); -+ sdev = __scsi_add_device(shost, 0, 0, sbp2_lun2int(lu->lun), lu); - /* - * FIXME: We are unable to perform reconnects while in sbp2_login(). - * Therefore __scsi_add_device() will get into trouble if a bus reset -@@ -896,7 +903,8 @@ static void sbp2_login(struct work_struc - } - - /* No error during __scsi_add_device() */ -- lu->sdev = sdev; -+ lu->has_sdev = true; -+ scsi_device_put(sdev); - sbp2_allow_block(lu); - goto out; - -@@ -934,11 +942,11 @@ static int sbp2_add_logical_unit(struct - return -ENOMEM; + /* + * Read the bus info block, perform a speed probe, and read all of the rest of + * the config ROM. We do all this with a cached bus generation. If the bus +@@ -409,16 +412,23 @@ read_rom(struct fw_device *device, int g + */ + static int read_bus_info_block(struct fw_device *device, int generation) + { +- static u32 rom[256]; +- u32 stack[16], sp, key; +- int i, end, length; ++ u32 *rom, *stack; ++ u32 sp, key; ++ int i, end, length, ret = -1; ++ ++ rom = kmalloc(sizeof(*rom) * READ_BIB_ROM_SIZE + ++ sizeof(*stack) * READ_BIB_STACK_SIZE, GFP_KERNEL); ++ if (rom == NULL) ++ return -ENOMEM; ++ ++ stack = &rom[READ_BIB_ROM_SIZE]; + + device->max_speed = SCODE_100; + + /* First read the bus info block. */ + for (i = 0; i < 5; i++) { + if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE) +- return -1; ++ goto out; + /* + * As per IEEE1212 7.2, during power-up, devices can + * reply with a 0 for the first quadlet of the config +@@ -428,7 +438,7 @@ static int read_bus_info_block(struct fw + * retry mechanism will try again later. + */ + if (i == 0 && rom[i] == 0) +- return -1; ++ goto out; } -- lu->tgt = tgt; -- lu->sdev = NULL; -- lu->lun = lun_entry & 0xffff; -- lu->retries = 0; -- lu->blocked = false; -+ lu->tgt = tgt; -+ lu->lun = lun_entry & 0xffff; -+ lu->retries = 0; -+ lu->has_sdev = false; -+ lu->blocked = false; - ++tgt->dont_block; - INIT_LIST_HEAD(&lu->orb_list); - INIT_DELAYED_WORK(&lu->work, sbp2_login); - --- -Stefan Richter --=====-==--- --=- ==-=- -http://arcgraph.de/sr/ - - -The bus management workqueue job was in danger to dereference NULL -pointers. Also, after having temporarily lifted card->lock, a few node -pointers and a device pointer may have become invalid. - -Add NULL pointer checks and get the necessary references. Also, move -card->local_node out of fw_card_bm_work's sight during shutdown of the -card. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-card.c | 51 ++++++++++++++++++++++----------- - drivers/firewire/fw-topology.c | 1 - 2 files changed, 35 insertions(+), 17 deletions(-) - -Index: linux/drivers/firewire/fw-card.c -=================================================================== ---- linux.orig/drivers/firewire/fw-card.c -+++ linux/drivers/firewire/fw-card.c -@@ -214,17 +214,29 @@ static void - fw_card_bm_work(struct work_struct *work) - { - struct fw_card *card = container_of(work, struct fw_card, work.work); -- struct fw_device *root; -+ struct fw_device *root_device; -+ struct fw_node *root_node, *local_node; - struct bm_data bmd; - unsigned long flags; - int root_id, new_root_id, irm_id, gap_count, generation, grace; - int do_reset = 0; - - spin_lock_irqsave(&card->lock, flags); -+ local_node = card->local_node; -+ root_node = card->root_node; -+ -+ if (local_node == NULL) { -+ spin_unlock_irqrestore(&card->lock, flags); -+ return; -+ } -+ fw_node_get(local_node); -+ fw_node_get(root_node); - - generation = card->generation; -- root = card->root_node->data; -- root_id = card->root_node->node_id; -+ root_device = root_node->data; -+ if (root_device) -+ fw_device_get(root_device); -+ root_id = root_node->node_id; - grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 10)); - - if (card->bm_generation + 1 == generation || -@@ -243,14 +255,14 @@ fw_card_bm_work(struct work_struct *work - - irm_id = card->irm_node->node_id; - if (!card->irm_node->link_on) { -- new_root_id = card->local_node->node_id; -+ new_root_id = local_node->node_id; - fw_notify("IRM has link off, making local node (%02x) root.\n", - new_root_id); - goto pick_me; - } - - bmd.lock.arg = cpu_to_be32(0x3f); -- bmd.lock.data = cpu_to_be32(card->local_node->node_id); -+ bmd.lock.data = cpu_to_be32(local_node->node_id); - - spin_unlock_irqrestore(&card->lock, flags); - -@@ -267,12 +279,12 @@ fw_card_bm_work(struct work_struct *work - * Another bus reset happened. Just return, - * the BM work has been rescheduled. + device->max_speed = device->node->max_speed; +@@ -478,26 +488,26 @@ static int read_bus_info_block(struct fw + */ + key = stack[--sp]; + i = key & 0xffffff; +- if (i >= ARRAY_SIZE(rom)) ++ if (i >= READ_BIB_ROM_SIZE) + /* + * The reference points outside the standard + * config rom area, something's fishy. */ -- return; +- return -1; + goto out; - } - if (bmd.rcode == RCODE_COMPLETE && bmd.old != 0x3f) - /* Somebody else is BM, let them do the work. */ -- return; + /* Read header quadlet for the block to get the length. */ + if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE) +- return -1; + goto out; - - spin_lock_irqsave(&card->lock, flags); - if (bmd.rcode != RCODE_COMPLETE) { -@@ -282,7 +294,7 @@ fw_card_bm_work(struct work_struct *work - * do a bus reset and pick the local node as - * root, and thus, IRM. + end = i + (rom[i] >> 16) + 1; + i++; +- if (end > ARRAY_SIZE(rom)) ++ if (end > READ_BIB_ROM_SIZE) + /* + * This block extends outside standard config + * area (and the array we're reading it + * into). That's broken, so ignore this + * device. */ -- new_root_id = card->local_node->node_id; -+ new_root_id = local_node->node_id; - fw_notify("BM lock failed, making local node (%02x) root.\n", - new_root_id); - goto pick_me; -@@ -295,7 +307,7 @@ fw_card_bm_work(struct work_struct *work - */ - spin_unlock_irqrestore(&card->lock, flags); - schedule_delayed_work(&card->work, DIV_ROUND_UP(HZ, 10)); -- return; -+ goto out; - } - - /* -@@ -305,20 +317,20 @@ fw_card_bm_work(struct work_struct *work - */ - card->bm_generation = generation; +- return -1; ++ goto out; -- if (root == NULL) { -+ if (root_device == NULL) { - /* - * Either link_on is false, or we failed to read the - * config rom. In either case, pick another root. - */ -- new_root_id = card->local_node->node_id; -- } else if (atomic_read(&root->state) != FW_DEVICE_RUNNING) { -+ new_root_id = local_node->node_id; -+ } else if (atomic_read(&root_device->state) != FW_DEVICE_RUNNING) { - /* - * If we haven't probed this device yet, bail out now - * and let's try again once that's done. - */ - spin_unlock_irqrestore(&card->lock, flags); -- return; -- } else if (root->config_rom[2] & BIB_CMC) { -+ goto out; -+ } else if (root_device->config_rom[2] & BIB_CMC) { /* - * FIXME: I suppose we should set the cmstr bit in the - * STATE_CLEAR register of this node, as described in -@@ -332,7 +344,7 @@ fw_card_bm_work(struct work_struct *work - * successfully read the config rom, but it's not - * cycle master capable. - */ -- new_root_id = card->local_node->node_id; -+ new_root_id = local_node->node_id; - } + * Now read in the block. If this is a directory +@@ -507,9 +517,9 @@ static int read_bus_info_block(struct fw + while (i < end) { + if (read_rom(device, generation, i, &rom[i]) != + RCODE_COMPLETE) +- return -1; ++ goto out; + if ((key >> 30) == 3 && (rom[i] >> 30) > 1 && +- sp < ARRAY_SIZE(stack)) ++ sp < READ_BIB_STACK_SIZE) + stack[sp++] = i + rom[i]; + i++; + } +@@ -519,11 +529,14 @@ static int read_bus_info_block(struct fw - pick_me: -@@ -341,8 +353,8 @@ fw_card_bm_work(struct work_struct *work - * the typically much larger 1394b beta repeater delays though. - */ - if (!card->beta_repeaters_present && -- card->root_node->max_hops < ARRAY_SIZE(gap_count_table)) -- gap_count = gap_count_table[card->root_node->max_hops]; -+ root_node->max_hops < ARRAY_SIZE(gap_count_table)) -+ gap_count = gap_count_table[root_node->max_hops]; - else - gap_count = 63; - -@@ -364,6 +376,11 @@ fw_card_bm_work(struct work_struct *work - fw_send_phy_config(card, new_root_id, generation, gap_count); - fw_core_initiate_bus_reset(card, 1); - } + device->config_rom = kmalloc(length * 4, GFP_KERNEL); + if (device->config_rom == NULL) +- return -1; ++ goto out; + memcpy(device->config_rom, rom, length * 4); + device->config_rom_length = length; ++ ret = 0; + out: -+ if (root_device) -+ fw_device_put(root_device); -+ fw_node_put(root_node); -+ fw_node_put(local_node); - } ++ kfree(rom); - static void -Index: linux/drivers/firewire/fw-topology.c -=================================================================== ---- linux.orig/drivers/firewire/fw-topology.c -+++ linux/drivers/firewire/fw-topology.c -@@ -383,6 +383,7 @@ void fw_destroy_nodes(struct fw_card *ca - card->color++; - if (card->local_node != NULL) - for_each_fw_node(card, card->local_node, report_lost_node); -+ card->local_node = NULL; - spin_unlock_irqrestore(&card->lock, flags); +- return 0; ++ return ret; } + static void fw_unit_release(struct device *dev) -- Stefan Richter --=====-==--- --=- ==--- +-=====-==--- --== ---=- http://arcgraph.de/sr/ -"modprobe firewire-ohci; sleep .1; modprobe -r firewire-ohci" used to -result in crashes like this: - - BUG: unable to handle kernel paging request at ffffffff8807b455 - IP: [] - PGD 203067 PUD 207063 PMD 7c170067 PTE 0 - Oops: 0010 [1] PREEMPT SMP - CPU 0 - Modules linked in: i915 drm cpufreq_ondemand acpi_cpufreq freq_table applesmc input_polldev led_class coretemp hwmon eeprom snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss button thermal processor sg snd_hda_intel snd_pcm snd_timer snd snd_page_alloc sky2 i2c_i801 rtc [last unloaded: crc_itu_t] - Pid: 9, comm: events/0 Not tainted 2.6.25-rc2 #3 - RIP: 0010:[] [] - RSP: 0018:ffff81007dcdde88 EFLAGS: 00010246 - RAX: ffff81007dc95040 RBX: ffff81007dee5390 RCX: 0000000000005e13 - RDX: 0000000000008c8b RSI: 0000000000000001 RDI: ffff81007dee5388 - RBP: ffff81007dc5eb40 R08: 0000000000000002 R09: ffffffff8022d05c - R10: ffffffff8023b34c R11: ffffffff8041a353 R12: ffff81007dee5388 - R13: ffffffff8807b455 R14: ffffffff80593bc0 R15: 0000000000000000 - FS: 0000000000000000(0000) GS:ffffffff8055a000(0000) knlGS:0000000000000000 - CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b - CR2: ffffffff8807b455 CR3: 0000000000201000 CR4: 00000000000006e0 - DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 - DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 - Process events/0 (pid: 9, threadinfo ffff81007dcdc000, task ffff81007dc95040) - Stack: ffffffff8023b396 ffffffff88082524 0000000000000000 ffffffff8807d9ae - ffff81007dc5eb40 ffff81007dc9dce0 ffff81007dc5eb40 ffff81007dc5eb80 - ffff81007dc9dce0 ffffffffffffffff ffffffff8023be87 0000000000000000 - Call Trace: - [] ? run_workqueue+0xdf/0x1df - [] ? worker_thread+0xd8/0xe3 - [] ? autoremove_wake_function+0x0/0x2e - [] ? worker_thread+0x0/0xe3 - [] ? kthread+0x47/0x74 - [] ? trace_hardirqs_on_thunk+0x35/0x3a - [] ? child_rip+0xa/0x12 - [] ? restore_args+0x0/0x3d - [] ? kthreadd+0x14c/0x171 - [] ? kthreadd+0x14c/0x171 - [] ? kthread+0x0/0x74 - [] ? child_rip+0x0/0x12 - - - Code: Bad RIP value. - RIP [] - RSP - CR2: ffffffff8807b455 - ---[ end trace c7366c6657fe5bed ]--- - -Note that this crash happened _after_ firewire-core was unloaded. The -shared workqueue tried to run firewire-core's device initialization jobs -or similar jobs. - -The fix makes sure that firewire-ohci and hence firewire-core is not -unloaded before all device shutdown jobs have been completed. This is -determined by the count of device initializations minus device releases. - -Also skip useless retries in the node initialization job if the node is -to be shut down. +When a device changes its configuration ROM, it announces this with a +bus reset. firewire-core has to check which node initiated a bus reset +and whether any unit directories went away or were added on this node. + +Tested with an IOI FWB-IDE01AB which has its link-on bit set if bus +power is available but does not respond to ROM read requests if self +power is off. This implements + - recognition of the units if self power is switched on after fw-core + gave up the initial attempt to read the config ROM, + - shutdown of the units when self power is switched off. + +Also tested with a second PC running Linux/ieee1394. When the eth1394 +driver is inserted and removed on that node, fw-core now notices the +addition and removal of the IPv4 unit on the ieee1394 node. Signed-off-by: Stefan Richter --- -Update: Refreshed to be applicable after patch "firewire: fw-sbp2: -better fix for NULL pointer dereference in scsi_remove_device". - -Update 2: Update 1 had a use-after-free bug. #-| - - - drivers/firewire/fw-card.c | 10 +++++++++- - drivers/firewire/fw-device.c | 21 ++++++--------------- - drivers/firewire/fw-device.h | 16 ++++++++++++++-- - drivers/firewire/fw-sbp2.c | 4 ++++ - drivers/firewire/fw-transaction.h | 2 ++ - 5 files changed, 35 insertions(+), 18 deletions(-) +Applies after "firewire: replace static ROM cache by allocated cache". -Index: linux/drivers/firewire/fw-card.c -=================================================================== ---- linux.orig/drivers/firewire/fw-card.c -+++ linux/drivers/firewire/fw-card.c -@@ -18,6 +18,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -398,6 +399,7 @@ fw_card_initialize(struct fw_card *card, - static atomic_t index = ATOMIC_INIT(-1); - - kref_init(&card->kref); -+ atomic_set(&card->device_count, 0); - card->index = atomic_inc_return(&index); - card->driver = driver; - card->device = device; -@@ -528,8 +530,14 @@ fw_core_remove_card(struct fw_card *card - card->driver = &dummy_driver; - - fw_destroy_nodes(card); -- flush_scheduled_work(); -+ /* -+ * Wait for all device workqueue jobs to finish. Otherwise the -+ * firewire-core module could be unloaded before the jobs ran. -+ */ -+ while (atomic_read(&card->device_count) > 0) -+ msleep(100); + drivers/firewire/fw-cdev.c | 18 ++-- + drivers/firewire/fw-device.c | 147 ++++++++++++++++++++++++++++++--- + drivers/firewire/fw-topology.c | 3 + drivers/firewire/fw-topology.h | 11 +- + 4 files changed, 158 insertions(+), 21 deletions(-) + +Index: linux/drivers/firewire/fw-cdev.c +=================================================================== +--- linux.orig/drivers/firewire/fw-cdev.c ++++ linux/drivers/firewire/fw-cdev.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include "fw-transaction.h" +@@ -269,20 +270,25 @@ static int ioctl_get_info(struct client + { + struct fw_cdev_get_info *get_info = buffer; + struct fw_cdev_event_bus_reset bus_reset; ++ struct fw_device *device = client->device; ++ unsigned long ret = 0; + + client->version = get_info->version; + get_info->version = FW_CDEV_VERSION; + ++ down(&device->device.sem); + if (get_info->rom != 0) { + void __user *uptr = u64_to_uptr(get_info->rom); + size_t want = get_info->rom_length; +- size_t have = client->device->config_rom_length * 4; ++ size_t have; + +- if (copy_to_user(uptr, client->device->config_rom, +- min(want, have))) +- return -EFAULT; ++ have = device->config_rom_length * 4; ++ ret = copy_to_user(uptr, device->config_rom, min(want, have)); + } +- get_info->rom_length = client->device->config_rom_length * 4; ++ get_info->rom_length = device->config_rom_length * 4; ++ up(&device->device.sem); ++ if (ret != 0) ++ return -EFAULT; + + client->bus_reset_closure = get_info->bus_reset_closure; + if (get_info->bus_reset != 0) { +@@ -293,7 +299,7 @@ static int ioctl_get_info(struct client + return -EFAULT; + } -+ cancel_delayed_work_sync(&card->work); - fw_flush_transactions(card); - del_timer_sync(&card->flush_timer); +- get_info->card = client->device->card->index; ++ get_info->card = device->card->index; + return 0; + } Index: linux/drivers/firewire/fw-device.c =================================================================== --- linux.orig/drivers/firewire/fw-device.c +++ linux/drivers/firewire/fw-device.c -@@ -150,21 +150,10 @@ struct bus_type fw_bus_type = { - }; - EXPORT_SYMBOL(fw_bus_type); - --struct fw_device *fw_device_get(struct fw_device *device) --{ -- get_device(&device->device); -- -- return device; --} -- --void fw_device_put(struct fw_device *device) --{ -- put_device(&device->device); --} -- - static void fw_device_release(struct device *dev) - { - struct fw_device *device = fw_device(dev); -+ struct fw_card *card = device->card; - unsigned long flags; - - /* -@@ -176,9 +165,9 @@ static void fw_device_release(struct dev - spin_unlock_irqrestore(&device->card->lock, flags); +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -160,9 +161,9 @@ static void fw_device_release(struct dev + * Take the card lock so we don't set this to NULL while a + * FW_NODE_UPDATED callback is being handled. + */ +- spin_lock_irqsave(&device->card->lock, flags); ++ spin_lock_irqsave(&card->lock, flags); + device->node->data = NULL; +- spin_unlock_irqrestore(&device->card->lock, flags); ++ spin_unlock_irqrestore(&card->lock, flags); fw_node_put(device->node); -- fw_card_put(device->card); kfree(device->config_rom); - kfree(device); -+ atomic_dec(&card->device_count); - } +@@ -337,10 +338,14 @@ static ssize_t + config_rom_show(struct device *dev, struct device_attribute *attr, char *buf) + { + struct fw_device *device = fw_device(dev); ++ size_t length; - int fw_device_enable_phys_dma(struct fw_device *device) -@@ -668,7 +657,8 @@ static void fw_device_init(struct work_s - */ +- memcpy(buf, device->config_rom, device->config_rom_length * 4); ++ down(&dev->sem); ++ length = device->config_rom_length * 4; ++ memcpy(buf, device->config_rom, length); ++ up(&dev->sem); + +- return device->config_rom_length * 4; ++ return length; + } + + static ssize_t +@@ -412,7 +417,7 @@ read_rom(struct fw_device *device, int g + */ + static int read_bus_info_block(struct fw_device *device, int generation) + { +- u32 *rom, *stack; ++ u32 *rom, *stack, *old_rom, *new_rom; + u32 sp, key; + int i, end, length, ret = -1; - if (read_bus_info_block(device, device->generation) < 0) { -- if (device->config_rom_retries < MAX_RETRIES) { -+ if (device->config_rom_retries < MAX_RETRIES && -+ atomic_read(&device->state) == FW_DEVICE_INITIALIZING) { - device->config_rom_retries++; - schedule_delayed_work(&device->work, RETRY_DELAY); - } else { -@@ -805,7 +795,8 @@ void fw_node_event(struct fw_card *card, - */ - device_initialize(&device->device); - atomic_set(&device->state, FW_DEVICE_INITIALIZING); -- device->card = fw_card_get(card); -+ atomic_inc(&card->device_count); -+ device->card = card; - device->node = fw_node_get(node); - device->node_id = node->node_id; - device->generation = card->generation; -Index: linux/drivers/firewire/fw-sbp2.c -=================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -769,6 +769,7 @@ static void sbp2_release_target(struct k - struct Scsi_Host *shost = - container_of((void *)tgt, struct Scsi_Host, hostdata[0]); - struct scsi_device *sdev; -+ struct fw_device *device = fw_device(tgt->unit->device.parent); - - /* prevent deadlocks */ - sbp2_unblock(tgt); -@@ -791,6 +792,7 @@ static void sbp2_release_target(struct k - - put_device(&tgt->unit->device); - scsi_host_put(shost); -+ fw_device_put(device); - } +@@ -527,11 +532,18 @@ static int read_bus_info_block(struct fw + length = i; + } - static struct workqueue_struct *sbp2_wq; -@@ -1088,6 +1090,8 @@ static int sbp2_probe(struct device *dev - if (scsi_add_host(shost, &unit->device) < 0) - goto fail_shost_put; - -+ fw_device_get(device); -+ - /* Initialize to values that won't match anything in our table. */ - firmware_revision = 0xff000000; - model = 0xff000000; -Index: linux/drivers/firewire/fw-transaction.h -=================================================================== ---- linux.orig/drivers/firewire/fw-transaction.h -+++ linux/drivers/firewire/fw-transaction.h -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #define TCODE_IS_READ_REQUEST(tcode) (((tcode) & ~1) == 4) - #define TCODE_IS_BLOCK_PACKET(tcode) (((tcode) & 1) != 0) -@@ -219,6 +220,7 @@ extern struct bus_type fw_bus_type; - struct fw_card { - const struct fw_card_driver *driver; - struct device *device; -+ atomic_t device_count; - struct kref kref; +- device->config_rom = kmalloc(length * 4, GFP_KERNEL); +- if (device->config_rom == NULL) ++ old_rom = device->config_rom; ++ new_rom = kmemdup(rom, length * 4, GFP_KERNEL); ++ if (new_rom == NULL) + goto out; +- memcpy(device->config_rom, rom, length * 4); ++ ++ /* serialize with readers via sysfs or ioctl */ ++ down(&device->device.sem); ++ device->config_rom = new_rom; + device->config_rom_length = length; ++ up(&device->device.sem); ++ ++ kfree(old_rom); + ret = 0; + out: + kfree(rom); +@@ -724,7 +736,7 @@ static void fw_device_init(struct work_s + if (atomic_cmpxchg(&device->state, + FW_DEVICE_INITIALIZING, + FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) { +- fw_device_shutdown(&device->work.work); ++ fw_device_shutdown(work); + } else { + if (device->config_rom_retries) + fw_notify("created device %s: GUID %08x%08x, S%d00, " +@@ -738,6 +750,7 @@ static void fw_device_init(struct work_s + device->device.bus_id, + device->config_rom[3], device->config_rom[4], + 1 << device->max_speed); ++ device->config_rom_retries = 0; + } - int node_id; -Index: linux/drivers/firewire/fw-device.h -=================================================================== ---- linux.orig/drivers/firewire/fw-device.h -+++ linux/drivers/firewire/fw-device.h -@@ -76,9 +76,21 @@ fw_device_is_shutdown(struct fw_device * - return atomic_read(&device->state) == FW_DEVICE_SHUTDOWN; + /* +@@ -784,6 +797,104 @@ static void fw_device_update(struct work + device_for_each_child(&device->device, NULL, update_unit); } --struct fw_device *fw_device_get(struct fw_device *device); -+static inline struct fw_device * -+fw_device_get(struct fw_device *device) ++enum { ++ REREAD_BIB_ERROR, ++ REREAD_BIB_GONE, ++ REREAD_BIB_UNCHANGED, ++ REREAD_BIB_CHANGED, ++}; ++ ++/* Reread and compare bus info block and header of root directory */ ++static int reread_bus_info_block(struct fw_device *device, int generation) +{ -+ get_device(&device->device); ++ u32 q; ++ int i; + -+ return device; -+} ++ for (i = 0; i < 6; i++) { ++ if (read_rom(device, generation, i, &q) != RCODE_COMPLETE) ++ return REREAD_BIB_ERROR; + -+static inline void -+fw_device_put(struct fw_device *device) -+{ -+ put_device(&device->device); -+} ++ if (i == 0 && q == 0) ++ return REREAD_BIB_GONE; + - struct fw_device *fw_device_get_by_devt(dev_t devt); --void fw_device_put(struct fw_device *device); - int fw_device_enable_phys_dma(struct fw_device *device); - - void fw_device_cdev_update(struct fw_device *device); - --- -Stefan Richter --=====-==--- --=- ==-== -http://arcgraph.de/sr/ - - - -The card->kref became obsolete since patch "firewire: fix crash in -automatic module unloading" added another counter of card users. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-card.c | 38 ------------------------------ - drivers/firewire/fw-ohci.c | 8 +++--- - drivers/firewire/fw-transaction.h | 4 --- - 3 files changed, 4 insertions(+), 46 deletions(-) - -Index: linux/drivers/firewire/fw-card.c -=================================================================== ---- linux.orig/drivers/firewire/fw-card.c -+++ linux/drivers/firewire/fw-card.c -@@ -398,7 +398,6 @@ fw_card_initialize(struct fw_card *card, - { - static atomic_t index = ATOMIC_INIT(-1); - -- kref_init(&card->kref); - atomic_set(&card->device_count, 0); - card->index = atomic_inc_return(&index); - card->driver = driver; -@@ -429,12 +428,6 @@ fw_card_add(struct fw_card *card, - card->link_speed = link_speed; - card->guid = guid; - -- /* -- * The subsystem grabs a reference when the card is added and -- * drops it when the driver calls fw_core_remove_card. -- */ -- fw_card_get(card); -- - mutex_lock(&card_mutex); - config_rom = generate_config_rom(card, &length); - list_add_tail(&card->link, &card_list); -@@ -540,40 +533,9 @@ fw_core_remove_card(struct fw_card *card - cancel_delayed_work_sync(&card->work); - fw_flush_transactions(card); - del_timer_sync(&card->flush_timer); -- -- fw_card_put(card); - } - EXPORT_SYMBOL(fw_core_remove_card); - --struct fw_card * --fw_card_get(struct fw_card *card) --{ -- kref_get(&card->kref); -- -- return card; --} --EXPORT_SYMBOL(fw_card_get); -- --static void --release_card(struct kref *kref) --{ -- struct fw_card *card = container_of(kref, struct fw_card, kref); -- -- kfree(card); --} -- --/* -- * An assumption for fw_card_put() is that the card driver allocates -- * the fw_card struct with kalloc and that it has been shut down -- * before the last ref is dropped. -- */ --void --fw_card_put(struct fw_card *card) --{ -- kref_put(&card->kref, release_card); --} --EXPORT_SYMBOL(fw_card_put); -- - int - fw_core_initiate_bus_reset(struct fw_card *card, int short_reset) - { -Index: linux/drivers/firewire/fw-ohci.c -=================================================================== ---- linux.orig/drivers/firewire/fw-ohci.c -+++ linux/drivers/firewire/fw-ohci.c -@@ -2059,7 +2059,7 @@ pci_probe(struct pci_dev *dev, const str - err = pci_enable_device(dev); - if (err) { - fw_error("Failed to enable OHCI hardware.\n"); -- goto fail_put_card; -+ goto fail_free; - } - - pci_set_master(dev); -@@ -2151,8 +2151,8 @@ pci_probe(struct pci_dev *dev, const str - pci_release_region(dev, 0); - fail_disable: - pci_disable_device(dev); -- fail_put_card: -- fw_card_put(&ohci->card); -+ fail_free: -+ kfree(&ohci->card); - - return err; - } -@@ -2180,7 +2180,7 @@ static void pci_remove(struct pci_dev *d - pci_iounmap(dev, ohci->registers); - pci_release_region(dev, 0); - pci_disable_device(dev); -- fw_card_put(&ohci->card); -+ kfree(&ohci->card); - - fw_notify("Removed fw-ohci device.\n"); - } -Index: linux/drivers/firewire/fw-transaction.h -=================================================================== ---- linux.orig/drivers/firewire/fw-transaction.h -+++ linux/drivers/firewire/fw-transaction.h -@@ -221,7 +221,6 @@ struct fw_card { - const struct fw_card_driver *driver; - struct device *device; - atomic_t device_count; -- struct kref kref; - - int node_id; - int generation; -@@ -263,9 +262,6 @@ struct fw_card { - int bm_generation; - }; - --struct fw_card *fw_card_get(struct fw_card *card); --void fw_card_put(struct fw_card *card); -- - /* - * The iso packet format allows for an immediate header/payload part - * stored in 'header' immediately after the packet info plus an - --- -Stefan Richter --=====-==--- --=- ==--- -http://arcgraph.de/sr/ - - -The reference count of the unit dropped too low in an error path in -sbp2_probe. Fixed by moving the _get further up. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-sbp2.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -Index: linux/drivers/firewire/fw-sbp2.c -=================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -1083,6 +1083,7 @@ static int sbp2_probe(struct device *dev - goto fail_shost_put; - - fw_device_get(device); -+ get_device(&unit->device); - - /* Initialize to values that won't match anything in our table. */ - firmware_revision = 0xff000000; -@@ -1098,8 +1099,6 @@ static int sbp2_probe(struct device *dev - - sbp2_init_workarounds(tgt, model, firmware_revision); - -- get_device(&unit->device); -- - /* Do the login in a workqueue so we can easily reschedule retries. */ - list_for_each_entry(lu, &tgt->lu_list, link) - sbp2_queue_work(lu, 0); - --- -Stefan Richter --=====-==--- --=- ==--- -http://arcgraph.de/sr/ - - -Add wrappers for getting and putting a unit. -Remove some line breaks. - -Signed-off-by: Stefan Richter ---- - drivers/firewire/fw-device.h | 27 +++++++++++++++++---------- - drivers/firewire/fw-sbp2.c | 4 ++-- - 2 files changed, 19 insertions(+), 12 deletions(-) - -Index: linux/drivers/firewire/fw-device.h -=================================================================== ---- linux.orig/drivers/firewire/fw-device.h -+++ linux/drivers/firewire/fw-device.h -@@ -64,28 +64,24 @@ struct fw_device { - struct fw_attribute_group attribute_group; - }; - --static inline struct fw_device * --fw_device(struct device *dev) -+static inline struct fw_device *fw_device(struct device *dev) - { - return container_of(dev, struct fw_device, device); - } - --static inline int --fw_device_is_shutdown(struct fw_device *device) -+static inline int fw_device_is_shutdown(struct fw_device *device) - { - return atomic_read(&device->state) == FW_DEVICE_SHUTDOWN; - } - --static inline struct fw_device * --fw_device_get(struct fw_device *device) -+static inline struct fw_device *fw_device_get(struct fw_device *device) - { - get_device(&device->device); - - return device; - } - --static inline void --fw_device_put(struct fw_device *device) -+static inline void fw_device_put(struct fw_device *device) - { - put_device(&device->device); - } -@@ -104,12 +100,23 @@ struct fw_unit { - struct fw_attribute_group attribute_group; - }; - --static inline struct fw_unit * --fw_unit(struct device *dev) -+static inline struct fw_unit *fw_unit(struct device *dev) - { - return container_of(dev, struct fw_unit, device); - } - -+static inline struct fw_unit *fw_unit_get(struct fw_unit *unit) -+{ -+ get_device(&unit->device); ++ if (i > device->config_rom_length || q != device->config_rom[i]) ++ return REREAD_BIB_CHANGED; ++ } + -+ return unit; ++ return REREAD_BIB_UNCHANGED; +} + -+static inline void fw_unit_put(struct fw_unit *unit) ++static void fw_device_refresh(struct work_struct *work) +{ -+ put_device(&unit->device); ++ struct fw_device *device = ++ container_of(work, struct fw_device, work.work); ++ struct fw_card *card = device->card; ++ int node_id = device->node_id; ++ ++ switch (reread_bus_info_block(device, device->generation)) { ++ case REREAD_BIB_ERROR: ++ if (device->config_rom_retries < MAX_RETRIES / 2 && ++ atomic_read(&device->state) == FW_DEVICE_INITIALIZING) { ++ device->config_rom_retries++; ++ schedule_delayed_work(&device->work, RETRY_DELAY / 2); ++ ++ return; ++ } ++ goto give_up; ++ ++ case REREAD_BIB_GONE: ++ goto gone; ++ ++ case REREAD_BIB_UNCHANGED: ++ if (atomic_cmpxchg(&device->state, ++ FW_DEVICE_INITIALIZING, ++ FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) ++ goto gone; ++ ++ fw_device_update(work); ++ device->config_rom_retries = 0; ++ ++ return; ++ } ++ ++ /* ++ * Something changed. We keep things simple and don't investigate ++ * further. We just destroy all previous units and create new ones. ++ */ ++ device_for_each_child(&device->device, NULL, shutdown_unit); ++ ++ if (read_bus_info_block(device, device->generation) < 0) { ++ if (device->config_rom_retries < MAX_RETRIES && ++ atomic_read(&device->state) == FW_DEVICE_INITIALIZING) { ++ device->config_rom_retries++; ++ schedule_delayed_work(&device->work, RETRY_DELAY); ++ ++ return; ++ } ++ goto give_up; ++ } ++ ++ create_units(device); ++ ++ if (atomic_cmpxchg(&device->state, ++ FW_DEVICE_INITIALIZING, ++ FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) ++ goto gone; ++ ++ fw_notify("refreshed device %s\n", device->device.bus_id); ++ device->config_rom_retries = 0; ++ goto out; ++ ++ give_up: ++ fw_notify("giving up on refresh of device %s\n", device->device.bus_id); ++ gone: ++ atomic_set(&device->state, FW_DEVICE_SHUTDOWN); ++ fw_device_shutdown(work); ++ out: ++ if (node_id == card->root_node->node_id) ++ schedule_delayed_work(&card->work, 0); +} + - #define CSR_OFFSET 0x40 - #define CSR_LEAF 0x80 - #define CSR_DIRECTORY 0xc0 -Index: linux/drivers/firewire/fw-sbp2.c + void fw_node_event(struct fw_card *card, struct fw_node *node, int event) + { + struct fw_device *device; +@@ -793,7 +904,7 @@ void fw_node_event(struct fw_card *card, + case FW_NODE_LINK_ON: + if (!node->link_on) + break; +- ++ create: + device = kzalloc(sizeof(*device), GFP_ATOMIC); + if (device == NULL) + break; +@@ -832,6 +943,22 @@ void fw_node_event(struct fw_card *card, + schedule_delayed_work(&device->work, INITIAL_DELAY); + break; + ++ case FW_NODE_INITIATED_RESET: ++ device = node->data; ++ if (device == NULL) ++ goto create; ++ ++ device->node_id = node->node_id; ++ smp_wmb(); /* update node_id before generation */ ++ device->generation = card->generation; ++ if (atomic_cmpxchg(&device->state, ++ FW_DEVICE_RUNNING, ++ FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) { ++ PREPARE_DELAYED_WORK(&device->work, fw_device_refresh); ++ schedule_delayed_work(&device->work, INITIAL_DELAY); ++ } ++ break; ++ + case FW_NODE_UPDATED: + if (!node->link_on || node->data == NULL) + break; +Index: linux/drivers/firewire/fw-topology.c =================================================================== ---- linux.orig/drivers/firewire/fw-sbp2.c -+++ linux/drivers/firewire/fw-sbp2.c -@@ -790,7 +790,7 @@ static void sbp2_release_target(struct k - scsi_remove_host(shost); - fw_notify("released %s\n", tgt->bus_id); - -- put_device(&tgt->unit->device); -+ fw_unit_put(tgt->unit); - scsi_host_put(shost); - fw_device_put(device); - } -@@ -1091,7 +1091,7 @@ static int sbp2_probe(struct device *dev - goto fail_shost_put; - - fw_device_get(device); -- get_device(&unit->device); -+ fw_unit_get(unit); +--- linux.orig/drivers/firewire/fw-topology.c ++++ linux/drivers/firewire/fw-topology.c +@@ -107,6 +107,7 @@ static struct fw_node *fw_node_create(u3 + node->node_id = LOCAL_BUS | SELF_ID_PHY_ID(sid); + node->link_on = SELF_ID_LINK_ON(sid); + node->phy_speed = SELF_ID_PHY_SPEED(sid); ++ node->initiated_reset = SELF_ID_PHY_INITIATOR(sid); + node->port_count = port_count; + + atomic_set(&node->ref_count, 1); +@@ -430,6 +431,8 @@ update_tree(struct fw_card *card, struct + event = FW_NODE_LINK_OFF; + else if (!node0->link_on && node1->link_on) + event = FW_NODE_LINK_ON; ++ else if (node1->initiated_reset && node1->link_on) ++ event = FW_NODE_INITIATED_RESET; + else + event = FW_NODE_UPDATED; + +Index: linux/drivers/firewire/fw-topology.h +=================================================================== +--- linux.orig/drivers/firewire/fw-topology.h ++++ linux/drivers/firewire/fw-topology.h +@@ -20,11 +20,12 @@ + #define __fw_topology_h + + enum { +- FW_NODE_CREATED = 0x00, +- FW_NODE_UPDATED = 0x01, +- FW_NODE_DESTROYED = 0x02, +- FW_NODE_LINK_ON = 0x03, +- FW_NODE_LINK_OFF = 0x04, ++ FW_NODE_CREATED, ++ FW_NODE_UPDATED, ++ FW_NODE_DESTROYED, ++ FW_NODE_LINK_ON, ++ FW_NODE_LINK_OFF, ++ FW_NODE_INITIATED_RESET, + }; - /* Initialize to values that won't match anything in our table. */ - firmware_revision = 0xff000000; + struct fw_node { -- Stefan Richter --=====-==--- --=- ==--- +-=====-==--- --== ---== http://arcgraph.de/sr/ linux-2.6-firewire-git-update.patch: Index: linux-2.6-firewire-git-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-firewire-git-update.patch,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- linux-2.6-firewire-git-update.patch 29 Feb 2008 18:58:22 -0000 1.1.2.2 +++ linux-2.6-firewire-git-update.patch 5 Mar 2008 18:41:17 -0000 1.1.2.3 @@ -1,905 +1,1102 @@ -git diff in linux1394-git tree vs. 2.6.25-rc1, 02/20/2008 +git diff in linux1394-git tree vs. 2.6.25-rc3-git4, 03/03/2008 - Documentation/debugging-via-ohci1394.txt | 17 +- - drivers/firewire/fw-cdev.c | 8 +- - drivers/firewire/fw-device.c | 48 +++-- - drivers/firewire/fw-device.h | 2 +- - drivers/firewire/fw-sbp2.c | 358 +++++++++++++++++++++++------- - drivers/ieee1394/sbp2.c | 22 ++- - drivers/ieee1394/sbp2.h | 2 + - 7 files changed, 345 insertions(+), 112 deletions(-) - ---- + Documentation/debugging-via-ohci1394.txt | 13 ++- + drivers/firewire/fw-card.c | 38 ---------- + drivers/firewire/fw-device.h | 27 ++++--- + drivers/firewire/fw-ohci.c | 114 +++++++++++++++++++++------- + drivers/firewire/fw-sbp2.c | 120 ++++++++++++------------------ + drivers/firewire/fw-transaction.c | 2 +- + drivers/firewire/fw-transaction.h | 10 +-- + drivers/ieee1394/csr.c | 6 +- + drivers/ieee1394/dv1394.c | 3 +- + drivers/ieee1394/nodemgr.c | 6 +- + drivers/ieee1394/ohci1394.c | 109 ++++++++++++--------------- + drivers/ieee1394/raw1394.c | 1 - + drivers/ieee1394/sbp2.c | 7 +- + drivers/ieee1394/video1394.c | 3 +- + lib/Kconfig.debug | 10 +++ + 15 files changed, 233 insertions(+), 236 deletions(-) diff --git a/Documentation/debugging-via-ohci1394.txt b/Documentation/debugging-via-ohci1394.txt -index de4804e..c360d4e 100644 +index c360d4e..371ba27 100644 --- a/Documentation/debugging-via-ohci1394.txt +++ b/Documentation/debugging-via-ohci1394.txt -@@ -36,14 +36,15 @@ available (notebooks) or too slow for extensive debug information (like ACPI). - Drivers - ------- - --The OHCI-1394 drivers in drivers/firewire and drivers/ieee1394 initialize --the OHCI-1394 controllers to a working state and can be used to enable --physical DMA. By default you only have to load the driver, and physical --DMA access will be granted to all remote nodes, but it can be turned off --when using the ohci1394 driver. -- --Because these drivers depend on the PCI enumeration to be completed, an --initialization routine which can runs pretty early (long before console_init(), -+The ohci1394 driver in drivers/ieee1394 initializes the OHCI-1394 controllers -+to a working state and enables physical DMA by default for all remote nodes. -+This can be turned off by ohci1394's module parameter phys_dma=0. -+ -+The alternative firewire-ohci driver in drivers/firewire uses filtered physical -+DMA, hence is not yet suitable for remote debugging. -+ -+Because ohci1394 depends on the PCI enumeration to be completed, an -+initialization routine which runs pretty early (long before console_init() - which makes the printk buffer appear on the console can be called) was written. +@@ -41,11 +41,14 @@ to a working state and enables physical DMA by default for all remote nodes. + This can be turned off by ohci1394's module parameter phys_dma=0. + + The alternative firewire-ohci driver in drivers/firewire uses filtered physical +-DMA, hence is not yet suitable for remote debugging. +- +-Because ohci1394 depends on the PCI enumeration to be completed, an +-initialization routine which runs pretty early (long before console_init() +-which makes the printk buffer appear on the console can be called) was written. ++DMA by default, which is more secure but not suitable for remote debugging. ++Compile the driver with CONFIG_FIREWIRE_OHCI_REMOTE_DMA to get unfiltered ++physical DMA. ++ ++Because ohci1394 and firewire-ohci depend on the PCI enumeration to be ++completed, an initialization routine which runs pretty early has been ++implemented for x86. This routine runs long before console_init() can be ++called, i.e. before the printk buffer appears on the console. To activate it, enable CONFIG_PROVIDE_OHCI1394_DMA_INIT (Kernel hacking menu: -diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c -index 7e73cba..44ccee2 100644 ---- a/drivers/firewire/fw-cdev.c -+++ b/drivers/firewire/fw-cdev.c -@@ -109,15 +109,17 @@ static int fw_device_op_open(struct inode *inode, struct file *file) - struct client *client; - unsigned long flags; + Provide code for enabling DMA over FireWire early on boot) and pass the +diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c +index a034627..140b34d 100644 +--- a/drivers/firewire/fw-card.c ++++ b/drivers/firewire/fw-card.c +@@ -398,7 +398,6 @@ fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver, + { + static atomic_t index = ATOMIC_INIT(-1); -- device = fw_device_from_devt(inode->i_rdev); -+ device = fw_device_get_by_devt(inode->i_rdev); - if (device == NULL) - return -ENODEV; - - client = kzalloc(sizeof(*client), GFP_KERNEL); -- if (client == NULL) -+ if (client == NULL) { -+ fw_device_put(device); - return -ENOMEM; -+ } +- kref_init(&card->kref); + atomic_set(&card->device_count, 0); + card->index = atomic_inc_return(&index); + card->driver = driver; +@@ -429,12 +428,6 @@ fw_card_add(struct fw_card *card, + card->link_speed = link_speed; + card->guid = guid; + +- /* +- * The subsystem grabs a reference when the card is added and +- * drops it when the driver calls fw_core_remove_card. +- */ +- fw_card_get(card); +- + mutex_lock(&card_mutex); + config_rom = generate_config_rom(card, &length); + list_add_tail(&card->link, &card_list); +@@ -540,40 +533,9 @@ fw_core_remove_card(struct fw_card *card) + cancel_delayed_work_sync(&card->work); + fw_flush_transactions(card); + del_timer_sync(&card->flush_timer); +- +- fw_card_put(card); + } + EXPORT_SYMBOL(fw_core_remove_card); + +-struct fw_card * +-fw_card_get(struct fw_card *card) +-{ +- kref_get(&card->kref); +- +- return card; +-} +-EXPORT_SYMBOL(fw_card_get); +- +-static void +-release_card(struct kref *kref) +-{ +- struct fw_card *card = container_of(kref, struct fw_card, kref); +- +- kfree(card); +-} +- +-/* +- * An assumption for fw_card_put() is that the card driver allocates +- * the fw_card struct with kalloc and that it has been shut down +- * before the last ref is dropped. +- */ +-void +-fw_card_put(struct fw_card *card) +-{ +- kref_put(&card->kref, release_card); +-} +-EXPORT_SYMBOL(fw_card_put); +- + int + fw_core_initiate_bus_reset(struct fw_card *card, int short_reset) + { +diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h +index 78ecd39..0d771fd 100644 +--- a/drivers/firewire/fw-device.h ++++ b/drivers/firewire/fw-device.h +@@ -64,28 +64,24 @@ struct fw_device { + struct fw_attribute_group attribute_group; + }; -- client->device = fw_device_get(device); -+ client->device = device; - INIT_LIST_HEAD(&client->event_list); - INIT_LIST_HEAD(&client->resource_list); - spin_lock_init(&client->lock); -diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c -index de9066e..2ab13e0 100644 ---- a/drivers/firewire/fw-device.c -+++ b/drivers/firewire/fw-device.c -@@ -358,12 +358,9 @@ static ssize_t - guid_show(struct device *dev, struct device_attribute *attr, char *buf) - { - struct fw_device *device = fw_device(dev); -- u64 guid; - -- guid = ((u64)device->config_rom[3] << 32) | device->config_rom[4]; -- -- return snprintf(buf, PAGE_SIZE, "0x%016llx\n", -- (unsigned long long)guid); -+ return snprintf(buf, PAGE_SIZE, "0x%08x%08x\n", -+ device->config_rom[3], device->config_rom[4]); - } - - static struct device_attribute fw_device_attributes[] = { -@@ -610,12 +607,14 @@ static DECLARE_RWSEM(idr_rwsem); - static DEFINE_IDR(fw_device_idr); - int fw_cdev_major; +-static inline struct fw_device * +-fw_device(struct device *dev) ++static inline struct fw_device *fw_device(struct device *dev) + { + return container_of(dev, struct fw_device, device); + } --struct fw_device *fw_device_from_devt(dev_t devt) -+struct fw_device *fw_device_get_by_devt(dev_t devt) +-static inline int +-fw_device_is_shutdown(struct fw_device *device) ++static inline int fw_device_is_shutdown(struct fw_device *device) { - struct fw_device *device; + return atomic_read(&device->state) == FW_DEVICE_SHUTDOWN; + } - down_read(&idr_rwsem); - device = idr_find(&fw_device_idr, MINOR(devt)); -+ if (device) -+ fw_device_get(device); - up_read(&idr_rwsem); +-static inline struct fw_device * +-fw_device_get(struct fw_device *device) ++static inline struct fw_device *fw_device_get(struct fw_device *device) + { + get_device(&device->device); return device; -@@ -627,13 +626,14 @@ static void fw_device_shutdown(struct work_struct *work) - container_of(work, struct fw_device, work.work); - int minor = MINOR(device->device.devt); + } -- down_write(&idr_rwsem); -- idr_remove(&fw_device_idr, minor); -- up_write(&idr_rwsem); -- - fw_device_cdev_remove(device); - device_for_each_child(&device->device, NULL, shutdown_unit); - device_unregister(&device->device); -+ -+ down_write(&idr_rwsem); -+ idr_remove(&fw_device_idr, minor); -+ up_write(&idr_rwsem); -+ fw_device_put(device); +-static inline void +-fw_device_put(struct fw_device *device) ++static inline void fw_device_put(struct fw_device *device) + { + put_device(&device->device); } +@@ -104,12 +100,23 @@ struct fw_unit { + struct fw_attribute_group attribute_group; + }; - static struct device_type fw_device_type = { -@@ -682,10 +682,13 @@ static void fw_device_init(struct work_struct *work) - } +-static inline struct fw_unit * +-fw_unit(struct device *dev) ++static inline struct fw_unit *fw_unit(struct device *dev) + { + return container_of(dev, struct fw_unit, device); + } - err = -ENOMEM; ++static inline struct fw_unit *fw_unit_get(struct fw_unit *unit) ++{ ++ get_device(&unit->device); + -+ fw_device_get(device); - down_write(&idr_rwsem); - if (idr_pre_get(&fw_device_idr, GFP_KERNEL)) - err = idr_get_new(&fw_device_idr, device, &minor); - up_write(&idr_rwsem); ++ return unit; ++} + - if (err < 0) - goto error; ++static inline void fw_unit_put(struct fw_unit *unit) ++{ ++ put_device(&unit->device); ++} ++ + #define CSR_OFFSET 0x40 + #define CSR_LEAF 0x80 + #define CSR_DIRECTORY 0xc0 +diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c +index 7ebad3c..28ea78c 100644 +--- a/drivers/firewire/fw-ohci.c ++++ b/drivers/firewire/fw-ohci.c +@@ -33,6 +33,10 @@ + #include + #include + ++#ifdef CONFIG_PPC_PMAC ++#include ++#endif ++ + #include "fw-ohci.h" + #include "fw-transaction.h" -@@ -717,13 +720,22 @@ static void fw_device_init(struct work_struct *work) +@@ -175,6 +179,7 @@ struct fw_ohci { + int generation; + int request_generation; + u32 bus_seconds; ++ bool old_uninorth; + + /* + * Spinlock for accessing fw_ohci data. Never call out of +@@ -311,15 +316,22 @@ static int ar_context_add_page(struct ar_context *ctx) + return 0; + } + ++#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32) ++#define cond_le32_to_cpu(v) \ ++ (ohci->old_uninorth ? (__force __u32)(v) : le32_to_cpu(v)) ++#else ++#define cond_le32_to_cpu(v) le32_to_cpu(v) ++#endif ++ + static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + { + struct fw_ohci *ohci = ctx->ohci; + struct fw_packet p; + u32 status, length, tcode; + +- p.header[0] = le32_to_cpu(buffer[0]); +- p.header[1] = le32_to_cpu(buffer[1]); +- p.header[2] = le32_to_cpu(buffer[2]); ++ p.header[0] = cond_le32_to_cpu(buffer[0]); ++ p.header[1] = cond_le32_to_cpu(buffer[1]); ++ p.header[2] = cond_le32_to_cpu(buffer[2]); + + tcode = (p.header[0] >> 4) & 0x0f; + switch (tcode) { +@@ -331,7 +343,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + break; + + case TCODE_READ_BLOCK_REQUEST : +- p.header[3] = le32_to_cpu(buffer[3]); ++ p.header[3] = cond_le32_to_cpu(buffer[3]); + p.header_length = 16; + p.payload_length = 0; + break; +@@ -340,7 +352,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + case TCODE_READ_BLOCK_RESPONSE: + case TCODE_LOCK_REQUEST: + case TCODE_LOCK_RESPONSE: +- p.header[3] = le32_to_cpu(buffer[3]); ++ p.header[3] = cond_le32_to_cpu(buffer[3]); + p.header_length = 16; + p.payload_length = p.header[3] >> 16; + break; +@@ -357,7 +369,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + + /* FIXME: What to do about evt_* errors? */ + length = (p.header_length + p.payload_length + 3) / 4; +- status = le32_to_cpu(buffer[length]); ++ status = cond_le32_to_cpu(buffer[length]); + + p.ack = ((status >> 16) & 0x1f) - 16; + p.speed = (status >> 21) & 0x7; +@@ -375,7 +387,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) */ - if (atomic_cmpxchg(&device->state, - FW_DEVICE_INITIALIZING, -- FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) -+ FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) { - fw_device_shutdown(&device->work.work); -- else -- fw_notify("created new fw device %s " -- "(%d config rom retries, S%d00)\n", -- device->device.bus_id, device->config_rom_retries, -- 1 << device->max_speed); -+ } else { -+ if (device->config_rom_retries) -+ fw_notify("created device %s: GUID %08x%08x, S%d00, " -+ "%d config ROM retries\n", -+ device->device.bus_id, -+ device->config_rom[3], device->config_rom[4], -+ 1 << device->max_speed, -+ device->config_rom_retries); -+ else -+ fw_notify("created device %s: GUID %08x%08x, S%d00\n", -+ device->device.bus_id, -+ device->config_rom[3], device->config_rom[4], -+ 1 << device->max_speed); -+ } + + if (p.ack + 16 == 0x09) +- ohci->request_generation = (buffer[2] >> 16) & 0xff; ++ ohci->request_generation = (p.header[2] >> 16) & 0xff; + else if (ctx == &ohci->ar_request_ctx) + fw_core_handle_request(&ohci->card, &p); + else +@@ -532,7 +544,7 @@ static int + context_add_buffer(struct context *ctx) + { + struct descriptor_buffer *desc; +- dma_addr_t bus_addr; ++ dma_addr_t uninitialized_var(bus_addr); + int offset; /* - * Reschedule the IRM work if we just finished reading the -@@ -741,7 +753,9 @@ static void fw_device_init(struct work_struct *work) - idr_remove(&fw_device_idr, minor); - up_write(&idr_rwsem); - error: -- put_device(&device->device); -+ fw_device_put(device); /* fw_device_idr's reference */ +@@ -1022,13 +1034,14 @@ static void bus_reset_tasklet(unsigned long data) + */ + + self_id_count = (reg_read(ohci, OHCI1394_SelfIDCount) >> 3) & 0x3ff; +- generation = (le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff; ++ generation = (cond_le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff; + rmb(); + + for (i = 1, j = 0; j < self_id_count; i += 2, j++) { + if (ohci->self_id_cpu[i] != ~ohci->self_id_cpu[i + 1]) + fw_error("inconsistent self IDs\n"); +- ohci->self_id_buffer[j] = le32_to_cpu(ohci->self_id_cpu[i]); ++ ohci->self_id_buffer[j] = ++ cond_le32_to_cpu(ohci->self_id_cpu[i]); + } + rmb(); + +@@ -1091,6 +1104,11 @@ static void bus_reset_tasklet(unsigned long data) + reg_write(ohci, OHCI1394_ConfigROMhdr, ohci->next_header); + } + ++#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA ++ reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0); ++ reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0); ++#endif + -+ put_device(&device->device); /* our reference */ + spin_unlock_irqrestore(&ohci->lock, flags); + + if (free_rom) +@@ -1316,7 +1334,7 @@ ohci_set_config_rom(struct fw_card *card, u32 *config_rom, size_t length) + unsigned long flags; + int retval = -EBUSY; + __be32 *next_config_rom; +- dma_addr_t next_config_rom_bus; ++ dma_addr_t uninitialized_var(next_config_rom_bus); + + ohci = fw_ohci(card); + +@@ -1429,6 +1447,9 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet) + static int + ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation) + { ++#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA ++ return 0; ++#else + struct fw_ohci *ohci = fw_ohci(card); + unsigned long flags; + int n, retval = 0; +@@ -1460,6 +1481,7 @@ ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation) + out: + spin_unlock_irqrestore(&ohci->lock, flags); + return retval; ++#endif /* CONFIG_FIREWIRE_OHCI_REMOTE_DMA */ } - static int update_unit(struct device *dev, void *data) -diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h -index 0854fe2..43808c0 100644 ---- a/drivers/firewire/fw-device.h -+++ b/drivers/firewire/fw-device.h -@@ -77,13 +77,13 @@ fw_device_is_shutdown(struct fw_device *device) + static u64 +@@ -1487,7 +1509,7 @@ static int handle_ir_dualbuffer_packet(struct context *context, + void *p, *end; + int i; + +- if (db->first_res_count > 0 && db->second_res_count > 0) { ++ if (db->first_res_count != 0 && db->second_res_count != 0) { + if (ctx->excess_bytes <= le16_to_cpu(db->second_req_count)) { + /* This descriptor isn't done yet, stop iteration. */ + return 0; +@@ -1513,7 +1535,7 @@ static int handle_ir_dualbuffer_packet(struct context *context, + memcpy(ctx->header + i + 4, p + 8, ctx->base.header_size - 4); + i += ctx->base.header_size; + ctx->excess_bytes += +- (le32_to_cpu(*(u32 *)(p + 4)) >> 16) & 0xffff; ++ (le32_to_cpu(*(__le32 *)(p + 4)) >> 16) & 0xffff; + p += ctx->base.header_size + 4; + } + ctx->header_length = i; +@@ -2039,6 +2061,35 @@ static const struct fw_card_driver ohci_driver = { + .stop_iso = ohci_stop_iso, + }; + ++#ifdef CONFIG_PPC_PMAC ++static void ohci_pmac_on(struct pci_dev *dev) ++{ ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(dev); ++ ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1); ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); ++ } ++ } ++} ++ ++static void ohci_pmac_off(struct pci_dev *dev) ++{ ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(dev); ++ ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); ++ } ++ } ++} ++#else ++#define ohci_pmac_on(dev) ++#define ohci_pmac_off(dev) ++#endif /* CONFIG_PPC_PMAC */ ++ + static int __devinit + pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + { +@@ -2048,6 +2099,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + int err; + size_t size; + ++ ohci_pmac_on(dev); ++ + ohci = kzalloc(sizeof(*ohci), GFP_KERNEL); + if (ohci == NULL) { + fw_error("Could not malloc fw_ohci data.\n"); +@@ -2059,13 +2112,17 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + err = pci_enable_device(dev); + if (err) { + fw_error("Failed to enable OHCI hardware.\n"); +- goto fail_put_card; ++ goto fail_free; + } + + pci_set_master(dev); + pci_write_config_dword(dev, OHCI1394_PCI_HCI_Control, 0); + pci_set_drvdata(dev, ohci); + ++#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32) ++ ohci->old_uninorth = dev->vendor == PCI_VENDOR_ID_APPLE && ++ dev->device == PCI_DEVICE_ID_APPLE_UNI_N_FW; ++#endif + spin_lock_init(&ohci->lock); + + tasklet_init(&ohci->bus_reset_tasklet, +@@ -2151,8 +2208,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + pci_release_region(dev, 0); + fail_disable: + pci_disable_device(dev); +- fail_put_card: +- fw_card_put(&ohci->card); ++ fail_free: ++ kfree(&ohci->card); + + return err; } +@@ -2180,39 +2237,42 @@ static void pci_remove(struct pci_dev *dev) + pci_iounmap(dev, ohci->registers); + pci_release_region(dev, 0); + pci_disable_device(dev); +- fw_card_put(&ohci->card); ++ ohci_pmac_off(dev); ++ kfree(&ohci->card); - struct fw_device *fw_device_get(struct fw_device *device); -+struct fw_device *fw_device_get_by_devt(dev_t devt); - void fw_device_put(struct fw_device *device); - int fw_device_enable_phys_dma(struct fw_device *device); + fw_notify("Removed fw-ohci device.\n"); + } - void fw_device_cdev_update(struct fw_device *device); - void fw_device_cdev_remove(struct fw_device *device); + #ifdef CONFIG_PM +-static int pci_suspend(struct pci_dev *pdev, pm_message_t state) ++static int pci_suspend(struct pci_dev *dev, pm_message_t state) + { +- struct fw_ohci *ohci = pci_get_drvdata(pdev); ++ struct fw_ohci *ohci = pci_get_drvdata(dev); + int err; + + software_reset(ohci); +- free_irq(pdev->irq, ohci); +- err = pci_save_state(pdev); ++ free_irq(dev->irq, ohci); ++ err = pci_save_state(dev); + if (err) { + fw_error("pci_save_state failed\n"); + return err; + } +- err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); ++ err = pci_set_power_state(dev, pci_choose_state(dev, state)); + if (err) + fw_error("pci_set_power_state failed with %d\n", err); ++ ohci_pmac_off(dev); --struct fw_device *fw_device_from_devt(dev_t devt); - extern int fw_cdev_major; + return 0; + } - struct fw_unit { +-static int pci_resume(struct pci_dev *pdev) ++static int pci_resume(struct pci_dev *dev) + { +- struct fw_ohci *ohci = pci_get_drvdata(pdev); ++ struct fw_ohci *ohci = pci_get_drvdata(dev); + int err; + +- pci_set_power_state(pdev, PCI_D0); +- pci_restore_state(pdev); +- err = pci_enable_device(pdev); ++ ohci_pmac_on(dev); ++ pci_set_power_state(dev, PCI_D0); ++ pci_restore_state(dev); ++ err = pci_enable_device(dev); + if (err) { + fw_error("pci_enable_device failed\n"); + return err; diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c -index 19ece9b..5259491 100644 +index 03069a4..d6d62c6 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c -@@ -28,14 +28,15 @@ - * and many others. - */ - -+#include -+#include -+#include -+#include - #include -+#include - #include - #include --#include --#include - #include --#include --#include - #include - #include - #include -@@ -47,9 +48,9 @@ - #include - #include - --#include "fw-transaction.h" --#include "fw-topology.h" - #include "fw-device.h" -+#include "fw-topology.h" -+#include "fw-transaction.h" +@@ -174,9 +174,6 @@ struct sbp2_target { + #define SBP2_ORB_NULL 0x80000000 + #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 - /* - * So far only bridges from Oxford Semiconductor are known to support -@@ -82,6 +83,9 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device " - * Avoids access beyond actual disk limits on devices with an off-by-one bug. - * Don't use this with devices which don't have this bug. - * -+ * - delay inquiry -+ * Wait extra SBP2_INQUIRY_DELAY seconds after login before SCSI inquiry. -+ * - * - override internal blacklist - * Instead of adding to the built-in blacklist, use only the workarounds - * specified in the module load parameter. -@@ -91,6 +95,8 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device " - #define SBP2_WORKAROUND_INQUIRY_36 0x2 - #define SBP2_WORKAROUND_MODE_SENSE_8 0x4 - #define SBP2_WORKAROUND_FIX_CAPACITY 0x8 -+#define SBP2_WORKAROUND_DELAY_INQUIRY 0x10 -+#define SBP2_INQUIRY_DELAY 12 - #define SBP2_WORKAROUND_OVERRIDE 0x100 - - static int sbp2_param_workarounds; -@@ -100,6 +106,7 @@ MODULE_PARM_DESC(workarounds, "Work around device bugs (default = 0" - ", 36 byte inquiry = " __stringify(SBP2_WORKAROUND_INQUIRY_36) - ", skip mode page 8 = " __stringify(SBP2_WORKAROUND_MODE_SENSE_8) - ", fix capacity = " __stringify(SBP2_WORKAROUND_FIX_CAPACITY) -+ ", delay inquiry = " __stringify(SBP2_WORKAROUND_DELAY_INQUIRY) - ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE) - ", or a combination)"); +-#define SBP2_DIRECTION_TO_MEDIA 0x0 +-#define SBP2_DIRECTION_FROM_MEDIA 0x1 +- + /* Unit directory keys */ + #define SBP2_CSR_UNIT_CHARACTERISTICS 0x3a + #define SBP2_CSR_FIRMWARE_REVISION 0x3c +@@ -223,8 +220,8 @@ struct sbp2_status { + }; -@@ -132,6 +139,7 @@ struct sbp2_logical_unit { - int generation; - int retries; - struct delayed_work work; -+ bool blocked; + struct sbp2_pointer { +- u32 high; +- u32 low; ++ __be32 high; ++ __be32 low; }; - /* -@@ -141,16 +149,18 @@ struct sbp2_logical_unit { - struct sbp2_target { - struct kref kref; - struct fw_unit *unit; -+ const char *bus_id; -+ struct list_head lu_list; + struct sbp2_orb { +@@ -252,8 +249,8 @@ struct sbp2_management_orb { + struct { + struct sbp2_pointer password; + struct sbp2_pointer response; +- u32 misc; +- u32 length; ++ __be32 misc; ++ __be32 length; + struct sbp2_pointer status_fifo; + } request; + __be32 response[4]; +@@ -262,20 +259,17 @@ struct sbp2_management_orb { + struct sbp2_status status; + }; - u64 management_agent_address; - int directory_id; - int node_id; - int address_high; +-#define LOGIN_RESPONSE_GET_LOGIN_ID(v) ((v).misc & 0xffff) +-#define LOGIN_RESPONSE_GET_LENGTH(v) (((v).misc >> 16) & 0xffff) - -- unsigned workarounds; -- struct list_head lu_list; -- -+ unsigned int workarounds; - unsigned int mgt_orb_timeout; -+ -+ int dont_block; /* counter for each logical unit */ -+ int blocked; /* ditto */ + struct sbp2_login_response { +- u32 misc; ++ __be32 misc; + struct sbp2_pointer command_block_agent; +- u32 reconnect_hold; ++ __be32 reconnect_hold; }; + #define COMMAND_ORB_DATA_SIZE(v) ((v)) + #define COMMAND_ORB_PAGE_SIZE(v) ((v) << 16) + #define COMMAND_ORB_PAGE_TABLE_PRESENT ((1) << 19) + #define COMMAND_ORB_MAX_PAYLOAD(v) ((v) << 20) + #define COMMAND_ORB_SPEED(v) ((v) << 24) +-#define COMMAND_ORB_DIRECTION(v) ((v) << 27) ++#define COMMAND_ORB_DIRECTION ((1) << 27) + #define COMMAND_ORB_REQUEST_FORMAT(v) ((v) << 29) + #define COMMAND_ORB_NOTIFY ((1) << 31) + +@@ -284,7 +278,7 @@ struct sbp2_command_orb { + struct { + struct sbp2_pointer next; + struct sbp2_pointer data_descriptor; +- u32 misc; ++ __be32 misc; + u8 command_block[12]; + } request; + struct scsi_cmnd *cmd; +@@ -453,8 +447,7 @@ sbp2_send_orb(struct sbp2_orb *orb, struct sbp2_logical_unit *lu, + unsigned long flags; + + orb->pointer.high = 0; +- orb->pointer.low = orb->request_bus; +- fw_memcpy_to_be32(&orb->pointer, &orb->pointer, sizeof(orb->pointer)); ++ orb->pointer.low = cpu_to_be32(orb->request_bus); + + spin_lock_irqsave(&device->card->lock, flags); + list_add_tail(&orb->link, &lu->orb_list); +@@ -530,31 +523,31 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, + if (dma_mapping_error(orb->response_bus)) + goto fail_mapping_response; + +- orb->request.response.high = 0; +- orb->request.response.low = orb->response_bus; ++ orb->request.response.high = 0; ++ orb->request.response.low = cpu_to_be32(orb->response_bus); + +- orb->request.misc = ++ orb->request.misc = cpu_to_be32( + MANAGEMENT_ORB_NOTIFY | + MANAGEMENT_ORB_FUNCTION(function) | +- MANAGEMENT_ORB_LUN(lun_or_login_id); +- orb->request.length = +- MANAGEMENT_ORB_RESPONSE_LENGTH(sizeof(orb->response)); ++ MANAGEMENT_ORB_LUN(lun_or_login_id)); ++ orb->request.length = cpu_to_be32( ++ MANAGEMENT_ORB_RESPONSE_LENGTH(sizeof(orb->response))); + +- orb->request.status_fifo.high = lu->address_handler.offset >> 32; +- orb->request.status_fifo.low = lu->address_handler.offset; ++ orb->request.status_fifo.high = ++ cpu_to_be32(lu->address_handler.offset >> 32); ++ orb->request.status_fifo.low = ++ cpu_to_be32(lu->address_handler.offset); + + if (function == SBP2_LOGIN_REQUEST) { + /* Ask for 2^2 == 4 seconds reconnect grace period */ +- orb->request.misc |= ++ orb->request.misc |= cpu_to_be32( + MANAGEMENT_ORB_RECONNECT(2) | +- MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login); ++ MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login)); + timeout = lu->tgt->mgt_orb_timeout; + } else { + timeout = SBP2_ORB_TIMEOUT; + } + +- fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request)); +- + init_completion(&orb->done); + orb->base.callback = complete_management_orb; + +@@ -599,8 +592,7 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, + sizeof(orb->response), DMA_FROM_DEVICE); + fail_mapping_response: + if (response) +- fw_memcpy_from_be32(response, +- orb->response, sizeof(orb->response)); ++ memcpy(response, orb->response, sizeof(orb->response)); + kref_put(&orb->base.kref, free_orb); + + return retval; +@@ -695,10 +687,8 @@ static void sbp2_conditionally_block(struct sbp2_logical_unit *lu) + if (!tgt->dont_block && !lu->blocked && + lu->generation != card->generation) { + lu->blocked = true; +- if (++tgt->blocked == 1) { ++ if (++tgt->blocked == 1) + scsi_block_requests(shost); +- fw_notify("blocked %s\n", lu->tgt->bus_id); +- } + } + spin_unlock_irqrestore(&card->lock, flags); + } +@@ -725,10 +715,8 @@ static void sbp2_conditionally_unblock(struct sbp2_logical_unit *lu) + } + spin_unlock_irqrestore(&card->lock, flags); + +- if (unblock) { ++ if (unblock) + scsi_unblock_requests(shost); +- fw_notify("unblocked %s\n", lu->tgt->bus_id); +- } + } /* -@@ -160,7 +170,7 @@ struct sbp2_target { - */ - #define SBP2_MIN_LOGIN_ORB_TIMEOUT 5000U /* Timeout in ms */ - #define SBP2_MAX_LOGIN_ORB_TIMEOUT 40000U /* Timeout in ms */ --#define SBP2_ORB_TIMEOUT 2000 /* Timeout in ms */ -+#define SBP2_ORB_TIMEOUT 2000U /* Timeout in ms */ - #define SBP2_ORB_NULL 0x80000000 - #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 +@@ -790,7 +778,7 @@ static void sbp2_release_target(struct kref *kref) + scsi_remove_host(shost); + fw_notify("released %s\n", tgt->bus_id); -@@ -297,7 +307,7 @@ struct sbp2_command_orb { - static const struct { - u32 firmware_revision; - u32 model; -- unsigned workarounds; -+ unsigned int workarounds; - } sbp2_workarounds_table[] = { - /* DViCO Momobay CX-1 with TSB42AA9 bridge */ { - .firmware_revision = 0x002800, -@@ -305,6 +315,11 @@ static const struct { - .workarounds = SBP2_WORKAROUND_INQUIRY_36 | - SBP2_WORKAROUND_MODE_SENSE_8, - }, -+ /* DViCO Momobay FX-3A with TSB42AA9A bridge */ { -+ .firmware_revision = 0x002800, -+ .model = 0x000000, -+ .workarounds = SBP2_WORKAROUND_DELAY_INQUIRY, -+ }, - /* Initio bridges, actually only needed for some older ones */ { - .firmware_revision = 0x000200, - .model = ~0, -@@ -501,6 +516,9 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, - unsigned int timeout; - int retval = -ENOMEM; +- put_device(&tgt->unit->device); ++ fw_unit_put(tgt->unit); + scsi_host_put(shost); + fw_device_put(device); + } +@@ -855,11 +843,10 @@ static void sbp2_login(struct work_struct *work) + tgt->address_high = local_node_id << 16; + sbp2_set_generation(lu, generation); -+ if (function == SBP2_LOGOUT_REQUEST && fw_device_is_shutdown(device)) -+ return 0; -+ - orb = kzalloc(sizeof(*orb), GFP_ATOMIC); - if (orb == NULL) - return -ENOMEM; -@@ -553,20 +571,20 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, - - retval = -EIO; - if (sbp2_cancel_orbs(lu) == 0) { -- fw_error("orb reply timed out, rcode=0x%02x\n", -- orb->base.rcode); -+ fw_error("%s: orb reply timed out, rcode=0x%02x\n", -+ lu->tgt->bus_id, orb->base.rcode); - goto out; +- /* Get command block agent offset and login id. */ + lu->command_block_agent_address = +- ((u64) (response.command_block_agent.high & 0xffff) << 32) | +- response.command_block_agent.low; +- lu->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response); ++ ((u64)(be32_to_cpu(response.command_block_agent.high) & 0xffff) ++ << 32) | be32_to_cpu(response.command_block_agent.low); ++ lu->login_id = be32_to_cpu(response.misc) & 0xffff; + + fw_notify("%s: logged in to LUN %04x (%d retries)\n", + tgt->bus_id, lu->lun, lu->retries); +@@ -1091,6 +1078,7 @@ static int sbp2_probe(struct device *dev) + goto fail_shost_put; + + fw_device_get(device); ++ fw_unit_get(unit); + + /* Initialize to values that won't match anything in our table. */ + firmware_revision = 0xff000000; +@@ -1106,8 +1094,6 @@ static int sbp2_probe(struct device *dev) + + sbp2_init_workarounds(tgt, model, firmware_revision); + +- get_device(&unit->device); +- + /* Do the login in a workqueue so we can easily reschedule retries. */ + list_for_each_entry(lu, &tgt->lu_list, link) + sbp2_queue_work(lu, 0); +@@ -1339,9 +1325,12 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, + * tables. + */ + if (count == 1 && sg_dma_len(sg) < SBP2_MAX_SG_ELEMENT_LENGTH) { +- orb->request.data_descriptor.high = lu->tgt->address_high; +- orb->request.data_descriptor.low = sg_dma_address(sg); +- orb->request.misc |= COMMAND_ORB_DATA_SIZE(sg_dma_len(sg)); ++ orb->request.data_descriptor.high = ++ cpu_to_be32(lu->tgt->address_high); ++ orb->request.data_descriptor.low = ++ cpu_to_be32(sg_dma_address(sg)); ++ orb->request.misc |= ++ cpu_to_be32(COMMAND_ORB_DATA_SIZE(sg_dma_len(sg))); + return 0; } - if (orb->base.rcode != RCODE_COMPLETE) { -- fw_error("management write failed, rcode 0x%02x\n", -- orb->base.rcode); -+ fw_error("%s: management write failed, rcode 0x%02x\n", -+ lu->tgt->bus_id, orb->base.rcode); - goto out; +@@ -1362,16 +1351,14 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, + goto fail_page_table; + } + l = min(sg_len, SBP2_MAX_SG_ELEMENT_LENGTH); +- orb->page_table[j].low = sg_addr; +- orb->page_table[j].high = (l << 16); ++ orb->page_table[j].low = cpu_to_be32(sg_addr); ++ orb->page_table[j].high = cpu_to_be32(l << 16); + sg_addr += l; + sg_len -= l; + j++; + } } - if (STATUS_GET_RESPONSE(orb->status) != 0 || - STATUS_GET_SBP_STATUS(orb->status) != 0) { -- fw_error("error status: %d:%d\n", -+ fw_error("%s: error status: %d:%d\n", lu->tgt->bus_id, - STATUS_GET_RESPONSE(orb->status), - STATUS_GET_SBP_STATUS(orb->status)); +- fw_memcpy_to_be32(orb->page_table, orb->page_table, +- sizeof(orb->page_table[0]) * j); + orb->page_table_bus = + dma_map_single(device->card->device, orb->page_table, + sizeof(orb->page_table), DMA_TO_DEVICE); +@@ -1385,11 +1372,10 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, + * initiator (i.e. us), but data_descriptor can refer to data + * on other nodes so we need to put our ID in descriptor.high. + */ +- orb->request.data_descriptor.high = lu->tgt->address_high; +- orb->request.data_descriptor.low = orb->page_table_bus; +- orb->request.misc |= +- COMMAND_ORB_PAGE_TABLE_PRESENT | +- COMMAND_ORB_DATA_SIZE(j); ++ orb->request.data_descriptor.high = cpu_to_be32(lu->tgt->address_high); ++ orb->request.data_descriptor.low = cpu_to_be32(orb->page_table_bus); ++ orb->request.misc |= cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT | ++ COMMAND_ORB_DATA_SIZE(j)); + + return 0; + +@@ -1435,8 +1421,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done) + orb->done = done; + orb->cmd = cmd; + +- orb->request.next.high = SBP2_ORB_NULL; +- orb->request.next.low = 0x0; ++ orb->request.next.high = cpu_to_be32(SBP2_ORB_NULL); + /* + * At speed 100 we can do 512 bytes per packet, at speed 200, + * 1024 bytes per packet etc. The SBP-2 max_payload field +@@ -1445,25 +1430,17 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done) + */ + max_payload = min(device->max_speed + 7, + device->card->max_receive - 1); +- orb->request.misc = ++ orb->request.misc = cpu_to_be32( + COMMAND_ORB_MAX_PAYLOAD(max_payload) | + COMMAND_ORB_SPEED(device->max_speed) | +- COMMAND_ORB_NOTIFY; ++ COMMAND_ORB_NOTIFY); + + if (cmd->sc_data_direction == DMA_FROM_DEVICE) +- orb->request.misc |= +- COMMAND_ORB_DIRECTION(SBP2_DIRECTION_FROM_MEDIA); +- else if (cmd->sc_data_direction == DMA_TO_DEVICE) +- orb->request.misc |= +- COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA); ++ orb->request.misc |= cpu_to_be32(COMMAND_ORB_DIRECTION); + + if (scsi_sg_count(cmd) && sbp2_map_scatterlist(orb, device, lu) < 0) goto out; -@@ -590,29 +608,147 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, - static void - complete_agent_reset_write(struct fw_card *card, int rcode, -- void *payload, size_t length, void *data) -+ void *payload, size_t length, void *done) -+{ -+ complete(done); -+} -+ -+static void sbp2_agent_reset(struct sbp2_logical_unit *lu) +- fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request)); +- +- memset(orb->request.command_block, +- 0, sizeof(orb->request.command_block)); + memcpy(orb->request.command_block, cmd->cmnd, COMMAND_SIZE(*cmd->cmnd)); + + orb->base.callback = complete_command_orb; +@@ -1491,11 +1468,8 @@ static int sbp2_scsi_slave_alloc(struct scsi_device *sdev) + + sdev->allow_restart = 1; + +- /* +- * Update the dma alignment (minimum alignment requirements for +- * start and end of DMA transfers) to be a sector +- */ +- blk_queue_update_dma_alignment(sdev->request_queue, 511); ++ /* SBP-2 requires quadlet alignment of the data buffers. */ ++ blk_queue_update_dma_alignment(sdev->request_queue, 4 - 1); + + if (lu->tgt->workarounds & SBP2_WORKAROUND_INQUIRY_36) + sdev->inquiry_len = 36; +diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c +index 7fcc59d..99529e5 100644 +--- a/drivers/firewire/fw-transaction.c ++++ b/drivers/firewire/fw-transaction.c +@@ -751,7 +751,7 @@ handle_topology_map(struct fw_card *card, struct fw_request *request, + void *payload, size_t length, void *callback_data) { -- struct fw_transaction *t = data; -+ struct fw_device *device = fw_device(lu->tgt->unit->device.parent); -+ DECLARE_COMPLETION_ONSTACK(done); -+ struct fw_transaction t; -+ static u32 z; -+ -+ fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST, -+ lu->tgt->node_id, lu->generation, device->max_speed, -+ lu->command_block_agent_address + SBP2_AGENT_RESET, -+ &z, sizeof(z), complete_agent_reset_write, &done); -+ wait_for_completion(&done); -+} + int i, start, end; +- u32 *map; ++ __be32 *map; + + if (!TCODE_IS_READ_REQUEST(tcode)) { + fw_send_response(card, request, RCODE_TYPE_ERROR); +diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h +index 09cb728..1a22a23 100644 +--- a/drivers/firewire/fw-transaction.h ++++ b/drivers/firewire/fw-transaction.h +@@ -86,12 +86,12 @@ + static inline void + fw_memcpy_from_be32(void *_dst, void *_src, size_t size) + { +- u32 *dst = _dst; +- u32 *src = _src; ++ u32 *dst = _dst; ++ __be32 *src = _src; + int i; -- kfree(t); -+static void -+complete_agent_reset_write_no_wait(struct fw_card *card, int rcode, -+ void *payload, size_t length, void *data) -+{ -+ kfree(data); + for (i = 0; i < size / 4; i++) +- dst[i] = cpu_to_be32(src[i]); ++ dst[i] = be32_to_cpu(src[i]); } --static int sbp2_agent_reset(struct sbp2_logical_unit *lu) -+static void sbp2_agent_reset_no_wait(struct sbp2_logical_unit *lu) - { - struct fw_device *device = fw_device(lu->tgt->unit->device.parent); - struct fw_transaction *t; -- static u32 zero; -+ static u32 z; - -- t = kzalloc(sizeof(*t), GFP_ATOMIC); -+ t = kmalloc(sizeof(*t), GFP_ATOMIC); - if (t == NULL) -- return -ENOMEM; -+ return; - - fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST, - lu->tgt->node_id, lu->generation, device->max_speed, - lu->command_block_agent_address + SBP2_AGENT_RESET, -- &zero, sizeof(zero), complete_agent_reset_write, t); -+ &z, sizeof(z), complete_agent_reset_write_no_wait, t); -+} + static inline void +@@ -221,7 +221,6 @@ struct fw_card { + const struct fw_card_driver *driver; + struct device *device; + atomic_t device_count; +- struct kref kref; -- return 0; -+static void sbp2_set_generation(struct sbp2_logical_unit *lu, int generation) -+{ -+ struct fw_card *card = fw_device(lu->tgt->unit->device.parent)->card; -+ unsigned long flags; -+ -+ /* serialize with comparisons of lu->generation and card->generation */ -+ spin_lock_irqsave(&card->lock, flags); -+ lu->generation = generation; -+ spin_unlock_irqrestore(&card->lock, flags); -+} -+ -+static inline void sbp2_allow_block(struct sbp2_logical_unit *lu) -+{ -+ /* -+ * We may access dont_block without taking card->lock here: -+ * All callers of sbp2_allow_block() and all callers of sbp2_unblock() -+ * are currently serialized against each other. -+ * And a wrong result in sbp2_conditionally_block()'s access of -+ * dont_block is rather harmless, it simply misses its first chance. -+ */ -+ --lu->tgt->dont_block; -+} + int node_id; + int generation; +@@ -263,9 +262,6 @@ struct fw_card { + int bm_generation; + }; + +-struct fw_card *fw_card_get(struct fw_card *card); +-void fw_card_put(struct fw_card *card); +- + /* + * The iso packet format allows for an immediate header/payload part + * stored in 'header' immediately after the packet info plus an +diff --git a/drivers/ieee1394/csr.c b/drivers/ieee1394/csr.c +index 52ac83e..c90be40 100644 +--- a/drivers/ieee1394/csr.c ++++ b/drivers/ieee1394/csr.c +@@ -133,8 +133,7 @@ static void host_reset(struct hpsb_host *host) + host->csr.state &= ~0x100; + } + +- host->csr.topology_map[1] = +- cpu_to_be32(be32_to_cpu(host->csr.topology_map[1]) + 1); ++ be32_add_cpu(&host->csr.topology_map[1], 1); + host->csr.topology_map[2] = cpu_to_be32(host->node_count << 16 + | host->selfid_count); + host->csr.topology_map[0] = +@@ -142,8 +141,7 @@ static void host_reset(struct hpsb_host *host) + | csr_crc16(host->csr.topology_map + 1, + host->selfid_count + 2)); + +- host->csr.speed_map[1] = +- cpu_to_be32(be32_to_cpu(host->csr.speed_map[1]) + 1); ++ be32_add_cpu(&host->csr.speed_map[1], 1); + host->csr.speed_map[0] = cpu_to_be32(0x3f1 << 16 + | csr_crc16(host->csr.speed_map+1, + 0x3f1)); +diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c +index 6572211..8c72f36 100644 +--- a/drivers/ieee1394/dv1394.c ++++ b/drivers/ieee1394/dv1394.c +@@ -2179,8 +2179,7 @@ static struct ieee1394_device_id dv1394_id_table[] = { + MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); + + static struct hpsb_protocol_driver dv1394_driver = { +- .name = "dv1394", +- .id_table = dv1394_id_table, ++ .name = "dv1394", + }; + + +diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c +index 511e432..70afa37 100644 +--- a/drivers/ieee1394/nodemgr.c ++++ b/drivers/ieee1394/nodemgr.c +@@ -701,7 +701,11 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv) + return 0; + + driver = container_of(drv, struct hpsb_protocol_driver, driver); +- for (id = driver->id_table; id->match_flags != 0; id++) { ++ id = driver->id_table; ++ if (!id) ++ return 0; + -+/* -+ * Blocks lu->tgt if all of the following conditions are met: -+ * - Login, INQUIRY, and high-level SCSI setup of all of the target's -+ * logical units have been finished (indicated by dont_block == 0). -+ * - lu->generation is stale. -+ * -+ * Note, scsi_block_requests() must be called while holding card->lock, -+ * otherwise it might foil sbp2_[conditionally_]unblock()'s attempt to -+ * unblock the target. -+ */ -+static void sbp2_conditionally_block(struct sbp2_logical_unit *lu) ++ for (; id->match_flags != 0; id++) { + if ((id->match_flags & IEEE1394_MATCH_VENDOR_ID) && + id->vendor_id != ud->vendor_id) + continue; +diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c +index 969de2a..29b8910 100644 +--- a/drivers/ieee1394/ohci1394.c ++++ b/drivers/ieee1394/ohci1394.c +@@ -2993,15 +2993,9 @@ do { \ + return err; \ + } while (0) + +-static int __devinit ohci1394_pci_probe(struct pci_dev *dev, +- const struct pci_device_id *ent) +-{ +- struct hpsb_host *host; +- struct ti_ohci *ohci; /* shortcut to currently handled device */ +- resource_size_t ohci_base; +- + #ifdef CONFIG_PPC_PMAC +- /* Necessary on some machines if ohci1394 was loaded/ unloaded before */ ++static void ohci1394_pmac_on(struct pci_dev *dev) +{ -+ struct sbp2_target *tgt = lu->tgt; -+ struct fw_card *card = fw_device(tgt->unit->device.parent)->card; -+ struct Scsi_Host *shost = -+ container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -+ unsigned long flags; -+ -+ spin_lock_irqsave(&card->lock, flags); -+ if (!tgt->dont_block && !lu->blocked && -+ lu->generation != card->generation) { -+ lu->blocked = true; -+ if (++tgt->blocked == 1) { -+ scsi_block_requests(shost); -+ fw_notify("blocked %s\n", lu->tgt->bus_id); -+ } -+ } -+ spin_unlock_irqrestore(&card->lock, flags); + if (machine_is(powermac)) { + struct device_node *ofn = pci_device_to_OF_node(dev); + +@@ -3010,8 +3004,32 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, + pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); + } + } +} + -+/* -+ * Unblocks lu->tgt as soon as all its logical units can be unblocked. -+ * Note, it is harmless to run scsi_unblock_requests() outside the -+ * card->lock protected section. On the other hand, running it inside -+ * the section might clash with shost->host_lock. -+ */ -+static void sbp2_conditionally_unblock(struct sbp2_logical_unit *lu) ++static void ohci1394_pmac_off(struct pci_dev *dev) +{ -+ struct sbp2_target *tgt = lu->tgt; -+ struct fw_card *card = fw_device(tgt->unit->device.parent)->card; -+ struct Scsi_Host *shost = -+ container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -+ unsigned long flags; -+ bool unblock = false; -+ -+ spin_lock_irqsave(&card->lock, flags); -+ if (lu->blocked && lu->generation == card->generation) { -+ lu->blocked = false; -+ unblock = --tgt->blocked == 0; -+ } -+ spin_unlock_irqrestore(&card->lock, flags); ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(dev); + -+ if (unblock) { -+ scsi_unblock_requests(shost); -+ fw_notify("unblocked %s\n", lu->tgt->bus_id); ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); ++ } + } +} -+ -+/* -+ * Prevents future blocking of tgt and unblocks it. -+ * Note, it is harmless to run scsi_unblock_requests() outside the -+ * card->lock protected section. On the other hand, running it inside -+ * the section might clash with shost->host_lock. -+ */ -+static void sbp2_unblock(struct sbp2_target *tgt) -+{ -+ struct fw_card *card = fw_device(tgt->unit->device.parent)->card; -+ struct Scsi_Host *shost = -+ container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -+ unsigned long flags; -+ -+ spin_lock_irqsave(&card->lock, flags); -+ ++tgt->dont_block; -+ spin_unlock_irqrestore(&card->lock, flags); -+ -+ scsi_unblock_requests(shost); - } - - static void sbp2_release_target(struct kref *kref) -@@ -621,23 +757,24 @@ static void sbp2_release_target(struct kref *kref) - struct sbp2_logical_unit *lu, *next; - struct Scsi_Host *shost = - container_of((void *)tgt, struct Scsi_Host, hostdata[0]); -- struct fw_device *device = fw_device(tgt->unit->device.parent); -+ -+ /* prevent deadlocks */ -+ sbp2_unblock(tgt); - - list_for_each_entry_safe(lu, next, &tgt->lu_list, link) { -- if (lu->sdev) -+ if (lu->sdev) { - scsi_remove_device(lu->sdev); -- -- if (!fw_device_is_shutdown(device)) -- sbp2_send_management_orb(lu, tgt->node_id, -- lu->generation, SBP2_LOGOUT_REQUEST, -- lu->login_id, NULL); -+ scsi_device_put(lu->sdev); -+ } -+ sbp2_send_management_orb(lu, tgt->node_id, lu->generation, -+ SBP2_LOGOUT_REQUEST, lu->login_id, NULL); ++#else ++#define ohci1394_pmac_on(dev) ++#define ohci1394_pmac_off(dev) + #endif /* CONFIG_PPC_PMAC */ - fw_core_remove_address_handler(&lu->address_handler); - list_del(&lu->link); - kfree(lu); - } - scsi_remove_host(shost); -- fw_notify("released %s\n", tgt->unit->device.bus_id); -+ fw_notify("released %s\n", tgt->bus_id); ++static int __devinit ohci1394_pci_probe(struct pci_dev *dev, ++ const struct pci_device_id *ent) ++{ ++ struct hpsb_host *host; ++ struct ti_ohci *ohci; /* shortcut to currently handled device */ ++ resource_size_t ohci_base; ++ ++ ohci1394_pmac_on(dev); + if (pci_enable_device(dev)) + FAIL(-ENXIO, "Failed to enable OHCI hardware"); + pci_set_master(dev); +@@ -3203,16 +3221,16 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, + #undef FAIL + } - put_device(&tgt->unit->device); - scsi_host_put(shost); -@@ -666,33 +803,43 @@ static void sbp2_login(struct work_struct *work) +-static void ohci1394_pci_remove(struct pci_dev *pdev) ++static void ohci1394_pci_remove(struct pci_dev *dev) { - struct sbp2_logical_unit *lu = - container_of(work, struct sbp2_logical_unit, work.work); -- struct Scsi_Host *shost = -- container_of((void *)lu->tgt, struct Scsi_Host, hostdata[0]); -+ struct sbp2_target *tgt = lu->tgt; -+ struct fw_device *device = fw_device(tgt->unit->device.parent); -+ struct Scsi_Host *shost; - struct scsi_device *sdev; - struct scsi_lun eight_bytes_lun; -- struct fw_unit *unit = lu->tgt->unit; -- struct fw_device *device = fw_device(unit->device.parent); - struct sbp2_login_response response; - int generation, node_id, local_node_id; - -+ if (fw_device_is_shutdown(device)) -+ goto out; -+ - generation = device->generation; - smp_rmb(); /* node_id must not be older than generation */ - node_id = device->node_id; - local_node_id = device->card->node_id; - -+ /* If this is a re-login attempt, log out, or we might be rejected. */ -+ if (lu->sdev) -+ sbp2_send_management_orb(lu, device->node_id, generation, -+ SBP2_LOGOUT_REQUEST, lu->login_id, NULL); -+ - if (sbp2_send_management_orb(lu, node_id, generation, - SBP2_LOGIN_REQUEST, lu->lun, &response) < 0) { -- if (lu->retries++ < 5) -+ if (lu->retries++ < 5) { - sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5)); -- else -- fw_error("failed to login to %s LUN %04x\n", -- unit->device.bus_id, lu->lun); -+ } else { -+ fw_error("%s: failed to login to LUN %04x\n", -+ tgt->bus_id, lu->lun); -+ /* Let any waiting I/O fail from now on. */ -+ sbp2_unblock(lu->tgt); -+ } - goto out; + struct ti_ohci *ohci; +- struct device *dev; ++ struct device *device; + +- ohci = pci_get_drvdata(pdev); ++ ohci = pci_get_drvdata(dev); + if (!ohci) + return; + +- dev = get_device(&ohci->host->device); ++ device = get_device(&ohci->host->device); + + switch (ohci->init_state) { + case OHCI_INIT_DONE: +@@ -3246,7 +3264,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) + /* Soft reset before we start - this disables + * interrupts and clears linkEnable and LPS. */ + ohci_soft_reset(ohci); +- free_irq(ohci->dev->irq, ohci); ++ free_irq(dev->irq, ohci); + + case OHCI_INIT_HAVE_TXRX_BUFFERS__MAYBE: + /* The ohci_soft_reset() stops all DMA contexts, so we +@@ -3257,12 +3275,12 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) + free_dma_trm_ctx(&ohci->at_resp_context); + + case OHCI_INIT_HAVE_SELFID_BUFFER: +- pci_free_consistent(ohci->dev, OHCI1394_SI_DMA_BUF_SIZE, ++ pci_free_consistent(dev, OHCI1394_SI_DMA_BUF_SIZE, + ohci->selfid_buf_cpu, + ohci->selfid_buf_bus); + + case OHCI_INIT_HAVE_CONFIG_ROM_BUFFER: +- pci_free_consistent(ohci->dev, OHCI_CONFIG_ROM_LEN, ++ pci_free_consistent(dev, OHCI_CONFIG_ROM_LEN, + ohci->csr_config_rom_cpu, + ohci->csr_config_rom_bus); + +@@ -3270,35 +3288,24 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) + iounmap(ohci->registers); + + case OHCI_INIT_HAVE_MEM_REGION: +- release_mem_region(pci_resource_start(ohci->dev, 0), ++ release_mem_region(pci_resource_start(dev, 0), + OHCI1394_REGISTER_SIZE); + +-#ifdef CONFIG_PPC_PMAC +- /* On UniNorth, power down the cable and turn off the chip clock +- * to save power on laptops */ +- if (machine_is(powermac)) { +- struct device_node* ofn = pci_device_to_OF_node(ohci->dev); +- +- if (ofn) { +- pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); +- pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); +- } +- } +-#endif /* CONFIG_PPC_PMAC */ ++ ohci1394_pmac_off(dev); + + case OHCI_INIT_ALLOC_HOST: +- pci_set_drvdata(ohci->dev, NULL); ++ pci_set_drvdata(dev, NULL); } -- lu->generation = generation; -- lu->tgt->node_id = node_id; -- lu->tgt->address_high = local_node_id << 16; -+ tgt->node_id = node_id; -+ tgt->address_high = local_node_id << 16; -+ sbp2_set_generation(lu, generation); - - /* Get command block agent offset and login id. */ - lu->command_block_agent_address = -@@ -700,8 +847,8 @@ static void sbp2_login(struct work_struct *work) - response.command_block_agent.low; - lu->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response); - -- fw_notify("logged in to %s LUN %04x (%d retries)\n", -- unit->device.bus_id, lu->lun, lu->retries); -+ fw_notify("%s: logged in to LUN %04x (%d retries)\n", -+ tgt->bus_id, lu->lun, lu->retries); - - #if 0 - /* FIXME: The linux1394 sbp2 does this last step. */ -@@ -711,26 +858,62 @@ static void sbp2_login(struct work_struct *work) - PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect); - sbp2_agent_reset(lu); - -+ /* This was a re-login. */ -+ if (lu->sdev) { -+ sbp2_cancel_orbs(lu); -+ sbp2_conditionally_unblock(lu); -+ goto out; -+ } -+ -+ if (lu->tgt->workarounds & SBP2_WORKAROUND_DELAY_INQUIRY) -+ ssleep(SBP2_INQUIRY_DELAY); -+ - memset(&eight_bytes_lun, 0, sizeof(eight_bytes_lun)); - eight_bytes_lun.scsi_lun[0] = (lu->lun >> 8) & 0xff; - eight_bytes_lun.scsi_lun[1] = lu->lun & 0xff; -+ shost = container_of((void *)tgt, struct Scsi_Host, hostdata[0]); - - sdev = __scsi_add_device(shost, 0, 0, - scsilun_to_int(&eight_bytes_lun), lu); -- if (IS_ERR(sdev)) { -- sbp2_send_management_orb(lu, node_id, generation, -- SBP2_LOGOUT_REQUEST, lu->login_id, NULL); -- /* -- * Set this back to sbp2_login so we fall back and -- * retry login on bus reset. -- */ -- PREPARE_DELAYED_WORK(&lu->work, sbp2_login); -- } else { -- lu->sdev = sdev; -+ /* -+ * FIXME: We are unable to perform reconnects while in sbp2_login(). -+ * Therefore __scsi_add_device() will get into trouble if a bus reset -+ * happens in parallel. It will either fail or leave us with an -+ * unusable sdev. As a workaround we check for this and retry the -+ * whole login and SCSI probing. -+ */ -+ -+ /* Reported error during __scsi_add_device() */ -+ if (IS_ERR(sdev)) -+ goto out_logout_login; -+ -+ /* Unreported error during __scsi_add_device() */ -+ smp_rmb(); /* get current card generation */ -+ if (generation != device->card->generation) { -+ scsi_remove_device(sdev); - scsi_device_put(sdev); -+ goto out_logout_login; - } -+ -+ /* No error during __scsi_add_device() */ -+ lu->sdev = sdev; -+ sbp2_allow_block(lu); -+ goto out; -+ -+ out_logout_login: -+ smp_rmb(); /* generation may have changed */ -+ generation = device->generation; -+ smp_rmb(); /* node_id must not be older than generation */ -+ -+ sbp2_send_management_orb(lu, device->node_id, generation, -+ SBP2_LOGOUT_REQUEST, lu->login_id, NULL); -+ /* -+ * If a bus reset happened, sbp2_update will have requeued -+ * lu->work already. Reset the work from reconnect to login. -+ */ -+ PREPARE_DELAYED_WORK(&lu->work, sbp2_login); - out: -- sbp2_target_put(lu->tgt); -+ sbp2_target_put(tgt); +- if (dev) +- put_device(dev); ++ if (device) ++ put_device(device); } - static int sbp2_add_logical_unit(struct sbp2_target *tgt, int lun_entry) -@@ -755,6 +938,8 @@ static int sbp2_add_logical_unit(struct sbp2_target *tgt, int lun_entry) - lu->sdev = NULL; - lu->lun = lun_entry & 0xffff; - lu->retries = 0; -+ lu->blocked = false; -+ ++tgt->dont_block; - INIT_LIST_HEAD(&lu->orb_list); - INIT_DELAYED_WORK(&lu->work, sbp2_login); - -@@ -813,7 +998,7 @@ static int sbp2_scan_unit_dir(struct sbp2_target *tgt, u32 *directory, - if (timeout > tgt->mgt_orb_timeout) - fw_notify("%s: config rom contains %ds " - "management ORB timeout, limiting " -- "to %ds\n", tgt->unit->device.bus_id, -+ "to %ds\n", tgt->bus_id, - timeout / 1000, - tgt->mgt_orb_timeout / 1000); - break; -@@ -836,12 +1021,12 @@ static void sbp2_init_workarounds(struct sbp2_target *tgt, u32 model, - u32 firmware_revision) - { - int i; -- unsigned w = sbp2_param_workarounds; -+ unsigned int w = sbp2_param_workarounds; - - if (w) - fw_notify("Please notify linux1394-devel at lists.sourceforge.net " - "if you need the workarounds parameter for %s\n", -- tgt->unit->device.bus_id); -+ tgt->bus_id); - - if (w & SBP2_WORKAROUND_OVERRIDE) - goto out; -@@ -863,8 +1048,7 @@ static void sbp2_init_workarounds(struct sbp2_target *tgt, u32 model, - if (w) - fw_notify("Workarounds for %s: 0x%x " - "(firmware_revision 0x%06x, model_id 0x%06x)\n", -- tgt->unit->device.bus_id, -- w, firmware_revision, model); -+ tgt->bus_id, w, firmware_revision, model); - tgt->workarounds = w; - } - -@@ -888,6 +1072,7 @@ static int sbp2_probe(struct device *dev) - tgt->unit = unit; - kref_init(&tgt->kref); - INIT_LIST_HEAD(&tgt->lu_list); -+ tgt->bus_id = unit->device.bus_id; - - if (fw_device_enable_phys_dma(device) < 0) - goto fail_shost_put; -@@ -938,10 +1123,13 @@ static void sbp2_reconnect(struct work_struct *work) + #ifdef CONFIG_PM +-static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state) ++static int ohci1394_pci_suspend(struct pci_dev *dev, pm_message_t state) { - struct sbp2_logical_unit *lu = - container_of(work, struct sbp2_logical_unit, work.work); -- struct fw_unit *unit = lu->tgt->unit; -- struct fw_device *device = fw_device(unit->device.parent); -+ struct sbp2_target *tgt = lu->tgt; -+ struct fw_device *device = fw_device(tgt->unit->device.parent); - int generation, node_id, local_node_id; - -+ if (fw_device_is_shutdown(device)) -+ goto out; -+ - generation = device->generation; - smp_rmb(); /* node_id must not be older than generation */ - node_id = device->node_id; -@@ -950,10 +1138,17 @@ static void sbp2_reconnect(struct work_struct *work) - if (sbp2_send_management_orb(lu, node_id, generation, - SBP2_RECONNECT_REQUEST, - lu->login_id, NULL) < 0) { -- if (lu->retries++ >= 5) { -- fw_error("failed to reconnect to %s\n", -- unit->device.bus_id); -- /* Fall back and try to log in again. */ -+ /* -+ * If reconnect was impossible even though we are in the -+ * current generation, fall back and try to log in again. -+ * -+ * We could check for "Function rejected" status, but -+ * looking at the bus generation as simpler and more general. -+ */ -+ smp_rmb(); /* get current card generation */ -+ if (generation == device->card->generation || -+ lu->retries++ >= 5) { -+ fw_error("%s: failed to reconnect\n", tgt->bus_id); - lu->retries = 0; - PREPARE_DELAYED_WORK(&lu->work, sbp2_login); - } -@@ -961,17 +1156,18 @@ static void sbp2_reconnect(struct work_struct *work) - goto out; + int err; +- struct ti_ohci *ohci = pci_get_drvdata(pdev); ++ struct ti_ohci *ohci = pci_get_drvdata(dev); + + if (!ohci) { + printk(KERN_ERR "%s: tried to suspend nonexisting host\n", +@@ -3326,32 +3333,23 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state) + ohci_devctl(ohci->host, RESET_BUS, LONG_RESET_NO_FORCE_ROOT); + ohci_soft_reset(ohci); + +- err = pci_save_state(pdev); ++ err = pci_save_state(dev); + if (err) { + PRINT(KERN_ERR, "pci_save_state failed with %d", err); + return err; } +- err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); ++ err = pci_set_power_state(dev, pci_choose_state(dev, state)); + if (err) + DBGMSG("pci_set_power_state failed with %d", err); +- +-/* PowerMac suspend code comes last */ +-#ifdef CONFIG_PPC_PMAC +- if (machine_is(powermac)) { +- struct device_node *ofn = pci_device_to_OF_node(pdev); +- +- if (ofn) +- pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); +- } +-#endif /* CONFIG_PPC_PMAC */ ++ ohci1394_pmac_off(dev); -- lu->generation = generation; -- lu->tgt->node_id = node_id; -- lu->tgt->address_high = local_node_id << 16; -+ tgt->node_id = node_id; -+ tgt->address_high = local_node_id << 16; -+ sbp2_set_generation(lu, generation); - -- fw_notify("reconnected to %s LUN %04x (%d retries)\n", -- unit->device.bus_id, lu->lun, lu->retries); -+ fw_notify("%s: reconnected to LUN %04x (%d retries)\n", -+ tgt->bus_id, lu->lun, lu->retries); - - sbp2_agent_reset(lu); - sbp2_cancel_orbs(lu); -+ sbp2_conditionally_unblock(lu); - out: -- sbp2_target_put(lu->tgt); -+ sbp2_target_put(tgt); + return 0; } - static void sbp2_update(struct fw_unit *unit) -@@ -986,6 +1182,7 @@ static void sbp2_update(struct fw_unit *unit) - * Iteration over tgt->lu_list is therefore safe here. - */ - list_for_each_entry(lu, &tgt->lu_list, link) { -+ sbp2_conditionally_block(lu); - lu->retries = 0; - sbp2_queue_work(lu, 0); - } -@@ -1063,7 +1260,7 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status) - - if (status != NULL) { - if (STATUS_GET_DEAD(*status)) -- sbp2_agent_reset(orb->lu); -+ sbp2_agent_reset_no_wait(orb->lu); - - switch (STATUS_GET_RESPONSE(*status)) { - case SBP2_STATUS_REQUEST_COMPLETE: -@@ -1089,6 +1286,7 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status) - * or when sending the write (less likely). - */ - result = DID_BUS_BUSY << 16; -+ sbp2_conditionally_block(orb->lu); - } - - dma_unmap_single(device->card->device, orb->base.request_bus, -@@ -1197,7 +1395,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done) - struct sbp2_logical_unit *lu = cmd->device->hostdata; - struct fw_device *device = fw_device(lu->tgt->unit->device.parent); - struct sbp2_command_orb *orb; -- unsigned max_payload; -+ unsigned int max_payload; - int retval = SCSI_MLQUEUE_HOST_BUSY; - - /* -@@ -1275,6 +1473,10 @@ static int sbp2_scsi_slave_alloc(struct scsi_device *sdev) +-static int ohci1394_pci_resume(struct pci_dev *pdev) ++static int ohci1394_pci_resume(struct pci_dev *dev) { - struct sbp2_logical_unit *lu = sdev->hostdata; - -+ /* (Re-)Adding logical units via the SCSI stack is not supported. */ -+ if (!lu) -+ return -ENOSYS; -+ - sdev->allow_restart = 1; - - /* -@@ -1319,7 +1521,7 @@ static int sbp2_scsi_abort(struct scsi_cmnd *cmd) - { - struct sbp2_logical_unit *lu = cmd->device->hostdata; + int err; +- struct ti_ohci *ohci = pci_get_drvdata(pdev); ++ struct ti_ohci *ohci = pci_get_drvdata(dev); + + if (!ohci) { + printk(KERN_ERR "%s: tried to resume nonexisting host\n", +@@ -3360,19 +3358,10 @@ static int ohci1394_pci_resume(struct pci_dev *pdev) + } + DBGMSG("resume called"); -- fw_notify("sbp2_scsi_abort\n"); -+ fw_notify("%s: sbp2_scsi_abort\n", lu->tgt->bus_id); - sbp2_agent_reset(lu); - sbp2_cancel_orbs(lu); +-/* PowerMac resume code comes first */ +-#ifdef CONFIG_PPC_PMAC +- if (machine_is(powermac)) { +- struct device_node *ofn = pci_device_to_OF_node(pdev); +- +- if (ofn) +- pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); +- } +-#endif /* CONFIG_PPC_PMAC */ +- +- pci_set_power_state(pdev, PCI_D0); +- pci_restore_state(pdev); +- err = pci_enable_device(pdev); ++ ohci1394_pmac_on(dev); ++ pci_set_power_state(dev, PCI_D0); ++ pci_restore_state(dev); ++ err = pci_enable_device(dev); + if (err) { + PRINT(KERN_ERR, "pci_enable_device failed with %d", err); + return err; +diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c +index 37e7e10..3634785 100644 +--- a/drivers/ieee1394/raw1394.c ++++ b/drivers/ieee1394/raw1394.c +@@ -2959,7 +2959,6 @@ MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); + + static struct hpsb_protocol_driver raw1394_driver = { + .name = "raw1394", +- .id_table = raw1394_id_table, + }; + /******************************************************************************/ diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c -index 28e155a..29e6663 100644 +index 9e2b196..29e6663 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c -@@ -183,6 +183,9 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device " - * Avoids access beyond actual disk limits on devices with an off-by-one bug. - * Don't use this with devices which don't have this bug. - * -+ * - delay inquiry -+ * Wait extra SBP2_INQUIRY_DELAY seconds after login before SCSI inquiry. -+ * - * - override internal blacklist - * Instead of adding to the built-in blacklist, use only the workarounds - * specified in the module load parameter. -@@ -195,6 +198,7 @@ MODULE_PARM_DESC(workarounds, "Work around device bugs (default = 0" - ", 36 byte inquiry = " __stringify(SBP2_WORKAROUND_INQUIRY_36) - ", skip mode page 8 = " __stringify(SBP2_WORKAROUND_MODE_SENSE_8) - ", fix capacity = " __stringify(SBP2_WORKAROUND_FIX_CAPACITY) -+ ", delay inquiry = " __stringify(SBP2_WORKAROUND_DELAY_INQUIRY) - ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE) - ", or a combination)"); - -@@ -357,6 +361,11 @@ static const struct { - .workarounds = SBP2_WORKAROUND_INQUIRY_36 | - SBP2_WORKAROUND_MODE_SENSE_8, - }, -+ /* DViCO Momobay FX-3A with TSB42AA9A bridge */ { -+ .firmware_revision = 0x002800, -+ .model_id = 0x000000, -+ .workarounds = SBP2_WORKAROUND_DELAY_INQUIRY, -+ }, - /* Initio bridges, actually only needed for some older ones */ { - .firmware_revision = 0x000200, - .model_id = SBP2_ROM_VALUE_WILDCARD, -@@ -914,6 +923,9 @@ static int sbp2_start_device(struct sbp2_lu *lu) - sbp2_agent_reset(lu, 1); - sbp2_max_speed_and_size(lu); - -+ if (lu->workarounds & SBP2_WORKAROUND_DELAY_INQUIRY) -+ ssleep(SBP2_INQUIRY_DELAY); -+ - error = scsi_add_device(lu->shost, 0, lu->ud->id, 0); - if (error) { - SBP2_ERR("scsi_add_device failed"); -@@ -1962,14 +1974,14 @@ static int sbp2scsi_slave_alloc(struct scsi_device *sdev) - { - struct sbp2_lu *lu = (struct sbp2_lu *)sdev->host->hostdata[0]; - -+ if (sdev->lun != 0 || sdev->id != lu->ud->id || sdev->channel != 0) -+ return -ENODEV; -+ +@@ -1980,11 +1980,8 @@ static int sbp2scsi_slave_alloc(struct scsi_device *sdev) lu->sdev = sdev; sdev->allow_restart = 1; @@ -913,16 +1110,38 @@ if (lu->workarounds & SBP2_WORKAROUND_INQUIRY_36) sdev->inquiry_len = 36; -diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h -index d2ecb0d..80d8e09 100644 ---- a/drivers/ieee1394/sbp2.h -+++ b/drivers/ieee1394/sbp2.h -@@ -343,6 +343,8 @@ enum sbp2lu_state_types { - #define SBP2_WORKAROUND_INQUIRY_36 0x2 - #define SBP2_WORKAROUND_MODE_SENSE_8 0x4 - #define SBP2_WORKAROUND_FIX_CAPACITY 0x8 -+#define SBP2_WORKAROUND_DELAY_INQUIRY 0x10 -+#define SBP2_INQUIRY_DELAY 12 - #define SBP2_WORKAROUND_OVERRIDE 0x100 +diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c +index bd28adf..cc240b2 100644 +--- a/drivers/ieee1394/video1394.c ++++ b/drivers/ieee1394/video1394.c +@@ -1315,8 +1315,7 @@ static struct ieee1394_device_id video1394_id_table[] = { + MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); + + static struct hpsb_protocol_driver video1394_driver = { +- .name = VIDEO1394_DRIVER_NAME, +- .id_table = video1394_id_table, ++ .name = VIDEO1394_DRIVER_NAME, + }; + - #endif /* SBP2_H */ +diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug +index 0796c1a..4e370e1 100644 +--- a/lib/Kconfig.debug ++++ b/lib/Kconfig.debug +@@ -592,6 +592,16 @@ config LATENCYTOP + Enable this option if you want to use the LatencyTOP tool + to find out which userspace is blocking on what kernel operations. + ++config FIREWIRE_OHCI_REMOTE_DMA ++ bool "Remote debugging via firewire-ohci" ++ depends on FIREWIRE_OHCI ++ help ++ This option lets you use the FireWire bus for remote debugging. ++ It enables unfiltered remote DMA in the firewire-ohci driver. ++ See Documentation/debugging-via-ohci1394.txt for more information. ++ ++ If unsure, say N. ++ + config PROVIDE_OHCI1394_DMA_INIT + bool "Provide code for enabling DMA over FireWire early on boot" + depends on PCI && X86 linux-2.6-silence-noise.patch: Index: linux-2.6-silence-noise.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-silence-noise.patch,v retrieving revision 1.3.8.2 retrieving revision 1.3.8.3 diff -u -r1.3.8.2 -r1.3.8.3 --- linux-2.6-silence-noise.patch 29 Feb 2008 18:58:23 -0000 1.3.8.2 +++ linux-2.6-silence-noise.patch 5 Mar 2008 18:41:17 -0000 1.3.8.3 @@ -78,19 +78,24 @@ pci_restore_msi_state(dev); ---- linux-2.6.22.noarch/drivers/base/power/main.c~ 2007-07-13 15:44:37.000000000 -0400 -+++ linux-2.6.22.noarch/drivers/base/power/main.c 2007-07-13 15:44:44.000000000 -0400 -@@ -37,6 +37,3 @@ int device_pm_add(struct device *dev) +diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c +index d887d5c..80be564 100644 +--- a/drivers/base/power/main.c ++++ b/drivers/base/power/main.c +@@ -64,9 +64,6 @@ int (*platform_enable_wakeup)(struct device *dev, int is_on); + */ + void device_pm_add(struct device *dev) { - pr_debug("PM: Adding info for %s:%s\n", - dev->bus ? dev->bus->name : "No Bus", - kobject_name(&dev->kobj)); mutex_lock(&dpm_list_mtx); list_add_tail(&dev->power.entry, &dpm_active); -@@ -51,9 +48,6 @@ int device_pm_add(struct device *dev) - down(&dev->sem); - } - } + mutex_unlock(&dpm_list_mtx); +@@ -80,9 +77,6 @@ void device_pm_add(struct device *dev) + */ + void device_pm_remove(struct device *dev) + { - pr_debug("PM: Removing info for %s:%s\n", - dev->bus ? dev->bus->name : "No Bus", - kobject_name(&dev->kobj)); linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1.2.2 -r 1.1.2.3 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-wireless-pending.patch,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- linux-2.6-wireless-pending.patch 29 Feb 2008 18:58:23 -0000 1.1.2.2 +++ linux-2.6-wireless-pending.patch 5 Mar 2008 18:41:17 -0000 1.1.2.3 @@ -1,3 +1,260 @@ +commit e4861829072c61883114c64a3af61f305a789ff0 +Author: Johannes Berg +Date: Wed Feb 27 13:39:00 2008 +0100 + + mac80211: fix key replacing, hw accel + + Even though I thought about it a lot and had also tested it, some + of my recent changes in the key code broke replacing keys, making + the kernel oops because a key is removed from a list while not on + it. + + This patch fixes that using the list as an indication whether or + not the key is on it (an empty list means it's not on any list.) + + Also, this patch fixes hw accel enabling, the check for not doing + hw accel when the interface is down was lost and is restored by + this. + + Additionally, move adding the key to the list into the function + __ieee80211_key_replace() for more consistency. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit db4d1169d0b893bfb7923b6526748fe2c5a7373f +Author: Johannes Berg +Date: Mon Feb 25 16:27:45 2008 +0100 + + mac80211: split ieee80211_key_alloc/free + + In order to RCU-ify sta_info, we need to be able to allocate + a key without linking it to an sdata/sta structure (because + allocation cannot be done in an rcu critical section). This + patch splits up ieee80211_key_alloc() and updates all users + appropriately. + + While at it, this patch fixes a number of race conditions + such as finally making key replacement atomic, unfortunately + at the expense of more complex code. + + Note that this patch documents /existing/ bugs with sta info + and key interaction, there is currently a race condition + when a sta info is freed without holding the RTNL. This will + finally be fixed by a followup patch. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 6f48422a29714ed92f6136d9e7d3ff39c75607d7 +Author: Johannes Berg +Date: Mon Feb 25 16:27:44 2008 +0100 + + mac80211: remove STA infos last_ack stuff + + These things aren't used and the only possible use is within + rate control algorithms, however those can, if they need it, + keep track of it in their private data. last_ack_ms isn't + even updated so completely useless. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit e6a5ddf20886206caf1c4a2431f6ff01198ab0f7 +Author: Johannes Berg +Date: Mon Feb 25 16:27:42 2008 +0100 + + mac80211: safely free beacon in ieee80211_if_reinit + + If ieee80211_if_reinit() is called from ieee80211_unregister_hw() + then it is possible that the driver will still request a beacon + (it is allowed to until ieee80211_unregister_hw() has returned.) + This means we need to use an RCU-protected write to the beacon + information even in this function. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 2485f7105f20f85c2dbebc67be6b2cb97175fa7e +Author: Johannes Berg +Date: Mon Feb 25 16:27:41 2008 +0100 + + mac80211: clarify use of TX status/RX callbacks + + This patch clarifies the use of the irqsafe vs. non-irq-safe + functions and their respective locking requirements. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 38c07b430b50172b803fe4c7f76cba580ba9931f +Author: Pavel Roskin +Date: Tue Feb 26 17:59:14 2008 -0500 + + ath5k: fix all endian issues reported by sparse + + Changes-licensed-under: ISC + Signed-off-by: Pavel Roskin + Acked-by: Luis R. Rodriguez + Acked-by: Nick Kossifidis + Signed-off-by: John W. Linville + +commit e6084239d39a10bac1186611fe7c523cea92c9ec +Author: Ivo van Doorn +Date: Mon Feb 25 23:22:13 2008 +0100 + + rt2x00: Release rt2x00 2.1.3 + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 1497074ad79009f8fb465d795f9e0d2a428b7fa2 +Author: Ivo van Doorn +Date: Mon Feb 25 23:20:33 2008 +0100 + + rt2x00: Check for 5GHz band in link tuner + + Fix a typo in the link tuner where accidently the + 2GHz band was checked instead of the 5GHz band. + This forced the link tuner to work in an invalid + range for the currently active band. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 58e307398317ab55470547a7d72859c89edd187d +Author: Florian Fainelli +Date: Mon Feb 25 17:51:53 2008 +0100 + + p54: print unknown eeprom fields + + This patch allows p54common to print the + uknown EEPROM fields, which can help + when debugging/testing devices. + + Signed-off-by: Florian Fainelli + Signed-off-by: John W. Linville + +commit 9a89c839f79395426b84cf6da9d56773402b4c0e +Author: Johannes Berg +Date: Mon Feb 25 11:12:18 2008 +0100 + + adm8211: fix cfg80211 band API conversion + + Insert a missing band assignment. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 8f300ae5b819f7655197925cdb1954edfd906a87 +Author: Michael Buesch +Date: Sun Feb 24 14:42:29 2008 +0100 + + b43legacy: Fix nondebug build + + Fix a typo. + + Signed-off-by: Michael Buesch + Acked-by: Stefano Brivio + Signed-off-by: John W. Linville + +commit 28de57d1a9eb7e67badb731297197fcbef0cc19e +Author: Aurelien Jarno +Date: Fri Feb 22 16:14:58 2008 +0100 + + ssb: Add CHIPCO IRQ access functions + + This patch adds functions to setup and read the CHIPCO IRQ. + + Signed-off-by: Aurelien Jarno + Signed-off-by: Michael Buesch + Signed-off-by: John W. Linville + +commit fba4a1e63723b5ef16c21a90f06520ae37c5da98 +Author: Johannes Berg +Date: Thu Feb 21 11:08:33 2008 +0100 + + mac80211: fix IBSS code + + This patch fixes two errors introduced by + + commit 19d35612f3cd7f60dd9174c0100584e21f5a1025 + Author: Bruno Randolf + Date: Mon Feb 18 11:21:36 2008 +0900 + + mac80211: enable IBSS merging + + The first error is an endianness problem that sparse found and + the second is a build failure when CONFIG_MAC80211_IBSS_DEBUG + is not set. + + Signed-off-by: Johannes Berg [...5319 lines suppressed...] * its 14 bytes. Note we use the control rate and not the -@@ -533,7 +532,7 @@ static inline void ath5k_hw_write_rate_d + * actual rate for this rate. See mac80211 tx.c * ieee80211_duration() for a brief description of * what rate we should choose to TX ACKs. */ - tx_time = ieee80211_generic_frame_duration(sc->hw, +- tx_time = ieee80211_generic_frame_duration(sc->hw, - sc->vif, 10, control_rate->rate_kbps/100); -+ sc->vif, 10, &srate); ++ tx_time = le16_to_cpu(ieee80211_generic_frame_duration(sc->hw, ++ sc->vif, 10, &srate)); ath5k_hw_reg_write(ah, tx_time, reg); @@ -32056,8 +33353,8 @@ /****************\ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/initvals.c 2008-03-04 19:35:36.000000000 -0500 @@ -1317,8 +1317,10 @@ int ath5k_hw_write_initvals(struct ath5k /* For AR5211 */ } else if (ah->ah_version == AR5K_AR5211) { @@ -32072,8 +33369,8 @@ } diff -up /dev/null linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig ---- /dev/null 2008-02-21 08:21:48.545426467 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig 2008-02-21 14:02:20.000000000 -0500 +--- /dev/null 2008-03-04 08:34:47.546307750 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/Kconfig 2008-03-04 19:35:36.000000000 -0500 @@ -0,0 +1,37 @@ +config ATH5K + tristate "Atheros 5xxx wireless cards support" @@ -32113,8 +33410,8 @@ + modprobe ath5k debug=0x00000400 + diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.c 2008-03-04 19:35:36.000000000 -0500 @@ -80,7 +80,7 @@ MODULE_AUTHOR("Nick Kossifidis"); MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards."); MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards"); @@ -32641,6 +33938,30 @@ if (ret) goto err_unmap; +@@ -1660,11 +1717,11 @@ ath5k_check_ibss_hw_merge(struct ath5k_s + u32 hw_tu; + struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data; + +- if ((mgmt->frame_control & IEEE80211_FCTL_FTYPE) == ++ if ((le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_FTYPE) == + IEEE80211_FTYPE_MGMT && +- (mgmt->frame_control & IEEE80211_FCTL_STYPE) == ++ (le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE) == + IEEE80211_STYPE_BEACON && +- mgmt->u.beacon.capab_info & WLAN_CAPABILITY_IBSS && ++ le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS && + memcmp(mgmt->bssid, sc->ah->ah_bssid, ETH_ALEN) == 0) { + /* + * Received an IBSS beacon with the same BSSID. Hardware might +@@ -1673,7 +1730,7 @@ ath5k_check_ibss_hw_merge(struct ath5k_s + hw_tu = TSF_TO_TU(ath5k_hw_get_tsf64(sc->ah)); + if (hw_tu >= sc->nexttbtt) { + ath5k_beacon_update_timers(sc, +- mgmt->u.beacon.timestamp); ++ le64_to_cpu(mgmt->u.beacon.timestamp)); + ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, + "detected HW merge from received beacon\n"); + } @@ -1791,9 +1848,8 @@ accept: rxs.mactime = ath5k_extend_tsf(sc->ah, ds->ds_rxstat.rs_tstamp); rxs.flag |= RX_FLAG_TSFT; @@ -32760,8 +34081,8 @@ case ALG_CCMP: return -EOPNOTSUPP; diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/debug.c 2008-03-04 19:35:36.000000000 -0500 @@ -65,7 +65,7 @@ static unsigned int ath5k_debug; module_param_named(debug, ath5k_debug, uint, 0); @@ -32851,8 +34172,8 @@ -#endif /* if ATH5K_DEBUG */ +#endif /* ifdef CONFIG_ATH5K_DEBUG */ diff -up linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h ---- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/ath5k/base.h 2008-03-04 19:35:36.000000000 -0500 @@ -83,7 +83,7 @@ struct ath5k_txq { #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) @@ -32898,8 +34219,8 @@ #define ath5k_hw_hasbssidmask(_ah) \ diff -up linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c ---- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-02-21 14:02:20.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rtl8180_max2820.c 2008-03-04 19:35:36.000000000 -0500 @@ -78,8 +78,9 @@ static void max2820_rf_set_channel(struc struct ieee80211_conf *conf) { @@ -32913,8 +34234,8 @@ /* While philips SA2400 drive the PA bias from diff -up linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.24.noarch/drivers/net/wireless/adm8211.c ---- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-02-21 14:01:26.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/adm8211.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/adm8211.c 2008-03-04 19:35:36.000000000 -0500 @@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_ { 0 } }; @@ -33066,25 +34387,26 @@ dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */ priv->retry_limit = 3; -@@ -1917,14 +1930,7 @@ static int __devinit adm8211_probe(struc +@@ -1917,14 +1930,9 @@ static int __devinit adm8211_probe(struc goto err_free_desc; } - priv->channel = priv->modes[0].channels[0].chan; -- ++ priv->channel = 1; + - err = ieee80211_register_hwmode(dev, &priv->modes[0]); - if (err) { - printk(KERN_ERR "%s (adm8211): Can't register hwmode\n", - pci_name(pdev)); - goto err_free_desc; - } -+ priv->channel = 1; ++ dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band; err = ieee80211_register_hw(dev); if (err) { diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c ---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-02-21 13:44:10.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-04 19:35:36.000000000 -0500 @@ -172,6 +172,22 @@ static int select_core_and_segment(struc return 0; } @@ -33141,8 +34463,8 @@ .write32 = ssb_pcmcia_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c ---- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-02-21 14:00:25.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-04 19:35:36.000000000 -0500 @@ -505,6 +505,14 @@ error: return err; } @@ -33185,8 +34507,8 @@ .write32 = ssb_ssb_write32, }; diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c ---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-02-21 13:44:10.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-02-21 14:05:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-04 19:35:36.000000000 -0500 @@ -572,6 +572,19 @@ static inline int ssb_pci_assert_buspowe } #endif /* DEBUG */ @@ -33238,3 +34560,23 @@ .write16 = ssb_pci_write16, .write32 = ssb_pci_write32, }; +diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c +--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-04 19:35:36.000000000 -0500 +@@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc + chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks); + } + ++void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value) ++{ ++ chipco_write32_masked(cc, SSB_CHIPCO_IRQMASK, mask, value); ++} ++ ++u32 ssb_chipco_irq_status(struct ssb_chipcommon *cc, u32 mask) ++{ ++ return chipco_read32(cc, SSB_CHIPCO_IRQSTAT) & mask; ++} ++ + u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask) + { + return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask; linux-2.6-wireless.patch: Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-wireless.patch,v retrieving revision 1.2.8.2 retrieving revision 1.2.8.3 diff -u -r1.2.8.2 -r1.2.8.3 --- linux-2.6-wireless.patch 29 Feb 2008 18:58:23 -0000 1.2.8.2 +++ linux-2.6-wireless.patch 5 Mar 2008 18:41:17 -0000 1.2.8.3 @@ -1,706 +1,391 @@ -commit c2893054cc823e05c723114378244c8caba084c0 -Author: Alexey Zaytsev -Date: Sat Feb 23 13:33:07 2008 +0300 - - Don't build bcm43xx if SSB is static and b43 PCI-SSB bridge is enabled. - - This may happen e.g. when the ssb is statically enables by the b44 driver, - and the b43 pci-ssb bridge is enbled by the b43/b43legacy drivers, or the - b43/b43legacy drivers are built statically. - - Signed-off-by: Alexey Zaytsev - Acked-by: Larry Finger - Signed-off-by: John W. Linville - -commit 82928757f3e9451c1ae520f46d327d6110a4eec1 -Author: Alexey Zaytsev -Date: Sat Feb 23 12:59:26 2008 +0300 +commit c256e05b7b30fab484deacb4f8cff59ce649c75e +Author: Michael Buesch +Date: Tue Mar 4 20:31:13 2008 +0100 - Use a separate config option for the b43 pci to ssb bridge. + b43legacy: Fix module init message - The bridge code was unnecessary enabled by the b44 - driver, but it prevents the bcm43xx driver from - being loaded, as the bridge claims the same pci ids. + This fixes the module init message to tell that the legacy + driver loaded. This makes it less confusing, in case both drivers are loaded. - Now we enable the birdge only if the b43{legacy} - drivers are selected. - - Signed-off-by: Alexey Zaytsev - Acked-by: Larry Finger + Signed-off-by: Michael Buesch Signed-off-by: John W. Linville -commit e668b6729ca1c7f88c7ea1789fb0ed4503c384ce -Author: Roland Dreier -Date: Tue Feb 26 15:26:56 2008 +0100 +commit cdb2a9fe63575dd1eb82b724bbd0aa5e0dd89fa0 +Author: Jussi Kivilinna +Date: Tue Mar 4 20:05:27 2008 +0200 - libertas: Remove unused exports - - The libertas driver exports a number of symbols with no in-tree users; - remove these unused exports. lbs_reset_device() is completely unused, with - no callers at all, so remove the function completely. + rndis_wlan: fix broken data copy - A couple of these unused exported symbols are static, which causes the - following build error on ia64 with gcc 4.2.3: + Replace broken code that attempted to copy 6 byte array to 64-bit + integer. Due to missing cast to 64-bit integer, left shift operation + were 32-bit and lead to bytes been copied over each other. New code + uses simple memcpy, for greater readability and efficiency. - drivers/net/wireless/libertas/main.c:1375: error: __ksymtab_lbs_remove_mesh causes a section type conflict - drivers/net/wireless/libertas/main.c:1354: error: __ksymtab_lbs_add_mesh causes a section type conflict - - Signed-off-by: Roland Dreier - Acked-by: Holger Schurig - Acked-by: Dan Williams + Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville -commit 7e0a589e4de9278215da894ba8e41ba0943e7aca -Author: Johannes Berg -Date: Tue Feb 26 00:39:28 2008 +0100 +commit 8a96df80b3ddb2410045a26ea19eeccb5f2d2d11 +Author: Sebastian Siewior +Date: Tue Mar 4 18:22:27 2008 +0100 - mac80211: fix kmalloc vs. net_ratelimit + libertas: compare the current command with response - The "goto end;" part definitely must not be rate limited. + instead of with itself. - Signed-off-by: Johannes Berg + Signed-off-by: Sebastian Siewior Signed-off-by: John W. Linville -commit 702ebfa36437c98a60ea21ac2a18b159e6aa16c6 -Author: Ivo van Doorn -Date: Mon Feb 25 23:15:13 2008 +0100 +commit 6305f498604df6c66bdb4cc533ce6332fa5ab61f +Author: David Woodhouse +Date: Mon Mar 3 12:20:12 2008 +0100 - rt2x00: Fix rt2x00lib_reset_link_tuner() - - rt2x00lib_reset_link_tuner() can be called from within - the link tuner itself. This means that it should - _not_ call rt2x00lib_stop_link_tuner() since that will - cause the thread to hang. + libertas: fix sanity check on sequence number in command response - Reorder the things that should be done during a - link tuner reset and during a link tuner start. + Slightly more useful if we compare it against the sequence number of the + command we have outstanding, rather than comparing the reply with itself. - Also make antenna tuning the last step of the link - tuner since it could possibly reset some statistical - information which we need for average calculation. + Doh. Pointed out by Sebastian Siewior - Signed-off-by: Ivo van Doorn + Signed-off-by: David Woodhouse + Acked-by: Dan Williams Signed-off-by: John W. Linville -commit 4460423f7cd0e1c5c0cf92e6159f151ba16e518f -Author: Ivo van Doorn -Date: Mon Feb 25 23:15:08 2008 +0100 +commit c2f2d3a06f8b628d444cf4f396d6c6ddd47e1d1f +Author: Johannes Berg +Date: Fri Feb 29 23:28:25 2008 +0100 - rt2x00: Don't switch to antenna with low rssi - - When rssi_a > rssi_b is true and the current antenna - was already antenna A, then rt2x00 incorrectly jumped - to antenna B. + p54: fix eeprom parser length sanity checks - Also don't configure the antenna when there has been - no change in the antenna setup. - - Signed-off-by: Ivo van Doorn - Signed-off-by: John W. Linville - -commit 50cbbe9cf17c52588a6b709273547c93b7c3d329 -Author: Ivo van Doorn -Date: Mon Feb 25 23:15:05 2008 +0100 - - rt2x00: Add link tuner safe RX toggle states - - This adds 2 new states which both are used to toggle - the RX. These new states are required for usage - inside the link tuner thread, because the normal - RX toggling will stop the link tuner thread. - While it is possible that the link tuner thread itself - is the caller of the RX toggle (when using software - antenna diversity). + When I called p54_parse_eeprom() on a hand-coded structure + I managed to make a small mistake with wrap->len which caused + a segfault a few lines down when trying to read entry->len. + This patch changes the validation code to avoid such problems. - Signed-off-by: Ivo van Doorn + Signed-off-by: Johannes Berg + Tested-by: Florian Fainelli Signed-off-by: John W. Linville -commit b268ed34199317e1c627106f1bc60317f2d5c44c -Author: Ivo van Doorn -Date: Mon Feb 25 23:15:01 2008 +0100 +commit 8c28293f5514f64ba064bac7946aebeda4a663c6 +Author: Johannes Berg +Date: Fri Feb 29 13:56:33 2008 +0100 - rt2x00: Fix antenna diversity - - Fix 2 issues in antenna diversity selection. - - 1) the following statement will always return true. - if ((rssi_curr - rssi_old) > -5 || (rssi_curr - rssi_old) < 5) - It is cleaner to check if the absolute value is smaller then 5. + p54: fix EEPROM structure endianness - 2) Only enable software diversity when default antenna setup - indicates support for it. Don't select it when the hardware - does not indicate support for it... + Since the EEPROM structure is read from hardware, it is + always little endian, annotate that in the struct and + make sure to convert where applicable. - Signed-off-by: Ivo van Doorn - Signed-off-by: John W. Linville - -commit 57b7ed05c7e68e1b14cc7da232cba2967fb670a7 -Author: Sebastian Siewior -Date: Sat Feb 23 21:46:31 2008 +0100 - - gelic wireless driver needs WIRELESS_EXT support - - | CC drivers/net/ps3_gelic_wireless.o - | /home/bigeasy/git/linux-2.6/drivers/net/ps3_gelic_wireless.c: In function 'gelic_wl_setup_netdev_ops': - | /home/bigeasy/git/linux-2.6/drivers/net/ps3_gelic_wireless.c:2660: error: 'struct net_device' has no member named 'wireless_data' - | /home/bigeasy/git/linux-2.6/drivers/net/ps3_gelic_wireless.c:2661: error: 'struct net_device' has no member named 'wireless_handlers' - | make[3]: *** [drivers/net/ps3_gelic_wireless.o] Error 1 - | make[2]: *** [drivers/net] Error 2 - | make[1]: *** [drivers] Error 2 - | make[1]: *** Waiting for unfinished jobs.... - | make: *** [sub-make] Error 2 - - Signed-off-by: Sebastian Siewior - Acked-by: Masakazu Mokuno + Signed-off-by: Johannes Berg + Cc: Michael Wu + Tested-by: Florian Fainelli Signed-off-by: John W. Linville -commit 3da83bba86f2aef628919469db5707db6a785868 -Author: Masakazu Mokuno -Date: Fri Feb 22 16:45:26 2008 +0900 +commit dc63644b0ee3b447e879ef8e124657b40e9ea81c +Author: Yoichi Yuasa +Date: Fri Feb 29 11:09:31 2008 +0100 - PS3: gelic: Link the wireless net_device structure to the corresponding device structure - - Link the net_device structure of the wireless part to the - corresponding device structure. + ssb: Add pcibios_enable_device() return value check - Without this, the sysfs node for this net_device would not have - 'device' link. + This patch has added pcibios_enable_device() return value check. - Signed-off-by: Masakazu Mokuno - Acked-by: Dan Williams + Signed-off-by: Yoichi Yuasa + Signed-off-by: Michael Buesch Signed-off-by: John W. Linville -commit 04d0a24457e249388ec3ee32b345617d1bc6ebf2 -Author: Johannes Berg -Date: Wed Feb 20 11:47:45 2008 +0100 +commit 1d60ab0574fae362b1cca0ef52181ef75fd46832 +Author: Stefano Brivio +Date: Sun Mar 2 11:33:10 2008 +0100 - rndis_wlan: fix sparse warnings + rc80211-pid: fix rate adjustment - It is obviously wrong to use an enum in a little endian struct, - and those other enums should be declared differently. + Merge rate_control_pid_shift_adjust() to rate_control_pid_adjust_rate() + in order to make the learning algorithm aware of constraints on rates. Also + add some comments and rename variables. - Signed-off-by: Johannes Berg - Acked-by: Jussi Kivilinna - Signed-off-by: John W. Linville - -commit 7672b302058148f0e9a4a2be36c851510ff9cb88 -Author: Gordon Farquharson -Date: Sat Feb 23 03:14:23 2008 -0700 - - Fix b43 driver build for arm - - Align the members of the SSB device structure to a 32 bit boundary so - that the b43 driver can be built for arm using a cross compiler. This - alignment is required so that the test in scripts/mod/file2alias.c - that checks that the size of the device ID type against the size of - the section in the object file succeeds (see comment and - http://lkml.org/lkml/2008/2/18/481 for explanation). + This fixes a bug which prevented 802.11b/g non-AP STAs from working with + 802.11b only AP STAs. - Signed-off-by: Gordon Farquharson - Acked-by: Michael Buesch + This patch was originally destined for 2.6.26, and is being backported + to fix a user reported problem in post-2.6.24 kernels. + + Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville -diff -up linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig linux-2.6.24.noarch/include/linux/mod_devicetable.h ---- linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig 2008-02-27 20:46:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/mod_devicetable.h 2008-02-27 20:47:51.000000000 -0500 -@@ -351,7 +351,13 @@ struct sdio_device_id { - struct ssb_device_id { - __u16 vendor; - __u16 coreid; -- __u8 revision; -+ /* Explicit padding to support a broken sanity check in file2alias.c. -+ * The check compares the size of the structure in the kernel -+ * object file to the size of the structure reported in userspace for -+ * the system on which the kernel is compiled. The check breaks on -+ * cross-compilation, and the padding is a workaround for this. */ -+ __u8 revision -+ __attribute__((aligned(sizeof(__u32)))); - }; - #define SSB_DEVICE(_vendor, _coreid, _revision) \ - { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } -diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c ---- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-02-27 20:46:37.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1116,9 +1116,10 @@ static void ieee80211_sta_process_addba_ - /* prepare reordering buffer */ - tid_agg_rx->reorder_buf = - kmalloc(buf_size * sizeof(struct sk_buf *), GFP_ATOMIC); -- if ((!tid_agg_rx->reorder_buf) && net_ratelimit()) { -- printk(KERN_ERR "can not allocate reordering buffer " -- "to tid %d\n", tid); -+ if (!tid_agg_rx->reorder_buf) { -+ if (net_ratelimit()) -+ printk(KERN_ERR "can not allocate reordering buffer " -+ "to tid %d\n", tid); - goto end; - } - memset(tid_agg_rx->reorder_buf, 0, -diff -up linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c.orig linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c ---- linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c 2008-02-27 20:47:51.000000000 -0500 -@@ -2690,6 +2690,7 @@ int gelic_wl_driver_probe(struct gelic_c - return -ENOMEM; - - /* setup net_device structure */ -+ SET_NETDEV_DEV(netdev, &card->dev->core); - gelic_wl_setup_netdev_ops(netdev); - - /* setup some of net_device and register it */ -diff -up linux-2.6.24.noarch/drivers/net/Kconfig.orig linux-2.6.24.noarch/drivers/net/Kconfig ---- linux-2.6.24.noarch/drivers/net/Kconfig.orig 2008-02-27 20:46:43.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/Kconfig 2008-02-27 20:47:51.000000000 -0500 -@@ -2374,6 +2374,7 @@ config GELIC_NET - config GELIC_WIRELESS - bool "PS3 Wireless support" - depends on GELIC_NET -+ select WIRELESS_EXT - help - This option adds the support for the wireless feature of PS3. - If you have the wireless-less model of PS3 or have no plan to -diff -up linux-2.6.24.noarch/drivers/net/wireless/b43/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/b43/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/b43/Kconfig.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43/Kconfig 2008-02-27 20:47:51.000000000 -0500 -@@ -32,6 +32,7 @@ config B43_PCI_AUTOSELECT - bool - depends on B43 && SSB_PCIHOST_POSSIBLE - select SSB_PCIHOST -+ select SSB_B43_PCI_BRIDGE - default y - - # Auto-select SSB PCICORE driver, if possible -diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/Kconfig.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/Kconfig 2008-02-27 20:47:51.000000000 -0500 -@@ -25,6 +25,7 @@ config B43LEGACY_PCI_AUTOSELECT - bool - depends on B43LEGACY && SSB_PCIHOST_POSSIBLE - select SSB_PCIHOST -+ select SSB_B43_PCI_BRIDGE - default y - - # Auto-select SSB PCICORE driver, if possible -diff -up linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c ---- linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c 2008-02-27 20:47:51.000000000 -0500 -@@ -228,9 +228,9 @@ struct NDIS_WLAN_BSSID_EX { - struct NDIS_802_11_SSID Ssid; - __le32 Privacy; - __le32 Rssi; -- enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; -+ __le32 NetworkTypeInUse; - struct NDIS_802_11_CONFIGURATION Configuration; -- enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; -+ __le32 InfrastructureMode; - u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX]; - __le32 IELength; - u8 IEs[0]; -@@ -279,11 +279,11 @@ struct RNDIS_CONFIG_PARAMETER_INFOBUFFER - } __attribute__((packed)); +diff -up linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c +--- linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-03-04 19:28:35.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c 2008-03-04 19:30:56.000000000 -0500 +@@ -2,7 +2,7 @@ + * Copyright 2002-2005, Instant802 Networks, Inc. + * Copyright 2005, Devicescape Software, Inc. + * Copyright 2007, Mattias Nissler +- * Copyright 2007, Stefano Brivio ++ * Copyright 2007-2008, Stefano Brivio + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as +@@ -63,72 +63,66 @@ + * RC_PID_ARITH_SHIFT. + */ - /* these have to match what is in wpa_supplicant */ --enum { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP } wpa_alg; --enum { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP, CIPHER_WEP104 } -- wpa_cipher; --enum { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE, KEY_MGMT_802_1X_NO_WPA, -- KEY_MGMT_WPA_NONE } wpa_key_mgmt; -+enum wpa_alg { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP }; -+enum wpa_cipher { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP, -+ CIPHER_WEP104 }; -+enum wpa_key_mgmt { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE, -+ KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE }; - - /* - * private data -diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/main.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1351,8 +1351,6 @@ done: - lbs_deb_leave_args(LBS_DEB_MESH, "ret %d", ret); - return ret; - } --EXPORT_SYMBOL_GPL(lbs_add_mesh); - - - static void lbs_remove_mesh(struct lbs_private *priv) - { -@@ -1372,7 +1370,6 @@ static void lbs_remove_mesh(struct lbs_p - free_netdev(mesh_dev); - lbs_deb_leave(LBS_DEB_MESH); - } --EXPORT_SYMBOL_GPL(lbs_remove_mesh); - - /** - * @brief This function finds the CFP in -@@ -1458,20 +1455,6 @@ void lbs_interrupt(struct lbs_private *p - } - EXPORT_SYMBOL_GPL(lbs_interrupt); - --int lbs_reset_device(struct lbs_private *priv) +-/* Shift the adjustment so that we won't switch to a lower rate if it exhibited +- * a worse failed frames behaviour and we'll choose the highest rate whose +- * failed frames behaviour is not worse than the one of the original rate +- * target. While at it, check that the adjustment is within the ranges. Then, +- * provide the new rate index. */ +-static int rate_control_pid_shift_adjust(struct rc_pid_rateinfo *r, +- int adj, int cur, int l) -{ -- int ret; +- int i, j, k, tmp; +- +- j = r[cur].rev_index; +- i = j + adj; - -- lbs_deb_enter(LBS_DEB_MAIN); -- ret = lbs_prepare_and_send_command(priv, CMD_802_11_RESET, -- CMD_ACT_HALT, 0, 0, NULL); -- msleep_interruptible(10); +- if (i < 0) +- return r[0].index; +- if (i >= l - 1) +- return r[l - 1].index; - -- lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret); -- return ret; +- tmp = i; +- +- if (adj < 0) { +- for (k = j; k >= i; k--) +- if (r[k].diff <= r[j].diff) +- tmp = k; +- } else { +- for (k = i + 1; k + i < l; k++) +- if (r[k].diff <= r[i].diff) +- tmp = k; +- } +- +- return r[tmp].index; -} --EXPORT_SYMBOL_GPL(lbs_reset_device); - - static int __init lbs_init_module(void) ++/* Adjust the rate while ensuring that we won't switch to a lower rate if it ++ * exhibited a worse failed frames behaviour and we'll choose the highest rate ++ * whose failed frames behaviour is not worse than the one of the original rate ++ * target. While at it, check that the new rate is valid. */ + static void rate_control_pid_adjust_rate(struct ieee80211_local *local, + struct sta_info *sta, int adj, + struct rc_pid_rateinfo *rinfo) { - lbs_deb_enter(LBS_DEB_MAIN); -diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmd.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1040,7 +1040,6 @@ int lbs_mesh_access(struct lbs_private * - lbs_deb_leave(LBS_DEB_CMD); - return ret; - } --EXPORT_SYMBOL_GPL(lbs_mesh_access); + struct ieee80211_sub_if_data *sdata; + struct ieee80211_hw_mode *mode; +- int newidx; +- int maxrate; +- int back = (adj > 0) ? 1 : -1; ++ int cur_sorted, new_sorted, probe, tmp, n_bitrates; ++ int cur = sta->txrate; + + sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); + + mode = local->oper_hw_mode; +- maxrate = sdata->bss ? sdata->bss->max_ratectrl_rateidx : -1; ++ n_bitrates = mode->num_rates; + +- newidx = rate_control_pid_shift_adjust(rinfo, adj, sta->txrate, +- mode->num_rates); ++ /* Map passed arguments to sorted values. */ ++ cur_sorted = rinfo[cur].rev_index; ++ new_sorted = cur_sorted + adj; ++ ++ /* Check limits. */ ++ if (new_sorted < 0) ++ new_sorted = rinfo[0].rev_index; ++ else if (new_sorted >= n_bitrates) ++ new_sorted = rinfo[n_bitrates - 1].rev_index; + +- while (newidx != sta->txrate) { +- if (rate_supported(sta, mode, newidx) && +- (maxrate < 0 || newidx <= maxrate)) { +- sta->txrate = newidx; +- break; +- } ++ tmp = new_sorted; + +- newidx += back; ++ if (adj < 0) { ++ /* Ensure that the rate decrease isn't disadvantageous. */ ++ for (probe = cur_sorted; probe >= new_sorted; probe--) ++ if (rinfo[probe].diff <= rinfo[cur_sorted].diff && ++ rate_supported(sta, mode, rinfo[probe].index)) ++ tmp = probe; ++ } else { ++ /* Look for rate increase with zero (or below) cost. */ ++ for (probe = new_sorted + 1; probe < n_bitrates; probe++) ++ if (rinfo[probe].diff <= rinfo[new_sorted].diff && ++ rate_supported(sta, mode, rinfo[probe].index)) ++ tmp = probe; + } - int lbs_mesh_config(struct lbs_private *priv, uint16_t enable, uint16_t chan) - { -@@ -1576,7 +1575,6 @@ done: - lbs_deb_leave_args(LBS_DEB_HOST, "ret %d", ret); - return ret; ++ /* Fit the rate found to the nearest supported rate. */ ++ do { ++ if (rate_supported(sta, mode, rinfo[tmp].index)) { ++ sta->txrate = rinfo[tmp].index; ++ break; ++ } ++ if (adj < 0) ++ tmp--; ++ else ++ tmp++; ++ } while (tmp < n_bitrates && tmp >= 0); ++ + #ifdef CONFIG_MAC80211_DEBUGFS + rate_control_pid_event_rate_change( + &((struct rc_pid_sta_info *)sta->rate_ctrl_priv)->events, +- newidx, mode->rates[newidx].rate); ++ cur, mode->rates[cur].rate); + #endif } --EXPORT_SYMBOL_GPL(lbs_prepare_and_send_command); - /** - * @brief This function allocates the command buffer and link -diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/decl.h.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/decl.h ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/decl.h.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/decl.h 2008-02-27 20:47:51.000000000 -0500 -@@ -69,7 +69,6 @@ struct lbs_private *lbs_add_card(void *c - int lbs_remove_card(struct lbs_private *priv); - int lbs_start_card(struct lbs_private *priv); - int lbs_stop_card(struct lbs_private *priv); --int lbs_reset_device(struct lbs_private *priv); - void lbs_host_to_card_done(struct lbs_private *priv); - - int lbs_update_channel(struct lbs_private *priv); -diff -up linux-2.6.24.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/bcm43xx/Kconfig ---- linux-2.6.24.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/bcm43xx/Kconfig 2008-02-27 20:47:51.000000000 -0500 -@@ -1,6 +1,6 @@ - config BCM43XX - tristate "Broadcom BCM43xx wireless support (DEPRECATED)" -- depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL -+ depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && (!SSB_B43_PCI_BRIDGE || SSB != y) && EXPERIMENTAL - select WIRELESS_EXT - select FW_LOADER - select HW_RANDOM -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-02-27 20:47:51.000000000 -0500 -@@ -61,11 +61,33 @@ EXPORT_SYMBOL_GPL(rt2x00lib_get_ring); - /* - * Link tuning handlers - */ --static void rt2x00lib_start_link_tuner(struct rt2x00_dev *rt2x00dev) -+void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev) - { -+ if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) -+ return; +diff -up linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig linux-2.6.24.noarch/drivers/net/wireless/p54common.h +--- linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54common.h 2008-03-04 19:30:56.000000000 -0500 +@@ -53,10 +53,10 @@ struct pda_entry { + } __attribute__ ((packed)); + + struct eeprom_pda_wrap { +- u32 magic; +- u16 pad; +- u16 len; +- u32 arm_opcode; ++ __le32 magic; ++ __le16 pad; ++ __le16 len; ++ __le32 arm_opcode; + u8 data[0]; + } __attribute__ ((packed)); + +diff -up linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig linux-2.6.24.noarch/drivers/net/wireless/p54common.c +--- linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54common.c 2008-03-04 19:30:56.000000000 -0500 +@@ -166,18 +166,23 @@ int p54_parse_eeprom(struct ieee80211_hw + struct p54_common *priv = dev->priv; + struct eeprom_pda_wrap *wrap = NULL; + struct pda_entry *entry; +- int i = 0; + unsigned int data_len, entry_len; + void *tmp; + int err; ++ u8 *end = (u8 *)eeprom + len; + + wrap = (struct eeprom_pda_wrap *) eeprom; +- entry = (void *)wrap->data + wrap->len; +- i += 2; +- i += le16_to_cpu(entry->len)*2; +- while (i < len) { ++ entry = (void *)wrap->data + le16_to_cpu(wrap->len); + -+ /* -+ * Reset link information. -+ * Both the currently active vgc level as well as -+ * the link tuner counter should be reset. Resetting -+ * the counter is important for devices where the -+ * device should only perform link tuning during the -+ * first minute after being enabled. -+ */ - rt2x00dev->link.count = 0; - rt2x00dev->link.vgc_level = 0; - -+ /* -+ * Reset the link tuner. -+ */ -+ rt2x00dev->ops->lib->reset_tuner(rt2x00dev); -+} ++ /* verify that at least the entry length/code fits */ ++ while ((u8 *)entry <= end - sizeof(*entry)) { + entry_len = le16_to_cpu(entry->len); + data_len = ((entry_len - 1) << 1); + -+static void rt2x00lib_start_link_tuner(struct rt2x00_dev *rt2x00dev) -+{ -+ /* -+ * Clear all (possibly) pre-existing quality statistics. -+ */ - memset(&rt2x00dev->link.qual, 0, sizeof(rt2x00dev->link.qual)); - - /* -@@ -79,10 +101,7 @@ static void rt2x00lib_start_link_tuner(s - rt2x00dev->link.qual.rx_percentage = 50; - rt2x00dev->link.qual.tx_percentage = 50; - -- /* -- * Reset the link tuner. -- */ -- rt2x00dev->ops->lib->reset_tuner(rt2x00dev); -+ rt2x00lib_reset_link_tuner(rt2x00dev); - - queue_delayed_work(rt2x00dev->hw->workqueue, - &rt2x00dev->link.work, LINK_TUNE_INTERVAL); -@@ -93,15 +112,6 @@ static void rt2x00lib_stop_link_tuner(st - cancel_delayed_work_sync(&rt2x00dev->link.work); - } - --void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev) --{ -- if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) -- return; -- -- rt2x00lib_stop_link_tuner(rt2x00dev); -- rt2x00lib_start_link_tuner(rt2x00dev); --} -- - /* - * Ring initialization - */ -@@ -260,19 +270,11 @@ static void rt2x00lib_evaluate_antenna_s - if (sample_a == sample_b) - return; - -- if (rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY) { -- if (sample_a > sample_b && rx == ANTENNA_B) -- rx = ANTENNA_A; -- else if (rx == ANTENNA_A) -- rx = ANTENNA_B; -- } -+ if (rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY) -+ rx = (sample_a > sample_b) ? ANTENNA_A : ANTENNA_B; ++ /* abort if entry exceeds whole structure */ ++ if ((u8 *)entry + sizeof(*entry) + data_len > end) ++ break; ++ + switch (le16_to_cpu(entry->code)) { + case PDR_MAC_ADDRESS: + SET_IEEE80211_PERM_ADDR(dev, entry->data); +@@ -249,13 +254,12 @@ int p54_parse_eeprom(struct ieee80211_hw + priv->version = *(u8 *)(entry->data + 1); + break; + case PDR_END: +- i = len; ++ /* make it overrun */ ++ entry_len = len; + break; + } + + entry = (void *)entry + (entry_len + 1)*2; +- i += 2; +- i += entry_len*2; + } -- if (rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY) { -- if (sample_a > sample_b && tx == ANTENNA_B) -- tx = ANTENNA_A; -- else if (tx == ANTENNA_A) -- tx = ANTENNA_B; -- } -+ if (rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY) -+ tx = (sample_a > sample_b) ? ANTENNA_A : ANTENNA_B; + if (!priv->iq_autocal || !priv->output_limit || !priv->curve_data) { +diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c +--- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c 2008-03-04 19:30:56.000000000 -0500 +@@ -3829,7 +3829,7 @@ static void b43legacy_print_driverinfo(v + #ifdef CONFIG_B43LEGACY_DMA + feat_dma = "D"; + #endif +- printk(KERN_INFO "Broadcom 43xx driver loaded " ++ printk(KERN_INFO "Broadcom 43xx-legacy driver loaded " + "[ Features: %s%s%s%s%s, Firmware-ID: " + B43legacy_SUPPORTED_FIRMWARE_ID " ]\n", + feat_pci, feat_leds, feat_rfkill, feat_pio, feat_dma); +diff -up linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c 2008-03-04 19:30:56.000000000 -0500 +@@ -260,7 +260,7 @@ struct NDIS_802_11_KEY { + __le32 KeyLength; + u8 Bssid[6]; + u8 Padding[6]; +- __le64 KeyRSC; ++ u8 KeyRSC[8]; + u8 KeyMaterial[32]; + } __attribute__((packed)); - rt2x00lib_config_antenna(rt2x00dev, rx, tx); - } -@@ -293,7 +295,7 @@ static void rt2x00lib_evaluate_antenna_e - * sample the rssi from the other antenna to make a valid - * comparison between the 2 antennas. - */ -- if ((rssi_curr - rssi_old) > -5 || (rssi_curr - rssi_old) < 5) -+ if (abs(rssi_curr - rssi_old) < 5) - return; - - rt2x00dev->link.ant.flags |= ANTENNA_MODE_SAMPLE; -@@ -319,15 +321,15 @@ static void rt2x00lib_evaluate_antenna(s - rt2x00dev->link.ant.flags &= ~ANTENNA_TX_DIVERSITY; - - if (rt2x00dev->hw->conf.antenna_sel_rx == 0 && -- rt2x00dev->default_ant.rx != ANTENNA_SW_DIVERSITY) -+ rt2x00dev->default_ant.rx == ANTENNA_SW_DIVERSITY) - rt2x00dev->link.ant.flags |= ANTENNA_RX_DIVERSITY; - if (rt2x00dev->hw->conf.antenna_sel_tx == 0 && -- rt2x00dev->default_ant.tx != ANTENNA_SW_DIVERSITY) -+ rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY) - rt2x00dev->link.ant.flags |= ANTENNA_TX_DIVERSITY; - - if (!(rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY) && - !(rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY)) { -- rt2x00dev->link.ant.flags &= ~ANTENNA_MODE_SAMPLE; -+ rt2x00dev->link.ant.flags = 0; - return; +@@ -1508,7 +1508,7 @@ static int rndis_iw_set_encode_ext(struc + struct usbnet *usbdev = dev->priv; + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev); + struct NDIS_802_11_KEY ndis_key; +- int i, keyidx, ret; ++ int keyidx, ret; + u8 *addr; + + keyidx = wrqu->encoding.flags & IW_ENCODE_INDEX; +@@ -1543,9 +1543,7 @@ static int rndis_iw_set_encode_ext(struc + ndis_key.KeyIndex = cpu_to_le32(keyidx); + + if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) { +- for (i = 0; i < 6; i++) +- ndis_key.KeyRSC |= +- cpu_to_le64(ext->rx_seq[i] << (i * 8)); ++ memcpy(ndis_key.KeyRSC, ext->rx_seq, 6); + ndis_key.KeyIndex |= cpu_to_le32(1 << 29); } -@@ -441,17 +443,18 @@ static void rt2x00lib_link_tuner(struct - rt2x00dev->ops->lib->link_tuner(rt2x00dev); +diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-04 19:30:56.000000000 -0500 +@@ -562,9 +562,7 @@ int lbs_process_rx_command(struct lbs_pr + } - /* -- * Evaluate antenna setup. -- */ -- rt2x00lib_evaluate_antenna(rt2x00dev); + resp = (void *)priv->upld_buf; - -- /* - * Precalculate a portion of the link signal which is - * in based on the tx/rx success/failure counters. - */ - rt2x00lib_precalculate_link_signal(&rt2x00dev->link.qual); - - /* -+ * Evaluate antenna setup, make this the last step since this could -+ * possibly reset some statistics. -+ */ -+ rt2x00lib_evaluate_antenna(rt2x00dev); -+ -+ /* - * Increase tuner counter, and reschedule the next link tuner run. - */ - rt2x00dev->link.count++; -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2008-02-27 20:47:51.000000000 -0500 -@@ -960,8 +960,12 @@ static int rt2400pci_set_device_state(st - rt2400pci_disable_radio(rt2x00dev); - break; - case STATE_RADIO_RX_ON: -+ case STATE_RADIO_RX_ON_LINK: -+ rt2400pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ break; - case STATE_RADIO_RX_OFF: -- rt2400pci_toggle_rx(rt2x00dev, state); -+ case STATE_RADIO_RX_OFF_LINK: -+ rt2400pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); - break; - case STATE_DEEP_SLEEP: - case STATE_SLEEP: -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1001,8 +1001,12 @@ static int rt2500usb_set_device_state(st - rt2500usb_disable_radio(rt2x00dev); - break; - case STATE_RADIO_RX_ON: -+ case STATE_RADIO_RX_ON_LINK: -+ rt2500usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ break; - case STATE_RADIO_RX_OFF: -- rt2500usb_toggle_rx(rt2x00dev, state); -+ case STATE_RADIO_RX_OFF_LINK: -+ rt2500usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); - break; - case STATE_DEEP_SLEEP: - case STATE_SLEEP: -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00reg.h 2008-02-27 20:47:51.000000000 -0500 -@@ -85,6 +85,8 @@ enum dev_state { - STATE_RADIO_OFF, - STATE_RADIO_RX_ON, - STATE_RADIO_RX_OFF, -+ STATE_RADIO_RX_ON_LINK, -+ STATE_RADIO_RX_OFF_LINK, - STATE_RADIO_IRQ_ON, - STATE_RADIO_IRQ_OFF, - }; -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2x00config.c 2008-02-27 20:47:51.000000000 -0500 -@@ -97,12 +97,16 @@ void rt2x00lib_config_antenna(struct rt2 - libconf.ant.rx = rx; - libconf.ant.tx = tx; - -+ if (rx == rt2x00dev->link.ant.active.rx && -+ tx == rt2x00dev->link.ant.active.tx) +- curcmd = le16_to_cpu(resp->command); +- ++ curcmd = le16_to_cpu(priv->cur_cmd->cmdbuf->command); + respcmd = le16_to_cpu(resp->command); + result = le16_to_cpu(resp->result); + +@@ -572,9 +570,9 @@ int lbs_process_rx_command(struct lbs_pr + respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies); + lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len); + +- if (resp->seqnum != resp->seqnum) { ++ if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) { + lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n", +- le16_to_cpu(resp->seqnum), le16_to_cpu(resp->seqnum)); ++ le16_to_cpu(resp->seqnum), le16_to_cpu(priv->cur_cmd->cmdbuf->seqnum)); + spin_unlock_irqrestore(&priv->driver_lock, flags); + ret = -1; + goto done; +diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c +--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-04 19:30:56.000000000 -0500 +@@ -111,7 +111,10 @@ static void __init ssb_fixup_pcibridge(s + + /* Enable PCI bridge bus mastering and memory space */ + pci_set_master(dev); +- pcibios_enable_device(dev, ~0); ++ if (pcibios_enable_device(dev, ~0) < 0) { ++ ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n"); + return; -+ - /* - * Antenna setup changes require the RX to be disabled, - * else the changes will be ignored by the device. - */ - if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) -- rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); -+ rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF_LINK); - - /* - * Write new antenna setup to device and reset the link tuner. -@@ -116,7 +120,7 @@ void rt2x00lib_config_antenna(struct rt2 - rt2x00dev->link.ant.active.tx = libconf.ant.tx; - - if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) -- rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON_LINK); - } ++ } - void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1112,8 +1112,12 @@ static int rt2500pci_set_device_state(st - rt2500pci_disable_radio(rt2x00dev); - break; - case STATE_RADIO_RX_ON: -+ case STATE_RADIO_RX_ON_LINK: -+ rt2500pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ break; - case STATE_RADIO_RX_OFF: -- rt2500pci_toggle_rx(rt2x00dev, state); -+ case STATE_RADIO_RX_OFF_LINK: -+ rt2500pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); - break; - case STATE_DEEP_SLEEP: - case STATE_SLEEP: -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1482,8 +1482,12 @@ static int rt61pci_set_device_state(stru - rt61pci_disable_radio(rt2x00dev); - break; - case STATE_RADIO_RX_ON: -+ case STATE_RADIO_RX_ON_LINK: -+ rt61pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ break; - case STATE_RADIO_RX_OFF: -- rt61pci_toggle_rx(rt2x00dev, state); -+ case STATE_RADIO_RX_OFF_LINK: -+ rt61pci_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); - break; - case STATE_DEEP_SLEEP: - case STATE_SLEEP: -diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-02-27 20:46:34.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-02-27 20:47:51.000000000 -0500 -@@ -1208,8 +1208,12 @@ static int rt73usb_set_device_state(stru - rt73usb_disable_radio(rt2x00dev); - break; - case STATE_RADIO_RX_ON: -+ case STATE_RADIO_RX_ON_LINK: -+ rt73usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); -+ break; - case STATE_RADIO_RX_OFF: -- rt73usb_toggle_rx(rt2x00dev, state); -+ case STATE_RADIO_RX_OFF_LINK: -+ rt73usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); - break; - case STATE_DEEP_SLEEP: - case STATE_SLEEP: -diff -up linux-2.6.24.noarch/drivers/ssb/Makefile.orig linux-2.6.24.noarch/drivers/ssb/Makefile ---- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-02-27 20:46:35.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-02-27 20:47:51.000000000 -0500 -@@ -14,6 +14,6 @@ ssb-$(CONFIG_SSB_DRIVER_PCICORE) += driv - - # b43 pci-ssb-bridge driver - # Not strictly a part of SSB, but kept here for convenience --ssb-$(CONFIG_SSB_PCIHOST) += b43_pci_bridge.o -+ssb-$(CONFIG_SSB_B43_PCI_BRIDGE) += b43_pci_bridge.o - - obj-$(CONFIG_SSB) += ssb.o -diff -up linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig linux-2.6.24.noarch/drivers/ssb/ssb_private.h ---- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-02-27 20:47:51.000000000 -0500 -@@ -120,10 +120,10 @@ extern int ssb_devices_thaw(struct ssb_b - extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev); - - /* b43_pci_bridge.c */ --#ifdef CONFIG_SSB_PCIHOST -+#ifdef CONFIG_SSB_B43_PCI_BRIDGE - extern int __init b43_pci_ssb_bridge_init(void); - extern void __exit b43_pci_ssb_bridge_exit(void); --#else /* CONFIG_SSB_PCIHOST */ -+#else /* CONFIG_SSB_B43_PCI_BRIDGR */ - static inline int b43_pci_ssb_bridge_init(void) - { - return 0; -diff -up linux-2.6.24.noarch/drivers/ssb/Kconfig.orig linux-2.6.24.noarch/drivers/ssb/Kconfig ---- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-02-27 20:46:35.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-02-27 20:47:51.000000000 -0500 -@@ -35,6 +35,11 @@ config SSB_PCIHOST - - If unsure, say Y - -+config SSB_B43_PCI_BRIDGE -+ bool -+ depends on SSB_PCIHOST -+ default n -+ - config SSB_PCMCIAHOST_POSSIBLE - bool - depends on SSB && (PCMCIA = y || PCMCIA = SSB) && EXPERIMENTAL + /* Enable PCI bridge BAR1 prefetch and burst */ + pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3); Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/sources,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -r1.11.2.2 -r1.11.2.3 --- sources 29 Feb 2008 18:58:24 -0000 1.11.2.2 +++ sources 5 Mar 2008 18:41:18 -0000 1.11.2.3 @@ -1,4 +1,3 @@ 3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2 -01b1f6c7b35ba356129c121a81a77991 patch-2.6.25-rc3.bz2 -cefc333ff0422cdaa5e821ca58d06af4 patch-2.6.25-rc3-git1.bz2 +a4cc0fd5bda60e498246b6d69c873895 patch-2.6.25-rc4.bz2 4aa57328d0802a063fa67dfc063da30e xen-3.2.0.tar.gz Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/upstream,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- upstream 29 Feb 2008 18:58:24 -0000 1.1.2.2 +++ upstream 5 Mar 2008 18:41:18 -0000 1.1.2.3 @@ -1,3 +1,2 @@ linux-2.6.24.tar.bz2 -patch-2.6.25-rc3.bz2 -patch-2.6.25-rc3-git1.bz2 +patch-2.6.25-rc4.bz2 --- linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch-from-kernel-2_6_25.patch DELETED --- --- linux-2.6-xen-0002-x86-xen-Construct-e820-map-with-a-hole-between-640K.patch DELETED --- --- linux-2.6-xen-0003-squashfs-Fix-build-without-CONFIG_SMP.patch DELETED --- --- linux-2.6-xen-0004-xen-Make-hvc0-the-preferred-console-in-domU.patch DELETED --- --- linux-2.6-xen-0005-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch DELETED --- --- linux-2.6-xen-0006-fbdev-Make-deferred-I-O-work-as-advertized.patch DELETED --- --- linux-2.6-xen-0007-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch DELETED --- --- linux-2.6-xen-0008-xen-Module-autoprobing-support-for-frontend-drivers.patch DELETED --- --- linux-2.6-xen-0009-xen-Add-compatibility-aliases-for-frontend-drivers.patch DELETED --- --- linux-2.6-xen-0010-xen-dom0-Add-a-vmlinuz-target.patch DELETED --- --- linux-2.6-xen-0011-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch DELETED --- --- linux-2.6-xen-0012-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch DELETED --- --- patch-2.6.25-rc3-git1.bz2.sign DELETED --- --- patch-2.6.25-rc3.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Wed Mar 5 18:42:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 18:42:57 GMT Subject: rpms/perl-Crypt-Random/devel perl-Crypt-Random.spec,1.6,1.7 Message-ID: <200803051842.m25Igvbv005470@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-Random/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5392 Modified Files: perl-Crypt-Random.spec Log Message: new perl Index: perl-Crypt-Random.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Random/devel/perl-Crypt-Random.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Crypt-Random.spec 12 Aug 2007 08:27:12 -0000 1.6 +++ perl-Crypt-Random.spec 5 Mar 2008 18:42:17 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Cryptographically Secure, True Random Number Generator Name: perl-Crypt-Random Version: 1.25 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Crypt-Random/ @@ -52,6 +52,9 @@ %{_mandir}/man3/Crypt::Random.3pm* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.25-5 +- rebuild for new perl + * Sun Aug 12 2007 Paul Howarth 1.25-4 - Clarify license as GPL v1 or later, or Artistic (same as perl) From fedora-extras-commits at redhat.com Wed Mar 5 18:43:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 18:43:36 GMT Subject: rpms/perl-Crypt-Primes/devel perl-Crypt-Primes.spec,1.5,1.6 Message-ID: <200803051843.m25Iha0f005529@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-Primes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5465 Modified Files: perl-Crypt-Primes.spec Log Message: new perl Index: perl-Crypt-Primes.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Primes/devel/perl-Crypt-Primes.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Crypt-Primes.spec 12 Aug 2007 08:22:10 -0000 1.5 +++ perl-Crypt-Primes.spec 5 Mar 2008 18:42:57 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Provable prime number generator for cryptographic applications Name: perl-Crypt-Primes Version: 0.50 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Crypt-Primes/ @@ -53,6 +53,9 @@ %{_mandir}/man3/Crypt::Primes.3pm* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.50-5 +- rebuild for new perl + * Sun Aug 12 2007 Paul Howarth 0.50-4 - Clarify license as GPL v1 or later, or Artistic (same as perl) From fedora-extras-commits at redhat.com Wed Mar 5 18:45:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 18:45:09 GMT Subject: rpms/perl-Convert-ASCII-Armour/devel perl-Convert-ASCII-Armour.spec, 1.4, 1.5 Message-ID: <200803051845.m25Ij9In005615@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Convert-ASCII-Armour/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5577 Modified Files: perl-Convert-ASCII-Armour.spec Log Message: new perl Index: perl-Convert-ASCII-Armour.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-ASCII-Armour/devel/perl-Convert-ASCII-Armour.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Convert-ASCII-Armour.spec 17 Apr 2007 22:44:00 -0000 1.4 +++ perl-Convert-ASCII-Armour.spec 5 Mar 2008 18:44:31 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-Convert-ASCII-Armour Version: 1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Convert binary octets into ASCII armoured messages -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-ASCII-Armour/ Source0: http://www.cpan.org/authors/id/V/VI/VIPUL/Convert-ASCII-Armour-%{version}.tar.gz @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.4-6 +- rebuild for new perl + * Tue Apr 17 2007 Steven Pritchard 1.4-5 - Use fixperms macro instead of our own chmod incantation. - BR ExtUtils::MakeMaker. From fedora-extras-commits at redhat.com Wed Mar 5 18:53:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 18:53:50 GMT Subject: rpms/perl-Tie-EncryptedHash/devel perl-Tie-EncryptedHash.spec, 1.4, 1.5 Message-ID: <200803051853.m25IroRZ005863@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Tie-EncryptedHash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5834 Modified Files: perl-Tie-EncryptedHash.spec Log Message: new perl Index: perl-Tie-EncryptedHash.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tie-EncryptedHash/devel/perl-Tie-EncryptedHash.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Tie-EncryptedHash.spec 18 Apr 2007 11:29:11 -0000 1.4 +++ perl-Tie-EncryptedHash.spec 5 Mar 2008 18:53:16 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Hashes (and objects based on hashes) with encrypting fields Name: perl-Tie-EncryptedHash Version: 1.21 -Release: 3%{?dist} +Release: 4%{?dist} License: Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Tie-EncryptedHash/ @@ -60,6 +60,9 @@ %{_mandir}/man3/Tie::EncryptedHash.3pm* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.21-4 +- rebuild for new perl + * Wed Apr 18 2007 Paul Howarth 1.21-3 - Buildrequire perl(ExtUtils::MakeMaker) - Fix argument order for find with -depth From fedora-extras-commits at redhat.com Wed Mar 5 19:04:23 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 19:04:23 GMT Subject: rpms/libdsk/devel .cvsignore, 1.6, 1.7 libdsk.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200803051904.m25J4N2t013166@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/pkgs/rpms/libdsk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13095 Modified Files: .cvsignore libdsk.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libdsk/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 6 Jan 2008 17:32:43 -0000 1.6 +++ .cvsignore 5 Mar 2008 19:02:20 -0000 1.7 @@ -1 +1 @@ -libdsk-1.2.0.tar.gz +libdsk-1.2.1.tar.gz Index: libdsk.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdsk/devel/libdsk.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libdsk.spec 19 Feb 2008 16:46:51 -0000 1.8 +++ libdsk.spec 5 Mar 2008 19:02:20 -0000 1.9 @@ -1,6 +1,6 @@ Name: libdsk -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Library for accessing disk images Group: System Environment/Libraries License: LGPLv2+ @@ -85,6 +85,9 @@ %changelog +* Wed Mar 05 2008 Ian Chapman 1.2.1-1 +- Upgrade to 1.2.1 + * Tue Feb 19 2008 Fedora Release Engineering - 1.2.0-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libdsk/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Jan 2008 17:32:43 -0000 1.6 +++ sources 5 Mar 2008 19:02:20 -0000 1.7 @@ -1 +1 @@ -0c74ceda8f36bc5d6d644dbacd8383d8 libdsk-1.2.0.tar.gz +3ff178e8d6e5d45967ebbf7a162a7fcc libdsk-1.2.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 19:06:24 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 19:06:24 GMT Subject: rpms/libdsk/F-8 libdsk.spec,1.7,1.8 sources,1.6,1.7 Message-ID: <200803051906.m25J6Omb013282@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/pkgs/rpms/libdsk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13233 Modified Files: libdsk.spec sources Log Message: Index: libdsk.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdsk/F-8/libdsk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libdsk.spec 6 Jan 2008 17:33:32 -0000 1.7 +++ libdsk.spec 5 Mar 2008 19:05:53 -0000 1.8 @@ -1,5 +1,5 @@ Name: libdsk -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: Library for accessing disk images Group: System Environment/Libraries @@ -85,6 +85,12 @@ %changelog +* Wed Mar 05 2008 Ian Chapman 1.2.1-1 +- Upgrade to 1.2.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.2.0-2 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 Ian Chapman 1.2.0-1 - Upgrade to 1.2.0 - Dropped open() patch, fixed upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libdsk/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Jan 2008 17:33:32 -0000 1.6 +++ sources 5 Mar 2008 19:05:53 -0000 1.7 @@ -1 +1 @@ -0c74ceda8f36bc5d6d644dbacd8383d8 libdsk-1.2.0.tar.gz +3ff178e8d6e5d45967ebbf7a162a7fcc libdsk-1.2.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 19:06:29 2008 From: fedora-extras-commits at redhat.com (Robin Norwood (rnorwood)) Date: Wed, 5 Mar 2008 19:06:29 GMT Subject: rpms/gnome-packagekit/devel gnome-packagekit.spec,1.11,1.12 Message-ID: <200803051906.m25J6Tl9013289@cvs-int.fedora.redhat.com> Author: rnorwood Update of /cvs/pkgs/rpms/gnome-packagekit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13261 Modified Files: gnome-packagekit.spec Log Message: Update to latest upstream version. Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnome-packagekit.spec 21 Feb 2008 22:06:58 -0000 1.11 +++ gnome-packagekit.spec 5 Mar 2008 19:05:58 -0000 1.12 @@ -1,5 +1,5 @@ %define dbus_version 0.61 -%define packagekit_version 0.1.8 +%define packagekit_version 0.1.9 Summary: GNOME PackageKit Client Name: gnome-packagekit @@ -15,6 +15,7 @@ Requires: libnotify >= 0.4.3 Requires: dbus-glib >= %{dbus_version} Requires: dbus-x11 >= %{dbus_version} +Requires: PackageKit = %{packagekit_version} Requires(post): scrollkeeper Requires(pre): GConf2 Requires(post): GConf2 @@ -117,6 +118,9 @@ %{_datadir}/applications/pk-*.desktop %changelog +* Wed Mar 5 2008 Robin Norwood - 0.1.9-1 +- Update to latest upstream version: 0.1.8 + * Thu Feb 21 2008 Robin Norwood - 0.1.8-1 - Update to latest upstream version: 0.1.8 From fedora-extras-commits at redhat.com Wed Mar 5 19:09:57 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 19:09:57 GMT Subject: rpms/libdsk/F-7 libdsk.spec,1.7,1.8 sources,1.6,1.7 Message-ID: <200803051909.m25J9viE013386@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/pkgs/rpms/libdsk/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13364 Modified Files: libdsk.spec sources Log Message: Index: libdsk.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdsk/F-7/libdsk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libdsk.spec 6 Jan 2008 17:34:34 -0000 1.7 +++ libdsk.spec 5 Mar 2008 19:09:26 -0000 1.8 @@ -1,5 +1,5 @@ Name: libdsk -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: Library for accessing disk images Group: System Environment/Libraries @@ -85,6 +85,12 @@ %changelog +* Wed Mar 05 2008 Ian Chapman 1.2.1-1 +- Upgrade to 1.2.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.2.0-2 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 Ian Chapman 1.2.0-1 - Upgrade to 1.2.0 - Dropped open() patch, fixed upstream Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libdsk/F-7/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Jan 2008 17:34:34 -0000 1.6 +++ sources 5 Mar 2008 19:09:26 -0000 1.7 @@ -1 +1 @@ -0c74ceda8f36bc5d6d644dbacd8383d8 libdsk-1.2.0.tar.gz +3ff178e8d6e5d45967ebbf7a162a7fcc libdsk-1.2.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 19:17:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:17:20 GMT Subject: rpms/perl-Digest-MD4/devel perl-Digest-MD4.spec,1.6,1.7 Message-ID: <200803051917.m25JHKrM013601@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Digest-MD4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13560 Modified Files: perl-Digest-MD4.spec Log Message: new perl Index: perl-Digest-MD4.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Digest-MD4/devel/perl-Digest-MD4.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Digest-MD4.spec 19 Feb 2008 19:09:04 -0000 1.6 +++ perl-Digest-MD4.spec 5 Mar 2008 19:16:50 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Digest-MD4 Version: 1.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl interface to the MD4 Algorithm Group: Development/Libraries License: GPL+ or Artistic @@ -45,6 +45,9 @@ %{_mandir}/man3/*.3pm* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 1.5-6 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.5-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 19:18:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:18:45 GMT Subject: rpms/perl-Crypt-SmbHash/devel perl-Crypt-SmbHash.spec,1.6,1.7 Message-ID: <200803051918.m25JIjcI013763@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-SmbHash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13646 Modified Files: perl-Crypt-SmbHash.spec Log Message: new perl Index: perl-Crypt-SmbHash.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-SmbHash/devel/perl-Crypt-SmbHash.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Crypt-SmbHash.spec 12 Aug 2007 19:48:43 -0000 1.6 +++ perl-Crypt-SmbHash.spec 5 Mar 2008 19:18:14 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Pure-perl Lanman and NT MD4 hash functions Name: perl-Crypt-SmbHash Version: 0.12 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Development/Libraries Url: http://search.cpan.org/dist/Crypt-SmbHash/ @@ -44,6 +44,9 @@ %{_mandir}/man3/Crypt::SmbHash.3pm* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.12-7 +- rebuild for new perl + * Sun Aug 12 2007 Paul Howarth 0.12-6 - Clarify license as GPL version 2 or later From fedora-extras-commits at redhat.com Wed Mar 5 19:19:03 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 5 Mar 2008 19:19:03 GMT Subject: rpms/libXNVCtrl/devel .cvsignore, 1.2, 1.3 libXNVCtrl.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200803051919.m25JJ3Pq013805@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libXNVCtrl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13706 Modified Files: .cvsignore libXNVCtrl.spec sources Log Message: * Wed Mar 5 2008 Hans de Goede 169.12-1 - Update to new upstream 169.12 release (talking about version inflation) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libXNVCtrl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jul 2007 18:18:32 -0000 1.2 +++ .cvsignore 5 Mar 2008 19:18:32 -0000 1.3 @@ -1 +1 @@ -nvidia-settings-1.0.tar.gz +nvidia-settings-169.12.tar.gz Index: libXNVCtrl.spec =================================================================== RCS file: /cvs/extras/rpms/libXNVCtrl/devel/libXNVCtrl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libXNVCtrl.spec 19 Feb 2008 13:28:33 -0000 1.4 +++ libXNVCtrl.spec 5 Mar 2008 19:18:32 -0000 1.5 @@ -1,6 +1,6 @@ Name: libXNVCtrl -Version: 1.0 -Release: 7%{?dist} +Version: 169.12 +Release: 1%{?dist} Summary: Library providing the NV-CONTROL API Group: System Environment/Libraries License: GPLv2+ @@ -29,7 +29,7 @@ %prep -%setup -q -n nvidia-settings-%{version} +%setup -q -n nvidia-settings-1.0 %patch0 -p1 -z .imake pushd src/%{name} xmkmf @@ -74,6 +74,9 @@ %changelog +* Wed Mar 5 2008 Hans de Goede 169.12-1 +- Update to new upstream 169.12 release (talking about version inflation) + * Tue Feb 19 2008 Hans de Goede 1.0-7 - Rebase to latest upstream, which is still called 1.0 (GRRRR) Index: sources =================================================================== RCS file: /cvs/extras/rpms/libXNVCtrl/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2008 13:28:33 -0000 1.3 +++ sources 5 Mar 2008 19:18:32 -0000 1.4 @@ -1 +1 @@ -d2753b2ffbe938bada9204a13ae42dab nvidia-settings-1.0.tar.gz +02a14243a4173533ff96ddc73060c83d nvidia-settings-169.12.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 19:19:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:19:39 GMT Subject: rpms/perl-ExtUtils-MakeMaker-Coverage/devel perl-ExtUtils-MakeMaker-Coverage.spec, 1.1, 1.2 Message-ID: <200803051919.m25JJdgQ013893@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-ExtUtils-MakeMaker-Coverage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13843 Modified Files: perl-ExtUtils-MakeMaker-Coverage.spec Log Message: new perl Index: perl-ExtUtils-MakeMaker-Coverage.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-MakeMaker-Coverage/devel/perl-ExtUtils-MakeMaker-Coverage.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-ExtUtils-MakeMaker-Coverage.spec 21 Aug 2007 17:47:05 -0000 1.1 +++ perl-ExtUtils-MakeMaker-Coverage.spec 5 Mar 2008 19:19:09 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-ExtUtils-MakeMaker-Coverage Version: 0.05 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Allows perl modules to check test coverage with Devel::Cover Group: Development/Libraries @@ -56,6 +56,9 @@ %{_bindir}/testcover %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.05-4 +- rebuild for new perl + * Mon Aug 20 2007 Robin Norwood - 0.05-3 - More BR's: perl(Test::Pod) and perl(Test::Pod::Coverage) From fedora-extras-commits at redhat.com Wed Mar 5 19:20:26 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 5 Mar 2008 19:20:26 GMT Subject: devel/kvm .cvsignore, 1.27, 1.28 kvm.spec, 1.46, 1.47 sources, 1.26, 1.27 Message-ID: <200803051920.m25JKQ77013984@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/kvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13932 Modified Files: .cvsignore kvm.spec sources Log Message: * Wed Mar 5 2008 Jeremy Katz - 63-1 - Update to kvm-63 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/kvm/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 28 Feb 2008 00:37:13 -0000 1.27 +++ .cvsignore 5 Mar 2008 19:19:56 -0000 1.28 @@ -1,5 +1 @@ -.*log -*.rpm -i686 -x86_64 -kvm-62.tar.gz +kvm-63.tar.gz Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- kvm.spec 4 Mar 2008 22:39:18 -0000 1.46 +++ kvm.spec 5 Mar 2008 19:19:56 -0000 1.47 @@ -1,7 +1,7 @@ Summary: Kernel-based Virtual Machine Name: kvm -Version: 62 -Release: 4%{?dist} +Version: 63 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net @@ -97,6 +97,9 @@ %{_sysconfdir}/sysconfig/modules/%{name}.modules %changelog +* Wed Mar 5 2008 Jeremy Katz - 63-1 +- Update to kvm-63 + * Tue Mar 4 2008 Kevin Fenzi - 62-4 - Make e1000 the default network driver Index: sources =================================================================== RCS file: /cvs/pkgs/devel/kvm/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 26 Feb 2008 19:10:17 -0000 1.26 +++ sources 5 Mar 2008 19:19:56 -0000 1.27 @@ -1 +1 @@ -64d827b1443dbb8cb1db80c557e00357 kvm-62.tar.gz +5df4eebff934f811821d2a2c40e38753 kvm-63.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 19:21:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:21:16 GMT Subject: rpms/perl-Scalar-Properties/devel perl-Scalar-Properties.spec, 1.4, 1.5 Message-ID: <200803051921.m25JLGek014067@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Scalar-Properties/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14031 Modified Files: perl-Scalar-Properties.spec Log Message: new perl Index: perl-Scalar-Properties.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Scalar-Properties/devel/perl-Scalar-Properties.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Scalar-Properties.spec 19 Dec 2007 19:47:13 -0000 1.4 +++ perl-Scalar-Properties.spec 5 Mar 2008 19:20:46 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Scalar-Properties Version: 0.13 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Run-time properties on scalar variables Group: Development/Libraries @@ -52,6 +52,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.13-2 +- rebuild for new perl + * Wed Dec 19 2007 Tom "spot" Callaway - 0.13-1.1 - BR: Test::More From fedora-extras-commits at redhat.com Wed Mar 5 19:22:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:22:08 GMT Subject: rpms/perl-Set-Infinite/devel perl-Set-Infinite.spec,1.4,1.5 Message-ID: <200803051922.m25JM8m0014144@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Set-Infinite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14115 Modified Files: perl-Set-Infinite.spec Log Message: new perl Index: perl-Set-Infinite.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Set-Infinite/devel/perl-Set-Infinite.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Set-Infinite.spec 2 Jan 2008 04:38:12 -0000 1.4 +++ perl-Set-Infinite.spec 5 Mar 2008 19:21:38 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Set-Infinite Version: 0.61 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Sets of intervals License: GPL+ or Artistic Group: Development/Libraries @@ -45,6 +45,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.61-5 +- rebuild for new perl + * Wed Jan 02 2008 Ralf Cors??pius 0.61-4 - Adjust License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Wed Mar 5 19:23:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:23:59 GMT Subject: rpms/perl-DateTime-Set/devel perl-DateTime-Set.spec,1.5,1.6 Message-ID: <200803051923.m25JNxOe014295@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Set/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14229 Modified Files: perl-DateTime-Set.spec Log Message: new perl Index: perl-DateTime-Set.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Set/devel/perl-DateTime-Set.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-DateTime-Set.spec 30 Dec 2007 11:44:13 -0000 1.5 +++ perl-DateTime-Set.spec 5 Mar 2008 19:23:26 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-DateTime-Set Version: 0.25 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Datetime sets and set math License: GPL+ or Artistic Group: Development/Libraries @@ -61,6 +61,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway - 0.25-6 +- rebuild for new perl + * Sun Dec 30 2007 Ralf Cors??pius - 0.25-5 - Adjust License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Wed Mar 5 19:24:00 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 5 Mar 2008 19:24:00 GMT Subject: rpms/crack-attack/devel crack-attack.spec,1.6,1.7 Message-ID: <200803051924.m25JO0u6014299@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/crack-attack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14249 Modified Files: crack-attack.spec Log Message: * Wed Mar 5 2008 Hans de Goede 1.1.14-13 - Stop using a full URL for Source1 (upstream file somehow got trunkated to 0 bytes) Index: crack-attack.spec =================================================================== RCS file: /cvs/extras/rpms/crack-attack/devel/crack-attack.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- crack-attack.spec 21 Feb 2008 02:23:36 -0000 1.6 +++ crack-attack.spec 5 Mar 2008 19:23:29 -0000 1.7 @@ -1,12 +1,12 @@ Summary: Puzzle action game Name: crack-attack Version: 1.1.14 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Amusements/Games URL: http://www.nongnu.org/crack-attack/ Source0: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.bz2 -Source1: http://www.miguev.net/misc/%{name}-sounds.tar.gz +Source1: %{name}-sounds.tar.gz Source2: %{name}-music.tar.gz Patch0: crack-attack-1.1.14-glutInit.patch Patch1: crack-attack-1.1.14-sanitize.patch @@ -93,6 +93,10 @@ %changelog +* Wed Mar 5 2008 Hans de Goede 1.1.14-13 +- Stop using a full URL for Source1 (upstream file somehow got trunkated to + 0 bytes) + * Tue Feb 19 2008 Fedora Release Engineering - 1.1.14-12 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 19:25:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:25:04 GMT Subject: rpms/perl-DateTime-Event-Recurrence/devel perl-DateTime-Event-Recurrence.spec, 1.4, 1.5 Message-ID: <200803051925.m25JP4H3014429@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Event-Recurrence/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14391 Modified Files: perl-DateTime-Event-Recurrence.spec Log Message: new perl Index: perl-DateTime-Event-Recurrence.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Event-Recurrence/devel/perl-DateTime-Event-Recurrence.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DateTime-Event-Recurrence.spec 3 Jan 2008 04:06:25 -0000 1.4 +++ perl-DateTime-Event-Recurrence.spec 5 Mar 2008 19:24:34 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-DateTime-Event-Recurrence Version: 0.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: DateTime::Set extension for create basic recurrence sets License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.16-6 +- rebuild for new perl + * Thu Jan 03 2008 Ralf Cors??pius 0.16-5 - Adjust License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Wed Mar 5 19:25:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:25:57 GMT Subject: rpms/perl-DateTime-Event-ICal/devel perl-DateTime-Event-ICal.spec, 1.4, 1.5 Message-ID: <200803051925.m25JPvnY014505@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Event-ICal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14478 Modified Files: perl-DateTime-Event-ICal.spec Log Message: new perl Index: perl-DateTime-Event-ICal.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Event-ICal/devel/perl-DateTime-Event-ICal.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DateTime-Event-ICal.spec 3 Jan 2008 03:06:33 -0000 1.4 +++ perl-DateTime-Event-ICal.spec 5 Mar 2008 19:25:27 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-DateTime-Event-ICal Version: 0.09 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl DateTime extension for computing rfc2445 recurrences License: GPL+ or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.09-5 +- rebuild for new perl + * Thu Jan 03 2008 Ralf Cors??pius 0.09-4 - Adjust License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Wed Mar 5 19:26:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:26:49 GMT Subject: rpms/perl-Convert-NLS_DATE_FORMAT/devel perl-Convert-NLS_DATE_FORMAT.spec, 1.2, 1.3 Message-ID: <200803051926.m25JQns0014594@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Convert-NLS_DATE_FORMAT/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14545 Modified Files: perl-Convert-NLS_DATE_FORMAT.spec Log Message: new perl Index: perl-Convert-NLS_DATE_FORMAT.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-NLS_DATE_FORMAT/devel/perl-Convert-NLS_DATE_FORMAT.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Convert-NLS_DATE_FORMAT.spec 17 Jan 2008 19:19:00 -0000 1.2 +++ perl-Convert-NLS_DATE_FORMAT.spec 5 Mar 2008 19:26:18 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Convert-NLS_DATE_FORMAT Version: 0.02 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Convert Oracle NLS_DATE_FORMAT <-> strftime Format Strings License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.02-3 +- rebuild for new perl + * Thu Jan 17 2008 Chris Weyl 0.02-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 19:29:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:29:10 GMT Subject: rpms/perl-Class-Gomor/devel perl-Class-Gomor.spec,1.1,1.2 Message-ID: <200803051929.m25JTAWI014702@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Gomor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14675 Modified Files: perl-Class-Gomor.spec Log Message: new perl Index: perl-Class-Gomor.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Gomor/devel/perl-Class-Gomor.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-Gomor.spec 9 May 2007 23:05:07 -0000 1.1 +++ perl-Class-Gomor.spec 5 Mar 2008 19:28:40 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-Gomor Version: 1.01 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Another class and object builder Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Wed Mar 05 2008 Tom "spot" Callaway - 1.01-3 +- rebuild for new perl + * Thu May 03 2007 Sindre Pedersen Bj??rdal - 1.01-2 - Add missing BRs - Add examples dir to %%doc From fedora-extras-commits at redhat.com Wed Mar 5 19:31:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:31:24 +0000 Subject: [pkgdb] libsoup22 was added for mbarnes Message-ID: <200803051932.m25JWnOC021886@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package libsoup22 with summary Compatibility package for libsoup 2.2 API Kevin Fenzi (kevin) has approved Package libsoup22 Kevin Fenzi (kevin) has added a Fedora devel branch for libsoup22 with an owner of mbarnes Kevin Fenzi (kevin) has approved libsoup22 in Fedora devel Kevin Fenzi (kevin) has approved Package libsoup22 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on libsoup22 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on libsoup22 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on libsoup22 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libsoup22 From fedora-extras-commits at redhat.com Wed Mar 5 19:31:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:31:26 +0000 Subject: [pkgdb] libsoup22 (Fedora, devel) updated by kevin Message-ID: <200803051932.m25JWnOF021886@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on libsoup22 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/libsoup22 From fedora-extras-commits at redhat.com Wed Mar 5 19:37:55 2008 From: fedora-extras-commits at redhat.com (Robin Norwood (rnorwood)) Date: Wed, 5 Mar 2008 19:37:55 GMT Subject: rpms/gnome-packagekit/devel .cvsignore,1.9,1.10 sources,1.9,1.10 Message-ID: <200803051937.m25JbtLI015014@cvs-int.fedora.redhat.com> Author: rnorwood Update of /cvs/pkgs/rpms/gnome-packagekit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14984 Modified Files: .cvsignore sources Log Message: Forgot new source file. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 21 Feb 2008 22:06:58 -0000 1.9 +++ .cvsignore 5 Mar 2008 19:37:24 -0000 1.10 @@ -1 +1 @@ -gnome-packagekit-0.1.8.tar.gz +gnome-packagekit-0.1.9.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 21 Feb 2008 22:06:58 -0000 1.9 +++ sources 5 Mar 2008 19:37:24 -0000 1.10 @@ -1 +1 @@ -e2c91036d945985b835d95a8e2dacbc2 gnome-packagekit-0.1.8.tar.gz +531969d7299aeb1c9a19453481541c60 gnome-packagekit-0.1.9.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 19:38:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 19:38:48 GMT Subject: rpms/perl-GraphViz/devel perl-GraphViz.spec,1.3,1.4 Message-ID: <200803051938.m25JcmEI015044@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-GraphViz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15024 Modified Files: perl-GraphViz.spec Log Message: new perl Index: perl-GraphViz.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-GraphViz/devel/perl-GraphViz.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-GraphViz.spec 19 Apr 2007 18:48:30 -0000 1.3 +++ perl-GraphViz.spec 5 Mar 2008 19:38:18 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-GraphViz Version: 2.02 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interface to the GraphViz graphing tool -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/GraphViz/ Source0: http://www.cpan.org/authors/id/L/LB/LBROCARD/GraphViz-%{version}.tar.gz @@ -59,6 +59,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 2.02-3 +- rebuild for new perl + * Thu Apr 19 2007 Chris Weyl 2.02-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 19:43:07 2008 From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk)) Date: Wed, 5 Mar 2008 19:43:07 GMT Subject: rpms/linuxwacom/devel linuxwacom.spec,1.52,1.53 Message-ID: <200803051943.m25Jh7eP015305@cvs-int.fedora.redhat.com> Author: arozansk Update of /cvs/pkgs/rpms/linuxwacom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15260 Modified Files: linuxwacom.spec Log Message: * removing configuration tools from the package Index: linuxwacom.spec =================================================================== RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- linuxwacom.spec 5 Mar 2008 00:53:44 -0000 1.52 +++ linuxwacom.spec 5 Mar 2008 19:42:36 -0000 1.53 @@ -3,7 +3,7 @@ # Upstream's versioning is goofy. Note the mapping from tarname to version. Name: linuxwacom Version: 0.7.9.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wacom Drivers from Linux Wacom Project Group: User Interface/X Hardware Support @@ -19,8 +19,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRequires: libX11-devel libXi-devel ncurses-devel BuildRequires: xorg-x11-server-sdk >= 1.4.99.1 -BuildRequires: autoconf automake libtool tk-devel tcl-devel xorg-x11-server-Xorg -Requires: xorg-x11-server-Xorg >= 1.4.99.1, udev >= 030-21 tk tcl +BuildRequires: autoconf automake libtool xorg-x11-server-Xorg +Requires: xorg-x11-server-Xorg >= 1.4.99.1, udev >= 030-21 ExclusiveArch: %{ix86} x86_64 alpha ia64 ppc ppc64 sparc sparc64 %description @@ -57,7 +57,8 @@ fi export RPM_LIBDIR=%{_lib} -%configure --without-gtk --enable-dlloader $XSERVER64 +%configure --without-gtk --enable-dlloader $XSERVER64 \ + --without-tk --without-tcl export CFLAGS="$RPM_OPT_FLAGS" make @@ -89,10 +90,7 @@ %{_bindir}/wacdump %{_bindir}/xidump %{_bindir}/xsetwacom -%{_bindir}/wacomcpl -%{_bindir}/wacomcpl-exec %{_libdir}/libwacomcfg*so.* -%{_libdir}/TkXInput/* %{_mandir}/man4/wacom.4* %{_sysconfdir}/udev/rules.d/60-wacom.rules @@ -104,6 +102,9 @@ %{_libdir}/libwacomcfg*.so %changelog +* Wed Mar 05 2008 Aristeu Rozanski - 0.7.9.8-2 +- Removed configuration tools + * Fri Feb 22 2008 Aristeu Rozanski - 0.7.9.8-1 - Fixed build - New upstream version From fedora-extras-commits at redhat.com Wed Mar 5 19:43:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:43:15 GMT Subject: rpms/libsoup22 - New directory Message-ID: <200803051943.m25JhFjZ015335@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libsoup22 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15288/rpms/libsoup22 Log Message: Directory /cvs/extras/rpms/libsoup22 added to the repository From fedora-extras-commits at redhat.com Wed Mar 5 19:43:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:43:16 GMT Subject: rpms/libsoup22/devel - New directory Message-ID: <200803051943.m25JhG72015344@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libsoup22/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15288/rpms/libsoup22/devel Log Message: Directory /cvs/extras/rpms/libsoup22/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 5 19:43:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:43:19 GMT Subject: rpms/libsoup22 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803051943.m25JhJIN015374@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libsoup22 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15288/rpms/libsoup22 Added Files: Makefile import.log Log Message: Setup of module libsoup22 --- NEW FILE Makefile --- # Top level Makefile for module libsoup22 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 5 19:43:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:43:19 GMT Subject: rpms/libsoup22/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803051943.m25JhJSP015390@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/libsoup22/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx15288/rpms/libsoup22/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libsoup22 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: libsoup22 # $Id: Makefile,v 1.1 2008/03/05 19:43:19 kevin Exp $ NAME := libsoup22 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Mar 5 19:44:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:44:43 +0000 Subject: [pkgdb] cpdup was added for salimma Message-ID: <200803051946.m25Jk6mR022601@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package cpdup with summary Filesystem mirroring utility Kevin Fenzi (kevin) has approved Package cpdup Kevin Fenzi (kevin) has added a Fedora devel branch for cpdup with an owner of salimma Kevin Fenzi (kevin) has approved cpdup in Fedora devel Kevin Fenzi (kevin) has approved Package cpdup Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cpdup (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cpdup (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cpdup (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpdup From fedora-extras-commits at redhat.com Wed Mar 5 19:45:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:45:21 +0000 Subject: [pkgdb] cpdup (Fedora, 7) updated by kevin Message-ID: <200803051946.m25JkVFK022634@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for cpdup Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cpdup (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cpdup (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cpdup (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on cpdup (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpdup From fedora-extras-commits at redhat.com Wed Mar 5 19:45:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:45:21 +0000 Subject: [pkgdb] cpdup (Fedora, 8) updated by kevin Message-ID: <200803051946.m25JkVFI022634@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for cpdup Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cpdup (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cpdup (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cpdup (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on cpdup (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpdup From fedora-extras-commits at redhat.com Wed Mar 5 19:45:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:45:21 +0000 Subject: [pkgdb] cpdup (Fedora, devel) updated by kevin Message-ID: <200803051946.m25JkVIt022633@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on cpdup (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpdup From fedora-extras-commits at redhat.com Wed Mar 5 19:45:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:45:21 +0000 Subject: [pkgdb] cpdup (Fedora EPEL, 5) updated by kevin Message-ID: <200803051946.m25JkVFN022634@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for cpdup Kevin Fenzi (kevin) has set commit to Approved for cvsextras on cpdup (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on cpdup (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on cpdup (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on cpdup (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cpdup From fedora-extras-commits at redhat.com Wed Mar 5 19:45:36 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:45:36 GMT Subject: rpms/cpdup - New directory Message-ID: <200803051945.m25JjaKp015565@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cpdup In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv15530/rpms/cpdup Log Message: Directory /cvs/extras/rpms/cpdup added to the repository From fedora-extras-commits at redhat.com Wed Mar 5 19:45:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:45:45 GMT Subject: rpms/cpdup/devel - New directory Message-ID: <200803051945.m25JjjjL015581@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cpdup/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv15530/rpms/cpdup/devel Log Message: Directory /cvs/extras/rpms/cpdup/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 5 19:45:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:45:51 GMT Subject: rpms/cpdup Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803051945.m25JjpN3015608@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cpdup In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv15530/rpms/cpdup Added Files: Makefile import.log Log Message: Setup of module cpdup --- NEW FILE Makefile --- # Top level Makefile for module cpdup all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 5 19:45:58 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:45:58 GMT Subject: rpms/cpdup/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803051945.m25JjwYg015627@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/cpdup/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv15530/rpms/cpdup/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cpdup --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: cpdup # $Id: Makefile,v 1.1 2008/03/05 19:45:51 kevin Exp $ NAME := cpdup SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Mar 5 19:46:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:46:31 +0000 Subject: [pkgdb] ocaml-lacaml was added for rjones Message-ID: <200803051947.m25Jlt33022873@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-lacaml with summary BLAS/LAPACK-interface for OCaml Kevin Fenzi (kevin) has approved Package ocaml-lacaml Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-lacaml with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-lacaml in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-lacaml Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-lacaml (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-lacaml (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-lacaml (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml From fedora-extras-commits at redhat.com Wed Mar 5 19:46:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:46:41 +0000 Subject: [pkgdb] ocaml-lacaml (Fedora, 8) updated by kevin Message-ID: <200803051948.m25Jm5KW022938@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-lacaml Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-lacaml (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-lacaml (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-lacaml (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-lacaml (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml From fedora-extras-commits at redhat.com Wed Mar 5 19:46:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:46:41 +0000 Subject: [pkgdb] ocaml-lacaml (Fedora, devel) updated by kevin Message-ID: <200803051948.m25Jm5KZ022938@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-lacaml (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml From fedora-extras-commits at redhat.com Wed Mar 5 19:47:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:47:33 GMT Subject: rpms/ocaml-lacaml - New directory Message-ID: <200803051947.m25JlXI0015943@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-lacaml In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS15898/rpms/ocaml-lacaml Log Message: Directory /cvs/extras/rpms/ocaml-lacaml added to the repository From fedora-extras-commits at redhat.com Wed Mar 5 19:47:36 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:47:36 GMT Subject: rpms/ocaml-lacaml/devel - New directory Message-ID: <200803051947.m25JlajJ015960@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-lacaml/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS15898/rpms/ocaml-lacaml/devel Log Message: Directory /cvs/extras/rpms/ocaml-lacaml/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 5 19:47:47 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:47:47 GMT Subject: rpms/ocaml-lacaml Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803051947.m25JllLJ015986@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-lacaml In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS15898/rpms/ocaml-lacaml Added Files: Makefile import.log Log Message: Setup of module ocaml-lacaml --- NEW FILE Makefile --- # Top level Makefile for module ocaml-lacaml all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 5 19:47:50 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:47:50 GMT Subject: rpms/ocaml-lacaml/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803051947.m25Jloxh016002@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-lacaml/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS15898/rpms/ocaml-lacaml/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-lacaml --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-lacaml # $Id: Makefile,v 1.1 2008/03/05 19:47:48 kevin Exp $ NAME := ocaml-lacaml SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Mar 5 19:48:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:48:27 +0000 Subject: [pkgdb] ocaml-camlidl was added for rjones Message-ID: <200803051949.m25Jnpjm023110@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-camlidl with summary Stub code generator and COM binding for Objective Caml Kevin Fenzi (kevin) has approved Package ocaml-camlidl Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-camlidl with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-camlidl in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-camlidl Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-camlidl (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-camlidl (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-camlidl (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl From fedora-extras-commits at redhat.com Wed Mar 5 19:48:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:48:50 +0000 Subject: [pkgdb] ocaml-camlidl (Fedora, 8) updated by kevin Message-ID: <200803051950.m25Jo0f6023132@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-camlidl Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-camlidl (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-camlidl (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-camlidl (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-camlidl (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl From fedora-extras-commits at redhat.com Wed Mar 5 19:48:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 05 Mar 2008 19:48:50 +0000 Subject: [pkgdb] ocaml-camlidl (Fedora, devel) updated by kevin Message-ID: <200803051950.m25Jo0f9023132@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-camlidl (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl From fedora-extras-commits at redhat.com Wed Mar 5 19:49:12 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:49:12 GMT Subject: rpms/ocaml-camlidl - New directory Message-ID: <200803051949.m25JnCjs016145@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-camlidl In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN16114/rpms/ocaml-camlidl Log Message: Directory /cvs/extras/rpms/ocaml-camlidl added to the repository From fedora-extras-commits at redhat.com Wed Mar 5 19:49:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:49:16 GMT Subject: rpms/ocaml-camlidl/devel - New directory Message-ID: <200803051949.m25JnGQW016166@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-camlidl/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN16114/rpms/ocaml-camlidl/devel Log Message: Directory /cvs/extras/rpms/ocaml-camlidl/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 5 19:49:25 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:49:25 GMT Subject: rpms/ocaml-camlidl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803051949.m25JnP2c016193@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-camlidl In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN16114/rpms/ocaml-camlidl Added Files: Makefile import.log Log Message: Setup of module ocaml-camlidl --- NEW FILE Makefile --- # Top level Makefile for module ocaml-camlidl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 5 19:49:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 5 Mar 2008 19:49:28 GMT Subject: rpms/ocaml-camlidl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803051949.m25JnS8J016209@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-camlidl/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN16114/rpms/ocaml-camlidl/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-camlidl --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-camlidl # $Id: Makefile,v 1.1 2008/03/05 19:49:25 kevin Exp $ NAME := ocaml-camlidl SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Mar 5 20:07:08 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 5 Mar 2008 20:07:08 GMT Subject: rpms/environment-modules/devel modules-3.2.6-versioning.patch, NONE, 1.1 environment-modules.spec, 1.14, 1.15 Message-ID: <200803052007.m25K78s5024952@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/environment-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857 Modified Files: environment-modules.spec Added Files: modules-3.2.6-versioning.patch Log Message: * Wed Mar 5 2008 - Orion Poplawski - 3.2.6-4 - Add patch to fix extraneous version path entry properly - Use --with-module-path to point to /etc/modulefiles for local modules, this also fixes bug #436041 modules-3.2.6-versioning.patch: --- NEW FILE modules-3.2.6-versioning.patch --- --- modules-3.2.6/modulefiles/modules.in.versioning 2007-03-25 08:24:51.000000000 -0600 +++ modules-3.2.6/modulefiles/modules.in 2008-03-05 10:32:38.000000000 -0700 @@ -24,5 +24,5 @@ prepend-path PATH $modroot/bin prepend-path MANPATH $modroot/share/man -module use @VERSIONPATH@ + at VERSIONING@module use @VERSIONPATH@ Index: environment-modules.spec =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- environment-modules.spec 9 Feb 2008 17:35:21 -0000 1.14 +++ environment-modules.spec 5 Mar 2008 20:06:24 -0000 1.15 @@ -1,12 +1,13 @@ Name: environment-modules Version: 3.2.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base License: GPLv2+ URL: http://modules.sourceforge.net/ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 +Patch0: modules-3.2.6-versioning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcl-devel, tclx-devel @@ -35,12 +36,14 @@ %prep %setup -q -n modules-%{version} +%patch -p1 -b .versioning %build %configure --disable-versioning --prefix=%{_datadir} \ --exec-prefix=%{_datadir}/Modules \ - --with-version-path=%{_datadir}/Modules/modulefiles + --with-module-path=%{_sysconfdir}/modulefiles +# --with-debug=42 --with-log-facility-debug=stderr make %{?_smp_mflags} @@ -50,6 +53,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d ln -s %{_datadir}/Modules/init/bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles %clean @@ -59,6 +63,7 @@ %files %defattr(-,root,root,-) %doc LICENSE.GPL README TODO +%{_sysconfdir}/modulefiles %{_sysconfdir}/profile.d/* %{_bindir}/modulecmd %{_datadir}/Modules/ @@ -67,7 +72,12 @@ %changelog -* Sat Feb 9 2008 - Orion Poplawski - 3.2.6-2 +* Wed Mar 5 2008 - Orion Poplawski - 3.2.6-4 +- Add patch to fix extraneous version path entry properly +- Use --with-module-path to point to /etc/modulefiles for local modules, + this also fixes bug #436041 + +* Sat Feb 9 2008 - Orion Poplawski - 3.2.6-3 - Rebuild for gcc 3.4 * Thu Jan 03 2008 - Alex Lancaster - 3.2.6-2 From fedora-extras-commits at redhat.com Wed Mar 5 20:12:13 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 5 Mar 2008 20:12:13 GMT Subject: rpms/environment-modules/EL-4 modules-3.2.6-versioning.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 environment-modules.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200803052012.m25KCDDi025757@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/environment-modules/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25608/EL-4 Modified Files: .cvsignore environment-modules.spec sources Added Files: modules-3.2.6-versioning.patch Log Message: Sync to devel modules-3.2.6-versioning.patch: --- NEW FILE modules-3.2.6-versioning.patch --- --- modules-3.2.6/modulefiles/modules.in.versioning 2007-03-25 08:24:51.000000000 -0600 +++ modules-3.2.6/modulefiles/modules.in 2008-03-05 10:32:38.000000000 -0700 @@ -24,5 +24,5 @@ prepend-path PATH $modroot/bin prepend-path MANPATH $modroot/share/man -module use @VERSIONPATH@ + at VERSIONING@module use @VERSIONPATH@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/EL-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Feb 2007 18:58:44 -0000 1.7 +++ .cvsignore 5 Mar 2008 20:11:29 -0000 1.8 @@ -1 +1 @@ -modules-3.2.5.tar.bz2 +modules-3.2.6.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/EL-4/environment-modules.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- environment-modules.spec 21 Aug 2007 20:35:23 -0000 1.12 +++ environment-modules.spec 5 Mar 2008 20:11:29 -0000 1.13 @@ -1,12 +1,13 @@ Name: environment-modules -Version: 3.2.5 -Release: 2%{?dist} +Version: 3.2.6 +Release: 4%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base License: GPLv2+ URL: http://modules.sourceforge.net/ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 +Patch0: modules-3.2.6-versioning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcl-devel, tclx-devel @@ -35,12 +36,14 @@ %prep %setup -q -n modules-%{version} +%patch -p1 -b .versioning %build %configure --disable-versioning --prefix=%{_datadir} \ --exec-prefix=%{_datadir}/Modules \ - --with-version-path=%{_datadir}/Modules/modulefiles + --with-module-path=%{_sysconfdir}/modulefiles +# --with-debug=42 --with-log-facility-debug=stderr make %{?_smp_mflags} @@ -50,6 +53,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d ln -s %{_datadir}/Modules/init/bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles %clean @@ -59,6 +63,7 @@ %files %defattr(-,root,root,-) %doc LICENSE.GPL README TODO +%{_sysconfdir}/modulefiles %{_sysconfdir}/profile.d/* %{_bindir}/modulecmd %{_datadir}/Modules/ @@ -67,6 +72,20 @@ %changelog +* Wed Mar 5 2008 - Orion Poplawski - 3.2.6-4 +- Add patch to fix extraneous version path entry properly +- Use --with-module-path to point to /etc/modulefiles for local modules, + this also fixes bug #436041 + +* Sat Feb 9 2008 - Orion Poplawski - 3.2.6-3 +- Rebuild for gcc 3.4 + +* Thu Jan 03 2008 - Alex Lancaster - 3.2.6-2 +- Rebuild for new Tcl (8.5). + +* Fri Nov 2 2007 - Orion Poplawski - 3.2.6-1 +- Update to 3.2.6 + * Tue Aug 21 2007 - Orion Poplawski - 3.2.5-2 - Update license tag to GPLv2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/EL-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Feb 2007 18:58:44 -0000 1.7 +++ sources 5 Mar 2008 20:11:29 -0000 1.8 @@ -1 +1 @@ -4eff5018b9c870af44940e81ccb11813 modules-3.2.5.tar.bz2 +59bc6401efbc677d6190b00a440cccdf modules-3.2.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 20:12:22 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 5 Mar 2008 20:12:22 GMT Subject: rpms/environment-modules/EL-5 modules-3.2.6-versioning.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 environment-modules.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200803052012.m25KCMKb025769@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/environment-modules/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25608/EL-5 Modified Files: .cvsignore environment-modules.spec sources Added Files: modules-3.2.6-versioning.patch Log Message: Sync to devel modules-3.2.6-versioning.patch: --- NEW FILE modules-3.2.6-versioning.patch --- --- modules-3.2.6/modulefiles/modules.in.versioning 2007-03-25 08:24:51.000000000 -0600 +++ modules-3.2.6/modulefiles/modules.in 2008-03-05 10:32:38.000000000 -0700 @@ -24,5 +24,5 @@ prepend-path PATH $modroot/bin prepend-path MANPATH $modroot/share/man -module use @VERSIONPATH@ + at VERSIONING@module use @VERSIONPATH@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/EL-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Apr 2007 15:14:51 -0000 1.7 +++ .cvsignore 5 Mar 2008 20:11:44 -0000 1.8 @@ -1 +1 @@ -modules-3.2.5.tar.bz2 +modules-3.2.6.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/EL-5/environment-modules.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- environment-modules.spec 21 Aug 2007 20:35:26 -0000 1.10 +++ environment-modules.spec 5 Mar 2008 20:11:44 -0000 1.11 @@ -1,12 +1,13 @@ Name: environment-modules -Version: 3.2.5 -Release: 2%{?dist} +Version: 3.2.6 +Release: 4%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base License: GPLv2+ URL: http://modules.sourceforge.net/ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 +Patch0: modules-3.2.6-versioning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcl-devel, tclx-devel @@ -35,12 +36,14 @@ %prep %setup -q -n modules-%{version} +%patch -p1 -b .versioning %build %configure --disable-versioning --prefix=%{_datadir} \ --exec-prefix=%{_datadir}/Modules \ - --with-version-path=%{_datadir}/Modules/modulefiles + --with-module-path=%{_sysconfdir}/modulefiles +# --with-debug=42 --with-log-facility-debug=stderr make %{?_smp_mflags} @@ -50,6 +53,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d ln -s %{_datadir}/Modules/init/bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles %clean @@ -59,6 +63,7 @@ %files %defattr(-,root,root,-) %doc LICENSE.GPL README TODO +%{_sysconfdir}/modulefiles %{_sysconfdir}/profile.d/* %{_bindir}/modulecmd %{_datadir}/Modules/ @@ -67,6 +72,20 @@ %changelog +* Wed Mar 5 2008 - Orion Poplawski - 3.2.6-4 +- Add patch to fix extraneous version path entry properly +- Use --with-module-path to point to /etc/modulefiles for local modules, + this also fixes bug #436041 + +* Sat Feb 9 2008 - Orion Poplawski - 3.2.6-3 +- Rebuild for gcc 3.4 + +* Thu Jan 03 2008 - Alex Lancaster - 3.2.6-2 +- Rebuild for new Tcl (8.5). + +* Fri Nov 2 2007 - Orion Poplawski - 3.2.6-1 +- Update to 3.2.6 + * Tue Aug 21 2007 - Orion Poplawski - 3.2.5-2 - Update license tag to GPLv2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/EL-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 20 Apr 2007 15:14:51 -0000 1.7 +++ sources 5 Mar 2008 20:11:44 -0000 1.8 @@ -1 +1 @@ -4eff5018b9c870af44940e81ccb11813 modules-3.2.5.tar.bz2 +59bc6401efbc677d6190b00a440cccdf modules-3.2.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 20:12:32 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 5 Mar 2008 20:12:32 GMT Subject: rpms/environment-modules/F-7 modules-3.2.6-versioning.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 environment-modules.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200803052012.m25KCWNL025777@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/environment-modules/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25608/F-7 Modified Files: .cvsignore environment-modules.spec sources Added Files: modules-3.2.6-versioning.patch Log Message: Sync to devel modules-3.2.6-versioning.patch: --- NEW FILE modules-3.2.6-versioning.patch --- --- modules-3.2.6/modulefiles/modules.in.versioning 2007-03-25 08:24:51.000000000 -0600 +++ modules-3.2.6/modulefiles/modules.in 2008-03-05 10:32:38.000000000 -0700 @@ -24,5 +24,5 @@ prepend-path PATH $modroot/bin prepend-path MANPATH $modroot/share/man -module use @VERSIONPATH@ + at VERSIONING@module use @VERSIONPATH@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/F-7/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Feb 2007 18:58:44 -0000 1.7 +++ .cvsignore 5 Mar 2008 20:11:52 -0000 1.8 @@ -1 +1 @@ -modules-3.2.5.tar.bz2 +modules-3.2.6.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/F-7/environment-modules.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- environment-modules.spec 21 Aug 2007 20:35:29 -0000 1.11 +++ environment-modules.spec 5 Mar 2008 20:11:52 -0000 1.12 @@ -1,12 +1,13 @@ Name: environment-modules -Version: 3.2.5 -Release: 2%{?dist} +Version: 3.2.6 +Release: 4%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base License: GPLv2+ URL: http://modules.sourceforge.net/ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 +Patch0: modules-3.2.6-versioning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcl-devel, tclx-devel @@ -35,12 +36,14 @@ %prep %setup -q -n modules-%{version} +%patch -p1 -b .versioning %build %configure --disable-versioning --prefix=%{_datadir} \ --exec-prefix=%{_datadir}/Modules \ - --with-version-path=%{_datadir}/Modules/modulefiles + --with-module-path=%{_sysconfdir}/modulefiles +# --with-debug=42 --with-log-facility-debug=stderr make %{?_smp_mflags} @@ -50,6 +53,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d ln -s %{_datadir}/Modules/init/bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles %clean @@ -59,6 +63,7 @@ %files %defattr(-,root,root,-) %doc LICENSE.GPL README TODO +%{_sysconfdir}/modulefiles %{_sysconfdir}/profile.d/* %{_bindir}/modulecmd %{_datadir}/Modules/ @@ -67,6 +72,20 @@ %changelog +* Wed Mar 5 2008 - Orion Poplawski - 3.2.6-4 +- Add patch to fix extraneous version path entry properly +- Use --with-module-path to point to /etc/modulefiles for local modules, + this also fixes bug #436041 + +* Sat Feb 9 2008 - Orion Poplawski - 3.2.6-3 +- Rebuild for gcc 3.4 + +* Thu Jan 03 2008 - Alex Lancaster - 3.2.6-2 +- Rebuild for new Tcl (8.5). + +* Fri Nov 2 2007 - Orion Poplawski - 3.2.6-1 +- Update to 3.2.6 + * Tue Aug 21 2007 - Orion Poplawski - 3.2.5-2 - Update license tag to GPLv2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/F-7/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Feb 2007 18:58:44 -0000 1.7 +++ sources 5 Mar 2008 20:11:52 -0000 1.8 @@ -1 +1 @@ -4eff5018b9c870af44940e81ccb11813 modules-3.2.5.tar.bz2 +59bc6401efbc677d6190b00a440cccdf modules-3.2.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 20:12:37 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 5 Mar 2008 20:12:37 GMT Subject: rpms/environment-modules/F-8 modules-3.2.6-versioning.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 environment-modules.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200803052012.m25KCbBU025789@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/environment-modules/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25608/F-8 Modified Files: .cvsignore environment-modules.spec sources Added Files: modules-3.2.6-versioning.patch Log Message: Sync to devel modules-3.2.6-versioning.patch: --- NEW FILE modules-3.2.6-versioning.patch --- --- modules-3.2.6/modulefiles/modules.in.versioning 2007-03-25 08:24:51.000000000 -0600 +++ modules-3.2.6/modulefiles/modules.in 2008-03-05 10:32:38.000000000 -0700 @@ -24,5 +24,5 @@ prepend-path PATH $modroot/bin prepend-path MANPATH $modroot/share/man -module use @VERSIONPATH@ + at VERSIONING@module use @VERSIONPATH@ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Feb 2007 18:58:44 -0000 1.7 +++ .cvsignore 5 Mar 2008 20:12:02 -0000 1.8 @@ -1 +1 @@ -modules-3.2.5.tar.bz2 +modules-3.2.6.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/F-8/environment-modules.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- environment-modules.spec 21 Aug 2007 20:35:41 -0000 1.11 +++ environment-modules.spec 5 Mar 2008 20:12:02 -0000 1.12 @@ -1,12 +1,13 @@ Name: environment-modules -Version: 3.2.5 -Release: 2%{?dist} +Version: 3.2.6 +Release: 4%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base License: GPLv2+ URL: http://modules.sourceforge.net/ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 +Patch0: modules-3.2.6-versioning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcl-devel, tclx-devel @@ -35,12 +36,14 @@ %prep %setup -q -n modules-%{version} +%patch -p1 -b .versioning %build %configure --disable-versioning --prefix=%{_datadir} \ --exec-prefix=%{_datadir}/Modules \ - --with-version-path=%{_datadir}/Modules/modulefiles + --with-module-path=%{_sysconfdir}/modulefiles +# --with-debug=42 --with-log-facility-debug=stderr make %{?_smp_mflags} @@ -50,6 +53,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d ln -s %{_datadir}/Modules/init/bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles %clean @@ -59,6 +63,7 @@ %files %defattr(-,root,root,-) %doc LICENSE.GPL README TODO +%{_sysconfdir}/modulefiles %{_sysconfdir}/profile.d/* %{_bindir}/modulecmd %{_datadir}/Modules/ @@ -67,6 +72,20 @@ %changelog +* Wed Mar 5 2008 - Orion Poplawski - 3.2.6-4 +- Add patch to fix extraneous version path entry properly +- Use --with-module-path to point to /etc/modulefiles for local modules, + this also fixes bug #436041 + +* Sat Feb 9 2008 - Orion Poplawski - 3.2.6-3 +- Rebuild for gcc 3.4 + +* Thu Jan 03 2008 - Alex Lancaster - 3.2.6-2 +- Rebuild for new Tcl (8.5). + +* Fri Nov 2 2007 - Orion Poplawski - 3.2.6-1 +- Update to 3.2.6 + * Tue Aug 21 2007 - Orion Poplawski - 3.2.5-2 - Update license tag to GPLv2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/environment-modules/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Feb 2007 18:58:44 -0000 1.7 +++ sources 5 Mar 2008 20:12:02 -0000 1.8 @@ -1 +1 @@ -4eff5018b9c870af44940e81ccb11813 modules-3.2.5.tar.bz2 +59bc6401efbc677d6190b00a440cccdf modules-3.2.6.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 20:14:54 2008 From: fedora-extras-commits at redhat.com (Guenther Deschner (gd)) Date: Wed, 5 Mar 2008 20:14:54 GMT Subject: rpms/samba/devel samba-3.2.0pre2-libnetapi_fix.diff, NONE, 1.1 samba-3.2.0pre2-build_fixes.patch, NONE, 1.1 samba.spec, 1.141, 1.142 sources, 1.49, 1.50 .cvsignore, 1.45, 1.46 Message-ID: <200803052014.m25KEsE8026217@cvs-int.fedora.redhat.com> Author: gd Update of /cvs/pkgs/rpms/samba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26032 Modified Files: samba.spec sources .cvsignore Added Files: samba-3.2.0pre2-libnetapi_fix.diff samba-3.2.0pre2-build_fixes.patch Log Message: Update to Samba 3.2.0pre2. Guenther samba-3.2.0pre2-libnetapi_fix.diff: --- NEW FILE samba-3.2.0pre2-libnetapi_fix.diff --- commit 29fca3c0353f2be4577613d7e38fbc51d2a370fa Author: G??nther Deschner Date: Wed Mar 5 13:20:32 2008 +0100 Add PICFLAG to libnetapi Makefile. Guenther diff --git a/source/lib/netapi/examples/Makefile.in b/source/lib/netapi/examples/Makefile.in index 6de3e65..000eef1 100644 --- a/source/lib/netapi/examples/Makefile.in +++ b/source/lib/netapi/examples/Makefile.in @@ -7,6 +7,7 @@ LIBS=@LIBS@ -lnetapi -ltdb -ltalloc DEVELOPER_CFLAGS=@DEVELOPER_CFLAGS@ FLAGS=-I../ -L../../../bin @CFLAGS@ $(GTK_FLAGS) CC=@CC@ +PICFLAG=@PICFLAG@ LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@ DYNEXP=@DYNEXP@ samba-3.2.0pre2-build_fixes.patch: --- NEW FILE samba-3.2.0pre2-build_fixes.patch --- commit cd582b7705dca40b3c688c9e23d8375dab43b4d0 Author: G??nther Deschner Date: Wed Mar 5 11:31:26 2008 +0100 Fix build of pam_smbpass. Guenther diff --git a/source/Makefile.in b/source/Makefile.in index 04df5cf..d61de37 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1905,7 +1905,8 @@ bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \ bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @echo "Linking shared library $@" - @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) + @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ + @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTDB_SHARED@ @echo Linking $@ commit 7dbc251e1cd28abf28342529607fa4b5f579a9c4 Author: Michael Adam Date: Wed Mar 5 11:39:47 2008 +0100 Makefile: Add explicit dependecies to libtalloc.so. So as to fix building of isolated targets. Michael diff --git a/source/Makefile.in b/source/Makefile.in index d61de37..cdb7cee 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1264,48 +1264,48 @@ bin/.dummy: dir=bin $(MAKEDIR); fi @: >> $@ || : > $@ # what a fancy emoticon! -bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@ +bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \ $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \ $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) \ @POPTLIBS@ @SMBD_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @LIBTDB_LIBS@ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) -bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \ $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS) \ $(LDAP_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \ $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \ $(KRB5LIBS) $(LDAP_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \ $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \ @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ @LIBNETAPI_LIBS@ -bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ @@ -1317,160 +1317,160 @@ bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ -bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) -lkeyutils $(LIBS) \ $(LIBSMBCLIENT_OBJ0) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBWBCLIENT_SHARED@ @LIBTDB_LIBS@ -bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) \ @POPTLIBS@ @LIBTDB_LIBS@ -bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \ $(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \ $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ @LIBTDB_LIBS@ -bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) \ $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \ $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) \ @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @POPTLIBS@ $(LDAP_LIBS) @LIBTDB_LIBS@ -bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \ $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ +bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \ $(DYNEXP) $(LIBS) @POPTLIBS@ -bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ -bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ -bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ +bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(LIBS) -bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ @LDAP_LIBS@ @LIBTDB_LIBS@ -bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ +bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) -bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ +bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ -bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ @@ -1511,7 +1511,7 @@ bin/libwbclient.a: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) -bin/libaddns. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ) +bin/libaddns. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \ $(KRB5LIBS) $(UUID_LIBS)\ @@ -1521,7 +1521,7 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBADDNS_OBJ) -$(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +$(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBNETAPI_OBJ) @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ $(LIBS) \ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ @@ -1532,7 +1532,7 @@ $(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBNETAPI_OBJ1) -bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @@ -1542,7 +1542,7 @@ bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ0) -bin/libsmbsharemodes. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBTDB_SHARED@ +bin/libsmbsharemodes. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LIBS) @LIBTDB_LIBS@ \ $(KRB5LIBS) $(LDAP_LIBS) \ @@ -1553,7 +1553,7 @@ bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ) # This is probably wrong for anything other than the GNU linker. -bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) +bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTALLOC_SHARED@ @echo Linking shared library $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) $(LIBS) \ $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \ @@ -1633,13 +1633,13 @@ bin/librpc_echo. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_ECHO_OBJ) @echo "Linking $@" @$(SHLD_MODULE) $(RPC_ECHO_OBJ) -bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo "Linking $@" @$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) \ $(PASSDB_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo "Linking $@" @$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ @@ -1649,7 +1649,7 @@ bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTDB_SHARED@ @LIBWBCLIENT_SHARE @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_OBJ) \ @WINBIND_NSS_EXTRA_LIBS@ @WINBIND_NSS_PTHREAD@ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ - at WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTDB_SHARED@ + at WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo "Linking $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \ $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) @LIBTDB_LIBS@ \ @@ -1890,47 +1890,47 @@ bin/registry. at SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/registry.o ## None here right now ######################################################### -bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \ $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \ - $(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ + $(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) +bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ @echo "Linking shared library $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTDB_SHARED@ +bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) $(LIBS) @LIBTDB_LIBS@ -bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTDB_SHARED@ +bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) $(LIBS) @LIBTDB_LIBS@ -bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTDB_SHARED@ +bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) $(LIBS) @LIBTDB_LIBS@ -bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTDB_SHARED@ +bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) $(LIBS) @LIBTDB_LIBS@ -bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o +bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud -bin/t_strstr at EXEEXT@: $(BINARY_PREREQS) bin/libbigballofmud. at SHLIBEXT@ torture/t_strstr.o +bin/t_strstr at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strstr.o $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strstr.o -L ./bin -lbigballofmud -bin/t_strappend at EXEEXT@: $(BINARY_PREREQS) bin/libbigballofmud. at SHLIBEXT@ torture/t_strappend.o +bin/t_strappend at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strappend.o $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strappend.o -L ./bin -lbigballofmud bin/t_stringoverflow at EXEEXT@: $(BINARY_PREREQS) bin/libbigballofmud. at SHLIBEXT@ torture/t_stringoverflow.o commit 237ea62a49fbf47634b55795c1065250d5148600 Author: Michael Adam Date: Wed Mar 5 14:16:46 2008 +0100 Makefile: untangle -ltalloc from LIBS, making use of libtalloc explicit. Michael diff --git a/source/Makefile.in b/source/Makefile.in index cdb7cee..8dbd1d5 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -18,7 +18,7 @@ datarootdir=@datarootdir@ selftest_prefix=@selftest_prefix@ smbtorture4_path=@smbtorture4_path@ -LIBS=@LIBS@ @LIBTALLOC_LIBS@ +LIBS=@LIBS@ CC=@CC@ SHLD=@SHLD@ LIB_PATH_VAR=@LIB_PATH_VAR@ @@ -1269,45 +1269,45 @@ bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARE @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \ $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \ $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) \ - @POPTLIBS@ @SMBD_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @POPTLIBS@ @SMBD_LIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ - @LIBTDB_LIBS@ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \ $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS) \ - $(LDAP_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \ $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \ - $(KRB5LIBS) $(LDAP_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(KRB5LIBS) $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \ $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \ - @LIBTDB_LIBS@ @WINBIND_LIBS@ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ - $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ @LIBNETAPI_LIBS@ + $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ @LIBNETAPI_LIBS@ bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/mount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_MOUNT_OBJ) @BUILD_POPT@ @echo Linking $@ @@ -1320,161 +1320,161 @@ bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@ bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) -lkeyutils $(LIBS) \ - $(LIBSMBCLIENT_OBJ0) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBWBCLIENT_SHARED@ @LIBTDB_LIBS@ + $(LIBSMBCLIENT_OBJ0) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBWBCLIENT_SHARED@ @LIBTDB_LIBS@ bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) \ - @POPTLIBS@ @LIBTDB_LIBS@ + @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \ $(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \ - $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ @LIBTDB_LIBS@ + $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) \ $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ - @LIBTDB_LIBS@ @WINBIND_LIBS@ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \ $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) \ - @LIBTDB_LIBS@ @WINBIND_LIBS@ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ - @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ - @LIBTDB_LIBS@ @WINBIND_LIBS@ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ - @POPTLIBS@ $(LDAP_LIBS) @LIBTDB_LIBS@ + @POPTLIBS@ $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \ - $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \ - $(DYNEXP) $(LIBS) @POPTLIBS@ + $(DYNEXP) $(LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \ - $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \ - $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ + @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ + @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(LIBS) + @$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(LIBS) @LIBTALLOC_LIBS@ bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ - @POPTLIBS@ @LDAP_LIBS@ @LIBTDB_LIBS@ + @POPTLIBS@ @LDAP_LIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) + @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ - $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ - $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ - $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ - $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ - $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ $(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) @echo Linking shared library $@ @@ -1514,7 +1514,7 @@ bin/libwbclient.a: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) bin/libaddns. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \ - $(KRB5LIBS) $(UUID_LIBS)\ + $(KRB5LIBS) $(UUID_LIBS) @LIBTALLOC_LIBS@ \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @@ -1523,7 +1523,7 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) $(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBNETAPI_OBJ) @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ $(LIBS) \ + @$(SHLD_DSO) $(LIBNETAPI_OBJ) @LIBTALLOC_LIBS@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ $(LIBS) \ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @ln -s -f `basename $@` $@.$(SONAME_VER) @@ -1534,7 +1534,7 @@ $(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ $(LIBS) \ + @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @@ -1544,7 +1544,7 @@ bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0) bin/libsmbsharemodes. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LIBS) @LIBTDB_LIBS@ \ + @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \ $(KRB5LIBS) $(LDAP_LIBS) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @@ -1555,7 +1555,7 @@ bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) # This is probably wrong for anything other than the GNU linker. bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTALLOC_SHARED@ @echo Linking shared library $@ - @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) $(LIBS) \ + @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) $(LIBS) @LIBTALLOC_LIBS@ \ $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \ @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) ln -snf libbigballofmud.so bin/libbigballofmud.so.0 @@ -1637,12 +1637,12 @@ bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_ @echo "Linking $@" @$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) \ - $(PASSDB_LIBS) @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(PASSDB_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo "Linking $@" @$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \ - $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ + $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ) @echo "Linking $@" @@ -1652,7 +1652,7 @@ bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo "Linking $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \ - $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) @LIBTDB_LIBS@ \ + $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ bin/winbind_krb5_locator. at SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) @@ -1893,7 +1893,7 @@ bin/registry. at SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/registry.o bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \ - $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \ $(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @@ -1901,37 +1901,37 @@ bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ - @LIBTDB_LIBS@ @WINBIND_LIBS@ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ @echo "Linking shared library $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ - @LIBTDB_LIBS@ @WINBIND_LIBS@ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) $(LIBS) @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) $(LIBS) @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) $(LIBS) @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) $(LIBS) @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o - $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud + $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ torture/t_strcmp.o -L ./bin -lbigballofmud bin/t_strstr at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strstr.o - $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strstr.o -L ./bin -lbigballofmud + $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ torture/t_strstr.o -L ./bin -lbigballofmud bin/t_strappend at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strappend.o - $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strappend.o -L ./bin -lbigballofmud + $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ torture/t_strappend.o -L ./bin -lbigballofmud bin/t_stringoverflow at EXEEXT@: $(BINARY_PREREQS) bin/libbigballofmud. at SHLIBEXT@ torture/t_stringoverflow.o $(CC) $(FLAGS) -o $@ $(DYNEXP) torture/t_stringoverflow.o -L./bin -lbigballofmud commit e26133808469cb7e9acc41cb15219d7b736d228a Author: Michael Adam Date: Wed Mar 5 15:04:28 2008 +0100 Makefile: reformat - break long target lines. Michael diff --git a/source/Makefile.in b/source/Makefile.in index 8dbd1d5..cfe0095 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -378,7 +378,9 @@ LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \ nsswitch/libwbclient/wbc_idmap.o \ nsswitch/libwbclient/wbc_sid.o \ nsswitch/libwbclient/wbc_pam.o -LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) @LIBTALLOC_STATIC@ $(LIBREPLACE_OBJ) +LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \ + $(WBCOMMON_OBJ) \ + @LIBTALLOC_STATIC@ $(LIBREPLACE_OBJ) GPEXT_OBJ = libgpo/gpext/gpext.o @GPEXT_STATIC@ @@ -1269,12 +1271,14 @@ bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARE @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \ $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \ $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) \ - @POPTLIBS@ @SMBD_LIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @POPTLIBS@ @SMBD_LIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \ + @WINBIND_LIBS@ bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ - @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @POPTLIBS@ \ + $(KRB5LIBS) $(LDAP_LIBS) bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @@ -1286,7 +1290,8 @@ bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLO @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \ $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \ - $(KRB5LIBS) $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(KRB5LIBS) $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \ + @WINBIND_LIBS@ bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @@ -1299,15 +1304,19 @@ bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @L @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ - $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ @LIBNETAPI_LIBS@ + $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \ + @INIPARSERLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ \ + @LIBNETAPI_LIBS@ bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ + $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ + $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/mount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_MOUNT_OBJ) @BUILD_POPT@ @echo Linking $@ @@ -1319,23 +1328,27 @@ bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@ bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) -lkeyutils $(LIBS) \ - $(LIBSMBCLIENT_OBJ0) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBWBCLIENT_SHARED@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) \ + -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ0) $(KRB5LIBS) \ + $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBWBCLIENT_SHARED@ \ + @LIBTDB_LIBS@ bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ + $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) \ - @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ + $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \ - $(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \ - $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + $(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \ + $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @@ -1352,7 +1365,8 @@ bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLO bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ - @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) @LIBTALLOC_LIBS@ \ + @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @@ -1367,12 +1381,15 @@ bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLO bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) \ + $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ \ + @LIBTDB_LIBS@ bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \ - $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @echo Linking $@ @@ -1381,57 +1398,80 @@ bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \ + $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) \ + $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \ - $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) \ + $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \ - $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) \ + $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) \ + $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) \ + $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \ + $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) \ + $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ + @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) \ + $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ + @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ + @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \ + $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \ + $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) \ + @SMBD_LIBS@ $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \ + @LIBWBCLIENT_SHARED@ bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \ + $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@ $(LIBS) @LIBTALLOC_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) \ + @POPTLIBS@ $(LIBS) @LIBTALLOC_LIBS@ bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) \ + $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ @@ -1440,41 +1480,49 @@ bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_SH bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ + @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) \ + $(LIBS) @LIBTALLOC_LIBS@ bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) \ + $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ - @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ - $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \ + $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ + $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ - @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ - $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) \ + $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ + $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ - @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ - $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ + $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ - @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ - $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ + $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ - @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ - $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ + $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ $(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) @echo Linking shared library $@ @@ -1523,7 +1571,8 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) $(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBNETAPI_OBJ) @LIBTALLOC_LIBS@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ $(LIBS) \ + @$(SHLD_DSO) $(LIBNETAPI_OBJ) \ + @LIBTALLOC_LIBS@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ $(LIBS) \ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @ln -s -f `basename $@` $@.$(SONAME_VER) @@ -1534,7 +1583,8 @@ $(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ $(LIBS) \ + @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @@ -1544,7 +1594,8 @@ bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0) bin/libsmbsharemodes. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \ + @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \ + $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \ $(KRB5LIBS) $(LDAP_LIBS) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @@ -1555,7 +1606,8 @@ bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) # This is probably wrong for anything other than the GNU linker. bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTALLOC_SHARED@ @echo Linking shared library $@ - @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) $(LIBS) @LIBTALLOC_LIBS@ \ + @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) \ + $(LIBS) @LIBTALLOC_LIBS@ \ $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \ @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) ln -snf libbigballofmud.so bin/libbigballofmud.so.0 @@ -1641,13 +1693,16 @@ bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_ bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo "Linking $@" - @$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \ - $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ + @$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \ + $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \ + $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ) @echo "Linking $@" @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_OBJ) \ - @WINBIND_NSS_EXTRA_LIBS@ @WINBIND_NSS_PTHREAD@ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ + @WINBIND_NSS_EXTRA_LIBS@ @WINBIND_NSS_PTHREAD@ \ + @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ @WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo "Linking $@" @@ -1893,7 +1948,8 @@ bin/registry. at SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/registry.o bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \ - $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ \ + @WINBIND_LIBS@ bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \ $(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @@ -1905,36 +1961,45 @@ bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \ bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ @echo "Linking shared library $@" - @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ - @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \ + $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) \ + $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) \ + $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) \ + $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ + @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \ + $(LIBS) @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o - $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ torture/t_strcmp.o -L ./bin -lbigballofmud + $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ \ + torture/t_strcmp.o -L ./bin -lbigballofmud bin/t_strstr at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strstr.o - $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ torture/t_strstr.o -L ./bin -lbigballofmud + $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ \ + torture/t_strstr.o -L ./bin -lbigballofmud bin/t_strappend at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strappend.o - $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ torture/t_strappend.o -L ./bin -lbigballofmud + $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) @LIBTALLOC_LIBS@ \ + torture/t_strappend.o -L ./bin -lbigballofmud bin/t_stringoverflow at EXEEXT@: $(BINARY_PREREQS) bin/libbigballofmud. at SHLIBEXT@ torture/t_stringoverflow.o - $(CC) $(FLAGS) -o $@ $(DYNEXP) torture/t_stringoverflow.o -L./bin -lbigballofmud + $(CC) $(FLAGS) -o $@ $(DYNEXP) torture/t_stringoverflow.o \ + -L./bin -lbigballofmud bin/timelimit at EXEEXT@: script/tests/timelimit.o @echo Linking $@ commit f6762f9cd0b2ace46e16d246adf2e386749650f9 Author: G??nther Deschner Date: Wed Mar 5 19:54:34 2008 +0100 Another build fix for pam_smbpass: make sure libwbclient is there. Guenther diff --git a/source/Makefile.in b/source/Makefile.in index cfe0095..b0e73fb 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1959,7 +1959,7 @@ bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ -bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ +bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@ @echo "Linking shared library $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \ $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- samba.spec 22 Feb 2008 18:09:11 -0000 1.141 +++ samba.spec 5 Mar 2008 20:14:17 -0000 1.142 @@ -1,14 +1,18 @@ +%define samba_version 3.2.0pre2 +%define tdb_version 1.1.1 +%define talloc_version 1.2.0 + Summary: The Samba Suite of programs Name: samba Epoch: 0 Version: 3.2.0 -Release: 1.pre1.3%{?dist} +Release: 1.pre2.3%{?dist} License: GPLv3+ and LGPLv3+ Group: System Environment/Daemons URL: http://www.samba.org/ #TAG: change for non-pre -Source: http://download.samba.org/samba/ftp/pre/%{name}-%{version}pre1.tar.gz +Source: http://download.samba.org/samba/ftp/pre/%{name}-%{version}pre2.tar.gz #Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz # Red Hat specific replacement-files @@ -41,9 +45,9 @@ Patch110: samba-3.0.21pre1-smbspool.patch Patch111: samba-3.0.13-smbclient.patch Patch200: samba-3.0.25rc1-inotifiy.patch -Patch201: samba-3.2.0pre1-winbindd-padding.patch patch202: samba-3.2.0pre1-buildfix.patch - +Patch203: samba-3.2.0pre2-build_fixes.patch +Patch204: samba-3.2.0pre2-libnetapi_fix.diff Requires(pre): samba-common = %{epoch}:%{version}-%{release} Requires: pam >= 0:0.64 @@ -52,7 +56,7 @@ Requires(post): /sbin/chkconfig, /sbin/service Requires(preun): /sbin/chkconfig, /sbin/service BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel -BuildRequires: autoconf, gawk, popt-devel +BuildRequires: autoconf, gawk, popt-devel, gtk2-devel # Working around perl dependency problem from docs %define __perl_requires %{SOURCE999} @@ -85,6 +89,8 @@ %package common Summary: Files used by both Samba servers and clients +Requires: libtdb >= 0:%{tdb_version} +Requires: libtalloc >= 0:%{talloc_version} Group: Applications/System Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, /sbin/service, coreutils @@ -116,6 +122,15 @@ Samba suite. +%package domainjoin-gui +Summary: Domainjoin GUI +Group: Applications/System +Requires: samba-common = %{epoch}:%{version}-%{release}, gtk2 + +%description domainjoin-gui +The samba-domainjoin-gui package includes a domainjoin gtk application. + + %package -n libsmbclient Summary: The SMB client library Group: Applications/System @@ -132,10 +147,55 @@ The libsmbclient-devel package contains the header files and libraries needed to develop programs that link against the SMB client library in the Samba suite. +%package -n libtdb +Summary: The TDB library and tools +Group: Applications/System +Version: %{tdb_version} + +%description -n libtdb +The TDB library from the Samba suite. + +%package -n tdb-tools +Summary: The TDB tools +Group: Applications/System +Version: %{tdb_version} +Requires: libtdb = %{epoch}:%{tdb_version}-%{release} + +%description -n tdb-tools +Some TDB tools from the Samba suite. + +%package -n libtdb-devel +Summary: Developer tools for the TDB library +Group: Development +Version: %{tdb_version} +Requires: libtdb = %{epoch}:%{tdb_version}-%{release} + +%description -n libtdb-devel +The libtdb-devel package contains the header files and libraries needed to +develop programs that link against the TDB library in the Samba suite. + +%package -n libtalloc +Summary: The talloc library +Group: Applications/System +Version: %{talloc_version} + +%description -n libtalloc +The talloc library from the Samba suite. + +%package -n libtalloc-devel +Summary: Developer tools for the talloc library +Group: Development +Version: %{talloc_version} +Requires: libtalloc = %{epoch}:%{talloc_version}-%{release} + +%description -n libtalloc-devel +The libtalloc-devel package contains the header files and libraries needed to +develop programs that link against the talloc library in the Samba suite. + %prep # TAG: change for non-pre -%setup -q -n samba-3.2.0pre1 +%setup -q -n %{name}-%{samba_version} #%setup -q # copy Red Hat specific scripts @@ -154,14 +214,14 @@ # generic patches %patch102 -p1 -b .pipedir #%patch103 -p1 -b .logfiles -%patch104 -p1 -b .nmbd-netbiosname +#%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply %patch107 -p1 -b .grouppwd #%patch108 -p1 -b .non-ascii-domain %patch110 -p1 -b .smbspool -%patch111 -p1 -b .smbclient -%patch200 -p0 -b .inotify -%patch201 -p0 -b .winbind-padding -%patch202 -p1 -b .buildfix +#%patch111 -p1 -b .smbclient # FIXME: does not apply +#%patch200 -p0 -b .inotify # FIXME: does not compile +%patch203 -p1 -b .build_fixes +%patch204 -p1 -b .libnetapi mv source/VERSION source/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION @@ -221,14 +281,16 @@ make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" \ proto -make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \ - all nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules - -make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ - debug2html +make LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}/source/bin \ + CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \ + all nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules test_shlibs + +make LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}/source/bin \ + CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \ + -C lib/netapi/examples make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ - smbfilter + debug2html smbfilter ( cd client ; gcc -o mount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c ) ( cd client ; gcc -o umount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c ) @@ -250,8 +312,8 @@ mkdir -p $RPM_BUILD_ROOT/var/log/samba/old mkdir -p $RPM_BUILD_ROOT/var/spool/samba mkdir -p $RPM_BUILD_ROOT/%{_datadir}/swat/using_samba -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/samba/codepages mkdir -p $RPM_BUILD_ROOT/var/run/winbindd +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig cd source @@ -267,7 +329,7 @@ PAMMODULESDIR=$RPM_BUILD_ROOT/%{_lib}/security \ MANDIR=$RPM_BUILD_ROOT%{_mandir} \ VARDIR=$RPM_BUILD_ROOT/var/log/samba \ - CODEPAGEDIR=$RPM_BUILD_ROOT%{_datadir}/samba/codepages \ + CODEPAGEDIR=$RPM_BUILD_ROOT%{_libdir}/samba \ SWATDIR=$RPM_BUILD_ROOT%{_datadir}/swat \ SAMBABOOK=$RPM_BUILD_ROOT%{_datadir}/swat/using_samba \ PIDDIR=$RPM_BUILD_ROOT/var/run @@ -300,28 +362,53 @@ # libraries { mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir} +# talloc +cd source/lib/talloc +# just to get the correct .pc file generated +./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir} +cd ../../.. + +# tdb +cd source/lib/tdb +# just to get the correct .pc file generated +./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir} +cd ../../.. + # make install puts libraries in the wrong place rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.a || true -rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbsharemodes.so || true - install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0 -install -m 755 source/bin/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so.0 +install -m 644 source/pkgconfig/smbclient.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/smbclient.pc ln -s libsmbclient.so.0 $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so -ln -s libsmbsharemodes.so.0 $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so #install -m 644 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a -#install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir} -/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/ +rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbsharemodes.so || true +install -m 755 source/bin/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so.0 +install -m 644 source/pkgconfig/smbsharemodes.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/smbsharemodes.pc +ln -s libsmbsharemodes.so.0 $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so -# } +rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libnetapi.so $RPM_BUILD_ROOT%{_libdir}/samba/libnetapi.a || true +install -m 755 source/bin/libnetapi.so $RPM_BUILD_ROOT%{_libdir}/libnetapi.so.0 +install -m 644 source/pkgconfig/netapi.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/netapi.pc +ln -s libnetapi.so.0 $RPM_BUILD_ROOT%{_libdir}/libnetapi.so + +rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libtalloc.so $RPM_BUILD_ROOT%{_libdir}/samba/libtalloc.a || true +install -m 755 source/bin/libtalloc.so $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1 +install -m 644 source/lib/talloc/talloc.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/talloc.pc +ln -s libtalloc.so.1 $RPM_BUILD_ROOT%{_libdir}/libtalloc.so + +rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libtdb.so $RPM_BUILD_ROOT%{_libdir}/samba/libtdb.a || true +install -m 755 source/bin/libtdb.so $RPM_BUILD_ROOT%{_libdir}/libtdb.so.0 +install -m 644 source/lib/tdb/tdb.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/tdb.pc +ln -s libtdb.so.0 $RPM_BUILD_ROOT%{_libdir}/libtdb.so + +rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libwbclient.so $RPM_BUILD_ROOT%{_libdir}/samba/libwbclient.a || true +install -m 755 source/bin/libwbclient.so $RPM_BUILD_ROOT%{_libdir}/libwbclient.so.0 +install -m 644 source/pkgconfig/wbclient.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/wbclient.pc +ln -s libwbclient.so.0 $RPM_BUILD_ROOT%{_libdir}/libwbclient.so -# various libs we currently remove -# TODO: evaluate how to make them back by extracting the correct .h files +/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/ -#this lib is not really useful or usable (libmsrpc.h requires the samba source) -#so better to remove it until upstream fixes it -rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.so -rm -f $RPM_BUILD_ROOT%{_includedir}/libmsrpc.h +# } mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat @@ -331,6 +418,12 @@ install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs +install -m 755 source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name} +install -m 644 source/lib/netapi/examples/netdomjoin-gui/samba.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/samba.ico +install -m 644 source/lib/netapi/examples/netdomjoin-gui/logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo.png +install -m 644 source/lib/netapi/examples/netdomjoin-gui/logo-small.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo-small.png + rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/editreg.1* rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1* rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1* @@ -534,6 +627,7 @@ %{_mandir}/man8/vfs_*.8* %{_libdir}/samba/vfs %{_libdir}/samba/auth +%{_libdir}/samba/charset %attr(1777,root,root) %dir /var/spool/samba %dir %{_sysconfdir}/openldap/schema %{_sysconfdir}/openldap/schema/samba.schema @@ -580,17 +674,20 @@ %defattr(-,root,root) %attr(755,root,root) /%{_lib}/security/pam_smbpass.so %dir %{_libdir}/samba -%{_libdir}/samba/charset %{_libdir}/samba/lowcase.dat %{_libdir}/samba/upcase.dat %{_libdir}/samba/valid.dat -#%{_libdir}/samba/libmsrpc.so %{_libdir}/libnss_wins.so /%{_lib}/libnss_wins.so.2 %{_libdir}/libnss_winbind.so /%{_lib}/libnss_winbind.so.2 /%{_lib}/security/pam_winbind.so - +%{_libdir}/libnetapi.so* +%{_libdir}/libwbclient.so* +%{_includedir}/netapi.h +%{_includedir}/wbclient.h +%{_libdir}/pkgconfig/netapi.pc +%{_libdir}/pkgconfig/wbclient.pc %{_bindir}/net %{_bindir}/testparm %{_bindir}/smbpasswd @@ -600,9 +697,6 @@ %{_bindir}/profiles %{_bindir}/smbcquotas %{_bindir}/smbcontrol -%{_bindir}/tdbbackup -%{_bindir}/tdbdump -%{_bindir}/tdbtool %{_bindir}/ldbadd %{_bindir}/ldbdel %{_bindir}/ldbedit @@ -620,12 +714,15 @@ %config(noreplace) %{_sysconfdir}/samba/lmhosts %config(noreplace) %{_sysconfdir}/sysconfig/samba %config(noreplace) %{_sysconfdir}/security/pam_winbind.conf -%dir %{_datadir}/samba -#%dir %{_datadir}/samba/codepages %dir %{_sysconfdir}/samba %attr(0700,root,root) %dir /var/log/samba %attr(0700,root,root) %dir /var/log/samba/old %{_initrddir}/winbind +%{_mandir}/man1/ldbadd.1.* +%{_mandir}/man1/ldbdel.1.* +%{_mandir}/man1/ldbedit.1.* +%{_mandir}/man1/ldbmodify.1.* +%{_mandir}/man1/ldbsearch.1.* %{_mandir}/man1/ntlm_auth.1* %{_mandir}/man1/profiles.1* %{_mandir}/man1/smbcquotas.1* @@ -643,33 +740,65 @@ %{_mandir}/man8/pdbedit.8* %{_mandir}/man8/net.8* %{_mandir}/man8/winbindd.8* -%{_mandir}/man8/tdbbackup.8* -%{_mandir}/man8/tdbdump.8* -%{_mandir}/man8/tdbtool.8* %{_mandir}/man8/idmap_*.8* %doc README COPYING Manifest %doc WHATSNEW.txt Roadmap - %files doc %doc docs/REVISION docs/Samba3-Developers-Guide.pdf docs/Samba3-ByExample.pdf %doc docs/Samba3-HOWTO.pdf docs/THANKS docs/history %doc docs/htmldocs %files -n libsmbclient -%{_libdir}/libsmbclient.so -%{_libdir}/libsmbclient.so.0 -%{_libdir}/libsmbsharemodes.so -%{_libdir}/libsmbsharemodes.so.0 +%{_libdir}/libsmbclient.so.* +%{_libdir}/libsmbsharemodes.so.* %files -n libsmbclient-devel %{_includedir}/libsmbclient.h %{_includedir}/smb_share_modes.h +%{_libdir}/libsmbclient.so +%{_libdir}/libsmbsharemodes.so +%{_libdir}/pkgconfig/smbclient.pc +%{_libdir}/pkgconfig/smbsharemodes.pc + +%files -n libtalloc +%{_libdir}/libtalloc.so.* -#%{_includedir}/libmsrpc.h +%files -n libtalloc-devel +%{_includedir}/talloc.h +%{_libdir}/libtalloc.so +%{_libdir}/pkgconfig/talloc.pc + +%files -n libtdb +%{_libdir}/libtdb.so.* + +%files -n libtdb-devel +%{_includedir}/tdb.h +%{_libdir}/libtdb.so +%{_libdir}/pkgconfig/tdb.pc + +%files -n tdb-tools +%{_bindir}/tdbbackup +%{_bindir}/tdbdump +%{_bindir}/tdbtool +%{_mandir}/man8/tdbbackup.8* +%{_mandir}/man8/tdbdump.8* +%{_mandir}/man8/tdbtool.8* + +%files domainjoin-gui +%{_sbindir}/netdomjoin-gui +%dir %{_datadir}/pixmaps/samba +%{_datadir}/pixmaps/samba/samba.ico +%{_datadir}/pixmaps/samba/logo.png +%{_datadir}/pixmaps/samba/logo-small.png %changelog +* Wed Mar 05 2008 Guenther Deschner - 3.2.0-1pre2.3 +- Update to 3.2.0pre2 +- Add talloc and tdb lib and devel packages +- Add domainjoin-gui package + * Fri Feb 22 2008 Simo Sorce - 3.2.0-0.pre1.3 - Try to fix GCC 4.3 build - Add --with-dnsupdate flag and also make sure other flags are required just to Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 8 Oct 2007 21:13:15 -0000 1.49 +++ sources 5 Mar 2008 20:14:17 -0000 1.50 @@ -1 +1 @@ -146baf1484d7d45fc397b7d5da01e9ec samba-3.2.0pre1.tar.gz +a0c3ec481ae86c45680773f7bf9f5872 samba-3.2.0pre2.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 8 Oct 2007 21:13:15 -0000 1.45 +++ .cvsignore 5 Mar 2008 20:14:17 -0000 1.46 @@ -1 +1 @@ -samba-3.2.0pre1.tar.gz +samba-3.2.0pre2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 20:25:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 20:25:12 GMT Subject: rpms/perl-Module-Install/devel perl-Module-Install.spec,1.9,1.10 Message-ID: <200803052025.m25KPCdo027135@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-Install/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27060 Modified Files: perl-Module-Install.spec Log Message: new perl Index: perl-Module-Install.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Install/devel/perl-Module-Install.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Module-Install.spec 5 Mar 2008 16:24:41 -0000 1.9 +++ perl-Module-Install.spec 5 Mar 2008 20:24:35 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Module-Install Version: 0.68 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Standalone, extensible Perl module installer License: GPL+ or Artistic Group: Development/Libraries @@ -15,6 +15,7 @@ BuildRequires: perl(Module::CoreList) BuildRequires: perl(Module::ScanDeps) >= 0.28 BuildRequires: perl(PAR::Dist) >= 0.03 +BuildRequires: perl(Test::MinimumVersion) #BuildRequires: perl(YAML) >= 0.35 #BuildRequires: perl(Test::Pod) >= 1.14 BuildRequires: perl(YAML::Tiny) >= 1.03 @@ -56,6 +57,8 @@ find $RPM_BUILD_ROOT%{perl_vendorlib} -type f -perm +100 -exec chmod a-x {} \; %check +# Upstream bug 29448 +mv t/03_audotinstall.t t/03_audotinstall.t.SPOT make test AUTOMATED_TESTING=1 %clean @@ -68,6 +71,10 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.68-3 +- disable broken test (upstream bug present) +- add Test::MinimumVersion as BR + * Wed Mar 5 2008 Tom "spot" Callaway 0.68-2 - rebuild for new perl From fedora-extras-commits at redhat.com Wed Mar 5 20:32:25 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 5 Mar 2008 20:32:25 GMT Subject: rpms/R-multcomp/EL-5 .cvsignore, 1.4, 1.5 R-multcomp.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200803052032.m25KWPgo028154@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-multcomp/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27997/EL-5 Modified Files: .cvsignore R-multcomp.spec sources Log Message: * Tue Mar 4 2008 Orion Poplawski - 0.993-1 - Update to 0.993-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/EL-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Feb 2008 16:24:13 -0000 1.4 +++ .cvsignore 5 Mar 2008 20:31:38 -0000 1.5 @@ -1 +1 @@ -multcomp_0.992-8.tar.gz +multcomp_0.993-1.tar.gz Index: R-multcomp.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/EL-5/R-multcomp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- R-multcomp.spec 15 Feb 2008 16:24:13 -0000 1.3 +++ R-multcomp.spec 5 Mar 2008 20:31:38 -0000 1.4 @@ -1,10 +1,10 @@ %define packname multcomp -%define packrel 8 +%define packrel 1 Summary: Simultaneous inference for general linear hypotheses R Package Name: R-%{packname} -Version: 0.992 -Release: 4%{?dist} +Version: 0.993 +Release: 1%{?dist} License: GPLv2 Group: Applications/Engineering Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz @@ -42,7 +42,10 @@ %check -%{_bindir}/R CMD check --no-install %{packname} +#We have to use --no-install because we don't have all of the suggested +#dependencies +#We use --no-latex because it is broken with --no-install +%{_bindir}/R CMD check --no-install --no-latex %{packname} %clean @@ -61,6 +64,7 @@ %defattr(-, root, root, -) %dir %{_datadir}/R/library/%{packname} %doc %{_datadir}/R/library/%{packname}/latex +%doc %{_datadir}/R/library/%{packname}/deprecated %doc %{_datadir}/R/library/%{packname}/doc %doc %{_datadir}/R/library/%{packname}/html %doc %{_datadir}/R/library/%{packname}/man @@ -77,6 +81,9 @@ %changelog +* Tue Mar 4 2008 Orion Poplawski - 0.993-1 +- Update to 0.993-1 + * Fri Feb 15 2008 Orion Poplawski - 0.992-4 - Update to 0.992-8 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/EL-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Feb 2008 16:24:13 -0000 1.4 +++ sources 5 Mar 2008 20:31:38 -0000 1.5 @@ -1 +1 @@ -7fa552b608fd11791be586a26dd1345e multcomp_0.992-8.tar.gz +8fbc8ee7d86ef56db5640127f26d1589 multcomp_0.993-1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 20:32:29 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 5 Mar 2008 20:32:29 GMT Subject: rpms/R-multcomp/F-7 .cvsignore, 1.4, 1.5 R-multcomp.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200803052032.m25KWTbr028184@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-multcomp/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27997/F-7 Modified Files: .cvsignore R-multcomp.spec sources Log Message: * Tue Mar 4 2008 Orion Poplawski - 0.993-1 - Update to 0.993-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/F-7/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Feb 2008 16:24:24 -0000 1.4 +++ .cvsignore 5 Mar 2008 20:31:55 -0000 1.5 @@ -1 +1 @@ -multcomp_0.992-8.tar.gz +multcomp_0.993-1.tar.gz Index: R-multcomp.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/F-7/R-multcomp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- R-multcomp.spec 15 Feb 2008 16:24:24 -0000 1.3 +++ R-multcomp.spec 5 Mar 2008 20:31:55 -0000 1.4 @@ -1,10 +1,10 @@ %define packname multcomp -%define packrel 8 +%define packrel 1 Summary: Simultaneous inference for general linear hypotheses R Package Name: R-%{packname} -Version: 0.992 -Release: 4%{?dist} +Version: 0.993 +Release: 1%{?dist} License: GPLv2 Group: Applications/Engineering Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz @@ -42,7 +42,10 @@ %check -%{_bindir}/R CMD check --no-install %{packname} +#We have to use --no-install because we don't have all of the suggested +#dependencies +#We use --no-latex because it is broken with --no-install +%{_bindir}/R CMD check --no-install --no-latex %{packname} %clean @@ -61,6 +64,7 @@ %defattr(-, root, root, -) %dir %{_datadir}/R/library/%{packname} %doc %{_datadir}/R/library/%{packname}/latex +%doc %{_datadir}/R/library/%{packname}/deprecated %doc %{_datadir}/R/library/%{packname}/doc %doc %{_datadir}/R/library/%{packname}/html %doc %{_datadir}/R/library/%{packname}/man @@ -77,6 +81,9 @@ %changelog +* Tue Mar 4 2008 Orion Poplawski - 0.993-1 +- Update to 0.993-1 + * Fri Feb 15 2008 Orion Poplawski - 0.992-4 - Update to 0.992-8 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/F-7/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Feb 2008 16:24:24 -0000 1.4 +++ sources 5 Mar 2008 20:31:55 -0000 1.5 @@ -1 +1 @@ -7fa552b608fd11791be586a26dd1345e multcomp_0.992-8.tar.gz +8fbc8ee7d86ef56db5640127f26d1589 multcomp_0.993-1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 20:32:39 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 5 Mar 2008 20:32:39 GMT Subject: rpms/R-multcomp/F-8 .cvsignore, 1.4, 1.5 R-multcomp.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200803052032.m25KWdgt028209@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/R-multcomp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27997/F-8 Modified Files: .cvsignore R-multcomp.spec sources Log Message: * Tue Mar 4 2008 Orion Poplawski - 0.993-1 - Update to 0.993-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Feb 2008 16:24:35 -0000 1.4 +++ .cvsignore 5 Mar 2008 20:31:59 -0000 1.5 @@ -1 +1 @@ -multcomp_0.992-8.tar.gz +multcomp_0.993-1.tar.gz Index: R-multcomp.spec =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/F-8/R-multcomp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- R-multcomp.spec 15 Feb 2008 16:24:35 -0000 1.3 +++ R-multcomp.spec 5 Mar 2008 20:31:59 -0000 1.4 @@ -1,10 +1,10 @@ %define packname multcomp -%define packrel 8 +%define packrel 1 Summary: Simultaneous inference for general linear hypotheses R Package Name: R-%{packname} -Version: 0.992 -Release: 4%{?dist} +Version: 0.993 +Release: 1%{?dist} License: GPLv2 Group: Applications/Engineering Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz @@ -42,7 +42,10 @@ %check -%{_bindir}/R CMD check --no-install %{packname} +#We have to use --no-install because we don't have all of the suggested +#dependencies +#We use --no-latex because it is broken with --no-install +%{_bindir}/R CMD check --no-install --no-latex %{packname} %clean @@ -61,6 +64,7 @@ %defattr(-, root, root, -) %dir %{_datadir}/R/library/%{packname} %doc %{_datadir}/R/library/%{packname}/latex +%doc %{_datadir}/R/library/%{packname}/deprecated %doc %{_datadir}/R/library/%{packname}/doc %doc %{_datadir}/R/library/%{packname}/html %doc %{_datadir}/R/library/%{packname}/man @@ -77,6 +81,9 @@ %changelog +* Tue Mar 4 2008 Orion Poplawski - 0.993-1 +- Update to 0.993-1 + * Fri Feb 15 2008 Orion Poplawski - 0.992-4 - Update to 0.992-8 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/R-multcomp/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Feb 2008 16:24:35 -0000 1.4 +++ sources 5 Mar 2008 20:31:59 -0000 1.5 @@ -1 +1 @@ -7fa552b608fd11791be586a26dd1345e multcomp_0.992-8.tar.gz +8fbc8ee7d86ef56db5640127f26d1589 multcomp_0.993-1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 20:32:57 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Wed, 5 Mar 2008 20:32:57 GMT Subject: rpms/quagga/devel quagga-0.99.9-ipv6_advert.patch, NONE, 1.1 quagga.spec, 1.43, 1.44 Message-ID: <200803052032.m25KWvoN028258@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/quagga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28134 Modified Files: quagga.spec Added Files: quagga-0.99.9-ipv6_advert.patch Log Message: * Wed Mar 05 2008 Martin Nagy - 0.99.9-6 - fix vtysh.conf owner and group (#416121) - fix bpgd IPv6 advertisements, patch from upstream (#429448) quagga-0.99.9-ipv6_advert.patch: --- NEW FILE quagga-0.99.9-ipv6_advert.patch --- diff -up quagga-0.99.9/bgpd/bgp_open.c.ipv6_advert quagga-0.99.9/bgpd/bgp_open.c --- quagga-0.99.9/bgpd/bgp_open.c.ipv6_advert 2008-03-05 20:44:20.000000000 +0100 +++ quagga-0.99.9/bgpd/bgp_open.c 2008-03-05 20:44:59.000000000 +0100 @@ -177,7 +177,7 @@ bgp_capability_mp (struct peer *peer, st peer->afc_recv[mpc.afi][mpc.safi] = 1; if (peer->afc[mpc.afi][mpc.safi]) - peer->afc_nego[mpc.safi][mpc.safi] = 1; + peer->afc_nego[mpc.afi][mpc.safi] = 1; else return -1; Index: quagga.spec =================================================================== RCS file: /cvs/extras/rpms/quagga/devel/quagga.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- quagga.spec 11 Feb 2008 10:35:07 -0000 1.43 +++ quagga.spec 5 Mar 2008 20:32:22 -0000 1.44 @@ -32,7 +32,7 @@ Summary: Routing daemon Name: quagga Version: 0.99.9 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 License: GPL Group: System Environment/Daemons @@ -42,6 +42,7 @@ #Patch6: quagga-0.98.5-pie.patch Patch7: quagga-0.99.9-initscript.patch Patch8: quagga-0.99.9-port_overflow.patch +Patch9: quagga-0.99.9-ipv6_advert.patch URL: http://www.quagga.net %if %with_snmp @@ -100,6 +101,7 @@ #%patch6 -p1 %patch7 -p1 -b .initscript %patch8 -p1 -b .port_overflow +%patch9 -p1 -b .ipv6_advert %build # FC5+ automatic -fstack-protector-all switch @@ -258,6 +260,7 @@ if [ ! -e %{_sysconfdir}/vtysh.conf ]; then touch %{_sysconfdir}/vtysh.conf chmod 640 %{_sysconfdir}/vtysh.conf + chown %{quagga_user}:%{vty_group} %{_sysconfdir}/vtysh.conf fi %postun @@ -313,7 +316,7 @@ %dir %attr(750,root,root) /var/run/quagga %endif %if %vty_group -%attr(750,%quagga_user,%vty_group) %{_sysconfdir}/vtysh.conf.sample +%attr(644,%quagga_user,%vty_group) %{_sysconfdir}/vtysh.conf.sample %endif %{_infodir}/*info* %{_mandir}/man*/* @@ -349,6 +352,10 @@ %endif %changelog +* Wed Mar 05 2008 Martin Nagy - 0.99.9-6 +- fix vtysh.conf owner and group (#416121) +- fix bpgd IPv6 advertisements, patch from upstream (#429448) + * Mon Feb 11 2008 Martin Nagy - 0.99.9-5 - rebuild for gcc-4.3 From fedora-extras-commits at redhat.com Wed Mar 5 20:35:42 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Wed, 5 Mar 2008 20:35:42 GMT Subject: rpms/quagga/F-8 quagga.spec,1.41,1.42 Message-ID: <200803052035.m25KZgxw028816@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/quagga/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28701 Modified Files: quagga.spec Log Message: * Wed Mar 05 2008 Martin Nagy - 0.99.9-6 - fix bpgd IPv6 advertisements, patch from upstream (#429448) Index: quagga.spec =================================================================== RCS file: /cvs/extras/rpms/quagga/F-8/quagga.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- quagga.spec 12 Nov 2007 16:28:32 -0000 1.41 +++ quagga.spec 5 Mar 2008 20:35:07 -0000 1.42 @@ -32,7 +32,7 @@ Summary: Routing daemon Name: quagga Version: 0.99.9 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 License: GPL Group: System Environment/Daemons @@ -41,6 +41,7 @@ Patch2: quagga-0.96.5-nostart.patch #Patch6: quagga-0.98.5-pie.patch Patch7: quagga-0.99.9-initscript.patch +Patch8: quagga-0.99.9-ipv6_advert.patch URL: http://www.quagga.net %if %with_snmp @@ -98,6 +99,7 @@ # This creates a .diff file that we apply after configuring #%patch6 -p1 %patch7 -p1 -b .initscript +%patch8 -p1 -b .ipv6_advert %build # FC5+ automatic -fstack-protector-all switch @@ -347,6 +349,9 @@ %endif %changelog +* Wed Mar 05 2008 Martin Nagy - 0.99.9-6 +- fix bpgd IPv6 advertisements, patch from upstream (#429448) + * Mon Nov 12 2007 Martin Bacovsky - 0.99.9-3 - resolves: #376821: ospfd init script looks for ospf6 configuration and lock file - resolves: #376841: Usage string in ospf6d init script incorrect From fedora-extras-commits at redhat.com Wed Mar 5 20:36:46 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Wed, 5 Mar 2008 20:36:46 GMT Subject: rpms/quagga/F-8 quagga-0.99.9-ipv6_advert.patch,NONE,1.1 Message-ID: <200803052036.m25KakXF028949@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/quagga/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28935 Added Files: quagga-0.99.9-ipv6_advert.patch Log Message: * Wed Mar 05 2008 Martin Nagy - 0.99.9-6 - fix bpgd IPv6 advertisements, patch from upstream (#429448) quagga-0.99.9-ipv6_advert.patch: --- NEW FILE quagga-0.99.9-ipv6_advert.patch --- diff -up quagga-0.99.9/bgpd/bgp_open.c.ipv6_advert quagga-0.99.9/bgpd/bgp_open.c --- quagga-0.99.9/bgpd/bgp_open.c.ipv6_advert 2008-03-05 20:44:20.000000000 +0100 +++ quagga-0.99.9/bgpd/bgp_open.c 2008-03-05 20:44:59.000000000 +0100 @@ -177,7 +177,7 @@ bgp_capability_mp (struct peer *peer, st peer->afc_recv[mpc.afi][mpc.safi] = 1; if (peer->afc[mpc.afi][mpc.safi]) - peer->afc_nego[mpc.safi][mpc.safi] = 1; + peer->afc_nego[mpc.afi][mpc.safi] = 1; else return -1; From fedora-extras-commits at redhat.com Wed Mar 5 20:38:31 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Wed, 5 Mar 2008 20:38:31 GMT Subject: rpms/grub/devel grub.spec,1.67,1.68 Message-ID: <200803052038.m25KcVkh029220@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29148 Modified Files: grub.spec Log Message: * Wed Mar 05 2008 Peter Jones - 0.97-27 - Fix permissions on grub.efi so cpio doesn't error when it's on vfat. Index: grub.spec =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- grub.spec 4 Mar 2008 21:47:42 -0000 1.67 +++ grub.spec 5 Mar 2008 20:37:48 -0000 1.68 @@ -1,6 +1,6 @@ Name: grub Version: 0.97 -Release: 26%{?dist} +Release: 27%{?dist} Summary: GRUB - the Grand Unified Boot Loader. Group: System Environment/Base License: GPLv2+ @@ -77,8 +77,7 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog NEWS README COPYING TODO docs/menu.lst /boot/grub -/boot/efi/EFI/redhat -/boot/efi/EFI/redhat/grub.efi +%attr(0755,root,root)/boot/efi/EFI/redhat/grub.efi /sbin/grub /sbin/grub-install /sbin/grub-terminfo @@ -90,6 +89,9 @@ %{_datadir}/grub %changelog +* Wed Mar 05 2008 Peter Jones - 0.97-27 +- Fix permissions on grub.efi so cpio doesn't error when it's on vfat. + * Tue Mar 04 2008 Peter Jones - 0.97-26 - Move grub.efi to a more useful location. From fedora-extras-commits at redhat.com Wed Mar 5 20:42:10 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Wed, 5 Mar 2008 20:42:10 GMT Subject: rpms/libsoup22/devel libsoup22.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803052042.m25KgAX2029959@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/libsoup22/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29694 Modified Files: .cvsignore sources Added Files: libsoup22.spec Log Message: New backward compatibility package. --- NEW FILE libsoup22.spec --- ### Abstract ### Name: libsoup22 Version: 2.2.105 Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries Summary: Soup, an HTTP library implementation URL: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-%{version}.tar.bz2 ### Dependencies ### Requires: glib2 >= 2.12 ### Build Dependencies ### BuildRequires: glib2-devel BuildRequires: gnutls-devel BuildRequires: libxml2-devel BuildRequires: pkgconfig %description Libsoup is an HTTP library implementation in C. It was originally part of a SOAP (Simple Object Access Protocol) implementation called Soup, but the SOAP and non-SOAP parts have now been split into separate packages. libsoup uses the Glib main loop and is designed to work well with GTK applications. This enables GNOME applications to access HTTP servers on the network in a completely asynchronous fashion, very similar to the Gtk+ programming model (a synchronous operation mode is also supported for those who want it). %package devel Summary: Header files for the Soup library Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: glib2-devel Requires: gnutls-devel Requires: libxml2-devel Requires: pkgconfig %description devel Libsoup is an HTTP library implementation in C. This package allows you to develop applications that use the libsoup library. %prep %setup -q -n libsoup-%{version} %build %configure make %{?_smp_mflags} %check make check %install rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root, -) %doc README COPYING NEWS AUTHORS %{_libdir}/lib*.so.* %files devel %defattr(-, root, root, -) %{_includedir}/libsoup-2.2 %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/gtk-doc/html/libsoup-2.2 %changelog * Tue Mar 4 2008 Paul W. Frields - 2.2.105-2 - Fix URL and file attributes per review * Wed Feb 27 2008 Paul W. Frields - 2.2.105-1 - Update to 2.2.105 - Fix buildroot, BuildRequires, and license per review * Wed Jan 30 2008 Matthew Barnes - 2.2.104-2 - Convert this package to libsoup22 for backward-compatibility. - Remove patch for RH bug #327871 (fixed in glibc). * Mon Nov 26 2007 Matthew Barnes - 2.2.104-1 - Update to 2.2.104 * Sun Oct 28 2007 Jeremy Katz - 2.2.103-1 - update to 2.2.103 to fix a rhythmbox crasher (#343561) * Mon Oct 15 2007 Matthew Barnes - 2.2.102-1 - Update to 2.2.102 * Thu Oct 11 2007 Matthew Barnes - 2.2.101-2 - Add patch for RH bug #327871 (broken Rhythmbox build). - Suspect this is really a glibc bug. * Fri Oct 05 2007 Matthew Barnes - 2.2.101-1 - Update to 2.2.101 * Wed Aug 8 2007 Matthias Clasen - 2.2.100-3 - Update the license field * Sat Apr 21 2007 Matthias Clasen - 2.2.100-2 - Don't install INSTALL * Mon Feb 12 2007 Matthew Barnes - 2.2.100-1 - Update to 2.2.100 * Mon Jan 08 2007 Matthew Barnes - 2.2.99-1 - Update to 2.2.99 * Mon Nov 21 2006 Matthew Barnes - 2.2.98-1 - Update to 2.2.98 - Remove patch for RH bug #215919 (fixed upstream). * Fri Nov 17 2006 Matthias Clasen - 2.2.97-2 - Avoid accidentally exported symbols (#215919) * Mon Nov 06 2006 Matthew Barnes - 2.2.97-1 - Update to 2.2.97 - Remove patch for Gnome.org bug #356809 (fixed upstream). * Fri Nov 03 2006 Matthew Barnes - 2.2.96-5 - Revised patch for Gnome.org bug #356809 to match upstream. * Sun Oct 01 2006 Jesse Keating - 2.2.96-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Wed Sep 20 2006 Matthew Barnes - 2.2.96-3.fc6 - Add patch for Gnome.org bug #356809 (lingering file on uninstall). * Tue Aug 15 2006 Matthew Barnes - 2.2.96-2.fc6 - Rebuild * Tue Jul 25 2006 Matthew Barnes - 2.2.96 - Update to 2.2.96 - Bump glib2 requirement to >= 2.6. * Wed Jul 12 2006 Matthew Barnes - 2.2.95.1-1 - Update to 2.2.95.1 * Wed Jul 12 2006 Jesse Keating - 2.2.94-3.1 - rebuild * Wed Jun 14 2006 Tomas Mraz - 2.2.94-3 - rebuilt with new gnutls * Tue Jun 13 2006 Matthias Clasen - 2.2.94-1 - Update to 2.2.94 * Mon Apr 10 2006 Matthias Clasen - 2.2.92-2 - Update to 2.2.92 * Sat Mar 4 2006 Matthias Clasen - 2.2.91-1 - Update to 2.2.91 * Wed Feb 15 2006 Matthias Clasen - 2.2.7-2 - Remove excessive Requires for the -devel package * Fri Feb 10 2006 Jesse Keating - 2.2.7-1.2.1 - bump again for double-long bug on ppc(64) * Tue Feb 07 2006 Jesse Keating - 2.2.7-1.2 - rebuilt for new gcc4.1 snapshot and glibc changes * Fri Dec 09 2005 Jesse Keating - rebuilt * Tue Nov 29 2005 David Malcolm - 2.2.7-1 - 2.2.7 - Remove static library * Tue Aug 23 2005 David Malcolm - 2.2.6.1-1 - 2.2.6.1 * Tue Aug 9 2005 David Malcolm - 2.2.5-1 - 2.2.5 - Removed gnome-bug-306877-soup-connection-ntlm.c.patch (#160071) as this is now in upstream tarball * Mon Aug 8 2005 Tomas Mraz - 2.2.3-5 - rebuild with new gnutls * Tue Jun 14 2005 David Malcolm - 2.2.3-4 - add patch for NTLM domains (#160071) * Sun Apr 24 2005 Florian La Roche - rebuild for new gnutls * Thu Mar 17 2005 David Malcolm - 2.2.3-2 - explicitly enable gtk-doc support * Thu Mar 17 2005 David Malcolm - 2.2.3-1 - 2.2.3 * Wed Mar 2 2005 David Malcolm - 2.2.2-3 - rebuild with GCC 4 * Wed Jan 26 2005 David Malcolm - 2.2.2-2 - actually uploaded the source this time * Wed Jan 26 2005 David Malcolm - 2.2.2-1 - update from 2.2.1 to 2.2.2 - add explicit devel requirements on glib2-devel, pkgconfig, gtk-doc, gnutls-devel and libxml2-devel * Tue Oct 12 2004 David Malcolm - 2.2.1-1 - update from 2.2.0 to 2.2.1 * Wed Oct 6 2004 David Malcolm - 2.2.0-3 - added requirement on libxml2 (#134700) * Wed Sep 22 2004 David Malcolm - 2.2.0-2 - added requirement on gnutls, so that we build with SSL support - fixed source download path * Tue Aug 31 2004 David Malcolm - 2.2.0-1 - update from 2.1.13 to 2.2.0 * Mon Aug 16 2004 David Malcolm - 2.1.13-1 - 2.1.13 * Tue Jul 20 2004 David Malcolm - 2.1.12-1 - 2.1.12 * Tue Jun 15 2004 Elliot Lee - rebuilt * Mon Jun 7 2004 David Malcolm - 2.1.11-1 - 2.1.11 * Thu May 20 2004 David Malcolm - 2.1.10-2 - added missing md5 file * Thu May 20 2004 David Malcolm - 2.1.10-1 - 2.1.10 * Tue Apr 20 2004 David Malcolm - 2.1.9-1 - Update to 2.1.9; added gtk-doc to BuildRequires and the generated files to the devel package * Wed Mar 10 2004 Jeremy Katz - 2.1.8-1 - 2.1.8 * Tue Mar 02 2004 Elliot Lee - rebuilt * Tue Feb 17 2004 Jeremy Katz - 2.1.7-1 - 2.1.7 * Fri Feb 13 2004 Elliot Lee - rebuilt * Mon Jan 26 2004 Jeremy Katz 2.1.5-1 - 2.1.5 * Wed Jan 14 2004 Jeremy Katz 2.1.4-0 - update to 2.1.4 * Sat Jan 3 2004 Jeremy Katz 2.1.3-0 - update to 2.1.3 * Tue Sep 23 2003 Jeremy Katz 1.99.26-2 - rebuild * Fri Sep 19 2003 Jeremy Katz 1.99.26-1 - 1.99.26 * Tue Jul 15 2003 Jeremy Katz 1.99.23-3 - rebuild to pickup ppc64 * Mon Jun 9 2003 Jeremy Katz 1.99.23-2 - rebuild - no openssl on ppc64 yet, excludearch * Mon Jun 9 2003 Jeremy Katz 1.99.23-1 - 1.99.23 * Wed Jun 5 2003 Elliot Lee - rebuilt * Thu Jun 5 2003 Jeremy Katz 1.99.22-2 - rebuild * Sun May 25 2003 Jeremy Katz 1.99.22-1 - 1.99.22 * Tue May 6 2003 Jeremy Katz 1.99.20-1 - 1.99.20 * Sun May 4 2003 Jeremy Katz 1.99.17-3 - include ssl proxy so that ssl urls work properly (#90165, #90166) * Wed Apr 16 2003 Jeremy Katz 1.99.17-2 - forward port patch to use a union initializer to fix build on x86_64 * Wed Apr 16 2003 Jeremy Katz 1.99.17-1 - rename package to libsoup - update to 1.99.17 - don't obsolete soup for now, it's parallel installable * Sun Apr 6 2003 Jeremy Katz 0.7.11-1 - update to 0.7.11 * Wed Apr 2 2003 Matt Wilson 0.7.10-5 - added soup-0.7.10-64bit.patch to fix 64 bit platforms (#86347) * Sat Feb 01 2003 Florian La Roche - only runtime libs in normal rpm * Wed Jan 22 2003 Tim Powers - rebuilt * Tue Jan 21 2003 Jeremy Katz - update url (#82347) * Tue Jan 7 2003 Nalin Dahyabhai 0.7.10-2 - use pkgconfig's openssl configuration information, if it exists * Fri Dec 13 2002 Jeremy Katz 0.7.10-1 - update to 0.7.10 * Thu Dec 12 2002 Jeremy Katz 0.7.9-4 - fix fpic patch - soup-devel should require soup * Thu Dec 12 2002 Jeremy Katz 0.7.9-3 - better lib64 patch - fix building of libwsdl-build to use libtool so that it gets built with -fPIC as needed * Tue Dec 10 2002 Jeremy Katz 0.7.9-2 - change popt handling in configure slightly so that it will work on multilib arches * Tue Dec 10 2002 Jeremy Katz 0.7.9-1 - update to 0.7.9, pulling the tarball out of Ximian packages * Wed Oct 23 2002 Jeremy Katz 0.7.4-3 - fix to not try to include non-existent doc files and remove all unwanted files from the build - include api docs - don't build the apache module * Wed Sep 25 2002 Jeremy Katz 0.7.4-2 - various specfile tweaks to include in Red Hat Linux - include all the files * Tue Jan 23 2001 Alex Graveley - Inital RPM config. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libsoup22/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2008 19:43:19 -0000 1.1 +++ .cvsignore 5 Mar 2008 20:41:37 -0000 1.2 @@ -0,0 +1 @@ +libsoup-2.2.105.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libsoup22/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2008 19:43:19 -0000 1.1 +++ sources 5 Mar 2008 20:41:37 -0000 1.2 @@ -0,0 +1 @@ +7fa48b06a0e2b0ff3d2fa45cf331f169 libsoup-2.2.105.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 20:42:37 2008 From: fedora-extras-commits at redhat.com (Guenther Deschner (gd)) Date: Wed, 5 Mar 2008 20:42:37 GMT Subject: rpms/samba/devel samba.spec,1.142,1.143 Message-ID: <200803052042.m25KgbBs030063@cvs-int.fedora.redhat.com> Author: gd Update of /cvs/pkgs/rpms/samba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29888 Modified Files: samba.spec Log Message: Change release number. Guenther Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- samba.spec 5 Mar 2008 20:14:17 -0000 1.142 +++ samba.spec 5 Mar 2008 20:41:59 -0000 1.143 @@ -6,7 +6,7 @@ Name: samba Epoch: 0 Version: 3.2.0 -Release: 1.pre2.3%{?dist} +Release: 2.pre2.0%{?dist} License: GPLv3+ and LGPLv3+ Group: System Environment/Daemons URL: http://www.samba.org/ From fedora-extras-commits at redhat.com Wed Mar 5 20:42:40 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 5 Mar 2008 20:42:40 GMT Subject: rpms/keepassx/F-8 keepassx-0.3.0-gcc43.patch,NONE,1.1 Message-ID: <200803052042.m25Kgev6030080@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/keepassx/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30050/F-8 Added Files: keepassx-0.3.0-gcc43.patch Log Message: add missing patch keepassx-0.3.0-gcc43.patch: --- NEW FILE keepassx-0.3.0-gcc43.patch --- diff -up ./src/lib/random.cpp.gcc43 ./src/lib/random.cpp --- ./src/lib/random.cpp.gcc43 2008-03-05 08:15:12.000000000 +0100 +++ ./src/lib/random.cpp 2008-03-05 08:15:31.000000000 +0100 @@ -22,6 +22,7 @@ #include #include #include "random.h" +#include using namespace std; void getRandomBytes(void* buffer,int NumBlocks,int BlockSize,bool Strong){ From fedora-extras-commits at redhat.com Wed Mar 5 20:42:51 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 5 Mar 2008 20:42:51 GMT Subject: rpms/keepassx/devel keepassx-0.3.0-gcc43.patch,NONE,1.1 Message-ID: <200803052042.m25Kgpau030165@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/keepassx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30050/devel Added Files: keepassx-0.3.0-gcc43.patch Log Message: add missing patch keepassx-0.3.0-gcc43.patch: --- NEW FILE keepassx-0.3.0-gcc43.patch --- diff -up ./src/lib/random.cpp.gcc43 ./src/lib/random.cpp --- ./src/lib/random.cpp.gcc43 2008-03-05 08:15:12.000000000 +0100 +++ ./src/lib/random.cpp 2008-03-05 08:15:31.000000000 +0100 @@ -22,6 +22,7 @@ #include #include #include "random.h" +#include using namespace std; void getRandomBytes(void* buffer,int NumBlocks,int BlockSize,bool Strong){ From fedora-extras-commits at redhat.com Wed Mar 5 20:47:32 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 5 Mar 2008 20:47:32 GMT Subject: rpms/smolt/devel .cvsignore, 1.20, 1.21 smolt.spec, 1.46, 1.47 sources, 1.21, 1.22 Message-ID: <200803052047.m25KlWjj030876@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30779 Modified Files: .cvsignore smolt.spec sources Log Message: trying new version of smolt Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 14 Feb 2008 19:19:03 -0000 1.20 +++ .cvsignore 5 Mar 2008 20:46:52 -0000 1.21 @@ -1 +1 @@ -smolt-1.1.tar.gz +smolt-1.1.1.tar.gz Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- smolt.spec 28 Feb 2008 05:14:51 -0000 1.46 +++ smolt.spec 5 Mar 2008 20:46:52 -0000 1.47 @@ -1,7 +1,7 @@ Name: smolt Summary: Fedora hardware profiler -Version: 1.1 -Release: 3%{?dist} +Version: 1.1.1 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://hosted.fedoraproject.org/projects/smolt @@ -9,11 +9,11 @@ # Note: This is a link to the gzip, you can't download it directly # This will get fixed as soon as hosted can create attachments directly -Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz +Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: dbus-python, python-crypto, python-urlgrabber, gawk +Requires: dbus-python, python-crypto, python-urlgrabber, gawk, python-genshi, python-paste BuildRequires: gettext BuildRequires: desktop-file-utils @@ -77,30 +77,21 @@ DESTDIR=%{buildroot} make install cd .. %{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/ +%{__mkdir} -p %{buildroot}/%{_mandir}/man1/ %{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/ %{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/ %{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/ %{__cp} client/fs_util.py %{buildroot}/%{_datadir}/%{name}/client/ +%{__cp} client/man/* %{buildroot}/%{_mandir}/man1/ %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/ -#%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/ -#%{__mkdir} -p %{buildroot}/%{_bindir} %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/ %{__mkdir} -p %{buildroot}/%{_initrddir} -#%{__mkdir} -p %{buildroot}/%{_datadir}/locale/ %{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt -#%{__mv} client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt -#%{__cp} -adv client/po/* %{buildroot}/%{_datadir}/locale/ - -#find %{buildroot} -name \*.po\* -delete touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid -#%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/ -#%{__install} -d -m 0755 client/icons/ %{buildroot}/%{_datadir}/%{name}/client/icons/ -#%{__cp} -adv client/*.py %{buildroot}/%{_datadir}/%{name}/client/ - # Icons %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/ %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/ @@ -115,13 +106,6 @@ %{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/ %{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png -#%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc -#%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc - -#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py -#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py -#%{__chmod} +x %{buildroot}/%{_initrddir}/smolt - %{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile @@ -169,6 +153,7 @@ %{_bindir}/smoltDeleteProfile %config(noreplace) /%{_sysconfdir}/%{name}/config* %{_sysconfdir}/cron.d/%{name} +%{_mandir}/man1/*gz %{_initrddir}/%{name} %ghost %config(noreplace) %{_sysconfdir}/sysconfig/hw-uuid @@ -188,6 +173,11 @@ %{_bindir}/smoltGui %changelog +* Wed Mar 05 2008 Mike McGrath - 1.1.1-1 +- Upstream released new version +- Manfiles added +- Source location updated + * Wed Feb 27 2008 Jeffrey C. Ollie - 1.1-3 - Copy instead of move cron file so that selinux contexts are set properly. (BZ#435050) Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 14 Feb 2008 19:19:03 -0000 1.21 +++ sources 5 Mar 2008 20:46:52 -0000 1.22 @@ -1 +1 @@ -10e7954f099c196f2e1c5ea3f977b84c smolt-1.1.tar.gz +7ec5dc8f7550be524dfd9467bb59f06c smolt-1.1.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 20:55:42 2008 From: fedora-extras-commits at redhat.com (Guenther Deschner (gd)) Date: Wed, 5 Mar 2008 20:55:42 GMT Subject: rpms/samba/devel samba.spec,1.143,1.144 Message-ID: <200803052055.m25KtgPf031809@cvs-int.fedora.redhat.com> Author: gd Update of /cvs/pkgs/rpms/samba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31700 Modified Files: samba.spec Log Message: Modify release number. This time hopefully correct. Guenther Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- samba.spec 5 Mar 2008 20:41:59 -0000 1.143 +++ samba.spec 5 Mar 2008 20:55:05 -0000 1.144 @@ -6,7 +6,7 @@ Name: samba Epoch: 0 Version: 3.2.0 -Release: 2.pre2.0%{?dist} +Release: 0.pre2.4%{?dist} License: GPLv3+ and LGPLv3+ Group: System Environment/Daemons URL: http://www.samba.org/ From fedora-extras-commits at redhat.com Wed Mar 5 21:23:44 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 5 Mar 2008 21:23:44 GMT Subject: rpms/i2c-tools/devel i2c-tools.spec,1.2,1.3 Message-ID: <200803052123.m25LNiqj008736@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/i2c-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8688 Modified Files: i2c-tools.spec Log Message: * Wed Mar 5 2008 Hans de Goede 3.0.0-3 - Change /dev/i2c-# creation from /lib/udev/devices to /etc/udev/makedev.d usage - Add an /etc/modprobe.d/i2c-dev file to work around bug 380971 Index: i2c-tools.spec =================================================================== RCS file: /cvs/extras/rpms/i2c-tools/devel/i2c-tools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- i2c-tools.spec 19 Feb 2008 08:37:09 -0000 1.2 +++ i2c-tools.spec 5 Mar 2008 21:23:11 -0000 1.3 @@ -6,15 +6,15 @@ Name: i2c-tools Version: 3.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A heterogeneous set of I2C tools for Linux Group: Applications/System License: GPLv2+ URL: http://www.lm-sensors.org/wiki/I2CTools Source0: http://dl.lm-sensors.org/i2c-tools/releases/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# for /lib/udev/devices ownership -Requires: udev +# for /etc/udev/makedev.d resp /etc/modprobe.d ownership +Requires: udev module-init-tools ExcludeArch: s390 s390x %description @@ -56,6 +56,15 @@ rm $RPM_BUILD_ROOT%{_bindir}/decode-edid.pl # Remove userland kernel headers, belong in glibc-kernheaders. rm -rf $RPM_BUILD_ROOT%{_includedir}/linux +# for i2c-dev ondemand loading through kmod +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d +echo "alias char-major-89-* i2c-dev" > \ + $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/i2c-dev +# for /dev/i2c-# creation (which are needed for kmod i2c-dev autoloading) +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d +for (( i = 0 ; i < 8 ; i++ )) do + echo "i2c-$i" >> $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/99-i2c-dev.nodes +done %clean @@ -65,12 +74,8 @@ %files %defattr(-,root,root,-) %doc CHANGES COPYING README -# Not created automatically as i2c-dev does not get autoloaded, once created -# manually, i2c-dev will get loaded by kmod as needed once bz 380971 is fixed -%attr(660, root, root) %dev(c, 89, 0) /lib/udev/devices/i2c-0 -%attr(660, root, root) %dev(c, 89, 0) /lib/udev/devices/i2c-1 -%attr(660, root, root) %dev(c, 89, 0) /lib/udev/devices/i2c-2 -%attr(660, root, root) %dev(c, 89, 0) /lib/udev/devices/i2c-3 +%config(noreplace) %{_sysconfdir}/modprobe.d/i2c-dev +%config(noreplace) %{_sysconfdir}/udev/makedev.d/99-i2c-dev.nodes %{_bindir}/* %{_sbindir}/* %exclude %{_sbindir}/eepro* @@ -83,6 +88,11 @@ %changelog +* Wed Mar 5 2008 Hans de Goede 3.0.0-3 +- Change /dev/i2c-# creation from /lib/udev/devices to /etc/udev/makedev.d + usage +- Add an /etc/modprobe.d/i2c-dev file to work around bug 380971 + * Tue Feb 19 2008 Fedora Release Engineering - 3.0.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 21:26:30 2008 From: fedora-extras-commits at redhat.com (Guenther Deschner (gd)) Date: Wed, 5 Mar 2008 21:26:30 GMT Subject: rpms/samba/devel samba-3.2.0pre2-build_fixes.patch, 1.1, 1.2 samba.spec, 1.144, 1.145 Message-ID: <200803052126.m25LQUW8008876@cvs-int.fedora.redhat.com> Author: gd Update of /cvs/pkgs/rpms/samba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8849 Modified Files: samba-3.2.0pre2-build_fixes.patch samba.spec Log Message: Add another build fix. Guenther samba-3.2.0pre2-build_fixes.patch: Index: samba-3.2.0pre2-build_fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/samba-3.2.0pre2-build_fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- samba-3.2.0pre2-build_fixes.patch 5 Mar 2008 20:14:17 -0000 1.1 +++ samba-3.2.0pre2-build_fixes.patch 5 Mar 2008 21:26:26 -0000 1.2 @@ -1251,3 +1251,24 @@ @echo "Linking shared library $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \ $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ +commit 5159e3dafa9f9bb85cde6681052d8f54b8bf8a2e +Author: G??nther Deschner +Date: Wed Mar 5 22:21:10 2008 +0100 + + Fix build targets for bin/net. + + Guenther + +diff --git a/source/Makefile.in b/source/Makefile.in +index b0e73fb..6d3ab60 100644 +--- a/source/Makefile.in ++++ b/source/Makefile.in +@@ -1300,7 +1300,7 @@ bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_S + $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \ + @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ + +-bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ ++bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@ + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ + @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \ Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- samba.spec 5 Mar 2008 20:55:05 -0000 1.144 +++ samba.spec 5 Mar 2008 21:26:26 -0000 1.145 @@ -6,7 +6,7 @@ Name: samba Epoch: 0 Version: 3.2.0 -Release: 0.pre2.4%{?dist} +Release: 1.pre2.5%{?dist} License: GPLv3+ and LGPLv3+ Group: System Environment/Daemons URL: http://www.samba.org/ From fedora-extras-commits at redhat.com Wed Mar 5 21:40:26 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 5 Mar 2008 21:40:26 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.2-install-all-css.patch, NONE, 1.1 kdelibs.spec, 1.278, 1.279 Message-ID: <200803052140.m25LeQI0010413@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10329/devel Modified Files: kdelibs.spec Added Files: kdelibs-4.0.2-install-all-css.patch Log Message: * Wed Mar 05 2008 Kevin Kofler 4.0.2-4 - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel - build apidocs and put them into an -apidocs subpackage (can be turned off) kdelibs-4.0.2-install-all-css.patch: --- NEW FILE kdelibs-4.0.2-install-all-css.patch --- diff -ur kdelibs-4.0.2/doc/common/CMakeLists.txt kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt --- kdelibs-4.0.2/doc/common/CMakeLists.txt 2008-01-05 01:00:05.000000000 +0100 +++ kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt 2008-03-05 21:22:32.000000000 +0100 @@ -7,6 +7,7 @@ xml.dcl doxygen.css tabs.css + kde.css flat.css print.css header.html footer.html mainheader.html Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- kdelibs.spec 29 Feb 2008 18:19:36 -0000 1.278 +++ kdelibs.spec 5 Mar 2008 21:39:51 -0000 1.279 @@ -1,10 +1,9 @@ - -# TODO: -# 1. package some noarch bits separately: apidocs. +# set this to 0 to disable -apidocs for a faster build +%define apidocs 1 Summary: K Desktop Environment 4 - Libraries Version: 4.0.2 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -61,6 +60,8 @@ # fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin # (can't talk over D-Bus to an app only supporting DCOP) Patch7: kdelibs-4.0.1-dcop-servicetype.patch +# install all .css files in kdelibs-common to build kdepimlibs-apidocs against +Patch8: kdelibs-4.0.2-install-all-css.patch # upstream patches @@ -133,6 +134,23 @@ This package includes the header files you will need to compile applications for KDE 4. +%package apidocs +Group: Development/Documentation +Summary: KDE 4 API documentation +Requires: %{name} = %{?epoch:%{epoch}:}%{version} +%if "%{name}" == "kdelibs" +Provides: kdelibs4-apidocs = %{version}-%{release} +#else +# Don't do that for now, we'd need to make sure all Requires: kdelibs-apidocs +# (in kdevelop etc.) are fixed to kdelibs3-apidocs first and it may not be +# worth it anyway. +#Provides: kdelibs-apidocs = 6:%{version}-%{release} +%endif + +%description apidocs +This package includes the KDE 4 API documentation in HTML +format for easy browsing. + %prep %setup -q -n kdelibs-%{version} @@ -147,6 +165,7 @@ %patch6 -p1 -b .openssl %endif %patch7 -p1 -b .dcop-servicetype +%patch8 -p1 -b .all-css # upstream patches @@ -159,8 +178,11 @@ make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 -# FIXME/TODO: apidocs -# doc/api/doxygen.sh --doxdatadir=doc/common . +# build apidocs +%if "%{?apidocs}" == "1" +export QTDOCDIR=`pkg-config --variable=docdir Qt` +doc/api/doxygen.sh . +%endif %install @@ -202,6 +224,12 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh +# install apidocs and generator script +install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh +%if "%{?apidocs}" == "1" +install -p -D kdelibs-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs +%endif + %post /sbin/ldconfig ||: @@ -272,6 +300,7 @@ %doc KDE4PORTING.html %{_kde4_bindir}/kconfig_compiler4 %{_kde4_bindir}/makekdewidgets4 +%{_kde4_bindir}/kde4-doxygen.sh %{_kde4_appsdir}/cmake/ %{_kde4_appsdir}/kdewidgets/ %{_kde4_appsdir}/ksgmltools2/ @@ -279,8 +308,19 @@ %{_kde4_libdir}/kde4/devel/ %{_kde4_libdir}/kde4/plugins/designer/ +%if "%{?apidocs}" == "1" +%files apidocs +%defattr(-,root,root,-) +%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ +%endif + %changelog +* Wed Mar 05 2008 Kevin Kofler 4.0.2-4 +- install all .css files in kdelibs-common to build kdepimlibs-apidocs against +- install doxygen.sh as kde4-doxygen.sh in -devel +- build apidocs and put them into an -apidocs subpackage (can be turned off) + * Fri Feb 29 2008 Than Ngo 4.0.2-3 - rebuilt From fedora-extras-commits at redhat.com Wed Mar 5 21:41:12 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Wed, 5 Mar 2008 21:41:12 GMT Subject: rpms/xorg-x11-drv-ivtv/devel xorg-x11-drv-ivtv.spec, 1.3, 1.4 xf86-video-ivtv-1.0.0-pciaccess.patch, 1.1, 1.2 Message-ID: <200803052141.m25LfCp2010569@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10435 Modified Files: xorg-x11-drv-ivtv.spec xf86-video-ivtv-1.0.0-pciaccess.patch Log Message: - Backport the libpciaccess support from pre 1.0.1 Index: xorg-x11-drv-ivtv.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel/xorg-x11-drv-ivtv.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xorg-x11-drv-ivtv.spec 20 Feb 2008 00:08:33 -0000 1.3 +++ xorg-x11-drv-ivtv.spec 5 Mar 2008 21:40:38 -0000 1.4 @@ -1,12 +1,12 @@ Name: xorg-x11-drv-ivtv -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.0.1 +Release: 0.1%{?dist} Summary: Xorg X11 ivtv video driver Group: User Interface/X Hardware Support License: MIT URL: http://ivtvdriver.org -Source0: http://dl.ivtvdriver.org/xf86-video-ivtv/archive/1.0.x/xf86-video-ivtv-%{version}.tar.gz +Source0: http://dl.ivtvdriver.org/xf86-video-ivtv/archive/1.0.x/xf86-video-ivtv-1.0.0.tar.gz Patch0: xf86-video-ivtv-1.0.0-pciaccess.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -14,13 +14,13 @@ BuildRequires: libtool Requires: xorg-x11-server-Xorg >= 1.3.0.0-6 Requires: ivtv-firmware -Obsoletes: ivtv_xdriver +Obsoletes: ivtv_xdriver < %{version} %description X.Org X11 ivtv video driver. %prep -%setup -q -n xf86-video-ivtv-%{version} +%setup -q -n xf86-video-ivtv-1.0.0 %patch0 -p1 -b .pciaccess sh autogen.sh @@ -34,6 +34,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/ivtv_drv.la + %clean rm -rf $RPM_BUILD_ROOT @@ -41,10 +42,14 @@ %files %defattr(-,root,root,-) %doc ChangeLog README +%config(noreplace) %{_sysconfdir}/modprobe.d/ivtvfb %{_libdir}/xorg/modules/drivers/ivtv_drv.so %changelog +* Wed Mar 5 2008 kwizart < kwizart at gmail.com > - 1.0.1-0.1 +- Backport the libpciaccess support from pre 1.0.1 + * Tue Feb 19 2008 kwizart < kwizart at gmail.com > - 1.0.0-3 - Fix for libpciaccess support xf86-video-ivtv-1.0.0-pciaccess.patch: Index: xf86-video-ivtv-1.0.0-pciaccess.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel/xf86-video-ivtv-1.0.0-pciaccess.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xf86-video-ivtv-1.0.0-pciaccess.patch 20 Feb 2008 00:08:33 -0000 1.1 +++ xf86-video-ivtv-1.0.0-pciaccess.patch 5 Mar 2008 21:40:38 -0000 1.2 @@ -1,28 +1,129 @@ -diff -up xf86-video-ivtv-1.0.0/configure.ac.pciaccess xf86-video-ivtv-1.0.0/configure.ac ---- xf86-video-ivtv-1.0.0/configure.ac.pciaccess 2008-02-19 22:40:07.000000000 +0100 -+++ xf86-video-ivtv-1.0.0/configure.ac 2008-02-19 23:34:25.000000000 +0100 -@@ -54,9 +54,17 @@ sdkdir=$(pkg-config --variable=sdkdir xo +diff -uNr xf86-video-ivtv-1.0.0/ChangeLog xf86-video-ivtv/ChangeLog +--- xf86-video-ivtv-1.0.0/ChangeLog 2007-10-14 18:36:10.000000000 +0200 ++++ xf86-video-ivtv/ChangeLog 2008-03-05 15:01:29.000000000 +0100 +@@ -1,3 +1,4 @@ ++#1.0.1 - Add support for newer X org versions with libpciaccess + #1.0.0 - Renamed to ivtv_drv and xf86-video-ivtv for consistency with X11R7 + naming convention. + - When the ivtv X driver is loaded, it ensures the osd/framebuffer is switched +diff -uNr xf86-video-ivtv-1.0.0/config.h.in xf86-video-ivtv/config.h.in +--- xf86-video-ivtv-1.0.0/config.h.in 2007-02-17 14:21:08.000000000 +0100 ++++ xf86-video-ivtv/config.h.in 2008-03-05 15:01:29.000000000 +0100 +@@ -50,8 +50,20 @@ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + ++/* Major version of this package */ ++#undef PACKAGE_VERSION_MAJOR ++ ++/* Minor version of this package */ ++#undef PACKAGE_VERSION_MINOR ++ ++/* Patch version of this package */ ++#undef PACKAGE_VERSION_PATCHLEVEL ++ + /* Define to 1 if you have the ANSI C header files. */ + #undef STDC_HEADERS + + /* Version number of package */ + #undef VERSION ++ ++/* Update some functions to new X parameter list */ ++#undef X_NEW_PARMS +diff -uNr xf86-video-ivtv-1.0.0/configure.ac xf86-video-ivtv/configure.ac +--- xf86-video-ivtv-1.0.0/configure.ac 2007-08-25 21:01:09.000000000 +0200 ++++ xf86-video-ivtv/configure.ac 2008-03-05 15:01:29.000000000 +0100 +@@ -22,7 +22,7 @@ + + AC_PREREQ(2.57) + AC_INIT([xf86-video-ivtv], +- 1.0.0, ++ 1.0.1, + [http://ivtvdriver.org/trac], + xf86-video-ivtv) + +@@ -47,16 +47,30 @@ + [moduledir="$withval"], + [moduledir="$libdir/xorg/modules"]) + ++PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901], ++ [AC_DEFINE(X_NEW_PARMS,1,[Update some functions to new X parameter list])]) ++ + # Checks for pkg-config packages +-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) ++PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) + sdkdir=$(pkg-config --variable=sdkdir xorg-server) + # Checks for extensions XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) +XORG_DRIVER_CHECK_EXT(XSERVER_LIBPCIACCESS, pciaccess) XORG_DRIVER_CHECK_EXT(XV, videoproto) +-# Checks for libraries. ++save_CFLAGS="$CFLAGS" ++CFLAGS="$XORG_CFLAGS" ++AC_CHECK_DECL(XSERVER_LIBPCIACCESS, ++ [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no], ++ [#include "xorg-server.h"]) ++CFLAGS="$save_CFLAGS" + - # Checks for libraries. -+#if test x$XSERVER_LIBPCIACCESS = xyes; then -+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) -+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" -+#fi ++if test "x$XSERVER_LIBPCIACCESS" = xyes; then ++ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) ++fi +AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) -+ # Checks for header files. AC_HEADER_STDC -diff -up xf86-video-ivtv-1.0.0/src/ivtv_hw.c.pciaccess xf86-video-ivtv-1.0.0/src/ivtv_hw.c ---- xf86-video-ivtv-1.0.0/src/ivtv_hw.c.pciaccess 2008-02-20 00:08:40.000000000 +0100 -+++ xf86-video-ivtv-1.0.0/src/ivtv_hw.c 2008-02-20 00:10:45.000000000 +0100 -@@ -350,7 +350,11 @@ ivtv_open(int scrnIndex, char *dev, char +diff -uNr xf86-video-ivtv-1.0.0/src/ivtv.c xf86-video-ivtv/src/ivtv.c +--- xf86-video-ivtv-1.0.0/src/ivtv.c 2007-10-12 09:12:46.000000000 +0200 ++++ xf86-video-ivtv/src/ivtv.c 2008-03-05 15:01:28.000000000 +0100 +@@ -114,7 +114,7 @@ + #define IVTVDEV_DRIVER_NAME "ivtv" + #define IVTVDEV_VERSION_MAJOR 1 + #define IVTVDEV_VERSION_MINOR 0 +-#define IVTVDEV_VERSION_PATCH 0 ++#define IVTVDEV_VERSION_PATCH 1 + #define IVTVDEV_VERSION ((IVTVDEV_VERSION_MAJOR << 16) | \ + (IVTVDEV_VERSION_MINOR << 8) | \ + (IVTVDEV_VERSION_PATCH)) +@@ -198,7 +198,7 @@ + static void + IVTVshadowUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf) + { +-#ifdef X_MODULAR ++#ifdef X_NEW_PARMS + RegionPtr damage = DamageRegion(pBuf->pDamage); + #else + RegionPtr damage = &pBuf->damage; +@@ -330,9 +330,6 @@ + xf86MatchDevice(IVTVDEV_DRIVER_NAME, &devSections)) <= 0) + return FALSE; + +- if (xf86GetPciVideoInfo() == NULL) +- return FALSE; +- + numUsed = xf86MatchPciInstances(IVTVDEV_DRIVER_NAME, + PCI_HAUPPAUGE_VENDOR_ID, + IVTVChipsets, +diff -uNr xf86-video-ivtv-1.0.0/src/ivtv_hw.c xf86-video-ivtv/src/ivtv_hw.c +--- xf86-video-ivtv-1.0.0/src/ivtv_hw.c 2007-10-12 09:14:57.000000000 +0200 ++++ xf86-video-ivtv/src/ivtv_hw.c 2008-03-05 15:01:28.000000000 +0100 +@@ -269,7 +269,13 @@ + xf86DrvMsg(scrnIndex, X_ERROR, + "Unable to open yuv device '%s'\n", yuvDevFull); + } ++ } else if (yuvFd == -1 && errno == EACCES) { ++ /* Device exists, but we weren't allowed to open it */ ++ xf86DrvMsg(scrnIndex, X_ERROR, ++ "Unable to open yuv device '%s'. " ++ "Check device permissions.\n", yuvDevFull); + } ++ + if (yuvFd == -1) + continue; + +@@ -350,7 +356,11 @@ /* -------------------------------------------------------------------- */ Bool @@ -34,7 +135,7 @@ { int fd; Bool retVal = TRUE; -@@ -377,7 +381,11 @@ ivtvHWProbe(pciVideoPtr pPci, char *devi +@@ -377,7 +387,11 @@ } Bool @@ -46,10 +147,10 @@ { ivtvHWPtr hwPtr; -diff -up xf86-video-ivtv-1.0.0/src/ivtv_hw.h.pciaccess xf86-video-ivtv-1.0.0/src/ivtv_hw.h ---- xf86-video-ivtv-1.0.0/src/ivtv_hw.h.pciaccess 2008-02-19 23:37:53.000000000 +0100 -+++ xf86-video-ivtv-1.0.0/src/ivtv_hw.h 2008-02-20 00:06:45.000000000 +0100 -@@ -44,6 +44,10 @@ in this Software without prior written a +diff -uNr xf86-video-ivtv-1.0.0/src/ivtv_hw.h xf86-video-ivtv/src/ivtv_hw.h +--- xf86-video-ivtv-1.0.0/src/ivtv_hw.h 2007-08-28 10:37:51.000000000 +0200 ++++ xf86-video-ivtv/src/ivtv_hw.h 2008-03-05 15:01:28.000000000 +0100 +@@ -44,6 +44,10 @@ # include "xorgVersion.h" #endif @@ -60,25 +161,17 @@ typedef struct { /* framebuffer device: filename (/dev/fb*), handle, more */ -@@ -77,6 +81,16 @@ typedef struct - - /* buildin video mode */ - DisplayModeRec buildin; -+ -+#if XSERVER_LIBPCIACCESS -+ struct pci_device *PciInfo; -+ int mmio_bar; -+ int fb_bar; -+ int gtt_bar; -+//#else -+// pciVideoPtr PciInfo; -+// PCITAG PciTag; -+#endif - } ivtvHWRec, *ivtvHWPtr; - - extern int ivtvHWPrivateIndex; -@@ -99,8 +113,13 @@ extern int ivtvHWPrivateIndex; +@@ -90,17 +94,15 @@ + # define IVTVDEVHW_BYTE_SWAP 1 + #endif +-/* FIXME - There must be a better way to do this..... */ +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(7,0,0,0,0) +-# define X_MODULAR 1 +-#elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,0,0,0,0) +-# define X_MODULAR 1 +-#endif +- Bool ivtvHWGetRec(ScrnInfoPtr pScrn); void ivtvHWFreeRec(ScrnInfoPtr pScrn); +#if XSERVER_LIBPCIACCESS @@ -91,17 +184,40 @@ char *ivtvHWGetName(ScrnInfoPtr pScrn); int ivtvHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp); int ivtvHWGetLineLength(ScrnInfoPtr pScrn); -diff -up xf86-video-ivtv-1.0.0/src/ivtv.c.pciaccess xf86-video-ivtv-1.0.0/src/ivtv.c ---- xf86-video-ivtv-1.0.0/src/ivtv.c.pciaccess 2008-02-20 00:11:36.000000000 +0100 -+++ xf86-video-ivtv-1.0.0/src/ivtv.c 2008-02-20 00:19:40.000000000 +0100 -@@ -330,8 +330,10 @@ IVTVDevProbe(DriverPtr drv, int flags) - xf86MatchDevice(IVTVDEV_DRIVER_NAME, &devSections)) <= 0) - return FALSE; +diff -uNr xf86-video-ivtv-1.0.0/src/ivtv_xv.c xf86-video-ivtv/src/ivtv_xv.c +--- xf86-video-ivtv-1.0.0/src/ivtv_xv.c 2007-08-28 10:37:51.000000000 +0200 ++++ xf86-video-ivtv/src/ivtv_xv.c 2008-03-05 15:01:28.000000000 +0100 +@@ -66,7 +66,7 @@ + static void IVTVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, + unsigned int *, unsigned int *, pointer); + +-#ifdef X_MODULAR ++#ifdef X_NEW_PARMS + static int IVTVPutImage(ScrnInfoPtr, short, short, short, short, short, + short, short, short, int, unsigned char *, short, + short, Bool, RegionPtr, pointer, DrawablePtr); +@@ -566,11 +566,12 @@ + ((sc_y & 15) << 4) + (blk_index & 15) + suv_offset; + + /* Copy v */ +- dst[dst_offset] = src[(width >> 1) * us_y + v_offset + us_x]; +- blk_index++; ++ dst[dst_offset++] = src[(width >> 1) * us_y + v_offset + us_x]; ++ + /* Copy u */ + dst[dst_offset] = src[(width >> 1) * us_y + u_offset + us_x]; +- blk_index++; ++ ++ blk_index+=2; -+#ifndef XSERVER_LIBPCIACCESS - if (xf86GetPciVideoInfo() == NULL) - return FALSE; -+#endif + if (xskip_count != xskip) { + /* Count towards the next horizontal skip */ +@@ -676,7 +677,7 @@ + return (sc_x << 16) | sc_y; + } - numUsed = xf86MatchPciInstances(IVTVDEV_DRIVER_NAME, - PCI_HAUPPAUGE_VENDOR_ID, +-#ifdef X_MODULAR ++#ifdef X_NEW_PARMS + static int + IVTVPutImage(ScrnInfoPtr pScrn, + short src_x, short src_y, From fedora-extras-commits at redhat.com Wed Mar 5 21:45:24 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Wed, 5 Mar 2008 21:45:24 GMT Subject: rpms/xorg-x11-drv-ivtv/devel xorg-x11-drv-ivtv.spec,1.4,1.5 Message-ID: <200803052145.m25LjOsp011082@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10708 Modified Files: xorg-x11-drv-ivtv.spec Log Message: fix modprobe.d/ivtvfb isn't here yet Index: xorg-x11-drv-ivtv.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel/xorg-x11-drv-ivtv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xorg-x11-drv-ivtv.spec 5 Mar 2008 21:40:38 -0000 1.4 +++ xorg-x11-drv-ivtv.spec 5 Mar 2008 21:44:49 -0000 1.5 @@ -42,7 +42,6 @@ %files %defattr(-,root,root,-) %doc ChangeLog README -%config(noreplace) %{_sysconfdir}/modprobe.d/ivtvfb %{_libdir}/xorg/modules/drivers/ivtv_drv.so From fedora-extras-commits at redhat.com Wed Mar 5 22:03:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:03:15 GMT Subject: rpms/perl-Expect/devel perl-Expect.spec,1.6,1.7 Message-ID: <200803052203.m25M3F5Y020081@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20055 Modified Files: perl-Expect.spec Log Message: new perl Index: perl-Expect.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Expect/devel/perl-Expect.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Expect.spec 15 Oct 2007 20:04:52 -0000 1.6 +++ perl-Expect.spec 5 Mar 2008 22:02:39 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Expect Version: 1.20 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Expect for Perl Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 05 2008 Tom "spot" Callaway - 1.20-2 +- rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway - 1.20-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Wed Mar 5 22:05:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:05:54 GMT Subject: rpms/perl-Expect-Simple/devel perl-Expect-Simple.spec,1.2,1.3 Message-ID: <200803052205.m25M5sYA020339@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Expect-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20234 Modified Files: perl-Expect-Simple.spec Log Message: new perl Index: perl-Expect-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Expect-Simple/devel/perl-Expect-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Expect-Simple.spec 15 Oct 2007 20:07:34 -0000 1.2 +++ perl-Expect-Simple.spec 5 Mar 2008 22:05:19 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Expect-Simple Version: 0.02 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Wrapper around the Expect module Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.02-2 +- rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway - 0.02-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Wed Mar 5 22:08:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:08:28 GMT Subject: rpms/perl-File-BaseDir/devel perl-File-BaseDir.spec,1.4,1.5 Message-ID: <200803052208.m25M8Sja020737@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-BaseDir/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20602 Modified Files: perl-File-BaseDir.spec Log Message: new perl Index: perl-File-BaseDir.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-BaseDir/devel/perl-File-BaseDir.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-File-BaseDir.spec 22 Nov 2007 21:21:52 -0000 1.4 +++ perl-File-BaseDir.spec 5 Mar 2008 22:07:49 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-File-BaseDir Version: 0.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Use the freedesktop basedir spec License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.03-2 +- rebuild for new perl + * Thu Nov 22 2007 Patrice Dumas 0.03-1 - update to 0.03 (#396071) From fedora-extras-commits at redhat.com Wed Mar 5 22:09:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:09:23 GMT Subject: rpms/perl-Module-Signature/devel perl-Module-Signature.spec, 1.10, 1.11 Message-ID: <200803052209.m25M9Nek020983@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-Signature/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20844 Modified Files: perl-Module-Signature.spec Log Message: new perl Index: perl-Module-Signature.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Signature/devel/perl-Module-Signature.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Module-Signature.spec 18 Apr 2007 17:53:27 -0000 1.10 +++ perl-Module-Signature.spec 5 Mar 2008 22:08:46 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-Module-Signature Version: 0.55 -Release: 2%{?dist} +Release: 3%{?dist} Summary: CPAN signature management utilities and modules Group: Development/Libraries @@ -59,6 +59,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.55-3 +- rebuild for new perl + * Tue Apr 17 2007 Ville Skytt?? - 0.55-2 - BuildRequire perl(ExtUtils::MakeMaker) and perl(Test::More). From fedora-extras-commits at redhat.com Wed Mar 5 22:09:26 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 5 Mar 2008 22:09:26 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.279,1.280 Message-ID: <200803052209.m25M9Qxf021021@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20869/devel Modified Files: kdelibs.spec Log Message: - BR doxygen and qt4-doc when building apidocs Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- kdelibs.spec 5 Mar 2008 21:39:51 -0000 1.279 +++ kdelibs.spec 5 Mar 2008 22:08:50 -0000 1.280 @@ -106,6 +106,11 @@ BuildRequires: openssh-clients BuildRequires: subversion +%if "%{?apidocs}" == "1" +BuildRequires: doxygen +BuildRequires: qt4-doc +%endif + %description Libraries for the K Desktop Environment 4. @@ -320,6 +325,7 @@ - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel - build apidocs and put them into an -apidocs subpackage (can be turned off) +- BR doxygen and qt4-doc when building apidocs * Fri Feb 29 2008 Than Ngo 4.0.2-3 - rebuilt From fedora-extras-commits at redhat.com Wed Mar 5 22:10:11 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 5 Mar 2008 22:10:11 GMT Subject: rpms/ocaml-lacaml/F-8 ocaml-lacaml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803052210.m25MABvg021127@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-lacaml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20984/F-8 Modified Files: .cvsignore sources Added Files: ocaml-lacaml.spec Log Message: Initial CVS import. --- NEW FILE ocaml-lacaml.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-lacaml Version: 4.3.0 Release: 2%{?dist} Summary: BLAS/LAPACK-interface for OCaml Group: Development/Libraries License: LGPLv2 with exceptions URL: http://ocaml.info/home/ocaml_sources.html Source0: http://www.ocaml.info/ocaml_sources/lacaml-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-findlib-devel BuildRequires: lapack-devel BuildRequires: blas-devel %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Common -i Install_printers -i Io -i Utils %description This OCaml-library interfaces the BLAS-library (Basic Linear Algebra Subroutines) and LAPACK-library (Linear Algebra routines), which are written in FORTRAN. This allows people to write high-performance numerical code for applications that need linear algebra. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n lacaml-%{version} %build make make examples strip lib/dlllacaml_stubs.so %install # These rules work if the library uses 'ocamlfind install' to install itself. rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install # By installing the *.cmx files, the compiler can do cross-module inlining. install -m 0644 lib/*.cmx $RPM_BUILD_ROOT%{_libdir}/ocaml/lacaml %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYRIGHT LICENSE %{_libdir}/ocaml/lacaml %if %opt %exclude %{_libdir}/ocaml/lacaml/*.a %exclude %{_libdir}/ocaml/lacaml/*.cmxa %exclude %{_libdir}/ocaml/lacaml/*.cmx %endif %exclude %{_libdir}/ocaml/lacaml/*.mli %exclude %{_libdir}/ocaml/lacaml/*.ml %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) %doc COPYRIGHT LICENSE Changes README TODO VERSION %if %opt %{_libdir}/ocaml/lacaml/*.a %{_libdir}/ocaml/lacaml/*.cmxa %{_libdir}/ocaml/lacaml/*.cmx %endif %{_libdir}/ocaml/lacaml/*.mli %{_libdir}/ocaml/lacaml/*.ml %changelog * Tue Mar 4 2008 Richard W.M. Jones - 4.3.0-2 - Rebuild for ppc64. * Wed Feb 20 2008 Richard W.M. Jones - 4.3.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2008 19:47:48 -0000 1.1 +++ .cvsignore 5 Mar 2008 22:09:36 -0000 1.2 @@ -0,0 +1 @@ +lacaml-4.3.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2008 19:47:48 -0000 1.1 +++ sources 5 Mar 2008 22:09:36 -0000 1.2 @@ -0,0 +1 @@ +dd42769a777f9dfc086b1d23e2d6ed44 lacaml-4.3.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 22:10:48 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 5 Mar 2008 22:10:48 GMT Subject: rpms/ocaml-lacaml/devel ocaml-lacaml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803052210.m25MAm6E021256@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-lacaml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21107/devel Modified Files: .cvsignore sources Added Files: ocaml-lacaml.spec Log Message: Initial CVS import. --- NEW FILE ocaml-lacaml.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-lacaml Version: 4.3.0 Release: 2%{?dist} Summary: BLAS/LAPACK-interface for OCaml Group: Development/Libraries License: LGPLv2 with exceptions URL: http://ocaml.info/home/ocaml_sources.html Source0: http://www.ocaml.info/ocaml_sources/lacaml-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-findlib-devel BuildRequires: lapack-devel BuildRequires: blas-devel %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Common -i Install_printers -i Io -i Utils %description This OCaml-library interfaces the BLAS-library (Basic Linear Algebra Subroutines) and LAPACK-library (Linear Algebra routines), which are written in FORTRAN. This allows people to write high-performance numerical code for applications that need linear algebra. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n lacaml-%{version} %build make make examples strip lib/dlllacaml_stubs.so %install # These rules work if the library uses 'ocamlfind install' to install itself. rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install # By installing the *.cmx files, the compiler can do cross-module inlining. install -m 0644 lib/*.cmx $RPM_BUILD_ROOT%{_libdir}/ocaml/lacaml %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYRIGHT LICENSE %{_libdir}/ocaml/lacaml %if %opt %exclude %{_libdir}/ocaml/lacaml/*.a %exclude %{_libdir}/ocaml/lacaml/*.cmxa %exclude %{_libdir}/ocaml/lacaml/*.cmx %endif %exclude %{_libdir}/ocaml/lacaml/*.mli %exclude %{_libdir}/ocaml/lacaml/*.ml %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) %doc COPYRIGHT LICENSE Changes README TODO VERSION %if %opt %{_libdir}/ocaml/lacaml/*.a %{_libdir}/ocaml/lacaml/*.cmxa %{_libdir}/ocaml/lacaml/*.cmx %endif %{_libdir}/ocaml/lacaml/*.mli %{_libdir}/ocaml/lacaml/*.ml %changelog * Tue Mar 4 2008 Richard W.M. Jones - 4.3.0-2 - Rebuild for ppc64. * Wed Feb 20 2008 Richard W.M. Jones - 4.3.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2008 19:47:48 -0000 1.1 +++ .cvsignore 5 Mar 2008 22:10:14 -0000 1.2 @@ -0,0 +1 @@ +lacaml-4.3.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2008 19:47:48 -0000 1.1 +++ sources 5 Mar 2008 22:10:14 -0000 1.2 @@ -0,0 +1 @@ +dd42769a777f9dfc086b1d23e2d6ed44 lacaml-4.3.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 5 22:10:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:10:49 GMT Subject: rpms/perl-Test-Distribution/devel perl-Test-Distribution.spec, 1.4, 1.5 Message-ID: <200803052210.m25MAna5021260@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-Distribution/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21118 Modified Files: perl-Test-Distribution.spec Log Message: new perl Index: perl-Test-Distribution.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Distribution/devel/perl-Test-Distribution.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Test-Distribution.spec 11 Mar 2007 06:36:31 -0000 1.4 +++ perl-Test-Distribution.spec 5 Mar 2008 22:10:11 -0000 1.5 @@ -3,9 +3,9 @@ Name: perl-Test-Distribution Version: 1.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perform tests on all modules of a distribution -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-Distribution/ Source0: http://www.cpan.org/authors/id/S/SR/SRSHAH/Test-Distribution-%{version}.tar.gz @@ -68,6 +68,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.26-5 +- rebuild for new perl + * Sat Mar 10 2007 Chris Weyl 1.26-4 - don't mess with debuginfo, just disable it. - appease Module::Signature/gpg From fedora-extras-commits at redhat.com Wed Mar 5 22:10:54 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 5 Mar 2008 22:10:54 GMT Subject: rpms/ocaml-camlidl/devel ocaml-camlidl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803052210.m25MAs8V021330@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlidl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21112/devel Modified Files: .cvsignore sources Added Files: ocaml-camlidl.spec Log Message: Initial CVS import. --- NEW FILE ocaml-camlidl.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-camlidl Version: 1.05 Release: 3%{?dist} Summary: Stub code generator and COM binding for Objective Caml Group: Development/Libraries License: QPL and LGPLv2 with exceptions URL: http://caml.inria.fr/pub/old_caml_site/camlidl/ Source0: http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-%{version}.tar.gz Source1: http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-%{version}.doc.pdf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml BuildRequires: ocaml-ocamldoc %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description CamlIDL is a stub code generator and COM binding for Objective Caml. CamlIDL comprises two parts: * A stub code generator that generates the C stub code required for the Caml/C interface, based on an MIDL specification. (MIDL stands for Microsoft's Interface Description Language; it looks like C header files with some extra annotations, plus a notion of object interfaces that look like C++ classes without inheritance.) * A (currently small) library of functions and tools to import COM components in Caml applications, and export Caml code as COM components. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n camlidl-%{version} sed -e 's|^OCAMLLIB=.*|OCAMLLIB=%{_libdir}/ocaml|' \ -e 's|^BINDIR=.*|BINDIR=%{_bindir}|' \ < config/Makefile.unix \ > config/Makefile cp %{SOURCE1} . %build make all %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml/caml mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml/stublibs mkdir -p $RPM_BUILD_ROOT/%{_bindir} make OCAMLLIB=$RPM_BUILD_ROOT/%{_libdir}/ocaml \ BINDIR=$RPM_BUILD_ROOT/%{_bindir} \ install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/*.* %if %opt %exclude %{_libdir}/ocaml/*.a %exclude %{_libdir}/ocaml/*.cmxa %endif %{_bindir}/camlidl %files devel %defattr(-,root,root,-) %doc LICENSE README Changes camlidl-%{version}.doc.pdf %if %opt %{_libdir}/ocaml/*.a %{_libdir}/ocaml/*.cmxa %endif %{_libdir}/ocaml/caml/*.h %changelog * Wed Mar 5 2008 Richard W.M. Jones - 1.05-3 - Removed -doc subpackage and placed documentation in -devel. * Tue Mar 4 2008 Richard W.M. Jones - 1.05-2 - Rebuild for ppc64. * Wed Feb 20 2008 Richard W.M. Jones - 1.05-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlidl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2008 19:49:25 -0000 1.1 +++ .cvsignore 5 Mar 2008 22:10:19 -0000 1.2 @@ -0,0 +1,2 @@ +camlidl-1.05.doc.pdf +camlidl-1.05.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlidl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2008 19:49:25 -0000 1.1 +++ sources 5 Mar 2008 22:10:19 -0000 1.2 @@ -0,0 +1,2 @@ +38cfda1efdab331acdb980d204e60268 camlidl-1.05.doc.pdf +4cfb863bc3cbdc1af2502042c45cc675 camlidl-1.05.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 22:10:57 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 5 Mar 2008 22:10:57 GMT Subject: rpms/ocaml-camlidl/F-8 ocaml-camlidl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803052210.m25MAvU1021336@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlidl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21110/F-8 Modified Files: .cvsignore sources Added Files: ocaml-camlidl.spec Log Message: Initial CVS import. --- NEW FILE ocaml-camlidl.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-camlidl Version: 1.05 Release: 3%{?dist} Summary: Stub code generator and COM binding for Objective Caml Group: Development/Libraries License: QPL and LGPLv2 with exceptions URL: http://caml.inria.fr/pub/old_caml_site/camlidl/ Source0: http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-%{version}.tar.gz Source1: http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-%{version}.doc.pdf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml BuildRequires: ocaml-ocamldoc %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description CamlIDL is a stub code generator and COM binding for Objective Caml. CamlIDL comprises two parts: * A stub code generator that generates the C stub code required for the Caml/C interface, based on an MIDL specification. (MIDL stands for Microsoft's Interface Description Language; it looks like C header files with some extra annotations, plus a notion of object interfaces that look like C++ classes without inheritance.) * A (currently small) library of functions and tools to import COM components in Caml applications, and export Caml code as COM components. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n camlidl-%{version} sed -e 's|^OCAMLLIB=.*|OCAMLLIB=%{_libdir}/ocaml|' \ -e 's|^BINDIR=.*|BINDIR=%{_bindir}|' \ < config/Makefile.unix \ > config/Makefile cp %{SOURCE1} . %build make all %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml/caml mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml/stublibs mkdir -p $RPM_BUILD_ROOT/%{_bindir} make OCAMLLIB=$RPM_BUILD_ROOT/%{_libdir}/ocaml \ BINDIR=$RPM_BUILD_ROOT/%{_bindir} \ install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/*.* %if %opt %exclude %{_libdir}/ocaml/*.a %exclude %{_libdir}/ocaml/*.cmxa %endif %{_bindir}/camlidl %files devel %defattr(-,root,root,-) %doc LICENSE README Changes camlidl-%{version}.doc.pdf %if %opt %{_libdir}/ocaml/*.a %{_libdir}/ocaml/*.cmxa %endif %{_libdir}/ocaml/caml/*.h %changelog * Wed Mar 5 2008 Richard W.M. Jones - 1.05-3 - Removed -doc subpackage and placed documentation in -devel. * Tue Mar 4 2008 Richard W.M. Jones - 1.05-2 - Rebuild for ppc64. * Wed Feb 20 2008 Richard W.M. Jones - 1.05-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlidl/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2008 19:49:25 -0000 1.1 +++ .cvsignore 5 Mar 2008 22:10:24 -0000 1.2 @@ -0,0 +1,2 @@ +camlidl-1.05.doc.pdf +camlidl-1.05.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlidl/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2008 19:49:25 -0000 1.1 +++ sources 5 Mar 2008 22:10:24 -0000 1.2 @@ -0,0 +1,2 @@ +38cfda1efdab331acdb980d204e60268 camlidl-1.05.doc.pdf +4cfb863bc3cbdc1af2502042c45cc675 camlidl-1.05.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 22:12:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:12:31 GMT Subject: rpms/perl-File-DesktopEntry/devel perl-File-DesktopEntry.spec, 1.8, 1.9 Message-ID: <200803052212.m25MCVUj021499@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-DesktopEntry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21474 Modified Files: perl-File-DesktopEntry.spec Log Message: new perl Index: perl-File-DesktopEntry.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-DesktopEntry/devel/perl-File-DesktopEntry.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-File-DesktopEntry.spec 27 Dec 2007 23:36:58 -0000 1.8 +++ perl-File-DesktopEntry.spec 5 Mar 2008 22:11:52 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-File-DesktopEntry Version: 0.04 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Object to handle .desktop files License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.02-2 +- rebuild for new perl + * Thu Dec 27 2007 Patrice Dumas 0.04-5 - update to 0.04 From fedora-extras-commits at redhat.com Wed Mar 5 22:13:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:13:10 GMT Subject: rpms/perl-Device-SerialPort/devel perl-Device-SerialPort.spec, 1.5, 1.6 Message-ID: <200803052213.m25MDAC2021590@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Device-SerialPort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21537 Modified Files: perl-Device-SerialPort.spec Log Message: new perl Index: perl-Device-SerialPort.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Device-SerialPort/devel/perl-Device-SerialPort.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Device-SerialPort.spec 19 Feb 2008 17:07:45 -0000 1.5 +++ perl-Device-SerialPort.spec 5 Mar 2008 22:12:36 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Device-SerialPort Version: 1.04 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Linux/POSIX emulation of Win32::SerialPort functions License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 1.04-3 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.04-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 22:14:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:14:03 GMT Subject: rpms/perl-Test-Portability-Files/devel perl-Test-Portability-Files.spec, 1.5, 1.6 Message-ID: <200803052214.m25ME322021674@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-Portability-Files/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21637 Modified Files: perl-Test-Portability-Files.spec Log Message: new perl Index: perl-Test-Portability-Files.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Portability-Files/devel/perl-Test-Portability-Files.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Test-Portability-Files.spec 30 Dec 2007 12:50:51 -0000 1.5 +++ perl-Test-Portability-Files.spec 5 Mar 2008 22:13:28 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Test-Portability-Files Version: 0.05 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Check file names portability License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.05-6 +- rebuild for new perl + * Sun Dec 30 2007 Ralf Cors??pius - 0.05-5 - BR: perl(Test::More). - BR: perl(Test::Pod), perl(Test::Pod::Coverage). From fedora-extras-commits at redhat.com Wed Mar 5 22:15:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:15:14 GMT Subject: rpms/perl-Regexp-Common/devel perl-Regexp-Common.spec,1.6,1.7 Message-ID: <200803052215.m25MFExH021774@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Regexp-Common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21729 Modified Files: perl-Regexp-Common.spec Log Message: new perl Index: perl-Regexp-Common.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Regexp-Common/devel/perl-Regexp-Common.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Regexp-Common.spec 29 Aug 2007 09:56:25 -0000 1.6 +++ perl-Regexp-Common.spec 5 Mar 2008 22:14:40 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Regexp-Common Version: 2.120 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Regexp::Common Perl module License: Artistic Group: Development/Libraries @@ -42,6 +42,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 2.120-7 +- rebuild for new perl + * Wed Aug 29 2007 Ralf Cors??pius - 2.120-6 - BR: perl(ExtUtils::MakeMaker). From fedora-extras-commits at redhat.com Wed Mar 5 22:16:26 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 5 Mar 2008 22:16:26 GMT Subject: rpms/ocaml-camlidl/F-8 ocaml-camlidl.spec,1.1,1.2 Message-ID: <200803052216.m25MGQnG021898@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlidl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21839 Modified Files: ocaml-camlidl.spec Log Message: * Wed Mar 5 2008 Richard W.M. Jones - 1.05-4 - Added tests subdirectory to the documentation. - Readd ExcludeArch ppc64 for F-8 (only). Index: ocaml-camlidl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlidl/F-8/ocaml-camlidl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-camlidl.spec 5 Mar 2008 22:10:24 -0000 1.1 +++ ocaml-camlidl.spec 5 Mar 2008 22:15:52 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-camlidl Version: 1.05 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Stub code generator and COM binding for Objective Caml Group: Development/Libraries @@ -12,6 +12,7 @@ Source0: http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-%{version}.tar.gz Source1: http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-%{version}.doc.pdf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: ppc64 BuildRequires: ocaml BuildRequires: ocaml-ocamldoc @@ -90,7 +91,7 @@ %files devel %defattr(-,root,root,-) -%doc LICENSE README Changes camlidl-%{version}.doc.pdf +%doc LICENSE README Changes camlidl-%{version}.doc.pdf tests %if %opt %{_libdir}/ocaml/*.a %{_libdir}/ocaml/*.cmxa @@ -99,6 +100,10 @@ %changelog +* Wed Mar 5 2008 Richard W.M. Jones - 1.05-4 +- Added tests subdirectory to the documentation. +- Readd ExcludeArch ppc64 for F-8 (only). + * Wed Mar 5 2008 Richard W.M. Jones - 1.05-3 - Removed -doc subpackage and placed documentation in -devel. From fedora-extras-commits at redhat.com Wed Mar 5 22:16:43 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 5 Mar 2008 22:16:43 GMT Subject: rpms/ocaml-camlidl/devel ocaml-camlidl.spec,1.1,1.2 Message-ID: <200803052216.m25MGhiA021954@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlidl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21864 Modified Files: ocaml-camlidl.spec Log Message: * Wed Mar 5 2008 Richard W.M. Jones - 1.05-4 - Added tests subdirectory to the documentation. Index: ocaml-camlidl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlidl/devel/ocaml-camlidl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-camlidl.spec 5 Mar 2008 22:10:19 -0000 1.1 +++ ocaml-camlidl.spec 5 Mar 2008 22:16:08 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-camlidl Version: 1.05 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Stub code generator and COM binding for Objective Caml Group: Development/Libraries @@ -90,7 +90,7 @@ %files devel %defattr(-,root,root,-) -%doc LICENSE README Changes camlidl-%{version}.doc.pdf +%doc LICENSE README Changes camlidl-%{version}.doc.pdf tests %if %opt %{_libdir}/ocaml/*.a %{_libdir}/ocaml/*.cmxa @@ -99,6 +99,9 @@ %changelog +* Wed Mar 5 2008 Richard W.M. Jones - 1.05-4 +- Added tests subdirectory to the documentation. + * Wed Mar 5 2008 Richard W.M. Jones - 1.05-3 - Removed -doc subpackage and placed documentation in -devel. From fedora-extras-commits at redhat.com Wed Mar 5 22:16:56 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 5 Mar 2008 22:16:56 GMT Subject: rpms/ocaml-lacaml/F-8 ocaml-lacaml.spec,1.1,1.2 Message-ID: <200803052216.m25MGur4021989@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-lacaml/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21889 Modified Files: ocaml-lacaml.spec Log Message: * Wed Mar 5 2008 Richard W.M. Jones - 4.3.0-3 - Readd ppc64 exclusion for F-8 (only). Index: ocaml-lacaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/F-8/ocaml-lacaml.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-lacaml.spec 5 Mar 2008 22:09:36 -0000 1.1 +++ ocaml-lacaml.spec 5 Mar 2008 22:16:23 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-lacaml Version: 4.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: BLAS/LAPACK-interface for OCaml Group: Development/Libraries @@ -11,6 +11,7 @@ URL: http://ocaml.info/home/ocaml_sources.html Source0: http://www.ocaml.info/ocaml_sources/lacaml-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: ppc64 BuildRequires: ocaml BuildRequires: ocaml-camlp4-devel @@ -97,6 +98,9 @@ %changelog +* Wed Mar 5 2008 Richard W.M. Jones - 4.3.0-3 +- Readd ppc64 exclusion for F-8 (only). + * Tue Mar 4 2008 Richard W.M. Jones - 4.3.0-2 - Rebuild for ppc64. From fedora-extras-commits at redhat.com Wed Mar 5 22:21:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:21:47 GMT Subject: rpms/perl-Expect/devel .cvsignore, 1.6, 1.7 perl-Expect.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200803052221.m25MLlLG022125@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22091 Modified Files: .cvsignore perl-Expect.spec sources Log Message: 1.21 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Expect/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Jul 2006 14:50:48 -0000 1.6 +++ .cvsignore 5 Mar 2008 22:21:13 -0000 1.7 @@ -1 +1 @@ -Expect-1.20.tar.gz +Expect-1.21.tar.gz Index: perl-Expect.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Expect/devel/perl-Expect.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Expect.spec 5 Mar 2008 22:02:39 -0000 1.7 +++ perl-Expect.spec 5 Mar 2008 22:21:13 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Expect -Version: 1.20 -Release: 2%{?dist} +Version: 1.21 +Release: 1%{?dist} Summary: Expect for Perl Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 05 2008 Tom "spot" Callaway - 1.21-1 +- update to 1.21 + * Wed Mar 05 2008 Tom "spot" Callaway - 1.20-2 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Expect/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 Jul 2006 14:50:48 -0000 1.6 +++ sources 5 Mar 2008 22:21:13 -0000 1.7 @@ -1 +1 @@ -9134ae3778285bcf8c3ffdba1a177886 Expect-1.20.tar.gz +a151b0dc4d1a35c73941c65b7c26da5b Expect-1.21.tar.gz From fedora-extras-commits at redhat.com Wed Mar 5 22:24:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:24:37 GMT Subject: rpms/perl-Pod-Readme/devel perl-Pod-Readme.spec,1.5,1.6 Message-ID: <200803052224.m25MOb58022297@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Pod-Readme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22254 Modified Files: perl-Pod-Readme.spec Log Message: new perl Index: perl-Pod-Readme.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Pod-Readme/devel/perl-Pod-Readme.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Pod-Readme.spec 27 Nov 2007 15:02:03 -0000 1.5 +++ perl-Pod-Readme.spec 5 Mar 2008 22:23:51 -0000 1.6 @@ -2,7 +2,7 @@ Name: perl-Pod-Readme Version: 0.090 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Convert POD to README file License: GPL+ or Artistic Group: Development/Libraries @@ -56,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.090-3 +- rebuild for new perl + * Tue Nov 27 2007 Steven Pritchard 0.090-2 - Update License tag. - Drop explicit dependencies on Test::* modules (#232736). From fedora-extras-commits at redhat.com Wed Mar 5 22:25:41 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Mar 2008 22:25:41 GMT Subject: extras-buildsys/utils/pushscript Push.py, 1.49, 1.50 BuildSys.py, 1.3, 1.4 Message-ID: <200803052225.m25MPfFp022456@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22398 Modified Files: Push.py BuildSys.py Log Message: Recreate plague-results repodata after deleting packages. Index: Push.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- Push.py 24 Oct 2007 17:44:14 -0000 1.49 +++ Push.py 5 Mar 2008 22:25:40 -0000 1.50 @@ -221,7 +221,7 @@ print "ERROR: lockfile %s failure: %s (error %d)" % (repolockname, strerr, err) sys.exit(err) - bs = LocalPlague(needsignroot) + bs = LocalPlague(needsignroot, cfg.createrepo) bs.PruneBuildResults() results = bs.GetBuildResults() results = BlackList.get_filtered_build_results(cfg,srcdist,results) Index: BuildSys.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/BuildSys.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BuildSys.py 2 Mar 2007 16:40:05 -0000 1.3 +++ BuildSys.py 5 Mar 2008 22:25:40 -0000 1.4 @@ -38,8 +38,9 @@ class LocalPlague(BuildSys): - def __init__(self,needsignroot): + def __init__(self, needsignroot, createrepo): self.needsignroot = needsignroot + self.createrepo = createrepo def GetBuildResults(self): rv = [] @@ -80,7 +81,13 @@ rv.append( (name,jobroots) ) return rv + def _CreateRepo(self): + cmd = self.createrepo + " -x \'*.src.rpm\' -x \'*-debuginfo-*.rpm\' %s" % self.needsignroot + Utils.run(cmd) + def PruneBuildResults(self): + repochanged = False + for (name,pkgrelroots) in self._ListPlagueResults(): validbuilds = pkgrelroots @@ -109,6 +116,7 @@ print 'Removing old %s' % pkgrelroot if not DEBUG: shutil.rmtree(pkgrelroot) + repochanged = True validbuilds.remove(pkgrelroot) # Now re-examine the remaining builds and mark unneeded ones as PUSHED. @@ -160,6 +168,9 @@ relroot = nextrelroot (n,a,e,v,r) = (nextn,nexta,nexte,nextv,nextr) + if repochanged: + self._CreateRepo() + class BuildResults: From fedora-extras-commits at redhat.com Wed Mar 5 22:26:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:26:02 GMT Subject: rpms/perl-Gtk2-Ex-Utils/devel perl-Gtk2-Ex-Utils.spec,1.2,1.3 Message-ID: <200803052226.m25MQ21i022472@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-Utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22391 Modified Files: perl-Gtk2-Ex-Utils.spec Log Message: new perl Index: perl-Gtk2-Ex-Utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-Utils/devel/perl-Gtk2-Ex-Utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Gtk2-Ex-Utils.spec 30 Nov 2006 06:45:27 -0000 1.2 +++ perl-Gtk2-Ex-Utils.spec 5 Mar 2008 22:25:28 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Gtk2-Ex-Utils Version: 0.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extra Gtk2 Utilities for working with Gnome2/Gtk2 in Perl -License: LGPL +License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Gtk2-Ex-Utils/ Source0: http://www.cpan.org/authors/id/K/KC/KCK/Gtk2-Ex-Utils-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.09-3 +- rebuild for new perl + * Wed Nov 29 2006 Chris Weyl 0.09-2 - bump From fedora-extras-commits at redhat.com Wed Mar 5 22:26:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:26:44 GMT Subject: rpms/perl-File-Type/devel perl-File-Type.spec,1.4,1.5 Message-ID: <200803052226.m25MQiU0022549@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22510 Modified Files: perl-File-Type.spec Log Message: new perl Index: perl-File-Type.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Type/devel/perl-File-Type.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-File-Type.spec 2 Jan 2008 06:13:09 -0000 1.4 +++ perl-File-Type.spec 5 Mar 2008 22:26:05 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-File-Type Version: 0.22 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Determine file type using magic License: GPL+ or Artistic Group: Development/Libraries @@ -44,6 +44,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.22-6 +- rebuild for new perl + * Wed Jan 02 2008 Ralf Cors??pius 0.22-5 - BR: perl(Test::More) (BZ 419631). - Adjust License-tag. From fedora-extras-commits at redhat.com Wed Mar 5 22:27:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:27:55 GMT Subject: rpms/perl-gettext/devel perl-gettext.spec,1.10,1.11 Message-ID: <200803052227.m25MRtc8022659@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-gettext/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22621 Modified Files: perl-gettext.spec Log Message: new perl Index: perl-gettext.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-gettext/devel/perl-gettext.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-gettext.spec 10 Feb 2008 05:38:13 -0000 1.10 +++ perl-gettext.spec 5 Mar 2008 22:27:20 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-gettext Version: 1.05 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Interface to gettext family of functions Group: Development/Libraries @@ -59,6 +59,9 @@ %changelog +* Wed Mar 05 2008 Tom "spot" Callaway - 1.05-13 +- rebuild for new perl + * Sun Feb 10 2008 Ralf Cors??pius - 1.05-12 - Rebuild for gcc43. From fedora-extras-commits at redhat.com Wed Mar 5 22:29:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:29:24 GMT Subject: rpms/perl-Crypt-SSLeay/devel perl-Crypt-SSLeay.spec,1.34,1.35 Message-ID: <200803052229.m25MTOMJ022745@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22704 Modified Files: perl-Crypt-SSLeay.spec Log Message: new perl Index: perl-Crypt-SSLeay.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel/perl-Crypt-SSLeay.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- perl-Crypt-SSLeay.spec 19 Feb 2008 21:57:43 -0000 1.34 +++ perl-Crypt-SSLeay.spec 5 Mar 2008 22:28:34 -0000 1.35 @@ -1,7 +1,7 @@ Name: perl-Crypt-SSLeay Summary: Crypt::SSLeay - OpenSSL glue that provides LWP https support Version: 0.57 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL+ or Artistic Group: Development/Libraries Source0: http://www.cpan.org/authors/id/D/DL/DLAND/Crypt-SSLeay-%{version}.tar.gz @@ -85,6 +85,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.57-7 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.57-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 22:30:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:30:22 GMT Subject: rpms/perl-HTTP-Request-Params/devel perl-HTTP-Request-Params.spec, 1.3, 1.4 Message-ID: <200803052230.m25MUMJN022835@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTTP-Request-Params/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22790 Modified Files: perl-HTTP-Request-Params.spec Log Message: new perl Index: perl-HTTP-Request-Params.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTTP-Request-Params/devel/perl-HTTP-Request-Params.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-HTTP-Request-Params.spec 16 Oct 2007 19:09:23 -0000 1.3 +++ perl-HTTP-Request-Params.spec 5 Mar 2008 22:29:40 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-HTTP-Request-Params Version: 1.01 -Release: 1%{?dist}.2 +Release: 2%{?dist} Summary: Retrieve GET/POST Parameters from HTTP Requests Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 1.01-2 +- rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 1.01-1.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Wed Mar 5 22:31:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:31:20 GMT Subject: rpms/perl-Image-Math-Constrain/devel perl-Image-Math-Constrain.spec, 1.1, 1.2 Message-ID: <200803052231.m25MVKJg022927@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Image-Math-Constrain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22876 Modified Files: perl-Image-Math-Constrain.spec Log Message: new perl Index: perl-Image-Math-Constrain.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Image-Math-Constrain/devel/perl-Image-Math-Constrain.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Image-Math-Constrain.spec 18 May 2007 22:52:12 -0000 1.1 +++ perl-Image-Math-Constrain.spec 5 Mar 2008 22:30:40 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-Image-Math-Constrain Version: 1.01 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scaling math used in image size constraining (such as thumbnails) -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Image-Math-Constrain/ Source0: http://www.cpan.org/authors/id/A/AD/ADAMK/Image-Math-Constrain-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 1.01-2 +- rebuild for new perl + * Mon Apr 02 2007 Steven Pritchard 1.01-1 - Specfile autogenerated by cpanspec 1.70. - Drop redundant explicit perl build dependency. From fedora-extras-commits at redhat.com Wed Mar 5 22:32:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:32:10 GMT Subject: rpms/perl-Affix-Infix2Postfix/devel perl-Affix-Infix2Postfix.spec, 1.1, 1.2 Message-ID: <200803052232.m25MWAeZ023029@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Affix-Infix2Postfix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22969 Modified Files: perl-Affix-Infix2Postfix.spec Log Message: new perl Index: perl-Affix-Infix2Postfix.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Affix-Infix2Postfix/devel/perl-Affix-Infix2Postfix.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Affix-Infix2Postfix.spec 18 May 2007 22:52:34 -0000 1.1 +++ perl-Affix-Infix2Postfix.spec 5 Mar 2008 22:31:28 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-Affix-Infix2Postfix Version: 0.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl extension for converting from infix notation to postfix notation -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Affix-Infix2Postfix/ Source0: http://www.cpan.org/authors/id/A/AD/ADDI/Affix-Infix2Postfix-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.03-2 +- rebuild for new perl + * Mon Apr 02 2007 Steven Pritchard 0.03-1 - Specfile autogenerated by cpanspec 1.70. - Fix License. From fedora-extras-commits at redhat.com Wed Mar 5 22:32:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:32:51 GMT Subject: rpms/perl-Compress-Raw-Bzip2/devel perl-Compress-Raw-Bzip2.spec, 1.5, 1.6 Message-ID: <200803052232.m25MWp0o023186@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23081 Modified Files: perl-Compress-Raw-Bzip2.spec Log Message: new perl Index: perl-Compress-Raw-Bzip2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Compress-Raw-Bzip2/devel/perl-Compress-Raw-Bzip2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Compress-Raw-Bzip2.spec 19 Feb 2008 21:55:53 -0000 1.5 +++ perl-Compress-Raw-Bzip2.spec 5 Mar 2008 22:32:17 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Compress-Raw-Bzip2 Version: 2.005 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Low-Level Interface to bzip2 compression library Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 2.005-5 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 2.005-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 22:33:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:33:41 GMT Subject: rpms/perl-PerlIO-via-dynamic/devel perl-PerlIO-via-dynamic.spec, 1.2, 1.3 Message-ID: <200803052233.m25MXfKj023348@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-PerlIO-via-dynamic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23303 Modified Files: perl-PerlIO-via-dynamic.spec Log Message: new perl Index: perl-PerlIO-via-dynamic.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PerlIO-via-dynamic/devel/perl-PerlIO-via-dynamic.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-PerlIO-via-dynamic.spec 16 Aug 2007 18:44:48 -0000 1.2 +++ perl-PerlIO-via-dynamic.spec 5 Mar 2008 22:33:06 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-PerlIO-via-dynamic Version: 0.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Dynamic PerlIO layers -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/PerlIO-via-dynamic/ Source0: http://www.cpan.org/modules/by-module/PerlIO/PerlIO-via-dynamic-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.12-4 +- rebuild for new perl + * Thu Aug 16 2007 Ian Burrell - 0.12-3 - Fix BuildRequires From fedora-extras-commits at redhat.com Wed Mar 5 22:35:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:35:18 GMT Subject: rpms/perl-Spoon/devel perl-Spoon.spec,1.6,1.7 Message-ID: <200803052235.m25MZI7Y023516@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Spoon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23450 Modified Files: perl-Spoon.spec Log Message: new perl Index: perl-Spoon.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Spoon/devel/perl-Spoon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Spoon.spec 18 Apr 2007 16:56:37 -0000 1.6 +++ perl-Spoon.spec 5 Mar 2008 22:34:37 -0000 1.7 @@ -1,8 +1,8 @@ Name: perl-Spoon Version: 0.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Spiffy Application Building Framework -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Spoon/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/Spoon-%{version}.tar.gz @@ -62,6 +62,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.24-3 +- rebuild for new perl + * Wed Apr 18 2007 Steven Pritchard 0.24-2 - BR ExtUtils::MakeMaker. From fedora-extras-commits at redhat.com Wed Mar 5 22:36:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:36:03 GMT Subject: rpms/perl-Kwiki/devel perl-Kwiki.spec,1.5,1.6 Message-ID: <200803052236.m25Ma3a2023661@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23574 Modified Files: perl-Kwiki.spec Log Message: new perl Index: perl-Kwiki.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki/devel/perl-Kwiki.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Kwiki.spec 4 Jan 2008 04:54:52 -0000 1.5 +++ perl-Kwiki.spec 5 Mar 2008 22:35:28 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Kwiki Version: 0.39 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kwiki Wiki Building Framework License: GPL+ or Artistic Group: Development/Libraries @@ -71,6 +71,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.39-3 +- rebuild for new perl + * Fri Jan 04 2008 Ralf Cors??pius 0.39-2 - Update License-tag. - BR: perl(Test::Memory::Cycle). From fedora-extras-commits at redhat.com Wed Mar 5 22:36:52 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:36:52 GMT Subject: rpms/perl-Kwiki-Revisions/devel perl-Kwiki-Revisions.spec,1.5,1.6 Message-ID: <200803052236.m25Maq8K023748@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-Revisions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23699 Modified Files: perl-Kwiki-Revisions.spec Log Message: new perl Index: perl-Kwiki-Revisions.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-Revisions/devel/perl-Kwiki-Revisions.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Kwiki-Revisions.spec 7 Jan 2008 07:33:34 -0000 1.5 +++ perl-Kwiki-Revisions.spec 5 Mar 2008 22:36:09 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Kwiki-Revisions Version: 0.15 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Kwiki Revisions Plugin License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.15-7 +- rebuild for new perl + * Mon Jan 07 2008 Ralf Cors??pius 0.15-6 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Wed Mar 5 22:37:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:37:33 GMT Subject: rpms/perl-Kwiki-UserPreferences/devel perl-Kwiki-UserPreferences.spec, 1.5, 1.6 Message-ID: <200803052237.m25MbXgK023806@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-UserPreferences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23742 Modified Files: perl-Kwiki-UserPreferences.spec Log Message: new perl Index: perl-Kwiki-UserPreferences.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-UserPreferences/devel/perl-Kwiki-UserPreferences.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Kwiki-UserPreferences.spec 9 Jan 2008 12:02:26 -0000 1.5 +++ perl-Kwiki-UserPreferences.spec 5 Mar 2008 22:36:49 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Kwiki-UserPreferences Version: 0.13 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Kwiki User Preferences Plugin License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.13-7 +- rebuild for new perl + * Wed Jan 09 2008 Ralf Cors??pius 0.13-6 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Wed Mar 5 22:38:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:38:43 GMT Subject: rpms/perl-Kwiki-UserName/devel perl-Kwiki-UserName.spec,1.5,1.6 Message-ID: <200803052238.m25MchYE023885@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-UserName/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23846 Modified Files: perl-Kwiki-UserName.spec Log Message: new perl Index: perl-Kwiki-UserName.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-UserName/devel/perl-Kwiki-UserName.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Kwiki-UserName.spec 4 Jan 2008 06:44:51 -0000 1.5 +++ perl-Kwiki-UserName.spec 5 Mar 2008 22:38:03 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Kwiki-UserName Version: 0.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Kwiki User Name Plugin License: GPL+ or Artistic Group: Development/Libraries @@ -56,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 0.14-7 +- rebuild for new perl + * Fri Jan 04 2008 Ralf Cors??pius 0.14-6 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Wed Mar 5 22:39:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:39:40 GMT Subject: rpms/perl-NetAddr-IP/devel perl-NetAddr-IP.spec,1.4,1.5 Message-ID: <200803052239.m25MdeOm024055@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-NetAddr-IP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23933 Modified Files: perl-NetAddr-IP.spec Log Message: new perl Index: perl-NetAddr-IP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-NetAddr-IP/devel/perl-NetAddr-IP.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-NetAddr-IP.spec 12 Feb 2008 15:38:38 -0000 1.4 +++ perl-NetAddr-IP.spec 5 Mar 2008 22:39:02 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-NetAddr-IP Version: 4.007 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manages IPv4 and IPv6 addresses and subnets License: Artistic Group: Development/Libraries @@ -56,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 4.007-2 +- rebuild for new perl + * Tue Feb 12 2008 Andreas Thienemann 4.007-1 - Updated to 4.007 - Rebuilt against gcc-4.3 From fedora-extras-commits at redhat.com Wed Mar 5 22:39:47 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Mar 2008 22:39:47 GMT Subject: extras-buildsys/server Repo.py,1.16.2.3.4.1,1.16.2.3.4.2 Message-ID: <200803052239.m25MdlLv024125@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23965/server Modified Files: Tag: Plague-0_4_5 Repo.py Log Message: they are called *-debuginfo-*.rpm not *debuginfo.rpm Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.16.2.3.4.1 retrieving revision 1.16.2.3.4.2 diff -u -r1.16.2.3.4.1 -r1.16.2.3.4.2 --- Repo.py 31 Jan 2008 14:30:13 -0000 1.16.2.3.4.1 +++ Repo.py 5 Mar 2008 22:39:47 -0000 1.16.2.3.4.2 @@ -118,7 +118,7 @@ self._repo_additions = [] - (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % (self._repo_cache_dir, self._repodir)) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*-debuginfo-*.rpm" %s' % (self._repo_cache_dir, self._repodir)) if s != 0: print "Repo Error (%s): createrepo failed with exit status %d! Output: '%s'" % (target_string, s, o) From fedora-extras-commits at redhat.com Wed Mar 5 22:40:17 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 5 Mar 2008 22:40:17 GMT Subject: extras-buildsys ChangeLog,1.126.2.44.2.1.2.10,1.126.2.44.2.1.2.11 Message-ID: <200803052240.m25MeHqV024137@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23965 Modified Files: Tag: Plague-0_4_5 ChangeLog Log Message: they are called *-debuginfo-*.rpm not *debuginfo.rpm Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.44.2.1.2.10 retrieving revision 1.126.2.44.2.1.2.11 diff -u -r1.126.2.44.2.1.2.10 -r1.126.2.44.2.1.2.11 --- ChangeLog 31 Jan 2008 17:32:27 -0000 1.126.2.44.2.1.2.10 +++ ChangeLog 5 Mar 2008 22:39:43 -0000 1.126.2.44.2.1.2.11 @@ -1,3 +1,8 @@ +2008-03-05 Michael Schwendt + + * server/Repo.py + - Fix debuginfo rpms exclude in _update_repo(). + 2008-01-18 Michael Schwendt * server/PackageJob.py From fedora-extras-commits at redhat.com Wed Mar 5 22:42:25 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Wed, 5 Mar 2008 22:42:25 GMT Subject: rpms/puppet/devel .cvsignore, 1.19, 1.20 puppet.spec, 1.21, 1.22 sources, 1.20, 1.21 Message-ID: <200803052242.m25MgPNK024281@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/puppet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24211 Modified Files: .cvsignore puppet.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/puppet/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 22 Dec 2007 22:29:40 -0000 1.19 +++ .cvsignore 5 Mar 2008 22:41:48 -0000 1.20 @@ -1 +1 @@ -puppet-0.24.1.tgz +puppet-0.24.2.tgz Index: puppet.spec =================================================================== RCS file: /cvs/pkgs/rpms/puppet/devel/puppet.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- puppet.spec 22 Dec 2007 22:29:40 -0000 1.21 +++ puppet.spec 5 Mar 2008 22:41:48 -0000 1.22 @@ -7,7 +7,7 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.24.1 +Version: 0.24.2 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -157,6 +157,9 @@ rm -rf %{buildroot} %changelog +* Wed Mar 5 2008 David Lutterkort - 0.24.2-1 +- New version + * Sat Dec 22 2007 David Lutterkort - 0.24.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/puppet/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 22 Dec 2007 22:29:40 -0000 1.20 +++ sources 5 Mar 2008 22:41:48 -0000 1.21 @@ -1 +1 @@ -74111be5615714ac980473e8d24b52db puppet-0.24.1.tgz +8f6533c8cbd1b738089671929db05c66 puppet-0.24.2.tgz From fedora-extras-commits at redhat.com Wed Mar 5 22:42:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:42:39 GMT Subject: rpms/perl-Net-DNS-Resolver-Programmable/devel perl-Net-DNS-Resolver-Programmable.spec, 1.2, 1.3 Message-ID: <200803052242.m25MgdUf024325@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-DNS-Resolver-Programmable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24240 Modified Files: perl-Net-DNS-Resolver-Programmable.spec Log Message: new perl Index: perl-Net-DNS-Resolver-Programmable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-DNS-Resolver-Programmable/devel/perl-Net-DNS-Resolver-Programmable.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Net-DNS-Resolver-Programmable.spec 11 Jul 2007 21:36:58 -0000 1.2 +++ perl-Net-DNS-Resolver-Programmable.spec 5 Mar 2008 22:42:01 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Net-DNS-Resolver-Programmable Version: 0.003 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Programmable DNS resolver class for offline emulation of DNS -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-DNS-Resolver-Programmable/ Source0: http://www.cpan.org/authors/id/J/JM/JMEHNLE/net-dns-resolver-programmable/Net-DNS-Resolver-Programmable-v%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 0.003-3 +- rebuild for new perl + * Wed Jul 11 2007 Steven Pritchard 0.003-2 - Rebuild. From fedora-extras-commits at redhat.com Wed Mar 5 22:43:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:43:29 GMT Subject: rpms/perl-Params-CallbackRequest/devel perl-Params-CallbackRequest.spec, 1.1, 1.2 Message-ID: <200803052243.m25MhThX024447@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Params-CallbackRequest/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24374 Modified Files: perl-Params-CallbackRequest.spec Log Message: new perl Index: perl-Params-CallbackRequest.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Params-CallbackRequest/devel/perl-Params-CallbackRequest.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Params-CallbackRequest.spec 25 Jul 2007 16:39:43 -0000 1.1 +++ perl-Params-CallbackRequest.spec 5 Mar 2008 22:42:48 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-Params-CallbackRequest Version: 1.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Functional and object-oriented callback architecture -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Params-CallbackRequest/ Source0: http://www.cpan.org/authors/id/D/DW/DWHEELER/Params-CallbackRequest-%{version}.tar.gz @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.17-2 +- rebuild for new perl + * Mon Jul 16 2007 Steven Pritchard 1.17-1 - Specfile autogenerated by cpanspec 1.73. - Remove redundant explicit perl BR. From fedora-extras-commits at redhat.com Wed Mar 5 22:44:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:44:28 GMT Subject: rpms/perl-File-chdir/devel perl-File-chdir.spec,1.3,1.4 Message-ID: <200803052244.m25MiSTs024536@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-chdir/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24490 Modified Files: perl-File-chdir.spec Log Message: new perl Index: perl-File-chdir.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-chdir/devel/perl-File-chdir.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-File-chdir.spec 17 Jan 2008 20:02:26 -0000 1.3 +++ perl-File-chdir.spec 5 Mar 2008 22:43:49 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-File-chdir Version: 0.09 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A more sensible way to change directories -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/File-chdir/ Source0: http://www.cpan.org/modules/by-module/File/File-chdir-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.09-2 +- rebuild for new perl + * Thu Jan 17 2008 Ian Burrell - 0.09-1 - Update to 0.09 From fedora-extras-commits at redhat.com Wed Mar 5 22:45:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:45:22 GMT Subject: rpms/perl-Module-Starter/devel perl-Module-Starter.spec,1.3,1.4 Message-ID: <200803052245.m25MjMY0024636@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-Starter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24598 Modified Files: perl-Module-Starter.spec Log Message: new perl Index: perl-Module-Starter.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Starter/devel/perl-Module-Starter.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Module-Starter.spec 1 Sep 2006 04:16:20 -0000 1.3 +++ perl-Module-Starter.spec 5 Mar 2008 22:44:46 -0000 1.4 @@ -1,10 +1,10 @@ Name: perl-Module-Starter Version: 1.42 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A simple starter kit for any module Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Module-Starter Source0: http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/Module-Starter-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,6 +66,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway 1.42-5 +- rebuild for new perl + * Thu Aug 31 2006 Chris Weyl 1.42-4 - bump for mass rebuild From fedora-extras-commits at redhat.com Wed Mar 5 22:47:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:47:05 GMT Subject: rpms/perl-MogileFS-Client/devel perl-MogileFS-Client.spec,1.2,1.3 Message-ID: <200803052247.m25Ml5hR024804@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MogileFS-Client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24713 Modified Files: perl-MogileFS-Client.spec Log Message: new perl Index: perl-MogileFS-Client.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MogileFS-Client/devel/perl-MogileFS-Client.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MogileFS-Client.spec 9 Aug 2007 21:17:48 -0000 1.2 +++ perl-MogileFS-Client.spec 5 Mar 2008 22:46:25 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-MogileFS-Client Version: 1.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Client library for the MogileFS distributed file system -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/~bradfitz/MogileFS-Client/ Source0: http://www.cpan.org/authors/id/B/BR/BRADFITZ/MogileFS-Client-%{version}.tar.gz @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Tom "spot" Callaway 1.08-2 +- rebuild for new perl + * Thu Aug 09 2007 Ruben Kerkhof 1.08-1 - Upstream released new version * Wed Jun 20 2007 Ruben Kerkhof 1.07-2 From fedora-extras-commits at redhat.com Wed Mar 5 22:50:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:50:10 GMT Subject: rpms/perl-XML-Grove/devel perl-XML-Grove.spec,1.16,1.17 Message-ID: <200803052250.m25MoAgO025009@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Grove/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24979 Modified Files: perl-XML-Grove.spec Log Message: new perl Index: perl-XML-Grove.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Grove/devel/perl-XML-Grove.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-XML-Grove.spec 17 Oct 2007 04:42:36 -0000 1.16 +++ perl-XML-Grove.spec 5 Mar 2008 22:49:35 -0000 1.17 @@ -1,6 +1,6 @@ Name: perl-XML-Grove Version: 0.46alpha -Release: 30 +Release: 31 Summary: Simple access to infoset of parsed XML, HTML, or SGML instances Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.46alpha-31 +- rebuild for new perl + * Wed Oct 17 2007 Tom "spot" Callaway - 0.46alpha-30 - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Wed Mar 5 22:50:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:50:57 GMT Subject: rpms/perl-Crypt-OpenSSL-DSA/devel perl-Crypt-OpenSSL-DSA.spec, 1.4, 1.5 Message-ID: <200803052250.m25MovpQ025080@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-DSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25047 Modified Files: perl-Crypt-OpenSSL-DSA.spec Log Message: new perl Index: perl-Crypt-OpenSSL-DSA.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-DSA/devel/perl-Crypt-OpenSSL-DSA.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Crypt-OpenSSL-DSA.spec 19 Feb 2008 04:47:22 -0000 1.4 +++ perl-Crypt-OpenSSL-DSA.spec 5 Mar 2008 22:50:22 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-Crypt-OpenSSL-DSA Version: 0.13 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl interface to OpenSSL for DSA -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-OpenSSL-DSA/ Source0: http://www.cpan.org/authors/id/T/TJ/TJMATHER/Crypt-OpenSSL-DSA-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.13-7 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.13-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 22:52:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:52:16 GMT Subject: rpms/perl-XML-Dumper/devel perl-XML-Dumper.spec,1.16,1.17 Message-ID: <200803052252.m25MqG2o025190@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Dumper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25134 Modified Files: perl-XML-Dumper.spec Log Message: new perl Index: perl-XML-Dumper.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Dumper/devel/perl-XML-Dumper.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-XML-Dumper.spec 25 Oct 2007 04:23:13 -0000 1.16 +++ perl-XML-Dumper.spec 5 Mar 2008 22:51:42 -0000 1.17 @@ -1,6 +1,6 @@ Name: perl-XML-Dumper Version: 0.81 -Release: 3%{dist} +Release: 4%{dist} Summary: Perl module for dumping Perl objects from/to XML Group: Development/Libraries @@ -64,6 +64,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.81-4 +- rebuild for new perl + * Thu Oct 25 2007 Robin Norwood - 0.81-3 - fix various issues from package review: - remove || : from %%check From fedora-extras-commits at redhat.com Wed Mar 5 22:53:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:53:09 GMT Subject: rpms/perl-HTML-PrettyPrinter/devel perl-HTML-PrettyPrinter.spec, 1.2, 1.3 Message-ID: <200803052253.m25Mr9Ad025318@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTML-PrettyPrinter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25247 Modified Files: perl-HTML-PrettyPrinter.spec Log Message: new perl Index: perl-HTML-PrettyPrinter.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-PrettyPrinter/devel/perl-HTML-PrettyPrinter.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-HTML-PrettyPrinter.spec 11 Jan 2008 23:47:48 -0000 1.2 +++ perl-HTML-PrettyPrinter.spec 5 Mar 2008 22:52:33 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-HTML-PrettyPrinter Version: 0.03 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generate nice HTML files from HTML syntax trees @@ -59,6 +59,9 @@ %changelog +* Wed Mar 05 2008 Tom "spot" Callaway - 0.03-4 +- rebuild for new perl + * Sat Jan 12 2008 Xavier Bachelot - 0.03-3 - Fix URL:. From fedora-extras-commits at redhat.com Wed Mar 5 22:53:58 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:53:58 GMT Subject: rpms/perl-DateTime-Precise/devel perl-DateTime-Precise.spec, 1.1, 1.2 Message-ID: <200803052253.m25Mrw2W025510@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Precise/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25384 Modified Files: perl-DateTime-Precise.spec Log Message: new perl Index: perl-DateTime-Precise.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Precise/devel/perl-DateTime-Precise.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-DateTime-Precise.spec 31 Jan 2008 20:39:50 -0000 1.1 +++ perl-DateTime-Precise.spec 5 Mar 2008 22:53:24 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-DateTime-Precise Version: 1.05 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perform common time and date operations with additional GPS operations @@ -76,6 +76,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 1.05-4 +- rebuild for new perl + * Wed Jan 30 2008 Xavier Bachelot - 1.05-3 - Fix License: tag. - Remove '| :' for %%check section. From fedora-extras-commits at redhat.com Wed Mar 5 22:54:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:54:48 GMT Subject: rpms/perl-GPS-PRN/devel perl-GPS-PRN.spec,1.5,1.6 Message-ID: <200803052254.m25MsmBj025644@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-GPS-PRN/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25564 Modified Files: perl-GPS-PRN.spec Log Message: new perl Index: perl-GPS-PRN.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-GPS-PRN/devel/perl-GPS-PRN.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-GPS-PRN.spec 16 Oct 2007 18:23:01 -0000 1.5 +++ perl-GPS-PRN.spec 5 Mar 2008 22:54:15 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-GPS-PRN Version: 0.05 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Package for PRN - Object ID conversions Group: Development/Libraries @@ -51,6 +51,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.05-2 +- rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 0.05-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Wed Mar 5 22:55:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:55:42 GMT Subject: rpms/perl-Net-Libdnet/devel perl-Net-Libdnet.spec,1.3,1.4 Message-ID: <200803052255.m25MtgXH025863@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-Libdnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25718 Modified Files: perl-Net-Libdnet.spec Log Message: new perl Index: perl-Net-Libdnet.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Libdnet/devel/perl-Net-Libdnet.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Net-Libdnet.spec 20 Feb 2008 00:21:23 -0000 1.3 +++ perl-Net-Libdnet.spec 5 Mar 2008 22:55:03 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Net-Libdnet Version: 0.01 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl interface to libdnet Group: Development/Libraries @@ -51,6 +51,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.01-5 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.01-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 22:56:04 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 5 Mar 2008 22:56:04 GMT Subject: rpms/xulrunner/devel xulrunner.spec, 1.84, 1.85 mozilla-gcc43.patch, 1.1, 1.2 Message-ID: <200803052256.m25Mu41n025959@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25487 Modified Files: xulrunner.spec mozilla-gcc43.patch Log Message: Update the patch for gcc 4.3 to actually fix the warnings instead of hide them. https://bugzilla.mozilla.org/show_bug.cgi?id=409384 Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- xulrunner.spec 5 Mar 2008 03:43:15 -0000 1.84 +++ xulrunner.spec 5 Mar 2008 22:55:30 -0000 1.85 @@ -119,7 +119,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -b .ver -%patch7 -p0 -b .gcc43 +%patch7 -p1 -b .gcc43 %patch107 -p1 -b .pk mozilla-gcc43.patch: Index: mozilla-gcc43.patch =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/mozilla-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mozilla-gcc43.patch 7 Feb 2008 04:12:44 -0000 1.1 +++ mozilla-gcc43.patch 5 Mar 2008 22:55:30 -0000 1.2 @@ -1,18 +1,119 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=411442 +https://bugzilla.mozilla.org/show_bug.cgi?id=409384 + +diff --git a/xpcom/glue/nsISupportsImpl.h b/xpcom/glue/nsISupportsImpl.h +--- a/xpcom/glue/nsISupportsImpl.h ++++ b/xpcom/glue/nsISupportsImpl.h +@@ -433,18 +433,18 @@ NS_IMETHODIMP _class::QueryInterface(REF + + #define NS_INTERFACE_TABLE_ENTRY(_class, _interface) \ + { &_interface::COMTypeInfo::kIID, \ +- reinterpret_cast( \ ++ PROffset32(reinterpret_cast( \ + static_cast<_interface*>((_class*) 0x1000)) - \ +- reinterpret_cast((_class*) 0x1000) \ ++ reinterpret_cast((_class*) 0x1000)) \ + }, + + #define NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, _interface, _implClass) \ + { &_interface::COMTypeInfo::kIID, \ +- reinterpret_cast( \ ++ PROffset32(reinterpret_cast( \ + static_cast<_interface*>( \ + static_cast<_implClass*>( \ + (_class*) 0x1000))) - \ +- reinterpret_cast((_class*) 0x1000) \ ++ reinterpret_cast((_class*) 0x1000)) \ + }, + + #define NS_INTERFACE_TABLE_END_WITH_PTR(_ptr) \ +diff --git a/xpcom/glue/nsVoidArray.h b/xpcom/glue/nsVoidArray.h +--- a/xpcom/glue/nsVoidArray.h ++++ b/xpcom/glue/nsVoidArray.h +@@ -406,7 +406,7 @@ private: + + PRBool HasSingle() const + { +- return reinterpret_cast(mImpl) & 0x1; ++ return !!(reinterpret_cast(mImpl) & 0x1); + } + void* GetSingle() const + { +diff --git a/xpcom/string/public/nsCharTraits.h b/xpcom/string/public/nsCharTraits.h +--- a/xpcom/string/public/nsCharTraits.h ++++ b/xpcom/string/public/nsCharTraits.h +@@ -671,7 +671,7 @@ struct nsCharSourceTraits + readable_distance( const InputIterator& first, const InputIterator& last ) + { + // assumes single fragment +- return last.get() - first.get(); ++ return PRUint32(last.get() - first.get()); + } + + static +diff --git a/xpcom/string/public/nsTDependentString.h b/xpcom/string/public/nsTDependentString.h +--- a/xpcom/string/public/nsTDependentString.h ++++ b/xpcom/string/public/nsTDependentString.h +@@ -73,7 +73,7 @@ class nsTDependentString_CharT : public + */ + + nsTDependentString_CharT( const char_type* start, const char_type* end ) +- : string_type(const_cast(start), end - start, F_TERMINATED) ++ : string_type(const_cast(start), PRUint32(end - start), F_TERMINATED) + { + AssertValid(); + } +@@ -86,7 +86,7 @@ class nsTDependentString_CharT : public + + explicit + nsTDependentString_CharT( const char_type* data ) +- : string_type(const_cast(data), char_traits::length(data), F_TERMINATED) ++ : string_type(const_cast(data), PRUint32(char_traits::length(data)), F_TERMINATED) + { + AssertValid(); + } +@@ -114,14 +114,14 @@ class nsTDependentString_CharT : public + + void Rebind( const char_type* data ) + { +- Rebind(data, char_traits::length(data)); ++ Rebind(data, PRUint32(char_traits::length(data))); + } + + NS_COM void Rebind( const char_type* data, size_type length ); + + void Rebind( const char_type* start, const char_type* end ) + { +- Rebind(start, end - start); ++ Rebind(start, PRUint32(end - start)); + } + + private: +diff --git a/xpcom/string/public/nsTDependentSubstring.h b/xpcom/string/public/nsTDependentSubstring.h +--- a/xpcom/string/public/nsTDependentSubstring.h ++++ b/xpcom/string/public/nsTDependentSubstring.h +@@ -71,10 +71,10 @@ class nsTDependentSubstring_CharT : publ + } + + nsTDependentSubstring_CharT( const char_type* start, const char_type* end ) +- : substring_type(const_cast(start), end - start, F_NONE) {} ++ : substring_type(const_cast(start), PRUint32(end - start), F_NONE) {} + + nsTDependentSubstring_CharT( const const_iterator& start, const const_iterator& end ) +- : substring_type(const_cast(start.get()), end.get() - start.get(), F_NONE) {} ++ : substring_type(const_cast(start.get()), PRUint32(end.get() - start.get()), F_NONE) {} + + // Create a nsTDependentSubstring to be bound later + nsTDependentSubstring_CharT() +diff --git a/xpcom/string/public/nsTString.h b/xpcom/string/public/nsTString.h +--- a/xpcom/string/public/nsTString.h ++++ b/xpcom/string/public/nsTString.h +@@ -449,7 +449,7 @@ class nsTFixedString_CharT : public nsTS + */ + + nsTFixedString_CharT( char_type* data, size_type storageSize ) +- : string_type(data, char_traits::length(data), F_TERMINATED | F_FIXED | F_CLASS_FIXED) ++ : string_type(data, PRUint32(char_traits::length(data)), F_TERMINATED | F_FIXED | F_CLASS_FIXED) + , mFixedCapacity(storageSize - 1) + , mFixedBuf(data) + {} -Index: configure -=================================================================== -RCS file: /cvsroot/mozilla/configure,v -retrieving revision 1.1956 -diff -d -u -p -r1.1956 configure ---- configure 6 Feb 2008 21:21:03 -0000 1.1956 -+++ configure 7 Feb 2008 03:55:09 -0000 -@@ -5556,7 +5556,7 @@ if test "$GNU_CXX"; then - # FIXME: Let us build with strict aliasing. bug 414641. - CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" - # Turn on GNU specific features -- _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" -+ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" - if test "$CPU_ARCH" != "ia64"; then - # only use -Wcast-align for non-ia64, it's noisy on that platform - _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wcast-align" From fedora-extras-commits at redhat.com Wed Mar 5 22:57:30 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 5 Mar 2008 22:57:30 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.280,1.281 Message-ID: <200803052257.m25MvUIq026145@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26031/devel Modified Files: kdelibs.spec Log Message: Also BR graphviz when building apidocs. Fix apidocs directory. Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.280 retrieving revision 1.281 diff -u -r1.280 -r1.281 --- kdelibs.spec 5 Mar 2008 22:08:50 -0000 1.280 +++ kdelibs.spec 5 Mar 2008 22:56:55 -0000 1.281 @@ -108,6 +108,7 @@ %if "%{?apidocs}" == "1" BuildRequires: doxygen +BuildRequires: graphviz BuildRequires: qt4-doc %endif @@ -232,7 +233,7 @@ # install apidocs and generator script install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh %if "%{?apidocs}" == "1" -install -p -D kdelibs-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs +install -p -D kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs %endif @@ -325,7 +326,7 @@ - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel - build apidocs and put them into an -apidocs subpackage (can be turned off) -- BR doxygen and qt4-doc when building apidocs +- BR doxygen, graphviz and qt4-doc when building apidocs * Fri Feb 29 2008 Than Ngo 4.0.2-3 - rebuilt From fedora-extras-commits at redhat.com Wed Mar 5 22:57:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 22:57:44 GMT Subject: rpms/perl-Net-Write/devel perl-Net-Write.spec,1.1,1.2 Message-ID: <200803052257.m25Mvi6p026160@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-Write/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26089 Modified Files: perl-Net-Write.spec Log Message: new perl Index: perl-Net-Write.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Write/devel/perl-Net-Write.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-Write.spec 2 Jun 2007 17:18:58 -0000 1.1 +++ perl-Net-Write.spec 5 Mar 2008 22:57:05 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Net-Write Version: 1.00 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A portable interface to open and send raw data to network Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 1.00-3 +- rebuild for new perl + * Sat May 26 2007 Sindre Pedersen Bj??rdal - 1.00-2 - Add examples dir as documentation - Add missing BRs for tests From fedora-extras-commits at redhat.com Wed Mar 5 22:58:35 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 5 Mar 2008 22:58:35 GMT Subject: rpms/xulrunner/devel xulrunner-mozconfig,1.12,1.13 Message-ID: <200803052258.m25MwZiG026227@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26170 Modified Files: xulrunner-mozconfig Log Message: cookies isn't an extension anymore Index: xulrunner-mozconfig =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-mozconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xulrunner-mozconfig 23 Feb 2008 01:33:57 -0000 1.12 +++ xulrunner-mozconfig 5 Mar 2008 22:57:58 -0000 1.13 @@ -21,7 +21,7 @@ ac_add_options --enable-canvas ac_add_options --enable-application=xulrunner ac_add_options --disable-javaxpcom -ac_add_options --enable-extensions=default,cookie +ac_add_options --enable-extensions=default ac_add_options --disable-crashreporter export BUILD_OFFICIAL=1 From fedora-extras-commits at redhat.com Wed Mar 5 23:00:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 5 Mar 2008 23:00:20 GMT Subject: rpms/perl-Net-IPv6Addr/devel perl-Net-IPv6Addr.spec,1.1,1.2 Message-ID: <200803052300.m25N0KC5026306@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-IPv6Addr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26260 Modified Files: perl-Net-IPv6Addr.spec Log Message: new perl Index: perl-Net-IPv6Addr.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-IPv6Addr/devel/perl-Net-IPv6Addr.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-IPv6Addr.spec 30 May 2007 22:29:03 -0000 1.1 +++ perl-Net-IPv6Addr.spec 5 Mar 2008 22:59:39 -0000 1.2 @@ -1,10 +1,10 @@ Name: perl-Net-IPv6Addr Version: 0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl module to check validity of IPv6 addresses Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Net-IPv6Addr/ Source0: http://search.cpan.org/CPAN/authors/id/T/TM/TMONROE/Net-IPv6Addr-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Wed Mar 5 2008 Tom "spot" Callaway - 0.2-4 +- rebuild for new perl + * Mon May 28 2007 Sindre Pedersen Bj??rdal - 0.2-3 - Fix license - Add explicit Requires on perl(Math::Base85) From fedora-extras-commits at redhat.com Wed Mar 5 23:06:05 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Wed, 5 Mar 2008 23:06:05 GMT Subject: rpms/puppet/EL-4 .cvsignore, 1.16, 1.17 puppet.spec, 1.18, 1.19 sources, 1.17, 1.18 Message-ID: <200803052306.m25N65IK001211@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/puppet/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1129/EL-4 Modified Files: .cvsignore puppet.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-4/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 22 Dec 2007 22:29:12 -0000 1.16 +++ .cvsignore 5 Mar 2008 23:05:29 -0000 1.17 @@ -1 +1 @@ -puppet-0.24.1.tgz +puppet-0.24.2.tgz Index: puppet.spec =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-4/puppet.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- puppet.spec 22 Dec 2007 22:29:12 -0000 1.18 +++ puppet.spec 5 Mar 2008 23:05:29 -0000 1.19 @@ -7,7 +7,7 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.24.1 +Version: 0.24.2 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -157,6 +157,9 @@ rm -rf %{buildroot} %changelog +* Wed Mar 5 2008 David Lutterkort - 0.24.2-1 +- New version + * Sat Dec 22 2007 David Lutterkort - 0.24.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-4/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 22 Dec 2007 22:29:12 -0000 1.17 +++ sources 5 Mar 2008 23:05:29 -0000 1.18 @@ -1 +1 @@ -74111be5615714ac980473e8d24b52db puppet-0.24.1.tgz +8f6533c8cbd1b738089671929db05c66 puppet-0.24.2.tgz From fedora-extras-commits at redhat.com Wed Mar 5 23:06:10 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Wed, 5 Mar 2008 23:06:10 GMT Subject: rpms/puppet/EL-5 .cvsignore, 1.18, 1.19 puppet.spec, 1.20, 1.21 sources, 1.19, 1.20 Message-ID: <200803052306.m25N6A9F001225@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/puppet/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1129/EL-5 Modified Files: .cvsignore puppet.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-5/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 22 Dec 2007 22:29:21 -0000 1.18 +++ .cvsignore 5 Mar 2008 23:05:35 -0000 1.19 @@ -1 +1 @@ -puppet-0.24.1.tgz +puppet-0.24.2.tgz Index: puppet.spec =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-5/puppet.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- puppet.spec 22 Dec 2007 22:29:21 -0000 1.20 +++ puppet.spec 5 Mar 2008 23:05:35 -0000 1.21 @@ -7,7 +7,7 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.24.1 +Version: 0.24.2 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -157,6 +157,9 @@ rm -rf %{buildroot} %changelog +* Wed Mar 5 2008 David Lutterkort - 0.24.2-1 +- New version + * Sat Dec 22 2007 David Lutterkort - 0.24.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/puppet/EL-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 22 Dec 2007 22:29:21 -0000 1.19 +++ sources 5 Mar 2008 23:05:35 -0000 1.20 @@ -1 +1 @@ -74111be5615714ac980473e8d24b52db puppet-0.24.1.tgz +8f6533c8cbd1b738089671929db05c66 puppet-0.24.2.tgz From fedora-extras-commits at redhat.com Wed Mar 5 23:06:19 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Wed, 5 Mar 2008 23:06:19 GMT Subject: rpms/puppet/F-7 .cvsignore, 1.19, 1.20 puppet.spec, 1.21, 1.22 sources, 1.20, 1.21 Message-ID: <200803052306.m25N6JLV001230@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/puppet/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1129/F-7 Modified Files: .cvsignore puppet.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-7/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 22 Dec 2007 22:29:25 -0000 1.19 +++ .cvsignore 5 Mar 2008 23:05:40 -0000 1.20 @@ -1 +1 @@ -puppet-0.24.1.tgz +puppet-0.24.2.tgz Index: puppet.spec =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-7/puppet.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- puppet.spec 22 Dec 2007 22:29:25 -0000 1.21 +++ puppet.spec 5 Mar 2008 23:05:40 -0000 1.22 @@ -7,7 +7,7 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.24.1 +Version: 0.24.2 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -157,6 +157,9 @@ rm -rf %{buildroot} %changelog +* Wed Mar 5 2008 David Lutterkort - 0.24.2-1 +- New version + * Sat Dec 22 2007 David Lutterkort - 0.24.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-7/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 22 Dec 2007 22:29:25 -0000 1.20 +++ sources 5 Mar 2008 23:05:40 -0000 1.21 @@ -1 +1 @@ -74111be5615714ac980473e8d24b52db puppet-0.24.1.tgz +8f6533c8cbd1b738089671929db05c66 puppet-0.24.2.tgz From fedora-extras-commits at redhat.com Wed Mar 5 23:06:24 2008 From: fedora-extras-commits at redhat.com (David Lutterkort (lutter)) Date: Wed, 5 Mar 2008 23:06:24 GMT Subject: rpms/puppet/F-8 .cvsignore, 1.19, 1.20 puppet.spec, 1.21, 1.22 sources, 1.20, 1.21 Message-ID: <200803052306.m25N6OCo001235@cvs-int.fedora.redhat.com> Author: lutter Update of /cvs/pkgs/rpms/puppet/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1129/F-8 Modified Files: .cvsignore puppet.spec sources Log Message: New version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-8/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 22 Dec 2007 22:29:34 -0000 1.19 +++ .cvsignore 5 Mar 2008 23:05:50 -0000 1.20 @@ -1 +1 @@ -puppet-0.24.1.tgz +puppet-0.24.2.tgz Index: puppet.spec =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-8/puppet.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- puppet.spec 22 Dec 2007 22:29:34 -0000 1.21 +++ puppet.spec 5 Mar 2008 23:05:50 -0000 1.22 @@ -7,7 +7,7 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.24.1 +Version: 0.24.2 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -157,6 +157,9 @@ rm -rf %{buildroot} %changelog +* Wed Mar 5 2008 David Lutterkort - 0.24.2-1 +- New version + * Sat Dec 22 2007 David Lutterkort - 0.24.1-1 - New version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/puppet/F-8/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 22 Dec 2007 22:29:34 -0000 1.20 +++ sources 5 Mar 2008 23:05:50 -0000 1.21 @@ -1 +1 @@ -74111be5615714ac980473e8d24b52db puppet-0.24.1.tgz +8f6533c8cbd1b738089671929db05c66 puppet-0.24.2.tgz From fedora-extras-commits at redhat.com Wed Mar 5 23:11:47 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 23:11:47 GMT Subject: rpms/zvbi/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 zvbi.spec, 1.7, 1.8 Message-ID: <200803052311.m25NBl8g001428@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/zvbi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1374 Modified Files: .cvsignore sources zvbi.spec Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zvbi/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Jan 2008 22:23:59 -0000 1.5 +++ .cvsignore 5 Mar 2008 23:11:11 -0000 1.6 @@ -1 +1 @@ -zvbi-0.2.26.tar.bz2 +zvbi-0.2.30.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/zvbi/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jan 2008 22:23:59 -0000 1.5 +++ sources 5 Mar 2008 23:11:11 -0000 1.6 @@ -1 +1 @@ -82805319ca61f6ffd7b7bb64d7433448 zvbi-0.2.26.tar.bz2 +ab131c42115188e131def8f5364e4491 zvbi-0.2.30.tar.bz2 Index: zvbi.spec =================================================================== RCS file: /cvs/extras/rpms/zvbi/devel/zvbi.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- zvbi.spec 19 Feb 2008 16:57:54 -0000 1.7 +++ zvbi.spec 5 Mar 2008 23:11:11 -0000 1.8 @@ -2,15 +2,16 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.26 -Release: 3%{?dist} +Version: 0.2.30 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries -License: GPLv2+ +# See NEWS for a full breakdown of licensing. +License: LGPLv2+ and GPLv2+ and BSD URL: http://zapping.sourceforge.net/ZVBI/index.html Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 -Patch0: zvbi-0.2.24-tvfonts.patch -Patch1: zvbi-0.2.25-openfix.patch +Patch0: %{name}-0.2.24-tvfonts.patch +Patch1: %{name}-0.2.25-openfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen BuildRequires: fontconfig @@ -65,10 +66,7 @@ %patch -p1 -b .orig %patch1 -p1 -#Fix character encodings (note ChangeLog's encoding is broken, hence sed) -sed -i 's/\xC3\xB2/\xF2/g' ChangeLog -sed -i 's/\xC2\x81//g' ChangeLog -iconv -f iso8859-1 ChangeLog -t utf8 > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog +#Fix character encodings iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README @@ -103,11 +101,11 @@ %find_lang %{name} #Install init script -install -m0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid +install -pm0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid #Install fonts -install -m 0644 contrib/*.pcf.gz %{buildroot}%{fontdir} -install -m 0644 contrib/fonts.* %{buildroot}%{fontdir} +install -pm0644 contrib/*.pcf.gz %{buildroot}%{fontdir} +install -pm0644 contrib/fonts.* %{buildroot}%{fontdir} #%%ghost the fonts.cache-1 and fonts.dir touch %{buildroot}%{fontdir}/fonts.cache-1 @@ -166,7 +164,7 @@ %{_mandir}/man1/* %exclude %{_libdir}/*.a %exclude %{_libdir}/*.la -%doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING NEWS README TODO +%doc AUTHORS BUGS ChangeLog COPYING COPYING.LIB NEWS README TODO %files devel @@ -187,6 +185,11 @@ %changelog +* Wed Mar 05 2008 Ian Chapman 0.2.30-1 +- Update to 0.2.30 +- Updated license field due to license change GPLv2+ -> LGPLv2+ +- Dropped encoding fixes for ChangeLog. No longer needed. + * Tue Feb 19 2008 Fedora Release Engineering - 0.2.26-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 23:11:59 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 5 Mar 2008 23:11:59 GMT Subject: rpms/selinux-policy/devel policy-20071130.patch, 1.88, 1.89 selinux-policy.spec, 1.625, 1.626 Message-ID: <200803052311.m25NBxRq001453@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1425 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Mon Mar 3 2008 Dan Walsh 3.3.1-11 - Fixes for libvirt policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- policy-20071130.patch 4 Mar 2008 21:38:18 -0000 1.88 +++ policy-20071130.patch 5 Mar 2008 23:11:52 -0000 1.89 @@ -6227,7 +6227,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.3.1/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2008-02-01 09:12:53.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/kernel/corenetwork.te.in 2008-03-04 15:06:28.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/kernel/corenetwork.te.in 2008-03-04 16:33:16.000000000 -0500 @@ -82,6 +82,7 @@ network_port(clockspeed, udp,4041,s0) network_port(cluster, tcp,5149,s0, udp,5149,s0, tcp,40040,s0, tcp,50006,s0, udp,50006,s0, tcp,50007,s0, udp,50007,s0, tcp,50008,s0, udp,50008,s0) @@ -6274,7 +6274,7 @@ network_port(printer, tcp,515,s0) network_port(ptal, tcp,5703,s0) network_port(pxe, udp,4011,s0) -@@ -148,7 +155,7 @@ +@@ -148,11 +155,11 @@ network_port(ricci_modcluster, tcp,16851,s0, udp,16851,s0) network_port(rlogind, tcp,513,s0) network_port(rndc, tcp,953,s0) @@ -6283,6 +6283,11 @@ network_port(rsh, tcp,514,s0) network_port(rsync, tcp,873,s0, udp,873,s0) network_port(rwho, udp,513,s0) +-network_port(smbd, tcp,139,s0, tcp,445,s0) ++network_port(smbd, tcp,137-139,s0, tcp,445,s0) + network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0) + network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0) + network_port(spamd, tcp,783,s0) @@ -170,7 +177,12 @@ network_port(transproxy, tcp,8081,s0) type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon @@ -6878,7 +6883,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.3.1/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2007-10-29 18:02:31.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/kernel/files.if 2008-03-04 16:23:38.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/kernel/files.if 2008-03-04 17:23:42.000000000 -0500 @@ -1266,6 +1266,24 @@ ######################################## @@ -7550,7 +7555,7 @@ /dev/gscd -b gen_context(system_u:object_r:removable_device_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.3.1/policy/modules/kernel/storage.if --- nsaserefpolicy/policy/modules/kernel/storage.if 2008-02-26 08:17:43.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/kernel/storage.if 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/kernel/storage.if 2008-03-04 17:41:15.000000000 -0500 @@ -81,6 +81,26 @@ ######################################## @@ -7783,7 +7788,7 @@ +/etc/rc\.d/init\.d/httpd -- gen_context(system_u:object_r:httpd_script_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.3.1/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2007-10-23 17:17:42.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/apache.if 2008-02-29 14:20:00.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/apache.if 2008-03-05 15:44:05.000000000 -0500 @@ -13,21 +13,16 @@ # template(`apache_content_template',` @@ -12788,8 +12793,8 @@ +/etc/rc.d/init.d/dnsmasq -- gen_context(system_u:object_r:dnsmasq_script_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.if serefpolicy-3.3.1/policy/modules/services/dnsmasq.if --- nsaserefpolicy/policy/modules/services/dnsmasq.if 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/dnsmasq.if 2008-02-26 08:29:22.000000000 -0500 -@@ -1 +1,106 @@ ++++ serefpolicy-3.3.1/policy/modules/services/dnsmasq.if 2008-03-05 14:40:55.000000000 -0500 +@@ -1 +1,125 @@ ## dnsmasq DNS forwarder and DHCP server + +######################################## @@ -12853,6 +12858,25 @@ + +######################################## +## ++## Send dnsmasq a sigkill ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++# ++interface(`dnsmasq_sigkill',` ++ gen_require(` ++ type dnsmasq_t; ++ ') ++ ++ allow $1 dnsmasq_t:process sigkill; ++') ++ ++######################################## ++## +## All of the rules required to administrate +## an dnsmasq environment +## @@ -23011,7 +23035,7 @@ /var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.3.1/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-12-04 11:02:50.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-04 14:49:58.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-05 14:36:29.000000000 -0500 @@ -12,9 +12,15 @@ ## ## @@ -23745,7 +23769,7 @@ + # X Protocol Extensions + allow $3 std_xext_t:x_extension { use }; + allow $3 shmem_xext_t:x_extension { use }; -+ dontaudit $3 xextension_type:x_extension query; ++ allow $3 xextension_type:x_extension query; + + # X Properties + # can read and write client properties @@ -24303,7 +24327,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.3.1/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.te 2008-02-28 16:46:06.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.te 2008-03-05 18:07:11.000000000 -0500 @@ -8,6 +8,14 @@ ## @@ -24543,7 +24567,15 @@ fs_getattr_all_fs(xdm_t) fs_search_auto_mountpoints(xdm_t) -@@ -245,6 +357,7 @@ +@@ -237,6 +349,7 @@ + storage_dontaudit_raw_write_removable_device(xdm_t) + storage_dontaudit_setattr_removable_dev(xdm_t) + storage_dontaudit_rw_scsi_generic(xdm_t) ++storage_rw_fuse(xdm_t) + + term_setattr_console(xdm_t) + term_use_unallocated_ttys(xdm_t) +@@ -245,6 +358,7 @@ auth_domtrans_pam_console(xdm_t) auth_manage_pam_pid(xdm_t) auth_manage_pam_console_data(xdm_t) @@ -24551,7 +24583,7 @@ auth_rw_faillog(xdm_t) auth_write_login_records(xdm_t) -@@ -256,12 +369,11 @@ +@@ -256,12 +370,11 @@ libs_exec_lib_files(xdm_t) logging_read_generic_logs(xdm_t) @@ -24565,7 +24597,7 @@ userdom_dontaudit_use_unpriv_user_fds(xdm_t) userdom_dontaudit_search_sysadm_home_dirs(xdm_t) userdom_create_all_users_keys(xdm_t) -@@ -270,8 +382,13 @@ +@@ -270,8 +383,13 @@ # Search /proc for any user domain processes. userdom_read_all_users_state(xdm_t) userdom_signal_all_users(xdm_t) @@ -24579,7 +24611,7 @@ tunable_policy(`use_nfs_home_dirs',` fs_manage_nfs_dirs(xdm_t) -@@ -304,7 +421,11 @@ +@@ -304,7 +422,11 @@ ') optional_policy(` @@ -24592,7 +24624,7 @@ ') optional_policy(` -@@ -312,6 +433,23 @@ +@@ -312,6 +434,23 @@ ') optional_policy(` @@ -24616,7 +24648,7 @@ # Talk to the console mouse server. gpm_stream_connect(xdm_t) gpm_setattr_gpmctl(xdm_t) -@@ -322,6 +460,10 @@ +@@ -322,6 +461,10 @@ ') optional_policy(` @@ -24627,7 +24659,7 @@ loadkeys_exec(xdm_t) ') -@@ -335,6 +477,11 @@ +@@ -335,6 +478,11 @@ ') optional_policy(` @@ -24639,7 +24671,7 @@ seutil_sigchld_newrole(xdm_t) ') -@@ -343,8 +490,8 @@ +@@ -343,8 +491,8 @@ ') optional_policy(` @@ -24649,7 +24681,7 @@ ifndef(`distro_redhat',` allow xdm_t self:process { execheap execmem }; -@@ -380,7 +527,7 @@ +@@ -380,7 +528,7 @@ allow xdm_xserver_t xdm_var_lib_t:file { getattr read }; dontaudit xdm_xserver_t xdm_var_lib_t:dir search; @@ -24658,7 +24690,7 @@ # Label pid and temporary files with derived types. manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t) -@@ -392,6 +539,15 @@ +@@ -392,6 +540,15 @@ can_exec(xdm_xserver_t, xkb_var_lib_t) files_search_var_lib(xdm_xserver_t) @@ -24674,7 +24706,7 @@ # VNC v4 module in X server corenet_tcp_bind_vnc_port(xdm_xserver_t) -@@ -404,9 +560,17 @@ +@@ -404,9 +561,17 @@ # to read ROLE_home_t - examine this in more detail # (xauth?) userdom_read_unpriv_users_home_content_files(xdm_xserver_t) @@ -24692,7 +24724,7 @@ tunable_policy(`use_nfs_home_dirs',` fs_manage_nfs_dirs(xdm_xserver_t) fs_manage_nfs_files(xdm_xserver_t) -@@ -420,6 +584,22 @@ +@@ -420,6 +585,22 @@ ') optional_policy(` @@ -24715,7 +24747,7 @@ resmgr_stream_connect(xdm_t) ') -@@ -429,47 +609,138 @@ +@@ -429,47 +610,138 @@ ') optional_policy(` @@ -25285,7 +25317,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.3.1/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2008-02-19 17:24:26.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/authlogin.te 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/authlogin.te 2008-03-05 15:46:36.000000000 -0500 @@ -59,6 +59,9 @@ type utempter_exec_t; application_domain(utempter_t,utempter_exec_t) @@ -25319,7 +25351,19 @@ ifdef(`distro_ubuntu',` optional_policy(` unconfined_domain(pam_t) -@@ -297,8 +309,10 @@ +@@ -282,6 +294,11 @@ + ') + ') + ++optional_policy(` ++ # apache leaks file descriptors ++ apache_dontaudit_rw_tcp_sockets(system_chkpwd_t) ++') ++ + ######################################## + # + # updpwd local policy +@@ -297,8 +314,10 @@ files_manage_etc_files(updpwd_t) term_dontaudit_use_console(updpwd_t) @@ -25331,7 +25375,7 @@ auth_manage_shadow(updpwd_t) auth_use_nsswitch(updpwd_t) -@@ -359,11 +373,6 @@ +@@ -359,11 +378,6 @@ ') optional_policy(` @@ -28372,7 +28416,7 @@ +/usr/sbin/sysreport -- gen_context(system_u:object_r:unconfined_notrans_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.3.1/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2007-11-16 15:30:49.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/unconfined.if 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/unconfined.if 2008-03-04 17:26:54.000000000 -0500 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -28407,7 +28451,15 @@ kernel_unconfined($1) corenet_unconfined($1) -@@ -70,6 +70,7 @@ +@@ -40,6 +40,7 @@ + domain_unconfined($1) + domain_dontaudit_read_all_domains_state($1) + domain_dontaudit_ptrace_all_domains($1) ++ domain_mmap_low($1) + files_unconfined($1) + fs_unconfined($1) + selinux_unconfined($1) +@@ -70,6 +71,7 @@ optional_policy(` # Communicate via dbusd. dbus_system_bus_unconfined($1) @@ -28415,7 +28467,7 @@ ') optional_policy(` -@@ -95,6 +96,10 @@ +@@ -95,6 +97,10 @@ optional_policy(` storage_unconfined($1) ') @@ -28426,7 +28478,7 @@ ') ######################################## -@@ -581,7 +586,6 @@ +@@ -581,7 +587,6 @@ interface(`unconfined_dbus_connect',` gen_require(` type unconfined_t; @@ -28434,7 +28486,7 @@ ') allow $1 unconfined_t:dbus acquire_svc; -@@ -589,7 +593,139 @@ +@@ -589,7 +594,139 @@ ######################################## ## @@ -28575,7 +28627,7 @@ ## ## ## -@@ -597,41 +733,43 @@ +@@ -597,41 +734,43 @@ ## ## # @@ -28633,7 +28685,7 @@ ## ## ## -@@ -639,10 +777,10 @@ +@@ -639,10 +778,10 @@ ## ## # @@ -28974,7 +29026,7 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.3.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-02-15 09:52:56.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-03-03 16:30:45.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-03-05 18:06:38.000000000 -0500 @@ -29,9 +29,14 @@ ') @@ -32328,8 +32380,8 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.te serefpolicy-3.3.1/policy/modules/system/virt.te --- nsaserefpolicy/policy/modules/system/virt.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/virt.te 2008-02-26 08:29:22.000000000 -0500 -@@ -0,0 +1,159 @@ ++++ serefpolicy-3.3.1/policy/modules/system/virt.te 2008-03-05 18:05:21.000000000 -0500 +@@ -0,0 +1,162 @@ + +policy_module(virt,1.0.0) + @@ -32385,8 +32437,8 @@ +# +# virtd local policy +# -+allow virtd_t self:capability { dac_override kill net_admin setgid }; -+allow virtd_t self:process sigkill; ++allow virtd_t self:capability { sys_module dac_override kill net_admin setgid }; ++allow virtd_t self:process { sigkill signal }; +allow virtd_t self:fifo_file rw_file_perms; +allow virtd_t self:unix_stream_socket create_stream_socket_perms; +allow virtd_t self:tcp_socket create_stream_socket_perms; @@ -32412,6 +32464,8 @@ +manage_lnk_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t) +filetrans_pattern(virtd_t, virt_etc_t, virt_etc_rw_t, dir) + ++corecmd_exec_bin(virtd_t) ++ +corenet_all_recvfrom_unlabeled(virtd_t) +corenet_all_recvfrom_netlabel(virtd_t) +corenet_tcp_sendrecv_all_if(virtd_t) @@ -32467,6 +32521,7 @@ +optional_policy(` + dnsmasq_domtrans(virtd_t) + dnsmasq_signal(virtd_t) ++ dnsmasq_sigkill(virtd_t) +') + +optional_policy(` Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.625 retrieving revision 1.626 diff -u -r1.625 -r1.626 --- selinux-policy.spec 4 Mar 2008 21:38:18 -0000 1.625 +++ selinux-policy.spec 5 Mar 2008 23:11:52 -0000 1.626 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -388,6 +388,9 @@ %endif %changelog +* Mon Mar 3 2008 Dan Walsh 3.3.1-11 +- Fixes for libvirt + * Mon Mar 3 2008 Dan Walsh 3.3.1-10 - Allow bitlebee to read locale_t From fedora-extras-commits at redhat.com Wed Mar 5 23:23:15 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 5 Mar 2008 23:23:15 GMT Subject: rpms/xorg-x11-util-macros/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xorg-x11-util-macros.spec, 1.23, 1.24 Message-ID: <200803052323.m25NNFWk001808@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-util-macros/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1786/devel Modified Files: .cvsignore sources xorg-x11-util-macros.spec Log Message: util-macros 1.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 6 Jan 2007 04:22:05 -0000 1.11 +++ .cvsignore 5 Mar 2008 23:22:38 -0000 1.12 @@ -1 +1 @@ -util-macros-1.1.5.tar.bz2 +util-macros-1.1.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Jan 2007 04:22:05 -0000 1.11 +++ sources 5 Mar 2008 23:22:38 -0000 1.12 @@ -1 +1 @@ -51952682d8b42aeda3af5cee0133ce2c util-macros-1.1.5.tar.bz2 +5b82bf7c25112f2ce7e2a3638a91a83c util-macros-1.1.6.tar.bz2 Index: xorg-x11-util-macros.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-util-macros/devel/xorg-x11-util-macros.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xorg-x11-util-macros.spec 20 Feb 2008 08:08:29 -0000 1.23 +++ xorg-x11-util-macros.spec 5 Mar 2008 23:22:38 -0000 1.24 @@ -1,10 +1,12 @@ +# XXX can't think of any reason this shouldn't be noarch. + %define pkgname util-macros %define debug_package %{nil} Summary: X.Org X11 Autotools macros Name: xorg-x11-util-macros -Version: 1.1.5 -Release: 2%{?dist} +Version: 1.1.6 +Release: 1%{?dist} License: The Open Group License Group: Development/System URL: http://www.x.org @@ -38,6 +40,9 @@ %{_datadir}/aclocal/xorg-macros.m4 %changelog +* Wed Mar 05 2008 Adam Jackson 1.1.6-1 +- Update to 1.1.6 + * Wed Feb 20 2008 Fedora Release Engineering - 1.1.5-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 5 23:24:31 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 23:24:31 GMT Subject: rpms/zvbi/F-8 sources,1.5,1.6 zvbi.spec,1.6,1.7 Message-ID: <200803052324.m25NOVrd001934@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/pkgs/rpms/zvbi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1867 Modified Files: sources zvbi.spec Log Message: Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/zvbi/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jan 2008 23:06:59 -0000 1.5 +++ sources 5 Mar 2008 23:23:54 -0000 1.6 @@ -1 +1 @@ -82805319ca61f6ffd7b7bb64d7433448 zvbi-0.2.26.tar.bz2 +ab131c42115188e131def8f5364e4491 zvbi-0.2.30.tar.bz2 Index: zvbi.spec =================================================================== RCS file: /cvs/pkgs/rpms/zvbi/F-8/zvbi.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- zvbi.spec 6 Jan 2008 23:19:57 -0000 1.6 +++ zvbi.spec 5 Mar 2008 23:23:54 -0000 1.7 @@ -2,15 +2,16 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.26 -Release: 2%{?dist} +Version: 0.2.30 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries -License: GPLv2+ +# See NEWS for a full breakdown of licensing. +License: LGPLv2+ and GPLv2+ and BSD URL: http://zapping.sourceforge.net/ZVBI/index.html Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 -Patch0: zvbi-0.2.24-tvfonts.patch -Patch1: zvbi-0.2.25-openfix.patch +Patch0: %{name}-0.2.24-tvfonts.patch +Patch1: %{name}-0.2.25-openfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen BuildRequires: fontconfig @@ -65,10 +66,7 @@ %patch -p1 -b .orig %patch1 -p1 -#Fix character encodings (note ChangeLog's encoding is broken, hence sed) -sed -i 's/\xC3\xB2/\xF2/g' ChangeLog -sed -i 's/\xC2\x81//g' ChangeLog -iconv -f iso8859-1 ChangeLog -t utf8 > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog +#Fix character encodings iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README @@ -103,11 +101,11 @@ %find_lang %{name} #Install init script -install -m0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid +install -pm0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid #Install fonts -install -m 0644 contrib/*.pcf.gz %{buildroot}%{fontdir} -install -m 0644 contrib/fonts.* %{buildroot}%{fontdir} +install -pm0644 contrib/*.pcf.gz %{buildroot}%{fontdir} +install -pm0644 contrib/fonts.* %{buildroot}%{fontdir} #%%ghost the fonts.cache-1 and fonts.dir touch %{buildroot}%{fontdir}/fonts.cache-1 @@ -166,7 +164,7 @@ %{_mandir}/man1/* %exclude %{_libdir}/*.a %exclude %{_libdir}/*.la -%doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING NEWS README TODO +%doc AUTHORS BUGS ChangeLog COPYING COPYING.LIB NEWS README TODO %files devel @@ -187,6 +185,14 @@ %changelog +* Wed Mar 05 2008 Ian Chapman 0.2.30-1 +- Update to 0.2.30 +- Updated license field due to license change GPLv2+ -> LGPLv2+ +- Dropped encoding fixes for ChangeLog. No longer needed. + +* Tue Feb 19 2008 Fedora Release Engineering - 0.2.26-3 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 Ian Chapman 0.2.26-2 - Release bump From fedora-extras-commits at redhat.com Wed Mar 5 23:24:44 2008 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 5 Mar 2008 23:24:44 GMT Subject: rpms/zvbi/F-7 sources,1.5,1.6 zvbi.spec,1.5,1.6 Message-ID: <200803052324.m25NOiUQ001943@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/zvbi/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1894 Modified Files: sources zvbi.spec Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/zvbi/F-7/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jan 2008 22:26:18 -0000 1.5 +++ sources 5 Mar 2008 23:24:07 -0000 1.6 @@ -1 +1 @@ -82805319ca61f6ffd7b7bb64d7433448 zvbi-0.2.26.tar.bz2 +ab131c42115188e131def8f5364e4491 zvbi-0.2.30.tar.bz2 Index: zvbi.spec =================================================================== RCS file: /cvs/extras/rpms/zvbi/F-7/zvbi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- zvbi.spec 6 Jan 2008 23:21:06 -0000 1.5 +++ zvbi.spec 5 Mar 2008 23:24:07 -0000 1.6 @@ -2,15 +2,16 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.26 -Release: 2%{?dist} +Version: 0.2.30 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries -License: GPLv2+ +# See NEWS for a full breakdown of licensing. +License: LGPLv2+ and GPLv2+ and BSD URL: http://zapping.sourceforge.net/ZVBI/index.html Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 -Patch0: zvbi-0.2.24-tvfonts.patch -Patch1: zvbi-0.2.25-openfix.patch +Patch0: %{name}-0.2.24-tvfonts.patch +Patch1: %{name}-0.2.25-openfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen BuildRequires: fontconfig @@ -65,10 +66,7 @@ %patch -p1 -b .orig %patch1 -p1 -#Fix character encodings (note ChangeLog's encoding is broken, hence sed) -sed -i 's/\xC3\xB2/\xF2/g' ChangeLog -sed -i 's/\xC2\x81//g' ChangeLog -iconv -f iso8859-1 ChangeLog -t utf8 > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog +#Fix character encodings iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README @@ -103,11 +101,11 @@ %find_lang %{name} #Install init script -install -m0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid +install -pm0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid #Install fonts -install -m 0644 contrib/*.pcf.gz %{buildroot}%{fontdir} -install -m 0644 contrib/fonts.* %{buildroot}%{fontdir} +install -pm0644 contrib/*.pcf.gz %{buildroot}%{fontdir} +install -pm0644 contrib/fonts.* %{buildroot}%{fontdir} #%%ghost the fonts.cache-1 and fonts.dir touch %{buildroot}%{fontdir}/fonts.cache-1 @@ -166,7 +164,7 @@ %{_mandir}/man1/* %exclude %{_libdir}/*.a %exclude %{_libdir}/*.la -%doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING NEWS README TODO +%doc AUTHORS BUGS ChangeLog COPYING COPYING.LIB NEWS README TODO %files devel @@ -187,6 +185,14 @@ %changelog +* Wed Mar 05 2008 Ian Chapman 0.2.30-1 +- Update to 0.2.30 +- Updated license field due to license change GPLv2+ -> LGPLv2+ +- Dropped encoding fixes for ChangeLog. No longer needed. + +* Tue Feb 19 2008 Fedora Release Engineering - 0.2.26-3 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 Ian Chapman 0.2.26-2 - Release bump From fedora-extras-commits at redhat.com Wed Mar 5 23:45:19 2008 From: fedora-extras-commits at redhat.com (John Dennis (jdennis)) Date: Wed, 5 Mar 2008 23:45:19 GMT Subject: rpms/freeradius/devel freeradius.spec,1.59,1.60 Message-ID: <200803052345.m25NjJCR002206@cvs-int.fedora.redhat.com> Author: jdennis Update of /cvs/pkgs/rpms/freeradius/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2169 Modified Files: freeradius.spec Log Message: checkpoint dialupadmin subpackage work Index: freeradius.spec =================================================================== RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- freeradius.spec 29 Feb 2008 18:18:34 -0000 1.59 +++ freeradius.spec 5 Mar 2008 23:44:45 -0000 1.60 @@ -1,8 +1,8 @@ # FIXME: should pki certs be moved to /etc/pki? -# FIXME: are the group names right? # FIXME: need to run rpmlint # FIXME: edit radrelay init.d script, was copied from radiusd init # FIXME: check each former patch, do we still need any? +# FIXME: mysql, pgsql, etc. should be factored out from dialupadmin and put in subpackage, subpackage should diaable auto fied requires Summary: High-performance and highly configurable free RADIUS server Name: freeradius Version: 2.0.2 @@ -53,15 +53,15 @@ done when adding or deleting new users. %package libs -Group: Productivity/Networking/Radius/Servers -Summary: FreeRADIUS share library +Group: System Environment/Daemons +Summary: FreeRADIUS shared libraries %description libs The FreeRADIUS shared library %package utils -Group: Productivity/Networking/Radius/Clients -Summary: FreeRADIUS Clients +Group: System Environment/Daemons +Summary: FreeRADIUS utilities Requires: %{name}-libs = %{version} %description utils @@ -74,7 +74,7 @@ attributes Selecting a particular configuration Authentication methods %package dialupadmin -Group: Productivity/Networking/Radius/Servers +Group: System Environment/Daemons Summary: Web management for FreeRADIUS Requires: httpd Requires: php @@ -89,8 +89,8 @@ %package devel -Group: Development/Libraries/C and C++ -Summary: FreeRADIUS Development Files (static libs) +Group: Development/Libraries +Summary: FreeRADIUS Development Files Requires: %{name}-libs = %{version} %description devel @@ -98,74 +98,74 @@ %package ldap -Summary: LDAP bindings for freeradius +Summary: LDAP support for freeradius Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: openldap BuildRequires: openldap-devel %description ldap -This plugin provides the LDAP bindings for the FreeRADIUS server project. +This plugin provides the LDAP support for the FreeRADIUS server project. %package krb5 -Summary: Kerberos 5 bindings for freeradius +Summary: Kerberos 5 support for freeradius Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: krb5-libs BuildRequires: krb5-devel %description krb5 -This plugin provides the Kerberos 5 bindings for the FreeRADIUS server project. +This plugin provides the Kerberos 5 support for the FreeRADIUS server project. %package perl -Summary: Perl bindings for freeradius +Summary: Perl support for freeradius Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: perl-libs BuildRequires: perl-devel %description perl -This plugin provides the Perl bindings for the FreeRADIUS server project. +This plugin provides the Perl support for the FreeRADIUS server project. %package python -Summary: Python bindings for freeradius +Summary: Python support for freeradius Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: python-libs BuildRequires: python-devel %description python -This plugin provides the Python bindings for the FreeRADIUS server project. +This plugin provides the Python support for the FreeRADIUS server project. %package mysql -Summary: MySQL bindings for freeradius +Summary: MySQL support for freeradius Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: mysql BuildRequires: mysql-devel %description mysql -This plugin provides the MySQL bindings for the FreeRADIUS server project. +This plugin provides the MySQL support for the FreeRADIUS server project. %package postgresql -Summary: postgresql bindings for freeradius +Summary: postgresql support for freeradius Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: postgresql BuildRequires: postgresql-devel %description postgresql -This plugin provides the postgresql bindings for the FreeRADIUS server project. +This plugin provides the postgresql support for the FreeRADIUS server project. %package unixODBC -Summary: unixODBC bindings for freeradius +Summary: unixODBC support for freeradius Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: unixODBC BuildRequires: unixODBC-devel %description unixODBC -This plugin provides the unixODBC bindings for the FreeRADIUS server project. +This plugin provides the unixODBC support for the FreeRADIUS server project. %prep @@ -250,6 +250,8 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/freeradius/*.a rm -rf $RPM_BUILD_ROOT/%{_libdir}/freeradius/*.la rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/sql/oracle +rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/sql/oracle + # remove unsupported config files rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/experimental.conf @@ -458,7 +460,7 @@ %{_datadir}/dialup_admin/htdocs/ %{_datadir}/dialup_admin/html/ %{_datadir}/dialup_admin/lib/ -%{_datadir}/dialup_admin/sql/ +%dir %{_datadir}/dialup_admin/sql/ %dir %{_datadir}/dialup_admin/conf/ %config(noreplace) %{_datadir}/dialup_admin/conf/* %config(noreplace) %{_sysconfdir}/httpd/conf.d/radius.conf @@ -497,12 +499,14 @@ %attr(640,-,radiusd) %config(noreplace) /etc/raddb/sql/mysql/* %{_libdir}/freeradius/rlm_sql_mysql.so %{_libdir}/freeradius/rlm_sql_mysql-%{version}.so +%{_datadir}/dialup_admin/sql/mysql %files postgresql %defattr(-,root,root,-) %attr(640,-,radiusd) %config(noreplace) /etc/raddb/sql/postgresql/* %{_libdir}/freeradius/rlm_sql_postgresql.so %{_libdir}/freeradius/rlm_sql_postgresql-%{version}.so +%{_datadir}/dialup_admin/sql/postgresql %files unixODBC %defattr(-,root,root,-) From fedora-extras-commits at redhat.com Wed Mar 5 23:53:53 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 5 Mar 2008 23:53:53 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.281,1.282 Message-ID: <200803052353.m25Nrre6002369@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2348/devel Modified Files: kdelibs.spec Log Message: Can't use install for a directory, use cp -prf instead. Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.281 retrieving revision 1.282 diff -u -r1.281 -r1.282 --- kdelibs.spec 5 Mar 2008 22:56:55 -0000 1.281 +++ kdelibs.spec 5 Mar 2008 23:53:19 -0000 1.282 @@ -233,7 +233,7 @@ # install apidocs and generator script install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh %if "%{?apidocs}" == "1" -install -p -D kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs +cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs %endif From fedora-extras-commits at redhat.com Wed Mar 5 23:59:38 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 5 Mar 2008 23:59:38 GMT Subject: rpms/hal-info/devel hal-info-20080215-kpc650.patch, NONE, 1.1 hal-info.spec, 1.12, 1.13 Message-ID: <200803052359.m25Nxcl8002477@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/hal-info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2451 Modified Files: hal-info.spec Added Files: hal-info-20080215-kpc650.patch Log Message: * Wed Mar 5 2008 Dan Williams - 20080215-2 - Fix modem tags for Kyocera KPC-650 hal-info-20080215-kpc650.patch: --- NEW FILE hal-info-20080215-kpc650.patch --- diff -up hal-info-20080215/fdi/information/10freedesktop/10-modem.fdi.kpc650 hal-info-20080215/fdi/information/10freedesktop/10-modem.fdi --- hal-info-20080215/fdi/information/10freedesktop/10-modem.fdi.kpc650 2008-03-05 18:49:21.000000000 -0500 +++ hal-info-20080215/fdi/information/10freedesktop/10-modem.fdi 2008-03-05 18:49:44.000000000 -0500 @@ -260,8 +260,10 @@ - modem - IS-707-A + + modem + IS-707-A + Index: hal-info.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- hal-info.spec 15 Feb 2008 23:24:34 -0000 1.12 +++ hal-info.spec 5 Mar 2008 23:59:01 -0000 1.13 @@ -1,16 +1,18 @@ Summary: Device information files for HAL Name: hal-info Version: 20080215 -Release: 1%{?dist} -License: AFL or GPLv2 +Release: 2%{?dist} +License: AFL/GPL Group: System Environment/Libraries URL: http://www.freedesktop.org/Software/hal Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch -Requires: hal >= 0.5.10 -BuildRequires: hal-devel >= 0.5.10 +Patch0: hal-info-20080215-kpc650.patch + +#Requires: hal >= 0.5.10 +#BuildRequires: hal-devel >= 0.5.10 %description The hal-info package contains various device information files (also @@ -19,6 +21,8 @@ %prep %setup -q +%patch -p1 -b .kpc650 + %build %configure @@ -36,6 +40,9 @@ %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi %changelog +* Wed Mar 5 2008 Dan Williams - 20080215-2%{?dist} +- Fix modem tags for Kyocera KPC-650 + * Fri Feb 15 2008 Dan Williams - 20080215-1%{?dist} - Update to latest upstream release (mainly for mobile broadband updates) From fedora-extras-commits at redhat.com Thu Mar 6 00:03:05 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 6 Mar 2008 00:03:05 GMT Subject: rpms/hal-info/devel hal-info.spec,1.13,1.14 Message-ID: <200803060003.m26035Q4009735@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/hal-info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9699 Modified Files: hal-info.spec Log Message: Revert mistaken debug stuff Index: hal-info.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- hal-info.spec 5 Mar 2008 23:59:01 -0000 1.13 +++ hal-info.spec 6 Mar 2008 00:02:28 -0000 1.14 @@ -11,8 +11,8 @@ Patch0: hal-info-20080215-kpc650.patch -#Requires: hal >= 0.5.10 -#BuildRequires: hal-devel >= 0.5.10 +Requires: hal >= 0.5.10 +BuildRequires: hal-devel >= 0.5.10 %description The hal-info package contains various device information files (also From fedora-extras-commits at redhat.com Thu Mar 6 00:03:37 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 6 Mar 2008 00:03:37 GMT Subject: rpms/hal-info/F-8 hal-info-20080215-kpc650.patch, NONE, 1.1 hal-info.spec, 1.11, 1.12 Message-ID: <200803060003.m2603bXS009791@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/hal-info/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9720 Modified Files: hal-info.spec Added Files: hal-info-20080215-kpc650.patch Log Message: * Wed Mar 5 2008 Dan Williams - 20080215-2 - Fix modem tags for Kyocera KPC-650 hal-info-20080215-kpc650.patch: --- NEW FILE hal-info-20080215-kpc650.patch --- diff -up hal-info-20080215/fdi/information/10freedesktop/10-modem.fdi.kpc650 hal-info-20080215/fdi/information/10freedesktop/10-modem.fdi --- hal-info-20080215/fdi/information/10freedesktop/10-modem.fdi.kpc650 2008-03-05 18:49:21.000000000 -0500 +++ hal-info-20080215/fdi/information/10freedesktop/10-modem.fdi 2008-03-05 18:49:44.000000000 -0500 @@ -260,8 +260,10 @@ - modem - IS-707-A + + modem + IS-707-A + Index: hal-info.spec =================================================================== RCS file: /cvs/pkgs/rpms/hal-info/F-8/hal-info.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- hal-info.spec 15 Feb 2008 23:28:04 -0000 1.11 +++ hal-info.spec 6 Mar 2008 00:02:59 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Device information files for HAL Name: hal-info Version: 20080215 -Release: 1%{?dist} +Release: 2%{?dist} License: AFL/GPL Group: System Environment/Libraries URL: http://www.freedesktop.org/Software/hal @@ -9,6 +9,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch +Patch0: hal-info-20080215-kpc650.patch + Requires: hal >= 0.5.10 BuildRequires: hal-devel >= 0.5.10 @@ -19,10 +21,13 @@ %prep %setup -q +%patch -p1 -b .kpc650 + %build %configure %install +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean @@ -35,6 +40,9 @@ %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi %changelog +* Wed Mar 5 2008 Dan Williams - 20080215-2%{?dist} +- Fix modem tags for Kyocera KPC-650 + * Fri Feb 15 2008 Dan Williams - 20080215-1%{?dist} - Update to latest upstream release (mainly for mobile broadband updates) From fedora-extras-commits at redhat.com Thu Mar 6 00:09:27 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:09:27 GMT Subject: rpms/cpdup/EL-5 cpdup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803060009.m2609RKK010025@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9940/EL-5 Modified Files: .cvsignore sources Added Files: cpdup.spec Log Message: cpdup-1.07 --- NEW FILE cpdup.spec --- Name: cpdup Version: 1.07 Release: 1%{?dist} Summary: Filesystem mirroring utility Group: Applications/Archiving License: BSD URL: http://apollo.backplane.com/FreeSrc/ Source0: http://apollo.backplane.com/FreeSrc/cpdup-1.07.tgz Source1: Makefile.linux Patch1: cpdup-1.07-utimes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: x86_64 ExcludeArch: ppc64 #BuildRequires: #Requires: %description The cpdup utility makes an exact mirror copy of the source in the destination, creating and deleting files and directories as necessary. UTimes, hardlinks, softlinks, devices, permissions, and flags are mirrored. By default, cpdup asks for confirmation if any file or directory needs to be removed from the destination and does not copy files which it believes to have already been synchronized (by observing that the source and destination file???s size and mtimes match). cpdup does not cross mount points in either the source or the destination. As a safety measure, cpdup refuses to replace a destination directory with a file. %prep %setup -q -n %{name} %patch1 -p1 -b .utimes rm md5.c %build # configure make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" -f %{SOURCE1} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -f %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_bindir}/* %{_mandir}/man1/* %changelog * Thu Feb 28 2008 Michel Salim - 1.07-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cpdup/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2008 19:45:51 -0000 1.1 +++ .cvsignore 6 Mar 2008 00:08:51 -0000 1.2 @@ -0,0 +1 @@ +cpdup-1.07.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cpdup/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2008 19:45:51 -0000 1.1 +++ sources 6 Mar 2008 00:08:51 -0000 1.2 @@ -0,0 +1 @@ +4f9d132f5a81d3f38b53267ae7af24a8 cpdup-1.07.tgz From fedora-extras-commits at redhat.com Thu Mar 6 00:09:30 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:09:30 GMT Subject: rpms/cpdup/F-7 cpdup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803060009.m2609Uh5010034@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9940/F-7 Modified Files: .cvsignore sources Added Files: cpdup.spec Log Message: cpdup-1.07 --- NEW FILE cpdup.spec --- Name: cpdup Version: 1.07 Release: 1%{?dist} Summary: Filesystem mirroring utility Group: Applications/Archiving License: BSD URL: http://apollo.backplane.com/FreeSrc/ Source0: http://apollo.backplane.com/FreeSrc/cpdup-1.07.tgz Source1: Makefile.linux Patch1: cpdup-1.07-utimes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: x86_64 ExcludeArch: ppc64 #BuildRequires: #Requires: %description The cpdup utility makes an exact mirror copy of the source in the destination, creating and deleting files and directories as necessary. UTimes, hardlinks, softlinks, devices, permissions, and flags are mirrored. By default, cpdup asks for confirmation if any file or directory needs to be removed from the destination and does not copy files which it believes to have already been synchronized (by observing that the source and destination file???s size and mtimes match). cpdup does not cross mount points in either the source or the destination. As a safety measure, cpdup refuses to replace a destination directory with a file. %prep %setup -q -n %{name} %patch1 -p1 -b .utimes rm md5.c %build # configure make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" -f %{SOURCE1} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -f %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_bindir}/* %{_mandir}/man1/* %changelog * Thu Feb 28 2008 Michel Salim - 1.07-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cpdup/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2008 19:45:51 -0000 1.1 +++ .cvsignore 6 Mar 2008 00:08:57 -0000 1.2 @@ -0,0 +1 @@ +cpdup-1.07.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cpdup/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2008 19:45:51 -0000 1.1 +++ sources 6 Mar 2008 00:08:57 -0000 1.2 @@ -0,0 +1 @@ +4f9d132f5a81d3f38b53267ae7af24a8 cpdup-1.07.tgz From fedora-extras-commits at redhat.com Thu Mar 6 00:09:38 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:09:38 GMT Subject: rpms/cpdup/F-8 cpdup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803060009.m2609cwi010044@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9940/F-8 Modified Files: .cvsignore sources Added Files: cpdup.spec Log Message: cpdup-1.07 --- NEW FILE cpdup.spec --- Name: cpdup Version: 1.07 Release: 1%{?dist} Summary: Filesystem mirroring utility Group: Applications/Archiving License: BSD URL: http://apollo.backplane.com/FreeSrc/ Source0: http://apollo.backplane.com/FreeSrc/cpdup-1.07.tgz Source1: Makefile.linux Patch1: cpdup-1.07-utimes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: x86_64 ExcludeArch: ppc64 #BuildRequires: #Requires: %description The cpdup utility makes an exact mirror copy of the source in the destination, creating and deleting files and directories as necessary. UTimes, hardlinks, softlinks, devices, permissions, and flags are mirrored. By default, cpdup asks for confirmation if any file or directory needs to be removed from the destination and does not copy files which it believes to have already been synchronized (by observing that the source and destination file???s size and mtimes match). cpdup does not cross mount points in either the source or the destination. As a safety measure, cpdup refuses to replace a destination directory with a file. %prep %setup -q -n %{name} %patch1 -p1 -b .utimes rm md5.c %build # configure make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" -f %{SOURCE1} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -f %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_bindir}/* %{_mandir}/man1/* %changelog * Thu Feb 28 2008 Michel Salim - 1.07-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cpdup/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2008 19:45:51 -0000 1.1 +++ .cvsignore 6 Mar 2008 00:09:01 -0000 1.2 @@ -0,0 +1 @@ +cpdup-1.07.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cpdup/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2008 19:45:51 -0000 1.1 +++ sources 6 Mar 2008 00:09:01 -0000 1.2 @@ -0,0 +1 @@ +4f9d132f5a81d3f38b53267ae7af24a8 cpdup-1.07.tgz From fedora-extras-commits at redhat.com Thu Mar 6 00:09:45 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:09:45 GMT Subject: rpms/cpdup/devel cpdup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803060009.m2609j2p010063@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9940/devel Modified Files: .cvsignore sources Added Files: cpdup.spec Log Message: cpdup-1.07 --- NEW FILE cpdup.spec --- Name: cpdup Version: 1.07 Release: 1%{?dist} Summary: Filesystem mirroring utility Group: Applications/Archiving License: BSD URL: http://apollo.backplane.com/FreeSrc/ Source0: http://apollo.backplane.com/FreeSrc/cpdup-1.07.tgz Source1: Makefile.linux Patch1: cpdup-1.07-utimes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: x86_64 ExcludeArch: ppc64 #BuildRequires: #Requires: %description The cpdup utility makes an exact mirror copy of the source in the destination, creating and deleting files and directories as necessary. UTimes, hardlinks, softlinks, devices, permissions, and flags are mirrored. By default, cpdup asks for confirmation if any file or directory needs to be removed from the destination and does not copy files which it believes to have already been synchronized (by observing that the source and destination file???s size and mtimes match). cpdup does not cross mount points in either the source or the destination. As a safety measure, cpdup refuses to replace a destination directory with a file. %prep %setup -q -n %{name} %patch1 -p1 -b .utimes rm md5.c %build # configure make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" -f %{SOURCE1} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -f %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_bindir}/* %{_mandir}/man1/* %changelog * Thu Feb 28 2008 Michel Salim - 1.07-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cpdup/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2008 19:45:51 -0000 1.1 +++ .cvsignore 6 Mar 2008 00:09:08 -0000 1.2 @@ -0,0 +1 @@ +cpdup-1.07.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cpdup/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2008 19:45:51 -0000 1.1 +++ sources 6 Mar 2008 00:09:08 -0000 1.2 @@ -0,0 +1 @@ +4f9d132f5a81d3f38b53267ae7af24a8 cpdup-1.07.tgz From fedora-extras-commits at redhat.com Thu Mar 6 00:16:28 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:16:28 GMT Subject: rpms/cpdup/EL-5 cpdup-1.07-utimes.patch,NONE,1.1 Message-ID: <200803060016.m260GSFI010205@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10186/EL-5 Added Files: cpdup-1.07-utimes.patch Log Message: cpdup-1.07: commit patch file cpdup-1.07-utimes.patch: --- NEW FILE cpdup-1.07-utimes.patch --- --- cpdup/hcproto.c.utimes 2006-08-17 21:06:31.000000000 -0400 +++ cpdup/hcproto.c 2008-02-28 15:19:09.000000000 -0500 @@ -8,6 +8,7 @@ #include #include +#include /* utimes */ #include #include #include From fedora-extras-commits at redhat.com Thu Mar 6 00:16:35 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:16:35 GMT Subject: rpms/cpdup/F-7 cpdup-1.07-utimes.patch,NONE,1.1 Message-ID: <200803060016.m260GZ2Q010223@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10186/F-7 Added Files: cpdup-1.07-utimes.patch Log Message: cpdup-1.07: commit patch file cpdup-1.07-utimes.patch: --- NEW FILE cpdup-1.07-utimes.patch --- --- cpdup/hcproto.c.utimes 2006-08-17 21:06:31.000000000 -0400 +++ cpdup/hcproto.c 2008-02-28 15:19:09.000000000 -0500 @@ -8,6 +8,7 @@ #include #include +#include /* utimes */ #include #include #include From fedora-extras-commits at redhat.com Thu Mar 6 00:16:46 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:16:46 GMT Subject: rpms/cpdup/devel cpdup-1.07-utimes.patch,NONE,1.1 Message-ID: <200803060016.m260Gklp010263@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10186/devel Added Files: cpdup-1.07-utimes.patch Log Message: cpdup-1.07: commit patch file cpdup-1.07-utimes.patch: --- NEW FILE cpdup-1.07-utimes.patch --- --- cpdup/hcproto.c.utimes 2006-08-17 21:06:31.000000000 -0400 +++ cpdup/hcproto.c 2008-02-28 15:19:09.000000000 -0500 @@ -8,6 +8,7 @@ #include #include +#include /* utimes */ #include #include #include From fedora-extras-commits at redhat.com Thu Mar 6 00:16:43 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:16:43 GMT Subject: rpms/cpdup/F-8 cpdup-1.07-utimes.patch,NONE,1.1 Message-ID: <200803060016.m260GhEN010244@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10186/F-8 Added Files: cpdup-1.07-utimes.patch Log Message: cpdup-1.07: commit patch file cpdup-1.07-utimes.patch: --- NEW FILE cpdup-1.07-utimes.patch --- --- cpdup/hcproto.c.utimes 2006-08-17 21:06:31.000000000 -0400 +++ cpdup/hcproto.c 2008-02-28 15:19:09.000000000 -0500 @@ -8,6 +8,7 @@ #include #include +#include /* utimes */ #include #include #include From fedora-extras-commits at redhat.com Thu Mar 6 00:18:04 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Thu, 6 Mar 2008 00:18:04 GMT Subject: rpms/libntlm/devel .cvsignore, 1.3, 1.4 libntlm.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200803060018.m260I4MX010359@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/libntlm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10330/devel Modified Files: .cvsignore libntlm.spec sources Log Message: libntlm updated to 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libntlm/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Jan 2008 19:51:51 -0000 1.3 +++ .cvsignore 6 Mar 2008 00:17:30 -0000 1.4 @@ -1 +1 @@ -libntlm-0.4.1.tar.gz +libntlm-0.4.2.tar.gz Index: libntlm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libntlm/devel/libntlm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libntlm.spec 20 Feb 2008 05:57:01 -0000 1.5 +++ libntlm.spec 6 Mar 2008 00:17:30 -0000 1.6 @@ -1,6 +1,6 @@ Name: libntlm -Version: 0.4.1 -Release: 2%{?dist} +Version: 0.4.2 +Release: 1%{?dist} Summary: NTLM authentication library Group: System Environment/Libraries @@ -65,6 +65,9 @@ %changelog +* Thu Mar 6 2008 Nikolay Vladimirov - 0.4.2-1 +- new upstream release + * Wed Feb 20 2008 Fedora Release Engineering - 0.4.1-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libntlm/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Jan 2008 19:51:51 -0000 1.3 +++ sources 6 Mar 2008 00:17:30 -0000 1.4 @@ -1 +1 @@ -1a9c2e9f6cbf762d56981d53fc8e703b libntlm-0.4.1.tar.gz +e68a4e20628de0259b54f59725b9c486 libntlm-0.4.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 00:22:13 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:22:13 GMT Subject: rpms/cpdup/EL-5 Makefile.linux,NONE,1.1 Message-ID: <200803060022.m260MDEc010475@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10452/EL-5 Added Files: Makefile.linux Log Message: cpdup-1.07: commit Makefile.linux --- NEW FILE Makefile.linux --- DESTDIR= PREFIX=/usr BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/share/man build: ${CC} ${CFLAGS} -D__unused= -D_GNU_SOURCE -D__USE_FILE_OFFSET64 \ -DNOMD5 -c *.c ${CC} ${CFLAGS} -D__unused= -D_GNU_SOURCE -D__USE_FILE_OFFSET64 \ -DNOMD5 *.o -o cpdup install: mkdir -p ${DESTDIR}${BINDIR} ${DESTDIR}${MANDIR}/man1 cp -p cpdup ${DESTDIR}${BINDIR}/ cp -p cpdup.1 ${DESTDIR}${MANDIR}/man1/ clean: -rm -f *.o From fedora-extras-commits at redhat.com Thu Mar 6 00:22:17 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:22:17 GMT Subject: rpms/cpdup/F-7 Makefile.linux,NONE,1.1 Message-ID: <200803060022.m260MHYw010491@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10452/F-7 Added Files: Makefile.linux Log Message: cpdup-1.07: commit Makefile.linux --- NEW FILE Makefile.linux --- DESTDIR= PREFIX=/usr BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/share/man build: ${CC} ${CFLAGS} -D__unused= -D_GNU_SOURCE -D__USE_FILE_OFFSET64 \ -DNOMD5 -c *.c ${CC} ${CFLAGS} -D__unused= -D_GNU_SOURCE -D__USE_FILE_OFFSET64 \ -DNOMD5 *.o -o cpdup install: mkdir -p ${DESTDIR}${BINDIR} ${DESTDIR}${MANDIR}/man1 cp -p cpdup ${DESTDIR}${BINDIR}/ cp -p cpdup.1 ${DESTDIR}${MANDIR}/man1/ clean: -rm -f *.o From fedora-extras-commits at redhat.com Thu Mar 6 00:22:21 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:22:21 GMT Subject: rpms/cpdup/F-8 Makefile.linux,NONE,1.1 Message-ID: <200803060022.m260MLX2010512@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10452/F-8 Added Files: Makefile.linux Log Message: cpdup-1.07: commit Makefile.linux --- NEW FILE Makefile.linux --- DESTDIR= PREFIX=/usr BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/share/man build: ${CC} ${CFLAGS} -D__unused= -D_GNU_SOURCE -D__USE_FILE_OFFSET64 \ -DNOMD5 -c *.c ${CC} ${CFLAGS} -D__unused= -D_GNU_SOURCE -D__USE_FILE_OFFSET64 \ -DNOMD5 *.o -o cpdup install: mkdir -p ${DESTDIR}${BINDIR} ${DESTDIR}${MANDIR}/man1 cp -p cpdup ${DESTDIR}${BINDIR}/ cp -p cpdup.1 ${DESTDIR}${MANDIR}/man1/ clean: -rm -f *.o From fedora-extras-commits at redhat.com Thu Mar 6 00:22:27 2008 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 6 Mar 2008 00:22:27 GMT Subject: rpms/cpdup/devel Makefile.linux,NONE,1.1 Message-ID: <200803060022.m260MROk010531@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/pkgs/rpms/cpdup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10452/devel Added Files: Makefile.linux Log Message: cpdup-1.07: commit Makefile.linux --- NEW FILE Makefile.linux --- DESTDIR= PREFIX=/usr BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/share/man build: ${CC} ${CFLAGS} -D__unused= -D_GNU_SOURCE -D__USE_FILE_OFFSET64 \ -DNOMD5 -c *.c ${CC} ${CFLAGS} -D__unused= -D_GNU_SOURCE -D__USE_FILE_OFFSET64 \ -DNOMD5 *.o -o cpdup install: mkdir -p ${DESTDIR}${BINDIR} ${DESTDIR}${MANDIR}/man1 cp -p cpdup ${DESTDIR}${BINDIR}/ cp -p cpdup.1 ${DESTDIR}${MANDIR}/man1/ clean: -rm -f *.o From fedora-extras-commits at redhat.com Thu Mar 6 00:23:28 2008 From: fedora-extras-commits at redhat.com (Nikolay Vladimirov (turki)) Date: Thu, 6 Mar 2008 00:23:28 GMT Subject: rpms/libntlm/F-8 .cvsignore, 1.2, 1.3 libntlm.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803060023.m260NSC0010615@cvs-int.fedora.redhat.com> Author: turki Update of /cvs/pkgs/rpms/libntlm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10555/F-8 Modified Files: .cvsignore libntlm.spec sources Log Message: libntlm updated to 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libntlm/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jun 2007 00:20:29 -0000 1.2 +++ .cvsignore 6 Mar 2008 00:22:46 -0000 1.3 @@ -1 +1 @@ -libntlm-0.3.13.tar.gz +libntlm-0.4.2.tar.gz Index: libntlm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libntlm/F-8/libntlm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libntlm.spec 29 Aug 2007 21:00:10 -0000 1.3 +++ libntlm.spec 6 Mar 2008 00:22:46 -0000 1.4 @@ -1,6 +1,6 @@ Name: libntlm -Version: 0.3.13 -Release: 5%{?dist} +Version: 0.4.2 +Release: 1%{?dist} Summary: NTLM authentication library Group: System Environment/Libraries @@ -65,6 +65,15 @@ %changelog +* Thu Mar 6 2008 Nikolay Vladimirov - 0.4.2-1 +- new upstream release + +* Wed Feb 20 2008 Fedora Release Engineering - 0.4.1-2 +- Autorebuild for GCC 4.3 + +* Wed Jan 23 2008 Nikolay Vladimirov - 0.4.1-1 +- new upstrem release + * Wed Aug 29 2007 Nikolay Vladimirov - 0.3.13-5 - rebuild for ppc32 selinux fix Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libntlm/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jun 2007 00:20:29 -0000 1.2 +++ sources 6 Mar 2008 00:22:46 -0000 1.3 @@ -1 +1 @@ -14e8aa077e032ae353b885a6d82ee668 libntlm-0.3.13.tar.gz +e68a4e20628de0259b54f59725b9c486 libntlm-0.4.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 01:12:23 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 6 Mar 2008 01:12:23 GMT Subject: rpms/heartbeat/F-8 IPaddr, NONE, 1.1 heartbeat.spec, 1.18, 1.19 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 heartbeat-fedora-chkconfig.patch, 1.2, NONE heartbeat-2.1.2-open.patch, 1.1, NONE Message-ID: <200803060112.m261CNma018410@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/heartbeat/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18385 Modified Files: heartbeat.spec sources .cvsignore Added Files: IPaddr Removed Files: heartbeat-fedora-chkconfig.patch heartbeat-2.1.2-open.patch Log Message: Update to 2.1.3 Add management GUI Drop upstreamed patches Add patch for IPAddr (bz #434653) --- NEW FILE IPaddr --- --- a/resources/OCF/IPaddr Thu Jul 26 19:26:13 2007 -0600 +++ b/resources/OCF/IPaddr Tue Feb 19 20:46:11 2008 +0100 @@ -247,9 +247,10 @@ lvs_restore_loopback() { CMD="OCF_RESKEY_cidr_netmask=32 OCF_RESKEY_ip=$1 OCF_RESKEY_nic=$ifname $FINDIF" if NICINFO=`eval $CMD` + NICINFO=`echo $NICINFO | tr -s " "` then - netmask_text=`echo "$NICINFO" | cut -f2 -d " "` - broadcast=`echo "$NICINFO" | cut -f3 -d " "` + netmask_text=`echo "$NICINFO" | cut -f3 -d " "` + broadcast=`echo "$NICINFO" | cut -f5 -d " "` else echo "ERROR: $CMD failed (rc=$rc)" exit $OCF_ERR_GENERIC Index: heartbeat.spec =================================================================== RCS file: /cvs/extras/rpms/heartbeat/F-8/heartbeat.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- heartbeat.spec 29 Aug 2007 17:01:45 -0000 1.18 +++ heartbeat.spec 6 Mar 2008 01:11:43 -0000 1.19 @@ -5,15 +5,14 @@ %define uname hacluster Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.1.3 +Release: 1%{?dist} License: GPLv2 and LGPLv2+ URL: http://linux-ha.org/ Group: System Environment/Daemons Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz Patch0: heartbeat-fedora-pam.patch -Patch1: heartbeat-fedora-chkconfig.patch -Patch2: heartbeat-2.1.2-open.patch +Patch1: http://hg.linux-ha.org/dev/raw-diff/806faf36d956/resources/OCF/IPaddr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel BuildRequires: iputils @@ -106,11 +105,20 @@ %description devel Heartbeat development package +%package gui +Summary: Provides a gui interface to manage heartbeat clusters +Group: System Environment/Daemons +Requires: heartbeat = %{version}-%{release} +Requires: PyXML +Requires: pygtk2 >= 2.4 + +%description gui +GUI client for Heartbeat clusters + %prep %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness' @@ -206,7 +214,6 @@ %{_sysconfdir}/ha.d/rc.d %config(noreplace) %{_sysconfdir}/ha.d/README.config %{_libdir}/heartbeat -%{_libdir}/heartbeat-gui %{_libdir}/libapphb.so.* %{_libdir}/libccmclient.so.* %{_libdir}/libcib.so.* @@ -236,8 +243,8 @@ %dir %{_var}/run/heartbeat %attr (2755, hacluster, haclient) %{_bindir}/cl_status %{_bindir}/cl_respawn -%{_bindir}/hb_gui -%{_datadir}/heartbeat-gui/ +%{_sbindir}/ciblint +%{_sbindir}/hb_report %{_sbindir}/crmadmin %{_sbindir}/cibadmin %{_sbindir}/ccm_tool @@ -288,12 +295,10 @@ %doc ldirectord/ldirectord.cf %defattr(-,root,root,-) %{_sbindir}/ldirectord -%{_sbindir}/supervise-ldirectord-config %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord %{_sysconfdir}/init.d/ldirectord %{_sysconfdir}/ha.d/resource.d/ldirectord %{_mandir}/man8/ldirectord.8* -%{_mandir}/man8/supervise-ldirectord-config.8* %files -n stonith %doc doc/COPYING @@ -325,7 +330,19 @@ %{_includedir}/pils/ %{_libdir}/*.so +%files gui +%defattr(-,root,root) +%{_libdir}/heartbeat-gui +%{_datadir}/heartbeat-gui +%{_bindir}/hb_gui + %changelog +* Mon Feb 25 2008 Kevin Fenzi - 2.1.3-1 +- Update to 2.1.3 +- Add management GUI +- Drop upstreamed patches +- Add patch for IPAddr (bz #434653) + * Tue Aug 29 2007 Kevin Fenzi - 2.1.2-2 - Update sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/heartbeat/F-8/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 29 Aug 2007 17:01:45 -0000 1.8 +++ sources 6 Mar 2008 01:11:43 -0000 1.9 @@ -1 +1 @@ -56868ab82936b3f77deb777992c4a80d heartbeat-2.1.2.tar.gz +bca53530a3802f7677772323047405cd heartbeat-2.1.3.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/heartbeat/F-8/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 29 Aug 2007 17:01:45 -0000 1.8 +++ .cvsignore 6 Mar 2008 01:11:43 -0000 1.9 @@ -1 +1 @@ -heartbeat-2.1.2.tar.gz +heartbeat-2.1.3.tar.gz --- heartbeat-fedora-chkconfig.patch DELETED --- --- heartbeat-2.1.2-open.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 01:16:15 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 6 Mar 2008 01:16:15 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.282,1.283 Message-ID: <200803060116.m261GFAB018512@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18483/devel Modified Files: kdelibs.spec Log Message: Fix references to build directory in *.tag files. Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.282 retrieving revision 1.283 diff -u -r1.282 -r1.283 --- kdelibs.spec 5 Mar 2008 23:53:19 -0000 1.282 +++ kdelibs.spec 6 Mar 2008 01:15:36 -0000 1.283 @@ -232,6 +232,8 @@ # install apidocs and generator script install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh +sed -i -e s\!`pwd`/kdelibs-%{version}-apidocs\!%{_kde4_docdir}/HTML/en/kdelibs4-apidocs\!g \ + kdelibs-%{version}-apidocs/*.tag kdelibs-%{version}-apidocs/*/*.tag kdelibs-%{version}-apidocs/*/*/*.tag %if "%{?apidocs}" == "1" cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs %endif @@ -322,7 +324,7 @@ %changelog -* Wed Mar 05 2008 Kevin Kofler 4.0.2-4 +* Thu Mar 06 2008 Kevin Kofler 4.0.2-4 - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel - build apidocs and put them into an -apidocs subpackage (can be turned off) From fedora-extras-commits at redhat.com Thu Mar 6 01:20:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 01:20:36 +0000 Subject: [pkgdb] gambas: devrim has requested watchbugzilla Message-ID: <200803060121.m261LnT1011686@bastion.fedora.phx.redhat.com> Devrim G?ND?Z (devrim) has requested the watchbugzilla acl on gambas (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gambas From fedora-extras-commits at redhat.com Thu Mar 6 01:20:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 01:20:39 +0000 Subject: [pkgdb] gambas: devrim has requested approveacls Message-ID: <200803060121.m261LnT4011686@bastion.fedora.phx.redhat.com> Devrim G?ND?Z (devrim) has requested the approveacls acl on gambas (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gambas From fedora-extras-commits at redhat.com Thu Mar 6 01:20:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 01:20:26 +0000 Subject: [pkgdb] gambas: devrim has requested commit Message-ID: <200803060121.m261Lr9E011723@bastion.fedora.phx.redhat.com> Devrim G?ND?Z (devrim) has requested the commit acl on gambas (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gambas From fedora-extras-commits at redhat.com Thu Mar 6 01:20:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 01:20:29 +0000 Subject: [pkgdb] gambas: devrim has requested watchcommits Message-ID: <200803060121.m261Lr9H011723@bastion.fedora.phx.redhat.com> Devrim G?ND?Z (devrim) has requested the watchcommits acl on gambas (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gambas From fedora-extras-commits at redhat.com Thu Mar 6 01:21:34 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 6 Mar 2008 01:21:34 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.283,1.284 Message-ID: <200803060121.m261LYUZ018667@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18630/devel Modified Files: kdelibs.spec Log Message: Revert last change, it is incorrect (the references are actually to the source directories, not the apidocs directory). Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.283 retrieving revision 1.284 diff -u -r1.283 -r1.284 --- kdelibs.spec 6 Mar 2008 01:15:36 -0000 1.283 +++ kdelibs.spec 6 Mar 2008 01:21:01 -0000 1.284 @@ -232,8 +232,6 @@ # install apidocs and generator script install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh -sed -i -e s\!`pwd`/kdelibs-%{version}-apidocs\!%{_kde4_docdir}/HTML/en/kdelibs4-apidocs\!g \ - kdelibs-%{version}-apidocs/*.tag kdelibs-%{version}-apidocs/*/*.tag kdelibs-%{version}-apidocs/*/*/*.tag %if "%{?apidocs}" == "1" cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs %endif @@ -324,7 +322,7 @@ %changelog -* Thu Mar 06 2008 Kevin Kofler 4.0.2-4 +* Wed Mar 05 2008 Kevin Kofler 4.0.2-4 - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel - build apidocs and put them into an -apidocs subpackage (can be turned off) From fedora-extras-commits at redhat.com Thu Mar 6 01:21:38 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Thu, 6 Mar 2008 01:21:38 GMT Subject: rpms/libgii/devel libgii.spec,1.4,1.5 Message-ID: <200803060121.m261LcJW018670@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/libgii/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18629 Modified Files: libgii.spec Log Message: - Fix multilib problem #342121 Index: libgii.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgii/devel/libgii.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libgii.spec 19 Feb 2008 10:31:35 -0000 1.4 +++ libgii.spec 6 Mar 2008 01:21:04 -0000 1.5 @@ -1,6 +1,6 @@ Name: libgii Version: 1.0.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Input library for GGI Group: System Environment/Libraries @@ -76,7 +76,7 @@ %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -117,6 +117,9 @@ %changelog +* Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.2-6 +- Fix multilib problem #342121 + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 01:38:39 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 6 Mar 2008 01:38:39 GMT Subject: rpms/soprano/devel soprano.spec,1.15,1.16 Message-ID: <200803060138.m261cd0Z019093@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19045/devel Modified Files: soprano.spec Log Message: * Thu Mar 6 2008 Kevin Kofler 2.0.3-2 - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen and qt4-doc when building apidocs Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- soprano.spec 4 Mar 2008 05:33:14 -0000 1.15 +++ soprano.spec 6 Mar 2008 01:38:06 -0000 1.16 @@ -1,12 +1,13 @@ # fedora review: http://bugzilla.redhat.com/248120 -# TODO: package apidocs (make apidox, BR doxygen and qt4-doc) +# set this to 0 to disable -apidocs for a faster build +%define apidocs 1 Summary: Qt wrapper API to different RDF storage solutions Name: soprano Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -21,6 +22,11 @@ # older packages had clucene-config.h in the wrong place BuildRequires: clucene-core-devel >= 0.9.20-2 +%if "%{?apidocs}" == "1" +BuildRequires: doxygen +BuildRequires: qt4-doc +%endif + %description %{summary}. @@ -33,6 +39,15 @@ %description devel %{summary}. +%package apidocs +Group: Development/Documentation +Summary: Soprano API documentation +Requires: %{name} = %{?epoch:%{epoch}:}%{version} + +%description apidocs +This package includes the Soprano API documentation in HTML +format for easy browsing. + %prep %setup -q -n soprano-%{version}%{?beta} @@ -40,10 +55,14 @@ %build -%cmake . +%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` make %{?_smp_mflags} +%if "%{?apidocs}" == "1" +make apidox +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -79,8 +98,18 @@ %{_includedir}/soprano/ %{_includedir}/Soprano/ +%if "%{?apidocs}" == "1" +%files apidocs +%defattr(-,root,root,-) +%doc docs/html +%endif + %changelog +* Thu Mar 6 2008 Kevin Kofler 2.0.3-2 +- build apidocs and put them into an -apidocs subpackage (can be turned off) +- BR doxygen and qt4-doc when building apidocs + * Tue Mar 4 2008 Kevin Kofler 2.0.3-1 - update to 2.0.3 (bugfix release) From fedora-extras-commits at redhat.com Thu Mar 6 01:48:09 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 6 Mar 2008 01:48:09 GMT Subject: devel/anaconda .cvsignore, 1.502, 1.503 anaconda.spec, 1.642, 1.643 sources, 1.634, 1.635 Message-ID: <200803060148.m261m9pu019357@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/anaconda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19321 Modified Files: .cvsignore anaconda.spec sources Log Message: * Wed Mar 05 2008 Jeremy Katz - 11.4.0.46-1 - Don't require some things which we fall back gracefully when not there (katzj) - Check for filesystem utilities to see if a filesystem is supported (katzj) - Write out keyboard settings before installing packages. (related to #429358) (dlehman) - Update pl translation - Make sure http:// or ftp:// is specified (#436089) (katzj) - Fix segfault when port is specified (#435219) (katzj) - Use ntfsresize -m to get minimum size (#431124) (katzj) - Use the right path to the .discinfo file when validating a tree. (clumens) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v retrieving revision 1.502 retrieving revision 1.503 diff -u -r1.502 -r1.503 --- .cvsignore 5 Mar 2008 03:20:49 -0000 1.502 +++ .cvsignore 6 Mar 2008 01:47:34 -0000 1.503 @@ -1 +1 @@ -anaconda-11.4.0.45.tar.bz2 +anaconda-11.4.0.46.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v retrieving revision 1.642 retrieving revision 1.643 diff -u -r1.642 -r1.643 --- anaconda.spec 5 Mar 2008 03:20:49 -0000 1.642 +++ anaconda.spec 6 Mar 2008 01:47:34 -0000 1.643 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.45 +Version: 11.4.0.46 Release: 1 License: GPLv2+ Group: Applications/System @@ -83,14 +83,10 @@ Requires: device-mapper >= %{dmver} Requires: device-mapper-libs >= %{dmver} Requires: dosfstools -Requires: e2fsprogs, gfs2-utils, reiserfs-utils, xfsprogs, jfsutils -%ifarch %{ix86} x86_64 -Requires: ntfsprogs -%endif +Requires: e2fsprogs %ifarch %{ix86} x86_64 ia64 Requires: dmidecode %endif -Requires: hfsutils Requires: python-pyblock >= %{pythonpyblockver} Requires: libbdevid >= %{libbdevidver} Requires: libbdevid-python @@ -102,7 +98,6 @@ Requires: system-config-firewall Requires: cryptsetup-luks Requires: mdadm -Requires: iscsi-initiator-utils Requires: lvm2 Requires: util-linux-ng %ifnarch s390 s390x ppc64 @@ -209,6 +204,17 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Mar 05 2008 Jeremy Katz - 11.4.0.46-1 +- Don't require some things which we fall back gracefully when not there (katzj) +- Check for filesystem utilities to see if a filesystem is supported (katzj) +- Write out keyboard settings before installing packages. (related + to #429358) (dlehman) +- Update pl translation +- Make sure http:// or ftp:// is specified (#436089) (katzj) +- Fix segfault when port is specified (#435219) (katzj) +- Use ntfsresize -m to get minimum size (#431124) (katzj) +- Use the right path to the .discinfo file when validating a tree. (clumens) + * Tue Mar 04 2008 Jeremy Katz - 11.4.0.45-1 - Fix the build. Index: sources =================================================================== RCS file: /cvs/pkgs/devel/anaconda/sources,v retrieving revision 1.634 retrieving revision 1.635 diff -u -r1.634 -r1.635 --- sources 5 Mar 2008 03:20:49 -0000 1.634 +++ sources 6 Mar 2008 01:47:34 -0000 1.635 @@ -1 +1 @@ -85af662ab06fe70ee30f4cc34e2cb60a anaconda-11.4.0.45.tar.bz2 +991f4d88d4cbfae612c6472df5e2e216 anaconda-11.4.0.46.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 01:59:45 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Thu, 6 Mar 2008 01:59:45 GMT Subject: rpms/ivtv-firmware/devel ivtv-firmware.spec,1.1,NONE Message-ID: <200803060159.m261xjCF019674@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/ivtv-firmware/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19626 Removed Files: ivtv-firmware.spec Log Message: Removing spec for new import and ownership of the package --- ivtv-firmware.spec DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 02:00:05 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 6 Mar 2008 02:00:05 GMT Subject: devel/anaconda .cvsignore, 1.503, 1.504 anaconda.spec, 1.643, 1.644 sources, 1.635, 1.636 Message-ID: <200803060200.m26205r9019695@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/anaconda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19648 Modified Files: .cvsignore anaconda.spec sources Log Message: * Wed Mar 05 2008 Jeremy Katz - 11.4.0.47-1 - Fix the build again (katzj) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v retrieving revision 1.503 retrieving revision 1.504 diff -u -r1.503 -r1.504 --- .cvsignore 6 Mar 2008 01:47:34 -0000 1.503 +++ .cvsignore 6 Mar 2008 01:59:31 -0000 1.504 @@ -1 +1 @@ -anaconda-11.4.0.46.tar.bz2 +anaconda-11.4.0.47.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v retrieving revision 1.643 retrieving revision 1.644 diff -u -r1.643 -r1.644 --- anaconda.spec 6 Mar 2008 01:47:34 -0000 1.643 +++ anaconda.spec 6 Mar 2008 01:59:31 -0000 1.644 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.46 +Version: 11.4.0.47 Release: 1 License: GPLv2+ Group: Applications/System @@ -204,6 +204,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Mar 05 2008 Jeremy Katz - 11.4.0.47-1 +- Fix the build again (katzj) + * Wed Mar 05 2008 Jeremy Katz - 11.4.0.46-1 - Don't require some things which we fall back gracefully when not there (katzj) - Check for filesystem utilities to see if a filesystem is supported (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/devel/anaconda/sources,v retrieving revision 1.635 retrieving revision 1.636 diff -u -r1.635 -r1.636 --- sources 6 Mar 2008 01:47:34 -0000 1.635 +++ sources 6 Mar 2008 01:59:31 -0000 1.636 @@ -1 +1 @@ -991f4d88d4cbfae612c6472df5e2e216 anaconda-11.4.0.46.tar.bz2 +e93767c10acc9ae5445908e98a61f00a anaconda-11.4.0.47.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 02:03:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 02:03:29 +0000 Subject: [pkgdb] ivtv-firmware ownership updated Message-ID: <200803060204.m2624g3b012846@bastion.fedora.phx.redhat.com> Package ivtv-firmware in Fedora devel was orphaned by Chauvet (kwizart) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ivtv-firmware From fedora-extras-commits at redhat.com Thu Mar 6 02:03:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 02:03:15 +0000 Subject: [pkgdb] ivtv-firmware ownership updated Message-ID: <200803060204.m2624gWV012861@bastion.fedora.phx.redhat.com> Package ivtv-firmware in Fedora 7 was orphaned by Chauvet (kwizart) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ivtv-firmware From fedora-extras-commits at redhat.com Thu Mar 6 02:03:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 02:03:26 +0000 Subject: [pkgdb] ivtv-firmware ownership updated Message-ID: <200803060204.m2624sps012884@bastion.fedora.phx.redhat.com> Package ivtv-firmware in Fedora 8 was orphaned by Chauvet (kwizart) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ivtv-firmware From fedora-extras-commits at redhat.com Thu Mar 6 02:09:08 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 6 Mar 2008 02:09:08 GMT Subject: rpms/xorg-x11-xtrans-devel/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-xtrans-devel.spec, 1.23, 1.24 xtrans-1.0.3-abstract-sockets.patch, 1.2, NONE Message-ID: <200803060209.m26298um027067@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27031/devel Modified Files: .cvsignore sources xorg-x11-xtrans-devel.spec Removed Files: xtrans-1.0.3-abstract-sockets.patch Log Message: xtrans 1.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Jan 2007 04:44:03 -0000 1.8 +++ .cvsignore 6 Mar 2008 02:08:29 -0000 1.9 @@ -1 +1 @@ -xtrans-1.0.3.tar.bz2 +xtrans-1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Jan 2007 04:44:03 -0000 1.8 +++ sources 6 Mar 2008 02:08:29 -0000 1.9 @@ -1 +1 @@ -bb196907ea1e182dcb396eb22f7d2c1a xtrans-1.0.3.tar.bz2 +8546e3a060aefb42c889eaa4b5db33af xtrans-1.1.tar.bz2 Index: xorg-x11-xtrans-devel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xtrans-devel/devel/xorg-x11-xtrans-devel.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xorg-x11-xtrans-devel.spec 20 Feb 2008 08:19:02 -0000 1.23 +++ xorg-x11-xtrans-devel.spec 6 Mar 2008 02:08:29 -0000 1.24 @@ -5,15 +5,14 @@ Summary: X.Org X11 developmental X transport library Name: xorg-x11-xtrans-devel -Version: 1.0.3 -Release: 6%{?dist} +Version: 1.1 +Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/individual/lib/xtrans-%{version}.tar.bz2 -Patch0: xtrans-1.0.3-abstract-sockets.patch +Source0: http://xorg.freedesktop.org/archive/individual/lib/xtrans-%{version}.tar.bz2 Patch1: xtrans-1.0.3-avoid-gethostname.patch BuildRequires: pkgconfig @@ -26,7 +25,6 @@ %prep %setup -q -n xtrans-%{version} -%patch0 -p1 -b .abstract %patch1 -p1 -b .my-name-is-unix %build @@ -61,6 +59,9 @@ %{_datadir}/aclocal/xtrans.m4 %changelog +* Wed Mar 05 2008 Adam Jackson 1.1-1 +- xtrans 1.1 + * Wed Feb 20 2008 Fedora Release Engineering - 1.0.3-6 - Autorebuild for GCC 4.3 --- xtrans-1.0.3-abstract-sockets.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 02:10:44 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 6 Mar 2008 02:10:44 GMT Subject: rpms/ustr/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 ustr.spec, 1.15, 1.16 Message-ID: <200803060210.m262AiZe027147@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/ustr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27120 Modified Files: .cvsignore sources ustr.spec Log Message: * Wed Mar 5 2008 James Antill - 1.0.4-2 - New upstream: 1.0.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ustr/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Jan 2008 01:29:49 -0000 1.4 +++ .cvsignore 6 Mar 2008 02:10:10 -0000 1.5 @@ -1,2 +1 @@ -ustr-1.0.2.tar.gz -ustr-1.0.3.tar.gz +ustr-1.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ustr/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jan 2008 01:29:49 -0000 1.4 +++ sources 6 Mar 2008 02:10:10 -0000 1.5 @@ -1 +1 @@ -7000840699a936feb3e2eb8cbd61d849 ustr-1.0.3.tar.gz +0061c50cd3d60a36218fa6df1fe32ec7 ustr-1.0.4.tar.gz Index: ustr.spec =================================================================== RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ustr.spec 21 Feb 2008 18:17:30 -0000 1.15 +++ ustr.spec 6 Mar 2008 02:10:10 -0000 1.16 @@ -26,16 +26,13 @@ Name: ustr -Version: 1.0.3 -Release: 5%{?dist} +Version: 1.0.4 +Release: 2%{?dist} Summary: String library, very low memory overhead, simple to import Group: System Environment/Libraries License: MIT or LGPLv2+ or BSD URL: http://www.and.org/ustr/ Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.gz -Patch0: ustr-import-multilib.patch -Patch1: ustr-import-multilib2.patch -Patch2: ustr-preserve-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: make gcc sed @@ -89,10 +86,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - %build make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} @@ -156,6 +149,9 @@ %changelog +* Wed Mar 5 2008 James Antill - 1.0.4-2 +- New upstream: 1.0.4 + * Thu Feb 21 2008 Dennis Gilmore - 1.0.3-5 - set broken_fed_dbg_opts to 0 its the recomended option upstream - add smpflags and cflags to make check From fedora-extras-commits at redhat.com Thu Mar 6 02:11:32 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 6 Mar 2008 02:11:32 GMT Subject: rpms/ustr/devel ustr-import-multilib.patch, 1.1, NONE ustr-import-multilib2.patch, 1.3, NONE ustr-preserve-multilib.patch, 1.1, NONE Message-ID: <200803060211.m262BWCP027216@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/ustr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27208 Removed Files: ustr-import-multilib.patch ustr-import-multilib2.patch ustr-preserve-multilib.patch Log Message: * Wed Mar 5 2008 James Antill - 1.0.4-2 - New upstream: 1.0.4 --- ustr-import-multilib.patch DELETED --- --- ustr-import-multilib2.patch DELETED --- --- ustr-preserve-multilib.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 02:20:50 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 6 Mar 2008 02:20:50 GMT Subject: rpms/ustr/devel sources,1.5,1.6 Message-ID: <200803060220.m262Koi4027373@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/ustr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27355 Modified Files: sources Log Message: * Wed Mar 5 2008 James Antill - 1.0.4-2 - New upstream: 1.0.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ustr/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Mar 2008 02:10:10 -0000 1.5 +++ sources 6 Mar 2008 02:20:14 -0000 1.6 @@ -1 +1 @@ -0061c50cd3d60a36218fa6df1fe32ec7 ustr-1.0.4.tar.gz +fc73e968de26e4e911d7c81c5e0e7359 ustr-1.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 03:06:15 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 6 Mar 2008 03:06:15 GMT Subject: rpms/ustr/devel multilib-ustr-import.patch, NONE, 1.1 ustr.spec, 1.16, 1.17 Message-ID: <200803060306.m2636FQm002735@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/ustr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2709 Modified Files: ustr.spec Added Files: multilib-ustr-import.patch Log Message: * Wed Mar 5 2008 James Antill - 1.0.4-3 - New upstream: 1.0.4 - Add multilib fix for import multilib-ustr-import.patch: --- NEW FILE multilib-ustr-import.patch --- commit bbe10c2b49f0a05b0ecebb1874a19c9b3655a1b3 Author: James Antill Date: Wed Mar 5 22:01:58 2008 -0500 Fixup ustr-import in multilib. ... again diff --git a/Makefile b/Makefile index d025d25..3a245ec 100644 --- a/Makefile +++ b/Makefile @@ -410,7 +410,7 @@ install: all-shared ustr.pc ustr-debug.pc install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc ustr-import-multilib: ustr-import-multilib.in - sed -e 's, at MBINDIR@,$(MBINDIR),g' < $< > $@ + sed -e 's, at INCLUDEDIR@,$(includedir),g' -e 's, at MBINDIR@,$(MBINDIR),g' < $< > $@ install-multilib-linux: install autoconf_64b ustr-import-multilib install -d $(DESTDIR)$(MBINDIR) @@ -429,7 +429,7 @@ install-multilib-linux: install autoconf_64b ustr-import-multilib $(HIDE)mv -f $(DESTDIR)$(bindir)/ustr-import-multilib $(DESTDIR)$(bindir)/ustr-import $(HIDE)touch --reference ustr-conf-multilib-linux.h $(DESTDIR)$(includedir)/ustr-conf.h $(HIDE)touch --reference ustr-conf-debug-multilib-linux.h $(DESTDIR)$(includedir)/ustr-conf-debug.h - $(HIDE)touch --reference ustr-import-multilib $(DESTDIR)$(bindir)/ustr-import + $(HIDE)touch --reference ustr-import-multilib.in $(DESTDIR)$(bindir)/ustr-import clean: Index: ustr.spec =================================================================== RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ustr.spec 6 Mar 2008 02:10:10 -0000 1.16 +++ ustr.spec 6 Mar 2008 03:05:40 -0000 1.17 @@ -27,12 +27,13 @@ Name: ustr Version: 1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: String library, very low memory overhead, simple to import Group: System Environment/Libraries License: MIT or LGPLv2+ or BSD URL: http://www.and.org/ustr/ Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.gz +Patch0: multilib-ustr-import.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: make gcc sed @@ -85,6 +86,7 @@ %prep %setup -q +%patch0 -p1 %build make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} @@ -149,8 +151,9 @@ %changelog -* Wed Mar 5 2008 James Antill - 1.0.4-2 +* Wed Mar 5 2008 James Antill - 1.0.4-3 - New upstream: 1.0.4 +- Add multilib fix for import * Thu Feb 21 2008 Dennis Gilmore - 1.0.3-5 - set broken_fed_dbg_opts to 0 its the recomended option upstream From fedora-extras-commits at redhat.com Thu Mar 6 03:17:55 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 6 Mar 2008 03:17:55 GMT Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.32, 1.33 sources, 1.30, 1.31 xorg-x11-proto-devel.spec, 1.69, 1.70 inputproto-1.4.2-card32.patch, 1.1, NONE Message-ID: <200803060317.m263HtvN002960@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2934/devel Modified Files: .cvsignore sources xorg-x11-proto-devel.spec Removed Files: inputproto-1.4.2-card32.patch Log Message: new inputproto and xproto Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 12 Nov 2007 23:38:23 -0000 1.32 +++ .cvsignore 6 Mar 2008 03:17:19 -0000 1.33 @@ -7,10 +7,10 @@ fontcacheproto-0.1.2.tar.bz2 fontsproto-2.0.2.tar.bz2 glproto-1.4.9.tar.bz2 -inputproto-1.4.2.tar.bz2 kbproto-1.0.3.tar.bz2 randrproto-1.2.1.tar.bz2 recordproto-1.13.2.tar.bz2 +renderproto-0.9.3.tar.bz2 resourceproto-1.0.2.tar.bz2 scrnsaverproto-1.1.0.tar.bz2 trapproto-3.4.3.tar.bz2 @@ -24,6 +24,6 @@ xf86rushproto-1.1.2.tar.bz2 xf86vidmodeproto-2.2.2.tar.bz2 xineramaproto-1.1.2.tar.bz2 -xproto-7.0.10.tar.bz2 xproxymanagementprotocol-1.0.2.tar.bz2 -renderproto-0.9.3.tar.bz2 +inputproto-1.4.3.tar.bz2 +xproto-7.0.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 12 Nov 2007 23:38:23 -0000 1.30 +++ sources 6 Mar 2008 03:17:19 -0000 1.31 @@ -7,10 +7,10 @@ 60df6b625074a9790e28543dcea71651 fontcacheproto-0.1.2.tar.bz2 c946f166107b016a21cc7a02e1132724 fontsproto-2.0.2.tar.bz2 e60951628422663e60faeb400f27bac1 glproto-1.4.9.tar.bz2 -e2c4cf4c2ad59d1e27f09381f6b4a3c3 inputproto-1.4.2.tar.bz2 6092cdb0a1225f95356ddbe6c2abaad5 kbproto-1.0.3.tar.bz2 e2e45564f8ce22e00e1360e79c8ccdeb randrproto-1.2.1.tar.bz2 0ed4706564a34fc2aff724aa16d3ff00 recordproto-1.13.2.tar.bz2 +598bc9a493deee2e48e4434e94467189 renderproto-0.9.3.tar.bz2 b823b314e37eb19dae1f297951d2e933 resourceproto-1.0.2.tar.bz2 5d551850e6f4acdf49a13f4eb3a5bbfa scrnsaverproto-1.1.0.tar.bz2 3b713239e5e6b269b31cb665563358df trapproto-3.4.3.tar.bz2 @@ -24,6 +24,6 @@ b6a96ffdae084e27487a58314008b000 xf86rushproto-1.1.2.tar.bz2 f00844a63d6e76b69eb0eb5e41eed843 xf86vidmodeproto-2.2.2.tar.bz2 1cc292c562962ad0ad3a253cae68c632 xineramaproto-1.1.2.tar.bz2 -2ed80e90992e7455eaac4c3e977ebd01 xproto-7.0.10.tar.bz2 d28007a50976204960fc1fc07b4ca093 xproxymanagementprotocol-1.0.2.tar.bz2 -598bc9a493deee2e48e4434e94467189 renderproto-0.9.3.tar.bz2 +a0f0d8cf6fbf0db8ba3937d0cc16138d inputproto-1.4.3.tar.bz2 +388234421add6c1760b4fc99fcdc76b0 xproto-7.0.12.tar.bz2 Index: xorg-x11-proto-devel.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- xorg-x11-proto-devel.spec 13 Nov 2007 16:55:59 -0000 1.69 +++ xorg-x11-proto-devel.spec 6 Mar 2008 03:17:19 -0000 1.70 @@ -10,7 +10,7 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.3 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT Group: Development/System URL: http://www.x.org @@ -32,8 +32,8 @@ Source7: ftp://ftp.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2 Source8: ftp://ftp.x.org/pub/individual/proto/glproto-1.4.9.tar.bz2 Provides: glproto = 1.4.9 -Source9: ftp://ftp.x.org/pub/individual/proto/inputproto-1.4.2.tar.bz2 -Provides: inputproto = 1.4.2 +Source9: ftp://ftp.x.org/pub/individual/proto/inputproto-1.4.3.tar.bz2 +Provides: inputproto = 1.4.3 Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2 Provides: kbproto = 1.0.3 Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.2.1.tar.bz2 @@ -56,12 +56,10 @@ Source26: ftp://ftp.x.org/pub/individual/proto/xf86rushproto-1.1.2.tar.bz2 Source27: ftp://ftp.x.org/pub/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2 Source28: ftp://ftp.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2 -Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.10.tar.bz2 -Provides: xproto = 7.0.10 +Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.12.tar.bz2 +Provides: xproto = 7.0.12 Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2 -Patch1: inputproto-1.4.2-card32.patch - BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros >= 1.0.2-1 @@ -84,8 +82,6 @@ %prep %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -%patch1 -p0 -b .card32 - %build # Proceed through each proto package directory, building them all @@ -298,6 +294,10 @@ %{_datadir}/pkgconfig/xproxymngproto.pc %changelog +* Wed Mar 05 2008 Adam Jackson 7.3-8 +- inputproto 1.4.3 +- xproto 7.0.12 + * Tue Nov 13 2007 Adam Jackson 7.3-7 - inputproto-1.4.2-card32.patch: Make sure CARD32 is defined on lp64. --- inputproto-1.4.2-card32.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 03:31:33 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Thu, 6 Mar 2008 03:31:33 GMT Subject: rpms/pungi/devel .cvsignore, 1.40, 1.41 pungi.spec, 1.43, 1.44 sources, 1.41, 1.42 Message-ID: <200803060331.m263VXRW003224@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/pungi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3191/devel Modified Files: .cvsignore pungi.spec sources Log Message: Throw in some last minute things before the beta Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 28 Feb 2008 22:20:47 -0000 1.40 +++ .cvsignore 6 Mar 2008 03:30:59 -0000 1.41 @@ -1 +1 @@ -pungi-1.2.8.tar.bz2 +pungi-1.2.9.tar.bz2 Index: pungi.spec =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- pungi.spec 28 Feb 2008 22:20:47 -0000 1.43 +++ pungi.spec 6 Mar 2008 03:30:59 -0000 1.44 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi -Version: 1.2.8 +Version: 1.2.9 Release: 1%{?dist} Summary: Distribution compose tool @@ -10,7 +10,7 @@ URL: https://fedorahosted.org/pungi Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: anaconda-runtime, yum => 3.0.3, repoview +Requires: anaconda-runtime >= 11.4.0.41, yum => 3.0.3, repoview BuildRequires: python-devel BuildArch: noarch @@ -55,6 +55,10 @@ %changelog +* Wed Mar 05 2008 Jesse Keating - 1.2.9-1 +- Fix ppc split iso generation +- Exclude repoview from isos + * Fri Jan 25 2008 jkeating 1.2.8-1 - Put createrepo arguments in correct order - Fix comps mashup to be more lenient with the open/close of Author: james Update of /cvs/pkgs/rpms/ustr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3262 Modified Files: multilib-ustr-import.patch ustr.spec Log Message: * Wed Mar 5 2008 James Antill - 1.0.4-4 - New upstream: 1.0.4 - Add multilib fix for import multilib-ustr-import.patch: Index: multilib-ustr-import.patch =================================================================== RCS file: /cvs/pkgs/rpms/ustr/devel/multilib-ustr-import.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multilib-ustr-import.patch 6 Mar 2008 03:05:40 -0000 1.1 +++ multilib-ustr-import.patch 6 Mar 2008 03:31:41 -0000 1.2 @@ -1,4 +1,4 @@ -commit bbe10c2b49f0a05b0ecebb1874a19c9b3655a1b3 +commit 18a892b62c50fcbdaed3d92645d9457466d623a3 Author: James Antill Date: Wed Mar 5 22:01:58 2008 -0500 @@ -26,3 +26,87 @@ clean: +diff --git a/ustr-import-multilib.in b/ustr-import-multilib.in +index b1f9994..0656b2a 100644 +--- a/ustr-import-multilib.in ++++ b/ustr-import-multilib.in +@@ -3,30 +3,59 @@ + INCDIR=@INCLUDEDIR@ + MBINDIR=@MBINDIR@ + ++NOT_DONE=1 + inst32() + { ++ foo=no ++ if [ "x$1" = "xeither" ]; then ++ foo=either ++ shift ++ fi + if [ -f "$MBINDIR/ustr-import-32" ]; then + "$MBINDIR/ustr-import-32" "$@" +- ++ RETVAL=$? ++ fi ++ ++ if [ "x$foo" = "xeither" ]; then + # This assume an installed multilib ustr-conf.h +- [ $RETVAL -eq 0 ] && mv ustr-conf.h ustr-conf-32.h +- [ $RETVAL -eq 0 ] && cp "$INCDIR/ustr-conf.h" . +- [ $RETVAL -eq 0 ] && mv ustr-conf-debug.h ustr-conf-debug-32.h +- [ $RETVAL -eq 0 ] && cp "$INCDIR/ustr-conf-debug.h" . ++ if [ $RETVAL -eq 0 ] && [ -f ustr-conf.h ]; then ++ mv ustr-conf.h ustr-conf-32.h ++ cp "$INCDIR/ustr-conf.h" . ++ fi ++ if [ $RETVAL -eq 0 ] && [ -f ustr-conf-debug.h ]; then ++ mv ustr-conf-debug.h ustr-conf-debug-32.h ++ cp "$INCDIR/ustr-conf-debug.h" . ++ fi ++ NOT_DONE=0 ++ else + exit $RETVAL + fi + } + + inst64() + { ++ foo=no ++ if [ "x$1" = "xeither" ]; then ++ foo=either ++ shift ++ fi + if [ -f "$MBINDIR/ustr-import-64" ]; then + "$MBINDIR/ustr-import-64" "$@" + RETVAL=$? ++ fi ++ ++ if [ "x$foo" = "xeither" ]; then + # This assume an installed multilib ustr-conf.h +- [ $RETVAL -eq 0 ] && mv ustr-conf.h ustr-conf-64.h +- [ $RETVAL -eq 0 ] && cp "$INCDIR/ustr-conf.h" . +- [ $RETVAL -eq 0 ] && mv ustr-conf-debug.h ustr-conf-debug-64.h +- [ $RETVAL -eq 0 ] && cp "$INCDIR/ustr-conf-debug.h" . ++ if [ $RETVAL -eq 0 ] && [ -f ustr-conf.h ]; then ++ mv ustr-conf.h ustr-conf-64.h ++ cp "$INCDIR/ustr-conf.h" . ++ fi ++ if [ $RETVAL -eq 0 ] && [ -f ustr-conf-debug.h ]; then ++ mv ustr-conf-debug.h ustr-conf-debug-64.h ++ cp "$INCDIR/ustr-conf-debug.h" . ++ fi ++ NOT_DONE=0 ++ else + exit $RETVAL + fi + } +@@ -41,7 +70,7 @@ if [ "x$1" = "x--64" ]; then + inst64 $@ + fi + +-inst64 $@ +-inst32 $@ ++inst64 either $@ ++inst32 either $@ + +-exit 1 ++exit $NOT_DONE Index: ustr.spec =================================================================== RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ustr.spec 6 Mar 2008 03:05:40 -0000 1.17 +++ ustr.spec 6 Mar 2008 03:31:41 -0000 1.18 @@ -27,7 +27,7 @@ Name: ustr Version: 1.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: String library, very low memory overhead, simple to import Group: System Environment/Libraries License: MIT or LGPLv2+ or BSD @@ -151,7 +151,7 @@ %changelog -* Wed Mar 5 2008 James Antill - 1.0.4-3 +* Wed Mar 5 2008 James Antill - 1.0.4-4 - New upstream: 1.0.4 - Add multilib fix for import From fedora-extras-commits at redhat.com Thu Mar 6 03:40:25 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 6 Mar 2008 03:40:25 GMT Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.25,1.26 Message-ID: <200803060340.m263eP3p003521@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdepimlibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3441/devel Modified Files: kdepimlibs.spec Log Message: * Thu Mar 06 2008 Kevin Kofler 4.0.2-2 - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen, graphviz and qt4-doc when building apidocs Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- kdepimlibs.spec 28 Feb 2008 18:19:19 -0000 1.25 +++ kdepimlibs.spec 6 Mar 2008 03:39:51 -0000 1.26 @@ -1,8 +1,16 @@ +%if 0%{?fedora} > 8 +# set this to 0 to disable -apidocs for a faster build +%define apidocs 1 +%else +# don't build apidocs on Fedora < 9 for now, because we don't have the required +# files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3 +%define apidocs 0 +%endif Name: kdepimlibs Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: K Desktop Environment 4 - PIM Libraries License: LGPLv2 @@ -23,6 +31,12 @@ BuildRequires: openldap-devel %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } +%if "%{?apidocs}" == "1" +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: qt4-doc +%endif + %description Personal Information Management (PIM) libraries for the K Desktop Environment 4. @@ -38,6 +52,15 @@ %description devel Header files for developing applications using %{name}. +%package apidocs +Group: Development/Documentation +Summary: kdepimlibs API documentation +Requires: %{name} = %{?epoch:%{epoch}:}%{version} + +%description apidocs +This package includes the kdepimlibs API documentation in HTML +format for easy browsing. + %prep %setup -q -n kdepimlibs-%{version} @@ -52,6 +75,12 @@ make %{?_smp_mflags} -C %{_target_platform} +# build apidocs +%if "%{?apidocs}" == "1" +export QTDOCDIR=`pkg-config --variable=docdir Qt` +kde4-doxygen.sh --doxdatadir=%{_kde4_docdir}/HTML/en/common . +%endif + %install rm -rf %{buildroot} @@ -75,6 +104,11 @@ done popd +# install apidocs +%if "%{?apidocs}" == "1" +cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs +%endif + %post -p /sbin/ldconfig @@ -105,8 +139,18 @@ %{_kde4_includedir}/* %{_kde4_libdir}/kde4/devel/lib*.so +%if "%{?apidocs}" == "1" +%files apidocs +%defattr(-,root,root,-) +%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs/ +%endif + %changelog +* Thu Mar 06 2008 Kevin Kofler 4.0.2-2 +- build apidocs and put them into an -apidocs subpackage (can be turned off) +- BR doxygen, graphviz and qt4-doc when building apidocs + * Thu Feb 28 2008 Than Ngo 4.0.2-1 - 4.0.2 From fedora-extras-commits at redhat.com Thu Mar 6 03:50:10 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 6 Mar 2008 03:50:10 GMT Subject: rpms/ustr/devel sources, 1.6, 1.7 ustr.spec, 1.18, 1.19 multilib-ustr-import.patch, 1.2, NONE Message-ID: <200803060350.m263oASO003681@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/ustr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3656 Modified Files: sources ustr.spec Removed Files: multilib-ustr-import.patch Log Message: * Wed Mar 5 2008 James Antill - 1.0.4-5 - New new upstream: 1.0.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ustr/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Mar 2008 02:20:14 -0000 1.6 +++ sources 6 Mar 2008 03:49:32 -0000 1.7 @@ -1 +1 @@ -fc73e968de26e4e911d7c81c5e0e7359 ustr-1.0.4.tar.gz +0833c29554eea19f2660aa000ba4c7b0 ustr-1.0.4.tar.gz Index: ustr.spec =================================================================== RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ustr.spec 6 Mar 2008 03:31:41 -0000 1.18 +++ ustr.spec 6 Mar 2008 03:49:32 -0000 1.19 @@ -27,13 +27,13 @@ Name: ustr Version: 1.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: String library, very low memory overhead, simple to import Group: System Environment/Libraries License: MIT or LGPLv2+ or BSD URL: http://www.and.org/ustr/ Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.gz -Patch0: multilib-ustr-import.patch +# Patch0: multilib-ustr-import.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: make gcc sed @@ -86,7 +86,7 @@ %prep %setup -q -%patch0 -p1 +#patch0 -p1 %build make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} @@ -151,12 +151,12 @@ %changelog -* Wed Mar 5 2008 James Antill - 1.0.4-4 -- New upstream: 1.0.4 -- Add multilib fix for import +* Wed Mar 5 2008 James Antill - 1.0.4-5 +- New new upstream: 1.0.4 * Thu Feb 21 2008 Dennis Gilmore - 1.0.3-5 - set broken_fed_dbg_opts to 0 its the recomended option upstream +- this works around sparc GCC problems - add smpflags and cflags to make check * Wed Feb 13 2008 James Antill - 1.0.3-4 --- multilib-ustr-import.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 04:02:00 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 6 Mar 2008 04:02:00 GMT Subject: rpms/ustr/F-8 .cvsignore,1.3,1.4 sources,1.3,1.4 ustr.spec,1.7,1.8 Message-ID: <200803060402.m26420NG010995@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/ustr/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9730 Modified Files: .cvsignore sources ustr.spec Log Message: * Wed Mar 5 2008 James Antill - 1.0.4-5 - New new upstream: 1.0.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ustr/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Oct 2007 12:49:21 -0000 1.3 +++ .cvsignore 6 Mar 2008 04:01:06 -0000 1.4 @@ -1 +1 @@ -ustr-1.0.2.tar.gz +ustr-1.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ustr/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Oct 2007 12:49:21 -0000 1.3 +++ sources 6 Mar 2008 04:01:06 -0000 1.4 @@ -1 +1 @@ -75f765c34d52c8fd46905f64ff6af7d0 ustr-1.0.2.tar.gz +0833c29554eea19f2660aa000ba4c7b0 ustr-1.0.4.tar.gz Index: ustr.spec =================================================================== RCS file: /cvs/pkgs/rpms/ustr/F-8/ustr.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ustr.spec 31 Oct 2007 12:51:45 -0000 1.7 +++ ustr.spec 6 Mar 2008 04:01:06 -0000 1.8 @@ -1,6 +1,7 @@ %define show_all_cmds 1 -%define broken_fed_dbg_opts 1 +%define broken_fed_dbg_opts 0 +%define multilib_inst 1 %if %{show_all_cmds} %define policy_cflags_hide HIDE= @@ -17,14 +18,22 @@ %define policy_cflags %{policy_cflags_hide} %{policy_cflags_broken} +%if %{multilib_inst} +%define ustr_make_install install-multilib-linux +%else +%define ustr_make_install install +%endif + + Name: ustr -Version: 1.0.2 -Release: 3%{?dist} +Version: 1.0.4 +Release: 5%{?dist} Summary: String library, very low memory overhead, simple to import Group: System Environment/Libraries License: MIT or LGPLv2+ or BSD URL: http://www.and.org/ustr/ Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.gz +# Patch0: multilib-ustr-import.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: make gcc sed @@ -77,21 +86,22 @@ %prep %setup -q +#patch0 -p1 %build make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} %check %if %{?chk}%{!?chk:1} -make check %{policy_cflags} +make %{?_smp_mflags} check CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} %endif %install rm -rf $RPM_BUILD_ROOT -make $@ install prefix=%{_prefix} \ +make $@ %{ustr_make_install} prefix=%{_prefix} \ bindir=%{_bindir} mandir=%{_mandir} \ datadir=%{_datadir} libdir=%{_libdir} \ - includedir=%{_includedir} \ + includedir=%{_includedir} libexecdir=%{_libexecdir} \ DESTDIR=$RPM_BUILD_ROOT LDCONFIG=/bin/true HIDE= %clean @@ -114,9 +124,12 @@ %defattr(-,root,root,-) %{_datadir}/ustr-%{version} %{_bindir}/ustr-import +%if %{multilib_inst} +%{_libexecdir}/ustr-%{version}/ustr-import* +%endif %{_includedir}/ustr.h %{_includedir}/ustr-*.h -%exclude %{_includedir}/ustr*debug.h +%exclude %{_includedir}/ustr*debug*.h %{_libdir}/pkgconfig/ustr.pc %{_libdir}/libustr.so %{_datadir}/doc/ustr-devel-%{version} @@ -130,8 +143,7 @@ %defattr(-,root,root,-) %{_libdir}/libustr-debug-1.0.so.* %{_libdir}/libustr-debug.so -%{_includedir}/ustr-debug.h -%{_includedir}/ustr-conf-debug.h +%{_includedir}/ustr*debug*.h %{_libdir}/pkgconfig/ustr-debug.pc %files debug-static @@ -139,6 +151,25 @@ %changelog +* Wed Mar 5 2008 James Antill - 1.0.4-5 +- New new upstream: 1.0.4 + +* Thu Feb 21 2008 Dennis Gilmore - 1.0.3-5 +- set broken_fed_dbg_opts to 0 its the recomended option upstream +- this works around sparc GCC problems +- add smpflags and cflags to make check + +* Wed Feb 13 2008 James Antill - 1.0.3-4 +- Preserve timestamps for shared multilib. files. +- Relates: bug#343351 + +* Sun Feb 10 2008 James Antill - 1.0.3-3 +- Add upstream multilib patch for ustr-import +- Resolves: bug#343351 + +* Mon Jan 14 2008 James Antill - 1.0.3-2 +- Build new upstream in Fedora + * Tue Oct 30 2007 James Antill - 1.0.2-2 - Build new upstream in Fedora From fedora-extras-commits at redhat.com Thu Mar 6 04:02:25 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Thu, 6 Mar 2008 04:02:25 GMT Subject: rpms/ustr/EL-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ustr.spec, 1.5, 1.6 Message-ID: <200803060402.m2642PlE011156@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/ustr/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10973 Modified Files: .cvsignore sources ustr.spec Log Message: * Wed Mar 5 2008 James Antill - 1.0.4-5 - New new upstream: 1.0.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ustr/EL-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Nov 2007 23:16:33 -0000 1.3 +++ .cvsignore 6 Mar 2008 04:01:46 -0000 1.4 @@ -1 +1 @@ -ustr-1.0.2.tar.gz +ustr-1.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ustr/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Nov 2007 23:16:33 -0000 1.3 +++ sources 6 Mar 2008 04:01:46 -0000 1.4 @@ -1 +1 @@ -75f765c34d52c8fd46905f64ff6af7d0 ustr-1.0.2.tar.gz +0833c29554eea19f2660aa000ba4c7b0 ustr-1.0.4.tar.gz Index: ustr.spec =================================================================== RCS file: /cvs/pkgs/rpms/ustr/EL-5/ustr.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ustr.spec 7 Nov 2007 23:16:33 -0000 1.5 +++ ustr.spec 6 Mar 2008 04:01:46 -0000 1.6 @@ -1,6 +1,7 @@ %define show_all_cmds 1 -%define broken_fed_dbg_opts 1 +%define broken_fed_dbg_opts 0 +%define multilib_inst 1 %if %{show_all_cmds} %define policy_cflags_hide HIDE= @@ -17,14 +18,22 @@ %define policy_cflags %{policy_cflags_hide} %{policy_cflags_broken} +%if %{multilib_inst} +%define ustr_make_install install-multilib-linux +%else +%define ustr_make_install install +%endif + + Name: ustr -Version: 1.0.2 -Release: 2%{?dist} +Version: 1.0.4 +Release: 5%{?dist} Summary: String library, very low memory overhead, simple to import Group: System Environment/Libraries License: MIT or LGPLv2+ or BSD URL: http://www.and.org/ustr/ Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.gz +# Patch0: multilib-ustr-import.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: make gcc sed @@ -77,21 +86,22 @@ %prep %setup -q +#patch0 -p1 %build make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} %check %if %{?chk}%{!?chk:1} -make check %{policy_cflags} +make %{?_smp_mflags} check CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags} %endif %install rm -rf $RPM_BUILD_ROOT -make $@ install prefix=%{_prefix} \ +make $@ %{ustr_make_install} prefix=%{_prefix} \ bindir=%{_bindir} mandir=%{_mandir} \ datadir=%{_datadir} libdir=%{_libdir} \ - includedir=%{_includedir} \ + includedir=%{_includedir} libexecdir=%{_libexecdir} \ DESTDIR=$RPM_BUILD_ROOT LDCONFIG=/bin/true HIDE= %clean @@ -114,9 +124,12 @@ %defattr(-,root,root,-) %{_datadir}/ustr-%{version} %{_bindir}/ustr-import +%if %{multilib_inst} +%{_libexecdir}/ustr-%{version}/ustr-import* +%endif %{_includedir}/ustr.h %{_includedir}/ustr-*.h -%exclude %{_includedir}/ustr*debug.h +%exclude %{_includedir}/ustr*debug*.h %{_libdir}/pkgconfig/ustr.pc %{_libdir}/libustr.so %{_datadir}/doc/ustr-devel-%{version} @@ -130,8 +143,7 @@ %defattr(-,root,root,-) %{_libdir}/libustr-debug-1.0.so.* %{_libdir}/libustr-debug.so -%{_includedir}/ustr-debug.h -%{_includedir}/ustr-conf-debug.h +%{_includedir}/ustr*debug*.h %{_libdir}/pkgconfig/ustr-debug.pc %files debug-static @@ -139,6 +151,25 @@ %changelog +* Wed Mar 5 2008 James Antill - 1.0.4-5 +- New new upstream: 1.0.4 + +* Thu Feb 21 2008 Dennis Gilmore - 1.0.3-5 +- set broken_fed_dbg_opts to 0 its the recomended option upstream +- this works around sparc GCC problems +- add smpflags and cflags to make check + +* Wed Feb 13 2008 James Antill - 1.0.3-4 +- Preserve timestamps for shared multilib. files. +- Relates: bug#343351 + +* Sun Feb 10 2008 James Antill - 1.0.3-3 +- Add upstream multilib patch for ustr-import +- Resolves: bug#343351 + +* Mon Jan 14 2008 James Antill - 1.0.3-2 +- Build new upstream in Fedora + * Tue Oct 30 2007 James Antill - 1.0.2-2 - Build new upstream in Fedora From fedora-extras-commits at redhat.com Thu Mar 6 04:19:50 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 6 Mar 2008 04:19:50 GMT Subject: rpms/smolt/EL-4 smolt.spec,1.26,1.27 sources,1.16,1.17 Message-ID: <200803060419.m264Jo9P011684@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11613/EL-4 Modified Files: smolt.spec sources Log Message: upstream released a new version Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/EL-4/smolt.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- smolt.spec 13 Sep 2007 15:32:13 -0000 1.26 +++ smolt.spec 6 Mar 2008 04:19:09 -0000 1.27 @@ -1,7 +1,7 @@ Name: smolt Summary: Fedora hardware profiler -Version: 0.9.8.4 -Release: 6%{?dist} +Version: 1.1.1 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://hosted.fedoraproject.org/projects/smolt @@ -9,14 +9,16 @@ # Note: This is a link to the gzip, you can't download it directly # This will get fixed as soon as hosted can create attachments directly -Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz +Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: dbus-python +Requires: dbus-python, python-crypto, python-urlgrabber, gawk, python-genshi, python-paste BuildRequires: gettext BuildRequires: desktop-file-utils +Requires(pre): %{_sbindir}/groupadd +Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -30,6 +32,29 @@ This package contains the client +%package server +Summary: Fedora hardware profiler server +Group: Applications/Internet +Requires: smolt = %{version}-%{release} +Requires: TurboGears mx + +%description server +The Fedora hardware profiler is a server-client system that does a hardware +scan against a machine and sends the results to a public Fedora Project +turbogears server. The sends are anonymous and should not contain any private +information other than the physical hardware information and basic OS info. + +This package contains the server portion + +%package firstboot +Summary: Fedora hardware profile firstboot +Group: Applications/Internet +Requires: smolt = %{version}-%{release} + +%description firstboot +This provides firstboot integration for smolt. It has been broken into a +separate package so firstboot isn't a requisite to use smolt. + %package gui Summary: Fedora hardware profiler gui Group: Applications/Internet @@ -51,42 +76,35 @@ cd client DESTDIR=%{buildroot} make install cd .. +%{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/ +%{__mkdir} -p %{buildroot}/%{_mandir}/man1/ +%{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/ %{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/ +%{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/ +%{__cp} client/fs_util.py %{buildroot}/%{_datadir}/%{name}/client/ +%{__cp} client/man/* %{buildroot}/%{_mandir}/man1/ %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/ -#%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/ -#%{__mkdir} -p %{buildroot}/%{_bindir} +%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/ %{__mkdir} -p %{buildroot}/%{_initrddir} -#%{__mkdir} -p %{buildroot}/%{_datadir}/locale/ +%{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt -#%{__mv} client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt -#%{__cp} -adv client/po/* %{buildroot}/%{_datadir}/locale/ - -#find %{buildroot} -name \*.po\* -delete touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid -#%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/ -#%{__install} -d -m 0755 client/icons/ %{buildroot}/%{_datadir}/%{name}/client/icons/ -#%{__cp} -adv client/*.py %{buildroot}/%{_datadir}/%{name}/client/ - # Icons %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/ %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/ %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/ %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/ +%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/pixmaps/ +%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/themes/default/ %{__mv} client/icons/smolt-icon-16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/smolt.png %{__mv} client/icons/smolt-icon-22.png %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/smolt.png %{__mv} client/icons/smolt-icon-24.png %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/smolt.png %{__mv} client/icons/smolt-icon-32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/smolt.png %{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/ - -#%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc -#%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc - -#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py -#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py -#%{__chmod} +x %{buildroot}/%{_initrddir}/smolt +%{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png %{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile @@ -104,14 +122,19 @@ %clean rm -rf %{buildroot} +%pre +%{_sbindir}/groupadd -r %{name} &>/dev/null || : +%{_sbindir}/useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \ + -c 'Smolt' -g %{name} %{name} &>/dev/null || : + %post /sbin/chkconfig --add smolt -if ! [ -f %{_sysconfdir}/sysconfig/hw-uuid ] -then - /bin/cat /proc/sys/kernel/random/uuid > %{_sysconfdir}/sysconfig/hw-uuid - /bin/chmod 0644 %{_sysconfdir}/sysconfig/hw-uuid - /bin/chown root:root %{_sysconfdir}/sysconfig/hw-uuid -fi + +#Randomize checkin times. +TMPFILE=$(/bin/mktemp /tmp/smolt.XXXXX) +/bin/awk '{ srand(); if($2 == 1 && $3 == 1) print $1,int((rand() * 100) % 22 + 1),int((rand() * 100) % 27 + 1),substr($0,index($0,$4)); else print $0}' /etc/cron.d/smolt > $TMPFILE +/bin/cp $TMPFILE /etc/cron.d/smolt +/bin/rm -f $TMPFILE %preun if [ $1 = 0 ]; then @@ -123,15 +146,26 @@ %defattr(-,root,root,-) %doc README GPL doc/* %dir %{_datadir}/%{name} +%dir %{_sysconfdir}/%{name}/ %{_datadir}/%{name}/client %{_datadir}/%{name}/doc %{_bindir}/smoltSendProfile %{_bindir}/smoltDeleteProfile -%{_sysconfdir}/%{name}/config.* +%config(noreplace) /%{_sysconfdir}/%{name}/config* %{_sysconfdir}/cron.d/%{name} +%{_mandir}/man1/*gz %{_initrddir}/%{name} %ghost %config(noreplace) %{_sysconfdir}/sysconfig/hw-uuid +%files server +%defattr(-,root,root,-) +%{_datadir}/%{name}/smoon + +%files firstboot +%defattr(-,root,root,-) +%{_datadir}/firstboot/modules/smolt.py* +%{_datadir}/firstboot/themes/default/smolt.png + %files gui %defattr(-,root,root,-) %{_datadir}/applications/fedora-smolt.desktop @@ -139,8 +173,53 @@ %{_bindir}/smoltGui %changelog -* Thu Sep 13 2007 Mike McGrath 0.9.8.4-6 -- Removed firstboot and server portions for EL-4 +* Wed Mar 05 2008 Mike McGrath - 1.1.1-1 +- Upstream released new version +- Manfiles added +- Source location updated + +* Wed Feb 27 2008 Jeffrey C. Ollie - 1.1-3 +- Copy instead of move cron file so that selinux contexts are set + properly. (BZ#435050) + +* Wed Feb 27 2008 Jeffrey C. Ollie - 1.1-2 +- Create smolt user. (BZ#435136) + +* Fri Feb 01 2008 Mike McGrath 1.0-5 +- Added a req for mx on smoon + +* Thu Jan 08 2008 Mike McGrath 1.0-4 +- Fixed firstboot + +* Thu Jan 08 2008 Mike McGrath 1.0-3 +- Added python-urlgrabber as a requires - 427969 + +* Thu Nov 22 2007 Mike McGrath 1.0-2 +- Installed scanner - #395901 + +* Tue Nov 20 2007 Mike McGrath 1.0-1 +- Upstream released new version + +* Tue Oct 25 2007 Mike McGrath 0.9.9.2-1 +- Upstream released new version + +* Tue Oct 23 2007 Mike McGrath 0.9.9.1-4 +- Upstream released new version + +* Thu Oct 18 2007 Mike McGrath 0.9.9-2 +- Fixed /etc/smolt/ ownership issue + +* Tue Oct 16 2007 Mike McGrath 0.9.9-1 +- Upstream released new version + +* Fri Sep 28 2007 Mike McGrath 0.9.8.4-8 +- Fixed Selinux + +* Thu Sep 27 2007 Mike McGrath 0.9.8.4-6 +- Added translations + +* Fri Sep 21 2007 Mike McGrath 0.9.8.4-5 +- Fixed firstboot issues * Mon Aug 13 2007 Mike McGrath 0.9.8.4-4 - Rebuild to clean up 'config.py' compilations Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/EL-4/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 13 Sep 2007 15:32:13 -0000 1.16 +++ sources 6 Mar 2008 04:19:09 -0000 1.17 @@ -1 +1 @@ -2b79adbf0271160d55f4540008d0859f smolt-0.9.8.4.tar.gz +7ec5dc8f7550be524dfd9467bb59f06c smolt-1.1.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 04:20:00 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 6 Mar 2008 04:20:00 GMT Subject: rpms/smolt/EL-5 smolt.spec,1.30,1.31 sources,1.19,1.20 Message-ID: <200803060420.m264K0ub011690@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11613/EL-5 Modified Files: smolt.spec sources Log Message: upstream released a new version Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/EL-5/smolt.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- smolt.spec 28 Feb 2008 05:20:25 -0000 1.30 +++ smolt.spec 6 Mar 2008 04:19:20 -0000 1.31 @@ -1,7 +1,7 @@ Name: smolt Summary: Fedora hardware profiler -Version: 1.1 -Release: 3%{?dist} +Version: 1.1.1 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://hosted.fedoraproject.org/projects/smolt @@ -9,11 +9,11 @@ # Note: This is a link to the gzip, you can't download it directly # This will get fixed as soon as hosted can create attachments directly -Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz +Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: dbus-python, python-crypto, python-urlgrabber, gawk +Requires: dbus-python, python-crypto, python-urlgrabber, gawk, python-genshi, python-paste BuildRequires: gettext BuildRequires: desktop-file-utils @@ -77,30 +77,21 @@ DESTDIR=%{buildroot} make install cd .. %{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/ +%{__mkdir} -p %{buildroot}/%{_mandir}/man1/ %{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/ %{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/ %{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/ %{__cp} client/fs_util.py %{buildroot}/%{_datadir}/%{name}/client/ +%{__cp} client/man/* %{buildroot}/%{_mandir}/man1/ %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/ -#%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/ -#%{__mkdir} -p %{buildroot}/%{_bindir} %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/ %{__mkdir} -p %{buildroot}/%{_initrddir} -#%{__mkdir} -p %{buildroot}/%{_datadir}/locale/ %{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt -#%{__mv} client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt -#%{__cp} -adv client/po/* %{buildroot}/%{_datadir}/locale/ - -#find %{buildroot} -name \*.po\* -delete touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid -#%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/ -#%{__install} -d -m 0755 client/icons/ %{buildroot}/%{_datadir}/%{name}/client/icons/ -#%{__cp} -adv client/*.py %{buildroot}/%{_datadir}/%{name}/client/ - # Icons %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/ %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/ @@ -115,13 +106,6 @@ %{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/ %{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png -#%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc -#%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc - -#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py -#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py -#%{__chmod} +x %{buildroot}/%{_initrddir}/smolt - %{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile @@ -169,6 +153,7 @@ %{_bindir}/smoltDeleteProfile %config(noreplace) /%{_sysconfdir}/%{name}/config* %{_sysconfdir}/cron.d/%{name} +%{_mandir}/man1/*gz %{_initrddir}/%{name} %ghost %config(noreplace) %{_sysconfdir}/sysconfig/hw-uuid @@ -188,6 +173,11 @@ %{_bindir}/smoltGui %changelog +* Wed Mar 05 2008 Mike McGrath - 1.1.1-1 +- Upstream released new version +- Manfiles added +- Source location updated + * Wed Feb 27 2008 Jeffrey C. Ollie - 1.1-3 - Copy instead of move cron file so that selinux contexts are set properly. (BZ#435050) Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/EL-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 14 Feb 2008 19:34:42 -0000 1.19 +++ sources 6 Mar 2008 04:19:20 -0000 1.20 @@ -1 +1 @@ -10e7954f099c196f2e1c5ea3f977b84c smolt-1.1.tar.gz +7ec5dc8f7550be524dfd9467bb59f06c smolt-1.1.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 04:20:04 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 6 Mar 2008 04:20:04 GMT Subject: rpms/smolt/F-7 smolt.spec,1.32,1.33 sources,1.20,1.21 Message-ID: <200803060420.m264K477011697@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11613/F-7 Modified Files: smolt.spec sources Log Message: upstream released a new version Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/F-7/smolt.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- smolt.spec 28 Feb 2008 05:19:55 -0000 1.32 +++ smolt.spec 6 Mar 2008 04:19:30 -0000 1.33 @@ -1,7 +1,7 @@ Name: smolt Summary: Fedora hardware profiler -Version: 1.1 -Release: 3%{?dist} +Version: 1.1.1 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://hosted.fedoraproject.org/projects/smolt @@ -9,11 +9,11 @@ # Note: This is a link to the gzip, you can't download it directly # This will get fixed as soon as hosted can create attachments directly -Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz +Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: dbus-python, python-crypto, python-urlgrabber, gawk +Requires: dbus-python, python-crypto, python-urlgrabber, gawk, python-genshi, python-paste BuildRequires: gettext BuildRequires: desktop-file-utils @@ -77,30 +77,21 @@ DESTDIR=%{buildroot} make install cd .. %{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/ +%{__mkdir} -p %{buildroot}/%{_mandir}/man1/ %{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/ %{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/ %{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/ %{__cp} client/fs_util.py %{buildroot}/%{_datadir}/%{name}/client/ +%{__cp} client/man/* %{buildroot}/%{_mandir}/man1/ %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/ -#%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/ -#%{__mkdir} -p %{buildroot}/%{_bindir} %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/ %{__mkdir} -p %{buildroot}/%{_initrddir} -#%{__mkdir} -p %{buildroot}/%{_datadir}/locale/ %{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt -#%{__mv} client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt -#%{__cp} -adv client/po/* %{buildroot}/%{_datadir}/locale/ - -#find %{buildroot} -name \*.po\* -delete touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid -#%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/ -#%{__install} -d -m 0755 client/icons/ %{buildroot}/%{_datadir}/%{name}/client/icons/ -#%{__cp} -adv client/*.py %{buildroot}/%{_datadir}/%{name}/client/ - # Icons %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/ %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/ @@ -115,13 +106,6 @@ %{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/ %{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png -#%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc -#%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc - -#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py -#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py -#%{__chmod} +x %{buildroot}/%{_initrddir}/smolt - %{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile @@ -169,6 +153,7 @@ %{_bindir}/smoltDeleteProfile %config(noreplace) /%{_sysconfdir}/%{name}/config* %{_sysconfdir}/cron.d/%{name} +%{_mandir}/man1/*gz %{_initrddir}/%{name} %ghost %config(noreplace) %{_sysconfdir}/sysconfig/hw-uuid @@ -188,6 +173,11 @@ %{_bindir}/smoltGui %changelog +* Wed Mar 05 2008 Mike McGrath - 1.1.1-1 +- Upstream released new version +- Manfiles added +- Source location updated + * Wed Feb 27 2008 Jeffrey C. Ollie - 1.1-3 - Copy instead of move cron file so that selinux contexts are set properly. (BZ#435050) Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/F-7/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 14 Feb 2008 19:34:50 -0000 1.20 +++ sources 6 Mar 2008 04:19:30 -0000 1.21 @@ -1 +1 @@ -10e7954f099c196f2e1c5ea3f977b84c smolt-1.1.tar.gz +7ec5dc8f7550be524dfd9467bb59f06c smolt-1.1.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 04:21:31 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 6 Mar 2008 04:21:31 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.2-install-all-css.patch, 1.1, 1.2 kdelibs.spec, 1.284, 1.285 Message-ID: <200803060421.m264LVEP011777@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11754/devel Modified Files: kdelibs-4.0.2-install-all-css.patch kdelibs.spec Log Message: * Thu Mar 06 2008 Kevin Kofler 4.0.2-5 - also install Doxyfile.global in -common to build kdepimlibs-apidocs against kdelibs-4.0.2-install-all-css.patch: Index: kdelibs-4.0.2-install-all-css.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.0.2-install-all-css.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdelibs-4.0.2-install-all-css.patch 5 Mar 2008 21:39:51 -0000 1.1 +++ kdelibs-4.0.2-install-all-css.patch 6 Mar 2008 04:21:20 -0000 1.2 @@ -1,11 +1,12 @@ diff -ur kdelibs-4.0.2/doc/common/CMakeLists.txt kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt --- kdelibs-4.0.2/doc/common/CMakeLists.txt 2008-01-05 01:00:05.000000000 +0100 -+++ kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt 2008-03-05 21:22:32.000000000 +0100 -@@ -7,6 +7,7 @@ ++++ kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt 2008-03-06 05:18:11.000000000 +0100 +@@ -7,6 +7,8 @@ xml.dcl doxygen.css tabs.css + kde.css flat.css print.css ++ Doxyfile.global header.html footer.html mainheader.html Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.284 retrieving revision 1.285 diff -u -r1.284 -r1.285 --- kdelibs.spec 6 Mar 2008 01:21:01 -0000 1.284 +++ kdelibs.spec 6 Mar 2008 04:21:20 -0000 1.285 @@ -3,7 +3,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.2 -Release: 4%{?dist} +Release: 5%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -60,7 +60,8 @@ # fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin # (can't talk over D-Bus to an app only supporting DCOP) Patch7: kdelibs-4.0.1-dcop-servicetype.patch -# install all .css files in kdelibs-common to build kdepimlibs-apidocs against +# install all .css files and Doxyfile.global in kdelibs-common to build +# kdepimlibs-apidocs against Patch8: kdelibs-4.0.2-install-all-css.patch # upstream patches @@ -322,6 +323,9 @@ %changelog +* Thu Mar 06 2008 Kevin Kofler 4.0.2-5 +- also install Doxyfile.global in -common to build kdepimlibs-apidocs against + * Wed Mar 05 2008 Kevin Kofler 4.0.2-4 - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel From fedora-extras-commits at redhat.com Thu Mar 6 04:36:59 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Thu, 6 Mar 2008 04:36:59 GMT Subject: comps comps-f9.xml.in,1.290,1.291 Message-ID: <200803060436.m264ax25011962@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11938 Modified Files: comps-f9.xml.in Log Message: no more sysvinit Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- comps-f9.xml.in 4 Mar 2008 21:10:01 -0000 1.290 +++ comps-f9.xml.in 6 Mar 2008 04:36:29 -0000 1.291 @@ -606,6 +606,7 @@ cpio e2fsprogs ed + event-compat-sysv fedora-logos fedora-release file @@ -631,7 +632,6 @@ setserial setup shadow-utils - sysvinit util-linux-ng vim-minimal elilo From fedora-extras-commits at redhat.com Thu Mar 6 04:43:24 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Thu, 6 Mar 2008 04:43:24 GMT Subject: rpms/libdrm/devel i915modeset,NONE,1.1 libdrm.spec,1.36,1.37 Message-ID: <200803060443.m264hO20012091@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/libdrm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12060 Modified Files: libdrm.spec Added Files: i915modeset Log Message: * Thu Mar 06 2008 Dave Airlie 2.4.0-0.8 - add modprobe.d file so i915 modesetting can be specified on kernel command line --- NEW FILE i915modeset --- install i915 { /bin/grep "i915.modeset=1" /proc/cmdline ; if /usr/bin/test $? = 0 ; then MYASS="modeset=1" ; else MYASS=""; fi ; /sbin/modprobe --ignore-install i915 $MYASS ; } Index: libdrm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- libdrm.spec 5 Mar 2008 04:13:07 -0000 1.36 +++ libdrm.spec 6 Mar 2008 04:42:47 -0000 1.37 @@ -3,7 +3,7 @@ Summary: Direct Rendering Manager runtime library Name: libdrm Version: 2.4.0 -Release: 0.7%{?dist} +Release: 0.8%{?dist} License: MIT Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -15,6 +15,7 @@ BuildRequires: pkgconfig automake autoconf libtool Source2: 91-drm-modeset.rules +Source3: i915modeset Patch1: libdrm-modesetting.patch Patch2: libdrm-2.4.0-no-freaking-mknod.patch @@ -45,6 +46,8 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ +install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ # NOTE: We intentionally don't ship *.la files find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || : @@ -61,6 +64,7 @@ %{_libdir}/libdrm.so.2 %{_libdir}/libdrm.so.2.3.0 %{_sysconfdir}/udev/rules.d/91-drm-modeset.rules +%{_sysconfdir}/modprobe.d/i915modeset %files devel %defattr(-,root,root,-) @@ -88,6 +92,10 @@ %{_libdir}/pkgconfig/libdrm.pc %changelog +* Thu Mar 06 2008 Dave Airlie 2.4.0-0.8 +- add modprobe.d file so i915 modesetting can be specified on kernel command + line + * Wed Mar 05 2008 Dave Airlie 2.4.0-0.7 - add udev rules for modesetting nodes. From fedora-extras-commits at redhat.com Thu Mar 6 04:20:14 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 6 Mar 2008 04:20:14 GMT Subject: rpms/smolt/F-8 smolt.spec,1.40,1.41 sources,1.20,1.21 Message-ID: <200803060420.m264KEIf011702@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11613/F-8 Modified Files: smolt.spec sources Log Message: upstream released a new version Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/F-8/smolt.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- smolt.spec 28 Feb 2008 05:19:23 -0000 1.40 +++ smolt.spec 6 Mar 2008 04:19:34 -0000 1.41 @@ -1,7 +1,7 @@ Name: smolt Summary: Fedora hardware profiler -Version: 1.1 -Release: 3%{?dist} +Version: 1.1.1 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://hosted.fedoraproject.org/projects/smolt @@ -9,11 +9,11 @@ # Note: This is a link to the gzip, you can't download it directly # This will get fixed as soon as hosted can create attachments directly -Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz +Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: dbus-python, python-crypto, python-urlgrabber, gawk +Requires: dbus-python, python-crypto, python-urlgrabber, gawk, python-genshi, python-paste BuildRequires: gettext BuildRequires: desktop-file-utils @@ -77,30 +77,21 @@ DESTDIR=%{buildroot} make install cd .. %{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/ +%{__mkdir} -p %{buildroot}/%{_mandir}/man1/ %{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/ %{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/ %{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/ %{__cp} client/fs_util.py %{buildroot}/%{_datadir}/%{name}/client/ +%{__cp} client/man/* %{buildroot}/%{_mandir}/man1/ %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/ -#%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/ -#%{__mkdir} -p %{buildroot}/%{_bindir} %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/ %{__mkdir} -p %{buildroot}/%{_initrddir} -#%{__mkdir} -p %{buildroot}/%{_datadir}/locale/ %{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt -#%{__mv} client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt -#%{__cp} -adv client/po/* %{buildroot}/%{_datadir}/locale/ - -#find %{buildroot} -name \*.po\* -delete touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid -#%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/ -#%{__install} -d -m 0755 client/icons/ %{buildroot}/%{_datadir}/%{name}/client/icons/ -#%{__cp} -adv client/*.py %{buildroot}/%{_datadir}/%{name}/client/ - # Icons %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/ %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/ @@ -115,13 +106,6 @@ %{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/ %{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png -#%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc -#%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc - -#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py -#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py -#%{__chmod} +x %{buildroot}/%{_initrddir}/smolt - %{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile @@ -169,6 +153,7 @@ %{_bindir}/smoltDeleteProfile %config(noreplace) /%{_sysconfdir}/%{name}/config* %{_sysconfdir}/cron.d/%{name} +%{_mandir}/man1/*gz %{_initrddir}/%{name} %ghost %config(noreplace) %{_sysconfdir}/sysconfig/hw-uuid @@ -188,6 +173,11 @@ %{_bindir}/smoltGui %changelog +* Wed Mar 05 2008 Mike McGrath - 1.1.1-1 +- Upstream released new version +- Manfiles added +- Source location updated + * Wed Feb 27 2008 Jeffrey C. Ollie - 1.1-3 - Copy instead of move cron file so that selinux contexts are set properly. (BZ#435050) Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/F-8/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 14 Feb 2008 19:35:05 -0000 1.20 +++ sources 6 Mar 2008 04:19:34 -0000 1.21 @@ -1 +1 @@ -10e7954f099c196f2e1c5ea3f977b84c smolt-1.1.tar.gz +7ec5dc8f7550be524dfd9467bb59f06c smolt-1.1.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 04:55:01 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Thu, 6 Mar 2008 04:55:01 GMT Subject: rpms/drivel/devel drivel.spec,1.14,1.15 Message-ID: <200803060455.m264t1eu012267@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/drivel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12245 Modified Files: drivel.spec Log Message: * Wed Mar 5 2008 Alex Lancaster - 2.1.1-0.5.20071130svn - Rebuild against libsoup22 compat package Index: drivel.spec =================================================================== RCS file: /cvs/pkgs/rpms/drivel/devel/drivel.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- drivel.spec 19 Feb 2008 19:03:18 -0000 1.14 +++ drivel.spec 6 Mar 2008 04:54:28 -0000 1.15 @@ -4,7 +4,7 @@ Summary: A journal or "blog" client Name: drivel Version: 2.1.1 -Release: 0.4.%{cvsdate}svn%{?dist} +Release: 0.5.%{cvsdate}svn%{?dist} License: GPLv2+ Group: Applications/Internet Url: http://www.dropline.net/drivel @@ -28,7 +28,7 @@ BuildRequires: libgnome-devel BuildRequires: libgnomeui-devel BuildRequires: gtksourceview-devel -BuildRequires: libsoup-devel +BuildRequires: libsoup22-devel BuildRequires: curl-devel BuildRequires: gettext BuildRequires: libtool @@ -129,6 +129,9 @@ %config %{_sysconfdir}/gconf/schemas/* %changelog +* Wed Mar 5 2008 Alex Lancaster - 2.1.1-0.5.20071130svn +- Rebuild against libsoup22 compat package + * Tue Feb 19 2008 Fedora Release Engineering - 2.1.1-0.4.20071130svn - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 05:18:23 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Thu, 6 Mar 2008 05:18:23 GMT Subject: rpms/buoh/devel buoh.spec,1.22,1.23 Message-ID: <200803060518.m265IN2W019791@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/pkgs/rpms/buoh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19760 Modified Files: buoh.spec Log Message: * Wed Mar 5 2008 Alex Lancaster - 0.8.2-4 - Temporarily rebuild against libsoup-22 (#434015) Index: buoh.spec =================================================================== RCS file: /cvs/pkgs/rpms/buoh/devel/buoh.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- buoh.spec 18 Feb 2008 22:29:07 -0000 1.22 +++ buoh.spec 6 Mar 2008 05:17:44 -0000 1.23 @@ -2,12 +2,12 @@ License: GPL Group: Applications/Internet Version: 0.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Online comics reader URL: http://buoh.steve-o.org/ Source: http://buoh.steve-o.org/downloads/buoh-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel +BuildRequires: desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup22-devel, libgnomeui-devel, GConf2-devel Requires(post): GConf2 Requires(postun): GConf2 @@ -81,6 +81,9 @@ %{_datadir}/icons/hicolor/16x16/apps/buoh.png %changelog +* Wed Mar 5 2008 Alex Lancaster - 0.8.2-4 +- Temporarily rebuild against libsoup-22 (#434015) + * Mon Feb 18 2008 Fedora Release Engineering - 0.8.2-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 05:19:08 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Thu, 6 Mar 2008 05:19:08 GMT Subject: rpms/kernel/F-8 kernel.spec, 1.364, 1.365 linux-2.6-drm-radeon-update.patch, 1.3, 1.4 nouveau-drm.patch, 1.6, 1.7 linux-2.6-agp-mm.patch, 1.1, NONE linux-2.6-drm-mm.patch, 1.1, NONE Message-ID: <200803060519.m265J8xn019862@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19785 Modified Files: kernel.spec linux-2.6-drm-radeon-update.patch nouveau-drm.patch Removed Files: linux-2.6-agp-mm.patch linux-2.6-drm-mm.patch Log Message: * Thu Mar 06 2008 Dave Airlie 2.6.24.3-19 - fixup agp/drm patches for F8 kernel Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.364 retrieving revision 1.365 diff -u -r1.364 -r1.365 --- kernel.spec 5 Mar 2008 01:41:44 -0000 1.364 +++ kernel.spec 6 Mar 2008 05:18:18 -0000 1.365 @@ -691,9 +691,6 @@ Patch1520: linux-2.6-dcdbas-autoload.patch -# drm-mm catchup (modesetting, ...) -Patch1801: linux-2.6-drm-mm.patch -Patch1800: linux-2.6-agp-mm.patch # nouveau + drm fixes Patch1802: nouveau-drm.patch Patch1803: linux-2.6-ppc32-ucmpdi2.patch @@ -1042,9 +1039,6 @@ # kill annoying messages ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch -# drm-mm catchup (modesetting, ...) -ApplyPatch linux-2.6-agp-mm.patch -ApplyPatch linux-2.6-drm-mm.patch # Nouveau DRM + drm fixes ApplyPatch nouveau-drm.patch ApplyPatch linux-2.6-ppc32-ucmpdi2.patch @@ -1921,6 +1915,9 @@ %changelog +* Thu Mar 06 2008 Dave Airlie 2.6.24.3-19 +- fixup agp/drm patches for F8 kernel + * Tue Mar 04 2008 John W. Linville 2.6.24.3-18 - libertas: fix sanity check on sequence number in command response - p54: fix EEPROM structure endianness linux-2.6-drm-radeon-update.patch: Index: linux-2.6-drm-radeon-update.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-drm-radeon-update.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-drm-radeon-update.patch 15 Feb 2008 23:58:52 -0000 1.3 +++ linux-2.6-drm-radeon-update.patch 6 Mar 2008 05:18:18 -0000 1.4 @@ -97,10 +97,10 @@ - dev_priv->fb_location = (RADEON_READ(RADEON_MC_FB_LOCATION) - & 0xffff) << 16; -+ dev_priv->fb_location = (radeon_read_fb_location(dev_priv) & 0xffff) << 16; - dev_priv->fb_size = ++ dev_priv->fb_location = (radeon_read_fb_location(dev_priv) & 0xffff) << 16; + dev_priv->fb_size = - ((RADEON_READ(RADEON_MC_FB_LOCATION) & 0xffff0000u) + 0x10000) -+ ((radeon_read_fb_location(dev_priv) & 0xffff0000u) + 0x10000) ++ ((radeon_read_fb_location(dev_priv) & 0xffff0000u) + 0x10000) - dev_priv->fb_location; dev_priv->front_pitch_offset = (((dev_priv->front_pitch / 64) << 22) | nouveau-drm.patch: Index: nouveau-drm.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/nouveau-drm.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nouveau-drm.patch 15 Feb 2008 23:58:54 -0000 1.6 +++ nouveau-drm.patch 6 Mar 2008 05:18:18 -0000 1.7 @@ -4,10 +4,157 @@ Subject: [PATCH] drm: add nouveau latest code --- -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/drm_bufs.c linux-2.6.23.noarch/drivers/char/drm/drm_bufs.c ---- linux-2.6.23.noarch.old/drivers/char/drm/drm_bufs.c 2007-11-26 21:18:35.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/drm_bufs.c 2007-11-26 21:16:13.000000000 -0500 -@@ -49,8 +49,8 @@ unsigned long drm_get_resource_len(struc + drivers/char/drm/Kconfig | 5 + + drivers/char/drm/Makefile | 12 + + drivers/char/drm/drmP.h | 4 +- + drivers/char/drm/drm_bufs.c | 6 +- + drivers/char/drm/drm_irq.c | 3 +- + drivers/char/drm/drm_pciids.h | 262 ++++ + drivers/char/drm/nouveau_dma.c | 177 +++ + drivers/char/drm/nouveau_dma.h | 98 ++ + drivers/char/drm/nouveau_drm.h | 166 ++ + drivers/char/drm/nouveau_drv.c | 96 ++ + drivers/char/drm/nouveau_drv.h | 584 +++++++ + drivers/char/drm/nouveau_fifo.c | 557 +++++++ + drivers/char/drm/nouveau_ioc32.c | 72 + + drivers/char/drm/nouveau_irq.c | 430 ++++++ + drivers/char/drm/nouveau_mem.c | 616 ++++++++ + drivers/char/drm/nouveau_notifier.c | 173 +++ + drivers/char/drm/nouveau_object.c | 1148 ++++++++++++++ + drivers/char/drm/nouveau_reg.h | 538 +++++++ + drivers/char/drm/nouveau_sgdma.c | 311 ++++ + drivers/char/drm/nouveau_state.c | 569 +++++++ + drivers/char/drm/nv04_fb.c | 24 + + drivers/char/drm/nv04_fifo.c | 129 ++ + drivers/char/drm/nv04_graph.c | 415 +++++ + drivers/char/drm/nv04_instmem.c | 160 ++ + drivers/char/drm/nv04_mc.c | 23 + + drivers/char/drm/nv04_timer.c | 45 + + drivers/char/drm/nv10_fb.c | 26 + + drivers/char/drm/nv10_fifo.c | 160 ++ + drivers/char/drm/nv10_graph.c | 777 ++++++++++ + drivers/char/drm/nv20_graph.c | 249 +++ + drivers/char/drm/nv30_graph.c | 2911 +++++++++++++++++++++++++++++++++++ + drivers/char/drm/nv40_fb.c | 56 + + drivers/char/drm/nv40_fifo.c | 208 +++ + drivers/char/drm/nv40_graph.c | 1906 +++++++++++++++++++++++ + drivers/char/drm/nv40_mc.c | 39 + + drivers/char/drm/nv50_fifo.c | 327 ++++ + drivers/char/drm/nv50_graph.c | 316 ++++ + drivers/char/drm/nv50_instmem.c | 320 ++++ + drivers/char/drm/nv50_mc.c | 43 + + 39 files changed, 13957 insertions(+), 4 deletions(-) + create mode 100644 drivers/char/drm/nouveau_dma.c + create mode 100644 drivers/char/drm/nouveau_dma.h + create mode 100644 drivers/char/drm/nouveau_drm.h + create mode 100644 drivers/char/drm/nouveau_drv.c + create mode 100644 drivers/char/drm/nouveau_drv.h + create mode 100644 drivers/char/drm/nouveau_fifo.c + create mode 100644 drivers/char/drm/nouveau_ioc32.c + create mode 100644 drivers/char/drm/nouveau_irq.c + create mode 100644 drivers/char/drm/nouveau_mem.c + create mode 100644 drivers/char/drm/nouveau_notifier.c + create mode 100644 drivers/char/drm/nouveau_object.c + create mode 100644 drivers/char/drm/nouveau_reg.h + create mode 100644 drivers/char/drm/nouveau_sgdma.c + create mode 100644 drivers/char/drm/nouveau_state.c + create mode 100644 drivers/char/drm/nv04_fb.c + create mode 100644 drivers/char/drm/nv04_fifo.c + create mode 100644 drivers/char/drm/nv04_graph.c + create mode 100644 drivers/char/drm/nv04_instmem.c + create mode 100644 drivers/char/drm/nv04_mc.c + create mode 100644 drivers/char/drm/nv04_timer.c + create mode 100644 drivers/char/drm/nv10_fb.c + create mode 100644 drivers/char/drm/nv10_fifo.c + create mode 100644 drivers/char/drm/nv10_graph.c + create mode 100644 drivers/char/drm/nv20_graph.c + create mode 100644 drivers/char/drm/nv30_graph.c + create mode 100644 drivers/char/drm/nv40_fb.c + create mode 100644 drivers/char/drm/nv40_fifo.c + create mode 100644 drivers/char/drm/nv40_graph.c + create mode 100644 drivers/char/drm/nv40_mc.c + create mode 100644 drivers/char/drm/nv50_fifo.c + create mode 100644 drivers/char/drm/nv50_graph.c + create mode 100644 drivers/char/drm/nv50_instmem.c + create mode 100644 drivers/char/drm/nv50_mc.c + +diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig +index 0b7ffa5..0220619 100644 +--- a/drivers/char/drm/Kconfig ++++ b/drivers/char/drm/Kconfig +@@ -106,3 +106,8 @@ config DRM_SAVAGE + Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister + chipset. If M is selected the module will be called savage. + ++config DRM_NOUVEAU ++ tristate "Nvidia video cards" ++ depends on DRM ++ help ++ Choose this for nvidia open source 3d driver +diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile +index 6915a05..f798916 100644 +--- a/drivers/char/drm/Makefile ++++ b/drivers/char/drm/Makefile +@@ -14,6 +14,16 @@ mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o + i810-objs := i810_drv.o i810_dma.o + i830-objs := i830_drv.o i830_dma.o i830_irq.o + i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o ++nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \ ++ nouveau_object.o nouveau_irq.o nouveau_notifier.o \ ++ nouveau_sgdma.o nouveau_dma.o \ ++ nv04_timer.o \ ++ nv04_mc.o nv40_mc.o nv50_mc.o \ ++ nv04_fb.o nv10_fb.o nv40_fb.o \ ++ nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \ ++ nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \ ++ nv40_graph.o nv50_graph.o \ ++ nv04_instmem.o nv50_instmem.o + radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o + sis-objs := sis_drv.o sis_mm.o + savage-objs := savage_drv.o savage_bci.o savage_state.o +@@ -25,6 +35,7 @@ radeon-objs += radeon_ioc32.o + mga-objs += mga_ioc32.o + r128-objs += r128_ioc32.o + i915-objs += i915_ioc32.o ++nouveau-objs += nouveau_ioc32.o + endif + + obj-$(CONFIG_DRM) += drm.o +@@ -35,6 +46,7 @@ obj-$(CONFIG_DRM_MGA) += mga.o + obj-$(CONFIG_DRM_I810) += i810.o + obj-$(CONFIG_DRM_I830) += i830.o + obj-$(CONFIG_DRM_I915) += i915.o ++obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o + obj-$(CONFIG_DRM_SIS) += sis.o + obj-$(CONFIG_DRM_SAVAGE)+= savage.o + obj-$(CONFIG_DRM_VIA) +=via.o +diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h +index 9dd0760..d539c96 100644 +--- a/drivers/char/drm/drmP.h ++++ b/drivers/char/drm/drmP.h +@@ -967,7 +967,8 @@ extern unsigned long drm_get_resource_start(struct drm_device *dev, + unsigned int resource); + extern unsigned long drm_get_resource_len(struct drm_device *dev, + unsigned int resource); +- ++struct drm_map_list *drm_find_matching_map(struct drm_device *dev, ++ drm_local_map_t *map); + /* DMA support (drm_dma.h) */ + extern int drm_dma_setup(struct drm_device *dev); + extern void drm_dma_takedown(struct drm_device *dev); +@@ -979,6 +980,7 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev, + extern int drm_control(struct drm_device *dev, void *data, + struct drm_file *file_priv); + extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS); ++extern int drm_irq_install(struct drm_device * dev); + extern int drm_irq_uninstall(struct drm_device *dev); + extern void drm_driver_irq_preinstall(struct drm_device *dev); + extern void drm_driver_irq_postinstall(struct drm_device *dev); +diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c +index 856774f..7890e08 100644 +--- a/drivers/char/drm/drm_bufs.c ++++ b/drivers/char/drm/drm_bufs.c +@@ -49,8 +49,8 @@ unsigned long drm_get_resource_len(struct drm_device *dev, unsigned int resource EXPORT_SYMBOL(drm_get_resource_len); @@ -18,7 +165,7 @@ { struct drm_map_list *entry; list_for_each_entry(entry, &dev->maplist, head) { -@@ -63,6 +63,7 @@ static struct drm_map_list *drm_find_mat +@@ -63,6 +63,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, return NULL; } @@ -26,10 +173,19 @@ static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash, unsigned long user_token, int hashed_handle) -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/drm_irq.c linux-2.6.23.noarch/drivers/char/drm/drm_irq.c ---- linux-2.6.23.noarch.old/drivers/char/drm/drm_irq.c 2007-11-26 21:18:35.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/drm_irq.c 2007-11-26 21:16:13.000000000 -0500 -@@ -81,7 +81,7 @@ int drm_irq_by_busid(struct drm_device * +@@ -429,6 +430,7 @@ int drm_rmmap(struct drm_device *dev, drm_local_map_t *map) + + return ret; + } ++EXPORT_SYMBOL(drm_rmmap); + + /* The rmmap ioctl appears to be unnecessary. All mappings are torn down on + * the last close of the device, and this is necessary for cleanup when things +diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c +index 05eae63..c091729 100644 +--- a/drivers/char/drm/drm_irq.c ++++ b/drivers/char/drm/drm_irq.c +@@ -81,7 +81,7 @@ int drm_irq_by_busid(struct drm_device *dev, void *data, * \c drm_driver_irq_preinstall() and \c drm_driver_irq_postinstall() functions * before and after the installation. */ @@ -38,7 +194,7 @@ { int ret; unsigned long sh_flags = 0; -@@ -141,6 +141,7 @@ static int drm_irq_install(struct drm_de +@@ -141,6 +141,7 @@ static int drm_irq_install(struct drm_device * dev) return 0; } @@ -46,14 +202,14 @@ /** * Uninstall the IRQ handler. -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/drm_pciids.h linux-2.6.23.noarch/drivers/char/drm/drm_pciids.h ---- linux-2.6.23.noarch.old/drivers/char/drm/drm_pciids.h 2007-11-26 21:18:35.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/drm_pciids.h 2007-11-26 21:24:20.000000000 -0500 -@@ -311,3 +311,265 @@ - {0x8086, 0x2a02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ +diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h +index 30b200b..a59f999 100644 +--- a/drivers/char/drm/drm_pciids.h ++++ b/drivers/char/drm/drm_pciids.h +@@ -314,3 +314,265 @@ {0x8086, 0x2a12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0, 0, 0} -+ + +#define nouveau_PCI_IDS \ + {0x10de, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NV_03}, \ + {0x10de, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NV_03}, \ @@ -315,80 +471,12 @@ + {0x12d2, 0x002c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NV_04}, \ + {0x12d2, 0x00a0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NV_04}, \ + {0, 0, 0} -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/drmP.h linux-2.6.23.noarch/drivers/char/drm/drmP.h ---- linux-2.6.23.noarch.old/drivers/char/drm/drmP.h 2007-11-26 21:18:35.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/drmP.h 2007-11-26 21:16:13.000000000 -0500 -@@ -1030,7 +1030,8 @@ extern unsigned long drm_get_resource_st - unsigned int resource); - extern unsigned long drm_get_resource_len(struct drm_device *dev, - unsigned int resource); -- -+struct drm_map_list *drm_find_matching_map(struct drm_device *dev, -+ drm_local_map_t *map); - /* DMA support (drm_dma.h) */ - extern int drm_dma_setup(struct drm_device *dev); - extern void drm_dma_takedown(struct drm_device *dev); -@@ -1042,6 +1043,7 @@ extern void drm_core_reclaim_buffers(str - extern int drm_control(struct drm_device *dev, void *data, - struct drm_file *file_priv); - extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS); -+extern int drm_irq_install(struct drm_device * dev); - extern int drm_irq_uninstall(struct drm_device *dev); - extern void drm_driver_irq_preinstall(struct drm_device *dev); - extern void drm_driver_irq_postinstall(struct drm_device *dev); -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/Kconfig linux-2.6.23.noarch/drivers/char/drm/Kconfig ---- linux-2.6.23.noarch.old/drivers/char/drm/Kconfig 2007-11-26 21:18:35.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/Kconfig 2007-11-26 21:20:41.000000000 -0500 -@@ -105,3 +105,10 @@ config DRM_SAVAGE - help - Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister - chipset. If M is selected the module will be called savage. + -+config DRM_NOUVEAU -+ tristate "Nvidia video cards" -+ depends on DRM -+ help -+ Choose this for nvidia open source 3d driver -+ -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/Makefile linux-2.6.23.noarch/drivers/char/drm/Makefile ---- linux-2.6.23.noarch.old/drivers/char/drm/Makefile 2007-11-26 21:18:35.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/Makefile 2007-11-26 21:21:50.000000000 -0500 -@@ -15,6 +15,16 @@ mga-objs := mga_drv.o mga_dma.o mga_s - i810-objs := i810_drv.o i810_dma.o - i830-objs := i830_drv.o i830_dma.o i830_irq.o - i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o i915_buffer.o -+nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \ -+ nouveau_object.o nouveau_irq.o nouveau_notifier.o \ -+ nouveau_sgdma.o nouveau_dma.o \ -+ nv04_timer.o \ -+ nv04_mc.o nv40_mc.o nv50_mc.o \ -+ nv04_fb.o nv10_fb.o nv40_fb.o \ -+ nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \ -+ nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \ -+ nv40_graph.o nv50_graph.o \ -+ nv04_instmem.o nv50_instmem.o - radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o - sis-objs := sis_drv.o sis_mm.o - savage-objs := savage_drv.o savage_bci.o savage_state.o -@@ -26,6 +36,7 @@ radeon-objs += radeon_ioc32.o - mga-objs += mga_ioc32.o - r128-objs += r128_ioc32.o - i915-objs += i915_ioc32.o -+nouveau-objs += nouveau_ioc32.o - endif - - obj-$(CONFIG_DRM) += drm.o -@@ -36,6 +47,7 @@ obj-$(CONFIG_DRM_MGA) += mga.o - obj-$(CONFIG_DRM_I810) += i810.o - obj-$(CONFIG_DRM_I830) += i830.o - obj-$(CONFIG_DRM_I915) += i915.o -+obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o - obj-$(CONFIG_DRM_SIS) += sis.o - obj-$(CONFIG_DRM_SAVAGE)+= savage.o - obj-$(CONFIG_DRM_VIA) +=via.o -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_dma.c linux-2.6.23.noarch/drivers/char/drm/nouveau_dma.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_dma.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_dma.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_dma.c b/drivers/char/drm/nouveau_dma.c +new file mode 100644 +index 0000000..ab502e6 +--- /dev/null ++++ b/drivers/char/drm/nouveau_dma.c @@ -0,0 +1,177 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -567,9 +655,11 @@ + return 0; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_dma.h linux-2.6.23.noarch/drivers/char/drm/nouveau_dma.h ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_dma.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_dma.h 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_dma.h b/drivers/char/drm/nouveau_dma.h +new file mode 100644 +index 0000000..5e51c1c +--- /dev/null ++++ b/drivers/char/drm/nouveau_dma.h @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -669,9 +759,11 @@ + +#endif + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drm.h linux-2.6.23.noarch/drivers/char/drm/nouveau_drm.h ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drm.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_drm.h 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_drm.h b/drivers/char/drm/nouveau_drm.h +new file mode 100644 +index 0000000..bfc9bd4 +--- /dev/null ++++ b/drivers/char/drm/nouveau_drm.h @@ -0,0 +1,166 @@ +/* + * Copyright 2005 Stephane Marchesin. @@ -839,9 +931,11 @@ + +#endif /* __NOUVEAU_DRM_H__ */ + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drv.c linux-2.6.23.noarch/drivers/char/drm/nouveau_drv.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_drv.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_drv.c b/drivers/char/drm/nouveau_drv.c +new file mode 100644 +index 0000000..387e3d6 +--- /dev/null ++++ b/drivers/char/drm/nouveau_drv.c @@ -0,0 +1,96 @@ +/* + * Copyright 2005 Stephane Marchesin. @@ -939,9 +1033,11 @@ +MODULE_AUTHOR(DRIVER_AUTHOR); +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_LICENSE("GPL and additional rights"); -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drv.h linux-2.6.23.noarch/drivers/char/drm/nouveau_drv.h ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drv.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_drv.h 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_drv.h b/drivers/char/drm/nouveau_drv.h +new file mode 100644 +index 0000000..2a16d3b +--- /dev/null ++++ b/drivers/char/drm/nouveau_drv.h @@ -0,0 +1,584 @@ +/* + * Copyright 2005 Stephane Marchesin. @@ -1527,9 +1623,11 @@ + +#endif /* __NOUVEAU_DRV_H__ */ + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_fifo.c linux-2.6.23.noarch/drivers/char/drm/nouveau_fifo.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_fifo.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_fifo.c b/drivers/char/drm/nouveau_fifo.c +new file mode 100644 +index 0000000..1aa724f +--- /dev/null ++++ b/drivers/char/drm/nouveau_fifo.c @@ -0,0 +1,557 @@ +/* + * Copyright 2005-2006 Stephane Marchesin @@ -2088,9 +2186,11 @@ +}; + +int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls); -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_ioc32.c linux-2.6.23.noarch/drivers/char/drm/nouveau_ioc32.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_ioc32.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_ioc32.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_ioc32.c b/drivers/char/drm/nouveau_ioc32.c +new file mode 100644 +index 0000000..f55ae7a +--- /dev/null ++++ b/drivers/char/drm/nouveau_ioc32.c @@ -0,0 +1,72 @@ +/** + * \file mga_ioc32.c @@ -2164,9 +2264,11 @@ + + return ret; +} -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_irq.c linux-2.6.23.noarch/drivers/char/drm/nouveau_irq.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_irq.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_irq.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_irq.c b/drivers/char/drm/nouveau_irq.c +new file mode 100644 +index 0000000..e64677e +--- /dev/null ++++ b/drivers/char/drm/nouveau_irq.c @@ -0,0 +1,430 @@ +/* + * Copyright (C) 2006 Ben Skeggs. @@ -2598,9 +2700,11 @@ + return IRQ_HANDLED; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_mem.c linux-2.6.23.noarch/drivers/char/drm/nouveau_mem.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_mem.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_mem.c b/drivers/char/drm/nouveau_mem.c +new file mode 100644 +index 0000000..1394df5 +--- /dev/null ++++ b/drivers/char/drm/nouveau_mem.c @@ -0,0 +1,616 @@ +/* + * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. @@ -3218,9 +3322,11 @@ +} + + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_notifier.c linux-2.6.23.noarch/drivers/char/drm/nouveau_notifier.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_notifier.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_notifier.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_notifier.c b/drivers/char/drm/nouveau_notifier.c +new file mode 100644 +index 0000000..71b8cbe +--- /dev/null ++++ b/drivers/char/drm/nouveau_notifier.c @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -3395,9 +3501,11 @@ + return 0; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_object.c linux-2.6.23.noarch/drivers/char/drm/nouveau_object.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_object.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_object.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_object.c b/drivers/char/drm/nouveau_object.c +new file mode 100644 +index 0000000..fbce770 +--- /dev/null ++++ b/drivers/char/drm/nouveau_object.c @@ -0,0 +1,1148 @@ +/* + * Copyright (C) 2006 Ben Skeggs. @@ -4547,9 +4655,11 @@ + return 0; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_reg.h linux-2.6.23.noarch/drivers/char/drm/nouveau_reg.h ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_reg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_reg.h 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_reg.h b/drivers/char/drm/nouveau_reg.h +new file mode 100644 +index 0000000..a1895c3 +--- /dev/null ++++ b/drivers/char/drm/nouveau_reg.h @@ -0,0 +1,538 @@ + + @@ -5089,9 +5199,11 @@ +#define NV40_RAMFC_UNK_4C 0x4C +#define NV40_RAMFC_UNK_50 0x50 + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_sgdma.c linux-2.6.23.noarch/drivers/char/drm/nouveau_sgdma.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_sgdma.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_sgdma.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_sgdma.c b/drivers/char/drm/nouveau_sgdma.c +new file mode 100644 +index 0000000..3b3d8f9 +--- /dev/null ++++ b/drivers/char/drm/nouveau_sgdma.c @@ -0,0 +1,311 @@ +#include "drmP.h" +#include "nouveau_drv.h" @@ -5404,9 +5516,11 @@ + return -EINVAL; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_state.c linux-2.6.23.noarch/drivers/char/drm/nouveau_state.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_state.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_state.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nouveau_state.c b/drivers/char/drm/nouveau_state.c +new file mode 100644 +index 0000000..7ab7f7d +--- /dev/null ++++ b/drivers/char/drm/nouveau_state.c @@ -0,0 +1,569 @@ +/* + * Copyright 2005 Stephane Marchesin @@ -5977,9 +6091,11 @@ +} + + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_fb.c linux-2.6.23.noarch/drivers/char/drm/nv04_fb.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_fb.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv04_fb.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv04_fb.c b/drivers/char/drm/nv04_fb.c +new file mode 100644 +index 0000000..534fb50 +--- /dev/null ++++ b/drivers/char/drm/nv04_fb.c @@ -0,0 +1,24 @@ +#include "drmP.h" +#include "drm.h" @@ -6005,9 +6121,11 @@ +{ +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_fifo.c linux-2.6.23.noarch/drivers/char/drm/nv04_fifo.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv04_fifo.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv04_fifo.c b/drivers/char/drm/nv04_fifo.c +new file mode 100644 +index 0000000..d750ced +--- /dev/null ++++ b/drivers/char/drm/nv04_fifo.c @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -6138,9 +6256,11 @@ + return 0; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_graph.c linux-2.6.23.noarch/drivers/char/drm/nv04_graph.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_graph.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv04_graph.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv04_graph.c b/drivers/char/drm/nv04_graph.c +new file mode 100644 +index 0000000..050f6e8 +--- /dev/null ++++ b/drivers/char/drm/nv04_graph.c @@ -0,0 +1,415 @@ +/* + * Copyright 2007 Stephane Marchesin @@ -6557,9 +6677,11 @@ +{ +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_instmem.c linux-2.6.23.noarch/drivers/char/drm/nv04_instmem.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_instmem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv04_instmem.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv04_instmem.c b/drivers/char/drm/nv04_instmem.c +new file mode 100644 +index 0000000..fed6ff7 +--- /dev/null ++++ b/drivers/char/drm/nv04_instmem.c @@ -0,0 +1,160 @@ +#include "drmP.h" +#include "drm.h" @@ -6721,9 +6843,11 @@ + return 0; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_mc.c linux-2.6.23.noarch/drivers/char/drm/nv04_mc.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_mc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv04_mc.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv04_mc.c b/drivers/char/drm/nv04_mc.c +new file mode 100644 +index 0000000..eee0c50 +--- /dev/null ++++ b/drivers/char/drm/nv04_mc.c @@ -0,0 +1,23 @@ +#include "drmP.h" +#include "drm.h" @@ -6748,9 +6872,11 @@ +{ +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_timer.c linux-2.6.23.noarch/drivers/char/drm/nv04_timer.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_timer.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv04_timer.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv04_timer.c b/drivers/char/drm/nv04_timer.c +new file mode 100644 +index 0000000..08a27f4 +--- /dev/null ++++ b/drivers/char/drm/nv04_timer.c @@ -0,0 +1,45 @@ +#include "drmP.h" +#include "drm.h" @@ -6797,9 +6923,11 @@ +{ +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv10_fb.c linux-2.6.23.noarch/drivers/char/drm/nv10_fb.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv10_fb.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv10_fb.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv10_fb.c b/drivers/char/drm/nv10_fb.c +new file mode 100644 +index 0000000..7fff5b3 +--- /dev/null ++++ b/drivers/char/drm/nv10_fb.c @@ -0,0 +1,26 @@ +#include "drmP.h" +#include "drm.h" @@ -6827,9 +6955,11 @@ +{ +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv10_fifo.c linux-2.6.23.noarch/drivers/char/drm/nv10_fifo.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv10_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv10_fifo.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv10_fifo.c b/drivers/char/drm/nv10_fifo.c +new file mode 100644 +index 0000000..c86725d +--- /dev/null ++++ b/drivers/char/drm/nv10_fifo.c @@ -0,0 +1,160 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -6991,9 +7121,11 @@ + return 0; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv10_graph.c linux-2.6.23.noarch/drivers/char/drm/nv10_graph.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv10_graph.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv10_graph.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv10_graph.c b/drivers/char/drm/nv10_graph.c +new file mode 100644 +index 0000000..e470ff0 +--- /dev/null ++++ b/drivers/char/drm/nv10_graph.c @@ -0,0 +1,777 @@ +/* + * Copyright 2007 Matthieu CASTET @@ -7772,9 +7904,11 @@ +{ +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv20_graph.c linux-2.6.23.noarch/drivers/char/drm/nv20_graph.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv20_graph.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv20_graph.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv20_graph.c b/drivers/char/drm/nv20_graph.c +new file mode 100644 +index 0000000..c163daf +--- /dev/null ++++ b/drivers/char/drm/nv20_graph.c @@ -0,0 +1,249 @@ +/* + * Copyright 2007 Matthieu CASTET @@ -8025,9 +8159,11 @@ + nouveau_gpuobj_ref_del(dev, &dev_priv->ctx_table); +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv30_graph.c linux-2.6.23.noarch/drivers/char/drm/nv30_graph.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv30_graph.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv30_graph.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv30_graph.c b/drivers/char/drm/nv30_graph.c +new file mode 100644 +index 0000000..ca43bb9 +--- /dev/null ++++ b/drivers/char/drm/nv30_graph.c @@ -0,0 +1,2911 @@ +/* + * Based on nv40_graph.c @@ -10940,9 +11076,11 @@ + nouveau_gpuobj_ref_del(dev, &dev_priv->ctx_table); +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv40_fb.c linux-2.6.23.noarch/drivers/char/drm/nv40_fb.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv40_fb.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv40_fb.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv40_fb.c b/drivers/char/drm/nv40_fb.c +new file mode 100644 +index 0000000..2cbb40e +--- /dev/null ++++ b/drivers/char/drm/nv40_fb.c @@ -0,0 +1,56 @@ +#include "drmP.h" +#include "drm.h" @@ -11000,9 +11138,11 @@ +{ +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv40_fifo.c linux-2.6.23.noarch/drivers/char/drm/nv40_fifo.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv40_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv40_fifo.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv40_fifo.c b/drivers/char/drm/nv40_fifo.c +new file mode 100644 +index 0000000..ce3f8fd +--- /dev/null ++++ b/drivers/char/drm/nv40_fifo.c @@ -0,0 +1,208 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -11212,9 +11352,11 @@ + return 0; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv40_graph.c linux-2.6.23.noarch/drivers/char/drm/nv40_graph.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv40_graph.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv40_graph.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv40_graph.c b/drivers/char/drm/nv40_graph.c +new file mode 100644 +index 0000000..26237c7 +--- /dev/null ++++ b/drivers/char/drm/nv40_graph.c @@ -0,0 +1,1906 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -13122,9 +13264,11 @@ +{ +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv40_mc.c linux-2.6.23.noarch/drivers/char/drm/nv40_mc.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv40_mc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv40_mc.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv40_mc.c b/drivers/char/drm/nv40_mc.c +new file mode 100644 +index 0000000..c7db902 +--- /dev/null ++++ b/drivers/char/drm/nv40_mc.c @@ -0,0 +1,39 @@ +#include "drmP.h" +#include "drm.h" @@ -13165,9 +13309,11 @@ +{ +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv50_fifo.c linux-2.6.23.noarch/drivers/char/drm/nv50_fifo.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv50_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv50_fifo.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv50_fifo.c b/drivers/char/drm/nv50_fifo.c +new file mode 100644 +index 0000000..7859544 +--- /dev/null ++++ b/drivers/char/drm/nv50_fifo.c @@ -0,0 +1,327 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -13496,9 +13642,11 @@ + return 0; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv50_graph.c linux-2.6.23.noarch/drivers/char/drm/nv50_graph.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv50_graph.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv50_graph.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv50_graph.c b/drivers/char/drm/nv50_graph.c +new file mode 100644 +index 0000000..e5bbf65 +--- /dev/null ++++ b/drivers/char/drm/nv50_graph.c @@ -0,0 +1,316 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -13816,9 +13964,11 @@ + return nv50_graph_transfer_context(dev, inst, 1); +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv50_instmem.c linux-2.6.23.noarch/drivers/char/drm/nv50_instmem.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv50_instmem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv50_instmem.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv50_instmem.c b/drivers/char/drm/nv50_instmem.c +new file mode 100644 +index 0000000..1eeb54d +--- /dev/null ++++ b/drivers/char/drm/nv50_instmem.c @@ -0,0 +1,320 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -14140,9 +14290,11 @@ + return 0; +} + -diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv50_mc.c linux-2.6.23.noarch/drivers/char/drm/nv50_mc.c ---- linux-2.6.23.noarch.old/drivers/char/drm/nv50_mc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.23.noarch/drivers/char/drm/nv50_mc.c 2007-11-26 21:16:13.000000000 -0500 +diff --git a/drivers/char/drm/nv50_mc.c b/drivers/char/drm/nv50_mc.c +new file mode 100644 +index 0000000..b111826 +--- /dev/null ++++ b/drivers/char/drm/nv50_mc.c @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2007 Ben Skeggs. @@ -14187,3 +14339,6 @@ +void nv50_mc_takedown(struct drm_device *dev) +{ +} +-- +1.5.2.5 + --- linux-2.6-agp-mm.patch DELETED --- --- linux-2.6-drm-mm.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 05:32:06 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 6 Mar 2008 05:32:06 GMT Subject: rpms/kernel/devel kernel.spec, 1.477, 1.478 linux-2.6-firewire-git-pending.patch, 1.11, 1.12 Message-ID: <200803060532.m265W6wf020072@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20047 Modified Files: kernel.spec linux-2.6-firewire-git-pending.patch Log Message: * Wed Mar 05 2008 Jarod Wilson - firewire-sbp2: improved ability to reconnect to devices following a bus reset - firewire-sbp2: set proper I/O retry limits in SBP-2 devices Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.477 retrieving revision 1.478 diff -u -r1.477 -r1.478 --- kernel.spec 5 Mar 2008 15:12:35 -0000 1.477 +++ kernel.spec 6 Mar 2008 05:31:30 -0000 1.478 @@ -1754,6 +1754,11 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Wed Mar 05 2008 Jarod Wilson +- firewire-sbp2: improved ability to reconnect to devices + following a bus reset +- firewire-sbp2: set proper I/O retry limits in SBP-2 devices + * Wed Mar 05 2008 Kyle McMartin - Linux 2.6.25-rc4 linux-2.6-firewire-git-pending.patch: Index: linux-2.6-firewire-git-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux-2.6-firewire-git-pending.patch 3 Mar 2008 21:12:45 -0000 1.11 +++ linux-2.6-firewire-git-pending.patch 6 Mar 2008 05:31:30 -0000 1.12 @@ -485,3 +485,216 @@ http://arcgraph.de/sr/ +Increase reconnect management orb timeout value. + +Signed-off-by: Jarod Wilson +--- + + drivers/firewire/fw-sbp2.c | 15 +++++++++++++-- + 1 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c +index d6d62c6..da315cf 100644 +--- a/drivers/firewire/fw-sbp2.c ++++ b/drivers/firewire/fw-sbp2.c +@@ -170,6 +170,7 @@ struct sbp2_target { + */ + #define SBP2_MIN_LOGIN_ORB_TIMEOUT 5000U /* Timeout in ms */ + #define SBP2_MAX_LOGIN_ORB_TIMEOUT 40000U /* Timeout in ms */ ++#define SBP2_MAX_RECONNECT_ORB_TIMEOUT 6000U /* Timeout in ms */ + #define SBP2_ORB_TIMEOUT 2000U /* Timeout in ms */ + #define SBP2_ORB_NULL 0x80000000 + #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 +@@ -538,14 +539,24 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, + orb->request.status_fifo.low = + cpu_to_be32(lu->address_handler.offset); + +- if (function == SBP2_LOGIN_REQUEST) { ++ switch (function) { ++ ++ case SBP2_LOGIN_REQUEST: + /* Ask for 2^2 == 4 seconds reconnect grace period */ + orb->request.misc |= cpu_to_be32( + MANAGEMENT_ORB_RECONNECT(2) | + MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login)); + timeout = lu->tgt->mgt_orb_timeout; +- } else { ++ break; ++ ++ case SBP2_RECONNECT_REQUEST: ++ timeout = min(SBP2_MAX_RECONNECT_ORB_TIMEOUT, ++ lu->tgt->mgt_orb_timeout); ++ break; ++ ++ default: + timeout = SBP2_ORB_TIMEOUT; ++ break; + } + + init_completion(&orb->done); +Per the SBP-2 specification, all SBP-2 target devices must have a BUSY_TIMEOUT +register. Per the 1394-1995 specification, the retry_limt portion of the +register should be set to 0x0 initially, and set on the target by a logged in +initiator (i.e., a Linux host w/firewire controller(s)). + +Well, as it turns out, lots of devices these days have actually moved on to +starting to implement SBP-3 compliance, which says that retry_limit should +default to 0xf instead (yes, SBP-3 stomps directly on 1394-1995, oops). + +Prior to this change, the firewire driver stack didn't touch retry_limit, and +any SBP-3 compliant device worked fine, while SBP-2 compliant ones were unable +to retransmit when the host returned an ack_busy_X, which resulted in stalled +out I/O, eventually causing the SCSI layer to give up and offline the device. + +The simple fix is for us to set retry_limit to 0xf in the register for all +devices (which actually matches what the old ieee1394 stack did). + +Prior to this change, a hard disk behind an SBP-2 Prolific PL-3507 bridge chip +would routinely encounter buffer I/O errors and wind up offlined by the SCSI +layer. With this change, I've encountered zero I/O failures moving tens of GB +of data around. + +Signed-off-by: Jarod Wilson + +--- + + drivers/firewire/fw-sbp2.c | 34 ++++++++++++++++++++++++++++++---- + 1 files changed, 30 insertions(+), 4 deletions(-) + +diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c +index 9813642..05559bb 100644 +--- a/drivers/firewire/fw-sbp2.c ++++ b/drivers/firewire/fw-sbp2.c +@@ -174,6 +174,7 @@ struct sbp2_target { + #define SBP2_ORB_TIMEOUT 2000U /* Timeout in ms */ + #define SBP2_ORB_NULL 0x80000000 + #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 ++#define SBP2_RETRY_LIMIT 0xf + + /* Unit directory keys */ + #define SBP2_CSR_UNIT_CHARACTERISTICS 0x3a +@@ -192,6 +193,9 @@ struct sbp2_target { + #define SBP2_LOGICAL_UNIT_RESET 0xe + #define SBP2_TARGET_RESET_REQUEST 0xf + ++/* Offset to transaction layer BUSY_TIMEOUT register (SBP-2 spec, seciton 6.2 */ ++#define SBP2_BUSY_TIMEOUT 0x210 ++ + /* Offsets for command block agent registers */ + #define SBP2_AGENT_STATE 0x00 + #define SBP2_AGENT_RESET 0x04 +@@ -811,6 +815,30 @@ static void sbp2_target_put(struct sbp2_target *tgt) + kref_put(&tgt->kref, sbp2_release_target); + } + ++static void ++complete_set_busy_timeout(struct fw_card *card, int rcode, ++ void *payload, size_t length, void *done) ++{ ++ complete(done); ++} ++ ++static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu) ++{ ++ struct fw_device *device = fw_device(lu->tgt->unit->device.parent); ++ DECLARE_COMPLETION_ONSTACK(done); ++ struct fw_transaction t; ++ static u32 busy_timeout; ++ ++ /* FIXME: should we try to set cycle_limit and second_limit too? */ ++ busy_timeout = cpu_to_be32(SBP2_RETRY_LIMIT); ++ ++ fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST, ++ lu->tgt->node_id, lu->generation, device->max_speed, ++ CSR_REGISTER_BASE + SBP2_BUSY_TIMEOUT, &busy_timeout, ++ sizeof(busy_timeout), complete_set_busy_timeout, &done); ++ wait_for_completion(&done); ++} ++ + static void sbp2_reconnect(struct work_struct *work); + + static void sbp2_login(struct work_struct *work) +@@ -862,10 +890,8 @@ static void sbp2_login(struct work_struct *work) + fw_notify("%s: logged in to LUN %04x (%d retries)\n", + tgt->bus_id, lu->lun, lu->retries); + +-#if 0 +- /* FIXME: The linux1394 sbp2 does this last step. */ +- sbp2_set_busy_timeout(scsi_id); +-#endif ++ /* set appropriate retry limit(s) in BUSY_TIMEOUT register */ ++ sbp2_set_busy_timeout(lu); + + PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect); + sbp2_agent_reset(lu); + + + +Try to write dual-phase retry protocol limits to BUSY_TIMEOUT register. +- The dual-phase retry protocol is optional to implement, and if not + supported, writes to the dual-phase portion of the register will be + ignored. We try to write the original 1394-1995 default here. +- In the case of devices that are also SBP-3-compliant, all writes are + ignored, as the register is read-only, but contains single-phase retry of + 15, which is what we're trying to set for all SBP-2 device anyway, so this + write attempt is safe and yields more consistent behavior for all devices. + +See section 8.3.2.3.5 of the 1394-1995 spec, section 6.2 of the SBP-2 spec, +and section 6.4 of the SBP-3 spec for further details. + +Signed-off-by: Jarod Wilson +--- + + drivers/firewire/fw-sbp2.c | 22 +++++++++++++++++++--- + 1 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c +index 05559bb..5adb38c 100644 +--- a/drivers/firewire/fw-sbp2.c ++++ b/drivers/firewire/fw-sbp2.c +@@ -174,7 +174,8 @@ struct sbp2_target { + #define SBP2_ORB_TIMEOUT 2000U /* Timeout in ms */ + #define SBP2_ORB_NULL 0x80000000 + #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 +-#define SBP2_RETRY_LIMIT 0xf ++#define SBP2_RETRY_LIMIT 0xf /* 15 retries */ ++#define SBP2_CYCLE_LIMIT (0xc8 << 12) /* 200 125us cycles */ + + /* Unit directory keys */ + #define SBP2_CSR_UNIT_CHARACTERISTICS 0x3a +@@ -822,6 +823,22 @@ complete_set_busy_timeout(struct fw_card *card, int rcode, + complete(done); + } + ++/* ++ * Write retransmit retry values into the BUSY_TIMEOUT register. ++ * - The single-phase retry protocol is supported by all SBP-2 devices, but the ++ * default retry_limit value is 0 (i.e. never retry transmission). We write a ++ * saner value after logging into the device. ++ * - The dual-phase retry protocol is optional to implement, and if not ++ * supported, writes to the dual-phase portion of the register will be ++ * ignored. We try to write the original 1394-1995 default here. ++ * - In the case of devices that are also SBP-3-compliant, all writes are ++ * ignored, as the register is read-only, but contains single-phase retry of ++ * 15, which is what we're trying to set for all SBP-2 device anyway, so this ++ * write attempt is safe and yields more consistent behavior for all devices. ++ * ++ * See section 8.3.2.3.5 of the 1394-1995 spec, section 6.2 of the SBP-2 spec, ++ * and section 6.4 of the SBP-3 spec for further details. ++ */ + static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu) + { + struct fw_device *device = fw_device(lu->tgt->unit->device.parent); +@@ -829,8 +846,7 @@ static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu) + struct fw_transaction t; + static u32 busy_timeout; + +- /* FIXME: should we try to set cycle_limit and second_limit too? */ +- busy_timeout = cpu_to_be32(SBP2_RETRY_LIMIT); ++ busy_timeout = cpu_to_be32(SBP2_CYCLE_LIMIT | SBP2_RETRY_LIMIT); + + fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST, + lu->tgt->node_id, lu->generation, device->max_speed, + + + From fedora-extras-commits at redhat.com Thu Mar 6 05:38:08 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Thu, 6 Mar 2008 05:38:08 GMT Subject: rpms/kernel/devel linux-2.6-drm-i915-modeset.patch, NONE, 1.1 kernel.spec, 1.478, 1.479 Message-ID: <200803060538.m265c8RT020203@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20171 Modified Files: kernel.spec Added Files: linux-2.6-drm-i915-modeset.patch Log Message: * Thu Mar 06 2008 Dave Airlie - Add initial i915 drm modesetting tree - needs i915.modeset=1 on command line + new libdrm + new intel driver to actually be useful linux-2.6-drm-i915-modeset.patch: --- NEW FILE linux-2.6-drm-i915-modeset.patch --- diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile index 721548c..2190a4c 100644 --- a/drivers/char/drm/Makefile +++ b/drivers/char/drm/Makefile @@ -7,14 +7,15 @@ drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \ drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \ drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \ drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o drm_object.o \ - drm_fence.o drm_ttm.o drm_bo.o drm_bo_move.o drm_bo_lock.o + drm_fence.o drm_ttm.o drm_bo.o drm_bo_move.o drm_bo_lock.o \ + drm_modes.o drm_crtc.o drm_edid.o tdfx-objs := tdfx_drv.o r128-objs := r128_drv.o r128_cce.o r128_state.o r128_irq.o mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o i810-objs := i810_drv.o i810_dma.o i830-objs := i830_drv.o i830_dma.o i830_irq.o -i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o i915_buffer.o +i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o i915_buffer.o i915_init.o intel_display.o intel_lvds.o intel_crt.o intel_i2c.o intel_modes.o intel_sdvo.o intel_tv.o intel_fb.o nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \ nouveau_object.o nouveau_irq.o nouveau_notifier.o nouveau_swmthd.o \ nouveau_sgdma.o nouveau_dma.o nouveau_buffer.o nouveau_fence.o \ diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h index 8fe8ac1..8f1c8d4 100644 --- a/drivers/char/drm/drm.h +++ b/drivers/char/drm/drm.h @@ -884,6 +884,185 @@ struct drm_mm_init_arg { uint64_t p_size; }; +struct drm_mm_info_arg { + unsigned int mem_type; + uint64_t p_size; +}; + + +/* + * Drm mode setting + */ +#define DRM_DISPLAY_INFO_LEN 32 +#define DRM_OUTPUT_NAME_LEN 32 +#define DRM_DISPLAY_MODE_LEN 32 +#define DRM_PROP_NAME_LEN 32 + +#define DRM_MODE_TYPE_BUILTIN (1<<0) +#define DRM_MODE_TYPE_CLOCK_C ((1<<1) | DRM_MODE_TYPE_BUILTIN) +#define DRM_MODE_TYPE_CRTC_C ((1<<2) | DRM_MODE_TYPE_BUILTIN) +#define DRM_MODE_TYPE_PREFERRED (1<<3) +#define DRM_MODE_TYPE_DEFAULT (1<<4) +#define DRM_MODE_TYPE_USERDEF (1<<5) +#define DRM_MODE_TYPE_DRIVER (1<<6) + +struct drm_mode_modeinfo { + unsigned int clock; + unsigned short hdisplay, hsync_start, hsync_end, htotal, hskew; + unsigned short vdisplay, vsync_start, vsync_end, vtotal, vscan; + + unsigned int vrefresh; /* vertical refresh * 1000 */ + + unsigned int flags; + unsigned int type; + char name[DRM_DISPLAY_MODE_LEN]; +}; + +struct drm_mode_card_res { + uint64_t fb_id_ptr; + uint64_t crtc_id_ptr; + uint64_t output_id_ptr; + int count_fbs; + int count_crtcs; + int count_outputs; + int min_width, max_width; + int min_height, max_height; +}; + +struct drm_mode_crtc { + uint64_t set_outputs_ptr; + + unsigned int crtc_id; /**< Id */ + unsigned int fb_id; /**< Id of framebuffer */ + + int x, y; /**< Position on the frameuffer */ + + int count_outputs; + unsigned int outputs; /**< Outputs that are connected */ + + int count_possibles; + unsigned int possibles; /**< Outputs that can be connected */ + int gamma_size; + int mode_valid; + struct drm_mode_modeinfo mode; +}; + +#define DRM_MODE_OUTPUT_NONE 0 +#define DRM_MODE_OUTPUT_DAC 1 +#define DRM_MODE_OUTPUT_TMDS 2 +#define DRM_MODE_OUTPUT_LVDS 3 +#define DRM_MODE_OUTPUT_TVDAC 4 + +struct drm_mode_get_output { + + uint64_t modes_ptr; + uint64_t props_ptr; + uint64_t prop_values_ptr; + + int count_modes; + int count_props; + unsigned int output; /**< Id */ + unsigned int crtc; /**< Id of crtc */ + unsigned int output_type; + unsigned int output_type_id; + + unsigned int connection; + unsigned int mm_width, mm_height; /**< HxW in millimeters */ + unsigned int subpixel; + int count_crtcs; + int count_clones; + unsigned int crtcs; /**< possible crtc to connect to */ + unsigned int clones; /**< list of clones */ +}; + +#define DRM_MODE_PROP_PENDING (1<<0) +#define DRM_MODE_PROP_RANGE (1<<1) +#define DRM_MODE_PROP_IMMUTABLE (1<<2) +#define DRM_MODE_PROP_ENUM (1<<3) // enumerated type with text strings +#define DRM_MODE_PROP_BLOB (1<<4) + +struct drm_mode_property_enum { + uint64_t value; + unsigned char name[DRM_PROP_NAME_LEN]; +}; + +struct drm_mode_get_property { + uint64_t values_ptr; /* values and blob lengths */ + uint64_t enum_blob_ptr; /* enum and blob id ptrs */ + + unsigned int prop_id; + unsigned int flags; + unsigned char name[DRM_PROP_NAME_LEN]; + + int count_values; + int count_enum_blobs; +}; + +struct drm_mode_output_set_property { + uint64_t value; + unsigned int prop_id; + unsigned int output_id; +}; + +struct drm_mode_get_blob { + uint32_t blob_id; + uint32_t length; + uint64_t data; +}; + +struct drm_mode_fb_cmd { + unsigned int buffer_id; + unsigned int width, height; + unsigned int pitch; + unsigned int bpp; + unsigned int handle; + unsigned int depth; +}; + +struct drm_mode_mode_cmd { + unsigned int output_id; + struct drm_mode_modeinfo mode; +}; + +#define DRM_MODE_CURSOR_BO 0x01 +#define DRM_MODE_CURSOR_MOVE 0x02 + +/* + * depending on the value in flags diffrent members are used. + * + * CURSOR_BO uses + * crtc + * width + * height + * handle - if 0 turns the cursor of + * + * CURSOR_MOVE uses + * crtc + * x + * y + */ +struct drm_mode_cursor { + unsigned int flags; + unsigned int crtc; + int x; + int y; + uint32_t width; + uint32_t height; + unsigned int handle; +}; + +/* + * oh so ugly hotplug [...15728 lines suppressed...] + */ + tv_format_atom = MakeAtom(TV_FORMAT_NAME, sizeof(TV_FORMAT_NAME) - 1, + TRUE); + + for (i = 0; i < NUM_TV_MODES; i++) + tv_format_name_atoms[i] = MakeAtom (tv_modes[i].name, + strlen (tv_modes[i].name), + TRUE); + + err = intel_tv_format_configure_property (output); + + if (err != 0) { + xf86DrvMsg(dev->scrnIndex, X_ERROR, + "RRConfigureOutputProperty error, %d\n", err); + } + + /* Set the current value of the tv_format property */ + if (!intel_tv_format_set_property (output)) + xf86DrvMsg(dev->scrnIndex, X_ERROR, + "RRChangeOutputProperty error, %d\n", err); + + for (i = 0; i < 4; i++) + { + INT32 range[2]; + margin_atoms[i] = MakeAtom(margin_names[i], strlen (margin_names[i]), + TRUE); + + range[0] = 0; + range[1] = 100; + err = RRConfigureOutputProperty(output->randr_output, margin_atoms[i], + TRUE, TRUE, FALSE, 2, range); + + if (err != 0) + xf86DrvMsg(dev->scrnIndex, X_ERROR, + "RRConfigureOutputProperty error, %d\n", err); + + err = RRChangeOutputProperty(output->randr_output, margin_atoms[i], + XA_INTEGER, 32, PropModeReplace, + 1, &tv_priv->margin[i], + FALSE, TRUE); + if (err != 0) + xf86DrvMsg(dev->scrnIndex, X_ERROR, + "RRChangeOutputProperty error, %d\n", err); + } +#endif +} + +static bool +intel_tv_set_property(struct drm_output *output, struct drm_property *property, + uint64_t val) +{ + struct drm_device *dev = output->dev; + int ret = 0; + + if (property == dev->mode_config.tv_left_margin_property || + property == dev->mode_config.tv_right_margin_property || + property == dev->mode_config.tv_top_margin_property || + property == dev->mode_config.tv_bottom_margin_property) { + ret = drm_output_property_set_value(output, property, val); + } else { + /* TV mode handling here */ + } + + return ret; +} + +static const struct drm_output_funcs intel_tv_output_funcs = { + .dpms = intel_tv_dpms, + .save = intel_tv_save, + .restore = intel_tv_restore, + .mode_valid = intel_tv_mode_valid, + .mode_fixup = intel_tv_mode_fixup, + .prepare = intel_output_prepare, + .mode_set = intel_tv_mode_set, + .commit = intel_output_commit, + .detect = intel_tv_detect, + .get_modes = intel_tv_get_modes, + .cleanup = intel_tv_destroy, + .set_property = intel_tv_set_property, +}; + +void +intel_tv_init(struct drm_device *dev) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_output *output; + struct intel_output *intel_output; + struct intel_tv_priv *tv_priv; + u32 tv_dac_on, tv_dac_off, save_tv_dac; + + /* FIXME: better TV detection and/or quirks */ +#if 0 + if (tv_priv->quirk_flag & QUIRK_IGNORE_TV) + return; +#endif + if ((I915_READ(TV_CTL) & TV_FUSE_STATE_MASK) == TV_FUSE_STATE_DISABLED) + return; + + /* + * Sanity check the TV output by checking to see if the + * DAC register holds a value + */ + save_tv_dac = I915_READ(TV_DAC); + + I915_WRITE(TV_DAC, save_tv_dac | TVDAC_STATE_CHG_EN); + tv_dac_on = I915_READ(TV_DAC); + + I915_WRITE(TV_DAC, save_tv_dac & ~TVDAC_STATE_CHG_EN); + tv_dac_off = I915_READ(TV_DAC); + + I915_WRITE(TV_DAC, save_tv_dac); + + /* + * If the register does not hold the state change enable + * bit, (either as a 0 or a 1), assume it doesn't really + * exist + */ + if ((tv_dac_on & TVDAC_STATE_CHG_EN) == 0 || + (tv_dac_off & TVDAC_STATE_CHG_EN) != 0) + return; + + output = drm_output_create(dev, &intel_tv_output_funcs, + DRM_MODE_OUTPUT_TVDAC); + + if (!output) + return; + + intel_output = drm_calloc(1, sizeof(struct intel_output) + + sizeof(struct intel_tv_priv), DRM_MEM_DRIVER); + if (!intel_output) { + drm_output_destroy(output); + return; + } + + tv_priv = (struct intel_tv_priv *)(intel_output + 1); + intel_output->type = INTEL_OUTPUT_TVOUT; + output->possible_crtcs = ((1 << 0) | (1 << 1)); + output->possible_clones = (1 << INTEL_OUTPUT_TVOUT); + intel_output->dev_priv = tv_priv; + tv_priv->type = TV_TYPE_UNKNOWN; + + tv_priv->tv_format = NULL; + + /* BIOS margin values */ + tv_priv->margin[TV_MARGIN_LEFT] = 54; + tv_priv->margin[TV_MARGIN_TOP] = 36; + tv_priv->margin[TV_MARGIN_RIGHT] = 46; + tv_priv->margin[TV_MARGIN_BOTTOM] = 37; + + if (!tv_priv->tv_format) + tv_priv->tv_format = kstrdup(tv_modes[0].name, GFP_KERNEL); + + output->driver_private = intel_output; + output->interlace_allowed = FALSE; + output->doublescan_allowed = FALSE; +} diff --git a/drivers/char/drm/nouveau_mem.c b/drivers/char/drm/nouveau_mem.c index a508a37..622fe99 100644 --- a/drivers/char/drm/nouveau_mem.c +++ b/drivers/char/drm/nouveau_mem.c @@ -372,7 +372,7 @@ nouveau_mem_init_ttm(struct drm_device *dev) bar1_size = drm_get_resource_len(dev, 1) >> PAGE_SHIFT; if (bar1_size < vram_size) { if ((ret = drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, - bar1_size, vram_size - bar1_size))) { + bar1_size, vram_size - bar1_size, 1))) { DRM_ERROR("Failed PRIV0 mm init: %d\n", ret); return ret; } @@ -383,7 +383,7 @@ nouveau_mem_init_ttm(struct drm_device *dev) #ifdef HACK_OLD_MM vram_size /= 4; #endif - if ((ret = drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, vram_size))) { + if ((ret = drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, vram_size, 1))) { DRM_ERROR("Failed VRAM mm init: %d\n", ret); return ret; } @@ -403,7 +403,7 @@ nouveau_mem_init_ttm(struct drm_device *dev) if ((ret = drm_bo_init_mm(dev, DRM_BO_MEM_TT, 0, dev_priv->gart_info.aper_size >> - PAGE_SHIFT))) { + PAGE_SHIFT, 1))) { DRM_ERROR("Failed TT mm init: %d\n", ret); return ret; } diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c index 6f75512..8e4a494 100644 --- a/drivers/char/drm/radeon_state.c +++ b/drivers/char/drm/radeon_state.c @@ -3012,7 +3012,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil */ case RADEON_PARAM_SAREA_HANDLE: /* The lock is the first dword in the sarea. */ - value = (long)dev->lock.hw_lock; + value = (long)dev->primary->master->lock.hw_lock; break; #endif case RADEON_PARAM_GART_TEX_HANDLE: Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.478 retrieving revision 1.479 diff -u -r1.478 -r1.479 --- kernel.spec 6 Mar 2008 05:31:30 -0000 1.478 +++ kernel.spec 6 Mar 2008 05:37:20 -0000 1.479 @@ -425,6 +425,7 @@ Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1}\ Provides: kernel-drm = 4.3.0\ Provides: kernel-drm-nouveau = 10\ +Provides: kernel-modeset = 1\ Requires(pre): %{kernel_prereq}\ Conflicts: %{kernel_dot_org_conflicts}\ Conflicts: %{package_conflicts}\ @@ -625,6 +626,7 @@ Patch1803: nouveau-drm.patch Patch1804: linux-2.6-drm-git-mm-revert-nopfn.patch Patch1805: linux-2.6-drm-git-i915-remove-priv-access.patch +Patch1806: linux-2.6-drm-i915-modeset.patch # kludge to make ich9 e1000 work Patch2000: linux-2.6-e1000-ich9.patch @@ -1149,6 +1151,7 @@ ApplyPatch nouveau-drm.patch ApplyPatch linux-2.6-drm-git-mm-revert-nopfn.patch ApplyPatch linux-2.6-drm-git-i915-remove-priv-access.patch +ApplyPatch linux-2.6-drm-i915-modeset.patch # ext4dev stable patch queue, slated for 2.6.25 #ApplyPatch linux-2.6-ext4-stable-queue.patch @@ -1754,6 +1757,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Thu Mar 06 2008 Dave Airlie +- Add initial i915 drm modesetting tree - needs i915.modeset=1 on command + line + new libdrm + new intel driver to actually be useful + * Wed Mar 05 2008 Jarod Wilson - firewire-sbp2: improved ability to reconnect to devices following a bus reset From fedora-extras-commits at redhat.com Thu Mar 6 06:20:08 2008 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Thu, 6 Mar 2008 06:20:08 GMT Subject: rpms/asterisk/devel asterisk-1.6.0-beta5-alternate-extensions.patch, NONE, 1.1 asterisk-1.6.0-beta5-alternate-voicemail.patch, NONE, 1.1 asterisk-1.6.0-beta5-appconference.patch, NONE, 1.1 asterisk-1.6.0-beta5-autoconf.patch, NONE, 1.1 asterisk-1.6.0-beta5-chanmobile.patch, NONE, 1.1 asterisk-1.6.0-beta5-initscripts.patch, NONE, 1.1 asterisk-1.6.0-beta5-lua.patch, NONE, 1.1 asterisk-1.6.0-beta5-optimization.patch, NONE, 1.1 asterisk-1.6.0-beta5-spandspfax.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 asterisk.spec, 1.15, 1.16 sources, 1.8, 1.9 asterisk-1.6.0-beta4-alternate-extensions.patch, 1.1, NONE asterisk-1.6.0-beta4-alternate-voicemail.patch, 1.1, NONE asterisk-1.6.0-beta4-appconference.patch, 1.1, NONE asterisk-1.6.0-beta4-astcanary.patch, 1.1, NONE asterisk-1.6.0-beta4-autoconf.patch, 1.1, NONE asterisk-1.6.0-beta4-chanmobile.patch, 1.1, NONE asterisk-1.6.0-beta4-funcdesc.patch, 1.1, NONE asterisk-1.6.0-beta4-initscripts.patch, 1.1, NONE asterisk-1.6.0-beta4-lua.patch, 1.1, NONE asterisk-1.6.0-beta4-optimization.patch, 1.1, NONE asterisk-1.6.0-beta4-spandspfax.patch, 1.1, NONE Message-ID: <200803060620.m266K8UC028097@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28037 Modified Files: .cvsignore asterisk.spec sources Added Files: asterisk-1.6.0-beta5-alternate-extensions.patch asterisk-1.6.0-beta5-alternate-voicemail.patch asterisk-1.6.0-beta5-appconference.patch asterisk-1.6.0-beta5-autoconf.patch asterisk-1.6.0-beta5-chanmobile.patch asterisk-1.6.0-beta5-initscripts.patch asterisk-1.6.0-beta5-lua.patch asterisk-1.6.0-beta5-optimization.patch asterisk-1.6.0-beta5-spandspfax.patch Removed Files: asterisk-1.6.0-beta4-alternate-extensions.patch asterisk-1.6.0-beta4-alternate-voicemail.patch asterisk-1.6.0-beta4-appconference.patch asterisk-1.6.0-beta4-astcanary.patch asterisk-1.6.0-beta4-autoconf.patch asterisk-1.6.0-beta4-chanmobile.patch asterisk-1.6.0-beta4-funcdesc.patch asterisk-1.6.0-beta4-initscripts.patch asterisk-1.6.0-beta4-lua.patch asterisk-1.6.0-beta4-optimization.patch asterisk-1.6.0-beta4-spandspfax.patch Log Message: Update to 1.6.0-beta5 asterisk-1.6.0-beta5-alternate-extensions.patch: --- NEW FILE asterisk-1.6.0-beta5-alternate-extensions.patch --- >From a33d076b1f3580e7dcf5aaa3af94d6e17024f5af Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 16:32:56 -0600 Subject: [PATCH] Allow alternate extensions to be specified in users.conf --- pbx/pbx_config.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 4a7a3d3..0e38d88 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1532,11 +1532,14 @@ static void pbx_load_users(void) { struct ast_config *cfg; char *cat, *chan; + char *ext; const char *zapchan; const char *hasexten; + const char *altexts; char tmp[256]; char iface[256]; char zapcopy[256]; + char altcopy[256]; char *c; int len; int hasvoicemail; @@ -1617,6 +1620,17 @@ static void pbx_load_users(void) } else { ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar); } + altexts = ast_variable_retrieve(cfg, cat, "alternateexts"); + if (!ast_strlen_zero(altexts)) { + snprintf(tmp, sizeof(tmp), "%s|1", cat); + ast_copy_string(altcopy, altexts, sizeof(altcopy)); + c = altcopy; + ext = strsep(&c, ","); + while (ext) { + ast_add_extension2(con, 0, ext, 1, NULL, NULL, "Goto", strdup(tmp), ast_free, registrar); + ext = strsep(&c, ","); + } + } } } ast_config_destroy(cfg); -- 1.5.4.3 asterisk-1.6.0-beta5-alternate-voicemail.patch: --- NEW FILE asterisk-1.6.0-beta5-alternate-voicemail.patch --- >From f8a98b91fd8e2235c0ea2ed38de62d0eec092717 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 15:52:36 -0600 Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded. --- configs/modules.conf.sample | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample index 2ca3c03..ae20637 100644 --- a/configs/modules.conf.sample +++ b/configs/modules.conf.sample @@ -37,3 +37,30 @@ load => res_musiconhold.so noload => chan_alsa.so ;noload => chan_oss.so ;noload => chan_console.so + +; +; Voicemail storage selection +; +; Comment out the "noload" lines for the voicemail +; storage system that you want. Leave the ones that +; you don't want uncommented. +; + +; +; Voicemail with IMAP storage +; +noload => app_directory_imap.so +noload => app_voicemail_imap.so + +; +; Voicemail with ODBC storage +; +noload => app_directory_odbc.so +noload => app_voicemail_odbc.so + +; +; Voicemail with filesystem storage +; +;noload => app_directory_plain.so +;noload => app_voicemail_plain.so + -- 1.5.4.3 asterisk-1.6.0-beta5-appconference.patch: --- NEW FILE asterisk-1.6.0-beta5-appconference.patch --- diff --git a/apps/Makefile b/apps/Makefile index 22b8f6d..d2be277 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -39,3 +39,16 @@ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) LIBS+= -lres_smdi.so endif +app_conference.o: ASTCFLAGS+=-DSILDET=2 -Iconference + +conference/conference.o: ASTCFLAGS+=-DSILDET=2 -Iconference + +conference/member.o: ASTCFLAGS+=-DSILDET=2 -Iconference + +conference/frame.o: ASTCFLAGS+=-DSILDET=2 -Iconference + +conference/cli.o: ASTCFLAGS+=-DSILDET=2 -Iconference + +app_conference.so: app_conference.o conference/conference.o conference/member.o conference/frame.o conference/cli.o + $(ECHO_PREFIX) echo " [LD] $^ -> $@" + $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $^ -lspeex diff --git a/apps/app_conference.c b/apps/app_conference.c new file mode 100644 index 0000000..3c7205b --- /dev/null +++ b/apps/app_conference.c @@ -0,0 +1,106 @@ +/* + * app_conference + * + * A channel independent conference application for Asterisk + * + * Copyright (C) 2002, 2003 Junghanns.NET GmbH + * Copyright (C) 2003, 2004 HorizonLive.com, Inc. + * Copyright (C) 2005, 2006 HorizonWimba, Inc. + * Copyright (C) 2007 Wimba, Inc. + * + * Klaus-Peter Junghanns + * + * Video Conferencing support added by + * Neil Stratford + * Copyright (C) 2005, 2005 Vipadia Limited + * + * VAD driven video conferencing, text message support + * and miscellaneous enhancements added by + * Mihai Balea + * + * This program may be modified and distributed under the + * terms of the GNU General Public License. You should have received + * a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc. + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include "app_conference.h" +#include "common.h" + +/* + * a conference has n + 1 threads, where n is the number of + * members and 1 is a conference thread which sends audio + * back to the members. + * + * each member thread reads frames from the channel and + * add's them to the member's frame queue. + * + * the conference thread reads frames from each speaking members + * queue, mixes them, and then re-queues them for the member thread + * to send back to the user. + */ + +static char *app = "Conference"; +static char *synopsis = "Channel Independent Conference"; +static char *descrip = "Channel Independent Conference Application"; + +static int app_conference_main(struct ast_channel* chan, void* data) +{ + int res ; + struct ast_module_user *u ; + + u = ast_module_user_add(chan); + + // call member thread function + res = member_exec( chan, data ) ; + + ast_module_user_remove(u); + + return res ; +} + +static int unload_module( void ) +{ + ast_log( LOG_NOTICE, "unloading app_conference module\n" ) ; + + ast_module_user_hangup_all(); + + unregister_conference_cli() ; + + return ast_unregister_application( app ) ; +} + +static int load_module( void ) +{ + ast_log( LOG_NOTICE, "Loading app_conference module\n") ; + + init_conference() ; + + register_conference_cli() ; + + return ast_register_application( app, app_conference_main, synopsis, descrip ) ; +} + +// increment a timeval by ms milliseconds +void add_milliseconds(struct timeval* tv, long ms) +{ + // add the microseconds to the microseconds field + tv->tv_usec += ( ms * 1000 ) ; + + // calculate the number of seconds to increment + long s = ( tv->tv_usec / 1000000 ) ; + + // adjust the microsends field + if ( s > 0 ) tv->tv_usec -= ( s * 1000000 ) ; + + // increment the seconds field + tv->tv_sec += s ; +} + +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, + "Channel Independent Conference Application"); diff --git a/apps/conference/CLI.txt b/apps/conference/CLI.txt new file mode 100644 index 0000000..48acf5a --- /dev/null +++ b/apps/conference/CLI.txt @@ -0,0 +1,96 @@ +Current command line used by app_conference +Please note that app_conference is still work in progress, so this document might be outdated. As always, the source code is the definitive reference (cli.[ch] and conference.[ch]). You can also obtain help/usage information by using Asterisk CLI help system ("help conference") + +A member in a conference can be referred to by its id or by its channel. Id is a positive number assigned automatically when the member joins the conference. Channel is Asterisk channel identifier. To obtain a list of member ids and channels in a conference, do: + +*CLI> conference list + + +- conference debug: enable debugging for a conference + usage: conference debug [ on | off ] + +- conference end: stops a conference + usage: conference end + +- conference kick: kick member from a conference + usage: conference kick + +- conference kickchannel: kick channel from a conference + usage: conference kickchannel + +- conference list: list members of a conference. If no conference is specified, all conferences are listed + usage: conference list {conference_name} + +- conference lock: locks incoming video to a member + usage: conference lock + +- conference lockchannel: locks incoming video to a channel + usage: conference lockchannel + +- conference mute: mute member in a conference + usage: conference mute + +- conference mutechannel: mute channel in a conference + usage: conference mutechannel + +- conference play sound: play a sound to a conference member + usage: conference play sound [mute] + If mute is specified, all other audio is muted while the sound is played back. + +- conference restart: kick all users in all conferences + usage: conference restart + +- conference set default: sets default video source + usage: conference set default + use a negative value for member if you want to clear the default + +- conference set defaultchannel: sets default video source channel + usage: conference set defaultchannel + +- conference show stats: show conference stats + usage: conference show stats + +- conference text: sends a text message to a member. Depends on the member's channel capabilities. + usage: conference text + +- conference textbroadcast: sends a text message to all members in a conference + usage: conference textbroadcast + +- conference textchannel: sends a text message to a channel + usage: conference textchannel [...9763 lines suppressed...] + conf_frame* outFramesTail ; + unsigned int outFramesCount ; + conf_frame* outVideoFrames ; + conf_frame* outVideoFramesTail ; + unsigned int outVideoFramesCount ; + conf_frame* outDTMFFrames ; + conf_frame* outDTMFFramesTail ; + unsigned int outDTMFFramesCount ; + conf_frame* outTextFrames ; + conf_frame* outTextFramesTail ; + unsigned int outTextFramesCount ; + + // LL video switched flag + short conference; + + // switch video by VAD? + short vad_switch; + // do a VAD switch even if video is not enabled? + short force_vad_switch; + // if member is current speaker, video will stay on it when it becomes silent + short vad_linger; + // switch by dtmf? + short dtmf_switch; + // relay dtmf to manager? + short dtmf_relay; + // initial nat delay flag + short first_frame_received; + // does text messages? + short does_text; + // conference does chat mode (1 on 1 video when two members in conference) + short does_chat_mode; + + + // time we last dropped a frame + struct timeval last_in_dropped ; + struct timeval last_out_dropped ; + + // ( not currently used ) + // int samplesperframe ; + + // used for determining need to mix frames + // and for management interface notification + // and for VAD based video switching + short speaking_state_notify ; + short speaking_state ; // This flag will be true if this member or any of its drivers is speaking + short local_speaking_state; // This flag will be true only if this member is speaking + struct timeval last_state_change; + int speaker_count; // Number of drivers (including this member) that are speaking + + // Stuff used to determine video broadcast state + // This member's video is sent out to at least one member of the conference + short video_broadcast_active; + // Time when we last sent out a video frame from this member + struct timeval last_video_frame_time; + + // Is the member supposed to be transmitting video? + short video_started; + + // pointer to next member in single-linked list + struct ast_conf_member* next ; + + // accounting values + unsigned long frames_in ; + unsigned long frames_in_dropped ; + unsigned long frames_out ; + unsigned long frames_out_dropped ; + + unsigned long video_frames_in ; + unsigned long video_frames_in_dropped ; + unsigned long video_frames_out ; + unsigned long video_frames_out_dropped ; + + unsigned long dtmf_frames_in ; + unsigned long dtmf_frames_in_dropped ; + unsigned long dtmf_frames_out ; + unsigned long dtmf_frames_out_dropped ; + + unsigned long text_frames_in ; + unsigned long text_frames_in_dropped ; + unsigned long text_frames_out ; + unsigned long text_frames_out_dropped ; + + // for counting sequentially dropped frames + unsigned int sequential_drops ; + unsigned long since_dropped ; + + // start time + struct timeval time_entered ; + struct timeval lastsent_timeval ; + + // flag indicating we should remove this member + short remove_flag ; + short kick_flag ; + +#if ( SILDET == 2 ) + // pointer to speex preprocessor dsp + SpeexPreprocessState *dsp ; + // number of frames to ignore speex_preprocess() + int ignore_speex_count; +#else + // placeholder when preprocessing is not enabled + void* dsp ; +#endif + + // audio format this member is using + int write_format ; + int read_format ; + + int write_format_index ; + int read_format_index ; + + // member frame translators + struct ast_trans_pvt* to_slinear ; + struct ast_trans_pvt* from_slinear ; + + // For playing sounds + struct ast_conf_soundq *soundq; + struct ast_conf_soundq *videoq; + + // Enter/leave sounds + char * enter_snd; + char * leave_snd; + + // Pointer to another member that will be driven from this member's audio + struct ast_conf_member *driven_member; +} ; + +struct conf_member +{ + struct ast_conf_member* realmember ; + struct conf_member* next ; +} ; + +// +// function declarations +// + +int member_exec( struct ast_channel* chan, void* data ) ; + +struct ast_conf_member* check_active_video( int id, struct ast_conference *conf ); + +struct ast_conf_member* create_member( struct ast_channel* chan, const char* data ) ; +struct ast_conf_member* delete_member( struct ast_conf_member* member ) ; + +// incoming queue +int queue_incoming_frame( struct ast_conf_member* member, struct ast_frame* fr ) ; +int queue_incoming_video_frame( struct ast_conf_member* member, const struct ast_frame* fr ) ; +int queue_incoming_dtmf_frame( struct ast_conf_member* member, const struct ast_frame* fr ) ; +conf_frame* get_incoming_frame( struct ast_conf_member* member ) ; +conf_frame* get_incoming_video_frame( struct ast_conf_member* member ) ; +conf_frame* get_incoming_dtmf_frame( struct ast_conf_member* member ) ; + +// outgoing queue +int queue_outgoing_frame( struct ast_conf_member* member, const struct ast_frame* fr, struct timeval delivery ) ; +int __queue_outgoing_frame( struct ast_conf_member* member, const struct ast_frame* fr, struct timeval delivery ) ; +conf_frame* get_outgoing_frame( struct ast_conf_member* member ) ; + +int queue_outgoing_video_frame( struct ast_conf_member* member, const struct ast_frame* fr, struct timeval delivery ) ; +conf_frame* get_outgoing_video_frame( struct ast_conf_member* member ) ; +int queue_outgoing_dtmf_frame( struct ast_conf_member* member, const struct ast_frame* fr ) ; +int queue_outgoing_text_frame( struct ast_conf_member* member, const struct ast_frame* fr ) ; +conf_frame* get_outgoing_dtmf_frame( struct ast_conf_member* member ) ; +conf_frame* get_outgoing_text_frame( struct ast_conf_member* member ) ; + +void send_state_change_notifications( struct ast_conf_member* member ) ; + +int increment_speaker_count(struct ast_conf_member *member, int lock); +int decrement_speaker_count(struct ast_conf_member *member, int lock); + +void member_process_spoken_frames(struct ast_conference* conf, + struct ast_conf_member *member, + struct conf_frame **spoken_frames, + long time_diff, + int *listener_count, + int *speaker_count); + +void member_process_outgoing_frames(struct ast_conference* conf, + struct ast_conf_member *member, + struct conf_frame *send_frames); + +int is_video_eligible(struct ast_conf_member *member); + +// Member start and stop video methods +void start_video(struct ast_conf_member *member); +void stop_video(struct ast_conf_member *member); + +// +// packer functions +// + +struct ast_packer; + +extern struct ast_packer *ast_packer_new(int bytes); +extern void ast_packer_set_flags(struct ast_packer *packer, int flags); +extern int ast_packer_get_flags(struct ast_packer *packer); +extern void ast_packer_free(struct ast_packer *s); +extern void ast_packer_reset(struct ast_packer *s, int bytes); +extern int ast_packer_feed(struct ast_packer *s, const struct ast_frame *f); +extern struct ast_frame *ast_packer_read(struct ast_packer *s); +#endif asterisk-1.6.0-beta5-autoconf.patch: --- NEW FILE asterisk-1.6.0-beta5-autoconf.patch --- >From 84fe14e2adca2048685072741707f2a20e0e104d Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 13:15:55 -0600 Subject: [PATCH] Update autoconf. --- configure | 808 ++++++++++++++++++++++++++++++-------- include/asterisk/autoconfig.h.in | 23 +- 2 files changed, 656 insertions(+), 175 deletions(-) diff --git a/configure b/configure index 7a4b433..32bda65 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 104019 . +# From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -729,14 +729,18 @@ BKTR_LIB BKTR_INCLUDE BKTR_DIR PBX_BKTR -CAP_LIB -CAP_INCLUDE -CAP_DIR -PBX_CAP +BLUETOOTH_LIB +BLUETOOTH_INCLUDE +BLUETOOTH_DIR +PBX_BLUETOOTH CURL_LIB CURL_INCLUDE CURL_DIR PBX_CURL +CAP_LIB +CAP_INCLUDE +CAP_DIR +PBX_CAP CURSES_LIB CURSES_INCLUDE CURSES_DIR @@ -857,6 +861,10 @@ RADIUS_LIB RADIUS_INCLUDE RADIUS_DIR PBX_RADIUS +SPANDSP_LIB +SPANDSP_INCLUDE +SPANDSP_DIR +PBX_SPANDSP SPEEX_LIB SPEEX_INCLUDE SPEEX_DIR @@ -977,12 +985,12 @@ OPENH323_INCDIR OPENH323_LIBDIR OPENH323_SUFFIX OPENH323_BUILD +PKGCONFIG EDITLINE_LIB PBX_H323 PBX_IXJUSER CONFIG_SDL CONFIG_GTK -PKGCONFIG CURL_CONFIG LTLIBOBJS' ac_subst_files='' @@ -1582,8 +1590,9 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-asound=PATH use Advanced Linux Sound Architecture files in PATH --with-execinfo=PATH use Stack Backtrace support files in PATH - --with-cap=PATH use POSIX 1.e capabilities files in PATH + --with-bluetooth=PATH use Bluetooth Support files in PATH --with-curl=PATH use cURL files in PATH + --with-cap=PATH use POSIX 1.e capabilities files in PATH --with-curses=PATH use curses files in PATH --with-crypto=PATH use OpenSSL Cryptography support files in PATH --with-gsm=PATH use External GSM library files in PATH , use @@ -1615,6 +1624,7 @@ Optional Packages: --with-pwlib=PATH use PWlib files in PATH --with-h323=PATH use OpenH323 files in PATH --with-radius=PATH use Radius Client files in PATH + --with-spandsp=PATH use spandsp Library files in PATH --with-speex=PATH use Speex files in PATH --with-speexdsp=PATH use Speexdsp files in PATH --with-sqlite=PATH use SQLite files in PATH @@ -7963,6 +7973,62 @@ fi + BLUETOOTH_DESCRIP="Bluetooth Support" + BLUETOOTH_OPTION="bluetooth" + +# Check whether --with-bluetooth was given. +if test "${with_bluetooth+set}" = set; then + withval=$with_bluetooth; + case ${withval} in + n|no) + USE_BLUETOOTH=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} BLUETOOTH" + ;; + *) + BLUETOOTH_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} BLUETOOTH" + ;; + esac + +fi + + PBX_BLUETOOTH=0 + + + + + + + CURL_DESCRIP="cURL" + CURL_OPTION="curl" + +# Check whether --with-curl was given. +if test "${with_curl+set}" = set; then + withval=$with_curl; + case ${withval} in + n|no) + USE_CURL=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} CURL" + ;; + *) + CURL_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} CURL" + ;; + esac + +fi + + PBX_CURL=0 + + + + + + CAP_DESCRIP="POSIX 1.e capabilities" CAP_OPTION="cap" @@ -8859,6 +8925,34 @@ fi + SPANDSP_DESCRIP="spandsp Library" + SPANDSP_OPTION="spandsp" + +# Check whether --with-spandsp was given. +if test "${with_spandsp+set}" = set; then + withval=$with_spandsp; + case ${withval} in + n|no) + USE_SPANDSP=no + ;; + y|ye|yes) + ac_mandatory_list="${ac_mandatory_list} SPANDSP" + ;; + *) + SPANDSP_DIR="${withval}" + ac_mandatory_list="${ac_mandatory_list} SPANDSP" + ;; + esac + +fi + + PBX_SPANDSP=0 + + + + + + SPEEX_DESCRIP="Speex" SPEEX_OPTION="speex" @@ -12933,13 +13027,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -12979,13 +13071,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -18633,6 +18723,268 @@ fi +if test "x${PBX_BLUETOOTH}" != "x1" -a "${USE_BLUETOOTH}" != "no"; then + pbxlibdir="" + # if --with-BLUETOOTH=DIR has been specified, use it. + if test "x${BLUETOOTH_DIR}" != "x"; then + if test -d ${BLUETOOTH_DIR}/lib; then + pbxlibdir="-L${BLUETOOTH_DIR}/lib" + else + pbxlibdir="-L${BLUETOOTH_DIR}" + fi + fi + pbxfuncname="ba2str" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_BLUETOOTH_FOUND=yes + else + as_ac_Lib=`echo "ac_cv_lib_bluetooth_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lbluetooth" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lbluetooth... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbluetooth ${pbxlibdir} $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ${pbxfuncname} (); +int +main () +{ +return ${pbxfuncname} (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + AST_BLUETOOTH_FOUND=yes +else + AST_BLUETOOTH_FOUND=no +fi + + fi + + # now check for the header. + if test "${AST_BLUETOOTH_FOUND}" = "yes"; then + BLUETOOTH_LIB="${pbxlibdir} -lbluetooth " + # if --with-BLUETOOTH=DIR has been specified, use it. + if test "x${BLUETOOTH_DIR}" != "x"; then + BLUETOOTH_INCLUDE="-I${BLUETOOTH_DIR}/include" + fi + BLUETOOTH_INCLUDE="${BLUETOOTH_INCLUDE} " + if test "xbluetooth/bluetooth.h" = "x" ; then # no header, assume found + BLUETOOTH_HEADER_FOUND="1" + else # check for the header + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE} " + if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + { echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h usability" >&5 +echo $ECHO_N "checking bluetooth/bluetooth.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h presence" >&5 +echo $ECHO_N "checking bluetooth/bluetooth.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------- ## +## Report this to www.asterisk.org ## +## ------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5 +echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; } +if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_bluetooth_bluetooth_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5 +echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; } + +fi +if test $ac_cv_header_bluetooth_bluetooth_h = yes; then + BLUETOOTH_HEADER_FOUND=1 +else + BLUETOOTH_HEADER_FOUND=0 +fi + + + CPPFLAGS="${saved_cppflags}" + fi + if test "x${BLUETOOTH_HEADER_FOUND}" = "x0" ; then + BLUETOOTH_LIB="" + BLUETOOTH_INCLUDE="" + else + if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + BLUETOOTH_LIB="" + fi + PBX_BLUETOOTH=1 + # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED + +cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH_VERSION +_ACEOF + + fi + fi +fi + + + if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then pbxlibdir="" # if --with-CURSES=DIR has been specified, use it. @@ -41379,31 +41731,137 @@ _ACEOF fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" +PBX_LUA=0 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 +echo "${ECHO_T}$PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + -if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then +fi +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 +echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="No" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_ct_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_prog_PKGCONFIG" +fi + +if test ! "x${PKGCONFIG}" = xNo; then + LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null) + LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null) + PBX_LUA=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LUA 1 +_ACEOF + +fi + + +if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then pbxlibdir="" - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - if test -d ${LUA_DIR}/lib; then - pbxlibdir="-L${LUA_DIR}/lib" + # if --with-RADIUS=DIR has been specified, use it. + if test "x${RADIUS_DIR}" != "x"; then + if test -d ${RADIUS_DIR}/lib; then + pbxlibdir="-L${RADIUS_DIR}/lib" else - pbxlibdir="-L${LUA_DIR}" + pbxlibdir="-L${RADIUS_DIR}" fi fi - pbxfuncname="luaL_newstate" + pbxfuncname="rc_read_config" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LUA_FOUND=yes + AST_RADIUS_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua5.1" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -llua5.1... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lradiusclient-ng" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lradiusclient-ng... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llua5.1 ${pbxlibdir} $LIBS" +LIBS="-lradiusclient-ng ${pbxlibdir} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41460,38 +41918,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_LUA_FOUND=yes + AST_RADIUS_FOUND=yes else - AST_LUA_FOUND=no + AST_RADIUS_FOUND=no fi fi # now check for the header. - if test "${AST_LUA_FOUND}" = "yes"; then - LUA_LIB="${pbxlibdir} -llua5.1 " - # if --with-LUA=DIR has been specified, use it. - if test "x${LUA_DIR}" != "x"; then - LUA_INCLUDE="-I${LUA_DIR}/include" - fi - LUA_INCLUDE="${LUA_INCLUDE} " - if test "xlua5.1/lua.h" = "x" ; then # no header, assume found - LUA_HEADER_FOUND="1" + if test "${AST_RADIUS_FOUND}" = "yes"; then + RADIUS_LIB="${pbxlibdir} -lradiusclient-ng " + # if --with-RADIUS=DIR has been specified, use it. + if test "x${RADIUS_DIR}" != "x"; then + RADIUS_INCLUDE="-I${RADIUS_DIR}/include" + fi + RADIUS_INCLUDE="${RADIUS_INCLUDE} " + if test "xradiusclient-ng.h" = "x" ; then # no header, assume found + RADIUS_HEADER_FOUND="1" else # check for the header saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE} " - if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then - { echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then + CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE} " + if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then + { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 +echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } +if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 +echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h usability" >&5 -echo $ECHO_N "checking lua5.1/lua.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking radiusclient-ng.h usability" >&5 +echo $ECHO_N "checking radiusclient-ng.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41499,7 +41957,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -41531,15 +41989,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking lua5.1/lua.h presence" >&5 -echo $ECHO_N "checking lua5.1/lua.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking radiusclient-ng.h presence" >&5 +echo $ECHO_N "checking radiusclient-ng.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -41572,25 +42030,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -41599,43 +42057,43 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5 -echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; } -if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 +echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } +if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_lua5_1_lua_h=$ac_header_preproc + ac_cv_header_radiusclient_ng_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5 -echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 +echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } fi -if test $ac_cv_header_lua5_1_lua_h = yes; then - LUA_HEADER_FOUND=1 +if test $ac_cv_header_radiusclient_ng_h = yes; then + RADIUS_HEADER_FOUND=1 else - LUA_HEADER_FOUND=0 + RADIUS_HEADER_FOUND=0 fi CPPFLAGS="${saved_cppflags}" fi - if test "x${LUA_HEADER_FOUND}" = "x0" ; then - LUA_LIB="" - LUA_INCLUDE="" + if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then + RADIUS_LIB="" + RADIUS_INCLUDE="" else if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LUA_LIB="" + RADIUS_LIB="" fi - PBX_LUA=1 + PBX_RADIUS=1 # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED cat >>confdefs.h <<_ACEOF -#define HAVE_LUA 1 +#define HAVE_RADIUS 1 _ACEOF cat >>confdefs.h <<_ACEOF -#define HAVE_LUA_VERSION +#define HAVE_RADIUS_VERSION _ACEOF fi @@ -41644,28 +42102,28 @@ fi -if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then +if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then pbxlibdir="" - # if --with-RADIUS=DIR has been specified, use it. - if test "x${RADIUS_DIR}" != "x"; then - if test -d ${RADIUS_DIR}/lib; then - pbxlibdir="-L${RADIUS_DIR}/lib" + # if --with-SPANDSP=DIR has been specified, use it. + if test "x${SPANDSP_DIR}" != "x"; then + if test -d ${SPANDSP_DIR}/lib; then + pbxlibdir="-L${SPANDSP_DIR}/lib" else - pbxlibdir="-L${RADIUS_DIR}" + pbxlibdir="-L${SPANDSP_DIR}" fi fi - pbxfuncname="rc_read_config" + pbxfuncname="fax_init" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_RADIUS_FOUND=yes + AST_SPANDSP_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lradiusclient-ng" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lradiusclient-ng... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspandsp" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lspandsp... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lradiusclient-ng ${pbxlibdir} $LIBS" +LIBS="-lspandsp ${pbxlibdir} -ltiff $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41722,38 +42180,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_RADIUS_FOUND=yes + AST_SPANDSP_FOUND=yes else - AST_RADIUS_FOUND=no + AST_SPANDSP_FOUND=no fi fi # now check for the header. - if test "${AST_RADIUS_FOUND}" = "yes"; then - RADIUS_LIB="${pbxlibdir} -lradiusclient-ng " - # if --with-RADIUS=DIR has been specified, use it. - if test "x${RADIUS_DIR}" != "x"; then - RADIUS_INCLUDE="-I${RADIUS_DIR}/include" - fi - RADIUS_INCLUDE="${RADIUS_INCLUDE} " - if test "xradiusclient-ng.h" = "x" ; then # no header, assume found - RADIUS_HEADER_FOUND="1" + if test "${AST_SPANDSP_FOUND}" = "yes"; then + SPANDSP_LIB="${pbxlibdir} -lspandsp -ltiff" + # if --with-SPANDSP=DIR has been specified, use it. + if test "x${SPANDSP_DIR}" != "x"; then + SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" + fi + SPANDSP_INCLUDE="${SPANDSP_INCLUDE} " + if test "xspandsp.h" = "x" ; then # no header, assume found + SPANDSP_HEADER_FOUND="1" else # check for the header saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE} " - if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then - { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 -echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } -if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then + CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE} " + if test "${ac_cv_header_spandsp_h+set}" = set; then + { echo "$as_me:$LINENO: checking for spandsp.h" >&5 +echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_spandsp_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 -echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 +echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking radiusclient-ng.h usability" >&5 -echo $ECHO_N "checking radiusclient-ng.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking spandsp.h usability" >&5 +echo $ECHO_N "checking spandsp.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41761,7 +42219,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -41793,15 +42251,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking radiusclient-ng.h presence" >&5 -echo $ECHO_N "checking radiusclient-ng.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking spandsp.h presence" >&5 +echo $ECHO_N "checking spandsp.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -41834,25 +42292,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: spandsp.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: spandsp.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: spandsp.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: spandsp.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: spandsp.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: spandsp.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: spandsp.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -41861,43 +42319,43 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5 -echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; } -if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for spandsp.h" >&5 +echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; } +if test "${ac_cv_header_spandsp_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_radiusclient_ng_h=$ac_header_preproc + ac_cv_header_spandsp_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5 -echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5 +echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; } fi -if test $ac_cv_header_radiusclient_ng_h = yes; then - RADIUS_HEADER_FOUND=1 +if test $ac_cv_header_spandsp_h = yes; then + SPANDSP_HEADER_FOUND=1 else - RADIUS_HEADER_FOUND=0 + SPANDSP_HEADER_FOUND=0 fi CPPFLAGS="${saved_cppflags}" fi - if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then - RADIUS_LIB="" - RADIUS_INCLUDE="" + if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then + SPANDSP_LIB="" + SPANDSP_INCLUDE="" else if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - RADIUS_LIB="" + SPANDSP_LIB="" fi - PBX_RADIUS=1 + PBX_SPANDSP=1 # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED cat >>confdefs.h <<_ACEOF -#define HAVE_RADIUS 1 +#define HAVE_SPANDSP 1 _ACEOF cat >>confdefs.h <<_ACEOF -#define HAVE_RADIUS_VERSION +#define HAVE_SPANDSP_VERSION _ACEOF fi @@ -50627,14 +51085,18 @@ BKTR_LIB!$BKTR_LIB$ac_delim BKTR_INCLUDE!$BKTR_INCLUDE$ac_delim BKTR_DIR!$BKTR_DIR$ac_delim PBX_BKTR!$PBX_BKTR$ac_delim -CAP_LIB!$CAP_LIB$ac_delim -CAP_INCLUDE!$CAP_INCLUDE$ac_delim -CAP_DIR!$CAP_DIR$ac_delim -PBX_CAP!$PBX_CAP$ac_delim +BLUETOOTH_LIB!$BLUETOOTH_LIB$ac_delim +BLUETOOTH_INCLUDE!$BLUETOOTH_INCLUDE$ac_delim +BLUETOOTH_DIR!$BLUETOOTH_DIR$ac_delim +PBX_BLUETOOTH!$PBX_BLUETOOTH$ac_delim CURL_LIB!$CURL_LIB$ac_delim CURL_INCLUDE!$CURL_INCLUDE$ac_delim CURL_DIR!$CURL_DIR$ac_delim PBX_CURL!$PBX_CURL$ac_delim +CAP_LIB!$CAP_LIB$ac_delim +CAP_INCLUDE!$CAP_INCLUDE$ac_delim +CAP_DIR!$CAP_DIR$ac_delim +PBX_CAP!$PBX_CAP$ac_delim CURSES_LIB!$CURSES_LIB$ac_delim CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim CURSES_DIR!$CURSES_DIR$ac_delim @@ -50708,10 +51170,6 @@ NEWT_INCLUDE!$NEWT_INCLUDE$ac_delim NEWT_DIR!$NEWT_DIR$ac_delim PBX_NEWT!$PBX_NEWT$ac_delim UNIXODBC_LIB!$UNIXODBC_LIB$ac_delim -UNIXODBC_INCLUDE!$UNIXODBC_INCLUDE$ac_delim -UNIXODBC_DIR!$UNIXODBC_DIR$ac_delim -PBX_UNIXODBC!$PBX_UNIXODBC$ac_delim -OGG_LIB!$OGG_LIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -50753,6 +51211,10 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +UNIXODBC_INCLUDE!$UNIXODBC_INCLUDE$ac_delim +UNIXODBC_DIR!$UNIXODBC_DIR$ac_delim +PBX_UNIXODBC!$PBX_UNIXODBC$ac_delim +OGG_LIB!$OGG_LIB$ac_delim OGG_INCLUDE!$OGG_INCLUDE$ac_delim OGG_DIR!$OGG_DIR$ac_delim PBX_OGG!$PBX_OGG$ac_delim @@ -50796,6 +51258,10 @@ RADIUS_LIB!$RADIUS_LIB$ac_delim RADIUS_INCLUDE!$RADIUS_INCLUDE$ac_delim RADIUS_DIR!$RADIUS_DIR$ac_delim PBX_RADIUS!$PBX_RADIUS$ac_delim +SPANDSP_LIB!$SPANDSP_LIB$ac_delim +SPANDSP_INCLUDE!$SPANDSP_INCLUDE$ac_delim +SPANDSP_DIR!$SPANDSP_DIR$ac_delim +PBX_SPANDSP!$PBX_SPANDSP$ac_delim SPEEX_LIB!$SPEEX_LIB$ac_delim SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim SPEEX_DIR!$SPEEX_DIR$ac_delim @@ -50842,14 +51308,6 @@ USB_DIR!$USB_DIR$ac_delim PBX_USB!$PBX_USB$ac_delim VORBIS_LIB!$VORBIS_LIB$ac_delim VORBIS_INCLUDE!$VORBIS_INCLUDE$ac_delim -VORBIS_DIR!$VORBIS_DIR$ac_delim -PBX_VORBIS!$PBX_VORBIS$ac_delim -VPB_LIB!$VPB_LIB$ac_delim -VPB_INCLUDE!$VPB_INCLUDE$ac_delim -VPB_DIR!$VPB_DIR$ac_delim -PBX_VPB!$PBX_VPB$ac_delim -X11_LIB!$X11_LIB$ac_delim -X11_INCLUDE!$X11_INCLUDE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -50891,6 +51349,14 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +VORBIS_DIR!$VORBIS_DIR$ac_delim +PBX_VORBIS!$PBX_VORBIS$ac_delim +VPB_LIB!$VPB_LIB$ac_delim +VPB_INCLUDE!$VPB_INCLUDE$ac_delim +VPB_DIR!$VPB_DIR$ac_delim +PBX_VPB!$PBX_VPB$ac_delim +X11_LIB!$X11_LIB$ac_delim +X11_INCLUDE!$X11_INCLUDE$ac_delim X11_DIR!$X11_DIR$ac_delim PBX_X11!$PBX_X11$ac_delim ZLIB_LIB!$ZLIB_LIB$ac_delim @@ -50957,17 +51423,17 @@ OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim OPENH323_BUILD!$OPENH323_BUILD$ac_delim +PKGCONFIG!$PKGCONFIG$ac_delim EDITLINE_LIB!$EDITLINE_LIB$ac_delim PBX_H323!$PBX_H323$ac_delim PBX_IXJUSER!$PBX_IXJUSER$ac_delim CONFIG_SDL!$CONFIG_SDL$ac_delim CONFIG_GTK!$CONFIG_GTK$ac_delim -PKGCONFIG!$PKGCONFIG$ac_delim CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 1e0f6c5..f8f5f6b 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -116,6 +116,12 @@ /* Define to indicate the ${BKTR_DESCRIP} library version */ #undef HAVE_BKTR_VERSION +/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */ +#undef HAVE_BLUETOOTH + +/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */ +#undef HAVE_BLUETOOTH_VERSION + /* Define to 1 if byteswap.h macros are available. */ #undef HAVE_BYTESWAP_H @@ -439,12 +445,9 @@ /* Define to indicate the ${LTDL_DESCRIP} library version */ #undef HAVE_LTDL_VERSION -/* Define this to indicate the ${LUA_DESCRIP} library */ +/* Define if your system has the LUA libraries. */ #undef HAVE_LUA -/* Define to indicate the ${LUA_DESCRIP} library version */ -#undef HAVE_LUA_VERSION - /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H @@ -712,6 +715,12 @@ /* Define to 1 if your system has soxmix application. */ #undef HAVE_SOXMIX +/* Define this to indicate the ${SPANDSP_DESCRIP} library */ +#undef HAVE_SPANDSP + +/* Define to indicate the ${SPANDSP_DESCRIP} library version */ +#undef HAVE_SPANDSP_VERSION + /* Define this to indicate the ${SPEEX_DESCRIP} library */ #undef HAVE_SPEEX @@ -1044,6 +1053,12 @@ /* Define ZAPTEL_HWGAIN headers version */ #undef HAVE_ZAPTEL_HWGAIN_VERSION +/* Define if your system has the ZAPTEL_NEONMWI headers. */ +#undef HAVE_ZAPTEL_NEONMWI + +/* Define ZAPTEL_NEONMWI headers version */ +#undef HAVE_ZAPTEL_NEONMWI_VERSION + /* Define if your system has the ZAPTEL_TRANSCODE headers. */ #undef HAVE_ZAPTEL_TRANSCODE -- 1.5.4.3 asterisk-1.6.0-beta5-chanmobile.patch: --- NEW FILE asterisk-1.6.0-beta5-chanmobile.patch --- >From 71326da75705d098df0d569960d5ec6477800511 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 09:23:28 -0600 Subject: [PATCH] Add chan_mobile from asterisk-addons. --- build_tools/menuselect-deps.in | 1 + channels/Makefile | 2 + channels/chan_mobile.c | 2118 ++++++++++++++++++++++++++++++++++++++++ configs/mobile.conf.sample | 60 ++ configure.ac | 4 + doc/chan_mobile.txt | 240 +++++ makeopts.in | 3 + 7 files changed, 2428 insertions(+), 0 deletions(-) create mode 100644 channels/chan_mobile.c create mode 100644 configs/mobile.conf.sample create mode 100644 doc/chan_mobile.txt diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 4923560..9df8667 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -1,5 +1,6 @@ ASOUND=@PBX_ALSA@ CRYPTO=@PBX_CRYPTO@ +BLUETOOTH=@PBX_BLUETOOTH@ CURL=@PBX_CURL@ FREETDS=@PBX_FREETDS@ GNU_LD=@GNU_LD@ diff --git a/channels/Makefile b/channels/Makefile index 467fc80..612ccd9 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -100,6 +100,8 @@ misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o +chan_mobile.so: LIBS+=$(BLUETOOTH_LIB) + chan_vpb.oo: ASTCFLAGS:=$(filter-out -Wdeclaration-after-statement,$(ASTCFLAGS)) $(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_video.o vgrabbers.o console_board.o diff --git a/channels/chan_mobile.c b/channels/chan_mobile.c new file mode 100644 index 0000000..1312ea9 --- /dev/null +++ b/channels/chan_mobile.c @@ -0,0 +1,2118 @@ +/* + * Asterisk -- An open source telephony toolkit. + * + * Copyright (C) 1999 - 2006, Digium, Inc. + * + * Mark Spencer + * + * See http://www.asterisk.org for more information about + * the Asterisk project. Please do not directly contact + * any of the maintainers of this project for assistance; + * the project provides a web site, mailing lists and IRC + * channels for your use. + * + * This program is free software, distributed under the terms of + * the GNU General Public License Version 2. See the LICENSE file + * at the top of the source tree. + */ + +/*! \file + * + * \brief Bluetooth Mobile Device channel driver + * + * \author Dave Bowerman + * + * \ingroup channel_drivers + */ + +/*** MODULEINFO + bluetooth + ***/ + +#include + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MBL_CONFIG "mobile.conf" + +#define DEVICE_FRAME_SIZE 48 +#define DEVICE_FRAME_FORMAT AST_FORMAT_SLINEAR +#define CHANNEL_FRAME_SIZE 320 + +static int prefformat = DEVICE_FRAME_FORMAT; + +static int discovery_interval = 60; /* The device discovery interval, default 60 seconds. */ +static pthread_t discovery_thread = AST_PTHREADT_NULL; /* The discovery thread */ +static sdp_session_t *sdp_session; + +enum mbl_type { + MBL_TYPE_PHONE, + MBL_TYPE_HEADSET +}; + +enum mbl_state { + MBL_STATE_INIT = 0, + MBL_STATE_INIT1, + MBL_STATE_INIT2, + MBL_STATE_INIT3, + MBL_STATE_INIT4, + MBL_STATE_INIT5, + MBL_STATE_INIT6, + MBL_STATE_INIT7, + MBL_STATE_PREIDLE, + MBL_STATE_IDLE, + MBL_STATE_DIAL, + MBL_STATE_DIAL1, + MBL_STATE_OUTGOING, + MBL_STATE_RING, + MBL_STATE_RING2, + MBL_STATE_RING3, + MBL_STATE_INCOMING, + MBL_STATE_HANGUP, + MBL_STATE_INSMS, + MBL_STATE_OUTSMS, + MBL_STATE_OUTSMS1, + MBL_STATE_OUTSMS2 +}; + +struct adapter_pvt { + int dev_id; /* device id */ + int hci_socket; /* device descriptor */ + char id[31]; /* the 'name' from mobile.conf */ + bdaddr_t addr; /* adddress of adapter */ + unsigned int inuse:1; /* are we in use ? */ + unsigned int alignment_detection:1; /* do alignment detection on this adpater? */ + int sco_socket; + AST_LIST_ENTRY(adapter_pvt) entry; +}; + +static AST_LIST_HEAD_STATIC(adapters, adapter_pvt); + +struct mbl_pvt { + struct ast_channel *owner; /* Channel we belong to, possibly NULL */ + struct ast_frame fr; /* "null" frame */ + enum mbl_type type; /* Phone or Headset */ + char id[31]; /* The id from mobile.conf */ + int group; /* group number for group dialling */ + bdaddr_t addr; /* address of device */ + struct adapter_pvt *adapter; /* the adapter we use */ + char context[AST_MAX_CONTEXT]; /* the context for incoming calls */ + char connected; /* is it connected? */ + int rfcomm_port; /* rfcomm port number */ + int rfcomm_socket; /* rfcomm socket descriptor */ + char rfcomm_buf[256]; + char io_buf[CHANNEL_FRAME_SIZE + AST_FRIENDLY_OFFSET]; + char io_save_buf[DEVICE_FRAME_SIZE]; + int io_save_len; + int io_pipe[2]; + int sco_socket; /* sco socket descriptor */ + pthread_t sco_listener_thread; /* inbound sco listener for this device */ + enum mbl_state state; /* monitor thread current state */ + pthread_t monitor_thread; /* monitor thread handle */ + char dial_number[AST_MAX_EXTENSION]; /* number for the monitor thread to dial */ + int dial_timeout; + char ciev_call_0[4]; /* dynamically built reponse strings */ [...2118 lines suppressed...] + +See configs/mobile.conf.sample for an example and an explanation of the configuration. + + +Using chan_mobile :- + +chan_mobile.so must be loaded either by loading it using the Asterisk CLI, or by adding it to /etc/asterisk/modules.conf + +Search for your bluetooth devices using the CLI command 'mobile search'. Be patient with this command as +it will take 8 - 10 seconds to do the discovery. This requires a free adapter. + +Headsets will generally have to be put into 'pairing' mode before they will show up here. + +This will return something like the following :- + +*CLI> mobile search +Address Name Usable Type Port +00:12:56:90:6E:00 LG TU500 Yes Phone 4 +00:80:C8:35:52:78 Toaster No Headset 0 +00:0B:9E:11:74:A5 Hello II Plus Yes Headset 1 +00:0F:86:0E:AE:42 Daves Blackberry Yes Phone 7 + +This is a list of all bluetooth devices seen and whether or not they are usable with chan_mobile. +The Address field contains the 'bd address' of the device. This is like an ethernet mac address. +The Name field is whatever is configured into the device as its name. +The Usable field tells you whether or not the device supports the Bluetooth Handsfree Profile or Headset profile. +The Type field tells you whether the device is usable as a Phone line (FXO) or a headset (FXS) +The Port field is the number to put in the configuration file. + +Choose which device(s) you want to use and edit /etc/asterisk/mobile.conf. There is a sample included +with the Asterisk-addons source under configs/mobile.conf.sample. + +Be sure to configure the right bd address and port number from the search. If you want inbound +calls on a device to go to a specific context, add a context= line, otherwise the default will +be used. The 'id' of the device [bitinbrackets] can be anything you like, just make it unique. + +If you are configuring a Headset be sure to include the type=headset line, if left out it defaults +to phone. + +The CLI command 'mobile show devices' can be used at any time to show the status of configured devices, +and whether or not the device is capable of sending / receiving SMS via bluetooth. + +*CLI> mobile show devices +ID Address Group Adapter Connected State SMS +headset 00:0B:9E:11:AE:C6 0 blue No Init No +LGTU550 00:E0:91:7F:46:44 1 dlink No Init No +*CLI> + +As each phone is connected you will see a message on the Asterisk console :- + + Loaded chan_mobile.so => (Bluetooth Mobile Device Channel Driver) + -- Bluetooth Device blackberry has connected. + -- Bluetooth Device dave has connected. + +To make outbound calls, add something to you Dialplan like the following :- (modify to suit) + +; Calls via LGTU5500 +exten => _9X.,1,Dial(Mobile/LGTU550/${EXTEN:1},45) +exten => _9X.,n,Hangup + +To use channel groups, add an entry to each phones definition in mobile.conf like group=n +where n is a number. + +Then if you do something like Dial(Mobile/g1/123456) Asterisk will dial 123456 on the first +connected free phone in group 1. + +Phones which do not have a specific 'group=n' will be in group 0. + + +To dial out on a headset, you need to use some other mechanism, because the headset is not likely +to have all the needed buttons on it. res_clioriginate is good for this :- + +*CLI> originate Mobile/headset extension NNNNN at context + +This will call your headset, once you answer, Asterisk will call NNNNN at context context + +Dialplan hints :- + +chan_mobile supports 'device status' so you can do somthing like + +exten => 1234,hint,SIP/30&Mobile/dave&Mobile/blackberry + + +MobileStatus Application :- + +chan_mobile also registers an application named MobileStatus. You can use this in your Dialplan +to determine the 'state' of a device. + +For example, suppose you wanted to call dave's extension, but only if he was in the office. You could +test to see if his mobile phone was attached to Asterisk, if it is dial his extension, otherwise dial his +mobile phone. + +exten => 40,1,MobileStatus(dave,DAVECELL) +exten => 40,2,GotoIf($["${DAVECELL}" = "1"]?3:5) +exten => 40,3,Dial(ZAP/g1/0427466412,45,tT) +exten => 40,4,Hangup +exten => 40,5,Dial(SIP/40,45,tT) +exten => 40,6,Hangup + +MobileStatus sets the value of the given variable to :- + +1 = Disconnected. i.e. Device not in range of Asterisk, or turned off etc etc +2 = Connected and Not on a call. i.e. Free +3 = Connected and on a call. i.e. Busy + + +SMS Sending / Receiving + +If Asterisk has detected your mobile phone is capable of SMS via bluetooth, you will be able to send and +receive SMS. + +Incoming SMS's cause Asterisk to create an inbound call to the context you defined in mobile.conf or the default +context if you did not define one. The call will start at extension 'sms'. Two channel variables will be available, +SMSSRC = the number of the originator of the SMS and SMSTXT which is the text of the SMS. +This is not a voice call, so grab the values of the variables and hang the call up. + +So, to handle incoming SMS's, do something like the following in your dialplan + +[incoming-mobile] +exten => sms,1,Verbose(Incoming SMS from ${SMSSRC} ${SMSTXT}) +exten => sms,n,Hangup() + +The above will just print the message on the console. + +If you use res_jabber, you could do something like this :- + +[incoming-mobile] +exten => sms,1,JabberSend(transport,user at jabber.somewhere.com,SMS from ${SMSRC} ${SMSTXT}) +exten => sms,2,Hangup() + +To send an SMS, use the application MobileSendSMS like the following :- + +exten => 99,1,MobileSendSMS(dave,0427123456,Hello World) + +This will send 'Hello World' via device 'dave' to '0427123456' + + +DTMF Debouncing :- + +DTMF detection varies from phone to phone. There is a configuration variable that allows you to tune +this to your needs. e.g. in mobile.conf + +[LGTU550] +address=00:12:56:90:6E:00 +port=4 +context=incoming-mobile +dtmfskip=50 + +change dtmfskip to suit your phone. The default is 200. The larger the number, the more chance of missed DTMF. +The smaller the number the more chance of multiple digits being detected. + + +Debugging :- + +Different phone manufacturers have different interpretations of the Bluetooth Handsfree Profile Spec. +This means that not all phones work the same way, particularly in the connection setup / initialisation +sequence. I've tried to make chan_mobile as general as possible, but it may need modification to +support some phone i've never tested. + +Some phones, most notably Sony Ericsson 'T' series, dont quite conform to the Bluetooth HFP spec. +chan_mobile will detect these and adapt accordingly. The T-610 and T-630 have been tested and +work fine. + +If your phone doesnt behave has expected, turn on Asterisk debugging with 'core set debug 1'. + +This will log a bunch of debug messages indicating what the phone is doing, importantly the rfcomm +conversation between Asterisk and the phone. This can be used to sort out what your phone is doing +and make chan_mobile support it. + +Be aware also, that just about all mobile phones behave differently. For example my LG TU500 wont dial unless +the phone is a the 'idle' screen. i.e. if the phone is showing a 'menu' on the display, when you dial via +Asterisk, the call will not work. chan_mobile handles this, but there may be other phones that do +other things too... + +Important: Watch what your mobile phone is doing the first few times. Asterisk wont make random calls but +if chan_mobile fails to hangup for some reason and you get a huge bill from your telco, dont blame me ;) + + +Feedback, Support, Please can you make Mobile Phone X work... etc :- + +as always, bugs should be reported at http://bugs.digium.com + +email me at david.bowerman at gmail.com or dseeb_ on #asterisk & #asterisk-dev irc. diff --git a/makeopts.in b/makeopts.in index 5baa11f..3769c87 100644 --- a/makeopts.in +++ b/makeopts.in @@ -68,6 +68,9 @@ AST_DECLARATION_AFTER_STATEMENT=@AST_DECLARATION_AFTER_STATEMENT@ ASOUND_INCLUDE=@ALSA_INCLUDE@ ASOUND_LIB=@ALSA_LIB@ +BLUETOOTH_LIB=@BLUETOOTH_LIB@ +BLUETOOTH_INCLUDE=@BLUETOOTH_INCLUDE@ + CURL_INCLUDE=@CURL_INCLUDE@ CURL_LIB=@CURL_LIB@ -- 1.5.4.3 asterisk-1.6.0-beta5-initscripts.patch: --- NEW FILE asterisk-1.6.0-beta5-initscripts.patch --- >From be6ba31e0c13859ad47be4f8d817104a2328009b Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Sun, 18 Nov 2007 21:47:59 -0600 Subject: [PATCH] Modify init scripts for better Fedora compatibility. --- contrib/init.d/rc.redhat.asterisk | 59 +++++++++++++++++------------------- contrib/sysconfig/asterisk | 16 ++++++++++ 2 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 contrib/sysconfig/asterisk diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk index 27d633e..6756002 100755 --- a/contrib/init.d/rc.redhat.asterisk +++ b/contrib/init.d/rc.redhat.asterisk @@ -3,7 +3,7 @@ # # asterisk Starts, Stops and Reloads Asterisk. # -# chkconfig: 2345 90 60 +# chkconfig: - 90 60 # description: Asterisk PBX and telephony daemon. # processname: asterisk # pidfile: /var/run/asterisk.pid @@ -20,59 +20,56 @@ # - Added support for -U and -G command line options # - Modified "reload" to call asterisk -rx 'reload' -# Use this option to specify a different configuration directory -#AST_CONFIG=/etc/asterisk +# Do not modify this script to change any of the settings, instead +# edit /etc/sysconfig/asterisk + +# Specify the configuration file +AST_CONFIG=/etc/asterisk/asterisk.conf # Installation directory AST_SBIN=/usr/sbin -# Uncomment the following and set them to the user/groups that you -# want to run Asterisk as. NOTE: this requires substantial work to -# be sure that Asterisk's environment has permission to write the -# files required for its operation, including logs, its comm -# socket, the asterisk database, etc. -#AST_USER="asterisk" +# The user that Asterisk will run as. +AST_USER="asterisk" + +# If a user is specified above, Asterisk will change the group it runs +# as to the primary group of the user, as well as initialize the +# supplementary groups. If you want to run Asterisk as a different +# group, set AST_GROUP to the group that Asterisk should run as. Note +# that this may break Zaptel devices as supplementary groups will not +# be initialized. #AST_GROUP="asterisk" -# Source function library. -. /etc/rc.d/init.d/functions +# Allow configuration overrides in /etc/sysconfig/asterisk +CONFIG0=`readlink $0` +if [ "$CONFIG0" = "" ]; then + CONFIGFILE=/etc/sysconfig/`basename $0` +else + CONFIGFILE=/etc/sysconfig/`basename $CONFIG0` +fi +[ -f $CONFIGFILE ] && . $CONFIGFILE if ! [ -x $AST_SBIN/asterisk ] ; then echo "ERROR: $AST_SBIN/asterisk not found" exit 0 fi -if ! [ -d $AST_CONFIG ] ; then - echo "ERROR: $AST_CONFIG directory not found" +if ! [ -f $AST_CONFIG ] ; then + echo "ERROR: $AST_CONFIG not found" exit 0 fi -# Uncomment this ONLY if you know what you are doing. -# export LD_ASSUME_KERNEL=2.4.1 +# Source function library. +. /etc/rc.d/init.d/functions # Full path to asterisk binary DAEMON=$AST_SBIN/asterisk -# Full path to safe_asterisk script -SAFE_ASTERISK=$AST_SBIN/safe_asterisk - -# Allow configuration overrides in /etc/sysconfig/asterisk -CONFIG0=`readlink $0` -if [ "$CONFIG0" = "" ]; then - CONFIGFILE=/etc/sysconfig/`basename $0` -else - CONFIGFILE=/etc/sysconfig/`basename $CONFIG0` -fi -[ -x $CONFIGFILE ] && . $CONFIGFILE - RETVAL=0 start() { # Start daemons. echo -n $"Starting asterisk: " - if [ -f $SAFE_ASTERISK ] ; then - DAEMON=$SAFE_ASTERISK - fi if [ $AST_USER ] ; then ASTARGS="-U $AST_USER" fi @@ -91,7 +88,7 @@ start() { stop() { # Stop daemons. - echo -n $"Shutting down asterisk: " + echo -n $"Stopping asterisk: " killproc asterisk RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk diff --git a/contrib/sysconfig/asterisk b/contrib/sysconfig/asterisk new file mode 100644 index 0000000..2d3598a --- /dev/null +++ b/contrib/sysconfig/asterisk @@ -0,0 +1,16 @@ +# Specify the configuration file +AST_CONFIG=/etc/asterisk/asterisk.conf + +# Installation directory +AST_SBIN=/usr/sbin + +# The user that Asterisk will run as. +AST_USER="asterisk" + +# If a user is specified above, Asterisk will change the group it runs +# as to the primary group of the user, as well as initialize the +# supplementary groups. If you want to run Asterisk as a different +# group, set AST_GROUP to the group that Asterisk should run as. Note +# that this may break Zaptel devices as supplementary groups will not +# be initialized. +#AST_GROUP="asterisk" -- 1.5.4.3 asterisk-1.6.0-beta5-lua.patch: --- NEW FILE asterisk-1.6.0-beta5-lua.patch --- >From a9994c7b56360d493956fe746094a4eb7ad0a95b Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 25 Feb 2008 13:14:23 -0600 Subject: [PATCH] Use pkgconfig to check for Lua. --- configure.ac | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c85548a..771b4c4 100644 --- a/configure.ac +++ b/configure.ac @@ -1308,9 +1308,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then [${PWLIB_INCLUDE}], [${PWLIB_LIB}]) fi -LUA_INCLUDE="-I/usr/include/lua5.1" -LUA_LIB="-llua5.1" -AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) +PBX_LUA=0 +AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) +if test ! "x${PKGCONFIG}" = xNo; then + LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null) + LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null) + PBX_LUA=1 + AC_DEFINE([HAVE_LUA], 1, [Define if your system has the LUA libraries.]) +fi AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) -- 1.5.4.3 asterisk-1.6.0-beta5-optimization.patch: --- NEW FILE asterisk-1.6.0-beta5-optimization.patch --- >From da427afb1c7f005b0b4474f75fe94b7db83ed7d8 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Thu, 8 Nov 2007 16:42:14 -0600 Subject: [PATCH] Pick proper optimization flags for Fedora. --- Makefile | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 03c6a8a..4cd5352 100644 --- a/Makefile +++ b/Makefile @@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu) endif ifeq ($(findstring -save-temps,$(ASTCFLAGS)),) -ASTCFLAGS+=-pipe + ifeq ($(findstring -pipe,$(ASTCFLAGS)),) + ASTCFLAGS+=-pipe + endif +endif + +ifeq ($(findstring -Wall,$(ASTCFLAGS)),) + ASTCFLAGS+=-Wall endif -ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) +ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h @@ -237,8 +243,10 @@ ifneq ($(findstring BSD,$(OSARCH)),) ASTLDFLAGS+=-L/usr/local/lib endif -ifneq ($(PROC),ultrasparc) - ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) +ifeq ($(findstring -march,$(ASTCFLAGS)),) + ifneq ($(PROC),ultrasparc) + ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif endif ifeq ($(PROC),ppc) -- 1.5.4.3 asterisk-1.6.0-beta5-spandspfax.patch: --- NEW FILE asterisk-1.6.0-beta5-spandspfax.patch --- >From c23d8ab21a87ca9f9028bd5823841631635bdf48 Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Mon, 12 Nov 2007 15:51:12 -0600 Subject: [PATCH] Add FAX apps. --- apps/app_rxfax.c | 380 ++++++++++++++++++++++++++++++++++++++++ apps/app_txfax.c | 306 ++++++++++++++++++++++++++++++++ build_tools/menuselect-deps.in | 1 + configure.ac | 3 + makeopts.in | 3 + 5 files changed, 693 insertions(+), 0 deletions(-) create mode 100644 apps/app_rxfax.c create mode 100644 apps/app_txfax.c diff --git a/apps/app_rxfax.c b/apps/app_rxfax.c new file mode 100644 index 0000000..bd81ea1 --- /dev/null +++ b/apps/app_rxfax.c @@ -0,0 +1,380 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * + * Trivial application to receive a TIFF FAX file + * + * Copyright (C) 2003, Steve Underwood + * + * Steve Underwood + * + * This program is free software, distributed under the terms of + * the GNU General Public License + */ + +/*** MODULEINFO + spandsp +***/ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision:$") + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/manager.h" + +#ifndef AST_MODULE +#define AST_MODULE "app_rxfax" +#endif + +static char *app = "RxFAX"; + +static char *synopsis = "Receive a FAX to a file"; + +static char *descrip = +" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n" +"given filename. If the file exists it will be overwritten. The file\n" +"should be in TIFF/F format.\n" +"The \"caller\" option makes the application behave as a calling machine,\n" +"rather than the answering machine. The default behaviour is to behave as\n" +"an answering machine.\n" +"Uses LOCALSTATIONID to identify itself to the remote end.\n" +" LOCALHEADERINFO to generate a header line on each page.\n" +"Sets REMOTESTATIONID to the sender CSID.\n" +" FAXPAGES to the number of pages received.\n" +" FAXBITRATE to the transmition rate.\n" +" FAXRESOLUTION to the resolution.\n" +"Returns -1 when the user hangs up.\n" +"Returns 0 otherwise.\n"; + +#define MAX_BLOCK_SIZE 240 + +static void span_message(int level, const char *msg) +{ + int ast_level; + + if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else + ast_level = __LOG_DEBUG; + ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg); +} +/*- End of function --------------------------------------------------------*/ + +#if 0 +static void t30_flush(t30_state_t *s, int which) +{ + /* TODO: */ +} +/*- End of function --------------------------------------------------------*/ +#endif + +static void phase_e_handler(t30_state_t *s, void *user_data, int result) +{ + struct ast_channel *chan; + t30_stats_t t; + char local_ident[21]; + char far_ident[21]; + char buf[11]; + + chan = (struct ast_channel *) user_data; + if (result == T30_ERR_OK) + { + t30_get_transfer_statistics(s, &t); + t30_get_far_ident(s, far_ident); + t30_get_local_ident(s, local_ident); + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Fax successfully received.\n"); + ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident); + ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident); + ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.x_resolution, t.y_resolution); + ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + ast_log(LOG_DEBUG, "==============================================================================\n"); + manager_event(EVENT_FLAG_CALL, + "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n", + chan->name, + chan->exten, + (chan->cid.cid_num) ? chan->cid.cid_num : "", + far_ident, + local_ident, + t.pages_transferred, + t.y_resolution, + t.bit_rate, + s->rx_file); + pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); + snprintf(buf, sizeof(buf), "%i", t.pages_transferred); + pbx_builtin_setvar_helper(chan, "FAXPAGES", buf); + snprintf(buf, sizeof(buf), "%i", t.y_resolution); + pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf); + snprintf(buf, sizeof(buf), "%i", t.bit_rate); + pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf); + } + else + { + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); + ast_log(LOG_DEBUG, "==============================================================================\n"); + } +} +/*- End of function --------------------------------------------------------*/ + +static void phase_d_handler(t30_state_t *s, void *user_data, int result) +{ + struct ast_channel *chan; + t30_stats_t t; + + chan = (struct ast_channel *) user_data; + if (result) + { + t30_get_transfer_statistics(s, &t); + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.width, t.length); + ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.x_resolution, t.y_resolution); + ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows); + ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); + ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding); + ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); + ast_log(LOG_DEBUG, "==============================================================================\n"); + } +} +/*- End of function --------------------------------------------------------*/ + +static int rxfax_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + char template_file[256]; + char target_file[256]; + char *s; + char *t; + char *v; + const char *x; + int option; + int len; + int i; + fax_state_t fax; + int calling_party; + int verbose; + int samples; + + struct ast_module_user *u; + struct ast_frame *inf = NULL; + struct ast_frame outf; + + int original_read_fmt; + int original_write_fmt; + + uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; + uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; + + if (chan == NULL) + { + ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n"); + return -1; + } + + span_set_message_handler(span_message); + + /* The next few lines of code parse out the filename and header from the input string */ + if (data == NULL) + { + /* No data implies no filename or anything is present */ + ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n"); + return -1; + } + + calling_party = FALSE; + verbose = FALSE; + target_file[0] = '\0'; + + for (option = 0, v = s = data; v; option++, s++) + { + t = s; + v = strchr(s, '|'); + s = (v) ? v : s + strlen(s); + strncpy((char *) buf, t, s - t); + buf[s - t] = '\0'; + if (option == 0) + { + /* The first option is always the file name */ + len = s - t; + if (len > 255) + len = 255; + strncpy(target_file, t, len); + target_file[len] = '\0'; + /* Allow the use of %d in the file name for a wild card of sorts, to + create a new file with the specified name scheme */ + if ((x = strchr(target_file, '%')) && x[1] == 'd') + { + strcpy(template_file, target_file); + i = 0; + do + { + snprintf(target_file, 256, template_file, 1); + i++; + } + while (ast_fileexists(target_file, "", chan->language) != -1); + } + } + else if (strncmp("caller", t, s - t) == 0) + { + calling_party = TRUE; + } + else if (strncmp("debug", t, s - t) == 0) + { + verbose = TRUE; + } + } + + /* Done parsing */ + + u = ast_module_user_add(chan); + + if (chan->_state != AST_STATE_UP) + { + /* Shouldn't need this, but checking to see if channel is already answered + * Theoretically asterisk should already have answered before running the app */ + res = ast_answer(chan); + } + + if (!res) + { + original_read_fmt = chan->readformat; + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); + return -1; + } + } + original_write_fmt = chan->writeformat; + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + return -1; + } + } + fax_init(&fax, calling_party); + if (verbose) + fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW; + x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); + if (x && x[0]) + t30_set_local_ident(&fax.t30_state, x); + x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); + if (x && x[0]) + t30_set_header_info(&fax.t30_state, x); + t30_set_rx_file(&fax.t30_state, target_file, -1); + //t30_set_phase_b_handler(&fax.t30_state, phase_b_handler, chan); + t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, chan); + t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, chan); + t30_set_ecm_capability(&fax.t30_state, TRUE); + t30_set_supported_compressions(&fax.t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); + while (ast_waitfor(chan, -1) > -1) + { + inf = ast_read(chan); + if (inf == NULL) + { + res = -1; + break; + } + if (inf->frametype == AST_FRAME_VOICE) + { + if (fax_rx(&fax, inf->data, inf->samples)) + break; + samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; + len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); + if (len) + { + memset(&outf, 0, sizeof(outf)); + outf.frametype = AST_FRAME_VOICE; + outf.subclass = AST_FORMAT_SLINEAR; + outf.datalen = len*sizeof(int16_t); + outf.samples = len; + outf.data = &buf[AST_FRIENDLY_OFFSET]; + outf.offset = AST_FRIENDLY_OFFSET; + outf.src = "RxFAX"; + if (ast_write(chan, &outf) < 0) + { + ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); + break; + } + } + } + ast_frfree(inf); + } + if (inf == NULL) + { + ast_log(LOG_DEBUG, "Got hangup\n"); + res = -1; + } + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + } + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, original_write_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); + } + t30_terminate(&fax.t30_state); + } + else + { + ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); + } + ast_module_user_remove(u); + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int unload_module(void) +{ + int res; + + ast_module_user_hangup_all(); + + res = ast_unregister_application(app); + + + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int load_module(void) +{ + return ast_register_application(app, rxfax_exec, synopsis, descrip); +} +/*- End of function --------------------------------------------------------*/ + +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial FAX Receive Application"); + +/*- End of file ------------------------------------------------------------*/ diff --git a/apps/app_txfax.c b/apps/app_txfax.c new file mode 100644 index 0000000..713ecf1 --- /dev/null +++ b/apps/app_txfax.c @@ -0,0 +1,306 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * + * Trivial application to send a TIFF file as a FAX + * + * Copyright (C) 2003, Steve Underwood + * + * Steve Underwood + * + * This program is free software, distributed under the terms of + * the GNU General Public License + */ + +/*** MODULEINFO + spandsp +***/ + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision:$") + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" + +#ifndef AST_MODULE +#define AST_MODULE "app_txfax" +#endif + +static char *app = "TxFAX"; + +static char *synopsis = "Send a FAX file"; + +static char *descrip = +" TxFAX(filename[|caller][|debug]): Send a given TIFF file to the channel as a FAX.\n" +"The \"caller\" option makes the application behave as a calling machine,\n" +"rather than the answering machine. The default behaviour is to behave as\n" +"an answering machine.\n" +"Uses LOCALSTATIONID to identify itself to the remote end.\n" +" LOCALHEADERINFO to generate a header line on each page.\n" +"Sets REMOTESTATIONID to the receiver CSID.\n" +"Returns -1 when the user hangs up, or if the file does not exist.\n" +"Returns 0 otherwise.\n"; + +#define MAX_BLOCK_SIZE 240 + +static void span_message(int level, const char *msg) +{ + int ast_level; + + if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else if (level == SPAN_LOG_WARNING) + ast_level = __LOG_WARNING; + else + ast_level = __LOG_DEBUG; + ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg); +} +/*- End of function --------------------------------------------------------*/ + +#if 0 +static void t30_flush(t30_state_t *s, int which) +{ + /* TODO: */ +} +/*- End of function --------------------------------------------------------*/ +#endif + +static void phase_e_handler(t30_state_t *s, void *user_data, int result) +{ + struct ast_channel *chan; + char far_ident[21]; + + chan = (struct ast_channel *) user_data; + if (result == T30_ERR_OK) + { + t30_get_far_ident(s, far_ident); + pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); + } + else + { + ast_log(LOG_DEBUG, "==============================================================================\n"); + ast_log(LOG_DEBUG, "Fax send not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); + ast_log(LOG_DEBUG, "==============================================================================\n"); + } +} +/*- End of function --------------------------------------------------------*/ + +static int txfax_exec(struct ast_channel *chan, void *data) +{ + int res = 0; + char source_file[256]; + char *s; + char *t; + char *v; + const char *x; + int option; + int len; + fax_state_t fax; + int calling_party; + int verbose; + int samples; + + struct ast_module_user *u; + struct ast_frame *inf = NULL; + struct ast_frame outf; + + int original_read_fmt; + int original_write_fmt; + + uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; + uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; + + if (chan == NULL) + { + ast_log(LOG_WARNING, "Fax transmit channel is NULL. Giving up.\n"); + return -1; + } + + span_set_message_handler(span_message); + + /* The next few lines of code parse out the filename and header from the input string */ + if (data == NULL) + { + /* No data implies no filename or anything is present */ + ast_log(LOG_WARNING, "Txfax requires an argument (filename)\n"); + return -1; + } + + calling_party = FALSE; + verbose = FALSE; + source_file[0] = '\0'; + + for (option = 0, v = s = data; v; option++, s++) + { + t = s; + v = strchr(s, '|'); + s = (v) ? v : s + strlen(s); + strncpy((char *) buf, t, s - t); + buf[s - t] = '\0'; + if (option == 0) + { + /* The first option is always the file name */ + len = s - t; + if (len > 255) + len = 255; + strncpy(source_file, t, len); + source_file[len] = '\0'; + } + else if (strncmp("caller", t, s - t) == 0) + { + calling_party = TRUE; + } + else if (strncmp("debug", t, s - t) == 0) + { + verbose = TRUE; + } + } + + /* Done parsing */ + + u = ast_module_user_add(chan); + + if (chan->_state != AST_STATE_UP) + { + /* Shouldn't need this, but checking to see if channel is already answered + * Theoretically asterisk should already have answered before running the app */ + res = ast_answer(chan); + } + + if (!res) + { + original_read_fmt = chan->readformat; + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); + return -1; + } + } + original_write_fmt = chan->writeformat; + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); + if (res < 0) + { + ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + return -1; + } + } + fax_init(&fax, calling_party); + if (verbose) + fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW; + + x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); + if (x && x[0]) + t30_set_local_ident(&fax.t30_state, x); + x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); + if (x && x[0]) + t30_set_header_info(&fax.t30_state, x); + t30_set_tx_file(&fax.t30_state, source_file, -1, -1); + //t30_set_phase_b_handler(&fax.t30_state, phase_b_handler, chan); + //t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, chan); + t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, chan); + t30_set_ecm_capability(&fax.t30_state, TRUE); + t30_set_supported_compressions(&fax.t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); + while (ast_waitfor(chan, -1) > -1) + { + inf = ast_read(chan); + if (inf == NULL) + { + res = -1; + break; + } + if (inf->frametype == AST_FRAME_VOICE) + { + if (fax_rx(&fax, inf->data, inf->samples)) + break; + samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; + len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); + if (len) + { + memset(&outf, 0, sizeof(outf)); + outf.frametype = AST_FRAME_VOICE; + outf.subclass = AST_FORMAT_SLINEAR; + outf.datalen = len*sizeof(int16_t); + outf.samples = len; + outf.data = &buf[AST_FRIENDLY_OFFSET]; + outf.offset = AST_FRIENDLY_OFFSET; + if (ast_write(chan, &outf) < 0) + { + ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); + break; + } + } + } + ast_frfree(inf); + } + if (inf == NULL) + { + ast_log(LOG_DEBUG, "Got hangup\n"); + res = -1; + } + if (original_read_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_read_format(chan, original_read_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); + } + if (original_write_fmt != AST_FORMAT_SLINEAR) + { + res = ast_set_write_format(chan, original_write_fmt); + if (res) + ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); + } + t30_terminate(&fax.t30_state); + } + else + { + ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); + } + ast_module_user_remove(u); + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int unload_module(void) +{ + int res; + + ast_module_user_hangup_all(); + + res = ast_unregister_application(app); + + + return res; +} +/*- End of function --------------------------------------------------------*/ + +static int load_module(void) +{ + return ast_register_application(app, txfax_exec, synopsis, descrip); +} +/*- End of function --------------------------------------------------------*/ + +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Trivial FAX Transmit Application"); + +/*- End of file ------------------------------------------------------------*/ diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 80eaf7d..4923560 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -29,6 +29,7 @@ POPT=@PBX_POPT@ PORTAUDIO=@PBX_PORTAUDIO@ PRI=@PBX_PRI@ RADIUS=@PBX_RADIUS@ +SPANDSP=@PBX_SPANDSP@ SPEEX=@PBX_SPEEX@ SPEEXDSP=@PBX_SPEEXDSP@ SQLITE3=@PBX_SQLITE3@ diff --git a/configure.ac b/configure.ac index 85e7aa2..cacb116 100644 --- a/configure.ac +++ b/configure.ac @@ -235,6 +235,7 @@ AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7]) AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib]) AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius]) +AST_EXT_LIB_SETUP([SPANDSP], [spandsp Library], [spandsp]) AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex]) AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp]) AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite]) @@ -1309,6 +1310,8 @@ AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) +AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [fax_init], [spandsp.h], [-ltiff]) + AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm]) AST_EXT_LIB_CHECK([SPEEXDSP], [speexdsp], [speex_preprocess_ctl], [speex/speex.h], [-lm]) diff --git a/makeopts.in b/makeopts.in index 1b150a9..5baa11f 100644 --- a/makeopts.in +++ b/makeopts.in @@ -165,6 +165,9 @@ SDL_LIB=@SDL_LIB@ SDL_IMAGE_INCLUDE=@SDL_IMAGE_INCLUDE@ SDL_IMAGE_LIB=@SDL_IMAGE_LIB@ +SPANDSP_INCLUDE=@SPANDSP_INCLUDE@ +SPANDSP_LIB=@SPANDSP_LIB@ + SPEEX_INCLUDE=@SPEEX_INCLUDE@ SPEEX_LIB=@SPEEX_LIB@ -- 1.5.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Feb 2008 22:56:39 -0000 1.8 +++ .cvsignore 6 Mar 2008 06:19:31 -0000 1.9 @@ -1 +1 @@ -asterisk-1.6.0-beta4-stripped.tar.gz +asterisk-1.6.0-beta5-stripped.tar.gz Index: asterisk.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- asterisk.spec 3 Mar 2008 19:25:34 -0000 1.15 +++ asterisk.spec 6 Mar 2008 06:19:31 -0000 1.16 @@ -1,10 +1,10 @@ %define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0} -%define beta 4 +%define beta 5 Summary: The Open Source PBX Name: asterisk Version: 1.6.0 -Release: 0.3.beta4%{?dist} +Release: 0.4.beta%{beta}%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.asterisk.org/ @@ -18,13 +18,13 @@ # # MD5 Sums # ======== -# 96b5b0cb960ddd88bb09896e62c85f6b asterisk-1.6.0-beta4.tar.gz -# 827fca887b15d5141c08cdef30b7ceb0 asterisk-1.6.0-beta4-stripped.tar.gz +# dbed33a8ee036ee7ecf9280f3f04f5de asterisk-1.6.0-beta5.tar.gz +# c8d03cb1af828da07177fe837546d6f9 asterisk-1.6.0-beta5-stripped.tar.gz # # SHA1 Sums # ========= -# 1f67154aefdb25fb03eb4b378a2c61a7ee1bd434 asterisk-1.6.0-beta4.tar.gz -# 9f1b7d4e6b405327a038ed7cc484460beac26852 asterisk-1.6.0-beta4-stripped.tar.gz +# 3061015fba17766948fc33b0f7dfb9ad187b5981 asterisk-1.6.0-beta5.tar.gz +# 5eb34e991168f7a53334fef72a3d79a9c6170156 asterisk-1.6.0-beta5-stripped.tar.gz Source0: asterisk-%{version}%{?beta:-beta%{beta}}-stripped.tar.gz Source1: asterisk-logrotate @@ -32,17 +32,15 @@ Source3: menuselect.makeopts Source4: asterisk-strip.sh -Patch1: asterisk-1.6.0-beta4-initscripts.patch -Patch2: asterisk-1.6.0-beta4-alternate-voicemail.patch -Patch3: asterisk-1.6.0-beta4-spandspfax.patch -Patch4: asterisk-1.6.0-beta4-appconference.patch -Patch5: asterisk-1.6.0-beta4-alternate-extensions.patch -Patch6: asterisk-1.6.0-beta4-optimization.patch -Patch7: asterisk-1.6.0-beta4-chanmobile.patch -Patch8: asterisk-1.6.0-beta4-lua.patch -Patch9: asterisk-1.6.0-beta4-autoconf.patch -Patch10: asterisk-1.6.0-beta4-astcanary.patch -Patch11: asterisk-1.6.0-beta4-funcdesc.patch +Patch1: asterisk-1.6.0-beta5-initscripts.patch +Patch2: asterisk-1.6.0-beta5-alternate-voicemail.patch +Patch3: asterisk-1.6.0-beta5-spandspfax.patch +Patch4: asterisk-1.6.0-beta5-appconference.patch +Patch5: asterisk-1.6.0-beta5-alternate-extensions.patch +Patch6: asterisk-1.6.0-beta5-optimization.patch +Patch7: asterisk-1.6.0-beta5-chanmobile.patch +Patch8: asterisk-1.6.0-beta5-lua.patch +Patch9: asterisk-1.6.0-beta5-autoconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -403,8 +401,6 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -%patch11 -p1 cp %{SOURCE2} menuselect.makedeps cp %{SOURCE3} menuselect.makeopts @@ -1010,6 +1006,10 @@ %{_libdir}/asterisk/modules/codec_zap.so %changelog +* Wed Mar 5 2008 Jeffrey C. Ollie - 1.6.0-0.4.beta5 +- Update to 1.6.0-beta5 +- Remove upstreamed patches. + * Mon Mar 3 2008 Jeffrey C. Ollie - 1.6.0-0.3.beta4 - Package the directory used to store monitor recordings. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Feb 2008 22:56:39 -0000 1.8 +++ sources 6 Mar 2008 06:19:31 -0000 1.9 @@ -1 +1 @@ -827fca887b15d5141c08cdef30b7ceb0 asterisk-1.6.0-beta4-stripped.tar.gz +c8d03cb1af828da07177fe837546d6f9 asterisk-1.6.0-beta5-stripped.tar.gz --- asterisk-1.6.0-beta4-alternate-extensions.patch DELETED --- --- asterisk-1.6.0-beta4-alternate-voicemail.patch DELETED --- --- asterisk-1.6.0-beta4-appconference.patch DELETED --- --- asterisk-1.6.0-beta4-astcanary.patch DELETED --- --- asterisk-1.6.0-beta4-autoconf.patch DELETED --- --- asterisk-1.6.0-beta4-chanmobile.patch DELETED --- --- asterisk-1.6.0-beta4-funcdesc.patch DELETED --- --- asterisk-1.6.0-beta4-initscripts.patch DELETED --- --- asterisk-1.6.0-beta4-lua.patch DELETED --- --- asterisk-1.6.0-beta4-optimization.patch DELETED --- --- asterisk-1.6.0-beta4-spandspfax.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 06:51:43 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Thu, 6 Mar 2008 06:51:43 GMT Subject: rpms/xorg-x11-drv-i810/devel intel-modeset.patch, NONE, 1.1 intel-stub.c, 1.1, 1.2 xorg-x11-drv-i810.spec, 1.78, 1.79 Message-ID: <200803060651.m266phoi028797@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28774 Modified Files: intel-stub.c xorg-x11-drv-i810.spec Added Files: intel-modeset.patch Log Message: * Thu Mar 06 2008 Dave Airlie 2.2.1-5 - Bump to include modesetting driver - and make stub auto pick batchbuffer branch if modesetting enabled intel-modeset.patch: --- NEW FILE intel-modeset.patch --- diff --git a/configure.ac b/configure.ac index c9773e6..a3d545e 100644 --- a/configure.ac +++ b/configure.ac @@ -202,6 +202,10 @@ if test "$DRI" = yes; then save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS $DRI_CFLAGS" + AC_CHECK_HEADER(xf86drmMode.h,[DRM_MODE=yes],[DRM_MODE=no],[#include "stdint.h"]) + if test "x$DRM_MODE" = xyes; then + AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting]) + fi AC_CHECK_TYPE(drm_i915_flip_t, [AC_DEFINE(HAVE_I915_FLIP, 1, [Have drm_i915_flip_t and related definitions])], diff --git a/src/Makefile.am b/src/Makefile.am index 701d928..441f0ca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -122,8 +122,13 @@ intel_drv_la_SOURCES = \ dri_bufmgr_remap.h \ intel_bufmgr_ttm.c \ intel_bufmgr_ttm.h \ + intel_bufmgr_exa.c \ + intel_bufmgr_exa.h \ intel_batchbuffer.c \ - intel_batchbuffer.h + intel_batchbuffer.h \ + drmmode_display.c \ + drmmode_display.h + INTEL_G4A = \ packed_yuv_sf.g4a \ diff --git a/src/common.h b/src/common.h index 2d3b84b..7100b4e 100644 --- a/src/common.h +++ b/src/common.h @@ -229,6 +229,9 @@ union intfloat { if (I810_DEBUG & DEBUG_VERBOSE_RING) \ ErrorF( "BEGIN_LP_RING %d in %s\n", n, FUNCTION_NAME); +#define ENSURE_LP_RING(n) \ + if (RecPtr->LpRing->space < (n) * 4) \ + WaitRingFunc(pScrn, (n) * 4, 0); #define BEGIN_LP_RING(n) \ RING_LOCALS \ diff --git a/src/drmmode_display.c b/src/drmmode_display.c new file mode 100644 index 0000000..34cf2e0 --- /dev/null +++ b/src/drmmode_display.c @@ -0,0 +1,615 @@ +/* + * Copyright ?? 2007 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Authors: + * Dave Airlie + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef XF86DRM_MODE +#include "i830.h" + +static Bool +drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height) +{ + scrn->virtualX = width; + scrn->virtualY = height; + return TRUE; +} + +static void +drmmode_ConvertFromKMode(ScrnInfoPtr scrn, + struct drm_mode_modeinfo *kmode, + DisplayModePtr mode) +{ + memset(mode, 0, sizeof(DisplayModeRec)); + mode->status = MODE_OK; + + mode->Clock = kmode->clock; + + mode->HDisplay = kmode->hdisplay; + mode->HSyncStart = kmode->hsync_start; + mode->HSyncEnd = kmode->hsync_end; + mode->HTotal = kmode->htotal; + mode->HSkew = kmode->hskew; + + mode->VDisplay = kmode->vdisplay; + mode->VSyncStart = kmode->vsync_start; + mode->VSyncEnd = kmode->vsync_end; + mode->VTotal = kmode->vtotal; + mode->VScan = kmode->vscan; + + mode->Flags = kmode->flags; //& FLAG_BITS; + mode->name = strdup(kmode->name); + + if (kmode->type & DRM_MODE_TYPE_DRIVER) + mode->type = M_T_DRIVER; + if (kmode->type & DRM_MODE_TYPE_PREFERRED) + mode->type |= M_T_PREFERRED; + xf86SetModeCrtc (mode, scrn->adjustFlags); +} + +static void +drmmode_ConvertToKMode(ScrnInfoPtr scrn, + struct drm_mode_modeinfo *kmode, + DisplayModePtr mode) +{ + memset(kmode, 0, sizeof(*kmode)); + + kmode->clock = mode->Clock; + kmode->hdisplay = mode->HDisplay; + kmode->hsync_start = mode->HSyncStart; + kmode->hsync_end = mode->HSyncEnd; + kmode->htotal = mode->HTotal; + kmode->hskew = mode->HSkew; + + kmode->vdisplay = mode->VDisplay; + kmode->vsync_start = mode->VSyncStart; + kmode->vsync_end = mode->VSyncEnd; + kmode->vtotal = mode->VTotal; + kmode->vscan = mode->VScan; + + kmode->flags = mode->Flags; //& FLAG_BITS; + if (mode->name) + strncpy(kmode->name, mode->name, DRM_DISPLAY_MODE_LEN); + kmode->name[DRM_DISPLAY_MODE_LEN-1] = 0; + +} + +static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = { + drmmode_xf86crtc_resize +}; + +static void +drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode) +{ + +} + +static Bool +drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, + Rotation rotation, int x, int y) +{ + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); + drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; + drmmode_ptr drmmode = drmmode_crtc->drmmode; + int saved_x, saved_y; + Rotation saved_rotation; + DisplayModeRec saved_mode; + uint32_t *output_ids; + int output_count = 0; + int ret = TRUE; + int i; + int fb_id; + struct drm_mode_modeinfo kmode; + + saved_mode = crtc->mode; + saved_x = crtc->x; + saved_y = crtc->y; + saved_rotation = crtc->rotation; + + crtc->mode = *mode; + crtc->x = x; + crtc->y = y; + crtc->rotation = rotation; + + output_ids = xcalloc(sizeof(uint32_t), xf86_config->num_output); + if (!output_ids) { + ret = FALSE; + goto done; + } + + for (i = 0; i < xf86_config->num_output; i++) { [...3471 lines suppressed...] diff --git a/src/intel_bufmgr_exa.c b/src/intel_bufmgr_exa.c new file mode 100644 index 0000000..f4a3590 --- /dev/null +++ b/src/intel_bufmgr_exa.c @@ -0,0 +1,167 @@ +/************************************************************************** + * + * Copyright ? 2007-2008 Red Hat Inc. + * Copyright ? 2007 Intel Corporation + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * + **************************************************************************/ +/* + * Authors: Thomas Hellstr?m + * Keith Whitwell + * Eric Anholt + * Dave Airlie + * Kristian H?gsberg + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#include +#include + +#include "xf86.h" +#include "i830.h" +#include "errno.h" +#include "dri_bufmgr.h" +#include "string.h" + +#include "i915_drm.h" + +#include "intel_bufmgr_exa.h" + +typedef struct _dri_bufmgr_exa { + dri_bufmgr bufmgr; + ScrnInfoPtr pScrn; +} dri_bufmgr_exa; + +typedef struct _dri_bo_exa { + dri_bo bo; + i830_memory *memory; + int refcount; +} dri_bo_exa; + +static dri_bo * +dri_exa_alloc(dri_bufmgr *bufmgr, const char *name, + unsigned long size, unsigned int alignment, + uint64_t location_mask) +{ + dri_bufmgr_exa *bufmgr_exa = (dri_bufmgr_exa *)bufmgr; + I830Ptr pI830 = I830PTR(bufmgr_exa->pScrn); + dri_bo_exa *exa_buf; + + exa_buf = malloc(sizeof(*exa_buf)); + if (!exa_buf) + return NULL; + + exa_buf->refcount = 1; + exa_buf->memory = i830_allocate_memory(bufmgr_exa->pScrn, + name, size, alignment, 0); + + exa_buf->bo.size = exa_buf->memory->size; + exa_buf->bo.offset = exa_buf->memory->offset; + exa_buf->bo.bufmgr = bufmgr; + exa_buf->bo.virtual = pI830->FbBase + exa_buf->memory->offset; + + return &exa_buf->bo; +} + +static void +dri_exa_bo_reference(dri_bo *buf) +{ + dri_bo_exa *exa_buf = (dri_bo_exa *)buf; + + exa_buf->refcount++; +} + +static void +dri_exa_bo_unreference(dri_bo *buf) +{ + dri_bufmgr_exa *bufmgr_exa = (dri_bufmgr_exa *)buf->bufmgr; + dri_bo_exa *exa_buf = (dri_bo_exa *)buf; + + if (!buf) + return; + + if (--exa_buf->refcount == 0) + i830_free_memory(bufmgr_exa->pScrn, exa_buf->memory); +} + +static int +dri_exa_bo_map(dri_bo *buf, GLboolean write_enable) +{ + return 0; +} + +static int +dri_exa_bo_unmap(dri_bo *buf) +{ + return 0; +} + +static void +dri_bufmgr_exa_destroy(dri_bufmgr *bufmgr) +{ + free(bufmgr); +} + +static void +dri_exa_emit_reloc(dri_bo *reloc_buf, uint64_t flags, GLuint delta, + GLuint offset, dri_bo *target_buf) +{ +} + +/** + * Initializes the EXA buffer manager, which is just a thin wrapper + * around the EXA allocator. + * + * \param fd File descriptor of the opened DRM device. + * \param fence_type Driver-specific fence type used for fences with no flush. + * \param fence_type_flush Driver-specific fence type used for fences with a + * flush. + */ +dri_bufmgr * +intel_bufmgr_exa_init(ScrnInfoPtr pScrn) +{ + dri_bufmgr_exa *bufmgr_exa; + + bufmgr_exa = calloc(1, sizeof(*bufmgr_exa)); + bufmgr_exa->pScrn = pScrn; + + bufmgr_exa->bufmgr.bo_alloc = dri_exa_alloc; + bufmgr_exa->bufmgr.bo_reference = dri_exa_bo_reference; + bufmgr_exa->bufmgr.bo_unreference = dri_exa_bo_unreference; + bufmgr_exa->bufmgr.bo_map = dri_exa_bo_map; + bufmgr_exa->bufmgr.bo_unmap = dri_exa_bo_unmap; + bufmgr_exa->bufmgr.destroy = dri_bufmgr_exa_destroy; + bufmgr_exa->bufmgr.emit_reloc = dri_exa_emit_reloc; + + return &bufmgr_exa->bufmgr; +} + diff --git a/src/intel_bufmgr_exa.h b/src/intel_bufmgr_exa.h new file mode 100644 index 0000000..ebfb38f --- /dev/null +++ b/src/intel_bufmgr_exa.h @@ -0,0 +1,8 @@ +#ifndef INTEL_BUFMGR_EXA_H +#define INTEL_BUFMGR_EXA_H + +#include "dri_bufmgr.h" + +dri_bufmgr *intel_bufmgr_exa_init(ScrnInfoPtr pScrn); + +#endif diff --git a/src/intel_bufmgr_ttm.c b/src/intel_bufmgr_ttm.c index 6d8719d..5652889 100644 --- a/src/intel_bufmgr_ttm.c +++ b/src/intel_bufmgr_ttm.c @@ -374,7 +374,7 @@ dri_ttm_alloc(dri_bufmgr *bufmgr, const char *name, ttm_buf->validate_index = -1; ttm_buf->map_count = 0; - DBG("bo_create: %p (%s) %ldb\n", &ttm_buf->bo, ttm_buf->name, size); + DBG("bo_create: %p %08x (%s) %ldb\n", &ttm_buf->bo, ttm_buf->drm_bo.handle, ttm_buf->name, size); return &ttm_buf->bo; } Index: intel-stub.c =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-stub.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- intel-stub.c 27 Feb 2008 22:32:21 -0000 1.1 +++ intel-stub.c 6 Mar 2008 06:51:07 -0000 1.2 @@ -30,6 +30,7 @@ * Kristian H??gsberg (krh at redhat.com) */ +#include #include "xorg-server.h" #include "xf86.h" #include "xf86Priv.h" @@ -53,12 +54,31 @@ pointer driver; Bool value; const char *name; - - xf86ProcessOptions(-1, xf86ConfigLayout.options, stubOptions); - if (xf86GetOptValBool(stubOptions, FLAG_BATCHBUFFER, &value) && value) + int cmdline_fd; + int kmode = 0; + + cmdline_fd = open("/proc/cmdline", O_RDONLY); + if (cmdline_fd >= 0) { + char buf[255]; + int ret; + + ret = read(cmdline_fd, buf, 255); + if (ret > 0) { + if (strstr(buf, "i915.modeset=1")) { + kmode = 1; + } + } + close(cmdline_fd); + } + + if (kmode == 0) { + xf86ProcessOptions(-1, xf86ConfigLayout.options, stubOptions); + if (xf86GetOptValBool(stubOptions, FLAG_BATCHBUFFER, &value) && value) name = "intel_batchbuffer"; - else + else name = "intel_master"; + } else + name = "intel_batchbuffer"; driver = LoadSubModule(module, name, NULL, NULL, NULL, NULL, errmaj, errmin); Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- xorg-x11-drv-i810.spec 4 Mar 2008 00:34:50 -0000 1.78 +++ xorg-x11-drv-i810.spec 6 Mar 2008 06:51:07 -0000 1.79 @@ -5,7 +5,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-i810 Version: 2.2.1 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -26,6 +26,7 @@ Patch100: intel-master.patch Patch101: intel-batchbuffer.patch +Patch102: intel-modeset.patch ExclusiveArch: %{ix86} x86_64 ia64 @@ -65,6 +66,7 @@ cd ../xf86-video-intel-%{batchbuffer_version} %patch101 -p1 -b .intel-batchbuffer +%patch102 -p1 -b .intel-modeset %build @@ -126,6 +128,10 @@ %{_libdir}/libI810XvMC.so %changelog +* Thu Mar 06 2008 Dave Airlie 2.2.1-5 +- Bump to include modesetting driver - and make stub auto pick + batchbuffer branch if modesetting enabled + * Mon Mar 3 2008 Kristian H??gsberg - 2.2.1-4 - Bump intel-batchbuffer to latest snapshot, rebuild against new server ABI. From fedora-extras-commits at redhat.com Thu Mar 6 07:09:17 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Thu, 6 Mar 2008 07:09:17 GMT Subject: rpms/xorg-x11-drv-i810/devel intel-modeset.patch, 1.1, 1.2 xorg-x11-drv-i810.spec, 1.79, 1.80 Message-ID: <200803060709.m2679H9S003618@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3595 Modified Files: intel-modeset.patch xorg-x11-drv-i810.spec Log Message: * Thu Mar 06 2008 Dave Airlie 2.2.1-6 - fix modesetting to start on i965 chips intel-modeset.patch: Index: intel-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-modeset.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- intel-modeset.patch 6 Mar 2008 06:51:07 -0000 1.1 +++ intel-modeset.patch 6 Mar 2008 07:08:53 -0000 1.2 @@ -1018,7 +1018,7 @@ info.sarea_priv_offset = 0; info.sarea_handle = sarea_handle; diff --git a/src/i830_driver.c b/src/i830_driver.c -index ba44645..8c13a15 100644 +index ba44645..ef9ac24 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -198,6 +198,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -2050,6 +2050,15 @@ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: Not available\n"); #endif +@@ -3035,7 +3166,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (serverGeneration == 1) + xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); + +- if (IS_I965G(pI830)) { ++ if (!pI830->use_drm_mode && IS_I965G(pI830)) { + /* turn off clock gating */ + #if 0 + OUTREG(0x6204, 0x70804000); @@ -3124,9 +3255,11 @@ I830LeaveVT(int scrnIndex, int flags) xf86_hide_cursors (pScrn); Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- xorg-x11-drv-i810.spec 6 Mar 2008 06:51:07 -0000 1.79 +++ xorg-x11-drv-i810.spec 6 Mar 2008 07:08:53 -0000 1.80 @@ -5,7 +5,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-i810 Version: 2.2.1 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -128,6 +128,9 @@ %{_libdir}/libI810XvMC.so %changelog +* Thu Mar 06 2008 Dave Airlie 2.2.1-6 +- fix modesetting to start on i965 chips + * Thu Mar 06 2008 Dave Airlie 2.2.1-5 - Bump to include modesetting driver - and make stub auto pick batchbuffer branch if modesetting enabled From fedora-extras-commits at redhat.com Thu Mar 6 07:13:07 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Thu, 6 Mar 2008 07:13:07 GMT Subject: rpms/quota/devel quota.spec,1.39,1.40 Message-ID: <200803060713.m267D7O5003759@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/quota/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3695 Modified Files: quota.spec Log Message: added symbolic link for quotaoff man page + don't ship xqmstats.8 man page (#436100,#436110) Index: quota.spec =================================================================== RCS file: /cvs/extras/rpms/quota/devel/quota.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- quota.spec 21 Feb 2008 15:08:54 -0000 1.39 +++ quota.spec 6 Mar 2008 07:12:32 -0000 1.40 @@ -5,7 +5,7 @@ Summary: System administration tools for monitoring users' disk usage Epoch: 1 Version: 3.15 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD and GPLv2+ URL: http://sourceforge.net/projects/linuxquota/ Group: System Environment/Base @@ -64,6 +64,9 @@ rm -f %{buildroot}%{_sbindir}/quot rm -f %{buildroot}%{_sbindir}/xqmstats rm -f %{buildroot}%{_mandir}/man8/quot.* +rm -f %{buildroot}%{_mandir}/man8/xqmstats.* +ln -s %{_mandir}/man8/quotaon.8 \ + %{buildroot}%{_mandir}/man8/quotaoff.8 %find_lang %{name} @@ -86,6 +89,11 @@ %changelog +* Thu Mar 6 2008 Ondrej Vasik 3.15-5 +- added symbolic link for quotaoff man page(#436110) +- don't ship xqmstats.8 man page as we don't ship those + binaries(#436100) + * Thu Feb 21 2008 Ondrej Vasik 3.15-4 - added pointers to quota_nld and warnquota to some manpages(upstream, #83975) From fedora-extras-commits at redhat.com Thu Mar 6 07:13:30 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 6 Mar 2008 07:13:30 GMT Subject: rpms/keepassx/F-8 .cvsignore, 1.4, 1.5 keepassx.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200803060713.m267DUQ5003801@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/keepassx/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3716/F-8 Modified Files: .cvsignore keepassx.spec sources Log Message: * Wed Mar 05 2008 Aurelien Bompard 0.3.0-3.a - version 0.3.0a Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2008 19:10:44 -0000 1.4 +++ .cvsignore 6 Mar 2008 07:12:53 -0000 1.5 @@ -1 +1 @@ -KeePassX-0.3.0.tar.gz +KeePassX-0.3.0a.tar.gz Index: keepassx.spec =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/F-8/keepassx.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- keepassx.spec 5 Mar 2008 07:31:07 -0000 1.6 +++ keepassx.spec 6 Mar 2008 07:12:53 -0000 1.7 @@ -1,12 +1,12 @@ Name: keepassx Version: 0.3.0 -Release: 2%{?dist} +Release: 3.a%{?dist} Summary: Cross-platform password manager Group: User Interface/Desktops License: GPLv2+ URL: http://keepassx.sourceforge.net -Source0: http://download.sf.net/keepassx/KeePassX-%{version}.tar.gz +Source0: http://download.sf.net/keepassx/KeePassX-%{version}a.tar.gz Patch0: keepassx-0.3.0-xdg.patch Patch1: keepassx-0.3.0-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +34,7 @@ %prep -%setup -q -n KeePassX-%{version} +%setup -q -n KeePassX-%{version}a %patch0 -p0 -b .xdg %patch1 -p0 -b .gcc43 @@ -57,7 +57,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/keepassx.xpm # Menu -sed -i -e 's/keepassx.xpm/keepassx.png/g' -e 's/^Exec=keepassx$/Exec=keepassx %f/g' \ +sed -i -e 's/^Exec=keepassx$/Exec=keepassx %f/g' \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -109,6 +109,9 @@ %changelog +* Wed Mar 05 2008 Aurelien Bompard 0.3.0-3.a +- version 0.3.0a + * Wed Mar 05 2008 Aurelien Bompard 0.3.0-2 - patch for gcc 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Mar 2008 19:10:44 -0000 1.4 +++ sources 6 Mar 2008 07:12:53 -0000 1.5 @@ -1 +1 @@ -c210b0b33cb01a5b55d87166d9b56242 KeePassX-0.3.0.tar.gz +4bc42c6f8d5590bb4ed32dab13c17863 KeePassX-0.3.0a.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 07:13:34 2008 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 6 Mar 2008 07:13:34 GMT Subject: rpms/keepassx/devel .cvsignore, 1.4, 1.5 keepassx.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200803060713.m267DYHa003806@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/pkgs/rpms/keepassx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3716/devel Modified Files: .cvsignore keepassx.spec sources Log Message: * Wed Mar 05 2008 Aurelien Bompard 0.3.0-3.a - version 0.3.0a Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2008 19:10:52 -0000 1.4 +++ .cvsignore 6 Mar 2008 07:13:01 -0000 1.5 @@ -1 +1 @@ -KeePassX-0.3.0.tar.gz +KeePassX-0.3.0a.tar.gz Index: keepassx.spec =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/devel/keepassx.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- keepassx.spec 5 Mar 2008 07:31:13 -0000 1.7 +++ keepassx.spec 6 Mar 2008 07:13:01 -0000 1.8 @@ -1,12 +1,12 @@ Name: keepassx Version: 0.3.0 -Release: 2%{?dist} +Release: 3.a%{?dist} Summary: Cross-platform password manager Group: User Interface/Desktops License: GPLv2+ URL: http://keepassx.sourceforge.net -Source0: http://download.sf.net/keepassx/KeePassX-%{version}.tar.gz +Source0: http://download.sf.net/keepassx/KeePassX-%{version}a.tar.gz Patch0: keepassx-0.3.0-xdg.patch Patch1: keepassx-0.3.0-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +34,7 @@ %prep -%setup -q -n KeePassX-%{version} +%setup -q -n KeePassX-%{version}a %patch0 -p0 -b .xdg %patch1 -p0 -b .gcc43 @@ -57,7 +57,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/keepassx.xpm # Menu -sed -i -e 's/keepassx.xpm/keepassx.png/g' -e 's/^Exec=keepassx$/Exec=keepassx %f/g' \ +sed -i -e 's/^Exec=keepassx$/Exec=keepassx %f/g' \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -109,6 +109,9 @@ %changelog +* Wed Mar 05 2008 Aurelien Bompard 0.3.0-3.a +- version 0.3.0a + * Wed Mar 05 2008 Aurelien Bompard 0.3.0-2 - patch for gcc 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/keepassx/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Mar 2008 19:10:52 -0000 1.4 +++ sources 6 Mar 2008 07:13:01 -0000 1.5 @@ -1 +1 @@ -c210b0b33cb01a5b55d87166d9b56242 KeePassX-0.3.0.tar.gz +4bc42c6f8d5590bb4ed32dab13c17863 KeePassX-0.3.0a.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 07:19:06 2008 From: fedora-extras-commits at redhat.com (Bryan O'Sullivan (bos)) Date: Thu, 6 Mar 2008 07:19:06 GMT Subject: rpms/llvm/devel llvm-2.2-gcc43.patch,NONE,1.1 llvm.spec,1.3,1.4 Message-ID: <200803060719.m267J6xO003983@cvs-int.fedora.redhat.com> Author: bos Update of /cvs/extras/rpms/llvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3957 Modified Files: llvm.spec Added Files: llvm-2.2-gcc43.patch Log Message: Fix gcc 4.3 build llvm-2.2-gcc43.patch: --- NEW FILE llvm-2.2-gcc43.patch --- diff -r ba4f1d4ee0d4 include/llvm/ADT/BitVector.h --- a/include/llvm/ADT/BitVector.h Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/ADT/BitVector.h Wed Mar 05 23:15:18 2008 -0800 @@ -16,8 +16,9 @@ #include "llvm/Support/MathExtras.h" #include +#include #include -#include +#include namespace llvm { diff -r ba4f1d4ee0d4 include/llvm/ADT/DenseMap.h --- a/include/llvm/ADT/DenseMap.h Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/ADT/DenseMap.h Wed Mar 05 23:15:18 2008 -0800 @@ -313,7 +313,7 @@ NumEntries = 0; NumTombstones = 0; NumBuckets = InitBuckets; - assert(InitBuckets && (InitBuckets & InitBuckets-1) == 0 && + assert(InitBuckets && (InitBuckets & (InitBuckets-1)) == 0 && "# initial buckets must be a power of two!"); Buckets = reinterpret_cast(new char[sizeof(BucketT)*InitBuckets]); // Initialize all the keys to EmptyKey. diff -r ba4f1d4ee0d4 include/llvm/ADT/ilist --- a/include/llvm/ADT/ilist Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/ADT/ilist Wed Mar 05 23:15:18 2008 -0800 @@ -40,6 +40,7 @@ #include "llvm/ADT/iterator" #include +#include namespace llvm { diff -r ba4f1d4ee0d4 include/llvm/Analysis/LoopInfo.h --- a/include/llvm/Analysis/LoopInfo.h Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/Analysis/LoopInfo.h Wed Mar 05 23:15:18 2008 -0800 @@ -397,13 +397,14 @@ if (BranchInst *BI = dyn_cast(BackedgeBlock->getTerminator())) if (BI->isConditional()) { if (ICmpInst *ICI = dyn_cast(BI->getCondition())) { - if (ICI->getOperand(0) == Inc) + if (ICI->getOperand(0) == Inc) { if (BI->getSuccessor(0) == getHeader()) { if (ICI->getPredicate() == ICmpInst::ICMP_NE) return ICI->getOperand(1); } else if (ICI->getPredicate() == ICmpInst::ICMP_EQ) { return ICI->getOperand(1); } + } } } diff -r ba4f1d4ee0d4 include/llvm/Analysis/ScalarEvolutionExpressions.h --- a/include/llvm/Analysis/ScalarEvolutionExpressions.h Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/Analysis/ScalarEvolutionExpressions.h Wed Mar 05 23:15:18 2008 -0800 @@ -252,11 +252,12 @@ virtual bool hasComputableLoopEvolution(const Loop *L) const { bool HasVarying = false; for (unsigned i = 0, e = getNumOperands(); i != e; ++i) - if (!getOperand(i)->isLoopInvariant(L)) + if (!getOperand(i)->isLoopInvariant(L)) { if (getOperand(i)->hasComputableLoopEvolution(L)) HasVarying = true; else return false; + } return HasVarying; } diff -r ba4f1d4ee0d4 include/llvm/CodeGen/MachineRegisterInfo.h --- a/include/llvm/CodeGen/MachineRegisterInfo.h Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/CodeGen/MachineRegisterInfo.h Wed Mar 05 23:15:18 2008 -0800 @@ -207,8 +207,8 @@ // If the first node isn't one we're interested in, advance to one that // we are interested in. if (op) { - if (!ReturnUses && op->isUse() || - !ReturnDefs && op->isDef()) + if ((!ReturnUses && op->isUse()) || + (!ReturnDefs && op->isDef())) ++*this; } } @@ -236,8 +236,8 @@ Op = Op->getNextOperandForReg(); // If this is an operand we don't care about, skip it. - while (Op && (!ReturnUses && Op->isUse() || - !ReturnDefs && Op->isDef())) + while (Op && ((!ReturnUses && Op->isUse()) || + (!ReturnDefs && Op->isDef()))) Op = Op->getNextOperandForReg(); return *this; diff -r ba4f1d4ee0d4 include/llvm/CodeGen/SelectionDAGNodes.h --- a/include/llvm/CodeGen/SelectionDAGNodes.h Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/CodeGen/SelectionDAGNodes.h Wed Mar 05 23:15:18 2008 -0800 @@ -802,8 +802,8 @@ static inline SDOperand getEmptyKey() { return SDOperand((SDNode*)-1, -1U); } static inline SDOperand getTombstoneKey() { return SDOperand((SDNode*)-1, 0);} static unsigned getHashValue(const SDOperand &Val) { - return (unsigned)((uintptr_t)Val.Val >> 4) ^ - (unsigned)((uintptr_t)Val.Val >> 9) + Val.ResNo; + return ((unsigned)((uintptr_t)Val.Val >> 4) ^ + (unsigned)((uintptr_t)Val.Val >> 9)) + Val.ResNo; } static bool isEqual(const SDOperand &LHS, const SDOperand &RHS) { return LHS == RHS; diff -r ba4f1d4ee0d4 include/llvm/LinkTimeOptimizer.h --- a/include/llvm/LinkTimeOptimizer.h Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/LinkTimeOptimizer.h Wed Mar 05 23:15:18 2008 -0800 @@ -16,6 +16,7 @@ #define __LTO_H__ #include +#include #include #include #include diff -r ba4f1d4ee0d4 include/llvm/Support/Streams.h --- a/include/llvm/Support/Streams.h Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/Support/Streams.h Wed Mar 05 23:15:18 2008 -0800 @@ -16,6 +16,7 @@ #define LLVM_SUPPORT_STREAMS_H #include +#include namespace llvm { diff -r ba4f1d4ee0d4 include/llvm/Target/SubtargetFeature.h --- a/include/llvm/Target/SubtargetFeature.h Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/Target/SubtargetFeature.h Wed Mar 05 23:15:18 2008 -0800 @@ -21,6 +21,7 @@ #include #include #include +#include #include "llvm/Support/DataTypes.h" namespace llvm { diff -r ba4f1d4ee0d4 include/llvm/Target/TargetJITInfo.h --- a/include/llvm/Target/TargetJITInfo.h Wed Mar 05 22:42:42 2008 -0800 +++ b/include/llvm/Target/TargetJITInfo.h Wed Mar 05 23:15:18 2008 -0800 @@ -17,8 +17,9 @@ #ifndef LLVM_TARGET_TARGETJITINFO_H #define LLVM_TARGET_TARGETJITINFO_H +#include #include -#include +#include "llvm/Support/DataTypes.h" namespace llvm { class Function; diff -r ba4f1d4ee0d4 lib/Analysis/Analysis.cpp --- a/lib/Analysis/Analysis.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Analysis/Analysis.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -10,6 +10,7 @@ #include "llvm-c/Analysis.h" #include "llvm/Analysis/Verifier.h" #include +#include using namespace llvm; diff -r ba4f1d4ee0d4 lib/Analysis/IPA/Andersens.cpp --- a/lib/Analysis/IPA/Andersens.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Analysis/IPA/Andersens.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -139,7 +139,7 @@ Constraint(ConstraintType Ty, unsigned D, unsigned S, unsigned O = 0) : Type(Ty), Dest(D), Src(S), Offset(O) { - assert(Offset == 0 || Ty != AddressOf && + assert((Offset == 0 || Ty != AddressOf) && "Offset is illegal on addressof constraints"); } @@ -1931,7 +1931,7 @@ C.Src = FindEquivalentNode(RHSNode, RHSLabel); C.Dest = FindEquivalentNode(FindNode(LHSNode), LHSLabel); - if (C.Src == C.Dest && C.Type == Constraint::Copy + if ((C.Src == C.Dest && C.Type == Constraint::Copy) || Seen.count(C)) continue; diff -r ba4f1d4ee0d4 lib/Analysis/IPA/GlobalsModRef.cpp --- a/lib/Analysis/IPA/GlobalsModRef.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Analysis/IPA/GlobalsModRef.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -115,11 +115,12 @@ /// case the most generic behavior of this function should be returned. virtual ModRefBehavior getModRefBehavior(Function *F, CallSite CS, std::vector *Info) { - if (FunctionRecord *FR = getFunctionInfo(F)) + if (FunctionRecord *FR = getFunctionInfo(F)) { if (FR->FunctionEffect == 0) return DoesNotAccessMemory; else if ((FR->FunctionEffect & Mod) == 0) return OnlyReadsMemory; + } return AliasAnalysis::getModRefBehavior(F, CS, Info); } diff -r ba4f1d4ee0d4 lib/Analysis/ScalarEvolution.cpp --- a/lib/Analysis/ScalarEvolution.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Analysis/ScalarEvolution.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -1994,13 +1994,14 @@ Instruction *I = dyn_cast(V); if (I == 0 || !L->contains(I->getParent())) return 0; - if (PHINode *PN = dyn_cast(I)) + if (PHINode *PN = dyn_cast(I)) { if (L->getHeader() == I->getParent()) return PN; else // We don't currently keep track of the control flow needed to evaluate // PHIs, so we cannot handle PHIs inside of loops. return 0; + } // If we won't be able to constant fold this expression even if the operands // are constants, return early. diff -r ba4f1d4ee0d4 lib/Archive/Archive.cpp --- a/lib/Archive/Archive.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Archive/Archive.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -18,6 +18,8 @@ #include "llvm/Module.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/System/Process.h" +#include +#include using namespace llvm; // getMemberSize - compute the actual physical size of the file member as seen diff -r ba4f1d4ee0d4 lib/Archive/ArchiveInternals.h --- a/lib/Archive/ArchiveInternals.h Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Archive/ArchiveInternals.h Wed Mar 05 23:15:18 2008 -0800 @@ -17,6 +17,8 @@ #include "llvm/Bitcode/Archive.h" #include "llvm/System/TimeValue.h" #include "llvm/ADT/StringExtras.h" + +#include #define ARFILE_MAGIC "!\n" ///< magic string #define ARFILE_MAGIC_LEN (sizeof(ARFILE_MAGIC)-1) ///< length of magic string diff -r ba4f1d4ee0d4 lib/AsmParser/LLLexer.cpp --- a/lib/AsmParser/LLLexer.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/AsmParser/LLLexer.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -18,6 +18,8 @@ #include #include "llvmAsmParser.h" + +#include using namespace llvm; //===----------------------------------------------------------------------===// diff -r ba4f1d4ee0d4 lib/AsmParser/Parser.cpp --- a/lib/AsmParser/Parser.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/AsmParser/Parser.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -14,6 +14,7 @@ #include "ParserInternals.h" #include "llvm/Module.h" #include "llvm/Support/MemoryBuffer.h" +#include using namespace llvm; diff -r ba4f1d4ee0d4 lib/Bitcode/Reader/BitReader.cpp --- a/lib/Bitcode/Reader/BitReader.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Bitcode/Reader/BitReader.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -11,6 +11,7 @@ #include "llvm/Bitcode/ReaderWriter.h" #include "llvm/Support/MemoryBuffer.h" #include +#include using namespace llvm; diff -r ba4f1d4ee0d4 lib/CodeGen/MachOWriter.cpp --- a/lib/CodeGen/MachOWriter.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/CodeGen/MachOWriter.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -38,6 +38,7 @@ #include "llvm/Support/OutputBuffer.h" #include "llvm/Support/Streams.h" #include +#include using namespace llvm; /// AddMachOWriter - Concrete function to add the Mach-O writer to the function diff -r ba4f1d4ee0d4 lib/ExecutionEngine/ExecutionEngine.cpp --- a/lib/ExecutionEngine/ExecutionEngine.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/ExecutionEngine/ExecutionEngine.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -26,7 +26,8 @@ #include "llvm/System/DynamicLibrary.h" #include "llvm/System/Host.h" #include "llvm/Target/TargetData.h" -#include +#include +#include using namespace llvm; STATISTIC(NumInitBytes, "Number of bytes of global vars initialized"); diff -r ba4f1d4ee0d4 lib/ExecutionEngine/ExecutionEngineBindings.cpp --- a/lib/ExecutionEngine/ExecutionEngineBindings.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/ExecutionEngine/ExecutionEngineBindings.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -15,6 +15,7 @@ #include "llvm-c/ExecutionEngine.h" #include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/ExecutionEngine/ExecutionEngine.h" +#include using namespace llvm; diff -r ba4f1d4ee0d4 lib/ExecutionEngine/Interpreter/Execution.cpp --- a/lib/ExecutionEngine/Interpreter/Execution.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/ExecutionEngine/Interpreter/Execution.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -23,8 +23,9 @@ #include "llvm/ADT/Statistic.h" #include "llvm/Support/Debug.h" #include "llvm/Support/MathExtras.h" +#include #include -#include +#include using namespace llvm; STATISTIC(NumDynamicInsts, "Number of dynamic instructions executed"); diff -r ba4f1d4ee0d4 lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp --- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -29,6 +29,7 @@ #include #include #include +#include #ifdef __linux__ #include diff -r ba4f1d4ee0d4 lib/ExecutionEngine/Interpreter/Interpreter.cpp --- a/lib/ExecutionEngine/Interpreter/Interpreter.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/ExecutionEngine/Interpreter/Interpreter.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -18,6 +18,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/ModuleProvider.h" +#include using namespace llvm; static struct RegisterInterp { diff -r ba4f1d4ee0d4 lib/ExecutionEngine/JIT/JITMemoryManager.cpp --- a/lib/ExecutionEngine/JIT/JITMemoryManager.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/ExecutionEngine/JIT/JITMemoryManager.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -17,6 +17,8 @@ #include #include #include +#include +#include using namespace llvm; diff -r ba4f1d4ee0d4 lib/Support/CommandLine.cpp --- a/lib/Support/CommandLine.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Support/CommandLine.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -29,6 +29,7 @@ #include #include #include +#include using namespace llvm; using namespace cl; diff -r ba4f1d4ee0d4 lib/Support/FileUtilities.cpp --- a/lib/Support/FileUtilities.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Support/FileUtilities.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -16,6 +16,7 @@ #include "llvm/System/Path.h" #include "llvm/System/MappedFile.h" #include "llvm/ADT/StringExtras.h" +#include #include #include using namespace llvm; diff -r ba4f1d4ee0d4 lib/Support/FoldingSet.cpp --- a/lib/Support/FoldingSet.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Support/FoldingSet.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -18,6 +18,7 @@ #include "llvm/ADT/APFloat.h" #include "llvm/Support/MathExtras.h" #include +#include using namespace llvm; //===----------------------------------------------------------------------===// diff -r ba4f1d4ee0d4 lib/Support/Statistic.cpp --- a/lib/Support/Statistic.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Support/Statistic.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -28,6 +28,7 @@ #include "llvm/ADT/StringExtras.h" #include #include +#include using namespace llvm; // GetLibSupportInfoOutputFile - Return a file stream to print our output on. diff -r ba4f1d4ee0d4 lib/Support/StringExtras.cpp --- a/lib/Support/StringExtras.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Support/StringExtras.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/ADT/StringExtras.h" +#include using namespace llvm; /// getToken - This function extracts one token from source, ignoring any diff -r ba4f1d4ee0d4 lib/Target/Sparc/SparcAsmPrinter.cpp --- a/lib/Target/Sparc/SparcAsmPrinter.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Target/Sparc/SparcAsmPrinter.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -31,6 +31,7 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/MathExtras.h" #include +#include using namespace llvm; STATISTIC(EmittedInsts, "Number of machine instrs printed"); diff -r ba4f1d4ee0d4 lib/Target/X86/X86JITInfo.cpp --- a/lib/Target/X86/X86JITInfo.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Target/X86/X86JITInfo.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -18,6 +18,7 @@ #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/Config/alloca.h" #include +#include using namespace llvm; #ifdef _MSC_VER diff -r ba4f1d4ee0d4 lib/Transforms/IPO/SimplifyLibCalls.cpp --- a/lib/Transforms/IPO/SimplifyLibCalls.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Transforms/IPO/SimplifyLibCalls.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -30,6 +30,7 @@ #include "llvm/Support/Debug.h" #include "llvm/Target/TargetData.h" #include "llvm/Transforms/IPO.h" +#include using namespace llvm; /// This statistic keeps track of the total number of library calls that have diff -r ba4f1d4ee0d4 lib/Transforms/Scalar/LoopUnroll.cpp --- a/lib/Transforms/Scalar/LoopUnroll.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/Transforms/Scalar/LoopUnroll.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -36,8 +36,9 @@ #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/IntrinsicInst.h" +#include +#include #include -#include using namespace llvm; STATISTIC(NumCompletelyUnrolled, "Number of loops completely unrolled"); diff -r ba4f1d4ee0d4 lib/VMCore/AutoUpgrade.cpp --- a/lib/VMCore/AutoUpgrade.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/VMCore/AutoUpgrade.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -18,6 +18,7 @@ #include "llvm/Instructions.h" #include "llvm/ParameterAttributes.h" #include "llvm/Intrinsics.h" +#include using namespace llvm; diff -r ba4f1d4ee0d4 lib/VMCore/ConstantFold.cpp --- a/lib/VMCore/ConstantFold.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/VMCore/ConstantFold.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -658,25 +658,28 @@ case Instruction::Xor: return ConstantInt::get(C1V ^ C2V); case Instruction::Shl: - if (uint32_t shiftAmt = C2V.getZExtValue()) + if (uint32_t shiftAmt = C2V.getZExtValue()) { if (shiftAmt < C1V.getBitWidth()) return ConstantInt::get(C1V.shl(shiftAmt)); else return UndefValue::get(C1->getType()); // too big shift is undef + } return const_cast(CI1); // Zero shift is identity case Instruction::LShr: - if (uint32_t shiftAmt = C2V.getZExtValue()) + if (uint32_t shiftAmt = C2V.getZExtValue()) { if (shiftAmt < C1V.getBitWidth()) return ConstantInt::get(C1V.lshr(shiftAmt)); else return UndefValue::get(C1->getType()); // too big shift is undef + } return const_cast(CI1); // Zero shift is identity case Instruction::AShr: - if (uint32_t shiftAmt = C2V.getZExtValue()) + if (uint32_t shiftAmt = C2V.getZExtValue()) { if (shiftAmt < C1V.getBitWidth()) return ConstantInt::get(C1V.ashr(shiftAmt)); else return UndefValue::get(C1->getType()); // too big shift is undef + } return const_cast(CI1); // Zero shift is identity } } @@ -1081,18 +1084,20 @@ // Ok, we ran out of things they have in common. If any leftovers // are non-zero then we have a difference, otherwise we are equal. for (; i < CE1->getNumOperands(); ++i) - if (!CE1->getOperand(i)->isNullValue()) + if (!CE1->getOperand(i)->isNullValue()) { if (isa(CE1->getOperand(i))) return isSigned ? ICmpInst::ICMP_SGT : ICmpInst::ICMP_UGT; else return ICmpInst::BAD_ICMP_PREDICATE; // Might be equal. + } for (; i < CE2->getNumOperands(); ++i) - if (!CE2->getOperand(i)->isNullValue()) + if (!CE2->getOperand(i)->isNullValue()) { if (isa(CE2->getOperand(i))) return isSigned ? ICmpInst::ICMP_SLT : ICmpInst::ICMP_ULT; else return ICmpInst::BAD_ICMP_PREDICATE; // Might be equal. + } return ICmpInst::ICMP_EQ; } } @@ -1121,20 +1126,22 @@ if (C1->isNullValue()) { if (const GlobalValue *GV = dyn_cast(C2)) // Don't try to evaluate aliases. External weak GV can be null. - if (!isa(GV) && !GV->hasExternalWeakLinkage()) + if (!isa(GV) && !GV->hasExternalWeakLinkage()) { if (pred == ICmpInst::ICMP_EQ) return ConstantInt::getFalse(); else if (pred == ICmpInst::ICMP_NE) return ConstantInt::getTrue(); + } // icmp eq/ne(GV,null) -> false/true } else if (C2->isNullValue()) { if (const GlobalValue *GV = dyn_cast(C1)) // Don't try to evaluate aliases. External weak GV can be null. - if (!isa(GV) && !GV->hasExternalWeakLinkage()) + if (!isa(GV) && !GV->hasExternalWeakLinkage()) { if (pred == ICmpInst::ICMP_EQ) return ConstantInt::getFalse(); else if (pred == ICmpInst::ICMP_NE) return ConstantInt::getTrue(); + } } if (isa(C1) && isa(C2)) { diff -r ba4f1d4ee0d4 lib/VMCore/Core.cpp --- a/lib/VMCore/Core.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/VMCore/Core.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -22,6 +22,7 @@ #include "llvm/Support/MemoryBuffer.h" #include #include +#include using namespace llvm; diff -r ba4f1d4ee0d4 lib/VMCore/Instructions.cpp --- a/lib/VMCore/Instructions.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/VMCore/Instructions.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -182,11 +182,12 @@ /// Value *PHINode::hasConstantValue(bool AllowNonDominatingInstruction) const { // If the PHI node only has one incoming value, eliminate the PHI node... - if (getNumIncomingValues() == 1) + if (getNumIncomingValues() == 1) { if (getIncomingValue(0) != this) // not X = phi X return getIncomingValue(0); else return UndefValue::get(getType()); // Self cycle is dead. + } // Otherwise if all of the incoming values are the same for the PHI, replace // the PHI node with the incoming value. @@ -194,13 +195,14 @@ Value *InVal = 0; bool HasUndefInput = false; for (unsigned i = 0, e = getNumIncomingValues(); i != e; ++i) - if (isa(getIncomingValue(i))) + if (isa(getIncomingValue(i))) { HasUndefInput = true; - else if (getIncomingValue(i) != this) // Not the PHI node itself... + } else if (getIncomingValue(i) != this) { // Not the PHI node itself... if (InVal && getIncomingValue(i) != InVal) return 0; // Not the same, bail out. else InVal = getIncomingValue(i); + } // The only case that could cause InVal to be null is if we have a PHI node // that only has entries for itself. In this case, there is no entry into the @@ -441,8 +443,8 @@ cast(cast(Fn->getType())->getElementType()); FTy = FTy; // silence warning. - assert((NumArgs == FTy->getNumParams()) || - (FTy->isVarArg() && NumArgs > FTy->getNumParams()) && + assert(((NumArgs == FTy->getNumParams()) || + (FTy->isVarArg() && NumArgs > FTy->getNumParams())) && "Calling a function with bad signature"); for (unsigned i = 0, e = NumArgs; i != e; i++) { @@ -1027,12 +1029,13 @@ if (!isa(Ptr)) return 0; // Type isn't a pointer type! // Handle the special case of the empty set index set... - if (NumIdx == 0) + if (NumIdx == 0) { if (AllowCompositeLeaf || cast(Ptr)->getElementType()->isFirstClassType()) return cast(Ptr)->getElementType(); else return 0; + } unsigned CurIdx = 0; while (const CompositeType *CT = dyn_cast(Ptr)) { @@ -2319,7 +2322,7 @@ assert(Op0Ty == Op1Ty && "Both operands to ICmp instruction are not of the same type!"); // Check that the operands are the right type - assert(Op0Ty->isInteger() || isa(Op0Ty) && + assert((Op0Ty->isInteger() || isa(Op0Ty)) && "Invalid operand types for ICmp instruction"); return; } diff -r ba4f1d4ee0d4 lib/VMCore/Value.cpp --- a/lib/VMCore/Value.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/lib/VMCore/Value.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -307,7 +307,7 @@ void User::replaceUsesOfWith(Value *From, Value *To) { if (From == To) return; // Duh what? - assert(!isa(this) || isa(this) && + assert((!isa(this) || isa(this)) && "Cannot call User::replaceUsesofWith on a constant!"); for (unsigned i = 0, E = getNumOperands(); i != E; ++i) diff -r ba4f1d4ee0d4 tools/llvm-db/Commands.cpp --- a/tools/llvm-db/Commands.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/tools/llvm-db/Commands.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -21,6 +21,7 @@ #include "llvm/Support/FileUtilities.h" #include "llvm/ADT/StringExtras.h" #include +#include using namespace llvm; /// getCurrentLanguage - Return the current source language that the user is diff -r ba4f1d4ee0d4 tools/llvm-ld/llvm-ld.cpp --- a/tools/llvm-ld/llvm-ld.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/tools/llvm-ld/llvm-ld.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -38,6 +38,7 @@ #include "llvm/System/Signals.h" #include #include +#include using namespace llvm; // Input/Output Options diff -r ba4f1d4ee0d4 tools/llvm-upgrade/UpgradeInternals.h --- a/tools/llvm-upgrade/UpgradeInternals.h Wed Mar 05 22:42:42 2008 -0800 +++ b/tools/llvm-upgrade/UpgradeInternals.h Wed Mar 05 23:15:18 2008 -0800 @@ -22,7 +22,7 @@ #include "llvm/ADT/StringExtras.h" #include #include - +#include // Global variables exported from the lexer. extern int yydebug; diff -r ba4f1d4ee0d4 tools/llvmc/llvmc.cpp --- a/tools/llvmc/llvmc.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/tools/llvmc/llvmc.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -21,6 +21,7 @@ #include "llvm/Support/ManagedStatic.h" #include "llvm/System/Signals.h" #include +#include using namespace llvm; //===----------------------------------------------------------------------===// diff -r ba4f1d4ee0d4 utils/PerfectShuffle/PerfectShuffle.cpp --- a/utils/PerfectShuffle/PerfectShuffle.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/utils/PerfectShuffle/PerfectShuffle.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -17,7 +17,7 @@ #include #include #include - +#include struct Operator; // Masks are 4-nibble hex numbers. Values 0-7 in any nibble means that it takes diff -r ba4f1d4ee0d4 utils/TableGen/AsmWriterEmitter.cpp --- a/utils/TableGen/AsmWriterEmitter.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/utils/TableGen/AsmWriterEmitter.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -242,11 +242,12 @@ unsigned MismatchOperand = ~0U; for (unsigned i = 0, e = Operands.size(); i != e; ++i) { - if (Operands[i] != Other.Operands[i]) + if (Operands[i] != Other.Operands[i]) { if (MismatchOperand != ~0U) // Already have one mismatch? return ~1U; else MismatchOperand = i; + } } return MismatchOperand; } diff -r ba4f1d4ee0d4 utils/TableGen/CodeGenDAGPatterns.cpp --- a/utils/TableGen/CodeGenDAGPatterns.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/utils/TableGen/CodeGenDAGPatterns.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -1318,14 +1318,14 @@ while (TPN->ApplyTypeConstraints(P, false)) /* Resolve all types */; - if (TPN->ContainsUnresolvedType()) + if (TPN->ContainsUnresolvedType()) { if (iter == 0) throw "Value #" + utostr(i) + " of PredicateOperand '" + DefaultOps[iter][i]->getName() + "' doesn't have a concrete type!"; else throw "Value #" + utostr(i) + " of OptionalDefOperand '" + DefaultOps[iter][i]->getName() + "' doesn't have a concrete type!"; - + } DefaultOpInfo.DefaultOps.push_back(TPN); } diff -r ba4f1d4ee0d4 utils/TableGen/CodeGenRegisters.h --- a/utils/TableGen/CodeGenRegisters.h Wed Mar 05 22:42:42 2008 -0800 +++ b/utils/TableGen/CodeGenRegisters.h Wed Mar 05 23:15:18 2008 -0800 @@ -15,9 +15,10 @@ #ifndef CODEGEN_REGISTERS_H #define CODEGEN_REGISTERS_H +#include "llvm/CodeGen/ValueTypes.h" #include #include -#include "llvm/CodeGen/ValueTypes.h" +#include namespace llvm { class Record; diff -r ba4f1d4ee0d4 utils/TableGen/DAGISelEmitter.cpp --- a/utils/TableGen/DAGISelEmitter.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/utils/TableGen/DAGISelEmitter.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -1059,7 +1059,7 @@ Code += "), 0"; emitCode(Code2 + Code + ");"); - if (NodeHasChain) + if (NodeHasChain) { // Remember which op produces the chain. if (!isRoot) emitCode(ChainName + " = SDOperand(" + NodeName + @@ -1067,6 +1067,7 @@ else emitCode(ChainName + " = SDOperand(" + NodeName + ", " + utostr(NumResults+NumDstRegs) + ");"); + } if (!isRoot) { NodeOps.push_back("Tmp" + utostr(ResNo)); diff -r ba4f1d4ee0d4 utils/TableGen/TGLexer.cpp --- a/utils/TableGen/TGLexer.cpp Wed Mar 05 22:42:42 2008 -0800 +++ b/utils/TableGen/TGLexer.cpp Wed Mar 05 23:15:18 2008 -0800 @@ -17,6 +17,8 @@ #include #include "llvm/Config/config.h" #include +#include +#include using namespace llvm; TGLexer::TGLexer(MemoryBuffer *StartBuf) : CurLineNo(1), CurBuf(StartBuf) { Index: llvm.spec =================================================================== RCS file: /cvs/extras/rpms/llvm/devel/llvm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- llvm.spec 18 Feb 2008 21:26:38 -0000 1.3 +++ llvm.spec 6 Mar 2008 07:18:30 -0000 1.4 @@ -14,7 +14,7 @@ Name: llvm Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Low Level Virtual Machine License: NCSA Group: Development/Languages @@ -25,6 +25,7 @@ %endif Patch0: llvm-2.1-fix-sed.patch +Patch1: llvm-2.2-gcc43.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: bison @@ -113,6 +114,7 @@ %setup -q -n llvm-%{version} %{?_with_gcc:-a1} %patch0 -p1 -b .fix-sed +%patch1 -p1 -b .gcc43 %build # We're not building a debuginfo package yet, because some generated @@ -287,6 +289,9 @@ %changelog +* Wed Mar 5 2008 Bryan O'Sullivan - 2.2-3 +- Fix compilation problems with gcc 4.3 + * Mon Feb 18 2008 Fedora Release Engineering - 2.2-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 09:23:20 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 6 Mar 2008 09:23:20 GMT Subject: rpms/libgsf/devel .cvsignore, 1.20, 1.21 libgsf.spec, 1.53, 1.54 sources, 1.20, 1.21 Message-ID: <200803060923.m269NKHJ019828@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libgsf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19794 Modified Files: .cvsignore libgsf.spec sources Log Message: next version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgsf/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 14 Sep 2007 05:39:01 -0000 1.20 +++ .cvsignore 6 Mar 2008 09:22:31 -0000 1.21 @@ -1 +1 @@ -libgsf-1.14.7.tar.bz2 +libgsf-1.14.8.tar.bz2 Index: libgsf.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- libgsf.spec 18 Feb 2008 22:20:54 -0000 1.53 +++ libgsf.spec 6 Mar 2008 09:22:31 -0000 1.54 @@ -3,8 +3,8 @@ Summary: GNOME Structured File library Name: libgsf -Version: 1.14.7 -Release: 3%{?dist} +Version: 1.14.8 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2 @@ -133,6 +133,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Thu Mar 06 2008 Caolan McNamara 1.14.8-1 +- latest version + * Mon Feb 18 2008 Fedora Release Engineering - 1.14.7-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgsf/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 14 Sep 2007 05:39:01 -0000 1.20 +++ sources 6 Mar 2008 09:22:31 -0000 1.21 @@ -1 +1 @@ -6612f1e57d3974d609bedd2fd8ff6317 libgsf-1.14.7.tar.bz2 +09e4b6639be79fa888cabc751f73674f libgsf-1.14.8.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 09:26:38 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 6 Mar 2008 09:26:38 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.43,1.44 Message-ID: <200803060926.m269Qcfx019989@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19929 Modified Files: kdebase-workspace.spec Log Message: apply correctly the patch Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- kdebase-workspace.spec 4 Mar 2008 14:42:51 -0000 1.43 +++ kdebase-workspace.spec 6 Mar 2008 09:26:01 -0000 1.44 @@ -110,7 +110,7 @@ %patch2 -p1 -b .consolekit %patch3 -p1 -b .gestures %patch100 -p1 -b .kde#155362 -%patch101 -p0 -b .kcontrol-crash +%patch101 -p1 -b .kcontrol-crash %build From fedora-extras-commits at redhat.com Thu Mar 6 09:29:07 2008 From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek)) Date: Thu, 6 Mar 2008 09:29:07 GMT Subject: rpms/gvfs/devel gvfs.spec,1.29,1.30 Message-ID: <200803060929.m269T7Q7020099@cvs-int.fedora.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20055 Modified Files: gvfs.spec Log Message: * Thu Mar 6 2008 Tomas Bzatek - 0.1.11-2 - Add patch that fixes a deadlock when foreign volume is removed Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gvfs.spec 4 Mar 2008 18:45:35 -0000 1.29 +++ gvfs.spec 6 Mar 2008 09:28:29 -0000 1.30 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 0.1.11 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -26,6 +26,10 @@ BuildRequires: bluez-libs-devel >= 3.12 BuildRequires: expat-devel +# Patches from head +Patch0: daemon_mount_deadlock.patch + + %description The gvfs package provides backend implementations for the gio framework in GLib. It includes ftp, sftp, cifs. @@ -39,8 +43,12 @@ The gvfs-devel package contains headers and other files that are required to develop applications using gvfs. + + + %prep %setup -q +%patch0 -p1 -b .deadlock %build %configure @@ -134,6 +142,9 @@ %{_libdir}/libgvfscommon.so %changelog +* Thu Mar 6 2008 Tomas Bzatek - 0.1.11-2 +- Add patch that fixes a deadlock when foreign volume is removed + * Tue Mar 4 2008 Matthias Clasen - 0.1.11-1 - Update to 0.1.11 From fedora-extras-commits at redhat.com Thu Mar 6 09:30:10 2008 From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek)) Date: Thu, 6 Mar 2008 09:30:10 GMT Subject: rpms/gvfs/devel daemon_mount_deadlock.patch,NONE,1.1 Message-ID: <200803060930.m269UA8O020150@cvs-int.fedora.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20141 Added Files: daemon_mount_deadlock.patch Log Message: patch attached daemon_mount_deadlock.patch: --- NEW FILE daemon_mount_deadlock.patch --- --- trunk/client/gdaemonmount.c 2008/03/05 09:27:06 1549 +++ trunk/client/gdaemonmount.c 2008/03/06 09:00:09 1570 @@ -191,7 +191,10 @@ g_object_ref (daemon_mount); if (daemon_mount->foreign_volume == volume) - g_daemon_mount_set_foreign_volume (daemon_mount, NULL); + { + g_object_unref (daemon_mount->foreign_volume); + daemon_mount->foreign_volume = NULL; + } G_UNLOCK (daemon_mount); From fedora-extras-commits at redhat.com Thu Mar 6 09:39:15 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Thu, 6 Mar 2008 09:39:15 GMT Subject: rpms/klamav/devel klamav.spec,1.18,1.19 Message-ID: <200803060939.m269dFQZ020414@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/klamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20369 Modified Files: klamav.spec Log Message: Rebuild against newer clamav Index: klamav.spec =================================================================== RCS file: /cvs/extras/rpms/klamav/devel/klamav.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- klamav.spec 13 Feb 2008 16:43:27 -0000 1.18 +++ klamav.spec 6 Mar 2008 09:38:40 -0000 1.19 @@ -1,7 +1,7 @@ Summary: Clam Anti-Virus on the KDE Desktop Name: klamav Version: 0.42 -Release: 1%{?dist} +Release: 2%{?dist} Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2 Patch0: klamav-suse-clamav-path.diff Patch1: klamav-0.41.1-pwd-echo.patch @@ -85,6 +85,9 @@ %{_datadir}/icons/*/*x*/apps/klamav.png %changelog +* Thu Mar 06 2008 Andy Shevchenko 0.42-2 +- rebuild against newer clamav + * Wed Feb 13 2008 Andy Shevchenko 0.42-1 - update to 0.42 - remove upstreamed and useless patches From fedora-extras-commits at redhat.com Thu Mar 6 09:39:35 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 6 Mar 2008 09:39:35 GMT Subject: rpms/libgsf/devel libgsf.spec,1.54,1.55 Message-ID: <200803060939.m269dZjJ020417@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/libgsf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20393 Modified Files: libgsf.spec Log Message: removed files Index: libgsf.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- libgsf.spec 6 Mar 2008 09:22:31 -0000 1.54 +++ libgsf.spec 6 Mar 2008 09:38:51 -0000 1.55 @@ -114,7 +114,6 @@ %{_libdir}/pkgconfig/libgsf-1.pc %dir %{_includedir}/libgsf-1 %{_includedir}/libgsf-1/gsf -%{_includedir}/libgsf-1/gsf-win32 %{_includedir}/libgsf-1/gsf-gvfs %{_datadir}/gtk-doc/html/gsf %{_mandir}/man1/gsf.1.gz From fedora-extras-commits at redhat.com Thu Mar 6 09:41:14 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Thu, 6 Mar 2008 09:41:14 GMT Subject: rpms/man-pages-uk/devel man-pages-uk.spec,1.5,1.6 Message-ID: <200803060941.m269fEBO020533@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/man-pages-uk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20513 Modified Files: man-pages-uk.spec Log Message: Fix Source0 URL Index: man-pages-uk.spec =================================================================== RCS file: /cvs/extras/rpms/man-pages-uk/devel/man-pages-uk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- man-pages-uk.spec 14 Feb 2008 16:50:03 -0000 1.5 +++ man-pages-uk.spec 6 Mar 2008 09:40:35 -0000 1.6 @@ -1,12 +1,12 @@ %define date 20071108 Name: man-pages-uk Version: 0.1 -Release: 0.6.%{date}%{?dist} +Release: 0.7.%{date}%{?dist} Summary: Ukrainian man pages from the Linux Documentation Project License: GFDL Group: Documentation URL: http://docs.linux.org.ua/index.php/Man:Contents -Source0: http://dl.sourceforge.net/sourceforge/wiki2man/man-pages-uk-utf8-%{date}.tar.gz +Source0: http://downloads.sourceforge.net/wiki2man/man-pages-uk-utf8-%{date}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -35,6 +35,9 @@ %lang(uk) %{_mandir}/uk %changelog +* Thu Mar 06 2008 Andy Shevchenko 0.1-0.7.20071108 +- just fix Source0 URL + * Wed Feb 13 2008 Andy Shevchenko 0.1-0.6.20071108 - update to 20071108 snapshot From fedora-extras-commits at redhat.com Thu Mar 6 09:51:44 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 6 Mar 2008 09:51:44 GMT Subject: rpms/openoffice.org/devel .cvsignore, 1.149, 1.150 sources, 1.272, 1.273 Message-ID: <200803060951.m269piQi020856@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20806 Modified Files: .cvsignore sources Log Message: bump Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- .cvsignore 28 Feb 2008 08:43:14 -0000 1.149 +++ .cvsignore 6 Mar 2008 09:50:42 -0000 1.150 @@ -4,4 +4,4 @@ Tigert-templates.tar.gz unowinreg.dll bengali.sdf -OOH680_m8.tar.bz2 +OOH680_m9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- sources 28 Feb 2008 08:43:14 -0000 1.272 +++ sources 6 Mar 2008 09:50:42 -0000 1.273 @@ -4,4 +4,4 @@ e3a0b76dcd876f3d721ee7183729153d unowinreg.dll f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz 0c0e868b34329d90a7c9a92f1704775c bengali.sdf -a08e2f5858146244bb1f54cb17370d3b OOH680_m8.tar.bz2 +af3f35cf2f34b2ab2415605955769516 OOH680_m9.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 09:53:02 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Thu, 6 Mar 2008 09:53:02 GMT Subject: rpms/libvirt/F-8 libvirt-0.4.1-qemud1.patch, NONE, 1.1 libvirt-0.4.1-qemud2.patch, NONE, 1.1 libvirt.spec, 1.71, 1.72 sources, 1.27, 1.28 libvirt-0.4.0-auth-null-cb-2.patch, 1.1, NONE libvirt-0.4.0-auth-null-cb.patch, 1.1, NONE libvirt-0.4.0-conffile-size.patch, 1.1, NONE libvirt-0.4.0-remote-ssh.patch, 1.1, NONE Message-ID: <200803060953.m269r2CL020943@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20870 Modified Files: libvirt.spec sources Added Files: libvirt-0.4.1-qemud1.patch libvirt-0.4.1-qemud2.patch Removed Files: libvirt-0.4.0-auth-null-cb-2.patch libvirt-0.4.0-auth-null-cb.patch libvirt-0.4.0-conffile-size.patch libvirt-0.4.0-remote-ssh.patch Log Message: Update to 0.4.1, Daniel libvirt-0.4.1-qemud1.patch: --- NEW FILE libvirt-0.4.1-qemud1.patch --- Avoid segfault upon early libvirtd failure. * qemud/qemud.c (main): Don't call qemudCleanup on an uninitialized pointer. By the way, even though this evoked a warning from gcc, "make distcheck" passes. Obviously, that means the distcheck rule is inadequate. I'll fix it so that it turns on -Werror for the final build. Signed-off-by: Jim Meyering --- qemud/qemud.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 96fdf32..b6b82ed 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2025,7 +2025,7 @@ libvirt management daemon:\n\ #define MAX_LISTEN 5 int main(int argc, char **argv) { - struct qemud_server *server; + struct qemud_server *server = NULL; struct sigaction sig_action; int sigpipe[2]; const char *pid_file = NULL; @@ -2180,7 +2180,8 @@ int main(int argc, char **argv) { unlink (pid_file); error1: - qemudCleanup(server); + if (server) + qemudCleanup(server); return ret; } libvirt-0.4.1-qemud2.patch: --- NEW FILE libvirt-0.4.1-qemud2.patch --- Don't use first byte of string as a pointer. * src/qemu_conf.c (qemudReportError): Use the pointer, errorMessage, not its first byte, errorMessage[0]. Signed-off-by: Jim Meyering --- src/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index eead0bc..e54da5b 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -68,7 +68,7 @@ void qemudReportError(virConnectPtr conn, errorMessage[0] = '\0'; } - virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage[0] : NULL)); + virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL)); __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); } Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-8/libvirt.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- libvirt.spec 17 Jan 2008 15:21:08 -0000 1.71 +++ libvirt.spec 6 Mar 2008 09:52:14 -0000 1.72 @@ -8,17 +8,25 @@ %define with_proxy yes %endif +%if "%{fedora}" +%ifarch ppc64 +%define with_qemu 0 +%else +%define with_qemu 1 +%endif +%else +%define with_qemu 0 +%endif + Summary: Library providing a simple API virtualization Name: libvirt -Version: 0.4.0 -Release: 4%{?dist}%{?extra_release} +Version: 0.4.1 +Release: 2%{?dist}%{?extra_release} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz -Patch1: libvirt-%{version}-auth-null-cb.patch -Patch2: libvirt-%{version}-conffile-size.patch -Patch3: libvirt-%{version}-auth-null-cb-2.patch -Patch4: libvirt-%{version}-remote-ssh.patch +Patch0: libvirt-0.4.1-qemud1.patch +Patch1: libvirt-0.4.1-qemud2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -33,12 +41,29 @@ Requires: nc Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config -# work correctly & doesn't have onerous dependancies +# work correctly & doesn't have onerous dependencies Requires: cyrus-sasl-md5 %if %{with_polkit} Requires: PolicyKit >= 0.6 %endif - +# For mount/umount in FS driver +BuildRequires: util-linux +# PPC64 has no Xen nor QEmu, try to build anyway +%ifnarch ppc64 +%if %{with_qemu} +# From QEMU RPMs +Requires: /usr/bin/qemu-img +%else +# From Xen RPMs +Requires: /usr/sbin/qcow-create +%endif +%endif +# For LVM drivers +Requires: lvm2 +# For ISCSI driver +Requires: iscsi-initiator-utils +# For disk driver +Requires: parted %ifarch i386 x86_64 ia64 BuildRequires: xen-devel %endif @@ -48,19 +73,41 @@ BuildRequires: gettext BuildRequires: gnutls-devel BuildRequires: avahi-devel +BuildRequires: libselinux-devel BuildRequires: dnsmasq BuildRequires: bridge-utils +%if %{with_qemu} +BuildRequires: qemu +%endif BuildRequires: cyrus-sasl-devel %if %{with_polkit} BuildRequires: PolicyKit-devel >= 0.6 %endif +# For mount/umount in FS driver +BuildRequires: util-linux +# PPC64 has no Xen nor QEmu, try to build anyway +%ifnarch ppc64 +%if %{with_qemu} +# From QEMU RPMs +BuildRequires: /usr/bin/qemu-img +%else +# From Xen RPMs +BuildRequires: /usr/sbin/qcow-create +%endif +%endif +# For LVM drivers +BuildRequires: lvm2 +# For ISCSI driver +BuildRequires: iscsi-initiator-utils +# For disk driver +BuildRequires: parted-devel Obsoletes: libvir # Fedora build root suckage BuildRequires: gawk %description -Libvirt is a C toolkit to interract with the virtualization capabilities +Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). %package devel @@ -86,22 +133,34 @@ %description python The libvirt-python package contains a module that permits applications written in the Python programming language to use the interface -supplied by the libvirt library to use the the virtualization capabilities +supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). %prep %setup -q +%patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build -# Xen is availble only on i386 x86_64 ia64 +# Xen is available only on i386 x86_64 ia64 %ifarch i386 i686 x86_64 ia64 -%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid +%configure --with-init-script=redhat \ + --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ + --with-remote-file=%{_localstatedir}/run/libvirtd.pid \ + --with-xen-proxy=%{with_proxy} +%else +%ifnarch ppc64 +%configure --without-xen \ + --with-init-script=redhat \ + --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ + --with-remote-file=%{_localstatedir}/run/libvirtd.pid %else -%configure --without-xen --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid +%configure --without-xen \ + --without-qemu \ + --with-init-script=redhat \ + --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ + --with-remote-file=%{_localstatedir}/run/libvirtd.pid +%endif %endif make @@ -188,6 +247,7 @@ %if %{with_proxy} == "yes" %attr(4755, root, root) %{_libexecdir}/libvirt_proxy %endif +%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %attr(0755, root, root) %{_sbindir}/libvirtd %doc docs/*.rng %doc docs/*.xml @@ -220,6 +280,13 @@ %doc docs/examples/python %changelog +* Thu Mar 6 2008 Daniel Veillard - 0.4.1-1.fc8 +- Update to 0.4.1 +- Storage APIs +- xenner support +- lots of assorted improvements, bugfixes and cleanups +- documentation and localization improvements + * Thu Jan 17 2008 Daniel P. Berrange - 0.4.0-4.fc8 - Fix SSH tunnelling (rhbz #428743) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-8/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 18 Dec 2007 11:02:18 -0000 1.27 +++ sources 6 Mar 2008 09:52:14 -0000 1.28 @@ -1 +1 @@ -2f6c6adb62145988f0e5021e5cbd71d3 libvirt-0.4.0.tar.gz +4dfe45869f082393cfd09f4690454c12 libvirt-0.4.1.tar.gz --- libvirt-0.4.0-auth-null-cb-2.patch DELETED --- --- libvirt-0.4.0-auth-null-cb.patch DELETED --- --- libvirt-0.4.0-conffile-size.patch DELETED --- --- libvirt-0.4.0-remote-ssh.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 09:53:11 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 6 Mar 2008 09:53:11 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1439,1.1440 Message-ID: <200803060953.m269rBYn020953@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20915 Modified Files: openoffice.org.spec Log Message: next release candidate Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1439 retrieving revision 1.1440 diff -u -r1.1439 -r1.1440 --- openoffice.org.spec 4 Mar 2008 08:53:36 -0000 1.1439 +++ openoffice.org.spec 6 Mar 2008 09:52:37 -0000 1.1440 @@ -1,5 +1,5 @@ %define oootag OOH680 -%define ooomilestone 8 +%define ooomilestone 9 %define rh_rpm_release 1 # undef to get english only and no-langpacks for a faster smoketest build @@ -2878,6 +2878,9 @@ %changelog +* Thu Mar 06 2008 Caolan McNamara - 1:2.4.0-9.1 +- next release candidate + * Thu Feb 28 2008 Caolan McNamara - 1:2.4.0-8.1 - next release candidate - add openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch From fedora-extras-commits at redhat.com Thu Mar 6 10:16:15 2008 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Thu, 6 Mar 2008 10:16:15 GMT Subject: rpms/uniconvertor/devel uniconvertor.spec,1.6,1.7 Message-ID: <200803061016.m26AGFDI028718@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/uniconvertor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28681 Modified Files: uniconvertor.spec Log Message: Fix Source0 URL Index: uniconvertor.spec =================================================================== RCS file: /cvs/extras/rpms/uniconvertor/devel/uniconvertor.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- uniconvertor.spec 13 Feb 2008 16:52:48 -0000 1.6 +++ uniconvertor.spec 6 Mar 2008 10:15:29 -0000 1.7 @@ -2,13 +2,13 @@ Name: uniconvertor Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Universal vector graphics translator Group: Applications/Multimedia License: LGPLv2+ and GPLv2+ and MIT URL: http://sk1project.org/modules.php?name=Products&product=uniconvertor -Source0: http://sk1project.org/downloads/uniconvertor/%{name}-%{version}.tar.gz +Source0: http://sk1project.org/downloads/uniconvertor/v%{version}/%{name}-%{version}.tar.gz Patch0: UniConvertor-1.1.0-simplify.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -67,6 +67,9 @@ %changelog +* Thu Mar 06 2008 Andy Shevchenko 1.1.1-2 +- just fix Source0 URL + * Wed Feb 13 2008 Andy Shevchenko 1.1.1-1 - update to 1.1.1 From fedora-extras-commits at redhat.com Thu Mar 6 10:18:06 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Thu, 6 Mar 2008 10:18:06 GMT Subject: rpms/libvirt/F-8 libvirt.spec,1.72,1.73 Message-ID: <200803061018.m26AI6Br028823@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28784 Modified Files: libvirt.spec Log Message: wrong release number, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-8/libvirt.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- libvirt.spec 6 Mar 2008 09:52:14 -0000 1.72 +++ libvirt.spec 6 Mar 2008 10:17:31 -0000 1.73 @@ -21,7 +21,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.4.1 -Release: 2%{?dist}%{?extra_release} +Release: 1%{?dist}%{?extra_release} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 10:26:01 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 6 Mar 2008 10:26:01 GMT Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.26,1.27 Message-ID: <200803061026.m26AQ1Z6029073@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdepimlibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29038/devel Modified Files: kdepimlibs.spec Log Message: Create the directory before trying to copy things into it. Index: kdepimlibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- kdepimlibs.spec 6 Mar 2008 03:39:51 -0000 1.26 +++ kdepimlibs.spec 6 Mar 2008 10:25:26 -0000 1.27 @@ -106,6 +106,7 @@ # install apidocs %if "%{?apidocs}" == "1" +mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs %endif From fedora-extras-commits at redhat.com Thu Mar 6 10:29:55 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 6 Mar 2008 10:29:55 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.x-kio.patch, NONE, 1.1 kdelibs.spec, 1.285, 1.286 Message-ID: <200803061029.m26ATtpW029249@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29208 Modified Files: kdelibs.spec Added Files: kdelibs-4.0.x-kio.patch Log Message: apply upstream patch to fix issue in KPropertiesDialog kdelibs-4.0.x-kio.patch: --- NEW FILE kdelibs-4.0.x-kio.patch --- Index: kio/kfile/kopenwithdialog.cpp =================================================================== --- kio/kfile/kopenwithdialog.cpp (Revision 782244) +++ kio/kfile/kopenwithdialog.cpp (Revision 782245) @@ -870,7 +870,7 @@ KConfigGroup cg = desktopFile.desktopGroup(); cg.writeEntry("Type", "Application"); cg.writeEntry("Name", initialServiceName); - cg.writePathEntry("Exec", fullExec); + cg.writeEntry("Exec", fullExec); cg.writeEntry("NoDisplay", true); // don't make it appear in the K menu if (terminal->isChecked()) { cg.writeEntry("Terminal", true); Index: kio/kfile/kpropertiesdialog.cpp =================================================================== --- kio/kfile/kpropertiesdialog.cpp (Revision 782244) +++ kio/kfile/kpropertiesdialog.cpp (Revision 782245) @@ -3015,7 +3015,7 @@ QString nameStr = _config.readName(); QString genNameStr = _config.readGenericName(); QString commentStr = _config.readComment(); - QString commandStr = config.readPathEntry( "Exec", QString() ); + QString commandStr = config.readEntry( "Exec", QString() ); if (commandStr.startsWith(QLatin1String("ksystraycmd "))) { commandStr.remove(0, 12); @@ -3176,9 +3176,9 @@ config.writeEntry( "GenericName", d->w->genNameEdit->text(), KConfigGroup::Persistent|KConfigGroup::Localized ); // for compat if (d->m_systrayBool) - config.writePathEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") ); + config.writeEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") ); else - config.writePathEntry( "Exec", d->w->commandEdit->text() ); + config.writeEntry( "Exec", d->w->commandEdit->text() ); config.writePathEntry( "Path", d->w->pathEdit->lineEdit()->text() ); // Write mimeTypes Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.285 retrieving revision 1.286 diff -u -r1.285 -r1.286 --- kdelibs.spec 6 Mar 2008 04:21:20 -0000 1.285 +++ kdelibs.spec 6 Mar 2008 10:29:15 -0000 1.286 @@ -3,7 +3,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.2 -Release: 5%{?dist} +Release: 6%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -65,6 +65,7 @@ Patch8: kdelibs-4.0.2-install-all-css.patch # upstream patches +Patch100: kdelibs-4.0.x-kio.patch BuildRequires: qt4-devel >= 4.3.0 Requires: qt4 >= %{_qt4_version} @@ -175,6 +176,7 @@ %patch8 -p1 -b .all-css # upstream patches +%patch100 -p0 -b .kio %build @@ -323,6 +325,9 @@ %changelog +* Thu Mar 06 2008 Than Ngo 4.0.2-6 +- apply upstream patch to fix issue in KPropertiesDialog + * Thu Mar 06 2008 Kevin Kofler 4.0.2-5 - also install Doxyfile.global in -common to build kdepimlibs-apidocs against From fedora-extras-commits at redhat.com Thu Mar 6 10:41:11 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 6 Mar 2008 10:41:11 GMT Subject: rpms/kernel-xen-2.6/devel linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch, NONE, 1.1.2.1 linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch, NONE, 1.1.2.1 linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch, NONE, 1.1.2.1 linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch, NONE, 1.1.2.1 linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch, NONE, 1.1.2.1 linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch, NONE, 1.1.2.1 linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch, NONE, 1.1.2.1 linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch, NONE, 1.1.2.1 Makefile, 1.2.6.5, 1.2.6.6 Makefile.config, 1.2.4.5, 1.2.4.6 config-xen-generic, 1.2.4.3, 1.2.4.4 kernel.spec, 1.11.2.14, 1.11.2.15 linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch, 1.1.2.1, NONE linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch, 1.1.2.1, NONE linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch, 1.1.2.1, NONE Message-ID: <200803061041.m26AfBYw029545@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29481 Modified Files: Tag: private-markmc-pv-ops-branch Makefile Makefile.config config-xen-generic kernel.spec Added Files: Tag: private-markmc-pv-ops-branch linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch Removed Files: Tag: private-markmc-pv-ops-branch linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch Log Message: * Thu Mar 05 2008 Mark McLoughlin - Add /proc/xen and /sys/hypervisor linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch: --- NEW FILE linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch --- >From cf0f35fc0d69ca088953e0cba566bfa503488b6b Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 19 Feb 2008 15:34:32 +0000 Subject: [PATCH] xen: Add a vmlinuz target Although patches are in progress to allow Xen boot a DomU using a bzImage, support for booting a Dom0 using a bzImage is still a ways off. For now, just add a target to build a gzip-ed ELF file which Xen can use to boot both Dom0 and DomU. Signed-off-by: Mark McLoughlin --- arch/x86/Makefile | 9 +++++++++ arch/x86/boot/.gitignore | 1 + arch/x86/boot/Makefile | 9 +++++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index f1e739a..14a752e 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -206,6 +206,15 @@ boot := arch/x86/boot PHONY += zImage bzImage compressed zlilo bzlilo \ zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install +ifdef CONFIG_XEN +PHONY += vmlinuz +all: vmlinuz + +vmlinuz: KBUILD_IMAGE := $(boot)/vmlinuz +vmlinuz: vmlinux + $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) +endif + # Default kernel to build all: bzImage diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore index b1bdc4c..35e7956 100644 --- a/arch/x86/boot/.gitignore +++ b/arch/x86/boot/.gitignore @@ -5,3 +5,4 @@ setup.bin setup.elf cpustr.h mkcpustr +vmlinuz diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index f88458e..61bba92 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -26,6 +26,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA #RAMDISK := -DRAMDISK=512 targets := vmlinux.bin setup.bin setup.elf zImage bzImage +targets += vmlinuz vmlinux-stripped subdir- := compressed setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o @@ -105,6 +106,14 @@ $(obj)/setup.bin: $(obj)/setup.elf FORCE $(obj)/compressed/vmlinux: FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@ +$(obj)/vmlinuz: $(obj)/vmlinux-stripped FORCE + $(call if_changed,gzip) + @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' + +$(obj)/vmlinux-stripped: OBJCOPYFLAGS := -g --strip-unneeded +$(obj)/vmlinux-stripped: vmlinux FORCE + $(call if_changed,objcopy) + # Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel FDARGS = # Set this if you want an initrd included with the zdisk/fdimage/isoimage kernel -- 1.5.4.1 linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch: --- NEW FILE linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch --- >From 1f09b9348726be2b7a25427c21a08f8c16e7a5a2 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 4 Feb 2008 08:30:37 +0000 Subject: [PATCH] xen: Add empty xenctrl module Add the basic infrastructure for a xenctrl module which will contain the various kernel interfaces used by (mainly Dom0) Xen userspace. Signed-off-by: Mark McLoughlin --- arch/x86/xen/Kconfig | 7 +++++ drivers/xen/Makefile | 2 + drivers/xen/xenctrl/Makefile | 4 +++ drivers/xen/xenctrl/main.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 0 deletions(-) create mode 100644 drivers/xen/xenctrl/Makefile create mode 100644 drivers/xen/xenctrl/main.c diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 4d5f264..4723bc1 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -11,3 +11,10 @@ config XEN This is the Linux Xen port. Enabling this will allow the kernel to boot in a paravirtualized environment under the Xen hypervisor. + +config XENCTRL + tristate "Xen's user space control interfaces" + depends on XEN && PROC_FS + default y if XEN + help + This is the /proc/xen interface used by Xen's libxc. diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 56592f0..6737463 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,2 +1,4 @@ obj-y += grant-table.o obj-y += xenbus/ + +obj-$(CONFIG_XENCTRL) += xenctrl/ diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile new file mode 100644 index 0000000..1f43a43 --- /dev/null +++ b/drivers/xen/xenctrl/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_XENCTRL) += xenctrl.o + +xenctrl-objs = +xenctrl-objs += main.o diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c new file mode 100644 index 0000000..2965ceb --- /dev/null +++ b/drivers/xen/xenctrl/main.c @@ -0,0 +1,62 @@ +/****************************************************************************** + * + * main.c + * + * Xen userspace control interfaces + * + * Copyright (c) 2002-2004, K A Fraser, B Dragovic + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include + +static int __init xenctrl_init(void) +{ + struct proc_dir_entry *dir; + + if (!is_running_on_xen()) + return -ENODEV; + + dir = proc_mkdir("xen", NULL); + if (!dir) + return -ENOMEM; + + dir->owner = THIS_MODULE; + + return 0; +} + +static void __exit xenctrl_exit(void) +{ + remove_proc_entry("xen", NULL); +} + +module_init(xenctrl_init); +module_exit(xenctrl_exit); + +MODULE_LICENSE("Dual BSD/GPL"); -- 1.5.4.1 linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch: --- NEW FILE linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch --- >From 1d322cb04345404de611fc9b7e10c78bf957eb49 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 4 Feb 2008 09:16:51 +0000 Subject: [PATCH] xen: Add /proc/xen/capabilities /proc/xen/capabilities is used by the xend init script to check whether it is running on Dom0. Signed-off-by: Mark McLoughlin --- drivers/xen/xenctrl/Makefile | 1 + drivers/xen/xenctrl/capabilities.c | 68 ++++++++++++++++++++++++++++++++++++ drivers/xen/xenctrl/main.c | 11 ++++++ drivers/xen/xenctrl/xenctrl.h | 39 ++++++++++++++++++++ 4 files changed, 119 insertions(+), 0 deletions(-) create mode 100644 drivers/xen/xenctrl/capabilities.c create mode 100644 drivers/xen/xenctrl/xenctrl.h diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile index 1f43a43..631f535 100644 --- a/drivers/xen/xenctrl/Makefile +++ b/drivers/xen/xenctrl/Makefile @@ -2,3 +2,4 @@ obj-$(CONFIG_XENCTRL) += xenctrl.o xenctrl-objs = xenctrl-objs += main.o +xenctrl-objs += capabilities.o diff --git a/drivers/xen/xenctrl/capabilities.c b/drivers/xen/xenctrl/capabilities.c new file mode 100644 index 0000000..1ff078a --- /dev/null +++ b/drivers/xen/xenctrl/capabilities.c @@ -0,0 +1,68 @@ +/****************************************************************************** + * + * capabilities.c + * + * /proc/xen/capabilities + * + * Copyright (c) 2002-2004, K A Fraser, B Dragovic + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include + +static int capabilities_read(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + int len = 0; + *page = 0; + + if (is_initial_xendomain()) + len = sprintf(page, "control_d\n"); + + *eof = 1; + return len; +} + +int __init capabilities_create_proc_entry(void) +{ + struct proc_dir_entry *entry; + + entry = create_proc_entry("xen/capabilities", 0400, NULL); + if (!entry) + return -ENOMEM; + + entry->owner = THIS_MODULE; + entry->read_proc = capabilities_read; + + return 0; +} + +void __exit capabilities_remove_proc_entry(void) +{ + remove_proc_entry("xen/capabilities", NULL); +} diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c index 2965ceb..0e42f7e 100644 --- a/drivers/xen/xenctrl/main.c +++ b/drivers/xen/xenctrl/main.c @@ -31,6 +31,8 @@ * IN THE SOFTWARE. */ +#include "xenctrl.h" + #include #include #include @@ -38,6 +40,7 @@ static int __init xenctrl_init(void) { struct proc_dir_entry *dir; + int ret; if (!is_running_on_xen()) return -ENODEV; @@ -48,11 +51,19 @@ static int __init xenctrl_init(void) dir->owner = THIS_MODULE; + ret = capabilities_create_proc_entry(); + if (ret) + goto fail1; + return 0; + + fail1: remove_proc_entry("xen", NULL); + return ret; } static void __exit xenctrl_exit(void) { + capabilities_remove_proc_entry(); remove_proc_entry("xen", NULL); } diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h new file mode 100644 index 0000000..7378dde --- /dev/null +++ b/drivers/xen/xenctrl/xenctrl.h @@ -0,0 +1,39 @@ +/****************************************************************************** + * xenctl.h + * + * Xen userspace control interfaces + * + * Copyright (c) 2002-2004, K A Fraser, B Dragovic + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include + +/* + * capabilities.c + */ +int capabilities_create_proc_entry(void) __init; +void capabilities_remove_proc_entry(void) __exit; -- 1.5.4.1 linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch: --- NEW FILE linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch --- >From b897a4dad96c4695994783da288a44818579f868 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 4 Feb 2008 08:24:57 +0000 Subject: [PATCH] xen: Add /proc/xen/privcmd /proc/xen/privcmd is an ioctl() interface which allows userspace apps to invoke hypercalls. There should also be an ioctl (IOCTL_PRIVCMD_MMAP) which is used to map foreign pages into a processes address space, but we leave this unimplemented for now pending further work on foreign page support. Signed-off-by: Mark McLoughlin --- drivers/xen/xenctrl/Makefile | 1 + drivers/xen/xenctrl/main.c | 6 +++ drivers/xen/xenctrl/privcmd.c | 81 +++++++++++++++++++++++++++++++++++++++ drivers/xen/xenctrl/xenctrl.h | 6 +++ include/asm-x86/xen/hypercall.h | 28 +++++++++++++ include/xen/sys/privcmd.h | 79 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 201 insertions(+), 0 deletions(-) create mode 100644 drivers/xen/xenctrl/privcmd.c create mode 100644 include/xen/sys/privcmd.h diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile index 631f535..8a706cb 100644 --- a/drivers/xen/xenctrl/Makefile +++ b/drivers/xen/xenctrl/Makefile @@ -3,3 +3,4 @@ obj-$(CONFIG_XENCTRL) += xenctrl.o xenctrl-objs = xenctrl-objs += main.o xenctrl-objs += capabilities.o +xenctrl-objs += privcmd.o diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c index 0e42f7e..d1fe6ef 100644 --- a/drivers/xen/xenctrl/main.c +++ b/drivers/xen/xenctrl/main.c @@ -55,14 +55,20 @@ static int __init xenctrl_init(void) if (ret) goto fail1; + ret = privcmd_create_proc_entry(); + if (ret) + goto fail2; + return 0; + fail2: capabilities_remove_proc_entry(); fail1: remove_proc_entry("xen", NULL); return ret; } static void __exit xenctrl_exit(void) { + privcmd_remove_proc_entry(); capabilities_remove_proc_entry(); remove_proc_entry("xen", NULL); } diff --git a/drivers/xen/xenctrl/privcmd.c b/drivers/xen/xenctrl/privcmd.c new file mode 100644 index 0000000..58c4b83 --- /dev/null +++ b/drivers/xen/xenctrl/privcmd.c @@ -0,0 +1,81 @@ +/****************************************************************************** + * privcmd.c + * + * Interface to privileged domain-0 commands. + * + * Copyright (c) 2002-2004, K A Fraser, B Dragovic + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include + +static long privcmd_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) +{ + switch (cmd) { + case IOCTL_PRIVCMD_HYPERCALL: { + privcmd_hypercall_t cmd; + + if (copy_from_user(&cmd, (void __user *)arg, sizeof(cmd))) + return -EFAULT; + + return privcmd_hypercall(&cmd); + } + + case IOCTL_PRIVCMD_MMAP: + case IOCTL_PRIVCMD_MMAPBATCH: + printk(KERN_WARNING "IOCTL_PRIVCMD_MMAP ioctl not yet implemented\n"); + default: + return -EINVAL; + } +} + +static const struct file_operations privcmd_file_ops = { + .unlocked_ioctl = privcmd_ioctl, +}; + +int __init privcmd_create_proc_entry(void) +{ + static struct proc_dir_entry *entry; + + entry = create_proc_entry("xen/privcmd", 0400, NULL); + if (!entry) + return -ENOMEM; + + entry->owner = THIS_MODULE; + entry->proc_fops = &privcmd_file_ops; + + return 0; +} + +void __exit privcmd_remove_proc_entry(void) +{ + remove_proc_entry("xen/privcmd", NULL); +} diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h index 7378dde..a35209a 100644 --- a/drivers/xen/xenctrl/xenctrl.h +++ b/drivers/xen/xenctrl/xenctrl.h @@ -37,3 +37,9 @@ */ int capabilities_create_proc_entry(void) __init; void capabilities_remove_proc_entry(void) __exit; + +/* + * privcmd.c + */ +int privcmd_create_proc_entry(void) __init; +void privcmd_remove_proc_entry(void) __exit; diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index bc0ee7d..cd554ca 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h @@ -410,4 +410,32 @@ MULTI_stack_switch(struct multicall_entry *mcl, mcl->args[1] = esp; } +#include + +static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) +{ + int ret; + + if (hypercall->op >= (PAGE_SIZE >> 5)) + return -EINVAL; + + __asm__ __volatile__ ( + "pushl %%ebx; pushl %%ecx; pushl %%edx; " + "pushl %%esi; pushl %%edi; " + "movl 8(%%eax),%%ebx ;" + "movl 16(%%eax),%%ecx ;" + "movl 24(%%eax),%%edx ;" + "movl 32(%%eax),%%esi ;" + "movl 40(%%eax),%%edi ;" + "movl (%%eax),%%eax ;" + "shll $5,%%eax ;" + "addl $hypercall_page,%%eax ;" + "call *%%eax ;" + "popl %%edi; popl %%esi; popl %%edx; " + "popl %%ecx; popl %%ebx" + : "=a" (ret) : "0" (hypercall) : "memory" ); + + return ret; +} + #endif /* __HYPERCALL_H__ */ diff --git a/include/xen/sys/privcmd.h b/include/xen/sys/privcmd.h new file mode 100644 index 0000000..9cfa9d7 --- /dev/null +++ b/include/xen/sys/privcmd.h @@ -0,0 +1,79 @@ +/****************************************************************************** + * privcmd.h + * + * Interface to /proc/xen/privcmd. + * + * Copyright (c) 2003-2005, K A Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __LINUX_PUBLIC_PRIVCMD_H__ +#define __LINUX_PUBLIC_PRIVCMD_H__ + +#include + +#ifndef __user +#define __user +#endif + +typedef struct privcmd_hypercall +{ + __u64 op; + __u64 arg[5]; +} privcmd_hypercall_t; + +typedef struct privcmd_mmap_entry { + __u64 va; + __u64 mfn; + __u64 npages; +} privcmd_mmap_entry_t; + +typedef struct privcmd_mmap { + int num; + domid_t dom; /* target domain */ + privcmd_mmap_entry_t __user *entry; +} privcmd_mmap_t; + +typedef struct privcmd_mmapbatch { + int num; /* number of pages to populate */ + domid_t dom; /* target domain */ + __u64 addr; /* virtual address */ + ulong __user *arr; /* array of mfns - top nibble set on err */ +} privcmd_mmapbatch_t; + +/* + * @cmd: IOCTL_PRIVCMD_HYPERCALL + * @arg: &privcmd_hypercall_t + * Return: Value returned from execution of the specified hypercall. + */ +#define IOCTL_PRIVCMD_HYPERCALL \ + _IOC(_IOC_NONE, 'P', 0, sizeof(privcmd_hypercall_t)) +#define IOCTL_PRIVCMD_MMAP \ + _IOC(_IOC_NONE, 'P', 2, sizeof(privcmd_mmap_t)) +#define IOCTL_PRIVCMD_MMAPBATCH \ + _IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t)) + +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */ -- 1.5.4.1 linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch: --- NEW FILE linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch --- >From 6a0df620e0d6ae9ab22cdadb226f7da0b1282fac Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 4 Feb 2008 22:04:36 +0000 Subject: [PATCH] xen: Add /proc/xen/xenbus This interface is used by userspace programs to talk to xenstored. Since xenstored makes itself available to Dom0 userspace via a socket this should only really be useful in Domu, but it turns out that Dom0 apps historically default to using /proc/xen/xenbus rather than the socket. Signed-off-by: Mark McLoughlin --- drivers/xen/xenbus/xenbus_comms.h | 1 - drivers/xen/xenbus/xenbus_probe.c | 2 + drivers/xen/xenbus/xenbus_xs.c | 1 + drivers/xen/xenctrl/Makefile | 1 + drivers/xen/xenctrl/main.c | 6 + drivers/xen/xenctrl/xenbus.c | 398 +++++++++++++++++++++++++++++++++++++ drivers/xen/xenctrl/xenctrl.h | 6 + include/xen/xenbus.h | 2 + 8 files changed, 416 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/xenctrl/xenbus.c diff --git a/drivers/xen/xenbus/xenbus_comms.h b/drivers/xen/xenbus/xenbus_comms.h index c21db75..fcc9b29 100644 --- a/drivers/xen/xenbus/xenbus_comms.h +++ b/drivers/xen/xenbus/xenbus_comms.h @@ -41,6 +41,5 @@ int xb_data_to_read(void); int xb_wait_for_data_to_read(void); int xs_input_avail(void); extern struct xenstore_domain_interface *xen_store_interface; -extern int xen_store_evtchn; #endif /* _XENBUS_COMMS_H */ diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 336363c..759fdbc 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -56,6 +56,8 @@ #include "xenbus_probe.h" int xen_store_evtchn; +EXPORT_SYMBOL_GPL(xen_store_evtchn); + struct xenstore_domain_interface *xen_store_interface; static unsigned long xen_store_mfn; diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c index 227d53b..810e24a 100644 --- a/drivers/xen/xenbus/xenbus_xs.c +++ b/drivers/xen/xenbus/xenbus_xs.c @@ -184,6 +184,7 @@ void *xenbus_dev_request_and_reply(struct xsd_sockmsg *msg) return ret; } +EXPORT_SYMBOL(xenbus_dev_request_and_reply); /* Send message to xs, get kmalloc'ed reply. ERR_PTR() on error. */ static void *xs_talkv(struct xenbus_transaction t, diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile index 8a706cb..23dafa3 100644 --- a/drivers/xen/xenctrl/Makefile +++ b/drivers/xen/xenctrl/Makefile @@ -4,3 +4,4 @@ xenctrl-objs = xenctrl-objs += main.o xenctrl-objs += capabilities.o xenctrl-objs += privcmd.o +xenctrl-objs += xenbus.o diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c index d1fe6ef..b0cf61b 100644 --- a/drivers/xen/xenctrl/main.c +++ b/drivers/xen/xenctrl/main.c @@ -59,8 +59,13 @@ static int __init xenctrl_init(void) if (ret) goto fail2; + ret = xenbus_create_proc_entry(); + if (ret) + goto fail3; + return 0; + fail3: privcmd_remove_proc_entry(); fail2: capabilities_remove_proc_entry(); fail1: remove_proc_entry("xen", NULL); return ret; @@ -68,6 +73,7 @@ static int __init xenctrl_init(void) static void __exit xenctrl_exit(void) { + xenbus_remove_proc_entry(); privcmd_remove_proc_entry(); capabilities_remove_proc_entry(); remove_proc_entry("xen", NULL); diff --git a/drivers/xen/xenctrl/xenbus.c b/drivers/xen/xenctrl/xenbus.c new file mode 100644 index 0000000..57d5501 --- /dev/null +++ b/drivers/xen/xenctrl/xenbus.c @@ -0,0 +1,398 @@ +/* + * xenbus.c + * + * /proc/xen/xenbus gives user-space access to the kernel's xenbus + * connection to xenstore. + * + * Copyright (c) 2005, Christian Limpach + * Copyright (c) 2005, Rusty Russell, IBM Corporation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include +#include + +#include + +struct xenbus_dev_transaction { + struct list_head list; + struct xenbus_transaction handle; +}; + +struct read_buffer { + struct list_head list; + unsigned int cons; + unsigned int len; + char msg[]; +}; + +struct xenbus_dev_data { + /* In-progress transaction. */ + struct list_head transactions; + + /* Active watches. */ + struct list_head watches; + + /* Partial request. */ + unsigned int len; + union { + struct xsd_sockmsg msg; + char buffer[PAGE_SIZE]; + } u; + + /* Response queue. */ + struct list_head read_buffers; + wait_queue_head_t read_waitq; + + struct mutex reply_mutex; +}; + +static ssize_t xenbus_dev_read(struct file *filp, + char __user *ubuf, + size_t len, loff_t *ppos) +{ + struct xenbus_dev_data *u = filp->private_data; + struct read_buffer *rb; + int i, ret; + + mutex_lock(&u->reply_mutex); + while (list_empty(&u->read_buffers)) { + mutex_unlock(&u->reply_mutex); + ret = wait_event_interruptible(u->read_waitq, + !list_empty(&u->read_buffers)); + if (ret) + return ret; + mutex_lock(&u->reply_mutex); + } + + rb = list_entry(u->read_buffers.next, struct read_buffer, list); + for (i = 0; i < len;) { + put_user(rb->msg[rb->cons], ubuf + i); + i++; + rb->cons++; + if (rb->cons == rb->len) { + list_del(&rb->list); + kfree(rb); + if (list_empty(&u->read_buffers)) + break; + rb = list_entry(u->read_buffers.next, + struct read_buffer, list); + } + } + mutex_unlock(&u->reply_mutex); + + return i; +} + +static void queue_reply(struct xenbus_dev_data *u, + char *data, unsigned int len) +{ + struct read_buffer *rb; + + if (len == 0) + return; + + rb = kmalloc(sizeof(*rb) + len, GFP_KERNEL); + BUG_ON(rb == NULL); + + rb->cons = 0; + rb->len = len; + + memcpy(rb->msg, data, len); + + list_add_tail(&rb->list, &u->read_buffers); + + wake_up(&u->read_waitq); +} + +struct watch_adapter +{ + struct list_head list; + struct xenbus_watch watch; + struct xenbus_dev_data *dev_data; + char *token; +}; + +static void free_watch_adapter(struct watch_adapter *watch) +{ + kfree(watch->watch.node); + kfree(watch->token); + kfree(watch); +} + +static void watch_fired(struct xenbus_watch *watch, + const char **vec, + unsigned int len) +{ + struct watch_adapter *adap = + container_of(watch, struct watch_adapter, watch); + struct xsd_sockmsg hdr; + const char *path, *token; + int path_len, tok_len, body_len; + + path = vec[XS_WATCH_PATH]; + token = adap->token; + + path_len = strlen(path) + 1; + tok_len = strlen(token) + 1; + body_len = path_len + tok_len; + + hdr.type = XS_WATCH_EVENT; + hdr.len = body_len; + + mutex_lock(&adap->dev_data->reply_mutex); + queue_reply(adap->dev_data, (char *)&hdr, sizeof(hdr)); + queue_reply(adap->dev_data, (char *)path, path_len); + queue_reply(adap->dev_data, (char *)token, tok_len); + mutex_unlock(&adap->dev_data->reply_mutex); +} + +static LIST_HEAD(watch_list); + +static ssize_t xenbus_dev_write(struct file *filp, + const char __user *ubuf, + size_t len, loff_t *ppos) +{ + struct xenbus_dev_data *u = filp->private_data; + struct xenbus_dev_transaction *trans = NULL; + uint32_t msg_type; + void *reply; + char *path, *token; + struct watch_adapter *watch, *tmp_watch; + int err, rc = len; + + if ((len + u->len) > sizeof(u->u.buffer)) { + rc = -EINVAL; + goto out; + } + + if (copy_from_user(u->u.buffer + u->len, ubuf, len) != 0) { + rc = -EFAULT; + goto out; + } + + u->len += len; + if ((u->len < sizeof(u->u.msg)) || + (u->len < (sizeof(u->u.msg) + u->u.msg.len))) + return rc; + + msg_type = u->u.msg.type; + + switch (msg_type) { + case XS_TRANSACTION_START: + case XS_TRANSACTION_END: + case XS_DIRECTORY: + case XS_READ: + case XS_GET_PERMS: + case XS_RELEASE: + case XS_GET_DOMAIN_PATH: + case XS_WRITE: + case XS_MKDIR: + case XS_RM: + case XS_SET_PERMS: + if (msg_type == XS_TRANSACTION_START) { + trans = kmalloc(sizeof(*trans), GFP_KERNEL); + if (!trans) { + rc = -ENOMEM; + goto out; + } + } + + reply = xenbus_dev_request_and_reply(&u->u.msg); + if (IS_ERR(reply)) { + kfree(trans); + rc = PTR_ERR(reply); + goto out; + } + + if (msg_type == XS_TRANSACTION_START) { + trans->handle.id = simple_strtoul(reply, NULL, 0); + list_add(&trans->list, &u->transactions); + } else if (msg_type == XS_TRANSACTION_END) { + list_for_each_entry(trans, &u->transactions, list) + if (trans->handle.id == u->u.msg.tx_id) + break; + BUG_ON(&trans->list == &u->transactions); + list_del(&trans->list); + kfree(trans); + } + mutex_lock(&u->reply_mutex); + queue_reply(u, (char *)&u->u.msg, sizeof(u->u.msg)); + queue_reply(u, (char *)reply, u->u.msg.len); + mutex_unlock(&u->reply_mutex); + kfree(reply); + break; + + case XS_WATCH: + case XS_UNWATCH: { + static const char *XS_RESP = "OK"; + struct xsd_sockmsg hdr; + + path = u->u.buffer + sizeof(u->u.msg); + token = memchr(path, 0, u->u.msg.len); + if (token == NULL) { + rc = -EILSEQ; + goto out; + } + token++; + + if (msg_type == XS_WATCH) { + watch = kmalloc(sizeof(*watch), GFP_KERNEL); + watch->watch.node = kmalloc(strlen(path)+1, + GFP_KERNEL); + strcpy((char *)watch->watch.node, path); + watch->watch.callback = watch_fired; + watch->token = kmalloc(strlen(token)+1, GFP_KERNEL); + strcpy(watch->token, token); + watch->dev_data = u; + + err = register_xenbus_watch(&watch->watch); + if (err) { + free_watch_adapter(watch); + rc = err; + goto out; + } + + list_add(&watch->list, &u->watches); + } else { + list_for_each_entry_safe(watch, tmp_watch, + &u->watches, list) { + if (!strcmp(watch->token, token) && + !strcmp(watch->watch.node, path)) + { + unregister_xenbus_watch(&watch->watch); + list_del(&watch->list); + free_watch_adapter(watch); + break; + } + } + } + + hdr.type = msg_type; + hdr.len = strlen(XS_RESP) + 1; + mutex_lock(&u->reply_mutex); + queue_reply(u, (char *)&hdr, sizeof(hdr)); + queue_reply(u, (char *)XS_RESP, hdr.len); + mutex_unlock(&u->reply_mutex); + break; + } + + default: + rc = -EINVAL; + break; + } + + out: + u->len = 0; + return rc; +} + +static int xenbus_dev_open(struct inode *inode, struct file *filp) +{ + struct xenbus_dev_data *u; + + if (xen_store_evtchn == 0) + return -ENOENT; + + nonseekable_open(inode, filp); + + u = kzalloc(sizeof(*u), GFP_KERNEL); + if (u == NULL) + return -ENOMEM; + + INIT_LIST_HEAD(&u->transactions); + INIT_LIST_HEAD(&u->watches); + INIT_LIST_HEAD(&u->read_buffers); + init_waitqueue_head(&u->read_waitq); + + mutex_init(&u->reply_mutex); + + filp->private_data = u; + + return 0; +} + +static int xenbus_dev_release(struct inode *inode, struct file *filp) +{ + struct xenbus_dev_data *u = filp->private_data; + struct xenbus_dev_transaction *trans, *tmp; + struct watch_adapter *watch, *tmp_watch; + + list_for_each_entry_safe(trans, tmp, &u->transactions, list) { + xenbus_transaction_end(trans->handle, 1); + list_del(&trans->list); + kfree(trans); + } + + list_for_each_entry_safe(watch, tmp_watch, &u->watches, list) { + unregister_xenbus_watch(&watch->watch); + list_del(&watch->list); + free_watch_adapter(watch); + } + + kfree(u); + + return 0; +} + +static unsigned int xenbus_dev_poll(struct file *file, poll_table *wait) +{ + struct xenbus_dev_data *u = file->private_data; + + poll_wait(file, &u->read_waitq, wait); + if (!list_empty(&u->read_buffers)) + return POLLIN | POLLRDNORM; + return 0; +} + +static const struct file_operations xenbus_dev_file_ops = { + .read = xenbus_dev_read, + .write = xenbus_dev_write, + .open = xenbus_dev_open, + .release = xenbus_dev_release, + .poll = xenbus_dev_poll, +}; + +int __init xenbus_create_proc_entry(void) +{ + struct proc_dir_entry *entry; + + entry = create_proc_entry("xen/xenbus", 0400, NULL); + if (!entry) + return -ENOMEM; + + entry->owner = THIS_MODULE; + entry->proc_fops = &xenbus_dev_file_ops; + + return 0; +} + +void __exit xenbus_remove_proc_entry(void) +{ + remove_proc_entry("xen/xenbus", NULL); +} diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h index a35209a..e585c4b 100644 --- a/drivers/xen/xenctrl/xenctrl.h +++ b/drivers/xen/xenctrl/xenctrl.h @@ -43,3 +43,9 @@ void capabilities_remove_proc_entry(void) __exit; */ int privcmd_create_proc_entry(void) __init; void privcmd_remove_proc_entry(void) __exit; + +/* + * xenbus.c + */ +int xenbus_create_proc_entry(void) __init; +void xenbus_remove_proc_entry(void) __exit; diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 6f7c290..10eae11 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h @@ -231,4 +231,6 @@ const char *xenbus_strstate(enum xenbus_state state); int xenbus_dev_is_online(struct xenbus_device *dev); int xenbus_frontend_closed(struct xenbus_device *dev); +extern int xen_store_evtchn; + #endif /* _XEN_XENBUS_H */ -- 1.5.4.1 linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch: --- NEW FILE linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch --- >From 54754bff4a3564e48821056f1134b1450cd0280e Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 7 Feb 2008 15:32:28 +0000 Subject: [PATCH] xen: Add Xen's /sys/hypervisor interface Hook up Xen's /sys/hypervisor interface: /sys/hypervisor/ -> type -> uuid -> compilation -> compile_date -> compiled_by -> compiler -> properties -> capabilities -> changeset -> pagesize -> virtual_start -> writable_pt -> version -> extra -> major -> minor Note: the hypervisor subsys hook requires that SYS_HYPERVISOR is selected to enabled it, which in turns means that the subsys will be registered by a pv-ops kernel with Xen support, even on bare metal. This hook needs to be changed to be runtime enabled. Signed-off-by: Mark McLoughlin --- arch/x86/xen/Kconfig | 3 +- drivers/xen/xenctrl/Makefile | 1 + drivers/xen/xenctrl/main.c | 6 + drivers/xen/xenctrl/sysfs.c | 349 +++++++++++++++++++++++++++++++++++++++ drivers/xen/xenctrl/xenctrl.h | 6 + include/xen/interface/version.h | 6 + 6 files changed, 370 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/xenctrl/sysfs.c diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 4723bc1..ff6a56a 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -14,7 +14,8 @@ config XEN config XENCTRL tristate "Xen's user space control interfaces" - depends on XEN && PROC_FS + depends on XEN && PROC_FS && SYSFS default y if XEN + select SYS_HYPERVISOR help This is the /proc/xen interface used by Xen's libxc. diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile index 23dafa3..e126e76 100644 --- a/drivers/xen/xenctrl/Makefile +++ b/drivers/xen/xenctrl/Makefile @@ -5,3 +5,4 @@ xenctrl-objs += main.o xenctrl-objs += capabilities.o xenctrl-objs += privcmd.o xenctrl-objs += xenbus.o +xenctrl-objs += sysfs.o diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c index b0cf61b..87d0dba 100644 --- a/drivers/xen/xenctrl/main.c +++ b/drivers/xen/xenctrl/main.c @@ -63,8 +63,13 @@ static int __init xenctrl_init(void) if (ret) goto fail3; + ret = sys_hypervisor_init(); + if (ret) + goto fail4; + return 0; + fail4: xenbus_remove_proc_entry(); fail3: privcmd_remove_proc_entry(); fail2: capabilities_remove_proc_entry(); fail1: remove_proc_entry("xen", NULL); @@ -73,6 +78,7 @@ static int __init xenctrl_init(void) static void __exit xenctrl_exit(void) { + sys_hypervisor_exit(); xenbus_remove_proc_entry(); privcmd_remove_proc_entry(); capabilities_remove_proc_entry(); diff --git a/drivers/xen/xenctrl/sysfs.c b/drivers/xen/xenctrl/sysfs.c new file mode 100644 index 0000000..8cbf4d6 --- /dev/null +++ b/drivers/xen/xenctrl/sysfs.c @@ -0,0 +1,349 @@ +/* + * copyright (c) 2006 IBM Corporation + * Authored by: Mike D. Day + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include "xenctrl.h" + +#define HYPERVISOR_ATTR_RO(_name) \ +static struct kobj_attribute _name##_attr = __ATTR_RO(_name) + +#define HYPERVISOR_ATTR_RW(_name) \ +static struct kobj_attribute _name##_attr = \ + __ATTR(_name, 0644, _name##_show, _name##_store) + +static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + return sprintf(buffer, "xen\n"); +} + +HYPERVISOR_ATTR_RO(type); + +static int __init xen_sysfs_type_init(void) +{ + return sysfs_create_file(hypervisor_kobj, &type_attr.attr); +} + +static void xen_sysfs_type_destroy(void) +{ + sysfs_remove_file(hypervisor_kobj, &type_attr.attr); +} + +static ssize_t major_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + int version; + + version = HYPERVISOR_xen_version(XENVER_version, NULL); + if (!version) + return -ENODEV; + + return sprintf(buffer, "%d\n", version >> 16); +} + +HYPERVISOR_ATTR_RO(major); + +static ssize_t minor_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + int version; + + version = HYPERVISOR_xen_version(XENVER_version, NULL); + if (!version) + return -ENODEV; + + return sprintf(buffer, "%d\n", version & 0xff); +} + +HYPERVISOR_ATTR_RO(minor); + +static ssize_t extra_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + int ret; + struct xen_extraversion extra; + + ret = HYPERVISOR_xen_version(XENVER_extraversion, &extra); + if (ret) + return ret; + + return sprintf(buffer, "%s\n", extra.extraversion); +} + +HYPERVISOR_ATTR_RO(extra); + +static struct attribute *version_attrs[] = { + &major_attr.attr, + &minor_attr.attr, + &extra_attr.attr, + NULL +}; + +static struct attribute_group version_group = { + .name = "version", + .attrs = version_attrs, +}; + +static int __init xen_sysfs_version_init(void) +{ + return sysfs_create_group(hypervisor_kobj, &version_group); +} + +static void xen_sysfs_version_destroy(void) +{ + sysfs_remove_group(hypervisor_kobj, &version_group); +} + +static ssize_t uuid_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + char *vm, *val; + int ret; + + vm = xenbus_read(XBT_NIL, "vm", "", NULL); + if (IS_ERR(vm)) + return PTR_ERR(vm); + + val = xenbus_read(XBT_NIL, vm, "uuid", NULL); + if (IS_ERR(val)) { + ret = PTR_ERR(val); + goto out; + } + + ret = sprintf(buffer, "%s\n", val); + + kfree(val); +out: kfree(vm); + + return ret; +} + +HYPERVISOR_ATTR_RO(uuid); + +static int __init xen_sysfs_uuid_init(void) +{ + return sysfs_create_file(hypervisor_kobj, &uuid_attr.attr); +} + +static void xen_sysfs_uuid_destroy(void) +{ + sysfs_remove_file(hypervisor_kobj, &uuid_attr.attr); +} + +static ssize_t compiler_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_compile_info info; + int ret; + + ret = HYPERVISOR_xen_version(XENVER_compile_info, &info); + if (ret) + return ret; + + return sprintf(buffer, "%s\n", info.compiler); +} + +HYPERVISOR_ATTR_RO(compiler); + +static ssize_t compiled_by_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_compile_info info; + int ret; + + ret = HYPERVISOR_xen_version(XENVER_compile_info, &info); + if (ret) + return ret; + + return sprintf(buffer, "%s\n", info.compile_by); +} + +HYPERVISOR_ATTR_RO(compiled_by); + +static ssize_t compile_date_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_compile_info info; + int ret; + + ret = HYPERVISOR_xen_version(XENVER_compile_info, &info); + if (ret) + return ret; + + return sprintf(buffer, "%s\n", info.compile_date); +} + +HYPERVISOR_ATTR_RO(compile_date); + +static struct attribute *xen_compile_attrs[] = { + &compiler_attr.attr, + &compiled_by_attr.attr, + &compile_date_attr.attr, + NULL +}; + +static struct attribute_group xen_compilation_group = { + .name = "compilation", + .attrs = xen_compile_attrs, +}; + +static int __init xen_compilation_init(void) +{ + return sysfs_create_group(hypervisor_kobj, + &xen_compilation_group); +} + +static void xen_compilation_destroy(void) +{ + sysfs_remove_group(hypervisor_kobj, + &xen_compilation_group); +} + +static ssize_t capabilities_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_capabilities_info *caps; + int ret; + + caps = kmalloc(sizeof(struct xen_capabilities_info), GFP_KERNEL); + if (!caps) + return -ENOMEM; + + ret = HYPERVISOR_xen_version(XENVER_capabilities, caps); + if (ret) + goto out; + + ret = sprintf(buffer, "%s\n", caps->info); + +out: kfree(caps); + + return ret; +} + +HYPERVISOR_ATTR_RO(capabilities); + +static ssize_t changeset_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_changeset_info cset; + int ret; + + ret = HYPERVISOR_xen_version(XENVER_changeset, &cset); + if (ret) + return ret; + + return sprintf(buffer, "%s\n", cset.info); +} + +HYPERVISOR_ATTR_RO(changeset); + +static ssize_t virtual_start_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_platform_parameters parms; + int ret; + + ret = HYPERVISOR_xen_version(XENVER_platform_parameters, &parms); + if (ret) + return ret; + + return sprintf(buffer, "%lx\n", parms.virt_start); +} + +HYPERVISOR_ATTR_RO(virtual_start); + +static ssize_t pagesize_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + int ret; + + ret = HYPERVISOR_xen_version(XENVER_pagesize, NULL); + if (ret < 0) + return ret; + + return sprintf(buffer, "%x\n", ret); +} + +HYPERVISOR_ATTR_RO(pagesize); + +static ssize_t writable_pt_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) +{ + struct xen_feature_info info; + int ret; + + info.submap_idx = XENFEAT_writable_page_tables; + + ret = HYPERVISOR_xen_version(XENVER_get_features, &info); + if (ret) + return ret; + + return sprintf(buffer, "%d\n", info.submap); +} + +HYPERVISOR_ATTR_RO(writable_pt); + +static struct attribute *xen_properties_attrs[] = { + &capabilities_attr.attr, + &changeset_attr.attr, + &virtual_start_attr.attr, + &pagesize_attr.attr, + &writable_pt_attr.attr, + NULL +}; + +static struct attribute_group xen_properties_group = { + .name = "properties", + .attrs = xen_properties_attrs, +}; + +static int __init xen_properties_init(void) +{ + return sysfs_create_group(hypervisor_kobj, + &xen_properties_group); +} + +static void xen_properties_destroy(void) +{ + sysfs_remove_group(hypervisor_kobj, &xen_properties_group); +} + +int __init sys_hypervisor_init(void) +{ + int ret; + + if (!is_running_on_xen()) + return -ENODEV; + + ret = xen_sysfs_type_init(); + if (ret) + goto out; + ret = xen_sysfs_version_init(); + if (ret) + goto version_out; + ret = xen_compilation_init(); + if (ret) + goto comp_out; + ret = xen_sysfs_uuid_init(); + if (ret) + goto uuid_out; + ret = xen_properties_init(); + if (!ret) + goto out; + + xen_sysfs_uuid_destroy(); +uuid_out: + xen_compilation_destroy(); +comp_out: + xen_sysfs_version_destroy(); +version_out: + xen_sysfs_type_destroy(); +out: + return ret; +} + +void __exit sys_hypervisor_exit(void) +{ + xen_properties_destroy(); + xen_compilation_destroy(); + xen_sysfs_uuid_destroy(); + xen_sysfs_version_destroy(); + xen_sysfs_type_destroy(); +} diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h index e585c4b..1afbdfb 100644 --- a/drivers/xen/xenctrl/xenctrl.h +++ b/drivers/xen/xenctrl/xenctrl.h @@ -49,3 +49,9 @@ void privcmd_remove_proc_entry(void) __exit; */ int xenbus_create_proc_entry(void) __init; void xenbus_remove_proc_entry(void) __exit; + +/* + * sysfs.c + */ +int sys_hypervisor_init(void) __init; +void sys_hypervisor_exit(void) __exit; diff --git a/include/xen/interface/version.h b/include/xen/interface/version.h index 453235e..dd58cf5 100644 --- a/include/xen/interface/version.h +++ b/include/xen/interface/version.h @@ -57,4 +57,10 @@ struct xen_feature_info { /* Declares the features reported by XENVER_get_features. */ #include "features.h" +/* arg == NULL; returns host memory page size. */ +#define XENVER_pagesize 7 + +/* arg == xen_domain_handle_t. */ +#define XENVER_guest_handle 8 + #endif /* __XEN_PUBLIC_VERSION_H__ */ -- 1.5.4.1 linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch: --- NEW FILE linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch --- >From dc0daca424b10e5758a875d9dfe55dbf4fc7966e Mon Sep 17 00:00:00 2001 From: Stephen Tweedie Date: Wed, 21 Nov 2007 18:40:31 +0000 Subject: [PATCH] xen debug: Add xprintk to log directly via hypercall For early debugging, it is useful to have a way of doing debugging output direct to the hypervisor without having to rely on console being fully initialised. Signed-off-by: Stephen Tweedie --- arch/x86/xen/enlighten.c | 32 ++++++++++++++++++++++++++++++++ include/xen/hvc-console.h | 1 + 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index a94605e..e1702e1 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -142,6 +143,37 @@ static void __init xen_banner(void) printk(KERN_INFO "Hypervisor signature: %s\n", xen_start_info->magic); } +static void kcons_write_dom0(const char *s, unsigned int count) +{ + int rc; + + while ((count > 0) && + ((rc = HYPERVISOR_console_io( + CONSOLEIO_write, count, (char *)s)) > 0)) { + count -= rc; + s += rc; + } +} + + +/*** Useful function for console debugging -- goes straight to Xen. ***/ +asmlinkage int xprintk(const char *fmt, ...) +{ + va_list args; + int printk_len; + static char printk_buf[1024]; + + /* Emit the output into the temporary buffer */ + va_start(args, fmt); + printk_len = vsnprintf(printk_buf, sizeof(printk_buf), fmt, args); + va_end(args); + + /* Send the processed output directly to Xen. */ + kcons_write_dom0(printk_buf, printk_len); + + return 0; +} + static void xen_cpuid(unsigned int *ax, unsigned int *bx, unsigned int *cx, unsigned int *dx) { diff --git a/include/xen/hvc-console.h b/include/xen/hvc-console.h index 21c0ecf..cb7a3c9 100644 --- a/include/xen/hvc-console.h +++ b/include/xen/hvc-console.h @@ -2,5 +2,6 @@ #define XEN_HVC_CONSOLE_H extern struct console xenboot_console; +extern asmlinkage int xprintk(const char *fmt, ...); #endif /* XEN_HVC_CONSOLE_H */ -- 1.5.4.1 linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch: --- NEW FILE linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch --- >From c255dab2cece092ec17e85fc0186ae6ac667afd5 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 4 Mar 2008 17:59:50 +0000 Subject: [PATCH] xen x86_64: Initial x86_64 support for Xen paravirt_ops Signed-off-by: Eduardo Habkost Signed-off-by: Mark McLoughlin --- arch/x86/Kconfig | 3 +- arch/x86/kernel/acpi/boot.c | 4 +- arch/x86/kernel/apic_32.c | 4 +- arch/x86/kernel/apic_64.c | 2 +- arch/x86/kernel/asm-offsets_64.c | 15 + arch/x86/kernel/early_printk.c | 5 +- arch/x86/kernel/efi_64.c | 4 +- arch/x86/kernel/entry_32.S | 83 +----- arch/x86/kernel/entry_64.S | 72 ++++- arch/x86/kernel/genapic_64.c | 12 + arch/x86/kernel/head64.c | 4 + arch/x86/kernel/head_64.S | 23 ++ arch/x86/kernel/hpet.c | 4 +- arch/x86/kernel/io_apic_64.c | 2 +- arch/x86/kernel/irq_64.c | 5 + arch/x86/kernel/mpparse_32.c | 4 +- arch/x86/kernel/mpparse_64.c | 4 +- arch/x86/kernel/paravirt.c | 3 + arch/x86/kernel/process_64.c | 9 + arch/x86/kernel/setup64.c | 5 + arch/x86/kernel/setup_64.c | 41 +++- arch/x86/kernel/smpboot_64.c | 4 +- arch/x86/kernel/vsyscall_64.c | 31 ++- arch/x86/mach-visws/traps.c | 10 +- arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 558 ++++++++++++++++++++++++++++++++-- arch/x86/mm/ioremap.c | 4 +- arch/x86/mm/pgtable_32.c | 25 ++- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/vdso/vdso32-setup.c | 6 +- arch/x86/xen/Kconfig | 1 - arch/x86/xen/Makefile | 6 + arch/x86/xen/enlighten.c | 268 +++++++++++----- arch/x86/xen/entry.S | 5 + arch/x86/xen/entry_32.S | 81 +++++ arch/x86/xen/entry_64.S | 68 ++++ arch/x86/xen/events.c | 13 +- arch/x86/xen/genapic.c | 190 ++++++++++++ arch/x86/xen/init.h | 20 ++ arch/x86/xen/init_32.c | 3 + arch/x86/xen/init_64.c | 181 +++++++++++ arch/x86/xen/mmu.c | 407 ++++++++++++++++++------- arch/x86/xen/mmu.h | 46 ++-- arch/x86/xen/multicalls.c | 9 +- arch/x86/xen/setup.c | 22 ++ arch/x86/xen/smp.c | 16 + arch/x86/xen/xen-asm.S | 219 +++----------- arch/x86/xen/xen-asm_32.S | 184 +++++++++++ arch/x86/xen/xen-asm_64.S | 75 +++++ arch/x86/xen/xen-head.S | 21 +- arch/x86/xen/xen-ops.h | 11 + drivers/acpi/thermal.c | 5 + drivers/char/hvc_xen.c | 6 + drivers/ieee1394/init_ohci1394_dma.c | 2 +- drivers/serial/8250_early.c | 2 +- include/asm-x86/asm-hack.h | 27 ++ include/asm-x86/cmpxchg_64.h | 36 +++ include/asm-x86/desc_defs.h | 4 + include/asm-x86/fixmap_32.h | 22 +- include/asm-x86/fixmap_64.h | 31 ++- include/asm-x86/mmu_context_64.h | 6 +- include/asm-x86/page_64.h | 2 +- include/asm-x86/paravirt.h | 46 ++- include/asm-x86/percpu.h | 32 ++ include/asm-x86/pgalloc_64.h | 69 ++++- include/asm-x86/pgtable.h | 15 +- include/asm-x86/pgtable_64.h | 3 +- include/asm-x86/proto.h | 1 + include/asm-x86/smp_64.h | 3 + include/asm-x86/system.h | 3 +- include/asm-x86/xen/hypercall.h | 205 ++++++++++--- include/asm-x86/xen/hypervisor.h | 3 - include/asm-x86/xen/interface.h | 35 ++- include/linux/dmi.h | 1 + include/linux/elfnote.h | 2 +- include/xen/events.h | 2 + include/xen/interface/elfnote.h | 16 + include/xen/page.h | 34 ++- init/main.c | 10 + mm/slab.c | 8 +- 80 files changed, 2759 insertions(+), 668 deletions(-) create mode 100644 arch/x86/xen/entry.S create mode 100644 arch/x86/xen/entry_32.S create mode 100644 arch/x86/xen/entry_64.S create mode 100644 arch/x86/xen/genapic.c create mode 100644 arch/x86/xen/init.h create mode 100644 arch/x86/xen/init_32.c create mode 100644 arch/x86/xen/init_64.c create mode 100644 arch/x86/xen/xen-asm_32.S create mode 100644 arch/x86/xen/xen-asm_64.S create mode 100644 include/asm-x86/asm-hack.h diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f41c953..6f466aa 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -92,7 +92,7 @@ config ARCH_MAY_HAVE_PC_FDC def_bool y config DMI - def_bool y + def_bool !XEN config RWSEM_GENERIC_SPINLOCK def_bool !X86_XADD @@ -330,6 +330,7 @@ config X86_RDC321X config X86_VSMP bool "Support for ScaleMP vSMP" + depends on !XEN depends on X86_64 && PCI help Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 2cdc9de..cfc79ac 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -141,7 +141,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) offset = phys & (PAGE_SIZE - 1); mapped_size = PAGE_SIZE - offset; - set_fixmap(FIX_ACPI_END, phys); + set_fixmap_ma(FIX_ACPI_END, phys); base = fix_to_virt(FIX_ACPI_END); /* @@ -152,7 +152,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) if (--idx < FIX_ACPI_BEGIN) return NULL; /* cannot handle this */ phys += PAGE_SIZE; - set_fixmap(idx, phys); + set_fixmap_ma(idx, phys); mapped_size += PAGE_SIZE; } diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 35a568e..40fc1b3 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -1138,7 +1138,7 @@ void __init init_apic_mappings(void) } else apic_phys = mp_lapic_addr; - set_fixmap_nocache(FIX_APIC_BASE, apic_phys); + set_fixmap_ma_nocache(FIX_APIC_BASE, apic_phys); printk(KERN_DEBUG "mapped APIC to %08lx (%08lx)\n", APIC_BASE, apic_phys); @@ -1172,7 +1172,7 @@ fake_ioapic_page: alloc_bootmem_pages(PAGE_SIZE); ioapic_phys = __pa(ioapic_phys); } - set_fixmap_nocache(idx, ioapic_phys); + set_fixmap_ma_nocache(idx, ioapic_phys); printk(KERN_DEBUG "mapped IOAPIC to %08lx (%08lx)\n", __fix_to_virt(idx), ioapic_phys); idx++; diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index d8d03e0..a611520 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -877,7 +877,7 @@ void __init init_apic_mappings(void) } else apic_phys = mp_lapic_addr; - set_fixmap_nocache(FIX_APIC_BASE, apic_phys); + set_fixmap_ma_nocache(FIX_APIC_BASE, apic_phys); apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", APIC_BASE, apic_phys); diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index 494e1e0..d0fabfd 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -25,6 +25,8 @@ #define OFFSET(sym, str, mem) \ DEFINE(sym, offsetof(struct str, mem)) +#include + #define __NO_STUBS 1 #undef __SYSCALL #undef _ASM_X86_64_UNISTD_H_ @@ -92,6 +94,13 @@ int main(void) offsetof (struct rt_sigframe32, uc.uc_mcontext)); BLANK(); #endif + +#ifdef CONFIG_XEN + BLANK(); + OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); [...5539 lines suppressed...] -#define ELFNOTE(name, type, desc) \ +#define ELFNOTE(name, type, desc...) \ ELFNOTE_START(name, type, "") \ desc ; \ ELFNOTE_END diff --git a/include/xen/events.h b/include/xen/events.h index 2bde54d..c18d2bf 100644 --- a/include/xen/events.h +++ b/include/xen/events.h @@ -3,6 +3,8 @@ #include +#include +#include #include #include diff --git a/include/xen/interface/elfnote.h b/include/xen/interface/elfnote.h index a64d3df..ee5501d 100644 --- a/include/xen/interface/elfnote.h +++ b/include/xen/interface/elfnote.h @@ -120,6 +120,22 @@ */ #define XEN_ELFNOTE_BSD_SYMTAB 11 +/* + * The lowest address the hypervisor hole can begin at (numeric). + * + * This must not be set higher than HYPERVISOR_VIRT_START. Its presence + * also indicates to the hypervisor that the kernel can deal with the + * hole starting at a higher address. + */ +#define XEN_ELFNOTE_HV_START_LOW 12 + +/* + * List of maddr_t-sized mask/value pairs describing how to recognize + * (non-present) L1 page table entries carrying valid MFNs (numeric). + */ +#define XEN_ELFNOTE_L1_MFN_VALID 13 + + #endif /* __XEN_PUBLIC_ELFNOTE_H__ */ /* diff --git a/include/xen/page.h b/include/xen/page.h index 031ef22..158fb60 100644 --- a/include/xen/page.h +++ b/include/xen/page.h @@ -8,6 +8,10 @@ #include +#include + +#include + #ifdef CONFIG_X86_PAE /* Xen machine address */ typedef struct xmaddr { @@ -70,6 +74,8 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) #endif pfn = 0; + //xprintk("mfn_to_pfn(%lx):\n", mfn); + /* * The array access can fail (e.g., device space beyond end of RAM). * In such cases it doesn't matter what we return (we return garbage), @@ -77,6 +83,7 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) */ __get_user(pfn, &machine_to_phys_mapping[mfn]); + //xprintk("mfn_to_pfn(%lx) = %lx\n", mfn, pfn); return pfn; } @@ -143,34 +150,29 @@ static inline void set_phys_to_machine(unsigned long pfn, unsigned long mfn) static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot) { - pte_t pte; - - pte.pte_high = (page_nr >> (32 - PAGE_SHIFT)) | - (pgprot_val(pgprot) >> 32); - pte.pte_high &= (__supported_pte_mask >> 32); - pte.pte_low = ((page_nr << PAGE_SHIFT) | pgprot_val(pgprot)); - pte.pte_low &= __supported_pte_mask; - - return pte; + pteval_t val; + + val = (page_nr << PAGE_SHIFT) | pgprot_val(pgprot); + val &= __supported_pte_mask; + return native_make_pte(val); } -static inline unsigned long long pte_val_ma(pte_t x) +static inline pteval_t pte_val_ma(pte_t x) { - return x.pte; + return native_pte_val(x); } -#define pmd_val_ma(v) ((v).pmd) -#define pud_val_ma(v) ((v).pgd.pgd) -#define __pte_ma(x) ((pte_t) { .pte = (x) }) +#define __pte_ma(x) (native_make_pte(x)) #define __pmd_ma(x) ((pmd_t) { (x) } ) #else /* !X86_PAE */ -#define pte_mfn(_pte) ((_pte).pte_low >> PAGE_SHIFT) +#define pte_mfn(_pte) ((native_pte_val(_pte) & __PHYSICAL_MASK) >> PAGE_SHIFT) #define mfn_pte(pfn, prot) __pte_ma(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) #define pte_val_ma(x) ((x).pte) -#define pmd_val_ma(v) ((v).pud.pgd.pgd) #define __pte_ma(x) ((pte_t) { (x) } ) #endif /* CONFIG_X86_PAE */ #define pgd_val_ma(x) ((x).pgd) +#define pmd_val_ma(x) (native_pmd_val((x))) +#define pud_val_ma(x) (native_pud_val((x))) xmaddr_t arbitrary_virt_to_machine(unsigned long address); diff --git a/init/main.c b/init/main.c index 80f5aaf..4a84f60 100644 --- a/init/main.c +++ b/init/main.c @@ -590,17 +590,25 @@ asmlinkage void __init start_kernel(void) rcu_init(); init_IRQ(); pidhash_init(); + printk("init_timers:\n"); init_timers(); hrtimers_init(); softirq_init(); + printk("timekeeping:\n"); timekeeping_init(); + printk("time:\n"); time_init(); + printk("profile:\n"); profile_init(); + printk("irqs_disabled:\n"); if (!irqs_disabled()) printk("start_kernel(): bug: interrupts were enabled early\n"); + printk("early_boot_irqs_on:\n"); early_boot_irqs_on(); + printk("local_irq_enable:\n"); local_irq_enable(); + printk("console_init:\n"); /* * HACK ALERT! This is early. We're enabling the console before * we've done PCI setups etc, and console_init() must be aware of @@ -637,7 +645,9 @@ asmlinkage void __init start_kernel(void) numa_policy_init(); if (late_time_init) late_time_init(); + printk("calibrate_delay:\n"); calibrate_delay(); + printk("pidmap_init:\n"); pidmap_init(); pgtable_cache_init(); prio_tree_init(); diff --git a/mm/slab.c b/mm/slab.c index e499669..c18daa3 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3202,6 +3202,8 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags) STATS_INC_ALLOCHIT(cachep); ac->touched = 1; objp = ac->entry[--ac->avail]; + if (!objp) + printk("really weird: avail objp for cache %s is null\n", cachep->name); } else { STATS_INC_ALLOCMISS(cachep); objp = cache_alloc_refill(cachep, flags); @@ -3464,8 +3466,10 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller) unsigned long save_flags; void *objp; - if (should_failslab(cachep, flags)) + if (should_failslab(cachep, flags)) { + printk("cache %s should fail\n", cachep->name); return NULL; + } cache_alloc_debugcheck_before(cachep, flags); local_irq_save(save_flags); @@ -3477,6 +3481,8 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller) if (unlikely((flags & __GFP_ZERO) && objp)) memset(objp, 0, obj_size(cachep)); + if (!objp) + printk("allocation from cache %s failed!!!\n", cachep->name); return objp; } -- 1.5.4.1 Index: config-xen-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-generic,v retrieving revision 1.2.4.3 retrieving revision 1.2.4.4 diff -u -r1.2.4.3 -r1.2.4.4 --- config-xen-generic 5 Mar 2008 14:01:21 -0000 1.2.4.3 +++ config-xen-generic 6 Mar 2008 10:40:29 -0000 1.2.4.4 @@ -1,4 +1,5 @@ CONFIG_XEN=y +CONFIG_XENCTRL=y CONFIG_HVC_XEN=y CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_NETDEV_FRONTEND=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.11.2.14 retrieving revision 1.11.2.15 diff -u -r1.11.2.14 -r1.11.2.15 --- kernel.spec 5 Mar 2008 18:41:17 -0000 1.11.2.14 +++ kernel.spec 6 Mar 2008 10:40:29 -0000 1.11.2.15 @@ -679,9 +679,14 @@ Patch5005: linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch Patch5006: linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch Patch5007: linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch -Patch5008: linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch -Patch5009: linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch -Patch5010: linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch +Patch5008: linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch +Patch5009: linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch +Patch5010: linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch +Patch5011: linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch +Patch5012: linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch +Patch5013: linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch +Patch5014: linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch +Patch5015: linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch # kernel-xen patches end # Xen hypervisor patches (20000+) @@ -1236,10 +1241,15 @@ ApplyPatch linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch ApplyPatch linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch ApplyPatch linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch -ApplyPatch linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch -ApplyPatch linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch +ApplyPatch linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch +ApplyPatch linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch +ApplyPatch linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch +ApplyPatch linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch +ApplyPatch linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch +ApplyPatch linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch +ApplyPatch linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch %ifarch x86_64 -ApplyPatch linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch +ApplyPatch linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch %endif # kernel-xen apply end @@ -1841,6 +1851,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Thu Mar 05 2008 Mark McLoughlin +- Add /proc/xen and /sys/hypervisor + * Wed Mar 05 2008 Mark McLoughlin - Re-base to kernel-2_6_25-0_93_rc4_fc9 --- linux-2.6-xen-0009-xen-dom0-Add-a-vmlinuz-target.patch DELETED --- --- linux-2.6-xen-0010-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch DELETED --- --- linux-2.6-xen-0011-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 10:57:42 2008 From: fedora-extras-commits at redhat.com (Gilboa Davara (gilboa)) Date: Thu, 6 Mar 2008 10:57:42 GMT Subject: rpms/gmrun/F-8 gmrun-gmrunrc.patch,1.1,1.2 gmrun.spec,1.6,1.7 Message-ID: <200803061057.m26Avg1Y029996@cvs-int.fedora.redhat.com> Author: gilboa Update of /cvs/pkgs/rpms/gmrun/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29964 Modified Files: gmrun-gmrunrc.patch gmrun.spec Log Message: gmrun-gmrunrc.patch: Index: gmrun-gmrunrc.patch =================================================================== RCS file: /cvs/pkgs/rpms/gmrun/F-8/gmrun-gmrunrc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gmrun-gmrunrc.patch 15 Feb 2007 10:59:04 -0000 1.1 +++ gmrun-gmrunrc.patch 6 Mar 2008 10:57:37 -0000 1.2 @@ -9,14 +9,14 @@ TermExec = ${Terminal} -e AlwaysInTerm = ssh telnet ftp lynx mc vi vim pine centericq perldoc man -@@ -32,18 +32,13 @@ +@@ -32,18 +32,14 @@ # - %u gets replaced with the whole URL ("http://www.google.com") # - %s gets replaced with "//www.google.com". This is useful for URL-s # like "man:printf" --> %s will get replaced with "printf" -URL_http = mozilla -remote "openURL(%u, new-window)" -URL_mailto = mozilla -remote "mailto(%s)" -+URL_http = htmlview %u -+URL_mailto = htmlview %u ++URL_http = xdg-open %u ++URL_mailto = xdg-email %u +URL_file = xdg-open %s URL_man = ${TermExec} 'man %s' URL_info = ${TermExec} 'info %s' @@ -25,7 +25,7 @@ -URL_readme = ${TermExec} 'less /usr/doc/%s/README' -URL_info = ${TermExec} 'info %s' -URL_sh = sh -c '%s' -+URL_search = htmlview 'http://www.google.co.il/search?q=%s' ++URL_search = xdg-open 'http://www.google.com/search?q=%s' # extension handlers -EXT:doc,rtf = AbiWord %s Index: gmrun.spec =================================================================== RCS file: /cvs/pkgs/rpms/gmrun/F-8/gmrun.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gmrun.spec 17 Jan 2008 17:58:42 -0000 1.6 +++ gmrun.spec 6 Mar 2008 10:57:37 -0000 1.7 @@ -1,6 +1,6 @@ Name: gmrun Version: 0.9.2 -Release: 12%{?dist} +Release: 15%{?dist} Summary: Lightweight "Run program" dialog box with search history and tab completion Group: User Interface/Desktops @@ -57,6 +57,12 @@ %changelog +* Thu Mar 04 2008 Gilboa Davara - 0.9.2-15 +- Reapply Ville's xdg-utils patch. + +* Mon Feb 18 2008 Fedora Release Engineering - 0.9.2-13 +- Autorebuild for GCC 4.3 + * Thu Jan 17 2008 Gilboa Davara - 0.9.2-11 - Replace htmlview with xdg-utils. (#388441, Patch by Ville Skytta) - gcc4.3 compile fix. From fedora-extras-commits at redhat.com Thu Mar 6 11:16:50 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 6 Mar 2008 11:16:50 GMT Subject: rpms/kdelibs/devel kdelibs.spec,1.286,1.287 Message-ID: <200803061116.m26BGoc6005071@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5037/devel Modified Files: kdelibs.spec Log Message: * Thu Mar 06 2008 Kevin Kofler 4.0.2-7 - exclude apidocs from the main package Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.286 retrieving revision 1.287 diff -u -r1.286 -r1.287 --- kdelibs.spec 6 Mar 2008 10:29:15 -0000 1.286 +++ kdelibs.spec 6 Mar 2008 11:16:10 -0000 1.287 @@ -3,7 +3,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.2 -Release: 6%{?dist} +Release: 7%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -287,6 +287,9 @@ %{_kde4_libdir}/kde4/plugins/phonon_platform/ %{_kde4_sysconfdir}/xdg/menus/*.menu %doc %{_mandir}/man*/* +%if "%{?apidocs}" == "1" +%exclude %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ +%endif # kdelibs-common comes from here for fedora >= 9 %if "%{name}" == "kdelibs" %exclude %{_kde4_configdir}/kdebug.areas @@ -325,6 +328,9 @@ %changelog +* Thu Mar 06 2008 Kevin Kofler 4.0.2-7 +- exclude apidocs from the main package + * Thu Mar 06 2008 Than Ngo 4.0.2-6 - apply upstream patch to fix issue in KPropertiesDialog From fedora-extras-commits at redhat.com Thu Mar 6 11:30:35 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 6 Mar 2008 11:30:35 GMT Subject: rpms/kernel-xen-2.6/devel linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch, NONE, 1.1.2.1 Makefile, 1.2.6.6, 1.2.6.7 Makefile.config, 1.2.4.6, 1.2.4.7 kernel.spec, 1.11.2.15, 1.11.2.16 Message-ID: <200803061130.m26BUZfG005471@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5428 Modified Files: Tag: private-markmc-pv-ops-branch Makefile Makefile.config kernel.spec Added Files: Tag: private-markmc-pv-ops-branch linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch Log Message: Fix privcmd build on x86_64 linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch: --- NEW FILE linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch --- >From d00be6cef97823ca14f0c9a3d05a4ecbdda9c6f2 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 6 Mar 2008 11:10:59 +0000 Subject: [PATCH] xen x86_64: Add 64 bit version of privcmd_hypercall() Signed-off-by: Mark McLoughlin --- include/asm-x86/xen/hypercall.h | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index a99725b..77108b4 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h @@ -545,6 +545,7 @@ MULTI_stack_switch(struct multicall_entry *mcl, #include +#ifdef CONFIG_X86_32 static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) { int ret; @@ -570,5 +571,32 @@ static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) return ret; } +#else /* CONFIG_X86_32 */ +static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) +{ + int ret; + long ign1, ign2, ign3; + + if (hypercall->op >= (PAGE_SIZE >> 5)) + return -EINVAL; + + __asm__ __volatile__ ( + "movq %8,%%r10; movq %9,%%r8;" + "shll $5,%%eax ;" + "addq $hypercall_page,%%rax ;" + "call *%%rax" + : "=a" (ret), "=D" (ign1), + "=S" (ign2), "=d" (ign3) + : "0" ((unsigned int)hypercall->op), + "1" (hypercall->arg[0]), + "2" (hypercall->arg[1]), + "3" (hypercall->arg[2]), + "g" (hypercall->arg[3]), + "g" (hypercall->arg[4]) + : "r8", "r10", "memory" ); + + return ret; +} +#endif /* CONFIG_X86_32 */ #endif /* __HYPERCALL_H__ */ -- 1.5.4.1 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.11.2.15 retrieving revision 1.11.2.16 diff -u -r1.11.2.15 -r1.11.2.16 --- kernel.spec 6 Mar 2008 10:40:29 -0000 1.11.2.15 +++ kernel.spec 6 Mar 2008 11:29:54 -0000 1.11.2.16 @@ -687,6 +687,7 @@ Patch5013: linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch Patch5014: linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch Patch5015: linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch +Patch5016: linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch # kernel-xen patches end # Xen hypervisor patches (20000+) @@ -1250,6 +1251,7 @@ ApplyPatch linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch %ifarch x86_64 ApplyPatch linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch +ApplyPatch linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch %endif # kernel-xen apply end From fedora-extras-commits at redhat.com Thu Mar 6 11:35:10 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Thu, 6 Mar 2008 11:35:10 GMT Subject: rpms/sysstat/devel sysstat-8.0.4-nfs_ext.patch, NONE, 1.1 sysstat.spec, 1.62, 1.63 Message-ID: <200803061135.m26BZAuj005652@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/sysstat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5625 Modified Files: sysstat.spec Added Files: sysstat-8.0.4-nfs_ext.patch Log Message: - add nfs extended statistic to iostat command sysstat-8.0.4-nfs_ext.patch: --- NEW FILE sysstat-8.0.4-nfs_ext.patch --- diff -up sysstat-8.0.4/man/iostat.1.pom sysstat-8.0.4/man/iostat.1 --- sysstat-8.0.4/man/iostat.1.pom 2007-11-10 14:41:02.000000000 +0100 +++ sysstat-8.0.4/man/iostat.1 2008-03-06 10:21:45.000000000 +0100 @@ -3,7 +3,7 @@ iostat \- Report Central Processing Unit (CPU) statistics and input/output statistics for devices, partitions and network filesystems (NFS). .SH SYNOPSIS -.B iostat [ -c ] [ -d ] [ -N ] [ -n ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ +.B iostat [ -c ] [ -d ] [ -N ] [ -n ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ .I device .B [ ... ] | ALL ] [ -p [ .I device @@ -409,6 +409,19 @@ NFS READ request. .RS Indicate the number of megabytes written to the server by the NFS client via an NFS WRITE request. + +.RE +.B rops/s +.RS +Indicate the number of read operations that were issued to the mount point +per second + +.RE +.B wops/s +.RS +Indicate the number of write operations that were issued to the mount point +per second + .RE .RE .SH OPTIONS @@ -429,6 +442,8 @@ Useful for viewing LVM2 statistics. .IP -n Display the network filesystem (NFS) report. This option works only with kernel 2.6.17 and later. +.IP -h +Display the NFS report more human readable. .IP "-p [ { device | ALL } ]" The -p option is exclusive of the -x option and displays statistics for block devices and all their partitions that are used by the system. diff -up sysstat-8.0.4/iostat.c.pom sysstat-8.0.4/iostat.c --- sysstat-8.0.4/iostat.c.pom 2008-01-01 10:26:31.000000000 +0100 +++ sysstat-8.0.4/iostat.c 2008-03-06 12:13:01.000000000 +0100 @@ -73,7 +73,7 @@ void usage(char *progname) { fprintf(stderr, _("Usage: %s [ options... ] [ [ ] ]\n" "Options are:\n" - "[ -c ] [ -d ] [ -N ] [ -n ] [ -k | -m ] [ -t ] [ -V ] [ -x ]\n" + "[ -c ] [ -d ] [ -N ] [ -n ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ -x ]\n" "[ [ ... ] | ALL ] [ -p [ | ALL ] ]\n"), progname); exit(1); @@ -843,10 +843,11 @@ void read_ppartitions_stat(int curr, int void read_nfs_stat(int curr, int flags) { FILE *fp; - int i, sw = 0; + int sw = 0; char line[8192]; + char *xprt_line; char nfs_name[MAX_NAME_LEN]; - char mount[10], on[10], bytes[10], aux[32]; + char mount[10], on[10], prefix[10], aux[32]; struct io_nfs_stats snfs; /* Every I/O NFS entry is potentially unregistered */ @@ -869,15 +870,45 @@ void read_nfs_stat(int curr, int flags) } } - sscanf(line, "%10s", bytes); - if (sw && (!strncmp(bytes, "bytes:", 6))) { + sscanf(line, "%10s", prefix); + if (sw && (!strncmp(prefix, "bytes:", 6))) { /* Read the stats for the last NFS-mounted directory */ - i = sscanf(strstr(line, "bytes:") + 6, "%llu %llu %llu %llu %llu %llu", + sscanf(strstr(line, "bytes:") + 6, "%llu %llu %llu %llu %llu %llu", &snfs.rd_normal_bytes, &snfs.wr_normal_bytes, &snfs.rd_direct_bytes, &snfs.wr_direct_bytes, &snfs.rd_server_bytes, &snfs.wr_server_bytes); - save_stats(nfs_name, curr, &snfs, ionfs_nr, st_hdr_ionfs); - sw = 0; + sw = 2; + } + + if ((sw==2) && (!strncmp(prefix,"xprt:", 5))) { + /* Read extended statistic for the last NFS-mounted directory + - number of sent rpc requests*/ + xprt_line=(strstr(line,"xprt:")+6); + /* upc, tcp or rdma data */ + + if (!strncmp(xprt_line,"udp",3)) { + /* port, bind_count, sends, recvs, bad_xids, req_u, bklog_u */ + sscanf(strstr(xprt_line,"udp")+4, "%*u %*u %lu %lu %*u %*u %*u", + &snfs.rpc_sends, &snfs.rpc_recvs); + } + + if (!strncmp(xprt_line,"tcp",3)) { + /* port, bind_counter, connect_count, connect_time, idle_time, + sends, recvs, bad_xids, req_u, bklog_u*/ + sscanf(strstr(xprt_line,"tcp")+4, "%*u %*u %*u %*u %*d %lu %lu %*u %*u %*u", + &snfs.rpc_sends, &snfs.rpc_recvs); + } + + if (!strncmp(xprt_line,"rdma",4)) { + /* 0(port), bind_count, connect_count, connect_time, idle_time + sends, recvs, bad_xids, req_u, bklog_u + ... */ + sscanf(strstr(xprt_line,"rdma")+5,"%*u %*u %*u %*u %*d %lu %lu %*u %*u %*u " + "%*u %*u %*u %*u %*u %*u %*u %*u %*u %*u\n", + &snfs.rpc_sends, &snfs.rpc_recvs); + } + save_stats(nfs_name, curr, &snfs, ionfs_nr, st_hdr_ionfs); + sw = 0; } } @@ -957,15 +988,15 @@ void write_nfs_stat_header(int flags, in { printf("Filesystem: "); if (DISPLAY_KILOBYTES(flags)) { - printf(" rkB_nor/s wkB_nor/s rkB_dir/s wkB_dir/s rkB_svr/s wkB_svr/s\n"); + printf(" rkB_nor/s wkB_nor/s rkB_dir/s wkB_dir/s rkB_svr/s wkB_svr/s rops/s wops/s\n"); *fctr = 1024; } else if (DISPLAY_MEGABYTES(flags)) { - printf(" rMB_nor/s wMB_nor/s rMB_dir/s wMB_dir/s rMB_svr/s wMB_svr/s\n"); + printf(" rMB_nor/s wMB_nor/s rMB_dir/s wMB_dir/s rMB_svr/s wMB_svr/s rops/s wops/s\n"); *fctr = 1024 * 1024; } else { - printf(" rBlk_nor/s wBlk_nor/s rBlk_dir/s wBlk_dir/s rBlk_svr/s wBlk_svr/s\n"); + printf(" rBlk_nor/s wBlk_nor/s rBlk_dir/s wBlk_dir/s rBlk_svr/s wBlk_svr/s rops/s wops/s\n"); *fctr = 512; } } @@ -1084,14 +1115,19 @@ void write_nfs_stat(int curr, unsigned l struct io_hdr_stats *shi, struct io_nfs_stats *ioni, struct io_nfs_stats *ionj) { - printf("%-22s %12.2f %12.2f %12.2f %12.2f %12.2f %12.2f\n", - shi->name, - S_VALUE(ionj->rd_normal_bytes, ioni->rd_normal_bytes, itv) / fctr, + if (DISPLAY_HUMAN_READABLE(flags)) + printf("%-22s \n%23s", shi-> name,""); + else + printf("%-22s ", shi->name); + printf("%12.2f %12.2f %12.2f %12.2f %12.2f %12.2f %9.2f %9.2f \n", + S_VALUE(ionj->rd_normal_bytes, ioni->rd_normal_bytes, itv) / fctr, S_VALUE(ionj->wr_normal_bytes, ioni->wr_normal_bytes, itv) / fctr, S_VALUE(ionj->rd_direct_bytes, ioni->rd_direct_bytes, itv) / fctr, S_VALUE(ionj->wr_direct_bytes, ioni->wr_direct_bytes, itv) / fctr, S_VALUE(ionj->rd_server_bytes, ioni->rd_server_bytes, itv) / fctr, - S_VALUE(ionj->wr_server_bytes, ioni->wr_server_bytes, itv) / fctr); + S_VALUE(ionj->wr_server_bytes, ioni->wr_server_bytes, itv) / fctr, + S_VALUE(ionj->rpc_sends, ioni->rpc_sends, itv), + S_VALUE(ionj->rpc_recvs, ioni->rpc_recvs, itv)); } @@ -1353,6 +1389,11 @@ int main(int argc, char **argv) flags |= I_D_DISK; /* Display disk utilization */ break; + case 'h': + /* Display NFS stats human readable*/ + flags |= I_D_HUMAN_READABLE; + break; + case 'k': if (DISPLAY_MEGABYTES(flags)) usage(argv[0]); diff -up sysstat-8.0.4/iostat.h.pom sysstat-8.0.4/iostat.h --- sysstat-8.0.4/iostat.h.pom 2008-01-01 10:26:31.000000000 +0100 +++ sysstat-8.0.4/iostat.h 2008-03-06 11:04:05.000000000 +0100 @@ -27,6 +27,7 @@ #define I_F_HAS_NFS 0x08000 #define I_D_DEVMAP_NAME 0x10000 #define I_D_ISO 0x20000 +#define I_D_HUMAN_READABLE 0x40000 #define DISPLAY_CPU(m) (((m) & I_D_CPU) == I_D_CPU) #define DISPLAY_DISK(m) (((m) & I_D_DISK) == I_D_DISK) @@ -46,6 +47,7 @@ #define HAS_NFS(m) (((m) & I_F_HAS_NFS) == I_F_HAS_NFS) #define DISPLAY_DEVMAP_NAME(m) (((m) & I_D_DEVMAP_NAME) == I_D_DEVMAP_NAME) #define DISPLAY_ISO(m) (((m) & I_D_ISO) == I_D_ISO) +#define DISPLAY_HUMAN_READABLE(m) (((m) & I_D_HUMAN_READABLE) == I_D_HUMAN_READABLE) #define DT_DEVICE 0 #define DT_PARTITION 1 @@ -120,6 +122,9 @@ struct io_nfs_stats { unsigned long long wr_direct_bytes __attribute__ ((packed)); unsigned long long rd_server_bytes __attribute__ ((packed)); unsigned long long wr_server_bytes __attribute__ ((packed)); + unsigned long rpc_sends __attribute__ ((packed)); + unsigned long rpc_recvs __attribute__ ((packed)); + }; #define IO_NFS_STATS_SIZE (sizeof(struct io_nfs_stats)) Index: sysstat.spec =================================================================== RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sysstat.spec 28 Feb 2008 09:41:12 -0000 1.62 +++ sysstat.spec 6 Mar 2008 11:34:34 -0000 1.63 @@ -1,12 +1,13 @@ Name: sysstat Version: 8.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The sar and iostat system monitoring commands License: GPLv2+ Group: Applications/System URL: http://perso.orange.fr/sebastien.godard/ Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2 Patch0: sysstat-8.0.4-write.patch +Patch1: sysstat-8.0.4-nfs_ext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,6 +24,7 @@ %prep %setup -q %patch -p1 -b .ret +%patch1 -p1 -b .nfse iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux mv CREDITS.aux CREDITS @@ -74,6 +76,9 @@ %{_localstatedir}/log/sa %changelog +* Thu Mar 6 2008 Ivana Varekova - 8.0.4-3 +- add nfs extended statistic to iostat command + * Thu Feb 28 2008 Ivana Varekova - 8.0.4-2 - retry write functuon in sadc command - thanks Tomas Mraz From fedora-extras-commits at redhat.com Thu Mar 6 11:36:35 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 6 Mar 2008 11:36:35 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.x-kio.patch, 1.1, 1.2 kdelibs.spec, 1.287, 1.288 Message-ID: <200803061136.m26BaZ97005745@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5712 Modified Files: kdelibs-4.0.x-kio.patch kdelibs.spec Log Message: fix kdelibs-4.0.x-kio.patch kdelibs-4.0.x-kio.patch: Index: kdelibs-4.0.x-kio.patch =================================================================== RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs-4.0.x-kio.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdelibs-4.0.x-kio.patch 6 Mar 2008 10:29:15 -0000 1.1 +++ kdelibs-4.0.x-kio.patch 6 Mar 2008 11:36:25 -0000 1.2 @@ -1,21 +1,19 @@ -Index: kio/kfile/kopenwithdialog.cpp -=================================================================== ---- kio/kfile/kopenwithdialog.cpp (Revision 782244) -+++ kio/kfile/kopenwithdialog.cpp (Revision 782245) -@@ -870,7 +870,7 @@ - KConfigGroup cg = desktopFile.desktopGroup(); - cg.writeEntry("Type", "Application"); - cg.writeEntry("Name", initialServiceName); -- cg.writePathEntry("Exec", fullExec); -+ cg.writeEntry("Exec", fullExec); - cg.writeEntry("NoDisplay", true); // don't make it appear in the K menu - if (terminal->isChecked()) { - cg.writeEntry("Terminal", true); -Index: kio/kfile/kpropertiesdialog.cpp -=================================================================== ---- kio/kfile/kpropertiesdialog.cpp (Revision 782244) -+++ kio/kfile/kpropertiesdialog.cpp (Revision 782245) -@@ -3015,7 +3015,7 @@ +diff -up kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp.kio kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp +--- kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp.kio 2008-01-05 01:00:16.000000000 +0100 ++++ kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp 2008-03-06 12:34:08.000000000 +0100 +@@ -879,7 +879,7 @@ void KOpenWithDialogPrivate::_k_slotOK() + KConfigGroup cg = desktop->desktopGroup(); + cg.writeEntry("Type", "Application"); + cg.writeEntry("Name", initialServiceName); +- cg.writePathEntry("Exec", fullExec); ++ cg.writeEntry("Exec", fullExec); + if (terminal->isChecked()) + { + cg.writeEntry("Terminal", true); +diff -up kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp.kio kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp +--- kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp.kio 2008-01-31 00:54:05.000000000 +0100 ++++ kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp 2008-03-06 12:31:52.000000000 +0100 +@@ -3015,7 +3015,7 @@ KDesktopPropsPlugin::KDesktopPropsPlugin QString nameStr = _config.readName(); QString genNameStr = _config.readGenericName(); QString commentStr = _config.readComment(); @@ -24,7 +22,7 @@ if (commandStr.startsWith(QLatin1String("ksystraycmd "))) { commandStr.remove(0, 12); -@@ -3176,9 +3176,9 @@ +@@ -3176,9 +3176,9 @@ void KDesktopPropsPlugin::applyChanges() config.writeEntry( "GenericName", d->w->genNameEdit->text(), KConfigGroup::Persistent|KConfigGroup::Localized ); // for compat if (d->m_systrayBool) Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- kdelibs.spec 6 Mar 2008 11:16:10 -0000 1.287 +++ kdelibs.spec 6 Mar 2008 11:36:25 -0000 1.288 @@ -176,7 +176,7 @@ %patch8 -p1 -b .all-css # upstream patches -%patch100 -p0 -b .kio +%patch100 -p1 -b .kio %build From fedora-extras-commits at redhat.com Thu Mar 6 12:21:42 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Thu, 6 Mar 2008 12:21:42 GMT Subject: rpms/coreutils/devel coreutils-selinux.patch, 1.41, 1.42 coreutils.spec, 1.197, 1.198 Message-ID: <200803061221.m26CLgjo013504@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13481 Modified Files: coreutils-selinux.patch coreutils.spec Log Message: fixed broken order of params in stat(#435669) coreutils-selinux.patch: Index: coreutils-selinux.patch =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- coreutils-selinux.patch 18 Feb 2008 14:37:04 -0000 1.41 +++ coreutils-selinux.patch 6 Mar 2008 12:21:32 -0000 1.42 @@ -1099,7 +1099,7 @@ /* stat the file and print what we find */ static bool -do_stat (char const *filename, bool terse, char const *format) -+do_stat (char const *filename, bool secure , bool terse, char const *format) ++do_stat (char const *filename, bool terse, bool secure, char const *format) { struct stat statbuf; Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- coreutils.spec 4 Mar 2008 12:04:31 -0000 1.197 +++ coreutils.spec 6 Mar 2008 12:21:32 -0000 1.198 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.10 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -293,6 +293,9 @@ /sbin/runuser %changelog +* Thu Mar 6 2008 Ondrej Vasik - 6.10-11 +- fixed broken order of params in stat(#435669) + * Tue Mar 4 2008 Ondrej Vasik - 6.10-10 - colorls.csh missing doublequotes (#435789) - fixed possibility to localize verbose outputs From fedora-extras-commits at redhat.com Thu Mar 6 12:38:35 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 6 Mar 2008 12:38:35 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.2-plasma-konsole.patch, NONE, 1.1 kdebase-workspace.spec, 1.44, 1.45 Message-ID: <200803061238.m26CcZnS013860@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13802 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.2-plasma-konsole.patch Log Message: add konsole in desktop menu kdebase-workspace-4.0.2-plasma-konsole.patch: --- NEW FILE kdebase-workspace-4.0.2-plasma-konsole.patch --- diff -up kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.h.orig kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.h --- kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.h.orig 2008-03-04 16:18:19.000000000 +0100 +++ kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.h 2008-03-04 16:18:58.000000000 +0100 @@ -83,6 +83,7 @@ public: const QRect& contentsRect); protected Q_SLOTS: + void runKonsole(); void runCommand(); void configure(); void applyConfig(); @@ -100,6 +101,7 @@ private: QAction *m_lockDesktopAction; QAction *m_appletBrowserAction; + QAction *m_runKonsoleAction; QAction *m_runCommandAction; QAction *m_setupDesktopAction; QAction *m_lockScreenAction; diff -up kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp.orig kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp --- kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp.orig 2008-03-04 15:45:16.000000000 +0100 +++ kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp 2008-03-06 13:29:54.000000000 +0100 @@ -37,6 +37,7 @@ #include #include #include +#include #include "plasma/corona.h" #include "plasma/appletbrowser.h" @@ -59,6 +60,7 @@ DefaultDesktop::DefaultDesktop(QObject * : Containment(parent, args), m_lockDesktopAction(0), m_appletBrowserAction(0), + m_runKonsoleAction(0), m_runCommandAction(0), m_lockScreenAction(0), m_logoutAction(0), @@ -307,6 +309,13 @@ void DefaultDesktop::runCommand() } } +void DefaultDesktop::runKonsole() +{ + KProcess proc; + proc << KStandardDirs::locate("exe", "konsole"); + proc.execute(); +} + void DefaultDesktop::lockScreen() { if (!KAuthorized::authorizeKAction("lock_screen")) { @@ -332,6 +341,10 @@ QList DefaultDesktop::contextA connect(m_appletBrowserAction, SIGNAL(triggered(bool)), this, SIGNAL(showAddWidgets())); m_appletBrowserAction->setIcon(KIcon("list-add")); + m_runKonsoleAction = new QAction(i18n("Konsole"), this); + connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole())); + m_runKonsoleAction->setIcon(KIcon("terminal")); + m_runCommandAction = new QAction(i18n("Run Command..."), this); connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand())); m_runCommandAction->setIcon(KIcon("system-run")); @@ -362,6 +375,8 @@ QList DefaultDesktop::contextA QList actions; + actions.append(m_runKonsoleAction); + if (KAuthorized::authorizeKAction("run_command")) { actions.append(m_runCommandAction); } Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- kdebase-workspace.spec 6 Mar 2008 09:26:01 -0000 1.44 +++ kdebase-workspace.spec 6 Mar 2008 12:38:02 -0000 1.45 @@ -16,6 +16,7 @@ Patch1: kdebase-workspace-4.0.1-redhat-startkde.patch Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch Patch3: kdebase-workspace-4.0.2-Gestures.patch +Patch4: kdebase-workspace-4.0.2-plasma-konsole.patch # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu) # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886 @@ -109,6 +110,9 @@ # ConsoleKit support for KDM (#228111, kde#147790) %patch2 -p1 -b .consolekit %patch3 -p1 -b .gestures +%patch4 -p1 -b .plase-konsole + +# upstream patches %patch100 -p1 -b .kde#155362 %patch101 -p1 -b .kcontrol-crash @@ -225,6 +229,7 @@ %changelog * Tue Mar 04 2008 Than Ngo 4.0.2-4 - disable gestures as default +- add konsole in desktop menu * Mon Mar 03 2008 Than Ngo 4.0.2-3 - apply upstream patch to fix crash in khotkeys From fedora-extras-commits at redhat.com Thu Mar 6 12:38:44 2008 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 6 Mar 2008 12:38:44 GMT Subject: rpms/python-simpy/devel python-simpy.spec,1.17,1.18 Message-ID: <200803061238.m26Ccixh013865@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13798 Modified Files: python-simpy.spec Log Message: Fix Source0 URL to downloads.sourceforge.net Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- python-simpy.spec 20 Feb 2008 13:19:04 -0000 1.17 +++ python-simpy.spec 6 Mar 2008 12:38:01 -0000 1.18 @@ -3,12 +3,12 @@ Name: python-simpy Version: 1.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPLv2+ URL: http://simpy.sourceforge.net -Source0: http://dl.sf.net/simpy/SimPy-%{version}.0.tar.gz +Source0: http://downloads.sourceforge.net/simpy/SimPy-%{version}.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel, python-setuptools-devel @@ -70,6 +70,9 @@ %changelog +* Thu Mar 6 2008 Sarantis Paskalis - 1.9-3 +- Fix Source0 URL to downloads.sourceforge.net + * Wed Feb 20 2008 Sarantis Paskalis - 1.9-2 - Upgrade to 1.9 - Drop executable permissions for all files From fedora-extras-commits at redhat.com Thu Mar 6 12:41:26 2008 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 6 Mar 2008 12:41:26 GMT Subject: rpms/python-simpy/F-7 python-simpy.spec,1.15,1.16 Message-ID: <200803061241.m26CfQwc014056@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13982 Modified Files: python-simpy.spec Log Message: Fix Source0 URL to downloads.sourceforge.net Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/F-7/python-simpy.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- python-simpy.spec 20 Feb 2008 13:43:21 -0000 1.15 +++ python-simpy.spec 6 Mar 2008 12:40:52 -0000 1.16 @@ -3,12 +3,12 @@ Name: python-simpy Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPLv2+ URL: http://simpy.sourceforge.net -Source0: http://dl.sf.net/simpy/SimPy-%{version}.0.tar.gz +Source0: http://downloads.sourceforge.net/simpy/SimPy-%{version}.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -74,6 +74,9 @@ %changelog +* Thu Mar 6 2008 Sarantis Paskalis - 1.9-2 +- Fix Source0 URL to downloads.sourceforge.net + * Wed Feb 20 2008 Sarantis Paskalis - 1.9-1 - Upgrade to 1.9 - Drop executable permissions for all files From fedora-extras-commits at redhat.com Thu Mar 6 12:41:26 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Thu, 6 Mar 2008 12:41:26 GMT Subject: rpms/tvtime/devel tvtime-1.0.1-fsbadval.patch, NONE, 1.1 tvtime.spec, 1.30, 1.31 Message-ID: <200803061241.m26CfQPi014059@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/tvtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13986 Modified Files: tvtime.spec Added Files: tvtime-1.0.1-fsbadval.patch Log Message: * Thu Mar 06 2008 Tomas Smetana 1.0.1-8 - fix #235622 - X error when toggling fullscreen tvtime-1.0.1-fsbadval.patch: --- NEW FILE tvtime-1.0.1-fsbadval.patch --- diff -up tvtime-1.0.1/src/xfullscreen.c.fsbadval tvtime-1.0.1/src/xfullscreen.c --- tvtime-1.0.1/src/xfullscreen.c.fsbadval 2008-03-06 13:31:10.000000000 +0100 +++ tvtime-1.0.1/src/xfullscreen.c 2008-03-06 13:31:47.000000000 +0100 @@ -263,6 +263,10 @@ void xfullscreen_get_position( xfullscre int max_area = -1; int i; + *x = xf->heads[ 0 ].x; + *y = xf->heads[ 0 ].y; + *w = xf->heads[ 0 ].w; + *h = xf->heads[ 0 ].h; for( i = 0; i < xf->nheads; i++ ) { int head_x1 = xf->heads[ i ].x; int head_x2 = xf->heads[ i ].x + xf->heads[ i ].w - 1; Index: tvtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/tvtime/devel/tvtime.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- tvtime.spec 12 Feb 2008 15:03:36 -0000 1.30 +++ tvtime.spec 6 Mar 2008 12:40:50 -0000 1.31 @@ -1,7 +1,7 @@ Summary: A high quality TV viewer Name: tvtime Version: 1.0.1 -Release: 7 +Release: 8 License: GPLv2+ and LGPLv2+ Group: Applications/Multimedia URL: http://tvtime.sourceforge.net @@ -9,6 +9,7 @@ Patch0: tvtime-0.9.13-pie.patch Patch1: tvtime-1.0.1-gcc4.1.patch Patch2: tvtime-1.0.1-header.patch +Patch3: tvtime-1.0.1-fsbadval.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +47,7 @@ %setup -q %patch1 -p1 -b .gcc %patch2 -p1 -b .header +%patch3 -p1 -b .fsbadval for i in docs/man/de/*.?; do iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" @@ -100,6 +102,9 @@ %{_bindir}/tvtime %changelog +* Thu Mar 06 2008 Tomas Smetana 1.0.1-8 +- fix #235622 - X error when toggling fullscreen + * Tue Feb 12 2008 Tomas Smetana 1.0.1-7 - fix license tag and summary - rebuild (gcc-4.3) From fedora-extras-commits at redhat.com Thu Mar 6 12:41:34 2008 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 6 Mar 2008 12:41:34 GMT Subject: rpms/python-simpy/F-8 python-simpy.spec,1.15,1.16 Message-ID: <200803061241.m26CfYwx014064@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13967 Modified Files: python-simpy.spec Log Message: Fix Source0 URL to downloads.sourceforge.net Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/F-8/python-simpy.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- python-simpy.spec 20 Feb 2008 13:39:04 -0000 1.15 +++ python-simpy.spec 6 Mar 2008 12:40:55 -0000 1.16 @@ -3,12 +3,12 @@ Name: python-simpy Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPLv2+ URL: http://simpy.sourceforge.net -Source0: http://dl.sf.net/simpy/SimPy-%{version}.0.tar.gz +Source0: http://downloads.sourceforge.net/simpy/SimPy-%{version}.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -74,6 +74,9 @@ %changelog +* Thu Mar 6 2008 Sarantis Paskalis - 1.9-2 +- Fix Source0 URL to downloads.sourceforge.net + * Wed Feb 20 2008 Sarantis Paskalis - 1.9-1 - Upgrade to 1.9 - Drop executable permissions for all files From fedora-extras-commits at redhat.com Thu Mar 6 12:46:35 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Thu, 6 Mar 2008 12:46:35 GMT Subject: rpms/coreutils/F-8 coreutils.spec,1.184,1.185 Message-ID: <200803061246.m26CkZ53014182@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14154 Modified Files: coreutils.spec Log Message: rebuild because of missing 6.9-14.fc8 ppc64 rpm Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils.spec,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- coreutils.spec 4 Mar 2008 12:54:13 -0000 1.184 +++ coreutils.spec 6 Mar 2008 12:46:01 -0000 1.185 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.9 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -293,6 +293,9 @@ /sbin/runuser %changelog +* Thu Mar 6 2008 Ondrej Vasik - 6.9-15 +- rebuild / unspotted 6.9-14 build failure on ppc64 + * Tue Mar 4 2008 Ondrej Vasik - 6.9-14 - fixed missing doublequotes in colorls.csh (#435789) - su-l/runuser-l pam file usage a bit documented(#368721) From fedora-extras-commits at redhat.com Thu Mar 6 13:02:26 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Thu, 6 Mar 2008 13:02:26 GMT Subject: rpms/tvtime/F-8 tvtime-1.0.1-fsbadval.patch, NONE, 1.1 tvtime.spec, 1.29, 1.30 Message-ID: <200803061302.m26D2QiX021518@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/tvtime/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21489 Modified Files: tvtime.spec Added Files: tvtime-1.0.1-fsbadval.patch Log Message: * Thu Mar 06 2008 Tomas Smetana 1.0.1-7 - fix #235622 - X error when toggling fullscreen tvtime-1.0.1-fsbadval.patch: --- NEW FILE tvtime-1.0.1-fsbadval.patch --- diff -up tvtime-1.0.1/src/xfullscreen.c.fsbadval tvtime-1.0.1/src/xfullscreen.c --- tvtime-1.0.1/src/xfullscreen.c.fsbadval 2008-03-06 13:31:10.000000000 +0100 +++ tvtime-1.0.1/src/xfullscreen.c 2008-03-06 13:31:47.000000000 +0100 @@ -263,6 +263,10 @@ void xfullscreen_get_position( xfullscre int max_area = -1; int i; + *x = xf->heads[ 0 ].x; + *y = xf->heads[ 0 ].y; + *w = xf->heads[ 0 ].w; + *h = xf->heads[ 0 ].h; for( i = 0; i < xf->nheads; i++ ) { int head_x1 = xf->heads[ i ].x; int head_x2 = xf->heads[ i ].x + xf->heads[ i ].w - 1; Index: tvtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/tvtime/F-8/tvtime.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- tvtime.spec 13 Jul 2006 10:01:54 -0000 1.29 +++ tvtime.spec 6 Mar 2008 13:01:52 -0000 1.30 @@ -1,7 +1,7 @@ Summary: A high quality TV viewer. Name: tvtime Version: 1.0.1 -Release: 6 +Release: 7 License: GPL Group: Applications/Multimedia URL: http://tvtime.sourceforge.net @@ -9,6 +9,7 @@ Patch0: tvtime-0.9.13-pie.patch Patch1: tvtime-1.0.1-gcc4.1.patch Patch2: tvtime-1.0.1-header.patch +Patch3: tvtime-1.0.1-fsbadval.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +47,7 @@ %setup -q %patch1 -p1 -b .gcc %patch2 -p1 -b .header +%patch3 -p1 -b .fsbadval for i in docs/man/de/*.?; do iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" @@ -100,6 +102,9 @@ %{_bindir}/tvtime %changelog +* Thu Mar 06 2008 Tomas Smetana 1.0.1-7 +- fix #235622 - X error when toggling fullscreen + * Thu Jul 13 2006 Than Ngo 1.0.1-6 - fix build problem From fedora-extras-commits at redhat.com Thu Mar 6 13:04:20 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Thu, 6 Mar 2008 13:04:20 GMT Subject: rpms/tvtime/devel tvtime.spec,1.31,1.32 Message-ID: <200803061304.m26D4KMA021550@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/tvtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21530 Modified Files: tvtime.spec Log Message: add dist tag Index: tvtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/tvtime/devel/tvtime.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- tvtime.spec 6 Mar 2008 12:40:50 -0000 1.31 +++ tvtime.spec 6 Mar 2008 13:03:47 -0000 1.32 @@ -1,7 +1,7 @@ Summary: A high quality TV viewer Name: tvtime Version: 1.0.1 -Release: 8 +Release: 8%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/Multimedia URL: http://tvtime.sourceforge.net From fedora-extras-commits at redhat.com Thu Mar 6 13:06:20 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Thu, 6 Mar 2008 13:06:20 GMT Subject: rpms/tvtime/F-8 tvtime.spec,1.30,1.31 Message-ID: <200803061306.m26D6Kmn021620@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/tvtime/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21572 Modified Files: tvtime.spec Log Message: add dist tag; fix license Index: tvtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/tvtime/F-8/tvtime.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- tvtime.spec 6 Mar 2008 13:01:52 -0000 1.30 +++ tvtime.spec 6 Mar 2008 13:05:39 -0000 1.31 @@ -1,8 +1,8 @@ Summary: A high quality TV viewer. Name: tvtime Version: 1.0.1 -Release: 7 -License: GPL +Release: 7%{?dist} +License: GPLv2+ and LGPLv2+ Group: Applications/Multimedia URL: http://tvtime.sourceforge.net Source: http://prdownloads.sourceforge.net/tvtime/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 13:06:31 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Thu, 6 Mar 2008 13:06:31 GMT Subject: rpms/authd/devel authd.spec,1.46,1.47 Message-ID: <200803061306.m26D6Vf1021627@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/authd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21579 Modified Files: authd.spec Log Message: corrected Source0 Index: authd.spec =================================================================== RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- authd.spec 5 Mar 2008 16:00:04 -0000 1.46 +++ authd.spec 6 Mar 2008 13:05:45 -0000 1.47 @@ -1,14 +1,14 @@ Summary: A RFC 1413 ident protocol daemon Name: authd Version: 1.4.3 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://fedorahosted.org/authd/ Obsoletes: pidentd <= 3.2 Provides: pidentd = 3.2 Requires(post): openssl -Source0: https://fedorahosted.org/authd/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz +Source0: https://fedorahosted.org/authd/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz?format=raw #Source0: %{name}-%{version}.tar.gz Patch0: authd-1.4.3-gcc4.patch Patch1: authd-1.4.3-disable.patch @@ -74,6 +74,10 @@ %{_sbindir}/in.authd %changelog +* Thu Mar 6 2008 Roman Rakus - 1.4.3-17 +- corrected Source0 +- corrected link in URL + * Wed Mar 5 2008 Roman Rakus - 1.4.3-16 - fixed Source0 From fedora-extras-commits at redhat.com Thu Mar 6 13:18:59 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Thu, 6 Mar 2008 13:18:59 GMT Subject: rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.5-sleep.patch, NONE, 1.1 nspluginwrapper.spec, 1.43, 1.44 Message-ID: <200803061318.m26DIxBL021877@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/nspluginwrapper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21827 Modified Files: nspluginwrapper.spec Added Files: nspluginwrapper-0.9.91.5-sleep.patch Log Message: * Thu Mar 06 2008 Martin Stransky 0.9.91.5-24 - added experimental patch for #426968 - nspluginwrapper wakes up too much nspluginwrapper-0.9.91.5-sleep.patch: --- NEW FILE nspluginwrapper-0.9.91.5-sleep.patch --- diff -up nspluginwrapper-0.9.91.5/src/npw-viewer.c.old nspluginwrapper-0.9.91.5/src/npw-viewer.c --- nspluginwrapper-0.9.91.5/src/npw-viewer.c.old 2008-03-06 13:51:03.000000000 +0100 +++ nspluginwrapper-0.9.91.5/src/npw-viewer.c 2008-03-06 14:00:05.000000000 +0100 @@ -3039,14 +3039,14 @@ static GPollFD xt_event_poll_fd; static gboolean xt_event_prepare(GSource *source, gint *timeout) { int mask = XtAppPending(x_app_context); - return mask & XtIMXEvent; + return mask; } static gboolean xt_event_check(GSource *source) { if (xt_event_poll_fd.revents & G_IO_IN) { int mask = XtAppPending(x_app_context); - if (mask & XtIMXEvent) + if (mask) return TRUE; } return FALSE; @@ -3057,9 +3057,9 @@ static gboolean xt_event_dispatch(GSourc int i; for (i = 0; i < 5; i++) { int mask = XtAppPending(x_app_context); - if ((mask & XtIMXEvent) == 0) + if ((mask) == 0) break; - XtAppProcessEvent(x_app_context, XtIMXEvent); + XtAppProcessEvent(x_app_context, XtIMAll); } return TRUE; } @@ -3073,17 +3073,6 @@ static GSourceFuncs xt_event_funcs = { (GSourceDummyMarshal)NULL }; -static gboolean xt_event_polling_timer_callback(gpointer user_data) -{ - int i; - for (i = 0; i < 5; i++) { - if ((XtAppPending(x_app_context) & (XtIMAll & ~XtIMXEvent)) == 0) - break; - XtAppProcessEvent(x_app_context, XtIMAll & ~XtIMXEvent); - } - return TRUE; -} - // RPC events static GPollFD rpc_event_poll_fd; @@ -3208,10 +3197,6 @@ static int do_main(int argc, char **argv xt_event_poll_fd.revents = 0; g_source_add_poll(xt_source, &xt_event_poll_fd); - gint xt_polling_timer_id = g_timeout_add(25, - xt_event_polling_timer_callback, - NULL); - // Initialize RPC events listener GSource *rpc_source = g_source_new(&rpc_event_funcs, sizeof(GSource)); if (rpc_source == NULL) { @@ -3232,7 +3217,6 @@ static int do_main(int argc, char **argv gtk_main(); D(bug("--- EXIT ---\n")); - g_source_remove(xt_polling_timer_id); g_source_destroy(rpc_source); g_source_destroy(xt_source); Index: nspluginwrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- nspluginwrapper.spec 26 Feb 2008 12:01:02 -0000 1.43 +++ nspluginwrapper.spec 6 Mar 2008 13:18:07 -0000 1.44 @@ -70,7 +70,7 @@ Summary: A compatibility layer for Netscape 4 plugins Name: nspluginwrapper Version: 0.9.91.5 -Release: 23%{?dist} +Release: 24%{?dist} Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2 Source1: %{plugin_config_name}.tar.gz Source2: plugin-config.sh.in @@ -83,6 +83,7 @@ Patch6: nspluginwrapper-0.9.91.5-xulrunner.patch Patch7: nspluginwrapper-0.9.91.5-npviewer-gthread.patch Patch8: nspluginwrapper-0.9.91.5-shutdown.patch +Patch9: nspluginwrapper-0.9.91.5-sleep.patch Patch10: plugin-config-setuid.patch License: GPL Group: Networking/WWW @@ -115,6 +116,7 @@ %patch6 -p1 -b .xl %patch7 -p1 -b .thread %patch8 -p1 -b .shutdown +%patch9 -p1 -b .sleep pushd %plugin_config_name %patch10 -p2 @@ -237,6 +239,9 @@ %{_sysconfdir}/sysconfig/%{name} %changelog +* Thu Mar 06 2008 Martin Stransky 0.9.91.5-24 +- added experimental patch for #426968 - nspluginwrapper wakes up too much + * Tue Feb 26 2008 Martin Stransky 0.9.91.5-23 - merged exclude patch with main tarball - fixed #431095 - Typo in mozilla-plugin-config verbose output From fedora-extras-commits at redhat.com Thu Mar 6 13:19:23 2008 From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung)) Date: Thu, 6 Mar 2008 13:19:23 GMT Subject: rpms/bsh/devel bsh-desktop.desktop,NONE,1.1 bsh.spec,1.15,1.16 Message-ID: <200803061319.m26DJNlZ021904@cvs-int.fedora.redhat.com> Author: pcheung Update of /cvs/pkgs/rpms/bsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21856 Modified Files: bsh.spec Added Files: bsh-desktop.desktop Log Message: Fix bugzilla 417491. Thanks Ville Skytta for the patch. Add menu entry and startup script for bsh desktop. Ensure scriptlets exit with zero exit status. --- NEW FILE bsh-desktop.desktop --- [Desktop Entry] Name=BeanShell Desktop Exec=bsh-desktop Icon=bsh Terminal=false Type=Application StartupWMClass=bsh-Console Categories=Development;Java; Version=1.0 Index: bsh.spec =================================================================== RCS file: /cvs/pkgs/rpms/bsh/devel/bsh.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- bsh.spec 19 Feb 2008 17:45:19 -0000 1.15 +++ bsh.spec 6 Mar 2008 13:18:43 -0000 1.16 @@ -32,7 +32,7 @@ Name: bsh Version: 1.3.0 -Release: 12jpp.1%{?dist} +Release: 12jpp.2%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java License: LGPL @@ -42,10 +42,11 @@ #tar cjf bsh-1.3.0-src.tar.bz2 BeanShell Source1: bsh-1.3.0.pom Source2: bsh-bsf-1.3.0.pom +Source3: %{name}-desktop.desktop Patch0: %{name}-build.patch #Patch1: %{name}-readline.patch -BuildRequires: ant, bsf, ant-trax +BuildRequires: ant, bsf, ant-trax, ImageMagick, desktop-file-utils BuildRequires: servlet Requires: bsf Requires: jpackage-utils >= 0:1.7.2 @@ -173,6 +174,12 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +# menu entry +desktop-file-install --vendor=fedora --mode=644 \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3} +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps +convert src/bsh/util/lib/icon.gif \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/bsh.png # demo for i in `find tests -name \*.bsh`; do @@ -205,10 +212,11 @@ # scripts install -d $RPM_BUILD_ROOT%{_bindir} -cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF +function bsh_script() { +cat > $RPM_BUILD_ROOT%{_bindir}/$1 << EOF #!/bin/sh # -# %{name} script +# $1 script # JPackage Project (http://jpackage.sourceforge.net) # Source functions library @@ -225,7 +233,7 @@ fi # Configuration -MAIN_CLASS=bsh.Interpreter +MAIN_CLASS=$2 if [ -n "\$BSH_DEBUG" ]; then BASE_FLAGS=-Ddebug=true fi @@ -247,6 +255,10 @@ # Let's start run "\$@" EOF +} + +bsh_script bsh bsh.Interpreter +bsh_script bsh-desktop bsh.Console cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF #!/usr/bin/env %{_bindir}/%{name} @@ -263,6 +275,10 @@ rm -rf $RPM_BUILD_ROOT %post +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi %update_maven_depmap %if %{gcj_support} if [ -x %{_bindir}/rebuild-gcj-db ] @@ -270,8 +286,13 @@ %{_bindir}/rebuild-gcj-db fi %endif +exit 0 %postun +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi %update_maven_depmap %if %{gcj_support} if [ -x %{_bindir}/rebuild-gcj-db ] @@ -279,14 +300,18 @@ %{_bindir}/rebuild-gcj-db fi %endif +exit 0 %files %defattr(-,root,root) %doc src/Changes.html src/License.txt src/README.txt %attr(0755,root,root) %{_bindir}/%{name} +%attr(0755,root,root) %{_bindir}/%{name}-desktop %attr(0755,root,root) %{_bindir}/%{name}doc %{_javadir}/* %dir %{_datadir}/%{name} +%{_datadir}/applications/*%{name}-desktop.desktop +%{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_datadir}/%{name}/webapps %{_datadir}/maven2/poms/* %{_mavendepmapfragdir} @@ -310,6 +335,11 @@ %{_datadir}/%{name}/* %changelog +* Thu Mar 06 2008 Permaine Cheung 0:1.3.0-12jpp.2 +- Fix bugzilla 417491. Thanks Ville Skytta for the patch. +- Add menu entry and startup script for bsh desktop. +- Ensure scriptlets exit with zero exit status. + * Tue Feb 19 2008 Fedora Release Engineering - 0:1.3.0-12jpp.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 13:19:43 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Thu, 6 Mar 2008 13:19:43 GMT Subject: rpms/tvtime/F-7 tvtime-1.0.1-fsbadval.patch, NONE, 1.1 tvtime.spec, 1.29, 1.30 Message-ID: <200803061319.m26DJh8M021946@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/tvtime/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21883 Modified Files: tvtime.spec Added Files: tvtime-1.0.1-fsbadval.patch Log Message: * Thu Mar 06 2008 Tomas Smetana 1.0.1-7 - fix #235622 - X error when toggling fullscreen tvtime-1.0.1-fsbadval.patch: --- NEW FILE tvtime-1.0.1-fsbadval.patch --- diff -up tvtime-1.0.1/src/xfullscreen.c.fsbadval tvtime-1.0.1/src/xfullscreen.c --- tvtime-1.0.1/src/xfullscreen.c.fsbadval 2008-03-06 13:31:10.000000000 +0100 +++ tvtime-1.0.1/src/xfullscreen.c 2008-03-06 13:31:47.000000000 +0100 @@ -263,6 +263,10 @@ void xfullscreen_get_position( xfullscre int max_area = -1; int i; + *x = xf->heads[ 0 ].x; + *y = xf->heads[ 0 ].y; + *w = xf->heads[ 0 ].w; + *h = xf->heads[ 0 ].h; for( i = 0; i < xf->nheads; i++ ) { int head_x1 = xf->heads[ i ].x; int head_x2 = xf->heads[ i ].x + xf->heads[ i ].w - 1; Index: tvtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/tvtime/F-7/tvtime.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- tvtime.spec 13 Jul 2006 10:01:54 -0000 1.29 +++ tvtime.spec 6 Mar 2008 13:19:09 -0000 1.30 @@ -1,7 +1,7 @@ Summary: A high quality TV viewer. Name: tvtime Version: 1.0.1 -Release: 6 +Release: 7%{?dist} License: GPL Group: Applications/Multimedia URL: http://tvtime.sourceforge.net @@ -9,6 +9,7 @@ Patch0: tvtime-0.9.13-pie.patch Patch1: tvtime-1.0.1-gcc4.1.patch Patch2: tvtime-1.0.1-header.patch +Patch3: tvtime-1.0.1-fsbadval.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +47,7 @@ %setup -q %patch1 -p1 -b .gcc %patch2 -p1 -b .header +%patch3 -p1 -b .fsbadval for i in docs/man/de/*.?; do iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" @@ -100,6 +102,9 @@ %{_bindir}/tvtime %changelog +* Thu Mar 06 2008 Tomas Smetana 1.0.1-7 +- fix #235622 - X error when toggling fullscreen + * Thu Jul 13 2006 Than Ngo 1.0.1-6 - fix build problem From fedora-extras-commits at redhat.com Thu Mar 6 14:00:12 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 6 Mar 2008 14:00:12 GMT Subject: rpms/kernel-xen-2.6/devel/scripts bumpspecfile.py, 1.1, 1.2 configcommon.pl, 1.1, 1.2 configdiff.pl, 1.1, 1.2 cross-amd64.sh, 1.1, 1.2 cross-i586.sh, 1.1, 1.2 cross-i686.sh, 1.1, 1.2 cross-ia64.sh, 1.1, 1.2 cross-iseries.sh, 1.1, 1.2 cross-ppc.sh, 1.1, 1.2 cross-ppc64.sh, 1.1, 1.2 cross-ppc8260.sh, 1.1, 1.2 cross-ppc8560.sh, 1.1, 1.2 cross-pseries.sh, 1.1, 1.2 cross-s390.sh, 1.1, 1.2 cross-s390x.sh, 1.1, 1.2 newpatch.sh, 1.1, 1.2 pull-upstreams.sh, 1.1, 1.2 rebase-xen-hv.sh, 1.1, 1.2 rebase-xen-kernel.sh, 1.1, 1.2 rebase.sh, 1.1, 1.2 reconfig.sh, 1.1, 1.2 rediffall.pl, 1.1, 1.2 Message-ID: <200803061400.m26E0ChH023295@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22915/scripts Added Files: bumpspecfile.py configcommon.pl configdiff.pl cross-amd64.sh cross-i586.sh cross-i686.sh cross-ia64.sh cross-iseries.sh cross-ppc.sh cross-ppc64.sh cross-ppc8260.sh cross-ppc8560.sh cross-pseries.sh cross-s390.sh cross-s390x.sh newpatch.sh pull-upstreams.sh rebase-xen-hv.sh rebase-xen-kernel.sh rebase.sh reconfig.sh rediffall.pl Log Message: * Wed Mar 05 2008 Mark McLoughlin - Reset to pv_ops xen DomU from kernel-2_6_25-0_93_rc4_fc9 - Revert the execshield patch for now - Include xen pv fb and kbd drivers - Add support for auto-probing frontend drivers - Add module aliases for xennet and xenblk - Add /proc/xen and /sys/hypervisor - Add first round of x86_64 xen pv_ops patches Index: bumpspecfile.py =================================================================== RCS file: bumpspecfile.py diff -N bumpspecfile.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ bumpspecfile.py 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,40 @@ +#!/usr/bin/python +# +# Needs $GIT_COMMITTER_NAME and $GIT_COMMITTER_EMAIL set. +# +import re +import sys +import time +import os +import string + +class Specfile: + def __init__(self,filename): + file=open(filename,"r") + self.lines=file.readlines() + + def addChangelogEntry(self,entry): + user = os.environ.get("GIT_COMMITTER_NAME","unknown") + email = os.environ.get("GIT_COMMITTER_EMAIL","unknown") + if (email == "unknown"): + email = os.environ.get("USER","unknown")+"@fedoraproject.org" + changematch=re.compile(r"^%changelog") + date=time.strftime("%a %b %d %Y", time.localtime(time.time())) + newchangelogentry="%changelog\n* "+date+" "+user+" <"+email+">"+"\n"+entry+"\n\n" + for i in range(len(self.lines)): + if(changematch.match(self.lines[i])): + self.lines[i]=newchangelogentry + break + + def writeFile(self,filename): + file=open(filename,"w") + file.writelines(self.lines) + file.close() + +if __name__=="__main__": + aspec=(sys.argv[1]) + s=Specfile(aspec) + entry=(sys.argv[2]) + s.addChangelogEntry(entry) + s.writeFile(aspec) + Index: configcommon.pl =================================================================== RCS file: configcommon.pl diff -N configcommon.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ configcommon.pl 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,82 @@ +#! /usr/bin/perl + +my @args=@ARGV; +my @configoptions; +my @configvalues; +my @common; +my $configcounter = 0; + +# first, read the 1st file + +open (FILE,"$args[0]") || die "Could not open $args[0]"; +while () { + my $str = $_; + if (/\# ([\w]+) is not set/) { + $configoptions[$configcounter] = $1; + $configvalues[$configcounter] = $str; + $common[$configcounter] = 1; + $configcounter ++; + } else { + if (/([\w]+)=/) { + $configoptions[$configcounter] = $1; + $configvalues[$configcounter] = $str; + $common[$configcounter] = 1; + $configcounter ++; + } else { + $configoptions[$configcounter] = "foobarbar"; + $configvalues[$configcounter] = $str; + $common[$configcounter] = 1; + $configcounter ++; + } + } +}; + +# now, read all configfiles and see of the options match the initial one. +# if not, mark it not common +my $cntr=1; + + +while ($cntr < @ARGV) { + open (FILE,$args[$cntr]) || die "Could not open $args[$cntr]"; + while () { + my $nooutput; + my $counter; + my $configname; + + if (/\# ([\w]+) is not set/) { + $configname = $1; + } else { + if (/([\w]+)=/) { + $configname = $1; + } + } + + $counter = 0; + $nooutput = 0; + while ($counter < $configcounter) { + if ("$configname" eq "$configoptions[$counter]") { + if ("$_" eq "$configvalues[$counter]") { + 1; + } else { + $common[$counter] = 0; + } + } + $counter++; + } + } + + $cntr++; +} + +# now print the common values +my $counter = 0; + +while ($counter < $configcounter) { + if ($common[$counter]!=0) { + print "$configvalues[$counter]"; + } + $counter++; +} + +1; + Index: configdiff.pl =================================================================== RCS file: configdiff.pl diff -N configdiff.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ configdiff.pl 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,76 @@ +#! /usr/bin/perl + +my @args=@ARGV; +my @configoptions; +my @configvalues; +my @alreadyprinted; +my $configcounter = 0; + +# first, read the override file + +open (FILE,"$args[0]") || die "Could not open $args[0]"; +while () { + my $str = $_; + if (/\# ([\w]+) is not set/) { + $configoptions[$configcounter] = $1; + $configvalues[$configcounter] = $str; + $alreadprinted[$configcounter] = 0; + $configcounter ++; + } else { + if (/([\w]+)=/) { + $configoptions[$configcounter] = $1; + $configvalues[$configcounter] = $str; + $alreadprinted[$configcounter] = 0; + $configcounter ++; + } else { + $configoptions[$configcounter] = "$_"; + $configvalues[$configcounter] = $str; + $alreadprinted[$configcounter] = 0; + $configcounter ++; + } + } +}; + +# now, read and output the entire configfile, except for the overridden +# parts... for those the new value is printed. +# O(N^2) algorithm so if this is slow I need to look at it later + +open (FILE2,"$args[1]") || die "Could not open $args[1]"; +while () { + my $nooutput; + my $counter; + my $configname="$_"; + my $match; + + if (/\# ([\w]+) is not set/) { + $configname = $1; + } else { + if (/([\w]+)=/) { + $configname = $1; + } + } + + $counter = 0; + $nooutput = 0; + $match = 0; +# print "C : $configname"; + while ($counter < $configcounter) { + if ("$configname" eq "$configoptions[$counter]") { + if ( ("$_" eq "$configvalues[$counter]") || ("$configname" eq "") ) { + $match = 1; + } else { + $alreadyprinted[$configcounter] = 1; + print "$_"; + $match = 1; + } + } + $counter++; + } + if ($match == 0) { + print "$_"; + } + +} + + +1; Index: cross-amd64.sh =================================================================== RCS file: cross-amd64.sh diff -N cross-amd64.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-amd64.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,3 @@ +export PATH=$PATH:/opt/cross/bin +make CROSS_COMPILE=x86_64-linux- ARCH=x86_64 hammer + Index: cross-i586.sh =================================================================== RCS file: cross-i586.sh diff -N cross-i586.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-i586.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,3 @@ +export PATH=$PATH:/opt/cross/bin +make ARCH=i386 i586 + Index: cross-i686.sh =================================================================== RCS file: cross-i686.sh diff -N cross-i686.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-i686.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,3 @@ +export PATH=$PATH:/opt/cross/bin +make ARCH=i386 i686 + Index: cross-ia64.sh =================================================================== RCS file: cross-ia64.sh diff -N cross-ia64.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-ia64.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,2 @@ +export PATH=$PATH:/opt/cross/bin +make CROSS_COMPILE=ia64-linux- ARCH=ia64 ia64 Index: cross-iseries.sh =================================================================== RCS file: cross-iseries.sh diff -N cross-iseries.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-iseries.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,3 @@ +export PATH=$PATH:/opt/cross/bin +make CROSS_COMPILE=ppc64-linux- ARCH=ppc64 ppc64iseries + Index: cross-ppc.sh =================================================================== RCS file: cross-ppc.sh diff -N cross-ppc.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-ppc.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,3 @@ +export PATH=$PATH:/opt/cross/bin +make CROSS_COMPILE=ppc-linux- ARCH=ppc ppc + Index: cross-ppc64.sh =================================================================== RCS file: cross-ppc64.sh diff -N cross-ppc64.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-ppc64.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,3 @@ +export PATH=$PATH:/opt/cross/bin +make CROSS_COMPILE=ppc64-linux- ARCH=ppc64 ppc64 + Index: cross-ppc8260.sh =================================================================== RCS file: cross-ppc8260.sh diff -N cross-ppc8260.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-ppc8260.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,3 @@ +export PATH=$PATH:/opt/cross/bin +make CROSS_COMPILE=ppc-linux- ARCH=ppc ppc8260 + Index: cross-ppc8560.sh =================================================================== RCS file: cross-ppc8560.sh diff -N cross-ppc8560.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-ppc8560.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,3 @@ +export PATH=$PATH:/opt/cross/bin +make CROSS_COMPILE=ppc-linux- ARCH=ppc ppc8560 + Index: cross-pseries.sh =================================================================== RCS file: cross-pseries.sh diff -N cross-pseries.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-pseries.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,3 @@ +export PATH=$PATH:/opt/cross/bin +make CROSS_COMPILE=ppc64-linux- ARCH=ppc64 pseries64 + Index: cross-s390.sh =================================================================== RCS file: cross-s390.sh diff -N cross-s390.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-s390.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,2 @@ +export PATH=$PATH:/opt/cross/bin +make CROSS_COMPILE=s390-linux- ARCH=s390 s390 Index: cross-s390x.sh =================================================================== RCS file: cross-s390x.sh diff -N cross-s390x.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cross-s390x.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,2 @@ +export PATH=$PATH:/opt/cross/bin +make CROSS_COMPILE=s390x-linux- ARCH=s390 s390x Index: newpatch.sh =================================================================== RCS file: newpatch.sh diff -N newpatch.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ newpatch.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,21 @@ +#!/bin/sh +# Easy application of new patches. +# Always adds to the very end. (Bumps last patch nr by 100) +# Parameters: +# $1 - patch filename +# $2 - description + +OLD=$(grep ^Patch kernel.spec | tail -n1 | awk '{ print $1 }' | sed s/Patch// | sed s/://) +NEW=$(($OLD/100*100+100)) + +sed -i "/^Patch$OLD:\ /a#\ $2\nPatch$NEW:\ $1" kernel.spec + +LAST=$(grep ^ApplyPatch kernel.spec | tail -n1 | awk '{ print $2 }') + +sed -i "/^ApplyPatch $LAST/aApplyPatch $1" kernel.spec + +cvs add $1 + +scripts/bumpspecfile.py kernel.spec "- $2" +make clog + Index: pull-upstreams.sh =================================================================== RCS file: pull-upstreams.sh diff -N pull-upstreams.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pull-upstreams.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,10 @@ +#!/bin/bash + +url=http://people.redhat.com/roland/utrace/2.6-current + +wget -q -O /dev/stdout $url/series | grep 'patch$' | +while read i +do + rm -f linux-2.6-$i + wget -nv -O linux-2.6-$i $url/$i +done Index: rebase-xen-hv.sh =================================================================== RCS file: rebase-xen-hv.sh diff -N rebase-xen-hv.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rebase-xen-hv.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,18 @@ +#!/bin/bash + +# it only rebases de hypervisor now + +set -x + +pushd xen || exit 1 +make clean +popd + +CSET=`hg tip | grep "changeset:" | cut -f2 -d':' | sed 's/ //g'` +tar cvf xen-$CSET.tar xen || exit 1 +rm -f xen-$CSET.tar.bz2 +bzip2 -v9 xen-$CSET.tar || exit 1 + +set +x + +ls -l xen-$CSET.tar.bz2 Index: rebase-xen-kernel.sh =================================================================== RCS file: rebase-xen-kernel.sh diff -N rebase-xen-kernel.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rebase-xen-kernel.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,29 @@ +#!/bin/bash + +# you are supposed to have both linux-2.6 "upstream tree" +# and linux-2.6-xen-fedora mercurial updated against that tree + +# it needs linux-2.6 linux-2.6-xen and linux-2.6-xen-fedora on the current directory +# with the right changesets on them. + +set -x + +# remove previous patch if it exist +rm -f linux-2.6-xen.patch + +for repo in linux-2.6 linux-2.6-xen-fedora xen-3.0.3-testing linux-2.6-xen-3.0.3 ; do + if [ ! -d $repo/ ]; then + echo "$repo directory don't exist"; + exit 1 + else + echo " * $repo `cd $repo; (hg tip | grep 'changeset:')`" >> linux-2.6-xen.patch + fi +done + +/usr/bin/diff -urNp --exclude=".hg*" --exclude="*.orig" --exclude="*~" \ + /scratch/src/linux-2.6.18/ linux-2.6-xen-fedora/ >> linux-2.6-xen.patch + + +set +x + +ls -lh linux-2.6-xen.patch Index: rebase.sh =================================================================== RCS file: rebase.sh diff -N rebase.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rebase.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,167 @@ +#!/bin/bash + +# Current kernel bits +if [ `grep -c ^patch upstream` -ge 1 ]; then + export OLD=`grep ^patch upstream | tail -n1 | sed s/patch-// | sed s/\.bz2//` +else + export OLD=`grep linux-2.6 upstream | tail -n1 | sed s/linux-// | sed s/\.tar\.bz2//` +fi +export OLDBASE=`echo $OLD | sed s/-/\ /g | sed s/2\.6\.// | awk '{ print $1 }'` +if [ `echo $OLD | grep -c rc` -ge 1 ]; then + export OLDRC=`echo $OLD | sed s/-/\ /g | sed s/rc// | awk '{ print $2 }'` + if [ `echo $OLD | grep -c git` -ge 1 ]; then + export OLDGIT=`echo $OLD | sed s/-/\ /g | sed s/git// | awk '{ print $3 }'` + else + export OLDGIT=0 + fi +else + export OLDRC=0 + if [ `echo $OLD | grep -c git` -ge 1 ]; then + export OLDGIT=`echo $OLD | sed s/-/\ /g | sed s/git// | awk '{ print $2 }'` + else + export OLDGIT=0 + fi +fi + +# Is there a new snapshot or prepatch ? +NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "snapshot for the stable"` +if [ -z "$NEW" ] ; then + NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "prepatch for the stable"` + if [ -z "$NEW" ] ; then + if [ "$OLDRC" -ne 0 ] ; then + NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "stable version of the Linux kernel is"` + else + echo "No new rc or git snapshot of stable branch". + exit + fi + fi +fi +export N=`echo $NEW | awk '{ print $11 }'` +if [ -z "$N" ]; then + # "Stable version" + export NEW=`echo $NEW | awk '{ print $10 }'` +else + export NEW=`echo $NEW | awk '{ print $11 }'` +fi + +export NEWBASE=`echo $NEW | sed s/-/\ /g | sed s/2\.6\.// | awk '{ print $1 }'` +if [ `echo $NEW | grep -c rc` -ge 1 ]; then + export NEWRC=`echo $NEW | sed s/-/\ /g | sed s/rc// | awk '{ print $2 }'` + if [ `echo $NEW | grep -c git` -ge 1 ]; then + export NEWGIT=`echo $NEW | sed s/-/\ /g | sed s/git// | awk '{ print $3 }'` + else + export NEWGIT=0 + fi +else + export NEWRC=0 + if [ `echo $NEW | grep -c git` -ge 1 ]; then + export NEWGIT=`echo $NEW | sed s/-/\ /g | sed s/git// | awk '{ print $2 }'` + else + export NEWGIT=0 + fi +fi + +echo "OLD kernel was $OLD BASE=$OLDBASE RC=$OLDRC GIT=$OLDGIT" +echo "NEW kernel is $NEW BASE=$NEWBASE RC=$NEWRC GIT=$NEWGIT" + +if [ "$OLDRC" -eq 0 -a "$OLDGIT" -eq 0 -a "$OLDGIT" -ne "$NEWGIT" ]; then + echo "Rebasing from a stable release to a new git snapshot" + perl -p -i -e 's/^%define\ released_kernel\ 1/\%define\ released_kernel\ 0/' kernel.spec + # force these to zero in this case, they may not have been when we rebased to stable + perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel.spec + perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec +fi + +if [ "$NEWRC" -eq 0 -a "$NEWGIT" -eq 0 ]; then + echo "Rebasing from -rc to final release." + perl -p -i -e 's/^%define\ released_kernel\ 0/\%define\ released_kernel\ 1/' kernel.spec + export TARBALL_BASE=$(($OLDBASE-1)) + perl -p -i -e 's/^%define\ base_sublevel\ $ENV{TARBALL_BASE}/%define\ base_sublevel\ $ENV{NEWBASE}/' kernel.spec + perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel.spec + perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec + + grep -v kernel-2.6.$TARBALL_BASE .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore + echo kernel-2.6.$NEWBASE >> .cvsignore + + for i in upstream sources .cvsignore + do + grep -v linux-2.6.$(($OLDBASE-1)).tar.bz2 $i > .$i.tmp; mv .$i.tmp $i + grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 $i > .$i.tmp; mv .$i.tmp $i + grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 $i > .$i.tmp; mv .$i.tmp $i + done + + echo linux-2.6.$TARBALL_BASE.tar.bz2 >> upstream + + rm -f linux-2.6.$(($OLDBASE-1)).tar.bz2 + rm -f linux-2.6.$(($OLDBASE-1)).tar.bz2.sign + rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2 + rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign + rm -f patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 + rm -f patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2.sign + + cvs remove linux-2.6.$(($OLDBASE-1)).tar.bz2.sign + cvs remove patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign + cvs remove patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2.sign + + make download + make upload FILES=linux-$NEW.tar.bz2 + + cvs add linux-$NEW.tar.bz2.sign + + bumpspecfile.py kernel.spec "- $NEW" + make clog + echo FIXME! Fix up fedora_cvs_origin + make verrel + exit +fi + +if [ "$OLDRC" != "$NEWRC" ]; then + echo "Different rc. Rebasing from $OLDRC to $NEWRC" + perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ $ENV{"NEWRC"}/' kernel.spec + perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' .cvsignore + perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' upstream + grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 sources > .sources.tmp; mv .sources.tmp sources + if [ `grep -c patch-2.6.$NEWBASE-rc$NEWRC.bz2 upstream` -eq 0 ]; then + echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> .cvsignore + echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> upstream + fi + rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2 + rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign + cvs remove patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign +fi + +if [ "$OLDGIT" != "$NEWGIT" ]; then + if [ "$OLDRC" -eq 0 -a "$OLDGIT" -eq 0 ]; then + echo "Rebasing to pre-rc git$NEWGIT" + else + echo "Different git. Rebasing from git$OLDGIT to git$NEWGIT" + fi + perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ $ENV{"NEWGIT"}/' kernel.spec + if [ "$OLDGIT" -ne 0 ]; then + if [ "$NEWGIT" -ne 0 ]; then + perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' .cvsignore + perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' upstream + fi + grep -v patch-$OLD.bz2 sources > .sources.tmp; mv .sources.tmp sources + grep -v patch-$OLD.bz2 upstream > .upstream.tmp; mv .upstream.tmp upstream + else + echo patch-$NEW.bz2 >> .cvsignore + echo patch-$NEW.bz2 >> upstream + fi + + make download + make upload FILES=patch-$NEW.bz2 + + cvs add patch-$NEW.bz2.sign + if [ "$OLDGIT" -ne 0 ]; then + rm -f patch-$OLD.bz2 + fi + rm -f patch-$OLD.bz2.sign + cvs remove patch-$OLD.bz2.sign +fi + +if [ "$OLDRC" != "$NEWRC" -o "$OLDGIT" != "$NEWGIT" ]; then + bumpspecfile.py kernel.spec "- $NEW" + make clog +fi + Index: reconfig.sh =================================================================== RCS file: reconfig.sh diff -N reconfig.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ reconfig.sh 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,26 @@ +#!/bin/bash + +base_sublevel=$(grep "^%define base_sublevel" kernel.spec | head -n1 | awk '{ print $3 }') + +if [ `grep -c "^%define released_kernel 1" kernel.spec` -ge 1 ]; then + V=$base_sublevel +else + let V=$base_sublevel+1 +fi + +cd kernel-2.6.$base_sublevel/linux-2.6.$base_sublevel.noarch/ +rm -f kernel-*.config +cp ../../kernel-2.6.$V-*.config . + +for i in kernel-*.config +do + echo $i + rm -f .config + cp $i .config + Arch=`head -1 .config | cut -b 3-` + make ARCH=$Arch nonint_oldconfig > /dev/null || exit 1 + echo "# $Arch" > configs/$i + cat .config >> configs/$i + echo +done + Index: rediffall.pl =================================================================== RCS file: rediffall.pl diff -N rediffall.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rediffall.pl 6 Mar 2008 13:59:34 -0000 1.2 @@ -0,0 +1,64 @@ +#!/usr/bin/perl -w +# +# Script to rediff all patches in the spec +# Usage: perl -w rediffall.pl < kernel-2.4.spec +# +# $workdir is where the new rediff'ed patches are created +# $origdir is where the original patches and tarball are located +# +# Note that both $workdir and $origdir must be absolute path names. +# Suggestion: create a /kernel symbolic link to the top of your CVS tree. + +my $workdir = "/dev/shm/redifftree"; +my $origdir = "/home/davej/devel"; +my $kernver = "linux-2.6.17"; +my $datestrip = "s/^\\(\\(+++\\|---\\) [^[:blank:]]\\+\\)[[:blank:]].*/\\1/"; +my $patchindex = 0; +my @patchlist; + +# phase 1: create a tree +print "Extracting pristine source..\n"; +system("mkdir -p $workdir"); +system("rm -rf $workdir/*"); +chdir("$workdir"); +system("tar -jxvf $origdir/$kernver.tar.bz2 > /dev/null"); +system("cp -al $kernver linux-$patchindex"); + +# phase 2: read the spec from stdin and store all patches +print "Reading specfile..\n"; + +while (<>) { + my $line = $_; + if ($line =~ /^Patch([0-9]+)\: ([a-zA-Z0-9\-\_\.\+]+\.patch)/) { + $patchlist[$1] = $2; + } else { + if ($line =~ /^Patch([0-9]+)\: ([a-zA-Z0-9\-\_\.]+\.bz2)/) { + $patchlist[$1] = $2; + } + } + + if ($line =~ /^%patch([0-9]+) -p1/) { + # copy the tree, apply the patch, diff and remove the old tree + my $oldindex = $patchindex; + $patchindex = $1; + + print "rediffing patch number $patchindex: $patchlist[$patchindex]\n"; + + system("cp -al linux-$oldindex linux-$patchindex"); + chdir("linux-$patchindex"); + if ($patchlist[$patchindex] =~ /bz2/) { + system("bzcat $origdir/$patchlist[$patchindex] | patch -p1 &>/dev/null"); + } else { + system("cat $origdir/$patchlist[$patchindex] | patch -p1 &>/dev/null"); + } + chdir("$workdir"); + system("rm -f `find -name \"*orig\"`"); + if ($patchlist[$patchindex] =~ /bz2/) { + } else { + system("diff -urNp --exclude-from=/home/davej/.exclude linux-$oldindex linux-$patchindex | sed '$datestrip' > $patchlist[$patchindex]"); + } + system("rm -rf linux-$oldindex"); + } +}; + +1; From fedora-extras-commits at redhat.com Thu Mar 6 14:01:16 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Thu, 6 Mar 2008 14:01:16 GMT Subject: rpms/kernel-xen-2.6/devel .gitignore, 1.1, 1.2 gen-patches, 1.1, 1.2 linux-2.6-acpi-eeepc-hotkey.patch, 1.1, 1.2 linux-2.6-at76.patch, 1.1, 1.2 linux-2.6-blkcipher-depend-on-chainiv.patch, 1.1, 1.2 linux-2.6-compile-fix-gcc-43.patch, 1.1, 1.2 linux-2.6-compile-fixes.patch, 1.3, 1.4 linux-2.6-debug-acpi-os-write-port.patch, 1.1, 1.2 linux-2.6-default-mmf_dump_elf_headers.patch, 1.1, 1.2 linux-2.6-drm-add-i915-radeon-mdt.patch, 1.1, 1.2 linux-2.6-drm-git-i915-remove-priv-access.patch, 1.1, 1.2 linux-2.6-drm-git-mm-revert-nopfn.patch, 1.1, 1.2 linux-2.6-drm-git-mm.patch, 1.1, 1.2 linux-2.6-e1000-corrupt-eeprom-checksum.patch, 1.1, 1.2 linux-2.6-e1000-ich9.patch, 1.1, 1.2 linux-2.6-ext4-stable-queue.patch, 1.1, 1.2 linux-2.6-firewire-git-pending.patch, 1.1, 1.2 linux-2.6-firewire-git-update.patch, 1.1, 1.2 linux-2.6-hotfixes.patch, 1.1, 1.2 linux-2.6-ia32-syscall-restart.patch, 1.1, 1.2 linux-2.6-lirc.patch, 1.1, 1.2 linux-2.6-netdev-atl2.patch, 1.1, 1.2 linux-2.6-netdev-e1000-disable-alpm.patch, 1.1, 1.2 linux-2.6-ppc-rtc.patch, 1.1, 1.2 linux-2.6-ppc-use-libgcc.patch, 1.1, 1.2 linux-2.6-ps3-legacy-bootloader-hack.patch, 1.1, 1.2 linux-2.6-ps3-storage-alias.patch, 1.1, 1.2 linux-2.6-scsi-mpt-vmware-fix.patch, 1.1, 1.2 linux-2.6-smarter-relatime.patch, 1.1, 1.2 linux-2.6-usb-ehci-hcd-respect-nousb.patch, 1.1, 1.2 linux-2.6-utrace-ptrace-compat-avr32.patch, 1.1, 1.2 linux-2.6-utrace-regset-avr32.patch, 1.1, 1.2 linux-2.6-utrace-tracehook-avr32.patch, 1.1, 1.2 linux-2.6-uvcvideo.patch, 1.1, 1.2 linux-2.6-vio-modalias.patch, 1.1, 1.2 linux-2.6-virtio_blk-fix-sysfs-bits.patch, 1.1, 1.2 linux-2.6-wireless-pending-too.patch, 1.1, 1.2 linux-2.6-wireless-pending.patch, 1.1, 1.2 linux-2.6-x86-debug-boot.patch, 1.1, 1.2 linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch, 1.1, 1.2 linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch, 1.1, 1.2 linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch, 1.1, 1.2 linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch, 1.1, 1.2 linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch, 1.1, 1.2 linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch, 1.1, 1.2 linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch, 1.1, 1.2 linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch, 1.1, 1.2 linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch, 1.1, 1.2 linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch, 1.1, 1.2 linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch, 1.1, 1.2 linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch, 1.1, 1.2 linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch, 1.1, 1.2 linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch, 1.1, 1.2 linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch, 1.1, 1.2 linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch, 1.1, 1.2 linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch, 1.1, 1.2 linux-2.6.24.tar.bz2.sign, 1.1, 1.2 mirrors, 1.1, 1.2 patch-2.6.25-rc4.bz2.sign, 1.1, 1.2 upstream, 1.1, 1.2 upstream-key.gpg, 1.1, 1.2 .cvsignore, 1.11, 1.12 Makefile, 1.2, 1.3 Makefile.config, 1.2, 1.3 config-debug, 1.2, 1.3 config-generic, 1.2, 1.3 config-i586, 1.2, 1.3 config-ia64-generic, 1.2, 1.3 config-nodebug, 1.2, 1.3 config-powerpc-generic, 1.2, 1.3 config-powerpc32-generic, 1.2, 1.3 config-powerpc64, 1.2, 1.3 config-s390x, 1.2, 1.3 config-sparc-generic, 1.2, 1.3 config-sparc64-generic, 1.2, 1.3 config-x86-generic, 1.2, 1.3 config-x86_64-generic, 1.2, 1.3 config-xen-generic, 1.2, 1.3 config-xen-ia64, 1.2, 1.3 config-xen-x86, 1.2, 1.3 config-xen-x86_64, 1.2, 1.3 kernel.spec, 1.13, 1.14 linux-2.6-ata-quirk.patch, 1.2, 1.3 linux-2.6-build-nonintconfig.patch, 1.1, 1.2 linux-2.6-crash-driver.patch, 1.2, 1.3 linux-2.6-cve-2008-0600.patch, 1.1, 1.2 linux-2.6-debug-nmi-timeout.patch, 1.2, 1.3 linux-2.6-debug-no-quiet.patch, 1.2, 1.3 linux-2.6-debug-sizeof-structs.patch, 1.2, 1.3 linux-2.6-debug-spinlock-taint.patch, 1.1, 1.2 linux-2.6-debug-taint-vm.patch, 1.3, 1.4 linux-2.6-defaults-fat-utf8.patch, 1.1, 1.2 linux-2.6-devmem.patch, 1.3, 1.4 linux-2.6-execshield.patch, 1.3, 1.4 linux-2.6-input-kill-stupid-messages.patch, 1.1, 1.2 linux-2.6-net-silence-noisy-printks.patch, 1.2, 1.3 linux-2.6-ppc32-ucmpdi2.patch, 1.1, 1.2 linux-2.6-ps3-ehci-iso.patch, 1.2, 1.3 linux-2.6-selinux-mprotect-checks.patch, 1.1, 1.2 linux-2.6-serial-460800.patch, 1.1, 1.2 linux-2.6-silence-noise.patch, 1.3, 1.4 linux-2.6-squashfs.patch, 1.3, 1.4 linux-2.6-utrace-core.patch, 1.2, 1.3 linux-2.6-utrace-ptrace-compat-ia64.patch, 1.2, 1.3 linux-2.6-utrace-ptrace-compat-s390.patch, 1.2, 1.3 linux-2.6-utrace-ptrace-compat-sparc64.patch, 1.2, 1.3 linux-2.6-utrace-ptrace-compat.patch, 1.2, 1.3 linux-2.6-utrace-regset-ia64.patch, 1.2, 1.3 linux-2.6-utrace-regset-s390.patch, 1.2, 1.3 linux-2.6-utrace-regset-sparc64.patch, 1.2, 1.3 linux-2.6-utrace-regset.patch, 1.2, 1.3 linux-2.6-utrace-tracehook-ia64.patch, 1.2, 1.3 linux-2.6-utrace-tracehook-s390.patch, 1.2, 1.3 linux-2.6-utrace-tracehook-sparc64.patch, 1.2, 1.3 linux-2.6-utrace-tracehook-um.patch, 1.2, 1.3 linux-2.6-utrace-tracehook.patch, 1.2, 1.3 linux-2.6-wireless.patch, 1.2, 1.3 linux-2.6-x86-tune-generic.patch, 1.1, 1.2 nouveau-drm.patch, 1.2, 1.3 sources, 1.11, 1.12 xen-build-id.patch, 1.2, 1.3 xen-compile-fix.patch, 1.3, 1.4 xen-syms-build-id.patch, 1.2, 1.3 config-olpc-generic, 1.1, NONE git-wireless-dev.patch, 1.2, NONE kernel-2.6.21.7-i686-xen.config, 1.3, NONE kernel-2.6.21.7-x86_64-xen.config, 1.3, NONE linux-2.6-2110_scsi-sd-printing.patch, 1.2, NONE linux-2.6-2111_sd-start-stop.patch, 1.2, NONE linux-2.6-2112_libata-suspend.patch, 1.2, NONE linux-2.6-2113_libata-spindown-compat.patch, 1.2, NONE linux-2.6-2114_libata-shutdown-warning.patch, 1.2, NONE linux-2.6-2115_libata-spindown-status.patch, 1.2, NONE linux-2.6-2116_libata-remove-spindown-compat.patch, 1.2, NONE linux-2.6-2117_sata-via-suspend.patch, 1.2, NONE linux-2.6-2118_scsi-constants.patch, 1.2, NONE linux-2.6-3w-9xxx-mem_len.patch, 1.1, NONE linux-2.6-PT_LOAD-align.patch, 1.1, NONE linux-2.6-acpi-boot-regression.patch, 1.2, NONE linux-2.6-acpi-config_pm-poweroff.patch, 1.1, NONE linux-2.6-acpi-dock-oops.patch, 1.2, NONE linux-2.6-acpi-keep-tsc-stable-when-lapic-timer-c2-ok-is-set.patch, 1.2, NONE linux-2.6-acpi-preserve-ebx-in-acpi_copy_wakeup_routine.patch, 1.2, NONE linux-2.6-acpi-unblacklist-dell-gx240.patch, 1.2, NONE linux-2.6-amd-disabled-svm-detect-msr-1.patch, 1.2, NONE linux-2.6-amd-disabled-svm-detect.patch, 1.2, NONE linux-2.6-ata-call-check-dma-with-qc-prepared.patch, 1.2, NONE linux-2.6-ata-use-pio-for-non-16-byte-xfers.patch, 1.2, NONE linux-2.6-bcm43xx-pci-neuter.patch, 1.2, NONE linux-2.6-cell-spu-device-tree.patch, 1.2, NONE linux-2.6-cell-spufs-fixes.patch, 1.2, NONE linux-2.6-clockevents-fix-resume-logic.patch, 1.2, NONE linux-2.6-common-uevent.patch, 1.2, NONE linux-2.6-crap-sysfs-workaround.patch, 1.2, NONE linux-2.6-crash-driver-xen.patch, 1.2, NONE linux-2.6-debug-boot-delay.patch, 1.2, NONE linux-2.6-debug-extra-warnings.patch, 1.2, NONE linux-2.6-debug-must_check.patch, 1.1, NONE linux-2.6-debug-slab-backtrace.patch, 1.1, NONE linux-2.6-debug-sysfs-crash-debugging-xen.patch, 1.2, NONE linux-2.6-debug-sysfs-crash-debugging.patch, 1.2, NONE linux-2.6-defaults-nonmi.patch, 1.1, NONE linux-2.6-defaults-pci_no_msi_mmconf.patch, 1.2, NONE linux-2.6-defaults-unicode-vt.patch, 1.1, NONE linux-2.6-devmem-xen.patch, 1.2, NONE linux-2.6-disable-netback-checksum.patch, 1.3, NONE linux-2.6-dvb-spinlock.patch, 1.2, NONE linux-2.6-execshield-xen.patch, 1.2, NONE linux-2.6-firewire-be32-fix.patch, 1.2, NONE linux-2.6-firewire.patch, 1.2, NONE linux-2.6-fix-pmops-1.patch, 1.2, NONE linux-2.6-fix-pmops-2.patch, 1.2, NONE linux-2.6-fix-pmops-3.patch, 1.2, NONE linux-2.6-fix-pmops-4.patch, 1.2, NONE linux-2.6-gfs2-update.patch, 1.2, NONE linux-2.6-i82875-edac-pci-setup.patch, 1.2, NONE linux-2.6-i965gm-support.patch, 1.2, NONE linux-2.6-ibmvscsi-schizo.patch, 1.1, NONE linux-2.6-kvm-19.patch, 1.2, NONE linux-2.6-kvm-reinit-real-mode-tss.patch, 1.2, NONE linux-2.6-libata-atiixp-ids.patch, 1.2, NONE linux-2.6-libata-hpa.patch, 1.2, NONE linux-2.6-libata-ich8m-add-pciid.patch, 1.2, NONE linux-2.6-libata-ncq-blacklist-2.6.22-rc7.patch, 1.2, NONE linux-2.6-libata-pata-hpt3x2n-correct-revision-boundary.patch, 1.2, NONE linux-2.6-libata-pata-pcmcia-new-ident.patch, 1.2, NONE linux-2.6-libata-pata-sis-fix-timing.patch, 1.2, NONE linux-2.6-libata-pata_dma-param.patch, 1.2, NONE linux-2.6-libata-pata_it821x-partly-fix-dma.patch, 1.2, NONE linux-2.6-libata-sata_nv-adma.patch, 1.2, NONE linux-2.6-libata-sata_nv-wildcard-removal.patch, 1.2, NONE linux-2.6-libata-setxfer.patch, 1.2, NONE linux-2.6-libata_ali_max_dma_speed.patch, 1.2, NONE linux-2.6-libertas.diff, 1.2, NONE linux-2.6-mm-udf-fixes.patch, 1.2, NONE linux-2.6-modsign-core.patch, 1.3, NONE linux-2.6-modsign-crypto.patch, 1.3, NONE linux-2.6-modsign-include.patch, 1.3, NONE linux-2.6-modsign-ksign.patch, 1.3, NONE linux-2.6-modsign-mpilib.patch, 1.3, NONE linux-2.6-modsign-script.patch, 1.3, NONE linux-2.6-modsign-verify.patch, 1.1, NONE linux-2.6-module_version.patch, 1.2, NONE linux-2.6-mpc52xx-fec.patch, 1.2, NONE linux-2.6-mpc52xx-sdma.patch, 1.2, NONE linux-2.6-net-e1000-no-msi-warning.patch, 1.2, NONE linux-2.6-netdev-e1000e-01.patch, 1.1, NONE linux-2.6-netdev-e1000e-02.patch, 1.1, NONE linux-2.6-netdev-e1000e-03.patch, 1.1, NONE linux-2.6-netdev-e1000e-04.patch, 1.1, NONE linux-2.6-netdev-e1000e-05.patch, 1.1, NONE linux-2.6-netdev-e1000e-06.patch, 1.1, NONE linux-2.6-netdev-e1000e-07.patch, 1.1, NONE linux-2.6-netdev-e1000e-08.patch, 1.1, NONE linux-2.6-netdev-e1000e-09.patch, 1.1, NONE linux-2.6-netdev-e1000e-10.patch, 1.1, NONE linux-2.6-netdev-e1000e-backport.patch, 1.1, NONE linux-2.6-nfs-missing-braces.patch, 1.2, NONE linux-2.6-nfs-noreaddirplus.patch, 1.2, NONE linux-2.6-olpc-touchpad.diff, 1.2, NONE linux-2.6-ondemand-timer.patch, 1.2, NONE linux-2.6-oprofile-0.9.3.patch, 1.1, NONE linux-2.6-optimise-spinlock-debug.patch, 1.1, NONE linux-2.6-pmac-zilog.patch, 1.2, NONE linux-2.6-powermac-generic-suspend-1.patch, 1.2, NONE linux-2.6-powermac-generic-suspend-2.patch, 1.2, NONE linux-2.6-powermac-generic-suspend-3.patch, 1.2, NONE linux-2.6-powermac-generic-suspend-4.patch, 1.2, NONE linux-2.6-powerpc-reserve-initrd-1.patch, 1.2, NONE linux-2.6-powerpc-reserve-initrd-2.patch, 1.2, NONE linux-2.6-powerpc-slabalign.patch, 1.2, NONE linux-2.6-ppc-data-exception.patch, 1.2, NONE linux-2.6-proc-self-maps-fix.patch, 1.2, NONE linux-2.6-ps3-clear-spu-irq.patch, 1.2, NONE linux-2.6-ps3-device-init.patch, 1.2, NONE linux-2.6-ps3-ethernet-autoload.patch, 1.2, NONE linux-2.6-ps3-ethernet-modular.patch, 1.2, NONE linux-2.6-ps3-gelic-wireless.patch, 1.2, NONE linux-2.6-ps3-gelic.patch, 1.2, NONE linux-2.6-ps3-kexec.patch, 1.2, NONE linux-2.6-ps3-legacy-ioport.patch, 1.2, NONE linux-2.6-ps3-memory-probe.patch, 1.2, NONE linux-2.6-ps3-smp-boot.patch, 1.2, NONE linux-2.6-ps3-sound-autoload.patch, 1.2, NONE linux-2.6-ps3-sound.patch, 1.2, NONE linux-2.6-ps3-stable-patches.patch, 1.2, NONE linux-2.6-ps3-storage.patch, 1.2, NONE linux-2.6-ps3-system-bus-rework-2.patch, 1.2, NONE linux-2.6-ps3-system-bus-rework.patch, 1.2, NONE linux-2.6-ps3-usb-autoload.patch, 1.2, NONE linux-2.6-ps3-wrap-spu-runctl.patch, 1.2, NONE linux-2.6-ps3av-export-header.patch, 1.2, NONE linux-2.6-ps3fb-panic.patch, 1.2, NONE linux-2.6-raid-autorun.patch, 1.1, NONE linux-2.6-remove-unnecessary-cast-in-prefetch.patch, 1.1, NONE linux-2.6-scsi-bounce-isa.patch, 1.2, NONE linux-2.6-sha_alignment.patch, 1.1, NONE linux-2.6-softirq-printout-irq-trace-events.patch, 1.2, NONE linux-2.6-softlockup-disable.patch, 1.2, NONE linux-2.6-sumversion-limits-dot-h.patch, 1.1, NONE linux-2.6-suspend-ordering.patch, 1.2, NONE linux-2.6-sysfs-inode-allocator-oops.patch, 1.2, NONE linux-2.6-udf-2.6.22-rc2-1-udf_data_corruption.patch, 1.2, NONE linux-2.6-udf-2.6.22-rc4-1-udf_block_leak.patch, 1.2, NONE linux-2.6-uevent-ebus.patch, 1.1, NONE linux-2.6-uevent-macio.patch, 1.1, NONE linux-2.6-uevent-of_platform.patch, 1.1, NONE linux-2.6-unexport-symbols.patch, 1.1, NONE linux-2.6-usb-autosuspend-default-disable.patch, 1.2, NONE linux-2.6-use-build-id-ld-option.patch, 1.2, NONE linux-2.6-utrace-ptrace-compat-xen.patch, 1.2, NONE linux-2.6-utrace-recalc_sigpending_and_wake.patch, 1.2, NONE linux-2.6-utrace-sig_kernel-macros.patch, 1.2, NONE linux-2.6-utrace-tracehook-xen.patch, 1.2, NONE linux-2.6-vm-invalidate_mapping_pages-cond-resched.patch, 1.2, NONE linux-2.6-vm-silence-atomic-alloc-failures.patch, 1.1, NONE linux-2.6-wakeups-hdaps.patch, 1.2, NONE linux-2.6-x86-64-edac-support.patch, 1.1, NONE linux-2.6-x86-64_pmtrace.patch, 1.2, NONE linux-2.6-x86-dell-hpet.patch, 1.2, NONE linux-2.6-x86-dont-delete-cpu_devs-data.patch, 1.2, NONE linux-2.6-x86-fsc-interrupt-controller-quirk.patch, 1.2, NONE linux-2.6-x86-vga-vidfail.patch, 1.1, NONE linux-2.6-x86_64-silence-up-apic-errors-xen.patch, 1.2, NONE linux-2.6-x86_64-silence-up-apic-errors.patch, 1.1, NONE linux-2.6-xen-backwards-time.patch, 1.1, NONE linux-2.6-xen-blkfront-wait-add.patch, 1.3, NONE linux-2.6-xen-fix-irq-warn-mismerge.patch, 1.1, NONE linux-2.6-xen-irq_vector-uninitialize.patch, 1.1, NONE linux-2.6-xen-paravirt-nographics-pvfb-fix.patch, 1.2, NONE linux-2.6-xen-privcmd-use-nopfn.patch, 1.1, NONE linux-2.6-xen-sleazy-fpu-i386.patch, 1.1, NONE linux-2.6-xen-sleazy-fpu-x86_64.patch, 1.1, NONE linux-2.6.20.tar.bz2.sign, 1.1, NONE Message-ID: <200803061401.m26E1Gcs030859@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22915 Modified Files: .cvsignore Makefile Makefile.config config-debug config-generic config-i586 config-ia64-generic config-nodebug config-powerpc-generic config-powerpc32-generic config-powerpc64 config-s390x config-sparc-generic config-sparc64-generic config-x86-generic config-x86_64-generic config-xen-generic config-xen-ia64 config-xen-x86 config-xen-x86_64 kernel.spec linux-2.6-ata-quirk.patch linux-2.6-build-nonintconfig.patch linux-2.6-crash-driver.patch linux-2.6-cve-2008-0600.patch linux-2.6-debug-nmi-timeout.patch linux-2.6-debug-no-quiet.patch linux-2.6-debug-sizeof-structs.patch linux-2.6-debug-spinlock-taint.patch linux-2.6-debug-taint-vm.patch linux-2.6-defaults-fat-utf8.patch linux-2.6-devmem.patch linux-2.6-execshield.patch linux-2.6-input-kill-stupid-messages.patch linux-2.6-net-silence-noisy-printks.patch linux-2.6-ppc32-ucmpdi2.patch linux-2.6-ps3-ehci-iso.patch linux-2.6-selinux-mprotect-checks.patch linux-2.6-serial-460800.patch linux-2.6-silence-noise.patch linux-2.6-squashfs.patch linux-2.6-utrace-core.patch linux-2.6-utrace-ptrace-compat-ia64.patch linux-2.6-utrace-ptrace-compat-s390.patch linux-2.6-utrace-ptrace-compat-sparc64.patch linux-2.6-utrace-ptrace-compat.patch linux-2.6-utrace-regset-ia64.patch linux-2.6-utrace-regset-s390.patch linux-2.6-utrace-regset-sparc64.patch linux-2.6-utrace-regset.patch linux-2.6-utrace-tracehook-ia64.patch linux-2.6-utrace-tracehook-s390.patch linux-2.6-utrace-tracehook-sparc64.patch linux-2.6-utrace-tracehook-um.patch linux-2.6-utrace-tracehook.patch linux-2.6-wireless.patch linux-2.6-x86-tune-generic.patch nouveau-drm.patch sources xen-build-id.patch xen-compile-fix.patch xen-syms-build-id.patch Added Files: .gitignore gen-patches linux-2.6-acpi-eeepc-hotkey.patch linux-2.6-at76.patch linux-2.6-blkcipher-depend-on-chainiv.patch linux-2.6-compile-fix-gcc-43.patch linux-2.6-compile-fixes.patch linux-2.6-debug-acpi-os-write-port.patch linux-2.6-default-mmf_dump_elf_headers.patch linux-2.6-drm-add-i915-radeon-mdt.patch linux-2.6-drm-git-i915-remove-priv-access.patch linux-2.6-drm-git-mm-revert-nopfn.patch linux-2.6-drm-git-mm.patch linux-2.6-e1000-corrupt-eeprom-checksum.patch linux-2.6-e1000-ich9.patch linux-2.6-ext4-stable-queue.patch linux-2.6-firewire-git-pending.patch linux-2.6-firewire-git-update.patch linux-2.6-hotfixes.patch linux-2.6-ia32-syscall-restart.patch linux-2.6-lirc.patch linux-2.6-netdev-atl2.patch linux-2.6-netdev-e1000-disable-alpm.patch linux-2.6-ppc-rtc.patch linux-2.6-ppc-use-libgcc.patch linux-2.6-ps3-legacy-bootloader-hack.patch linux-2.6-ps3-storage-alias.patch linux-2.6-scsi-mpt-vmware-fix.patch linux-2.6-smarter-relatime.patch linux-2.6-usb-ehci-hcd-respect-nousb.patch linux-2.6-utrace-ptrace-compat-avr32.patch linux-2.6-utrace-regset-avr32.patch linux-2.6-utrace-tracehook-avr32.patch linux-2.6-uvcvideo.patch linux-2.6-vio-modalias.patch linux-2.6-virtio_blk-fix-sysfs-bits.patch linux-2.6-wireless-pending-too.patch linux-2.6-wireless-pending.patch linux-2.6-x86-debug-boot.patch linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch linux-2.6.24.tar.bz2.sign mirrors patch-2.6.25-rc4.bz2.sign upstream upstream-key.gpg Removed Files: config-olpc-generic git-wireless-dev.patch kernel-2.6.21.7-i686-xen.config kernel-2.6.21.7-x86_64-xen.config linux-2.6-2110_scsi-sd-printing.patch linux-2.6-2111_sd-start-stop.patch linux-2.6-2112_libata-suspend.patch linux-2.6-2113_libata-spindown-compat.patch linux-2.6-2114_libata-shutdown-warning.patch linux-2.6-2115_libata-spindown-status.patch linux-2.6-2116_libata-remove-spindown-compat.patch linux-2.6-2117_sata-via-suspend.patch linux-2.6-2118_scsi-constants.patch linux-2.6-3w-9xxx-mem_len.patch linux-2.6-PT_LOAD-align.patch linux-2.6-acpi-boot-regression.patch linux-2.6-acpi-config_pm-poweroff.patch linux-2.6-acpi-dock-oops.patch linux-2.6-acpi-keep-tsc-stable-when-lapic-timer-c2-ok-is-set.patch linux-2.6-acpi-preserve-ebx-in-acpi_copy_wakeup_routine.patch linux-2.6-acpi-unblacklist-dell-gx240.patch linux-2.6-amd-disabled-svm-detect-msr-1.patch linux-2.6-amd-disabled-svm-detect.patch linux-2.6-ata-call-check-dma-with-qc-prepared.patch linux-2.6-ata-use-pio-for-non-16-byte-xfers.patch linux-2.6-bcm43xx-pci-neuter.patch linux-2.6-cell-spu-device-tree.patch linux-2.6-cell-spufs-fixes.patch linux-2.6-clockevents-fix-resume-logic.patch linux-2.6-common-uevent.patch linux-2.6-crap-sysfs-workaround.patch linux-2.6-crash-driver-xen.patch linux-2.6-debug-boot-delay.patch linux-2.6-debug-extra-warnings.patch linux-2.6-debug-must_check.patch linux-2.6-debug-slab-backtrace.patch linux-2.6-debug-sysfs-crash-debugging-xen.patch linux-2.6-debug-sysfs-crash-debugging.patch linux-2.6-defaults-nonmi.patch linux-2.6-defaults-pci_no_msi_mmconf.patch linux-2.6-defaults-unicode-vt.patch linux-2.6-devmem-xen.patch linux-2.6-disable-netback-checksum.patch linux-2.6-dvb-spinlock.patch linux-2.6-execshield-xen.patch linux-2.6-firewire-be32-fix.patch linux-2.6-firewire.patch linux-2.6-fix-pmops-1.patch linux-2.6-fix-pmops-2.patch linux-2.6-fix-pmops-3.patch linux-2.6-fix-pmops-4.patch linux-2.6-gfs2-update.patch linux-2.6-i82875-edac-pci-setup.patch linux-2.6-i965gm-support.patch linux-2.6-ibmvscsi-schizo.patch linux-2.6-kvm-19.patch linux-2.6-kvm-reinit-real-mode-tss.patch linux-2.6-libata-atiixp-ids.patch linux-2.6-libata-hpa.patch linux-2.6-libata-ich8m-add-pciid.patch linux-2.6-libata-ncq-blacklist-2.6.22-rc7.patch linux-2.6-libata-pata-hpt3x2n-correct-revision-boundary.patch linux-2.6-libata-pata-pcmcia-new-ident.patch linux-2.6-libata-pata-sis-fix-timing.patch linux-2.6-libata-pata_dma-param.patch linux-2.6-libata-pata_it821x-partly-fix-dma.patch linux-2.6-libata-sata_nv-adma.patch linux-2.6-libata-sata_nv-wildcard-removal.patch linux-2.6-libata-setxfer.patch linux-2.6-libata_ali_max_dma_speed.patch linux-2.6-libertas.diff linux-2.6-mm-udf-fixes.patch linux-2.6-modsign-core.patch linux-2.6-modsign-crypto.patch linux-2.6-modsign-include.patch linux-2.6-modsign-ksign.patch linux-2.6-modsign-mpilib.patch linux-2.6-modsign-script.patch linux-2.6-modsign-verify.patch linux-2.6-module_version.patch linux-2.6-mpc52xx-fec.patch linux-2.6-mpc52xx-sdma.patch linux-2.6-net-e1000-no-msi-warning.patch linux-2.6-netdev-e1000e-01.patch linux-2.6-netdev-e1000e-02.patch linux-2.6-netdev-e1000e-03.patch linux-2.6-netdev-e1000e-04.patch linux-2.6-netdev-e1000e-05.patch linux-2.6-netdev-e1000e-06.patch linux-2.6-netdev-e1000e-07.patch linux-2.6-netdev-e1000e-08.patch linux-2.6-netdev-e1000e-09.patch linux-2.6-netdev-e1000e-10.patch linux-2.6-netdev-e1000e-backport.patch linux-2.6-nfs-missing-braces.patch linux-2.6-nfs-noreaddirplus.patch linux-2.6-olpc-touchpad.diff linux-2.6-ondemand-timer.patch linux-2.6-oprofile-0.9.3.patch linux-2.6-optimise-spinlock-debug.patch linux-2.6-pmac-zilog.patch linux-2.6-powermac-generic-suspend-1.patch linux-2.6-powermac-generic-suspend-2.patch linux-2.6-powermac-generic-suspend-3.patch linux-2.6-powermac-generic-suspend-4.patch linux-2.6-powerpc-reserve-initrd-1.patch linux-2.6-powerpc-reserve-initrd-2.patch linux-2.6-powerpc-slabalign.patch linux-2.6-ppc-data-exception.patch linux-2.6-proc-self-maps-fix.patch linux-2.6-ps3-clear-spu-irq.patch linux-2.6-ps3-device-init.patch linux-2.6-ps3-ethernet-autoload.patch linux-2.6-ps3-ethernet-modular.patch linux-2.6-ps3-gelic-wireless.patch linux-2.6-ps3-gelic.patch linux-2.6-ps3-kexec.patch linux-2.6-ps3-legacy-ioport.patch linux-2.6-ps3-memory-probe.patch linux-2.6-ps3-smp-boot.patch linux-2.6-ps3-sound-autoload.patch linux-2.6-ps3-sound.patch linux-2.6-ps3-stable-patches.patch linux-2.6-ps3-storage.patch linux-2.6-ps3-system-bus-rework-2.patch linux-2.6-ps3-system-bus-rework.patch linux-2.6-ps3-usb-autoload.patch linux-2.6-ps3-wrap-spu-runctl.patch linux-2.6-ps3av-export-header.patch linux-2.6-ps3fb-panic.patch linux-2.6-raid-autorun.patch linux-2.6-remove-unnecessary-cast-in-prefetch.patch linux-2.6-scsi-bounce-isa.patch linux-2.6-sha_alignment.patch linux-2.6-softirq-printout-irq-trace-events.patch linux-2.6-softlockup-disable.patch linux-2.6-sumversion-limits-dot-h.patch linux-2.6-suspend-ordering.patch linux-2.6-sysfs-inode-allocator-oops.patch linux-2.6-udf-2.6.22-rc2-1-udf_data_corruption.patch linux-2.6-udf-2.6.22-rc4-1-udf_block_leak.patch linux-2.6-uevent-ebus.patch linux-2.6-uevent-macio.patch linux-2.6-uevent-of_platform.patch linux-2.6-unexport-symbols.patch linux-2.6-usb-autosuspend-default-disable.patch linux-2.6-use-build-id-ld-option.patch linux-2.6-utrace-ptrace-compat-xen.patch linux-2.6-utrace-recalc_sigpending_and_wake.patch linux-2.6-utrace-sig_kernel-macros.patch linux-2.6-utrace-tracehook-xen.patch linux-2.6-vm-invalidate_mapping_pages-cond-resched.patch linux-2.6-vm-silence-atomic-alloc-failures.patch linux-2.6-wakeups-hdaps.patch linux-2.6-x86-64-edac-support.patch linux-2.6-x86-64_pmtrace.patch linux-2.6-x86-dell-hpet.patch linux-2.6-x86-dont-delete-cpu_devs-data.patch linux-2.6-x86-fsc-interrupt-controller-quirk.patch linux-2.6-x86-vga-vidfail.patch linux-2.6-x86_64-silence-up-apic-errors-xen.patch linux-2.6-x86_64-silence-up-apic-errors.patch linux-2.6-xen-backwards-time.patch linux-2.6-xen-blkfront-wait-add.patch linux-2.6-xen-fix-irq-warn-mismerge.patch linux-2.6-xen-irq_vector-uninitialize.patch linux-2.6-xen-paravirt-nographics-pvfb-fix.patch linux-2.6-xen-privcmd-use-nopfn.patch linux-2.6-xen-sleazy-fpu-i386.patch linux-2.6-xen-sleazy-fpu-x86_64.patch linux-2.6.20.tar.bz2.sign Log Message: * Wed Mar 05 2008 Mark McLoughlin - Reset to pv_ops xen DomU from kernel-2_6_25-0_93_rc4_fc9 - Revert the execshield patch for now - Include xen pv fb and kbd drivers - Add support for auto-probing frontend drivers - Add module aliases for xennet and xenblk - Add /proc/xen and /sys/hypervisor - Add first round of x86_64 xen pv_ops patches Index: .gitignore =================================================================== RCS file: .gitignore diff -N .gitignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .gitignore 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,8 @@ +clog +GNUmakefile +kernel-2.6.*.config +temp-* +kernel-2.6.24 +linux-2.6.24.tar.bz2 +patch-2.6.25-rc4.bz2 +xen-3.2.0.tar.gz Index: gen-patches =================================================================== RCS file: gen-patches diff -N gen-patches --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gen-patches 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,215 @@ +#!/bin/bash +# +# This script goes with the Makefile hacks for git/branch builds. +# + +nopatches=1 +if [ "x$1" = "x--fedora" ]; then + nopatches=0 + shift + patchcomment="plus Fedora patches" +else + patchcomment="no Fedora patches" +fi + +name= +if [ "x$1" = "x--name" ]; then + shift + name="$1" + shift +fi + +if [ $# -lt 2 ]; then + echo >&2 "Usage: GIT_DIR=REPO $0 [--fedora] [--name NAME]\ + TARBALL-TAG [PATCH-TAG...] BRANCH..." + exit 2 +fi + +base=$1 +shift +base_rev=`git-rev-parse "$base"` || exit + +patchbase=10 +nextpatch=$patchbase +usepatch() +{ + patches[$nextpatch]=$1 + nextpatch=$(($nextpatch + 1)) +} + +lasturl=: +loglines="- Experimental build from git sources ($patchcomment)\\ +" +log() +{ + local logrev=$1 + local logbranch=$3 + local ref + ref=`git-symbolic-ref -q $logbranch` && logbranch=$ref + case $logbranch in + refs/remotes/*) + logbranch=${logbranch#refs/remotes/} + local remote=${logbranch%%/*} + logbranch=${logbranch#*/} + logbranch=${logbranch//\//-} + local url + url=`git-config "remote.${remote}.url"` || { + echo >&2 "Cannot find URL for remote $remote" + exit 2 + } + if [ "$url" != "$lasturl" ]; then + lasturl="$url" + loglines="${loglines}- $url\\ +" + fi + logtext="$(printf %12s "remote: ")$logbranch" + ;; + *) + lasturl=: + logtext="$(printf %-12s "git $2:")$logbranch" + ;; + esac + loglines="${loglines}- $(printf %-35s "$logtext") ${logrev}\\ +" +} + +patch_headers() +{ + p=$patchbase + while [ $p -lt $nextpatch ]; do + echo "Patch$p: ${patches[$p]}\\" + p=$(($p + 1)) + done +} + +patch_apply() +{ + p=$patchbase + while [ $p -lt $nextpatch ]; do +# echo "%patch$p -p1\\" + echo "ApplyPatch ${patches[$p]}\\" + p=$(($p + 1)) + done +} + +base_rev() +{ + local base=$1 + tag_rev=`git-rev-parse --revs-only --verify "$base^{}" 2> /dev/null` && + [ "`git-describe --tags $tag_rev`" = "$base" ] && return 0 + case "$1" in + v*-git*) + local id=patch-${1#v}.id + if [ ! -r $id ]; then + make download UPSTREAM_FILES=$id UPSTREAM_CHECKS=-- > /dev/null 2>&1 + fi + [ -r $id ] && tag_rev=`cat $id` && return 0 + ;; + v2*) + echo >&2 "Cannot find tag $base" + exit 2 + ;; + esac + return 1 +} + +log $base_rev base $base +while base_rev $1; do + base=$1 + base_rev=$tag_rev + shift + patchfile=patch-${base#v}.bz2 + fgrep -q $patchfile sources || usepatch $patchfile + log $tag_rev tag $base +done +version=${base#v} + +now="`date +'%Y-%m-%d %H:%M %Z'`" + +GIT_DIFF_OPTS=-pu +export GIT_DIFF_OPTS + +i=0 +last_base=$base +last_base_rev=$base_rev +for branch; do + branch_rev=`git-rev-parse "$branch^{}"` || exit 2 + merge_base=`git-merge-base $last_base_rev $branch_rev` || { + echo >&2 "No common ancestor for $last_base and $branch" + exit 2 + } + if ((i > 0)) && [ "x$merge_base" = "x${merge_rev[$(($i - 1))]}" ]; then + echo >&2 "$last_base is not an ancestor of $branch" + exit 2 + fi + merge_rev[$i]=$merge_base + ((i++)) + last_base=$branch + last_base_rev=$branch_rev +done +merge_rev[$i]=$last_base_rev + +test "x${merge_rev[0]}" = "x$base_rev" || { + echo >&2 "$base is not an ancestor of $branch" + exit 2 +} + +i=1 +for branch; do + + branch_rev=${merge_rev[$i]} + ((i++)) + + case "$branch" in + refs/remotes/*/master) + branch_name=${branch#refs/remotes/} + branch_name=${branch_name%/master} + ;; + refs/remotes/*) + branch_name=${branch#refs/remotes/} + branch_name=${branch_name//\//-} + ;; + */*) + branch_name=${branch_name//\//-} + ;; + *) + branch_name=$branch + ;; + esac + + file=linux-${version}-${branch_name}.patch + git diff --no-renames --patch-with-stat \ + -r "${base_rev}" -r "${branch_rev}" > $file || exit + if [ ! -s $file ]; then + rm -f $file + continue + fi + + usepatch $file + log $branch_rev branch $branch + + base_rev="$branch_rev" +done +name=`echo ${name:-${branch}} | sed s/-/_/g` + +#upstream_branch=`date -u -d "$now" +${branch}.%Y%m%dT%H%M | sed s/-/_/g` +upstream_branch=$name +branch_rev=`git describe $base_rev | sed 's/-g[0-9a-f]*$//;s/^[^-]*//;s/-/./g'` + +logdate=`date -d "$now" +'%a %b %d %Y'` + +sed "/%define nopatches/c\\ +%define nopatches ${nopatches}\\ +%define upstream_branch ${name}\\ +%define upstream_branch_tag ${branch_rev} +/^### BRANCH PATCH/a\\ +`patch_headers` +### +/^### BRANCH APPLY/a\\ +`patch_apply` +### +/^%changelog/a\\ +* ${logdate} ${GIT_AUTHOR_NAME} <${GIT_AUTHOR_EMAIL}>\\ +$loglines + +" linux-2.6-acpi-eeepc-hotkey.patch: Index: linux-2.6-acpi-eeepc-hotkey.patch =================================================================== RCS file: linux-2.6-acpi-eeepc-hotkey.patch diff -N linux-2.6-acpi-eeepc-hotkey.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-acpi-eeepc-hotkey.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,490 @@ +Signed-off-by: Eric Cooper + +--- + drivers/misc/Kconfig | 10 + + drivers/misc/Makefile | 1 + + drivers/misc/eeepc.c | 447 +++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 458 insertions(+), 0 deletions(-) + create mode 100644 drivers/misc/eeepc.c + +diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig +index b1f9a40..8fd1ccb 100644 +--- a/drivers/misc/Kconfig ++++ b/drivers/misc/Kconfig +@@ -251,4 +251,14 @@ config ATMEL_SSC + driver (SCSI/ATA) which supports enclosures + or a SCSI enclosure device (SES) to use these services. + ++config EEEPC ++ tristate "Eee PC Hotkey Driver (EXPERIMENTAL)" ++ depends on X86 ++ depends on ACPI ++ depends on EXPERIMENTAL && !ACPI_ASUS ++ ---help--- ++ This driver supports the Fn-Fx keys on Eee PC laptops. ++ ++ If you have an Eee PC laptop, say Y or M here. ++ + endif # MISC_DEVICES +diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile +index 87f2685..699b35c 100644 +--- a/drivers/misc/Makefile ++++ b/drivers/misc/Makefile +@@ -17,3 +17,4 @@ obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o + obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o + obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o + obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o ++obj-$(CONFIG_EEEPC) += eeepc.o +diff --git a/drivers/misc/eeepc.c b/drivers/misc/eeepc.c +new file mode 100644 +index 0000000..2e33117 +--- /dev/null ++++ b/drivers/misc/eeepc.c +@@ -0,0 +1,447 @@ ++/* ++ * eepc_acpi.c - Asus Eee PC hotkey driver ++ * ++ * Copyright (C) 2008 Eric Cooper ++ * ++ * Based on asus_acpi.c as patched for the Eee PC by Asus: ++ * ftp://ftp.asus.com/pub/ASUS/EeePC/701/ASUS_ACPI_071126.rar ++ * ++ * Copyright (C) 2002-2005 Julien Lerouge, 2003-2006 Karol Kozimor ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define EEEPC_HOTK_NAME "Eee PC Hotkey Driver" ++#define EEEPC_HOTK_FILE "eeepc" ++#define EEEPC_HOTK_CLASS "hotkey" ++#define EEEPC_HOTK_DEVICE_NAME "Hotkey" ++#define EEEPC_HOTK_HID "ASUS010" ++ ++#define EEEPC_LOG EEEPC_HOTK_FILE ": " ++#define EEEPC_ERR KERN_ERR EEEPC_LOG ++#define EEEPC_WARNING KERN_WARNING EEEPC_LOG ++#define EEEPC_NOTICE KERN_NOTICE EEEPC_LOG ++#define EEEPC_INFO KERN_INFO EEEPC_LOG ++ ++/* ++ * Definitions for Asus EeePC ++ */ ++ ++#define NOTIFY_WLAN_ON 0x10 ++ ++enum { ++ DISABLE_ASL_WLAN = 0x0001, ++ DISABLE_ASL_BLUETOOTH = 0x0002, ++ DISABLE_ASL_IRDA = 0x0004, ++ DISABLE_ASL_CAMERA = 0x0008, ++ DISABLE_ASL_TV = 0x0010, ++ DISABLE_ASL_GPS = 0x0020, ++ DISABLE_ASL_DISPLAYSWITCH = 0x0040, ++ DISABLE_ASL_MODEM = 0x0080, ++ DISABLE_ASL_CARDREADER = 0x0100 ++}; ++ ++enum { ++ CM_ASL_WLAN = 0, ++ CM_ASL_BLUETOOTH, ++ CM_ASL_IRDA, ++ CM_ASL_1394, ++ CM_ASL_CAMERA, ++ CM_ASL_TV, ++ CM_ASL_GPS, ++ CM_ASL_DVDROM, ++ CM_ASL_DISPLAYSWITCH, ++ CM_ASL_PANELBRIGHT, ++ CM_ASL_BIOSFLASH, ++ CM_ASL_ACPIFLASH, ++ CM_ASL_CPUFV, ++ CM_ASL_CPUTEMPERATURE, ++ CM_ASL_FANCPU, ++ CM_ASL_FANCHASSIS, ++ CM_ASL_USBPORT1, ++ CM_ASL_USBPORT2, ++ CM_ASL_USBPORT3, ++ CM_ASL_MODEM, ++ CM_ASL_CARDREADER, ++ CM_ASL_LID ++}; ++ ++const char *cm_getv[] = { ++ "WLDG", NULL, NULL, NULL, ++ "CAMG", NULL, NULL, NULL, ++ NULL, "PBLG", NULL, NULL, ++ "CFVG", NULL, NULL, NULL, ++ "USBG", NULL, NULL, "MODG", ++ "CRDG", "LIDG" ++}; ++ ++const char *cm_setv[] = { ++ "WLDS", NULL, NULL, NULL, ++ "CAMS", NULL, NULL, NULL, ++ "SDSP", "PBLS", "HDPS", NULL, ++ "CFVS", NULL, NULL, NULL, ++ "USBG", NULL, NULL, "MODS", ++ "CRDS", NULL ++}; ++ ++static unsigned int init_flag; ++ ++/* ++ * This is the main structure, we can use it to store useful information ++ * about the hotk device ++ */ ++struct eeepc_hotk { ++ struct acpi_device *device; /* the device we are in */ ++ acpi_handle handle; /* the handle of the hotk device */ ++ u32 cm_supported; /* the control methods supported ++ by this BIOS */ ++ u16 event_count[128]; /* count for each event */ ++}; ++ ++/* The actual device the driver binds to */ ++static struct eeepc_hotk *ehotk; ++ ++/* ++ * The hotkey driver declaration ++ */ ++static int eeepc_hotk_add(struct acpi_device *device); ++static int eeepc_hotk_remove(struct acpi_device *device, int type); ++ ++static const struct acpi_device_id eee_device_ids[] = { ++ {EEEPC_HOTK_HID, 0}, ++ {"", 0}, ++}; ++ ++static struct acpi_driver eeepc_hotk_driver = { ++ .name = EEEPC_HOTK_NAME, ++ .class = EEEPC_HOTK_CLASS, ++ .ids = eee_device_ids, ++ .ops = { ++ .add = eeepc_hotk_add, ++ .remove = eeepc_hotk_remove, ++ }, ++}; ++ ++MODULE_AUTHOR("Julien Lerouge, Karol Kozimor, Eric Cooper"); ++MODULE_DESCRIPTION(EEEPC_HOTK_NAME); ++MODULE_LICENSE("GPL"); ++ ++/* ++ * returns 1 if write is successful, otherwise 0. ++ */ ++static int write_acpi_int(acpi_handle handle, const char *method, int val, ++ struct acpi_buffer *output) ++{ ++ struct acpi_object_list params; ++ union acpi_object in_obj; ++ acpi_status status; ++ ++ params.count = 1; ++ params.pointer = &in_obj; ++ in_obj.type = ACPI_TYPE_INTEGER; ++ in_obj.integer.value = val; ++ ++ status = acpi_evaluate_object(handle, (char *)method, ¶ms, output); ++ return (status == AE_OK); ++} ++ ++static int read_acpi_int(acpi_handle handle, const char *method, int *val) ++{ ++ struct acpi_buffer output; ++ union acpi_object out_obj; ++ acpi_status status; ++ ++ output.length = sizeof(out_obj); ++ output.pointer = &out_obj; ++ status = acpi_evaluate_object(handle, (char *) method, NULL, &output); ++ *val = out_obj.integer.value; ++ return (status == AE_OK) && (out_obj.type == ACPI_TYPE_INTEGER); ++} ++ ++static int parse_arg(const char *buf, unsigned long count, int *val) ++{ ++ if (!count) ++ return 0; ++ if (count > 31) ++ return -EINVAL; ++ if (sscanf(buf, "%i", val) != 1) ++ return -EINVAL; ++ return count; ++} ++ ++static ssize_t store_proc(int cm, const char *buf, size_t count) ++{ ++ int rv, value; ++ ++ rv = parse_arg(buf, count, &value); ++ if (rv > 0 && (ehotk->cm_supported & (0x1 << cm))) { ++ const char *method = cm_setv[cm]; ++ if (method == NULL) ++ return 0; ++ if (!write_acpi_int(ehotk->handle, method, value, NULL)) ++ printk(EEEPC_WARNING "Error writing %s\n", method); ++ } ++ return rv; ++} ++ ++static ssize_t show_proc(int cm, char *buf) ++{ ++ int value = -1; ++ ++ if ((ehotk->cm_supported & (0x1 << cm))) { ++ const char *method = cm_getv[cm]; ++ if (method == NULL) ++ return 0; ++ if (!read_acpi_int(ehotk->handle, method, &value)) ++ printk(EEEPC_WARNING "Error reading %s\n", method); ++ } ++ return sprintf(buf, "%d\n", value); ++} ++ ++static ssize_t real_store_init(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ int rv, value; ++ ++ rv = parse_arg(buf, count, &value); ++ if (!write_acpi_int(ehotk->handle, "INIT", value, NULL)) ++ printk(EEEPC_ERR "Hotkey initialization failed\n"); ++ else ++ printk(EEEPC_INFO "Reset init flag 0x%x\n", value); ++ return rv; ++} ++ ++#define EEEPC_CREATE_DEVICE_ATTR(_name, _cm) \ ++ static ssize_t show_##_name(struct device *dev, \ ++ struct device_attribute *attr, \ ++ char *buf) \ ++ { \ ++ return show_proc(_cm, buf); \ ++ } \ ++ static ssize_t store_##_name(struct device *dev, \ ++ struct device_attribute *attr, \ ++ const char *buf, size_t count) \ ++ { \ ++ return store_proc(_cm, buf, count); \ ++ } \ ++ static struct device_attribute dev_attr_##_name = { \ ++ .attr = { \ ++ .name = __stringify(_name), \ ++ .mode = 0644 }, \ ++ .show = show_##_name, \ ++ .store = store_##_name, \ ++ } ++ ++EEEPC_CREATE_DEVICE_ATTR(brn, CM_ASL_PANELBRIGHT); ++EEEPC_CREATE_DEVICE_ATTR(camera, CM_ASL_CAMERA); ++EEEPC_CREATE_DEVICE_ATTR(cardr, CM_ASL_CARDREADER); ++EEEPC_CREATE_DEVICE_ATTR(cpufv, CM_ASL_CPUFV); ++EEEPC_CREATE_DEVICE_ATTR(disp, CM_ASL_DISPLAYSWITCH); ++EEEPC_CREATE_DEVICE_ATTR(hdps, CM_ASL_BIOSFLASH); ++EEEPC_CREATE_DEVICE_ATTR(init, -1); /* fixed up in eeepc_hotk_add() */ ++EEEPC_CREATE_DEVICE_ATTR(lid, CM_ASL_LID); ++EEEPC_CREATE_DEVICE_ATTR(wlan, CM_ASL_WLAN); ++ ++static struct attribute *platform_attributes[] = { ++ &dev_attr_brn.attr, ++ &dev_attr_camera.attr, ++ &dev_attr_cardr.attr, ++ &dev_attr_cpufv.attr, ++ &dev_attr_disp.attr, ++ &dev_attr_hdps.attr, ++ &dev_attr_init.attr, ++ &dev_attr_lid.attr, ++ &dev_attr_wlan.attr, ++ NULL ++}; ++ ++static struct attribute_group platform_attribute_group = { ++ .attrs = platform_attributes ++}; ++ ++static int eeepc_hotk_check(void) ++{ ++ struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; ++ int result; ++ ++ result = acpi_bus_get_status(ehotk->device); ++ if (result) ++ return result; ++ if (ehotk->device->status.present) { ++ if (!write_acpi_int(ehotk->handle, "INIT", init_flag, ++ &buffer)) { ++ printk(EEEPC_ERR "Hotkey initialization failed\n"); ++ return -ENODEV; ++ } else { ++ printk(EEEPC_NOTICE "Hotkey init flags 0x%x\n", ++ init_flag); ++ } ++ /* get control methods supported */ ++ if (!read_acpi_int(ehotk->handle, "CMSG" ++ , &ehotk->cm_supported)) { ++ printk(EEEPC_ERR ++ "Get control methods supported failed\n"); ++ return -ENODEV; ++ } else { ++ printk(EEEPC_INFO ++ "Get control methods supported: 0x%x\n", ++ ehotk->cm_supported); ++ } ++ ehotk->cm_supported |= (0x1 << CM_ASL_LID); ++ } else { ++ printk(EEEPC_ERR "Hotkey device not present, aborting\n"); ++ return -EINVAL; ++ } ++ return 0; ++} ++ ++static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data) ++{ ++ if (!ehotk) ++ return; ++ /* if DISABLE_ASL_WLAN is set, the notify code for fn+f2 ++ will always be 0x10 */ ++ if (event == NOTIFY_WLAN_ON && (DISABLE_ASL_WLAN & init_flag)) { ++ int value; ++ if (ehotk->cm_supported & (0x1 << CM_ASL_WLAN)) { ++ const char *method = cm_getv[CM_ASL_WLAN]; ++ if (!read_acpi_int(ehotk->handle, method, &value)) ++ printk(EEEPC_WARNING "Error reading %s\n", ++ method); ++ else if (value == 1) ++ event = 0x11; ++ } ++ } ++ acpi_bus_generate_proc_event(ehotk->device, event, ++ ehotk->event_count[event % 128]++); ++} ++ ++static int ehotk_found; ++ ++static int eeepc_hotk_add(struct acpi_device *device) ++{ ++ acpi_status status = AE_OK; ++ int result; ++ ++ if (!device) ++ return -EINVAL; ++ printk(EEEPC_NOTICE EEEPC_HOTK_NAME "\n"); ++ ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL); ++ if (!ehotk) ++ return -ENOMEM; ++ ehotk->handle = device->handle; ++ strcpy(acpi_device_name(device), EEEPC_HOTK_DEVICE_NAME); ++ strcpy(acpi_device_class(device), EEEPC_HOTK_CLASS); ++ acpi_driver_data(device) = ehotk; ++ ehotk->device = device; ++ result = eeepc_hotk_check(); ++ if (result) ++ goto end; ++ dev_attr_init.show = NULL; ++ dev_attr_init.store = real_store_init; ++ status = acpi_install_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY, ++ eeepc_hotk_notify, ehotk); ++ if (ACPI_FAILURE(status)) ++ printk(EEEPC_ERR "Error installing notify handler\n"); ++ ehotk_found = 1; ++ end: ++ if (result) ++ kfree(ehotk); ++ return result; ++} ++ ++static int eeepc_hotk_remove(struct acpi_device *device, int type) ++{ ++ acpi_status status = 0; ++ ++ if (!device || !acpi_driver_data(device)) ++ return -EINVAL; ++ status = acpi_remove_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY, ++ eeepc_hotk_notify); ++ if (ACPI_FAILURE(status)) ++ printk(EEEPC_ERR "Error removing notify handler\n"); ++ kfree(ehotk); ++ return 0; ++} ++ ++static struct platform_driver platform_driver = { ++ .driver = { ++ .name = EEEPC_HOTK_FILE, ++ .owner = THIS_MODULE, ++ } ++}; ++ ++static struct platform_device *platform_device; ++ ++static void __exit eeepc_hotk_exit(void) ++{ ++ acpi_bus_unregister_driver(&eeepc_hotk_driver); ++ sysfs_remove_group(&platform_device->dev.kobj, ++ &platform_attribute_group); ++ platform_device_unregister(platform_device); ++ platform_driver_unregister(&platform_driver); ++} ++ ++static int __init eeepc_hotk_init(void) ++{ ++ struct device *dev; ++ int result; ++ ++ if (acpi_disabled) ++ return -ENODEV; ++ init_flag = DISABLE_ASL_WLAN | DISABLE_ASL_DISPLAYSWITCH; ++ result = acpi_bus_register_driver(&eeepc_hotk_driver); ++ if (result < 0) ++ return result; ++ if (!ehotk_found) { ++ acpi_bus_unregister_driver(&eeepc_hotk_driver); ++ return -ENODEV; ++ } ++ dev = acpi_get_physical_device(ehotk->device->handle); ++ /* Register platform stuff */ ++ result = platform_driver_register(&platform_driver); ++ if (result) ++ goto fail_platform_driver; ++ platform_device = platform_device_alloc(EEEPC_HOTK_FILE, -1); ++ if (!platform_device) { ++ result = -ENOMEM; ++ goto fail_platform_device1; ++ } ++ result = platform_device_add(platform_device); ++ if (result) ++ goto fail_platform_device2; ++ result = sysfs_create_group(&platform_device->dev.kobj, ++ &platform_attribute_group); ++ if (result) ++ goto fail_sysfs; ++ return 0; ++ fail_sysfs: ++ platform_device_del(platform_device); ++ fail_platform_device2: ++ platform_device_put(platform_device); ++ fail_platform_device1: ++ platform_driver_unregister(&platform_driver); ++ fail_platform_driver: ++ return result; ++} ++ ++module_init(eeepc_hotk_init); ++module_exit(eeepc_hotk_exit); linux-2.6-at76.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 linux-2.6-at76.patch Index: linux-2.6-at76.patch =================================================================== RCS file: linux-2.6-at76.patch diff -N linux-2.6-at76.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-at76.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,3933 @@ +commit e141a848e24724c2d5534ff8152b0be4fe1b6f62 +Author: Pavel Roskin +Date: Fri Feb 22 00:01:07 2008 -0500 + + at76_usb: make the driver depend on MAC80211 + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 4891e7cb744d9e00dfe714c2827abcd32a02e405 +Author: Pavel Roskin +Date: Fri Feb 22 00:01:01 2008 -0500 + + at76_usb: reindent, reorder initializers for readability + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit a5d909eecd7c57843395780d7bc3e9655093bd5e +Author: Pavel Roskin +Date: Fri Feb 22 00:00:55 2008 -0500 + + at76_usb: add more MODULE_AUTHOR entries + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit e5d8694e15d0f20a5a3999ca6697278df9a66ca7 +Author: Pavel Roskin +Date: Fri Feb 22 00:00:50 2008 -0500 + + at76_usb: remove unneeded code + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 781e1500cd246b9aeaa0fc7593f028d43c87dbc0 +Author: Pavel Roskin +Date: Fri Feb 22 00:00:44 2008 -0500 + + at76_usb: fix missing newlines in printk, improve some messages + + It's important to know which function failed. + + Signed-off-by: Pavel Roskin + Signed-off-by: John W. Linville + +commit 4083ec919a7353cf7a9de6cf42aa13669b7e018e +Author: Kalle Valo +Date: Sun Feb 10 17:01:19 2008 +0200 + + at76_usb: Remove struct net_device + + This patch contains only code removal, no code has been modified. + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit bae74e67b58fc0ecf930fc1b5f485d536b1eea5a +Author: Kalle Valo +Date: Sun Feb 10 17:01:11 2008 +0200 + + at76_usb: Prepare for struct net_device removal + + Some cleanup to make it easier to remove the struct net_device. + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit e31a31b44489b3535fcf7b02871458186ed43aa7 +Author: Kalle Valo +Date: Sun Feb 10 17:01:04 2008 +0200 + + at76_usb: Allocate struct at76_priv using ieee80211_alloc_hw() + + This is for the preparation to remove struct net_device. + + Also netdev is not registered anymore so the legacy stack does not have + visible interface anymore. + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit 162d3ad6b55220940216d35dc1418e0c0ef9b98e +Author: Kalle Valo +Date: Sun Feb 10 17:00:56 2008 +0200 + + at76_usb: Use wiphy_name everywhere where needed + + This is for the preparation to remove struct net_device. + + Functions used by the legacy stack were not converted, because they will + removed anyway. + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit 779e36d16d4b79f30207da5d41d8cda9151f8e1f +Author: Kalle Valo +Date: Sun Feb 10 17:00:49 2008 +0200 + + at76_usb: Remove support the legacy stack + + Now the mac80211 interface will only work, the interface using the legacy + stack will be defunct. The legacy interface will removed in following + patches. + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit 0e5a456201237a135d5970b755ade55c18565033 +Author: Kalle Valo +Date: Sun Feb 10 17:00:41 2008 +0200 + + at76_usb: Add support for WEP + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit 88ba88d527a925f0b0a5162e64e026e33312648e +Author: Kalle Valo +Date: Sun Feb 10 17:00:34 2008 +0200 + + at76_usb: Add support for monitor mode + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit 798f4f8d71f221f0e74dbd1588ab6225c64efc45 +Author: Kalle Valo +Date: Sun Feb 10 17:00:26 2008 +0200 + + at76_usb: add mac80211 support + + This patch creates the basic facilities for using mac80211 while keeping + the old legacy stack alone. This add only adds new code, no old code is + changed. Both the legacy and mac80211 interfaces are created to make the + transition easier. The legacy interface will be removed with following + patches. + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit ee5141d10332561306a48b216a1ae1ddfe318805 +Author: Kalle Valo +Date: Sun Feb 10 17:00:19 2008 +0200 + + at76_usb: Add DBG_CMD for debugging firmware commands + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit 2009705e36ad0b50f0cdb0f9ef186f33057d17e8 +Author: Kalle Valo +Date: Sun Feb 10 17:00:11 2008 +0200 + + at76_usb: Convert DBG_TX levels to use at76_dbg_dump() + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit bd80e67cdc3286868f59cf809b63c5c021392fbd +Author: Kalle Valo +Date: Sun Feb 10 17:00:04 2008 +0200 + + at76_usb: Add at76_dbg_dump() macro + + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit c53a0aa28992ba7f212effec5e29be990848b54f +Author: Pavel Roskin +Date: Sun Feb 10 16:59:56 2008 +0200 + + at76_usb: Use net/mac80211.h instead of net/ieee80211.h + + Rename symbols as required. Use IEEE80211_MAX_FRAG_THRESHOLD as the + maximal packet size, which takes slightly more memory, but should be + safer. + + Copy some frame definitions from net/ieee80211.h to at76_usb.h. It's + done temporarily until mac80211 conversion is complete. + + Signed-off-by: Pavel Roskin + Signed-off-by: Kalle Valo + Signed-off-by: John W. Linville + +commit 38ec6fbd236318179e28c71bc1b3dc94166e4be2 +Author: Pavel Roskin +Date: Mon Feb 4 00:05:19 2008 -0500 + + at76_usb: Add ID for Uniden PCW100 + [...3540 lines suppressed...] ++ ++ at76_dbg(DBG_PROC_ENTRY, "%s: EXIT", __func__); ++} ++ ++static int at76_probe(struct usb_interface *interface, ++ const struct usb_device_id *id) ++{ ++ int ret; ++ struct at76_priv *priv; ++ struct fwentry *fwe; ++ struct usb_device *udev; ++ int op_mode; ++ int need_ext_fw = 0; ++ struct mib_fw_version fwv; ++ int board_type = (int)id->driver_info; ++ ++ udev = usb_get_dev(interface_to_usbdev(interface)); ++ ++ /* Load firmware into kernel memory */ ++ fwe = at76_load_firmware(udev, board_type); ++ if (!fwe) { ++ ret = -ENOENT; ++ goto error; ++ } ++ ++ op_mode = at76_get_op_mode(udev); ++ ++ at76_dbg(DBG_DEVSTART, "opmode %d", op_mode); ++ ++ /* we get OPMODE_NONE with 2.4.23, SMC2662W-AR ??? ++ we get 204 with 2.4.23, Fiberline FL-WL240u (505A+RFMD2958) ??? */ ++ ++ if (op_mode == OPMODE_HW_CONFIG_MODE) { ++ dev_printk(KERN_ERR, &interface->dev, ++ "cannot handle a device in HW_CONFIG_MODE\n"); ++ ret = -EBUSY; ++ goto error; ++ } ++ ++ if (op_mode != OPMODE_NORMAL_NIC_WITH_FLASH ++ && op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) { ++ /* download internal firmware part */ ++ dev_printk(KERN_DEBUG, &interface->dev, ++ "downloading internal firmware\n"); ++ ret = at76_load_internal_fw(udev, fwe); ++ if (ret < 0) { ++ dev_printk(KERN_ERR, &interface->dev, ++ "error %d downloading internal firmware\n", ++ ret); ++ goto error; ++ } ++ usb_put_dev(udev); ++ return ret; ++ } ++ ++ /* Internal firmware already inside the device. Get firmware ++ * version to test if external firmware is loaded. ++ * This works only for newer firmware, e.g. the Intersil 0.90.x ++ * says "control timeout on ep0in" and subsequent ++ * at76_get_op_mode() fail too :-( */ ++ ++ /* if version >= 0.100.x.y or device with built-in flash we can ++ * query the device for the fw version */ ++ if ((fwe->fw_version.major > 0 || fwe->fw_version.minor >= 100) ++ || (op_mode == OPMODE_NORMAL_NIC_WITH_FLASH)) { ++ ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv)); ++ if (ret < 0 || (fwv.major | fwv.minor) == 0) ++ need_ext_fw = 1; ++ } else ++ /* No way to check firmware version, reload to be sure */ ++ need_ext_fw = 1; ++ ++ if (need_ext_fw) { ++ dev_printk(KERN_DEBUG, &interface->dev, ++ "downloading external firmware\n"); ++ ++ ret = at76_load_external_fw(udev, fwe); ++ if (ret) ++ goto error; ++ ++ /* Re-check firmware version */ ++ ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv)); ++ if (ret < 0) { ++ dev_printk(KERN_ERR, &interface->dev, ++ "error %d getting firmware version\n", ret); ++ goto error; ++ } ++ } ++ ++ priv = at76_alloc_new_device(udev); ++ if (!priv) { ++ ret = -ENOMEM; ++ goto error; ++ } ++ ++ usb_set_intfdata(interface, priv); ++ ++ memcpy(&priv->fw_version, &fwv, sizeof(struct mib_fw_version)); ++ priv->board_type = board_type; ++ ++ ret = at76_init_new_device(priv, interface); ++ if (ret < 0) ++ at76_delete_device(priv); ++ ++ return ret; ++ ++error: ++ usb_put_dev(udev); ++ return ret; ++} ++ ++static void at76_disconnect(struct usb_interface *interface) ++{ ++ struct at76_priv *priv; ++ ++ priv = usb_get_intfdata(interface); ++ usb_set_intfdata(interface, NULL); ++ ++ /* Disconnect after loading internal firmware */ ++ if (!priv) ++ return; ++ ++ printk(KERN_INFO "%s: disconnecting\n", wiphy_name(priv->hw->wiphy)); ++ at76_delete_device(priv); ++ dev_printk(KERN_INFO, &interface->dev, "disconnected\n"); ++} ++ ++/* Structure for registering this driver with the USB subsystem */ ++static struct usb_driver at76_driver = { ++ .name = DRIVER_NAME, ++ .probe = at76_probe, ++ .disconnect = at76_disconnect, ++ .id_table = dev_table, ++}; ++ ++static int __init at76_mod_init(void) ++{ ++ int result; ++ ++ printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " loading\n"); ++ ++ mutex_init(&fw_mutex); ++ ++ /* register this driver with the USB subsystem */ ++ result = usb_register(&at76_driver); ++ if (result < 0) ++ printk(KERN_ERR DRIVER_NAME ++ ": usb_register failed (status %d)\n", result); ++ ++ led_trigger_register_simple("at76_usb-tx", &ledtrig_tx); ++ return result; ++} ++ ++static void __exit at76_mod_exit(void) ++{ ++ int i; ++ ++ printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " unloading\n"); ++ usb_deregister(&at76_driver); ++ for (i = 0; i < ARRAY_SIZE(firmwares); i++) { ++ if (firmwares[i].fw) ++ release_firmware(firmwares[i].fw); ++ } ++ led_trigger_unregister_simple(ledtrig_tx); ++} ++ ++module_param_named(debug, at76_debug, int, 0600); ++MODULE_PARM_DESC(debug, "Debugging level"); ++ ++module_init(at76_mod_init); ++module_exit(at76_mod_exit); ++ ++MODULE_AUTHOR("Oliver Kurth "); ++MODULE_AUTHOR("Joerg Albert "); ++MODULE_AUTHOR("Alex "); ++MODULE_AUTHOR("Nick Jones"); ++MODULE_AUTHOR("Balint Seeber "); ++MODULE_AUTHOR("Pavel Roskin "); ++MODULE_AUTHOR("Guido Guenther "); ++MODULE_AUTHOR("Kalle Valo "); ++MODULE_DESCRIPTION(DRIVER_DESC); ++MODULE_LICENSE("GPL"); +diff -up linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.24.noarch/drivers/net/wireless/Kconfig +--- linux-2.6.24.noarch/drivers/net/wireless/Kconfig.orig 2008-02-27 20:56:07.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/Kconfig 2008-02-27 20:56:23.000000000 -0500 +@@ -457,6 +457,14 @@ config PCMCIA_ATMEL + Enable support for PCMCIA cards containing the + Atmel at76c502 and at76c504 chips. + ++config USB_ATMEL ++ tristate "Atmel at76c503/at76c505/at76c505a USB cards" ++ depends on MAC80211 && WLAN_80211 && USB ++ select FW_LOADER ++ ---help--- ++ Enable support for USB Wireless devices using Atmel at76c503, ++ at76c505 or at76c505a chips. ++ + config AIRO_CS + tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards" + depends on PCMCIA && (BROKEN || !M32R) && WLAN_80211 linux-2.6-blkcipher-depend-on-chainiv.patch: Index: linux-2.6-blkcipher-depend-on-chainiv.patch =================================================================== RCS file: linux-2.6-blkcipher-depend-on-chainiv.patch diff -N linux-2.6-blkcipher-depend-on-chainiv.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-blkcipher-depend-on-chainiv.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,23 @@ +diff --git a/crypto/Makefile b/crypto/Makefile +index 48c7583..13b8cf8 100644 +--- a/crypto/Makefile ++++ b/crypto/Makefile +@@ -12,8 +12,8 @@ obj-$(CONFIG_CRYPTO_AEAD) += aead.o + + crypto_blkcipher-objs := ablkcipher.o + crypto_blkcipher-objs += blkcipher.o ++crypto_blkcipher-objs += chainiv.o + obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o +-obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o + obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.o + obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o + +diff --git a/crypto/chainiv.c b/crypto/chainiv.c +index d17fa04..170e436 100644 +--- a/crypto/chainiv.c ++++ b/crypto/chainiv.c +@@ -329,3 +329,4 @@ module_exit(chainiv_module_exit); + + MODULE_LICENSE("GPL"); + MODULE_DESCRIPTION("Chain IV Generator"); ++MODULE_ALIAS("chainiv"); linux-2.6-compile-fix-gcc-43.patch: Index: linux-2.6-compile-fix-gcc-43.patch =================================================================== RCS file: linux-2.6-compile-fix-gcc-43.patch diff -N linux-2.6-compile-fix-gcc-43.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-compile-fix-gcc-43.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,38 @@ +--- linux-2.6.24.noarch.orig/include/linux/time.h ++++ linux-2.6.24.noarch/include/linux/time.h +@@ -169,7 +169,7 @@ extern struct timeval ns_to_timeval(cons + * @a: pointer to timespec to be incremented + * @ns: unsigned nanoseconds value to be added + */ +-static inline void timespec_add_ns(struct timespec *a, u64 ns) ++static inline void timespec_add_ns(struct timespec *a, volatile u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -30,6 +30,15 @@ + + #define MODULE_NAME_LEN (64 - sizeof(unsigned long)) + ++/* On some platforms relocations to global data cannot go into read-only ++ * sections, so 'const' makes no sense and even causes compile failures ++ * with some compilers. */ ++#if defined(CONFIG_ALPHA) || defined(CONFIG_IA64) || defined(CONFIG_PPC64) ++#define __ksym_const ++#else ++#define __ksym_const const ++#endif ++ + struct kernel_symbol + { + unsigned long value; +@@ -192,7 +201,7 @@ void *__symbol_get_gpl(const char *symbol); + static const char __kstrtab_##sym[] \ + __attribute__((section("__ksymtab_strings"))) \ + = MODULE_SYMBOL_PREFIX #sym; \ +- static const struct kernel_symbol __ksymtab_##sym \ ++ static __ksym_const struct kernel_symbol __ksymtab_##sym \ + __used \ + __attribute__((section("__ksymtab" sec), unused)) \ + = { (unsigned long)&sym, __kstrtab_##sym } linux-2.6-compile-fixes.patch: Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: linux-2.6-compile-fixes.patch diff -N linux-2.6-compile-fixes.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-compile-fixes.patch 6 Mar 2008 13:59:25 -0000 1.4 @@ -0,0 +1,7 @@ +# +# Small compile fixes (For more involved fixes, please use a separate patch). +# +# Please add the errors from gcc before the diffs to save others having +# to do a compile to figure out what your diff is fixing. Thanks. +# + linux-2.6-debug-acpi-os-write-port.patch: Index: linux-2.6-debug-acpi-os-write-port.patch =================================================================== RCS file: linux-2.6-debug-acpi-os-write-port.patch diff -N linux-2.6-debug-acpi-os-write-port.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-debug-acpi-os-write-port.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,15 @@ +--- + drivers/acpi/osl.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- linux-2.6.22.noarch.orig/drivers/acpi/osl.c ++++ linux-2.6.22.noarch/drivers/acpi/osl.c +@@ -419,6 +419,8 @@ acpi_status acpi_os_write_port(acpi_io_a + *(u32 *) value = readl(virt_addr); + break; + default: ++ printk(KERN_ERR PREFIX ++ "writing %d bits to %p\n", (int)width, virt_addr); + BUG(); + } + linux-2.6-default-mmf_dump_elf_headers.patch: Index: linux-2.6-default-mmf_dump_elf_headers.patch =================================================================== RCS file: linux-2.6-default-mmf_dump_elf_headers.patch diff -N linux-2.6-default-mmf_dump_elf_headers.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-default-mmf_dump_elf_headers.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,12 @@ +--- linux-2.6/include/linux/sched.h ++++ linux-2.6/include/linux/sched.h +@@ -373,7 +373,8 @@ extern int get_dumpable(struct mm_struct + #define MMF_DUMP_FILTER_MASK \ + (((1 << MMF_DUMP_FILTER_BITS) - 1) << MMF_DUMP_FILTER_SHIFT) + #define MMF_DUMP_FILTER_DEFAULT \ +- ((1 << MMF_DUMP_ANON_PRIVATE) | (1 << MMF_DUMP_ANON_SHARED)) ++ ((1 << MMF_DUMP_ANON_PRIVATE) | (1 << MMF_DUMP_ANON_SHARED) | \ ++ (1 << MMF_DUMP_ELF_HEADERS)) + + struct sighand_struct { + atomic_t count; linux-2.6-drm-add-i915-radeon-mdt.patch: Index: linux-2.6-drm-add-i915-radeon-mdt.patch =================================================================== RCS file: linux-2.6-drm-add-i915-radeon-mdt.patch diff -N linux-2.6-drm-add-i915-radeon-mdt.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-drm-add-i915-radeon-mdt.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,26 @@ +diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c +index 0f9c1f1..1be5795 100644 +--- a/drivers/char/drm/i915_drv.c ++++ b/drivers/char/drm/i915_drv.c +@@ -37,6 +37,8 @@ + static struct pci_device_id pciidlist[] = { + i915_PCI_IDS + }; ++MODULE_DEVICE_TABLE(pci, pciidlist); ++ + static struct drm_fence_driver i915_fence_driver = { + .num_classes = 1, + .wrap_diff = (1U << (BREADCRUMB_BITS - 1)), +diff --git a/drivers/char/drm/radeon_drv.c b/drivers/char/drm/radeon_drv.c +index 349ac3d..1be40f5 100644 +--- a/drivers/char/drm/radeon_drv.c ++++ b/drivers/char/drm/radeon_drv.c +@@ -56,6 +56,8 @@ static struct pci_device_id pciidlist[] = { + radeon_PCI_IDS + }; + ++MODULE_DEVICE_TABLE(pci, pciidlist); ++ + static struct drm_driver driver = { + .driver_features = + DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | linux-2.6-drm-git-i915-remove-priv-access.patch: Index: linux-2.6-drm-git-i915-remove-priv-access.patch =================================================================== RCS file: linux-2.6-drm-git-i915-remove-priv-access.patch diff -N linux-2.6-drm-git-i915-remove-priv-access.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-drm-git-i915-remove-priv-access.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,24 @@ +diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c +index d2b7d3f..30ab367 100644 +--- a/drivers/char/drm/i915_dma.c ++++ b/drivers/char/drm/i915_dma.c +@@ -51,7 +51,7 @@ int i915_wait_ring(struct drm_device *dev, int n, const char *caller) + if (ring->space >= n) + return 0; + +- dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; ++ //dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; + + if (ring->head != last_head) + i = 0; +@@ -73,8 +73,8 @@ void i915_kernel_lost_context(struct drm_device *dev) + if (ring->space < 0) + ring->space += ring->Size; + +- if (ring->head == ring->tail) +- dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY; ++// if (ring->head == ring->tail) ++// dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY; + } + + static int i915_dma_cleanup(struct drm_device *dev) linux-2.6-drm-git-mm-revert-nopfn.patch: Index: linux-2.6-drm-git-mm-revert-nopfn.patch =================================================================== RCS file: linux-2.6-drm-git-mm-revert-nopfn.patch diff -N linux-2.6-drm-git-mm-revert-nopfn.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-drm-git-mm-revert-nopfn.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,117 @@ +commit 4825484968daa23b3a55446c5f40f4d35fb6ff21 +Author: Dave Airlie +Date: Mon Mar 3 13:29:52 2008 +1000 + + Revert "drm: reimplement nopfn callers with fault" + + This reverts commit ae0bdbd7e1d02e978323640256125f8a5391510a. + +diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c +index 6184b98..3cd0b1c 100644 +--- a/drivers/char/drm/drm_vm.c ++++ b/drivers/char/drm/drm_vm.c +@@ -679,8 +679,8 @@ EXPORT_SYMBOL(drm_mmap); + * \c Pagefault method for buffer objects. + * + * \param vma Virtual memory area. +- * \param vmf vm fault data +- * \return Error or VM_FAULT_NOPAGE: the pfn is manually inserted. ++ * \param address File offset. ++ * \return Error or refault. The pfn is manually inserted. + * + * It's important that pfns are inserted while holding the bo->mutex lock. + * otherwise we might race with unmap_mapping_range() which is always +@@ -692,7 +692,8 @@ EXPORT_SYMBOL(drm_mmap); + * protected by the bo->mutex lock. + */ + +-static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) ++static unsigned long drm_bo_vm_nopfn(struct vm_area_struct *vma, ++ unsigned long address) + { + struct drm_buffer_object *bo = (struct drm_buffer_object *) vma->vm_private_data; + unsigned long page_offset; +@@ -704,22 +705,25 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) + unsigned long bus_base; + unsigned long bus_offset; + unsigned long bus_size; +- unsigned long ret = VM_FAULT_NOPAGE; ++ unsigned long ret = NOPFN_REFAULT; ++ ++ if (address > vma->vm_end) ++ return NOPFN_SIGBUS; + + dev = bo->dev; + err = drm_bo_read_lock(&dev->bm.bm_lock); + if (err) +- return VM_FAULT_NOPAGE; ++ return NOPFN_REFAULT; + + err = mutex_lock_interruptible(&bo->mutex); + if (err) { + drm_bo_read_unlock(&dev->bm.bm_lock); +- return VM_FAULT_NOPAGE; ++ return NOPFN_REFAULT; + } + + err = drm_bo_wait(bo, 0, 0, 0); + if (err) { +- ret = (err != -EAGAIN) ? VM_FAULT_SIGBUS : VM_FAULT_NOPAGE; ++ ret = (err != -EAGAIN) ? NOPFN_SIGBUS : NOPFN_REFAULT; + goto out_unlock; + } + +@@ -734,7 +738,7 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) + DRM_BO_FLAG_FORCE_MAPPABLE; + err = drm_bo_move_buffer(bo, new_flags, 0, 0); + if (err) { +- ret = (err != -EAGAIN) ? VM_FAULT_SIGBUS : VM_FAULT_NOPAGE; ++ ret = (err != -EAGAIN) ? NOPFN_SIGBUS : NOPFN_REFAULT; + goto out_unlock; + } + } +@@ -743,12 +747,11 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) + &bus_size); + + if (err) { +- ret = VM_FAULT_SIGBUS; ++ ret = NOPFN_SIGBUS; + goto out_unlock; + } + +- /* XXX: vmf->pgoff may work here, but it adds on vma->vm_pgoff */ +- page_offset = ((unsigned long)vmf->virtual_address - vma->vm_start) >> PAGE_SHIFT; ++ page_offset = (address - vma->vm_start) >> PAGE_SHIFT; + + if (bus_size) { + struct drm_mem_type_manager *man = &dev->bm.man[bo->mem.mem_type]; +@@ -761,7 +764,7 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) + drm_ttm_fixup_caching(ttm); + page = drm_ttm_get_page(ttm, page_offset); + if (!page) { +- ret = VM_FAULT_OOM; ++ ret = NOPFN_OOM; + goto out_unlock; + } + pfn = page_to_pfn(page); +@@ -770,9 +773,9 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) + drm_io_prot(_DRM_TTM, vma); + } + +- err = vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn); ++ err = vm_insert_pfn(vma, address, pfn); + if (err) { +- ret = (err != -EAGAIN) ? VM_FAULT_OOM : VM_FAULT_NOPAGE; ++ ret = (err != -EAGAIN) ? NOPFN_OOM : NOPFN_REFAULT; + goto out_unlock; + } + out_unlock: +@@ -827,7 +830,7 @@ static void drm_bo_vm_close(struct vm_area_struct *vma) + } + + static struct vm_operations_struct drm_bo_vm_ops = { +- .fault = drm_bo_vm_fault, ++ .nopfn = drm_bo_vm_nopfn, + .open = drm_bo_vm_open, + .close = drm_bo_vm_close, + }; linux-2.6-drm-git-mm.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 linux-2.6-drm-git-mm.patch Index: linux-2.6-drm-git-mm.patch =================================================================== RCS file: linux-2.6-drm-git-mm.patch diff -N linux-2.6-drm-git-mm.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-drm-git-mm.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,11136 @@ +commit 9ad1ccf9cff8aa911d965c94b83187b50c459d43 +Author: Xiang, Haihao +Date: Fri Feb 29 12:07:01 2008 +1000 + + i915: i915_execbuffer ioctl32 routine, fix #13732 + + Signed-off-by: Dave Airlie + +commit aa0e20c041614319ff66a40c5f70a9f7eae01fbc +Author: Thomas Hellstrom +Date: Fri Feb 29 12:05:48 2008 +1000 + + drm/ttm: Add a compat kmap_atomic_prot_pfn to do quick kernel map / unmaps of PCI- or high memory. + + This is substantially more efficient than drm_bo_kmap, since the mapping only lives on a single processor. Unmapping is done use kunmap_atomic(). Flushes only a single tlb() entry. + + Add a support utility int drm_bo_pfn_prot() that returns the pfn and desired page protection for a given bo offset. + + This is all intended for relocations in bound TTMS or vram. Mapping-accessing-unmapping must be atomic, either using preempt_xx() macros or a spinlock. + + Signed-off-by: Dave Airlie + +commit 9c005b094ecada32e04e0b9ebdcfe3ab47fe86b7 +Author: Thomas Hellstrom +Date: Fri Feb 29 11:53:45 2008 +1000 + + drm/i915: relocation fixes. + + This fixes various problems in the relocations for i915. + + Signed-off-by: Dave Airlie + +commit 35c64f7d95512505400849241605d26b9a9801b4 +Author: Thomas Hellstrom +Date: Fri Feb 29 11:49:39 2008 +1000 + + drm/i915: Make the execbuffer code reasonably safe against errors. + + In particular -EAGAINs, which should be common during Xserver operation. + Also handle the fence creation failure case. + + Signed-off-by: Dave Airlie + +commit ae0806d80764d8ae63e74a5d7e3921a532d61d14 +Author: Thomas Hellstrom +Date: Fri Feb 29 11:41:36 2008 +1000 + + drm/fence: add a last queued sequence member + + Add an fence_class_manager::last_queued_sequence member, since a sequence number may actually turn up before the corresponding fence object has been queued on the ring. + + Fence drivers can use this member to determine whether a sequence number must be re-reported. + + Signed-off-by: Dave Airlie + +commit e3d3d4c7421a2277be24254524f56e17419c1449 +Author: Kristian H??gsberg +Date: Fri Feb 29 11:38:20 2008 +1000 + + drm/i915: remove leading underscores and fixup sarea + + the sarea fix came from Alan Hourihane + + Signed-off-by: Dave Airlie + +commit e1a98c2e5dd333becd47e188cf66093e1a86f41b +Author: Kristian H??gsberg +Date: Fri Feb 29 11:35:21 2008 +1000 + + drm/i915: Add a dri2 init path that gets the lock from the dri2 sarea. + + Signed-off-by: Dave Airlie + +commit 70a1de5ac59b59cb8f7c1d08ce455374785bca05 +Author: Kristian H??gsberg +Date: Fri Feb 29 11:31:08 2008 +1000 + + drm/i915: Only look up dev_priv->mmio_map if it's not already set up + + Signed-off-by: Dave Airlie + +commit 047243f9c142c599d1ab82991a5a0a8dd0170bb8 +Author: Kristian H??gsberg +Date: Fri Feb 29 11:30:26 2008 +1000 + + drm/i915: Add I915_PARAM_CHIPSET_ID param to get chipset ID. + + Signed-off-by: Dave Airlie + +commit b57dde526e116f14a5697b5c0d9697493baa2d5d +Author: Kristian H??gsberg +Date: Fri Feb 29 11:29:42 2008 +1000 + + drm/i915: Make sarea_priv setup optional. + + Signed-off-by: Dave Airlie + +commit 3cb77dd7f3974fc64de6ec3859c970b9b9ddd1fc +Author: Thomas Hellstrom +Date: Fri Feb 29 11:27:30 2008 +1000 + + drm/i915: Re-report breadcrumbs on poll to the fence manager, + + since a breadcrumb may actually turn up before a corresponding fence object + has been placed on the fence ring. + + Signed-off-by: Dave Airlie + +commit 0f066ed26802ff65965f7b29346cec98921c2b29 +Author: Thomas Hellstrom +Date: Fri Feb 29 11:02:23 2008 +1000 + + drm/i915: Avoid calling drm_fence_flush_old excessively. + + Signed-off-by: Dave Airlie + +commit e927ccfe2905d680b4217fc6af17c9c1ff86ebef +Author: Thomas Hellstrom +Date: Fri Feb 29 10:57:18 2008 +1000 + + drm/fence: differentiate between flushes and waiting types. + + Add a "command_stream_barrier" method to the bo driver. + + Signed-off-by: Dave Airlie + +commit ae0bdbd7e1d02e978323640256125f8a5391510a +Author: Nick Piggin +Date: Thu Feb 7 16:29:15 2008 +1000 + + drm: reimplement nopfn callers with fault + + Reimplement the existing nopfn handlers with ->fault so we can subsequently + remove nopfn + + Signed-off-by: Nick Piggin + Signed-off-by: Dave Airlie + +commit 29403da6adea71d155a4c3ad0923cd7c86f0bf9e +Author: Dave Airlie +Date: Thu Feb 7 16:21:57 2008 +1000 + + drm: remove tlb flush call as no longer needed. + + Signed-off-by: Dave Airlie + +commit b691c8da4038e0e01fb3beaa06bf21468c8dd0f0 +Author: Dave Airlie +Date: Fri Jan 25 11:36:39 2008 +1000 + + drm/i915: final i915 interface change - make reloc use copy from user + + Life is a lot simpler especially with relocation avoidance code, if we + simple store the relocations in a malloced buffer and copy from user + instead of bring up a BO everytime. + + Signed-off-by: Dave Airlie + +commit 222a41948d2a1f454c7f978f3c3f18dc25061216 +Author: Dave Airlie +Date: Fri Jan 25 11:05:59 2008 +1000 + + drm: whitespace and some label cleanups. + + Signed-off-by: Dave Airlie + +commit 046fd35ec86a5744b6a1073e47fd7fea1ab0c553 +Author: Kyle McMartin +Date: Thu Jan 24 16:48:24 2008 +1000 + + i915: fix invalid opcode exception on cpus without clflush + + i915_flush_ttm was unconditionally executing a clflush instruction + to (obviously) flush the cache. Instead, check if the cpu supports + clflush, and if not, fall back to calling wbinvd to flush the entire + cache. + + Signed-off-by: Kyle McMartin + Signed-off-by: Dave Airlie + +commit 9f32218d9b003af5206d9e0c280a2bcff19ee125 +Author: Eric Anholt +Date: Thu Jan 24 16:47:28 2008 +1000 + + drm: Add additional explanation of DRM_BO_FLAG_CACHED_MAPPED + + Signed-off-by: Dave Airlie + +commit 9149865182a2edf9e62ad290bbe93521f1c00372 +Author: Thomas Hellstrom +Date: Thu Jan 24 16:44:25 2008 +1000 + + drm/ttm: Properly propagate the user-space fence flags. [...10743 lines suppressed...] ++ if (dev_priv->irq_enabled && (--dev_priv->user_irq_refcount == 0)) { ++ /* dev_priv->irq_enable_reg &= ~USER_INT_FLAG; ++ I915_WRITE16(I915REG_INT_ENABLE_R, dev_priv->irq_enable_reg);*/ ++ } ++ spin_unlock(&dev_priv->user_irq_lock); ++} ++ ++ + static int i915_wait_irq(struct drm_device * dev, int irq_nr) + { + drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; +@@ -308,19 +411,24 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr) + + dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; + ++ i915_user_irq_on(dev_priv); + DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ, + READ_BREADCRUMB(dev_priv) >= irq_nr); ++ i915_user_irq_off(dev_priv); + + if (ret == -EBUSY) { + DRM_ERROR("EBUSY -- rec: %d emitted: %d\n", + READ_BREADCRUMB(dev_priv), (int)dev_priv->counter); + } + +- dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv); ++ if (dev_priv->sarea_priv) ++ dev_priv->sarea_priv->last_dispatch = ++ READ_BREADCRUMB(dev_priv); + return ret; + } + +-static int i915_driver_vblank_do_wait(struct drm_device *dev, unsigned int *sequence, ++static int i915_driver_vblank_do_wait(struct drm_device *dev, ++ unsigned int *sequence, + atomic_t *counter) + { + drm_i915_private_t *dev_priv = dev->dev_private; +@@ -397,15 +505,15 @@ int i915_irq_wait(struct drm_device *dev, void *data, + static void i915_enable_interrupt (struct drm_device *dev) + { + drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; +- u16 flag; + +- flag = 0; ++ dev_priv->irq_enable_reg = USER_INT_FLAG; + if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_A) +- flag |= VSYNC_PIPEA_FLAG; ++ dev_priv->irq_enable_reg |= VSYNC_PIPEA_FLAG; + if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B) +- flag |= VSYNC_PIPEB_FLAG; ++ dev_priv->irq_enable_reg |= VSYNC_PIPEB_FLAG; + +- I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | flag); ++ I915_WRITE16(I915REG_INT_ENABLE_R, dev_priv->irq_enable_reg); ++ dev_priv->irq_enabled = 1; + } + + /* Set the vblank monitor pipe +@@ -464,7 +572,7 @@ int i915_vblank_swap(struct drm_device *dev, void *data, + drm_i915_private_t *dev_priv = dev->dev_private; + drm_i915_vblank_swap_t *swap = data; + drm_i915_vbl_swap_t *vbl_swap; +- unsigned int pipe, seqtype, curseq; ++ unsigned int pipe, seqtype, curseq, plane; + unsigned long irqflags; + struct list_head *list; + +@@ -473,18 +581,20 @@ int i915_vblank_swap(struct drm_device *dev, void *data, + return -EINVAL; + } + +- if (dev_priv->sarea_priv->rotation) { ++ if (!dev_priv->sarea_priv || dev_priv->sarea_priv->rotation) { + DRM_DEBUG("Rotation not supported\n"); + return -EINVAL; + } + + if (swap->seqtype & ~(_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE | +- _DRM_VBLANK_SECONDARY | _DRM_VBLANK_NEXTONMISS)) { ++ _DRM_VBLANK_SECONDARY | _DRM_VBLANK_NEXTONMISS | ++ _DRM_VBLANK_FLIP)) { + DRM_ERROR("Invalid sequence type 0x%x\n", swap->seqtype); + return -EINVAL; + } + +- pipe = (swap->seqtype & _DRM_VBLANK_SECONDARY) ? 1 : 0; ++ plane = (swap->seqtype & _DRM_VBLANK_SECONDARY) ? 1 : 0; ++ pipe = i915_get_pipe(dev, plane); + + seqtype = swap->seqtype & (_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE); + +@@ -495,6 +605,11 @@ int i915_vblank_swap(struct drm_device *dev, void *data, + + spin_lock_irqsave(&dev->drw_lock, irqflags); + ++ /* It makes no sense to schedule a swap for a drawable that doesn't have ++ * valid information at this point. E.g. this could mean that the X ++ * server is too old to push drawable information to the DRM, in which ++ * case all such swaps would become ineffective. ++ */ + if (!drm_get_drawable_info(dev, swap->drawable)) { + spin_unlock_irqrestore(&dev->drw_lock, irqflags); + DRM_DEBUG("Invalid drawable ID %d\n", swap->drawable); +@@ -517,14 +632,43 @@ int i915_vblank_swap(struct drm_device *dev, void *data, + } + } + ++ if (swap->seqtype & _DRM_VBLANK_FLIP) { ++ swap->sequence--; ++ ++ if ((curseq - swap->sequence) <= (1<<23)) { ++ struct drm_drawable_info *drw; ++ ++ LOCK_TEST_WITH_RETURN(dev, file_priv); ++ ++ spin_lock_irqsave(&dev->drw_lock, irqflags); ++ ++ drw = drm_get_drawable_info(dev, swap->drawable); ++ ++ if (!drw) { ++ spin_unlock_irqrestore(&dev->drw_lock, ++ irqflags); ++ DRM_DEBUG("Invalid drawable ID %d\n", ++ swap->drawable); ++ return -EINVAL; ++ } ++ ++ i915_dispatch_vsync_flip(dev, drw, plane); ++ ++ spin_unlock_irqrestore(&dev->drw_lock, irqflags); ++ ++ return 0; ++ } ++ } ++ + spin_lock_irqsave(&dev_priv->swaps_lock, irqflags); + + list_for_each(list, &dev_priv->vbl_swaps.head) { + vbl_swap = list_entry(list, drm_i915_vbl_swap_t, head); + + if (vbl_swap->drw_id == swap->drawable && +- vbl_swap->pipe == pipe && ++ vbl_swap->plane == plane && + vbl_swap->sequence == swap->sequence) { ++ vbl_swap->flip = (swap->seqtype & _DRM_VBLANK_FLIP); + spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags); + DRM_DEBUG("Already scheduled\n"); + return 0; +@@ -548,8 +692,12 @@ int i915_vblank_swap(struct drm_device *dev, void *data, + DRM_DEBUG("\n"); + + vbl_swap->drw_id = swap->drawable; +- vbl_swap->pipe = pipe; ++ vbl_swap->plane = plane; + vbl_swap->sequence = swap->sequence; ++ vbl_swap->flip = (swap->seqtype & _DRM_VBLANK_FLIP); ++ ++ if (vbl_swap->flip) ++ swap->sequence++; + + spin_lock_irqsave(&dev_priv->swaps_lock, irqflags); + +@@ -567,7 +715,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev) + { + drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; + +- I915_WRITE16(I915REG_HWSTAM, 0xfffe); ++ I915_WRITE16(I915REG_HWSTAM, 0xeffe); + I915_WRITE16(I915REG_INT_MASK_R, 0x0); + I915_WRITE16(I915REG_INT_ENABLE_R, 0x0); + } +@@ -580,10 +728,17 @@ void i915_driver_irq_postinstall(struct drm_device * dev) + INIT_LIST_HEAD(&dev_priv->vbl_swaps.head); + dev_priv->swaps_pending = 0; + +- if (!dev_priv->vblank_pipe) +- dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A; ++ spin_lock_init(&dev_priv->user_irq_lock); ++ dev_priv->user_irq_refcount = 0; ++ + i915_enable_interrupt(dev); + DRM_INIT_WAITQUEUE(&dev_priv->irq_queue); ++ ++ /* ++ * Initialize the hardware status page IRQ location. ++ */ ++ ++ I915_WRITE(I915REG_INSTPM, (1 << 5) | (1 << 21)); + } + + void i915_driver_irq_uninstall(struct drm_device * dev) +@@ -594,6 +749,7 @@ void i915_driver_irq_uninstall(struct drm_device * dev) + if (!dev_priv) + return; + ++ dev_priv->irq_enabled = 0; + I915_WRITE16(I915REG_HWSTAM, 0xffff); + I915_WRITE16(I915REG_INT_MASK_R, 0xffff); + I915_WRITE16(I915REG_INT_ENABLE_R, 0x0); linux-2.6-e1000-corrupt-eeprom-checksum.patch: Index: linux-2.6-e1000-corrupt-eeprom-checksum.patch =================================================================== RCS file: linux-2.6-e1000-corrupt-eeprom-checksum.patch diff -N linux-2.6-e1000-corrupt-eeprom-checksum.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-e1000-corrupt-eeprom-checksum.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,25 @@ +diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c +index 7c5b05a..603150b 100644 +--- a/drivers/net/e1000/e1000_main.c ++++ b/drivers/net/e1000/e1000_main.c +@@ -258,6 +258,10 @@ static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE; + module_param(debug, int, 0); + MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); + ++static int eeprom_bad_csum_allow = 0; ++module_param(eeprom_bad_csum_allow, int, 0); ++MODULE_PARM_DESC(eeprom_bas_csum_allow, "Allow bad eeprom checksums"); ++ + /** + * e1000_init_module - Driver Registration Routine + * +@@ -1081,7 +1085,8 @@ e1000_probe(struct pci_dev *pdev, + * interface after manually setting a hw addr using + * `ip set address` + */ +- memset(adapter->hw.mac_addr, 0, netdev->addr_len); ++ if (!eeprom_bad_csum_allow) ++ memset(adapter->hw.mac_addr, 0, netdev->addr_len); + } else { + /* copy the MAC address out of the EEPROM */ + if (e1000_read_mac_addr(&adapter->hw)) linux-2.6-e1000-ich9.patch: Index: linux-2.6-e1000-ich9.patch =================================================================== RCS file: linux-2.6-e1000-ich9.patch diff -N linux-2.6-e1000-ich9.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-e1000-ich9.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,29 @@ +diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c +index 8f8139d..22c49ec 100644 +--- a/drivers/net/e1000e/ich8lan.c ++++ b/drivers/net/e1000e/ich8lan.c +@@ -209,6 +209,12 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw) + + /* Verify phy id */ + switch (phy->id) { ++ case 0x0: ++ if (hw->adapter->pdev->device == 0x10be) ++ hw_dbg(hw, "got 0 phy id, trying anyway"); ++ /* Fall through to IGP03E1000 case below */ ++ else ++ return -E1000_ERR_PHY; + case IGP03E1000_E_PHY_ID: + phy->type = e1000_phy_igp_3; + phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT; +diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c +index 3031d6d..932b4d8 100644 +--- a/drivers/net/e1000e/netdev.c ++++ b/drivers/net/e1000e/netdev.c +@@ -4095,6 +4095,7 @@ static struct pci_device_id e1000_pci_tbl[] = { + { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_G), board_ich9lan }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan }, ++ { PCI_VDEVICE(INTEL, 0x10be), board_ich9lan }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan }, + + { } /* terminate list */ linux-2.6-ext4-stable-queue.patch: Index: linux-2.6-ext4-stable-queue.patch =================================================================== RCS file: linux-2.6-ext4-stable-queue.patch diff -N linux-2.6-ext4-stable-queue.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-ext4-stable-queue.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,810 @@ +Index: linux-2.6.24.noarch/fs/ext4/dir.c +=================================================================== +--- linux-2.6.24.noarch.orig/fs/ext4/dir.c ++++ linux-2.6.24.noarch/fs/ext4/dir.c +@@ -46,7 +46,7 @@ const struct file_operations ext4_dir_op + #ifdef CONFIG_COMPAT + .compat_ioctl = ext4_compat_ioctl, + #endif +- .fsync = ext4_sync_file, /* BKL held */ ++ .fsync = ext4_sync_file, + .release = ext4_release_dir, + }; + +Index: linux-2.6.24.noarch/fs/ext4/inode.c +=================================================================== +--- linux-2.6.24.noarch.orig/fs/ext4/inode.c ++++ linux-2.6.24.noarch/fs/ext4/inode.c +@@ -403,6 +403,7 @@ static ext4_fsblk_t ext4_find_near(struc + __le32 *start = ind->bh ? (__le32*) ind->bh->b_data : ei->i_data; + __le32 *p; + ext4_fsblk_t bg_start; ++ ext4_fsblk_t last_block; + ext4_grpblk_t colour; + + /* Try to find previous block */ +@@ -420,8 +421,13 @@ static ext4_fsblk_t ext4_find_near(struc + * into the same cylinder group then. + */ + bg_start = ext4_group_first_block_no(inode->i_sb, ei->i_block_group); +- colour = (current->pid % 16) * ++ last_block = ext4_blocks_count(EXT4_SB(inode->i_sb)->s_es) - 1; ++ ++ if (bg_start + EXT4_BLOCKS_PER_GROUP(inode->i_sb) <= last_block) ++ colour = (current->pid % 16) * + (EXT4_BLOCKS_PER_GROUP(inode->i_sb) / 16); ++ else ++ colour = (current->pid % 16) * ((last_block - bg_start) / 16); + return bg_start + colour; + } + +@@ -768,7 +774,6 @@ err_out: + * + * `handle' can be NULL if create == 0. + * +- * The BKL may not be held on entry here. Be sure to take it early. + * return > 0, # of blocks mapped or allocated. + * return = 0, if plain lookup failed. + * return < 0, error case. +@@ -903,11 +908,34 @@ out: + */ + #define DIO_CREDITS 25 + ++ ++/* ++ * ext4 get_block() wrapper function ++ * It first do a look up, returns if the blocks already mapped. Otherwise ++ * it takes the write sem and do block allocation ++ * ++ * If file type is extents based, call with ext4_ext_get_blocks() ++ * Otherwise, call with ext4_get_blocks_handle() to handle indirect mapping ++ * based files ++ * ++ * return > 0, number of of blocks already mapped/allocated ++ * if create==0 and these are pre-allocated blocks ++ * buffer head is unmapped ++ * otherwise blocks are mapped ++ * ++ * return = 0, if plain look up failed (blocks have not been allocated) ++ * buffer head is unmapped ++ * ++ * return < 0, error case. ++ */ + int ext4_get_blocks_wrap(handle_t *handle, struct inode *inode, sector_t block, + unsigned long max_blocks, struct buffer_head *bh, + int create, int extend_disksize) + { + int retval; ++ ++ clear_buffer_mapped(bh); ++ + /* + * Try to see if we can get the block without requesting + * for new file system block. +@@ -921,12 +949,27 @@ int ext4_get_blocks_wrap(handle_t *handl + inode, block, max_blocks, bh, 0, 0); + } + up_read((&EXT4_I(inode)->i_data_sem)); +- if (!create || (retval > 0)) ++ ++ /* If it is only a block(s) look up */ ++ if (!create) ++ return retval; ++ ++ /* ++ * Returns if the blocks have already allocated ++ * ++ * Note that if blocks have been preallocated ++ * ext4_ext_get_block() returns with buffer head unmapped. ++ * Write to a preallocated space needs to split ++ * the preallocated extents, thus needs to update ++ * i_data ++ */ ++ if (retval > 0 && buffer_mapped(bh)) + return retval; + + /* +- * We need to allocate new blocks which will result +- * in i_data update ++ * New blocks and preallocation handling will possiblely result ++ * in i_data update, take the write sem, and call get_blocks() ++ * with create = 1 + */ + down_write((&EXT4_I(inode)->i_data_sem)); + /* +@@ -3461,3 +3504,9 @@ int ext4_change_inode_journal_flag(struc + + return err; + } ++ ++int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page) ++{ ++ return block_page_mkwrite(vma, page, ext4_get_block); ++} ++ +Index: linux-2.6.24.noarch/fs/ext4/extents.c +=================================================================== +--- linux-2.6.24.noarch.orig/fs/ext4/extents.c ++++ linux-2.6.24.noarch/fs/ext4/extents.c +@@ -148,6 +148,7 @@ static ext4_fsblk_t ext4_ext_find_goal(s + { + struct ext4_inode_info *ei = EXT4_I(inode); + ext4_fsblk_t bg_start; ++ ext4_fsblk_t last_block; + ext4_grpblk_t colour; + int depth; + +@@ -169,8 +170,13 @@ static ext4_fsblk_t ext4_ext_find_goal(s + /* OK. use inode's group */ + bg_start = (ei->i_block_group * EXT4_BLOCKS_PER_GROUP(inode->i_sb)) + + le32_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_first_data_block); +- colour = (current->pid % 16) * ++ last_block = ext4_blocks_count(EXT4_SB(inode->i_sb)->s_es) - 1; ++ ++ if (bg_start + EXT4_BLOCKS_PER_GROUP(inode->i_sb) <= last_block) ++ colour = (current->pid % 16) * + (EXT4_BLOCKS_PER_GROUP(inode->i_sb) / 16); ++ else ++ colour = (current->pid % 16) * ((last_block - bg_start) / 16); + return bg_start + colour + block; + } + +@@ -349,7 +355,7 @@ static void ext4_ext_show_leaf(struct in + #define ext4_ext_show_leaf(inode,path) + #endif + +-static void ext4_ext_drop_refs(struct ext4_ext_path *path) ++void ext4_ext_drop_refs(struct ext4_ext_path *path) + { + int depth = path->p_depth; + int i; +@@ -2168,6 +2174,10 @@ static int ext4_ext_convert_to_initializ + newblock = iblock - ee_block + ext_pblock(ex); + ex2 = ex; + ++ err = ext4_ext_get_access(handle, inode, path + depth); ++ if (err) ++ goto out; ++ + /* ex1: ee_block to iblock - 1 : uninitialized */ + if (iblock > ee_block) { + ex1 = ex; +@@ -2200,16 +2210,20 @@ static int ext4_ext_convert_to_initializ + newdepth = ext_depth(inode); + if (newdepth != depth) { + depth = newdepth; +- path = ext4_ext_find_extent(inode, iblock, NULL); ++ ext4_ext_drop_refs(path); ++ path = ext4_ext_find_extent(inode, iblock, path); + if (IS_ERR(path)) { + err = PTR_ERR(path); +- path = NULL; + goto out; + } + eh = path[depth].p_hdr; + ex = path[depth].p_ext; + if (ex2 != &newex) + ex2 = ex; ++ ++ err = ext4_ext_get_access(handle, inode, path + depth); ++ if (err) ++ goto out; + } + allocated = max_blocks; + } +@@ -2230,9 +2244,6 @@ static int ext4_ext_convert_to_initializ + ex2->ee_len = cpu_to_le16(allocated); + if (ex2 != ex) + goto insert; +- err = ext4_ext_get_access(handle, inode, path + depth); +- if (err) +- goto out; + /* + * New (initialized) extent starts from the first block + * in the current extent. i.e., ex2 == ex +@@ -2276,9 +2287,22 @@ out: + } + + /* ++ * Block allocation/map/preallocation routine for extents based files ++ * ++ * + * Need to be called with + * down_read(&EXT4_I(inode)->i_data_sem) if not allocating file system block + * (ie, create is zero). Otherwise down_write(&EXT4_I(inode)->i_data_sem) ++ * ++ * return > 0, number of of blocks already mapped/allocated ++ * if create == 0 and these are pre-allocated blocks ++ * buffer head is unmapped ++ * otherwise blocks are mapped ++ * ++ * return = 0, if plain look up failed (blocks have not been allocated) ++ * buffer head is unmapped ++ * ++ * return < 0, error case. + */ + int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, + ext4_lblk_t iblock, +@@ -2623,7 +2647,7 @@ long ext4_fallocate(struct inode *inode, + * modify 1 super block, 1 block bitmap and 1 group descriptor. + */ + credits = EXT4_DATA_TRANS_BLOCKS(inode->i_sb) + 3; +- down_write((&EXT4_I(inode)->i_data_sem)); ++ mutex_lock(&inode->i_mutex); + retry: + while (ret >= 0 && ret < max_blocks) { + block = block + ret; +@@ -2634,16 +2658,17 @@ retry: + break; + } + +- ret = ext4_ext_get_blocks(handle, inode, block, ++ ret = ext4_get_blocks_wrap(handle, inode, block, + max_blocks, &map_bh, + EXT4_CREATE_UNINITIALIZED_EXT, 0); +- WARN_ON(ret <= 0); + if (ret <= 0) { +- ext4_error(inode->i_sb, "ext4_fallocate", +- "ext4_ext_get_blocks returned error: " +- "inode#%lu, block=%u, max_blocks=%lu", ++#ifdef EXT4FS_DEBUG ++ WARN_ON(ret <= 0); ++ printk(KERN_ERR "%s: ext4_ext_get_blocks " ++ "returned error inode#%lu, block=%u, " ++ "max_blocks=%lu", __func__, + inode->i_ino, block, max_blocks); +- ret = -EIO; ++#endif + ext4_mark_inode_dirty(handle, inode); + ret2 = ext4_journal_stop(handle); + break; +@@ -2680,7 +2705,6 @@ retry: + if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries)) + goto retry; + +- up_write((&EXT4_I(inode)->i_data_sem)); + /* + * Time to update the file size. + * Update only when preallocation was requested beyond the file size. +@@ -2692,21 +2716,18 @@ retry: + * if no error, we assume preallocation succeeded + * completely + */ +- mutex_lock(&inode->i_mutex); + i_size_write(inode, offset + len); + EXT4_I(inode)->i_disksize = i_size_read(inode); +- mutex_unlock(&inode->i_mutex); + } else if (ret < 0 && nblocks) { + /* Handle partial allocation scenario */ + loff_t newsize; + +- mutex_lock(&inode->i_mutex); + newsize = (nblocks << blkbits) + i_size_read(inode); + i_size_write(inode, EXT4_BLOCK_ALIGN(newsize, blkbits)); + EXT4_I(inode)->i_disksize = i_size_read(inode); +- mutex_unlock(&inode->i_mutex); + } + } + ++ mutex_unlock(&inode->i_mutex); + return ret > 0 ? ret2 : ret; + } +Index: linux-2.6.24.noarch/fs/ext4/mballoc.c +=================================================================== +--- linux-2.6.24.noarch.orig/fs/ext4/mballoc.c ++++ linux-2.6.24.noarch/fs/ext4/mballoc.c +@@ -627,21 +627,19 @@ static ext4_fsblk_t ext4_grp_offs_to_blo + return block; + } + ++static inline void *mb_correct_addr_and_bit(int *bit, void *addr) ++{ + #if BITS_PER_LONG == 64 +-#define mb_correct_addr_and_bit(bit, addr) \ +-{ \ +- bit += ((unsigned long) addr & 7UL) << 3; \ +- addr = (void *) ((unsigned long) addr & ~7UL); \ +-} ++ *bit += ((unsigned long) addr & 7UL) << 3; ++ addr = (void *) ((unsigned long) addr & ~7UL); + #elif BITS_PER_LONG == 32 +-#define mb_correct_addr_and_bit(bit, addr) \ +-{ \ +- bit += ((unsigned long) addr & 3UL) << 3; \ +- addr = (void *) ((unsigned long) addr & ~3UL); \ +-} ++ *bit += ((unsigned long) addr & 3UL) << 3; ++ addr = (void *) ((unsigned long) addr & ~3UL); + #else + #error "how many bits you are?!" + #endif ++ return addr; ++} + + static inline int mb_test_bit(int bit, void *addr) + { +@@ -649,34 +647,54 @@ static inline int mb_test_bit(int bit, v + * ext4_test_bit on architecture like powerpc + * needs unsigned long aligned address + */ +- mb_correct_addr_and_bit(bit, addr); ++ addr = mb_correct_addr_and_bit(&bit, addr); + return ext4_test_bit(bit, addr); + } + + static inline void mb_set_bit(int bit, void *addr) + { +- mb_correct_addr_and_bit(bit, addr); ++ addr = mb_correct_addr_and_bit(&bit, addr); + ext4_set_bit(bit, addr); + } + + static inline void mb_set_bit_atomic(spinlock_t *lock, int bit, void *addr) + { +- mb_correct_addr_and_bit(bit, addr); ++ addr = mb_correct_addr_and_bit(&bit, addr); + ext4_set_bit_atomic(lock, bit, addr); + } + + static inline void mb_clear_bit(int bit, void *addr) + { +- mb_correct_addr_and_bit(bit, addr); ++ addr = mb_correct_addr_and_bit(&bit, addr); + ext4_clear_bit(bit, addr); + } + + static inline void mb_clear_bit_atomic(spinlock_t *lock, int bit, void *addr) + { +- mb_correct_addr_and_bit(bit, addr); ++ addr = mb_correct_addr_and_bit(&bit, addr); + ext4_clear_bit_atomic(lock, bit, addr); + } + ++static inline int mb_find_next_zero_bit(void *addr, int max, int start) ++{ ++ int fix = 0; ++ addr = mb_correct_addr_and_bit(&fix, addr); ++ max += fix; ++ start += fix; ++ ++ return ext4_find_next_zero_bit(addr, max, start) - fix; ++} ++ ++static inline int mb_find_next_bit(void *addr, int max, int start) ++{ ++ int fix = 0; ++ addr = mb_correct_addr_and_bit(&fix, addr); ++ max += fix; ++ start += fix; ++ ++ return ext4_find_next_bit(addr, max, start) - fix; ++} ++ + static void *mb_find_buddy(struct ext4_buddy *e4b, int order, int *max) + { + char *bb; +@@ -906,7 +924,7 @@ static void ext4_mb_mark_free_simple(str + unsigned short chunk; + unsigned short border; + +- BUG_ON(len >= EXT4_BLOCKS_PER_GROUP(sb)); ++ BUG_ON(len > EXT4_BLOCKS_PER_GROUP(sb)); + + border = 2 << sb->s_blocksize_bits; + +@@ -946,12 +964,12 @@ static void ext4_mb_generate_buddy(struc + + /* initialize buddy from bitmap which is aggregation + * of on-disk bitmap and preallocations */ +- i = ext4_find_next_zero_bit(bitmap, max, 0); ++ i = mb_find_next_zero_bit(bitmap, max, 0); + grp->bb_first_free = i; + while (i < max) { + fragments++; + first = i; +- i = ext4_find_next_bit(bitmap, max, i); ++ i = mb_find_next_bit(bitmap, max, i); + len = i - first; + free += len; + if (len > 1) +@@ -959,7 +977,7 @@ static void ext4_mb_generate_buddy(struc + else + grp->bb_counters[0]++; + if (i < max) +- i = ext4_find_next_zero_bit(bitmap, max, i); ++ i = mb_find_next_zero_bit(bitmap, max, i); + } + grp->bb_fragments = fragments; + +@@ -967,6 +985,10 @@ static void ext4_mb_generate_buddy(struc + ext4_error(sb, __FUNCTION__, + "EXT4-fs: group %lu: %u blocks in bitmap, %u in gd\n", + group, free, grp->bb_free); ++ /* ++ * If we intent to continue, we consider group descritor ++ * corrupt and update bb_free using bitmap value ++ */ + grp->bb_free = free; + } + +@@ -1146,8 +1168,9 @@ out: + return err; + } + +-static int ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group, +- struct ext4_buddy *e4b) ++static noinline int ++ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group, ++ struct ext4_buddy *e4b) + { + struct ext4_sb_info *sbi = EXT4_SB(sb); + struct inode *inode = sbi->s_buddy_cache; +@@ -1778,7 +1801,7 @@ static void ext4_mb_simple_scan_group(st + buddy = mb_find_buddy(e4b, i, &max); + BUG_ON(buddy == NULL); + +- k = ext4_find_next_zero_bit(buddy, max, 0); ++ k = mb_find_next_zero_bit(buddy, max, 0); + BUG_ON(k >= max); + + ac->ac_found++; +@@ -1818,11 +1841,11 @@ static void ext4_mb_complex_scan_group(s + i = e4b->bd_info->bb_first_free; + + while (free && ac->ac_status == AC_STATUS_CONTINUE) { +- i = ext4_find_next_zero_bit(bitmap, ++ i = mb_find_next_zero_bit(bitmap, + EXT4_BLOCKS_PER_GROUP(sb), i); + if (i >= EXT4_BLOCKS_PER_GROUP(sb)) { + /* +- * IF we corrupt the bitmap we won't find any ++ * IF we have corrupt bitmap, we won't find any + * free blocks even though group info says we + * we have free blocks + */ +@@ -1838,6 +1861,12 @@ static void ext4_mb_complex_scan_group(s + ext4_error(sb, __FUNCTION__, "%d free blocks as per " + "group info. But got %d blocks\n", + free, ex.fe_len); ++ /* ++ * The number of free blocks differs. This mostly ++ * indicate that the bitmap is corrupt. So exit ++ * without claiming the space. ++ */ ++ break; + } + + ext4_mb_measure_extent(ac, &ex, e4b); +@@ -1937,7 +1966,8 @@ static int ext4_mb_good_group(struct ext + return 0; + } + +-static int ext4_mb_regular_allocator(struct ext4_allocation_context *ac) ++static noinline int ++ext4_mb_regular_allocator(struct ext4_allocation_context *ac) + { + ext4_group_t group; + ext4_group_t i; +@@ -2444,7 +2474,7 @@ static void ext4_mb_history_init(struct + /* if we can't allocate history, then we simple won't use it */ + } + +-static void ext4_mb_store_history(struct ext4_allocation_context *ac) ++static noinline void ext4_mb_store_history(struct ext4_allocation_context *ac) + { + struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); + struct ext4_mb_history h; +@@ -2780,7 +2810,7 @@ int ext4_mb_release(struct super_block * + return 0; + } + +-static void ext4_mb_free_committed_blocks(struct super_block *sb) ++static noinline void ext4_mb_free_committed_blocks(struct super_block *sb) + { + struct ext4_sb_info *sbi = EXT4_SB(sb); + int err; +@@ -3001,7 +3031,8 @@ void exit_ext4_mballoc(void) + * Check quota and mark choosed space (ac->ac_b_ex) non-free in bitmaps + * Returns 0 if success or error code + */ +-static int ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, ++static noinline int ++ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, + handle_t *handle) + { + struct buffer_head *bitmap_bh = NULL; +@@ -3118,7 +3149,8 @@ static void ext4_mb_normalize_group_requ + * Normalization means making request better in terms of + * size and alignment + */ +-static void ext4_mb_normalize_request(struct ext4_allocation_context *ac, ++static noinline void ++ext4_mb_normalize_request(struct ext4_allocation_context *ac, + struct ext4_allocation_request *ar) + { + int bsbits, max; +@@ -3384,7 +3416,7 @@ static void ext4_mb_use_group_pa(struct + /* + * search goal blocks in preallocated space + */ +-static int ext4_mb_use_preallocated(struct ext4_allocation_context *ac) ++static noinline int ext4_mb_use_preallocated(struct ext4_allocation_context *ac) + { + struct ext4_inode_info *ei = EXT4_I(ac->ac_inode); + struct ext4_locality_group *lg; +@@ -3551,7 +3583,7 @@ static void ext4_mb_put_pa(struct ext4_a + /* + * creates new preallocated space for given inode + */ +-static int ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) ++static noinline int ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) + { + struct super_block *sb = ac->ac_sb; + struct ext4_prealloc_space *pa; +@@ -3638,7 +3670,7 @@ static int ext4_mb_new_inode_pa(struct e + /* + * creates new preallocated space for locality group inodes belongs to + */ +-static int ext4_mb_new_group_pa(struct ext4_allocation_context *ac) ++static noinline int ext4_mb_new_group_pa(struct ext4_allocation_context *ac) + { + struct super_block *sb = ac->ac_sb; + struct ext4_locality_group *lg; +@@ -3711,7 +3743,7 @@ static int ext4_mb_new_preallocation(str + * the caller MUST hold group/inode locks. + * TODO: optimize the case when there are no in-core structures yet + */ +-static int ext4_mb_release_inode_pa(struct ext4_buddy *e4b, ++static noinline int ext4_mb_release_inode_pa(struct ext4_buddy *e4b, + struct buffer_head *bitmap_bh, + struct ext4_prealloc_space *pa) + { +@@ -3740,10 +3772,10 @@ static int ext4_mb_release_inode_pa(stru + } + + while (bit < end) { +- bit = ext4_find_next_zero_bit(bitmap_bh->b_data, end, bit); ++ bit = mb_find_next_zero_bit(bitmap_bh->b_data, end, bit); + if (bit >= end) + break; +- next = ext4_find_next_bit(bitmap_bh->b_data, end, bit); ++ next = mb_find_next_bit(bitmap_bh->b_data, end, bit); + if (next > end) + next = end; + start = group * EXT4_BLOCKS_PER_GROUP(sb) + bit + +@@ -3771,6 +3803,10 @@ static int ext4_mb_release_inode_pa(stru + (unsigned long) pa->pa_len); + ext4_error(sb, __FUNCTION__, "free %u, pa_free %u\n", + free, pa->pa_free); ++ /* ++ * pa is already deleted so we use the value obtained ++ * from the bitmap and continue. ++ */ + } + atomic_add(free, &sbi->s_mb_discarded); + if (ac) +@@ -3779,7 +3815,7 @@ static int ext4_mb_release_inode_pa(stru + return err; + } + +-static int ext4_mb_release_group_pa(struct ext4_buddy *e4b, ++static noinline int ext4_mb_release_group_pa(struct ext4_buddy *e4b, + struct ext4_prealloc_space *pa) + { + struct ext4_allocation_context *ac; +@@ -3821,7 +3857,7 @@ static int ext4_mb_release_group_pa(stru + * - how many do we discard + * 1) how many requested + */ +-static int ext4_mb_discard_group_preallocations(struct super_block *sb, ++static noinline int ext4_mb_discard_group_preallocations(struct super_block *sb, + ext4_group_t group, int needed) + { + struct ext4_group_info *grp = ext4_get_group_info(sb, group); +@@ -4143,7 +4179,8 @@ static void ext4_mb_group_or_file(struct + mutex_lock(&ac->ac_lg->lg_mutex); + } + +-static int ext4_mb_initialize_context(struct ext4_allocation_context *ac, ++static noinline int ++ext4_mb_initialize_context(struct ext4_allocation_context *ac, + struct ext4_allocation_request *ar) + { + struct super_block *sb = ar->inode->i_sb; +@@ -4374,7 +4411,8 @@ static void ext4_mb_poll_new_transaction + ext4_mb_free_committed_blocks(sb); + } + +-static int ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b, ++static noinline int ++ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b, + ext4_group_t group, ext4_grpblk_t block, int count) + { + struct ext4_group_info *db = e4b->bd_info; +Index: linux-2.6.24.noarch/fs/ext4/namei.c +=================================================================== +--- linux-2.6.24.noarch.orig/fs/ext4/namei.c ++++ linux-2.6.24.noarch/fs/ext4/namei.c +@@ -1804,12 +1804,8 @@ retry: + inode->i_fop = &ext4_dir_operations; + inode->i_size = EXT4_I(inode)->i_disksize = inode->i_sb->s_blocksize; + dir_block = ext4_bread (handle, inode, 0, 1, &err); +- if (!dir_block) { +- ext4_dec_count(handle, inode); /* is this nlink == 0? */ +- ext4_mark_inode_dirty(handle, inode); +- iput (inode); +- goto out_stop; +- } ++ if (!dir_block) ++ goto out_clear_inode; + BUFFER_TRACE(dir_block, "get_write_access"); + ext4_journal_get_write_access(handle, dir_block); + de = (struct ext4_dir_entry_2 *) dir_block->b_data; +@@ -1832,7 +1828,8 @@ retry: + ext4_mark_inode_dirty(handle, inode); + err = ext4_add_entry (handle, dentry, inode); + if (err) { +- inode->i_nlink = 0; ++out_clear_inode: ++ clear_nlink(inode); + ext4_mark_inode_dirty(handle, inode); + iput (inode); + goto out_stop; +@@ -2164,7 +2161,7 @@ static int ext4_unlink(struct inode * di + dir->i_ctime = dir->i_mtime = ext4_current_time(dir); + ext4_update_dx_flag(dir); + ext4_mark_inode_dirty(handle, dir); +- ext4_dec_count(handle, inode); ++ drop_nlink(inode); + if (!inode->i_nlink) + ext4_orphan_add(handle, inode); + inode->i_ctime = ext4_current_time(inode); +@@ -2214,7 +2211,7 @@ retry: + err = __page_symlink(inode, symname, l, + mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS); + if (err) { +- ext4_dec_count(handle, inode); ++ clear_nlink(inode); + ext4_mark_inode_dirty(handle, inode); + iput (inode); + goto out_stop; +@@ -2223,7 +2220,6 @@ retry: + inode->i_op = &ext4_fast_symlink_inode_operations; + memcpy((char*)&EXT4_I(inode)->i_data,symname,l); + inode->i_size = l-1; +- EXT4_I(inode)->i_flags &= ~EXT4_EXTENTS_FL; + } + EXT4_I(inode)->i_disksize = inode->i_size; + err = ext4_add_nondir(handle, dentry, inode); +@@ -2407,7 +2403,7 @@ static int ext4_rename (struct inode * o + ext4_dec_count(handle, old_dir); + if (new_inode) { + /* checked empty_dir above, can't have another parent, +- * ext3_dec_count() won't work for many-linked dirs */ ++ * ext4_dec_count() won't work for many-linked dirs */ + new_inode->i_nlink = 0; + } else { + ext4_inc_count(handle, new_dir); +Index: linux-2.6.24.noarch/fs/ext4/migrate.c +=================================================================== +--- linux-2.6.24.noarch.orig/fs/ext4/migrate.c ++++ linux-2.6.24.noarch/fs/ext4/migrate.c +@@ -43,6 +43,7 @@ static int finish_range(handle_t *handle + + if (IS_ERR(path)) { + retval = PTR_ERR(path); ++ path = NULL; + goto err_out; + } + +@@ -74,6 +75,10 @@ static int finish_range(handle_t *handle + } + retval = ext4_ext_insert_extent(handle, inode, path, &newext); + err_out: ++ if (path) { ++ ext4_ext_drop_refs(path); ++ kfree(path); ++ } + lb->first_pblock = 0; + return retval; + } +Index: linux-2.6.24.noarch/include/linux/ext4_fs_extents.h +=================================================================== +--- linux-2.6.24.noarch.orig/include/linux/ext4_fs_extents.h ++++ linux-2.6.24.noarch/include/linux/ext4_fs_extents.h +@@ -227,5 +227,6 @@ extern int ext4_ext_search_left(struct i + ext4_lblk_t *, ext4_fsblk_t *); + extern int ext4_ext_search_right(struct inode *, struct ext4_ext_path *, + ext4_lblk_t *, ext4_fsblk_t *); ++extern void ext4_ext_drop_refs(struct ext4_ext_path *); + #endif /* _LINUX_EXT4_EXTENTS */ + +Index: linux-2.6.24.noarch/fs/ext4/file.c +=================================================================== +--- linux-2.6.24.noarch.orig/fs/ext4/file.c ++++ linux-2.6.24.noarch/fs/ext4/file.c +@@ -123,6 +123,23 @@ force_commit: + return ret; + } + ++static struct vm_operations_struct ext4_file_vm_ops = { ++ .fault = filemap_fault, ++ .page_mkwrite = ext4_page_mkwrite, ++}; ++ ++static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma) ++{ ++ struct address_space *mapping = file->f_mapping; ++ ++ if (!mapping->a_ops->readpage) ++ return -ENOEXEC; ++ file_accessed(file); ++ vma->vm_ops = &ext4_file_vm_ops; ++ vma->vm_flags |= VM_CAN_NONLINEAR; ++ return 0; ++} ++ + const struct file_operations ext4_file_operations = { + .llseek = generic_file_llseek, + .read = do_sync_read, +@@ -133,7 +150,7 @@ const struct file_operations ext4_file_o + #ifdef CONFIG_COMPAT + .compat_ioctl = ext4_compat_ioctl, + #endif +- .mmap = generic_file_mmap, ++ .mmap = ext4_file_mmap, + .open = generic_file_open, + .release = ext4_release_file, + .fsync = ext4_sync_file, +Index: linux-2.6.24.noarch/include/linux/ext4_fs.h +=================================================================== +--- linux-2.6.24.noarch.orig/include/linux/ext4_fs.h ++++ linux-2.6.24.noarch/include/linux/ext4_fs.h +@@ -1047,6 +1047,7 @@ extern void ext4_set_aops(struct inode * + extern int ext4_writepage_trans_blocks(struct inode *); + extern int ext4_block_truncate_page(handle_t *handle, struct page *page, + struct address_space *mapping, loff_t from); ++extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page); + + /* ioctl.c */ + extern int ext4_ioctl (struct inode *, struct file *, unsigned int, +Index: linux-2.6.24.noarch/fs/ext4/ialloc.c +=================================================================== +--- linux-2.6.24.noarch.orig/fs/ext4/ialloc.c ++++ linux-2.6.24.noarch/fs/ext4/ialloc.c +@@ -702,7 +702,12 @@ got: + ei->i_dir_start_lookup = 0; + ei->i_disksize = 0; + +- ei->i_flags = EXT4_I(dir)->i_flags & ~EXT4_INDEX_FL; ++ /* ++ * Don't inherit extent flag from directory. We set extent flag on ++ * newly created directory and file only if -o extent mount option is ++ * specified ++ */ ++ ei->i_flags = EXT4_I(dir)->i_flags & ~(EXT4_INDEX_FL|EXT4_EXTENTS_FL); + if (S_ISLNK(mode)) + ei->i_flags &= ~(EXT4_IMMUTABLE_FL|EXT4_APPEND_FL); + /* dirsync only applies to directories */ +@@ -745,12 +750,15 @@ got: + goto fail_free_drop; + } + if (test_opt(sb, EXTENTS)) { +- EXT4_I(inode)->i_flags |= EXT4_EXTENTS_FL; +- ext4_ext_tree_init(handle, inode); +- err = ext4_update_incompat_feature(handle, sb, +- EXT4_FEATURE_INCOMPAT_EXTENTS); +- if (err) +- goto fail; ++ /* set extent flag only for diretory and file */ ++ if (S_ISDIR(mode) || S_ISREG(mode)) { ++ EXT4_I(inode)->i_flags |= EXT4_EXTENTS_FL; ++ ext4_ext_tree_init(handle, inode); ++ err = ext4_update_incompat_feature(handle, sb, ++ EXT4_FEATURE_INCOMPAT_EXTENTS); ++ if (err) ++ goto fail; ++ } + } + + ext4_debug("allocating inode %lu\n", inode->i_ino); linux-2.6-firewire-git-pending.patch: Index: linux-2.6-firewire-git-pending.patch =================================================================== RCS file: linux-2.6-firewire-git-pending.patch diff -N linux-2.6-firewire-git-pending.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-firewire-git-pending.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,487 @@ +# +# Patches under review and/or pending inclusion in the linux1394-git +# tree, which we think we're going to want... +# + +read_bus_info_block() is repeatedly called by workqueue jobs. +These will step on each others toes eventually if there are multiple +workqueue threads, and we end up with corrupt config ROM images. + +Signed-off-by: Stefan Richter +--- + drivers/firewire/fw-device.c | 41 +++++++++++++++++++++++------------ + 1 file changed, 27 insertions(+), 14 deletions(-) + +Index: linux/drivers/firewire/fw-device.c +=================================================================== +--- linux.orig/drivers/firewire/fw-device.c ++++ linux/drivers/firewire/fw-device.c +@@ -400,6 +400,9 @@ read_rom(struct fw_device *device, int g + return callback_data.rcode; + } + ++#define READ_BIB_ROM_SIZE 256 ++#define READ_BIB_STACK_SIZE 16 ++ + /* + * Read the bus info block, perform a speed probe, and read all of the rest of + * the config ROM. We do all this with a cached bus generation. If the bus +@@ -409,16 +412,23 @@ read_rom(struct fw_device *device, int g + */ + static int read_bus_info_block(struct fw_device *device, int generation) + { +- static u32 rom[256]; +- u32 stack[16], sp, key; +- int i, end, length; ++ u32 *rom, *stack; ++ u32 sp, key; ++ int i, end, length, ret = -1; ++ ++ rom = kmalloc(sizeof(*rom) * READ_BIB_ROM_SIZE + ++ sizeof(*stack) * READ_BIB_STACK_SIZE, GFP_KERNEL); ++ if (rom == NULL) ++ return -ENOMEM; ++ ++ stack = &rom[READ_BIB_ROM_SIZE]; + + device->max_speed = SCODE_100; + + /* First read the bus info block. */ + for (i = 0; i < 5; i++) { + if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE) +- return -1; ++ goto out; + /* + * As per IEEE1212 7.2, during power-up, devices can + * reply with a 0 for the first quadlet of the config +@@ -428,7 +438,7 @@ static int read_bus_info_block(struct fw + * retry mechanism will try again later. + */ + if (i == 0 && rom[i] == 0) +- return -1; ++ goto out; + } + + device->max_speed = device->node->max_speed; +@@ -478,26 +488,26 @@ static int read_bus_info_block(struct fw + */ + key = stack[--sp]; + i = key & 0xffffff; +- if (i >= ARRAY_SIZE(rom)) ++ if (i >= READ_BIB_ROM_SIZE) + /* + * The reference points outside the standard + * config rom area, something's fishy. + */ +- return -1; ++ goto out; + + /* Read header quadlet for the block to get the length. */ + if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE) +- return -1; ++ goto out; + end = i + (rom[i] >> 16) + 1; + i++; +- if (end > ARRAY_SIZE(rom)) ++ if (end > READ_BIB_ROM_SIZE) + /* + * This block extends outside standard config + * area (and the array we're reading it + * into). That's broken, so ignore this + * device. + */ +- return -1; ++ goto out; + + /* + * Now read in the block. If this is a directory +@@ -507,9 +517,9 @@ static int read_bus_info_block(struct fw + while (i < end) { + if (read_rom(device, generation, i, &rom[i]) != + RCODE_COMPLETE) +- return -1; ++ goto out; + if ((key >> 30) == 3 && (rom[i] >> 30) > 1 && +- sp < ARRAY_SIZE(stack)) ++ sp < READ_BIB_STACK_SIZE) + stack[sp++] = i + rom[i]; + i++; + } +@@ -519,11 +529,14 @@ static int read_bus_info_block(struct fw + + device->config_rom = kmalloc(length * 4, GFP_KERNEL); + if (device->config_rom == NULL) +- return -1; ++ goto out; + memcpy(device->config_rom, rom, length * 4); + device->config_rom_length = length; ++ ret = 0; ++ out: ++ kfree(rom); + +- return 0; ++ return ret; + } + + static void fw_unit_release(struct device *dev) + +-- +Stefan Richter +-=====-==--- --== ---=- +http://arcgraph.de/sr/ + + +When a device changes its configuration ROM, it announces this with a +bus reset. firewire-core has to check which node initiated a bus reset +and whether any unit directories went away or were added on this node. + +Tested with an IOI FWB-IDE01AB which has its link-on bit set if bus +power is available but does not respond to ROM read requests if self +power is off. This implements + - recognition of the units if self power is switched on after fw-core + gave up the initial attempt to read the config ROM, + - shutdown of the units when self power is switched off. + +Also tested with a second PC running Linux/ieee1394. When the eth1394 +driver is inserted and removed on that node, fw-core now notices the +addition and removal of the IPv4 unit on the ieee1394 node. + +Signed-off-by: Stefan Richter +--- + +Applies after "firewire: replace static ROM cache by allocated cache". + + drivers/firewire/fw-cdev.c | 18 ++-- + drivers/firewire/fw-device.c | 147 ++++++++++++++++++++++++++++++--- + drivers/firewire/fw-topology.c | 3 + drivers/firewire/fw-topology.h | 11 +- + 4 files changed, 158 insertions(+), 21 deletions(-) + +Index: linux/drivers/firewire/fw-cdev.c +=================================================================== +--- linux.orig/drivers/firewire/fw-cdev.c ++++ linux/drivers/firewire/fw-cdev.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include "fw-transaction.h" +@@ -269,20 +270,25 @@ static int ioctl_get_info(struct client + { + struct fw_cdev_get_info *get_info = buffer; + struct fw_cdev_event_bus_reset bus_reset; ++ struct fw_device *device = client->device; ++ unsigned long ret = 0; + + client->version = get_info->version; + get_info->version = FW_CDEV_VERSION; + ++ down(&device->device.sem); + if (get_info->rom != 0) { + void __user *uptr = u64_to_uptr(get_info->rom); + size_t want = get_info->rom_length; +- size_t have = client->device->config_rom_length * 4; ++ size_t have; + +- if (copy_to_user(uptr, client->device->config_rom, +- min(want, have))) +- return -EFAULT; ++ have = device->config_rom_length * 4; ++ ret = copy_to_user(uptr, device->config_rom, min(want, have)); + } +- get_info->rom_length = client->device->config_rom_length * 4; ++ get_info->rom_length = device->config_rom_length * 4; ++ up(&device->device.sem); ++ if (ret != 0) ++ return -EFAULT; + + client->bus_reset_closure = get_info->bus_reset_closure; + if (get_info->bus_reset != 0) { +@@ -293,7 +299,7 @@ static int ioctl_get_info(struct client + return -EFAULT; + } + +- get_info->card = client->device->card->index; ++ get_info->card = device->card->index; + + return 0; + } +Index: linux/drivers/firewire/fw-device.c +=================================================================== +--- linux.orig/drivers/firewire/fw-device.c ++++ linux/drivers/firewire/fw-device.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -160,9 +161,9 @@ static void fw_device_release(struct dev + * Take the card lock so we don't set this to NULL while a + * FW_NODE_UPDATED callback is being handled. + */ +- spin_lock_irqsave(&device->card->lock, flags); ++ spin_lock_irqsave(&card->lock, flags); + device->node->data = NULL; +- spin_unlock_irqrestore(&device->card->lock, flags); ++ spin_unlock_irqrestore(&card->lock, flags); + + fw_node_put(device->node); + kfree(device->config_rom); +@@ -337,10 +338,14 @@ static ssize_t + config_rom_show(struct device *dev, struct device_attribute *attr, char *buf) + { + struct fw_device *device = fw_device(dev); ++ size_t length; + +- memcpy(buf, device->config_rom, device->config_rom_length * 4); ++ down(&dev->sem); ++ length = device->config_rom_length * 4; ++ memcpy(buf, device->config_rom, length); ++ up(&dev->sem); + +- return device->config_rom_length * 4; ++ return length; + } + + static ssize_t +@@ -412,7 +417,7 @@ read_rom(struct fw_device *device, int g + */ + static int read_bus_info_block(struct fw_device *device, int generation) + { +- u32 *rom, *stack; ++ u32 *rom, *stack, *old_rom, *new_rom; + u32 sp, key; + int i, end, length, ret = -1; + +@@ -527,11 +532,18 @@ static int read_bus_info_block(struct fw + length = i; + } + +- device->config_rom = kmalloc(length * 4, GFP_KERNEL); +- if (device->config_rom == NULL) ++ old_rom = device->config_rom; ++ new_rom = kmemdup(rom, length * 4, GFP_KERNEL); ++ if (new_rom == NULL) + goto out; +- memcpy(device->config_rom, rom, length * 4); ++ ++ /* serialize with readers via sysfs or ioctl */ ++ down(&device->device.sem); ++ device->config_rom = new_rom; + device->config_rom_length = length; ++ up(&device->device.sem); ++ ++ kfree(old_rom); + ret = 0; + out: + kfree(rom); +@@ -724,7 +736,7 @@ static void fw_device_init(struct work_s + if (atomic_cmpxchg(&device->state, + FW_DEVICE_INITIALIZING, + FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) { +- fw_device_shutdown(&device->work.work); ++ fw_device_shutdown(work); + } else { + if (device->config_rom_retries) + fw_notify("created device %s: GUID %08x%08x, S%d00, " +@@ -738,6 +750,7 @@ static void fw_device_init(struct work_s + device->device.bus_id, + device->config_rom[3], device->config_rom[4], + 1 << device->max_speed); ++ device->config_rom_retries = 0; + } + + /* +@@ -784,6 +797,104 @@ static void fw_device_update(struct work + device_for_each_child(&device->device, NULL, update_unit); + } + ++enum { ++ REREAD_BIB_ERROR, ++ REREAD_BIB_GONE, ++ REREAD_BIB_UNCHANGED, ++ REREAD_BIB_CHANGED, ++}; ++ ++/* Reread and compare bus info block and header of root directory */ ++static int reread_bus_info_block(struct fw_device *device, int generation) ++{ ++ u32 q; ++ int i; ++ ++ for (i = 0; i < 6; i++) { ++ if (read_rom(device, generation, i, &q) != RCODE_COMPLETE) ++ return REREAD_BIB_ERROR; ++ ++ if (i == 0 && q == 0) ++ return REREAD_BIB_GONE; ++ ++ if (i > device->config_rom_length || q != device->config_rom[i]) ++ return REREAD_BIB_CHANGED; ++ } ++ ++ return REREAD_BIB_UNCHANGED; ++} ++ ++static void fw_device_refresh(struct work_struct *work) ++{ ++ struct fw_device *device = ++ container_of(work, struct fw_device, work.work); ++ struct fw_card *card = device->card; ++ int node_id = device->node_id; ++ ++ switch (reread_bus_info_block(device, device->generation)) { ++ case REREAD_BIB_ERROR: ++ if (device->config_rom_retries < MAX_RETRIES / 2 && ++ atomic_read(&device->state) == FW_DEVICE_INITIALIZING) { ++ device->config_rom_retries++; ++ schedule_delayed_work(&device->work, RETRY_DELAY / 2); ++ ++ return; ++ } ++ goto give_up; ++ ++ case REREAD_BIB_GONE: ++ goto gone; ++ ++ case REREAD_BIB_UNCHANGED: ++ if (atomic_cmpxchg(&device->state, ++ FW_DEVICE_INITIALIZING, ++ FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) ++ goto gone; ++ ++ fw_device_update(work); ++ device->config_rom_retries = 0; ++ ++ return; ++ } ++ ++ /* ++ * Something changed. We keep things simple and don't investigate ++ * further. We just destroy all previous units and create new ones. ++ */ ++ device_for_each_child(&device->device, NULL, shutdown_unit); ++ ++ if (read_bus_info_block(device, device->generation) < 0) { ++ if (device->config_rom_retries < MAX_RETRIES && ++ atomic_read(&device->state) == FW_DEVICE_INITIALIZING) { ++ device->config_rom_retries++; ++ schedule_delayed_work(&device->work, RETRY_DELAY); ++ ++ return; ++ } ++ goto give_up; ++ } ++ ++ create_units(device); ++ ++ if (atomic_cmpxchg(&device->state, ++ FW_DEVICE_INITIALIZING, ++ FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) ++ goto gone; ++ ++ fw_notify("refreshed device %s\n", device->device.bus_id); ++ device->config_rom_retries = 0; ++ goto out; ++ ++ give_up: ++ fw_notify("giving up on refresh of device %s\n", device->device.bus_id); ++ gone: ++ atomic_set(&device->state, FW_DEVICE_SHUTDOWN); ++ fw_device_shutdown(work); ++ out: ++ if (node_id == card->root_node->node_id) ++ schedule_delayed_work(&card->work, 0); ++} ++ + void fw_node_event(struct fw_card *card, struct fw_node *node, int event) + { + struct fw_device *device; +@@ -793,7 +904,7 @@ void fw_node_event(struct fw_card *card, + case FW_NODE_LINK_ON: + if (!node->link_on) + break; +- ++ create: + device = kzalloc(sizeof(*device), GFP_ATOMIC); + if (device == NULL) + break; +@@ -832,6 +943,22 @@ void fw_node_event(struct fw_card *card, + schedule_delayed_work(&device->work, INITIAL_DELAY); + break; + ++ case FW_NODE_INITIATED_RESET: ++ device = node->data; ++ if (device == NULL) ++ goto create; ++ ++ device->node_id = node->node_id; ++ smp_wmb(); /* update node_id before generation */ ++ device->generation = card->generation; ++ if (atomic_cmpxchg(&device->state, ++ FW_DEVICE_RUNNING, ++ FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) { ++ PREPARE_DELAYED_WORK(&device->work, fw_device_refresh); ++ schedule_delayed_work(&device->work, INITIAL_DELAY); ++ } ++ break; ++ + case FW_NODE_UPDATED: + if (!node->link_on || node->data == NULL) + break; +Index: linux/drivers/firewire/fw-topology.c +=================================================================== +--- linux.orig/drivers/firewire/fw-topology.c ++++ linux/drivers/firewire/fw-topology.c +@@ -107,6 +107,7 @@ static struct fw_node *fw_node_create(u3 + node->node_id = LOCAL_BUS | SELF_ID_PHY_ID(sid); + node->link_on = SELF_ID_LINK_ON(sid); + node->phy_speed = SELF_ID_PHY_SPEED(sid); ++ node->initiated_reset = SELF_ID_PHY_INITIATOR(sid); + node->port_count = port_count; + + atomic_set(&node->ref_count, 1); +@@ -430,6 +431,8 @@ update_tree(struct fw_card *card, struct + event = FW_NODE_LINK_OFF; + else if (!node0->link_on && node1->link_on) + event = FW_NODE_LINK_ON; ++ else if (node1->initiated_reset && node1->link_on) ++ event = FW_NODE_INITIATED_RESET; + else + event = FW_NODE_UPDATED; + +Index: linux/drivers/firewire/fw-topology.h +=================================================================== +--- linux.orig/drivers/firewire/fw-topology.h ++++ linux/drivers/firewire/fw-topology.h +@@ -20,11 +20,12 @@ + #define __fw_topology_h + + enum { +- FW_NODE_CREATED = 0x00, +- FW_NODE_UPDATED = 0x01, +- FW_NODE_DESTROYED = 0x02, +- FW_NODE_LINK_ON = 0x03, +- FW_NODE_LINK_OFF = 0x04, ++ FW_NODE_CREATED, ++ FW_NODE_UPDATED, ++ FW_NODE_DESTROYED, ++ FW_NODE_LINK_ON, ++ FW_NODE_LINK_OFF, ++ FW_NODE_INITIATED_RESET, + }; + + struct fw_node { + +-- +Stefan Richter +-=====-==--- --== ---== +http://arcgraph.de/sr/ + + linux-2.6-firewire-git-update.patch: Index: linux-2.6-firewire-git-update.patch =================================================================== RCS file: linux-2.6-firewire-git-update.patch diff -N linux-2.6-firewire-git-update.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-firewire-git-update.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,1147 @@ +git diff in linux1394-git tree vs. 2.6.25-rc3-git4, 03/03/2008 + + Documentation/debugging-via-ohci1394.txt | 13 ++- + drivers/firewire/fw-card.c | 38 ---------- + drivers/firewire/fw-device.h | 27 ++++--- + drivers/firewire/fw-ohci.c | 114 +++++++++++++++++++++------- + drivers/firewire/fw-sbp2.c | 120 ++++++++++++------------------ + drivers/firewire/fw-transaction.c | 2 +- + drivers/firewire/fw-transaction.h | 10 +-- + drivers/ieee1394/csr.c | 6 +- + drivers/ieee1394/dv1394.c | 3 +- + drivers/ieee1394/nodemgr.c | 6 +- + drivers/ieee1394/ohci1394.c | 109 ++++++++++++--------------- + drivers/ieee1394/raw1394.c | 1 - + drivers/ieee1394/sbp2.c | 7 +- + drivers/ieee1394/video1394.c | 3 +- + lib/Kconfig.debug | 10 +++ + 15 files changed, 233 insertions(+), 236 deletions(-) + +diff --git a/Documentation/debugging-via-ohci1394.txt b/Documentation/debugging-via-ohci1394.txt +index c360d4e..371ba27 100644 +--- a/Documentation/debugging-via-ohci1394.txt ++++ b/Documentation/debugging-via-ohci1394.txt +@@ -41,11 +41,14 @@ to a working state and enables physical DMA by default for all remote nodes. + This can be turned off by ohci1394's module parameter phys_dma=0. + + The alternative firewire-ohci driver in drivers/firewire uses filtered physical +-DMA, hence is not yet suitable for remote debugging. +- +-Because ohci1394 depends on the PCI enumeration to be completed, an +-initialization routine which runs pretty early (long before console_init() +-which makes the printk buffer appear on the console can be called) was written. ++DMA by default, which is more secure but not suitable for remote debugging. ++Compile the driver with CONFIG_FIREWIRE_OHCI_REMOTE_DMA to get unfiltered ++physical DMA. ++ ++Because ohci1394 and firewire-ohci depend on the PCI enumeration to be ++completed, an initialization routine which runs pretty early has been ++implemented for x86. This routine runs long before console_init() can be ++called, i.e. before the printk buffer appears on the console. + + To activate it, enable CONFIG_PROVIDE_OHCI1394_DMA_INIT (Kernel hacking menu: + Provide code for enabling DMA over FireWire early on boot) and pass the +diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c +index a034627..140b34d 100644 +--- a/drivers/firewire/fw-card.c ++++ b/drivers/firewire/fw-card.c +@@ -398,7 +398,6 @@ fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver, + { + static atomic_t index = ATOMIC_INIT(-1); + +- kref_init(&card->kref); + atomic_set(&card->device_count, 0); + card->index = atomic_inc_return(&index); + card->driver = driver; +@@ -429,12 +428,6 @@ fw_card_add(struct fw_card *card, + card->link_speed = link_speed; + card->guid = guid; + +- /* +- * The subsystem grabs a reference when the card is added and +- * drops it when the driver calls fw_core_remove_card. +- */ +- fw_card_get(card); +- + mutex_lock(&card_mutex); + config_rom = generate_config_rom(card, &length); + list_add_tail(&card->link, &card_list); +@@ -540,40 +533,9 @@ fw_core_remove_card(struct fw_card *card) + cancel_delayed_work_sync(&card->work); + fw_flush_transactions(card); + del_timer_sync(&card->flush_timer); +- +- fw_card_put(card); + } + EXPORT_SYMBOL(fw_core_remove_card); + +-struct fw_card * +-fw_card_get(struct fw_card *card) +-{ +- kref_get(&card->kref); +- +- return card; +-} +-EXPORT_SYMBOL(fw_card_get); +- +-static void +-release_card(struct kref *kref) +-{ +- struct fw_card *card = container_of(kref, struct fw_card, kref); +- +- kfree(card); +-} +- +-/* +- * An assumption for fw_card_put() is that the card driver allocates +- * the fw_card struct with kalloc and that it has been shut down +- * before the last ref is dropped. +- */ +-void +-fw_card_put(struct fw_card *card) +-{ +- kref_put(&card->kref, release_card); +-} +-EXPORT_SYMBOL(fw_card_put); +- + int + fw_core_initiate_bus_reset(struct fw_card *card, int short_reset) + { +diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h +index 78ecd39..0d771fd 100644 +--- a/drivers/firewire/fw-device.h ++++ b/drivers/firewire/fw-device.h +@@ -64,28 +64,24 @@ struct fw_device { + struct fw_attribute_group attribute_group; + }; + +-static inline struct fw_device * +-fw_device(struct device *dev) ++static inline struct fw_device *fw_device(struct device *dev) + { + return container_of(dev, struct fw_device, device); + } + +-static inline int +-fw_device_is_shutdown(struct fw_device *device) ++static inline int fw_device_is_shutdown(struct fw_device *device) + { + return atomic_read(&device->state) == FW_DEVICE_SHUTDOWN; + } + +-static inline struct fw_device * +-fw_device_get(struct fw_device *device) ++static inline struct fw_device *fw_device_get(struct fw_device *device) + { + get_device(&device->device); + + return device; + } + +-static inline void +-fw_device_put(struct fw_device *device) ++static inline void fw_device_put(struct fw_device *device) + { + put_device(&device->device); + } +@@ -104,12 +100,23 @@ struct fw_unit { + struct fw_attribute_group attribute_group; + }; + +-static inline struct fw_unit * +-fw_unit(struct device *dev) ++static inline struct fw_unit *fw_unit(struct device *dev) + { + return container_of(dev, struct fw_unit, device); + } + ++static inline struct fw_unit *fw_unit_get(struct fw_unit *unit) ++{ ++ get_device(&unit->device); ++ ++ return unit; ++} ++ ++static inline void fw_unit_put(struct fw_unit *unit) ++{ ++ put_device(&unit->device); ++} ++ + #define CSR_OFFSET 0x40 + #define CSR_LEAF 0x80 + #define CSR_DIRECTORY 0xc0 +diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c +index 7ebad3c..28ea78c 100644 +--- a/drivers/firewire/fw-ohci.c ++++ b/drivers/firewire/fw-ohci.c +@@ -33,6 +33,10 @@ + #include + #include + ++#ifdef CONFIG_PPC_PMAC ++#include ++#endif ++ + #include "fw-ohci.h" + #include "fw-transaction.h" + +@@ -175,6 +179,7 @@ struct fw_ohci { + int generation; + int request_generation; + u32 bus_seconds; ++ bool old_uninorth; + + /* + * Spinlock for accessing fw_ohci data. Never call out of +@@ -311,15 +316,22 @@ static int ar_context_add_page(struct ar_context *ctx) + return 0; + } + ++#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32) ++#define cond_le32_to_cpu(v) \ ++ (ohci->old_uninorth ? (__force __u32)(v) : le32_to_cpu(v)) ++#else ++#define cond_le32_to_cpu(v) le32_to_cpu(v) ++#endif ++ + static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + { + struct fw_ohci *ohci = ctx->ohci; + struct fw_packet p; + u32 status, length, tcode; + +- p.header[0] = le32_to_cpu(buffer[0]); +- p.header[1] = le32_to_cpu(buffer[1]); +- p.header[2] = le32_to_cpu(buffer[2]); ++ p.header[0] = cond_le32_to_cpu(buffer[0]); ++ p.header[1] = cond_le32_to_cpu(buffer[1]); ++ p.header[2] = cond_le32_to_cpu(buffer[2]); + + tcode = (p.header[0] >> 4) & 0x0f; + switch (tcode) { +@@ -331,7 +343,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + break; + + case TCODE_READ_BLOCK_REQUEST : +- p.header[3] = le32_to_cpu(buffer[3]); ++ p.header[3] = cond_le32_to_cpu(buffer[3]); + p.header_length = 16; + p.payload_length = 0; + break; +@@ -340,7 +352,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + case TCODE_READ_BLOCK_RESPONSE: + case TCODE_LOCK_REQUEST: + case TCODE_LOCK_RESPONSE: +- p.header[3] = le32_to_cpu(buffer[3]); ++ p.header[3] = cond_le32_to_cpu(buffer[3]); + p.header_length = 16; + p.payload_length = p.header[3] >> 16; + break; +@@ -357,7 +369,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + + /* FIXME: What to do about evt_* errors? */ + length = (p.header_length + p.payload_length + 3) / 4; +- status = le32_to_cpu(buffer[length]); ++ status = cond_le32_to_cpu(buffer[length]); + + p.ack = ((status >> 16) & 0x1f) - 16; + p.speed = (status >> 21) & 0x7; +@@ -375,7 +387,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) + */ + + if (p.ack + 16 == 0x09) +- ohci->request_generation = (buffer[2] >> 16) & 0xff; ++ ohci->request_generation = (p.header[2] >> 16) & 0xff; + else if (ctx == &ohci->ar_request_ctx) + fw_core_handle_request(&ohci->card, &p); + else +@@ -532,7 +544,7 @@ static int + context_add_buffer(struct context *ctx) + { + struct descriptor_buffer *desc; +- dma_addr_t bus_addr; ++ dma_addr_t uninitialized_var(bus_addr); + int offset; + + /* +@@ -1022,13 +1034,14 @@ static void bus_reset_tasklet(unsigned long data) + */ + + self_id_count = (reg_read(ohci, OHCI1394_SelfIDCount) >> 3) & 0x3ff; +- generation = (le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff; ++ generation = (cond_le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff; + rmb(); + + for (i = 1, j = 0; j < self_id_count; i += 2, j++) { + if (ohci->self_id_cpu[i] != ~ohci->self_id_cpu[i + 1]) + fw_error("inconsistent self IDs\n"); +- ohci->self_id_buffer[j] = le32_to_cpu(ohci->self_id_cpu[i]); ++ ohci->self_id_buffer[j] = ++ cond_le32_to_cpu(ohci->self_id_cpu[i]); + } + rmb(); + +@@ -1091,6 +1104,11 @@ static void bus_reset_tasklet(unsigned long data) + reg_write(ohci, OHCI1394_ConfigROMhdr, ohci->next_header); + } + ++#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA ++ reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0); ++ reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0); ++#endif ++ + spin_unlock_irqrestore(&ohci->lock, flags); + + if (free_rom) +@@ -1316,7 +1334,7 @@ ohci_set_config_rom(struct fw_card *card, u32 *config_rom, size_t length) + unsigned long flags; + int retval = -EBUSY; + __be32 *next_config_rom; +- dma_addr_t next_config_rom_bus; ++ dma_addr_t uninitialized_var(next_config_rom_bus); + + ohci = fw_ohci(card); + +@@ -1429,6 +1447,9 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet) + static int + ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation) + { ++#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA ++ return 0; ++#else + struct fw_ohci *ohci = fw_ohci(card); + unsigned long flags; + int n, retval = 0; +@@ -1460,6 +1481,7 @@ ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation) + out: + spin_unlock_irqrestore(&ohci->lock, flags); + return retval; ++#endif /* CONFIG_FIREWIRE_OHCI_REMOTE_DMA */ + } + + static u64 +@@ -1487,7 +1509,7 @@ static int handle_ir_dualbuffer_packet(struct context *context, + void *p, *end; + int i; + +- if (db->first_res_count > 0 && db->second_res_count > 0) { ++ if (db->first_res_count != 0 && db->second_res_count != 0) { + if (ctx->excess_bytes <= le16_to_cpu(db->second_req_count)) { + /* This descriptor isn't done yet, stop iteration. */ + return 0; +@@ -1513,7 +1535,7 @@ static int handle_ir_dualbuffer_packet(struct context *context, + memcpy(ctx->header + i + 4, p + 8, ctx->base.header_size - 4); + i += ctx->base.header_size; + ctx->excess_bytes += +- (le32_to_cpu(*(u32 *)(p + 4)) >> 16) & 0xffff; ++ (le32_to_cpu(*(__le32 *)(p + 4)) >> 16) & 0xffff; + p += ctx->base.header_size + 4; + } + ctx->header_length = i; +@@ -2039,6 +2061,35 @@ static const struct fw_card_driver ohci_driver = { + .stop_iso = ohci_stop_iso, + }; + ++#ifdef CONFIG_PPC_PMAC ++static void ohci_pmac_on(struct pci_dev *dev) ++{ ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(dev); ++ ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1); ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); ++ } ++ } ++} ++ ++static void ohci_pmac_off(struct pci_dev *dev) ++{ ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(dev); ++ ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); ++ } ++ } ++} ++#else ++#define ohci_pmac_on(dev) ++#define ohci_pmac_off(dev) ++#endif /* CONFIG_PPC_PMAC */ ++ + static int __devinit + pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + { +@@ -2048,6 +2099,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + int err; + size_t size; + ++ ohci_pmac_on(dev); ++ + ohci = kzalloc(sizeof(*ohci), GFP_KERNEL); + if (ohci == NULL) { + fw_error("Could not malloc fw_ohci data.\n"); +@@ -2059,13 +2112,17 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + err = pci_enable_device(dev); + if (err) { + fw_error("Failed to enable OHCI hardware.\n"); +- goto fail_put_card; ++ goto fail_free; + } + + pci_set_master(dev); + pci_write_config_dword(dev, OHCI1394_PCI_HCI_Control, 0); + pci_set_drvdata(dev, ohci); + ++#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32) ++ ohci->old_uninorth = dev->vendor == PCI_VENDOR_ID_APPLE && ++ dev->device == PCI_DEVICE_ID_APPLE_UNI_N_FW; ++#endif + spin_lock_init(&ohci->lock); + + tasklet_init(&ohci->bus_reset_tasklet, +@@ -2151,8 +2208,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) + pci_release_region(dev, 0); + fail_disable: + pci_disable_device(dev); +- fail_put_card: +- fw_card_put(&ohci->card); ++ fail_free: ++ kfree(&ohci->card); + + return err; + } +@@ -2180,39 +2237,42 @@ static void pci_remove(struct pci_dev *dev) + pci_iounmap(dev, ohci->registers); + pci_release_region(dev, 0); + pci_disable_device(dev); +- fw_card_put(&ohci->card); ++ ohci_pmac_off(dev); ++ kfree(&ohci->card); + + fw_notify("Removed fw-ohci device.\n"); + } + + #ifdef CONFIG_PM +-static int pci_suspend(struct pci_dev *pdev, pm_message_t state) ++static int pci_suspend(struct pci_dev *dev, pm_message_t state) + { +- struct fw_ohci *ohci = pci_get_drvdata(pdev); ++ struct fw_ohci *ohci = pci_get_drvdata(dev); + int err; + + software_reset(ohci); +- free_irq(pdev->irq, ohci); +- err = pci_save_state(pdev); ++ free_irq(dev->irq, ohci); ++ err = pci_save_state(dev); + if (err) { + fw_error("pci_save_state failed\n"); + return err; + } +- err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); ++ err = pci_set_power_state(dev, pci_choose_state(dev, state)); + if (err) + fw_error("pci_set_power_state failed with %d\n", err); ++ ohci_pmac_off(dev); + + return 0; + } + +-static int pci_resume(struct pci_dev *pdev) ++static int pci_resume(struct pci_dev *dev) + { +- struct fw_ohci *ohci = pci_get_drvdata(pdev); ++ struct fw_ohci *ohci = pci_get_drvdata(dev); + int err; + +- pci_set_power_state(pdev, PCI_D0); +- pci_restore_state(pdev); +- err = pci_enable_device(pdev); ++ ohci_pmac_on(dev); ++ pci_set_power_state(dev, PCI_D0); ++ pci_restore_state(dev); ++ err = pci_enable_device(dev); + if (err) { + fw_error("pci_enable_device failed\n"); + return err; +diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c +index 03069a4..d6d62c6 100644 +--- a/drivers/firewire/fw-sbp2.c ++++ b/drivers/firewire/fw-sbp2.c +@@ -174,9 +174,6 @@ struct sbp2_target { + #define SBP2_ORB_NULL 0x80000000 + #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 + +-#define SBP2_DIRECTION_TO_MEDIA 0x0 +-#define SBP2_DIRECTION_FROM_MEDIA 0x1 +- + /* Unit directory keys */ + #define SBP2_CSR_UNIT_CHARACTERISTICS 0x3a + #define SBP2_CSR_FIRMWARE_REVISION 0x3c +@@ -223,8 +220,8 @@ struct sbp2_status { + }; + + struct sbp2_pointer { +- u32 high; +- u32 low; ++ __be32 high; ++ __be32 low; + }; + + struct sbp2_orb { +@@ -252,8 +249,8 @@ struct sbp2_management_orb { + struct { + struct sbp2_pointer password; + struct sbp2_pointer response; +- u32 misc; +- u32 length; ++ __be32 misc; ++ __be32 length; + struct sbp2_pointer status_fifo; + } request; + __be32 response[4]; +@@ -262,20 +259,17 @@ struct sbp2_management_orb { + struct sbp2_status status; + }; + +-#define LOGIN_RESPONSE_GET_LOGIN_ID(v) ((v).misc & 0xffff) +-#define LOGIN_RESPONSE_GET_LENGTH(v) (((v).misc >> 16) & 0xffff) +- + struct sbp2_login_response { +- u32 misc; ++ __be32 misc; + struct sbp2_pointer command_block_agent; +- u32 reconnect_hold; ++ __be32 reconnect_hold; + }; + #define COMMAND_ORB_DATA_SIZE(v) ((v)) + #define COMMAND_ORB_PAGE_SIZE(v) ((v) << 16) + #define COMMAND_ORB_PAGE_TABLE_PRESENT ((1) << 19) + #define COMMAND_ORB_MAX_PAYLOAD(v) ((v) << 20) + #define COMMAND_ORB_SPEED(v) ((v) << 24) +-#define COMMAND_ORB_DIRECTION(v) ((v) << 27) ++#define COMMAND_ORB_DIRECTION ((1) << 27) + #define COMMAND_ORB_REQUEST_FORMAT(v) ((v) << 29) + #define COMMAND_ORB_NOTIFY ((1) << 31) + +@@ -284,7 +278,7 @@ struct sbp2_command_orb { + struct { + struct sbp2_pointer next; + struct sbp2_pointer data_descriptor; +- u32 misc; ++ __be32 misc; + u8 command_block[12]; + } request; + struct scsi_cmnd *cmd; +@@ -453,8 +447,7 @@ sbp2_send_orb(struct sbp2_orb *orb, struct sbp2_logical_unit *lu, + unsigned long flags; + + orb->pointer.high = 0; +- orb->pointer.low = orb->request_bus; +- fw_memcpy_to_be32(&orb->pointer, &orb->pointer, sizeof(orb->pointer)); ++ orb->pointer.low = cpu_to_be32(orb->request_bus); + + spin_lock_irqsave(&device->card->lock, flags); + list_add_tail(&orb->link, &lu->orb_list); +@@ -530,31 +523,31 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, + if (dma_mapping_error(orb->response_bus)) + goto fail_mapping_response; + +- orb->request.response.high = 0; +- orb->request.response.low = orb->response_bus; ++ orb->request.response.high = 0; ++ orb->request.response.low = cpu_to_be32(orb->response_bus); + +- orb->request.misc = ++ orb->request.misc = cpu_to_be32( + MANAGEMENT_ORB_NOTIFY | + MANAGEMENT_ORB_FUNCTION(function) | +- MANAGEMENT_ORB_LUN(lun_or_login_id); +- orb->request.length = +- MANAGEMENT_ORB_RESPONSE_LENGTH(sizeof(orb->response)); ++ MANAGEMENT_ORB_LUN(lun_or_login_id)); ++ orb->request.length = cpu_to_be32( ++ MANAGEMENT_ORB_RESPONSE_LENGTH(sizeof(orb->response))); + +- orb->request.status_fifo.high = lu->address_handler.offset >> 32; +- orb->request.status_fifo.low = lu->address_handler.offset; ++ orb->request.status_fifo.high = ++ cpu_to_be32(lu->address_handler.offset >> 32); ++ orb->request.status_fifo.low = ++ cpu_to_be32(lu->address_handler.offset); + + if (function == SBP2_LOGIN_REQUEST) { + /* Ask for 2^2 == 4 seconds reconnect grace period */ +- orb->request.misc |= ++ orb->request.misc |= cpu_to_be32( + MANAGEMENT_ORB_RECONNECT(2) | +- MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login); ++ MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login)); + timeout = lu->tgt->mgt_orb_timeout; + } else { + timeout = SBP2_ORB_TIMEOUT; + } + +- fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request)); +- + init_completion(&orb->done); + orb->base.callback = complete_management_orb; + +@@ -599,8 +592,7 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, + sizeof(orb->response), DMA_FROM_DEVICE); + fail_mapping_response: + if (response) +- fw_memcpy_from_be32(response, +- orb->response, sizeof(orb->response)); ++ memcpy(response, orb->response, sizeof(orb->response)); + kref_put(&orb->base.kref, free_orb); + + return retval; +@@ -695,10 +687,8 @@ static void sbp2_conditionally_block(struct sbp2_logical_unit *lu) + if (!tgt->dont_block && !lu->blocked && + lu->generation != card->generation) { + lu->blocked = true; +- if (++tgt->blocked == 1) { ++ if (++tgt->blocked == 1) + scsi_block_requests(shost); +- fw_notify("blocked %s\n", lu->tgt->bus_id); +- } + } + spin_unlock_irqrestore(&card->lock, flags); + } +@@ -725,10 +715,8 @@ static void sbp2_conditionally_unblock(struct sbp2_logical_unit *lu) + } + spin_unlock_irqrestore(&card->lock, flags); + +- if (unblock) { ++ if (unblock) + scsi_unblock_requests(shost); +- fw_notify("unblocked %s\n", lu->tgt->bus_id); +- } + } + + /* +@@ -790,7 +778,7 @@ static void sbp2_release_target(struct kref *kref) + scsi_remove_host(shost); + fw_notify("released %s\n", tgt->bus_id); + +- put_device(&tgt->unit->device); ++ fw_unit_put(tgt->unit); + scsi_host_put(shost); + fw_device_put(device); + } +@@ -855,11 +843,10 @@ static void sbp2_login(struct work_struct *work) + tgt->address_high = local_node_id << 16; + sbp2_set_generation(lu, generation); + +- /* Get command block agent offset and login id. */ + lu->command_block_agent_address = +- ((u64) (response.command_block_agent.high & 0xffff) << 32) | +- response.command_block_agent.low; +- lu->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response); ++ ((u64)(be32_to_cpu(response.command_block_agent.high) & 0xffff) ++ << 32) | be32_to_cpu(response.command_block_agent.low); ++ lu->login_id = be32_to_cpu(response.misc) & 0xffff; + + fw_notify("%s: logged in to LUN %04x (%d retries)\n", + tgt->bus_id, lu->lun, lu->retries); +@@ -1091,6 +1078,7 @@ static int sbp2_probe(struct device *dev) + goto fail_shost_put; + + fw_device_get(device); ++ fw_unit_get(unit); + + /* Initialize to values that won't match anything in our table. */ + firmware_revision = 0xff000000; +@@ -1106,8 +1094,6 @@ static int sbp2_probe(struct device *dev) + + sbp2_init_workarounds(tgt, model, firmware_revision); + +- get_device(&unit->device); +- + /* Do the login in a workqueue so we can easily reschedule retries. */ + list_for_each_entry(lu, &tgt->lu_list, link) + sbp2_queue_work(lu, 0); +@@ -1339,9 +1325,12 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, + * tables. + */ + if (count == 1 && sg_dma_len(sg) < SBP2_MAX_SG_ELEMENT_LENGTH) { +- orb->request.data_descriptor.high = lu->tgt->address_high; +- orb->request.data_descriptor.low = sg_dma_address(sg); +- orb->request.misc |= COMMAND_ORB_DATA_SIZE(sg_dma_len(sg)); ++ orb->request.data_descriptor.high = ++ cpu_to_be32(lu->tgt->address_high); ++ orb->request.data_descriptor.low = ++ cpu_to_be32(sg_dma_address(sg)); ++ orb->request.misc |= ++ cpu_to_be32(COMMAND_ORB_DATA_SIZE(sg_dma_len(sg))); + return 0; + } + +@@ -1362,16 +1351,14 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, + goto fail_page_table; + } + l = min(sg_len, SBP2_MAX_SG_ELEMENT_LENGTH); +- orb->page_table[j].low = sg_addr; +- orb->page_table[j].high = (l << 16); ++ orb->page_table[j].low = cpu_to_be32(sg_addr); ++ orb->page_table[j].high = cpu_to_be32(l << 16); + sg_addr += l; + sg_len -= l; + j++; + } + } + +- fw_memcpy_to_be32(orb->page_table, orb->page_table, +- sizeof(orb->page_table[0]) * j); + orb->page_table_bus = + dma_map_single(device->card->device, orb->page_table, + sizeof(orb->page_table), DMA_TO_DEVICE); +@@ -1385,11 +1372,10 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, + * initiator (i.e. us), but data_descriptor can refer to data + * on other nodes so we need to put our ID in descriptor.high. + */ +- orb->request.data_descriptor.high = lu->tgt->address_high; +- orb->request.data_descriptor.low = orb->page_table_bus; +- orb->request.misc |= +- COMMAND_ORB_PAGE_TABLE_PRESENT | +- COMMAND_ORB_DATA_SIZE(j); ++ orb->request.data_descriptor.high = cpu_to_be32(lu->tgt->address_high); ++ orb->request.data_descriptor.low = cpu_to_be32(orb->page_table_bus); ++ orb->request.misc |= cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT | ++ COMMAND_ORB_DATA_SIZE(j)); + + return 0; + +@@ -1435,8 +1421,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done) + orb->done = done; + orb->cmd = cmd; + +- orb->request.next.high = SBP2_ORB_NULL; +- orb->request.next.low = 0x0; ++ orb->request.next.high = cpu_to_be32(SBP2_ORB_NULL); + /* + * At speed 100 we can do 512 bytes per packet, at speed 200, + * 1024 bytes per packet etc. The SBP-2 max_payload field +@@ -1445,25 +1430,17 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done) + */ + max_payload = min(device->max_speed + 7, + device->card->max_receive - 1); +- orb->request.misc = ++ orb->request.misc = cpu_to_be32( + COMMAND_ORB_MAX_PAYLOAD(max_payload) | + COMMAND_ORB_SPEED(device->max_speed) | +- COMMAND_ORB_NOTIFY; ++ COMMAND_ORB_NOTIFY); + + if (cmd->sc_data_direction == DMA_FROM_DEVICE) +- orb->request.misc |= +- COMMAND_ORB_DIRECTION(SBP2_DIRECTION_FROM_MEDIA); +- else if (cmd->sc_data_direction == DMA_TO_DEVICE) +- orb->request.misc |= +- COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA); ++ orb->request.misc |= cpu_to_be32(COMMAND_ORB_DIRECTION); + + if (scsi_sg_count(cmd) && sbp2_map_scatterlist(orb, device, lu) < 0) + goto out; + +- fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request)); +- +- memset(orb->request.command_block, +- 0, sizeof(orb->request.command_block)); + memcpy(orb->request.command_block, cmd->cmnd, COMMAND_SIZE(*cmd->cmnd)); + + orb->base.callback = complete_command_orb; +@@ -1491,11 +1468,8 @@ static int sbp2_scsi_slave_alloc(struct scsi_device *sdev) + + sdev->allow_restart = 1; + +- /* +- * Update the dma alignment (minimum alignment requirements for +- * start and end of DMA transfers) to be a sector +- */ +- blk_queue_update_dma_alignment(sdev->request_queue, 511); ++ /* SBP-2 requires quadlet alignment of the data buffers. */ ++ blk_queue_update_dma_alignment(sdev->request_queue, 4 - 1); + + if (lu->tgt->workarounds & SBP2_WORKAROUND_INQUIRY_36) + sdev->inquiry_len = 36; +diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c +index 7fcc59d..99529e5 100644 +--- a/drivers/firewire/fw-transaction.c ++++ b/drivers/firewire/fw-transaction.c +@@ -751,7 +751,7 @@ handle_topology_map(struct fw_card *card, struct fw_request *request, + void *payload, size_t length, void *callback_data) + { + int i, start, end; +- u32 *map; ++ __be32 *map; + + if (!TCODE_IS_READ_REQUEST(tcode)) { + fw_send_response(card, request, RCODE_TYPE_ERROR); +diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h +index 09cb728..1a22a23 100644 +--- a/drivers/firewire/fw-transaction.h ++++ b/drivers/firewire/fw-transaction.h +@@ -86,12 +86,12 @@ + static inline void + fw_memcpy_from_be32(void *_dst, void *_src, size_t size) + { +- u32 *dst = _dst; +- u32 *src = _src; ++ u32 *dst = _dst; ++ __be32 *src = _src; + int i; + + for (i = 0; i < size / 4; i++) +- dst[i] = cpu_to_be32(src[i]); ++ dst[i] = be32_to_cpu(src[i]); + } + + static inline void +@@ -221,7 +221,6 @@ struct fw_card { + const struct fw_card_driver *driver; + struct device *device; + atomic_t device_count; +- struct kref kref; + + int node_id; + int generation; +@@ -263,9 +262,6 @@ struct fw_card { + int bm_generation; + }; + +-struct fw_card *fw_card_get(struct fw_card *card); +-void fw_card_put(struct fw_card *card); +- + /* + * The iso packet format allows for an immediate header/payload part + * stored in 'header' immediately after the packet info plus an +diff --git a/drivers/ieee1394/csr.c b/drivers/ieee1394/csr.c +index 52ac83e..c90be40 100644 +--- a/drivers/ieee1394/csr.c ++++ b/drivers/ieee1394/csr.c +@@ -133,8 +133,7 @@ static void host_reset(struct hpsb_host *host) + host->csr.state &= ~0x100; + } + +- host->csr.topology_map[1] = +- cpu_to_be32(be32_to_cpu(host->csr.topology_map[1]) + 1); ++ be32_add_cpu(&host->csr.topology_map[1], 1); + host->csr.topology_map[2] = cpu_to_be32(host->node_count << 16 + | host->selfid_count); + host->csr.topology_map[0] = +@@ -142,8 +141,7 @@ static void host_reset(struct hpsb_host *host) + | csr_crc16(host->csr.topology_map + 1, + host->selfid_count + 2)); + +- host->csr.speed_map[1] = +- cpu_to_be32(be32_to_cpu(host->csr.speed_map[1]) + 1); ++ be32_add_cpu(&host->csr.speed_map[1], 1); + host->csr.speed_map[0] = cpu_to_be32(0x3f1 << 16 + | csr_crc16(host->csr.speed_map+1, + 0x3f1)); +diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c +index 6572211..8c72f36 100644 +--- a/drivers/ieee1394/dv1394.c ++++ b/drivers/ieee1394/dv1394.c +@@ -2179,8 +2179,7 @@ static struct ieee1394_device_id dv1394_id_table[] = { + MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); + + static struct hpsb_protocol_driver dv1394_driver = { +- .name = "dv1394", +- .id_table = dv1394_id_table, ++ .name = "dv1394", + }; + + +diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c +index 511e432..70afa37 100644 +--- a/drivers/ieee1394/nodemgr.c ++++ b/drivers/ieee1394/nodemgr.c +@@ -701,7 +701,11 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv) + return 0; + + driver = container_of(drv, struct hpsb_protocol_driver, driver); +- for (id = driver->id_table; id->match_flags != 0; id++) { ++ id = driver->id_table; ++ if (!id) ++ return 0; ++ ++ for (; id->match_flags != 0; id++) { + if ((id->match_flags & IEEE1394_MATCH_VENDOR_ID) && + id->vendor_id != ud->vendor_id) + continue; +diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c +index 969de2a..29b8910 100644 +--- a/drivers/ieee1394/ohci1394.c ++++ b/drivers/ieee1394/ohci1394.c +@@ -2993,15 +2993,9 @@ do { \ + return err; \ + } while (0) + +-static int __devinit ohci1394_pci_probe(struct pci_dev *dev, +- const struct pci_device_id *ent) +-{ +- struct hpsb_host *host; +- struct ti_ohci *ohci; /* shortcut to currently handled device */ +- resource_size_t ohci_base; +- + #ifdef CONFIG_PPC_PMAC +- /* Necessary on some machines if ohci1394 was loaded/ unloaded before */ ++static void ohci1394_pmac_on(struct pci_dev *dev) ++{ + if (machine_is(powermac)) { + struct device_node *ofn = pci_device_to_OF_node(dev); + +@@ -3010,8 +3004,32 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, + pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); + } + } ++} ++ ++static void ohci1394_pmac_off(struct pci_dev *dev) ++{ ++ if (machine_is(powermac)) { ++ struct device_node *ofn = pci_device_to_OF_node(dev); ++ ++ if (ofn) { ++ pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); ++ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); ++ } ++ } ++} ++#else ++#define ohci1394_pmac_on(dev) ++#define ohci1394_pmac_off(dev) + #endif /* CONFIG_PPC_PMAC */ + ++static int __devinit ohci1394_pci_probe(struct pci_dev *dev, ++ const struct pci_device_id *ent) ++{ ++ struct hpsb_host *host; ++ struct ti_ohci *ohci; /* shortcut to currently handled device */ ++ resource_size_t ohci_base; ++ ++ ohci1394_pmac_on(dev); + if (pci_enable_device(dev)) + FAIL(-ENXIO, "Failed to enable OHCI hardware"); + pci_set_master(dev); +@@ -3203,16 +3221,16 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, + #undef FAIL + } + +-static void ohci1394_pci_remove(struct pci_dev *pdev) ++static void ohci1394_pci_remove(struct pci_dev *dev) + { + struct ti_ohci *ohci; +- struct device *dev; ++ struct device *device; + +- ohci = pci_get_drvdata(pdev); ++ ohci = pci_get_drvdata(dev); + if (!ohci) + return; + +- dev = get_device(&ohci->host->device); ++ device = get_device(&ohci->host->device); + + switch (ohci->init_state) { + case OHCI_INIT_DONE: +@@ -3246,7 +3264,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) + /* Soft reset before we start - this disables + * interrupts and clears linkEnable and LPS. */ + ohci_soft_reset(ohci); +- free_irq(ohci->dev->irq, ohci); ++ free_irq(dev->irq, ohci); + + case OHCI_INIT_HAVE_TXRX_BUFFERS__MAYBE: + /* The ohci_soft_reset() stops all DMA contexts, so we +@@ -3257,12 +3275,12 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) + free_dma_trm_ctx(&ohci->at_resp_context); + + case OHCI_INIT_HAVE_SELFID_BUFFER: +- pci_free_consistent(ohci->dev, OHCI1394_SI_DMA_BUF_SIZE, ++ pci_free_consistent(dev, OHCI1394_SI_DMA_BUF_SIZE, + ohci->selfid_buf_cpu, + ohci->selfid_buf_bus); + + case OHCI_INIT_HAVE_CONFIG_ROM_BUFFER: +- pci_free_consistent(ohci->dev, OHCI_CONFIG_ROM_LEN, ++ pci_free_consistent(dev, OHCI_CONFIG_ROM_LEN, + ohci->csr_config_rom_cpu, + ohci->csr_config_rom_bus); + +@@ -3270,35 +3288,24 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) + iounmap(ohci->registers); + + case OHCI_INIT_HAVE_MEM_REGION: +- release_mem_region(pci_resource_start(ohci->dev, 0), ++ release_mem_region(pci_resource_start(dev, 0), + OHCI1394_REGISTER_SIZE); + +-#ifdef CONFIG_PPC_PMAC +- /* On UniNorth, power down the cable and turn off the chip clock +- * to save power on laptops */ +- if (machine_is(powermac)) { +- struct device_node* ofn = pci_device_to_OF_node(ohci->dev); +- +- if (ofn) { +- pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); +- pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0); +- } +- } +-#endif /* CONFIG_PPC_PMAC */ ++ ohci1394_pmac_off(dev); + + case OHCI_INIT_ALLOC_HOST: +- pci_set_drvdata(ohci->dev, NULL); ++ pci_set_drvdata(dev, NULL); + } + +- if (dev) +- put_device(dev); ++ if (device) ++ put_device(device); + } + + #ifdef CONFIG_PM +-static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state) ++static int ohci1394_pci_suspend(struct pci_dev *dev, pm_message_t state) + { + int err; +- struct ti_ohci *ohci = pci_get_drvdata(pdev); ++ struct ti_ohci *ohci = pci_get_drvdata(dev); + + if (!ohci) { + printk(KERN_ERR "%s: tried to suspend nonexisting host\n", +@@ -3326,32 +3333,23 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state) + ohci_devctl(ohci->host, RESET_BUS, LONG_RESET_NO_FORCE_ROOT); + ohci_soft_reset(ohci); + +- err = pci_save_state(pdev); ++ err = pci_save_state(dev); + if (err) { + PRINT(KERN_ERR, "pci_save_state failed with %d", err); + return err; + } +- err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); ++ err = pci_set_power_state(dev, pci_choose_state(dev, state)); + if (err) + DBGMSG("pci_set_power_state failed with %d", err); +- +-/* PowerMac suspend code comes last */ +-#ifdef CONFIG_PPC_PMAC +- if (machine_is(powermac)) { +- struct device_node *ofn = pci_device_to_OF_node(pdev); +- +- if (ofn) +- pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0); +- } +-#endif /* CONFIG_PPC_PMAC */ ++ ohci1394_pmac_off(dev); + + return 0; + } + +-static int ohci1394_pci_resume(struct pci_dev *pdev) ++static int ohci1394_pci_resume(struct pci_dev *dev) + { + int err; +- struct ti_ohci *ohci = pci_get_drvdata(pdev); ++ struct ti_ohci *ohci = pci_get_drvdata(dev); + + if (!ohci) { + printk(KERN_ERR "%s: tried to resume nonexisting host\n", +@@ -3360,19 +3358,10 @@ static int ohci1394_pci_resume(struct pci_dev *pdev) + } + DBGMSG("resume called"); + +-/* PowerMac resume code comes first */ +-#ifdef CONFIG_PPC_PMAC +- if (machine_is(powermac)) { +- struct device_node *ofn = pci_device_to_OF_node(pdev); +- +- if (ofn) +- pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); +- } +-#endif /* CONFIG_PPC_PMAC */ +- +- pci_set_power_state(pdev, PCI_D0); +- pci_restore_state(pdev); +- err = pci_enable_device(pdev); ++ ohci1394_pmac_on(dev); ++ pci_set_power_state(dev, PCI_D0); ++ pci_restore_state(dev); ++ err = pci_enable_device(dev); + if (err) { + PRINT(KERN_ERR, "pci_enable_device failed with %d", err); + return err; +diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c +index 37e7e10..3634785 100644 +--- a/drivers/ieee1394/raw1394.c ++++ b/drivers/ieee1394/raw1394.c +@@ -2959,7 +2959,6 @@ MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); + + static struct hpsb_protocol_driver raw1394_driver = { + .name = "raw1394", +- .id_table = raw1394_id_table, + }; + + /******************************************************************************/ +diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c +index 9e2b196..29e6663 100644 +--- a/drivers/ieee1394/sbp2.c ++++ b/drivers/ieee1394/sbp2.c +@@ -1980,11 +1980,8 @@ static int sbp2scsi_slave_alloc(struct scsi_device *sdev) + lu->sdev = sdev; + sdev->allow_restart = 1; + +- /* +- * Update the dma alignment (minimum alignment requirements for +- * start and end of DMA transfers) to be a sector +- */ +- blk_queue_update_dma_alignment(sdev->request_queue, 511); ++ /* SBP-2 requires quadlet alignment of the data buffers. */ ++ blk_queue_update_dma_alignment(sdev->request_queue, 4 - 1); + + if (lu->workarounds & SBP2_WORKAROUND_INQUIRY_36) + sdev->inquiry_len = 36; +diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c +index bd28adf..cc240b2 100644 +--- a/drivers/ieee1394/video1394.c ++++ b/drivers/ieee1394/video1394.c +@@ -1315,8 +1315,7 @@ static struct ieee1394_device_id video1394_id_table[] = { + MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); + + static struct hpsb_protocol_driver video1394_driver = { +- .name = VIDEO1394_DRIVER_NAME, +- .id_table = video1394_id_table, ++ .name = VIDEO1394_DRIVER_NAME, + }; + + +diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug +index 0796c1a..4e370e1 100644 +--- a/lib/Kconfig.debug ++++ b/lib/Kconfig.debug +@@ -592,6 +592,16 @@ config LATENCYTOP + Enable this option if you want to use the LatencyTOP tool + to find out which userspace is blocking on what kernel operations. + ++config FIREWIRE_OHCI_REMOTE_DMA ++ bool "Remote debugging via firewire-ohci" ++ depends on FIREWIRE_OHCI ++ help ++ This option lets you use the FireWire bus for remote debugging. ++ It enables unfiltered remote DMA in the firewire-ohci driver. ++ See Documentation/debugging-via-ohci1394.txt for more information. ++ ++ If unsure, say N. ++ + config PROVIDE_OHCI1394_DMA_INIT + bool "Provide code for enabling DMA over FireWire early on boot" + depends on PCI && X86 linux-2.6-hotfixes.patch: Index: linux-2.6-hotfixes.patch =================================================================== RCS file: linux-2.6-hotfixes.patch diff -N linux-2.6-hotfixes.patch linux-2.6-ia32-syscall-restart.patch: Index: linux-2.6-ia32-syscall-restart.patch =================================================================== RCS file: linux-2.6-ia32-syscall-restart.patch diff -N linux-2.6-ia32-syscall-restart.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-ia32-syscall-restart.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,117 @@ +From 702b92b212afb1cb9d9590f5a9133113c2b4168c Mon Sep 17 00:00:00 2001 +From: Roland McGrath +Date: Thu, 28 Feb 2008 19:40:17 -0800 +Subject: [PATCH] x86_64 ia32 syscall restart fix + +The code to restart syscalls after signals depends on checking for a +negative orig_ax, and for particular negative -ERESTART* values in ax. +These fields are 64 bits and for a 32-bit task they get zero-extended. +The syscall restart behavior is lost, a regression from a native 32-bit +kernel and from 64-bit tasks' behavior. This patch fixes the problem by +doing sign-extension where it matters. For orig_ax, the only time the +value should be -1 but winds up as 0x0ffffffff is via a 32-bit ptrace +call. So the patch changes ptrace to sign-extend the 32-bit orig_eax +value when it's stored; it doesn't change the checks on orig_ax, though +it uses the new current_syscall() inline to better document the subtle +importance of the used of signedness there. The ax value is stored a +lot of ways and it seems hard to get them all sign-extended at their +origins. So for that, we use the current_syscall_ret() to sign-extend +it only for 32-bit tasks at the time of the -ERESTART* comparisons. + +Signed-off-by: Roland McGrath +--- + arch/x86/kernel/ptrace.c | 9 ++++++++- + arch/x86/kernel/signal_64.c | 38 +++++++++++++++++++++++++++++++++----- + 2 files changed, 41 insertions(+), 6 deletions(-) + +diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c +index f41fdc9..f8eed1b 100644 +--- a/arch/x86/kernel/ptrace.c ++++ b/arch/x86/kernel/ptrace.c +@@ -1045,10 +1045,17 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 value) + R32(esi, si); + R32(ebp, bp); + R32(eax, ax); +- R32(orig_eax, orig_ax); + R32(eip, ip); + R32(esp, sp); + ++ case offsetof(struct user32, regs.orig_eax): ++ /* ++ * Sign-extend the value so that orig_eax = -1 ++ * causes (long)orig_ax < 0 tests to fire correctly. ++ */ ++ regs->orig_ax = (long) (s32) value; ++ break; ++ + case offsetof(struct user32, regs.eflags): + return set_flags(child, value); + +diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c +index 7347bb1..ce317ee 100644 +--- a/arch/x86/kernel/signal_64.c ++++ b/arch/x86/kernel/signal_64.c +@@ -311,6 +311,35 @@ give_sigsegv: + } + + /* ++ * Return -1L or the syscall number that @regs is executing. ++ */ ++static long current_syscall(struct pt_regs *regs) ++{ ++ /* ++ * We always sign-extend a -1 value being set here, ++ * so this is always either -1L or a syscall number. ++ */ ++ return regs->orig_ax; ++} ++ ++/* ++ * Return a value that is -EFOO if the system call in @regs->orig_ax ++ * returned an error. This only works for @regs from @current. ++ */ ++static long current_syscall_ret(struct pt_regs *regs) ++{ ++#ifdef CONFIG_IA32_EMULATION ++ if (test_thread_flag(TIF_IA32)) ++ /* ++ * Sign-extend the value so (int)-EFOO becomes (long)-EFOO ++ * and will match correctly in comparisons. ++ */ ++ return (int) regs->ax; ++#endif ++ return regs->ax; ++} ++ ++/* + * OK, we're invoking a handler + */ + +@@ -327,9 +356,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, + #endif + + /* Are we from a system call? */ +- if ((long)regs->orig_ax >= 0) { ++ if (current_syscall(regs) >= 0) { + /* If so, check system call restarting.. */ +- switch (regs->ax) { ++ switch (current_syscall_ret(regs)) { + case -ERESTART_RESTARTBLOCK: + case -ERESTARTNOHAND: + regs->ax = -EINTR; +@@ -426,10 +455,9 @@ static void do_signal(struct pt_regs *regs) + } + + /* Did we come from a system call? */ +- if ((long)regs->orig_ax >= 0) { ++ if (current_syscall(regs) >= 0) { + /* Restart the system call - no handlers present */ +- long res = regs->ax; +- switch (res) { ++ switch (current_syscall_ret(regs)) { + case -ERESTARTNOHAND: + case -ERESTARTSYS: + case -ERESTARTNOINTR: +-- +1.5.4.1 + linux-2.6-lirc.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 linux-2.6-lirc.patch Index: linux-2.6-lirc.patch =================================================================== RCS file: linux-2.6-lirc.patch diff -N linux-2.6-lirc.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-lirc.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,17646 @@ +diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig +index 9dea14d..d84ac4a 100644 +--- a/drivers/input/Kconfig ++++ b/drivers/input/Kconfig +@@ -173,5 +173,7 @@ source "drivers/input/gameport/Kconfig" + + endmenu + ++source "drivers/input/lirc/Kconfig" ++ + endmenu + +diff --git a/drivers/input/Makefile b/drivers/input/Makefile +index 2ae87b1..24bdec1 100644 +--- a/drivers/input/Makefile ++++ b/drivers/input/Makefile +@@ -21,5 +21,6 @@ obj-$(CONFIG_INPUT_JOYSTICK) += joystick/ + obj-$(CONFIG_INPUT_TABLET) += tablet/ + obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/ + obj-$(CONFIG_INPUT_MISC) += misc/ ++obj-$(CONFIG_INPUT_LIRC) += lirc/ + + obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o +diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig +new file mode 100644 +index 0000000..138e58a +--- /dev/null ++++ b/drivers/input/lirc/Kconfig +@@ -0,0 +1,127 @@ ++# ++# LIRC driver(s) configuration ++# ++menuconfig INPUT_LIRC ++ bool "Linux Infrared Remote Control IR receiver/transmitter drivers" ++ default n ++ help ++ Say Y here, and all supported Linux Infrared Remote Control IR and ++ RF receiver and transmitter drivers will be displayed. When paired ++ with a remote control and the lirc daemon, the receiver drivers ++ allow control of your Linux system via remote control. ++ ++if INPUT_LIRC ++ ++config LIRC_DEV ++ tristate "LIRC device loadable module support" ++ default m ++ help ++ LIRC device loadable module support, required for most LIRC drivers ++ ++config LIRC_ATIUSB ++ tristate "ATI RF USB Receiver support" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the ATI USB RF remote receiver ++ ++config LIRC_BT829 ++ tristate "BT829 based hardware" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the IR interface on BT829-based hardware ++ ++config LIRC_CMDIR ++ tristate "CommandIR USB Transceiver" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the CommandIR USB Transceiver ++ ++config LIRC_I2C ++ tristate "I2C Based IR Receivers" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for I2C-based IR receivers, such as those commonly ++ found onboard Hauppauge PVR-150/250/350 video capture cards ++ ++config LIRC_IGORPLUGUSB ++ tristate "Igor Cesko's USB IR Receiver" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for Igor Cesko's USB IR Receiver ++ ++config LIRC_IMON ++ tristate "Soundgraph IMON Receiver" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the Soundgraph IMON IR Receiver ++ ++config LIRC_IT87 ++ tristate "ITE IT87XX CIR Port Receiver" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the ITE IT87xx IR Receiver ++ ++config LIRC_MCEUSB ++ tristate "Microsoft Media Center Ed. Receiver, v1" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the Microsoft Media Center Ed. Receiver, v1 ++ ++config LIRC_MCEUSB2 ++ tristate "Microsoft Media Center Ed. Receiver, v2" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the Microsoft Media Center Ed. Receiver, v2 ++ ++config LIRC_PVR150 ++ tristate "Hauppauge PVR-XXX Transmitter" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the Hauppauge PVR-150/250/350/500 IR Transmitter ++ ++config LIRC_PARALLEL ++ tristate "Homebrew Parallel Port Receiver" ++ default m ++ depends on LIRC_DEV && !SMP ++ help ++ Driver for Homebrew Parallel Port Receivers ++ ++config LIRC_SERIAL ++ tristate "Homebrew Serial Port Receiver" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for Homebrew Serial Port Receivers ++ ++config LIRC_SIR ++ tristate "Built-in SIR IrDA port" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the SIR IrDA port ++ ++config LIRC_STREAMZAP ++ tristate "Streamzap PC Receiver" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the Streamzap PC Receiver ++ ++config LIRC_TTUSBIR ++ tristate "Technotrend USB IR Receiver" ++ default m ++ depends on LIRC_DEV ++ help ++ Driver for the Technotrend USB IR Receiver ++ ++endif +diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile +new file mode 100644 +index 0000000..71124ef +--- /dev/null ++++ b/drivers/input/lirc/Makefile +@@ -0,0 +1,24 @@ ++# Makefile for the lirc drivers. ++# ++ ++# Each configuration option enables a list of files. ++ ++EXTRA_CFLAGS =-DIRCTL_DEV_MAJOR=61 -DLIRC_SERIAL_TRANSMITTER -I$(src) ++ ++obj-$(CONFIG_LIRC_DEV) += lirc_dev.o ++obj-$(CONFIG_LIRC_ATIUSB) += lirc_atiusb.o ++obj-$(CONFIG_LIRC_BT829) += lirc_bt829.o ++obj-$(CONFIG_LIRC_CMDIR) += lirc_cmdir.o commandir.o ++obj-$(CONFIG_LIRC_I2C) += lirc_i2c.o ++obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o ++obj-$(CONFIG_LIRC_IMON) += lirc_imon.o ++obj-$(CONFIG_LIRC_IT87) += lirc_it87.o ++obj-$(CONFIG_LIRC_MCEUSB) += lirc_mceusb.o ++obj-$(CONFIG_LIRC_MCEUSB2) += lirc_mceusb2.o ++obj-$(CONFIG_LIRC_PVR150) += lirc_pvr150.o ++obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o ++obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o ++obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o ++obj-$(CONFIG_LIRC_SIR) += lirc_sir.o ++obj-$(CONFIG_LIRC_STREAMZAP) += lirc_streamzap.o ++obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o +diff --git a/drivers/input/lirc/commandir.c b/drivers/input/lirc/commandir.c +new file mode 100644 +index 0000000..a49d996 +--- /dev/null ++++ b/drivers/input/lirc/commandir.c +@@ -0,0 +1,1009 @@ ++ [...17253 lines suppressed...] ++ if (ttusbir->last_pulse == buf[i]) { ++ if (ttusbir->last_num < PULSE_MASK/63) ++ ttusbir->last_num++; ++ /* else we are in a idle period and do not need to ++ * increment any longer */ ++ } else { ++ l = ttusbir->last_num * 62; /* about 62 = us/byte */ ++ if (ttusbir->last_pulse) /* pulse or space? */ ++ l |= PULSE_BIT; ++ if (!lirc_buffer_full(&ttusbir->rbuf)) { ++ lirc_buffer_write_1(&ttusbir->rbuf, (void *)&l); ++ wake_up_interruptible(&ttusbir->rbuf.wait_poll); ++ } ++ ttusbir->last_num = 0; ++ ttusbir->last_pulse = buf[i]; ++ } ++ } ++ usb_submit_urb(urb, GFP_ATOMIC); /* keep data rolling :-) */ ++} ++ ++/* Called whenever the USB subsystem thinks we could be the right driver ++ to handle this device ++*/ ++static int probe(struct usb_interface *intf, const struct usb_device_id *id) ++{ ++ int alt_set, endp; ++ int found = 0; ++ int i, j; ++ int struct_size; ++ struct usb_host_interface *host_interf; ++ struct usb_interface_descriptor *interf_desc; ++ struct usb_host_endpoint *host_endpoint; ++ struct ttusbir_device *ttusbir; ++ ++ DPRINTK("Module ttusbir probe\n"); ++ ++ /* To reduce memory fragmentation we use only one allocation */ ++ struct_size = sizeof(struct ttusbir_device) + ++ (sizeof(struct urb *) * num_urbs) + ++ (sizeof(char *) * num_urbs) + ++ (num_urbs * 128); ++ ttusbir = kmalloc(struct_size, GFP_KERNEL); ++ if (!ttusbir) ++ return -ENOMEM; ++ memset(ttusbir, 0, struct_size); ++ ++ ttusbir->urb = (struct urb **)((char *)ttusbir + ++ sizeof(struct ttusbir_device)); ++ ttusbir->buffer = (char **)((char *)ttusbir->urb + ++ (sizeof(struct urb *) * num_urbs)); ++ for (i = 0; i < num_urbs; i++) ++ ttusbir->buffer[i] = (char *)ttusbir->buffer + ++ (sizeof(char *)*num_urbs) + (i * 128); ++ ++ ttusbir->driver = &driver; ++ ttusbir->alt_setting = -1; ++ /* @TODO check if error can be returned */ ++ ttusbir->udev = usb_get_dev(interface_to_usbdev(intf)); ++ ttusbir->interf = intf; ++ ttusbir->last_pulse = 0x00; ++ ttusbir->last_num = 0; ++ ++ /* Now look for interface setting we can handle ++ We are searching for the alt setting where end point ++ 0x82 has max packet size 16 ++ */ ++ for (alt_set = 0; alt_set < intf->num_altsetting && !found; alt_set++) { ++ host_interf = &intf->altsetting[alt_set]; ++ interf_desc = &host_interf->desc; ++ for (endp = 0; endp < interf_desc->bNumEndpoints; endp++) { ++ host_endpoint = &host_interf->endpoint[endp]; ++ if ((host_endpoint->desc.bEndpointAddress == 0x82) && ++ (host_endpoint->desc.wMaxPacketSize == 0x10)) { ++ ttusbir->alt_setting = alt_set; ++ ttusbir->endpoint = endp; ++ found = 1; ++ break; ++ } ++ } ++ } ++ if (ttusbir->alt_setting != -1) ++ DPRINTK("alt setting: %d\n", ttusbir->alt_setting); ++ else { ++ err("Could not find alternate setting\n"); ++ kfree(ttusbir); ++ return -EINVAL; ++ } ++ ++ /* OK lets setup this interface setting */ ++ usb_set_interface(ttusbir->udev, 0, ttusbir->alt_setting); ++ ++ /* Store device info in interface structure */ ++ usb_set_intfdata(intf, ttusbir); ++ ++ /* Register as a LIRC plugin */ ++ if (lirc_buffer_init(&ttusbir->rbuf, sizeof(lirc_t), 256) < 0) { ++ err("Could not get memory for LIRC data buffer\n"); ++ usb_set_intfdata(intf, NULL); ++ kfree(ttusbir); ++ return -ENOMEM; ++ } ++ strcpy(ttusbir->plugin.name, "TTUSBIR"); ++ ttusbir->plugin.minor = -1; ++ ttusbir->plugin.code_length = 1; ++ ttusbir->plugin.sample_rate = 0; ++ ttusbir->plugin.data = ttusbir; ++ ttusbir->plugin.add_to_buf = NULL; ++ ttusbir->plugin.get_queue = NULL; ++ ttusbir->plugin.rbuf = &ttusbir->rbuf; ++ ttusbir->plugin.set_use_inc = set_use_inc; ++ ttusbir->plugin.set_use_dec = set_use_dec; ++ ttusbir->plugin.ioctl = NULL; ++ ttusbir->plugin.fops = NULL; ++ ttusbir->plugin.owner = THIS_MODULE; ++ ttusbir->plugin.features = LIRC_CAN_REC_MODE2; ++ ttusbir->minor = lirc_register_plugin(&ttusbir->plugin); ++ if (ttusbir->minor < 0) { ++ err("Error registering as LIRC plugin\n"); ++ usb_set_intfdata(intf, NULL); ++ lirc_buffer_free(&ttusbir->rbuf); ++ kfree(ttusbir); ++ return -EIO; ++ } ++ ++ /* Allocate and setup the URB that we will use to talk to the device */ ++ for (i = 0; i < num_urbs; i++) { ++ ttusbir->urb[i] = usb_alloc_urb(8, GFP_KERNEL); ++ if (!ttusbir->urb[i]) { ++ err("Could not allocate memory for the URB\n"); ++ for (j = i - 1; j >= 0; j--) ++ kfree(ttusbir->urb[j]); ++ lirc_buffer_free(&ttusbir->rbuf); ++ lirc_unregister_plugin(ttusbir->minor); ++ kfree(ttusbir); ++ usb_set_intfdata(intf, NULL); ++ return -ENOMEM; ++ } ++ ttusbir->urb[i]->dev = ttusbir->udev; ++ ttusbir->urb[i]->context = ttusbir; ++ ttusbir->urb[i]->pipe = usb_rcvisocpipe(ttusbir->udev, ++ ttusbir->endpoint); ++ ttusbir->urb[i]->interval = 1; ++ ttusbir->urb[i]->transfer_flags = URB_ISO_ASAP; ++ ttusbir->urb[i]->transfer_buffer = &ttusbir->buffer[i][0]; ++ ttusbir->urb[i]->complete = urb_complete; ++ ttusbir->urb[i]->number_of_packets = 8; ++ ttusbir->urb[i]->transfer_buffer_length = 128; ++ for (j = 0; j < 8; j++) { ++ ttusbir->urb[i]->iso_frame_desc[j].offset = j*16; ++ ttusbir->urb[i]->iso_frame_desc[j].length = 16; ++ } ++ } ++ return 0; ++} ++ ++/* Called when the driver is unloaded or the device is unplugged ++ */ ++static void disconnect(struct usb_interface *intf) ++{ ++ int i; ++ struct ttusbir_device *ttusbir; ++ ++ DPRINTK("Module ttusbir disconnect\n"); ++ ++ ttusbir = (struct ttusbir_device *) usb_get_intfdata(intf); ++ usb_set_intfdata(intf, NULL); ++ lirc_unregister_plugin(ttusbir->minor); ++ DPRINTK("unregistered\n"); ++ ++ for (i = 0; i < num_urbs; i++) { ++ usb_kill_urb(ttusbir->urb[i]); ++ usb_free_urb(ttusbir->urb[i]); ++ } ++ DPRINTK("URBs killed\n"); ++ lirc_buffer_free(&ttusbir->rbuf); ++ kfree(ttusbir); ++} ++ ++static int ttusbir_init_module(void) ++{ ++ int result; ++ ++ DPRINTK(KERN_DEBUG "Module ttusbir init\n"); ++ ++ /* register this driver with the USB subsystem */ ++ result = usb_register(&driver); ++ if (result) ++ err("usb_register failed. Error number %d", result); ++ return result; ++} ++ ++static void ttusbir_exit_module(void) ++{ ++ printk(KERN_DEBUG "Module ttusbir exit\n"); ++ /* deregister this driver with the USB subsystem */ ++ usb_deregister(&driver); ++} ++ ++module_init(ttusbir_init_module); ++module_exit(ttusbir_exit_module); linux-2.6-netdev-atl2.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 linux-2.6-netdev-atl2.patch Index: linux-2.6-netdev-atl2.patch =================================================================== RCS file: linux-2.6-netdev-atl2.patch diff -N linux-2.6-netdev-atl2.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-netdev-atl2.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,4360 @@ +diff -Nurp a/drivers/net/atl2/atl2_ethtool.c b/drivers/net/atl2/atl2_ethtool.c +--- a/drivers/net/atl2/atl2_ethtool.c 1969-12-31 19:00:00.000000000 -0500 ++++ b/drivers/net/atl2/atl2_ethtool.c 2007-12-10 12:45:39.000000000 -0500 +@@ -0,0 +1,416 @@ ++/* atl2_ethtool.c -- atl2 ethtool support ++ * ++ * Copyright(c) 2007 Atheros Corporation. All rights reserved. ++ * Copyright(c) 2006 xiong huang ++ * Copyright(c) 2007 Chris Snook ++ * ++ * Derived from Intel e1000 driver ++ * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the Free ++ * Software Foundation; either version 2 of the License, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. ++ * ++ * You should have received a copy of the GNU General Public License along with ++ * this program; if not, write to the Free Software Foundation, Inc., 59 ++ * Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "atl2.h" ++#include "atl2_hw.h" ++ ++extern char atl2_driver_name[]; ++extern char atl2_driver_version[]; ++ ++extern int atl2_up(struct atl2_adapter *adapter); ++extern void atl2_down(struct atl2_adapter *adapter); ++extern void atl2_reinit_locked(struct atl2_adapter *adapter); ++extern s32 atl2_reset_hw(struct atl2_hw *hw); ++ ++static int ++atl2_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) ++{ ++ struct atl2_adapter *adapter = netdev_priv(netdev); ++ struct atl2_hw *hw = &adapter->hw; ++ ++ ecmd->supported = (SUPPORTED_10baseT_Half | ++ SUPPORTED_10baseT_Full | ++ SUPPORTED_100baseT_Half | ++ SUPPORTED_100baseT_Full | ++ SUPPORTED_Autoneg | ++ SUPPORTED_TP); ++ ecmd->advertising = ADVERTISED_TP; ++ ++ ecmd->advertising |= ADVERTISED_Autoneg; ++ ecmd->advertising |= hw->autoneg_advertised; ++ ++ ecmd->port = PORT_TP; ++ ecmd->phy_address = 0; ++ ecmd->transceiver = XCVR_INTERNAL; ++ ++ if (adapter->link_speed != SPEED_0) { ++ ecmd->speed = adapter->link_speed; ++ if (adapter->link_duplex == FULL_DUPLEX) ++ ecmd->duplex = DUPLEX_FULL; ++ else ++ ecmd->duplex = DUPLEX_HALF; ++ } else { ++ ecmd->speed = -1; ++ ecmd->duplex = -1; ++ } ++ ++ ecmd->autoneg = AUTONEG_ENABLE; ++ return 0; ++} ++ ++static int ++atl2_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) ++{ ++ struct atl2_adapter *adapter = netdev_priv(netdev); ++ struct atl2_hw *hw = &adapter->hw; ++ ++ while (test_and_set_bit(__ATL2_RESETTING, &adapter->flags)) ++ msleep(1); ++ ++ if (ecmd->autoneg == AUTONEG_ENABLE) { ++#define MY_ADV_MASK (ADVERTISE_10_HALF| \ ++ ADVERTISE_10_FULL| \ ++ ADVERTISE_100_HALF| \ ++ ADVERTISE_100_FULL) ++ ++ if ((ecmd->advertising&MY_ADV_MASK) == MY_ADV_MASK) { ++ hw->MediaType = MEDIA_TYPE_AUTO_SENSOR; ++ hw->autoneg_advertised = MY_ADV_MASK; ++ } else if ((ecmd->advertising&MY_ADV_MASK) == ADVERTISE_100_FULL) { ++ hw->MediaType = MEDIA_TYPE_100M_FULL; ++ hw->autoneg_advertised = ADVERTISE_100_FULL; ++ } else if ((ecmd->advertising&MY_ADV_MASK) == ADVERTISE_100_HALF) { ++ hw->MediaType = MEDIA_TYPE_100M_HALF; ++ hw->autoneg_advertised = ADVERTISE_100_HALF; ++ } else if ((ecmd->advertising&MY_ADV_MASK) == ADVERTISE_10_FULL) { ++ hw->MediaType = MEDIA_TYPE_10M_FULL; ++ hw->autoneg_advertised = ADVERTISE_10_FULL; ++ } else if ((ecmd->advertising&MY_ADV_MASK) == ADVERTISE_10_HALF) { ++ hw->MediaType = MEDIA_TYPE_10M_HALF; ++ hw->autoneg_advertised = ADVERTISE_10_HALF; ++ } else { ++ clear_bit(__ATL2_RESETTING, &adapter->flags); ++ return -EINVAL; ++ } ++ ecmd->advertising = hw->autoneg_advertised | ++ ADVERTISED_TP | ADVERTISED_Autoneg; ++ } else { ++ clear_bit(__ATL2_RESETTING, &adapter->flags); ++ return -EINVAL; ++ } ++ ++ /* reset the link */ ++ if (netif_running(adapter->netdev)) { ++ atl2_down(adapter); ++ atl2_up(adapter); ++ } else ++ atl2_reset_hw(&adapter->hw); ++ ++ clear_bit(__ATL2_RESETTING, &adapter->flags); ++ return 0; ++} ++ ++static u32 ++atl2_get_tx_csum(struct net_device *netdev) ++{ ++ return (netdev->features & NETIF_F_HW_CSUM) != 0; ++} ++ ++static u32 ++atl2_get_msglevel(struct net_device *netdev) ++{ ++ return 0; ++} ++ ++/* ++ * It's sane for this to be empty, but we might want to take advantage of this. ++ */ ++static void ++atl2_set_msglevel(struct net_device *netdev, u32 data) ++{ ++} ++ ++static int ++atl2_get_regs_len(struct net_device *netdev) ++{ ++#define ATL2_REGS_LEN 42 ++ return ATL2_REGS_LEN * sizeof(u32); ++} ++ ++static void ++atl2_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p) ++{ ++ struct atl2_adapter *adapter = netdev_priv(netdev); ++ struct atl2_hw *hw = &adapter->hw; ++ u32 *regs_buff = p; ++ u16 phy_data; ++ ++ memset(p, 0, ATL2_REGS_LEN * sizeof(u32)); ++ ++ regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id; ++ ++ regs_buff[0] = ATL2_READ_REG(hw, REG_VPD_CAP); ++ regs_buff[1] = ATL2_READ_REG(hw, REG_SPI_FLASH_CTRL); ++ regs_buff[2] = ATL2_READ_REG(hw, REG_SPI_FLASH_CONFIG); ++ regs_buff[3] = ATL2_READ_REG(hw, REG_TWSI_CTRL); ++ regs_buff[4] = ATL2_READ_REG(hw, REG_PCIE_DEV_MISC_CTRL); ++ regs_buff[5] = ATL2_READ_REG(hw, REG_MASTER_CTRL); ++ regs_buff[6] = ATL2_READ_REG(hw, REG_MANUAL_TIMER_INIT); ++ regs_buff[7] = ATL2_READ_REG(hw, REG_IRQ_MODU_TIMER_INIT); ++ regs_buff[8] = ATL2_READ_REG(hw, REG_PHY_ENABLE); ++ regs_buff[9] = ATL2_READ_REG(hw, REG_CMBDISDMA_TIMER); ++ regs_buff[10] = ATL2_READ_REG(hw, REG_IDLE_STATUS); ++ regs_buff[11] = ATL2_READ_REG(hw, REG_MDIO_CTRL); ++ regs_buff[12] = ATL2_READ_REG(hw, REG_SERDES_LOCK); ++ regs_buff[13] = ATL2_READ_REG(hw, REG_MAC_CTRL); ++ regs_buff[14] = ATL2_READ_REG(hw, REG_MAC_IPG_IFG); ++ regs_buff[15] = ATL2_READ_REG(hw, REG_MAC_STA_ADDR); ++ regs_buff[16] = ATL2_READ_REG(hw, REG_MAC_STA_ADDR+4); ++ regs_buff[17] = ATL2_READ_REG(hw, REG_RX_HASH_TABLE); ++ regs_buff[18] = ATL2_READ_REG(hw, REG_RX_HASH_TABLE+4); [...3967 lines suppressed...] ++ case enable_option: ++ switch (*value) { ++ case OPTION_ENABLED: ++ printk(KERN_INFO "%s Enabled\n", opt->name); ++ return 0; ++ break; ++ case OPTION_DISABLED: ++ printk(KERN_INFO "%s Disabled\n", opt->name); ++ return 0; ++ break; ++ } ++ break; ++ case range_option: ++ if(*value >= opt->arg.r.min && *value <= opt->arg.r.max) { ++ printk(KERN_INFO "%s set to %i\n", opt->name, *value); ++ return 0; ++ } ++ break; ++ case list_option: ++ for(i = 0; i < opt->arg.l.nr; i++) { ++ ent = &opt->arg.l.p[i]; ++ if(*value == ent->i) { ++ if(ent->str[0] != '\0') ++ printk(KERN_INFO "%s\n", ent->str); ++ return 0; ++ } ++ } ++ break; ++ default: ++ BUG(); ++ } ++ ++ printk(KERN_INFO "Invalid %s specified (%i) %s\n", ++ opt->name, *value, opt->err); ++ *value = opt->def; ++ return -1; ++} ++ ++/** ++ * atl2_check_options - Range Checking for Command Line Parameters ++ * @adapter: board private structure ++ * ++ * This routine checks all command line parameters for valid user ++ * input. If an invalid value is given, or if no user specified ++ * value exists, a default value is used. The final value is stored ++ * in a variable in the adapter structure. ++ **/ ++void __devinit ++atl2_check_options(struct atl2_adapter *adapter) ++{ ++ int val; ++ struct atl2_option opt; ++ int bd = adapter->bd_number; ++ if(bd >= ATL2_MAX_NIC) { ++ printk(KERN_NOTICE "Warning: no configuration for board #%i\n", bd); ++ printk(KERN_NOTICE "Using defaults for all values\n"); ++#ifndef module_param_array ++ bd = ATL2_MAX_NIC; ++#endif ++ } ++ ++ /* Bytes of Transmit Memory */ ++ opt.type = range_option; ++ opt.name = "Bytes of Transmit Memory"; ++ opt.err = "using default of " __MODULE_STRING(ATL2_DEFAULT_TX_MEMSIZE); ++ opt.def = ATL2_DEFAULT_TX_MEMSIZE; ++ opt.arg.r.min = ATL2_MIN_TX_MEMSIZE; ++ opt.arg.r.max = ATL2_MAX_TX_MEMSIZE; ++#ifdef module_param_array ++ if(num_TxMemSize > bd) { ++#endif ++ val = TxMemSize[bd]; ++ atl2_validate_option(&val, &opt); ++ adapter->txd_ring_size = ((u32) val) * 1024; ++#ifdef module_param_array ++ } else { ++ adapter->txd_ring_size = ((u32)opt.def) * 1024; ++ } ++#endif ++ // txs ring size: ++ adapter->txs_ring_size = adapter->txd_ring_size / 128; ++ if (adapter->txs_ring_size > 160) ++ adapter->txs_ring_size = 160; ++ ++ /* Receive Memory Block Count */ ++ opt.type = range_option; ++ opt.name = "Number of receive memory block"; ++ opt.err = "using default of " __MODULE_STRING(ATL2_DEFAULT_RXD_COUNT); ++ opt.def = ATL2_DEFAULT_RXD_COUNT; ++ opt.arg.r.min = ATL2_MIN_RXD_COUNT; ++ opt.arg.r.max = ATL2_MAX_RXD_COUNT; ++#ifdef module_param_array ++ if(num_RxMemBlock > bd) { ++#endif ++ val = RxMemBlock[bd]; ++ atl2_validate_option(&val, &opt); ++ adapter->rxd_ring_size = (u32)val; //((u16)val)&~1; // even number ++#ifdef module_param_array ++ } else { ++ adapter->rxd_ring_size = (u32)opt.def; ++ } ++#endif ++ // init RXD Flow control value ++ adapter->hw.fc_rxd_hi = (adapter->rxd_ring_size/8)*7; ++ adapter->hw.fc_rxd_lo = (ATL2_MIN_RXD_COUNT/8) > (adapter->rxd_ring_size/12) ? ++ (ATL2_MIN_RXD_COUNT/8) : (adapter->rxd_ring_size/12); ++ ++ /* Interrupt Moderate Timer */ ++ opt.type = range_option; ++ opt.name = "Interrupt Moderate Timer"; ++ opt.err = "using default of " __MODULE_STRING(INT_MOD_DEFAULT_CNT); ++ opt.def = INT_MOD_DEFAULT_CNT; ++ opt.arg.r.min = INT_MOD_MIN_CNT; ++ opt.arg.r.max = INT_MOD_MAX_CNT; ++#ifdef module_param_array ++ if(num_IntModTimer > bd) { ++#endif ++ val = IntModTimer[bd]; ++ atl2_validate_option(&val, &opt); ++ adapter->imt = (u16) val; ++#ifdef module_param_array ++ } else { ++ adapter->imt = (u16)(opt.def); ++ } ++#endif ++ /* Flash Vendor */ ++ opt.type = range_option; ++ opt.name = "SPI Flash Vendor"; ++ opt.err = "using default of " __MODULE_STRING(FLASH_VENDOR_DEFAULT); ++ opt.def = FLASH_VENDOR_DEFAULT; ++ opt.arg.r.min = FLASH_VENDOR_MIN; ++ opt.arg.r.max = FLASH_VENDOR_MAX; ++#ifdef module_param_array ++ if(num_FlashVendor > bd) { ++#endif ++ val = FlashVendor[bd]; ++ atl2_validate_option(&val, &opt); ++ adapter->hw.flash_vendor = (u8) val; ++#ifdef module_param_array ++ } else { ++ adapter->hw.flash_vendor = (u8)(opt.def); ++ } ++#endif ++ /* MediaType */ ++ opt.type = range_option; ++ opt.name = "Speed/Duplex Selection"; ++ opt.err = "using default of " __MODULE_STRING(MEDIA_TYPE_AUTO_SENSOR); ++ opt.def = MEDIA_TYPE_AUTO_SENSOR; ++ opt.arg.r.min = MEDIA_TYPE_AUTO_SENSOR; ++ opt.arg.r.max = MEDIA_TYPE_10M_HALF; ++#ifdef module_param_array ++ if(num_MediaType > bd) { ++#endif ++ val = MediaType[bd]; ++ atl2_validate_option(&val, &opt); ++ adapter->hw.MediaType = (u16) val; ++#ifdef module_param_array ++ } else { ++ adapter->hw.MediaType = (u16)(opt.def); ++ } ++#endif ++} +diff -Nurp a/drivers/net/atl2/Makefile b/drivers/net/atl2/Makefile +--- a/drivers/net/atl2/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ b/drivers/net/atl2/Makefile 2008-01-31 14:37:35.000000000 -0500 +@@ -0,0 +1,2 @@ ++obj-$(CONFIG_ATL2) += atl2.o ++atl2-y += atl2_main.o atl2_hw.o atl2_ethtool.o atl2_param.o +diff -Nurp a/drivers/net/Kconfig b/drivers/net/Kconfig +--- a/drivers/net/Kconfig 2008-01-31 14:32:05.000000000 -0500 ++++ b/drivers/net/Kconfig 2008-01-31 14:44:01.000000000 -0500 +@@ -1999,6 +1999,17 @@ config NE_H8300 + Say Y here if you want to use the NE2000 compatible + controller on the Renesas H8/300 processor. + ++config ATL2 ++ tristate "Atheros L2 Fast Ethernet support (EXPERIMENTAL)" ++ depends on PCI && EXPERIMENTAL ++ select CRC32 ++ select MII ++ help ++ This driver supports the Atheros L2 fast ethernet adapter. ++ ++ To compile this driver as a module, choose M here. The module ++ will be called atl2. ++ + source "drivers/net/fec_8xx/Kconfig" + source "drivers/net/fs_enet/Kconfig" + +diff -Nurp a/drivers/net/Makefile b/drivers/net/Makefile +--- a/drivers/net/Makefile 2008-01-31 14:32:05.000000000 -0500 ++++ b/drivers/net/Makefile 2008-01-31 14:38:52.000000000 -0500 +@@ -11,6 +11,7 @@ obj-$(CONFIG_CHELSIO_T3) += cxgb3/ + obj-$(CONFIG_EHEA) += ehea/ + obj-$(CONFIG_BONDING) += bonding/ + obj-$(CONFIG_ATL1) += atl1/ ++obj-$(CONFIG_ATL2) += atl2/ + obj-$(CONFIG_GIANFAR) += gianfar_driver.o + obj-$(CONFIG_TEHUTI) += tehuti.o + linux-2.6-netdev-e1000-disable-alpm.patch: Index: linux-2.6-netdev-e1000-disable-alpm.patch =================================================================== RCS file: linux-2.6-netdev-e1000-disable-alpm.patch diff -N linux-2.6-netdev-e1000-disable-alpm.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-netdev-e1000-disable-alpm.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,70 @@ +Port of f2fa3114919fa195f800a04a5e57156c0f67fff4 (from the netdev tree) +from e1000e to e1000. + +Should fix the checksum problems too. + +bz #400561 (F8) +--- + drivers/net/e1000/e1000_main.c | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +--- linux-2.6.23.noarch.orig/drivers/net/e1000/e1000_main.c ++++ linux-2.6.23.noarch/drivers/net/e1000/e1000_main.c +@@ -846,6 +846,33 @@ e1000_reset(struct e1000_adapter *adapte + e1000_release_manageability(adapter); + } + ++static void e1000e_disable_l1aspm(struct pci_dev *pdev) ++{ ++ int pos; ++ u32 cap; ++ u16 val; ++ ++ /* ++ * 82573 workaround - disable L1 ASPM on mobile chipsets ++ * ++ * L1 ASPM on various mobile (ich7) chipsets do not behave properly ++ * resulting in lost data or garbage information on the pci-e link ++ * level. This could result in (false) bad EEPROM checksum errors, ++ * long ping times (up to 2s) or even a system freeze/hang. ++ * ++ * Unfortunately this feature saves about 1W power consumption when ++ * active. ++ */ ++ pos = pci_find_capability(pdev, PCI_CAP_ID_EXP); ++ pci_read_config_dword(pdev, pos + PCI_EXP_LNKCAP, &cap); ++ pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &val); ++ if (val & 0x2) { ++ dev_warn(&pdev->dev, "Disabling L1 ASPM\n"); ++ val &= ~0x2; ++ pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, val); ++ } ++} ++ + /** + * e1000_probe - Device Initialization Routine + * @pdev: PCI device information struct +@@ -872,6 +899,7 @@ e1000_probe(struct pci_dev *pdev, + uint16_t eeprom_apme_mask = E1000_EEPROM_APME; + DECLARE_MAC_BUF(mac); + ++ e1000e_disable_l1aspm(pdev); + if ((err = pci_enable_device(pdev))) + return err; + +@@ -5180,6 +5209,7 @@ e1000_resume(struct pci_dev *pdev) + + pci_set_power_state(pdev, PCI_D0); + pci_restore_state(pdev); ++ e1000e_disable_l1aspm(pdev); + if ((err = pci_enable_device(pdev))) { + printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n"); + return err; +@@ -5276,6 +5306,7 @@ static pci_ers_result_t e1000_io_slot_re + struct net_device *netdev = pci_get_drvdata(pdev); + struct e1000_adapter *adapter = netdev->priv; + ++ e1000e_disable_l1aspm(pdev); + if (pci_enable_device(pdev)) { + printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n"); + return PCI_ERS_RESULT_DISCONNECT; linux-2.6-ppc-rtc.patch: Index: linux-2.6-ppc-rtc.patch =================================================================== RCS file: linux-2.6-ppc-rtc.patch diff -N linux-2.6-ppc-rtc.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-ppc-rtc.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,98 @@ +diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig +index 1e6715e..3e788b7 100644 +--- a/drivers/rtc/Kconfig ++++ b/drivers/rtc/Kconfig +@@ -461,4 +461,12 @@ config RTC_DRV_RS5C313 + help + If you say yes here you get support for the Ricoh RS5C313 RTC chips. + ++config RTC_DRV_PPC ++ tristate "PowerPC machine dependent RTC support" ++ depends on PPC_MERGE ++ help ++ The PowerPC kernel has machine-specific functions for accessing ++ the RTC. This exposes that functionality through the generic RTC ++ class. ++ + endif # RTC_CLASS +diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile +index 465db4d..e822e56 100644 +--- a/drivers/rtc/Makefile ++++ b/drivers/rtc/Makefile +@@ -49,3 +49,4 @@ obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o + obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o + obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o + obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o ++obj-$(CONFIG_RTC_DRV_PPC) += rtc-ppc.o +--- /dev/null 2007-12-03 03:08:41.854157978 +0000 ++++ b/drivers/rtc/rtc-ppc.c 2007-12-03 16:56:15.000000000 +0000 +@@ -0,0 +1,69 @@ ++/* ++ * RTC driver for ppc_md RTC functions ++ * ++ * ?? 2007 Red Hat, Inc. ++ * ++ * Author: David Woodhouse ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++ ++#include ++#include ++#include ++#include ++#include ++ ++static int ppc_rtc_read_time(struct device *dev, struct rtc_time *tm) ++{ ++ ppc_md.get_rtc_time(tm); ++ return 0; ++} ++ ++static int ppc_rtc_set_time(struct device *dev, struct rtc_time *tm) ++{ ++ return ppc_md.set_rtc_time(tm); ++} ++ ++static const struct rtc_class_ops ppc_rtc_ops = { ++ .set_time = ppc_rtc_set_time, ++ .read_time = ppc_rtc_read_time, ++}; ++ ++static struct rtc_device *rtc; ++static struct platform_device *ppc_rtc_pdev; ++ ++static int __init ppc_rtc_init(void) ++{ ++ if (!ppc_md.get_rtc_time || !ppc_md.set_rtc_time) ++ return -ENODEV; ++ ++ ppc_rtc_pdev = platform_device_register_simple("ppc-rtc", 0, NULL, 0); ++ if (IS_ERR(ppc_rtc_pdev)) ++ return PTR_ERR(ppc_rtc_pdev); ++ ++ rtc = rtc_device_register("ppc_md", &ppc_rtc_pdev->dev, ++ &ppc_rtc_ops, THIS_MODULE); ++ if (IS_ERR(rtc)) { ++ platform_device_unregister(ppc_rtc_pdev); ++ return PTR_ERR(rtc); ++ } ++ ++ return 0; ++} ++ ++static void __exit ppc_rtc_exit(void) ++{ ++ rtc_device_unregister(rtc); ++ platform_device_unregister(ppc_rtc_pdev); ++} ++ ++module_init(ppc_rtc_init); ++module_exit(ppc_rtc_exit); ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("David Woodhouse "); ++MODULE_DESCRIPTION("Generic RTC class driver for PowerPC"); linux-2.6-ppc-use-libgcc.patch: Index: linux-2.6-ppc-use-libgcc.patch =================================================================== RCS file: linux-2.6-ppc-use-libgcc.patch diff -N linux-2.6-ppc-use-libgcc.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-ppc-use-libgcc.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,102 @@ +diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile +index 4bb023f..63e68d2 100644 +--- a/arch/powerpc/lib/Makefile ++++ b/arch/powerpc/lib/Makefile +@@ -23,3 +23,5 @@ obj-$(CONFIG_SMP) += locks.o + endif + + obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o ++ ++obj-y += libgcc/ +diff --git a/arch/powerpc/lib/libgcc/Makefile b/arch/powerpc/lib/libgcc/Makefile +new file mode 100644 +index 0000000..36d8e1e +--- /dev/null ++++ b/arch/powerpc/lib/libgcc/Makefile +@@ -0,0 +1,2 @@ ++obj-y += __divdi3.o ++obj-y += __udivmoddi4.o +diff --git a/arch/powerpc/lib/libgcc/__divdi3.c b/arch/powerpc/lib/libgcc/__divdi3.c +new file mode 100644 +index 0000000..f23c6fe +--- /dev/null ++++ b/arch/powerpc/lib/libgcc/__divdi3.c +@@ -0,0 +1,23 @@ ++#include "libgcc.h" ++ ++s64 __divdi3(s64 num, s64 den) ++{ ++ int minus = 0; ++ s64 v; ++ ++ if (num < 0) { ++ num = -num; ++ minus = 1; ++ } ++ if (den < 0) { ++ den = -den; ++ minus ^= 1; ++ } ++ ++ v = __udivmoddi4(num, den, NULL); ++ if (minus) ++ v = -v; ++ ++ return v; ++} ++EXPORT_SYMBOL(__divdi3); +diff --git a/arch/powerpc/lib/libgcc/__udivmoddi4.c b/arch/powerpc/lib/libgcc/__udivmoddi4.c +new file mode 100644 +index 0000000..2df0caa +--- /dev/null ++++ b/arch/powerpc/lib/libgcc/__udivmoddi4.c +@@ -0,0 +1,31 @@ ++#include "libgcc.h" ++ ++u64 __udivmoddi4(u64 num, u64 den, u64 * rem_p) ++{ ++ u64 quot = 0, qbit = 1; ++ ++ if (den == 0) { ++ BUG(); ++ } ++ ++ /* Left-justify denominator and count shift */ ++ while ((s64) den >= 0) { ++ den <<= 1; ++ qbit <<= 1; ++ } ++ ++ while (qbit) { ++ if (den <= num) { ++ num -= den; ++ quot += qbit; ++ } ++ den >>= 1; ++ qbit >>= 1; ++ } ++ ++ if (rem_p) ++ *rem_p = num; ++ ++ return quot; ++} ++EXPORT_SYMBOL(__udivmoddi4); +diff --git a/arch/powerpc/lib/libgcc/libgcc.h b/arch/powerpc/lib/libgcc/libgcc.h +new file mode 100644 +index 0000000..4dd6a2e +--- /dev/null ++++ b/arch/powerpc/lib/libgcc/libgcc.h +@@ -0,0 +1,12 @@ ++#ifndef _LIBGCC_H_ ++#define _LIBGCC_H_ ++ ++#include ++#include ++ ++/* Cribbed from klibc/libgcc/ */ ++ ++s64 __divdi3(s64 num, s64 den); ++u64 __udivmoddi4(u64 num, u64 den, u64 * rem_p); ++ ++#endif /*_LIBGCC_H_*/ linux-2.6-ps3-legacy-bootloader-hack.patch: Index: linux-2.6-ps3-legacy-bootloader-hack.patch =================================================================== RCS file: linux-2.6-ps3-legacy-bootloader-hack.patch diff -N linux-2.6-ps3-legacy-bootloader-hack.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-ps3-legacy-bootloader-hack.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,37 @@ +A temporary hack to support the legacy 2.6.16 bootloader. This will be +removed as soon as a 2.6.22 bootloader is ready. + +Hacked-by: Geoff Levand +--- + arch/powerpc/kernel/prom.c | 6 ++++++ + arch/powerpc/platforms/ps3/setup.c | 4 +++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +--- a/arch/powerpc/kernel/prom.c ++++ b/arch/powerpc/kernel/prom.c +@@ -939,6 +939,12 @@ static int __init early_init_dt_scan_mem + size = 0x80000000ul - base; + } + #endif ++#ifdef CONFIG_PPC_PS3 ++ /* temporary hack for the legacy bootloader */ ++ if (of_flat_dt_is_compatible(of_get_flat_dt_root(), "PS3PF")) { ++ size = 0x8000000; ++ } ++#endif + lmb_add(base, size); + } + return 0; +--- a/arch/powerpc/platforms/ps3/setup.c ++++ b/arch/powerpc/platforms/ps3/setup.c +@@ -210,7 +210,9 @@ static int __init ps3_probe(void) + DBG(" -> %s:%d\n", __func__, __LINE__); + + dt_root = of_get_flat_dt_root(); +- if (!of_flat_dt_is_compatible(dt_root, "sony,ps3")) ++ if (!of_flat_dt_is_compatible(dt_root, "sony,ps3") ++ /* temporary hack for the legacy bootloader */ ++ && !of_flat_dt_is_compatible(dt_root, "PS3PF")) + return 0; + + powerpc_firmware_features |= FW_FEATURE_PS3_POSSIBLE; linux-2.6-ps3-storage-alias.patch: Index: linux-2.6-ps3-storage-alias.patch =================================================================== RCS file: linux-2.6-ps3-storage-alias.patch diff -N linux-2.6-ps3-storage-alias.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-ps3-storage-alias.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,7 @@ +--- linux-2.6.22.ppc64/drivers/block/ps3disk.c~ 2007-07-25 16:06:16.000000000 +0100 ++++ linux-2.6.22.ppc64/drivers/block/ps3disk.c 2007-07-26 08:49:44.000000000 +0100 +@@ -628,3 +628,4 @@ MODULE_LICENSE("GPL"); + MODULE_DESCRIPTION("PS3 Disk Storage Driver"); + MODULE_AUTHOR("Sony Corporation"); + MODULE_ALIAS(PS3_MODULE_ALIAS_STOR_DISK); ++MODULE_ALIAS("ps3_storage"); linux-2.6-scsi-mpt-vmware-fix.patch: Index: linux-2.6-scsi-mpt-vmware-fix.patch =================================================================== RCS file: linux-2.6-scsi-mpt-vmware-fix.patch diff -N linux-2.6-scsi-mpt-vmware-fix.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-scsi-mpt-vmware-fix.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,43 @@ +The attached patch is a workaround for a bug in VMWare's emulated LSI +Fusion SCSI HBA. The emulated firmware returns zero for the maximum +number of attached devices; the real firmware returns a positive +number. Therefore, the kernel that boots and works fine on bare metal +will fail on VMWare because this firmware value is handed to the SCSI +midlayer, which then skips the entire bus scan. + +F7 bz 241935 + +The patch below was submitted by Eric Moore of LSI to the linux-scsi +mailing list: + +http://marc.info/?l=linux-scsi&m=117432237404247 + +then immediately rejected by Christoph Hellwig, who prefers that +VMWare fix their emulation instead. + +diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c +index eddb933..21fadf2 100644 +--- a/drivers/message/fusion/mptbase.c ++++ b/drivers/message/fusion/mptbase.c +@@ -2571,8 +2571,19 @@ GetPortFacts(MPT_ADAPTER *ioc, int portnum, int sleepFlag) + pfacts->MaxPersistentIDs = le16_to_cpu(pfacts->MaxPersistentIDs); + pfacts->MaxLanBuckets = le16_to_cpu(pfacts->MaxLanBuckets); + +- max_id = (ioc->bus_type == SAS) ? pfacts->PortSCSIID : +- pfacts->MaxDevices; ++ switch (ioc->bus_type) { ++ case SAS: ++ max_id = pfacts->PortSCSIID; ++ break; ++ case FC: ++ max_id = pfacts->MaxDevices; ++ break; ++ case SPI: ++ default: ++ max_id = MPT_MAX_SCSI_DEVICES; ++ break; ++ } ++ + ioc->devices_per_bus = (max_id > 255) ? 256 : max_id; + ioc->number_of_buses = (ioc->devices_per_bus < 256) ? 1 : max_id/256; + linux-2.6-smarter-relatime.patch: Index: linux-2.6-smarter-relatime.patch =================================================================== RCS file: linux-2.6-smarter-relatime.patch diff -N linux-2.6-smarter-relatime.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-smarter-relatime.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,267 @@ + +Subject: [patch] [patch] implement smarter atime updates support +From: Ingo Molnar + +change relatime updates to be performed once per day. This makes +relatime a compatible solution for HSM, mailer-notification and +tmpwatch applications too. + +also add the CONFIG_DEFAULT_RELATIME kernel option, which makes +"norelatime" the default for all mounts without an extra kernel +boot option. + +add the "default_relatime=0" boot option to turn this off. + +also add the /proc/sys/kernel/default_relatime flag which can be changed +runtime to modify the behavior of subsequent new mounts. + +tested by moving the date forward: + + # date + Sun Aug 5 22:55:14 CEST 2007 + # date -s "Tue Aug 7 22:55:14 CEST 2007" + Tue Aug 7 22:55:14 CEST 2007 + +access to a file did not generate disk IO before the date was set, and +it generated exactly one IO after the date was set. + +Signed-off-by: Ingo Molnar +--- + Documentation/kernel-parameters.txt | 8 +++++ + fs/Kconfig | 22 ++++++++++++++ + fs/inode.c | 53 +++++++++++++++++++++++++++--------- + fs/namespace.c | 24 ++++++++++++++++ + include/linux/mount.h | 3 ++ + kernel/sysctl.c | 17 +++++++++++ + 6 files changed, 114 insertions(+), 13 deletions(-) + +Index: linux/Documentation/kernel-parameters.txt +=================================================================== +--- linux.orig/Documentation/kernel-parameters.txt ++++ linux/Documentation/kernel-parameters.txt +@@ -525,6 +525,10 @@ and is between 256 and 4096 characters. + This is a 16-member array composed of values + ranging from 0-255. + ++ default_relatime= ++ [FS] mount all filesystems with relative atime ++ updates by default. ++ + vt.default_utf8= + [VT] + Format=<0|1> +@@ -1468,6 +1472,10 @@ and is between 256 and 4096 characters. + Format: [,[,...]] + See arch/*/kernel/reboot.c or arch/*/kernel/process.c + ++ relatime_interval= ++ [FS] relative atime update frequency, in seconds. ++ (default: 1 day: 86400 seconds) ++ + reserve= [KNL,BUGS] Force the kernel to ignore some iomem area + + reservetop= [X86-32] +--- linux-2.6.23.noarch/fs/Kconfig~ 2007-10-17 17:09:10.000000000 -0400 ++++ linux-2.6.23.noarch/fs/Kconfig 2007-10-17 17:10:05.000000000 -0400 +@@ -2173,6 +2173,29 @@ config 9P_FS + + endif # NETWORK_FILESYSTEMS + ++config DEFAULT_RELATIME ++ bool "Mount all filesystems with relatime by default" ++ default y ++ help ++ If you say Y here, all your filesystems will be mounted ++ with the "relatime" mount option. This eliminates many atime ++ ('file last accessed' timestamp) updates (which otherwise ++ is performed on every file access and generates a write ++ IO to the inode) and thus speeds up IO. Atime is still updated, ++ but only once per day. ++ ++ The mtime ('file last modified') and ctime ('file created') ++ timestamp are unaffected by this change. ++ ++ Use the "norelatime" kernel boot option to turn off this ++ feature. ++ ++config DEFAULT_RELATIME_VAL ++ int ++ default "1" if DEFAULT_RELATIME ++ default "0" ++ ++ + if BLOCK + menu "Partition Types" + +Index: linux/fs/inode.c +=================================================================== +--- linux.orig/fs/inode.c ++++ linux/fs/inode.c +@@ -1162,6 +1162,41 @@ sector_t bmap(struct inode * inode, sect + } + EXPORT_SYMBOL(bmap); + ++/* ++ * Relative atime updates frequency (default: 1 day): ++ */ ++int relatime_interval __read_mostly = 24*60*60; ++ ++/* ++ * With relative atime, only update atime if the ++ * previous atime is earlier than either the ctime or ++ * mtime. ++ */ ++static int relatime_need_update(struct inode *inode, struct timespec now) ++{ ++ /* ++ * Is mtime younger than atime? If yes, update atime: ++ */ ++ if (timespec_compare(&inode->i_mtime, &inode->i_atime) >= 0) ++ return 1; ++ /* ++ * Is ctime younger than atime? If yes, update atime: ++ */ ++ if (timespec_compare(&inode->i_ctime, &inode->i_atime) >= 0) ++ return 1; ++ ++ /* ++ * Is the previous atime value older than a day? If yes, ++ * update atime: ++ */ ++ if ((long)(now.tv_sec - inode->i_atime.tv_sec) >= relatime_interval) ++ return 1; ++ /* ++ * Good, we can skip the atime update: ++ */ ++ return 0; ++} ++ + /** + * touch_atime - update the access time + * @mnt: mount the inode is accessed on +@@ -1191,22 +1226,14 @@ void touch_atime(struct vfsmount *mnt, s + return; + if ((mnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode)) + return; +- +- if (mnt->mnt_flags & MNT_RELATIME) { +- /* +- * With relative atime, only update atime if the +- * previous atime is earlier than either the ctime or +- * mtime. +- */ +- if (timespec_compare(&inode->i_mtime, +- &inode->i_atime) < 0 && +- timespec_compare(&inode->i_ctime, +- &inode->i_atime) < 0) ++ } ++ now = current_fs_time(inode->i_sb); ++ if (mnt) { ++ if (mnt->mnt_flags & MNT_RELATIME) ++ if (!relatime_need_update(inode, now)) + return; +- } + } + +- now = current_fs_time(inode->i_sb); + if (timespec_equal(&inode->i_atime, &now)) + return; + +Index: linux/fs/namespace.c +=================================================================== +--- linux.orig/fs/namespace.c ++++ linux/fs/namespace.c +@@ -1107,6 +1107,7 @@ int do_add_mount(struct vfsmount *newmnt + goto unlock; + + newmnt->mnt_flags = mnt_flags; ++ + if ((err = graft_tree(newmnt, nd))) + goto unlock; + +@@ -1362,6 +1363,24 @@ int copy_mount_options(const void __user + } + + /* ++ * Allow users to disable (or enable) atime updates via a .config ++ * option or via the boot line, or via /proc/sys/fs/default_relatime: ++ */ ++int default_relatime __read_mostly = CONFIG_DEFAULT_RELATIME_VAL; ++ ++static int __init set_default_relatime(char *str) ++{ ++ get_option(&str, &default_relatime); ++ ++ printk(KERN_INFO "Mount all filesystems with" ++ "default relative atime updates: %s.\n", ++ default_relatime ? "enabled" : "disabled"); ++ ++ return 1; ++} ++__setup("default_relatime=", set_default_relatime); ++ ++/* + * Flags is a 32-bit value that allows up to 31 non-fs dependent flags to + * be given to the mount() call (ie: read-only, no-dev, no-suid etc). + * +@@ -1409,6 +1428,11 @@ long do_mount(char *dev_name, char *dir_ + mnt_flags |= MNT_NODIRATIME; + if (flags & MS_RELATIME) + mnt_flags |= MNT_RELATIME; ++ else if (default_relatime && ++ !(flags & (MNT_NOATIME | MNT_NODIRATIME))) { ++ mnt_flags |= MNT_RELATIME; ++ flags |= MS_RELATIME; ++ } + + flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE | + MS_NOATIME | MS_NODIRATIME | MS_RELATIME); +Index: linux/include/linux/mount.h +=================================================================== +--- linux.orig/include/linux/mount.h ++++ linux/include/linux/mount.h +@@ -103,5 +103,8 @@ extern void shrink_submounts(struct vfsm + extern spinlock_t vfsmount_lock; + extern dev_t name_to_dev_t(char *name); + ++extern int default_relatime; ++extern int relatime_interval; ++ + #endif + #endif /* _LINUX_MOUNT_H */ +Index: linux/kernel/sysctl.c +=================================================================== +--- linux.orig/kernel/sysctl.c ++++ linux/kernel/sysctl.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -1206,6 +1207,22 @@ static ctl_table fs_table[] = { + .mode = 0644, + .proc_handler = &proc_dointvec, + }, ++ { ++ .ctl_name = CTL_UNNUMBERED, ++ .procname = "default_relatime", ++ .data = &default_relatime, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &proc_dointvec, ++ }, ++ { ++ .ctl_name = CTL_UNNUMBERED, ++ .procname = "relatime_interval", ++ .data = &relatime_interval, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &proc_dointvec, ++ }, + #if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) + { + .ctl_name = CTL_UNNUMBERED, + linux-2.6-usb-ehci-hcd-respect-nousb.patch: Index: linux-2.6-usb-ehci-hcd-respect-nousb.patch =================================================================== RCS file: linux-2.6-usb-ehci-hcd-respect-nousb.patch diff -N linux-2.6-usb-ehci-hcd-respect-nousb.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-usb-ehci-hcd-respect-nousb.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,20 @@ +Make the EHCI host driver respect the "nousb" kernel option. + +Signed-off-by: Chuck Ebbert + +--- + drivers/usb/host/ehci-hcd.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- linux-2.6.23.noarch.orig/drivers/usb/host/ehci-hcd.c ++++ linux-2.6.23.noarch/drivers/usb/host/ehci-hcd.c +@@ -973,6 +973,9 @@ static int __init ehci_hcd_init(void) + { + int retval = 0; + ++ if (usb_disabled()) ++ return -ENODEV; ++ + pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n", + hcd_name, + sizeof(struct ehci_qh), sizeof(struct ehci_qtd), linux-2.6-utrace-ptrace-compat-avr32.patch: Index: linux-2.6-utrace-ptrace-compat-avr32.patch =================================================================== RCS file: linux-2.6-utrace-ptrace-compat-avr32.patch diff -N linux-2.6-utrace-ptrace-compat-avr32.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-utrace-ptrace-compat-avr32.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,137 @@ +[PATCH 4d] utrace: avr32 ptrace compatibility + +From: Haavard Skinnemoen + +Rip out most of the ptrace code for AVR32 and replace it with the much +nicer utrace stuff. It builds in all possible combinations of +CONFIG_UTRACE and CONFIG_PTRACE, and it seems to work as far as I've tested +it with strace and some simple debugging with gdb. + +Signed-off-by: Haavard Skinnemoen +Signed-off-by: Roland McGrath + +--- + + arch/avr32/kernel/ptrace.c | 91 +++++++++----------------------------------- + 1 files changed, 19 insertions(+), 72 deletions(-) + +--- linux-2.6/arch/avr32/kernel/ptrace.c ++++ linux-2.6/arch/avr32/kernel/ptrace.c +@@ -112,98 +112,45 @@ const struct utrace_regset_view *utrace_ + } + #endif /* CONFIG_UTRACE */ + ++#ifdef CONFIG_PTRACE + +-#if 0 +-long arch_ptrace(struct task_struct *child, long request, long addr, long data) ++static const struct ptrace_layout_segment avr32_uarea[] = { ++ { 0, ELF_NGREG * sizeof(long), 0, 0 }, ++ { 0, 0, -1, 0 }, ++}; ++ ++int arch_ptrace(long *request, struct task_struct *child, ++ struct utrace_attached_engine *engine, ++ unsigned long addr, unsigned long data, long *val) + { +- int ret; ++ pr_debug("arch_ptrace(%ld, %d, %#lx, %#lx)\n", ++ *request, child->pid, addr, data); + + pr_debug("ptrace: Enabling monitor mode...\n"); + ocd_write(DC, ocd_read(DC) | (1 << OCD_DC_MM_BIT) + | (1 << OCD_DC_DBE_BIT)); + +- switch (request) { +- /* Read the word at location addr in the child process */ +- case PTRACE_PEEKTEXT: +- case PTRACE_PEEKDATA: +- ret = generic_ptrace_peekdata(child, addr, data); +- break; +- ++ switch (*request) { + case PTRACE_PEEKUSR: +- ret = ptrace_read_user(child, addr, +- (unsigned long __user *)data); +- break; +- +- /* Write the word in data at location addr */ +- case PTRACE_POKETEXT: +- case PTRACE_POKEDATA: +- ret = generic_ptrace_pokedata(child, addr, data); +- break; ++ return ptrace_peekusr(child, engine, avr32_uarea, addr, data); + + case PTRACE_POKEUSR: +- ret = ptrace_write_user(child, addr, data); +- break; +- +- /* continue and stop at next (return from) syscall */ +- case PTRACE_SYSCALL: +- /* restart after signal */ +- case PTRACE_CONT: +- ret = -EIO; +- if (!valid_signal(data)) +- break; +- if (request == PTRACE_SYSCALL) +- set_tsk_thread_flag(child, TIF_SYSCALL_TRACE); +- else +- clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); +- child->exit_code = data; +- /* XXX: Are we sure no breakpoints are active here? */ +- wake_up_process(child); +- ret = 0; +- break; +- +- /* +- * Make the child exit. Best I can do is send it a +- * SIGKILL. Perhaps it should be put in the status that it +- * wants to exit. +- */ +- case PTRACE_KILL: +- ret = 0; +- if (child->exit_state == EXIT_ZOMBIE) +- break; +- child->exit_code = SIGKILL; +- wake_up_process(child); +- break; +- +- /* +- * execute single instruction. +- */ +- case PTRACE_SINGLESTEP: +- ret = -EIO; +- if (!valid_signal(data)) +- break; +- clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); +- ptrace_single_step(child); +- child->exit_code = data; +- wake_up_process(child); +- ret = 0; ++ return ptrace_pokeusr(child, engine, avr32_uarea, addr, data); + break; + + case PTRACE_GETREGS: +- ret = ptrace_getregs(child, (void __user *)data); ++ return ptrace_whole_regset(child, engine, data, 0, 0); + break; + + case PTRACE_SETREGS: +- ret = ptrace_setregs(child, (const void __user *)data); +- break; +- +- default: +- ret = ptrace_request(child, request, addr, data); ++ return ptrace_whole_regset(child, engine, data, 0, 1); + break; + } + +- return ret; ++ return -ENOSYS; + } +-#endif ++#endif /* CONFIG_PTRACE */ ++#endif /* CONFIG_UTRACE */ + + asmlinkage void syscall_trace(struct pt_regs *regs, int is_exit) + { linux-2.6-utrace-regset-avr32.patch: Index: linux-2.6-utrace-regset-avr32.patch =================================================================== RCS file: linux-2.6-utrace-regset-avr32.patch diff -N linux-2.6-utrace-regset-avr32.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-utrace-regset-avr32.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,159 @@ +[PATCH 2d] utrace: avr32 regset support + +From: Haavard Skinnemoen + +Rip out most of the ptrace code for AVR32 and replace it with the much +nicer utrace stuff. + +CC: Haavard Skinnemoen +Signed-off-by: Roland McGrath + +--- + + arch/avr32/kernel/ptrace.c | 111 +++++++++++++++++--------------------------- + 1 files changed, 44 insertions(+), 67 deletions(-) + +--- linux-2.6/arch/avr32/kernel/ptrace.c ++++ linux-2.6/arch/avr32/kernel/ptrace.c +@@ -14,10 +14,14 @@ + #include + #include + #include ++#include + ++#include + #include + #include + ++#ifdef CONFIG_UTRACE ++ + static struct pt_regs *get_user_regs(struct task_struct *tsk) + { + return (struct pt_regs *)((unsigned long)task_stack_page(tsk) + +@@ -57,86 +61,59 @@ void ptrace_disable(struct task_struct * + clear_tsk_thread_flag(child, TIF_BREAKPOINT); + } + +-/* +- * Read the word at offset "offset" into the task's "struct user". We +- * actually access the pt_regs struct stored on the kernel stack. +- */ +-static int ptrace_read_user(struct task_struct *tsk, unsigned long offset, +- unsigned long __user *data) ++static int genregs_get(struct task_struct *target, ++ const struct utrace_regset *regset, ++ unsigned int pos, unsigned int count, ++ void *kbuf, void __user *ubuf) + { +- unsigned long *regs; +- unsigned long value; +- +- if (offset & 3 || offset >= sizeof(struct user)) { +- printk("ptrace_read_user: invalid offset 0x%08lx\n", offset); +- return -EIO; +- } +- +- regs = (unsigned long *)get_user_regs(tsk); +- +- value = 0; +- if (offset < sizeof(struct pt_regs)) +- value = regs[offset / sizeof(regs[0])]; ++ struct pt_regs *regs = get_user_regs(target); + +- pr_debug("ptrace_read_user(%s[%u], %#lx, %p) -> %#lx\n", +- tsk->comm, tsk->pid, offset, data, value); +- +- return put_user(value, data); ++ return utrace_regset_copyout(&pos, &count, &kbuf, &ubuf, ++ regs, 0, -1); + } + +-/* +- * Write the word "value" to offset "offset" into the task's "struct +- * user". We actually access the pt_regs struct stored on the kernel +- * stack. +- */ +-static int ptrace_write_user(struct task_struct *tsk, unsigned long offset, +- unsigned long value) ++static int genregs_set(struct task_struct *target, ++ const struct utrace_regset *regset, ++ unsigned int pos, unsigned int count, ++ const void *kbuf, const void __user *ubuf) + { +- unsigned long *regs; +- +- pr_debug("ptrace_write_user(%s[%u], %#lx, %#lx)\n", +- tsk->comm, tsk->pid, offset, value); +- +- if (offset & 3 || offset >= sizeof(struct user)) { +- pr_debug(" invalid offset 0x%08lx\n", offset); +- return -EIO; +- } +- +- if (offset >= sizeof(struct pt_regs)) +- return 0; ++ struct pt_regs *regs = get_user_regs(target); + +- regs = (unsigned long *)get_user_regs(tsk); +- regs[offset / sizeof(regs[0])] = value; +- +- return 0; ++ return utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, ++ regs, 0, -1); + } + +-static int ptrace_getregs(struct task_struct *tsk, void __user *uregs) +-{ +- struct pt_regs *regs = get_user_regs(tsk); ++static const struct utrace_regset native_regsets[] = { ++ { ++ .core_note_type = NT_PRSTATUS, ++ .n = ELF_NGREG, ++ .size = sizeof(long), ++ .align = sizeof(long), ++ .get = genregs_get, ++ .set = genregs_set, ++ }, ++ /* ++ * Other register sets that probably would make sense: ++ * - Coprocessor registers (8 coprocs with 16 registers each) ++ * - TLS stuff ++ */ ++}; + +- return copy_to_user(uregs, regs, sizeof(*regs)) ? -EFAULT : 0; +-} ++static const struct utrace_regset_view utrace_avr32_native_view = { ++ .name = UTS_MACHINE, ++ .e_machine = ELF_ARCH, ++ .regsets = native_regsets, ++ .n = ARRAY_SIZE(native_regsets), ++}; + +-static int ptrace_setregs(struct task_struct *tsk, const void __user *uregs) ++const struct utrace_regset_view *utrace_native_view(struct task_struct *tsk) + { +- struct pt_regs newregs; +- int ret; +- +- ret = -EFAULT; +- if (copy_from_user(&newregs, uregs, sizeof(newregs)) == 0) { +- struct pt_regs *regs = get_user_regs(tsk); +- +- ret = -EINVAL; +- if (valid_user_regs(&newregs)) { +- *regs = newregs; +- ret = 0; +- } +- } +- +- return ret; ++ return &utrace_avr32_native_view; + } ++#endif /* CONFIG_UTRACE */ ++ + ++#if 0 + long arch_ptrace(struct task_struct *child, long request, long addr, long data) + { + int ret; linux-2.6-utrace-tracehook-avr32.patch: Index: linux-2.6-utrace-tracehook-avr32.patch =================================================================== RCS file: linux-2.6-utrace-tracehook-avr32.patch diff -N linux-2.6-utrace-tracehook-avr32.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-utrace-tracehook-avr32.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -0,0 +1,205 @@ +[PATCH 1e] utrace: tracehook for AVR32 + +From: Haavard Skinnemoen + +This patch does the initial tracehook conversion for AVR32. + +Signed-off-by: Haavard Skinnemoen +Signed-off-by: Roland McGrath + +--- + + arch/avr32/kernel/ptrace.c | 50 +++++++++++++++---------------- + arch/avr32/kernel/process.c | 2 - + arch/avr32/kernel/entry-avr32b.S | 10 +++++- + include/asm-avr32/tracehook.h | 62 ++++++++++++++++++++++++++++++++++++++ + 4 files changed, 94 insertions(+), 30 deletions(-) + create include/asm-avr32/tracehook.h + +--- linux-2.6/arch/avr32/kernel/ptrace.c ++++ linux-2.6/arch/avr32/kernel/ptrace.c +@@ -5,20 +5,16 @@ + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +-#undef DEBUG ++#include ++#include ++#include + #include + #include + #include + #include + #include + #include +-#include +-#include +-#include +- +-#include +-#include +-#include ++ + #include + #include + +@@ -28,6 +24,7 @@ static struct pt_regs *get_user_regs(str + THREAD_SIZE - sizeof(struct pt_regs)); + } + ++#if 0 + static void ptrace_single_step(struct task_struct *tsk) + { + pr_debug("ptrace_single_step: pid=%u, PC=0x%08lx, SR=0x%08lx\n", +@@ -229,30 +226,31 @@ long arch_ptrace(struct task_struct *chi + + return ret; + } ++#endif + +-asmlinkage void syscall_trace(void) ++asmlinkage void syscall_trace(struct pt_regs *regs, int is_exit) + { + if (!test_thread_flag(TIF_SYSCALL_TRACE)) + return; +- if (!(current->ptrace & PT_PTRACED)) +- return; + +- /* The 0x80 provides a way for the tracing parent to +- * distinguish between a syscall stop and SIGTRAP delivery */ +- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) +- ? 0x80 : 0)); ++ tracehook_report_syscall(regs, is_exit); ++} + +- /* +- * this isn't the same as continuing with a signal, but it +- * will do for normal use. strace only continues with a +- * signal if the stopping signal is not SIGTRAP. -brl +- */ +- if (current->exit_code) { +- pr_debug("syscall_trace: sending signal %d to PID %u\n", +- current->exit_code, current->pid); +- send_sig(current->exit_code, current, 1); +- current->exit_code = 0; +- } ++/* ++ * Handle hitting a breakpoint ++ */ ++static void do_breakpoint(struct task_struct *tsk, struct pt_regs *regs) ++{ ++ siginfo_t info; ++ ++ info.si_signo = SIGTRAP; ++ info.si_errno = 0; ++ info.si_code = TRAP_BRKPT; ++ info.si_addr = (void __user *)instruction_pointer(regs); ++ ++ pr_debug("ptrace_break: Sending SIGTRAP to PID %u (pc = 0x%p)\n", ++ tsk->pid, info.si_addr); ++ force_sig_info(SIGTRAP, &info, tsk); + } + + /* +--- linux-2.6/arch/avr32/kernel/process.c ++++ linux-2.6/arch/avr32/kernel/process.c +@@ -383,8 +383,6 @@ asmlinkage int sys_execve(char __user *u + goto out; + + error = do_execve(filename, uargv, uenvp, regs); +- if (error == 0) +- current->ptrace &= ~PT_DTRACE; + putname(filename); + + out: +--- linux-2.6/arch/avr32/kernel/entry-avr32b.S ++++ linux-2.6/arch/avr32/kernel/entry-avr32b.S +@@ -230,15 +230,21 @@ ret_from_fork: + rjmp syscall_exit_cont + + syscall_trace_enter: +- pushm r8-r12 ++ mov r12, sp /* regs */ ++ mov r11, 0 /* is_exit */ + rcall syscall_trace +- popm r8-r12 ++ ++ /* syscall_trace may update r8, so reload r8-r12 from regs. */ ++ sub lr, sp, -REG_R12 ++ ldm lr, r8-r12 + rjmp syscall_trace_cont + + syscall_exit_work: + bld r1, TIF_SYSCALL_TRACE + brcc 1f + unmask_interrupts ++ mov r12, sp ++ mov r11, 1 + rcall syscall_trace + mask_interrupts + ld.w r1, r0[TI_flags] +--- linux-2.6/include/asm-avr32/tracehook.h ++++ linux-2.6/include/asm-avr32/tracehook.h +@@ -0,0 +1,62 @@ ++/* ++ * Tracing hooks for AVR32 ++ * ++ * Copyright (C) 2007 Atmel Corporation ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++#ifndef _ASM_AVR32_TRACEHOOK_H ++#define _ASM_AVR32_TRACEHOOK_H ++ ++#include ++ ++#define ARCH_HAS_SINGLE_STEP 1 ++ ++static inline void tracehook_enable_single_step(struct task_struct *tsk) ++{ ++ /* ++ * If the process is stopped in debug mode, simply set ++ * TIF_SINGLE_STEP to tell the monitor code to set the single ++ * step bit in DC before returning. ++ * ++ * Otherwise, we need to set a breakpoint at the return ++ * address before returning to userspace. TIF_BREAKPOINT will ++ * tell the syscall/exception exit code to do this. ++ */ ++ if (!(tsk->thread.cpu_context.sr & SR_D)) ++ set_tsk_thread_flag(tsk, TIF_BREAKPOINT); ++ ++ set_tsk_thread_flag(tsk, TIF_SINGLE_STEP); ++} ++ ++static inline void tracehook_disable_single_step(struct task_struct *tsk) ++{ ++ clear_tsk_thread_flag(tsk, TIF_BREAKPOINT); ++ clear_tsk_thread_flag(tsk, TIF_SINGLE_STEP); ++} ++ ++static inline int tracehook_single_step_enabled(struct task_struct *tsk) ++{ ++ return test_tsk_thread_flag(tsk, TIF_SINGLE_STEP); ++} ++ ++static inline void tracehook_enable_syscall_trace(struct task_struct *tsk) ++{ ++ set_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE); ++} ++ ++static inline void tracehook_disable_syscall_trace(struct task_struct *tsk) ++{ ++ clear_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE); ++} ++ ++static inline void tracehook_abort_syscall(struct pt_regs *regs) ++{ ++ /* Invalid system call number => return -ENOSYS */ ++ regs->r8 = -1; ++} ++ ++ ++#endif /* _ASM_AVR32_TRACEHOOK_H */ linux-2.6-uvcvideo.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 linux-2.6-uvcvideo.patch Index: linux-2.6-uvcvideo.patch =================================================================== RCS file: linux-2.6-uvcvideo.patch diff -N linux-2.6-uvcvideo.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-uvcvideo.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,6928 @@ +diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig +index c9f14bf..19acd71 100644 +--- a/drivers/media/video/Kconfig ++++ b/drivers/media/video/Kconfig +@@ -718,6 +718,7 @@ source "drivers/media/video/em28xx/Kconfig" + source "drivers/media/video/usbvision/Kconfig" + + source "drivers/media/video/usbvideo/Kconfig" ++source "drivers/media/video/uvcvideo/Kconfig" + + source "drivers/media/video/et61x251/Kconfig" + +diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile +index b5a0641..91033cf 100644 +--- a/drivers/media/video/Makefile ++++ b/drivers/media/video/Makefile +@@ -123,6 +123,8 @@ obj-$(CONFIG_USB_KONICAWC) += usbvideo/ + obj-$(CONFIG_USB_VICAM) += usbvideo/ + obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/ + ++obj-$(CONFIG_USB_UVCVIDEO) += uvcvideo/ ++ + obj-$(CONFIG_VIDEO_IVTV) += ivtv/ + + obj-$(CONFIG_VIDEO_VIVI) += vivi.o +diff --git a/drivers/media/video/uvcvideo/Kconfig b/drivers/media/video/uvcvideo/Kconfig +new file mode 100644 +index 0000000..dccaab7 +--- /dev/null ++++ b/drivers/media/video/uvcvideo/Kconfig +@@ -0,0 +1,7 @@ ++config USB_UVCVIDEO ++ tristate "USB Video class device (uvcvideo) driver" ++ ---help--- ++ Say M or Y here to enable support for USB video devices that ++ conform to the USB video class device specification. ++ . ++ If unsure, jump up and down and look confused. +diff --git a/drivers/media/video/uvcvideo/Makefile b/drivers/media/video/uvcvideo/Makefile +new file mode 100644 +index 0000000..ada681c +--- /dev/null ++++ b/drivers/media/video/uvcvideo/Makefile +@@ -0,0 +1,2 @@ ++obj-$(CONFIG_USB_UVCVIDEO) := uvcvideo.o ++uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o uvc_status.o uvc_isight.o +diff --git a/drivers/media/video/uvcvideo/uvc_compat.h b/drivers/media/video/uvcvideo/uvc_compat.h +new file mode 100644 +index 0000000..321f3d3 +--- /dev/null ++++ b/drivers/media/video/uvcvideo/uvc_compat.h +@@ -0,0 +1,263 @@ ++#ifndef _UVC_COMPAT_H ++#define _UVC_COMPAT_H ++ ++#include ++ ++#ifndef __KERNEL__ ++#ifndef __user ++#define __user ++#endif ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) ++/* ++ * Extended control API ++ */ ++struct v4l2_ext_control ++{ ++ __u32 id; ++ __u32 reserved2[2]; ++ union { ++ __s32 value; ++ __s64 value64; ++ void *reserved; ++ }; ++} __attribute__ ((packed)); ++ ++struct v4l2_ext_controls ++{ ++ __u32 ctrl_class; ++ __u32 count; ++ __u32 error_idx; ++ __u32 reserved[2]; ++ struct v4l2_ext_control *controls; ++}; ++ ++/* Values for ctrl_class field */ ++#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */ ++#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ ++ ++#define V4L2_CTRL_ID_MASK (0x0fffffff) ++#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) ++#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000) ++ ++/* Control flags */ ++#define V4L2_CTRL_FLAG_READ_ONLY 0x0004 ++#define V4L2_CTRL_FLAG_UPDATE 0x0008 ++#define V4L2_CTRL_FLAG_INACTIVE 0x0010 ++#define V4L2_CTRL_FLAG_SLIDER 0x0020 ++ ++/* Query flags, to be ORed with the control ID */ ++#define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000 ++ ++/* User-class control IDs defined by V4L2 */ ++#undef V4L2_CID_BASE ++#define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) ++#define V4L2_CID_USER_BASE V4L2_CID_BASE ++#define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1) ++ ++#define VIDIOC_G_EXT_CTRLS _IOWR ('V', 71, struct v4l2_ext_controls) ++#define VIDIOC_S_EXT_CTRLS _IOWR ('V', 72, struct v4l2_ext_controls) ++#define VIDIOC_TRY_EXT_CTRLS _IOWR ('V', 73, struct v4l2_ext_controls) ++ ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) ++/* ++ * Frame size and frame rate enumeration ++ * ++ * Included in Linux 2.6.19 ++ */ ++enum v4l2_frmsizetypes ++{ ++ V4L2_FRMSIZE_TYPE_DISCRETE = 1, ++ V4L2_FRMSIZE_TYPE_CONTINUOUS = 2, ++ V4L2_FRMSIZE_TYPE_STEPWISE = 3, ++}; ++ ++struct v4l2_frmsize_discrete ++{ ++ __u32 width; /* Frame width [pixel] */ ++ __u32 height; /* Frame height [pixel] */ ++}; ++ ++struct v4l2_frmsize_stepwise ++{ ++ __u32 min_width; /* Minimum frame width [pixel] */ ++ __u32 max_width; /* Maximum frame width [pixel] */ ++ __u32 step_width; /* Frame width step size [pixel] */ ++ __u32 min_height; /* Minimum frame height [pixel] */ ++ __u32 max_height; /* Maximum frame height [pixel] */ ++ __u32 step_height; /* Frame height step size [pixel] */ ++}; ++ ++struct v4l2_frmsizeenum ++{ ++ __u32 index; /* Frame size number */ ++ __u32 pixel_format; /* Pixel format */ ++ __u32 type; /* Frame size type the device supports. */ ++ ++ union { /* Frame size */ ++ struct v4l2_frmsize_discrete discrete; ++ struct v4l2_frmsize_stepwise stepwise; ++ }; ++ ++ __u32 reserved[2]; /* Reserved space for future use */ ++}; ++ ++enum v4l2_frmivaltypes ++{ ++ V4L2_FRMIVAL_TYPE_DISCRETE = 1, ++ V4L2_FRMIVAL_TYPE_CONTINUOUS = 2, ++ V4L2_FRMIVAL_TYPE_STEPWISE = 3, ++}; ++ ++struct v4l2_frmival_stepwise ++{ ++ struct v4l2_fract min; /* Minimum frame interval [s] */ ++ struct v4l2_fract max; /* Maximum frame interval [s] */ ++ struct v4l2_fract step; /* Frame interval step size [s] */ ++}; ++ ++struct v4l2_frmivalenum ++{ ++ __u32 index; /* Frame format index */ ++ __u32 pixel_format; /* Pixel format */ ++ __u32 width; /* Frame width */ ++ __u32 height; /* Frame height */ ++ __u32 type; /* Frame interval type the device supports. */ ++ ++ union { /* Frame interval */ ++ struct v4l2_fract discrete; ++ struct v4l2_frmival_stepwise stepwise; ++ }; ++ ++ __u32 reserved[2]; /* Reserved space for future use */ ++}; ++ ++#define VIDIOC_ENUM_FRAMESIZES _IOWR ('V', 74, struct v4l2_frmsizeenum) ++#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR ('V', 75, struct v4l2_frmivalenum) ++#endif ++ [...6535 lines suppressed...] ++ /* Video streaming object, must always be non-NULL. */ ++ struct uvc_streaming *streaming; ++ ++ void (*decode) (struct urb *urb, struct uvc_video_device *video, ++ struct uvc_buffer *buf); ++ ++ /* Context data used by the bulk completion handler. */ ++ struct { ++ __u8 header[256]; ++ unsigned int header_size; ++ int skip_payload; ++ __u32 payload_size; ++ __u32 max_payload_size; ++ } bulk; ++ ++ struct urb *urb[UVC_URBS]; ++ char *urb_buffer[UVC_URBS]; ++ ++ __u8 last_fid; ++}; ++ ++enum uvc_device_state { ++ UVC_DEV_DISCONNECTED = 1, ++}; ++ ++struct uvc_device { ++ struct usb_device *udev; ++ struct usb_interface *intf; ++ __u32 quirks; ++ int intfnum; ++ ++ enum uvc_device_state state; ++ struct kref kref; ++ struct list_head list; ++ ++ /* Video control interface */ ++ __u16 uvc_version; ++ __u32 clock_frequency; ++ ++ struct list_head entities; ++ ++ struct uvc_video_device video; ++ ++ /* Status Interrupt Endpoint */ ++ struct usb_host_endpoint *int_ep; ++ struct urb *int_urb; ++ __u8 status[16]; ++ ++ /* Video Streaming interfaces */ ++ struct list_head streaming; ++}; ++ ++enum uvc_handle_state { ++ UVC_HANDLE_PASSIVE = 0, ++ UVC_HANDLE_ACTIVE = 1, ++}; ++ ++struct uvc_fh { ++ struct uvc_video_device *device; ++ enum uvc_handle_state state; ++}; ++ ++struct uvc_driver { ++ struct usb_driver driver; ++ ++ struct mutex open_mutex; /* protects from open/disconnect race */ ++ ++ struct list_head devices; /* struct uvc_device list */ ++ struct list_head controls; /* struct uvc_control_info list */ ++ struct mutex ctrl_mutex; /* protects controls and devices lists */ ++}; ++ ++/* ------------------------------------------------------------------------ ++ * Debugging, printing and logging ++ */ ++ ++#define UVC_TRACE_PROBE (1 << 0) ++#define UVC_TRACE_DESCR (1 << 1) ++#define UVC_TRACE_CONTROL (1 << 2) ++#define UVC_TRACE_FORMAT (1 << 3) ++#define UVC_TRACE_CAPTURE (1 << 4) ++#define UVC_TRACE_CALLS (1 << 5) ++#define UVC_TRACE_IOCTL (1 << 6) ++#define UVC_TRACE_FRAME (1 << 7) ++#define UVC_TRACE_SUSPEND (1 << 8) ++#define UVC_TRACE_STATUS (1 << 9) ++ ++extern unsigned int uvc_trace_param; ++ ++#define uvc_trace(flag, msg...) \ ++ do { \ ++ if (uvc_trace_param & flag) \ ++ printk(KERN_DEBUG "uvcvideo: " msg); \ ++ } while(0) ++ ++#define uvc_printk(level, msg...) \ ++ printk(level "uvcvideo: " msg) ++ ++#define UVC_GUID_FORMAT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" ++#define UVC_GUID_ARGS(guid) \ ++ (guid)[3], (guid)[2], (guid)[1], (guid)[0], \ ++ (guid)[5], (guid)[4], \ ++ (guid)[7], (guid)[6], \ ++ (guid)[8], (guid)[9], \ ++ (guid)[10], (guid)[11], (guid)[12], \ ++ (guid)[13], (guid)[14], (guid)[15] ++ ++/* -------------------------------------------------------------------------- ++ * Internal functions. ++ */ ++ ++/* Core driver */ ++extern struct uvc_driver uvc_driver; ++extern void uvc_delete(struct kref *kref); ++ ++/* Video buffers queue management. */ ++extern void uvc_queue_init(struct uvc_video_queue *queue); ++extern int uvc_alloc_buffers(struct uvc_video_queue *queue, ++ unsigned int nbuffers, unsigned int buflength); ++extern int uvc_free_buffers(struct uvc_video_queue *queue); ++extern void uvc_query_buffer(struct uvc_buffer *buf, ++ struct v4l2_buffer *v4l2_buf); ++extern int uvc_queue_buffer(struct uvc_video_queue *queue, ++ struct v4l2_buffer *v4l2_buf); ++extern int uvc_dequeue_buffer(struct uvc_video_queue *queue, ++ struct v4l2_buffer *v4l2_buf, int nonblocking); ++extern int uvc_queue_enable(struct uvc_video_queue *queue, int enable); ++extern void uvc_queue_cancel(struct uvc_video_queue *queue); ++extern struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue, ++ struct uvc_buffer *buf); ++ ++/* V4L2 interface */ ++extern struct file_operations uvc_fops; ++ ++/* Video */ ++extern int uvc_video_init(struct uvc_video_device *video); ++extern int uvc_video_suspend(struct uvc_video_device *video); ++extern int uvc_video_resume(struct uvc_video_device *video); ++extern int uvc_video_enable(struct uvc_video_device *video, int enable); ++extern int uvc_probe_video(struct uvc_video_device *video, ++ struct uvc_streaming_control *probe); ++extern int uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit, ++ __u8 intfnum, __u8 cs, void *data, __u16 size); ++extern int uvc_set_video_ctrl(struct uvc_video_device *video, ++ struct uvc_streaming_control *ctrl, int probe); ++ ++/* Status */ ++extern int uvc_status_init(struct uvc_device *dev); ++extern void uvc_status_cleanup(struct uvc_device *dev); ++extern int uvc_status_suspend(struct uvc_device *dev); ++extern int uvc_status_resume(struct uvc_device *dev); ++ ++/* Controls */ ++extern struct uvc_control *uvc_find_control(struct uvc_video_device *video, ++ __u32 v4l2_id, struct uvc_control_mapping **mapping); ++extern int uvc_query_v4l2_ctrl(struct uvc_video_device *video, ++ struct v4l2_queryctrl *v4l2_ctrl); ++ ++extern int uvc_ctrl_add_info(struct uvc_control_info *info); ++extern int uvc_ctrl_add_mapping(struct uvc_control_mapping *mapping); ++extern int uvc_ctrl_init_device(struct uvc_device *dev); ++extern void uvc_ctrl_cleanup_device(struct uvc_device *dev); ++extern int uvc_ctrl_resume_device(struct uvc_device *dev); ++extern void uvc_ctrl_init(void); ++ ++extern int uvc_ctrl_begin(struct uvc_video_device *video); ++extern int __uvc_ctrl_commit(struct uvc_video_device *video, int rollback); ++static inline int uvc_ctrl_commit(struct uvc_video_device *video) ++{ ++ return __uvc_ctrl_commit(video, 0); ++} ++static inline int uvc_ctrl_rollback(struct uvc_video_device *video) ++{ ++ return __uvc_ctrl_commit(video, 1); ++} ++ ++extern int uvc_ctrl_get(struct uvc_video_device *video, ++ struct v4l2_ext_control *xctrl); ++extern int uvc_ctrl_set(struct uvc_video_device *video, ++ struct v4l2_ext_control *xctrl); ++ ++extern int uvc_xu_ctrl_query(struct uvc_video_device *video, ++ struct uvc_xu_control *ctrl, int set); ++ ++/* Utility functions */ ++extern void uvc_simplify_fraction(uint32_t *numerator, uint32_t *denominator, ++ unsigned int n_terms, unsigned int threshold); ++extern uint32_t uvc_fraction_to_interval(uint32_t numerator, ++ uint32_t denominator); ++extern struct usb_host_endpoint *uvc_find_endpoint( ++ struct usb_host_interface *alts, __u8 epaddr); ++ ++/* Quirks support */ ++void uvc_video_decode_isight (struct urb *urb, struct uvc_video_device *video, ++ struct uvc_buffer *buf); ++ ++#endif /* __KERNEL__ */ ++ ++#endif ++ linux-2.6-vio-modalias.patch: Index: linux-2.6-vio-modalias.patch =================================================================== RCS file: linux-2.6-vio-modalias.patch diff -N linux-2.6-vio-modalias.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-vio-modalias.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,32 @@ +diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c +index f988672..12a0851 100644 +--- a/arch/powerpc/kernel/vio.c ++++ b/arch/powerpc/kernel/vio.c +@@ -294,9 +294,27 @@ static ssize_t devspec_show(struct device *dev, + return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none"); + } + ++static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, ++ char *buf) ++{ ++ const struct vio_dev *vio_dev = to_vio_dev(dev); ++ struct device_node *dn; ++ const char *cp; ++ ++ dn = dev->archdata.of_node; ++ if (!dn) ++ return -ENODEV; ++ cp = of_get_property(dn, "compatible", NULL); ++ if (!cp) ++ return -ENODEV; ++ ++ return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp); ++} ++ + static struct device_attribute vio_dev_attrs[] = { + __ATTR_RO(name), + __ATTR_RO(devspec), ++ __ATTR_RO(modalias), + __ATTR_NULL + }; + linux-2.6-virtio_blk-fix-sysfs-bits.patch: Index: linux-2.6-virtio_blk-fix-sysfs-bits.patch =================================================================== RCS file: linux-2.6-virtio_blk-fix-sysfs-bits.patch diff -N linux-2.6-virtio_blk-fix-sysfs-bits.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-virtio_blk-fix-sysfs-bits.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,27 @@ +From: Jeremy Katz +To: rusty at rustcorp.com.au +Cc: Jeremy Katz +Subject: [PATCH] Fix sysfs bits to have proper block symlink +Date: Sun, 2 Mar 2008 17:00:15 -0500 + +Fix up so that the virtio_blk devices in sysfs link correctly to their +block device. This then allows them to be detected by hal, etc + +Signed-off-by: Jeremy Katz +--- + drivers/block/virtio_blk.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c +index 3b1a68d..0cfbe8c 100644 +--- a/drivers/block/virtio_blk.c ++++ b/drivers/block/virtio_blk.c +@@ -238,6 +238,7 @@ static int virtblk_probe(struct virtio_device *vdev) + vblk->disk->first_minor = index_to_minor(index); + vblk->disk->private_data = vblk; + vblk->disk->fops = &virtblk_fops; ++ vblk->disk->driverfs_dev = &vdev->dev; + index++; + + /* If barriers are supported, tell block layer that queue is ordered */ + linux-2.6-wireless-pending-too.patch: Index: linux-2.6-wireless-pending-too.patch =================================================================== RCS file: linux-2.6-wireless-pending-too.patch diff -N linux-2.6-wireless-pending-too.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-wireless-pending-too.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,68 @@ +This is an a backport of two fixes which are based on top of the open11s +patches which are not yet in Rawhide. They will disappear when those +later patches get merged to net-2.6.26 (probably in a few days). + + mac80211: always insert key into list + mac80211: fix hardware scan completion + +diff -up linux-2.6.24.noarch/net/mac80211/key.c.orig linux-2.6.24.noarch/net/mac80211/key.c +--- linux-2.6.24.noarch/net/mac80211/key.c.orig 2008-03-04 19:40:41.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/key.c 2008-03-04 19:43:13.000000000 -0500 +@@ -174,6 +174,9 @@ static void __ieee80211_key_replace(stru + { + int idx, defkey; + ++ if (new) ++ list_add(&new->list, &sdata->key_list); ++ + if (sta) { + rcu_assign_pointer(sta->key, new); + } else { +@@ -190,9 +193,6 @@ static void __ieee80211_key_replace(stru + ieee80211_set_default_key(sdata, -1); + + rcu_assign_pointer(sdata->keys[idx], new); +- if (new) +- list_add(&new->list, &sdata->key_list); +- + if (defkey && new) + ieee80211_set_default_key(sdata, new->conf.keyidx); + } +diff -up linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c +--- linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c.orig 2008-03-04 19:40:41.000000000 -0500 ++++ linux-2.6.24.noarch/net/mac80211/ieee80211_sta.c 2008-03-04 19:48:19.000000000 -0500 +@@ -3401,22 +3401,27 @@ void ieee80211_scan_completed(struct iee + + rcu_read_lock(); + list_for_each_entry_rcu(sdata, &local->interfaces, list) { +- + /* No need to wake the master device. */ + if (sdata->dev == local->mdev) + continue; + +- if (sdata->vif.type == IEEE80211_IF_TYPE_STA) { +- if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) +- ieee80211_send_nullfunc(local, sdata, 0); +- ieee80211_sta_timer((unsigned long)sdata); +- } ++ /* Tell AP we're back */ ++ if (sdata->vif.type == IEEE80211_IF_TYPE_STA && ++ sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) ++ ieee80211_send_nullfunc(local, sdata, 0); + + netif_wake_queue(sdata->dev); + } +- rcu_read_unlock(); + + done: ++ /* Restart STA timer for both SW and HW scan cases */ ++ list_for_each_entry_rcu(sdata, &local->interfaces, list) { ++ if (sdata->vif.type == IEEE80211_IF_TYPE_STA) ++ ieee80211_sta_timer((unsigned long)sdata); ++ } ++ ++ rcu_read_unlock(); ++ + sdata = IEEE80211_DEV_TO_SUB_IF(dev); + if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { + struct ieee80211_if_sta *ifsta = &sdata->u.sta; linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: linux-2.6-wireless-pending.patch diff -N linux-2.6-wireless-pending.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-wireless-pending.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,34582 @@ +commit e4861829072c61883114c64a3af61f305a789ff0 +Author: Johannes Berg +Date: Wed Feb 27 13:39:00 2008 +0100 + + mac80211: fix key replacing, hw accel + + Even though I thought about it a lot and had also tested it, some + of my recent changes in the key code broke replacing keys, making + the kernel oops because a key is removed from a list while not on + it. + + This patch fixes that using the list as an indication whether or + not the key is on it (an empty list means it's not on any list.) + + Also, this patch fixes hw accel enabling, the check for not doing + hw accel when the interface is down was lost and is restored by + this. + + Additionally, move adding the key to the list into the function + __ieee80211_key_replace() for more consistency. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit db4d1169d0b893bfb7923b6526748fe2c5a7373f +Author: Johannes Berg +Date: Mon Feb 25 16:27:45 2008 +0100 + + mac80211: split ieee80211_key_alloc/free + + In order to RCU-ify sta_info, we need to be able to allocate + a key without linking it to an sdata/sta structure (because + allocation cannot be done in an rcu critical section). This + patch splits up ieee80211_key_alloc() and updates all users + appropriately. + + While at it, this patch fixes a number of race conditions + such as finally making key replacement atomic, unfortunately + at the expense of more complex code. + + Note that this patch documents /existing/ bugs with sta info + and key interaction, there is currently a race condition + when a sta info is freed without holding the RTNL. This will + finally be fixed by a followup patch. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 6f48422a29714ed92f6136d9e7d3ff39c75607d7 +Author: Johannes Berg +Date: Mon Feb 25 16:27:44 2008 +0100 + + mac80211: remove STA infos last_ack stuff + + These things aren't used and the only possible use is within + rate control algorithms, however those can, if they need it, + keep track of it in their private data. last_ack_ms isn't + even updated so completely useless. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit e6a5ddf20886206caf1c4a2431f6ff01198ab0f7 +Author: Johannes Berg +Date: Mon Feb 25 16:27:42 2008 +0100 + + mac80211: safely free beacon in ieee80211_if_reinit + + If ieee80211_if_reinit() is called from ieee80211_unregister_hw() + then it is possible that the driver will still request a beacon + (it is allowed to until ieee80211_unregister_hw() has returned.) + This means we need to use an RCU-protected write to the beacon + information even in this function. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 2485f7105f20f85c2dbebc67be6b2cb97175fa7e +Author: Johannes Berg +Date: Mon Feb 25 16:27:41 2008 +0100 + + mac80211: clarify use of TX status/RX callbacks + + This patch clarifies the use of the irqsafe vs. non-irq-safe + functions and their respective locking requirements. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 38c07b430b50172b803fe4c7f76cba580ba9931f +Author: Pavel Roskin +Date: Tue Feb 26 17:59:14 2008 -0500 + + ath5k: fix all endian issues reported by sparse + + Changes-licensed-under: ISC + Signed-off-by: Pavel Roskin + Acked-by: Luis R. Rodriguez + Acked-by: Nick Kossifidis + Signed-off-by: John W. Linville + +commit e6084239d39a10bac1186611fe7c523cea92c9ec +Author: Ivo van Doorn +Date: Mon Feb 25 23:22:13 2008 +0100 + + rt2x00: Release rt2x00 2.1.3 + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 1497074ad79009f8fb465d795f9e0d2a428b7fa2 +Author: Ivo van Doorn +Date: Mon Feb 25 23:20:33 2008 +0100 + + rt2x00: Check for 5GHz band in link tuner + + Fix a typo in the link tuner where accidently the + 2GHz band was checked instead of the 5GHz band. + This forced the link tuner to work in an invalid + range for the currently active band. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 58e307398317ab55470547a7d72859c89edd187d +Author: Florian Fainelli +Date: Mon Feb 25 17:51:53 2008 +0100 + + p54: print unknown eeprom fields + + This patch allows p54common to print the + uknown EEPROM fields, which can help + when debugging/testing devices. + + Signed-off-by: Florian Fainelli + Signed-off-by: John W. Linville + +commit 9a89c839f79395426b84cf6da9d56773402b4c0e +Author: Johannes Berg +Date: Mon Feb 25 11:12:18 2008 +0100 + + adm8211: fix cfg80211 band API conversion + + Insert a missing band assignment. + + Signed-off-by: Johannes Berg + Signed-off-by: John W. Linville + +commit 8f300ae5b819f7655197925cdb1954edfd906a87 +Author: Michael Buesch +Date: Sun Feb 24 14:42:29 2008 +0100 + + b43legacy: Fix nondebug build + + Fix a typo. + + Signed-off-by: Michael Buesch + Acked-by: Stefano Brivio + Signed-off-by: John W. Linville + +commit 28de57d1a9eb7e67badb731297197fcbef0cc19e +Author: Aurelien Jarno +Date: Fri Feb 22 16:14:58 2008 +0100 + + ssb: Add CHIPCO IRQ access functions + + This patch adds functions to setup and read the CHIPCO IRQ. + + Signed-off-by: Aurelien Jarno + Signed-off-by: Michael Buesch + Signed-off-by: John W. Linville + +commit fba4a1e63723b5ef16c21a90f06520ae37c5da98 +Author: Johannes Berg +Date: Thu Feb 21 11:08:33 2008 +0100 + + mac80211: fix IBSS code + + This patch fixes two errors introduced by + + commit 19d35612f3cd7f60dd9174c0100584e21f5a1025 + Author: Bruno Randolf + Date: Mon Feb 18 11:21:36 2008 +0900 + + mac80211: enable IBSS merging + + The first error is an endianness problem that sparse found and + the second is a build failure when CONFIG_MAC80211_IBSS_DEBUG + is not set. + + Signed-off-by: Johannes Berg + Cc: Bruno Randolf + Signed-off-by: John W. Linville [...34189 lines suppressed...] +- memcpy(priv->rates, adm8211_rates, sizeof(adm8211_rates)); +- priv->modes[0].num_rates = ARRAY_SIZE(adm8211_rates); +- priv->modes[0].rates = priv->rates; +- + dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */ + + priv->retry_limit = 3; +@@ -1917,14 +1930,9 @@ static int __devinit adm8211_probe(struc + goto err_free_desc; + } + +- priv->channel = priv->modes[0].channels[0].chan; ++ priv->channel = 1; + +- err = ieee80211_register_hwmode(dev, &priv->modes[0]); +- if (err) { +- printk(KERN_ERR "%s (adm8211): Can't register hwmode\n", +- pci_name(pdev)); +- goto err_free_desc; +- } ++ dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band; + + err = ieee80211_register_hw(dev); + if (err) { +diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c +--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-04 19:35:36.000000000 -0500 +@@ -172,6 +172,22 @@ static int select_core_and_segment(struc + return 0; + } + ++static u8 ssb_pcmcia_read8(struct ssb_device *dev, u16 offset) ++{ ++ struct ssb_bus *bus = dev->bus; ++ unsigned long flags; ++ int err; ++ u8 value = 0xFF; ++ ++ spin_lock_irqsave(&bus->bar_lock, flags); ++ err = select_core_and_segment(dev, &offset); ++ if (likely(!err)) ++ value = readb(bus->mmio + offset); ++ spin_unlock_irqrestore(&bus->bar_lock, flags); ++ ++ return value; ++} ++ + static u16 ssb_pcmcia_read16(struct ssb_device *dev, u16 offset) + { + struct ssb_bus *bus = dev->bus; +@@ -206,6 +222,20 @@ static u32 ssb_pcmcia_read32(struct ssb_ + return (lo | (hi << 16)); + } + ++static void ssb_pcmcia_write8(struct ssb_device *dev, u16 offset, u8 value) ++{ ++ struct ssb_bus *bus = dev->bus; ++ unsigned long flags; ++ int err; ++ ++ spin_lock_irqsave(&bus->bar_lock, flags); ++ err = select_core_and_segment(dev, &offset); ++ if (likely(!err)) ++ writeb(value, bus->mmio + offset); ++ mmiowb(); ++ spin_unlock_irqrestore(&bus->bar_lock, flags); ++} ++ + static void ssb_pcmcia_write16(struct ssb_device *dev, u16 offset, u16 value) + { + struct ssb_bus *bus = dev->bus; +@@ -238,8 +268,10 @@ static void ssb_pcmcia_write32(struct ss + + /* Not "static", as it's used in main.c */ + const struct ssb_bus_ops ssb_pcmcia_ops = { ++ .read8 = ssb_pcmcia_read8, + .read16 = ssb_pcmcia_read16, + .read32 = ssb_pcmcia_read32, ++ .write8 = ssb_pcmcia_write8, + .write16 = ssb_pcmcia_write16, + .write32 = ssb_pcmcia_write32, + }; +diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c +--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-04 19:35:36.000000000 -0500 +@@ -505,6 +505,14 @@ error: + return err; + } + ++static u8 ssb_ssb_read8(struct ssb_device *dev, u16 offset) ++{ ++ struct ssb_bus *bus = dev->bus; ++ ++ offset += dev->core_index * SSB_CORE_SIZE; ++ return readb(bus->mmio + offset); ++} ++ + static u16 ssb_ssb_read16(struct ssb_device *dev, u16 offset) + { + struct ssb_bus *bus = dev->bus; +@@ -521,6 +529,14 @@ static u32 ssb_ssb_read32(struct ssb_dev + return readl(bus->mmio + offset); + } + ++static void ssb_ssb_write8(struct ssb_device *dev, u16 offset, u8 value) ++{ ++ struct ssb_bus *bus = dev->bus; ++ ++ offset += dev->core_index * SSB_CORE_SIZE; ++ writeb(value, bus->mmio + offset); ++} ++ + static void ssb_ssb_write16(struct ssb_device *dev, u16 offset, u16 value) + { + struct ssb_bus *bus = dev->bus; +@@ -539,8 +555,10 @@ static void ssb_ssb_write32(struct ssb_d + + /* Ops for the plain SSB bus without a host-device (no PCI or PCMCIA). */ + static const struct ssb_bus_ops ssb_ssb_ops = { ++ .read8 = ssb_ssb_read8, + .read16 = ssb_ssb_read16, + .read32 = ssb_ssb_read32, ++ .write8 = ssb_ssb_write8, + .write16 = ssb_ssb_write16, + .write32 = ssb_ssb_write32, + }; +diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c +--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-04 19:35:36.000000000 -0500 +@@ -572,6 +572,19 @@ static inline int ssb_pci_assert_buspowe + } + #endif /* DEBUG */ + ++static u8 ssb_pci_read8(struct ssb_device *dev, u16 offset) ++{ ++ struct ssb_bus *bus = dev->bus; ++ ++ if (unlikely(ssb_pci_assert_buspower(bus))) ++ return 0xFF; ++ if (unlikely(bus->mapped_device != dev)) { ++ if (unlikely(ssb_pci_switch_core(bus, dev))) ++ return 0xFF; ++ } ++ return ioread8(bus->mmio + offset); ++} ++ + static u16 ssb_pci_read16(struct ssb_device *dev, u16 offset) + { + struct ssb_bus *bus = dev->bus; +@@ -598,6 +611,19 @@ static u32 ssb_pci_read32(struct ssb_dev + return ioread32(bus->mmio + offset); + } + ++static void ssb_pci_write8(struct ssb_device *dev, u16 offset, u8 value) ++{ ++ struct ssb_bus *bus = dev->bus; ++ ++ if (unlikely(ssb_pci_assert_buspower(bus))) ++ return; ++ if (unlikely(bus->mapped_device != dev)) { ++ if (unlikely(ssb_pci_switch_core(bus, dev))) ++ return; ++ } ++ iowrite8(value, bus->mmio + offset); ++} ++ + static void ssb_pci_write16(struct ssb_device *dev, u16 offset, u16 value) + { + struct ssb_bus *bus = dev->bus; +@@ -626,8 +652,10 @@ static void ssb_pci_write32(struct ssb_d + + /* Not "static", as it's used in main.c */ + const struct ssb_bus_ops ssb_pci_ops = { ++ .read8 = ssb_pci_read8, + .read16 = ssb_pci_read16, + .read32 = ssb_pci_read32, ++ .write8 = ssb_pci_write8, + .write16 = ssb_pci_write16, + .write32 = ssb_pci_write32, + }; +diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c +--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-04 19:28:32.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-04 19:35:36.000000000 -0500 +@@ -353,6 +353,16 @@ void ssb_chipco_watchdog_timer_set(struc + chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks); + } + ++void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value) ++{ ++ chipco_write32_masked(cc, SSB_CHIPCO_IRQMASK, mask, value); ++} ++ ++u32 ssb_chipco_irq_status(struct ssb_chipcommon *cc, u32 mask) ++{ ++ return chipco_read32(cc, SSB_CHIPCO_IRQSTAT) & mask; ++} ++ + u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask) + { + return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask; linux-2.6-x86-debug-boot.patch: Index: linux-2.6-x86-debug-boot.patch =================================================================== RCS file: linux-2.6-x86-debug-boot.patch diff -N linux-2.6-x86-debug-boot.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-x86-debug-boot.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,104 @@ +--- + arch/i386/boot/main.c | 12 ++++++++++++ + arch/i386/boot/pm.c | 8 ++++++++ + 2 files changed, 20 insertions(+) + +--- linux-2.6.22.noarch.orig/arch/i386/boot/main.c ++++ linux-2.6.22.noarch/arch/i386/boot/main.c +@@ -105,6 +105,7 @@ static void set_bios_mode(void) + void main(void) + { + /* First, copy the boot header into the "zeropage" */ ++ puts("Booting: "); + copy_boot_params(); + + /* End of heap check */ +@@ -118,6 +119,7 @@ void main(void) + } + + /* Make sure we have all the proper CPU support */ ++ putchar('A'); + if (validate_cpu()) { + puts("Unable to boot - please use a kernel appropriate " + "for your CPU.\n"); +@@ -125,37 +127,47 @@ void main(void) + } + + /* Tell the BIOS what CPU mode we intend to run in. */ ++ putchar('B'); + set_bios_mode(); + + /* Detect memory layout */ ++ putchar('C'); + detect_memory(); + + /* Set keyboard repeat rate (why?) */ ++ putchar('D'); + keyboard_set_repeat(); + + /* Set the video mode */ ++ putchar('E'); + set_video(); + + /* Query MCA information */ ++ putchar('F'); + query_mca(); + + /* Voyager */ + #ifdef CONFIG_X86_VOYAGER ++ putchar('G'); + query_voyager(); + #endif + ++ putchar('H'); + /* Query Intel SpeedStep (IST) information */ + query_ist(); + + /* Query APM information */ + #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) ++ putchar('I'); + query_apm_bios(); + #endif + + /* Query EDD information */ + #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) ++ putchar('J'); + query_edd(); + #endif + /* Do the last things and invoke protected mode */ ++ putchar('K'); + go_to_protected_mode(); + } +--- linux-2.6.22.noarch.orig/arch/i386/boot/pm.c ++++ linux-2.6.22.noarch/arch/i386/boot/pm.c +@@ -145,24 +145,30 @@ static void setup_idt(void) + void go_to_protected_mode(void) + { + /* Hook before leaving real mode, also disables interrupts */ ++ putchar('L'); + realmode_switch_hook(); + + /* Move the kernel/setup to their final resting places */ ++ putchar('M'); + move_kernel_around(); + + /* Enable the A20 gate */ ++ putchar('N'); + if (enable_a20()) { + puts("A20 gate not responding, unable to boot...\n"); + die(); + } + + /* Reset coprocessor (IGNNE#) */ ++ putchar('O'); + reset_coprocessor(); + + /* Mask all interrupts in the PIC */ ++ putchar('P'); + mask_all_interrupts(); + + /* Actual transition to protected mode... */ ++ puts("Q\n"); + setup_idt(); + setup_gdt(); + protected_mode_jump(boot_params.hdr.code32_start, linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch: Index: linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch =================================================================== RCS file: linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch diff -N linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,1067 @@ +From 77198032633b5660879bb89bae9f1682fd0ec24c Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Wed, 5 Mar 2008 17:20:11 +0000 +Subject: [PATCH] Revert linux-2.6-execshield.patch + +Signed-off-by: Mark McLoughlin +--- + arch/x86/kernel/cpu/common.c | 14 ----- + arch/x86/kernel/process_32.c | 39 +-------------- + arch/x86/kernel/setup64.c | 40 +++++++++++++++ + arch/x86/kernel/smp_32.c | 3 - + arch/x86/kernel/traps_32.c | 106 +--------------------------------------- + arch/x86/mm/init_32.c | 20 ++++---- + arch/x86/mm/mmap.c | 4 +- + arch/x86/vdso/vdso32-setup.c | 2 +- + fs/binfmt_elf.c | 21 +------- + fs/proc/array.c | 8 +-- + include/asm-ia64/pgalloc.h | 4 -- + include/asm-powerpc/pgalloc.h | 5 -- + include/asm-ppc/pgalloc.h | 5 -- + include/asm-s390/pgalloc.h | 4 -- + include/asm-sparc/pgalloc.h | 4 -- + include/asm-sparc64/pgalloc.h | 4 -- + include/asm-x86/desc.h | 16 ------ + include/asm-x86/elf.h | 2 + + include/asm-x86/mmu.h | 6 -- + include/asm-x86/pgalloc_64.h | 7 --- + include/asm-x86/processor.h | 6 -- + include/linux/mm.h | 8 +--- + include/linux/mm_types.h | 3 - + include/linux/resource.h | 5 +-- + include/linux/sched.h | 7 --- + kernel/sysctl.c | 28 ----------- + mm/mmap.c | 107 +++------------------------------------- + mm/mprotect.c | 9 +--- + mm/mremap.c | 4 +- + 29 files changed, 74 insertions(+), 417 deletions(-) + +diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c +index 53cb84e..a38aafa 100644 +--- a/arch/x86/kernel/cpu/common.c ++++ b/arch/x86/kernel/cpu/common.c +@@ -478,20 +478,6 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) + * we do "generic changes." + */ + +- /* +- * emulation of NX with segment limits unfortunately means +- * we have to disable the fast system calls, due to the way that +- * sysexit clears the segment limits on return. +- * If we have either disabled exec-shield on the boot command line, +- * or we have NX, then we don't need to do this. +- */ +- if (exec_shield != 0) { +-#ifdef CONFIG_X86_PAE +- if (!test_bit(X86_FEATURE_NX, c->x86_capability)) +-#endif +- clear_bit(X86_FEATURE_SEP, c->x86_capability); +- } +- + /* If the model name is still unset, do table lookup. */ + if ( !c->x86_model_id[0] ) { + char *p; +diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c +index db271a2..be3c7a2 100644 +--- a/arch/x86/kernel/process_32.c ++++ b/arch/x86/kernel/process_32.c +@@ -679,8 +679,7 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct + /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ + + __unlazy_fpu(prev_p); +- if (next_p->mm) +- load_user_cs_desc(cpu, next_p->mm); ++ + + /* we're going to use this soon, after a few expensive things */ + if (next_p->fpu_counter > 5) +@@ -850,39 +849,3 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) + unsigned long range_end = mm->brk + 0x02000000; + return randomize_range(mm->brk, range_end, 0) ? : mm->brk; + } +- +-static void modify_cs(struct mm_struct *mm, unsigned long limit) +-{ +- mm->context.exec_limit = limit; +- set_user_cs(&mm->context.user_cs, limit); +- if (mm == current->mm) { +- preempt_disable(); +- load_user_cs_desc(smp_processor_id(), mm); +- preempt_enable(); +- } +-} +- +-void arch_add_exec_range(struct mm_struct *mm, unsigned long limit) +-{ +- if (limit > mm->context.exec_limit) +- modify_cs(mm, limit); +-} +- +-void arch_remove_exec_range(struct mm_struct *mm, unsigned long old_end) +-{ +- struct vm_area_struct *vma; +- unsigned long limit = PAGE_SIZE; +- +- if (old_end == mm->context.exec_limit) { +- for (vma = mm->mmap; vma; vma = vma->vm_next) +- if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) +- limit = vma->vm_end; +- modify_cs(mm, limit); +- } +-} +- +-void arch_flush_exec_range(struct mm_struct *mm) +-{ +- mm->context.exec_limit = 0; +- set_user_cs(&mm->context.user_cs, 0); +-} +diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c +index 8a940dc..309366f 100644 +--- a/arch/x86/kernel/setup64.c ++++ b/arch/x86/kernel/setup64.c +@@ -45,6 +45,46 @@ EXPORT_SYMBOL_GPL(__supported_pte_mask); + + static int do_not_nx __cpuinitdata = 0; + ++/* noexec=on|off ++Control non executable mappings for 64bit processes. ++ ++on Enable(default) ++off Disable ++*/ ++static int __init nonx_setup(char *str) ++{ ++ if (!str) ++ return -EINVAL; ++ if (!strncmp(str, "on", 2)) { ++ __supported_pte_mask |= _PAGE_NX; ++ do_not_nx = 0; ++ } else if (!strncmp(str, "off", 3)) { ++ do_not_nx = 1; ++ __supported_pte_mask &= ~_PAGE_NX; ++ } ++ return 0; ++} ++early_param("noexec", nonx_setup); ++ ++int force_personality32 = 0; ++ ++/* noexec32=on|off ++Control non executable heap for 32bit processes. ++To control the stack too use noexec=off ++ ++on PROT_READ does not imply PROT_EXEC for 32bit processes ++off PROT_READ implies PROT_EXEC (default) ++*/ ++static int __init nonx32_setup(char *str) ++{ ++ if (!strcmp(str, "on")) ++ force_personality32 &= ~READ_IMPLIES_EXEC; ++ else if (!strcmp(str, "off")) ++ force_personality32 |= READ_IMPLIES_EXEC; ++ return 1; ++} ++__setup("noexec32=", nonx32_setup); ++ + /* + * Copy data used in early init routines from the initial arrays to the + * per cpu data areas. These arrays then become expendable and the +diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c +index cca75b4..dc0cde9 100644 +--- a/arch/x86/kernel/smp_32.c ++++ b/arch/x86/kernel/smp_32.c +@@ -22,7 +22,6 @@ + + #include + #include +-#include + #include + #include + +@@ -317,8 +316,6 @@ void smp_invalidate_interrupt(struct pt_regs *regs) + unsigned long cpu; + + cpu = get_cpu(); +- if (current->active_mm) +- load_user_cs_desc(cpu, current->active_mm); + + if (!cpu_isset(cpu, flush_cpumask)) + goto out; +diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c +index 7865615..b22c01e 100644 +--- a/arch/x86/kernel/traps_32.c ++++ b/arch/x86/kernel/traps_32.c +@@ -592,91 +592,7 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) + DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) + DO_ERROR(12, SIGBUS, "stack segment", stack_segment) + DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) +- +-/* +- * lazy-check for CS validity on exec-shield binaries: +- * +- * the original non-exec stack patch was written by +- * Solar Designer . Thanks! +- */ +-static int +-check_lazy_exec_limit(int cpu, struct pt_regs *regs, long error_code) +-{ +- struct desc_struct *desc1, *desc2; +- struct vm_area_struct *vma; +- unsigned long limit; +- +- if (current->mm == NULL) +- return 0; +- +- limit = -1UL; +- if (current->mm->context.exec_limit != -1UL) { +- limit = PAGE_SIZE; +- spin_lock(¤t->mm->page_table_lock); +- for (vma = current->mm->mmap; vma; vma = vma->vm_next) +- if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) +- limit = vma->vm_end; +- vma = get_gate_vma(current); +- if (vma && (vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) +- limit = vma->vm_end; +- spin_unlock(¤t->mm->page_table_lock); +- if (limit >= TASK_SIZE) +- limit = -1UL; +- current->mm->context.exec_limit = limit; +- } +- set_user_cs(¤t->mm->context.user_cs, limit); +- +- desc1 = ¤t->mm->context.user_cs; +- desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; +- +- if (desc1->a != desc2->a || desc1->b != desc2->b) { +- /* +- * The CS was not in sync - reload it and retry the +- * instruction. If the instruction still faults then +- * we won't hit this branch next time around. +- */ +- if (print_fatal_signals >= 2) { +- printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n", +- error_code, error_code/8, regs->ip, smp_processor_id()); +- printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x, CPU_cs: %08x/%08x.\n", +- current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b); +- } +- load_user_cs_desc(cpu, current->mm); +- return 1; +- } +- +- return 0; +-} +- +-/* +- * The fixup code for errors in iret jumps to here (iret_exc). It loses +- * the original trap number and error code. The bogus trap 32 and error +- * code 0 are what the vanilla kernel delivers via: +- * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1) +- * +- * NOTE: Because of the final "1" in the macro we need to enable interrupts. +- * +- * In case of a general protection fault in the iret instruction, we +- * need to check for a lazy CS update for exec-shield. +- */ +-void do_iret_error(struct pt_regs *regs, long error_code) +-{ +- int ok; +- local_irq_enable(); +- ok = check_lazy_exec_limit(get_cpu(), regs, error_code); +- put_cpu(); +- if (!ok && notify_die(DIE_TRAP, "iret exception", regs, +- error_code, 32, SIGSEGV) != NOTIFY_STOP) { +- siginfo_t info; +- info.si_signo = SIGSEGV; +- info.si_errno = 0; +- info.si_code = ILL_BADSTK; +- info.si_addr = 0; +- do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code, +- &info); +- } +-} +- ++DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1) + + void __kprobes do_general_protection(struct pt_regs * regs, + long error_code) +@@ -684,7 +600,6 @@ void __kprobes do_general_protection(struct pt_regs * regs, + int cpu = get_cpu(); + struct tss_struct *tss = &per_cpu(init_tss, cpu); + struct thread_struct *thread = ¤t->thread; +- int ok; + + /* + * Perform the lazy TSS's I/O bitmap copy. If the TSS has an +@@ -711,6 +626,7 @@ void __kprobes do_general_protection(struct pt_regs * regs, + put_cpu(); + return; + } ++ put_cpu(); + + if (regs->flags & VM_MASK) + goto gp_in_vm86; +@@ -718,22 +634,6 @@ void __kprobes do_general_protection(struct pt_regs * regs, + if (!user_mode(regs)) + goto gp_in_kernel; + +- ok = check_lazy_exec_limit(cpu, regs, error_code); +- +- put_cpu(); +- +- if (ok) +- return; +- +- if (print_fatal_signals) { +- printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code, +- error_code/8, regs->ip, smp_processor_id()); +- printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x.\n", +- current->mm->context.exec_limit, +- current->mm->context.user_cs.a, +- current->mm->context.user_cs.b); +- } +- + current->thread.error_code = error_code; + current->thread.trap_no = 13; + if (show_unhandled_signals && unhandled_signal(current, SIGSEGV) && +@@ -750,13 +650,11 @@ void __kprobes do_general_protection(struct pt_regs * regs, + return; + + gp_in_vm86: +- put_cpu(); + local_irq_enable(); + handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code); + return; + + gp_in_kernel: +- put_cpu(); + if (!fixup_exception(regs)) { + current->thread.error_code = error_code; + current->thread.trap_no = 13; +diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c +index f5926ae..ee1091a 100644 +--- a/arch/x86/mm/init_32.c ++++ b/arch/x86/mm/init_32.c +@@ -474,7 +474,7 @@ static int disable_nx __initdata; + * Control non executable mappings. + * + * on Enable +- * off Disable (disables exec-shield too) ++ * off Disable + */ + static int __init noexec_setup(char *str) + { +@@ -483,12 +483,14 @@ static int __init noexec_setup(char *str) + __supported_pte_mask |= _PAGE_NX; + disable_nx = 0; + } +- } else if (!strcmp(str, "off")) { +- disable_nx = 1; +- __supported_pte_mask &= ~_PAGE_NX; +- exec_shield = 0; +- } else +- return -EINVAL; ++ } else { ++ if (!strcmp(str, "off")) { ++ disable_nx = 1; ++ __supported_pte_mask &= ~_PAGE_NX; ++ } else { ++ return -EINVAL; ++ } ++ } + + return 0; + } +@@ -526,10 +528,6 @@ void __init paging_init(void) + if (nx_enabled) + printk(KERN_INFO "NX (Execute Disable) protection: active\n"); + #endif +- if (exec_shield) +- printk(KERN_INFO "Using x86 segment limits to approximate " +- "NX protection\n"); +- + pagetable_init(); + + load_cr3(swapper_pg_dir); +diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c +index ec932ae..56fe712 100644 +--- a/arch/x86/mm/mmap.c ++++ b/arch/x86/mm/mmap.c +@@ -111,15 +111,13 @@ static unsigned long mmap_legacy_base(void) + */ + void arch_pick_mmap_layout(struct mm_struct *mm) + { +- if (!(2 & exec_shield) && mmap_is_legacy()) { ++ if (mmap_is_legacy()) { + mm->mmap_base = mmap_legacy_base(); + mm->get_unmapped_area = arch_get_unmapped_area; + mm->unmap_area = arch_unmap_area; + } else { + mm->mmap_base = mmap_base(); + mm->get_unmapped_area = arch_get_unmapped_area_topdown; +- if (!(current->personality & READ_IMPLIES_EXEC)) +- mm->get_unmapped_exec_area = arch_get_unmapped_exec_area; + mm->unmap_area = arch_unmap_area_topdown; + } + } +diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c +index 0bd5f44..348f134 100644 +--- a/arch/x86/vdso/vdso32-setup.c ++++ b/arch/x86/vdso/vdso32-setup.c +@@ -336,7 +336,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack) + if (compat) + addr = VDSO_HIGH_BASE; + else { +- addr = get_unmapped_area_prot(NULL, 0, PAGE_SIZE, 0, 0, 1); ++ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0); + if (IS_ERR_VALUE(addr)) { + ret = addr; + goto up_fail; +diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c +index 1fc8940..5e1a4fb 100644 +--- a/fs/binfmt_elf.c ++++ b/fs/binfmt_elf.c +@@ -81,7 +81,7 @@ static struct linux_binfmt elf_format = { + .hasvdso = 1 + }; + +-#define BAD_ADDR(x) IS_ERR_VALUE(x) ++#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE) + + static int set_brk(unsigned long start, unsigned long end) + { +@@ -709,11 +709,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) + break; + } + +- if (current->personality == PER_LINUX && (exec_shield & 2)) { +- executable_stack = EXSTACK_DISABLE_X; +- current->flags |= PF_RANDOMIZE; +- } +- + /* Some simple consistency checks for the interpreter */ + if (elf_interpreter) { + retval = -ELIBBAD; +@@ -733,15 +728,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) + if (retval) + goto out_free_dentry; + +-#ifdef CONFIG_X86_32 +- /* +- * Turn off the CS limit completely if exec-shield disabled or +- * NX active: +- */ +- if (!exec_shield || executable_stack != EXSTACK_DISABLE_X || nx_enabled) +- arch_add_exec_range(current->mm, -1); +-#endif +- + /* Discard our unneeded old files struct */ + if (files) { + put_files_struct(files); +@@ -755,8 +741,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) + /* Do this immediately, since STACK_TOP as used in setup_arg_pages + may depend on the personality. */ + SET_PERSONALITY(loc->elf_ex, 0); +- if (!(exec_shield & 2) && +- elf_read_implies_exec(loc->elf_ex, executable_stack)) ++ if (elf_read_implies_exec(loc->elf_ex, executable_stack)) + current->personality |= READ_IMPLIES_EXEC; + + if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) +@@ -921,7 +906,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) + interpreter, + &interp_map_addr, + load_bias); +- if (!BAD_ADDR(elf_entry)) { ++ if (!IS_ERR((void *)elf_entry)) { + /* + * load_elf_interp() returns relocation + * adjustment +diff --git a/fs/proc/array.c b/fs/proc/array.c +index 46adc3b..07d6c48 100644 +--- a/fs/proc/array.c ++++ b/fs/proc/array.c +@@ -471,12 +471,8 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, + } + rcu_read_unlock(); + +- if (!whole || num_threads < 2) { +- wchan = 0; +- if (current->uid == task->uid || current->euid == task->uid || +- capable(CAP_SYS_NICE)) +- wchan = get_wchan(task); +- } ++ if (!whole || num_threads < 2) ++ wchan = get_wchan(task); + if (!whole) { + min_flt = task->min_flt; + maj_flt = task->maj_flt; +diff --git a/include/asm-ia64/pgalloc.h b/include/asm-ia64/pgalloc.h +index 24f183a..b9ac1a6 100644 +--- a/include/asm-ia64/pgalloc.h ++++ b/include/asm-ia64/pgalloc.h +@@ -1,10 +1,6 @@ + #ifndef _ASM_IA64_PGALLOC_H + #define _ASM_IA64_PGALLOC_H + +-#define arch_add_exec_range(mm, limit) do { ; } while (0) +-#define arch_flush_exec_range(mm) do { ; } while (0) +-#define arch_remove_exec_range(mm, limit) do { ; } while (0) +- + /* + * This file contains the functions and defines necessary to allocate + * page tables. +diff --git a/include/asm-powerpc/pgalloc.h b/include/asm-powerpc/pgalloc.h +index 25068ae..b4505ed 100644 +--- a/include/asm-powerpc/pgalloc.h ++++ b/include/asm-powerpc/pgalloc.h +@@ -2,11 +2,6 @@ + #define _ASM_POWERPC_PGALLOC_H + #ifdef __KERNEL__ + +-/* Dummy functions since we don't support execshield on ppc */ +-#define arch_add_exec_range(mm, limit) do { ; } while (0) +-#define arch_flush_exec_range(mm) do { ; } while (0) +-#define arch_remove_exec_range(mm, limit) do { ; } while (0) +- + #ifdef CONFIG_PPC64 + #include + #else +diff --git a/include/asm-ppc/pgalloc.h b/include/asm-ppc/pgalloc.h +index de55ad5..fd4d1d7 100644 +--- a/include/asm-ppc/pgalloc.h ++++ b/include/asm-ppc/pgalloc.h +@@ -41,10 +41,5 @@ extern void pte_free(struct mm_struct *mm, pgtable_t pte); + + #define check_pgt_cache() do { } while (0) + +-#define arch_add_exec_range(mm, limit) do { ; } while (0) +-#define arch_flush_exec_range(mm) do { ; } while (0) +-#define arch_remove_exec_range(mm, limit) do { ; } while (0) +- +- + #endif /* _PPC_PGALLOC_H */ + #endif /* __KERNEL__ */ +diff --git a/include/asm-s390/pgalloc.h b/include/asm-s390/pgalloc.h +index a43f0ec..f5b2bf3 100644 +--- a/include/asm-s390/pgalloc.h ++++ b/include/asm-s390/pgalloc.h +@@ -17,10 +17,6 @@ + #include + #include + +-#define arch_add_exec_range(mm, limit) do { ; } while (0) +-#define arch_flush_exec_range(mm) do { ; } while (0) +-#define arch_remove_exec_range(mm, limit) do { ; } while (0) +- + #define check_pgt_cache() do {} while (0) + + unsigned long *crst_table_alloc(struct mm_struct *, int); +diff --git a/include/asm-sparc/pgalloc.h b/include/asm-sparc/pgalloc.h +index 2632807..6292cd0 100644 +--- a/include/asm-sparc/pgalloc.h ++++ b/include/asm-sparc/pgalloc.h +@@ -66,8 +66,4 @@ BTFIXUPDEF_CALL(void, pte_free, pgtable_t ) + #define pte_free(mm, pte) BTFIXUP_CALL(pte_free)(pte) + #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte) + +-#define arch_add_exec_range(mm, limit) do { ; } while (0) +-#define arch_flush_exec_range(mm) do { ; } while (0) +-#define arch_remove_exec_range(mm, limit) do { ; } while (0) +- + #endif /* _SPARC_PGALLOC_H */ +diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h +index c998da2..3ee2d40 100644 +--- a/include/asm-sparc64/pgalloc.h ++++ b/include/asm-sparc64/pgalloc.h +@@ -79,8 +79,4 @@ static inline void check_pgt_cache(void) + quicklist_trim(0, NULL, 25, 16); + } + +-#define arch_add_exec_range(mm, limit) do { ; } while (0) +-#define arch_flush_exec_range(mm) do { ; } while (0) +-#define arch_remove_exec_range(mm, limit) do { ; } while (0) +- + #endif /* _SPARC64_PGALLOC_H */ +diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h +index 7ad80b9..5b6a05d 100644 +--- a/include/asm-x86/desc.h ++++ b/include/asm-x86/desc.h +@@ -353,22 +353,6 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist) + _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS); + } + +-static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) +-{ +- limit = (limit - 1) / PAGE_SIZE; +- desc->a = limit & 0xffff; +- desc->b = (limit & 0xf0000) | 0x00c0fb00; +-} +- +-#define load_user_cs_desc(cpu, mm) \ +- get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs +- +-#ifdef CONFIG_X86_32 +-extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); +-extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); +-extern void arch_flush_exec_range(struct mm_struct *mm); +-#endif /* CONFIG_X86_32 */ +- + #else + /* + * GET_DESC_BASE reads the descriptor base of the specified segment. +diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h +index 001b577..fb62f99 100644 +--- a/include/asm-x86/elf.h ++++ b/include/asm-x86/elf.h +@@ -185,6 +185,7 @@ static inline void elf_common_init(struct thread_struct *t, + clear_thread_flag(TIF_ABI_PENDING); \ + else \ + set_thread_flag(TIF_ABI_PENDING); \ ++ current->personality |= force_personality32; \ + } while (0) + #define COMPAT_ELF_PLATFORM ("i686") + +@@ -229,6 +230,7 @@ static inline void elf_common_init(struct thread_struct *t, + #define ELF_PLATFORM ("x86_64") + extern void set_personality_64bit(void); + extern unsigned int sysctl_vsyscall32; ++extern int force_personality32; + + #endif /* !CONFIG_X86_32 */ + +diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h +index db9b109..efa962c 100644 +--- a/include/asm-x86/mmu.h ++++ b/include/asm-x86/mmu.h +@@ -9,8 +9,6 @@ + * we put the segment information here. + * + * cpu_vm_mask is used to optimize ldt flushing. +- * exec_limit is used to track the range PROT_EXEC +- * mappings span. + */ + typedef struct { + void *ldt; +@@ -20,10 +18,6 @@ typedef struct { + int size; + struct mutex lock; + void *vdso; +-#ifdef CONFIG_X86_32 +- struct desc_struct user_cs; +- unsigned long exec_limit; +-#endif + } mm_context_t; + + #ifdef CONFIG_SMP +diff --git a/include/asm-x86/pgalloc_64.h b/include/asm-x86/pgalloc_64.h +index 982e1cb..8d67223 100644 +--- a/include/asm-x86/pgalloc_64.h ++++ b/include/asm-x86/pgalloc_64.h +@@ -5,13 +5,6 @@ + #include + #include + +-#define arch_add_exec_range(mm, limit) \ +- do { (void)(mm), (void)(limit); } while (0) +-#define arch_flush_exec_range(mm) \ +- do { (void)(mm); } while (0) +-#define arch_remove_exec_range(mm, limit) \ +- do { (void)(mm), (void)(limit); } while (0) +- + #define pmd_populate_kernel(mm, pmd, pte) \ + set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte))) + #define pud_populate(mm, pud, pmd) \ +diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h +index ef01196..45a2f0a 100644 +--- a/include/asm-x86/processor.h ++++ b/include/asm-x86/processor.h +@@ -674,9 +674,6 @@ extern int bootloader_type; + extern char ignore_fpu_irq; + #define cache_line_size() (boot_cpu_data.x86_cache_alignment) + +-#define __HAVE_ARCH_ALIGN_STACK +-extern unsigned long arch_align_stack(unsigned long sp); +- + #define HAVE_ARCH_PICK_MMAP_LAYOUT 1 + #define ARCH_HAS_PREFETCHW + #define ARCH_HAS_SPINLOCK_PREFETCH +@@ -754,9 +751,6 @@ static inline void prefetchw(const void *x) + regs->cs = __USER_CS; \ + regs->ip = new_eip; \ + regs->sp = new_esp; \ +- preempt_disable(); \ +- load_user_cs_desc(smp_processor_id(), current->mm); \ +- preempt_enable(); \ + } while (0) + + +diff --git a/include/linux/mm.h b/include/linux/mm.h +index 4b74dc8..3f3ccfe 100644 +--- a/include/linux/mm.h ++++ b/include/linux/mm.h +@@ -1043,13 +1043,7 @@ extern int install_special_mapping(struct mm_struct *mm, + unsigned long addr, unsigned long len, + unsigned long flags, struct page **pages); + +-extern unsigned long get_unmapped_area_prot(struct file *, unsigned long, unsigned long, unsigned long, unsigned long, int); +- +-static inline unsigned long get_unmapped_area(struct file *file, unsigned long addr, +- unsigned long len, unsigned long pgoff, unsigned long flags) +-{ +- return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); +-} ++extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); + + extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, + unsigned long len, unsigned long prot, +diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h +index 1f430ab..af190ce 100644 +--- a/include/linux/mm_types.h ++++ b/include/linux/mm_types.h +@@ -163,9 +163,6 @@ struct mm_struct { + unsigned long (*get_unmapped_area) (struct file *filp, + unsigned long addr, unsigned long len, + unsigned long pgoff, unsigned long flags); +- unsigned long (*get_unmapped_exec_area) (struct file *filp, +- unsigned long addr, unsigned long len, +- unsigned long pgoff, unsigned long flags); + void (*unmap_area) (struct mm_struct *mm, unsigned long addr); + unsigned long mmap_base; /* base of mmap area */ + unsigned long task_size; /* size of task vm space */ +diff --git a/include/linux/resource.h b/include/linux/resource.h +index 14757af..ae13db7 100644 +--- a/include/linux/resource.h ++++ b/include/linux/resource.h +@@ -54,11 +54,8 @@ struct rlimit { + /* + * Limit the stack by to some sane default: root can always + * increase this limit if needed.. 8MB seems reasonable. +- * +- * (2MB more to cover randomization effects.) + */ +-#define _STK_LIM (10*1024*1024) +-#define EXEC_STACK_BIAS (2*1024*1024) ++#define _STK_LIM (8*1024*1024) + + /* + * GPG wants 32kB of mlocked memory, to make sure pass phrases +diff --git a/include/linux/sched.h b/include/linux/sched.h +index a4b1a64..6361cff 100644 +--- a/include/linux/sched.h ++++ b/include/linux/sched.h +@@ -98,9 +98,6 @@ struct futex_pi_state; + struct robust_list_head; + struct bio; + +-extern int exec_shield; +-extern int print_fatal_signals; +- + /* + * List of flags we want to share for kernel threads, + * if only because they are not used by them anyway. +@@ -346,10 +343,6 @@ extern int sysctl_max_map_count; + extern unsigned long + arch_get_unmapped_area(struct file *, unsigned long, unsigned long, + unsigned long, unsigned long); +- +-extern unsigned long +-arch_get_unmapped_exec_area(struct file *, unsigned long, unsigned long, +- unsigned long, unsigned long); + extern unsigned long + arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, + unsigned long len, unsigned long pgoff, +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index ea74b8c..2d35d6e 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -82,26 +82,6 @@ extern int maps_protect; + extern int sysctl_stat_interval; + extern int latencytop_enabled; + +-int exec_shield = (1<<0); +-/* exec_shield is a bitmask: +- * 0: off; vdso at STACK_TOP, 1 page below TASK_SIZE +- * (1<<0) 1: on [also on if !=0] +- * (1<<1) 2: force noexecstack regardless of PT_GNU_STACK +- * The old settings +- * (1<<2) 4: vdso just below .text of main (unless too low) +- * (1<<3) 8: vdso just below .text of PT_INTERP (unless too low) +- * are ignored because the vdso is placed completely randomly +- */ +- +-static int __init setup_exec_shield(char *str) +-{ +- get_option(&str, &exec_shield); +- +- return 1; +-} +- +-__setup("exec-shield=", setup_exec_shield); +- + /* Constants used for minimum and maximum */ + #if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM) + static int one = 1; +@@ -386,14 +366,6 @@ static struct ctl_table kern_table[] = { + .proc_handler = &proc_dointvec, + }, + { +- .ctl_name = CTL_UNNUMBERED, +- .procname = "exec-shield", +- .data = &exec_shield, +- .maxlen = sizeof(int), +- .mode = 0644, +- .proc_handler = &proc_dointvec, +- }, +- { + .ctl_name = KERN_CORE_USES_PID, + .procname = "core_uses_pid", + .data = &core_uses_pid, +diff --git a/mm/mmap.c b/mm/mmap.c +index d7c2c9d..a32d28c 100644 +--- a/mm/mmap.c ++++ b/mm/mmap.c +@@ -26,7 +26,6 @@ + #include + #include + #include +-#include + + #include + #include +@@ -378,8 +377,6 @@ static inline void + __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma, + struct vm_area_struct *prev, struct rb_node *rb_parent) + { +- if (vma->vm_flags & VM_EXEC) +- arch_add_exec_range(mm, vma->vm_end); + if (prev) { + vma->vm_next = prev->vm_next; + prev->vm_next = vma; +@@ -483,8 +480,6 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma, + rb_erase(&vma->vm_rb, &mm->mm_rb); + if (mm->mmap_cache == vma) + mm->mmap_cache = prev; +- if (vma->vm_flags & VM_EXEC) +- arch_remove_exec_range(mm, vma->vm_end); + } + + /* +@@ -790,8 +785,6 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, + } else /* cases 2, 5, 7 */ + vma_adjust(prev, prev->vm_start, + end, prev->vm_pgoff, NULL); +- if (prev->vm_flags & VM_EXEC) +- arch_add_exec_range(mm, prev->vm_end); + return prev; + } + +@@ -947,8 +940,7 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr, + /* Obtain the address to map to. we verify (or select) it and ensure + * that it represents a valid section of the address space. + */ +- addr = get_unmapped_area_prot(file, addr, len, pgoff, flags, +- prot & PROT_EXEC); ++ addr = get_unmapped_area(file, addr, len, pgoff, flags); + if (addr & ~PAGE_MASK) + return addr; + +@@ -1418,17 +1410,13 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) + } + + unsigned long +-get_unmapped_area_prot(struct file *file, unsigned long addr, unsigned long len, +- unsigned long pgoff, unsigned long flags, int exec) ++get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, ++ unsigned long pgoff, unsigned long flags) + { + unsigned long (*get_area)(struct file *, unsigned long, + unsigned long, unsigned long, unsigned long); + +- if (exec && current->mm->get_unmapped_exec_area) +- get_area = current->mm->get_unmapped_exec_area; +- else +- get_area = current->mm->get_unmapped_area; +- ++ get_area = current->mm->get_unmapped_area; + if (file && file->f_op && file->f_op->get_unmapped_area) + get_area = file->f_op->get_unmapped_area; + addr = get_area(file, addr, len, pgoff, flags); +@@ -1442,74 +1430,8 @@ get_unmapped_area_prot(struct file *file, unsigned long addr, unsigned long len, + + return arch_rebalance_pgtables(addr, len); + } +-EXPORT_SYMBOL(get_unmapped_area_prot); +- +-#define SHLIB_BASE 0x00110000 +- +-unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0, +- unsigned long len0, unsigned long pgoff, unsigned long flags) +-{ +- unsigned long addr = addr0, len = len0; +- struct mm_struct *mm = current->mm; +- struct vm_area_struct *vma; +- unsigned long tmp; +- +- if (len > TASK_SIZE) +- return -ENOMEM; +- +- if (flags & MAP_FIXED) +- return addr; +- +- if (!addr) { +- addr = randomize_range(SHLIB_BASE, 0x01000000, len); +- } else { +- addr = PAGE_ALIGN(addr); +- vma = find_vma(mm, addr); +- if (TASK_SIZE - len >= addr && +- (!vma || addr + len <= vma->vm_start)) +- return addr; +- } +- +- addr = SHLIB_BASE; +- for (vma = find_vma(mm, addr); ; vma = vma->vm_next) { +- /* At this point: (!vma || addr < vma->vm_end). */ +- if (TASK_SIZE - len < addr) +- return -ENOMEM; +- +- if (!vma || addr + len <= vma->vm_start) { +- /* +- * Must not let a PROT_EXEC mapping get into the +- * brk area: +- */ +- if (addr + len > mm->brk) +- goto failed; +- +- /* +- * Up until the brk area we randomize addresses +- * as much as possible: +- */ +- if (addr >= 0x01000000) { +- tmp = randomize_range(0x01000000, +- PAGE_ALIGN(max(mm->start_brk, +- (unsigned long)0x08000000)), len); +- vma = find_vma(mm, tmp); +- if (TASK_SIZE - len >= tmp && +- (!vma || tmp + len <= vma->vm_start)) +- return tmp; +- } +- /* +- * Ok, randomization didnt work out - return +- * the result of the linear search: +- */ +- return addr; +- } +- addr = vma->vm_end; +- } +- +-failed: +- return current->mm->get_unmapped_area(filp, addr0, len0, pgoff, flags); +-} + ++EXPORT_SYMBOL(get_unmapped_area); + + /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ + struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr) +@@ -1584,14 +1506,6 @@ out: + return prev ? prev->vm_next : vma; + } + +-static int over_stack_limit(unsigned long sz) +-{ +- if (sz < EXEC_STACK_BIAS) +- return 0; +- return (sz - EXEC_STACK_BIAS) > +- current->signal->rlim[RLIMIT_STACK].rlim_cur; +-} +- + /* + * Verify that the stack growth is acceptable and + * update accounting. This is shared with both the +@@ -1608,7 +1522,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un + return -ENOMEM; + + /* Stack limit test */ +- if (over_stack_limit(size)) ++ if (size > rlim[RLIMIT_STACK].rlim_cur) + return -ENOMEM; + + /* mlock limit tests */ +@@ -1912,14 +1826,10 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, + if (new->vm_ops && new->vm_ops->open) + new->vm_ops->open(new); + +- if (new_below) { +- unsigned long old_end = vma->vm_end; +- ++ if (new_below) + vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff + + ((addr - new->vm_start) >> PAGE_SHIFT), new); +- if (vma->vm_flags & VM_EXEC) +- arch_remove_exec_range(mm, old_end); +- } else ++ else + vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); + + return 0; +@@ -2138,7 +2048,6 @@ void exit_mmap(struct mm_struct *mm) + vm_unacct_memory(nr_accounted); + free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); + tlb_finish_mmu(tlb, 0, end); +- arch_flush_exec_range(mm); + + /* + * Walk the list again, actually closing and freeing it, +diff --git a/mm/mprotect.c b/mm/mprotect.c +index 6d822ad..4de5468 100644 +--- a/mm/mprotect.c ++++ b/mm/mprotect.c +@@ -23,12 +23,8 @@ + #include + #include + #include +-#include + #include + #include +-#ifdef CONFIG_X86 +-#include +-#endif + + static void change_pte_range(struct mm_struct *mm, pmd_t *pmd, + unsigned long addr, unsigned long end, pgprot_t newprot, +@@ -138,7 +134,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, + struct mm_struct *mm = vma->vm_mm; + unsigned long oldflags = vma->vm_flags; + long nrpages = (end - start) >> PAGE_SHIFT; +- unsigned long charged = 0, old_end = vma->vm_end; ++ unsigned long charged = 0; + pgoff_t pgoff; + int error; + int dirty_accountable = 0; +@@ -202,9 +198,6 @@ success: + dirty_accountable = 1; + } + +- if (oldflags & VM_EXEC) +- arch_remove_exec_range(current->mm, old_end); +- + if (is_vm_hugetlb_page(vma)) + hugetlb_change_protection(vma, start, end, vma->vm_page_prot); + else +diff --git a/mm/mremap.c b/mm/mremap.c +index 101f885..08e3c7f 100644 +--- a/mm/mremap.c ++++ b/mm/mremap.c +@@ -392,8 +392,8 @@ unsigned long do_mremap(unsigned long addr, + if (vma->vm_flags & VM_MAYSHARE) + map_flags |= MAP_SHARED; + +- new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len, +- vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC); ++ new_addr = get_unmapped_area(vma->vm_file, 0, new_len, ++ vma->vm_pgoff, map_flags); + if (new_addr & ~PAGE_MASK) { + ret = new_addr; + goto out; +-- +1.5.4.1 + linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch: Index: linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch =================================================================== RCS file: linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch diff -N linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,30 @@ +From 1fa2a8ec8dd7f0a05035b50dec00a92710dab698 Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Wed, 5 Mar 2008 12:50:50 +0000 +Subject: [PATCH] squashfs: Fix build without CONFIG_SMP + +wait_event() needs various definitions from + +With CONFIG_SMP, pulls in , +but without CONFIG_SMP it fails to build. + +Signed-off-by: Mark McLoughlin +--- + fs/squashfs/inode.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c +index f578528..f5829f2 100644 +--- a/fs/squashfs/inode.c ++++ b/fs/squashfs/inode.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include "squashfs.h" + +-- +1.5.4.1 + linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch: Index: linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch =================================================================== RCS file: linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch diff -N linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,39 @@ +From 8085f21aff0de59e5c2f6937823040dff8a003ed Mon Sep 17 00:00:00 2001 +From: Markus Armbruster +Date: Fri, 29 Feb 2008 17:37:43 +0000 +Subject: [PATCH] xen: Make hvc0 the preferred console in domU + +This makes the Xen console just work. Before, you had to ask for it +on the kernel command line with console=hvc0 + +Signed-off-by: Markus Armbruster +Signed-off-by: Mark McLoughlin +--- + arch/x86/xen/enlighten.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c +index 8b9ee27..a94605e 100644 +--- a/arch/x86/xen/enlighten.c ++++ b/arch/x86/xen/enlighten.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -1210,6 +1211,9 @@ asmlinkage void __init xen_start_kernel(void) + ? __pa(xen_start_info->mod_start) : 0; + boot_params.hdr.ramdisk_size = xen_start_info->mod_len; + ++ if (!is_initial_xendomain()) ++ add_preferred_console("hvc", 0, NULL); ++ + /* Start the world */ + start_kernel(); + } +-- +1.5.4.1 + linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch: Index: linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch =================================================================== RCS file: linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch diff -N linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,78 @@ +From 6007e6d44bea69bc39ddb3a45185a1b4f3d42f06 Mon Sep 17 00:00:00 2001 +From: Markus Armbruster +Date: Mon, 25 Feb 2008 14:02:24 +0100 +Subject: [PATCH] xen: Make xen-blkfront write its protocol ABI to xenstore + +Frontends are expected to write their protocol ABI to xenstore. Since +the protocol ABI defaults to the backend's native ABI, things work +fine without that as long as the frontend's native ABI is identical to +the backend's native ABI. This is not the case for xen-blkfront +running 32-on-64, because its ABI differs between 32 and 64 bit, and +thus needs this fix. + +Based on http://xenbits.xensource.com/xen-unstable.hg?rev/c545932a18f3 +and http://xenbits.xensource.com/xen-unstable.hg?rev/ffe52263b430 by +Gerd Hoffmann + +Signed-off-by: Markus Armbruster +--- + drivers/block/xen-blkfront.c | 7 +++++++ + include/xen/interface/io/protocols.h | 21 +++++++++++++++++++++ + 2 files changed, 28 insertions(+), 0 deletions(-) + create mode 100644 include/xen/interface/io/protocols.h + +diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c +index 9c6f3f9..2e7c81e 100644 +--- a/drivers/block/xen-blkfront.c ++++ b/drivers/block/xen-blkfront.c +@@ -47,6 +47,7 @@ + + #include + #include ++#include + + #include + +@@ -614,6 +615,12 @@ again: + message = "writing event-channel"; + goto abort_transaction; + } ++ err = xenbus_printf(xbt, dev->nodename, "protocol", "%s", ++ XEN_IO_PROTO_ABI_NATIVE); ++ if (err) { ++ message = "writing protocol"; ++ goto abort_transaction; ++ } + + err = xenbus_transaction_end(xbt, 0); + if (err) { +diff --git a/include/xen/interface/io/protocols.h b/include/xen/interface/io/protocols.h +new file mode 100644 +index 0000000..01fc8ae +--- /dev/null ++++ b/include/xen/interface/io/protocols.h +@@ -0,0 +1,21 @@ ++#ifndef __XEN_PROTOCOLS_H__ ++#define __XEN_PROTOCOLS_H__ ++ ++#define XEN_IO_PROTO_ABI_X86_32 "x86_32-abi" ++#define XEN_IO_PROTO_ABI_X86_64 "x86_64-abi" ++#define XEN_IO_PROTO_ABI_IA64 "ia64-abi" ++#define XEN_IO_PROTO_ABI_POWERPC64 "powerpc64-abi" ++ ++#if defined(__i386__) ++# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32 ++#elif defined(__x86_64__) ++# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_64 ++#elif defined(__ia64__) ++# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64 ++#elif defined(__powerpc64__) ++# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64 ++#else ++# error arch fixup needed here ++#endif ++ ++#endif +-- +1.5.4.1 + linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch: Index: linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch =================================================================== RCS file: linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch diff -N linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,87 @@ +From 014bae01b0076eb96cd5ba1013253623dba06254 Mon Sep 17 00:00:00 2001 +From: Markus Armbruster +Date: Mon, 25 Feb 2008 14:03:52 +0100 +Subject: [PATCH] fbdev: Make deferred I/O work as advertized + +Deferred I/O was utterly broken. Reading the mmap()ed framebuffer +worked, but writing it made the VM endlessly invoke +vm_ops.page_mkwrite(). That happened because we failed to set +page->mapping and page->index. + +The fix is to set them, and clean up properly before the framebuffer +gets released. + +Fix extracted from this linux-fbdev-devel message: + + Subject: [PATCH 1/1 2.6.24] fbdev: defio and Metronomefb + From: Jaya Kumar + Date: 2008-02-18 13:41:26 + +Signed-off-by: Jaya Kumar +Signed-off-by: Markus Armbruster +--- + drivers/video/fb_defio.c | 22 ++++++++++++++++++++-- + 1 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c +index 0f8cfb9..24843fd 100644 +--- a/drivers/video/fb_defio.c ++++ b/drivers/video/fb_defio.c +@@ -4,7 +4,7 @@ + * Copyright (C) 2006 Jaya Kumar + * + * This file is subject to the terms and conditions of the GNU General Public +- * License. See the file COPYING in the main directory of this archive ++ * License. See the file COPYING in the main directory of this archive + * for more details. + */ + +@@ -31,7 +31,7 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma, + unsigned long offset; + struct page *page; + struct fb_info *info = vma->vm_private_data; +- /* info->screen_base is in System RAM */ ++ /* info->screen_base is virtual memory */ + void *screen_base = (void __force *) info->screen_base; + + offset = vmf->pgoff << PAGE_SHIFT; +@@ -43,6 +43,15 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma, + return VM_FAULT_SIGBUS; + + get_page(page); ++ ++ if (vma->vm_file) ++ page->mapping = vma->vm_file->f_mapping; ++ else ++ printk(KERN_ERR "no mapping available\n"); ++ ++ BUG_ON(!page->mapping); ++ page->index = vmf->pgoff; ++ + vmf->page = page; + return 0; + } +@@ -138,11 +147,20 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_init); + + void fb_deferred_io_cleanup(struct fb_info *info) + { ++ void *screen_base = (void __force *) info->screen_base; + struct fb_deferred_io *fbdefio = info->fbdefio; ++ struct page *page; ++ int i; + + BUG_ON(!fbdefio); + cancel_delayed_work(&info->deferred_work); + flush_scheduled_work(); ++ ++ /* clear out the mapping that we setup */ ++ for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) { ++ page = vmalloc_to_page(screen_base + i); ++ page->mapping = NULL; ++ } + } + EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup); + +-- +1.5.4.1 + linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch: Index: linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch =================================================================== RCS file: linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch diff -N linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,1254 @@ +From 38a7237d6e5d70a4deafc7ef14e90c76b391834f Mon Sep 17 00:00:00 2001 +From: Markus Armbruster +Date: Mon, 25 Feb 2008 14:06:46 +0100 +Subject: [PATCH] xen pvfb: Para-virtual framebuffer, keyboard and pointer driver + +This is a pair of Xen para-virtual frontend device drivers: +drivers/video/xen-fbfront.c provides a framebuffer, and +drivers/input/xen-kbdfront provides keyboard and mouse. + +The backends run in dom0 user space. + +The two drivers are not in two separate patches, because the +intermediate step (one driver, not the other) is somewhat problematic: +the backend in dom0 needs both drivers, and will refuse to complete +device initialization unless they're both present. + +Signed-off-by: Markus Armbruster +--- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 2 + + drivers/input/xen-kbdfront.c | 340 +++++++++++++++++++++++ + drivers/video/Kconfig | 14 + + drivers/video/Makefile | 1 + + drivers/video/xen-fbfront.c | 550 ++++++++++++++++++++++++++++++++++++++ + include/xen/interface/io/fbif.h | 124 +++++++++ + include/xen/interface/io/kbdif.h | 114 ++++++++ + 8 files changed, 1154 insertions(+), 0 deletions(-) + create mode 100644 drivers/input/xen-kbdfront.c + create mode 100644 drivers/video/xen-fbfront.c + create mode 100644 include/xen/interface/io/fbif.h + create mode 100644 include/xen/interface/io/kbdif.h + +diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig +index d84ac4a..747633c 100644 +--- a/drivers/input/Kconfig ++++ b/drivers/input/Kconfig +@@ -149,6 +149,15 @@ config INPUT_APMPOWER + To compile this driver as a module, choose M here: the + module will be called apm-power. + ++config XEN_KBDDEV_FRONTEND ++ tristate "Xen virtual keyboard and mouse support" ++ depends on XEN_FBDEV_FRONTEND ++ default y ++ help ++ This driver implements the front-end of the Xen virtual ++ keyboard and mouse device driver. It communicates with a back-end ++ in another domain. ++ + comment "Input Device Drivers" + + source "drivers/input/keyboard/Kconfig" +diff --git a/drivers/input/Makefile b/drivers/input/Makefile +index 24bdec1..606e1b9 100644 +--- a/drivers/input/Makefile ++++ b/drivers/input/Makefile +@@ -24,3 +24,5 @@ obj-$(CONFIG_INPUT_MISC) += misc/ + obj-$(CONFIG_INPUT_LIRC) += lirc/ + + obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o ++ ++obj-$(CONFIG_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o +diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c +new file mode 100644 +index 0000000..0f47f46 +--- /dev/null ++++ b/drivers/input/xen-kbdfront.c +@@ -0,0 +1,340 @@ ++/* ++ * Xen para-virtual input device ++ * ++ * Copyright (C) 2005 Anthony Liguori ++ * Copyright (C) 2006-2008 Red Hat, Inc., Markus Armbruster ++ * ++ * Based on linux/drivers/input/mouse/sermouse.c ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file COPYING in the main directory of this archive for ++ * more details. ++ */ ++ ++/* ++ * TODO: ++ * ++ * Switch to grant tables together with xen-fbfront.c. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct xenkbd_info { ++ struct input_dev *kbd; ++ struct input_dev *ptr; ++ struct xenkbd_page *page; ++ int irq; ++ struct xenbus_device *xbdev; ++ char phys[32]; ++}; ++ ++static int xenkbd_remove(struct xenbus_device *); ++static int xenkbd_connect_backend(struct xenbus_device *, struct xenkbd_info *); ++static void xenkbd_disconnect_backend(struct xenkbd_info *); ++ ++/* ++ * Note: if you need to send out events, see xenfb_do_update() for how ++ * to do that. ++ */ ++ ++static irqreturn_t input_handler(int rq, void *dev_id) ++{ ++ struct xenkbd_info *info = dev_id; ++ struct xenkbd_page *page = info->page; ++ __u32 cons, prod; ++ ++ prod = page->in_prod; ++ if (prod == page->in_cons) ++ return IRQ_HANDLED; ++ rmb(); /* ensure we see ring contents up to prod */ ++ for (cons = page->in_cons; cons != prod; cons++) { ++ union xenkbd_in_event *event; ++ struct input_dev *dev; ++ event = &XENKBD_IN_RING_REF(page, cons); ++ ++ dev = info->ptr; ++ switch (event->type) { ++ case XENKBD_TYPE_MOTION: ++ input_report_rel(dev, REL_X, event->motion.rel_x); ++ input_report_rel(dev, REL_Y, event->motion.rel_y); ++ break; ++ case XENKBD_TYPE_KEY: ++ dev = NULL; ++ if (test_bit(event->key.keycode, info->kbd->keybit)) ++ dev = info->kbd; ++ if (test_bit(event->key.keycode, info->ptr->keybit)) ++ dev = info->ptr; ++ if (dev) ++ input_report_key(dev, event->key.keycode, ++ event->key.pressed); ++ else ++ printk(KERN_WARNING ++ "xenkbd: unhandled keycode 0x%x\n", ++ event->key.keycode); ++ break; ++ case XENKBD_TYPE_POS: ++ input_report_abs(dev, ABS_X, event->pos.abs_x); ++ input_report_abs(dev, ABS_Y, event->pos.abs_y); ++ break; ++ } ++ if (dev) ++ input_sync(dev); ++ } ++ mb(); /* ensure we got ring contents */ ++ page->in_cons = cons; ++ notify_remote_via_irq(info->irq); ++ ++ return IRQ_HANDLED; ++} ++ ++static int __devinit xenkbd_probe(struct xenbus_device *dev, ++ const struct xenbus_device_id *id) ++{ ++ int ret, i; ++ struct xenkbd_info *info; ++ struct input_dev *kbd, *ptr; ++ ++ info = kzalloc(sizeof(*info), GFP_KERNEL); ++ if (!info) { ++ xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure"); ++ return -ENOMEM; ++ } ++ dev->dev.driver_data = info; ++ info->xbdev = dev; ++ info->irq = -1; ++ snprintf(info->phys, sizeof(info->phys), "xenbus/%s", dev->nodename); ++ ++ info->page = (void *)__get_free_page(GFP_KERNEL | __GFP_ZERO); ++ if (!info->page) ++ goto error_nomem; ++ ++ /* keyboard */ ++ kbd = input_allocate_device(); ++ if (!kbd) ++ goto error_nomem; ++ kbd->name = "Xen Virtual Keyboard"; ++ kbd->phys = info->phys; ++ kbd->id.bustype = BUS_PCI; ++ kbd->id.vendor = 0x5853; ++ kbd->id.product = 0xffff; ++ kbd->evbit[0] = BIT(EV_KEY); ++ for (i = KEY_ESC; i < KEY_UNKNOWN; i++) ++ set_bit(i, kbd->keybit); ++ for (i = KEY_OK; i < KEY_MAX; i++) ++ set_bit(i, kbd->keybit); ++ ++ ret = input_register_device(kbd); ++ if (ret) { ++ input_free_device(kbd); ++ xenbus_dev_fatal(dev, ret, "input_register_device(kbd)"); ++ goto error; ++ } ++ info->kbd = kbd; ++ ++ /* pointing device */ ++ ptr = input_allocate_device(); ++ if (!ptr) ++ goto error_nomem; ++ ptr->name = "Xen Virtual Pointer"; ++ ptr->phys = info->phys; ++ ptr->id.bustype = BUS_PCI; ++ ptr->id.vendor = 0x5853; ++ ptr->id.product = 0xfffe; ++ ptr->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS); ++ for (i = BTN_LEFT; i <= BTN_TASK; i++) ++ set_bit(i, ptr->keybit); ++ ptr->relbit[0] = BIT(REL_X) | BIT(REL_Y); ++ input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0); ++ input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0); ++ ++ ret = input_register_device(ptr); ++ if (ret) { ++ input_free_device(ptr); ++ xenbus_dev_fatal(dev, ret, "input_register_device(ptr)"); ++ goto error; ++ } ++ info->ptr = ptr; ++ ++ ret = xenkbd_connect_backend(dev, info); ++ if (ret < 0) ++ goto error; ++ ++ return 0; ++ ++ error_nomem: ++ ret = -ENOMEM; ++ xenbus_dev_fatal(dev, ret, "allocating device memory"); ++ error: ++ xenkbd_remove(dev); ++ return ret; ++} ++ ++static int xenkbd_resume(struct xenbus_device *dev) ++{ ++ struct xenkbd_info *info = dev->dev.driver_data; ++ ++ xenkbd_disconnect_backend(info); ++ memset(info->page, 0, PAGE_SIZE); ++ return xenkbd_connect_backend(dev, info); ++} ++ ++static int xenkbd_remove(struct xenbus_device *dev) ++{ ++ struct xenkbd_info *info = dev->dev.driver_data; ++ ++ xenkbd_disconnect_backend(info); ++ if (info->kbd) ++ input_unregister_device(info->kbd); ++ if (info->ptr) ++ input_unregister_device(info->ptr); ++ free_page((unsigned long)info->page); ++ kfree(info); ++ return 0; ++} ++ ++static int xenkbd_connect_backend(struct xenbus_device *dev, ++ struct xenkbd_info *info) ++{ ++ int ret, evtchn; ++ struct xenbus_transaction xbt; ++ ++ ret = xenbus_alloc_evtchn(dev, &evtchn); ++ if (ret) ++ return ret; ++ ret = bind_evtchn_to_irqhandler(evtchn, input_handler, ++ 0, dev->devicetype, info); ++ if (ret < 0) { ++ xenbus_free_evtchn(dev, evtchn); ++ xenbus_dev_fatal(dev, ret, "bind_evtchn_to_irqhandler"); ++ return ret; ++ } ++ info->irq = ret; ++ ++ again: ++ ret = xenbus_transaction_start(&xbt); ++ if (ret) { ++ xenbus_dev_fatal(dev, ret, "starting transaction"); ++ return ret; ++ } ++ ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu", ++ virt_to_mfn(info->page)); ++ if (ret) ++ goto error_xenbus; ++ ret = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", ++ evtchn); ++ if (ret) ++ goto error_xenbus; ++ ret = xenbus_transaction_end(xbt, 0); ++ if (ret) { ++ if (ret == -EAGAIN) ++ goto again; ++ xenbus_dev_fatal(dev, ret, "completing transaction"); ++ return ret; ++ } ++ ++ xenbus_switch_state(dev, XenbusStateInitialised); ++ return 0; ++ ++ error_xenbus: ++ xenbus_transaction_end(xbt, 1); ++ xenbus_dev_fatal(dev, ret, "writing xenstore"); ++ return ret; ++} ++ ++static void xenkbd_disconnect_backend(struct xenkbd_info *info) ++{ ++ if (info->irq >= 0) ++ unbind_from_irqhandler(info->irq, info); ++ info->irq = -1; ++} ++ ++static void xenkbd_backend_changed(struct xenbus_device *dev, ++ enum xenbus_state backend_state) ++{ ++ struct xenkbd_info *info = dev->dev.driver_data; ++ int ret, val; ++ ++ switch (backend_state) { ++ case XenbusStateInitialising: ++ case XenbusStateInitialised: ++ case XenbusStateUnknown: ++ case XenbusStateClosed: ++ break; ++ ++ case XenbusStateInitWait: ++InitWait: ++ ret = xenbus_scanf(XBT_NIL, info->xbdev->otherend, ++ "feature-abs-pointer", "%d", &val); ++ if (ret < 0) ++ val = 0; ++ if (val) { ++ ret = xenbus_printf(XBT_NIL, info->xbdev->nodename, ++ "request-abs-pointer", "1"); ++ if (ret) ++ printk(KERN_WARNING ++ "xenkbd: can't request abs-pointer"); ++ } ++ xenbus_switch_state(dev, XenbusStateConnected); ++ break; ++ ++ case XenbusStateConnected: ++ /* ++ * Work around xenbus race condition: If backend goes ++ * through InitWait to Connected fast enough, we can ++ * get Connected twice here. ++ */ ++ if (dev->state != XenbusStateConnected) ++ goto InitWait; /* no InitWait seen yet, fudge it */ ++ break; ++ ++ case XenbusStateClosing: ++ xenbus_frontend_closed(dev); ++ break; ++ } ++} ++ ++static struct xenbus_device_id xenkbd_ids[] = { ++ { "vkbd" }, ++ { "" } ++}; ++ ++static struct xenbus_driver xenkbd = { ++ .name = "vkbd", ++ .owner = THIS_MODULE, ++ .ids = xenkbd_ids, ++ .probe = xenkbd_probe, ++ .remove = xenkbd_remove, ++ .resume = xenkbd_resume, ++ .otherend_changed = xenkbd_backend_changed, ++}; ++ ++static int __init xenkbd_init(void) ++{ ++ if (!is_running_on_xen()) ++ return -ENODEV; ++ ++ /* Nothing to do if running in dom0. */ ++ if (is_initial_xendomain()) ++ return -ENODEV; ++ ++ return xenbus_register_frontend(&xenkbd); ++} ++ ++static void __exit xenkbd_cleanup(void) ++{ ++ xenbus_unregister_driver(&xenkbd); ++} ++ ++module_init(xenkbd_init); ++module_exit(xenkbd_cleanup); ++ ++MODULE_LICENSE("GPL"); +diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig +index 758435f..67de177 100644 +--- a/drivers/video/Kconfig ++++ b/drivers/video/Kconfig +@@ -1903,6 +1903,20 @@ config FB_VIRTUAL + + If unsure, say N. + ++config XEN_FBDEV_FRONTEND ++ tristate "Xen virtual frame buffer support" ++ depends on FB && XEN ++ select FB_SYS_FILLRECT ++ select FB_SYS_COPYAREA ++ select FB_SYS_IMAGEBLIT ++ select FB_SYS_FOPS ++ select FB_DEFERRED_IO ++ default y ++ help ++ This driver implements the front-end of the Xen virtual ++ frame buffer driver. It communicates with a back-end ++ in another domain. ++ + source "drivers/video/omap/Kconfig" + + source "drivers/video/backlight/Kconfig" +diff --git a/drivers/video/Makefile b/drivers/video/Makefile +index 83e02b3..d3ab9b2 100644 +--- a/drivers/video/Makefile ++++ b/drivers/video/Makefile +@@ -113,6 +113,7 @@ obj-$(CONFIG_FB_PS3) += ps3fb.o + obj-$(CONFIG_FB_SM501) += sm501fb.o + obj-$(CONFIG_FB_XILINX) += xilinxfb.o + obj-$(CONFIG_FB_OMAP) += omap/ ++obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o + + # Platform or fallback drivers go here + obj-$(CONFIG_FB_UVESA) += uvesafb.o +diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c +new file mode 100644 +index 0000000..619a6f8 +--- /dev/null ++++ b/drivers/video/xen-fbfront.c +@@ -0,0 +1,550 @@ ++/* ++ * Xen para-virtual frame buffer device ++ * ++ * Copyright (C) 2005-2006 Anthony Liguori ++ * Copyright (C) 2006-2008 Red Hat, Inc., Markus Armbruster ++ * ++ * Based on linux/drivers/video/q40fb.c ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file COPYING in the main directory of this archive for ++ * more details. ++ */ ++ ++/* ++ * TODO: ++ * ++ * Switch to grant tables when they become capable of dealing with the ++ * frame buffer. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct xenfb_info { ++ unsigned char *fb; ++ struct fb_info *fb_info; ++ int x1, y1, x2, y2; /* dirty rectangle, ++ protected by dirty_lock */ ++ spinlock_t dirty_lock; ++ int nr_pages; ++ int irq; ++ struct xenfb_page *page; ++ unsigned long *mfns; ++ int update_wanted; /* XENFB_TYPE_UPDATE wanted */ ++ ++ struct xenbus_device *xbdev; ++}; ++ ++static u32 xenfb_mem_len = XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH / 8; ++ ++static int xenfb_remove(struct xenbus_device *); ++static void xenfb_init_shared_page(struct xenfb_info *); ++static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *); ++static void xenfb_disconnect_backend(struct xenfb_info *); ++ ++static void xenfb_do_update(struct xenfb_info *info, ++ int x, int y, int w, int h) ++{ ++ union xenfb_out_event event; ++ u32 prod; ++ ++ event.type = XENFB_TYPE_UPDATE; ++ event.update.x = x; ++ event.update.y = y; ++ event.update.width = w; ++ event.update.height = h; ++ ++ prod = info->page->out_prod; ++ /* caller ensures !xenfb_queue_full() */ ++ mb(); /* ensure ring space available */ ++ XENFB_OUT_RING_REF(info->page, prod) = event; ++ wmb(); /* ensure ring contents visible */ ++ info->page->out_prod = prod + 1; ++ ++ notify_remote_via_irq(info->irq); ++} ++ ++static int xenfb_queue_full(struct xenfb_info *info) ++{ ++ u32 cons, prod; ++ ++ prod = info->page->out_prod; ++ cons = info->page->out_cons; ++ return prod - cons == XENFB_OUT_RING_LEN; ++} ++ ++static void xenfb_refresh(struct xenfb_info *info, ++ int x1, int y1, int w, int h) ++{ ++ unsigned long flags; ++ int y2 = y1 + h - 1; ++ int x2 = x1 + w - 1; ++ ++ if (!info->update_wanted) ++ return; ++ ++ spin_lock_irqsave(&info->dirty_lock, flags); ++ ++ /* Combine with dirty rectangle: */ ++ if (info->y1 < y1) ++ y1 = info->y1; ++ if (info->y2 > y2) ++ y2 = info->y2; ++ if (info->x1 < x1) ++ x1 = info->x1; ++ if (info->x2 > x2) ++ x2 = info->x2; ++ ++ if (xenfb_queue_full(info)) { ++ /* Can't send right now, stash it in the dirty rectangle */ ++ info->x1 = x1; ++ info->x2 = x2; ++ info->y1 = y1; ++ info->y2 = y2; ++ spin_unlock_irqrestore(&info->dirty_lock, flags); ++ return; ++ } ++ ++ /* Clear dirty rectangle: */ ++ info->x1 = info->y1 = INT_MAX; ++ info->x2 = info->y2 = 0; ++ ++ spin_unlock_irqrestore(&info->dirty_lock, flags); ++ ++ if (x1 <= x2 && y1 <= y2) ++ xenfb_do_update(info, x1, y1, x2 - x1 + 1, y2 - y1 + 1); ++} ++ ++static void xenfb_deferred_io(struct fb_info *fb_info, ++ struct list_head *pagelist) ++{ ++ struct xenfb_info *info = fb_info->par; ++ struct page *page; ++ unsigned long beg, end; ++ int y1, y2, miny, maxy; ++ ++ miny = INT_MAX; ++ maxy = 0; ++ list_for_each_entry(page, pagelist, lru) { ++ beg = page->index << PAGE_SHIFT; ++ end = beg + PAGE_SIZE - 1; ++ y1 = beg / fb_info->fix.line_length; ++ y2 = end / fb_info->fix.line_length; ++ if (y2 >= fb_info->var.yres) ++ y2 = fb_info->var.yres - 1; ++ if (miny > y1) ++ miny = y1; ++ if (maxy < y2) ++ maxy = y2; ++ } ++ xenfb_refresh(info, 0, miny, fb_info->var.xres, maxy - miny + 1); ++} ++ ++static struct fb_deferred_io xenfb_defio = { ++ .delay = HZ / 20, ++ .deferred_io = xenfb_deferred_io, ++}; ++ ++static int xenfb_setcolreg(unsigned regno, unsigned red, unsigned green, ++ unsigned blue, unsigned transp, ++ struct fb_info *info) ++{ ++ u32 v; ++ ++ if (regno > info->cmap.len) ++ return 1; ++ ++#define CNVT_TOHW(val, width) ((((val)<<(width))+0x7FFF-(val))>>16) ++ red = CNVT_TOHW(red, info->var.red.length); ++ green = CNVT_TOHW(green, info->var.green.length); ++ blue = CNVT_TOHW(blue, info->var.blue.length); ++ transp = CNVT_TOHW(transp, info->var.transp.length); ++#undef CNVT_TOHW ++ ++ v = (red << info->var.red.offset) | ++ (green << info->var.green.offset) | ++ (blue << info->var.blue.offset); ++ ++ switch (info->var.bits_per_pixel) { ++ case 16: ++ case 24: ++ case 32: ++ ((u32 *)info->pseudo_palette)[regno] = v; ++ break; ++ } ++ ++ return 0; ++} ++ ++static void xenfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) ++{ ++ struct xenfb_info *info = p->par; ++ ++ sys_fillrect(p, rect); ++ xenfb_refresh(info, rect->dx, rect->dy, rect->width, rect->height); ++} ++ ++static void xenfb_imageblit(struct fb_info *p, const struct fb_image *image) ++{ ++ struct xenfb_info *info = p->par; ++ ++ sys_imageblit(p, image); ++ xenfb_refresh(info, image->dx, image->dy, image->width, image->height); ++} ++ ++static void xenfb_copyarea(struct fb_info *p, const struct fb_copyarea *area) ++{ ++ struct xenfb_info *info = p->par; ++ ++ sys_copyarea(p, area); ++ xenfb_refresh(info, area->dx, area->dy, area->width, area->height); ++} ++ ++static ssize_t xenfb_write(struct fb_info *p, const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct xenfb_info *info = p->par; ++ ssize_t res; ++ ++ res = fb_sys_write(p, buf, count, ppos); ++ xenfb_refresh(info, 0, 0, info->page->width, info->page->height); ++ return res; ++} ++ ++static struct fb_ops xenfb_fb_ops = { ++ .owner = THIS_MODULE, ++ .fb_read = fb_sys_read, ++ .fb_write = xenfb_write, ++ .fb_setcolreg = xenfb_setcolreg, ++ .fb_fillrect = xenfb_fillrect, ++ .fb_copyarea = xenfb_copyarea, ++ .fb_imageblit = xenfb_imageblit, ++}; ++ ++static irqreturn_t xenfb_event_handler(int rq, void *dev_id) ++{ ++ /* ++ * No in events recognized, simply ignore them all. ++ * If you need to recognize some, see xen-kbdfront's ++ * input_handler() for how to do that. ++ */ ++ struct xenfb_info *info = dev_id; ++ struct xenfb_page *page = info->page; ++ ++ if (page->in_cons != page->in_prod) { ++ info->page->in_cons = info->page->in_prod; ++ notify_remote_via_irq(info->irq); ++ } ++ ++ /* Flush dirty rectangle: */ ++ xenfb_refresh(info, INT_MAX, INT_MAX, -INT_MAX, -INT_MAX); ++ ++ return IRQ_HANDLED; ++} ++ ++static int __devinit xenfb_probe(struct xenbus_device *dev, ++ const struct xenbus_device_id *id) ++{ ++ struct xenfb_info *info; ++ struct fb_info *fb_info; ++ int ret; ++ ++ info = kzalloc(sizeof(*info), GFP_KERNEL); ++ if (info == NULL) { ++ xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure"); ++ return -ENOMEM; ++ } ++ dev->dev.driver_data = info; ++ info->xbdev = dev; ++ info->irq = -1; ++ info->x1 = info->y1 = INT_MAX; ++ spin_lock_init(&info->dirty_lock); ++ ++ info->fb = vmalloc(xenfb_mem_len); ++ if (info->fb == NULL) ++ goto error_nomem; ++ memset(info->fb, 0, xenfb_mem_len); ++ ++ info->nr_pages = (xenfb_mem_len + PAGE_SIZE - 1) >> PAGE_SHIFT; ++ ++ info->mfns = vmalloc(sizeof(unsigned long) * info->nr_pages); ++ if (!info->mfns) ++ goto error_nomem; ++ ++ /* set up shared page */ ++ info->page = (void *)__get_free_page(GFP_KERNEL | __GFP_ZERO); ++ if (!info->page) ++ goto error_nomem; ++ ++ xenfb_init_shared_page(info); ++ ++ /* abusing framebuffer_alloc() to allocate pseudo_palette */ ++ fb_info = framebuffer_alloc(sizeof(u32) * 256, NULL); ++ if (fb_info == NULL) ++ goto error_nomem; ++ ++ /* complete the abuse: */ ++ fb_info->pseudo_palette = fb_info->par; ++ fb_info->par = info; ++ ++ fb_info->screen_base = info->fb; ++ ++ fb_info->fbops = &xenfb_fb_ops; ++ fb_info->var.xres_virtual = fb_info->var.xres = info->page->width; ++ fb_info->var.yres_virtual = fb_info->var.yres = info->page->height; ++ fb_info->var.bits_per_pixel = info->page->depth; ++ ++ fb_info->var.red = (struct fb_bitfield){16, 8, 0}; ++ fb_info->var.green = (struct fb_bitfield){8, 8, 0}; ++ fb_info->var.blue = (struct fb_bitfield){0, 8, 0}; ++ ++ fb_info->var.activate = FB_ACTIVATE_NOW; ++ fb_info->var.height = -1; ++ fb_info->var.width = -1; ++ fb_info->var.vmode = FB_VMODE_NONINTERLACED; ++ ++ fb_info->fix.visual = FB_VISUAL_TRUECOLOR; ++ fb_info->fix.line_length = info->page->line_length; ++ fb_info->fix.smem_start = 0; ++ fb_info->fix.smem_len = xenfb_mem_len; ++ strcpy(fb_info->fix.id, "xen"); ++ fb_info->fix.type = FB_TYPE_PACKED_PIXELS; ++ fb_info->fix.accel = FB_ACCEL_NONE; ++ ++ fb_info->flags = FBINFO_FLAG_DEFAULT; ++ ++ ret = fb_alloc_cmap(&fb_info->cmap, 256, 0); ++ if (ret < 0) { ++ framebuffer_release(fb_info); ++ xenbus_dev_fatal(dev, ret, "fb_alloc_cmap"); ++ goto error; ++ } ++ ++ fb_info->fbdefio = &xenfb_defio; ++ fb_deferred_io_init(fb_info); ++ ++ ret = register_framebuffer(fb_info); ++ if (ret) { ++ fb_deferred_io_cleanup(fb_info); ++ fb_dealloc_cmap(&fb_info->cmap); ++ framebuffer_release(fb_info); ++ xenbus_dev_fatal(dev, ret, "register_framebuffer"); ++ goto error; ++ } ++ info->fb_info = fb_info; ++ ++ ret = xenfb_connect_backend(dev, info); ++ if (ret < 0) ++ goto error; ++ ++ return 0; ++ ++ error_nomem: ++ ret = -ENOMEM; ++ xenbus_dev_fatal(dev, ret, "allocating device memory"); ++ error: ++ xenfb_remove(dev); ++ return ret; ++} ++ ++static int xenfb_resume(struct xenbus_device *dev) ++{ ++ struct xenfb_info *info = dev->dev.driver_data; ++ ++ xenfb_disconnect_backend(info); ++ xenfb_init_shared_page(info); ++ return xenfb_connect_backend(dev, info); ++} ++ ++static int xenfb_remove(struct xenbus_device *dev) ++{ ++ struct xenfb_info *info = dev->dev.driver_data; ++ ++ xenfb_disconnect_backend(info); ++ if (info->fb_info) { ++ fb_deferred_io_cleanup(info->fb_info); ++ unregister_framebuffer(info->fb_info); ++ fb_dealloc_cmap(&info->fb_info->cmap); ++ framebuffer_release(info->fb_info); ++ } ++ free_page((unsigned long)info->page); ++ vfree(info->mfns); ++ vfree(info->fb); ++ kfree(info); ++ ++ return 0; ++} ++ ++static unsigned long vmalloc_to_mfn(void *address) ++{ ++ return pfn_to_mfn(vmalloc_to_pfn(address)); ++} ++ ++static void xenfb_init_shared_page(struct xenfb_info *info) ++{ ++ int i; ++ ++ for (i = 0; i < info->nr_pages; i++) ++ info->mfns[i] = vmalloc_to_mfn(info->fb + i * PAGE_SIZE); ++ ++ info->page->pd[0] = vmalloc_to_mfn(info->mfns); ++ info->page->pd[1] = 0; ++ info->page->width = XENFB_WIDTH; ++ info->page->height = XENFB_HEIGHT; ++ info->page->depth = XENFB_DEPTH; ++ info->page->line_length = (info->page->depth / 8) * info->page->width; ++ info->page->mem_length = xenfb_mem_len; ++ info->page->in_cons = info->page->in_prod = 0; ++ info->page->out_cons = info->page->out_prod = 0; ++} ++ ++static int xenfb_connect_backend(struct xenbus_device *dev, ++ struct xenfb_info *info) ++{ ++ int ret, evtchn; ++ struct xenbus_transaction xbt; ++ ++ ret = xenbus_alloc_evtchn(dev, &evtchn); ++ if (ret) ++ return ret; ++ ret = bind_evtchn_to_irqhandler(evtchn, xenfb_event_handler, ++ 0, dev->devicetype, info); ++ if (ret < 0) { ++ xenbus_free_evtchn(dev, evtchn); ++ xenbus_dev_fatal(dev, ret, "bind_evtchn_to_irqhandler"); ++ return ret; ++ } ++ info->irq = ret; ++ ++ again: ++ ret = xenbus_transaction_start(&xbt); ++ if (ret) { ++ xenbus_dev_fatal(dev, ret, "starting transaction"); ++ return ret; ++ } ++ ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu", ++ virt_to_mfn(info->page)); ++ if (ret) ++ goto error_xenbus; ++ ret = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", ++ evtchn); ++ if (ret) ++ goto error_xenbus; ++ ret = xenbus_printf(xbt, dev->nodename, "protocol", "%s", ++ XEN_IO_PROTO_ABI_NATIVE); ++ if (ret) ++ goto error_xenbus; ++ ret = xenbus_printf(xbt, dev->nodename, "feature-update", "1"); ++ if (ret) ++ goto error_xenbus; ++ ret = xenbus_transaction_end(xbt, 0); ++ if (ret) { ++ if (ret == -EAGAIN) ++ goto again; ++ xenbus_dev_fatal(dev, ret, "completing transaction"); ++ return ret; ++ } ++ ++ xenbus_switch_state(dev, XenbusStateInitialised); ++ return 0; ++ ++ error_xenbus: ++ xenbus_transaction_end(xbt, 1); ++ xenbus_dev_fatal(dev, ret, "writing xenstore"); ++ return ret; ++} ++ ++static void xenfb_disconnect_backend(struct xenfb_info *info) ++{ ++ if (info->irq >= 0) ++ unbind_from_irqhandler(info->irq, info); ++ info->irq = -1; ++} ++ ++static void xenfb_backend_changed(struct xenbus_device *dev, ++ enum xenbus_state backend_state) ++{ ++ struct xenfb_info *info = dev->dev.driver_data; ++ int val; ++ ++ switch (backend_state) { ++ case XenbusStateInitialising: ++ case XenbusStateInitialised: ++ case XenbusStateUnknown: ++ case XenbusStateClosed: ++ break; ++ ++ case XenbusStateInitWait: ++InitWait: ++ xenbus_switch_state(dev, XenbusStateConnected); ++ break; ++ ++ case XenbusStateConnected: ++ /* ++ * Work around xenbus race condition: If backend goes ++ * through InitWait to Connected fast enough, we can ++ * get Connected twice here. ++ */ ++ if (dev->state != XenbusStateConnected) ++ goto InitWait; /* no InitWait seen yet, fudge it */ ++ ++ if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, ++ "request-update", "%d", &val) < 0) ++ val = 0; ++ if (val) ++ info->update_wanted = 1; ++ break; ++ ++ case XenbusStateClosing: ++ xenbus_frontend_closed(dev); ++ break; ++ } ++} ++ ++static struct xenbus_device_id xenfb_ids[] = { ++ { "vfb" }, ++ { "" } ++}; ++ ++static struct xenbus_driver xenfb = { ++ .name = "vfb", ++ .owner = THIS_MODULE, ++ .ids = xenfb_ids, ++ .probe = xenfb_probe, ++ .remove = xenfb_remove, ++ .resume = xenfb_resume, ++ .otherend_changed = xenfb_backend_changed, ++}; ++ ++static int __init xenfb_init(void) ++{ ++ if (!is_running_on_xen()) ++ return -ENODEV; ++ ++ /* Nothing to do if running in dom0. */ ++ if (is_initial_xendomain()) ++ return -ENODEV; ++ ++ return xenbus_register_frontend(&xenfb); ++} ++ ++static void __exit xenfb_cleanup(void) ++{ ++ xenbus_unregister_driver(&xenfb); ++} ++ ++module_init(xenfb_init); ++module_exit(xenfb_cleanup); ++ ++MODULE_LICENSE("GPL"); +diff --git a/include/xen/interface/io/fbif.h b/include/xen/interface/io/fbif.h +new file mode 100644 +index 0000000..5a934dd +--- /dev/null ++++ b/include/xen/interface/io/fbif.h +@@ -0,0 +1,124 @@ ++/* ++ * fbif.h -- Xen virtual frame buffer device ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to ++ * deal in the Software without restriction, including without limitation the ++ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Copyright (C) 2005 Anthony Liguori ++ * Copyright (C) 2006 Red Hat, Inc., Markus Armbruster ++ */ ++ ++#ifndef __XEN_PUBLIC_IO_FBIF_H__ ++#define __XEN_PUBLIC_IO_FBIF_H__ ++ ++/* Out events (frontend -> backend) */ ++ ++/* ++ * Out events may be sent only when requested by backend, and receipt ++ * of an unknown out event is an error. ++ */ ++ ++/* Event type 1 currently not used */ ++/* ++ * Framebuffer update notification event ++ * Capable frontend sets feature-update in xenstore. ++ * Backend requests it by setting request-update in xenstore. ++ */ ++#define XENFB_TYPE_UPDATE 2 ++ ++struct xenfb_update { ++ uint8_t type; /* XENFB_TYPE_UPDATE */ ++ int32_t x; /* source x */ ++ int32_t y; /* source y */ ++ int32_t width; /* rect width */ ++ int32_t height; /* rect height */ ++}; ++ ++#define XENFB_OUT_EVENT_SIZE 40 ++ ++union xenfb_out_event { ++ uint8_t type; ++ struct xenfb_update update; ++ char pad[XENFB_OUT_EVENT_SIZE]; ++}; ++ ++/* In events (backend -> frontend) */ ++ ++/* ++ * Frontends should ignore unknown in events. ++ * No in events currently defined. ++ */ ++ ++#define XENFB_IN_EVENT_SIZE 40 ++ ++union xenfb_in_event { ++ uint8_t type; ++ char pad[XENFB_IN_EVENT_SIZE]; ++}; ++ ++/* shared page */ ++ ++#define XENFB_IN_RING_SIZE 1024 ++#define XENFB_IN_RING_LEN (XENFB_IN_RING_SIZE / XENFB_IN_EVENT_SIZE) ++#define XENFB_IN_RING_OFFS 1024 ++#define XENFB_IN_RING(page) \ ++ ((union xenfb_in_event *)((char *)(page) + XENFB_IN_RING_OFFS)) ++#define XENFB_IN_RING_REF(page, idx) \ ++ (XENFB_IN_RING((page))[(idx) % XENFB_IN_RING_LEN]) ++ ++#define XENFB_OUT_RING_SIZE 2048 ++#define XENFB_OUT_RING_LEN (XENFB_OUT_RING_SIZE / XENFB_OUT_EVENT_SIZE) ++#define XENFB_OUT_RING_OFFS (XENFB_IN_RING_OFFS + XENFB_IN_RING_SIZE) ++#define XENFB_OUT_RING(page) \ ++ ((union xenfb_out_event *)((char *)(page) + XENFB_OUT_RING_OFFS)) ++#define XENFB_OUT_RING_REF(page, idx) \ ++ (XENFB_OUT_RING((page))[(idx) % XENFB_OUT_RING_LEN]) ++ ++struct xenfb_page { ++ uint32_t in_cons, in_prod; ++ uint32_t out_cons, out_prod; ++ ++ int32_t width; /* width of the framebuffer (in pixels) */ ++ int32_t height; /* height of the framebuffer (in pixels) */ ++ uint32_t line_length; /* length of a row of pixels (in bytes) */ ++ uint32_t mem_length; /* length of the framebuffer (in bytes) */ ++ uint8_t depth; /* depth of a pixel (in bits) */ ++ ++ /* ++ * Framebuffer page directory ++ * ++ * Each directory page holds PAGE_SIZE / sizeof(*pd) ++ * framebuffer pages, and can thus map up to PAGE_SIZE * ++ * PAGE_SIZE / sizeof(*pd) bytes. With PAGE_SIZE == 4096 and ++ * sizeof(unsigned long) == 4, that's 4 Megs. Two directory ++ * pages should be enough for a while. ++ */ ++ unsigned long pd[2]; ++}; ++ ++/* ++ * Wart: xenkbd needs to know resolution. Put it here until a better ++ * solution is found, but don't leak it to the backend. ++ */ ++#ifdef __KERNEL__ ++#define XENFB_WIDTH 800 ++#define XENFB_HEIGHT 600 ++#define XENFB_DEPTH 32 ++#endif ++ ++#endif +diff --git a/include/xen/interface/io/kbdif.h b/include/xen/interface/io/kbdif.h +new file mode 100644 +index 0000000..fb97f42 +--- /dev/null ++++ b/include/xen/interface/io/kbdif.h +@@ -0,0 +1,114 @@ ++/* ++ * kbdif.h -- Xen virtual keyboard/mouse ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to ++ * deal in the Software without restriction, including without limitation the ++ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Copyright (C) 2005 Anthony Liguori ++ * Copyright (C) 2006 Red Hat, Inc., Markus Armbruster ++ */ ++ ++#ifndef __XEN_PUBLIC_IO_KBDIF_H__ ++#define __XEN_PUBLIC_IO_KBDIF_H__ ++ ++/* In events (backend -> frontend) */ ++ ++/* ++ * Frontends should ignore unknown in events. ++ */ ++ ++/* Pointer movement event */ ++#define XENKBD_TYPE_MOTION 1 ++/* Event type 2 currently not used */ ++/* Key event (includes pointer buttons) */ ++#define XENKBD_TYPE_KEY 3 ++/* ++ * Pointer position event ++ * Capable backend sets feature-abs-pointer in xenstore. ++ * Frontend requests ot instead of XENKBD_TYPE_MOTION by setting ++ * request-abs-update in xenstore. ++ */ ++#define XENKBD_TYPE_POS 4 ++ ++struct xenkbd_motion { ++ uint8_t type; /* XENKBD_TYPE_MOTION */ ++ int32_t rel_x; /* relative X motion */ ++ int32_t rel_y; /* relative Y motion */ ++}; ++ ++struct xenkbd_key { ++ uint8_t type; /* XENKBD_TYPE_KEY */ ++ uint8_t pressed; /* 1 if pressed; 0 otherwise */ ++ uint32_t keycode; /* KEY_* from linux/input.h */ ++}; ++ ++struct xenkbd_position { ++ uint8_t type; /* XENKBD_TYPE_POS */ ++ int32_t abs_x; /* absolute X position (in FB pixels) */ ++ int32_t abs_y; /* absolute Y position (in FB pixels) */ ++}; ++ ++#define XENKBD_IN_EVENT_SIZE 40 ++ ++union xenkbd_in_event { ++ uint8_t type; ++ struct xenkbd_motion motion; ++ struct xenkbd_key key; ++ struct xenkbd_position pos; ++ char pad[XENKBD_IN_EVENT_SIZE]; ++}; ++ ++/* Out events (frontend -> backend) */ ++ ++/* ++ * Out events may be sent only when requested by backend, and receipt ++ * of an unknown out event is an error. ++ * No out events currently defined. ++ */ ++ ++#define XENKBD_OUT_EVENT_SIZE 40 ++ ++union xenkbd_out_event { ++ uint8_t type; ++ char pad[XENKBD_OUT_EVENT_SIZE]; ++}; ++ ++/* shared page */ ++ ++#define XENKBD_IN_RING_SIZE 2048 ++#define XENKBD_IN_RING_LEN (XENKBD_IN_RING_SIZE / XENKBD_IN_EVENT_SIZE) ++#define XENKBD_IN_RING_OFFS 1024 ++#define XENKBD_IN_RING(page) \ ++ ((union xenkbd_in_event *)((char *)(page) + XENKBD_IN_RING_OFFS)) ++#define XENKBD_IN_RING_REF(page, idx) \ ++ (XENKBD_IN_RING((page))[(idx) % XENKBD_IN_RING_LEN]) ++ ++#define XENKBD_OUT_RING_SIZE 1024 ++#define XENKBD_OUT_RING_LEN (XENKBD_OUT_RING_SIZE / XENKBD_OUT_EVENT_SIZE) ++#define XENKBD_OUT_RING_OFFS (XENKBD_IN_RING_OFFS + XENKBD_IN_RING_SIZE) ++#define XENKBD_OUT_RING(page) \ ++ ((union xenkbd_out_event *)((char *)(page) + XENKBD_OUT_RING_OFFS)) ++#define XENKBD_OUT_RING_REF(page, idx) \ ++ (XENKBD_OUT_RING((page))[(idx) % XENKBD_OUT_RING_LEN]) ++ ++struct xenkbd_page { ++ uint32_t in_cons, in_prod; ++ uint32_t out_cons, out_prod; ++}; ++ ++#endif +-- +1.5.4.1 + linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch: Index: linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch =================================================================== RCS file: linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch diff -N linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,97 @@ +From 422407af4fdf82e12748b36174a17d857f08ebee Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Fri, 22 Feb 2008 12:42:52 +0000 +Subject: [PATCH] xen: Module autoprobing support for frontend drivers + +Add module aliases to support autoprobing modules +for xen frontend devices. + +Signed-off-by: Mark McLoughlin +--- + drivers/block/xen-blkfront.c | 1 + + drivers/net/xen-netfront.c | 1 + + drivers/xen/xenbus/xenbus_probe.c | 27 +++++++++++++++++++++++++-- + 3 files changed, 27 insertions(+), 2 deletions(-) + +diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c +index 2e7c81e..0c47c02 100644 +--- a/drivers/block/xen-blkfront.c ++++ b/drivers/block/xen-blkfront.c +@@ -1005,3 +1005,4 @@ module_exit(xlblk_exit); + MODULE_DESCRIPTION("Xen virtual block device frontend"); + MODULE_LICENSE("GPL"); + MODULE_ALIAS_BLOCKDEV_MAJOR(XENVBD_MAJOR); ++MODULE_ALIAS("xen:vbd"); +diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c +index 7483d45..b3fa27e 100644 +--- a/drivers/net/xen-netfront.c ++++ b/drivers/net/xen-netfront.c +@@ -1809,3 +1809,4 @@ module_exit(netif_exit); + + MODULE_DESCRIPTION("Xen virtual network device frontend"); + MODULE_LICENSE("GPL"); ++MODULE_ALIAS("xen:vif"); +diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c +index 4750de3..336363c 100644 +--- a/drivers/xen/xenbus/xenbus_probe.c ++++ b/drivers/xen/xenbus/xenbus_probe.c +@@ -88,6 +88,16 @@ int xenbus_match(struct device *_dev, struct device_driver *_drv) + return match_device(drv->ids, to_xenbus_device(_dev)) != NULL; + } + ++static int xenbus_uevent(struct device *_dev, struct kobj_uevent_env *env) ++{ ++ struct xenbus_device *dev = to_xenbus_device(_dev); ++ ++ if (add_uevent_var(env, "MODALIAS=xen:%s", dev->devicetype)) ++ return -ENOMEM; ++ ++ return 0; ++} ++ + /* device// => - */ + static int frontend_bus_id(char bus_id[BUS_ID_SIZE], const char *nodename) + { +@@ -166,6 +176,7 @@ static struct xen_bus_type xenbus_frontend = { + .bus = { + .name = "xen", + .match = xenbus_match, ++ .uevent = xenbus_uevent, + .probe = xenbus_dev_probe, + .remove = xenbus_dev_remove, + .shutdown = xenbus_dev_shutdown, +@@ -438,6 +449,12 @@ static ssize_t xendev_show_devtype(struct device *dev, + } + DEVICE_ATTR(devtype, S_IRUSR | S_IRGRP | S_IROTH, xendev_show_devtype, NULL); + ++static ssize_t xendev_show_modalias(struct device *dev, ++ struct device_attribute *attr, char *buf) ++{ ++ return sprintf(buf, "xen:%s\n", to_xenbus_device(dev)->devicetype); ++} ++DEVICE_ATTR(modalias, S_IRUSR | S_IRGRP | S_IROTH, xendev_show_modalias, NULL); + + int xenbus_probe_node(struct xen_bus_type *bus, + const char *type, +@@ -492,10 +509,16 @@ int xenbus_probe_node(struct xen_bus_type *bus, + + err = device_create_file(&xendev->dev, &dev_attr_devtype); + if (err) +- goto fail_remove_file; ++ goto fail_remove_nodename; ++ ++ err = device_create_file(&xendev->dev, &dev_attr_modalias); ++ if (err) ++ goto fail_remove_devtype; + + return 0; +-fail_remove_file: ++fail_remove_devtype: ++ device_remove_file(&xendev->dev, &dev_attr_devtype); ++fail_remove_nodename: + device_remove_file(&xendev->dev, &dev_attr_nodename); + fail_unregister: + device_unregister(&xendev->dev); +-- +1.5.4.1 + linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch: Index: linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch =================================================================== RCS file: linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch diff -N linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,37 @@ +From 6025fff31cba456d0e44e6120af376454658890d Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Thu, 21 Feb 2008 11:13:12 +0000 +Subject: [PATCH] xen: Add compatibility aliases for frontend drivers + +Before getting merged, xen-blkfront was xenblk and +xen-netfront was xennet. + +Add compatibility module aliases to ease upgrades. + +Signed-off-by: Mark McLoughlin +--- + drivers/block/xen-blkfront.c | 1 + + drivers/net/xen-netfront.c | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c +index 0c47c02..8ce168d 100644 +--- a/drivers/block/xen-blkfront.c ++++ b/drivers/block/xen-blkfront.c +@@ -1006,3 +1006,4 @@ MODULE_DESCRIPTION("Xen virtual block device frontend"); + MODULE_LICENSE("GPL"); + MODULE_ALIAS_BLOCKDEV_MAJOR(XENVBD_MAJOR); + MODULE_ALIAS("xen:vbd"); ++MODULE_ALIAS("xenblk"); +diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c +index b3fa27e..e62018a 100644 +--- a/drivers/net/xen-netfront.c ++++ b/drivers/net/xen-netfront.c +@@ -1810,3 +1810,4 @@ module_exit(netif_exit); + MODULE_DESCRIPTION("Xen virtual network device frontend"); + MODULE_LICENSE("GPL"); + MODULE_ALIAS("xen:vif"); ++MODULE_ALIAS("xennet"); +-- +1.5.4.1 + linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch: Index: linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch =================================================================== RCS file: linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch diff -N linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,78 @@ +From cf0f35fc0d69ca088953e0cba566bfa503488b6b Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Tue, 19 Feb 2008 15:34:32 +0000 +Subject: [PATCH] xen: Add a vmlinuz target + +Although patches are in progress to allow Xen boot +a DomU using a bzImage, support for booting a Dom0 +using a bzImage is still a ways off. + +For now, just add a target to build a gzip-ed ELF +file which Xen can use to boot both Dom0 and DomU. + +Signed-off-by: Mark McLoughlin +--- + arch/x86/Makefile | 9 +++++++++ + arch/x86/boot/.gitignore | 1 + + arch/x86/boot/Makefile | 9 +++++++++ + 3 files changed, 19 insertions(+), 0 deletions(-) + +diff --git a/arch/x86/Makefile b/arch/x86/Makefile +index f1e739a..14a752e 100644 +--- a/arch/x86/Makefile ++++ b/arch/x86/Makefile +@@ -206,6 +206,15 @@ boot := arch/x86/boot + PHONY += zImage bzImage compressed zlilo bzlilo \ + zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install + ++ifdef CONFIG_XEN ++PHONY += vmlinuz ++all: vmlinuz ++ ++vmlinuz: KBUILD_IMAGE := $(boot)/vmlinuz ++vmlinuz: vmlinux ++ $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) ++endif ++ + # Default kernel to build + all: bzImage + +diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore +index b1bdc4c..35e7956 100644 +--- a/arch/x86/boot/.gitignore ++++ b/arch/x86/boot/.gitignore +@@ -5,3 +5,4 @@ setup.bin + setup.elf + cpustr.h + mkcpustr ++vmlinuz +diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile +index f88458e..61bba92 100644 +--- a/arch/x86/boot/Makefile ++++ b/arch/x86/boot/Makefile +@@ -26,6 +26,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA + #RAMDISK := -DRAMDISK=512 + + targets := vmlinux.bin setup.bin setup.elf zImage bzImage ++targets += vmlinuz vmlinux-stripped + subdir- := compressed + + setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o +@@ -105,6 +106,14 @@ $(obj)/setup.bin: $(obj)/setup.elf FORCE + $(obj)/compressed/vmlinux: FORCE + $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@ + ++$(obj)/vmlinuz: $(obj)/vmlinux-stripped FORCE ++ $(call if_changed,gzip) ++ @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' ++ ++$(obj)/vmlinux-stripped: OBJCOPYFLAGS := -g --strip-unneeded ++$(obj)/vmlinux-stripped: vmlinux FORCE ++ $(call if_changed,objcopy) ++ + # Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel + FDARGS = + # Set this if you want an initrd included with the zdisk/fdimage/isoimage kernel +-- +1.5.4.1 + linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch: Index: linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch =================================================================== RCS file: linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch diff -N linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,124 @@ +From 1f09b9348726be2b7a25427c21a08f8c16e7a5a2 Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Mon, 4 Feb 2008 08:30:37 +0000 +Subject: [PATCH] xen: Add empty xenctrl module + +Add the basic infrastructure for a xenctrl module +which will contain the various kernel interfaces +used by (mainly Dom0) Xen userspace. + +Signed-off-by: Mark McLoughlin +--- + arch/x86/xen/Kconfig | 7 +++++ + drivers/xen/Makefile | 2 + + drivers/xen/xenctrl/Makefile | 4 +++ + drivers/xen/xenctrl/main.c | 62 ++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 75 insertions(+), 0 deletions(-) + create mode 100644 drivers/xen/xenctrl/Makefile + create mode 100644 drivers/xen/xenctrl/main.c + +diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig +index 4d5f264..4723bc1 100644 +--- a/arch/x86/xen/Kconfig ++++ b/arch/x86/xen/Kconfig +@@ -11,3 +11,10 @@ config XEN + This is the Linux Xen port. Enabling this will allow the + kernel to boot in a paravirtualized environment under the + Xen hypervisor. ++ ++config XENCTRL ++ tristate "Xen's user space control interfaces" ++ depends on XEN && PROC_FS ++ default y if XEN ++ help ++ This is the /proc/xen interface used by Xen's libxc. +diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile +index 56592f0..6737463 100644 +--- a/drivers/xen/Makefile ++++ b/drivers/xen/Makefile +@@ -1,2 +1,4 @@ + obj-y += grant-table.o + obj-y += xenbus/ ++ ++obj-$(CONFIG_XENCTRL) += xenctrl/ +diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile +new file mode 100644 +index 0000000..1f43a43 +--- /dev/null ++++ b/drivers/xen/xenctrl/Makefile +@@ -0,0 +1,4 @@ ++obj-$(CONFIG_XENCTRL) += xenctrl.o ++ ++xenctrl-objs = ++xenctrl-objs += main.o +diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c +new file mode 100644 +index 0000000..2965ceb +--- /dev/null ++++ b/drivers/xen/xenctrl/main.c +@@ -0,0 +1,62 @@ ++/****************************************************************************** ++ * ++ * main.c ++ * ++ * Xen userspace control interfaces ++ * ++ * Copyright (c) 2002-2004, K A Fraser, B Dragovic ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation; or, when distributed ++ * separately from the Linux kernel or incorporated into other ++ * software packages, subject to the following license: ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this source file (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, copy, modify, ++ * merge, publish, distribute, sublicense, and/or sell copies of the Software, ++ * and to permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. ++ */ ++ ++#include ++#include ++#include ++ ++static int __init xenctrl_init(void) ++{ ++ struct proc_dir_entry *dir; ++ ++ if (!is_running_on_xen()) ++ return -ENODEV; ++ ++ dir = proc_mkdir("xen", NULL); ++ if (!dir) ++ return -ENOMEM; ++ ++ dir->owner = THIS_MODULE; ++ ++ return 0; ++} ++ ++static void __exit xenctrl_exit(void) ++{ ++ remove_proc_entry("xen", NULL); ++} ++ ++module_init(xenctrl_init); ++module_exit(xenctrl_exit); ++ ++MODULE_LICENSE("Dual BSD/GPL"); +-- +1.5.4.1 + linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch: Index: linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch =================================================================== RCS file: linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch diff -N linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,190 @@ +From 1d322cb04345404de611fc9b7e10c78bf957eb49 Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Mon, 4 Feb 2008 09:16:51 +0000 +Subject: [PATCH] xen: Add /proc/xen/capabilities + +/proc/xen/capabilities is used by the xend init script +to check whether it is running on Dom0. + +Signed-off-by: Mark McLoughlin +--- + drivers/xen/xenctrl/Makefile | 1 + + drivers/xen/xenctrl/capabilities.c | 68 ++++++++++++++++++++++++++++++++++++ + drivers/xen/xenctrl/main.c | 11 ++++++ + drivers/xen/xenctrl/xenctrl.h | 39 ++++++++++++++++++++ + 4 files changed, 119 insertions(+), 0 deletions(-) + create mode 100644 drivers/xen/xenctrl/capabilities.c + create mode 100644 drivers/xen/xenctrl/xenctrl.h + +diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile +index 1f43a43..631f535 100644 +--- a/drivers/xen/xenctrl/Makefile ++++ b/drivers/xen/xenctrl/Makefile +@@ -2,3 +2,4 @@ obj-$(CONFIG_XENCTRL) += xenctrl.o + + xenctrl-objs = + xenctrl-objs += main.o ++xenctrl-objs += capabilities.o +diff --git a/drivers/xen/xenctrl/capabilities.c b/drivers/xen/xenctrl/capabilities.c +new file mode 100644 +index 0000000..1ff078a +--- /dev/null ++++ b/drivers/xen/xenctrl/capabilities.c +@@ -0,0 +1,68 @@ ++/****************************************************************************** ++ * ++ * capabilities.c ++ * ++ * /proc/xen/capabilities ++ * ++ * Copyright (c) 2002-2004, K A Fraser, B Dragovic ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation; or, when distributed ++ * separately from the Linux kernel or incorporated into other ++ * software packages, subject to the following license: ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this source file (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, copy, modify, ++ * merge, publish, distribute, sublicense, and/or sell copies of the Software, ++ * and to permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. ++ */ ++ ++#include ++#include ++#include ++ ++static int capabilities_read(char *page, char **start, off_t off, ++ int count, int *eof, void *data) ++{ ++ int len = 0; ++ *page = 0; ++ ++ if (is_initial_xendomain()) ++ len = sprintf(page, "control_d\n"); ++ ++ *eof = 1; ++ return len; ++} ++ ++int __init capabilities_create_proc_entry(void) ++{ ++ struct proc_dir_entry *entry; ++ ++ entry = create_proc_entry("xen/capabilities", 0400, NULL); ++ if (!entry) ++ return -ENOMEM; ++ ++ entry->owner = THIS_MODULE; ++ entry->read_proc = capabilities_read; ++ ++ return 0; ++} ++ ++void __exit capabilities_remove_proc_entry(void) ++{ ++ remove_proc_entry("xen/capabilities", NULL); ++} +diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c +index 2965ceb..0e42f7e 100644 +--- a/drivers/xen/xenctrl/main.c ++++ b/drivers/xen/xenctrl/main.c +@@ -31,6 +31,8 @@ + * IN THE SOFTWARE. + */ + ++#include "xenctrl.h" ++ + #include + #include + #include +@@ -38,6 +40,7 @@ + static int __init xenctrl_init(void) + { + struct proc_dir_entry *dir; ++ int ret; + + if (!is_running_on_xen()) + return -ENODEV; +@@ -48,11 +51,19 @@ static int __init xenctrl_init(void) + + dir->owner = THIS_MODULE; + ++ ret = capabilities_create_proc_entry(); ++ if (ret) ++ goto fail1; ++ + return 0; ++ ++ fail1: remove_proc_entry("xen", NULL); ++ return ret; + } + + static void __exit xenctrl_exit(void) + { ++ capabilities_remove_proc_entry(); + remove_proc_entry("xen", NULL); + } + +diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h +new file mode 100644 +index 0000000..7378dde +--- /dev/null ++++ b/drivers/xen/xenctrl/xenctrl.h +@@ -0,0 +1,39 @@ ++/****************************************************************************** ++ * xenctl.h ++ * ++ * Xen userspace control interfaces ++ * ++ * Copyright (c) 2002-2004, K A Fraser, B Dragovic ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation; or, when distributed ++ * separately from the Linux kernel or incorporated into other ++ * software packages, subject to the following license: ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this source file (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, copy, modify, ++ * merge, publish, distribute, sublicense, and/or sell copies of the Software, ++ * and to permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. ++ */ ++ ++#include ++ ++/* ++ * capabilities.c ++ */ ++int capabilities_create_proc_entry(void) __init; ++void capabilities_remove_proc_entry(void) __exit; +-- +1.5.4.1 + linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch: Index: linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch =================================================================== RCS file: linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch diff -N linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,285 @@ +From b897a4dad96c4695994783da288a44818579f868 Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Mon, 4 Feb 2008 08:24:57 +0000 +Subject: [PATCH] xen: Add /proc/xen/privcmd + +/proc/xen/privcmd is an ioctl() interface which allows +userspace apps to invoke hypercalls. + +There should also be an ioctl (IOCTL_PRIVCMD_MMAP) +which is used to map foreign pages into a processes +address space, but we leave this unimplemented for +now pending further work on foreign page support. + +Signed-off-by: Mark McLoughlin +--- + drivers/xen/xenctrl/Makefile | 1 + + drivers/xen/xenctrl/main.c | 6 +++ + drivers/xen/xenctrl/privcmd.c | 81 +++++++++++++++++++++++++++++++++++++++ + drivers/xen/xenctrl/xenctrl.h | 6 +++ + include/asm-x86/xen/hypercall.h | 28 +++++++++++++ + include/xen/sys/privcmd.h | 79 ++++++++++++++++++++++++++++++++++++++ + 6 files changed, 201 insertions(+), 0 deletions(-) + create mode 100644 drivers/xen/xenctrl/privcmd.c + create mode 100644 include/xen/sys/privcmd.h + +diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile +index 631f535..8a706cb 100644 +--- a/drivers/xen/xenctrl/Makefile ++++ b/drivers/xen/xenctrl/Makefile +@@ -3,3 +3,4 @@ obj-$(CONFIG_XENCTRL) += xenctrl.o + xenctrl-objs = + xenctrl-objs += main.o + xenctrl-objs += capabilities.o ++xenctrl-objs += privcmd.o +diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c +index 0e42f7e..d1fe6ef 100644 +--- a/drivers/xen/xenctrl/main.c ++++ b/drivers/xen/xenctrl/main.c +@@ -55,14 +55,20 @@ static int __init xenctrl_init(void) + if (ret) + goto fail1; + ++ ret = privcmd_create_proc_entry(); ++ if (ret) ++ goto fail2; ++ + return 0; + ++ fail2: capabilities_remove_proc_entry(); + fail1: remove_proc_entry("xen", NULL); + return ret; + } + + static void __exit xenctrl_exit(void) + { ++ privcmd_remove_proc_entry(); + capabilities_remove_proc_entry(); + remove_proc_entry("xen", NULL); + } +diff --git a/drivers/xen/xenctrl/privcmd.c b/drivers/xen/xenctrl/privcmd.c +new file mode 100644 +index 0000000..58c4b83 +--- /dev/null ++++ b/drivers/xen/xenctrl/privcmd.c +@@ -0,0 +1,81 @@ ++/****************************************************************************** ++ * privcmd.c ++ * ++ * Interface to privileged domain-0 commands. ++ * ++ * Copyright (c) 2002-2004, K A Fraser, B Dragovic ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation; or, when distributed ++ * separately from the Linux kernel or incorporated into other ++ * software packages, subject to the following license: ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this source file (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, copy, modify, ++ * merge, publish, distribute, sublicense, and/or sell copies of the Software, ++ * and to permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++static long privcmd_ioctl(struct file *file, unsigned int cmd, ++ unsigned long arg) ++{ ++ switch (cmd) { ++ case IOCTL_PRIVCMD_HYPERCALL: { ++ privcmd_hypercall_t cmd; ++ ++ if (copy_from_user(&cmd, (void __user *)arg, sizeof(cmd))) ++ return -EFAULT; ++ ++ return privcmd_hypercall(&cmd); ++ } ++ ++ case IOCTL_PRIVCMD_MMAP: ++ case IOCTL_PRIVCMD_MMAPBATCH: ++ printk(KERN_WARNING "IOCTL_PRIVCMD_MMAP ioctl not yet implemented\n"); ++ default: ++ return -EINVAL; ++ } ++} ++ ++static const struct file_operations privcmd_file_ops = { ++ .unlocked_ioctl = privcmd_ioctl, ++}; ++ ++int __init privcmd_create_proc_entry(void) ++{ ++ static struct proc_dir_entry *entry; ++ ++ entry = create_proc_entry("xen/privcmd", 0400, NULL); ++ if (!entry) ++ return -ENOMEM; ++ ++ entry->owner = THIS_MODULE; ++ entry->proc_fops = &privcmd_file_ops; ++ ++ return 0; ++} ++ ++void __exit privcmd_remove_proc_entry(void) ++{ ++ remove_proc_entry("xen/privcmd", NULL); ++} +diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h +index 7378dde..a35209a 100644 +--- a/drivers/xen/xenctrl/xenctrl.h ++++ b/drivers/xen/xenctrl/xenctrl.h +@@ -37,3 +37,9 @@ + */ + int capabilities_create_proc_entry(void) __init; + void capabilities_remove_proc_entry(void) __exit; ++ ++/* ++ * privcmd.c ++ */ ++int privcmd_create_proc_entry(void) __init; ++void privcmd_remove_proc_entry(void) __exit; +diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h +index bc0ee7d..cd554ca 100644 +--- a/include/asm-x86/xen/hypercall.h ++++ b/include/asm-x86/xen/hypercall.h +@@ -410,4 +410,32 @@ MULTI_stack_switch(struct multicall_entry *mcl, + mcl->args[1] = esp; + } + ++#include ++ ++static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) ++{ ++ int ret; ++ ++ if (hypercall->op >= (PAGE_SIZE >> 5)) ++ return -EINVAL; ++ ++ __asm__ __volatile__ ( ++ "pushl %%ebx; pushl %%ecx; pushl %%edx; " ++ "pushl %%esi; pushl %%edi; " ++ "movl 8(%%eax),%%ebx ;" ++ "movl 16(%%eax),%%ecx ;" ++ "movl 24(%%eax),%%edx ;" ++ "movl 32(%%eax),%%esi ;" ++ "movl 40(%%eax),%%edi ;" ++ "movl (%%eax),%%eax ;" ++ "shll $5,%%eax ;" ++ "addl $hypercall_page,%%eax ;" ++ "call *%%eax ;" ++ "popl %%edi; popl %%esi; popl %%edx; " ++ "popl %%ecx; popl %%ebx" ++ : "=a" (ret) : "0" (hypercall) : "memory" ); ++ ++ return ret; ++} ++ + #endif /* __HYPERCALL_H__ */ +diff --git a/include/xen/sys/privcmd.h b/include/xen/sys/privcmd.h +new file mode 100644 +index 0000000..9cfa9d7 +--- /dev/null ++++ b/include/xen/sys/privcmd.h +@@ -0,0 +1,79 @@ ++/****************************************************************************** ++ * privcmd.h ++ * ++ * Interface to /proc/xen/privcmd. ++ * ++ * Copyright (c) 2003-2005, K A Fraser ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation; or, when distributed ++ * separately from the Linux kernel or incorporated into other ++ * software packages, subject to the following license: ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this source file (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, copy, modify, ++ * merge, publish, distribute, sublicense, and/or sell copies of the Software, ++ * and to permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. ++ */ ++ ++#ifndef __LINUX_PUBLIC_PRIVCMD_H__ ++#define __LINUX_PUBLIC_PRIVCMD_H__ ++ ++#include ++ ++#ifndef __user ++#define __user ++#endif ++ ++typedef struct privcmd_hypercall ++{ ++ __u64 op; ++ __u64 arg[5]; ++} privcmd_hypercall_t; ++ ++typedef struct privcmd_mmap_entry { ++ __u64 va; ++ __u64 mfn; ++ __u64 npages; ++} privcmd_mmap_entry_t; ++ ++typedef struct privcmd_mmap { ++ int num; ++ domid_t dom; /* target domain */ ++ privcmd_mmap_entry_t __user *entry; ++} privcmd_mmap_t; ++ ++typedef struct privcmd_mmapbatch { ++ int num; /* number of pages to populate */ ++ domid_t dom; /* target domain */ ++ __u64 addr; /* virtual address */ ++ ulong __user *arr; /* array of mfns - top nibble set on err */ ++} privcmd_mmapbatch_t; ++ ++/* ++ * @cmd: IOCTL_PRIVCMD_HYPERCALL ++ * @arg: &privcmd_hypercall_t ++ * Return: Value returned from execution of the specified hypercall. ++ */ ++#define IOCTL_PRIVCMD_HYPERCALL \ ++ _IOC(_IOC_NONE, 'P', 0, sizeof(privcmd_hypercall_t)) ++#define IOCTL_PRIVCMD_MMAP \ ++ _IOC(_IOC_NONE, 'P', 2, sizeof(privcmd_mmap_t)) ++#define IOCTL_PRIVCMD_MMAPBATCH \ ++ _IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t)) ++ ++#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */ +-- +1.5.4.1 + linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch: Index: linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch =================================================================== RCS file: linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch diff -N linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,529 @@ +From 6a0df620e0d6ae9ab22cdadb226f7da0b1282fac Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Mon, 4 Feb 2008 22:04:36 +0000 +Subject: [PATCH] xen: Add /proc/xen/xenbus + +This interface is used by userspace programs to talk to +xenstored. + +Since xenstored makes itself available to Dom0 userspace +via a socket this should only really be useful in Domu, +but it turns out that Dom0 apps historically default +to using /proc/xen/xenbus rather than the socket. + +Signed-off-by: Mark McLoughlin +--- + drivers/xen/xenbus/xenbus_comms.h | 1 - + drivers/xen/xenbus/xenbus_probe.c | 2 + + drivers/xen/xenbus/xenbus_xs.c | 1 + + drivers/xen/xenctrl/Makefile | 1 + + drivers/xen/xenctrl/main.c | 6 + + drivers/xen/xenctrl/xenbus.c | 398 +++++++++++++++++++++++++++++++++++++ + drivers/xen/xenctrl/xenctrl.h | 6 + + include/xen/xenbus.h | 2 + + 8 files changed, 416 insertions(+), 1 deletions(-) + create mode 100644 drivers/xen/xenctrl/xenbus.c + +diff --git a/drivers/xen/xenbus/xenbus_comms.h b/drivers/xen/xenbus/xenbus_comms.h +index c21db75..fcc9b29 100644 +--- a/drivers/xen/xenbus/xenbus_comms.h ++++ b/drivers/xen/xenbus/xenbus_comms.h +@@ -41,6 +41,5 @@ int xb_data_to_read(void); + int xb_wait_for_data_to_read(void); + int xs_input_avail(void); + extern struct xenstore_domain_interface *xen_store_interface; +-extern int xen_store_evtchn; + + #endif /* _XENBUS_COMMS_H */ +diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c +index 336363c..759fdbc 100644 +--- a/drivers/xen/xenbus/xenbus_probe.c ++++ b/drivers/xen/xenbus/xenbus_probe.c +@@ -56,6 +56,8 @@ + #include "xenbus_probe.h" + + int xen_store_evtchn; ++EXPORT_SYMBOL_GPL(xen_store_evtchn); ++ + struct xenstore_domain_interface *xen_store_interface; + static unsigned long xen_store_mfn; + +diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c +index 227d53b..810e24a 100644 +--- a/drivers/xen/xenbus/xenbus_xs.c ++++ b/drivers/xen/xenbus/xenbus_xs.c +@@ -184,6 +184,7 @@ void *xenbus_dev_request_and_reply(struct xsd_sockmsg *msg) + + return ret; + } ++EXPORT_SYMBOL(xenbus_dev_request_and_reply); + + /* Send message to xs, get kmalloc'ed reply. ERR_PTR() on error. */ + static void *xs_talkv(struct xenbus_transaction t, +diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile +index 8a706cb..23dafa3 100644 +--- a/drivers/xen/xenctrl/Makefile ++++ b/drivers/xen/xenctrl/Makefile +@@ -4,3 +4,4 @@ xenctrl-objs = + xenctrl-objs += main.o + xenctrl-objs += capabilities.o + xenctrl-objs += privcmd.o ++xenctrl-objs += xenbus.o +diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c +index d1fe6ef..b0cf61b 100644 +--- a/drivers/xen/xenctrl/main.c ++++ b/drivers/xen/xenctrl/main.c +@@ -59,8 +59,13 @@ static int __init xenctrl_init(void) + if (ret) + goto fail2; + ++ ret = xenbus_create_proc_entry(); ++ if (ret) ++ goto fail3; ++ + return 0; + ++ fail3: privcmd_remove_proc_entry(); + fail2: capabilities_remove_proc_entry(); + fail1: remove_proc_entry("xen", NULL); + return ret; +@@ -68,6 +73,7 @@ static int __init xenctrl_init(void) + + static void __exit xenctrl_exit(void) + { ++ xenbus_remove_proc_entry(); + privcmd_remove_proc_entry(); + capabilities_remove_proc_entry(); + remove_proc_entry("xen", NULL); +diff --git a/drivers/xen/xenctrl/xenbus.c b/drivers/xen/xenctrl/xenbus.c +new file mode 100644 +index 0000000..57d5501 +--- /dev/null ++++ b/drivers/xen/xenctrl/xenbus.c +@@ -0,0 +1,398 @@ ++/* ++ * xenbus.c ++ * ++ * /proc/xen/xenbus gives user-space access to the kernel's xenbus ++ * connection to xenstore. ++ * ++ * Copyright (c) 2005, Christian Limpach ++ * Copyright (c) 2005, Rusty Russell, IBM Corporation ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License version 2 ++ * as published by the Free Software Foundation; or, when distributed ++ * separately from the Linux kernel or incorporated into other ++ * software packages, subject to the following license: ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this source file (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, copy, modify, ++ * merge, publish, distribute, sublicense, and/or sell copies of the Software, ++ * and to permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#include ++ ++struct xenbus_dev_transaction { ++ struct list_head list; ++ struct xenbus_transaction handle; ++}; ++ ++struct read_buffer { ++ struct list_head list; ++ unsigned int cons; ++ unsigned int len; ++ char msg[]; ++}; ++ ++struct xenbus_dev_data { ++ /* In-progress transaction. */ ++ struct list_head transactions; ++ ++ /* Active watches. */ ++ struct list_head watches; ++ ++ /* Partial request. */ ++ unsigned int len; ++ union { ++ struct xsd_sockmsg msg; ++ char buffer[PAGE_SIZE]; ++ } u; ++ ++ /* Response queue. */ ++ struct list_head read_buffers; ++ wait_queue_head_t read_waitq; ++ ++ struct mutex reply_mutex; ++}; ++ ++static ssize_t xenbus_dev_read(struct file *filp, ++ char __user *ubuf, ++ size_t len, loff_t *ppos) ++{ ++ struct xenbus_dev_data *u = filp->private_data; ++ struct read_buffer *rb; ++ int i, ret; ++ ++ mutex_lock(&u->reply_mutex); ++ while (list_empty(&u->read_buffers)) { ++ mutex_unlock(&u->reply_mutex); ++ ret = wait_event_interruptible(u->read_waitq, ++ !list_empty(&u->read_buffers)); ++ if (ret) ++ return ret; ++ mutex_lock(&u->reply_mutex); ++ } ++ ++ rb = list_entry(u->read_buffers.next, struct read_buffer, list); ++ for (i = 0; i < len;) { ++ put_user(rb->msg[rb->cons], ubuf + i); ++ i++; ++ rb->cons++; ++ if (rb->cons == rb->len) { ++ list_del(&rb->list); ++ kfree(rb); ++ if (list_empty(&u->read_buffers)) ++ break; ++ rb = list_entry(u->read_buffers.next, ++ struct read_buffer, list); ++ } ++ } ++ mutex_unlock(&u->reply_mutex); ++ ++ return i; ++} ++ ++static void queue_reply(struct xenbus_dev_data *u, ++ char *data, unsigned int len) ++{ ++ struct read_buffer *rb; ++ ++ if (len == 0) ++ return; ++ ++ rb = kmalloc(sizeof(*rb) + len, GFP_KERNEL); ++ BUG_ON(rb == NULL); ++ ++ rb->cons = 0; ++ rb->len = len; ++ ++ memcpy(rb->msg, data, len); ++ ++ list_add_tail(&rb->list, &u->read_buffers); ++ ++ wake_up(&u->read_waitq); ++} ++ ++struct watch_adapter ++{ ++ struct list_head list; ++ struct xenbus_watch watch; ++ struct xenbus_dev_data *dev_data; ++ char *token; ++}; ++ ++static void free_watch_adapter(struct watch_adapter *watch) ++{ ++ kfree(watch->watch.node); ++ kfree(watch->token); ++ kfree(watch); ++} ++ ++static void watch_fired(struct xenbus_watch *watch, ++ const char **vec, ++ unsigned int len) ++{ ++ struct watch_adapter *adap = ++ container_of(watch, struct watch_adapter, watch); ++ struct xsd_sockmsg hdr; ++ const char *path, *token; ++ int path_len, tok_len, body_len; ++ ++ path = vec[XS_WATCH_PATH]; ++ token = adap->token; ++ ++ path_len = strlen(path) + 1; ++ tok_len = strlen(token) + 1; ++ body_len = path_len + tok_len; ++ ++ hdr.type = XS_WATCH_EVENT; ++ hdr.len = body_len; ++ ++ mutex_lock(&adap->dev_data->reply_mutex); ++ queue_reply(adap->dev_data, (char *)&hdr, sizeof(hdr)); ++ queue_reply(adap->dev_data, (char *)path, path_len); ++ queue_reply(adap->dev_data, (char *)token, tok_len); ++ mutex_unlock(&adap->dev_data->reply_mutex); ++} ++ ++static LIST_HEAD(watch_list); ++ ++static ssize_t xenbus_dev_write(struct file *filp, ++ const char __user *ubuf, ++ size_t len, loff_t *ppos) ++{ ++ struct xenbus_dev_data *u = filp->private_data; ++ struct xenbus_dev_transaction *trans = NULL; ++ uint32_t msg_type; ++ void *reply; ++ char *path, *token; ++ struct watch_adapter *watch, *tmp_watch; ++ int err, rc = len; ++ ++ if ((len + u->len) > sizeof(u->u.buffer)) { ++ rc = -EINVAL; ++ goto out; ++ } ++ ++ if (copy_from_user(u->u.buffer + u->len, ubuf, len) != 0) { ++ rc = -EFAULT; ++ goto out; ++ } ++ ++ u->len += len; ++ if ((u->len < sizeof(u->u.msg)) || ++ (u->len < (sizeof(u->u.msg) + u->u.msg.len))) ++ return rc; ++ ++ msg_type = u->u.msg.type; ++ ++ switch (msg_type) { ++ case XS_TRANSACTION_START: ++ case XS_TRANSACTION_END: ++ case XS_DIRECTORY: ++ case XS_READ: ++ case XS_GET_PERMS: ++ case XS_RELEASE: ++ case XS_GET_DOMAIN_PATH: ++ case XS_WRITE: ++ case XS_MKDIR: ++ case XS_RM: ++ case XS_SET_PERMS: ++ if (msg_type == XS_TRANSACTION_START) { ++ trans = kmalloc(sizeof(*trans), GFP_KERNEL); ++ if (!trans) { ++ rc = -ENOMEM; ++ goto out; ++ } ++ } ++ ++ reply = xenbus_dev_request_and_reply(&u->u.msg); ++ if (IS_ERR(reply)) { ++ kfree(trans); ++ rc = PTR_ERR(reply); ++ goto out; ++ } ++ ++ if (msg_type == XS_TRANSACTION_START) { ++ trans->handle.id = simple_strtoul(reply, NULL, 0); ++ list_add(&trans->list, &u->transactions); ++ } else if (msg_type == XS_TRANSACTION_END) { ++ list_for_each_entry(trans, &u->transactions, list) ++ if (trans->handle.id == u->u.msg.tx_id) ++ break; ++ BUG_ON(&trans->list == &u->transactions); ++ list_del(&trans->list); ++ kfree(trans); ++ } ++ mutex_lock(&u->reply_mutex); ++ queue_reply(u, (char *)&u->u.msg, sizeof(u->u.msg)); ++ queue_reply(u, (char *)reply, u->u.msg.len); ++ mutex_unlock(&u->reply_mutex); ++ kfree(reply); ++ break; ++ ++ case XS_WATCH: ++ case XS_UNWATCH: { ++ static const char *XS_RESP = "OK"; ++ struct xsd_sockmsg hdr; ++ ++ path = u->u.buffer + sizeof(u->u.msg); ++ token = memchr(path, 0, u->u.msg.len); ++ if (token == NULL) { ++ rc = -EILSEQ; ++ goto out; ++ } ++ token++; ++ ++ if (msg_type == XS_WATCH) { ++ watch = kmalloc(sizeof(*watch), GFP_KERNEL); ++ watch->watch.node = kmalloc(strlen(path)+1, ++ GFP_KERNEL); ++ strcpy((char *)watch->watch.node, path); ++ watch->watch.callback = watch_fired; ++ watch->token = kmalloc(strlen(token)+1, GFP_KERNEL); ++ strcpy(watch->token, token); ++ watch->dev_data = u; ++ ++ err = register_xenbus_watch(&watch->watch); ++ if (err) { ++ free_watch_adapter(watch); ++ rc = err; ++ goto out; ++ } ++ ++ list_add(&watch->list, &u->watches); ++ } else { ++ list_for_each_entry_safe(watch, tmp_watch, ++ &u->watches, list) { ++ if (!strcmp(watch->token, token) && ++ !strcmp(watch->watch.node, path)) ++ { ++ unregister_xenbus_watch(&watch->watch); ++ list_del(&watch->list); ++ free_watch_adapter(watch); ++ break; ++ } ++ } ++ } ++ ++ hdr.type = msg_type; ++ hdr.len = strlen(XS_RESP) + 1; ++ mutex_lock(&u->reply_mutex); ++ queue_reply(u, (char *)&hdr, sizeof(hdr)); ++ queue_reply(u, (char *)XS_RESP, hdr.len); ++ mutex_unlock(&u->reply_mutex); ++ break; ++ } ++ ++ default: ++ rc = -EINVAL; ++ break; ++ } ++ ++ out: ++ u->len = 0; ++ return rc; ++} ++ ++static int xenbus_dev_open(struct inode *inode, struct file *filp) ++{ ++ struct xenbus_dev_data *u; ++ ++ if (xen_store_evtchn == 0) ++ return -ENOENT; ++ ++ nonseekable_open(inode, filp); ++ ++ u = kzalloc(sizeof(*u), GFP_KERNEL); ++ if (u == NULL) ++ return -ENOMEM; ++ ++ INIT_LIST_HEAD(&u->transactions); ++ INIT_LIST_HEAD(&u->watches); ++ INIT_LIST_HEAD(&u->read_buffers); ++ init_waitqueue_head(&u->read_waitq); ++ ++ mutex_init(&u->reply_mutex); ++ ++ filp->private_data = u; ++ ++ return 0; ++} ++ ++static int xenbus_dev_release(struct inode *inode, struct file *filp) ++{ ++ struct xenbus_dev_data *u = filp->private_data; ++ struct xenbus_dev_transaction *trans, *tmp; ++ struct watch_adapter *watch, *tmp_watch; ++ ++ list_for_each_entry_safe(trans, tmp, &u->transactions, list) { ++ xenbus_transaction_end(trans->handle, 1); ++ list_del(&trans->list); ++ kfree(trans); ++ } ++ ++ list_for_each_entry_safe(watch, tmp_watch, &u->watches, list) { ++ unregister_xenbus_watch(&watch->watch); ++ list_del(&watch->list); ++ free_watch_adapter(watch); ++ } ++ ++ kfree(u); ++ ++ return 0; ++} ++ ++static unsigned int xenbus_dev_poll(struct file *file, poll_table *wait) ++{ ++ struct xenbus_dev_data *u = file->private_data; ++ ++ poll_wait(file, &u->read_waitq, wait); ++ if (!list_empty(&u->read_buffers)) ++ return POLLIN | POLLRDNORM; ++ return 0; ++} ++ ++static const struct file_operations xenbus_dev_file_ops = { ++ .read = xenbus_dev_read, ++ .write = xenbus_dev_write, ++ .open = xenbus_dev_open, ++ .release = xenbus_dev_release, ++ .poll = xenbus_dev_poll, ++}; ++ ++int __init xenbus_create_proc_entry(void) ++{ ++ struct proc_dir_entry *entry; ++ ++ entry = create_proc_entry("xen/xenbus", 0400, NULL); ++ if (!entry) ++ return -ENOMEM; ++ ++ entry->owner = THIS_MODULE; ++ entry->proc_fops = &xenbus_dev_file_ops; ++ ++ return 0; ++} ++ ++void __exit xenbus_remove_proc_entry(void) ++{ ++ remove_proc_entry("xen/xenbus", NULL); ++} +diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h +index a35209a..e585c4b 100644 +--- a/drivers/xen/xenctrl/xenctrl.h ++++ b/drivers/xen/xenctrl/xenctrl.h +@@ -43,3 +43,9 @@ void capabilities_remove_proc_entry(void) __exit; + */ + int privcmd_create_proc_entry(void) __init; + void privcmd_remove_proc_entry(void) __exit; ++ ++/* ++ * xenbus.c ++ */ ++int xenbus_create_proc_entry(void) __init; ++void xenbus_remove_proc_entry(void) __exit; +diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h +index 6f7c290..10eae11 100644 +--- a/include/xen/xenbus.h ++++ b/include/xen/xenbus.h +@@ -231,4 +231,6 @@ const char *xenbus_strstate(enum xenbus_state state); + int xenbus_dev_is_online(struct xenbus_device *dev); + int xenbus_frontend_closed(struct xenbus_device *dev); + ++extern int xen_store_evtchn; ++ + #endif /* _XEN_XENBUS_H */ +-- +1.5.4.1 + linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch: Index: linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch =================================================================== RCS file: linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch diff -N linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,479 @@ +From 54754bff4a3564e48821056f1134b1450cd0280e Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Thu, 7 Feb 2008 15:32:28 +0000 +Subject: [PATCH] xen: Add Xen's /sys/hypervisor interface + +Hook up Xen's /sys/hypervisor interface: + + /sys/hypervisor/ + -> type + -> uuid + -> compilation + -> compile_date + -> compiled_by + -> compiler + -> properties + -> capabilities + -> changeset + -> pagesize + -> virtual_start + -> writable_pt + -> version + -> extra + -> major + -> minor + +Note: the hypervisor subsys hook requires that +SYS_HYPERVISOR is selected to enabled it, which in +turns means that the subsys will be registered by +a pv-ops kernel with Xen support, even on bare +metal. This hook needs to be changed to be runtime +enabled. + +Signed-off-by: Mark McLoughlin +--- + arch/x86/xen/Kconfig | 3 +- + drivers/xen/xenctrl/Makefile | 1 + + drivers/xen/xenctrl/main.c | 6 + + drivers/xen/xenctrl/sysfs.c | 349 +++++++++++++++++++++++++++++++++++++++ + drivers/xen/xenctrl/xenctrl.h | 6 + + include/xen/interface/version.h | 6 + + 6 files changed, 370 insertions(+), 1 deletions(-) + create mode 100644 drivers/xen/xenctrl/sysfs.c + +diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig +index 4723bc1..ff6a56a 100644 +--- a/arch/x86/xen/Kconfig ++++ b/arch/x86/xen/Kconfig +@@ -14,7 +14,8 @@ config XEN + + config XENCTRL + tristate "Xen's user space control interfaces" +- depends on XEN && PROC_FS ++ depends on XEN && PROC_FS && SYSFS + default y if XEN ++ select SYS_HYPERVISOR + help + This is the /proc/xen interface used by Xen's libxc. +diff --git a/drivers/xen/xenctrl/Makefile b/drivers/xen/xenctrl/Makefile +index 23dafa3..e126e76 100644 +--- a/drivers/xen/xenctrl/Makefile ++++ b/drivers/xen/xenctrl/Makefile +@@ -5,3 +5,4 @@ xenctrl-objs += main.o + xenctrl-objs += capabilities.o + xenctrl-objs += privcmd.o + xenctrl-objs += xenbus.o ++xenctrl-objs += sysfs.o +diff --git a/drivers/xen/xenctrl/main.c b/drivers/xen/xenctrl/main.c +index b0cf61b..87d0dba 100644 +--- a/drivers/xen/xenctrl/main.c ++++ b/drivers/xen/xenctrl/main.c +@@ -63,8 +63,13 @@ static int __init xenctrl_init(void) + if (ret) + goto fail3; + ++ ret = sys_hypervisor_init(); ++ if (ret) ++ goto fail4; ++ + return 0; + ++ fail4: xenbus_remove_proc_entry(); + fail3: privcmd_remove_proc_entry(); + fail2: capabilities_remove_proc_entry(); + fail1: remove_proc_entry("xen", NULL); +@@ -73,6 +78,7 @@ static int __init xenctrl_init(void) + + static void __exit xenctrl_exit(void) + { ++ sys_hypervisor_exit(); + xenbus_remove_proc_entry(); + privcmd_remove_proc_entry(); + capabilities_remove_proc_entry(); +diff --git a/drivers/xen/xenctrl/sysfs.c b/drivers/xen/xenctrl/sysfs.c +new file mode 100644 +index 0000000..8cbf4d6 +--- /dev/null ++++ b/drivers/xen/xenctrl/sysfs.c +@@ -0,0 +1,349 @@ ++/* ++ * copyright (c) 2006 IBM Corporation ++ * Authored by: Mike D. Day ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include "xenctrl.h" ++ ++#define HYPERVISOR_ATTR_RO(_name) \ ++static struct kobj_attribute _name##_attr = __ATTR_RO(_name) ++ ++#define HYPERVISOR_ATTR_RW(_name) \ ++static struct kobj_attribute _name##_attr = \ ++ __ATTR(_name, 0644, _name##_show, _name##_store) ++ ++static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ return sprintf(buffer, "xen\n"); ++} ++ ++HYPERVISOR_ATTR_RO(type); ++ ++static int __init xen_sysfs_type_init(void) ++{ ++ return sysfs_create_file(hypervisor_kobj, &type_attr.attr); ++} ++ ++static void xen_sysfs_type_destroy(void) ++{ ++ sysfs_remove_file(hypervisor_kobj, &type_attr.attr); ++} ++ ++static ssize_t major_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ int version; ++ ++ version = HYPERVISOR_xen_version(XENVER_version, NULL); ++ if (!version) ++ return -ENODEV; ++ ++ return sprintf(buffer, "%d\n", version >> 16); ++} ++ ++HYPERVISOR_ATTR_RO(major); ++ ++static ssize_t minor_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ int version; ++ ++ version = HYPERVISOR_xen_version(XENVER_version, NULL); ++ if (!version) ++ return -ENODEV; ++ ++ return sprintf(buffer, "%d\n", version & 0xff); ++} ++ ++HYPERVISOR_ATTR_RO(minor); ++ ++static ssize_t extra_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ int ret; ++ struct xen_extraversion extra; ++ ++ ret = HYPERVISOR_xen_version(XENVER_extraversion, &extra); ++ if (ret) ++ return ret; ++ ++ return sprintf(buffer, "%s\n", extra.extraversion); ++} ++ ++HYPERVISOR_ATTR_RO(extra); ++ ++static struct attribute *version_attrs[] = { ++ &major_attr.attr, ++ &minor_attr.attr, ++ &extra_attr.attr, ++ NULL ++}; ++ ++static struct attribute_group version_group = { ++ .name = "version", ++ .attrs = version_attrs, ++}; ++ ++static int __init xen_sysfs_version_init(void) ++{ ++ return sysfs_create_group(hypervisor_kobj, &version_group); ++} ++ ++static void xen_sysfs_version_destroy(void) ++{ ++ sysfs_remove_group(hypervisor_kobj, &version_group); ++} ++ ++static ssize_t uuid_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ char *vm, *val; ++ int ret; ++ ++ vm = xenbus_read(XBT_NIL, "vm", "", NULL); ++ if (IS_ERR(vm)) ++ return PTR_ERR(vm); ++ ++ val = xenbus_read(XBT_NIL, vm, "uuid", NULL); ++ if (IS_ERR(val)) { ++ ret = PTR_ERR(val); ++ goto out; ++ } ++ ++ ret = sprintf(buffer, "%s\n", val); ++ ++ kfree(val); ++out: kfree(vm); ++ ++ return ret; ++} ++ ++HYPERVISOR_ATTR_RO(uuid); ++ ++static int __init xen_sysfs_uuid_init(void) ++{ ++ return sysfs_create_file(hypervisor_kobj, &uuid_attr.attr); ++} ++ ++static void xen_sysfs_uuid_destroy(void) ++{ ++ sysfs_remove_file(hypervisor_kobj, &uuid_attr.attr); ++} ++ ++static ssize_t compiler_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ struct xen_compile_info info; ++ int ret; ++ ++ ret = HYPERVISOR_xen_version(XENVER_compile_info, &info); ++ if (ret) ++ return ret; ++ ++ return sprintf(buffer, "%s\n", info.compiler); ++} ++ ++HYPERVISOR_ATTR_RO(compiler); ++ ++static ssize_t compiled_by_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ struct xen_compile_info info; ++ int ret; ++ ++ ret = HYPERVISOR_xen_version(XENVER_compile_info, &info); ++ if (ret) ++ return ret; ++ ++ return sprintf(buffer, "%s\n", info.compile_by); ++} ++ ++HYPERVISOR_ATTR_RO(compiled_by); ++ ++static ssize_t compile_date_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ struct xen_compile_info info; ++ int ret; ++ ++ ret = HYPERVISOR_xen_version(XENVER_compile_info, &info); ++ if (ret) ++ return ret; ++ ++ return sprintf(buffer, "%s\n", info.compile_date); ++} ++ ++HYPERVISOR_ATTR_RO(compile_date); ++ ++static struct attribute *xen_compile_attrs[] = { ++ &compiler_attr.attr, ++ &compiled_by_attr.attr, ++ &compile_date_attr.attr, ++ NULL ++}; ++ ++static struct attribute_group xen_compilation_group = { ++ .name = "compilation", ++ .attrs = xen_compile_attrs, ++}; ++ ++static int __init xen_compilation_init(void) ++{ ++ return sysfs_create_group(hypervisor_kobj, ++ &xen_compilation_group); ++} ++ ++static void xen_compilation_destroy(void) ++{ ++ sysfs_remove_group(hypervisor_kobj, ++ &xen_compilation_group); ++} ++ ++static ssize_t capabilities_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ struct xen_capabilities_info *caps; ++ int ret; ++ ++ caps = kmalloc(sizeof(struct xen_capabilities_info), GFP_KERNEL); ++ if (!caps) ++ return -ENOMEM; ++ ++ ret = HYPERVISOR_xen_version(XENVER_capabilities, caps); ++ if (ret) ++ goto out; ++ ++ ret = sprintf(buffer, "%s\n", caps->info); ++ ++out: kfree(caps); ++ ++ return ret; ++} ++ ++HYPERVISOR_ATTR_RO(capabilities); ++ ++static ssize_t changeset_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ struct xen_changeset_info cset; ++ int ret; ++ ++ ret = HYPERVISOR_xen_version(XENVER_changeset, &cset); ++ if (ret) ++ return ret; ++ ++ return sprintf(buffer, "%s\n", cset.info); ++} ++ ++HYPERVISOR_ATTR_RO(changeset); ++ ++static ssize_t virtual_start_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ struct xen_platform_parameters parms; ++ int ret; ++ ++ ret = HYPERVISOR_xen_version(XENVER_platform_parameters, &parms); ++ if (ret) ++ return ret; ++ ++ return sprintf(buffer, "%lx\n", parms.virt_start); ++} ++ ++HYPERVISOR_ATTR_RO(virtual_start); ++ ++static ssize_t pagesize_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ int ret; ++ ++ ret = HYPERVISOR_xen_version(XENVER_pagesize, NULL); ++ if (ret < 0) ++ return ret; ++ ++ return sprintf(buffer, "%x\n", ret); ++} ++ ++HYPERVISOR_ATTR_RO(pagesize); ++ ++static ssize_t writable_pt_show(struct kobject *kobj, struct kobj_attribute *attr, char *buffer) ++{ ++ struct xen_feature_info info; ++ int ret; ++ ++ info.submap_idx = XENFEAT_writable_page_tables; ++ ++ ret = HYPERVISOR_xen_version(XENVER_get_features, &info); ++ if (ret) ++ return ret; ++ ++ return sprintf(buffer, "%d\n", info.submap); ++} ++ ++HYPERVISOR_ATTR_RO(writable_pt); ++ ++static struct attribute *xen_properties_attrs[] = { ++ &capabilities_attr.attr, ++ &changeset_attr.attr, ++ &virtual_start_attr.attr, ++ &pagesize_attr.attr, ++ &writable_pt_attr.attr, ++ NULL ++}; ++ ++static struct attribute_group xen_properties_group = { ++ .name = "properties", ++ .attrs = xen_properties_attrs, ++}; ++ ++static int __init xen_properties_init(void) ++{ ++ return sysfs_create_group(hypervisor_kobj, ++ &xen_properties_group); ++} ++ ++static void xen_properties_destroy(void) ++{ ++ sysfs_remove_group(hypervisor_kobj, &xen_properties_group); ++} ++ ++int __init sys_hypervisor_init(void) ++{ ++ int ret; ++ ++ if (!is_running_on_xen()) ++ return -ENODEV; ++ ++ ret = xen_sysfs_type_init(); ++ if (ret) ++ goto out; ++ ret = xen_sysfs_version_init(); ++ if (ret) ++ goto version_out; ++ ret = xen_compilation_init(); ++ if (ret) ++ goto comp_out; ++ ret = xen_sysfs_uuid_init(); ++ if (ret) ++ goto uuid_out; ++ ret = xen_properties_init(); ++ if (!ret) ++ goto out; ++ ++ xen_sysfs_uuid_destroy(); ++uuid_out: ++ xen_compilation_destroy(); ++comp_out: ++ xen_sysfs_version_destroy(); ++version_out: ++ xen_sysfs_type_destroy(); ++out: ++ return ret; ++} ++ ++void __exit sys_hypervisor_exit(void) ++{ ++ xen_properties_destroy(); ++ xen_compilation_destroy(); ++ xen_sysfs_uuid_destroy(); ++ xen_sysfs_version_destroy(); ++ xen_sysfs_type_destroy(); ++} +diff --git a/drivers/xen/xenctrl/xenctrl.h b/drivers/xen/xenctrl/xenctrl.h +index e585c4b..1afbdfb 100644 +--- a/drivers/xen/xenctrl/xenctrl.h ++++ b/drivers/xen/xenctrl/xenctrl.h +@@ -49,3 +49,9 @@ void privcmd_remove_proc_entry(void) __exit; + */ + int xenbus_create_proc_entry(void) __init; + void xenbus_remove_proc_entry(void) __exit; ++ ++/* ++ * sysfs.c ++ */ ++int sys_hypervisor_init(void) __init; ++void sys_hypervisor_exit(void) __exit; +diff --git a/include/xen/interface/version.h b/include/xen/interface/version.h +index 453235e..dd58cf5 100644 +--- a/include/xen/interface/version.h ++++ b/include/xen/interface/version.h +@@ -57,4 +57,10 @@ struct xen_feature_info { + /* Declares the features reported by XENVER_get_features. */ + #include "features.h" + ++/* arg == NULL; returns host memory page size. */ ++#define XENVER_pagesize 7 ++ ++/* arg == xen_domain_handle_t. */ ++#define XENVER_guest_handle 8 ++ + #endif /* __XEN_PUBLIC_VERSION_H__ */ +-- +1.5.4.1 + linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch: Index: linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch =================================================================== RCS file: linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch diff -N linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,79 @@ +From dc0daca424b10e5758a875d9dfe55dbf4fc7966e Mon Sep 17 00:00:00 2001 +From: Stephen Tweedie +Date: Wed, 21 Nov 2007 18:40:31 +0000 +Subject: [PATCH] xen debug: Add xprintk to log directly via hypercall + +For early debugging, it is useful to have a way of doing debugging output +direct to the hypervisor without having to rely on console being fully +initialised. + +Signed-off-by: Stephen Tweedie +--- + arch/x86/xen/enlighten.c | 32 ++++++++++++++++++++++++++++++++ + include/xen/hvc-console.h | 1 + + 2 files changed, 33 insertions(+), 0 deletions(-) + +diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c +index a94605e..e1702e1 100644 +--- a/arch/x86/xen/enlighten.c ++++ b/arch/x86/xen/enlighten.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -142,6 +143,37 @@ static void __init xen_banner(void) + printk(KERN_INFO "Hypervisor signature: %s\n", xen_start_info->magic); + } + ++static void kcons_write_dom0(const char *s, unsigned int count) ++{ ++ int rc; ++ ++ while ((count > 0) && ++ ((rc = HYPERVISOR_console_io( ++ CONSOLEIO_write, count, (char *)s)) > 0)) { ++ count -= rc; ++ s += rc; ++ } ++} ++ ++ ++/*** Useful function for console debugging -- goes straight to Xen. ***/ ++asmlinkage int xprintk(const char *fmt, ...) ++{ ++ va_list args; ++ int printk_len; ++ static char printk_buf[1024]; ++ ++ /* Emit the output into the temporary buffer */ ++ va_start(args, fmt); ++ printk_len = vsnprintf(printk_buf, sizeof(printk_buf), fmt, args); ++ va_end(args); ++ ++ /* Send the processed output directly to Xen. */ ++ kcons_write_dom0(printk_buf, printk_len); ++ ++ return 0; ++} ++ + static void xen_cpuid(unsigned int *ax, unsigned int *bx, + unsigned int *cx, unsigned int *dx) + { +diff --git a/include/xen/hvc-console.h b/include/xen/hvc-console.h +index 21c0ecf..cb7a3c9 100644 +--- a/include/xen/hvc-console.h ++++ b/include/xen/hvc-console.h +@@ -2,5 +2,6 @@ + #define XEN_HVC_CONSOLE_H + + extern struct console xenboot_console; ++extern asmlinkage int xprintk(const char *fmt, ...); + + #endif /* XEN_HVC_CONSOLE_H */ +-- +1.5.4.1 + linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch Index: linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch =================================================================== RCS file: linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch diff -N linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,5938 @@ +From c255dab2cece092ec17e85fc0186ae6ac667afd5 Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Tue, 4 Mar 2008 17:59:50 +0000 +Subject: [PATCH] xen x86_64: Initial x86_64 support for Xen paravirt_ops + +Signed-off-by: Eduardo Habkost +Signed-off-by: Mark McLoughlin +--- + arch/x86/Kconfig | 3 +- + arch/x86/kernel/acpi/boot.c | 4 +- + arch/x86/kernel/apic_32.c | 4 +- + arch/x86/kernel/apic_64.c | 2 +- + arch/x86/kernel/asm-offsets_64.c | 15 + + arch/x86/kernel/early_printk.c | 5 +- + arch/x86/kernel/efi_64.c | 4 +- + arch/x86/kernel/entry_32.S | 83 +----- + arch/x86/kernel/entry_64.S | 72 ++++- + arch/x86/kernel/genapic_64.c | 12 + + arch/x86/kernel/head64.c | 4 + + arch/x86/kernel/head_64.S | 23 ++ + arch/x86/kernel/hpet.c | 4 +- + arch/x86/kernel/io_apic_64.c | 2 +- + arch/x86/kernel/irq_64.c | 5 + + arch/x86/kernel/mpparse_32.c | 4 +- + arch/x86/kernel/mpparse_64.c | 4 +- + arch/x86/kernel/paravirt.c | 3 + + arch/x86/kernel/process_64.c | 9 + + arch/x86/kernel/setup64.c | 5 + + arch/x86/kernel/setup_64.c | 41 +++- + arch/x86/kernel/smpboot_64.c | 4 +- + arch/x86/kernel/vsyscall_64.c | 31 ++- + arch/x86/mach-visws/traps.c | 10 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 558 ++++++++++++++++++++++++++++++++-- + arch/x86/mm/ioremap.c | 4 +- + arch/x86/mm/pgtable_32.c | 25 ++- + arch/x86/pci/mmconfig_32.c | 2 +- + arch/x86/vdso/vdso32-setup.c | 6 +- + arch/x86/xen/Kconfig | 1 - + arch/x86/xen/Makefile | 6 + + arch/x86/xen/enlighten.c | 268 +++++++++++----- + arch/x86/xen/entry.S | 5 + + arch/x86/xen/entry_32.S | 81 +++++ + arch/x86/xen/entry_64.S | 68 ++++ + arch/x86/xen/events.c | 13 +- + arch/x86/xen/genapic.c | 190 ++++++++++++ + arch/x86/xen/init.h | 20 ++ + arch/x86/xen/init_32.c | 3 + + arch/x86/xen/init_64.c | 181 +++++++++++ + arch/x86/xen/mmu.c | 407 ++++++++++++++++++------- + arch/x86/xen/mmu.h | 46 ++-- + arch/x86/xen/multicalls.c | 9 +- + arch/x86/xen/setup.c | 22 ++ + arch/x86/xen/smp.c | 16 + + arch/x86/xen/xen-asm.S | 219 +++----------- + arch/x86/xen/xen-asm_32.S | 184 +++++++++++ + arch/x86/xen/xen-asm_64.S | 75 +++++ + arch/x86/xen/xen-head.S | 21 +- + arch/x86/xen/xen-ops.h | 11 + + drivers/acpi/thermal.c | 5 + + drivers/char/hvc_xen.c | 6 + + drivers/ieee1394/init_ohci1394_dma.c | 2 +- + drivers/serial/8250_early.c | 2 +- + include/asm-x86/asm-hack.h | 27 ++ + include/asm-x86/cmpxchg_64.h | 36 +++ + include/asm-x86/desc_defs.h | 4 + + include/asm-x86/fixmap_32.h | 22 +- + include/asm-x86/fixmap_64.h | 31 ++- + include/asm-x86/mmu_context_64.h | 6 +- + include/asm-x86/page_64.h | 2 +- + include/asm-x86/paravirt.h | 46 ++- + include/asm-x86/percpu.h | 32 ++ + include/asm-x86/pgalloc_64.h | 69 ++++- + include/asm-x86/pgtable.h | 15 +- + include/asm-x86/pgtable_64.h | 3 +- + include/asm-x86/proto.h | 1 + + include/asm-x86/smp_64.h | 3 + + include/asm-x86/system.h | 3 +- + include/asm-x86/xen/hypercall.h | 205 ++++++++++--- + include/asm-x86/xen/hypervisor.h | 3 - + include/asm-x86/xen/interface.h | 35 ++- + include/linux/dmi.h | 1 + + include/linux/elfnote.h | 2 +- + include/xen/events.h | 2 + + include/xen/interface/elfnote.h | 16 + + include/xen/page.h | 34 ++- + init/main.c | 10 + + mm/slab.c | 8 +- + 80 files changed, 2759 insertions(+), 668 deletions(-) + create mode 100644 arch/x86/xen/entry.S + create mode 100644 arch/x86/xen/entry_32.S + create mode 100644 arch/x86/xen/entry_64.S + create mode 100644 arch/x86/xen/genapic.c + create mode 100644 arch/x86/xen/init.h + create mode 100644 arch/x86/xen/init_32.c + create mode 100644 arch/x86/xen/init_64.c + create mode 100644 arch/x86/xen/xen-asm_32.S + create mode 100644 arch/x86/xen/xen-asm_64.S + create mode 100644 include/asm-x86/asm-hack.h + +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index f41c953..6f466aa 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -92,7 +92,7 @@ config ARCH_MAY_HAVE_PC_FDC + def_bool y + + config DMI +- def_bool y ++ def_bool !XEN + + config RWSEM_GENERIC_SPINLOCK + def_bool !X86_XADD +@@ -330,6 +330,7 @@ config X86_RDC321X + + config X86_VSMP + bool "Support for ScaleMP vSMP" ++ depends on !XEN + depends on X86_64 && PCI + help + Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is +diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c +index 2cdc9de..cfc79ac 100644 +--- a/arch/x86/kernel/acpi/boot.c ++++ b/arch/x86/kernel/acpi/boot.c +@@ -141,7 +141,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) + + offset = phys & (PAGE_SIZE - 1); + mapped_size = PAGE_SIZE - offset; +- set_fixmap(FIX_ACPI_END, phys); ++ set_fixmap_ma(FIX_ACPI_END, phys); + base = fix_to_virt(FIX_ACPI_END); + + /* +@@ -152,7 +152,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) + if (--idx < FIX_ACPI_BEGIN) + return NULL; /* cannot handle this */ + phys += PAGE_SIZE; +- set_fixmap(idx, phys); ++ set_fixmap_ma(idx, phys); + mapped_size += PAGE_SIZE; + } + +diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c +index 35a568e..40fc1b3 100644 +--- a/arch/x86/kernel/apic_32.c ++++ b/arch/x86/kernel/apic_32.c +@@ -1138,7 +1138,7 @@ void __init init_apic_mappings(void) + } else + apic_phys = mp_lapic_addr; + +- set_fixmap_nocache(FIX_APIC_BASE, apic_phys); ++ set_fixmap_ma_nocache(FIX_APIC_BASE, apic_phys); + printk(KERN_DEBUG "mapped APIC to %08lx (%08lx)\n", APIC_BASE, + apic_phys); + +@@ -1172,7 +1172,7 @@ fake_ioapic_page: + alloc_bootmem_pages(PAGE_SIZE); + ioapic_phys = __pa(ioapic_phys); + } +- set_fixmap_nocache(idx, ioapic_phys); ++ set_fixmap_ma_nocache(idx, ioapic_phys); + printk(KERN_DEBUG "mapped IOAPIC to %08lx (%08lx)\n", + __fix_to_virt(idx), ioapic_phys); + idx++; +diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c +index d8d03e0..a611520 100644 +--- a/arch/x86/kernel/apic_64.c ++++ b/arch/x86/kernel/apic_64.c +@@ -877,7 +877,7 @@ void __init init_apic_mappings(void) + } else + apic_phys = mp_lapic_addr; + +- set_fixmap_nocache(FIX_APIC_BASE, apic_phys); ++ set_fixmap_ma_nocache(FIX_APIC_BASE, apic_phys); + apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", + APIC_BASE, apic_phys); + +diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c +index 494e1e0..d0fabfd 100644 +--- a/arch/x86/kernel/asm-offsets_64.c ++++ b/arch/x86/kernel/asm-offsets_64.c +@@ -25,6 +25,8 @@ + #define OFFSET(sym, str, mem) \ + DEFINE(sym, offsetof(struct str, mem)) + ++#include ++ + #define __NO_STUBS 1 + #undef __SYSCALL + #undef _ASM_X86_64_UNISTD_H_ +@@ -92,6 +94,13 @@ int main(void) + offsetof (struct rt_sigframe32, uc.uc_mcontext)); [...5545 lines suppressed...] +-#define ELFNOTE(name, type, desc) \ ++#define ELFNOTE(name, type, desc...) \ + ELFNOTE_START(name, type, "") \ + desc ; \ + ELFNOTE_END +diff --git a/include/xen/events.h b/include/xen/events.h +index 2bde54d..c18d2bf 100644 +--- a/include/xen/events.h ++++ b/include/xen/events.h +@@ -3,6 +3,8 @@ + + #include + ++#include ++#include + #include + #include + +diff --git a/include/xen/interface/elfnote.h b/include/xen/interface/elfnote.h +index a64d3df..ee5501d 100644 +--- a/include/xen/interface/elfnote.h ++++ b/include/xen/interface/elfnote.h +@@ -120,6 +120,22 @@ + */ + #define XEN_ELFNOTE_BSD_SYMTAB 11 + ++/* ++ * The lowest address the hypervisor hole can begin at (numeric). ++ * ++ * This must not be set higher than HYPERVISOR_VIRT_START. Its presence ++ * also indicates to the hypervisor that the kernel can deal with the ++ * hole starting at a higher address. ++ */ ++#define XEN_ELFNOTE_HV_START_LOW 12 ++ ++/* ++ * List of maddr_t-sized mask/value pairs describing how to recognize ++ * (non-present) L1 page table entries carrying valid MFNs (numeric). ++ */ ++#define XEN_ELFNOTE_L1_MFN_VALID 13 ++ ++ + #endif /* __XEN_PUBLIC_ELFNOTE_H__ */ + + /* +diff --git a/include/xen/page.h b/include/xen/page.h +index 031ef22..158fb60 100644 +--- a/include/xen/page.h ++++ b/include/xen/page.h +@@ -8,6 +8,10 @@ + + #include + ++#include ++ ++#include ++ + #ifdef CONFIG_X86_PAE + /* Xen machine address */ + typedef struct xmaddr { +@@ -70,6 +74,8 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) + #endif + + pfn = 0; ++ //xprintk("mfn_to_pfn(%lx):\n", mfn); ++ + /* + * The array access can fail (e.g., device space beyond end of RAM). + * In such cases it doesn't matter what we return (we return garbage), +@@ -77,6 +83,7 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) + */ + __get_user(pfn, &machine_to_phys_mapping[mfn]); + ++ //xprintk("mfn_to_pfn(%lx) = %lx\n", mfn, pfn); + return pfn; + } + +@@ -143,34 +150,29 @@ static inline void set_phys_to_machine(unsigned long pfn, unsigned long mfn) + + static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot) + { +- pte_t pte; +- +- pte.pte_high = (page_nr >> (32 - PAGE_SHIFT)) | +- (pgprot_val(pgprot) >> 32); +- pte.pte_high &= (__supported_pte_mask >> 32); +- pte.pte_low = ((page_nr << PAGE_SHIFT) | pgprot_val(pgprot)); +- pte.pte_low &= __supported_pte_mask; +- +- return pte; ++ pteval_t val; ++ ++ val = (page_nr << PAGE_SHIFT) | pgprot_val(pgprot); ++ val &= __supported_pte_mask; ++ return native_make_pte(val); + } + +-static inline unsigned long long pte_val_ma(pte_t x) ++static inline pteval_t pte_val_ma(pte_t x) + { +- return x.pte; ++ return native_pte_val(x); + } +-#define pmd_val_ma(v) ((v).pmd) +-#define pud_val_ma(v) ((v).pgd.pgd) +-#define __pte_ma(x) ((pte_t) { .pte = (x) }) ++#define __pte_ma(x) (native_make_pte(x)) + #define __pmd_ma(x) ((pmd_t) { (x) } ) + #else /* !X86_PAE */ +-#define pte_mfn(_pte) ((_pte).pte_low >> PAGE_SHIFT) ++#define pte_mfn(_pte) ((native_pte_val(_pte) & __PHYSICAL_MASK) >> PAGE_SHIFT) + #define mfn_pte(pfn, prot) __pte_ma(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) + #define pte_val_ma(x) ((x).pte) +-#define pmd_val_ma(v) ((v).pud.pgd.pgd) + #define __pte_ma(x) ((pte_t) { (x) } ) + #endif /* CONFIG_X86_PAE */ + + #define pgd_val_ma(x) ((x).pgd) ++#define pmd_val_ma(x) (native_pmd_val((x))) ++#define pud_val_ma(x) (native_pud_val((x))) + + + xmaddr_t arbitrary_virt_to_machine(unsigned long address); +diff --git a/init/main.c b/init/main.c +index 80f5aaf..4a84f60 100644 +--- a/init/main.c ++++ b/init/main.c +@@ -590,17 +590,25 @@ asmlinkage void __init start_kernel(void) + rcu_init(); + init_IRQ(); + pidhash_init(); ++ printk("init_timers:\n"); + init_timers(); + hrtimers_init(); + softirq_init(); ++ printk("timekeeping:\n"); + timekeeping_init(); ++ printk("time:\n"); + time_init(); ++ printk("profile:\n"); + profile_init(); ++ printk("irqs_disabled:\n"); + if (!irqs_disabled()) + printk("start_kernel(): bug: interrupts were enabled early\n"); ++ printk("early_boot_irqs_on:\n"); + early_boot_irqs_on(); ++ printk("local_irq_enable:\n"); + local_irq_enable(); + ++ printk("console_init:\n"); + /* + * HACK ALERT! This is early. We're enabling the console before + * we've done PCI setups etc, and console_init() must be aware of +@@ -637,7 +645,9 @@ asmlinkage void __init start_kernel(void) + numa_policy_init(); + if (late_time_init) + late_time_init(); ++ printk("calibrate_delay:\n"); + calibrate_delay(); ++ printk("pidmap_init:\n"); + pidmap_init(); + pgtable_cache_init(); + prio_tree_init(); +diff --git a/mm/slab.c b/mm/slab.c +index e499669..c18daa3 100644 +--- a/mm/slab.c ++++ b/mm/slab.c +@@ -3202,6 +3202,8 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags) + STATS_INC_ALLOCHIT(cachep); + ac->touched = 1; + objp = ac->entry[--ac->avail]; ++ if (!objp) ++ printk("really weird: avail objp for cache %s is null\n", cachep->name); + } else { + STATS_INC_ALLOCMISS(cachep); + objp = cache_alloc_refill(cachep, flags); +@@ -3464,8 +3466,10 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller) + unsigned long save_flags; + void *objp; + +- if (should_failslab(cachep, flags)) ++ if (should_failslab(cachep, flags)) { ++ printk("cache %s should fail\n", cachep->name); + return NULL; ++ } + + cache_alloc_debugcheck_before(cachep, flags); + local_irq_save(save_flags); +@@ -3477,6 +3481,8 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller) + if (unlikely((flags & __GFP_ZERO) && objp)) + memset(objp, 0, obj_size(cachep)); + ++ if (!objp) ++ printk("allocation from cache %s failed!!!\n", cachep->name); + return objp; + } + +-- +1.5.4.1 + linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch: Index: linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch =================================================================== RCS file: linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch diff -N linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,58 @@ +From d00be6cef97823ca14f0c9a3d05a4ecbdda9c6f2 Mon Sep 17 00:00:00 2001 +From: Mark McLoughlin +Date: Thu, 6 Mar 2008 11:10:59 +0000 +Subject: [PATCH] xen x86_64: Add 64 bit version of privcmd_hypercall() + +Signed-off-by: Mark McLoughlin +--- + include/asm-x86/xen/hypercall.h | 28 ++++++++++++++++++++++++++++ + 1 files changed, 28 insertions(+), 0 deletions(-) + +diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h +index a99725b..77108b4 100644 +--- a/include/asm-x86/xen/hypercall.h ++++ b/include/asm-x86/xen/hypercall.h +@@ -545,6 +545,7 @@ MULTI_stack_switch(struct multicall_entry *mcl, + + #include + ++#ifdef CONFIG_X86_32 + static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) + { + int ret; +@@ -570,5 +571,32 @@ static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) + + return ret; + } ++#else /* CONFIG_X86_32 */ ++static inline int privcmd_hypercall(privcmd_hypercall_t *hypercall) ++{ ++ int ret; ++ long ign1, ign2, ign3; ++ ++ if (hypercall->op >= (PAGE_SIZE >> 5)) ++ return -EINVAL; ++ ++ __asm__ __volatile__ ( ++ "movq %8,%%r10; movq %9,%%r8;" ++ "shll $5,%%eax ;" ++ "addq $hypercall_page,%%rax ;" ++ "call *%%rax" ++ : "=a" (ret), "=D" (ign1), ++ "=S" (ign2), "=d" (ign3) ++ : "0" ((unsigned int)hypercall->op), ++ "1" (hypercall->arg[0]), ++ "2" (hypercall->arg[1]), ++ "3" (hypercall->arg[2]), ++ "g" (hypercall->arg[3]), ++ "g" (hypercall->arg[4]) ++ : "r8", "r10", "memory" ); ++ ++ return ret; ++} ++#endif /* CONFIG_X86_32 */ + + #endif /* __HYPERCALL_H__ */ +-- +1.5.4.1 + Index: linux-2.6.24.tar.bz2.sign =================================================================== RCS file: linux-2.6.24.tar.bz2.sign diff -N linux-2.6.24.tar.bz2.sign --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6.24.tar.bz2.sign 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.7 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBHmR5WyGugalF9Dw4RAgviAJsF8E19NUBvcgI4inL02JCSMljEHwCbBfsp +fU6wxlRC0o2yQ596/IyRLNI= +=2egt +-----END PGP SIGNATURE----- Index: mirrors =================================================================== RCS file: mirrors diff -N mirrors --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mirrors 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,5 @@ +http://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/ +http://ftp.kernel.org/pub/linux/kernel/v2.6/ +http://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/old/ +http://ftp.kernel.org/pub/linux/kernel/v2.6/testing/ +http://ftp.kernel.org/pub/linux/kernel/v2.6/stable-review/ Index: patch-2.6.25-rc4.bz2.sign =================================================================== RCS file: patch-2.6.25-rc4.bz2.sign diff -N patch-2.6.25-rc4.bz2.sign --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patch-2.6.25-rc4.bz2.sign 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.7 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBHzihsyGugalF9Dw4RAmvmAJ9ksQ5jf9yUO9KIUeo1adCPfKJrMQCfa3Ob +5SYdhp9yFKCV9a4cvu3nF70= +=9t/0 +-----END PGP SIGNATURE----- Index: upstream =================================================================== RCS file: upstream diff -N upstream --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ upstream 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,2 @@ +linux-2.6.24.tar.bz2 +patch-2.6.25-rc4.bz2 Index: upstream-key.gpg =================================================================== RCS file: upstream-key.gpg diff -N upstream-key.gpg --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ upstream-key.gpg 6 Mar 2008 13:59:26 -0000 1.2 @@ -0,0 +1,54 @@ +pub 1024D/517D0F0E 2000-10-10 Linux Kernel Archives Verification Key + Key fingerprint = C75D C40A 11D7 AF88 9981 ED5B C86B A06A 517D 0F0E +sub 4096g/E50A8F2A 2000-10-10 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.0.3 (GNU/Linux) +Comment: For info see http://www.gnupg.org + +mQGiBDnirDkRBADCTL/iUTeZKb0tiAcKdZdsUP/KSnrGGjlinolUAsUC0D6/hUB1 +RdCpJOOERTIEr1yvehqDM7veRhNMoxJNQxa/sSrkywey5qc8uaskUNEqenimq/70 +bahWJeoWXjad68mQFh65lULnHQrrioeJnh9UpyGJppNb/yIjdnymH9aYEwCglgP7 +UegBzH22h8NVQEK2PWWbyUUD/jQA4lI0wRWcL9HpkYkHcH0LTKRB9zYpQYtyvzJi +yTGwJyFMfYNXy0RT11dICeLkf3HMR84hkPERKMhALobLxVUbfc7j2AygmzGphWGy +DH/xjptQP/zrsq87ylYRONK18w1J42cm+yZa4XThMDPJMrb9/l8qnxU1JnW7W1al +HKTpBACbs+91KLqrnIGcF44TMwxgUj5CUrayPoEnLU+ZMBqfSjmu8RqEYmTxJCKv +7erBFSuazBGj5X7twunrtrW3bxO63MbLbHjfXSRrMnKOb8dRULIg6eWAnoAx8VVZ +YjrOpwAntU3WxYOpbiCHt9kLbb+N5rvNtFcmOqRRQaCIUFOOaLQ8TGludXggS2Vy +bmVsIEFyY2hpdmVzIFZlcmlmaWNhdGlvbiBLZXkgPGZ0cGFkbWluQGtlcm5lbC5v +cmc+iFUEExECABUFAjnirDkDCwoDAxUDAgMWAgECF4AACgkQyGugalF9Dw4MNACe +JiQTyCmQzPGou2cl/RyOXj79kYYAnAsT6xt72hp/PFiywYM9vBsDVv9niQEVAwUQ +OeKwNWx5eAAqlgcFAQEdZgf/Vn2dMKrn8021NhavP0uA3pHGRmdKQ2WJBdLiN2tv +LkpAioZtho+op+xBz8j1zdIJQ/7XWko869KHge2BAFwA8rWDzjtaAWdE0Jo/NiAR +epUwV2FdRRwSxIcNG2CCPyJnfPokRqjdl2z9k2PkwidHSq+2k6JxCWnOcIXChSKf +kHnemtA65ixAlhuxvyN3MPuYs1jAHyDGcyMfomp1qH9tXFQhhyXRrG2eMAfslstC +XGXLcoLN3O2BMR/fG2GlV6kOqGOvoMIW3clVeQLQ9B1yyekKiVY6Vg+CgK5qhg8z +9tjH4f33zzNDwsx1WSCOU/1LIPzFBNbR9QtTF2XmOUfRs4hGBBARAgAGBQI54rBc +AAoJEH2d7s4ry8YhmjsAoMUW9RxfXBSos0A6LwGd+5pXv/MRAKCYFLG2T4GSV+qf +iRsXnrgDHQHD04hGBBARAgAGBQI54rOZAAoJEPKlddweGoeC/+sAoL5f7JF21mRe +Z8VV4nhh7prm+idSAKCMXDWW/tBOeJDYpiEhgyGSGgJJWrkEDQQ54q+cEBAAjRmb +txamcZ9EYsQTnQvVL2l6vY5Rnbc1JDdcyHEV1kH5OwZWqvckL4QgKKBbTQwyB9pC +o0nGK4PkBbrwL0outfHQ5jl9DUzTKIu+asWUyf3fxfUV6j2A6BMo59KNnJzUyJ2+ +B5na6NN8nEqEtmogROtjT8LkOvYwqD4A/5re2vwtie+h5yU6A+JbyGQF6lFxThZj +4WGctBgCcDBqRkPAG8DFFAdeN5SMAArktCYuUGXi2q88EDoOs3Ykw0kB8+ZFECz/ +4/b93so5Wt2hC15cxAJoXFfR3mXHm40EHzMdEublWV4blB2KvFocQC74/H74QPUk +cWlc6EhPodKvcuOfTimDxXaiGNFONUPgNAmCXeVoOapdWpb3x7iOHPwSaXeJSrO9 +fc4GtVjDv90DT2ekK7cvYk8s6B3t7p7W21Xi+hRgrw63B3HElr01gdMZY5XA5ey/ +WmnyBS6LOxXlnVBE+2uSQ+aZHqrLpXcRvq2ZonOziDSE0i940ZvIwlSzn0U5BQWl +9hBDQw78RacYqaFvlpcGiPj75bScB4eemxV6Wdo9mtK0Vrr+9bWScXHEv7did4X+ +7tBWKbA8M+g290OSzjeQBGLuPmbjxzEKH9jcUumzBzzC5x5GFh7On9TLXQ4K/oRT +6QQpS93YrTVbR60G4MKsePWLJmg7IgYUtNdLGjsAAwUP/0aAAq8CmWtourj1XxNY +pFmOAU45d65fPWVadKyF++B+uDyRNYN7HQCqrJ7ddn0sH7OBtlE8yaBYgR0TFly9 +9+LqQO4r4IGCw2TBgA5tKnOWoPGEzvrLeoxR3SnPrKBlDvx6Rr9h3OJ9UV5u/NLh +mCP9iN10gWCGzsWbONc6qD6PugbTur44D6s4CRK9xfliSrtG3GBHW914UKjJeB9s +e3oc1rkmNv39kKcu33w4XVETAj4qpXnwoJvy639dfvnQt1TWFjIt20iP7m+jkT3B +b526uJ5GuJl6r8sm5OYYRs5cLigvUzRZVgYnjjqlRRACx0WcinKK55Li2Pq4qcRV +vSE5Tr3kTUTGxdmy113FbscrhLhesGALv3Hb7jeeWC8jviGEaHppgUumR6v0hsI1 +rZ3K8kCjFRAYV8OKtcEeMqjouArGi5dn0ClmG4lwH4SEdqC/TRNWGG+iVpWf5yCj +9mvtvUhLtl6QjXHLrJdSGyafvqR1EQMJadFt4URvx0M7tqZIcwPUnb+7Oc+J96po +e/EQmnm6rFnTpWz0BbY4mbJC7vUH4JyLs0nlxiKrBjaO9C1DSAKBpjqaga8dQe1Z +kLOI2F7IWFeKV2LaMl+ZvvfWMECNcqNW2fkCuP9Fpz5K+xg21TwovVy93aWKgFL6 +06jK51oQp3fW86xXK9ZGKYqQiEYEGBECAAYFAjnir5wACgkQyGugalF9Dw5M9QCg +hhmHalzWf8B3AVrjPrtrRHA1vlgAn3YRlU5l0V5W1iXvHXQCUHIESpgm +=SZZb +-----END PGP PUBLIC KEY BLOCK----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 18 Jan 2008 19:14:27 -0000 1.11 +++ .cvsignore 6 Mar 2008 13:59:25 -0000 1.12 @@ -1,4 +1,8 @@ -linux-2.6.21.tar.bz2 -patch-2.6.21.7.bz2 -linux-2.6.21.7-xen-3.1.0.patch.bz2 +clog +GNUmakefile +kernel-2.6.*.config +temp-* +kernel-2.6.24 +linux-2.6.24.tar.bz2 +patch-2.6.25-rc4.bz2 xen-3.2.0.tar.gz Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 15 Oct 2007 18:56:30 -0000 1.2 +++ Makefile 6 Mar 2008 13:59:25 -0000 1.3 @@ -1,7 +1,18 @@ -# Makefile for source rpm: kernel-xen-2.6 +# Makefile for source rpm: kernel # $Id$ -NAME := kernel-xen-2.6 -SPECFILE = $(firstword $(wildcard *.spec)) +NAME := kernel-xen-2.6 +SPECFILE := kernel.spec + +# use noarch for make prep instead of the current CPU +# noarch creates and checks all config files not just the current one, +# in addition "i386" isn't a valid kernel target +PREPARCH = noarch + +# we only check the .sign signatures +UPSTREAM_CHECKS = sign + +# local targets we need to carry around in addition to the default sources +TARGETS = download define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done @@ -10,7 +21,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout +# attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef @@ -19,3 +30,187 @@ endif include $(MAKEFILE_COMMON) +include Makefile.config + +debug: + @perl -pi -e 's/# CONFIG_SLUB_DEBUG_ON is not set/CONFIG_SLUB_DEBUG_ON=y/' config-nodebug + @perl -pi -e 's/# CONFIG_LOCK_STAT is not set/CONFIG_LOCK_STAT=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_STACK_USAGE is not set/CONFIG_DEBUG_STACK_USAGE=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_IGNORE_QUIET is not set/CONFIG_DEBUG_IGNORE_QUIET=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_MUTEXES is not set/CONFIG_DEBUG_MUTEXES=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_RT_MUTEXES is not set/CONFIG_DEBUG_RT_MUTEXES=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_RWSEMS is not set/CONFIG_DEBUG_RWSEMS=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_LOCK_ALLOC is not set/CONFIG_DEBUG_LOCK_ALLOC=y/' config-nodebug + @perl -pi -e 's/# CONFIG_PROVE_LOCKING is not set/CONFIG_PROVE_LOCKING=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_SPINLOCK is not set/CONFIG_DEBUG_SPINLOCK=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_VM is not set/CONFIG_DEBUG_VM=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_SLEEP_IN_IRQ is not set/CONFIG_DEBUG_SLEEP_IN_IRQ=y/' config-nodebug + @perl -pi -e 's/# CONFIG_FAULT_INJECTION is not set/CONFIG_FAULT_INJECTION=y/' config-nodebug + @perl -pi -e 's/# CONFIG_FAILSLAB is not set/CONFIG_FAILSLAB=y/' config-nodebug + @perl -pi -e 's/# CONFIG_FAIL_PAGE_ALLOC is not set/CONFIG_FAIL_PAGE_ALLOC=y/' config-nodebug + @perl -pi -e 's/# CONFIG_FAIL_MAKE_REQUEST is not set/CONFIG_FAIL_MAKE_REQUEST=y/' config-nodebug + @perl -pi -e 's/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/CONFIG_FAULT_INJECTION_DEBUG_FS=y/' config-nodebug + @perl -pi -e 's/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/' config-nodebug + @perl -pi -e 's/# CONFIG_DEBUG_SG is not set/CONFIG_DEBUG_SG=y/' config-nodebug + @perl -pi -e 's/# CONFIG_EXT4DEV_FS is not set/CONFIG_EXT4DEV_FS=m/' config-generic + + @perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec + +release: + @perl -pi -e 's/CONFIG_SLUB_DEBUG_ON=y/# CONFIG_SLUB_DEBUG_ON is not set/' config-nodebug + @perl -pi -e 's/CONFIG_LOCK_STAT=y/# CONFIG_LOCK_STAT is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_STACK_USAGE=y/# CONFIG_DEBUG_STACK_USAGE is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_IGNORE_QUIET=y/# CONFIG_DEBUG_IGNORE_QUIET is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_RT_MUTEXES=y/# CONFIG_DEBUG_RT_MUTEXES is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_RWSEMS=y/# CONFIG_DEBUG_RWSEMS is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_LOCK_ALLOC=y/# CONFIG_DEBUG_LOCK_ALLOC is not set/' config-nodebug + @perl -pi -e 's/CONFIG_PROVE_LOCKING=y/# CONFIG_PROVE_LOCKING is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_SPINLOCK=y/# CONFIG_DEBUG_SPINLOCK is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_VM=y/# CONFIG_DEBUG_VM is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_SLEEP_IN_IRQ=y/# CONFIG_DEBUG_SLEEP_IN_IRQ is not set/' config-nodebug + @perl -pi -e 's/CONFIG_FAULT_INJECTION=y/# CONFIG_FAULT_INJECTION is not set/' config-nodebug + @perl -pi -e 's/CONFIG_FAILSLAB=y/# CONFIG_FAILSLAB is not set/' config-nodebug + @perl -pi -e 's/CONFIG_FAIL_PAGE_ALLOC=y/# CONFIG_FAIL_PAGE_ALLOC is not set/' config-nodebug + @perl -pi -e 's/CONFIG_FAIL_MAKE_REQUEST=y/# CONFIG_FAIL_MAKE_REQUEST is not set/' config-nodebug + @perl -pi -e 's/CONFIG_FAULT_INJECTION_DEBUG_FS=y/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/' config-nodebug + @perl -pi -e 's/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/' config-nodebug + @perl -pi -e 's/CONFIG_DEBUG_SG=y/# CONFIG_DEBUG_SG is not set/' config-nodebug + @perl -pi -e 's/CONFIG_EXT4DEV_FS=m/# CONFIG_EXT4DEV_FS is not set/' config-generic + + @perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec + + +reconfig: + @rm -f kernel-*-config + @VERSION="2.6.25" make -f Makefile.config configs + @scripts/reconfig.sh + +# since i386 isn't a target... +compile compile-short: DIST_DEFINES += --target $(shell uname -m) + +# +# Hacks for building vanilla (unpatched) kernel rpms. +# Use "make vanilla-TARGET" like "make TARGET" (make vanilla-scratch-build). +# +vanilla-%: $(SPECFILE:.spec=-vanilla.spec) + @$(MAKE) $* SPECFILE=$< + +$(SPECFILE:.spec=-vanilla.spec): $(SPECFILE) + @rm -f $@ + (echo %define nopatches 1; cat $<) > $@ + +#scratch-build: NAME = $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) -q --qf "%{NAME}\n" --specfile $(SPECFILE)| head -1) +#scratch-build: test-srpm +# $(BUILD_CLIENT) build $(BUILD_FLAGS) --scratch $(TARGET) \ +# $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm + +# Dismal kludge for building via brew from cvs after "make vanilla-tag". +ifdef BEEHIVE_SRPM_BUILD +export CHECKOUT_TAG ?= $(shell sed s/^.// CVS/Tag) +tag-pattern = $(TAG_NAME)-$(TAG_VERSION)-0_%_$(TAG_RELEASE) +ifeq (,$(filter-out $(tag-pattern),$(CHECKOUT_TAG))) +variant := $(patsubst $(tag-pattern),%,$(CHECKOUT_TAG)) +srpm: SPECFILE := $(wildcard $(SPECFILE:.spec=-$(variant).spec) \ + $(SPECFILE:.spec=.t.$(variant).spec)) +srpm beehive-sprm: RELEASE := 0.$(variant).$(RELEASE) +endif +endif + +ifndef KVERSION +KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \ + print "2.6." $$3 \ + }' $(SPECFILE)) +endif + +# +# Hacks for building kernel rpms from upstream code plus local GIT branches. +# Use "make git/BRANCH/TARGET" like "make TARGET". +# Use "make git/BRANCH-fedora/TARGET" to include Fedora patches on top. +# +ifndef GIT_SPEC +git/%: + @$(MAKE) GIT_SPEC=$(subst /,-,$(*D)) git-$(*F) +else +git-%: $(SPECFILE:.spec=.t.$(GIT_SPEC).spec) + @$(MAKE) GIT_SPEC= $* SPECFILE=$< +endif + +# +# Your git-branches.mk file can define GIT_DIR, e.g.: +# GIT_DIR = ${HOME}/kernel/.git +# Make sure GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL are also set +# or your rpm changelogs will look like crap. +# +# For each branch it can define a variable branch-BRANCH or tag-BRANCH +# giving the parent of BRANCH to diff against in a separate patch. If +# the parent is unknown, it will use $(branch-upstream) defaulting to +# "refs/remotes/upstream/master". +# +# Defining tag-BRANCH means the tag corresponds to an upstream patch in +# the sources file, so that is used instead of generating a patch with +# git. If there is no tag-upstream defined, it will figure out a vNNN +# tag or vNNN-gitN pseudo-tag from the last patch in the sources file. +# For example: +# tag-some-hacks = v2.6.21-rc5 +# branch-more-hacks = some-hacks +# Leads to patches: +# git diff v2.6.21-rc5..more-hacks > linux-2.6.21-rc5-some-hacks.patch +# git diff some-hacks..more-hacks > linux-2.6.21-rc5-more-hacks.patch +# Whereas having no git-branches.mk at all but doing +# "make GIT_DIR=... git/mybranch/test-srpm" does: +# id=`cat patch-2.6.21-rc5-git4.id` # auto-fetched via upstream file +# git diff $id..upstream > linux-2.6.21-rc5-git4-upstream.patch +# git diff upstream..mybranch > linux-2.6.21-rc5-git4-mybranch.patch +# If the upstream patch (or any branch patch) is empty it's left out. +# +git-branches.mk:; +-include git-branches.mk + +branch-upstream ?= refs/remotes/upstream/master + +ifdef GIT_DIR +export GIT_DIR +export GIT_AUTHOR_NAME +export GIT_AUTHOR_EMAIL +gen-patches ?= gen-patches + +ifndef havespec +$(SPECFILE:.spec=.t.%-fedora.spec): $(SPECFILE) $(gen-patches) FORCE + ./$(gen-patches) --fedora < $< > $@ $(gen-patches-args) +$(SPECFILE:.spec=.t.%.spec): $(SPECFILE) $(gen-patches) FORCE + ./$(gen-patches) < $< > $@ $(gen-patches-args) +.PRECIOUS: $(SPECFILE:.spec=.t.%.spec) $(SPECFILE:.spec=.t.%-fedora.spec) +endif + +spec-%: $(SPECFILE:.spec=.t.%.spec) ; +$(SPECFILE):; +FORCE:; + +branch-of-* = $(firstword $(head-$*) $*) +gen-patches-args = --name $* v$(KVERSION) $(call heads,$(branch-of-*)) +define heads +$(if $(tag-$1),$(filter-out v$(KVERSION),$(tag-$1)),\ + $(call heads,$(firstword $(branch-$1) $(branch-upstream)))) $1 +endef + +files-%-fedora: + @echo $(SPECFILE:.spec=.t.$*-fedora.spec) + @$(call list-patches,$(branch-of-*)) +files-%: + @echo $(SPECFILE:.spec=.t.$*.spec) + @$(call list-patches,$(branch-of-*)) +define list-patches +$(if $(tag-$1),version=$(patsubst v%,%,$(tag-$1)),\ + $(call list-patches,$(firstword $(branch-$1) $(branch-upstream)))); \ +echo linux-$${version}-$(patsubst refs/remotes/%/master,%,$1).patch +endef + +ifndef tag-$(branch-upstream) +tag-$(branch-upstream) := $(shell \ + sed -n 's/^.* *//;s/\.bz2$$//;s/patch-/v/;/^v/h;$${g;p}' sources) +endif +endif Index: config-debug =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-debug,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-debug 29 Oct 2007 17:29:06 -0000 1.2 +++ config-debug 6 Mar 2008 13:59:25 -0000 1.3 @@ -25,4 +25,8 @@ CONFIG_DEBUG_STACK_USAGE=y CONFIG_ACPI_DEBUG=y -# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set \ No newline at end of file +# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set + +CONFIG_DEBUG_SG=y + +CONFIG_DEBUG_PAGEALLOC=y Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-generic 29 Oct 2007 17:29:06 -0000 1.2 +++ config-generic 6 Mar 2008 13:59:25 -0000 1.3 @@ -40,8 +40,11 @@ CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y -CONFIG_IPC_NS=y CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y + CONFIG_POSIX_MQUEUE=y # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y @@ -49,6 +52,7 @@ CONFIG_PREEMPT_BKL=y CONFIG_SLUB=y +# CONFIG_SLUB_STATS is not set CONFIG_MISC_DEVICES=y @@ -71,9 +75,12 @@ CONFIG_PCI_MSI=y CONFIG_PCIEPORTBUS=y CONFIG_PCIEAER=y +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_HOTPLUG_PCI_FAKE=m -# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +# CONFIG_PCI_LEGACY is not set + CONFIG_ISA=y # CONFIG_EISA is not set # CONFIG_MCA is not set @@ -110,7 +117,7 @@ CONFIG_INFINIBAND_IPOIB=m CONFIG_INFINIBAND_IPOIB_DEBUG=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y -# CONFIG_INFINIBAND_IPOIB_CM is not set +CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_SRP=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m @@ -121,6 +128,8 @@ CONFIG_INFINIBAND_CXGB3=m # CONFIG_INFINIBAND_CXGB3_DEBUG is not set CONFIG_MLX4_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set # # Executable file formats @@ -365,8 +374,6 @@ # CONFIG_BLK_DEV_OPTI621 is not set CONFIG_BLK_DEV_RZ1000=y CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -# CONFIG_IDEDMA_ONLYDISK is not set CONFIG_BLK_DEV_AEC62XX=y CONFIG_BLK_DEV_ALI15X3=y # CONFIG_WDC_ALI15X3 is not set @@ -393,21 +400,27 @@ # CONFIG_BLK_DEV_SLC90E66 is not set # CONFIG_BLK_DEV_TRM290 is not set CONFIG_BLK_DEV_VIA82CXXX=y -# CONFIG_IDE_CHIPSETS is not set CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set # CONFIG_BLK_DEV_HD is not set +CONFIG_VIRTIO=m +CONFIG_VIRTIO_BLK=m +CONFIG_VIRTIO_RING=m +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_NET=m + # # SCSI device support # CONFIG_SCSI=m -CONFIG_SCSI_PROC_FS=y -CONFIG_SCSI_TGT=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_PROC_FS=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_SRP=m CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_TGT=m # # SCSI support type (disk, tape, CD-ROM) @@ -435,6 +448,7 @@ CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set +CONFIG_SCSI_SAS_HOST_SMP=y CONFIG_RAID_ATTRS=m CONFIG_ISCSI_TCP=m @@ -515,14 +529,14 @@ CONFIG_PATA_IT8213=m CONFIG_PATA_JMICRON=m # CONFIG_PATA_LEGACY is not set -CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_NINJA32=m CONFIG_PATA_MARVELL=m # CONFIG_PATA_WINBOND_VLB is not set CONFIG_PATA_MPIIX=m -CONFIG_PATA_OLDPIIX=m CONFIG_PATA_NETCELL=m CONFIG_PATA_NS87410=m CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m CONFIG_PATA_OPTI=m CONFIG_PATA_OPTIDMA=m CONFIG_PATA_PCMCIA=m @@ -535,6 +549,7 @@ CONFIG_PATA_PDC2027X=m CONFIG_PATA_SIL680=m CONFIG_PATA_SIS=m +CONFIG_PATA_TRIFLEX=m CONFIG_PATA_VIA=m CONFIG_PATA_WINBOND=m @@ -678,11 +693,6 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set -CONFIG_IP_ROUTE_MULTIPATH_RR=m -CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m -CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m -CONFIG_IP_ROUTE_MULTIPATH_DRR=m # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m @@ -737,14 +747,17 @@ CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_NET_9P=m -# CONFIG_NET_9P_DEBUG is not set CONFIG_NET_9P_FD=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_DEBUG is not set CONFIG_DECNET=m CONFIG_DECNET_ROUTER=y # CONFIG_DECNET_NF_GRABULATOR is not set CONFIG_BRIDGE=m CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_NF_CONNTRACK=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m @@ -757,8 +770,10 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m @@ -770,15 +785,18 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m CONFIG_NETFILTER_XT_MATCH_MARK=m CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_STATE=m @@ -891,9 +909,10 @@ CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_ULOG=m CONFIG_XFRM=y -CONFIG_XFRM_USER=y -CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y +CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_USER=y CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m @@ -949,40 +968,40 @@ # CONFIG_NET_SCHED=y CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_RR=m CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_RR=m -CONFIG_NET_ESTIMATOR=y +CONFIG_NET_SCH_TEQL=m CONFIG_NET_CLS=y -CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_CLS_POLICE=y CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_POLICE=y +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_MARK=y CONFIG_CLS_U32_PERF=y -CONFIG_NET_CLS_IND=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_CLS_BASIC=m CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_EMATCH_U32=m CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y @@ -1068,7 +1087,7 @@ CONFIG_BROADCOM_PHY=m CONFIG_CICADA_PHY=m CONFIG_DAVICOM_PHY=m -CONFIG_FIXED_PHY=m +CONFIG_FIXED_PHY=y CONFIG_FIXED_MII_10_FDX=y CONFIG_FIXED_MII_100_FDX=y CONFIG_FIXED_MII_1000_FDX=y @@ -1078,6 +1097,7 @@ CONFIG_LXT_PHY=m CONFIG_MARVELL_PHY=m CONFIG_QSEMI_PHY=m +CONFIG_REALTEK_PHY=m CONFIG_SMSC_PHY=m CONFIG_VITESSE_PHY=m @@ -1120,7 +1140,7 @@ CONFIG_BNX2=m CONFIG_QLA3XXX=m CONFIG_ATL1=m -# CONFIG_DGRS is not set +CONFIG_ATL2=m # CONFIG_EEPRO100 is not set CONFIG_E100=m CONFIG_FEALNX=m @@ -1225,9 +1245,14 @@ # CONFIG_PCMCIA_RAYCS is not set CONFIG_MAC80211=m +CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set +CONFIG_MAC80211_RC_DEFAULT="pid" +CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_SIMPLE=y CONFIG_MAC80211_LEDS=y -CONFIG_MAC80211_HT=y -# CONFIG_MAC80211_DEBUGFS is not set +CONFIG_MAC80211_DEBUGFS=y +# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set # CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y @@ -1237,25 +1262,19 @@ CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y CONFIG_CFG80211=m +CONFIG_NL80211=y CONFIG_ADM8211=m CONFIG_ATH5K=m +CONFIG_ATH5K_DEBUG=y CONFIG_AIRO=m CONFIG_AIRO_CS=m CONFIG_ATMEL=m # CONFIG_BCM43XX is not set CONFIG_B43=m -CONFIG_B43_PCI=y CONFIG_B43_PCMCIA=y CONFIG_B43_DEBUG=y -CONFIG_B43_DMA=y -CONFIG_B43_PIO=y -CONFIG_B43_DMA_AND_PIO_MODE=y -# CONFIG_B43_DMA_MODE is not set -# CONFIG_B43_PIO_MODE is not set CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI=y -CONFIG_B43LEGACY_PCMCIA=y CONFIG_B43LEGACY_DEBUG=y CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y @@ -1273,17 +1292,21 @@ # CONFIG_IPW2200 is not set # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2200_DEBUG is not set -# CONFIG_LIBERTAS is not set - -CONFIG_IWLWIFI=y -CONFIG_IWLWIFI_DEBUG=y -CONFIG_IWLWIFI_SENSITIVITY=y -CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y -CONFIG_IWLWIFI_QOS=y -CONFIG_IWLWIFI_HT=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_DEBUG=y CONFIG_IWL4965=m +CONFIG_IWL4965_DEBUG=y +CONFIG_IWL4965_SENSITIVITY=y +CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y +CONFIG_IWL4965_QOS=y +CONFIG_IWL4965_HT=y CONFIG_IWL3945=m -# CONFIG_NL80211 is not set +CONFIG_IWL3945_DEBUG=y +CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y +CONFIG_IWL3945_QOS=y CONFIG_NORTEL_HERMES=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m @@ -1297,23 +1320,29 @@ CONFIG_PCMCIA_ATMEL=m CONFIG_PCMCIA_WL3501=m CONFIG_RT2X00=y +CONFIG_RT2X00_LIB_DEBUGFS=y # CONFIG_RT2X00_DEBUG is not set CONFIG_RT2400PCI=m CONFIG_RT2400PCI_RFKILL=y +CONFIG_RT2400PCI_LEDS=y CONFIG_RT2500PCI=m CONFIG_RT2500PCI_RFKILL=y +CONFIG_RT2500PCI_LEDS=y CONFIG_RT61PCI=m CONFIG_RT61PCI_RFKILL=y +CONFIG_RT61PCI_LEDS=y CONFIG_RT2500USB=m +CONFIG_RT2500USB_LEDS=y CONFIG_RT73USB=m -CONFIG_RTL818X=y +CONFIG_RT73USB_LEDS=y +CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_TMD_HERMES=m CONFIG_USB_ATMEL=m CONFIG_USB_ZD1201=m -# CONFIG_ZD1211RW is not set -CONFIG_ZD1211RW_MAC80211=m -# CONFIG_ZD1211RW_MAC80211_DEBUG is not set +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set # @@ -1354,7 +1383,24 @@ # # Amateur Radio support # -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +# CONFIG_CAN is not set +CONFIG_NETROM=m +CONFIG_ROSE=m +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +CONFIG_DMASCC=m +CONFIG_SCC_DELAY=n +CONFIG_SCC_TRXECHO=y +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m # # IrDA (infrared) support @@ -1426,6 +1472,8 @@ CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART_LL=y # # ISDN subsystem @@ -1551,7 +1599,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_JOYDEV=m -# CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set @@ -1655,7 +1702,6 @@ # CONFIG_VT=y CONFIG_VT_CONSOLE=y -CONFIG_VT_UNICODE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y @@ -1673,7 +1719,7 @@ CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m # CONFIG_TCG_INFINEON is not set -# CONFIG_TELCLOCK is not set +CONFIG_TELCLOCK=m # # Serial drivers @@ -1715,7 +1761,6 @@ CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m -CONFIG_TIPAR=m # # I2C support @@ -1780,7 +1825,9 @@ CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m @@ -1800,6 +1847,7 @@ CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_HDAPS=m +# CONFIG_SENSORS_I5K_AMB is not set CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_K8TEMP=m @@ -1834,6 +1882,7 @@ CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m @@ -1895,7 +1944,9 @@ # CONFIG_WAFER_WDT is not set # CONFIG_CPU5_WDT is not set CONFIG_I6300ESB_WDT=m +CONFIG_IT8712F_WDT=m # CONFIG_SBC8360_WDT is not set +# CONFIG_SBC7240_WDT is not set CONFIG_W83977F_WDT=m CONFIG_PCIPCWATCHDOG=m CONFIG_USBPCWATCHDOG=m @@ -1903,21 +1954,21 @@ CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set -CONFIG_RTC=y +# CONFIG_RTC is not set # CONFIG_RTC_DEBUG is not set # CONFIG_GEN_RTC is not set -# CONFIG_RTC_CLASS is not set +CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_DS1553=m CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_DS1374=m # CONFIG_RTC_DRV_EP93XX is not set CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_M41T80=m @@ -1933,6 +1984,7 @@ CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_V3020=m CONFIG_RTC_DRV_STK17TA8=m +# CONFIG_RTC_DRV_S35390A is not set CONFIG_DTLK=m CONFIG_R3964=m @@ -2013,6 +2065,7 @@ CONFIG_VIDEO_CPIA_USB=m CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m CONFIG_VIDEO_CX25840=m CONFIG_VIDEO_CX2341X=m @@ -2024,6 +2077,7 @@ CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_IVTV=m @@ -2033,6 +2087,8 @@ CONFIG_VIDEO_MXB=m CONFIG_VIDEO_OVCAMCHIP=m CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR=y +CONFIG_VIDEO_PVRUSB2_ONAIR_USB2=y CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_SAA5249=m CONFIG_VIDEO_SAA6588=m @@ -2071,6 +2127,8 @@ CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_VP27SMPX=m CONFIG_TUNER_3036=m # CONFIG_TUNER_TEA5761 is not set @@ -2098,6 +2156,7 @@ CONFIG_DVB_STV0299=m # CONFIG_DVB_SP887X is not set CONFIG_DVB_BT8XX=m +CONFIG_DVB_BUDGET_CORE=m CONFIG_DVB_CX24110=m CONFIG_DVB_L64781=m CONFIG_DVB_LGDT330X=m @@ -2108,7 +2167,9 @@ CONFIG_DVB_S5H1420=m CONFIG_DVB_SP8870=m CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m CONFIG_DVB_TDA1004X=m +CONFIG_DVB_TUA6100=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_VES1820=m CONFIG_DVB_VES1X93=m @@ -2178,7 +2239,6 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_TUNER_CUSTOMIZE is not set -CONFIG_VIDEO_BUF=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_24XXX=y @@ -2259,7 +2319,7 @@ # CONFIG_FB_VIRTUAL is not set CONFIG_FB_VOODOO1=m # CONFIG_FB_VT8623 is not set - +CONFIG_FB_EFI=y # CONFIG_FIRMWARE_EDID is not set @@ -2304,8 +2364,6 @@ CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_RTCTIMER=m -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_SUPPORT_OLD_API is not set @@ -2372,6 +2430,7 @@ CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5 CONFIG_SND_HDSPM=m +CONFIG_SND_HIFIER=m CONFIG_SND_ICE1712=m CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m @@ -2383,17 +2442,20 @@ CONFIG_SND_MIRO=m CONFIG_SND_MIXART=m CONFIG_SND_NM256=m +CONFIG_SND_OXYGEN=m CONFIG_SND_RME32=m CONFIG_SND_PCXHR=m CONFIG_SND_RIPTIDE=m CONFIG_SND_RME96=m CONFIG_SND_RME9652=m CONFIG_SND_SC6000=m +CONFIG_SND_SIS7019=m CONFIG_SND_SONICVIBES=m CONFIG_SND_HDSP=m CONFIG_SND_TRIDENT=m CONFIG_SND_VIA82XX=m CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y @@ -2415,7 +2477,6 @@ # Open Sound System # # CONFIG_SOUND_PRIME is not set -# CONFIG_SOUND_BT878 is not set # # USB support @@ -2423,6 +2484,8 @@ CONFIG_USB=y CONFIG_USB_SUPPORT=y # CONFIG_USB_DEBUG is not set + +# DEPRECATED: See bug 362221. Fix udev. # CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_PERSIST is not set @@ -2582,6 +2645,7 @@ CONFIG_USB_SERIAL_IPAQ=m CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m CONFIG_USB_SERIAL_KEYSPAN_MPR=y @@ -2625,50 +2689,55 @@ # # USB Miscellaneous drivers # -CONFIG_USB_EMI26=m + CONFIG_USB_ADUTUX=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_ATM=m CONFIG_USB_AUERSWALD=m -CONFIG_USB_RIO500=m -CONFIG_USB_LCD=m CONFIG_USB_BERRY_CHARGE=m -# CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_TEST is not set +CONFIG_USB_CXACRU=m +# CONFIG_USB_CYTHERM is not set +CONFIG_USB_EMI26=m +CONFIG_USB_ETH=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set # CONFIG_USB_GADGET is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_GOKU is not set -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m # CONFIG_USB_GADGETFS is not set -CONFIG_USB_W9968CF=m -CONFIG_USB_ZC0301=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_LCD=m +CONFIG_USB_LD=m CONFIG_USB_LEGOTOWER=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_ALI_M5632=y -# CONFIG_USB_CYTHERM is not set -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_MON=y CONFIG_USB_PHIDGET=m CONFIG_USB_PHIDGETSERVO=m CONFIG_USB_PHIDGETKIT=m CONFIG_USB_PHIDGETMOTORCONTROL=m -CONFIG_USB_U132_HCD=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_RIO500=m +CONFIG_USB_QUICKCAM_MESSENGER=m CONFIG_USB_SL811_HCD=m -CONFIG_USB_MON=y CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_ATM=m -CONFIG_USB_CXACRU=m -CONFIG_USB_XUSBATM=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_LD=m +CONFIG_USB_SI470X=m +CONFIG_USB_STKWEBCAM=m +# CONFIG_USB_TEST is not set CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_UVCVIDEO=m +CONFIG_USB_W9968CF=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_ZC0301=m +CONFIG_USB_ZERO=m -CONFIG_USB_QUICKCAM_MESSENGER=m -# CONFIG_USB_HIDINPUT_POWERBOOK is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # # Sonics Silicon Backplane @@ -2758,7 +2827,6 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y -CONFIG_RAMFS=y CONFIG_DEBUG_FS=y # @@ -2823,11 +2891,14 @@ # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_CIFS_EXPERIMENTAL=y +CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_CIFS_WEAK_PW_HASH=y # CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_DFS_UPCALL=y CONFIG_NCP_FS=m CONFIG_NCPFS_PACKET_SIGNING=y CONFIG_NCPFS_IOCTL_LOCKING=y @@ -2843,6 +2914,7 @@ # CONFIG_AF_RXRPC is not set CONFIG_OCFS2_FS=m +# CONFIG_OCFS2_DEBUG_FS is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set CONFIG_CONFIGFS_FS=m @@ -2936,6 +3008,7 @@ # CONFIG_DEBUG_DRIVER is not set CONFIG_HEADERS_CHECK=y # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_TRACE is not set # CONFIG_LKDTM is not set # CONFIG_RT_MUTEX_TESTER is not set @@ -2952,6 +3025,11 @@ CONFIG_DEBUG_LIST=y CONFIG_DEBUG_SHIRQ=y CONFIG_DEBUG_DEVRES=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set + +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_NX_TEST is not set +# CONFIG_DEBUG_BOOT_PARAMS is not set # # Security options @@ -2966,11 +3044,12 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y -CONFIG_UTS_NS=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 +# CONFIG_SECURITY_SMACK is not set CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -2990,27 +3069,32 @@ CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CTR=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_MPILIB=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SEQIV=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TWOFISH=m @@ -3019,7 +3103,8 @@ CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_TEST=m CONFIG_LIBCRC32C=m - +CONFIG_CRYPTO_DEV_HIFN_795X=m +CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # # Library routines @@ -3064,7 +3149,9 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PROC_PID_CPUSET=y -CONFIG_SYSFS_DEPRECATED=y +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set + CONFIG_RELAY=y # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_MUST_CHECK=y @@ -3084,10 +3171,8 @@ CONFIG_IBMASR=m CONFIG_PM_LEGACY=y -# CONFIG_PM_SYSFS_DEPRECATED is not set CONFIG_PM_DEBUG=y CONFIG_PM_TRACE=y -# CONFIG_DISABLE_CONSOLE_SUSPEND is not set # CONFIG_PM_VERBOSE is not set CONFIG_CRASH=m @@ -3106,7 +3191,6 @@ CONFIG_SCSI_ARCMSR=m CONFIG_SCSI_ARCMSR_AER=y # CONFIG_SCSI_DTC3280 is not set -# CONFIG_SCSI_ESP_CORE is not set # CONFIG_SCSI_GENERIC_NCR5380 is not set # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set # CONFIG_SCSI_NCR53C406A is not set @@ -3117,7 +3201,7 @@ # CONFIG_SCSI_T128 is not set # CONFIG_SCSI_U14_34F is not set # CONFIG_SCSI_ULTRASTOR is not set -# CONFIG_CD_NO_IDESCSI is not set +CONFIG_SCSI_MVSAS=m # CONFIG_EL1 is not set # CONFIG_EL2 is not set @@ -3291,13 +3375,8 @@ CONFIG_CFAG12864B_RATE=20 # CONFIG_PHANTOM is not set -# CONFIG_BLINK is not set CONFIG_EEPROM_93CX6=m -CONFIG_CPU_IDLE=y -# CONFIG_CPU_IDLE_GOV_LADDER is not set -CONFIG_CPU_IDLE_GOV_MENU=y - CONFIG_POWER_SUPPLY=m # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_APM_POWER=m @@ -3337,3 +3416,53 @@ # CONFIG_SAMPLES is not set +# CONFIG_DEVKMEM is not set + +CONFIG_PM_TRACE_RTC=y +CONFIG_R6040=m +CONFIG_IGB=m +CONFIG_BNX2X=m +CONFIG_NOZOMI=m +CONFIG_PCF8575=m +# CONFIG_TPS65010 is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +CONFIG_LATENCYTOP=y +CONFIG_RESOURCE_COUNTERS=y +# CONFIG_COMPAT_BRK is not set + +# FIXME: Move to arch +CONFIG_ACPI_WMI=m +CONFIG_ACPI_CUSTOM_DSDT_INITRD=y + +#FIXME: x86 generic? +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_I8K=m +CONFIG_ACER_WMI=m +CONFIG_EDAC_I3000=m +CONFIG_INPUT_APANEL=m + +# CONFIG_INTEL_MENLOW is not set +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_IPWIRELESS=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_CGROUP_MEM_CONT=y +CONFIG_TC1100_WMI=m + +# CONFIG_BLK_DEV_XIP is not set +CONFIG_MEMSTICK=m +CONFIG_MEMSTICK_DEBUG=y + +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m +CONFIG_MEMSTICK_TIFM_MS=m + +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_CGROUP_SCHED=y +# CONFIG_CGROUP_MEM_RES_CTLR is not set + +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set Index: config-i586 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-i586,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-i586 29 Oct 2007 17:29:06 -0000 1.2 +++ config-i586 6 Mar 2008 13:59:25 -0000 1.3 @@ -5,3 +5,5 @@ # CONFIG_HIGHMEM64G is not set CONFIG_X86_POWERNOW_K6=m + +# CONFIG_KVM is not set Index: config-ia64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-ia64-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-ia64-generic 29 Oct 2007 17:29:06 -0000 1.2 +++ config-ia64-generic 6 Mar 2008 13:59:25 -0000 1.3 @@ -13,7 +13,6 @@ # CONFIG_XEN_VT is not set CONFIG_MMU=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_TIME_INTERPOLATION=y CONFIG_EFI=y # CONFIG_ITANIUM is not set CONFIG_MCKINLEY=y @@ -63,6 +62,7 @@ # # Character devices # +CONFIG_TCG_INFINEON=m # # Watchdog Cards @@ -114,8 +114,10 @@ CONFIG_ACPI=y CONFIG_ACPI_AC=m # CONFIG_ACPI_ASUS is not set -CONFIG_ACPI_BAY=m -CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_SYSFS_POWER=y +# CONFIG_ACPI_BAY is not set +# CONFIG_ACPI_BATTERY is not set CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_BUTTON=m # CONFIG_ACPI_DOCK is not set @@ -187,3 +189,7 @@ # CONFIG_IA64_MC_ERR_INJECT is not set CONFIG_DMIID=y + +CONFIG_SENSORS_I5K_AMB=m + +CONFIG_SPARSEMEM_VMEMMAP=y Index: config-nodebug =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-nodebug,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-nodebug 29 Oct 2007 17:29:06 -0000 1.2 +++ config-nodebug 6 Mar 2008 13:59:25 -0000 1.3 @@ -25,3 +25,7 @@ CONFIG_DEBUG_STACK_USAGE=y # CONFIG_ACPI_DEBUG is not set + +CONFIG_DEBUG_SG=y + +CONFIG_DEBUG_PAGEALLOC=y Index: config-powerpc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-powerpc-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-powerpc-generic 29 Oct 2007 17:29:06 -0000 1.2 +++ config-powerpc-generic 6 Mar 2008 13:59:25 -0000 1.3 @@ -33,8 +33,9 @@ CONFIG_SUSPEND=y CONFIG_HIBERNATION=y # CONFIG_RTC is not set -CONFIG_GEN_RTC=y +# CONFIG_GEN_RTC is not set # CONFIG_GEN_RTC_X is not set +CONFIG_RTC_DRV_PPC=y CONFIG_PROC_DEVICETREE=y # CONFIG_CMDLINE_BOOL is not set CONFIG_BLK_DEV_IDE_PMAC=y @@ -49,6 +50,7 @@ CONFIG_I2C_POWERMAC=y CONFIG_APPLE_AIRPORT=m CONFIG_SERIAL_PMACZILOG=m +# CONFIG_SERIAL_PMACZILOG_TTYS is not set CONFIG_AGP_UNINORTH=y CONFIG_FB_OF=y # CONFIG_FB_CONTROL is not set @@ -119,9 +121,6 @@ # CONFIG_PPC_LITE5200 is not set CONFIG_PPC_BESTCOMM=y CONFIG_PMAC_RACKMETER=m -CONFIG_SERIAL_MPC52xx=y -CONFIG_SERIAL_MPC52xx_CONSOLE=y -CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 CONFIG_USB_OHCI_HCD_PPC_SOC=y CONFIG_USB_OHCI_HCD_PCI=y CONFIG_USB_OHCI_HCD_PPC_OF=y @@ -157,8 +156,6 @@ # CONFIG_BLK_DEV_IDEPNP is not set # CONFIG_BLK_DEV_IDEPCI is not set CONFIG_IDEPCI_SHARE_IRQ=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -# CONFIG_IDEDMA_ONLYDISK is not set # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set # CONFIG_BLK_DEV_AMD74XX is not set @@ -186,9 +183,7 @@ CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y CONFIG_BLK_DEV_IDEDMA_PMAC=y # CONFIG_IDE_ARM is not set -# CONFIG_IDE_CHIPSETS is not set CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set # CONFIG_BLK_DEV_HD is not set # CONFIG_USB_STORAGE_ISD200 is not set CONFIG_MTD_PHYSMAP_OF=m @@ -210,4 +205,19 @@ CONFIG_AXON_RAM=m CONFIG_OPROFILE_CELL=y -# CONFIG_MPC5200_WDT is not set +# CONFIG_PPC_MPC52xx is not set +CONFIG_SUSPEND_FREEZER=y +# CONFIG_IDEPCI_PCIBUS_ORDER is not set +CONFIG_PATA_PLATFORM=m +CONFIG_PATA_OF_PLATFORM=m +CONFIG_USB_EHCI_HCD_PPC_OF=y + +# CONFIG_MPC5121_ADS is not set +CONFIG_MTD_OF_PARTS=m +# CONFIG_MTD_NAND_FSL_ELBC is not set +CONFIG_THERMAL=y + +# CONFIG_MEMORY_HOTREMOVE is not set + +CONFIG_DMADEVICES=y +# CONFIG_FSL_DMA is not set Index: config-powerpc32-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-powerpc32-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-powerpc32-generic 29 Oct 2007 17:29:06 -0000 1.2 +++ config-powerpc32-generic 6 Mar 2008 13:59:25 -0000 1.3 @@ -47,7 +47,6 @@ CONFIG_FB_PLATINUM=y CONFIG_FB_VALKYRIE=y CONFIG_FB_CT65550=y -CONFIG_DMASOUND_PMAC=m # CONFIG_BDI_SWITCH is not set CONFIG_MAC_FLOPPY=m # CONFIG_BLK_DEV_FD is not set @@ -67,7 +66,16 @@ CONFIG_PATA_MPC52xx=m +CONFIG_SERIAL_MPC52xx=y +CONFIG_SERIAL_MPC52xx_CONSOLE=y +CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 +# CONFIG_MPC5200_WDT is not set + CONFIG_PPC_MPC5200_BUGFIX=y +CONFIG_FEC_MPC52xx=m +#CHECK: This may later become a tristate. +CONFIG_FEC_MPC52xx_MDIO=y + CONFIG_SERIAL_OF_PLATFORM=y CONFIG_DEBUG_STACKOVERFLOW=y @@ -82,9 +90,9 @@ # CONFIG_BLK_DEV_HT6560B is not set # CONFIG_BLK_DEV_QD65XX is not set # CONFIG_BLK_DEV_UMC8672 is not set -CONFIG_SERIAL_PMACZILOG_TTYS=y # CONFIG_VIRQ_DEBUG is not set CONFIG_PPC_BESTCOMM_ATA=m CONFIG_PPC_BESTCOMM_FEC=m CONFIG_PPC_BESTCOMM_GEN_BD=m + Index: config-powerpc64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-powerpc64,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-powerpc64 29 Oct 2007 17:29:06 -0000 1.2 +++ config-powerpc64 6 Mar 2008 13:59:25 -0000 1.3 @@ -16,7 +16,7 @@ CONFIG_PPC_CELLEB=y CONFIG_PS3_HTAB_SIZE=20 # CONFIG_PS3_DYNAMIC_DMA is not set -CONFIG_PS3_USE_LPAR_ADDR=y +# CONFIG_PS3_USE_LPAR_ADDR is not set CONFIG_PS3_ADVANCED=y CONFIG_PS3_HTAB_SIZE=20 # CONFIG_PS3_DYNAMIC_DMA is not set @@ -29,6 +29,7 @@ CONFIG_PS3_DISK=m CONFIG_PS3_ROM=m CONFIG_PS3_FLASH=m +CONFIG_PS3_LPM=y CONFIG_SND_PS3=m CONFIG_SND_PS3_DEFAULT_START_DELAY=1000 CONFIG_GELIC_NET=m @@ -77,8 +78,7 @@ CONFIG_VIOCD=m CONFIG_VIOTAPE=m -# virq_to_hw() requires irq_map[] to be exported. Ick. -# CONFIG_PASEMI_MAC is not set +CONFIG_PASEMI_MAC=m CONFIG_SERIAL_OF_PLATFORM=m CONFIG_PPC_PASEMI_IOMMU=y @@ -110,7 +110,6 @@ # CONFIG_FB_ATY is not set # CONFIG_POWER4_ONLY is not set -# CONFIG_PPC_PASEMI is not set CONFIG_RTAS_PROC=y CONFIG_IOMMU_VMERGE=y @@ -126,7 +125,6 @@ CONFIG_EHEA=m CONFIG_INFINIBAND_EHCA=m -CONFIG_INFINIBAND_EHCA_SCALING=y CONFIG_HCALL_STATS=y @@ -148,7 +146,11 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0 # CONFIG_IBM_NEW_EMAC_DEBUG is not set -CONFIG_SERIAL_PMACZILOG_TTYS=y # CONFIG_VIRQ_DEBUG is not set CONFIG_ELECTRA_CF=m +CONFIG_SPARSEMEM_VMEMMAP=y + +CONFIG_SPU_TRACE=m +CONFIG_MTD_NAND_PASEMI=m +CONFIG_EDAC_CELL=m Index: config-s390x =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-s390x,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-s390x 29 Oct 2007 17:29:06 -0000 1.2 +++ config-s390x 6 Mar 2008 13:59:25 -0000 1.3 @@ -63,7 +63,6 @@ CONFIG_TN3215=y CONFIG_TN3215_CONSOLE=y CONFIG_CCW_CONSOLE=y -CONFIG_SCLP=y CONFIG_SCLP_TTY=y CONFIG_SCLP_CONSOLE=y CONFIG_SCLP_VT220_TTY=y @@ -197,3 +196,5 @@ CONFIG_S390_VMUR=m +# CONFIG_THERMAL is not set +# CONFIG_DEBUG_PAGEALLOC is not set Index: config-sparc-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-sparc-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-sparc-generic 29 Oct 2007 17:29:06 -0000 1.2 +++ config-sparc-generic 6 Mar 2008 13:59:25 -0000 1.3 @@ -39,7 +39,6 @@ CONFIG_FB_CG14=y CONFIG_FB_P9100=y CONFIG_FB_LEO=y -# CONFIG_FB_PCI is not set # CONFIG_FB_IGA is not set # CONFIG_MDA_CONSOLE is not set CONFIG_PROM_CONSOLE=y @@ -81,7 +80,6 @@ CONFIG_SUN_MOSTEK_RTC=y # CONFIG_SUN_BPP is not set # CONFIG_SUN_VIDEOPIX is not set -# CONFIG_SUN_AURORA is not set CONFIG_TADPOLE_TS102_UCTRL=m CONFIG_SUN_JSFLASH=m CONFIG_APM_RTC_IS_GMT=y @@ -97,7 +95,6 @@ # CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC79XX is not set # CONFIG_SCSI_ADVANSYS is not set -# CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_CPQFCTS is not set @@ -115,9 +112,6 @@ # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_NSP32 is not set CONFIG_SCSI_SUNESP=m -CONFIG_FC4=m -CONFIG_FC4_SOC=m -CONFIG_FC4_SOCAL=m CONFIG_SCSI_PLUTO=m CONFIG_SCSI_FCAL=m CONFIG_SUNLANCE=m Index: config-sparc64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-sparc64-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-sparc64-generic 29 Oct 2007 17:29:06 -0000 1.2 +++ config-sparc64-generic 6 Mar 2008 13:59:25 -0000 1.3 @@ -28,7 +28,7 @@ CONFIG_HUGETLB_PAGE_SIZE_4MB=y # CONFIG_HUGETLB_PAGE_SIZE_512K is not set # CONFIG_HUGETLB_PAGE_SIZE_64K is not set -CONFIG_NR_CPUS=32 +CONFIG_NR_CPUS=64 CONFIG_US3_FREQ=m CONFIG_US2E_FREQ=m CONFIG_SUN_OPENPROMFS=m @@ -63,9 +63,9 @@ CONFIG_FB_PM2=y CONFIG_FB_P9100=y # CONFIG_FB_LEO is not set -CONFIG_FB_PCI=y CONFIG_FB_XVR500=y CONFIG_FB_XVR2500=y +# CONFIG_DRM_NOUVEAU is not set # CONFIG_MDA_CONSOLE is not set # CONFIG_PROM_CONSOLE is not set CONFIG_FONTS=y @@ -90,7 +90,6 @@ CONFIG_SUN_MOSTEK_RTC=y CONFIG_OBP_FLASH=m # CONFIG_SUN_VIDEOPIX is not set -# CONFIG_SUN_AURORA is not set # CONFIG_SERIO_SERPORT is not set CONFIG_BLK_DEV_FD=y CONFIG_SUNVDC=m @@ -109,15 +108,9 @@ # CONFIG_SCSI_GDTH is not set # CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set CONFIG_SCSI_QLOGICPTI=m CONFIG_SCSI_SUNESP=m -CONFIG_FC4=m -CONFIG_FC4_SOC=m -CONFIG_FC4_SOCAL=m -CONFIG_SCSI_PLUTO=m -CONFIG_SCSI_FCAL=m CONFIG_SUNLANCE=m CONFIG_SUNBMAC=m CONFIG_SUNQE=m @@ -130,7 +123,6 @@ CONFIG_ATM_FORE200E_USE_TASKLET=y CONFIG_ATM_FORE200E_DEBUG=0 CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_DRM_FFB=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_R128 is not set # CONFIG_KEYBOARD_ATKBD is not set @@ -138,7 +130,6 @@ # CONFIG_INPUT_PCSPKR is not set CONFIG_INPUT_SPARCSPKR=m # CONFIG_SOUND_PRIME is not set -CONFIG_SND_BIT32_EMUL=m CONFIG_SND_SUN_AMD7930=m CONFIG_SND_SUN_CS4231=m CONFIG_SND_SUN_DBRI=m @@ -159,3 +150,6 @@ # CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_STACK_DEBUG is not set +CONFIG_SPARSEMEM_VMEMMAP=y + +# CONFIG_THERMAL is not set Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-x86-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-x86-generic 29 Oct 2007 17:29:06 -0000 1.2 +++ config-x86-generic 6 Mar 2008 13:59:25 -0000 1.3 @@ -1,5 +1,6 @@ CONFIG_UID16=y -CONFIG_X86_64_XEN is not set +# CONFIG_64BIT is not set + # # Processor type and features # @@ -50,7 +51,6 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_HPET=y CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y # CONFIG_HPET_RTC_IRQ is not set # CONFIG_HPET_MMAP is not set CONFIG_X86_LOCAL_APIC=y @@ -77,7 +77,7 @@ CONFIG_EFI=y CONFIG_EFI_VARS=y CONFIG_EFI_PCDP=y -CONFIG_EFI_RTC=y +CONFIG_FB_IMAC=y # CONFIG_PCI_GOBIOS is not set # CONFIG_PCI_GODIRECT is not set @@ -125,6 +125,8 @@ CONFIG_ACPI=y CONFIG_ACPI_AC=m # CONFIG_ACPI_ASUS is not set +CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BAY=m CONFIG_ACPI_BLACKLIST_YEAR=1999 @@ -139,7 +141,6 @@ CONFIG_ACPI_PROCFS=y CONFIG_ACPI_SBS=m CONFIG_ACPI_SLEEP=y -# CONFIG_ACPI_PROCFS_SLEEP is not set CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_TOSHIBA=m @@ -169,7 +170,7 @@ # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y -CONFIG_X86_POWERNOW_K8=y +CONFIG_X86_POWERNOW_K8=m CONFIG_X86_POWERNOW_K8_ACPI=y # CONFIG_X86_GX_SUSPMOD is not set # CONFIG_X86_SPEEDSTEP_CENTRINO is not set @@ -177,7 +178,7 @@ CONFIG_X86_SPEEDSTEP_SMI=y CONFIG_X86_SPEEDSTEP_LIB=y # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set -CONFIG_X86_P4_CLOCKMOD=m +# CONFIG_X86_P4_CLOCKMOD is not set CONFIG_X86_LONGRUN=y # CONFIG_X86_LONGHAUL is not set # CONFIG_X86_CPUFREQ_NFORCE2 is not set @@ -216,6 +217,8 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_BIOS=y +CONFIG_DMAR=y +CONFIG_DMAR_GFX_WA=y CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_COMPAQ=m @@ -224,7 +227,6 @@ # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_PCIE=m -# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set # SHPC has half-arsed PCI probing, which makes it load on too many systems # CONFIG_HOTPLUG_PCI_SHPC is not set CONFIG_PM=y @@ -251,7 +253,6 @@ CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m CONFIG_I2C_I810=m -CONFIG_I2C_ISA=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_PIIX4=m CONFIG_I2C_PROSAVAGE=m @@ -283,7 +284,6 @@ CONFIG_EDAC_I82975X=m CONFIG_EDAC_I3000=m CONFIG_EDAC_I5000=m -CONFIG_EDAC_K8=m CONFIG_EDAC_R82600=m CONFIG_SCHED_MC=y @@ -304,6 +304,7 @@ # CONFIG_SGI_IOC4 is not set CONFIG_ASUS_LAPTOP=m +CONFIG_EEEPC=m CONFIG_FUJITSU_LAPTOP=m CONFIG_MSI_LAPTOP=m CONFIG_SONY_LAPTOP=m @@ -315,7 +316,7 @@ CONFIG_RELOCATABLE=y CONFIG_PHYSICAL_ALIGN=0x400000 -CONFIG_PHYSICAL_START=0x1000000 +CONFIG_PHYSICAL_START=0x400000 CONFIG_CRASH_DUMP=y CONFIG_PROC_VMCORE=y @@ -333,21 +334,34 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_GOV_LADDER is not set +CONFIG_CPU_IDLE_GOV_MENU=y + CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y +CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_MACINTOSH_DRIVERS=y CONFIG_DMIID=y CONFIG_VIRTUALIZATION=y +CONFIG_PARAVIRT_GUEST=y CONFIG_VMI=y CONFIG_LGUEST=m +CONFIG_LGUEST_GUEST=y # CONFIG_XEN is not set # CONFIG_HVC_XEN is not set CONFIG_DMADEVICES=y CONFIG_INTEL_IOATDMA=m +CONFIG_SENSORS_I5K_AMB=m + +# CONFIG_CPA_DEBUG is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set + +CONFIG_HP_WATCHDOG=m Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-x86_64-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-x86_64-generic 29 Oct 2007 17:29:06 -0000 1.2 +++ config-x86_64-generic 6 Mar 2008 13:59:25 -0000 1.3 @@ -1,3 +1,4 @@ +CONFIG_64BIT=y CONFIG_UID16=y # CONFIG_X86_64_XEN is not set # CONFIG_MK8 is not set @@ -11,7 +12,9 @@ CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set CONFIG_NR_CPUS=64 -CONFIG_X86_POWERNOW_K8=y +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_POWERNOW_K8_ACPI=y +# CONFIG_X86_P4_CLOCKMOD is not set CONFIG_IA32_EMULATION=y # CONFIG_IA32_AOUT is not set # CONFIG_IOMMU_DEBUG is not set @@ -24,6 +27,12 @@ CONFIG_EDD=m CONFIG_PCI_BIOS=y CONFIG_PCI_MMCONFIG=y +CONFIG_DMAR=y +CONFIG_DMAR_GFX_WA=y + +CONFIG_EFI=y +CONFIG_EFI_VARS=y +CONFIG_EFI_PCDP=y CONFIG_I2O=m CONFIG_I2O_BLOCK=m @@ -62,6 +71,8 @@ CONFIG_ACPI=y CONFIG_ACPI_AC=m # CONFIG_ACPI_ASUS is not set +CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BAY=m CONFIG_ACPI_BLACKLIST_YEAR=0 @@ -76,7 +87,6 @@ CONFIG_ACPI_PROCFS=y CONFIG_ACPI_SBS=m CONFIG_ACPI_SLEEP=y -# CONFIG_ACPI_PROCFS_SLEEP is not set CONFIG_ACPI_THERMAL=y CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_POWER=y @@ -86,6 +96,7 @@ CONFIG_ACPI_PROC_EVENT=y CONFIG_ASUS_LAPTOP=m +CONFIG_EEEPC=m CONFIG_FUJITSU_LAPTOP=m CONFIG_MSI_LAPTOP=m CONFIG_SONY_LAPTOP=m @@ -94,6 +105,7 @@ CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y +CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_COMPAQ=m @@ -101,13 +113,11 @@ CONFIG_HOTPLUG_PCI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_PCIE=m -# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set # SHPC has half-arsed PCI probing, which makes it load on too many systems CONFIG_HOTPLUG_PCI_SHPC=m CONFIG_HPET=y # CONFIG_HPET_MMAP is not set # CONFIG_HPET_RTC_IRQ is not set -CONFIG_HPET_EMULATE_RTC=y CONFIG_PM=y CONFIG_IEEE80211=m @@ -148,7 +158,6 @@ CONFIG_I2C_SIS96X=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m -CONFIG_I2C_ISA=m CONFIG_DELL_RBU=m CONFIG_DCDBAS=m @@ -165,7 +174,6 @@ CONFIG_EDAC_I82875P=m CONFIG_EDAC_I82860=m CONFIG_EDAC_I82975X=m -CONFIG_EDAC_K8=m CONFIG_EDAC_R82600=m CONFIG_SCHED_MC=y @@ -178,6 +186,8 @@ # CONFIG_HW_RANDOM_GEODE is not set +CONFIG_USB_HIDINPUT_POWERBOOK=y + CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_DEBUG_NMI_TIMEOUT=5 @@ -225,9 +235,26 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_GOV_LADDER is not set +CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_VIRTUALIZATION=y CONFIG_DMADEVICES=y CONFIG_INTEL_IOATDMA=m +CONFIG_SENSORS_I5K_AMB=m + +# CONFIG_X86_MCE is not set + +CONFIG_SPARSEMEM_VMEMMAP=y + +# CONFIG_PARAVIRT_GUEST is not set +# CONFIG_COMPAT_VDSO is not set +CONFIG_PROVIDE_OHCI1394_DMA_INIT=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_CPA_DEBUG is not set +CONFIG_CRYPTO_SALSA20_X86_64=m + +CONFIG_HP_WATCHDOG=m Index: config-xen-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-xen-generic 29 Oct 2007 17:29:06 -0000 1.2 +++ config-xen-generic 6 Mar 2008 13:59:25 -0000 1.3 @@ -1,72 +1,9 @@ - -CONFIG_XEN_PCIDEV_FRONTEND=y -# CONFIG_XEN_PCIDEV_FE_DEBUG is not set - - CONFIG_XEN=y -CONFIG_XEN_INTERFACE_VERSION=0x00030202 - -# -# XEN -# -CONFIG_XEN_PRIVILEGED_GUEST=y -# CONFIG_XEN_UNPRIVILEGED_GUEST is not set -CONFIG_XEN_PRIVCMD=y -CONFIG_XEN_XENBUS_DEV=y -CONFIG_XEN_BACKEND=y -CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_XEN_BLKDEV_TAP=m -CONFIG_XEN_NETDEV_BACKEND=m -# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set -CONFIG_XEN_NETDEV_LOOPBACK=m -CONFIG_XEN_PCIDEV_BACKEND=m -CONFIG_XEN_PCIDEV_BACKEND_VPCI=y -# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set -# CONFIG_XEN_PCIDEV_BE_DEBUG is not set -# CONFIG_XEN_TPMDEV_BACKEND is not set +CONFIG_XENCTRL=y +CONFIG_HVC_XEN=y CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_NETDEV_FRONTEND=m -CONFIG_XEN_FRAMEBUFFER=y -CONFIG_XEN_KEYBOARD=y -CONFIG_XEN_SCRUB_PAGES=y -# CONFIG_XEN_DISABLE_SERIAL is not set -CONFIG_XEN_SYSFS=y -CONFIG_XEN_COMPAT_030002_AND_LATER=y -# CONFIG_XEN_COMPAT_LATEST_ONLY is not set -CONFIG_XEN_COMPAT_030002=y -CONFIG_HAVE_ARCH_ALLOC_SKB=y -CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y -CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y -CONFIG_NO_IDLE_HZ=y -CONFIG_XEN_UTIL=y -CONFIG_XEN_BALLOON=y -CONFIG_XEN_DEVMEM=y -CONFIG_XEN_SKBUFF=y -CONFIG_XEN_REBOOT=y -CONFIG_XEN_SMPBOOT=y - -# Microcode needs sys_mlock & sys_munlock that are not exported -# it needs to be compiled in -# FIXME: This isn't going to work as of .19, due to firmware loader -# not being available that early in boot. This will cause long pauses during boot. -CONFIG_MICROCODE=y - -# TPM is not working, somebody have to merge the xen bits -# CONFIG_TCG_TPM is not set - -# frequency scaling really needs to be done in the hypervisor instead -# CONFIG_CPU_FREQ is not set - -# need to set the serial stuff up like this or serial console doesn't -# work quite right in dom0. ick. -CONFIG_SERIAL_8250=m -# CONFIG_SERIAL_8250_CONSOLE is not set - -# CONFIG_HZ_1000 is not set -CONFIG_HZ_250=y - -# xen and kvm conflict -# CONFIG_KVM is not set -# CONFIG_KVM_INTEL is not set -# CONFIG_KVM_AMD is not set +# We need this for console, so compile in +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_KBDDEV_FRONTEND=y Index: config-xen-ia64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-ia64,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-xen-ia64 29 Oct 2007 17:29:06 -0000 1.2 +++ config-xen-ia64 6 Mar 2008 13:59:25 -0000 1.3 @@ -1,25 +0,0 @@ -# CONFIG_IA64_GENERIC is not set -CONFIG_IA64_DIG=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM_MANUAL=y -CONFIG_FORCE_MAX_ZONEORDER=11 - -CONFIG_XEN=y -CONFIG_XEN_IA64_DOM0_VP=y -CONFIG_XEN_DISABLE_SERIAL=y -# CONFIG_XEN_PCIDEV_BACKEND is not set -# CONFIG_XEN_PCIDEV_BACKEND_VPCI is not set -# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set -# CONFIG_XEN_PCIDEV_BE_DEBUG is not set -# CONFIG_XEN_TPMDEV_BACKEND is not set - -# internal #defines conflict with xen-ia64 -# CONFIG_FB_NEOMAGIC is not set - -# don't work, missing symbols -# CONFIG_KEXEC is not set -# CONFIG_CRASH_DUMP is not set - -# Missing function not exported -# CONFIG_XEN_BLKDEV_TAP is not set Index: config-xen-x86 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-x86,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-xen-x86 29 Oct 2007 17:29:06 -0000 1.2 +++ config-xen-x86 6 Mar 2008 13:59:25 -0000 1.3 @@ -1,4 +0,0 @@ - -# CONFIG_X86_PC is not set -CONFIG_X86_XEN=y -# CONFIG_X86_GENERICARCH is not set Index: config-xen-x86_64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-x86_64,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-xen-x86_64 29 Oct 2007 17:29:06 -0000 1.2 +++ config-xen-x86_64 6 Mar 2008 13:59:25 -0000 1.3 @@ -1,8 +1,5 @@ -# things we want different from i686 xen - -CONFIG_X86_64=y - -# CONFIG_X86_XEN is not set -CONFIG_X86_64_XEN=y - -CONFIG_GENERIC_CPU=y +CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_GUEST=y +# CONFIG_SMP is not set +# CONFIG_NUMA is not set +# CONFIG_NEED_MULTIPLE_NODES is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kernel.spec 25 Feb 2008 00:37:30 -0000 1.13 +++ kernel.spec 6 Mar 2008 13:59:25 -0000 1.14 @@ -1,12 +1,9 @@ -# we are kernel-xen-2.6! -%define xen_package_magic 1 - Summary: The Linux kernel (the core of the Linux operating system) # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%define released_kernel 1 +%define released_kernel 0 # Versions of various parts @@ -19,33 +16,22 @@ # fedora_build defines which build revision of this kernel version we're # building. Rather than incrementing forever, as with the prior versioning -# setup, the trick below will allow us to use the automatic CVS Revision keyword -# expansion, without breaking release number ordering. -# -# CVS Revision 1.42 was after RPM Release 2925.14. We do some math to -# increase the Release number starting from 2926 +# setup, we set fedora_cvs_origin to the current cvs revision s/1.// of the +# kernel spec when the kernel is rebased, so fedora_build automatically +# works out to the offset from the rebase, so it doesn't get too ginormous. # -%define baserevision 42 -%define baserelease 2926 -%define fedora_build %(R="$Revision$"; \ - # be careful: '%%' becomes '%' below \ - R="${R%% \$}"; R="${R##: 1.}"; \ - # keep anything after the first dot, so this won't \ - # break horribily when using branches \ - # (e.g. 1.42.1.2.3.4 will become 1.2926.1.2.3.4) \ - r1="${R%%%%.*}";rest="${R#$r1}"; \ - # now, the math: \ - echo `expr '(' $r1 - %{baserevision} ')' + %{baserelease}`$rest) +%define fedora_cvs_origin 14 +%define fedora_build %(R="$Revision$"; R="${R%% \$}"; R="${R##: 1.}"; expr $R - %{fedora_cvs_origin}) # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base, # which yields a base_sublevel of 21. -%define base_sublevel 21 +%define base_sublevel 24 ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a 2.6.21.y update to apply? -%define stable_update 7 +%define stable_update 0 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -57,9 +43,9 @@ # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(expr %{base_sublevel} + 1) # The rc snapshot level -%define rcrev 0 +%define rcrev 4 # The git snapshot level -%define gitrev 17 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -92,6 +78,8 @@ %define with_headers %{?_without_headers: 0} %{?!_without_headers: 1} # kernel-debuginfo %define with_debuginfo %{?_without_debuginfo: 0} %{!?_without_debuginfo: 1} +# kernel-bootwrapper (for creating zImages from kernel + initrd) +%define with_bootwrapper %{?_without_bootwrapper: 0} %{!?_without_bootwrapper: 1} # Additional options for user-friendly one-off kernel building: # @@ -104,55 +92,15 @@ # Only build the xen kernel (--with xenonly): %define with_xenonly %{?_with_xenonly: 1} %{?!_with_xenonly: 0} -# Whether or not to do C=1 builds with sparse -%define usesparse 0 -%if "%fedora" >= "7" -%define usesparse 1 -%endif - -# defaults for the non-xen package: - -# don't include xen patches -%define includexen 0 - -# don't build xen variant -%define with_xen 0 - -# Install vdso files -%define do_vdso_install 1 - +# should we do C=1 builds with sparse +%define with_sparse %{?_with_sparse: 1} %{?!_with_sparse: 0} -# Magic that will be enabled for the kernel-xen-2.6 Fedora package: -%if 0%{?xen_package_magic} - -# Include the Xen patches +# Whether or not to apply the Xen patches -- leave this enabled %define includexen 1 - -# Enable the xen variant -%define with_xen 1 - -# No vdso files -%define do_vdso_install 0 - -# Disable all other variants +# Disable non-xen sub-packages under kernel-xen-2.6 %define with_xenonly 1 - -# No kernel-headers %define with_headers 0 - -# We don't build the .config files dynamically, currently -%define preconfigured 1 - -# The main package is called kernel-xen-2.6 -%define variant -xen-2.6 - -# However the -xen variant will be called kernel-xen -%define variantbase kernel - -%endif # (xen_package_magic) - - # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. @@ -178,9 +126,9 @@ %define pkg_release 0.%{fedora_build}%{?rctag}%{?gittag}%{?buildid}%{?dist} %endif -%define mainpkgname kernel%{?variant} +%define mainpkgname kernel-xen-2.6 %if !0%{?variantbase:1} -%define variantbase %{mainpkgname} +%define variantbase kernel %endif # The kernel tarball/base version @@ -192,7 +140,7 @@ %define xen_hv_dirname xen-%{xen_hv_version} %define xen_flags verbose=y crash_debug=y %define xen_target vmlinuz -%define xen_image vmlinuz +%define xen_image arch/x86/boot/vmlinuz %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} %define hdrarch %_target_cpu @@ -208,6 +156,7 @@ %if %{nopatches} %define includexen 0 %define with_xen 0 +%define with_bootwrapper 0 %define variant -vanilla %else %define variant_fedora -fedora @@ -215,9 +164,10 @@ %define using_upstream_branch 0 %if 0%{?upstream_branch:1} +%define stable_update 0 %define using_upstream_branch 1 %define variant -%{upstream_branch}%{?variant_fedora} -%define pkg_release %{upstream_branch_release}.%{pkg_release} +%define pkg_release 0.%{fedora_build}%{upstream_branch_tag}%{?buildid}%{?dist} %endif %if !%{debugbuildsenabled} @@ -282,8 +232,8 @@ %define with_pae 0 %endif -# xen only builds on i686, x86_64 and ia64 -%ifnarch i686 x86_64 ia64 +# xen only builds on i686 and x86_64 +%ifnarch i686 x86_64 %define with_xen 0 %endif @@ -304,8 +254,8 @@ %endif # no need to build headers again for these arches, -# they can just use i386 and ppc64 and sparc headers -%ifarch i586 i686 ppc64iseries sparc64 +# they can just use i386 and ppc64 headers +%ifarch i586 i686 ppc64iseries %define with_headers 0 %endif @@ -316,9 +266,14 @@ %define all_arch_configs kernel-%{version}-*.config %endif -# sparse blows up on ppc64 +# bootwrapper is only on ppc +%ifnarch ppc ppc64 +%define with_bootwrapper 0 +%endif + +# sparse blows up on ppc64 alpha and sparc64 %ifarch ppc64 ppc alpha sparc64 -%define usesparse 0 +%define with_sparse 0 %endif # Per-arch tweaks @@ -356,8 +311,7 @@ %endif %ifarch sparc -# Yes, this is a hack. We want both sets of headers in the sparc.rpm -%define hdrarch sparc64 +# We only build sparc headers since we dont support sparc32 hardware %endif %ifarch sparc64 @@ -396,7 +350,7 @@ %if %{nopatches} # XXX temporary until last vdso patches are upstream -%define vdso_arches %{nil} +%define vdso_arches ppc ppc64 %endif %if %{nopatches}%{using_upstream_branch} @@ -468,7 +422,7 @@ # Packages that need to be installed before the kernel is, because the %post # scripts use them. # -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.9-7 +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.30-1 # # This macro does requires, provides, conflicts, obsoletes for a kernel package. @@ -500,11 +454,8 @@ URL: http://www.kernel.org/ Version: %{rpmversion} Release: %{pkg_release} -# non-xen kernel says: -# > DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. -# > SET %%nobuildarches (ABOVE) INSTEAD -# However kernel-xen-2.6 can ignore this warning because it is not responsible -# for generating the kernel-headers packages. +# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. +# SET %%nobuildarches (ABOVE) INSTEAD ExclusiveArch: noarch i686 x86_64 ExclusiveOS: Linux @@ -520,8 +471,8 @@ BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config -%if %{usesparse} -BuildRequires: sparse >= 0.3 +%if %{with_sparse} +BuildRequires: sparse >= 0.4.1 %endif BuildConflicts: rhbuildsys(DiskFree) < 500Mb @@ -583,12 +534,6 @@ Source91: config-sparc64 Source92: config-sparc64-smp -Source100: kernel-%{version}-i686-xen.config -Source101: kernel-%{version}-x86_64-xen.config - -%if %{using_upstream_branch} -### BRANCH PATCH ### -%else # Here should be only the patches up to the upstream canonical Linus tree. # For a stable release kernel @@ -612,341 +557,137 @@ %endif %endif +%if %{using_upstream_branch} +### BRANCH PATCH ### %endif -%if !%{nopatches} - -# compile fix with latest glibc -Patch1: linux-2.6-sumversion-limits-dot-h.patch -# gcc 4.3 mis-compile on x86_64 -Patch2: linux-2.6-remove-unnecessary-cast-in-prefetch.patch - -# Patches 10 through 99 are for things that are going upstream really soon. -Patch11: nouveau-drm.patch - -Patch12: linux-2.6-fix-pmops-1.patch -Patch13: linux-2.6-fix-pmops-2.patch -Patch14: linux-2.6-fix-pmops-3.patch -Patch15: linux-2.6-fix-pmops-4.patch +# stable release candidate +# Patch03: patch-2.6.24.1-rc1.bz2 -# DRM bits for 965 -Patch17: linux-2.6-i965gm-support.patch +# we always need nonintconfig, even for -vanilla kernels +Patch06: linux-2.6-build-nonintconfig.patch -# enable sysrq-c on all kernels, not only kexec -Patch20: linux-2.6-sysrq-c.patch +%if !%{nopatches} -# utrace -Patch30: linux-2.6-utrace-sig_kernel-macros.patch -Patch31: linux-2.6-utrace-recalc_sigpending_and_wake.patch -Patch32: linux-2.6-utrace-tracehook.patch -Patch33: linux-2.6-utrace-tracehook-ia64.patch -Patch34: linux-2.6-utrace-tracehook-sparc64.patch -Patch35: linux-2.6-utrace-tracehook-s390.patch -Patch36: linux-2.6-utrace-tracehook-um.patch -Patch37: linux-2.6-utrace-regset.patch -Patch38: linux-2.6-utrace-regset-ia64.patch -Patch39: linux-2.6-utrace-regset-sparc64.patch -Patch40: linux-2.6-utrace-regset-s390.patch -Patch41: linux-2.6-utrace-core.patch -Patch42: linux-2.6-utrace-ptrace-compat.patch -Patch43: linux-2.6-utrace-ptrace-compat-ia64.patch -Patch44: linux-2.6-utrace-ptrace-compat-sparc64.patch -Patch45: linux-2.6-utrace-ptrace-compat-s390.patch - -#xen bits of utrace patches: -Patch52: linux-2.6-utrace-tracehook-xen.patch -Patch62: linux-2.6-utrace-ptrace-compat-xen.patch - - -# build-id stuff (http://fedoraproject.org/wiki/Releases/FeatureBuildId) -Patch70: linux-2.6-use-build-id-ld-option.patch - -# Patches 100 through 500 are meant for architecture patches - -# 200 - 299 x86(-64) - -Patch200: linux-2.6-x86-tune-generic.patch -Patch201: linux-2.6-x86-vga-vidfail.patch -Patch202: linux-2.6-x86-64-edac-support.patch -Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch -Patch204: linux-2.6-x86_64-silence-up-apic-errors-xen.patch -Patch205: linux-2.6-x86-dont-delete-cpu_devs-data.patch -Patch206: linux-2.6-x86-fsc-interrupt-controller-quirk.patch -Patch207: linux-2.6-x86-dell-hpet.patch -Patch209: linux-2.6-x86-64_pmtrace.patch - - -# 300 - 399 ppc(64) -Patch300: linux-2.6-g5-therm-shutdown.patch -Patch301: linux-2.6-powerpc-slabalign.patch -Patch302: linux-2.6-ppc-data-exception.patch -Patch303: linux-2.6-ppc32-ucmpdi2.patch -Patch304: linux-2.6-ibmvscsi-schizo.patch -Patch305: linux-2.6-pmac-zilog.patch -Patch306: linux-2.6-powerpc-reserve-initrd-1.patch -Patch307: linux-2.6-powerpc-reserve-initrd-2.patch -Patch308: linux-2.6-cell-spu-device-tree.patch -Patch309: linux-2.6-cell-spufs-fixes.patch - -Patch310: linux-2.6-common-uevent.patch -Patch311: linux-2.6-uevent-macio.patch -Patch312: linux-2.6-uevent-of_platform.patch -Patch313: linux-2.6-uevent-ebus.patch - -Patch330: linux-2.6-powermac-generic-suspend-1.patch -Patch331: linux-2.6-powermac-generic-suspend-2.patch -Patch332: linux-2.6-powermac-generic-suspend-3.patch -Patch333: linux-2.6-powermac-generic-suspend-4.patch - -Patch340: linux-2.6-mpc52xx-sdma.patch -Patch341: linux-2.6-mpc52xx-fec.patch - -# Patches from ps3-linux-patches.git (2007-05-04) -Patch350: linux-2.6-ps3-stable-patches.patch -Patch351: linux-2.6-ps3-smp-boot.patch -Patch352: linux-2.6-ps3-system-bus-rework.patch -Patch353: linux-2.6-ps3-kexec.patch -Patch354: linux-2.6-ps3-gelic.patch -Patch355: linux-2.6-ps3-gelic-wireless.patch -Patch356: linux-2.6-ps3-ehci-iso.patch -Patch357: linux-2.6-ps3-clear-spu-irq.patch -Patch358: linux-2.6-ps3-wrap-spu-runctl.patch -# Ignore the SPE logo bits. Cute, but not exactly necessary -Patch359: linux-2.6-ps3-storage.patch -Patch360: linux-2.6-ps3-sound.patch -Patch361: linux-2.6-ps3-device-init.patch -Patch362: linux-2.6-ps3-system-bus-rework-2.patch - -# And then some minor tweaks... -Patch370: linux-2.6-ps3-memory-probe.patch -Patch371: linux-2.6-ps3-legacy-ioport.patch -Patch372: linux-2.6-ps3fb-panic.patch -Patch373: linux-2.6-ps3-ethernet-modular.patch -Patch374: linux-2.6-ps3-sound-autoload.patch -Patch375: linux-2.6-ps3-ethernet-autoload.patch -Patch376: linux-2.6-ps3av-export-header.patch -Patch377: linux-2.6-ps3-usb-autoload.patch - - - -# 400 - 499 ia64 - -# 500 - 599 s390(x) - -# 600 - 699 sparc(64) - -# -# Patches 800 through 899 are reserved for bugfixes to the core system -# and patches related to how RPMs are build -# -Patch800: linux-2.6-build-nonintconfig.patch - -# Exec-shield. -Patch810: linux-2.6-execshield.patch -Patch811: linux-2.6-execshield-xen.patch - -# Module signing infrastructure. -Patch900: linux-2.6-modsign-mpilib.patch -Patch901: linux-2.6-modsign-crypto.patch -Patch902: linux-2.6-modsign-include.patch -Patch903: linux-2.6-modsign-verify.patch -Patch904: linux-2.6-modsign-ksign.patch -Patch905: linux-2.6-modsign-core.patch -Patch906: linux-2.6-modsign-script.patch - -# 950 - 999 Xen -# linux-2.6.21.7-xen-3.1.0.patch patch generated by -# 'hg diff -rd91e11100fb0 -rd610071e6045 -X .hgtags' on -# http://hg.et.redhat.com/kernel-dev/ehabkost/linux-2.6.21.y-xen-3.1.0 -Patch950: linux-2.6.21.7-xen-3.1.0.patch.bz2 -Patch960: linux-2.6-xen-blkfront-wait-add.patch -Patch961: linux-2.6-xen-backwards-time.patch -Patch962: linux-2.6-xen-irq_vector-uninitialize.patch - -# Fix sleazy-FPU implementation -Patch963: linux-2.6-xen-sleazy-fpu-i386.patch -Patch964: linux-2.6-xen-sleazy-fpu-x86_64.patch - -# Fix VM_PFNMAP BUG_ON() -Patch965: linux-2.6-xen-privcmd-use-nopfn.patch - -# Remove bogus WARN_ON() from synchronize_irq() (bug #293451) -Patch966: linux-2.6-xen-fix-irq-warn-mismerge.patch - -# virt-install --nographics --paravirt fix (bug #348931) -Patch967: linux-2.6-xen-paravirt-nographics-pvfb-fix.patch - -# -# Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems -# - -Patch1010: linux-2.6-debug-sizeof-structs.patch -Patch1011: linux-2.6-debug-slab-backtrace.patch -Patch1012: linux-2.6-debug-nmi-timeout.patch -Patch1013: linux-2.6-debug-taint-vm.patch -Patch1015: linux-2.6-debug-spinlock-taint.patch -Patch1016: linux-2.6-debug-extra-warnings.patch -Patch1019: linux-2.6-debug-must_check.patch -Patch1020: linux-2.6-debug-no-quiet.patch -Patch1021: linux-2.6-debug-boot-delay.patch -Patch1022: linux-2.6-debug-sysfs-crash-debugging.patch -Patch1023: linux-2.6-debug-sysfs-crash-debugging-xen.patch - -# Restrict /dev/mem usage. -Patch1050: linux-2.6-devmem.patch -Patch1051: linux-2.6-devmem-xen.patch - -# Provide read only /dev/crash driver. -Patch1060: linux-2.6-crash-driver.patch -Patch1061: linux-2.6-crash-driver-xen.patch - -# SCSI bits. -Patch1100: linux-2.6-scsi-bounce-isa.patch -Patch1106: linux-2.6-scsi-cpqarray-set-master.patch -Patch1107: linux-2.6-3w-9xxx-mem_len.patch - -# NIC driver fixes -Patch1300: linux-2.6-net-e1000-no-msi-warning.patch - -# e1000e backport -Patch1350: linux-2.6-netdev-e1000e-01.patch -Patch1351: linux-2.6-netdev-e1000e-02.patch -Patch1352: linux-2.6-netdev-e1000e-03.patch -Patch1353: linux-2.6-netdev-e1000e-04.patch -Patch1354: linux-2.6-netdev-e1000e-05.patch -Patch1355: linux-2.6-netdev-e1000e-06.patch -Patch1356: linux-2.6-netdev-e1000e-07.patch -Patch1357: linux-2.6-netdev-e1000e-08.patch -Patch1358: linux-2.6-netdev-e1000e-09.patch -Patch1359: linux-2.6-netdev-e1000e-10.patch -Patch1360: linux-2.6-netdev-e1000e-backport.patch +Patch10: linux-2.6-hotfixes.patch -# Filesystem stuff. -# Squashfs -Patch1400: linux-2.6-squashfs.patch -# GFS2 -Patch1410: linux-2.6-gfs2-update.patch - - -# Networking core. -Patch1500: linux-2.6-net-silence-noisy-printks.patch - -# Misc bits. -Patch1600: linux-2.6-module_version.patch -Patch1601: linux-2.6-sha_alignment.patch -Patch1610: linux-2.6-input-kill-stupid-messages.patch -Patch1620: linux-2.6-ondemand-timer.patch -Patch1630: linux-2.6-kvm-19.patch -Patch1631: linux-2.6-amd-disabled-svm-detect.patch -Patch1632: linux-2.6-amd-disabled-svm-detect-msr-1.patch -Patch1633: linux-2.6-kvm-reinit-real-mode-tss.patch -Patch1650: linux-2.6-serial-460800.patch -Patch1660: linux-2.6-mm-udf-fixes.patch -Patch1661: linux-2.6-udf-2.6.22-rc2-1-udf_data_corruption.patch -Patch1662: linux-2.6-udf-2.6.22-rc4-1-udf_block_leak.patch -Patch1670: linux-2.6-sysfs-inode-allocator-oops.patch -# checksum fixes (bug #223258) -Patch1665: linux-2.6-disable-netback-checksum.patch - -Patch1690: linux-2.6-PT_LOAD-align.patch -Patch1700: linux-2.6-dvb-spinlock.patch -Patch1710: linux-2.6-nfs-noreaddirplus.patch -Patch1711: linux-2.6-nfs-missing-braces.patch -Patch1720: linux-2.6-proc-self-maps-fix.patch -Patch1730: linux-2.6-suspend-ordering.patch -Patch1740: linux-2.6-softlockup-disable.patch -Patch1770: linux-2.6-optimise-spinlock-debug.patch -Patch1771: linux-2.6-silence-noise.patch -Patch1781: linux-2.6-softirq-printout-irq-trace-events.patch -Patch1791: linux-2.6-libertas.diff -Patch1792: linux-2.6-olpc-touchpad.diff -Patch1793: linux-2.6-raid-autorun.patch -Patch1794: linux-2.6-i82875-edac-pci-setup.patch -Patch1795: linux-2.6-crap-sysfs-workaround.patch -Patch1796: linux-2.6-oprofile-0.9.3.patch - -# SELinux/audit patches. -Patch1801: linux-2.6-selinux-mprotect-checks.patch - -# no external module should use these symbols. -Patch1910: linux-2.6-unexport-symbols.patch - -# VM bits. -Patch2000: linux-2.6-vm-invalidate_mapping_pages-cond-resched.patch -Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch - -# Tweak some defaults. -Patch2100: linux-2.6-defaults-fat-utf8.patch -Patch2103: linux-2.6-defaults-unicode-vt.patch -Patch2105: linux-2.6-defaults-nonmi.patch -Patch2106: linux-2.6-defaults-pci_no_msi_mmconf.patch -Patch2107: linux-2.6-usb-autosuspend-default-disable.patch - -# SATA Bits -Patch2201: linux-2.6-libata-hpa.patch -Patch2202: linux-2.6-libata-sata_nv-adma.patch -Patch2203: linux-2.6-libata-ali-atapi-dma.patch -Patch2204: linux-2.6-ata-quirk.patch -Patch2206: linux-2.6-libata-sata_nv-wildcard-removal.patch -Patch2207: linux-2.6-libata-pata-pcmcia-new-ident.patch -Patch2208: linux-2.6-libata-atiixp-ids.patch -Patch2209: linux-2.6-libata-pata-hpt3x2n-correct-revision-boundary.patch -Patch2210: linux-2.6-libata-pata-sis-fix-timing.patch -Patch2211: linux-2.6-libata-setxfer.patch -Patch2212: linux-2.6-libata_ali_max_dma_speed.patch -Patch2213: linux-2.6-ata-use-pio-for-non-16-byte-xfers.patch -Patch2214: linux-2.6-ata-call-check-dma-with-qc-prepared.patch -Patch2215: linux-2.6-libata-ich8m-add-pciid.patch -Patch2216: linux-2.6-libata-pata_dma-param.patch -Patch2217: linux-2.6-libata-ncq-blacklist-2.6.22-rc7.patch -Patch2218: linux-2.6-libata-pata_it821x-partly-fix-dma.patch - -# ATA spindown -Patch2220: linux-2.6-2110_scsi-sd-printing.patch -Patch2221: linux-2.6-2111_sd-start-stop.patch -Patch2222: linux-2.6-2112_libata-suspend.patch -Patch2223: linux-2.6-2113_libata-spindown-compat.patch -Patch2224: linux-2.6-2114_libata-shutdown-warning.patch -Patch2225: linux-2.6-2115_libata-spindown-status.patch -Patch2226: linux-2.6-2116_libata-remove-spindown-compat.patch -Patch2227: linux-2.6-2117_sata-via-suspend.patch -Patch2228: linux-2.6-2118_scsi-constants.patch - -# Wireless bits -Patch2300: linux-2.6-wireless.patch -Patch2301: git-wireless-dev.patch -Patch2302: linux-2.6-bcm43xx-pci-neuter.patch - -# Assorted dyntick/clock/timer fixes. -Patch2402: linux-2.6-acpi-keep-tsc-stable-when-lapic-timer-c2-ok-is-set.patch -Patch2403: linux-2.6-clockevents-fix-resume-logic.patch - -# ACPI bits -Patch2500: linux-2.6-acpi-unblacklist-dell-gx240.patch -Patch2501: linux-2.6-acpi-dock-oops.patch -Patch2502: linux-2.6-acpi-boot-regression.patch -Patch2503: linux-2.6-acpi-preserve-ebx-in-acpi_copy_wakeup_routine.patch - -# Excessive wakeups. -Patch2600: linux-2.6-wakeups-hdaps.patch - -Patch3000: linux-2.6-acpi-config_pm-poweroff.patch - -# Add the new firewire stack. Diff between the v2.6.20 tag and commit -# 5468ee91741092a711327628c7c524a4d4d0cd6a in the linux1394 git tree. -Patch5000: linux-2.6-firewire.patch -Patch5001: linux-2.6-firewire-be32-fix.patch - -# Security: - -# CVE-2008-0600 (bug #432517) -Patch6000: linux-2.6-cve-2008-0600.patch - -# -# 10000 to 20000 is for stuff that has to come last due to the -# amount of drivers they touch. But only these should go here. -# Not patches you're too lazy for to put in the proper place. -# +Patch21: linux-2.6-utrace-tracehook.patch +Patch22: linux-2.6-utrace-tracehook-ia64.patch +Patch23: linux-2.6-utrace-tracehook-sparc64.patch +Patch24: linux-2.6-utrace-tracehook-s390.patch +Patch25: linux-2.6-utrace-tracehook-um.patch +Patch26: linux-2.6-utrace-tracehook-avr32.patch +Patch27: linux-2.6-utrace-regset.patch +Patch28: linux-2.6-utrace-regset-ia64.patch +Patch29: linux-2.6-utrace-regset-sparc64.patch +Patch30: linux-2.6-utrace-regset-s390.patch +Patch31: linux-2.6-utrace-regset-avr32.patch +Patch32: linux-2.6-utrace-core.patch +Patch33: linux-2.6-utrace-ptrace-compat.patch +Patch34: linux-2.6-utrace-ptrace-compat-ia64.patch +Patch35: linux-2.6-utrace-ptrace-compat-sparc64.patch +Patch36: linux-2.6-utrace-ptrace-compat-s390.patch +Patch37: linux-2.6-utrace-ptrace-compat-avr32.patch + +Patch41: linux-2.6-sysrq-c.patch +Patch42: linux-2.6-x86-tune-generic.patch +Patch75: linux-2.6-x86-debug-boot.patch + +Patch80: linux-2.6-ia32-syscall-restart.patch + +Patch123: linux-2.6-ppc-rtc.patch +Patch140: linux-2.6-ps3-ehci-iso.patch +Patch141: linux-2.6-ps3-storage-alias.patch +Patch142: linux-2.6-ps3-legacy-bootloader-hack.patch +Patch143: linux-2.6-g5-therm-shutdown.patch +Patch144: linux-2.6-vio-modalias.patch + +Patch160: linux-2.6-execshield.patch +Patch250: linux-2.6-debug-sizeof-structs.patch +Patch260: linux-2.6-debug-nmi-timeout.patch +Patch270: linux-2.6-debug-taint-vm.patch +Patch280: linux-2.6-debug-spinlock-taint.patch +Patch330: linux-2.6-debug-no-quiet.patch +Patch350: linux-2.6-devmem.patch +Patch370: linux-2.6-crash-driver.patch +Patch400: linux-2.6-scsi-cpqarray-set-master.patch +Patch402: linux-2.6-scsi-mpt-vmware-fix.patch +Patch420: linux-2.6-squashfs.patch +Patch430: linux-2.6-net-silence-noisy-printks.patch +Patch450: linux-2.6-input-kill-stupid-messages.patch +Patch460: linux-2.6-serial-460800.patch +Patch510: linux-2.6-silence-noise.patch +Patch570: linux-2.6-selinux-mprotect-checks.patch +Patch610: linux-2.6-defaults-fat-utf8.patch +Patch660: linux-2.6-libata-ali-atapi-dma.patch +Patch670: linux-2.6-ata-quirk.patch + +Patch680: linux-2.6-wireless.patch +Patch681: linux-2.6-wireless-pending.patch +Patch682: linux-2.6-wireless-pending-too.patch +Patch690: linux-2.6-at76.patch + +Patch820: linux-2.6-compile-fixes.patch +Patch821: linux-2.6-compile-fix-gcc-43.patch +Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch +Patch1400: linux-2.6-smarter-relatime.patch +Patch1515: linux-2.6-lirc.patch + +# nouveau + drm fixes +Patch1801: linux-2.6-drm-git-mm.patch +Patch1802: linux-2.6-ppc32-ucmpdi2.patch +Patch1803: nouveau-drm.patch +Patch1804: linux-2.6-drm-git-mm-revert-nopfn.patch +Patch1805: linux-2.6-drm-git-i915-remove-priv-access.patch + +# kludge to make ich9 e1000 work +Patch2000: linux-2.6-e1000-ich9.patch + +# atl2 network driver +Patch2020: linux-2.6-netdev-atl2.patch + +# ext4 patches +Patch2100: linux-2.6-ext4-stable-queue.patch + +# linux1394 git patches +Patch2200: linux-2.6-firewire-git-update.patch +Patch2201: linux-2.6-firewire-git-pending.patch + +# make USB EHCI driver respect "nousb" parameter +Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch + +# acpi hotkey driver for asus eeepc +Patch2350: linux-2.6-acpi-eeepc-hotkey.patch + +# usb video +Patch2400: linux-2.6-uvcvideo.patch + +Patch2501: linux-2.6-ppc-use-libgcc.patch + +Patch2503: linux-2.6-virtio_blk-fix-sysfs-bits.patch + +### HACK ### +Patch2502: linux-2.6-blkcipher-depend-on-chainiv.patch + +# kernel-xen patches start +Patch5000: linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch +Patch5001: linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch +Patch5002: linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch +Patch5003: linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch +Patch5004: linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch +Patch5005: linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch +Patch5006: linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch +Patch5007: linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch +Patch5008: linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch +Patch5009: linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch +Patch5010: linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch +Patch5011: linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch +Patch5012: linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch +Patch5013: linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch +Patch5014: linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch +Patch5015: linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch +Patch5016: linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch +# kernel-xen patches end # Xen hypervisor patches (20000+) Patch20000: xen-compile-fix.patch @@ -959,9 +700,6 @@ # Include build-id notes on xen-syms Patch20005: xen-syms-build-id.patch - - - %endif BuildRoot: %{_tmppath}/%{mainpkgname}-%{KVERREL}-root-%{_target_cpu} @@ -997,6 +735,12 @@ building most standard programs and are also needed for rebuilding the glibc package. +%package bootwrapper +Summary: Boot wrapper files for generating combined kernel + initrd images +Group: Development/System +%description bootwrapper +Kernel-bootwrapper contains the wrapper code which makes bootable "zImage" +files combining both kernel and initial ramdisk. %package -n %{mainpkgname}-debuginfo-common Summary: Kernel source files used by %{mainpkgname}-debuginfo packages @@ -1021,7 +765,7 @@ %description -n %{variantbase}%{?1:-%{1}}-debuginfo\ This package provides debug information for package %{variantbase}%{?1:-%{1}}.\ This is required to use SystemTap with %{variantbase}%{?1:-%{1}}-%{KVERREL}.\ -%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}' -o debuginfo%{?1}.list}\ +%{?1:%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}(\.debug)?' -o debuginfo%{?1}.list}}\ %{nil} # @@ -1084,8 +828,9 @@ %define variant_summary The Linux kernel compiled with extra debugging enabled for PAE capable machines -%kernel_variant_package PAE-debug -%description -n %{variantbase}-PAE-debug +%kernel_variant_package PAEdebug +Obsoletes: %{variantbase}-PAEdebug +%description -n %{variantbase}-PAEdebug This package includes a version of the Linux kernel with support for up to 64GB of high memory. It requires a CPU with Physical Address Extensions (PAE). The non-PAE kernel can only address up to 4GB of memory. @@ -1126,6 +871,7 @@ %prep # do a few sanity-checks for --with *only builds +%if !%{with_doc} %if %{with_baseonly} %if !%{with_up} echo "Cannot build --with baseonly, up build is disabled" @@ -1147,6 +893,14 @@ %endif %endif +%if %{with_xenonly} +%if !%{with_xen} +echo "Cannot build --with xenonly, xen build is disabled" +exit 1 +%endif +%endif +%endif + # If the package has a variantbase set, the up (no variant suffix) packages would # be inconsistent (sometimes using %%{mainpkgname}, other using %%{variantbase}) # @@ -1161,17 +915,75 @@ exit 1 %endif - - +patch_command='patch -p1 -F1 -s' +ApplyPatch() +{ + local patch=$1 + shift + if [ ! -f $RPM_SOURCE_DIR/$patch ]; then + exit 1; + fi + case "$patch" in + *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;; + *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;; + *) $patch_command ${1+"$@"} < "$RPM_SOURCE_DIR/$patch" ;; + esac +} # First we unpack the kernel tarball. # If this isn't the first make prep, we use links to the existing clean tarball # which speeds things up quite a bit. -if [ ! -d kernel-%{kversion}/vanilla ]; then + +# Update to latest upstream. +%if 0%{?released_kernel} +%define vanillaversion 2.6.%{base_sublevel} +# released_kernel with stable_update available case +%if 0%{?stable_update} +%define vanillaversion 2.6.%{base_sublevel}.%{stable_update} +%endif +# non-released_kernel case +%else +%if 0%{?rcrev} +%define vanillaversion 2.6.%{upstream_sublevel}-rc%{rcrev} +%if 0%{?gitrev} +%define vanillaversion 2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev} +%endif +%else +# pre-{base_sublevel+1}-rc1 case +%if 0%{?gitrev} +%define vanillaversion 2.6.%{base_sublevel}-git%{gitrev} +%endif +%endif +%endif + +if [ ! -d kernel-%{kversion}/vanilla-%{vanillaversion} ]; then # Ok, first time we do a make prep. rm -f pax_global_header %setup -q -n kernel-%{kversion} -c - mv linux-%{kversion} vanilla + mv linux-%{kversion} vanilla-%{vanillaversion} + cd vanilla-%{vanillaversion} + +# Update vanilla to the latest upstream. +# released_kernel with stable_update available case +%if 0%{?stable_update} +ApplyPatch patch-2.6.%{base_sublevel}.%{stable_update}.bz2 +# non-released_kernel case +%else +%if 0%{?rcrev} +ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2 +%if 0%{?gitrev} +ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2 +%endif +%else +# pre-{base_sublevel+1}-rc1 case +%if 0%{?gitrev} +ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2 +%endif +%endif +%endif + + cd .. + else # We already have a vanilla dir. cd kernel-%{kversion} @@ -1184,22 +996,20 @@ fi fi -cp -rl vanilla linux-%{kversion}.%{_target_cpu} +cp -rl vanilla-%{vanillaversion} linux-%{kversion}.%{_target_cpu} cd linux-%{kversion}.%{_target_cpu} -%if 0%{?preconfigured} - # The .config files were already generated - cp $RPM_SOURCE_DIR/kernel-%{kversion}*.config . -%else - # Drop some necessary files from the source dir into the buildroot - cp $RPM_SOURCE_DIR/config-* . - cp %{SOURCE15} . - - # Dynamically generate kernel .config files from config-* files - make -f %{SOURCE20} VERSION=%{version} configs +%if %{using_upstream_branch} +### BRANCH APPLY ### %endif +# Drop some necessary files from the source dir into the buildroot +cp $RPM_SOURCE_DIR/config-* . +cp %{SOURCE15} . + +# Dynamically generate kernel .config files from config-* files +make -f %{SOURCE20} VERSION=%{version} configs #if a rhel kernel, apply the rhel config options %if 0%{?rhel} @@ -1218,538 +1028,245 @@ done %endif -patch_command='patch -p1 -F1 -s' -ApplyPatch() -{ - local patch=$1 - shift - if [ ! -f $RPM_SOURCE_DIR/$patch ]; then - exit 1; - fi - case "$patch" in - *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;; - *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;; - *) $patch_command ${1+"$@"} < "$RPM_SOURCE_DIR/$patch" ;; - esac -} - -%if %{using_upstream_branch} -### BRANCH APPLY ### -%else - -# Update to latest upstream. -# released_kernel with stable_update available case -%if 0%{?stable_update} -ApplyPatch patch-2.6.%{base_sublevel}.%{stable_update}.bz2 - -# non-released_kernel case -%else -%if 0%{?rcrev} -ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2 -%if 0%{?gitrev} -ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2 -%endif -%else -# pre-{base_sublevel+1}-rc1 case -%if 0%{?gitrev} -ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2 -%endif -%endif -%endif - -%endif +# stable release candidate +# ApplyPatch patch-2.6.24.1-rc1.bz2 +# This patch adds a "make nonint_oldconfig" which is non-interactive and +# also gives a list of missing options at the end. Useful for automated +# builds (as used in the buildsystem). +ApplyPatch linux-2.6-build-nonintconfig.patch %if !%{nopatches} -# -# Xen -# -%if %{includexen} -# -# Apply the main xen patch... -#%patch951 -p1 -%patch950 -p1 -b .p.xen -# -# ... and back out all the tpm additions, they need fixing -# -for f in `find drivers/char/tpm -type f -name "*.p.xen"` ; do \ - g=`dirname $f`/`basename $f .p.xen`; \ - mv "$f" "$g"; \ - if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \ -done -# Delete the rest of the backup files, they just confuse the build later -find -name "*.p.xen" | xargs rm -f - -# Xen utrace -%patch960 -p1 -%patch961 -p1 -%patch962 -p1 -%patch963 -p1 -%patch964 -p1 -%patch965 -p1 -%patch966 -p1 -%patch967 -p1 -%endif - - -# compile fix -%patch1 -p1 -%patch2 -p1 - -# Patches 10 through 100 are meant for core subsystem upgrades -%patch11 -p1 - -# Power management fixes -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 - -# DRM support for 965GM -%patch17 -p1 - -# sysrq works always -%patch20 -p1 +ApplyPatch linux-2.6-hotfixes.patch # Roland's utrace ptrace replacement. -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 - -%if %{includexen} -#xen bits of utrace -%patch52 -p1 -%patch62 -p1 -%endif +# Main patch includes i386, x86_64, powerpc. +#ApplyPatch linux-2.6-utrace-tracehook.patch +# Additional arch work by other contributors. +#ApplyPatch linux-2.6-utrace-tracehook-ia64.patch +#ApplyPatch linux-2.6-utrace-tracehook-sparc64.patch +#ApplyPatch linux-2.6-utrace-tracehook-s390.patch +#ApplyPatch linux-2.6-utrace-tracehook-um.patch +#ApplyPatch linux-2.6-utrace-tracehook-avr32.patch +# Main patch includes i386, x86_64, powerpc. +#ApplyPatch linux-2.6-utrace-regset.patch +# Additional arch work by other contributors. +#ApplyPatch linux-2.6-utrace-regset-ia64.patch +#ApplyPatch linux-2.6-utrace-regset-sparc64.patch +#ApplyPatch linux-2.6-utrace-regset-s390.patch +#ApplyPatch linux-2.6-utrace-regset-avr32.patch +# Core patch has no machine dependencies. +#ApplyPatch linux-2.6-utrace-core.patch +# Main patch includes i386, x86_64, powerpc. +#ApplyPatch linux-2.6-utrace-ptrace-compat.patch +# Additional arch work by other contributors. +#ApplyPatch linux-2.6-utrace-ptrace-compat-ia64.patch +#ApplyPatch linux-2.6-utrace-ptrace-compat-sparc64.patch +#ApplyPatch linux-2.6-utrace-ptrace-compat-s390.patch +#ApplyPatch linux-2.6-utrace-ptrace-compat-avr32.patch -# Use --build-id option -%patch70 -p1 +# enable sysrq-c on all kernels, not only kexec +ApplyPatch linux-2.6-sysrq-c.patch # Architecture patches - -# # x86(-64) -# # Compile 686 kernels tuned for Pentium4. -%patch200 -p1 -# add vidfail capability; -# without this patch specifying a framebuffer on the kernel prompt would -# make the boot stop if there's no supported framebuffer device; this is bad -# for the installer cd that wants to automatically fall back to textmode -# in that case -%patch201 -p1 -# EDAC support for K8 -%patch202 -p1 -# Suppress APIC errors on UP x86-64. -%patch203 -p1 -%if %{includexen} -# Suppress APIC errors on UP x86-64 (xen bits) -%patch204 -p1 -%endif -# Don't delete cpu_devs data to identify different x86 types in late_initcall -%patch205 -p1 -# quirk for Siemens Nixdorf AG FSC Multiprocessor Interrupt Controller -%patch206 -p1 -# Blacklist Dell Optiplex 320 from using the HPET -%patch207 -p1 -# Add x86-64 PM_TRACE support. -%patch209 -p1 +ApplyPatch linux-2.6-x86-tune-generic.patch + +ApplyPatch linux-2.6-ia32-syscall-restart.patch # # PowerPC # +### UPSTREAM PATCHES FROM 2.6.25 (we think): +# RTC class driver for ppc_md rtc functions +ApplyPatch linux-2.6-ppc-rtc.patch +### NOT (YET) UPSTREAM: +# The EHCI ISO patch isn't yet upstream but is needed to fix reboot +ApplyPatch linux-2.6-ps3-ehci-iso.patch +# The storage alias patch is Fedora-local, and allows the old 'ps3_storage' +# module name to work on upgrades. Otherwise, I believe mkinitrd will fail +# to pull the module in, +ApplyPatch linux-2.6-ps3-storage-alias.patch +# Support booting from Sony's original released 2.6.16-based kboot +ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch # Alleviate G5 thermal shutdown problems -%patch300 -p1 -# Ensure slab objects are aligned enough for a uint64_t (#235392) -%patch301 -p1 -# Fix data exception problem -%patch302 -p1 -# Temporary hack to work around GCC PR #25724 / #21237 -%patch303 -p1 -# Fix up ibmvscsi for combined pSeries/iSeries build -%patch304 -p1 -# Move pmac_zilog to its newly-registered device number -%patch305 -p1 -# Ensure initrd memory is reserved at boot -%patch306 -p1 -%patch307 -p1 -%patch308 -p1 -%patch309 -p1 - -# uevent support for of_platform device -%patch310 -p1 -%patch311 -p1 -%patch312 -p1 -%patch313 -p1 - -#powermac-generic-suspend-* -%patch330 -p1 -%patch331 -p1 -%patch332 -p1 -%patch333 -p1 - -# Efika Ethernet -%patch340 -p1 -%patch341 -p1 - -# PlayStation 3 support -%patch350 -p1 -%patch351 -p1 -%patch352 -p1 -%patch353 -p1 -%patch354 -p1 -%patch355 -p1 -%patch356 -p1 -%patch357 -p1 -%patch358 -p1 -%patch359 -p1 -%patch360 -p1 -%patch361 -p1 -%patch362 -p1 - -%patch370 -p1 -%patch371 -p1 -%patch372 -p1 -%patch373 -p1 -%patch374 -p1 -%patch375 -p1 -%patch376 -p1 -%patch377 -p1 - -# S390 +ApplyPatch linux-2.6-g5-therm-shutdown.patch +# Provide modalias in sysfs for vio devices +ApplyPatch linux-2.6-vio-modalias.patch # -# Patches 800 through 899 are reserved for bugfixes to the core system -# and patches related to how RPMs are build -# - - -# This patch adds a "make nonint_oldconfig" which is non-interactive and -# also gives a list of missing options at the end. Useful for automated -# builds (as used in the buildsystem). -%patch800 -p1 - # Exec shield -%patch810 -p1 -%if %{includexen} -%patch811 -p1 -%endif - # -# GPG signed kernel modules -# -%patch900 -p1 -%patch901 -p1 -%patch902 -p1 -%patch903 -p1 -%patch904 -p1 -%patch905 -p1 -%patch906 -p1 - +ApplyPatch linux-2.6-execshield.patch # -# Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems +# bugfixes to drivers and filesystems # +# USB +ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch + +# ACPI +# eeepc hotkey support +ApplyPatch linux-2.6-acpi-eeepc-hotkey.patch # Various low-impact patches to aid debugging. -%patch1010 -p1 -%patch1011 -p1 -%patch1012 -p1 -%patch1013 -p1 -%patch1015 -p1 -%patch1016 -p1 -%patch1019 -p1 -# Disable the 'quiet' boot switch for better bug reports. -%patch1020 -p1 -%patch1021 -p1 -%patch1022 -p1 -%if %{includexen} -%patch1023 -p1 +ApplyPatch linux-2.6-debug-sizeof-structs.patch +ApplyPatch linux-2.6-debug-nmi-timeout.patch +ApplyPatch linux-2.6-debug-taint-vm.patch +ApplyPatch linux-2.6-debug-spinlock-taint.patch +%if !%{debugbuildsenabled} +ApplyPatch linux-2.6-debug-no-quiet.patch %endif # # Make /dev/mem a need-to-know function # -%patch1050 -p1 -%if %{includexen} -%patch1051 -p1 -%endif +ApplyPatch linux-2.6-devmem.patch # # /dev/crash driver for the crashdump analysis tool # -%patch1060 -p1 -%if %{includexen} -%patch1061 -p1 -%endif +ApplyPatch linux-2.6-crash-driver.patch # # SCSI Bits. # -# Fix old SCSI adapter crashes with CD-ROM -%patch1100 -p1 # fix cpqarray pci enable -%patch1106 -p1 +ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch +# fix vmware emulated scsi controller +#ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch -# Fix 3w-9xxx to use PCI resource length correctly (bug #309611) -%patch1107 -p1 - -# -# Various NFS/NFSD fixes. +# ALSA # -# NIC driver fixes -# Don't print warnings about MSI failures on e1000 -%patch1300 -p1 - -# e1000e backport -%patch1350 -p1 -%patch1351 -p1 -%patch1352 -p1 -%patch1353 -p1 -%patch1354 -p1 -%patch1355 -p1 -%patch1356 -p1 -%patch1357 -p1 -%patch1358 -p1 -%patch1359 -p1 -%patch1360 -p1 - # Filesystem patches. # Squashfs -%patch1400 -p1 -# GFS2 update -%patch1410 -p1 +ApplyPatch linux-2.6-squashfs.patch # Networking # Disable easy to trigger printk's. -%patch1500 -p1 +ApplyPatch linux-2.6-net-silence-noisy-printks.patch # Misc fixes -# Add missing MODULE_VERSION tags to some modules. -%patch1600 -p1 -# Fix SHA1 alignment problem on ia64 -%patch1601 -p1 # The input layer spews crap no-one cares about. -%patch1610 -p1 -# don't wakeup ondemand timer whilst idle. -%patch1620 -p1 -# Update KVM. (should we just carry the latest version?) -%patch1630 -p1 -# KVM: Detect if AMD svm was disabled by BIOS -%patch1631 -p1 -# KVM: Fix above patch on 32-bit -%patch1632 -p1 -# KVM: reinit real-mode TSS before switching back -%patch1633 -p1 +ApplyPatch linux-2.6-input-kill-stupid-messages.patch # Allow to use 480600 baud on 16C950 UARTs -%patch1650 -p1 -# Allow large files on UDF -%patch1660 -p1 -%patch1661 -p1 -%patch1662 -p1 -# fix oops in sysfs_readdir -%patch1670 -p1 - -%if %{includexen} -# checksum fixes (bug #223258) -%patch1665 -p1 -%endif - -# Align kernel data segment to page boundary. -%patch1690 -p1 -# DVB spinlock bug -%patch1700 -p1 -# NFS: Added support to turn off the NFSv3 READDIRPLUS RPC. -%patch1710 -p1 -# Missing braces -%patch1711 -p1 -# setuid /proc/self/maps fix. -%patch1720 -p1 -# Fix ACPI suspend / device suspend ordering problem -%patch1730 -p1 -# Add a safety net to softlockup so that it doesn't prevent installs. -%patch1740 -p1 -# Speed up spinlock debug. -%patch1770 -p1 +ApplyPatch linux-2.6-serial-460800.patch # Silence some useless messages that still get printed with 'quiet' -%patch1771 -p1 -# softirqs: print out irq-trace events -%patch1781 -p1 - -# OLPC specific patches -%if 0%{?olpc} -# Marvell Libertas wireless driver -%patch1791 -p1 -# OLPC touchpad -%patch1792 -p1 -%endif - -# temporarily restore START_ARRAY ioctl -%patch1793 -p1 - -# Fix i82875 EDAC driver setup so X will start -%patch1794 -p1 -# Work around sysfs/uevent use-after-free problems with Bluetooth HID -%patch1795 -p1 - -%if %{includexen} -# Xenoprof's DOMAIN_SWITCH_CODE changed in oprofile 0.9.3 -%patch1796 -p1 -%endif +ApplyPatch linux-2.6-silence-noise.patch # Fix the SELinux mprotect checks on executable mappings -%patch1801 -p1 - -# Remove kernel-internal functionality that nothing external should use. -%patch1910 -p1 - -# -# VM related fixes. -# -# Re-add cond_resched to invalidate_mapping_pages() -%patch2000 -p1 -# Silence GFP_ATOMIC failures. -%patch2001 -p1 +ApplyPatch linux-2.6-selinux-mprotect-checks.patch # Changes to upstream defaults. # Use UTF-8 by default on VFAT. -%patch2100 -p1 +ApplyPatch linux-2.6-defaults-fat-utf8.patch -# Use unicode VT's by default. -%patch2103 -p1 -# Disable NMI watchdog by default. -%patch2105 -p1 -# Disable MMCONFIG & MSI by default. -%patch2106 -p1 -# Disable USB autosuspend by default. -%patch2107 -p1 - -# HPA support for libata. -%patch2201 -p1 -# sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands -%patch2202 -p1 # Disable ATAPI DMA on ALI chipsets. -%patch2203 -p1 -# libata: don't initialize sg in ata_exec_internal() if DMA_NONE +ApplyPatch linux-2.6-libata-ali-atapi-dma.patch # ia64 ata quirk -%patch2204 -p1 -# remove the wildcard from sata_nv driver -%patch2206 -p1 -# pata_pcmcia.c: add card ident for jvc cdrom -%patch2207 -p1 -# Add libata ID's for ATI SB700 -%patch2208 -p1 -# hpt3x2n: Correct revision boundary -%patch2209 -p1 -# pata_sis: Fix and clean up some timing setups -%patch2210 -p1 -# libata: always use polling SETXFER -%patch2211 -p1 -# pata_ali: limit DMA speeds -%patch2212 -p1 -# libata: use PIO when xfer is not a multiple of 16 -%patch2213 -p1 -# libata: call check_dma with qc better prepared -%patch2214 -p1 -# libata: add intel ich8m (santa rosa) pata ID -%patch2215 -p1 -# libata: add option to disable PATA DMA -%patch2216 -p1 -# libata: update NCQ blacklist -%patch2217 -p1 -# libata: partially fix dma for pata_it821x -%patch2218 -p1 - -# ATA spindown -%patch2220 -p1 -%patch2221 -p1 -%patch2222 -p1 -%patch2223 -p1 -%patch2224 -p1 -%patch2225 -p1 -%patch2226 -p1 -%patch2227 -p1 -%patch2228 -p1 - -# Add critical wireless updates from 2.6.22 -%patch2300 -p1 -# Add the new wireless stack and drivers from wireless-dev -%patch2301 -p1 -# avoid bcm43xx vs bcm43xx-mac80211 PCI ID conflicts -%patch2302 -p1 - -# Assorted dyntick/clock/timer fixes. -%patch2402 -p1 -%patch2403 -p1 - - -# ACPI patches -# Remove Dell Optiplex GX240 from the ACPI blacklist -%patch2500 -p1 -# Fix ACPI dock oops (#238054) -%patch2501 -p1 -# Fix another ACPI boot regression. -%patch2502 -p1 -# Fix possible breakage of ACPI suspend -%patch2503 -p1 - -# Fix excessive wakeups -# Make hdaps timer only tick when in use. -%patch2600 -p1 - - -# ACPI patches -%patch3000 -p1 - -# -# Patches 5000 to 6000 are reserved for new drivers that are about to -# be merged upstream -# - -# Pull in the new firewire stack from 2.6.20-rc3-mm1. -%patch5000 -p1 -%patch5001 -p1 - -# security: -%patch6000 -p1 +ApplyPatch linux-2.6-ata-quirk.patch -# -# final stuff -# +# wireless patches headed for 2.6.25 +#ApplyPatch linux-2.6-wireless.patch +# wireless patches headed for 2.6.26 +ApplyPatch linux-2.6-wireless-pending.patch +# temporary backport of some later wireless patches +ApplyPatch linux-2.6-wireless-pending-too.patch + +# Add misc wireless bits from upstream wireless tree +ApplyPatch linux-2.6-at76.patch + +# implement smarter atime updates support. +ApplyPatch linux-2.6-smarter-relatime.patch # -# misc small stuff to make things compile or otherwise improve performance +# misc small stuff to make things compile # -# END OF PATCH APPLICATIONS +C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-compile-fixes.patch | awk '{print $1}') +if [ "$C" -gt 10 ]; then +ApplyPatch linux-2.6-compile-fixes.patch +fi + +# build with gcc43 +ApplyPatch linux-2.6-compile-fix-gcc-43.patch + +# build id related enhancements +ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch + +# http://www.lirc.org/ +ApplyPatch linux-2.6-lirc.patch + +ApplyPatch linux-2.6-e1000-ich9.patch +ApplyPatch linux-2.6-netdev-atl2.patch + +# Nouveau DRM + drm fixes +ApplyPatch linux-2.6-drm-git-mm.patch +ApplyPatch linux-2.6-ppc32-ucmpdi2.patch +ApplyPatch nouveau-drm.patch +ApplyPatch linux-2.6-drm-git-mm-revert-nopfn.patch +ApplyPatch linux-2.6-drm-git-i915-remove-priv-access.patch + +# ext4dev stable patch queue, slated for 2.6.25 +#ApplyPatch linux-2.6-ext4-stable-queue.patch + +# linux1394 git patches +ApplyPatch linux-2.6-firewire-git-update.patch +C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}') +if [ "$C" -gt 10 ]; then +ApplyPatch linux-2.6-firewire-git-pending.patch +fi +# usb video +ApplyPatch linux-2.6-uvcvideo.patch + +ApplyPatch linux-2.6-ppc-use-libgcc.patch + +ApplyPatch linux-2.6-virtio_blk-fix-sysfs-bits.patch + +ApplyPatch linux-2.6-blkcipher-depend-on-chainiv.patch + +# ---------- below all scheduled for 2.6.24 ----------------- + +# kernel-xen apply start +ApplyPatch linux-2.6-xen-0001-Revert-linux-2.6-execshield.patch.patch +ApplyPatch linux-2.6-xen-0002-squashfs-Fix-build-without-CONFIG_SMP.patch +ApplyPatch linux-2.6-xen-0003-xen-Make-hvc0-the-preferred-console-in-domU.patch +ApplyPatch linux-2.6-xen-0004-xen-Make-xen-blkfront-write-its-protocol-ABI-to-xen.patch +ApplyPatch linux-2.6-xen-0005-fbdev-Make-deferred-I-O-work-as-advertized.patch +ApplyPatch linux-2.6-xen-0006-xen-pvfb-Para-virtual-framebuffer-keyboard-and-poi.patch +ApplyPatch linux-2.6-xen-0007-xen-Module-autoprobing-support-for-frontend-drivers.patch +ApplyPatch linux-2.6-xen-0008-xen-Add-compatibility-aliases-for-frontend-drivers.patch +ApplyPatch linux-2.6-xen-0009-xen-Add-a-vmlinuz-target.patch +ApplyPatch linux-2.6-xen-0010-xen-Add-empty-xenctrl-module.patch +ApplyPatch linux-2.6-xen-0011-xen-Add-proc-xen-capabilities.patch +ApplyPatch linux-2.6-xen-0012-xen-Add-proc-xen-privcmd.patch +ApplyPatch linux-2.6-xen-0013-xen-Add-proc-xen-xenbus.patch +ApplyPatch linux-2.6-xen-0014-xen-Add-Xen-s-sys-hypervisor-interface.patch +ApplyPatch linux-2.6-xen-0015-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch +%ifarch x86_64 +ApplyPatch linux-2.6-xen-0016-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch +ApplyPatch linux-2.6-xen-0017-xen-x86_64-Add-64-bit-version-of-privcmd_hypercall.patch +%endif +# kernel-xen apply end + +# END OF PATCH APPLICATIONS %endif # Any further pre-build tree manipulations happen here. -if [ -e scripts/checkpatch.pl ];then - chmod +x scripts/checkpatch.pl -fi +chmod +x scripts/checkpatch.pl cp %{SOURCE10} Documentation/ +# only deal with configs if we are going to build for the arch +%ifnarch %nobuildarches + mkdir configs # Remove configs not for the buildarch @@ -1772,6 +1289,8 @@ echo "# $Arch" > configs/$i cat .config >> configs/$i done +# end of kernel config +%endif # get rid of unwanted files resulting from patch fuzz find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null @@ -1781,17 +1300,16 @@ # Unpack the Xen tarball. %if %{includexen} cp %{SOURCE2} . -if [ -d xen ]; then - rm -rf xen +if [ -d %{xen_hv_dirname} ]; then + rm -rf %{xen_hv_dirname} fi %setup -D -T -q -n kernel-%{kversion} -a1 cd %{xen_hv_dirname}/ # Any necessary hypervisor patches go here -%patch20000 -p1 -%patch20001 -p1 -%patch20004 -p1 -%patch20005 -p1 - +ApplyPatch xen-compile-fix.patch +ApplyPatch xen-version-strings.patch +ApplyPatch xen-build-id.patch +ApplyPatch xen-syms-build-id.patch %endif @@ -1800,7 +1318,7 @@ ### %build -%if %{usesparse} +%if %{with_sparse} %define sparse_mflags C=1 %endif @@ -1816,10 +1334,16 @@ '$(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@' %endif +cp_vmlinux() +{ + eu-strip --remove-comment -o "$2" "$1" +} + BuildKernel() { MakeTarget=$1 KernelImage=$2 Flavour=$3 + InstallName=${4:-vmlinuz} # Pick the right config file for the kernel we're building if [ -n "$Flavour" ] ; then @@ -1832,6 +1356,14 @@ DevelLink= fi + # When the bootable image is just the ELF kernel, strip it. + # We already copy the unstripped file into the debuginfo package. + if [ "$KernelImage" = vmlinux ]; then + CopyKernel=cp_vmlinux + else + CopyKernel=cp + fi + KernelVer=%{version}-%{release}$Flavour echo BUILDING A KERNEL FOR $Flavour %{_target_cpu}... @@ -1867,23 +1399,18 @@ install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img - cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer if [ -f arch/$Arch/boot/zImage.stub ]; then cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || : fi - - if [ "$Flavour" == "kdump" ]; then - cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer - rm -f $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer - fi + $CopyKernel $KernelImage \ + $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer + chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer -%if %{do_vdso_install} %ifarch %{vdso_arches} make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer %endif -%endif # And save the headers/makefiles etc for building modules against # @@ -1903,6 +1430,10 @@ # first copy everything cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp System.map $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + if [ -s Module.markers ]; then + cp Module.markers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + fi # then drop all but the needed Makefiles/Kconfig files rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts @@ -1921,9 +1452,6 @@ cd include cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include - if [ "$Arch" = "x86_64" ]; then - cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include - fi # While arch/powerpc/include/asm is still a symlink to the old # include/asm-ppc{64,} directory, include that in kernel-devel too. if [ "$Arch" = "powerpc" -a -r ../arch/powerpc/include/asm ]; then @@ -1972,7 +1500,7 @@ collect_modules_list networking \ 'register_netdev|ieee80211_register_hw|usbnet_probe' collect_modules_list block \ - 'ata_scsi_ioctl|scsi_add_host|blk_init_queue' + 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans' # detect missing or incorrect license tags rm -f modinfo @@ -2025,7 +1553,7 @@ %if %{with_debug} BuildKernel %make_target %kernel_image debug %if %{with_pae} -BuildKernel %make_target %kernel_image PAE-debug +BuildKernel %make_target %kernel_image PAEdebug %endif %endif @@ -2048,7 +1576,7 @@ %endif %if %{with_kdump} -BuildKernel %make_target %kernel_image kdump +BuildKernel vmlinux vmlinux kdump vmlinux %endif ### @@ -2130,6 +1658,10 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h %endif +%if %{with_bootwrapper} +make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts +%endif + ### ### clean ### @@ -2214,8 +1746,8 @@ %endif %if %{with_pae_debug} -%kernel_variant_preun PAE-debug -%kernel_variant_post -v PAE-debug -s kernel-smp -r kernel-PAE-debug +%kernel_variant_post -v PAEdebug -s kernel-smp -r kernel-PAEdebug +%kernel_variant_preun PAEdebug %endif %if %{with_xen} @@ -2237,6 +1769,13 @@ /usr/include/* %endif +%if %{with_bootwrapper} +%files bootwrapper +%defattr(-,root,root) +/usr/sbin/* +%{_libdir}/kernel-wrapper +%endif + # only some architecture builds need kernel-doc %if %{with_doc} %files -n %{mainpkgname}-doc @@ -2271,13 +1810,12 @@ /lib/modules/%{KVERREL}%{?2}/extra\ /lib/modules/%{KVERREL}%{?2}/updates\ /lib/modules/%{KVERREL}%{?2}/weak-updates\ -%if %{do_vdso_install}\ %ifarch %{vdso_arches}\ /lib/modules/%{KVERREL}%{?2}/vdso\ %endif\ -%endif\ /lib/modules/%{KVERREL}%{?2}/modules.block\ /lib/modules/%{KVERREL}%{?2}/modules.networking\ +/lib/modules/%{KVERREL}%{?2}/modules.order\ %ghost /boot/initrd-%{KVERREL}%{?2}.img\ %{?-e:%{-e*}}\ %{expand:%%files -n %{variantbase}-%{?2:%{2}-}devel}\ @@ -2309,11 +1847,20 @@ %kernel_variant_files %{with_smp} smp %kernel_variant_files %{with_debug} debug %kernel_variant_files %{with_pae} PAE -%kernel_variant_files %{with_pae_debug} PAE-debug +%kernel_variant_files %{with_pae_debug} PAEdebug %kernel_variant_files -k vmlinux %{with_kdump} kdump %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Wed Mar 05 2008 Mark McLoughlin +- Reset to pv_ops xen DomU from kernel-2_6_25-0_93_rc4_fc9 +- Revert the execshield patch for now +- Include xen pv fb and kbd drivers +- Add support for auto-probing frontend drivers +- Add module aliases for xennet and xenblk +- Add /proc/xen and /sys/hypervisor +- Add first round of x86_64 xen pv_ops patches + * Mon Feb 25 2008 Mark McLoughlin - Fix boot on x86_64 - gcc 4.3.0 related (#434556) linux-2.6-ata-quirk.patch: Index: linux-2.6-ata-quirk.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-ata-quirk.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-ata-quirk.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-ata-quirk.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -46,13 +46,13 @@ + +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_11, quirk_intel_ide_controller); + ---- linux-2.6.20/arch/ia64/kernel/Makefile 2007-02-08 02:13:41.000000000 -0500 -+++ linux-2.6.20_fix/arch/ia64/kernel/Makefile 2007-02-12 09:49:39.000000000 -0500 +--- linux-2.6.21.noarch/arch/ia64/kernel/Makefile~ 2007-05-27 23:23:36.000000000 -0400 ++++ linux-2.6.21.noarch/arch/ia64/kernel/Makefile 2007-05-27 23:23:48.000000000 -0400 @@ -33,6 +33,7 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o obj-$(CONFIG_AUDIT) += audit.o obj-$(CONFIG_PCI_MSI) += msi_ia64.o +obj-$(CONFIG_PCI) += quirks.o mca_recovery-y += mca_drv.o mca_drv_asm.o + obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o - obj-$(CONFIG_IA64_ESI) += esi.o linux-2.6-build-nonintconfig.patch: Index: linux-2.6-build-nonintconfig.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-build-nonintconfig.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-build-nonintconfig.patch 24 Jan 2007 01:28:48 -0000 1.1 +++ linux-2.6-build-nonintconfig.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -1,140 +1,123 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-600/scripts/kconfig/conf.c linux-800/scripts/kconfig/conf.c ---- linux-600/scripts/kconfig/conf.c -+++ linux-800/scripts/kconfig/conf.c -@@ -20,6 +20,7 @@ enum { +diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile +index 32e8c5a..8020453 100644 +--- a/scripts/kconfig/Makefile ++++ b/scripts/kconfig/Makefile +@@ -24,6 +24,11 @@ oldconfig: $(obj)/conf + silentoldconfig: $(obj)/conf + $< -s $(Kconfig) + ++nonint_oldconfig: $(obj)/conf ++ $< -b $(Kconfig) ++loose_nonint_oldconfig: $(obj)/conf ++ $< -B $(Kconfig) ++ + # Create new linux.pot file + # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files + # The symlink is used to repair a deficiency in arch/um +diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c +index fda6313..ed33b66 100644 +--- a/scripts/kconfig/conf.c ++++ b/scripts/kconfig/conf.c +@@ -22,6 +22,8 @@ enum { ask_all, ask_new, ask_silent, + dont_ask, ++ dont_ask_dont_tell, set_default, set_yes, set_mod, -@@ -37,6 +37,8 @@ static struct menu *rootEntry; +@@ -38,6 +40,8 @@ static struct menu *rootEntry; static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n"); +static int return_value = 0; + - static void strip(char *str) + static const char *get_help(struct menu *menu) { - char *p = str; -@@ -93,6 +96,12 @@ static void conf_askvalue(struct symbol + if (menu_has_help(menu)) +@@ -112,6 +116,16 @@ static int conf_askvalue(struct symbol *sym, const char *def) fflush(stdout); fgets(line, 128, stdin); - return; + return 1; + case dont_ask: + if (!sym_has_value(sym)) { + fprintf(stderr,"CONFIG_%s\n",sym->name); + return_value++; + } -+ return; ++ /*FALLTHROUGH*/ ++ case dont_ask_dont_tell: ++ if (sym_has_value(sym)) ++ return 0; ++ return 1; case set_default: printf("%s\n", def); - return; -@@ -337,6 +346,10 @@ static int conf_choice(struct menu *menu + return 1; +@@ -351,6 +365,11 @@ static int conf_choice(struct menu *menu) printf("?"); printf("]: "); switch (input_mode) { + case dont_ask: ++ case dont_ask_dont_tell: + cnt = def; + printf("%d\n", cnt); + break; case ask_new: case ask_silent: if (!is_new) { -@@ -472,7 +485,10 @@ static void check_conf(struct menu *menu +@@ -486,6 +505,10 @@ static void check_conf(struct menu *menu) if (!conf_cnt++) - printf("*\n* Restart config...\n*\n"); + printf(_("*\n* Restart config...\n*\n")); rootEntry = menu_get_parent_menu(menu); -- conf(rootEntry); -+ if (input_mode == dont_ask) ++ if (input_mode == dont_ask ++ || input_mode == dont_ask_dont_tell) + fprintf(stderr,"CONFIG_%s\n",sym->name); + else -+ conf(rootEntry); + conf(rootEntry); } - if (sym_is_choice(sym) && sym_get_tristate_value(sym) != mod) - return; -@@ -493,6 +509,9 @@ int main(int ac, char **av) + } +@@ -504,11 +527,17 @@ int main(int ac, char **av) + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + +- while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) { ++ while ((opt = getopt(ac, av, "osbBdD:nmyrh")) != -1) { + switch (opt) { case 'o': input_mode = ask_new; break; + case 'b': + input_mode = dont_ask; + break; ++ case 'B': ++ input_mode = dont_ask_dont_tell; ++ break; case 's': input_mode = ask_silent; valid_stdin = isatty(0) && isatty(1) && isatty(2); -@@ -557,6 +576,7 @@ int main(int ac, char **av) +@@ -573,6 +602,8 @@ int main(int ac, char **av) } case ask_all: case ask_new: + case dont_ask: ++ case dont_ask_dont_tell: conf_read(NULL); break; - default: -@@ -632,7 +632,7 @@ int main(int ac, char **av) + case set_no: +@@ -619,7 +650,8 @@ int main(int ac, char **av) do { conf_cnt = 0; check_conf(&rootmenu); - } while (conf_cnt); -+ } while ((conf_cnt) && (input_mode != dont_ask)); ++ } while (conf_cnt && (input_mode != dont_ask ++ && input_mode != dont_ask_dont_tell)); if (conf_write(NULL)) { fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); return 1; -@@ -643,5 +643,5 @@ skip_check: +@@ -630,5 +662,5 @@ skip_check: return 1; } - return 0; + return return_value; } ---- linux-2.6.16.noarch/scripts/kconfig/Makefile~ 2006-03-25 15:55:18.000000000 -0500 -+++ linux-2.6.16.noarch/scripts/kconfig/Makefile 2006-03-25 15:55:47.000000000 -0500 -@@ -23,6 +23,9 @@ oldconfig: $(obj)/conf - silentoldconfig: $(obj)/conf - $< -s arch/$(ARCH)/Kconfig - -+nonint_oldconfig: scripts/kconfig/conf -+ ./scripts/kconfig/conf -b arch/$(ARCH)/Kconfig -+ - update-po-config: $(obj)/kxgettext - xgettext --default-domain=linux \ - --add-comments --keyword=_ --keyword=N_ \ ---- linux-2.6.14/scripts/kconfig/confdata.c~ 2005-11-10 14:55:46.000000000 -0500 -+++ linux-2.6.14/scripts/kconfig/confdata.c 2005-11-10 14:56:01.000000000 -0500 -@@ -161,7 +161,7 @@ load: - if (def == S_DEF_USER) { - sym = sym_find(line + 9); - if (!sym) { -- conf_warning("trying to assign nonexistent symbol %s", line + 9); -+ conf_warning("trying to assign nonexistent symbol %s", line + 9); - break; - } - } else { -@@ -197,7 +197,7 @@ load: - if (def == S_DEF_USER) { - sym = sym_find(line + 7); - if (!sym) { -- conf_warning("trying to assign nonexistent symbol %s", line + 7); -+ conf_warning("trying to assign nonexistent symbol %s", line + 7); - break; - } - } else { ---- linux-2.6.14/scripts/kconfig/confdata.c~ 2005-11-15 23:51:37.000000000 -0500 -+++ linux-2.6.14/scripts/kconfig/confdata.c 2005-11-15 23:52:50.000000000 -0500 -@@ -153,7 +153,6 @@ int conf_read_simple(const char *name) - break; - } else if (!(sym->flags & SYMBOL_NEW)) { - conf_warning("trying to reassign symbol %s", sym->name); -- break; - } - switch (sym->type) { - case S_BOOLEAN: -@@ -183,7 +182,6 @@ int conf_read_simple(const char *name) - break; - } else if (!(sym->flags & SYMBOL_NEW)) { - conf_warning("trying to reassign symbol %s", sym->name); -- break; - } - switch (sym->type) { - case S_TRISTATE: linux-2.6-crash-driver.patch: Index: linux-2.6-crash-driver.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-crash-driver.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-crash-driver.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-crash-driver.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -1,15 +1,3 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/i386/mm/init.c linux-1060/arch/i386/mm/init.c ---- linux-1050/arch/i386/mm/init.c -+++ linux-1060/arch/i386/mm/init.c -@@ -248,6 +248,8 @@ int devmem_is_allowed(unsigned long page - return 0; - } - -+EXPORT_SYMBOL_GPL(page_is_ram); -+ - #ifdef CONFIG_HIGHMEM - pte_t *kmap_pte; - pgprot_t kmap_prot; diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/ia64/kernel/ia64_ksyms.c linux-1060/arch/ia64/kernel/ia64_ksyms.c --- linux-1050/arch/ia64/kernel/ia64_ksyms.c +++ linux-1060/arch/ia64/kernel/ia64_ksyms.c @@ -23,25 +11,6 @@ #ifdef ASM_SUPPORTED # ifdef CONFIG_SMP # if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3) -diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/x86_64/mm/init.c linux-1060/arch/x86_64/mm/init.c ---- linux-1050/arch/x86_64/mm/init.c -+++ linux-1060/arch/x86_64/mm/init.c -@@ -6,5 +6,6 @@ - */ - -+#include - #include - #include - #include -@@ -417,6 +418,8 @@ int devmem_is_allowed(unsigned long page - } - - -+EXPORT_SYMBOL_GPL(page_is_ram); -+ - static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules, - kcore_vsyscall; - diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/crash.c linux-1060/drivers/char/crash.c --- linux-1050/drivers/char/crash.c +++ linux-1060/drivers/char/crash.c @@ -188,17 +157,18 @@ int "Maximum number of legacy PTY in use" --- linux-2.6.16.noarch/drivers/char/Makefile~ 2006-03-25 18:50:42.000000000 -0500 +++ linux-2.6.16.noarch/drivers/char/Makefile 2006-03-25 18:50:59.000000000 -0500 -@@ -95,6 +95,7 @@ obj-$(CONFIG_IPMI_HANDLER) += ipmi/ +@@ -95,6 +95,8 @@ obj-$(CONFIG_IPMI_HANDLER) += ipmi/ + obj-$(CONFIG_JS_RTC) += js-rtc.o + js-rtc-y = rtc.o - obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o - obj-$(CONFIG_TCG_TPM) += tpm/ +obj-$(CONFIG_CRASH) += crash.o - ++ # Files generated that shall be removed upon make clean - clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c + clean-files := consolemap_deftbl.c defkeymap.c + diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-i386/crash.h linux-1060/include/asm-i386/crash.h ---- linux-1050/include/asm-i386/crash.h -+++ linux-1060/include/asm-i386/crash.h +--- linux-1050/include/asm-x86/crash.h ++++ linux-1060/include/asm-x86/crash.h @@ -0,0 +1,75 @@ +#ifndef _ASM_I386_CRASH_H +#define _ASM_I386_CRASH_H @@ -369,93 +339,15 @@ +#endif /* __KERNEL__ */ + +#endif /* _ASM_IA64_CRASH_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-x86_64/crash.h linux-1060/include/asm-x86_64/crash.h ---- linux-1050/include/asm-x86_64/crash.h -+++ linux-1060/include/asm-x86_64/crash.h -@@ -0,0 +1,75 @@ -+#ifndef _ASM_X86_64_CRASH_H -+#define _ASM_X86_64_CRASH_H -+ -+/* -+ * linux/include/asm-x86_64/crash.h -+ * -+ * Copyright (c) 2004 Red Hat, Inc. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ */ -+ -+#ifdef __KERNEL__ -+ -+#include -+#include -+#include -+ -+extern int page_is_ram(unsigned long); -+ -+static inline void * -+map_virtual(u64 offset, struct page **pp) -+{ -+ struct page *page; -+ unsigned long pfn; -+ void *vaddr; -+ -+ pfn = (unsigned long)(offset >> PAGE_SHIFT); -+ -+ if (!page_is_ram(pfn)) { -+ printk(KERN_INFO -+ "crash memory driver: !page_is_ram(pfn: %lx)\n", pfn); -+ return NULL; -+ } -+ -+ if (!pfn_valid(pfn)) { -+ printk(KERN_INFO -+ "crash memory driver: invalid pfn: %lx )\n", pfn); -+ return NULL; -+ } -+ -+ page = pfn_to_page(pfn); -+ -+ vaddr = kmap(page); -+ if (!vaddr) { -+ printk(KERN_INFO -+ "crash memory driver: pfn: %lx kmap(page: %lx) failed\n", -+ pfn, (unsigned long)page); -+ return NULL; -+ } -+ -+ *pp = page; -+ return (vaddr + (offset & (PAGE_SIZE-1))); -+} -+ -+static inline void unmap_virtual(struct page *page) -+{ -+ kunmap(page); -+} -+ -+#endif /* __KERNEL__ */ -+ -+#endif /* _ASM_X86_64_CRASH_H */ ---- linux-2.6.21.noarch/arch/x86_64/kernel/e820.c~ 2007-05-04 00:04:56.000000000 -0400 -+++ linux-2.6.21.noarch/arch/x86_64/kernel/e820.c 2007-05-04 00:05:02.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - --struct e820map e820 __initdata; -+struct e820map e820; +diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c +index c004d94..13417a2 100644 +--- a/arch/x86/mm/ioremap.c ++++ b/arch/x86/mm/ioremap.c +@@ -65,6 +65,7 @@ int page_is_ram(unsigned long pagenr) + } + return 0; + } ++EXPORT_SYMBOL_GPL(page_is_ram); - /* - * PFN of last memory page. + /* + * Fix up the linear direct mapping of the kernel to avoid cache attribute linux-2.6-cve-2008-0600.patch: Index: linux-2.6-cve-2008-0600.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-cve-2008-0600.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-cve-2008-0600.patch 12 Feb 2008 17:10:17 -0000 1.1 +++ linux-2.6-cve-2008-0600.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -21,11 +21,11 @@ Signed-off-by: Linus Torvalds --- -Index: linux-2.6.21.i686/fs/splice.c -=================================================================== ---- linux-2.6.21.i686.orig/fs/splice.c -+++ linux-2.6.21.i686/fs/splice.c -@@ -1171,7 +1171,7 @@ static int get_iovec_page_array(const st +diff --git a/fs/splice.c b/fs/splice.c +index 14e2262..9b559ee 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1234,7 +1234,7 @@ static int get_iovec_page_array(const struct iovec __user *iov, if (unlikely(!len)) break; error = -EFAULT; @@ -34,3 +34,4 @@ break; /* + linux-2.6-debug-nmi-timeout.patch: Index: linux-2.6-debug-nmi-timeout.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-debug-nmi-timeout.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-nmi-timeout.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-debug-nmi-timeout.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -1,5 +1,5 @@ ---- linux-2.6.20.noarch/arch/i386/kernel/nmi.c~ 2007-04-13 15:52:37.000000000 -0400 -+++ linux-2.6.20.noarch/arch/i386/kernel/nmi.c 2007-04-13 15:53:06.000000000 -0400 +--- linux-2.6.20.noarch/arch/x86/kernel/nmi_32.c~ 2007-04-13 15:52:37.000000000 -0400 ++++ linux-2.6.20.noarch/arch/x86/kernel/nmi_32.c 2007-04-13 15:53:06.000000000 -0400 @@ -1044,7 +1044,7 @@ __kprobes int nmi_watchdog_tick(struct p * wait a few IRQs (5 seconds) before doing the oops ... */ @@ -9,8 +9,8 @@ /* * die_nmi will return ONLY if NOTIFY_STOP happens.. */ ---- linux-2.6.20.noarch/arch/x86_64/kernel/nmi.c~ 2007-04-13 15:53:09.000000000 -0400 -+++ linux-2.6.20.noarch/arch/x86_64/kernel/nmi.c 2007-04-13 15:53:29.000000000 -0400 +--- linux-2.6.20.noarch/arch/x86/kernel/nmi_64.c~ 2007-04-13 15:53:09.000000000 -0400 ++++ linux-2.6.20.noarch/arch/x86/kernel/nmi_64.c 2007-04-13 15:53:29.000000000 -0400 @@ -923,7 +923,7 @@ int __kprobes nmi_watchdog_tick(struct p * wait a few IRQs (5 seconds) before doing the oops ... */ @@ -20,11 +20,11 @@ die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs, panic_on_timeout); } else { ---- linux-2.6.20.noarch/lib/Kconfig.debug~ 2007-04-13 15:53:48.000000000 -0400 -+++ linux-2.6.20.noarch/lib/Kconfig.debug 2007-04-13 15:55:18.000000000 -0400 -@@ -133,6 +133,14 @@ config DETECT_SOFTLOCKUP - can be detected via the NMI-watchdog, on platforms that - support it.) +--- linux-2.6.21.noarch/lib/Kconfig.debug~ 2007-07-06 17:05:46.000000000 -0400 ++++ linux-2.6.21.noarch/lib/Kconfig.debug 2007-07-06 17:06:07.000000000 -0400 +@@ -126,6 +126,14 @@ config SCHEDSTATS + application, you can say N to avoid the very slight overhead + this adds. +config DEBUG_NMI_TIMEOUT + int "Number of seconds before NMI timeout" @@ -34,6 +34,6 @@ + This value is the number of seconds the NMI watchdog will tick + before it decides the machine has hung. + - config SCHEDSTATS - bool "Collect scheduler statistics" + config TIMER_STATS + bool "Collect kernel timers statistics" depends on DEBUG_KERNEL && PROC_FS linux-2.6-debug-no-quiet.patch: Index: linux-2.6-debug-no-quiet.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-debug-no-quiet.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-no-quiet.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-debug-no-quiet.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -1,21 +1,24 @@ diff --git a/init/main.c b/init/main.c -index a92989e..f4dee52 100644 +index 8b19820..c27d2a0 100644 --- a/init/main.c +++ b/init/main.c -@@ -236,7 +236,11 @@ static int __init quiet_kernel(char *str) +@@ -244,8 +244,12 @@ static int __init debug_kernel(char *str) + + static int __init quiet_kernel(char *str) { - if (*str) - return 0; +#ifdef CONFIG_DEBUG_IGNORE_QUIET + console_loglevel = 10; +#else console_loglevel = 4; +#endif - return 1; + return 0; } ---- linux-2.6.21.noarch/lib/Kconfig.debug~ 2007-05-28 02:18:07.000000000 -0400 -+++ linux-2.6.21.noarch/lib/Kconfig.debug 2007-05-28 02:18:43.000000000 -0400 + early_param("debug", debug_kernel); +diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug +index a370fe8..aee5495 100644 +--- a/lib/Kconfig.debug ++++ b/lib/Kconfig.debug @@ -1,3 +1,8 @@ +config DEBUG_IGNORE_QUIET + bool "Ignore 'quiet' boot argument" linux-2.6-debug-sizeof-structs.patch: Index: linux-2.6-debug-sizeof-structs.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-debug-sizeof-structs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-sizeof-structs.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-debug-sizeof-structs.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -2,7 +2,7 @@ +++ linux-2.6/init/main.c 2006-07-11 02:49:01.000000000 -0400 @@ -350,6 +350,10 @@ static void __init setup_per_cpu_areas(v } - #endif /* !__GENERIC_PER_CPU */ + #endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */ +#include +#include @@ -16,7 +16,7 @@ @@ -403,6 +403,15 @@ static void __init smp_init(void) /* Any cleanup work */ printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus()); - smp_cpus_done(max_cpus); + smp_cpus_done(setup_max_cpus); + + printk(KERN_DEBUG "sizeof(vma)=%u bytes\n", (unsigned int) sizeof(struct vm_area_struct)); + printk(KERN_DEBUG "sizeof(page)=%u bytes\n", (unsigned int) sizeof(struct page)); linux-2.6-debug-spinlock-taint.patch: Index: linux-2.6-debug-spinlock-taint.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-debug-spinlock-taint.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-debug-spinlock-taint.patch 24 Jan 2007 01:28:48 -0000 1.1 +++ linux-2.6-debug-spinlock-taint.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -1,42 +1,44 @@ ---- linux-2.6.17.noarch/lib/spinlock_debug.c~ 2006-07-04 16:23:43.000000000 -0400 -+++ linux-2.6.17.noarch/lib/spinlock_debug.c 2006-07-04 16:24:45.000000000 -0400 -@@ -57,9 +57,9 @@ static void spin_bug(spinlock_t *lock, c +diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c +index 9c4b025..b7a010a 100644 +--- a/lib/spinlock_debug.c ++++ b/lib/spinlock_debug.c +@@ -58,9 +58,9 @@ static void spin_bug(spinlock_t *lock, const char *msg) if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT) owner = lock->owner; - printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n", + printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d (%s)\n", msg, raw_smp_processor_id(), -- current->comm, current->pid); -+ current->comm, current->pid, print_tainted()); +- current->comm, task_pid_nr(current)); ++ current->comm, task_pid_nr(current), print_tainted()); printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, " ".owner_cpu: %d\n", lock, lock->magic, -@@ -112,9 +112,9 @@ static void __spin_lock_debug(spinlock_t +@@ -114,9 +114,9 @@ static void __spin_lock_debug(spinlock_t *lock) if (print_once) { print_once = 0; printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, " - "%s/%d, %p\n", + "%s/%d, %p (%s)\n", raw_smp_processor_id(), current->comm, -- current->pid, lock); -+ current->pid, lock, print_tainted()); +- task_pid_nr(current), lock); ++ task_pid_nr(current), lock, print_tainted()); dump_stack(); - } - } -@@ -154,9 +154,9 @@ static void rwlock_bug(rwlock_t *lock, c + #ifdef CONFIG_SMP + trigger_all_cpu_backtrace(); +@@ -159,9 +159,9 @@ static void rwlock_bug(rwlock_t *lock, const char *msg) if (!debug_locks_off()) return; - printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n", + printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", msg, raw_smp_processor_id(), current->comm, -- current->pid, lock); -+ current->pid, lock, print_tainted()); +- task_pid_nr(current), lock); ++ task_pid_nr(current), lock, print_tainted()); dump_stack(); } -@@ -177,9 +177,9 @@ static void __read_lock_debug(rwlock_t * +@@ -184,9 +184,9 @@ static void __read_lock_debug(rwlock_t *lock) if (print_once) { print_once = 0; printk(KERN_EMERG "BUG: read-lock lockup on CPU#%d, " @@ -48,7 +50,7 @@ dump_stack(); } } -@@ -250,9 +250,9 @@ static void __write_lock_debug(rwlock_t +@@ -259,9 +259,9 @@ static void __write_lock_debug(rwlock_t *lock) if (print_once) { print_once = 0; printk(KERN_EMERG "BUG: write-lock lockup on CPU#%d, " @@ -60,3 +62,4 @@ dump_stack(); } } + linux-2.6-debug-taint-vm.patch: Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-taint-vm.patch 24 Jul 2007 14:13:44 -0000 1.3 +++ linux-2.6-debug-taint-vm.patch 6 Mar 2008 13:59:25 -0000 1.4 @@ -1,39 +1,8 @@ ---- linux-2.6.20.noarch/include/asm-generic/bug.h~ 2007-02-12 16:18:21.000000000 -0500 -+++ linux-2.6.20.noarch/include/asm-generic/bug.h 2007-02-12 16:19:57.000000000 -0500 -@@ -3,6 +3,10 @@ - - #include - -+#ifndef __ASSEMBLY__ -+extern const char *print_tainted(void); -+#endif -+ - #ifdef CONFIG_BUG - - #ifdef CONFIG_GENERIC_BUG -@@ -22,7 +26,7 @@ struct bug_entry { - - #ifndef HAVE_ARCH_BUG - #define BUG() do { \ -- printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \ -+ printk("BUG: failure at %s:%d/%s()! (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \ - panic("BUG!"); \ - } while (0) - #endif -@@ -35,8 +39,7 @@ struct bug_entry { - #define WARN_ON(condition) ({ \ - typeof(condition) __ret_warn_on = (condition); \ - if (unlikely(__ret_warn_on)) { \ -- printk("BUG: at %s:%d %s()\n", __FILE__, \ -- __LINE__, __FUNCTION__); \ -+ printk("BUG: warning at %s:%d/%s() (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \ - dump_stack(); \ - } \ - unlikely(__ret_warn_on); \ -diff -urNp --exclude-from=/home/davej/.exclude linux-1740/kernel/panic.c linux-2000/kernel/panic.c ---- linux-1740/kernel/panic.c -+++ linux-2000/kernel/panic.c -@@ -151,6 +151,7 @@ const char *print_tainted(void) +diff --git a/kernel/panic.c b/kernel/panic.c +index 6f6e03e..198fc58 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -173,6 +173,7 @@ const char *print_tainted(void) snprintf(buf, sizeof(buf), "Not tainted"); return(buf); } @@ -41,26 +10,11 @@ void add_taint(unsigned flag) { ---- linux-2.6.15/mm/page_alloc.c~ 2006-01-07 20:48:33.000000000 -0500 -+++ linux-2.6.15/mm/page_alloc.c 2006-01-07 20:49:24.000000000 -0500 -@@ -137,12 +137,12 @@ static inline int bad_range(struct zone - static void bad_page(struct page *page) - { - printk(KERN_EMERG "Bad page state in process '%s'\n" -- KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n" -+ KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n" - KERN_EMERG "Trying to fix it up, but a reboot is needed\n" - KERN_EMERG "Backtrace:\n", - current->comm, page, (int)(2*sizeof(unsigned long)), - (unsigned long)page->flags, page->mapping, -- page_mapcount(page), page_count(page)); -+ page_mapcount(page), page_count(page), print_tainted()); - dump_stack(); - page->flags &= ~(1 << PG_lru | - 1 << PG_private | ---- linux-2.6.20.noarch/mm/slab.c~ 2007-04-04 16:36:51.000000000 -0400 -+++ linux-2.6.20.noarch/mm/slab.c 2007-04-04 16:37:03.000000000 -0400 -@@ -1802,8 +1802,8 @@ static void check_poison_obj(struct kmem +diff --git a/mm/slab.c b/mm/slab.c +index 2e338a5..e5627f9 100644 +--- a/mm/slab.c ++++ b/mm/slab.c +@@ -1846,8 +1846,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp) /* Print header */ if (lines == 0) { printk(KERN_ERR @@ -69,11 +23,9 @@ + "Slab corruption (%s): %s start=%p, len=%d\n", + print_tainted(), cachep->name, realobj, size); print_objinfo(cachep, objp, 0); - dump_stack(); } ---- linux-2.6.21.noarch/mm/slab.c~ 2007-05-14 11:51:33.000000000 -0400 -+++ linux-2.6.21.noarch/mm/slab.c 2007-05-14 11:53:00.000000000 -0400 -@@ -2924,8 +2924,8 @@ static void check_slabp(struct kmem_cach + /* Hexdump the affected line */ +@@ -2935,8 +2935,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp) if (entries != cachep->num - slabp->inuse) { bad: printk(KERN_ERR "slab: Internal list corruption detected in " @@ -84,3 +36,48 @@ for (i = 0; i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t); i++) { +diff --git a/mm/slub.c b/mm/slub.c +index 9c1d9f3..e11d58d 100644 +--- a/mm/slub.c ++++ b/mm/slub.c +@@ -451,7 +451,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...) + va_end(args); + printk(KERN_ERR "========================================" + "=====================================\n"); +- printk(KERN_ERR "BUG %s: %s\n", s->name, buf); ++ printk(KERN_ERR "BUG %s (%s): %s\n", s->name, print_tainted(), buf); + printk(KERN_ERR "----------------------------------------" + "-------------------------------------\n\n"); + } +diff --git a/kernel/panic.c b/kernel/panic.c +index d9e90cf..570b1f6 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -306,8 +306,8 @@ void warn_on_slowpath(const char *file, int line) + sprint_symbol(function, caller); + + printk(KERN_WARNING "------------[ cut here ]------------\n"); +- printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file, +- line, function); ++ printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file, ++ line, function, print_tainted()); + print_modules(); + dump_stack(); + print_oops_end_marker(); +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index 402a504..2085092 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -225,10 +225,10 @@ static void bad_page(struct page *page) + void *pc = page_get_page_cgroup(page); + + printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG +- "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n", ++ "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n", + current->comm, page, (int)(2*sizeof(unsigned long)), + (unsigned long)page->flags, page->mapping, +- page_mapcount(page), page_count(page)); ++ page_mapcount(page), page_count(page), print_tainted()); + if (pc) { + printk(KERN_EMERG "cgroup:%p\n", pc); + page_reset_bad_cgroup(page); linux-2.6-defaults-fat-utf8.patch: Index: linux-2.6-defaults-fat-utf8.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-defaults-fat-utf8.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-defaults-fat-utf8.patch 24 Jan 2007 01:28:48 -0000 1.1 +++ linux-2.6-defaults-fat-utf8.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -1,9 +1,9 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181963 ---- linux-2.6.15.noarch/fs/fat/inode.c~ 2006-02-20 23:20:12.000000000 -0500 -+++ linux-2.6.15.noarch/fs/fat/inode.c 2006-02-20 23:21:42.000000000 -0500 -@@ -952,7 +952,8 @@ static int parse_options(char *options, +--- linux-2.6.21.noarch/fs/fat/inode.c~ 2007-05-27 23:22:31.000000000 -0400 ++++ linux-2.6.21.noarch/fs/fat/inode.c 2007-05-27 23:22:50.000000000 -0400 +@@ -950,7 +950,8 @@ static int parse_options(char *options, opts->shortname = 0; opts->name_check = 'n'; opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK = 0; @@ -11,5 +11,5 @@ + opts->utf8 = 1; + opts->unicode_xlate = 0; opts->numtail = 1; - opts->nocase = 0; + opts->usefree = opts->nocase = 0; *debug = 0; linux-2.6-devmem.patch: Index: linux-2.6-devmem.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-devmem.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-devmem.patch 24 Jul 2007 14:13:44 -0000 1.3 +++ linux-2.6-devmem.patch 6 Mar 2008 13:59:25 -0000 1.4 @@ -1,657 +1,119 @@ -Index: patching/arch/i386/mm/init.c -=================================================================== ---- patching.orig/arch/i386/mm/init.c -+++ patching/arch/i386/mm/init.c -@@ -233,6 +233,25 @@ int page_is_ram(unsigned long pagenr) +From: Arjan van de Ven +Subject: [PATCH] make /dev/kmem a config option + +This patch makes /dev/kmem a config option; /dev/kmem is VERY rarely +used, and when used, it's generally for no good (rootkits tend to be +the most common users). With this config option, users have the +choice to disable /dev/kmem, saving some size as well. + +A patch to disable /dev/kmem has been in the Fedora and RHEL kernels for +4+ years now without any known problems or legit users of /dev/kmem. + +Signed-off-by: Arjan van de Ven +--- + drivers/char/Kconfig | 8 ++++++++ + drivers/char/mem.c | 10 ++++++++++ + 2 files changed, 18 insertions(+) + +Index: linux.trees.git/drivers/char/Kconfig +=================================================================== +--- linux.trees.git.orig/drivers/char/Kconfig ++++ linux.trees.git/drivers/char/Kconfig +@@ -80,6 +80,14 @@ config VT_HW_CONSOLE_BINDING + information. For framebuffer console users, please refer to + . + ++config DEVKMEM ++ bool "/dev/kmem virtual device support" ++ help ++ Say Y here if you want to support the /dev/kmem device. The ++ /dev/kmem device is rarely used, but can be used for certain ++ kind of kernel debugging operations. ++ When in doubt, say "N". ++ + config SERIAL_NONSTANDARD + bool "Non-standard serial port support" + depends on HAS_IOMEM +Index: linux.trees.git/drivers/char/mem.c +=================================================================== +--- linux.trees.git.orig/drivers/char/mem.c ++++ linux.trees.git/drivers/char/mem.c +@@ -295,6 +295,7 @@ static int mmap_mem(struct file * file, return 0; } -+/* -+ * devmem_is_allowed() checks to see if /dev/mem access to a certain address is -+ * valid. The argument is a physical page number. -+ * -+ * -+ * On x86, access has to be given to the first megabyte of ram because that area -+ * contains bios code and data regions used by X and dosemu and similar apps. -+ * Access has to be given to non-kernel-ram areas as well, these contain the PCI -+ * mmio resources as well as potential bios/acpi data regions. -+ */ -+int devmem_is_allowed(unsigned long pagenr) -+{ -+ if (pagenr <= 256) -+ return 1; -+ if (!page_is_ram(pagenr)) -+ return 1; -+ return 0; -+} -+ - #ifdef CONFIG_HIGHMEM - pte_t *kmap_pte; - pgprot_t kmap_prot; -Index: patching/arch/ia64/mm/init.c -=================================================================== ---- patching.orig/arch/ia64/mm/init.c -+++ patching/arch/ia64/mm/init.c -@@ -281,6 +281,13 @@ free_initrd_mem (unsigned long start, un - } ++#ifdef CONFIG_DEVKMEM + static int mmap_kmem(struct file * file, struct vm_area_struct * vma) + { + unsigned long pfn; +@@ -315,6 +316,7 @@ static int mmap_kmem(struct file * file, + vma->vm_pgoff = pfn; + return mmap_mem(file, vma); } - -+int page_is_ram(unsigned long pagenr) -+{ -+ //FIXME: implement w/efi walk -+ printk("page is ram is called!!!!!\n"); -+ return 1; -+} -+ - /* - * This installs a clean page in the kernel's page table. - */ -Index: patching/arch/powerpc/mm/mem.c -=================================================================== ---- patching.orig/arch/powerpc/mm/mem.c -+++ patching/arch/powerpc/mm/mem.c -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - #include - - #include "mmu_decl.h" -@@ -339,6 +340,19 @@ void __init mem_init(void) - max_mapnr = max_pfn; - totalram_pages += free_all_bootmem(); - #endif -+ -+#ifdef CONFIG_PPC_PSERIES -+ /* Mark the RTAS pages as PG_reserved so userspace can mmap them */ -+ if (rtas_rmo_buf) { -+ unsigned long pfn, start_pfn, end_pfn; -+ -+ start_pfn = rtas_rmo_buf >> PAGE_SHIFT; -+ end_pfn = (rtas_rmo_buf + RTAS_RMOBUF_MAX) >> PAGE_SHIFT; -+ for (pfn = start_pfn; pfn < end_pfn; pfn++) -+ SetPageReserved(pfn_to_page(pfn)); -+ } +#endif -+ - for_each_online_pgdat(pgdat) { - for (i = 0; i < pgdat->node_spanned_pages; i++) { - if (!pfn_valid(pgdat->node_start_pfn + i)) -Index: patching/arch/s390/mm/init.c -=================================================================== ---- patching.orig/arch/s390/mm/init.c -+++ patching/arch/s390/mm/init.c -@@ -148,6 +148,11 @@ void __init paging_init(void) - free_area_init_nodes(max_zone_pfns); - } - -+int page_is_ram (unsigned long pagenr) -+{ -+ return pagenr < max_mapnr; -+} -+ - void __init mem_init(void) - { - unsigned long codesize, reservedpages, datasize, initsize; -Index: patching/arch/x86_64/mm/init.c -=================================================================== ---- patching.orig/arch/x86_64/mm/init.c -+++ patching/arch/x86_64/mm/init.c -@@ -452,6 +452,28 @@ void __init clear_kernel_mapping(unsigne - __flush_tlb_all(); - } -+static inline int page_is_ram (unsigned long pagenr) -+{ -+ int i; -+ -+ for (i = 0; i < e820.nr_map; i++) { -+ unsigned long addr, end; -+ -+ if (e820.map[i].type != E820_RAM) /* not usable memory */ -+ continue; -+ /* -+ * !!!FIXME!!! Some BIOSen report areas as RAM that -+ * are not. Notably the 640->1Mb area. We need a sanity -+ * check here. -+ */ -+ addr = (e820.map[i].addr+PAGE_SIZE-1) >> PAGE_SHIFT; -+ end = (e820.map[i].addr+e820.map[i].size) >> PAGE_SHIFT; -+ if ((pagenr >= addr) && (pagenr < end)) -+ return 1; -+ } -+ return 0; -+} -+ + #ifdef CONFIG_CRASH_DUMP /* - * Memory hotplug specific functions - */ -@@ -534,6 +556,26 @@ int __add_pages(struct zone *z, unsigned - } - #endif +@@ -353,6 +355,7 @@ static ssize_t read_oldmem(struct file * + extern long vread(char *buf, char *addr, unsigned long count); + extern long vwrite(char *buf, char *addr, unsigned long count); -+/* -+ * devmem_is_allowed() checks to see if /dev/mem access to a certain address is -+ * valid. The argument is a physical page number. -+ * -+ * -+ * On x86-64, access has to be given to the first megabyte of ram because that area -+ * contains bios code and data regions used by X and dosemu and similar apps. -+ * Access has to be given to non-kernel-ram areas as well, these contain the PCI -+ * mmio resources as well as potential bios/acpi data regions. -+ */ -+int devmem_is_allowed(unsigned long pagenr) -+{ -+ if (pagenr <= 256) -+ return 1; -+ if (!page_is_ram(pagenr)) -+ return 1; -+ return 0; -+} -+ -+ - static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules, - kcore_vsyscall; - -Index: patching/drivers/char/mem.c -=================================================================== ---- patching.orig/drivers/char/mem.c -+++ patching/drivers/char/mem.c -@@ -35,6 +35,22 @@ - # include - #endif - -+static inline int range_is_allowed(unsigned long from, unsigned long to) -+{ -+ unsigned long cursor; -+ -+ cursor = from >> PAGE_SHIFT; -+ while ((cursor << PAGE_SHIFT) < to) { -+ if (!devmem_is_allowed(cursor)) { -+ printk ("Program %s tried to read /dev/mem between %lx->%lx.\n", -+ current->comm, from, to); -+ return 0; -+ } -+ cursor++; -+ } -+ return 1; -+} -+ ++#ifdef CONFIG_DEVKMEM /* - * Architectures vary in how they handle caching for addresses - * outside of main memory. -@@ -152,6 +168,8 @@ static ssize_t read_mem(struct file * fi - */ - ptr = xlate_dev_mem_ptr(p); - -+ if (!range_is_allowed(p, p+count)) -+ return -EPERM; - if (copy_to_user(buf, ptr, sz)) - return -EFAULT; - buf += sz; -@@ -209,6 +227,8 @@ static ssize_t write_mem(struct file * f - */ - ptr = xlate_dev_mem_ptr(p); - -+ if (!range_is_allowed(ptr, ptr+sz)) -+ return -EPERM; - copied = copy_from_user(ptr, buf, sz); - if (copied) { - written += sz - copied; -@@ -359,6 +379,8 @@ static ssize_t read_kmem(struct file *fi - ssize_t low_count, read, sz; - char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ - -+ return -EPERM; -+ - read = 0; - if (p < (unsigned long) high_memory) { - low_count = count; -@@ -434,126 +456,6 @@ static ssize_t read_kmem(struct file *fi - return read; + * This function reads the *virtual* memory as seen by the kernel. + */ +@@ -557,6 +560,7 @@ static ssize_t write_kmem(struct file * + *ppos = p; + return virtr + wrote; } ++#endif -- --static inline ssize_t --do_write_kmem(void *p, unsigned long realp, const char __user * buf, -- size_t count, loff_t *ppos) --{ -- ssize_t written, sz; -- unsigned long copied; -- -- written = 0; --#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED -- /* we don't have page 0 mapped on sparc and m68k.. */ -- if (realp < PAGE_SIZE) { -- unsigned long sz = PAGE_SIZE - realp; -- if (sz > count) -- sz = count; -- /* Hmm. Do something? */ -- buf += sz; -- p += sz; -- realp += sz; -- count -= sz; -- written += sz; -- } --#endif -- -- while (count > 0) { -- char *ptr; -- /* -- * Handle first page in case it's not aligned -- */ -- if (-realp & (PAGE_SIZE - 1)) -- sz = -realp & (PAGE_SIZE - 1); -- else -- sz = PAGE_SIZE; -- -- sz = min_t(unsigned long, sz, count); -- -- /* -- * On ia64 if a page has been mapped somewhere as -- * uncached, then it must also be accessed uncached -- * by the kernel or data corruption may occur -- */ -- ptr = xlate_dev_kmem_ptr(p); -- -- copied = copy_from_user(ptr, buf, sz); -- if (copied) { -- written += sz - copied; -- if (written) -- break; -- return -EFAULT; -- } -- buf += sz; -- p += sz; -- realp += sz; -- count -= sz; -- written += sz; -- } -- -- *ppos += written; -- return written; --} -- -- --/* -- * This function writes to the *virtual* memory as seen by the kernel. -- */ --static ssize_t write_kmem(struct file * file, const char __user * buf, -- size_t count, loff_t *ppos) --{ -- unsigned long p = *ppos; -- ssize_t wrote = 0; -- ssize_t virtr = 0; -- ssize_t written; -- char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ -- -- if (p < (unsigned long) high_memory) { -- -- wrote = count; -- if (count > (unsigned long) high_memory - p) -- wrote = (unsigned long) high_memory - p; -- -- written = do_write_kmem((void*)p, p, buf, wrote, ppos); -- if (written != wrote) -- return written; -- wrote = written; -- p += wrote; -- buf += wrote; -- count -= wrote; -- } -- -- if (count > 0) { -- kbuf = (char *)__get_free_page(GFP_KERNEL); -- if (!kbuf) -- return wrote ? wrote : -ENOMEM; -- while (count > 0) { -- int len = count; -- -- if (len > PAGE_SIZE) -- len = PAGE_SIZE; -- if (len) { -- written = copy_from_user(kbuf, buf, len); -- if (written) { -- if (wrote + virtr) -- break; -- free_page((unsigned long)kbuf); -- return -EFAULT; -- } -- } -- len = vwrite(kbuf, (char *)p, len); -- count -= len; -- buf += len; -- virtr += len; -- p += len; -- } -- free_page((unsigned long)kbuf); -- } -- -- *ppos = p; -- return virtr + wrote; --} -- - #if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__) + #ifdef CONFIG_DEVPORT static ssize_t read_port(struct file * file, char __user * buf, - size_t count, loff_t *ppos) -@@ -828,7 +730,6 @@ extern const struct file_operations mem_ +@@ -734,6 +738,7 @@ static const struct file_operations mem_ + .get_unmapped_area = get_unmapped_area_mem, + }; + ++#ifdef CONFIG_DEVKMEM static const struct file_operations kmem_fops = { .llseek = memory_lseek, .read = read_kmem, -- .write = write_kmem, - .mmap = mmap_kmem, +@@ -742,6 +747,7 @@ static const struct file_operations kmem .open = open_kmem, .get_unmapped_area = get_unmapped_area_mem, -@@ -964,7 +865,6 @@ static const struct { + }; ++#endif + + static const struct file_operations null_fops = { + .llseek = null_lseek, +@@ -820,11 +826,13 @@ static int memory_open(struct inode * in + filp->f_mapping->backing_dev_info = + &directly_mappable_cdev_bdi; + break; ++#ifdef CONFIG_DEVKMEM + case 2: + filp->f_op = &kmem_fops; + filp->f_mapping->backing_dev_info = + &directly_mappable_cdev_bdi; + break; ++#endif + case 3: + filp->f_op = &null_fops; + break; +@@ -873,7 +881,9 @@ static const struct { const struct file_operations *fops; } devlist[] = { /* list of minor devices */ {1, "mem", S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops}, -- {2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops}, ++#ifdef CONFIG_DEVKMEM + {2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops}, ++#endif {3, "null", S_IRUGO | S_IWUGO, &null_fops}, - #if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__) + #ifdef CONFIG_DEVPORT {4, "port", S_IRUSR | S_IWUSR | S_IRGRP, &port_fops}, -Index: patching/fs/proc/kcore.c -=================================================================== ---- patching.orig/fs/proc/kcore.c -+++ patching/fs/proc/kcore.c -@@ -23,10 +23,10 @@ - #include - - #define CORE_STR "CORE" -- -+unsigned int allow_kcore_access = 0; - static int open_kcore(struct inode * inode, struct file * filp) - { -- return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; -+ return (capable(CAP_SYS_RAWIO) && allow_kcore_access) ? 0 : -EPERM; - } - - static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *); -Index: patching/include/asm-alpha/page.h -=================================================================== ---- patching.orig/include/asm-alpha/page.h -+++ patching/include/asm-alpha/page.h -@@ -93,6 +93,8 @@ typedef unsigned long pgprot_t; - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - -+#define devmem_is_allowed(x) 1 -+ - #include - #include - -Index: patching/include/asm-arm/page.h -=================================================================== ---- patching.orig/include/asm-arm/page.h -+++ patching/include/asm-arm/page.h -@@ -192,6 +192,8 @@ typedef unsigned long pgprot_t; - - #include - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - - #endif -Index: patching/include/asm-arm26/page.h -=================================================================== ---- patching.orig/include/asm-arm26/page.h -+++ patching/include/asm-arm26/page.h -@@ -95,6 +95,8 @@ typedef unsigned long pgprot_t; - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - - #include -Index: patching/include/asm-cris/page.h -=================================================================== ---- patching.orig/include/asm-cris/page.h -+++ patching/include/asm-cris/page.h -@@ -76,6 +76,8 @@ typedef struct { unsigned long pgprot; } - #include - #include - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - - #endif /* _CRIS_PAGE_H */ -Index: patching/include/asm-h8300/page.h -=================================================================== ---- patching.orig/include/asm-h8300/page.h -+++ patching/include/asm-h8300/page.h -@@ -78,6 +78,8 @@ extern unsigned long memory_end; - #include - #include - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - - #endif /* _H8300_PAGE_H */ -Index: patching/include/asm-i386/page.h -=================================================================== ---- patching.orig/include/asm-i386/page.h -+++ patching/include/asm-i386/page.h -@@ -110,6 +110,8 @@ extern int sysctl_legacy_va_layout; - - extern int page_is_ram(unsigned long pagenr); - -+extern int devmem_is_allowed(unsigned long pagenr); -+ - #endif /* __ASSEMBLY__ */ - - #ifdef __ASSEMBLY__ -Index: patching/include/asm-ia64/page.h -=================================================================== ---- patching.orig/include/asm-ia64/page.h -+++ patching/include/asm-ia64/page.h -@@ -229,6 +229,8 @@ get_order (unsigned long size) - (((current->personality & READ_IMPLIES_EXEC) != 0) \ - ? VM_EXEC : 0)) - -+#define devmem_is_allowed(x) 1 -+ - #ifndef __ASSEMBLY__ - #ifdef CONFIG_XEN - -Index: patching/include/asm-m68k/page.h -=================================================================== ---- patching.orig/include/asm-m68k/page.h -+++ patching/include/asm-m68k/page.h -@@ -177,6 +177,8 @@ static inline void *__va(unsigned long x - - #include - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - - #endif /* _M68K_PAGE_H */ -Index: patching/include/asm-m68knommu/page.h -=================================================================== ---- patching.orig/include/asm-m68knommu/page.h -+++ patching/include/asm-m68knommu/page.h -@@ -77,6 +77,8 @@ extern unsigned long memory_end; - - #include - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - - #endif /* _M68KNOMMU_PAGE_H */ -Index: patching/include/asm-mips/page.h -=================================================================== ---- patching.orig/include/asm-mips/page.h -+++ patching/include/asm-mips/page.h -@@ -199,4 +199,6 @@ typedef struct { unsigned long pgprot; } - - #endif /* defined (__KERNEL__) */ - -+#define devmem_is_allowed(x) 1 -+ - #endif /* _ASM_PAGE_H */ -Index: patching/include/asm-parisc/page.h -=================================================================== ---- patching.orig/include/asm-parisc/page.h -+++ patching/include/asm-parisc/page.h -@@ -173,6 +173,8 @@ extern int npmem_ranges; - #include - #include - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - - #endif /* _PARISC_PAGE_H */ -Index: patching/include/asm-ppc/page.h -=================================================================== ---- patching.orig/include/asm-ppc/page.h -+++ patching/include/asm-ppc/page.h -@@ -173,6 +173,8 @@ extern __inline__ int get_order(unsigned - /* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */ - #define __HAVE_ARCH_GATE_AREA 1 - -+#define devmem_is_allowed(x) 1 -+ - #include - #endif /* __KERNEL__ */ - #endif /* _PPC_PAGE_H */ -Index: patching/include/asm-powerpc/page.h -=================================================================== ---- patching.orig/include/asm-powerpc/page.h -+++ patching/include/asm-powerpc/page.h -@@ -191,6 +191,8 @@ extern const char *arch_vma_name(struct - #include - #endif /* __ASSEMBLY__ */ - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - - #endif /* _ASM_POWERPC_PAGE_H */ -Index: patching/include/asm-s390/page.h -=================================================================== ---- patching.orig/include/asm-s390/page.h -+++ patching/include/asm-s390/page.h -@@ -166,6 +166,8 @@ static inline int pfn_valid(unsigned lon - #include - #include - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - - #endif /* _S390_PAGE_H */ -Index: patching/include/asm-sh/page.h -=================================================================== ---- patching.orig/include/asm-sh/page.h -+++ patching/include/asm-sh/page.h -@@ -148,5 +148,7 @@ typedef struct { unsigned long pgd; } pg - #define __HAVE_ARCH_GATE_AREA - #endif - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - #endif /* __ASM_SH_PAGE_H */ -Index: patching/include/asm-sh64/page.h -=================================================================== ---- patching.orig/include/asm-sh64/page.h -+++ patching/include/asm-sh64/page.h -@@ -115,5 +115,7 @@ typedef struct { unsigned long pgprot; } - #include - #include - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - #endif /* __ASM_SH64_PAGE_H */ -Index: patching/include/asm-sparc/page.h -=================================================================== ---- patching.orig/include/asm-sparc/page.h -+++ patching/include/asm-sparc/page.h -@@ -163,6 +163,8 @@ extern unsigned long pfn_base; - #include - #include - -+#define devmem_is_allowed(x) 1 -+ - #endif /* __KERNEL__ */ - - #endif /* _SPARC_PAGE_H */ -Index: patching/include/asm-sparc64/page.h -=================================================================== ---- patching.orig/include/asm-sparc64/page.h -+++ patching/include/asm-sparc64/page.h -@@ -141,6 +141,8 @@ typedef unsigned long pgprot_t; - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - -+#define devmem_is_allowed(x) 1 -+ - #include - - #endif /* __KERNEL__ */ -Index: patching/include/asm-um/page.h -=================================================================== ---- patching.orig/include/asm-um/page.h -+++ patching/include/asm-um/page.h -@@ -113,6 +113,7 @@ extern unsigned long uml_physmem; - - extern struct page *arch_validate(struct page *page, gfp_t mask, int order); - #define HAVE_ARCH_VALIDATE -+#define devmem_is_allowed(x) 1 - - extern int arch_free_page(struct page *page, int order); - #define HAVE_ARCH_FREE_PAGE -Index: patching/include/asm-v850/page.h -=================================================================== ---- patching.orig/include/asm-v850/page.h -+++ patching/include/asm-v850/page.h -@@ -126,6 +126,8 @@ typedef unsigned long pgprot_t; - #include - #include - -+#define devmem_is_allowed(x) 1 -+ - #endif /* KERNEL */ - - #endif /* __V850_PAGE_H__ */ -Index: patching/include/asm-x86_64/page.h -=================================================================== ---- patching.orig/include/asm-x86_64/page.h -+++ patching/include/asm-x86_64/page.h -@@ -138,6 +138,10 @@ typedef struct { unsigned long pgprot; } - #include - #include - -+#ifndef __ASSEMBLY__ -+extern int devmem_is_allowed(unsigned long pagenr); -+#endif -+ - #endif /* __KERNEL__ */ - - #endif /* _X86_64_PAGE_H */ -Index: patching/arch/x86_64/kernel/machine_kexec.c -=================================================================== ---- patching.orig/arch/x86_64/kernel/machine_kexec.c -+++ patching/arch/x86_64/kernel/machine_kexec.c -@@ -344,10 +344,12 @@ NORET_TYPE void machine_kexec(struct kim - * Useful for holding code to do something appropriate - * after a kernel panic. - */ -+extern int allow_kcore_access; - static int __init setup_crashkernel(char *arg) - { - unsigned long size, base; - char *p; -+ allow_kcore_access = 1; /*enable ability to read /proc/kcore*/ - if (!arg) - return -EINVAL; - size = memparse(arg, &p); + + +-- +If you want to reach me at my work email, use arjan at linux.intel.com +For development, discussion and tips for power savings, +visit http://www.lesswatts.org + linux-2.6-execshield.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6-execshield.patch Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-execshield.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-execshield.patch 24 Jul 2007 14:13:44 -0000 1.3 +++ linux-2.6-execshield.patch 6 Mar 2008 13:59:25 -0000 1.4 @@ -1,52 +1,68 @@ -Index: linux-2.6/arch/i386/kernel/cpu/common.c -=================================================================== ---- linux-2.6.orig/arch/i386/kernel/cpu/common.c -+++ linux-2.6/arch/i386/kernel/cpu/common.c -@@ -437,6 +437,13 @@ void __cpuinit identify_cpu(struct cpuin - if (disable_pse) - clear_bit(X86_FEATURE_PSE, c->x86_capability); +diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c +index f86a3c4..4c5f70d 100644 +--- a/arch/x86/kernel/cpu/common.c ++++ b/arch/x86/kernel/cpu/common.c +@@ -478,6 +478,20 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) + * we do "generic changes." + */ ++ /* ++ * emulation of NX with segment limits unfortunately means ++ * we have to disable the fast system calls, due to the way that ++ * sysexit clears the segment limits on return. ++ * If we have either disabled exec-shield on the boot command line, ++ * or we have NX, then we don't need to do this. ++ */ + if (exec_shield != 0) { -+#ifdef CONFIG_HIGHMEM64G /* NX implies PAE */ ++#ifdef CONFIG_X86_PAE + if (!test_bit(X86_FEATURE_NX, c->x86_capability)) +#endif -+ clear_bit(X86_FEATURE_SEP, c->x86_capability); ++ clear_bit(X86_FEATURE_SEP, c->x86_capability); + } + /* If the model name is still unset, do table lookup. */ if ( !c->x86_model_id[0] ) { char *p; -Index: linux-2.6/arch/i386/kernel/process.c -=================================================================== ---- linux-2.6.orig/arch/i386/kernel/process.c -+++ linux-2.6/arch/i386/kernel/process.c -@@ -647,6 +647,8 @@ struct task_struct fastcall * __switch_t +diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c +index a7d50a5..83f7b4e 100644 +--- a/arch/x86/kernel/process_32.c ++++ b/arch/x86/kernel/process_32.c +@@ -677,7 +677,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); +- + if (next_p->mm) + load_user_cs_desc(cpu, next_p->mm); - /* - * Reload esp0. -@@ -907,3 +909,60 @@ unsigned long arch_align_stack(unsigned - sp -= get_random_int() % 8192; - return sp & ~0xf; + /* we're going to use this soon, after a few expensive things */ + if (next_p->fpu_counter > 5) +diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c +index a7d50a5..86e35cb 100644 +--- a/arch/x86/kernel/process_32.c ++++ b/arch/x86/kernel/process_32.c +@@ -847,3 +847,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) + unsigned long range_end = mm->brk + 0x02000000; + return randomize_range(mm->brk, range_end, 0) ? : mm->brk; } + -+void arch_add_exec_range(struct mm_struct *mm, unsigned long limit) ++static void modify_cs(struct mm_struct *mm, unsigned long limit) +{ -+ if (limit > mm->context.exec_limit) { -+ mm->context.exec_limit = limit; -+ set_user_cs(&mm->context.user_cs, limit); -+ if (mm == current->mm) { -+ preempt_disable(); -+ load_user_cs_desc(smp_processor_id(), mm); -+ preempt_enable(); -+ } ++ mm->context.exec_limit = limit; ++ set_user_cs(&mm->context.user_cs, limit); ++ if (mm == current->mm) { ++ preempt_disable(); ++ load_user_cs_desc(smp_processor_id(), mm); ++ preempt_enable(); + } +} + ++void arch_add_exec_range(struct mm_struct *mm, unsigned long limit) ++{ ++ if (limit > mm->context.exec_limit) ++ modify_cs(mm, limit); ++} ++ +void arch_remove_exec_range(struct mm_struct *mm, unsigned long old_end) +{ + struct vm_area_struct *vma; @@ -56,14 +72,7 @@ + for (vma = mm->mmap; vma; vma = vma->vm_next) + if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) + limit = vma->vm_end; -+ -+ mm->context.exec_limit = limit; -+ set_user_cs(&mm->context.user_cs, limit); -+ if (mm == current->mm) { -+ preempt_disable(); -+ load_user_cs_desc(smp_processor_id(), mm); -+ preempt_enable(); -+ } ++ modify_cs(mm, limit); + } +} + @@ -72,35 +81,70 @@ + mm->context.exec_limit = 0; + set_user_cs(&mm->context.user_cs, 0); +} -+ -+/* -+ * Generate random brk address between 128MB and 196MB. (if the layout -+ * allows it.) -+ */ -+void randomize_brk(unsigned long old_brk) -+{ -+ unsigned long new_brk, range_start, range_end; -+ -+ range_start = 0x08000000; -+ if (current->mm->brk >= range_start) -+ range_start = current->mm->brk; -+ range_end = range_start + 0x02000000; -+ new_brk = randomize_range(range_start, range_end, 0); -+ if (new_brk) -+ current->mm->brk = new_brk; -+} -+ ---- linux-2.6.20.noarch/arch/i386/kernel/smp.c~ 2007-02-17 21:43:47.000000000 -0500 -+++ linux-2.6.20.noarch/arch/i386/kernel/smp.c 2007-02-17 21:43:53.000000000 -0500 -@@ -23,6 +23,7 @@ +diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c +index 309366f..8a940dc 100644 +--- a/arch/x86/kernel/setup64.c ++++ b/arch/x86/kernel/setup64.c +@@ -45,46 +45,6 @@ EXPORT_SYMBOL_GPL(__supported_pte_mask); + + static int do_not_nx __cpuinitdata = 0; + +-/* noexec=on|off +-Control non executable mappings for 64bit processes. +- +-on Enable(default) +-off Disable +-*/ +-static int __init nonx_setup(char *str) +-{ +- if (!str) +- return -EINVAL; +- if (!strncmp(str, "on", 2)) { +- __supported_pte_mask |= _PAGE_NX; +- do_not_nx = 0; +- } else if (!strncmp(str, "off", 3)) { +- do_not_nx = 1; +- __supported_pte_mask &= ~_PAGE_NX; +- } +- return 0; +-} +-early_param("noexec", nonx_setup); +- +-int force_personality32 = 0; +- +-/* noexec32=on|off +-Control non executable heap for 32bit processes. +-To control the stack too use noexec=off +- +-on PROT_READ does not imply PROT_EXEC for 32bit processes +-off PROT_READ implies PROT_EXEC (default) +-*/ +-static int __init nonx32_setup(char *str) +-{ +- if (!strcmp(str, "on")) +- force_personality32 &= ~READ_IMPLIES_EXEC; +- else if (!strcmp(str, "off")) +- force_personality32 |= READ_IMPLIES_EXEC; +- return 1; +-} +-__setup("noexec32=", nonx32_setup); +- + /* + * Copy data used in early init routines from the initial arrays to the + * per cpu data areas. These arrays then become expendable and the +diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c +index dc0cde9..cca75b4 100644 +--- a/arch/x86/kernel/smp_32.c [...1917 lines suppressed...] ++ unsigned long len0, unsigned long pgoff, unsigned long flags) ++{ ++ unsigned long addr = addr0, len = len0; ++ struct mm_struct *mm = current->mm; ++ struct vm_area_struct *vma; ++ unsigned long tmp; ++ ++ if (len > TASK_SIZE) ++ return -ENOMEM; + -+ __get_user(insn, (unsigned char *)(regs->eip + i)); -+ printk("%02x ", insn); ++ if (flags & MAP_FIXED) ++ return addr; ++ ++ if (!addr) { ++ addr = randomize_range(SHLIB_BASE, 0x01000000, len); ++ } else { ++ addr = PAGE_ALIGN(addr); ++ vma = find_vma(mm, addr); ++ if (TASK_SIZE - len >= addr && ++ (!vma || addr + len <= vma->vm_start)) ++ return addr; ++ } ++ ++ addr = SHLIB_BASE; ++ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) { ++ /* At this point: (!vma || addr < vma->vm_end). */ ++ if (TASK_SIZE - len < addr) ++ return -ENOMEM; ++ ++ if (!vma || addr + len <= vma->vm_start) { ++ /* ++ * Must not let a PROT_EXEC mapping get into the ++ * brk area: ++ */ ++ if (addr + len > mm->brk) ++ goto failed; ++ ++ /* ++ * Up until the brk area we randomize addresses ++ * as much as possible: ++ */ ++ if (addr >= 0x01000000) { ++ tmp = randomize_range(0x01000000, ++ PAGE_ALIGN(max(mm->start_brk, ++ (unsigned long)0x08000000)), len); ++ vma = find_vma(mm, tmp); ++ if (TASK_SIZE - len >= tmp && ++ (!vma || tmp + len <= vma->vm_start)) ++ return tmp; ++ } ++ /* ++ * Ok, randomization didnt work out - return ++ * the result of the linear search: ++ */ ++ return addr; + } ++ addr = vma->vm_end; + } -+#endif -+ printk("\n"); -+ show_regs(regs); -+} + -+static int __init setup_print_fatal_signals(char *str) ++failed: ++ return current->mm->get_unmapped_area(filp, addr0, len0, pgoff, flags); ++} + +-EXPORT_SYMBOL(get_unmapped_area); + + /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ + struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr) +@@ -1506,6 +1585,14 @@ out: + return prev ? prev->vm_next : vma; + } + ++static int over_stack_limit(unsigned long sz) +{ -+ get_option (&str, &print_fatal_signals); -+ -+ return 1; ++ if (sz < EXEC_STACK_BIAS) ++ return 0; ++ return (sz - EXEC_STACK_BIAS) > ++ current->signal->rlim[RLIMIT_STACK].rlim_cur; +} + -+__setup("print-fatal-signals=", setup_print_fatal_signals); + /* + * Verify that the stack growth is acceptable and + * update accounting. This is shared with both the +@@ -1522,7 +1609,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un + return -ENOMEM; + + /* Stack limit test */ +- if (size > rlim[RLIMIT_STACK].rlim_cur) ++ if (over_stack_limit(size)) + return -ENOMEM; + + /* mlock limit tests */ +@@ -1826,10 +1913,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, + if (new->vm_ops && new->vm_ops->open) + new->vm_ops->open(new); + +- if (new_below) ++ if (new_below) { ++ unsigned long old_end = vma->vm_end; ++ + vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff + + ((addr - new->vm_start) >> PAGE_SHIFT), new); +- else ++ if (vma->vm_flags & VM_EXEC) ++ arch_remove_exec_range(mm, old_end); ++ } else + vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); - static int - specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) -@@ -1795,6 +1826,8 @@ relock: - * Anything else is fatal, maybe with a core dump. - */ - current->flags |= PF_SIGNALED; -+ if (print_fatal_signals) -+ print_fatal_signal(regs, signr); - if (sig_kernel_coredump(signr)) { - /* - * If it was able to dump core, this kills all -Index: linux-2.6/mm/mprotect.c -=================================================================== ---- linux-2.6.orig/mm/mprotect.c -+++ linux-2.6/mm/mprotect.c -@@ -23,6 +23,7 @@ + return 0; +@@ -2048,6 +2139,7 @@ void exit_mmap(struct mm_struct *mm) + vm_unacct_memory(nr_accounted); + free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); + tlb_finish_mmu(tlb, 0, end); ++ arch_flush_exec_range(mm); + + /* + * Walk the list again, actually closing and freeing it, +diff --git a/mm/mprotect.c b/mm/mprotect.c +index 4de5468..6d822ad 100644 +--- a/mm/mprotect.c ++++ b/mm/mprotect.c +@@ -23,8 +23,12 @@ #include #include #include +#include #include #include ++#ifdef CONFIG_X86 ++#include ++#endif -@@ -135,7 +136,7 @@ mprotect_fixup(struct vm_area_struct *vm + static void change_pte_range(struct mm_struct *mm, pmd_t *pmd, + unsigned long addr, unsigned long end, pgprot_t newprot, +@@ -134,7 +138,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, struct mm_struct *mm = vma->vm_mm; unsigned long oldflags = vma->vm_flags; long nrpages = (end - start) >> PAGE_SHIFT; @@ -1709,7 +1003,7 @@ pgoff_t pgoff; int error; int dirty_accountable = 0; -@@ -201,6 +202,9 @@ success: +@@ -198,6 +202,9 @@ success: dirty_accountable = 1; } @@ -1719,11 +1013,11 @@ if (is_vm_hugetlb_page(vma)) hugetlb_change_protection(vma, start, end, vma->vm_page_prot); else -Index: linux-2.6/mm/mremap.c -=================================================================== ---- linux-2.6.orig/mm/mremap.c -+++ linux-2.6/mm/mremap.c -@@ -389,8 +389,8 @@ unsigned long do_mremap(unsigned long ad +diff --git a/mm/mremap.c b/mm/mremap.c +index 08e3c7f..101f885 100644 +--- a/mm/mremap.c ++++ b/mm/mremap.c +@@ -392,8 +392,8 @@ unsigned long do_mremap(unsigned long addr, if (vma->vm_flags & VM_MAYSHARE) map_flags |= MAP_SHARED; @@ -1731,6 +1025,6 @@ - vma->vm_pgoff, map_flags); + new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len, + vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC); - ret = new_addr; - if (new_addr & ~PAGE_MASK) + if (new_addr & ~PAGE_MASK) { + ret = new_addr; goto out; linux-2.6-input-kill-stupid-messages.patch: Index: linux-2.6-input-kill-stupid-messages.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-input-kill-stupid-messages.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-input-kill-stupid-messages.patch 22 Mar 2007 16:01:16 -0000 1.1 +++ linux-2.6-input-kill-stupid-messages.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -1,16 +1,17 @@ ---- linux-2.6.17.noarch/drivers/input/keyboard/atkbd.c~ 2006-06-26 19:11:36.659767000 -0400 -+++ linux-2.6.17.noarch/drivers/input/keyboard/atkbd.c 2006-06-26 19:12:23.643737000 -0400 -@@ -383,9 +383,13 @@ static irqreturn_t atkbd_interrupt(struc +--- linux-2.6.21.noarch/drivers/input/keyboard/atkbd.c~ 2007-07-06 10:51:04.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/input/keyboard/atkbd.c 2007-07-06 10:51:33.000000000 -0400 +@@ -409,10 +409,14 @@ static irqreturn_t atkbd_interrupt(struc goto out; case ATKBD_RET_ACK: case ATKBD_RET_NAK: +#if 0 + /* Quite a few key switchers and other tools trigger this and it confuses + people who can do nothing about it */ - printk(KERN_WARNING "atkbd.c: Spurious %s on %s. " - "Some program might be trying access hardware directly.\n", - data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys); + if (printk_ratelimit()) + printk(KERN_WARNING "atkbd.c: Spurious %s on %s. " + "Some program might be trying access hardware directly.\n", + data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys); +#endif goto out; - case ATKBD_RET_HANGEUL: - case ATKBD_RET_HANJA: + case ATKBD_RET_ERR: + atkbd->err_count++; linux-2.6-net-silence-noisy-printks.patch: Index: linux-2.6-net-silence-noisy-printks.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-net-silence-noisy-printks.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-net-silence-noisy-printks.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-net-silence-noisy-printks.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -4,123 +4,14 @@ Signed-off-by: Dave Jones -diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c -index 56b2f75..b2b36c7 100644 ---- a/net/ipv4/netfilter/ip_conntrack_standalone.c -+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c -@@ -458,11 +458,8 @@ static unsigned int ip_conntrack_local(unsigned int hooknum, - { +--- linux-2.6.23.noarch/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c~ 2007-10-16 13:56:02.000000000 -0400 ++++ linux-2.6.23.noarch/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2007-10-16 13:56:08.000000000 -0400 +@@ -176,8 +176,6 @@ static unsigned int ipv4_conntrack_local /* root is playing with raw sockets. */ - if ((*pskb)->len < sizeof(struct iphdr) -- || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) { + if (skb->len < sizeof(struct iphdr) || + ip_hdrlen(skb) < sizeof(struct iphdr)) { - if (net_ratelimit()) - printk("ipt_hook: happy cracking.\n"); -+ || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) return NF_ACCEPT; -- } - return ip_conntrack_in(hooknum, pskb, in, out, okfn); - } - -diff --git a/net/ipv4/netfilter/iptable_filter.c b/net/ipv4/netfilter/iptable_filter.c -index d1d61e9..acd903e 100644 ---- a/net/ipv4/netfilter/iptable_filter.c -+++ b/net/ipv4/netfilter/iptable_filter.c -@@ -102,11 +102,8 @@ ipt_local_out_hook(unsigned int hook, - { - /* root is playing with raw sockets. */ - if ((*pskb)->len < sizeof(struct iphdr) -- || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) { -- if (net_ratelimit()) -- printk("ipt_hook: happy cracking.\n"); -+ || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) - return NF_ACCEPT; -- } - - return ipt_do_table(pskb, hook, in, out, &packet_filter); - } -diff --git a/net/ipv4/netfilter/iptable_mangle.c b/net/ipv4/netfilter/iptable_mangle.c -index 98b66ef..8d7bf96 100644 ---- a/net/ipv4/netfilter/iptable_mangle.c -+++ b/net/ipv4/netfilter/iptable_mangle.c -@@ -136,11 +136,8 @@ ipt_local_hook(unsigned int hook, - - /* root is playing with raw sockets. */ - if ((*pskb)->len < sizeof(struct iphdr) -- || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) { -- if (net_ratelimit()) -- printk("ipt_hook: happy cracking.\n"); -+ || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) - return NF_ACCEPT; -- } - - /* Save things which could affect route */ - mark = (*pskb)->mark; -diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c -index 8f3e92d..4e3d6f6 100644 ---- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c -+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c -@@ -199,11 +199,8 @@ static unsigned int ipv4_conntrack_local(unsigned int hooknum, - { - /* root is playing with raw sockets. */ - if ((*pskb)->len < sizeof(struct iphdr) -- || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) { -- if (net_ratelimit()) -- printk("ipt_hook: happy cracking.\n"); -+ || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) - return NF_ACCEPT; -- } - return nf_conntrack_in(PF_INET, hooknum, pskb); - } - -diff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c -index 112a21d..847e6a4 100644 ---- a/net/ipv6/netfilter/ip6table_filter.c -+++ b/net/ipv6/netfilter/ip6table_filter.c -@@ -102,11 +102,8 @@ ip6t_local_out_hook(unsigned int hook, - #if 0 - /* root is playing with raw sockets. */ - if ((*pskb)->len < sizeof(struct iphdr) -- || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) { -- if (net_ratelimit()) -- printk("ip6t_hook: happy cracking.\n"); -+ || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) - return NF_ACCEPT; -- } - #endif - - return ip6t_do_table(pskb, hook, in, out, &packet_filter); -diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c -index 0c468d3..6c80e35 100644 ---- a/net/ipv6/netfilter/ip6table_mangle.c -+++ b/net/ipv6/netfilter/ip6table_mangle.c -@@ -138,11 +138,8 @@ ip6t_local_hook(unsigned int hook, - #if 0 - /* root is playing with raw sockets. */ - if ((*pskb)->len < sizeof(struct iphdr) -- || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) { -- if (net_ratelimit()) -- printk("ip6t_hook: happy cracking.\n"); -+ || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr)) - return NF_ACCEPT; -- } - #endif - - /* save source/dest address, mark, hoplimit, flowlabel, priority, */ - - - -Remove noisy, easy to trigger (as user even, with sfuzz) printk. - -Signed-off-by: Dave Jones - ---- linux-2.6.20.noarch/net/irda/af_irda.c~ 2007-04-19 19:07:21.000000000 -0400 -+++ linux-2.6.20.noarch/net/irda/af_irda.c 2007-04-19 19:07:28.000000000 -0400 -@@ -1143,8 +1143,6 @@ static int irda_create(struct socket *so - self->max_sdu_size_rx = TTP_SAR_UNBOUND; - break; - default: -- IRDA_ERROR("%s: protocol not supported!\n", -- __FUNCTION__); - return -ESOCKTNOSUPPORT; - } - break; + } + return nf_conntrack_in(PF_INET, hooknum, skb); linux-2.6-ppc32-ucmpdi2.patch: Index: linux-2.6-ppc32-ucmpdi2.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-ppc32-ucmpdi2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-ppc32-ucmpdi2.patch 22 Mar 2007 16:01:16 -0000 1.1 +++ linux-2.6-ppc32-ucmpdi2.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -1,3 +1,8 @@ +Without this diff, nouveau doesn't build on ppc32. +It works around a gcc bug. (PR #25724 / #21237) + +Hopefully we can just drop this when we move to gcc4.3 + --- linux-2.6.19.ppc/arch/powerpc/kernel/misc_32.S~ 2006-11-29 21:57:37.000000000 +0000 +++ linux-2.6.19.ppc/arch/powerpc/kernel/misc_32.S 2006-12-17 12:19:48.000000000 +0000 @@ -728,6 +728,27 @@ _GLOBAL(__lshrdi3) linux-2.6-ps3-ehci-iso.patch: Index: linux-2.6-ps3-ehci-iso.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-ps3-ehci-iso.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-ps3-ehci-iso.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-ps3-ehci-iso.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -18,18 +18,27 @@ Signed-off-by: Geoff Levand --- - drivers/usb/host/ehci-sched.c | 34 ++++++++++++++++++++++++++++++---- - 1 file changed, 30 insertions(+), 4 deletions(-) + drivers/usb/host/ehci-sched.c | 30 ++++++++++++++++++++++++++++++ + 1 files changed, 30 insertions(+) ---- ps3-linux-dev.orig/drivers/usb/host/ehci-sched.c -+++ ps3-linux-dev/drivers/usb/host/ehci-sched.c -@@ -1168,8 +1168,21 @@ itd_urb_transaction ( +--- a/drivers/usb/host/ehci-sched.c ++++ b/drivers/usb/host/ehci-sched.c +@@ -21,6 +21,10 @@ + + /*-------------------------------------------------------------------------*/ + ++#ifdef CONFIG_PPC_PS3 ++#include ++#endif ++ + /* + * EHCI scheduled transaction support: interrupt, iso, split iso + * These are called "periodic" transactions in the EHCI spec. +@@ -1302,8 +1306,21 @@ itd_urb_transaction ( if (likely (!list_empty(&stream->free_list))) { itd = list_entry (stream->free_list.prev, - struct ehci_itd, itd_list); -- list_del (&itd->itd_list); -- itd_dma = itd->itd_dma; -+#if defined(CONFIG_PPC_PS3) + struct ehci_itd, itd_list); ++#ifdef CONFIG_PPC_PS3 + /* Fix for Cell SCC ISO transfer (PS3 Bluetooth). */ + if (firmware_has_feature(FW_FEATURE_PS3_LV1) + && itd->frame == ((ehci_readl(ehci, @@ -41,19 +50,17 @@ + itd_dma = itd->itd_dma; + } +#else -+ list_del (&itd->itd_list); -+ itd_dma = itd->itd_dma; + list_del (&itd->itd_list); + itd_dma = itd->itd_dma; +#endif } else itd = NULL; -@@ -1784,8 +1797,21 @@ sitd_urb_transaction ( +@@ -1922,8 +1939,21 @@ sitd_urb_transaction ( if (!list_empty(&stream->free_list)) { sitd = list_entry (stream->free_list.prev, struct ehci_sitd, sitd_list); -- list_del (&sitd->sitd_list); -- sitd_dma = sitd->sitd_dma; -+#if defined(CONFIG_PPC_PS3) ++#ifdef CONFIG_PPC_PS3 + /* Fix for Cell SCC ISO transfer (PS3 Bluetooth). */ + if (firmware_has_feature(FW_FEATURE_PS3_LV1) + && sitd->frame == ((ehci_readl(ehci, @@ -65,8 +72,8 @@ + sitd_dma = sitd->sitd_dma; + } +#else -+ list_del (&sitd->sitd_list); -+ sitd_dma = sitd->sitd_dma; + list_del (&sitd->sitd_list); + sitd_dma = sitd->sitd_dma; +#endif } else sitd = NULL; linux-2.6-selinux-mprotect-checks.patch: Index: linux-2.6-selinux-mprotect-checks.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-selinux-mprotect-checks.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-selinux-mprotect-checks.patch 24 Jan 2007 01:28:48 -0000 1.1 +++ linux-2.6-selinux-mprotect-checks.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -1,3 +1,6 @@ +This needs a fixed toolchain, and a userspace rebuild to work. +For this reason, it's had difficulty getting upstream. + --- linux-2.6.16-rc3/security/selinux/hooks.c 2006-02-13 13:19:09.000000000 -0500 +++ linux-2.6.16-rc3-x/security/selinux/hooks.c 2006-02-14 14:44:48.000000000 -0500 @@ -2365,7 +2365,6 @@ static int selinux_file_ioctl(struct fil linux-2.6-serial-460800.patch: Index: linux-2.6-serial-460800.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-serial-460800.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-serial-460800.patch 24 Jan 2007 01:28:48 -0000 1.1 +++ linux-2.6-serial-460800.patch 6 Mar 2008 13:59:25 -0000 1.2 @@ -38,13 +38,13 @@ switch (termios->c_cflag & CSIZE) { case CS5: -@@ -1697,7 +1708,8 @@ +@@ -2034,7 +2034,8 @@ serial8250_set_termios(struct uart_port /* * Ask the core to calculate the divisor for us. */ -- baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); +- baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); + max_baud = (up->port.type == PORT_16C950 ? port->uartclk/4 : port->uartclk/16); -+ baud = uart_get_baud_rate(port, termios, old, 0, max_baud); ++ baud = uart_get_baud_rate(port, termios, old, 0, max_baud); quot = serial8250_get_divisor(port, baud); /* @@ -52,7 +52,7 @@ */ spin_lock_irqsave(&up->port.lock, flags); -+ /* ++ /* + * 16C950 supports additional prescaler ratios between 1:16 and 1:4 + * thus increasing max baud rate to uartclk/4. + */ @@ -64,7 +64,7 @@ + else + serial_icr_write(up, UART_TCR, 0); + } -+ ++ /* * Update the per-port timeout. */ linux-2.6-silence-noise.patch: Index: linux-2.6-silence-noise.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-silence-noise.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-silence-noise.patch 24 Jul 2007 14:13:44 -0000 1.3 +++ linux-2.6-silence-noise.patch 6 Mar 2008 13:59:25 -0000 1.4 @@ -1,5 +1,5 @@ ---- linux-2.6.18.noarch/arch/x86_64/mm/init.c~ 2006-10-16 17:09:56.000000000 -0400 -+++ linux-2.6.18.noarch/arch/x86_64/mm/init.c 2006-10-16 17:10:09.000000000 -0400 +--- linux-2.6.18.noarch/arch/x86/mm/init_64.c~ 2006-10-16 17:09:56.000000000 -0400 ++++ linux-2.6.18.noarch/arch/x86/mm/init_64.c 2006-10-16 17:10:09.000000000 -0400 @@ -337,10 +337,6 @@ static void __init find_early_table_spac table_start >>= PAGE_SHIFT; @@ -32,8 +32,8 @@ "#%d:%llx@%llx for %s\n", res->flags & IORESOURCE_IO ? "I/O" : "mem", resno, (unsigned long long)(res->end - res->start + 1), ---- linux-2.6.19.noarch/arch/i386/pci/i386.c~ 2006-12-04 11:21:32.000000000 -0500 -+++ linux-2.6.19.noarch/arch/i386/pci/i386.c 2006-12-04 11:22:10.000000000 -0500 +--- linux-2.6.19.noarch/arch/x86/pci/i386.c~ 2006-12-04 11:21:32.000000000 -0500 ++++ linux-2.6.19.noarch/arch/x86/pci/i386.c 2006-12-04 11:22:10.000000000 -0500 @@ -112,7 +112,7 @@ static void __init pcibios_allocate_bus_ pr = pci_find_parent_resource(dev, r); if (!r->start || !pr || @@ -52,28 +52,7 @@ "resource region %d " "of device %s\n", idx, pci_name(dev)); ---- linux-2.6.20.noarch/drivers/base/power/main.c~ 2007-04-12 15:29:10.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/base/power/main.c 2007-04-12 15:29:34.000000000 -0400 -@@ -53,9 +53,6 @@ int device_pm_add(struct device * dev) - { - int error; - -- pr_debug("PM: Adding info for %s:%s\n", -- dev->bus ? dev->bus->name : "No Bus", -- kobject_name(&dev->kobj)); - down(&dpm_list_sem); - list_add_tail(&dev->power.entry, &dpm_active); - device_pm_set_parent(dev, dev->parent); -@@ -67,9 +64,6 @@ int device_pm_add(struct device * dev) - - void device_pm_remove(struct device * dev) - { -- pr_debug("PM: Removing info for %s:%s\n", -- dev->bus ? dev->bus->name : "No Bus", -- kobject_name(&dev->kobj)); - down(&dpm_list_sem); - dpm_sysfs_remove(dev); - put_device(dev->power.pm_parent); + Remove noisy PM printk. This has served its purpose. @@ -97,3 +76,29 @@ } pci_restore_pcix_state(dev); pci_restore_msi_state(dev); + + +diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c +index d887d5c..80be564 100644 +--- a/drivers/base/power/main.c ++++ b/drivers/base/power/main.c +@@ -64,9 +64,6 @@ int (*platform_enable_wakeup)(struct device *dev, int is_on); + */ + void device_pm_add(struct device *dev) + { +- pr_debug("PM: Adding info for %s:%s\n", +- dev->bus ? dev->bus->name : "No Bus", +- kobject_name(&dev->kobj)); + mutex_lock(&dpm_list_mtx); + list_add_tail(&dev->power.entry, &dpm_active); + mutex_unlock(&dpm_list_mtx); +@@ -80,9 +77,6 @@ void device_pm_add(struct device *dev) + */ + void device_pm_remove(struct device *dev) + { +- pr_debug("PM: Removing info for %s:%s\n", +- dev->bus ? dev->bus->name : "No Bus", +- kobject_name(&dev->kobj)); + mutex_lock(&dpm_list_mtx); + dpm_sysfs_remove(dev); + list_del_init(&dev->power.entry); linux-2.6-squashfs.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6-squashfs.patch Index: linux-2.6-squashfs.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-squashfs.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-squashfs.patch 24 Jul 2007 14:13:44 -0000 1.3 +++ linux-2.6-squashfs.patch 6 Mar 2008 13:59:25 -0000 1.4 @@ -1,26 +1,28 @@ -diff -x .gitignore -Nurp linux-2.6.20/fs/Kconfig linux-2.6.20-squashfs3.2-r2/fs/Kconfig ---- linux-2.6.20/fs/Kconfig 2006-12-25 01:13:12.000000000 +0000 -+++ linux-2.6.20-squashfs3.2-r2/fs/Kconfig 2007-01-16 02:06:03.000000000 +0000 -@@ -1404,6 +1404,71 @@ config CRAMFS +diff --git a/fs/Kconfig b/fs/Kconfig +index d731282..cab44a1 100644 +--- a/fs/Kconfig ++++ b/fs/Kconfig +@@ -1367,6 +1367,56 @@ config CRAMFS If unsure, say N. +config SQUASHFS -+ tristate "SquashFS 3.2 - Squashed file system support" ++ tristate "SquashFS 3.3 - Squashed file system support" + select ZLIB_INFLATE + help -+ Saying Y here includes support for SquashFS 3.2 (a Compressed Read-Only File -+ System). Squashfs is a highly compressed read-only filesystem for Linux. -+ It uses zlib compression to compress both files, inodes and directories. -+ Inodes in the system are very small and all blocks are packed to minimise -+ data overhead. Block sizes greater than 4K are supported up to a maximum of 64K. -+ SquashFS 3.1 supports 64 bit filesystems and files (larger than 4GB), full -+ uid/gid information, hard links and timestamps. -+ -+ Squashfs is intended for general read-only filesystem use, for archival -+ use (i.e. in cases where a .tar.gz file may be used), and in embedded -+ systems where low overhead is needed. Further information and filesystem tools -+ are available from http://squashfs.sourceforge.net. ++ Saying Y here includes support for SquashFS 3.3 (a Compressed ++ Read-Only File System). Squashfs is a highly compressed read-only ++ filesystem for Linux. It uses zlib compression to compress both ++ files, inodes and directories. Inodes in the system are very small ++ and all blocks are packed to minimise data overhead. Block sizes ++ greater than 4K are supported up to a maximum of 1 Mbytes (default ++ block size 128K). SquashFS 3.3 supports 64 bit filesystems and files ++ (larger than 4GB), full uid/gid information, hard links and timestamps. ++ ++ Squashfs is intended for general read-only filesystem use, for ++ archival use (i.e. in cases where a .tar.gz file may be used), and in ++ embedded systems where low overhead is needed. Further information ++ and filesystem tools are available from http://squashfs.sourceforge.net. + + If you want to compile this as a module ( = code which can be + inserted in and removed from the running kernel whenever you want), @@ -32,13 +34,11 @@ + +config SQUASHFS_EMBEDDED + -+ bool "Additional options for memory-constrained systems" ++ bool "Additional option for memory-constrained systems" + depends on SQUASHFS + default n + help -+ Saying Y here allows you to specify cache sizes and how Squashfs -+ allocates memory. This is only intended for memory constrained -+ systems. ++ Saying Y here allows you to specify cache size. + + If unsure, say N. + @@ -56,43 +56,45 @@ + Note there must be at least one cached fragment. Anything + much more than three will probably not make much difference. + -+config SQUASHFS_VMALLOC -+ bool "Use Vmalloc rather than Kmalloc" if SQUASHFS_EMBEDDED -+ depends on SQUASHFS -+ default n -+ help -+ By default SquashFS uses kmalloc to obtain fragment cache memory. -+ Kmalloc memory is the standard kernel allocator, but it can fail -+ on memory constrained systems. Because of the way Vmalloc works, -+ Vmalloc can succeed when kmalloc fails. Specifying this option -+ will make SquashFS always use Vmalloc to allocate the -+ fragment cache memory. -+ -+ If unsure, say N. -+ config VXFS_FS tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" depends on BLOCK -diff -x .gitignore -Nurp linux-2.6.20/fs/Makefile linux-2.6.20-squashfs3.2-r2/fs/Makefile ---- linux-2.6.20/fs/Makefile 2006-12-25 01:13:12.000000000 +0000 -+++ linux-2.6.20-squashfs3.2-r2/fs/Makefile 2007-01-16 02:06:03.000000000 +0000 -@@ -68,6 +68,7 @@ obj-$(CONFIG_JBD) += jbd/ +diff --git a/fs/Makefile b/fs/Makefile +index 1e7a11b..3faf857 100644 +--- a/fs/Makefile ++++ b/fs/Makefile +@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD) += jbd/ obj-$(CONFIG_JBD2) += jbd2/ obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_CRAMFS) += cramfs/ +obj-$(CONFIG_SQUASHFS) += squashfs/ - obj-$(CONFIG_RAMFS) += ramfs/ + obj-y += ramfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_CODA_FS) += coda/ -diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/inode.c linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c ---- linux-2.6.20/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c 2007-01-16 02:28:36.000000000 +0000 -@@ -0,0 +1,2329 @@ +diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile +new file mode 100644 +index 0000000..1bc7b06 +--- /dev/null ++++ b/fs/squashfs/Makefile +@@ -0,0 +1,7 @@ ++# ++# Makefile for the linux squashfs routines. ++# ++ ++obj-$(CONFIG_SQUASHFS) += squashfs.o ++squashfs-y += inode.o ++squashfs-y += squashfs2_0.o +diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c +new file mode 100644 +index 0000000..f578528 +--- /dev/null ++++ b/fs/squashfs/inode.c +@@ -0,0 +1,2178 @@ +/* + * Squashfs - a compressed read only filesystem for Linux + * + * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher ++ * Phillip Lougher + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License @@ -121,10 +123,12 @@ +#include +#include +#include ++#include + +#include "squashfs.h" + -+static void vfs_read_inode(struct inode *i); ++int squashfs_cached_blks; ++ +static struct dentry *squashfs_get_parent(struct dentry *child); +static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode); +static int squashfs_statfs(struct dentry *, struct kstatfs *); @@ -133,7 +137,6 @@ + int readahead_blks, char *block_list, + unsigned short **block_p, unsigned int *bsize); +static int squashfs_readpage(struct file *file, struct page *page); -+static int squashfs_readpage4K(struct file *file, struct page *page); +static int squashfs_readdir(struct file *, void *, filldir_t); +static struct dentry *squashfs_lookup(struct inode *, struct dentry *, + struct nameidata *); @@ -171,7 +174,6 @@ + .destroy_inode = squashfs_destroy_inode, + .statfs = squashfs_statfs, + .put_super = squashfs_put_super, -+ .read_inode = vfs_read_inode +}; + +static struct export_operations squashfs_export_ops = { @@ -186,10 +188,6 @@ + .readpage = squashfs_readpage +}; + -+SQSH_EXTERN const struct address_space_operations squashfs_aops_4K = { -+ .readpage = squashfs_readpage4K -+}; -+ +static const struct file_operations squashfs_dir_ops = { + .read = generic_read_dir, + .readdir = squashfs_readdir @@ -273,30 +271,36 @@ +{ + struct squashfs_sb_info *msblk = s->s_fs_info; + struct squashfs_super_block *sblk = &msblk->sblk; -+ struct buffer_head *bh[((SQUASHFS_FILE_MAX_SIZE - 1) >> -+ msblk->devblksize_log2) + 2]; ++ struct buffer_head **bh; + unsigned int offset = index & ((1 << msblk->devblksize_log2) - 1); + unsigned int cur_index = index >> msblk->devblksize_log2; + int bytes, avail_bytes, b = 0, k = 0; + unsigned int compressed; + unsigned int c_byte = length; + ++ bh = kmalloc(((sblk->block_size >> msblk->devblksize_log2) + 1) * ++ sizeof(struct buffer_head *), GFP_KERNEL); ++ if (bh == NULL) ++ goto read_failure; ++ + if (c_byte) { [...2115 lines suppressed...] -+#endif -+ -+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY -+extern int squashfs_2_0_supported(struct squashfs_sb_info *msblk); -+#else -+static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk) -+{ -+ return 0; -+} -+#endif -diff -x .gitignore -Nurp linux-2.6.20/include/linux/squashfs_fs.h linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs.h ---- linux-2.6.20/include/linux/squashfs_fs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs.h 2007-01-12 00:06:09.000000000 +0000 -@@ -0,0 +1,934 @@ +diff --git a/include/linux/squashfs_fs.h b/include/linux/squashfs_fs.h +new file mode 100644 +index 0000000..e60308e +--- /dev/null ++++ b/include/linux/squashfs_fs.h +@@ -0,0 +1,935 @@ +#ifndef SQUASHFS_FS +#define SQUASHFS_FS + @@ -3276,7 +3119,7 @@ + * Squashfs + * + * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher ++ * Phillip Lougher + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License @@ -3299,16 +3142,9 @@ +#define CONFIG_SQUASHFS_2_0_COMPATIBILITY +#endif + -+#ifdef CONFIG_SQUASHFS_VMALLOC -+#define SQUASHFS_ALLOC(a) vmalloc(a) -+#define SQUASHFS_FREE(a) vfree(a) -+#else -+#define SQUASHFS_ALLOC(a) kmalloc(a, GFP_KERNEL) -+#define SQUASHFS_FREE(a) kfree(a) -+#endif +#define SQUASHFS_CACHED_FRAGMENTS CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE +#define SQUASHFS_MAJOR 3 -+#define SQUASHFS_MINOR 0 ++#define SQUASHFS_MINOR 1 +#define SQUASHFS_MAGIC 0x73717368 +#define SQUASHFS_MAGIC_SWAP 0x68737173 +#define SQUASHFS_START 0 @@ -3318,10 +3154,10 @@ +#define SQUASHFS_METADATA_LOG 13 + +/* default size of data blocks */ -+#define SQUASHFS_FILE_SIZE 65536 -+#define SQUASHFS_FILE_LOG 16 ++#define SQUASHFS_FILE_SIZE 131072 ++#define SQUASHFS_FILE_LOG 17 + -+#define SQUASHFS_FILE_MAX_SIZE 65536 ++#define SQUASHFS_FILE_MAX_SIZE 1048576 + +/* Max number of uids and gids */ +#define SQUASHFS_UIDS 256 @@ -3402,9 +3238,8 @@ + +#define SQUASHFS_COMPRESSED_BIT_BLOCK (1 << 24) + -+#define SQUASHFS_COMPRESSED_SIZE_BLOCK(B) (((B) & \ -+ ~SQUASHFS_COMPRESSED_BIT_BLOCK) ? (B) & \ -+ ~SQUASHFS_COMPRESSED_BIT_BLOCK : SQUASHFS_COMPRESSED_BIT_BLOCK) ++#define SQUASHFS_COMPRESSED_SIZE_BLOCK(B) ((B) & \ ++ ~SQUASHFS_COMPRESSED_BIT_BLOCK) + +#define SQUASHFS_COMPRESSED_BLOCK(B) (!((B) & SQUASHFS_COMPRESSED_BIT_BLOCK)) + @@ -3900,6 +3735,15 @@ + unsigned int start_block:24; +} __attribute__ ((packed)); + ++union squashfs_inode_header_1 { ++ struct squashfs_base_inode_header_1 base; ++ struct squashfs_dev_inode_header_1 dev; ++ struct squashfs_symlink_inode_header_1 symlink; ++ struct squashfs_reg_inode_header_1 reg; ++ struct squashfs_dir_inode_header_1 dir; ++ struct squashfs_ipc_inode_header_1 ipc; ++}; ++ +#define SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, n) \ + SQUASHFS_MEMSET(s, d, n);\ + SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\ @@ -4203,9 +4047,11 @@ + +#endif +#endif -diff -x .gitignore -Nurp linux-2.6.20/include/linux/squashfs_fs_i.h linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_i.h ---- linux-2.6.20/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_i.h 2007-01-12 00:06:09.000000000 +0000 +diff --git a/include/linux/squashfs_fs_i.h b/include/linux/squashfs_fs_i.h +new file mode 100644 +index 0000000..76a3a5a +--- /dev/null ++++ b/include/linux/squashfs_fs_i.h @@ -0,0 +1,45 @@ +#ifndef SQUASHFS_FS_I +#define SQUASHFS_FS_I @@ -4213,7 +4059,7 @@ + * Squashfs + * + * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher ++ * Phillip Lougher + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License @@ -4252,17 +4098,19 @@ + struct inode vfs_inode; +}; +#endif -diff -x .gitignore -Nurp linux-2.6.20/include/linux/squashfs_fs_sb.h linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_sb.h ---- linux-2.6.20/include/linux/squashfs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20-squashfs3.2-r2/include/linux/squashfs_fs_sb.h 2007-01-12 01:23:47.000000000 +0000 -@@ -0,0 +1,74 @@ +diff --git a/include/linux/squashfs_fs_sb.h b/include/linux/squashfs_fs_sb.h +new file mode 100644 +index 0000000..e5fa802 +--- /dev/null ++++ b/include/linux/squashfs_fs_sb.h +@@ -0,0 +1,76 @@ +#ifndef SQUASHFS_FS_SB +#define SQUASHFS_FS_SB +/* + * Squashfs + * + * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 -+ * Phillip Lougher ++ * Phillip Lougher + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License @@ -4322,6 +4170,8 @@ + struct meta_index *meta_index; + z_stream stream; + long long *inode_lookup_table; ++ int unused_cache_blks; ++ int unused_frag_blks; + int (*read_inode)(struct inode *i, squashfs_inode_t \ + inode); + long long (*read_blocklist)(struct inode *inode, int \ @@ -4330,9 +4180,10 @@ + int (*read_fragment_index_table)(struct super_block *s); +}; +#endif -diff -x .gitignore -Nurp linux-2.6.20/init/do_mounts_rd.c linux-2.6.20-squashfs3.2-r2/init/do_mounts_rd.c ---- linux-2.6.20/init/do_mounts_rd.c 2006-11-29 21:57:37.000000000 +0000 -+++ linux-2.6.20-squashfs3.2-r2/init/do_mounts_rd.c 2007-01-16 02:06:03.000000000 +0000 +diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c +index 3ac5904..0ddd43c 100644 +--- a/init/do_mounts_rd.c ++++ b/init/do_mounts_rd.c @@ -5,6 +5,7 @@ #include #include @@ -4341,7 +4192,7 @@ #include #include -@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in +@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, int out_fd); * numbers could not be found. * * We currently check for the following magic numbers: @@ -4349,7 +4200,7 @@ * minix * ext2 * romfs -@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start +@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start_block) struct ext2_super_block *ext2sb; struct romfs_super_block *romfsb; struct cramfs_super *cramfsb; @@ -4357,7 +4208,7 @@ int nblocks = -1; unsigned char *buf; -@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start +@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start_block) ext2sb = (struct ext2_super_block *) buf; romfsb = (struct romfs_super_block *) buf; cramfsb = (struct cramfs_super *) buf; @@ -4365,7 +4216,7 @@ memset(buf, 0xe5, size); /* -@@ -101,6 +105,18 @@ identify_ramdisk_image(int fd, int start +@@ -101,6 +105,18 @@ identify_ramdisk_image(int fd, int start_block) goto done; } linux-2.6-utrace-core.patch: Index: linux-2.6-utrace-core.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-core.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-core.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-core.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -19,42 +19,38 @@ --- + kernel/Makefile | 1 + kernel/utrace.c | 2383 +++++++++++++++++++++++++++++++++++++ + Documentation/utrace.txt | 579 +++++++++ Documentation/DocBook/Makefile | 2 Documentation/DocBook/utrace.tmpl | 23 - Documentation/utrace.txt | 579 ++++++++++ - include/linux/sched.h | 5 include/linux/tracehook.h | 85 + - include/linux/utrace.h | 544 +++++++++ + include/linux/utrace.h | 544 ++++++++ + include/linux/sched.h | 5 init/Kconfig | 18 - kernel/Makefile | 1 - kernel/utrace.c | 2141 ++++++++++++++++++++++++++++++++++++++ - 9 files changed, 3380 insertions(+), 18 deletions(-) + 9 files changed, 3622 insertions(+), 18 deletions(-) create kernel/utrace.c create Documentation/utrace.txt create Documentation/DocBook/utrace.tmpl create include/linux/utrace.h -Index: b/kernel/Makefile -=================================================================== ---- a/kernel/Makefile -+++ b/kernel/Makefile -@@ -51,6 +51,7 @@ obj-$(CONFIG_SYSCTL) += utsname_sysctl.o - obj-$(CONFIG_UTS_NS) += utsname.o +--- linux-2.6/kernel/Makefile ++++ linux-2.6/kernel/Makefile +@@ -57,6 +57,7 @@ obj-$(CONFIG_SYSCTL) += utsname_sysctl.o obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o + obj-$(CONFIG_MARKERS) += marker.o +obj-$(CONFIG_UTRACE) += utrace.o ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y) # According to Alan Modra , the -fno-omit-frame-pointer is -Index: b/kernel/utrace.c -=================================================================== ---- /dev/null -+++ b/kernel/utrace.c -@@ -0,0 +1,2141 @@ +--- linux-2.6/kernel/utrace.c ++++ linux-2.6/kernel/utrace.c +@@ -0,0 +1,2383 @@ +/* + * utrace infrastructure interface for debugging user processes + * -+ * Copyright (C) 2006, 2007 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions @@ -125,11 +121,11 @@ + utrace_cachep = + kmem_cache_create("utrace_cache", + sizeof(struct utrace), 0, -+ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); ++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); + utrace_engine_cachep = + kmem_cache_create("utrace_engine_cache", + sizeof(struct utrace_attached_engine), 0, -+ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); ++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); + return 0; +} +subsys_initcall(utrace_init); @@ -154,12 +150,13 @@ + * to attach. The PF_STARTING flag is cleared after its + * report_clone hook has had a chance to run. + */ -+ if ((target->flags & PF_STARTING) -+ && (current->utrace == NULL -+ || current->utrace->u.live.cloning != target)) { -+ yield(); -+ return (signal_pending(current) -+ ? ERR_PTR(-ERESTARTNOINTR) : NULL); ++ if (target->flags & PF_STARTING) { ++ utrace = current->utrace; ++ if (utrace == NULL || utrace->u.live.cloning != target) { ++ yield(); ++ return (signal_pending(current) ++ ? ERR_PTR(-ERESTARTNOINTR) : NULL); ++ } + } + + utrace = kmem_cache_alloc(utrace_cachep, GFP_KERNEL); @@ -359,7 +356,18 @@ + * which will call release_task itself. + */ + read_unlock(&tasklist_lock); ++ } + ++ /* ++ * When it's in TASK_STOPPED state, do not set UTRACE_EVENT(JCTL). ++ * That bit indicates utrace_report_jctl has not run yet, but it ++ * may have. Set UTRACE_ACTION_QUIESCE instead to be sure that ++ * once it resumes it will recompute its flags in utrace_quiescent. ++ */ ++ if (((flags &~ tsk->utrace_flags) & UTRACE_EVENT(JCTL)) ++ && tsk->state == TASK_STOPPED) { ++ flags &= ~UTRACE_EVENT(JCTL); ++ flags |= UTRACE_ACTION_QUIESCE; + } + + tsk->utrace_flags = flags; @@ -405,7 +413,7 @@ +static int +quiesce(struct task_struct *target, int interrupt) +{ -+ int quiescent; ++ int ret; + + target->utrace_flags |= UTRACE_ACTION_QUIESCE; + read_barrier_depends(); @@ -413,27 +421,62 @@ + if (target->exit_state) + goto dead; + -+ quiescent = target->state & (TASK_TRACED | TASK_STOPPED); -+ if (!quiescent) { ++ /* ++ * First a quick check without the siglock. If it's in TASK_TRACED ++ * or TASK_STOPPED already, we know it is going to go through ++ * utrace_get_signal before it resumes. ++ */ ++ ret = 1; ++ switch (target->state) { ++ case TASK_TRACED: ++ break; ++ ++ case TASK_STOPPED: ++ /* ++ * If it will call utrace_report_jctl but has not gotten ++ * through it yet, then don't consider it quiescent yet. ++ * utrace_report_jctl will take target->utrace->lock and ++ * clear UTRACE_EVENT(JCTL) once it finishes. After that, ++ * it is considered quiescent; when it wakes up, it will go ++ * through utrace_get_signal before doing anything else. ++ */ ++ if (!(target->utrace_flags & UTRACE_EVENT(JCTL))) ++ break; ++ ++ default: ++ /* ++ * Now get the siglock and check again. ++ */ + spin_lock_irq(&target->sighand->siglock); + if (unlikely(target->exit_state)) { + spin_unlock_irq(&target->sighand->siglock); + goto dead; + } -+ quiescent = unlikely(target->state -+ & (TASK_TRACED | TASK_STOPPED)); -+ if (!quiescent) { ++ switch (target->state) { ++ case TASK_TRACED: ++ break; ++ ++ case TASK_STOPPED: ++ ret = !(target->utrace_flags & UTRACE_EVENT(JCTL)); ++ break; ++ ++ default: ++ /* ++ * It is not stopped, so tell it to stop soon. ++ */ ++ ret = 0; + if (interrupt) + signal_wake_up(target, 0); + else { + set_tsk_thread_flag(target, TIF_SIGPENDING); + kick_process(target); + } ++ break; + } + spin_unlock_irq(&target->sighand->siglock); + } + -+ return quiescent; ++ return ret; + +dead: + /* @@ -479,7 +522,7 @@ + */ +struct utrace_attached_engine * +utrace_attach(struct task_struct *target, int flags, -+ const struct utrace_engine_ops *ops, void *data) ++ const struct utrace_engine_ops *ops, void *data) +{ + struct utrace *utrace; + struct utrace_attached_engine *engine; @@ -494,6 +537,8 @@ + * Check this first; a race with reaping may lead to restart. + */ + rcu_read_unlock(); ++ if (!(flags & UTRACE_ATTACH_CREATE)) ++ return ERR_PTR(-ENOENT); + return ERR_PTR(-ESRCH); + } + @@ -579,10 +624,13 @@ +EXPORT_SYMBOL_GPL(utrace_attach); + +/* -+ * When an engine is detached, the target thread may still see it and make -+ * callbacks until it quiesces. We reset its event flags to just QUIESCE -+ * and install a special ops vector whose callback is dead_engine_delete. -+ * When the target thread quiesces, it can safely free the engine itself. ++ * When an engine is detached, the target thread may still see it ++ * and make callbacks until it quiesces. We install a special ops ++ * vector whose callbacks are all dead_engine_delete. When the ++ * target thread quiesces, it can safely free the engine itself. ++ * We must cover all callbacks in case of races between checking ++ * engine->flags and utrace_detach changing engine->ops. ++ * Only report_reap is never called due to a special case in utrace_reap. + */ +static u32 +dead_engine_delete(struct utrace_attached_engine *engine, @@ -591,9 +639,38 @@ + return UTRACE_ACTION_DETACH; +} + ++/* ++ * Don't use .report_xxx = ... style here because this way makes it easier ++ * to be sure we're forced to have an initializer here for every member. ++ */ +static const struct utrace_engine_ops dead_engine_ops = +{ -+ .report_quiesce = &dead_engine_delete ++ (u32 (*)(struct utrace_attached_engine *, struct task_struct *, ++ unsigned long, struct task_struct *)) &dead_engine_delete, ++ (u32 (*)(struct utrace_attached_engine *, struct task_struct *, ++ pid_t)) &dead_engine_delete, ++ &dead_engine_delete, ++ (u32 (*)(struct utrace_attached_engine *, struct task_struct *, ++ struct pt_regs *, u32, siginfo_t *, ++ const struct k_sigaction *, struct k_sigaction *)) ++ &dead_engine_delete, ++ (u32 (*)(struct utrace_attached_engine *, struct task_struct *, ++ int)) &dead_engine_delete, ++ (u32 (*)(struct utrace_attached_engine *, struct task_struct *, ++ const struct linux_binprm *, struct pt_regs *)) ++ &dead_engine_delete, ++ (u32 (*)(struct utrace_attached_engine *, struct task_struct *, ++ struct pt_regs *)) &dead_engine_delete, ++ (u32 (*)(struct utrace_attached_engine *, struct task_struct *, ++ struct pt_regs *)) &dead_engine_delete, ++ (u32 (*)(struct utrace_attached_engine *, struct task_struct *, ++ long, long *)) &dead_engine_delete, ++ (u32 (*)(struct utrace_attached_engine *, struct task_struct *)) ++ &dead_engine_delete, ++ NULL, /* report_reap */ ++ NULL, /* allow_access_process_vm */ ++ NULL, /* unsafe_exec */ ++ NULL, /* tracer_task */ +}; + + @@ -799,9 +876,32 @@ + return ret; + } + -+ flags = engine->flags; -+ engine->flags = UTRACE_EVENT(QUIESCE) | UTRACE_ACTION_QUIESCE; ++ /* ++ * This must work while the target thread races with us doing: ++ * if (engine->flags & UTRACE_EVENT(x)) REPORT(x, ...); ++ * The REPORT macro uses smp_rmb() between checking engine->flags ++ * and using engine->ops. Here we change engine->ops first, then ++ * use smp_wmb() before changing engine->flags. This ensures it ++ * can check the old flags before using the old ops, or check the ++ * old flags before using the new ops, or check the new flags ++ * before using the new ops, but can never check the new flags ++ * before using the old ops. Hence, dead_engine_ops might be used ++ * with any old flags in place. So, it has report_* callback ++ * pointers for every event type. Since it has to have those ++ * anyway, we enable (for after any potential race) all the events ++ * that have no overhead to enable. We want it to get into that ++ * callback and complete the detach ASAP. ++ */ + rcu_assign_pointer(engine->ops, &dead_engine_ops); ++ smp_wmb(); ++ flags = engine->flags; ++ engine->flags = (UTRACE_EVENT(QUIESCE) ++ | UTRACE_EVENT(CLONE) ++ | UTRACE_EVENT(VFORK_DONE) ++ | UTRACE_EVENT(EXEC) ++ | UTRACE_EVENT(EXIT) ++ | UTRACE_EVENT(JCTL) ++ | UTRACE_ACTION_QUIESCE); + + if (quiesce(target, 1)) { + remove_engine(engine, target, utrace); @@ -926,7 +1026,7 @@ +{ + struct utrace *utrace; + int report; -+ unsigned long old_flags, old_utrace_flags; ++ unsigned long old_flags, old_utrace_flags, set_utrace_flags; + int ret = -EALREADY; + +#ifdef ARCH_HAS_SINGLE_STEP @@ -960,6 +1060,22 @@ + } + + /* ++ * When it's in TASK_STOPPED state, do not set UTRACE_EVENT(JCTL). ++ * That bit indicates utrace_report_jctl has not run yet and so the ++ * target cannot be considered quiescent. But if the bit wasn't ++ * already set, it can't be in running in there and really is ++ * quiescent now in its existing job control stop. We set ++ * UTRACE_ACTION_QUIESCE to be sure that once it resumes it will ++ * recompute its flags in utrace_quiescent. ++ */ ++ set_utrace_flags = flags; ++ if (((set_utrace_flags &~ old_utrace_flags) & UTRACE_EVENT(JCTL)) ++ && target->state == TASK_STOPPED) { ++ set_utrace_flags &= ~UTRACE_EVENT(JCTL); ++ set_utrace_flags |= UTRACE_ACTION_QUIESCE; ++ } ++ ++ /* + * When setting these flags, it's essential that we really + * synchronize with exit_notify. They cannot be set after + * exit_notify takes the tasklist_lock. By holding the read @@ -969,20 +1085,20 @@ + * knows positively that utrace_report_death will be called or + * that it won't. + */ -+ if ((flags &~ old_utrace_flags) & (UTRACE_ACTION_NOREAP -+ | DEATH_EVENTS)) { ++ if ((set_utrace_flags &~ old_utrace_flags) & (UTRACE_ACTION_NOREAP ++ | DEATH_EVENTS)) { + read_lock(&tasklist_lock); + if (unlikely(target->exit_state)) { + read_unlock(&tasklist_lock); + spin_unlock(&utrace->lock); + return ret; + } -+ target->utrace_flags |= flags; ++ target->utrace_flags |= set_utrace_flags; + read_unlock(&tasklist_lock); + } + + engine->flags = flags; -+ target->utrace_flags |= flags; ++ target->utrace_flags |= set_utrace_flags; + ret = 0; + + report = 0; @@ -1104,10 +1220,20 @@ + return ret; +} + -+#define REPORT(callback, ...) do { \ -+ u32 ret = (*rcu_dereference(engine->ops)->callback) \ -+ (engine, tsk, ##__VA_ARGS__); \ -+ action = update_action(tsk, utrace, engine, ret); \ ++/* ++ * This macro is always used after checking engine->flags. ++ * The smp_rmb() here pairs with smp_wmb() in utrace_detach. ++ * engine->ops changes before engine->flags, so the flags we ++ * just tested properly enabled this report for the real ops, ++ * or harmlessly enabled it for dead_engine_ops. ++ */ ++#define REPORT(callback, ...) \ ++ do { \ ++ u32 ret; \ ++ smp_rmb(); \ ++ ret = (*rcu_dereference(engine->ops)->callback) \ ++ (engine, tsk, ##__VA_ARGS__); \ ++ action = update_action(tsk, utrace, engine, ret); \ + } while (0) + + @@ -1145,9 +1271,11 @@ + * This must be current to be sure it's not possibly + * getting into utrace_report_death. + */ ++ struct utrace *utrace; + BUG_ON(tsk != current); -+ spin_lock(&tsk->utrace->lock); -+ action = remove_detached(tsk, tsk->utrace, action, ~0UL); ++ utrace = tsk->utrace; ++ spin_lock(&utrace->lock); ++ action = remove_detached(tsk, utrace, action, ~0UL); + } + return action; +} @@ -1251,6 +1379,18 @@ + spin_unlock_irq(&tsk->sighand->siglock); + } + ++ /* ++ * We clear the UTRACE_EVENT(JCTL) bit to indicate that we are now ++ * in a truly quiescent TASK_STOPPED state. After this, we can be ++ * detached by another thread. Setting UTRACE_ACTION_QUIESCE ++ * ensures that we will go through utrace_quiescent and recompute ++ * flags after we resume. ++ */ ++ spin_lock(&utrace->lock); ++ tsk->utrace_flags &= ~UTRACE_EVENT(JCTL); ++ tsk->utrace_flags |= UTRACE_ACTION_QUIESCE; ++ spin_unlock(&utrace->lock); ++ + return action & UTRACE_JCTL_NOSIGCHLD; +} + @@ -1294,6 +1434,7 @@ + */ + if (action & UTRACE_ACTION_QUIESCE) { + int killed; ++ int stop; + + if (signal != NULL) { + BUG_ON(utrace->u.live.signal != NULL); @@ -1310,7 +1451,8 @@ + * Never stop when there is a SIGKILL bringing us down. + */ + killed = sigkill_pending(tsk); -+ if (!killed && (tsk->utrace_flags & UTRACE_ACTION_QUIESCE)) { ++ stop = !killed && (tsk->utrace_flags & UTRACE_ACTION_QUIESCE); ++ if (likely(stop)) { + set_current_state(TASK_TRACED); + /* + * If there is a group stop in progress, @@ -1332,10 +1474,32 @@ + */ + BUG_ON(tsk->utrace != utrace); + BUG_ON(utrace->u.live.signal != signal); ++ ++ if (likely(stop)) { ++ /* ++ * Synchronize with any utrace_detach ++ * that might be in progress. We were ++ * just now quiescent in TASK_TRACED, ++ * and it expected us to stay there. ++ * But SIGKILL might have broken that. ++ * Taking this lock here serializes its ++ * work so that if it had the lock and ++ * thought we were still in TASK_TRACED, ++ * we block until it has finished ++ * looking at utrace. A utrace_detach ++ * that gets the lock after we release ++ * it here will not think we are ++ * quiescent at all, since we are in ++ * TASK_RUNNING state now. ++ */ ++ spin_lock(&utrace->lock); ++ spin_unlock(&utrace->lock); ++ } ++ + utrace->u.live.signal = NULL; + } + -+ if (killed) /* Game over, man! */ ++ if (unlikely(killed)) /* Game over, man! */ + return 1; + + /* @@ -1630,6 +1794,7 @@ + struct list_head *pos, *next; + struct utrace_attached_engine *engine; + unsigned long action, ev; ++ int killed; + +/* + XXX pass syscall # to engine hook directly, let it return inhibit-action @@ -1653,12 +1818,32 @@ + break; + } + action = check_detach(tsk, action); -+ if (unlikely(check_quiescent(tsk, action)) && !is_exit) ++ killed = check_quiescent(tsk, action); ++ ++ if (!is_exit) { ++ if (unlikely(killed)) ++ /* ++ * We are continuing despite QUIESCE because of a ++ * SIGKILL. Don't let the system call actually ++ * proceed. ++ */ ++ tracehook_abort_syscall(regs); ++ + /* -+ * We are continuing despite QUIESCE because of a SIGKILL. -+ * Don't let the system call actually proceed. ++ * Clear TIF_SIGPENDING if it no longer needs to be set. ++ * It may have been set as part of quiescence, and won't ++ * ever have been cleared by another thread. For other ++ * reports, we can just leave it set and will go through ++ * utrace_get_signal to reset things. But here we are ++ * about to enter a syscall, which might bail out with an ++ * -ERESTART* error if it's set now. + */ -+ tracehook_abort_syscall(regs); ++ if (signal_pending(tsk)) { ++ spin_lock_irq(&tsk->sighand->siglock); ++ recalc_sigpending(); ++ spin_unlock_irq(&tsk->sighand->siglock); ++ } ++ } +} + + @@ -1726,12 +1911,50 @@ + __releases(tsk->sighand->siglock) + __acquires(tsk->sighand->siglock) +{ -+ struct utrace *utrace = tsk->utrace; ++ struct utrace *utrace; + struct utrace_signal signal = { info, return_ka, 0 }; + struct k_sigaction *ka; + unsigned long action, event; + + /* ++ * We could have been considered quiescent while we were in ++ * TASK_STOPPED, and detached asynchronously. If we woke up ++ * and checked tsk->utrace_flags before that was finished, ++ * we might be here with utrace already removed or in the ++ * middle of being removed. ++ */ ++ rcu_read_lock(); ++ utrace = rcu_dereference(tsk->utrace); ++ if (unlikely(utrace == NULL)) { ++ rcu_read_unlock(); ++ return 0; ++ } ++ if (!(tsk->utrace_flags & UTRACE_EVENT(JCTL))) { ++ /* ++ * It's possible we might have just been in TASK_STOPPED ++ * and subject to the aforementioned race. ++ * ++ * RCU makes it safe to get the utrace->lock even if it's ++ * being freed. Once we have that lock, either an external ++ * detach has finished and this struct has been freed, or ++ * else we know we are excluding any other detach attempt. ++ * Since we are no longer in TASK_STOPPED now, all we ++ * needed the lock for was to order any quiesce() call after us. ++ */ ++ spin_unlock_irq(&tsk->sighand->siglock); ++ spin_lock(&utrace->lock); ++ if (unlikely(tsk->utrace != utrace)) { ++ spin_unlock(&utrace->lock); ++ rcu_read_unlock(); ++ cond_resched(); ++ return -1; ++ } ++ spin_unlock(&utrace->lock); ++ spin_lock_irq(&tsk->sighand->siglock); ++ } ++ rcu_read_unlock(); ++ ++ /* + * If a signal was injected previously, it could not use our + * stack space directly. It had to allocate a data structure, + * which we can now copy out of and free. @@ -1805,13 +2028,28 @@ + */ + if (signal.signr != 0) { + if (signal.return_ka == NULL) { -+ ka = &tsk->sighand->action[signal.signr - 1]; ++ /* ++ * utrace_inject_signal recorded this to have us ++ * use the injected signal's normal sigaction. We ++ * have to perform the SA_ONESHOT work now because ++ * our caller will never touch the real sigaction. ++ */ ++ ka = &tsk->sighand->action[info->si_signo - 1]; ++ *return_ka = *ka; + if (ka->sa.sa_flags & SA_ONESHOT) + ka->sa.sa_handler = SIG_DFL; -+ *return_ka = *ka; + } + else + BUG_ON(signal.return_ka != return_ka); ++ ++ /* ++ * We already processed the SA_ONESHOT work ahead of time. ++ * Once we return nonzero, our caller will only refer to ++ * return_ka. So we must clear the flag to be sure it ++ * doesn't clear return_ka->sa.sa_handler. ++ */ ++ return_ka->sa.sa_flags &= ~SA_ONESHOT; ++ + return signal.signr; + } + @@ -2192,10 +2430,8 @@ + + return unsafe; +} -Index: b/Documentation/utrace.txt -=================================================================== ---- /dev/null -+++ b/Documentation/utrace.txt +--- linux-2.6/Documentation/utrace.txt ++++ linux-2.6/Documentation/utrace.txt @@ -0,0 +1,579 @@ +DRAFT DRAFT DRAFT WORK IN PROGRESS DRAFT DRAFT DRAFT + @@ -2776,10 +3012,8 @@ +sure which event callbacks it will or won't see after utrace_set_flags +has returned. By checking for errors, it can know whether to clean up +its data structures immediately or to let its callbacks do the work. -Index: b/Documentation/DocBook/Makefile -=================================================================== ---- a/Documentation/DocBook/Makefile -+++ b/Documentation/DocBook/Makefile +--- linux-2.6/Documentation/DocBook/Makefile ++++ linux-2.6/Documentation/DocBook/Makefile @@ -9,7 +9,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ kernel-hacking.xml kernel-locking.xml deviceiobook.xml \ @@ -2787,12 +3021,10 @@ - kernel-api.xml filesystems.xml lsm.xml usb.xml \ + kernel-api.xml filesystems.xml lsm.xml utrace.xml usb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ - genericirq.xml + genericirq.xml s390-drivers.xml uio-howto.xml -Index: b/Documentation/DocBook/utrace.tmpl -=================================================================== ---- /dev/null -+++ b/Documentation/DocBook/utrace.tmpl +--- linux-2.6/Documentation/DocBook/utrace.tmpl ++++ linux-2.6/Documentation/DocBook/utrace.tmpl @@ -0,0 +1,23 @@ + + + + -Index: b/include/linux/tracehook.h -=================================================================== ---- a/include/linux/tracehook.h -+++ b/include/linux/tracehook.h +--- linux-2.6/include/linux/tracehook.h ++++ linux-2.6/include/linux/tracehook.h @@ -28,6 +28,7 @@ #include @@ -2829,7 +3059,7 @@ struct linux_binprm; struct pt_regs; -@@ -342,6 +343,7 @@ utrace_regset_copyin_ignore(unsigned int +@@ -353,6 +354,7 @@ utrace_regset_copyin_ignore(unsigned int */ static inline void tracehook_init_task(struct task_struct *child) { @@ -2837,7 +3067,7 @@ } /* -@@ -350,6 +352,9 @@ static inline void tracehook_init_task(s +@@ -361,6 +363,9 @@ static inline void tracehook_init_task(s */ static inline void tracehook_release_task(struct task_struct *p) { @@ -2847,7 +3077,7 @@ } /* -@@ -360,7 +365,20 @@ static inline void tracehook_release_tas +@@ -370,7 +375,20 @@ static inline void tracehook_release_tas */ static inline int tracehook_check_released(struct task_struct *p) { @@ -2869,7 +3099,7 @@ } /* -@@ -371,7 +389,7 @@ static inline int tracehook_check_releas +@@ -381,7 +399,7 @@ static inline int tracehook_check_releas static inline int tracehook_notify_cldstop(struct task_struct *tsk, const siginfo_t *info) { @@ -2878,7 +3108,7 @@ } /* -@@ -385,7 +403,11 @@ static inline int tracehook_notify_cldst +@@ -395,7 +413,11 @@ static inline int tracehook_notify_cldst static inline int tracehook_notify_death(struct task_struct *tsk, int *noreap, void **death_cookie) { @@ -2891,7 +3121,7 @@ *noreap = 0; return 0; } -@@ -398,7 +420,8 @@ static inline int tracehook_notify_death +@@ -408,7 +430,8 @@ static inline int tracehook_notify_death static inline int tracehook_consider_fatal_signal(struct task_struct *tsk, int sig) { @@ -2901,7 +3131,7 @@ } /* -@@ -411,7 +434,7 @@ static inline int tracehook_consider_ign +@@ -421,7 +444,7 @@ static inline int tracehook_consider_ign int sig, void __user *handler) { @@ -2910,7 +3140,7 @@ } -@@ -422,7 +445,7 @@ static inline int tracehook_consider_ign +@@ -432,7 +455,7 @@ static inline int tracehook_consider_ign */ static inline int tracehook_induce_sigpending(struct task_struct *tsk) { @@ -2919,7 +3149,7 @@ } /* -@@ -437,6 +460,8 @@ static inline int tracehook_get_signal(s +@@ -447,6 +470,8 @@ static inline int tracehook_get_signal(s siginfo_t *info, struct k_sigaction *return_ka) { @@ -2928,7 +3158,7 @@ return 0; } -@@ -449,6 +474,8 @@ static inline int tracehook_get_signal(s +@@ -459,6 +484,8 @@ static inline int tracehook_get_signal(s */ static inline int tracehook_finish_stop(int last_one) { @@ -2937,7 +3167,7 @@ return 0; } -@@ -460,7 +487,7 @@ static inline int tracehook_finish_stop( +@@ -470,7 +497,7 @@ static inline int tracehook_finish_stop( */ static inline int tracehook_inhibit_wait_stopped(struct task_struct *child) { @@ -2946,7 +3176,7 @@ } /* -@@ -470,7 +497,7 @@ static inline int tracehook_inhibit_wait +@@ -480,7 +507,7 @@ static inline int tracehook_inhibit_wait */ static inline int tracehook_inhibit_wait_zombie(struct task_struct *child) { @@ -2955,7 +3185,7 @@ } /* -@@ -480,7 +507,7 @@ static inline int tracehook_inhibit_wait +@@ -490,7 +517,7 @@ static inline int tracehook_inhibit_wait */ static inline int tracehook_inhibit_wait_continued(struct task_struct *child) { @@ -2964,7 +3194,7 @@ } -@@ -490,13 +517,9 @@ static inline int tracehook_inhibit_wait +@@ -500,13 +527,9 @@ static inline int tracehook_inhibit_wait */ static inline int tracehook_unsafe_exec(struct task_struct *tsk) { @@ -2980,7 +3210,7 @@ } /* -@@ -511,6 +534,8 @@ static inline int tracehook_unsafe_exec( +@@ -521,6 +544,8 @@ static inline int tracehook_unsafe_exec( */ static inline struct task_struct *tracehook_tracer_task(struct task_struct *p) { @@ -2989,7 +3219,7 @@ return NULL; } -@@ -522,6 +547,8 @@ static inline int tracehook_allow_access +@@ -532,6 +557,8 @@ static inline int tracehook_allow_access { if (tsk == current) return 1; @@ -2998,7 +3228,7 @@ return 0; } -@@ -533,7 +560,7 @@ static inline int tracehook_allow_access +@@ -543,7 +570,7 @@ static inline int tracehook_allow_access */ static inline int tracehook_expect_breakpoints(struct task_struct *tsk) { @@ -3007,18 +3237,18 @@ } -@@ -556,6 +583,10 @@ static inline int tracehook_expect_break +@@ -566,6 +593,10 @@ static inline int tracehook_expect_break static inline void tracehook_report_death(struct task_struct *tsk, int exit_state, void *death_cookie) { + smp_mb(); + if (tsk_utrace_flags(tsk) & (UTRACE_EVENT(DEATH) -+ | UTRACE_ACTION_QUIESCE)) ++ | UTRACE_EVENT(QUIESCE))) + utrace_report_death(tsk, death_cookie); } /* -@@ -565,14 +596,18 @@ static inline void tracehook_report_deat +@@ -575,14 +606,18 @@ static inline void tracehook_report_deat */ static inline void tracehook_report_delayed_group_leader(struct task_struct *p) { @@ -3038,7 +3268,7 @@ } /* -@@ -581,6 +616,8 @@ static inline void tracehook_report_exec +@@ -591,6 +626,8 @@ static inline void tracehook_report_exec */ static inline void tracehook_report_exit(long *exit_code) { @@ -3047,7 +3277,7 @@ } /* -@@ -595,6 +632,8 @@ static inline void tracehook_report_exit +@@ -605,6 +642,8 @@ static inline void tracehook_report_exit static inline void tracehook_report_clone(unsigned long clone_flags, struct task_struct *child) { @@ -3056,7 +3286,7 @@ } /* -@@ -608,6 +647,8 @@ static inline void tracehook_report_clon +@@ -618,6 +657,8 @@ static inline void tracehook_report_clon pid_t pid, struct task_struct *child) { @@ -3065,7 +3295,7 @@ } /* -@@ -619,6 +660,8 @@ static inline void tracehook_report_clon +@@ -629,6 +670,8 @@ static inline void tracehook_report_clon static inline void tracehook_report_vfork_done(struct task_struct *child, pid_t child_pid) { @@ -3074,7 +3304,7 @@ } /* -@@ -626,6 +669,9 @@ static inline void tracehook_report_vfor +@@ -636,6 +679,9 @@ static inline void tracehook_report_vfor */ static inline void tracehook_report_syscall(struct pt_regs *regs, int is_exit) { @@ -3084,7 +3314,7 @@ } /* -@@ -645,6 +691,11 @@ static inline void tracehook_report_hand +@@ -655,6 +701,11 @@ static inline void tracehook_report_hand const sigset_t *oldset, struct pt_regs *regs) { @@ -3096,10 +3326,8 @@ } -Index: b/include/linux/utrace.h -=================================================================== ---- /dev/null -+++ b/include/linux/utrace.h +--- linux-2.6/include/linux/utrace.h ++++ linux-2.6/include/linux/utrace.h @@ -0,0 +1,544 @@ +/* + * utrace infrastructure interface for debugging user processes @@ -3645,11 +3873,9 @@ +#endif /* CONFIG_UTRACE */ + +#endif /* linux/utrace.h */ -Index: b/include/linux/sched.h -=================================================================== ---- a/include/linux/sched.h -+++ b/include/linux/sched.h -@@ -941,6 +941,11 @@ struct task_struct { +--- linux-2.6/include/linux/sched.h ++++ linux-2.6/include/linux/sched.h +@@ -1064,6 +1064,11 @@ struct task_struct { struct audit_context *audit_context; seccomp_t seccomp; @@ -3661,14 +3887,13 @@ /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; -Index: b/init/Kconfig -=================================================================== ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -595,6 +595,24 @@ config STOP_MACHINE - Need stop_machine() primitive. - endmenu +--- linux-2.6/init/Kconfig ++++ linux-2.6/init/Kconfig +@@ -762,3 +762,21 @@ source "block/Kconfig" + config PREEMPT_NOTIFIERS + bool ++ +menu "Process debugging support" + +config UTRACE @@ -3686,7 +3911,3 @@ + kernel and are very sure you don't need these facilitiies, + say Y. +endmenu -+ - menu "Block layer" - source "block/Kconfig" - endmenu linux-2.6-utrace-ptrace-compat-ia64.patch: Index: linux-2.6-utrace-ptrace-compat-ia64.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-ptrace-compat-ia64.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-ptrace-compat-ia64.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-ptrace-compat-ia64.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -8,15 +8,13 @@ --- - arch/ia64/ia32/sys_ia32.c | 40 + - arch/ia64/kernel/ptrace.c | 1016 +++++----------------------------------------- - 2 files changed, 159 insertions(+), 897 deletions(-) + arch/ia64/ia32/sys_ia32.c | 40 ++ + arch/ia64/kernel/ptrace.c | 1019 +++++---------------------------------------- + 2 files changed, 159 insertions(+), 900 deletions(-) -Index: b/arch/ia64/ia32/sys_ia32.c -=================================================================== ---- a/arch/ia64/ia32/sys_ia32.c -+++ b/arch/ia64/ia32/sys_ia32.c -@@ -2340,6 +2340,46 @@ const struct utrace_regset_view utrace_i +--- linux-2.6/arch/ia64/ia32/sys_ia32.c ++++ linux-2.6/arch/ia64/ia32/sys_ia32.c +@@ -2344,6 +2344,46 @@ const struct utrace_regset_view utrace_i }; #endif @@ -63,10 +61,8 @@ typedef struct { unsigned int ss_sp; unsigned int ss_flags; -Index: b/arch/ia64/kernel/ptrace.c -=================================================================== ---- a/arch/ia64/kernel/ptrace.c -+++ b/arch/ia64/kernel/ptrace.c +--- linux-2.6/arch/ia64/kernel/ptrace.c ++++ linux-2.6/arch/ia64/kernel/ptrace.c @@ -554,81 +554,6 @@ ia64_sync_user_rbs (struct task_struct * return 0; } @@ -149,7 +145,7 @@ /* * Write f32-f127 back to task->thread.fph if it has been modified. */ -@@ -792,828 +717,6 @@ access_nat_bits (struct task_struct *chi +@@ -792,831 +717,6 @@ access_nat_bits (struct task_struct *chi return 0; } @@ -324,10 +320,14 @@ - return 0; - - case PT_CR_IPSR: -- if (write_access) -- pt->cr_ipsr = ((*data & IPSR_MASK) +- if (write_access) { +- unsigned long tmp = *data; +- /* psr.ri==3 is a reserved value: SDM 2:25 */ +- if ((tmp & IA64_PSR_RI) == IA64_PSR_RI) +- tmp &= ~IA64_PSR_RI; +- pt->cr_ipsr = ((tmp & IPSR_MASK) - | (pt->cr_ipsr & ~IPSR_MASK)); -- else +- } else - *data = (pt->cr_ipsr & IPSR_MASK); - return 0; - @@ -950,7 +950,6 @@ - - case PTRACE_DETACH: - /* detach a process that was attached. */ -- clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); - ret = ptrace_detach(child, data); - goto out_tsk; - @@ -978,7 +977,7 @@ /* "asmlinkage" so the input arguments are preserved... */ -@@ -1667,6 +770,9 @@ syscall_trace_leave (long arg0, long arg +@@ -1670,6 +770,9 @@ syscall_trace_leave (long arg0, long arg } } @@ -988,7 +987,7 @@ /* Utrace implementation starts here */ typedef struct utrace_get { -@@ -2454,3 +1560,119 @@ const struct utrace_regset_view *utrace_ +@@ -2463,3 +1566,119 @@ const struct utrace_regset_view *utrace_ #endif return &utrace_ia64_native; } linux-2.6-utrace-ptrace-compat-s390.patch: Index: linux-2.6-utrace-ptrace-compat-s390.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-ptrace-compat-s390.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-ptrace-compat-s390.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-ptrace-compat-s390.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -7,15 +7,13 @@ --- + arch/s390/kernel/ptrace.c | 155 +++++++++++++++++++++++++++++++++++++ arch/s390/kernel/compat_wrapper.S | 2 - arch/s390/kernel/ptrace.c | 151 ++++++++++++++++++++++++++++++++++++++ - 2 files changed, 152 insertions(+), 1 deletion(-) + 2 files changed, 156 insertions(+), 1 deletions(-) -Index: b/arch/s390/kernel/ptrace.c -=================================================================== ---- a/arch/s390/kernel/ptrace.c -+++ b/arch/s390/kernel/ptrace.c -@@ -575,6 +575,157 @@ const struct utrace_regset_view *utrace_ +--- linux-2.6/arch/s390/kernel/ptrace.c ++++ linux-2.6/arch/s390/kernel/ptrace.c +@@ -595,6 +595,161 @@ const struct utrace_regset_view *utrace_ } @@ -124,11 +122,15 @@ + +#ifdef CONFIG_COMPAT +static const struct ptrace_layout_segment s390_compat_uarea[] = { -+ {PT_PSWMASK / 2, PT_FPC / 2, 0, 0}, -+ {PT_FPC / 2, PT_CR_9 / 2, 1, 0}, -+ {PT_CR_9 / 2, PT_IEEE_IP / 2, 2, 0}, -+ {PT_IEEE_IP / 2, sizeof(struct user32), -1, -1}, -+ {0, 0, -1, 0} ++ { offsetof(struct user_regs_struct32, psw), ++ offsetof(struct user_regs_struct32, fp_regs), 0, 0 }, ++ { offsetof(struct user_regs_struct32, fp_regs), ++ offsetof(struct user_regs_struct32, per_info), 1, 0 }, ++ { offsetof(struct user_regs_struct32, per_info), ++ offsetof(struct user_regs_struct32, ieee_instruction_pointer), 2, 0 }, ++ { offsetof(struct user_regs_struct32, ieee_instruction_pointer), ++ sizeof(struct user32), -1, -1 }, ++ { 0, 0, -1, 0 } +}; + +int arch_compat_ptrace(compat_long_t *request, @@ -173,10 +175,8 @@ asmlinkage void syscall_trace(struct pt_regs *regs, int entryexit) { -Index: b/arch/s390/kernel/compat_wrapper.S -=================================================================== ---- a/arch/s390/kernel/compat_wrapper.S -+++ b/arch/s390/kernel/compat_wrapper.S +--- linux-2.6/arch/s390/kernel/compat_wrapper.S ++++ linux-2.6/arch/s390/kernel/compat_wrapper.S @@ -121,7 +121,7 @@ sys32_ptrace_wrapper: lgfr %r3,%r3 # long llgtr %r4,%r4 # long linux-2.6-utrace-ptrace-compat-sparc64.patch: Index: linux-2.6-utrace-ptrace-compat-sparc64.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-ptrace-compat-sparc64.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-ptrace-compat-sparc64.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-ptrace-compat-sparc64.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -7,14 +7,12 @@ --- - arch/sparc64/kernel/ptrace.c | 566 +++++++------------------------------------ - 1 file changed, 100 insertions(+), 466 deletions(-) + arch/sparc64/kernel/ptrace.c | 566 +++++++----------------------------------- + 1 files changed, 100 insertions(+), 466 deletions(-) -Index: b/arch/sparc64/kernel/ptrace.c -=================================================================== ---- a/arch/sparc64/kernel/ptrace.c -+++ b/arch/sparc64/kernel/ptrace.c -@@ -667,484 +667,118 @@ void flush_ptrace_access(struct vm_area_ +--- linux-2.6/arch/sparc64/kernel/ptrace.c ++++ linux-2.6/arch/sparc64/kernel/ptrace.c +@@ -671,484 +671,118 @@ void flush_ptrace_access(struct vm_area_ } } linux-2.6-utrace-ptrace-compat.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-utrace-ptrace-compat.patch Index: linux-2.6-utrace-ptrace-compat.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-ptrace-compat.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-ptrace-compat.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-ptrace-compat.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -12,31 +12,31 @@ --- - arch/i386/kernel/ptrace.c | 40 - arch/powerpc/kernel/ptrace.c | 250 ++++ + fs/proc/base.c | 40 + + arch/powerpc/kernel/ptrace.c | 454 +++++---- arch/powerpc/kernel/signal_32.c | 52 + + arch/powerpc/kernel/Makefile | 2 + arch/powerpc/kernel/ptrace32.c | 416 -------- arch/powerpc/lib/sstep.c | 3 - arch/x86_64/ia32/ia32entry.S | 2 - arch/x86_64/ia32/ptrace32.c | 56 - - arch/x86_64/kernel/ptrace.c | 46 - fs/proc/base.c | 40 - include/asm-x86_64/ptrace-abi.h | 3 - include/asm-x86_64/tracehook.h | 1 - include/linux/ptrace.h | 221 +++- - include/linux/sched.h | 4 - init/Kconfig | 15 - kernel/Makefile | 3 - kernel/exit.c | 13 + arch/x86/ia32/ptrace32.c | 57 + + arch/x86/ia32/ia32entry.S | 2 + arch/x86/kernel/ptrace_64.c | 46 + + arch/x86/kernel/ptrace_32.c | 40 + kernel/fork.c | 2 - kernel/ptrace.c | 2046 +++++++++++++++++++++++++++++++++++++--- + kernel/exit.c | 13 + kernel/ptrace.c | 2061 +++++++++++++++++++++++++++++++++++++-- kernel/sys_ni.c | 4 - 18 files changed, 2627 insertions(+), 174 deletions(-) + kernel/Makefile | 3 + include/linux/sched.h | 4 + include/linux/ptrace.h | 222 +++- + include/asm-x86/ptrace-abi.h | 6 + init/Kconfig | 15 + 19 files changed, 2650 insertions(+), 792 deletions(-) + delete arch/powerpc/kernel/ptrace32.c -Index: b/fs/proc/base.c -=================================================================== ---- a/fs/proc/base.c -+++ b/fs/proc/base.c -@@ -148,6 +148,46 @@ static int get_nr_threads(struct task_st +--- linux-2.6/fs/proc/base.c ++++ linux-2.6/fs/proc/base.c +@@ -154,6 +154,46 @@ static int get_nr_threads(struct task_st return count; } @@ -63,7 +63,7 @@ + return -EPERM; + smp_rmb(); + if (task->mm) -+ dumpable = task->mm->dumpable; ++ dumpable = get_dumpable(task->mm); + if (!dumpable && !capable(CAP_SYS_PTRACE)) + return -EPERM; + @@ -83,221 +83,74 @@ static int proc_cwd_link(struct inode *inode, struct dentry **dentry, struct vfsmount **mnt) { struct task_struct *task = get_proc_task(inode); -Index: b/arch/i386/kernel/ptrace.c -=================================================================== ---- a/arch/i386/kernel/ptrace.c -+++ b/arch/i386/kernel/ptrace.c -@@ -736,6 +736,46 @@ const struct utrace_regset_view *utrace_ - return &utrace_i386_native; +--- linux-2.6/arch/powerpc/kernel/ptrace.c ++++ linux-2.6/arch/powerpc/kernel/ptrace.c +@@ -590,248 +590,320 @@ const struct utrace_regset_view *utrace_ } -+#ifdef CONFIG_PTRACE -+static const struct ptrace_layout_segment i386_uarea[] = { -+ {0, FRAME_SIZE*4, 0, 0}, -+ {FRAME_SIZE*4, offsetof(struct user, u_debugreg[0]), -1, 0}, -+ {offsetof(struct user, u_debugreg[0]), -+ offsetof(struct user, u_debugreg[8]), 4, 0}, -+ {0, 0, -1, 0} -+}; -+ -+int arch_ptrace(long *req, struct task_struct *child, -+ struct utrace_attached_engine *engine, -+ unsigned long addr, unsigned long data, long *val) -+{ -+ switch (*req) { -+ case PTRACE_PEEKUSR: -+ return ptrace_peekusr(child, engine, i386_uarea, addr, data); -+ case PTRACE_POKEUSR: -+ return ptrace_pokeusr(child, engine, i386_uarea, addr, data); -+ case PTRACE_GETREGS: -+ return ptrace_whole_regset(child, engine, data, 0, 0); -+ case PTRACE_SETREGS: -+ return ptrace_whole_regset(child, engine, data, 0, 1); -+ case PTRACE_GETFPREGS: -+ return ptrace_whole_regset(child, engine, data, 1, 0); -+ case PTRACE_SETFPREGS: -+ return ptrace_whole_regset(child, engine, data, 1, 1); -+ case PTRACE_GETFPXREGS: -+ return ptrace_whole_regset(child, engine, data, 2, 0); -+ case PTRACE_SETFPXREGS: -+ return ptrace_whole_regset(child, engine, data, 2, 1); -+ case PTRACE_GET_THREAD_AREA: -+ case PTRACE_SET_THREAD_AREA: -+ return ptrace_onereg_access(child, engine, -+ utrace_native_view(current), 3, -+ addr, (void __user *)data, -+ *req == PTRACE_SET_THREAD_AREA); -+ } -+ return -ENOSYS; -+} -+#endif - void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code) ++#ifdef CONFIG_PTRACE + /* + * Here are the old "legacy" powerpc specific getregs/setregs ptrace calls, + * we mark them as obsolete now, they will be removed in a future version + */ +-static long arch_ptrace_old(struct task_struct *child, long request, long addr, +- long data) ++static int arch_ptrace_old(long *request, struct task_struct *child, ++ struct utrace_attached_engine *engine, ++ unsigned long addr, unsigned long data, long *val) { -Index: b/arch/x86_64/ia32/ptrace32.c -=================================================================== ---- a/arch/x86_64/ia32/ptrace32.c -+++ b/arch/x86_64/ia32/ptrace32.c -@@ -166,11 +166,6 @@ static int getreg32(struct task_struct * - - #undef R32 - --asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data) --{ -- return -ENOSYS; --} +- int ret = -EPERM; - - static int - ia32_genregs_get(struct task_struct *target, - const struct utrace_regset *regset, -@@ -600,3 +595,54 @@ const struct utrace_regset_view utrace_i - .name = "i386", .e_machine = EM_386, - .regsets = ia32_regsets, .n = ARRAY_SIZE(ia32_regsets) - }; -+ -+ -+#ifdef CONFIG_PTRACE -+/* -+ * This matches the arch/i386/kernel/ptrace.c definitions. -+ */ -+ -+static const struct ptrace_layout_segment ia32_uarea[] = { -+ {0, sizeof(struct user_regs_struct32), 0, 0}, -+ {sizeof(struct user_regs_struct32), -+ offsetof(struct user32, u_debugreg[0]), -1, 0}, -+ {offsetof(struct user32, u_debugreg[0]), -+ offsetof(struct user32, u_debugreg[8]), 4, 0}, -+ {0, 0, -1, 0} -+}; -+ -+int arch_compat_ptrace(compat_long_t *req, struct task_struct *child, -+ struct utrace_attached_engine *engine, -+ compat_ulong_t addr, compat_ulong_t data, -+ compat_long_t *val) -+{ -+ switch (*req) { -+ case PTRACE_PEEKUSR: -+ return ptrace_compat_peekusr(child, engine, ia32_uarea, -+ addr, data); -+ case PTRACE_POKEUSR: -+ return ptrace_compat_pokeusr(child, engine, ia32_uarea, -+ addr, data); -+ case PTRACE_GETREGS: -+ return ptrace_whole_regset(child, engine, data, 0, 0); -+ case PTRACE_SETREGS: -+ return ptrace_whole_regset(child, engine, data, 0, 1); -+ case PTRACE_GETFPREGS: -+ return ptrace_whole_regset(child, engine, data, 1, 0); -+ case PTRACE_SETFPREGS: -+ return ptrace_whole_regset(child, engine, data, 1, 1); -+ case PTRACE_GETFPXREGS: -+ return ptrace_whole_regset(child, engine, data, 2, 0); -+ case PTRACE_SETFPXREGS: -+ return ptrace_whole_regset(child, engine, data, 2, 1); -+ case PTRACE_GET_THREAD_AREA: -+ case PTRACE_SET_THREAD_AREA: [...2275 lines suppressed...] +- if (copied != sizeof(tmp)) +- return -EIO; +- return put_user(tmp, (unsigned long __user *)data); +static u32 +ptrace_report_exit(struct utrace_attached_engine *engine, + struct task_struct *tsk, long orig_code, long *code) @@ -2757,18 +3441,22 @@ + END_CHECK; + + return parent; -+} -+ + } + +-int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) +static int +ptrace_allow_access_process_vm(struct utrace_attached_engine *engine, + struct task_struct *target, + struct task_struct *caller) -+{ + { +- int copied; + struct ptrace_state *state; + int ours = 0; + + START_CHECK; -+ + +- copied = access_process_vm(tsk, addr, &data, sizeof(data), 1); +- return (copied == sizeof(data)) ? 0 : -EIO; + state = get_ptrace_state(engine, target); + if (likely(state != NULL)) { + ours = (((engine->flags & UTRACE_ACTION_QUIESCE) @@ -2783,7 +3471,7 @@ + END_CHECK; + + return ours; -+} + } + + +static const struct utrace_engine_ops ptrace_utrace_ops = @@ -2802,11 +3490,9 @@ + .tracer_task = ptrace_tracer_task, + .allow_access_process_vm = ptrace_allow_access_process_vm, +}; -Index: b/kernel/sys_ni.c -=================================================================== ---- a/kernel/sys_ni.c -+++ b/kernel/sys_ni.c -@@ -113,6 +113,10 @@ cond_syscall(sys_vm86); +--- linux-2.6/kernel/sys_ni.c ++++ linux-2.6/kernel/sys_ni.c +@@ -122,6 +122,10 @@ cond_syscall(sys_vm86); cond_syscall(compat_sys_ipc); cond_syscall(compat_sys_sysctl); @@ -2817,32 +3503,28 @@ /* arch-specific weak syscall entries */ cond_syscall(sys_pciconfig_read); cond_syscall(sys_pciconfig_write); -Index: b/kernel/Makefile -=================================================================== ---- a/kernel/Makefile -+++ b/kernel/Makefile +--- linux-2.6/kernel/Makefile ++++ linux-2.6/kernel/Makefile @@ -4,7 +4,7 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o profile.o \ exit.o itimer.o time.o softirq.o resource.o \ -- sysctl.o capability.o ptrace.o timer.o user.o \ -+ sysctl.o capability.o timer.o user.o \ +- sysctl.o capability.o ptrace.o timer.o user.o user_namespace.o \ ++ sysctl.o capability.o timer.o user.o user_namespace.o \ signal.o sys.o kmod.o workqueue.o pid.o \ rcupdate.o extable.o params.o posix-timers.o \ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \ -@@ -52,6 +52,7 @@ obj-$(CONFIG_UTS_NS) += utsname.o - obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o +@@ -58,6 +58,7 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayac obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o + obj-$(CONFIG_MARKERS) += marker.o obj-$(CONFIG_UTRACE) += utrace.o +obj-$(CONFIG_PTRACE) += ptrace.o ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y) # According to Alan Modra , the -fno-omit-frame-pointer is -Index: b/include/linux/sched.h -=================================================================== ---- a/include/linux/sched.h -+++ b/include/linux/sched.h -@@ -1036,6 +1036,10 @@ struct task_struct { +--- linux-2.6/include/linux/sched.h ++++ linux-2.6/include/linux/sched.h +@@ -1161,6 +1161,10 @@ struct task_struct { atomic_t fs_excl; /* holding fs exclusive resources */ struct rcu_head rcu; @@ -2853,11 +3535,9 @@ /* * cache last used pipe for splice */ -Index: b/include/linux/ptrace.h -=================================================================== ---- a/include/linux/ptrace.h -+++ b/include/linux/ptrace.h -@@ -49,50 +49,197 @@ +--- linux-2.6/include/linux/ptrace.h ++++ linux-2.6/include/linux/ptrace.h +@@ -49,49 +49,195 @@ #include #ifdef __KERNEL__ @@ -2907,8 +3587,9 @@ -extern int ptrace_check_attach(struct task_struct *task, int kill); -extern int ptrace_request(struct task_struct *child, long request, long addr, long data); extern int ptrace_may_attach(struct task_struct *task); - - +-extern int __ptrace_may_attach(struct task_struct *task); ++ ++ +#ifdef CONFIG_PTRACE +#include +#include @@ -2964,7 +3645,7 @@ + struct utrace_attached_engine *engine, + const struct utrace_regset_view *view, + int setno, unsigned long regno, -+ void __user *data, int write); ++ void __user *udata, void *kdata, int write); + + +/* @@ -3005,7 +3686,7 @@ + (unsigned long __user *)data, NULL, 0); +} + -+/* Convenience wrapper for the common PTRACE_PEEKUSR implementation. */ ++/* Convenience wrapper for the common PTRACE_POKEUSR implementation. */ +static inline int ptrace_pokeusr(struct task_struct *child, + struct utrace_attached_engine *engine, + const struct ptrace_layout_segment layout[], @@ -3087,40 +3768,27 @@ + return -ECHILD; +} +#endif /* CONFIG_PTRACE */ -+ -+ - #ifndef force_successful_syscall_return - /* - * System call handlers that, upon successful completion, need to return a -Index: b/include/asm-x86_64/tracehook.h -=================================================================== ---- a/include/asm-x86_64/tracehook.h -+++ b/include/asm-x86_64/tracehook.h -@@ -15,6 +15,7 @@ - - #include - #include -+#include - - /* - * See linux/tracehook.h for the descriptions of what these need to do. -Index: b/include/asm-x86_64/ptrace-abi.h -=================================================================== ---- a/include/asm-x86_64/ptrace-abi.h -+++ b/include/asm-x86_64/ptrace-abi.h -@@ -48,4 +48,7 @@ - #define PTRACE_ARCH_PRCTL 30 /* arch_prctl for child */ + int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data); + int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data); +--- linux-2.6/include/asm-x86/ptrace-abi.h ++++ linux-2.6/include/asm-x86/ptrace-abi.h +@@ -73,9 +73,9 @@ + + #ifdef __x86_64__ + # define PTRACE_ARCH_PRCTL 30 +-#else +-# define PTRACE_SYSEMU 31 +-# define PTRACE_SYSEMU_SINGLESTEP 32 + #endif +#define PTRACE_SYSEMU 31 +#define PTRACE_SYSEMU_SINGLESTEP 32 + #endif -Index: b/init/Kconfig -=================================================================== ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -597,10 +597,21 @@ endmenu +--- linux-2.6/init/Kconfig ++++ linux-2.6/init/Kconfig +@@ -765,10 +765,21 @@ config PREEMPT_NOTIFIERS menu "Process debugging support" linux-2.6-utrace-regset-ia64.patch: Index: linux-2.6-utrace-regset-ia64.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-regset-ia64.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-regset-ia64.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-regset-ia64.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -9,17 +9,15 @@ --- - arch/ia64/ia32/sys_ia32.c | 472 +++++++++++++++++++++++++ - arch/ia64/kernel/ptrace.c | 804 +++++++++++++++++++++++++++++++++++++++++++ - include/asm-ia64/elf.h | 24 + + arch/ia64/ia32/sys_ia32.c | 476 +++++++++++++++++++++++++ + arch/ia64/kernel/ptrace.c | 810 ++++++++++++++++++++++++++++++++++++++++++ include/asm-ia64/tracehook.h | 7 - 4 files changed, 1305 insertions(+), 2 deletions(-) + include/asm-ia64/elf.h | 24 + + 4 files changed, 1315 insertions(+), 2 deletions(-) -Index: b/arch/ia64/ia32/sys_ia32.c -=================================================================== ---- a/arch/ia64/ia32/sys_ia32.c -+++ b/arch/ia64/ia32/sys_ia32.c -@@ -44,6 +44,7 @@ +--- linux-2.6/arch/ia64/ia32/sys_ia32.c ++++ linux-2.6/arch/ia64/ia32/sys_ia32.c +@@ -43,6 +43,7 @@ #include #include #include @@ -27,7 +25,15 @@ #include #include #include -@@ -1868,6 +1869,477 @@ sys32_ptrace (int request, pid_t pid, un +@@ -50,6 +51,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -1868,6 +1870,480 @@ sys32_ptrace (int request, pid_t pid, un } #endif @@ -188,7 +194,7 @@ + end = (dst->pos - 7 * sizeof(int)) / sizeof(struct _fpreg_ia32); + for (; start < end; start++) + access_fpreg_ia32(start, (struct _fpreg_ia32 *)buf + start, -+ pt, info->sw, tos, 0); ++ pt, info->sw, tos, 1); + if (dst->count == 0) + return; + } @@ -480,16 +486,19 @@ + */ +static const struct utrace_regset ia32_regsets[] = { + { ++ .core_note_type = NT_PRSTATUS, + .n = sizeof(struct user_regs_struct32)/4, + .size = 4, .align = 4, + .get = ia32_genregs_get, .set = ia32_genregs_set + }, + { ++ .core_note_type = NT_PRFPREG, + .n = sizeof(struct ia32_user_i387_struct) / 4, + .size = 4, .align = 4, + .get = ia32_fpregs_get, .set = ia32_fpregs_set + }, + { ++ .core_note_type = NT_PRXFPREG, + .n = sizeof(struct ia32_user_fxsr_struct) / 4, + .size = 4, .align = 4, + .get = ia32_fpxregs_get, .set = ia32_fpxregs_set @@ -505,10 +514,8 @@ typedef struct { unsigned int ss_sp; unsigned int ss_flags; -Index: b/arch/ia64/kernel/ptrace.c -=================================================================== ---- a/arch/ia64/kernel/ptrace.c -+++ b/arch/ia64/kernel/ptrace.c +--- linux-2.6/arch/ia64/kernel/ptrace.c ++++ linux-2.6/arch/ia64/kernel/ptrace.c @@ -3,6 +3,9 @@ * * Copyright (C) 1999-2005 Hewlett-Packard Co @@ -519,23 +526,17 @@ * * Derived from the x86 and Alpha versions. */ -@@ -18,13 +21,16 @@ +@@ -18,7 +21,10 @@ #include #include #include +#include ++#include +#include #include #include #include - #include - #include - #include -+#include - #include - #ifdef CONFIG_PERFMON - #include @@ -548,6 +554,7 @@ ia64_sync_user_rbs (struct task_struct * return 0; } @@ -576,7 +577,7 @@ static int access_uarea (struct task_struct *child, unsigned long addr, unsigned long *data, int write_access) -@@ -1248,7 +1259,9 @@ ptrace_getregs (struct task_struct *chil +@@ -1252,7 +1263,9 @@ ptrace_getregs (struct task_struct *chil ret = retval ? -EIO : 0; return ret; } @@ -586,7 +587,7 @@ static long ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr) { -@@ -1394,6 +1407,7 @@ ptrace_setregs (struct task_struct *chil +@@ -1398,6 +1411,7 @@ ptrace_setregs (struct task_struct *chil ret = retval ? -EIO : 0; return ret; } @@ -594,7 +595,7 @@ /* * Called by kernel/ptrace.c when detaching.. -@@ -1411,6 +1425,7 @@ ptrace_disable (struct task_struct *chil +@@ -1415,6 +1429,7 @@ ptrace_disable (struct task_struct *chil child_psr->tb = 0; } @@ -602,7 +603,7 @@ asmlinkage long sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data) { -@@ -1598,6 +1613,7 @@ sys_ptrace (long request, pid_t pid, uns +@@ -1601,6 +1616,7 @@ sys_ptrace (long request, pid_t pid, uns unlock_kernel(); return ret; } @@ -610,7 +611,7 @@ /* "asmlinkage" so the input arguments are preserved... */ -@@ -1650,3 +1666,791 @@ syscall_trace_leave (long arg0, long arg +@@ -1653,3 +1669,797 @@ syscall_trace_leave (long arg0, long arg tracehook_report_syscall_step(®s); } } @@ -650,35 +651,35 @@ + + pt = task_pt_regs(target); + switch (addr) { -+ case ELF_GR_OFFSET(1): -+ ptr = &pt->r1; -+ break; -+ case ELF_GR_OFFSET(2): -+ case ELF_GR_OFFSET(3): -+ ptr = (void *)&pt->r2 + (addr - ELF_GR_OFFSET(2)); -+ break; -+ case ELF_GR_OFFSET(4) ... ELF_GR_OFFSET(7): -+ if (write_access) { -+ /* read NaT bit first: */ -+ unsigned long dummy; -+ -+ ret = unw_get_gr(info, addr/8, &dummy, &nat); -+ if (ret < 0) -+ return ret; -+ } -+ return unw_access_gr(info, addr/8, data, &nat, write_access); -+ case ELF_GR_OFFSET(8) ... ELF_GR_OFFSET(11): -+ ptr = (void *)&pt->r8 + addr - ELF_GR_OFFSET(8); -+ break; -+ case ELF_GR_OFFSET(12): -+ case ELF_GR_OFFSET(13): -+ ptr = (void *)&pt->r12 + addr - ELF_GR_OFFSET(12); -+ break; -+ case ELF_GR_OFFSET(14): -+ ptr = &pt->r14; -+ break; -+ case ELF_GR_OFFSET(15): -+ ptr = &pt->r15; ++ case ELF_GR_OFFSET(1): ++ ptr = &pt->r1; ++ break; ++ case ELF_GR_OFFSET(2): ++ case ELF_GR_OFFSET(3): ++ ptr = (void *)&pt->r2 + (addr - ELF_GR_OFFSET(2)); ++ break; ++ case ELF_GR_OFFSET(4) ... ELF_GR_OFFSET(7): ++ if (write_access) { ++ /* read NaT bit first: */ ++ unsigned long dummy; ++ ++ ret = unw_get_gr(info, addr/8, &dummy, &nat); ++ if (ret < 0) ++ return ret; ++ } ++ return unw_access_gr(info, addr/8, data, &nat, write_access); ++ case ELF_GR_OFFSET(8) ... ELF_GR_OFFSET(11): ++ ptr = (void *)&pt->r8 + addr - ELF_GR_OFFSET(8); ++ break; ++ case ELF_GR_OFFSET(12): ++ case ELF_GR_OFFSET(13): ++ ptr = (void *)&pt->r12 + addr - ELF_GR_OFFSET(12); ++ break; ++ case ELF_GR_OFFSET(14): ++ ptr = &pt->r14; ++ break; ++ case ELF_GR_OFFSET(15): ++ ptr = &pt->r15; + } + if (write_access) + *ptr = *data; @@ -696,17 +697,17 @@ + + pt = task_pt_regs(target); + switch (addr) { -+ case ELF_BR_OFFSET(0): -+ ptr = &pt->b0; -+ break; -+ case ELF_BR_OFFSET(1) ... ELF_BR_OFFSET(5): -+ return unw_access_br(info, (addr - ELF_BR_OFFSET(0))/8, -+ data, write_access); -+ case ELF_BR_OFFSET(6): -+ ptr = &pt->b6; -+ break; -+ case ELF_BR_OFFSET(7): -+ ptr = &pt->b7; ++ case ELF_BR_OFFSET(0): ++ ptr = &pt->b0; ++ break; ++ case ELF_BR_OFFSET(1) ... ELF_BR_OFFSET(5): ++ return unw_access_br(info, (addr - ELF_BR_OFFSET(0))/8, ++ data, write_access); ++ case ELF_BR_OFFSET(6): ++ ptr = &pt->b6; ++ break; ++ case ELF_BR_OFFSET(7): ++ ptr = &pt->b7; + } + if (write_access) + *ptr = *data; @@ -726,137 +727,141 @@ + pt = task_pt_regs(target); + if (addr >= ELF_AR_RSC_OFFSET && addr <= ELF_AR_SSD_OFFSET) { + switch (addr) { -+ case ELF_AR_RSC_OFFSET: -+ /* force PL3 */ -+ if (write_access) -+ pt->ar_rsc = *data | (3 << 2); -+ else -+ *data = pt->ar_rsc; -+ return 0; -+ case ELF_AR_BSP_OFFSET: -+ /* -+ * By convention, we use PT_AR_BSP to refer to -+ * the end of the user-level backing store. -+ * Use ia64_rse_skip_regs(PT_AR_BSP, -CFM.sof) -+ * to get the real value of ar.bsp at the time -+ * the kernel was entered. -+ * -+ * Furthermore, when changing the contents of -+ * PT_AR_BSP (or PT_CFM) we MUST copy any -+ * users-level stacked registers that are -+ * stored on the kernel stack back to -+ * user-space because otherwise, we might end -+ * up clobbering kernel stacked registers. -+ * Also, if this happens while the task is -+ * blocked in a system call, which convert the -+ * state such that the non-system-call exit -+ * path is used. This ensures that the proper -+ * state will be picked up when resuming -+ * execution. However, it *also* means that -+ * once we write PT_AR_BSP/PT_CFM, it won't be -+ * possible to modify the syscall arguments of -+ * the pending system call any longer. This -+ * shouldn't be an issue because modifying -+ * PT_AR_BSP/PT_CFM generally implies that -+ * we're either abandoning the pending system -+ * call or that we defer it's re-execution -+ * (e.g., due to GDB doing an inferior -+ * function call). -+ */ -+ urbs_end = ia64_get_user_rbs_end(target, pt, &cfm); -+ if (write_access) { -+ if (*data != urbs_end) { -+ if (ia64_sync_user_rbs(target, info->sw, -+ pt->ar_bspstore, -+ urbs_end) < 0) -+ return -1; -+ if (in_syscall(pt)) -+ convert_to_non_syscall(target, -+ pt, -+ cfm); -+ /* -+ * Simulate user-level write -+ * of ar.bsp: -+ */ -+ pt->loadrs = 0; -+ pt->ar_bspstore = *data; -+ } -+ } else -+ *data = urbs_end; -+ return 0; -+ case ELF_AR_BSPSTORE_OFFSET: // ar_bsp_store -+ ptr = &pt->ar_bspstore; -+ break; -+ case ELF_AR_RNAT_OFFSET: // ar_rnat -+ urbs_end = ia64_get_user_rbs_end(target, pt, NULL); -+ rnat_addr = (long) ia64_rse_rnat_addr((long *) -+ urbs_end); -+ if (write_access) -+ return ia64_poke(target, info->sw, urbs_end, -+ rnat_addr, *data); -+ else -+ return ia64_peek(target, info->sw, urbs_end, -+ rnat_addr, data); -+ case ELF_AR_CCV_OFFSET: // ar_ccv -+ ptr = &pt->ar_ccv; -+ break; -+ case ELF_AR_UNAT_OFFSET: // ar_unat -+ ptr = &pt->ar_unat; -+ break; -+ case ELF_AR_FPSR_OFFSET: // ar_fpsr -+ ptr = &pt->ar_fpsr; -+ break; -+ case ELF_AR_PFS_OFFSET: // ar_pfs -+ ptr = &pt->ar_pfs; -+ break; -+ case ELF_AR_LC_OFFSET: // ar_lc -+ return unw_access_ar(info, UNW_AR_LC, data, -+ write_access); -+ case ELF_AR_EC_OFFSET: // ar_ec -+ return unw_access_ar(info, UNW_AR_EC, data, -+ write_access); -+ case ELF_AR_CSD_OFFSET: // ar_csd -+ ptr = &pt->ar_csd; -+ break; -+ case ELF_AR_SSD_OFFSET: // ar_ssd -+ ptr = &pt->ar_ssd; ++ case ELF_AR_RSC_OFFSET: ++ /* force PL3 */ ++ if (write_access) ++ pt->ar_rsc = *data | (3 << 2); ++ else ++ *data = pt->ar_rsc; ++ return 0; ++ case ELF_AR_BSP_OFFSET: ++ /* ++ * By convention, we use PT_AR_BSP to refer to ++ * the end of the user-level backing store. ++ * Use ia64_rse_skip_regs(PT_AR_BSP, -CFM.sof) ++ * to get the real value of ar.bsp at the time ++ * the kernel was entered. ++ * ++ * Furthermore, when changing the contents of ++ * PT_AR_BSP (or PT_CFM) we MUST copy any ++ * users-level stacked registers that are ++ * stored on the kernel stack back to ++ * user-space because otherwise, we might end ++ * up clobbering kernel stacked registers. ++ * Also, if this happens while the task is ++ * blocked in a system call, which convert the ++ * state such that the non-system-call exit ++ * path is used. This ensures that the proper ++ * state will be picked up when resuming ++ * execution. However, it *also* means that ++ * once we write PT_AR_BSP/PT_CFM, it won't be ++ * possible to modify the syscall arguments of ++ * the pending system call any longer. This ++ * shouldn't be an issue because modifying ++ * PT_AR_BSP/PT_CFM generally implies that ++ * we're either abandoning the pending system ++ * call or that we defer it's re-execution ++ * (e.g., due to GDB doing an inferior ++ * function call). ++ */ ++ urbs_end = ia64_get_user_rbs_end(target, pt, &cfm); ++ if (write_access) { ++ if (*data != urbs_end) { ++ if (ia64_sync_user_rbs(target, info->sw, ++ pt->ar_bspstore, ++ urbs_end) < 0) ++ return -1; ++ if (in_syscall(pt)) ++ convert_to_non_syscall(target, ++ pt, ++ cfm); ++ /* ++ * Simulate user-level write ++ * of ar.bsp: ++ */ ++ pt->loadrs = 0; ++ pt->ar_bspstore = *data; ++ } ++ } else ++ *data = urbs_end; ++ return 0; ++ case ELF_AR_BSPSTORE_OFFSET: // ar_bsp_store ++ ptr = &pt->ar_bspstore; ++ break; ++ case ELF_AR_RNAT_OFFSET: // ar_rnat ++ urbs_end = ia64_get_user_rbs_end(target, pt, NULL); ++ rnat_addr = (long) ia64_rse_rnat_addr((long *) ++ urbs_end); ++ if (write_access) ++ return ia64_poke(target, info->sw, urbs_end, ++ rnat_addr, *data); ++ else ++ return ia64_peek(target, info->sw, urbs_end, ++ rnat_addr, data); ++ case ELF_AR_CCV_OFFSET: // ar_ccv ++ ptr = &pt->ar_ccv; ++ break; ++ case ELF_AR_UNAT_OFFSET: // ar_unat ++ ptr = &pt->ar_unat; ++ break; ++ case ELF_AR_FPSR_OFFSET: // ar_fpsr ++ ptr = &pt->ar_fpsr; ++ break; ++ case ELF_AR_PFS_OFFSET: // ar_pfs ++ ptr = &pt->ar_pfs; ++ break; ++ case ELF_AR_LC_OFFSET: // ar_lc ++ return unw_access_ar(info, UNW_AR_LC, data, ++ write_access); ++ case ELF_AR_EC_OFFSET: // ar_ec ++ return unw_access_ar(info, UNW_AR_EC, data, ++ write_access); ++ case ELF_AR_CSD_OFFSET: // ar_csd ++ ptr = &pt->ar_csd; ++ break; ++ case ELF_AR_SSD_OFFSET: // ar_ssd ++ ptr = &pt->ar_ssd; + } + } else if (addr >= ELF_CR_IIP_OFFSET && addr <= ELF_CR_IPSR_OFFSET) { + switch (addr) { -+ case ELF_CR_IIP_OFFSET: -+ ptr = &pt->cr_iip; -+ break; -+ case ELF_CFM_OFFSET: -+ urbs_end = ia64_get_user_rbs_end(target, pt, &cfm); -+ if (write_access) { -+ if (((cfm ^ *data) & PFM_MASK) != 0) { -+ if (ia64_sync_user_rbs(target, info->sw, -+ pt->ar_bspstore, -+ urbs_end) < 0) -+ return -1; -+ if (in_syscall(pt)) -+ convert_to_non_syscall(target, -+ pt, -+ cfm); -+ pt->cr_ifs = ((pt->cr_ifs & ~PFM_MASK) -+ | (*data & PFM_MASK)); -+ } -+ } else -+ *data = cfm; -+ return 0; -+ case ELF_CR_IPSR_OFFSET: -+ if (write_access) -+ pt->cr_ipsr = ((*data & IPSR_MASK) -+ | (pt->cr_ipsr & ~IPSR_MASK)); -+ else -+ *data = (pt->cr_ipsr & IPSR_MASK); -+ return 0; ++ case ELF_CR_IIP_OFFSET: ++ ptr = &pt->cr_iip; ++ break; ++ case ELF_CFM_OFFSET: ++ urbs_end = ia64_get_user_rbs_end(target, pt, &cfm); ++ if (write_access) { ++ if (((cfm ^ *data) & PFM_MASK) != 0) { ++ if (ia64_sync_user_rbs(target, info->sw, ++ pt->ar_bspstore, ++ urbs_end) < 0) ++ return -1; ++ if (in_syscall(pt)) ++ convert_to_non_syscall(target, ++ pt, ++ cfm); ++ pt->cr_ifs = ((pt->cr_ifs & ~PFM_MASK) ++ | (*data & PFM_MASK)); ++ } ++ } else ++ *data = cfm; ++ return 0; ++ case ELF_CR_IPSR_OFFSET: ++ if (write_access) { ++ unsigned long tmp = *data; ++ /* psr.ri==3 is a reserved value: SDM 2:25 */ ++ if ((tmp & IA64_PSR_RI) == IA64_PSR_RI) ++ tmp &= ~IA64_PSR_RI; ++ pt->cr_ipsr = ((tmp & IPSR_MASK) ++ | (pt->cr_ipsr & ~IPSR_MASK)); ++ } else ++ *data = (pt->cr_ipsr & IPSR_MASK); ++ return 0; + } + } else if (addr == ELF_NAT_OFFSET) -+ return access_nat_bits(target, pt, info, -+ data, write_access); ++ return access_nat_bits(target, pt, info, ++ data, write_access); + else if (addr == ELF_PR_OFFSET) -+ ptr = &pt->pr; ++ ptr = &pt->pr; + else + return -1; + @@ -1370,12 +1375,14 @@ + +static const struct utrace_regset native_regsets[] = { + { ++ .core_note_type = NT_PRSTATUS, + .n = ELF_NGREG, + .size = sizeof(elf_greg_t), .align = sizeof(elf_greg_t), + .get = gpregs_get, .set = gpregs_set, + .writeback = gpregs_writeback + }, + { ++ .core_note_type = NT_PRFPREG, + .n = ELF_NFPREG, + .size = sizeof(elf_fpreg_t), .align = sizeof(elf_fpreg_t), + .get = fpregs_get, .set = fpregs_set, .active = fpregs_active @@ -1402,10 +1409,8 @@ +#endif + return &utrace_ia64_native; +} -Index: b/include/asm-ia64/tracehook.h -=================================================================== ---- a/include/asm-ia64/tracehook.h -+++ b/include/asm-ia64/tracehook.h +--- linux-2.6/include/asm-ia64/tracehook.h ++++ linux-2.6/include/asm-ia64/tracehook.h @@ -67,7 +67,10 @@ static inline int tracehook_single_step_ static inline void tracehook_abort_syscall(struct pt_regs *regs) @@ -1419,10 +1424,8 @@ -#endif +#endif /* asm/tracehook.h */ -Index: b/include/asm-ia64/elf.h -=================================================================== ---- a/include/asm-ia64/elf.h -+++ b/include/asm-ia64/elf.h +--- linux-2.6/include/asm-ia64/elf.h ++++ linux-2.6/include/asm-ia64/elf.h @@ -154,6 +154,30 @@ extern void ia64_init_addr_space (void); #define ELF_NGREG 128 /* we really need just 72 but let's leave some headroom... */ #define ELF_NFPREG 128 /* f0 and f1 could be omitted, but so what... */ linux-2.6-utrace-regset-s390.patch: Index: linux-2.6-utrace-regset-s390.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-regset-s390.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-regset-s390.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-regset-s390.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -9,24 +9,20 @@ --- arch/s390/kernel/Makefile | 2 - arch/s390/kernel/ptrace.c | 952 ++++++++++++++++++---------------------------- - 2 files changed, 390 insertions(+), 564 deletions(-) + arch/s390/kernel/ptrace.c | 958 +++++++++++++++++++-------------------------- + 2 files changed, 409 insertions(+), 551 deletions(-) -Index: b/arch/s390/kernel/Makefile -=================================================================== ---- a/arch/s390/kernel/Makefile -+++ b/arch/s390/kernel/Makefile +--- linux-2.6/arch/s390/kernel/Makefile ++++ linux-2.6/arch/s390/kernel/Makefile @@ -35,3 +35,5 @@ obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS # This is just to get the dependencies... # binfmt_elf32.o: $(TOPDIR)/fs/binfmt_elf.c + +CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' -Index: b/arch/s390/kernel/ptrace.c -=================================================================== ---- a/arch/s390/kernel/ptrace.c -+++ b/arch/s390/kernel/ptrace.c -@@ -30,6 +30,7 @@ +--- linux-2.6/arch/s390/kernel/ptrace.c ++++ linux-2.6/arch/s390/kernel/ptrace.c +@@ -30,10 +30,12 @@ #include #include #include @@ -34,15 +30,12 @@ #include #include #include -@@ -42,6 +43,7 @@ - #include - #include - #include -+#include + #include ++#include - #ifdef CONFIG_COMPAT - #include "compat_ptrace.h" -@@ -116,640 +118,462 @@ tracehook_single_step_enabled(struct tas + #include + #include +@@ -116,628 +118,482 @@ tracehook_single_step_enabled(struct tas return task->thread.per_info.single_step; } @@ -170,13 +163,15 @@ + unsigned long pswmask = regs->psw.mask; + ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, + &pswmask, PT_PSWMASK, PT_PSWADDR); -+ if (pswmask != PSW_MASK_MERGE(psw_user_bits, pswmask) ++ if (ret == 0 && +#ifdef CONFIG_COMPAT -+ && pswmask != PSW_MASK_MERGE(psw_user32_bits, pswmask) ++ pswmask != PSW_MASK_MERGE(psw_user32_bits, pswmask) && +#endif -+ ) ++ pswmask != PSW_MASK_MERGE(psw_user_bits, pswmask)) + /* Invalid psw mask. */ -+ return -EINVAL; ++ ret = -EINVAL; ++ if (ret) ++ return ret; + regs->psw.mask = pswmask; + FixPerRegisters(target); + } @@ -195,6 +190,8 @@ + ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, + ®s->psw.addr, PT_PSWADDR, + PT_ACR0); ++ if (ret) ++ return ret; +#ifndef CONFIG_64BIT + /* I'd like to reject addresses without the + high order bit but older gdb's rely on it */ @@ -276,6 +273,14 @@ -#endif - data != PSW_MASK_MERGE(psw_user_bits, data)) - /* Invalid psw mask. */ +- return -EINVAL; +-#ifndef CONFIG_64BIT +- if (addr == (addr_t) &dummy->regs.psw.addr) +- /* I'd like to reject addresses without the +- high order bit but older gdb's rely on it */ +- data |= PSW_ADDR_AMODE; +-#endif +- *(addr_t *)((addr_t) &task_pt_regs(child)->psw + addr) = data; +static int +fpregs_set(struct task_struct *target, + const struct utrace_regset *regset, @@ -288,23 +293,13 @@ + save_fp_regs(&target->thread.fp_regs); + + /* If setting FPC, must validate it first. */ -+ if (count > 0 && pos == 0) { -+ unsigned long fpc; ++ if (count > 0 && pos < offsetof(s390_fp_regs, fprs)) { ++ u32 fpc[2] = { target->thread.fp_regs.fpc, 0 }; ++ BUILD_BUG_ON(offsetof(s390_fp_regs, fprs) != sizeof(fpc)); + ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, + &fpc, 0, sizeof(fpc)); + if (ret) + return ret; -+ -+ if ((fpc & ~((unsigned long) FPC_VALID_MASK -+ << (BITS_PER_LONG - 32))) != 0) - return -EINVAL; --#ifndef CONFIG_64BIT -- if (addr == (addr_t) &dummy->regs.psw.addr) -- /* I'd like to reject addresses without the -- high order bit but older gdb's rely on it */ -- data |= PSW_ADDR_AMODE; --#endif -- *(addr_t *)((addr_t) &task_pt_regs(child)->psw + addr) = data; - } else if (addr < (addr_t) (&dummy->regs.orig_gpr2)) { - /* @@ -323,17 +318,16 @@ - else -#endif - *(addr_t *)((addr_t) &child->thread.acrs + offset) = data; -+ memcpy(&target->thread.fp_regs, &fpc, sizeof(fpc)); -+ } ++ if ((fpc[0] & ~FPC_VALID_MASK) != 0 || fpc[1] != 0) ++ return -EINVAL; - } else if (addr == (addr_t) &dummy->regs.orig_gpr2) { - /* - * orig_gpr2 is stored on the kernel stack - */ - task_pt_regs(child)->orig_gpr2 = data; -+ if (ret == 0) -+ ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, -+ &target->thread.fp_regs, 0, -1); ++ target->thread.fp_regs.fpc = fpc[0]; ++ } - } else if (addr < (addr_t) (&dummy->regs.fp_regs + 1)) { - /* @@ -345,8 +339,9 @@ - return -EINVAL; - offset = addr - (addr_t) &dummy->regs.fp_regs; - *(addr_t *)((addr_t) &child->thread.fp_regs + offset) = data; -+ if (ret == 0 && target == current) -+ restore_fp_regs(&target->thread.fp_regs); ++ if (ret == 0 && count > 0) ++ ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, ++ target->thread.fp_regs.fprs, 0, -1); - } else if (addr < (addr_t) (&dummy->regs.per_info + 1)) { - /* @@ -354,7 +349,9 @@ - */ - offset = addr - (addr_t) &dummy->regs.per_info; - *(addr_t *)((addr_t) &child->thread.per_info + offset) = data; -- ++ if (ret == 0 && target == current) ++ restore_fp_regs(&target->thread.fp_regs); + - } + return ret; +} @@ -378,20 +375,18 @@ + unsigned int pos, unsigned int count, + const void *kbuf, const void __user *ubuf) { -- unsigned long tmp; - ptrace_area parea; - int copied, ret; -- ++ int ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, ++ &target->thread.per_info, 0, -1); + - switch (request) { - case PTRACE_PEEKTEXT: - case PTRACE_PEEKDATA: - /* Remove high order bit from address (only for 31 bit). */ - addr &= PSW_ADDR_INSN; - /* read word at location addr. */ -- copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0); -- if (copied != sizeof(tmp)) -- return -EIO; -- return put_user(tmp, (unsigned long __force __user *) data); +- return generic_ptrace_peekdata(child, addr, data); - - case PTRACE_PEEKUSR: - /* read the word at location addr in the USER area. */ @@ -402,10 +397,7 @@ - /* Remove high order bit from address (only for 31 bit). */ - addr &= PSW_ADDR_INSN; - /* write the word at location addr. */ -- copied = access_process_vm(child, addr, &data, sizeof(data),1); -- if (copied != sizeof(data)) -- return -EIO; -- return 0; +- return generic_ptrace_pokedata(child, addr, data); - - case PTRACE_POKEUSR: - /* write the word at location addr in the USER area */ @@ -438,9 +430,6 @@ - return 0; - } - return ptrace_request(child, request, addr, data); -+ int ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, -+ &target->thread.per_info, 0, -1); -+ + FixPerRegisters(target); + + return ret; @@ -478,11 +467,13 @@ - return -EIO; +static const struct utrace_regset native_regsets[] = { + { ++ .core_note_type = NT_PRSTATUS, + .size = sizeof(long), .align = sizeof(long), + .n = sizeof(s390_regs) / sizeof(long), + .get = genregs_get, .set = genregs_set + }, + { ++ .core_note_type = NT_PRFPREG, + .size = sizeof(long), .align = sizeof(long), + .n = sizeof(s390_fp_regs) / sizeof(long), + .get = fpregs_get, .set = fpregs_set @@ -539,12 +530,13 @@ + int ret = 0; + + /* Fake a 31 bit psw mask. */ -+ if (count > 0 && pos == PT_PSWMASK / 2) { ++ if (count > 0 && pos == offsetof(struct user_regs_struct32, psw.mask)) { + u32 pswmask = PSW32_MASK_MERGE(psw32_user_bits, + (u32) (regs->psw.mask >> 32)); -+ ret = utrace_regset_copyout(&pos, &count, &kbuf, &ubuf, -+ &pswmask, PT_PSWMASK / 2, -+ PT_PSWADDR / 2); ++ ret = utrace_regset_copyout( ++ &pos, &count, &kbuf, &ubuf, &pswmask, ++ offsetof(struct user_regs_struct32, psw.mask), ++ offsetof(struct user_regs_struct32, psw.addr)); + } - } else if (addr < (addr_t) (&dummy32->regs.fp_regs + 1)) { @@ -554,11 +546,13 @@ - offset = addr - (addr_t) &dummy32->regs.fp_regs; - tmp = *(__u32 *)((addr_t) &child->thread.fp_regs + offset); + /* Fake a 31 bit psw address. */ -+ if (ret == 0 && count > 0 && pos == PT_PSWADDR / 2) { ++ if (ret == 0 && count > 0 && ++ pos == offsetof(struct user_regs_struct32, psw.addr)) { + u32 pswaddr = (u32) regs->psw.addr | PSW32_ADDR_AMODE31; -+ ret = utrace_regset_copyout(&pos, &count, &kbuf, &ubuf, -+ &pswaddr, PT_PSWADDR / 2, -+ PT_GPR0 / 2); ++ ret = utrace_regset_copyout( ++ &pos, &count, &kbuf, &ubuf, &pswaddr, ++ offsetof(struct user_regs_struct32, psw.addr), ++ offsetof(struct user_regs_struct32, gprs[0])); + } - } else if (addr < (addr_t) (&dummy32->regs.per_info + 1)) { @@ -574,8 +568,11 @@ - offset == (addr_t) &dummy_per32->lowcore.words.address) - offset = offset*2 + 4; + /* The GPRs are directly on the stack. Just truncate them. */ -+ while (ret == 0 && count > 0 && pos < PT_ACR0 / 2) { -+ u32 value = regs->gprs[(pos - PT_GPR0 / 2) / sizeof(u32)]; ++ while (ret == 0 && count > 0 && ++ pos < offsetof(struct user_regs_struct32, acrs[0])) { ++ unsigned int n = ++ pos - offsetof(struct user_regs_struct32, gprs[0]); ++ u32 value = regs->gprs[n / sizeof(u32)]; + if (kbuf) { + *(u32 *) kbuf = value; + kbuf += sizeof(u32); @@ -593,14 +590,14 @@ - } else - tmp = 0; + /* The ACRs are kept in the thread_struct. */ -+ if (ret == 0 && count > 0 && pos < PT_ACR0 / 2 + NUM_ACRS * ACR_SIZE) { ++ if (ret == 0 && count > 0 && ++ pos < offsetof(struct user_regs_struct32, acrs[NUM_ACRS])) { + if (target == current) + save_access_regs(target->thread.acrs); -+ -+ ret = utrace_regset_copyout(&pos, &count, &kbuf, &ubuf, -+ target->thread.acrs, -+ PT_ACR0 / 2, -+ PT_ACR0 / 2 + NUM_ACRS * ACR_SIZE); ++ ret = utrace_regset_copyout( ++ &pos, &count, &kbuf, &ubuf, target->thread.acrs, ++ offsetof(struct user_regs_struct32, acrs[0]), ++ offsetof(struct user_regs_struct32, acrs[NUM_ACRS])); + } - return put_user(tmp, (__u32 __user *) data); @@ -608,8 +605,7 @@ + if (count > 0) { + if (kbuf) + *(u32 *) kbuf = regs->orig_gpr2; -+ else if (put_user((u32) regs->orig_gpr2, -+ (u32 __user *) ubuf)) ++ else if (put_user((u32) regs->orig_gpr2, (u32 __user *) ubuf)) + return -EFAULT; + } + @@ -635,18 +631,19 @@ + int ret = 0; + + /* Check for an invalid PSW mask. */ -+ if (count > 0 && pos == PT_PSWMASK / 2) { ++ if (count > 0 && pos == offsetof(struct user_regs_struct32, psw.mask)) { + u32 pswmask; -+ ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, -+ &pswmask, PT_PSWMASK / 2, -+ PT_PSWADDR / 2); ++ ret = utrace_regset_copyin( ++ &pos, &count, &kbuf, &ubuf, &pswmask, ++ offsetof(struct user_regs_struct32, psw.mask), ++ offsetof(struct user_regs_struct32, psw.addr)); + if (ret) + return ret; - if (!test_thread_flag(TIF_31BIT) || - (addr & 3) || addr > sizeof(struct user32) - 3) - return -EIO; -+ if (pswmask != PSW_MASK_MERGE(psw_user32_bits, pswmask)) ++ if (pswmask != PSW32_MASK_MERGE(psw32_user_bits, pswmask)) + /* Invalid psw mask. */ + return -EINVAL; @@ -663,11 +660,12 @@ - */ - if (addr == (addr_t) &dummy32->regs.psw.mask) { + /* Build a 64 bit psw address from 31 bit address. */ -+ if (count > 0 && pos == PT_PSWADDR / 2) { ++ if (count > 0 && pos == offsetof(struct user_regs_struct32, psw.addr)) { + u32 pswaddr; -+ ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, -+ &pswaddr, PT_PSWADDR / 2, -+ PT_GPR0 / 2); ++ ret = utrace_regset_copyin( ++ &pos, &count, &kbuf, &ubuf, &pswaddr, ++ offsetof(struct user_regs_struct32, psw.addr), ++ offsetof(struct user_regs_struct32, gprs[0])); + if (ret == 0) /* Build a 64 bit psw mask from 31 bit mask. */ - if (tmp != PSW32_MASK_MERGE(psw32_user_bits, tmp)) @@ -687,7 +685,10 @@ + } + + /* The GPRs are directly onto the stack. */ -+ while (ret == 0 && count > 0 && pos < PT_ACR0 / 2) { ++ while (ret == 0 && count > 0 && ++ pos < offsetof(struct user_regs_struct32, acrs[0])) { ++ unsigned int n = ++ pos - offsetof(struct user_regs_struct32, gprs[0]); + u32 value; + + if (kbuf) { @@ -712,7 +713,7 @@ - * orig_gpr2 is stored on the kernel stack - */ - *(__u32*)((addr_t) &task_pt_regs(child)->orig_gpr2 + 4) = tmp; -+ regs->gprs[(pos - PT_GPR0 / 2) / sizeof(u32)] = value; ++ regs->gprs[n / sizeof(u32)] = value; + } - } else if (addr < (addr_t) (&dummy32->regs.fp_regs + 1)) { @@ -726,16 +727,17 @@ - offset = addr - (addr_t) &dummy32->regs.fp_regs; - *(__u32 *)((addr_t) &child->thread.fp_regs + offset) = tmp; + /* The ACRs are kept in the thread_struct. */ -+ if (count > 0 && pos < PT_ORIGGPR2 / 2) { -+ if (target == current -+ && (pos != PT_ACR0 / 2 -+ || count < sizeof(target->thread.acrs))) ++ if (count > 0 && ++ pos < offsetof(struct user_regs_struct32, acrs[NUM_ACRS])) { ++ if (target == current && ++ (pos != offsetof(struct user_regs_struct32, acrs[0]) || ++ count < sizeof(target->thread.acrs))) + save_access_regs(target->thread.acrs); + -+ ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf, -+ target->thread.acrs, -+ PT_ACR0 / 2, -+ PT_ACR0 / 2 + NUM_ACRS * ACR_SIZE); ++ ret = utrace_regset_copyin( ++ &pos, &count, &kbuf, &ubuf, target->thread.acrs, ++ offsetof(struct user_regs_struct32, acrs[0]), ++ offsetof(struct user_regs_struct32, acrs[NUM_ACRS])); - } else if (addr < (addr_t) (&dummy32->regs.per_info + 1)) { - /* @@ -968,7 +970,7 @@ - tracehook_disable_single_step(child); - wake_up_process(child); - return 0; -- + - case PTRACE_KILL: - /* - * make the child exit. Best I can do is send it a sigkill. @@ -996,21 +998,19 @@ - /* give it a chance to run. */ - wake_up_process(child); - return 0; -- -- case PTRACE_DETACH: -- /* detach a process that was attached. */ -- return ptrace_detach(child, data); - +static const struct utrace_regset s390_compat_regsets[] = { + { ++ .core_note_type = NT_PRSTATUS, + .size = sizeof(u32), .align = sizeof(u32), -+ .n = sizeof(s390_regs) / sizeof(long), ++ .n = offsetof(struct user_regs_struct32, fp_regs) / sizeof(u32), + .get = s390_genregs_get, .set = s390_genregs_set + }, + { ++ .core_note_type = NT_PRFPREG, + .size = sizeof(u32), .align = sizeof(u32), + .n = sizeof(s390_fp_regs) / sizeof(u32), + .get = fpregs_get, .set = fpregs_set ++ + }, + { + .size = sizeof(u32), .align = sizeof(u32), linux-2.6-utrace-regset-sparc64.patch: Index: linux-2.6-utrace-regset-sparc64.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-regset-sparc64.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-regset-sparc64.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-regset-sparc64.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -9,14 +9,12 @@ --- arch/sparc64/kernel/Makefile | 2 - arch/sparc64/kernel/ptrace.c | 631 +++++++++++++++++++++++++++++++++++++----- + arch/sparc64/kernel/ptrace.c | 635 +++++++++++++++++++++++++++++++++++++---- arch/sparc64/kernel/systbls.S | 4 - 3 files changed, 568 insertions(+), 69 deletions(-) + 3 files changed, 572 insertions(+), 69 deletions(-) -Index: b/arch/sparc64/kernel/Makefile -=================================================================== ---- a/arch/sparc64/kernel/Makefile -+++ b/arch/sparc64/kernel/Makefile +--- linux-2.6/arch/sparc64/kernel/Makefile ++++ linux-2.6/arch/sparc64/kernel/Makefile @@ -5,6 +5,8 @@ EXTRA_AFLAGS := -ansi EXTRA_CFLAGS := -Werror @@ -26,10 +24,8 @@ extra-y := head.o init_task.o vmlinux.lds obj-y := process.o setup.o cpu.o idprom.o \ -Index: b/arch/sparc64/kernel/ptrace.c -=================================================================== ---- a/arch/sparc64/kernel/ptrace.c -+++ b/arch/sparc64/kernel/ptrace.c +--- linux-2.6/arch/sparc64/kernel/ptrace.c ++++ linux-2.6/arch/sparc64/kernel/ptrace.c @@ -1,6 +1,6 @@ -/* ptrace.c: Sparc process tracing support. +/* ptrace.c: Sparc64 process tracing support. @@ -39,7 +35,7 @@ * Copyright (C) 1997 Jakub Jelinek (jj at sunsite.mff.cuni.cz) * * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson, -@@ -11,106 +11,603 @@ +@@ -11,106 +11,607 @@ */ #include @@ -217,9 +213,8 @@ + } + + return err; - } - --static inline void pt_succ_return(struct pt_regs *regs, unsigned long value) ++} ++ +#define FPREG_F0 0 +#define FPREG_FSR 32 +#define FPREG_GSR 33 @@ -231,11 +226,7 @@ + const struct utrace_regset *regset, + unsigned int pos, unsigned int count, + void *kbuf, void __user *ubuf) - { -- regs->u_regs[UREG_I0] = value; -- regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY); -- regs->tpc = regs->tnpc; -- regs->tnpc += 4; ++{ + struct thread_info *t = task_thread_info(target); + int err; + @@ -264,22 +255,16 @@ + return err; } --static inline void --pt_succ_return_linux(struct pt_regs *regs, unsigned long value, void __user *addr) +-static inline void pt_succ_return(struct pt_regs *regs, unsigned long value) +static int fpregs_set(struct task_struct *target, + const struct utrace_regset *regset, + unsigned int pos, unsigned int count, + const void *kbuf, const void __user *ubuf) { -- if (test_thread_flag(TIF_32BIT)) { -- if (put_user(value, (unsigned int __user *) addr)) { -- pt_error_return(regs, EFAULT); -- return; -- } -- } else { -- if (put_user(value, (long __user *) addr)) { -- pt_error_return(regs, EFAULT); -- return; +- regs->u_regs[UREG_I0] = value; +- regs->tstate &= ~(TSTATE_ICARRY | TSTATE_XCARRY); +- regs->tpc = regs->tnpc; +- regs->tnpc += 4; + struct thread_info *t = task_thread_info(target); + int err; + @@ -306,15 +291,19 @@ + } + + return err; -+} -+ + } + +-static inline void +-pt_succ_return_linux(struct pt_regs *regs, unsigned long value, void __user *addr) +static const struct utrace_regset native_regsets[] = { + { ++ .core_note_type = NT_PRSTATUS, + .n = SPARC64_NGREGS, + .size = sizeof(long), .align = sizeof(long), + .get = genregs_get, .set = genregs_set + }, + { ++ .core_note_type = NT_PRFPREG, + .n = SPARC64_NFPREGS, + .size = sizeof(long), .align = sizeof(long), + .get = fpregs_get, .set = fpregs_set @@ -345,7 +334,16 @@ + const struct utrace_regset *regset, + unsigned int pos, unsigned int count, + void *kbuf, void __user *ubuf) -+{ + { +- if (test_thread_flag(TIF_32BIT)) { +- if (put_user(value, (unsigned int __user *) addr)) { +- pt_error_return(regs, EFAULT); +- return; +- } +- } else { +- if (put_user(value, (long __user *) addr)) { +- pt_error_return(regs, EFAULT); +- return; + struct pt_regs *regs = task_pt_regs(target); + + while (count > 0 && pos < (GENREG32_L0 * 4)) { @@ -669,11 +667,13 @@ + +static const struct utrace_regset sparc32_regsets[] = { + { ++ .core_note_type = NT_PRSTATUS, + .n = SPARC32_NGREGS, + .size = sizeof(u32), .align = sizeof(u32), + .get = genregs32_get, .set = genregs32_set + }, + { ++ .core_note_type = NT_PRFPREG, + .n = SPARC32_NFPREGS, + .size = sizeof(u32), .align = sizeof(u32), + .get = fpregs32_get, .set = fpregs32_set @@ -708,11 +708,9 @@ /* To get the necessary page struct, access_process_vm() first calls * get_user_pages(). This has done a flush_dcache_page() on the * accessed page. Then our caller (copy_{to,from}_user_page()) did -Index: b/arch/sparc64/kernel/systbls.S -=================================================================== ---- a/arch/sparc64/kernel/systbls.S -+++ b/arch/sparc64/kernel/systbls.S -@@ -24,7 +24,7 @@ sys_call_table32: +--- linux-2.6/arch/sparc64/kernel/systbls.S ++++ linux-2.6/arch/sparc64/kernel/systbls.S +@@ -23,7 +23,7 @@ sys_call_table32: /*10*/ .word sys_unlink, sunos_execv, sys_chdir, sys32_chown16, sys32_mknod /*15*/ .word sys_chmod, sys32_lchown16, sparc_brk, sys32_perfctr, sys32_lseek /*20*/ .word sys_getpid, sys_capget, sys_capset, sys32_setuid16, sys32_getuid16 @@ -721,7 +719,7 @@ /*30*/ .word compat_sys_utime, sys_lchown, sys_fchown, sys32_access, sys32_nice .word sys_chown, sys_sync, sys32_kill, compat_sys_newstat, sys32_sendfile /*40*/ .word compat_sys_newlstat, sys_dup, sys_pipe, compat_sys_times, sys_getuid -@@ -168,7 +168,7 @@ sunos_sys_table: +@@ -169,7 +169,7 @@ sunos_sys_table: .word sys_chmod, sys32_lchown16, sunos_brk .word sunos_nosys, sys32_lseek, sunos_getpid .word sunos_nosys, sunos_nosys, sunos_nosys linux-2.6-utrace-regset.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-utrace-regset.patch Index: linux-2.6-utrace-regset.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-regset.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-regset.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-regset.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -11,1169 +11,939 @@ --- - arch/i386/kernel/i387.c | 143 +++--- - arch/i386/kernel/ptrace.c | 822 ++++++++++++++++++++---------------- - arch/powerpc/kernel/Makefile | 4 - arch/powerpc/kernel/ptrace-common.h | 145 ------ - arch/powerpc/kernel/ptrace.c | 718 +++++++++++++++---------------- - arch/powerpc/kernel/ptrace32.c | 443 ------------------- - arch/x86_64/ia32/fpu32.c | 92 +++- - arch/x86_64/ia32/ptrace32.c | 721 ++++++++++++++++++++----------- - arch/x86_64/kernel/ptrace.c | 730 +++++++++++++++++++------------ - include/asm-i386/i387.h | 13 - include/asm-x86_64/fpu32.h | 3 - include/asm-x86_64/tracehook.h | 8 - include/linux/tracehook.h | 244 ++++++++++ - kernel/ptrace.c | 8 - 14 files changed, 2125 insertions(+), 1969 deletions(-) - delete arch/powerpc/kernel/ptrace32.c - delete arch/powerpc/kernel/ptrace-common.h + arch/powerpc/kernel/Makefile | 2 + arch/powerpc/kernel/ptrace32.c | 20 - + arch/powerpc/kernel/ptrace.c | 644 ++++++++++++++++++++++---------- + arch/x86/ia32/ptrace32.c | 721 +++++++++++++++++++++++------------- + arch/x86/ia32/fpu32.c | 92 ++++- + arch/x86/kernel/ptrace_32.c | 806 +++++++++++++++++++++++----------------- + arch/x86/kernel/i387_32.c | 143 ++++--- + arch/x86/kernel/ptrace_64.c | 720 ++++++++++++++++++++++-------------- + kernel/ptrace.c | 9 + include/linux/tracehook.h | 255 ++++++++++++- + include/asm-x86/fpu32.h | 3 + include/asm-x86/i387_32.h | 13 - + include/asm-x86/tracehook.h | 8 + 13 files changed, 2228 insertions(+), 1208 deletions(-) -Index: b/arch/i386/kernel/i387.c -=================================================================== ---- a/arch/i386/kernel/i387.c -+++ b/arch/i386/kernel/i387.c -@@ -222,14 +222,10 @@ void set_fpu_twd( struct task_struct *ts - * FXSR floating point environment conversions. +--- linux-2.6/arch/powerpc/kernel/Makefile ++++ linux-2.6/arch/powerpc/kernel/Makefile +@@ -10,6 +10,8 @@ CFLAGS_prom_init.o += -fPIC + CFLAGS_btext.o += -fPIC + endif + ++CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' ++ + obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ + irq.o align.o signal_32.o pmc.o vdso.o \ + init_task.o process.o systbl.o idle.o \ +--- linux-2.6/arch/powerpc/kernel/ptrace32.c ++++ linux-2.6/arch/powerpc/kernel/ptrace32.c +@@ -35,10 +35,6 @@ + #include + #include + +-/* +- * does not yet catch signals sent when the child dies. +- * in exit.c or in signal.c. +- */ + + /* + * Here are the old "legacy" powerpc specific getregs/setregs ptrace calls, +@@ -173,7 +169,7 @@ long compat_sys_ptrace(int request, int + + CHECK_FULL_REGS(child->thread.regs); + if (index < PT_FPR0) { +- tmp = ptrace_get_reg(child, index); ++ tmp = 0;/*ptrace_get_reg(child, index);*/ + } else { + flush_fp_to_thread(child); + /* +@@ -223,7 +219,7 @@ long compat_sys_ptrace(int request, int + flush_fp_to_thread(child); + tmp = ((unsigned long int *)child->thread.fpr)[numReg - PT_FPR0]; + } else { /* register within PT_REGS struct */ +- tmp = ptrace_get_reg(child, numReg); ++/* tmp = ptrace_get_reg(child, numReg);*/ + } + reg32bits = ((u32*)&tmp)[part]; + ret = put_user(reg32bits, (u32 __user *)data); +@@ -281,7 +277,7 @@ long compat_sys_ptrace(int request, int + + CHECK_FULL_REGS(child->thread.regs); + if (index < PT_FPR0) { +- ret = ptrace_put_reg(child, index, data); ++/* ret = ptrace_put_reg(child, index, data);*/ + } else { + flush_fp_to_thread(child); + /* +@@ -319,12 +315,12 @@ long compat_sys_ptrace(int request, int + break; + CHECK_FULL_REGS(child->thread.regs); + if (numReg < PT_FPR0) { +- unsigned long freg = ptrace_get_reg(child, numReg); ++ unsigned long freg = 0;/*ptrace_get_reg(child, numReg);*/ + if (index % 2) + freg = (freg & ~0xfffffffful) | (data & 0xfffffffful); + else + freg = (freg & 0xfffffffful) | (data << 32); +- ret = ptrace_put_reg(child, numReg, freg); ++/* ret = ptrace_put_reg(child, numReg, freg);*/ + } else { + flush_fp_to_thread(child); + ((unsigned int *)child->thread.regs)[index] = data; +@@ -358,8 +354,8 @@ long compat_sys_ptrace(int request, int + CHECK_FULL_REGS(child->thread.regs); + ret = 0; + for (ui = 0; ui < PT_REGS_COUNT; ui ++) { +- ret |= __put_user(ptrace_get_reg(child, ui), +- (unsigned int __user *) data); ++/* ret |= __put_user(ptrace_get_reg(child, ui), ++ (unsigned int __user *) data);*/ + data += sizeof(int); + } + break; +@@ -379,7 +375,7 @@ long compat_sys_ptrace(int request, int + ret = __get_user(tmp, (unsigned int __user *) data); + if (ret) + break; +- ptrace_put_reg(child, ui, tmp); ++/* ptrace_put_reg(child, ui, tmp);*/ + data += sizeof(int); + } + break; +--- linux-2.6/arch/powerpc/kernel/ptrace.c ++++ linux-2.6/arch/powerpc/kernel/ptrace.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #ifdef CONFIG_PPC32 + #include + #endif +@@ -38,11 +39,6 @@ + #include + + /* +- * does not yet catch signals sent when the child dies. +- * in exit.c or in signal.c. +- */ +- +-/* + * Set of msr bits that gdb can change on behalf of a process. */ + #if defined(CONFIG_40x) || defined(CONFIG_BOOKE) +@@ -60,69 +56,120 @@ + #define PT_MAX_PUT_REG PT_CCR + #endif --static int convert_fxsr_to_user( struct _fpstate __user *buf, -- struct i387_fxsave_struct *fxsave ) -+static inline void -+convert_fxsr_env_to_i387(unsigned long env[7], -+ struct i387_fxsave_struct *fxsave) +-/* +- * Get contents of register REGNO in task TASK. +- */ +-unsigned long ptrace_get_reg(struct task_struct *task, int regno) ++static int ++genregs_get(struct task_struct *target, ++ const struct utrace_regset *regset, ++ unsigned int pos, unsigned int count, ++ void *kbuf, void __user *ubuf) { -- unsigned long env[7]; -- struct _fpreg __user *to; -- struct _fpxreg *from; -- int i; -- - env[0] = (unsigned long)fxsave->cwd | 0xffff0000ul; - env[1] = (unsigned long)fxsave->swd | 0xffff0000ul; - env[2] = twd_fxsr_to_i387(fxsave); -@@ -237,7 +233,17 @@ static int convert_fxsr_to_user( struct - env[4] = fxsave->fcs | ((unsigned long)fxsave->fop << 16); - env[5] = fxsave->foo; - env[6] = fxsave->fos; -+} -+ -+static int convert_fxsr_to_user(struct _fpstate __user *buf, -+ struct i387_fxsave_struct *fxsave) -+{ -+ unsigned long env[7]; -+ struct _fpreg __user *to; -+ struct _fpxreg *from; -+ int i; +- unsigned long tmp = 0; ++ unsigned long tmp; [...5750 lines suppressed...] --static inline int get_vrregs(unsigned long __user *data, -- struct task_struct *task) --{ -- unsigned long regsize; -- -- /* copy AltiVec registers VR[0] .. VR[31] */ -- regsize = 32 * sizeof(vector128); -- if (copy_to_user(data, task->thread.vr, regsize)) -- return -EFAULT; -- data += (regsize / sizeof(unsigned long)); -- -- /* copy VSCR */ -- regsize = 1 * sizeof(vector128); -- if (copy_to_user(data, &task->thread.vscr, regsize)) -- return -EFAULT; -- data += (regsize / sizeof(unsigned long)); -- -- /* copy VRSAVE */ -- if (put_user(task->thread.vrsave, (u32 __user *)data)) -- return -EFAULT; -- -- return 0; --} -- --/* -- * Write contents of AltiVec register state into task TASK. -- */ --static inline int set_vrregs(struct task_struct *task, -- unsigned long __user *data) --{ -- unsigned long regsize; -- -- /* copy AltiVec registers VR[0] .. VR[31] */ -- regsize = 32 * sizeof(vector128); -- if (copy_from_user(task->thread.vr, data, regsize)) -- return -EFAULT; -- data += (regsize / sizeof(unsigned long)); -- -- /* copy VSCR */ -- regsize = 1 * sizeof(vector128); -- if (copy_from_user(&task->thread.vscr, data, regsize)) -- return -EFAULT; -- data += (regsize / sizeof(unsigned long)); -- -- /* copy VRSAVE */ -- if (get_user(task->thread.vrsave, (u32 __user *)data)) -- return -EFAULT; -- -- return 0; --} --#endif -- --static inline int ptrace_set_debugreg(struct task_struct *task, -- unsigned long addr, unsigned long data) --{ -- /* We only support one DABR and no IABRS at the moment */ -- if (addr > 0) -- return -EINVAL; -- -- /* The bottom 3 bits are flags */ -- if ((data & ~0x7UL) >= TASK_SIZE) -- return -EIO; -- -- /* Ensure translation is on */ -- if (data && !(data & DABR_TRANSLATION)) -- return -EIO; -- -- task->thread.dabr = data; -- return 0; --} -- --#endif /* _PPC64_PTRACE_COMMON_H */ -Index: b/kernel/ptrace.c -=================================================================== ---- a/kernel/ptrace.c -+++ b/kernel/ptrace.c -@@ -96,12 +96,6 @@ int ptrace_detach(struct task_struct *ch + /* do the secure computing check first */ +--- linux-2.6/kernel/ptrace.c ++++ linux-2.6/kernel/ptrace.c +@@ -100,13 +100,6 @@ int ptrace_detach(struct task_struct *ch if (!valid_signal(data)) return -EIO; - /* Architecture-specific hardware disable .. */ - ptrace_disable(child); +- clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); - - /* .. re-parent .. */ - child->exit_code = data; @@ -4420,9 +3854,9 @@ return -ENOSYS; } -@@ -209,9 +203,7 @@ struct task_struct *ptrace_get_task_stru - return child; - } +@@ -218,12 +211,10 @@ struct task_struct *ptrace_get_task_stru + #define arch_ptrace_attach(child) do { } while (0) + #endif -#ifndef __ARCH_SYS_PTRACE asmlinkage long sys_ptrace(long request, long pid, long addr, long data) @@ -4430,10 +3864,11 @@ return -ENOSYS; } -#endif /* __ARCH_SYS_PTRACE */ -Index: b/include/linux/tracehook.h -=================================================================== ---- a/include/linux/tracehook.h -+++ b/include/linux/tracehook.h + + int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data) + { +--- linux-2.6/include/linux/tracehook.h ++++ linux-2.6/include/linux/tracehook.h @@ -52,10 +52,10 @@ struct pt_regs; * should be one that can be evaluated in modules, i.e. uses exported symbols. * @@ -4449,7 +3884,7 @@ * Enabling or disabling redundantly is harmless. * * void tracehook_enable_block_step(struct task_struct *tsk); -@@ -93,6 +93,242 @@ struct pt_regs; +@@ -93,6 +93,253 @@ struct pt_regs; */ @@ -4489,6 +3924,17 @@ + unsigned int bias; /* Bias from natural indexing. */ + + /* ++ * If nonzero, this gives the n_type field (NT_* value) of the ++ * core file note in which this regset's data appears. ++ * NT_PRSTATUS is a special case in that the regset data starts ++ * at offsetof(struct elf_prstatus, pr_reg) into the note data; ++ * that is part of the per-machine ELF formats userland knows ++ * about. In other cases, the core file note contains exactly ++ * the whole regset (n*size) and nothing else. ++ */ ++ unsigned int core_note_type; ++ ++ /* + * Return -%ENODEV if not available on the hardware found. + * Return %0 if no interesting state in this thread. + * Return >%0 number of @size units of interesting state. @@ -4692,11 +4138,19 @@ /* * Following are entry points from core code, where the user debugging * support can affect the normal behavior. The locking situation is -Index: b/include/asm-i386/i387.h -=================================================================== ---- a/include/asm-i386/i387.h -+++ b/include/asm-i386/i387.h -@@ -129,17 +129,12 @@ extern int save_i387( struct _fpstate __ +--- linux-2.6/include/asm-x86/fpu32.h ++++ linux-2.6/include/asm-x86/fpu32.h +@@ -7,4 +7,7 @@ int restore_i387_ia32(struct task_struct + int save_i387_ia32(struct task_struct *tsk, struct _fpstate_ia32 __user *buf, + struct pt_regs *regs, int fsave); + ++int get_fpregs32(struct user_i387_ia32_struct *, struct task_struct *); ++int set_fpregs32(struct task_struct *, const struct user_i387_ia32_struct *); ++ + #endif +--- linux-2.6/include/asm-x86/i387_32.h ++++ linux-2.6/include/asm-x86/i387_32.h +@@ -130,17 +130,12 @@ extern int save_i387( struct _fpstate __ extern int restore_i387( struct _fpstate __user *buf ); /* @@ -4718,25 +4172,11 @@ /* * FPU state for core dumps... -Index: b/include/asm-x86_64/fpu32.h -=================================================================== ---- a/include/asm-x86_64/fpu32.h -+++ b/include/asm-x86_64/fpu32.h -@@ -7,4 +7,7 @@ int restore_i387_ia32(struct task_struct - int save_i387_ia32(struct task_struct *tsk, struct _fpstate_ia32 __user *buf, - struct pt_regs *regs, int fsave); +--- linux-2.6/include/asm-x86/tracehook.h ++++ linux-2.6/include/asm-x86/tracehook.h +@@ -60,4 +60,12 @@ static inline void tracehook_abort_sysca -+int get_fpregs32(struct user_i387_ia32_struct *, struct task_struct *); -+int set_fpregs32(struct task_struct *, const struct user_i387_ia32_struct *); -+ #endif -Index: b/include/asm-x86_64/tracehook.h -=================================================================== ---- a/include/asm-x86_64/tracehook.h -+++ b/include/asm-x86_64/tracehook.h -@@ -48,4 +48,12 @@ static inline void tracehook_abort_sysca - regs->orig_rax = -1L; - } +/* + * These are used directly by some of the regset code. linux-2.6-utrace-tracehook-ia64.patch: Index: linux-2.6-utrace-tracehook-ia64.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-tracehook-ia64.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-tracehook-ia64.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-tracehook-ia64.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -8,19 +8,17 @@ --- - arch/ia64/ia32/ia32_entry.S | 2 - + arch/ia64/ia32/ia32_entry.S | 2 + arch/ia64/ia32/sys_ia32.c | 23 ++----------- - arch/ia64/kernel/ptrace.c | 39 +++++----------------- - arch/ia64/kernel/signal.c | 4 +- - include/asm-ia64/tracehook.h | 73 +++++++++++++++++++++++++++++++++++++++++++ + arch/ia64/kernel/ptrace.c | 39 ++++++---------------- + arch/ia64/kernel/signal.c | 4 ++ + include/asm-ia64/tracehook.h | 73 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 50 deletions(-) create include/asm-ia64/tracehook.h -Index: b/arch/ia64/ia32/ia32_entry.S -=================================================================== ---- a/arch/ia64/ia32/ia32_entry.S -+++ b/arch/ia64/ia32/ia32_entry.S -@@ -236,7 +236,7 @@ ia32_syscall_table: +--- linux-2.6/arch/ia64/ia32/ia32_entry.S ++++ linux-2.6/arch/ia64/ia32/ia32_entry.S +@@ -199,7 +199,7 @@ ia32_syscall_table: data8 sys_setuid /* 16-bit version */ data8 sys_getuid /* 16-bit version */ data8 compat_sys_stime /* 25 */ @@ -29,10 +27,8 @@ data8 sys32_alarm data8 sys_ni_syscall data8 sys32_pause -Index: b/arch/ia64/ia32/sys_ia32.c -=================================================================== ---- a/arch/ia64/ia32/sys_ia32.c -+++ b/arch/ia64/ia32/sys_ia32.c +--- linux-2.6/arch/ia64/ia32/sys_ia32.c ++++ linux-2.6/arch/ia64/ia32/sys_ia32.c @@ -1436,25 +1436,6 @@ sys32_waitpid (int pid, unsigned int *st return compat_sys_wait4(pid, stat_addr, options, NULL); } @@ -87,10 +83,8 @@ typedef struct { unsigned int ss_sp; -Index: b/arch/ia64/kernel/ptrace.c -=================================================================== ---- a/arch/ia64/kernel/ptrace.c -+++ b/arch/ia64/kernel/ptrace.c +--- linux-2.6/arch/ia64/kernel/ptrace.c ++++ linux-2.6/arch/ia64/kernel/ptrace.c @@ -12,6 +12,7 @@ #include #include @@ -99,7 +93,7 @@ #include #include #include -@@ -1598,28 +1599,6 @@ sys_ptrace (long request, pid_t pid, uns +@@ -1601,28 +1602,6 @@ sys_ptrace (long request, pid_t pid, uns return ret; } @@ -128,7 +122,7 @@ /* "asmlinkage" so the input arguments are preserved... */ asmlinkage void -@@ -1627,9 +1606,8 @@ syscall_trace_enter (long arg0, long arg +@@ -1630,9 +1609,8 @@ syscall_trace_enter (long arg0, long arg long arg4, long arg5, long arg6, long arg7, struct pt_regs regs) { @@ -140,7 +134,7 @@ if (unlikely(current->audit_context)) { long syscall; -@@ -1664,8 +1642,11 @@ syscall_trace_leave (long arg0, long arg +@@ -1667,8 +1645,11 @@ syscall_trace_leave (long arg0, long arg audit_syscall_exit(success, result); } @@ -156,10 +150,8 @@ + tracehook_report_syscall_step(®s); + } } -Index: b/arch/ia64/kernel/signal.c -=================================================================== ---- a/arch/ia64/kernel/signal.c -+++ b/arch/ia64/kernel/signal.c +--- linux-2.6/arch/ia64/kernel/signal.c ++++ linux-2.6/arch/ia64/kernel/signal.c @@ -10,7 +10,7 @@ #include #include @@ -169,7 +161,7 @@ #include #include #include -@@ -471,6 +471,8 @@ handle_signal (unsigned long sig, struct +@@ -421,6 +421,8 @@ handle_signal (unsigned long sig, struct sigaddset(¤t->blocked, sig); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); @@ -178,10 +170,8 @@ return 1; } -Index: b/include/asm-ia64/tracehook.h -=================================================================== ---- /dev/null -+++ b/include/asm-ia64/tracehook.h +--- linux-2.6/include/asm-ia64/tracehook.h ++++ linux-2.6/include/asm-ia64/tracehook.h @@ -0,0 +1,73 @@ +/* + * Copyright (C)2006 Intel Co linux-2.6-utrace-tracehook-s390.patch: Index: linux-2.6-utrace-tracehook-s390.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-tracehook-s390.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-tracehook-s390.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-tracehook-s390.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -7,18 +7,16 @@ --- + arch/s390/kernel/traps.c | 6 ++-- arch/s390/kernel/compat_signal.c | 5 ++- - arch/s390/kernel/ptrace.c | 62 +++++++++++++++++++++------------------ - arch/s390/kernel/signal.c | 3 + - arch/s390/kernel/traps.c | 6 +-- + arch/s390/kernel/ptrace.c | 62 +++++++++++++++++++++----------------- + arch/s390/kernel/signal.c | 3 ++ include/asm-s390/tracehook.h | 46 ++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 32 deletions(-) create include/asm-s390/tracehook.h -Index: b/arch/s390/kernel/traps.c -=================================================================== ---- a/arch/s390/kernel/traps.c -+++ b/arch/s390/kernel/traps.c +--- linux-2.6/arch/s390/kernel/traps.c ++++ linux-2.6/arch/s390/kernel/traps.c @@ -18,7 +18,7 @@ #include #include @@ -28,7 +26,7 @@ #include #include #include -@@ -360,7 +360,7 @@ void __kprobes do_single_step(struct pt_ +@@ -340,7 +340,7 @@ void __kprobes do_single_step(struct pt_ SIGTRAP) == NOTIFY_STOP){ return; } @@ -37,7 +35,7 @@ force_sig(SIGTRAP, current); } -@@ -461,7 +461,7 @@ static void illegal_op(struct pt_regs * +@@ -441,7 +441,7 @@ static void illegal_op(struct pt_regs * if (get_user(*((__u16 *) opcode), (__u16 __user *) location)) return; if (*((__u16 *) opcode) == S390_BREAKPOINT_U16) { @@ -46,11 +44,9 @@ force_sig(SIGTRAP, current); else signal = SIGILL; -Index: b/arch/s390/kernel/compat_signal.c -=================================================================== ---- a/arch/s390/kernel/compat_signal.c -+++ b/arch/s390/kernel/compat_signal.c -@@ -28,6 +28,7 @@ +--- linux-2.6/arch/s390/kernel/compat_signal.c ++++ linux-2.6/arch/s390/kernel/compat_signal.c +@@ -27,6 +27,7 @@ #include #include #include @@ -58,7 +54,7 @@ #include "compat_linux.h" #include "compat_ptrace.h" -@@ -579,7 +580,9 @@ handle_signal32(unsigned long sig, struc +@@ -580,7 +581,9 @@ handle_signal32(unsigned long sig, struc sigaddset(¤t->blocked,sig); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); @@ -69,10 +65,8 @@ return ret; } - -Index: b/arch/s390/kernel/ptrace.c -=================================================================== ---- a/arch/s390/kernel/ptrace.c -+++ b/arch/s390/kernel/ptrace.c +--- linux-2.6/arch/s390/kernel/ptrace.c ++++ linux-2.6/arch/s390/kernel/ptrace.c @@ -29,6 +29,7 @@ #include #include @@ -128,7 +122,7 @@ } #ifndef CONFIG_64BIT -@@ -593,6 +611,7 @@ do_ptrace_emu31(struct task_struct *chil +@@ -586,6 +604,7 @@ do_ptrace_emu31(struct task_struct *chil copied += sizeof(unsigned int); } return 0; @@ -136,7 +130,7 @@ case PTRACE_GETEVENTMSG: return put_user((__u32) child->ptrace_message, (unsigned int __force __user *) data); -@@ -658,7 +677,7 @@ do_ptrace(struct task_struct *child, lon +@@ -651,7 +670,7 @@ do_ptrace(struct task_struct *child, lon clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); child->exit_code = data; /* make sure the single step bit is not set. */ @@ -145,7 +139,7 @@ wake_up_process(child); return 0; -@@ -672,7 +691,7 @@ do_ptrace(struct task_struct *child, lon +@@ -665,7 +684,7 @@ do_ptrace(struct task_struct *child, lon return 0; child->exit_code = SIGKILL; /* make sure the single step bit is not set. */ @@ -154,7 +148,7 @@ wake_up_process(child); return 0; -@@ -685,7 +704,7 @@ do_ptrace(struct task_struct *child, lon +@@ -678,7 +697,7 @@ do_ptrace(struct task_struct *child, lon if (data) set_tsk_thread_flag(child, TIF_SINGLE_STEP); else @@ -163,7 +157,7 @@ /* give it a chance to run. */ wake_up_process(child); return 0; -@@ -738,30 +757,17 @@ syscall_trace(struct pt_regs *regs, int +@@ -726,30 +745,17 @@ syscall_trace(struct pt_regs *regs, int if (unlikely(current->audit_context) && entryexit) audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]); @@ -203,11 +197,9 @@ if (unlikely(current->audit_context) && !entryexit) audit_syscall_entry(test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X, regs->gprs[2], regs->orig_gpr2, regs->gprs[3], -Index: b/arch/s390/kernel/signal.c -=================================================================== ---- a/arch/s390/kernel/signal.c -+++ b/arch/s390/kernel/signal.c -@@ -25,6 +25,7 @@ +--- linux-2.6/arch/s390/kernel/signal.c ++++ linux-2.6/arch/s390/kernel/signal.c +@@ -24,6 +24,7 @@ #include #include #include @@ -215,7 +207,7 @@ #include #include #include -@@ -395,6 +396,8 @@ handle_signal(unsigned long sig, struct +@@ -396,6 +397,8 @@ handle_signal(unsigned long sig, struct sigaddset(¤t->blocked,sig); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); @@ -224,10 +216,8 @@ } return ret; -Index: b/include/asm-s390/tracehook.h -=================================================================== ---- /dev/null -+++ b/include/asm-s390/tracehook.h +--- linux-2.6/include/asm-s390/tracehook.h ++++ linux-2.6/include/asm-s390/tracehook.h @@ -0,0 +1,46 @@ +/* + * Tracing hooks, s390/s390x support. linux-2.6-utrace-tracehook-sparc64.patch: Index: linux-2.6-utrace-tracehook-sparc64.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-tracehook-sparc64.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-tracehook-sparc64.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-tracehook-sparc64.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -7,18 +7,16 @@ --- - arch/sparc64/kernel/entry.S | 6 ------ - arch/sparc64/kernel/ptrace.c | 29 +++++++++-------------------- + arch/sparc64/kernel/ptrace.c | 29 +++++++++------------------- arch/sparc64/kernel/signal.c | 2 ++ arch/sparc64/kernel/signal32.c | 2 ++ - include/asm-sparc64/tracehook.h | 40 ++++++++++++++++++++++++++++++++++++++++ + arch/sparc64/kernel/entry.S | 6 ------ + include/asm-sparc64/tracehook.h | 40 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 26 deletions(-) create include/asm-sparc64/tracehook.h -Index: b/arch/sparc64/kernel/ptrace.c -=================================================================== ---- a/arch/sparc64/kernel/ptrace.c -+++ b/arch/sparc64/kernel/ptrace.c +--- linux-2.6/arch/sparc64/kernel/ptrace.c ++++ linux-2.6/arch/sparc64/kernel/ptrace.c @@ -22,6 +22,7 @@ #include #include @@ -95,19 +93,17 @@ if (unlikely(current->audit_context) && !syscall_exit_p) audit_syscall_entry((test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC : -Index: b/arch/sparc64/kernel/signal.c -=================================================================== ---- a/arch/sparc64/kernel/signal.c -+++ b/arch/sparc64/kernel/signal.c -@@ -23,6 +23,7 @@ - #include +--- linux-2.6/arch/sparc64/kernel/signal.c ++++ linux-2.6/arch/sparc64/kernel/signal.c +@@ -22,6 +22,7 @@ + #include #include #include +#include #include #include -@@ -491,6 +492,7 @@ static inline void handle_signal(unsigne +@@ -481,6 +482,7 @@ static inline void handle_signal(unsigne sigaddset(¤t->blocked,signr); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); @@ -115,11 +111,9 @@ } static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs, -Index: b/arch/sparc64/kernel/signal32.c -=================================================================== ---- a/arch/sparc64/kernel/signal32.c -+++ b/arch/sparc64/kernel/signal32.c -@@ -21,6 +21,7 @@ +--- linux-2.6/arch/sparc64/kernel/signal32.c ++++ linux-2.6/arch/sparc64/kernel/signal32.c +@@ -20,6 +20,7 @@ #include #include #include @@ -127,7 +121,7 @@ #include #include -@@ -1237,6 +1238,7 @@ static inline void handle_signal32(unsig +@@ -1236,6 +1237,7 @@ static inline void handle_signal32(unsig sigaddset(¤t->blocked,signr); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); @@ -135,10 +129,8 @@ } static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs, -Index: b/arch/sparc64/kernel/entry.S -=================================================================== ---- a/arch/sparc64/kernel/entry.S -+++ b/arch/sparc64/kernel/entry.S +--- linux-2.6/arch/sparc64/kernel/entry.S ++++ linux-2.6/arch/sparc64/kernel/entry.S @@ -1434,7 +1434,6 @@ execve_merge: .globl sys_pipe, sys_sigpause, sys_nis_syscall @@ -159,10 +151,8 @@ 1: ldx [%curptr + TI_FLAGS], %l5 andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0 be,pt %icc, rtrap -Index: b/include/asm-sparc64/tracehook.h -=================================================================== ---- /dev/null -+++ b/include/asm-sparc64/tracehook.h +--- linux-2.6/include/asm-sparc64/tracehook.h ++++ linux-2.6/include/asm-sparc64/tracehook.h @@ -0,0 +1,40 @@ +/* + * Tracing hooks, SPARC64 CPU support linux-2.6-utrace-tracehook-um.patch: Index: linux-2.6-utrace-tracehook-um.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-tracehook-um.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-tracehook-um.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-tracehook-um.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -19,294 +19,30 @@ --- - arch/um/kernel/exec.c | 1 - arch/um/kernel/process.c | 6 - arch/um/kernel/ptrace.c | 327 ++++------------------------------------ - arch/um/kernel/signal.c | 5 - arch/um/kernel/skas/syscall.c | 4 - arch/um/sys-i386/signal.c | 4 - include/asm-um/ptrace-generic.h | 3 - include/asm-um/ptrace-i386.h | 2 - include/asm-um/ptrace-x86_64.h | 2 - include/asm-um/thread_info.h | 3 - include/asm-um/tracehook.h | 57 ++++++ - 11 files changed, 106 insertions(+), 308 deletions(-) + arch/um/kernel/ptrace.c | 55 ++++++++++++++------------------------- + arch/um/kernel/skas/syscall.c | 2 - + arch/um/kernel/signal.c | 5 +++- + arch/um/kernel/exec.c | 1 - + arch/um/kernel/process.c | 2 + + arch/um/sys-i386/signal.c | 4 --- + include/asm-um/ptrace-x86_64.h | 2 + + include/asm-um/ptrace-i386.h | 2 + + include/asm-um/tracehook.h | 57 ++++++++++++++++++++++++++++++++++++++++ + include/asm-um/thread_info.h | 3 ++ + 10 files changed, 89 insertions(+), 44 deletions(-) create include/asm-um/tracehook.h -Index: b/arch/um/kernel/ptrace.c -=================================================================== ---- a/arch/um/kernel/ptrace.c -+++ b/arch/um/kernel/ptrace.c -@@ -3,261 +3,21 @@ - * Licensed under the GPL - */ - --#include "linux/sched.h" --#include "linux/mm.h" --#include "linux/errno.h" --#include "linux/smp_lock.h" --#include "linux/security.h" --#include "linux/ptrace.h" --#include "linux/audit.h" --#ifdef CONFIG_PROC_MM --#include "linux/proc_mm.h" --#endif --#include "asm/ptrace.h" --#include "asm/uaccess.h" --#include "kern_util.h" --#include "skas_ptrace.h" --#include "sysdep/ptrace.h" --#include "os.h" -- --static inline void set_singlestepping(struct task_struct *child, int on) --{ -- if (on) -- child->ptrace |= PT_DTRACE; -- else -- child->ptrace &= ~PT_DTRACE; -- child->thread.singlestep_syscall = 0; -- --#ifdef SUBARCH_SET_SINGLESTEPPING -- SUBARCH_SET_SINGLESTEPPING(child, on); --#endif --} -+#include -+#include -+#include -+#include -+#include - - /* - * Called by kernel/ptrace.c when detaching.. - */ - void ptrace_disable(struct task_struct *child) - { -- set_singlestepping(child,0); --} -- --extern int peek_user(struct task_struct * child, long addr, long data); --extern int poke_user(struct task_struct * child, long addr, long data); -- --long arch_ptrace(struct task_struct *child, long request, long addr, long data) --{ -- int i, ret; -- unsigned long __user *p = (void __user *)(unsigned long)data; -- -- switch (request) { -- /* when I and D space are separate, these will need to be fixed. */ -- case PTRACE_PEEKTEXT: /* read word at location addr. */ -- case PTRACE_PEEKDATA: { -- unsigned long tmp; -- int copied; -- -- ret = -EIO; -- copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0); -- if (copied != sizeof(tmp)) -- break; -- ret = put_user(tmp, p); -- break; -- } -- -- /* read the word at location addr in the USER area. */ -- case PTRACE_PEEKUSR: -- ret = peek_user(child, addr, data); -- break; -- -- /* when I and D space are separate, this will have to be fixed. */ -- case PTRACE_POKETEXT: /* write the word at location addr. */ -- case PTRACE_POKEDATA: -- ret = -EIO; -- if (access_process_vm(child, addr, &data, sizeof(data), -- 1) != sizeof(data)) -- break; -- ret = 0; -- break; -- -- case PTRACE_POKEUSR: /* write the word at location addr in the USER area */ -- ret = poke_user(child, addr, data); -- break; -- -- case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */ -- case PTRACE_CONT: { /* restart after signal. */ -- ret = -EIO; -- if (!valid_signal(data)) -- break; -- -- set_singlestepping(child, 0); -- if (request == PTRACE_SYSCALL) { -- set_tsk_thread_flag(child, TIF_SYSCALL_TRACE); -- } -- else { -- clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); -- } -- child->exit_code = data; -- wake_up_process(child); -- ret = 0; -- break; -- } -- --/* -- * make the child exit. Best I can do is send it a sigkill. -- * perhaps it should be put in the status that it wants to -- * exit. -- */ -- case PTRACE_KILL: { -- ret = 0; -- if (child->exit_state == EXIT_ZOMBIE) /* already dead */ -- break; -- -- set_singlestepping(child, 0); -- child->exit_code = SIGKILL; -- wake_up_process(child); -- break; -- } -- -- case PTRACE_SINGLESTEP: { /* set the trap flag. */ -- ret = -EIO; -- if (!valid_signal(data)) -- break; -- clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); -- set_singlestepping(child, 1); -- child->exit_code = data; -- /* give it a chance to run. */ -- wake_up_process(child); -- ret = 0; -- break; -- } -- -- case PTRACE_DETACH: -- /* detach a process that was attached. */ -- ret = ptrace_detach(child, data); -- break; -- --#ifdef PTRACE_GETREGS -- case PTRACE_GETREGS: { /* Get all gp regs from the child. */ -- if (!access_ok(VERIFY_WRITE, p, MAX_REG_OFFSET)) { -- ret = -EIO; -- break; -- } -- for ( i = 0; i < MAX_REG_OFFSET; i += sizeof(long) ) { -- __put_user(getreg(child, i), p); -- p++; -- } -- ret = 0; -- break; -- } --#endif --#ifdef PTRACE_SETREGS -- case PTRACE_SETREGS: { /* Set all gp regs in the child. */ -- unsigned long tmp = 0; -- if (!access_ok(VERIFY_READ, p, MAX_REG_OFFSET)) { -- ret = -EIO; -- break; -- } -- for ( i = 0; i < MAX_REG_OFFSET; i += sizeof(long) ) { -- __get_user(tmp, p); -- putreg(child, i, tmp); -- p++; -- } -- ret = 0; -- break; -- } --#endif --#ifdef PTRACE_GETFPREGS -- case PTRACE_GETFPREGS: /* Get the child FPU state. */ -- ret = get_fpregs(data, child); -- break; --#endif --#ifdef PTRACE_SETFPREGS -- case PTRACE_SETFPREGS: /* Set the child FPU state. */ -- ret = set_fpregs(data, child); -- break; --#endif --#ifdef PTRACE_GETFPXREGS -- case PTRACE_GETFPXREGS: /* Get the child FPU state. */ -- ret = get_fpxregs(data, child); -- break; --#endif --#ifdef PTRACE_SETFPXREGS -- case PTRACE_SETFPXREGS: /* Set the child FPU state. */ -- ret = set_fpxregs(data, child); -- break; --#endif -- case PTRACE_GET_THREAD_AREA: -- ret = ptrace_get_thread_area(child, addr, -- (struct user_desc __user *) data); -- break; -- -- case PTRACE_SET_THREAD_AREA: -- ret = ptrace_set_thread_area(child, addr, -- (struct user_desc __user *) data); -- break; -- -- case PTRACE_FAULTINFO: { -- /* Take the info from thread->arch->faultinfo, -- * but transfer max. sizeof(struct ptrace_faultinfo). -- * On i386, ptrace_faultinfo is smaller! -- */ -- ret = copy_to_user(p, &child->thread.arch.faultinfo, -- sizeof(struct ptrace_faultinfo)); -- if(ret) -- break; -- break; -- } -- --#ifdef PTRACE_LDT -- case PTRACE_LDT: { -- struct ptrace_ldt ldt; -- -- if(copy_from_user(&ldt, p, sizeof(ldt))){ -- ret = -EIO; -- break; -- } -- -- /* This one is confusing, so just punt and return -EIO for -- * now -- */ -- ret = -EIO; -- break; -- } --#endif --#ifdef CONFIG_PROC_MM -- case PTRACE_SWITCH_MM: { -- struct mm_struct *old = child->mm; -- struct mm_struct *new = proc_mm_get_mm(data); -- -- if(IS_ERR(new)){ -- ret = PTR_ERR(new); -- break; -- } -- -- atomic_inc(&new->mm_users); -- child->mm = new; -- child->active_mm = new; -- mmput(old); -- ret = 0; -- break; -- } --#endif --#ifdef PTRACE_ARCH_PRCTL -- case PTRACE_ARCH_PRCTL: -- /* XXX Calls ptrace on the host - needs some SMP thinking */ -- ret = arch_prctl_skas(child, data, (void *) addr); -- break; --#endif -- default: -- ret = ptrace_request(child, request, addr, data); -- break; -- } -- -- return ret; - } +--- linux-2.6/arch/um/kernel/ptrace.c ++++ linux-2.6/arch/um/kernel/ptrace.c +@@ -5,6 +5,7 @@ --void send_sigtrap(struct task_struct *tsk, union uml_pt_regs *regs, -- int error_code) -+static void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, -+ int error_code) - { - struct siginfo info; - -@@ -266,56 +26,39 @@ void send_sigtrap(struct task_struct *ts + #include "linux/audit.h" + #include "linux/ptrace.h" ++#include "linux/tracehook.h" + #include "linux/sched.h" + #include "asm/uaccess.h" + #ifdef CONFIG_PROC_MM +@@ -235,20 +236,18 @@ void send_sigtrap(struct task_struct *ts info.si_code = TRAP_BRKPT; /* User-mode eip? */ @@ -314,33 +50,28 @@ + info.si_addr = UPT_IS_USER(®s->regs) ? + (void __user *) UPT_IP(®s->regs) : NULL; - /* Send us the fakey SIGTRAP */ + /* Send us the fake SIGTRAP */ force_sig_info(SIGTRAP, &info, tsk); } --/* XXX Check PT_DTRACE vs TIF_SINGLESTEP for singlestepping check and +-/* +- * XXX Check PT_DTRACE vs TIF_SINGLESTEP for singlestepping check and - * PT_PTRACED vs TIF_SYSCALL_TRACE for syscall tracing check -+/* notification of system call entry/exit -+ * - triggered by current->work.syscall_trace - */ --void syscall_trace(union uml_pt_regs *regs, int entryexit) -+void do_syscall_trace(struct pt_regs *regs, int entryexit) +- */ + void syscall_trace(struct uml_pt_regs *regs, int entryexit) { - int is_singlestep = (current->ptrace & PT_DTRACE) && entryexit; - int tracesysgood; -- -- if (unlikely(current->audit_context)) { -- if (!entryexit) -- audit_syscall_entry(HOST_AUDIT_ARCH, -- UPT_SYSCALL_NR(regs), -- UPT_SYSCALL_ARG1(regs), -- UPT_SYSCALL_ARG2(regs), -- UPT_SYSCALL_ARG3(regs), -- UPT_SYSCALL_ARG4(regs)); -- else audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(regs)), -- UPT_SYSCALL_RET(regs)); -- } -- ++ /* do the secure computing check first */ ++ if (!entryexit) ++ secure_computing(PT_REGS_SYSCALL_NR(regs)); + + if (unlikely(current->audit_context)) { + if (!entryexit) +@@ -262,33 +261,19 @@ void syscall_trace(struct uml_pt_regs *r + UPT_SYSCALL_RET(regs)); + } + - /* Fake a debug trap */ - if (is_singlestep) - send_sigtrap(current, regs, 0); @@ -351,37 +82,31 @@ - if (!(current->ptrace & PT_PTRACED)) - return; - -- /* the 0x80 provides a way for the tracing parent to distinguish -- between a syscall stop and SIGTRAP delivery */ +- /* +- * the 0x80 provides a way for the tracing parent to distinguish +- * between a syscall stop and SIGTRAP delivery +- */ - tracesysgood = (current->ptrace & PT_TRACESYSGOOD); - ptrace_notify(SIGTRAP | (tracesysgood ? 0x80 : 0)); - - if (entryexit) /* force do_signal() --> is_syscall() */ - set_thread_flag(TIF_SIGPENDING); - -- /* this isn't the same as continuing with a signal, but it will do +- /* +- * this isn't the same as continuing with a signal, but it will do - * for normal use. strace only continues with a signal if the - * stopping signal is not SIGTRAP. -brl - */ - if (current->exit_code) { - send_sig(current->exit_code, current, 1); - current->exit_code = 0; -- } -+ /* do the secure computing check first */ -+ if (!entryexit) -+ secure_computing(PT_REGS_SYSCALL_NR(regs)); -+ -+ if (unlikely(current->audit_context) && entryexit) -+ audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(®s->regs)), -+ UPT_SYSCALL_RET(®s->regs)); -+ + if (test_thread_flag(TIF_SYSCALL_TRACE)) + tracehook_report_syscall(regs, entryexit); + + if (test_thread_flag(TIF_SINGLESTEP) && entryexit) { + send_sigtrap(current, regs, 0); /* XXX */ + tracehook_report_syscall_step(regs); -+ } + } + + if (unlikely(current->audit_context) && !entryexit) + audit_syscall_entry(HOST_AUDIT_ARCH, @@ -391,11 +116,9 @@ + UPT_SYSCALL_ARG3(®s->regs), + UPT_SYSCALL_ARG4(®s->regs)); } -Index: b/arch/um/kernel/skas/syscall.c -=================================================================== ---- a/arch/um/kernel/skas/syscall.c -+++ b/arch/um/kernel/skas/syscall.c -@@ -19,8 +19,6 @@ void handle_syscall(union uml_pt_regs *r +--- linux-2.6/arch/um/kernel/skas/syscall.c ++++ linux-2.6/arch/um/kernel/skas/syscall.c +@@ -15,8 +15,6 @@ void handle_syscall(struct uml_pt_regs * long result; int syscall; @@ -404,26 +127,17 @@ current->thread.nsyscalls++; nsyscalls++; -@@ -38,6 +36,4 @@ void handle_syscall(union uml_pt_regs *r - else result = EXECUTE_SYSCALL(syscall, regs); +--- linux-2.6/arch/um/kernel/signal.c ++++ linux-2.6/arch/um/kernel/signal.c +@@ -5,6 +5,7 @@ - REGS_SET_SYSCALL_RETURN(r->skas.regs, result); -- -- syscall_trace(r, 1); - } -Index: b/arch/um/kernel/signal.c -=================================================================== ---- a/arch/um/kernel/signal.c -+++ b/arch/um/kernel/signal.c -@@ -14,6 +14,7 @@ - #include "linux/tty.h" - #include "linux/binfmts.h" + #include "linux/module.h" #include "linux/ptrace.h" +#include "linux/tracehook.h" + #include "linux/sched.h" + #include "asm/siginfo.h" #include "asm/signal.h" - #include "asm/uaccess.h" - #include "asm/unistd.h" -@@ -93,6 +94,8 @@ static int handle_signal(struct pt_regs +@@ -80,6 +81,8 @@ static int handle_signal(struct pt_regs sigaddset(¤t->blocked, signr); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); @@ -432,51 +146,39 @@ } return err; -@@ -148,7 +151,7 @@ static int kern_do_signal(struct pt_regs +@@ -138,7 +141,7 @@ static int kern_do_signal(struct pt_regs * on the host. The tracing thread will check this flag and * PTRACE_SYSCALL if necessary. */ -- if(current->ptrace & PT_DTRACE) -+ if(test_thread_flag(TIF_SYSCALL_TRACE)) +- if (current->ptrace & PT_DTRACE) ++ if (test_thread_flag(TIF_SYSCALL_TRACE)) current->thread.singlestep_syscall = is_syscall(PT_REGS_IP(¤t->thread.regs)); -Index: b/arch/um/kernel/exec.c -=================================================================== ---- a/arch/um/kernel/exec.c -+++ b/arch/um/kernel/exec.c -@@ -51,7 +51,6 @@ static long execve1(char *file, char __u - error = do_execve(file, argv, env, ¤t->thread.regs); - if (error == 0){ +--- linux-2.6/arch/um/kernel/exec.c ++++ linux-2.6/arch/um/kernel/exec.c +@@ -61,7 +61,6 @@ static long execve1(char *file, char __u + error = do_execve(file, argv, env, ¤t->thread.regs); + if (error == 0) { task_lock(current); -- current->ptrace &= ~PT_DTRACE; +- current->ptrace &= ~PT_DTRACE; #ifdef SUBARCH_EXECVE1 SUBARCH_EXECVE1(¤t->thread.regs.regs); #endif -Index: b/arch/um/kernel/process.c -=================================================================== ---- a/arch/um/kernel/process.c -+++ b/arch/um/kernel/process.c -@@ -458,11 +458,11 @@ int singlestepping(void * t) +--- linux-2.6/arch/um/kernel/process.c ++++ linux-2.6/arch/um/kernel/process.c +@@ -435,7 +435,7 @@ int singlestepping(void * t) { struct task_struct *task = t ? t : current; - if ( ! (task->ptrace & PT_DTRACE) ) -- return(0); + if (!test_thread_flag(TIF_SINGLESTEP)) -+ return 0; + return 0; if (task->thread.singlestep_syscall) -- return(1); -+ return 1; - - return 2; - } -Index: b/arch/um/sys-i386/signal.c -=================================================================== ---- a/arch/um/sys-i386/signal.c -+++ b/arch/um/sys-i386/signal.c -@@ -267,8 +267,6 @@ int setup_signal_stack_sc(unsigned long +--- linux-2.6/arch/um/sys-i386/signal.c ++++ linux-2.6/arch/um/sys-i386/signal.c +@@ -378,8 +378,6 @@ int setup_signal_stack_sc(unsigned long PT_REGS_EDX(regs) = (unsigned long) 0; PT_REGS_ECX(regs) = (unsigned long) 0; @@ -485,7 +187,7 @@ return 0; err: -@@ -324,8 +322,6 @@ int setup_signal_stack_si(unsigned long +@@ -435,8 +433,6 @@ int setup_signal_stack_si(unsigned long PT_REGS_EDX(regs) = (unsigned long) &frame->info; PT_REGS_ECX(regs) = (unsigned long) &frame->uc; @@ -494,10 +196,8 @@ return 0; err: -Index: b/include/asm-um/ptrace-x86_64.h -=================================================================== ---- a/include/asm-um/ptrace-x86_64.h -+++ b/include/asm-um/ptrace-x86_64.h +--- linux-2.6/include/asm-um/ptrace-x86_64.h ++++ linux-2.6/include/asm-um/ptrace-x86_64.h @@ -14,6 +14,8 @@ #define __FRAME_OFFSETS /* Needed to get the R* macros */ #include "asm/ptrace-generic.h" @@ -507,24 +207,8 @@ #define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64 /* Also defined in sysdep/ptrace.h, so may already be defined. */ -Index: b/include/asm-um/ptrace-generic.h -=================================================================== ---- a/include/asm-um/ptrace-generic.h -+++ b/include/asm-um/ptrace-generic.h -@@ -44,9 +44,6 @@ extern int set_fpxregs(unsigned long buf - - extern void show_regs(struct pt_regs *regs); - --extern void send_sigtrap(struct task_struct *tsk, union uml_pt_regs *regs, -- int error_code); -- - extern int arch_copy_tls(struct task_struct *new); - extern void clear_flushed_tls(struct task_struct *task); - -Index: b/include/asm-um/ptrace-i386.h -=================================================================== ---- a/include/asm-um/ptrace-i386.h -+++ b/include/asm-um/ptrace-i386.h +--- linux-2.6/include/asm-um/ptrace-i386.h ++++ linux-2.6/include/asm-um/ptrace-i386.h @@ -6,6 +6,8 @@ #ifndef __UM_PTRACE_I386_H #define __UM_PTRACE_I386_H @@ -534,10 +218,8 @@ #define HOST_AUDIT_ARCH AUDIT_ARCH_I386 #include "linux/compiler.h" -Index: b/include/asm-um/tracehook.h -=================================================================== ---- /dev/null -+++ b/include/asm-um/tracehook.h +--- linux-2.6/include/asm-um/tracehook.h ++++ linux-2.6/include/asm-um/tracehook.h @@ -0,0 +1,57 @@ +/* + * Tracing hooks, i386 CPU support @@ -596,11 +278,9 @@ + + +#endif -Index: b/include/asm-um/thread_info.h -=================================================================== ---- a/include/asm-um/thread_info.h -+++ b/include/asm-um/thread_info.h -@@ -69,6 +69,8 @@ static inline struct thread_info *curren +--- linux-2.6/include/asm-um/thread_info.h ++++ linux-2.6/include/asm-um/thread_info.h +@@ -82,6 +82,8 @@ static inline struct thread_info *curren #define TIF_MEMDIE 5 #define TIF_SYSCALL_AUDIT 6 #define TIF_RESTORE_SIGMASK 7 @@ -609,7 +289,7 @@ #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) -@@ -77,5 +79,6 @@ static inline struct thread_info *curren +@@ -90,5 +92,6 @@ static inline struct thread_info *curren #define _TIF_MEMDIE (1 << TIF_MEMDIE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) linux-2.6-utrace-tracehook.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-utrace-tracehook.patch Index: linux-2.6-utrace-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-utrace-tracehook.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-utrace-tracehook.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-utrace-tracehook.patch 6 Mar 2008 13:59:25 -0000 1.3 @@ -33,87 +33,83 @@ --- - arch/alpha/kernel/asm-offsets.c | 2 - arch/alpha/kernel/entry.S | 4 - arch/arm/kernel/ptrace.c | 17 - - arch/arm26/kernel/ptrace.c | 32 -- + fs/binfmt_flat.c | 3 + fs/binfmt_som.c | 2 + fs/proc/base.c | 17 + + fs/proc/array.c | 10 + + fs/binfmt_elf_fdpic.c | 7 - + fs/exec.c | 11 - + fs/binfmt_elf.c | 10 - + fs/binfmt_aout.c | 6 - + security/selinux/hooks.c | 54 +++-- + security/selinux/include/objsec.h | 1 + arch/s390/kernel/compat_linux.c | 3 + arch/s390/kernel/process.c | 3 arch/frv/kernel/ptrace.c | 15 - - arch/i386/kernel/entry.S | 7 - arch/i386/kernel/process.c | 3 - arch/i386/kernel/ptrace.c | 104 +-------- - arch/i386/kernel/signal.c | 37 +-- - arch/i386/kernel/vm86.c | 7 - arch/i386/math-emu/fpu_entry.c | 6 - arch/ia64/kernel/asm-offsets.c | 2 - arch/ia64/kernel/fsys.S | 16 - - arch/ia64/kernel/mca.c | 2 - arch/mips/kernel/ptrace.c | 21 - + arch/arm/kernel/ptrace.c | 17 - arch/mips/kernel/sysirix.c | 2 + arch/mips/kernel/ptrace.c | 23 -- + arch/powerpc/kernel/sys_ppc32.c | 5 + arch/powerpc/kernel/ptrace32.c | 7 + + arch/powerpc/kernel/ptrace.c | 49 +--- + arch/powerpc/kernel/signal.c | 3 arch/powerpc/kernel/asm-offsets.c | 2 arch/powerpc/kernel/process.c | 5 - arch/powerpc/kernel/ptrace-common.h | 16 - - arch/powerpc/kernel/ptrace.c | 74 +----- - arch/powerpc/kernel/ptrace32.c | 13 - - arch/powerpc/kernel/signal_32.c | 3 - arch/powerpc/kernel/signal_64.c | 3 - arch/powerpc/kernel/sys_ppc32.c | 5 - arch/ppc/kernel/asm-offsets.c | 2 - arch/s390/kernel/compat_linux.c | 3 - arch/s390/kernel/process.c | 3 + arch/x86/math-emu/fpu_entry.c | 6 - + arch/x86/ia32/sys_ia32.c | 5 + arch/x86/ia32/ptrace32.c | 2 + arch/x86/ia32/ia32_aout.c | 6 - + arch/x86/ia32/ia32_signal.c | 7 - + arch/x86/ia32/ia32entry.S | 4 + arch/x86/kernel/vm86_32.c | 7 - + arch/x86/kernel/process_64.c | 5 + arch/x86/kernel/process_32.c | 3 + arch/x86/kernel/entry_32.S | 7 - + arch/x86/kernel/signal_64.c | 28 +- + arch/x86/kernel/entry_64.S | 8 - + arch/x86/kernel/ptrace_32.c | 103 ++------- + arch/x86/kernel/traps_64.c | 8 - + arch/x86/kernel/ptrace_64.c | 57 ++--- + arch/x86/kernel/signal_32.c | 37 +-- + arch/x86/mm/fault_64.c | 2 + arch/alpha/kernel/asm-offsets.c | 2 + arch/alpha/kernel/entry.S | 4 arch/sparc64/kernel/binfmt_aout32.c | 2 arch/sparc64/kernel/process.c | 3 arch/sparc64/kernel/sys_sparc32.c | 3 - arch/x86_64/ia32/ia32_aout.c | 6 - arch/x86_64/ia32/ia32_signal.c | 7 - arch/x86_64/ia32/ia32entry.S | 4 - arch/x86_64/ia32/ptrace32.c | 2 - arch/x86_64/ia32/sys_ia32.c | 5 - arch/x86_64/kernel/entry.S | 8 - arch/x86_64/kernel/process.c | 5 - arch/x86_64/kernel/ptrace.c | 57 +--- - arch/x86_64/kernel/signal.c | 28 +- - arch/x86_64/kernel/traps.c | 8 - arch/x86_64/mm/fault.c | 4 - drivers/connector/cn_proc.c | 4 - fs/binfmt_aout.c | 6 - fs/binfmt_elf.c | 6 - fs/binfmt_elf_fdpic.c | 7 - fs/binfmt_flat.c | 3 - fs/binfmt_som.c | 2 - fs/exec.c | 11 - fs/proc/array.c | 12 - - fs/proc/base.c | 17 - - include/asm-i386/signal.h | 4 - include/asm-i386/thread_info.h | 7 - include/asm-i386/tracehook.h | 52 ++++ - include/asm-powerpc/tracehook.h | 74 ++++++ - include/asm-x86_64/thread_info.h | 3 - include/asm-x86_64/tracehook.h | 51 ++++ - include/linux/init_task.h | 3 - include/linux/ptrace.h | 18 - - include/linux/sched.h | 16 - - include/linux/tracehook.h | 415 ++++++++++++++++++++++++++++++++++++ - kernel/exit.c | 243 +++++---------------- - kernel/fork.c | 66 +---- - kernel/ptrace.c | 299 +------------------------ - kernel/signal.c | 211 +++--------------- - kernel/sys.c | 2 - kernel/timer.c | 6 + arch/ppc/kernel/asm-offsets.c | 2 + arch/ia64/kernel/mca.c | 2 + arch/ia64/kernel/asm-offsets.c | 2 + arch/ia64/kernel/fsys.S | 16 + + kernel/exit.c | 238 +++++--------------- + kernel/power/process.c | 11 + + kernel/sched.c | 2 + kernel/ptrace.c | 307 +------------------------- + kernel/timer.c | 6 - + kernel/signal.c | 210 ++++-------------- + kernel/acct.c | 2 kernel/tsacct.c | 2 + kernel/sys.c | 2 + kernel/fork.c | 67 ++---- + include/linux/ptrace.h | 18 -- + include/linux/sched.h | 16 - + include/linux/init_task.h | 3 + include/linux/tracehook.h | 414 +++++++++++++++++++++++++++++++++++ + include/asm-powerpc/tracehook.h | 49 ++++ + include/asm-x86/thread_info_32.h | 7 - + include/asm-x86/thread_info_64.h | 3 + include/asm-x86/tracehook.h | 63 +++++ + include/asm-x86/signal.h | 4 + drivers/connector/cn_proc.c | 4 mm/nommu.c | 4 - security/selinux/hooks.c | 54 ++-- - security/selinux/include/objsec.h | 1 - 70 files changed, 934 insertions(+), 1213 deletions(-) + 69 files changed, 869 insertions(+), 1149 deletions(-) create include/linux/tracehook.h - create include/asm-i386/tracehook.h create include/asm-powerpc/tracehook.h - create include/asm-x86_64/tracehook.h + create include/asm-x86/tracehook.h -Index: b/fs/binfmt_flat.c -=================================================================== ---- a/fs/binfmt_flat.c -+++ b/fs/binfmt_flat.c -@@ -914,9 +914,6 @@ static int load_flat_binary(struct linux +--- linux-2.6/fs/binfmt_flat.c ++++ linux-2.6/fs/binfmt_flat.c +@@ -920,9 +920,6 @@ static int load_flat_binary(struct linux start_thread(regs, start_addr, current->mm->start_stack); @@ -123,10 +119,8 @@ return 0; } -Index: b/fs/binfmt_som.c -=================================================================== ---- a/fs/binfmt_som.c -+++ b/fs/binfmt_som.c +--- linux-2.6/fs/binfmt_som.c ++++ linux-2.6/fs/binfmt_som.c @@ -285,8 +285,6 @@ load_som_binary(struct linux_binprm * bp map_hpux_gateway_page(current,current->mm); @@ -136,19 +130,17 @@ return 0; /* error cleanup */ -Index: b/fs/proc/base.c -=================================================================== ---- a/fs/proc/base.c -+++ b/fs/proc/base.c -@@ -67,6 +67,7 @@ +--- linux-2.6/fs/proc/base.c ++++ linux-2.6/fs/proc/base.c +@@ -68,6 +68,7 @@ #include #include #include +#include - #include + #include #include #include -@@ -189,13 +190,6 @@ static int proc_root_link(struct inode * +@@ -195,13 +196,6 @@ static int proc_root_link(struct inode * return result; } @@ -159,10 +151,10 @@ [...3621 lines suppressed...] -@@ -0,0 +1,74 @@ -+/* -+ * Tracing hooks, PowerPC CPU support -+ * -+ * Copyright (C) 2006, 2007 Red Hat, Inc. All rights reserved. -+ * -+ * This copyrighted material is made available to anyone wishing to use, -+ * modify, copy, or redistribute it subject to the terms and conditions -+ * of the GNU General Public License v.2. -+ * -+ * Red Hat Author: Roland McGrath. -+ */ -+ -+#ifndef _ASM_TRACEHOOK_H -+#define _ASM_TRACEHOOK_H 1 -+ -+#include -+#include -+ -+/* -+ * See linux/tracehook.h for the descriptions of what these need to do. -+ */ -+ -+#define ARCH_HAS_SINGLE_STEP (1) -+ -+static inline void tracehook_enable_single_step(struct task_struct *task) -+{ -+ struct pt_regs *regs = task->thread.regs; -+ if (regs != NULL) { -+#if defined(CONFIG_PPC32) && (defined(CONFIG_40x) || defined(CONFIG_BOOKE)) -+ task->thread.dbcr0 = DBCR0_IDM | DBCR0_IC; -+ regs->msr |= MSR_DE; -+#else -+ regs->msr |= MSR_SE; -+#endif -+ } -+ set_tsk_thread_flag(task, TIF_SINGLESTEP); -+} -+ -+static inline void tracehook_disable_single_step(struct task_struct *task) -+{ -+ struct pt_regs *regs = task->thread.regs; -+ if (regs != NULL) { -+#if defined(CONFIG_PPC32) && (defined(CONFIG_40x) || defined(CONFIG_BOOKE)) -+ task->thread.dbcr0 = 0; -+ regs->msr &= ~MSR_DE; -+#else -+ regs->msr &= ~MSR_SE; -+#endif -+ } -+ clear_tsk_thread_flag(task, TIF_SINGLESTEP); -+} -+ -+static inline int tracehook_single_step_enabled(struct task_struct *tsk) -+{ -+ return test_tsk_thread_flag(tsk, TIF_SINGLESTEP); -+} -+ -+static inline void tracehook_enable_syscall_trace(struct task_struct *tsk) -+{ -+ set_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE); -+} -+ -+static inline void tracehook_disable_syscall_trace(struct task_struct *tsk) -+{ -+ clear_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE); -+} -+ -+static inline void tracehook_abort_syscall(struct pt_regs *regs) -+{ -+ regs->orig_gpr3 = -1L; -+} -+ -+ -+#endif -Index: b/include/asm-x86_64/tracehook.h -=================================================================== ---- /dev/null -+++ b/include/asm-x86_64/tracehook.h -@@ -0,0 +1,51 @@ +--- linux-2.6/include/asm-x86/thread_info_64.h ++++ linux-2.6/include/asm-x86/thread_info_64.h +@@ -115,7 +115,7 @@ static inline struct thread_info *stack_ + #define TIF_SECCOMP 8 /* secure computing */ + #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal */ + #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ +-/* 16 free */ ++#define TIF_FORCED_TF 16 /* true if TF in eflags artificially */ + #define TIF_IA32 17 /* 32bit process */ + #define TIF_FORK 18 /* ret_from_fork */ + #define TIF_ABI_PENDING 19 +@@ -133,6 +133,7 @@ static inline struct thread_info *stack_ + #define _TIF_SECCOMP (1<orig_rax) +#define tracehook_syscall_retval(regs) (&(regs)->rax) +static inline void tracehook_abort_syscall(struct pt_regs *regs) +{ + regs->orig_rax = -1L; +} ++#else ++ ++#define tracehook_syscall_callno(regs) (&(regs)->orig_eax) ++#define tracehook_syscall_retval(regs) (&(regs)->eax) ++static inline void tracehook_abort_syscall(struct pt_regs *regs) ++{ ++ regs->orig_eax = -1; ++} + +#endif -Index: b/include/asm-x86_64/thread_info.h -=================================================================== ---- a/include/asm-x86_64/thread_info.h -+++ b/include/asm-x86_64/thread_info.h -@@ -115,7 +115,7 @@ static inline struct thread_info *stack_ - #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ - #define TIF_SECCOMP 8 /* secure computing */ - #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal */ --/* 16 free */ -+#define TIF_FORCED_TF 16 /* true if TF in eflags artificially */ - #define TIF_IA32 17 /* 32bit process */ - #define TIF_FORK 18 /* ret_from_fork */ - #define TIF_ABI_PENDING 19 -@@ -133,6 +133,7 @@ static inline struct thread_info *stack_ - #define _TIF_SYSCALL_AUDIT (1<ptrace & PT_DTRACE) { \ +- current->ptrace &= ~PT_DTRACE; \ ++ if (test_and_clear_thread_flag(TIF_FORCED_TF)) \ + (regs)->eflags &= ~TF_MASK; \ +- } \ + } while (0) + + #else /* __i386__ */ +--- linux-2.6/drivers/connector/cn_proc.c ++++ linux-2.6/drivers/connector/cn_proc.c @@ -63,8 +63,8 @@ void proc_fork_connector(struct task_str ktime_get_ts(&ts); /* get high res monotonic timestamp */ put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); @@ -4111,11 +3843,9 @@ ev->event_data.fork.child_pid = task->pid; ev->event_data.fork.child_tgid = task->tgid; -Index: b/mm/nommu.c -=================================================================== ---- a/mm/nommu.c -+++ b/mm/nommu.c -@@ -20,7 +20,7 @@ +--- linux-2.6/mm/nommu.c ++++ linux-2.6/mm/nommu.c +@@ -21,7 +21,7 @@ #include #include #include @@ -4124,7 +3854,7 @@ #include #include #include -@@ -674,7 +674,7 @@ static unsigned long determine_vm_flags( +@@ -706,7 +706,7 @@ static unsigned long determine_vm_flags( * it's being traced - otherwise breakpoints set in it may interfere * with another untraced process */ linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-wireless.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-wireless.patch 24 Jul 2007 14:13:44 -0000 1.2 +++ linux-2.6-wireless.patch 6 Mar 2008 13:59:26 -0000 1.3 @@ -1,23814 +1,391 @@ ---- linux-2.6.21.noarch/CREDITS.orig 2007-06-14 13:40:38.000000000 -0400 -+++ linux-2.6.21.noarch/CREDITS 2007-06-14 13:40:56.000000000 -0400 -@@ -317,6 +317,12 @@ S: 2322 37th Ave SW - S: Seattle, Washington 98126-2010 - S: USA - -+N: Johannes Berg -+E: johannes at sipsolutions.net -+W: http://johannes.sipsolutions.net/ -+P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5 -+D: powerpc & 802.11 hacker -+ - N: Stephen R. van den Berg (AKA BuGless) - E: berg at pool.informatik.rwth-aachen.de - D: General kernel, gcc, and libc hacker ---- linux-2.6.21.noarch/lib/Makefile.orig 2007-06-14 13:54:21.000000000 -0400 -+++ linux-2.6.21.noarch/lib/Makefile 2007-06-14 13:41:27.000000000 -0400 -@@ -40,6 +40,7 @@ endif - obj-$(CONFIG_BITREVERSE) += bitrev.o - obj-$(CONFIG_CRC_CCITT) += crc-ccitt.o - obj-$(CONFIG_CRC16) += crc16.o -+obj-$(CONFIG_CRC_ITU_T) += crc-itu-t.o - obj-$(CONFIG_CRC32) += crc32.o - obj-$(CONFIG_LIBCRC32C) += libcrc32c.o - obj-$(CONFIG_GENERIC_ALLOCATOR) += genalloc.o ---- linux-2.6.21.noarch/lib/Kconfig.orig 2007-06-14 13:54:21.000000000 -0400 -+++ linux-2.6.21.noarch/lib/Kconfig 2007-06-14 13:41:27.000000000 -0400 -@@ -23,6 +23,14 @@ config CRC16 - the kernel tree does. Such modules that use library CRC16 - functions require M here. - -+config CRC_ITU_T -+ tristate "CRC ITU-T V.41 functions" -+ help -+ This option is provided for the case where no in-kernel-tree -+ modules require CRC ITU-T V.41 functions, but a module built outside -+ the kernel tree does. Such modules that use library CRC ITU-T V.41 -+ functions require M here. -+ - config CRC32 - tristate "CRC32 functions" - default y ---- linux-2.6.21.noarch/lib/crc-itu-t.c.orig 2007-06-14 13:54:39.000000000 -0400 -+++ linux-2.6.21.noarch/lib/crc-itu-t.c 2007-06-14 13:41:27.000000000 -0400 -@@ -0,0 +1,69 @@ -+/* -+ * crc-itu-t.c -+ * -+ * This source code is licensed under the GNU General Public License, -+ * Version 2. See the file COPYING for more details. -+ */ -+ -+#include -+#include -+#include -+ -+/** CRC table for the CRC ITU-T V.41 0x0x1021 (x^16 + x^12 + x^15 + 1) */ -+const u16 crc_itu_t_table[256] = { -+ 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, -+ 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, -+ 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, -+ 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, -+ 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, -+ 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, -+ 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, -+ 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, -+ 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, -+ 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, -+ 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, -+ 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, -+ 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, -+ 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, -+ 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, -+ 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, -+ 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, -+ 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, -+ 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, -+ 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, -+ 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, -+ 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, -+ 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, -+ 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, -+ 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, -+ 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, -+ 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, -+ 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, -+ 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, -+ 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, -+ 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, -+ 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 -+}; -+ -+EXPORT_SYMBOL(crc_itu_t_table); -+ -+/** -+ * crc_itu_t - Compute the CRC-ITU-T for the data buffer -+ * -+ * @crc: previous CRC value -+ * @buffer: data pointer -+ * @len: number of bytes in the buffer -+ * -+ * Returns the updated CRC value -+ */ -+u16 crc_itu_t(u16 crc, const u8 *buffer, size_t len) -+{ -+ while (len--) -+ crc = crc_itu_t_byte(crc, *buffer++); -+ return crc; -+} -+EXPORT_SYMBOL(crc_itu_t); -+ -+MODULE_DESCRIPTION("CRC ITU-T V.41 calculations"); -+MODULE_LICENSE("GPL"); -+ ---- linux-2.6.21.noarch/include/linux/nl80211.h.orig 2007-06-14 13:40:38.000000000 -0400 -+++ linux-2.6.21.noarch/include/linux/nl80211.h 2007-06-14 13:40:56.000000000 -0400 -@@ -0,0 +1,38 @@ -+#ifndef __LINUX_NL80211_H -+#define __LINUX_NL80211_H -+/* -+ * 802.11 netlink interface public header -+ * -+ * Copyright 2006, 2007 Johannes Berg -+ */ -+ -+/** -+ * enum nl80211_iftype - (virtual) interface types -+ * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides -+ * @NL80211_IFTYPE_ADHOC: independent BSS member -+ * @NL80211_IFTYPE_STATION: managed BSS member -+ * @NL80211_IFTYPE_AP: access point -+ * @NL80211_IFTYPE_AP_VLAN: VLAN interface for access points -+ * @NL80211_IFTYPE_WDS: wireless distribution interface -+ * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames -+ * @__NL80211_IFTYPE_AFTER_LAST: internal use -+ * -+ * These values are used with the NL80211_ATTR_IFTYPE -+ * to set the type of an interface. -+ * -+ */ -+enum nl80211_iftype { -+ NL80211_IFTYPE_UNSPECIFIED, -+ NL80211_IFTYPE_ADHOC, -+ NL80211_IFTYPE_STATION, -+ NL80211_IFTYPE_AP, -+ NL80211_IFTYPE_AP_VLAN, -+ NL80211_IFTYPE_WDS, -+ NL80211_IFTYPE_MONITOR, -+ -+ /* keep last */ -+ __NL80211_IFTYPE_AFTER_LAST -+}; -+#define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1) -+ -+#endif /* __LINUX_NL80211_H */ ---- linux-2.6.21.noarch/include/linux/ieee80211.h.orig 2007-06-14 13:40:38.000000000 -0400 -+++ linux-2.6.21.noarch/include/linux/ieee80211.h 2007-06-14 13:40:56.000000000 -0400 -@@ -0,0 +1,342 @@ -+/* -+ * IEEE 802.11 defines -+ * -+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen -+ * -+ * Copyright (c) 2002-2003, Jouni Malinen -+ * Copyright (c) 2005, Devicescape Software, Inc. -+ * Copyright (c) 2006, Michael Wu -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#ifndef IEEE80211_H -+#define IEEE80211_H -+ -+#include -+ -+#define FCS_LEN 4 -+ -+#define IEEE80211_FCTL_VERS 0x0003 -+#define IEEE80211_FCTL_FTYPE 0x000c -+#define IEEE80211_FCTL_STYPE 0x00f0 -+#define IEEE80211_FCTL_TODS 0x0100 -+#define IEEE80211_FCTL_FROMDS 0x0200 -+#define IEEE80211_FCTL_MOREFRAGS 0x0400 -+#define IEEE80211_FCTL_RETRY 0x0800 -+#define IEEE80211_FCTL_PM 0x1000 -+#define IEEE80211_FCTL_MOREDATA 0x2000 -+#define IEEE80211_FCTL_PROTECTED 0x4000 -+#define IEEE80211_FCTL_ORDER 0x8000 -+ [...23803 lines suppressed...] +@@ -166,18 +166,23 @@ int p54_parse_eeprom(struct ieee80211_hw + struct p54_common *priv = dev->priv; + struct eeprom_pda_wrap *wrap = NULL; + struct pda_entry *entry; +- int i = 0; + unsigned int data_len, entry_len; + void *tmp; + int err; ++ u8 *end = (u8 *)eeprom + len; + + wrap = (struct eeprom_pda_wrap *) eeprom; +- entry = (void *)wrap->data + wrap->len; +- i += 2; +- i += le16_to_cpu(entry->len)*2; +- while (i < len) { ++ entry = (void *)wrap->data + le16_to_cpu(wrap->len); ++ ++ /* verify that at least the entry length/code fits */ ++ while ((u8 *)entry <= end - sizeof(*entry)) { + entry_len = le16_to_cpu(entry->len); + data_len = ((entry_len - 1) << 1); ++ ++ /* abort if entry exceeds whole structure */ ++ if ((u8 *)entry + sizeof(*entry) + data_len > end) ++ break; ++ + switch (le16_to_cpu(entry->code)) { + case PDR_MAC_ADDRESS: + SET_IEEE80211_PERM_ADDR(dev, entry->data); +@@ -249,13 +254,12 @@ int p54_parse_eeprom(struct ieee80211_hw + priv->version = *(u8 *)(entry->data + 1); + break; + case PDR_END: +- i = len; ++ /* make it overrun */ ++ entry_len = len; + break; + } + + entry = (void *)entry + (entry_len + 1)*2; +- i += 2; +- i += entry_len*2; + } --comment "Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support" -- depends on NET_RADIO && PCI - config PRISM54 - tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus' -- depends on PCI && NET_RADIO && EXPERIMENTAL -+ depends on PCI && EXPERIMENTAL && WLAN_80211 -+ select WIRELESS_EXT - select FW_LOADER - ---help--- - Enable PCI and Cardbus support for the following chipset based cards: -@@ -523,7 +509,8 @@ config PRISM54 + if (!priv->iq_autocal || !priv->output_limit || !priv->curve_data) { +diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c +--- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c 2008-03-04 19:30:56.000000000 -0500 +@@ -3829,7 +3829,7 @@ static void b43legacy_print_driverinfo(v + #ifdef CONFIG_B43LEGACY_DMA + feat_dma = "D"; + #endif +- printk(KERN_INFO "Broadcom 43xx driver loaded " ++ printk(KERN_INFO "Broadcom 43xx-legacy driver loaded " + "[ Features: %s%s%s%s%s, Firmware-ID: " + B43legacy_SUPPORTED_FIRMWARE_ID " ]\n", + feat_pci, feat_leds, feat_rfkill, feat_pio, feat_dma); +diff -up linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c 2008-03-04 19:30:56.000000000 -0500 +@@ -260,7 +260,7 @@ struct NDIS_802_11_KEY { + __le32 KeyLength; + u8 Bssid[6]; + u8 Padding[6]; +- __le64 KeyRSC; ++ u8 KeyRSC[8]; + u8 KeyMaterial[32]; + } __attribute__((packed)); + +@@ -1508,7 +1508,7 @@ static int rndis_iw_set_encode_ext(struc + struct usbnet *usbdev = dev->priv; + struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev); + struct NDIS_802_11_KEY ndis_key; +- int i, keyidx, ret; ++ int keyidx, ret; + u8 *addr; + + keyidx = wrqu->encoding.flags & IW_ENCODE_INDEX; +@@ -1543,9 +1543,7 @@ static int rndis_iw_set_encode_ext(struc + ndis_key.KeyIndex = cpu_to_le32(keyidx); + + if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) { +- for (i = 0; i < 6; i++) +- ndis_key.KeyRSC |= +- cpu_to_le64(ext->rx_seq[i] << (i * 8)); ++ memcpy(ndis_key.KeyRSC, ext->rx_seq, 6); + ndis_key.KeyIndex |= cpu_to_le32(1 << 29); + } - config USB_ZD1201 - tristate "USB ZD1201 based Wireless device support" -- depends on USB && NET_RADIO -+ depends on USB && WLAN_80211 -+ select WIRELESS_EXT - select FW_LOADER - ---help--- - Say Y if you want to use wireless LAN adapters based on the ZyDAS -@@ -542,11 +529,4 @@ source "drivers/net/wireless/hostap/Kcon - source "drivers/net/wireless/bcm43xx/Kconfig" - source "drivers/net/wireless/zd1211rw/Kconfig" +diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-04 19:28:31.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-04 19:30:56.000000000 -0500 +@@ -562,9 +562,7 @@ int lbs_process_rx_command(struct lbs_pr + } --# yes, this works even when no drivers are selected --config NET_WIRELESS -- bool -- depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA) -- default y + resp = (void *)priv->upld_buf; - - endmenu +- curcmd = le16_to_cpu(resp->command); - ---- linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-06-14 13:40:38.000000000 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-06-14 13:40:57.000000000 -0400 -@@ -1,6 +1,7 @@ - config BCM43XX - tristate "Broadcom BCM43xx wireless support" -- depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && NET_RADIO && EXPERIMENTAL -+ depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL -+ select WIRELESS_EXT - select FW_LOADER - select HW_RANDOM - ---help--- ---- linux-2.6.21.noarch/drivers/net/wireless/hostap/Kconfig.orig 2007-06-14 13:40:38.000000000 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/hostap/Kconfig 2007-06-14 13:40:57.000000000 -0400 -@@ -1,6 +1,7 @@ - config HOSTAP - tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)" -- depends on NET_RADIO -+ depends on WLAN_80211 -+ select WIRELESS_EXT - select IEEE80211 - select IEEE80211_CRYPT_WEP - ---help--- ---- linux-2.6.21.noarch/Documentation/feature-removal-schedule.txt.orig 2007-06-14 13:40:38.000000000 -0400 -+++ linux-2.6.21.noarch/Documentation/feature-removal-schedule.txt 2007-06-14 13:40:57.000000000 -0400 -@@ -294,18 +294,6 @@ Who: Richard Purdie - - --------------------------- ++ curcmd = le16_to_cpu(priv->cur_cmd->cmdbuf->command); + respcmd = le16_to_cpu(resp->command); + result = le16_to_cpu(resp->result); + +@@ -572,9 +570,9 @@ int lbs_process_rx_command(struct lbs_pr + respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies); + lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len); + +- if (resp->seqnum != resp->seqnum) { ++ if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) { + lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n", +- le16_to_cpu(resp->seqnum), le16_to_cpu(resp->seqnum)); ++ le16_to_cpu(resp->seqnum), le16_to_cpu(priv->cur_cmd->cmdbuf->seqnum)); + spin_unlock_irqrestore(&priv->driver_lock, flags); + ret = -1; + goto done; +diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c +--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-03-04 19:28:37.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-04 19:30:56.000000000 -0500 +@@ -111,7 +111,10 @@ static void __init ssb_fixup_pcibridge(s + + /* Enable PCI bridge bus mastering and memory space */ + pci_set_master(dev); +- pcibios_enable_device(dev, ~0); ++ if (pcibios_enable_device(dev, ~0) < 0) { ++ ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n"); ++ return; ++ } --What: Wireless extensions over netlink (CONFIG_NET_WIRELESS_RTNETLINK) --When: with the merge of wireless-dev, 2.6.22 or later --Why: The option/code is -- * not enabled on most kernels -- * not required by any userspace tools (except an experimental one, -- and even there only for some parts, others use ioctl) -- * pointless since wext is no longer evolving and the ioctl -- interface needs to be kept --Who: Johannes Berg -- ----------------------------- -- - What: i8xx_tco watchdog driver - When: in 2.6.22 - Why: the i8xx_tco watchdog driver has been replaced by the iTCO_wdt + /* Enable PCI bridge BAR1 prefetch and burst */ + pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3); linux-2.6-x86-tune-generic.patch: Index: linux-2.6-x86-tune-generic.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6-x86-tune-generic.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-x86-tune-generic.patch 24 Jan 2007 01:28:48 -0000 1.1 +++ linux-2.6-x86-tune-generic.patch 6 Mar 2008 13:59:26 -0000 1.2 @@ -1,5 +1,7 @@ ---- linux-2.6.15/arch/i386/Makefile.cpu~ 2006-01-09 11:39:04.000000000 -0500 -+++ linux-2.6.15/arch/i386/Makefile.cpu 2006-01-09 11:39:36.000000000 -0500 +* Optimise for today's CPUs. + +--- linux-2.6/arch/x86/Makefile_32.cpu 2006-01-09 11:39:04.000000000 -0500 ++++ linux-2.6/arch/x86/Makefile_32.cpu 2006-01-09 11:39:36.000000000 -0500 @@ -15,7 +15,7 @@ cflags-$(CONFIG_M486) += -march=i486 cflags-$(CONFIG_M586) += -march=i586 cflags-$(CONFIG_M586TSC) += -march=i586 nouveau-drm.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 nouveau-drm.patch Index: nouveau-drm.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/nouveau-drm.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nouveau-drm.patch 24 Jul 2007 14:13:45 -0000 1.2 +++ nouveau-drm.patch 6 Mar 2008 13:59:26 -0000 1.3 @@ -1,71 +1,231 @@ +From 97feb40c0d41369a3235a192b3db7d472e65bea8 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Fri, 29 Feb 2008 15:58:37 +1000 +Subject: [PATCH] nouveau: rebased master from git + +--- + drivers/char/drm/Kconfig | 7 + + drivers/char/drm/Makefile | 12 + + drivers/char/drm/drmP.h | 4 +- + drivers/char/drm/drm_bufs.c | 5 +- + drivers/char/drm/drm_drv.c | 4 + + drivers/char/drm/drm_irq.c | 3 +- + drivers/char/drm/drm_pciids.h | 262 ++++ + drivers/char/drm/nouveau_buffer.c | 293 +++++ + drivers/char/drm/nouveau_dma.c | 172 +++ + drivers/char/drm/nouveau_dma.h | 96 ++ + drivers/char/drm/nouveau_drm.h | 166 +++ + drivers/char/drm/nouveau_drv.c | 108 ++ + drivers/char/drm/nouveau_drv.h | 602 ++++++++++ + drivers/char/drm/nouveau_fence.c | 120 ++ + drivers/char/drm/nouveau_fifo.c | 590 ++++++++++ + drivers/char/drm/nouveau_ioc32.c | 72 ++ + drivers/char/drm/nouveau_irq.c | 477 ++++++++ + drivers/char/drm/nouveau_mem.c | 674 +++++++++++ + drivers/char/drm/nouveau_notifier.c | 165 +++ + drivers/char/drm/nouveau_object.c | 1148 ++++++++++++++++++ + drivers/char/drm/nouveau_reg.h | 586 +++++++++ + drivers/char/drm/nouveau_sgdma.c | 341 ++++++ + drivers/char/drm/nouveau_state.c | 694 +++++++++++ + drivers/char/drm/nouveau_swmthd.c | 191 +++ + drivers/char/drm/nouveau_swmthd.h | 33 + + drivers/char/drm/nv04_fb.c | 23 + + drivers/char/drm/nv04_fifo.c | 138 +++ + drivers/char/drm/nv04_graph.c | 516 ++++++++ + drivers/char/drm/nv04_instmem.c | 159 +++ + drivers/char/drm/nv04_mc.c | 35 + + drivers/char/drm/nv04_timer.c | 44 + + drivers/char/drm/nv10_fb.c | 25 + + drivers/char/drm/nv10_fifo.c | 169 +++ + drivers/char/drm/nv10_graph.c | 871 ++++++++++++++ + drivers/char/drm/nv20_graph.c | 889 ++++++++++++++ + drivers/char/drm/nv40_fb.c | 62 + + drivers/char/drm/nv40_fifo.c | 199 ++++ + drivers/char/drm/nv40_graph.c | 2225 +++++++++++++++++++++++++++++++++++ + drivers/char/drm/nv40_mc.c | 38 + + drivers/char/drm/nv50_fifo.c | 339 ++++++ + drivers/char/drm/nv50_graph.c | 363 ++++++ + drivers/char/drm/nv50_instmem.c | 323 +++++ + drivers/char/drm/nv50_mc.c | 43 + + 43 files changed, 13282 insertions(+), 4 deletions(-) + create mode 100644 drivers/char/drm/nouveau_buffer.c + create mode 100644 drivers/char/drm/nouveau_dma.c + create mode 100644 drivers/char/drm/nouveau_dma.h + create mode 100644 drivers/char/drm/nouveau_drm.h + create mode 100644 drivers/char/drm/nouveau_drv.c + create mode 100644 drivers/char/drm/nouveau_drv.h + create mode 100644 drivers/char/drm/nouveau_fence.c + create mode 100644 drivers/char/drm/nouveau_fifo.c + create mode 100644 drivers/char/drm/nouveau_ioc32.c + create mode 100644 drivers/char/drm/nouveau_irq.c + create mode 100644 drivers/char/drm/nouveau_mem.c + create mode 100644 drivers/char/drm/nouveau_notifier.c + create mode 100644 drivers/char/drm/nouveau_object.c + create mode 100644 drivers/char/drm/nouveau_reg.h + create mode 100644 drivers/char/drm/nouveau_sgdma.c + create mode 100644 drivers/char/drm/nouveau_state.c + create mode 100644 drivers/char/drm/nouveau_swmthd.c + create mode 100644 drivers/char/drm/nouveau_swmthd.h + create mode 100644 drivers/char/drm/nv04_fb.c + create mode 100644 drivers/char/drm/nv04_fifo.c + create mode 100644 drivers/char/drm/nv04_graph.c + create mode 100644 drivers/char/drm/nv04_instmem.c + create mode 100644 drivers/char/drm/nv04_mc.c + create mode 100644 drivers/char/drm/nv04_timer.c + create mode 100644 drivers/char/drm/nv10_fb.c + create mode 100644 drivers/char/drm/nv10_fifo.c + create mode 100644 drivers/char/drm/nv10_graph.c + create mode 100644 drivers/char/drm/nv20_graph.c + create mode 100644 drivers/char/drm/nv40_fb.c + create mode 100644 drivers/char/drm/nv40_fifo.c + create mode 100644 drivers/char/drm/nv40_graph.c + create mode 100644 drivers/char/drm/nv40_mc.c + create mode 100644 drivers/char/drm/nv50_fifo.c + create mode 100644 drivers/char/drm/nv50_graph.c + create mode 100644 drivers/char/drm/nv50_instmem.c + create mode 100644 drivers/char/drm/nv50_mc.c + diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig -index ef833a1..065f499 100644 +index 610d6fd..6b98529 100644 --- a/drivers/char/drm/Kconfig +++ b/drivers/char/drm/Kconfig -@@ -106,3 +106,9 @@ config DRM_SAVAGE +@@ -105,3 +105,10 @@ config DRM_SAVAGE + help Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister chipset. If M is selected the module will be called savage. - ++ +config DRM_NOUVEAU + tristate "Nvidia video cards" -+ depends on DRM && PCI ++ depends on DRM + help -+ Choose this option if you want to enable nouveau reverse engineered -+ driver for nvidia chipset. The module will be called nouveau. ++ Choose this for nvidia open source 3d driver ++ diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile -index 6915a05..20b79d5 100644 +index 85c4f9e..721548c 100644 --- a/drivers/char/drm/Makefile +++ b/drivers/char/drm/Makefile -@@ -14,6 +14,14 @@ mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o +@@ -15,6 +15,16 @@ mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o i810-objs := i810_drv.o i810_dma.o i830-objs := i830_drv.o i830_dma.o i830_irq.o - i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o + i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o i915_buffer.o +nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \ -+ nouveau_object.o nouveau_irq.o \ ++ nouveau_object.o nouveau_irq.o nouveau_notifier.o nouveau_swmthd.o \ ++ nouveau_sgdma.o nouveau_dma.o nouveau_buffer.o nouveau_fence.o \ + nv04_timer.o \ -+ nv04_mc.o nv40_mc.o \ ++ nv04_mc.o nv40_mc.o nv50_mc.o \ + nv04_fb.o nv10_fb.o nv40_fb.o \ -+ nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \ -+ nv40_graph.o -+ ++ nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \ ++ nv04_graph.o nv10_graph.o nv20_graph.o \ ++ nv40_graph.o nv50_graph.o \ ++ nv04_instmem.o nv50_instmem.o radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o sis-objs := sis_drv.o sis_mm.o savage-objs := savage_drv.o savage_bci.o savage_state.o -@@ -25,6 +33,7 @@ radeon-objs += radeon_ioc32.o +@@ -26,6 +36,7 @@ radeon-objs += radeon_ioc32.o mga-objs += mga_ioc32.o r128-objs += r128_ioc32.o i915-objs += i915_ioc32.o -+nouveau-objs += nouveau_ioc32.o ++nouveau-objs += nouveau_ioc32.o endif obj-$(CONFIG_DRM) += drm.o -@@ -38,5 +47,6 @@ obj-$(CONFIG_DRM_I915) += i915.o +@@ -36,6 +47,7 @@ obj-$(CONFIG_DRM_MGA) += mga.o + obj-$(CONFIG_DRM_I810) += i810.o + obj-$(CONFIG_DRM_I830) += i830.o + obj-$(CONFIG_DRM_I915) += i915.o ++obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o obj-$(CONFIG_DRM_SIS) += sis.o obj-$(CONFIG_DRM_SAVAGE)+= savage.o obj-$(CONFIG_DRM_VIA) +=via.o -+obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o - - +diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h +index bd41621..a437ac2 100644 +--- a/drivers/char/drm/drmP.h ++++ b/drivers/char/drm/drmP.h +@@ -1030,7 +1030,8 @@ extern unsigned long drm_get_resource_start(struct drm_device *dev, + unsigned int resource); + extern unsigned long drm_get_resource_len(struct drm_device *dev, + unsigned int resource); +- ++struct drm_map_list *drm_find_matching_map(struct drm_device *dev, ++ drm_local_map_t *map); + /* DMA support (drm_dma.h) */ + extern int drm_dma_setup(struct drm_device *dev); + extern void drm_dma_takedown(struct drm_device *dev); +@@ -1042,6 +1043,7 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev, + extern int drm_control(struct drm_device *dev, void *data, + struct drm_file *file_priv); + extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS); ++extern int drm_irq_install(struct drm_device * dev); + extern int drm_irq_uninstall(struct drm_device *dev); + extern void drm_driver_irq_preinstall(struct drm_device *dev); + extern void drm_driver_irq_postinstall(struct drm_device *dev); diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c -index a6828cc..f3da5c4 100644 +index 6da493f..f3aac97 100644 --- a/drivers/char/drm/drm_bufs.c +++ b/drivers/char/drm/drm_bufs.c -@@ -400,6 +400,7 @@ int drm_rmmap(drm_device_t *dev, drm_local_map_t *map) +@@ -48,8 +48,8 @@ unsigned long drm_get_resource_len(struct drm_device *dev, unsigned int resource + } + EXPORT_SYMBOL(drm_get_resource_len); + [...13794 lines suppressed...] ++ ++ /* Assume that praying isn't enough, check that we can re-read the ++ * entire fake channel back from the PRAMIN BAR */ ++ for (i = 0; i < c_size; i+=4) { ++ if (NV_READ(NV_RAMIN + i) != NV_RI32(i)) { ++ DRM_ERROR("Error reading back PRAMIN at 0x%08x\n", i); ++ return -EINVAL; ++ } ++ } ++ ++ /* Global PRAMIN heap */ ++ if (nouveau_mem_init_heap(&dev_priv->ramin_heap, ++ c_size, dev_priv->ramin->size - c_size)) { ++ dev_priv->ramin_heap = NULL; ++ DRM_ERROR("Failed to init RAMIN heap\n"); ++ } ++ ++ /*XXX: incorrect, but needed to make hash func "work" */ ++ dev_priv->ramht_offset = 0x10000; ++ dev_priv->ramht_bits = 9; ++ dev_priv->ramht_size = (1 << dev_priv->ramht_bits); ++ return 0; ++} ++ ++void ++nv50_instmem_takedown(struct drm_device *dev) ++{ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv; ++ struct nouveau_channel *chan = dev_priv->fifos[0]; ++ int i; ++ ++ DRM_DEBUG("\n"); ++ ++ if (!priv) ++ return; ++ ++ /* Restore state from before init */ ++ for (i = 0x1700; i <= 0x1710; i+=4) ++ NV_WRITE(i, priv->save1700[(i-0x1700)/4]); ++ ++ nouveau_gpuobj_ref_del(dev, &priv->pramin_bar); ++ nouveau_gpuobj_ref_del(dev, &priv->pramin_pt); ++ ++ /* Destroy dummy channel */ ++ if (chan) { ++ nouveau_gpuobj_del(dev, &chan->vm_pd); ++ nouveau_gpuobj_ref_del(dev, &chan->ramfc); ++ nouveau_gpuobj_ref_del(dev, &chan->ramin); ++ nouveau_mem_takedown(&chan->ramin_heap); ++ ++ dev_priv->fifos[0] = dev_priv->fifos[127] = NULL; ++ drm_free(chan, sizeof(*chan), DRM_MEM_DRIVER); ++ } ++ ++ dev_priv->Engine.instmem.priv = NULL; ++ drm_free(priv, sizeof(*priv), DRM_MEM_DRIVER); ++} ++ ++int ++nv50_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, uint32_t *sz) ++{ ++ if (gpuobj->im_backing) ++ return -EINVAL; ++ ++ *sz = (*sz + (NV50_INSTMEM_PAGE_SIZE-1)) & ~(NV50_INSTMEM_PAGE_SIZE-1); ++ if (*sz == 0) ++ return -EINVAL; ++ ++ gpuobj->im_backing = nouveau_mem_alloc(dev, NV50_INSTMEM_PAGE_SIZE, ++ *sz, NOUVEAU_MEM_FB, ++ (struct drm_file *)-2); ++ if (!gpuobj->im_backing) { ++ DRM_ERROR("Couldn't allocate vram to back PRAMIN pages\n"); ++ return -ENOMEM; ++ } ++ ++ return 0; ++} ++ ++void ++nv50_instmem_clear(struct drm_device *dev, struct nouveau_gpuobj *gpuobj) ++{ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ ++ if (gpuobj && gpuobj->im_backing) { ++ if (gpuobj->im_bound) ++ dev_priv->Engine.instmem.unbind(dev, gpuobj); ++ nouveau_mem_free(dev, gpuobj->im_backing); ++ gpuobj->im_backing = NULL; ++ } ++} ++ ++int ++nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj) ++{ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv; ++ uint32_t pte, pte_end, vram; ++ ++ if (!gpuobj->im_backing || !gpuobj->im_pramin || gpuobj->im_bound) ++ return -EINVAL; ++ ++ DRM_DEBUG("st=0x%0llx sz=0x%0llx\n", ++ gpuobj->im_pramin->start, gpuobj->im_pramin->size); ++ ++ pte = (gpuobj->im_pramin->start >> 12) << 3; ++ pte_end = ((gpuobj->im_pramin->size >> 12) << 3) + pte; ++ vram = gpuobj->im_backing->start; ++ ++ DRM_DEBUG("pramin=0x%llx, pte=%d, pte_end=%d\n", ++ gpuobj->im_pramin->start, pte, pte_end); ++ DRM_DEBUG("first vram page: 0x%llx\n", ++ gpuobj->im_backing->start); ++ ++ while (pte < pte_end) { ++ INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 0)/4, vram | 1); ++ INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 4)/4, 0x00000000); ++ ++ pte += 8; ++ vram += NV50_INSTMEM_PAGE_SIZE; ++ } ++ ++ gpuobj->im_bound = 1; ++ return 0; ++} ++ ++int ++nv50_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj) ++{ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv; ++ uint32_t pte, pte_end; ++ ++ if (gpuobj->im_bound == 0) ++ return -EINVAL; ++ ++ pte = (gpuobj->im_pramin->start >> 12) << 3; ++ pte_end = ((gpuobj->im_pramin->size >> 12) << 3) + pte; ++ while (pte < pte_end) { ++ INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 0)/4, 0x00000009); ++ INSTANCE_WR(priv->pramin_pt->gpuobj, (pte + 4)/4, 0x00000000); ++ pte += 8; ++ } ++ ++ gpuobj->im_bound = 0; ++ return 0; ++} +diff --git a/drivers/char/drm/nv50_mc.c b/drivers/char/drm/nv50_mc.c +new file mode 100644 +index 0000000..b111826 +--- /dev/null ++++ b/drivers/char/drm/nv50_mc.c +@@ -0,0 +1,43 @@ ++/* ++ * Copyright (C) 2007 Ben Skeggs. ++ * All Rights Reserved. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining ++ * a copy of this software and associated documentation files (the ++ * "Software"), to deal in the Software without restriction, including ++ * without limitation the rights to use, copy, modify, merge, publish, ++ * distribute, sublicense, and/or sell copies of the Software, and to ++ * permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the ++ * next paragraph) shall be included in all copies or substantial ++ * portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE ++ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ * ++ */ ++ ++#include "drmP.h" ++#include "drm.h" ++#include "nouveau_drv.h" ++ ++int ++nv50_mc_init(struct drm_device *dev) ++{ ++ struct drm_nouveau_private *dev_priv = dev->dev_private; ++ ++ NV_WRITE(NV03_PMC_ENABLE, 0xFFFFFFFF); ++ ++ return 0; ++} ++ ++void nv50_mc_takedown(struct drm_device *dev) ++{ ++} +-- +1.5.3.7 + Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 18 Jan 2008 19:14:27 -0000 1.11 +++ sources 6 Mar 2008 13:59:26 -0000 1.12 @@ -1,4 +1,3 @@ -1b515f588078dfa7f4bab2634bd17e80 linux-2.6.21.tar.bz2 -b9c8734471a454806c77f040fcf9869b patch-2.6.21.7.bz2 -0b7a1468bcd3353b77494cbf0e97d2e4 linux-2.6.21.7-xen-3.1.0.patch.bz2 +3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2 +a4cc0fd5bda60e498246b6d69c873895 patch-2.6.25-rc4.bz2 4aa57328d0802a063fa67dfc063da30e xen-3.2.0.tar.gz xen-build-id.patch: Index: xen-build-id.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/xen-build-id.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen-build-id.patch 29 Oct 2007 17:29:06 -0000 1.2 +++ xen-build-id.patch 6 Mar 2008 13:59:26 -0000 1.3 @@ -1,8 +1,20 @@ -Index: xen-3.1.0-rc7-7041b52471c3/Config.mk -=================================================================== ---- xen-3.1.0-rc7-7041b52471c3.orig/Config.mk -+++ xen-3.1.0-rc7-7041b52471c3/Config.mk -@@ -52,6 +52,12 @@ define cc-ver-check-closure +diff -up xen-3.2.0/xen/Rules.mk.build-id xen-3.2.0/xen/Rules.mk +--- xen-3.2.0/xen/Rules.mk.build-id 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0/xen/Rules.mk 2008-02-13 18:26:21.000000000 +0000 +@@ -84,6 +84,9 @@ CFLAGS := $(strip $(CFLAGS) $(CFLAGS-y + AFLAGS := $(strip $(AFLAGS) $(AFLAGS-y)) + AFLAGS += $(patsubst -std=gnu%,,$(CFLAGS)) + ++# Use --build-id when linking directly; normally the compiler would pass it. ++LDFLAGS_DIRECT += $(call ld-option,$(CC),--build-id,) ++ + # LDFLAGS are only passed directly to $(LD) + LDFLAGS := $(strip $(LDFLAGS) $(LDFLAGS_DIRECT)) + +diff -up xen-3.2.0/Config.mk.build-id xen-3.2.0/Config.mk +--- xen-3.2.0/Config.mk.build-id 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0/Config.mk 2008-02-13 18:26:21.000000000 +0000 +@@ -57,6 +57,12 @@ define cc-ver-check-closure endif endef @@ -15,17 +27,3 @@ ifneq ($(debug),y) CFLAGS += -DNDEBUG else -Index: xen-3.1.0-rc7-7041b52471c3/xen/Rules.mk -=================================================================== ---- xen-3.1.0-rc7-7041b52471c3.orig/xen/Rules.mk -+++ xen-3.1.0-rc7-7041b52471c3/xen/Rules.mk -@@ -72,6 +72,9 @@ CFLAGS := $(strip $(CFLAGS) $(CFLAGS-y - AFLAGS := $(strip $(AFLAGS) $(AFLAGS-y)) - AFLAGS += $(patsubst -std=gnu%,,$(CFLAGS)) - -+# Use --build-id when linking directly; normally the compiler would pass it. -+LDFLAGS_DIRECT += $(call ld-option,$(CC),--build-id,) -+ - # LDFLAGS are only passed directly to $(LD) - LDFLAGS := $(strip $(LDFLAGS) $(LDFLAGS_DIRECT)) - xen-compile-fix.patch: Index: xen-compile-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/xen-compile-fix.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xen-compile-fix.patch 13 Sep 2007 19:20:29 -0000 1.3 +++ xen-compile-fix.patch 6 Mar 2008 13:59:26 -0000 1.4 @@ -1,13 +1,12 @@ -Index: xen-3.1.0/xen/include/asm-x86/hvm/hvm.h -=================================================================== ---- xen-3.1.0/xen/include/asm-x86/hvm/hvm.h -+++ xen-3.1.0/xen/include/asm-x86/hvm/hvm.h -@@ -183,7 +183,7 @@ hvm_long_mode_enabled(struct vcpu *v) - return hvm_funcs.long_mode_enabled(v); - } +diff -up xen-3.2.0/xen/include/asm-x86/hvm/hvm.h.compile-fix xen-3.2.0/xen/include/asm-x86/hvm/hvm.h +--- xen-3.2.0/xen/include/asm-x86/hvm/hvm.h.compile-fix 2008-02-13 18:21:43.000000000 +0000 ++++ xen-3.2.0/xen/include/asm-x86/hvm/hvm.h 2008-02-13 18:25:14.000000000 +0000 +@@ -155,7 +155,7 @@ u64 hvm_get_guest_tsc(struct vcpu *v); + #define hvm_long_mode_enabled(v) \ + ((v)->arch.hvm_vcpu.guest_efer & EFER_LMA) #else -#define hvm_long_mode_enabled(v) (v,0) +#define hvm_long_mode_enabled(v) 0 #endif - static inline int + enum hvm_intblk xen-syms-build-id.patch: Index: xen-syms-build-id.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/xen-syms-build-id.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen-syms-build-id.patch 29 Oct 2007 17:29:06 -0000 1.2 +++ xen-syms-build-id.patch 6 Mar 2008 13:59:26 -0000 1.3 @@ -1,7 +1,6 @@ From: Eduardo Habkost Subject: Add build-id section to xen-syms - This needs some changes on xen.lds.S and to mkelf32. The linker script need a .notes section and a note phdr. mkelf32 needs to support a input file containing more than one phdr and ignore the note phdr. @@ -10,12 +9,9 @@ xen hypervisor image that boots doesn't have the build-id information, but the build-id section is a requirement of Fedora's find-debuginfo.sh. - ---- -Index: xen-3.1.0-rc7-7041b52471c3/xen/arch/x86/boot/mkelf32.c -=================================================================== ---- xen-3.1.0-rc7-7041b52471c3.orig/xen/arch/x86/boot/mkelf32.c -+++ xen-3.1.0-rc7-7041b52471c3/xen/arch/x86/boot/mkelf32.c +diff -up xen-3.2.0/xen/arch/x86/boot/mkelf32.c.syms-build-id xen-3.2.0/xen/arch/x86/boot/mkelf32.c +--- xen-3.2.0/xen/arch/x86/boot/mkelf32.c.syms-build-id 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0/xen/arch/x86/boot/mkelf32.c 2008-02-13 18:27:05.000000000 +0000 @@ -229,10 +229,11 @@ int main(int argc, char **argv) { u64 final_exec_addr; @@ -134,11 +130,10 @@ /* * End the image on a page boundary. This gets round alignment bugs * in the boot- or chain-loader (e.g., kexec on the XenoBoot CD). -Index: xen-3.1.0-rc7-7041b52471c3/xen/arch/x86/x86_32/xen.lds.S -=================================================================== ---- xen-3.1.0-rc7-7041b52471c3.orig/xen/arch/x86/x86_32/xen.lds.S -+++ xen-3.1.0-rc7-7041b52471c3/xen/arch/x86/x86_32/xen.lds.S -@@ -15,6 +15,7 @@ ENTRY(start) +diff -up xen-3.2.0/xen/arch/x86/x86_64/xen.lds.S.syms-build-id xen-3.2.0/xen/arch/x86/x86_64/xen.lds.S +--- xen-3.2.0/xen/arch/x86/x86_64/xen.lds.S.syms-build-id 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0/xen/arch/x86/x86_64/xen.lds.S 2008-02-13 18:27:05.000000000 +0000 +@@ -13,6 +13,7 @@ ENTRY(start) PHDRS { text PT_LOAD ; @@ -146,17 +141,16 @@ } SECTIONS { -@@ -96,4 +97,5 @@ SECTIONS +@@ -99,4 +100,5 @@ SECTIONS .stab.index 0 : { *(.stab.index) } .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) } + .notes : { *(.note*) } :note } -Index: xen-3.1.0-rc7-7041b52471c3/xen/arch/x86/x86_64/xen.lds.S -=================================================================== ---- xen-3.1.0-rc7-7041b52471c3.orig/xen/arch/x86/x86_64/xen.lds.S -+++ xen-3.1.0-rc7-7041b52471c3/xen/arch/x86/x86_64/xen.lds.S -@@ -13,6 +13,7 @@ ENTRY(start) +diff -up xen-3.2.0/xen/arch/x86/x86_32/xen.lds.S.syms-build-id xen-3.2.0/xen/arch/x86/x86_32/xen.lds.S +--- xen-3.2.0/xen/arch/x86/x86_32/xen.lds.S.syms-build-id 2008-01-16 18:34:59.000000000 +0000 ++++ xen-3.2.0/xen/arch/x86/x86_32/xen.lds.S 2008-02-13 18:27:05.000000000 +0000 +@@ -15,6 +15,7 @@ ENTRY(start) PHDRS { text PT_LOAD ; @@ -164,7 +158,7 @@ } SECTIONS { -@@ -94,4 +95,5 @@ SECTIONS +@@ -101,4 +102,5 @@ SECTIONS .stab.index 0 : { *(.stab.index) } .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) } --- config-olpc-generic DELETED --- --- git-wireless-dev.patch DELETED --- --- kernel-2.6.21.7-i686-xen.config DELETED --- --- kernel-2.6.21.7-x86_64-xen.config DELETED --- --- linux-2.6-2110_scsi-sd-printing.patch DELETED --- --- linux-2.6-2111_sd-start-stop.patch DELETED --- --- linux-2.6-2112_libata-suspend.patch DELETED --- --- linux-2.6-2113_libata-spindown-compat.patch DELETED --- --- linux-2.6-2114_libata-shutdown-warning.patch DELETED --- --- linux-2.6-2115_libata-spindown-status.patch DELETED --- --- linux-2.6-2116_libata-remove-spindown-compat.patch DELETED --- --- linux-2.6-2117_sata-via-suspend.patch DELETED --- --- linux-2.6-2118_scsi-constants.patch DELETED --- --- linux-2.6-3w-9xxx-mem_len.patch DELETED --- --- linux-2.6-PT_LOAD-align.patch DELETED --- --- linux-2.6-acpi-boot-regression.patch DELETED --- --- linux-2.6-acpi-config_pm-poweroff.patch DELETED --- --- linux-2.6-acpi-dock-oops.patch DELETED --- --- linux-2.6-acpi-keep-tsc-stable-when-lapic-timer-c2-ok-is-set.patch DELETED --- --- linux-2.6-acpi-preserve-ebx-in-acpi_copy_wakeup_routine.patch DELETED --- --- linux-2.6-acpi-unblacklist-dell-gx240.patch DELETED --- --- linux-2.6-amd-disabled-svm-detect-msr-1.patch DELETED --- --- linux-2.6-amd-disabled-svm-detect.patch DELETED --- --- linux-2.6-ata-call-check-dma-with-qc-prepared.patch DELETED --- --- linux-2.6-ata-use-pio-for-non-16-byte-xfers.patch DELETED --- --- linux-2.6-bcm43xx-pci-neuter.patch DELETED --- --- linux-2.6-cell-spu-device-tree.patch DELETED --- --- linux-2.6-cell-spufs-fixes.patch DELETED --- --- linux-2.6-clockevents-fix-resume-logic.patch DELETED --- --- linux-2.6-common-uevent.patch DELETED --- --- linux-2.6-crap-sysfs-workaround.patch DELETED --- --- linux-2.6-crash-driver-xen.patch DELETED --- --- linux-2.6-debug-boot-delay.patch DELETED --- --- linux-2.6-debug-extra-warnings.patch DELETED --- --- linux-2.6-debug-must_check.patch DELETED --- --- linux-2.6-debug-slab-backtrace.patch DELETED --- --- linux-2.6-debug-sysfs-crash-debugging-xen.patch DELETED --- --- linux-2.6-debug-sysfs-crash-debugging.patch DELETED --- --- linux-2.6-defaults-nonmi.patch DELETED --- --- linux-2.6-defaults-pci_no_msi_mmconf.patch DELETED --- --- linux-2.6-defaults-unicode-vt.patch DELETED --- --- linux-2.6-devmem-xen.patch DELETED --- --- linux-2.6-disable-netback-checksum.patch DELETED --- --- linux-2.6-dvb-spinlock.patch DELETED --- --- linux-2.6-execshield-xen.patch DELETED --- --- linux-2.6-firewire-be32-fix.patch DELETED --- --- linux-2.6-firewire.patch DELETED --- --- linux-2.6-fix-pmops-1.patch DELETED --- --- linux-2.6-fix-pmops-2.patch DELETED --- --- linux-2.6-fix-pmops-3.patch DELETED --- --- linux-2.6-fix-pmops-4.patch DELETED --- --- linux-2.6-gfs2-update.patch DELETED --- --- linux-2.6-i82875-edac-pci-setup.patch DELETED --- --- linux-2.6-i965gm-support.patch DELETED --- --- linux-2.6-ibmvscsi-schizo.patch DELETED --- --- linux-2.6-kvm-19.patch DELETED --- --- linux-2.6-kvm-reinit-real-mode-tss.patch DELETED --- --- linux-2.6-libata-atiixp-ids.patch DELETED --- --- linux-2.6-libata-hpa.patch DELETED --- --- linux-2.6-libata-ich8m-add-pciid.patch DELETED --- --- linux-2.6-libata-ncq-blacklist-2.6.22-rc7.patch DELETED --- --- linux-2.6-libata-pata-hpt3x2n-correct-revision-boundary.patch DELETED --- --- linux-2.6-libata-pata-pcmcia-new-ident.patch DELETED --- --- linux-2.6-libata-pata-sis-fix-timing.patch DELETED --- --- linux-2.6-libata-pata_dma-param.patch DELETED --- --- linux-2.6-libata-pata_it821x-partly-fix-dma.patch DELETED --- --- linux-2.6-libata-sata_nv-adma.patch DELETED --- --- linux-2.6-libata-sata_nv-wildcard-removal.patch DELETED --- --- linux-2.6-libata-setxfer.patch DELETED --- --- linux-2.6-libata_ali_max_dma_speed.patch DELETED --- --- linux-2.6-libertas.diff DELETED --- --- linux-2.6-mm-udf-fixes.patch DELETED --- --- linux-2.6-modsign-core.patch DELETED --- --- linux-2.6-modsign-crypto.patch DELETED --- --- linux-2.6-modsign-include.patch DELETED --- --- linux-2.6-modsign-ksign.patch DELETED --- --- linux-2.6-modsign-mpilib.patch DELETED --- --- linux-2.6-modsign-script.patch DELETED --- --- linux-2.6-modsign-verify.patch DELETED --- --- linux-2.6-module_version.patch DELETED --- --- linux-2.6-mpc52xx-fec.patch DELETED --- --- linux-2.6-mpc52xx-sdma.patch DELETED --- --- linux-2.6-net-e1000-no-msi-warning.patch DELETED --- --- linux-2.6-netdev-e1000e-01.patch DELETED --- --- linux-2.6-netdev-e1000e-02.patch DELETED --- --- linux-2.6-netdev-e1000e-03.patch DELETED --- --- linux-2.6-netdev-e1000e-04.patch DELETED --- --- linux-2.6-netdev-e1000e-05.patch DELETED --- --- linux-2.6-netdev-e1000e-06.patch DELETED --- --- linux-2.6-netdev-e1000e-07.patch DELETED --- --- linux-2.6-netdev-e1000e-08.patch DELETED --- --- linux-2.6-netdev-e1000e-09.patch DELETED --- --- linux-2.6-netdev-e1000e-10.patch DELETED --- --- linux-2.6-netdev-e1000e-backport.patch DELETED --- --- linux-2.6-nfs-missing-braces.patch DELETED --- --- linux-2.6-nfs-noreaddirplus.patch DELETED --- --- linux-2.6-olpc-touchpad.diff DELETED --- --- linux-2.6-ondemand-timer.patch DELETED --- --- linux-2.6-oprofile-0.9.3.patch DELETED --- --- linux-2.6-optimise-spinlock-debug.patch DELETED --- --- linux-2.6-pmac-zilog.patch DELETED --- --- linux-2.6-powermac-generic-suspend-1.patch DELETED --- --- linux-2.6-powermac-generic-suspend-2.patch DELETED --- --- linux-2.6-powermac-generic-suspend-3.patch DELETED --- --- linux-2.6-powermac-generic-suspend-4.patch DELETED --- --- linux-2.6-powerpc-reserve-initrd-1.patch DELETED --- --- linux-2.6-powerpc-reserve-initrd-2.patch DELETED --- --- linux-2.6-powerpc-slabalign.patch DELETED --- --- linux-2.6-ppc-data-exception.patch DELETED --- --- linux-2.6-proc-self-maps-fix.patch DELETED --- --- linux-2.6-ps3-clear-spu-irq.patch DELETED --- --- linux-2.6-ps3-device-init.patch DELETED --- --- linux-2.6-ps3-ethernet-autoload.patch DELETED --- --- linux-2.6-ps3-ethernet-modular.patch DELETED --- --- linux-2.6-ps3-gelic-wireless.patch DELETED --- --- linux-2.6-ps3-gelic.patch DELETED --- --- linux-2.6-ps3-kexec.patch DELETED --- --- linux-2.6-ps3-legacy-ioport.patch DELETED --- --- linux-2.6-ps3-memory-probe.patch DELETED --- --- linux-2.6-ps3-smp-boot.patch DELETED --- --- linux-2.6-ps3-sound-autoload.patch DELETED --- --- linux-2.6-ps3-sound.patch DELETED --- --- linux-2.6-ps3-stable-patches.patch DELETED --- --- linux-2.6-ps3-storage.patch DELETED --- --- linux-2.6-ps3-system-bus-rework-2.patch DELETED --- --- linux-2.6-ps3-system-bus-rework.patch DELETED --- --- linux-2.6-ps3-usb-autoload.patch DELETED --- --- linux-2.6-ps3-wrap-spu-runctl.patch DELETED --- --- linux-2.6-ps3av-export-header.patch DELETED --- --- linux-2.6-ps3fb-panic.patch DELETED --- --- linux-2.6-raid-autorun.patch DELETED --- --- linux-2.6-remove-unnecessary-cast-in-prefetch.patch DELETED --- --- linux-2.6-scsi-bounce-isa.patch DELETED --- --- linux-2.6-sha_alignment.patch DELETED --- --- linux-2.6-softirq-printout-irq-trace-events.patch DELETED --- --- linux-2.6-softlockup-disable.patch DELETED --- --- linux-2.6-sumversion-limits-dot-h.patch DELETED --- --- linux-2.6-suspend-ordering.patch DELETED --- --- linux-2.6-sysfs-inode-allocator-oops.patch DELETED --- --- linux-2.6-udf-2.6.22-rc2-1-udf_data_corruption.patch DELETED --- --- linux-2.6-udf-2.6.22-rc4-1-udf_block_leak.patch DELETED --- --- linux-2.6-uevent-ebus.patch DELETED --- --- linux-2.6-uevent-macio.patch DELETED --- --- linux-2.6-uevent-of_platform.patch DELETED --- --- linux-2.6-unexport-symbols.patch DELETED --- --- linux-2.6-usb-autosuspend-default-disable.patch DELETED --- --- linux-2.6-use-build-id-ld-option.patch DELETED --- --- linux-2.6-utrace-ptrace-compat-xen.patch DELETED --- --- linux-2.6-utrace-recalc_sigpending_and_wake.patch DELETED --- --- linux-2.6-utrace-sig_kernel-macros.patch DELETED --- --- linux-2.6-utrace-tracehook-xen.patch DELETED --- --- linux-2.6-vm-invalidate_mapping_pages-cond-resched.patch DELETED --- --- linux-2.6-vm-silence-atomic-alloc-failures.patch DELETED --- --- linux-2.6-wakeups-hdaps.patch DELETED --- --- linux-2.6-x86-64-edac-support.patch DELETED --- --- linux-2.6-x86-64_pmtrace.patch DELETED --- --- linux-2.6-x86-dell-hpet.patch DELETED --- --- linux-2.6-x86-dont-delete-cpu_devs-data.patch DELETED --- --- linux-2.6-x86-fsc-interrupt-controller-quirk.patch DELETED --- --- linux-2.6-x86-vga-vidfail.patch DELETED --- --- linux-2.6-x86_64-silence-up-apic-errors-xen.patch DELETED --- --- linux-2.6-x86_64-silence-up-apic-errors.patch DELETED --- --- linux-2.6-xen-backwards-time.patch DELETED --- --- linux-2.6-xen-blkfront-wait-add.patch DELETED --- --- linux-2.6-xen-fix-irq-warn-mismerge.patch DELETED --- --- linux-2.6-xen-irq_vector-uninitialize.patch DELETED --- --- linux-2.6-xen-paravirt-nographics-pvfb-fix.patch DELETED --- --- linux-2.6-xen-privcmd-use-nopfn.patch DELETED --- --- linux-2.6-xen-sleazy-fpu-i386.patch DELETED --- --- linux-2.6-xen-sleazy-fpu-x86_64.patch DELETED --- --- linux-2.6.20.tar.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 14:02:57 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 6 Mar 2008 14:02:57 GMT Subject: rpms/libebml/devel .cvsignore, 1.8, 1.9 libebml.spec, 1.18, 1.19 sources, 1.9, 1.10 libebml-0.7.7-gcc43.patch, 1.1, NONE Message-ID: <200803061402.m26E2v8h031140@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libebml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31003 Modified Files: .cvsignore libebml.spec sources Removed Files: libebml-0.7.7-gcc43.patch Log Message: * Thu Mar 6 2008 Hans de Goede 0.7.8-1 - New upstream release 0.7.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libebml/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Apr 2006 14:34:42 -0000 1.8 +++ .cvsignore 6 Mar 2008 14:02:14 -0000 1.9 @@ -1 +1 @@ -libebml-0.7.7.tar.bz2 +libebml-0.7.8.tar.bz2 Index: libebml.spec =================================================================== RCS file: /cvs/extras/rpms/libebml/devel/libebml.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libebml.spec 19 Feb 2008 09:00:24 -0000 1.18 +++ libebml.spec 6 Mar 2008 14:02:14 -0000 1.19 @@ -1,12 +1,11 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 0.7.7 -Release: 5%{?dist} +Version: 0.7.8 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.matroska.org/ Source: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2 -Patch0: libebml-0.7.7-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) %description @@ -31,7 +30,9 @@ %prep %setup -q -%patch0 -p1 +iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.tmp +touch -r ChangeLog ChangeLog.tmp +mv ChangeLog.tmp ChangeLog %build @@ -43,6 +44,7 @@ make -C make/linux \ prefix=$RPM_BUILD_ROOT%{_prefix} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ + INSTALL="install -p" \ install rm $RPM_BUILD_ROOT%{_libdir}/%{name}.a # Needed for proper stripping of the library (still in 0.7.6) @@ -70,6 +72,9 @@ %changelog +* Thu Mar 6 2008 Hans de Goede 0.7.8-1 +- New upstream release 0.7.8 + * Tue Feb 19 2008 Fedora Release Engineering - 0.7.7-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libebml/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Apr 2006 14:34:42 -0000 1.9 +++ sources 6 Mar 2008 14:02:14 -0000 1.10 @@ -1 +1 @@ -7c8456a50fd82c1c9755917d0182c49e libebml-0.7.7.tar.bz2 +6278109f52e4f9d2c8a8dfc0d668b587 libebml-0.7.8.tar.bz2 --- libebml-0.7.7-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 14:06:25 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 6 Mar 2008 14:06:25 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.45,1.46 Message-ID: <200803061406.m26E6PtC031421@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31383 Modified Files: kdebase-workspace.spec Log Message: typo fix Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- kdebase-workspace.spec 6 Mar 2008 12:38:02 -0000 1.45 +++ kdebase-workspace.spec 6 Mar 2008 14:05:46 -0000 1.46 @@ -6,7 +6,7 @@ Name: kdebase-workspace Version: 4.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -110,7 +110,7 @@ # ConsoleKit support for KDM (#228111, kde#147790) %patch2 -p1 -b .consolekit %patch3 -p1 -b .gestures -%patch4 -p1 -b .plase-konsole +%patch4 -p1 -b .plasma-konsole # upstream patches %patch100 -p1 -b .kde#155362 @@ -227,6 +227,9 @@ %changelog +* Thu Mar 06 2008 Than Ngo 4.0.2-5 +- typo fix + * Tue Mar 04 2008 Than Ngo 4.0.2-4 - disable gestures as default - add konsole in desktop menu From fedora-extras-commits at redhat.com Thu Mar 6 14:20:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:20:35 +0000 Subject: [pkgdb] jython: jmatthews has requested commit Message-ID: <200803061422.m26EMA7U007208@bastion.fedora.phx.redhat.com> John Matthews (jmatthews) has requested the commit acl on jython (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:20:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:20:35 +0000 Subject: [pkgdb] jython: jmatthews has requested watchbugzilla Message-ID: <200803061422.m26EMADB007206@bastion.fedora.phx.redhat.com> John Matthews (jmatthews) has requested the watchbugzilla acl on jython (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:20:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:20:53 +0000 Subject: [pkgdb] jython: jmatthews has requested watchcommits Message-ID: <200803061422.m26EMDoT007245@bastion.fedora.phx.redhat.com> John Matthews (jmatthews) has requested the watchcommits acl on jython (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:20:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:20:41 +0000 Subject: [pkgdb] jython: jmatthews has requested watchbugzilla Message-ID: <200803061422.m26EMADE007206@bastion.fedora.phx.redhat.com> John Matthews (jmatthews) has requested the watchbugzilla acl on jython (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:20:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:20:43 +0000 Subject: [pkgdb] jython: jmatthews has requested watchcommits Message-ID: <200803061422.m26EMADH007206@bastion.fedora.phx.redhat.com> John Matthews (jmatthews) has requested the watchcommits acl on jython (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:20:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:20:44 +0000 Subject: [pkgdb] jython: jmatthews has requested commit Message-ID: <200803061422.m26EMK0h007304@bastion.fedora.phx.redhat.com> John Matthews (jmatthews) has requested the commit acl on jython (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:21:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:21:01 +0000 Subject: [pkgdb] jython: jmatthews has requested watchbugzilla Message-ID: <200803061422.m26EMDoW007245@bastion.fedora.phx.redhat.com> John Matthews (jmatthews) has requested the watchbugzilla acl on jython (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:20:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:20:46 +0000 Subject: [pkgdb] jython: jmatthews has requested watchcommits Message-ID: <200803061422.m26EMA7X007208@bastion.fedora.phx.redhat.com> John Matthews (jmatthews) has requested the watchcommits acl on jython (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:20:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:20:49 +0000 Subject: [pkgdb] jython: jmatthews has requested commit Message-ID: <200803061422.m26EMK0k007304@bastion.fedora.phx.redhat.com> John Matthews (jmatthews) has requested the commit acl on jython (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:25:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:25:10 +0000 Subject: [pkgdb] jython had acl change status Message-ID: <200803061426.m26EQU5w007549@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has set the watchbugzilla acl on jython (Fedora devel) to Approved for John Matthews (jmatthews) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:25:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:25:11 +0000 Subject: [pkgdb] jython had acl change status Message-ID: <200803061426.m26EQU61007549@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has set the watchcommits acl on jython (Fedora devel) to Approved for John Matthews (jmatthews) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:24:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:24:58 +0000 Subject: [pkgdb] jython had acl change status Message-ID: <200803061426.m26EQYjI007587@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has set the commit acl on jython (Fedora devel) to Approved for John Matthews (jmatthews) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:25:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:25:01 +0000 Subject: [pkgdb] jython had acl change status Message-ID: <200803061426.m26EQYjL007587@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has set the commit acl on jython (Fedora 7) to Approved for John Matthews (jmatthews) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:25:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:25:02 +0000 Subject: [pkgdb] jython had acl change status Message-ID: <200803061426.m26EQYjO007587@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has set the watchcommits acl on jython (Fedora 7) to Approved for John Matthews (jmatthews) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:25:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:25:03 +0000 Subject: [pkgdb] jython had acl change status Message-ID: <200803061426.m26EQdVL007644@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has set the watchbugzilla acl on jython (Fedora 7) to Approved for John Matthews (jmatthews) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:25:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:25:22 +0000 Subject: [pkgdb] jython had acl change status Message-ID: <200803061426.m26EQU64007549@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has set the watchcommits acl on jython (Fedora 8) to Approved for John Matthews (jmatthews) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:25:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:25:07 +0000 Subject: [pkgdb] jython had acl change status Message-ID: <200803061426.m26EQdVO007644@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has set the watchbugzilla acl on jython (Fedora 8) to Approved for John Matthews (jmatthews) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:25:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 14:25:24 +0000 Subject: [pkgdb] jython had acl change status Message-ID: <200803061426.m26EQiwU007701@bastion.fedora.phx.redhat.com> Andrew Overholt (overholt) has set the commit acl on jython (Fedora 8) to Approved for John Matthews (jmatthews) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/jython From fedora-extras-commits at redhat.com Thu Mar 6 14:25:56 2008 From: fedora-extras-commits at redhat.com (Krzysztof Kurzawski (kurzawa)) Date: Thu, 6 Mar 2008 14:25:56 GMT Subject: rpms/dayplanner/devel dayplanner.spec, NONE, 1.1 holiday_japan, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803061425.m26EPuJW031896@cvs-int.fedora.redhat.com> Author: kurzawa Update of /cvs/pkgs/rpms/dayplanner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31868/devel Modified Files: .cvsignore sources Added Files: dayplanner.spec holiday_japan Log Message: import dayplanner 0.8.1 --- NEW FILE dayplanner.spec --- %define include_holidayparser 0 %{?_with_holidayparser: %{expand: %%global include_holidayparser 1}} Name: dayplanner Version: 0.8.1 Release: 3%{?dist} Summary: An easy and clean Day Planner Summary(pl): Prosty i elegancki organizer Group: Applications/Productivity License: GPLv3+ URL: http://www.day-planner.org/ Source0: http://download.gna.org/dayplanner/%{name}-%{version}.tar.bz2 Source1: holiday_japan BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext desktop-file-utils perl Requires: hicolor-icon-theme %description Day Planner is a simple time management program. Day Planner is designed to help you easily manage your time. It can manage appointments, birthdays and more. It makes sure you remember your appointments by popping up a dialog box reminding you about it. %description -l pl Day Planner is a prosty program do zarz??dzania czasem. Day Planner jest zaprojektowany aby pom??c Tobie ??atwo zarz??dza?? Twoim czasem. Mo??e zarz??dza?? spotkaniami, urodzinami i innymi. Mo??esz by?? pewnym ??e b??dziesz pami??ta?? o spotkaniach przez wyskakuj??ce okna dialogowe przypominaj??ce o nich. %prep %setup -q # Desktop file cat > %{name}.desktop << EOF [Desktop Entry] Name=Day Planner GenericName=Day Planner Comment=An easy and clean Day Planner Comment[pl_PL]=Prosty i elegancki organizer Exec=dayplanner Icon=dayplanner Terminal=false Type=Application Categories=Office; GenericName[pl_PL]=Day Planner EOF %build # nothing to build %install rm -rf $RPM_BUILD_ROOT %if include_holidayparser make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} DHPinstall %else make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} %endif # Install hicolor icons for size in 16 24 32 48; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps install -m 644 -p art/%{name}-${size}x${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/%{name}.png done rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png # Install desktop file desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{name}.desktop # Install holiday cp -pf %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/holiday # Chmod find $RPM_BUILD_ROOT%{_datadir}/%{name} -name \*.pm -exec chmod 0644 {} \; # Find the localization %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f dayplanner.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS THANKS TODO ./doc/* %{_bindir}/%{name} %{_bindir}/%{name}-daemon %{_bindir}/%{name}-notifier %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog * Tue Mar 04 2008 Krzysztof Kurzawski - 0.8.1-3 - Correct install section - Fix holiday_japan - Correct BR-s * Mon Mar 03 2008 Krzysztof Kurzawski - 0.8.1-2 - Correct install section - Add holiday_japan * Tue Feb 19 2008 Krzysztof Kurzawski - 0.8.1-1 - First release --- NEW FILE holiday_japan --- : : Japanese holiday file. Copy to ~/.holiday : compiler: Ogura Yoshito : : Last modified: Mar 4, 2008 : by Mamoru Tasaka : : small "New Year's Day" weekend on 1/1 small "Adults Day" weekend on second monday in january small "National Foundation Day" weekend on 2/11 small "Day of Showa" weekend on 4/29 small "Constitution Day" weekend on 5/3 small "Greenery Day" weekend on 5/4 small "Children's Day" weekend on 5/5 small "Oceans' Day" weekend on third monday in july small "Respect for the Aged" weekend on third monday in september small "Physical Culture Day" weekend on second monday in october small "Culture Day" weekend on 11/3 small "Labor Day" weekend on 11/23 small "Emperor's Birthday" weekend on 12/23 : : Notes from Mamoru Tasaka : Japan sets Vernal Equinox Day and Autumnal Equinox Day as : holidays, which change every year! : What days become these holidays is usually announced by NAOJ : (National Astronomy Observatory of Japan) on Febrary 1st : of the year before. To check this, please refer to : http://www.nao.ac.jp/QA/faq/a0301.html : small "Vernal Equinox Day" weekend on 3/20 small "Autumnal Equinox Day" weekend on 9/23 : small "St. Valentine's Day" on february 14 small "Girls' Festival" on march 3 small "Buddha's Birthday" on april 8 small "May Day" on may 1 small "Boys' Festival" on may 5 small "Mother's Day" on second sunday in may small "Father's Day" on third sunday in june small "Festival of the Weaver Star" on july 7 small "Christmas" on december 25 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:03:19 -0000 1.1 +++ .cvsignore 6 Mar 2008 14:25:19 -0000 1.2 @@ -0,0 +1 @@ +dayplanner-0.8.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:03:19 -0000 1.1 +++ sources 6 Mar 2008 14:25:19 -0000 1.2 @@ -0,0 +1 @@ +64d0fe546906fd99482a741cf5dce747 dayplanner-0.8.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 14:27:38 2008 From: fedora-extras-commits at redhat.com (Krzysztof Kurzawski (kurzawa)) Date: Thu, 6 Mar 2008 14:27:38 GMT Subject: rpms/dayplanner/F-7 dayplanner.spec, NONE, 1.1 holiday_japan, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803061427.m26ERcuV032063@cvs-int.fedora.redhat.com> Author: kurzawa Update of /cvs/pkgs/rpms/dayplanner/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32028/F-7 Modified Files: .cvsignore sources Added Files: dayplanner.spec holiday_japan Log Message: import dayplanner 0.8.1 --- NEW FILE dayplanner.spec --- %define include_holidayparser 0 %{?_with_holidayparser: %{expand: %%global include_holidayparser 1}} Name: dayplanner Version: 0.8.1 Release: 3%{?dist} Summary: An easy and clean Day Planner Summary(pl): Prosty i elegancki organizer Group: Applications/Productivity License: GPLv3+ URL: http://www.day-planner.org/ Source0: http://download.gna.org/dayplanner/%{name}-%{version}.tar.bz2 Source1: holiday_japan BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext desktop-file-utils perl Requires: hicolor-icon-theme %description Day Planner is a simple time management program. Day Planner is designed to help you easily manage your time. It can manage appointments, birthdays and more. It makes sure you remember your appointments by popping up a dialog box reminding you about it. %description -l pl Day Planner is a prosty program do zarz??dzania czasem. Day Planner jest zaprojektowany aby pom??c Tobie ??atwo zarz??dza?? Twoim czasem. Mo??e zarz??dza?? spotkaniami, urodzinami i innymi. Mo??esz by?? pewnym ??e b??dziesz pami??ta?? o spotkaniach przez wyskakuj??ce okna dialogowe przypominaj??ce o nich. %prep %setup -q # Desktop file cat > %{name}.desktop << EOF [Desktop Entry] Name=Day Planner GenericName=Day Planner Comment=An easy and clean Day Planner Comment[pl_PL]=Prosty i elegancki organizer Exec=dayplanner Icon=dayplanner Terminal=false Type=Application Categories=Office; GenericName[pl_PL]=Day Planner EOF %build # nothing to build %install rm -rf $RPM_BUILD_ROOT %if include_holidayparser make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} DHPinstall %else make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} %endif # Install hicolor icons for size in 16 24 32 48; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps install -m 644 -p art/%{name}-${size}x${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/%{name}.png done rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png # Install desktop file desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{name}.desktop # Install holiday cp -pf %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/holiday # Chmod find $RPM_BUILD_ROOT%{_datadir}/%{name} -name \*.pm -exec chmod 0644 {} \; # Find the localization %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f dayplanner.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS THANKS TODO ./doc/* %{_bindir}/%{name} %{_bindir}/%{name}-daemon %{_bindir}/%{name}-notifier %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog * Tue Mar 04 2008 Krzysztof Kurzawski - 0.8.1-3 - Correct install section - Fix holiday_japan - Correct BR-s * Mon Mar 03 2008 Krzysztof Kurzawski - 0.8.1-2 - Correct install section - Add holiday_japan * Tue Feb 19 2008 Krzysztof Kurzawski - 0.8.1-1 - First release --- NEW FILE holiday_japan --- : : Japanese holiday file. Copy to ~/.holiday : compiler: Ogura Yoshito : : Last modified: Mar 4, 2008 : by Mamoru Tasaka : : small "New Year's Day" weekend on 1/1 small "Adults Day" weekend on second monday in january small "National Foundation Day" weekend on 2/11 small "Day of Showa" weekend on 4/29 small "Constitution Day" weekend on 5/3 small "Greenery Day" weekend on 5/4 small "Children's Day" weekend on 5/5 small "Oceans' Day" weekend on third monday in july small "Respect for the Aged" weekend on third monday in september small "Physical Culture Day" weekend on second monday in october small "Culture Day" weekend on 11/3 small "Labor Day" weekend on 11/23 small "Emperor's Birthday" weekend on 12/23 : : Notes from Mamoru Tasaka : Japan sets Vernal Equinox Day and Autumnal Equinox Day as : holidays, which change every year! : What days become these holidays is usually announced by NAOJ : (National Astronomy Observatory of Japan) on Febrary 1st : of the year before. To check this, please refer to : http://www.nao.ac.jp/QA/faq/a0301.html : small "Vernal Equinox Day" weekend on 3/20 small "Autumnal Equinox Day" weekend on 9/23 : small "St. Valentine's Day" on february 14 small "Girls' Festival" on march 3 small "Buddha's Birthday" on april 8 small "May Day" on may 1 small "Boys' Festival" on may 5 small "Mother's Day" on second sunday in may small "Father's Day" on third sunday in june small "Festival of the Weaver Star" on july 7 small "Christmas" on december 25 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:03:19 -0000 1.1 +++ .cvsignore 6 Mar 2008 14:27:05 -0000 1.2 @@ -0,0 +1 @@ +dayplanner-0.8.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:03:19 -0000 1.1 +++ sources 6 Mar 2008 14:27:05 -0000 1.2 @@ -0,0 +1 @@ +64d0fe546906fd99482a741cf5dce747 dayplanner-0.8.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 14:29:28 2008 From: fedora-extras-commits at redhat.com (Krzysztof Kurzawski (kurzawa)) Date: Thu, 6 Mar 2008 14:29:28 GMT Subject: rpms/dayplanner/F-8 dayplanner.spec, NONE, 1.1 holiday_japan, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803061429.m26ETSjK032203@cvs-int.fedora.redhat.com> Author: kurzawa Update of /cvs/pkgs/rpms/dayplanner/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32165/F-8 Modified Files: .cvsignore sources Added Files: dayplanner.spec holiday_japan Log Message: import dayplanner 0.8.1 --- NEW FILE dayplanner.spec --- %define include_holidayparser 0 %{?_with_holidayparser: %{expand: %%global include_holidayparser 1}} Name: dayplanner Version: 0.8.1 Release: 3%{?dist} Summary: An easy and clean Day Planner Summary(pl): Prosty i elegancki organizer Group: Applications/Productivity License: GPLv3+ URL: http://www.day-planner.org/ Source0: http://download.gna.org/dayplanner/%{name}-%{version}.tar.bz2 Source1: holiday_japan BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext desktop-file-utils perl Requires: hicolor-icon-theme %description Day Planner is a simple time management program. Day Planner is designed to help you easily manage your time. It can manage appointments, birthdays and more. It makes sure you remember your appointments by popping up a dialog box reminding you about it. %description -l pl Day Planner is a prosty program do zarz??dzania czasem. Day Planner jest zaprojektowany aby pom??c Tobie ??atwo zarz??dza?? Twoim czasem. Mo??e zarz??dza?? spotkaniami, urodzinami i innymi. Mo??esz by?? pewnym ??e b??dziesz pami??ta?? o spotkaniach przez wyskakuj??ce okna dialogowe przypominaj??ce o nich. %prep %setup -q # Desktop file cat > %{name}.desktop << EOF [Desktop Entry] Name=Day Planner GenericName=Day Planner Comment=An easy and clean Day Planner Comment[pl_PL]=Prosty i elegancki organizer Exec=dayplanner Icon=dayplanner Terminal=false Type=Application Categories=Office; GenericName[pl_PL]=Day Planner EOF %build # nothing to build %install rm -rf $RPM_BUILD_ROOT %if include_holidayparser make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} DHPinstall %else make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} %endif # Install hicolor icons for size in 16 24 32 48; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps install -m 644 -p art/%{name}-${size}x${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/%{name}.png done rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png # Install desktop file desktop-file-install --vendor="fedora" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{name}.desktop # Install holiday cp -pf %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/holiday # Chmod find $RPM_BUILD_ROOT%{_datadir}/%{name} -name \*.pm -exec chmod 0644 {} \; # Find the localization %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f dayplanner.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS THANKS TODO ./doc/* %{_bindir}/%{name} %{_bindir}/%{name}-daemon %{_bindir}/%{name}-notifier %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*x*/apps/%{name}.png %changelog * Tue Mar 04 2008 Krzysztof Kurzawski - 0.8.1-3 - Correct install section - Fix holiday_japan - Correct BR-s * Mon Mar 03 2008 Krzysztof Kurzawski - 0.8.1-2 - Correct install section - Add holiday_japan * Tue Feb 19 2008 Krzysztof Kurzawski - 0.8.1-1 - First release --- NEW FILE holiday_japan --- : : Japanese holiday file. Copy to ~/.holiday : compiler: Ogura Yoshito : : Last modified: Mar 4, 2008 : by Mamoru Tasaka : : small "New Year's Day" weekend on 1/1 small "Adults Day" weekend on second monday in january small "National Foundation Day" weekend on 2/11 small "Day of Showa" weekend on 4/29 small "Constitution Day" weekend on 5/3 small "Greenery Day" weekend on 5/4 small "Children's Day" weekend on 5/5 small "Oceans' Day" weekend on third monday in july small "Respect for the Aged" weekend on third monday in september small "Physical Culture Day" weekend on second monday in october small "Culture Day" weekend on 11/3 small "Labor Day" weekend on 11/23 small "Emperor's Birthday" weekend on 12/23 : : Notes from Mamoru Tasaka : Japan sets Vernal Equinox Day and Autumnal Equinox Day as : holidays, which change every year! : What days become these holidays is usually announced by NAOJ : (National Astronomy Observatory of Japan) on Febrary 1st : of the year before. To check this, please refer to : http://www.nao.ac.jp/QA/faq/a0301.html : small "Vernal Equinox Day" weekend on 3/20 small "Autumnal Equinox Day" weekend on 9/23 : small "St. Valentine's Day" on february 14 small "Girls' Festival" on march 3 small "Buddha's Birthday" on april 8 small "May Day" on may 1 small "Boys' Festival" on may 5 small "Mother's Day" on second sunday in may small "Father's Day" on third sunday in june small "Festival of the Weaver Star" on july 7 small "Christmas" on december 25 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2008 17:03:19 -0000 1.1 +++ .cvsignore 6 Mar 2008 14:28:55 -0000 1.2 @@ -0,0 +1 @@ +dayplanner-0.8.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dayplanner/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2008 17:03:19 -0000 1.1 +++ sources 6 Mar 2008 14:28:55 -0000 1.2 @@ -0,0 +1 @@ +64d0fe546906fd99482a741cf5dce747 dayplanner-0.8.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 14:41:35 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Thu, 6 Mar 2008 14:41:35 GMT Subject: rpms/authd/devel authd.spec,1.47,1.48 Message-ID: <200803061441.m26EfZvq032627@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/authd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32590 Modified Files: authd.spec Log Message: corrected Source0 Index: authd.spec =================================================================== RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- authd.spec 6 Mar 2008 13:05:45 -0000 1.47 +++ authd.spec 6 Mar 2008 14:41:00 -0000 1.48 @@ -8,8 +8,7 @@ Obsoletes: pidentd <= 3.2 Provides: pidentd = 3.2 Requires(post): openssl -Source0: https://fedorahosted.org/authd/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz?format=raw -#Source0: %{name}-%{version}.tar.gz +Source0: http://svn.fedorahosted.org/svn/authd/%{name}-%{version}.tar.gz Patch0: authd-1.4.3-gcc4.patch Patch1: authd-1.4.3-disable.patch Patch2: authd-1.4.3-ipv6-mapping.patch @@ -77,6 +76,7 @@ * Thu Mar 6 2008 Roman Rakus - 1.4.3-17 - corrected Source0 - corrected link in URL +- source added to svn on fedorahosted * Wed Mar 5 2008 Roman Rakus - 1.4.3-16 - fixed Source0 From fedora-extras-commits at redhat.com Thu Mar 6 14:44:50 2008 From: fedora-extras-commits at redhat.com (Roman Rakus (rrakus)) Date: Thu, 6 Mar 2008 14:44:50 GMT Subject: rpms/authd/devel authd.spec,1.48,1.49 Message-ID: <200803061444.m26Eiot5032765@cvs-int.fedora.redhat.com> Author: rrakus Update of /cvs/extras/rpms/authd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32729 Modified Files: authd.spec Log Message: corrected Source0 Index: authd.spec =================================================================== RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- authd.spec 6 Mar 2008 14:41:00 -0000 1.48 +++ authd.spec 6 Mar 2008 14:44:17 -0000 1.49 @@ -1,7 +1,7 @@ Summary: A RFC 1413 ident protocol daemon Name: authd Version: 1.4.3 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: https://fedorahosted.org/authd/ @@ -73,7 +73,7 @@ %{_sbindir}/in.authd %changelog -* Thu Mar 6 2008 Roman Rakus - 1.4.3-17 +* Thu Mar 6 2008 Roman Rakus - 1.4.3-18 - corrected Source0 - corrected link in URL - source added to svn on fedorahosted From fedora-extras-commits at redhat.com Thu Mar 6 14:45:59 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 6 Mar 2008 14:45:59 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.2-simplelauch.patch, NONE, 1.1 kdebase-workspace.spec, 1.46, 1.47 Message-ID: <200803061445.m26Ejxge000377@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv345 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.2-simplelauch.patch Log Message: make the simple menu the default kdebase-workspace-4.0.2-simplelauch.patch: --- NEW FILE kdebase-workspace-4.0.2-simplelauch.patch --- diff -up kdebase-workspace-4.0.2/libs/plasma/corona.cpp.menu kdebase-workspace-4.0.2/libs/plasma/corona.cpp --- kdebase-workspace-4.0.2/libs/plasma/corona.cpp.menu 2008-03-06 15:26:34.000000000 +0100 +++ kdebase-workspace-4.0.2/libs/plasma/corona.cpp 2008-03-06 15:28:28.000000000 +0100 @@ -326,7 +326,7 @@ void Corona::loadDefaultSetup() panel->setLocation(Plasma::BottomEdge); // some default applets to get a usable UI - panel->addApplet("launcher"); + panel->addApplet("simplelauncher"); panel->addApplet("tasks"); panel->addApplet("pager"); panel->addApplet("systemtray"); Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- kdebase-workspace.spec 6 Mar 2008 14:05:46 -0000 1.46 +++ kdebase-workspace.spec 6 Mar 2008 14:45:23 -0000 1.47 @@ -17,6 +17,7 @@ Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch Patch3: kdebase-workspace-4.0.2-Gestures.patch Patch4: kdebase-workspace-4.0.2-plasma-konsole.patch +Patch5: kdebase-workspace-4.0.2-simplelauch.patch # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu) # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886 @@ -111,6 +112,7 @@ %patch2 -p1 -b .consolekit %patch3 -p1 -b .gestures %patch4 -p1 -b .plasma-konsole +%patch5 -p1 -b .simplelauch # upstream patches %patch100 -p1 -b .kde#155362 @@ -229,6 +231,7 @@ %changelog * Thu Mar 06 2008 Than Ngo 4.0.2-5 - typo fix +- make the simple menu the default * Tue Mar 04 2008 Than Ngo 4.0.2-4 - disable gestures as default From fedora-extras-commits at redhat.com Thu Mar 6 14:54:13 2008 From: fedora-extras-commits at redhat.com (Sebastian Vahl (fedora)) Date: Thu, 6 Mar 2008 15:54:13 +0100 Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.2-simplelauch.patch, NONE, 1.1 kdebase-workspace.spec, 1.46, 1.47 In-Reply-To: <200803061445.m26Ejxge000377@cvs-int.fedora.redhat.com> References: <200803061445.m26Ejxge000377@cvs-int.fedora.redhat.com> Message-ID: <200803061554.14576.fedora@deadbabylon.de> Am Do 6.M?rz 2008 schrieb Than Ngo: > Author: than > > Update of /cvs/extras/rpms/kdebase-workspace/devel > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv345 > > Modified Files: > kdebase-workspace.spec > Added Files: > kdebase-workspace-4.0.2-simplelauch.patch > Log Message: > make the simple menu the default Could we please discuss this before we make such a fundamental change? Sebastian -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part. URL: From fedora-extras-commits at redhat.com Thu Mar 6 14:55:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 14:55:28 GMT Subject: rpms/perl-IO-Interface/devel perl-IO-Interface.spec,1.7,1.8 Message-ID: <200803061455.m26EtSS8000800@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-Interface/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv743 Modified Files: perl-IO-Interface.spec Log Message: new perl Index: perl-IO-Interface.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Interface/devel/perl-IO-Interface.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-IO-Interface.spec 20 Feb 2008 01:38:22 -0000 1.7 +++ perl-IO-Interface.spec 6 Mar 2008 14:54:48 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-IO-Interface Version: 1.03 -Release: 2%{?dist}.2 +Release: 3%{?dist} Summary: Perl extension for accessing network card configuration information Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.03-3 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.03-2.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 14:55:39 2008 From: fedora-extras-commits at redhat.com (Krzysztof Kurzawski (kurzawa)) Date: Thu, 6 Mar 2008 14:55:39 GMT Subject: rpms/taskcoach/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 taskcoach.spec, 1.3, 1.4 Message-ID: <200803061455.m26EtduS000839@cvs-int.fedora.redhat.com> Author: kurzawa Update of /cvs/pkgs/rpms/taskcoach/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv766 Modified Files: .cvsignore sources taskcoach.spec Log Message: Update to 0.69.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2008 10:33:32 -0000 1.2 +++ .cvsignore 6 Mar 2008 14:55:04 -0000 1.3 @@ -1 +1 @@ -TaskCoach-0.68.0.tar.gz +TaskCoach-0.69.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2008 10:33:32 -0000 1.2 +++ sources 6 Mar 2008 14:55:04 -0000 1.3 @@ -1 +1 @@ -2ae1f1349d6a0df6d8c739abe361c714 TaskCoach-0.68.0.tar.gz +8f6ab0b81ac4e6911946d46d6b711921 TaskCoach-0.69.1.tar.gz Index: taskcoach.spec =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/devel/taskcoach.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- taskcoach.spec 21 Feb 2008 16:11:49 -0000 1.3 +++ taskcoach.spec 6 Mar 2008 14:55:04 -0000 1.4 @@ -2,8 +2,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: taskcoach -Version: 0.68.0 -Release: 7%{?dist} +Version: 0.69.1 +Release: 1%{?dist} Summary: Your friendly task manager Summary(pl): Tw??j przyjazny menad??er zada?? Group: Applications/Productivity @@ -87,6 +87,9 @@ %exclude %{python_sitelib}/buildlib/ %changelog +* Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-1 +- Update to 0.69.1 + * Thu Feb 21 2008 Krzysztof Kurzawski 0.68.0-7 - Correct license From fedora-extras-commits at redhat.com Thu Mar 6 14:56:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 14:56:31 GMT Subject: rpms/perl-Net-Pcap/devel perl-Net-Pcap.spec,1.2,1.3 Message-ID: <200803061456.m26EuVGU000922@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-Pcap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv849 Modified Files: perl-Net-Pcap.spec Log Message: new perl Index: perl-Net-Pcap.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Pcap/devel/perl-Net-Pcap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Net-Pcap.spec 20 Feb 2008 00:22:18 -0000 1.2 +++ perl-Net-Pcap.spec 6 Mar 2008 14:55:57 -0000 1.3 @@ -1,10 +1,10 @@ Name: perl-Net-Pcap Version: 0.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Interface to pcap(3) LBL packet capture library Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Net-Pcap/ Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SAPER/Net-Pcap-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +53,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.14-4 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.14-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 14:58:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 14:58:29 GMT Subject: rpms/perl-Math-Base85/devel perl-Math-Base85.spec,1.2,1.3 Message-ID: <200803061458.m26EwTeO001073@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Math-Base85/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1033 Modified Files: perl-Math-Base85.spec Log Message: new perl Index: perl-Math-Base85.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Base85/devel/perl-Math-Base85.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Math-Base85.spec 28 May 2007 20:39:51 -0000 1.2 +++ perl-Math-Base85.spec 6 Mar 2008 14:57:53 -0000 1.3 @@ -1,10 +1,10 @@ Name: perl-Math-Base85 Version: 0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl extension for base 85 numbers, as referenced by RFC 1924 Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Math-Base85/ Source0: http://search.cpan.org/CPAN/authors/id/T/TM/TMONROE/Math-Base85-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,6 +51,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.2-4 +- rebuild for new perl + * Wed May 23 2007 Sindre Pedersen Bj??rdal - 0.2-3 - Bump release for rebuild * Tue May 22 2007 Sindre Pedersen Bj??rdal - 0.2-2 From fedora-extras-commits at redhat.com Thu Mar 6 14:59:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 14:59:13 GMT Subject: rpms/perl-Net-IPv4Addr/devel perl-Net-IPv4Addr.spec,1.1,1.2 Message-ID: <200803061459.m26ExDJ5001152@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-IPv4Addr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1074 Modified Files: perl-Net-IPv4Addr.spec Log Message: new perl Index: perl-Net-IPv4Addr.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-IPv4Addr/devel/perl-Net-IPv4Addr.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-IPv4Addr.spec 6 May 2007 15:26:12 -0000 1.1 +++ perl-Net-IPv4Addr.spec 6 Mar 2008 14:58:30 -0000 1.2 @@ -1,10 +1,10 @@ Name: perl-Net-IPv4Addr Version: 0.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension for manipulating IPv4 addresses Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Net-IPv4Addr/ Source0: http://search.cpan.org/CPAN/authors/id/F/FR/FRAJULAC/Net-IPv4Addr-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +53,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.10-3 +- rebuild for new perl + * Sat May 05 2007 Sindre Pedersen Bj??rdal - 0.10-2 - Add missing build dependencies - Fix License From fedora-extras-commits at redhat.com Thu Mar 6 15:01:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:01:18 GMT Subject: rpms/perl-Net-Packet/devel perl-Net-Packet.spec,1.1,1.2 Message-ID: <200803061501.m26F1I7W008437@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-Packet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1219 Modified Files: perl-Net-Packet.spec Log Message: new perl Index: perl-Net-Packet.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Packet/devel/perl-Net-Packet.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-Packet.spec 15 Jul 2007 09:56:40 -0000 1.1 +++ perl-Net-Packet.spec 6 Mar 2008 15:00:34 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Net-Packet Version: 3.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A framework to easily send and receive frames from layer 2 to layer 7 Group: Development/Libraries @@ -60,6 +60,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 3.25-3 +- rebuild for new perl + * Mon Jun 04 2007 Sindre Pedersen Bj??rdal - 3.25-2 - Add missing BRs * Sat May 05 2007 Sindre Pedersen Bj??rdal - 3.25-1 From fedora-extras-commits at redhat.com Thu Mar 6 15:03:03 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:03:03 GMT Subject: rpms/perl-Net-SSH/devel perl-Net-SSH.spec,1.13,1.14 Message-ID: <200803061503.m26F33pY008560@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-SSH/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8509 Modified Files: perl-Net-SSH.spec Log Message: new perl Index: perl-Net-SSH.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SSH/devel/perl-Net-SSH.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Net-SSH.spec 18 Apr 2007 15:43:30 -0000 1.13 +++ perl-Net-SSH.spec 6 Mar 2008 15:02:27 -0000 1.14 @@ -1,8 +1,8 @@ Name: perl-Net-SSH Version: 0.08 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl extension for secure shell -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-SSH/ Source0: http://www.cpan.org/authors/id/I/IV/IVAN/Net-SSH-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/Net::SSH.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway 0.08-6 +- rebuild for new perl + * Wed Apr 18 2007 Steven Pritchard 0.08-5 - Reformat to match cpanspec output. - Canonicalize Source0 URL. From fedora-extras-commits at redhat.com Thu Mar 6 15:04:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:04:18 GMT Subject: rpms/perl-String-ShellQuote/devel perl-String-ShellQuote.spec, 1.12, 1.13 Message-ID: <200803061504.m26F4ITF008678@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-String-ShellQuote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8612 Modified Files: perl-String-ShellQuote.spec Log Message: new perl Index: perl-String-ShellQuote.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-String-ShellQuote/devel/perl-String-ShellQuote.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-String-ShellQuote.spec 18 Apr 2007 15:52:58 -0000 1.12 +++ perl-String-ShellQuote.spec 6 Mar 2008 15:03:33 -0000 1.13 @@ -1,8 +1,8 @@ Name: perl-String-ShellQuote Version: 1.03 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl module for quoting strings for passing through the shell -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/String-ShellQuote/ Source0: http://www.cpan.org/authors/id/R/RO/ROSCH/String-ShellQuote-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/String::ShellQuote.3* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.03-5 +- rebuild for new perl + * Wed Apr 18 2007 Steven Pritchard 1.03-4 - Reformat to match cpanspec output. - Use fixperms macro instead of our own chmod incantation. From fedora-extras-commits at redhat.com Thu Mar 6 15:04:46 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 6 Mar 2008 15:04:46 GMT Subject: rpms/gnome-session/devel .cvsignore, 1.50, 1.51 gnome-session.spec, 1.151, 1.152 sources, 1.50, 1.51 gnome-session-enable-sound-by-default.patch, 1.1, NONE Message-ID: <200803061504.m26F4k74008727@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8628 Modified Files: .cvsignore gnome-session.spec sources Removed Files: gnome-session-enable-sound-by-default.patch Log Message: * Thu Mar 06 2008 - Bastien Nocera - 2.21.93-1 - Update to 2.21.93, drop esound dependencies and patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 26 Feb 2008 17:54:57 -0000 1.50 +++ .cvsignore 6 Mar 2008 15:03:53 -0000 1.51 @@ -1 +1 @@ -gnome-session-2.21.92.tar.bz2 +gnome-session-2.21.93.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- gnome-session.spec 26 Feb 2008 17:58:45 -0000 1.151 +++ gnome-session.spec 6 Mar 2008 15:03:53 -0000 1.152 @@ -11,7 +11,7 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.21.92 +Version: 2.21.93 Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.21/%{name}-%{version}.tar.bz2 @@ -39,9 +39,6 @@ Patch1: gnome-session-2.2.2-icons.patch -# Launch "esd" (really pulseaudio) all the time -Patch2: gnome-session-enable-sound-by-default.patch - # too much crashing Patch9: gnome-session-2.13.4-no-crashes.patch @@ -59,8 +56,6 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=475468 Patch22: ice-leaks.patch -BuildRequires: esound-devel >= %{esound_version} -BuildRequires: /usr/bin/esd BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -118,7 +113,7 @@ autoheader autoconf -%configure --enable-esd --with-halt-command=/usr/bin/poweroff --with-reboot-command=/usr/bin/reboot +%configure --with-halt-command=/usr/bin/poweroff --with-reboot-command=/usr/bin/reboot make %{?_smp_mflags} %install @@ -188,6 +183,9 @@ %doc %{_mandir}/man*/* %changelog +* Thu Mar 06 2008 - Bastien Nocera - 2.21.93-1 +- Update to 2.21.93, drop esound dependencies and patches + * Tue Feb 26 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 26 Feb 2008 17:54:57 -0000 1.50 +++ sources 6 Mar 2008 15:03:53 -0000 1.51 @@ -1 +1 @@ -b1d3f82efc633772bfe92a2ddca92168 gnome-session-2.21.92.tar.bz2 +d54c519c87f20130d9b52ffd631840c9 gnome-session-2.21.93.tar.bz2 --- gnome-session-enable-sound-by-default.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 15:06:48 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Thu, 6 Mar 2008 15:06:48 GMT Subject: rpms/gnome-session/devel gnome-session.spec,1.152,1.153 Message-ID: <200803061506.m26F6mG0008809@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8782 Modified Files: gnome-session.spec Log Message: Remove application of removed patch Index: gnome-session.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- gnome-session.spec 6 Mar 2008 15:03:53 -0000 1.152 +++ gnome-session.spec 6 Mar 2008 15:06:13 -0000 1.153 @@ -93,7 +93,6 @@ %setup -q %patch1 -p1 -b .icons -%patch2 -p0 -b .sound %patch9 -p1 -b .no-crashes %patch13 -p1 -b .window-manager %patch20 -p1 -b .timeout From fedora-extras-commits at redhat.com Thu Mar 6 15:07:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:07:55 GMT Subject: rpms/perl-IO-Multiplex/devel .cvsignore, 1.2, 1.3 perl-IO-Multiplex.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803061507.m26F7tp3008906@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-Multiplex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8869 Modified Files: .cvsignore perl-IO-Multiplex.spec sources Log Message: new perl Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Multiplex/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Dec 2005 08:37:49 -0000 1.2 +++ .cvsignore 6 Mar 2008 15:07:21 -0000 1.3 @@ -1 +1 @@ -IO-Multiplex-1.08.tar.gz +IO-Multiplex-1.09.tar.gz Index: perl-IO-Multiplex.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Multiplex/devel/perl-IO-Multiplex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-IO-Multiplex.spec 16 Oct 2007 20:19:46 -0000 1.3 +++ perl-IO-Multiplex.spec 6 Mar 2008 15:07:21 -0000 1.4 @@ -1,16 +1,15 @@ Summary: IO-Multiplex module for perl Name: perl-IO-Multiplex -Version: 1.08 -Release: 5%{?dist}.1 +Version: 1.09 +Release: 1%{?dist} License: Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-Multiplex/ -Source: http://www.cpan.org/authors/id/B/BB/BBB/IO-Multiplex-1.08.tar.gz +Source: http://www.cpan.org/authors/id/B/BB/BBB/IO-Multiplex-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -47,6 +46,10 @@ %{perl_vendorlib}/IO/ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.09-1 +- rebuild for new perl +- 1.09 + * Tue Oct 16 2007 Tom "spot" Callaway - 1.08-5.1 - add BR: perl(ExtUtils::MakeMaker) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Multiplex/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Dec 2005 08:37:49 -0000 1.2 +++ sources 6 Mar 2008 15:07:21 -0000 1.3 @@ -1 +1 @@ -b27e0eb03f85cfd04b3e29953cfd4444 IO-Multiplex-1.08.tar.gz +cf459a39f2964d5ec6c32622759c9e90 IO-Multiplex-1.09.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 15:09:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:09:23 GMT Subject: rpms/perl-Crypt-RSA/devel perl-Crypt-RSA.spec,1.6,1.7 Message-ID: <200803061509.m26F9NJB009010@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-RSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8973 Modified Files: perl-Crypt-RSA.spec Log Message: new perl Index: perl-Crypt-RSA.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-RSA/devel/perl-Crypt-RSA.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Crypt-RSA.spec 12 Aug 2007 12:49:42 -0000 1.6 +++ perl-Crypt-RSA.spec 6 Mar 2008 15:08:47 -0000 1.7 @@ -1,7 +1,7 @@ Summary: RSA public-key cryptosystem Name: perl-Crypt-RSA Version: 1.58 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Crypt-RSA/ @@ -89,6 +89,9 @@ %{_mandir}/man3/crypt-rsa-interoperablity-template.3* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.58-4 +- rebuild for new perl + * Sun Aug 12 2007 Paul Howarth 1.58-3 - Clarify license as GPL v1 or later, or Artistic (same as perl) From fedora-extras-commits at redhat.com Thu Mar 6 15:10:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:10:27 GMT Subject: rpms/perl-Crypt-DH/devel perl-Crypt-DH.spec,1.8,1.9 Message-ID: <200803061510.m26FARPF009116@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-DH/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9062 Modified Files: perl-Crypt-DH.spec Log Message: new perl Index: perl-Crypt-DH.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-DH/devel/perl-Crypt-DH.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Crypt-DH.spec 11 Aug 2007 14:26:32 -0000 1.8 +++ perl-Crypt-DH.spec 6 Mar 2008 15:09:50 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Perl module implementing the Diffie-Hellman key exchange system Name: perl-Crypt-DH Version: 0.06 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Crypt-DH/ @@ -48,6 +48,9 @@ %{_mandir}/man3/Crypt::DH.3pm* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 0.06-8 +- rebuild for new perl + * Sat Aug 11 2007 Paul Howarth 0.06-7 - Clarify license as GPL v1 or later, or Artistic (same as perl) - Add buildreq perl(Test::More) From fedora-extras-commits at redhat.com Thu Mar 6 15:11:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:11:42 GMT Subject: rpms/perl-Crypt-DSA/devel perl-Crypt-DSA.spec,1.7,1.8 Message-ID: <200803061511.m26FBg0B009206@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-DSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9167 Modified Files: perl-Crypt-DSA.spec Log Message: new perl Index: perl-Crypt-DSA.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-DSA/devel/perl-Crypt-DSA.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Crypt-DSA.spec 12 Aug 2007 08:01:20 -0000 1.7 +++ perl-Crypt-DSA.spec 6 Mar 2008 15:11:01 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Perl module for DSA signatures and key generation Name: perl-Crypt-DSA Version: 0.14 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Crypt-DSA/ @@ -53,6 +53,9 @@ %{_mandir}/man3/Crypt::DSA::Util.3pm* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 0.14-6 +- rebuild for new perl + * Sat Aug 11 2007 Paul Howarth 0.14-5 - Clarify license as GPL v1 or later, or Artistic (same as perl) - Add buildreq perl(Test::More) From fedora-extras-commits at redhat.com Thu Mar 6 15:12:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:12:38 GMT Subject: rpms/perl-Math-GMP/devel perl-Math-GMP.spec,1.8,1.9 Message-ID: <200803061512.m26FCcmV009289@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Math-GMP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9255 Modified Files: perl-Math-GMP.spec Log Message: new perl Index: perl-Math-GMP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-GMP/devel/perl-Math-GMP.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Math-GMP.spec 19 Feb 2008 19:09:58 -0000 1.8 +++ perl-Math-GMP.spec 6 Mar 2008 15:12:04 -0000 1.9 @@ -1,7 +1,7 @@ Summary: High speed arbitrary size integer math Name: perl-Math-GMP Version: 2.04 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ Group: Development/Libraries Url: http://search.cpan.org/dist/Math-GMP/ @@ -49,6 +49,9 @@ %{_mandir}/man3/Math::GMP.3pm* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 2.04-8 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 2.04-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 15:15:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:15:11 GMT Subject: rpms/perl-Net-SSH-Perl/devel perl-Net-SSH-Perl.spec,1.6,1.7 Message-ID: <200803061515.m26FFBCQ009465@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-SSH-Perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9414 Modified Files: perl-Net-SSH-Perl.spec Log Message: new perl Index: perl-Net-SSH-Perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SSH-Perl/devel/perl-Net-SSH-Perl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Net-SSH-Perl.spec 13 Aug 2007 11:44:05 -0000 1.6 +++ perl-Net-SSH-Perl.spec 6 Mar 2008 15:14:29 -0000 1.7 @@ -4,7 +4,7 @@ Summary: SSH (Secure Shell) client Name: perl-Net-SSH-Perl Version: 1.30 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Net-SSH-Perl/ @@ -85,6 +85,9 @@ %{_mandir}/man3/Net::SSH::Perl*.3pm* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.30-6 +- rebuild for new perl + * Mon Aug 13 2007 Paul Howarth 1.30-5 - Clarify license as GPL v1 or later, or Artistic (same as perl) - Add buildreq perl(Test::More) From fedora-extras-commits at redhat.com Thu Mar 6 15:15:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:15:59 GMT Subject: rpms/perl-Data-Structure-Util/devel perl-Data-Structure-Util.spec, 1.5, 1.6 Message-ID: <200803061515.m26FFxD3009546@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Data-Structure-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9503 Modified Files: perl-Data-Structure-Util.spec Log Message: new perl Index: perl-Data-Structure-Util.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-Structure-Util/devel/perl-Data-Structure-Util.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Data-Structure-Util.spec 20 Feb 2008 02:52:30 -0000 1.5 +++ perl-Data-Structure-Util.spec 6 Mar 2008 15:15:18 -0000 1.6 @@ -1,8 +1,8 @@ Name: perl-Data-Structure-Util Version: 0.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Change nature of data within a structure -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-Structure-Util/ Source0: http://www.cpan.org/authors/id/F/FO/FOTANGO/Data-Structure-Util-%{version}.tar.gz @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.12-5 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.12-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 15:16:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:16:37 GMT Subject: rpms/perl-IO-Null/devel perl-IO-Null.spec,1.3,1.4 Message-ID: <200803061516.m26FGb38009633@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-Null/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9549 Modified Files: perl-IO-Null.spec Log Message: new perl Index: perl-IO-Null.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Null/devel/perl-IO-Null.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-IO-Null.spec 17 Apr 2007 23:38:13 -0000 1.3 +++ perl-IO-Null.spec 6 Mar 2008 15:16:00 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-IO-Null Version: 1.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Class for null filehandles -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-Null/ Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/IO-Null-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.01-4 +- rebuild for new perl + * Tue Apr 17 2007 Steven Pritchard 1.01-3 - Use fixperms macro instead of our own chmod incantation. - BR ExtUtils::MakeMaker. From fedora-extras-commits at redhat.com Thu Mar 6 15:17:57 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Thu, 6 Mar 2008 15:17:57 GMT Subject: rpms/pyflowtools/devel .cvsignore, 1.3, 1.4 pyflowtools.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200803061517.m26FHvWN009741@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/pyflowtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9699 Modified Files: .cvsignore pyflowtools.spec sources Log Message: pyflowtools-0.3.3-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Nov 2007 23:10:45 -0000 1.3 +++ .cvsignore 6 Mar 2008 15:17:23 -0000 1.4 @@ -1 +1 @@ -pyflowtools-0.3.2.tar.gz +pyflowtools-0.3.3.tar.gz Index: pyflowtools.spec =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/devel/pyflowtools.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- pyflowtools.spec 20 Feb 2008 03:27:00 -0000 1.10 +++ pyflowtools.spec 6 Mar 2008 15:17:23 -0000 1.11 @@ -2,8 +2,8 @@ Summary: An interface to OSU FlowTools Name: pyflowtools -Version: 0.3.2 -Release: 2%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Source0: http://pyflowtools.googlecode.com/files/%{name}-%{version}.tar.gz License: GPL Group: Development/Libraries @@ -38,6 +38,9 @@ %{python_sitelib}/* %changelog +* Wed Mar 5 2008 Paul P. Komkoff Jr - 0.3.3-1 +- short bugfix release + * Tue Feb 19 2008 Fedora Release Engineering - 0.3.2-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Nov 2007 23:10:45 -0000 1.3 +++ sources 6 Mar 2008 15:17:23 -0000 1.4 @@ -1 +1 @@ -8c30e84d2bfacc619a4f80410491f05b pyflowtools-0.3.2.tar.gz +dfa87dbccb40dedd257c1e0c6af9e7e1 pyflowtools-0.3.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 15:19:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:19:00 GMT Subject: rpms/uuid/devel uuid.spec,1.8,1.9 Message-ID: <200803061519.m26FJ0NR009810@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/uuid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9770 Modified Files: uuid.spec Log Message: new perl Index: uuid.spec =================================================================== RCS file: /cvs/pkgs/rpms/uuid/devel/uuid.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- uuid.spec 20 Feb 2008 03:13:04 -0000 1.8 +++ uuid.spec 6 Mar 2008 15:18:26 -0000 1.9 @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -235,6 +235,9 @@ %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.0-4 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.6.0-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 15:20:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 15:20:42 GMT Subject: rpms/perl-ExtUtils-F77/devel perl-ExtUtils-F77.spec,1.1,1.2 Message-ID: <200803061520.m26FKgih009976@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-ExtUtils-F77/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9902 Modified Files: perl-ExtUtils-F77.spec Log Message: new perl Index: perl-ExtUtils-F77.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-ExtUtils-F77/devel/perl-ExtUtils-F77.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-ExtUtils-F77.spec 2 Aug 2007 15:08:43 -0000 1.1 +++ perl-ExtUtils-F77.spec 6 Mar 2008 15:20:02 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-ExtUtils-F77 Version: 1.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple interface to F77 libs -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/ExtUtils-F77/ Source0: http://www.cpan.org/authors/id/K/KG/KGB/ExtUtils-F77-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.16-3 +- rebuild for new perl + * Wed Aug 1 2007 Orion Poplawski 1.16-2 - Add BR: gcc-gfortran From fedora-extras-commits at redhat.com Thu Mar 6 15:23:07 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Thu, 6 Mar 2008 15:23:07 GMT Subject: rpms/sectool/devel .cvsignore, 1.2, 1.3 sectool.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803061523.m26FN7nK010123@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/sectool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10056 Modified Files: .cvsignore sectool.spec sources Log Message: upgrade to the latest upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sectool/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Jan 2008 16:41:00 -0000 1.2 +++ .cvsignore 6 Mar 2008 15:22:31 -0000 1.3 @@ -1 +1 @@ -sectool-0.2.0.tar.bz2 +sectool-0.5.0.tar.bz2 Index: sectool.spec =================================================================== RCS file: /cvs/extras/rpms/sectool/devel/sectool.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sectool.spec 23 Jan 2008 16:41:00 -0000 1.1 +++ sectool.spec 6 Mar 2008 15:22:31 -0000 1.2 @@ -1,6 +1,6 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.2.0 +Version: 0.5.0 Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 @@ -8,7 +8,7 @@ Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch -Requires: python2 gettext +Requires: python2 gettext coreutils BuildRequires: desktop-file-utils gettext intltool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,9 +41,6 @@ make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Red-Hat-Base \ - --add-category Settings \ - --add-category System \ --vendor=fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/sectool.desktop #adjust paths in sectool.conf @@ -52,6 +49,10 @@ sed -i 's,TESTS_DIR=\(.*\),TESTS_DIR=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf sed -i 's,TDATA_DIR=\(.*\),TDATA_DIR=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf +#adjust icons path in guiOutput.py +sed -i 's,__ico_path = \(.*\),__ico_path = "%{_datadir}/pixmaps/sectool/",' $RPM_BUILD_ROOT%{_datadir}/sectool/guiOutput.py + + #this file is just for development rm $RPM_BUILD_ROOT/%{_datadir}/sectool/scheduler/selftest.py @@ -74,6 +75,7 @@ %{_datadir}/sectool/actions.py* %{_datadir}/sectool/__init__.py* %{_datadir}/sectool/output.py* +%{_datadir}/sectool/mailoutput.py* %{_datadir}/sectool/sectool.py* %{_datadir}/sectool/tuierrors.py* %{_mandir}/man8/sectool.8.gz @@ -89,9 +91,19 @@ %{_datadir}/pixmaps/sectool-gui.png %{_datadir}/pixmaps/sectool-min.png %{_datadir}/applications/fedora-sectool.desktop +%{_datadir}/pixmaps/sectool/*.png %changelog +* Wed Mar 05 2008 Peter Vrabec - 0.5.0-1 +- email sending support + +* Wed Mar 05 2008 Peter Vrabec - 0.4.0-1 +- new tests +- bugfixes +- support diff results +- improved GUI + * Wed Jan 23 2008 Peter Vrabec - 0.2.0-1 - stable demo release Index: sources =================================================================== RCS file: /cvs/extras/rpms/sectool/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Jan 2008 16:41:00 -0000 1.2 +++ sources 6 Mar 2008 15:22:31 -0000 1.3 @@ -1 +1 @@ -844b8ede7d02cd42b3fb35ba86e979e2 sectool-0.2.0.tar.bz2 +12b828babc0a11577e6c42a9e956f0a2 sectool-0.5.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 15:31:39 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Thu, 6 Mar 2008 15:31:39 GMT Subject: rpms/elinks/devel .cvsignore, 1.21, 1.22 elinks.spec, 1.51, 1.52 sources, 1.21, 1.22 Message-ID: <200803061531.m26FVdUM010497@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/elinks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10460 Modified Files: .cvsignore elinks.spec sources Log Message: new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 6 Feb 2008 13:50:48 -0000 1.21 +++ .cvsignore 6 Mar 2008 15:31:00 -0000 1.22 @@ -1 +1 @@ -elinks-0.11.4rc0.tar.bz2 +elinks-0.11.4rc1.tar.bz2 Index: elinks.spec =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- elinks.spec 21 Feb 2008 13:28:39 -0000 1.51 +++ elinks.spec 6 Mar 2008 15:31:00 -0000 1.52 @@ -1,11 +1,11 @@ Name: elinks Summary: A text-mode Web browser Version: 0.11.4 -Release: 0.3.rc0%{?dist} +Release: 0.4.rc1%{?dist} License: GPLv2 URL: http://elinks.or.cz Group: Applications/Internet -Source: http://elinks.or.cz/download/elinks-%{version}rc0.tar.bz2 +Source: http://elinks.or.cz/download/elinks-%{version}rc1.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -37,7 +37,7 @@ quickly and swiftly displays Web pages. %prep -%setup -q -n %{name}-%{version}rc0 +%setup -q -n %{name}-%{version}rc1 # Prevent crash when HOME is unset (bug #90663). %patch0 -p1 @@ -88,6 +88,9 @@ %{_mandir}/man5/* %changelog +* Thu Mar 6 2008 Ondrej Vasik 0.11.4-0.4.rc1 +- new upstream release candidate marked stable + * Thu Feb 21 2008 Ondrej Vasik 0.11.4-0.3.rc0 - fixed broken output for gzipped chunked pages(#410801) Index: sources =================================================================== RCS file: /cvs/extras/rpms/elinks/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 6 Feb 2008 13:50:48 -0000 1.21 +++ sources 6 Mar 2008 15:31:00 -0000 1.22 @@ -1 +1 @@ -718137aa45ddb2e7137edb8fb4f646a6 elinks-0.11.4rc0.tar.bz2 +7fc7c36844be9c528c2ef28dbd4c5e6f elinks-0.11.4rc1.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 15:40:53 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Thu, 6 Mar 2008 15:40:53 GMT Subject: rpms/netatalk/devel netatalk-2.0.3-chmod.patch, NONE, 1.1 netatalk-2.0.3-log_stderr.patch, NONE, 1.1 netatalk-2.0.3-maxsrv.patch, NONE, 1.1 netatalk-2.0.3-multiarch.patch, NONE, 1.1 netatalk.spec, 1.43, 1.44 Message-ID: <200803061540.m26FerE8010806@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/netatalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10764 Modified Files: netatalk.spec Added Files: netatalk-2.0.3-chmod.patch netatalk-2.0.3-log_stderr.patch netatalk-2.0.3-maxsrv.patch netatalk-2.0.3-multiarch.patch Log Message: * Thu Mar 06 2008 Martin Nagy - 4:2.0.3-19 - fix chmod o+x (#225085) - increase the maximum number of cnid_dbd processes to 512 (#232805) - papd now writes debugging output to stderr when invoked with -d (#150021) - fix multiarch conflict for netatalk-devel (#342681) netatalk-2.0.3-chmod.patch: --- NEW FILE netatalk-2.0.3-chmod.patch --- diff -up netatalk-2.0.3/etc/afpd/unix.c.chmod netatalk-2.0.3/etc/afpd/unix.c --- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-03-06 09:09:57.000000000 +0100 +++ netatalk-2.0.3/etc/afpd/unix.c 2008-03-06 09:10:43.000000000 +0100 @@ -415,14 +415,14 @@ mode_t mode; struct stat *st; { struct stat sb; -mode_t mask = S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH; +mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO; /* rwx for owner group and other, by default */ if (!st) { if (stat(name, &sb) != 0) return -1; st = &sb; } - mode &= mask; /* keep only rw-rw-rw in mode */ + mode |= st->st_mode & ~mask; /* keep other bits from previous mode */ if ( chmod( name, mode & ~default_options.umask ) < 0 && errno != EPERM ) { return -1; netatalk-2.0.3-log_stderr.patch: --- NEW FILE netatalk-2.0.3-log_stderr.patch --- diff -up netatalk-2.0.3/etc/papd/main.c.log_stderr netatalk-2.0.3/etc/papd/main.c --- netatalk-2.0.3/etc/papd/main.c.log_stderr 2004-06-09 03:25:53.000000000 +0200 +++ netatalk-2.0.3/etc/papd/main.c 2008-03-06 12:14:58.000000000 +0100 @@ -260,7 +260,7 @@ int main( ac, av ) switch (server_lock("papd", pidfile, debug)) { case 0: /* open a couple things again in the child */ - if ((c = open("/", O_RDONLY)) >= 0) { + if (!debug && (c = open("/", O_RDONLY)) >= 0) { dup2(c, 1); dup2(c, 2); } @@ -287,7 +287,8 @@ int main( ac, av ) openlog( p, LOG_PID ); #else /* ultrix */ set_processname(p); - syslog_setup(log_debug, logtype_default, logoption_ndelay|logoption_pid, logfacility_lpr ); + syslog_setup(log_debug, logtype_default, logoption_ndelay | logoption_pid | + debug ? logoption_perror : 0, logfacility_lpr ); #endif /* ultrix */ LOG(log_info, logtype_papd, "restart (%s)", version ); netatalk-2.0.3-maxsrv.patch: --- NEW FILE netatalk-2.0.3-maxsrv.patch --- diff -up netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c --- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-03-06 09:20:52.000000000 +0100 +++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-03-06 09:22:40.000000000 +0100 @@ -93,7 +93,7 @@ static int srvfd; static int rqstfd; -#define MAXSRV 128 +#define MAXSRV 512 #define MAXSPAWN 3 /* Max times respawned in.. */ netatalk-2.0.3-multiarch.patch: --- NEW FILE netatalk-2.0.3-multiarch.patch --- diff -up netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch netatalk-2.0.3/distrib/config/netatalk-config.in --- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-03-06 15:54:27.000000000 +0100 +++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-03-06 15:55:00.000000000 +0100 @@ -218,9 +218,6 @@ fi if test "@includedir@" != /usr/include ; then includes="-I at includedir@" fi -if test "@libdir@" != /usr/lib ; then - libs="-L at libdir@" -fi af_cflags="$af_cflags $includes" af_libs="$libs -latalk" Index: netatalk.spec =================================================================== RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- netatalk.spec 25 Feb 2008 15:46:32 -0000 1.43 +++ netatalk.spec 6 Mar 2008 15:40:16 -0000 1.44 @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -17,6 +17,10 @@ Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch Patch5: netatalk-2.0.3-open_call.patch +Patch6: netatalk-2.0.3-chmod.patch +Patch7: netatalk-2.0.3-maxsrv.patch +Patch8: netatalk-2.0.3-log_stderr.patch +Patch9: netatalk-2.0.3-multiarch.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -50,6 +54,10 @@ %patch3 -p1 -b .extern_ucreator %patch4 -p1 %patch5 -p1 -b .open_call +%patch6 -p1 -b .chmod +%patch7 -p1 -b .maxsrv +%patch8 -p1 -b .log_stderr +%patch9 -p1 -b .multiarch ln -s ./NEWS ChangeLog @@ -190,6 +198,12 @@ %{_mandir}/man*/netatalk-config.1* %changelog +* Thu Mar 06 2008 Martin Nagy - 4:2.0.3-19 +- fix chmod o+x (#225085) +- increase the maximum number of cnid_dbd processes to 512 (#232805) +- papd now writes debugging output to stderr when invoked with -d (#150021) +- fix multiarch conflict for netatalk-devel (#342681) + * Mon Feb 25 2008 Martin Nagy - 4:2.0.3-18 - make init script LSB compliant (#246993) From fedora-extras-commits at redhat.com Thu Mar 6 15:43:35 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 6 Mar 2008 15:43:35 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.52, 1.53 sources, 1.64, 1.65 system-config-services.spec, 1.63, 1.64 Message-ID: <200803061543.m26FhZ9v010932@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10898 Modified Files: .cvsignore sources system-config-services.spec Log Message: update online documentation reload xinetd on changing xinetd services honor xinetd status when displaying xinetd services Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 4 Mar 2008 16:42:14 -0000 1.52 +++ .cvsignore 6 Mar 2008 15:42:58 -0000 1.53 @@ -1 +1 @@ -system-config-services-0.99.6.tar.bz2 +system-config-services-0.99.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 4 Mar 2008 16:42:14 -0000 1.64 +++ sources 6 Mar 2008 15:42:58 -0000 1.65 @@ -1 +1 @@ -cd3bd69703e8c385b5f8907522060c06 system-config-services-0.99.6.tar.bz2 +e6bf82b4ff8b90fd6f6c8078cad52468 system-config-services-0.99.7.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- system-config-services.spec 4 Mar 2008 16:42:14 -0000 1.63 +++ system-config-services.spec 6 Mar 2008 15:42:58 -0000 1.64 @@ -16,7 +16,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.6 +Version: 0.99.7 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -107,6 +107,11 @@ %{_mandir}/*/system-config-services.8* %changelog +* Thu Mar 06 2008 Nils Philippsen - 0.99.7-1 +- update online documentation +- reload xinetd on changing xinetd services +- honor xinetd status when displaying xinetd services + * Tue Mar 04 2008 Nils Philippsen - 0.99.6-1 - use ListStore instead of TreeStore - add some extra padding for fixed width columns in TreeView From fedora-extras-commits at redhat.com Thu Mar 6 15:54:41 2008 From: fedora-extras-commits at redhat.com (Krzysztof Kurzawski (kurzawa)) Date: Thu, 6 Mar 2008 15:54:41 GMT Subject: rpms/taskcoach/F-7 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 taskcoach.spec, 1.2, 1.3 Message-ID: <200803061554.m26FsfpV011386@cvs-int.fedora.redhat.com> Author: kurzawa Update of /cvs/pkgs/rpms/taskcoach/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11351 Modified Files: .cvsignore sources taskcoach.spec Log Message: Update to 0.69.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2008 10:35:35 -0000 1.2 +++ .cvsignore 6 Mar 2008 15:54:04 -0000 1.3 @@ -1 +1 @@ -TaskCoach-0.68.0.tar.gz +TaskCoach-0.69.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2008 10:35:35 -0000 1.2 +++ sources 6 Mar 2008 15:54:04 -0000 1.3 @@ -1 +1 @@ -2ae1f1349d6a0df6d8c739abe361c714 TaskCoach-0.68.0.tar.gz +8f6ab0b81ac4e6911946d46d6b711921 TaskCoach-0.69.1.tar.gz Index: taskcoach.spec =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/F-7/taskcoach.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- taskcoach.spec 21 Feb 2008 16:13:03 -0000 1.2 +++ taskcoach.spec 6 Mar 2008 15:54:04 -0000 1.3 @@ -2,8 +2,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: taskcoach -Version: 0.68.0 -Release: 7%{?dist} +Version: 0.69.1 +Release: 1%{?dist} Summary: Your friendly task manager Summary(pl): Tw??j przyjazny menad??er zada?? Group: Applications/Productivity @@ -87,6 +87,9 @@ %exclude %{python_sitelib}/buildlib/ %changelog +* Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-1 +- Update to 0.69.1 + * Thu Feb 21 2008 Krzysztof Kurzawski 0.68.0-7 - Correct license From fedora-extras-commits at redhat.com Thu Mar 6 16:01:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 16:01:44 +0000 Subject: [pkgdb] totem: firewing has requested commit Message-ID: <200803061603.m26G3KHt011670@bastion.fedora.phx.redhat.com> Stewart Adam (firewing) has requested the commit acl on totem (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/totem From fedora-extras-commits at redhat.com Thu Mar 6 16:02:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 16:02:01 +0000 Subject: [pkgdb] totem: firewing has requested watchcommits Message-ID: <200803061603.m26G3MHY011689@bastion.fedora.phx.redhat.com> Stewart Adam (firewing) has requested the watchcommits acl on totem (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/totem From fedora-extras-commits at redhat.com Thu Mar 6 16:01:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 16:01:49 +0000 Subject: [pkgdb] totem: firewing has requested watchbugzilla Message-ID: <200803061603.m26G3KHw011670@bastion.fedora.phx.redhat.com> Stewart Adam (firewing) has requested the watchbugzilla acl on totem (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/totem From fedora-extras-commits at redhat.com Thu Mar 6 16:01:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 16:01:54 +0000 Subject: [pkgdb] totem: firewing has requested watchbugzilla Message-ID: <200803061603.m26G3KI1011670@bastion.fedora.phx.redhat.com> Stewart Adam (firewing) has requested the watchbugzilla acl on totem (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/totem From fedora-extras-commits at redhat.com Thu Mar 6 16:02:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 16:02:10 +0000 Subject: [pkgdb] totem: firewing has requested watchcommits Message-ID: <200803061603.m26G3MHb011689@bastion.fedora.phx.redhat.com> Stewart Adam (firewing) has requested the watchcommits acl on totem (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/totem From fedora-extras-commits at redhat.com Thu Mar 6 16:02:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 16:02:12 +0000 Subject: [pkgdb] totem: firewing has requested commit Message-ID: <200803061603.m26G3MHe011689@bastion.fedora.phx.redhat.com> Stewart Adam (firewing) has requested the commit acl on totem (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/totem From fedora-extras-commits at redhat.com Thu Mar 6 16:02:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 16:02:16 +0000 Subject: [pkgdb] totem: firewing has requested watchbugzilla Message-ID: <200803061603.m26G3KI4011670@bastion.fedora.phx.redhat.com> Stewart Adam (firewing) has requested the watchbugzilla acl on totem (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/totem From fedora-extras-commits at redhat.com Thu Mar 6 16:02:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 16:02:17 +0000 Subject: [pkgdb] totem: firewing has requested watchcommits Message-ID: <200803061603.m26G3qXV011806@bastion.fedora.phx.redhat.com> Stewart Adam (firewing) has requested the watchcommits acl on totem (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/totem From fedora-extras-commits at redhat.com Thu Mar 6 16:02:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 16:02:33 +0000 Subject: [pkgdb] totem: firewing has requested commit Message-ID: <200803061603.m26G3MHh011689@bastion.fedora.phx.redhat.com> Stewart Adam (firewing) has requested the commit acl on totem (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/totem From fedora-extras-commits at redhat.com Thu Mar 6 16:02:51 2008 From: fedora-extras-commits at redhat.com (Krzysztof Kurzawski (kurzawa)) Date: Thu, 6 Mar 2008 16:02:51 GMT Subject: rpms/taskcoach/devel taskcoach.spec,1.4,1.5 Message-ID: <200803061602.m26G2pWt018937@cvs-int.fedora.redhat.com> Author: kurzawa Update of /cvs/pkgs/rpms/taskcoach/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18911 Modified Files: taskcoach.spec Log Message: Increase release Index: taskcoach.spec =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/devel/taskcoach.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- taskcoach.spec 6 Mar 2008 14:55:04 -0000 1.4 +++ taskcoach.spec 6 Mar 2008 16:02:15 -0000 1.5 @@ -3,7 +3,7 @@ Name: taskcoach Version: 0.69.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Your friendly task manager Summary(pl): Tw??j przyjazny menad??er zada?? Group: Applications/Productivity @@ -87,6 +87,9 @@ %exclude %{python_sitelib}/buildlib/ %changelog +* Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-2 +- Increase release + * Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-1 - Update to 0.69.1 From fedora-extras-commits at redhat.com Thu Mar 6 16:04:56 2008 From: fedora-extras-commits at redhat.com (Krzysztof Kurzawski (kurzawa)) Date: Thu, 6 Mar 2008 16:04:56 GMT Subject: rpms/taskcoach/F-7 taskcoach.spec,1.3,1.4 Message-ID: <200803061604.m26G4uRl019067@cvs-int.fedora.redhat.com> Author: kurzawa Update of /cvs/pkgs/rpms/taskcoach/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19036 Modified Files: taskcoach.spec Log Message: Increase release Index: taskcoach.spec =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/F-7/taskcoach.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- taskcoach.spec 6 Mar 2008 15:54:04 -0000 1.3 +++ taskcoach.spec 6 Mar 2008 16:04:18 -0000 1.4 @@ -3,7 +3,7 @@ Name: taskcoach Version: 0.69.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Your friendly task manager Summary(pl): Tw??j przyjazny menad??er zada?? Group: Applications/Productivity @@ -87,6 +87,9 @@ %exclude %{python_sitelib}/buildlib/ %changelog +* Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-2 +- Increase release + * Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-1 - Update to 0.69.1 From fedora-extras-commits at redhat.com Thu Mar 6 16:12:34 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 6 Mar 2008 16:12:34 GMT Subject: rpms/perl-Sys-Virt/devel .cvsignore, 1.2, 1.3 perl-Sys-Virt.spec, 1.8, 1.9 sources, 1.2, 1.3 Message-ID: <200803061612.m26GCYJn019331@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/perl-Sys-Virt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19262 Modified Files: .cvsignore perl-Sys-Virt.spec sources Log Message: Update to 0.1.2. Drop Sys-Virt-Domain-doc.patch. BR XML::XPath. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sys-Virt/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Aug 2006 18:40:28 -0000 1.2 +++ .cvsignore 6 Mar 2008 16:11:54 -0000 1.3 @@ -1 +1 @@ -Sys-Virt-0.1.1.tar.gz +Sys-Virt-0.1.2.tar.gz Index: perl-Sys-Virt.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sys-Virt/devel/perl-Sys-Virt.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Sys-Virt.spec 20 Feb 2008 03:01:43 -0000 1.8 +++ perl-Sys-Virt.spec 6 Mar 2008 16:11:54 -0000 1.9 @@ -1,27 +1,27 @@ Name: perl-Sys-Virt -Version: 0.1.1 -Release: 10%{?dist} +Version: 0.1.2 +Release: 1%{?dist} Summary: Represent and manage a libvirt hypervisor connection License: GPL Group: Development/Libraries URL: http://search.cpan.org/dist/Sys-Virt/ Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-%{version}.tar.gz -Patch0: Sys-Virt-doc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) +BuildRequires: perl(XML::XPath) BuildRequires: libvirt-devel >= 0.1.1 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=202320 BuildRequires: /usr/bin/pkg-config -%if %{!?fedora:0}%{?fedora} >= 6 -BuildRequires: xen-devel -# libvirt/xen are only available on these: -ExclusiveArch: i386 x86_64 ia64 -%else -# libvirt/xen are only available on these: -ExclusiveArch: i386 x86_64 -%endif +#%if %{!?fedora:0}%{?fedora} >= 6 +#BuildRequires: xen-devel +## libvirt/xen are only available on these: +#ExclusiveArch: i386 x86_64 ia64 +#%else +## libvirt/xen are only available on these: +#ExclusiveArch: i386 x86_64 +#%endif Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -31,7 +31,6 @@ %prep %setup -q -n Sys-Virt-%{version} -%patch -p1 sed -i -e '/Sys-Virt\.spec/d' Makefile.PL sed -i -e '/\.spec\.PL$/d' MANIFEST @@ -66,6 +65,11 @@ %{_mandir}/man3/* %changelog +* Wed Mar 05 2008 Steven Pritchard 0.1.2-1 +- Update to 0.1.2. +- Drop Sys-Virt-Domain-doc.patch. +- BR XML::XPath. + * Tue Feb 19 2008 Fedora Release Engineering - 0.1.1-10 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sys-Virt/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Aug 2006 18:40:28 -0000 1.2 +++ sources 6 Mar 2008 16:11:54 -0000 1.3 @@ -1 +1 @@ -63b776d65213df313685fc93b808b3bf Sys-Virt-0.1.1.tar.gz +9df07b687585672ed699949b45096e9b Sys-Virt-0.1.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 16:23:15 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Thu, 6 Mar 2008 16:23:15 GMT Subject: rpms/kernel/F-8 linux-2.6-ps3_gelic_wireless.patch, NONE, 1.1 kernel.spec, 1.365, 1.366 Message-ID: <200803061623.m26GNFo0019548@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19504 Modified Files: kernel.spec Added Files: linux-2.6-ps3_gelic_wireless.patch Log Message: add ps3_gelic_wireless driver linux-2.6-ps3_gelic_wireless.patch: --- NEW FILE linux-2.6-ps3_gelic_wireless.patch --- commit 4b74850dc3fb8a0941dde0f1bf7686803d1250cd Author: Masakazu Mokuno Date: Fri Feb 22 16:45:26 2008 +0900 PS3: gelic: Link the wireless net_device structure to the corresponding device structure Link the net_device structure of the wireless part to the corresponding device structure. Without this, the sysfs node for this net_device would not have 'device' link. Signed-off-by: Masakazu Mokuno Acked-by: Dan Williams Signed-off-by: John W. Linville commit 09dde54c6a69d4f9ea1213923b93aeae7020f8b6 Author: Masakazu Mokuno Date: Thu Feb 7 19:58:57 2008 +0900 PS3: gelic: Add wireless support for PS3 Signed-off-by: Masakazu Mokuno Acked-by: Dan Williams Acked-by: John W. Linville Signed-off-by: Jeff Garzik commit 589866f9f1cb14273b644993d362ec7845007f94 Author: Masakazu Mokuno Date: Thu Feb 7 19:58:42 2008 +0900 PS3: gelic: Add support for dual network interface Add support for dual network (net_device) interface so that ethernet and wireless can own separate ethX interfaces. V2 - Fix the bug that bringing down and up the interface keeps rx disabled. - Make 'gelic_net_poll_controller()' extern , as David Woodhouse pointed out at the previous submission. - Fix weird usage of member names for the rx descriptor chain V1 - Export functions which are convenient for both interfaces - Move irq allocation/release code to driver probe/remove handlers because interfaces share interrupts. - Allocate skbs by using dev_alloc_skb() instead of netdev_alloc_skb() as the interfaces share the hardware rx queue. - Add gelic_port struct in order to abstract dual interface handling - Change handlers for hardware queues so that they can handle dual {source,destination} interfaces. - Use new NAPI functions This is a prerequisite for the new PS3 wireless support. Signed-off-by: Jeff Garzik commit 01fed4c284def58b8a9ee0b915c3956b93c670b7 Author: Masakazu Mokuno Date: Thu Feb 7 19:58:32 2008 +0900 PS3: gelic: add support for port link status Add support for interrupt driven port link status detection. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit 7bc56b92b025c13f8d3c9b049ed816db464fb0b5 Author: Masakazu Mokuno Date: Thu Feb 7 19:58:20 2008 +0900 PS3: gelic: remove duplicated ethtool handlers Remove some ethtool handlers, which duplicate functionality that was already provided by the common ethtool handlers. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit 59e973277cf942a1eac6d83802d6c9d1f397566b Author: Masakazu Mokuno Date: Thu Feb 7 19:58:08 2008 +0900 PS3: gelic: code cleanup Code cleanup: - Use appropriate prefixes for names instead of fixed 'gelic_net' so that objects of the functions, variables and constants can be estimated. - Remove definitions for IPSec offload to the gelic hardware. This functionality is never supported on PS3. - Group constants with enum. - Use bitwise constants for interrupt status, instead of bit numbers to eliminate shift operations. - Style fixes. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit 100e1d891902e432951e88bffba0dc49005a216c Author: Masakazu Mokuno Date: Thu Feb 7 19:57:54 2008 +0900 PS3: gelic: Add endianness macros Mark the members of the structure for DMA descriptors with proper endian annotations and use the appropriate accessor macros. As the gelic driver works only on PS3, all these macros will be expanded to null. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit b94e1d47684b0bee6088d848e29154697ea4c4bd Author: Masakazu Mokuno Date: Thu Feb 7 19:57:41 2008 +0900 PS3: gelic: Fix the wrong dev_id passed The device id for lv1_net_set_interrupt_status_indicator() is wrong. This path would be invoked only in the case of an initialization failure. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik diff -up linux-2.6.24.noarch/drivers/net/Makefile.orig linux-2.6.24.noarch/drivers/net/Makefile --- linux-2.6.24.noarch/drivers/net/Makefile.orig 2008-03-06 11:12:01.000000000 -0500 +++ linux-2.6.24.noarch/drivers/net/Makefile 2008-03-06 11:13:12.000000000 -0500 @@ -67,7 +67,8 @@ obj-$(CONFIG_BNX2) += bnx2.o spidernet-y += spider_net.o spider_net_ethtool.o obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o obj-$(CONFIG_GELIC_NET) += ps3_gelic.o -ps3_gelic-objs += ps3_gelic_net.o +gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o +ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y) obj-$(CONFIG_TC35815) += tc35815.o obj-$(CONFIG_SKGE) += skge.o obj-$(CONFIG_SKY2) += sky2.o diff -up /dev/null linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c --- /dev/null 2008-03-05 20:34:43.806375470 -0500 +++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c 2008-03-06 11:13:20.000000000 -0500 @@ -0,0 +1,2754 @@ +/* + * PS3 gelic network driver. + * + * Copyright (C) 2007 Sony Computer Entertainment Inc. + * Copyright 2007 Sony Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#undef DEBUG + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "ps3_gelic_net.h" +#include "ps3_gelic_wireless.h" + + +static int gelic_wl_start_scan(struct gelic_wl_info *wl, int always_scan); +static int gelic_wl_try_associate(struct net_device *netdev); + +/* + * tables + */ + +/* 802.11b/g channel to freq in MHz */ +static const int channel_freq[] = { + 2412, 2417, 2422, 2427, 2432, + 2437, 2442, 2447, 2452, 2457, + 2462, 2467, 2472, 2484 +}; [...5353 lines suppressed...] +}; + +enum gelic_eurus_scan_sec_type { + GELIC_EURUS_SCAN_SEC_NONE = 0x0000, + GELIC_EURUS_SCAN_SEC_WEP = 0x0100, + GELIC_EURUS_SCAN_SEC_WPA = 0x0200, + GELIC_EURUS_SCAN_SEC_WPA2 = 0x0400, + GELIC_EURUS_SCAN_SEC_MASK = 0x0f00, +}; + +enum gelic_eurus_scan_sec_wep_type { + GELIC_EURUS_SCAN_SEC_WEP_UNKNOWN = 0x0000, + GELIC_EURUS_SCAN_SEC_WEP_40 = 0x0001, + GELIC_EURUS_SCAN_SEC_WEP_104 = 0x0002, + GELIC_EURUS_SCAN_SEC_WEP_MASK = 0x0003, +}; + +enum gelic_eurus_scan_sec_wpa_type { + GELIC_EURUS_SCAN_SEC_WPA_UNKNOWN = 0x0000, + GELIC_EURUS_SCAN_SEC_WPA_TKIP = 0x0001, + GELIC_EURUS_SCAN_SEC_WPA_AES = 0x0002, + GELIC_EURUS_SCAN_SEC_WPA_MASK = 0x0003, +}; + +/* + * hw BSS information structure returned from GELIC_EURUS_CMD_GET_SCAN + */ +struct gelic_eurus_scan_info { + /* all fields are big endian */ + __be16 size; + __be16 rssi; /* percentage */ + __be16 channel; /* channel number */ + __be16 beacon_period; /* FIXME: in msec unit */ + __be16 capability; + __be16 security; + u8 bssid[8]; /* last ETH_ALEN are valid. bssid[0],[1] are unused */ + u8 essid[32]; /* IW_ESSID_MAX_SIZE */ + u8 rate[16]; /* first MAX_RATES_LENGTH(12) are valid */ + u8 ext_rate[16]; /* first MAX_RATES_EX_LENGTH(16) are valid */ + __be32 reserved1; + __be32 reserved2; + __be32 reserved3; + __be32 reserved4; + u8 elements[0]; /* ie */ +} __attribute__ ((packed)); + +/* the hypervisor returns bbs up to 16 */ +#define GELIC_EURUS_MAX_SCAN (16) +struct gelic_wl_scan_info { + struct list_head list; + struct gelic_eurus_scan_info *hwinfo; + + int valid; /* set 1 if this entry was in latest scanned list + * from Eurus */ + unsigned int eurus_index; /* index in the Eurus list */ + unsigned long last_scanned; /* acquired time */ + + unsigned int rate_len; + unsigned int rate_ext_len; + unsigned int essid_len; +}; + +/* for GELIC_EURUS_CMD_GET_RSSI */ +struct gelic_eurus_rssi_info { + /* big endian */ + __be16 rssi; +} __attribute__ ((packed)); + + +/* for 'stat' member of gelic_wl_info */ +enum gelic_wl_info_status_bit { + GELIC_WL_STAT_CONFIGURED, + GELIC_WL_STAT_CH_INFO, /* ch info aquired */ + GELIC_WL_STAT_ESSID_SET, /* ESSID specified by userspace */ + GELIC_WL_STAT_BSSID_SET, /* BSSID specified by userspace */ + GELIC_WL_STAT_WPA_PSK_SET, /* PMK specified by userspace */ + GELIC_WL_STAT_WPA_LEVEL_SET, /* WEP or WPA[2] selected */ +}; + +/* for 'scan_stat' member of gelic_wl_info */ +enum gelic_wl_scan_state { + /* just initialized or get last scan result failed */ + GELIC_WL_SCAN_STAT_INIT, + /* scan request issued, accepted or chip is scanning */ + GELIC_WL_SCAN_STAT_SCANNING, + /* scan results retrieved */ + GELIC_WL_SCAN_STAT_GOT_LIST, +}; + +/* for 'cipher_method' */ +enum gelic_wl_cipher_method { + GELIC_WL_CIPHER_NONE, + GELIC_WL_CIPHER_WEP, + GELIC_WL_CIPHER_TKIP, + GELIC_WL_CIPHER_AES, +}; + +/* for 'wpa_level' */ +enum gelic_wl_wpa_level { + GELIC_WL_WPA_LEVEL_NONE, + GELIC_WL_WPA_LEVEL_WPA, + GELIC_WL_WPA_LEVEL_WPA2, +}; + +/* for 'assoc_stat' */ +enum gelic_wl_assoc_state { + GELIC_WL_ASSOC_STAT_DISCONN, + GELIC_WL_ASSOC_STAT_ASSOCIATING, + GELIC_WL_ASSOC_STAT_ASSOCIATED, +}; +/* part of private data alloc_etherdev() allocated */ +#define GELIC_WEP_KEYS 4 +struct gelic_wl_info { + /* bss list */ + struct semaphore scan_lock; + struct list_head network_list; + struct list_head network_free_list; + struct gelic_wl_scan_info *networks; + + unsigned long scan_age; /* last scanned time */ + enum gelic_wl_scan_state scan_stat; + struct completion scan_done; + + /* eurus command queue */ + struct workqueue_struct *eurus_cmd_queue; + struct completion cmd_done_intr; + + /* eurus event handling */ + struct workqueue_struct *event_queue; + struct delayed_work event_work; + + /* wl status bits */ + unsigned long stat; + enum gelic_eurus_auth_method auth_method; /* open/shared */ + enum gelic_wl_cipher_method group_cipher_method; + enum gelic_wl_cipher_method pairwise_cipher_method; + enum gelic_wl_wpa_level wpa_level; /* wpa/wpa2 */ + + /* association handling */ + struct semaphore assoc_stat_lock; + struct delayed_work assoc_work; + enum gelic_wl_assoc_state assoc_stat; + struct completion assoc_done; + + spinlock_t lock; + u16 ch_info; /* available channels. bit0 = ch1 */ + /* WEP keys */ + u8 key[GELIC_WEP_KEYS][IW_ENCODING_TOKEN_MAX]; + unsigned long key_enabled; + unsigned int key_len[GELIC_WEP_KEYS]; + unsigned int current_key; + /* WWPA PSK */ + u8 psk[GELIC_WL_EURUS_PSK_MAX_LEN]; + enum gelic_eurus_wpa_psk_type psk_type; + unsigned int psk_len; + + u8 essid[IW_ESSID_MAX_SIZE]; + u8 bssid[ETH_ALEN]; /* userland requested */ + u8 active_bssid[ETH_ALEN]; /* associated bssid */ + unsigned int essid_len; + + /* buffer for hypervisor IO */ + void *buf; + + struct iw_public_data wireless_data; + struct iw_statistics iwstat; +}; + +#define GELIC_WL_BSS_MAX_ENT 32 +#define GELIC_WL_ASSOC_RETRY 50 +static inline struct gelic_port *wl_port(struct gelic_wl_info *wl) +{ + return container_of((void *)wl, struct gelic_port, priv); +} +static inline struct gelic_wl_info *port_wl(struct gelic_port *port) +{ + return port_priv(port); +} + +struct gelic_eurus_cmd { + struct work_struct work; + struct gelic_wl_info *wl; + unsigned int cmd; /* command code */ + u64 tag; + u64 size; + void *buffer; + unsigned int buf_size; + struct completion done; + int status; + u64 cmd_status; +}; + +/* private ioctls to pass PSK */ +#define GELIC_WL_PRIV_SET_PSK (SIOCIWFIRSTPRIV + 0) +#define GELIC_WL_PRIV_GET_PSK (SIOCIWFIRSTPRIV + 1) + +extern int gelic_wl_driver_probe(struct gelic_card *card); +extern int gelic_wl_driver_remove(struct gelic_card *card); +extern void gelic_wl_interrupt(struct net_device *netdev, u64 status); +#endif /* _GELIC_WIRELESS_H */ Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.365 retrieving revision 1.366 diff -u -r1.365 -r1.366 --- kernel.spec 6 Mar 2008 05:18:18 -0000 1.365 +++ kernel.spec 6 Mar 2008 16:22:39 -0000 1.366 @@ -662,6 +662,7 @@ Patch683: linux-2.6-wireless-pending-too.patch Patch690: linux-2.6-at76.patch Patch691: linux-2.6-rndis_wlan.patch +Patch692: linxu-2.6-ps3_gelic_wirelss.patch Patch700: linux-2.6-cfg80211-extras.patch Patch701: linux-2.6-zd1211rw-module-alias.patch Patch720: linux-2.6-e1000-bad-csum-allow.patch @@ -1237,6 +1238,7 @@ # Add misc wireless bits from upstream wireless tree ApplyPatch linux-2.6-at76.patch ApplyPatch linux-2.6-rndis_wlan.patch +ApplyPatch linux-2.6-ps3_gelic_wireless.patch # Restore ability to add/remove virtual i/fs to mac80211 devices ApplyPatch linux-2.6-cfg80211-extras.patch @@ -1915,6 +1917,9 @@ %changelog +* Thu Mar 06 2008 John W. Linville 2.6.24.3-20 +- add ps3_gelic_wirless driver + * Thu Mar 06 2008 Dave Airlie 2.6.24.3-19 - fixup agp/drm patches for F8 kernel From fedora-extras-commits at redhat.com Thu Mar 6 16:28:58 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Thu, 6 Mar 2008 16:28:58 GMT Subject: rpms/kernel/F-8 kernel.spec,1.366,1.367 Message-ID: <200803061628.m26GSwQq019703@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19679 Modified Files: kernel.spec Log Message: correct typo in spec file Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.366 retrieving revision 1.367 diff -u -r1.366 -r1.367 --- kernel.spec 6 Mar 2008 16:22:39 -0000 1.366 +++ kernel.spec 6 Mar 2008 16:28:23 -0000 1.367 @@ -662,7 +662,7 @@ Patch683: linux-2.6-wireless-pending-too.patch Patch690: linux-2.6-at76.patch Patch691: linux-2.6-rndis_wlan.patch -Patch692: linxu-2.6-ps3_gelic_wirelss.patch +Patch692: linux-2.6-ps3_gelic_wireless.patch Patch700: linux-2.6-cfg80211-extras.patch Patch701: linux-2.6-zd1211rw-module-alias.patch Patch720: linux-2.6-e1000-bad-csum-allow.patch @@ -1917,6 +1917,9 @@ %changelog +* Thu Mar 06 2008 John W. Linville 2.6.24.3-21 +- correct patch name typo in spec file + * Thu Mar 06 2008 John W. Linville 2.6.24.3-20 - add ps3_gelic_wirless driver From fedora-extras-commits at redhat.com Thu Mar 6 16:29:58 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Thu, 6 Mar 2008 16:29:58 GMT Subject: rpms/pyflowtools/F-7 .cvsignore, 1.3, 1.4 pyflowtools.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200803061629.m26GTwVi019754@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/pyflowtools/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19709/F-7 Modified Files: .cvsignore pyflowtools.spec sources Log Message: pyflowtools-0.3.3-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-7/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Nov 2007 23:29:25 -0000 1.3 +++ .cvsignore 6 Mar 2008 16:29:21 -0000 1.4 @@ -1 +1 @@ -pyflowtools-0.3.2.tar.gz +pyflowtools-0.3.3.tar.gz Index: pyflowtools.spec =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-7/pyflowtools.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pyflowtools.spec 30 Nov 2007 23:45:22 -0000 1.8 +++ pyflowtools.spec 6 Mar 2008 16:29:21 -0000 1.9 @@ -2,7 +2,7 @@ Summary: An interface to OSU FlowTools Name: pyflowtools -Version: 0.3.2 +Version: 0.3.3 Release: 1%{?dist} Source0: http://pyflowtools.googlecode.com/files/%{name}-%{version}.tar.gz License: GPL @@ -38,6 +38,12 @@ %{python_sitelib}/* %changelog +* Wed Mar 5 2008 Paul P. Komkoff Jr - 0.3.3-1 +- short bugfix release + +* Tue Feb 19 2008 Fedora Release Engineering - 0.3.2-2 +- Autorebuild for GCC 4.3 + * Thu Nov 29 2007 Paul P. Komkoff Jr - 0.3.2-1 - new upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-7/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Nov 2007 23:29:25 -0000 1.3 +++ sources 6 Mar 2008 16:29:21 -0000 1.4 @@ -1 +1 @@ -8c30e84d2bfacc619a4f80410491f05b pyflowtools-0.3.2.tar.gz +dfa87dbccb40dedd257c1e0c6af9e7e1 pyflowtools-0.3.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 16:30:03 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Thu, 6 Mar 2008 16:30:03 GMT Subject: rpms/pyflowtools/F-8 .cvsignore, 1.3, 1.4 pyflowtools.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200803061630.m26GU3J6019762@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/pyflowtools/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19709/F-8 Modified Files: .cvsignore pyflowtools.spec sources Log Message: pyflowtools-0.3.3-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Nov 2007 23:29:30 -0000 1.3 +++ .cvsignore 6 Mar 2008 16:29:28 -0000 1.4 @@ -1 +1 @@ -pyflowtools-0.3.2.tar.gz +pyflowtools-0.3.3.tar.gz Index: pyflowtools.spec =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-8/pyflowtools.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pyflowtools.spec 30 Nov 2007 23:45:28 -0000 1.9 +++ pyflowtools.spec 6 Mar 2008 16:29:28 -0000 1.10 @@ -2,7 +2,7 @@ Summary: An interface to OSU FlowTools Name: pyflowtools -Version: 0.3.2 +Version: 0.3.3 Release: 1%{?dist} Source0: http://pyflowtools.googlecode.com/files/%{name}-%{version}.tar.gz License: GPL @@ -38,6 +38,12 @@ %{python_sitelib}/* %changelog +* Wed Mar 5 2008 Paul P. Komkoff Jr - 0.3.3-1 +- short bugfix release + +* Tue Feb 19 2008 Fedora Release Engineering - 0.3.2-2 +- Autorebuild for GCC 4.3 + * Thu Nov 29 2007 Paul P. Komkoff Jr - 0.3.2-1 - new upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/pyflowtools/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Nov 2007 23:29:30 -0000 1.3 +++ sources 6 Mar 2008 16:29:28 -0000 1.4 @@ -1 +1 @@ -8c30e84d2bfacc619a4f80410491f05b pyflowtools-0.3.2.tar.gz +dfa87dbccb40dedd257c1e0c6af9e7e1 pyflowtools-0.3.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 16:42:50 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 6 Mar 2008 16:42:50 GMT Subject: rpms/telepathy-glib/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 telepathy-glib.spec, 1.8, 1.9 Message-ID: <200803061642.m26GgoJB020183@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/telepathy-glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20147 Modified Files: .cvsignore sources telepathy-glib.spec Log Message: * Thu Mar 6 2008 Brian Pepple - 0.7.4-1 - Update to 0.7.4. - Disable test for now. - Add hack to fix build on ppc64. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Nov 2007 22:47:01 -0000 1.5 +++ .cvsignore 6 Mar 2008 16:42:11 -0000 1.6 @@ -1 +1 @@ -telepathy-glib-0.7.0.tar.gz +telepathy-glib-0.7.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Nov 2007 22:47:01 -0000 1.5 +++ sources 6 Mar 2008 16:42:11 -0000 1.6 @@ -1 +1 @@ -b4cb035a6e235be3179364341843e929 telepathy-glib-0.7.0.tar.gz +1f439c4c0fbd0da2425e58e2380f4306 telepathy-glib-0.7.4.tar.gz Index: telepathy-glib.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- telepathy-glib.spec 9 Feb 2008 00:29:05 -0000 1.8 +++ telepathy-glib.spec 6 Mar 2008 16:42:11 -0000 1.9 @@ -1,6 +1,6 @@ Name: telepathy-glib -Version: 0.7.0 -Release: 2%{?dist} +Version: 0.7.4 +Release: 1%{?dist} Summary: GLib bindings for Telepathy Group: System Environment/Libraries @@ -42,11 +42,14 @@ %check -make check +#make check %build %configure --enable-static=no +%ifarch ppc64 +sed -i 's|" T "|" D "|g' telepathy-glib/Makefile +%endif make %{?_smp_mflags} @@ -81,6 +84,11 @@ %changelog +* Thu Mar 6 2008 Brian Pepple - 0.7.4-1 +- Update to 0.7.4. +- Disable test for now. +- Add hack to fix build on ppc64. + * Fri Feb 8 2008 Brian Pepple - 0.7.0-2 - Rebuild for gcc-4.3. From fedora-extras-commits at redhat.com Thu Mar 6 17:24:48 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Thu, 6 Mar 2008 17:24:48 GMT Subject: comps comps-f9.xml.in,1.291,1.292 Message-ID: <200803061724.m26HOmIN028565@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28502 Modified Files: comps-f9.xml.in Log Message: [tw] moved system-config-firewall into base-x and admin-tools Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.291 retrieving revision 1.292 diff -u -r1.291 -r1.292 --- comps-f9.xml.in 6 Mar 2008 04:36:29 -0000 1.291 +++ comps-f9.xml.in 6 Mar 2008 17:24:17 -0000 1.292 @@ -15,6 +15,7 @@ system-config-keyboard system-config-language system-config-lvm + system-config-firewall system-config-network system-config-rootpassword system-config-soundcard @@ -323,6 +324,7 @@ smolt-firstboot system-config-date system-config-display + system-config-firewall system-config-network system-config-printer system-config-services @@ -3308,7 +3310,6 @@ false true - system-config-firewall system-config-httpd system-config-nfs system-config-printer From fedora-extras-commits at redhat.com Thu Mar 6 17:30:28 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 6 Mar 2008 17:30:28 GMT Subject: rpms/libtelepathy/devel .cvsignore, 1.15, 1.16 libtelepathy.spec, 1.18, 1.19 sources, 1.15, 1.16 Message-ID: <200803061730.m26HUSKT028728@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/libtelepathy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28673 Modified Files: .cvsignore libtelepathy.spec sources Log Message: * Thu Mar 6 2008 Brian Pepple - 0.3.3-1 - Update to 0.3.3. - Bump min requirement for tp-glib-devel. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libtelepathy/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 23 Nov 2007 23:02:58 -0000 1.15 +++ .cvsignore 6 Mar 2008 17:29:54 -0000 1.16 @@ -1 +1 @@ -libtelepathy-0.3.1.tar.gz +libtelepathy-0.3.3.tar.gz Index: libtelepathy.spec =================================================================== RCS file: /cvs/pkgs/rpms/libtelepathy/devel/libtelepathy.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libtelepathy.spec 9 Feb 2008 00:18:15 -0000 1.18 +++ libtelepathy.spec 6 Mar 2008 17:29:54 -0000 1.19 @@ -1,6 +1,6 @@ Name: libtelepathy -Version: 0.3.1 -Release: 3%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: A GLib library to ease writing telepathy clients Group: System Environment/Libraries @@ -11,7 +11,7 @@ BuildRequires: dbus-devel >= 0.93 BuildRequires: dbus-glib-devel >= 0.73 -BuildRequires: telepathy-glib-devel >= 0.7.0 +BuildRequires: telepathy-glib-devel >= 0.7.1 BuildRequires: libxslt BuildRequires: python @@ -26,7 +26,7 @@ Requires: %{name} = %{version}-%{release} Requires: dbus-devel >= 0.93 Requires: dbus-glib-devel >= 0.73 -Requires: telepathy-glib-devel >= 0.7.0 +Requires: telepathy-glib-devel >= 0.7.1 Requires: pkgconfig @@ -74,6 +74,10 @@ %changelog +* Thu Mar 6 2008 Brian Pepple - 0.3.3-1 +- Update to 0.3.3. +- Bump min requirement for tp-glib-devel. + * Fri Feb 8 2008 Brian Pepple - 0.3.1-3 - Rebuild for gcc-4.3. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libtelepathy/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 23 Nov 2007 23:02:58 -0000 1.15 +++ sources 6 Mar 2008 17:29:54 -0000 1.16 @@ -1 +1 @@ -594e9999483cdd5cd913b6ea8cf9b076 libtelepathy-0.3.1.tar.gz +490ca1a0c614d4466394b72d43bf7370 libtelepathy-0.3.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 17:30:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 17:30:51 GMT Subject: rpms/uuid/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 uuid.spec, 1.9, 1.10 Message-ID: <200803061730.m26HUplE028791@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/uuid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28706 Modified Files: .cvsignore sources uuid.spec Log Message: new perl Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/uuid/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Jul 2007 23:05:41 -0000 1.5 +++ .cvsignore 6 Mar 2008 17:30:14 -0000 1.6 @@ -1 +1 @@ -uuid-1.6.0.tar.gz +uuid-1.6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/uuid/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Jul 2007 23:05:41 -0000 1.5 +++ sources 6 Mar 2008 17:30:14 -0000 1.6 @@ -1 +1 @@ -752cae29ed7d7460a6ab770e850bcb5d uuid-1.6.0.tar.gz +18c8875411da07fe4503fdfc2136bf46 uuid-1.6.1.tar.gz Index: uuid.spec =================================================================== RCS file: /cvs/pkgs/rpms/uuid/devel/uuid.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- uuid.spec 6 Mar 2008 15:18:26 -0000 1.9 +++ uuid.spec 6 Mar 2008 17:30:14 -0000 1.10 @@ -1,14 +1,14 @@ Name: uuid -Version: 1.6.0 -Release: 4%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries URL: http://www.ossp.org/pkg/lib/uuid/ Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz -Patch0: ossp-uuid.patch +Patch0: uuid-1.6.1-ossp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: /usr/bin/libtool +BuildRequires: libtool %description OSSP uuid is a ISO-C:1999 application programming interface (API) @@ -61,7 +61,7 @@ %package php Summary: PHP support for Universally Unique Identifier library Group: Development/Libraries -BuildRequires: /usr/bin/phpize +BuildRequires: php-devel Requires: %{_libdir}/php/modules Requires: %{name} = %{version}-%{release} @@ -71,7 +71,7 @@ %package pgsql Summary: PostgreSQL support for Universally Unique Identifier library Group: Development/Libraries -BuildRequires: /usr/bin/pg_config +BuildRequires: postgresql-devel Requires: %{_libdir}/pgsql Requires: %{_datadir}/pgsql Requires: %{name} = %{version}-%{release} @@ -235,6 +235,9 @@ %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-1 +- 1.6.1 + * Thu Mar 6 2008 Tom "spot" Callaway - 1.6.0-4 - rebuild for new perl From fedora-extras-commits at redhat.com Thu Mar 6 17:38:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:38:57 +0000 Subject: [pkgdb] gdm: rstrode has requested watchbugzilla Message-ID: <200803061740.m26HeJ6s015895@bastion.fedora.phx.redhat.com> Ray Strode (rstrode) has requested the watchbugzilla acl on gdm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdm From fedora-extras-commits at redhat.com Thu Mar 6 17:38:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:38:44 +0000 Subject: [pkgdb] gdm: rstrode has requested watchcommits Message-ID: <200803061740.m26HeL8e015914@bastion.fedora.phx.redhat.com> Ray Strode (rstrode) has requested the watchcommits acl on gdm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdm From fedora-extras-commits at redhat.com Thu Mar 6 17:39:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:39:06 +0000 Subject: [pkgdb] gdm: rstrode has requested commit Message-ID: <200803061740.m26HeJ6v015895@bastion.fedora.phx.redhat.com> Ray Strode (rstrode) has requested the commit acl on gdm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdm From fedora-extras-commits at redhat.com Thu Mar 6 17:38:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:38:52 +0000 Subject: [pkgdb] gdm: rstrode has requested approveacls Message-ID: <200803061740.m26HeL8h015914@bastion.fedora.phx.redhat.com> Ray Strode (rstrode) has requested the approveacls acl on gdm (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdm From fedora-extras-commits at redhat.com Thu Mar 6 17:39:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:39:31 +0000 Subject: [pkgdb] gnome-screensaver: rstrode has requested watchbugzilla Message-ID: <200803061740.m26HeJ70015895@bastion.fedora.phx.redhat.com> Ray Strode (rstrode) has requested the watchbugzilla acl on gnome-screensaver (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver From fedora-extras-commits at redhat.com Thu Mar 6 17:39:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:39:33 +0000 Subject: [pkgdb] gnome-screensaver: rstrode has requested commit Message-ID: <200803061740.m26Het6t016007@bastion.fedora.phx.redhat.com> Ray Strode (rstrode) has requested the commit acl on gnome-screensaver (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver From fedora-extras-commits at redhat.com Thu Mar 6 17:39:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:39:17 +0000 Subject: [pkgdb] gnome-screensaver: rstrode has requested watchcommits Message-ID: <200803061740.m26HetH4016004@bastion.fedora.phx.redhat.com> Ray Strode (rstrode) has requested the watchcommits acl on gnome-screensaver (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver From fedora-extras-commits at redhat.com Thu Mar 6 17:39:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:39:18 +0000 Subject: [pkgdb] gnome-screensaver: rstrode has requested approveacls Message-ID: <200803061740.m26HeL8k015914@bastion.fedora.phx.redhat.com> Ray Strode (rstrode) has requested the approveacls acl on gnome-screensaver (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver From fedora-extras-commits at redhat.com Thu Mar 6 17:39:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:39:46 +0000 Subject: [pkgdb] gdm had acl change status Message-ID: <200803061741.m26Het6w016007@bastion.fedora.phx.redhat.com> William Jon McCann (mccann) has set the watchbugzilla acl on gdm (Fedora devel) to Approved for Ray Strode (rstrode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gdm From fedora-extras-commits at redhat.com Thu Mar 6 17:41:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:41:02 +0000 Subject: [pkgdb] gnome-screensaver had acl change status Message-ID: <200803061742.m26HgNWV016168@bastion.fedora.phx.redhat.com> William Jon McCann (mccann) has set the watchcommits acl on gnome-screensaver (Fedora devel) to Approved for Ray Strode (rstrode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver From fedora-extras-commits at redhat.com Thu Mar 6 17:40:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:40:49 +0000 Subject: [pkgdb] gnome-screensaver had acl change status Message-ID: <200803061742.m26HgRqS016187@bastion.fedora.phx.redhat.com> William Jon McCann (mccann) has set the commit acl on gnome-screensaver (Fedora devel) to Approved for Ray Strode (rstrode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver From fedora-extras-commits at redhat.com Thu Mar 6 17:41:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:41:07 +0000 Subject: [pkgdb] gnome-screensaver had acl change status Message-ID: <200803061742.m26HgNWY016168@bastion.fedora.phx.redhat.com> William Jon McCann (mccann) has set the watchbugzilla acl on gnome-screensaver (Fedora devel) to Approved for Ray Strode (rstrode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver From fedora-extras-commits at redhat.com Thu Mar 6 17:41:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Thu, 06 Mar 2008 17:41:03 +0000 Subject: [pkgdb] gnome-screensaver had acl change status Message-ID: <200803061742.m26HgeuD016229@bastion.fedora.phx.redhat.com> William Jon McCann (mccann) has set the approveacls acl on gnome-screensaver (Fedora devel) to Approved for Ray Strode (rstrode) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-screensaver From fedora-extras-commits at redhat.com Thu Mar 6 17:43:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 17:43:59 GMT Subject: rpms/perl-HTTP-BrowserDetect/devel perl-HTTP-BrowserDetect.spec, 1.5, 1.6 Message-ID: <200803061743.m26Hhxlh029120@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTTP-BrowserDetect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29098 Modified Files: perl-HTTP-BrowserDetect.spec Log Message: new perl Index: perl-HTTP-BrowserDetect.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTTP-BrowserDetect/devel/perl-HTTP-BrowserDetect.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-HTTP-BrowserDetect.spec 19 May 2007 00:59:22 -0000 1.5 +++ perl-HTTP-BrowserDetect.spec 6 Mar 2008 17:43:24 -0000 1.6 @@ -1,8 +1,8 @@ Name: perl-HTTP-BrowserDetect Version: 0.99 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Determine the Web browser, version, and platform from an HTTP user agent string -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTTP-BrowserDetect/ Source0: http://www.cpan.org/authors/id/W/WA/WALSHAM/HTTP-BrowserDetect-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 0.99-2 +- rebuild for new perl + * Fri May 18 2007 Steven Pritchard 0.99-1 - Update to 0.99. - Update Source0 URL. From fedora-extras-commits at redhat.com Thu Mar 6 17:49:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 17:49:25 GMT Subject: rpms/perl-POE-Wheel-Null/devel perl-POE-Wheel-Null.spec,1.4,1.5 Message-ID: <200803061749.m26HnPoF029342@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Wheel-Null/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29313 Modified Files: perl-POE-Wheel-Null.spec Log Message: new perl Index: perl-POE-Wheel-Null.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Wheel-Null/devel/perl-POE-Wheel-Null.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-POE-Wheel-Null.spec 10 Jan 2008 06:57:13 -0000 1.4 +++ perl-POE-Wheel-Null.spec 6 Mar 2008 17:48:51 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-POE-Wheel-Null Version: 0.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: POE Wheel that does puts data nowhere, and sends nothing Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway 0.01-4 +- rebuild for new perl + * Thu Jan 10 2008 Ralf Cors??pius 0.01-3 - Update License-tag. - BR perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Thu Mar 6 17:50:59 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 17:50:59 GMT Subject: rpms/uuid/devel uuid-1.6.1-ossp.patch,NONE,1.1 uuid.spec,1.10,1.11 Message-ID: <200803061750.m26Hox1r029427@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/uuid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29397 Modified Files: uuid.spec Added Files: uuid-1.6.1-ossp.patch Log Message: cvs add missing patch uuid-1.6.1-ossp.patch: --- NEW FILE uuid-1.6.1-ossp.patch --- diff -up uuid-1.6.1/uuid-config.in.BAD uuid-1.6.1/uuid-config.in --- uuid-1.6.1/uuid-config.in.BAD 2008-03-06 11:56:13.000000000 -0500 +++ uuid-1.6.1/uuid-config.in 2008-03-06 11:56:25.000000000 -0500 @@ -121,7 +121,7 @@ do output_extra="$output_extra $uuid_ldflags" ;; --libs) - output="$output -luuid" + output="$output -lossp-uuid" output_extra="$output_extra $uuid_libs" ;; * ) diff -up uuid-1.6.1/Makefile.in.BAD uuid-1.6.1/Makefile.in --- uuid-1.6.1/Makefile.in.BAD 2008-03-06 11:10:13.000000000 -0500 +++ uuid-1.6.1/Makefile.in 2008-03-06 11:11:39.000000000 -0500 @@ -62,13 +62,13 @@ PERL = @PERL@ PHP = @PHP@ PG_CONFIG = @PG_CONFIG@ -LIB_NAME = libuuid.la +LIB_NAME = libossp-uuid.la LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo -DCE_NAME = libuuid_dce.la +DCE_NAME = libossp-uuid_dce.la DCE_OBJS = uuid_dce.lo $(LIB_OBJS) -CXX_NAME = libuuid++.la +CXX_NAME = libossp-uuid++.la CXX_OBJS = uuid++.lo $(LIB_OBJS) PRG_NAME = uuid @@ -79,10 +79,10 @@ MAN_NAME = uuid.3 uuid++.3 uuid.1 PERL_NAME = $(S)/perl/blib/lib/OSSP/uuid.pm PERL_OBJS = $(S)/perl/uuid.pm -PHP_NAME = $(S)/php/modules/uuid.so +PHP_NAME = $(S)/php/modules/ossp-uuid.so PHP_OBJS = $(S)/php/uuid.c -PGSQL_NAME = $(S)/pgsql/libuuid.so +PGSQL_NAME = $(S)/pgsql/libossp-uuid.so PGSQL_OBJS = $(S)/pgsql/uuid.c TARGETS = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@ @@ -231,7 +231,7 @@ install: $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/ $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/ - $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ + $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/ - at if [ ".$(WITH_DCE)" = .yes ]; then \ echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \ @@ -241,7 +241,7 @@ install: echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \ $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \ fi - $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ + $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3 - at if [ ".$(WITH_CXX)" = .yes ]; then \ echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \ $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \ @@ -276,7 +276,7 @@ uninstall: - at if [ ".$(WITH_CXX)" = .yes ]; then \ $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \ fi - -$(RM) $(DESTDIR)$(mandir)/man3/uuid.3 + -$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3 - at if [ ".$(WITH_CXX)" = .yes ]; then \ echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \ $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \ @@ -290,7 +290,7 @@ uninstall: echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \ $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \ fi - -$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc + -$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc -$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1 -$(RM) $(DESTDIR)$(bindir)/uuid-config -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE) diff -up uuid-1.6.1/pgsql/Makefile.BAD uuid-1.6.1/pgsql/Makefile --- uuid-1.6.1/pgsql/Makefile.BAD 2008-03-06 11:53:26.000000000 -0500 +++ uuid-1.6.1/pgsql/Makefile 2008-03-06 11:54:14.000000000 -0500 @@ -18,13 +18,13 @@ POSTGRES := $(shell $(PG_CONFIG top_builddir := $(dir $(PGXS))../.. include $(top_builddir)/src/Makefile.global -NAME = uuid +NAME = ossp-uuid OBJS = uuid.o SO_MAJOR_VERSION = 1 SO_MINOR_VERSION = 0 override CPPFLAGS := -I.. $(CPPFLAGS) -SHLIB_LINK := -L../.libs -luuid +SHLIB_LINK := -L../.libs -lossp-uuid SHLIB_LINK += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic") SHLIB_LINK += $(shell test $(shell uname -s) = Darwin && echo "-bundle_loader $(POSTGRES)") rpath := @@ -35,16 +35,16 @@ enable_shared = yes include $(top_builddir)/src/Makefile.shlib uuid.sql: uuid.sql.in - sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' uuid.sql + sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' uuid.sql install: all $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(mkinstalldirs) $(DESTDIR)$(datadir) - $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX) + $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX) $(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql uninstall: - -rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX) + -rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX) -rm -f $(DESTDIR)$(datadir)/uuid.sql clean distclean: clean-lib diff -up uuid-1.6.1/uuid.pc.in.BAD uuid-1.6.1/uuid.pc.in --- uuid-1.6.1/uuid.pc.in.BAD 2008-03-06 11:57:29.000000000 -0500 +++ uuid-1.6.1/uuid.pc.in 2008-03-06 11:57:36.000000000 -0500 @@ -37,6 +37,6 @@ Description: Universally Unique Identifi Version: @UUID_VERSION_RAW@ URL: http://www.ossp.org/pkg/lib/uuid/ Cflags: -I${includedir} -Libs: -L${libdir} -luuid +Libs: -L${libdir} -lossp-uuid Libs.private: @LIBS@ diff -up uuid-1.6.1/perl/Makefile.PL.BAD uuid-1.6.1/perl/Makefile.PL --- uuid-1.6.1/perl/Makefile.PL.BAD 2008-03-06 11:12:05.000000000 -0500 +++ uuid-1.6.1/perl/Makefile.PL 2008-03-06 11:49:25.000000000 -0500 @@ -33,9 +33,9 @@ use Config; use ExtUtils::MakeMaker; # determine source directory -my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } - grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) - or die "no source directory found (where libuuid.la is located)"; +my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d } + grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la")) + or die "no source directory found (where libossp-uuid.la is located)"; # determine extra build options my $compat = 0; @@ -47,7 +47,7 @@ WriteMakefile( VERSION_FROM => 'uuid.pm', ABSTRACT_FROM => 'uuid.pod', PREREQ_PM => {}, - LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], + LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ], DEFINE => '', INC => "-I. -I$srcdir", PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', diff -up uuid-1.6.1/Makefile.PL.BAD uuid-1.6.1/Makefile.PL --- uuid-1.6.1/Makefile.PL.BAD 2008-03-06 11:09:49.000000000 -0500 +++ uuid-1.6.1/Makefile.PL 2008-03-06 11:10:01.000000000 -0500 @@ -44,7 +44,7 @@ ARGS = $ARGS all pure_all: \@if [ ! -d build ]; then mkdir build; fi \@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi - \@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi + \@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi \@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi \@cd perl && \$(MAKE) \$(MFLAGS) \$\@ diff -up uuid-1.6.1/php/config.m4.BAD uuid-1.6.1/php/config.m4 --- uuid-1.6.1/php/config.m4.BAD 2008-03-06 11:54:55.000000000 -0500 +++ uuid-1.6.1/php/config.m4 2008-03-06 11:55:07.000000000 -0500 @@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) PHP_ADD_LIBPATH([..], ) - PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) + PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) PHP_ADD_INCLUDE([..]) PHP_SUBST(UUID_SHARED_LIBADD) diff -up uuid-1.6.1/php/Makefile.local.BAD uuid-1.6.1/php/Makefile.local --- uuid-1.6.1/php/Makefile.local.BAD 2008-03-06 11:54:39.000000000 -0500 +++ uuid-1.6.1/php/Makefile.local 2008-03-06 11:54:49.000000000 -0500 @@ -48,7 +48,7 @@ install: build @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \ echo "installing PHP$$version API into $$extdir"; \ ./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \ - ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \ + ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \ ./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php clean: diff -up uuid-1.6.1/php/uuid.ts.BAD uuid-1.6.1/php/uuid.ts --- uuid-1.6.1/php/uuid.ts.BAD 2008-03-06 11:55:38.000000000 -0500 +++ uuid-1.6.1/php/uuid.ts 2008-03-06 11:56:03.000000000 -0500 @@ -34,9 +34,9 @@ $php_version = $argv[1]; -print "++ loading DSO uuid.so (low-level API)\n"; +print "++ loading DSO ossp-uuid.so (low-level API)\n"; if (!extension_loaded('uuid')) { - dl('modules/uuid.so'); + dl('modules/ossp-uuid.so'); } print "++ loading PHP uuid.php${php_version} (high-level API)\n"; Index: uuid.spec =================================================================== RCS file: /cvs/pkgs/rpms/uuid/devel/uuid.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- uuid.spec 6 Mar 2008 17:30:14 -0000 1.10 +++ uuid.spec 6 Mar 2008 17:50:23 -0000 1.11 @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -235,6 +235,9 @@ %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-2 +- forgot to cvs add patch + * Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-1 - 1.6.1 From fedora-extras-commits at redhat.com Thu Mar 6 17:53:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 17:53:47 GMT Subject: rpms/perl-LDAP/devel perl-LDAP.spec,1.15,1.16 Message-ID: <200803061753.m26HrlAL029557@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-LDAP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29525 Modified Files: perl-LDAP.spec Log Message: new perl Index: perl-LDAP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-LDAP/devel/perl-LDAP.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-LDAP.spec 9 Apr 2007 21:37:47 -0000 1.15 +++ perl-LDAP.spec 6 Mar 2008 17:53:13 -0000 1.16 @@ -1,11 +1,11 @@ Name: perl-LDAP Version: 0.34 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: LDAP Perl module Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/perl-ldap/ Source0: http://www.cpan.org/authors/id/G/GB/GBARR/perl-ldap-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +69,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1:0.34-4 +- rebuild for new perl + * Mon Apr 09 2007 Robin Norwood - 1:0.34-3 - Resolves: bz#226267 - Only filter out the unversioned Provides: perl(Net::LDAP::Filter) to From fedora-extras-commits at redhat.com Thu Mar 6 17:54:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 17:54:54 GMT Subject: rpms/perl-POE-Filter-IRCD/devel perl-POE-Filter-IRCD.spec,1.8,1.9 Message-ID: <200803061754.m26HssKq029648@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Filter-IRCD/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29607 Modified Files: perl-POE-Filter-IRCD.spec Log Message: new perl Index: perl-POE-Filter-IRCD.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Filter-IRCD/devel/perl-POE-Filter-IRCD.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-POE-Filter-IRCD.spec 5 Dec 2006 16:28:06 -0000 1.8 +++ perl-POE-Filter-IRCD.spec 6 Mar 2008 17:54:14 -0000 1.9 @@ -1,10 +1,10 @@ Name: perl-POE-Filter-IRCD Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A POE-based parser for the IRC protocol Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/POE-Filter-IRCD Source0: http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/POE-Filter-IRCD-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -13,7 +13,6 @@ BuildArch: noarch -BuildRequires: perl BuildRequires: perl(POE) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) @@ -61,6 +60,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway 2.2-2 +- rebuild for new perl + * Tue Dec 05 2006 Chris Weyl 2.2-1 - update to 2.2 From fedora-extras-commits at redhat.com Thu Mar 6 17:56:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 17:56:00 GMT Subject: rpms/perl-POE-Filter-Zlib/devel perl-POE-Filter-Zlib.spec,1.6,1.7 Message-ID: <200803061756.m26Hu0qa029725@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Filter-Zlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29687 Modified Files: perl-POE-Filter-Zlib.spec Log Message: new perl Index: perl-POE-Filter-Zlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Filter-Zlib/devel/perl-POE-Filter-Zlib.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-POE-Filter-Zlib.spec 16 Dec 2006 00:56:09 -0000 1.6 +++ perl-POE-Filter-Zlib.spec 6 Mar 2008 17:55:21 -0000 1.7 @@ -1,15 +1,15 @@ Name: perl-POE-Filter-Zlib Version: 1.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: POE filter wrapped around Compress::Zlib # note license definition in Makefile.PL -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/POE-Filter-Zlib/ Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/POE-Filter-Zlib-%{version}.tar.gz -# just to be thurough, see also: +# just to be thorough, see also: Source1: LICENSE.readme BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,6 +63,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway 1.8-2 +- rebuild for new perl + * Fri Dec 15 2006 Chris Weyl 1.8-1 - update to 1.8 From fedora-extras-commits at redhat.com Thu Mar 6 17:57:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 17:57:04 GMT Subject: rpms/perl-Log-Dispatch-Config/devel perl-Log-Dispatch-Config.spec, 1.6, 1.7 Message-ID: <200803061757.m26Hv4gX029847@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Log-Dispatch-Config/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29781 Modified Files: perl-Log-Dispatch-Config.spec Log Message: new perl Index: perl-Log-Dispatch-Config.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Log-Dispatch-Config/devel/perl-Log-Dispatch-Config.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Log-Dispatch-Config.spec 16 Oct 2007 21:34:21 -0000 1.6 +++ perl-Log-Dispatch-Config.spec 6 Mar 2008 17:56:24 -0000 1.7 @@ -2,7 +2,7 @@ Name: perl-Log-Dispatch-Config Version: 1.01 -Release: 2%{?dist}.2 +Release: 3%{?dist} Summary: Log4j for Perl Group: Development/Libraries @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) BuildRequires: perl(Log::Dispatch) >= 2.00, perl(AppConfig) >= 1.52 @@ -58,6 +57,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.01-3 +- rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway 1.01-2.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Thu Mar 6 17:58:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 17:58:15 GMT Subject: rpms/perl-POE-Component-SSLify/devel perl-POE-Component-SSLify.spec, 1.7, 1.8 Message-ID: <200803061758.m26HwF5D029953@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-SSLify/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29901 Modified Files: perl-POE-Component-SSLify.spec Log Message: new perl Index: perl-POE-Component-SSLify.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-SSLify/devel/perl-POE-Component-SSLify.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-POE-Component-SSLify.spec 2 Jun 2007 07:07:52 -0000 1.7 +++ perl-POE-Component-SSLify.spec 6 Mar 2008 17:57:41 -0000 1.8 @@ -1,8 +1,8 @@ Name: perl-POE-Component-SSLify Version: 0.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Makes using SSL in the world of POE easy! -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/POE-Component-SSLify/ Source0: http://www.cpan.org/authors/id/A/AP/APOCAL/POE-Component-SSLify-%{version}.tar.gz @@ -55,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway 0.08-2 +- rebuild for new perl + * Fri Jun 01 2007 Chris Weyl 0.08-1 - update to 0.08 From fedora-extras-commits at redhat.com Thu Mar 6 17:58:44 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Marcelin_Beno=C3=AEt?= (sereinit)) Date: Thu, 6 Mar 2008 17:58:44 GMT Subject: rpms/cairo-clock/devel .cvsignore, 1.2, 1.3 cairo-clock.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803061758.m26Hwiq2030008@cvs-int.fedora.redhat.com> Author: sereinit Update of /cvs/pkgs/rpms/cairo-clock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29933 Modified Files: .cvsignore cairo-clock.spec sources Log Message: Update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cairo-clock/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Feb 2008 10:06:10 -0000 1.2 +++ .cvsignore 6 Mar 2008 17:58:11 -0000 1.3 @@ -1 +1 @@ -cairo-clock_0.3.3-1.tar.gz +cairo-clock-0.3.4.tar.gz Index: cairo-clock.spec =================================================================== RCS file: /cvs/pkgs/rpms/cairo-clock/devel/cairo-clock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cairo-clock.spec 12 Feb 2008 10:06:10 -0000 1.1 +++ cairo-clock.spec 6 Mar 2008 17:58:11 -0000 1.2 @@ -1,18 +1,16 @@ Summary: Cairo-rendered on-screen clock Name: cairo-clock -Version: 0.3.3 -Release: 3%{?dist} +Version: 0.3.4 +Release: 1%{?dist} URL: http://macslow.thepimp.net/?page_id=23 -Source0: http://macslow.thepimp.net/projects/%{name}/%{name}_%{version}-1.tar.gz +Source0: http://macslow.thepimp.net/projects/%{name}/%{name}-%{version}.tar.gz License: GPLv2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Requires: perl-XML-Parser BuildRequires: gettext BuildRequires: perl-XML-Parser BuildRequires: desktop-file-utils -BuildRequires: libglade2-devel BuildRequires: librsvg2-devel %description @@ -55,14 +53,18 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Thu Feb 04 2008 Beno??t Marcelin 0.3.4-1 +- Update to 0.3.4 +- Clean BuildRequires and changelog * Thu Dec 19 2007 Beno??t Marcelin 0.3.3-3 - Clean version need on BuildRequire -- use %{__make} INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT +- Clean Require +- use %%{__make} INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT - drop INSTALL doc file - change vendor Fedora to fedora * Sun Dec 09 2007 Beno??t Marcelin 0.3.3-2 - Correct the url, vendor -- use make install instead of %makeinstall +- use make install instead of %%makeinstall - add a upstream for sources - clean BuildRequires and Requires * Thu Oct 04 2007 Beno??t Marcelin 0.3.3-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cairo-clock/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Feb 2008 10:06:10 -0000 1.2 +++ sources 6 Mar 2008 17:58:11 -0000 1.3 @@ -1 +1 @@ -2517b92e8ceea3dbb7df5d6c24d3d215 cairo-clock_0.3.3-1.tar.gz +78e5b3aa3492aa6c182eaacae63a7c03 cairo-clock-0.3.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 17:59:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 17:59:40 GMT Subject: rpms/perl-POE-Component-Server-SimpleHTTP/devel perl-POE-Component-Server-SimpleHTTP.spec, 1.6, 1.7 Message-ID: <200803061759.m26HxeCV030082@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-Server-SimpleHTTP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30014 Modified Files: perl-POE-Component-Server-SimpleHTTP.spec Log Message: new perl Index: perl-POE-Component-Server-SimpleHTTP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-SimpleHTTP/devel/perl-POE-Component-Server-SimpleHTTP.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-POE-Component-Server-SimpleHTTP.spec 21 Apr 2007 22:27:34 -0000 1.6 +++ perl-POE-Component-Server-SimpleHTTP.spec 6 Mar 2008 17:59:00 -0000 1.7 @@ -1,8 +1,8 @@ Name: perl-POE-Component-Server-SimpleHTTP Version: 1.23 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serve HTTP requests in POE -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/POE-Component-Server-SimpleHTTP/ #Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/POE-Component-Server-SimpleHTTP-1.23.tar.gz @@ -76,6 +76,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway 1.23-3 +- rebuild for new perl + * Sat Apr 21 2007 Chris Weyl 1.23-2 - additional testing BR From fedora-extras-commits at redhat.com Thu Mar 6 18:00:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:00:43 GMT Subject: rpms/perl-POE-Component-Server-HTTP/devel perl-POE-Component-Server-HTTP.spec, 1.4, 1.5 Message-ID: <200803061800.m26I0hpG030241@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-Server-HTTP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30130 Modified Files: perl-POE-Component-Server-HTTP.spec Log Message: new perl Index: perl-POE-Component-Server-HTTP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-HTTP/devel/perl-POE-Component-Server-HTTP.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-POE-Component-Server-HTTP.spec 10 Jan 2008 05:10:01 -0000 1.4 +++ perl-POE-Component-Server-HTTP.spec 6 Mar 2008 18:00:00 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-POE-Component-Server-HTTP Version: 0.09 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Foundation of a POE HTTP Daemon License: GPL+ or Artistic Group: Development/Libraries @@ -73,6 +73,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 0.09-5 +- rebuild for new perl + * Thu Jan 10 2008 Ralf Cors??pius 0.09-4 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Thu Mar 6 18:03:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:03:40 GMT Subject: rpms/perl-Net-SNMP/devel perl-Net-SNMP.spec,1.2,1.3 Message-ID: <200803061803.m26I3ebJ005091@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-SNMP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5059 Modified Files: perl-Net-SNMP.spec Log Message: new perl Index: perl-Net-SNMP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SNMP/devel/perl-Net-SNMP.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Net-SNMP.spec 17 Oct 2007 01:58:30 -0000 1.2 +++ perl-Net-SNMP.spec 6 Mar 2008 18:03:04 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Net-SNMP Version: 5.2.0 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Object oriented interface to SNMP Group: Development/Libraries @@ -73,6 +73,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 5.2.0-2 +- rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 5.2.0-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Thu Mar 6 18:07:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:07:35 GMT Subject: rpms/net-snmp/devel net-snmp.spec,1.143,1.144 Message-ID: <200803061807.m26I7Zms005216@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/net-snmp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5180 Modified Files: net-snmp.spec Log Message: new perl Index: net-snmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- net-snmp.spec 21 Feb 2008 14:54:19 -0000 1.143 +++ net-snmp.spec 6 Mar 2008 18:07:00 -0000 1.144 @@ -7,10 +7,10 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: %{major_ver} -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 -License: BSD and CMU +License: BSD and MIT Group: System Environment/Daemons URL: http://net-snmp.sourceforge.net/ Source0: http://dl.sourceforge.net/net-snmp/net-snmp-%{major_ver}.tar.gz @@ -384,6 +384,9 @@ %{_libdir}/lib*.so.* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 5.4.1-12 +- rebuild for new perl + * Thu Feb 21 2008 Jan Safranek 5.4.1-11 - add openssl-devel to the list of netsnmp-devel deps From fedora-extras-commits at redhat.com Thu Mar 6 18:08:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:08:44 GMT Subject: rpms/perl-Class-MakeMethods/devel perl-Class-MakeMethods.spec, 1.5, 1.6 Message-ID: <200803061808.m26I8inT005299@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-MakeMethods/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5268 Modified Files: perl-Class-MakeMethods.spec Log Message: new perl Index: perl-Class-MakeMethods.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-MakeMethods/devel/perl-Class-MakeMethods.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-MakeMethods.spec 15 Oct 2007 19:21:46 -0000 1.5 +++ perl-Class-MakeMethods.spec 6 Mar 2008 18:08:08 -0000 1.6 @@ -2,7 +2,7 @@ Name: perl-Class-MakeMethods Version: 1.01 -Release: 2%{?dist}.2 +Release: 3%{?dist} Summary: Generate common types of methods Group: Development/Libraries @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -79,6 +78,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.01-3 +- rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway 1.01-2.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Thu Mar 6 18:09:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:09:47 GMT Subject: rpms/perl-Class-Base/devel perl-Class-Base.spec,1.2,1.3 Message-ID: <200803061809.m26I9lNl005374@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5345 Modified Files: perl-Class-Base.spec Log Message: new perl Index: perl-Class-Base.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Base/devel/perl-Class-Base.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Base.spec 16 May 2007 23:44:35 -0000 1.2 +++ perl-Class-Base.spec 6 Mar 2008 18:09:07 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Class-Base Version: 0.03 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Useful base class for deriving other modules -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-Base/ Source0: http://www.cpan.org/authors/id/A/AB/ABW/Class-Base-%{version}.tar.gz @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 0.03-3 +- rebuild for new perl + * Wed May 16 2007 Chris Weyl 0.03-2 - bump From fedora-extras-commits at redhat.com Thu Mar 6 18:14:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:14:36 GMT Subject: rpms/perl-Text-TabularDisplay/devel perl-Text-TabularDisplay.spec, 1.2, 1.3 Message-ID: <200803061814.m26IEaL8005573@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-TabularDisplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5545 Modified Files: perl-Text-TabularDisplay.spec Log Message: new perl Index: perl-Text-TabularDisplay.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-TabularDisplay/devel/perl-Text-TabularDisplay.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Text-TabularDisplay.spec 16 May 2007 23:36:23 -0000 1.2 +++ perl-Text-TabularDisplay.spec 6 Mar 2008 18:13:55 -0000 1.3 @@ -1,9 +1,9 @@ Name: perl-Text-TabularDisplay Version: 1.22 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Display text in formatted table output # see TabularDisplay.pm's header -License: GPL +License: GPLv2 Group: Development/Libraries URL: http://search.cpan.org/dist/Text-TabularDisplay/ Source0: http://www.cpan.org/authors/id/D/DA/DARREN/Text-TabularDisplay-%{version}.tar.gz @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.22-4 +- rebuild for new perl + * Wed May 16 2007 Chris Weyl 1.22-3 - bump From fedora-extras-commits at redhat.com Thu Mar 6 18:15:33 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Marcelin_Beno=C3=AEt?= (sereinit)) Date: Thu, 6 Mar 2008 18:15:33 GMT Subject: rpms/cairo-clock/F-7 cairo-clock.spec,1.1,1.2 Message-ID: <200803061815.m26IFXhe005639@cvs-int.fedora.redhat.com> Author: sereinit Update of /cvs/pkgs/rpms/cairo-clock/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5615 Modified Files: cairo-clock.spec Log Message: Update to 0.3.4 Index: cairo-clock.spec =================================================================== RCS file: /cvs/pkgs/rpms/cairo-clock/F-7/cairo-clock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cairo-clock.spec 12 Feb 2008 10:14:18 -0000 1.1 +++ cairo-clock.spec 6 Mar 2008 18:14:57 -0000 1.2 @@ -1,18 +1,16 @@ Summary: Cairo-rendered on-screen clock Name: cairo-clock -Version: 0.3.3 -Release: 3%{?dist} +Version: 0.3.4 +Release: 1%{?dist} URL: http://macslow.thepimp.net/?page_id=23 -Source0: http://macslow.thepimp.net/projects/%{name}/%{name}_%{version}-1.tar.gz +Source0: http://macslow.thepimp.net/projects/%{name}/%{name}-%{version}.tar.gz License: GPLv2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Requires: perl-XML-Parser BuildRequires: gettext BuildRequires: perl-XML-Parser BuildRequires: desktop-file-utils -BuildRequires: libglade2-devel BuildRequires: librsvg2-devel %description @@ -55,14 +53,18 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Thu Feb 04 2008 Beno??t Marcelin 0.3.4-1 +- Update to 0.3.4 +- Clean BuildRequires and changelog * Thu Dec 19 2007 Beno??t Marcelin 0.3.3-3 - Clean version need on BuildRequire -- use %{__make} INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT +- Clean Require +- use %%{__make} INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT - drop INSTALL doc file - change vendor Fedora to fedora * Sun Dec 09 2007 Beno??t Marcelin 0.3.3-2 - Correct the url, vendor -- use make install instead of %makeinstall +- use make install instead of %%makeinstall - add a upstream for sources - clean BuildRequires and Requires * Thu Oct 04 2007 Beno??t Marcelin 0.3.3-1 From fedora-extras-commits at redhat.com Thu Mar 6 18:17:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:17:38 GMT Subject: rpms/perl-Text-RecordParser/devel perl-Text-RecordParser.spec, 1.2, 1.3 Message-ID: <200803061817.m26IHcxb005749@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-RecordParser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5720 Modified Files: perl-Text-RecordParser.spec Log Message: new perl Index: perl-Text-RecordParser.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-RecordParser/devel/perl-Text-RecordParser.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Text-RecordParser.spec 16 May 2007 23:41:06 -0000 1.2 +++ perl-Text-RecordParser.spec 6 Mar 2008 18:17:04 -0000 1.3 @@ -1,11 +1,11 @@ Name: perl-Text-RecordParser -Version: v1.2.1 -Release: 3%{?dist} +Version: 1.2.1 +Release: 4%{?dist} Summary: Read record-oriented files -License: GPL +License: GPLv2 Group: Development/Libraries URL: http://search.cpan.org/dist/Text-RecordParser/ -Source0: http://www.cpan.org/authors/id/K/KC/KCLARK/Text-RecordParser-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/K/KC/KCLARK/Text-RecordParser-v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -38,7 +38,7 @@ can then use many methods to get at the data as arrays or hashes. %prep -%setup -q -n Text-RecordParser-%{version} +%setup -q -n Text-RecordParser-v%{version} perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t @@ -68,6 +68,9 @@ %{_mandir}/man[13]/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway 1.2.1-4 +- rebuild for new perl + * Wed May 16 2007 Chris Weyl v1.2.1-3 - bump From fedora-extras-commits at redhat.com Thu Mar 6 18:18:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:18:47 GMT Subject: rpms/perl-Log-Log4perl/devel perl-Log-Log4perl.spec,1.17,1.18 Message-ID: <200803061818.m26IIlog005864@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Log-Log4perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5802 Modified Files: perl-Log-Log4perl.spec Log Message: new perl Index: perl-Log-Log4perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Log-Log4perl.spec 17 Oct 2007 16:57:17 -0000 1.17 +++ perl-Log-Log4perl.spec 6 Mar 2008 18:18:08 -0000 1.18 @@ -1,6 +1,6 @@ Name: perl-Log-Log4perl Version: 1.13 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Log4j implementation for Perl Group: Development/Libraries @@ -67,6 +67,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.13-2 +- rebuild for new perl + * Wed Oct 17 2007 Tom "spot" Callaway - 1.13-1.1 - disable tests From fedora-extras-commits at redhat.com Thu Mar 6 18:21:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:21:49 GMT Subject: rpms/net-snmp/devel net-snmp.spec,1.144,1.145 Message-ID: <200803061821.m26ILn8Q005991@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/net-snmp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5961 Modified Files: net-snmp.spec Log Message: BR: ExtUtils::Embed Index: net-snmp.spec =================================================================== RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- net-snmp.spec 6 Mar 2008 18:07:00 -0000 1.144 +++ net-snmp.spec 6 Mar 2008 18:21:16 -0000 1.145 @@ -7,7 +7,7 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: %{major_ver} -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 License: BSD and MIT @@ -49,7 +49,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bzip2-devel, elfutils-devel BuildRequires: libselinux-devel, elfutils-libelf-devel, rpm-devel -BuildRequires: perl-devel, gawk, procps +BuildRequires: perl-devel, perl(ExtUtils::Embed), gawk, procps %ifnarch s390 s390x BuildRequires: lm_sensors-devel %endif @@ -384,6 +384,9 @@ %{_libdir}/lib*.so.* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 5.4.1-13 +- BR: perl(ExtUtils::Embed) + * Thu Mar 6 2008 Tom "spot" Callaway 5.4.1-12 - rebuild for new perl From fedora-extras-commits at redhat.com Thu Mar 6 18:25:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:25:05 GMT Subject: rpms/perl-SVN-Simple/devel perl-SVN-Simple.spec,1.3,1.4 Message-ID: <200803061825.m26IP5dp006118@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SVN-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6083 Modified Files: perl-SVN-Simple.spec Log Message: new perl Index: perl-SVN-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SVN-Simple/devel/perl-SVN-Simple.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-SVN-Simple.spec 16 Aug 2007 19:13:38 -0000 1.3 +++ perl-SVN-Simple.spec 6 Mar 2008 18:24:24 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-SVN-Simple Version: 0.27 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A simple interface for writing a delta editor -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/SVN-Simple/ Source0: http://www.cpan.org/modules/by-module/SVN/SVN-Simple-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.27-6 +- rebuild for new perl + * Thu Aug 16 2007 Ian Burrell - 0.27-5 - Fix BuildRequires From fedora-extras-commits at redhat.com Thu Mar 6 18:25:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:25:55 GMT Subject: rpms/perl-Config-Record/devel perl-Config-Record.spec,1.9,1.10 Message-ID: <200803061825.m26IPtcc006194@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Config-Record/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6158 Modified Files: perl-Config-Record.spec Log Message: new perl Index: perl-Config-Record.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Record/devel/perl-Config-Record.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Config-Record.spec 15 Oct 2007 20:18:09 -0000 1.9 +++ perl-Config-Record.spec 6 Mar 2008 18:25:19 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Config-Record Version: 1.1.1 -Release: 3%{?dist}.2 +Release: 4%{?dist} Summary: Perl module for Configuration file access Group: Development/Libraries @@ -52,6 +52,9 @@ %{_mandir}/man3/*.3pm* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.1.1-4 +- rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway 1.1.1-3.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Thu Mar 6 18:27:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:27:33 GMT Subject: rpms/perl-SVK/devel perl-SVK.spec,1.9,1.10 Message-ID: <200803061827.m26IRXOZ006289@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SVK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6262 Modified Files: perl-SVK.spec Log Message: new perl Index: perl-SVK.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SVK/devel/perl-SVK.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-SVK.spec 16 Aug 2007 19:26:19 -0000 1.9 +++ perl-SVK.spec 6 Mar 2008 18:26:54 -0000 1.10 @@ -1,8 +1,8 @@ Name: perl-SVK Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Distributed Version Control System -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/SVK/ Source0: http://www.cpan.org/modules/by-authors/id/C/CL/CLKAO/SVK-v%{version}.tar.gz @@ -98,6 +98,9 @@ %{_bindir}/svk %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 2.0.2-2 +- rebuild for new perl + * Thu Aug 16 2007 Ian Burrell - 2.0.2-1 - Update to 2.0.2 - Fix BuildRequires From fedora-extras-commits at redhat.com Thu Mar 6 18:29:08 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Marcelin_Beno=C3=AEt?= (sereinit)) Date: Thu, 6 Mar 2008 18:29:08 GMT Subject: rpms/cairo-clock/F-7 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200803061829.m26IT8XZ006388@cvs-int.fedora.redhat.com> Author: sereinit Update of /cvs/pkgs/rpms/cairo-clock/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6357 Modified Files: .cvsignore sources Log Message: Update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cairo-clock/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Feb 2008 10:14:18 -0000 1.2 +++ .cvsignore 6 Mar 2008 18:28:32 -0000 1.3 @@ -1 +1 @@ -cairo-clock_0.3.3-1.tar.gz +cairo-clock-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cairo-clock/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Feb 2008 10:14:18 -0000 1.2 +++ sources 6 Mar 2008 18:28:32 -0000 1.3 @@ -1 +1 @@ -2517b92e8ceea3dbb7df5d6c24d3d215 cairo-clock_0.3.3-1.tar.gz +78e5b3aa3492aa6c182eaacae63a7c03 cairo-clock-0.3.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 18:30:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:30:19 GMT Subject: rpms/perl-Class-Inner/devel perl-Class-Inner.spec,1.1,1.2 Message-ID: <200803061830.m26IUJIM006462@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Inner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6414 Modified Files: perl-Class-Inner.spec Log Message: new perl Index: perl-Class-Inner.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inner/devel/perl-Class-Inner.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-Inner.spec 21 Dec 2007 11:39:51 -0000 1.1 +++ perl-Class-Inner.spec 6 Mar 2008 18:29:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-Inner Version: 0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A perlish implementation of Java like inner classes Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.1-5 +- rebuild for new perl + * Thu Dec 20 2007 Xavier Bachelot - 0.1-4 - Remove unneeded comment. - Import into Fedora. From fedora-extras-commits at redhat.com Thu Mar 6 18:31:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:31:39 GMT Subject: rpms/perl-Text-CharWidth/devel perl-Text-CharWidth.spec,1.4,1.5 Message-ID: <200803061831.m26IVdUo006664@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-CharWidth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6523 Modified Files: perl-Text-CharWidth.spec Log Message: new perl Index: perl-Text-CharWidth.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CharWidth/devel/perl-Text-CharWidth.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Text-CharWidth.spec 18 Feb 2008 19:41:13 -0000 1.4 +++ perl-Text-CharWidth.spec 6 Mar 2008 18:30:57 -0000 1.5 @@ -1,13 +1,12 @@ Summary: Get number of occupied columns of a string on terminal Name: perl-Text-CharWidth Version: 0.04 -Release: 3%{?dist}.2 +Release: 4%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-CharWidth/ Source0: http://search.cpan.org/CPAN/authors/id/K/KU/KUBOTA/Text-CharWidth-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Simple) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -46,6 +45,9 @@ %{_mandir}/man3/Text::CharWidth.3pm* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.04-4 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.04-3.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 18:32:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:32:33 GMT Subject: rpms/perl-Class-Factory/devel perl-Class-Factory.spec,1.2,1.3 Message-ID: <200803061832.m26IWX1n006745@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Factory/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6707 Modified Files: perl-Class-Factory.spec Log Message: new perl Index: perl-Class-Factory.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Factory/devel/perl-Class-Factory.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Factory.spec 19 Mar 2007 15:18:15 -0000 1.2 +++ perl-Class-Factory.spec 6 Mar 2008 18:31:54 -0000 1.3 @@ -1,15 +1,15 @@ Name: perl-Class-Factory Version: 1.05 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Base class for dynamic factory classes # see lib/Class/Factory.pm -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-Factory/ Source0: http://www.cpan.org/authors/id/P/PH/PHRED/Class-Factory-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl, perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.05-3 +- rebuild for new perl + * Mon Mar 19 2007 Chris Weyl 1.05-2 - bump From fedora-extras-commits at redhat.com Thu Mar 6 18:34:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:34:12 GMT Subject: rpms/perl-DBD-Mock/devel perl-DBD-Mock.spec,1.4,1.5 Message-ID: <200803061834.m26IYCAU006859@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBD-Mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6825 Modified Files: perl-DBD-Mock.spec Log Message: new perl Index: perl-DBD-Mock.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Mock/devel/perl-DBD-Mock.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DBD-Mock.spec 24 Oct 2007 03:50:05 -0000 1.4 +++ perl-DBD-Mock.spec 6 Mar 2008 18:33:38 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-DBD-Mock Version: 1.36 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mock database driver for testing License: GPL+ or Artistic Group: Development/Libraries @@ -63,6 +63,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.36-2 +- rebuild for new perl + * Tue Oct 23 2007 Chris Weyl 1.36-1 - update to 1.36 - license tag: GPL -> GPL+ From fedora-extras-commits at redhat.com Thu Mar 6 18:34:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:34:55 GMT Subject: rpms/perl-Class-Observable/devel perl-Class-Observable.spec, 1.2, 1.3 Message-ID: <200803061834.m26IYt18006932@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Observable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6897 Modified Files: perl-Class-Observable.spec Log Message: new perl Index: perl-Class-Observable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Observable/devel/perl-Class-Observable.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Observable.spec 27 Jan 2008 21:18:23 -0000 1.2 +++ perl-Class-Observable.spec 6 Mar 2008 18:34:21 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Class-Observable Version: 1.04 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Allow other classes and objects to respond to events in yours License: GPL+ or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.04-4 +- rebuild for new perl + * Sun Jan 27 2008 Andreas Thienemann 1.04-3 - Added Test::More to the BuildReqs From fedora-extras-commits at redhat.com Thu Mar 6 18:35:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:35:53 GMT Subject: rpms/perl-Math-BaseCnv/devel perl-Math-BaseCnv.spec,1.1,1.2 Message-ID: <200803061835.m26IZrNd007001@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Math-BaseCnv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6972 Modified Files: perl-Math-BaseCnv.spec Log Message: new perl Index: perl-Math-BaseCnv.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-BaseCnv/devel/perl-Math-BaseCnv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Math-BaseCnv.spec 25 Dec 2007 16:49:01 -0000 1.1 +++ perl-Math-BaseCnv.spec 6 Mar 2008 18:35:19 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Math-BaseCnv Version: 1.4.75O6Pbr -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast functions to CoNVert between number Bases Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.4.7506Pbr-3 +- rebuild for new perl + * Fri Dec 21 2007 Xavier Bachelot - 1.4.75O6Pbr-2 - Clean up spec. * Thu Aug 30 2007 Xavier Bachelot - 1.4.75O6Pbr-1 From fedora-extras-commits at redhat.com Thu Mar 6 18:36:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:36:51 GMT Subject: rpms/perl-XML-Tidy/devel perl-XML-Tidy.spec,1.1,1.2 Message-ID: <200803061836.m26Iapb1007089@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Tidy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7045 Modified Files: perl-XML-Tidy.spec Log Message: new perl Index: perl-XML-Tidy.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Tidy/devel/perl-XML-Tidy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-XML-Tidy.spec 28 Dec 2007 22:00:39 -0000 1.1 +++ perl-XML-Tidy.spec 6 Mar 2008 18:36:13 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-XML-Tidy Version: 1.2.54HJnFa -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tidy indenting of XML documents Group: Development/Libraries @@ -62,6 +62,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.2.54HJnFa-4 +- rebuild for new perl + * Wed Dec 26 2007 Xavier Bachelot - 1.2.54HJnFa-3 - Add missing BR:. From fedora-extras-commits at redhat.com Thu Mar 6 18:40:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:40:02 GMT Subject: rpms/perl-Gtk2-GladeXML/devel perl-Gtk2-GladeXML.spec,1.5,1.6 Message-ID: <200803061840.m26Ie2h6007280@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-GladeXML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7231 Modified Files: perl-Gtk2-GladeXML.spec Log Message: new perl Index: perl-Gtk2-GladeXML.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-GladeXML/devel/perl-Gtk2-GladeXML.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Gtk2-GladeXML.spec 18 Feb 2008 23:20:20 -0000 1.5 +++ perl-Gtk2-GladeXML.spec 6 Mar 2008 18:39:28 -0000 1.6 @@ -1,10 +1,10 @@ Name: perl-Gtk2-GladeXML Version: 1.006 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Create user interfaces directly from Glade XML files Group: Development/Libraries -License: GPL +License: GPLv2+ URL: http://search.cpan.org/dist/Gtk2-GladeXML/ Source0: http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gtk2-GladeXML-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,6 +66,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.006-4 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 1.006-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 18:40:44 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 6 Mar 2008 18:40:44 GMT Subject: rpms/sbcl/devel .cvsignore, 1.35, 1.36 sbcl.spec, 1.83, 1.84 sources, 1.36, 1.37 Message-ID: <200803061840.m26IeiW8007357@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318 Modified Files: .cvsignore sbcl.spec sources Log Message: * Fri Feb 29 2008 Rex Dieter - 1.0.15-1 - sbcl-1.0.15 - %check: skip run-tests, hangs on room.test.sh Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 28 Jan 2008 14:05:03 -0000 1.35 +++ .cvsignore 6 Mar 2008 18:40:09 -0000 1.36 @@ -1,5 +1 @@ -sbcl-1.0.5-x86-64-linux-binary.tar.bz2 -sbcl-1.0.5-x86-linux-binary.tar.bz2 -sbcl-1.0.12-source.tar.bz2 -sbcl-1.0.13-source.tar.bz2 -sbcl-1.0.14-source.tar.bz2 +sbcl-1.0.15-source.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- sbcl.spec 19 Feb 2008 21:29:25 -0000 1.83 +++ sbcl.spec 6 Mar 2008 18:40:09 -0000 1.84 @@ -12,8 +12,8 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 1.0.14 -Release: 2%{?dist} +Version: 1.0.15 +Release: 1%{?dist} License: BSD Group: Development/Languages @@ -128,7 +128,7 @@ %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" # setup local bootstrap %if "%{?sbcl_bootstrap_src}" != "%{nil}" @@ -164,37 +164,40 @@ # santity check, essential contrib modules get built/included? CONTRIBS="sb-posix sb-bsd-sockets" for CONTRIB in $CONTRIBS ; do - if [ ! -d $RPM_BUILD_ROOT%{_libdir}/sbcl/$CONTRIB ]; then + if [ ! -d %{buildroot}%{_libdir}/sbcl/$CONTRIB ]; then echo "WARNING: ${CONTRIB} awol!" ERROR=1 fi done +# omit for now, sbcl-1.0.14+ hangs on room.test.sh +%if 0 pushd tests # Only x86 builds are expected to pass all # Don't worry about thread.impure failure(s), threading is optional anyway. %{?setarch} %{?sbcl_shell} ./run-tests.sh ||: popd +%endif exit $ERROR %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}} +mkdir -p %{buildroot}{%{_bindir},%{_libdir},%{_mandir}} unset SBCL_HOME -export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} -export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} +export INSTALL_ROOT=%{buildroot}%{_prefix} +export LIB_DIR=%{buildroot}%{_libdir} %{?sbcl_shell} ./install.sh ## Unpackaged files -rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl -rm -f $RPM_BUILD_ROOT%{_infodir}/dir +rm -rf %{buildroot}%{_docdir}/sbcl +rm -f %{buildroot}%{_infodir}/dir # CVS crud -find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf -find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f +find %{buildroot} -name CVS -type d | xargs rm -rf +find %{buildroot} -name .cvsignore | xargs rm -f # 'test-passed' files from %%check -find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -vf +find %{buildroot} -name 'test-passed' | xargs rm -vf %if "%{?min_bootstrap}" == "%{nil}" @@ -230,10 +233,14 @@ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %changelog +* Fri Feb 29 2008 Rex Dieter - 1.0.15-1 +- sbcl-1.0.15 +- %%check: skip run-tests, hangs on room.test.sh + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.14-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sbcl/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 28 Jan 2008 14:05:03 -0000 1.36 +++ sources 6 Mar 2008 18:40:09 -0000 1.37 @@ -1 +1 @@ -07fd7e865fb6052a82e1efc3f4b9899e sbcl-1.0.14-source.tar.bz2 +d3d95ae10684a3cfc59e427ec533ee68 sbcl-1.0.15-source.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 18:41:57 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:41:57 GMT Subject: rpms/perl-Gnome2-Canvas/devel perl-Gnome2-Canvas.spec,1.5,1.6 Message-ID: <200803061841.m26Ifvbi007458@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gnome2-Canvas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7418 Modified Files: perl-Gnome2-Canvas.spec Log Message: new perl Index: perl-Gnome2-Canvas.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gnome2-Canvas/devel/perl-Gnome2-Canvas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Gnome2-Canvas.spec 18 Feb 2008 23:16:40 -0000 1.5 +++ perl-Gnome2-Canvas.spec 6 Mar 2008 18:41:24 -0000 1.6 @@ -1,10 +1,10 @@ Name: perl-Gnome2-Canvas Version: 1.002 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An engine for structured graphics in Gnome2 Group: Development/Libraries -License: GPL +License: GPLv2+ URL: http://search.cpan.org/dist/Gnome2-Canvas/ Source0: http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Canvas-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,6 +63,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.002-9 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 1.002-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 18:43:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:43:28 GMT Subject: rpms/perl-Apache-LogRegex/devel perl-Apache-LogRegex.spec,1.5,1.6 Message-ID: <200803061843.m26IhScX007557@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Apache-LogRegex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7520 Modified Files: perl-Apache-LogRegex.spec Log Message: new perl Index: perl-Apache-LogRegex.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Apache-LogRegex/devel/perl-Apache-LogRegex.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Apache-LogRegex.spec 11 Dec 2007 15:09:00 -0000 1.5 +++ perl-Apache-LogRegex.spec 6 Mar 2008 18:42:51 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Apache-LogRegex Version: 1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parse a line from an Apache logfile into a hash License: GPL+ or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 1.4-4 +- rebuild for new perl + * Tue Dec 11 2007 Steven Pritchard 1.4-3 - Update License tag. - BR Test::More. From fedora-extras-commits at redhat.com Thu Mar 6 18:44:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:44:28 GMT Subject: rpms/perl-Imager/devel perl-Imager.spec,1.15,1.16 Message-ID: <200803061844.m26IiSR9007636@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Imager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7600 Modified Files: perl-Imager.spec Log Message: new perl Index: perl-Imager.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Imager/devel/perl-Imager.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Imager.spec 20 Feb 2008 02:59:05 -0000 1.15 +++ perl-Imager.spec 6 Mar 2008 18:43:50 -0000 1.16 @@ -1,6 +1,6 @@ Name: perl-Imager Version: 0.62 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension for Generating 24 bit Images License: GPL+ or Artistic Group: Development/Libraries @@ -73,6 +73,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.62-3 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.62-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 18:45:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:45:53 GMT Subject: rpms/Sprog/devel Sprog.spec,1.8,1.9 Message-ID: <200803061845.m26IjrAI007730@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/Sprog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7702 Modified Files: Sprog.spec Log Message: new perl Index: Sprog.spec =================================================================== RCS file: /cvs/pkgs/rpms/Sprog/devel/Sprog.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Sprog.spec 9 Oct 2006 08:48:35 -0000 1.8 +++ Sprog.spec 6 Mar 2008 18:45:20 -0000 1.9 @@ -1,10 +1,10 @@ Name: Sprog Version: 0.14 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A graphical tool to build programs by plugging parts together Group: Applications/System -License: GPL or Artistic +License: GPL+ or Artistic URL: http://sprog.sourceforge.net/ Source0: http://osdn.dl.sourceforge.net/sprog/Sprog-%{version}.tar.gz Source1: gnome-run.png @@ -78,6 +78,9 @@ %{_datadir}/applications/fedora-Sprog.desktop %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.14-13 +- rebuild for new perl + * Mon Oct 09 2006 Gavin Henry - 0.14-12 - Rebuild for FC6 From fedora-extras-commits at redhat.com Thu Mar 6 18:46:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:46:42 GMT Subject: rpms/perl-File-Tail/devel perl-File-Tail.spec,1.12,1.13 Message-ID: <200803061846.m26Ikg2F007800@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-Tail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7769 Modified Files: perl-File-Tail.spec Log Message: new perl Index: perl-File-Tail.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Tail/devel/perl-File-Tail.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-File-Tail.spec 15 Oct 2007 20:38:46 -0000 1.12 +++ perl-File-Tail.spec 6 Mar 2008 18:46:07 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-File-Tail Version: 0.99.3 -Release: 5%{?dist}.1 +Release: 6%{?dist} Summary: Perl extension for reading from continously updated files Group: Development/Libraries @@ -52,6 +52,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.99.3-6 +- rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway - 0.99.3-5.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Thu Mar 6 18:49:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Marcelin_Beno=C3=AEt?= (sereinit)) Date: Thu, 6 Mar 2008 18:49:03 GMT Subject: rpms/cairo-clock/F-8 .cvsignore, 1.2, 1.3 cairo-clock.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803061849.m26In384007919@cvs-int.fedora.redhat.com> Author: sereinit Update of /cvs/pkgs/rpms/cairo-clock/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7882 Modified Files: .cvsignore cairo-clock.spec sources Log Message: Update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cairo-clock/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Feb 2008 10:18:29 -0000 1.2 +++ .cvsignore 6 Mar 2008 18:48:25 -0000 1.3 @@ -1 +1 @@ -cairo-clock_0.3.3-1.tar.gz +cairo-clock-0.3.4.tar.gz Index: cairo-clock.spec =================================================================== RCS file: /cvs/pkgs/rpms/cairo-clock/F-8/cairo-clock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cairo-clock.spec 12 Feb 2008 10:18:29 -0000 1.1 +++ cairo-clock.spec 6 Mar 2008 18:48:25 -0000 1.2 @@ -1,18 +1,16 @@ Summary: Cairo-rendered on-screen clock Name: cairo-clock -Version: 0.3.3 -Release: 3%{?dist} +Version: 0.3.4 +Release: 1%{?dist} URL: http://macslow.thepimp.net/?page_id=23 -Source0: http://macslow.thepimp.net/projects/%{name}/%{name}_%{version}-1.tar.gz +Source0: http://macslow.thepimp.net/projects/%{name}/%{name}-%{version}.tar.gz License: GPLv2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Requires: perl-XML-Parser BuildRequires: gettext BuildRequires: perl-XML-Parser BuildRequires: desktop-file-utils -BuildRequires: libglade2-devel BuildRequires: librsvg2-devel %description @@ -55,14 +53,18 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Thu Feb 04 2008 Beno??t Marcelin 0.3.4-1 +- Update to 0.3.4 +- Clean BuildRequires and changelog * Thu Dec 19 2007 Beno??t Marcelin 0.3.3-3 - Clean version need on BuildRequire -- use %{__make} INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT +- Clean Require +- use %%{__make} INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT - drop INSTALL doc file - change vendor Fedora to fedora * Sun Dec 09 2007 Beno??t Marcelin 0.3.3-2 - Correct the url, vendor -- use make install instead of %makeinstall +- use make install instead of %%makeinstall - add a upstream for sources - clean BuildRequires and Requires * Thu Oct 04 2007 Beno??t Marcelin 0.3.3-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cairo-clock/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Feb 2008 10:18:29 -0000 1.2 +++ sources 6 Mar 2008 18:48:25 -0000 1.3 @@ -1 +1 @@ -2517b92e8ceea3dbb7df5d6c24d3d215 cairo-clock_0.3.3-1.tar.gz +78e5b3aa3492aa6c182eaacae63a7c03 cairo-clock-0.3.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 18:55:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:55:02 GMT Subject: rpms/perl-PerlIO-via-symlink/devel perl-PerlIO-via-symlink.spec, 1.2, 1.3 Message-ID: <200803061855.m26It2pT008116@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-PerlIO-via-symlink/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8079 Modified Files: perl-PerlIO-via-symlink.spec Log Message: new perl Index: perl-PerlIO-via-symlink.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PerlIO-via-symlink/devel/perl-PerlIO-via-symlink.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-PerlIO-via-symlink.spec 16 Aug 2007 18:48:40 -0000 1.2 +++ perl-PerlIO-via-symlink.spec 6 Mar 2008 18:54:28 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-PerlIO-via-symlink Version: 0.05 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PerlIO layers for create symlinks -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/PerlIO-via-symlink/ Source0: http://www.cpan.org/modules/by-module/PerlIO/PerlIO-via-symlink-%{version}.tar.gz @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.05-5 +- rebuild for new perl + * Thu Aug 16 2007 Ian Burrell - 0.05-4 - Fix BuildRequires From fedora-extras-commits at redhat.com Thu Mar 6 18:57:00 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:57:00 GMT Subject: rpms/perl-Data-Hierarchy/devel perl-Data-Hierarchy.spec,1.4,1.5 Message-ID: <200803061857.m26Iv0P3008193@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Data-Hierarchy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8163 Modified Files: perl-Data-Hierarchy.spec Log Message: new perl Index: perl-Data-Hierarchy.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-Hierarchy/devel/perl-Data-Hierarchy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Data-Hierarchy.spec 16 Aug 2007 16:47:42 -0000 1.4 +++ perl-Data-Hierarchy.spec 6 Mar 2008 18:56:21 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-Data-Hierarchy Version: 0.34 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Handle data in a hierarchical structure -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-Hierarchy/ Source0: http://www.cpan.org/modules/by-module/Data/Data-Hierarchy-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.34-4 +- rebuild for new perl + * Thu Aug 16 2007 Ian M. Burrell - 0.34-3 - Fix BuildRequires From fedora-extras-commits at redhat.com Thu Mar 6 18:58:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:58:53 GMT Subject: rpms/perl-App-CLI/devel perl-App-CLI.spec,1.2,1.3 Message-ID: <200803061858.m26IwrPr008291@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-App-CLI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8266 Modified Files: perl-App-CLI.spec Log Message: new perl Index: perl-App-CLI.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-App-CLI/devel/perl-App-CLI.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-App-CLI.spec 16 Aug 2007 16:41:53 -0000 1.2 +++ perl-App-CLI.spec 6 Mar 2008 18:58:12 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-App-CLI Version: 0.07 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Dispatcher module for command line interface programs -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/App-CLI/ Source0: http://www.cpan.org/modules/by-module/App/App-CLI-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.07-4 +- rebuild for new perl + * Thu Aug 16 2007 Ian M. Burrell - 0.07-3 - Add BuildRequires ExtUtils::MakeMaker, Test::More From fedora-extras-commits at redhat.com Thu Mar 6 18:59:54 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 18:59:54 GMT Subject: rpms/perl-SVN-Mirror/devel perl-SVN-Mirror.spec,1.7,1.8 Message-ID: <200803061859.m26IxsVI008373@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SVN-Mirror/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8329 Modified Files: perl-SVN-Mirror.spec Log Message: new perl Index: perl-SVN-Mirror.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SVN-Mirror/devel/perl-SVN-Mirror.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-SVN-Mirror.spec 16 Aug 2007 18:58:03 -0000 1.7 +++ perl-SVN-Mirror.spec 6 Mar 2008 18:59:18 -0000 1.8 @@ -1,8 +1,8 @@ Name: perl-SVN-Mirror Version: 0.73 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mirror remote repository to local Subversion repository -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/SVN-Mirror/ Source0: http://www.cpan.org/modules/by-module/SVN/SVN-Mirror-%{version}.tar.gz @@ -66,6 +66,9 @@ %{_bindir}/svm %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.73-3 +- rebuild for new perl + * Thu Aug 16 2007 Ian Burrell - 0.73-2 - Fix BuildRequires From fedora-extras-commits at redhat.com Thu Mar 6 19:00:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 19:00:43 GMT Subject: rpms/perl-PerlIO-eol/devel perl-PerlIO-eol.spec,1.5,1.6 Message-ID: <200803061900.m26J0h1v008460@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-PerlIO-eol/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8416 Modified Files: perl-PerlIO-eol.spec Log Message: new perl Index: perl-PerlIO-eol.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PerlIO-eol/devel/perl-PerlIO-eol.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-PerlIO-eol.spec 19 Feb 2008 05:03:27 -0000 1.5 +++ perl-PerlIO-eol.spec 6 Mar 2008 19:00:03 -0000 1.6 @@ -1,8 +1,8 @@ Name: perl-PerlIO-eol Version: 0.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PerlIO layer for normalizing line endings -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/PerlIO-eol/ Source0: http://www.cpan.org/modules/by-module/PerlIO/PerlIO-eol-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.14-4 +- rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.14-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 19:01:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 19:01:23 GMT Subject: rpms/perl-Algorithm-Annotate/devel perl-Algorithm-Annotate.spec, 1.2, 1.3 Message-ID: <200803061901.m26J1N1R015673@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Algorithm-Annotate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8504 Modified Files: perl-Algorithm-Annotate.spec Log Message: new perl Index: perl-Algorithm-Annotate.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Algorithm-Annotate/devel/perl-Algorithm-Annotate.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Algorithm-Annotate.spec 16 Aug 2007 16:29:48 -0000 1.2 +++ perl-Algorithm-Annotate.spec 6 Mar 2008 19:00:49 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Algorithm-Annotate Version: 0.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Represent a series of changes in annotate form -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Algorithm-Annotate/ Source0: http://www.cpan.org/modules/by-module/Algorithm/Algorithm-Annotate-%{version}.tar.gz @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.10-6 +- rebuild for new perl + * Thu Aug 16 2007 Ian M. Burrell - 0.10-5 - Add BuildRequires ExtUtils::MakeMaker, Test::More From fedora-extras-commits at redhat.com Thu Mar 6 19:01:51 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 6 Mar 2008 19:01:51 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.1, 1.2 Message-ID: <200803061901.m26J1prY015755@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15730 Modified Files: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch Log Message: add some more cunning to the unopkg bodge openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch: Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 14 Feb 2008 11:05:57 -0000 1.1 +++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 6 Mar 2008 19:01:45 -0000 1.2 @@ -17,7 +17,7 @@ + set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + fi + echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA -+ if [ $? -ne 0 ]; then ++ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; + set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml' + fi + echo $@ | grep -q env:UserInstallation From fedora-extras-commits at redhat.com Thu Mar 6 19:03:05 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 19:03:05 GMT Subject: rpms/perl-IO-Digest/devel perl-IO-Digest.spec,1.2,1.3 Message-ID: <200803061903.m26J35jJ015814@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-Digest/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15777 Modified Files: perl-IO-Digest.spec Log Message: new perl Index: perl-IO-Digest.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Digest/devel/perl-IO-Digest.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-IO-Digest.spec 16 Aug 2007 17:36:21 -0000 1.2 +++ perl-IO-Digest.spec 6 Mar 2008 19:02:24 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-IO-Digest Version: 0.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Calculate digests while reading or writing -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-Digest/ Source0: http://www.cpan.org/modules/by-module/IO/IO-Digest-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.10-6 +- rebuild for new perl + * Thu Aug 16 2007 Ian M. Burrell - 0.10-5 - Fix BuildRequires From fedora-extras-commits at redhat.com Thu Mar 6 19:04:43 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 6 Mar 2008 19:04:43 GMT Subject: rpms/writer2latex/devel writer2latex.spec,1.3,1.4 Message-ID: <200803061904.m26J4hYU015961@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/writer2latex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15921 Modified Files: writer2latex.spec Log Message: bodge moved into OOo itself Index: writer2latex.spec =================================================================== RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- writer2latex.spec 18 Feb 2008 22:22:40 -0000 1.3 +++ writer2latex.spec 6 Mar 2008 19:04:10 -0000 1.4 @@ -105,22 +105,22 @@ %pre -n openoffice.org-%{name} if [ $1 -gt 1 ]; then # Upgrade => deregister old extension - unopkg remove --shared org.openoffice.legacy.writer2latex.uno.pkg -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 || : + unopkg remove --shared org.openoffice.legacy.writer2latex.uno.pkg || : fi %post -n openoffice.org-%{name} # register extension - unopkg add --shared --link %{_datadir}/writer2latex.uno.pkg -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 || : + unopkg add --shared --link %{_datadir}/writer2latex.uno.pkg || : %preun -n openoffice.org-%{name} if [ $1 -eq 0 ]; then # not upgrading => deregister - unopkg remove --shared org.openoffice.legacy.writer2latex.uno.pkg -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 || : + unopkg remove --shared org.openoffice.legacy.writer2latex.uno.pkg || : fi %postun -n openoffice.org-%{name} # clear disk cache - unopkg list --shared -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 > /dev/null 2>&1 || : + unopkg list --shared > /dev/null 2>&1 || : %files %defattr(0644,root,root,0755) From fedora-extras-commits at redhat.com Thu Mar 6 19:06:26 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 6 Mar 2008 19:06:26 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.1, 1.1.2.1 openoffice.org-1.9.97.rh156067.noversionedsysui.patch, 1.3, NONE Message-ID: <200803061906.m26J6QFx016058@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16027 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch Removed Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-1.9.97.rh156067.noversionedsysui.patch Log Message: merge to branch openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch: Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 14 Feb 2008 11:05:57 -0000 1.1 +++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 6 Mar 2008 19:06:15 -0000 1.1.2.1 @@ -17,7 +17,7 @@ + set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + fi + echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA -+ if [ $? -ne 0 ]; then ++ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; + set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml' + fi + echo $@ | grep -q env:UserInstallation --- openoffice.org-1.9.97.rh156067.noversionedsysui.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 19:06:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 19:06:43 GMT Subject: rpms/perl-Gtk2-TrayIcon/devel perl-Gtk2-TrayIcon.spec,1.6,1.7 Message-ID: <200803061906.m26J6h1f016063@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-TrayIcon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16001 Modified Files: perl-Gtk2-TrayIcon.spec Log Message: new perl Index: perl-Gtk2-TrayIcon.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-TrayIcon/devel/perl-Gtk2-TrayIcon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Gtk2-TrayIcon.spec 18 Feb 2008 23:25:03 -0000 1.6 +++ perl-Gtk2-TrayIcon.spec 6 Mar 2008 19:06:08 -0000 1.7 @@ -12,11 +12,11 @@ Name: perl-Gtk2-TrayIcon Version: 0.06 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl interface to the EggTrayIcon library Group: Development/Libraries -License: LGPL +License: LGPLv2+ URL: http://search.cpan.org/dist/Gtk2-TrayIcon Source0: http://www.cpan.org/modules/by-module/Gtk2/Gtk2-TrayIcon-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -73,6 +73,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.06-4 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.06-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 19:08:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 19:08:19 GMT Subject: rpms/perl-Gtk2-Spell/devel perl-Gtk2-Spell.spec,1.4,1.5 Message-ID: <200803061908.m26J8Jqv016168@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-Spell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16124 Modified Files: perl-Gtk2-Spell.spec Log Message: new perl Index: perl-Gtk2-Spell.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-Spell/devel/perl-Gtk2-Spell.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Gtk2-Spell.spec 18 Feb 2008 23:23:16 -0000 1.4 +++ perl-Gtk2-Spell.spec 6 Mar 2008 19:07:35 -0000 1.5 @@ -1,11 +1,11 @@ Name: perl-Gtk2-Spell Version: 1.03 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Gtk2::Spell perl module Group: Development/Libraries -License: LGPL +License: LGPLv2+ URL: http://search.cpan.org/dist/Gtk2-Spell/ Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Gtk2-Spell-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +56,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 1.03-8 +- rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 1.03-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 19:09:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 19:09:10 GMT Subject: rpms/perl-File-MimeInfo/devel perl-File-MimeInfo.spec,1.5,1.6 Message-ID: <200803061909.m26J9ANj016244@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-MimeInfo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16206 Modified Files: perl-File-MimeInfo.spec Log Message: new perl Index: perl-File-MimeInfo.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-MimeInfo/devel/perl-File-MimeInfo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-File-MimeInfo.spec 14 Feb 2008 21:54:47 -0000 1.5 +++ perl-File-MimeInfo.spec 6 Mar 2008 19:08:30 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-File-MimeInfo Version: 0.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Determine file type and open application License: GPL+ or Artistic Group: Development/Libraries @@ -56,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway 0.15-2 +- rebuild for new perl + * Thu Feb 14 2008 Patrice Dumas 0.15-1 - update to 0.15, remove upstreamed no-ask patch From fedora-extras-commits at redhat.com Thu Mar 6 19:13:46 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Marcelin_Beno=C3=AEt?= (sereinit)) Date: Thu, 6 Mar 2008 19:13:46 GMT Subject: rpms/cairo-clock/F-7 cairo-clock.spec,1.2,1.3 Message-ID: <200803061913.m26JDkex016375@cvs-int.fedora.redhat.com> Author: sereinit Update of /cvs/pkgs/rpms/cairo-clock/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16311 Modified Files: cairo-clock.spec Log Message: Fix koji make tag problem Index: cairo-clock.spec =================================================================== RCS file: /cvs/pkgs/rpms/cairo-clock/F-7/cairo-clock.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cairo-clock.spec 6 Mar 2008 18:14:57 -0000 1.2 +++ cairo-clock.spec 6 Mar 2008 19:13:13 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Cairo-rendered on-screen clock Name: cairo-clock Version: 0.3.4 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://macslow.thepimp.net/?page_id=23 Source0: http://macslow.thepimp.net/projects/%{name}/%{name}-%{version}.tar.gz License: GPLv2 @@ -53,6 +53,8 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Thu Feb 06 2008 Beno??t Marcelin 0.3.4-2 +- Just need to fix koji make tag problems * Thu Feb 04 2008 Beno??t Marcelin 0.3.4-1 - Update to 0.3.4 - Clean BuildRequires and changelog From fedora-extras-commits at redhat.com Thu Mar 6 19:14:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 19:14:09 GMT Subject: rpms/perl-Class-Inner/devel perl-Class-Inner.spec,1.2,1.3 Message-ID: <200803061914.m26JE9jW016448@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Inner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16425 Modified Files: perl-Class-Inner.spec Log Message: new perl Index: perl-Class-Inner.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inner/devel/perl-Class-Inner.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Inner.spec 6 Mar 2008 18:29:42 -0000 1.2 +++ perl-Class-Inner.spec 6 Mar 2008 19:14:02 -0000 1.3 @@ -1,12 +1,14 @@ Name: perl-Class-Inner Version: 0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A perlish implementation of Java like inner classes Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Class-Inner/ Source0: http://search.cpan.org/CPAN/authors/id/P/PD/PDCAWLEY/Class-Inner-%{version}.tar.gz +# Upstream RT bug 33533 +Patch0: perl-Class-Inner-0.1-perl510-testfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -22,6 +24,7 @@ %prep %setup -q -n Class-Inner-%{version} +%patch0 -p1 %build @@ -53,6 +56,9 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.1-6 +- fix test for perl 5.10 + * Thu Mar 6 2008 Tom "spot" Callaway - 0.1-5 - rebuild for new perl From fedora-extras-commits at redhat.com Thu Mar 6 19:14:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 19:14:25 GMT Subject: rpms/perl-Class-Inner/devel perl-Class-Inner-0.1-perl510-testfix.patch, NONE, 1.1 Message-ID: <200803061914.m26JEPqM016487@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Inner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16469 Added Files: perl-Class-Inner-0.1-perl510-testfix.patch Log Message: new perl perl-Class-Inner-0.1-perl510-testfix.patch: --- NEW FILE perl-Class-Inner-0.1-perl510-testfix.patch --- diff -up Class-Inner-0.1/t/basic.t.BAD Class-Inner-0.1/t/basic.t --- Class-Inner-0.1/t/basic.t.BAD 2008-03-06 14:09:44.000000000 -0500 +++ Class-Inner-0.1/t/basic.t 2008-03-06 14:10:13.000000000 -0500 @@ -45,4 +45,4 @@ is($ic->poly(), 'b', '$ic->poly is $ic = undef; -ok(!$ic_class->isa('Parent'), 'Class dismissed'); +ok(!(ref $ic_class && $ic_class->isa('Parent')), 'Class dismissed'); From fedora-extras-commits at redhat.com Thu Mar 6 19:17:09 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Thu, 6 Mar 2008 19:17:09 GMT Subject: rpms/nfs-utils/F-8 nfs-utils.spec, 1.160, 1.161 nfs-utils-1.0.12-mountd-memleak.patch, 1.1, NONE Message-ID: <200803061917.m26JH9mv016724@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16658 Modified Files: nfs-utils.spec Removed Files: nfs-utils-1.0.12-mountd-memleak.patch Log Message: - Removed a patch that was no longer needed and was causing memory corruption in rpc.mountd (bz 270541) Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/nfs-utils.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- nfs-utils.spec 3 Mar 2008 19:11:14 -0000 1.160 +++ nfs-utils.spec 6 Mar 2008 19:16:33 -0000 1.161 @@ -2,7 +2,7 @@ Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 # group all 32bit related archs @@ -25,18 +25,17 @@ Patch00: nfs-utils-1.0.5-statdpath.patch Patch01: nfs-utils-1.0.6-mountd.patch Patch02: nfs-utils-1.0.6-gssd_mixed_case.patch -Patch03: nfs-utils-1.0.12-mountd-memleak.patch -Patch04: nfs-utils-1.1.0-showmount-rpcerror.patch -Patch05: nfs-utils-1.1.0-exp-subtree-warn-off.patch -Patch06: nfs-utils-1.1.0-smnotify-path.patch -Patch07: nfs-utils-1.1.0-exportfs-man-update.patch -Patch08: nfs-utils-1.1.1-mountd-man.patch -Patch09: nfs-utils-1.1.0-fsloc-nohide.patch -Patch10: nfs-utils-1.1.1-xlog-valist.patch -Patch11: nfs-utils-1.1.1-mountd-crossmnt.patch -Patch12: nfs-utils-1.1.1-mountd-crossmnt-cleanup.patch -Patch13: nfs-utils-1.1.1-gssd-mcred.patch -Patch14: nfs-utils-1.1.1-idmapd-validasc.patch +Patch03: nfs-utils-1.1.0-showmount-rpcerror.patch +Patch04: nfs-utils-1.1.0-exp-subtree-warn-off.patch +Patch05: nfs-utils-1.1.0-smnotify-path.patch +Patch06: nfs-utils-1.1.0-exportfs-man-update.patch +Patch07: nfs-utils-1.1.1-mountd-man.patch +Patch08: nfs-utils-1.1.0-fsloc-nohide.patch +Patch09: nfs-utils-1.1.1-xlog-valist.patch +Patch10: nfs-utils-1.1.1-mountd-crossmnt.patch +Patch11: nfs-utils-1.1.1-mountd-crossmnt-cleanup.patch +Patch12: nfs-utils-1.1.1-gssd-mcred.patch +Patch13: nfs-utils-1.1.1-idmapd-validasc.patch %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch @@ -103,7 +102,6 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 %if %{enablefscache} %patch90 -p1 @@ -274,6 +272,10 @@ %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Thu Mar 6 2008 Steve Dickson 1.1.1-2 +- Removed a patch that was no longer needed and was causing + memory corruption in rpc.mountd (bz 270541) + * Mon Mar 3 2008 Steve Dickson 1.1.1-1 - Updated to latest upstream release, nfs-utils-1.1.1 - Added the removal of sm-notify.pid to nfslock init script. --- nfs-utils-1.0.12-mountd-memleak.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 19:19:46 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Thu, 6 Mar 2008 19:19:46 GMT Subject: rpms/xorg-x11-drv-ivtv/devel sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 xorg-x11-drv-ivtv.spec, 1.5, 1.6 Message-ID: <200803061919.m26JJkgV016844@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16792 Modified Files: sources .cvsignore xorg-x11-drv-ivtv.spec Log Message: Update to 1.0.1 (bugfixes) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jan 2008 18:33:44 -0000 1.2 +++ sources 6 Mar 2008 19:19:10 -0000 1.3 @@ -1 +1 @@ -c8072f8ef5f2aa10eb9324b95dabed3c xf86-video-ivtv-1.0.0.tar.gz +c66a5cd5c12c3eab92751b310c1fd43e xf86-video-ivtv-1.0.1.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jan 2008 18:33:44 -0000 1.2 +++ .cvsignore 6 Mar 2008 19:19:10 -0000 1.3 @@ -1 +1 @@ -xf86-video-ivtv-1.0.0.tar.gz +xf86-video-ivtv-1.0.1.tar.gz Index: xorg-x11-drv-ivtv.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel/xorg-x11-drv-ivtv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xorg-x11-drv-ivtv.spec 5 Mar 2008 21:44:49 -0000 1.5 +++ xorg-x11-drv-ivtv.spec 6 Mar 2008 19:19:10 -0000 1.6 @@ -1,17 +1,16 @@ Name: xorg-x11-drv-ivtv Version: 1.0.1 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Xorg X11 ivtv video driver Group: User Interface/X Hardware Support License: MIT URL: http://ivtvdriver.org -Source0: http://dl.ivtvdriver.org/xf86-video-ivtv/archive/1.0.x/xf86-video-ivtv-1.0.0.tar.gz -Patch0: xf86-video-ivtv-1.0.0-pciaccess.patch +Source0: http://dl.ivtvdriver.org/xf86-video-ivtv/archive/1.0.x/xf86-video-ivtv-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6 -BuildRequires: libtool +#BuildRequires: libtool Requires: xorg-x11-server-Xorg >= 1.3.0.0-6 Requires: ivtv-firmware Obsoletes: ivtv_xdriver < %{version} @@ -20,9 +19,8 @@ X.Org X11 ivtv video driver. %prep -%setup -q -n xf86-video-ivtv-1.0.0 -%patch0 -p1 -b .pciaccess -sh autogen.sh +%setup -q -n xf86-video-ivtv-%{version} +#sh autogen.sh %build %configure @@ -46,6 +44,12 @@ %changelog +* Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.1-1 +- Update to 1.0.1 (final) + +* Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.1-0.2 +- Add xf86-video-ivtv-1.0.1-pagesize.patch + * Wed Mar 5 2008 kwizart < kwizart at gmail.com > - 1.0.1-0.1 - Backport the libpciaccess support from pre 1.0.1 From fedora-extras-commits at redhat.com Thu Mar 6 19:22:02 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Thu, 6 Mar 2008 19:22:02 GMT Subject: rpms/xorg-x11-drv-ivtv/devel xf86-video-ivtv-1.0.0-pciaccess.patch, 1.2, NONE Message-ID: <200803061922.m26JM2ul016911@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904 Removed Files: xf86-video-ivtv-1.0.0-pciaccess.patch Log Message: Remove old patch --- xf86-video-ivtv-1.0.0-pciaccess.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 19:26:46 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 19:26:46 GMT Subject: rpms/perl-PPI-Tester/devel perl-PPI-Tester.spec,1.3,1.4 Message-ID: <200803061926.m26JQkmC017130@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-PPI-Tester/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17105 Modified Files: perl-PPI-Tester.spec Log Message: new perl Index: perl-PPI-Tester.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PPI-Tester/devel/perl-PPI-Tester.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-PPI-Tester.spec 4 Mar 2008 18:28:10 -0000 1.3 +++ perl-PPI-Tester.spec 6 Mar 2008 19:26:11 -0000 1.4 @@ -6,7 +6,7 @@ Name: perl-PPI-Tester Version: 0.06 -Release: 3%{?dist} +Release: 5%{?dist} Summary: A wxPerl-based interactive PPI debugger/tester Group: Development/Libraries @@ -19,6 +19,7 @@ BuildRequires: perl(ExtUtils::AutoInstall) BuildRequires: perl(PPI) BuildRequires: perl(Wx) +BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -31,7 +32,8 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor +# Hack, we work around weirdness in Wx probing. +%{__perl} Makefile.PL INSTALLDIRS=vendor || : make %{?_smp_mflags} @@ -61,6 +63,12 @@ %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.06-5 +- hack: work around Wx probing issues + +* Tue Mar 4 2008 Tom "spot" Callaway - 0.06-4 +- add BR: Test::More + * Tue Mar 4 2008 Tom "spot" Callaway - 0.06-3 - rebuild for new perl From fedora-extras-commits at redhat.com Thu Mar 6 19:32:44 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Thu, 6 Mar 2008 19:32:44 GMT Subject: rpms/xorg-x11-drv-ivtv/devel xf86-video-ivtv-1.0.1-pagesize.patch, NONE, 1.1 xorg-x11-drv-ivtv.spec, 1.6, 1.7 Message-ID: <200803061932.m26JWiQW017392@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17343 Modified Files: xorg-x11-drv-ivtv.spec Added Files: xf86-video-ivtv-1.0.1-pagesize.patch Log Message: - Add back xf86-video-ivtv-1.0.1-pagesize.patch xf86-video-ivtv-1.0.1-pagesize.patch: --- NEW FILE xf86-video-ivtv-1.0.1-pagesize.patch --- Index: src/ivtv_hw.c =================================================================== --- src/ivtv_hw.c (revision 4104) +++ src/ivtv_hw.c (working copy) @@ -54,7 +54,6 @@ #include "xf86cmap.h" -#include "asm/page.h" /* #define for PAGE_* */ #include "globals.h" #define DPMS_SERVER #include @@ -570,7 +569,7 @@ ivtvHWMapVidmem(ScrnInfoPtr pScrn) { ivtvHWPtr hwPtr = IVTVDEVHWPTR(pScrn); - long page_mask = ~(sysconf(_SC_PAGESIZE) - 1); + long page_mask = ~(getpagesize() - 1); TRACE_ENTER("MapVidmem"); if (NULL == hwPtr->fbmem) { Index: xorg-x11-drv-ivtv.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel/xorg-x11-drv-ivtv.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xorg-x11-drv-ivtv.spec 6 Mar 2008 19:19:10 -0000 1.6 +++ xorg-x11-drv-ivtv.spec 6 Mar 2008 19:32:08 -0000 1.7 @@ -1,12 +1,13 @@ Name: xorg-x11-drv-ivtv Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Xorg X11 ivtv video driver Group: User Interface/X Hardware Support License: MIT URL: http://ivtvdriver.org Source0: http://dl.ivtvdriver.org/xf86-video-ivtv/archive/1.0.x/xf86-video-ivtv-%{version}.tar.gz +Patch0: xf86-video-ivtv-1.0.1-pagesize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6 @@ -20,6 +21,7 @@ %prep %setup -q -n xf86-video-ivtv-%{version} +%patch0 -p0 -b .pagesize #sh autogen.sh %build @@ -44,6 +46,9 @@ %changelog +* Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.1-2 +- Add back xf86-video-ivtv-1.0.1-pagesize.patch + * Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.1-1 - Update to 1.0.1 (final) From fedora-extras-commits at redhat.com Thu Mar 6 19:48:20 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Thu, 6 Mar 2008 19:48:20 GMT Subject: rpms/xorg-x11-drv-ivtv/F-8 xf86-video-ivtv-1.0.1-pagesize.patch, NONE, 1.1 xorg-x11-drv-ivtv.spec, 1.1, 1.2 Message-ID: <200803061948.m26JmKSD018567@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18250 Modified Files: xorg-x11-drv-ivtv.spec Added Files: xf86-video-ivtv-1.0.1-pagesize.patch Log Message: - Update to 1.0.1 (final) xf86-video-ivtv-1.0.1-pagesize.patch: --- NEW FILE xf86-video-ivtv-1.0.1-pagesize.patch --- Index: src/ivtv_hw.c =================================================================== --- src/ivtv_hw.c (revision 4104) +++ src/ivtv_hw.c (working copy) @@ -54,7 +54,6 @@ #include "xf86cmap.h" -#include "asm/page.h" /* #define for PAGE_* */ #include "globals.h" #define DPMS_SERVER #include @@ -570,7 +569,7 @@ ivtvHWMapVidmem(ScrnInfoPtr pScrn) { ivtvHWPtr hwPtr = IVTVDEVHWPTR(pScrn); - long page_mask = ~(sysconf(_SC_PAGESIZE) - 1); + long page_mask = ~(getpagesize() - 1); TRACE_ENTER("MapVidmem"); if (NULL == hwPtr->fbmem) { Index: xorg-x11-drv-ivtv.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-8/xorg-x11-drv-ivtv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xorg-x11-drv-ivtv.spec 19 Feb 2008 21:15:13 -0000 1.1 +++ xorg-x11-drv-ivtv.spec 6 Mar 2008 19:47:42 -0000 1.2 @@ -1,5 +1,5 @@ Name: xorg-x11-drv-ivtv -Version: 1.0.0 +Version: 1.0.1 Release: 2%{?dist} Summary: Xorg X11 ivtv video driver @@ -7,19 +7,22 @@ License: MIT URL: http://ivtvdriver.org Source0: http://dl.ivtvdriver.org/xf86-video-ivtv/archive/1.0.x/xf86-video-ivtv-%{version}.tar.gz +Patch0: xf86-video-ivtv-1.0.1-pagesize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6 +#BuildRequires: libtool Requires: xorg-x11-server-Xorg >= 1.3.0.0-6 Requires: ivtv-firmware -Obsoletes: ivtv_xdriver +Obsoletes: ivtv_xdriver < %{version} %description X.Org X11 ivtv video driver. %prep %setup -q -n xf86-video-ivtv-%{version} - +%patch0 -p0 -b .pagesize +#sh autogen.sh %build %configure @@ -31,6 +34,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/ivtv_drv.la + %clean rm -rf $RPM_BUILD_ROOT @@ -42,6 +46,21 @@ %changelog +* Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.1-2 +- Add back xf86-video-ivtv-1.0.1-pagesize.patch + +* Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.1-1 +- Update to 1.0.1 (final) + +* Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.1-0.2 +- Add xf86-video-ivtv-1.0.1-pagesize.patch + +* Wed Mar 5 2008 kwizart < kwizart at gmail.com > - 1.0.1-0.1 +- Backport the libpciaccess support from pre 1.0.1 + +* Tue Feb 19 2008 kwizart < kwizart at gmail.com > - 1.0.0-3 +- Fix for libpciaccess support + * Mon Feb 18 2008 kwizart < kwizart at gmail.com > - 1.0.0-2 - Bump for Fedora introduction. From fedora-extras-commits at redhat.com Thu Mar 6 19:50:28 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Thu, 6 Mar 2008 19:50:28 GMT Subject: rpms/xorg-x11-drv-ivtv/F-8 sources,1.2,1.3 Message-ID: <200803061950.m26JoS73018913@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18790 Modified Files: sources Log Message: Add source Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2008 21:15:13 -0000 1.2 +++ sources 6 Mar 2008 19:49:52 -0000 1.3 @@ -1 +1 @@ -c8072f8ef5f2aa10eb9324b95dabed3c xf86-video-ivtv-1.0.0.tar.gz +c66a5cd5c12c3eab92751b310c1fd43e xf86-video-ivtv-1.0.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 19:54:28 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Thu, 6 Mar 2008 19:54:28 GMT Subject: rpms/xorg-x11-drv-ivtv/F-7 xf86-video-ivtv-1.0.1-pagesize.patch, NONE, 1.1 sources, 1.2, 1.3 xorg-x11-drv-ivtv.spec, 1.1, 1.2 Message-ID: <200803061954.m26JsSGe019577@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19453 Modified Files: sources xorg-x11-drv-ivtv.spec Added Files: xf86-video-ivtv-1.0.1-pagesize.patch Log Message: - Update to 1.0.1 (final) xf86-video-ivtv-1.0.1-pagesize.patch: --- NEW FILE xf86-video-ivtv-1.0.1-pagesize.patch --- Index: src/ivtv_hw.c =================================================================== --- src/ivtv_hw.c (revision 4104) +++ src/ivtv_hw.c (working copy) @@ -54,7 +54,6 @@ #include "xf86cmap.h" -#include "asm/page.h" /* #define for PAGE_* */ #include "globals.h" #define DPMS_SERVER #include @@ -570,7 +569,7 @@ ivtvHWMapVidmem(ScrnInfoPtr pScrn) { ivtvHWPtr hwPtr = IVTVDEVHWPTR(pScrn); - long page_mask = ~(sysconf(_SC_PAGESIZE) - 1); + long page_mask = ~(getpagesize() - 1); TRACE_ENTER("MapVidmem"); if (NULL == hwPtr->fbmem) { Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2008 21:29:07 -0000 1.2 +++ sources 6 Mar 2008 19:53:54 -0000 1.3 @@ -1 +1 @@ -c8072f8ef5f2aa10eb9324b95dabed3c xf86-video-ivtv-1.0.0.tar.gz +c66a5cd5c12c3eab92751b310c1fd43e xf86-video-ivtv-1.0.1.tar.gz Index: xorg-x11-drv-ivtv.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-7/xorg-x11-drv-ivtv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xorg-x11-drv-ivtv.spec 19 Feb 2008 21:29:07 -0000 1.1 +++ xorg-x11-drv-ivtv.spec 6 Mar 2008 19:53:54 -0000 1.2 @@ -1,5 +1,5 @@ Name: xorg-x11-drv-ivtv -Version: 1.0.0 +Version: 1.0.1 Release: 2%{?dist} Summary: Xorg X11 ivtv video driver @@ -7,19 +7,22 @@ License: MIT URL: http://ivtvdriver.org Source0: http://dl.ivtvdriver.org/xf86-video-ivtv/archive/1.0.x/xf86-video-ivtv-%{version}.tar.gz +Patch0: xf86-video-ivtv-1.0.1-pagesize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6 +#BuildRequires: libtool Requires: xorg-x11-server-Xorg >= 1.3.0.0-6 Requires: ivtv-firmware -Obsoletes: ivtv_xdriver +Obsoletes: ivtv_xdriver < %{version} %description X.Org X11 ivtv video driver. %prep %setup -q -n xf86-video-ivtv-%{version} - +%patch0 -p0 -b .pagesize +#sh autogen.sh %build %configure @@ -31,6 +34,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/ivtv_drv.la + %clean rm -rf $RPM_BUILD_ROOT @@ -42,6 +46,21 @@ %changelog +* Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.1-2 +- Add back xf86-video-ivtv-1.0.1-pagesize.patch + +* Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.1-1 +- Update to 1.0.1 (final) + +* Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 1.0.1-0.2 +- Add xf86-video-ivtv-1.0.1-pagesize.patch + +* Wed Mar 5 2008 kwizart < kwizart at gmail.com > - 1.0.1-0.1 +- Backport the libpciaccess support from pre 1.0.1 + +* Tue Feb 19 2008 kwizart < kwizart at gmail.com > - 1.0.0-3 +- Fix for libpciaccess support + * Mon Feb 18 2008 kwizart < kwizart at gmail.com > - 1.0.0-2 - Bump for Fedora introduction. From fedora-extras-commits at redhat.com Thu Mar 6 20:10:07 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Thu, 6 Mar 2008 20:10:07 GMT Subject: rpms/genromfs/devel genromfs.spec,1.20,1.21 Message-ID: <200803062010.m26KA7hV029059@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/genromfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28933 Modified Files: genromfs.spec Log Message: Fix URL. Index: genromfs.spec =================================================================== RCS file: /cvs/pkgs/rpms/genromfs/devel/genromfs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- genromfs.spec 19 Feb 2008 19:56:33 -0000 1.20 +++ genromfs.spec 6 Mar 2008 20:09:26 -0000 1.21 @@ -5,7 +5,7 @@ License: GPLv2+ Group: System Environment/Base URL: http://romfs.sourceforge.net/ -Source: http://unc.dl.sourceforge.net/sourceforge/romfs/genromfs-0.5.1.tar.gz +Source: http://downloads.sourceforge.net/romfs/%{name}-%{version}.tar.gz Patch: genromfs-0.5.1.patch ExclusiveOS: Linux BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Thu Mar 6 20:37:31 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 6 Mar 2008 20:37:31 GMT Subject: rpms/yum-utils/devel yum-downloader-archlist.patch, NONE, 1.1 yum-utils.spec, 1.29, 1.30 Message-ID: <200803062037.m26KbVAK032654@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32531 Modified Files: yum-utils.spec Added Files: yum-downloader-archlist.patch Log Message: archlist patch for jkeating yum-downloader-archlist.patch: --- NEW FILE yum-downloader-archlist.patch --- diff --git a/yumdownloader.py b/yumdownloader.py index ebfed81..5252ad4 100755 --- a/yumdownloader.py +++ b/yumdownloader.py @@ -226,6 +226,8 @@ class YumDownloader(YumUtilBase): # if '--source' is used the add src to the archlist if opts.source: archlist = rpmUtils.arch.getArchList() + ['src'] + elif opts.archlist: + archlist = opts.archlist.split(',') else: archlist = rpmUtils.arch.getArchList() self._getSacks(archlist=archlist) @@ -250,7 +252,8 @@ class YumDownloader(YumUtilBase): help='resolve dependencies and download required packages') parser.add_option("--source", default=False, dest="source", action="store_true", help='operate on source packages') - + parser.add_option("--archlist", + help="only download packages of certain architecture(s)") if __name__ == '__main__': util = YumDownloader() Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- yum-utils.spec 8 Feb 2008 21:49:24 -0000 1.29 +++ yum-utils.spec 6 Mar 2008 20:36:54 -0000 1.30 @@ -1,10 +1,11 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz +Patch0: yum-downloader-archlist.patch URL: http://linux.duke.edu/yum/download/yum-utils/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -228,6 +229,7 @@ %prep %setup -q +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Thu Mar 6 20:38:36 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 6 Mar 2008 20:38:36 GMT Subject: rpms/python-sqlobject/devel python-sqlobject-0.9.4-setup.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 python-sqlobject.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200803062038.m26KcarR000365@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-sqlobject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32700 Modified Files: .cvsignore python-sqlobject.spec sources Added Files: python-sqlobject-0.9.4-setup.patch Log Message: * Thu Mar 6 2008 Luke Macken 0.9.4-1 - Update to 0.9.4 - Add python-sqlobject-0.9.4-setup.patch to prevent it from trying to download its own version of setuptools automatically. python-sqlobject-0.9.4-setup.patch: --- NEW FILE python-sqlobject-0.9.4-setup.patch --- --- setup.py.orig 2008-03-06 15:27:50.000000000 -0500 +++ setup.py 2008-03-06 15:27:57.000000000 -0500 @@ -1,8 +1,6 @@ # ez_setup doesn't work with Python 2.2, so we use distutils # in that case: try: - from ez_setup import use_setuptools - use_setuptools() from setuptools import setup is_setuptools = True except ImportError: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlobject/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 13 Feb 2008 19:16:19 -0000 1.9 +++ .cvsignore 6 Mar 2008 20:37:56 -0000 1.10 @@ -1 +1 @@ -SQLObject-0.9.3.tar.gz +SQLObject-0.9.4.tar.gz Index: python-sqlobject.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlobject/devel/python-sqlobject.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-sqlobject.spec 21 Feb 2008 21:41:19 -0000 1.16 +++ python-sqlobject.spec 6 Mar 2008 20:37:56 -0000 1.17 @@ -1,14 +1,15 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-sqlobject -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: SQLObject -Object-Relational Manager, aka database wrapper Group: Development/Libraries License: LGPLv2+ URL: http://sqlobject.org/ Source0: http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-%{version}.tar.gz +Patch0: %{name}-%{version}-setup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -28,6 +29,7 @@ %prep %setup -q -n SQLObject-%{version} +%patch0 -b .setup %build %{__python} setup.py build @@ -50,6 +52,11 @@ %{_bindir}/* %changelog +* Thu Mar 6 2008 Luke Macken 0.9.4-1 +- Update to 0.9.4 +- Add python-sqlobject-0.9.4-setup.patch to prevent it from trying to download + its own version of setuptools automatically. + * Thu Feb 21 2008 Toshio Kuratomi 0.9.3-2 - Stop deleting the ez_setup directory so we can build setuptools eggs as upstream intends. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlobject/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 13 Feb 2008 19:16:19 -0000 1.9 +++ sources 6 Mar 2008 20:37:56 -0000 1.10 @@ -1 +1 @@ -c0e00600ced0ef7949a4232e6bd4db2c SQLObject-0.9.3.tar.gz +087955cc701aec971d85b7ce63fa58aa SQLObject-0.9.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 20:41:19 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 6 Mar 2008 20:41:19 GMT Subject: rpms/libpciaccess/devel .cvsignore, 1.6, 1.7 libpciaccess.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200803062041.m26KfJxH000861@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libpciaccess/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv748/devel Modified Files: .cvsignore libpciaccess.spec sources Log Message: libpciaccess 0.10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libpciaccess/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 31 Oct 2007 18:08:17 -0000 1.6 +++ .cvsignore 6 Mar 2008 20:40:43 -0000 1.7 @@ -1 +1 @@ -libpciaccess-20071031.tar.bz2 +libpciaccess-0.10.tar.bz2 Index: libpciaccess.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libpciaccess.spec 18 Feb 2008 18:58:32 -0000 1.10 +++ libpciaccess.spec 6 Mar 2008 20:40:43 -0000 1.11 @@ -2,8 +2,8 @@ %define gitrev e392082abb5696c8837224da86cc0af4f21d7010 Name: libpciaccess -Version: 0.9.1 -Release: 4.%{gitdate}%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: PCI access library Group: System Environment/Libraries @@ -12,8 +12,8 @@ # git snapshot. To recreate, run # % ./make-libpciaccess-snapshot.sh %{gitrev} -Source0: libpciaccess-20071031.tar.bz2 -#Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 +#Source0: libpciaccess-20071031.tar.bz2 +Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 Source1: make-libpciaccess-snapshot.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,11 +36,11 @@ Development package for libpciaccess. %prep -%setup -q -n %{name}-%{gitdate} +%setup -q -n %{name}-%{version} %patch0 -p1 -b .cache %build -autoreconf -v --install +#autoreconf -v --install %configure --disable-static make %{?_smp_mflags} @@ -68,6 +68,9 @@ %{_libdir}/pkgconfig/pciaccess.pc %changelog +* Thu Mar 06 2008 Adam Jackson 0.10-1 +- libpciaccess 0.10 + * Mon Feb 18 2008 Fedora Release Engineering - 0.9.1-4.20071031 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libpciaccess/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 31 Oct 2007 18:08:17 -0000 1.6 +++ sources 6 Mar 2008 20:40:43 -0000 1.7 @@ -1 +1 @@ -651f9e71ec2fc85639a01f6e594c3d1f libpciaccess-20071031.tar.bz2 +fadacd7f13c3c2f83e14f670925487a1 libpciaccess-0.10.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 20:43:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 20:43:36 GMT Subject: rpms/perl-Data-Structure-Util/devel .cvsignore, 1.3, 1.4 perl-Data-Structure-Util.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200803062043.m26KhaXN001308@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Data-Structure-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1181 Modified Files: .cvsignore perl-Data-Structure-Util.spec sources Log Message: new perl Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-Structure-Util/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Jul 2006 23:21:18 -0000 1.3 +++ .cvsignore 6 Mar 2008 20:42:54 -0000 1.4 @@ -1 +1 @@ -Data-Structure-Util-0.12.tar.gz +Data-Structure-Util-0.13.tar.gz Index: perl-Data-Structure-Util.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-Structure-Util/devel/perl-Data-Structure-Util.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Data-Structure-Util.spec 6 Mar 2008 15:15:18 -0000 1.6 +++ perl-Data-Structure-Util.spec 6 Mar 2008 20:42:54 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Data-Structure-Util -Version: 0.12 -Release: 5%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: Change nature of data within a structure License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 0.13-1 +- 0.13 (not on CPAN yet, got from new maintainer) + * Thu Mar 6 2008 Tom "spot" Callaway - 0.12-5 - rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-Structure-Util/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Jul 2006 23:21:18 -0000 1.3 +++ sources 6 Mar 2008 20:42:54 -0000 1.4 @@ -1 +1 @@ -1af2a4149ba81f42d11dbfaecbaf5973 Data-Structure-Util-0.12.tar.gz +27498fd96db2fbc56772253b10f511dc Data-Structure-Util-0.13.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 20:45:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 20:45:08 GMT Subject: rpms/perl-Pipeline/devel perl-Pipeline.spec,1.5,1.6 Message-ID: <200803062045.m26Kj8Ep001598@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Pipeline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499 Modified Files: perl-Pipeline.spec Log Message: new perl Index: perl-Pipeline.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Pipeline/devel/perl-Pipeline.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Pipeline.spec 2 Jan 2008 05:26:58 -0000 1.5 +++ perl-Pipeline.spec 6 Mar 2008 20:44:34 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Pipeline Version: 3.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Generic pipeline interface License: GPL+ or Artistic Group: Development/Libraries @@ -61,6 +61,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway 3.12-6 +- rebuild for new perl + * Wed Jan 02 2008 Ralf Cors??pius 3.12-5 - BR: perl(Test::More) (BZ 419631). - Adjust License-tag. From fedora-extras-commits at redhat.com Thu Mar 6 20:47:58 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 6 Mar 2008 20:47:58 GMT Subject: rpms/libXinerama/devel .cvsignore, 1.7, 1.8 libXinerama.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <200803062047.m26Klw7P002119@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libXinerama/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1996/devel Modified Files: .cvsignore libXinerama.spec sources Log Message: libXinerama 1.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libXinerama/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 26 Mar 2007 18:36:58 -0000 1.7 +++ .cvsignore 6 Mar 2008 20:47:21 -0000 1.8 @@ -1 +1 @@ -libXinerama-1.0.2.tar.bz2 +libXinerama-1.0.3.tar.bz2 Index: libXinerama.spec =================================================================== RCS file: /cvs/pkgs/rpms/libXinerama/devel/libXinerama.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libXinerama.spec 20 Feb 2008 02:20:56 -0000 1.17 +++ libXinerama.spec 6 Mar 2008 20:47:21 -0000 1.18 @@ -1,13 +1,13 @@ Summary: X.Org X11 libXinerama runtime library Name: libXinerama -Version: 1.0.2 -Release: 4%{?dist} +Version: 1.0.3 +Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel @@ -69,6 +69,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Adam Jackson 1.0.3-1 +- libXinerama 1.0.3 + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-4 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libXinerama/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 26 Mar 2007 18:36:58 -0000 1.7 +++ sources 6 Mar 2008 20:47:21 -0000 1.8 @@ -1 +1 @@ -f6fb08eafd3c2909d515f1a07bfca8fd libXinerama-1.0.2.tar.bz2 +cd9f7c46439ac40e0517a302d2434d2c libXinerama-1.0.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 20:53:36 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 6 Mar 2008 20:53:36 GMT Subject: rpms/yum-utils/devel yum-utils.spec,1.30,1.31 Message-ID: <200803062053.m26KraFx003001@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2883 Modified Files: yum-utils.spec Log Message: one more time Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- yum-utils.spec 6 Mar 2008 20:36:54 -0000 1.30 +++ yum-utils.spec 6 Mar 2008 20:52:52 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -402,6 +402,11 @@ %changelog +* Thu Mar 6 2008 Seth Vidal +- 1.1.11-3 +- add archlist patch to yumdownloader so things can be built again. + + * Wed Jan 30 2008 Tim Lauridsen - mark as 1.1.11 * Sun Jan 13 2008 Seth Vidal From fedora-extras-commits at redhat.com Thu Mar 6 20:57:02 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Thu, 6 Mar 2008 20:57:02 GMT Subject: rpms/kernel/F-8 linux-2.6-libata-fix-hpt-svw-dma-masking.patch, NONE, 1.1 kernel.spec, 1.367, 1.368 Message-ID: <200803062057.m26Kv2en003351@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3240 Modified Files: kernel.spec Added Files: linux-2.6-libata-fix-hpt-svw-dma-masking.patch Log Message: * Thu Mar 06 2008 Chuck Ebbert 2.6.24.3-22 - Fix libata DMA masking for HPT and SVW (possible fix for #433557) linux-2.6-libata-fix-hpt-svw-dma-masking.patch: --- NEW FILE linux-2.6-libata-fix-hpt-svw-dma-masking.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6ddd68615ae9b21096545d7d6ab0f04113ae8b42 Commit: 6ddd68615ae9b21096545d7d6ab0f04113ae8b42 Parent: 29e8c3c304b62f31b799565c9ee85d42bd163f80 Author: Alan Cox AuthorDate: Tue Feb 26 13:35:54 2008 -0800 Committer: Jeff Garzik CommitDate: Wed Mar 5 07:46:34 2008 -0500 pata_hpt*, pata_serverworks: fix UDMA masking When masking, mask out the modes that are unsupported not the ones that are supported. This makes life happier. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik --- drivers/ata/pata_hpt366.c | 6 +++--- drivers/ata/pata_hpt37x.c | 6 +++--- drivers/ata/pata_serverworks.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c index 0713872..a742efa 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c @@ -27,7 +27,7 @@ #include #define DRV_NAME "pata_hpt366" -#define DRV_VERSION "0.6.1" +#define DRV_VERSION "0.6.2" struct hpt_clock { u8 xfer_speed; @@ -180,9 +180,9 @@ static unsigned long hpt366_filter(struct ata_device *adev, unsigned long mask) if (hpt_dma_blacklisted(adev, "UDMA", bad_ata33)) mask &= ~ATA_MASK_UDMA; if (hpt_dma_blacklisted(adev, "UDMA3", bad_ata66_3)) - mask &= ~(0x07 << ATA_SHIFT_UDMA); + mask &= ~(0xF8 << ATA_SHIFT_UDMA); if (hpt_dma_blacklisted(adev, "UDMA4", bad_ata66_4)) - mask &= ~(0x0F << ATA_SHIFT_UDMA); + mask &= ~(0xF0 << ATA_SHIFT_UDMA); } return ata_pci_default_filter(adev, mask); } diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c index 68eb349..9a10878 100644 --- a/drivers/ata/pata_hpt37x.c +++ b/drivers/ata/pata_hpt37x.c @@ -24,7 +24,7 @@ #include #define DRV_NAME "pata_hpt37x" -#define DRV_VERSION "0.6.9" +#define DRV_VERSION "0.6.11" struct hpt_clock { u8 xfer_speed; @@ -281,7 +281,7 @@ static unsigned long hpt370_filter(struct ata_device *adev, unsigned long mask) if (hpt_dma_blacklisted(adev, "UDMA", bad_ata33)) mask &= ~ATA_MASK_UDMA; if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5)) - mask &= ~(0x1F << ATA_SHIFT_UDMA); + mask &= ~(0xE0 << ATA_SHIFT_UDMA); } return ata_pci_default_filter(adev, mask); } @@ -297,7 +297,7 @@ static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask) { if (adev->class == ATA_DEV_ATA) { if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5)) - mask &= ~ (0x1F << ATA_SHIFT_UDMA); + mask &= ~(0xE0 << ATA_SHIFT_UDMA); } return ata_pci_default_filter(adev, mask); } diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c index 9c523fb..a589c0f 100644 --- a/drivers/ata/pata_serverworks.c +++ b/drivers/ata/pata_serverworks.c @@ -226,7 +226,7 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo for (i = 0; (p = csb_bad_ata100[i]) != NULL; i++) { if (!strcmp(p, model_num)) - mask &= ~(0x1F << ATA_SHIFT_UDMA); + mask &= ~(0xE0 << ATA_SHIFT_UDMA); } return ata_pci_default_filter(adev, mask); } -- To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.367 retrieving revision 1.368 diff -u -r1.367 -r1.368 --- kernel.spec 6 Mar 2008 16:28:23 -0000 1.367 +++ kernel.spec 6 Mar 2008 20:56:27 -0000 1.368 @@ -655,6 +655,7 @@ Patch640: linux-2.6-defaults-nommconf.patch Patch660: linux-2.6-libata-ali-atapi-dma.patch Patch670: linux-2.6-ata-quirk.patch +Patch671: linux-2.6-libata-fix-hpt-svw-dma-masking.patch Patch680: linux-2.6-wireless.patch Patch681: linux-2.6-wireless-pending.patch @@ -1217,6 +1218,8 @@ ApplyPatch linux-2.6-libata-ali-atapi-dma.patch # ia64 ata quirk ApplyPatch linux-2.6-ata-quirk.patch +# actually mask the intended DMA modes from the blacklist +ApplyPatch linux-2.6-libata-fix-hpt-svw-dma-masking.patch # Enable ACPI ATA objects # add option to disable PATA DMA # fix resume failure on some systems @@ -1917,6 +1920,9 @@ %changelog +* Thu Mar 06 2008 Chuck Ebbert 2.6.24.3-22 +- Fix libata DMA masking for HPT and SVW (possible fix for #433557) + * Thu Mar 06 2008 John W. Linville 2.6.24.3-21 - correct patch name typo in spec file From fedora-extras-commits at redhat.com Thu Mar 6 21:21:28 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 6 Mar 2008 21:21:28 GMT Subject: rpms/perl-Sys-Virt/devel perl-Sys-Virt.spec,1.9,1.10 Message-ID: <200803062121.m26LLSxD013075@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/perl-Sys-Virt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13042 Modified Files: perl-Sys-Virt.spec Log Message: No longer need to BR pkgconfig or xen-devel. Disable 100-connect test. Index: perl-Sys-Virt.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sys-Virt/devel/perl-Sys-Virt.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Sys-Virt.spec 6 Mar 2008 16:11:54 -0000 1.9 +++ perl-Sys-Virt.spec 6 Mar 2008 21:20:52 -0000 1.10 @@ -12,16 +12,6 @@ BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(XML::XPath) BuildRequires: libvirt-devel >= 0.1.1 -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=202320 -BuildRequires: /usr/bin/pkg-config -#%if %{!?fedora:0}%{?fedora} >= 6 -#BuildRequires: xen-devel -## libvirt/xen are only available on these: -#ExclusiveArch: i386 x86_64 ia64 -#%else -## libvirt/xen are only available on these: -#ExclusiveArch: i386 x86_64 -#%endif Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -36,6 +26,10 @@ sed -i -e '/\.spec\.PL$/d' MANIFEST rm -f *.spec.PL +# Disable 100-connect test. +sed -i -e '/^t\/100-connect\.t$/d' MANIFEST +rm -f t/100-connect.t + %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -69,6 +63,8 @@ - Update to 0.1.2. - Drop Sys-Virt-Domain-doc.patch. - BR XML::XPath. +- No longer need to BR pkgconfig or xen-devel. +- Disable 100-connect test. * Tue Feb 19 2008 Fedora Release Engineering - 0.1.1-10 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 21:26:35 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 6 Mar 2008 21:26:35 GMT Subject: rpms/strigi/devel strigi.spec,1.13,1.14 Message-ID: <200803062126.m26LQZjh013179@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/pkgs/rpms/strigi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13150 Modified Files: strigi.spec Log Message: * Thu Mar 06 2008 Deji Akingunola - 0.5.8-2 - Use upstream's default build options (disable inotify support, #436096) Index: strigi.spec =================================================================== RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- strigi.spec 21 Feb 2008 10:52:35 -0000 1.13 +++ strigi.spec 6 Mar 2008 21:26:01 -0000 1.14 @@ -1,6 +1,6 @@ Name: strigi Version: 0.5.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A desktop search program for KDE Group: Applications/Productivity License: LGPLv2+ @@ -64,8 +64,7 @@ %endif cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB_DESTINATION=%{_libdir} \ - -DLIB_SUFFIX=%{lib_suffix} \ - -DENABLE_INOTIFY:BOOL=ON -DENABLE_DBUS:BOOL=ON .. + -DLIB_SUFFIX=%{lib_suffix} .. make VERBOSE=1 %{?_smp_mflags} %install @@ -112,6 +111,9 @@ %{_libdir}/strigi/ %changelog +* Thu Mar 06 2008 Deji Akingunola - 0.5.8-2 +- Use upstream's default build options (disable inotify support, #436096) + * Thu Feb 21 2008 Kevin Kofler - 0.5.8-1 - Update to 0.5.8 - Fix LIB_DESTINATION (#433627) From fedora-extras-commits at redhat.com Thu Mar 6 21:27:56 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Thu, 6 Mar 2008 21:27:56 GMT Subject: rpms/libX11/devel .cvsignore, 1.11, 1.12 libX11.spec, 1.44, 1.45 sources, 1.10, 1.11 brightness-keysyms.patch, 1.1, NONE bug-201284.patch, 1.1, NONE libX11-1.1.3-xkb-lock-fix.patch, 1.1, NONE Message-ID: <200803062127.m26LRuAR013283@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/libX11/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13205/devel Modified Files: .cvsignore libX11.spec sources Removed Files: brightness-keysyms.patch bug-201284.patch libX11-1.1.3-xkb-lock-fix.patch Log Message: libX11 1.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libX11/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 24 Sep 2007 19:11:41 -0000 1.11 +++ .cvsignore 6 Mar 2008 21:27:06 -0000 1.12 @@ -1 +1 @@ -libX11-1.1.3.tar.bz2 +libX11-1.1.4.tar.bz2 Index: libX11.spec =================================================================== RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- libX11.spec 20 Feb 2008 02:06:50 -0000 1.44 +++ libX11.spec 6 Mar 2008 21:27:06 -0000 1.45 @@ -1,22 +1,19 @@ Summary: X.Org X11 libX11 runtime library Name: libX11 -Version: 1.1.3 -Release: 5%{?dist} +Version: 1.1.4 +Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch # FIXME: https://bugs.freedesktop.org/show_bug.cgi?id=3646 seems to indicate # this patch is now committed upstream. When libX11-1.0.4 is released, # manually confirm each patch hunk before removal. Patch2: dont-forward-keycode-0.patch -Patch3: bug-201284.patch -Patch4: libX11-1.1.3-xkb-lock-fix.patch -Patch5: brightness-keysyms.patch BuildRequires: pkgconfig # xproto >= 7.0.6 required @@ -57,9 +54,6 @@ # find it later. #%patch0 -p0 -b .datadir-locale-dir-fix %patch2 -p1 -b .dont-forward-keycode-0 -%patch3 -p1 -b .3-bug201284 -%patch4 -p1 -b .jx -%patch5 -p1 -b .brightness-keysyms %build %configure \ @@ -89,136 +83,7 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog NEWS %dir %{_datadir}/X11 -%dir %{_datadir}/X11/locale -%dir %{_datadir}/X11/locale/C -%{_datadir}/X11/locale/C/* -%dir %{_datadir}/X11/locale/armscii-8 -%{_datadir}/X11/locale/armscii-8/* -%{_datadir}/X11/locale/compose.dir -%dir %{_datadir}/X11/locale/en_US.UTF-8 -%{_datadir}/X11/locale/en_US.UTF-8/* -%dir %{_datadir}/X11/locale/el_GR.UTF-8 -%{_datadir}/X11/locale/el_GR.UTF-8/* -%dir %{_datadir}/X11/locale/georgian-academy -%{_datadir}/X11/locale/georgian-academy/* -%dir %{_datadir}/X11/locale/georgian-ps -%{_datadir}/X11/locale/georgian-ps/* -%dir %{_datadir}/X11/locale/ibm-cp1133 -%{_datadir}/X11/locale/ibm-cp1133/* -%dir %{_datadir}/X11/locale/iscii-dev -%{_datadir}/X11/locale/iscii-dev/* -%dir %{_datadir}/X11/locale/isiri-3342 -%{_datadir}/X11/locale/isiri-3342/* -%dir %{_datadir}/X11/locale/iso8859-* -%{_datadir}/X11/locale/iso8859-*/* -%dir %{_datadir}/X11/locale/ja.* -%{_datadir}/X11/locale/ja.*/* -%dir %{_datadir}/X11/locale/ja -%{_datadir}/X11/locale/ja/* -%dir %{_datadir}/X11/locale/ja_JP.UTF-8 -%{_datadir}/X11/locale/ja_JP.UTF-8/Compose -%{_datadir}/X11/locale/ja_JP.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/ja_JP.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/ko -%{_datadir}/X11/locale/ko/Compose -%{_datadir}/X11/locale/ko/XI18N_OBJS -%{_datadir}/X11/locale/ko/XLC_LOCALE -%dir %{_datadir}/X11/locale/ko_KR.UTF-8 -%{_datadir}/X11/locale/ko_KR.UTF-8/Compose -%{_datadir}/X11/locale/ko_KR.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/ko_KR.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/koi8-c -%{_datadir}/X11/locale/koi8-c/Compose -%{_datadir}/X11/locale/koi8-c/XI18N_OBJS -%{_datadir}/X11/locale/koi8-c/XLC_LOCALE -%dir %{_datadir}/X11/locale/koi8-r -%{_datadir}/X11/locale/koi8-r/Compose -%{_datadir}/X11/locale/koi8-r/XI18N_OBJS -%{_datadir}/X11/locale/koi8-r/XLC_LOCALE -%dir %{_datadir}/X11/locale/koi8-u -%{_datadir}/X11/locale/koi8-u/Compose -%{_datadir}/X11/locale/koi8-u/XI18N_OBJS -%{_datadir}/X11/locale/koi8-u/XLC_LOCALE -%{_datadir}/X11/locale/locale.alias -%{_datadir}/X11/locale/locale.dir -%dir %{_datadir}/X11/locale/microsoft-* -%{_datadir}/X11/locale/microsoft-*/* -%dir %{_datadir}/X11/locale/mulelao-1 -%{_datadir}/X11/locale/mulelao-1/Compose -%{_datadir}/X11/locale/mulelao-1/XI18N_OBJS -%{_datadir}/X11/locale/mulelao-1/XLC_LOCALE -%dir %{_datadir}/X11/locale/nokhchi-1 -%{_datadir}/X11/locale/nokhchi-1/Compose -%{_datadir}/X11/locale/nokhchi-1/XI18N_OBJS -%{_datadir}/X11/locale/nokhchi-1/XLC_LOCALE -%dir %{_datadir}/X11/locale/pt_BR.UTF-8 -%{_datadir}/X11/locale/pt_BR.UTF-8/Compose -%{_datadir}/X11/locale/pt_BR.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/pt_BR.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/tatar-cyr -%{_datadir}/X11/locale/tatar-cyr/Compose -%{_datadir}/X11/locale/tatar-cyr/XI18N_OBJS -%{_datadir}/X11/locale/tatar-cyr/XLC_LOCALE -%dir %{_datadir}/X11/locale/th_TH.UTF-8 -%{_datadir}/X11/locale/th_TH.UTF-8/Compose -%{_datadir}/X11/locale/th_TH.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/th_TH.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/th_TH -%{_datadir}/X11/locale/th_TH/Compose -%{_datadir}/X11/locale/th_TH/XI18N_OBJS -%{_datadir}/X11/locale/th_TH/XLC_LOCALE -%dir %{_datadir}/X11/locale/tscii-0 -%{_datadir}/X11/locale/tscii-0/Compose -%{_datadir}/X11/locale/tscii-0/XI18N_OBJS -%{_datadir}/X11/locale/tscii-0/XLC_LOCALE -%dir %{_datadir}/X11/locale/vi_VN.tcvn -%{_datadir}/X11/locale/vi_VN.tcvn/Compose -%{_datadir}/X11/locale/vi_VN.tcvn/XI18N_OBJS -%{_datadir}/X11/locale/vi_VN.tcvn/XLC_LOCALE -%dir %{_datadir}/X11/locale/vi_VN.viscii -%{_datadir}/X11/locale/vi_VN.viscii/Compose -%{_datadir}/X11/locale/vi_VN.viscii/XI18N_OBJS -%{_datadir}/X11/locale/vi_VN.viscii/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_CN.UTF-8 -%{_datadir}/X11/locale/zh_CN.UTF-8/Compose -%{_datadir}/X11/locale/zh_CN.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/zh_CN.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_CN.gb18030 -%{_datadir}/X11/locale/zh_CN.gb18030/Compose -%{_datadir}/X11/locale/zh_CN.gb18030/XI18N_OBJS -%{_datadir}/X11/locale/zh_CN.gb18030/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_CN.gbk -%{_datadir}/X11/locale/zh_CN.gbk/Compose -%{_datadir}/X11/locale/zh_CN.gbk/XI18N_OBJS -%{_datadir}/X11/locale/zh_CN.gbk/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_CN -%{_datadir}/X11/locale/zh_CN/Compose -%{_datadir}/X11/locale/zh_CN/XI18N_OBJS -%{_datadir}/X11/locale/zh_CN/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_HK.UTF-8 -%{_datadir}/X11/locale/zh_HK.UTF-8/Compose -%{_datadir}/X11/locale/zh_HK.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/zh_HK.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_HK.big5 -%{_datadir}/X11/locale/zh_HK.big5/Compose -%{_datadir}/X11/locale/zh_HK.big5/XI18N_OBJS -%{_datadir}/X11/locale/zh_HK.big5/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_HK.big5hkscs -%{_datadir}/X11/locale/zh_HK.big5hkscs/Compose -%{_datadir}/X11/locale/zh_HK.big5hkscs/XI18N_OBJS -%{_datadir}/X11/locale/zh_HK.big5hkscs/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_TW.UTF-8 -%{_datadir}/X11/locale/zh_TW.UTF-8/Compose -%{_datadir}/X11/locale/zh_TW.UTF-8/XI18N_OBJS -%{_datadir}/X11/locale/zh_TW.UTF-8/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_TW.big5 -%{_datadir}/X11/locale/zh_TW.big5/Compose -%{_datadir}/X11/locale/zh_TW.big5/XI18N_OBJS -%{_datadir}/X11/locale/zh_TW.big5/XLC_LOCALE -%dir %{_datadir}/X11/locale/zh_TW -%{_datadir}/X11/locale/zh_TW/Compose -%{_datadir}/X11/locale/zh_TW/XI18N_OBJS -%{_datadir}/X11/locale/zh_TW/XLC_LOCALE +%{_datadir}/X11/locale/ %{_datadir}/X11/XErrorDB %{_datadir}/X11/XKeysymDB %{_libdir}/libX11.so.6 @@ -249,6 +114,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Adam Jackson 1.1.4-1 +- libX11 1.1.4 + * Tue Feb 19 2008 Fedora Release Engineering - 1.1.3-5 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libX11/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 24 Sep 2007 19:11:41 -0000 1.10 +++ sources 6 Mar 2008 21:27:06 -0000 1.11 @@ -1 +1 @@ -4d43d3e472c552d2f191ecdd4e75112c libX11-1.1.3.tar.bz2 +1469a5a8aa8d288dce6f4c45d2f68dc3 libX11-1.1.4.tar.bz2 --- brightness-keysyms.patch DELETED --- --- bug-201284.patch DELETED --- --- libX11-1.1.3-xkb-lock-fix.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 21:35:10 2008 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 6 Mar 2008 21:35:10 GMT Subject: rpms/em8300-kmod/F-8 em8300-kmod-0.16.3-2624.patch, NONE, 1.1 em8300-kmod.spec, 1.49, 1.50 Message-ID: <200803062135.m26LZAhg013481@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/pkgs/rpms/em8300-kmod/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13456 Modified Files: em8300-kmod.spec Added Files: em8300-kmod-0.16.3-2624.patch Log Message: * Thu Mar 6 2008 Ville Skytt?? - 0.16.3-7 - Backport upstream kernel 2.6.24 compat changes to 0.16.3 (not upgrading to 0.16.4 at least yet due to lack of WSS patches for it). - Build for kernel 2.6.24.3-12.fc8. em8300-kmod-0.16.3-2624.patch: --- NEW FILE em8300-kmod-0.16.3-2624.patch --- Index: em8300/modules/em8300_compat24.h diff -u em8300/modules/em8300_compat24.h:1.5 em8300/modules/em8300_compat24.h:1.6 --- em8300/modules/em8300_compat24.h:1.5 Mon Apr 10 15:31:14 2006 +++ em8300/modules/em8300_compat24.h Mon Dec 3 14:59:09 2007 @@ -1,4 +1,4 @@ -/* $Id: em8300_compat24.h,v 1.5 2006/04/10 22:31:14 nboullis Exp $ +/* $Id: em8300_compat24.h,v 1.6 2007/12/03 22:59:09 nboullis Exp $ * * em8300_compat24.h -- compatibility layer for 2.4 and some 2.5 kernels * Copyright (C) 2004 Andreas Schultz @@ -30,6 +30,15 @@ typedef void irqreturn_t; #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) +#ifndef IRQF_DISABLED +#define IRQF_DISABLED SA_INTERRUPT +#endif +#ifndef IRQF_SHARED +#define IRQF_SHARED SA_SHIRQ +#endif +#endif + /* i2c stuff */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,67) static inline void *i2c_get_clientdata(struct i2c_client *dev) Index: em8300/modules/em8300_main.c diff -u em8300/modules/em8300_main.c:1.132 em8300/modules/em8300_main.c:1.133 --- em8300/modules/em8300_main.c:1.132 Sun Jun 17 16:04:21 2007 +++ em8300/modules/em8300_main.c Mon Dec 3 14:59:09 2007 @@ -686,7 +686,7 @@ init_waitqueue_head(&em->vbi_wait); init_waitqueue_head(&em->sp_ptsfifo_wait); - result = request_irq(dev->irq, em8300_irq, SA_SHIRQ | SA_INTERRUPT, "em8300", (void *) em); + result = request_irq(dev->irq, em8300_irq, IRQF_SHARED | IRQF_DISABLED, "em8300", (void *) em); if (result == -EINVAL) { printk(KERN_ERR "em8300: Bad irq number or handler\n"); Index: em8300-kmod.spec =================================================================== RCS file: /cvs/pkgs/rpms/em8300-kmod/F-8/em8300-kmod.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- em8300-kmod.spec 11 Feb 2008 22:49:43 -0000 1.49 +++ em8300-kmod.spec 6 Mar 2008 21:34:36 -0000 1.50 @@ -4,7 +4,7 @@ # end stuff to be ... # hardcode for now: -%{!?kversion: %define kversion 2.6.23.15-137.fc8} +%{!?kversion: %define kversion 2.6.24.3-12.fc8} %define kmod_name em8300 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -25,7 +25,7 @@ Name: %{kmod_name}-kmod Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards Version: 0.16.3 -Release: 6.%(echo %{kverrel} | tr - _) +Release: 7.%(echo %{kverrel} | tr - _) Group: System Environment/Kernel License: GPLv2+ @@ -33,6 +33,7 @@ Source0: http://downloads.sourceforge.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz Patch0: http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch Patch1: %{name}-0.16.3-2623.patch +Patch2: %{name}-0.16.3-2624.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: i386 i586 @@ -47,6 +48,7 @@ cd %{kmod_name}-%{version}%{?prever} %patch0 -p0 %patch1 -p0 +%patch2 -p1 cd .. for kvariant in %{kvariants} ; do cp -a %{kmod_name}-%{version}%{?prever} _kmod_build_$kvariant @@ -79,6 +81,11 @@ %changelog +* Thu Mar 6 2008 Ville Skytt?? - 0.16.3-7 +- Backport upstream kernel 2.6.24 compat changes to 0.16.3 + (not upgrading to 0.16.4 at least yet due to lack of WSS patches for it). +- Build for kernel 2.6.24.3-12.fc8. + * Tue Feb 12 2008 Ville Skytt?? - Rebuild for kernel 2.6.23.15-137.fc8. From fedora-extras-commits at redhat.com Thu Mar 6 21:36:56 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 6 Mar 2008 21:36:56 GMT Subject: rpms/perl-SVK/devel perl-SVK.spec,1.10,1.11 Message-ID: <200803062136.m26Lau60013574@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SVK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13545 Modified Files: perl-SVK.spec Log Message: new perl Index: perl-SVK.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SVK/devel/perl-SVK.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-SVK.spec 6 Mar 2008 18:26:54 -0000 1.10 +++ perl-SVK.spec 6 Mar 2008 21:36:20 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-SVK Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Distributed Version Control System License: GPL+ or Artistic Group: Development/Libraries @@ -24,6 +24,8 @@ BuildRequires: perl(FreezeThaw) BuildRequires: perl(IO::Digest) BuildRequires: perl(List::MoreUtils) +BuildRequires: perl(Locale::Maketext::Lexicon) +BuildRequires: perl(Log::Log4perl) BuildRequires: perl(Path::Class) >= 0.16 BuildRequires: perl(PerlIO::eol) >= 0.13 BuildRequires: perl(PerlIO::via::dynamic) >= 0.11 @@ -83,7 +85,8 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -make test +# The tests are a bit hosed. Revisit at some point. +# make test chmod -R u+w t %clean @@ -98,6 +101,9 @@ %{_bindir}/svk %changelog +* Thu Mar 6 2008 Tom "spot" Callaway - 2.0.2-3 +- disable tests, they're a bit hosed + * Thu Mar 6 2008 Tom "spot" Callaway - 2.0.2-2 - rebuild for new perl From fedora-extras-commits at redhat.com Thu Mar 6 21:49:41 2008 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 6 Mar 2008 21:49:41 GMT Subject: rpms/perl-Sys-Virt/devel perl-Sys-Virt.spec, 1.10, 1.11 Sys-Virt-doc.patch, 1.1, NONE Message-ID: <200803062149.m26Lnfuo015042@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/pkgs/rpms/perl-Sys-Virt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14933 Modified Files: perl-Sys-Virt.spec Removed Files: Sys-Virt-doc.patch Log Message: Fix changelog comment and actually drop Sys-Virt-doc.patch. Index: perl-Sys-Virt.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sys-Virt/devel/perl-Sys-Virt.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Sys-Virt.spec 6 Mar 2008 21:20:52 -0000 1.10 +++ perl-Sys-Virt.spec 6 Mar 2008 21:49:05 -0000 1.11 @@ -61,7 +61,7 @@ %changelog * Wed Mar 05 2008 Steven Pritchard 0.1.2-1 - Update to 0.1.2. -- Drop Sys-Virt-Domain-doc.patch. +- Drop Sys-Virt-doc.patch. - BR XML::XPath. - No longer need to BR pkgconfig or xen-devel. - Disable 100-connect test. --- Sys-Virt-doc.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 21:51:30 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 6 Mar 2008 21:51:30 GMT Subject: rpms/selinux-policy/devel modules-mls.conf, 1.30, 1.31 modules-targeted.conf, 1.83, 1.84 policy-20071130.patch, 1.89, 1.90 selinux-policy.spec, 1.626, 1.627 Message-ID: <200803062151.m26LpUmJ015346@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15216 Modified Files: modules-mls.conf modules-targeted.conf policy-20071130.patch selinux-policy.spec Log Message: * Thu Mar 6 2008 Dan Walsh 3.3.1-12 - Fix initrc_context generation for MLS Index: modules-mls.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- modules-mls.conf 3 Jan 2008 22:13:09 -0000 1.30 +++ modules-mls.conf 6 Mar 2008 21:50:52 -0000 1.31 @@ -570,7 +570,7 @@ # # X windows login display manager # -xserver = off +xserver = base # Layer: services # Module: nscd Index: modules-targeted.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- modules-targeted.conf 26 Feb 2008 23:02:51 -0000 1.83 +++ modules-targeted.conf 6 Mar 2008 21:50:52 -0000 1.84 @@ -275,7 +275,14 @@ # # cyphesis game server # -cyphesis +cyphesis = module + +# Layer: services +# Module: gamin +# +# FAM File Alteration Monitor API +# +gamin = module # Layer: services # Module: cyrus policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- policy-20071130.patch 5 Mar 2008 23:11:52 -0000 1.89 +++ policy-20071130.patch 6 Mar 2008 21:50:52 -0000 1.90 @@ -693,7 +693,7 @@ +system_r:xdm_t xguest_r:xguest_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.3.1/Makefile --- nsaserefpolicy/Makefile 2008-02-06 10:33:22.000000000 -0500 -+++ serefpolicy-3.3.1/Makefile 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/Makefile 2008-03-06 11:35:33.000000000 -0500 @@ -235,7 +235,7 @@ appdir := $(contextpath) user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts) @@ -736,6 +736,17 @@ endef # create-base-per-role-tmpl modulenames,outputfile +@@ -521,6 +523,10 @@ + @mkdir -p $(appdir)/users + $(verbose) $(INSTALL) -m 644 $^ $@ + ++$(appdir)/initrc_context: $(tmpdir)/initrc_context ++ @mkdir -p $(appdir) ++ $(verbose) $(INSTALL) -m 644 $< $@ ++ + $(appdir)/%: $(appconf)/% + @mkdir -p $(appdir) + $(verbose) $(INSTALL) -m 644 $< $@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.3.1/man/man8/httpd_selinux.8 --- nsaserefpolicy/man/man8/httpd_selinux.8 2008-02-18 14:30:19.000000000 -0500 +++ serefpolicy-3.3.1/man/man8/httpd_selinux.8 2008-02-29 09:31:45.000000000 -0500 @@ -2308,7 +2319,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.3.1/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2007-12-19 05:32:18.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/admin/rpm.te 2008-02-28 15:36:54.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/admin/rpm.te 2008-03-06 13:12:21.000000000 -0500 @@ -31,6 +31,9 @@ files_type(rpm_var_lib_t) typealias rpm_var_lib_t alias var_lib_rpm_t; @@ -2381,9 +2392,21 @@ optional_policy(` java_domtrans(rpm_script_t) +@@ -353,6 +372,11 @@ + ') + + optional_policy(` ++ gamin_domtrans(rpm_t) ++ gamin_stream_connect(rpm_t) ++') ++ ++optional_policy(` + usermanage_domtrans_groupadd(rpm_script_t) + usermanage_domtrans_useradd(rpm_script_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.3.1/policy/modules/admin/sudo.if --- nsaserefpolicy/policy/modules/admin/sudo.if 2007-12-04 11:02:51.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/admin/sudo.if 2008-02-27 12:44:10.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/admin/sudo.if 2008-03-06 15:38:11.000000000 -0500 @@ -55,7 +55,7 @@ # @@ -2393,12 +2416,13 @@ allow $1_sudo_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow $1_sudo_t self:process { setexec setrlimit }; allow $1_sudo_t self:fd use; -@@ -68,33 +68,34 @@ +@@ -68,33 +68,35 @@ allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms; allow $1_sudo_t self:unix_dgram_socket sendto; allow $1_sudo_t self:unix_stream_socket connectto; - allow $1_sudo_t self:netlink_audit_socket { create bind write nlmsg_read read }; + allow $1_sudo_t self:key manage_key_perms; ++ allow $1_sudo_t $1_t:key search; # Enter this derived domain from the user domain domtrans_pattern($2, sudo_exec_t, $1_sudo_t) @@ -2432,7 +2456,7 @@ domain_use_interactive_fds($1_sudo_t) domain_sigchld_interactive_fds($1_sudo_t) -@@ -106,32 +107,42 @@ +@@ -106,32 +108,42 @@ files_getattr_usr_files($1_sudo_t) # for some PAM modules and for cwd files_dontaudit_search_home($1_sudo_t) @@ -2485,7 +2509,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.3.1/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2007-10-12 08:56:09.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/admin/su.if 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/admin/su.if 2008-03-06 15:39:00.000000000 -0500 @@ -41,15 +41,13 @@ allow $2 $1_su_t:process signal; @@ -2535,7 +2559,7 @@ ') ####################################### -@@ -172,13 +170,12 @@ +@@ -172,14 +170,14 @@ domain_interactive_fd($1_su_t) role $3 types $1_su_t; @@ -2550,9 +2574,11 @@ allow $1_su_t self:fifo_file rw_fifo_file_perms; - allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; allow $1_su_t self:key { search write }; ++ allow $1_su_t $1_t:key search; # Transition from the user domain to this domain. -@@ -188,7 +185,7 @@ + domtrans_pattern($2, su_exec_t, $1_su_t) +@@ -188,7 +186,7 @@ corecmd_shell_domtrans($1_su_t,$2) allow $2 $1_su_t:fd use; allow $2 $1_su_t:fifo_file rw_file_perms; @@ -2561,7 +2587,7 @@ kernel_read_system_state($1_su_t) kernel_read_kernel_sysctls($1_su_t) -@@ -203,15 +200,15 @@ +@@ -203,15 +201,15 @@ # needed for pam_rootok selinux_compute_access_vector($1_su_t) @@ -2580,7 +2606,7 @@ files_read_etc_files($1_su_t) files_read_etc_runtime_files($1_su_t) files_search_var_lib($1_su_t) -@@ -226,12 +223,14 @@ +@@ -226,12 +224,14 @@ libs_use_ld_so($1_su_t) libs_use_shared_libs($1_su_t) @@ -2596,7 +2622,7 @@ ifdef(`distro_rhel4',` domain_role_change_exemption($1_su_t) -@@ -295,13 +294,7 @@ +@@ -295,13 +295,7 @@ xserver_domtrans_user_xauth($1, $1_su_t) ') @@ -3592,8 +3618,8 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.3.1/policy/modules/apps/gpg.te --- nsaserefpolicy/policy/modules/apps/gpg.te 2007-12-19 05:32:09.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/apps/gpg.te 2008-02-26 08:29:22.000000000 -0500 -@@ -7,15 +7,228 @@ ++++ serefpolicy-3.3.1/policy/modules/apps/gpg.te 2008-03-06 15:47:25.000000000 -0500 +@@ -7,15 +7,229 @@ # # Type for gpg or pgp executables. @@ -3644,6 +3670,7 @@ +userdom_user_home_dir_filetrans(user, gpg_t, user_gpg_secret_t, dir) +userdom_manage_user_home_content_files(user,gpg_t) +userdom_manage_user_tmp_files(user,gpg_t) ++userdom_unpriv_users_stream_connect(gpg_t) + +# transition from the gpg domain to the helper domain +domtrans_pattern(gpg_t,gpg_helper_exec_t,gpg_helper_t) @@ -3911,7 +3938,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.3.1/policy/modules/apps/java.fc --- nsaserefpolicy/policy/modules/apps/java.fc 2007-03-01 10:01:48.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/apps/java.fc 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/apps/java.fc 2008-03-06 11:17:59.000000000 -0500 @@ -11,6 +11,7 @@ # /usr/(.*/)?bin/java.* -- gen_context(system_u:object_r:java_exec_t,s0) @@ -3920,7 +3947,7 @@ /usr/bin/frysk -- gen_context(system_u:object_r:java_exec_t,s0) /usr/bin/gappletviewer -- gen_context(system_u:object_r:java_exec_t,s0) /usr/bin/gcj-dbtool -- gen_context(system_u:object_r:java_exec_t,s0) -@@ -20,5 +21,14 @@ +@@ -20,5 +21,15 @@ /usr/bin/grmic -- gen_context(system_u:object_r:java_exec_t,s0) /usr/bin/grmiregistry -- gen_context(system_u:object_r:java_exec_t,s0) /usr/bin/jv-convert -- gen_context(system_u:object_r:java_exec_t,s0) @@ -3933,13 +3960,14 @@ +/usr/lib/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0) +/usr/lib64/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0) + -+/usr/lib/openoffice\.org/program/soffice\.bin -- gen_context(system_u:object_r:java_exec_t,s0) -+/usr/lib64/openoffice\.org/program/soffice\.bin -- gen_context(system_u:object_r:java_exec_t,s0) ++/usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:java_exec_t,s0) ++/usr/lib64/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:java_exec_t,s0) ++ + +/usr/bin/octave-[^/]* -- gen_context(system_u:object_r:java_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.3.1/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 2007-10-12 08:56:02.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/apps/java.if 2008-03-03 08:25:05.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/apps/java.if 2008-03-06 11:15:51.000000000 -0500 @@ -32,7 +32,7 @@ ## ## @@ -3949,7 +3977,7 @@ gen_require(` type java_exec_t; ') -@@ -57,14 +57,16 @@ +@@ -57,18 +57,21 @@ # Local policy # @@ -3970,7 +3998,12 @@ manage_dirs_pattern($1_javaplugin_t,$1_javaplugin_tmp_t,$1_javaplugin_tmp_t) manage_files_pattern($1_javaplugin_t,$1_javaplugin_tmp_t,$1_javaplugin_tmp_t) -@@ -76,13 +78,9 @@ + files_tmp_filetrans($1_javaplugin_t,$1_javaplugin_tmp_t,{ file dir }) ++ allow $1_javaplugin_t $1_javaplugin_tmp_t:file execute; + + manage_files_pattern($1_javaplugin_t,$1_javaplugin_tmpfs_t,$1_javaplugin_tmpfs_t) + manage_lnk_files_pattern($1_javaplugin_t,$1_javaplugin_tmpfs_t,$1_javaplugin_tmpfs_t) +@@ -76,14 +79,9 @@ manage_sock_files_pattern($1_javaplugin_t,$1_javaplugin_tmpfs_t,$1_javaplugin_tmpfs_t) fs_tmpfs_filetrans($1_javaplugin_t,$1_javaplugin_tmpfs_t,{ file lnk_file sock_file fifo_file }) @@ -3981,10 +4014,11 @@ - # The user role is authorized for this domain. - domain_auto_trans($1_t, java_exec_t, $1_javaplugin_t) -+ domain_auto_trans($2, java_exec_t, $1_javaplugin_t) - allow $1_javaplugin_t $2:fd use; +- allow $1_javaplugin_t $2:fd use; ++ domtrans_pattern($2, java_exec_t, $1_javaplugin_t) # Unrestricted inheritance from the caller. allow $2 $1_javaplugin_t:process { noatsecure siginh rlimitinh }; + allow $1_javaplugin_t $2:process signull; @@ -94,7 +92,7 @@ kernel_read_system_state($1_javaplugin_t) @@ -4034,7 +4068,17 @@ userdom_manage_user_home_content_dirs($1,$1_javaplugin_t) userdom_manage_user_home_content_files($1,$1_javaplugin_t) userdom_manage_user_home_content_symlinks($1,$1_javaplugin_t) -@@ -156,16 +162,63 @@ +@@ -146,9 +152,6 @@ + + tunable_policy(`allow_java_execstack',` + allow $1_javaplugin_t self:process execstack; +- +- allow $1_javaplugin_t $1_javaplugin_tmp_t:file execute; +- + libs_legacy_use_shared_libs($1_javaplugin_t) + libs_legacy_use_ld_so($1_javaplugin_t) + +@@ -156,16 +159,63 @@ ') optional_policy(` @@ -4104,7 +4148,7 @@ ') ######################################## -@@ -219,3 +272,67 @@ +@@ -219,3 +269,67 @@ corecmd_search_bin($1) domtrans_pattern($1, java_exec_t, java_t) ') @@ -4378,7 +4422,7 @@ # /bin diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.3.1/policy/modules/apps/mozilla.if --- nsaserefpolicy/policy/modules/apps/mozilla.if 2007-10-29 07:52:48.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/apps/mozilla.if 2008-03-04 10:33:57.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/apps/mozilla.if 2008-03-06 10:13:20.000000000 -0500 @@ -35,7 +35,10 @@ template(`mozilla_per_role_template',` gen_require(` @@ -4508,7 +4552,7 @@ # Unrestricted inheritance from the caller. allow $2 $1_mozilla_t:process { noatsecure siginh rlimitinh }; -@@ -112,11 +151,13 @@ +@@ -112,17 +151,20 @@ ps_process_pattern($2,$1_mozilla_t) allow $2 $1_mozilla_t:process signal_perms; @@ -4524,7 +4568,22 @@ # Look for plugins corecmd_list_bin($1_mozilla_t) -@@ -165,13 +206,28 @@ + # for bash - old mozilla binary + corecmd_exec_shell($1_mozilla_t) + corecmd_exec_bin($1_mozilla_t) ++ application_exec($1_mozilla_t) + + # Browse the web, connect to printer + corenet_all_recvfrom_unlabeled($1_mozilla_t) +@@ -151,6 +193,7 @@ + + dev_read_urand($1_mozilla_t) + dev_read_rand($1_mozilla_t) ++ + dev_write_sound($1_mozilla_t) + dev_read_sound($1_mozilla_t) + dev_dontaudit_rw_dri($1_mozilla_t) +@@ -165,13 +208,28 @@ files_read_var_files($1_mozilla_t) files_read_var_symlinks($1_mozilla_t) files_dontaudit_getattr_boot_dirs($1_mozilla_t) @@ -4553,29 +4612,29 @@ libs_use_ld_so($1_mozilla_t) libs_use_shared_libs($1_mozilla_t) -@@ -180,18 +236,10 @@ +@@ -180,18 +238,10 @@ miscfiles_read_fonts($1_mozilla_t) miscfiles_read_localization($1_mozilla_t) - # Browse the web, connect to printer - sysnet_dns_name_resolve($1_mozilla_t) - sysnet_read_config($1_mozilla_t) -+ userdom_dontaudit_read_user_tmp_files($1,$1_mozilla_t) -+ userdom_dontaudit_use_user_terminals($1,$1_mozilla_t) - +- - userdom_manage_user_home_content_dirs($1,$1_mozilla_t) - userdom_manage_user_home_content_files($1,$1_mozilla_t) - userdom_manage_user_home_content_symlinks($1,$1_mozilla_t) - userdom_manage_user_tmp_dirs($1,$1_mozilla_t) - userdom_manage_user_tmp_files($1,$1_mozilla_t) - userdom_manage_user_tmp_sockets($1,$1_mozilla_t) -- ++ userdom_dontaudit_read_user_tmp_files($1,$1_mozilla_t) ++ userdom_dontaudit_use_user_terminals($1,$1_mozilla_t) + - xserver_user_client_template($1,$1_mozilla_t,$1_mozilla_tmpfs_t) + xserver_user_x_domain_template($1,$1_mozilla,$1_mozilla_t,$1_mozilla_tmpfs_t) xserver_dontaudit_read_xdm_tmp_files($1_mozilla_t) xserver_dontaudit_getattr_xdm_tmp_sockets($1_mozilla_t) -@@ -211,131 +259,8 @@ +@@ -211,131 +261,8 @@ fs_manage_cifs_symlinks($1_mozilla_t) ') @@ -4709,7 +4768,7 @@ ') optional_policy(` -@@ -350,19 +275,27 @@ +@@ -350,19 +277,27 @@ optional_policy(` cups_read_rw_config($1_mozilla_t) cups_dbus_chat($1_mozilla_t) @@ -4721,14 +4780,14 @@ - dbus_user_bus_client_template($1,$1_mozilla,$1_mozilla_t) +# dbus_user_bus_client_template($1,$1_mozilla,$1_mozilla_t) +# dbus_connectto_user_bus($1,$1_mozilla_t) - ') - - optional_policy(` -+ gnome_exec_gconf($1_mozilla_t) -+ gnome_manage_user_gnome_config($1,$1_mozilla_t) + ') + + optional_policy(` ++ gnome_exec_gconf($1_mozilla_t) ++ gnome_manage_user_gnome_config($1,$1_mozilla_t) + ') + + optional_policy(` + gnome_domtrans_user_gconf($1,$1_mozilla_t) gnome_stream_connect_gconf_template($1,$1_mozilla_t) ') @@ -4739,7 +4798,7 @@ ') optional_policy(` -@@ -370,37 +303,18 @@ +@@ -370,37 +305,18 @@ ') optional_policy(` @@ -4780,7 +4839,7 @@ ') ######################################## -@@ -430,11 +344,11 @@ +@@ -430,11 +346,11 @@ # template(`mozilla_read_user_home_files',` gen_require(` @@ -4795,7 +4854,7 @@ ') ######################################## -@@ -464,11 +378,10 @@ +@@ -464,11 +380,10 @@ # template(`mozilla_write_user_home_files',` gen_require(` @@ -4809,7 +4868,7 @@ ') ######################################## -@@ -573,3 +486,27 @@ +@@ -573,3 +488,27 @@ allow $2 $1_mozilla_t:tcp_socket rw_socket_perms; ') @@ -6082,7 +6141,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.3.1/policy/modules/kernel/corecommands.fc --- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2007-12-12 11:35:27.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/kernel/corecommands.fc 2008-02-26 13:48:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/kernel/corecommands.fc 2008-03-06 10:56:27.000000000 -0500 @@ -7,11 +7,11 @@ /bin/d?ash -- gen_context(system_u:object_r:shell_exec_t,s0) /bin/bash -- gen_context(system_u:object_r:shell_exec_t,s0) @@ -6173,7 +6232,19 @@ /usr/share/apr-0/build/[^/]+\.sh -- gen_context(system_u:object_r:bin_t,s0) /usr/share/apr-0/build/libtool -- gen_context(system_u:object_r:bin_t,s0) -@@ -284,3 +292,10 @@ +@@ -213,9 +221,10 @@ + /etc/gdm/[^/]+/.* gen_context(system_u:object_r:bin_t,s0) + + /usr/lib/.*/program(/.*)? gen_context(system_u:object_r:bin_t,s0) ++/usr/lib64/.*/program(/.*)? gen_context(system_u:object_r:bin_t,s0) + /usr/lib/bluetooth(/.*)? -- gen_context(system_u:object_r:bin_t,s0) +-/usr/lib/vmware-tools/sbin32(/.*)? gen_context(system_u:object_r:bin_t,s0) + /usr/lib64/bluetooth(/.*)? -- gen_context(system_u:object_r:bin_t,s0) ++/usr/lib/vmware-tools/sbin32(/.*)? gen_context(system_u:object_r:bin_t,s0) + /usr/share/authconfig/authconfig-gtk\.py -- gen_context(system_u:object_r:bin_t,s0) + /usr/share/authconfig/authconfig-tui\.py -- gen_context(system_u:object_r:bin_t,s0) + /usr/share/authconfig/authconfig\.py -- gen_context(system_u:object_r:bin_t,s0) +@@ -284,3 +293,10 @@ ifdef(`distro_suse',` /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0) ') @@ -7061,7 +7132,7 @@ # etc_runtime_t is the type of various diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.3.1/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2007-10-24 15:00:24.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/kernel/filesystem.if 2008-03-04 08:35:34.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/kernel/filesystem.if 2008-03-06 10:50:35.000000000 -0500 @@ -310,6 +310,25 @@ ######################################## @@ -7123,7 +7194,15 @@ ') ######################################## -@@ -3039,6 +3077,25 @@ +@@ -2903,6 +2941,7 @@ + type tmpfs_t; + ') + ++ dontaudit $1 tmpfs_t:dir rw_dir_perms; + dontaudit $1 tmpfs_t:file rw_file_perms; + ') + +@@ -3039,6 +3078,25 @@ ######################################## ## @@ -7149,7 +7228,7 @@ ## Relabel block nodes on tmpfs filesystems. ## ## -@@ -3224,6 +3281,7 @@ +@@ -3224,6 +3282,7 @@ ') allow $1 filesystem_type:filesystem getattr; @@ -7157,7 +7236,7 @@ ') ######################################## -@@ -3551,3 +3609,123 @@ +@@ -3551,3 +3610,123 @@ relabelfrom_blk_files_pattern($1,noxattrfs,noxattrfs) relabelfrom_chr_files_pattern($1,noxattrfs,noxattrfs) ') @@ -13572,7 +13651,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.3.1/policy/modules/services/fail2ban.te --- nsaserefpolicy/policy/modules/services/fail2ban.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/fail2ban.te 2008-03-04 15:04:18.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/fail2ban.te 2008-03-06 13:11:59.000000000 -0500 @@ -18,6 +18,9 @@ type fail2ban_var_run_t; files_pid_file(fail2ban_var_run_t) @@ -13594,7 +13673,7 @@ kernel_read_system_state(fail2ban_t) -@@ -47,14 +51,20 @@ +@@ -47,14 +51,23 @@ files_read_etc_files(fail2ban_t) files_read_usr_files(fail2ban_t) @@ -13602,6 +13681,9 @@ +files_search_var_lib(fail2ban_t) + +fs_list_inotifyfs(fail2ban_t) ++ ++auth_use_nsswitch(fail2ban_t) ++corenet_tcp_connect_dns_port(fail2ban_t) libs_use_ld_so(fail2ban_t) libs_use_shared_libs(fail2ban_t) @@ -13616,6 +13698,18 @@ optional_policy(` apache_read_log(fail2ban_t) ') +@@ -64,5 +77,11 @@ + ') + + optional_policy(` ++ gamin_domtrans(fail2ban_t) ++ gamin_stream_connect(fail2ban_t) ++') ++ ++optional_policy(` + iptables_domtrans(fail2ban_t) + ') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.fc serefpolicy-3.3.1/policy/modules/services/fetchmail.fc --- nsaserefpolicy/policy/modules/services/fetchmail.fc 2006-11-16 17:15:21.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/services/fetchmail.fc 2008-02-26 08:29:22.000000000 -0500 @@ -13867,6 +13961,97 @@ ') optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.fc serefpolicy-3.3.1/policy/modules/services/gamin.fc +--- nsaserefpolicy/policy/modules/services/gamin.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/gamin.fc 2008-03-06 13:09:29.000000000 -0500 +@@ -0,0 +1,2 @@ ++ ++/usr/libexec/gam_server -- gen_context(system_u:object_r:gamin_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.if serefpolicy-3.3.1/policy/modules/services/gamin.if +--- nsaserefpolicy/policy/modules/services/gamin.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/gamin.if 2008-03-06 13:09:29.000000000 -0500 +@@ -0,0 +1,39 @@ ++ ++## policy for gamin ++ ++######################################## ++## ++## Execute a domain transition to run gamin. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`gamin_domtrans',` ++ gen_require(` ++ type gamin_t; ++ type gamin_exec_t; ++ ') ++ ++ domtrans_pattern($1,gamin_exec_t,gamin_t) ++') ++ ++######################################## ++## ++## Connect to gamin over an unix stream socket. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`gamin_stream_connect',` ++ gen_require(` ++ type gamin_t; ++ ') ++ ++ allow $1 gamin_t:unix_stream_socket connectto; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.te serefpolicy-3.3.1/policy/modules/services/gamin.te +--- nsaserefpolicy/policy/modules/services/gamin.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/gamin.te 2008-03-06 13:11:39.000000000 -0500 +@@ -0,0 +1,38 @@ ++policy_module(gamin,1.0.0) ++ ++######################################## ++# ++# Declarations ++# ++ ++type gamin_t; ++type gamin_exec_t; ++init_daemon_domain(gamin_t, gamin_exec_t) ++ ++######################################## ++# ++# gamin local policy ++# ++ ++# Init script handling ++domain_use_interactive_fds(gamin_t) ++ ++# internal communication is often done using fifo and unix sockets. ++allow gamin_t self:fifo_file rw_file_perms; ++allow gamin_t self:unix_stream_socket create_stream_socket_perms; ++ ++files_read_etc_files(gamin_t) ++files_read_etc_runtime_files(gamin_t) ++files_list_all(gamin_t) ++files_getattr_all_files(gamin_t) ++ ++fs_list_inotifyfs(gamin_t) ++domain_read_all_domains_state(gamin_t) ++ ++libs_use_ld_so(gamin_t) ++libs_use_shared_libs(gamin_t) ++ ++miscfiles_read_localization(gamin_t) ++ ++role unconfined_r types gamin_t; ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.fc serefpolicy-3.3.1/policy/modules/services/gnomeclock.fc --- nsaserefpolicy/policy/modules/services/gnomeclock.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/services/gnomeclock.fc 2008-02-26 08:29:22.000000000 -0500 @@ -15382,7 +15567,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.3.1/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/mta.te 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/mta.te 2008-03-06 11:55:52.000000000 -0500 @@ -6,6 +6,8 @@ # Declarations # @@ -15469,11 +15654,15 @@ logrotate_read_tmp_files(system_mail_t) ') -@@ -136,11 +162,33 @@ +@@ -136,11 +162,37 @@ ') optional_policy(` -+ clamav_stream_connect(sendmail_t) ++ clamav_stream_connect(system_mail_t) ++') ++ ++optional_policy(` ++ fail2ban_append_log(system_mail_t) +') + +optional_policy(` @@ -15504,7 +15693,7 @@ optional_policy(` # why is mail delivered to a directory of type arpwatch_data_t? arpwatch_search_data(mailserver_delivery) -@@ -154,3 +202,4 @@ +@@ -154,3 +206,4 @@ cron_read_system_job_tmp_files(mta_user_agent) ') ') @@ -16109,7 +16298,7 @@ +/var/log/wpa_supplicant\.log.* -- gen_context(system_u:object_r:NetworkManager_log_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.3.1/policy/modules/services/networkmanager.if --- nsaserefpolicy/policy/modules/services/networkmanager.if 2007-06-12 10:15:45.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.if 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.if 2008-03-06 11:40:40.000000000 -0500 @@ -97,3 +97,21 @@ allow $1 NetworkManager_t:dbus send_msg; allow NetworkManager_t $1:dbus send_msg; @@ -16134,7 +16323,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.3.1/policy/modules/services/networkmanager.te --- nsaserefpolicy/policy/modules/services/networkmanager.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te 2008-03-06 11:40:30.000000000 -0500 @@ -13,6 +13,9 @@ type NetworkManager_var_run_t; files_pid_file(NetworkManager_var_run_t) @@ -18136,7 +18325,7 @@ -') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.3.1/policy/modules/services/ppp.te --- nsaserefpolicy/policy/modules/services/ppp.te 2008-02-15 09:52:56.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/ppp.te 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/ppp.te 2008-03-06 11:40:58.000000000 -0500 @@ -196,6 +196,12 @@ optional_policy(` @@ -18162,6 +18351,21 @@ allow pptp_t self:fifo_file { read write }; allow pptp_t self:unix_dgram_socket create_socket_perms; allow pptp_t self:unix_stream_socket { connectto create_stream_socket_perms }; +@@ -287,6 +293,14 @@ + ') + + optional_policy(` ++ dbus_system_domain(pppd_t,pppd_exec_t) ++ ++ optional_policy(` ++ networkmanager_dbus_chat(pppd_t) ++ ') ++') ++ ++optional_policy(` + hostname_exec(pptp_t) + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.fc serefpolicy-3.3.1/policy/modules/services/prelude.fc --- nsaserefpolicy/policy/modules/services/prelude.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/services/prelude.fc 2008-02-26 08:29:22.000000000 -0500 @@ -23035,7 +23239,7 @@ /var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.3.1/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-12-04 11:02:50.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-05 14:36:29.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-06 13:07:32.000000000 -0500 @@ -12,9 +12,15 @@ ## ## @@ -23499,7 +23703,7 @@ # for when /tmp/.X11-unix is created by the system allow $2 xdm_t:fd use; -@@ -542,25 +540,465 @@ +@@ -542,25 +540,473 @@ allow $2 xdm_tmp_t:sock_file { read write }; dontaudit $2 xdm_t:tcp_socket { read write }; @@ -23647,14 +23851,15 @@ + class x_synthetic_event all_x_synthetic_event_perms; + + attribute xdm_x_domain; -+ type xdm_t; + ') + + allow $2 $1:x_drawable { hide setattr show receive create manage add_child write read getattr remove_child list_child destroy set_property }; + allow $2 $1:x_event receive; + allow $2 $1:x_synthetic_event receive; -+ + allow $1 $2:x_property read; ++ ++ allow $2 std_xext_t:x_extension query; ++ allow $2 x_rootwindow_t:x_drawable { get_property getattr }; +') + +####################################### @@ -23691,6 +23896,7 @@ + type screensaver_xext_t, unknown_xext_t, x_rootscreen_t; + type disallowed_xext_t; + type output_xext_t; ++ type accelgraphics_xext_t; + + attribute x_server_domain, x_domain; + attribute xproperty_type; @@ -23743,6 +23949,10 @@ + # everyone can get the input focus of everyone else + # this is a fundamental brokenness in the X protocol + allow $3 { x_domain x_server_domain }:x_device { getfocus setfocus use setattr bell manage freeze getattr grab force_cursor }; ++ ++ allow $3 { x_domain xserver_unconfined_type }:x_drawable receive; ++ allow $3 { x_domain xserver_unconfined_type }:x_event receive; ++ + tunable_policy(`allow_read_x_device',` + allow $3 { x_domain x_server_domain }:x_device read; + ') @@ -23760,6 +23970,8 @@ + # allows to know when new windows appear, among other things + allow $3 manage_xevent_t:x_event receive; + ++ allow $3 accelgraphics_xext_t:x_extension use; ++ + # X Server + # can read server-owned resources + allow $3 x_server_domain:x_resource read; @@ -23971,7 +24183,7 @@ ') ') -@@ -593,26 +1031,44 @@ +@@ -593,26 +1039,44 @@ # template(`xserver_use_user_fonts',` gen_require(` @@ -24023,7 +24235,7 @@ ## Transition to a user Xauthority domain. ## ## -@@ -638,10 +1094,77 @@ +@@ -638,10 +1102,77 @@ # template(`xserver_domtrans_user_xauth',` gen_require(` @@ -24103,7 +24315,7 @@ ') ######################################## -@@ -671,10 +1194,10 @@ +@@ -671,10 +1202,10 @@ # template(`xserver_user_home_dir_filetrans_user_xauth',` gen_require(` @@ -24116,7 +24328,7 @@ ') ######################################## -@@ -760,7 +1283,7 @@ +@@ -760,7 +1291,7 @@ type xconsole_device_t; ') @@ -24125,7 +24337,7 @@ ') ######################################## -@@ -860,6 +1383,25 @@ +@@ -860,6 +1391,25 @@ ######################################## ## @@ -24151,7 +24363,7 @@ ## Read xdm-writable configuration files. ## ## -@@ -914,6 +1456,7 @@ +@@ -914,6 +1464,7 @@ files_search_tmp($1) allow $1 xdm_tmp_t:dir list_dir_perms; create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t) @@ -24159,7 +24371,7 @@ ') ######################################## -@@ -955,6 +1498,24 @@ +@@ -955,6 +1506,24 @@ ######################################## ## @@ -24184,7 +24396,7 @@ ## Execute the X server in the XDM X server domain. ## ## -@@ -965,15 +1526,47 @@ +@@ -965,15 +1534,47 @@ # interface(`xserver_domtrans_xdm_xserver',` gen_require(` @@ -24233,7 +24445,7 @@ ## Make an X session script an entrypoint for the specified domain. ## ## -@@ -1123,7 +1716,7 @@ +@@ -1123,7 +1724,7 @@ type xdm_xserver_tmp_t; ') @@ -24242,7 +24454,7 @@ ') ######################################## -@@ -1312,3 +1905,82 @@ +@@ -1312,3 +1913,82 @@ files_search_tmp($1) stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t) ') @@ -24327,7 +24539,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.3.1/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.te 2008-03-05 18:07:11.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.te 2008-03-06 15:35:49.000000000 -0500 @@ -8,6 +8,14 @@ ## @@ -24571,7 +24783,7 @@ storage_dontaudit_raw_write_removable_device(xdm_t) storage_dontaudit_setattr_removable_dev(xdm_t) storage_dontaudit_rw_scsi_generic(xdm_t) -+storage_rw_fuse(xdm_t) ++storage_dontaudit_rw_fuse(xdm_t) term_setattr_console(xdm_t) term_use_unallocated_ttys(xdm_t) @@ -26108,7 +26320,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.3.1/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2007-12-12 11:35:28.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/libraries.fc 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/libraries.fc 2008-03-06 10:59:36.000000000 -0500 @@ -133,6 +133,7 @@ /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -26142,7 +26354,14 @@ /usr/lib(64)?/.*/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/local/(.*/)?libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) HOME_DIR/.*/plugins/nprhapengine\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -292,6 +295,8 @@ +@@ -287,11 +290,15 @@ + /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib/acroread/.+\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib/acroread/(.*/)?ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib/.*/program(/.*)?\.so gen_context(system_u:object_r:lib_t,s0) ++/usr/lib64/.*/program(/.*)?\.so gen_context(system_u:object_r:lib_t,s0) + ') dnl end distro_redhat + # # /var # @@ -26151,7 +26370,7 @@ /var/ftp/lib(64)?(/.*)? gen_context(system_u:object_r:lib_t,s0) /var/ftp/lib(64)?/ld[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:ld_so_t,s0) -@@ -304,3 +309,9 @@ +@@ -304,3 +311,9 @@ /var/spool/postfix/lib(64)?(/.*)? gen_context(system_u:object_r:lib_t,s0) /var/spool/postfix/usr(/.*)? gen_context(system_u:object_r:lib_t,s0) /var/spool/postfix/lib(64)?/ld.*\.so.* -- gen_context(system_u:object_r:ld_so_t,s0) @@ -27152,8 +27371,8 @@ +/usr/bin/qemu-kvm -- gen_context(system_u:object_r:qemu_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/qemu.if serefpolicy-3.3.1/policy/modules/system/qemu.if --- nsaserefpolicy/policy/modules/system/qemu.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/qemu.if 2008-02-27 23:40:38.000000000 -0500 -@@ -0,0 +1,291 @@ ++++ serefpolicy-3.3.1/policy/modules/system/qemu.if 2008-03-06 09:35:23.000000000 -0500 +@@ -0,0 +1,294 @@ + +## policy for qemu + @@ -27389,6 +27608,9 @@ + type $1_t; + domain_type($1_t) + ++ type $1_tmp_t; ++ files_tmp_file($1_tmp_t) ++ + domain_use_interactive_fds($1_t) + + allow $1_t self:capability { dac_read_search dac_override }; @@ -28092,7 +28314,7 @@ allow setrans_t self:netlink_selinux_socket create_socket_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.3.1/policy/modules/system/sysnetwork.if --- nsaserefpolicy/policy/modules/system/sysnetwork.if 2007-07-16 14:09:49.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.if 2008-03-04 15:18:51.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.if 2008-03-06 11:55:26.000000000 -0500 @@ -145,6 +145,25 @@ ######################################## @@ -28391,8 +28613,8 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.3.1/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-12-12 11:35:28.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/unconfined.fc 2008-03-04 10:17:41.000000000 -0500 -@@ -2,15 +2,18 @@ ++++ serefpolicy-3.3.1/policy/modules/system/unconfined.fc 2008-03-06 11:17:16.000000000 -0500 +@@ -2,15 +2,16 @@ # e.g.: # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0) # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t @@ -28402,8 +28624,7 @@ /usr/lib/ia32el/ia32x_loader -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) -/usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) -+/usr/lib(64)?/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) - +- /usr/local/RealPlayer/realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) - ifdef(`distro_gentoo',` @@ -29026,7 +29247,7 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.3.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-02-15 09:52:56.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-03-05 18:06:38.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-03-06 09:14:52.000000000 -0500 @@ -29,9 +29,14 @@ ') @@ -30022,7 +30243,7 @@ userdom_xwindows_client_template($1) ############################## -@@ -1076,14 +1086,14 @@ +@@ -1076,14 +1086,16 @@ # authlogin_per_role_template($1, $1_t, $1_r) @@ -30036,13 +30257,15 @@ # gnome keyring wants to read this. - dev_dontaudit_read_rand($1_t) + dev_dontaudit_read_rand($1_usertype) ++ # temporarily allow since openoffice requires this ++ dev_read_rand($1_usertype) - logging_send_syslog_msg($1_t) + logging_send_syslog_msg($1_usertype) logging_dontaudit_send_audit_msgs($1_t) # Need to to this just so screensaver will work. Should be moved to screensaver domain -@@ -1091,32 +1101,25 @@ +@@ -1091,32 +1103,25 @@ selinux_get_enforce_mode($1_t) optional_policy(` @@ -30084,7 +30307,7 @@ ') ') -@@ -1127,10 +1130,10 @@ +@@ -1127,10 +1132,10 @@ ## ## ##

@@ -30099,7 +30322,7 @@ ## This template creates a user domain, types, and ## rules for the user's tty, pty, home directories, ## tmp, and tmpfs files. -@@ -1193,12 +1196,11 @@ +@@ -1193,12 +1198,11 @@ # and may change other protocols tunable_policy(`user_tcp_server',` corenet_tcp_bind_all_nodes($1_t) @@ -30114,7 +30337,7 @@ ') # Run pppd in pppd_t by default for user -@@ -1207,7 +1209,27 @@ +@@ -1207,7 +1211,27 @@ ') optional_policy(` @@ -30143,7 +30366,7 @@ ') ') -@@ -1284,8 +1306,6 @@ +@@ -1284,8 +1308,6 @@ # Manipulate other users crontab. allow $1_t self:passwd crontab; @@ -30152,7 +30375,7 @@ kernel_read_software_raid_state($1_t) kernel_getattr_core_if($1_t) kernel_getattr_message_if($1_t) -@@ -1363,13 +1383,6 @@ +@@ -1363,13 +1385,6 @@ # But presently necessary for installing the file_contexts file. seutil_manage_bin_policy($1_t) @@ -30166,7 +30389,7 @@ optional_policy(` userhelper_exec($1_t) ') -@@ -1422,6 +1435,7 @@ +@@ -1422,6 +1437,7 @@ dev_relabel_all_dev_nodes($1) files_create_boot_flag($1) @@ -30174,7 +30397,7 @@ # Necessary for managing /boot/efi fs_manage_dos_files($1) -@@ -1787,10 +1801,14 @@ +@@ -1787,10 +1803,14 @@ template(`userdom_user_home_content',` gen_require(` attribute $1_file_type; @@ -30190,7 +30413,7 @@ ') ######################################## -@@ -1886,11 +1904,11 @@ +@@ -1886,11 +1906,11 @@ # template(`userdom_search_user_home_dirs',` gen_require(` @@ -30204,7 +30427,7 @@ ') ######################################## -@@ -1920,11 +1938,11 @@ +@@ -1920,11 +1940,11 @@ # template(`userdom_list_user_home_dirs',` gen_require(` @@ -30218,7 +30441,7 @@ ') ######################################## -@@ -1968,12 +1986,12 @@ +@@ -1968,12 +1988,12 @@ # template(`userdom_user_home_domtrans',` gen_require(` @@ -30234,7 +30457,7 @@ ') ######################################## -@@ -2003,10 +2021,10 @@ +@@ -2003,10 +2023,10 @@ # template(`userdom_dontaudit_list_user_home_dirs',` gen_require(` @@ -30247,7 +30470,7 @@ ') ######################################## -@@ -2038,11 +2056,47 @@ +@@ -2038,11 +2058,47 @@ # template(`userdom_manage_user_home_content_dirs',` gen_require(` @@ -30297,7 +30520,7 @@ ') ######################################## -@@ -2074,10 +2128,10 @@ +@@ -2074,10 +2130,10 @@ # template(`userdom_dontaudit_setattr_user_home_content_files',` gen_require(` @@ -30310,7 +30533,7 @@ ') ######################################## -@@ -2107,11 +2161,11 @@ +@@ -2107,11 +2163,11 @@ # template(`userdom_read_user_home_content_files',` gen_require(` @@ -30324,7 +30547,7 @@ ') ######################################## -@@ -2141,11 +2195,11 @@ +@@ -2141,11 +2197,11 @@ # template(`userdom_dontaudit_read_user_home_content_files',` gen_require(` @@ -30339,7 +30562,7 @@ ') ######################################## -@@ -2175,10 +2229,14 @@ +@@ -2175,10 +2231,14 @@ # template(`userdom_dontaudit_write_user_home_content_files',` gen_require(` @@ -30356,7 +30579,7 @@ ') ######################################## -@@ -2208,11 +2266,11 @@ +@@ -2208,11 +2268,11 @@ # template(`userdom_read_user_home_content_symlinks',` gen_require(` @@ -30370,7 +30593,7 @@ ') ######################################## -@@ -2242,11 +2300,11 @@ +@@ -2242,11 +2302,11 @@ # template(`userdom_exec_user_home_content_files',` gen_require(` @@ -30384,7 +30607,7 @@ ') ######################################## -@@ -2276,10 +2334,10 @@ +@@ -2276,10 +2336,10 @@ # template(`userdom_dontaudit_exec_user_home_content_files',` gen_require(` @@ -30397,7 +30620,7 @@ ') ######################################## -@@ -2311,12 +2369,12 @@ +@@ -2311,12 +2371,12 @@ # template(`userdom_manage_user_home_content_files',` gen_require(` @@ -30413,7 +30636,7 @@ ') ######################################## -@@ -2348,10 +2406,10 @@ +@@ -2348,10 +2408,10 @@ # template(`userdom_dontaudit_manage_user_home_content_dirs',` gen_require(` @@ -30426,7 +30649,7 @@ ') ######################################## -@@ -2383,12 +2441,12 @@ +@@ -2383,12 +2443,12 @@ # template(`userdom_manage_user_home_content_symlinks',` gen_require(` @@ -30442,7 +30665,7 @@ ') ######################################## -@@ -2420,12 +2478,12 @@ +@@ -2420,12 +2480,12 @@ # template(`userdom_manage_user_home_content_pipes',` gen_require(` @@ -30458,7 +30681,7 @@ ') ######################################## -@@ -2457,12 +2515,12 @@ +@@ -2457,12 +2517,12 @@ # template(`userdom_manage_user_home_content_sockets',` gen_require(` @@ -30474,7 +30697,7 @@ ') ######################################## -@@ -2507,11 +2565,11 @@ +@@ -2507,11 +2567,11 @@ # template(`userdom_user_home_dir_filetrans',` gen_require(` @@ -30488,7 +30711,7 @@ ') ######################################## -@@ -2556,11 +2614,11 @@ +@@ -2556,11 +2616,11 @@ # template(`userdom_user_home_content_filetrans',` gen_require(` @@ -30502,7 +30725,7 @@ ') ######################################## -@@ -2600,11 +2658,11 @@ +@@ -2600,11 +2660,11 @@ # template(`userdom_user_home_dir_filetrans_user_home_content',` gen_require(` @@ -30516,7 +30739,7 @@ ') ######################################## -@@ -2634,11 +2692,11 @@ +@@ -2634,11 +2694,11 @@ # template(`userdom_write_user_tmp_sockets',` gen_require(` @@ -30530,7 +30753,7 @@ ') ######################################## -@@ -2668,11 +2726,11 @@ +@@ -2668,11 +2728,11 @@ # template(`userdom_list_user_tmp',` gen_require(` @@ -30544,7 +30767,7 @@ ') ######################################## -@@ -2704,10 +2762,10 @@ +@@ -2704,10 +2764,10 @@ # template(`userdom_dontaudit_list_user_tmp',` gen_require(` @@ -30557,7 +30780,7 @@ ') ######################################## -@@ -2739,10 +2797,10 @@ +@@ -2739,10 +2799,10 @@ # template(`userdom_dontaudit_manage_user_tmp_dirs',` gen_require(` @@ -30570,7 +30793,7 @@ ') ######################################## -@@ -2772,12 +2830,12 @@ +@@ -2772,12 +2832,12 @@ # template(`userdom_read_user_tmp_files',` gen_require(` @@ -30586,7 +30809,7 @@ ') ######################################## -@@ -2809,10 +2867,10 @@ +@@ -2809,10 +2869,10 @@ # template(`userdom_dontaudit_read_user_tmp_files',` gen_require(` @@ -30599,7 +30822,7 @@ ') ######################################## -@@ -2844,10 +2902,48 @@ +@@ -2844,10 +2904,48 @@ # template(`userdom_dontaudit_append_user_tmp_files',` gen_require(` @@ -30650,7 +30873,7 @@ ') ######################################## -@@ -2877,12 +2973,12 @@ +@@ -2877,12 +2975,12 @@ # template(`userdom_rw_user_tmp_files',` gen_require(` @@ -30666,7 +30889,7 @@ ') ######################################## -@@ -2914,10 +3010,10 @@ +@@ -2914,10 +3012,10 @@ # template(`userdom_dontaudit_manage_user_tmp_files',` gen_require(` @@ -30679,7 +30902,7 @@ ') ######################################## -@@ -2949,12 +3045,12 @@ +@@ -2949,12 +3047,12 @@ # template(`userdom_read_user_tmp_symlinks',` gen_require(` @@ -30695,7 +30918,7 @@ ') ######################################## -@@ -2986,11 +3082,11 @@ +@@ -2986,11 +3084,11 @@ # template(`userdom_manage_user_tmp_dirs',` gen_require(` @@ -30709,7 +30932,7 @@ ') ######################################## -@@ -3022,11 +3118,11 @@ +@@ -3022,11 +3120,11 @@ # template(`userdom_manage_user_tmp_files',` gen_require(` @@ -30723,7 +30946,7 @@ ') ######################################## -@@ -3058,11 +3154,11 @@ +@@ -3058,11 +3156,11 @@ # template(`userdom_manage_user_tmp_symlinks',` gen_require(` @@ -30737,7 +30960,7 @@ ') ######################################## -@@ -3094,11 +3190,11 @@ +@@ -3094,11 +3192,11 @@ # template(`userdom_manage_user_tmp_pipes',` gen_require(` @@ -30751,7 +30974,7 @@ ') ######################################## -@@ -3130,11 +3226,11 @@ +@@ -3130,11 +3228,11 @@ # template(`userdom_manage_user_tmp_sockets',` gen_require(` @@ -30765,7 +30988,7 @@ ') ######################################## -@@ -3179,10 +3275,10 @@ +@@ -3179,10 +3277,10 @@ # template(`userdom_user_tmp_filetrans',` gen_require(` @@ -30778,7 +31001,7 @@ files_search_tmp($2) ') -@@ -3223,10 +3319,10 @@ +@@ -3223,10 +3321,10 @@ # template(`userdom_tmp_filetrans_user_tmp',` gen_require(` @@ -30791,7 +31014,7 @@ ') ######################################## -@@ -3254,6 +3350,42 @@ +@@ -3254,6 +3352,42 @@ ## ## # @@ -30834,7 +31057,7 @@ template(`userdom_rw_user_tmpfs_files',` gen_require(` type $1_tmpfs_t; -@@ -4231,11 +4363,11 @@ +@@ -4231,11 +4365,11 @@ # interface(`userdom_search_staff_home_dirs',` gen_require(` @@ -30848,7 +31071,7 @@ ') ######################################## -@@ -4251,10 +4383,10 @@ +@@ -4251,10 +4385,10 @@ # interface(`userdom_dontaudit_search_staff_home_dirs',` gen_require(` @@ -30861,7 +31084,7 @@ ') ######################################## -@@ -4270,11 +4402,11 @@ +@@ -4270,11 +4404,11 @@ # interface(`userdom_manage_staff_home_dirs',` gen_require(` @@ -30875,7 +31098,7 @@ ') ######################################## -@@ -4289,16 +4421,16 @@ +@@ -4289,16 +4423,16 @@ # interface(`userdom_relabelto_staff_home_dirs',` gen_require(` @@ -30895,7 +31118,7 @@ ## users home directory. ## ## -@@ -4307,12 +4439,27 @@ +@@ -4307,12 +4441,27 @@ ## ## # @@ -30926,7 +31149,7 @@ ') ######################################## -@@ -4327,13 +4474,13 @@ +@@ -4327,13 +4476,13 @@ # interface(`userdom_read_staff_home_content_files',` gen_require(` @@ -30944,7 +31167,7 @@ ') ######################################## -@@ -4531,10 +4678,10 @@ +@@ -4531,10 +4680,10 @@ # interface(`userdom_getattr_sysadm_home_dirs',` gen_require(` @@ -30957,7 +31180,7 @@ ') ######################################## -@@ -4551,10 +4698,10 @@ +@@ -4551,10 +4700,10 @@ # interface(`userdom_dontaudit_getattr_sysadm_home_dirs',` gen_require(` @@ -30970,7 +31193,7 @@ ') ######################################## -@@ -4569,10 +4716,10 @@ +@@ -4569,10 +4718,10 @@ # interface(`userdom_search_sysadm_home_dirs',` gen_require(` @@ -30983,7 +31206,7 @@ ') ######################################## -@@ -4588,10 +4735,10 @@ +@@ -4588,10 +4737,10 @@ # interface(`userdom_dontaudit_search_sysadm_home_dirs',` gen_require(` @@ -30996,7 +31219,7 @@ ') ######################################## -@@ -4606,10 +4753,10 @@ +@@ -4606,10 +4755,10 @@ # interface(`userdom_list_sysadm_home_dirs',` gen_require(` @@ -31009,7 +31232,7 @@ ') ######################################## -@@ -4625,10 +4772,10 @@ +@@ -4625,10 +4774,10 @@ # interface(`userdom_dontaudit_list_sysadm_home_dirs',` gen_require(` @@ -31022,7 +31245,7 @@ ') ######################################## -@@ -4644,12 +4791,11 @@ +@@ -4644,12 +4793,11 @@ # interface(`userdom_dontaudit_read_sysadm_home_content_files',` gen_require(` @@ -31038,7 +31261,7 @@ ') ######################################## -@@ -4676,10 +4822,10 @@ +@@ -4676,10 +4824,10 @@ # interface(`userdom_sysadm_home_dir_filetrans',` gen_require(` @@ -31051,7 +31274,7 @@ ') ######################################## -@@ -4694,10 +4840,10 @@ +@@ -4694,10 +4842,10 @@ # interface(`userdom_search_sysadm_home_content_dirs',` gen_require(` @@ -31064,7 +31287,7 @@ ') ######################################## -@@ -4712,13 +4858,13 @@ +@@ -4712,13 +4860,13 @@ # interface(`userdom_read_sysadm_home_content_files',` gen_require(` @@ -31082,7 +31305,7 @@ ') ######################################## -@@ -4754,11 +4900,49 @@ +@@ -4754,11 +4902,49 @@ # interface(`userdom_search_all_users_home_dirs',` gen_require(` @@ -31133,7 +31356,7 @@ ') ######################################## -@@ -4778,6 +4962,14 @@ +@@ -4778,6 +4964,14 @@ files_list_home($1) allow $1 home_dir_type:dir list_dir_perms; @@ -31148,7 +31371,7 @@ ') ######################################## -@@ -4839,6 +5031,26 @@ +@@ -4839,6 +5033,26 @@ ######################################## ##

@@ -31175,7 +31398,7 @@ ## Create, read, write, and delete all directories ## in all users home directories. ## -@@ -4859,6 +5071,25 @@ +@@ -4859,6 +5073,25 @@ ######################################## ## @@ -31201,7 +31424,7 @@ ## Create, read, write, and delete all files ## in all users home directories. ## -@@ -4879,6 +5110,26 @@ +@@ -4879,6 +5112,26 @@ ######################################## ## @@ -31228,7 +31451,7 @@ ## Create, read, write, and delete all symlinks ## in all users home directories. ## -@@ -5115,7 +5366,7 @@ +@@ -5115,7 +5368,7 @@ # interface(`userdom_relabelto_generic_user_home_dirs',` gen_require(` @@ -31237,7 +31460,7 @@ ') files_search_home($1) -@@ -5304,6 +5555,50 @@ +@@ -5304,6 +5557,50 @@ ######################################## ## @@ -31288,7 +31511,7 @@ ## Create, read, write, and delete directories in ## unprivileged users home directories. ## -@@ -5509,6 +5804,42 @@ +@@ -5509,6 +5806,42 @@ ######################################## ## @@ -31331,7 +31554,7 @@ ## Read and write unprivileged user ttys. ## ## -@@ -5674,6 +6005,42 @@ +@@ -5674,6 +6007,42 @@ ######################################## ## @@ -31374,7 +31597,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5704,3 +6071,368 @@ +@@ -5704,3 +6073,368 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.626 retrieving revision 1.627 diff -u -r1.626 -r1.627 --- selinux-policy.spec 5 Mar 2008 23:11:52 -0000 1.626 +++ selinux-policy.spec 6 Mar 2008 21:50:52 -0000 1.627 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -388,6 +388,9 @@ %endif %changelog +* Thu Mar 6 2008 Dan Walsh 3.3.1-12 +- Fix initrc_context generation for MLS + * Mon Mar 3 2008 Dan Walsh 3.3.1-11 - Fixes for libvirt From fedora-extras-commits at redhat.com Thu Mar 6 21:53:22 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Thu, 6 Mar 2008 21:53:22 GMT Subject: rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.901-VM800_xv_LCD.patch, NONE, 1.1 openchrome-0.2.901-libpciaccess.patch, 1.3, 1.4 xorg-x11-drv-openchrome.spec, 1.10, 1.11 Message-ID: <200803062153.m26LrMbb015731@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15687 Modified Files: openchrome-0.2.901-libpciaccess.patch xorg-x11-drv-openchrome.spec Added Files: openchrome-0.2.901-VM800_xv_LCD.patch Log Message: * Thu Mar 06 2008 Xavier Bachelot - 0.2.901-8 - Add patch to fix XV on LCD for VM800. - Improved libpciaccess patch. openchrome-0.2.901-VM800_xv_LCD.patch: --- NEW FILE openchrome-0.2.901-VM800_xv_LCD.patch --- --- src/via_swov.c +++ src/via_swov.c @@ -1728,5 +1728,6 @@ * Enable video on secondary */ - if (pVia->Chipset == VIA_P4M900 && pVia->pBIOSInfo->PanelActive) { + if ((pVia->Chipset == VIA_P4M900 || pVia->Chipset == VIA_VM800) + && pVia->pBIOSInfo->PanelActive) { /* V1_ON_SND_DISPLAY */ vidCtl |= 0x80000000; openchrome-0.2.901-libpciaccess.patch: Index: openchrome-0.2.901-libpciaccess.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.901-libpciaccess.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openchrome-0.2.901-libpciaccess.patch 10 Jan 2008 20:57:05 -0000 1.3 +++ openchrome-0.2.901-libpciaccess.patch 6 Mar 2008 21:53:16 -0000 1.4 @@ -353,16 +353,6 @@ if (!VIAMapMMIO(pScrn)) { VIAFreeRec(pScrn); -@@ -1407,7 +1483,9 @@ - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "...Finished parsing config file options.\n"); - -+#ifndef XSERVER_LIBPCIACCESS - ViaCheckCardId(pScrn); -+#endif - - /* Read memory bandwidth from registers */ - pVia->MemClk = hwp->readCrtc(hwp, 0x3D) >> 4; @@ -1440,6 +1518,65 @@ return FALSE; } @@ -686,43 +676,33 @@ +#define VIA_MEMBASE(p,n) (p)->regions[(n)].base_addr +#define VENDOR_ID(p) (p)->vendor_id +#define DEVICE_ID(p) (p)->device_id -+#define SUBVENDOR_ID(p) (p)->subvendor_id ++#define SUBVENDOR_ID(p) (p)->subvendor_id +#define SUBSYS_ID(p) (p)->subdevice_id +#define CHIP_REVISION(p) (p)->revision +#else +#define VIA_MEMBASE(p,n) (p)->memBase[n] +#define VENDOR_ID(p) (p)->vendor +#define DEVICE_ID(p) (p)->chipType -+#define SUBVENDOR_ID(p) (p)->subsysVendor ++#define SUBVENDOR_ID(p) (p)->subsysVendor +#define SUBSYS_ID(p) (p)->subsysCard +#define CHIP_REVISION(p) (p)->chipRev +#endif + #endif /* _VIA_H_ */ -diff -Naur src/via_id.c src/via_id.c ---- src/via_id.c 2008-01-02 18:58:44.000000000 +0100 -+++ src/via_id.c 2008-01-10 12:20:18.000000000 +0100 -@@ -212,6 +212,10 @@ - hwp->writeCrtc(hwp, 0x4F, tmp); - } - -+/* -+ * -+ */ -+#ifndef XSERVER_LIBPCIACCESS - void - ViaCheckCardId(ScrnInfoPtr pScrn) - { -@@ -238,4 +242,4 @@ - pVia->PciInfo->chipType, pVia->PciInfo->subsysVendor, pVia->PciInfo->subsysCard); - pVia->Id = NULL; - } -- -+#endif diff -Naur ChangeLog ChangeLog --- ChangeLog 2008-01-02 19:31:02.000000000 +0100 +++ ChangeLog 2008-01-10 12:20:18.000000000 +0100 -@@ -1,3 +1,11 @@ +@@ -1,3 +1,21 @@ ++2008-03-06 Jon Nettleton ++ ++ * src/via.h: ++ * src/via_driver.c: (VIAPreInit): ++ * src/via_id.c: (ViaCheckCardId): ++ ++ Switched ViaCheckCardId to use the macros defined in ++ via.h. This allows it to work with libpciaccess enabled ++ xorg servers as well as legacy versions. ++ +2007-12-31 Jon Nettleton + + * src/via_driver.c: (VIAPreInit), (VIAMapMMIO): @@ -734,3 +714,25 @@ 2007-10-29 Benno Schulenberg * src/via_driver.c: (VIAPreInit): +--- src/via_id.c 2008-03-06 20:30:31.000000000 +0100 ++++ src/via_id.c 2008-03-06 22:25:29.000000000 +0100 +@@ -227,15 +255,15 @@ + struct ViaCardIdStruct *Id; + VIAPtr pVia = VIAPTR(pScrn); + +- if ((pVia->PciInfo->subsysVendor == pVia->PciInfo->vendor) && +- (pVia->PciInfo->subsysCard == pVia->PciInfo->chipType)) ++ if ((SUBVENDOR_ID(pVia->PciInfo) == VENDOR_ID(pVia->PciInfo)) && ++ (SUBSYS_ID(pVia->PciInfo) == DEICE_ID(pVia->PciInfo))) + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Manufacturer plainly copied main PCI IDs to subsystem/card IDs.\n"); + + for (Id = ViaCardId; Id->String; Id++) { + if ((Id->Chip == pVia->Chipset) && +- (Id->Vendor == pVia->PciInfo->subsysVendor) && +- (Id->Device == pVia->PciInfo->subsysCard)) { ++ (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) && ++ (Id->Device == SUBSYS_ID(pVia->PciInfo))) { + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s.\n", Id->String); + pVia->Id = Id; + return; Index: xorg-x11-drv-openchrome.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xorg-x11-drv-openchrome.spec 20 Feb 2008 07:02:25 -0000 1.10 +++ xorg-x11-drv-openchrome.spec 6 Mar 2008 21:53:16 -0000 1.11 @@ -9,7 +9,7 @@ Summary: Xorg X11 openchrome video driver Name: xorg-x11-drv-openchrome Version: 0.2.901 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.openchrome.org License: MIT Group: User Interface/X Hardware Support @@ -21,6 +21,7 @@ Patch1: openchrome-0.2.901-libpciaccess.patch Patch2: openchrome-0.2.901-replace_xf86memcpy.patch Patch3: openchrome-0.2.901-P4M900_fifo_settings.patch +Patch4: openchrome-0.2.901-VM800_xv_LCD.patch ExclusiveArch: %{ix86} x86_64 BuildRequires: pkgconfig @@ -57,6 +58,7 @@ %patch1 -p0 -b .libpciaccess %patch2 -p0 -b .xf86memcpy %patch3 -p0 -b .P4M900_fifo +%patch4 -p0 -b .VM800_xv_LCD %build autoreconf @@ -105,6 +107,10 @@ %changelog +* Thu Mar 06 2008 Xavier Bachelot - 0.2.901-8 +- Add patch to fix XV on LCD for VM800. +- Improved libpciaccess patch. + * Wed Feb 20 2008 Fedora Release Engineering - 0.2.901-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 6 21:53:37 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Thu, 6 Mar 2008 21:53:37 GMT Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.80,1.81 Message-ID: <200803062153.m26Lrbbe015807@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15589 Modified Files: xorg-x11-drv-i810.spec Log Message: * Fri Mar 07 2008 Dave Airlie 2.2.1-7 - re-run autoconf to build modesetting with batchbuffer Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- xorg-x11-drv-i810.spec 6 Mar 2008 07:08:53 -0000 1.80 +++ xorg-x11-drv-i810.spec 6 Mar 2008 21:53:02 -0000 1.81 @@ -5,7 +5,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-i810 Version: 2.2.1 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -75,6 +75,7 @@ make cd ../xf86-video-intel-%{batchbuffer_version} +aclocal; autoheader; automake -a; autoconf %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri make @@ -128,6 +129,9 @@ %{_libdir}/libI810XvMC.so %changelog +* Fri Mar 07 2008 Dave Airlie 2.2.1-7 +- re-run autoconf to build modesetting with batchbuffer + * Thu Mar 06 2008 Dave Airlie 2.2.1-6 - fix modesetting to start on i965 chips From fedora-extras-commits at redhat.com Thu Mar 6 21:55:38 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 6 Mar 2008 21:55:38 GMT Subject: rpms/selinux-policy/devel policy-20071130.patch,1.90,1.91 Message-ID: <200803062155.m26LtcD2016187@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16135 Modified Files: policy-20071130.patch Log Message: * Thu Mar 6 2008 Dan Walsh 3.3.1-12 - Fix initrc_context generation for MLS policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- policy-20071130.patch 6 Mar 2008 21:50:52 -0000 1.90 +++ policy-20071130.patch 6 Mar 2008 21:55:29 -0000 1.91 @@ -7424,8 +7424,25 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.3.1/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2007-12-19 05:32:07.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/kernel/kernel.te 2008-02-26 08:29:22.000000000 -0500 -@@ -259,6 +259,8 @@ ++++ serefpolicy-3.3.1/policy/modules/kernel/kernel.te 2008-03-06 15:50:41.000000000 -0500 +@@ -231,6 +231,8 @@ + # Mount root file system. Used when loading a policy + # from initrd, then mounting the root filesystem + fs_mount_all_fs(kernel_t) ++fs_unmount_all_fs(kernel_t) ++ + + selinux_load_policy(kernel_t) + +@@ -253,12 +255,16 @@ + + mls_process_read_up(kernel_t) + mls_process_write_down(kernel_t) ++mls_file_write_all_levels(kernel_t) ++mls_file_read_all_levels(kernel_t) + + ifdef(`distro_redhat',` + # Bugzilla 222337 fs_rw_tmpfs_chr_files(kernel_t) ') @@ -7434,7 +7451,7 @@ tunable_policy(`read_default_t',` files_list_default(kernel_t) files_read_default_files(kernel_t) -@@ -363,7 +365,7 @@ +@@ -363,7 +369,7 @@ allow kern_unconfined proc_type:{ dir file lnk_file } *; @@ -7443,7 +7460,7 @@ allow kern_unconfined kernel_t:system *; -@@ -374,3 +376,4 @@ +@@ -374,3 +380,4 @@ allow kern_unconfined unlabeled_t:process ~{ transition dyntransition execmem execstack execheap }; kernel_rw_all_sysctls(kern_unconfined) @@ -13651,7 +13668,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.3.1/policy/modules/services/fail2ban.te --- nsaserefpolicy/policy/modules/services/fail2ban.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/fail2ban.te 2008-03-06 13:11:59.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/fail2ban.te 2008-03-06 16:54:16.000000000 -0500 @@ -18,6 +18,9 @@ type fail2ban_var_run_t; files_pid_file(fail2ban_var_run_t) @@ -13683,7 +13700,7 @@ +fs_list_inotifyfs(fail2ban_t) + +auth_use_nsswitch(fail2ban_t) -+corenet_tcp_connect_dns_port(fail2ban_t) ++corenet_tcp_connect_whois_port(fail2ban_t) libs_use_ld_so(fail2ban_t) libs_use_shared_libs(fail2ban_t) From fedora-extras-commits at redhat.com Thu Mar 6 21:56:00 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 6 Mar 2008 21:56:00 GMT Subject: rpms/selinux-policy/F-8 policy-20070703.patch, 1.191, 1.192 selinux-policy.spec, 1.617, 1.618 Message-ID: <200803062156.m26Lu0L4016321@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16234 Modified Files: policy-20070703.patch selinux-policy.spec Log Message: * Thu Mar 4 2008 Dan Walsh 3.0.8-92 - Fix openoffice policy to allow it to run from firefox on xguest policy-20070703.patch: Index: policy-20070703.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- policy-20070703.patch 4 Mar 2008 22:08:07 -0000 1.191 +++ policy-20070703.patch 6 Mar 2008 21:55:53 -0000 1.192 @@ -3043,7 +3043,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.0.8/policy/modules/apps/java.fc --- nsaserefpolicy/policy/modules/apps/java.fc 2007-10-22 13:21:41.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/apps/java.fc 2008-02-06 09:05:24.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/apps/java.fc 2008-03-06 11:18:15.000000000 -0500 @@ -11,6 +11,7 @@ # /usr/(.*/)?bin/java.* -- gen_context(system_u:object_r:java_exec_t,s0) @@ -3052,7 +3052,7 @@ /usr/bin/frysk -- gen_context(system_u:object_r:java_exec_t,s0) /usr/bin/gappletviewer -- gen_context(system_u:object_r:java_exec_t,s0) /usr/bin/gcj-dbtool -- gen_context(system_u:object_r:java_exec_t,s0) -@@ -20,5 +21,11 @@ +@@ -20,5 +21,13 @@ /usr/bin/grmic -- gen_context(system_u:object_r:java_exec_t,s0) /usr/bin/grmiregistry -- gen_context(system_u:object_r:java_exec_t,s0) /usr/bin/jv-convert -- gen_context(system_u:object_r:java_exec_t,s0) @@ -3064,11 +3064,13 @@ +/opt/matlab(/.*)?/bin(/.*)?/MATLAB.* -- gen_context(system_u:object_r:java_exec_t,s0) +/usr/lib/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0) + -+/usr/lib(64)?/openoffice\.org/program/soffice\.bin -- gen_context(system_u:object_r:java_exec_t,s0) ++/usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:java_exec_t,s0) ++/usr/lib64/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:java_exec_t,s0) ++ +/usr/bin/octave-[^/]* -- gen_context(system_u:object_r:java_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.8/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/apps/java.if 2008-01-28 10:57:36.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/apps/java.if 2008-03-06 11:16:06.000000000 -0500 @@ -32,7 +32,7 @@ ## ## @@ -3095,16 +3097,25 @@ allow $1_javaplugin_t $2:unix_stream_socket connectto; allow $1_javaplugin_t $2:unix_stream_socket { read write }; userdom_write_user_tmp_sockets($1,$1_javaplugin_t) -@@ -81,8 +84,7 @@ +@@ -69,6 +72,7 @@ + manage_dirs_pattern($1_javaplugin_t,$1_javaplugin_tmp_t,$1_javaplugin_tmp_t) + manage_files_pattern($1_javaplugin_t,$1_javaplugin_tmp_t,$1_javaplugin_tmp_t) + files_tmp_filetrans($1_javaplugin_t,$1_javaplugin_tmp_t,{ file dir }) ++ allow $1_javaplugin_t $1_javaplugin_tmp_t:file execute; + + manage_files_pattern($1_javaplugin_t,$1_javaplugin_tmpfs_t,$1_javaplugin_tmpfs_t) + manage_lnk_files_pattern($1_javaplugin_t,$1_javaplugin_tmpfs_t,$1_javaplugin_tmpfs_t) +@@ -81,9 +85,7 @@ can_exec($1_javaplugin_t, java_exec_t) - # The user role is authorized for this domain. - domain_auto_trans($1_t, java_exec_t, $1_javaplugin_t) -+ domain_auto_trans($2, java_exec_t, $1_javaplugin_t) - allow $1_javaplugin_t $2:fd use; +- allow $1_javaplugin_t $2:fd use; ++ domtrans_pattern($2, java_exec_t, $1_javaplugin_t) # Unrestricted inheritance from the caller. allow $2 $1_javaplugin_t:process { noatsecure siginh rlimitinh }; + allow $1_javaplugin_t $2:process signull; @@ -94,7 +96,7 @@ kernel_read_system_state($1_javaplugin_t) @@ -3148,7 +3159,16 @@ userdom_dontaudit_use_user_terminals($1,$1_javaplugin_t) userdom_dontaudit_setattr_user_home_content_files($1,$1_javaplugin_t) userdom_dontaudit_exec_user_home_content_files($1,$1_javaplugin_t) -@@ -166,6 +177,62 @@ +@@ -147,8 +158,6 @@ + tunable_policy(`allow_java_execstack',` + allow $1_javaplugin_t self:process execstack; + +- allow $1_javaplugin_t $1_javaplugin_tmp_t:file execute; +- + libs_legacy_use_shared_libs($1_javaplugin_t) + libs_legacy_use_ld_so($1_javaplugin_t) + +@@ -166,6 +175,62 @@ optional_policy(` xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t) ') @@ -3211,7 +3231,7 @@ ') ######################################## -@@ -219,3 +286,66 @@ +@@ -219,3 +284,66 @@ corecmd_search_bin($1) domtrans_pattern($1, java_exec_t, java_t) ') @@ -4136,7 +4156,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc --- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2007-10-22 13:21:42.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc 2008-02-19 09:59:23.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/kernel/corecommands.fc 2008-03-06 10:57:37.000000000 -0500 @@ -7,6 +7,7 @@ /bin/d?ash -- gen_context(system_u:object_r:shell_exec_t,s0) /bin/bash -- gen_context(system_u:object_r:shell_exec_t,s0) @@ -4211,7 +4231,15 @@ ifdef(`distro_gentoo', ` /usr/.*-.*-linux-gnu/gcc-bin/.*(/.*)? gen_context(system_u:object_r:bin_t,s0) -@@ -259,3 +270,23 @@ +@@ -188,6 +199,7 @@ + + ifdef(`distro_redhat', ` + /usr/lib/.*/program(/.*)? gen_context(system_u:object_r:bin_t,s0) ++/usr/lib64/.*/program(/.*)? gen_context(system_u:object_r:bin_t,s0) + /usr/lib/bluetooth(/.*)? -- gen_context(system_u:object_r:bin_t,s0) + /usr/lib/vmware-tools/sbin32(/.*)? gen_context(system_u:object_r:bin_t,s0) + /usr/lib64/bluetooth(/.*)? -- gen_context(system_u:object_r:bin_t,s0) +@@ -259,3 +271,23 @@ ifdef(`distro_suse',` /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0) ') @@ -5525,7 +5553,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.0.8/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2007-10-22 13:21:42.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/kernel/filesystem.if 2008-02-26 17:48:01.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/kernel/filesystem.if 2008-03-06 10:50:53.000000000 -0500 @@ -271,45 +271,6 @@ ######################################## @@ -5756,7 +5784,15 @@ interface(`fs_dontaudit_read_ramfs_files',` gen_require(` type ramfs_t; -@@ -3206,6 +3305,7 @@ +@@ -2885,6 +2984,7 @@ + type tmpfs_t; + ') + ++ dontaudit $1 tmpfs_t:dir rw_dir_perms; + dontaudit $1 tmpfs_t:file rw_file_perms; + ') + +@@ -3206,6 +3306,7 @@ ') allow $1 filesystem_type:filesystem getattr; @@ -5764,7 +5800,7 @@ ') ######################################## -@@ -3322,6 +3422,24 @@ +@@ -3322,6 +3423,24 @@ ######################################## ## @@ -5789,7 +5825,7 @@ ## List all directories with a filesystem type. ## ## -@@ -3533,3 +3651,62 @@ +@@ -3533,3 +3652,62 @@ relabelfrom_blk_files_pattern($1,noxattrfs,noxattrfs) relabelfrom_chr_files_pattern($1,noxattrfs,noxattrfs) ') @@ -10140,7 +10176,7 @@ +/var/run/fail2ban\.sock -s gen_context(system_u:object_r:fail2ban_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.0.8/policy/modules/services/fail2ban.te --- nsaserefpolicy/policy/modules/services/fail2ban.te 2007-10-22 13:21:36.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/fail2ban.te 2008-03-04 16:29:48.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/fail2ban.te 2008-03-06 16:54:33.000000000 -0500 @@ -1,5 +1,5 @@ -policy_module(fail2ban,1.0.0) @@ -10159,7 +10195,7 @@ kernel_read_system_state(fail2ban_t) -@@ -47,14 +48,20 @@ +@@ -47,14 +48,23 @@ files_read_etc_files(fail2ban_t) files_read_usr_files(fail2ban_t) @@ -10167,6 +10203,9 @@ +files_search_var_lib(fail2ban_t) + +fs_list_inotifyfs(fail2ban_t) ++ ++auth_use_nsswitch(fail2ban_t) ++corenet_tcp_connect_whois_port(fail2ban_t) libs_use_ld_so(fail2ban_t) libs_use_shared_libs(fail2ban_t) @@ -10181,6 +10220,18 @@ optional_policy(` apache_read_log(fail2ban_t) ') +@@ -64,5 +74,11 @@ + ') + + optional_policy(` ++ gamin_domtrans(fail2ban_t) ++ gamin_stream_connect(fail2ban_t) ++') ++ ++optional_policy(` + iptables_domtrans(fail2ban_t) + ') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.0.8/policy/modules/services/fetchmail.te --- nsaserefpolicy/policy/modules/services/fetchmail.te 2007-10-22 13:21:39.000000000 -0400 +++ serefpolicy-3.0.8/policy/modules/services/fetchmail.te 2008-01-17 09:03:07.000000000 -0500 @@ -10289,6 +10340,97 @@ ') optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.fc serefpolicy-3.0.8/policy/modules/services/gamin.fc +--- nsaserefpolicy/policy/modules/services/gamin.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/gamin.fc 2008-03-06 16:51:35.000000000 -0500 +@@ -0,0 +1,2 @@ ++ ++/usr/libexec/gam_server -- gen_context(system_u:object_r:gamin_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.if serefpolicy-3.0.8/policy/modules/services/gamin.if +--- nsaserefpolicy/policy/modules/services/gamin.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/gamin.if 2008-03-06 16:51:35.000000000 -0500 +@@ -0,0 +1,39 @@ ++ ++## policy for gamin ++ ++######################################## ++## ++## Execute a domain transition to run gamin. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`gamin_domtrans',` ++ gen_require(` ++ type gamin_t; ++ type gamin_exec_t; ++ ') ++ ++ domtrans_pattern($1,gamin_exec_t,gamin_t) ++') ++ ++######################################## ++## ++## Connect to gamin over an unix stream socket. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`gamin_stream_connect',` ++ gen_require(` ++ type gamin_t; ++ ') ++ ++ allow $1 gamin_t:unix_stream_socket connectto; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.te serefpolicy-3.0.8/policy/modules/services/gamin.te +--- nsaserefpolicy/policy/modules/services/gamin.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/gamin.te 2008-03-06 16:51:35.000000000 -0500 +@@ -0,0 +1,38 @@ ++policy_module(gamin,1.0.0) ++ ++######################################## ++# ++# Declarations ++# ++ ++type gamin_t; ++type gamin_exec_t; ++init_daemon_domain(gamin_t, gamin_exec_t) ++ ++######################################## ++# ++# gamin local policy ++# ++ ++# Init script handling ++domain_use_interactive_fds(gamin_t) ++ ++# internal communication is often done using fifo and unix sockets. ++allow gamin_t self:fifo_file rw_file_perms; ++allow gamin_t self:unix_stream_socket create_stream_socket_perms; ++ ++files_read_etc_files(gamin_t) ++files_read_etc_runtime_files(gamin_t) ++files_list_all(gamin_t) ++files_getattr_all_files(gamin_t) ++ ++fs_list_inotifyfs(gamin_t) ++domain_read_all_domains_state(gamin_t) ++ ++libs_use_ld_so(gamin_t) ++libs_use_shared_libs(gamin_t) ++ ++miscfiles_read_localization(gamin_t) ++ ++role unconfined_r types gamin_t; ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.0.8/policy/modules/services/hal.fc --- nsaserefpolicy/policy/modules/services/hal.fc 2007-10-22 13:21:39.000000000 -0400 +++ serefpolicy-3.0.8/policy/modules/services/hal.fc 2008-01-17 09:03:07.000000000 -0500 @@ -11202,7 +11344,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.0.8/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2007-10-22 13:21:39.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/mta.te 2008-01-31 11:46:14.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/mta.te 2008-03-06 11:57:46.000000000 -0500 @@ -1,11 +1,13 @@ -policy_module(mta,1.7.1) @@ -11291,11 +11433,15 @@ logrotate_read_tmp_files(system_mail_t) ') -@@ -136,11 +158,33 @@ +@@ -136,11 +158,37 @@ ') optional_policy(` -+ clamav_stream_connect(sendmail_t) ++ clamav_stream_connect(system_mail_t) ++') ++ ++optional_policy(` ++ fail2ban_append_log(system_mail_t) +') + +optional_policy(` @@ -11309,7 +11455,7 @@ -# should break this up among sections: +init_stream_connect_script(mailserver_delivery) +init_rw_script_stream_sockets(mailserver_delivery) -+ + +tunable_policy(`use_samba_home_dirs',` + fs_manage_cifs_dirs(mailserver_delivery) + fs_manage_cifs_files(mailserver_delivery) @@ -11321,12 +11467,12 @@ + fs_manage_nfs_files(mailserver_delivery) + fs_manage_nfs_symlinks(mailserver_delivery) +') - ++ +# should break this up among sections: optional_policy(` # why is mail delivered to a directory of type arpwatch_data_t? arpwatch_search_data(mailserver_delivery) -@@ -154,3 +198,4 @@ +@@ -154,3 +202,4 @@ cron_read_system_job_tmp_files(mta_user_agent) ') ') @@ -19088,7 +19234,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.8/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/libraries.fc 2008-02-11 16:25:54.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/system/libraries.fc 2008-03-06 10:59:16.000000000 -0500 @@ -65,11 +65,15 @@ /opt/(.*/)?java/.+\.jar -- gen_context(system_u:object_r:lib_t,s0) /opt/(.*/)?jre.*/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -19166,7 +19312,7 @@ /usr/lib(64)?/python2.4/site-packages/M2Crypto/__m2crypto.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) # vmware -@@ -284,3 +299,16 @@ +@@ -284,3 +299,18 @@ /var/spool/postfix/lib(64)?(/.*)? gen_context(system_u:object_r:lib_t,s0) /var/spool/postfix/usr(/.*)? gen_context(system_u:object_r:lib_t,s0) /var/spool/postfix/lib(64)?/ld.*\.so.* -- gen_context(system_u:object_r:ld_so_t,s0) @@ -19183,6 +19329,8 @@ +/usr/lib64/libswscale\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/libavdevice\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/libmythavcodec-[^/]+\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib/.*/program(/.*)?\.so gen_context(system_u:object_r:lib_t,s0) ++/usr/lib64/.*/program(/.*)?\.so gen_context(system_u:object_r:lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.8/policy/modules/system/libraries.te --- nsaserefpolicy/policy/modules/system/libraries.te 2007-10-22 13:21:39.000000000 -0400 +++ serefpolicy-3.0.8/policy/modules/system/libraries.te 2008-01-17 09:03:07.000000000 -0500 @@ -21420,14 +21568,13 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.0.8/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-10-22 13:21:39.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc 2008-03-04 10:18:00.000000000 -0500 -@@ -7,6 +7,10 @@ ++++ serefpolicy-3.0.8/policy/modules/system/unconfined.fc 2008-03-06 11:18:43.000000000 -0500 +@@ -7,6 +7,8 @@ /usr/bin/vncserver -- gen_context(system_u:object_r:unconfined_exec_t,s0) /usr/lib/ia32el/ia32x_loader -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) -/usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) -+/usr/lib(64)?/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) - +- /usr/local/RealPlayer/realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) +/usr/bin/rhythmbox -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) +/usr/bin/sbcl -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/selinux-policy.spec,v retrieving revision 1.617 retrieving revision 1.618 diff -u -r1.617 -r1.618 --- selinux-policy.spec 4 Mar 2008 22:08:07 -0000 1.617 +++ selinux-policy.spec 6 Mar 2008 21:55:53 -0000 1.618 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.0.8 -Release: 91%{?dist} +Release: 92%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -381,6 +381,9 @@ %endif %changelog +* Thu Mar 4 2008 Dan Walsh 3.0.8-92 +- Fix openoffice policy to allow it to run from firefox on xguest + * Tue Mar 4 2008 Dan Walsh 3.0.8-91 - Allow rpc.mountd to write to lvm_control_t chr_file From fedora-extras-commits at redhat.com Thu Mar 6 22:15:13 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Thu, 6 Mar 2008 22:15:13 GMT Subject: rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.901-libpciaccess.patch, 1.4, 1.5 xorg-x11-drv-openchrome.spec, 1.11, 1.12 Message-ID: <200803062215.m26MFDH7027302@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27263 Modified Files: openchrome-0.2.901-libpciaccess.patch xorg-x11-drv-openchrome.spec Log Message: - Fix libpciaccess patch. openchrome-0.2.901-libpciaccess.patch: Index: openchrome-0.2.901-libpciaccess.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.901-libpciaccess.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- openchrome-0.2.901-libpciaccess.patch 6 Mar 2008 21:53:16 -0000 1.4 +++ openchrome-0.2.901-libpciaccess.patch 6 Mar 2008 22:15:08 -0000 1.5 @@ -716,7 +716,7 @@ * src/via_driver.c: (VIAPreInit): --- src/via_id.c 2008-03-06 20:30:31.000000000 +0100 +++ src/via_id.c 2008-03-06 22:25:29.000000000 +0100 -@@ -227,15 +255,15 @@ +@@ -218,15 +218,15 @@ struct ViaCardIdStruct *Id; VIAPtr pVia = VIAPTR(pScrn); @@ -736,3 +736,12 @@ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s.\n", Id->String); pVia->Id = Id; return; +@@ -235,7 +235,7 @@ + + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unknown Card-Ids (%4X|%4X|%4X); please report to openchrome-users at openchrome.org\n", +- pVia->PciInfo->chipType, pVia->PciInfo->subsysVendor, pVia->PciInfo->subsysCard); ++ DEVICE_ID(pVia->PciInfo), SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo)); + pVia->Id = NULL; + } + Index: xorg-x11-drv-openchrome.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-drv-openchrome.spec 6 Mar 2008 21:53:16 -0000 1.11 +++ xorg-x11-drv-openchrome.spec 6 Mar 2008 22:15:08 -0000 1.12 @@ -9,7 +9,7 @@ Summary: Xorg X11 openchrome video driver Name: xorg-x11-drv-openchrome Version: 0.2.901 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.openchrome.org License: MIT Group: User Interface/X Hardware Support @@ -107,6 +107,9 @@ %changelog +* Thu Mar 06 2008 Xavier Bachelot - 0.2.901-9 +- Fix libpciaccess patch. + * Thu Mar 06 2008 Xavier Bachelot - 0.2.901-8 - Add patch to fix XV on LCD for VM800. - Improved libpciaccess patch. From fedora-extras-commits at redhat.com Thu Mar 6 22:17:19 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Thu, 6 Mar 2008 22:17:19 GMT Subject: rpms/xorg-x11-drv-i810/devel intel-2.1.1-pciaccess-version.patch, NONE, 1.1 intel-disable-stepping.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.81, 1.82 Message-ID: <200803062217.m26MHJBS027723@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27585 Modified Files: xorg-x11-drv-i810.spec Added Files: intel-2.1.1-pciaccess-version.patch intel-disable-stepping.patch Log Message: * Fri Mar 07 2008 Dave Airlie 2.2.1-8 - fixup pciaccess version check and autoconf and fallout intel-2.1.1-pciaccess-version.patch: --- NEW FILE intel-2.1.1-pciaccess-version.patch --- diff -up xf86-video-intel-2.2.1/configure.ac.d xf86-video-intel-2.2.1/configure.ac --- xf86-video-intel-2.2.1/configure.ac.d 2008-03-07 08:06:47.000000000 +1000 +++ xf86-video-intel-2.2.1/configure.ac 2008-03-07 08:06:54.000000000 +1000 @@ -115,9 +115,9 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, CFLAGS="$save_CFLAGS" if test x$XSERVER_LIBPCIACCESS = xyes; then - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0]) + PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) else - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0], + PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10], have_libpciaccess=yes, have_libpciaccess=no) fi intel-disable-stepping.patch: --- NEW FILE intel-disable-stepping.patch --- diff -up xf86-video-intel-2.2.0-188-g49af3c4/src/reg_dumper/Makefile.am.da xf86-video-intel-2.2.0-188-g49af3c4/src/reg_dumper/Makefile.am --- xf86-video-intel-2.2.0-188-g49af3c4/src/reg_dumper/Makefile.am.da 2008-03-07 08:09:46.000000000 +1000 +++ xf86-video-intel-2.2.0-188-g49af3c4/src/reg_dumper/Makefile.am 2008-03-07 08:09:50.000000000 +1000 @@ -1,4 +1,4 @@ -noinst_PROGRAMS = intel_reg_dumper intel_idle intel_stepping +noinst_PROGRAMS = intel_reg_dumper intel_idle intel_reg_dumper_SOURCES = \ main.c \ Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- xorg-x11-drv-i810.spec 6 Mar 2008 21:53:02 -0000 1.81 +++ xorg-x11-drv-i810.spec 6 Mar 2008 22:16:44 -0000 1.82 @@ -5,7 +5,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-i810 Version: 2.2.1 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -23,10 +23,12 @@ Patch3: intel-2.1.1-fix-xv-reset.patch Patch4: intel-2.1.1-fix-xv-compiz.patch Patch5: intel-2.1.1-efi.patch +Patch6: intel-2.1.1-pciaccess-version.patch Patch100: intel-master.patch Patch101: intel-batchbuffer.patch Patch102: intel-modeset.patch +Patch103: intel-disable-stepping.patch ExclusiveArch: %{ix86} x86_64 ia64 @@ -62,15 +64,19 @@ %patch3 -p1 -b .xvfix #patch4 -p1 -b .xv-compiz %patch5 -p1 -b .efi +%patch6 -p1 -b .pciaccessvers %patch100 -p1 -b .intel-master cd ../xf86-video-intel-%{batchbuffer_version} +%patch6 -p1 -b .pciaccessvers %patch101 -p1 -b .intel-batchbuffer %patch102 -p1 -b .intel-modeset +%patch103 -p1 -b .intel-stepping %build cd xf86-video-intel-%{version} +aclocal; autoheader; automake -a; autoconf %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri make @@ -129,6 +135,9 @@ %{_libdir}/libI810XvMC.so %changelog +* Fri Mar 07 2008 Dave Airlie 2.2.1-8 +- fixup pciaccess version check and autoconf and fallout + * Fri Mar 07 2008 Dave Airlie 2.2.1-7 - re-run autoconf to build modesetting with batchbuffer From fedora-extras-commits at redhat.com Thu Mar 6 22:25:13 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 6 Mar 2008 22:25:13 GMT Subject: rpms/selinux-policy/devel policy-20071130.patch,1.91,1.92 Message-ID: <200803062225.m26MPDKJ029018@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28967 Modified Files: policy-20071130.patch Log Message: * Thu Mar 6 2008 Dan Walsh 3.3.1-12 - Fix initrc_context generation for MLS policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- policy-20071130.patch 6 Mar 2008 21:55:29 -0000 1.91 +++ policy-20071130.patch 6 Mar 2008 22:25:06 -0000 1.92 @@ -23256,7 +23256,7 @@ /var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.3.1/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-12-04 11:02:50.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-06 13:07:32.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-06 17:09:27.000000000 -0500 @@ -12,9 +12,15 @@ ## ## @@ -23720,7 +23720,7 @@ # for when /tmp/.X11-unix is created by the system allow $2 xdm_t:fd use; -@@ -542,25 +540,473 @@ +@@ -542,25 +540,474 @@ allow $2 xdm_tmp_t:sock_file { read write }; dontaudit $2 xdm_t:tcp_socket { read write }; @@ -23918,6 +23918,7 @@ + attribute x_server_domain, x_domain; + attribute xproperty_type; + attribute xevent_type, xextension_type; ++ attribute xserver_unconfined_type; + class x_drawable all_x_drawable_perms; + class x_screen all_x_screen_perms; + class x_gc all_x_gc_perms; @@ -24200,7 +24201,7 @@ ') ') -@@ -593,26 +1039,44 @@ +@@ -593,26 +1040,44 @@ # template(`xserver_use_user_fonts',` gen_require(` @@ -24252,7 +24253,7 @@ ## Transition to a user Xauthority domain. ## ## -@@ -638,10 +1102,77 @@ +@@ -638,10 +1103,77 @@ # template(`xserver_domtrans_user_xauth',` gen_require(` @@ -24332,7 +24333,7 @@ ') ######################################## -@@ -671,10 +1202,10 @@ +@@ -671,10 +1203,10 @@ # template(`xserver_user_home_dir_filetrans_user_xauth',` gen_require(` @@ -24345,7 +24346,7 @@ ') ######################################## -@@ -760,7 +1291,7 @@ +@@ -760,7 +1292,7 @@ type xconsole_device_t; ') @@ -24354,7 +24355,7 @@ ') ######################################## -@@ -860,6 +1391,25 @@ +@@ -860,6 +1392,25 @@ ######################################## ## @@ -24380,7 +24381,7 @@ ## Read xdm-writable configuration files. ## ## -@@ -914,6 +1464,7 @@ +@@ -914,6 +1465,7 @@ files_search_tmp($1) allow $1 xdm_tmp_t:dir list_dir_perms; create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t) @@ -24388,7 +24389,7 @@ ') ######################################## -@@ -955,6 +1506,24 @@ +@@ -955,6 +1507,24 @@ ######################################## ## @@ -24413,7 +24414,7 @@ ## Execute the X server in the XDM X server domain. ## ## -@@ -965,15 +1534,47 @@ +@@ -965,15 +1535,47 @@ # interface(`xserver_domtrans_xdm_xserver',` gen_require(` @@ -24462,7 +24463,7 @@ ## Make an X session script an entrypoint for the specified domain. ## ## -@@ -1123,7 +1724,7 @@ +@@ -1123,7 +1725,7 @@ type xdm_xserver_tmp_t; ') @@ -24471,7 +24472,7 @@ ') ######################################## -@@ -1312,3 +1913,82 @@ +@@ -1312,3 +1914,82 @@ files_search_tmp($1) stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t) ') From fedora-extras-commits at redhat.com Thu Mar 6 22:39:01 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 6 Mar 2008 22:39:01 GMT Subject: rpms/libgdiplus/devel libgdiplus.spec,1.27,1.28 sources,1.16,1.17 Message-ID: <200803062239.m26Md1dx031218@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/libgdiplus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31055/devel Modified Files: libgdiplus.spec sources Log Message: Bump to preview 4 Index: libgdiplus.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgdiplus/devel/libgdiplus.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- libgdiplus.spec 19 Feb 2008 10:52:42 -0000 1.27 +++ libgdiplus.spec 6 Mar 2008 22:38:11 -0000 1.28 @@ -1,6 +1,6 @@ Name: libgdiplus Version: 1.9 -Release: 2%{?dist} +Release: 4%{?dist} Summary: libgdiplus: An Open Source implementation of the GDI+ API Group: System Environment/Libraries @@ -59,8 +59,8 @@ %{_libdir}/lib*.so %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 1.9-2 -- Autorebuild for GCC 4.3 +* Thu Mar 06 2008 Paul F. Johnson 1.9-4 +- bump to preview 4 * Mon Feb 04 2008 Paul F. Johnson 1.9-1 - bump to preview 1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgdiplus/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 18 Feb 2008 14:57:42 -0000 1.16 +++ sources 6 Mar 2008 22:38:11 -0000 1.17 @@ -1 +1 @@ -bfe86e92cea97b9ddadb25c8db57ebc3 libgdiplus-1.9.tar.bz2 +939f65903ea385ae1dc9bf0098669838 libgdiplus-1.9.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 22:41:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Thu, 6 Mar 2008 22:41:41 GMT Subject: rpms/which/devel which.spec,1.24,1.25 Message-ID: <200803062241.m26Mffe2031690@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/which/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31574 Modified Files: which.spec Log Message: install-info should exit gracefully when --nodocs Index: which.spec =================================================================== RCS file: /cvs/pkgs/rpms/which/devel/which.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- which.spec 15 Feb 2008 22:22:15 -0000 1.24 +++ which.spec 6 Mar 2008 22:41:08 -0000 1.25 @@ -39,11 +39,13 @@ %post /sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/which.info.gz +exit 0 %preun if [ $1 = 0 ]; then /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/which.info.gz fi +exit 0 %clean rm -rf $RPM_BUILD_ROOT @@ -57,6 +59,9 @@ %{_mandir}/*/* %changelog +* Thu Mar 06 2008 Warren Togami 2.19-3 +- install-info should exit gracefully when --nodocs + * Fri Feb 15 2008 Than Ngo 2.19-2 - rebuilt From fedora-extras-commits at redhat.com Thu Mar 6 22:42:58 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 6 Mar 2008 22:42:58 GMT Subject: rpms/strigi/F-8 strigi.spec,1.14,1.15 Message-ID: <200803062242.m26MgwQT031940@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/pkgs/rpms/strigi/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31844 Modified Files: strigi.spec Log Message: * Thu Mar 06 2008 Deji Akingunola - 0.5.8-2 - Use upstream's default build options (disable inotify support, #436096) Index: strigi.spec =================================================================== RCS file: /cvs/pkgs/rpms/strigi/F-8/strigi.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- strigi.spec 21 Feb 2008 10:52:31 -0000 1.14 +++ strigi.spec 6 Mar 2008 22:42:25 -0000 1.15 @@ -1,6 +1,6 @@ Name: strigi Version: 0.5.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A desktop search program for KDE Group: Applications/Productivity License: LGPLv2+ @@ -64,8 +64,7 @@ %endif cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB_DESTINATION=%{_libdir} \ - -DLIB_SUFFIX=%{lib_suffix} \ - -DENABLE_INOTIFY:BOOL=ON -DENABLE_DBUS:BOOL=ON .. + -DLIB_SUFFIX=%{lib_suffix} .. make VERBOSE=1 %{?_smp_mflags} %install @@ -112,6 +111,9 @@ %{_libdir}/strigi/ %changelog +* Thu Mar 06 2008 Deji Akingunola - 0.5.8-2 +- Use upstream's default build options (disable inotify support, #436096) + * Thu Feb 21 2008 Kevin Kofler - 0.5.8-1 - Update to 0.5.8 - Fix LIB_DESTINATION (#433627) From fedora-extras-commits at redhat.com Thu Mar 6 22:44:11 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Thu, 6 Mar 2008 22:44:11 GMT Subject: rpms/which/devel which.spec,1.25,1.26 Message-ID: <200803062244.m26MiBu9032135@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/which/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32030 Modified Files: which.spec Log Message: bump Index: which.spec =================================================================== RCS file: /cvs/pkgs/rpms/which/devel/which.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- which.spec 6 Mar 2008 22:41:08 -0000 1.25 +++ which.spec 6 Mar 2008 22:43:37 -0000 1.26 @@ -1,7 +1,7 @@ Summary: Displays where a particular program in your path is located Name: which Version: 2.19 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: Applications/System Source0: http://www.xs4all.nl/~carlo17/which/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Thu Mar 6 22:47:56 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 6 Mar 2008 22:47:56 GMT Subject: rpms/mono/devel mono.spec,1.65,1.66 sources,1.19,1.20 Message-ID: <200803062247.m26MluhE000365@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/mono/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32693/devel Modified Files: mono.spec sources Log Message: Bump to preview 4 Index: mono.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- mono.spec 21 Feb 2008 12:04:54 -0000 1.65 +++ mono.spec 6 Mar 2008 22:47:19 -0000 1.66 @@ -1,6 +1,6 @@ Name: mono Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A .NET runtime environment Group: Development/Languages @@ -503,7 +503,6 @@ %mono_bin_1 mono-service mono-service %mono_bin_2 mono-service2 mono-service %{monodir}/gac/mono-service - %gac_dll System.Management %gac_dll System.Messaging %gac_dll System.ServiceProcess @@ -520,6 +519,7 @@ %files web %defattr(-,root,root,-) %gac_dll Mono.Http +%gac_dll Mono.Web %gac_dll System.Runtime.Remoting %gac_dll System.Web %gac_dll System.Runtime.Serialization.Formatters.Soap @@ -539,7 +539,6 @@ %config (noreplace) %{_sysconfdir}/mono/1.0/DefaultWsdlHelpGenerator.aspx %config (noreplace) %{_sysconfdir}/mono/2.0/DefaultWsdlHelpGenerator.aspx %config (noreplace) %{_sysconfdir}/mono/2.0/web.config -# Hmm, this doesn't seem to ship with the .exe file? %mono_bin httpcfg %{_mandir}/man1/httpcfg.1.gz @@ -586,6 +585,9 @@ %gac_dll IBM.Data.DB2 %changelog +* Thu Mar 06 2008 Paul F. Johnson 1.9-2 +- bump to preview 4 + * Mon Feb 04 2008 Paul F. Johnson 1.9-1 - bump to preview 2 - spec file fixes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mono/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 21 Feb 2008 12:04:54 -0000 1.19 +++ sources 6 Mar 2008 22:47:19 -0000 1.20 @@ -1 +1 @@ -8301f01119ab5d4ec6107948effebefb mono-1.9.tar.bz2 +d58dbf544595b37e81df735b2031cd64 mono-1.9.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 6 22:51:19 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 6 Mar 2008 22:51:19 GMT Subject: rpms/wpa_supplicant/F-8 wpa_supplicant.init.d, 1.6, 1.7 wpa_supplicant.spec, 1.45, 1.46 Message-ID: <200803062251.m26MpJYL000940@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/wpa_supplicant/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv815 Modified Files: wpa_supplicant.init.d wpa_supplicant.spec Log Message: * Thu Mar 6 2008 Dan Williams - 0.5.10-3 - Don't start the supplicant by default when installed (rh #436380) Index: wpa_supplicant.init.d =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.init.d,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wpa_supplicant.init.d 24 Dec 2007 22:34:32 -0000 1.6 +++ wpa_supplicant.init.d 6 Mar 2008 22:50:45 -0000 1.7 @@ -15,7 +15,7 @@ # Provides: wpa_supplicant # Required-Start: $local_fs messagebus # Required-Stop: $local_fs messagebus -# Default-Start: 3 4 5 +# Default-Start: # Default-Stop: 0 1 6 # Short-Description: start and stop wpa_supplicant # Description: wpa_supplicant is a tool for connecting to wireless networks Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- wpa_supplicant.spec 4 Mar 2008 15:09:40 -0000 1.45 +++ wpa_supplicant.spec 6 Mar 2008 22:50:45 -0000 1.46 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.5.10 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -141,6 +141,9 @@ %{_bindir}/wpa_gui %changelog +* Thu Mar 6 2008 Dan Williams - 0.5.10-3 +- Don't start the supplicant by default when installed (rh #436380) + * Tue Mar 4 2008 Dan Williams - 0.5.10-2 - Fix a potential use-after-free in the D-Bus byte array demarshalling code From fedora-extras-commits at redhat.com Thu Mar 6 22:52:15 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 6 Mar 2008 22:52:15 GMT Subject: rpms/wpa_supplicant/devel wpa_supplicant.init.d, 1.5, 1.6 wpa_supplicant.spec, 1.43, 1.44 Message-ID: <200803062252.m26MqFcu001157@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/wpa_supplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1022 Modified Files: wpa_supplicant.init.d wpa_supplicant.spec Log Message: * Thu Mar 6 2008 Dan Williams - 1:0.6.3-3 - Don't start the supplicant by default when installed (rh #436380) Index: wpa_supplicant.init.d =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.init.d,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wpa_supplicant.init.d 24 Dec 2007 22:36:49 -0000 1.5 +++ wpa_supplicant.init.d 6 Mar 2008 22:51:39 -0000 1.6 @@ -15,7 +15,7 @@ # Provides: wpa_supplicant # Required-Start: $local_fs messagebus # Required-Stop: $local_fs messagebus -# Default-Start: 3 4 5 +# Default-Start: # Default-Stop: 0 1 6 # Short-Description: start and stop wpa_supplicant # Description: wpa_supplicant is a tool for connecting to wireless networks Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- wpa_supplicant.spec 4 Mar 2008 15:11:01 -0000 1.43 +++ wpa_supplicant.spec 6 Mar 2008 22:51:39 -0000 1.44 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.6.3 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -147,6 +147,9 @@ %{_bindir}/wpa_gui %changelog +* Thu Mar 6 2008 Dan Williams - 1:0.6.3-3 +- Don't start the supplicant by default when installed (rh #436380) + * Tue Mar 4 2008 Dan Williams - 1:0.6.3-2 - Fix a potential use-after-free in the D-Bus byte array demarshalling code From fedora-extras-commits at redhat.com Thu Mar 6 23:03:38 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Thu, 6 Mar 2008 23:03:38 GMT Subject: rpms/libdrm/devel libdrm-modesetting.patch, 1.1, 1.2 libdrm.spec, 1.37, 1.38 Message-ID: <200803062303.m26N3cO8010003@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/libdrm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9877 Modified Files: libdrm-modesetting.patch libdrm.spec Log Message: * Fri Mar 07 2008 Dave Airlie 2.4.0-0.9 - add support for new sysfs structure libdrm-modesetting.patch: Index: libdrm-modesetting.patch =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm-modesetting.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libdrm-modesetting.patch 5 Mar 2008 00:50:26 -0000 1.1 +++ libdrm-modesetting.patch 6 Mar 2008 23:02:48 -0000 1.2 @@ -156,10 +156,10 @@ extern drmVersionPtr drmGetLibVersion(int fd); diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c new file mode 100644 -index 0000000..07b14db +index 0000000..f86cc48 --- /dev/null +++ b/libdrm/xf86drmMode.c -@@ -0,0 +1,594 @@ +@@ -0,0 +1,613 @@ +/* + * \file xf86drmMode.c + * Header for DRM modesetting interface. @@ -730,6 +730,25 @@ + if (ret != 4) + return -EINVAL; + ++ sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/drm", ++ domain, bus, dev, func); ++ ++ sysdir = opendir(pci_dev_dir); ++ if (sysdir) { ++ dent = readdir(sysdir); ++ while (dent) { ++ if (!strncmp(dent->d_name, "controlD", 8)) { ++ found = 1; ++ break; ++ } ++ ++ dent = readdir(sysdir); ++ } ++ closedir(sysdir); ++ if (found) ++ return 0; ++ } ++ + sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/", + domain, bus, dev, func); + Index: libdrm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- libdrm.spec 6 Mar 2008 04:42:47 -0000 1.37 +++ libdrm.spec 6 Mar 2008 23:02:48 -0000 1.38 @@ -3,7 +3,7 @@ Summary: Direct Rendering Manager runtime library Name: libdrm Version: 2.4.0 -Release: 0.8%{?dist} +Release: 0.9%{?dist} License: MIT Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -92,6 +92,9 @@ %{_libdir}/pkgconfig/libdrm.pc %changelog +* Fri Mar 07 2008 Dave Airlie 2.4.0-0.9 +- add support for new sysfs structure + * Thu Mar 06 2008 Dave Airlie 2.4.0-0.8 - add modprobe.d file so i915 modesetting can be specified on kernel command line From fedora-extras-commits at redhat.com Thu Mar 6 23:12:58 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Thu, 6 Mar 2008 23:12:58 GMT Subject: rpms/grub/devel grub-fedora-9.patch,1.5,1.6 grub.spec,1.68,1.69 Message-ID: <200803062312.m26NCwgk011171@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/grub/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11121 Modified Files: grub-fedora-9.patch grub.spec Log Message: * Thu Mar 06 2008 Peter Jones - 0.97-28 - Fix FAT/VFAT directory searching. - Don't artificially limit the kernel's location to lowmem. grub-fedora-9.patch: Index: grub-fedora-9.patch =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-9.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- grub-fedora-9.patch 28 Feb 2008 00:17:17 -0000 1.5 +++ grub-fedora-9.patch 6 Mar 2008 23:12:47 -0000 1.6 @@ -24868,10 +24868,10 @@ + diff --git a/efi/ia32/loader/linux.c b/efi/ia32/loader/linux.c new file mode 100644 -index 0000000..088b126 +index 0000000..36b6570 --- /dev/null +++ b/efi/ia32/loader/linux.c -@@ -0,0 +1,911 @@ +@@ -0,0 +1,906 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2006 Free Software Foundation, Inc. @@ -25045,17 +25045,12 @@ + desc < mmap_end; + desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size)) + { -+ /* Probably it is better to put the real mode code in the traditional -+ space for safety. */ + if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY -+ && desc->physical_start <= 0x90000 + && desc->num_pages >= real_mode_pages) + { + grub_efi_physical_address_t physical_end; + + physical_end = desc->physical_start + (desc->num_pages << 12); -+ if (physical_end > 0x90000) -+ physical_end = 0x90000; + + grub_dprintf ("linux", "physical_start = %x, physical_end = %x\n", + (unsigned) desc->physical_start, @@ -26620,10 +26615,10 @@ + diff --git a/efi/x86_64/loader/linux.c b/efi/x86_64/loader/linux.c new file mode 100644 -index 0000000..b618ef3 +index 0000000..f0fa412 --- /dev/null +++ b/efi/x86_64/loader/linux.c -@@ -0,0 +1,827 @@ +@@ -0,0 +1,822 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2006 Free Software Foundation, Inc. @@ -26797,17 +26792,12 @@ + desc < mmap_end; + desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size)) + { -+ /* Probably it is better to put the real mode code in the traditional -+ space for safety. */ + if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY -+ && desc->physical_start <= 0x90000 + && desc->num_pages >= real_mode_pages) + { + grub_efi_physical_address_t physical_end; + + physical_end = desc->physical_start + (desc->num_pages << 12); -+ if (physical_end > 0x90000) -+ physical_end = 0x90000; + + grub_dprintf ("linux", "physical_start = %x, physical_end = %x\n", + (unsigned) desc->physical_start, @@ -38395,7 +38385,7 @@ printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE); for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode; diff --git a/stage2/fsys_fat.c b/stage2/fsys_fat.c -index f40e658..70a4614 100644 +index f40e658..57a556c 100644 --- a/stage2/fsys_fat.c +++ b/stage2/fsys_fat.c @@ -54,8 +54,8 @@ struct fat_superblock @@ -38430,6 +38420,16 @@ /* Fill in info about super block */ FAT_SUPER->num_sectors = FAT_CVT_U16 (bpb.short_sectors) +@@ -340,7 +342,8 @@ fat_dir (char *dirname) + /* Directories don't have a file size */ + filemax = MAXINT; + +- for (rest = dirname; (ch = *rest) && !isspace (ch) && ch != '/'; rest++); ++ for (rest = dirname; (ch = *rest) && !isspace (ch) && ch != '/'; rest++) ++ *rest = tolower(*rest); + + *rest = 0; + diff --git a/stage2/fsys_iso9660.c b/stage2/fsys_iso9660.c index 90e4aa8..4d8a300 100644 --- a/stage2/fsys_iso9660.c Index: grub.spec =================================================================== RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- grub.spec 5 Mar 2008 20:37:48 -0000 1.68 +++ grub.spec 6 Mar 2008 23:12:47 -0000 1.69 @@ -1,6 +1,6 @@ Name: grub Version: 0.97 -Release: 27%{?dist} +Release: 28%{?dist} Summary: GRUB - the Grand Unified Boot Loader. Group: System Environment/Base License: GPLv2+ @@ -77,7 +77,7 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog NEWS README COPYING TODO docs/menu.lst /boot/grub -%attr(0755,root,root)/boot/efi/EFI/redhat/grub.efi +%attr(0755,root,root)/boot/efi/EFI/redhat /sbin/grub /sbin/grub-install /sbin/grub-terminfo @@ -89,6 +89,10 @@ %{_datadir}/grub %changelog +* Thu Mar 06 2008 Peter Jones - 0.97-28 +- Fix FAT/VFAT directory searching. +- Don't artificially limit the kernel's location to lowmem. + * Wed Mar 05 2008 Peter Jones - 0.97-27 - Fix permissions on grub.efi so cpio doesn't error when it's on vfat. From fedora-extras-commits at redhat.com Thu Mar 6 23:25:07 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Thu, 6 Mar 2008 23:25:07 GMT Subject: rpms/efibootmgr/devel efibootmgr-0.5.4-driver.patch, NONE, 1.1 efibootmgr.spec, 1.3, 1.4 Message-ID: <200803062325.m26NP7J6012726@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/efibootmgr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12627 Modified Files: efibootmgr.spec Added Files: efibootmgr-0.5.4-driver.patch Log Message: * Thu Mar 06 2008 Peter Jones - 0.5.4-3 - Add support for setting driver related variables. efibootmgr-0.5.4-driver.patch: --- NEW FILE efibootmgr-0.5.4-driver.patch --- diff -up efibootmgr-0.5.4/src/lib/efi.c.driver efibootmgr-0.5.4/src/lib/efi.c --- efibootmgr-0.5.4/src/lib/efi.c.driver 2008-03-06 15:45:17.000000000 -0500 +++ efibootmgr-0.5.4/src/lib/efi.c 2008-03-06 15:49:54.000000000 -0500 @@ -170,6 +170,26 @@ create_or_edit_variable(efi_variable_t * } static int +select_driver_var_names(const struct dirent *d) +{ + if (!strncmp(d->d_name, "Driver", 6) && + isxdigit(d->d_name[6]) && isxdigit(d->d_name[7]) && + isxdigit(d->d_name[8]) && isxdigit(d->d_name[9]) && + d->d_name[10] == '-') + return 1; + return 0; +} + +int +read_driver_var_names(struct dirent ***namelist) +{ + if (!fs_kernel_calls || !namelist) return -1; + return scandir(fs_kernel_calls->path, + namelist, select_driver_var_names, + alphasort); +} + +static int select_boot_var_names(const struct dirent *d) { if (!strncmp(d->d_name, "Boot", 4) && @@ -189,7 +209,6 @@ read_boot_var_names(struct dirent ***nam alphasort); } - static int get_edd_version() { @@ -763,7 +782,7 @@ append_extra_args(void *data, unsigned l int make_linux_efi_variable(efi_variable_t *var, - unsigned int free_number) + unsigned int free_number, int driver) { efi_guid_t guid = EFI_GLOBAL_VARIABLE; char buffer[16]; @@ -773,7 +792,7 @@ make_linux_efi_variable(efi_variable_t * memset(buffer, 0, sizeof(buffer)); /* VariableName needs to be BootXXXX */ - sprintf(buffer, "Boot%04X", free_number); + sprintf(buffer, driver ? "Driver%04X" : "Boot%04X", free_number); efichar_from_char(var->VariableName, buffer, 1024); diff -up efibootmgr-0.5.4/src/include/efi.h.driver efibootmgr-0.5.4/src/include/efi.h --- efibootmgr-0.5.4/src/include/efi.h.driver 2008-03-06 15:48:38.000000000 -0500 +++ efibootmgr-0.5.4/src/include/efi.h 2008-03-06 15:50:18.000000000 -0500 @@ -352,7 +352,7 @@ struct efivar_kernel_calls { /* Exported functions */ extern int make_linux_efi_variable(efi_variable_t *var, - unsigned int free_number); + unsigned int free_number, int driver); extern char * efi_guid_unparse(efi_guid_t *guid, char *out); extern EFI_DEVICE_PATH *load_option_path(EFI_LOAD_OPTION *option); @@ -363,6 +363,7 @@ extern efi_status_t delete_variable(efi_ extern efi_status_t create_or_edit_variable(efi_variable_t *var); extern void set_fs_kernel_calls(); +extern int read_driver_var_names(struct dirent ***namelist); extern int read_boot_var_names(struct dirent ***namelist); extern int variable_to_name(efi_variable_t *var, char *name); extern int var_name_to_path(const char *name, char *path); diff -up efibootmgr-0.5.4/src/include/efibootmgr.h.driver efibootmgr-0.5.4/src/include/efibootmgr.h --- efibootmgr-0.5.4/src/include/efibootmgr.h.driver 2008-03-06 16:21:55.000000000 -0500 +++ efibootmgr-0.5.4/src/include/efibootmgr.h 2008-03-06 16:22:17.000000000 -0500 @@ -52,6 +52,7 @@ typedef struct { unsigned int forcegpt:1; unsigned int set_timeout:1; unsigned int delete_timeout:1; + unsigned int driver:1; unsigned short int timeout; } efibootmgr_opt_t; diff -up efibootmgr-0.5.4/src/man/man8/efibootmgr.8.driver efibootmgr-0.5.4/src/man/man8/efibootmgr.8 --- efibootmgr-0.5.4/src/man/man8/efibootmgr.8.driver 2008-03-06 15:44:32.000000000 -0500 +++ efibootmgr-0.5.4/src/man/man8/efibootmgr.8 2008-03-06 17:03:55.000000000 -0500 @@ -53,6 +53,9 @@ Create new variable bootnum and add to b The disk containing the loader (defaults to \fI/dev/sda\fR) .TP +\fB-D | --driver\fR +Operate on Driver#### and DriverOrder instead of Boot#### and BootOrder +.TP \fB-e | --edd \fI1|3|-1\fB\fR Force EDD 1.0 or 3.0 creation variables, or guess. .TP diff -up efibootmgr-0.5.4/src/efibootmgr/efibootmgr.c.driver efibootmgr-0.5.4/src/efibootmgr/efibootmgr.c --- efibootmgr-0.5.4/src/efibootmgr/efibootmgr.c.driver 2008-03-06 15:44:14.000000000 -0500 +++ efibootmgr-0.5.4/src/efibootmgr/efibootmgr.c 2008-03-06 16:59:04.000000000 -0500 @@ -65,6 +65,7 @@ typedef struct _var_entry { /* global variables */ +static LIST_HEAD(driver_entry_list); static LIST_HEAD(boot_entry_list); static LIST_HEAD(blk_list); efibootmgr_opt_t opts; @@ -216,7 +217,7 @@ find_free_boot_var(list_t *boot_list) static void -warn_duplicate_name(list_t *boot_list) +warn_duplicate_name(list_t *boot_list, int driver) { list_t *pos; var_entry_t *boot; @@ -228,7 +229,9 @@ warn_duplicate_name(list_t *boot_list) boot->var_data.Data; if (!efichar_char_strcmp(opts.label, load_option->description)) { - fprintf(stderr, "** Warning ** : %.8s has same label %s\n", + fprintf(stderr, driver + ? "** Warning ** : %.10s has same label %s\n" + : "** Warning ** : %.8s has same label %s\n", boot->name->d_name, opts.label); } @@ -237,7 +240,7 @@ warn_duplicate_name(list_t *boot_list) static var_entry_t * -make_boot_var(list_t *boot_list) +make_var(list_t *boot_list, int driver) { var_entry_t *boot; int free_number; @@ -267,7 +270,7 @@ make_boot_var(list_t *boot_list) if (!boot) return NULL; memset(boot, 0, sizeof(*boot)); boot->num = free_number; - if (!make_linux_efi_variable(&boot->var_data, free_number)) { + if (!make_linux_efi_variable(&boot->var_data, free_number, driver)) { free(boot); return NULL; } @@ -289,30 +292,30 @@ read_boot(efi_variable_t *var, const cha } static efi_status_t -read_boot_order(efi_variable_t *boot_order) +read_order(efi_variable_t *boot_order, int driver) { efi_status_t status; - status = read_boot(boot_order, "BootOrder"); + status = read_boot(boot_order, driver ? "DriverOrder" : "BootOrder"); if (status != EFI_SUCCESS && status != EFI_NOT_FOUND) return status; if (status == EFI_NOT_FOUND) { - fill_var(boot_order, "BootOrder"); + fill_var(boot_order, driver ? "DriverOrder" : "BootOrder"); } return EFI_SUCCESS; } static efi_status_t -add_to_boot_order(uint16_t num) +add_to_order(uint16_t num, int driver) { efi_status_t status; efi_variable_t boot_order; uint64_t new_data_size; uint16_t *new_data, *old_data; - status = read_boot_order(&boot_order); + status = read_order(&boot_order, driver); if (status != EFI_SUCCESS) return status; /* We've now got an array (in boot_order.Data) of the @@ -333,7 +336,7 @@ add_to_boot_order(uint16_t num) static efi_status_t -remove_from_boot_order(uint16_t num) +remove_from_order(uint16_t num, int driver) { efi_status_t status; efi_variable_t boot_order; @@ -342,13 +345,13 @@ remove_from_boot_order(uint16_t num) int old_i,new_i; char boot_order_name[PATH_MAX]; - status = read_boot_order(&boot_order); + status = read_order(&boot_order, driver); if (status != EFI_SUCCESS) return status; /* If it's empty, yea! */ if (!boot_order.DataSize) return EFI_SUCCESS; fill_bootvar_name(boot_order_name, sizeof(boot_order_name), - "BootOrder"); + driver ? "DriverOrder" : "BootOrder"); /* We've now got an array (in boot_order.Data) of the boot order. Simply copy the array, skipping the @@ -415,7 +418,7 @@ set_boot_u16(const char *name, uint16_t } static efi_status_t -delete_boot_var(uint16_t num) +delete_boot_var(uint16_t num, int driver) { efi_status_t status; efi_variable_t var; @@ -423,28 +426,33 @@ delete_boot_var(uint16_t num) list_t *pos, *n; var_entry_t *boot; - snprintf(name, sizeof(name), "Boot%04X", num); + snprintf(name, sizeof(name), driver ? "Driver%04X" : "Boot%04X", num); memset(&var, 0, sizeof(var)); fill_var(&var, name); status = delete_variable(&var); /* For backwards compatibility, try to delete abcdef entries as well */ if (status) { - snprintf(name, sizeof(name), "Boot%04x", num); + snprintf(name, sizeof(name), driver ? "Driver%04X" : "Boot%04x", + num); memset(&var, 0, sizeof(var)); fill_var(&var, name); status = delete_variable(&var); } if (status) { - fprintf (stderr,"\nboot entry: %X not found\n\n",num); + fprintf (stderr,"\n%s entry: %X not found\n\n", + driver ? "driver" : "boot", num); return status; } - list_for_each_safe(pos, n, &boot_entry_list) { + list_for_each_safe(pos, n, driver ? &driver_entry_list + : &boot_entry_list) { boot = list_entry(pos, var_entry_t, list); if (boot->num == num) { - status = remove_from_boot_order(num); - if (status) return status; + if (!driver) { + status = remove_from_order(num, driver); + if (status) return status; + } list_del(&(boot->list)); break; /* short-circuit since it was found */ } @@ -468,13 +476,28 @@ set_var_nums(const char *pattern, list_t if (rc == 1) { var->num = num; name = var->name->d_name; /* shorter name */ - if ((isalpha(name[4]) && islower(name[4])) || - (isalpha(name[5]) && islower(name[5])) || - (isalpha(name[6]) && islower(name[6])) || - (isalpha(name[7]) && islower(name[7]))) { - fprintf(stderr, "** Warning ** : %.8s is not " - "EFI 1.10 compliant (lowercase hex in name)\n", name); - warn++; + if (!strncmp(name, "Boot", 4)) { + if ((isalpha(name[4]) && islower(name[4])) || + (isalpha(name[5]) && islower(name[5])) || + (isalpha(name[6]) && islower(name[6])) || + (isalpha(name[7]) && islower(name[7]))) { + fprintf(stderr, "** Warning ** : %.8s " + "is not EFI 1.10 compliant " + "(lowercase hex in name)\n", + name); + warn++; + } + } else if (!strncmp(name, "Driver", 6)) { + if ((isalpha(name[6]) && islower(name[6])) || + (isalpha(name[7]) && islower(name[7])) || + (isalpha(name[8]) && islower(name[8])) || + (isalpha(name[9]) && islower(name[9]))) { + fprintf(stderr, "** Warning ** : %.10s " + "is not EFI 1.10 compliant " + "(lowercase hex in name)\n", + name); + warn++; + } } } } @@ -574,10 +597,10 @@ find_disk_blk(char *disk_name, list_t *b #endif static void -unparse_boot_order(uint16_t *order, int length) +unparse_order(uint16_t *order, int length, int driver) { int i; - printf("BootOrder: "); + printf("%s: ", driver ? "DriverOrder" : "BootOrder"); for (i=0; inum == b) return 1; @@ -602,7 +625,7 @@ is_current_boot_entry(int b) static int -parse_boot_order(char *buffer, uint16_t *order, int length) +parse_order(char *buffer, uint16_t *order, int length, int driver) { int i; int num, rc; @@ -611,12 +634,13 @@ parse_boot_order(char *buffer, uint16_t rc = sscanf(buffer, "%x", &num); if (rc == 1) order[i] = num & 0xFFFF; else { - fprintf(stderr,"\nInvalid hex characters in boot order: %s\n\n",buffer); + fprintf(stderr,"\nInvalid hex characters in %s order: %s\n\n",buffer, driver ? "driver" : "boot"); return -1; } /* make sure this is an existing boot entry */ - if (!is_current_boot_entry(order[i])) { - fprintf (stderr,"\nboot entry %X does not exist\n\n",order[i]); + if (!is_current_entry(order[i], driver)) { + fprintf (stderr,"\n%s entry %X does not exist\n\n", + driver ? "driver" : "boot", order[i]); return -1; } @@ -629,7 +653,7 @@ parse_boot_order(char *buffer, uint16_t } static efi_status_t -set_boot_order() +set_order(int driver) { efi_variable_t boot_order; uint16_t *n = (uint16_t *)boot_order.Data; @@ -637,9 +661,9 @@ set_boot_order() if (!opts.bootorder) return EFI_SUCCESS; memset(&boot_order, 0, sizeof(boot_order)); - fill_var(&boot_order, "BootOrder"); + fill_var(&boot_order, driver ? "DriverOrder" : "BootOrder"); - boot_order.DataSize = parse_boot_order(opts.bootorder, n, 1024/sizeof(uint16_t)) * sizeof(uint16_t); + boot_order.DataSize = parse_order(opts.bootorder, n, 1024/sizeof(uint16_t), driver) * sizeof(uint16_t); if (boot_order.DataSize < 0) return 1; else @@ -647,7 +671,7 @@ set_boot_order() } static void -show_boot_vars() +show_vars(list_t *list) { list_t *pos; var_entry_t *boot; @@ -657,7 +681,7 @@ show_boot_vars() char text_path[1024], *p; unsigned long optional_data_len=0; - list_for_each(pos, &boot_entry_list) { + list_for_each(pos, list) { boot = list_entry(pos, var_entry_t, list); load_option = (EFI_LOAD_OPTION *) boot->var_data.Data; @@ -665,10 +689,15 @@ show_boot_vars() load_option->description, sizeof(description)); memset(text_path, 0, sizeof(text_path)); path = load_option_path(load_option); - if (boot->name) - printf("%.8s", boot->name->d_name); - else - printf("Boot%04X", boot->num); + if (boot->name) { + if (boot->name->d_name[0] == 'B') + printf("%.8s", boot->name->d_name); + else + printf("%.10s", boot->name->d_name); + } else { + printf(boot->name->d_name[0] == 'B' ? + "Driver%04X" : "Boot%04X", boot->num); + } if (load_option->attributes & LOAD_OPTION_ACTIVE) printf("* "); @@ -700,16 +729,16 @@ show_boot_vars() static void -show_boot_order() +show_order(int driver) { efi_status_t status; efi_variable_t boot_order; uint16_t *data; - status = read_boot_order(&boot_order); + status = read_order(&boot_order, driver); if (status != EFI_SUCCESS) { - perror("show_boot_order()"); + perror("show_order()"); return; } @@ -718,18 +747,19 @@ show_boot_order() */ data = (uint16_t *)&(boot_order.Data); if (boot_order.DataSize) - unparse_boot_order(data, boot_order.DataSize / sizeof(uint16_t)); + unparse_order(data, boot_order.DataSize / sizeof(uint16_t), + driver); } static efi_status_t -set_active_state() +set_active_state(int driver) { list_t *pos; var_entry_t *boot; EFI_LOAD_OPTION *load_option; - list_for_each(pos, &boot_entry_list) { + list_for_each(pos, driver ? &driver_entry_list : &boot_entry_list) { boot = list_entry(pos, var_entry_t, list); load_option = (EFI_LOAD_OPTION *) boot->var_data.Data; @@ -756,7 +786,8 @@ set_active_state() } } /* if we reach here then the bootnumber supplied was not found */ - fprintf(stderr,"\nboot entry %x not found\n\n",opts.bootnum); + fprintf(stderr,"\n%s entry %x not found\n\n", driver ?"driver" :"boot", + opts.bootnum); return EFI_NOT_FOUND; } @@ -774,6 +805,7 @@ usage() printf("\t-B | --delete-bootnum delete bootnum (hex)\n"); printf("\t-c | --create create new variable bootnum and add to bootorder\n"); printf("\t-d | --disk disk (defaults to /dev/sda) containing loader\n"); + printf("\t-D | --driver modify driver entry instead of boot entry\n"); printf("\t-e | --edd [1|3|-1] force EDD 1.0 or 3.0 creation variables, or guess\n"); printf("\t-E | --device num EDD 1.0 device number (defaults to 0x80)\n"); printf("\t-g | --gpt force disk with invalid PMBR to be treated as GPT\n"); @@ -806,6 +838,7 @@ set_default_opts() opts.bootnext = -1; /* Don't set it */ opts.active = -1; /* Don't set it */ opts.timeout = -1; /* Don't set it */ + opts.driver = 0; opts.edd10_devicenum = 0x80; opts.loader = "\\elilo.efi"; opts.label = "Linux"; @@ -833,6 +866,7 @@ parse_opts(int argc, char **argv) {"delete-bootnum", no_argument, 0, 'B'}, {"create", no_argument, 0, 'c'}, {"disk", required_argument, 0, 'd'}, + {"driver", no_argument, 0, 'D'}, {"iface", required_argument, 0, 'i'}, {"acpi_hid", required_argument, 0, 'H'}, {"edd-device", required_argument, 0, 'E'}, @@ -860,7 +894,7 @@ parse_opts(int argc, char **argv) }; c = getopt_long (argc, argv, - "AaBb:cd:e:E:gH:i:l:L:n:No:Op:qt:TuU:v::Vw@:", + "AaBb:cd:De:E:gH:i:l:L:n:No:Op:qt:TuU:v::Vw@:", long_options, &option_index); if (c == -1) break; @@ -893,6 +927,9 @@ parse_opts(int argc, char **argv) case 'd': opts.disk = optarg; break; + case 'D': + opts.driver = 1; + break; case 'e': rc = sscanf(optarg, "%d", &num); if (rc == 1) opts.edd_version = num; @@ -1048,6 +1085,9 @@ main(int argc, char **argv) num_boot_names = read_boot_var_names(&boot_names); read_vars(boot_names, num_boot_names, &boot_entry_list); set_var_nums("Boot%04X-%*s", &boot_entry_list); + num_boot_names = read_driver_var_names(&boot_names); + read_vars(boot_names, num_boot_names, &driver_entry_list); + set_var_nums("Driver%04X-%*s", &driver_entry_list); if (opts.delete_boot) { if (opts.bootnum == -1) { @@ -1055,7 +1095,7 @@ main(int argc, char **argv) return 1; } else - ret = delete_boot_var(opts.bootnum); + ret = delete_boot_var(opts.bootnum, opts.driver); } if (opts.active >= 0) { @@ -1064,42 +1104,56 @@ main(int argc, char **argv) return 1; } else - ret=set_active_state(); + ret=set_active_state(opts.driver); } } if (opts.create) { - warn_duplicate_name(&boot_entry_list); - new_boot = make_boot_var(&boot_entry_list); + if (opts.driver) { + warn_duplicate_name(&driver_entry_list, opts.driver); + new_boot = make_var(&driver_entry_list, opts.driver); + } else { + warn_duplicate_name(&boot_entry_list, opts.driver); + new_boot = make_var(&boot_entry_list, opts.driver); + } + if (!new_boot) return 1; /* Put this boot var in the right BootOrder */ if (!opts.testfile && new_boot) - ret=add_to_boot_order(new_boot->num); + ret=add_to_order(new_boot->num, opts.driver); } if (!opts.testfile) { if (opts.delete_bootorder) { - ret=delete_var("BootOrder"); + ret=delete_var(opts.driver ?"DriverOrder" :"BootOrder"); } if (opts.bootorder) { - ret=set_boot_order(); + ret=set_order(opts.driver); } + if (opts.driver) { + if (opts.delete_timeout || opts.set_timeout) { + fprintf(stderr, "\nTimeout is not compatible with -D.\n\n"); + return 1; + } + if (opts.bootnext >= 0 || opts.delete_bootnext) { + fprintf(stderr, "\nBootNext is not compatible with -D.\n\n"); + return 1; + } + } - if (opts.delete_bootnext) { + if (opts.delete_bootnext) ret=delete_var("BootNext"); - } - if (opts.delete_timeout) { + if (opts.delete_timeout) ret=delete_var("Timeout"); - } if (opts.bootnext >= 0) { - if (!is_current_boot_entry(opts.bootnext & 0xFFFF)){ + if (!is_current_entry(opts.bootnext & 0xFFFF, 0)){ fprintf (stderr,"\n\nboot entry %X does not exist\n\n", opts.bootnext); return 1; @@ -1107,9 +1161,8 @@ main(int argc, char **argv) ret=set_boot_u16("BootNext", opts.bootnext & 0xFFFF); } - if (opts.set_timeout) { + if (opts.set_timeout) ret=set_boot_u16("Timeout", opts.timeout); - } if (!opts.quiet && ret == 0) { num = read_boot_u16("BootNext"); @@ -1124,12 +1177,15 @@ main(int argc, char **argv) if (num != -1) { printf("Timeout: %u seconds\n", num); } - show_boot_order(); - show_boot_vars(); + show_order(0); + show_vars(&boot_entry_list); + show_order(1); + show_vars(&driver_entry_list); } } free_dirents(boot_names, num_boot_names); free_vars(&boot_entry_list); + free_vars(&driver_entry_list); if (ret) return 1; return 0; Index: efibootmgr.spec =================================================================== RCS file: /cvs/extras/rpms/efibootmgr/devel/efibootmgr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- efibootmgr.spec 5 Feb 2008 17:04:09 -0000 1.3 +++ efibootmgr.spec 6 Mar 2008 23:24:17 -0000 1.4 @@ -1,7 +1,7 @@ Summary: EFI Boot Manager Name: efibootmgr Version: 0.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://linux.dell.com/%{name}/ @@ -15,6 +15,7 @@ Obsoletes: elilo <= 3.6-5 Source0: http://linux.dell.com/%{name}/permalink/%{name}-%{version}.tar.gz +Patch0: efibootmgr-0.5.4-driver.patch %description %{name} displays and allows the user to edit the Intel Extensible @@ -24,8 +25,11 @@ %prep %setup -q +%patch0 -p1 + %build make %{?_smp_mflags} EXTRA_CFLAGS='%{optflags}' + %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_mandir}/man8 @@ -44,6 +48,9 @@ %doc README INSTALL COPYING %changelog +* Thu Mar 06 2008 Peter Jones - 0.5.4-3 +- Add support for setting driver related variables. + * Tue Feb 5 2008 Matt Domsch 0.5.4-2 - rebuild with conflicts/obsoletes matching elilo From fedora-extras-commits at redhat.com Thu Mar 6 23:48:34 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 6 Mar 2008 23:48:34 GMT Subject: rpms/NetworkManager/F-7 .cvsignore, 1.43, 1.44 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.2, 1.3 NetworkManager.spec, 1.151, 1.152 sources, 1.61, 1.62 NetworkManager-0.6.5-no-killswitch-fix.patch, 1.1, NONE Message-ID: <200803062348.m26NmYZS014961@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14930 Modified Files: .cvsignore NetworkManager-0.6.5-fixup-internal-applet-build.patch NetworkManager.spec sources Removed Files: NetworkManager-0.6.5-no-killswitch-fix.patch Log Message: * Thu Mar 6 2008 Dan Williams 1:0.6.6-1 - Update to 0.6.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/F-7/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 21 Jun 2007 14:33:59 -0000 1.43 +++ .cvsignore 6 Mar 2008 23:47:59 -0000 1.44 @@ -1,3 +1,5 @@ network-manager-applet-0.6.5.tar.bz2 NetworkManager-0.6.5.tar.bz2 nm-applet-0.6.5.tar.bz2 +NetworkManager-0.6.6.tar.gz +nm-applet-0.6.6.tar.gz NetworkManager-0.6.5-fixup-internal-applet-build.patch: Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/F-7/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NetworkManager-0.6.5-fixup-internal-applet-build.patch 15 Mar 2007 20:35:01 -0000 1.2 +++ NetworkManager-0.6.5-fixup-internal-applet-build.patch 6 Mar 2008 23:47:59 -0000 1.3 @@ -1,6 +1,49 @@ ---- NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am.buildfix 2007-02-02 10:53:26.000000000 -0500 -+++ NetworkManager-0.6.5/nm-applet-0.6.5/src/Makefile.am 2007-03-15 14:20:32.000000000 -0400 -@@ -2,6 +2,9 @@ +diff -up NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am +--- NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am.buildfix 2008-02-20 11:08:06.000000000 -0500 ++++ NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am 2008-03-06 18:11:26.000000000 -0500 +@@ -1,7 +1,8 @@ + INCLUDES = \ + -I$(top_srcdir) \ + $(GTK_CFLAGS) \ +- $(NM_CFLAGS) ++ -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util + + noinst_LTLIBRARIES = libnma.la + +diff -up NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac +--- NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac.buildfix 2008-03-06 16:50:35.000000000 -0500 ++++ NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac 2008-03-06 18:11:26.000000000 -0500 +@@ -18,10 +18,10 @@ dnl + dnl This doesn't depend on gnome support, only on gnome-common, autogen already + dnl uses gnome-autogen + dnl +-GNOME_COMMON_INIT +-GNOME_DEBUG_CHECK +-GNOME_COMPILE_WARNINGS([maximum]) +-GNOME_MAINTAINER_MODE_DEFINES ++dnl GNOME_COMMON_INIT ++dnl GNOME_DEBUG_CHECK ++dnl GNOME_COMPILE_WARNINGS([maximum]) ++dnl GNOME_MAINTAINER_MODE_DEFINES + + dnl + dnl Required headers +@@ -111,10 +111,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) + AC_SUBST(GOBJECT_CFLAGS) + AC_SUBST(GOBJECT_LIBS) + +-PKG_CHECK_MODULES(NM, NetworkManager) +-AC_SUBST(NM_CFLAGS) +-AC_SUBST(NM_LIBS) +- + AC_ARG_WITH(notify, AC_HELP_STRING([--with-notify], [Use libnotify]), enable_notify=$withval, enable_notify=auto) + + PKG_CHECK_MODULES(GTK, gtk+-2.0) +diff -up NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am +--- NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am.buildfix 2008-02-20 11:08:06.000000000 -0500 ++++ NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am 2008-03-06 18:11:26.000000000 -0500 +@@ -2,6 +2,9 @@ NULL= bin_PROGRAMS = nm-applet @@ -8,9 +51,9 @@ + -I${top_srcdir}/../libnm-util + nm_applet_CPPFLAGS = \ + -I$(top_srcdir) \ $(DBUS_CFLAGS) \ - $(GTHREAD_CFLAGS) \ -@@ -12,7 +15,6 @@ +@@ -13,7 +16,6 @@ nm_applet_CPPFLAGS = \ $(GCONF_CFLAGS) \ $(LIBGNOMEUI_CFLAGS) \ $(GNOME_KEYRING_CFLAGS) \ @@ -18,40 +61,47 @@ -DICONDIR=\""$(datadir)/icons"\" \ -DGLADEDIR=\""$(gladedir)"\" \ -DBINDIR=\""$(bindir)"\" \ -@@ -112,7 +114,7 @@ +@@ -114,8 +116,8 @@ nm_applet_LDADD = \ $(GCONF_LIBS) \ $(LIBGNOMEUI_LIBS) \ $(GNOME_KEYRING_LIBS) \ - $(NM_LIBS) \ +- ../libnma/libnma.la \ + -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ $(top_builddir)/libnma/libnma.la \ $(NULL) if WITH_NOTIFY ---- NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac.buildfix 2007-03-15 11:51:49.000000000 -0400 -+++ NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac 2007-03-15 16:33:34.000000000 -0400 -@@ -18,10 +18,10 @@ - dnl This doesn't depend on gnome support, only on gnome-common, autogen already - dnl uses gnome-autogen - dnl --GNOME_COMMON_INIT --GNOME_DEBUG_CHECK --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -+dnl GNOME_COMMON_INIT -+dnl GNOME_DEBUG_CHECK -+dnl GNOME_COMPILE_WARNINGS([maximum]) -+dnl GNOME_MAINTAINER_MODE_DEFINES +diff -up NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am +--- NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am.buildfix 2008-03-06 18:13:34.000000000 -0500 ++++ NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am 2008-03-06 18:16:30.000000000 -0500 +@@ -1,6 +1,8 @@ + NULL= + +-INCLUDES = -I${top_srcdir} ++INCLUDES = -I${top_srcdir} \ ++ -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util - dnl - dnl Required headers -@@ -112,10 +112,6 @@ - AC_SUBST(GOBJECT_CFLAGS) - AC_SUBST(GOBJECT_LIBS) + bin_PROGRAMS = nm-editor + +@@ -15,7 +17,6 @@ nm_editor_CPPFLAGS = \ + $(LIBGNOMEUI_CFLAGS) \ + $(PANEL_APPLET_CFLAGS) \ + $(GNOME_KEYRING_CFLAGS) \ +- $(NM_CFLAGS) \ + -DICONDIR=\""$(datadir)/pixmaps"\" \ + -DGLADEDIR=\""$(datadir)/nm-applet"\" \ + -DBINDIR=\""$(bindir)"\" \ +@@ -57,8 +58,9 @@ nm_editor_LDADD = \ + $(GCONF_LIBS) \ + $(LIBGNOMEUI_LIBS) \ + $(GNOME_KEYRING_LIBS) \ +- $(NM_LIBS) \ +- ../libnma/libnma.la \ ++ -L${top_srcdir}/../libnm-util \ ++ $(top_builddir)/../libnm-util/libnm-util.la \ ++ $(top_builddir)/libnma/libnma.la \ + $(NULL) --PKG_CHECK_MODULES(NM, NetworkManager) --AC_SUBST(NM_CFLAGS) --AC_SUBST(NM_LIBS) -- - AC_ARG_WITH(notify, AC_HELP_STRING([--with-notify], [Use libnotify]), enable_notify=$withval, enable_notify=auto) - PKG_CHECK_MODULES(GTK, gtk+-2.0) Index: NetworkManager.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/F-7/NetworkManager.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- NetworkManager.spec 27 Jun 2007 14:08:52 -0000 1.151 +++ NetworkManager.spec 6 Mar 2008 23:47:59 -0000 1.152 @@ -6,21 +6,20 @@ %define gtk2_version 2.6.0 %define wireless_tools_version 1:28-0pre9 +%define libnl_version 1.1 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.6.5 -Release: 7%{?dist} +Version: 0.6.6 +Release: 1%{?dist} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}.tar.bz2 -Source1: nm-applet-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.gz +Source1: nm-applet-%{version}.tar.gz Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch -Patch2: linkdebug.patch -Patch3: NetworkManager-0.6.5-no-killswitch-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -32,6 +31,7 @@ Requires: dhcdbd Requires: dhclient >= 3.0.2-12 Requires: wpa_supplicant +Requires: libnl >= %{libnl_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -48,7 +48,7 @@ BuildRequires: pkgconfig BuildRequires: dhcdbd BuildRequires: wpa_supplicant -BuildRequires: libnl-devel +BuildRequires: libnl-devel >= %{libnl_version} BuildRequires: libnotify-devel >= 0.3 BuildRequires: perl(XML::Parser) BuildRequires: automake autoconf intltool libtool @@ -117,13 +117,11 @@ %prep -%setup -q +%setup -q -n %{name}-0.6.6 %patch0 -p1 -b .startup-dhcdbd -%patch2 -p1 -b .linkdebug -%patch3 -p1 -b .no-killswitch-fix # unpack the applet -tar -xjf %{SOURCE1} +tar -xzf %{SOURCE1} %patch1 -p1 -b .buildfix %build @@ -137,7 +135,7 @@ make # build the applet -pushd nm-applet-0.6.5 +pushd nm-applet-0.6.6 autoreconf -i intltoolize --force %configure \ @@ -156,7 +154,7 @@ make install DESTDIR=$RPM_BUILD_ROOT # install the applet -pushd nm-applet-0.6.5 +pushd nm-applet-0.6.6 make install DESTDIR=$RPM_BUILD_ROOT popd @@ -166,6 +164,11 @@ %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la %{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/ +%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applications/nm-editor.desktop + +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/ +%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/nm-applet.desktop + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -211,8 +214,8 @@ %dir %{_sysconfdir}/NetworkManager/ %{_bindir}/nm-tool %{_libdir}/libnm-util.so* -%{_mandir}/man1/NetworkManager.1.gz -%{_mandir}/man1/NetworkManagerDispatcher.1.gz +%{_mandir}/man8/NetworkManager.8.gz +%{_mandir}/man8/NetworkManagerDispatcher.8.gz %{_mandir}/man1/nm-tool.1.gz %dir %{_localstatedir}/run/NetworkManager %{_prefix}/libexec/nm-crash-logger @@ -225,6 +228,7 @@ %{_bindir}/nm-applet %{_bindir}/nm-vpn-properties %{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade +%{_bindir}/nm-editor %{_datadir}/nm-applet/ %{_datadir}/icons/hicolor/22x22/apps/*.png %{_datadir}/icons/hicolor/48x48/apps/*.png @@ -249,6 +253,9 @@ %changelog +* Thu Mar 6 2008 Dan Williams 1:0.6.6-1 +- Update to 0.6.6 + * Wed Jun 27 2007 Dan Williams 1:0.6.5-7 - Fix Wireless Enabled checkbox when no killswitches are present Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/F-7/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 21 Jun 2007 14:33:59 -0000 1.61 +++ sources 6 Mar 2008 23:47:59 -0000 1.62 @@ -1,2 +1,2 @@ -5f9161b0f3c0011b7f44bd0a7321e7c0 NetworkManager-0.6.5.tar.bz2 -a629a8e2e90f7e1eb9cfd3fba35d7113 nm-applet-0.6.5.tar.bz2 +412ed4db5d2db04285799c4303ddeeed NetworkManager-0.6.6.tar.gz +16e95a3515e4255d034b14045a9effd5 nm-applet-0.6.6.tar.gz --- NetworkManager-0.6.5-no-killswitch-fix.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 6 23:55:45 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 6 Mar 2008 23:55:45 GMT Subject: rpms/libdhcp/F-7 libdhcp-1.24-libnl.patch, NONE, 1.1 libdhcp.spec, 1.53, 1.54 Message-ID: <200803062355.m26Ntj9k015380@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/libdhcp/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15308 Modified Files: libdhcp.spec Added Files: libdhcp-1.24-libnl.patch Log Message: * Thu Mar 6 2008 Dan Williams - 1.24-6 - Update for libnl 1.1 libdhcp-1.24-libnl.patch: --- NEW FILE libdhcp-1.24-libnl.patch --- diff -up libdhcp-1.24/nic.c.libnl libdhcp-1.24/nic.c --- libdhcp-1.24/nic.c.libnl 2007-03-05 15:36:03.000000000 -0500 +++ libdhcp-1.24/nic.c 2008-02-12 15:35:22.000000000 -0500 @@ -50,7 +50,6 @@ #include #include -#include #include #include #include @@ -367,15 +366,17 @@ static int nic_get_links(NLH_t nh, char } } - if (nl_send_auto_complete(nh->nl, nlmsg_hdr(msg)) < 0) { + if (nl_send_auto_complete(nh->nl, msg) < 0) { eprintf(NIC_FATAL, "nic_get_links: %m\n"); return -1; } rlen = 1; while (rlen > 0) { + struct ucred *creds = NULL; + rhdrs = NULL; - if ((rlen = nl_recv(nh->nl, &addr, (void *)&rhdrs)) <= 0) + if ((rlen = nl_recv(nh->nl, &addr, (void *)&rhdrs, &creds)) <= 0) break; if (rlen < sizeof (*rhdr) + sizeof (struct ifinfomsg)) { @@ -738,7 +739,7 @@ NIC_Res_t nic_update( NIC_t nic ) if( nic->l.change & NIC_LINK_PROTINFO ) NLA_PUT_U32(msg, IFLA_PROTINFO, nic->l.protinfo); - if( nl_send_auto_complete(nic->nh->nl, nlmsg_hdr(msg)) < 0 ) + if( nl_send_auto_complete(nic->nh->nl, msg) < 0 ) { eprintf(NIC_ERR,"nic_update_link: send failed - %d %s", nl_get_errno(), nl_geterror()); @@ -746,6 +747,7 @@ NIC_Res_t nic_update( NIC_t nic ) } nlmsg_free(msg); + nl_disable_sequence_check(nic->nh->nl); if( nl_wait_for_ack(nic->nh->nl) < 0 ) { @@ -1104,7 +1106,7 @@ static int nic_get_addresses(NLH_t nh, I IP_ADDR(&(addr->nla.addr)) ); - if ( nl_send_auto_complete( nh->nl, nlmsg_hdr(msg) ) < 0 ) + if ( nl_send_auto_complete( nh->nl, msg) < 0 ) { eprintf(NIC_ERR,"nic_get_addresses: send failed: %d %s\n", nl_get_errno(), nl_geterror()); @@ -1126,7 +1128,8 @@ static int nic_get_addresses(NLH_t nh, I do { - if ( (rlen = nl_recv( nh->nl, &kernel, (void*)&buf)) > 0 ) + struct ucred *creds = NULL; + if( (rlen = nl_recv(nh->nl, &kernel, (void*) &buf, &creds)) > 0 ) { if( rlen < (sizeof(struct nlmsghdr) + sizeof(struct ifaddrmsg)) ) goto nla_return; @@ -1692,7 +1695,7 @@ int nic_addr_send( IPaddr_t ipa, NIC_Add if( ipa->nla.have & NIC_ADDR_CACHEINFO ) NLA_PUT(msg, IFA_CACHEINFO, sizeof(struct ifa_cacheinfo), &(ipa->nla.cacheinfo)); - if( (err = nl_send_auto_complete(ipa->nh->nl, nlmsg_hdr(msg))) < 0 ) + if( (err = nl_send_auto_complete(ipa->nh->nl, msg)) < 0 ) { eprintf(NIC_ERR,"nic_addr_send: send failed - %d %d %s", err, nl_get_errno(), nl_geterror()); @@ -1700,6 +1703,7 @@ int nic_addr_send( IPaddr_t ipa, NIC_Add } nlmsg_free(msg); + nl_disable_sequence_check(ipa->nh->nl); int n_tries = 0; try_again: @@ -2208,7 +2212,7 @@ static int nic_get_routes(NLH_t nh, RT_t if( (rta->have & NIC_RT_IIF) && (rta->iif[0] != '\0') ) NLA_PUT_STRING(msg, RTA_IIF, &(rta->iif[0])); - if ( nl_send_auto_complete( nh->nl, nlmsg_hdr(msg) ) < 0 ) + if ( nl_send_auto_complete( nh->nl, msg) < 0 ) { eprintf(NIC_ERR,"nic_get_routes: send failed: %d %s\n", nl_get_errno(), nl_geterror()); @@ -2223,7 +2227,8 @@ static int nic_get_routes(NLH_t nh, RT_t do { - if ( (rlen = nl_recv( nh->nl, &kernel, (void*)&buf)) > 0 ) + struct ucred *creds = NULL; + if ( (rlen = nl_recv( nh->nl, &kernel, (void*)&buf, &creds)) > 0 ) { if( rlen < (sizeof(struct nlmsghdr) + sizeof(struct rtmsg)) ) goto rta_return; @@ -2963,7 +2968,7 @@ static NIC_Res_t nic_route_msg( IProute_ if ( rt->rt.have & NIC_RT_MP_ALGO ) NLA_PUT_U32(msg, RTA_MP_ALGO, rt->rt.mp_algo); - if( nl_send_auto_complete(rt->nh->nl, nlmsg_hdr(msg)) < 0 ) + if( nl_send_auto_complete(rt->nh->nl, msg) < 0 ) { eprintf(NIC_ERR,"%s: send failed - %d %s", tag, nl_get_errno(), nl_geterror()); @@ -2971,6 +2976,7 @@ static NIC_Res_t nic_route_msg( IProute_ } nlmsg_free(msg); + nl_disable_sequence_check(rt->nh->nl); if( nl_wait_for_ack(rt->nh->nl) < 0 ) { Index: libdhcp.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdhcp/F-7/libdhcp.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- libdhcp.spec 8 Aug 2007 22:19:36 -0000 1.53 +++ libdhcp.spec 6 Mar 2008 23:55:12 -0000 1.54 @@ -1,13 +1,14 @@ Summary: A library for network interface configuration with DHCP Name: libdhcp Version: 1.24 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Development/Libraries URL: http://people.redhat.com/dcantrel/%{name}/ Source: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2 Patch0: %{name}-1.24-option-list.patch +Patch1: %{name}-1.24-libnl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dhcp-devel, libdhcp4client-devel >= 12:3.0.4-18 @@ -43,6 +44,7 @@ %prep %setup -q %patch0 -p1 -b .optionlist +%patch1 -p1 -b .libnl %build %{__make} %{?_smp_mflags} @@ -74,6 +76,9 @@ %{_libdir}/libdhcp.a %changelog +* Thu Mar 6 2008 Dan Williams - 1.24-6 +- Update for libnl 1.1 + * Wed Aug 08 2007 David Cantrell - 1.24-5 - Update License tag to GPLv2 From fedora-extras-commits at redhat.com Thu Mar 6 23:58:05 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 6 Mar 2008 23:58:05 GMT Subject: rpms/libdhcp/F-7 libdhcp.spec,1.54,1.55 Message-ID: <200803062358.m26Nw54L015711@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/libdhcp/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15587 Modified Files: libdhcp.spec Log Message: Bump libnl requires Index: libdhcp.spec =================================================================== RCS file: /cvs/pkgs/rpms/libdhcp/F-7/libdhcp.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- libdhcp.spec 6 Mar 2008 23:55:12 -0000 1.54 +++ libdhcp.spec 6 Mar 2008 23:57:29 -0000 1.55 @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dhcp-devel, libdhcp4client-devel >= 12:3.0.4-18 -BuildRequires: libdhcp6client-devel >= 0.10-38, libnl-devel >= 1.0-0.10.pre5.4 +BuildRequires: libdhcp6client-devel >= 0.10-38, libnl-devel >= 1.1 BuildRequires: pkgconfig %description From fedora-extras-commits at redhat.com Fri Mar 7 00:18:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 00:18:43 +0000 Subject: [pkgdb] xfce4-time-out-plugin was added for cwickert Message-ID: <200803070020.m270KPOu031031@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xfce4-time-out-plugin with summary Xfce panel plugin for taking breaks from the computer Kevin Fenzi (kevin) has approved Package xfce4-time-out-plugin Kevin Fenzi (kevin) has added a Fedora devel branch for xfce4-time-out-plugin with an owner of cwickert Kevin Fenzi (kevin) has approved xfce4-time-out-plugin in Fedora devel Kevin Fenzi (kevin) has approved Package xfce4-time-out-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfce4-time-out-plugin (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfce4-time-out-plugin (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfce4-time-out-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-time-out-plugin From fedora-extras-commits at redhat.com Fri Mar 7 00:19:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 00:19:02 +0000 Subject: [pkgdb] xfce4-time-out-plugin (Fedora, 8) updated by kevin Message-ID: <200803070020.m270KPOx031031@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xfce4-time-out-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfce4-time-out-plugin (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfce4-time-out-plugin (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfce4-time-out-plugin (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on xfce4-time-out-plugin (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-time-out-plugin From fedora-extras-commits at redhat.com Fri Mar 7 00:19:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 00:19:02 +0000 Subject: [pkgdb] xfce4-time-out-plugin (Fedora, 7) updated by kevin Message-ID: <200803070020.m270KPP2031031@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for xfce4-time-out-plugin Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xfce4-time-out-plugin (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xfce4-time-out-plugin (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xfce4-time-out-plugin (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on xfce4-time-out-plugin (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-time-out-plugin From fedora-extras-commits at redhat.com Fri Mar 7 00:19:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 00:19:02 +0000 Subject: [pkgdb] xfce4-time-out-plugin (Fedora, devel) updated by kevin Message-ID: <200803070020.m270Kjmo031093@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on xfce4-time-out-plugin (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xfce4-time-out-plugin From fedora-extras-commits at redhat.com Fri Mar 7 00:19:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:19:55 GMT Subject: rpms/xfce4-time-out-plugin - New directory Message-ID: <200803070019.m270JtY2025843@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-time-out-plugin In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25719/rpms/xfce4-time-out-plugin Log Message: Directory /cvs/extras/rpms/xfce4-time-out-plugin added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 00:19:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:19:59 GMT Subject: rpms/xfce4-time-out-plugin/devel - New directory Message-ID: <200803070019.m270Jxa8025865@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-time-out-plugin/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25719/rpms/xfce4-time-out-plugin/devel Log Message: Directory /cvs/extras/rpms/xfce4-time-out-plugin/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 00:20:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:20:05 GMT Subject: rpms/xfce4-time-out-plugin Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803070020.m270K5PA025904@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-time-out-plugin In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25719/rpms/xfce4-time-out-plugin Added Files: Makefile import.log Log Message: Setup of module xfce4-time-out-plugin --- NEW FILE Makefile --- # Top level Makefile for module xfce4-time-out-plugin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 00:20:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:20:09 GMT Subject: rpms/xfce4-time-out-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803070020.m270K9cF025926@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-time-out-plugin/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse25719/rpms/xfce4-time-out-plugin/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfce4-time-out-plugin --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xfce4-time-out-plugin # $Id: Makefile,v 1.1 2008/03/07 00:20:06 kevin Exp $ NAME := xfce4-time-out-plugin SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 00:21:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 00:21:35 +0000 Subject: [pkgdb] dvipdfmx was added for jgu Message-ID: <200803070023.m270NHD5031277@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package dvipdfmx with summary A DVI to PDF translator Kevin Fenzi (kevin) has approved Package dvipdfmx Kevin Fenzi (kevin) has added a Fedora devel branch for dvipdfmx with an owner of jgu Kevin Fenzi (kevin) has approved dvipdfmx in Fedora devel Kevin Fenzi (kevin) has approved Package dvipdfmx Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dvipdfmx (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dvipdfmx (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 00:21:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 00:21:50 +0000 Subject: [pkgdb] dvipdfmx (Fedora, devel) updated by kevin Message-ID: <200803070023.m270NWUl031303@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on dvipdfmx (Fedora devel) for jnovy Kevin Fenzi (kevin) approved watchcommits on dvipdfmx (Fedora devel) for jnovy Kevin Fenzi (kevin) approved commit on dvipdfmx (Fedora devel) for jnovy Kevin Fenzi (kevin) approved build on dvipdfmx (Fedora devel) for jnovy Kevin Fenzi (kevin) approved approveacls on dvipdfmx (Fedora devel) for jnovy Kevin Fenzi (kevin) approved watchbugzilla on dvipdfmx (Fedora devel) for pertusus Kevin Fenzi (kevin) approved watchcommits on dvipdfmx (Fedora devel) for pertusus Kevin Fenzi (kevin) approved commit on dvipdfmx (Fedora devel) for pertusus Kevin Fenzi (kevin) approved build on dvipdfmx (Fedora devel) for pertusus Kevin Fenzi (kevin) approved approveacls on dvipdfmx (Fedora devel) for pertusus Kevin Fenzi (kevin) Approved cvsextras for commit access on dvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 00:22:07 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 7 Mar 2008 00:22:07 GMT Subject: devel/mkinitrd .cvsignore, 1.173, 1.174 mkinitrd.spec, 1.251, 1.252 sources, 1.215, 1.216 Message-ID: <200803070022.m270M7qv026393@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/mkinitrd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26291 Modified Files: .cvsignore mkinitrd.spec sources Log Message: * Thu Mar 6 2008 Jeremy Katz - 6.0.34-1 - Fix scsi_wait_scan stuff up (#429937) - Add support for --without (wtogami, #436248) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/mkinitrd/.cvsignore,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- .cvsignore 5 Mar 2008 17:25:04 -0000 1.173 +++ .cvsignore 7 Mar 2008 00:21:31 -0000 1.174 @@ -1 +1 @@ -mkinitrd-6.0.33.tar.bz2 +mkinitrd-6.0.34.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/pkgs/devel/mkinitrd/mkinitrd.spec,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- mkinitrd.spec 5 Mar 2008 17:25:04 -0000 1.251 +++ mkinitrd.spec 7 Mar 2008 00:21:31 -0000 1.252 @@ -2,7 +2,7 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 6.0.33 +Version: 6.0.34 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -115,6 +115,10 @@ %{_libdir}/libbdevid.so.* %changelog +* Thu Mar 6 2008 Jeremy Katz - 6.0.34-1 +- Fix scsi_wait_scan stuff up (#429937) +- Add support for --without (wtogami, #436248) + * Wed Mar 5 2008 Jeremy Katz - 6.0.33-1 - Fix the non-persistent overlay case Index: sources =================================================================== RCS file: /cvs/pkgs/devel/mkinitrd/sources,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- sources 5 Mar 2008 17:25:04 -0000 1.215 +++ sources 7 Mar 2008 00:21:31 -0000 1.216 @@ -1 +1 @@ -5e49d0d9579a45b9aeabd6aa96c5a7e9 mkinitrd-6.0.33.tar.bz2 +79aaf00feb3f7ece584fc43118f73dda mkinitrd-6.0.34.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 00:22:57 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:22:57 GMT Subject: rpms/dvipdfmx - New directory Message-ID: <200803070022.m270Mv0A026579@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dvipdfmx In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy26517/rpms/dvipdfmx Log Message: Directory /cvs/extras/rpms/dvipdfmx added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 00:23:04 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:23:04 GMT Subject: rpms/dvipdfmx/devel - New directory Message-ID: <200803070023.m270N4M4026605@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dvipdfmx/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy26517/rpms/dvipdfmx/devel Log Message: Directory /cvs/extras/rpms/dvipdfmx/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 00:23:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:23:10 GMT Subject: rpms/dvipdfmx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803070023.m270NAHp026641@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dvipdfmx In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy26517/rpms/dvipdfmx Added Files: Makefile import.log Log Message: Setup of module dvipdfmx --- NEW FILE Makefile --- # Top level Makefile for module dvipdfmx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 00:23:13 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:23:13 GMT Subject: rpms/dvipdfmx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803070023.m270NDL7026664@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/dvipdfmx/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy26517/rpms/dvipdfmx/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dvipdfmx --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: dvipdfmx # $Id: Makefile,v 1.1 2008/03/07 00:23:10 kevin Exp $ NAME := dvipdfmx SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 00:24:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 00:24:33 +0000 Subject: [pkgdb] xdvipdfmx was added for nbecker Message-ID: <200803070026.m270Q1VB031528@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xdvipdfmx with summary An extended version of DVIPDFMx with support for XeTeX output Kevin Fenzi (kevin) has approved Package xdvipdfmx Kevin Fenzi (kevin) has added a Fedora devel branch for xdvipdfmx with an owner of nbecker Kevin Fenzi (kevin) has approved xdvipdfmx in Fedora devel Kevin Fenzi (kevin) has approved Package xdvipdfmx Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdvipdfmx (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdvipdfmx (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 00:24:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 00:24:42 +0000 Subject: [pkgdb] xdvipdfmx (Fedora, 8) updated by kevin Message-ID: <200803070026.m270QO6g031558@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xdvipdfmx Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdvipdfmx (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdvipdfmx (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdvipdfmx (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on xdvipdfmx (Fedora 8) for pertusus Kevin Fenzi (kevin) approved watchcommits on xdvipdfmx (Fedora 8) for pertusus Kevin Fenzi (kevin) approved commit on xdvipdfmx (Fedora 8) for pertusus Kevin Fenzi (kevin) approved build on xdvipdfmx (Fedora 8) for pertusus Kevin Fenzi (kevin) approved approveacls on xdvipdfmx (Fedora 8) for pertusus Kevin Fenzi (kevin) Approved cvsextras for commit access on xdvipdfmx (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 00:24:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 00:24:42 +0000 Subject: [pkgdb] xdvipdfmx (Fedora, 7) updated by kevin Message-ID: <200803070026.m270QO6i031558@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for xdvipdfmx Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdvipdfmx (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdvipdfmx (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdvipdfmx (Fedora 7) Kevin Fenzi (kevin) approved watchbugzilla on xdvipdfmx (Fedora 7) for pertusus Kevin Fenzi (kevin) approved watchcommits on xdvipdfmx (Fedora 7) for pertusus Kevin Fenzi (kevin) approved commit on xdvipdfmx (Fedora 7) for pertusus Kevin Fenzi (kevin) approved build on xdvipdfmx (Fedora 7) for pertusus Kevin Fenzi (kevin) approved approveacls on xdvipdfmx (Fedora 7) for pertusus Kevin Fenzi (kevin) Approved cvsextras for commit access on xdvipdfmx (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 00:24:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 00:24:42 +0000 Subject: [pkgdb] xdvipdfmx (Fedora, devel) updated by kevin Message-ID: <200803070026.m270QOTB031557@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on xdvipdfmx (Fedora devel) for pertusus Kevin Fenzi (kevin) approved watchcommits on xdvipdfmx (Fedora devel) for pertusus Kevin Fenzi (kevin) approved commit on xdvipdfmx (Fedora devel) for pertusus Kevin Fenzi (kevin) approved build on xdvipdfmx (Fedora devel) for pertusus Kevin Fenzi (kevin) approved approveacls on xdvipdfmx (Fedora devel) for pertusus Kevin Fenzi (kevin) Approved cvsextras for commit access on xdvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 00:25:17 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 7 Mar 2008 00:25:17 GMT Subject: rpms/netlabel_tools/F-7 netlabel_tools-0.17-newlibnl.patch, NONE, 1.1 netlabel_tools.spec, 1.6, 1.7 Message-ID: <200803070025.m270PHDl027023@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/pkgs/rpms/netlabel_tools/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26900 Modified Files: netlabel_tools.spec Added Files: netlabel_tools-0.17-newlibnl.patch Log Message: * Thu Mar 6 2008 Dan Williams - 0.17-6 - bz#431766 added patch to build with new libnl netlabel_tools-0.17-newlibnl.patch: --- NEW FILE netlabel_tools-0.17-newlibnl.patch --- diff -up netlabel_tools-0.17/libnetlabel/netlabel_internal.h.libnl netlabel_tools-0.17/libnetlabel/netlabel_internal.h --- netlabel_tools-0.17/libnetlabel/netlabel_internal.h.libnl 2006-09-28 17:18:05.000000000 -0500 +++ netlabel_tools-0.17/libnetlabel/netlabel_internal.h 2008-02-11 09:24:06.000000000 -0600 @@ -8,19 +8,17 @@ /* * (c) Copyright Hewlett-Packard Development Company, L.P., 2006 * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software: you can redistribute it and/or modify + * it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program. If not, see . * */ @@ -37,11 +35,13 @@ struct nlbl_handle_s { /* Specify which version of libnl we are using */ /* 1.0-pre5 => 1005 */ /* 1.0-pre6 => 1006 */ -#define LIBNL_VERSION 1005 +/* 1.0-pre8 => 1008 */ +/* 1.1 => 1100 */ +#define LIBNL_VERSION 1100 /* XXX - this whole block will most likely go away once libnl supports Generic * Netlink */ -#if 1 /* Generic Netlink types */ +#if LIBNL_VERSION <= 1006 /* Generic Netlink types */ /* Generic Netlink message header */ struct genlmsghdr { diff -up netlabel_tools-0.17/libnetlabel/netlabel_msg.c.libnl netlabel_tools-0.17/libnetlabel/netlabel_msg.c --- netlabel_tools-0.17/libnetlabel/netlabel_msg.c.libnl 2006-09-28 17:18:05.000000000 -0500 +++ netlabel_tools-0.17/libnetlabel/netlabel_msg.c 2008-02-11 09:22:13.000000000 -0600 @@ -8,19 +8,17 @@ /* * (c) Copyright Hewlett-Packard Development Company, L.P., 2006 * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software: you can redistribute it and/or modify + * it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program. If not, see . * */ @@ -52,7 +50,11 @@ nlbl_msg *nlbl_msg_new(void) struct genlmsghdr genl_hdr; /* create the message with a simple netlink header */ +#if LIBNL_VERSION >= 1008 + msg = nlmsg_alloc(); +#else msg = nlmsg_build_no_hdr(); +#endif if (msg == NULL) goto msg_new_failure; diff -up netlabel_tools-0.17/libnetlabel/netlabel_comm.c.libnl netlabel_tools-0.17/libnetlabel/netlabel_comm.c --- netlabel_tools-0.17/libnetlabel/netlabel_comm.c.libnl 2006-09-28 17:18:05.000000000 -0500 +++ netlabel_tools-0.17/libnetlabel/netlabel_comm.c 2008-02-11 09:24:06.000000000 -0600 @@ -8,28 +8,33 @@ /* * (c) Copyright Hewlett-Packard Development Company, L.P., 2006 * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software: you can redistribute it and/or modify + * it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program. If not, see . * */ #include #include #include +#include #include + +#ifndef __USE_GNU +#define __USE_GNU #include -#include +#undef __USE_GNU +#else +#include +#endif #include @@ -100,7 +105,10 @@ nlbl_handle *nlbl_comm_open(void) goto open_failure; /* set the netlink handle properties */ -#if LIBNL_VERSION >= 1006 +#if LIBNL_VERSION >= 1008 + nl_socket_set_peer_port(hndl->nl_hndl, 0); + nl_set_passcred(hndl->nl_hndl, 1); +#elif LIBNL_VERSION == 1006 nl_handle_set_peer_pid(hndl->nl_hndl, 0); nl_set_passcred(hndl->nl_hndl, 1); #endif @@ -177,7 +185,11 @@ int nlbl_comm_recv_raw(nlbl_handle *hndl * is waiting to be read from the handle */ timeout.tv_sec = nlcomm_read_timeout; timeout.tv_usec = 0; +#if LIBNL_VERSION >= 1008 + nl_fd = nl_socket_get_fd(hndl->nl_hndl); +#else nl_fd = nl_handle_get_fd(hndl->nl_hndl); +#endif FD_ZERO(&read_fds); FD_SET(nl_fd, &read_fds); ret_val = select(nl_fd + 1, &read_fds, NULL, NULL, &timeout); @@ -188,14 +200,12 @@ int nlbl_comm_recv_raw(nlbl_handle *hndl /* perform the read operation */ *data = NULL; -#if LIBNL_VERSION == 1005 - ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data); +#if LIBNL_VERSION >= 1006 + ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data, &creds); if (ret_val < 0) return ret_val; - /* XXX - avoid a compiler warning about unused variables */ - creds = NULL; -#elif LIBNL_VERSION >= 1006 - ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data, &creds); +#else + ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data); if (ret_val < 0) return ret_val; #endif @@ -250,7 +260,11 @@ int nlbl_comm_recv(nlbl_handle *hndl, nl * is waiting to be read from the handle */ timeout.tv_sec = nlcomm_read_timeout; timeout.tv_usec = 0; +#if LIBNL_VERSION >= 1008 + nl_fd = nl_socket_get_fd(hndl->nl_hndl); +#else nl_fd = nl_handle_get_fd(hndl->nl_hndl); +#endif FD_ZERO(&read_fds); FD_SET(nl_fd, &read_fds); ret_val = select(nl_fd + 1, &read_fds, NULL, NULL, &timeout); @@ -260,12 +274,16 @@ int nlbl_comm_recv(nlbl_handle *hndl, nl return -EAGAIN; /* perform the read operation */ -#if LIBNL_VERSION == 1005 - ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, &data); +#if LIBNL_VERSION >= 1100 + ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, &data, &creds); if (ret_val < 0) return ret_val; #elif LIBNL_VERSION >= 1006 - ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, &data, &creds); + ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data, &creds); + if (ret_val < 0) + return ret_val; +#else + ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data); if (ret_val < 0) return ret_val; #endif @@ -349,6 +367,6 @@ int nlbl_comm_send(nlbl_handle *hndl, nl #if LIBNL_VERSION == 1005 return nl_send_auto_complete(hndl->nl_hndl, nlbl_msg_nlhdr(msg)); #elif LIBNL_VERSION >= 1006 - return = nl_send_auto_complete(hndl->nl_hndl, msg); + return nl_send_auto_complete(hndl->nl_hndl, msg); #endif } Index: netlabel_tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/netlabel_tools/F-7/netlabel_tools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- netlabel_tools.spec 16 Oct 2006 20:54:59 -0000 1.6 +++ netlabel_tools.spec 7 Mar 2008 00:24:44 -0000 1.7 @@ -4,7 +4,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.17 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons URL: %{home_base_url} @@ -13,6 +13,7 @@ Source2: netlabel.rules Patch1: netlabel_tools-0.17-new-hdrs.patch Patch2: netlabel_tools-27_28.patch +Patch3: netlabel_tools-0.17-newlibnl.patch BuildRoot: %{_tmppath}/%{name}-%{version} BuildRequires: kernel-headers >= 2.6.18 BuildRequires: libnl-devel @@ -31,6 +32,7 @@ %patch1 -p1 # Upstream patch. %patch2 -p0 +%patch3 -p1 -b .libnl %build # Don't use _smp_mflags, it's small and a hand crafted Makefile @@ -57,6 +59,9 @@ %attr(0644,root,root) %{_mandir}/man8/* %changelog +* Thu Mar 6 2008 Dan Williams - 0.17-6 +- bz#431766 added patch to build with new libnl + * Mon Oct 16 2006 James Antill - 0.17-3 - Add upstream patch. - s/p1/p0/ for upstream patch. From fedora-extras-commits at redhat.com Fri Mar 7 00:25:35 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:25:35 GMT Subject: rpms/xdvipdfmx - New directory Message-ID: <200803070025.m270PZgg027128@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdvipdfmx In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz27019/rpms/xdvipdfmx Log Message: Directory /cvs/extras/rpms/xdvipdfmx added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 00:25:39 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:25:39 GMT Subject: rpms/xdvipdfmx/devel - New directory Message-ID: <200803070025.m270PdMH027149@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdvipdfmx/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz27019/rpms/xdvipdfmx/devel Log Message: Directory /cvs/extras/rpms/xdvipdfmx/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 00:25:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:25:42 GMT Subject: rpms/xdvipdfmx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803070025.m270Pg3l027181@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdvipdfmx In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz27019/rpms/xdvipdfmx Added Files: Makefile import.log Log Message: Setup of module xdvipdfmx --- NEW FILE Makefile --- # Top level Makefile for module xdvipdfmx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 00:25:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 00:25:44 GMT Subject: rpms/xdvipdfmx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803070025.m270Pide027203@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xdvipdfmx/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz27019/rpms/xdvipdfmx/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xdvipdfmx --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xdvipdfmx # $Id: Makefile,v 1.1 2008/03/07 00:25:42 kevin Exp $ NAME := xdvipdfmx SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 00:29:17 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 7 Mar 2008 00:29:17 GMT Subject: devel/anaconda .cvsignore, 1.504, 1.505 anaconda.spec, 1.644, 1.645 sources, 1.636, 1.637 Message-ID: <200803070029.m270THHO027842@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/anaconda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27747 Modified Files: .cvsignore anaconda.spec sources Log Message: * Thu Mar 06 2008 Jeremy Katz - 11.4.0.48-1 - Don't use the bits from $UPDATES unless $UPDATES exists (katzj) - Fix horkage with busybox stuff. There's now start-stop-daemon (katzj) - Require new enough version of yum-utils (katzj) - Pass the --archlist option to yumdownloader (jkeating) - Update pt_BR translation Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v retrieving revision 1.504 retrieving revision 1.505 diff -u -r1.504 -r1.505 --- .cvsignore 6 Mar 2008 01:59:31 -0000 1.504 +++ .cvsignore 7 Mar 2008 00:28:44 -0000 1.505 @@ -1 +1 @@ -anaconda-11.4.0.47.tar.bz2 +anaconda-11.4.0.48.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v retrieving revision 1.644 retrieving revision 1.645 diff -u -r1.644 -r1.645 --- anaconda.spec 6 Mar 2008 01:59:31 -0000 1.644 +++ anaconda.spec 7 Mar 2008 00:28:44 -0000 1.645 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.47 +Version: 11.4.0.48 Release: 1 License: GPLv2+ Group: Applications/System @@ -133,7 +133,7 @@ Requires: xorg-x11-font-utils, netpbm-progs Requires: busybox-anaconda Requires: isomd5sum -Requires: yum-utils +Requires: yum-utils >= 1.1.11-3 %description runtime The anaconda-runtime package contains parts of the installation system which @@ -204,6 +204,13 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Mar 06 2008 Jeremy Katz - 11.4.0.48-1 +- Don't use the bits from $UPDATES unless $UPDATES exists (katzj) +- Fix horkage with busybox stuff. There's now start-stop-daemon (katzj) +- Require new enough version of yum-utils (katzj) +- Pass the --archlist option to yumdownloader (jkeating) +- Update pt_BR translation + * Wed Mar 05 2008 Jeremy Katz - 11.4.0.47-1 - Fix the build again (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/devel/anaconda/sources,v retrieving revision 1.636 retrieving revision 1.637 diff -u -r1.636 -r1.637 --- sources 6 Mar 2008 01:59:31 -0000 1.636 +++ sources 7 Mar 2008 00:28:44 -0000 1.637 @@ -1 +1 @@ -e93767c10acc9ae5445908e98a61f00a anaconda-11.4.0.47.tar.bz2 +1e87c46df9f07b32a5f74d660e0de778 anaconda-11.4.0.48.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 00:33:36 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 7 Mar 2008 00:33:36 GMT Subject: rpms/xfce4-time-out-plugin/devel xfce4-time-out-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803070033.m270XaSI028543@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-time-out-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28426/devel Modified Files: .cvsignore sources Added Files: xfce4-time-out-plugin.spec Log Message: initial import --- NEW FILE xfce4-time-out-plugin.spec --- Name: xfce4-time-out-plugin Version: 0.1.1 Release: 1%{?dist} Summary: Xfce panel plugin for taking breaks from the computer Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel BuildRequires: gettext, perl(XML::Parser) Requires: xfce4-panel >= 4.4.0 %description This plugin makes it possible to take periodical breaks from the computer every X minutes. During breaks it locks your screen. It optionally allows you to postpone breaks for a certain time. %prep %setup -q %build %configure make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %changelog * Sun Nov 25 2007 Christoph Wickert - 0.1.1-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-time-out-plugin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 00:20:06 -0000 1.1 +++ .cvsignore 7 Mar 2008 00:33:02 -0000 1.2 @@ -0,0 +1 @@ +xfce4-time-out-plugin-0.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-time-out-plugin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 00:20:06 -0000 1.1 +++ sources 7 Mar 2008 00:33:02 -0000 1.2 @@ -0,0 +1 @@ +d2f5b157cf47c754d8dd007c73a4d1e6 xfce4-time-out-plugin-0.1.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 00:43:03 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 7 Mar 2008 00:43:03 GMT Subject: devel/livecd-tools .cvsignore, 1.13, 1.14 livecd-tools.spec, 1.13, 1.14 sources, 1.13, 1.14 Message-ID: <200803070043.m270h3Pp029868@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/livecd-tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29774 Modified Files: .cvsignore livecd-tools.spec sources Log Message: * Thu Mar 6 2008 Jeremy Katz - 015-1 - Support for using live isos with pxe booting (Richard W.M. Jones and Chris Lalancette) - Fixes for SELinux being disabled (Warren Togami) - Stop using mayflower for building the initrd; mkinitrd can do it now - Create a minimal /dev rather than using the host /dev (Warren Togami) - Support for persistent overlays when using a USB stick (based on support by Douglas McClendon) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/livecd-tools/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 12 Feb 2008 18:32:54 -0000 1.13 +++ .cvsignore 7 Mar 2008 00:42:23 -0000 1.14 @@ -1 +1 @@ -livecd-tools-014.tar.bz2 +livecd-tools-015.tar.bz2 Index: livecd-tools.spec =================================================================== RCS file: /cvs/pkgs/devel/livecd-tools/livecd-tools.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- livecd-tools.spec 12 Feb 2008 18:32:54 -0000 1.13 +++ livecd-tools.spec 7 Mar 2008 00:42:24 -0000 1.14 @@ -4,7 +4,7 @@ Summary: Tools for building live CD's Name: livecd-tools -Version: 014 +Version: 015 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -52,8 +52,7 @@ %doc AUTHORS COPYING README HACKING %{_bindir}/livecd-creator %{_bindir}/livecd-iso-to-disk -%dir /usr/lib/livecd-creator -/usr/lib/livecd-creator/mayflower +%{_bindir}/livecd-iso-to-pxeboot %dir %{_datadir}/livecd-tools %{_datadir}/livecd-tools/* %{_bindir}/image-creator @@ -63,6 +62,15 @@ %{python_sitelib}/imgcreate/*.pyc %changelog +* Thu Mar 6 2008 Jeremy Katz - 015-1 +- Support for using live isos with pxe booting (Richard W.M. Jones and + Chris Lalancette) +- Fixes for SELinux being disabled (Warren Togami) +- Stop using mayflower for building the initrd; mkinitrd can do it now +- Create a minimal /dev rather than using the host /dev (Warren Togami) +- Support for persistent overlays when using a USB stick (based on support + by Douglas McClendon) + * Tue Feb 12 2008 Jeremy Katz - 014-1 - Rework to provide a python API for use by other tools (thanks to markmc for a lot of the legwork here) Index: sources =================================================================== RCS file: /cvs/pkgs/devel/livecd-tools/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 12 Feb 2008 18:32:54 -0000 1.13 +++ sources 7 Mar 2008 00:42:24 -0000 1.14 @@ -1 +1 @@ -a39f71459e448c8da65512b840e91456 livecd-tools-014.tar.bz2 +021e61e504a068b863facfddad35b747 livecd-tools-015.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 01:43:35 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 7 Mar 2008 01:43:35 GMT Subject: rpms/xfce4-time-out-plugin/devel xfce4-time-out-plugin.spec, 1.1, 1.2 Message-ID: <200803070143.m271hZJ2012378@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-time-out-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12271 Modified Files: xfce4-time-out-plugin.spec Log Message: add review # to specfile Index: xfce4-time-out-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-time-out-plugin/devel/xfce4-time-out-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-time-out-plugin.spec 7 Mar 2008 00:33:02 -0000 1.1 +++ xfce4-time-out-plugin.spec 7 Mar 2008 01:42:55 -0000 1.2 @@ -1,3 +1,5 @@ +# Review at https://bugzilla.redhat.com/show_bug.cgi?id=398111 + Name: xfce4-time-out-plugin Version: 0.1.1 Release: 1%{?dist} @@ -10,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel -BuildRequires: gettext, perl(XML::Parser) +BuildRequires: gettext, perl(XML::Parser), libICE-devel Requires: xfce4-panel >= 4.4.0 %description From fedora-extras-commits at redhat.com Fri Mar 7 01:51:01 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 7 Mar 2008 01:51:01 GMT Subject: rpms/xfce4-time-out-plugin/F-7 xfce4-time-out-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803070151.m271p1rp013578@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-time-out-plugin/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13367/F-7 Modified Files: .cvsignore sources Added Files: xfce4-time-out-plugin.spec Log Message: * Sun Nov 25 2007 Christoph Wickert - 0.1.1-1 - Initial Fedora package --- NEW FILE xfce4-time-out-plugin.spec --- # Review at https://bugzilla.redhat.com/show_bug.cgi?id=398111 Name: xfce4-time-out-plugin Version: 0.1.1 Release: 1%{?dist} Summary: Xfce panel plugin for taking breaks from the computer Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel BuildRequires: gettext, perl(XML::Parser), libICE-devel Requires: xfce4-panel >= 4.4.0 %description This plugin makes it possible to take periodical breaks from the computer every X minutes. During breaks it locks your screen. It optionally allows you to postpone breaks for a certain time. %prep %setup -q %build %configure make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %changelog * Sun Nov 25 2007 Christoph Wickert - 0.1.1-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-time-out-plugin/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 00:20:06 -0000 1.1 +++ .cvsignore 7 Mar 2008 01:50:27 -0000 1.2 @@ -0,0 +1 @@ +xfce4-time-out-plugin-0.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-time-out-plugin/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 00:20:06 -0000 1.1 +++ sources 7 Mar 2008 01:50:27 -0000 1.2 @@ -0,0 +1 @@ +d2f5b157cf47c754d8dd007c73a4d1e6 xfce4-time-out-plugin-0.1.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 01:51:06 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 7 Mar 2008 01:51:06 GMT Subject: rpms/xfce4-time-out-plugin/F-8 xfce4-time-out-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803070151.m271p6mA013638@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-time-out-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13367/F-8 Modified Files: .cvsignore sources Added Files: xfce4-time-out-plugin.spec Log Message: * Sun Nov 25 2007 Christoph Wickert - 0.1.1-1 - Initial Fedora package --- NEW FILE xfce4-time-out-plugin.spec --- # Review at https://bugzilla.redhat.com/show_bug.cgi?id=398111 Name: xfce4-time-out-plugin Version: 0.1.1 Release: 1%{?dist} Summary: Xfce panel plugin for taking breaks from the computer Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel BuildRequires: gettext, perl(XML::Parser), libICE-devel Requires: xfce4-panel >= 4.4.0 %description This plugin makes it possible to take periodical breaks from the computer every X minutes. During breaks it locks your screen. It optionally allows you to postpone breaks for a certain time. %prep %setup -q %build %configure make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %post touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %changelog * Sun Nov 25 2007 Christoph Wickert - 0.1.1-1 - Initial Fedora package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-time-out-plugin/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 00:20:06 -0000 1.1 +++ .cvsignore 7 Mar 2008 01:50:31 -0000 1.2 @@ -0,0 +1 @@ +xfce4-time-out-plugin-0.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-time-out-plugin/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 00:20:06 -0000 1.1 +++ sources 7 Mar 2008 01:50:31 -0000 1.2 @@ -0,0 +1 @@ +d2f5b157cf47c754d8dd007c73a4d1e6 xfce4-time-out-plugin-0.1.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 02:06:40 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 7 Mar 2008 02:06:40 GMT Subject: rpms/gnome-media/devel gnome-media.spec,1.121,1.122 Message-ID: <200803070206.m2726eEp024582@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-media/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24438 Modified Files: gnome-media.spec Log Message: install all desktop files Index: gnome-media.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- gnome-media.spec 15 Feb 2008 04:02:13 -0000 1.121 +++ gnome-media.spec 7 Mar 2008 02:06:04 -0000 1.122 @@ -12,10 +12,10 @@ Summary: GNOME media programs Name: gnome-media Version: 2.20.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Multimedia -Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz +Source: http://download.gnome.org/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz Patch0: gnome-media-2.13.5-hide-help-button.patch # https://bugzilla.redhat.com/show_bug.cgi?id=186791 Patch1: gnome-volume-control-gconf-fixes.patch @@ -104,9 +104,12 @@ # show in all desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Red-Hat-Base \ $RPM_BUILD_ROOT%{_datadir}/applications/gnome-sound-recorder.desktop +desktop-file-install --vendor "" --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/gstreamer-properties.desktop + rm -f $RPM_BUILD_ROOT%{_datadir}/applications/vumeter.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/applications/reclevel.desktop rm -f $RPM_BUILD_ROOT%{_bindir}/vumeter @@ -199,6 +202,9 @@ %{_libdir}/pkgconfig/* %changelog +* Thu Mar 6 2008 Matthias Clasen - 2.20.1-9 +- Use desktop-file-install for all desktop files + * Thu Feb 14 2008 Matthias Clasen - 2.20.1-8 - Rebuild From fedora-extras-commits at redhat.com Fri Mar 7 02:09:04 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 7 Mar 2008 02:09:04 GMT Subject: rpms/xfce4-clipman-plugin/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce4-clipman-plugin.spec, 1.10, 1.11 Message-ID: <200803070209.m27294oT025102@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24846 Modified Files: .cvsignore sources xfce4-clipman-plugin.spec Log Message: * Fri Mar 07 2008 Christoph Wickert - 0.8.1-1 - Update to 0.8.1 (fixes bugzilla.xfce.org #3304) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jan 2007 11:22:19 -0000 1.4 +++ .cvsignore 7 Mar 2008 02:08:08 -0000 1.5 @@ -1 +1 @@ -xfce4-clipman-plugin-0.8.0.tar.bz2 +xfce4-clipman-plugin-0.8.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jan 2007 11:22:19 -0000 1.4 +++ sources 7 Mar 2008 02:08:08 -0000 1.5 @@ -1 +1 @@ -808d4e8bc6e9a9d4ed30124fb2236c1d xfce4-clipman-plugin-0.8.0.tar.bz2 +3b2973ad5aae70720eda028e9af0b449 xfce4-clipman-plugin-0.8.1.tar.bz2 Index: xfce4-clipman-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xfce4-clipman-plugin.spec 18 Feb 2008 23:43:02 -0000 1.10 +++ xfce4-clipman-plugin.spec 7 Mar 2008 02:08:08 -0000 1.11 @@ -1,6 +1,6 @@ Name: xfce4-clipman-plugin -Version: 0.8.0 -Release: 4%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: Clipboard manager plugin for the Xfce panel Group: User Interface/Desktops @@ -39,6 +39,9 @@ %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Fri Mar 07 2008 Christoph Wickert - 0.8.1-1 +- Update to 0.8.1 (fixes bugzilla.xfce.org #3304) + * Mon Feb 18 2008 Fedora Release Engineering - 0.8.0-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:12:26 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 7 Mar 2008 02:12:26 GMT Subject: rpms/xfce4-clipman-plugin/F-7 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce4-clipman-plugin.spec, 1.8, 1.9 Message-ID: <200803070212.m272CQSG025959@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25686/F-7 Modified Files: .cvsignore sources xfce4-clipman-plugin.spec Log Message: * Fri Mar 07 2008 Christoph Wickert - 0.8.1-1 - Update to 0.8.1 (fixes bugzilla.xfce.org #3304) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-7/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jan 2007 11:22:19 -0000 1.4 +++ .cvsignore 7 Mar 2008 02:11:44 -0000 1.5 @@ -1 +1 @@ -xfce4-clipman-plugin-0.8.0.tar.bz2 +xfce4-clipman-plugin-0.8.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-7/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jan 2007 11:22:19 -0000 1.4 +++ sources 7 Mar 2008 02:11:44 -0000 1.5 @@ -1 +1 @@ -808d4e8bc6e9a9d4ed30124fb2236c1d xfce4-clipman-plugin-0.8.0.tar.bz2 +3b2973ad5aae70720eda028e9af0b449 xfce4-clipman-plugin-0.8.1.tar.bz2 Index: xfce4-clipman-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-7/xfce4-clipman-plugin.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xfce4-clipman-plugin.spec 28 Apr 2007 16:37:29 -0000 1.8 +++ xfce4-clipman-plugin.spec 7 Mar 2008 02:11:44 -0000 1.9 @@ -1,6 +1,6 @@ Name: xfce4-clipman-plugin -Version: 0.8.0 -Release: 2%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: Clipboard manager plugin for the Xfce panel Group: User Interface/Desktops @@ -39,6 +39,15 @@ %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Fri Mar 07 2008 Christoph Wickert - 0.8.1-1 +- Update to 0.8.1 (fixes bugzilla.xfce.org #3304) + +* Mon Feb 18 2008 Fedora Release Engineering - 0.8.0-4 +- Autorebuild for GCC 4.3 + +* Sat Aug 25 2007 Christoph Wickert - 0.8.0-3 +- Rebuild for BuildID feature + * Sat Apr 28 2007 Christoph Wickert - 0.8.0-2 - Rebuild for Xfce 4.4.1 From fedora-extras-commits at redhat.com Fri Mar 7 02:12:37 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 7 Mar 2008 02:12:37 GMT Subject: rpms/xfce4-clipman-plugin/F-8 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce4-clipman-plugin.spec, 1.9, 1.10 Message-ID: <200803070212.m272CbTZ026008@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25686/F-8 Modified Files: .cvsignore sources xfce4-clipman-plugin.spec Log Message: * Fri Mar 07 2008 Christoph Wickert - 0.8.1-1 - Update to 0.8.1 (fixes bugzilla.xfce.org #3304) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jan 2007 11:22:19 -0000 1.4 +++ .cvsignore 7 Mar 2008 02:11:56 -0000 1.5 @@ -1 +1 @@ -xfce4-clipman-plugin-0.8.0.tar.bz2 +xfce4-clipman-plugin-0.8.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jan 2007 11:22:19 -0000 1.4 +++ sources 7 Mar 2008 02:11:56 -0000 1.5 @@ -1 +1 @@ -808d4e8bc6e9a9d4ed30124fb2236c1d xfce4-clipman-plugin-0.8.0.tar.bz2 +3b2973ad5aae70720eda028e9af0b449 xfce4-clipman-plugin-0.8.1.tar.bz2 Index: xfce4-clipman-plugin.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-8/xfce4-clipman-plugin.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xfce4-clipman-plugin.spec 24 Aug 2007 22:09:37 -0000 1.9 +++ xfce4-clipman-plugin.spec 7 Mar 2008 02:11:56 -0000 1.10 @@ -1,6 +1,6 @@ Name: xfce4-clipman-plugin -Version: 0.8.0 -Release: 3%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: Clipboard manager plugin for the Xfce panel Group: User Interface/Desktops @@ -39,6 +39,12 @@ %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Fri Mar 07 2008 Christoph Wickert - 0.8.1-1 +- Update to 0.8.1 (fixes bugzilla.xfce.org #3304) + +* Mon Feb 18 2008 Fedora Release Engineering - 0.8.0-4 +- Autorebuild for GCC 4.3 + * Sat Aug 25 2007 Christoph Wickert - 0.8.0-3 - Rebuild for BuildID feature From fedora-extras-commits at redhat.com Fri Mar 7 02:20:41 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 7 Mar 2008 02:20:41 GMT Subject: rpms/gnome-media/devel gnome-media.spec,1.122,1.123 Message-ID: <200803070220.m272KfwH027565@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-media/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27436 Modified Files: gnome-media.spec Log Message: work around a dbus problem Index: gnome-media.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- gnome-media.spec 7 Mar 2008 02:06:04 -0000 1.122 +++ gnome-media.spec 7 Mar 2008 02:19:56 -0000 1.123 @@ -86,7 +86,9 @@ %patch2 -p0 -b .front-track %build -/usr/bin/gst-inspect-0.10 --print-all > /dev/null +# try to work around a problem where gst-inspect does +# not find playbin the first time around +DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null %configure --disable-schemas-install --enable-gnomecd=no --enable-cddbslave=no make #%{?_smp_mflags} From fedora-extras-commits at redhat.com Fri Mar 7 02:23:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:08 GMT Subject: rpms/perl-Net-Packet-Target/devel perl-Net-Packet-Target.spec, 1.1, 1.2 Message-ID: <200803070223.m272N8Xc028057@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-Packet-Target/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-Packet-Target/devel Modified Files: perl-Net-Packet-Target.spec Log Message: new perl Index: perl-Net-Packet-Target.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Packet-Target/devel/perl-Net-Packet-Target.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-Packet-Target.spec 12 Nov 2007 23:32:44 -0000 1.1 +++ perl-Net-Packet-Target.spec 7 Mar 2008 02:12:04 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-Net-Packet-Target Version: 1.01 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An object for all network related stuff Group: Development/Libraries @@ -53,5 +53,8 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.01-2 +Rebuild for new perl + * Sun Nov 11 2007 Sindre Pedersen Bj??rdal - 1.01-1 - Initial build From fedora-extras-commits at redhat.com Fri Mar 7 02:23:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:07 GMT Subject: rpms/perl-DBIx-POS/devel perl-DBIx-POS.spec,1.3,1.4 Message-ID: <200803070223.m272N7IJ028055@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBIx-POS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-DBIx-POS/devel Modified Files: perl-DBIx-POS.spec Log Message: new perl Index: perl-DBIx-POS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBIx-POS/devel/perl-DBIx-POS.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-DBIx-POS.spec 30 Apr 2007 15:21:37 -0000 1.3 +++ perl-DBIx-POS.spec 7 Mar 2008 01:58:29 -0000 1.4 @@ -1,14 +1,16 @@ Name: perl-DBIx-POS Version: 0.03 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Define a dictionary of SQL statements in a POD dialect (POS) -License: Artistic +# There was some code that was taken from Class::Singleton, which was Artistic only at the time. +# That code has since been relicensed to GPL+ or Artistic. +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DBIx-POS/ Source0: http://www.cpan.org/authors/id/M/MD/MDORMAN/DBIx-POS-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl, perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(YAML) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -53,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.03-5 +Rebuild for new perl + * Mon Apr 30 2007 Chris Weyl 0.03-4 - retag license as just Artistic due to included code from Class::Singleton From fedora-extras-commits at redhat.com Fri Mar 7 02:23:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:08 GMT Subject: rpms/perl-MD5/devel perl-MD5.spec,1.2,1.3 Message-ID: <200803070223.m272N8hT028056@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MD5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-MD5/devel Modified Files: perl-MD5.spec Log Message: new perl Index: perl-MD5.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MD5/devel/perl-MD5.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MD5.spec 16 Oct 2007 21:15:51 -0000 1.2 +++ perl-MD5.spec 7 Mar 2008 02:08:27 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-MD5 Version: 2.03 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Perl interface to the MD5 Message-Digest Algorithm License: GPL+ or Artistic Group: Development/Libraries @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.03-2.1 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway 2.03-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:08 GMT Subject: rpms/perl-XML-Merge/devel perl-XML-Merge.spec,1.1,1.2 Message-ID: <200803070223.m272N8Qf028059@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Merge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-XML-Merge/devel Modified Files: perl-XML-Merge.spec Log Message: new perl Index: perl-XML-Merge.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Merge/devel/perl-XML-Merge.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-XML-Merge.spec 2 Jan 2008 12:50:41 -0000 1.1 +++ perl-XML-Merge.spec 7 Mar 2008 02:21:31 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-XML-Merge Version: 1.2.565EgGd -Release: 2%{?dist} +Release: 3%{?dist} Summary: Flexibly merge XML documents Group: Development/Libraries @@ -64,6 +64,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.2.565EgGd-3 +Rebuild for new perl + * Sat Dec 22 2007 Xavier Bachelot - 1.2.565EgGd-2 - Clean up spec. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:08 GMT Subject: rpms/perl-Frontier-RPC/devel perl-Frontier-RPC.spec,1.12,1.13 Message-ID: <200803070223.m272N8RL028069@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Frontier-RPC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Frontier-RPC/devel Modified Files: perl-Frontier-RPC.spec Log Message: new perl Index: perl-Frontier-RPC.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Frontier-RPC/devel/perl-Frontier-RPC.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Frontier-RPC.spec 26 Oct 2007 20:01:27 -0000 1.12 +++ perl-Frontier-RPC.spec 7 Mar 2008 02:01:33 -0000 1.13 @@ -1,7 +1,7 @@ Summary: A Perl interface for making and serving XML-RPC calls Name: perl-Frontier-RPC Version: 0.07b4 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Libraries License: GPL+ or Artistic @@ -59,6 +59,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.07b4-4 +Rebuild for new perl + * Fri Oct 26 2007 Robin Norwood - 0.07b4-3 - Various fixes from package review: - Remove BR: perl From fedora-extras-commits at redhat.com Fri Mar 7 02:23:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:08 GMT Subject: rpms/perl-Kwiki-Diff/devel perl-Kwiki-Diff.spec,1.4,1.5 Message-ID: <200803070223.m272N8rX028060@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-Diff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Kwiki-Diff/devel Modified Files: perl-Kwiki-Diff.spec Log Message: new perl Index: perl-Kwiki-Diff.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-Diff/devel/perl-Kwiki-Diff.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Kwiki-Diff.spec 4 Jan 2008 06:23:19 -0000 1.4 +++ perl-Kwiki-Diff.spec 7 Mar 2008 02:05:51 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Kwiki-Diff Version: 0.03 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Display differences between the current wiki page and older revisions License: GPL+ or Artistic Group: Development/Libraries @@ -57,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.03-6 +Rebuild for new perl + * Fri Jan 04 2008 Ralf Cors??pius 0.03-5 - Update License-tag. - BR: perl(Test::Pod::Coverage), perl(Test::Pod). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:09 GMT Subject: rpms/perl-POE-Component-Logger/devel perl-POE-Component-Logger.spec, 1.3, 1.4 Message-ID: <200803070223.m272N9j9028108@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-Logger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-POE-Component-Logger/devel Modified Files: perl-POE-Component-Logger.spec Log Message: new perl Index: perl-POE-Component-Logger.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-Logger/devel/perl-POE-Component-Logger.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-POE-Component-Logger.spec 1 Sep 2006 04:19:24 -0000 1.3 +++ perl-POE-Component-Logger.spec 7 Mar 2008 02:14:05 -0000 1.4 @@ -1,10 +1,10 @@ Name: perl-POE-Component-Logger Version: 1.00 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A POE logging class Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/POE-Component-Logger Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/POE-Component-Logger-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +65,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.00-3 +Rebuild for new perl + * Thu Aug 31 2006 Chris Weyl 1.00-2 - bump for mass rebuild From fedora-extras-commits at redhat.com Fri Mar 7 02:23:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:09 GMT Subject: rpms/perl-PDL/devel perl-PDL.spec,1.38,1.39 Message-ID: <200803070223.m272N9II028107@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-PDL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-PDL/devel Modified Files: perl-PDL.spec Log Message: new perl Index: perl-PDL.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- perl-PDL.spec 4 Mar 2008 17:43:36 -0000 1.38 +++ perl-PDL.spec 7 Mar 2008 02:13:33 -0000 1.39 @@ -1,6 +1,6 @@ Name: perl-PDL Version: 2.4.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The Perl Data Language Group: Development/Libraries @@ -142,6 +142,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.4.3-8 +Rebuild for new perl + * Tue Mar 04 2008 Orion Poplawski - 2.4.3-7 - Add patch to build GSL support with GSL 1.10 - unset DISPLAY in %%check for mock builds From fedora-extras-commits at redhat.com Fri Mar 7 02:23:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:08 GMT Subject: rpms/perl-HTTP-DAV/devel perl-HTTP-DAV.spec,1.1,1.2 Message-ID: <200803070223.m272N8Dv028072@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTTP-DAV/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-HTTP-DAV/devel Modified Files: perl-HTTP-DAV.spec Log Message: new perl Index: perl-HTTP-DAV.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTTP-DAV/devel/perl-HTTP-DAV.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTTP-DAV.spec 23 Jul 2007 19:55:29 -0000 1.1 +++ perl-HTTP-DAV.spec 7 Mar 2008 02:04:32 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-HTTP-DAV Version: 0.31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WebDAV client library for Perl5 -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTTP-DAV/ Source0: http://www.cpan.org/authors/id/P/PC/PCOLLINS/HTTP-DAV-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.31-2 +Rebuild for new perl + * Mon Jul 16 2007 Steven Pritchard 0.31-1 - Specfile autogenerated by cpanspec 1.73. - Fix License. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:09 GMT Subject: rpms/perl-Kwiki-Search/devel perl-Kwiki-Search.spec,1.5,1.6 Message-ID: <200803070223.m272N9Uh028109@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Kwiki-Search/devel Modified Files: perl-Kwiki-Search.spec Log Message: new perl Index: perl-Kwiki-Search.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-Search/devel/perl-Kwiki-Search.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Kwiki-Search.spec 7 Jan 2008 06:25:00 -0000 1.5 +++ perl-Kwiki-Search.spec 7 Mar 2008 02:06:48 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Kwiki-Search Version: 0.12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Kwiki Search Plugin License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.12-7 +Rebuild for new perl + * Mon Jan 07 2008 Ralf Cors??pius 0.12-6 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:12 GMT Subject: rpms/openser/devel openser.spec,1.9,1.10 Message-ID: <200803070223.m272NCeo028175@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/openser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/openser/devel Modified Files: openser.spec Log Message: new perl Index: openser.spec =================================================================== RCS file: /cvs/pkgs/rpms/openser/devel/openser.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- openser.spec 23 Feb 2008 08:47:14 -0000 1.9 +++ openser.spec 7 Mar 2008 01:53:31 -0000 1.10 @@ -10,7 +10,7 @@ Summary: Open Source SIP Server Name: openser Version: 1.3.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://www.openser.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz @@ -810,6 +810,9 @@ %doc docdir/README.xmpp %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.3.0-10 +Rebuild for new perl + * Sat Feb 23 2008 Jan ONDREJ (SAL) 1.3.0-9 - ia64 build fix From fedora-extras-commits at redhat.com Fri Mar 7 02:23:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:08 GMT Subject: rpms/ekg2/devel ekg2.spec,1.7,1.8 Message-ID: <200803070223.m272N8Jw028065@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ekg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/ekg2/devel Modified Files: ekg2.spec Log Message: new perl Index: ekg2.spec =================================================================== RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ekg2.spec 14 Feb 2008 22:47:14 -0000 1.7 +++ ekg2.spec 7 Mar 2008 01:52:30 -0000 1.8 @@ -5,7 +5,7 @@ Summary(pl): Wieloprotoko??owy komunikator internetowy Name: ekg2 Version: 0.1.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/Internet Source0: http://pl.ekg2.org/%{name}-%{version}.tar.gz @@ -347,6 +347,9 @@ %attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.1.1-4 +Rebuild for new perl + * Thu Feb 14 2008 Dominik Mierzejewski 0.1.1-3 - fix build with gcc-4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:11 GMT Subject: rpms/perl-Algorithm-CheckDigits/devel perl-Algorithm-CheckDigits.spec, 1.2, 1.3 Message-ID: <200803070223.m272NBuA028150@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Algorithm-CheckDigits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Algorithm-CheckDigits/devel Modified Files: perl-Algorithm-CheckDigits.spec Log Message: new perl Index: perl-Algorithm-CheckDigits.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Algorithm-CheckDigits/devel/perl-Algorithm-CheckDigits.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Algorithm-CheckDigits.spec 12 Jan 2008 00:16:16 -0000 1.2 +++ perl-Algorithm-CheckDigits.spec 7 Mar 2008 01:54:00 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Algorithm-CheckDigits Version: 0.48 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension to generate and test check digits @@ -61,6 +61,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.48-3 +Rebuild for new perl + * Sat Jan 12 2008 Xavier Bachelot - 0.48-2 - Remove '|| :' from %%check section. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:09 GMT Subject: rpms/rt3/devel rt3.spec,1.22,1.23 Message-ID: <200803070223.m272N9cp028111@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/rt3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/rt3/devel Modified Files: rt3.spec Log Message: new perl Index: rt3.spec =================================================================== RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- rt3.spec 4 Feb 2008 07:17:52 -0000 1.22 +++ rt3.spec 7 Mar 2008 02:22:35 -0000 1.23 @@ -13,7 +13,7 @@ Name: rt3 Version: 3.6.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Request tracker 3 Group: Applications/Internet @@ -264,6 +264,9 @@ %{_mandir}/man1/rt-mailgate* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 3.6.6-3 +Rebuild for new perl + * Mon Feb 04 2008 Ralf Cors??pius - 3.6.6-2 - R: perl(CSS::Squish). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:09 GMT Subject: rpms/perl-Text-Quoted/devel perl-Text-Quoted.spec,1.13,1.14 Message-ID: <200803070223.m272N93G028106@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Quoted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-Quoted/devel Modified Files: perl-Text-Quoted.spec Log Message: new perl Index: perl-Text-Quoted.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Quoted/devel/perl-Text-Quoted.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Text-Quoted.spec 25 Jan 2008 09:37:43 -0000 1.13 +++ perl-Text-Quoted.spec 7 Mar 2008 02:19:33 -0000 1.14 @@ -1,6 +1,6 @@ Name: perl-Text-Quoted Version: 2.05 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extract the structure of a quoted mail message License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.05-2 +Rebuild for new perl + * Fri Jan 25 2008 Ralf Cors??pius - 2.05-1 - Upstream update. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:09 GMT Subject: rpms/perl-Text-Aspell/devel perl-Text-Aspell.spec,1.6,1.7 Message-ID: <200803070223.m272N9hi028110@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Aspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-Aspell/devel Modified Files: perl-Text-Aspell.spec Log Message: new perl Index: perl-Text-Aspell.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Aspell/devel/perl-Text-Aspell.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Text-Aspell.spec 13 Feb 2008 20:54:57 -0000 1.6 +++ perl-Text-Aspell.spec 7 Mar 2008 02:18:35 -0000 1.7 @@ -2,7 +2,7 @@ Name: perl-%{base} Version: 0.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl interface to the GNU Aspell library Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.09-3 +Rebuild for new perl + * Wed Feb 13 2008 Jerry James - 0.09-2 - Rebuild for gcc 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:09 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:09 GMT Subject: rpms/perl-Calendar-Simple/devel perl-Calendar-Simple.spec,1.7,1.8 Message-ID: <200803070223.m272N9OS028112@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Calendar-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Calendar-Simple/devel Modified Files: perl-Calendar-Simple.spec Log Message: new perl Index: perl-Calendar-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/devel/perl-Calendar-Simple.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Calendar-Simple.spec 17 Aug 2007 05:27:58 -0000 1.7 +++ perl-Calendar-Simple.spec 7 Mar 2008 01:55:35 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Perl extension to create simple calendars Name: perl-Calendar-Simple Version: 1.17 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Calendar-Simple/ @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.17-3 +Rebuild for new perl + * Fri Aug 17 2007 Ralf Cors??pius - 1.17-2 - Update license tag. - Reflect perl package split. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:14 GMT Subject: rpms/perl-Callback/devel perl-Callback.spec,1.1,1.2 Message-ID: <200803070223.m272NEoM028205@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Callback/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Callback/devel Modified Files: perl-Callback.spec Log Message: new perl Index: perl-Callback.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Callback/devel/perl-Callback.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Callback.spec 20 Jul 2007 11:10:15 -0000 1.1 +++ perl-Callback.spec 7 Mar 2008 01:55:39 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-Callback Version: 1.07 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Object interface for function callbacks -License: GPL/Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Callback/ Source0: http://www.cpan.org/modules/by-module/Callback/Callback-%{version}.tar.gz @@ -47,5 +47,8 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.07-2 +Rebuild for new perl + * Thu Mar 15 2007 mkpai 1.07-1 - Specfile autogenerated by cpanspec 1.69.1. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:10 GMT Subject: rpms/perl-File-NCopy/devel perl-File-NCopy.spec,1.9,1.10 Message-ID: <200803070223.m272NAU2028129@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-NCopy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-File-NCopy/devel Modified Files: perl-File-NCopy.spec Log Message: new perl Index: perl-File-NCopy.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-NCopy/devel/perl-File-NCopy.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-File-NCopy.spec 24 Oct 2007 02:35:02 -0000 1.9 +++ perl-File-NCopy.spec 7 Mar 2008 02:00:32 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-File-NCopy Version: 0.35 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Copy files to directories, or a single file to another file License: GPL+ or Artistic Group: Development/Libraries @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.35-4 +Rebuild for new perl + * Wed Oct 24 2007 Ralf Cors??pius - 0.35-3 - Add BR: perl(Test::Pod). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:10 GMT Subject: rpms/perl-Devel-Cover/devel perl-Devel-Cover.spec,1.11,1.12 Message-ID: <200803070223.m272NAkG028130@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Devel-Cover/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Devel-Cover/devel Modified Files: perl-Devel-Cover.spec Log Message: new perl Index: perl-Devel-Cover.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Devel-Cover/devel/perl-Devel-Cover.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Devel-Cover.spec 20 Feb 2008 01:33:09 -0000 1.11 +++ perl-Devel-Cover.spec 7 Mar 2008 01:59:30 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Devel-Cover Version: 0.63 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Code coverage metrics for Perl Group: Development/Libraries @@ -65,6 +65,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.63-3 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.63-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:10 GMT Subject: rpms/perl-Net-CUPS/devel perl-Net-CUPS.spec,1.6,1.7 Message-ID: <200803070223.m272NA4R028132@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-CUPS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-CUPS/devel Modified Files: perl-Net-CUPS.spec Log Message: new perl Index: perl-Net-CUPS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-CUPS/devel/perl-Net-CUPS.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Net-CUPS.spec 18 Feb 2008 23:28:56 -0000 1.6 +++ perl-Net-CUPS.spec 7 Mar 2008 02:11:02 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Net-CUPS Version: 0.55 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl bindings to the CUPS C API Interface License: GPL+ or Artistic Group: Development/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.55-4 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.55-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:10 GMT Subject: rpms/perl-Email-Send/devel perl-Email-Send.spec,1.3,1.4 Message-ID: <200803070223.m272NAs8028128@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Email-Send/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Email-Send/devel Modified Files: perl-Email-Send.spec Log Message: new perl Index: perl-Email-Send.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-Send/devel/perl-Email-Send.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Email-Send.spec 29 Nov 2007 00:35:41 -0000 1.3 +++ perl-Email-Send.spec 7 Mar 2008 02:00:03 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Email-Send Version: 2.192 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Module for sending email Group: Development/Libraries License: GPL+ or Artistic @@ -48,6 +48,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.192-2 +Rebuild for new perl + * Wed Nov 28 2007 Tom "spot" Callaway - 2.192-1 - bump to 2.192 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:10 GMT Subject: rpms/perl-Test-AutoBuild/devel perl-Test-AutoBuild.spec,1.7,1.8 Message-ID: <200803070223.m272NAWq028134@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-AutoBuild/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Test-AutoBuild/devel Modified Files: perl-Test-AutoBuild.spec Log Message: new perl Index: perl-Test-AutoBuild.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-AutoBuild/devel/perl-Test-AutoBuild.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Test-AutoBuild.spec 22 Dec 2007 19:01:22 -0000 1.7 +++ perl-Test-AutoBuild.spec 7 Mar 2008 02:17:27 -0000 1.8 @@ -12,7 +12,7 @@ Summary: Framework for performing continuous, unattended, automated software builds Name: perl-%{appname} Version: 1.2.2 -Release: 1%{_extra_release} +Release: 2%{_extra_release} License: GPLv2+ Group: Development/Tools Url: http://autobuild.org/ @@ -423,6 +423,9 @@ %config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.2.2-2 +Rebuild for new perl + * Sat Dec 22 2007 Daniel Berrange - 1.2.2-1.fc9 - Updated to 1.2.2 packages - Added git, darcs, monotone, bzr subpackages From fedora-extras-commits at redhat.com Fri Mar 7 02:23:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:10 GMT Subject: rpms/perl-Authen-Krb5/devel perl-Authen-Krb5.spec,1.3,1.4 Message-ID: <200803070223.m272NAm3028133@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Authen-Krb5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Authen-Krb5/devel Modified Files: perl-Authen-Krb5.spec Log Message: new perl Index: perl-Authen-Krb5.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Authen-Krb5/devel/perl-Authen-Krb5.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Authen-Krb5.spec 20 Feb 2008 03:36:43 -0000 1.3 +++ perl-Authen-Krb5.spec 7 Mar 2008 01:54:32 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Authen-Krb5 Version: 1.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Krb5 Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -67,6 +67,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.7-5 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.7-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:11 GMT Subject: rpms/perl-Text-Kakasi/devel perl-Text-Kakasi.spec,1.8,1.9 Message-ID: <200803070223.m272NBS2028152@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Kakasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-Kakasi/devel Modified Files: perl-Text-Kakasi.spec Log Message: new perl Index: perl-Text-Kakasi.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Kakasi/devel/perl-Text-Kakasi.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Text-Kakasi.spec 12 Feb 2008 10:00:18 -0000 1.8 +++ perl-Text-Kakasi.spec 7 Mar 2008 02:18:58 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Text-Kakasi Version: 2.04 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Kakasi library module for perl Group: Development/Libraries @@ -60,6 +60,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.04-8 +Rebuild for new perl + * Tue Feb 12 2008 Akira TAGOH - 2.04-7 - Rebuild for gcc-4.3. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:11 GMT Subject: rpms/perl-IO-Compress-Bzip2/devel perl-IO-Compress-Bzip2.spec, 1.3, 1.4 Message-ID: <200803070223.m272NBWY028156@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-Compress-Bzip2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-IO-Compress-Bzip2/devel Modified Files: perl-IO-Compress-Bzip2.spec Log Message: new perl Index: perl-IO-Compress-Bzip2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-Compress-Bzip2/devel/perl-IO-Compress-Bzip2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-IO-Compress-Bzip2.spec 17 Jul 2007 20:54:22 -0000 1.3 +++ perl-IO-Compress-Bzip2.spec 7 Mar 2008 02:05:00 -0000 1.4 @@ -1,10 +1,10 @@ Name: perl-IO-Compress-Bzip2 Version: 2.005 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl interface to allow reading and writing of bzip2 data Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/IO-Compress-Bzip2/ Source0: http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/IO-Compress-Bzip2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.005-3 +Rebuild for new perl + * Tue Jul 17 2007 Robin Norwood - 2.005-2 - Bump release to beat F-7 version From fedora-extras-commits at redhat.com Fri Mar 7 02:23:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:11 GMT Subject: rpms/perl-Date-Pcalc/devel perl-Date-Pcalc.spec,1.3,1.4 Message-ID: <200803070223.m272NBSu028155@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Date-Pcalc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Date-Pcalc/devel Modified Files: perl-Date-Pcalc.spec Log Message: new perl Index: perl-Date-Pcalc.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Date-Pcalc/devel/perl-Date-Pcalc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Date-Pcalc.spec 15 Oct 2007 19:18:55 -0000 1.3 +++ perl-Date-Pcalc.spec 7 Mar 2008 01:58:59 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Date-Pcalc Version: 1.2 -Release: 4%{?dist}.1 +Release: 5%{?dist} Summary: Gregorian calendar date calculations License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.2-5.1 +Rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway - 1.2-4.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:11 GMT Subject: rpms/perl-SQL-Translator/devel perl-SQL-Translator.spec,1.2,1.3 Message-ID: <200803070223.m272NB8M028154@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SQL-Translator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-SQL-Translator/devel Modified Files: perl-SQL-Translator.spec Log Message: new perl Index: perl-SQL-Translator.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SQL-Translator/devel/perl-SQL-Translator.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SQL-Translator.spec 24 Oct 2007 07:04:11 -0000 1.2 +++ perl-SQL-Translator.spec 7 Mar 2008 02:16:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-SQL-Translator Version: 0.08001 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manipulate structured data definitions (SQL and more) License: GPLv2 Group: Development/Libraries @@ -105,6 +105,9 @@ %{_mandir}/man[13]/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.08001-3 +Rebuild for new perl + * Wed Oct 24 2007 Chris Weyl 0.08001-2 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:16 GMT Subject: rpms/perl-Maypole/devel perl-Maypole.spec,1.4,1.5 Message-ID: <200803070223.m272NGVv028257@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Maypole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Maypole/devel Modified Files: perl-Maypole.spec Log Message: new perl Index: perl-Maypole.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Maypole/devel/perl-Maypole.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Maypole.spec 26 Aug 2007 22:11:21 -0000 1.4 +++ perl-Maypole.spec 7 Mar 2008 02:10:03 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Maypole Version: 2.111 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: MVC web application framework Group: Development/Libraries License: GPL+ or Artistic @@ -67,6 +67,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.111-2.1 +Rebuild for new perl + * Sun Aug 26 2007 Tom "spot" Callaway 2.111-1 - bump to 2.111 - license tag fix From fedora-extras-commits at redhat.com Fri Mar 7 02:23:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:11 GMT Subject: rpms/perl-Boulder/devel perl-Boulder.spec,1.5,1.6 Message-ID: <200803070223.m272NBKP028153@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Boulder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Boulder/devel Modified Files: perl-Boulder.spec Log Message: new perl Index: perl-Boulder.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Boulder/devel/perl-Boulder.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Boulder.spec 15 Oct 2007 15:21:31 -0000 1.5 +++ perl-Boulder.spec 7 Mar 2008 01:55:05 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Boulder Version: 1.30 -Release: 4%{?dist}.1 +Release: 5%{?dist} Summary: An API for hierarchical tag/value structures License: GPL+ or Artistic Group: Development/Libraries @@ -55,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.30-5.1 +Rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway 1.30-4.1 - missing BR From fedora-extras-commits at redhat.com Fri Mar 7 02:23:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:16 GMT Subject: rpms/perl-Apache-DBI/devel perl-Apache-DBI.spec,1.4,1.5 Message-ID: <200803070223.m272NGiK028261@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Apache-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Apache-DBI/devel Modified Files: perl-Apache-DBI.spec Log Message: new perl Index: perl-Apache-DBI.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Apache-DBI/devel/perl-Apache-DBI.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Apache-DBI.spec 15 Oct 2007 15:05:02 -0000 1.4 +++ perl-Apache-DBI.spec 7 Mar 2008 01:54:10 -0000 1.5 @@ -2,7 +2,7 @@ Name: perl-Apache-DBI Version: 1.06 -Release: 1%{?dist}.2 +Release: 2%{?dist} Summary: Persistent database connections with Apache/mod_perl Group: Development/Libraries @@ -69,6 +69,9 @@ %{perl_vendorlib}/Apache %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.06-2.2 +Rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway 1.06-1.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:11 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:11 GMT Subject: rpms/clearsilver/devel clearsilver.spec,1.16,1.17 Message-ID: <200803070223.m272NBkV028151@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/clearsilver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/clearsilver/devel Modified Files: clearsilver.spec Log Message: new perl Index: clearsilver.spec =================================================================== RCS file: /cvs/pkgs/rpms/clearsilver/devel/clearsilver.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- clearsilver.spec 19 Feb 2008 05:59:43 -0000 1.16 +++ clearsilver.spec 7 Mar 2008 01:51:58 -0000 1.17 @@ -2,10 +2,12 @@ Name: clearsilver Version: 0.10.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries -License: Neotonic ClearSilver Software License +# Technically, the license is "Neotonic ClearSilver", but it is a copy of +# ASL 1.1 with the trademarks as the only difference. +License: ASL 1.1 URL: http://www.clearsilver.net/ Source0: http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz Patch0: clearsilver-0.10.5-fedora.patch @@ -169,6 +171,9 @@ %endif %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.10.5-3 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.10.5-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:12 GMT Subject: rpms/perl-Class-Accessor-Grouped/devel perl-Class-Accessor-Grouped.spec, 1.3, 1.4 Message-ID: <200803070223.m272NCLK028172@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Accessor-Grouped/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Class-Accessor-Grouped/devel Modified Files: perl-Class-Accessor-Grouped.spec Log Message: new perl Index: perl-Class-Accessor-Grouped.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Accessor-Grouped/devel/perl-Class-Accessor-Grouped.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-Accessor-Grouped.spec 5 Mar 2008 17:03:17 -0000 1.3 +++ perl-Class-Accessor-Grouped.spec 7 Mar 2008 01:56:06 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Class-Accessor-Grouped Version: 0.07000 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lets you build groups of accessors License: GPL+ or Artistic Group: Development/Libraries @@ -79,6 +79,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.07000-4 +Rebuild for new perl + * Wed Mar 05 2008 Tom "spot" Callaway 0.07000-3 - rebuild for new perl From fedora-extras-commits at redhat.com Fri Mar 7 02:23:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:12 GMT Subject: rpms/perl-Mail-Box-Parser-C/devel perl-Mail-Box-Parser-C.spec, 1.3, 1.4 Message-ID: <200803070223.m272NCli028171@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Mail-Box-Parser-C/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Mail-Box-Parser-C/devel Modified Files: perl-Mail-Box-Parser-C.spec Log Message: new perl Index: perl-Mail-Box-Parser-C.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-Box-Parser-C/devel/perl-Mail-Box-Parser-C.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Mail-Box-Parser-C.spec 20 Feb 2008 01:40:02 -0000 1.3 +++ perl-Mail-Box-Parser-C.spec 7 Mar 2008 02:09:00 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Mail-Box-Parser-C Version: 3.006 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parsing folders for MailBox with C routines Group: Development/Libraries License: GPL+ or Artistic @@ -42,6 +42,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 3.006-4 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 3.006-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:12 GMT Subject: rpms/perl-Locale-Maketext-Fuzzy/devel perl-Locale-Maketext-Fuzzy.spec, 1.7, 1.8 Message-ID: <200803070223.m272NC3Q028176@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Fuzzy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Locale-Maketext-Fuzzy/devel Modified Files: perl-Locale-Maketext-Fuzzy.spec Log Message: new perl Index: perl-Locale-Maketext-Fuzzy.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Fuzzy/devel/perl-Locale-Maketext-Fuzzy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Locale-Maketext-Fuzzy.spec 5 Dec 2007 03:38:59 -0000 1.7 +++ perl-Locale-Maketext-Fuzzy.spec 7 Mar 2008 02:08:06 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Locale-Maketext-Fuzzy Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maketext from already interpolated strings Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.10-2 +Rebuild for new perl + * Wed Dec 05 2007 Ralf Cors??pius - 0.10-1 - Upstream update. - Change Source0: to using "by-module". From fedora-extras-commits at redhat.com Fri Mar 7 02:23:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:13 GMT Subject: rpms/perl-POE-Component-Client-LDAP/devel perl-POE-Component-Client-LDAP.spec, 1.4, 1.5 Message-ID: <200803070223.m272NDKe028200@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-Client-LDAP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-POE-Component-Client-LDAP/devel Modified Files: perl-POE-Component-Client-LDAP.spec Log Message: new perl Index: perl-POE-Component-Client-LDAP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-Client-LDAP/devel/perl-POE-Component-Client-LDAP.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-POE-Component-Client-LDAP.spec 10 Jan 2008 04:49:15 -0000 1.4 +++ perl-POE-Component-Client-LDAP.spec 7 Mar 2008 02:13:39 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-POE-Component-Client-LDAP Version: 0.04 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Async LDAP access for POE Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.04-5 +Rebuild for new perl + * Thu Jan 10 2008 Ralf Cors??pius 0.04-4 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:19 GMT Subject: rpms/perl-GPS/devel perl-GPS.spec,1.2,1.3 Message-ID: <200803070223.m272NJFf028325@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-GPS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-GPS/devel Modified Files: perl-GPS.spec Log Message: new perl Index: perl-GPS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-GPS/devel/perl-GPS.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-GPS.spec 16 Oct 2007 18:10:18 -0000 1.2 +++ perl-GPS.spec 7 Mar 2008 02:01:38 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-GPS Version: 0.15 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Perl interface to a GPS receiver that implements the Garmin protocol Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.15-2.1 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 0.15-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:12 GMT Subject: rpms/perl-Workflow/devel perl-Workflow.spec,1.2,1.3 Message-ID: <200803070223.m272NCaj028173@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Workflow/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Workflow/devel Modified Files: perl-Workflow.spec Log Message: new perl Index: perl-Workflow.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Workflow/devel/perl-Workflow.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Workflow.spec 25 Apr 2007 18:46:22 -0000 1.2 +++ perl-Workflow.spec 7 Mar 2008 02:21:07 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Workflow Version: 0.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple, flexible system to implement workflows -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Workflow/ Source0: http://www.cpan.org/authors/id/J/JO/JONASBN/Workflow-%{version}.tar.gz @@ -85,6 +85,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.26-4 +Rebuild for new perl + * Wed Apr 25 2007 Chris Weyl 0.26-3 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:13 GMT Subject: rpms/perl-RPM-Specfile/devel perl-RPM-Specfile.spec,1.18,1.19 Message-ID: <200803070223.m272NDnv028197@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-RPM-Specfile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-RPM-Specfile/devel Modified Files: perl-RPM-Specfile.spec Log Message: new perl Index: perl-RPM-Specfile.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-RPM-Specfile/devel/perl-RPM-Specfile.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-RPM-Specfile.spec 3 Jul 2007 15:30:12 -0000 1.18 +++ perl-RPM-Specfile.spec 7 Mar 2008 02:15:35 -0000 1.19 @@ -1,10 +1,10 @@ Name: perl-RPM-Specfile Version: 1.51 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl extension for creating RPM specfiles Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/RPM-Specfile/ Source0: http://www.cpan.org/authors/id/C/CH/CHIPT/RPM-Specfile-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,6 +57,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.51-5 +Rebuild for new perl + * Tue Jul 03 2007 Robin Norwood 1.51-4 - Fix issues reported by Steven in package review. - Untabify spec file. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:10 GMT Subject: rpms/perl-Crypt-SmbHash/devel perl-Crypt-SmbHash.spec,1.7,1.8 Message-ID: <200803070223.m272NAow028131@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-SmbHash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Crypt-SmbHash/devel Modified Files: perl-Crypt-SmbHash.spec Log Message: new perl Index: perl-Crypt-SmbHash.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-SmbHash/devel/perl-Crypt-SmbHash.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Crypt-SmbHash.spec 5 Mar 2008 19:18:14 -0000 1.7 +++ perl-Crypt-SmbHash.spec 7 Mar 2008 01:57:57 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Pure-perl Lanman and NT MD4 hash functions Name: perl-Crypt-SmbHash Version: 0.12 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Development/Libraries Url: http://search.cpan.org/dist/Crypt-SmbHash/ @@ -44,6 +44,9 @@ %{_mandir}/man3/Crypt::SmbHash.3pm* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.12-8 +Rebuild for new perl + * Wed Mar 5 2008 Tom "spot" Callaway 0.12-7 - rebuild for new perl From fedora-extras-commits at redhat.com Fri Mar 7 02:23:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:13 GMT Subject: rpms/epylog/devel epylog.spec,1.8,1.9 Message-ID: <200803070223.m272NDYv028198@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/epylog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/epylog/devel Modified Files: epylog.spec Log Message: new perl Index: epylog.spec =================================================================== RCS file: /cvs/pkgs/rpms/epylog/devel/epylog.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- epylog.spec 17 Feb 2008 18:45:28 -0000 1.8 +++ epylog.spec 7 Mar 2008 01:52:38 -0000 1.9 @@ -2,7 +2,7 @@ Name: epylog Version: 1.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: New logs analyzer and parser Group: Applications/System @@ -97,6 +97,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.0.3-7 +Rebuild for new perl + * Sun Feb 17 2008 Konstantin Ryabitsev - 1.0.3-6 - Remove manual python-abi provides - Update license to GPLv2+ From fedora-extras-commits at redhat.com Fri Mar 7 02:23:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:14 GMT Subject: rpms/perl-Devel-Profiler/devel perl-Devel-Profiler.spec,1.1,1.2 Message-ID: <200803070223.m272NEHG028206@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Devel-Profiler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Devel-Profiler/devel Modified Files: perl-Devel-Profiler.spec Log Message: new perl Index: perl-Devel-Profiler.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Devel-Profiler/devel/perl-Devel-Profiler.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Devel-Profiler.spec 23 Jul 2007 19:40:29 -0000 1.1 +++ perl-Devel-Profiler.spec 7 Mar 2008 01:59:39 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-Devel-Profiler Version: 0.04 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl profiler compatible with dprofpp -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Devel-Profiler/ Source0: http://www.cpan.org/authors/id/S/SA/SAMTREGAR/Devel-Profiler-%{version}.tar.gz @@ -57,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.04-3 +Rebuild for new perl + * Mon Jul 16 2007 Steven Pritchard 0.04-2 - BR ExtUtils::MakeMaker and Test::More. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:15 GMT Subject: rpms/smbldap-tools/devel smbldap-tools.spec,1.6,1.7 Message-ID: <200803070223.m272NFpB028237@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/smbldap-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/smbldap-tools/devel Modified Files: smbldap-tools.spec Log Message: new perl Index: smbldap-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/smbldap-tools/devel/smbldap-tools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- smbldap-tools.spec 26 Sep 2007 15:05:32 -0000 1.6 +++ smbldap-tools.spec 7 Mar 2008 02:22:39 -0000 1.7 @@ -1,7 +1,7 @@ Summary: User and group administration tools for Samba/OpenLDAP Name: smbldap-tools Version: 0.9.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base URL: https://gna.org/projects/smbldap-tools/ @@ -86,6 +86,9 @@ %{_mandir}/man8/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.9.4-2 +Rebuild for new perl + * Wed Sep 26 2007 Paul Howarth 0.9.4-1 - update to 0.9.4 - new upstream, new URLs From fedora-extras-commits at redhat.com Fri Mar 7 02:23:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:23 GMT Subject: rpms/perl-Email-MIME-Attachment-Stripper/devel perl-Email-MIME-Attachment-Stripper.spec, 1.4, 1.5 Message-ID: <200803070223.m272NNq7028416@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Email-MIME-Attachment-Stripper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Email-MIME-Attachment-Stripper/devel Modified Files: perl-Email-MIME-Attachment-Stripper.spec Log Message: new perl Index: perl-Email-MIME-Attachment-Stripper.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-MIME-Attachment-Stripper/devel/perl-Email-MIME-Attachment-Stripper.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Email-MIME-Attachment-Stripper.spec 30 Nov 2007 21:29:21 -0000 1.4 +++ perl-Email-MIME-Attachment-Stripper.spec 7 Mar 2008 01:59:47 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Email-MIME-Attachment-Stripper Version: 1.314 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Strip the attachments from a mail message Group: Development/Libraries License: GPL+ or Artistic @@ -44,6 +44,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.314-3 +Rebuild for new perl + * Fri Nov 30 2007 Tom "spot" Callaway - 1.314-2 - add missing BR From fedora-extras-commits at redhat.com Fri Mar 7 02:23:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:15 GMT Subject: rpms/perl-Mail-SPF/devel perl-Mail-SPF.spec,1.1,1.2 Message-ID: <200803070223.m272NFsH028238@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Mail-SPF/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Mail-SPF/devel Modified Files: perl-Mail-SPF.spec Log Message: new perl Index: perl-Mail-SPF.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-SPF/devel/perl-Mail-SPF.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Mail-SPF.spec 12 Jul 2007 18:13:44 -0000 1.1 +++ perl-Mail-SPF.spec 7 Mar 2008 02:09:31 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Mail-SPF Version: 2.005 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Object-oriented implementation of Sender Policy Framework License: BSD Group: Development/Libraries @@ -59,6 +59,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.005-2 +Rebuild for new perl + * Mon Jul 09 2007 Steven Pritchard 2.005-1 - Specfile autogenerated by cpanspec 1.71. - Add the "v" before version numbers to handle broken upstream packaging. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:15 GMT Subject: rpms/perl-Text-Wrapper/devel perl-Text-Wrapper.spec,1.7,1.8 Message-ID: <200803070223.m272NF8B028241@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Wrapper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-Wrapper/devel Modified Files: perl-Text-Wrapper.spec Log Message: new perl Index: perl-Text-Wrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Wrapper/devel/perl-Text-Wrapper.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Text-Wrapper.spec 4 Feb 2008 12:01:52 -0000 1.7 +++ perl-Text-Wrapper.spec 7 Mar 2008 02:20:02 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Text-Wrapper Version: 1.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple word wrapping perl module License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.01-4 +Rebuild for new perl + * Mon Feb 04 2008 Ralf Cors??pius - 1.01-3 - Add BR: perl(Test::Pod), perl(Test::Pod::Coverage) (BZ: 431411) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:12 GMT Subject: rpms/perl-eperl/devel perl-eperl.spec,1.4,1.5 Message-ID: <200803070223.m272NCAc028177@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-eperl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-eperl/devel Modified Files: perl-eperl.spec Log Message: new perl Index: perl-eperl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-eperl/devel/perl-eperl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-eperl.spec 20 Feb 2008 03:08:27 -0000 1.4 +++ perl-eperl.spec 7 Mar 2008 02:22:01 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-eperl Version: 2.2.14 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Embedded Perl Language -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://www.ossp.org/pkg/tool/eperl/ Source0: ftp://ftp.ossp.org/pkg/tool/eperl/eperl-%{version}.tar.gz @@ -75,6 +75,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.2.14-6 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 2.2.14-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:14 GMT Subject: rpms/perl-Kwiki-Archive-Rcs/devel perl-Kwiki-Archive-Rcs.spec, 1.5, 1.6 Message-ID: <200803070223.m272NE4Y028201@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-Archive-Rcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Kwiki-Archive-Rcs/devel Modified Files: perl-Kwiki-Archive-Rcs.spec Log Message: new perl Index: perl-Kwiki-Archive-Rcs.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-Archive-Rcs/devel/perl-Kwiki-Archive-Rcs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Kwiki-Archive-Rcs.spec 4 Jan 2008 05:22:07 -0000 1.5 +++ perl-Kwiki-Archive-Rcs.spec 7 Mar 2008 02:05:36 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Kwiki-Archive-Rcs Version: 0.15 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Kwiki Page Archival Using RCS License: GPL+ or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.15-8 +Rebuild for new perl + * Fri Jan 04 2008 Ralf Cors??pius 0.15-7 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:13 GMT Subject: rpms/perl-Crypt-OpenSSL-PKCS10/devel perl-Crypt-OpenSSL-PKCS10.spec, 1.4, 1.5 Message-ID: <200803070223.m272NDtb028199@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-PKCS10/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Crypt-OpenSSL-PKCS10/devel Modified Files: perl-Crypt-OpenSSL-PKCS10.spec Log Message: new perl Index: perl-Crypt-OpenSSL-PKCS10.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-PKCS10/devel/perl-Crypt-OpenSSL-PKCS10.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Crypt-OpenSSL-PKCS10.spec 19 Feb 2008 04:48:18 -0000 1.4 +++ perl-Crypt-OpenSSL-PKCS10.spec 7 Mar 2008 01:57:34 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-Crypt-OpenSSL-PKCS10 Version: 0.06 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Perl interface to OpenSSL for PKCS10 -License: Artistic or GPL +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-OpenSSL-PKCS10/ Source0: http://www.cpan.org/authors/id/J/JO/JONOZZZ/Crypt-OpenSSL-PKCS10-%{version}.tar.gz @@ -56,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.06-9 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.06-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:13 GMT Subject: rpms/perl-Text-Tree/devel perl-Text-Tree.spec,1.4,1.5 Message-ID: <200803070223.m272NDOZ028196@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Tree/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-Tree/devel Modified Files: perl-Text-Tree.spec Log Message: new perl Index: perl-Text-Tree.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Tree/devel/perl-Text-Tree.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Text-Tree.spec 17 Oct 2007 04:19:31 -0000 1.4 +++ perl-Text-Tree.spec 7 Mar 2008 02:19:39 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Text-Tree Version: 1.0 -Release: 2%{?dist}.2 +Release: 3%{?dist} Summary: Format a simple tree of strings into a textual tree graph License: GPL+ or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.0-3.2 +Rebuild for new perl + * Wed Oct 17 2007 Tom "spot" Callaway 1.0-2.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:14 GMT Subject: rpms/perl-Net-Patricia/devel perl-Net-Patricia.spec,1.7,1.8 Message-ID: <200803070223.m272NEYS028202@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-Patricia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-Patricia/devel Modified Files: perl-Net-Patricia.spec Log Message: new perl Index: perl-Net-Patricia.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Patricia/devel/perl-Net-Patricia.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Net-Patricia.spec 19 Feb 2008 17:10:29 -0000 1.7 +++ perl-Net-Patricia.spec 7 Mar 2008 02:12:08 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Net-Patricia Version: 1.014 -Release: 5%{?dist}.1 +Release: 6%{?dist} Summary: Patricia Trie perl module for fast IP address lookups License: GPLv2+ Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.014-6.1 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.014-5.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:15 GMT Subject: rpms/perl-Module-Starter-PBP/devel perl-Module-Starter-PBP.spec, 1.3, 1.4 Message-ID: <200803070223.m272NFeg028236@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-Starter-PBP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Module-Starter-PBP/devel Modified Files: perl-Module-Starter-PBP.spec Log Message: new perl Index: perl-Module-Starter-PBP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Starter-PBP/devel/perl-Module-Starter-PBP.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Module-Starter-PBP.spec 1 Sep 2006 04:16:37 -0000 1.3 +++ perl-Module-Starter-PBP.spec 7 Mar 2008 02:10:33 -0000 1.4 @@ -8,11 +8,11 @@ Name: perl-Module-Starter-PBP Version: 0.000003 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Create a module as recommended in "Perl Best Practices" Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Module-Starter-PBP # note different macro! @@ -78,6 +78,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.000003-6 +Rebuild for new perl + * Thu Aug 31 2006 Chris Weyl 0.000003-5 - bump for mass rebuild From fedora-extras-commits at redhat.com Fri Mar 7 02:23:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:12 GMT Subject: rpms/perl-Geo-METAR/devel perl-Geo-METAR.spec,1.1,1.2 Message-ID: <200803070223.m272NCH5028174@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Geo-METAR/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Geo-METAR/devel Modified Files: perl-Geo-METAR.spec Log Message: new perl Index: perl-Geo-METAR.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Geo-METAR/devel/perl-Geo-METAR.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Geo-METAR.spec 20 Jun 2007 19:32:12 -0000 1.1 +++ perl-Geo-METAR.spec 7 Mar 2008 02:02:06 -0000 1.2 @@ -1,10 +1,10 @@ Name: perl-Geo-METAR Version: 1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module for accessing aviation weather information Group: Development/Libraries -License: GPL +License: GPLv2+ URL: http://search.cpan.org/dist/Geo-METAR/ Source0: http://jeremy.zawodny.com/perl/Geo-METAR/Geo-METAR-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.14-3 +Rebuild for new perl + * Thu Jun 6 2007 kwizart < kwizart at gmail.com > - 1.14-2 - Add BR perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:14 GMT Subject: rpms/perl-Gtk2-Sexy/devel perl-Gtk2-Sexy.spec,1.5,1.6 Message-ID: <200803070223.m272NEj8028203@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-Sexy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Gtk2-Sexy/devel Modified Files: perl-Gtk2-Sexy.spec Log Message: new perl Index: perl-Gtk2-Sexy.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-Sexy/devel/perl-Gtk2-Sexy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Gtk2-Sexy.spec 18 Feb 2008 23:22:17 -0000 1.5 +++ perl-Gtk2-Sexy.spec 7 Mar 2008 02:03:30 -0000 1.6 @@ -1,15 +1,14 @@ Name: perl-Gtk2-Sexy Version: 0.02 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Perl interface to the sexy widget collection Group: Development/Libraries -License: LGPL +License: LGPLv2+ URL: http://search.cpan.org/dist/Gtk2-Sexy Source0: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Gtk2-Sexy-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl BuildRequires: perl(Gtk2), perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) BuildRequires: libsexy-devel, libxml2-devel @@ -59,6 +58,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.02-8 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.02-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:15 GMT Subject: rpms/perl-File-BOM/devel perl-File-BOM.spec,1.5,1.6 Message-ID: <200803070223.m272NFaq028239@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-BOM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-File-BOM/devel Modified Files: perl-File-BOM.spec Log Message: new perl Index: perl-File-BOM.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-BOM/devel/perl-File-BOM.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-File-BOM.spec 17 Apr 2007 23:24:38 -0000 1.5 +++ perl-File-BOM.spec 7 Mar 2008 02:00:09 -0000 1.6 @@ -1,8 +1,8 @@ Name: perl-File-BOM Version: 0.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities for handling Byte Order Marks -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/File-BOM/ Source0: http://www.cpan.org/authors/id/M/MA/MATTLAW/File-BOM-%{version}.tar.gz @@ -45,6 +45,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.14-3 +Rebuild for new perl + * Tue Apr 17 2007 Steven Pritchard 0.14-2 - Rebuild. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:15 GMT Subject: rpms/netcdf-perl/devel netcdf-perl.spec,1.4,1.5 Message-ID: <200803070223.m272NFh9028242@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/netcdf-perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/netcdf-perl/devel Modified Files: netcdf-perl.spec Log Message: new perl Index: netcdf-perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/netcdf-perl/devel/netcdf-perl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- netcdf-perl.spec 9 Feb 2008 18:13:51 -0000 1.4 +++ netcdf-perl.spec 7 Mar 2008 01:53:07 -0000 1.5 @@ -1,6 +1,6 @@ Name: netcdf-perl Version: 1.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl extension module for scientific data access via the netCDF API Group: Development/Libraries @@ -71,6 +71,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.2.3-7 +Rebuild for new perl + * Sat Feb 9 2008 - Orion Poplawski - 1.2.3-6 - Rebuild for gcc 3.4 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:13 GMT Subject: rpms/perl-Sys-SigAction/devel perl-Sys-SigAction.spec,1.3,1.4 Message-ID: <200803070223.m272NDGd028195@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Sys-SigAction/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Sys-SigAction/devel Modified Files: perl-Sys-SigAction.spec Log Message: new perl Index: perl-Sys-SigAction.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sys-SigAction/devel/perl-Sys-SigAction.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Sys-SigAction.spec 27 Jan 2008 21:30:42 -0000 1.3 +++ perl-Sys-SigAction.spec 7 Mar 2008 02:17:02 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Sys-SigAction Version: 0.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension for Consistent Signal Handling License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.10-3 +Rebuild for new perl + * Sun Jan 27 2008 Andreas Thienemann 0.10-2 - Added Test::More to the BuildReqs From fedora-extras-commits at redhat.com Fri Mar 7 02:23:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:16 GMT Subject: rpms/perl-HTML-Scrubber/devel perl-HTML-Scrubber.spec,1.5,1.6 Message-ID: <200803070223.m272NGN0028258@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTML-Scrubber/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-HTML-Scrubber/devel Modified Files: perl-HTML-Scrubber.spec Log Message: new perl Index: perl-HTML-Scrubber.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Scrubber/devel/perl-HTML-Scrubber.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-HTML-Scrubber.spec 16 Oct 2007 18:46:34 -0000 1.5 +++ perl-HTML-Scrubber.spec 7 Mar 2008 02:04:05 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-HTML-Scrubber Version: 0.08 -Release: 4%{?dist}.2 +Release: 5%{?dist} Summary: Library for scrubbing/sanitizing html Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.08-5.2 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 0.08-4.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:16 GMT Subject: rpms/perl-Scope-Guard/devel perl-Scope-Guard.spec,1.2,1.3 Message-ID: <200803070223.m272NGcL028262@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Scope-Guard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Scope-Guard/devel Modified Files: perl-Scope-Guard.spec Log Message: new perl Index: perl-Scope-Guard.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Scope-Guard/devel/perl-Scope-Guard.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Scope-Guard.spec 26 Nov 2007 18:19:29 -0000 1.2 +++ perl-Scope-Guard.spec 7 Mar 2008 02:16:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Scope-Guard Version: 0.03 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lexically scoped resource management License: GPL+ or Artistic Group: Development/Libraries @@ -57,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.03-3 +Rebuild for new perl + * Mon Nov 26 2007 Chris Weyl 0.03-2 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:16 GMT Subject: rpms/perl-XML-Validator-Schema/devel perl-XML-Validator-Schema.spec, 1.1, 1.2 Message-ID: <200803070223.m272NG8U028263@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Validator-Schema/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-XML-Validator-Schema/devel Modified Files: perl-XML-Validator-Schema.spec Log Message: new perl Index: perl-XML-Validator-Schema.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Validator-Schema/devel/perl-XML-Validator-Schema.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-XML-Validator-Schema.spec 23 Mar 2007 16:48:20 -0000 1.1 +++ perl-XML-Validator-Schema.spec 7 Mar 2008 02:21:38 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-XML-Validator-Schema Version: 1.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Validate XML against a subset of W3C XML Schema -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/XML-Validator-Schema/ Source0: http://www.cpan.org/modules/by-module/XML/XML-Validator-Schema-%{version}.tar.gz @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.08-2 +Rebuild for new perl + * Thu Mar 15 2007 Andreas Thienemann 1.08-1 - Specfile autogenerated by cpanspec 1.69.1. - Cleaned up for FE From fedora-extras-commits at redhat.com Fri Mar 7 02:23:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:16 GMT Subject: rpms/perl-Kwiki-Raw/devel perl-Kwiki-Raw.spec,1.4,1.5 Message-ID: <200803070223.m272NG5X028260@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-Raw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Kwiki-Raw/devel Modified Files: perl-Kwiki-Raw.spec Log Message: new perl Index: perl-Kwiki-Raw.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-Raw/devel/perl-Kwiki-Raw.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Kwiki-Raw.spec 7 Jan 2008 02:49:45 -0000 1.4 +++ perl-Kwiki-Raw.spec 7 Mar 2008 02:06:31 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Kwiki-Raw Version: 0.02 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Provide an action to retrieve the raw wikitext of a page License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.02-6 +Rebuild for new perl + * Mon Jan 07 2008 Ralf Cors??pius 0.04-5 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:21 GMT Subject: rpms/perl-HTTP-Proxy/devel perl-HTTP-Proxy.spec,1.6,1.7 Message-ID: <200803070223.m272NLMO028371@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-HTTP-Proxy/devel Modified Files: perl-HTTP-Proxy.spec Log Message: new perl Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTTP-Proxy/devel/perl-HTTP-Proxy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-HTTP-Proxy.spec 28 Nov 2007 18:32:46 -0000 1.6 +++ perl-HTTP-Proxy.spec 7 Mar 2008 02:04:38 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy Version: 0.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.20-2 +Rebuild for new perl + * Mon Sep 4 2006 Jose Pedro Oliveira - 0.20-1 - Update to 0.20. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:17 GMT Subject: rpms/perl-Object-Accessor/devel perl-Object-Accessor.spec,1.8,1.9 Message-ID: <200803070223.m272NHRe028277@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Object-Accessor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Object-Accessor/devel Modified Files: perl-Object-Accessor.spec Log Message: new perl Index: perl-Object-Accessor.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Object-Accessor/devel/perl-Object-Accessor.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Object-Accessor.spec 2 Jan 2008 07:05:45 -0000 1.8 +++ perl-Object-Accessor.spec 7 Mar 2008 02:13:04 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Object-Accessor Version: 0.32 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl module that allows per object accessors License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.32-4 +Rebuild for new perl + * Wed Jan 02 2008 Ralf Cors??pius 0.32-3 - Adjust License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:14 GMT Subject: rpms/perl-Text-CHM/devel perl-Text-CHM.spec,1.4,1.5 Message-ID: <200803070223.m272NEiY028204@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-CHM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-CHM/devel Modified Files: perl-Text-CHM.spec Log Message: new perl Index: perl-Text-CHM.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-CHM/devel/perl-Text-CHM.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Text-CHM.spec 19 Feb 2008 18:25:59 -0000 1.4 +++ perl-Text-CHM.spec 7 Mar 2008 02:18:39 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Text-CHM Version: 0.01 -Release: 3%{?dist}.1 +Release: 4%{?dist} Summary: Perl extension for handling MS Compiled HtmlHelp Files Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.01-4.1 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.01-3.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:17 GMT Subject: rpms/perl-Net-Server/devel perl-Net-Server.spec,1.18,1.19 Message-ID: <200803070223.m272NHJ9028278@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-Server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-Server/devel Modified Files: perl-Net-Server.spec Log Message: new perl Index: perl-Net-Server.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Net-Server.spec 12 Aug 2007 10:46:08 -0000 1.18 +++ perl-Net-Server.spec 7 Mar 2008 02:12:37 -0000 1.19 @@ -2,7 +2,7 @@ Name: perl-%{rname} Version: 0.97 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extensible, general Perl server engine Group: Development/Libraries @@ -65,6 +65,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.97-2 +Rebuild for new perl + * Sun Aug 12 2007 Nicolas Mailhot ??? 0.97-1 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:17 GMT Subject: rpms/perl-Class-CSV/devel perl-Class-CSV.spec,1.1,1.2 Message-ID: <200803070223.m272NHiJ028280@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-CSV/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Class-CSV/devel Modified Files: perl-Class-CSV.spec Log Message: new perl Index: perl-Class-CSV.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-CSV/devel/perl-Class-CSV.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-CSV.spec 12 Nov 2007 15:25:49 -0000 1.1 +++ perl-Class-CSV.spec 7 Mar 2008 01:56:11 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-CSV Version: 1.03 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Class based CSV parser/writer License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.03-3 +Rebuild for new perl + * Wed Nov 7 2007 David Malcolm - 1.03-2 - drop versioned dependency on perl(Text::CSV_XS) in lieu of autogenerated one From fedora-extras-commits at redhat.com Fri Mar 7 02:23:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:19 GMT Subject: rpms/perl-Kwiki-Attachments/devel perl-Kwiki-Attachments.spec, 1.4, 1.5 Message-ID: <200803070223.m272NJln028327@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-Attachments/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Kwiki-Attachments/devel Modified Files: perl-Kwiki-Attachments.spec Log Message: new perl Index: perl-Kwiki-Attachments.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-Attachments/devel/perl-Kwiki-Attachments.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Kwiki-Attachments.spec 4 Jan 2008 06:02:55 -0000 1.4 +++ perl-Kwiki-Attachments.spec 7 Mar 2008 02:05:43 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Kwiki-Attachments Version: 0.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Kwiki Page Attachments Plugin License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.18-5 +Rebuild for new perl + * Fri Jan 04 2008 Ralf Cors??pius 0.18-4 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:17 GMT Subject: rpms/perl-Sys-Virt/devel perl-Sys-Virt.spec,1.11,1.12 Message-ID: <200803070223.m272NH1m028282@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Sys-Virt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Sys-Virt/devel Modified Files: perl-Sys-Virt.spec Log Message: new perl Index: perl-Sys-Virt.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sys-Virt/devel/perl-Sys-Virt.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Sys-Virt.spec 6 Mar 2008 21:49:05 -0000 1.11 +++ perl-Sys-Virt.spec 7 Mar 2008 02:17:12 -0000 1.12 @@ -1,8 +1,8 @@ Name: perl-Sys-Virt Version: 0.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Represent and manage a libvirt hypervisor connection -License: GPL +License: GPLv2+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Sys-Virt/ Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-%{version}.tar.gz @@ -59,6 +59,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.1.2-2 +Rebuild for new perl + * Wed Mar 05 2008 Steven Pritchard 0.1.2-1 - Update to 0.1.2. - Drop Sys-Virt-doc.patch. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:17 GMT Subject: rpms/perl-Test-Expect/devel perl-Test-Expect.spec,1.2,1.3 Message-ID: <200803070223.m272NHPA028276@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Test-Expect/devel Modified Files: perl-Test-Expect.spec Log Message: new perl Index: perl-Test-Expect.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Expect/devel/perl-Test-Expect.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-Expect.spec 11 Dec 2007 15:10:40 -0000 1.2 +++ perl-Test-Expect.spec 7 Mar 2008 02:18:03 -0000 1.3 @@ -1,10 +1,10 @@ Name: perl-Test-Expect Version: 0.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Automated driving and testing of terminal-based programs Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Test-Expect/ Source0: http://www.cpan.org/authors/id/L/LB/LBROCARD/Test-Expect-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +59,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.30-3 +Rebuild for new perl + * Tue Dec 11 2007 Ralf Cors??pius - 0.30-2 - BR: perl(Test::More), perl(Test::Builder) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:14 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:14 GMT Subject: rpms/perl-Gnome2-VFS/devel perl-Gnome2-VFS.spec,1.5,1.6 Message-ID: <200803070223.m272NEZW028207@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gnome2-VFS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Gnome2-VFS/devel Modified Files: perl-Gnome2-VFS.spec Log Message: new perl Index: perl-Gnome2-VFS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gnome2-VFS/devel/perl-Gnome2-VFS.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Gnome2-VFS.spec 18 Feb 2008 23:19:24 -0000 1.5 +++ perl-Gnome2-VFS.spec 7 Mar 2008 02:02:35 -0000 1.6 @@ -1,8 +1,8 @@ Name: perl-Gnome2-VFS Version: 1.080 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl interface to the 2.x series of the GNOME VFS library -License: LGPL +License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Gnome2-VFS/ Source0: http://www.cpan.org/authors/id/T/TS/TSCH/Gnome2-VFS-%{version}.tar.gz @@ -10,7 +10,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) ## core -BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) ## non-core @@ -63,6 +62,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.080-3 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 1.080-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:15 GMT Subject: rpms/perl-POE-Component-SNMP/devel perl-POE-Component-SNMP.spec, 1.6, 1.7 Message-ID: <200803070223.m272NFbg028240@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-SNMP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-POE-Component-SNMP/devel Modified Files: perl-POE-Component-SNMP.spec Log Message: new perl Index: perl-POE-Component-SNMP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-SNMP/devel/perl-POE-Component-SNMP.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-POE-Component-SNMP.spec 10 Jan 2008 06:25:43 -0000 1.6 +++ perl-POE-Component-SNMP.spec 7 Mar 2008 02:14:09 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-POE-Component-SNMP Version: 1.07 -Release: 2%{?dist} +Release: 3%{?dist} Summary: POE interface to Net::SNMP Group: Development/Libraries @@ -65,6 +65,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.07-3 +Rebuild for new perl + * Thu Jan 10 2008 Ralf Cors??pius 1.07-2 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:17 GMT Subject: rpms/perl-Crypt-OpenSSL-X509/devel perl-Crypt-OpenSSL-X509.spec, 1.5, 1.6 Message-ID: <200803070223.m272NHTa028281@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Crypt-OpenSSL-X509/devel Modified Files: perl-Crypt-OpenSSL-X509.spec Log Message: new perl Index: perl-Crypt-OpenSSL-X509.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel/perl-Crypt-OpenSSL-X509.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Crypt-OpenSSL-X509.spec 25 Feb 2008 20:18:04 -0000 1.5 +++ perl-Crypt-OpenSSL-X509.spec 7 Mar 2008 01:57:42 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Crypt-OpenSSL-X509 Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl interface to OpenSSL for X509 License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.6-2 +Rebuild for new perl + * Mon Feb 25 2008 Wes Hardaker - 0.6-1 - bump to upstream 0.6 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:20 GMT Subject: rpms/perl-Convert-TNEF/devel perl-Convert-TNEF.spec,1.10,1.11 Message-ID: <200803070223.m272NKBN028343@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Convert-TNEF/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Convert-TNEF/devel Modified Files: perl-Convert-TNEF.spec Log Message: new perl Index: perl-Convert-TNEF.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-TNEF/devel/perl-Convert-TNEF.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Convert-TNEF.spec 17 Apr 2007 23:11:04 -0000 1.10 +++ perl-Convert-TNEF.spec 7 Mar 2008 01:57:12 -0000 1.11 @@ -1,8 +1,8 @@ Name: perl-Convert-TNEF Version: 0.17 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Perl module to read TNEF files -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Convert-TNEF/ Source0: http://www.cpan.org/authors/id/D/DO/DOUGW/Convert-TNEF-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/Convert::TNEF.3pm* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.17-8 +Rebuild for new perl + * Tue Apr 17 2007 Steven Pritchard 0.17-7 - Use fixperms macro instead of our own chmod incantation. - Reformat to more closely match cpanspec output. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:23 GMT Subject: rpms/perl-Net-DNS-SEC/devel perl-Net-DNS-SEC.spec,1.1,1.2 Message-ID: <200803070223.m272NNkG028412@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-DNS-SEC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-DNS-SEC/devel Modified Files: perl-Net-DNS-SEC.spec Log Message: new perl Index: perl-Net-DNS-SEC.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-DNS-SEC/devel/perl-Net-DNS-SEC.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-DNS-SEC.spec 12 Jul 2007 15:21:46 -0000 1.1 +++ perl-Net-DNS-SEC.spec 7 Mar 2008 02:11:15 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-Net-DNS-SEC Version: 0.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: DNSSEC modules for Perl -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-DNS-SEC/ Source0: http://www.cpan.org/authors/id/O/OL/OLAF/Net-DNS-SEC-%{version}.tar.gz @@ -65,6 +65,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.14-3 +Rebuild for new perl + * Wed Jul 11 2007 Wes Hardaker - 0.14-2 - BuildRequire Digest::SHA - include the demo scripts in the documentation From fedora-extras-commits at redhat.com Fri Mar 7 02:23:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:23 GMT Subject: rpms/perl-Finance-Quote/devel perl-Finance-Quote.spec,1.6,1.7 Message-ID: <200803070223.m272NNru028415@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Finance-Quote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Finance-Quote/devel Modified Files: perl-Finance-Quote.spec Log Message: new perl Index: perl-Finance-Quote.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Finance-Quote/devel/perl-Finance-Quote.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Finance-Quote.spec 26 Sep 2007 15:53:18 -0000 1.6 +++ perl-Finance-Quote.spec 7 Mar 2008 02:01:06 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Finance-Quote Version: 1.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Perl module that retrieves stock and mutual fund quotes Group: Development/Libraries License: GPLv2+ @@ -44,6 +44,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.13-2 +Rebuild for new perl + * Wed Sep 26 2007 Bill Nottingham - add perl(ExtUtils::MakeMaker) buildreq From fedora-extras-commits at redhat.com Fri Mar 7 02:23:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:22 GMT Subject: rpms/perl-Mail-GnuPG/devel perl-Mail-GnuPG.spec,1.6,1.7 Message-ID: <200803070223.m272NMHu028391@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Mail-GnuPG/devel Modified Files: perl-Mail-GnuPG.spec Log Message: new perl Index: perl-Mail-GnuPG.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/perl-Mail-GnuPG.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Mail-GnuPG.spec 4 Sep 2007 09:19:28 -0000 1.6 +++ perl-Mail-GnuPG.spec 7 Mar 2008 02:09:11 -0000 1.7 @@ -1,7 +1,7 @@ Name: perl-Mail-GnuPG Summary: Process email with GPG Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-GnuPG/ @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.10-2 +Rebuild for new perl + * Tue Sep 04 2007 Ralf Cors??pius - 0.10-1 - Upstream update. - Reflect source url having changed. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:18 GMT Subject: rpms/perl-LWP-Authen-Wsse/devel perl-LWP-Authen-Wsse.spec,1.3,1.4 Message-ID: <200803070223.m272NIsH028303@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-LWP-Authen-Wsse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-LWP-Authen-Wsse/devel Modified Files: perl-LWP-Authen-Wsse.spec Log Message: new perl Index: perl-LWP-Authen-Wsse.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-LWP-Authen-Wsse/devel/perl-LWP-Authen-Wsse.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-LWP-Authen-Wsse.spec 16 Oct 2007 21:01:32 -0000 1.3 +++ perl-LWP-Authen-Wsse.spec 7 Mar 2008 02:07:28 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-LWP-Authen-Wsse Version: 0.05 -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: Library for enabling X-WSSE authentication in LWP Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.05-3.1 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway 0.05-2.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:20 GMT Subject: rpms/perl-DateTime-Format-ICal/devel perl-DateTime-Format-ICal.spec, 1.4, 1.5 Message-ID: <200803070223.m272NKsF028345@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Format-ICal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-DateTime-Format-ICal/devel Modified Files: perl-DateTime-Format-ICal.spec Log Message: new perl Index: perl-DateTime-Format-ICal.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-ICal/devel/perl-DateTime-Format-ICal.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DateTime-Format-ICal.spec 3 Jan 2008 04:16:41 -0000 1.4 +++ perl-DateTime-Format-ICal.spec 7 Mar 2008 01:59:10 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-DateTime-Format-ICal Version: 0.08 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Parse and format iCal datetime and duration strings License: GPL+ or Artistic Group: Development/Libraries @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.08-6 +Rebuild for new perl + * Thu Jan 03 2008 Ralf Cors??pius 0.08-5 - Adjust License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:18 GMT Subject: rpms/perl-LockFile-Simple/devel perl-LockFile-Simple.spec,1.1,1.2 Message-ID: <200803070223.m272NI9h028300@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-LockFile-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-LockFile-Simple/devel Modified Files: perl-LockFile-Simple.spec Log Message: new perl Index: perl-LockFile-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-LockFile-Simple/devel/perl-LockFile-Simple.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-LockFile-Simple.spec 23 Mar 2007 10:05:31 -0000 1.1 +++ perl-LockFile-Simple.spec 7 Mar 2008 02:08:12 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-LockFile-Simple Version: 0.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple file locking scheme License: Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.2.5-2 +Rebuild for new perl + * Tue Jan 16 2007 Andreas Thienemann 0.2.5-1 - Initial spec for FE - Specfile autogenerated by cpanspec 1.69.1. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:18 GMT Subject: rpms/perl-Digest-CRC/devel perl-Digest-CRC.spec,1.2,1.3 Message-ID: <200803070223.m272NIB5028298@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Digest-CRC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Digest-CRC/devel Modified Files: perl-Digest-CRC.spec Log Message: new perl Index: perl-Digest-CRC.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Digest-CRC/devel/perl-Digest-CRC.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Digest-CRC.spec 20 Feb 2008 08:30:22 -0000 1.2 +++ perl-Digest-CRC.spec 7 Mar 2008 01:59:43 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Digest-CRC Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generic CRC functions Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.10-4 +Rebuild for new perl + * Wed Feb 20 2008 Fedora Release Engineering - 0.10-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:23 GMT Subject: rpms/perl-Unix-Statgrab/devel perl-Unix-Statgrab.spec,1.8,1.9 Message-ID: <200803070223.m272NNwn028414@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Unix-Statgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Unix-Statgrab/devel Modified Files: perl-Unix-Statgrab.spec Log Message: new perl Index: perl-Unix-Statgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Unix-Statgrab/devel/perl-Unix-Statgrab.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Unix-Statgrab.spec 20 Feb 2008 03:03:35 -0000 1.8 +++ perl-Unix-Statgrab.spec 7 Mar 2008 02:20:37 -0000 1.9 @@ -1,8 +1,8 @@ Name: perl-Unix-Statgrab Version: 0.04 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl extension for collecting information about the machine -License: LGPL +License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Unix-Statgrab/ Source0: http://www.cpan.org/authors/id/V/VP/VPARSEVAL/Unix-Statgrab-%{version}.tar.gz @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.04-4 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.04-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:18 GMT Subject: rpms/perl-Cflow/devel perl-Cflow.spec,1.8,1.9 Message-ID: <200803070223.m272NIrT028302@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Cflow/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Cflow/devel Modified Files: perl-Cflow.spec Log Message: new perl Index: perl-Cflow.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Cflow/devel/perl-Cflow.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Cflow.spec 9 Feb 2008 18:34:02 -0000 1.8 +++ perl-Cflow.spec 7 Mar 2008 01:55:43 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Cflow Version: 1.053 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Find flows in raw IP flow files Group: Development/Libraries License: GPLv2+ @@ -56,6 +56,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.053-9 +Rebuild for new perl + * Sat Feb 9 2008 - Orion Poplawski - 1.053-8 - Rebuild for gcc 3.4 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:18 GMT Subject: rpms/perl-Text-WikiFormat/devel perl-Text-WikiFormat.spec,1.6,1.7 Message-ID: <200803070223.m272NI59028297@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-WikiFormat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-WikiFormat/devel Modified Files: perl-Text-WikiFormat.spec Log Message: new perl Index: perl-Text-WikiFormat.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-WikiFormat/devel/perl-Text-WikiFormat.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Text-WikiFormat.spec 28 Nov 2007 18:33:44 -0000 1.6 +++ perl-Text-WikiFormat.spec 7 Mar 2008 02:19:42 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Text-WikiFormat Version: 0.79 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Translate Wiki formatted text into other formats Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.79-2 +Rebuild for new perl + * Fri Jun 29 2007 Jose Pedro Oliveira - 0.79-1 - Update to 0.79. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:28 GMT Subject: rpms/perl-BerkeleyDB/devel perl-BerkeleyDB.spec,1.19,1.20 Message-ID: <200803070223.m272NSId028519@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-BerkeleyDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-BerkeleyDB/devel Modified Files: perl-BerkeleyDB.spec Log Message: new perl Index: perl-BerkeleyDB.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- perl-BerkeleyDB.spec 20 Feb 2008 02:49:52 -0000 1.19 +++ perl-BerkeleyDB.spec 7 Mar 2008 01:54:52 -0000 1.20 @@ -1,6 +1,6 @@ Name: perl-BerkeleyDB Version: 0.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension for Berkeley DB version 2, 3 or 4 License: GPL+ or Artistic Group: Development/Libraries @@ -59,6 +59,9 @@ %{_bindir}/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.33-3 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.33-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:23 GMT Subject: rpms/perl-File-RsyncP/devel perl-File-RsyncP.spec,1.6,1.7 Message-ID: <200803070223.m272NN9c028413@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-RsyncP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-File-RsyncP/devel Modified Files: perl-File-RsyncP.spec Log Message: new perl Index: perl-File-RsyncP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-RsyncP/devel/perl-File-RsyncP.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-File-RsyncP.spec 12 Feb 2008 14:41:38 -0000 1.6 +++ perl-File-RsyncP.spec 7 Mar 2008 02:00:39 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-File-RsyncP Version: 0.68 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A perl implementation of an Rsync client License: GPLv2 Group: Development/Libraries @@ -51,6 +51,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.68-4 +Rebuild for new perl + * Tue Feb 12 2008 Mike McGrath - 0.68-3 - Rebuild for gcc43 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:19 GMT Subject: rpms/perl-CGI-Ajax/devel perl-CGI-Ajax.spec,1.3,1.4 Message-ID: <200803070223.m272NJub028324@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CGI-Ajax/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-CGI-Ajax/devel Modified Files: perl-CGI-Ajax.spec Log Message: new perl Index: perl-CGI-Ajax.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CGI-Ajax/devel/perl-CGI-Ajax.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-CGI-Ajax.spec 8 Jan 2008 17:52:20 -0000 1.3 +++ perl-CGI-Ajax.spec 7 Mar 2008 01:55:09 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-CGI-Ajax Version: 0.701 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl-specific system for writing Asynchronous web applications License: GPL+ or Artistic Group: Development/Libraries @@ -56,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.701-4 +Rebuild for new perl + * Tue Jan 08 2008 Ralf Cors??pius 0.701-3 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:19 GMT Subject: rpms/perl-Getopt-Euclid/devel perl-Getopt-Euclid.spec,1.1,1.2 Message-ID: <200803070223.m272NJLm028323@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Getopt-Euclid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Getopt-Euclid/devel Modified Files: perl-Getopt-Euclid.spec Log Message: new perl Index: perl-Getopt-Euclid.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Getopt-Euclid/devel/perl-Getopt-Euclid.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Getopt-Euclid.spec 18 Nov 2007 20:10:23 -0000 1.1 +++ perl-Getopt-Euclid.spec 7 Mar 2008 02:02:11 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Getopt-Euclid Version: 0.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Executable Uniform Command-Line Interface Descriptions License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.1.0-2 +Rebuild for new perl + * Wed Nov 14 2007 Rasmus Ory Nielsen - 0.1.0-1 - Specfile autogenerated by cpanspec 1.73. - Adapted for Fedora From fedora-extras-commits at redhat.com Fri Mar 7 02:23:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:19 GMT Subject: rpms/perl-Kwiki-ModPerl/devel perl-Kwiki-ModPerl.spec,1.4,1.5 Message-ID: <200803070223.m272NJto028328@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-ModPerl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Kwiki-ModPerl/devel Modified Files: perl-Kwiki-ModPerl.spec Log Message: new perl Index: perl-Kwiki-ModPerl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-ModPerl/devel/perl-Kwiki-ModPerl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Kwiki-ModPerl.spec 9 Jan 2008 06:19:15 -0000 1.4 +++ perl-Kwiki-ModPerl.spec 7 Mar 2008 02:06:08 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Kwiki-ModPerl Version: 0.09 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Enable Kwiki to work under mod_perl License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.09-6 +Rebuild for new perl + * Wed Jan 09 2008 Ralf Cors??pius 0.09-5 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:21 GMT Subject: rpms/perl-Tie-DBI/devel perl-Tie-DBI.spec,1.4,1.5 Message-ID: <200803070223.m272NLBM028368@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Tie-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Tie-DBI/devel Modified Files: perl-Tie-DBI.spec Log Message: new perl Index: perl-Tie-DBI.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tie-DBI/devel/perl-Tie-DBI.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Tie-DBI.spec 26 Aug 2007 20:10:05 -0000 1.4 +++ perl-Tie-DBI.spec 7 Mar 2008 02:20:14 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Tie-DBI Version: 1.02 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tie hashes to DBI relational databases Group: Development/Libraries License: GPL+ or Artistic @@ -49,6 +49,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.02-4 +Rebuild for new perl + * Sun Aug 26 2007 Tom "spot" Callaway 1.02-3 - license tag fix From fedora-extras-commits at redhat.com Fri Mar 7 02:23:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:19 GMT Subject: rpms/perl-Net-SCP/devel perl-Net-SCP.spec,1.13,1.14 Message-ID: <200803070223.m272NJmM028326@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-SCP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-SCP/devel Modified Files: perl-Net-SCP.spec Log Message: new perl Index: perl-Net-SCP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SCP/devel/perl-Net-SCP.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Net-SCP.spec 28 Jan 2008 19:51:45 -0000 1.13 +++ perl-Net-SCP.spec 7 Mar 2008 02:12:13 -0000 1.14 @@ -1,6 +1,6 @@ Name: perl-Net-SCP Version: 0.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl extension for secure copy protocol License: GPL+ or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.08-2 +Rebuild for new perl + * Mon Jan 28 2008 Steven Pritchard 0.08-1 - Update to 0.08. - Update License tag. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:20 GMT Subject: rpms/perl-Color-Library/devel perl-Color-Library.spec,1.1,1.2 Message-ID: <200803070223.m272NK42028344@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Color-Library/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Color-Library/devel Modified Files: perl-Color-Library.spec Log Message: new perl Index: perl-Color-Library.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Color-Library/devel/perl-Color-Library.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Color-Library.spec 6 Feb 2008 01:41:20 -0000 1.1 +++ perl-Color-Library.spec 7 Mar 2008 01:56:41 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Color-Library Version: 0.02 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy-to-use and comprehensive named-color library License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.02-2 +Rebuild for new perl + * Mon Jan 28 2008 Steven Pritchard 0.02-1 - Specfile autogenerated by cpanspec 1.74. - Drop redundant explicit dependency on Module::Pluggable. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:25 GMT Subject: rpms/perl-Net-DBus/devel perl-Net-DBus.spec,1.6,1.7 Message-ID: <200803070223.m272NPTN028455@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-DBus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-DBus/devel Modified Files: perl-Net-DBus.spec Log Message: new perl Index: perl-Net-DBus.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-DBus/devel/perl-Net-DBus.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Net-DBus.spec 21 Feb 2008 16:04:50 -0000 1.6 +++ perl-Net-DBus.spec 7 Mar 2008 02:11:10 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Net-DBus Version: 0.33.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Use and provide DBus services License: GPL+ or Artistic Group: Development/Libraries @@ -62,6 +62,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.33.6-2 +Rebuild for new perl + * Thu Feb 21 2008 Chris Weyl 0.33.6-1 - update to 0.33.6 - update license tag From fedora-extras-commits at redhat.com Fri Mar 7 02:23:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:37 GMT Subject: rpms/perl-Geo-IP/devel perl-Geo-IP.spec,1.3,1.4 Message-ID: <200803070223.m272NbNX028713@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Geo-IP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Geo-IP/devel Modified Files: perl-Geo-IP.spec Log Message: new perl Index: perl-Geo-IP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Geo-IP/devel/perl-Geo-IP.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Geo-IP.spec 19 Feb 2008 13:29:49 -0000 1.3 +++ perl-Geo-IP.spec 7 Mar 2008 02:01:57 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Geo-IP Version: 1.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Efficient Perl bindings for the GeoIP location database Group: Development/Libraries @@ -56,6 +56,9 @@ %{_mandir}/man3/Geo::Mirror.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.30-3 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.30-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:25 GMT Subject: rpms/cpanspec/devel cpanspec.spec,1.19,1.20 Message-ID: <200803070223.m272NPtI028456@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/cpanspec/devel Modified Files: cpanspec.spec Log Message: new perl Index: cpanspec.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cpanspec.spec 11 Dec 2007 19:17:42 -0000 1.19 +++ cpanspec.spec 7 Mar 2008 01:52:10 -0000 1.20 @@ -1,6 +1,6 @@ Name: cpanspec Version: 1.74 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM spec file generation utility License: GPL+ or Artistic Group: Development/Tools @@ -51,6 +51,9 @@ %{_mandir}/man1/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.74-2 +Rebuild for new perl + * Tue Dec 11 2007 Steven Pritchard 1.74-1 - Update to 1.74. - Update License tag. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:19 GMT Subject: rpms/gscan2pdf/devel gscan2pdf.spec,1.22,1.23 Message-ID: <200803070223.m272NJPE028329@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/gscan2pdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/gscan2pdf/devel Modified Files: gscan2pdf.spec Log Message: new perl Index: gscan2pdf.spec =================================================================== RCS file: /cvs/pkgs/rpms/gscan2pdf/devel/gscan2pdf.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gscan2pdf.spec 2 Feb 2008 15:50:08 -0000 1.22 +++ gscan2pdf.spec 7 Mar 2008 01:52:42 -0000 1.23 @@ -1,6 +1,6 @@ Name: gscan2pdf Version: 0.9.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A GUI for producing a multipage PDF from a scan Group: Applications/Publishing @@ -73,6 +73,9 @@ %{_mandir}/man1/*.1* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.9.21-2 +Rebuild for new perl + * Sat Feb 02 2008 Bernard Johnson - 0.9.21-1 - v 0.9.21 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:20 GMT Subject: rpms/perl-SGML-Parser-OpenSP/devel perl-SGML-Parser-OpenSP.spec, 1.5, 1.6 Message-ID: <200803070223.m272NKR2028347@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SGML-Parser-OpenSP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-SGML-Parser-OpenSP/devel Modified Files: perl-SGML-Parser-OpenSP.spec Log Message: new perl Index: perl-SGML-Parser-OpenSP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SGML-Parser-OpenSP/devel/perl-SGML-Parser-OpenSP.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-SGML-Parser-OpenSP.spec 19 Feb 2008 23:28:34 -0000 1.5 +++ perl-SGML-Parser-OpenSP.spec 7 Mar 2008 02:16:07 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-SGML-Parser-OpenSP Version: 0.991 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl interface to the OpenSP SGML and XML parser Group: Development/Libraries @@ -62,6 +62,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.991-3 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.991-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:16 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:16 GMT Subject: rpms/perl-Gtk2-Ex-PodViewer/devel perl-Gtk2-Ex-PodViewer.spec, 1.3, 1.4 Message-ID: <200803070223.m272NG1a028259@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-PodViewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Gtk2-Ex-PodViewer/devel Modified Files: perl-Gtk2-Ex-PodViewer.spec Log Message: new perl Index: perl-Gtk2-Ex-PodViewer.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-PodViewer/devel/perl-Gtk2-Ex-PodViewer.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Gtk2-Ex-PodViewer.spec 4 May 2007 04:31:22 -0000 1.3 +++ perl-Gtk2-Ex-PodViewer.spec 7 Mar 2008 02:03:06 -0000 1.4 @@ -1,10 +1,10 @@ Name: perl-Gtk2-Ex-PodViewer Version: 0.17 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Gtk2 widget for displaying Plain old Documentation (POD) Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Gtk2-Ex-PodViewer/ Source0: http://search.cpan.org/CPAN/authors/id/G/GB/GBROWN/Gtk2-Ex-PodViewer-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,6 +55,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.17-4 +Rebuild for new perl + * Thu May 03 2007 Bernard Johnson - 0.17-3 - BR on perl(ExtUtils::MakeMaker) rather than perl From fedora-extras-commits at redhat.com Fri Mar 7 02:23:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:20 GMT Subject: rpms/perl-Module-Versions-Report/devel perl-Module-Versions-Report.spec, 1.5, 1.6 Message-ID: <200803070223.m272NKmr028349@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-Versions-Report/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Module-Versions-Report/devel Modified Files: perl-Module-Versions-Report.spec Log Message: new perl Index: perl-Module-Versions-Report.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Versions-Report/devel/perl-Module-Versions-Report.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Module-Versions-Report.spec 16 Oct 2007 21:24:37 -0000 1.5 +++ perl-Module-Versions-Report.spec 7 Mar 2008 02:10:44 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Module-Versions-Report Version: 1.03 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Report versions of all modules in memory Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.03-2.1 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 1.03-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:17 GMT Subject: rpms/perl-Net-IP-CMatch/devel perl-Net-IP-CMatch.spec,1.7,1.8 Message-ID: <200803070223.m272NHBp028279@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-IP-CMatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-IP-CMatch/devel Modified Files: perl-Net-IP-CMatch.spec Log Message: new perl Index: perl-Net-IP-CMatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-IP-CMatch/devel/perl-Net-IP-CMatch.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Net-IP-CMatch.spec 19 Feb 2008 17:08:54 -0000 1.7 +++ perl-Net-IP-CMatch.spec 7 Mar 2008 02:11:31 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Net-IP-CMatch Version: 0.02 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Efficiently match IP addresses against IP ranges with C Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.02-8 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.02-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:21 GMT Subject: rpms/perl-Data-Alias/devel perl-Data-Alias.spec,1.12,1.13 Message-ID: <200803070223.m272NLvO028370@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Data-Alias/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Data-Alias/devel Modified Files: perl-Data-Alias.spec Log Message: new perl Index: perl-Data-Alias.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-Alias/devel/perl-Data-Alias.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Data-Alias.spec 18 Feb 2008 23:11:12 -0000 1.12 +++ perl-Data-Alias.spec 7 Mar 2008 01:58:42 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-Data-Alias Version: 1.07 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Comprehensive set of aliasing operations License: GPL+ or Artistic Group: Development/Libraries @@ -67,6 +67,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.07-3 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 1.07-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:21 GMT Subject: rpms/perl-Mail-SPF-Query/devel perl-Mail-SPF-Query.spec,1.5,1.6 Message-ID: <200803070223.m272NLK8028374@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Mail-SPF-Query/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Mail-SPF-Query/devel Modified Files: perl-Mail-SPF-Query.spec Log Message: new perl Index: perl-Mail-SPF-Query.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-SPF-Query/devel/perl-Mail-SPF-Query.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Mail-SPF-Query.spec 18 Apr 2007 15:19:38 -0000 1.5 +++ perl-Mail-SPF-Query.spec 7 Mar 2008 02:09:44 -0000 1.6 @@ -1,8 +1,8 @@ Name: perl-Mail-SPF-Query Version: 1.999.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Query Sender Policy Framework -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-SPF-Query/ Source0: http://www.cpan.org/authors/id/J/JM/JMEHNLE/mail-spf-query/Mail-SPF-Query-%{version}.tar.gz @@ -60,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.999.1-4 +Rebuild for new perl + * Wed Apr 18 2007 Steven Pritchard 1.999.1-3 - Use fixperms macro instead of our own chmod incantation. - BR ExtUtils::MakeMaker. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:21 GMT Subject: rpms/perl-RPM2/devel perl-RPM2.spec,1.4,1.5 Message-ID: <200803070223.m272NLK5028369@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-RPM2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-RPM2/devel Modified Files: perl-RPM2.spec Log Message: new perl Index: perl-RPM2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-RPM2/devel/perl-RPM2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-RPM2.spec 19 Feb 2008 22:10:06 -0000 1.4 +++ perl-RPM2.spec 7 Mar 2008 02:15:42 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-RPM2 Version: 0.67 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl bindings for the RPM Package Manager API License: GPL+ or Artistic Group: Development/Libraries @@ -52,6 +52,9 @@ %{_mandir}/man3/RPM2.3pm* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.67-5 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.67-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:21 GMT Subject: rpms/perl-Graphics-ColorNames/devel perl-Graphics-ColorNames.spec, 1.6, 1.7 Message-ID: <200803070223.m272NLlj028372@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Graphics-ColorNames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Graphics-ColorNames/devel Modified Files: perl-Graphics-ColorNames.spec Log Message: new perl Index: perl-Graphics-ColorNames.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Graphics-ColorNames/devel/perl-Graphics-ColorNames.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Graphics-ColorNames.spec 6 Feb 2008 01:50:57 -0000 1.6 +++ perl-Graphics-ColorNames.spec 7 Mar 2008 02:02:40 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Graphics-ColorNames Version: 2.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Defines RGB values for common color names License: GPL+ or Artistic Group: Development/Libraries @@ -58,6 +58,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.11-2 +Rebuild for new perl + * Mon Jan 28 2008 Steven Pritchard 2.11-1 - Update to 2.11. - BR Color::Library, Module::Loaded, Test::Exception, and Tie::Sub. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:22 GMT Subject: rpms/perl-DBIx-SQLite-Simple/devel perl-DBIx-SQLite-Simple.spec, 1.1, 1.2 Message-ID: <200803070223.m272NMN5028394@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBIx-SQLite-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-DBIx-SQLite-Simple/devel Modified Files: perl-DBIx-SQLite-Simple.spec Log Message: new perl Index: perl-DBIx-SQLite-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBIx-SQLite-Simple/devel/perl-DBIx-SQLite-Simple.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-DBIx-SQLite-Simple.spec 11 May 2007 23:19:47 -0000 1.1 +++ perl-DBIx-SQLite-Simple.spec 7 Mar 2008 01:58:37 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-DBIx-SQLite-Simple Version: 0.34 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easy access to SQLite databases using objects Group: Development/Libraries @@ -52,6 +52,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.34-3 +Rebuild for new perl + * Sun May 06 2007 Sindre Pedersen Bj??rdal - 0.34-2 - Add missing BRs - Fix %%files From fedora-extras-commits at redhat.com Fri Mar 7 02:23:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:27 GMT Subject: rpms/perl-Term-ReadPassword/devel perl-Term-ReadPassword.spec, 1.2, 1.3 Message-ID: <200803070223.m272NR7T028502@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Term-ReadPassword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Term-ReadPassword/devel Modified Files: perl-Term-ReadPassword.spec Log Message: new perl Index: perl-Term-ReadPassword.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Term-ReadPassword/devel/perl-Term-ReadPassword.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Term-ReadPassword.spec 28 Jan 2008 19:01:33 -0000 1.2 +++ perl-Term-ReadPassword.spec 7 Mar 2008 02:17:23 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Term-ReadPassword Version: 0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Asking the user for a password License: GPL+ or Artistic Group: Development/Libraries @@ -45,6 +45,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.11-2 +Rebuild for new perl + * Mon Jan 28 2008 Steven Pritchard 0.11-1 - Update to 0.11. - Update License tag. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:28 GMT Subject: rpms/perl-POE-Component-Server-SOAP/devel perl-POE-Component-Server-SOAP.spec, 1.6, 1.7 Message-ID: <200803070223.m272NSiR028522@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-Server-SOAP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-POE-Component-Server-SOAP/devel Modified Files: perl-POE-Component-Server-SOAP.spec Log Message: new perl Index: perl-POE-Component-Server-SOAP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-SOAP/devel/perl-POE-Component-Server-SOAP.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-POE-Component-Server-SOAP.spec 10 Jan 2008 05:37:28 -0000 1.6 +++ perl-POE-Component-Server-SOAP.spec 7 Mar 2008 02:14:14 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-POE-Component-Server-SOAP Version: 1.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Publish POE event handlers via SOAP over HTTP License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.11-3 +Rebuild for new perl + * Thu Jan 10 2008 Ralf Cors??pius 1.11-2 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:20 GMT Subject: rpms/perl-Module-Compile/devel perl-Module-Compile.spec,1.2,1.3 Message-ID: <200803070223.m272NKtp028348@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-Compile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Module-Compile/devel Modified Files: perl-Module-Compile.spec Log Message: new perl Index: perl-Module-Compile.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Compile/devel/perl-Module-Compile.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Module-Compile.spec 18 Apr 2007 16:53:01 -0000 1.2 +++ perl-Module-Compile.spec 7 Mar 2008 02:10:15 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Module-Compile Version: 0.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl Module Compilation -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Compile/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/Module-Compile-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.20-3 +Rebuild for new perl + * Wed Apr 18 2007 Steven Pritchard 0.20-2 - BR ExtUtils::MakeMaker. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:23 GMT Subject: rpms/perl-Template-GD/devel perl-Template-GD.spec,1.2,1.3 Message-ID: <200803070223.m272NNgI028418@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Template-GD/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Template-GD/devel Modified Files: perl-Template-GD.spec Log Message: new perl Index: perl-Template-GD.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Template-GD/devel/perl-Template-GD.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Template-GD.spec 26 Aug 2007 19:43:21 -0000 1.2 +++ perl-Template-GD.spec 7 Mar 2008 02:17:17 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Template-GD Version: 2.66 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GD plugin(s) for the Template Toolkit Group: Development/Libraries License: GPL+ or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.66-4 +Rebuild for new perl + * Sun Aug 26 2007 Tom "spot" Callaway - 2.66-3 - license fix From fedora-extras-commits at redhat.com Fri Mar 7 02:23:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:22 GMT Subject: rpms/perl-OpenFrame/devel perl-OpenFrame.spec,1.4,1.5 Message-ID: <200803070223.m272NMIe028397@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-OpenFrame/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-OpenFrame/devel Modified Files: perl-OpenFrame.spec Log Message: new perl Index: perl-OpenFrame.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-OpenFrame/devel/perl-OpenFrame.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-OpenFrame.spec 2 Jan 2008 05:48:07 -0000 1.4 +++ perl-OpenFrame.spec 7 Mar 2008 02:13:16 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-OpenFrame Version: 3.05 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Framework for network enabled applications -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/OpenFrame/ Source0: http://www.cpan.org/authors/id/R/RC/RCLAMP/OpenFrame-%{version}.tar.gz @@ -58,6 +58,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 3.05-8 +Rebuild for new perl + * Wed Jan 02 2008 Ralf Cors??pius 3.05-7 - BR: perl(Test::Simple) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:22 GMT Subject: rpms/perl-Class-Data-Accessor/devel perl-Class-Data-Accessor.spec, 1.5, 1.6 Message-ID: <200803070223.m272NMUH028396@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Data-Accessor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Class-Data-Accessor/devel Modified Files: perl-Class-Data-Accessor.spec Log Message: new perl Index: perl-Class-Data-Accessor.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Data-Accessor/devel/perl-Class-Data-Accessor.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-Data-Accessor.spec 31 May 2007 23:26:36 -0000 1.5 +++ perl-Class-Data-Accessor.spec 7 Mar 2008 01:56:16 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Class-Data-Accessor Version: 0.04001 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Inheritable, overridable class and instance data accessor creation License: Artistic Group: Development/Libraries @@ -63,6 +63,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.04001-2 +Rebuild for new perl + * Thu May 31 2007 Chris Weyl 0.04001-1 - update -- 0.40001 clarifies conflicting license statements From fedora-extras-commits at redhat.com Fri Mar 7 02:23:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:29 GMT Subject: rpms/perl-Module-Depends/devel perl-Module-Depends.spec,1.3,1.4 Message-ID: <200803070223.m272NTgC028542@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-Depends/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Module-Depends/devel Modified Files: perl-Module-Depends.spec Log Message: new perl Index: perl-Module-Depends.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Depends/devel/perl-Module-Depends.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Module-Depends.spec 16 Aug 2007 17:47:18 -0000 1.3 +++ perl-Module-Depends.spec 7 Mar 2008 02:10:20 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-Module-Depends Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Identify the dependencies of a distribution -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Depends/ Source0: http://www.cpan.org/modules/by-module/Module/Module-Depends-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.13-2 +Rebuild for new perl + * Thu Aug 16 2007 Ian M. Burrell - 0.13-1 - Update to 0.13 - Fix BuildRequires From fedora-extras-commits at redhat.com Fri Mar 7 02:23:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:28 GMT Subject: rpms/perl-IO-LockedFile/devel perl-IO-LockedFile.spec,1.1,1.2 Message-ID: <200803070223.m272NSM0028520@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-IO-LockedFile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-IO-LockedFile/devel Modified Files: perl-IO-LockedFile.spec Log Message: new perl Index: perl-IO-LockedFile.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-IO-LockedFile/devel/perl-IO-LockedFile.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-IO-LockedFile.spec 24 May 2007 22:50:23 -0000 1.1 +++ perl-IO-LockedFile.spec 7 Mar 2008 02:05:13 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-IO-LockedFile Version: 0.23 -Release: 2 +Release: 3 Summary: Something -License: GPL or Artistic or something +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-LockedFile/ Source0: http://www.cpan.org/authors/id/R/RA/RANI/IO-LockedFile-%{version}.tar.gz @@ -44,6 +44,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.23-3 +Rebuild for new perl + * Thu May 24 2007 Paul Wouters 0.13-2 - Added perl(ExtUtils::MakeMaker) BuildRequires From fedora-extras-commits at redhat.com Fri Mar 7 02:23:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:22 GMT Subject: rpms/perl-Kwiki-RecentChanges/devel perl-Kwiki-RecentChanges.spec, 1.6, 1.7 Message-ID: <200803070223.m272NMLu028393@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-RecentChanges/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Kwiki-RecentChanges/devel Modified Files: perl-Kwiki-RecentChanges.spec Log Message: new perl Index: perl-Kwiki-RecentChanges.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-RecentChanges/devel/perl-Kwiki-RecentChanges.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Kwiki-RecentChanges.spec 9 Jan 2008 09:36:09 -0000 1.6 +++ perl-Kwiki-RecentChanges.spec 7 Mar 2008 02:06:42 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Kwiki-RecentChanges Version: 0.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Kwiki Recent Changes Plugin License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.14-5 +Rebuild for new perl + * Wed Jan 09 2008 Ralf Cors??pius 0.14-4 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:23 GMT Subject: rpms/perl-Net-LibIDN/devel perl-Net-LibIDN.spec,1.6,1.7 Message-ID: <200803070223.m272NNEV028417@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-LibIDN/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-LibIDN/devel Modified Files: perl-Net-LibIDN.spec Log Message: new perl Index: perl-Net-LibIDN.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-LibIDN/devel/perl-Net-LibIDN.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Net-LibIDN.spec 10 Feb 2008 13:37:29 -0000 1.6 +++ perl-Net-LibIDN.spec 7 Mar 2008 02:11:47 -0000 1.7 @@ -3,7 +3,7 @@ Summary: Perl bindings for GNU LibIDN Name: perl-Net-LibIDN Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/%{pkgname}/ @@ -53,6 +53,9 @@ %{perl_vendorarch}/auto/Net %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.10-2 +Rebuild for new perl + * Sun Feb 10 2008 Robert Scheck 0.10-1 - Upgrade to 0.10 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:31 GMT Subject: rpms/irssi/devel irssi.spec,1.32,1.33 Message-ID: <200803070223.m272NVls028585@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/irssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/irssi/devel Modified Files: irssi.spec Log Message: new perl Index: irssi.spec =================================================================== RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- irssi.spec 1 Mar 2008 18:40:20 -0000 1.32 +++ irssi.spec 7 Mar 2008 01:52:52 -0000 1.33 @@ -3,7 +3,7 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 0.8.12 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/Communications @@ -85,6 +85,9 @@ %{_includedir}/irssi %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.8.12-9 +Rebuild for new perl + * Sat Mar 1 2008 Marek Mahut - 0.8.12-8 - Fix for multiarch conflict (BZ#341591) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:13 GMT Subject: rpms/perl-ConfigReader/devel perl-ConfigReader.spec,1.1,1.2 Message-ID: <200803070223.m272ND0n028194@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-ConfigReader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-ConfigReader/devel Modified Files: perl-ConfigReader.spec Log Message: new perl Index: perl-ConfigReader.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-ConfigReader/devel/perl-ConfigReader.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-ConfigReader.spec 23 Mar 2007 10:04:34 -0000 1.1 +++ perl-ConfigReader.spec 7 Mar 2008 01:57:01 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-ConfigReader Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Read directives from a configuration file -License: LGPL +License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/ConfigReader/ Source0: http://www.cpan.org/modules/by-module/ConfigReader/ConfigReader-%{version}.tar.gz @@ -51,6 +51,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.5-2 +Rebuild for new perl + * Wed Dec 13 2006 Andreas Thienemann 0.5-1 - Specfile autogenerated by cpanspec 1.69.1. - Major cleanups in the spec to make the package build. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:31 GMT Subject: rpms/perl-Devel-Caller/devel perl-Devel-Caller.spec,1.4,1.5 Message-ID: <200803070223.m272NVuY028588@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Devel-Caller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Devel-Caller/devel Modified Files: perl-Devel-Caller.spec Log Message: new perl Index: perl-Devel-Caller.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Devel-Caller/devel/perl-Devel-Caller.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Devel-Caller.spec 20 Feb 2008 02:54:24 -0000 1.4 +++ perl-Devel-Caller.spec 7 Mar 2008 01:59:20 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Devel-Caller Version: 2.03 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Meatier versions of caller License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.03-3 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 2.03-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:18 GMT Subject: rpms/perl-Net-IRC/devel perl-Net-IRC.spec,1.1,1.2 Message-ID: <200803070223.m272NI8K028299@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-IRC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-IRC/devel Modified Files: perl-Net-IRC.spec Log Message: new perl Index: perl-Net-IRC.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-IRC/devel/perl-Net-IRC.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-IRC.spec 5 Oct 2007 02:04:46 -0000 1.1 +++ perl-Net-IRC.spec 7 Mar 2008 02:11:43 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Net-IRC Version: 0.75 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl interface to the Internet Relay Chat protocol Group: Development/Libraries @@ -51,6 +51,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.75-3 +Rebuild for new perl + * Mon Oct 01 2007 Christopher Stone 0.75-2 - Add irctest and t/ to %%doc From fedora-extras-commits at redhat.com Fri Mar 7 02:23:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:24 GMT Subject: rpms/perl-Crypt-PasswdMD5/devel perl-Crypt-PasswdMD5.spec,1.2,1.3 Message-ID: <200803070223.m272NOpK028436@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-PasswdMD5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Crypt-PasswdMD5/devel Modified Files: perl-Crypt-PasswdMD5.spec Log Message: new perl Index: perl-Crypt-PasswdMD5.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-PasswdMD5/devel/perl-Crypt-PasswdMD5.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Crypt-PasswdMD5.spec 15 Oct 2007 19:08:51 -0000 1.2 +++ perl-Crypt-PasswdMD5.spec 7 Mar 2008 01:57:47 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Crypt-PasswdMD5 Version: 1.3 -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: Provides interoperable MD5-based crypt() functions License: GPL+ or Artistic Group: Development/Libraries @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.3-3.1 +Rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway - 1.3-2.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:31 GMT Subject: rpms/perl-MP3-Info/devel perl-MP3-Info.spec,1.10,1.11 Message-ID: <200803070223.m272NVRF028586@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MP3-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-MP3-Info/devel Modified Files: perl-MP3-Info.spec Log Message: new perl Index: perl-MP3-Info.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MP3-Info/devel/perl-MP3-Info.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-MP3-Info.spec 30 Sep 2007 14:46:47 -0000 1.10 +++ perl-MP3-Info.spec 7 Mar 2008 02:08:38 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-MP3-Info Version: 1.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manipulate / fetch info from MP3 audio files Group: Development/Libraries @@ -52,6 +52,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.23-2 +Rebuild for new perl + * Sun Sep 30 2007 Christopher Stone 1.23-1 - Upstream sync From fedora-extras-commits at redhat.com Fri Mar 7 02:23:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:29 GMT Subject: rpms/udunits/devel udunits.spec,1.14,1.15 Message-ID: <200803070223.m272NTIR028544@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/udunits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/udunits/devel Modified Files: udunits.spec Log Message: new perl Index: udunits.spec =================================================================== RCS file: /cvs/pkgs/rpms/udunits/devel/udunits.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- udunits.spec 20 Feb 2008 01:53:10 -0000 1.14 +++ udunits.spec 7 Mar 2008 02:22:54 -0000 1.15 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A library for manipulating units of physical quantities License: MIT Group: System Environment/Libraries @@ -127,6 +127,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.12.4-14 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.12.4-13 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:24 GMT Subject: rpms/perl-Text-Levenshtein/devel perl-Text-Levenshtein.spec, 1.4, 1.5 Message-ID: <200803070223.m272NOrO028435@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Levenshtein/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-Levenshtein/devel Modified Files: perl-Text-Levenshtein.spec Log Message: new perl Index: perl-Text-Levenshtein.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Levenshtein/devel/perl-Text-Levenshtein.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Text-Levenshtein.spec 2 Jan 2008 12:37:46 -0000 1.4 +++ perl-Text-Levenshtein.spec 7 Mar 2008 02:19:11 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Text-Levenshtein Version: 0.05 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Implementation of the Levenshtein edit distance License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.05-6 +Rebuild for new perl + * Wed Jan 02 2008 Ralf Cors??pius 0.05-5 - Adjust License-tag. - Add BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:24 GMT Subject: rpms/perl-CPANPLUS-Dist-Build/devel perl-CPANPLUS-Dist-Build.spec, 1.3, 1.4 Message-ID: <200803070223.m272NOle028438@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CPANPLUS-Dist-Build/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-CPANPLUS-Dist-Build/devel Modified Files: perl-CPANPLUS-Dist-Build.spec Log Message: new perl Index: perl-CPANPLUS-Dist-Build.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CPANPLUS-Dist-Build/devel/perl-CPANPLUS-Dist-Build.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-CPANPLUS-Dist-Build.spec 24 Oct 2007 16:42:05 -0000 1.3 +++ perl-CPANPLUS-Dist-Build.spec 7 Mar 2008 01:55:15 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-CPANPLUS-Dist-Build Version: 0.05 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Module::Build extension for CPANPLUS -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/CPANPLUS-Dist-Build/ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/CPANPLUS-Dist-Build-%{version}.tar.gz @@ -66,6 +66,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.05-4 +Rebuild for new perl + * Wed Oct 24 2007 Chris Weyl 0.05-3 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:24 GMT Subject: rpms/perl-RRD-Simple/devel perl-RRD-Simple.spec,1.7,1.8 Message-ID: <200803070223.m272NOAL028434@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-RRD-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-RRD-Simple/devel Modified Files: perl-RRD-Simple.spec Log Message: new perl Index: perl-RRD-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-RRD-Simple/devel/perl-RRD-Simple.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-RRD-Simple.spec 11 Jan 2008 05:54:03 -0000 1.7 +++ perl-RRD-Simple.spec 7 Mar 2008 02:15:50 -0000 1.8 @@ -1,10 +1,10 @@ Name: perl-RRD-Simple Version: 1.43 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple interface to create and store data in RRD files Group: Development/Libraries -License: Apache Software License +License: ASL 2.0 URL: http://search.cpan.org/dist/RRD-Simple Source0: http://search.cpan.org/CPAN/authors/id/N/NI/NICOLAW/RRD-Simple-%{version}.tar.gz @@ -66,6 +66,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.43-3 +Rebuild for new perl + * Fri Jan 11 2008 Ralf Cors??pius 1.43-2 - BR: perl(Test::More) (BZ 419631). - BR: perl(Test::Pod), perl(Test::Pod::Coverage). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:24 GMT Subject: rpms/swatch/devel swatch.spec,1.12,1.13 Message-ID: <200803070223.m272NOKW028439@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/swatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/swatch/devel Modified Files: swatch.spec Log Message: new perl Index: swatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/swatch/devel/swatch.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- swatch.spec 17 Oct 2007 05:00:41 -0000 1.12 +++ swatch.spec 7 Mar 2008 02:22:44 -0000 1.13 @@ -1,6 +1,6 @@ Name: swatch Version: 3.2.1 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Tool for actively monitoring log files Group: Applications/File @@ -70,6 +70,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 3.2.1-2.1 +Rebuild for new perl + * Wed Oct 17 2007 Tom "spot" Callaway - 3.2.1-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:24 GMT Subject: rpms/perl-POE-Component-Server-XMLRPC/devel perl-POE-Component-Server-XMLRPC.spec, 1.3, 1.4 Message-ID: <200803070223.m272NOdu028433@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-Server-XMLRPC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-POE-Component-Server-XMLRPC/devel Modified Files: perl-POE-Component-Server-XMLRPC.spec Log Message: new perl Index: perl-POE-Component-Server-XMLRPC.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-XMLRPC/devel/perl-POE-Component-Server-XMLRPC.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-POE-Component-Server-XMLRPC.spec 1 Sep 2006 04:20:31 -0000 1.3 +++ perl-POE-Component-Server-XMLRPC.spec 7 Mar 2008 02:14:18 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-POE-Component-Server-XMLRPC Version: 0.05 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Publish POE event handlers via XMLRPC over HTTP -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/POE-Component-Server-XMLRPC/ Source0: http://www.cpan.org/authors/id/M/MA/MAHEX/POE-Component-Server-XMLRPC-%{version}.tar.gz @@ -57,6 +57,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.05-4 +Rebuild for new perl + * Thu Aug 31 2006 Chris Weyl 0.05-3 - bump for mass rebuild From fedora-extras-commits at redhat.com Fri Mar 7 02:23:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:25 GMT Subject: rpms/perl-Test-Base/devel perl-Test-Base.spec,1.8,1.9 Message-ID: <200803070223.m272NPRH028454@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Test-Base/devel Modified Files: perl-Test-Base.spec Log Message: new perl Index: perl-Test-Base.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Base/devel/perl-Test-Base.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Test-Base.spec 7 Jul 2007 17:24:55 -0000 1.8 +++ perl-Test-Base.spec 7 Mar 2008 02:17:40 -0000 1.9 @@ -1,8 +1,8 @@ Name: perl-Test-Base Version: 0.54 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Data Driven Testing Framework -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-Base/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/Test-Base-%{version}.tar.gz @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.54-3 +Rebuild for new perl + * Sat Jul 07 2007 Steven Pritchard 0.54-2 - BR Test::More. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:25 GMT Subject: rpms/perl-Text-Diff-HTML/devel perl-Text-Diff-HTML.spec,1.1,1.2 Message-ID: <200803070223.m272NPWm028460@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Diff-HTML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-Diff-HTML/devel Modified Files: perl-Text-Diff-HTML.spec Log Message: new perl Index: perl-Text-Diff-HTML.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Diff-HTML/devel/perl-Text-Diff-HTML.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Text-Diff-HTML.spec 23 Jul 2007 21:49:03 -0000 1.1 +++ perl-Text-Diff-HTML.spec 7 Mar 2008 02:18:43 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-Text-Diff-HTML Version: 0.04 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XHTML format for Text::Diff::Unified -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-Diff-HTML/ Source0: http://www.cpan.org/authors/id/D/DW/DWHEELER/Text-Diff-HTML-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.04-3 +Rebuild for new perl + * Mon Jul 16 2007 Steven Pritchard 0.04-2 - Remove redundant explicity dependencies. - BR Test::More and Test::Pod. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-HTML-FormatText-WithLinks/devel perl-HTML-FormatText-WithLinks.spec, 1.6, 1.7 Message-ID: <200803070223.m272NZav028658@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTML-FormatText-WithLinks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-HTML-FormatText-WithLinks/devel Modified Files: perl-HTML-FormatText-WithLinks.spec Log Message: new perl Index: perl-HTML-FormatText-WithLinks.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-FormatText-WithLinks/devel/perl-HTML-FormatText-WithLinks.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-HTML-FormatText-WithLinks.spec 1 Mar 2008 12:50:04 -0000 1.6 +++ perl-HTML-FormatText-WithLinks.spec 7 Mar 2008 02:03:52 -0000 1.7 @@ -1,10 +1,10 @@ Name: perl-HTML-FormatText-WithLinks Version: 0.09 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML to text conversion with links as footnotes Group: Development/Libraries -License: Artistic or GPL+ +License: GPL+ or Artistic+ URL: http://search.cpan.org/dist/HTML-FormatText-WithLinks Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,6 +57,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.09-2 +Rebuild for new perl + * Wed Aug 8 2007 Patrice Dumas 0.09-1 - update to 0.09 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Text-Markdown/devel perl-Text-Markdown.spec,1.1,1.2 Message-ID: <200803070223.m272NZfW028647@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Markdown/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-Markdown/devel Modified Files: perl-Text-Markdown.spec Log Message: new perl Index: perl-Text-Markdown.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Markdown/devel/perl-Text-Markdown.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Text-Markdown.spec 4 Jul 2007 14:12:42 -0000 1.1 +++ perl-Text-Markdown.spec 7 Mar 2008 02:19:30 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Text-Markdown Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A text-to-HTML filter Group: Development/Libraries @@ -59,6 +59,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.0.3-4 +Rebuild for new perl + * Tue Jul 3 2007 Jeffrey C. Ollie - 1.0.3-3 - Fix license field. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:25 GMT Subject: rpms/perl-HTML-Encoding/devel perl-HTML-Encoding.spec,1.7,1.8 Message-ID: <200803070223.m272NPcY028459@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTML-Encoding/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-HTML-Encoding/devel Modified Files: perl-HTML-Encoding.spec Log Message: new perl Index: perl-HTML-Encoding.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Encoding/devel/perl-HTML-Encoding.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-HTML-Encoding.spec 6 Dec 2007 09:49:31 -0000 1.7 +++ perl-HTML-Encoding.spec 7 Mar 2008 02:03:43 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-HTML-Encoding Version: 0.56 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Determine the encoding of HTML/XML/XHTML documents Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.56-2 +Rebuild for new perl + * Thu Dec 6 2007 Ville Skytt?? - 0.56-1 - 0.56. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Nmap-Parser/devel perl-Nmap-Parser.spec,1.3,1.4 Message-ID: <200803070223.m272NZfm028651@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Nmap-Parser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Nmap-Parser/devel Modified Files: perl-Nmap-Parser.spec Log Message: new perl Index: perl-Nmap-Parser.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Nmap-Parser/devel/perl-Nmap-Parser.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Nmap-Parser.spec 24 Sep 2007 18:37:14 -0000 1.3 +++ perl-Nmap-Parser.spec 7 Mar 2008 02:12:57 -0000 1.4 @@ -1,10 +1,10 @@ Name: perl-Nmap-Parser Version: 1.05 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Parse nmap scan data with perl Group: Development/Libraries -License: GPL +License: GPLv2+ URL: http://search.cpan.org/dist/Nmap-Parser Source0: http://search.cpan.org/CPAN/authors/id/A/AP/APERSAUD/Nmap-Parser-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,6 +62,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.05-5 +Rebuild for new perl + * Mon Sep 24 2007 Jesse Keating - 1.05-4 - Bump release for upgrade path From fedora-extras-commits at redhat.com Fri Mar 7 02:23:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:33 GMT Subject: rpms/perl-Text-WrapI18N/devel perl-Text-WrapI18N.spec,1.3,1.4 Message-ID: <200803070223.m272NXmQ028627@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-WrapI18N/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-WrapI18N/devel Modified Files: perl-Text-WrapI18N.spec Log Message: new perl Index: perl-Text-WrapI18N.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-WrapI18N/devel/perl-Text-WrapI18N.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Text-WrapI18N.spec 17 Oct 2007 04:23:30 -0000 1.3 +++ perl-Text-WrapI18N.spec 7 Mar 2008 02:19:57 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Line wrapping with support for several locale setups Name: perl-Text-WrapI18N Version: 0.06 -Release: 2%{?dist}.2 +Release: 3%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-WrapI18N/ @@ -53,6 +53,9 @@ %{_mandir}/man3/Text::WrapI18N.3pm* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.06-3.2 +Rebuild for new perl + * Wed Oct 17 2007 Tom "spot" Callaway - 0.06-2.2 - add BR: perl(Test::Simple) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Net-GPSD/devel perl-Net-GPSD.spec,1.7,1.8 Message-ID: <200803070223.m272NZc5028653@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-GPSD/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-GPSD/devel Modified Files: perl-Net-GPSD.spec Log Message: new perl Index: perl-Net-GPSD.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-GPSD/devel/perl-Net-GPSD.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Net-GPSD.spec 19 Dec 2007 18:30:20 -0000 1.7 +++ perl-Net-GPSD.spec 7 Mar 2008 02:11:22 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Net-GPSD Version: 0.36 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Provides an object client interface to the gpsd server daemon Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.36-2 +Rebuild for new perl + * Wed Dec 19 2007 Tom "spot" Callaway - 0.36-1 - bump to 0.36 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:26 GMT Subject: rpms/perl-File-ExtAttr/devel perl-File-ExtAttr.spec,1.6,1.7 Message-ID: <200803070223.m272NQ0i028480@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-ExtAttr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-File-ExtAttr/devel Modified Files: perl-File-ExtAttr.spec Log Message: new perl Index: perl-File-ExtAttr.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-ExtAttr/devel/perl-File-ExtAttr.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-File-ExtAttr.spec 18 Feb 2008 23:14:01 -0000 1.6 +++ perl-File-ExtAttr.spec 7 Mar 2008 02:00:14 -0000 1.7 @@ -1,8 +1,8 @@ Name: perl-File-ExtAttr Version: 1.02 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl extension for accessing extended attributes of files -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/File-ExtAttr/ Source0: http://www.cpan.org/authors/id/R/RI/RICHDAWE/File-ExtAttr-%{version}.tar.gz @@ -65,6 +65,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.02-5 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 1.02-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Gnome2-Print/devel perl-Gnome2-Print.spec,1.5,1.6 Message-ID: <200803070223.m272NZtc028659@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gnome2-Print/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Gnome2-Print/devel Modified Files: perl-Gnome2-Print.spec Log Message: new perl Index: perl-Gnome2-Print.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gnome2-Print/devel/perl-Gnome2-Print.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Gnome2-Print.spec 18 Feb 2008 23:18:25 -0000 1.5 +++ perl-Gnome2-Print.spec 7 Mar 2008 02:02:31 -0000 1.6 @@ -1,8 +1,8 @@ Name: perl-Gnome2-Print Version: 1.000 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl wrappers for the Gnome Print utilities -License: LGPL +License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Gnome2-Print/ Source0: http://www.cpan.org/authors/id/E/EB/EBASSI/Gnome2-Print-%{version}.tar.gz @@ -55,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.000-5 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 1.000-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:26 GMT Subject: rpms/perl-Net-Telnet/devel perl-Net-Telnet.spec,1.9,1.10 Message-ID: <200803070223.m272NQex028476@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-Telnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-Telnet/devel Modified Files: perl-Net-Telnet.spec Log Message: new perl Index: perl-Net-Telnet.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Telnet/devel/perl-Net-Telnet.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Net-Telnet.spec 17 Oct 2007 02:08:02 -0000 1.9 +++ perl-Net-Telnet.spec 7 Mar 2008 02:12:43 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Net-Telnet Version: 3.03 -Release: 5.1 +Release: 6.1 Summary: Net-Telnet Perl module Group: Development/Libraries @@ -52,6 +52,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 3.03-6.1 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 3.03-5.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:20 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:20 GMT Subject: rpms/perl-POE-Component-SimpleLog/devel perl-POE-Component-SimpleLog.spec, 1.5, 1.6 Message-ID: <200803070223.m272NKhK028346@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-SimpleLog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-POE-Component-SimpleLog/devel Modified Files: perl-POE-Component-SimpleLog.spec Log Message: new perl Index: perl-POE-Component-SimpleLog.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-SimpleLog/devel/perl-POE-Component-SimpleLog.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-POE-Component-SimpleLog.spec 10 Jan 2008 06:04:32 -0000 1.5 +++ perl-POE-Component-SimpleLog.spec 7 Mar 2008 02:14:33 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-POE-Component-SimpleLog Version: 1.04 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simple logging system for POE Group: Development/Libraries @@ -65,6 +65,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.04-3 +Rebuild for new perl + * Thu Jan 10 2008 Ralf Cors??pius 1.04-2 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:26 GMT Subject: rpms/perl-Gtk2-Ex-Simple-List/devel perl-Gtk2-Ex-Simple-List.spec, 1.2, 1.3 Message-ID: <200803070223.m272NQ47028481@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-Simple-List/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Gtk2-Ex-Simple-List/devel Modified Files: perl-Gtk2-Ex-Simple-List.spec Log Message: new perl Index: perl-Gtk2-Ex-Simple-List.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-Simple-List/devel/perl-Gtk2-Ex-Simple-List.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Gtk2-Ex-Simple-List.spec 2 Dec 2006 18:33:16 -0000 1.2 +++ perl-Gtk2-Ex-Simple-List.spec 7 Mar 2008 02:03:15 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Gtk2-Ex-Simple-List Version: 0.50 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple interface to Gtk2's complex MVC list widget -License: LGPL +License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Gtk2-Ex-Simple-List/ Source0: http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl-Ex/Gtk2-Ex-Simple-List-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.50-3 +Rebuild for new perl + * Sat Dec 02 2006 Chris Weyl 0.50-2 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Net-NBName/devel perl-Net-NBName.spec,1.1,1.2 Message-ID: <200803070223.m272NZYm028652@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-NBName/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-NBName/devel Modified Files: perl-Net-NBName.spec Log Message: new perl Index: perl-Net-NBName.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-NBName/devel/perl-Net-NBName.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-NBName.spec 22 Jan 2008 21:46:15 -0000 1.1 +++ perl-Net-NBName.spec 7 Mar 2008 02:11:59 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Net-NBName Version: 0.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NetBIOS Name Service Requests License: GPL+ or Artistic Group: Development/Libraries @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.26-3 +Rebuild for new perl + * Fri Dec 28 2007 0.26-2 - Specfile autogenerated by cpanspec 1.74. - Added patch to include shebang in nodescan.pl, nodestat.pl and namequery.pl. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:26 GMT Subject: rpms/perl-Astro-FITS-CFITSIO/devel perl-Astro-FITS-CFITSIO.spec, 1.3, 1.4 Message-ID: <200803070223.m272NQf2028478@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Astro-FITS-CFITSIO/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Astro-FITS-CFITSIO/devel Modified Files: perl-Astro-FITS-CFITSIO.spec Log Message: new perl Index: perl-Astro-FITS-CFITSIO.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Astro-FITS-CFITSIO/devel/perl-Astro-FITS-CFITSIO.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Astro-FITS-CFITSIO.spec 9 Feb 2008 18:18:00 -0000 1.3 +++ perl-Astro-FITS-CFITSIO.spec 7 Mar 2008 01:54:15 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Astro-FITS-CFITSIO Version: 1.05 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl extension for using the cfitsio library License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.05-4 +Rebuild for new perl + * Sat Feb 9 2008 Orion Poplawski 1.05-3 - Rebuild for gcc 3.4 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:36 GMT Subject: rpms/perl-WWW-Babelfish/devel perl-WWW-Babelfish.spec,1.4,1.5 Message-ID: <200803070223.m272NaF0028692@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-WWW-Babelfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-WWW-Babelfish/devel Modified Files: perl-WWW-Babelfish.spec Log Message: new perl Index: perl-WWW-Babelfish.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-WWW-Babelfish/devel/perl-WWW-Babelfish.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-WWW-Babelfish.spec 17 Oct 2007 04:34:51 -0000 1.4 +++ perl-WWW-Babelfish.spec 7 Mar 2008 02:20:58 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-WWW-Babelfish Version: 0.16 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Perl extension for translation via Babelfish or Google License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.16-2.1 +Rebuild for new perl + * Wed Oct 17 2007 Tom "spot" Callaway 0.16-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:29 GMT Subject: rpms/perl-Kwiki-Users-Remote/devel perl-Kwiki-Users-Remote.spec, 1.5, 1.6 Message-ID: <200803070223.m272NTVd028543@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-Users-Remote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Kwiki-Users-Remote/devel Modified Files: perl-Kwiki-Users-Remote.spec Log Message: new perl Index: perl-Kwiki-Users-Remote.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-Users-Remote/devel/perl-Kwiki-Users-Remote.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Kwiki-Users-Remote.spec 9 Jan 2008 13:06:57 -0000 1.5 +++ perl-Kwiki-Users-Remote.spec 7 Mar 2008 02:07:09 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Kwiki-Users-Remote Version: 0.04 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Automatically set Kwiki user name from HTTP authentication License: GPL+ or Artistic Group: Development/Libraries @@ -65,6 +65,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.04-6 +Rebuild for new perl + * Wed Jan 09 2008 Ralf Cors??pius 0.04-5 - Update License tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:26 GMT Subject: rpms/perl-Gtk2-Ex-CalendarButton/devel perl-Gtk2-Ex-CalendarButton.spec, 1.2, 1.3 Message-ID: <200803070223.m272NQii028479@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-CalendarButton/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Gtk2-Ex-CalendarButton/devel Modified Files: perl-Gtk2-Ex-CalendarButton.spec Log Message: new perl Index: perl-Gtk2-Ex-CalendarButton.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-CalendarButton/devel/perl-Gtk2-Ex-CalendarButton.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Gtk2-Ex-CalendarButton.spec 18 Aug 2007 19:03:14 -0000 1.2 +++ perl-Gtk2-Ex-CalendarButton.spec 7 Mar 2008 02:02:51 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Gtk2-Ex-CalendarButton Version: 0.01 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Gtk2::Ex::CalendarButton Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -58,6 +58,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.01-5 +Rebuild for new perl + * Sat Aug 18 2007 Chris Weyl 0.01-4 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:36 GMT Subject: rpms/perl-Cache-Mmap/devel perl-Cache-Mmap.spec,1.4,1.5 Message-ID: <200803070223.m272Na2M028687@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Cache-Mmap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Cache-Mmap/devel Modified Files: perl-Cache-Mmap.spec Log Message: new perl Index: perl-Cache-Mmap.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Cache-Mmap/devel/perl-Cache-Mmap.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Cache-Mmap.spec 20 Feb 2008 02:50:44 -0000 1.4 +++ perl-Cache-Mmap.spec 7 Mar 2008 01:55:24 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Cache-Mmap Version: 0.09 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Shared data cache using memory mapped files License: GPL+ or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.09-5 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.09-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:37 GMT Subject: rpms/perl-Razor-Agent/devel perl-Razor-Agent.spec,1.16,1.17 Message-ID: <200803070223.m272NbnF028710@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Razor-Agent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Razor-Agent/devel Modified Files: perl-Razor-Agent.spec Log Message: new perl Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Razor-Agent.spec 10 Feb 2008 15:34:48 -0000 1.16 +++ perl-Razor-Agent.spec 7 Mar 2008 02:15:54 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Use a Razor catalogue server to filter spam messages Name: perl-Razor-Agent Version: 2.84 -Release: 3%{?dist} +Release: 4%{?dist} License: Artistic Group: Applications/Internet URL: http://razor.sourceforge.net/ @@ -74,6 +74,9 @@ %{_mandir}/man*/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.84-4 +Rebuild for new perl + * Sun Feb 10 2008 Robert Scheck 2.84-3 - Rebuilt against gcc 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:27 GMT Subject: rpms/perl-PatchReader/devel perl-PatchReader.spec,1.5,1.6 Message-ID: <200803070223.m272NRQV028501@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-PatchReader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-PatchReader/devel Modified Files: perl-PatchReader.spec Log Message: new perl Index: perl-PatchReader.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PatchReader/devel/perl-PatchReader.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-PatchReader.spec 17 Oct 2007 02:34:17 -0000 1.5 +++ perl-PatchReader.spec 7 Mar 2008 02:14:52 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-PatchReader Version: 0.9.5 -Release: 4%{?dist}.2 +Release: 5%{?dist} Summary: Utilities to read and manipulate patches and CVS Group: Development/Libraries @@ -63,6 +63,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.9.5-5.2 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 0.9.5-4.2 - add BR: perl(Test::Simple) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:27 GMT Subject: rpms/perl-MogileFS-Utils/devel perl-MogileFS-Utils.spec,1.2,1.3 Message-ID: <200803070223.m272NRjq028500@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MogileFS-Utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-MogileFS-Utils/devel Modified Files: perl-MogileFS-Utils.spec Log Message: new perl Index: perl-MogileFS-Utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MogileFS-Utils/devel/perl-MogileFS-Utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MogileFS-Utils.spec 9 Aug 2007 21:29:46 -0000 1.2 +++ perl-MogileFS-Utils.spec 7 Mar 2008 02:10:50 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-MogileFS-Utils Version: 2.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities for MogileFS -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MogileFS-Utils/ Source0: http://search.cpan.org/CPAN/authors/id/B/BR/BRADFITZ/MogileFS-Utils-%{version}.tar.gz @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.12-2 +Rebuild for new perl + * Thu Aug 09 2007 Ruben Kerkhof 2.12-1 - Upstream released new version * Wed Jun 20 2007 Ruben Kerkhof 2.11-1 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:28 GMT Subject: rpms/perl-Net-eBay/devel perl-Net-eBay.spec,1.1,1.2 Message-ID: <200803070223.m272NSM7028521@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-eBay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-eBay/devel Modified Files: perl-Net-eBay.spec Log Message: new perl Index: perl-Net-eBay.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-eBay/devel/perl-Net-eBay.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-eBay.spec 5 Feb 2008 19:57:44 -0000 1.1 +++ perl-Net-eBay.spec 7 Mar 2008 02:12:52 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Net-eBay Version: 0.46 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl Interface to XML based eBay API @@ -67,6 +67,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.46-2 +Rebuild for new perl + * Mon Feb 04 2008 Xavier Bachelot - 0.46-1 - New upstream version. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:37 GMT Subject: rpms/perl-Class-Std/devel perl-Class-Std.spec,1.2,1.3 Message-ID: <200803070223.m272Nblc028709@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Std/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Class-Std/devel Modified Files: perl-Class-Std.spec Log Message: new perl Index: perl-Class-Std.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Std/devel/perl-Class-Std.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Std.spec 21 Jan 2008 08:47:51 -0000 1.2 +++ perl-Class-Std.spec 7 Mar 2008 01:56:31 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Class-Std Version: 0.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for creating standard "inside-out" classes License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.0.8-3 +Rebuild for new perl + * Sun Jan 20 2008 Andreas Thienemann - 0.0.8-2 - Added changed BuildReqs to handle changed Perl packaging in fedora (bz - Detailed License to specify "GPL2 or later" clause From fedora-extras-commits at redhat.com Fri Mar 7 02:23:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:39 GMT Subject: rpms/perl-Text-Format/devel perl-Text-Format.spec,1.1,1.2 Message-ID: <200803070223.m272NdlZ028746@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-Format/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-Format/devel Modified Files: perl-Text-Format.spec Log Message: new perl Index: perl-Text-Format.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-Format/devel/perl-Text-Format.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Text-Format.spec 1 Feb 2008 22:18:22 -0000 1.1 +++ perl-Text-Format.spec 7 Mar 2008 02:18:55 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Text-Format Version: 0.52 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Various subroutines to format text Group: Development/Libraries @@ -59,5 +59,8 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.52-2 +Rebuild for new perl + * Fri Feb 01 2008 Xavier Bachelot - 0.52-1 - Initial build. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:37 GMT Subject: rpms/perl-JSON-XS/devel perl-JSON-XS.spec,1.7,1.8 Message-ID: <200803070223.m272NbZm028712@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-JSON-XS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-JSON-XS/devel Modified Files: perl-JSON-XS.spec Log Message: new perl Index: perl-JSON-XS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-JSON-XS/devel/perl-JSON-XS.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-JSON-XS.spec 18 Feb 2008 23:26:09 -0000 1.7 +++ perl-JSON-XS.spec 7 Mar 2008 02:05:27 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-JSON-XS Version: 1.52 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JSON serialising/deserialising, done correctly and fast License: GPL+ or Artistic Group: Development/Libraries @@ -56,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.52-3 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 1.52-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:22 GMT Subject: rpms/perl-DateTime-Format-Oracle/devel perl-DateTime-Format-Oracle.spec, 1.2, 1.3 Message-ID: <200803070223.m272NMHr028392@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DateTime-Format-Oracle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-DateTime-Format-Oracle/devel Modified Files: perl-DateTime-Format-Oracle.spec Log Message: new perl Index: perl-DateTime-Format-Oracle.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Oracle/devel/perl-DateTime-Format-Oracle.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DateTime-Format-Oracle.spec 2 Feb 2008 01:35:15 -0000 1.2 +++ perl-DateTime-Format-Oracle.spec 7 Mar 2008 01:59:16 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-DateTime-Format-Oracle Version: 0.03 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parse and format Oracle dates and timestamps License: GPL+ or Artistic Group: Development/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.03-3 +Rebuild for new perl + * Fri Feb 01 2008 Chris Weyl 0.03-2 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:33 GMT Subject: rpms/perl-File-Find-Rule-PPI/devel perl-File-Find-Rule-PPI.spec, 1.4, 1.5 Message-ID: <200803070223.m272NXG2028625@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-Find-Rule-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-File-Find-Rule-PPI/devel Modified Files: perl-File-Find-Rule-PPI.spec Log Message: new perl Index: perl-File-Find-Rule-PPI.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Find-Rule-PPI/devel/perl-File-Find-Rule-PPI.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-File-Find-Rule-PPI.spec 28 Nov 2007 18:32:39 -0000 1.4 +++ perl-File-Find-Rule-PPI.spec 7 Mar 2008 02:00:26 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-File-Find-Rule-PPI Version: 0.05 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Add support for PPI queries to File::Find::Rule Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.05-2 +Rebuild for new perl + * Sun Sep 10 2006 Jose Pedro Oliveira - 0.05-1 - Update to 0.05. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:37 GMT Subject: rpms/perl-Text-WordDiff/devel perl-Text-WordDiff.spec,1.1,1.2 Message-ID: <200803070223.m272Nbdv028708@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-WordDiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-WordDiff/devel Modified Files: perl-Text-WordDiff.spec Log Message: new perl Index: perl-Text-WordDiff.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-WordDiff/devel/perl-Text-WordDiff.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Text-WordDiff.spec 23 Jul 2007 21:53:03 -0000 1.1 +++ perl-Text-WordDiff.spec 7 Mar 2008 02:19:47 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-Text-WordDiff Version: 0.02 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Track changes between documents -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-WordDiff/ Source0: http://www.cpan.org/authors/id/D/DW/DWHEELER/Text-WordDiff-%{version}.tar.gz @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.02-3 +Rebuild for new perl + * Mon Jul 16 2007 Steven Pritchard 0.02-2 - BR Test::More and Test::Pod. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:27 GMT Subject: rpms/perl-YAML-Parser-Syck/devel perl-YAML-Parser-Syck.spec, 1.7, 1.8 Message-ID: <200803070223.m272NRMm028499@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-YAML-Parser-Syck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-YAML-Parser-Syck/devel Modified Files: perl-YAML-Parser-Syck.spec Log Message: new perl Index: perl-YAML-Parser-Syck.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-YAML-Parser-Syck/devel/perl-YAML-Parser-Syck.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-YAML-Parser-Syck.spec 20 Feb 2008 03:06:14 -0000 1.7 +++ perl-YAML-Parser-Syck.spec 7 Mar 2008 02:21:52 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-YAML-Parser-Syck Version: 0.01 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Perl Wrapper for the YAML Parser Extension: libsyck License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.01-11 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.01-10 - Autorebuild for GCC 4.3 @@ -76,7 +79,7 @@ - Remove pkgname macro for clarity - Remove redundant BR: perl - More specific URL -- License is same as perl (GPL or Artistic), not just Artistic +- License is same as perl (GPL+ or Artistic), not just Artistic - Add BR: syck-devel - Tidy summary - Remove redundant "|| :" from %%check From fedora-extras-commits at redhat.com Fri Mar 7 02:23:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:27 GMT Subject: rpms/perl-MARC-Record/devel perl-MARC-Record.spec,1.3,1.4 Message-ID: <200803070223.m272NRdm028503@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MARC-Record/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-MARC-Record/devel Modified Files: perl-MARC-Record.spec Log Message: new perl Index: perl-MARC-Record.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MARC-Record/devel/perl-MARC-Record.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-MARC-Record.spec 28 Nov 2007 18:32:59 -0000 1.3 +++ perl-MARC-Record.spec 7 Mar 2008 02:08:17 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-MARC-Record Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Object-oriented abstraction of MARC record handling Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.0.0-2 +Rebuild for new perl + * Tue Jan 30 2007 Jose Pedro Oliveira - 2.0.0-1 - Update to 2.0.0. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:29 GMT Subject: rpms/perl-Proc-Daemon/devel perl-Proc-Daemon.spec,1.3,1.4 Message-ID: <200803070223.m272NTg2028546@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Proc-Daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Proc-Daemon/devel Modified Files: perl-Proc-Daemon.spec Log Message: new perl Index: perl-Proc-Daemon.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Proc-Daemon/devel/perl-Proc-Daemon.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Proc-Daemon.spec 17 Oct 2007 02:40:23 -0000 1.3 +++ perl-Proc-Daemon.spec 7 Mar 2008 02:15:25 -0000 1.4 @@ -2,7 +2,7 @@ Name: perl-Proc-Daemon Version: 0.03 -Release: 1%{?dist}.2 +Release: 2%{?dist} Summary: Run Perl program as a daemon process Group: Development/Libraries @@ -52,6 +52,9 @@ %{perl_vendorlib}/Proc %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.03-2.2 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway 0.03-1.2 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:28 GMT Subject: rpms/perl-MasonX-Interp-WithCallbacks/devel perl-MasonX-Interp-WithCallbacks.spec, 1.2, 1.3 Message-ID: <200803070223.m272NS1N028524@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-MasonX-Interp-WithCallbacks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-MasonX-Interp-WithCallbacks/devel Modified Files: perl-MasonX-Interp-WithCallbacks.spec Log Message: new perl Index: perl-MasonX-Interp-WithCallbacks.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MasonX-Interp-WithCallbacks/devel/perl-MasonX-Interp-WithCallbacks.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MasonX-Interp-WithCallbacks.spec 27 Jul 2007 18:56:25 -0000 1.2 +++ perl-MasonX-Interp-WithCallbacks.spec 7 Mar 2008 02:09:51 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-MasonX-Interp-WithCallbacks Version: 1.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mason callback support via Params::CallbackRequest -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MasonX-Interp-WithCallbacks/ Source0: http://www.cpan.org/authors/id/D/DW/DWHEELER/MasonX-Interp-WithCallbacks-%{version}.tar.gz @@ -58,6 +58,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.17-2 +Rebuild for new perl + * Fri Jul 27 2007 Steven Pritchard 1.17-1 - Update to 1.17. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:28 GMT Subject: rpms/perl-Crypt-Simple/devel perl-Crypt-Simple.spec,1.2,1.3 Message-ID: <200803070223.m272NSLd028525@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Crypt-Simple/devel Modified Files: perl-Crypt-Simple.spec Log Message: new perl Index: perl-Crypt-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-Simple/devel/perl-Crypt-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Crypt-Simple.spec 9 Jul 2007 18:36:02 -0000 1.2 +++ perl-Crypt-Simple.spec 7 Mar 2008 01:57:54 -0000 1.3 @@ -1,10 +1,10 @@ Name: perl-Crypt-Simple Version: 0.06 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Encrypt stuff simply Group: Development/Libraries -License: GPL +License: GPLv2+ URL: http://search.cpan.org/dist/Crypt-Simple/ Source0: http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Crypt-Simple-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +65,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.06-5 +Rebuild for new perl + * Mon Jul 9 2007 Allisson Azevedo 0.06-4 - Add exception for FC-6 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:30 GMT Subject: rpms/perl-Net-SNPP/devel perl-Net-SNPP.spec,1.4,1.5 Message-ID: <200803070223.m272NUgt028565@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-SNPP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-SNPP/devel Modified Files: perl-Net-SNPP.spec Log Message: new perl Index: perl-Net-SNPP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SNPP/devel/perl-Net-SNPP.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Net-SNPP.spec 28 Sep 2007 02:29:34 -0000 1.4 +++ perl-Net-SNPP.spec 7 Mar 2008 02:12:24 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Net-SNPP Version: 1.17 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl modules for the Simple Network Pager Protocol Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.17-6 +Rebuild for new perl + * Thu Sep 27 2007 Jeffrey C. Ollie - 1.17-5 - More BR fixes. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:45 GMT Subject: rpms/perl-Pod-Simple/devel perl-Pod-Simple.spec,1.12,1.13 Message-ID: <200803070223.m272Nj7a028832@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Pod-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Pod-Simple/devel Modified Files: perl-Pod-Simple.spec Log Message: new perl Index: perl-Pod-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Pod-Simple/devel/perl-Pod-Simple.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Pod-Simple.spec 17 Oct 2007 02:36:27 -0000 1.12 +++ perl-Pod-Simple.spec 7 Mar 2008 02:15:07 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-Pod-Simple Version: 3.05 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Framework for parsing POD documentation Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 3.05-2.1 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 3.05-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:41 GMT Subject: rpms/perl-WWW-Bugzilla/devel perl-WWW-Bugzilla.spec,1.3,1.4 Message-ID: <200803070223.m272NfZ4028792@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-WWW-Bugzilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-WWW-Bugzilla/devel Modified Files: perl-WWW-Bugzilla.spec Log Message: new perl Index: perl-WWW-Bugzilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-WWW-Bugzilla/devel/perl-WWW-Bugzilla.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-WWW-Bugzilla.spec 17 Oct 2007 04:36:35 -0000 1.3 +++ perl-WWW-Bugzilla.spec 7 Mar 2008 02:21:03 -0000 1.4 @@ -6,7 +6,7 @@ Name: perl-WWW-Bugzilla Version: 0.9 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Handles submission/update of bugzilla bugs via WWW::Mechanize Group: Development/Libraries @@ -62,6 +62,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.9-2.1 +Rebuild for new perl + * Wed Oct 17 2007 Tom "spot" Callaway - 0.9-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:30 GMT Subject: rpms/perl-Data-Password/devel perl-Data-Password.spec,1.2,1.3 Message-ID: <200803070223.m272NU1u028562@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Data-Password/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Data-Password/devel Modified Files: perl-Data-Password.spec Log Message: new perl Index: perl-Data-Password.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-Password/devel/perl-Data-Password.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Data-Password.spec 27 Jan 2008 21:44:25 -0000 1.2 +++ perl-Data-Password.spec 7 Mar 2008 01:58:55 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Data-Password Version: 1.07 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl extension for assesing password quality License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.07-3 +Rebuild for new perl + * Sun Jan 27 2008 Andreas Thienemann 1.07-2 - Added Test::More to the BuildReqs From fedora-extras-commits at redhat.com Fri Mar 7 02:23:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:29 GMT Subject: rpms/perl-X11-Protocol/devel perl-X11-Protocol.spec,1.6,1.7 Message-ID: <200803070223.m272NTNM028545@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-X11-Protocol/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-X11-Protocol/devel Modified Files: perl-X11-Protocol.spec Log Message: new perl Index: perl-X11-Protocol.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-X11-Protocol/devel/perl-X11-Protocol.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-X11-Protocol.spec 18 Sep 2007 17:34:02 -0000 1.6 +++ perl-X11-Protocol.spec 7 Mar 2008 02:21:11 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-X11-Protocol Version: 0.56 -Release: 1%{?dist} +Release: 2%{?dist} Summary: X11-Protocol - Raw interface to X Window System servers Group: Development/Libraries @@ -70,6 +70,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.56-2 +Rebuild for new perl + * Tue Sep 18 2007 Patrick "Jima" Laughton 0.56-1 - New upstream release (bugfix) - Added BR for perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:38 GMT Subject: rpms/perl-Net-SSH2/devel perl-Net-SSH2.spec,1.3,1.4 Message-ID: <200803070223.m272NcQI028730@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-SSH2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-SSH2/devel Modified Files: perl-Net-SSH2.spec Log Message: new perl Index: perl-Net-SSH2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SSH2/devel/perl-Net-SSH2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Net-SSH2.spec 18 Feb 2008 23:30:47 -0000 1.3 +++ perl-Net-SSH2.spec 7 Mar 2008 02:12:30 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Net-SSH2 Version: 0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Support for the SSH 2 protocol via libSSH2 License: GPL+ or Artistic Group: Development/Libraries @@ -62,6 +62,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.18-4 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.18-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:40 GMT Subject: rpms/perl-SQL-Library/devel perl-SQL-Library.spec,1.4,1.5 Message-ID: <200803070223.m272NeMH028770@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SQL-Library/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-SQL-Library/devel Modified Files: perl-SQL-Library.spec Log Message: new perl Index: perl-SQL-Library.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SQL-Library/devel/perl-SQL-Library.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-SQL-Library.spec 17 Oct 2007 03:29:11 -0000 1.4 +++ perl-SQL-Library.spec 7 Mar 2008 02:16:29 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-SQL-Library Version: 0.0.3 -Release: 2%{?dist}.2 +Release: 3%{?dist} Summary: Manage libraries of SQL easily License: GPL+ or Artistic Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.0.3-3.2 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 0.0.3-2.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:30 GMT Subject: rpms/perl-DBI-Dumper/devel perl-DBI-Dumper.spec,1.5,1.6 Message-ID: <200803070223.m272NUGr028564@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBI-Dumper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-DBI-Dumper/devel Modified Files: perl-DBI-Dumper.spec Log Message: new perl Index: perl-DBI-Dumper.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBI-Dumper/devel/perl-DBI-Dumper.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-DBI-Dumper.spec 18 Feb 2008 23:10:19 -0000 1.5 +++ perl-DBI-Dumper.spec 7 Mar 2008 01:58:21 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-DBI-Dumper Version: 2.01 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Dump data from a DBI datasource to file # see http://rt.cpan.org/Public/Bug/Display.html?id=27269 License: GPL+ or Artistic @@ -78,6 +78,9 @@ %{_mandir}/man[13]/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.01-6 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 2.01-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:22 GMT Subject: rpms/perl-XML-Xerces/devel perl-XML-Xerces.spec,1.3,1.4 Message-ID: <200803070223.m272NMSx028395@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Xerces/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-XML-Xerces/devel Modified Files: perl-XML-Xerces.spec Log Message: new perl Index: perl-XML-Xerces.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Xerces/devel/perl-XML-Xerces.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-XML-Xerces.spec 20 Feb 2008 07:01:26 -0000 1.3 +++ perl-XML-Xerces.spec 7 Mar 2008 02:21:46 -0000 1.4 @@ -3,7 +3,7 @@ Name: perl-XML-Xerces Version: %{ver}_%{PatchLevel} -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl API to Xerces XML parser Group: Development/Libraries @@ -71,6 +71,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.7.0_0-7 +Rebuild for new perl + * Wed Feb 20 2008 Fedora Release Engineering - 2.7.0_0-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:42 GMT Subject: rpms/perl-POE-Component-DBIAgent/devel perl-POE-Component-DBIAgent.spec, 1.3, 1.4 Message-ID: <200803070223.m272NgA5028806@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-DBIAgent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-POE-Component-DBIAgent/devel Modified Files: perl-POE-Component-DBIAgent.spec Log Message: new perl Index: perl-POE-Component-DBIAgent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-DBIAgent/devel/perl-POE-Component-DBIAgent.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-POE-Component-DBIAgent.spec 5 Oct 2006 20:50:49 -0000 1.3 +++ perl-POE-Component-DBIAgent.spec 7 Mar 2008 02:13:43 -0000 1.4 @@ -1,9 +1,9 @@ Name: perl-POE-Component-DBIAgent Version: 0.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: POE Component for running asynchronous DBI calls # see tail of DBIAgent.pm -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/POE-Component-DBIAgent/ Source0: http://www.cpan.org/authors/id/R/RD/RDB/POE-Component-DBIAgent-%{version}.tar.gz @@ -56,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.26-3 +Rebuild for new perl + * Thu Oct 05 2006 Chris Weyl 0.26-2 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:25 GMT Subject: rpms/perl-Time-Period/devel perl-Time-Period.spec,1.2,1.3 Message-ID: <200803070223.m272NPnS028458@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Time-Period/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Time-Period/devel Modified Files: perl-Time-Period.spec Log Message: new perl Index: perl-Time-Period.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Time-Period/devel/perl-Time-Period.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Time-Period.spec 17 Oct 2007 04:21:37 -0000 1.2 +++ perl-Time-Period.spec 7 Mar 2008 02:20:20 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Time-Period Version: 1.20 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: A Perl module to deal with time periods Group: Development/Libraries @@ -51,6 +51,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.20-2.1 +Rebuild for new perl + * Wed Oct 17 2007 Tom "spot" Callaway 1.20-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:33 GMT Subject: rpms/perl-Net-CIDR-Lite/devel perl-Net-CIDR-Lite.spec,1.6,1.7 Message-ID: <200803070223.m272NXKO028628@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-CIDR-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-CIDR-Lite/devel Modified Files: perl-Net-CIDR-Lite.spec Log Message: new perl Index: perl-Net-CIDR-Lite.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-CIDR-Lite/devel/perl-Net-CIDR-Lite.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Net-CIDR-Lite.spec 18 Apr 2007 15:33:25 -0000 1.6 +++ perl-Net-CIDR-Lite.spec 7 Mar 2008 02:10:56 -0000 1.7 @@ -1,8 +1,8 @@ Name: perl-Net-CIDR-Lite Version: 0.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Net::CIDR::Lite Perl module -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-CIDR-Lite/ Source0: http://www.cpan.org/authors/id/D/DO/DOUGW/Net-CIDR-Lite-%{version}.tar.gz @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.20-4 +Rebuild for new perl + * Wed Apr 18 2007 Steven Pritchard 0.20-3 - Use fixperms macro instead of our own chmod incantation. - BR ExtUtils::MakeMaker. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:31 GMT Subject: rpms/perl-Gtk2-Ex-Carp/devel perl-Gtk2-Ex-Carp.spec,1.2,1.3 Message-ID: <200803070223.m272NVPO028587@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-Carp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Gtk2-Ex-Carp/devel Modified Files: perl-Gtk2-Ex-Carp.spec Log Message: new perl Index: perl-Gtk2-Ex-Carp.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-Carp/devel/perl-Gtk2-Ex-Carp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Gtk2-Ex-Carp.spec 26 Mar 2007 17:37:03 -0000 1.2 +++ perl-Gtk2-Ex-Carp.spec 7 Mar 2008 02:02:56 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Gtk2-Ex-Carp Version: 0.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GTK+ friendly die() and warn() functions -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Gtk2-Ex-Carp/ Source0: http://www.cpan.org/authors/id/G/GB/GBROWN/Gtk2-Ex-Carp-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.01-4 +Rebuild for new perl + * Mon Mar 26 2007 Chris Weyl 0.01-3 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:33 GMT Subject: rpms/uuid/devel uuid.spec,1.11,1.12 Message-ID: <200803070223.m272NXbD028629@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/uuid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/uuid/devel Modified Files: uuid.spec Log Message: new perl Index: uuid.spec =================================================================== RCS file: /cvs/pkgs/rpms/uuid/devel/uuid.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- uuid.spec 6 Mar 2008 17:50:23 -0000 1.11 +++ uuid.spec 7 Mar 2008 02:22:59 -0000 1.12 @@ -1,6 +1,6 @@ Name: uuid Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries @@ -235,6 +235,9 @@ %{_libdir}/libossp-uuid_dce.so %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.6.1-3 +Rebuild for new perl + * Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-2 - forgot to cvs add patch From fedora-extras-commits at redhat.com Fri Mar 7 02:23:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:32 GMT Subject: rpms/perl-Gnome2-GConf/devel perl-Gnome2-GConf.spec,1.8,1.9 Message-ID: <200803070223.m272NW44028605@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gnome2-GConf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Gnome2-GConf/devel Modified Files: perl-Gnome2-GConf.spec Log Message: new perl Index: perl-Gnome2-GConf.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gnome2-GConf/devel/perl-Gnome2-GConf.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Gnome2-GConf.spec 18 Feb 2008 23:17:32 -0000 1.8 +++ perl-Gnome2-GConf.spec 7 Mar 2008 02:02:21 -0000 1.9 @@ -1,15 +1,14 @@ Name: perl-Gnome2-GConf Version: 1.044 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl wrappers for the GConf configuration engine -License: LGPL +License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Gnome2-GConf/ Source0: http://www.cpan.org/modules/by-module/Gnome2/Gnome2-GConf-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## core -BuildRequires: perl BuildRequires: perl(Test::More) ## non-core BuildRequires: perl(Glib) >= 1.120, GConf2 @@ -68,6 +67,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.044-3 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 1.044-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:30 GMT Subject: rpms/perl-Gtk2-Notify/devel perl-Gtk2-Notify.spec,1.6,1.7 Message-ID: <200803070223.m272NU7k028566@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-Notify/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Gtk2-Notify/devel Modified Files: perl-Gtk2-Notify.spec Log Message: new perl Index: perl-Gtk2-Notify.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-Notify/devel/perl-Gtk2-Notify.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Gtk2-Notify.spec 18 Feb 2008 23:21:12 -0000 1.6 +++ perl-Gtk2-Notify.spec 7 Mar 2008 02:03:26 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Gtk2-Notify Version: 0.04 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl interface to libnotify License: LGPLv2+ Group: Development/Libraries @@ -66,6 +66,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.04-3 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.04-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:18 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:18 GMT Subject: rpms/p0rn-comfort/devel p0rn-comfort.spec,1.3,1.4 Message-ID: <200803070223.m272NIVP028301@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/p0rn-comfort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/p0rn-comfort/devel Modified Files: p0rn-comfort.spec Log Message: new perl Index: p0rn-comfort.spec =================================================================== RCS file: /cvs/pkgs/rpms/p0rn-comfort/devel/p0rn-comfort.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- p0rn-comfort.spec 10 Sep 2006 21:27:46 -0000 1.3 +++ p0rn-comfort.spec 7 Mar 2008 01:53:41 -0000 1.4 @@ -1,8 +1,8 @@ Name: p0rn-comfort Version: 0.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Support programs for browsing image-gallery sites -License: GPL +License: GPL+ Group: Applications/Internet URL: http://www.cgarbs.de/p0rn-comfort.en.html Source0: http://www.cgarbs.de/stuff/p0rn-comfort-%{version}.tar.gz @@ -70,6 +70,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.0.4-5 +Rebuild for new perl + * Sun Sep 10 2006 Andreas Thienemann 0.0.4-4 - *bump* From fedora-extras-commits at redhat.com Fri Mar 7 02:23:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:41 GMT Subject: rpms/perl-PDF-API2/devel perl-PDF-API2.spec,1.9,1.10 Message-ID: <200803070223.m272NfF1028803@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-PDF-API2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-PDF-API2/devel Modified Files: perl-PDF-API2.spec Log Message: new perl Index: perl-PDF-API2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PDF-API2/devel/perl-PDF-API2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-PDF-API2.spec 22 Jan 2008 03:07:42 -0000 1.9 +++ perl-PDF-API2.spec 7 Mar 2008 02:13:28 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-PDF-API2 Version: 0.69 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module for creation and modification of PDF files Group: System Environment/Libraries @@ -121,6 +121,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.69-3 +Rebuild for new perl + * Mon Jan 21 2008 Bernard Johnson - 0.69-2 - patch .orig files packaged (bz #427762) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:32 GMT Subject: rpms/perl-Config-Simple/devel perl-Config-Simple.spec,1.1,1.2 Message-ID: <200803070223.m272NWBu028608@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Config-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Config-Simple/devel Modified Files: perl-Config-Simple.spec Log Message: new perl Index: perl-Config-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Config-Simple/devel/perl-Config-Simple.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Config-Simple.spec 24 Dec 2007 21:01:09 -0000 1.1 +++ perl-Config-Simple.spec 7 Mar 2008 01:56:56 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Config-Simple Version: 4.59 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple configuration file class Group: Development/Libraries @@ -52,6 +52,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 4.59-3 +Rebuild for new perl + * Sun Dec 23 2007 Rafa?? Psota 4.59-2 - License tag fix - Source0 fix From fedora-extras-commits at redhat.com Fri Mar 7 02:23:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:33 GMT Subject: rpms/perl-Module-Locate/devel perl-Module-Locate.spec,1.3,1.4 Message-ID: <200803070223.m272NXq3028631@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Module-Locate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Module-Locate/devel Modified Files: perl-Module-Locate.spec Log Message: new perl Index: perl-Module-Locate.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Module-Locate/devel/perl-Module-Locate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Module-Locate.spec 16 Oct 2007 21:38:22 -0000 1.3 +++ perl-Module-Locate.spec 7 Mar 2008 02:10:28 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Module-Locate Version: 1.7 -Release: 1%{?dist}.2 +Release: 2%{?dist} Summary: Locate modules in the same fashion as "require" and "use" Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.7-2.2 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 1.7-1.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:41 GMT Subject: rpms/perl-PBS/devel perl-PBS.spec,1.5,1.6 Message-ID: <200803070223.m272NfVD028794@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-PBS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-PBS/devel Modified Files: perl-PBS.spec Log Message: new perl Index: perl-PBS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PBS/devel/perl-PBS.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-PBS.spec 14 Feb 2008 22:18:02 -0000 1.5 +++ perl-PBS.spec 7 Mar 2008 02:13:22 -0000 1.6 @@ -1,10 +1,10 @@ Name: perl-PBS Version: 0.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl binding for the Portable Batch System client library Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://www-rcf.usc.edu/~garrick/perl-PBS/ Source0: http://www-rcf.usc.edu/~garrick/perl-PBS/perl-PBS-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +76,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.33-3 +Rebuild for new perl + * Thu Feb 14 2008 Garrick Staples 0.33-2 - rebuilding for fedora9 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:33 GMT Subject: rpms/perl-Chart/devel perl-Chart.spec,1.9,1.10 Message-ID: <200803070223.m272NXQk028610@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Chart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Chart/devel Modified Files: perl-Chart.spec Log Message: new perl Index: perl-Chart.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Chart/devel/perl-Chart.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Chart.spec 12 Apr 2007 22:57:50 -0000 1.9 +++ perl-Chart.spec 7 Mar 2008 01:55:47 -0000 1.10 @@ -1,8 +1,8 @@ Name: perl-Chart Version: 2.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl module for producing many types of charts -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Chart/ Source0: http://www.cpan.org/authors/id/C/CH/CHARTGRP/Chart-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/Chart.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.4.1-6 +Rebuild for new perl + * Mon Apr 09 2007 Steven Pritchard 2.4.1-5 - Fix find option order. - Use fixperms macro instead of our own chmod incantation. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:43 GMT Subject: rpms/innotop/devel innotop.spec,1.4,1.5 Message-ID: <200803070223.m272Nh9w028825@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/innotop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/innotop/devel Modified Files: innotop.spec Log Message: new perl Index: innotop.spec =================================================================== RCS file: /cvs/pkgs/rpms/innotop/devel/innotop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- innotop.spec 29 Jan 2008 12:00:16 -0000 1.4 +++ innotop.spec 7 Mar 2008 01:52:48 -0000 1.5 @@ -1,6 +1,6 @@ Name: innotop Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A MySQL and InnoDB monitor program Group: Applications/Databases @@ -54,6 +54,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.6.0-2 +Rebuild for new perl + * Tue Jan 29 2008 Michael Fleming 1.6.0-1 - New upstream release. - Update License From fedora-extras-commits at redhat.com Fri Mar 7 02:23:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:31 GMT Subject: rpms/perl-HTML-Table/devel perl-HTML-Table.spec,1.5,1.6 Message-ID: <200803070223.m272NVwx028589@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTML-Table/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-HTML-Table/devel Modified Files: perl-HTML-Table.spec Log Message: new perl Index: perl-HTML-Table.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTML-Table/devel/perl-HTML-Table.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-HTML-Table.spec 28 Feb 2008 03:21:47 -0000 1.5 +++ perl-HTML-Table.spec 7 Mar 2008 02:04:15 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-HTML-Table Version: 2.07b -Release: 1%{?dist} +Release: 2%{?dist} Summary: Create HTML tables using simple interface License: GPL+ or Artistic Group: Development/Libraries @@ -68,6 +68,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.07b-2 +Rebuild for new perl + * Wed Feb 27 2008 Orion Poplawski 2.07b-1 - Update to 2.07b From fedora-extras-commits at redhat.com Fri Mar 7 02:23:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:36 GMT Subject: rpms/perl-Crypt-OpenSSL-AES/devel perl-Crypt-OpenSSL-AES.spec, 1.6, 1.7 Message-ID: <200803070223.m272NabD028686@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-AES/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Crypt-OpenSSL-AES/devel Modified Files: perl-Crypt-OpenSSL-AES.spec Log Message: new perl Index: perl-Crypt-OpenSSL-AES.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-AES/devel/perl-Crypt-OpenSSL-AES.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Crypt-OpenSSL-AES.spec 19 Feb 2008 04:45:32 -0000 1.6 +++ perl-Crypt-OpenSSL-AES.spec 7 Mar 2008 01:57:25 -0000 1.7 @@ -1,8 +1,8 @@ Name: perl-Crypt-OpenSSL-AES Version: 0.02 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl interface to OpenSSL for AES -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-OpenSSL-AES/ Source0: http://www.cpan.org/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-%{version}.tar.gz @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.02-5 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.02-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:38 GMT Subject: rpms/perl-POE-Component-SimpleDBI/devel perl-POE-Component-SimpleDBI.spec, 1.6, 1.7 Message-ID: <200803070223.m272NcGO028726@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-SimpleDBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-POE-Component-SimpleDBI/devel Modified Files: perl-POE-Component-SimpleDBI.spec Log Message: new perl Index: perl-POE-Component-SimpleDBI.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-SimpleDBI/devel/perl-POE-Component-SimpleDBI.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-POE-Component-SimpleDBI.spec 27 Dec 2007 18:44:07 -0000 1.6 +++ perl-POE-Component-SimpleDBI.spec 7 Mar 2008 02:14:24 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-POE-Component-SimpleDBI Version: 1.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Asynchronous non-blocking DBI calls in POE made simple License: GPL+ or Artistic Group: Development/Libraries @@ -58,6 +58,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.18-2 +Rebuild for new perl + * Thu Dec 27 2007 Chris Weyl 1.18-1 - update to 1.18 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Authen-DigestMD5/devel perl-Authen-DigestMD5.spec, 1.5, 1.6 Message-ID: <200803070223.m272NZY5028649@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Authen-DigestMD5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Authen-DigestMD5/devel Modified Files: perl-Authen-DigestMD5.spec Log Message: new perl Index: perl-Authen-DigestMD5.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Authen-DigestMD5/devel/perl-Authen-DigestMD5.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Authen-DigestMD5.spec 10 Aug 2007 17:40:51 -0000 1.5 +++ perl-Authen-DigestMD5.spec 7 Mar 2008 01:54:25 -0000 1.6 @@ -1,7 +1,7 @@ Summary: SASL DIGEST-MD5 authentication (RFC2831) Name: perl-Authen-DigestMD5 Version: 0.04 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Authen-DigestMD5/ @@ -52,6 +52,9 @@ %{_mandir}/man3/Authen::DigestMD5.3pm* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.04-5 +Rebuild for new perl + * Fri Aug 10 2007 Paul Howarth 0.04-4 - Clarify license as GPL v1 or later, or Artistic (same as perl) - Add buildreq perl(Test::More) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:24 GMT Subject: rpms/perl-Net-SFTP/devel perl-Net-SFTP.spec,1.1,1.2 Message-ID: <200803070223.m272NO0F028437@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-SFTP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-SFTP/devel Modified Files: perl-Net-SFTP.spec Log Message: new perl Index: perl-Net-SFTP.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-SFTP/devel/perl-Net-SFTP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-SFTP.spec 16 Jul 2007 22:52:03 -0000 1.1 +++ perl-Net-SFTP.spec 7 Mar 2008 02:12:18 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-Net-SFTP Version: 0.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Secure File Transfer Protocol client -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-SFTP/ Source0: http://www.cpan.org/authors/id/D/DB/DBROBINS/Net-SFTP-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.10-2 +Rebuild for new perl + * Mon Jul 16 2007 Steven Pritchard 0.10-1 - Specfile autogenerated by cpanspec 1.73. - Fix License. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Text-ASCIITable/devel perl-Text-ASCIITable.spec,1.2,1.3 Message-ID: <200803070223.m272NZgY028655@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-ASCIITable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-ASCIITable/devel Modified Files: perl-Text-ASCIITable.spec Log Message: new perl Index: perl-Text-ASCIITable.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-ASCIITable/devel/perl-Text-ASCIITable.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Text-ASCIITable.spec 18 Dec 2006 05:25:48 -0000 1.2 +++ perl-Text-ASCIITable.spec 7 Mar 2008 02:18:31 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Text-ASCIITable Version: 0.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Create a nice formatted table using ASCII characters -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-ASCIITable/ Source0: http://www.cpan.org/authors/id/L/LU/LUNATIC/Text-ASCIITable-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.18-3 +Rebuild for new perl + * Sun Dec 17 2006 Chris Weyl 0.18-2 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Class-InsideOut/devel perl-Class-InsideOut.spec, 1.10, 1.11 Message-ID: <200803070223.m272NZLq028656@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-InsideOut/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Class-InsideOut/devel Modified Files: perl-Class-InsideOut.spec Log Message: new perl Index: perl-Class-InsideOut.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-InsideOut/devel/perl-Class-InsideOut.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Class-InsideOut.spec 15 Oct 2007 18:48:18 -0000 1.10 +++ perl-Class-InsideOut.spec 7 Mar 2008 01:56:25 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-Class-InsideOut Version: 1.06 -Release: 1%{?dist}.2 +Release: 2%{?dist} Summary: A safe, simple inside-out object construction kit Group: Development/Libraries @@ -72,6 +72,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.06-2.2 +Rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway 1.06-1.2 - add BR: perl(Test::More) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Class-Whitehole/devel perl-Class-Whitehole.spec,1.3,1.4 Message-ID: <200803070223.m272NZLC028650@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Whitehole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Class-Whitehole/devel Modified Files: perl-Class-Whitehole.spec Log Message: new perl Index: perl-Class-Whitehole.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Whitehole/devel/perl-Class-Whitehole.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-Whitehole.spec 24 Aug 2007 21:10:04 -0000 1.3 +++ perl-Class-Whitehole.spec 7 Mar 2008 01:56:35 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Class-Whitehole Version: 0.04 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Base class to treat unhandled method calls as errors Group: Development/Libraries License: GPL+ or Artistic @@ -43,6 +43,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.04-5 +Rebuild for new perl + * Fri Aug 24 2007 Tom "spot" Callaway 0.04-4 - license fix From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Font-TTF/devel perl-Font-TTF.spec,1.9,1.10 Message-ID: <200803070223.m272NZdq028648@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Font-TTF/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Font-TTF/devel Modified Files: perl-Font-TTF.spec Log Message: new perl Index: perl-Font-TTF.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Font-TTF/devel/perl-Font-TTF.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Font-TTF.spec 9 Feb 2008 09:19:22 -0000 1.9 +++ perl-Font-TTF.spec 7 Mar 2008 02:01:27 -0000 1.10 @@ -3,7 +3,7 @@ Name: perl-%{cpanname} Version: 0.43 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl library for modifying TTF font files Group: Development/Libraries @@ -76,6 +76,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.43-3 +Rebuild for new perl + * Sat Feb 09 2008 Nicolas Mailhot - 0.43-2 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:32 GMT Subject: rpms/perl-Kwiki-NewPage/devel perl-Kwiki-NewPage.spec,1.5,1.6 Message-ID: <200803070223.m272NWcl028606@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Kwiki-NewPage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Kwiki-NewPage/devel Modified Files: perl-Kwiki-NewPage.spec Log Message: new perl Index: perl-Kwiki-NewPage.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Kwiki-NewPage/devel/perl-Kwiki-NewPage.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Kwiki-NewPage.spec 9 Jan 2008 06:33:16 -0000 1.5 +++ perl-Kwiki-NewPage.spec 7 Mar 2008 02:06:19 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Kwiki-NewPage Version: 0.12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Kwiki New Page Plugin License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.12-7 +Rebuild for new perl + * Wed Jan 09 2008 Ralf Cors??pius 0.12.6 - Update License-tag. - BR: perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:33 GMT Subject: rpms/perl-Math-Vec/devel perl-Math-Vec.spec,1.2,1.3 Message-ID: <200803070223.m272NXGU028630@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Math-Vec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Math-Vec/devel Modified Files: perl-Math-Vec.spec Log Message: new perl Index: perl-Math-Vec.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Vec/devel/perl-Math-Vec.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Math-Vec.spec 16 Jan 2008 16:34:42 -0000 1.2 +++ perl-Math-Vec.spec 7 Mar 2008 02:09:58 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Math-Vec Version: 1.01 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl Math::Vec module Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.01-2 +Rebuild for new perl + * Wed Jan 16 2008 Roozbeh Pournader - 1.01-1 - Update to 1.01 - Add build requirements on Test::More and Test::Pod (patch by From fedora-extras-commits at redhat.com Fri Mar 7 02:23:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:27 GMT Subject: rpms/pcsc-perl/devel pcsc-perl.spec,1.15,1.16 Message-ID: <200803070223.m272NRV1028498@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/pcsc-perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/pcsc-perl/devel Modified Files: pcsc-perl.spec Log Message: new perl Index: pcsc-perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/pcsc-perl/devel/pcsc-perl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pcsc-perl.spec 19 Feb 2008 09:26:46 -0000 1.15 +++ pcsc-perl.spec 7 Mar 2008 01:53:47 -0000 1.16 @@ -6,7 +6,7 @@ Name: pcsc-perl Version: 1.4.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl interface to the PC/SC smart card library Group: Development/Libraries @@ -68,6 +68,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.4.6-4 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.4.6-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:31 GMT Subject: rpms/perl-Mail-Alias/devel perl-Mail-Alias.spec,1.12,1.13 Message-ID: <200803070223.m272NVRd028583@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Mail-Alias/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Mail-Alias/devel Modified Files: perl-Mail-Alias.spec Log Message: new perl Index: perl-Mail-Alias.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-Alias/devel/perl-Mail-Alias.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Mail-Alias.spec 18 Apr 2007 15:13:02 -0000 1.12 +++ perl-Mail-Alias.spec 7 Mar 2008 02:08:51 -0000 1.13 @@ -1,8 +1,8 @@ Name: perl-Mail-Alias Version: 1.12 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Module for manipulating e-mail alias files -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-Alias/ Source0: http://www.cpan.org/authors/id/Z/ZE/ZELT/Mail-Alias-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.12-9 +Rebuild for new perl + * Wed Apr 18 2007 Steven Pritchard 1.12-8 - Remove check macro cruft. - Reformat to match cpanspec output. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:36 GMT Subject: rpms/perl-Bio-ASN1-EntrezGene/devel perl-Bio-ASN1-EntrezGene.spec, 1.4, 1.5 Message-ID: <200803070223.m272NaaC028689@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Bio-ASN1-EntrezGene/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Bio-ASN1-EntrezGene/devel Modified Files: perl-Bio-ASN1-EntrezGene.spec Log Message: new perl Index: perl-Bio-ASN1-EntrezGene.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Bio-ASN1-EntrezGene/devel/perl-Bio-ASN1-EntrezGene.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Bio-ASN1-EntrezGene.spec 5 Mar 2008 01:12:36 -0000 1.4 +++ perl-Bio-ASN1-EntrezGene.spec 7 Mar 2008 01:54:57 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Bio-ASN1-EntrezGene Version: 1.091 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Regular expression-based Perl Parser for NCBI Entrez Gene License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.091-6 +Rebuild for new perl + * Tue Mar 04 2008 Tom "spot" Callaway 1.091-5 - rebuild for new perl From fedora-extras-commits at redhat.com Fri Mar 7 02:23:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:36 GMT Subject: rpms/perl-QWizard/devel perl-QWizard.spec,1.3,1.4 Message-ID: <200803070223.m272NaeA028690@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-QWizard/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-QWizard/devel Modified Files: perl-QWizard.spec Log Message: new perl Index: perl-QWizard.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-QWizard/devel/perl-QWizard.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-QWizard.spec 22 Dec 2007 14:13:25 -0000 1.3 +++ perl-QWizard.spec 7 Mar 2008 02:15:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-QWizard Version: 3.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A very portable graphical question and answer wizard system License: GPL+ or Artistic Group: Development/Libraries @@ -73,6 +73,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 3.13-3 +Rebuild for new perl + * Sat Dec 22 2007 Wes Hardaker - 3.13-2 - remove patch now in base From fedora-extras-commits at redhat.com Fri Mar 7 02:23:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:36 GMT Subject: rpms/perl-perlmenu/devel perl-perlmenu.spec,1.3,1.4 Message-ID: <200803070223.m272Nag9028691@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-perlmenu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-perlmenu/devel Modified Files: perl-perlmenu.spec Log Message: new perl Index: perl-perlmenu.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-perlmenu/devel/perl-perlmenu.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-perlmenu.spec 21 Aug 2007 15:32:05 -0000 1.3 +++ perl-perlmenu.spec 7 Mar 2008 02:22:21 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-perlmenu Version: 4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl library module for curses-based menus & data-entry templates Group: Development/Libraries @@ -43,6 +43,9 @@ %{perl_vendorlib}/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 4.0-6 +Rebuild for new perl + * Tue Aug 21 2007 Parag Nemade - 4.0-5 - update License tag From fedora-extras-commits at redhat.com Fri Mar 7 02:23:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:38 GMT Subject: rpms/perl-Email-Reply/devel perl-Email-Reply.spec,1.2,1.3 Message-ID: <200803070223.m272Ncws028727@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Email-Reply/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Email-Reply/devel Modified Files: perl-Email-Reply.spec Log Message: new perl Index: perl-Email-Reply.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Email-Reply/devel/perl-Email-Reply.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Email-Reply.spec 26 Aug 2007 15:10:29 -0000 1.2 +++ perl-Email-Reply.spec 7 Mar 2008 01:59:52 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Email-Reply Version: 1.202 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Reply to an email message Group: Development/Libraries License: GPL+ or Artistic @@ -45,6 +45,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.202-2 +Rebuild for new perl + * Sun Aug 26 2007 Tom "spot" Callaway - 1.201-4 - 1.202 - license fix From fedora-extras-commits at redhat.com Fri Mar 7 02:23:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:26 GMT Subject: rpms/perl-Convert-UUlib/devel perl-Convert-UUlib.spec,1.18,1.19 Message-ID: <200803070223.m272NQqu028477@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Convert-UUlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Convert-UUlib/devel Modified Files: perl-Convert-UUlib.spec Log Message: new perl Index: perl-Convert-UUlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Convert-UUlib.spec 8 Feb 2008 21:45:08 -0000 1.18 +++ perl-Convert-UUlib.spec 7 Mar 2008 01:57:19 -0000 1.19 @@ -3,7 +3,7 @@ Name: perl-%{rname} Version: 1.09 Epoch: 1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl interface to the uulib library @@ -59,6 +59,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1:1.09-4 +Rebuild for new perl + * Fri Feb 08 2008 Nicolas Mailhot - 1:1.09-3 ??? gcc 4.3 rebuild From fedora-extras-commits at redhat.com Fri Mar 7 02:23:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:37 GMT Subject: rpms/perl-Gtk2-Ex-Dialogs/devel perl-Gtk2-Ex-Dialogs.spec,1.2,1.3 Message-ID: <200803070223.m272Nbu0028711@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Gtk2-Ex-Dialogs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Gtk2-Ex-Dialogs/devel Modified Files: perl-Gtk2-Ex-Dialogs.spec Log Message: new perl Index: perl-Gtk2-Ex-Dialogs.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Gtk2-Ex-Dialogs/devel/perl-Gtk2-Ex-Dialogs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Gtk2-Ex-Dialogs.spec 30 Nov 2006 06:55:04 -0000 1.2 +++ perl-Gtk2-Ex-Dialogs.spec 7 Mar 2008 02:03:01 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Gtk2-Ex-Dialogs Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Useful tools for Gnome2/Gtk2 Perl GUI design -License: LGPL +License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Gtk2-Ex-Dialogs/ Source0: http://www.cpan.org/authors/id/K/KC/KCK/Gtk2-Ex-Dialogs-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.11-3 +Rebuild for new perl + * Wed Nov 29 2006 Chris Weyl 0.11-2 - bump From fedora-extras-commits at redhat.com Fri Mar 7 02:23:21 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:21 GMT Subject: rpms/perl-Getopt-GUI-Long/devel perl-Getopt-GUI-Long.spec,1.1,1.2 Message-ID: <200803070223.m272NL2P028373@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Getopt-GUI-Long/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Getopt-GUI-Long/devel Modified Files: perl-Getopt-GUI-Long.spec Log Message: new perl Index: perl-Getopt-GUI-Long.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Getopt-GUI-Long/devel/perl-Getopt-GUI-Long.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Getopt-GUI-Long.spec 26 Dec 2007 19:12:09 -0000 1.1 +++ perl-Getopt-GUI-Long.spec 7 Mar 2008 02:02:16 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Getopt-GUI-Long Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A wrapper around Getopt::Long to provide a GUI to applications License: GPL+ or Artistic Group: Development/Libraries @@ -73,6 +73,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.8-2 +Rebuild for new perl + * Wed Dec 19 2007 Wes Hardaker - 0.8-1 - initial version From fedora-extras-commits at redhat.com Fri Mar 7 02:23:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:28 GMT Subject: rpms/perl-Unix-Syslog/devel perl-Unix-Syslog.spec,1.14,1.15 Message-ID: <200803070223.m272NSIE028523@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Unix-Syslog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Unix-Syslog/devel Modified Files: perl-Unix-Syslog.spec Log Message: new perl Index: perl-Unix-Syslog.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Unix-Syslog/devel/perl-Unix-Syslog.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Unix-Syslog.spec 20 Feb 2008 03:05:03 -0000 1.14 +++ perl-Unix-Syslog.spec 7 Mar 2008 02:20:52 -0000 1.15 @@ -1,6 +1,6 @@ Name: perl-Unix-Syslog Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl interface to the UNIX syslog(3) calls License: Artistic 2.0 Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.0-3 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 1.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:26 GMT Subject: rpms/perl-Parallel-ForkManager/devel perl-Parallel-ForkManager.spec, 1.1, 1.2 Message-ID: <200803070223.m272NQN5028475@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Parallel-ForkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Parallel-ForkManager/devel Modified Files: perl-Parallel-ForkManager.spec Log Message: new perl Index: perl-Parallel-ForkManager.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Parallel-ForkManager/devel/perl-Parallel-ForkManager.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Parallel-ForkManager.spec 17 Jan 2008 03:41:36 -0000 1.1 +++ perl-Parallel-ForkManager.spec 7 Mar 2008 02:14:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Parallel-ForkManager Version: 0.7.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple parallel processing fork manager License: GPL+ or Artistic Group: Development/Libraries @@ -57,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.7.5-2 +Rebuild for new perl + * Wed Jan 16 2008 Jason Tibbitts 0.7.5-1 - Specfile autogenerated by cpanspec 1.74. - Make the .pl files documentation instead of installing them to avoid From fedora-extras-commits at redhat.com Fri Mar 7 02:23:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:39 GMT Subject: rpms/perl-Linux-Pid/devel perl-Linux-Pid.spec,1.2,1.3 Message-ID: <200803070223.m272NdJB028751@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Linux-Pid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Linux-Pid/devel Modified Files: perl-Linux-Pid.spec Log Message: new perl Index: perl-Linux-Pid.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Linux-Pid/devel/perl-Linux-Pid.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Linux-Pid.spec 20 Feb 2008 07:00:33 -0000 1.2 +++ perl-Linux-Pid.spec 7 Mar 2008 02:07:48 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Linux-Pid Version: 0.04 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Get the native PID and the PPID on Linux Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.04-5 +Rebuild for new perl + * Wed Feb 20 2008 Fedora Release Engineering - 0.04-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:37 GMT Subject: rpms/perl-XML-Filter-XInclude/devel perl-XML-Filter-XInclude.spec, 1.1, 1.2 Message-ID: <200803070223.m272NbMT028707@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Filter-XInclude/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-XML-Filter-XInclude/devel Modified Files: perl-XML-Filter-XInclude.spec Log Message: new perl Index: perl-XML-Filter-XInclude.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Filter-XInclude/devel/perl-XML-Filter-XInclude.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-XML-Filter-XInclude.spec 23 Mar 2007 16:47:45 -0000 1.1 +++ perl-XML-Filter-XInclude.spec 7 Mar 2008 02:21:22 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-XML-Filter-XInclude Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XInclude as a SAX Filter -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/XML-Filter-XInclude/ Source0: http://www.cpan.org/modules/by-module/XML/XML-Filter-XInclude-%{version}.tar.gz @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.0-2 +Rebuild for new perl + * Thu Mar 15 2007 Andreas Thienemann 1.0-1 - Specfile autogenerated by cpanspec 1.69.1. - Cleaned up for FE From fedora-extras-commits at redhat.com Fri Mar 7 02:23:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:39 GMT Subject: rpms/perl-FileHandle-Fmode/devel perl-FileHandle-Fmode.spec, 1.2, 1.3 Message-ID: <200803070223.m272NdVd028750@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-FileHandle-Fmode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-FileHandle-Fmode/devel Modified Files: perl-FileHandle-Fmode.spec Log Message: new perl Index: perl-FileHandle-Fmode.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-FileHandle-Fmode/devel/perl-FileHandle-Fmode.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-FileHandle-Fmode.spec 19 Feb 2008 05:21:51 -0000 1.2 +++ perl-FileHandle-Fmode.spec 7 Mar 2008 02:00:58 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-FileHandle-Fmode Version: 0.09 -Release: 3%{?dist} +Release: 4%{?dist} Summary: FileHandle::Fmode Perl module -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/FileHandle-Fmode/ Source0: http://www.cpan.org/modules/by-module/FileHandle/FileHandle-Fmode-%{version}.tar.gz @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.09-4 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.09-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:38 GMT Subject: rpms/perl-Regexp-Shellish/devel perl-Regexp-Shellish.spec,1.2,1.3 Message-ID: <200803070223.m272Nc8R028729@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Regexp-Shellish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Regexp-Shellish/devel Modified Files: perl-Regexp-Shellish.spec Log Message: new perl Index: perl-Regexp-Shellish.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Regexp-Shellish/devel/perl-Regexp-Shellish.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Regexp-Shellish.spec 16 Aug 2007 18:52:39 -0000 1.2 +++ perl-Regexp-Shellish.spec 7 Mar 2008 02:16:03 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Regexp-Shellish Version: 0.93 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Shell-like regular expressions -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Regexp-Shellish/ Source0: http://www.cpan.org/modules/by-module/Regexp/Regexp-Shellish-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.93-4 +Rebuild for new perl + * Thu Aug 16 2007 Ian Burrell - 0.93-3 - Fix BuildRequires From fedora-extras-commits at redhat.com Fri Mar 7 02:23:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:38 GMT Subject: rpms/perl-Test-Cmd/devel perl-Test-Cmd.spec,1.2,1.3 Message-ID: <200803070223.m272Nce3028728@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-Cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Test-Cmd/devel Modified Files: perl-Test-Cmd.spec Log Message: new perl Index: perl-Test-Cmd.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Cmd/devel/perl-Test-Cmd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-Cmd.spec 17 Oct 2007 03:46:51 -0000 1.2 +++ perl-Test-Cmd.spec 7 Mar 2008 02:17:54 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-Cmd Version: 1.05 -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Perl module for portable testing of commands and scripts Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.05-2.1 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 1.05-1.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:40 GMT Subject: rpms/docbook2X/devel docbook2X.spec,1.8,1.9 Message-ID: <200803070223.m272NeEo028772@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/docbook2X/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/docbook2X/devel Modified Files: docbook2X.spec Log Message: new perl Index: docbook2X.spec =================================================================== RCS file: /cvs/pkgs/rpms/docbook2X/devel/docbook2X.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- docbook2X.spec 19 Feb 2008 18:09:43 -0000 1.8 +++ docbook2X.spec 7 Mar 2008 01:52:26 -0000 1.9 @@ -1,6 +1,6 @@ Name: docbook2X Version: 0.8.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Convert docbook into man and Texinfo Group: Applications/Text @@ -77,6 +77,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.8.8-3 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.8-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:29 GMT Subject: rpms/perl-Smart-Comments/devel perl-Smart-Comments.spec,1.5,1.6 Message-ID: <200803070223.m272NTIT028540@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Smart-Comments/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Smart-Comments/devel Modified Files: perl-Smart-Comments.spec Log Message: new perl Index: perl-Smart-Comments.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Smart-Comments/devel/perl-Smart-Comments.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Smart-Comments.spec 1 Mar 2008 18:29:22 -0000 1.5 +++ perl-Smart-Comments.spec 7 Mar 2008 02:16:46 -0000 1.6 @@ -1,7 +1,7 @@ Name: perl-Smart-Comments Epoch: 1 Version: v1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Comments that do more than just sit there Group: Development/Libraries @@ -74,6 +74,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1:v1.0.3-2 +Rebuild for new perl + * Sat Mar 01 2008 Chris Weyl 1:v1.0.3-1 - update to v1.0.3 - update lic tag From fedora-extras-commits at redhat.com Fri Mar 7 02:23:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:40 GMT Subject: rpms/queuegraph/devel queuegraph.spec,1.2,1.3 Message-ID: <200803070223.m272Neqt028775@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/queuegraph/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/queuegraph/devel Modified Files: queuegraph.spec Log Message: new perl Index: queuegraph.spec =================================================================== RCS file: /cvs/pkgs/rpms/queuegraph/devel/queuegraph.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- queuegraph.spec 31 Oct 2007 05:34:56 -0000 1.2 +++ queuegraph.spec 7 Mar 2008 02:22:26 -0000 1.3 @@ -7,11 +7,11 @@ Name: queuegraph Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A RRDtool frontend for Mail statistics Group: System Environment/Daemons -License: GPL +License: GPL+ URL: http://www.arschkrebs.de/postfix/queuegraph/ Source0: http://www.arschkrebs.de/postfix/queuegraph/queuegraph.tar.gz @@ -154,6 +154,9 @@ %endif %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.1-3 +Rebuild for new perl + * Tue Oct 30 2007 Bernard Johnson - 1.1-2 - new tarball - no version numbers updated - fixed up patches to match new tarball From fedora-extras-commits at redhat.com Fri Mar 7 02:23:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:36 GMT Subject: rpms/renrot/devel renrot.spec,1.12,1.13 Message-ID: <200803070223.m272NaqD028688@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/renrot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/renrot/devel Modified Files: renrot.spec Log Message: new perl Index: renrot.spec =================================================================== RCS file: /cvs/pkgs/rpms/renrot/devel/renrot.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- renrot.spec 12 Oct 2007 10:48:34 -0000 1.12 +++ renrot.spec 7 Mar 2008 02:22:31 -0000 1.13 @@ -1,6 +1,6 @@ Name: renrot Version: 0.25 -Release: 3%{?dist}.1 +Release: 4%{?dist} License: Artistic 2.0 Group: Applications/Multimedia Summary: A program to rename and rotate files according to EXIF tags @@ -73,6 +73,9 @@ %config(noreplace) %{_sysconfdir}/%{name}/tags.conf %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.25-4.1 +Rebuild for new perl + * Tue Sep 04 2007 Andy Shevchenko 0.25-3.1 - Fix License tag - Add BuildRequires: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:27 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:27 GMT Subject: rpms/perl-GStreamer/devel perl-GStreamer.spec,1.5,1.6 Message-ID: <200803070223.m272NRxZ028497@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-GStreamer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-GStreamer/devel Modified Files: perl-GStreamer.spec Log Message: new perl Index: perl-GStreamer.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-GStreamer/devel/perl-GStreamer.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-GStreamer.spec 18 Feb 2008 23:14:55 -0000 1.5 +++ perl-GStreamer.spec 7 Mar 2008 02:01:47 -0000 1.6 @@ -1,8 +1,8 @@ Name: perl-GStreamer Version: 0.09 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl bindings to the GStreamer framework -License: LGPL +License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/GStreamer/ Source0: http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-%{version}.tar.gz @@ -66,6 +66,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.09-6 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.09-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:39 GMT Subject: rpms/perl-UNIVERSAL-exports/devel perl-UNIVERSAL-exports.spec, 1.5, 1.6 Message-ID: <200803070223.m272NdlU028745@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-UNIVERSAL-exports/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-UNIVERSAL-exports/devel Modified Files: perl-UNIVERSAL-exports.spec Log Message: new perl Index: perl-UNIVERSAL-exports.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-exports/devel/perl-UNIVERSAL-exports.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-UNIVERSAL-exports.spec 26 Aug 2007 20:14:33 -0000 1.5 +++ perl-UNIVERSAL-exports.spec 7 Mar 2008 02:20:25 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-UNIVERSAL-exports Version: 0.05 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight, universal exporting of variables Group: Development/Libraries License: GPL+ or Artistic @@ -52,6 +52,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.05-4 +Rebuild for new perl + * Sun Aug 26 2007 Tom "spot" Callaway 0.05-3 - license tag fix From fedora-extras-commits at redhat.com Fri Mar 7 02:23:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:41 GMT Subject: rpms/dnssec-tools/devel dnssec-tools.spec,1.14,1.15 Message-ID: <200803070223.m272NfMq028791@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/dnssec-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/dnssec-tools/devel Modified Files: dnssec-tools.spec Log Message: new perl Index: dnssec-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/dnssec-tools/devel/dnssec-tools.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dnssec-tools.spec 15 Feb 2008 22:46:29 -0000 1.14 +++ dnssec-tools.spec 7 Mar 2008 01:52:21 -0000 1.15 @@ -1,8 +1,8 @@ Summary: A suite of tools for managing dnssec aware DNS usage Name: dnssec-tools Version: 1.3.2 -Release: 1%{?dist} -License: BSD-like +Release: 2%{?dist} +License: BSD Group: System Environment/Base URL: http://www.dnssec-tools.org/ Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz @@ -262,6 +262,9 @@ %{_mandir}/man3/val_freeaddrinfo.3.gz %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.3.2-2 +Rebuild for new perl + * Fri Feb 15 2008 Wes Hardaker - 1.3.2-1 - Jump to upstream to grab latest identical fixes From fedora-extras-commits at redhat.com Fri Mar 7 02:23:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:39 GMT Subject: rpms/perl-Data-Compare/devel perl-Data-Compare.spec,1.8,1.9 Message-ID: <200803070223.m272NdwA028749@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Data-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Data-Compare/devel Modified Files: perl-Data-Compare.spec Log Message: new perl Index: perl-Data-Compare.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Data-Compare/devel/perl-Data-Compare.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Data-Compare.spec 28 Nov 2007 18:58:30 -0000 1.8 +++ perl-Data-Compare.spec 7 Mar 2008 01:58:50 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Data-Compare Version: 0.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compare perl data structures Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.17-2 +Rebuild for new perl + * Wed Nov 28 2007 Tom "spot" Callaway - 0.17-1 - 0.17 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:49 GMT Subject: rpms/perl-HTTP-Recorder/devel perl-HTTP-Recorder.spec,1.1,1.2 Message-ID: <200803070223.m272NnFj028839@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-HTTP-Recorder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-HTTP-Recorder/devel Modified Files: perl-HTTP-Recorder.spec Log Message: new perl Index: perl-HTTP-Recorder.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-HTTP-Recorder/devel/perl-HTTP-Recorder.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTTP-Recorder.spec 2 May 2006 01:18:54 -0000 1.1 +++ perl-HTTP-Recorder.spec 7 Mar 2008 02:04:51 -0000 1.2 @@ -1,10 +1,10 @@ Name: perl-HTTP-Recorder Version: 0.05 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Record interaction with web sites Group: Development/Libraries -License: GPL +License: GPL+ URL: http://search.cpan.org/dist/HTTP-Recorder/ Source0: http://www.cpan.org/authors/id/L/LE/LEIRA/HTTP-Recorder-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.05-2 +Rebuild for new perl + * Thu Sep 8 2005 Jose Pedro Oliveira - 0.05-1 - Update to 0.05. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:30 GMT Subject: rpms/perl-Compress-Bzip2/devel perl-Compress-Bzip2.spec,1.7,1.8 Message-ID: <200803070223.m272NUEo028563@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Compress-Bzip2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Compress-Bzip2/devel Modified Files: perl-Compress-Bzip2.spec Log Message: new perl Index: perl-Compress-Bzip2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Compress-Bzip2/devel/perl-Compress-Bzip2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Compress-Bzip2.spec 19 Feb 2008 21:54:59 -0000 1.7 +++ perl-Compress-Bzip2.spec 7 Mar 2008 01:56:49 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Compress-Bzip2 Version: 2.09 -Release: 5%{?dist}.2 +Release: 6%{?dist} Summary: Interface to Bzip2 compression library Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.09-6.2 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 2.09-5.2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:43 GMT Subject: rpms/perl-Authen-PAM/devel perl-Authen-PAM.spec,1.4,1.5 Message-ID: <200803070223.m272Nhi2028816@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Authen-PAM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Authen-PAM/devel Modified Files: perl-Authen-PAM.spec Log Message: new perl Index: perl-Authen-PAM.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Authen-PAM/devel/perl-Authen-PAM.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Authen-PAM.spec 20 Feb 2008 02:48:58 -0000 1.4 +++ perl-Authen-PAM.spec 7 Mar 2008 01:54:39 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-Authen-PAM Version: 0.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Authen::PAM Perl module -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Authen-PAM/ Source0: http://www.cpan.org/authors/id/N/NI/NIKIP/Authen-PAM-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.16-5 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.16-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:40 GMT Subject: rpms/perl-XML-Handler-YAWriter/devel perl-XML-Handler-YAWriter.spec, 1.2, 1.3 Message-ID: <200803070223.m272NejM028773@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Handler-YAWriter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-XML-Handler-YAWriter/devel Modified Files: perl-XML-Handler-YAWriter.spec Log Message: new perl Index: perl-XML-Handler-YAWriter.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Handler-YAWriter/devel/perl-XML-Handler-YAWriter.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-XML-Handler-YAWriter.spec 12 Jan 2008 00:17:50 -0000 1.2 +++ perl-XML-Handler-YAWriter.spec 7 Mar 2008 02:21:27 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-XML-Handler-YAWriter Version: 0.23 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Yet another Perl SAX XML Writer @@ -59,6 +59,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.23-5 +Rebuild for new perl + * Sat Jan 12 2008 Xavier Bachelot - 0.23-4 - Remove '|| :' from %%check section. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:32 GMT Subject: rpms/perl-Mail-RFC822-Address/devel perl-Mail-RFC822-Address.spec, 1.1, 1.2 Message-ID: <200803070223.m272NWuR028607@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Mail-RFC822-Address/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Mail-RFC822-Address/devel Modified Files: perl-Mail-RFC822-Address.spec Log Message: new perl Index: perl-Mail-RFC822-Address.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-RFC822-Address/devel/perl-Mail-RFC822-Address.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Mail-RFC822-Address.spec 23 Mar 2007 14:12:44 -0000 1.1 +++ perl-Mail-RFC822-Address.spec 7 Mar 2008 02:09:21 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Mail-RFC822-Address Version: 0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl extension for validating email addresses according to RFC822 License: MIT Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.3-2 +Rebuild for new perl + * Thu Mar 15 2007 Andreas Thienemann 0.3-1 - Specfile autogenerated by cpanspec 1.69.1. - Cleaned up for FE From fedora-extras-commits at redhat.com Fri Mar 7 02:23:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:30 GMT Subject: rpms/perl-Text-LevenshteinXS/devel perl-Text-LevenshteinXS.spec, 1.4, 1.5 Message-ID: <200803070223.m272NUvt028567@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Text-LevenshteinXS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Text-LevenshteinXS/devel Modified Files: perl-Text-LevenshteinXS.spec Log Message: new perl Index: perl-Text-LevenshteinXS.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Text-LevenshteinXS/devel/perl-Text-LevenshteinXS.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Text-LevenshteinXS.spec 20 Feb 2008 03:02:43 -0000 1.4 +++ perl-Text-LevenshteinXS.spec 7 Mar 2008 02:19:24 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-Text-LevenshteinXS Version: 0.03 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XS implementation of the Levenshtein edit distance -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-LevenshteinXS/ Source0: http://www.cpan.org/authors/id/J/JG/JGOLDBERG/Text-LevenshteinXS-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.03-5 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.03-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:49 GMT Subject: rpms/perl-File-Sync/devel perl-File-Sync.spec,1.4,1.5 Message-ID: <200803070223.m272Nnuw028838@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-File-Sync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-File-Sync/devel Modified Files: perl-File-Sync.spec Log Message: new perl Index: perl-File-Sync.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Sync/devel/perl-File-Sync.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-File-Sync.spec 20 Feb 2008 02:56:14 -0000 1.4 +++ perl-File-Sync.spec 7 Mar 2008 02:00:52 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-File-Sync Version: 0.09 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl access to fsync() and sync() function calls -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/File-Sync/ Source0: http://www.cpan.org/authors/id/C/CE/CEVANS/File-Sync-%{version}.tar.gz @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.09-5 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.09-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:32 GMT Subject: rpms/perl-ccom/devel perl-ccom.spec,1.2,1.3 Message-ID: <200803070223.m272NWbm028604@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-ccom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-ccom/devel Modified Files: perl-ccom.spec Log Message: new perl Index: perl-ccom.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-ccom/devel/perl-ccom.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-ccom.spec 3 Feb 2008 21:03:10 -0000 1.2 +++ perl-ccom.spec 7 Mar 2008 02:21:56 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Perl module for context-sensitive phonetic string replacement Name: perl-ccom Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://www.heise.de/ct/ftp/99/25/252/ @@ -64,6 +64,9 @@ %{perl_vendorarch}/*.pm %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.4.1-2 +Rebuild for new perl + * Thu Jan 31 2008 Robert Scheck 1.4.1-1 - Upgrade to 1.4.1 - Initial spec file for Fedora and Red Hat Enterprise Linux From fedora-extras-commits at redhat.com Fri Mar 7 02:23:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:43 GMT Subject: rpms/perl-Test-File-Contents/devel perl-Test-File-Contents.spec, 1.1, 1.2 Message-ID: <200803070223.m272NhUe028822@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-File-Contents/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Test-File-Contents/devel Modified Files: perl-Test-File-Contents.spec Log Message: new perl Index: perl-Test-File-Contents.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-File-Contents/devel/perl-Test-File-Contents.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-File-Contents.spec 23 Jul 2007 21:46:23 -0000 1.1 +++ perl-Test-File-Contents.spec 7 Mar 2008 02:18:13 -0000 1.2 @@ -1,8 +1,8 @@ Name: perl-Test-File-Contents Version: 0.05 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Test routines for examining the contents of files -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-File-Contents/ Source0: http://www.cpan.org/authors/id/S/SK/SKUD/Test-File-Contents-%{version}.tar.gz @@ -46,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.05-2 +Rebuild for new perl + * Mon Jul 16 2007 Steven Pritchard 0.05-1 - Specfile autogenerated by cpanspec 1.71. - BR Test::Builder::Tester, Test::More, Test::Pod, and Test::Pod::Coverage. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:30 GMT Subject: rpms/perl-SNMP_Session/devel perl-SNMP_Session.spec,1.6,1.7 Message-ID: <200803070223.m272NUrl028561@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SNMP_Session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-SNMP_Session/devel Modified Files: perl-SNMP_Session.spec Log Message: new perl Index: perl-SNMP_Session.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SNMP_Session/devel/perl-SNMP_Session.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-SNMP_Session.spec 17 Oct 2007 03:02:17 -0000 1.6 +++ perl-SNMP_Session.spec 7 Mar 2008 02:16:22 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-SNMP_Session Version: 1.08 -Release: 3%{?dist}.1 +Release: 4%{?dist} Summary: SNMP support for Perl 5 Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.08-4.1 +Rebuild for new perl + * Tue Oct 16 2007 Tom "spot" Callaway - 1.08-3.1 - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:40 GMT Subject: rpms/perl-Test-Unit/devel perl-Test-Unit.spec,1.1,1.2 Message-ID: <200803070223.m272Neuo028774@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Test-Unit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Test-Unit/devel Modified Files: perl-Test-Unit.spec Log Message: new perl Index: perl-Test-Unit.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Unit/devel/perl-Test-Unit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Unit.spec 22 Dec 2007 16:16:20 -0000 1.1 +++ perl-Test-Unit.spec 7 Mar 2008 02:18:23 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Unit Version: 0.25 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The PerlUnit testing framework Group: Development/Libraries @@ -74,6 +74,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.25-4 +Rebuild for new perl + * Fri Dec 21 2007 Xavier Bachelot - 0.25-3 - Mangle Summary. - Fix License. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:39 GMT Subject: rpms/Zim/devel Zim.spec,1.7,1.8 Message-ID: <200803070223.m272NdBR028748@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/Zim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/Zim/devel Modified Files: Zim.spec Log Message: new perl Index: Zim.spec =================================================================== RCS file: /cvs/pkgs/rpms/Zim/devel/Zim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Zim.spec 27 Dec 2007 22:43:31 -0000 1.7 +++ Zim.spec 7 Mar 2008 01:51:54 -0000 1.8 @@ -1,6 +1,6 @@ Name: Zim Version: 0.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Desktop wiki & notekeeper Group: Applications/Editors @@ -94,6 +94,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.23-2 +Rebuild for new perl + * Thu Nov 22 2007 Chris Weyl 0.23-1 - update to 0.23 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:41 GMT Subject: rpms/perl-Perl6-Bible/devel perl-Perl6-Bible.spec,1.3,1.4 Message-ID: <200803070223.m272NfMR028793@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Perl6-Bible/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Perl6-Bible/devel Modified Files: perl-Perl6-Bible.spec Log Message: new perl Index: perl-Perl6-Bible.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Perl6-Bible/devel/perl-Perl6-Bible.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Perl6-Bible.spec 9 Jan 2008 14:04:30 -0000 1.3 +++ perl-Perl6-Bible.spec 7 Mar 2008 02:14:57 -0000 1.4 @@ -1,8 +1,8 @@ Name: perl-Perl6-Bible Version: 0.30 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl 6 Design Documentations -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Perl6-Bible/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Perl6-Bible-%{version}.tar.gz @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.30-5 +Rebuild for new perl + * Wed Jan 09 2008 Ralf Cors??pius 0.30-4 - BR perl(Test::More) (BZ 419631). From fedora-extras-commits at redhat.com Fri Mar 7 02:23:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:43 GMT Subject: rpms/obexftp/devel obexftp.spec,1.12,1.13 Message-ID: <200803070223.m272Nhjs028815@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/obexftp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/obexftp/devel Modified Files: obexftp.spec Log Message: new perl Index: obexftp.spec =================================================================== RCS file: /cvs/pkgs/rpms/obexftp/devel/obexftp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- obexftp.spec 19 Feb 2008 20:49:45 -0000 1.12 +++ obexftp.spec 7 Mar 2008 01:53:14 -0000 1.13 @@ -8,7 +8,7 @@ Summary: Tool to access devices via the OBEX protocol Group: Applications/File Version: 0.22 -Release: 0.8.%{pre}%{?dist} +Release: 0.9.%{pre}%{?dist} License: GPLv2+ URL: http://openobex.triq.net/ Source: http://triq.net/obexftp/%{name}-%{version}-%{pre}.tar.bz2 @@ -145,6 +145,9 @@ %{ruby_sitearch}/obexftp.so %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.22-0.9.rc9 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.22-0.8.rc9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:32 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:32 GMT Subject: rpms/ocsinventory-client/devel ocsinventory-client.spec,1.9,1.10 Message-ID: <200803070223.m272NWkk028609@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ocsinventory-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/ocsinventory-client/devel Modified Files: ocsinventory-client.spec Log Message: new perl Index: ocsinventory-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocsinventory-client/devel/ocsinventory-client.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ocsinventory-client.spec 15 Oct 2007 14:47:05 -0000 1.9 +++ ocsinventory-client.spec 7 Mar 2008 01:53:22 -0000 1.10 @@ -9,7 +9,7 @@ Name: ocsinventory-client Version: 1.01 -Release: 6%{?dist}%{?ocstag:.}%{?ocstag} +Release: 7%{?dist}%{?ocstag:.}%{?ocstag} Summary: Open Computer and Software Inventory Next Generation client Group: Development/Libraries @@ -180,6 +180,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.01-7 +Rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway 1.01-6 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:42 GMT Subject: rpms/perl-DBD-SQLite2/devel perl-DBD-SQLite2.spec,1.9,1.10 Message-ID: <200803070223.m272NgKT028807@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-DBD-SQLite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-DBD-SQLite2/devel Modified Files: perl-DBD-SQLite2.spec Log Message: new perl Index: perl-DBD-SQLite2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-SQLite2/devel/perl-DBD-SQLite2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-DBD-SQLite2.spec 20 Feb 2008 01:32:11 -0000 1.9 +++ perl-DBD-SQLite2.spec 7 Mar 2008 01:58:09 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite2 Version: 0.33 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Self Contained RDBMS in a DBI Driver (sqlite 2.x) Group: Development/Libraries License: GPL+ or Artistic @@ -48,6 +48,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.33-10 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 0.33-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:39 GMT Subject: rpms/perl-Finance-YahooQuote/devel perl-Finance-YahooQuote.spec, 1.2, 1.3 Message-ID: <200803070223.m272Nd3C028747@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Finance-YahooQuote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Finance-YahooQuote/devel Modified Files: perl-Finance-YahooQuote.spec Log Message: new perl Index: perl-Finance-YahooQuote.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Finance-YahooQuote/devel/perl-Finance-YahooQuote.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Finance-YahooQuote.spec 15 Oct 2007 20:46:00 -0000 1.2 +++ perl-Finance-YahooQuote.spec 7 Mar 2008 02:01:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Finance-YahooQuote Version: 0.21 -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: Perl interface to get stock quotes from Yahoo! Finance Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.21-3.1 +Rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway 0.21-2.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:43 GMT Subject: rpms/perl-SNMP-Info/devel perl-SNMP-Info.spec,1.1,1.2 Message-ID: <200803070223.m272NhDH028819@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-SNMP-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-SNMP-Info/devel Modified Files: perl-SNMP-Info.spec Log Message: new perl Index: perl-SNMP-Info.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-SNMP-Info/devel/perl-SNMP-Info.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-SNMP-Info.spec 22 Jan 2008 21:18:16 -0000 1.1 +++ perl-SNMP-Info.spec 7 Mar 2008 02:16:15 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-SNMP-Info Version: 1.04 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Object Oriented Perl5 Interface to Network devices and MIBs through SNMP License: BSD Group: Development/Libraries @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.04-4 +Rebuild for new perl + * Fri Dec 28 2007 1.04-3 - Specfile autogenerated by cpanspec 1.74. - Added missing BuildRequires lines. From fedora-extras-commits at redhat.com Fri Mar 7 02:23:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:25 GMT Subject: rpms/perl-libwhisker2/devel perl-libwhisker2.spec,1.2,1.3 Message-ID: <200803070223.m272NPOV028457@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-libwhisker2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-libwhisker2/devel Modified Files: perl-libwhisker2.spec Log Message: new perl Index: perl-libwhisker2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-libwhisker2/devel/perl-libwhisker2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-libwhisker2.spec 23 May 2007 01:34:21 -0000 1.2 +++ perl-libwhisker2.spec 7 Mar 2008 02:22:12 -0000 1.3 @@ -2,11 +2,11 @@ Obsoletes: perl-libwhisker <= 1.8 Provides: perl-libwhisker = %{version}-%{release} Version: 2.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl module geared specificly for HTTP testing Group: Development/Libraries -License: GPL +License: GPLv2+ URL: http://www.wiretrip.net/rfp/lw.asp Source0: http://www.wiretrip.net/rfp/libwhisker/libwhisker2-%{version}.tar.gz #install to vendorlib, not sitelib @@ -60,6 +60,9 @@ %{_mandir}/man?/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 2.4-4 +Rebuild for new perl + * Wed May 23 2007 Sindre Pedersen Bj??rdal - 2.4-3 - Fix patch to really include lw1 bridge * Tue May 08 2007 Sindre Pedersen Bj??rdal - 2.4-2 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-Class-Date/devel perl-Class-Date.spec,1.2,1.3 Message-ID: <200803070223.m272NZAZ028654@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Date/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Class-Date/devel Modified Files: perl-Class-Date.spec Log Message: new perl Index: perl-Class-Date.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Date/devel/perl-Class-Date.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Date.spec 18 Feb 2008 21:39:29 -0000 1.2 +++ perl-Class-Date.spec 7 Mar 2008 01:56:21 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Class-Date Version: 1.1.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Class for easy date and time manipulation Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.1.9-4 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 1.1.9-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:33 GMT Subject: rpms/perl-String-Approx/devel perl-String-Approx.spec,1.4,1.5 Message-ID: <200803070223.m272NXmA028626@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-String-Approx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-String-Approx/devel Modified Files: perl-String-Approx.spec Log Message: new perl Index: perl-String-Approx.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-String-Approx/devel/perl-String-Approx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-String-Approx.spec 19 Feb 2008 17:11:24 -0000 1.4 +++ perl-String-Approx.spec 7 Mar 2008 02:16:58 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-String-Approx Version: 3.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl extension for approximate matching (fuzzy matching) License: LGPLv2+ or Artistic Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 3.26-5 +Rebuild for new perl + * Tue Feb 19 2008 Fedora Release Engineering - 3.26-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:25:47 2008 From: fedora-extras-commits at redhat.com (Neal Becker (nbecker)) Date: Fri, 7 Mar 2008 02:25:47 GMT Subject: rpms/xdvipdfmx/devel xdvipdfmx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803070225.m272Pl3L029086@cvs-int.fedora.redhat.com> Author: nbecker Update of /cvs/pkgs/rpms/xdvipdfmx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28953/devel Modified Files: .cvsignore sources Added Files: xdvipdfmx.spec Log Message: Initial import --- NEW FILE xdvipdfmx.spec --- Summary: An extended version of DVIPDFMx with support for XeTeX output Name: xdvipdfmx Version: 0.4 Release: 3%{?dist} License: GPLv2+ Group: Applications/Publishing Source: http://scripts.sil.org/svn-view/xdvipdfmx/TAGS/xdvipdfmx-%{version}.tar.gz URL: http://scripts.sil.org/xetex_linux Requires: tex(tex), dvipdfmx # dvipdfmx is required because some data files are shared BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # to build, we need various -devel packages... BuildRequires: fontconfig-devel, freetype-devel, libpng-devel, zlib-devel, kpathsea-devel, libpaper-devel %description xdvipdfmx is an output driver for the XeTeX typesetting system. It is an extended version of DVIPDFMx by Jin-Hwan Cho and Shunsaku Hirata, which is itself an extended version of dvipdfm by Mark A. Wicks. This driver converts XDV (extended DVI) output from the xetex program into standard PDF that can be viewed or printed. # # # # # # # # # # # PREP # # # # # # # # # # %prep # setup macro does standard clean-and-unpack %setup -q # # # # # # # # # # # BUILD # # # # # # # # # # %build chmod +x configure %{configure} --with-freetype2=`freetype-config --prefix` make %{?_smp_mflags} # # # # # # # # # # # INSTALL # # # # # # # # # # %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # # # # # # # # # # # FILE LIST # # # # # # # # # # %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/xdvipdfmx %doc README AUTHORS BUGS COPYING TODO doc/tug2003.pdf index.html *.css %changelog * Thu Mar 6 2008 Neal Becker - 0.4-3 - Fix typo tex(tex) - Add dist * Thu Mar 6 2008 Neal Becker - 0.4-2 - Drop Vendor - Add Req dvipdfmx - Add doc - Add BR libpaper-devel - Drop Req fontconfig - Req changed to tex(tex) * Wed Mar 5 2008 Neal Becker - 0.4-1 - Update to 0.4 * Mon Mar 3 2008 Neal Becker - 0.3-1 - First try on Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xdvipdfmx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 00:25:42 -0000 1.1 +++ .cvsignore 7 Mar 2008 02:25:13 -0000 1.2 @@ -0,0 +1 @@ +xdvipdfmx-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xdvipdfmx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 00:25:42 -0000 1.1 +++ sources 7 Mar 2008 02:25:13 -0000 1.2 @@ -0,0 +1 @@ +2bb9d65f2406a112fa53dbd0697d93ad xdvipdfmx-0.4.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 02:35:23 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 7 Mar 2008 02:35:23 GMT Subject: comps comps-f9.xml.in,1.292,1.293 Message-ID: <200803070235.m272ZNlN031820@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31481 Modified Files: comps-f9.xml.in Log Message: Remove gnome-volume-manager from the GNOME group: http://bugzilla.gnome.org/show_bug.cgi?id=509823 Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.292 retrieving revision 1.293 diff -u -r1.292 -r1.293 --- comps-f9.xml.in 6 Mar 2008 17:24:17 -0000 1.292 +++ comps-f9.xml.in 7 Mar 2008 02:34:53 -0000 1.293 @@ -1788,7 +1788,6 @@ gnome-pilot-conduits gnome-schedule gnome-theme-curvylooks - gnome-volume-manager gnotime gonvert grsync From fedora-extras-commits at redhat.com Fri Mar 7 02:23:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:29 GMT Subject: rpms/perl-mecab/devel perl-mecab.spec,1.8,1.9 Message-ID: <200803070223.m272NTn3028541@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-mecab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-mecab/devel Modified Files: perl-mecab.spec Log Message: new perl Index: perl-mecab.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-mecab/devel/perl-mecab.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-mecab.spec 3 Feb 2008 12:45:57 -0000 1.8 +++ perl-mecab.spec 7 Mar 2008 02:22:18 -0000 1.9 @@ -60,6 +60,9 @@ %{perl_vendorarch}/auto/MeCab/ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.97-1 +Rebuild for new perl + * Sun Feb 3 2008 Mamoru Tasaka - 0.97-1 - 0.97 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:42 GMT Subject: rpms/perl-Net-Libdnet/devel perl-Net-Libdnet.spec,1.4,1.5 Message-ID: <200803070223.m272Ngur028808@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Net-Libdnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Net-Libdnet/devel Modified Files: perl-Net-Libdnet.spec Log Message: new perl Index: perl-Net-Libdnet.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Libdnet/devel/perl-Net-Libdnet.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Net-Libdnet.spec 5 Mar 2008 22:55:03 -0000 1.4 +++ perl-Net-Libdnet.spec 7 Mar 2008 02:11:53 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Net-Libdnet Version: 0.01 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Perl interface to libdnet Group: Development/Libraries @@ -51,6 +51,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.01-6 +Rebuild for new perl + * Wed Mar 5 2008 Tom "spot" Callaway - 0.01-5 - rebuild for new perl From fedora-extras-commits at redhat.com Fri Mar 7 02:23:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:40 GMT Subject: rpms/perl-Chatbot-Eliza/devel perl-Chatbot-Eliza.spec,1.3,1.4 Message-ID: <200803070223.m272Ne8a028771@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Chatbot-Eliza/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Chatbot-Eliza/devel Modified Files: perl-Chatbot-Eliza.spec Log Message: new perl Index: perl-Chatbot-Eliza.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Chatbot-Eliza/devel/perl-Chatbot-Eliza.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Chatbot-Eliza.spec 15 Oct 2007 18:27:02 -0000 1.3 +++ perl-Chatbot-Eliza.spec 7 Mar 2008 01:56:01 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Chatbot-Eliza Version: 1.04 -Release: 3%{?dist}.1 +Release: 4%{?dist} Summary: Implementation of the Eliza algorithm License: GPL+ or Artistic Group: Development/Libraries @@ -55,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.04-4.1 +Rebuild for new perl + * Mon Oct 15 2007 Tom "spot" Callaway 1.04-3.1 - correct license tag - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:38 GMT Subject: rpms/mailgraph/devel mailgraph.spec,1.6,1.7 Message-ID: <200803070223.m272NcJt028731@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/mailgraph/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/mailgraph/devel Modified Files: mailgraph.spec Log Message: new perl Index: mailgraph.spec =================================================================== RCS file: /cvs/pkgs/rpms/mailgraph/devel/mailgraph.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mailgraph.spec 31 Oct 2007 01:48:23 -0000 1.6 +++ mailgraph.spec 7 Mar 2008 01:52:59 -0000 1.7 @@ -2,11 +2,11 @@ Name: mailgraph Version: 1.14 -Release: 1%{?dist}%{?repotag:.%{repotag}} +Release: 2%{?dist}%{?repotag:.%{repotag}} Summary: A RRDtool frontend for Mail statistics Group: System Environment/Daemons -License: GPL +License: GPL+ URL: http://mailgraph.schweikert.ch/ Source0: http://mailgraph.schweikert.ch/pub/%{name}-%{version}.tar.gz @@ -179,6 +179,9 @@ %doc selinux/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 1.14-2 +Rebuild for new perl + * Tue Oct 30 2007 Bernard Johnson - 1.14-1 - v 1.14 - fix broken URLs (bz #251280) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:38 GMT Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.49,1.50 Message-ID: <200803070223.m272NcSO028732@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/xchat-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/xchat-gnome/devel Modified Files: xchat-gnome.spec Log Message: new perl Index: xchat-gnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- xchat-gnome.spec 13 Feb 2008 00:59:05 -0000 1.49 +++ xchat-gnome.spec 7 Mar 2008 02:23:03 -0000 1.50 @@ -1,6 +1,6 @@ Name: xchat-gnome Version: 0.18 -Release: 9%{?dist} +Release: 10%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -130,6 +130,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.18-10 +Rebuild for new perl + * Tue Feb 12 2008 Brian Pepple - 0.18-9 - Updated away/back patch. (#430883) From fedora-extras-commits at redhat.com Fri Mar 7 02:23:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:31 GMT Subject: rpms/perl-Acme-Damn/devel perl-Acme-Damn.spec,1.4,1.5 Message-ID: <200803070223.m272NV8V028584@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Acme-Damn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-Acme-Damn/devel Modified Files: perl-Acme-Damn.spec Log Message: new perl Index: perl-Acme-Damn.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Acme-Damn/devel/perl-Acme-Damn.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Acme-Damn.spec 18 Feb 2008 23:07:24 -0000 1.4 +++ perl-Acme-Damn.spec 7 Mar 2008 01:53:56 -0000 1.5 @@ -1,8 +1,8 @@ Name: perl-Acme-Damn Version: 0.03 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Unbless Perl objects -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Acme-Damn/ Source0: http://www.cpan.org/authors/id/I/IB/IBB/Acme-Damn-%{version}.tar.gz @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.03-6 +Rebuild for new perl + * Mon Feb 18 2008 Fedora Release Engineering - 0.03-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:40 GMT Subject: rpms/perl-POE-Component-IRC/devel perl-POE-Component-IRC.spec, 1.18, 1.19 Message-ID: <200803070223.m272NeLZ028776@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-IRC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-POE-Component-IRC/devel Modified Files: perl-POE-Component-IRC.spec Log Message: new perl Index: perl-POE-Component-IRC.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-IRC/devel/perl-POE-Component-IRC.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-POE-Component-IRC.spec 5 May 2007 21:19:48 -0000 1.18 +++ perl-POE-Component-IRC.spec 7 Mar 2008 02:13:52 -0000 1.19 @@ -11,11 +11,11 @@ Name: perl-POE-Component-IRC Version: 5.29 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A POE component for building IRC clients Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/POE-Component-IRC Source0: http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/POE-Component-IRC-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -88,6 +88,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 5.29-2 +Rebuild for new perl + * Sat May 05 2007 Chris Weyl 5.29-1 - update to 5.29 From fedora-extras-commits at redhat.com Fri Mar 7 02:23:35 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 02:23:35 GMT Subject: rpms/perl-POE-Component-JobQueue/devel perl-POE-Component-JobQueue.spec, 1.4, 1.5 Message-ID: <200803070223.m272NZO6028657@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-POE-Component-JobQueue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13441/perl-POE-Component-JobQueue/devel Modified Files: perl-POE-Component-JobQueue.spec Log Message: new perl Index: perl-POE-Component-JobQueue.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-POE-Component-JobQueue/devel/perl-POE-Component-JobQueue.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-POE-Component-JobQueue.spec 1 Sep 2006 04:19:08 -0000 1.4 +++ perl-POE-Component-JobQueue.spec 7 Mar 2008 02:14:01 -0000 1.5 @@ -4,12 +4,12 @@ Name: perl-POE-Component-JobQueue Version: %{rpmver} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Process a large number of tasks with a finite number of workers Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/POE-Component-JobQueue Source0: http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-JobQueue-%{cpanver}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,6 +63,9 @@ %changelog +* Thu Mar 06 2008 Tom "spot" Callaway - 0.5500-3 +Rebuild for new perl + * Thu Aug 31 2006 Chris Weyl 0.5500-2 - bump for mass rebuild From fedora-extras-commits at redhat.com Fri Mar 7 03:06:35 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 7 Mar 2008 03:06:35 GMT Subject: rpms/gnome-media/devel gnome-media.spec,1.123,1.124 Message-ID: <200803070306.m2736ZtW012891@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-media/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12835 Modified Files: gnome-media.spec Log Message: ExcludeArch ppc Index: gnome-media.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- gnome-media.spec 7 Mar 2008 02:19:56 -0000 1.123 +++ gnome-media.spec 7 Mar 2008 03:05:42 -0000 1.124 @@ -27,6 +27,9 @@ URL: http://www.gnome.org ExcludeArch: s390 s390x +# See bug 435771 +ExcludeArch: ppc ppc64 + Requires(post): scrollkeeper >= 0.1.4 Requires(postun): scrollkeeper >= 0.1.4 Requires(post): GConf2 >= 2.14 From fedora-extras-commits at redhat.com Fri Mar 7 03:19:33 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 7 Mar 2008 03:19:33 GMT Subject: rpms/file-roller/devel file-roller.spec,1.112,1.113 Message-ID: <200803070319.m273JXet013260@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/file-roller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13145 Modified Files: file-roller.spec Log Message: Don't OnlyShowIn=GNOME Index: file-roller.spec =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- file-roller.spec 26 Feb 2008 04:10:14 -0000 1.112 +++ file-roller.spec 7 Mar 2008 03:18:59 -0000 1.113 @@ -11,7 +11,7 @@ Summary: File Roller is a tool for viewing and creating archives Name: file-roller Version: 2.21.92 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://download.gnome.org/sources/file-roller/ @@ -65,7 +65,6 @@ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-only-show-in GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/* rm -rf $RPM_BUILD_ROOT/var/scrollkeeper @@ -125,6 +124,9 @@ %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Thu Mar 6 2008 Matthias Clasen - 2.21.92-2 +- Don't OnlyShowIn=GNOME + * Mon Feb 25 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 From fedora-extras-commits at redhat.com Fri Mar 7 03:31:41 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 7 Mar 2008 03:31:41 GMT Subject: rpms/file-roller/devel file-roller.spec,1.113,1.114 Message-ID: <200803070331.m273VfmM013507@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/file-roller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13470 Modified Files: file-roller.spec Log Message: Don't OnlyShowIn=GNOME Index: file-roller.spec =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- file-roller.spec 7 Mar 2008 03:18:59 -0000 1.113 +++ file-roller.spec 7 Mar 2008 03:30:53 -0000 1.114 @@ -65,6 +65,7 @@ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --remove-only-show-in=GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/* rm -rf $RPM_BUILD_ROOT/var/scrollkeeper From fedora-extras-commits at redhat.com Fri Mar 7 03:51:48 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 7 Mar 2008 03:51:48 GMT Subject: rpms/yum-utils/devel yum-downloader-archlist.patch,1.1,1.2 Message-ID: <200803070351.m273pmAn013863@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13841 Modified Files: yum-downloader-archlist.patch Log Message: look it's a better patch, just for jkeating, b/c we love him so. yum-downloader-archlist.patch: Index: yum-downloader-archlist.patch =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-downloader-archlist.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yum-downloader-archlist.patch 6 Mar 2008 20:36:54 -0000 1.1 +++ yum-downloader-archlist.patch 7 Mar 2008 03:51:43 -0000 1.2 @@ -1,8 +1,59 @@ -diff --git a/yumdownloader.py b/yumdownloader.py -index ebfed81..5252ad4 100755 ---- a/yumdownloader.py -+++ b/yumdownloader.py -@@ -226,6 +226,8 @@ class YumDownloader(YumUtilBase): +--- a/yumdownloader.py 2008-03-06 22:48:24.000000000 -0500 ++++ b/yumdownloader.py 2008-03-06 14:34:12.000000000 -0500 +@@ -64,9 +64,12 @@ + self.logger.error("Error: Could not make cachedir, exiting") + sys.exit(50) + self.repos.setCacheDir(cachedir) +- # Turn of cache +- self.conf.cache = 0 + ++ # Turn off cache ++ self.conf.cache = 0 ++ # make sure the repos know about it, too ++ self.repos.setCache(0) ++ + # Setup yum (Ts, RPM db, Repo & Sack) + self.doUtilYumSetup(opts) + # Setup source repos +@@ -116,14 +119,12 @@ + + def downloadPackages(self,opts): + +- avail = self.pkgSack.returnPackages() +- + toDownload = [] + + packages = self.cmds + for pkg in packages: + toActOn = [] +- exactmatch, matched, unmatched = parsePackages(avail, [pkg]) ++ exactmatch, matched, unmatched = parsePackages(self.pkgSack.returnPackages(), [pkg]) + installable = yum.misc.unique(exactmatch + matched) + if len(unmatched) > 0: # if we get back anything in unmatched, it fails + self.logger.error('No Match for argument %s' % pkg) +@@ -160,7 +161,7 @@ + toDownload.extend(self.bestPackagesFromList(toActOn, 'src')) + else: + toDownload.extend(self.bestPackagesFromList(toActOn)) +- ++ + # If the user supplies to --resolve flag, resolve dependencies for + # all packages + # note this might require root access because the headers need to be +@@ -215,18 +216,18 @@ + size=os.stat(path).st_size) + shutil.copy2(path, local) + progress.end(progress.size) +- ++ + # sligly modified from the one in YumUtilBase + def doUtilYumSetup(self,opts): + """do a default setup for all the normal/necessary yum components, + really just a shorthand for testing""" + try: +- self._getTs() +- self._getRpmDB() + self._getRepos() # if '--source' is used the add src to the archlist if opts.source: archlist = rpmUtils.arch.getArchList() + ['src'] @@ -11,7 +62,7 @@ else: archlist = rpmUtils.arch.getArchList() self._getSacks(archlist=archlist) -@@ -250,7 +252,8 @@ class YumDownloader(YumUtilBase): +@@ -251,7 +252,8 @@ help='resolve dependencies and download required packages') parser.add_option("--source", default=False, dest="source", action="store_true", help='operate on source packages') @@ -20,4 +71,4 @@ + help="only download packages of certain architecture(s)") if __name__ == '__main__': util = YumDownloader() - \ No newline at end of file + From fedora-extras-commits at redhat.com Fri Mar 7 03:54:47 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 7 Mar 2008 03:54:47 GMT Subject: rpms/gedit/devel gedit.spec,1.151,1.152 Message-ID: <200803070354.m273slKs013952@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13909 Modified Files: gedit.spec Log Message: Don't OnlyShowIn=GNOME Index: gedit.spec =================================================================== RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- gedit.spec 26 Feb 2008 04:31:25 -0000 1.151 +++ gedit.spec 7 Mar 2008 03:54:12 -0000 1.152 @@ -18,7 +18,7 @@ Summary: gEdit is a small but powerful text editor for GNOME Name: gedit Version: 2.21.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: Applications/Editors @@ -125,7 +125,6 @@ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-only-show-in GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/* ## clean up all the static libs for plugins (workaround for no -module) @@ -194,6 +193,9 @@ %changelog +* Thu Mar 6 2008 Matthias Clasen - 1:2.21.2-2 +- Don't OnlyShowIn=GNOME + * Mon Feb 25 2008 Matthias Clasen - 1:2.21.2-1 - Update to 2.21.2 From fedora-extras-commits at redhat.com Fri Mar 7 04:10:36 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 7 Mar 2008 04:10:36 GMT Subject: rpms/firefox/devel .cvsignore, 1.63, 1.64 firefox.spec, 1.268, 1.269 sources, 1.74, 1.75 Message-ID: <200803070410.m274AaCT024048@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23880 Modified Files: .cvsignore firefox.spec sources Log Message: * Thu Mar 6 2008 Christopher Aillon 3.0-0.beta3.35 - Update to latest trunk (2008-03-06) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 5 Mar 2008 03:44:01 -0000 1.63 +++ .cvsignore 7 Mar 2008 04:09:57 -0000 1.64 @@ -1 +1 @@ -mozilla-20080304.tar.bz2 +mozilla-20080306.tar.bz2 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- firefox.spec 5 Mar 2008 03:49:21 -0000 1.268 +++ firefox.spec 7 Mar 2008 04:09:57 -0000 1.269 @@ -7,20 +7,20 @@ %define mozappdir %{_libdir}/%{name}-%{version_internal} %define gecko_version 1.9 -%define xulrunner_version 1.9-0.beta4.34 +%define xulrunner_version 1.9-0.beta4.35 %define official_branding 0 %define build_langpacks 0 %if ! %{official_branding} -%define cvsdate 20080304 +%define cvsdate 20080306 %define nightly .nightly%{cvsdate} %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.beta4.34%{?nightly}%{?dist} +Release: 0.beta4.35%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -315,6 +315,9 @@ #--------------------------------------------------------------------- %changelog +* Thu Mar 6 2008 Christopher Aillon 3.0-0.beta3.35 +- Update to latest trunk (2008-03-06) + * Tue Mar 4 2008 Christopher Aillon 3.0-0.beta3.34 - Update to latest trunk (2008-03-04) Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 5 Mar 2008 03:44:01 -0000 1.74 +++ sources 7 Mar 2008 04:09:57 -0000 1.75 @@ -1 +1 @@ -c487d5d5ce437b43f342a5a8657e0527 mozilla-20080304.tar.bz2 +fbff40b3066f26c96d634225a3e6c0cb mozilla-20080306.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 04:11:12 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 7 Mar 2008 04:11:12 GMT Subject: rpms/xulrunner/devel .cvsignore, 1.33, 1.34 sources, 1.34, 1.35 xulrunner.spec, 1.85, 1.86 mozilla-gcc43.patch, 1.2, NONE Message-ID: <200803070411.m274BC5w024188@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24037 Modified Files: .cvsignore sources xulrunner.spec Removed Files: mozilla-gcc43.patch Log Message: * Thu Mar 6 2008 Christopher Aillon 1.9-0.beta4.35 - Update to latest trunk (2008-03-06) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 5 Mar 2008 03:43:15 -0000 1.33 +++ .cvsignore 7 Mar 2008 04:10:31 -0000 1.34 @@ -1 +1 @@ -mozilla-20080304.tar.bz2 +mozilla-20080306.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 5 Mar 2008 03:43:15 -0000 1.34 +++ sources 7 Mar 2008 04:10:31 -0000 1.35 @@ -1 +1 @@ -c487d5d5ce437b43f342a5a8657e0527 mozilla-20080304.tar.bz2 +fbff40b3066f26c96d634225a3e6c0cb mozilla-20080306.tar.bz2 Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- xulrunner.spec 5 Mar 2008 22:55:30 -0000 1.85 +++ xulrunner.spec 7 Mar 2008 04:10:31 -0000 1.86 @@ -7,14 +7,14 @@ %define version_internal 1.9pre %if ! %{official_branding} -%define cvsdate 20080304 +%define cvsdate 20080306 %define nightly .nightly%{cvsdate} %endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.beta4.34%{?nightly}%{?dist} +Release: 0.beta4.35%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -34,7 +34,6 @@ Patch4: mozilla-build.patch Patch5: xulrunner-path.patch Patch6: xulrunner-version.patch -Patch7: mozilla-gcc43.patch # customization patches @@ -119,7 +118,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -b .ver -%patch7 -p1 -b .gcc43 %patch107 -p1 -b .pk @@ -400,6 +398,9 @@ #--------------------------------------------------------------------- %changelog +* Thu Mar 6 2008 Christopher Aillon 1.9-0.beta4.35 +- Update to latest trunk (2008-03-06) + * Tue Mar 4 2008 Christopher Aillon 1.9-0.beta4.34 - Update to latest trunk (2008-03-04) --- mozilla-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 7 04:13:57 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 04:13:57 GMT Subject: rpms/yum-utils/devel yum-downloader-archlist.patch, 1.2, 1.3 yum-utils.spec, 1.31, 1.32 Message-ID: <200803070413.m274Dvfx024756@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24733 Modified Files: yum-downloader-archlist.patch yum-utils.spec Log Message: * Thu Mar 06 2008 Jesse Keating - 1.1.11-4 - Update yumdownloader to git HEAD for complete archlist support. yum-downloader-archlist.patch: Index: yum-downloader-archlist.patch =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-downloader-archlist.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yum-downloader-archlist.patch 7 Mar 2008 03:51:43 -0000 1.2 +++ yum-downloader-archlist.patch 7 Mar 2008 04:13:53 -0000 1.3 @@ -31,8 +31,13 @@ installable = yum.misc.unique(exactmatch + matched) if len(unmatched) > 0: # if we get back anything in unmatched, it fails self.logger.error('No Match for argument %s' % pkg) -@@ -160,7 +161,7 @@ +@@ -158,9 +159,12 @@ class YumDownloader(YumUtilBase): + if toActOn: + if opts.source: toDownload.extend(self.bestPackagesFromList(toActOn, 'src')) ++ elif opts.archlist: ++ for arch in opts.archlist.split(','): ++ toDownload.extend(self.bestPackagesFromList(toActOn, arch)) else: toDownload.extend(self.bestPackagesFromList(toActOn)) - Index: yum-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- yum-utils.spec 6 Mar 2008 20:52:52 -0000 1.31 +++ yum-utils.spec 7 Mar 2008 04:13:53 -0000 1.32 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.11 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -402,6 +402,9 @@ %changelog +* Thu Mar 06 2008 Jesse Keating - 1.1.11-4 +- Update yumdownloader to git HEAD for complete archlist support. + * Thu Mar 6 2008 Seth Vidal - 1.1.11-3 - add archlist patch to yumdownloader so things can be built again. From fedora-extras-commits at redhat.com Fri Mar 7 04:16:40 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 7 Mar 2008 04:16:40 GMT Subject: rpms/gnome-games/devel gnome-games.spec,1.163,1.164 Message-ID: <200803070416.m274Gequ025323@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25140 Modified Files: gnome-games.spec Log Message: Drop OnlyShowIn=GNOME Index: gnome-games.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- gnome-games.spec 26 Feb 2008 05:57:54 -0000 1.163 +++ gnome-games.spec 7 Mar 2008 04:16:04 -0000 1.164 @@ -44,7 +44,7 @@ Summary: GNOME games Name: gnome-games Version: 2.21.92 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ and GFDL+ Group: Amusements/Games @@ -153,7 +153,6 @@ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-only-show-in GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/gnome-glines.desktop \ $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnect.desktop \ %{card_desktops} @@ -330,6 +329,9 @@ %changelog +* Thu Mar 6 2008 Matthias Clasen - 1:2.21.92-2 +- Drop OnlyShowIn=GNOME + * Tue Feb 26 2008 Matthias Clasen - 1:2.21.92-1 - Update to 2.21.92 From fedora-extras-commits at redhat.com Fri Mar 7 04:35:48 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Fri, 7 Mar 2008 04:35:48 GMT Subject: rpms/xcompmgr/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xcompmgr.spec, 1.6, 1.7 Message-ID: <200803070435.m274Zmnf028130@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/xcompmgr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28100 Modified Files: .cvsignore sources xcompmgr.spec Log Message: * Thu Mar 06 2008 Deji Akingunola - 1.1.4-1 - New release 1.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xcompmgr/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jun 2006 16:37:30 -0000 1.2 +++ .cvsignore 7 Mar 2008 04:35:10 -0000 1.3 @@ -1 +1 @@ -xcompmgr-1.1.3.tar.gz +xcompmgr-1.1.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xcompmgr/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jun 2006 16:37:30 -0000 1.2 +++ sources 7 Mar 2008 04:35:10 -0000 1.3 @@ -1 +1 @@ -44ccbafa8484b7e0c00e5c83cd915adc xcompmgr-1.1.3.tar.gz +3eb1c2b7a6ceaec4ee872cb06d202d91 xcompmgr-1.1.4.tar.bz2 Index: xcompmgr.spec =================================================================== RCS file: /cvs/extras/rpms/xcompmgr/devel/xcompmgr.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xcompmgr.spec 11 Feb 2008 04:55:55 -0000 1.6 +++ xcompmgr.spec 7 Mar 2008 04:35:10 -0000 1.7 @@ -1,11 +1,11 @@ Summary: X11 composite manager Name: xcompmgr -Version: 1.1.3 -Release: 8%{?dist} +Version: 1.1.4 +Release: 1%{?dist} License: Copyright only Group: User Interface/X URL: http://xapps.freedesktop.org -Source0: http://xapps.freedesktop.org/release/%{name}-%{version}.tar.gz +Source0: http://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel BuildRequires: libXfixes-devel @@ -40,6 +40,9 @@ %{_mandir}/man1/xcompmgr.1.gz %changelog +* Thu Mar 06 2008 Deji Akingunola - 1.1.4-1 +- New release 1.1.4 + * Sun Feb 10 2008 Deji Akingunola - 1.1.3-8 - Rebuild for gcc43 From fedora-extras-commits at redhat.com Fri Mar 7 04:45:13 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Fri, 7 Mar 2008 04:45:13 GMT Subject: rpms/gnome-system-monitor/devel gnome-system-monitor.spec, 1.107, 1.108 Message-ID: <200803070445.m274jDQk028412@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-system-monitor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28369 Modified Files: gnome-system-monitor.spec Log Message: Don't OnlyShowIn=GNOME Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- gnome-system-monitor.spec 26 Feb 2008 05:13:51 -0000 1.107 +++ gnome-system-monitor.spec 7 Mar 2008 04:44:39 -0000 1.108 @@ -13,7 +13,7 @@ Summary: Simple process monitor Name: gnome-system-monitor Version: 2.21.92 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.gnome.org/ @@ -73,7 +73,6 @@ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-only-show-in GNOME \ --remove-category Application \ $RPM_BUILD_ROOT%{_datadir}/applications/* @@ -119,6 +118,9 @@ %changelog +* Thu Mar 6 2008 Matthias Clasen - 2.21.92-2 +- Don't OnlyShowIn=GNOME + * Mon Feb 25 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 From fedora-extras-commits at redhat.com Fri Mar 7 05:01:51 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Fri, 7 Mar 2008 05:01:51 GMT Subject: rpms/xcompmgr/F-8 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xcompmgr.spec, 1.5, 1.6 Message-ID: <200803070501.m2751p0f003509@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/xcompmgr/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3332 Modified Files: .cvsignore sources xcompmgr.spec Log Message: * Thu Mar 06 2008 Deji Akingunola - 1.1.4-1 - New release 1.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xcompmgr/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jun 2006 16:37:30 -0000 1.2 +++ .cvsignore 7 Mar 2008 05:01:14 -0000 1.3 @@ -1 +1 @@ -xcompmgr-1.1.3.tar.gz +xcompmgr-1.1.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xcompmgr/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jun 2006 16:37:30 -0000 1.2 +++ sources 7 Mar 2008 05:01:14 -0000 1.3 @@ -1 +1 @@ -44ccbafa8484b7e0c00e5c83cd915adc xcompmgr-1.1.3.tar.gz +3eb1c2b7a6ceaec4ee872cb06d202d91 xcompmgr-1.1.4.tar.bz2 Index: xcompmgr.spec =================================================================== RCS file: /cvs/extras/rpms/xcompmgr/F-8/xcompmgr.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xcompmgr.spec 22 Aug 2007 11:48:48 -0000 1.5 +++ xcompmgr.spec 7 Mar 2008 05:01:14 -0000 1.6 @@ -1,19 +1,19 @@ -Summary: X11 composite manager -Name: xcompmgr -Version: 1.1.3 -Release: 7%{?dist} -License: Copyright only -Group: User Interface/X -URL: http://xapps.freedesktop.org -Source0: http://xapps.freedesktop.org/release/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libX11-devel -BuildRequires: libXfixes-devel -BuildRequires: libXrender-devel -BuildRequires: libXdamage-devel -BuildRequires: libXcomposite-devel -BuildRequires: libXext-devel -BuildRequires: pkgconfig +Summary: X11 composite manager +Name: xcompmgr +Version: 1.1.4 +Release: 1%{?dist} +License: Copyright only +Group: User Interface/X +URL: http://xapps.freedesktop.org +Source0: http://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libX11-devel +BuildRequires: libXfixes-devel +BuildRequires: libXrender-devel +BuildRequires: libXdamage-devel +BuildRequires: libXcomposite-devel +BuildRequires: libXext-devel +BuildRequires: pkgconfig %description xcompmgr is a sample compositing manager for X servers supporting the XFIXES, @@ -40,6 +40,9 @@ %{_mandir}/man1/xcompmgr.1.gz %changelog +* Thu Mar 06 2008 Deji Akingunola - 1.1.4-1 +- New release 1.1.4 + * Wed Aug 22 2007 Deji Akingunola - 1.1.3-7 - Update License tag and Rebuild From fedora-extras-commits at redhat.com Fri Mar 7 05:15:07 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Fri, 7 Mar 2008 05:15:07 GMT Subject: rpms/xcompmgr/F-7 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xcompmgr.spec, 1.4, 1.5 Message-ID: <200803070515.m275F7vT003822@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/xcompmgr/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3790 Modified Files: .cvsignore sources xcompmgr.spec Log Message: * Thu Mar 06 2008 Deji Akingunola - 1.1.4-1 - New release 1.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xcompmgr/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jun 2006 16:37:30 -0000 1.2 +++ .cvsignore 7 Mar 2008 05:14:31 -0000 1.3 @@ -1 +1 @@ -xcompmgr-1.1.3.tar.gz +xcompmgr-1.1.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xcompmgr/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jun 2006 16:37:30 -0000 1.2 +++ sources 7 Mar 2008 05:14:31 -0000 1.3 @@ -1 +1 @@ -44ccbafa8484b7e0c00e5c83cd915adc xcompmgr-1.1.3.tar.gz +3eb1c2b7a6ceaec4ee872cb06d202d91 xcompmgr-1.1.4.tar.bz2 Index: xcompmgr.spec =================================================================== RCS file: /cvs/extras/rpms/xcompmgr/F-7/xcompmgr.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xcompmgr.spec 28 Aug 2006 20:28:48 -0000 1.4 +++ xcompmgr.spec 7 Mar 2008 05:14:31 -0000 1.5 @@ -1,19 +1,19 @@ -Summary: X11 composite manager -Name: xcompmgr -Version: 1.1.3 -Release: 6%{?dist} -License: STL -Group: User Interface/X -URL: http://xapps.freedesktop.org -Source0: http://xapps.freedesktop.org/release/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libX11-devel -BuildRequires: libXfixes-devel -BuildRequires: libXrender-devel -BuildRequires: libXdamage-devel -BuildRequires: libXcomposite-devel -BuildRequires: libXext-devel -BuildRequires: pkgconfig +Summary: X11 composite manager +Name: xcompmgr +Version: 1.1.4 +Release: 1%{?dist} +License: Copyright only +Group: User Interface/X +URL: http://xapps.freedesktop.org +Source0: http://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libX11-devel +BuildRequires: libXfixes-devel +BuildRequires: libXrender-devel +BuildRequires: libXdamage-devel +BuildRequires: libXcomposite-devel +BuildRequires: libXext-devel +BuildRequires: pkgconfig %description xcompmgr is a sample compositing manager for X servers supporting the XFIXES, @@ -40,6 +40,12 @@ %{_mandir}/man1/xcompmgr.1.gz %changelog +* Thu Mar 06 2008 Deji Akingunola - 1.1.4-1 +- New release 1.1.4 + +* Wed Aug 22 2007 Deji Akingunola - 1.1.3-7 +- Update License tag + * Mon Aug 28 2006 Deji Akingunola - 1.1.3-6 - Rebuild for FC6 From fedora-extras-commits at redhat.com Fri Mar 7 05:22:10 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 7 Mar 2008 05:22:10 GMT Subject: rpms/perl-mecab/devel perl-mecab.spec,1.9,1.10 Message-ID: <200803070522.m275MABN003994@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/perl-mecab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3969 Modified Files: perl-mecab.spec Log Message: bump Index: perl-mecab.spec =================================================================== RCS file: /cvs/extras/rpms/perl-mecab/devel/perl-mecab.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-mecab.spec 7 Mar 2008 02:22:18 -0000 1.9 +++ perl-mecab.spec 7 Mar 2008 05:21:32 -0000 1.10 @@ -1,6 +1,6 @@ %define mainver 0.97 %undefine betaver -%define relnumber 1 +%define relnumber 2 %define srcname mecab-perl Name: perl-mecab @@ -60,8 +60,8 @@ %{perl_vendorarch}/auto/MeCab/ %changelog -* Thu Mar 06 2008 Tom "spot" Callaway - 0.97-1 -Rebuild for new perl +* Fri Mar 7 2008 Mamoru Tasaka - 0.97-2 +- Rebuild for new perl * Sun Feb 3 2008 Mamoru Tasaka - 0.97-1 - 0.97 From fedora-extras-commits at redhat.com Fri Mar 7 05:24:03 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 7 Mar 2008 05:24:03 GMT Subject: rpms/perl-mecab/devel perl-mecab.spec,1.10,1.11 Message-ID: <200803070524.m275O3jj004041@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/perl-mecab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4015 Modified Files: perl-mecab.spec Log Message: Index: perl-mecab.spec =================================================================== RCS file: /cvs/extras/rpms/perl-mecab/devel/perl-mecab.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-mecab.spec 7 Mar 2008 05:21:32 -0000 1.10 +++ perl-mecab.spec 7 Mar 2008 05:23:29 -0000 1.11 @@ -61,7 +61,7 @@ %changelog * Fri Mar 7 2008 Mamoru Tasaka - 0.97-2 -- Rebuild for new perl +- Rebuild for new perl (F-9) * Sun Feb 3 2008 Mamoru Tasaka - 0.97-1 - 0.97 From fedora-extras-commits at redhat.com Fri Mar 7 06:47:18 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 7 Mar 2008 06:47:18 GMT Subject: rpms/kernel/devel linux-2.6-firewire-git-pending.patch,1.12,1.13 Message-ID: <200803070647.m276lI62012378@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12350 Modified Files: linux-2.6-firewire-git-pending.patch Log Message: Minor tweak to firewire-git-pending patch linux-2.6-firewire-git-pending.patch: Index: linux-2.6-firewire-git-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6-firewire-git-pending.patch 6 Mar 2008 05:31:30 -0000 1.12 +++ linux-2.6-firewire-git-pending.patch 7 Mar 2008 06:46:59 -0000 1.13 @@ -532,6 +532,9 @@ } init_completion(&orb->done); + + + Per the SBP-2 specification, all SBP-2 target devices must have a BUSY_TIMEOUT register. Per the 1394-1995 specification, the retry_limt portion of the register should be set to 0x0 initially, and set on the target by a logged in @@ -558,32 +561,25 @@ --- - drivers/firewire/fw-sbp2.c | 34 ++++++++++++++++++++++++++++++---- - 1 files changed, 30 insertions(+), 4 deletions(-) +Update: use CSR_BUSY_TIMEOUT from fw-transaction.h instead of needlessly + creating an SBP2_BUSY_TIMEOUT + + drivers/firewire/fw-sbp2.c | 31 +++++++++++++++++++++++++++---- + 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c -index 9813642..05559bb 100644 +index d6d62c6..fbf5b7a 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c -@@ -174,6 +174,7 @@ struct sbp2_target { +@@ -173,6 +173,7 @@ struct sbp2_target { #define SBP2_ORB_TIMEOUT 2000U /* Timeout in ms */ #define SBP2_ORB_NULL 0x80000000 #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 -+#define SBP2_RETRY_LIMIT 0xf ++#define SBP2_RETRY_LIMIT 0xf /* 15 retries */ /* Unit directory keys */ #define SBP2_CSR_UNIT_CHARACTERISTICS 0x3a -@@ -192,6 +193,9 @@ struct sbp2_target { - #define SBP2_LOGICAL_UNIT_RESET 0xe - #define SBP2_TARGET_RESET_REQUEST 0xf - -+/* Offset to transaction layer BUSY_TIMEOUT register (SBP-2 spec, seciton 6.2 */ -+#define SBP2_BUSY_TIMEOUT 0x210 -+ - /* Offsets for command block agent registers */ - #define SBP2_AGENT_STATE 0x00 - #define SBP2_AGENT_RESET 0x04 -@@ -811,6 +815,30 @@ static void sbp2_target_put(struct sbp2_target *tgt) +@@ -800,6 +801,30 @@ static void sbp2_target_put(struct sbp2_target *tgt) kref_put(&tgt->kref, sbp2_release_target); } @@ -601,12 +597,12 @@ + struct fw_transaction t; + static u32 busy_timeout; + -+ /* FIXME: should we try to set cycle_limit and second_limit too? */ ++ /* FIXME: we should try to set dual-phase cycle_limit too */ + busy_timeout = cpu_to_be32(SBP2_RETRY_LIMIT); + + fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST, + lu->tgt->node_id, lu->generation, device->max_speed, -+ CSR_REGISTER_BASE + SBP2_BUSY_TIMEOUT, &busy_timeout, ++ CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, &busy_timeout, + sizeof(busy_timeout), complete_set_busy_timeout, &done); + wait_for_completion(&done); +} @@ -614,7 +610,7 @@ static void sbp2_reconnect(struct work_struct *work); static void sbp2_login(struct work_struct *work) -@@ -862,10 +890,8 @@ static void sbp2_login(struct work_struct *work) +@@ -851,10 +876,8 @@ static void sbp2_login(struct work_struct *work) fw_notify("%s: logged in to LUN %04x (%d retries)\n", tgt->bus_id, lu->lun, lu->retries); @@ -628,7 +624,7 @@ PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect); sbp2_agent_reset(lu); - +--- Try to write dual-phase retry protocol limits to BUSY_TIMEOUT register. - The dual-phase retry protocol is optional to implement, and if not @@ -645,24 +641,26 @@ Signed-off-by: Jarod Wilson --- +Update: refresh for updated patch 1/2 using CSR_BUSY_TIMEOUT + drivers/firewire/fw-sbp2.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c -index 05559bb..5adb38c 100644 +index fbf5b7a..763f653 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c -@@ -174,7 +174,8 @@ struct sbp2_target { +@@ -173,7 +173,8 @@ struct sbp2_target { #define SBP2_ORB_TIMEOUT 2000U /* Timeout in ms */ #define SBP2_ORB_NULL 0x80000000 #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 --#define SBP2_RETRY_LIMIT 0xf +-#define SBP2_RETRY_LIMIT 0xf /* 15 retries */ +#define SBP2_RETRY_LIMIT 0xf /* 15 retries */ +#define SBP2_CYCLE_LIMIT (0xc8 << 12) /* 200 125us cycles */ /* Unit directory keys */ #define SBP2_CSR_UNIT_CHARACTERISTICS 0x3a -@@ -822,6 +823,22 @@ complete_set_busy_timeout(struct fw_card *card, int rcode, +@@ -808,6 +809,22 @@ complete_set_busy_timeout(struct fw_card *card, int rcode, complete(done); } @@ -685,16 +683,13 @@ static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu) { struct fw_device *device = fw_device(lu->tgt->unit->device.parent); -@@ -829,8 +846,7 @@ static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu) +@@ -815,8 +832,7 @@ static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu) struct fw_transaction t; static u32 busy_timeout; -- /* FIXME: should we try to set cycle_limit and second_limit too? */ +- /* FIXME: we should try to set dual-phase cycle_limit too */ - busy_timeout = cpu_to_be32(SBP2_RETRY_LIMIT); + busy_timeout = cpu_to_be32(SBP2_CYCLE_LIMIT | SBP2_RETRY_LIMIT); fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST, lu->tgt->node_id, lu->generation, device->max_speed, - - - From fedora-extras-commits at redhat.com Fri Mar 7 06:53:28 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Fri, 7 Mar 2008 06:53:28 GMT Subject: rpms/xorg-x11-drv-i810/devel intel-modeset.patch, 1.2, 1.3 xorg-x11-drv-i810.spec, 1.82, 1.83 Message-ID: <200803070653.m276rSB7012458@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12430 Modified Files: intel-modeset.patch xorg-x11-drv-i810.spec Log Message: * Fri Mar 07 2008 Dave Airlie 2.2.1-9 - update modesetting patch to include 965 video + fix for memory space leak intel-modeset.patch: Index: intel-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-modeset.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- intel-modeset.patch 6 Mar 2008 07:08:53 -0000 1.2 +++ intel-modeset.patch 7 Mar 2008 06:53:24 -0000 1.3 @@ -740,7 +740,7 @@ +#endif +#endif diff --git a/src/i830.h b/src/i830.h -index c61767d..02c547d 100644 +index c61767d..d19ba7f 100644 --- a/src/i830.h +++ b/src/i830.h @@ -86,8 +86,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -832,8 +832,93 @@ unsigned long intel_get_pixmap_offset(PixmapPtr pPix); unsigned long intel_get_pixmap_pitch(PixmapPtr pPix); extern Bool I830AccelInit(ScreenPtr pScreen); +@@ -890,4 +906,11 @@ extern void i830_fixup_devices(ScrnInfoPtr); + + #include "intel_batchbuffer.h" + ++/* Mirrors CARD32 definition in Xmd.h */ ++#ifdef LONG64 ++#define CARD32_HEX "x" ++#else ++#define CARD32_HEX "lx" ++#endif ++ + #endif /* _I830_H_ */ +diff --git a/src/i830_debug.c b/src/i830_debug.c +index 7d0c0a0..17044b2 100644 +--- a/src/i830_debug.c ++++ b/src/i830_debug.c +@@ -957,13 +957,14 @@ i830_dump_error_state(ScrnInfoPtr pScrn) + { + I830Ptr pI830 = I830PTR(pScrn); + +- ErrorF("pgetbl_ctl: 0x%" PRIx32 "getbl_err: 0x%" PRIx32 "\n", ++ ErrorF("pgetbl_ctl: 0x%" CARD32_HEX "getbl_err: 0x%" CARD32_HEX "\n", + INREG(PGETBL_CTL), INREG(PGE_ERR)); + +- ErrorF("ipeir: %" PRIx32 " iphdr: %" PRIx32 "\n", INREG(IPEIR), ++ ErrorF("ipeir: %" CARD32_HEX " iphdr: %" CARD32_HEX "\n", INREG(IPEIR), + INREG(IPEHR)); + +- ErrorF("LP ring tail: %" PRIx32 " head: %" PRIx32 " len: %" PRIx32 " start %" PRIx32 "\n", ++ ErrorF("LP ring tail: %" CARD32_HEX " head: %" CARD32_HEX ++ " len: %" CARD32_HEX " start %" CARD32_HEX "\n", + INREG(LP_RING + RING_TAIL), + INREG(LP_RING + RING_HEAD) & HEAD_ADDR, + INREG(LP_RING + RING_LEN), +@@ -974,8 +975,8 @@ i830_dump_error_state(ScrnInfoPtr pScrn) + + ErrorF("instdone: %x instpm: %x\n", INREG16(INST_DONE), INREG8(INST_PM)); + +- ErrorF("memmode: %" PRIx32 " instps: %" PRIx32 "\n", INREG(MEMMODE), +- INREG(INST_PS)); ++ ErrorF("memmode: %" CARD32_HEX " instps: %" CARD32_HEX "\n", ++ INREG(MEMMODE), INREG(INST_PS)); + + ErrorF("hwstam: %x ier: %x imr: %x iir: %x\n", + INREG16(HWSTAM), INREG16(IER), INREG16(IMR), INREG16(IIR)); +@@ -987,12 +988,14 @@ i965_dump_error_state(ScrnInfoPtr pScrn) + { + I830Ptr pI830 = I830PTR(pScrn); + +- ErrorF("pgetbl_ctl: 0x%" PRIx32 " pgetbl_err: 0x%" PRIx32 "\n", ++ ErrorF("pgetbl_ctl: 0x%" CARD32_HEX " pgetbl_err: 0x%" CARD32_HEX "\n", + INREG(PGETBL_CTL), INREG(PGE_ERR)); + +- ErrorF("ipeir: %" PRIx32 " iphdr: %" PRIx32 "\n", INREG(IPEIR_I965), INREG(IPEHR_I965)); ++ ErrorF("ipeir: %" CARD32_HEX " iphdr: %" CARD32_HEX "\n", ++ INREG(IPEIR_I965), INREG(IPEHR_I965)); + +- ErrorF("LP ring tail: %" PRIx32 " head: %" PRIx32 " len: %" PRIx32 " start %" PRIx32 "\n", ++ ErrorF("LP ring tail: %" CARD32_HEX " head: %" CARD32_HEX ++ " len: %" CARD32_HEX " start %" CARD32_HEX "\n", + INREG(LP_RING + RING_TAIL), + INREG(LP_RING + RING_HEAD) & HEAD_ADDR, + INREG(LP_RING + RING_LEN), INREG(LP_RING + RING_START)); +@@ -1004,15 +1007,18 @@ i965_dump_error_state(ScrnInfoPtr pScrn) + (int)INREG(INST_DONE_1)); + ErrorF("instpm: %x\n", (int)INREG(INST_PM)); + +- ErrorF("memmode: %" PRIx32 " instps: %" PRIx32 "\n", INREG(MEMMODE), INREG(INST_PS_I965)); ++ ErrorF("memmode: %" CARD32_HEX " instps: %" CARD32_HEX "\n", ++ INREG(MEMMODE), INREG(INST_PS_I965)); + + ErrorF("HW Status mask (hwstam): %x\nIRQ enable (ier): %x " + "imr: %x iir: %x\n", + (int)INREG(HWSTAM), (int)INREG(IER), (int)INREG(IMR), + (int)INREG(IIR)); + +- ErrorF("acthd: %" PRIx32 " dma_fadd_p: %" PRIx32 "\n", INREG(ACTHD), INREG(DMA_FADD_P)); +- ErrorF("ecoskpd: %" PRIx32 " excc: %" PRIx32 "\n", INREG(ECOSKPD), INREG(EXCC)); ++ ErrorF("acthd: %" CARD32_HEX " dma_fadd_p: %" CARD32_HEX "\n", ++ INREG(ACTHD), INREG(DMA_FADD_P)); ++ ErrorF("ecoskpd: %" CARD32_HEX " excc: %" CARD32_HEX "\n", ++ INREG(ECOSKPD), INREG(EXCC)); + + ErrorF("cache_mode: %x/%x\n", (int)INREG(CACHE_MODE_0), + (int)INREG(CACHE_MODE_1)); diff --git a/src/i830_dri.c b/src/i830_dri.c -index d95ecb2..cfe7220 100644 +index d95ecb2..3e47e92 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -177,10 +177,12 @@ I830InitDma(ScrnInfoPtr pScrn) @@ -952,7 +1037,15 @@ if (!I830InitDma(pScrn)) { DRICloseScreen(pScreen); -@@ -1892,22 +1899,24 @@ I830DRI2Prepare(ScreenPtr pScreen) +@@ -971,7 +978,6 @@ I830DRICloseScreen(ScreenPtr pScreen) + { + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + I830Ptr pI830 = I830PTR(pScrn); +- I830DRIPtr pI830DRI = (I830DRIPtr) pI830->pDRIInfo->devPrivate; + + DPRINTF(PFX, "I830DRICloseScreen\n"); + +@@ -1892,22 +1898,24 @@ I830DRI2Prepare(ScreenPtr pScreen) char busId[64]; drmVersionPtr version; @@ -989,7 +1082,7 @@ } version = drmGetVersion(pI830->drmSubFD); -@@ -1931,7 +1940,11 @@ I830DRI2Prepare(ScreenPtr pScreen) +@@ -1931,7 +1939,11 @@ I830DRI2Prepare(ScreenPtr pScreen) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[DRI2] Opened DRM device successfully\n"); @@ -1002,7 +1095,16 @@ if (!pI830->use_ttm_batch) return; -@@ -1994,9 +2007,11 @@ I830DRI2ScreenInit(ScreenPtr pScreen) +@@ -1954,7 +1966,7 @@ I830DRI2ScreenInit(ScreenPtr pScreen) + I830Ptr pI830 = I830PTR(pScrn); + I830RingBuffer *ring = pI830->LpRing; + drm_i915_init_t info; +- int fd, major, minor, patch; ++ int fd; + const char *driverName; + unsigned int sarea_handle; + void *p; +@@ -1994,9 +2006,11 @@ I830DRI2ScreenInit(ScreenPtr pScreen) memset(&info, 0, sizeof(info)); info.func = I915_INIT_DMA2; @@ -1018,7 +1120,7 @@ info.sarea_priv_offset = 0; info.sarea_handle = sarea_handle; diff --git a/src/i830_driver.c b/src/i830_driver.c -index ba44645..ef9ac24 100644 +index ba44645..953762b 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -198,6 +198,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -1745,7 +1847,15 @@ #if defined(XF86DRI) /* Load the dri module if requested. */ -@@ -2362,7 +2453,7 @@ I830BlockHandler(int i, +@@ -2316,7 +2407,6 @@ void + IntelEmitInvarientState(ScrnInfoPtr pScrn) + { + I830Ptr pI830 = I830PTR(pScrn); +- CARD32 ctx_addr; + + if (pI830->noAccel) + return; +@@ -2362,7 +2452,7 @@ I830BlockHandler(int i, pScreen->BlockHandler = I830BlockHandler; if (pI830->batch) @@ -1754,7 +1864,7 @@ I830VideoBlockHandler(i, blockData, pTimeout, pReadmask); } -@@ -2384,7 +2475,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2384,7 +2474,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pScrn = xf86Screens[pScreen->myNum]; pI830 = I830PTR(pScrn); @@ -1765,7 +1875,7 @@ pScrn->displayWidth = (pScrn->virtualX + 63) & ~63; -@@ -2430,48 +2523,74 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2430,48 +2522,74 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) #endif } @@ -1880,7 +1990,7 @@ } pI830->directRendering = DRI_TYPE_NONE; -@@ -2499,6 +2618,12 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2499,6 +2617,12 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } #endif @@ -1893,7 +2003,7 @@ /* The batchbuffer branch won't work without a bufmgr, so fail now * if neither XF86DRI or DRI2 managed to set that up. */ if (pI830->bufmgr == NULL) { -@@ -2515,6 +2640,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2515,6 +2639,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) return FALSE; } @@ -1902,7 +2012,7 @@ xf86DrvMsg(pScrn->scrnIndex, pI830->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT, "VideoRam: %d KB\n", pScrn->videoRam); -@@ -2580,12 +2707,14 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2580,12 +2706,14 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pI8301 = I830PTR(pI830->entityPrivate->pScrn_1); pI830->LpRing = pI8301->LpRing; pI830->overlay_regs = pI8301->overlay_regs; @@ -1918,7 +2028,7 @@ #if defined(XF86DRI) || defined(DRI2) /* -@@ -2776,7 +2905,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2776,7 +2904,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pI830->XvEnabled = FALSE; #endif @@ -1927,7 +2037,7 @@ if (pI830->LpRing->mem->size == 0) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Disabling acceleration because the ring buffer " -@@ -2792,7 +2921,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2792,7 +2920,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) "needs 2D acceleration.\n"); pI830->XvEnabled = FALSE; } @@ -1936,7 +2046,7 @@ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Disabling Xv because the overlay register buffer " "allocation failed.\n"); -@@ -2829,30 +2958,32 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2829,30 +2957,32 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (pI830->directRendering == DRI_TYPE_NONE) i830_free_3d_memory(pScrn); @@ -1992,7 +2102,7 @@ } #endif -@@ -2862,11 +2993,13 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2862,11 +2992,13 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pI830->allowPageFlip ? "en" : "dis"); #endif @@ -2011,7 +2121,7 @@ if (I830IsPrimary(pScrn)) { pScrn->fbOffset = pI830->front_buffer->offset; -@@ -2877,12 +3010,13 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2877,12 +3009,13 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pI830->xoffset = (pScrn->fbOffset / pI830->cpp) % pScrn->displayWidth; pI830->yoffset = (pScrn->fbOffset / pI830->cpp) / pScrn->displayWidth; @@ -2031,7 +2141,7 @@ DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n"); if (!pI830->useEXA) { -@@ -2902,9 +3036,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -2902,9 +3035,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (pScrn->virtualX > pScrn->displayWidth) pScrn->displayWidth = pScrn->virtualX; @@ -2041,7 +2151,7 @@ DPRINTF(PFX, "assert( if(!fbScreenInit(pScreen, ...) )\n"); if (!fbScreenInit(pScreen, pI830->FbBase + pScrn->fbOffset, pScrn->virtualX, pScrn->virtualY, -@@ -3023,7 +3154,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -3023,7 +3153,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } #endif @@ -2050,7 +2160,7 @@ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: Not available\n"); #endif -@@ -3035,7 +3166,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -3035,7 +3165,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (serverGeneration == 1) xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); @@ -2059,7 +2169,7 @@ /* turn off clock gating */ #if 0 OUTREG(0x6204, 0x70804000); -@@ -3124,9 +3255,11 @@ I830LeaveVT(int scrnIndex, int flags) +@@ -3124,9 +3254,11 @@ I830LeaveVT(int scrnIndex, int flags) xf86_hide_cursors (pScrn); @@ -2074,7 +2184,7 @@ #if defined(XF86DRI) || defined(DRI2) /* don't disable interrupt before stopping the ring for fencing */ -@@ -3134,7 +3267,7 @@ I830LeaveVT(int scrnIndex, int flags) +@@ -3134,7 +3266,7 @@ I830LeaveVT(int scrnIndex, int flags) drmCtlUninstHandler(pI830->drmSubFD); } #endif @@ -2083,7 +2193,7 @@ i830CompareRegsToSnapshot(pScrn, "After LeaveVT"); i830DumpRegs (pScrn); } -@@ -3146,7 +3279,7 @@ I830LeaveVT(int scrnIndex, int flags) +@@ -3146,7 +3278,7 @@ I830LeaveVT(int scrnIndex, int flags) * allocations until we relese the lock. */ #ifdef XF86DRI_MM @@ -2092,7 +2202,7 @@ if (pI830->memory_manager != NULL && pScrn->vtSema) { drmMMLock(pI830->drmSubFD, DRM_BO_MEM_TT, 1, 0); } -@@ -3176,7 +3309,8 @@ I830EnterVT(int scrnIndex, int flags) +@@ -3176,7 +3308,8 @@ I830EnterVT(int scrnIndex, int flags) */ if (pI830->SaveGeneration != serverGeneration) { pI830->SaveGeneration = serverGeneration; @@ -2102,7 +2212,7 @@ } pI830->leaving = FALSE; -@@ -3186,7 +3320,7 @@ I830EnterVT(int scrnIndex, int flags) +@@ -3186,7 +3319,7 @@ I830EnterVT(int scrnIndex, int flags) /* Unlock the memory manager first of all so that we can pin our * buffer objects */ @@ -2111,7 +2221,7 @@ drmMMUnlock(pI830->drmSubFD, DRM_BO_MEM_TT, 1); } } -@@ -3201,34 +3335,39 @@ I830EnterVT(int scrnIndex, int flags) +@@ -3201,34 +3334,39 @@ I830EnterVT(int scrnIndex, int flags) /* Update the screen pixmap in case the buffer moved */ i830_update_front_offset(pScrn); @@ -2171,7 +2281,7 @@ #ifdef DRI2 if (pI830->directRendering == DRI_TYPE_DRI2) { -@@ -3318,6 +3457,9 @@ I830EnterVT(int scrnIndex, int flags) +@@ -3318,6 +3456,9 @@ I830EnterVT(int scrnIndex, int flags) if (pI830->checkDevices) pI830->devicesTimer = TimerSet(NULL, 0, 1000, I830CheckDevicesTimer, pScrn); @@ -2181,7 +2291,7 @@ /* Mark 3D state as being clobbered and setup the basics */ *pI830->last_3d = LAST_3D_OTHER; IntelEmitInvarientState(pScrn); -@@ -3361,9 +3503,11 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) +@@ -3361,9 +3502,11 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) TimerCancel(pI830->devicesTimer); pI830->devicesTimer = NULL; @@ -2233,20 +2343,19 @@ /* this is the front buffer pixmap so set it up as such..*/ driver_priv->flags |= I830_EXA_PIXMAP_IS_FRONTBUFFER; diff --git a/src/i830_memory.c b/src/i830_memory.c -index 634a796..92f062a 100644 +index 634a796..405d426 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c -@@ -165,13 +165,16 @@ i830_bind_memory(ScrnInfoPtr pScrn, i830_memory *mem) +@@ -165,13 +165,15 @@ i830_bind_memory(ScrnInfoPtr pScrn, i830_memory *mem) if (mem->bo.size != 0) { I830Ptr pI830 = I830PTR(pScrn); int ret; -+ int flags = DRM_BO_FLAG_MEM_VRAM | -+ DRM_BO_FLAG_MEM_TT | -+ DRM_BO_FLAG_READ | -+ DRM_BO_FLAG_WRITE; ++ int flags = DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE; + -+ if (mem->need_vram) -+ flags &= ~DRM_BO_FLAG_MEM_TT; ++ if (mem->need_vram) ++ flags |= DRM_BO_FLAG_MEM_VRAM; ++ else ++ flags |= DRM_BO_FLAG_MEM_TT; ret = drmBOSetStatus(pI830->drmSubFD, &mem->bo, - DRM_BO_FLAG_MEM_VRAM | @@ -2258,7 +2367,7 @@ DRM_BO_MASK_MEM | DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | -@@ -199,16 +202,18 @@ i830_bind_memory(ScrnInfoPtr pScrn, i830_memory *mem) +@@ -199,16 +201,18 @@ i830_bind_memory(ScrnInfoPtr pScrn, i830_memory *mem) mem->bound = TRUE; } @@ -2281,7 +2390,7 @@ } return TRUE; -@@ -223,13 +228,15 @@ i830_unbind_memory(ScrnInfoPtr pScrn, i830_memory *mem) +@@ -223,13 +227,15 @@ i830_unbind_memory(ScrnInfoPtr pScrn, i830_memory *mem) return TRUE; /* Mark the pages accessible now that they're bound. */ @@ -2300,7 +2409,7 @@ i830_clear_tiling(pScrn, mem->fence_nr); #ifdef XF86DRI_MM -@@ -353,6 +360,7 @@ i830_reset_allocations(ScrnInfoPtr pScrn) +@@ -353,6 +359,7 @@ i830_reset_allocations(ScrnInfoPtr pScrn) pI830->exa_offscreen = NULL; pI830->exa_965_state = NULL; pI830->overlay_regs = NULL; @@ -2308,7 +2417,7 @@ #ifdef XF86DRI pI830->back_buffer = NULL; pI830->third_buffer = NULL; -@@ -488,16 +496,18 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size) +@@ -488,16 +495,18 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size) if (pI830->memory_manager != NULL) { int ret; @@ -2333,7 +2442,7 @@ } } else { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -@@ -522,9 +532,10 @@ i830_allocator_fini(ScrnInfoPtr pScrn) +@@ -522,9 +531,10 @@ i830_allocator_fini(ScrnInfoPtr pScrn) #ifdef XF86DRI_MM /* The memory manager is more special */ if (pI830->memory_manager) { @@ -2347,7 +2456,7 @@ } #endif /* XF86DRI_MM */ -@@ -789,6 +800,7 @@ i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name, +@@ -789,6 +799,7 @@ i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name, mem->end = -1; mem->size = size; mem->allocated_size = size; @@ -2355,7 +2464,7 @@ if (flags & NEED_LIFETIME_FIXED) mem->lifetime_fixed_offset = TRUE; -@@ -840,8 +852,8 @@ i830_allocate_memory(ScrnInfoPtr pScrn, const char *name, +@@ -840,8 +851,8 @@ i830_allocate_memory(ScrnInfoPtr pScrn, const char *name, #ifdef XF86DRI_MM I830Ptr pI830 = I830PTR(pScrn); @@ -2366,7 +2475,7 @@ { return i830_allocate_memory_bo(pScrn, name, size, alignment, flags); } else -@@ -1046,6 +1058,24 @@ i830_allocate_overlay(ScrnInfoPtr pScrn) +@@ -1046,6 +1057,24 @@ i830_allocate_overlay(ScrnInfoPtr pScrn) if (!OVERLAY_NOPHYSICAL(pI830)) flags |= NEED_PHYSICAL_ADDR; @@ -2391,7 +2500,7 @@ if (!IS_I965G(pI830)) { pI830->overlay_regs = i830_allocate_memory(pScrn, "overlay registers", OVERLAY_SIZE, GTT_PAGE_SIZE, -@@ -1203,6 +1233,9 @@ i830_allocate_framebuffer(ScrnInfoPtr pScrn, I830Ptr pI830, BoxPtr FbMemBox, +@@ -1203,6 +1232,9 @@ i830_allocate_framebuffer(ScrnInfoPtr pScrn, I830Ptr pI830, BoxPtr FbMemBox, else tiling = pI830->tiling; @@ -2401,7 +2510,7 @@ /* Attempt to allocate it tiled first if we have page flipping on. */ if (tiling && IsTileable(pScrn, pitch)) { /* XXX: probably not the case on 965 */ -@@ -1227,8 +1260,12 @@ i830_allocate_framebuffer(ScrnInfoPtr pScrn, I830Ptr pI830, BoxPtr FbMemBox, +@@ -1227,8 +1259,12 @@ i830_allocate_framebuffer(ScrnInfoPtr pScrn, I830Ptr pI830, BoxPtr FbMemBox, return NULL; } @@ -2416,7 +2525,7 @@ return front_buffer; } -@@ -1237,10 +1274,13 @@ i830_allocate_cursor_buffers(ScrnInfoPtr pScrn) +@@ -1237,10 +1273,13 @@ i830_allocate_cursor_buffers(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); @@ -2431,7 +2540,7 @@ /* Try to allocate one big blob for our cursor memory. This works * around a limitation in the FreeBSD AGP driver that allows only one * physical allocation larger than a page, and could allow us -@@ -1353,18 +1393,20 @@ i830_allocate_2d_memory(ScrnInfoPtr pScrn) +@@ -1353,18 +1392,20 @@ i830_allocate_2d_memory(ScrnInfoPtr pScrn) unsigned int pitch = pScrn->displayWidth * pI830->cpp; long size; @@ -2457,7 +2566,7 @@ if (pI830->fb_compression) i830_setup_fb_compression(pScrn); -@@ -1925,14 +1967,16 @@ i830_bind_all_memory(ScrnInfoPtr pScrn) +@@ -1925,14 +1966,16 @@ i830_bind_all_memory(ScrnInfoPtr pScrn) if (pI830->StolenOnly == TRUE || pI830->memory_list == NULL) return TRUE; @@ -2479,7 +2588,7 @@ for (mem = pI830->memory_list->next; mem->next != NULL; mem = mem->next) -@@ -1949,7 +1993,7 @@ i830_bind_all_memory(ScrnInfoPtr pScrn) +@@ -1949,7 +1992,7 @@ i830_bind_all_memory(ScrnInfoPtr pScrn) } #endif } @@ -2488,7 +2597,7 @@ i830_update_cursor_offsets(pScrn); return TRUE; -@@ -1964,7 +2008,7 @@ i830_unbind_all_memory(ScrnInfoPtr pScrn) +@@ -1964,7 +2007,7 @@ i830_unbind_all_memory(ScrnInfoPtr pScrn) if (pI830->StolenOnly == TRUE) return TRUE; @@ -2497,7 +2606,7 @@ i830_memory *mem; for (mem = pI830->memory_list->next; mem->next != NULL; -@@ -1982,10 +2026,12 @@ i830_unbind_all_memory(ScrnInfoPtr pScrn) +@@ -1982,10 +2025,12 @@ i830_unbind_all_memory(ScrnInfoPtr pScrn) } #endif @@ -2514,7 +2623,7 @@ return TRUE; diff --git a/src/i830_video.c b/src/i830_video.c -index 8f0ac30..3fb702d 100644 +index 8f0ac30..7738d3d 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -75,6 +75,7 @@ @@ -2663,7 +2772,7 @@ } /* Wait for the overlay to light up before attempting to use it */ OUT_BATCH(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); -@@ -443,35 +535,40 @@ i830_overlay_on(ScrnInfoPtr pScrn) +@@ -443,35 +535,41 @@ i830_overlay_on(ScrnInfoPtr pScrn) i830_pipe_a_require_deactivate (pScrn); OVERLAY_DEBUG("overlay_on\n"); @@ -2701,6 +2810,7 @@ - OVERLAY_DEBUG ("overlay_continue cmd 0x%08" PRIx32 " -> 0x%08" PRIx32 - " sta 0x%08" PRIx32 "\n", - overlay->OCMD, INREG(OCMD_REGISTER), INREG(DOVSTA)); ++ BEGIN_BATCH(4); OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE); OUT_BATCH(MI_NOOP); @@ -2714,7 +2824,7 @@ ADVANCE_BATCH(); OVERLAY_DEBUG("overlay_continue\n"); } -@@ -480,7 +577,7 @@ static void +@@ -480,7 +578,7 @@ static void i830_overlay_off(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); @@ -2723,7 +2833,7 @@ if (!*pI830->overlayOn) return; -@@ -504,17 +601,24 @@ i830_overlay_off(ScrnInfoPtr pScrn) +@@ -504,17 +602,22 @@ i830_overlay_off(ScrnInfoPtr pScrn) * Turn overlay off */ { @@ -2731,8 +2841,6 @@ overlay->OCMD &= ~OVERLAY_ENABLE; - OVERLAY_DEBUG ("overlay_off cmd 0x%08" PRIx32 " -> 0x%08" PRIx32 " sta 0x%08" PRIx32 "\n", - overlay->OCMD, INREG(OCMD_REGISTER), INREG(DOVSTA)); -+ // OVERLAY_DEBUG ("overlay_off cmd 0x%08lx -> 0x%08lx sta 0x%08lx\n", -+ // overlay->OCMD, INREG(OCMD_REGISTER), INREG(DOVSTA)); + overlay_reg_finish(pI830); + BEGIN_BATCH(6); @@ -2753,7 +2861,7 @@ } OUT_BATCH(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); OUT_BATCH(MI_NOOP); -@@ -583,7 +687,7 @@ I830InitVideo(ScreenPtr pScreen) +@@ -583,7 +686,7 @@ I830InitVideo(ScreenPtr pScreen) /* Set up overlay video if we can do it at this depth. */ if (!IS_I965G(pI830) && pScrn->bitsPerPixel != 8 && @@ -2762,7 +2870,7 @@ { overlayAdaptor = I830SetupImageVideoOverlay(pScreen); if (overlayAdaptor != NULL) { -@@ -607,14 +711,14 @@ I830ResetVideo(ScrnInfoPtr pScrn) +@@ -607,14 +710,14 @@ I830ResetVideo(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); I830PortPrivPtr pPriv = pI830->adaptor->pPortPrivates[0].ptr; @@ -2779,7 +2887,7 @@ memset(overlay, 0, sizeof(*overlay)); overlay->YRGB_VPH = 0; overlay->UV_VPH = 0; -@@ -669,6 +773,7 @@ I830ResetVideo(ScrnInfoPtr pScrn) +@@ -669,6 +772,7 @@ I830ResetVideo(ScrnInfoPtr pScrn) else overlay->OCONFIG |= OVERLAY_PIPE_B; @@ -2787,7 +2895,7 @@ #if 0 /* * XXX DUMP REGISTER CODE !!! -@@ -678,7 +783,7 @@ I830ResetVideo(ScrnInfoPtr pScrn) +@@ -678,7 +782,7 @@ I830ResetVideo(ScrnInfoPtr pScrn) { int i; for (i = 0x30000; i < 0x31000; i += 4) @@ -2796,7 +2904,7 @@ } #endif } -@@ -742,33 +847,41 @@ I830UpdateGamma(ScrnInfoPtr pScrn) +@@ -742,33 +846,41 @@ I830UpdateGamma(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); I830PortPrivPtr pPriv = pI830->adaptor->pPortPrivates[0].ptr; @@ -2855,16 +2963,37 @@ } static XF86VideoAdaptorPtr -@@ -1018,7 +1131,7 @@ I830StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown) +@@ -841,6 +953,7 @@ I830SetupImageVideoOverlay(ScreenPtr pScreen) + pPriv->current_crtc = NULL; + pPriv->desired_crtc = NULL; + pPriv->buf = NULL; ++ pPriv->state = NULL; + pPriv->currentBuf = 0; + pPriv->gamma5 = 0xc0c0c0; + pPriv->gamma4 = 0x808080; +@@ -954,6 +1067,7 @@ I830SetupImageVideoTextured(ScreenPtr pScreen) + pPriv->textured = TRUE; + pPriv->videoStatus = 0; + pPriv->buf = NULL; ++ pPriv->state = NULL; + pPriv->currentBuf = 0; + pPriv->doubleBuffer = 0; + +@@ -1018,8 +1132,12 @@ I830StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown) /* Sync before freeing the buffer, because the pages will be unbound. */ I830Sync(pScrn); - i830_free_memory(pScrn, pPriv->buf); + dri_bo_unreference(pPriv->buf); pPriv->buf = NULL; ++ if (pPriv->state) { ++ dri_bo_unreference(pPriv->state); ++ pPriv->state = NULL; ++ } pPriv->videoStatus = 0; } else { -@@ -1037,7 +1150,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn, + if (pPriv->videoStatus & CLIENT_VIDEO_ON) { +@@ -1037,7 +1155,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv = (I830PortPrivPtr) data; I830Ptr pI830 = I830PTR(pScrn); I830OverlayRegPtr overlay; @@ -2874,7 +3003,7 @@ if (pPriv->textured) { /* XXX: Currently the brightness/saturation attributes aren't hooked up. * However, apps expect them to be there, and the spec seems to let us -@@ -1046,32 +1160,40 @@ I830SetPortAttribute(ScrnInfoPtr pScrn, +@@ -1046,32 +1165,40 @@ I830SetPortAttribute(ScrnInfoPtr pScrn, return Success; } @@ -2927,7 +3056,7 @@ if (value < 0) pPriv->desired_crtc = NULL; else -@@ -1105,17 +1227,23 @@ I830SetPortAttribute(ScrnInfoPtr pScrn, +@@ -1105,17 +1232,23 @@ I830SetPortAttribute(ScrnInfoPtr pScrn, break; } OVERLAY_DEBUG("COLORKEY\n"); @@ -2954,7 +3083,7 @@ /* Ensure that the overlay is off, ready for updating */ if ((attribute == xvGamma0 || attribute == xvGamma1 || -@@ -1128,6 +1256,9 @@ I830SetPortAttribute(ScrnInfoPtr pScrn, +@@ -1128,6 +1261,9 @@ I830SetPortAttribute(ScrnInfoPtr pScrn, } return Success; @@ -2964,7 +3093,15 @@ } static int -@@ -1209,10 +1340,11 @@ I830CopyPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +@@ -1196,7 +1332,6 @@ I830CopyPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, + int srcPitch, + int dstPitch, int top, int left, int h, int w) + { +- I830Ptr pI830 = I830PTR(pScrn); + unsigned char *src, *dst; + int i,j; + unsigned char *s; +@@ -1209,10 +1344,11 @@ I830CopyPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, src = buf + (top * srcPitch) + (left << 1); @@ -2978,7 +3115,7 @@ switch (pPriv->rotation) { case RR_Rotate_0: -@@ -1285,6 +1417,7 @@ I830CopyPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +@@ -1285,6 +1421,7 @@ I830CopyPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, } break; } @@ -2986,7 +3123,11 @@ } /* Copies planar data in *buf to UYVY-packed data in the screen atYBufXOffset. -@@ -1299,10 +1432,12 @@ I830CopyPlanarToPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +@@ -1295,14 +1432,15 @@ I830CopyPlanarToPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, + int srcPitch2, int dstPitch, int srcH, + int top, int left, int h, int w, int id) + { +- I830Ptr pI830 = I830PTR(pScrn); CARD8 *dst1, *srcy, *srcu, *srcv; int y; @@ -3001,7 +3142,7 @@ srcy = buf + (top * srcPitch) + left; if (id == FOURCC_YV12) { -@@ -1344,6 +1479,7 @@ I830CopyPlanarToPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +@@ -1344,6 +1482,7 @@ I830CopyPlanarToPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, srcv += srcPitch2; } } @@ -3009,7 +3150,7 @@ } static void -@@ -1371,10 +1507,11 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +@@ -1371,10 +1510,11 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, ErrorF("src1 is %p, offset is %ld\n", src1, (unsigned long)src1 - (unsigned long)buf); #endif @@ -3023,7 +3164,7 @@ switch (pPriv->rotation) { case RR_Rotate_0: -@@ -1413,22 +1550,25 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +@@ -1413,22 +1553,25 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, break; } @@ -3053,7 +3194,7 @@ } switch (pPriv->rotation) { -@@ -1467,6 +1607,7 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +@@ -1467,6 +1610,7 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, } break; } @@ -3061,7 +3202,7 @@ /* Copy U data for YV12, or V data for I420 */ src3 = buf + (srcH * srcPitch) + ((srcH >> 1) * srcPitch2) + -@@ -1475,16 +1616,17 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +@@ -1475,16 +1619,17 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, ErrorF("src3 is %p, offset is %ld\n", src3, (unsigned long)src3 - (unsigned long)buf); #endif @@ -3083,7 +3224,7 @@ } switch (pPriv->rotation) { -@@ -1523,6 +1665,7 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +@@ -1523,6 +1668,7 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, } break; } @@ -3091,7 +3232,7 @@ } typedef struct { -@@ -1750,7 +1893,7 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, +@@ -1750,7 +1896,7 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, { I830Ptr pI830 = I830PTR(pScrn); I830PortPrivPtr pPriv = pI830->adaptor->pPortPrivates[0].ptr; @@ -3100,7 +3241,7 @@ unsigned int swidth, swidthy, swidthuv; unsigned int mask, shift, offsety, offsetu; int tmp; -@@ -1761,7 +1904,9 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, +@@ -1761,7 +1907,9 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, dstPitch); #if VIDEO_DEBUG @@ -3110,7 +3251,7 @@ #endif /* -@@ -1865,6 +2010,7 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, +@@ -1865,6 +2013,7 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, offsetu = pPriv->UBuf1offset; } @@ -3118,7 +3259,7 @@ switch (id) { case FOURCC_YV12: case FOURCC_I420: -@@ -1907,16 +2053,33 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, +@@ -1907,16 +2056,33 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, dstBox->x1, dstBox->y1, dstBox->x2, dstBox->y2); /* buffer locations */ @@ -3157,18 +3298,43 @@ overlay->DWINPOS, overlay->DWINSZ); OVERLAY_DEBUG("dst: %d x %d, src: %d x %d\n", drw_w, drw_h, src_w, src_h); -@@ -2078,8 +2241,9 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, +@@ -2078,8 +2244,9 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, OCMD |= BUFFER1; overlay->OCMD = OCMD; - OVERLAY_DEBUG("OCMD is 0x%" PRIx32 "\n", OCMD); -+ OVERLAY_DEBUG("OCMD is 0x%lx\n", OCMD); ++ OVERLAY_DEBUG("OCMD is 0x%" CARD32_HEX "\n", OCMD); + overlay_reg_finish(pI830); /* make sure the overlay is on */ i830_overlay_on (pScrn); /* and show this frame */ -@@ -2341,23 +2505,22 @@ I830PutImage(ScrnInfoPtr pScrn, +@@ -2198,7 +2365,7 @@ I830PutImage(ScrnInfoPtr pScrn, + int top, left, npixels, nlines, size; + BoxRec dstBox; + int pitchAlignMask; +- int alloc_size, extraLinear; ++ int alloc_size; + xf86CrtcPtr crtc; + + if (pPriv->textured) +@@ -2321,15 +2488,9 @@ I830PutImage(ScrnInfoPtr pScrn, + ErrorF("srcPitch: %d, dstPitch: %d, size: %d\n", srcPitch, dstPitch, size); + #endif + +- if (IS_I965G(pI830)) +- extraLinear = BRW_LINEAR_EXTRA; +- else +- extraLinear = 0; +- + alloc_size = size; + if (pPriv->doubleBuffer) + alloc_size *= 2; +- alloc_size += extraLinear; + + if (pPriv->buf) { + /* Wait for any previous acceleration to the buffer to have completed. +@@ -2341,23 +2502,34 @@ I830PutImage(ScrnInfoPtr pScrn, /* Free the current buffer if we're going to have to reallocate */ if (pPriv->buf && pPriv->buf->size < alloc_size) { @@ -3181,15 +3347,28 @@ - pPriv->buf = i830_allocate_memory(pScrn, "xv buffer", alloc_size, 16, - 0); + pPriv->buf = dri_bo_alloc(pI830->bufmgr, -+ "xv buffer", alloc_size, 16, 0); ++ "xv buffer", alloc_size, 4096, ++ DRM_BO_FLAG_MEM_LOCAL | ++ DRM_BO_FLAG_CACHED | ++ DRM_BO_FLAG_CACHED_MAPPED); } - +- if (pPriv->buf == NULL) return BadAlloc; - pPriv->extra_offset = pPriv->buf->offset + - (pPriv->doubleBuffer ? size * 2 : size); -+ pPriv->extra_offset = (pPriv->doubleBuffer ? size * 2 : size); ++ if (pPriv->state == NULL && IS_I965G(pI830)) { ++ pPriv->state = dri_bo_alloc(pI830->bufmgr, ++ "xv buffer", BRW_LINEAR_EXTRA, 4096, ++ DRM_BO_FLAG_MEM_LOCAL | ++ DRM_BO_FLAG_CACHED | ++ DRM_BO_FLAG_CACHED_MAPPED); ++ if (pPriv->state == NULL) { ++ dri_bo_unreference(pPriv->buf); ++ return BadAlloc; ++ } ++ } /* fixup pointers */ - pPriv->YBuf0offset = pPriv->buf->offset; @@ -3197,7 +3376,7 @@ if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) { pPriv->UBuf0offset = pPriv->YBuf0offset + (dstPitch * 2 * width); pPriv->VBuf0offset = pPriv->UBuf0offset + (dstPitch * width / 2); -@@ -2378,7 +2541,7 @@ I830PutImage(ScrnInfoPtr pScrn, +@@ -2378,7 +2550,7 @@ I830PutImage(ScrnInfoPtr pScrn, /* Pick the idle buffer */ if (!pPriv->textured && *pI830->overlayOn && pPriv->doubleBuffer) @@ -3206,16 +3385,21 @@ /* copy data */ top = y1 >> 16; -@@ -2596,7 +2759,7 @@ I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout, +@@ -2596,8 +2768,12 @@ I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout, * unbound. */ I830Sync(pScrn); - i830_free_memory(pScrn, pPriv->buf); + dri_bo_unreference(pPriv->buf); pPriv->buf = NULL; ++ if (pPriv->state) { ++ dri_bo_unreference(pPriv->state); ++ pPriv->state = NULL; ++ } pPriv->videoStatus = 0; } -@@ -2609,7 +2772,7 @@ I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout, + } +@@ -2609,7 +2785,7 @@ I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout, ***************************************************************************/ typedef struct { @@ -3224,16 +3408,19 @@ Bool isOn; } OffscreenPrivRec, *OffscreenPrivPtr; -@@ -2654,7 +2817,7 @@ I830AllocateSurface(ScrnInfoPtr pScrn, +@@ -2654,7 +2830,10 @@ I830AllocateSurface(ScrnInfoPtr pScrn, fbpitch = pI830->cpp * pScrn->displayWidth; size = pitch * h; - pPriv->buf = i830_allocate_memory(pScrn, "xv surface buffer", size, 16, 0); -+ pPriv->buf = dri_bo_alloc(pI830->bufmgr, "xv surface buffer", size, 16, 0); ++ pPriv->buf = dri_bo_alloc(pI830->bufmgr, "xv surface buffer", size, 4096, ++ DRM_BO_FLAG_MEM_LOCAL | ++ DRM_BO_FLAG_CACHED | ++ DRM_BO_FLAG_CACHED_MAPPED); if (pPriv->buf == NULL) { xfree(surface->pitches); xfree(surface->offsets); -@@ -2670,10 +2833,11 @@ I830AllocateSurface(ScrnInfoPtr pScrn, +@@ -2670,10 +2849,11 @@ I830AllocateSurface(ScrnInfoPtr pScrn, surface->pScrn = pScrn; surface->id = id; surface->pitches[0] = pitch; @@ -3247,7 +3434,7 @@ return Success; } -@@ -2709,7 +2873,7 @@ I830FreeSurface(XF86SurfacePtr surface) +@@ -2709,7 +2889,7 @@ I830FreeSurface(XF86SurfacePtr surface) I830StopSurface(surface); /* Sync before freeing the buffer, because the pages will be unbound. */ I830Sync(pScrn); @@ -3256,7 +3443,7 @@ pPriv->buf = NULL; xfree(surface->pitches); xfree(surface->offsets); -@@ -2785,7 +2949,7 @@ I830DisplaySurface(XF86SurfacePtr surface, +@@ -2785,7 +2965,7 @@ I830DisplaySurface(XF86SurfacePtr surface, /* Pick the idle buffer */ if (!pI830Priv->textured && *pI830->overlayOn && pI830Priv->doubleBuffer) @@ -3266,18 +3453,20 @@ i830_display_video(pScrn, crtc, surface->id, surface->width, surface->height, surface->pitches[0], x1, y1, x2, y2, &dstBox, diff --git a/src/i830_video.h b/src/i830_video.h -index 1768913..c21e5fa 100644 +index 1768913..b5f6a47 100644 --- a/src/i830_video.h +++ b/src/i830_video.h -@@ -58,7 +58,7 @@ typedef struct { +@@ -58,8 +58,8 @@ typedef struct { CARD32 videoStatus; Time offTime; Time freeTime; - i830_memory *buf; /** YUV data buffer */ +- unsigned int extra_offset; + dri_bo *buf; /** YUV data buffer */ - unsigned int extra_offset; ++ dri_bo *state; /** State buffer */ Bool overlayOK; + int oneLineMode; diff --git a/src/i915_video.c b/src/i915_video.c index 6b20ad2..6b3b15e 100644 --- a/src/i915_video.c @@ -3421,33 +3610,83 @@ pI830->exa965->vbo_prim_start = pI830->exa965->vbo_used; diff --git a/src/i965_video.c b/src/i965_video.c -index 6d04613..fc8b42c 100644 +index 6d04613..91b9f39 100644 --- a/src/i965_video.c +++ b/src/i965_video.c -@@ -251,7 +251,9 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, - state_base_offset = pPriv->extra_offset; - state_base_offset = ALIGN(state_base_offset, 64); +@@ -183,7 +183,6 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, + int next_offset, total_state_size; + int vb_size = (4 * 4) * 4; /* 4 DWORDS per vertex */ + char *state_base; +- int state_base_offset; + #if 0 + ErrorF("BroadwaterDisplayVideoTextured: %dx%d (pitch %d)\n", width, height, +@@ -241,17 +240,12 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, + binding_table_offset = ALIGN(next_offset, 32); + next_offset = binding_table_offset + (WM_BINDING_TABLE_ENTRIES * 4); + +- /* Allocate an area in framebuffer for our state layout we just set up */ + total_state_size = next_offset; +- assert (total_state_size < BRW_LINEAR_EXTRA); ++ assert (total_state_size < pPriv->state->size); + +- /* +- * Use the extra space allocated at the end of the Xv buffer +- */ +- state_base_offset = pPriv->extra_offset; +- state_base_offset = ALIGN(state_base_offset, 64); +- - state_base = (char *)(pI830->FbBase + state_base_offset); -+ dri_bo_map(pPriv->buf, TRUE); ++ dri_bo_map(pPriv->state, TRUE); + -+ state_base = (char *) pPriv->buf->virtual + state_base_offset; ++ state_base = (char *) pPriv->state->virtual; /* Set up our pointers to state structures in framebuffer. It would * probably be a good idea to fill these structures out in system memory * and then dump them there, instead. -@@ -340,7 +342,10 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, +@@ -272,19 +266,19 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, + vb = (void *)(state_base + vb_offset); + + #if 0 +- ErrorF("vs: 0x%08x\n", state_base_offset + vs_offset); +- ErrorF("wm: 0x%08x\n", state_base_offset + wm_offset); +- ErrorF("sf: 0x%08x\n", state_base_offset + sf_offset); +- ErrorF("cc: 0x%08x\n", state_base_offset + cc_offset); +- ErrorF("sf kernel: 0x%08x\n", state_base_offset + sf_kernel_offset); +- ErrorF("ps kernel: 0x%08x\n", state_base_offset + ps_kernel_offset); +- ErrorF("sip kernel: 0x%08x\n", state_base_offset + sip_kernel_offset); +- ErrorF("cc_vp: 0x%08x\n", state_base_offset + cc_viewport_offset); +- ErrorF("src sampler: 0x%08x\n", state_base_offset + src_sampler_offset); +- ErrorF("vb: 0x%08x\n", state_base_offset + vb_offset); +- ErrorF("dst surf: 0x%08x\n", state_base_offset + dest_surf_offset); +- ErrorF("src surf: 0x%08x\n", state_base_offset + src_surf_offset); +- ErrorF("binding table: 0x%08x\n", state_base_offset + binding_table_offset); ++ ErrorF("vs: 0x%08x\n", vs_offset); ++ ErrorF("wm: 0x%08x\n", wm_offset); ++ ErrorF("sf: 0x%08x\n", sf_offset); ++ ErrorF("cc: 0x%08x\n", cc_offset); ++ ErrorF("sf kernel: 0x%08x\n", sf_kernel_offset); ++ ErrorF("ps kernel: 0x%08x\n", ps_kernel_offset); ++ ErrorF("sip kernel: 0x%08x\n", sip_kernel_offset); ++ ErrorF("cc_vp: 0x%08x\n", cc_viewport_offset); ++ ErrorF("src sampler: 0x%08x\n", src_sampler_offset); ++ ErrorF("vb: 0x%08x\n", vb_offset); ++ ErrorF("dst surf: 0x%08x\n", dest_surf_offset); ++ ErrorF("src surf: 0x%08x\n", src_surf_offset); ++ ErrorF("binding table: 0x%08x\n", binding_table_offset); + #endif + + /* For 3D, the VS must have 8, 12, 16, 24, or 32 VUEs allocated to it. +@@ -340,8 +334,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, cc_state->cc3.ia_blend_enable = 1; /* blend alpha just like colors */ cc_state->cc3.blend_enable = 0; /* disable color blend */ cc_state->cc3.alpha_test = 0; /* disable alpha test */ - cc_state->cc4.cc_viewport_state_offset = (state_base_offset + -+ -+ /* FIXME: Eek! No relocation to match this... */ -+ cc_state->cc4.cc_viewport_state_offset = (pPriv->buf->offset + -+ state_base_offset + - cc_viewport_offset) >> 5; +- cc_viewport_offset) >> 5; ++ cc_state->cc4.cc_viewport_state_offset = cc_viewport_offset >> 5; cc_state->cc5.dither_enable = 0; /* disable dither */ cc_state->cc5.logicop_func = 0xc; /* WHITE */ -@@ -371,7 +376,19 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, + cc_state->cc5.statistics_enable = 1; +@@ -371,7 +364,19 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, dest_surf_state->ss0.mipmap_layout_mode = 0; dest_surf_state->ss0.render_cache_read_mode = 0; @@ -3458,9 +3697,9 @@ + DRM_BO_FLAG_MEM_TT | + DRM_BO_FLAG_WRITE | + DRM_BO_FLAG_READ, -+ pPriv->buf, ++ pPriv->state, + (char *) &dest_surf_state->ss1.base_addr - -+ (char *) pPriv->buf->virtual, ++ state_base, + 0); + else + dest_surf_state->ss1.base_addr = intel_get_pixmap_offset(pPixmap); @@ -3468,51 +3707,59 @@ dest_surf_state->ss2.height = pScrn->virtualY - 1; dest_surf_state->ss2.width = pScrn->virtualX - 1; dest_surf_state->ss2.mip_count = 0; -@@ -403,7 +420,20 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, +@@ -403,7 +408,21 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, src_surf_state->ss0.mipmap_layout_mode = 0; src_surf_state->ss0.render_cache_read_mode = 0; - src_surf_state->ss1.base_addr = pPriv->YBuf0offset; -+ -+ if (pI830->use_ttm_batch) ++ if (pI830->use_ttm_batch) { ++ dri_emit_reloc(pPriv->state, ++ DRM_BO_FLAG_MEM_TT | ++ DRM_BO_FLAG_WRITE | ++ DRM_BO_FLAG_READ, ++ pPriv->YBuf0offset, ++ (char *) &src_surf_state->ss1.base_addr - state_base, ++ pPriv->buf); + src_surf_state->ss1.base_addr = -+ intelddx_batchbuffer_emit_pixmap(pPixmap, -+ DRM_BO_FLAG_MEM_TT | -+ DRM_BO_FLAG_READ, -+ pPriv->buf, -+ (char *) &src_surf_state->ss1.base_addr - -+ (char *) pPriv->buf->virtual, -+ pPriv->YBuf0offset); -+ else ++ pPriv->buf->offset + pPriv->YBuf0offset; ++ } else { + src_surf_state->ss1.base_addr = + pPriv->buf->offset + pPriv->YBuf0offset; ++ } + src_surf_state->ss2.width = width - 1; src_surf_state->ss2.height = height - 1; src_surf_state->ss2.mip_count = 0; -@@ -439,8 +469,11 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, +@@ -413,8 +432,8 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, + + /* Set up a binding table for our two surfaces. Only the PS will use it */ + /* XXX: are these offset from the right place? */ +- binding_table[0] = state_base_offset + dest_surf_offset; +- binding_table[1] = state_base_offset + src_surf_offset; ++ binding_table[0] = dest_surf_offset; ++ binding_table[1] = src_surf_offset; + + /* Set up the packed YUV source sampler. Doesn't do colorspace conversion. + */ +@@ -439,8 +458,8 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, memcpy (sf_kernel, sf_kernel_static, sizeof (sf_kernel_static)); memset(sf_state, 0, sizeof(*sf_state)); -+ -+ /* FIXME: Eek! No relocation to match this... */ - sf_state->thread0.kernel_start_pointer = +- sf_state->thread0.kernel_start_pointer = - (state_base_offset + sf_kernel_offset) >> 6; -+ (pPriv->buf->offset + state_base_offset + sf_kernel_offset) >> 6; + ++ sf_state->thread0.kernel_start_pointer = sf_kernel_offset >> 6; sf_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(SF_KERNEL_NUM_GRF); sf_state->sf1.single_program_flow = 1; /* XXX */ sf_state->sf1.binding_table_entry_count = 0; -@@ -470,16 +503,22 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, +@@ -470,16 +489,15 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, memcpy (ps_kernel, ps_kernel_static, sizeof (ps_kernel_static)); memset (wm_state, 0, sizeof (*wm_state)); -+ -+ /* FIXME: Eek! No relocation to match this... */ - wm_state->thread0.kernel_start_pointer = +- wm_state->thread0.kernel_start_pointer = - (state_base_offset + ps_kernel_offset) >> 6; -+ (pPriv->buf->offset + state_base_offset + ps_kernel_offset) >> 6; + ++ wm_state->thread0.kernel_start_pointer = ps_kernel_offset >> 6; wm_state->thread0.grf_reg_count = BRW_GRF_BLOCKS(PS_KERNEL_NUM_GRF); wm_state->thread1.single_program_flow = 1; /* XXX */ wm_state->thread1.binding_table_entry_count = 2; @@ -3520,52 +3767,79 @@ * set, and the minimum allocation is 1024 bytes. */ - wm_state->thread2.scratch_space_base_pointer = (state_base_offset + -+ /* FIXME: Eek! No relocation to match this... */ -+ wm_state->thread2.scratch_space_base_pointer = (pPriv->buf->offset + -+ state_base_offset + - wm_scratch_offset) >> 10; -+ +- wm_scratch_offset) >> 10; ++ wm_state->thread2.scratch_space_base_pointer = wm_scratch_offset >> 10; wm_state->thread2.per_thread_scratch_space = 0; /* 1024 bytes */ wm_state->thread3.dispatch_grf_start_reg = 3; /* XXX */ wm_state->thread3.const_urb_entry_read_length = 0; -@@ -487,8 +526,12 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, +@@ -487,8 +505,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, wm_state->thread3.urb_entry_read_length = 1; /* XXX */ wm_state->thread3.urb_entry_read_offset = 0; /* XXX */ wm_state->wm4.stats_enable = 1; - wm_state->wm4.sampler_state_pointer = (state_base_offset + -+ -+ /* FIXME: Eek! No relocation to match this... */ -+ wm_state->wm4.sampler_state_pointer = (pPriv->buf->offset + -+ state_base_offset + - src_sampler_offset) >> 5; -+ +- src_sampler_offset) >> 5; ++ wm_state->wm4.sampler_state_pointer = src_sampler_offset >> 5; wm_state->wm4.sampler_count = 1; /* 1-4 samplers used */ wm_state->wm5.max_threads = PS_MAX_THREADS - 1; wm_state->wm5.thread_dispatch_enable = 1; -@@ -535,8 +578,9 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, +@@ -496,6 +513,8 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, + wm_state->wm5.enable_8_pix = 0; + wm_state->wm5.early_depth_test = 1; + ++ dri_bo_unmap(pPriv->state); ++ + { + BEGIN_BATCH(2); + OUT_BATCH(MI_FLUSH | +@@ -520,12 +539,16 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, + OUT_BATCH((0 << 4) | /* URB Entry Allocation Size */ + (0 << 0)); /* Number of URB Entries */ + +- /* Zero out the two base address registers so all offsets are +- * absolute ++ /* Set the base addresses for general state and surface state ++ * to our buffer. + */ + OUT_BATCH(BRW_STATE_BASE_ADDRESS | 4); +- OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* Generate state base address */ +- OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* Surface state base address */ ++ OUT_RELOC(pPriv->state, /* General state base address */ ++ DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ, ++ BASE_ADDRESS_MODIFY); ++ OUT_RELOC(pPriv->state, /* Surface state base address */ ++ DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ, ++ BASE_ADDRESS_MODIFY); + OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* media base addr, don't care */ + /* general state max addr, disabled */ + OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); +@@ -535,8 +558,9 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, /* Set system instruction pointer */ OUT_BATCH(BRW_STATE_SIP | 0); /* system instruction pointer */ - OUT_BATCH(state_base_offset + sip_kernel_offset); - -+ OUT_RELOC(pPriv->buf, ++ OUT_RELOC(pPriv->state, + DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ, -+ state_base_offset + sip_kernel_offset); ++ sip_kernel_offset); OUT_BATCH(MI_NOOP); ADVANCE_BATCH(); } -@@ -564,7 +608,9 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, +@@ -564,7 +588,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, OUT_BATCH(0); /* clip */ OUT_BATCH(0); /* sf */ /* Only the PS uses the binding table */ - OUT_BATCH(state_base_offset + binding_table_offset); /* ps */ -+ OUT_RELOC(pPriv->buf, -+ DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ, -+ state_base_offset + binding_table_offset); /* ps */ ++ OUT_BATCH(binding_table_offset); /* ps */ /* Blend constant color (magenta is fun) */ OUT_BATCH(BRW_3DSTATE_CONSTANT_COLOR | 3); -@@ -594,9 +640,16 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, +@@ -589,14 +613,15 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, + + /* Set the pointers to the 3d pipeline state */ + OUT_BATCH(BRW_3DSTATE_PIPELINED_POINTERS | 5); +- OUT_BATCH(state_base_offset + vs_offset); /* 32 byte aligned */ ++ OUT_BATCH(vs_offset); /* 32 byte aligned */ + /* disable GS, resulting in passthrough */ OUT_BATCH(BRW_GS_DISABLE); /* disable CLIP, resulting in passthrough */ OUT_BATCH(BRW_CLIP_DISABLE); @@ -3573,29 +3847,43 @@ - OUT_BATCH(state_base_offset + wm_offset); /* 32 byte aligned */ - OUT_BATCH(state_base_offset + cc_offset); /* 64 byte aligned */ + -+ OUT_RELOC(pPriv->buf, -+ DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ, -+ state_base_offset + sf_offset); /* 32 byte aligned */ -+ OUT_RELOC(pPriv->buf, -+ DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ, -+ state_base_offset + wm_offset); /* 32 byte aligned */ -+ OUT_RELOC(pPriv->buf, -+ DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ, -+ state_base_offset + cc_offset); /* 64 byte aligned */ ++ OUT_BATCH(sf_offset); /* 32 byte aligned */ ++ OUT_BATCH(wm_offset); /* 32 byte aligned */ ++ OUT_BATCH(cc_offset); /* 64 byte aligned */ /* URB fence */ OUT_BATCH(BRW_URB_FENCE | -@@ -623,7 +676,9 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, +@@ -617,14 +642,19 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, + OUT_BATCH(((URB_CS_ENTRY_SIZE - 1) << 4) | + (URB_CS_ENTRIES << 0)); + +- /* Set up the pointer to our vertex buffer */ +- OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | 2); ++ /* Set up the pointer to our vertex buffer. The vertex buffer ++ * addresses aren't relative to any of the base addresses so we ++ * have to emit a relocation. */ ++ OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | 3); + /* four 32-bit floats per vertex */ OUT_BATCH((0 << VB0_BUFFER_INDEX_SHIFT) | VB0_VERTEXDATA | ((4 * 4) << VB0_BUFFER_PITCH_SHIFT)); - OUT_BATCH(state_base_offset + vb_offset); -+ OUT_RELOC(pPriv->buf, ++ OUT_RELOC(pPriv->state, + DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ, -+ state_base_offset + vb_offset); ++ vb_offset); OUT_BATCH(3); /* four corners to our rectangle */ ++ OUT_BATCH(0); /* reserved */ /* Set up our vertex elements, sourced from the single vertex buffer. */ + OUT_BATCH(BRW_3DSTATE_VERTEX_ELEMENTS | 3); +@@ -649,7 +679,6 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, + (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_3_SHIFT) | + (4 << VE1_DESTINATION_ELEMENT_OFFSET_SHIFT)); + +- OUT_BATCH(MI_NOOP); /* pad to quadword */ + ADVANCE_BATCH(); + } + diff --git a/src/intel_batchbuffer.c b/src/intel_batchbuffer.c index e15c6ce..3362a46 100644 --- a/src/intel_batchbuffer.c Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- xorg-x11-drv-i810.spec 6 Mar 2008 22:16:44 -0000 1.82 +++ xorg-x11-drv-i810.spec 7 Mar 2008 06:53:24 -0000 1.83 @@ -5,7 +5,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-i810 Version: 2.2.1 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -135,6 +135,10 @@ %{_libdir}/libI810XvMC.so %changelog +* Fri Mar 07 2008 Dave Airlie 2.2.1-9 +- update modesetting patch to include 965 video + fix for memory + space leak + * Fri Mar 07 2008 Dave Airlie 2.2.1-8 - fixup pciaccess version check and autoconf and fallout From fedora-extras-commits at redhat.com Fri Mar 7 07:04:11 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Fri, 7 Mar 2008 07:04:11 GMT Subject: rpms/kernel/devel kernel.spec, 1.479, 1.480 linux-2.6-drm-i915-modeset.patch, 1.1, 1.2 Message-ID: <200803070704.m2774B3a019846@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19814 Modified Files: kernel.spec linux-2.6-drm-i915-modeset.patch Log Message: * Fri Mar 07 2008 Dave Airlie - drm/modeset - fix unload and overly-large size alloc Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.479 retrieving revision 1.480 diff -u -r1.479 -r1.480 --- kernel.spec 6 Mar 2008 05:37:20 -0000 1.479 +++ kernel.spec 7 Mar 2008 07:03:34 -0000 1.480 @@ -1757,6 +1757,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Fri Mar 07 2008 Dave Airlie +- drm/modeset - fix unload and overly-large size alloc + * Thu Mar 06 2008 Dave Airlie - Add initial i915 drm modesetting tree - needs i915.modeset=1 on command line + new libdrm + new intel driver to actually be useful linux-2.6-drm-i915-modeset.patch: Index: linux-2.6-drm-i915-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-drm-i915-modeset.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-drm-i915-modeset.patch 6 Mar 2008 05:37:20 -0000 1.1 +++ linux-2.6-drm-i915-modeset.patch 7 Mar 2008 07:03:34 -0000 1.2 @@ -5469,20 +5469,10 @@ } diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c -index a2c1369..06bbdff 100644 +index a2c1369..01bed65 100644 --- a/drivers/char/drm/drm_irq.c +++ b/drivers/char/drm/drm_irq.c -@@ -157,6 +157,9 @@ int drm_irq_uninstall(struct drm_device * dev) - if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) - return -EINVAL; - -+ if (drm_core_check_feature(dev, DRIVER_MODESET)) -+ return 0; -+ - mutex_lock(&dev->struct_mutex); - irq_enabled = dev->irq_enabled; - dev->irq_enabled = 0; -@@ -201,6 +204,8 @@ int drm_control(struct drm_device *dev, void *data, +@@ -201,6 +201,8 @@ int drm_control(struct drm_device *dev, void *data, case DRM_INST_HANDLER: if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) return 0; @@ -5491,7 +5481,16 @@ if (dev->if_version < DRM_IF_VERSION(1, 2) && ctl->irq != dev->irq) return -EINVAL; -@@ -405,18 +410,18 @@ static void drm_locked_tasklet_func(unsigned long data) +@@ -208,6 +210,8 @@ int drm_control(struct drm_device *dev, void *data, + case DRM_UNINST_HANDLER: + if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) + return 0; ++ if (drm_core_check_feature(dev, DRIVER_MODESET)) ++ return 0; + return drm_irq_uninstall(dev); + default: + return -EINVAL; +@@ -405,18 +409,18 @@ static void drm_locked_tasklet_func(unsigned long data) spin_lock_irqsave(&dev->tasklet_lock, irqflags); if (!dev->locked_tasklet_func || @@ -8781,10 +8780,10 @@ int ret; diff --git a/drivers/char/drm/i915_init.c b/drivers/char/drm/i915_init.c new file mode 100644 -index 0000000..e2018bb +index 0000000..b82a46b --- /dev/null +++ b/drivers/char/drm/i915_init.c -@@ -0,0 +1,400 @@ +@@ -0,0 +1,401 @@ +/* + * Copyright (c) 2007 Intel Corporation + * Jesse Barnes @@ -9052,6 +9051,7 @@ + + + if (drm_core_check_feature(dev, DRIVER_MODESET)) { ++ drm_irq_uninstall(dev); + intel_modeset_cleanup(dev); + } + @@ -11268,7 +11268,7 @@ +#endif /* __INTEL_DRV_H__ */ diff --git a/drivers/char/drm/intel_fb.c b/drivers/char/drm/intel_fb.c new file mode 100644 -index 0000000..e33494c +index 0000000..d9743da --- /dev/null +++ b/drivers/char/drm/intel_fb.c @@ -0,0 +1,752 @@ @@ -11846,7 +11846,7 @@ + fb->bits_per_pixel = 32; + fb->pitch = fb->width * ((fb->bits_per_pixel + 1) / 8); + fb->depth = 24; -+ ret = drm_buffer_object_create(dev, fb->pitch * fb->height * 4, ++ ret = drm_buffer_object_create(dev, fb->pitch * fb->height, + drm_bo_type_kernel, + DRM_BO_FLAG_READ | + DRM_BO_FLAG_WRITE | From fedora-extras-commits at redhat.com Fri Mar 7 07:28:01 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Fri, 7 Mar 2008 07:28:01 GMT Subject: rpms/scim-bridge/devel scim-bridge-0.4.15-hotkey-help.patch, NONE, 1.1 scim-bridge.spec, 1.57, 1.58 Message-ID: <200803070728.m277S1bU020131@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim-bridge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20102 Modified Files: scim-bridge.spec Added Files: scim-bridge-0.4.15-hotkey-help.patch Log Message: Resolves: rhbz#199389 (Add global hotkey list in help window.) scim-bridge-0.4.15-hotkey-help.patch: --- NEW FILE scim-bridge-0.4.15-hotkey-help.patch --- diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp --- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp.hotkey-help 2007-11-07 18:48:45.000000000 +0800 +++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.cpp 2008-03-07 15:21:25.000000000 +0800 @@ -60,6 +60,8 @@ static unsigned int imengine_id = 0; static bool on_the_spot_enabled = true; +static String help_hotkeys = ""; + /* Class definition */ class ScimBridgeAgentIMContextImpl: public ScimBridgeAgentIMContext { @@ -137,6 +139,7 @@ class ScimBridgeAgentIMContextImpl: publ void alloc_imengine (); void free_imengine (); + private: scim_bridge_imcontext_id_t id; @@ -273,6 +276,17 @@ void ScimBridgeAgentIMContext::set_on_th } +void ScimBridgeAgentIMContext::set_help_hotkeys (const String &hotkey_str) +{ + help_hotkeys = hotkey_str; +} + +String ScimBridgeAgentIMContext::get_help_hotkeys () +{ + return help_hotkeys; +} + + ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener): client_listener (new_client_listener), imengine (NULL), enabled (false), preedit_mode (PREEDIT_ANY), preedit_shown (false), preedit_cursor_position (0) @@ -917,7 +931,9 @@ void ScimBridgeAgentIMContextImpl::panel { String help = String (_ ("Smart Common Input Method platform ")) + String (SCIM_VERSION) + - String (_ ("\n(C) 2002-2005 James Su \n\n")); + String (_ ("\n(C) 2002-2005 James Su \n\n")) + + help_hotkeys + + String ("\n\n"); IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ()); if (factory.null ()) factory = fallback_imengine_factory; diff -up scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h --- scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h.hotkey-help 2007-06-02 11:33:48.000000000 +0800 +++ scim-bridge-0.4.15/agent/scim-bridge-agent-imcontext.h 2008-03-07 15:19:12.000000000 +0800 @@ -130,6 +130,21 @@ class ScimBridgeAgentIMContext static void set_enabled_by_default (bool enabled); /** + * Get the hotkey help messages. + * + * @return help messages about hotkeys. + */ + static scim::String get_help_hotkeys (); + + /** + * Set the hotkey help messages. + * + * @param hotkey_str Help message about hotkeys. + * + */ + static void set_help_hotkeys (const scim::String &hotkey_str); + + /** * Destructor. */ virtual ~ScimBridgeAgentIMContext () {} diff -up scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.hotkey-help scim-bridge-0.4.15/agent/scim-bridge-agent.cpp --- scim-bridge-0.4.15/agent/scim-bridge-agent.cpp.hotkey-help 2008-02-24 08:08:43.000000000 +0800 +++ scim-bridge-0.4.15/agent/scim-bridge-agent.cpp 2008-03-07 15:22:27.000000000 +0800 @@ -529,6 +529,23 @@ void ScimBridgeAgentImpl::slot_reload_co scim_global_config_flush (); scim_keyboard_layout = scim_get_default_keyboard_layout (); + + String help_hotkeys; + + help_hotkeys = String (_ ("\nGlobal Hotkeys:")) + + String (_ ("\n\nTrigger: ")) + + scim_config->read (String ("/Hotkeys/FrontEnd/Trigger"), String ("Unable to be loaded.")) + + String (_ ("\n\nTurn on: ")) + + scim_config->read (String ("/Hotkeys/FrontEnd/On"), String ("Unable to be loaded.")) + + String (_ ("\n\nTurn off: ")) + + scim_config->read (String ("/Hotkeys/FrontEnd/Off"), String ("Unable to be loaded.")) + + String (_ ("\n\nNext input method: ")) + + scim_config->read (String ("/Hotkeys/FrontEnd/NextFactory"), String ("Unable to be loaded.")) + + String (_ ("\n\nPrevious input method: ")) + + scim_config->read (String ("/Hotkeys/FrontEnd/PreviousFactory"), String ("Unable to be loaded.")); + String (_ ("\n\nShow input method menu: ")) + + scim_config->read (String ("/Hotkeys/FrontEnd/ShowFactoryMenu"), String ("Unable to be loaded.")); + ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys); } Index: scim-bridge.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- scim-bridge.spec 4 Mar 2008 05:04:51 -0000 1.57 +++ scim-bridge.spec 7 Mar 2008 07:27:27 -0000 1.58 @@ -5,7 +5,7 @@ Name: scim-bridge Version: 0.4.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM Bridge Gtk IM module Group: System Environment/Libraries @@ -24,6 +24,7 @@ Requires: scim >= 1.4.6 Patch0: scim-bridge-0.4.15-fix-gdm.patch +Patch1: scim-bridge-0.4.15-hotkey-help.patch %description @@ -71,6 +72,7 @@ %prep %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} %patch0 -p1 -b .0-fix-gdm +%patch1 -p1 -b .1-hotkey-help %if %{snapshot} mkdir m4 @@ -141,6 +143,9 @@ %changelog +* Fri Mar 07 2008 Caius Chance - 0.4.15-2 +- Resolves: rhbz#199389 (Add global hotkey list in help window.) + * Tue Mar 04 2008 Huang Peng - 0.4.15-1 - Update to 0.4.15. - Let scim-bridge gtkim context can work with gtkplug widget #251787. From fedora-extras-commits at redhat.com Fri Mar 7 07:43:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 07:43:58 +0000 Subject: [pkgdb] kernel: markmc has requested commit Message-ID: <200803070745.m277jiTW020590@bastion.fedora.phx.redhat.com> Mark McLoughlin (markmc) has requested the commit acl on kernel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kernel From fedora-extras-commits at redhat.com Fri Mar 7 07:44:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 07:44:02 +0000 Subject: [pkgdb] kernel: markmc has requested watchcommits Message-ID: <200803070745.m277jm8e020615@bastion.fedora.phx.redhat.com> Mark McLoughlin (markmc) has requested the watchcommits acl on kernel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kernel From fedora-extras-commits at redhat.com Fri Mar 7 07:56:14 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Fri, 7 Mar 2008 07:56:14 GMT Subject: comps comps-f9.xml.in,1.293,1.294 Message-ID: <200803070756.m277uEcA020664@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20647 Modified Files: comps-f9.xml.in Log Message: Install smartmontools-config by default in F-9 Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.293 retrieving revision 1.294 diff -u -r1.293 -r1.294 --- comps-f9.xml.in 7 Mar 2008 02:34:53 -0000 1.293 +++ comps-f9.xml.in 7 Mar 2008 07:55:44 -0000 1.294 @@ -243,6 +243,7 @@ sendmail setuptool smartmontools + smartmontools-config specspo stunnel sudo From fedora-extras-commits at redhat.com Fri Mar 7 08:31:50 2008 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 7 Mar 2008 08:31:50 GMT Subject: rpms/gdm/devel gdm-2.21.9-signal.patch, NONE, 1.1 gdm.spec, 1.338, 1.339 Message-ID: <200803070831.m278VoRD028264@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/pkgs/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28223 Modified Files: gdm.spec Added Files: gdm-2.21.9-signal.patch Log Message: fix endianness breakage gdm-2.21.9-signal.patch: --- NEW FILE gdm-2.21.9-signal.patch --- --- gdm-2.21.9/common/gdm-signal-handler.c~ 2008-02-04 21:20:41.000000000 +0000 +++ gdm-2.21.9/common/gdm-signal-handler.c 2008-03-06 15:41:46.000000000 +0000 @@ -220,6 +220,7 @@ signal_handler (int signo) { static int in_fatal = 0; int ignore; + guchar signo_byte = signo; /* avoid loops */ if (in_fatal > 0) { @@ -244,12 +245,12 @@ signal_handler (int signo) g_warning ("Caught signal %d, shutting down abnormally. Generating backtrace...", signo); gdm_signal_handler_backtrace (); - ignore = write (signal_pipes [1], (guchar *)&signo, 1); + ignore = write (signal_pipes [1], &signo_byte, 1); break; default: --in_fatal; /* FIXME: should probably use int32 here */ - ignore = write (signal_pipes [1], (guchar *)&signo, 1); + ignore = write (signal_pipes [1], &signo_byte, 1); break; } } Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.338 retrieving revision 1.339 diff -u -r1.338 -r1.339 --- gdm.spec 4 Mar 2008 04:37:14 -0000 1.338 +++ gdm.spec 7 Mar 2008 08:31:15 -0000 1.339 @@ -19,7 +19,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.21.9 -Release: 0.2008.02.29.2%{?dist} +Release: 0.2008.02.29.3%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -91,6 +91,7 @@ Patch0: gdm-2.21.9-dont-steal-all-keypresses.patch Patch1: gdm-2.21.9-check-capslock-state-not-capslock-light-state.patch +Patch2: gdm-2.21.9-signal.patch Patch99: gdm-2.21.8-fedora-logo.patch @@ -114,7 +115,7 @@ %patch0 -p1 -b .dont-steal-all-keypresses %patch1 -p1 -b .check-capslock-state-not-capslock-light-state - +%patch2 -p1 -b .signal %patch99 -p1 -b .fedora-logo @@ -310,6 +311,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Fri Mar 7 2008 David Woodhouse - 1:2.21.9-0.2008.02.29.3 +- Fix endianness breakage in signal pipes (#436333) + * Mon Mar 3 2008 Ray Strode - 1:2.21.9-0.2008.02.29.2 - Be more explicit in file list; use less globs - Don't package user-switcher in both packages! From fedora-extras-commits at redhat.com Fri Mar 7 09:09:18 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Fri, 7 Mar 2008 09:09:18 GMT Subject: rpms/gcc/devel .cvsignore, 1.227, 1.228 gcc43.spec, 1.20, 1.21 sources, 1.229, 1.230 gcc43-baselist-update.patch, 1.2, NONE gcc43-pr34964.patch, 1.1, NONE gcc43-pr35028.patch, 1.1, NONE gcc43-pr35078.patch, 1.1, NONE Message-ID: <200803070909.m2799IfC003356@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3319 Modified Files: .cvsignore gcc43.spec sources Removed Files: gcc43-baselist-update.patch gcc43-pr34964.patch gcc43-pr35028.patch gcc43-pr35078.patch Log Message: 4.3.0-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- .cvsignore 1 Mar 2008 00:15:53 -0000 1.227 +++ .cvsignore 7 Mar 2008 09:08:38 -0000 1.228 @@ -1,2 +1,2 @@ -gcc-4.3.0-20080229.tar.bz2 +gcc-4.3.0-20080307.tar.bz2 fastjar-0.95.tar.gz Index: gcc43.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gcc43.spec 1 Mar 2008 00:15:53 -0000 1.20 +++ gcc43.spec 7 Mar 2008 09:08:38 -0000 1.21 @@ -1,6 +1,6 @@ -%define DATE 20080229 +%define DATE 20080307 %define gcc_version 4.3.0 -%define gcc_release 0.13 +%define gcc_release 1 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -140,10 +140,6 @@ Patch11: gcc43-rh341221.patch Patch12: gcc43-cpp-pragma.patch Patch13: gcc43-java-debug-iface-type.patch -Patch14: gcc43-pr34964.patch -Patch15: gcc43-pr35028.patch -Patch16: gcc43-pr35078.patch -Patch17: gcc43-baselist-update.patch # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. @@ -440,10 +436,6 @@ %patch11 -p0 -b .rh341221~ %patch12 -p0 -b .cpp-pragma~ %patch13 -p0 -b .java-debug-iface-type~ -%patch14 -p0 -b .pr34964~ -%patch15 -p0 -b .pr35028~ -%patch16 -p0 -b .pr35078~ -%patch17 -p0 -b .baselist-update~ tar xzf %{SOURCE4} @@ -451,7 +443,7 @@ tar xjf %{SOURCE10} %endif -sed -i -e 's/4\.3\.0/4.3.0/' gcc/BASE-VER +sed -i -e 's/4\.3\.1/4.3.0/' gcc/BASE-VER echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h @@ -1657,6 +1649,12 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Fri Mar 7 2008 Jakub Jelinek 4.3.0-1 +- gcc 4.3.0 release + - PRs c++/35244, c++/35315, c++/35323, c++/35333, c++/35338, driver/35420, + libfortran/35355, libstdc++/35480, target/33963, target/35189, + target/35222, target/35401, target/35453 + * Fri Feb 29 2008 Jakub Jelinek 4.3.0-0.13 - update from gcc-4_3-branch - PRs middle-end/19984, target/25477 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- sources 1 Mar 2008 00:15:53 -0000 1.229 +++ sources 7 Mar 2008 09:08:38 -0000 1.230 @@ -1,2 +1,2 @@ -d482ca8757d55c91ea709bce300a1d59 gcc-4.3.0-20080229.tar.bz2 +634cd8d08cee6315a4091ec4fadc3b95 gcc-4.3.0-20080307.tar.bz2 92a70f9e56223b653bce0f58f90cf950 fastjar-0.95.tar.gz --- gcc43-baselist-update.patch DELETED --- --- gcc43-pr34964.patch DELETED --- --- gcc43-pr35028.patch DELETED --- --- gcc43-pr35078.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 7 09:32:55 2008 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 7 Mar 2008 09:32:55 GMT Subject: rpms/flumotion/devel flumotion.spec,1.12,1.13 Message-ID: <200803070932.m279Wtlo003695@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3677 Modified Files: flumotion.spec Log Message: fix pycrypto dep Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/devel/flumotion.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- flumotion.spec 20 Feb 2008 04:57:37 -0000 1.12 +++ flumotion.spec 7 Mar 2008 09:32:15 -0000 1.13 @@ -6,7 +6,7 @@ Name: flumotion Version: 0.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Flumotion - the Fluendo Streaming Server Group: Applications/Internet @@ -26,7 +26,7 @@ Requires: python-imaging Requires: pyOpenSSL Requires: pkgconfig -Requires: pycrypto +Requires: python-crypto # for make-dummy-cert to work Requires(post): openssl @@ -253,6 +253,9 @@ %{_sysconfdir}/rc.d/init.d/flumotion %changelog +* Fri Mar 07 2008 Thomas Vander Stichele +- Change pycrypto dependency to python-crypto, which is the actual package name + * Tue Feb 19 2008 Fedora Release Engineering - 0.4.2-3 - Autorebuild for GCC 4.3 @@ -260,7 +263,6 @@ - 0.4.2-2 - Own datadir/flumotion. Fixes #233834. - Require pycrypto for the sha256 bouncer. -- NOT YET BUILT * Sat Apr 14 2007 Thomas Vander Stichele - 0.4.2-1 From fedora-extras-commits at redhat.com Fri Mar 7 09:45:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 09:45:16 +0000 Subject: [pkgdb] xdvipdfmx: jnovy has requested watchbugzilla Message-ID: <200803070947.m279l4TG023515@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has requested the watchbugzilla acl on xdvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 09:45:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 09:45:36 +0000 Subject: [pkgdb] xdvipdfmx: jnovy has requested watchcommits Message-ID: <200803070947.m279l9R2023536@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has requested the watchcommits acl on xdvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 09:45:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 09:45:24 +0000 Subject: [pkgdb] xdvipdfmx: jnovy has requested commit Message-ID: <200803070947.m279lC6p023558@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has requested the commit acl on xdvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 09:45:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 09:45:30 +0000 Subject: [pkgdb] xdvipdfmx: jnovy has requested approveacls Message-ID: <200803070947.m279lC6t023558@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has requested the approveacls acl on xdvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 10:03:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:03:00 +0000 Subject: [pkgdb] thunderbird: stransky has requested commit Message-ID: <200803071004.m27A4YYQ024024@bastion.fedora.phx.redhat.com> Martin Stransky (stransky) has requested the commit acl on thunderbird (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/thunderbird From fedora-extras-commits at redhat.com Fri Mar 7 10:03:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:03:04 +0000 Subject: [pkgdb] thunderbird: stransky has requested watchcommits Message-ID: <200803071004.m27A4YYU024024@bastion.fedora.phx.redhat.com> Martin Stransky (stransky) has requested the watchcommits acl on thunderbird (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/thunderbird From fedora-extras-commits at redhat.com Fri Mar 7 10:20:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:20:36 +0000 Subject: [pkgdb] vconfig: rrakus has requested watchbugzilla Message-ID: <200803071022.m27AMPec024459@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on vconfig (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:20:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:20:38 +0000 Subject: [pkgdb] vconfig: rrakus has requested approveacls Message-ID: <200803071022.m27AMQ5M024478@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on vconfig (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:20:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:20:39 +0000 Subject: [pkgdb] vconfig: rrakus has requested commit Message-ID: <200803071022.m27AMPef024459@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on vconfig (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:20:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:20:55 +0000 Subject: [pkgdb] vconfig: rrakus has requested watchbugzilla Message-ID: <200803071022.m27AMTfR024515@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on vconfig (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:20:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:20:42 +0000 Subject: [pkgdb] vconfig: rrakus has requested watchcommits Message-ID: <200803071022.m27AMQ5P024478@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on vconfig (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:20:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:20:57 +0000 Subject: [pkgdb] vconfig: rrakus has requested commit Message-ID: <200803071022.m27AMTfU024515@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on vconfig (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:20:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:20:46 +0000 Subject: [pkgdb] vconfig: rrakus has requested approveacls Message-ID: <200803071022.m27AMPei024459@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on vconfig (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:21:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:21:06 +0000 Subject: [pkgdb] vconfig: rrakus has requested watchbugzilla Message-ID: <200803071022.m27AMTfX024515@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchbugzilla acl on vconfig (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:21:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:21:00 +0000 Subject: [pkgdb] vconfig: rrakus has requested watchcommits Message-ID: <200803071022.m27AMnk2024625@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on vconfig (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:21:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:21:16 +0000 Subject: [pkgdb] vconfig: rrakus has requested approveacls Message-ID: <200803071022.m27AMo0U024644@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the approveacls acl on vconfig (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:21:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:21:01 +0000 Subject: [pkgdb] vconfig: rrakus has requested commit Message-ID: <200803071022.m27AMnk5024625@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the commit acl on vconfig (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:21:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 10:21:29 +0000 Subject: [pkgdb] vconfig: rrakus has requested watchcommits Message-ID: <200803071023.m27AMo0X024644@bastion.fedora.phx.redhat.com> Roman Rakus (rrakus) has requested the watchcommits acl on vconfig (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 10:52:25 2008 From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut)) Date: Fri, 7 Mar 2008 10:52:25 GMT Subject: rpms/astronomy-bookmarks/devel astronomy-bookmarks.spec, NONE, 1.1 default-bookmarks.html, NONE, 1.1 Message-ID: <200803071052.m27AqP2O011975@cvs-int.fedora.redhat.com> Author: mmahut Update of /cvs/pkgs/rpms/astronomy-bookmarks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11968 Added Files: astronomy-bookmarks.spec default-bookmarks.html Log Message: Initial package import --- NEW FILE astronomy-bookmarks.spec --- Name: astronomy-bookmarks Version: 1 Release: 3%{?dist} Summary: Fedora astronomy bookmarks Group: Applications/Internet License: GFDL URL: https://fedoraproject.org/wiki/SIGs/Astronomy/Bookmarks Source0: default-bookmarks.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Conflicts: fedora-bookmarks Provides: system-bookmarks %description This package contains the astronomy bookmarks for Fedora. %prep %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/bookmarks install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/bookmarks %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %dir %{_datadir}/bookmarks %{_datadir}/bookmarks/default-bookmarks.html %changelog * Sun Feb 20 2008 Marek Mahut 1-3 - Initial version --- NEW FILE default-bookmarks.html --- Bookmarks

Bookmarks

From fedora-extras-commits at redhat.com Fri Mar 7 11:09:01 2008 From: fedora-extras-commits at redhat.com (Mark McLoughlin (markmc)) Date: Fri, 7 Mar 2008 11:09:01 GMT Subject: rpms/kernel-xen-2.6/devel kernel.spec,1.14,1.15 Message-ID: <200803071109.m27B919m019421@cvs-int.fedora.redhat.com> Author: markmc Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19387 Modified Files: kernel.spec Log Message: * Fri Mar 7 2008 Mark McLoughlin - Label everything in xen subpackage with %{kverrel}-xen to ensure xen-syms.debug goes into kernel-debuginfo-xen Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kernel.spec 6 Mar 2008 13:59:25 -0000 1.14 +++ kernel.spec 7 Mar 2008 11:08:23 -0000 1.15 @@ -765,7 +765,7 @@ %description -n %{variantbase}%{?1:-%{1}}-debuginfo\ This package provides debug information for package %{variantbase}%{?1:-%{1}}.\ This is required to use SystemTap with %{variantbase}%{?1:-%{1}}-%{KVERREL}.\ -%{?1:%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}(\.debug)?' -o debuginfo%{?1}.list}}\ +%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:-?%{1}}(-%%{_target_cpu})?/.*|/.*%%{KVERREL}%{?1}(\.debug)?' -o debuginfo%{?1}.list}\ %{nil} # @@ -1542,8 +1542,8 @@ cd %{xen_hv_dirname}/xen/ mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot make %{?_smp_mflags} %{xen_flags} - install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL} - install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL} + install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}xen + install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}xen cd ../.. %endif %endif @@ -1611,8 +1611,8 @@ %if %{includexen} %if %{with_xen} mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d -rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf -cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf <<\EOF +rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf +cat > $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf <<\EOF # This directive teaches ldconfig to search in nosegneg subdirectories # and cache the DSOs there with extra bit 0 set in their hwcap match # fields. In Xen guest kernels, the vDSO tells the dynamic linker to @@ -1620,7 +1620,7 @@ # in the ld.so.cache file. hwcap 0 nosegneg EOF -chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf +chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf %endif %endif @@ -1752,7 +1752,7 @@ %if %{with_xen} %kernel_variant_preun xen -%kernel_variant_post -v xen -s kernel-xen[0U] -r kernel-xen -- `[ -d /proc/xen -a ! -e /proc/xen/xsd_kva ] || echo --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}` +%kernel_variant_post -v xen -s kernel-xen[0U] -r kernel-xen -- `[ -d /proc/xen -a ! -e /proc/xen/xsd_kva ] || echo --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}xen` if [ -x /sbin/ldconfig ] then /sbin/ldconfig -X || exit $? @@ -1849,9 +1849,13 @@ %kernel_variant_files %{with_pae} PAE %kernel_variant_files %{with_pae_debug} PAEdebug %kernel_variant_files -k vmlinux %{with_kdump} kdump -%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen +%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf %{with_xen} xen %changelog +* Fri Mar 7 2008 Mark McLoughlin +- Label everything in xen subpackage with %{kverrel}-xen to + ensure xen-syms.debug goes into kernel-debuginfo-xen + * Wed Mar 05 2008 Mark McLoughlin - Reset to pv_ops xen DomU from kernel-2_6_25-0_93_rc4_fc9 - Revert the execshield patch for now From fedora-extras-commits at redhat.com Fri Mar 7 11:10:45 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Fri, 7 Mar 2008 11:10:45 GMT Subject: rpms/perl-libwww-perl/devel perl-libwww-perl.spec,1.24,1.25 Message-ID: <200803071110.m27BAjAM019495@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-libwww-perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19427 Modified Files: perl-libwww-perl.spec Log Message: Patch from bugzilla. Rebuild package after perl-5.10 will be out. Index: perl-libwww-perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/perl-libwww-perl.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- perl-libwww-perl.spec 28 Feb 2008 13:14:18 -0000 1.24 +++ perl-libwww-perl.spec 7 Mar 2008 11:09:44 -0000 1.25 @@ -1,6 +1,6 @@ Name: perl-libwww-perl Version: 5.808 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A Perl interface to the World-Wide Web Group: Development/Libraries @@ -18,10 +18,11 @@ BuildArch: noarch BuildRequires: perl(HTML::Entities), perl(URI), perl(Test::More), perl(ExtUtils::MakeMaker) +BuildRequires: mailcap Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Compress::Zlib) Requires: perl-HTML-Parser >= 3.33 - +Requires: mailcap %description The libwww-perl collection is a set of Perl modules which provides a @@ -79,6 +80,14 @@ mv -f "${file}_" "$file" done +# Use system wide MIME types (link also to blib/... for "make test"). Doing +# this stuff before "make install" would not cause the symlink to be packaged +# but a copy of /etc/mime.types. +for file in {blib/lib,$RPM_BUILD_ROOT%{perl_vendorlib}}/LWP/media.types ; do + [ ! -f $file ] && echo ERROR && exit 1 + ln -sf /etc/mime.types $file +done + %check make test @@ -105,6 +114,9 @@ %changelog +* Fri Mar 7 2008 Ville Skytt?? - 5.808-7 +- Use system /etc/mime.types instead of an outdated private copy. + * Wed Feb 27 2008 Tom "spot" Callaway - 5.808-6 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Fri Mar 7 11:13:17 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 7 Mar 2008 11:13:17 GMT Subject: rpms/rsyslog/devel rsyslog-3.11.4-undef.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 rsyslog.spec, 1.27, 1.28 sources, 1.17, 1.18 Message-ID: <200803071113.m27BDHXK019562@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/rsyslog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19527 Modified Files: .cvsignore rsyslog.spec sources Added Files: rsyslog-3.11.4-undef.patch Log Message: move to rsyslog v3 rsyslog-3.11.4-undef.patch: --- NEW FILE rsyslog-3.11.4-undef.patch --- diff -up rsyslog-3.11.0/plugins/imklog/imklog.h.undef rsyslog-3.11.0/plugins/imklog/imklog.h --- rsyslog-3.11.0/plugins/imklog/imklog.h.undef 2008-02-01 12:42:18.000000000 +0100 +++ rsyslog-3.11.0/plugins/imklog/imklog.h 2008-02-01 12:43:33.000000000 +0100 @@ -28,6 +28,9 @@ #include "rsyslog.h" #include "syslogd.h" +#undef syslog +#undef vsyslog + /* global variables */ extern int dbgPrintSymbols; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 Feb 2008 16:56:20 -0000 1.17 +++ .cvsignore 7 Mar 2008 11:12:39 -0000 1.18 @@ -1,3 +1,4 @@ -rsyslog-2.0.2.tar.gz +rsyslog-3.12.1.tar.gz +rsyslog.conf rsyslog.init rsyslog.sysconfig Index: rsyslog.spec =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- rsyslog.spec 18 Feb 2008 12:31:54 -0000 1.27 +++ rsyslog.spec 7 Mar 2008 11:12:39 -0000 1.28 @@ -2,27 +2,28 @@ Summary: Enhanced system logging and kernel message trapping daemons Name: rsyslog -Version: 2.0.2 -Release: 2%{?dist} -License: GPLv2+ +Version: 3.12.1 +Release: 1%{?dist} +License: GPLv3+ Group: System Environment/Daemons URL: http://www.rsyslog.com/ Source0: http://download.rsyslog.com/rsyslog/%{name}-%{version}.tar.gz Source1: rsyslog.init -Source2: rsyslog.sysconfig +Source2: rsyslog.conf +Source3: rsyslog.sysconfig +Patch1: rsyslog-3.11.4-undef.patch BuildRequires: zlib-devel -BuildRequires: autoconf automake libtool +BuildRequires: autoconf automake Requires: logrotate >= 3.5.2 Requires: bash >= 2.0 Requires(post): /sbin/chkconfig coreutils Requires(preun): /sbin/chkconfig /sbin/service Requires(postun): /sbin/service Provides: syslog -Provides: sysklogd = 1.4.3-1 -Obsoletes: sysklogd < 1.4.3-1 -Conflicts: syslog-ng +Conflicts: sysklogd < 1.4.1-43 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %package mysql Summary: MySQL support for rsyslog Group: System Environment/Daemons @@ -35,6 +36,12 @@ Requires: %name = %version-%release BuildRequires: postgresql-devel +%package gssapi +Summary: GSSAPI authentication and encryption support for rsyslog +Group: System Environment/Daemons +Requires: %name = %version-%release +BuildRequires: krb5-devel + %description Rsyslog is an enhanced multi-threaded syslogd supporting, among others, MySQL, syslog/tcp, RFC 3195, permitted sender lists, filtering on any message part, @@ -52,11 +59,17 @@ The rsyslog-pgsql package contains a dynamic shared object that will add PostgreSQL database support to rsyslog. +%description gssapi +The rsyslog-gssapi package contains the rsyslog plugins which support GSSAPI +authentication and secure connections. GSSAPI is commonly used for Kerberos +authentication. + %prep %setup -q +%patch1 -p1 -b .undef %build -%configure --sbindir=%{sbindir} --disable-static --enable-mysql --enable-pgsql +%configure --sbindir=%{sbindir} --disable-static --enable-mysql --enable-pgsql --enable-gssapi-krb5 make %{?_smp_mflags} %install @@ -67,10 +80,11 @@ install -d -m 755 $RPM_BUILD_ROOT%{_initrddir} install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d + install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/rsyslog -install -p -m 644 redhat/rsyslog.conf $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf -install -p -m 644 redhat/rsyslog.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rsyslog -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rsyslog +install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rsyslog +install -p -m 644 redhat/rsyslog.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog #get rid of *.la rm $RPM_BUILD_ROOT/%{_libdir}/rsyslog/*.la @@ -79,23 +93,12 @@ rm -rf $RPM_BUILD_ROOT %post -if [ $1 = 1 ]; then - /sbin/chkconfig --add rsyslog -fi +/sbin/chkconfig --add rsyslog for n in /var/log/{messages,secure,maillog,spooler} do [ -f $n ] && continue umask 066 && touch $n done -#use sysklogd configuration files -if [ -f /etc/syslog.conf ]; then - mv -f /etc/rsyslog.conf /etc/rsyslog.conf.rpmnew - mv -f /etc/syslog.conf /etc/rsyslog.conf -fi -if [ -f /etc/sysconfig/syslog ]; then - mv -f /etc/sysconfig/rsyslog /etc/sysconfig/rsyslog.rpmnew - mv -f /etc/sysconfig/syslog /etc/sysconfig/rsyslog -fi %preun if [ $1 = 0 ]; then @@ -108,15 +111,25 @@ service rsyslog condrestart > /dev/null 2>&1 ||: fi +%triggerun -- rsyslog < 3.0.0 +/bin/kill `cat /var/run/rklogd.pid 2> /dev/null` > /dev/null 2>&1 ||: + %files %defattr(-,root,root,-) -%doc AUTHORS COPYING INSTALL NEWS README doc/*html -%config(noreplace) %{_sysconfdir}/rsyslog.conf -%config(noreplace) %{_sysconfdir}/sysconfig/rsyslog -%config(noreplace) %{_sysconfdir}/logrotate.d/rsyslog +%doc AUTHORS COPYING NEWS README doc/*html +%dir %{_libdir}/rsyslog +%{_libdir}/rsyslog/imklog.so +%{_libdir}/rsyslog/immark.so +%{_libdir}/rsyslog/imtcp.so +%{_libdir}/rsyslog/tcpsrv.so +%{_libdir}/rsyslog/imudp.so +%{_libdir}/rsyslog/imuxsock.so +%{_libdir}/rsyslog/omtesting.so +%config %{_sysconfdir}/rsyslog.conf +%config %{_sysconfdir}/sysconfig/rsyslog +%config(noreplace) %{_sysconfdir}/logrotate.d/syslog %{_initrddir}/rsyslog %{sbindir}/rsyslogd -%{sbindir}/rklogd %{sbindir}/rfc3195d %{_mandir}/*/* @@ -130,23 +143,49 @@ %doc plugins/ompgsql/createDB.sql %{_libdir}/rsyslog/ompgsql.so +%files gssapi +%defattr(-,root,root) +%{_libdir}/rsyslog/gssutil.so +%{_libdir}/rsyslog/imgssapi.so +%{_libdir}/rsyslog/omgssapi.so + %changelog -* Mon Feb 18 2008 Peter Vrabec 2.0.2-2 -- include createDB.sql in PostgresSQL plugin +* Thu Mar 06 2008 Peter Vrabec 3.12.1-1 +- upgrade -* Wed Feb 13 2008 Peter Vrabec 2.0.2-1 -- new upstream release +* Wed Mar 05 2008 Peter Vrabec 3.12.0-1 +- upgrade + +* Mon Feb 25 2008 Peter Vrabec 3.11.5-1 +- upgrade + +* Fri Feb 01 2008 Peter Vrabec 3.11.0-1 +- upgrade to the latests development release - provide PostgresSQL support +- provide GSSAPI support -* Mon Feb 11 2008 Peter Vrabec 2.0.0-3 -- fix documentation problems +* Mon Jan 21 2008 Peter Vrabec 2.0.0-7 +- change from requires sysklogd to conflicts sysklogd -* Tue Jan 22 2008 Peter Vrabec 2.0.0-2 -- strerror fix (#428775) +* Fri Jan 18 2008 Peter Vrabec 2.0.0-6 +- change logrotate file +- use rsyslog own pid file -* Thu Jan 17 2008 Peter Vrabec 2.0.0-1 -- upgrade -- fixing bad file descriptor (#428775) +* Thu Jan 17 2008 Peter Vrabec 2.0.0-5 +- fixing bad descriptor (#428775) + +* Wed Jan 16 2008 Peter Vrabec 2.0.0-4 +- rename logrotate file + +* Wed Jan 16 2008 Peter Vrabec 2.0.0-3 +- fix post script and init file + +* Wed Jan 16 2008 Peter Vrabec 2.0.0-2 +- change pid filename and use logrotata script from sysklogd + +* Tue Jan 15 2008 Peter Vrabec 2.0.0-1 +- upgrade to stable release +- spec file clean up * Wed Jan 02 2008 Peter Vrabec 1.21.2-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 Feb 2008 16:56:20 -0000 1.17 +++ sources 7 Mar 2008 11:12:39 -0000 1.18 @@ -1,3 +1,4 @@ -7e214ddb80544e99dac643f1d93c81fb rsyslog-2.0.2.tar.gz -fe8fcd90c672701fa198dd1206df64ae rsyslog.init -e10d2dc3238c2cf2a54933f10b19b9bf rsyslog.sysconfig +12c743b21a0984467bc4c05b6ee887e2 rsyslog-3.12.1.tar.gz +9730674162e08bcc88503a19e21ac2d4 rsyslog.conf +04ea4165e7289f009b189968e49b9c81 rsyslog.init +04f3868aa518d33809f5943d7bc2fc0b rsyslog.sysconfig From fedora-extras-commits at redhat.com Fri Mar 7 11:16:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 11:16:45 +0000 Subject: [pkgdb] cloudy: mmahut has requested watchbugzilla Message-ID: <200803071118.m27BIYmR026213@bastion.fedora.phx.redhat.com> Marek Mahut (mmahut) has requested the watchbugzilla acl on cloudy (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cloudy From fedora-extras-commits at redhat.com Fri Mar 7 11:16:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 11:16:54 +0000 Subject: [pkgdb] cloudy: mmahut has requested approveacls Message-ID: <200803071118.m27BIYmU026213@bastion.fedora.phx.redhat.com> Marek Mahut (mmahut) has requested the approveacls acl on cloudy (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cloudy From fedora-extras-commits at redhat.com Fri Mar 7 11:17:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 11:17:07 +0000 Subject: [pkgdb] cloudy: mmahut has requested commit Message-ID: <200803071118.m27BIhrK026234@bastion.fedora.phx.redhat.com> Marek Mahut (mmahut) has requested the commit acl on cloudy (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cloudy From fedora-extras-commits at redhat.com Fri Mar 7 11:17:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 11:17:00 +0000 Subject: [pkgdb] cloudy: mmahut has requested watchcommits Message-ID: <200803071118.m27BIYmX026213@bastion.fedora.phx.redhat.com> Marek Mahut (mmahut) has requested the watchcommits acl on cloudy (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cloudy From fedora-extras-commits at redhat.com Fri Mar 7 11:20:40 2008 From: fedora-extras-commits at redhat.com (Ivana Varekova (varekova)) Date: Fri, 7 Mar 2008 11:20:40 GMT Subject: rpms/man-pages/devel man-pages-2.78-stream.patch, NONE, 1.1 man-pages.spec, 1.96, 1.97 Message-ID: <200803071120.m27BKekM019699@cvs-int.fedora.redhat.com> Author: varekova Update of /cvs/pkgs/rpms/man-pages/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19670 Modified Files: man-pages.spec Added Files: man-pages-2.78-stream.patch Log Message: - fix 436398: add information about unimplemented syscalls man-pages-2.78-stream.patch: --- NEW FILE man-pages-2.78-stream.patch --- diff -up man-pages-2.78/man2/getmsg.2.pom man-pages-2.78/man2/getmsg.2 --- man-pages-2.78/man2/getmsg.2.pom 2008-03-07 12:03:52.000000000 +0100 +++ man-pages-2.78/man2/getmsg.2 2008-03-07 12:04:04.000000000 +0100 @@ -0,0 +1 @@ +.so man2/unimplemented.2 diff -up man-pages-2.78/man2/putmsg.2.pom man-pages-2.78/man2/putmsg.2 --- man-pages-2.78/man2/putmsg.2.pom 2008-03-07 12:03:52.000000000 +0100 +++ man-pages-2.78/man2/putmsg.2 2008-03-07 12:04:12.000000000 +0100 @@ -0,0 +1 @@ +.so man2/unimplemented.2 diff -up man-pages-2.78/man2/fattch.2.pom man-pages-2.78/man2/fattch.2 --- man-pages-2.78/man2/fattch.2.pom 2008-03-07 12:03:52.000000000 +0100 +++ man-pages-2.78/man2/fattch.2 2008-03-07 12:03:38.000000000 +0100 @@ -0,0 +1 @@ +.so man2/unimplemented.2 diff -up man-pages-2.78/man2/isastream.2.pom man-pages-2.78/man2/isastream.2 --- man-pages-2.78/man2/isastream.2.pom 2008-03-07 12:03:52.000000000 +0100 +++ man-pages-2.78/man2/isastream.2 2008-03-07 12:04:08.000000000 +0100 @@ -0,0 +1 @@ +.so man2/unimplemented.2 diff -up man-pages-2.78/man2/fdetach.2.pom man-pages-2.78/man2/fdetach.2 --- man-pages-2.78/man2/fdetach.2.pom 2008-03-07 12:03:52.000000000 +0100 +++ man-pages-2.78/man2/fdetach.2 2008-03-07 12:04:00.000000000 +0100 @@ -0,0 +1 @@ +.so man2/unimplemented.2 diff -up man-pages-2.78/man2/unimplemented.2.pom man-pages-2.78/man2/unimplemented.2 --- man-pages-2.78/man2/unimplemented.2.pom 2008-02-28 10:58:27.000000000 +0100 +++ man-pages-2.78/man2/unimplemented.2 2008-03-07 12:08:41.000000000 +0100 @@ -26,9 +26,10 @@ .\" .TH UNIMPLEMENTED 2 2007-07-05 "Linux" "Linux Programmer's Manual" .SH NAME -afs_syscall, break, ftime, getpmsg, gtty, lock, madvise1, mpx, -multiplexer, prof, profil, putpmsg, security, stty, tuxcall, ulimit, -vserver \- unimplemented system calls +afs_syscall, break, fattach, fdetach, ftime, getmsg, getpmsg, gtty, +isastream, lock, madvise1, mpx, multiplexer, prof, profil, putmsg, +putpmsg, security, stty, tuxcall, ulimit, vserver +\- unimplemented system calls .SH SYNOPSIS Unimplemented system calls. .SH DESCRIPTION Index: man-pages.spec =================================================================== RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- man-pages.spec 28 Feb 2008 10:09:55 -0000 1.96 +++ man-pages.spec 7 Mar 2008 11:20:02 -0000 1.97 @@ -1,7 +1,7 @@ Summary: Man (manual) pages from the Linux Documentation Project Name: man-pages Version: 2.78 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+, GLP, BSD, MIT, Copyright only, IEEE Group: Documentation URL: http://www.kernel.org/pub/linux/docs/manpages/ @@ -32,6 +32,7 @@ Patch50: man-pages-2.63-iconv.patch Patch51: man-pages-2.75-crypt.patch Patch52: man-pages-2.76-prctl.patch +Patch53: man-pages-2.78-stream.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Autoreq: false @@ -67,6 +68,7 @@ %patch50 -p1 %patch51 -p1 %patch52 -p1 +%patch53 -p1 ### And now remove those we are not going to use: @@ -177,6 +179,10 @@ %lang(en) %{_mandir}/en/man* %changelog +* Fri Mar 7 2008 Ivana Varekova - 2.78-2 +- fix 436398: + add information about unimplemented syscalls + * Fri Feb 22 2008 Ivana Varekova - 2.78-1 - update to 2.78 From fedora-extras-commits at redhat.com Fri Mar 7 11:41:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 11:41:44 +0000 Subject: [pkgdb] xdvipdfmx had acl change status Message-ID: <200803071143.m27BhXc0026924@bastion.fedora.phx.redhat.com> Neal Becker (nbecker) has set the watchbugzilla acl on xdvipdfmx (Fedora devel) to Approved for Jindrich Novy (jnovy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 11:41:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 11:41:58 +0000 Subject: [pkgdb] xdvipdfmx had acl change status Message-ID: <200803071143.m27BhYv2026928@bastion.fedora.phx.redhat.com> Neal Becker (nbecker) has set the watchcommits acl on xdvipdfmx (Fedora devel) to Approved for Jindrich Novy (jnovy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 11:41:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 11:41:48 +0000 Subject: [pkgdb] xdvipdfmx had acl change status Message-ID: <200803071143.m27BhbjY026967@bastion.fedora.phx.redhat.com> Neal Becker (nbecker) has set the approveacls acl on xdvipdfmx (Fedora devel) to Approved for Jindrich Novy (jnovy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 11:41:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 11:41:48 +0000 Subject: [pkgdb] xdvipdfmx had acl change status Message-ID: <200803071143.m27BhXc4026924@bastion.fedora.phx.redhat.com> Neal Becker (nbecker) has set the commit acl on xdvipdfmx (Fedora devel) to Obsolete for Jindrich Novy (jnovy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 11:42:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 11:42:05 +0000 Subject: [pkgdb] xdvipdfmx had acl change status Message-ID: <200803071143.m27Bhbjc026967@bastion.fedora.phx.redhat.com> Neal Becker (nbecker) has set the commit acl on xdvipdfmx (Fedora devel) to Approved for Jindrich Novy (jnovy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Fri Mar 7 12:24:59 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 12:24:59 +0000 Subject: [pkgdb] cloudy had acl change status Message-ID: <200803071226.m27CQZj9028056@bastion.fedora.phx.redhat.com> Sergio Pascual (sergiopr) has set the watchcommits acl on cloudy (Fedora devel) to Approved for Marek Mahut (mmahut) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cloudy From fedora-extras-commits at redhat.com Fri Mar 7 12:24:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 12:24:47 +0000 Subject: [pkgdb] cloudy had acl change status Message-ID: <200803071226.m27CQaiA028072@bastion.fedora.phx.redhat.com> Sergio Pascual (sergiopr) has set the watchbugzilla acl on cloudy (Fedora devel) to Approved for Marek Mahut (mmahut) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cloudy From fedora-extras-commits at redhat.com Fri Mar 7 12:24:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 12:24:49 +0000 Subject: [pkgdb] cloudy had acl change status Message-ID: <200803071226.m27CQaiD028072@bastion.fedora.phx.redhat.com> Sergio Pascual (sergiopr) has set the commit acl on cloudy (Fedora devel) to Approved for Marek Mahut (mmahut) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cloudy From fedora-extras-commits at redhat.com Fri Mar 7 12:24:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 12:24:51 +0000 Subject: [pkgdb] cloudy had acl change status Message-ID: <200803071226.m27CQeYi028112@bastion.fedora.phx.redhat.com> Sergio Pascual (sergiopr) has set the approveacls acl on cloudy (Fedora devel) to Approved for Marek Mahut (mmahut) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/cloudy From fedora-extras-commits at redhat.com Fri Mar 7 12:48:15 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 12:48:15 GMT Subject: rpms/perl-mecab/devel perl-mecab.spec,1.11,1.12 Message-ID: <200803071248.m27CmFaL027773@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-mecab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27741 Modified Files: perl-mecab.spec Log Message: new perl Index: perl-mecab.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-mecab/devel/perl-mecab.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-mecab.spec 7 Mar 2008 05:23:29 -0000 1.11 +++ perl-mecab.spec 7 Mar 2008 12:47:41 -0000 1.12 @@ -1,6 +1,6 @@ %define mainver 0.97 %undefine betaver -%define relnumber 2 +%define relnumber 3 %define srcname mecab-perl Name: perl-mecab @@ -60,6 +60,9 @@ %{perl_vendorarch}/auto/MeCab/ %changelog +* Fri Mar 7 2008 Tom "spot" Callaway - 0.97-3 +- rebuild for new perl (in dist-f9-perl) + * Fri Mar 7 2008 Mamoru Tasaka - 0.97-2 - Rebuild for new perl (F-9) From fedora-extras-commits at redhat.com Fri Mar 7 13:28:20 2008 From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar)) Date: Fri, 7 Mar 2008 13:28:20 GMT Subject: rpms/ncurses/devel .cvsignore, 1.28, 1.29 ncurses.spec, 1.83, 1.84 sources, 1.28, 1.29 Message-ID: <200803071328.m27DSKah002967@cvs-int.fedora.redhat.com> Author: mlichvar Update of /cvs/pkgs/rpms/ncurses/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2941 Modified Files: .cvsignore ncurses.spec sources Log Message: - update to patch 20080301 - provide libtermcap.so (#428898) - move all headers to /usr/include - move libncursesw out of /usr - make examples in documentation compilable (#436355) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 14 Jan 2008 18:53:50 -0000 1.28 +++ .cvsignore 7 Mar 2008 13:27:42 -0000 1.29 @@ -1,3 +1,4 @@ ncurses-5.6.tar.gz ncurses-5.6-20071201-patch.sh.bz2 ncurses-5.6-20071215-20080112.patch.bz2 +ncurses-5.6-20080119-20080301.patch.bz2 Index: ncurses.spec =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- ncurses.spec 19 Feb 2008 14:06:48 -0000 1.83 +++ ncurses.spec 7 Mar 2008 13:27:42 -0000 1.84 @@ -1,7 +1,7 @@ Summary: Ncurses support utilities Name: ncurses Version: 5.6 -Release: 15.20080112%{?dist} +Release: 16.20080301%{?dist} License: MIT Group: System Environment/Base URL: http://invisible-island.net/ncurses/ncurses.html @@ -9,6 +9,7 @@ Patch1: ncurses-5.6-20071201-patch.sh.bz2 Patch2: ncurses-5.6-20071215-20080112.patch.bz2 +Patch3: ncurses-5.6-20080119-20080301.patch.bz2 Patch8: ncurses-5.5-20061209-config.patch Patch9: ncurses-5.6-20070612-libs.patch @@ -69,6 +70,7 @@ Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Obsoletes: libtermcap-devel < 2.0.8-48 +Provides: libtermcap-devel = 2.0.8-48 %description devel The header files and libraries for developing applications that use @@ -92,6 +94,7 @@ # tack isn't in ncurses tree since 20070203 rm -rf tack %patch2 -p1 +%patch3 -p1 %patch8 -p1 -b .config %patch9 -p1 -b .libs @@ -99,6 +102,7 @@ %patch11 -p1 -b .urxvt # this will be in documentation, drop executable bits +cp -p install-sh test chmod 644 test/* %build @@ -107,7 +111,6 @@ --with-shared --without-ada --with-ospeed=unsigned \\\ --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\ --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\ - --includedir=%{_includedir}/ncursesw \\\ --enable-overwrite \\\ --with-termlib=tinfo \\\ --with-chtype=long @@ -134,10 +137,10 @@ chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.* chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a -# move lib{ncurses,tinfo}.so.* to /lib* +# move lib{ncurses{,w},tinfo}.so.* to /lib* mkdir $RPM_BUILD_ROOT/%{_lib} -mv $RPM_BUILD_ROOT%{_libdir}/lib{ncurses,tinfo}.so.* $RPM_BUILD_ROOT/%{_lib} -for l in $RPM_BUILD_ROOT%{_libdir}/lib{ncurses,tinfo}.so; do +mv $RPM_BUILD_ROOT%{_libdir}/lib{ncurses{,w},tinfo}.so.* $RPM_BUILD_ROOT/%{_lib} +for l in $RPM_BUILD_ROOT%{_libdir}/lib{ncurses{,w},tinfo}.so; do ln -sf $(echo %{_libdir} | \ sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l done @@ -187,17 +190,18 @@ echo $t done 2> /dev/null | sort -u | comm -2 -3 - terms.base > terms.term -ln -sf ncurses/{curses,unctrl,eti,form,menu,ncurses,panel,term}.h \ - ${RPM_BUILD_ROOT}%{_includedir} - # can't replace directory with symlink (rpm bug), symlink all headers -mkdir $RPM_BUILD_ROOT%{_includedir}/ncurses -for l in $RPM_BUILD_ROOT%{_includedir}/ncursesw/*.h; do - ln -s ../ncursesw/$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncurses +mkdir $RPM_BUILD_ROOT%{_includedir}/ncurses{,w} +for l in $RPM_BUILD_ROOT%{_includedir}/*.h; do + ln -s ../$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncurses + ln -s ../$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncursesw done -rm -f $RPM_BUILD_ROOT%{_libdir}/libcurses.so +rm -f $RPM_BUILD_ROOT%{_libdir}/libcurses{,w}.so echo "INPUT(-lncurses)" > $RPM_BUILD_ROOT%{_libdir}/libcurses.so +echo "INPUT(-lncursesw)" > $RPM_BUILD_ROOT%{_libdir}/libcursesw.so + +echo "INPUT(-ltinfo)" > $RPM_BUILD_ROOT%{_libdir}/libtermcap.so rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo @@ -240,14 +244,7 @@ %dir %{_includedir}/ncursesw %{_includedir}/ncurses/*.h %{_includedir}/ncursesw/*.h -%{_includedir}/curses.h -%{_includedir}/ncurses.h -%{_includedir}/eti.h -%{_includedir}/form.h -%{_includedir}/menu.h -%{_includedir}/panel.h -%{_includedir}/term.h -%{_includedir}/unctrl.h +%{_includedir}/*.h %{_mandir}/man3/* %files static @@ -258,6 +255,13 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Mar 07 2008 Miroslav Lichvar 5.6-16.20080301 +- update to patch 20080301 +- provide libtermcap.so (#428898) +- move all headers to /usr/include +- move libncursesw out of /usr +- make examples in documentation compilable (#436355) + * Tue Feb 19 2008 Fedora Release Engineering - 5.6-15.20080112 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ncurses/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 14 Jan 2008 18:53:50 -0000 1.28 +++ sources 7 Mar 2008 13:27:42 -0000 1.29 @@ -1,3 +1,4 @@ b6593abe1089d6aab1551c105c9300e3 ncurses-5.6.tar.gz 5c4c833a31064c7099209f7a141fed10 ncurses-5.6-20071201-patch.sh.bz2 d32ba589cd7bfdc4ac82fd8078c06e2b ncurses-5.6-20071215-20080112.patch.bz2 +0fe7ec33499e83e9a64f71ef3f555008 ncurses-5.6-20080119-20080301.patch.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 14:15:50 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Fri, 7 Mar 2008 14:15:50 GMT Subject: rpms/xorg-x11-drv-openchrome/devel xorg-x11-drv-openchrome.spec, 1.12, 1.13 Message-ID: <200803071415.m27EFoRu010707@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10670 Modified Files: xorg-x11-drv-openchrome.spec Log Message: * Fri Mar 07 2008 Adam Jackson 0.2.901-10 - Fix -devel subpackage to obsolete via-devel properly. Index: xorg-x11-drv-openchrome.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xorg-x11-drv-openchrome.spec 6 Mar 2008 22:15:08 -0000 1.12 +++ xorg-x11-drv-openchrome.spec 7 Mar 2008 14:15:15 -0000 1.13 @@ -9,7 +9,7 @@ Summary: Xorg X11 openchrome video driver Name: xorg-x11-drv-openchrome Version: 0.2.901 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://www.openchrome.org License: MIT Group: User Interface/X Hardware Support @@ -48,6 +48,8 @@ Summary: Xorg X11 openchrome video driver XvMC development package Group: Development/System Requires: %{name} = %{version}-%{release} +Obsoletes: xorg-x11-drv-via-devel +Provides: xorg-x11-drv-via-devel %description devel X.Org X11 openchrome video driver XvMC development package. @@ -107,6 +109,9 @@ %changelog +* Fri Mar 07 2008 Adam Jackson 0.2.901-10 +- Fix -devel subpackage to obsolete via-devel properly. + * Thu Mar 06 2008 Xavier Bachelot - 0.2.901-9 - Fix libpciaccess patch. From fedora-extras-commits at redhat.com Fri Mar 7 14:32:10 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 7 Mar 2008 14:32:10 GMT Subject: rpms/xine-lib/devel xine-lib.spec,1.34,1.35 Message-ID: <200803071432.m27EWABP011001@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/xine-lib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10973 Modified Files: xine-lib.spec Log Message: * Fri Mar 7 2008 Rex Dieter - 1.1.10.1-1.1 - xcb support for f7+ (#373411) Index: xine-lib.spec =================================================================== RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- xine-lib.spec 8 Feb 2008 19:46:29 -0000 1.34 +++ xine-lib.spec 7 Mar 2008 14:31:37 -0000 1.35 @@ -14,7 +14,7 @@ %else %define have_vidix 0 %endif # ix86 -%if 0%{?fedora} >= 8 +%if 0%{?fedora} > 6 %define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} %else %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} @@ -34,7 +34,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.10.1 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -385,6 +385,9 @@ %changelog +* Fri Mar 7 2008 Rex Dieter - 1.1.10.1-1.1 +- xcb support for f7+ (#373411) + * Fri Feb 8 2008 Ville Skytt?? - 1.1.10.1-1 - 1.1.10.1 (security update, #431541). From fedora-extras-commits at redhat.com Fri Mar 7 14:33:13 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 7 Mar 2008 14:33:13 GMT Subject: rpms/xine-lib/F-7 xine-lib.spec,1.22,1.23 Message-ID: <200803071433.m27EXD5O011106@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/xine-lib/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11041 Modified Files: xine-lib.spec Log Message: * Fri Mar 7 2008 Rex Dieter - 1.1.10.1-1.1 - xcb support for f7+ (#373411) Index: xine-lib.spec =================================================================== RCS file: /cvs/pkgs/rpms/xine-lib/F-7/xine-lib.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xine-lib.spec 8 Feb 2008 19:48:40 -0000 1.22 +++ xine-lib.spec 7 Mar 2008 14:32:30 -0000 1.23 @@ -14,7 +14,7 @@ %else %define have_vidix 0 %endif # ix86 -%if 0%{?fedora} >= 8 +%if 0%{?fedora} > 6 %define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} %else %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} @@ -34,7 +34,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.10.1 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -385,6 +385,9 @@ %changelog +* Fri Mar 7 2008 Rex Dieter - 1.1.10.1-1.1 +- xcb support for f7+ (#373411) + * Fri Feb 8 2008 Ville Skytt?? - 1.1.10.1-1 - 1.1.10.1 (security update, #431541). From fedora-extras-commits at redhat.com Fri Mar 7 14:33:16 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 7 Mar 2008 14:33:16 GMT Subject: rpms/openoffice.org/devel .cvsignore, 1.150, 1.150.2.1 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.24, 1.24.2.1 openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, 1.3, 1.3.2.1 openoffice.org-2.4.0.ooo85097.desktop.pagein.patch, 1.1, 1.1.2.1 openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch, 1.1, 1.1.2.1 openoffice.org.spec, 1.1440, 1.1440.2.1 pseudoworkspace.valgrind1.patch, 1.27, 1.27.2.1 sources, 1.273, 1.273.2.1 workspace.cairotext01.patch, 1.6, 1.6.2.1 openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch, 1.1, NONE openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch, 1.1, NONE openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch, 1.1, NONE openoffice.org-2.4.0.ooo86123.ucb.newneon.patch, 1.1, NONE workspace.gcc430two.patch, 1.7, NONE workspace.notes2.patch, 1.5, NONE Message-ID: <200803071433.m27EXGnb011160@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11048 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 .cvsignore openoffice.org-1.9.87.rh151357.setlangtolocale.patch openoffice.org-2.0.3.ooo80816.selinux.bridges.patch openoffice.org-2.4.0.ooo85097.desktop.pagein.patch openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch openoffice.org.spec pseudoworkspace.valgrind1.patch sources workspace.cairotext01.patch Removed Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch openoffice.org-2.4.0.ooo86123.ucb.newneon.patch workspace.gcc430two.patch workspace.notes2.patch Log Message: test build on branch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.150 retrieving revision 1.150.2.1 diff -u -r1.150 -r1.150.2.1 --- .cvsignore 6 Mar 2008 09:50:42 -0000 1.150 +++ .cvsignore 7 Mar 2008 14:32:37 -0000 1.150.2.1 @@ -5,3 +5,4 @@ unowinreg.dll bengali.sdf OOH680_m9.tar.bz2 +DEV300_m1.tar.bz2 openoffice.org-1.9.87.rh151357.setlangtolocale.patch: Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -r1.24 -r1.24.2.1 --- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 28 Jan 2008 17:26:40 -0000 1.24 +++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 7 Mar 2008 14:32:37 -0000 1.24.2.1 @@ -89,7 +89,7 @@ - // determine the filename of the license to show - OUString aLangString; - ::com::sun::star::lang::Locale aLocale; -- OString aMgrName = OString("dkt") + OString::valueOf((sal_Int32)SUPD, 10); +- OString aMgrName = OString("dkt"); - - AllSettings aSettings(Application::GetSettings()); - aLocale = aSettings.GetUILocale(); @@ -791,15 +791,6 @@ diff -u -r1.17 substitutepathvars.cxx --- openoffice.org.orig/framework/source/services/substitutepathvars.cxx 16 Sep 2006 14:12:15 -0000 1.17 +++ openoffice.org/framework/source/services/substitutepathvars.cxx 28 Jun 2007 13:59:22 -0000 -@@ -129,7 +129,7 @@ - #endif - - #include -- -+#include - //_________________________________________________________________________________________________________________ - // Defines - //_________________________________________________________________________________________________________________ @@ -1264,7 +1264,10 @@ Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE ); rtl::OUString aLocaleStr; openoffice.org-2.0.3.ooo80816.selinux.bridges.patch: Index: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo80816.selinux.bridges.patch,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 4 Feb 2008 12:35:02 -0000 1.3 +++ openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 7 Mar 2008 14:32:37 -0000 1.3.2.1 @@ -5,7 +5,7 @@ diff -u -r1.5 vtablefactory.hxx --- openoffice.org.orig/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 2 May 2006 11:59:11 -0000 1.5 +++ openoffice.org/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 17 May 2006 10:57:45 -0000 -@@ -60,11 +60,21 @@ +@@ -66,11 +66,21 @@ skipping an RTTI pointer, see mapBlockToVtable). Also, the block contains any generated code snippets, after the vtable itself. */ @@ -28,7 +28,7 @@ }; /** The vtable structure corresponding to an interface type. -@@ -110,8 +120,6 @@ +@@ -116,8 +126,6 @@ VtableFactory(VtableFactory &); // not implemented void operator =(VtableFactory); // not implemented @@ -37,16 +37,16 @@ void createVtables( GuardedBlocks & blocks, BaseOffset const & baseOffset, typelib_InterfaceTypeDescription * type, bool includePrimary) const; -@@ -162,7 +170,7 @@ +@@ -169,7 +177,7 @@ @return a pointer to the remaining code snippet area */ static unsigned char * addLocalFunctions( -- void ** slots, unsigned char * code, -+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, +- Slot ** slots, unsigned char * code, ++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, sal_Int32 functionCount, sal_Int32 vtableOffset); -@@ -181,8 +189,6 @@ +@@ -188,8 +196,6 @@ osl::Mutex m_mutex; Map m_map; @@ -62,7 +62,7 @@ diff -u -r1.10 cpp2uno.cxx --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 2 May 2006 12:01:33 -0000 1.10 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 17 May 2006 10:57:47 -0000 -@@ -361,7 +361,7 @@ +@@ -367,7 +367,7 @@ int const codeSnippetSize = 16; unsigned char * codeSnippet( @@ -71,7 +71,7 @@ typelib_TypeClass returnTypeClass) { if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { -@@ -407,7 +407,7 @@ +@@ -413,7 +413,7 @@ // jmp privateSnippetExecutor: *p++ = 0xE9; *reinterpret_cast< sal_Int32 * >(p) @@ -80,33 +80,33 @@ p += sizeof (sal_Int32); OSL_ASSERT(p - code <= codeSnippetSize); return code + codeSnippetSize; -@@ -434,7 +434,7 @@ +@@ -445,7 +445,7 @@ } unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( -- void ** slots, unsigned char * code, -+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, +- Slot ** slots, unsigned char * code, ++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, sal_Int32 functionCount, sal_Int32 vtableOffset) { -@@ -445,9 +445,9 @@ +@@ -458,9 +458,9 @@ switch (member->eTypeClass) { case typelib_TypeClass_INTERFACE_ATTRIBUTE: // Getter: -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( member)->pAttributeTypeRef->eTypeClass); // Setter: -@@ -455,17 +455,17 @@ +@@ -468,17 +468,17 @@ typelib_InterfaceAttributeTypeDescription * >( member)->bReadOnly) { -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, @@ -115,8 +115,8 @@ break; case typelib_TypeClass_INTERFACE_METHOD: -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, @@ -130,40 +130,47 @@ diff -u -r1.8 cpp2uno.cxx --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx 2 May 2006 12:02:15 -0000 1.8 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx 17 May 2006 10:57:47 -0000 -@@ -676,7 +676,7 @@ +@@ -685,7 +685,7 @@ } unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( -- void ** slots, unsigned char * code, -+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, +- Slot ** slots, unsigned char * code, ++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, sal_Int32 functionCount, sal_Int32 vtableOffset) { -@@ -692,7 +692,7 @@ +@@ -702,9 +702,9 @@ switch (member->eTypeClass) { case typelib_TypeClass_INTERFACE_ATTRIBUTE: // Getter: -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, +- code, functionOffset++, vtableOffset, ++ code, functionOffset++, vtableOffset, bridges::cpp_uno::shared::isSimpleType( -@@ -705,13 +705,13 @@ + reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( +@@ -715,15 +715,15 @@ typelib_InterfaceAttributeTypeDescription * >( member)->bReadOnly) { -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; - code = codeSnippet(code, functionOffset++, vtableOffset, true); +- (s++)->fn = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ (s++)->fn = code + writetoexecdiff; ++ code = codeSnippet(code, functionOffset++, vtableOffset, true); } break; case typelib_TypeClass_INTERFACE_METHOD: -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, +- code, functionOffset++, vtableOffset, ++ code, functionOffset++, vtableOffset, bridges::cpp_uno::shared::isSimpleType( + reinterpret_cast< + typelib_InterfaceMethodTypeDescription * >( Index: source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx =================================================================== RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx,v @@ -171,41 +178,46 @@ diff -u -r1.5 cpp2uno.cxx --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx 2 May 2006 12:03:36 -0000 1.5 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx 17 May 2006 10:57:48 -0000 -@@ -487,7 +487,7 @@ +@@ -494,7 +494,7 @@ //================================================================================================== unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( -- void ** slots, unsigned char * code, -+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, +- Slot ** slots, unsigned char * code, ++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset, sal_Int32 functionCount, sal_Int32 nVtableOffset ) { -@@ -504,14 +504,14 @@ +@@ -513,15 +513,15 @@ reinterpret_cast( pTD ); // get method -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; - code = codeSnippet( code, nFunctionOffset++, nVtableOffset, +- (s++)->fn = code; +- code = codeSnippet( code, nFunctionOffset++, nVtableOffset, ++ (s++)->fn = code + writetoexecdiff; ++ code = codeSnippet( code, nFunctionOffset++, nVtableOffset, x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) ); if ( ! pAttrTD->bReadOnly ) { // set method -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; - code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false ); +- (s++)->fn = code; +- code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false ); ++ (s++)->fn = code + writetoexecdiff; ++ code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false ); } } -@@ -520,7 +520,7 @@ + else if ( typelib_TypeClass_INTERFACE_METHOD == pTD->eTypeClass ) +@@ -529,8 +529,8 @@ typelib_InterfaceMethodTypeDescription *pMethodTD = reinterpret_cast( pTD ); -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; - code = codeSnippet( code, nFunctionOffset++, nVtableOffset, +- (s++)->fn = code; +- code = codeSnippet( code, nFunctionOffset++, nVtableOffset, ++ (s++)->fn = code + writetoexecdiff; ++ code = codeSnippet( code, nFunctionOffset++, nVtableOffset, x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) ); } + else Index: source/cpp_uno/shared/cppinterfaceproxy.cxx =================================================================== RCS file: /cvs/udk/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx,v @@ -248,7 +260,7 @@ #elif defined SAL_W32 #define WIN32_LEAN_AND_MEAN #ifdef _MSC_VER -@@ -80,9 +84,12 @@ +@@ -80,9 +85,12 @@ using bridges::cpp_uno::shared::VtableFactory; @@ -263,7 +275,7 @@ sal_Size pagesize; #if defined SAL_UNX #if defined FREEBSD || defined NETBSD -@@ -101,45 +108,118 @@ +@@ -101,45 +109,118 @@ #else #error Unsupported platform #endif @@ -404,7 +416,7 @@ } class VtableFactory::GuardedBlocks: public std::vector< Block > { -@@ -160,11 +240,6 @@ +@@ -160,11 +241,6 @@ }; VtableFactory::GuardedBlocks::~GuardedBlocks() { @@ -416,7 +428,7 @@ } class VtableFactory::BaseOffset { -@@ -199,28 +274,17 @@ +@@ -199,28 +275,17 @@ return offset; } @@ -446,7 +458,7 @@ } VtableFactory::Vtables VtableFactory::getVtables( -@@ -248,10 +312,6 @@ +@@ -248,10 +313,6 @@ return i->second; } @@ -457,7 +469,7 @@ void VtableFactory::createVtables( GuardedBlocks & blocks, BaseOffset const & baseOffset, typelib_InterfaceTypeDescription * type, bool includePrimary) const -@@ -259,17 +319,16 @@ +@@ -259,31 +320,30 @@ if (includePrimary) { sal_Int32 slotCount = bridges::cpp_uno::shared::getPrimaryFunctions(type); @@ -470,26 +482,25 @@ throw std::bad_alloc(); } try { -- void ** slots = initializeBlock(block.start) + slotCount; -+ void ** slots = initializeBlock(block.writep) + slotCount; +- Slot * slots = initializeBlock(block.start, slotCount); ++ Slot * slots = initializeBlock(block.writep, slotCount); unsigned char * codeBegin = reinterpret_cast< unsigned char * >(slots); unsigned char * code = codeBegin; -+ sal_PtrDiff writetoexecdiff = sal_IntPtr(block.execp) - sal_IntPtr(block.writep); - sal_Int32 vtableOffset = blocks.size() * sizeof (void **); ++ sal_PtrDiff writetoexecdiff = sal_IntPtr(block.execp) - sal_IntPtr(block.writep); + sal_Int32 vtableOffset = blocks.size() * sizeof (Slot *); for (typelib_InterfaceTypeDescription const * type2 = type; type2 != 0; type2 = type2->pBaseTypeDescription) -@@ -278,14 +337,14 @@ - = bridges::cpp_uno::shared::getLocalFunctions(type2); - slots -= functionCount; + { code = addLocalFunctions( -- slots, code, type2, -+ slots, code, writetoexecdiff, type2, +- &slots, code, type2, ++ &slots, code, writetoexecdiff, type2, baseOffset.getFunctionOffset(type2->aBase.pTypeName), - functionCount, vtableOffset); + bridges::cpp_uno::shared::getLocalFunctions(type2), + vtableOffset); } flushCode(codeBegin, code); -+ block.swapwriteandexec(); ++ block.swapwriteandexec(); blocks.push_back(block); } catch (...) { - freeBlock(block); @@ -503,73 +514,142 @@ diff -u -r1.12 cpp2uno.cxx --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx 22 Nov 2006 11:07:20 -0000 1.12 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx 5 Jun 2007 12:38:03 -0000 -@@ -512,7 +512,7 @@ +@@ -518,7 +518,7 @@ } unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( -- void ** slots, unsigned char * code, -+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, +- Slot ** slots, unsigned char * code, ++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, - sal_Int32 /* functionCount */, sal_Int32 vTableOffset) + sal_Int32 functionCount, sal_Int32 vTableOffset) { -@@ -523,7 +523,7 @@ +@@ -531,9 +531,9 @@ switch (member->eTypeClass) { case typelib_TypeClass_INTERFACE_ATTRIBUTE: // Getter: -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vTableOffset, +- code, functionOffset++, vTableOffset, ++ code, functionOffset++, vTableOffset, bridges::cpp_uno::shared::isSimpleType( -@@ -535,13 +535,13 @@ + reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( +@@ -543,15 +543,15 @@ typelib_InterfaceAttributeTypeDescription * >( member)->bReadOnly) { -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; - code = codeSnippet(code, functionOffset++, vTableOffset, true); +- (s++)->fn = code; +- code = codeSnippet(code, functionOffset++, vTableOffset, true); ++ (s++)->fn = code + writetoexecdiff; ++ code = codeSnippet(code, functionOffset++, vTableOffset, true); } break; case typelib_TypeClass_INTERFACE_METHOD: -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vTableOffset, +- code, functionOffset++, vTableOffset, ++ code, functionOffset++, vTableOffset, bridges::cpp_uno::shared::isSimpleType( + reinterpret_cast< + typelib_InterfaceMethodTypeDescription * >( --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 2007-06-05 13:55:15.000000000 +0100 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 2007-06-05 13:56:12.000000000 +0100 -@@ -666,7 +666,7 @@ +@@ -670,7 +670,7 @@ } unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( -- void ** slots, unsigned char * code, -+ void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, +- Slot ** slots, unsigned char * code, ++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, sal_Int32 functionCount, sal_Int32 vtableOffset) { -@@ -682,7 +682,7 @@ +@@ -688,9 +688,9 @@ switch (member->eTypeClass) { case typelib_TypeClass_INTERFACE_ATTRIBUTE: // Getter: -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, +- code, functionOffset++, vtableOffset, ++ code, functionOffset++, vtableOffset, bridges::cpp_uno::shared::isSimpleType( -@@ -695,13 +695,13 @@ + reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( +@@ -701,15 +701,15 @@ typelib_InterfaceAttributeTypeDescription * >( member)->bReadOnly) { -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; - code = codeSnippet(code, functionOffset++, vtableOffset, true); +- (s++)->fn = code; +- code = codeSnippet(code, functionOffset++, vtableOffset, true); ++ (s++)->fn = code + writetoexecdiff; ++ code = codeSnippet(code, functionOffset++, vtableOffset, true); } break; case typelib_TypeClass_INTERFACE_METHOD: -- *slots++ = code; -+ *slots++ = code + writetoexecdiff; +- (s++)->fn = code; ++ (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, +- code, functionOffset++, vtableOffset, ++ code, functionOffset++, vtableOffset, bridges::cpp_uno::shared::isSimpleType( + reinterpret_cast< + typelib_InterfaceMethodTypeDescription * >( +--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx 2008-03-07 09:23:13.000000000 +0000 ++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx 2008-03-07 09:34:58.000000000 +0000 +@@ -580,7 +580,7 @@ + { + const int codeSnippetSize = 40; + +-bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, ++bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, + bool bHasHiddenParam ) + { + #ifdef CMC_DEBUG +@@ -603,7 +603,7 @@ + raw[2] = nOffsetAndIndex; + raw[3] = destination->gp_value; + +- return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code); ++ return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code+writetoexecdiff); + } + } + +@@ -633,7 +633,7 @@ + } + + unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( +- Slot ** in_slots, unsigned char * code, ++ Slot ** in_slots, unsigned char * code, sal_PtrDiff writetoexecdiff, + typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, + sal_Int32 functionCount, sal_Int32 vtableOffset) + { +@@ -652,7 +652,7 @@ + case typelib_TypeClass_INTERFACE_ATTRIBUTE: + // Getter: + *slots++ = codeSnippet( +- code, functionOffset++, vtableOffset, ++ code, writetoexecdiff, functionOffset++, vtableOffset, + ia64::return_in_hidden_param( + reinterpret_cast< + typelib_InterfaceAttributeTypeDescription * >( +@@ -665,14 +665,14 @@ + typelib_InterfaceAttributeTypeDescription * >( + member)->bReadOnly) + { +- *slots++ = codeSnippet(code, functionOffset++, vtableOffset, false); ++ *slots++ = codeSnippet(code, writetoexecdiff, functionOffset++, vtableOffset, false); + code += codeSnippetSize; + } + break; + + case typelib_TypeClass_INTERFACE_METHOD: + *slots++ = codeSnippet( +- code, functionOffset++, vtableOffset, ++ code, writetoexecdiff, functionOffset++, vtableOffset, + ia64::return_in_hidden_param( + reinterpret_cast< + typelib_InterfaceMethodTypeDescription * >( openoffice.org-2.4.0.ooo85097.desktop.pagein.patch: Index: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo85097.desktop.pagein.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- openoffice.org-2.4.0.ooo85097.desktop.pagein.patch 9 Jan 2008 07:48:30 -0000 1.1 +++ openoffice.org-2.4.0.ooo85097.desktop.pagein.patch 7 Mar 2008 14:32:37 -0000 1.1.2.1 @@ -6,17 +6,17 @@ --- openoffice.org.orig/desktop/source/pagein/makefile.mk 5 Oct 2006 10:47:06 -0000 1.9 +++ openoffice.org/desktop/source/pagein/makefile.mk 9 Jan 2008 07:43:34 -0000 @@ -110,7 +110,6 @@ - @-echo $(DLLPRE)go$(UPDDLLPOST) >> $@ - @-echo $(DLLPRE)sb$(UPDDLLPOST) >> $@ - @-echo $(DLLPRE)sfx$(UPDDLLPOST) >> $@ -- @-echo $(DLLPRE)so$(UPDDLLPOST) >> $@ + @-echo $(DLLPRE)go$(DFTDLLPOST) >> $@ + @-echo $(DLLPRE)sb$(DFTDLLPOST) >> $@ + @-echo $(DLLPRE)sfx$(DFTDLLPOST) >> $@ +- @-echo $(DLLPRE)so$(DFTDLLPOST) >> $@ # - @-echo $(DLLPRE)fwe$(UPDDLLPOST) >> $@ - @-echo $(DLLPRE)fwk$(UPDDLLPOST) >> $@ + @-echo $(DLLPRE)fwe$(DFTDLLPOST) >> $@ + @-echo $(DLLPRE)fwk$(DFTDLLPOST) >> $@ @@ -122,12 +121,14 @@ @-echo $(DLLPRE)icuuc$(ICUDLLPOST) >> $@ - @-echo $(DLLPRE)sot$(UPDDLLPOST) >> $@ - @-echo $(DLLPRE)psp$(UPDDLLPOST) >> $@ + @-echo $(DLLPRE)sot$(DFTDLLPOST) >> $@ + @-echo $(DLLPRE)psp$(DFTDLLPOST) >> $@ +.IF "$(USE_SYSTEM_STL)"!="YES" .IF "$(COMNAME)" == "gcc2" || "$(COMNAME)" == "gcc3" @-echo $(DLLPRE)stlport_gcc$(DLLPOST) >> $@ openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch: Index: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch 10 Jan 2008 17:52:27 -0000 1.1 +++ openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch 7 Mar 2008 14:32:38 -0000 1.1.2.1 @@ -1,11 +1,3 @@ -diff -ru openoffice.org/solenv/bin/compiler.wrap openoffice.org/solenv/bin/compiler.wrap ---- openoffice.org.orig/solenv/bin/compiler.wrap 2008-01-10 12:24:02.000000000 +0000 -+++ openoffice.org/solenv/bin/compiler.wrap 2008-01-10 12:26:52.000000000 +0000 -@@ -1,4 +1,3 @@ --#!/usr/solar/bin/perl -w - #!/usr/bin/perl - - #print STDERR "ARGV =\n at ARGV\n"; diff -ru openoffice.org/solenv/bin/langwrap openoffice.org/solenv/bin/langwrap --- openoffice.org.orig/solenv/bin/langwrap 2008-01-10 12:24:02.000000000 +0000 +++ openoffice.org/solenv/bin/langwrap 2008-01-10 12:26:45.000000000 +0000 Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440 retrieving revision 1.1440.2.1 diff -u -r1.1440 -r1.1440.2.1 --- openoffice.org.spec 6 Mar 2008 09:52:37 -0000 1.1440 +++ openoffice.org.spec 7 Mar 2008 14:32:38 -0000 1.1440.2.1 @@ -1,6 +1,6 @@ -%define oootag OOH680 -%define ooomilestone 9 -%define rh_rpm_release 1 +%define oootag DEV300 +%define ooomilestone 1 +%define rh_rpm_release 0.1 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -42,7 +42,7 @@ Summary: OpenOffice.org comprehensive office suite. Name: openoffice.org -Version: 2.4.0 +Version: 3.0.0 Release: %{ooomilestone}.%{rh_rpm_release}%{?dist} Epoch: 1 License: LGPLv2 and LGPLv2+ and MPLv1.1 and BSD @@ -67,7 +67,7 @@ BuildRequires: libxslt-devel, db4-devel, xulrunner-devel, libwpd-devel, BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel BuildRequires: perl-Archive-Zip, libtextcat-devel, nss-devel >= 3.11.7-8 -BuildRequires: xerces-j2, hyphen-devel, openssl-devel +BuildRequires: xerces-j2, hyphen-devel, openssl-devel, lpsolve-devel Patch0: openoffice.org-simple-crash_report.sh Patch1: openoffice.org-multiliblauncher.sh @@ -124,27 +124,21 @@ Patch50: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch Patch51: openoffice.org-2.3.1.ooo81307.sw.word2.patch Patch52: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch -Patch53: workspace.notes2.patch -Patch54: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch -Patch55: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch -Patch56: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch -Patch57: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch -Patch58: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch -Patch59: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch -Patch60: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch -Patch61: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch -Patch62: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch -Patch63: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch -Patch64: openoffice.org-2.4.0.ooo85448.emptyrpath.patch -Patch65: workspace.cairotext01.patch -Patch66: workspace.gcc430two.patch -Patch67: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch -Patch68: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch -Patch69: openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch -Patch70: openoffice.org-2.4.0.ooo86123.ucb.newneon.patch -Patch71: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch -Patch72: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch -Patch73: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch +Patch53: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch +Patch54: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch +Patch55: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch +Patch56: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch +Patch57: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch +Patch58: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch +Patch59: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch +Patch60: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch +Patch61: openoffice.org-2.4.0.ooo85448.emptyrpath.patch +Patch62: workspace.cairotext01.patch +Patch63: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch +Patch64: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch +Patch65: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch +Patch66: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch +Patch67: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch %define instdir %{_libdir}/openoffice.org @@ -1082,27 +1076,21 @@ %patch50 -p1 -b .ooo82966.svx.missing3d.patch %patch51 -p1 -b .ooo81307.sw.word2.patch %patch52 -p1 -b .ooo83878.unopkg.enablelinking.patch -%patch53 -p1 -b .workspace.notes2.patch -%patch54 -p1 -b .ooo84676.ucb.davprotocol.patch -%patch55 -p1 -b .ooo84621.sw.insertexcel.patch -%patch56 -p1 -b .ooo84770.svx.eventsmismatch.patch -%patch57 -p1 -b .ooo85054.stlport.noorigs.patch -%patch58 -p1 -b .ooo86670.config_office.xpcomasxul.patch -%patch59 -p1 -b .ooo85097.desktop.pagein.patch -%patch60 -p1 -%patch61 -p1 -b .rh133741.alwaysgtk.vcl.patch -%patch62 -p1 -b .ooo85385.svtools.a11ycrash.patch -%patch63 -p1 -b .ooo85429.sw.a11ycrash.patch -%patch64 -p1 -b .ooo85448.emptyrpath.patch -%patch65 -p1 -b .workspace.cairotext01.patch -%patch66 -p1 -b .workspace.gcc430two.patch -%patch67 -p1 -b .ooo85854.sw.graphicsaveas.patch -%patch68 -p1 -b .ooo85921.sd.editmasterundermouse.patch -%patch69 -p1 -b .ooo85931.svx.getentrypos.patch -%patch70 -p1 -b .ooo86123.ucb.newneon.patch -%patch71 -p1 -b .ooo86080.unopkg.bodge.patch -%patch72 -p1 -b .ooo86268.desktop.visibilitycockup.patch -%patch73 -p1 -b .oooXXXXX.psprint.debugcups.patch +%patch53 -p1 -b .ooo84676.ucb.davprotocol.patch +%patch54 -p1 -b .ooo84621.sw.insertexcel.patch +%patch55 -p1 -b .ooo85054.stlport.noorigs.patch +%patch56 -p1 -b .ooo86670.config_office.xpcomasxul.patch +%patch57 -p1 -b .ooo85097.desktop.pagein.patch +%patch58 -p1 +%patch59 -p1 -b .rh133741.alwaysgtk.vcl.patch +%patch60 -p1 -b .ooo85429.sw.a11ycrash.patch +%patch61 -p1 -b .ooo85448.emptyrpath.patch +%patch62 -p1 -b .workspace.cairotext01.patch +%patch63 -p1 -b .ooo85854.sw.graphicsaveas.patch +%patch64 -p1 -b .ooo85921.sd.editmasterundermouse.patch +%patch65 -p1 -b .ooo86080.unopkg.bodge.patch +%patch66 -p1 -b .ooo86268.desktop.visibilitycockup.patch +%patch67 -p1 -b .oooXXXXX.psprint.debugcups.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2877,7 +2865,16 @@ %{python_py_sitearch}/unohelper.py* -%changelog +%6changelog +* Fri Mar 07 2008 Caolan McNamara - 1:3.0.0-0.1.1 +- extend selinux bodge to ia64 +- drop integrated workspace.notes2.patch +- drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch +- drop integrated openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch +- drop integrated workspace.gcc430two.patch +- drop integrated openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch +- drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch + * Thu Mar 06 2008 Caolan McNamara - 1:2.4.0-9.1 - next release candidate pseudoworkspace.valgrind1.patch: Index: pseudoworkspace.valgrind1.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v retrieving revision 1.27 retrieving revision 1.27.2.1 diff -u -r1.27 -r1.27.2.1 --- pseudoworkspace.valgrind1.patch 24 Jan 2008 18:47:12 -0000 1.27 +++ pseudoworkspace.valgrind1.patch 7 Mar 2008 14:32:38 -0000 1.27.2.1 @@ -13,22 +13,6 @@ nNumItemId(SID_ATTR_NUMBERING_RULE), bInInintControl(FALSE) { -Index: source/rc/rc.cxx -=================================================================== -RCS file: /cvs/util/tools/source/rc/rc.cxx,v -retrieving revision 1.10 -diff -u -r1.10 rc.cxx ---- openoffice.org.orig/tools/source/rc/rc.cxx 27 Jun 2007 22:16:55 -0000 1.10 -+++ openoffice.org/tools/source/rc/rc.cxx 18 Jan 2008 12:57:15 -0000 -@@ -97,7 +97,7 @@ - - // ======================================================================= - --Date::Date( const ResId& rResId ) -+Date::Date( const ResId& rResId ) : nDate(0) - { - rResId.SetRT( RSC_DATE ); - ResMgr* pResMgr = NULL; Index: source/ui/dialog/SwSpellDialogChildWindow.cxx =================================================================== RCS file: /cvs/sw/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx,v @@ -44,33 +28,6 @@ m_SpellStartPosition(SPELL_START_BODY), m_bBodySpelled(false), m_bOtherSpelled(false), -Index: source/contnr/svlbox.cxx -=================================================================== -RCS file: /cvs/util/svtools/source/contnr/svlbox.cxx,v -retrieving revision 1.31 -diff -u -r1.31 svlbox.cxx ---- openoffice.org.orig/svtools/source/contnr/svlbox.cxx 18 Jul 2007 08:52:54 -0000 1.31 -+++ openoffice.org/svtools/source/contnr/svlbox.cxx 18 Jan 2008 14:39:53 -0000 -@@ -725,7 +725,8 @@ - - SvLBox::SvLBox( Window* pParent, WinBits nWinStyle ) : - Control( pParent, nWinStyle | WB_CLIPCHILDREN ), -- DropTargetHelper( this ), DragSourceHelper( this ) -+ DropTargetHelper( this ), DragSourceHelper( this ), -+ eSelMode(NO_SELECTION) - { - DBG_CTOR(SvLBox,0); - nWindowStyle = nWinStyle; -@@ -748,7 +749,8 @@ - - SvLBox::SvLBox( Window* pParent, const ResId& rResId ) : - Control( pParent, rResId ), -- DropTargetHelper( this ), DragSourceHelper( this ) -+ DropTargetHelper( this ), DragSourceHelper( this ), -+ eSelMode(NO_SELECTION) - { - DBG_CTOR(SvLBox,0); - pTargetEntry = 0; Index: source/core/unocore/unoframe.cxx =================================================================== RCS file: /cvs/sw/sw/source/core/unocore/unoframe.cxx,v Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.273 retrieving revision 1.273.2.1 diff -u -r1.273 -r1.273.2.1 --- sources 6 Mar 2008 09:50:42 -0000 1.273 +++ sources 7 Mar 2008 14:32:38 -0000 1.273.2.1 @@ -4,4 +4,4 @@ e3a0b76dcd876f3d721ee7183729153d unowinreg.dll f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz 0c0e868b34329d90a7c9a92f1704775c bengali.sdf -af3f35cf2f34b2ab2415605955769516 OOH680_m9.tar.bz2 +46342c036e072477b43dcb25b743b88e DEV300_m1.tar.bz2 workspace.cairotext01.patch: Index: workspace.cairotext01.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cairotext01.patch,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- workspace.cairotext01.patch 29 Feb 2008 10:11:44 -0000 1.6 +++ workspace.cairotext01.patch 7 Mar 2008 14:32:38 -0000 1.6.2.1 @@ -53,16 +53,15 @@ diff -u gsl/vcl/unx/inc/salgdi.h:1.41 gsl/vcl/unx/inc/salgdi.h:1.41.206.2 --- gsl/vcl/unx/inc/salgdi.h:1.41 Wed Jun 27 13:41:23 2007 +++ gsl/vcl/unx/inc/salgdi.h Mon Jan 28 00:53:49 2008 -@@ -58,6 +58,8 @@ - #include - #endif - -+#include -+ +@@ -47,6 +47,7 @@ + #include "tools/fract.hxx" + #include "vcl/dllapi.h" #include "xfont.hxx" ++#include // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -@@ -78,6 +80,19 @@ + struct ImplFontMetricData; +@@ -66,6 +67,19 @@ // -=-= SalGraphicsData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -82,7 +81,7 @@ class VCL_DLLPUBLIC X11SalGraphics : public SalGraphics { friend class X11FontLayout; -@@ -90,7 +105,8 @@ +@@ -78,7 +92,8 @@ SalColormap *m_pDeleteColormap; Drawable hDrawable_; // use int m_nScreen; @@ -92,7 +91,7 @@ XLIB_Region pPaintRegion_; XLIB_Region pClipRegion_; -@@ -198,6 +214,7 @@ +@@ -186,6 +201,7 @@ void DrawServerSimpleFontString( const ServerFontLayout& ); void DrawServerAAFontString( const ServerFontLayout& ); bool DrawServerAAForcedString( const ServerFontLayout& ); --- openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch DELETED --- --- openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch DELETED --- --- openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch DELETED --- --- openoffice.org-2.4.0.ooo86123.ucb.newneon.patch DELETED --- --- workspace.gcc430two.patch DELETED --- --- workspace.notes2.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 7 14:34:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:34:49 +0000 Subject: [pkgdb] thunderbird had acl change status Message-ID: <200803071436.m27EaT3N000819@bastion.fedora.phx.redhat.com> Christopher Aillon (caillon) has set the watchcommits acl on thunderbird (Fedora 8) to Approved for Martin Stransky (stransky) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/thunderbird From fedora-extras-commits at redhat.com Fri Mar 7 14:34:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:34:49 +0000 Subject: [pkgdb] thunderbird had acl change status Message-ID: <200803071436.m27EaT3R000819@bastion.fedora.phx.redhat.com> Christopher Aillon (caillon) has set the commit acl on thunderbird (Fedora 8) to Approved for Martin Stransky (stransky) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/thunderbird From fedora-extras-commits at redhat.com Fri Mar 7 14:37:44 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Fri, 7 Mar 2008 14:37:44 GMT Subject: rpms/mc/devel mc-lzma.patch, NONE, 1.1 mc-extensions.patch, 1.10, 1.11 mc.spec, 1.131, 1.132 Message-ID: <200803071437.m27EbiRj011277@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/mc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11251 Modified Files: mc-extensions.patch mc.spec Added Files: mc-lzma.patch Log Message: * Fri Mar 7 2008 Jindrich Novy 4.6.2-2.pre1 - add lzma vfs support by Lasse Collin - update extensions patch to use xdg-open mc-lzma.patch: --- NEW FILE mc-lzma.patch --- # LZMA support for Midnight Commander # 2006-03-17 # # This patch adds basic support for LZMA compressed files to # Midnight Commander 4.6.1. You should have LZMA utils 4.32.x # or later. Older versions of LZMA utils will *not* work. # # Copyright (C) 2006 Lasse Collin # # This patch is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. diff -Naru mc-4.6.1.orig/edit/edit.c mc-4.6.1/edit/edit.c --- mc-4.6.1.orig/edit/edit.c 2005-05-27 17:19:18.000000000 +0300 +++ mc-4.6.1/edit/edit.c 2006-03-17 17:39:49.000000000 +0200 @@ -186,6 +186,7 @@ static const struct edit_filters { const char *read, *write, *extension; } all_filters[] = { + { "lzma -cd %s 2>&1", "lzma > %s", ".bz2" }, { "bzip2 -cd %s 2>&1", "bzip2 > %s", ".bz2" }, { "gzip -cd %s 2>&1", "gzip > %s", ".gz" }, { "gzip -cd %s 2>&1", "gzip > %s", ".Z" } diff -Naru mc-4.6.1.orig/src/util.c mc-4.6.1/src/util.c --- mc-4.6.1.orig/src/util.c 2005-05-27 17:19:18.000000000 +0300 +++ mc-4.6.1/src/util.c 2006-03-17 18:20:50.000000000 +0200 @@ -900,7 +900,7 @@ * Warning: this function moves the current file pointer */ int get_compression_type (int fd) { - unsigned char magic[4]; + unsigned char magic[16]; /* Read the magic signature */ if (mc_read (fd, (char *) magic, 4) != 4) @@ -944,6 +944,31 @@ return COMPRESSION_BZIP2; } } + + /* LZMA files; both LZMA_Alone and LZMA utils formats. The LZMA_Alone + * format is used by the LZMA_Alone tool from LZMA SDK. The LZMA utils + * format is the default format of LZMA utils 4.32.1 and later. */ + if (magic[0] < 0xE1 || (magic[0] == 0xFF && magic[1] == 'L' && + magic[2] == 'Z' && magic[3] == 'M')) { + if (mc_read (fd, (char *) magic + 4, 9) == 9) { + /* LZMA utils format */ + if (magic[0] == 0xFF && magic[4] == 'A' && magic[5] == 0x00) + return COMPRESSION_LZMA; + /* The LZMA_Alone format has no magic bytes, thus we + * need to play a wizard. This can give false positives, + * thus the detection below should be removed when + * the newer LZMA utils format has got popular. */ + if (magic[0] < 0xE1 && magic[4] < 0x20 && + ((magic[10] == 0x00 && magic[11] == 0x00 && + magic[12] == 0x00) || + (magic[5] == 0xFF && magic[6] == 0xFF && + magic[7] == 0xFF && magic[8] == 0xFF && + magic[9] == 0xFF && magic[10] == 0xFF && + magic[11] == 0xFF && magic[12] == 0xFF))) + return COMPRESSION_LZMA; + } + } + return 0; } @@ -954,6 +979,7 @@ case COMPRESSION_GZIP: return "#ugz"; case COMPRESSION_BZIP: return "#ubz"; case COMPRESSION_BZIP2: return "#ubz2"; + case COMPRESSION_LZMA: return "#ulzma"; } /* Should never reach this place */ fprintf (stderr, "Fatal: decompress_extension called with an unknown argument\n"); diff -Naru mc-4.6.1.orig/src/util.h mc-4.6.1/src/util.h --- mc-4.6.1.orig/src/util.h 2005-01-13 21:20:47.000000000 +0200 +++ mc-4.6.1/src/util.h 2006-03-17 17:34:34.000000000 +0200 @@ -169,7 +169,8 @@ COMPRESSION_NONE, COMPRESSION_GZIP, COMPRESSION_BZIP, - COMPRESSION_BZIP2 + COMPRESSION_BZIP2, + COMPRESSION_LZMA }; int get_compression_type (int fd); diff -Naru mc-4.6.1.orig/vfs/extfs/iso9660.in mc-4.6.1/vfs/extfs/iso9660.in --- mc-4.6.1.orig/vfs/extfs/iso9660.in 2004-10-29 12:14:38.000000000 +0300 +++ mc-4.6.1/vfs/extfs/iso9660.in 2006-03-17 17:45:28.000000000 +0200 @@ -25,6 +25,7 @@ mcisofs_list () { # left as a reminder to implement compressed image support =) case "$1" in + *.lzma) MYCAT="lzma -dc";; *.bz2) MYCAT="bzip2 -dc";; *.gz) MYCAT="gzip -dc";; *.z) MYCAT="gzip -dc";; diff -Naru mc-4.6.1.orig/vfs/extfs/lslR.in mc-4.6.1/vfs/extfs/lslR.in --- mc-4.6.1.orig/vfs/extfs/lslR.in 2003-06-22 12:54:21.000000000 +0300 +++ mc-4.6.1/vfs/extfs/lslR.in 2006-03-17 17:45:08.000000000 +0200 @@ -12,6 +12,7 @@ mclslRfs_list () { case "$1" in + *.lzma) MYCAT="lzma -dc";; *.bz2) MYCAT="bzip2 -dc";; *.gz) MYCAT="gzip -dc";; *.z) MYCAT="gzip -dc";; diff -Naru mc-4.6.1.orig/vfs/extfs/mailfs.in mc-4.6.1/vfs/extfs/mailfs.in --- mc-4.6.1.orig/vfs/extfs/mailfs.in 2002-12-24 08:56:17.000000000 +0200 +++ mc-4.6.1/vfs/extfs/mailfs.in 2006-03-17 17:53:47.000000000 +0200 @@ -7,6 +7,7 @@ $zcat="zcat"; # gunzip to stdout $bzcat="bzip2 -dc"; # bunzip2 to stdout +$lzcat="lzma -dc"; # unlzma to stdout $file="file"; # "file" command $TZ='GMT'; # default timezone (for Date module) @@ -132,6 +133,8 @@ exit 1 unless (open IN, "$zcat $mbox_qname|"); } elsif (/bzip/) { exit 1 unless (open IN, "$bzcat $mbox_qname|"); +} elsif (/lzma/) { + exit 1 unless (open IN, "$lzcat $mbox_qname|"); } else { exit 1 unless (open IN, "<$mbox_name"); } diff -Naru mc-4.6.1.orig/vfs/extfs/patchfs.in mc-4.6.1/vfs/extfs/patchfs.in --- mc-4.6.1.orig/vfs/extfs/patchfs.in 2004-11-17 01:00:40.000000000 +0200 +++ mc-4.6.1/vfs/extfs/patchfs.in 2006-03-17 17:52:47.000000000 +0200 @@ -12,6 +12,7 @@ use File::Temp 'tempfile'; # standard binaries +my $lzma = 'lzma'; my $bzip = 'bzip2'; my $gzip = 'gzip'; my $fileutil = 'file'; @@ -70,7 +71,9 @@ my ($qfname)=(quotemeta $_[0]); $_=`$fileutil $qfname`; - if (/bzip/) { + if (/lzma/) { + return "$lzma -dc $qfname"; + } elsif (/bzip/) { return "$bzip -dc $qfname"; } elsif (/gzip/) { return "$gzip -dc $qfname"; @@ -86,7 +89,9 @@ my ($sep) = $append ? '>>' : '>'; $_=`$fileutil $qfname`; - if (/bzip/) { + if (/lzma/) { + return "$lzma -c $sep $qfname"; + } elsif (/bzip/) { return "$bzip -c $sep $qfname"; } elsif (/gzip/) { return "$gzip -c $sep $qfname"; diff -Naru mc-4.6.1.orig/vfs/extfs/sfs.ini mc-4.6.1/vfs/extfs/sfs.ini --- mc-4.6.1.orig/vfs/extfs/sfs.ini 1998-12-15 17:57:43.000000000 +0200 +++ mc-4.6.1/vfs/extfs/sfs.ini 2006-03-17 17:44:01.000000000 +0200 @@ -10,6 +10,8 @@ ubz/1 bzip -d < %1 > %3 bz2/1 bzip2 < %1 > %3 ubz2/1 bzip2 -d < %1 > %3 +lzma/1 lzma < %1 > %3 +ulzma/1 lzma -d < %1 > %3 tar/1 tar cf %3 %1 tgz/1 tar czf %3 %1 uhtml/1 lynx -force_html -dump %1 > %3 mc-extensions.patch: Index: mc-extensions.patch =================================================================== RCS file: /cvs/extras/rpms/mc/devel/mc-extensions.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mc-extensions.patch 4 Jan 2007 16:14:38 -0000 1.10 +++ mc-extensions.patch 7 Mar 2008 14:37:40 -0000 1.11 @@ -1,17 +1,7 @@ ---- mc/configure.ac.extensions 2006-12-28 06:34:31.000000000 +0100 -+++ mc/configure.ac 2007-01-04 15:42:15.000000000 +0100 -@@ -83,7 +83,7 @@ - AC_CHECK_TOOL(AR, ar, ar) - - dnl Only list browsers here that can be run in background (i.e. with `&') --AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape]) -+AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape]) - - dnl - dnl Ovverriding mmap support. This has to be before AC_FUNC_MMAP is used. ---- mc/configure.extensions 2006-12-28 06:34:48.000000000 +0100 -+++ mc/configure 2007-01-04 15:42:15.000000000 +0100 -@@ -7166,7 +7166,7 @@ +diff -up mc-4.6.2-pre1/configure.extensions mc-4.6.2-pre1/configure +--- mc-4.6.2-pre1/configure.extensions 2007-09-11 16:33:32.000000000 +0200 ++++ mc-4.6.2-pre1/configure 2008-03-07 14:28:51.000000000 +0100 +@@ -5736,7 +5736,7 @@ fi @@ -20,9 +10,22 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 ---- mc/lib/mc.ext.in.extensions 2006-12-28 04:45:29.000000000 +0100 -+++ mc/lib/mc.ext.in 2007-01-04 15:53:33.000000000 +0100 -@@ -220,14 +220,25 @@ +diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in +--- mc-4.6.2-pre1/lib/mc.ext.in.extensions 2006-12-28 04:57:01.000000000 +0100 ++++ mc-4.6.2-pre1/lib/mc.ext.in 2008-03-07 14:28:31.000000000 +0100 +@@ -119,6 +119,11 @@ + Open=%cd %p#utar + View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf - + ++# .tar.lzma, .tlz ++regex/\.t(ar\.lzma|lz)$ ++ Open=%cd %p#utar ++ View=%view{ascii} lzma -dc %f 2>/dev/null | tar tvvf - ++ + # .tar.F - used in QNX + regex/\.tar\.F$ + # Open=%cd %p#utar +@@ -220,14 +225,25 @@ # C shell/.c @@ -35,7 +38,8 @@ + Include=editor # Header - regex/\.(h|hpp)$ +-regex/\.(h|hpp)$ ++regex/\.([Hh]|[Hh]pp|HPP)$ + Include=editor + +# Asm @@ -50,7 +54,7 @@ Open=%var{EDITOR:vi} %f # Object -@@ -251,10 +262,12 @@ +@@ -251,10 +267,12 @@ # GNU Info page type/^Info\ text @@ -65,7 +69,18 @@ # Manual page # Exception - .so libraries are not manual pages -@@ -328,18 +341,24 @@ +@@ -298,6 +316,10 @@ + Open=case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more} + View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac + ++regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lzma$ ++ Open=case %d/%f in */log/*|*/logs/*) lzma -dc %f ;; *) lzma -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more} ++ View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) lzma -dc %f ;; *) lzma -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac ++ + + ### Images ### + +@@ -328,18 +350,24 @@ type/^Netpbm Include=image @@ -88,11 +103,11 @@ include/image - Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi -+ Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (display %f &); fi ++ Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (xdg-open %f &); fi View=%view{ascii} identify %f #View=%view{ascii} asciiview %f -@@ -347,7 +366,8 @@ +@@ -347,7 +375,8 @@ ### Sound files ### regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$ @@ -102,7 +117,7 @@ regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$ Open=mikmod %f -@@ -357,11 +377,16 @@ +@@ -357,11 +386,16 @@ Open=vplay -s 22 %f regex/\.([mM][pP]3)$ @@ -122,7 +137,7 @@ View=%view{ascii} ogginfo %s regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$ -@@ -371,11 +396,15 @@ +@@ -371,11 +405,15 @@ Open=mplayer -vo null %f View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f @@ -139,7 +154,7 @@ ### Video ### -@@ -395,20 +424,27 @@ +@@ -395,20 +433,27 @@ regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$ Include=video @@ -168,7 +183,7 @@ #Open=(gtv %f >/dev/null 2>&1 &) #Open=(xanim %f >/dev/null 2>&1 &) -@@ -417,12 +453,13 @@ +@@ -417,12 +462,13 @@ # Postscript type/^PostScript @@ -179,12 +194,12 @@ # PDF type/^PDF - Open=(xpdf %f &) -+ Open=(evince %f >/dev/null 2>&1 &) ++ Open=(xdg-open %f >/dev/null 2>&1 &) + #Open=(xpdf %f >/dev/null 2>&1 &) #Open=(acroread %f &) #Open=(ghostview %f &) View=%view{ascii} pdftotext %f - -@@ -433,7 +470,7 @@ +@@ -433,7 +479,7 @@ # html regex/\.([hH][tT][mM][lL]?)$ Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null @@ -193,7 +208,7 @@ # StarOffice 5.2 shell/.sdw -@@ -450,22 +487,27 @@ +@@ -450,22 +496,27 @@ # Microsoft Word Document regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$ @@ -226,3 +241,27 @@ View=%view{ascii} xls2csv %f || strings %f # Use OpenOffice.org to open any MS Office documents +@@ -542,6 +593,11 @@ + Open=gzip -dc %f | %var{PAGER:more} + View=%view{ascii} gzip -dc %f 2>/dev/null + ++# lzma ++regex/\.lzma$ ++ Open=lzma -dc %f | %var{PAGER:more} ++ View=%view{ascii} lzma -dc %f 2>/dev/null ++ + + ### Default ### + +diff -up mc-4.6.2-pre1/configure.ac.extensions mc-4.6.2-pre1/configure.ac +--- mc-4.6.2-pre1/configure.ac.extensions 2007-09-10 16:25:30.000000000 +0200 ++++ mc-4.6.2-pre1/configure.ac 2008-03-07 14:28:51.000000000 +0100 +@@ -83,7 +83,7 @@ + AC_CHECK_TOOL(AR, ar, ar) + + dnl Only list browsers here that can be run in background (i.e. with `&') +-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape]) ++AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape]) + + dnl + dnl Ovverriding mmap support. This has to be before AC_FUNC_MMAP is used. Index: mc.spec =================================================================== RCS file: /cvs/extras/rpms/mc/devel/mc.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- mc.spec 25 Feb 2008 15:01:14 -0000 1.131 +++ mc.spec 7 Mar 2008 14:37:40 -0000 1.132 @@ -1,7 +1,7 @@ Summary: User-friendly text console file manager and visual shell Name: mc Version: 4.6.2 -Release: 1.pre1%{?dist} +Release: 2.pre1%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Shells @@ -29,6 +29,7 @@ Patch15: mc-prompt.patch Patch16: mc-refresh.patch Patch17: mc-preserveattr.patch +Patch18: mc-lzma.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -57,6 +58,7 @@ %patch15 -p1 -b .prompt %patch16 -p1 -b .refresh %patch17 -p1 -b .preserveattr +%patch18 -p1 -b .lzmavfs # convert files in /lib to UTF-8 pushd lib @@ -195,6 +197,10 @@ %dir %{_libexecdir}/mc %changelog +* Fri Mar 7 2008 Jindrich Novy 4.6.2-2.pre1 +- add lzma vfs support by Lasse Collin +- update extensions patch to use xdg-open + * Mon Feb 25 2008 Jindrich Novy 4.6.2-1.pre1 - update to 4.6.2-pre1 - forwardport the UTF-8 patch to 4.6.2-pre1 and convert new From fedora-extras-commits at redhat.com Fri Mar 7 14:40:44 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Fri, 7 Mar 2008 14:40:44 GMT Subject: rpms/qt/devel qt.spec,1.157,1.158 Message-ID: <200803071440.m27Eei40011352@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11331 Modified Files: qt.spec Log Message: - move qt.[c]sh in main package (#221000) Index: qt.spec =================================================================== RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- qt.spec 18 Feb 2008 11:05:25 -0000 1.157 +++ qt.spec 7 Mar 2008 14:40:05 -0000 1.158 @@ -1,7 +1,7 @@ Summary: The shared library for the Qt GUI toolkit. Name: qt Version: 3.3.8b -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries @@ -90,6 +90,7 @@ Requires: fileutils Requires: fontconfig >= 2.0 Requires: /etc/ld.so.conf.d +Requires: pkgconfig Provides: qt3 = %version-%release @@ -154,7 +155,6 @@ Requires: libpng-devel Requires: libjpeg-devel Requires: libmng-devel -Requires: pkgconfig Requires: mesa-libGL-devel Requires: mesa-libGLU-devel @@ -499,6 +499,7 @@ %if %{immodule} %{qtdir}/plugins/inputmethods %endif +%attr(0755,root,root) %config /etc/profile.d/* /etc/ld.so.conf.d/* %{qtdir}/lib/libqui.so.* %{qtdir}/lib/libqt*.so.* @@ -511,7 +512,6 @@ %files devel %defattr(-,root,root,-) -%attr(0755,root,root) %config /etc/profile.d/* %{qtdir}/bin/moc %{qtdir}/bin/uic %{qtdir}/bin/findtr @@ -574,6 +574,9 @@ %changelog +* Fri Mar 07 2008 Than Ngo 3.3.8b-6 +- move qt.[c]sh in main package (#221000) + * Mon Feb 18 2008 Kevin Kofler 3.3.8b-5 - fix buildkey for GCC 4.3 (#433235) From fedora-extras-commits at redhat.com Fri Mar 7 14:46:11 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 7 Mar 2008 14:46:11 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.1, 1.1440.2.2 Message-ID: <200803071446.m27EkBKK011521@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11501 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org.spec Log Message: tweak release Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440.2.1 retrieving revision 1.1440.2.2 diff -u -r1.1440.2.1 -r1.1440.2.2 --- openoffice.org.spec 7 Mar 2008 14:32:38 -0000 1.1440.2.1 +++ openoffice.org.spec 7 Mar 2008 14:45:22 -0000 1.1440.2.2 @@ -1,6 +1,6 @@ %define oootag DEV300 %define ooomilestone 1 -%define rh_rpm_release 0.1 +%define rh_rpm_release 1 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -43,7 +43,7 @@ Summary: OpenOffice.org comprehensive office suite. Name: openoffice.org Version: 3.0.0 -Release: %{ooomilestone}.%{rh_rpm_release}%{?dist} +Release: 0.0.%{ooomilestone}.%{rh_rpm_release}%{?dist} Epoch: 1 License: LGPLv2 and LGPLv2+ and MPLv1.1 and BSD Group: Applications/Productivity From fedora-extras-commits at redhat.com Fri Mar 7 14:48:26 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Fri, 7 Mar 2008 14:48:26 GMT Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.28, 1.29 sources, 1.30, 1.31 xorg-x11-drv-nv.spec, 1.68, 1.69 nouveau-alloca.patch, 1.1, NONE nouveau-fix-bswap32.patch, 1.1, NONE Message-ID: <200803071448.m27EmQtY011598@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11572/devel Modified Files: .cvsignore sources xorg-x11-drv-nv.spec Removed Files: nouveau-alloca.patch nouveau-fix-bswap32.patch Log Message: nv 2.1.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 22 Feb 2008 18:54:28 -0000 1.28 +++ .cvsignore 7 Mar 2008 14:47:53 -0000 1.29 @@ -1,2 +1 @@ -nouveau-20070920.tar.bz2 -xf86-video-nv-2.1.7.tar.bz2 +xf86-video-nv-2.1.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 29 Feb 2008 05:08:57 -0000 1.30 +++ sources 7 Mar 2008 14:47:53 -0000 1.31 @@ -1 +1 @@ -192414222f1a98e228832ee53f8178c0 xf86-video-nv-2.1.7.tar.bz2 +c3e8c98287dc98677bebfbe1ba51ab77 xf86-video-nv-2.1.8.tar.bz2 Index: xorg-x11-drv-nv.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- xorg-x11-drv-nv.spec 2 Mar 2008 23:33:19 -0000 1.68 +++ xorg-x11-drv-nv.spec 7 Mar 2008 14:47:53 -0000 1.69 @@ -4,8 +4,8 @@ Summary: Xorg X11 nv video driver Name: xorg-x11-drv-nv -Version: 2.1.7 -Release: 3%{?dist} +Version: 2.1.8 +Release: 1%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -67,6 +67,9 @@ %{_mandir}/man4/nv.4* %changelog +* Fri Mar 07 2008 Adam Jackson 2.1.8-1 +- nv 2.1.8 + * Mon Mar 03 2008 Dave Airlie 2.1.7-3 - update for new server ABI --- nouveau-alloca.patch DELETED --- --- nouveau-fix-bswap32.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 7 14:50:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:50:31 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqMEq001497@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the watchbugzilla acl on vconfig (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:50:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:50:35 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqQPU001519@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the watchcommits acl on vconfig (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:50:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:50:38 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqMEt001497@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the commit acl on vconfig (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:50:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:50:42 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqQPX001519@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the approveacls acl on vconfig (Fedora devel) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:51:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:51:01 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqdOH001579@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the watchbugzilla acl on vconfig (Fedora 7) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:50:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:50:50 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqMEw001497@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the watchcommits acl on vconfig (Fedora 7) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:50:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:50:51 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqgNw001627@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the commit acl on vconfig (Fedora 7) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:50:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:50:53 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqgO1001627@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the approveacls acl on vconfig (Fedora 7) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:51:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:51:11 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqdOK001579@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the watchcommits acl on vconfig (Fedora 8) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:51:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:51:12 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqdON001579@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the commit acl on vconfig (Fedora 8) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:50:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:50:58 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqQPa001519@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the watchbugzilla acl on vconfig (Fedora 8) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:51:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:51:02 +0000 Subject: [pkgdb] vconfig had acl change status Message-ID: <200803071452.m27EqrRJ001736@bastion.fedora.phx.redhat.com> Phil Knirsch (pknirsch) has set the approveacls acl on vconfig (Fedora 8) to Approved for Roman Rakus (rrakus) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vconfig From fedora-extras-commits at redhat.com Fri Mar 7 14:53:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:53:44 +0000 Subject: [pkgdb] xplanet: mmahut has requested watchbugzilla Message-ID: <200803071455.m27EtZFj001928@bastion.fedora.phx.redhat.com> Marek Mahut (mmahut) has requested the watchbugzilla acl on xplanet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xplanet From fedora-extras-commits at redhat.com Fri Mar 7 14:54:00 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:54:00 +0000 Subject: [pkgdb] xplanet: mmahut has requested watchcommits Message-ID: <200803071455.m27Etc0W001950@bastion.fedora.phx.redhat.com> Marek Mahut (mmahut) has requested the watchcommits acl on xplanet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xplanet From fedora-extras-commits at redhat.com Fri Mar 7 14:53:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:53:49 +0000 Subject: [pkgdb] xplanet: mmahut has requested commit Message-ID: <200803071455.m27EtZFm001928@bastion.fedora.phx.redhat.com> Marek Mahut (mmahut) has requested the commit acl on xplanet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xplanet From fedora-extras-commits at redhat.com Fri Mar 7 14:54:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:54:04 +0000 Subject: [pkgdb] xplanet: mmahut has requested approveacls Message-ID: <200803071455.m27Etc0Z001950@bastion.fedora.phx.redhat.com> Marek Mahut (mmahut) has requested the approveacls acl on xplanet (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xplanet From fedora-extras-commits at redhat.com Fri Mar 7 14:55:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:55:32 +0000 Subject: [pkgdb] marble had groupAcl changed Message-ID: <200803071457.m27EvNHk002116@bastion.fedora.phx.redhat.com> Chitlesh GOORAH (chitlesh) has set the commit acl on marble (Fedora 7) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/marble From fedora-extras-commits at redhat.com Fri Mar 7 14:55:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:55:32 +0000 Subject: [pkgdb] marble had groupAcl changed Message-ID: <200803071457.m27EvNoV002134@bastion.fedora.phx.redhat.com> Chitlesh GOORAH (chitlesh) has set the commit acl on marble (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/marble From fedora-extras-commits at redhat.com Fri Mar 7 14:55:38 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:55:38 +0000 Subject: [pkgdb] marble had groupAcl changed Message-ID: <200803071457.m27EvNHm002116@bastion.fedora.phx.redhat.com> Chitlesh GOORAH (chitlesh) has set the commit acl on marble (Fedora 6) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/marble From fedora-extras-commits at redhat.com Fri Mar 7 14:55:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 14:55:41 +0000 Subject: [pkgdb] marble had groupAcl changed Message-ID: <200803071457.m27EvNHo002116@bastion.fedora.phx.redhat.com> Chitlesh GOORAH (chitlesh) has set the commit acl on marble (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/marble From fedora-extras-commits at redhat.com Fri Mar 7 14:58:06 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Fri, 7 Mar 2008 14:58:06 GMT Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.56,1.57 Message-ID: <200803071458.m27Ew6PF011842@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11818 Modified Files: java-1.7.0-icedtea.spec Log Message: * Fri Mar 07 2008 Lillian Angel - 1.7.0.0-0.29.b24 - Updated icedteasnapshot - Updated release - Removed ExcludeArch Index: java-1.7.0-icedtea.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- java-1.7.0-icedtea.spec 3 Mar 2008 17:48:31 -0000 1.56 +++ java-1.7.0-icedtea.spec 7 Mar 2008 14:57:32 -0000 1.57 @@ -4,7 +4,7 @@ %define gcjbootstrap 0 %define icedteaver 1.6 -%define icedteasnapshot %{nil} +%define icedteasnapshot -391090a3755dc38d1ba3c7fb8feb2c505fe3c795 %define openjdkver b24 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.7.0-icedtea/ @@ -101,7 +101,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.28.%{openjdkver}%{?dist} +Release: 0.29.%{openjdkver}%{?dist} Summary: IcedTea Runtime Environment Group: Development/Languages @@ -121,9 +121,6 @@ Source7: mauve_tests Patch0: java-1.7.0-icedtea-win32.patch Patch1: java-1.7.0-icedtea-jhat.patch -# Excluding ppc as a workaround for this bug: -#https://bugzilla.redhat.com/show_bug.cgi?id=435337 -ExcludeArch: ppc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -747,6 +744,11 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Fri Mar 07 2008 Lillian Angel - 1.7.0.0-0.29.b24 +- Updated icedteasnapshot +- Updated release +- Removed ExcludeArch + * Mon Mar 03 2008 Lillian Angel - 1.7.0.0-0.28.b24 - ExcludeArch ppc added as a workaround for this bug: https://bugzilla.redhat.com/show_bug.cgi?id=435337 From fedora-extras-commits at redhat.com Fri Mar 7 14:58:50 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 14:58:50 GMT Subject: rpms/irssi/devel irssi.spec,1.33,1.34 Message-ID: <200803071458.m27EwoG9011866@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/irssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11848 Modified Files: irssi.spec Log Message: new perl Index: irssi.spec =================================================================== RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- irssi.spec 7 Mar 2008 01:52:52 -0000 1.33 +++ irssi.spec 7 Mar 2008 14:58:15 -0000 1.34 @@ -3,7 +3,7 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 0.8.12 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: Applications/Communications @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ncurses-devel openssl-devel zlib-devel -BuildRequires: pkgconfig glib2-devel perl-devel +BuildRequires: pkgconfig glib2-devel perl-devel perl(ExtUtils::Embed) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %package devel @@ -85,8 +85,11 @@ %{_includedir}/irssi %changelog +* Fri Mar 7 2008 Tom "spot" Callaway - 0.8.12-10 +- BR: perl(ExtUtils::Embed) + * Thu Mar 06 2008 Tom "spot" Callaway - 0.8.12-9 -Rebuild for new perl +- Rebuild for new perl * Sat Mar 1 2008 Marek Mahut - 0.8.12-8 - Fix for multiarch conflict (BZ#341591) From fedora-extras-commits at redhat.com Fri Mar 7 15:00:25 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Fri, 7 Mar 2008 15:00:25 GMT Subject: rpms/java-1.7.0-icedtea/devel .cvsignore, 1.16, 1.17 sources, 1.40, 1.41 Message-ID: <200803071500.m27F0Ph5011950@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11922 Modified Files: .cvsignore sources Log Message: Uploaded snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 13 Feb 2008 17:59:55 -0000 1.16 +++ .cvsignore 7 Mar 2008 14:59:46 -0000 1.17 @@ -3,3 +3,4 @@ mauve_tests openjdk-b24-fedora.zip icedtea-1.6.tar.gz +icedtea-1.6-391090a3755dc38d1ba3c7fb8feb2c505fe3c795.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 3 Mar 2008 15:50:11 -0000 1.40 +++ sources 7 Mar 2008 14:59:46 -0000 1.41 @@ -3,3 +3,4 @@ 254bfa2360efb5374439f9b1738c7b22 openjdk-b24-fedora.zip 7a0c160c03012cd40957a7a112e25038 mauve_tests 0deadd4cbbef0490365bc6a24661e638 icedtea-1.6.tar.gz +90f52b9c5cd355ba16b57ba6132a3671 icedtea-1.6-391090a3755dc38d1ba3c7fb8feb2c505fe3c795.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 15:02:13 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Fri, 7 Mar 2008 15:02:13 GMT Subject: rpms/thunderbird/F-8 thunderbird.sh.in, 1.8, 1.9 thunderbird.spec, 1.111, 1.112 firefox-1.5-embedwindow-visibility.patch, 1.1, NONE Message-ID: <200803071502.m27F2DWP019231@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/thunderbird/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19186 Modified Files: thunderbird.sh.in thunderbird.spec Removed Files: firefox-1.5-embedwindow-visibility.patch Log Message: updated starting script, fixes #436410 Index: thunderbird.sh.in =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/F-8/thunderbird.sh.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- thunderbird.sh.in 26 Sep 2007 15:32:44 -0000 1.8 +++ thunderbird.sh.in 7 Mar 2008 15:01:38 -0000 1.9 @@ -4,19 +4,34 @@ # (based on the Mozilla RPM launch script) # -MOZ_LIB_DIR="/usr/lib" -if [ -x "/usr/lib64/thunderbird-TBIRD_VERSION/thunderbird-bin" ] -then - MOZ_LIB_DIR="/usr/lib64" +## +## Variables +## +MOZ_ARCH=$(uname -m) +case $MOZ_ARCH in + x86_64 | ia64 | s390 ) + MOZ_LIB_DIR="/usr/lib64" + SECONDARY_LIB_DIR="/usr/lib" + ;; + * ) + MOZ_LIB_DIR="/usr/lib" + SECONDARY_LIB_DIR="/usr/lib64" + ;; +esac + +if [ ! -x $MOZ_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird ]; then + if [ ! -x $SECONDARY_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird ]; then + echo "Error: $MOZ_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird not found" + if [ -d $SECONDARY_LIB_DIR ]; then + echo " $SECONDARY_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird not found" + fi + exit 1 + fi + MOZ_LIB_DIR="$SECONDARY_LIB_DIR" fi -MOZILLA_FIVE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION" -MRE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION" -export MOZILLA_FIVE_HOME MRE_HOME - -MOZ_PROGRAM=$MRE_HOME/thunderbird -#MOZ_CLIENT_PROGRAM="$MRE_HOME/mozilla-xremote-client -a thunderbird" -MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird-bin -remote" +MOZ_DIST_BIN="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION" +MOZ_PROGRAM="$MOZ_DIST_BIN/thunderbird" ## ## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default @@ -25,74 +40,4 @@ #MOZ_DISABLE_PANGO=1 #export MOZ_DISABLE_PANGO - -function check_running() { - $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null - RETURN_VAL=$? - if [ "$RETURN_VAL" -eq "2" ]; then - echo 0 - return 0 - else - echo 1 - return 1 - fi -} - -function rm_shit() { - find $HOME/.thunderbird -name XUL.mfasl 2>/dev/null | xargs rm -f -} - -# currently unused -MOZARGS="" - -ALREADY_RUNNING=`check_running` - -# If no command-line arguments given... -if [ -z "$1" ]; then - if [ "${ALREADY_RUNNING}" -eq "1" ]; then - exec $MOZ_CLIENT_PROGRAM "xfeDoCommand(openInbox)" >/dev/null 2>&1 - else - rm_shit - exec $MOZ_PROGRAM $MOZARGS >/dev/null 2>&1 - fi -fi - -for arg in $@ ; do - case "$1" in - -remote) - shift - exec $MOZ_PROGRAM -remote "$@" - ;; - - -mail) - shift - if [ "${ALREADY_RUNNING}" -eq "1" ]; then - # remove 'mailto:' prefix - ARGS="`echo $@ | sed 's/^mailto://'`" - exec $MOZ_CLIENT_PROGRAM "mailto($ARGS)" - else - rm_shit - exec $MOZ_PROGRAM $MOZARGS -mail "$@" - fi - ;; - - -compose) - shift - if [ "${ALREADY_RUNNING}" -eq "1" ]; then - # remove 'mailto:' prefix - ARGS="`echo $@ | sed 's/^mailto://'`" - exec $MOZ_CLIENT_PROGRAM "mailto($ARGS)" - else - rm_shit - exec $MOZ_PROGRAM $MOZARGS -compose "$@" - fi - ;; - - *) - # for now, pass it on and hope for the best - exec $MOZ_PROGRAM $MOZARGS "$@" - ;; - esac - shift -done - +exec $MOZ_PROGRAM "$@" Index: thunderbird.spec =================================================================== RCS file: /cvs/pkgs/rpms/thunderbird/F-8/thunderbird.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- thunderbird.spec 26 Feb 2008 23:26:09 -0000 1.111 +++ thunderbird.spec 7 Mar 2008 15:01:38 -0000 1.112 @@ -309,6 +309,9 @@ #=============================================================================== %changelog +* Fri Mar 07 2008 Martin Stransky +- updated starting script, fixes #436410 + * Tue Feb 26 2008 Christopher Aillon 2.0.0.12-1 - Update to 2.0.0.12 --- firefox-1.5-embedwindow-visibility.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 7 15:02:48 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 7 Mar 2008 15:02:48 GMT Subject: rpms/kaffeine/devel kaffeine.spec,1.15,1.16 Message-ID: <200803071502.m27F2mbn019261@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kaffeine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19224 Modified Files: kaffeine.spec Log Message: * Fri Mar 07 2008 Rex Dieter 0.8.6-3 - fix deps wrt kaffeine-libs (#436442) - f7: xcb support (#373411) Index: kaffeine.spec =================================================================== RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- kaffeine.spec 19 Feb 2008 21:14:28 -0000 1.15 +++ kaffeine.spec 7 Mar 2008 15:02:13 -0000 1.16 @@ -13,7 +13,7 @@ #define nonfree 1 Version: 0.8.6 -Release: 2%{?dist} +Release: 3%{?dist} %if "%{?nonfree:1}" != "1" # Fedora Review: http://bugzilla.redhat.com/213432 @@ -34,7 +34,7 @@ BuildRequires: cdparanoia-devel cdparanoia BuildRequires: libvorbis-devel BuildRequires: xine-lib-devel -%if 0%{?fedora} > 7 +%if 0%{?fedora} > 6 BuildRequires: libxcb-devel %endif # dvb @@ -51,22 +51,22 @@ Requires(hint): libdvdcss # extra/nonfree codec support Requires(hint): xine-lib-extras-nonfree +%endif + +%description +Nonfree support bits for kaffeine, including DVD playback, MP3 +decoding, as well as extended audio/video codec support. + %else + %if 0%{?libs} Requires: %{name}-libs = %{version}-%{release} %else Obsoletes: %{name}-libs < %{version}-%{release} Provides: %{name}-libs = %{version}-%{release} %endif -%endif - %description -Nonfree support bits for kaffeine, including DVD playback, MP3 -decoding, as well as extended audio/video codec support. - -%else -%description Kaffeine is a xine-based media player for KDE. It plays back CDs, and VCDs, and can decode all (local or streamed) multimedia formats supported by xine-lib. @@ -86,7 +86,6 @@ %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -Requires: kdelibs3 >= %{version} # helps multilib upgrades Obsoletes: %{name} < %{version}-%{release} # include to be paranoid, installing libs-only is still mostly untested -- Rex @@ -221,6 +220,10 @@ %changelog +* Fri Mar 07 2008 Rex Dieter 0.8.6-3 +- fix deps wrt kaffeine-libs (#436442) +- f7: xcb support (#373411) + * Tue Feb 19 2008 Fedora Release Engineering - 0.8.6-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 15:06:26 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 7 Mar 2008 15:06:26 GMT Subject: rpms/shadow-utils/devel shadow-4.1.0-audit-newgrp.patch, 1.1, 1.2 shadow-utils.spec, 1.111, 1.112 Message-ID: <200803071506.m27F6Q7O019397@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/shadow-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19374 Modified Files: shadow-4.1.0-audit-newgrp.patch shadow-utils.spec Log Message: improve newgrp audit patch shadow-4.1.0-audit-newgrp.patch: Index: shadow-4.1.0-audit-newgrp.patch =================================================================== RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-4.1.0-audit-newgrp.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- shadow-4.1.0-audit-newgrp.patch 13 Feb 2008 12:54:32 -0000 1.1 +++ shadow-4.1.0-audit-newgrp.patch 7 Mar 2008 15:06:15 -0000 1.2 @@ -1,7 +1,7 @@ diff -urp shadow-4.1.0.orig/src/newgrp.c shadow-4.1.0/src/newgrp.c --- shadow-4.1.0.orig/src/newgrp.c 2007-11-18 18:15:05.000000000 -0500 -+++ shadow-4.1.0/src/newgrp.c 2008-02-12 16:45:20.000000000 -0500 -@@ -122,6 +122,8 @@ int main (int argc, char **argv) ++++ shadow-4.1.0/src/newgrp.c 2008-03-06 10:01:17.000000000 -0500 +@@ -122,6 +123,8 @@ int main (int argc, char **argv) #endif #ifdef WITH_AUDIT @@ -10,7 +10,7 @@ audit_help_open (); #endif setlocale (LC_ALL, ""); -@@ -164,7 +166,7 @@ int main (int argc, char **argv) +@@ -164,7 +167,7 @@ int main (int argc, char **argv) if (!pwd) { fprintf (stderr, _("unknown UID: %u\n"), getuid ()); #ifdef WITH_AUDIT @@ -19,41 +19,69 @@ getuid (), 0); #endif SYSLOG ((LOG_WARN, "unknown UID %u", getuid ())); -@@ -272,8 +274,14 @@ int main (int argc, char **argv) +@@ -272,7 +275,13 @@ int main (int argc, char **argv) if (ngroups < 0) { perror ("getgroups"); #ifdef WITH_AUDIT - audit_logger (AUDIT_USER_START, Prog, -- "changing", NULL, getuid (), 0); + if (group) { -+ snprintf(audit_buf, sizeof(audit_buf), -+ "changing new-group=%s", group); ++ snprintf (audit_buf, sizeof(audit_buf), ++ "changing new_group=%s", group); + audit_logger (AUDIT_CHGRP_ID, Prog, + audit_buf, NULL, getuid (), 0); + } else + audit_logger (AUDIT_CHGRP_ID, Prog, -+ "changing", NULL, getuid (), 0); + "changing", NULL, getuid (), 0); #endif exit (1); +@@ -394,13 +403,26 @@ int main (int argc, char **argv) + + if (grp->gr_passwd[0] == '\0' || + strcmp (cpasswd, grp->gr_passwd) != 0) { ++#ifdef WITH_AUDIT ++ snprintf (audit_buf, sizeof(audit_buf), ++ "authentication new_gid=%d", ++ grp->gr_gid); ++ audit_logger (AUDIT_GRP_AUTH, Prog, ++ audit_buf, NULL, getuid (), 0); ++#endif + SYSLOG ((LOG_INFO, + "Invalid password for group `%s' from `%s'", + group, name)); + sleep (1); +- fputs (_("Invalid password."), stderr); ++ fputs (_("Invalid password.\n"), stderr); + goto failure; + } ++#ifdef WITH_AUDIT ++ snprintf (audit_buf, sizeof(audit_buf), ++ "authentication new_gid=%d", grp->gr_gid); ++ audit_logger (AUDIT_GRP_AUTH, Prog, ++ audit_buf, NULL, getuid (), 1); ++#endif } -@@ -461,8 +469,14 @@ int main (int argc, char **argv) - fprintf (stderr, _("%s: failure forking: %s"), + + /* +@@ -458,10 +480,16 @@ int main (int argc, char **argv) + child = fork (); + if (child < 0) { + /* error in fork() */ +- fprintf (stderr, _("%s: failure forking: %s"), ++ fprintf (stderr, _("%s: failure forking: %s\n"), is_newgrp ? "newgrp" : "sg", strerror (errno)); #ifdef WITH_AUDIT - audit_logger (AUDIT_USER_START, Prog, "changing", -- NULL, getuid (), 0); + if (group) { -+ snprintf(audit_buf, sizeof(audit_buf), -+ "changing new-group=%s", group); ++ snprintf (audit_buf, sizeof(audit_buf), ++ "changing new_group=%s", group); + audit_logger (AUDIT_CHGRP_ID, Prog, + audit_buf, NULL, getuid (), 0); + } else + audit_logger (AUDIT_CHGRP_ID, Prog, "changing", -+ NULL, getuid (), 0); + NULL, getuid (), 0); #endif exit (1); - } else if (child) { -@@ -531,14 +545,24 @@ int main (int argc, char **argv) +@@ -531,14 +559,24 @@ int main (int argc, char **argv) * to the real UID. For root, this also sets the real GID to the * new group id. */ @@ -61,8 +89,8 @@ + if (setgid (gid)) { perror ("setgid"); +#ifdef WITH_AUDIT -+ snprintf(audit_buf, sizeof(audit_buf), -+ "changing new-gid=%d", gid); ++ snprintf (audit_buf, sizeof(audit_buf), ++ "changing new_gid=%d", gid); + audit_logger (AUDIT_CHGRP_ID, Prog, + audit_buf, NULL, getuid (), 0); +#endif @@ -74,44 +102,44 @@ #ifdef WITH_AUDIT - audit_logger (AUDIT_USER_START, Prog, "changing", - NULL, getuid (), 0); -+ snprintf(audit_buf, sizeof(audit_buf), -+ "changing new-gid=%d", gid); ++ snprintf (audit_buf, sizeof(audit_buf), ++ "changing new_gid=%d", gid); + audit_logger (AUDIT_CHGRP_ID, Prog, + audit_buf, NULL, getuid (), 0); #endif exit (1); } -@@ -551,8 +575,10 @@ int main (int argc, char **argv) +@@ -551,8 +589,10 @@ int main (int argc, char **argv) closelog (); execl ("/bin/sh", "sh", "-c", command, (char *) 0); #ifdef WITH_AUDIT - audit_logger (AUDIT_USER_START, Prog, "changing", - NULL, getuid (), 0); -+ snprintf(audit_buf, sizeof(audit_buf), -+ "changing new-gid=%d", gid); ++ snprintf (audit_buf, sizeof(audit_buf), ++ "changing new_gid=%d", gid); + audit_logger (AUDIT_CHGRP_ID, Prog, + audit_buf, NULL, getuid (), 0); #endif perror ("/bin/sh"); exit (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); -@@ -618,7 +644,8 @@ int main (int argc, char **argv) +@@ -618,7 +658,8 @@ int main (int argc, char **argv) } #ifdef WITH_AUDIT - audit_logger (AUDIT_USER_START, Prog, "changing", NULL, getuid (), 1); -+ snprintf(audit_buf, sizeof(audit_buf), "changing new-gid=%d", gid); ++ snprintf (audit_buf, sizeof(audit_buf), "changing new_gid=%d", gid); + audit_logger (AUDIT_CHGRP_ID, Prog, audit_buf, NULL, getuid (), 1); #endif /* * Exec the login shell and go away. We are trying to get back to -@@ -641,7 +668,14 @@ int main (int argc, char **argv) +@@ -641,7 +682,14 @@ int main (int argc, char **argv) */ closelog (); #ifdef WITH_AUDIT - audit_logger (AUDIT_USER_START, Prog, "changing", NULL, getuid (), 0); + if (group) { -+ snprintf(audit_buf, sizeof(audit_buf), -+ "changing new-group=%s", group); ++ snprintf (audit_buf, sizeof(audit_buf), ++ "changing new_group=%s", group); + audit_logger (AUDIT_CHGRP_ID, Prog, + audit_buf, NULL, getuid (), 0); + } else Index: shadow-utils.spec =================================================================== RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- shadow-utils.spec 3 Mar 2008 14:14:07 -0000 1.111 +++ shadow-utils.spec 7 Mar 2008 15:06:15 -0000 1.112 @@ -5,7 +5,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2 @@ -22,6 +22,7 @@ Patch7: shadow-4.0.18.1-mtime.patch Patch8: shadow-4.1.0-audit-newgrp.patch Patch9: shadow-4.1.0-segfault.patch +Patch10: shadow-4.1.0-fasterReset.patch License: BSD Group: System Environment/Base @@ -56,6 +57,7 @@ %patch7 -p1 -b .mtime %patch8 -p1 -b .auditNewgrp %patch9 -p1 -b .segfault +%patch10 -p1 -b .fasterReset rm po/*.gmo rm po/stamp-po @@ -195,6 +197,9 @@ %{_mandir}/man8/vigr.8* %changelog +* Fri Mar 07 2008 Peter Vrabec 2:4.1.0-5 +- improve newgrp audit patch + * Mon Mar 03 2008 Peter Vrabec 2:4.1.0-4 - fix selinux labeling (#433757) From fedora-extras-commits at redhat.com Fri Mar 7 15:14:31 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Fri, 7 Mar 2008 15:14:31 GMT Subject: rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.901-libpciaccess.patch, 1.5, 1.6 xorg-x11-drv-openchrome.spec, 1.13, 1.14 Message-ID: <200803071514.m27FEV5S019544@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19521 Modified Files: openchrome-0.2.901-libpciaccess.patch xorg-x11-drv-openchrome.spec Log Message: - Fix a typo in libpciaccess patch. openchrome-0.2.901-libpciaccess.patch: Index: openchrome-0.2.901-libpciaccess.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.901-libpciaccess.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- openchrome-0.2.901-libpciaccess.patch 6 Mar 2008 22:15:08 -0000 1.5 +++ openchrome-0.2.901-libpciaccess.patch 7 Mar 2008 15:14:26 -0000 1.6 @@ -723,7 +723,7 @@ - if ((pVia->PciInfo->subsysVendor == pVia->PciInfo->vendor) && - (pVia->PciInfo->subsysCard == pVia->PciInfo->chipType)) + if ((SUBVENDOR_ID(pVia->PciInfo) == VENDOR_ID(pVia->PciInfo)) && -+ (SUBSYS_ID(pVia->PciInfo) == DEICE_ID(pVia->PciInfo))) ++ (SUBSYS_ID(pVia->PciInfo) == DEVICE_ID(pVia->PciInfo))) xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Manufacturer plainly copied main PCI IDs to subsystem/card IDs.\n"); Index: xorg-x11-drv-openchrome.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xorg-x11-drv-openchrome.spec 7 Mar 2008 14:15:15 -0000 1.13 +++ xorg-x11-drv-openchrome.spec 7 Mar 2008 15:14:26 -0000 1.14 @@ -9,7 +9,7 @@ Summary: Xorg X11 openchrome video driver Name: xorg-x11-drv-openchrome Version: 0.2.901 -Release: 10%{?dist} +Release: 11%{?dist} URL: http://www.openchrome.org License: MIT Group: User Interface/X Hardware Support @@ -109,6 +109,9 @@ %changelog +* Thu Mar 07 2008 Xavier Bachelot - 0.2.901-11 +- Fix a typo in libpciaccess patch. + * Fri Mar 07 2008 Adam Jackson 0.2.901-10 - Fix -devel subpackage to obsolete via-devel properly. From fedora-extras-commits at redhat.com Fri Mar 7 15:17:57 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 7 Mar 2008 15:17:57 GMT Subject: rpms/kaffeine/F-8 kaffeine.spec,1.11,1.12 Message-ID: <200803071517.m27FHv9k019654@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kaffeine/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19619 Modified Files: kaffeine.spec Log Message: * Fri Mar 07 2008 Rex Dieter 0.8.6-3 - fix deps wrt kaffeine-libs (#436442) - f7: xcb support (#373411) Index: kaffeine.spec =================================================================== RCS file: /cvs/pkgs/rpms/kaffeine/F-8/kaffeine.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kaffeine.spec 22 Feb 2008 18:05:11 -0000 1.11 +++ kaffeine.spec 7 Mar 2008 15:17:22 -0000 1.12 @@ -13,7 +13,7 @@ #define nonfree 1 Version: 0.8.6 -Release: 1%{?dist} +Release: 3%{?dist} %if "%{?nonfree:1}" != "1" # Fedora Review: http://bugzilla.redhat.com/213432 @@ -34,7 +34,7 @@ BuildRequires: cdparanoia-devel cdparanoia BuildRequires: libvorbis-devel BuildRequires: xine-lib-devel -%if 0%{?fedora} > 7 +%if 0%{?fedora} > 6 BuildRequires: libxcb-devel %endif # dvb @@ -51,21 +51,21 @@ Requires(hint): libdvdcss # extra/nonfree codec support Requires(hint): xine-lib-extras-nonfree +%endif + +%description +Nonfree support bits for kaffeine, including DVD playback, MP3 +decoding, as well as extended audio/video codec support. + %else + %if 0%{?libs} Requires: %{name}-libs = %{version}-%{release} %else Obsoletes: %{name}-libs < %{version}-%{release} Provides: %{name}-libs = %{version}-%{release} %endif -%endif - -%description -Nonfree support bits for kaffeine, including DVD playback, MP3 -decoding, as well as extended audio/video codec support. - -%else %description Kaffeine is a xine-based media player for KDE. It plays back CDs, and VCDs, and can decode all (local or streamed) multimedia formats @@ -86,7 +86,6 @@ %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -Requires: kdelibs3 >= %{version} # helps multilib upgrades Obsoletes: %{name} < %{version}-%{release} # include to be paranoid, installing libs-only is still mostly untested -- Rex @@ -221,6 +220,13 @@ %changelog +* Fri Mar 07 2008 Rex Dieter 0.8.6-3 +- fix deps wrt kaffeine-libs (#436442) +- f7: xcb support (#373411) + +* Tue Feb 19 2008 Fedora Release Engineering - 0.8.6-2 +- Autorebuild for GCC 4.3 + * Sun Jan 20 2008 Rex Dieter 0.8.6-1 - kaffeine-0.8.6 From fedora-extras-commits at redhat.com Fri Mar 7 15:21:40 2008 From: fedora-extras-commits at redhat.com (Joe Orton (jorton)) Date: Fri, 7 Mar 2008 15:21:40 GMT Subject: rpms/libidn/devel libidn.spec,1.45,1.46 Message-ID: <200803071521.m27FLeVQ019739@cvs-int.fedora.redhat.com> Author: jorton Update of /cvs/extras/rpms/libidn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19721 Modified Files: libidn.spec Log Message: * Fri Mar 7 2008 Joe Orton 0.6.14-6 - drop libidn.a - move shared library to /lib{,64} (#283651) Index: libidn.spec =================================================================== RCS file: /cvs/extras/rpms/libidn/devel/libidn.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- libidn.spec 7 Feb 2008 15:19:20 -0000 1.45 +++ libidn.spec 7 Mar 2008 15:21:05 -0000 1.46 @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.14 -Release: 5 +Release: 6 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -41,7 +41,7 @@ %build # Must re-bootstrap to get multilib-aware libtool autoreconf -%configure --disable-csharp +%configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} %check @@ -49,7 +49,7 @@ %install rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig # provide more examples make %{?_smp_mflags} -C examples distclean @@ -61,9 +61,15 @@ # Make multilib safe: sed -i '/gnu compiler/d' $RPM_BUILD_ROOT%{_includedir}/idn-int.h -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ +rm -f $RPM_BUILD_ROOT/%{_lib}/*.la \ $RPM_BUILD_ROOT%{_datadir}/info/*.png +mkdir -p $RPM_BUILD_ROOT%{_libdir} +mv $RPM_BUILD_ROOT/%{_lib}/libidn.so $RPM_BUILD_ROOT%{_libdir} + +lib=`echo $RPM_BUILD_ROOT/%{_lib}/libidn.so.*.*` +ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libidn.so + %find_lang %{name} %post @@ -86,19 +92,22 @@ %{_bindir}/idn %{_mandir}/man1/idn.1* %{_datadir}/emacs/site-lisp -%{_libdir}/libidn.so.* +/%{_lib}/libidn.so.* %{_infodir}/%{name}.info.gz %files devel %defattr(0644,root,root,755) %doc doc/libidn.html examples %{_libdir}/libidn.so -%{_libdir}/libidn.a %{_includedir}/*.h %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/* %changelog +* Fri Mar 7 2008 Joe Orton 0.6.14-6 +- drop libidn.a +- move shared library to /lib{,64} (#283651) + * Thu Feb 7 2008 Joe Orton 0.6.14-5 - fix DT_RPATH in /usr/bin/idn - convert libidn.iconv to UTF-8 (Jon Ciesla, #226029) From fedora-extras-commits at redhat.com Fri Mar 7 15:26:02 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Fri, 7 Mar 2008 15:26:02 GMT Subject: rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.57,1.58 Message-ID: <200803071526.m27FQ2xu019893@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19873 Modified Files: java-1.7.0-icedtea.spec Log Message: * Fri Mar 07 2008 Lillian Angel - 1.7.0.0-0.29.b2 - Set gcjbootstrap to 1 if arch is ppc. Index: java-1.7.0-icedtea.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- java-1.7.0-icedtea.spec 7 Mar 2008 14:57:32 -0000 1.57 +++ java-1.7.0-icedtea.spec 7 Mar 2008 15:25:21 -0000 1.58 @@ -2,6 +2,9 @@ # java-1.5.0-gcj-devel. If gcjbootstrap is 0 IcedTea is built against # java-1.7.0-icedtea-devel. %define gcjbootstrap 0 +%ifarch ppc +%define gcjbootstrap 1 +%endif %define icedteaver 1.6 %define icedteasnapshot -391090a3755dc38d1ba3c7fb8feb2c505fe3c795 @@ -744,6 +747,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Fri Mar 07 2008 Lillian Angel - 1.7.0.0-0.29.b2 +- Set gcjbootstrap to 1 if arch is ppc. + * Fri Mar 07 2008 Lillian Angel - 1.7.0.0-0.29.b24 - Updated icedteasnapshot - Updated release From fedora-extras-commits at redhat.com Fri Mar 7 15:29:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 15:29:12 +0000 Subject: [pkgdb] xine-lib: rdieter has requested commit Message-ID: <200803071531.m27FV3ZT003562@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the commit acl on xine-lib (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib From fedora-extras-commits at redhat.com Fri Mar 7 15:29:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 15:29:12 +0000 Subject: [pkgdb] xine-lib: rdieter has requested watchbugzilla Message-ID: <200803071531.m27FV3xV003561@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the watchbugzilla acl on xine-lib (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib From fedora-extras-commits at redhat.com Fri Mar 7 15:29:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 15:29:28 +0000 Subject: [pkgdb] xine-lib: rdieter has requested watchcommits Message-ID: <200803071531.m27FV6C1003601@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the watchcommits acl on xine-lib (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib From fedora-extras-commits at redhat.com Fri Mar 7 15:32:02 2008 From: fedora-extras-commits at redhat.com (Krzysztof Kurzawski (kurzawa)) Date: Fri, 7 Mar 2008 15:32:02 GMT Subject: rpms/taskcoach/F-7 taskcoach.spec,1.4,1.5 Message-ID: <200803071532.m27FW2wd020069@cvs-int.fedora.redhat.com> Author: kurzawa Update of /cvs/pkgs/rpms/taskcoach/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20040 Modified Files: taskcoach.spec Log Message: Bumping release Index: taskcoach.spec =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/F-7/taskcoach.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- taskcoach.spec 6 Mar 2008 16:04:18 -0000 1.4 +++ taskcoach.spec 7 Mar 2008 15:31:25 -0000 1.5 @@ -3,7 +3,7 @@ Name: taskcoach Version: 0.69.1 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Your friendly task manager Summary(pl): Tw??j przyjazny menad??er zada?? Group: Applications/Productivity @@ -87,6 +87,9 @@ %exclude %{python_sitelib}/buildlib/ %changelog +* Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-2.1 +- Bumping release + * Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-2 - Increase release From fedora-extras-commits at redhat.com Fri Mar 7 15:33:49 2008 From: fedora-extras-commits at redhat.com (Krzysztof Kurzawski (kurzawa)) Date: Fri, 7 Mar 2008 15:33:49 GMT Subject: rpms/taskcoach/F-8 taskcoach.spec,1.2,1.3 Message-ID: <200803071533.m27FXn5j020175@cvs-int.fedora.redhat.com> Author: kurzawa Update of /cvs/pkgs/rpms/taskcoach/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20141 Modified Files: taskcoach.spec Log Message: Increase release Index: taskcoach.spec =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/F-8/taskcoach.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- taskcoach.spec 21 Feb 2008 16:14:08 -0000 1.2 +++ taskcoach.spec 7 Mar 2008 15:33:10 -0000 1.3 @@ -2,8 +2,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: taskcoach -Version: 0.68.0 -Release: 7%{?dist} +Version: 0.69.1 +Release: 2%{?dist} Summary: Your friendly task manager Summary(pl): Tw??j przyjazny menad??er zada?? Group: Applications/Productivity @@ -87,6 +87,12 @@ %exclude %{python_sitelib}/buildlib/ %changelog +* Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-2 +- Increase release + +* Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-1 +- Update to 0.69.1 + * Thu Feb 21 2008 Krzysztof Kurzawski 0.68.0-7 - Correct license From fedora-extras-commits at redhat.com Fri Mar 7 15:34:11 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 7 Mar 2008 15:34:11 GMT Subject: rpms/shadow-utils/devel shadow-4.1.0-fasterReset.patch,NONE,1.1 Message-ID: <200803071534.m27FYBMJ020201@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/shadow-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20185 Added Files: shadow-4.1.0-fasterReset.patch Log Message: add faster reset patch shadow-4.1.0-fasterReset.patch: --- NEW FILE shadow-4.1.0-fasterReset.patch --- diff -up shadow-4.1.0/src/faillog.c.fasterReset shadow-4.1.0/src/faillog.c --- shadow-4.1.0/src/faillog.c.fasterReset 2008-03-04 14:08:55.000000000 +0100 +++ shadow-4.1.0/src/faillog.c 2008-03-04 14:11:13.000000000 +0100 @@ -164,8 +164,13 @@ static void reset (void) if (uflg) reset_one (user); - else - for (uid = 0; reset_one (uid); uid++); + else { + struct passwd *pwent; + + setpwent (); + while ( pwent = getpwent () ) + reset_one (pwent->pw_uid); + } } static void print (void) From fedora-extras-commits at redhat.com Fri Mar 7 15:39:55 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 7 Mar 2008 15:39:55 GMT Subject: rpms/kaffeine/F-7 kaffeine.spec,1.6,1.7 Message-ID: <200803071539.m27FdtXo020364@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kaffeine/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20337 Modified Files: kaffeine.spec Log Message: * Fri Mar 07 2008 Rex Dieter 0.8.6-3 - fix deps wrt kaffeine-libs (#436442) - f7: xcb support (#373411) Index: kaffeine.spec =================================================================== RCS file: /cvs/pkgs/rpms/kaffeine/F-7/kaffeine.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kaffeine.spec 22 Feb 2008 18:07:55 -0000 1.6 +++ kaffeine.spec 7 Mar 2008 15:39:16 -0000 1.7 @@ -13,7 +13,7 @@ #define nonfree 1 Version: 0.8.6 -Release: 1%{?dist} +Release: 3%{?dist} %if "%{?nonfree:1}" != "1" # Fedora Review: http://bugzilla.redhat.com/213432 @@ -34,7 +34,7 @@ BuildRequires: cdparanoia-devel cdparanoia BuildRequires: libvorbis-devel BuildRequires: xine-lib-devel -%if 0%{?fedora} > 7 +%if 0%{?fedora} > 6 BuildRequires: libxcb-devel %endif # dvb @@ -51,21 +51,21 @@ Requires(hint): libdvdcss # extra/nonfree codec support Requires(hint): xine-lib-extras-nonfree +%endif + +%description +Nonfree support bits for kaffeine, including DVD playback, MP3 +decoding, as well as extended audio/video codec support. + %else + %if 0%{?libs} Requires: %{name}-libs = %{version}-%{release} %else Obsoletes: %{name}-libs < %{version}-%{release} Provides: %{name}-libs = %{version}-%{release} %endif -%endif - -%description -Nonfree support bits for kaffeine, including DVD playback, MP3 -decoding, as well as extended audio/video codec support. - -%else %description Kaffeine is a xine-based media player for KDE. It plays back CDs, and VCDs, and can decode all (local or streamed) multimedia formats @@ -86,7 +86,6 @@ %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -Requires: kdelibs3 >= %{version} # helps multilib upgrades Obsoletes: %{name} < %{version}-%{release} # include to be paranoid, installing libs-only is still mostly untested -- Rex @@ -221,6 +220,13 @@ %changelog +* Fri Mar 07 2008 Rex Dieter 0.8.6-3 +- fix deps wrt kaffeine-libs (#436442) +- f7: xcb support (#373411) + +* Tue Feb 19 2008 Fedora Release Engineering - 0.8.6-2 +- Autorebuild for GCC 4.3 + * Sun Jan 20 2008 Rex Dieter 0.8.6-1 - kaffeine-0.8.6 From fedora-extras-commits at redhat.com Fri Mar 7 15:47:54 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 7 Mar 2008 15:47:54 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.2, 1.1440.2.3 Message-ID: <200803071547.m27Fls9h020532@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20503 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org.spec Log Message: add gperf requirement Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440.2.2 retrieving revision 1.1440.2.3 diff -u -r1.1440.2.2 -r1.1440.2.3 --- openoffice.org.spec 7 Mar 2008 14:45:22 -0000 1.1440.2.2 +++ openoffice.org.spec 7 Mar 2008 15:47:16 -0000 1.1440.2.3 @@ -56,7 +56,7 @@ Source4: http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf Source6: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll -BuildRequires: zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++ +BuildRequires: zip, findutils, autoconf, flex, bison, gperf, ant, icu, gcc-c++ BuildRequires: perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, bc BuildRequires: gdb, %{java_devel}, zlib-devel, vigra-devel, hsqldb, libXt-devel BuildRequires: freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh @@ -64,7 +64,7 @@ BuildRequires: libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel BuildRequires: libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel BuildRequires: evolution-data-server-devel, libxslt-devel, desktop-file-utils -BuildRequires: libxslt-devel, db4-devel, xulrunner-devel, libwpd-devel, +BuildRequires: libxslt-devel, db4-devel, xulrunner-devel, libwpd-devel BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel BuildRequires: perl-Archive-Zip, libtextcat-devel, nss-devel >= 3.11.7-8 BuildRequires: xerces-j2, hyphen-devel, openssl-devel, lpsolve-devel From fedora-extras-commits at redhat.com Fri Mar 7 15:49:42 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Fri, 7 Mar 2008 15:49:42 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.47,1.48 Message-ID: <200803071549.m27Fng99020590@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20568 Modified Files: kdebase-workspace.spec Log Message: revert the change, make kickoff default Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- kdebase-workspace.spec 6 Mar 2008 14:45:23 -0000 1.47 +++ kdebase-workspace.spec 7 Mar 2008 15:49:08 -0000 1.48 @@ -17,7 +17,6 @@ Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch Patch3: kdebase-workspace-4.0.2-Gestures.patch Patch4: kdebase-workspace-4.0.2-plasma-konsole.patch -Patch5: kdebase-workspace-4.0.2-simplelauch.patch # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu) # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886 @@ -112,7 +111,7 @@ %patch2 -p1 -b .consolekit %patch3 -p1 -b .gestures %patch4 -p1 -b .plasma-konsole -%patch5 -p1 -b .simplelauch +#patch5 -p1 -b .simplelauch # upstream patches %patch100 -p1 -b .kde#155362 @@ -231,7 +230,6 @@ %changelog * Thu Mar 06 2008 Than Ngo 4.0.2-5 - typo fix -- make the simple menu the default * Tue Mar 04 2008 Than Ngo 4.0.2-4 - disable gestures as default From fedora-extras-commits at redhat.com Fri Mar 7 16:07:15 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 16:07:15 GMT Subject: rpms/kdeedu/devel kdeedu.spec,1.85,1.86 Message-ID: <200803071607.m27G7Ffs028055@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28025/devel Modified Files: kdeedu.spec Log Message: * Fri Mar 07 2008 Kevin Kofler 4.0.2-2 - reenable BR openbabel-devel - add BR gpsd-devel (for marble), libnova-devel (for KStars) Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- kdeedu.spec 28 Feb 2008 18:08:27 -0000 1.85 +++ kdeedu.spec 7 Mar 2008 16:06:39 -0000 1.86 @@ -1,7 +1,7 @@ Name: kdeedu Summary: Educational/Edutainment applications Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Amusements/Games @@ -27,16 +27,17 @@ BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: giflib-devel +BuildRequires: gpsd-devel BuildRequires: kdelibs4-devel >= %{version} # for macros.kde4 BuildRequires: kde-filesystem +BuildRequires: libnova-devel BuildRequires: libusb-devel # FIXME: OCaml is needed by Kalzium #ifarch alpha armv4l %{ix86} ia64 x86_64 ppc sparc #BuildRequires: ocaml(compiler) #endif -# FIXME: build fails with openbabel-devel installed -- Rex -#BuildRequires: openbabel-devel +BuildRequires: openbabel-devel BuildRequires: pcre-devel BuildRequires: python-devel python BuildRequires: readline-devel @@ -159,6 +160,10 @@ %changelog +* Fri Mar 07 2008 Kevin Kofler 4.0.2-2 +- reenable BR openbabel-devel +- add BR gpsd-devel (for marble), libnova-devel (for KStars) + * Thu Feb 28 2008 Than Ngo 4.0.2-1 - 4.0.2 From fedora-extras-commits at redhat.com Fri Mar 7 16:10:03 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 7 Mar 2008 16:10:03 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.53, 1.54 sources, 1.65, 1.66 system-config-services.spec, 1.64, 1.65 Message-ID: <200803071610.m27GA3iE028171@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28133 Modified Files: .cvsignore sources system-config-services.spec Log Message: don't warn about xinetd not installed/running with disabled xinetd services in the list Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 6 Mar 2008 15:42:58 -0000 1.53 +++ .cvsignore 7 Mar 2008 16:09:26 -0000 1.54 @@ -1 +1 @@ -system-config-services-0.99.7.tar.bz2 +system-config-services-0.99.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 6 Mar 2008 15:42:58 -0000 1.65 +++ sources 7 Mar 2008 16:09:26 -0000 1.66 @@ -1 +1 @@ -e6bf82b4ff8b90fd6f6c8078cad52468 system-config-services-0.99.7.tar.bz2 +be087bfd8be1d6a92e7d49d3a2a1d368 system-config-services-0.99.8.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- system-config-services.spec 6 Mar 2008 15:42:58 -0000 1.64 +++ system-config-services.spec 7 Mar 2008 16:09:26 -0000 1.65 @@ -16,7 +16,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.7 +Version: 0.99.8 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -107,6 +107,10 @@ %{_mandir}/*/system-config-services.8* %changelog +* Fri Mar 07 2008 Nils Philippsen - 0.99.8-1 +- don't warn about xinetd not installed/running with disabled xinetd services + in the list + * Thu Mar 06 2008 Nils Philippsen - 0.99.7-1 - update online documentation - reload xinetd on changing xinetd services From fedora-extras-commits at redhat.com Fri Mar 7 16:10:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 16:10:46 +0000 Subject: [pkgdb] xine-lib had acl change status Message-ID: <200803071612.m27GCb1o004881@bastion.fedora.phx.redhat.com> Aurelien Bompard (abompard) has set the commit acl on xine-lib (Fedora devel) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib From fedora-extras-commits at redhat.com Fri Mar 7 16:10:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 16:10:48 +0000 Subject: [pkgdb] xine-lib had acl change status Message-ID: <200803071612.m27GCb1s004881@bastion.fedora.phx.redhat.com> Aurelien Bompard (abompard) has set the approveacls acl on xine-lib (Fedora devel) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib From fedora-extras-commits at redhat.com Fri Mar 7 16:10:59 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 7 Mar 2008 16:10:59 GMT Subject: rpms/totem/devel totem.spec,1.169,1.170 Message-ID: <200803071610.m27GAxnR028249@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28179 Modified Files: totem.spec Log Message: * Fri Mar 07 2008 - Bastien Nocera - 2.23.0-2 - Re-add missing nautilus files section - Fix obsoletes and provides to upgrade from the broken 2.21.96 packages Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- totem.spec 5 Mar 2008 12:11:23 -0000 1.169 +++ totem.spec 7 Mar 2008 16:10:21 -0000 1.170 @@ -10,7 +10,7 @@ Summary: Movie player for GNOME Name: totem Version: 2.23.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exception Group: Applications/Multimedia URL: http://www.gnome.org/projects/totem/ @@ -76,6 +76,8 @@ Summary: Gstreamer backend for Totem Group: Applications/Multimedia Provides: %{name}-backend +Provides: %{name}-gstreamer +Obsoletes: %{name}-gstreamer < 2.23.0 Requires: %{name} = %{version} Requires: gstreamer >= %gstreamer_version Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version @@ -92,6 +94,8 @@ Summary: Gstreamer backend for Totem Group: Applications/Multimedia Provides: %{name}-backend +Provides: %{name}-xine +Obsoletes: %{name}-xine < 2.23.0 Requires: %{name} = %{version} Requires: xine-lib >= %{xine_version} BuildRequires: xine-lib-devel >= %{xine_version} @@ -171,6 +175,10 @@ Summary: Video and Audio Properties tab for Nautilus Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} +Provides: totem-nautilus-xine +Provides: totem-nautilus-gstreamer +Obsoletes: totem-nautilus-xine < 2.23.0 +Obsoletes: totem-nautilus-gstreamer < 2.23.0 %description nautilus A Nautilus extension that shows the properties of audio and video files in??? @@ -357,7 +365,6 @@ %{_bindir}/%{name}-audio-preview %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/ -%{_libdir}/nautilus/extensions-2.0/*.so* %dir %{_libexecdir}/totem %{_libexecdir}/totem/totem-bugreport.py* %{_libdir}/libbaconvideowidget.so* @@ -376,6 +383,10 @@ %{_mandir}/man1/%{name}.1* %{_mandir}/man1/totem-video-thumbnailer.1.gz +%files nautilus +%defattr(-, root, root) +%{_libdir}/nautilus/extensions-2.0/*.so* + %files galago %defattr(-, root, root) %{_libdir}/totem/plugins/galago @@ -416,6 +427,11 @@ %endif %changelog +* Fri Mar 07 2008 - Bastien Nocera - 2.23.0-2 +- Re-add missing nautilus files section +- Fix obsoletes and provides to upgrade from the broken 2.21.96 + packages + * Tue Mar 04 2008 - Bastien Nocera - 2.23.0-1 - Update to 2.23.0, rework the -gstreamer/-xine backend split to switch libraries instead of having replacements for all the From fedora-extras-commits at redhat.com Fri Mar 7 16:11:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 16:11:01 +0000 Subject: [pkgdb] xine-lib had acl change status Message-ID: <200803071612.m27GCrLH004953@bastion.fedora.phx.redhat.com> Aurelien Bompard (abompard) has set the watchbugzilla acl on xine-lib (Fedora 7) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib From fedora-extras-commits at redhat.com Fri Mar 7 16:11:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 16:11:02 +0000 Subject: [pkgdb] xine-lib had acl change status Message-ID: <200803071612.m27GCrLK004953@bastion.fedora.phx.redhat.com> Aurelien Bompard (abompard) has set the watchcommits acl on xine-lib (Fedora 7) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib From fedora-extras-commits at redhat.com Fri Mar 7 16:11:04 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 16:11:04 +0000 Subject: [pkgdb] xine-lib had acl change status Message-ID: <200803071612.m27GCrLN004953@bastion.fedora.phx.redhat.com> Aurelien Bompard (abompard) has set the commit acl on xine-lib (Fedora 7) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib From fedora-extras-commits at redhat.com Fri Mar 7 16:11:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 16:11:49 +0000 Subject: [pkgdb] xine-lib had acl change status Message-ID: <200803071613.m27GDRvU005043@bastion.fedora.phx.redhat.com> Aurelien Bompard (abompard) has set the commit acl on xine-lib (Fedora 8) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xine-lib From fedora-extras-commits at redhat.com Fri Mar 7 16:19:33 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 7 Mar 2008 16:19:33 GMT Subject: devel/kvm kvm-63-defaults.patch, NONE, 1.1 kvm.spec, 1.47, 1.48 kvm-62-defaults.patch, 1.1, NONE Message-ID: <200803071619.m27GJXhv028403@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/kvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28379 Modified Files: kvm.spec Added Files: kvm-63-defaults.patch Removed Files: kvm-62-defaults.patch Log Message: * Fri Mar 7 2008 Jeremy Katz - 63-2 - Fix the build kvm-63-defaults.patch: --- NEW FILE kvm-63-defaults.patch --- diff -up kvm-63/qemu/vl.c.orig kvm-63/qemu/vl.c --- kvm-63/qemu/vl.c.orig 2008-03-04 03:50:44.000000000 -0500 +++ kvm-63/qemu/vl.c 2008-03-07 11:18:10.000000000 -0500 @@ -191,8 +191,8 @@ NICInfo nd_table[MAX_NICS]; int vm_running; static int rtc_utc = 1; static int rtc_date_offset = -1; /* -1 means no change */ -int cirrus_vga_enabled = 1; -int vmsvga_enabled = 0; +int cirrus_vga_enabled = 0; +int vmsvga_enabled = 1; #ifdef TARGET_SPARC int graphic_width = 1024; int graphic_height = 768; Index: kvm.spec =================================================================== RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- kvm.spec 5 Mar 2008 19:19:56 -0000 1.47 +++ kvm.spec 7 Mar 2008 16:18:54 -0000 1.48 @@ -1,13 +1,13 @@ Summary: Kernel-based Virtual Machine Name: kvm Version: 63 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: Development/Tools URL: http://%{name}.sf.net Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.modules -Patch0: kvm-62-defaults.patch +Patch0: kvm-63-defaults.patch Patch1: %{name}-bootmenu.patch Patch2: %{name}-62-block-rw-range-check.patch Patch3: %{name}-62-e1000-default.patch @@ -97,6 +97,9 @@ %{_sysconfdir}/sysconfig/modules/%{name}.modules %changelog +* Fri Mar 7 2008 Jeremy Katz - 63-2 +- Fix the build + * Wed Mar 5 2008 Jeremy Katz - 63-1 - Update to kvm-63 --- kvm-62-defaults.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 7 16:20:28 2008 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 7 Mar 2008 16:20:28 GMT Subject: rpms/yum-utils/devel yum-downloader-archlist.patch, 1.3, 1.4 yum-utils.spec, 1.32, 1.33 Message-ID: <200803071620.m27GKSnv028479@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28454 Modified Files: yum-downloader-archlist.patch yum-utils.spec Log Message: it works this time, we swear yum-downloader-archlist.patch: Index: yum-downloader-archlist.patch =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-downloader-archlist.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- yum-downloader-archlist.patch 7 Mar 2008 04:13:53 -0000 1.3 +++ yum-downloader-archlist.patch 7 Mar 2008 16:20:21 -0000 1.4 @@ -1,6 +1,14 @@ ---- a/yumdownloader.py 2008-03-06 22:48:24.000000000 -0500 -+++ b/yumdownloader.py 2008-03-06 14:34:12.000000000 -0500 -@@ -64,9 +64,12 @@ +--- a/yumdownloader.py 2008-01-30 01:03:15.000000000 -0500 ++++ b/yumdownloader.py 2008-03-07 10:54:06.000000000 -0500 +@@ -26,6 +26,7 @@ + from urlgrabber.progress import TextMeter + import shutil + ++import rpmUtils + + class YumDownloader(YumUtilBase): + NAME = 'yumdownloader' +@@ -64,9 +65,12 @@ self.logger.error("Error: Could not make cachedir, exiting") sys.exit(50) self.repos.setCacheDir(cachedir) @@ -15,7 +23,7 @@ # Setup yum (Ts, RPM db, Repo & Sack) self.doUtilYumSetup(opts) # Setup source repos -@@ -116,14 +119,12 @@ +@@ -116,14 +120,12 @@ def downloadPackages(self,opts): @@ -31,7 +39,7 @@ installable = yum.misc.unique(exactmatch + matched) if len(unmatched) > 0: # if we get back anything in unmatched, it fails self.logger.error('No Match for argument %s' % pkg) -@@ -158,9 +159,12 @@ class YumDownloader(YumUtilBase): +@@ -158,9 +160,12 @@ if toActOn: if opts.source: toDownload.extend(self.bestPackagesFromList(toActOn, 'src')) @@ -45,7 +53,7 @@ # If the user supplies to --resolve flag, resolve dependencies for # all packages # note this might require root access because the headers need to be -@@ -215,18 +216,18 @@ +@@ -215,18 +220,20 @@ size=os.stat(path).st_size) shutil.copy2(path, local) progress.end(progress.size) @@ -63,11 +71,13 @@ if opts.source: archlist = rpmUtils.arch.getArchList() + ['src'] + elif opts.archlist: -+ archlist = opts.archlist.split(',') ++ archlist = [] ++ for a in opts.archlist.split(','): ++ archlist.extend(rpmUtils.arch.getArchList(a)) else: archlist = rpmUtils.arch.getArchList() self._getSacks(archlist=archlist) -@@ -251,7 +252,8 @@ +@@ -251,7 +258,8 @@ help='resolve dependencies and download required packages') parser.add_option("--source", default=False, dest="source", action="store_true", help='operate on source packages') Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- yum-utils.spec 7 Mar 2008 04:13:53 -0000 1.32 +++ yum-utils.spec 7 Mar 2008 16:20:21 -0000 1.33 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 1.1.11 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -402,6 +402,9 @@ %changelog +* Fri Mar 7 2008 Seth Vidal +- once more, with feeling + * Thu Mar 06 2008 Jesse Keating - 1.1.11-4 - Update yumdownloader to git HEAD for complete archlist support. From fedora-extras-commits at redhat.com Fri Mar 7 16:21:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 16:21:01 +0000 Subject: [pkgdb] kernel had acl change status Message-ID: <200803071622.m27GMdQ1005391@bastion.fedora.phx.redhat.com> Dave Jones (davej) has set the watchcommits acl on kernel (Fedora devel) to Approved for Mark McLoughlin (markmc) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kernel From fedora-extras-commits at redhat.com Fri Mar 7 16:20:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 16:20:50 +0000 Subject: [pkgdb] kernel had acl change status Message-ID: <200803071622.m27GMfhj005418@bastion.fedora.phx.redhat.com> Dave Jones (davej) has set the commit acl on kernel (Fedora devel) to Approved for Mark McLoughlin (markmc) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/kernel From fedora-extras-commits at redhat.com Fri Mar 7 16:23:53 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Fri, 7 Mar 2008 16:23:53 GMT Subject: rpms/system-config-printer/F-8 system-config-printer-0.7.74.x.patch, 1.8, 1.9 system-config-printer.spec, 1.162, 1.163 system-config-printer-state-reasons.patch, 1.1, NONE Message-ID: <200803071623.m27GNriA028624@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28596 Modified Files: system-config-printer.spec Added Files: system-config-printer-0.7.74.x.patch Removed Files: system-config-printer-state-reasons.patch Log Message: * Fri Mar 7 2008 Tim Waugh 0.7.74.11-3 - Include troubleshooter from SVN. system-config-printer-0.7.74.x.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 system-config-printer-0.7.74.x.patch Index: system-config-printer-0.7.74.x.patch =================================================================== RCS file: system-config-printer-0.7.74.x.patch diff -N system-config-printer-0.7.74.x.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ system-config-printer-0.7.74.x.patch 7 Mar 2008 16:23:45 -0000 1.9 @@ -0,0 +1,54299 @@ +diff -up system-config-printer-0.7.74.11/Makefile.am.0.7.74.x system-config-printer-0.7.74.11/Makefile.am +--- system-config-printer-0.7.74.11/Makefile.am.0.7.74.x 2008-03-03 17:52:19.000000000 +0000 ++++ system-config-printer-0.7.74.11/Makefile.am 2008-03-07 15:57:24.000000000 +0000 +@@ -4,17 +4,41 @@ nobase_pkgdata_SCRIPTS= \ + ppds.py \ + pysmb.py \ + system-config-printer.py \ ++ troubleshoot/__init__.py \ + applet.py + +-nobase_pkgdata_DATA= \ +- config.py \ +- cupsd.py \ +- cupshelpers.py \ +- options.py \ +- optionwidgets.py \ +- probe_printer.py \ +- gtk_label_autowrap.py \ +- system-config-printer.glade \ ++nobase_pkgdata_DATA= \ ++ config.py \ ++ cupsd.py \ ++ cupshelpers.py \ ++ options.py \ ++ optionwidgets.py \ ++ probe_printer.py \ ++ gtk_label_autowrap.py \ ++ statereason.py \ ++ system-config-printer.glade \ ++ troubleshoot/base.py \ ++ troubleshoot/CheckLocalServerPublishing.py \ ++ troubleshoot/CheckNetworkServerSanity.py \ ++ troubleshoot/CheckPPDSanity.py \ ++ troubleshoot/CheckPrinterSanity.py \ ++ troubleshoot/ChooseNetworkPrinter.py \ ++ troubleshoot/ChoosePrinter.py \ ++ troubleshoot/DeviceListed.py \ ++ troubleshoot/ErrorLogCheckpoint.py \ ++ troubleshoot/ErrorLogFetch.py \ ++ troubleshoot/ErrorLogParse.py \ ++ troubleshoot/LocalOrRemote.py \ ++ troubleshoot/NetworkCUPSPrinterShared.py \ ++ troubleshoot/PrinterStateReasons.py \ ++ troubleshoot/PrintTestPage.py \ ++ troubleshoot/QueueNotEnabled.py \ ++ troubleshoot/QueueRejectingJobs.py \ ++ troubleshoot/RemoteAddress.py \ ++ troubleshoot/SchedulerNotRunning.py \ ++ troubleshoot/ServerFirewalled.py \ ++ troubleshoot/Shrug.py \ ++ troubleshoot/Welcome.py \ + applet.glade + + nobase_sbin_SCRIPTS=\ +diff -up system-config-printer-0.7.74.11/po/de.po.0.7.74.x system-config-printer-0.7.74.11/po/de.po +--- system-config-printer-0.7.74.11/po/de.po.0.7.74.x 2008-03-03 17:52:19.000000000 +0000 ++++ system-config-printer-0.7.74.11/po/de.po 2008-03-07 15:57:24.000000000 +0000 +@@ -14,7 +14,7 @@ msgid "" + msgstr "" + "Project-Id-Version: system-config-printer.trunk.de\n" + "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n" +-"POT-Creation-Date: 2008-03-03 17:48+0000\n" ++"POT-Creation-Date: 2008-03-07 15:46+0000\n" + "PO-Revision-Date: 2008-01-29 22:35+0100\n" + "Last-Translator: Fabian Affolter \n" + "Language-Team: \n" +@@ -30,7 +30,7 @@ msgstr "" + msgid "Idle" + msgstr "Bereit" + +-#: ../cupshelpers.py:28 ../applet.py:731 ++#: ../cupshelpers.py:28 ../troubleshoot/PrintTestPage.py:35 ../applet.py:640 + msgid "Processing" + msgstr "Verarbeite" + +@@ -38,11 +38,18 @@ msgstr "Verarbeite" + msgid "Busy" + msgstr "Besch??ftigt" + +-#: ../cupshelpers.py:30 ../applet.py:732 ++#: ../cupshelpers.py:30 ../troubleshoot/PrintTestPage.py:36 ../applet.py:641 + msgid "Stopped" + msgstr "Angehalten" + +-#: ../cupshelpers.py:47 ../applet.py:741 ++#: ../cupshelpers.py:47 ../troubleshoot/ChooseNetworkPrinter.py:96 ++#: ../troubleshoot/ChooseNetworkPrinter.py:97 ++#: ../troubleshoot/ChooseNetworkPrinter.py:100 ++#: ../troubleshoot/ChooseNetworkPrinter.py:101 ++#: ../troubleshoot/ChoosePrinter.py:85 ../troubleshoot/ChoosePrinter.py:86 ++#: ../troubleshoot/ChoosePrinter.py:89 ../troubleshoot/ChoosePrinter.py:90 ++#: ../troubleshoot/DeviceListed.py:84 ../troubleshoot/DeviceListed.py:85 ++#: ../applet.py:650 + msgid "Unknown" + msgstr "Unbekannt" + +@@ -59,11 +66,12 @@ msgid "_Set Default" + msgstr "_Standard setzen" + + #: ../my-default-printer.py:148 ../system-config-printer.glade.h:198 +-#: ../applet.py:186 ../applet.py:226 ++#: ../troubleshoot/PrintTestPage.py:73 ../applet.py:95 ../applet.py:135 + msgid "Printer" + msgstr "Drucker" + +-#: ../my-default-printer.py:152 ++#: ../my-default-printer.py:152 ../troubleshoot/ChooseNetworkPrinter.py:37 ++#: ../troubleshoot/ChoosePrinter.py:38 + msgid "Location" + msgstr "Ort" + +@@ -186,20 +194,20 @@ msgstr "" + "wenn diese Konflikte gel??st werden." + + #: ../system-config-printer.py:1288 ../system-config-printer.py:1304 +-#: ../applet.py:349 ++#: ../applet.py:258 + msgid "Not authorized" + msgstr "Nicht berechtigt" + +-#: ../system-config-printer.py:1289 ../applet.py:350 ++#: ../system-config-printer.py:1289 ../applet.py:259 + msgid "The password may be incorrect." + msgstr "Das Passwort ist wom??glich falsch." + + #: ../system-config-printer.py:1292 ../system-config-printer.py:1325 +-#: ../applet.py:353 ++#: ../applet.py:262 + msgid "CUPS server error" + msgstr "CUPS-Serverfehler" + +-#: ../system-config-printer.py:1293 ../applet.py:354 ++#: ../system-config-printer.py:1293 ../applet.py:263 + #, python-format + msgid "There was an error during the CUPS operation: '%s'." + msgstr "Beim Betrieb von CUPS trat ein Fehler auf: '%s'." +@@ -297,6 +305,7 @@ msgid "Cancel Tests" + msgstr "Tests abbrechen" + + #: ../system-config-printer.py:1820 ../system-config-printer.glade.h:197 ++#: ../troubleshoot/PrintTestPage.py:61 + msgid "Print Test Page" + msgstr "Testseite drucken" + +@@ -829,7 +838,7 @@ msgstr "Beschreibung:" + msgid "Device" + msgstr "Ger??t" + +-#: ../system-config-printer.glade.h:103 ++#: ../system-config-printer.glade.h:103 ../troubleshoot/DeviceListed.py:40 + msgid "Device URI" + msgstr "Ger??te-URI" + +@@ -981,6 +990,8 @@ msgid "More" + msgstr "Mehr" + + #: ../system-config-printer.glade.h:144 ++#: ../troubleshoot/ChooseNetworkPrinter.py:35 ++#: ../troubleshoot/ChoosePrinter.py:36 ../troubleshoot/DeviceListed.py:36 + msgid "Name" + msgstr "Name" + +@@ -1090,7 +1101,8 @@ msgstr "Seiten pro Seite:" + msgid "Parity" + msgstr "Parit??t" + +-#: ../system-config-printer.glade.h:187 ../applet.glade.h:5 ++#: ../system-config-printer.glade.h:187 ../troubleshoot/Welcome.py:64 ++#: ../applet.glade.h:5 + msgid "Password:" + msgstr "Passwort:" + +@@ -1363,235 +1375,611 @@ msgstr "Drucker konfigurieren" + msgid "Printing" + msgstr "Drucken" + +-#: ../applet.py:80 ++#: ../statereason.py:73 + msgid "Toner low" + msgstr "Wenig Toner" + +-#: ../applet.py:81 ++#: ../statereason.py:74 + #, python-format + msgid "Printer '%s' is low on toner." + msgstr "Drucker '%s' hat nur noch wenig Toner" + +-#: ../applet.py:82 ++#: ../statereason.py:75 + msgid "Toner empty" + msgstr "Toner leer" + +-#: ../applet.py:83 [...53906 lines suppressed...] ++ ++ def _dump_answers (self): ++ debugprint (self.answers_as_text ()) ++ ++ def _report_traceback (self): ++ print "Traceback:" ++ (type, value, tb) = sys.exc_info () ++ tblast = traceback.extract_tb (tb, limit=None) ++ if len (tblast): ++ tblast = tblast[:len (tblast) - 1] ++ extxt = traceback.format_exception_only (type, value) ++ for line in traceback.format_tb(tb): ++ print line.strip () ++ print extxt[0].strip () ++ ++ def _display (self, question): ++ result = False ++ try: ++ result = question.display () ++ except: ++ self._report_traceback () ++ ++ question.displayed = result ++ return result ++ ++ def _can_click_forward (self, question): ++ try: ++ return question.can_click_forward () ++ except: ++ self._report_traceback () ++ return True ++ ++ def _collect_answer (self, question): ++ try: ++ return question.collect_answer () ++ except: ++ self._report_traceback () ++ return {} ++ ++QUESTIONS = ["Welcome", ++ "SchedulerNotRunning", ++ "CheckLocalServerPublishing", ++ "ChoosePrinter", ++ "CheckPrinterSanity", ++ "CheckPPDSanity", ++ ++ "LocalOrRemote", ++ "DeviceListed", ++ "RemoteAddress", ++ "CheckNetworkServerSanity", ++ "ChooseNetworkPrinter", ++ ++ "NetworkCUPSPrinterShared", ++ ++ "QueueNotEnabled", ++ "QueueRejectingJobs", ++ "PrinterStateReasons", ++ ++ "ServerFirewalled", ++ "ErrorLogCheckpoint", ++ "PrintTestPage", ++ "ErrorLogFetch", ++ "PrinterStateReasons", ++ "ErrorLogParse", ++ "Shrug"] ++ ++def run (quitfn=None): ++ troubleshooter = Troubleshooter (quitfn) ++ modules_imported = [] ++ for module in QUESTIONS: ++ try: ++ if not module in modules_imported: ++ exec ("from %s import %s" % (module, module)) ++ exec ("%s.debug = %d" % (module, debug)) ++ modules_imported.append (module) ++ ++ exec ("%s (troubleshooter)" % module) ++ except: ++ troubleshooter._report_traceback () ++ return troubleshooter ++ ++if __name__ == "__main__": ++ import sys, getopt ++ base.debug = 0 ++ try: ++ opts, args = getopt.gnu_getopt (sys.argv[1:], '', ++ ['debug']) ++ for opt, optarg in opts: ++ if opt == '--debug': ++ base.debug = 1 ++ except getopt.GetoptError: ++ pass ++ ++ import os.path ++ if sys.argv[0][0] != '/': ++ cwd = os.getcwd () ++ path = cwd + os.path.sep + sys.argv[0] ++ else: ++ path = sys.argv[0] ++ sub = os.path.dirname (path) ++ root = os.path.dirname (sub) ++ debugprint ("Appending %s to path" % root) ++ sys.path.append (root) ++ run (gtk.main_quit) ++ gtk.main () +diff -up /dev/null system-config-printer-0.7.74.11/troubleshoot/Shrug.py +--- /dev/null 2008-03-07 08:53:00.682001298 +0000 ++++ system-config-printer-0.7.74.11/troubleshoot/Shrug.py 2008-03-07 15:57:24.000000000 +0000 +@@ -0,0 +1,91 @@ ++#!/usr/bin/env python ++ ++## Printing troubleshooter ++ ++## Copyright (C) 2008 Red Hat, Inc. ++## Copyright (C) 2008 Tim Waugh ++ ++## This program is free software; you can redistribute it and/or modify ++## it under the terms of the GNU General Public License as published by ++## the Free Software Foundation; either version 2 of the License, or ++## (at your option) any later version. ++ ++## This program is distributed in the hope that it will be useful, ++## but WITHOUT ANY WARRANTY; without even the implied warranty of ++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++## GNU General Public License for more details. ++ ++## You should have received a copy of the GNU General Public License ++## along with this program; if not, write to the Free Software ++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++from base import * ++from base import _ ++class Shrug(Question): ++ def __init__ (self, troubleshooter): ++ Question.__init__ (self, troubleshooter, "Shrug") ++ page = self.initial_vbox (_("Sorry!"), ++ _("I have not been able to work out what " ++ "the problem is, but I have collected " ++ "some useful information to put in a " ++ "bug report.")) ++ ++ sw = gtk.ScrolledWindow () ++ textview = gtk.TextView () ++ textview.set_editable (False) ++ sw.add (textview) ++ page.pack_start (sw) ++ self.buffer = textview.get_buffer () ++ ++ box = gtk.HButtonBox () ++ box.set_border_width (0) ++ box.set_spacing (3) ++ box.set_layout (gtk.BUTTONBOX_END) ++ page.pack_start (box, False, False, 0) ++ ++ self.copy = gtk.Button (stock='gtk-copy') ++ box.pack_start (self.copy, False, False, 0) ++ ++ self.save = gtk.Button (stock='gtk-save') ++ box.pack_start (self.save, False, False, 0) ++ ++ self.clipboard = gtk.Clipboard () ++ ++ troubleshooter.new_page (page, self) ++ ++ def display (self): ++ self.buffer.set_text (self.troubleshooter.answers_as_text ()) ++ return True ++ ++ def connect_signals (self, handler): ++ self.copy_sigid = self.copy.connect ('clicked', self.on_copy_clicked) ++ self.save_sigid = self.save.connect ('clicked', self.on_save_clicked) ++ ++ def disconnect_signals (self): ++ self.copy.disconnect (self.copy_sigid) ++ self.save.disconnect (self.save_sigid) ++ ++ def on_copy_clicked (self, button): ++ text = self.buffer.get_text (self.buffer.get_start_iter (), ++ self.buffer.get_end_iter ()) ++ self.clipboard.set_text (text) ++ ++ def on_save_clicked (self, button): ++ dialog = gtk.FileChooserDialog (parent=self.troubleshooter.main, ++ action=gtk.FILE_CHOOSER_ACTION_SAVE, ++ buttons=('gtk-cancel', ++ gtk.RESPONSE_CANCEL, ++ 'gtk-save', ++ gtk.RESPONSE_OK)) ++ dialog.set_do_overwrite_confirmation (True) ++ dialog.set_current_name ("troubleshoot.txt") ++ dialog.set_default_response (gtk.RESPONSE_OK) ++ response = dialog.run () ++ dialog.hide () ++ if response != gtk.RESPONSE_OK: ++ return ++ ++ f = file (dialog.get_filename (), "w") ++ f.write (self.buffer.get_text (self.buffer.get_start_iter (), ++ self.buffer.get_end_iter ())) ++ del f Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer.spec,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- system-config-printer.spec 5 Mar 2008 10:15:54 -0000 1.162 +++ system-config-printer.spec 7 Mar 2008 16:23:46 -0000 1.163 @@ -3,7 +3,7 @@ Summary: A printer administration tool Name: system-config-printer Version: 0.7.74.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -11,7 +11,7 @@ Source1: pycups-%{pycups_version}.tar.bz2 Source2: system-config-printer.pam Source3: system-config-printer.console -Patch0: system-config-printer-state-reasons.patch +Patch0: system-config-printer-0.7.74.x.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -53,7 +53,7 @@ %prep %setup -q -a 1 -%patch0 -p1 -b .state-reasons +%patch0 -p1 -b .0.7.74.x %build %configure @@ -124,6 +124,9 @@ exit 0 %changelog +* Fri Mar 7 2008 Tim Waugh 0.7.74.11-3 +- Include troubleshooter from SVN. + * Wed Mar 5 2008 Tim Waugh 0.7.74.11-2 - Updated pycups to 1.9.36. - Include state-reasons work-around fix. --- system-config-printer-state-reasons.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 7 16:29:48 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 16:29:48 GMT Subject: rpms/pyxmms/devel pyxmms.spec,1.5,1.6 Message-ID: <200803071629.m27GTmQG028763@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/pyxmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28728 Modified Files: pyxmms.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 2.06-6 - Handle the egg file. Index: pyxmms.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyxmms/devel/pyxmms.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pyxmms.spec 19 Feb 2008 18:58:30 -0000 1.5 +++ pyxmms.spec 7 Mar 2008 16:29:10 -0000 1.6 @@ -4,7 +4,7 @@ Name: pyxmms Summary: Python Interface to XMMS Version: 2.06 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Development/Libraries URL: http://www.via.ecp.fr/~flo/ @@ -40,8 +40,14 @@ %dir %{python_sitearch}/xmms/ %{python_sitearch}/xmms/*.py* %{python_sitearch}/xmms/*.so +%if 0%{?fedora} >= 9 + %{python_sitearch}/%{name}-%{version}-py2.5.egg-info +%endif %changelog +* Fri Mar 07 2008 Jesse Keating - 2.06-6 +- Handle the egg file. + * Tue Feb 19 2008 Fedora Release Engineering - 2.06-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 16:30:55 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 16:30:55 GMT Subject: rpms/cobbler/EL-4 .cvsignore, 1.31, 1.32 cobbler.spec, 1.38, 1.39 sources, 1.35, 1.36 Message-ID: <200803071630.m27GUtqG028961@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28850/EL-4 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 20 Feb 2008 19:39:35 -0000 1.31 +++ .cvsignore 7 Mar 2008 16:30:21 -0000 1.32 @@ -28,3 +28,4 @@ cobbler-0.6.5.tar.gz cobbler-0.8.0.tar.gz cobbler-0.8.1.tar.gz +cobbler-0.8.2.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- cobbler.spec 20 Feb 2008 19:39:35 -0000 1.38 +++ cobbler.spec 7 Mar 2008 16:30:21 -0000 1.39 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.8.1 +Version: 0.8.2 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,6 +190,9 @@ %changelog +* Fri Mar 07 2008 Michael DeHaan - 0.8.2-1 +- Upstream changes (see CHANGELOG) + * Wed Feb 20 2008 Michael DeHaan - 0.8.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 20 Feb 2008 19:39:35 -0000 1.35 +++ sources 7 Mar 2008 16:30:21 -0000 1.36 @@ -1,2 +1,3 @@ b5c5e3023038778bf2c7a85035a967fd cobbler-0.8.0.tar.gz 507e597da2dcc9eac54e86de465a7859 cobbler-0.8.1.tar.gz +e922caf052f8d6d0e8f199a2eb81bc68 cobbler-0.8.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 16:31:00 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 16:31:00 GMT Subject: rpms/cobbler/EL-5 .cvsignore, 1.35, 1.36 cobbler.spec, 1.40, 1.41 sources, 1.38, 1.39 Message-ID: <200803071631.m27GV0Mh028966@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28850/EL-5 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 20 Feb 2008 19:39:47 -0000 1.35 +++ .cvsignore 7 Mar 2008 16:30:25 -0000 1.36 @@ -32,3 +32,4 @@ cobbler-0.6.5.tar.gz cobbler-0.8.0.tar.gz cobbler-0.8.1.tar.gz +cobbler-0.8.2.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- cobbler.spec 20 Feb 2008 19:39:47 -0000 1.40 +++ cobbler.spec 7 Mar 2008 16:30:25 -0000 1.41 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.8.1 +Version: 0.8.2 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,6 +190,9 @@ %changelog +* Fri Mar 07 2008 Michael DeHaan - 0.8.2-1 +- Upstream changes (see CHANGELOG) + * Wed Feb 20 2008 Michael DeHaan - 0.8.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 20 Feb 2008 19:39:47 -0000 1.38 +++ sources 7 Mar 2008 16:30:25 -0000 1.39 @@ -1,2 +1,3 @@ b5c5e3023038778bf2c7a85035a967fd cobbler-0.8.0.tar.gz 507e597da2dcc9eac54e86de465a7859 cobbler-0.8.1.tar.gz +e922caf052f8d6d0e8f199a2eb81bc68 cobbler-0.8.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 16:31:05 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 16:31:05 GMT Subject: rpms/cobbler/F-7 .cvsignore, 1.31, 1.32 cobbler.spec, 1.38, 1.39 sources, 1.35, 1.36 Message-ID: <200803071631.m27GV5UQ028978@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28850/F-7 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-7/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 20 Feb 2008 19:39:51 -0000 1.31 +++ .cvsignore 7 Mar 2008 16:30:30 -0000 1.32 @@ -28,3 +28,4 @@ cobbler-0.6.5.tar.gz cobbler-0.8.0.tar.gz cobbler-0.8.1.tar.gz +cobbler-0.8.2.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-7/cobbler.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- cobbler.spec 20 Feb 2008 19:39:51 -0000 1.38 +++ cobbler.spec 7 Mar 2008 16:30:30 -0000 1.39 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.8.1 +Version: 0.8.2 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,6 +190,9 @@ %changelog +* Fri Mar 07 2008 Michael DeHaan - 0.8.2-1 +- Upstream changes (see CHANGELOG) + * Wed Feb 20 2008 Michael DeHaan - 0.8.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 20 Feb 2008 19:39:51 -0000 1.35 +++ sources 7 Mar 2008 16:30:30 -0000 1.36 @@ -1,2 +1,3 @@ b5c5e3023038778bf2c7a85035a967fd cobbler-0.8.0.tar.gz 507e597da2dcc9eac54e86de465a7859 cobbler-0.8.1.tar.gz +e922caf052f8d6d0e8f199a2eb81bc68 cobbler-0.8.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 16:31:10 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 16:31:10 GMT Subject: rpms/cobbler/F-8 .cvsignore, 1.31, 1.32 cobbler.spec, 1.37, 1.38 sources, 1.35, 1.36 Message-ID: <200803071631.m27GVAAa028983@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28850/F-8 Modified Files: .cvsignore cobbler.spec sources Log Message: This is 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-8/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 20 Feb 2008 19:39:57 -0000 1.31 +++ .cvsignore 7 Mar 2008 16:30:35 -0000 1.32 @@ -28,3 +28,4 @@ cobbler-0.6.5.tar.gz cobbler-0.8.0.tar.gz cobbler-0.8.1.tar.gz +cobbler-0.8.2.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- cobbler.spec 20 Feb 2008 19:39:57 -0000 1.37 +++ cobbler.spec 7 Mar 2008 16:30:35 -0000 1.38 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.8.1 +Version: 0.8.2 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,6 +190,9 @@ %changelog +* Fri Mar 07 2008 Michael DeHaan - 0.8.2-1 +- Upstream changes (see CHANGELOG) + * Wed Feb 20 2008 Michael DeHaan - 0.8.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 20 Feb 2008 19:39:57 -0000 1.35 +++ sources 7 Mar 2008 16:30:35 -0000 1.36 @@ -1,2 +1,3 @@ b5c5e3023038778bf2c7a85035a967fd cobbler-0.8.0.tar.gz 507e597da2dcc9eac54e86de465a7859 cobbler-0.8.1.tar.gz +e922caf052f8d6d0e8f199a2eb81bc68 cobbler-0.8.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 16:31:15 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 16:31:15 GMT Subject: rpms/cobbler/devel .cvsignore, 1.31, 1.32 cobbler.spec, 1.41, 1.42 sources, 1.36, 1.37 Message-ID: <200803071631.m27GVFU9028990@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/extras/rpms/cobbler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28850/devel Modified Files: .cvsignore cobbler.spec sources Log Message: This is 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 20 Feb 2008 19:40:07 -0000 1.31 +++ .cvsignore 7 Mar 2008 16:30:40 -0000 1.32 @@ -28,3 +28,4 @@ cobbler-0.6.5.tar.gz cobbler-0.8.0.tar.gz cobbler-0.8.1.tar.gz +cobbler-0.8.2.tar.gz Index: cobbler.spec =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- cobbler.spec 20 Feb 2008 19:40:07 -0000 1.41 +++ cobbler.spec 7 Mar 2008 16:30:40 -0000 1.42 @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.8.1 +Version: 0.8.2 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,6 +190,9 @@ %changelog +* Fri Mar 07 2008 Michael DeHaan - 0.8.2-1 +- Upstream changes (see CHANGELOG) + * Wed Feb 20 2008 Michael DeHaan - 0.8.1-1 - Upstream changes (see CHANGELOG) Index: sources =================================================================== RCS file: /cvs/extras/rpms/cobbler/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 20 Feb 2008 19:40:07 -0000 1.36 +++ sources 7 Mar 2008 16:30:40 -0000 1.37 @@ -1,2 +1,3 @@ 045ed56039904e5b65406b035e0527c8 cobbler-0.8.0.tar.gz 507e597da2dcc9eac54e86de465a7859 cobbler-0.8.1.tar.gz +e922caf052f8d6d0e8f199a2eb81bc68 cobbler-0.8.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 16:32:42 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 16:32:42 GMT Subject: rpms/kdeedu/devel kdeedu-4.0.2-openbabel.patch, NONE, 1.1 kdeedu.spec, 1.86, 1.87 Message-ID: <200803071632.m27GWgTk029295@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29263/devel Modified Files: kdeedu.spec Added Files: kdeedu-4.0.2-openbabel.patch Log Message: Fix linking against OpenBabel. kdeedu-4.0.2-openbabel.patch: --- NEW FILE kdeedu-4.0.2-openbabel.patch --- diff -ur kdeedu-4.0.2/kalzium/src/CMakeLists.txt kdeedu-4.0.2-openbabel/kalzium/src/CMakeLists.txt --- kdeedu-4.0.2/kalzium/src/CMakeLists.txt 2008-01-31 00:53:33.000000000 +0100 +++ kdeedu-4.0.2-openbabel/kalzium/src/CMakeLists.txt 2008-03-07 17:29:17.000000000 +0100 @@ -108,9 +108,12 @@ target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KUTILS_LIBRARY} science kdeeduui ) -if (OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND) - target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES} ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro-kalzium) -endif (OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND) +if (OPENBABEL2_FOUND) + target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES}) + if (OPENGL_FOUND AND EIGEN_FOUND) + target_link_libraries(kalzium ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro-kalzium) + endif (OPENGL_FOUND AND EIGEN_FOUND) +endif (OPENBABEL2_FOUND) if(LIBFACILE_FOUND) link_directories (${OCAMLC_DIR}) Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- kdeedu.spec 7 Mar 2008 16:06:39 -0000 1.86 +++ kdeedu.spec 7 Mar 2008 16:32:08 -0000 1.87 @@ -7,6 +7,8 @@ Group: Amusements/Games URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2 +# fix linking against OpenBabel +Patch0: kdeedu-4.0.2-openbabel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # http://bugzilla.redhat.com/371121 @@ -94,6 +96,7 @@ %prep %setup -q -n kdeedu-%{version} +%patch0 -p1 -b .openbabel %build @@ -161,7 +164,7 @@ %changelog * Fri Mar 07 2008 Kevin Kofler 4.0.2-2 -- reenable BR openbabel-devel +- reenable BR openbabel-devel, fix build with it - add BR gpsd-devel (for marble), libnova-devel (for KStars) * Thu Feb 28 2008 Than Ngo 4.0.2-1 From fedora-extras-commits at redhat.com Fri Mar 7 16:36:43 2008 From: fedora-extras-commits at redhat.com (Jakub Jelinek (jakub)) Date: Fri, 7 Mar 2008 16:36:43 GMT Subject: rpms/gcc/devel gcc43-pr35498.patch,NONE,1.1 gcc43.spec,1.21,1.22 Message-ID: <200803071636.m27Gahgn029508@cvs-int.fedora.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29420 Modified Files: gcc43.spec Added Files: gcc43-pr35498.patch Log Message: 4.3.0-2 gcc43-pr35498.patch: --- NEW FILE gcc43-pr35498.patch --- 2008-03-07 Jakub Jelinek PR target/35498 * config/rs6000/rs6000.c (rs6000_expand_compare_and_swapqhi): Shift wdst back after sync_compare_and_swapqhi_internal. --- gcc/config/rs6000/rs6000.c.jj 2008-02-29 09:11:54.000000000 +0100 +++ gcc/config/rs6000/rs6000.c 2008-03-07 17:22:27.000000000 +0100 @@ -13858,6 +13858,9 @@ rs6000_expand_compare_and_swapqhi (rtx d emit_insn (gen_sync_compare_and_swapqhi_internal (wdst, mask, oldval, newval, mem)); + /* Shift the result back. */ + emit_insn (gen_lshrsi3 (wdst, wdst, shift)); + emit_move_insn (dst, gen_lowpart (mode, wdst)); } Index: gcc43.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gcc43.spec 7 Mar 2008 09:08:38 -0000 1.21 +++ gcc43.spec 7 Mar 2008 16:36:09 -0000 1.22 @@ -1,6 +1,6 @@ %define DATE 20080307 %define gcc_version 4.3.0 -%define gcc_release 1 +%define gcc_release 2 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -140,6 +140,7 @@ Patch11: gcc43-rh341221.patch Patch12: gcc43-cpp-pragma.patch Patch13: gcc43-java-debug-iface-type.patch +Patch14: gcc43-pr35498.patch # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. @@ -436,6 +437,7 @@ %patch11 -p0 -b .rh341221~ %patch12 -p0 -b .cpp-pragma~ %patch13 -p0 -b .java-debug-iface-type~ +%patch14 -p0 -b .pr35498~ tar xzf %{SOURCE4} @@ -1649,6 +1651,9 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Fri Mar 7 2008 Jakub Jelinek 4.3.0-2 +- fix ppc/ppc64 8/16 bit sync builtins (PR target/35498) + * Fri Mar 7 2008 Jakub Jelinek 4.3.0-1 - gcc 4.3.0 release - PRs c++/35244, c++/35315, c++/35323, c++/35333, c++/35338, driver/35420, From fedora-extras-commits at redhat.com Fri Mar 7 16:36:51 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 16:36:51 GMT Subject: rpms/openser/devel openser.spec,1.10,1.11 Message-ID: <200803071636.m27GapOI029519@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/openser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429 Modified Files: openser.spec Log Message: new perl Index: openser.spec =================================================================== RCS file: /cvs/pkgs/rpms/openser/devel/openser.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- openser.spec 7 Mar 2008 01:53:31 -0000 1.10 +++ openser.spec 7 Mar 2008 16:36:10 -0000 1.11 @@ -10,7 +10,7 @@ Summary: Open Source SIP Server Name: openser Version: 1.3.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://www.openser.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz @@ -178,6 +178,7 @@ Group: System Environment/Daemons # require perl-devel for >F7 and perl for <=F6 BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::Embed), perl-devel Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -810,9 +811,11 @@ %doc docdir/README.xmpp %changelog -* Thu Mar 06 2008 Tom "spot" Callaway - 1.3.0-10 -Rebuild for new perl +* Fri Mar 7 2008 Tom "spot" Callaway - 1.3.0-11 +- fix perl build requires +* Thu Mar 06 2008 Tom "spot" Callaway - 1.3.0-10 +- Rebuild for new perl * Sat Feb 23 2008 Jan ONDREJ (SAL) 1.3.0-9 - ia64 build fix From fedora-extras-commits at redhat.com Fri Mar 7 16:38:02 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Fri, 7 Mar 2008 16:38:02 GMT Subject: rpms/system-config-printer/F-8 system-config-printer.spec, 1.163, 1.164 Message-ID: <200803071638.m27Gc2uQ029611@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29581 Modified Files: system-config-printer.spec Log Message: Include extra files. Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-8/system-config-printer.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- system-config-printer.spec 7 Mar 2008 16:23:46 -0000 1.163 +++ system-config-printer.spec 7 Mar 2008 16:37:27 -0000 1.164 @@ -108,8 +108,10 @@ %{_datadir}/%{name}/probe_printer.py* %{_datadir}/%{name}/pysmb.py* %{_datadir}/%{name}/system-config-printer.py* +%{_datadir}/%{name}/statereason.py* %{_datadir}/%{name}/gtk_label_autowrap.py* %{_datadir}/%{name}/applet.py* +%{_datadir}/%{name}/troubleshoot %{_datadir}/%{name}/*.glade %{_datadir}/applications/redhat-system-config-printer.desktop %{_datadir}/applications/redhat-manage-print-jobs.desktop From fedora-extras-commits at redhat.com Fri Mar 7 16:39:11 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 16:39:11 GMT Subject: rpms/python-durus/devel python-durus.spec,1.16,1.17 Message-ID: <200803071639.m27GdBq3029693@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-durus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29660 Modified Files: python-durus.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 3.5-5 - Drop the pyver stuff, no longer needed. Index: python-durus.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-durus/devel/python-durus.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-durus.spec 19 Feb 2008 23:46:04 -0000 1.16 +++ python-durus.spec 7 Mar 2008 16:38:35 -0000 1.17 @@ -1,11 +1,10 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} %define srcname Durus Name: python-durus Version: 3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Python Object Database Group: Development/Libraries @@ -16,7 +15,6 @@ BuildRequires: python-devel BuildRequires: python-setuptools -Requires: python-abi = %{pyver} %description Durus is a persistent object system for applications written in the Python @@ -56,6 +54,9 @@ %{_bindir}/durus %changelog +* Fri Mar 07 2008 Jesse Keating - 3.5-5 +- Drop the pyver stuff, no longer needed. + * Tue Feb 19 2008 Fedora Release Engineering - 3.5-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 16:39:42 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 16:39:42 GMT Subject: rpms/perl-CPANPLUS-Dist-Build/devel perl-CPANPLUS-Dist-Build.spec, 1.4, 1.5 Message-ID: <200803071639.m27GdghZ029745@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CPANPLUS-Dist-Build/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29687 Modified Files: perl-CPANPLUS-Dist-Build.spec Log Message: disable tests, no networking Index: perl-CPANPLUS-Dist-Build.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CPANPLUS-Dist-Build/devel/perl-CPANPLUS-Dist-Build.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-CPANPLUS-Dist-Build.spec 7 Mar 2008 01:55:15 -0000 1.4 +++ perl-CPANPLUS-Dist-Build.spec 7 Mar 2008 16:39:08 -0000 1.5 @@ -52,7 +52,8 @@ %{_fixperms} %{buildroot}/* %check -make test +# Tests require networking. +# make test # otherwise bits of the test run are packaged up in doc... rm -rf t/dummy-perl/lib/perl5 t/dummy-cpanplus @@ -66,8 +67,11 @@ %{_mandir}/man3/* %changelog +* Fri Mat 7 2008 Tom "spot" Callaway - 0.05-5 +- disable tests (they need network support) + * Thu Mar 06 2008 Tom "spot" Callaway - 0.05-4 -Rebuild for new perl +- Rebuild for new perl * Wed Oct 24 2007 Chris Weyl 0.05-3 - bump From fedora-extras-commits at redhat.com Fri Mar 7 16:42:15 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 16:42:15 GMT Subject: rpms/python-psyco/devel python-psyco.spec,1.16,1.17 Message-ID: <200803071642.m27GgF8o029868@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-psyco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29829 Modified Files: python-psyco.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 1.5.1-8 - Handle egg info files Index: python-psyco.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-psyco/devel/python-psyco.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-psyco.spec 19 Feb 2008 23:49:32 -0000 1.16 +++ python-psyco.spec 7 Mar 2008 16:41:40 -0000 1.17 @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 1.5.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The Python Specialing Compiler @@ -52,8 +52,15 @@ %{python_sitearch}/psyco/*.pyc %dir %{python_sitearch}/psyco %{python_sitearch}/psyco/*.pyo +%if 0%{?fedora} >= 9 + %{python_sitearch}/%{name}-%{version}-py2.5.egg-info +%endif + %changelog +* Fri Mar 07 2008 Jesse Keating - 1.5.1-8 +- Handle egg info files + * Tue Feb 19 2008 Fedora Release Engineering - 1.5.1-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 16:44:46 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 16:44:46 GMT Subject: rpms/python-quixote/devel python-quixote.spec,1.13,1.14 Message-ID: <200803071644.m27Gikkw030008@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-quixote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29971 Modified Files: python-quixote.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 2.4-7 - Drop the pyver stuff, not needed. Index: python-quixote.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-quixote/devel/python-quixote.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- python-quixote.spec 19 Feb 2008 23:51:35 -0000 1.13 +++ python-quixote.spec 7 Mar 2008 16:44:07 -0000 1.14 @@ -4,7 +4,7 @@ Name: python-quixote Version: 2.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A highly Pythonic Web application framework Group: Development/Libraries @@ -14,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description Quixote is a framework for developing Web applications in Python. Quixote is @@ -70,6 +69,9 @@ %{python_sitearch}/quixote/html/*.pyo %changelog +* Fri Mar 07 2008 Jesse Keating - 2.4-7 +- Drop the pyver stuff, not needed. + * Tue Feb 19 2008 Fedora Release Engineering - 2.4-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 16:46:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 16:46:44 GMT Subject: rpms/perl-CPANPLUS-Dist-Build/devel perl-CPANPLUS-Dist-Build.spec, 1.5, 1.6 Message-ID: <200803071646.m27GkihR030111@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CPANPLUS-Dist-Build/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30088 Modified Files: perl-CPANPLUS-Dist-Build.spec Log Message: disable tests, no networking Index: perl-CPANPLUS-Dist-Build.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CPANPLUS-Dist-Build/devel/perl-CPANPLUS-Dist-Build.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-CPANPLUS-Dist-Build.spec 7 Mar 2008 16:39:08 -0000 1.5 +++ perl-CPANPLUS-Dist-Build.spec 7 Mar 2008 16:46:05 -0000 1.6 @@ -67,7 +67,7 @@ %{_mandir}/man3/* %changelog -* Fri Mat 7 2008 Tom "spot" Callaway - 0.05-5 +* Fri Mar 7 2008 Tom "spot" Callaway - 0.05-5 - disable tests (they need network support) * Thu Mar 06 2008 Tom "spot" Callaway - 0.05-4 From fedora-extras-commits at redhat.com Fri Mar 7 16:48:48 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 16:48:48 GMT Subject: rpms/python-twisted-conch/devel python-twisted-conch.spec,1.3,1.4 Message-ID: <200803071648.m27Gmmrs030202@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-conch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30171 Modified Files: python-twisted-conch.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 0.8.0-3 - Drop the pyver stuff, handle egg. Index: python-twisted-conch.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-conch/devel/python-twisted-conch.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-twisted-conch.spec 20 Feb 2008 05:04:57 -0000 1.3 +++ python-twisted-conch.spec 7 Mar 2008 16:48:11 -0000 1.4 @@ -1,12 +1,11 @@ %{?!python:%define python python} -%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define origname TwistedConch Name: %{python}-twisted-conch Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Twisted SSHv2 implementation Group: Development/Libraries @@ -18,11 +17,6 @@ BuildRequires: %{python}-twisted-core >= 2.5.0 BuildRequires: python-devel -# for FC3 and earlier -%if "%{pybasever}" < "2.4" -Requires: python(abi) = %{pybasever} -%endif - Requires: %{python}-twisted-core >= 2.5.0 Requires: %{python}-crypto @@ -79,7 +73,14 @@ %{python_sitearch}/twisted/plugins/twisted_conch.py* +%if 0%{?fedora} >= 9 + %{python_sitearch}/%{name}-%{version}-py2.5.egg-info +%endif + %changelog +* Fri Mar 07 2008 Jesse Keating - 0.8.0-3 +- Drop the pyver stuff, handle egg. + * Wed Feb 20 2008 Fedora Release Engineering - 0.8.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 16:50:58 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 16:50:58 GMT Subject: rpms/python-twisted-conch/devel python-twisted-conch.spec,1.4,1.5 Message-ID: <200803071650.m27Gownj030313@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-conch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30271 Modified Files: python-twisted-conch.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 0.8.0-4 - Handle the egg correctly, since the name is odd. Index: python-twisted-conch.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-conch/devel/python-twisted-conch.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-twisted-conch.spec 7 Mar 2008 16:48:11 -0000 1.4 +++ python-twisted-conch.spec 7 Mar 2008 16:50:21 -0000 1.5 @@ -5,7 +5,7 @@ Name: %{python}-twisted-conch Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Twisted SSHv2 implementation Group: Development/Libraries @@ -74,10 +74,13 @@ %{python_sitearch}/twisted/plugins/twisted_conch.py* %if 0%{?fedora} >= 9 - %{python_sitearch}/%{name}-%{version}-py2.5.egg-info + %{python_sitearch}/Conch-%{version}-py2.5.egg-info %endif %changelog +* Fri Mar 07 2008 Jesse Keating - 0.8.0-4 +- Handle the egg correctly, since the name is odd. + * Fri Mar 07 2008 Jesse Keating - 0.8.0-3 - Drop the pyver stuff, handle egg. From fedora-extras-commits at redhat.com Fri Mar 7 16:54:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 16:54:45 GMT Subject: rpms/perl-CPANPLUS-Dist-Build/devel perl-CPANPLUS-Dist-Build.spec, 1.6, 1.7 Message-ID: <200803071654.m27GsjGo030484@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-CPANPLUS-Dist-Build/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30453 Modified Files: perl-CPANPLUS-Dist-Build.spec Log Message: disable tests, no networking Index: perl-CPANPLUS-Dist-Build.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-CPANPLUS-Dist-Build/devel/perl-CPANPLUS-Dist-Build.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-CPANPLUS-Dist-Build.spec 7 Mar 2008 16:46:05 -0000 1.6 +++ perl-CPANPLUS-Dist-Build.spec 7 Mar 2008 16:54:11 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-CPANPLUS-Dist-Build Version: 0.05 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Module::Build extension for CPANPLUS License: GPL+ or Artistic Group: Development/Libraries From fedora-extras-commits at redhat.com Fri Mar 7 16:55:25 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 7 Mar 2008 16:55:25 GMT Subject: rpms/cmake/devel cmake.spec,1.28,1.29 Message-ID: <200803071655.m27GtPjV030565@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/cmake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30472 Modified Files: cmake.spec Log Message: Undo wxWidgets changes that accidentally got checked in. Add macro for bootstrapping Index: cmake.spec =================================================================== RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- cmake.spec 5 Mar 2008 16:42:49 -0000 1.28 +++ cmake.spec 7 Mar 2008 16:54:42 -0000 1.29 @@ -1,3 +1,7 @@ +# Set to bcond_without or use --with bootstrap if bootstrapping a new release +# or architecture +%bcond_with bootstrap + Name: cmake Version: 2.4.8 Release: 3%{?dist} @@ -11,15 +15,10 @@ Source2: macros.cmake Patch0: cmake-2.4.2-fedora.patch Patch1: cmake-2.4.5-xmlrpc.patch -Patch2: cmake-2.4.8-CMakeSetup-unicode.patch -Patch3: cmake-2.4.8-wxdialog.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, libX11-devel -BuildRequires: curl-devel, expat-devel, zlib-devel, wxGTK-devel -# To bootstrap on a new architecture/release, you must comment out the -# xmlrpc-c-devel BR and xmlrpc patch. Build cmake then xmlrpc-c. Then -# undo the cmake changes and rebuild cmake. -BuildRequires: xmlrpc-c-devel +BuildRequires: curl-devel, expat-devel, zlib-devel +%{?!with_bootstrap:BuildRequires: xmlrpc-c-devel} Requires: rpm @@ -32,21 +31,10 @@ generation, code generation, and template instantiation. -%package -n cmakesetup -Summary: CMakeSetup -Group: Development/Tools -Requires: %{name} = %{version}-%{release} - -%description -n cmakesetup -wxWidgets based CMake tool. - - %prep %setup -q %patch -p1 -b .fedora %patch1 -p1 -b .xmlrpc -%patch2 -p1 -b .unicode -%patch3 -p1 -b .wxdialog %build @@ -54,7 +42,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS" ./bootstrap --init=%SOURCE1 --prefix=%{_prefix} --datadir=/share/%{name} \ --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \ - --system-libs + --%{?with_bootstrap:no-}system-libs make VERBOSE=1 %{?_smp_mflags} @@ -86,14 +74,10 @@ %{_mandir}/man1/*.1* %{_datadir}/emacs/ -%files -n cmakesetup -%defattr(-,root,root,-) -%{_bindir}/CMakeSetup - %changelog -* Fri Feb 8 2008 Laurent Rineau - 2.4.8-3 -- Enable the wxWidgets version of CMakeSetup (bug #431953). +* Fri Mar 7 2008 Orion Poplawski - 2.4.8-3 +- Add macro for bootstrapping new release/architecture * Tue Feb 19 2008 Fedora Release Engineering - 2.4.8-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 16:58:55 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 16:58:55 GMT Subject: rpms/python-twisted-core/devel python-twisted-core.spec,1.7,1.8 Message-ID: <200803071658.m27GwtZg030684@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30658 Modified Files: python-twisted-core.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 2.5.0-4 - Handle egg, drop pyver stuff, attempt to fix the multiple file listings Index: python-twisted-core.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-core/devel/python-twisted-core.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-twisted-core.spec 20 Feb 2008 05:06:00 -0000 1.7 +++ python-twisted-core.spec 7 Mar 2008 16:58:21 -0000 1.8 @@ -1,12 +1,11 @@ %{?!python:%define python python} -%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define origname TwistedCore Name: %{python}-twisted-core Version: 2.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An asynchronous networking framework written in Python Group: Development/Libraries @@ -22,11 +21,6 @@ BuildRequires: /bin/sed BuildRequires: /bin/awk -# for FC3 and earlier -%if "%{pybasever}" < "2.4" -Requires: python(abi) = %{pybasever} -%endif - Requires: %{python}-zope-interface Requires: pyOpenSSL @@ -132,12 +126,8 @@ %{python_sitearch}/twisted/manhole/*.glade %{python_sitearch}/twisted/manhole/ui/ -%{python_sitearch}/twisted/manhole/ui/*.py* -%{python_sitearch}/twisted/manhole/ui/*.glade -%{python_sitearch}/twisted/manhole/ui/gtkrc %{python_sitearch}/twisted/persisted/ -%{python_sitearch}/twisted/persisted/journal/ %dir %{python_sitearch}/twisted/plugins/ %{python_sitearch}/twisted/plugins/*.py* @@ -180,6 +170,10 @@ %{python_sitearch}/twisted/trial/test/*.py* %{python_sitearch}/twisted/trial/test/notpython +%if 0%{?fedora} >= 9 + %{python_sitearch}/Twisted-%{version}-py2.5.egg-info +%endif + %files doc %defattr(-,root,root,-) %doc doc/* @@ -190,6 +184,9 @@ %{_datadir}/zsh/site-functions/_twisted_zsh_stub %changelog +* Fri Mar 07 2008 Jesse Keating - 2.5.0-4 +- Handle egg, drop pyver stuff, attempt to fix the multiple file listings + * Wed Feb 20 2008 Fedora Release Engineering - 2.5.0-3 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 17:01:09 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Fri, 7 Mar 2008 17:01:09 GMT Subject: rpms/gengetopt/F-7 gengetopt-2.22-gcc43.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gengetopt.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200803071701.m27H19Lg004802@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gengetopt/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30761 Modified Files: .cvsignore gengetopt.spec sources Added Files: gengetopt-2.22-gcc43.patch Log Message: * Fri Mar 07 2008 Debarshi Ray - 2.22-1 - Version bump to 2.22. Closes Red Hat Bugzilla bug #428641. - Fixed build failure with gcc-4.3. - Trimmed the 'BuildRequires' list. - Changed character encodings from ISO8859-1 to UTF-8. - Disabled parallel make to prevent failure with -j2. - Added 'make check-valgrind' for ix86, x86_64, ppc and ppc64 in check stanza. - Fixed Texinfo scriptlets according to Fedora packaging guidelines. gengetopt-2.22-gcc43.patch: --- NEW FILE gengetopt-2.22-gcc43.patch --- diff -urNp gengetopt-2.22.orig/src/fileutils.cpp gengetopt-2.22/src/fileutils.cpp --- gengetopt-2.22.orig/src/fileutils.cpp 2006-05-07 15:12:05.000000000 +0530 +++ gengetopt-2.22/src/fileutils.cpp 2008-03-05 08:52:25.000000000 +0530 @@ -12,6 +12,7 @@ #include #include +#include #include "fileutils.h" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gengetopt/F-7/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Aug 2007 03:31:55 -0000 1.4 +++ .cvsignore 7 Mar 2008 17:00:30 -0000 1.5 @@ -1 +1 @@ -gengetopt-2.21.tar.gz +gengetopt-2.22.tar.gz Index: gengetopt.spec =================================================================== RCS file: /cvs/pkgs/rpms/gengetopt/F-7/gengetopt.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gengetopt.spec 7 Aug 2007 03:31:55 -0000 1.3 +++ gengetopt.spec 7 Mar 2008 17:00:30 -0000 1.4 @@ -1,19 +1,22 @@ -Summary: Tool to write command line option parsing code for C programs -Name: gengetopt -Version: 2.21 -Release: 2%{dist} -License: GPLv3+ -Group: Development/Tools -URL: http://www.gnu.org/software/gengetopt/ -Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +Summary: Tool to write command line option parsing code for C programs +Name: gengetopt +Version: 2.22 +Release: 1%{dist} +License: GPLv3+ +Group: Development/Tools +URL: http://www.gnu.org/software/gengetopt/ +Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Patch0: %{name}-%{version}-gcc43.patch -Requires(post): /sbin/install-info +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -BuildRequires: help2man -BuildRequires: valgrind +%ifarch %{ix86} x86_64 ppc ppc64 +BuildRequires: valgrind +%endif %description Gengetopt is a tool to generate C code to parse the command line arguments @@ -22,21 +25,35 @@ %prep %setup -q +%patch0 -p1 + +# Suppress rpmlint error. +iconv --from-code ISO8859-1 --to-code UTF-8 ./ChangeLog \ + --output ChangeLog.utf-8 && mv ChangeLog.utf-8 ./ChangeLog +iconv --from-code ISO8859-1 --to-code UTF-8 ./THANKS \ + --output THANKS.utf-8 && mv THANKS.utf-8 ./THANKS %build %configure -make %{?_smp_mflags} + +# Parallel make does not work. +make %check make check +%ifarch %{ix86} x86_64 ppc ppc64 +pushd ./tests + make check-valgrind +popd +%endif + %install rm -rf $RPM_BUILD_ROOT -# To retain timestamps on files installed without any modification. make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT%{_infodir}/dir +rm -f $RPM_BUILD_ROOT%{_infodir}/dir # Move /usr/share/doc/gengetopt/examples to RPM_BUILD_DIR. # To be later listed against %doc. @@ -47,17 +64,26 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || : +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz \ - %{_infodir}/dir >/dev/null 2>&1 || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE NEWS README THANKS TODO doc/gengetopt.html doc/index.html examples +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc LICENSE +%doc NEWS +%doc README +%doc THANKS +%doc TODO +%doc doc/index.html +%doc doc/%{name}.html +%doc examples %{_bindir}/%{name} %{_infodir}/%{name}.info.gz %{_mandir}/man1/%{name}.1.gz @@ -68,6 +94,15 @@ %{_datadir}/%{name}/gnugetopt.h %changelog +* Fri Mar 07 2008 Debarshi Ray - 2.22-1 +- Version bump to 2.22. Closes Red Hat Bugzilla bug #428641. +- Fixed build failure with gcc-4.3. +- Trimmed the 'BuildRequires' list. +- Changed character encodings from ISO8859-1 to UTF-8. +- Disabled parallel make to prevent failure with -j2. +- Added 'make check-valgrind' for ix86, x86_64, ppc and ppc64 in check stanza. +- Fixed Texinfo scriptlets according to Fedora packaging guidelines. + * Tue Aug 07 2007 Debarshi Ray - 2.21-2 - Removed 'BuildRequires: source-highlight' to prevent build failure. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gengetopt/F-7/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Aug 2007 03:31:55 -0000 1.4 +++ sources 7 Mar 2008 17:00:30 -0000 1.5 @@ -1 +1 @@ -f44cc7507a3c069a0374e371efcc69ab gengetopt-2.21.tar.gz +346f35c9e0607733b26dcbba9fbbfa8c gengetopt-2.22.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 17:02:00 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 17:02:00 GMT Subject: rpms/python-twisted-lore/devel python-twisted-lore.spec,1.2,1.3 Message-ID: <200803071702.m27H20bM005555@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-lore/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5494 Modified Files: python-twisted-lore.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 0.2.0-6 - Handle the egg, drop the pyver stuff. Index: python-twisted-lore.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-lore/devel/python-twisted-lore.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-twisted-lore.spec 20 Feb 2008 05:06:57 -0000 1.2 +++ python-twisted-lore.spec 7 Mar 2008 17:01:26 -0000 1.3 @@ -1,12 +1,11 @@ %{?!python:%define python python} -%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define origname TwistedLore Name: %{python}-twisted-lore Version: 0.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Twisted documentation system Group: Development/Libraries @@ -18,11 +17,6 @@ BuildRequires: %{python}-twisted-core >= 2.4.0 BuildRequires: python-devel -# for FC3 and earlier -%if "%{pybasever}" < "2.4" -Requires: python(abi) = %{pybasever} -%endif - Requires: %{python}-twisted-core Requires: %{python}-twisted-web @@ -75,7 +69,14 @@ %{python_sitearch}/twisted/plugins/twisted_lore.py* +%if 0%{?fedora} >= 9 + %{python_sitearch}/Twisted_Lore-%{version}-py2.5.egg-info +%endif + %changelog +* Fri Mar 07 2008 Jesse Keating - 0.2.0-6 +- Handle the egg, drop the pyver stuff. + * Wed Feb 20 2008 Fedora Release Engineering - 0.2.0-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 17:05:16 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 17:05:16 GMT Subject: rpms/python-twisted-mail/devel python-twisted-mail.spec,1.3,1.4 Message-ID: <200803071705.m27H5GLe005747@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5680 Modified Files: python-twisted-mail.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 0.4.0-3 - Fix the egg issue, drop the pyver stuff. Index: python-twisted-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-mail/devel/python-twisted-mail.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-twisted-mail.spec 20 Feb 2008 05:07:52 -0000 1.3 +++ python-twisted-mail.spec 7 Mar 2008 17:04:35 -0000 1.4 @@ -1,12 +1,11 @@ %{?!python:%define python python} -%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define origname TwistedMail Name: %{python}-twisted-mail Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Twisted Mail library, server and client Group: Development/Libraries @@ -18,11 +17,6 @@ BuildRequires: %{python}-twisted-core >= 2.5.0 BuildRequires: python-devel -# for FC3 and earlier -%if "%{pybasever}" < "2.4" -Requires: python(abi) = %{pybasever} -%endif - Requires: %{python}-twisted-core >= 2.5.0 Requires: %{python}-twisted-names @@ -74,7 +68,14 @@ %{python_sitearch}/twisted/plugins/twisted_mail.py* +%if 0%{?fedora} >= 9 + %{python_sitearch}/%{name}-%{version}-py2.5.egg-info +%endif + %changelog +* Fri Mar 07 2008 Jesse Keating - 0.4.0-3 +- Fix the egg issue, drop the pyver stuff. + * Wed Feb 20 2008 Fedora Release Engineering - 0.4.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 17:05:24 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Fri, 7 Mar 2008 17:05:24 GMT Subject: rpms/gengetopt/F-8 gengetopt-2.22-gcc43.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gengetopt.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200803071705.m27H5O1q005795@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gengetopt/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5715 Modified Files: .cvsignore gengetopt.spec sources Added Files: gengetopt-2.22-gcc43.patch Log Message: * Fri Mar 07 2008 Debarshi Ray - 2.22-1 - Version bump to 2.22. Closes Red Hat Bugzilla bug #428641. - Fixed build failure with gcc-4.3. - Trimmed the 'BuildRequires' list. - Changed character encodings from ISO8859-1 to UTF-8. - Disabled parallel make to prevent failure with -j2. - Added 'make check-valgrind' for ix86, x86_64, ppc and ppc64 in check stanza. - Fixed Texinfo scriptlets according to Fedora packaging guidelines. gengetopt-2.22-gcc43.patch: --- NEW FILE gengetopt-2.22-gcc43.patch --- diff -urNp gengetopt-2.22.orig/src/fileutils.cpp gengetopt-2.22/src/fileutils.cpp --- gengetopt-2.22.orig/src/fileutils.cpp 2006-05-07 15:12:05.000000000 +0530 +++ gengetopt-2.22/src/fileutils.cpp 2008-03-05 08:52:25.000000000 +0530 @@ -12,6 +12,7 @@ #include #include +#include #include "fileutils.h" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gengetopt/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Aug 2007 02:55:06 -0000 1.4 +++ .cvsignore 7 Mar 2008 17:04:49 -0000 1.5 @@ -1 +1 @@ -gengetopt-2.21.tar.gz +gengetopt-2.22.tar.gz Index: gengetopt.spec =================================================================== RCS file: /cvs/pkgs/rpms/gengetopt/F-8/gengetopt.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gengetopt.spec 21 Aug 2007 20:03:43 -0000 1.5 +++ gengetopt.spec 7 Mar 2008 17:04:49 -0000 1.6 @@ -1,19 +1,22 @@ -Summary: Tool to write command line option parsing code for C programs -Name: gengetopt -Version: 2.21 -Release: 3%{dist} -License: GPLv3+ -Group: Development/Tools -URL: http://www.gnu.org/software/gengetopt/ -Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +Summary: Tool to write command line option parsing code for C programs +Name: gengetopt +Version: 2.22 +Release: 1%{dist} +License: GPLv3+ +Group: Development/Tools +URL: http://www.gnu.org/software/gengetopt/ +Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Patch0: %{name}-%{version}-gcc43.patch -Requires(post): /sbin/install-info +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -BuildRequires: help2man -BuildRequires: valgrind +%ifarch %{ix86} x86_64 ppc ppc64 +BuildRequires: valgrind +%endif %description Gengetopt is a tool to generate C code to parse the command line arguments @@ -22,21 +25,35 @@ %prep %setup -q +%patch0 -p1 + +# Suppress rpmlint error. +iconv --from-code ISO8859-1 --to-code UTF-8 ./ChangeLog \ + --output ChangeLog.utf-8 && mv ChangeLog.utf-8 ./ChangeLog +iconv --from-code ISO8859-1 --to-code UTF-8 ./THANKS \ + --output THANKS.utf-8 && mv THANKS.utf-8 ./THANKS %build %configure -make %{?_smp_mflags} + +# Parallel make does not work. +make %check make check +%ifarch %{ix86} x86_64 ppc ppc64 +pushd ./tests + make check-valgrind +popd +%endif + %install rm -rf $RPM_BUILD_ROOT -# To retain timestamps on files installed without any modification. make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT%{_infodir}/dir +rm -f $RPM_BUILD_ROOT%{_infodir}/dir # Move /usr/share/doc/gengetopt/examples to RPM_BUILD_DIR. # To be later listed against %doc. @@ -47,17 +64,26 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || : +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz \ - %{_infodir}/dir >/dev/null 2>&1 || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE NEWS README THANKS TODO doc/gengetopt.html doc/index.html examples +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc LICENSE +%doc NEWS +%doc README +%doc THANKS +%doc TODO +%doc doc/index.html +%doc doc/%{name}.html +%doc examples %{_bindir}/%{name} %{_infodir}/%{name}.info.gz %{_mandir}/man1/%{name}.1.gz @@ -68,8 +94,14 @@ %{_datadir}/%{name}/gnugetopt.h %changelog -* Wed Aug 22 2007 Debarshi Ray - 2.21-3 -- Rebuilding. +* Fri Mar 07 2008 Debarshi Ray - 2.22-1 +- Version bump to 2.22. Closes Red Hat Bugzilla bug #428641. +- Fixed build failure with gcc-4.3. +- Trimmed the 'BuildRequires' list. +- Changed character encodings from ISO8859-1 to UTF-8. +- Disabled parallel make to prevent failure with -j2. +- Added 'make check-valgrind' for ix86, x86_64, ppc and ppc64 in check stanza. +- Fixed Texinfo scriptlets according to Fedora packaging guidelines. * Tue Aug 07 2007 Debarshi Ray - 2.21-2 - Removed 'BuildRequires: source-highlight' to prevent build failure. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gengetopt/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Aug 2007 02:55:06 -0000 1.4 +++ sources 7 Mar 2008 17:04:49 -0000 1.5 @@ -1 +1 @@ -f44cc7507a3c069a0374e371efcc69ab gengetopt-2.21.tar.gz +346f35c9e0607733b26dcbba9fbbfa8c gengetopt-2.22.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 17:06:40 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 7 Mar 2008 17:06:40 GMT Subject: rpms/openoffice.org/devel workspace.cmcfixes43.patch, NONE, 1.1.2.1 openoffice.org.spec, 1.1440.2.3, 1.1440.2.4 Message-ID: <200803071706.m27H6e1k005889@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5801 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org.spec Added Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 workspace.cmcfixes43.patch Log Message: add workspace.cmcfixes43.patch workspace.cmcfixes43.patch: --- NEW FILE workspace.cmcfixes43.patch --- Index: udk/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx diff -u udk/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx:1.3 udk/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx:1.3.20.1 --- udk/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx:1.3 Wed Dec 12 07:34:44 2007 +++ udk/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx Fri Mar 7 08:56:40 2008 @@ -34,6 +34,7 @@ ************************************************************************/ #include +#include #include #include #include Index: udk/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx diff -u udk/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx:1.2 udk/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx:1.2.6.1 --- udk/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx:1.2 Wed Feb 27 01:52:03 2008 +++ udk/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx Fri Mar 7 08:56:08 2008 @@ -37,6 +37,7 @@ #include "precompiled_bridges.hxx" #include +#include #include #include #include Index: udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx diff -u udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx:1.4 udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx:1.4.6.1 --- udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx:1.4 Wed Feb 27 01:54:38 2008 +++ udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx Fri Mar 7 08:58:11 2008 @@ -44,12 +44,14 @@ #include "bridges/cpp_uno/shared/vtablefactory.hxx" #include "share.hxx" +#include +#include + using namespace com::sun::star::uno; //#define BRDEBUG #ifdef BRDEBUG -#include #include #include #include Index: udk/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx diff -u udk/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx:1.2 udk/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx:1.2.28.1 --- udk/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx:1.2 Fri Nov 2 08:21:34 2007 +++ udk/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx Fri Mar 7 08:57:17 2008 @@ -33,6 +33,7 @@ * ************************************************************************/ #include +#include #include #include #include Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx diff -u udk/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx:1.7 udk/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx:1.7.96.1 --- udk/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx:1.7 Sat Sep 16 08:48:22 2006 +++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx Fri Mar 7 08:54:36 2008 @@ -37,6 +37,7 @@ #include "precompiled_bridges.hxx" #include +#include #include #include #include Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx diff -u udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx:1.3 udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx:1.3.6.1 --- udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx:1.3 Wed Feb 27 01:56:24 2008 +++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx Fri Mar 7 08:55:32 2008 @@ -47,6 +47,7 @@ #include "share.hxx" #include +#include using namespace ::com::sun::star::uno; Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx diff -u udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx:1.3 udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx:1.3.6.1 --- udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx:1.3 Wed Feb 27 01:56:42 2008 +++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx Fri Mar 7 08:54:56 2008 @@ -37,6 +37,7 @@ #include "precompiled_bridges.hxx" #include +#include #include #include #include Index: udk/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx diff -u udk/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx:1.6 udk/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx:1.6.80.1 --- udk/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx:1.6 Wed Nov 22 03:07:33 2006 +++ udk/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx Fri Mar 7 08:58:40 2008 @@ -36,6 +36,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" #include +#include #include #include #include Index: udk/testtools/source/bridgetest/component.LINUXIgcc3.map diff -u udk/testtools/source/bridgetest/component.LINUXIgcc3.map:1.3 udk/testtools/source/bridgetest/component.LINUXIgcc3.map:removed --- udk/testtools/source/bridgetest/component.LINUXIgcc3.map:1.3 Fri Sep 9 05:21:49 2005 +++ udk/testtools/source/bridgetest/component.LINUXIgcc3.map Fri Mar 7 09:02:56 2008 @@ -1,46 +0,0 @@ -#************************************************************************* -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile$ -# -# $Revision$ -# -# last change: $Author$ $Date$ -# -# The Contents of this file are made available subject to -# the terms of GNU Lesser General Public License Version 2.1. -# -# -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -#************************************************************************* - -UDK_3_0_0 { - global: - component_getFactory; - component_getImplementationEnvironment; - component_writeInfo; - - _ZN4_STL7num_put*; # STLport - - local: - *; -}; Index: udk/testtools/source/bridgetest/component.gcc3.map diff -u /dev/null udk/testtools/source/bridgetest/component.gcc3.map:1.1.2.1 --- /dev/null Fri Mar 7 09:02:56 2008 +++ udk/testtools/source/bridgetest/component.gcc3.map Mon Mar 3 02:54:31 2008 @@ -0,0 +1,46 @@ +#************************************************************************* +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile$ +# +# $Revision$ +# +# last change: $Author$ $Date$ +# +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. +# +# +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1, as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +#************************************************************************* + +UDK_3_0_0 { + global: + component_getFactory; + component_getImplementationEnvironment; [...30580 lines suppressed...] -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -#************************************************************************* - -UDK_3_0_0 { - global: - component_getFactory; - component_getImplementationEnvironment; - component_writeInfo; - - _ZN4_STL7num_put*; # STLport - - local: - *; -}; Index: udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map diff -u /dev/null udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map:1.1.2.1 --- /dev/null Fri Mar 7 09:03:51 2008 +++ udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map Mon Mar 3 02:52:36 2008 @@ -0,0 +1,46 @@ +#************************************************************************* +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile$ +# +# $Revision$ +# +# last change: $Author$ $Date$ +# +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. +# +# +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1, as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +#************************************************************************* + +UDK_3_0_0 { + global: + component_getFactory; + component_getImplementationEnvironment; + component_writeInfo; + + _ZN4_STL7num_put*; # STLport + + local: + *; +}; Index: udk/stoc/test/tdmanager/makefile.mk diff -u udk/stoc/test/tdmanager/makefile.mk:1.4 udk/stoc/test/tdmanager/makefile.mk:1.4.88.1 --- udk/stoc/test/tdmanager/makefile.mk:1.4 Thu Sep 8 01:32:31 2005 +++ udk/stoc/test/tdmanager/makefile.mk Mon Mar 3 02:51:41 2008 @@ -52,8 +52,8 @@ SHL1IMPLIB = itesttdmanager DEF1NAME = $(SHL1TARGET) -.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3" -SHL1VERSIONMAP = testtdmanager.LINUXIgcc3.map +.IF "$(COMNAME)" == "gcc3" +SHL1VERSIONMAP = testtdmanager.gcc3.map .ELSE SHL1VERSIONMAP = testtdmanager.map .ENDIF Index: udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map diff -u udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:1.3 udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:removed --- udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:1.3 Thu Sep 8 01:32:51 2005 +++ udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map Fri Mar 7 09:03:51 2008 @@ -1,46 +0,0 @@ -#************************************************************************* -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile$ -# -# $Revision$ -# -# last change: $Author$ $Date$ -# -# The Contents of this file are made available subject to -# the terms of GNU Lesser General Public License Version 2.1. -# -# -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -#************************************************************************* - -UDK_3_0_0 { - global: - component_getFactory; - component_getImplementationEnvironment; - component_writeInfo; - - _ZN4_STL7num_put*; # STLport - - local: - *; -}; Index: udk/stoc/test/tdmanager/testtdmanager.gcc3.map diff -u /dev/null udk/stoc/test/tdmanager/testtdmanager.gcc3.map:1.1.2.1 --- /dev/null Fri Mar 7 09:03:51 2008 +++ udk/stoc/test/tdmanager/testtdmanager.gcc3.map Mon Mar 3 02:51:41 2008 @@ -0,0 +1,46 @@ +#************************************************************************* +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile$ +# +# $Revision$ +# +# last change: $Author$ $Date$ +# +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. +# +# +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1, as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +#************************************************************************* + +UDK_3_0_0 { + global: + component_getFactory; + component_getImplementationEnvironment; + component_writeInfo; + + _ZN4_STL7num_put*; # STLport + + local: + *; +}; Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440.2.3 retrieving revision 1.1440.2.4 diff -u -r1.1440.2.3 -r1.1440.2.4 --- openoffice.org.spec 7 Mar 2008 15:47:16 -0000 1.1440.2.3 +++ openoffice.org.spec 7 Mar 2008 17:05:50 -0000 1.1440.2.4 @@ -139,6 +139,7 @@ Patch65: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch Patch66: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch Patch67: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch +Patch68: workspace.cmcfixes43.patch %define instdir %{_libdir}/openoffice.org @@ -1091,6 +1092,7 @@ %patch65 -p1 -b .ooo86080.unopkg.bodge.patch %patch66 -p1 -b .ooo86268.desktop.visibilitycockup.patch %patch67 -p1 -b .oooXXXXX.psprint.debugcups.patch +%patch68 -p1 -b .workspace.cmcfixes43.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2874,6 +2876,7 @@ - drop integrated workspace.gcc430two.patch - drop integrated openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch - drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch +- add workspace.cmcfixes43.patch * Thu Mar 06 2008 Caolan McNamara - 1:2.4.0-9.1 - next release candidate From fedora-extras-commits at redhat.com Fri Mar 7 17:08:34 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 7 Mar 2008 17:08:34 GMT Subject: rpms/telepathy-glib/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 telepathy-glib.spec, 1.9, 1.10 Message-ID: <200803071708.m27H8YB4006067@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/telepathy-glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5984 Modified Files: .cvsignore sources telepathy-glib.spec Log Message: * Fri Mar 7 2008 Brian Pepple - 0.7.5-1 - Update to 0.7.5. - Remove hack to fix ppc64 build. fixed upstream. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 6 Mar 2008 16:42:11 -0000 1.6 +++ .cvsignore 7 Mar 2008 17:07:50 -0000 1.7 @@ -1 +1 @@ -telepathy-glib-0.7.4.tar.gz +telepathy-glib-0.7.5.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Mar 2008 16:42:11 -0000 1.6 +++ sources 7 Mar 2008 17:07:50 -0000 1.7 @@ -1 +1 @@ -1f439c4c0fbd0da2425e58e2380f4306 telepathy-glib-0.7.4.tar.gz +3a945bf8584d8435ae59e05de689f966 telepathy-glib-0.7.5.tar.gz Index: telepathy-glib.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- telepathy-glib.spec 6 Mar 2008 16:42:11 -0000 1.9 +++ telepathy-glib.spec 7 Mar 2008 17:07:50 -0000 1.10 @@ -1,5 +1,5 @@ Name: telepathy-glib -Version: 0.7.4 +Version: 0.7.5 Release: 1%{?dist} Summary: GLib bindings for Telepathy @@ -47,9 +47,6 @@ %build %configure --enable-static=no -%ifarch ppc64 -sed -i 's|" T "|" D "|g' telepathy-glib/Makefile -%endif make %{?_smp_mflags} @@ -84,6 +81,10 @@ %changelog +* Fri Mar 7 2008 Brian Pepple - 0.7.5-1 +- Update to 0.7.5. +- Remove hack to fix ppc64 build. fixed upstream. + * Thu Mar 6 2008 Brian Pepple - 0.7.4-1 - Update to 0.7.4. - Disable test for now. From fedora-extras-commits at redhat.com Fri Mar 7 17:08:34 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 17:08:34 GMT Subject: rpms/python-twisted-mail/devel python-twisted-mail.spec,1.4,1.5 Message-ID: <200803071708.m27H8Y7I006070@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5991 Modified Files: python-twisted-mail.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 0.4.0-4 - Fix the egg issue, drop the pyver stuff. Index: python-twisted-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-mail/devel/python-twisted-mail.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-twisted-mail.spec 7 Mar 2008 17:04:35 -0000 1.4 +++ python-twisted-mail.spec 7 Mar 2008 17:07:51 -0000 1.5 @@ -5,7 +5,7 @@ Name: %{python}-twisted-mail Version: 0.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Twisted Mail library, server and client Group: Development/Libraries @@ -69,11 +69,11 @@ %{python_sitearch}/twisted/plugins/twisted_mail.py* %if 0%{?fedora} >= 9 - %{python_sitearch}/%{name}-%{version}-py2.5.egg-info + %{python_sitearch}/Twisted_Mail-%{version}-py2.5.egg-info %endif %changelog -* Fri Mar 07 2008 Jesse Keating - 0.4.0-3 +* Fri Mar 07 2008 Jesse Keating - 0.4.0-4 - Fix the egg issue, drop the pyver stuff. * Wed Feb 20 2008 Fedora Release Engineering - 0.4.0-2 From fedora-extras-commits at redhat.com Fri Mar 7 17:08:47 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Fri, 7 Mar 2008 17:08:47 GMT Subject: rpms/gengetopt/devel gengetopt-2.22-gcc43.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gengetopt.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200803071708.m27H8lKT006168@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/gengetopt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6024 Modified Files: .cvsignore gengetopt.spec sources Added Files: gengetopt-2.22-gcc43.patch Log Message: * Fri Mar 07 2008 Debarshi Ray - 2.22-1 - Version bump to 2.22. Closes Red Hat Bugzilla bug #428641. - Fixed build failure with gcc-4.3. - Trimmed the 'BuildRequires' list. - Changed character encodings from ISO8859-1 to UTF-8. - Disabled parallel make to prevent failure with -j2. - Added 'make check-valgrind' for ix86, x86_64, ppc and ppc64 in check stanza. - Fixed Texinfo scriptlets according to Fedora packaging guidelines. gengetopt-2.22-gcc43.patch: --- NEW FILE gengetopt-2.22-gcc43.patch --- diff -urNp gengetopt-2.22.orig/src/fileutils.cpp gengetopt-2.22/src/fileutils.cpp --- gengetopt-2.22.orig/src/fileutils.cpp 2006-05-07 15:12:05.000000000 +0530 +++ gengetopt-2.22/src/fileutils.cpp 2008-03-05 08:52:25.000000000 +0530 @@ -12,6 +12,7 @@ #include #include +#include #include "fileutils.h" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gengetopt/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Aug 2007 02:55:06 -0000 1.4 +++ .cvsignore 7 Mar 2008 17:08:10 -0000 1.5 @@ -1 +1 @@ -gengetopt-2.21.tar.gz +gengetopt-2.22.tar.gz Index: gengetopt.spec =================================================================== RCS file: /cvs/pkgs/rpms/gengetopt/devel/gengetopt.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gengetopt.spec 21 Aug 2007 20:03:43 -0000 1.5 +++ gengetopt.spec 7 Mar 2008 17:08:10 -0000 1.6 @@ -1,19 +1,22 @@ -Summary: Tool to write command line option parsing code for C programs -Name: gengetopt -Version: 2.21 -Release: 3%{dist} -License: GPLv3+ -Group: Development/Tools -URL: http://www.gnu.org/software/gengetopt/ -Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +Summary: Tool to write command line option parsing code for C programs +Name: gengetopt +Version: 2.22 +Release: 1%{dist} +License: GPLv3+ +Group: Development/Tools +URL: http://www.gnu.org/software/gengetopt/ +Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Patch0: %{name}-%{version}-gcc43.patch -Requires(post): /sbin/install-info +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -BuildRequires: help2man -BuildRequires: valgrind +%ifarch %{ix86} x86_64 ppc ppc64 +BuildRequires: valgrind +%endif %description Gengetopt is a tool to generate C code to parse the command line arguments @@ -22,21 +25,35 @@ %prep %setup -q +%patch0 -p1 + +# Suppress rpmlint error. +iconv --from-code ISO8859-1 --to-code UTF-8 ./ChangeLog \ + --output ChangeLog.utf-8 && mv ChangeLog.utf-8 ./ChangeLog +iconv --from-code ISO8859-1 --to-code UTF-8 ./THANKS \ + --output THANKS.utf-8 && mv THANKS.utf-8 ./THANKS %build %configure -make %{?_smp_mflags} + +# Parallel make does not work. +make %check make check +%ifarch %{ix86} x86_64 ppc ppc64 +pushd ./tests + make check-valgrind +popd +%endif + %install rm -rf $RPM_BUILD_ROOT -# To retain timestamps on files installed without any modification. make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT%{_infodir}/dir +rm -f $RPM_BUILD_ROOT%{_infodir}/dir # Move /usr/share/doc/gengetopt/examples to RPM_BUILD_DIR. # To be later listed against %doc. @@ -47,17 +64,26 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || : +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz \ - %{_infodir}/dir >/dev/null 2>&1 || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE NEWS README THANKS TODO doc/gengetopt.html doc/index.html examples +%doc AUTHORS +%doc ChangeLog +%doc COPYING +%doc LICENSE +%doc NEWS +%doc README +%doc THANKS +%doc TODO +%doc doc/index.html +%doc doc/%{name}.html +%doc examples %{_bindir}/%{name} %{_infodir}/%{name}.info.gz %{_mandir}/man1/%{name}.1.gz @@ -68,8 +94,14 @@ %{_datadir}/%{name}/gnugetopt.h %changelog -* Wed Aug 22 2007 Debarshi Ray - 2.21-3 -- Rebuilding. +* Fri Mar 07 2008 Debarshi Ray - 2.22-1 +- Version bump to 2.22. Closes Red Hat Bugzilla bug #428641. +- Fixed build failure with gcc-4.3. +- Trimmed the 'BuildRequires' list. +- Changed character encodings from ISO8859-1 to UTF-8. +- Disabled parallel make to prevent failure with -j2. +- Added 'make check-valgrind' for ix86, x86_64, ppc and ppc64 in check stanza. +- Fixed Texinfo scriptlets according to Fedora packaging guidelines. * Tue Aug 07 2007 Debarshi Ray - 2.21-2 - Removed 'BuildRequires: source-highlight' to prevent build failure. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gengetopt/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Aug 2007 02:55:06 -0000 1.4 +++ sources 7 Mar 2008 17:08:10 -0000 1.5 @@ -1 +1 @@ -f44cc7507a3c069a0374e371efcc69ab gengetopt-2.21.tar.gz +346f35c9e0607733b26dcbba9fbbfa8c gengetopt-2.22.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 17:11:38 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 17:11:38 GMT Subject: rpms/python-twisted-names/devel python-twisted-names.spec,1.3,1.4 Message-ID: <200803071711.m27HBcCG006360@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-names/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6335 Modified Files: python-twisted-names.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 0.4.0-3 - Fix the egg info, drop the pyver stuff. Index: python-twisted-names.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-names/devel/python-twisted-names.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-twisted-names.spec 20 Feb 2008 05:08:49 -0000 1.3 +++ python-twisted-names.spec 7 Mar 2008 17:11:01 -0000 1.4 @@ -1,12 +1,11 @@ %{?!python:%define python python} -%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define origname TwistedNames Name: %{python}-twisted-names Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Twisted DNS implementation Group: Development/Libraries @@ -18,11 +17,6 @@ BuildRequires: %{python}-twisted-core >= 2.5.0 BuildRequires: %{python}-devel -# for FC3 and earlier -%if "%{pybasever}" < "2.4" -Requires: python(abi) = %{pybasever} -%endif - Requires: %{python}-twisted-core >= 2.5.0 # a noarch-turned-arch package should not have debuginfo @@ -68,7 +62,14 @@ %{python_sitearch}/twisted/plugins/twisted_names.py* +%if 0%{?fedora} >= 9 + %{python_sitearch}/Twisted_Names-%{version}-py2.5.egg-info +%endif + %changelog +* Fri Mar 07 2008 Jesse Keating - 0.4.0-3 +- Fix the egg info, drop the pyver stuff. + * Wed Feb 20 2008 Fedora Release Engineering - 0.4.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 17:14:06 2008 From: fedora-extras-commits at redhat.com (Eduardo Habkost (ehabkost)) Date: Fri, 7 Mar 2008 17:14:06 GMT Subject: rpms/kernel-xen-2.6/devel kernel.spec, 1.15, 1.16 config-xen-x86_64, 1.3, 1.4 Message-ID: <200803071714.m27HE6VM006503@cvs-int.fedora.redhat.com> Author: ehabkost Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6439 Modified Files: kernel.spec config-xen-x86_64 Log Message: Change PHYSICAL_START and SPARSEMEM_VMEMMAP on x86_64 .config So it doesn't explode on boot. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- kernel.spec 7 Mar 2008 11:08:23 -0000 1.15 +++ kernel.spec 7 Mar 2008 17:13:32 -0000 1.16 @@ -1852,6 +1852,10 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}xen.conf %{with_xen} xen %changelog +* Fri Mar 07 2008 Eduardo Habkost +- Change PHYSICAL_START and SPARSEMEM_VMEMMAP on x86_64 .config, so + it doesn't explode on boot + * Fri Mar 7 2008 Mark McLoughlin - Label everything in xen subpackage with %{kverrel}-xen to ensure xen-syms.debug goes into kernel-debuginfo-xen Index: config-xen-x86_64 =================================================================== RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/config-xen-x86_64,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-xen-x86_64 6 Mar 2008 13:59:25 -0000 1.3 +++ config-xen-x86_64 7 Mar 2008 17:13:32 -0000 1.4 @@ -3,3 +3,10 @@ # CONFIG_SMP is not set # CONFIG_NUMA is not set # CONFIG_NEED_MULTIPLE_NODES is not set + + +# x86_64 breaks with a different CONFIG_PHYSICAL_START, currently +CONFIG_PHYSICAL_START=0x200000 + +# x86_64 breaks with CONFIG_SPARSEMEM_VMEMMAP, currently +# CONFIG_SPARSEMEM_VMEMMAP is not set From fedora-extras-commits at redhat.com Fri Mar 7 17:14:29 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 17:14:29 GMT Subject: rpms/python-twisted-news/devel python-twisted-news.spec,1.3,1.4 Message-ID: <200803071714.m27HETLY006511@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-news/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6478 Modified Files: python-twisted-news.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 0.3.0-3 - Fix the egg issue, drop the pyver stuff. Index: python-twisted-news.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-news/devel/python-twisted-news.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-twisted-news.spec 20 Feb 2008 05:09:42 -0000 1.3 +++ python-twisted-news.spec 7 Mar 2008 17:13:49 -0000 1.4 @@ -1,12 +1,11 @@ %{?!python:%define python python} -%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define origname TwistedNews Name: %{python}-twisted-news Version: 0.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Twisted News is an NNTP server and programming library Group: Development/Libraries @@ -18,11 +17,6 @@ BuildRequires: %{python}-twisted-core >= 2.5.0 BuildRequires: python-devel -# for FC3 and earlier -%if "%{pybasever}" < "2.4" -Requires: python(abi) = %{pybasever} -%endif - Requires: %{python}-twisted-core >= 2.5.0 Requires: %{python}-twisted-mail @@ -62,7 +56,14 @@ %{python_sitearch}/twisted/plugins/twisted_news.py* +%if 0%{?fedora} >= 9 + %{python_sitearch}/Twisted_News-%{version}-py2.5.egg-info +%endif + %changelog +* Fri Mar 07 2008 Jesse Keating - 0.3.0-3 +- Fix the egg issue, drop the pyver stuff. + * Wed Feb 20 2008 Fedora Release Engineering - 0.3.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 17:17:13 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 17:17:13 GMT Subject: rpms/python-twisted-runner/devel python-twisted-runner.spec, 1.2, 1.3 Message-ID: <200803071717.m27HHDfJ006693@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-runner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6667 Modified Files: python-twisted-runner.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 0.2.0-6 - Fix the egg issue, drop the pyver stuff. Index: python-twisted-runner.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-runner/devel/python-twisted-runner.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-twisted-runner.spec 20 Feb 2008 05:10:38 -0000 1.2 +++ python-twisted-runner.spec 7 Mar 2008 17:16:36 -0000 1.3 @@ -1,12 +1,11 @@ %{?!python:%define python python} -%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define origname TwistedRunner Name: %{python}-twisted-runner Version: 0.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Twisted Runner process management library and inetd replacement Group: Development/Libraries @@ -18,11 +17,6 @@ BuildRequires: python-devel BuildRequires: %{python}-twisted-core >= 2.4.0 -# for FC3 and earlier -%if "%{pybasever}" < "2.4" -Requires: python(abi) = %{pybasever} -%endif - Requires: %{python}-twisted-core %description @@ -51,7 +45,14 @@ %{python_sitearch}/twisted/runner/ +%if 0%{?fedora} >= 9 + %{python_sitearch}/Twisted_Runner-%{version}-py2.5.egg-info +%endif + %changelog +* Fri Mar 07 2008 Jesse Keating - 0.2.0-6 +- Fix the egg issue, drop the pyver stuff. + * Wed Feb 20 2008 Fedora Release Engineering - 0.2.0-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 17:19:39 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 17:19:39 GMT Subject: rpms/python-twisted-web/devel python-twisted-web.spec,1.3,1.4 Message-ID: <200803071719.m27HJdZ9006807@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-web/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6776 Modified Files: python-twisted-web.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 0.7.0-3 - Handle egg issue, drop the pyver stuff. Index: python-twisted-web.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-web/devel/python-twisted-web.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-twisted-web.spec 20 Feb 2008 05:11:33 -0000 1.3 +++ python-twisted-web.spec 7 Mar 2008 17:19:05 -0000 1.4 @@ -1,12 +1,11 @@ %{?!python:%define python python} -%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define origname TwistedWeb Name: %{python}-twisted-web Version: 0.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Twisted web server, programmable in Python Group: Development/Libraries @@ -18,11 +17,6 @@ BuildRequires: %{python}-twisted-core >= 2.5.0 BuildRequires: %{python}-devel -# for FC3 and earlier -%if "%{pybasever}" < "2.4" -Requires: python(abi) = %{pybasever} -%endif - Requires: %{python}-twisted-core >= 2.5.0 Requires: SOAPpy @@ -65,7 +59,14 @@ %{python_sitearch}/twisted/plugins/twisted_web.py* +%if 0%{?fedora} >= 9 + %{python_sitearch}/Twisted_Web-%{version}-py2.5.egg-info +%endif + %changelog +* Fri Mar 07 2008 Jesse Keating - 0.7.0-3 +- Handle egg issue, drop the pyver stuff. + * Wed Feb 20 2008 Fedora Release Engineering - 0.7.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 17:22:39 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 7 Mar 2008 17:22:39 GMT Subject: rpms/python-twisted-words/devel python-twisted-words.spec,1.3,1.4 Message-ID: <200803071722.m27HMdun006938@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-twisted-words/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6913 Modified Files: python-twisted-words.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 0.5.0-3 - Handle the egg issue, drop the pyver stuff. Index: python-twisted-words.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-twisted-words/devel/python-twisted-words.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-twisted-words.spec 20 Feb 2008 05:12:24 -0000 1.3 +++ python-twisted-words.spec 7 Mar 2008 17:22:02 -0000 1.4 @@ -1,12 +1,11 @@ %{?!python:%define python python} -%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define origname TwistedWords Name: %{python}-twisted-words Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Twisted Words contains Instant Messaging implementations Group: Development/Libraries @@ -18,11 +17,6 @@ BuildRequires: %{python}-twisted-core >= 2.5.0 BuildRequires: %{python}-devel -# for FC3 and earlier -%if "%{pybasever}" < "2.4" -Requires: python(abi) = %{pybasever} -%endif - Requires: %{python}-twisted-core >= 2.5.0 # a noarch-turned-arch package should not have debuginfo @@ -73,7 +67,14 @@ %{python_sitearch}/twisted/plugins/twisted_words.py* +%if 0%{?fedora} >= 9 + %{python_sitearch}/Twisted_Words-%{version}-py2.5.egg-info +%endif + %changelog +* Fri Mar 07 2008 Jesse Keating - 0.5.0-3 +- Handle the egg issue, drop the pyver stuff. + * Wed Feb 20 2008 Fedora Release Engineering - 0.5.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 17:28:42 2008 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 7 Mar 2008 17:28:42 GMT Subject: comps comps-f7.xml.in, 1.317, 1.318 comps-f8.xml.in, 1.230, 1.231 comps-f9.xml.in, 1.294, 1.295 Message-ID: <200803071728.m27HSgss007128@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7100 Modified Files: comps-f7.xml.in comps-f8.xml.in comps-f9.xml.in Log Message: add pcmanfm Index: comps-f7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f7.xml.in,v retrieving revision 1.317 retrieving revision 1.318 diff -u -r1.317 -r1.318 --- comps-f7.xml.in 4 Mar 2008 21:10:01 -0000 1.317 +++ comps-f7.xml.in 7 Mar 2008 17:28:11 -0000 1.318 @@ -1675,6 +1675,7 @@ nautilus-open-terminal nautilus-search-tool panelfm + pcmanfm rss-glx-gnome-screensaver sabayon scim-input-pad Index: comps-f8.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f8.xml.in,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- comps-f8.xml.in 4 Mar 2008 21:10:01 -0000 1.230 +++ comps-f8.xml.in 7 Mar 2008 17:28:11 -0000 1.231 @@ -1793,6 +1793,7 @@ nautilus-open-terminal nautilus-search-tool panelfm + pcmanfm rss-glx-gnome-screensaver sabayon scim-input-pad Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- comps-f9.xml.in 7 Mar 2008 07:55:44 -0000 1.294 +++ comps-f9.xml.in 7 Mar 2008 17:28:11 -0000 1.295 @@ -1802,6 +1802,7 @@ nautilus-open-terminal nautilus-search-tool panelfm + pcmanfm rss-glx-gnome-screensaver sabayon scim-input-pad From fedora-extras-commits at redhat.com Fri Mar 7 17:35:51 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 7 Mar 2008 17:35:51 GMT Subject: rpms/kernel/devel patch-2.6.25-rc4-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.775, 1.776 kernel.spec, 1.480, 1.481 sources, 1.735, 1.736 upstream, 1.657, 1.658 Message-ID: <200803071735.m27HZp0x007415@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7361 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.25-rc4-git2.bz2.sign Log Message: * Fri Mar 07 2008 Dave Jones - 2.6.25-rc4-git2 --- NEW FILE patch-2.6.25-rc4-git2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBH0OlMyGugalF9Dw4RAqp8AJ43a4kL6rMfAbfqjb4NpoUMXJ2GQgCfYAFi ZtlrusuAX091d8kK0Bp8Cfo= =C8T4 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.775 retrieving revision 1.776 diff -u -r1.775 -r1.776 --- .cvsignore 5 Mar 2008 15:12:35 -0000 1.775 +++ .cvsignore 7 Mar 2008 17:35:11 -0000 1.776 @@ -5,3 +5,4 @@ kernel-2.6.24 linux-2.6.24.tar.bz2 patch-2.6.25-rc4.bz2 +patch-2.6.25-rc4-git2.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.480 retrieving revision 1.481 diff -u -r1.480 -r1.481 --- kernel.spec 7 Mar 2008 07:03:34 -0000 1.480 +++ kernel.spec 7 Mar 2008 17:35:11 -0000 1.481 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 4 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1170,7 +1170,7 @@ ApplyPatch linux-2.6-virtio_blk-fix-sysfs-bits.patch -ApplyPatch linux-2.6-blkcipher-depend-on-chainiv.patch +#ApplyPatch linux-2.6-blkcipher-depend-on-chainiv.patch # ---------- below all scheduled for 2.6.24 ----------------- @@ -1757,6 +1757,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Fri Mar 07 2008 Dave Jones +- 2.6.25-rc4-git2 + * Fri Mar 07 2008 Dave Airlie - drm/modeset - fix unload and overly-large size alloc Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.735 retrieving revision 1.736 diff -u -r1.735 -r1.736 --- sources 5 Mar 2008 15:12:35 -0000 1.735 +++ sources 7 Mar 2008 17:35:11 -0000 1.736 @@ -1,2 +1,3 @@ 3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2 a4cc0fd5bda60e498246b6d69c873895 patch-2.6.25-rc4.bz2 +c5ef4bb448856fd4aa88f4444c7ebdf9 patch-2.6.25-rc4-git2.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.657 retrieving revision 1.658 diff -u -r1.657 -r1.658 --- upstream 5 Mar 2008 15:12:35 -0000 1.657 +++ upstream 7 Mar 2008 17:35:11 -0000 1.658 @@ -1,2 +1,3 @@ linux-2.6.24.tar.bz2 patch-2.6.25-rc4.bz2 +patch-2.6.25-rc4-git2.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 17:36:10 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 7 Mar 2008 17:36:10 GMT Subject: rpms/kernel/devel/scripts rebase.sh,1.13,1.14 Message-ID: <200803071736.m27HaAaX007420@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7361/scripts Modified Files: rebase.sh Log Message: * Fri Mar 07 2008 Dave Jones - 2.6.25-rc4-git2 Index: rebase.sh =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- rebase.sh 26 Feb 2008 20:34:04 -0000 1.13 +++ rebase.sh 7 Mar 2008 17:35:21 -0000 1.14 @@ -155,9 +155,9 @@ cvs add patch-$NEW.bz2.sign if [ "$OLDGIT" -ne 0 ]; then rm -f patch-$OLD.bz2 + rm -f patch-$OLD.bz2.sign + cvs remove patch-$OLD.bz2.sign fi - rm -f patch-$OLD.bz2.sign - cvs remove patch-$OLD.bz2.sign fi if [ "$OLDRC" != "$NEWRC" -o "$OLDGIT" != "$NEWGIT" ]; then From fedora-extras-commits at redhat.com Fri Mar 7 17:43:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:43:52 +0000 Subject: [pkgdb] oyranos was added for kwizart Message-ID: <200803071745.m27HjVuR022133@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package oyranos with summary The Oyranos Colour Management System (CMS) Kevin Fenzi (kevin) has approved Package oyranos Kevin Fenzi (kevin) has added a Fedora devel branch for oyranos with an owner of kwizart Kevin Fenzi (kevin) has approved oyranos in Fedora devel Kevin Fenzi (kevin) has approved Package oyranos Kevin Fenzi (kevin) has set commit to Approved for cvsextras on oyranos (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on oyranos (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on oyranos (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/oyranos From fedora-extras-commits at redhat.com Fri Mar 7 17:43:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:43:48 +0000 Subject: [pkgdb] oyranos (Fedora, 8) updated by kevin Message-ID: <200803071745.m27Hjfg3022157@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for oyranos Kevin Fenzi (kevin) has set commit to Approved for cvsextras on oyranos (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on oyranos (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on oyranos (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on oyranos (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/oyranos From fedora-extras-commits at redhat.com Fri Mar 7 17:43:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:43:48 +0000 Subject: [pkgdb] oyranos (Fedora, devel) updated by kevin Message-ID: <200803071745.m27Hjfg6022157@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on oyranos (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/oyranos From fedora-extras-commits at redhat.com Fri Mar 7 17:44:40 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:44:40 GMT Subject: rpms/oyranos - New directory Message-ID: <200803071744.m27Hiehq007748@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/oyranos In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRE7685/rpms/oyranos Log Message: Directory /cvs/extras/rpms/oyranos added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:44:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:44:46 GMT Subject: rpms/oyranos/devel - New directory Message-ID: <200803071744.m27HikBg007764@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/oyranos/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRE7685/rpms/oyranos/devel Log Message: Directory /cvs/extras/rpms/oyranos/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:44:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:44:53 GMT Subject: rpms/oyranos Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803071744.m27HirFu007803@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/oyranos In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRE7685/rpms/oyranos Added Files: Makefile import.log Log Message: Setup of module oyranos --- NEW FILE Makefile --- # Top level Makefile for module oyranos all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 17:44:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:44:56 GMT Subject: rpms/oyranos/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803071744.m27HiuVp007821@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/oyranos/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRE7685/rpms/oyranos/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module oyranos --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: oyranos # $Id: Makefile,v 1.1 2008/03/07 17:44:53 kevin Exp $ NAME := oyranos SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 17:45:19 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Fri, 7 Mar 2008 17:45:19 GMT Subject: rpms/python-fedora/devel .cvsignore, 1.6, 1.7 python-fedora.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200803071745.m27HjJpV007945@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7662 Modified Files: .cvsignore python-fedora.spec sources Log Message: - Small updates to description of -infrastructure as we're no longer tied to Fedora Infrastructure boxes. - Changes to accomodate FAS2 - Changes to use TG-1.0.4, and SQLAlchemy-0.4. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 15 Dec 2007 03:27:43 -0000 1.6 +++ .cvsignore 7 Mar 2008 17:44:37 -0000 1.7 @@ -1 +1 @@ -python-fedora-0.2.90.22.tar.gz +python-fedora-0.2.99.2.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-fedora.spec 15 Dec 2007 03:27:43 -0000 1.8 +++ python-fedora.spec 7 Mar 2008 17:44:37 -0000 1.9 @@ -2,8 +2,8 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: python-fedora -Version: 0.2.90.22 -Release: 1%{?dist} +Version: 0.2.99.2 +Release: 2%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services Group: Development/Languages @@ -23,23 +23,19 @@ MirrorManager, and FAS2. %package infrastructure -Summary: Python modules for building Fedora Infrastructure Services +Summary: Python modules for building Fedora Services Group: Development/Languages Requires: %{name} = %{version}-%{release} Requires: python-psycopg2 Requires: python-bugzilla Requires: python-feedparser Requires: python-ldap -# This can go away when TurboGears can use SQLAlchemy >= 0.4 -%if 0%{?fedora} >= 8 -Requires: python-sqlalchemy0.3 -%else Requires: python-sqlalchemy -%endif %description infrastructure -Additional python modules that can be used on Fedora Infrastructure Servers to -help build new services. This includes the server's authentication providers. +Additional python modules that can be used to help create Fedora Services. +This includes the a JSON-based auth provider for authenticating against FAS2 +over the network. %prep %setup -q @@ -63,7 +59,7 @@ %doc README COPYING AUTHORS ChangeLog %dir %{python_sitelib}/fedora %dir %{python_sitelib}/fedora/tg -%{python_sitelib}/fedora/__init__.py* +%{python_sitelib}/fedora/*.py* %{python_sitelib}/fedora/tg/__init__.py* %{python_sitelib}/fedora/tg/client.py* %{python_sitelib}/python_fedora-%{version}-py%{pyver}.egg-info @@ -74,8 +70,23 @@ %{python_sitelib}/fedora/tg/identity/ %{python_sitelib}/fedora/tg/visit/ %{python_sitelib}/fedora/tg/widgets.py* +%{python_sitelib}/fedora/tg/json.py* %changelog +* Fri Mar 7 2008 Toshio Kuratomi - 0.2.99.2-2 +- Small updates to description of -infrastructure as we're no longer tied to + Fedora Infrastructure boxes. + +* Mon Mar 3 2008 Toshio Kuratomi - 0.2.99.2-1 +- Third beta. Changes to accomodate FAS2 included as FAS2, TG-1.0.4, and + SA-0.4 are going to all roll into the new platform together. + +* Sun Feb 17 2008 Toshio Kuratomi - 0.2.99.1-1 +- Second beta. + +* Wed Feb 13 2008 Toshio Kuratomi - 0.2.99.0-1 +- First beta of new release. This release is for TG-1.0.4 and SA-0.4. + * Thu Dec 13 2007 Luke Macken - 0.2.90.22-1 - Convert fasLDAP to get its connection information fedora-db-access. - Add requirements for python-feedparser and python-bugzilla Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Dec 2007 03:27:43 -0000 1.6 +++ sources 7 Mar 2008 17:44:37 -0000 1.7 @@ -1 +1 @@ -ce0a83effddd99e29aef6c0731f168bf python-fedora-0.2.90.22.tar.gz +76d1ad63b86b35dddf8360230986dc6c python-fedora-0.2.99.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 17:45:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:45:39 +0000 Subject: [pkgdb] webcpp was added for furby Message-ID: <200803071747.m27HlW7t022348@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package webcpp with summary Convert C++ code to HTML Kevin Fenzi (kevin) has approved Package webcpp Kevin Fenzi (kevin) has added a Fedora devel branch for webcpp with an owner of furby Kevin Fenzi (kevin) has approved webcpp in Fedora devel Kevin Fenzi (kevin) has approved Package webcpp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on webcpp (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on webcpp (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on webcpp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/webcpp From fedora-extras-commits at redhat.com Fri Mar 7 17:46:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:46:08 +0000 Subject: [pkgdb] webcpp (Fedora, 8) updated by kevin Message-ID: <200803071747.m27HllDW022378@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for webcpp Kevin Fenzi (kevin) has set commit to Approved for cvsextras on webcpp (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on webcpp (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on webcpp (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on webcpp (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/webcpp From fedora-extras-commits at redhat.com Fri Mar 7 17:46:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:46:09 +0000 Subject: [pkgdb] webcpp (Fedora, devel) updated by kevin Message-ID: <200803071747.m27HllDZ022378@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on webcpp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/webcpp From fedora-extras-commits at redhat.com Fri Mar 7 17:47:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:47:05 GMT Subject: rpms/webcpp - New directory Message-ID: <200803071747.m27Hl5eO008101@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/webcpp In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswA8044/rpms/webcpp Log Message: Directory /cvs/extras/rpms/webcpp added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:47:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:47:08 GMT Subject: rpms/webcpp/devel - New directory Message-ID: <200803071747.m27Hl8iJ008117@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/webcpp/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswA8044/rpms/webcpp/devel Log Message: Directory /cvs/extras/rpms/webcpp/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:47:12 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:47:12 GMT Subject: rpms/webcpp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803071747.m27HlCnF008146@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/webcpp In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswA8044/rpms/webcpp Added Files: Makefile import.log Log Message: Setup of module webcpp --- NEW FILE Makefile --- # Top level Makefile for module webcpp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 17:47:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:47:19 GMT Subject: rpms/webcpp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803071747.m27HlJqe008169@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/webcpp/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswA8044/rpms/webcpp/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module webcpp --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: webcpp # $Id: Makefile,v 1.1 2008/03/07 17:47:12 kevin Exp $ NAME := webcpp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 17:47:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:47:47 +0000 Subject: [pkgdb] ocaml-json-wheel was added for rjones Message-ID: <200803071749.m27HneT4022558@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocaml-json-wheel with summary OCaml library for parsing JSON Kevin Fenzi (kevin) has approved Package ocaml-json-wheel Kevin Fenzi (kevin) has added a Fedora devel branch for ocaml-json-wheel with an owner of rjones Kevin Fenzi (kevin) has approved ocaml-json-wheel in Fedora devel Kevin Fenzi (kevin) has approved Package ocaml-json-wheel Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-json-wheel (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-json-wheel (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-json-wheel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel From fedora-extras-commits at redhat.com Fri Mar 7 17:48:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:48:13 +0000 Subject: [pkgdb] ocaml-json-wheel (Fedora, 8) updated by kevin Message-ID: <200803071749.m27HnqrC022588@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocaml-json-wheel Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocaml-json-wheel (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocaml-json-wheel (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocaml-json-wheel (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-json-wheel (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel From fedora-extras-commits at redhat.com Fri Mar 7 17:48:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:48:13 +0000 Subject: [pkgdb] ocaml-json-wheel (Fedora, devel) updated by kevin Message-ID: <200803071749.m27HnqrF022588@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocaml-json-wheel (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel From fedora-extras-commits at redhat.com Fri Mar 7 17:48:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:48:44 GMT Subject: rpms/ocaml-json-wheel - New directory Message-ID: <200803071748.m27Hmi53008328@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-json-wheel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw8288/rpms/ocaml-json-wheel Log Message: Directory /cvs/extras/rpms/ocaml-json-wheel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:48:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:48:53 GMT Subject: rpms/ocaml-json-wheel Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803071748.m27HmrZs008370@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-json-wheel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw8288/rpms/ocaml-json-wheel Added Files: Makefile import.log Log Message: Setup of module ocaml-json-wheel --- NEW FILE Makefile --- # Top level Makefile for module ocaml-json-wheel all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 17:48:48 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:48:48 GMT Subject: rpms/ocaml-json-wheel/devel - New directory Message-ID: <200803071748.m27HmmJr008343@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-json-wheel/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw8288/rpms/ocaml-json-wheel/devel Log Message: Directory /cvs/extras/rpms/ocaml-json-wheel/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:48:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:48:59 GMT Subject: rpms/ocaml-json-wheel/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803071748.m27HmxEf008386@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocaml-json-wheel/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIw8288/rpms/ocaml-json-wheel/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocaml-json-wheel --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocaml-json-wheel # $Id: Makefile,v 1.1 2008/03/07 17:48:53 kevin Exp $ NAME := ocaml-json-wheel SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 17:50:13 2008 From: fedora-extras-commits at redhat.com (Krzysztof Kurzawski (kurzawa)) Date: Fri, 7 Mar 2008 17:50:13 GMT Subject: rpms/taskcoach/F-8 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 taskcoach.spec, 1.3, 1.4 Message-ID: <200803071750.m27HoDhN008519@cvs-int.fedora.redhat.com> Author: kurzawa Update of /cvs/pkgs/rpms/taskcoach/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8488 Modified Files: .cvsignore sources taskcoach.spec Log Message: Bumping release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2008 10:37:20 -0000 1.2 +++ .cvsignore 7 Mar 2008 17:49:38 -0000 1.3 @@ -1 +1 @@ -TaskCoach-0.68.0.tar.gz +TaskCoach-0.69.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2008 10:37:20 -0000 1.2 +++ sources 7 Mar 2008 17:49:38 -0000 1.3 @@ -1 +1 @@ -2ae1f1349d6a0df6d8c739abe361c714 TaskCoach-0.68.0.tar.gz +8f6ab0b81ac4e6911946d46d6b711921 TaskCoach-0.69.1.tar.gz Index: taskcoach.spec =================================================================== RCS file: /cvs/pkgs/rpms/taskcoach/F-8/taskcoach.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- taskcoach.spec 7 Mar 2008 15:33:10 -0000 1.3 +++ taskcoach.spec 7 Mar 2008 17:49:38 -0000 1.4 @@ -3,7 +3,7 @@ Name: taskcoach Version: 0.69.1 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Your friendly task manager Summary(pl): Tw??j przyjazny menad??er zada?? Group: Applications/Productivity @@ -87,6 +87,9 @@ %exclude %{python_sitelib}/buildlib/ %changelog +* Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-2.1 +- Bumping release + * Thu Mar 06 2008 Krzysztof Kurzawski 0.69.1-2 - Increase release From fedora-extras-commits at redhat.com Fri Mar 7 17:52:39 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 7 Mar 2008 17:52:39 GMT Subject: rpms/openoffice.org/devel workspace.cmcfixes43.patch, 1.1.2.1, 1.1.2.2 Message-ID: <200803071752.m27Hqdhe008676@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8642 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 workspace.cmcfixes43.patch Log Message: add workspace.cmcfixes43.patch workspace.cmcfixes43.patch: Index: workspace.cmcfixes43.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/Attic/workspace.cmcfixes43.patch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- workspace.cmcfixes43.patch 7 Mar 2008 17:05:50 -0000 1.1.2.1 +++ workspace.cmcfixes43.patch 7 Mar 2008 17:52:31 -0000 1.1.2.2 @@ -30731,18 +30731,6 @@ MYSPELLLIB= $(LIBPRE) myspell.lib COSVLIB= $(LIBPRE) cosv.lib UDMLIB= $(LIBPRE) udm.lib -Index: porting/crashrep/source/unx/main.cxx -diff -u porting/crashrep/source/unx/main.cxx:1.26 porting/crashrep/source/unx/main.cxx:1.26.44.1 ---- porting/crashrep/source/unx/main.cxx:1.26 Mon Jan 29 07:14:53 2007 -+++ porting/crashrep/source/unx/main.cxx Mon Mar 3 03:29:40 2008 -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - - #include - #include Index: udk/stoc/test/registry_tdprovider/makefile.mk diff -u udk/stoc/test/registry_tdprovider/makefile.mk:1.4 udk/stoc/test/registry_tdprovider/makefile.mk:1.4.88.1 --- udk/stoc/test/registry_tdprovider/makefile.mk:1.4 Thu Sep 8 01:30:08 2005 From fedora-extras-commits at redhat.com Fri Mar 7 17:53:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:53:22 +0000 Subject: [pkgdb] sigscheme was added for tagoh Message-ID: <200803071755.m27Ht1u6022958@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package sigscheme with summary R5RS Scheme interpreter for embedded use Kevin Fenzi (kevin) has approved Package sigscheme Kevin Fenzi (kevin) has added a Fedora devel branch for sigscheme with an owner of tagoh Kevin Fenzi (kevin) has approved sigscheme in Fedora devel Kevin Fenzi (kevin) has approved Package sigscheme Kevin Fenzi (kevin) has set commit to Approved for cvsextras on sigscheme (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on sigscheme (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on sigscheme (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sigscheme From fedora-extras-commits at redhat.com Fri Mar 7 17:53:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:53:24 +0000 Subject: [pkgdb] sigscheme (Fedora, devel) updated by kevin Message-ID: <200803071755.m27Ht1u9022958@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on sigscheme (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/sigscheme From fedora-extras-commits at redhat.com Fri Mar 7 17:53:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:53:20 +0000 Subject: [pkgdb] gnome-web-photo: mpg has requested watchbugzilla Message-ID: <200803071755.m27HtDGA022999@bastion.fedora.phx.redhat.com> Marco Pesenti Gritti (mpg) has requested the watchbugzilla acl on gnome-web-photo (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo From fedora-extras-commits at redhat.com Fri Mar 7 17:53:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:53:34 +0000 Subject: [pkgdb] gnome-web-photo: mpg has requested watchcommits Message-ID: <200803071755.m27Ht1uB022958@bastion.fedora.phx.redhat.com> Marco Pesenti Gritti (mpg) has requested the watchcommits acl on gnome-web-photo (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo From fedora-extras-commits at redhat.com Fri Mar 7 17:53:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:53:24 +0000 Subject: [pkgdb] gnome-web-photo: mpg has requested commit Message-ID: <200803071755.m27HtDGD022999@bastion.fedora.phx.redhat.com> Marco Pesenti Gritti (mpg) has requested the commit acl on gnome-web-photo (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo From fedora-extras-commits at redhat.com Fri Mar 7 17:54:29 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Fri, 7 Mar 2008 17:54:29 GMT Subject: rpms/cups/devel cups.spec,1.401,1.402 Message-ID: <200803071754.m27HsTnk008770@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/cups/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8744 Modified Files: cups.spec Log Message: More adjustments for svn builds. Index: cups.spec =================================================================== RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v retrieving revision 1.401 retrieving revision 1.402 diff -u -r1.401 -r1.402 --- cups.spec 5 Mar 2008 16:26:51 -0000 1.401 +++ cups.spec 7 Mar 2008 17:53:50 -0000 1.402 @@ -1,4 +1,4 @@ -#define svn 7356 +#define svn 7370 %define initdir /etc/rc.d/init.d %define use_alternatives 1 %define lspp 1 @@ -58,6 +58,9 @@ Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat Prereq: /usr/sbin/alternatives %endif +%if %{?svn:1}%{!?svn:0} +Requires: poppler-utils +%endif # Unconditionally obsolete LPRng so that upgrades work properly. Obsoletes: lpd lpr LPRng <= 3.8.15-3 @@ -183,9 +186,8 @@ %if %lspp --enable-lspp \ %endif - %{?svn:--enable-pdftops} \ --with-log-file-perm=0600 --enable-pie --enable-relro \ - --with-dbusdir=%{_sysconfdir}/dbus-1 \ + --enable-pdftops --with-dbusdir=%{_sysconfdir}/dbus-1 \ localedir=%{_datadir}/locale # If we got this far, all prerequisite libraries must be here. @@ -277,6 +279,8 @@ %if %{?svn:1}%{!?svn:0} rm -f $RPM_BUILD_ROOT%{_bindir}/ppd{c,html,i,merge,po} +rm -f $RPM_BUILD_ROOT%{cups_serverbin}/filter/{command,raster}to{escpx,pclx} +rm -f $RPM_BUILD_ROOT%{cups_serverbin}/driver/drv rm -rf $RPM_BUILD_ROOT%{_datadir}/cups/ppdc %endif From fedora-extras-commits at redhat.com Fri Mar 7 17:55:00 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:55:00 GMT Subject: rpms/sigscheme - New directory Message-ID: <200803071755.m27Ht0Y5008820@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sigscheme In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWV8787/rpms/sigscheme Log Message: Directory /cvs/extras/rpms/sigscheme added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:55:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:55:05 GMT Subject: rpms/sigscheme/devel - New directory Message-ID: <200803071755.m27Ht5sX008839@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sigscheme/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWV8787/rpms/sigscheme/devel Log Message: Directory /cvs/extras/rpms/sigscheme/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:55:10 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:55:10 GMT Subject: rpms/sigscheme Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803071755.m27HtAR6008865@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sigscheme In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWV8787/rpms/sigscheme Added Files: Makefile import.log Log Message: Setup of module sigscheme --- NEW FILE Makefile --- # Top level Makefile for module sigscheme all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 17:55:14 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:55:14 GMT Subject: rpms/sigscheme/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803071755.m27HtEMQ008885@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/sigscheme/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWV8787/rpms/sigscheme/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sigscheme --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: sigscheme # $Id: Makefile,v 1.1 2008/03/07 17:55:10 kevin Exp $ NAME := sigscheme SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 17:56:01 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 7 Mar 2008 17:56:01 GMT Subject: rpms/kernel/devel kernel.spec, 1.481, 1.482 linux-2.6-blkcipher-depend-on-chainiv.patch, 1.2, NONE Message-ID: <200803071756.m27Hu1aE008942@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8905 Modified Files: kernel.spec Removed Files: linux-2.6-blkcipher-depend-on-chainiv.patch Log Message: I think 76fc60a2e3c6aa6e98cd3a5cb81a1855c637b274 obsoletes this. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.481 retrieving revision 1.482 diff -u -r1.481 -r1.482 --- kernel.spec 7 Mar 2008 17:35:11 -0000 1.481 +++ kernel.spec 7 Mar 2008 17:55:27 -0000 1.482 @@ -654,9 +654,6 @@ Patch2503: linux-2.6-virtio_blk-fix-sysfs-bits.patch -### HACK ### -Patch2502: linux-2.6-blkcipher-depend-on-chainiv.patch - %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu} @@ -1170,8 +1167,6 @@ ApplyPatch linux-2.6-virtio_blk-fix-sysfs-bits.patch -#ApplyPatch linux-2.6-blkcipher-depend-on-chainiv.patch - # ---------- below all scheduled for 2.6.24 ----------------- # END OF PATCH APPLICATIONS --- linux-2.6-blkcipher-depend-on-chainiv.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 7 17:56:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:56:41 +0000 Subject: [pkgdb] extremetuxracer was added for nphilipp Message-ID: <200803071758.m27HwK6E023376@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package extremetuxracer with summary 3D racing game featuring Tux Kevin Fenzi (kevin) has approved Package extremetuxracer Kevin Fenzi (kevin) has added a Fedora devel branch for extremetuxracer with an owner of nphilipp Kevin Fenzi (kevin) has approved extremetuxracer in Fedora devel Kevin Fenzi (kevin) has approved Package extremetuxracer Kevin Fenzi (kevin) has set commit to Approved for cvsextras on extremetuxracer (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on extremetuxracer (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on extremetuxracer (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/extremetuxracer From fedora-extras-commits at redhat.com Fri Mar 7 17:56:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:56:44 +0000 Subject: [pkgdb] gnome-web-photo had acl change status Message-ID: <200803071758.m27Hwb4r023419@bastion.fedora.phx.redhat.com> Bastien Nocera (hadess) has set the watchbugzilla acl on gnome-web-photo (Fedora devel) to Approved for Marco Pesenti Gritti (mpg) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo From fedora-extras-commits at redhat.com Fri Mar 7 17:56:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:56:46 +0000 Subject: [pkgdb] gnome-web-photo had acl change status Message-ID: <200803071758.m27Hwb4u023419@bastion.fedora.phx.redhat.com> Bastien Nocera (hadess) has set the watchcommits acl on gnome-web-photo (Fedora devel) to Approved for Marco Pesenti Gritti (mpg) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo From fedora-extras-commits at redhat.com Fri Mar 7 17:57:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:57:02 +0000 Subject: [pkgdb] extremetuxracer (Fedora, 8) updated by kevin Message-ID: <200803071758.m27HwK6H023376@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for extremetuxracer Kevin Fenzi (kevin) has set commit to Approved for cvsextras on extremetuxracer (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on extremetuxracer (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on extremetuxracer (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on extremetuxracer (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/extremetuxracer From fedora-extras-commits at redhat.com Fri Mar 7 17:57:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:57:02 +0000 Subject: [pkgdb] extremetuxracer (Fedora, 7) updated by kevin Message-ID: <200803071758.m27HwK6K023376@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for extremetuxracer Kevin Fenzi (kevin) has set commit to Approved for cvsextras on extremetuxracer (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on extremetuxracer (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on extremetuxracer (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on extremetuxracer (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/extremetuxracer From fedora-extras-commits at redhat.com Fri Mar 7 17:56:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:56:50 +0000 Subject: [pkgdb] gnome-web-photo had acl change status Message-ID: <200803071758.m27HwhmX023496@bastion.fedora.phx.redhat.com> Bastien Nocera (hadess) has set the commit acl on gnome-web-photo (Fedora devel) to Approved for Marco Pesenti Gritti (mpg) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/gnome-web-photo From fedora-extras-commits at redhat.com Fri Mar 7 17:57:02 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:57:02 +0000 Subject: [pkgdb] extremetuxracer (Fedora, devel) updated by kevin Message-ID: <200803071758.m27HwgNU023494@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on extremetuxracer (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/extremetuxracer From fedora-extras-commits at redhat.com Fri Mar 7 17:57:50 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:57:50 GMT Subject: rpms/extremetuxracer - New directory Message-ID: <200803071757.m27HvoP5009025@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/extremetuxracer In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbV8979/rpms/extremetuxracer Log Message: Directory /cvs/extras/rpms/extremetuxracer added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:57:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:57:59 GMT Subject: rpms/extremetuxracer/devel - New directory Message-ID: <200803071757.m27HvxSS009046@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/extremetuxracer/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbV8979/rpms/extremetuxracer/devel Log Message: Directory /cvs/extras/rpms/extremetuxracer/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:58:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:58:08 GMT Subject: rpms/extremetuxracer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803071758.m27Hw8t5009076@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/extremetuxracer In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbV8979/rpms/extremetuxracer Added Files: Makefile import.log Log Message: Setup of module extremetuxracer --- NEW FILE Makefile --- # Top level Makefile for module extremetuxracer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 17:58:14 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:58:14 GMT Subject: rpms/extremetuxracer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803071758.m27HwEpI009096@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/extremetuxracer/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbV8979/rpms/extremetuxracer/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module extremetuxracer --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: extremetuxracer # $Id: Makefile,v 1.1 2008/03/07 17:58:08 kevin Exp $ NAME := extremetuxracer SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 17:58:39 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:58:39 +0000 Subject: [pkgdb] ggobi was added for mmahut Message-ID: <200803071800.m27I0Wpa023752@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ggobi with summary Open source visualization for exploring high-dimensional data Kevin Fenzi (kevin) has approved Package ggobi Kevin Fenzi (kevin) has added a Fedora devel branch for ggobi with an owner of mmahut Kevin Fenzi (kevin) has approved ggobi in Fedora devel Kevin Fenzi (kevin) has approved Package ggobi Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ggobi (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ggobi (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ggobi (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ggobi From fedora-extras-commits at redhat.com Fri Mar 7 17:58:44 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Fri, 7 Mar 2008 17:58:44 GMT Subject: rpms/gnome-web-photo/devel xulrunner19.patch, NONE, 1.1 gnome-web-photo.spec, 1.8, 1.9 Message-ID: <200803071758.m27HwiXV009308@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/gnome-web-photo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9042 Modified Files: gnome-web-photo.spec Added Files: xulrunner19.patch Log Message: * Fri Mar 7 2008 Marco Pesenti Gritti - 0.3-10 - Add patch to make it work with xulrunner 1.9 xulrunner19.patch: --- NEW FILE xulrunner19.patch --- diff -u -r gnome-web-photo-0.3-orig/configure.ac gnome-web-photo-0.3/configure.ac --- gnome-web-photo-0.3-orig/configure.ac 2008-03-07 18:41:35.000000000 +0100 +++ gnome-web-photo-0.3/configure.ac 2008-03-07 18:42:24.000000000 +0100 @@ -132,57 +132,12 @@ AM_GCONF_SOURCE_2 +# ********* +# Xulrunner +# ********* -# ******* -# Mozilla -# ******* - -GECKO_INIT([GECKO]) - -AC_SUBST([GECKO]) -AC_SUBST([GECKO_FLAVOUR]) -AC_SUBST([GECKO_INCLUDE_ROOT]) -AC_SUBST([GECKO_HOME]) -AC_SUBST([GECKO_PREFIX]) - -case "$GECKO" in -seamonkey) min_version=1.0 ;; -*firefox) min_version=1.4 ;; -xulrunner) min_version=1.8 ;; -esac - -PKG_CHECK_MODULES([GECKO], [${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_extra_pkg_dependencies}]) -AC_SUBST([GECKO_CFLAGS]) -AC_SUBST([GECKO_LIBS]) - -# In xulrunner, gkgfx is in libxul; for all others we need to -# explicitly link against it - -if test "$GECKO" != "xulrunner"; then - GECKO_EXTRA_LIBS="$GECKO_EXTRA_LIBS -lgkgfx" -fi - -AC_SUBST([GECKO_EXTRA_LIBS]) - -# Check for PSM headers - -AC_MSG_CHECKING([for mozilla security compoment]) -GECKO_COMPILE_IFELSE([pipnss], - [AC_LANG_PROGRAM( - [[#include ]], - [[nsIX509Cert *c; - c->GetIssuer (nsnull);]] - )], - [AC_DEFINE([HAVE_PSM], [1],[Define if you have the mozilla NSS headers installed]) have_psm=yes], - [have_psm=no]) -AC_MSG_RESULT([$have_psm]) - -AM_CONDITIONAL([HAVE_PSM],[test "x$have_psm" = "xyes"]) - -# Needed since 1.8b2 -# Define this down here so it doesn't affect the API checks above - -AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define for access to internal mozilla API]) +LIBXUL_INIT +LIBXUL_DEFINES # ****************** # Portability checks Only in gnome-web-photo-0.3: configure.ac.rej Only in gnome-web-photo-0.3/m4: libxul.m4 diff -u -r gnome-web-photo-0.3-orig/src/Components.cpp gnome-web-photo-0.3/src/Components.cpp --- gnome-web-photo-0.3-orig/src/Components.cpp 2008-03-07 18:41:35.000000000 +0100 +++ gnome-web-photo-0.3/src/Components.cpp 2008-03-07 18:41:44.000000000 +0100 @@ -137,80 +137,15 @@ return NS_OK; } -#ifdef HAVE_PSM - -#include - -#define NSSDIALOGS_CLASSNAME "Dummy NSS Dialogs" -#define NSSDIALOGS_CID { 0x128e643e, 0x8b28, 0x4eea, { 0x8d, 0xe7, 0x22, 0x4f, 0x5a, 0xa0, 0x56, 0x54 } } - -class NSSDialogs : public nsIBadCertListener -{ - public: - NS_DECL_ISUPPORTS - NS_DECL_NSIBADCERTLISTENER - - NSSDialogs () { } - ~NSSDialogs () { } -}; - -NS_IMPL_THREADSAFE_ISUPPORTS1 (NSSDialogs, nsIBadCertListener) - -/* boolean confirmUnknownIssuer (in nsIInterfaceRequestor socketInfo, in nsIX509Cert cert, out short certAddType); */ -NS_IMETHODIMP -NSSDialogs::ConfirmUnknownIssuer(nsIInterfaceRequestor *socketInfo, - nsIX509Cert *cert, - PRInt16 *certAddType, - PRBool *_retval) -{ - LOG ("ConfirmUnknownIssuer\n"); - *certAddType = nsIBadCertListener::ADD_TRUSTED_FOR_SESSION; - *_retval = PR_TRUE; - return NS_OK; -} - -/* boolean confirmMismatchDomain (in nsIInterfaceRequestor socketInfo, in AUTF8String targetURL, in nsIX509Cert cert); */ -NS_IMETHODIMP -NSSDialogs::ConfirmMismatchDomain(nsIInterfaceRequestor *socketInfo, - const nsACString & targetURL, - nsIX509Cert *cert, - PRBool *_retval) -{ - LOG ("ConfirmMismatchDomain\n"); - *_retval = PR_TRUE; - return NS_OK; -} - -/* boolean confirmCertExpired (in nsIInterfaceRequestor socketInfo, in nsIX509Cert cert); */ -NS_IMETHODIMP -NSSDialogs::ConfirmCertExpired(nsIInterfaceRequestor *socketInfo, - nsIX509Cert *cert, - PRBool *_retval) -{ - LOG ("ConfirmCertExpired\n"); - *_retval = PR_TRUE; - return NS_OK; -} - -/* void notifyCrlNextupdate (in nsIInterfaceRequestor socketInfo, in AUTF8String targetURL, in nsIX509Cert cert); */ -NS_IMETHODIMP -NSSDialogs::NotifyCrlNextupdate(nsIInterfaceRequestor *socketInfo, - const nsACString & targetURL, - nsIX509Cert *cert) -{ - LOG ("NotifyCrlNextupdate\n"); - return NS_OK; -} - -#endif /* HAVE_PSM */ - /* -------------------------------------------------------------------------- */ NS_GENERIC_FACTORY_CONSTRUCTOR(Prompter) +#ifndef HAVE_GECKO_1_9 #ifdef HAVE_PSM NS_GENERIC_FACTORY_CONSTRUCTOR(NSSDialogs) #endif +#endif /* HAVE_GECKO_1_9 */ static const nsModuleComponentInfo sAppComps[] = { @@ -220,14 +155,6 @@ NS_PROMPTSERVICE_CONTRACTID, PrompterConstructor }, -#ifdef HAVE_PSM - { - NSSDIALOGS_CLASSNAME, - NSSDIALOGS_CID, - NS_BADCERTLISTENER_CONTRACTID, - NSSDialogsConstructor - }, -#endif /* HAVE_PSM */ }; PRBool diff -u -r gnome-web-photo-0.3-orig/src/Listener.h gnome-web-photo-0.3/src/Listener.h --- gnome-web-photo-0.3-orig/src/Listener.h 2008-03-07 18:41:35.000000000 +0100 +++ gnome-web-photo-0.3/src/Listener.h 2008-03-07 18:41:44.000000000 +0100 @@ -23,7 +23,7 @@ #include #include -#include +#include #include class Listener : public nsIDOMLoadListener diff -u -r gnome-web-photo-0.3-orig/src/main.cpp gnome-web-photo-0.3/src/main.cpp --- gnome-web-photo-0.3-orig/src/main.cpp 2008-03-07 18:41:35.000000000 +0100 +++ gnome-web-photo-0.3/src/main.cpp 2008-03-07 18:41:46.000000000 +0100 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -336,6 +337,48 @@ static nsresult gecko_startup (void) { + nsresult rv; + + static const GREVersionRange greVersion = { + "1.9a", PR_TRUE, + "1.9.*", PR_TRUE + }; + char xpcomLocation[4096]; + rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); + if (NS_FAILED (rv)) + { + g_warning ("Could not get gre path!\n"); + return FALSE; + } + + // Startup the XPCOM Glue that links us up with XPCOM. + rv = XPCOMGlueStartup(xpcomLocation); + if (NS_FAILED (rv)) + { + g_warning ("Could not determine locale!\n"); + return FALSE; + } + + rv = GTKEmbedGlueStartup(); + if (NS_FAILED (rv)) + { + g_warning ("Could not startup glue!\n"); + return FALSE; + } + + rv = GTKEmbedGlueStartupInternal(); + if (NS_FAILED (rv)) + { + g_warning ("Could not startup internal glue!\n"); + return FALSE; + } + + char *lastSlash = strrchr(xpcomLocation, '/'); + if (lastSlash) + *lastSlash = '\0'; + + gtk_moz_embed_set_path(xpcomLocation); + /* BUG ALERT! If we don't have a profile, Gecko will crash on https sites and * when trying to open the password manager. The prefs will be set up so that * no cookies or passwords etc. will be persisted. @@ -345,12 +388,6 @@ gtk_moz_embed_set_profile_path (profile, "gnome-web-photo"); g_free (profile); -#ifdef HAVE_GECKO_1_9 - gtk_moz_embed_set_path (GECKO_HOME); -#else - gtk_moz_embed_set_comp_path (GECKO_HOME); -#endif - /* Fire up the beast! */ gtk_moz_embed_push_startup (); @@ -362,8 +399,6 @@ return NS_ERROR_FAILURE; } - nsresult rv = NS_OK; - if (mode != MODE_PRINT) { /* This prevents us from printing all pages, so only do it for photo/thumbnail */ nsCOMPtr sheetService (do_GetService ("@mozilla.org/content/style-sheet-service;1", &rv)); @@ -424,7 +459,6 @@ main (int argc, char **argv) { GtkWidget *window; - GdkScreen *screen; GOptionContext *context; GError *error = NULL; int i, len; @@ -596,11 +630,6 @@ /* Create window */ window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_role (GTK_WINDOW (window), "gnome-web-photo-hidden-window"); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE); - gtk_window_set_skip_pager_hint (GTK_WINDOW (window), TRUE); - gtk_window_set_focus_on_map (GTK_WINDOW (window), FALSE); - gEmbed = EMBED (g_object_new (TYPE_EMBED, NULL)); g_signal_connect (gEmbed, "ready", G_CALLBACK (embed_ready_cb), NULL); g_signal_connect (gEmbed, "print-done", G_CALLBACK (print_done_cb), NULL); @@ -608,13 +637,8 @@ gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (gEmbed)); #ifndef DEBUG_SHOW_WINDOW - /* Move the window off screen */ - screen = gtk_widget_get_screen (GTK_WIDGET (window)); - gtk_window_move (GTK_WINDOW (window), - gdk_screen_get_width (screen) + 100, - gdk_screen_get_height (screen) + 100); - gtk_widget_show_all (window); - gdk_window_hide (window->window); + gtk_widget_show(GTK_WIDGET(gEmbed)); + gtk_widget_realize(GTK_WIDGET(gEmbed)); #else gtk_widget_show_all (window); #endif diff -u -r gnome-web-photo-0.3-orig/src/Makefile.am gnome-web-photo-0.3/src/Makefile.am --- gnome-web-photo-0.3-orig/src/Makefile.am 2008-03-07 18:41:35.000000000 +0100 +++ gnome-web-photo-0.3/src/Makefile.am 2008-03-07 18:41:44.000000000 +0100 @@ -36,28 +36,31 @@ main.cpp gnome_web_photo_CPPFLAGS = \ + $(DEPENDENCY_CFLAGS) \ $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \ -DSHARE_DIR=\"$(pkgdatadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DGECKO_HOME=\"$(GECKO_HOME)\" \ -DGECKO_PREFIX=\"$(GECKO_PREFIX)\" \ + -DXPCOM_GLUE_USE_NSPR \ + -DXPCOM_GLUE \ $(AM_CPPFLAGS) gnome_web_photo_CXXFLAGS = \ $(DEPENDENCY_CFLAGS) \ - $(GECKO_CFLAGS) \ + $(LIBXUL_INCLUDES) \ + $(LIBXUL_CXXFLAGS) \ $(AM_CXXFLAGS) gnome_web_photo_LDFLAGS = \ - -R$(GECKO_HOME) \ + -R$(LIBXUL_LIBDIR) \ $(AM_LDFLAGS) gnome_web_photo_LDADD = \ $(DEPENDENCY_LIBS) \ $(JPEG_LIBS) \ - $(GECKO_LIBS) \ - $(GECKO_EXTRA_LIBS) - + $(LIBXUL_LIBS) \ + -lxpcomglue install-exec-hook: gnome-web-photo cd $(DESTDIR)$(bindir) && \ diff -u -r gnome-web-photo-0.3-orig/src/Prefs.cpp gnome-web-photo-0.3/src/Prefs.cpp --- gnome-web-photo-0.3-orig/src/Prefs.cpp 2008-03-07 18:41:35.000000000 +0100 +++ gnome-web-photo-0.3/src/Prefs.cpp 2008-03-07 18:41:44.000000000 +0100 @@ -26,9 +26,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff -u -r gnome-web-photo-0.3-orig/src/Printer.cpp gnome-web-photo-0.3/src/Printer.cpp --- gnome-web-photo-0.3-orig/src/Printer.cpp 2008-03-07 18:41:35.000000000 +0100 +++ gnome-web-photo-0.3/src/Printer.cpp 2008-03-07 18:41:44.000000000 +0100 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -44,10 +45,10 @@ , mPrintBG(aPrintBG) { if (aFilename[0] == '/') { - NS_CopyNativeToUnicode (nsDependentCString(aFilename), mFilename); + NS_CStringToUTF16 (nsCString (aFilename), NS_CSTRING_ENCODING_UTF8, mFilename); } else { char *path = g_build_filename (g_get_current_dir(), aFilename, NULL); - NS_CopyNativeToUnicode (nsDependentCString(path), mFilename); + NS_CStringToUTF16 (nsCString (path), NS_CSTRING_ENCODING_UTF8, mFilename); g_free(path); } } @@ -100,7 +101,6 @@ { aSettings->SetPrinterName (NS_LITERAL_STRING("PostScript/default").get()); aSettings->SetPrintRange (nsIPrintSettings::kRangeAllPages); - aSettings->SetPaperSize (nsIPrintSettings::kPaperSizeDefined); aSettings->SetPaperSizeUnit (nsIPrintSettings::kPaperSizeMillimeters); aSettings->SetPaperWidth (210.0); aSettings->SetPaperHeight (297.0); diff -u -r gnome-web-photo-0.3-orig/src/Printer.h gnome-web-photo-0.3/src/Printer.h --- gnome-web-photo-0.3-orig/src/Printer.h 2008-03-07 18:41:35.000000000 +0100 +++ gnome-web-photo-0.3/src/Printer.h 2008-03-07 18:41:44.000000000 +0100 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include class nsIPrintSettings; diff -u -r gnome-web-photo-0.3-orig/src/Writer.cpp gnome-web-photo-0.3/src/Writer.cpp --- gnome-web-photo-0.3-orig/src/Writer.cpp 2008-03-07 18:41:35.000000000 +0100 +++ gnome-web-photo-0.3/src/Writer.cpp 2008-03-07 18:41:44.000000000 +0100 @@ -37,13 +37,13 @@ #include #include #include +#include #include -#include -#include +#include #include #include -#include -#include +#include +#include #include #include #include @@ -78,43 +78,24 @@ { NS_ENSURE_STATE (mEmbed); - PRBool retval = PR_FALSE; - nsresult rv; nsCOMPtr browser; gtk_moz_embed_get_nsIWebBrowser (mEmbed, getter_AddRefs (browser)); - NS_ENSURE_TRUE (browser, retval); + NS_ENSURE_TRUE (browser, PR_FALSE); nsCOMPtr domWin; rv = browser->GetContentDOMWindow (getter_AddRefs (domWin)); - NS_ENSURE_SUCCESS (rv, retval); + NS_ENSURE_SUCCESS (rv, PR_FALSE); nsCOMPtr domDoc; rv = domWin->GetDocument (getter_AddRefs (domDoc)); - NS_ENSURE_SUCCESS (rv, retval); + NS_ENSURE_SUCCESS (rv, PR_FALSE); nsCOMPtr doc (do_QueryInterface (domDoc, &rv)); - NS_ENSURE_SUCCESS (rv, retval); - - nsCOMPtr docShellAsISupports (doc->GetContainer ()); - nsCOMPtr docShell (do_QueryInterface (docShellAsISupports, &rv)); - NS_ENSURE_SUCCESS (rv, retval); - - nsCOMPtr presShell; - rv = docShell->GetPresShell (getter_AddRefs (presShell)); - NS_ENSURE_SUCCESS (rv, retval); - - nsCOMPtr presContext; - rv = docShell->GetPresContext (getter_AddRefs (presContext)); - NS_ENSURE_SUCCESS (rv, retval); - - rv = NS_ERROR_NULL_POINTER; - nsIViewManager *viewManager = presShell->GetViewManager (); - NS_ENSURE_TRUE (viewManager, retval); + NS_ENSURE_SUCCESS (rv, PR_FALSE); /* Get document information */ CopyUTF16toUTF8 (doc->GetDocumentTitle(), mTitle); - mTitle.CompressWhitespace(PR_TRUE, PR_TRUE); nsIURI *uri = doc->GetDocumentURI(); if (uri) { @@ -123,6 +104,20 @@ doc->FlushPendingNotifications (Flush_Display); + nsCOMPtr docShell (do_GetInterface (browser, &rv)); + NS_ENSURE_SUCCESS (rv, rv); + + nsCOMPtr presShell; + rv = docShell->GetPresShell (getter_AddRefs (presShell)); + NS_ENSURE_SUCCESS (rv, PR_FALSE); + + nsIViewManager *viewManager = presShell->GetViewManager (); + NS_ENSURE_TRUE (viewManager, PR_FALSE); + + nsIDeviceContext *dc; + viewManager->GetDeviceContext (dc); + NS_ENSURE_TRUE (dc, PR_FALSE); + nsIScrollableView* scrollableView = nsnull; viewManager->GetRootScrollableView (&scrollableView); nsIView* view; @@ -132,15 +127,11 @@ viewManager->GetRootView(view); } - /* Get conversion factors */ - float p2t = presContext->PixelsToTwips(); - float t2p = presContext->TwipsToPixels(); + nsRect r = view->GetBounds() - view->GetPosition(); /* Limit the bitmap size */ - nscoord twipLimitW = NSIntPixelsToTwips(mWidth, p2t); - nscoord twipLimitH = NSIntPixelsToTwips(mHeight, p2t); - - nsRect r = view->GetBounds() - view->GetPosition(); + nscoord twipLimitW = NSIntPixelsToAppUnits(mWidth, dc->AppUnitsPerDevPixel ()); + nscoord twipLimitH = NSIntPixelsToAppUnits(mHeight, dc->AppUnitsPerDevPixel ()); if (r.height > twipLimitH) { r.height = twipLimitH; @@ -149,89 +140,37 @@ r.width = twipLimitW; } - /* sanity check */ - if (r.IsEmpty()) { - LOG ("Rect is empty!\n"); - return PR_FALSE; - } + mWidth = NSAppUnitsToIntPixels(r.width, dc->AppUnitsPerDevPixel ()); + mHeight = NSAppUnitsToIntPixels(r.height, dc->AppUnitsPerDevPixel ()); - mWidth = NSTwipsToIntPixels(r.width, t2p); - mHeight = NSTwipsToIntPixels(r.height, t2p); + nsRefPtr imgSurface = + new gfxImageSurface(gfxIntSize(mWidth, mHeight), + gfxImageSurface::ImageFormatRGB24); + NS_ENSURE_TRUE(imgSurface, PR_FALSE); - PRUint32 stripe = (2 << 20) / mWidth; - nscoord twipStripe = NSIntPixelsToTwips(stripe, p2t); + nsRefPtr imgContext = new gfxContext(imgSurface); - nsRect cutout(r); - cutout.SizeTo(r.width, PR_MIN(r.height, twipStripe)); + nsRefPtr surface = + gfxPlatform::GetPlatform()-> + CreateOffscreenSurface(gfxIntSize(mWidth, mHeight), + gfxASurface::ImageFormatRGB24); + NS_ENSURE_TRUE(surface, PR_FALSE); - PRUint32 roundCount = 0; - const char* status = ""; + nsRefPtr context = new gfxContext(surface); + NS_ENSURE_TRUE(context, PR_FALSE); - if (r.IsEmpty()) { - status = "EMPTY"; - } else { - PRBool failed = PR_FALSE; - while (!cutout.IsEmpty() && !mHadError && !failed) { - ++roundCount; - - PRUint32 width = NSTwipsToIntPixels(cutout.width, t2p); - PRUint32 height = NSTwipsToIntPixels(cutout.height, t2p); - - nsCOMPtr context; - rv = viewManager->RenderOffscreen (view, cutout, - PR_FALSE, PR_TRUE, NS_RGB(255, 255, 255), - getter_AddRefs(context)); - if (NS_FAILED(rv)) { - failed = PR_TRUE; - status = "FAILEDRENDER"; - } else { - nsIDrawingSurface* surface; - context->GetDrawingSurface(&surface); - if (!surface) { - failed = PR_TRUE; - status = "NOSURFACE"; - } else { - PRUint32 w, h; - surface->GetDimensions(&w,&h); - /* these are computed from ScaleRoundOut(t2p) on cutout.Bounds(), and - * may be one pixel too wide and/or hight - */ - - if (width > w || height > h) { - failed = PR_TRUE; - status = "SIZEMISMATCH"; - } else if (!Prepare(surface)) { - failed = PR_TRUE; - status = "PNGPREPAREFAILED"; - } else { - PRUint8* data; - PRInt32 rowLen, rowSpan; - rv = surface->Lock(0, 0, w, h, (void**)&data, &rowSpan, &rowLen, - NS_LOCK_SURFACE_READ_ONLY); - if (NS_FAILED(rv)) { - failed = PR_TRUE; - status = "FAILEDLOCK"; - } else { - LOG ("."); - WriteSurface(surface, width, height, data, rowLen, rowSpan, rowLen/w); - surface->Unlock(); - } - } - } - context->DestroyDrawingSurface(surface); - } - cutout.MoveBy(0, twipStripe); - cutout.IntersectRect(r, cutout); - } + rv = presShell->RenderDocument(r, PR_FALSE, PR_TRUE, + NS_RGB(255, 255, 0), context); + NS_ENSURE_SUCCESS(rv, PR_FALSE); - retval = Finish(); - status = retval ? "OK" : status[0] != '\0' ? status : "FAILED"; - LOG ("\n"); - } + imgContext->DrawSurface(surface, gfxSize(mWidth, mHeight)); - LOG ("%d round(s) of height %d, result: %s\n", roundCount, stripe, status); + if (Prepare(imgSurface)) { + WriteSurface(imgSurface, mWidth, mHeight); + return Finish(); + } - return retval; + return PR_FALSE; } /* PNG Writer */ @@ -267,7 +206,7 @@ }; PRBool -PNGWriter::Prepare(nsIDrawingSurface *aSurface) +PNGWriter::Prepare(gfxImageSurface *aSurface) { if (mInitialised) return PR_TRUE; @@ -337,10 +276,6 @@ // PNG_RESOLUTION_METER); // 1000 * 72 / 25.4 = 2834 - nsPixelFormat format; - aSurface->GetPixelFormat(&format); - /* FIXME: assert that subsequent surfaces have same format? */ - /* FIXME: do I need 8, or the format.m[R|G|B]Count here? */ png_set_IHDR (mPNG, mInfo, mWidth, mHeight, 8 /* bits per sample */ /* FIXME? */, PNG_COLOR_TYPE_RGB /* FIXME: alpha? */, PNG_INTERLACE_NONE, @@ -348,10 +283,10 @@ if (mHadError) return PR_FALSE; png_color_8 sig_bit; - sig_bit.red = format.mRedCount; - sig_bit.green = format.mGreenCount; - sig_bit.blue = format.mBlueCount; - sig_bit.alpha = format.mAlphaCount; + sig_bit.red = 8; + sig_bit.green = 8; + sig_bit.blue = 8; + sig_bit.alpha = 0; png_set_sBIT (mPNG, mInfo, &sig_bit); if (mHadError) return PR_FALSE; @@ -370,43 +305,28 @@ } void -PNGWriter::WriteSurface(nsIDrawingSurface *aSurface, +PNGWriter::WriteSurface(gfxImageSurface *aSurface, PRUint32 aWidth, - PRUint32 aHeight, - PRUint8 *aData, - PRInt32 aRowLen, - PRInt32 aRowSpan, - PRInt32 aPixelSpan) + PRUint32 aHeight) { - nsPixelFormat format; - aSurface->GetPixelFormat(&format); + long cairoStride = aSurface->Stride(); + unsigned char* cairoData = aSurface->Data(); - PRUint8* buf = (PRUint8*) mRow; - for (PRUint32 i = 0; i < aHeight; ++i) - { - PRUint8* src = aData + i*aRowSpan; - - PRUint8* dest = buf; - for (PRUint32 j = 0; j < aWidth; ++j) - { - /* v is the pixel value */ -#ifdef WORDS_BIGENDIAN - PRUint32 v = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3]; - v >>= (32 - 8*aPixelSpan); -//maybe like this: PRUint32 v = *((PRUint32*) src) >> (32 - 8*bytesPerPix); -#else - PRUint32 v = *((PRUint32*) src); -#endif - dest[0] = ((v & format.mRedMask) >> format.mRedShift) << (8 - format.mRedCount); - dest[1] = ((v & format.mGreenMask) >> format.mGreenShift) << (8 - format.mGreenCount); - dest[2] = ((v & format.mBlueMask) >> format.mBlueShift) << (8 - format.mBlueCount); - src += aPixelSpan; - dest += 3; - } - - png_write_row (mPNG, mRow); - if (mHadError) break; + for (PRUint32 row = 0; row < aHeight; ++row) { + PRUint8* dest = mRow; + for (PRUint32 col = 0; col < aWidth; ++col) { + PRUint32* cairoPixel = reinterpret_cast + ((cairoData + row * cairoStride + 4 * col)); + + dest[0] = (*cairoPixel >> 16) & 0xFF; + dest[1] = (*cairoPixel >> 8) & 0xFF; + dest[2] = (*cairoPixel >> 0) & 0xFF; + dest += 3; } + + png_write_row (mPNG, mRow); + if (mHadError) break; + } } PRBool @@ -464,7 +384,7 @@ }; PRBool -PPMWriter::Prepare(nsIDrawingSurface *aSurface) +PPMWriter::Prepare(gfxImageSurface *aSurface) { if (mInitialised) return PR_TRUE; @@ -482,45 +402,30 @@ } void -PPMWriter::WriteSurface(nsIDrawingSurface *aSurface, +PPMWriter::WriteSurface(gfxImageSurface *aSurface, PRUint32 aWidth, - PRUint32 aHeight, - PRUint8 *aData, - PRInt32 aRowLen, - PRInt32 aRowSpan, - PRInt32 aPixelSpan) + PRUint32 aHeight) { - nsPixelFormat format; - aSurface->GetPixelFormat(&format); + long cairoStride = aSurface->Stride(); + unsigned char* cairoData = aSurface->Data(); - PRUint8* buf = (PRUint8*) mRow; - for (PRUint32 i = 0; i < aHeight; ++i) - { - PRUint8* src = aData + i*aRowSpan; - - PRUint8* dest = mRow; - for (PRUint32 j = 0; j < aWidth; ++j) - { - /* v is the pixel value */ -#ifdef WORDS_BIGENDIAN - PRUint32 v = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3]; - v >>= (32 - 8*aPixelSpan); -//maybe like this: PRUint32 v = *((PRUint32*) src) >> (32 - 8*bytesPerPix); -#else - PRUint32 v = *((PRUint32*) src); -#endif - dest[0] = ((v & format.mRedMask) >> format.mRedShift) << (8 - format.mRedCount); - dest[1] = ((v & format.mGreenMask) >> format.mGreenShift) << (8 - format.mGreenCount); - dest[2] = ((v & format.mBlueMask) >> format.mBlueShift) << (8 - format.mBlueCount); - src += aPixelSpan; - dest += 3; - } - - if (fwrite(mRow, 3, mWidth, mFile) != mWidth) { - mHadError = PR_TRUE; - break; - } + for (PRUint32 row = 0; row < aHeight; ++row) { + PRUint8* dest = mRow; + for (PRUint32 col = 0; col < aWidth; ++col) { + PRUint32* cairoPixel = reinterpret_cast + ((cairoData + row * cairoStride + 4 * col)); + + dest[0] = (*cairoPixel >> 16) & 0xFF; + dest[1] = (*cairoPixel >> 8) & 0xFF; + dest[2] = (*cairoPixel >> 0) & 0xFF; + dest += 3; + } + + if (fwrite(mRow, 3, mWidth, mFile) != mWidth) { + mHadError = PR_TRUE; + break; } + } } PRBool @@ -553,7 +458,7 @@ } PRBool -ThumbnailWriter::Prepare(nsIDrawingSurface *aSurface) +ThumbnailWriter::Prepare(gfxImageSurface *aSurface) { if (!mInitialised) { void *buf = malloc (sizeof (GdkPixdata) + 3 * THUMBNAIL_WIDTH * THUMBNAIL_HEIGHT); @@ -576,38 +481,25 @@ } void -ThumbnailWriter::WriteSurface(nsIDrawingSurface *aSurface, +ThumbnailWriter::WriteSurface(gfxImageSurface *aSurface, PRUint32 aWidth, - PRUint32 aHeight, - PRUint8 *aData, - PRInt32 aRowLen, - PRInt32 aRowSpan, - PRInt32 aPixelSpan) + PRUint32 aHeight) { - nsPixelFormat format; - aSurface->GetPixelFormat(&format); + long cairoStride = aSurface->Stride(); + unsigned char* cairoData = aSurface->Data(); - for (PRUint32 i = 0; i < aHeight; ++i) - { - PRUint8* src = aData + i*aRowSpan; - for (PRUint32 j = 0; j < aWidth; ++j) - { - /* v is the pixel value */ -#ifdef WORDS_BIGENDIAN - PRUint32 v = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3]; - v >>= (32 - 8*aPixelSpan); -#else - PRUint32 v = *((PRUint32*) src); -#endif - mDest[0] = ((v & format.mRedMask) >> format.mRedShift) << (8 - format.mRedCount); - mDest[1] = ((v & format.mGreenMask) >> format.mGreenShift) << (8 - format.mGreenCount); - mDest[2] = ((v & format.mBlueMask) >> format.mBlueShift) << (8 - format.mBlueCount); - src += aPixelSpan; - mDest += 3; - } - - if (mHadError) break; + for (PRUint32 row = 0; row < aHeight; ++row) { + for (PRUint32 col = 0; col < aWidth; ++col) { + PRUint32* cairoPixel = reinterpret_cast + ((cairoData + row * cairoStride + 4 * col)); + + mDest[0] = (*cairoPixel >> 16) & 0xFF; + mDest[1] = (*cairoPixel >> 8) & 0xFF; + mDest[2] = (*cairoPixel >> 0) & 0xFF; + mDest += 3; } + if (mHadError) break; + } } PRBool @@ -670,7 +562,7 @@ }; PRBool -JPEGWriter::Prepare(nsIDrawingSurface *aSurface) +JPEGWriter::Prepare(gfxImageSurface *aSurface) { if (mInitialised) return PR_TRUE; @@ -713,44 +605,29 @@ } void -JPEGWriter::WriteSurface(nsIDrawingSurface *aSurface, +JPEGWriter::WriteSurface(gfxImageSurface *aSurface, PRUint32 aWidth, - PRUint32 aHeight, - PRUint8 *aData, - PRInt32 aRowLen, - PRInt32 aRowSpan, - PRInt32 aPixelSpan) + PRUint32 aHeight) { - nsPixelFormat format; - aSurface->GetPixelFormat(&format); + long cairoStride = aSurface->Stride(); + unsigned char* cairoData = aSurface->Data(); - PRUint8* buf = (PRUint8*) mRow; - for (PRUint32 i = 0; i < aHeight; ++i) - { - PRUint8* src = aData + i*aRowSpan; - - PRUint8* dest = buf; - for (PRUint32 j = 0; j < aWidth; ++j) - { - /* v is the pixel value */ -#ifdef WORDS_BIGENDIAN - PRUint32 v = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3]; - v >>= (32 - 8*aPixelSpan); -//maybe like this: PRUint32 v = *((PRUint32*) src) >> (32 - 8*bytesPerPix); -#else - PRUint32 v = *((PRUint32*) src); -#endif - dest[0] = ((v & format.mRedMask) >> format.mRedShift) << (8 - format.mRedCount); - dest[1] = ((v & format.mGreenMask) >> format.mGreenShift) << (8 - format.mGreenCount); - dest[2] = ((v & format.mBlueMask) >> format.mBlueShift) << (8 - format.mBlueCount); - src += aPixelSpan; - dest += 3; - } - - JSAMPROW rows[1] = { (JSAMPLE*) mRow }; - (void) jpeg_write_scanlines (&mJPEG, rows, 1); - if (mHadError) break; + for (PRUint32 row = 0; row < aHeight; ++row) { + PRUint8* dest = mRow; + for (PRUint32 col = 0; col < aWidth; ++col) { + PRUint32* cairoPixel = reinterpret_cast + ((cairoData + row * cairoStride + 4 * col)); + + dest[0] = (*cairoPixel >> 16) & 0xFF; + dest[1] = (*cairoPixel >> 8) & 0xFF; + dest[2] = (*cairoPixel >> 0) & 0xFF; + dest += 3; } + + JSAMPROW rows[1] = { (JSAMPLE*) mRow }; + (void) jpeg_write_scanlines (&mJPEG, rows, 1); + if (mHadError) break; + } } PRBool Only in gnome-web-photo-0.3/src: Writer.cpp.orig diff -u -r gnome-web-photo-0.3-orig/src/Writer.h gnome-web-photo-0.3/src/Writer.h --- gnome-web-photo-0.3-orig/src/Writer.h 2008-03-07 18:41:35.000000000 +0100 +++ gnome-web-photo-0.3/src/Writer.h 2008-03-07 18:41:44.000000000 +0100 @@ -21,7 +21,8 @@ #ifndef WRITER_H #define WRITER_H -#include +#include +#include #include #include #include @@ -31,8 +32,6 @@ #include #endif -class nsIDrawingSurface; - class Writer { public: @@ -41,9 +40,9 @@ PRBool Write (); - virtual PRBool Prepare(nsIDrawingSurface *) = 0; + virtual PRBool Prepare(gfxImageSurface *) = 0; virtual PRBool Finish() = 0; - virtual void WriteSurface(nsIDrawingSurface*, PRUint32, PRUint32, PRUint8*, PRInt32, PRInt32, PRInt32) = 0; + virtual void WriteSurface(gfxImageSurface*, PRUint32, PRUint32) = 0; protected: GtkMozEmbed *mEmbed; @@ -64,10 +63,10 @@ PNGWriter (GtkMozEmbed*, const char *); virtual ~PNGWriter(); - virtual PRBool Prepare(nsIDrawingSurface *); + virtual PRBool Prepare(gfxImageSurface *); virtual PRBool Finish(); - virtual void WriteSurface(nsIDrawingSurface*, PRUint32, PRUint32, PRUint8*, PRInt32, PRInt32, PRInt32); + virtual void WriteSurface(gfxImageSurface*, PRUint32, PRUint32); static void WarnCallback(png_structp, png_const_charp); static void ErrorCallback(png_structp, png_const_charp); @@ -86,10 +85,10 @@ PPMWriter (GtkMozEmbed*, const char *); virtual ~PPMWriter(); - virtual PRBool Prepare(nsIDrawingSurface *); + virtual PRBool Prepare(gfxImageSurface *); virtual PRBool Finish(); - virtual void WriteSurface(nsIDrawingSurface*, PRUint32, PRUint32, PRUint8*, PRInt32, PRInt32, PRInt32); + virtual void WriteSurface(gfxImageSurface*, PRUint32, PRUint32); private: FILE *mFile; @@ -102,9 +101,9 @@ ThumbnailWriter(GtkMozEmbed*, const char*, PRUint32); virtual ~ThumbnailWriter(); - virtual PRBool Prepare(nsIDrawingSurface *); + virtual PRBool Prepare(gfxImageSurface *); virtual PRBool Finish(); - virtual void WriteSurface(nsIDrawingSurface*, PRUint32, PRUint32, PRUint8*, PRInt32, PRInt32, PRInt32); + virtual void WriteSurface(gfxImageSurface*, PRUint32, PRUint32); private: GdkPixdata *mData; @@ -119,10 +118,10 @@ JPEGWriter (GtkMozEmbed*, const char *, PRUint16); virtual ~JPEGWriter(); - virtual PRBool Prepare(nsIDrawingSurface *); + virtual PRBool Prepare(gfxImageSurface *); virtual PRBool Finish(); - virtual void WriteSurface(nsIDrawingSurface*, PRUint32, PRUint32, PRUint8*, PRInt32, PRInt32, PRInt32); + virtual void WriteSurface(gfxImageSurface*, PRUint32, PRUint32); private: PRUint16 mQuality; --- /dev/null 2008-03-07 10:07:23.927002592 +0100 +++ gnome-web-photo-0.3/m4/libxul.m4 2008-03-07 18:41:46.000000000 +0100 @@ -0,0 +1,566 @@ +# Copyright ?? 2000-2004 Marco Pesenti Gritti +# Copyright ?? 2003, 2004, 2005, 2006, 2007 Christian Persch +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# LIBXUL_INIT([embedding],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +# Checks for libxul, and aborts if it's not found +# +# Checks for -fshort-wchar compiler variable, and adds it to +# AM_CXXFLAGS if found +# +# Checks whether RTTI is enabled, and adds -fno-rtti to +# AM_CXXFLAGS otherwise +# +# Checks whether the gecko build is a debug build, and adds +# debug flags to AM_CXXFLAGS if it is. + +AC_DEFUN([LIBXUL_INIT], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl + +if test -z "$1"; then + libxul_cv_libxul_pkg="libxul" +elif test "$1" = "embedding"; then + libxul_cv_libxul_pkg="libxul-embedding" +else + AC_MSG_ERROR([[Unsupported value passed to LIBXUL_INIT]]) +fi + +PKG_CHECK_EXISTS([$libxul_cv_libxul_pkg],[libxul_cv_have_libxul=yes],[libxul_cv_have_libxul=no]) +if test "$libxul_cv_have_libxul" != "yes"; then + # Debian/Ubuntu xulrunner-1.9-dev has versioned pc files, try again + libxul_cv_libxul_pkg="${libxul_cv_libxul_pkg}-1.9" + PKG_CHECK_EXISTS([$libxul_cv_libxul_pkg],[libxul_cv_have_libxul=yes],[libxul_cv_have_libxul=no]) +fi +if test "$libxul_cv_have_libxul" != "yes"; then + # Still nothing? Error out + AC_MSG_ERROR([libxul not found]) +fi + +libxul_cv_version="$($PKG_CONFIG --modversion $libxul_cv_libxul_pkg)" +libxul_cv_prefix="$($PKG_CONFIG --variable=prefix $libxul_cv_libxul_pkg)" +libxul_cv_include_root="$($PKG_CONFIG --variable=includedir $libxul_cv_libxul_pkg)" +libxul_cv_sdkdir="$($PKG_CONFIG --variable=sdkdir $libxul_cv_libxul_pkg)" + +# FIXMEchpe: this isn't right. The pc file seems buggy, but until +# I can figure this out, do it like this: +libxul_cv_libdir="$(readlink $($PKG_CONFIG --variable=sdkdir $libxul_cv_libxul_pkg)/bin)" + +libxul_cv_includes="$($PKG_CONFIG --cflags-only-I libxul-unstable libxul)" + +AC_DEFINE([HAVE_LIBXUL],[1],[Define for libxul]) + +LIBXUL_VERSION="$libxul_cv_version" +LIBXUL_PREFIX="$libxul_cv_prefix" +LIBXUL_INCLUDE_ROOT="$libxul_cv_include_root" +LIBXUL_INCLUDES="$libxul_cv_includes" +LIBXUL_LIBDIR="$libxul_cv_libdir" + +LIBXUL_CXXCPPFLAGS= +LIBXUL_CXXFLAGS= +LIBXUL_LDFLAGS= + +# Can't use the value from the .pc file, since it seems buggy +# Until I can figure it out, do this instead +LIBXUL_LIBS="-L${libxul_cv_sdkdir}/lib -lxpcomglue_s -L${libxul_cv_sdkdir}/bin -lxul -lxpcom" + +# *********************** +# Check for -fshort-wchar +# *********************** + +# NOTE: This is really gcc-only +# Do this test using CXX only since some versions of gcc +# 2.95-2.97 have a signed wchar_t in c++ only and some versions +# only have short-wchar support for c++. + +AC_LANG_PUSH([C++]) + +_SAVE_CXXFLAGS=$CXXFLAGS +CXXFLAGS="$CXXFLAGS $LIBXUL_CXXFLAGS -fshort-wchar" + +AC_CACHE_CHECK([for compiler -fshort-wchar option], + libxul_cv_have_usable_wchar_option, + [AC_RUN_IFELSE([AC_LANG_SOURCE( + [[#include + int main () { + return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ; + } ]])], + [libxul_cv_have_usable_wchar_option="yes"], + [libxul_cv_have_usable_wchar_option="no"], + [libxul_cv_have_usable_wchar_option="maybe (cross-compiling)"])]) + +CXXFLAGS="$_SAVE_CXXFLAGS" + +AC_LANG_POP([C++]) + +if test "$libxul_cv_have_usable_wchar_option" = "yes"; then + LIBXUL_CXXFLAGS="$LIBXUL_CXXFLAGS -fshort-wchar" +fi + +# ************** +# Check for RTTI +# ************** + +AC_MSG_CHECKING([whether to enable C++ RTTI]) +AC_ARG_ENABLE([cpp-rtti], + AS_HELP_STRING([--enable-cpp-rtti],[Enable C++ RTTI]), + [],[enable_cpp_rtti=no]) +AC_MSG_RESULT([$enable_cpp_rtti]) + +if test "$enable_cpp_rtti" = "no"; then + LIBXUL_CXXFLAGS="-fno-rtti $LIBXUL_CXXFLAGS" +fi + +# ************* +# Various tests +# ************* + +# FIXMEchpe: remove this test, it shouldn't be needed anymore thanks to static glue libs + +AC_LANG_PUSH([C++]) + +_SAVE_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $LIBXUL_CXXCPPFLAGS $LIBXUL_INCLUDES" + +AC_MSG_CHECKING([[whether we have a libxul debug build]]) +AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[#include + #if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP) + #error No + #endif]] + )], + [libxul_cv_have_debug=yes], + [libxul_cv_have_debug=no]) +AC_MSG_RESULT([$libxul_cv_have_debug]) + +CPPFLAGS="$_SAVE_CPPFLAGS" + +AC_LANG_POP([C++]) + +if test "$libxul_cv_have_debug" = "yes"; then + LIBXUL_CXXCPPFLAGS="$LIBXUL_CXXCPPFLAGS -DDEBUG -D_DEBUG" + + AC_DEFINE([HAVE_LIBXUL_DEBUG],[1],[Define if libxul is a debug build]) +fi + +# ************************************* +# Check for C++ symbol visibility stuff +# ************************************* + +# Check for .hidden assembler directive and visibility attribute. +# Copied from mozilla's configure.in, which in turn was +# borrowed from glibc's configure.in + +# Only do this for g++ + +if test "$GXX" = "yes"; then + AC_CACHE_CHECK(for visibility(hidden) attribute, + libxul_cv_visibility_hidden, + [cat > conftest.c </dev/null 2>&1; then + if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then + libxul_cv_visibility_hidden=yes + fi + fi + rm -f conftest.[cs] + ]) + if test "$libxul_cv_visibility_hidden" = "yes"; then + AC_DEFINE([HAVE_VISIBILITY_HIDDEN_ATTRIBUTE],[1],[Define if the compiler supports the "hidden" visibility attribute]) + + AC_CACHE_CHECK(for visibility(default) attribute, + libxul_cv_visibility_default, + [cat > conftest.c </dev/null 2>&1; then + if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then + libxul_cv_visibility_default=yes + fi + fi + rm -f conftest.[cs] + ]) + if test "$libxul_cv_visibility_default" = "yes"; then + AC_DEFINE([HAVE_VISIBILITY_ATTRIBUTE],[1],[Define if the compiler supports the "default" visibility attribute]) + + AC_CACHE_CHECK(for visibility pragma support, + libxul_cv_visibility_pragma, + [cat > conftest.c </dev/null 2>&1; then + if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then + if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then + libxul_cv_visibility_pragma=yes + fi + fi + fi + rm -f conftest.[cs] + ]) + if test "$libxul_cv_visibility_pragma" = "yes"; then + AC_CACHE_CHECK(For gcc visibility bug with class-level attributes (GCC bug 26905), + libxul_cv_have_visibility_class_bug, + [cat > conftest.c < /dev/null 2>&1 ; then + libxul_cv_have_visibility_class_bug=yes + else + if test `egrep -c '@PLT|\\$stub' conftest.S` = 0; then + libxul_cv_have_visibility_class_bug=yes + fi + fi + rm -rf conftest.{c,S} + ]) + + AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297), + libxul_cv_have_visibility_builtin_bug, + [cat > conftest.c < +#pragma GCC visibility pop + +__attribute__ ((visibility ("default"))) void Func() { + char c[[100]]; + memset(c, 0, sizeof(c)); +} +EOF + libxul_cv_have_visibility_builtin_bug=no + if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + libxul_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then + libxul_cv_visibility_builtin_bug=yes + fi + fi + rm -f conftest.{c,S} + ]) + if test "$libxul_cv_have_visibility_builtin_bug" = "no" -a \ + "$libxul_cv_have_visibility_class_bug" = "no"; then + VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' + WRAP_SYSTEM_INCLUDES=1 + else + VISIBILITY_FLAGS='-fvisibility=hidden' + fi # have visibility pragma bug + fi # have visibility pragma + fi # have visibility(default) attribute + fi # have visibility(hidden) attribute + + LIBXUL_CXXFLAGS="$LIBXUL_CXXFLAGS $VISIBILITY_FLAGS" +fi # g++ + +# ********* +# Finish up +# ********* + +AC_SUBST([LIBXUL_VERSION]) +AC_SUBST([LIBXUL_PREFIX]) +AC_SUBST([LIBXUL_INCLUDE_ROOT]) +AC_SUBST([LIBXUL_INCLUDES]) +AC_SUBST([LIBXUL_LIBDIR]) +AC_SUBST([LIBXUL_CXXCPPFLAGS]) +AC_SUBST([LIBXUL_CXXFLAGS]) +AC_SUBST([LIBXUL_LDFLAGS]) +AC_SUBST([LIBXUL_LIBS]) + +]) + +# LIBXUL_DEFINES +# +# Automake defines for libxul. Not included in LIBXUL_INIT so that +# LIBXUL_INIT may be called conditionally. If you use LIBXUL_INIT, +# you _must_ call LIBXUL_DEFINES, unconditionally. + +AC_DEFUN([LIBXUL_DEFINES], +[ + +AM_CONDITIONAL([HAVE_LIBXUL],[test "$libxul_cv_have_libxul" = "yes"]) +AM_CONDITIONAL([HAVE_LIBXUL_DEBUG],[test "$libxul_cv_have_debug" = "yes"]) + +]) + +# *************************************************************************** +# *************************************************************************** +# *************************************************************************** + +# _LIBXUL_DISPATCH(MACRO, INCLUDEDIRS, ...) + +m4_define([_LIBXUL_DISPATCH], +[ + +AC_LANG_PUSH([C++]) + +_SAVE_CPPFLAGS="$CPPFLAGS" +_SAVE_CXXFLAGS="$CXXFLAGS" +_SAVE_LDFLAGS="$LDFLAGS" +_SAVE_LIBS="$LIBS" +CPPFLAGS="$CPPFLAGS $LIBXUL_CXXCPPFLAGS $LIBXUL_INCLUDES" +CXXFLAGS="$CXXFLAGS $LIBXUL_CXXFLAGS $($PKG_CONFIG --cflags-only-other libxul)" +LDFLAGS="$LDFLAGS $LIBXUL_LDFLAGS -Wl,--rpath=$LIBXUL_LIBDIR" +LIBS="$LIBS $($PKG_CONFIG --libs libxul)" + +# FIXMEchpe: remove this, since the header layout is now flat (only stable and unstable) + +_LIBXUL_DISPATCH_INCLUDEDIRS="$2" + +_LIBXUL_DISPATCH_INCLUDEDIRS="$_LIBXUL_DISPATCH_INCLUDEDIRS dom necko pref" + +# Now add them to CPPFLAGS +for i in $_LIBXUL_DISPATCH_INCLUDEDIRS; do + CPPFLAGS="$CPPFLAGS -I$LIBXUL_INCLUDE_ROOT/$i" +done + +m4_indir([$1],m4_shiftn(2,$@)) + +CPPFLAGS="$_SAVE_CPPFLAGS" +CXXFLAGS="$_SAVE_CXXFLAGS" +LDFLAGS="$_SAVE_LDFLAGS" +LIBS="$_SAVE_LIBS" + +AC_LANG_POP([C++]) + +])# _LIBXUL_DISPATCH + +# *************************************************************************** +# *************************************************************************** +# *************************************************************************** + +# LIBXUL_CHECK_HEADERS(INCLUDEDIRS, HEADERS, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [INCLUDES]) + +AC_DEFUN([LIBXUL_CHECK_HEADERS],[_LIBXUL_DISPATCH([AC_CHECK_HEADERS],$@)]) + +# LIBXUL_COMPILE_IFELSE(INCLUDEDIRS, PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + +AC_DEFUN([LIBXUL_COMPILE_IFELSE],[_LIBXUL_DISPATCH([AC_COMPILE_IFELSE],$@)]) + +# LIBXUL_RUN_IFELSE(INCLUDEDIRS, PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + +AC_DEFUN([LIBXUL_RUN_IFELSE],[_LIBXUL_DISPATCH([AC_RUN_IFELSE],$@)]) + +# *************************************************************************** +# *************************************************************************** +# *************************************************************************** + +# LIBXUL_XPCOM_PROGRAM([PROLOGUE], [BODY]) +# +# Produce a template C++ program which starts XPCOM up and shuts it down after +# the BODY part has run. In BODY, the the following variables are predeclared: +# +# nsresult rv +# int status = 1 (EXIT_FAILURE) +# +# The program's exit status will be |status|; set it to 0 (or EXIT_SUCCESS) +# to indicate success and to a value between 1 (EXIT_FAILURE) and 120 to +# indicate failure. +# +# To jump out of the BODY and exit the test program, you can use |break|. + +AC_DEFUN([LIBXUL_XPCOM_PROGRAM], +[AC_LANG_PROGRAM([[ +#include +#include +#include +#include +#include +#include +#include +#include +]] +[$1], +[[ +// redirect unwanted mozilla debug output to the bit bucket +freopen ("/dev/null", "w", stdout); + +nsresult rv; +nsCOMPtr directory; +rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_LIBXUL_HOME"), PR_FALSE, + getter_AddRefs (directory)); +if (NS_FAILED (rv) || !directory) { + exit (126); +} + +rv = NS_InitXPCOM2 (nsnull, directory, nsnull); +if (NS_FAILED (rv)) { + exit (125); +} + +int status = EXIT_FAILURE; + +// now put in the BODY, scoped with do...while(0) to ensure we don't hold a +// COMptr after XPCOM shutdown and so we can jump out with a simple |break|. +do { +]] +m4_shiftn(1,$@) +[[ +} while (0); + +NS_ShutdownXPCOM (nsnull); +exit (status); +]]) +]) # LIBXUL_XPCOM_PROGRAM + +# *************************************************************************** +# *************************************************************************** +# *************************************************************************** + +# LIBXUL_XPCOM_PROGRAM_CHECK([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [ACTION-IF-CROSS-COMPILING]) +# +# Checks whether we can build and run any XPCOM test programs at all + +AC_DEFUN([LIBXUL_XPCOM_PROGRAM_CHECK], +[AC_REQUIRE([LIBXUL_INIT])dnl + +AC_CACHE_CHECK([whether we can compile and run XPCOM programs], +[libxul_cv_xpcom_program_check], +[ +libxul_cv_xpcom_program_check=no + +LIBXUL_RUN_IFELSE([], + [LIBXUL_XPCOM_PROGRAM([],[[status = EXIT_SUCCESS;]])], + [libxul_cv_xpcom_program_check=yes], + [libxul_cv_xpcom_program_check=no], + [libxul_cv_xpcom_program_check=maybe]) +]) + +if test "$libxul_cv_xpcom_program_check" = "yes"; then + ifelse([$2],,[:],[$2]) +else + ifelse([$3],,[AC_MSG_FAILURE([Cannot compile and run XPCOM programs])], + [$3]) +fi + +]) # LIBXUL_XPCOM_PROGRAM_CHECK + +# *************************************************************************** +# *************************************************************************** +# *************************************************************************** + +# LIBXUL_CHECK_CONTRACTID(CONTRACTID, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Checks wheter CONTRACTID is a registered contract ID + +AC_DEFUN([LIBXUL_CHECK_CONTRACTID], +[AC_REQUIRE([LIBXUL_INIT])dnl + +AS_VAR_PUSHDEF([libxul_cv_have_CID],[libxul_cv_have_$1]) + +AC_CACHE_CHECK([for the $1 XPCOM component], +libxul_cv_have_CID, +[ +AS_VAR_SET(libxul_cv_have_CID,[no]) + +LIBXUL_RUN_IFELSE([], +[LIBXUL_XPCOM_PROGRAM([[ +#include +]],[[ +status = 99; +nsCOMPtr registrar; +rv = NS_GetComponentRegistrar (getter_AddRefs (registrar)); +if (NS_FAILED (rv)) break; + +status = 98; +PRBool isRegistered = PR_FALSE; +rv = registrar->IsContractIDRegistered ("$1", &isRegistered); +if (NS_FAILED (rv)) break; + +status = isRegistered ? EXIT_SUCCESS : 97; +]]) +], +[AS_VAR_SET(libxul_cv_have_CID,[yes])], +[AS_VAR_SET(libxul_cv_have_CID,[no])], +[AS_VAR_SET(libxul_cv_have_CID,[maybe])]) + +]) + +if test AS_VAR_GET(libxul_cv_have_CID) = "yes"; then + ifelse([$2],,[:],[$2]) +else + ifelse([$3],,[AC_MSG_ERROR([dnl +Contract ID "$1" is not registered, but $PACKAGE_NAME depends on it.])], + [$3]) +fi + +AS_VAR_POPDEF([libxul_cv_have_CID]) + +]) # LIBXUL_CHECK_CONTRACTID + +# LIBXUL_CHECK_CONTRACTIDS(CONTRACTID, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Checks wheter CONTRACTIDs are registered contract IDs. +# If ACTION-IF-NOT-FOUND is given, it is executed when one of the contract IDs +# is not found and the missing contract ID is in the |as_contractid| variable. + +AC_DEFUN([LIBXUL_CHECK_CONTRACTIDS], +[AC_REQUIRE([LIBXUL_INIT])dnl + +result=yes +as_contractid= +for as_contractid in $1 +do + LIBXUL_CHECK_CONTRACTID([$as_contractid],[],[result=no; break;]) +done + +if test "$result" = "yes"; then + ifelse([$2],,[:],[$2]) +else + ifelse([$3],,[AC_MSG_ERROR([dnl +Contract ID "$as_contractid" is not registered, but $PACKAGE_NAME depends on it.])], + [$3]) +fi + +]) # LIBXUL_CHECK_CONTRACTIDS + +# *************************************************************************** +# *************************************************************************** +# *************************************************************************** + +# LIBXUL_XPIDL([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +# Checks for xpidl program and include directory +# +# Variables set: +# XPIDL: the xpidl program +# XPIDL_IDLDIR: the xpidl include directory + +AC_DEFUN([LIBXUL_XPIDL], +[AC_REQUIRE([LIBXUL_INIT])dnl + +_C_PATH_PROG([XPIDL],[xpidl],[no],[$LIBXUL_LIBDIR:$PATH]) + +XPIDL_IDLDIR="$($PKG_CONFIG --variable=idldir libxul)" + +if test "$XPIDL" != "no" -a -n "$XPIDL_IDLDIR" -a -f "$XPIDL_IDLDIR/nsISupports.idl"; then + ifelse([$1],,[:],[$1]) +else + ifelse([$2],,[AC_MSG_FAILURE([XPIDL program or include directory not found])],[$2]) +fi + +]) Index: gnome-web-photo.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gnome-web-photo.spec 19 Feb 2008 04:27:21 -0000 1.8 +++ gnome-web-photo.spec 7 Mar 2008 17:58:06 -0000 1.9 @@ -1,9 +1,9 @@ -%define gecko_version 1.8.1.10 +%define gecko_version 1.9 Summary: HTML pages thumbnailer Name: gnome-web-photo Version: 0.3 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ Group: Applications/Internet URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/ @@ -21,6 +21,8 @@ BuildRequires: libjpeg-devel BuildRequires: gettext perl(XML::Parser) +Patch0: xulrunner19.patch + %description gnome-web-photo contains a thumbnailer that will be used by GNOME applications, including the file manager, to generate screenshots of web pages. @@ -28,7 +30,10 @@ %prep %setup -q +%patch0 -p1 -b .xulrunner19 + %build +autoreconf %configure make %{?_smp_mflags} @@ -74,6 +79,9 @@ %{_datadir}/gnome-web-photo %changelog +* Fri Mar 7 2008 Marco Pesenti Gritti - 0.3-10 +- Add patch to make it work with xulrunner 1.9 + * Mon Feb 18 2008 Fedora Release Engineering - 0.3-9 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 17:58:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:58:50 +0000 Subject: [pkgdb] ggobi (Fedora, 8) updated by kevin Message-ID: <200803071800.m27I0hTa023802@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ggobi Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ggobi (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ggobi (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ggobi (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on ggobi (Fedora 8) for astronomy-sig Kevin Fenzi (kevin) approved watchcommits on ggobi (Fedora 8) for astronomy-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on ggobi (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ggobi From fedora-extras-commits at redhat.com Fri Mar 7 17:58:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 17:58:50 +0000 Subject: [pkgdb] ggobi (Fedora, devel) updated by kevin Message-ID: <200803071800.m27I0hTd023802@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on ggobi (Fedora devel) for astronomy-sig Kevin Fenzi (kevin) approved watchcommits on ggobi (Fedora devel) for astronomy-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on ggobi (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ggobi From fedora-extras-commits at redhat.com Fri Mar 7 17:59:14 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Fri, 7 Mar 2008 17:59:14 GMT Subject: rpms/gtk-vnc/devel gtk-vnc-0.3.4-scaling-crash.patch, NONE, 1.1 gtk-vnc.spec, 1.11, 1.12 Message-ID: <200803071759.m27HxEcn009353@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/gtk-vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9226 Modified Files: gtk-vnc.spec Added Files: gtk-vnc-0.3.4-scaling-crash.patch Log Message: Update to 0.3.4 release gtk-vnc-0.3.4-scaling-crash.patch: --- NEW FILE gtk-vnc-0.3.4-scaling-crash.patch --- diff -r 02bc30c3e8f6 src/vncdisplay.c --- a/src/vncdisplay.c Wed Mar 05 19:21:36 2008 -0600 +++ b/src/vncdisplay.c Thu Mar 06 17:50:12 2008 -0500 @@ -1084,6 +1084,12 @@ static gboolean configure_event(GtkWidge static gboolean configure_event(GtkWidget *widget, GdkEventConfigure *configure, gpointer data G_GNUC_UNUSED) { + VncDisplay *obj = VNC_DISPLAY(widget); + VncDisplayPrivate *priv = obj->priv; + + if (priv->fb.data == NULL) + return FALSE; + rescale_display(VNC_DISPLAY(widget), configure->width, configure->height); Index: gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtk-vnc.spec 3 Feb 2008 22:27:17 -0000 1.11 +++ gtk-vnc.spec 7 Mar 2008 17:58:33 -0000 1.12 @@ -6,17 +6,23 @@ Summary: A GTK widget for VNC clients Name: gtk-vnc -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch1: %{name}-%{version}-scaling-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gtk-vnc.sf.net/ -BuildRequires: gtk2-devel pygtk2-devel python-devel gnutls-devel zlib-devel +BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel +BuildRequires: gnutls-devel gtkglext-devel %if %{with_plugin} +%if "%{fedora}" > "8" +BuildRequires: xulrunner-devel +%else BuildRequires: firefox-devel %endif +%endif %description gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines @@ -46,6 +52,7 @@ A module allowing use of the GTK-VNC widget from python +%if %{with_plugin} %package plugin Summary: Mozilla plugin for the gtk-vnc library Group: Development/Libraries @@ -57,9 +64,11 @@ This package provides a web browser plugin for Mozilla compatible browsers. +%endif %prep %setup -q +%patch1 -p1 %build %if %{with_plugin} @@ -67,11 +76,11 @@ %else %configure %endif -make +%__make %{?_smp_mflags} %install rm -fr %{buildroot} -make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/python*/site-packages/*.a @@ -113,6 +122,10 @@ %endif %changelog +* Thu Mar 6 2008 Daniel P. Berrange - 0.3.4-1.fc9 +- Update to 0.3.4 release +- Fix crash with OpenGL scaling code + * Sun Feb 3 2008 Daniel P. Berrange - 0.3.3-1.fc9 - Update to 0.3.3 release From fedora-extras-commits at redhat.com Fri Mar 7 17:59:31 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:59:31 GMT Subject: rpms/ggobi - New directory Message-ID: <200803071759.m27HxVXN009427@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ggobi In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseZ9344/rpms/ggobi Log Message: Directory /cvs/extras/rpms/ggobi added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:59:38 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:59:38 GMT Subject: rpms/ggobi/devel - New directory Message-ID: <200803071759.m27HxcvZ009441@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ggobi/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseZ9344/rpms/ggobi/devel Log Message: Directory /cvs/extras/rpms/ggobi/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 17:59:45 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:59:45 GMT Subject: rpms/ggobi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803071759.m27Hxj6d009466@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ggobi In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseZ9344/rpms/ggobi Added Files: Makefile import.log Log Message: Setup of module ggobi --- NEW FILE Makefile --- # Top level Makefile for module ggobi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 17:59:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 17:59:53 GMT Subject: rpms/ggobi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803071759.m27HxrNr009484@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ggobi/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseZ9344/rpms/ggobi/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ggobi --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ggobi # $Id: Makefile,v 1.1 2008/03/07 17:59:45 kevin Exp $ NAME := ggobi SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 18:02:37 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 18:02:37 +0000 Subject: [pkgdb] midori was added for pgordon Message-ID: <200803071804.m27I4G7c024200@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package midori with summary A lightweight GTK+ web browser Kevin Fenzi (kevin) has approved Package midori Kevin Fenzi (kevin) has added a Fedora devel branch for midori with an owner of pgordon Kevin Fenzi (kevin) has approved midori in Fedora devel Kevin Fenzi (kevin) has approved Package midori Kevin Fenzi (kevin) has set commit to Approved for cvsextras on midori (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on midori (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on midori (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/midori From fedora-extras-commits at redhat.com Fri Mar 7 18:02:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 18:02:40 +0000 Subject: [pkgdb] midori (Fedora, 8) updated by kevin Message-ID: <200803071804.m27I4Xdr024232@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for midori Kevin Fenzi (kevin) has set commit to Approved for cvsextras on midori (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on midori (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on midori (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on midori (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/midori From fedora-extras-commits at redhat.com Fri Mar 7 18:02:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 18:02:40 +0000 Subject: [pkgdb] midori (Fedora, 7) updated by kevin Message-ID: <200803071804.m27I4Xdu024232@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for midori Kevin Fenzi (kevin) has set commit to Approved for cvsextras on midori (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on midori (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on midori (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on midori (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/midori From fedora-extras-commits at redhat.com Fri Mar 7 18:02:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 18:02:40 +0000 Subject: [pkgdb] midori (Fedora, devel) updated by kevin Message-ID: <200803071804.m27I4Xdx024232@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on midori (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/midori From fedora-extras-commits at redhat.com Fri Mar 7 18:03:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 18:03:46 GMT Subject: rpms/midori - New directory Message-ID: <200803071803.m27I3kUm016870@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/midori In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR16830/rpms/midori Log Message: Directory /cvs/extras/rpms/midori added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 18:03:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 18:03:53 GMT Subject: rpms/midori/devel - New directory Message-ID: <200803071803.m27I3rIj016886@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/midori/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR16830/rpms/midori/devel Log Message: Directory /cvs/extras/rpms/midori/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 18:04:02 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 18:04:02 GMT Subject: rpms/midori Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803071804.m27I421V016912@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/midori In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR16830/rpms/midori Added Files: Makefile import.log Log Message: Setup of module midori --- NEW FILE Makefile --- # Top level Makefile for module midori all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 18:04:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 18:04:07 GMT Subject: rpms/midori/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803071804.m27I473F016931@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/midori/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR16830/rpms/midori/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module midori --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: midori # $Id: Makefile,v 1.1 2008/03/07 18:04:02 kevin Exp $ NAME := midori SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 18:05:39 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Fri, 7 Mar 2008 18:05:39 GMT Subject: rpms/gtk-vnc/devel sources,1.6,1.7 Message-ID: <200803071805.m27I5dNG017152@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/gtk-vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17118 Modified Files: sources Log Message: Upload 0.3.4 source tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Feb 2008 22:27:18 -0000 1.6 +++ sources 7 Mar 2008 18:05:01 -0000 1.7 @@ -1 +1 @@ -9d1762c53cb632461f9f75da336f3f8c gtk-vnc-0.3.3.tar.gz +5ccf094bfb47ad5fe224d7feca175de2 gtk-vnc-0.3.4.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 18:12:15 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Fri, 7 Mar 2008 18:12:15 GMT Subject: rpms/event-compat-sysv/devel event-compat-sysv.spec,1.5,1.6 Message-ID: <200803071812.m27ICFNR017383@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/event-compat-sysv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17288 Modified Files: event-compat-sysv.spec Log Message: these need to be %%config(noreplace) Index: event-compat-sysv.spec =================================================================== RCS file: /cvs/extras/rpms/event-compat-sysv/devel/event-compat-sysv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- event-compat-sysv.spec 26 Feb 2008 23:02:20 -0000 1.5 +++ event-compat-sysv.spec 7 Mar 2008 18:11:37 -0000 1.6 @@ -1,6 +1,6 @@ Name: event-compat-sysv Version: 0.3.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Upstart events to emulate SysVInit Group: System Environment/Base @@ -59,28 +59,31 @@ %files %defattr(-,root,root,-) -%{_sysconfdir}/event.d/control-alt-delete -%{_sysconfdir}/event.d/rc0 -%{_sysconfdir}/event.d/rc1 -%{_sysconfdir}/event.d/rc2 -%{_sysconfdir}/event.d/rc3 -%{_sysconfdir}/event.d/rc4 -%{_sysconfdir}/event.d/rc5 -%{_sysconfdir}/event.d/rc6 -%{_sysconfdir}/event.d/rc-default -%{_sysconfdir}/event.d/rcS -%{_sysconfdir}/event.d/rcS-sulogin -%{_sysconfdir}/event.d/sulogin -%{_sysconfdir}/event.d/tty1 -%{_sysconfdir}/event.d/tty2 -%{_sysconfdir}/event.d/tty3 -%{_sysconfdir}/event.d/tty4 -%{_sysconfdir}/event.d/tty5 -%{_sysconfdir}/event.d/tty6 -%{_sysconfdir}/event.d/prefdm +%config(noreplace) %{_sysconfdir}/event.d/control-alt-delete +%config(noreplace) %{_sysconfdir}/event.d/rc0 +%config(noreplace) %{_sysconfdir}/event.d/rc1 +%config(noreplace) %{_sysconfdir}/event.d/rc2 +%config(noreplace) %{_sysconfdir}/event.d/rc3 +%config(noreplace) %{_sysconfdir}/event.d/rc4 +%config(noreplace) %{_sysconfdir}/event.d/rc5 +%config(noreplace) %{_sysconfdir}/event.d/rc6 +%config(noreplace) %{_sysconfdir}/event.d/rc-default +%config(noreplace) %{_sysconfdir}/event.d/rcS +%config(noreplace) %{_sysconfdir}/event.d/rcS-sulogin +%config(noreplace) %{_sysconfdir}/event.d/sulogin +%config(noreplace) %{_sysconfdir}/event.d/tty1 +%config(noreplace) %{_sysconfdir}/event.d/tty2 +%config(noreplace) %{_sysconfdir}/event.d/tty3 +%config(noreplace) %{_sysconfdir}/event.d/tty4 +%config(noreplace) %{_sysconfdir}/event.d/tty5 +%config(noreplace) %{_sysconfdir}/event.d/tty6 +%config(noreplace) %{_sysconfdir}/event.d/prefdm %doc COPYING %changelog +* Fri Mar 7 2008 Bill Nottingham - 0.3.9-9 +- Much as /etc/inittab was, these need to be %%config(noreplace) + * Tue Feb 26 2008 Casey Dahlin - 0.3.9-8 - Fix for bug #432870 (prefdm event now has -nodaemon) From fedora-extras-commits at redhat.com Fri Mar 7 18:12:24 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 7 Mar 2008 18:12:24 GMT Subject: rpms/seekwatcher/devel seekwatcher.spec,1.1,1.2 Message-ID: <200803071812.m27ICO01017390@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/seekwatcher/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17319 Modified Files: seekwatcher.spec Log Message: * Fri Mar 07 2008 Eric Sandeen - 0.10-1 - New upstream version, includes filtering for fewer dropped events. Index: seekwatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/seekwatcher/devel/seekwatcher.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- seekwatcher.spec 2 Dec 2007 05:03:23 -0000 1.1 +++ seekwatcher.spec 7 Mar 2008 18:11:47 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Utility for visualizing block layer IO patterns and performance Name: seekwatcher -Version: 0.9 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} License: GPLv2 BuildArch: noarch Group: Development/System @@ -40,6 +40,9 @@ /usr/bin/* %changelog +* Fri Mar 07 2008 Eric Sandeen - 0.10-1 +- New upstream version, includes filtering for fewer dropped events. + * Fri Nov 30 2007 Eric Sandeen - 0.9-2 - More specfile fiddling From fedora-extras-commits at redhat.com Fri Mar 7 18:21:01 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 18:21:01 GMT Subject: rpms/perl-eperl/devel perl-eperl.spec,1.5,1.6 Message-ID: <200803071821.m27IL1sf017754@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-eperl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17714 Modified Files: perl-eperl.spec Log Message: perl 5.10 doesnt have a DynaLoader.a Index: perl-eperl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-eperl/devel/perl-eperl.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-eperl.spec 7 Mar 2008 02:22:01 -0000 1.5 +++ perl-eperl.spec 7 Mar 2008 18:20:25 -0000 1.6 @@ -1,12 +1,13 @@ Name: perl-eperl Version: 2.2.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Embedded Perl Language License: GPL+ or Artistic Group: Development/Libraries URL: http://www.ossp.org/pkg/tool/eperl/ Source0: ftp://ftp.ossp.org/pkg/tool/eperl/eperl-%{version}.tar.gz Patch0: http://ftp.debian.org/pool/main/e/eperl/eperl_2.2.14-13.diff.gz +Patch1: eperl-2.2.14-perl510-noDynaLoader.a.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel BuildRequires: db4-devel @@ -30,6 +31,7 @@ %prep %setup -q -n eperl-%{version} %patch0 -p1 +%patch1 -p1 chmod u+x etc/shtool find contrib/utils -perm +100 -type f -exec chmod 644 {} \; @@ -75,8 +77,11 @@ %{_mandir}/man3/* %changelog +* Fri Mar 07 2008 Tom "spot" Callaway - 2.2.14-7 +- perl 5.10 doesn't have DynaLoader.a + * Thu Mar 06 2008 Tom "spot" Callaway - 2.2.14-6 -Rebuild for new perl +- Rebuild for new perl * Tue Feb 19 2008 Fedora Release Engineering - 2.2.14-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 18:22:01 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 7 Mar 2008 18:22:01 GMT Subject: rpms/seekwatcher/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200803071822.m27IM1BO017882@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/seekwatcher/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17818 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/seekwatcher/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Dec 2007 05:03:23 -0000 1.2 +++ .cvsignore 7 Mar 2008 18:21:22 -0000 1.3 @@ -1 +1 @@ -seekwatcher-0.9.tar.bz2 +seekwatcher-0.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/seekwatcher/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Dec 2007 05:03:23 -0000 1.2 +++ sources 7 Mar 2008 18:21:22 -0000 1.3 @@ -1 +1 @@ -e4c554577e9298fc70fd162bdc647746 seekwatcher-0.9.tar.bz2 +d9800db1cbe7cc61f3cd52b617cf6a20 seekwatcher-0.10.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 18:23:47 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Fri, 7 Mar 2008 18:23:47 GMT Subject: rpms/sysvinit/devel sysvinit.spec,1.65,1.66 Message-ID: <200803071823.m27INluZ018018@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/sysvinit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17946 Modified Files: sysvinit.spec Log Message: don't build sysvinit package itself Index: sysvinit.spec =================================================================== RCS file: /cvs/extras/rpms/sysvinit/devel/sysvinit.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sysvinit.spec 29 Feb 2008 05:54:02 -0000 1.65 +++ sysvinit.spec 7 Mar 2008 18:23:11 -0000 1.66 @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes Name: sysvinit Version: 2.86 -Release: 22 +Release: 23 License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz @@ -122,6 +122,11 @@ install -m 755 change_console $RPM_BUILD_ROOT/sbin/change_console install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8/change_console.8 +rm -f $RPM_BUILD_ROOT/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} +rm -f $RPM_BUILD_ROOT/%{_includedir}/initreq.h +rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/* +rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}* + %post [ -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root ] && /sbin/telinit u exit 0 @@ -129,11 +134,11 @@ %clean rm -rf $RPM_BUILD_ROOT +%if 0 %files %defattr(-,root,root) %doc doc/Changelog doc/Install COPYRIGHT %doc doc/sysvinit-%{version}.lsm -/bin/mountpoint /sbin/halt /sbin/init /sbin/poweroff @@ -142,7 +147,6 @@ /sbin/shutdown /sbin/telinit /sbin/change_console -%attr(2555,root,tty) /usr/bin/wall %{_includedir}/initreq.h %{_mandir}/man5/* %{_mandir}/man8/halt* @@ -152,11 +156,17 @@ %{_mandir}/man8/runlevel* %{_mandir}/man8/shutdown* %{_mandir}/man8/telinit* +%endif %files tools %defattr(-,root,root) %doc doc/Changelog -%{_bindir}/* +/bin/mountpoint +%{_bindir}/last +%{_bindir}/lastb +%{_bindir}/mesg +%{_bindir}/utmpdump +%attr(2555,root,tty) /usr/bin/wall /sbin/change_console /sbin/pidof /sbin/killall5 @@ -168,6 +178,10 @@ %{_mandir}/man8/sulogin* %changelog +* Fri Mar 7 2008 Bill Nottingham - 2.86-23 +- move mountpoint to -tools subpackage +- don't build sysvinit package itself + * Fri Feb 29 2008 Bill Nottingham - 2.86-22 - don't kill pid 1 with killall5 From fedora-extras-commits at redhat.com Fri Mar 7 18:27:53 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 7 Mar 2008 18:27:53 GMT Subject: rpms/PyKDE/devel .cvsignore, 1.4, 1.5 PyKDE.spec, 1.17, 1.18 sources, 1.3, 1.4 PyKDE-3.16.0-konsolepart.patch, 1.1, NONE PyKDE-3.16.0-python25.patch, 1.1, NONE PyKDE-3.16.0-sip-4.7.patch, 1.1, NONE Message-ID: <200803071827.m27IRrX4018147@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/PyKDE/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18101 Modified Files: .cvsignore PyKDE.spec sources Removed Files: PyKDE-3.16.0-konsolepart.patch PyKDE-3.16.0-python25.patch PyKDE-3.16.0-sip-4.7.patch Log Message: * Fri Mar 07 2008 Rex Dieter 3.16.1-1 - PyKDE-3.16.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PyKDE/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Feb 2007 14:03:21 -0000 1.4 +++ .cvsignore 7 Mar 2008 18:27:16 -0000 1.5 @@ -1,2 +1 @@ -clog -PyKDE-3.16.0.tar.gz +PyKDE-3.16.1.tar.bz2 Index: PyKDE.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyKDE/devel/PyKDE.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- PyKDE.spec 11 Feb 2008 13:05:09 -0000 1.17 +++ PyKDE.spec 7 Mar 2008 18:27:16 -0000 1.18 @@ -2,23 +2,19 @@ # Fedora review: # http://bugzilla.redhat.com/190367 -Summary: Python bindings for KDE +Summary: Python bindings for KDE3 Name: PyKDE -Version: 3.16.0 -Release: 12%{?dist} +Version: 3.16.1 +Release: 1%{?dist} License: GPLv2 URL: http://www.riverbankcomputing.co.uk/pykde/ -Source0: http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-%{version}.tar.gz +Source0: http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-%{version}.tar.bz2 Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: PyKDE-3.16.0-konsolepart.patch # http://mats.imk.fraunhofer.de/pipermail/pykde/2006-November/014627.html Patch2: PyKDE-3.16.0-kmimetype.patch -# http://mats.imk.fraunhofer.de/pipermail/pykde/2006-December/015025.html -Patch3: PyKDE-3.16.0-python25.patch -Patch4: http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-3.16.0-sip-4.7.patch BuildRequires: python-devel >= 2.3 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]") @@ -33,14 +29,12 @@ #Requires: PyQt = %{pyqt_ver} #endif -BuildRequires: kdelibs3-devel kdebase3 -%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) -Requires: kdelibs3 >= %{kdelibs_ver} -# for libkonsolepart.* -Requires: kdebase3 +BuildRequires: kdelibs3-devel +%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) +Requires: kdelibs3 >= %{kdelibs3_ver} %description -These are the Python bindings for KDE. +These are the Python bindings for KDE3. %package devel Summary: %{name} SIP files @@ -56,9 +50,7 @@ %prep %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}} -%patch1 -p1 -b .konsolepart %patch2 -p1 -b .kmimetype -%patch4 -p1 -b .sip-4.7 %build @@ -85,7 +77,6 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README THANKS %{_bindir}/* -%{_libdir}/libkonsolepart.* %{python_sitearch}/* %files devel @@ -95,6 +86,9 @@ %changelog +* Fri Mar 07 2008 Rex Dieter 3.16.1-1 +- PyKDE-3.16.1 + * Mon Feb 11 2008 Rex Dieter 3.16.0-12 - respin (gcc43) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyKDE/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Sep 2006 20:19:02 -0000 1.3 +++ sources 7 Mar 2008 18:27:16 -0000 1.4 @@ -1 +1 @@ -92fa0f7d6063dc2aad97d5302975ca76 PyKDE-3.16.0.tar.gz +986e67ced4753cac5a4b7be8031ad64e PyKDE-3.16.1.tar.bz2 --- PyKDE-3.16.0-konsolepart.patch DELETED --- --- PyKDE-3.16.0-python25.patch DELETED --- --- PyKDE-3.16.0-sip-4.7.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 7 18:30:20 2008 From: fedora-extras-commits at redhat.com (Eric Sandeen (sandeen)) Date: Fri, 7 Mar 2008 18:30:20 GMT Subject: rpms/seekwatcher/F-8 .cvsignore, 1.2, 1.3 seekwatcher.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803071830.m27IUKYZ018260@cvs-int.fedora.redhat.com> Author: sandeen Update of /cvs/pkgs/rpms/seekwatcher/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18226 Modified Files: .cvsignore seekwatcher.spec sources Log Message: * Fri Mar 07 2008 Eric Sandeen - 0.10-1 - New upstream version, includes filtering for fewer dropped events. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/seekwatcher/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Dec 2007 05:10:26 -0000 1.2 +++ .cvsignore 7 Mar 2008 18:29:46 -0000 1.3 @@ -1 +1 @@ -seekwatcher-0.9.tar.bz2 +seekwatcher-0.10.tar.bz2 Index: seekwatcher.spec =================================================================== RCS file: /cvs/pkgs/rpms/seekwatcher/F-8/seekwatcher.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- seekwatcher.spec 2 Dec 2007 05:10:26 -0000 1.1 +++ seekwatcher.spec 7 Mar 2008 18:29:46 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Utility for visualizing block layer IO patterns and performance Name: seekwatcher -Version: 0.9 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} License: GPLv2 BuildArch: noarch Group: Development/System @@ -40,6 +40,9 @@ /usr/bin/* %changelog +* Fri Mar 07 2008 Eric Sandeen - 0.10-1 +- New upstream version, includes filtering for fewer dropped events. + * Fri Nov 30 2007 Eric Sandeen - 0.9-2 - More specfile fiddling Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/seekwatcher/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Dec 2007 05:10:26 -0000 1.2 +++ sources 7 Mar 2008 18:29:46 -0000 1.3 @@ -1 +1 @@ -e4c554577e9298fc70fd162bdc647746 seekwatcher-0.9.tar.bz2 +d9800db1cbe7cc61f3cd52b617cf6a20 seekwatcher-0.10.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 18:36:28 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 18:36:28 GMT Subject: rpms/perl-eperl/devel eperl-2.2.14-perl510-noDynaLoader.a.patch, NONE, 1.1 perl-eperl.spec, 1.6, 1.7 Message-ID: <200803071836.m27IaSOA018523@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-eperl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18498 Modified Files: perl-eperl.spec Added Files: eperl-2.2.14-perl510-noDynaLoader.a.patch Log Message: no DynaLoader.a eperl-2.2.14-perl510-noDynaLoader.a.patch: --- NEW FILE eperl-2.2.14-perl510-noDynaLoader.a.patch --- diff -up eperl-2.2.14/configure.BAD eperl-2.2.14/configure --- eperl-2.2.14/configure.BAD 2008-03-07 13:15:04.000000000 -0500 +++ eperl-2.2.14/configure 2008-03-07 13:15:17.000000000 -0500 @@ -1355,7 +1355,7 @@ case $usedl in #define HAVE_PERL_DYNALOADER 1 _ACEOF - perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a + perl_dla= ;; * ) rc=no diff -up eperl-2.2.14/configure.in.BAD eperl-2.2.14/configure.in --- eperl-2.2.14/configure.in.BAD 2008-03-07 13:15:24.000000000 -0500 +++ eperl-2.2.14/configure.in 2008-03-07 13:15:31.000000000 -0500 @@ -159,7 +159,7 @@ case $usedl in define ) rc=yes AC_DEFINE(HAVE_PERL_DYNALOADER) - perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a + perl_dla= ;; * ) rc=no Index: perl-eperl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-eperl/devel/perl-eperl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-eperl.spec 7 Mar 2008 18:20:25 -0000 1.6 +++ perl-eperl.spec 7 Mar 2008 18:35:46 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-eperl Version: 2.2.14 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Embedded Perl Language License: GPL+ or Artistic Group: Development/Libraries @@ -77,6 +77,9 @@ %{_mandir}/man3/* %changelog +* Fri Mar 07 2008 Tom "spot" Callaway - 2.2.14-8 +- actually commit patch to cvs + * Fri Mar 07 2008 Tom "spot" Callaway - 2.2.14-7 - perl 5.10 doesn't have DynaLoader.a From fedora-extras-commits at redhat.com Fri Mar 7 18:37:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 18:37:55 GMT Subject: rpms/openser/devel openser-1.3.0-perl510.patch, NONE, 1.1 openser.spec, 1.11, 1.12 Message-ID: <200803071837.m27IbtiX018621@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/openser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18582 Modified Files: openser.spec Added Files: openser-1.3.0-perl510.patch Log Message: use PERL_SYS_INIT3_BASE for 5.10 openser-1.3.0-perl510.patch: --- NEW FILE openser-1.3.0-perl510.patch --- diff -up openser-1.3.0-tls/modules/perl/perl.c.BAD openser-1.3.0-tls/modules/perl/perl.c --- openser-1.3.0-tls/modules/perl/perl.c.BAD 2008-03-07 13:28:51.000000000 -0500 +++ openser-1.3.0-tls/modules/perl/perl.c 2008-03-07 13:28:58.000000000 -0500 @@ -322,7 +322,7 @@ static int mod_init(void) { return -1; } - PERL_SYS_INIT3(&argc, &argv, &environ); + PERL_SYS_INIT3_BODY(&argc, &argv, &environ); if ((my_perl = parser_init())) { ret = 0; Index: openser.spec =================================================================== RCS file: /cvs/pkgs/rpms/openser/devel/openser.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- openser.spec 7 Mar 2008 16:36:10 -0000 1.11 +++ openser.spec 7 Mar 2008 18:37:19 -0000 1.12 @@ -10,7 +10,7 @@ Summary: Open Source SIP Server Name: openser Version: 1.3.0 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://www.openser.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz @@ -18,6 +18,7 @@ Patch3: openser--openssl-paths.diff Patch4: openser--openserdbctl.diff Patch5: openser--config-fix.diff +Patch6: openser-1.3.0-perl510.patch URL: http://www.openser.org/ BuildRequires: expat-devel @@ -415,6 +416,7 @@ %patch3 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \ @@ -811,6 +813,9 @@ %doc docdir/README.xmpp %changelog +* Fri Mar 7 2008 Tom "spot" Callaway - 1.3.0-12 +- patch perl code to use PERL_SYS_INIT3_BODY + * Fri Mar 7 2008 Tom "spot" Callaway - 1.3.0-11 - fix perl build requires From fedora-extras-commits at redhat.com Fri Mar 7 18:39:13 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Fri, 7 Mar 2008 18:39:13 GMT Subject: rpms/xorg-x11-server/devel .cvsignore, 1.37, 1.38 commitid, 1.10, 1.11 sources, 1.32, 1.33 xorg-x11-server.spec, 1.301, 1.302 Message-ID: <200803071839.m27IdDOA018718@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18673/devel Modified Files: .cvsignore commitid sources xorg-x11-server.spec Log Message: today's git snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 4 Mar 2008 20:43:03 -0000 1.37 +++ .cvsignore 7 Mar 2008 18:38:38 -0000 1.38 @@ -1 +1 @@ -xorg-server-20080304.tar.bz2 +xorg-server-20080307.tar.bz2 Index: commitid =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- commitid 4 Mar 2008 20:43:03 -0000 1.10 +++ commitid 7 Mar 2008 18:38:38 -0000 1.11 @@ -1 +1 @@ -e4d92a13e83b4327067c97d8c9fe151a1c0b35af +ef702d586697c4ae9092ab0a412719c11973ec60 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 4 Mar 2008 20:43:03 -0000 1.32 +++ sources 7 Mar 2008 18:38:38 -0000 1.33 @@ -1 +1 @@ -e81f00d089163f9a88bc89e73da0b2c3 xorg-server-20080304.tar.bz2 +04ea8f94db434f0629b8ce7ff68a1087 xorg-server-20080307.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.301 retrieving revision 1.302 diff -u -r1.301 -r1.302 --- xorg-x11-server.spec 4 Mar 2008 20:43:03 -0000 1.301 +++ xorg-x11-server.spec 7 Mar 2008 18:38:38 -0000 1.302 @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080304 +%define gitdate 20080307 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.4.99.900 -Release: 0.28.%{gitdate}%{?dist} +Version: 1.4.99.901 +Release: 1.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -108,8 +108,8 @@ # openssl? really? BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex -BuildRequires: mesa-libGL-devel >= 7.1 -BuildRequires: mesa-source >= 7.1-0.16 +BuildRequires: mesa-libGL-devel >= 7.1-0.19 +BuildRequires: mesa-source >= 7.1-0.19 # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 %if %{with_hw_servers} @@ -506,6 +506,9 @@ %changelog +* Fri Mar 07 2008 Adam Jackson 1.4.99.901-1.20080307 +- Today's 1.5 snapshot. + * Tue Mar 04 2008 Adam Jackson 1.4.99.900-0.28.20080304 - Today's 1.5 snapshot. - Obsolete: xorg-x11-drv-magictouch to get it uninstalled. From fedora-extras-commits at redhat.com Fri Mar 7 18:43:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 18:43:55 GMT Subject: rpms/perl-Graphics-ColorNames/devel perl-Graphics-ColorNames.spec, 1.7, 1.8 Message-ID: <200803071843.m27Ihtlc018877@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Graphics-ColorNames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18854 Modified Files: perl-Graphics-ColorNames.spec Log Message: disable missing BR Index: perl-Graphics-ColorNames.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Graphics-ColorNames/devel/perl-Graphics-ColorNames.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Graphics-ColorNames.spec 7 Mar 2008 02:02:40 -0000 1.7 +++ perl-Graphics-ColorNames.spec 7 Mar 2008 18:43:21 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Graphics-ColorNames Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Defines RGB values for common color names License: GPL+ or Artistic Group: Development/Libraries @@ -17,7 +17,8 @@ BuildRequires: perl(Test::Pod) >= 1 BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Portability::Files) -BuildRequires: perl(Tie::Sub) +# Not in Fedora (yet) +# BuildRequires: perl(Tie::Sub) Requires: perl(Module::Load) >= 0.10 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -58,8 +59,11 @@ %{_mandir}/man3/* %changelog +* Fri Mar 07 2008 Tom "spot" Callaway - 2.11-3 +- disable BR on Tie::Sub (optional, and not in Fedora yet) + * Thu Mar 06 2008 Tom "spot" Callaway - 2.11-2 -Rebuild for new perl +- Rebuild for new perl * Mon Jan 28 2008 Steven Pritchard 2.11-1 - Update to 2.11. From fedora-extras-commits at redhat.com Fri Mar 7 18:49:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 18:49:55 GMT Subject: rpms/perl-libxml-perl/devel perl-libxml-perl.spec,1.15,1.16 Message-ID: <200803071849.m27Int4B019048@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-libxml-perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19022 Modified Files: perl-libxml-perl.spec Log Message: dont filter out all Data::Grove provides, only unversioned duplicate Index: perl-libxml-perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-libxml-perl/devel/perl-libxml-perl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-libxml-perl.spec 28 Feb 2008 13:15:10 -0000 1.15 +++ perl-libxml-perl.spec 7 Mar 2008 18:49:20 -0000 1.16 @@ -1,6 +1,6 @@ Name: perl-libxml-perl Version: 0.08 -Release: 5%{?dist} +Release: 7%{?dist} Summary: A collection of Perl modules for working with XML Group: Development/Libraries @@ -29,7 +29,7 @@ cat << \EOF > %{name}-prov #!/bin/sh %{__perl_provides} $* |\ - sed -e '/perl(Data::Grove)/d' + sed -e '/perl(Data::Grove)$/d' EOF %define __perl_provides %{_builddir}/libxml-perl-%{version}/%{name}-prov @@ -66,6 +66,9 @@ %changelog +* Fri Mar 7 2008 Tom "spot" Callaway - 0.08-6 +- don't filter out all Data::Grove provides, only unversioned one + * Wed Feb 27 2008 Tom "spot" Callaway - 0.08-5 - Rebuild for perl 5.10 (again) From fedora-extras-commits at redhat.com Fri Mar 7 18:55:06 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Fri, 7 Mar 2008 18:55:06 GMT Subject: rpms/kernel/devel config-generic,1.78,1.79 kernel.spec,1.482,1.483 Message-ID: <200803071855.m27It695019175@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19142 Modified Files: config-generic kernel.spec Log Message: * Fri Mar 07 2008 Dave Jones - Enable unused symbols. Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- config-generic 5 Mar 2008 15:12:35 -0000 1.78 +++ config-generic 7 Mar 2008 18:54:31 -0000 1.79 @@ -3354,7 +3354,7 @@ CONFIG_DMA_ENGINE=y CONFIG_NET_DMA=y -# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_UNUSED_SYMBOLS=y CONFIG_UTRACE=y CONFIG_PTRACE=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.482 retrieving revision 1.483 diff -u -r1.482 -r1.483 --- kernel.spec 7 Mar 2008 17:55:27 -0000 1.482 +++ kernel.spec 7 Mar 2008 18:54:31 -0000 1.483 @@ -1753,6 +1753,9 @@ %changelog * Fri Mar 07 2008 Dave Jones +- Enable unused symbols. + +* Fri Mar 07 2008 Dave Jones - 2.6.25-rc4-git2 * Fri Mar 07 2008 Dave Airlie From fedora-extras-commits at redhat.com Fri Mar 7 18:58:12 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Fri, 7 Mar 2008 18:58:12 GMT Subject: rpms/oyranos/devel README-Fedora-ICC_PROFILES, NONE, 1.1 oyranos-0.1.7-default.patch, NONE, 1.1 oyranos-0.1.7-fix_bash.patch, NONE, 1.1 oyranos-0.1.7-fix_pc.patch, NONE, 1.1 oyranos-0.1.7-install_p.patch, NONE, 1.1 oyranos-0.1.7-man-1_3.patch, NONE, 1.1 oyranos-0.1.7-rm_class.patch, NONE, 1.1 oyranos-0.1.7-rpath.patch, NONE, 1.1 oyranos-0.1.7-shared_NVCtrl.patch, NONE, 1.1 oyranos-0.1.7-sw_elektra.patch, NONE, 1.1 oyranos-repack.sh, NONE, 1.1 oyranos.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803071858.m27IwCim019346@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/oyranos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19288/devel Modified Files: .cvsignore sources Added Files: README-Fedora-ICC_PROFILES oyranos-0.1.7-default.patch oyranos-0.1.7-fix_bash.patch oyranos-0.1.7-fix_pc.patch oyranos-0.1.7-install_p.patch oyranos-0.1.7-man-1_3.patch oyranos-0.1.7-rm_class.patch oyranos-0.1.7-rpath.patch oyranos-0.1.7-shared_NVCtrl.patch oyranos-0.1.7-sw_elektra.patch oyranos-repack.sh oyranos.spec Log Message: Initial import --- NEW FILE README-Fedora-ICC_PROFILES --- README-Fedora-ICC_PROFILES Fedora does not currently redistribute icc profiles. You need to download them manually for now. They need to be placed in ~/.color/icc or /usr/share/color/icc (for system wide access). See: http://www.behrmann.name http://www.colormanagement.org http://www.eci.org http://www.littlecms.com/profiles.zip http://www.photogamut.org oyranos-0.1.7-default.patch: --- NEW FILE oyranos-0.1.7-default.patch --- diff -up oyranos-0.1.7/settings/prepress.policy.xml.default oyranos-0.1.7/settings/prepress.policy.xml --- oyranos-0.1.7/settings/prepress.policy.xml.default 2008-02-28 00:06:03.000000000 +0100 +++ oyranos-0.1.7/settings/prepress.policy.xml 2008-02-28 00:07:39.000000000 +0100 @@ -18,15 +18,15 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM diff -up oyranos-0.1.7/settings/office.policy.xml.default oyranos-0.1.7/settings/office.policy.xml --- oyranos-0.1.7/settings/office.policy.xml.default 2008-02-28 00:03:30.000000000 +0100 +++ oyranos-0.1.7/settings/office.policy.xml 2008-02-28 00:04:59.000000000 +0100 @@ -18,19 +18,19 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM diff -up oyranos-0.1.7/settings/photographer.policy.xml.default oyranos-0.1.7/settings/photographer.policy.xml --- oyranos-0.1.7/settings/photographer.policy.xml.default 2008-02-28 00:05:56.000000000 +0100 +++ oyranos-0.1.7/settings/photographer.policy.xml 2008-02-28 00:06:55.000000000 +0100 @@ -18,15 +18,15 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM diff -up oyranos-0.1.7/settings/designer.policy.xml.default oyranos-0.1.7/settings/designer.policy.xml --- oyranos-0.1.7/settings/designer.policy.xml.default 2008-02-28 00:08:10.000000000 +0100 +++ oyranos-0.1.7/settings/designer.policy.xml 2008-02-28 00:08:38.000000000 +0100 @@ -18,15 +18,15 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM oyranos-0.1.7-fix_bash.patch: --- NEW FILE oyranos-0.1.7-fix_bash.patch --- diff -up oyranos-0.1.7/configure.sh.fix_bash oyranos-0.1.7/configure.sh --- oyranos-0.1.7/configure.sh.fix_bash 2008-03-04 12:59:25.000000000 +0100 +++ oyranos-0.1.7/configure.sh 2008-03-04 12:59:25.000000000 +0100 @@ -418,7 +418,6 @@ if [ -n "$DEBUG" ] && [ $DEBUG -gt 0 ]; DEBUG_="-Wall -g -DDEBUG --pedantic" test -f "$i/makefile".in && echo "DEBUG = $DEBUG_" >> "$i/makefile" test -f "$i/makefile".in && echo "DEBUG_SWITCH = -v" >> "$i/makefile" - else fi done fi diff -up oyranos-0.1.7/configure.fix_bash oyranos-0.1.7/configure --- oyranos-0.1.7/configure.fix_bash 2008-03-04 12:59:25.000000000 +0100 +++ oyranos-0.1.7/configure 2008-03-04 13:18:24.000000000 +0100 @@ -25,7 +25,7 @@ else fi MAKEFILE_DIR=". fl_i18n $PROFILE_DIR"; export MAKEFILE_DIR -export CONF_H CONF CONF_I18N CONF_NV +export CONF_H CONF CONF_I18N VERSION_A=0 VERSION_B=1 @@ -375,8 +375,6 @@ test -n "$ECHO" && $ECHO "CXX = $CXX" >> test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF test -n "$ECHO" && $ECHO "CXX = $CXX" >> $CONF_I18N test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF_I18N -test -n "$ECHO" && $ECHO "CXX = $CXX" >> $CONF_NV -test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF_NV export CC CXX CFLAGS_COMMON="`echo $CFLAGS | $STRIPOPT` \$(DEBUG) \$(INCL)" @@ -417,7 +415,6 @@ export internalelektra # set some compiler and linker options test -n "$ECHO" && $ECHO "RM = rm -vf" >> $CONF -test -n "$ECHO" && $ECHO "RM = rm -vf" >> $CONF_NV if [ $OSUNAME = "Darwin" ]; then test -n "$ECHO" && $ECHO "LIBEXT = .dylib" >> $CONF GCC_VERSION_INFO="-Wl,-compatibility_version -Wl,$VERSION_ABI_A -Wl,-current_version -Wl,$VERSION_ABI_A.$VERSION_ABI_B" @@ -579,7 +576,6 @@ test -n "$ECHO" && $ECHO "prefix=$prefix test -n "$ECHO" && $ECHO "exec_prefix=$exec_prefix" >> $CONF_SH test -n "$ECHO" && $ECHO "bindir=$bindir" >> $CONF_SH test -n "$ECHO" && $ECHO "sbindir=$sbindir" >> $CONF_SH -test -n "$ECHO" && $ECHO "libdir=$libdir" >> $CONF_SH test -n "$ECHO" && $ECHO "includedir=$includedir" >> $CONF_SH test -n "$ECHO" && $ECHO "datadir=$datadir" >> $CONF_SH test -n "$ECHO" && $ECHO "mandir=$mandir" >> $CONF_SH @@ -727,7 +723,6 @@ CFLAGS="$CFLAGS_COMMON `echo $CFLAGS | $ CXXFLAGS="$CXXFLAGS_COMMON `echo $CXXFLAGS | $STRIPOPT`" LDFLAGS="`echo $LDFLAGS | $STRIPOPT` \$(dl)" -test -n "$ECHO" && $ECHO "CFLAGS=$CFLAGS" >> $CONF_NV test -n "$ECHO" && $ECHO "CFLAGS = $CFLAGS" >> $CONF_I18N test -n "$ECHO" && $ECHO "CXXFLAGS = $CXXFLAGS">>$CONF_I18N test -n "$ECHO" && $ECHO "LDFLAGS = $LDFLAGS" >> $CONF_I18N oyranos-0.1.7-fix_pc.patch: --- NEW FILE oyranos-0.1.7-fix_pc.patch --- diff -up oyranos-0.1.7/oyranos_monitor.pc.in.fix_pc oyranos-0.1.7/oyranos_monitor.pc.in --- oyranos-0.1.7/oyranos_monitor.pc.in.fix_pc 2006-04-13 11:30:25.000000000 +0200 +++ oyranos-0.1.7/oyranos_monitor.pc.in 2008-03-07 15:45:39.000000000 +0100 @@ -1,7 +1,7 @@ -includedir=${prefix}/include -Name: oyranos +Name: oyranos_monitor Description: Oyranos Colour Management System -Libs: -L${libdir} -loyranos -loyranos_moni -X11 -Xinerama +Requires: x11 xinerama oyranos +Libs: -L${libdir} -loyranos_moni Cflags: -I${includedir} diff -up oyranos-0.1.7/oyranos-config.in.fix_pc oyranos-0.1.7/oyranos-config.in --- oyranos-0.1.7/oyranos-config.in.fix_pc 2007-04-03 15:53:41.000000000 +0200 +++ oyranos-0.1.7/oyranos-config.in 2008-03-07 16:03:11.000000000 +0100 @@ -1,3 +1,9 @@ + +ELEKTRA_VERSION=`pkg-config --modversion elektra` +export ELEKTRA_VERSION +libdir=`pkg-config x11 --variable libdir` +export libdir + if [ -n "$PKG_CONFIG_PATH" ]; then PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$libdir/pkgconfig else @@ -82,6 +88,7 @@ if [ "$echo_help" = "yes" ]; then echo " $0 --settingsdirname Oyranos settings directory name" fi +if [ -f liboyranos.so ]; then if [ -z $ELEKTRA_VERSION ]; then elektra_dyn="`pkg-config --libs elektra`" if [ -f $libdir/libelektra.a ]; then @@ -102,6 +109,7 @@ else elektra="$libdir/lib${TARGET}_elektra.a $dl $iconv $intl" fi fi +fi if [ "$echo_cflags" = "yes" ]; then echo "-I$prefix/include" @@ -111,7 +119,7 @@ if [ "$echo_ldflags" = "yes" ]; then if [ -f liboyranos.so ]; then echo "-L. -loyranos $elektra_dyn $oyranos_add" else - echo "-L$libdir -loyranos $elektra_dyn $oyranos_add" + pkg-config --libs oyranos fi fi @@ -127,13 +135,13 @@ if [ "$echo_ld_x_flags" = "yes" ]; then if [ -f liboyranos.so ]; then echo "-L. -loyranos -loyranos_moni $elektra_dyn $oyranos_add" else - echo "-L$libdir -loyranos -loyranos_moni $elektra_dyn $oyranos_add" + pkg-config --libs oyranos_monitor fi fi # only standard paths are here supported -if [ -f /usr/lib/libX11.so ]; then - X11_PATH=-L/usr/lib +if [ -f $libdir/libX11.so ]; then + X11_PATH=-L$libdir fi if [ -f /usr/local/lib/libX11.so ]; then X11_PATH=-L/usr/local/lib oyranos-0.1.7-install_p.patch: --- NEW FILE oyranos-0.1.7-install_p.patch --- --- oyranos-0.1.7/configure.install_p 2007-06-18 01:22:09.000000000 +0200 +++ oyranos-0.1.7/configure 2007-06-18 01:25:09.000000000 +0200 @@ -435,7 +435,7 @@ test -n "$ECHO" && $ECHO "REZ = fltk-config --post \$@" >> $CONF test -n "$ECHO" && $ECHO "I18N_LIB = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF test -n "$ECHO" && $ECHO "I18N_LIBSTAT = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF - INSTALL="install $DEBUG_SWITCH" + INSTALL="install -p $DEBUG_SWITCH" oyranos_add="-framework ApplicationServices \$dl" oyranos_x_add="" else @@ -462,7 +462,7 @@ test -n "$ECHO" && $ECHO "MAKEDEPEND = makedepend -Y" >> $CONF CFLAGS="$CFLAGS -fPIC -DPIC" CXXFLAGS="$CXXFLAGS -fPIC -DPIC" - INSTALL="install $DEBUG_SWITCH" + INSTALL="install -p $DEBUG_SWITCH" else test -n "$ECHO" && $ECHO "COPY = cp -p" >> $CONF if [ $OSUNAME = "BSD" ]; then @@ -471,14 +471,14 @@ test -n "$ECHO" && $ECHO "LINK_NAME_M = -Wl,-soname -Wl,\$(LIB_MONI_SONAMEFULL)" >> $CONF test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,\$(libdir)" >> $CONF test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,\$(srcdir)" >> $CONF - INSTALL="install $DEBUG_SWITCH" + INSTALL="install -p $DEBUG_SWITCH" fi if [ $OSUNAME = "SunOS" ]; then LDFLAGS="$LDFLAGS -mimpure-text" INSTALL="install" else LDFLAGS="$LDFLAGS" - INSTALL="install" + INSTALL="install -p" fi test -n "$ECHO" && $ECHO "I18N_LIB = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF test -n "$ECHO" && $ECHO "I18N_LIBSTAT = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF @@ -737,9 +737,9 @@ test -n "$ECHO" && $ECHO "CFLAGS = $CFLAGS" >> $CONF test -n "$ECHO" && $ECHO "CXXFLAGS = $CXXFLAGS">>$CONF test -n "$ECHO" && $ECHO "LDFLAGS = $LDFLAGS" >> $CONF -test -n "$ECHO" && $ECHO "INSTALL = $INSTALL" >> $CONF -test -n "$ECHO" && $ECHO "INSTALL = $INSTALL" >> $ECI_CONF -test -n "$ECHO" && $ECHO "INSTALL = $INSTALL" >> $BASE_CONF +test -n "$ECHO" && $ECHO "INSTALL = $INSTALL -p" >> $CONF +test -n "$ECHO" && $ECHO "INSTALL = $INSTALL -p" >> $ECI_CONF +test -n "$ECHO" && $ECHO "INSTALL = $INSTALL -p" >> $BASE_CONF test -n "$ECHO" && $ECHO "" >> $CONF test -n "$ECHO" && $ECHO "" >> $CONF oyranos-0.1.7-man-1_3.patch: --- NEW FILE oyranos-0.1.7-man-1_3.patch --- diff -up oyranos-0.1.7/oyranos-config-fltk.1.man-1_3 oyranos-0.1.7/oyranos-config-fltk.1 --- oyranos-0.1.7/oyranos-config-fltk.1.man-1_3 2008-03-04 13:08:38.000000000 +0100 +++ oyranos-0.1.7/oyranos-config-fltk.1 2008-03-04 13:08:44.000000000 +0100 @@ -15,6 +15,6 @@ www.oyranos.org/wiki/index.php?title=Oyr .SH AUTHOR Kai-Uwe Behrmann (ku.b (at) gmx.de) .SH "SEE ALSO" -oyranos-config(1) oyranos-policy(1) oyranos-monitor(1) oyranos(3) +oyranos-config(3) oyranos-policy(1) oyranos-monitor(1) oyranos(3) .SH BUGS at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 diff -up oyranos-0.1.7/oyranos.3.man-1_3 oyranos-0.1.7/oyranos.3 --- oyranos-0.1.7/oyranos.3.man-1_3 2008-03-04 13:06:20.000000000 +0100 +++ oyranos-0.1.7/oyranos.3 2008-03-04 13:06:27.000000000 +0100 @@ -25,6 +25,6 @@ http://www.oyranos.org/doc/html/index.ht .SH AUTHOR Kai-Uwe Behrmann (ku.b (at) gmx.de) .SH "SEE ALSO" -oyranos-config(1) oyranos-policy(1) oyranos-monitor(1) +oyranos-config(3) oyranos-policy(1) oyranos-monitor(1) .SH BUGS at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 diff -up oyranos-0.1.7/oyranos-policy.1.man-1_3 oyranos-0.1.7/oyranos-policy.1 --- oyranos-0.1.7/oyranos-policy.1.man-1_3 2008-03-04 13:08:16.000000000 +0100 +++ oyranos-0.1.7/oyranos-policy.1 2008-03-04 13:08:42.000000000 +0100 @@ -20,6 +20,6 @@ Dump the current policy: .SH AUTHOR Kai-Uwe Behrmann (ku.b (at) gmx.de) .SH "SEE ALSO" -oyranos-config(1) oyranos-policy(1) oyranos-monitor(1) oyranos(3) +oyranos-config(3) oyranos-policy(1) oyranos-monitor(1) oyranos(3) .SH BUGS at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 diff -up oyranos-0.1.7/oyranos-config.1.man-1_3 oyranos-0.1.7/oyranos-config.1 --- oyranos-0.1.7/oyranos-config.1.man-1_3 2008-03-04 13:07:00.000000000 +0100 +++ oyranos-0.1.7/oyranos-config.1 2008-03-04 13:07:14.000000000 +0100 @@ -1,4 +1,4 @@ -.TH "oyranos-config" 1 "February 20, 2007" "User Commands" +.TH "oyranos-config" 3 "February 20, 2007" "User Commands" .SH NAME oyranos-config \- Oyranos CMS configuration query for builds and locations .SH SYNOPSIS oyranos-0.1.7-rm_class.patch: --- NEW FILE oyranos-0.1.7-rm_class.patch --- diff -up oyranos-0.1.7/Doxyfile.rm_class oyranos-0.1.7/Doxyfile --- oyranos-0.1.7/Doxyfile.rm_class 2008-03-04 16:09:04.000000000 +0100 +++ oyranos-0.1.7/Doxyfile 2008-03-04 16:09:56.000000000 +0100 @@ -203,8 +203,8 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES +CLASS_GRAPH = NO +COLLABORATION_GRAPH = NO UML_LOOK = YES TEMPLATE_RELATIONS = NO INCLUDE_GRAPH = NO oyranos-0.1.7-rpath.patch: --- NEW FILE oyranos-0.1.7-rpath.patch --- --- oyranos-0.1.7/configure.rpath 2007-04-03 15:50:01.000000000 +0200 +++ oyranos-0.1.7/configure 2007-06-18 00:59:01.000000000 +0200 @@ -457,8 +457,8 @@ test -n "$ECHO" && $ECHO "LINK_FLAGS_STATIC =" >> $CONF test -n "$ECHO" && $ECHO "LINK_NAME = -Wl,-soname -Wl,\$(LIBSONAMEFULL)" >> $CONF test -n "$ECHO" && $ECHO "LINK_NAME_M = -Wl,-soname -Wl,\$(LIB_MONI_SONAMEFULL)" >> $CONF - test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,--rpath -Wl,\$(libdir)" >> $CONF - test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,--rpath -Wl,\$(srcdir)" >> $CONF + test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,-L\$(libdir)" >> $CONF + test -n "$ECHO" && $ECHO "LINK_SRC_PATH =??-Wl,\$(srcdir)" >> $CONF test -n "$ECHO" && $ECHO "MAKEDEPEND = makedepend -Y" >> $CONF CFLAGS="$CFLAGS -fPIC -DPIC" CXXFLAGS="$CXXFLAGS -fPIC -DPIC" @@ -469,8 +469,8 @@ LDFLAGS="$LDFLAGS" test -n "$ECHO" && $ECHO "LINK_NAME = -Wl,-soname -Wl,\$(LIBSONAMEFULL)" >> $CONF test -n "$ECHO" && $ECHO "LINK_NAME_M = -Wl,-soname -Wl,\$(LIB_MONI_SONAMEFULL)" >> $CONF - test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,--rpath -Wl,\$(libdir)" >> $CONF - test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,--rpath -Wl,\$(srcdir)" >> $CONF + test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,-L\$(libdir)" >> $CONF + test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,\$(srcdir)" >> $CONF INSTALL="install $DEBUG_SWITCH" fi if [ $OSUNAME = "SunOS" ]; then oyranos-0.1.7-shared_NVCtrl.patch: --- NEW FILE oyranos-0.1.7-shared_NVCtrl.patch --- --- oyranos-0.1.7/configure.NVCtrl 2007-07-26 17:36:56.000000000 +0200 +++ oyranos-0.1.7/configure 2007-07-26 17:36:56.000000000 +0200 @@ -8,7 +8,6 @@ CONF_H=config.h CONF=makefile CONF_SH=$TARGET-config -CONF_NV=libXNVCtrl/makefile CONF_I18N=fl_i18n/makefile SPEC=$TARGET.spec SPECICC=$TARGET-icc.spec @@ -24,7 +23,7 @@ ECI_CONF=error.txt BASE_CONF=error.txt fi -MAKEFILE_DIR=". fl_i18n libXNVCtrl $PROFILE_DIR"; export MAKEFILE_DIR +MAKEFILE_DIR=". fl_i18n $PROFILE_DIR"; export MAKEFILE_DIR export CONF_H CONF CONF_I18N CONF_NV @@ -192,7 +191,6 @@ test -n "$ECHO" && $ECHO "" > $CONF test -n "$ECHO" && $ECHO "" > $CONF_H test -n "$ECHO" && $ECHO "" > $CONF_I18N -test -n "$ECHO" && $ECHO "" > $CONF_NV test -n "$ECHO" && $ECHO "" > $ECI_CONF test -n "$ECHO" && $ECHO "" > $BASE_CONF test -n "$ECHO" && $ECHO "" > $PKGC @@ -486,7 +484,6 @@ CFLAGS="$CFLAGS -L. -fPIC" CXXFLAGS="$CXXFLAGS -L. -fPIC" test -n "$ECHO" && $ECHO "RM = rm -f" >> $CONF - test -n "$ECHO" && $ECHO "RM = rm -f" >> $CONF_NV fi fi --- oyranos-0.1.7/makefile.in.NVCtrl 2007-07-26 17:38:39.000000000 +0200 +++ oyranos-0.1.7/makefile.in 2007-07-26 18:05:05.000000000 +0200 @@ -21,6 +21,7 @@ LIB_MONI_NAME = lib$(TARGET)_moni.a LIB_XNVCTRL = libXNVCtrl LIB_XNVCTRL_NAME = $(LIB_XNVCTRL).a +LIB_XNVCTRL_SO = $(LIB_XNVCTRL)$(LIBEXT) #endif LIBFL_I18N = fl_i18n/libfl_i18n.a @@ -189,17 +190,12 @@ $(RM) $(LIB_MONI_SO) $(LNK) $(LIB_MONI_SONAMEFULL) $(LIB_MONI_SO) -$(LIB_XNVCTRL).a: - echo Building $@ ... - -(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile) - test -L $(LIB_XNVCTRL).a || $(LNK) $(LIB_XNVCTRL)/$(LIB_XNVCTRL).a . - # the twinview library -$(TARGET)-monitor-nvidia: $(TARGET)_monitor_nvidia.c $(LIB_XNVCTRL).a +$(TARGET)-monitor-nvidia: $(TARGET)_monitor_nvidia.c echo Linking $@ ... - -$(CC) $(CFLAGS) $(INCL) $(TARGET)_monitor_nvidia.c -I./$(LIB_XNVCTRL) \ + -$(CC) $(CFLAGS) $(INCL) $(TARGET)_monitor_nvidia.c -I$(includedir)/NVCtrl \ -o $(TARGET)-monitor-nvidia -L./ $(LDLIBS) $(X11_LIBS) \ - -L./$(LIB_XNVCTRL) -lXNVCtrl $(LIBSONAMEFULL) $(LIB_MONI_SONAMEFULL) \ + -lXNVCtrl $(LIBSONAMEFULL) $(LIB_MONI_SONAMEFULL) \ $(LINK_LIB_PATH) $(target)_config_fltk.o: $(TARGET)_config_fltk.cxx oyranos-0.1.7-sw_elektra.patch: --- NEW FILE oyranos-0.1.7-sw_elektra.patch --- --- oyranos-0.1.7/configure.sh.sw_elektra 2007-03-29 17:02:01.000000000 +0200 +++ oyranos-0.1.7/configure.sh 2007-06-18 00:34:08.000000000 +0200 @@ -45,7 +45,7 @@ else echo "ELEKTRA_LIBS = `pkg-config --libs elektra`" >> $CONF fi - echo "ELEKTRA_SW = `pkg-config --cflags-only-I elektra | sed 's/\-I// ; s%/include%/etc/kdb/%'`" >> $CONF + echo "ELEKTRA_SW = /etc/kdb/" >> $CONF ELEKTRA_FOUND=1 else if [ $ELEKTRA -eq 1 ]; then --- NEW FILE oyranos-repack.sh --- #!/bin/bash set -e tmp=$(mktemp -d) trap cleanup EXIT cleanup() { set +e [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" } unset CDPATH pwd=$(pwd) ver=0.1.7 cd "$tmp" wget -N http://downloads.sourceforge.net/oyranos/oyranos-${ver}.tar.gz tar zxvf oyranos-${ver}.tar.gz pushd oyranos-${ver} # Prevent static elektra to be used rm -rf elektra-0.6.4 # Prevent static libXNVCtrl to be used rm -rf libXNVCtrl libXNVCtrl.a # Make build more verbose for f in `find . -name [mM]akefile\*` configure.sh ; do sed -i.silent -e '/.SILENT/d' $f ; done # Fix Changelog not-utf8 cp -p ChangeLog ChangeLog.origine iconv -f ISO-8859-1 -t UTF8 ChangeLog.origine > ChangeLog touch -r ChangeLog.origine ChangeLog rm -rf ChangeLog.origine # Remove icc profiles from the archive rm -rf standard_profiles popd tar jcf "$pwd"/oyranos-repack-${ver}.tar.bz2 oyranos-${ver} cd - >/dev/null --- NEW FILE oyranos.spec --- Name: oyranos Version: 0.1.7 Release: 11%{?dist} Summary: The Oyranos Colour Management System (CMS) Group: Applications/Multimedia License: GPLv2+ URL: http://www.oyranos.org #Source0: http://downloads.sourceforge.net/oyranos/oyranos-%{version}.tar.gz Source0: http://kwizart.fedorapeople.org/SOURCES/oyranos-repack-0.1.7.tar.bz2 Source1: README-Fedora-ICC_PROFILES Source10: oyranos-repack.sh Patch0: oyranos-0.1.7-sw_elektra.patch Patch1: oyranos-0.1.7-rpath.patch Patch2: oyranos-0.1.7-install_p.patch Patch3: oyranos-0.1.7-shared_NVCtrl.patch Patch4: oyranos-0.1.7-fix_pc.patch Patch5: oyranos-0.1.7-fix_bash.patch Patch6: oyranos-0.1.7-default.patch Patch7: oyranos-0.1.7-man-1_3.patch Patch8: oyranos-0.1.7-rm_class.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: graphviz BuildRequires: elektra-devel BuildRequires: freetype-devel BuildRequires: gettext BuildRequires: fltk-devel BuildRequires: imake BuildRequires: lcms-devel >= 1.14 BuildRequires: libstdc++-devel BuildRequires: libxslt-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: libXNVCtrl-devel BuildRequires: libXinerama-devel BuildRequires: libXext-devel BuildRequires: libX11-devel BuildRequires: libXxf86vm-devel BuildRequires: color-filesystem Requires: color-filesystem #Requires: color-icc-profiles #Requires(post): /usr/sbin/elektra-kdb %description The Colour Management System (CMS) Oyranos is intented to coordinate device specific informations (ICC colour profiles) and configure their system wide settings. Target is a predictable path for applications and users to match colours across devices and across platforms. Oyranos is intended as a OS level CMS. %package libs Summary: Libraries for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description libs The Colour Management System (CMS) Oyranos is intented to coordinate device specific informations (ICC colour profiles) and configure their system wide settings. Target is a predictable path for applications and users to match colours across devices and across platforms. Oyranos is intended as a OS level CMS. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig Requires: libX11-devel Requires: libXinerama-devel %description devel This package contains development files for %{name}. %package docs Summary: Documentation for %{name} Group: Documentation %description docs This package contains documentation files for %{name}. %prep %setup -q %patch0 -p1 -b .sw_elektra %patch1 -p1 -b .rpath %patch2 -p1 -b .install_p %patch3 -p1 -b .NVCtrl %patch4 -p1 -b .fix_pc %patch5 -p1 -b .fix_bash %patch6 -p1 -b .default %patch7 -p1 -b .man-1_3 %patch8 -p1 -b .rm_class # Prevent static elektra to be used #rm -rf elektra-0.6.4 # Prevent static libXNVCtrl to be used #rm -rf libXNVCtrl libXNVCtrl.a # Make build more verbose #for f in `find . -name [mM]akefile\*` configure.sh ; do sed -i.silent -e '/.SILENT/d' $f ; done # Fix Changelog not-utf8 #cp -p ChangeLog ChangeLog.origine #iconv -f ISO-8859-1 -t UTF8 ChangeLog.origine > ChangeLog #touch -r ChangeLog.origine ChangeLog #rm -rf ChangeLog.origine # Update Doxygen doxygen -u #??Install Fedora doc install -pm 0644 %{SOURCE1} . %build export internalelektra=no %configure --disable-static --syscolordir=%{_colordir} # Parralle build sometime fails make #{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT __doc # Prevent icc profiles with commercial license to be installed rm -rf standard_profiles make DESTDIR=$RPM_BUILD_ROOT install_bin install_linguas install_gui # Remove unneeded files find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' # install doc in the right place... mkdir -p __doc/ mv $RPM_BUILD_ROOT%{_datadir}/doc/oyranos/* __doc/ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/oyranos # Tweak the oyranos_version.h sed -i -e '/OY_SRC/d' $RPM_BUILD_ROOT%{_includedir}/%{name}/oyranos_version.h touch -r ChangeLog $RPM_BUILD_ROOT%{_includedir}/%{name}/oyranos_version.h # Multilib tweaks touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/%{name}-config # Move oyranos-config.1 to oyranos-config.3 mv $RPM_BUILD_ROOT%{_mandir}/man1/oyranos-config.1 $RPM_BUILD_ROOT%{_mandir}/man3/oyranos-config.3 touch -r ChangeLog $RPM_BUILD_ROOT%{_mandir}/man3/oyranos-config.3 %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %if 0 %post if [ "`elektra-kdb ls system/sw/oyranos 2>/dev/zero | wc -l`" -eq 0 ]; then oyranos-policy %{_settingscolordir}/office.policy.xml fi || : %endif %postun libs -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README README-Fedora-ICC_PROFILES %{_bindir}/%{name}-monitor %{_bindir}/%{name}-monitor-nvidia %{_bindir}/%{name}-config-fltk %{_bindir}/%{name}-policy %{_mandir}/man1/%{name}-config-fltk.* %{_mandir}/man1/%{name}-policy.* %{_datadir}/color/settings/*.policy.xml %{_datadir}/color/cmms/*.oy_cmm_register.xml # No profile should be installed with oyranos (even Cineon) # Instead we need to Requires them when available # from a separate package or from any virtual provides. #{_datadir}/color/icc/* %files libs %defattr(-,root,root,-) %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_bindir}/%{name}-config %{_mandir}/man3/%{name}.* %{_mandir}/man3/%{name}-config.* %{_includedir}/%{name}/ %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}*.pc %files docs %defattr(-,root,root,-) %doc __doc/html/* %changelog * Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 0.1.7-11 - Make oyranos-config a wrapper for pkgconfig * Tue Mar 4 2008 kwizart < kwizart at gmail.com > - 0.1.7-10 - Comment out %%post with %%if 0 - Add BR graphviz - Upate Doxygen before generation (-u) (set CLASS_GRAPH and COLLABORATION_GRAPH to NO ) - Remove Requires color-filesystem for -devel - Rename man1 to man3 within man pages. * Sat Mar 1 2008 kwizart < kwizart at gmail.com > - 0.1.7-9 - Drop monitor-nvidia (will be bundled in the main package) - Comment out the oyranos default policy until some profiles are available within the repository. - Reenable oyranos-config with tweaks for multilibs (will be properly fixed later with pkgconfig) - Add Requirement needed by oyranos_moni.pc - Add README-Fedora-ICC_PROFILES * Wed Feb 20 2008 kwizart < kwizart at gmail.com > - 0.1.7-8 - Uses color-filesystem BR and macros - Split the doc - Split monitor-nvidia from the main package and use alternatives - Fix wrong file encoding not-utf8 ChangeLog - Tweak oyranos_version.h - Remove oyranos-config (we should use pkgconfig instead) - Repackage the sources. * Thu Aug 16 2007 kwizart < kwizart at gmail.com > - 0.1.7-7 - Move oyranos-config to -devel - Add Requires elektra-devel for oyranos-devel - Use ldconfig for -libs only - Fix .pc files * Thu Aug 16 2007 kwizart < kwizart at gmail.com > - 0.1.7-6 - Move man3 to -devel - Remove .a and .la after install step - Drop the elektra keys registration for now: http://www.libelektra.org/Best_Practices_When_Creating_Keys User will have to register them by himself * Tue Jul 10 2007 kwizart < kwizart at gmail.com > - 0.1.7-5 - Directory ownership for %%{_datadir}/color/settings - Drop unused macros * Sun Jun 17 2007 kwizart < kwizart at gmail.com > - 0.1.7-4 - Uses patches to fix things - Removed unused macros - Removed patented icc profiles * Mon May 14 2007 kwizart < kwizart at gmail.com > - 0.1.7-3 - Fixed remaining rpaths * Sat May 12 2007 kwizart < kwizart at gmail.com > - 0.1.7-2 - Disabled internal elektra. - Exclude oyranos-config. - Include Various Licenses files. * Sun Apr 10 2007 kwizart < kwizart at gmail.com > - 0.1.7-1 - Update to final 0.1.7 * Sun Apr 1 2007 kwizart < kwizart at gmail.com > - 0.1.7-0.1.rc8 - Initial Fedora release * Sat Sep 16 2006 Kai-Uwe Behrmann - set default policy if no settings are found * Sat May 28 2005 - Kai-Uwe Behrmann - packaging * Tue Apr 21 2005 Kai-Uwe Behrmann - first release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 17:44:53 -0000 1.1 +++ .cvsignore 7 Mar 2008 18:57:34 -0000 1.2 @@ -0,0 +1 @@ +oyranos-repack-0.1.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 17:44:53 -0000 1.1 +++ sources 7 Mar 2008 18:57:34 -0000 1.2 @@ -0,0 +1 @@ +7db310bbdaea1c603941783b71372f52 oyranos-repack-0.1.7.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 19:02:38 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Fri, 7 Mar 2008 19:02:38 GMT Subject: rpms/oyranos/devel oyranos.spec,1.1,1.2 Message-ID: <200803071902.m27J2cnQ026605@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/oyranos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26567 Modified Files: oyranos.spec Log Message: Fix before import Index: oyranos.spec =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/devel/oyranos.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- oyranos.spec 7 Mar 2008 18:57:34 -0000 1.1 +++ oyranos.spec 7 Mar 2008 19:02:04 -0000 1.2 @@ -42,6 +42,7 @@ BuildRequires: libXxf86vm-devel BuildRequires: color-filesystem Requires: color-filesystem +Requires: %{name}-libs = %{version}-%{release} #Requires: color-icc-profiles #Requires(post): /usr/sbin/elektra-kdb @@ -59,7 +60,6 @@ %package libs Summary: Libraries for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} %description libs The Colour Management System (CMS) Oyranos is intented to coordinate device From fedora-extras-commits at redhat.com Fri Mar 7 19:10:54 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 19:10:54 GMT Subject: rpms/kdeedu/devel kdeedu-4.0.2-cfitsio.patch, NONE, 1.1 kdeedu.spec, 1.87, 1.88 Message-ID: <200803071910.m27JAsvJ026828@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26795/devel Modified Files: kdeedu.spec Added Files: kdeedu-4.0.2-cfitsio.patch Log Message: * Fri Mar 07 2008 Kevin Kofler 4.0.2-3 - fix cfitsio detection by using pkgconfig kdeedu-4.0.2-cfitsio.patch: --- NEW FILE kdeedu-4.0.2-cfitsio.patch --- diff -ur kdeedu-4.0.2/cmake/modules/FindCFitsio.cmake kdeedu-4.0.2-cfitsio/cmake/modules/FindCFitsio.cmake --- kdeedu-4.0.2/cmake/modules/FindCFitsio.cmake 2008-01-05 00:56:03.000000000 +0100 +++ kdeedu-4.0.2-cfitsio/cmake/modules/FindCFitsio.cmake 2008-03-07 20:07:07.000000000 +0100 @@ -20,13 +20,22 @@ else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) + IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + PKGCONFIG(cfitsio _CFitsioIncDir _CFitsioLinkDir _CFitsioLinkFlags _CFitsioCflags) + ENDIF (NOT WIN32) + find_path(CFITSIO_INCLUDE_DIR fitsio.h + ${_CFitsioIncDir} ${_obIncDir} ${GNUWIN32_DIR}/include ) find_library(CFITSIO_LIBRARIES NAMES cfitsio PATHS + ${_CFitsioLinkDir} ${_obLinkDir} ${GNUWIN32_DIR}/lib ) Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- kdeedu.spec 7 Mar 2008 16:32:08 -0000 1.87 +++ kdeedu.spec 7 Mar 2008 19:10:14 -0000 1.88 @@ -1,7 +1,7 @@ Name: kdeedu Summary: Educational/Edutainment applications Version: 4.0.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Amusements/Games @@ -9,6 +9,8 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2 # fix linking against OpenBabel Patch0: kdeedu-4.0.2-openbabel.patch +# fix cfitsio detection by using pkgconfig +Patch1: kdeedu-4.0.2-cfitsio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # http://bugzilla.redhat.com/371121 @@ -97,6 +99,7 @@ %prep %setup -q -n kdeedu-%{version} %patch0 -p1 -b .openbabel +%patch1 -p1 -b .cfitsio %build @@ -163,6 +166,9 @@ %changelog +* Fri Mar 07 2008 Kevin Kofler 4.0.2-3 +- fix cfitsio detection by using pkgconfig + * Fri Mar 07 2008 Kevin Kofler 4.0.2-2 - reenable BR openbabel-devel, fix build with it - add BR gpsd-devel (for marble), libnova-devel (for KStars) From fedora-extras-commits at redhat.com Fri Mar 7 19:18:21 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Fri, 7 Mar 2008 19:18:21 GMT Subject: rpms/oyranos/F-8 README-Fedora-ICC_PROFILES, NONE, 1.1 oyranos-0.1.7-default.patch, NONE, 1.1 oyranos-0.1.7-fix_bash.patch, NONE, 1.1 oyranos-0.1.7-fix_pc.patch, NONE, 1.1 oyranos-0.1.7-install_p.patch, NONE, 1.1 oyranos-0.1.7-man-1_3.patch, NONE, 1.1 oyranos-0.1.7-rm_class.patch, NONE, 1.1 oyranos-0.1.7-rpath.patch, NONE, 1.1 oyranos-0.1.7-shared_NVCtrl.patch, NONE, 1.1 oyranos-0.1.7-sw_elektra.patch, NONE, 1.1 oyranos-repack.sh, NONE, 1.1 oyranos.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803071918.m27JILS8027107@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/oyranos/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27035/F-8 Modified Files: .cvsignore sources Added Files: README-Fedora-ICC_PROFILES oyranos-0.1.7-default.patch oyranos-0.1.7-fix_bash.patch oyranos-0.1.7-fix_pc.patch oyranos-0.1.7-install_p.patch oyranos-0.1.7-man-1_3.patch oyranos-0.1.7-rm_class.patch oyranos-0.1.7-rpath.patch oyranos-0.1.7-shared_NVCtrl.patch oyranos-0.1.7-sw_elektra.patch oyranos-repack.sh oyranos.spec Log Message: Initial import for F-8 --- NEW FILE README-Fedora-ICC_PROFILES --- README-Fedora-ICC_PROFILES Fedora does not currently redistribute icc profiles. You need to download them manually for now. They need to be placed in ~/.color/icc or /usr/share/color/icc (for system wide access). See: http://www.behrmann.name http://www.colormanagement.org http://www.eci.org http://www.littlecms.com/profiles.zip http://www.photogamut.org oyranos-0.1.7-default.patch: --- NEW FILE oyranos-0.1.7-default.patch --- diff -up oyranos-0.1.7/settings/prepress.policy.xml.default oyranos-0.1.7/settings/prepress.policy.xml --- oyranos-0.1.7/settings/prepress.policy.xml.default 2008-02-28 00:06:03.000000000 +0100 +++ oyranos-0.1.7/settings/prepress.policy.xml 2008-02-28 00:07:39.000000000 +0100 @@ -18,15 +18,15 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM diff -up oyranos-0.1.7/settings/office.policy.xml.default oyranos-0.1.7/settings/office.policy.xml --- oyranos-0.1.7/settings/office.policy.xml.default 2008-02-28 00:03:30.000000000 +0100 +++ oyranos-0.1.7/settings/office.policy.xml 2008-02-28 00:04:59.000000000 +0100 @@ -18,19 +18,19 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM diff -up oyranos-0.1.7/settings/photographer.policy.xml.default oyranos-0.1.7/settings/photographer.policy.xml --- oyranos-0.1.7/settings/photographer.policy.xml.default 2008-02-28 00:05:56.000000000 +0100 +++ oyranos-0.1.7/settings/photographer.policy.xml 2008-02-28 00:06:55.000000000 +0100 @@ -18,15 +18,15 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM diff -up oyranos-0.1.7/settings/designer.policy.xml.default oyranos-0.1.7/settings/designer.policy.xml --- oyranos-0.1.7/settings/designer.policy.xml.default 2008-02-28 00:08:10.000000000 +0100 +++ oyranos-0.1.7/settings/designer.policy.xml 2008-02-28 00:08:38.000000000 +0100 @@ -18,15 +18,15 @@ - XYZ.icc + LCMSXYZI.ICM - Lab.icc + LCMSLABI.ICM - XYZ.icc + LCMSXYZI.ICM oyranos-0.1.7-fix_bash.patch: --- NEW FILE oyranos-0.1.7-fix_bash.patch --- diff -up oyranos-0.1.7/configure.sh.fix_bash oyranos-0.1.7/configure.sh --- oyranos-0.1.7/configure.sh.fix_bash 2008-03-04 12:59:25.000000000 +0100 +++ oyranos-0.1.7/configure.sh 2008-03-04 12:59:25.000000000 +0100 @@ -418,7 +418,6 @@ if [ -n "$DEBUG" ] && [ $DEBUG -gt 0 ]; DEBUG_="-Wall -g -DDEBUG --pedantic" test -f "$i/makefile".in && echo "DEBUG = $DEBUG_" >> "$i/makefile" test -f "$i/makefile".in && echo "DEBUG_SWITCH = -v" >> "$i/makefile" - else fi done fi diff -up oyranos-0.1.7/configure.fix_bash oyranos-0.1.7/configure --- oyranos-0.1.7/configure.fix_bash 2008-03-04 12:59:25.000000000 +0100 +++ oyranos-0.1.7/configure 2008-03-04 13:18:24.000000000 +0100 @@ -25,7 +25,7 @@ else fi MAKEFILE_DIR=". fl_i18n $PROFILE_DIR"; export MAKEFILE_DIR -export CONF_H CONF CONF_I18N CONF_NV +export CONF_H CONF CONF_I18N VERSION_A=0 VERSION_B=1 @@ -375,8 +375,6 @@ test -n "$ECHO" && $ECHO "CXX = $CXX" >> test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF test -n "$ECHO" && $ECHO "CXX = $CXX" >> $CONF_I18N test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF_I18N -test -n "$ECHO" && $ECHO "CXX = $CXX" >> $CONF_NV -test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF_NV export CC CXX CFLAGS_COMMON="`echo $CFLAGS | $STRIPOPT` \$(DEBUG) \$(INCL)" @@ -417,7 +415,6 @@ export internalelektra # set some compiler and linker options test -n "$ECHO" && $ECHO "RM = rm -vf" >> $CONF -test -n "$ECHO" && $ECHO "RM = rm -vf" >> $CONF_NV if [ $OSUNAME = "Darwin" ]; then test -n "$ECHO" && $ECHO "LIBEXT = .dylib" >> $CONF GCC_VERSION_INFO="-Wl,-compatibility_version -Wl,$VERSION_ABI_A -Wl,-current_version -Wl,$VERSION_ABI_A.$VERSION_ABI_B" @@ -579,7 +576,6 @@ test -n "$ECHO" && $ECHO "prefix=$prefix test -n "$ECHO" && $ECHO "exec_prefix=$exec_prefix" >> $CONF_SH test -n "$ECHO" && $ECHO "bindir=$bindir" >> $CONF_SH test -n "$ECHO" && $ECHO "sbindir=$sbindir" >> $CONF_SH -test -n "$ECHO" && $ECHO "libdir=$libdir" >> $CONF_SH test -n "$ECHO" && $ECHO "includedir=$includedir" >> $CONF_SH test -n "$ECHO" && $ECHO "datadir=$datadir" >> $CONF_SH test -n "$ECHO" && $ECHO "mandir=$mandir" >> $CONF_SH @@ -727,7 +723,6 @@ CFLAGS="$CFLAGS_COMMON `echo $CFLAGS | $ CXXFLAGS="$CXXFLAGS_COMMON `echo $CXXFLAGS | $STRIPOPT`" LDFLAGS="`echo $LDFLAGS | $STRIPOPT` \$(dl)" -test -n "$ECHO" && $ECHO "CFLAGS=$CFLAGS" >> $CONF_NV test -n "$ECHO" && $ECHO "CFLAGS = $CFLAGS" >> $CONF_I18N test -n "$ECHO" && $ECHO "CXXFLAGS = $CXXFLAGS">>$CONF_I18N test -n "$ECHO" && $ECHO "LDFLAGS = $LDFLAGS" >> $CONF_I18N oyranos-0.1.7-fix_pc.patch: --- NEW FILE oyranos-0.1.7-fix_pc.patch --- diff -up oyranos-0.1.7/oyranos_monitor.pc.in.fix_pc oyranos-0.1.7/oyranos_monitor.pc.in --- oyranos-0.1.7/oyranos_monitor.pc.in.fix_pc 2006-04-13 11:30:25.000000000 +0200 +++ oyranos-0.1.7/oyranos_monitor.pc.in 2008-03-07 15:45:39.000000000 +0100 @@ -1,7 +1,7 @@ -includedir=${prefix}/include -Name: oyranos +Name: oyranos_monitor Description: Oyranos Colour Management System -Libs: -L${libdir} -loyranos -loyranos_moni -X11 -Xinerama +Requires: x11 xinerama oyranos +Libs: -L${libdir} -loyranos_moni Cflags: -I${includedir} diff -up oyranos-0.1.7/oyranos-config.in.fix_pc oyranos-0.1.7/oyranos-config.in --- oyranos-0.1.7/oyranos-config.in.fix_pc 2007-04-03 15:53:41.000000000 +0200 +++ oyranos-0.1.7/oyranos-config.in 2008-03-07 16:03:11.000000000 +0100 @@ -1,3 +1,9 @@ + +ELEKTRA_VERSION=`pkg-config --modversion elektra` +export ELEKTRA_VERSION +libdir=`pkg-config x11 --variable libdir` +export libdir + if [ -n "$PKG_CONFIG_PATH" ]; then PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$libdir/pkgconfig else @@ -82,6 +88,7 @@ if [ "$echo_help" = "yes" ]; then echo " $0 --settingsdirname Oyranos settings directory name" fi +if [ -f liboyranos.so ]; then if [ -z $ELEKTRA_VERSION ]; then elektra_dyn="`pkg-config --libs elektra`" if [ -f $libdir/libelektra.a ]; then @@ -102,6 +109,7 @@ else elektra="$libdir/lib${TARGET}_elektra.a $dl $iconv $intl" fi fi +fi if [ "$echo_cflags" = "yes" ]; then echo "-I$prefix/include" @@ -111,7 +119,7 @@ if [ "$echo_ldflags" = "yes" ]; then if [ -f liboyranos.so ]; then echo "-L. -loyranos $elektra_dyn $oyranos_add" else - echo "-L$libdir -loyranos $elektra_dyn $oyranos_add" + pkg-config --libs oyranos fi fi @@ -127,13 +135,13 @@ if [ "$echo_ld_x_flags" = "yes" ]; then if [ -f liboyranos.so ]; then echo "-L. -loyranos -loyranos_moni $elektra_dyn $oyranos_add" else - echo "-L$libdir -loyranos -loyranos_moni $elektra_dyn $oyranos_add" + pkg-config --libs oyranos_monitor fi fi # only standard paths are here supported -if [ -f /usr/lib/libX11.so ]; then - X11_PATH=-L/usr/lib +if [ -f $libdir/libX11.so ]; then + X11_PATH=-L$libdir fi if [ -f /usr/local/lib/libX11.so ]; then X11_PATH=-L/usr/local/lib oyranos-0.1.7-install_p.patch: --- NEW FILE oyranos-0.1.7-install_p.patch --- --- oyranos-0.1.7/configure.install_p 2007-06-18 01:22:09.000000000 +0200 +++ oyranos-0.1.7/configure 2007-06-18 01:25:09.000000000 +0200 @@ -435,7 +435,7 @@ test -n "$ECHO" && $ECHO "REZ = fltk-config --post \$@" >> $CONF test -n "$ECHO" && $ECHO "I18N_LIB = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF test -n "$ECHO" && $ECHO "I18N_LIBSTAT = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF - INSTALL="install $DEBUG_SWITCH" + INSTALL="install -p $DEBUG_SWITCH" oyranos_add="-framework ApplicationServices \$dl" oyranos_x_add="" else @@ -462,7 +462,7 @@ test -n "$ECHO" && $ECHO "MAKEDEPEND = makedepend -Y" >> $CONF CFLAGS="$CFLAGS -fPIC -DPIC" CXXFLAGS="$CXXFLAGS -fPIC -DPIC" - INSTALL="install $DEBUG_SWITCH" + INSTALL="install -p $DEBUG_SWITCH" else test -n "$ECHO" && $ECHO "COPY = cp -p" >> $CONF if [ $OSUNAME = "BSD" ]; then @@ -471,14 +471,14 @@ test -n "$ECHO" && $ECHO "LINK_NAME_M = -Wl,-soname -Wl,\$(LIB_MONI_SONAMEFULL)" >> $CONF test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,\$(libdir)" >> $CONF test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,\$(srcdir)" >> $CONF - INSTALL="install $DEBUG_SWITCH" + INSTALL="install -p $DEBUG_SWITCH" fi if [ $OSUNAME = "SunOS" ]; then LDFLAGS="$LDFLAGS -mimpure-text" INSTALL="install" else LDFLAGS="$LDFLAGS" - INSTALL="install" + INSTALL="install -p" fi test -n "$ECHO" && $ECHO "I18N_LIB = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF test -n "$ECHO" && $ECHO "I18N_LIBSTAT = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF @@ -737,9 +737,9 @@ test -n "$ECHO" && $ECHO "CFLAGS = $CFLAGS" >> $CONF test -n "$ECHO" && $ECHO "CXXFLAGS = $CXXFLAGS">>$CONF test -n "$ECHO" && $ECHO "LDFLAGS = $LDFLAGS" >> $CONF -test -n "$ECHO" && $ECHO "INSTALL = $INSTALL" >> $CONF -test -n "$ECHO" && $ECHO "INSTALL = $INSTALL" >> $ECI_CONF -test -n "$ECHO" && $ECHO "INSTALL = $INSTALL" >> $BASE_CONF +test -n "$ECHO" && $ECHO "INSTALL = $INSTALL -p" >> $CONF +test -n "$ECHO" && $ECHO "INSTALL = $INSTALL -p" >> $ECI_CONF +test -n "$ECHO" && $ECHO "INSTALL = $INSTALL -p" >> $BASE_CONF test -n "$ECHO" && $ECHO "" >> $CONF test -n "$ECHO" && $ECHO "" >> $CONF oyranos-0.1.7-man-1_3.patch: --- NEW FILE oyranos-0.1.7-man-1_3.patch --- diff -up oyranos-0.1.7/oyranos-config-fltk.1.man-1_3 oyranos-0.1.7/oyranos-config-fltk.1 --- oyranos-0.1.7/oyranos-config-fltk.1.man-1_3 2008-03-04 13:08:38.000000000 +0100 +++ oyranos-0.1.7/oyranos-config-fltk.1 2008-03-04 13:08:44.000000000 +0100 @@ -15,6 +15,6 @@ www.oyranos.org/wiki/index.php?title=Oyr .SH AUTHOR Kai-Uwe Behrmann (ku.b (at) gmx.de) .SH "SEE ALSO" -oyranos-config(1) oyranos-policy(1) oyranos-monitor(1) oyranos(3) +oyranos-config(3) oyranos-policy(1) oyranos-monitor(1) oyranos(3) .SH BUGS at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 diff -up oyranos-0.1.7/oyranos.3.man-1_3 oyranos-0.1.7/oyranos.3 --- oyranos-0.1.7/oyranos.3.man-1_3 2008-03-04 13:06:20.000000000 +0100 +++ oyranos-0.1.7/oyranos.3 2008-03-04 13:06:27.000000000 +0100 @@ -25,6 +25,6 @@ http://www.oyranos.org/doc/html/index.ht .SH AUTHOR Kai-Uwe Behrmann (ku.b (at) gmx.de) .SH "SEE ALSO" -oyranos-config(1) oyranos-policy(1) oyranos-monitor(1) +oyranos-config(3) oyranos-policy(1) oyranos-monitor(1) .SH BUGS at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 diff -up oyranos-0.1.7/oyranos-policy.1.man-1_3 oyranos-0.1.7/oyranos-policy.1 --- oyranos-0.1.7/oyranos-policy.1.man-1_3 2008-03-04 13:08:16.000000000 +0100 +++ oyranos-0.1.7/oyranos-policy.1 2008-03-04 13:08:42.000000000 +0100 @@ -20,6 +20,6 @@ Dump the current policy: .SH AUTHOR Kai-Uwe Behrmann (ku.b (at) gmx.de) .SH "SEE ALSO" -oyranos-config(1) oyranos-policy(1) oyranos-monitor(1) oyranos(3) +oyranos-config(3) oyranos-policy(1) oyranos-monitor(1) oyranos(3) .SH BUGS at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 diff -up oyranos-0.1.7/oyranos-config.1.man-1_3 oyranos-0.1.7/oyranos-config.1 --- oyranos-0.1.7/oyranos-config.1.man-1_3 2008-03-04 13:07:00.000000000 +0100 +++ oyranos-0.1.7/oyranos-config.1 2008-03-04 13:07:14.000000000 +0100 @@ -1,4 +1,4 @@ -.TH "oyranos-config" 1 "February 20, 2007" "User Commands" +.TH "oyranos-config" 3 "February 20, 2007" "User Commands" .SH NAME oyranos-config \- Oyranos CMS configuration query for builds and locations .SH SYNOPSIS oyranos-0.1.7-rm_class.patch: --- NEW FILE oyranos-0.1.7-rm_class.patch --- diff -up oyranos-0.1.7/Doxyfile.rm_class oyranos-0.1.7/Doxyfile --- oyranos-0.1.7/Doxyfile.rm_class 2008-03-04 16:09:04.000000000 +0100 +++ oyranos-0.1.7/Doxyfile 2008-03-04 16:09:56.000000000 +0100 @@ -203,8 +203,8 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES +CLASS_GRAPH = NO +COLLABORATION_GRAPH = NO UML_LOOK = YES TEMPLATE_RELATIONS = NO INCLUDE_GRAPH = NO oyranos-0.1.7-rpath.patch: --- NEW FILE oyranos-0.1.7-rpath.patch --- --- oyranos-0.1.7/configure.rpath 2007-04-03 15:50:01.000000000 +0200 +++ oyranos-0.1.7/configure 2007-06-18 00:59:01.000000000 +0200 @@ -457,8 +457,8 @@ test -n "$ECHO" && $ECHO "LINK_FLAGS_STATIC =" >> $CONF test -n "$ECHO" && $ECHO "LINK_NAME = -Wl,-soname -Wl,\$(LIBSONAMEFULL)" >> $CONF test -n "$ECHO" && $ECHO "LINK_NAME_M = -Wl,-soname -Wl,\$(LIB_MONI_SONAMEFULL)" >> $CONF - test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,--rpath -Wl,\$(libdir)" >> $CONF - test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,--rpath -Wl,\$(srcdir)" >> $CONF + test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,-L\$(libdir)" >> $CONF + test -n "$ECHO" && $ECHO "LINK_SRC_PATH =??-Wl,\$(srcdir)" >> $CONF test -n "$ECHO" && $ECHO "MAKEDEPEND = makedepend -Y" >> $CONF CFLAGS="$CFLAGS -fPIC -DPIC" CXXFLAGS="$CXXFLAGS -fPIC -DPIC" @@ -469,8 +469,8 @@ LDFLAGS="$LDFLAGS" test -n "$ECHO" && $ECHO "LINK_NAME = -Wl,-soname -Wl,\$(LIBSONAMEFULL)" >> $CONF test -n "$ECHO" && $ECHO "LINK_NAME_M = -Wl,-soname -Wl,\$(LIB_MONI_SONAMEFULL)" >> $CONF - test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,--rpath -Wl,\$(libdir)" >> $CONF - test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,--rpath -Wl,\$(srcdir)" >> $CONF + test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,-L\$(libdir)" >> $CONF + test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,\$(srcdir)" >> $CONF INSTALL="install $DEBUG_SWITCH" fi if [ $OSUNAME = "SunOS" ]; then oyranos-0.1.7-shared_NVCtrl.patch: --- NEW FILE oyranos-0.1.7-shared_NVCtrl.patch --- --- oyranos-0.1.7/configure.NVCtrl 2007-07-26 17:36:56.000000000 +0200 +++ oyranos-0.1.7/configure 2007-07-26 17:36:56.000000000 +0200 @@ -8,7 +8,6 @@ CONF_H=config.h CONF=makefile CONF_SH=$TARGET-config -CONF_NV=libXNVCtrl/makefile CONF_I18N=fl_i18n/makefile SPEC=$TARGET.spec SPECICC=$TARGET-icc.spec @@ -24,7 +23,7 @@ ECI_CONF=error.txt BASE_CONF=error.txt fi -MAKEFILE_DIR=". fl_i18n libXNVCtrl $PROFILE_DIR"; export MAKEFILE_DIR +MAKEFILE_DIR=". fl_i18n $PROFILE_DIR"; export MAKEFILE_DIR export CONF_H CONF CONF_I18N CONF_NV @@ -192,7 +191,6 @@ test -n "$ECHO" && $ECHO "" > $CONF test -n "$ECHO" && $ECHO "" > $CONF_H test -n "$ECHO" && $ECHO "" > $CONF_I18N -test -n "$ECHO" && $ECHO "" > $CONF_NV test -n "$ECHO" && $ECHO "" > $ECI_CONF test -n "$ECHO" && $ECHO "" > $BASE_CONF test -n "$ECHO" && $ECHO "" > $PKGC @@ -486,7 +484,6 @@ CFLAGS="$CFLAGS -L. -fPIC" CXXFLAGS="$CXXFLAGS -L. -fPIC" test -n "$ECHO" && $ECHO "RM = rm -f" >> $CONF - test -n "$ECHO" && $ECHO "RM = rm -f" >> $CONF_NV fi fi --- oyranos-0.1.7/makefile.in.NVCtrl 2007-07-26 17:38:39.000000000 +0200 +++ oyranos-0.1.7/makefile.in 2007-07-26 18:05:05.000000000 +0200 @@ -21,6 +21,7 @@ LIB_MONI_NAME = lib$(TARGET)_moni.a LIB_XNVCTRL = libXNVCtrl LIB_XNVCTRL_NAME = $(LIB_XNVCTRL).a +LIB_XNVCTRL_SO = $(LIB_XNVCTRL)$(LIBEXT) #endif LIBFL_I18N = fl_i18n/libfl_i18n.a @@ -189,17 +190,12 @@ $(RM) $(LIB_MONI_SO) $(LNK) $(LIB_MONI_SONAMEFULL) $(LIB_MONI_SO) -$(LIB_XNVCTRL).a: - echo Building $@ ... - -(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile) - test -L $(LIB_XNVCTRL).a || $(LNK) $(LIB_XNVCTRL)/$(LIB_XNVCTRL).a . - # the twinview library -$(TARGET)-monitor-nvidia: $(TARGET)_monitor_nvidia.c $(LIB_XNVCTRL).a +$(TARGET)-monitor-nvidia: $(TARGET)_monitor_nvidia.c echo Linking $@ ... - -$(CC) $(CFLAGS) $(INCL) $(TARGET)_monitor_nvidia.c -I./$(LIB_XNVCTRL) \ + -$(CC) $(CFLAGS) $(INCL) $(TARGET)_monitor_nvidia.c -I$(includedir)/NVCtrl \ -o $(TARGET)-monitor-nvidia -L./ $(LDLIBS) $(X11_LIBS) \ - -L./$(LIB_XNVCTRL) -lXNVCtrl $(LIBSONAMEFULL) $(LIB_MONI_SONAMEFULL) \ + -lXNVCtrl $(LIBSONAMEFULL) $(LIB_MONI_SONAMEFULL) \ $(LINK_LIB_PATH) $(target)_config_fltk.o: $(TARGET)_config_fltk.cxx oyranos-0.1.7-sw_elektra.patch: --- NEW FILE oyranos-0.1.7-sw_elektra.patch --- --- oyranos-0.1.7/configure.sh.sw_elektra 2007-03-29 17:02:01.000000000 +0200 +++ oyranos-0.1.7/configure.sh 2007-06-18 00:34:08.000000000 +0200 @@ -45,7 +45,7 @@ else echo "ELEKTRA_LIBS = `pkg-config --libs elektra`" >> $CONF fi - echo "ELEKTRA_SW = `pkg-config --cflags-only-I elektra | sed 's/\-I// ; s%/include%/etc/kdb/%'`" >> $CONF + echo "ELEKTRA_SW = /etc/kdb/" >> $CONF ELEKTRA_FOUND=1 else if [ $ELEKTRA -eq 1 ]; then --- NEW FILE oyranos-repack.sh --- #!/bin/bash set -e tmp=$(mktemp -d) trap cleanup EXIT cleanup() { set +e [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" } unset CDPATH pwd=$(pwd) ver=0.1.7 cd "$tmp" wget -N http://downloads.sourceforge.net/oyranos/oyranos-${ver}.tar.gz tar zxvf oyranos-${ver}.tar.gz pushd oyranos-${ver} # Prevent static elektra to be used rm -rf elektra-0.6.4 # Prevent static libXNVCtrl to be used rm -rf libXNVCtrl libXNVCtrl.a # Make build more verbose for f in `find . -name [mM]akefile\*` configure.sh ; do sed -i.silent -e '/.SILENT/d' $f ; done # Fix Changelog not-utf8 cp -p ChangeLog ChangeLog.origine iconv -f ISO-8859-1 -t UTF8 ChangeLog.origine > ChangeLog touch -r ChangeLog.origine ChangeLog rm -rf ChangeLog.origine # Remove icc profiles from the archive rm -rf standard_profiles popd tar jcf "$pwd"/oyranos-repack-${ver}.tar.bz2 oyranos-${ver} cd - >/dev/null --- NEW FILE oyranos.spec --- Name: oyranos Version: 0.1.7 Release: 11%{?dist} Summary: The Oyranos Colour Management System (CMS) Group: Applications/Multimedia License: GPLv2+ URL: http://www.oyranos.org #Source0: http://downloads.sourceforge.net/oyranos/oyranos-%{version}.tar.gz Source0: http://kwizart.fedorapeople.org/SOURCES/oyranos-repack-0.1.7.tar.bz2 Source1: README-Fedora-ICC_PROFILES Source10: oyranos-repack.sh Patch0: oyranos-0.1.7-sw_elektra.patch Patch1: oyranos-0.1.7-rpath.patch Patch2: oyranos-0.1.7-install_p.patch Patch3: oyranos-0.1.7-shared_NVCtrl.patch Patch4: oyranos-0.1.7-fix_pc.patch Patch5: oyranos-0.1.7-fix_bash.patch Patch6: oyranos-0.1.7-default.patch Patch7: oyranos-0.1.7-man-1_3.patch Patch8: oyranos-0.1.7-rm_class.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: graphviz BuildRequires: elektra-devel BuildRequires: freetype-devel BuildRequires: gettext BuildRequires: fltk-devel BuildRequires: imake BuildRequires: lcms-devel >= 1.14 BuildRequires: libstdc++-devel BuildRequires: libxslt-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: libXNVCtrl-devel BuildRequires: libXinerama-devel BuildRequires: libXext-devel BuildRequires: libX11-devel BuildRequires: libXxf86vm-devel BuildRequires: color-filesystem Requires: color-filesystem #Requires: color-icc-profiles #Requires(post): /usr/sbin/elektra-kdb %description The Colour Management System (CMS) Oyranos is intented to coordinate device specific informations (ICC colour profiles) and configure their system wide settings. Target is a predictable path for applications and users to match colours across devices and across platforms. Oyranos is intended as a OS level CMS. %package libs Summary: Libraries for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description libs The Colour Management System (CMS) Oyranos is intented to coordinate device specific informations (ICC colour profiles) and configure their system wide settings. Target is a predictable path for applications and users to match colours across devices and across platforms. Oyranos is intended as a OS level CMS. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig Requires: libX11-devel Requires: libXinerama-devel %description devel This package contains development files for %{name}. %package docs Summary: Documentation for %{name} Group: Documentation %description docs This package contains documentation files for %{name}. %prep %setup -q %patch0 -p1 -b .sw_elektra %patch1 -p1 -b .rpath %patch2 -p1 -b .install_p %patch3 -p1 -b .NVCtrl %patch4 -p1 -b .fix_pc %patch5 -p1 -b .fix_bash %patch6 -p1 -b .default %patch7 -p1 -b .man-1_3 %patch8 -p1 -b .rm_class # Prevent static elektra to be used #rm -rf elektra-0.6.4 # Prevent static libXNVCtrl to be used #rm -rf libXNVCtrl libXNVCtrl.a # Make build more verbose #for f in `find . -name [mM]akefile\*` configure.sh ; do sed -i.silent -e '/.SILENT/d' $f ; done # Fix Changelog not-utf8 #cp -p ChangeLog ChangeLog.origine #iconv -f ISO-8859-1 -t UTF8 ChangeLog.origine > ChangeLog #touch -r ChangeLog.origine ChangeLog #rm -rf ChangeLog.origine # Update Doxygen doxygen -u #??Install Fedora doc install -pm 0644 %{SOURCE1} . %build export internalelektra=no %configure --disable-static --syscolordir=%{_colordir} # Parralle build sometime fails make #{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT __doc # Prevent icc profiles with commercial license to be installed rm -rf standard_profiles make DESTDIR=$RPM_BUILD_ROOT install_bin install_linguas install_gui # Remove unneeded files find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' # install doc in the right place... mkdir -p __doc/ mv $RPM_BUILD_ROOT%{_datadir}/doc/oyranos/* __doc/ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/oyranos # Tweak the oyranos_version.h sed -i -e '/OY_SRC/d' $RPM_BUILD_ROOT%{_includedir}/%{name}/oyranos_version.h touch -r ChangeLog $RPM_BUILD_ROOT%{_includedir}/%{name}/oyranos_version.h # Multilib tweaks touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/%{name}-config # Move oyranos-config.1 to oyranos-config.3 mv $RPM_BUILD_ROOT%{_mandir}/man1/oyranos-config.1 $RPM_BUILD_ROOT%{_mandir}/man3/oyranos-config.3 touch -r ChangeLog $RPM_BUILD_ROOT%{_mandir}/man3/oyranos-config.3 %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %if 0 %post if [ "`elektra-kdb ls system/sw/oyranos 2>/dev/zero | wc -l`" -eq 0 ]; then oyranos-policy %{_settingscolordir}/office.policy.xml fi || : %endif %postun libs -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README README-Fedora-ICC_PROFILES %{_bindir}/%{name}-monitor %{_bindir}/%{name}-monitor-nvidia %{_bindir}/%{name}-config-fltk %{_bindir}/%{name}-policy %{_mandir}/man1/%{name}-config-fltk.* %{_mandir}/man1/%{name}-policy.* %{_datadir}/color/settings/*.policy.xml %{_datadir}/color/cmms/*.oy_cmm_register.xml # No profile should be installed with oyranos (even Cineon) # Instead we need to Requires them when available # from a separate package or from any virtual provides. #{_datadir}/color/icc/* %files libs %defattr(-,root,root,-) %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_bindir}/%{name}-config %{_mandir}/man3/%{name}.* %{_mandir}/man3/%{name}-config.* %{_includedir}/%{name}/ %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}*.pc %files docs %defattr(-,root,root,-) %doc __doc/html/* %changelog * Thu Mar 6 2008 kwizart < kwizart at gmail.com > - 0.1.7-11 - Make oyranos-config a wrapper for pkgconfig * Tue Mar 4 2008 kwizart < kwizart at gmail.com > - 0.1.7-10 - Comment out %%post with %%if 0 - Add BR graphviz - Upate Doxygen before generation (-u) (set CLASS_GRAPH and COLLABORATION_GRAPH to NO ) - Remove Requires color-filesystem for -devel - Rename man1 to man3 within man pages. * Sat Mar 1 2008 kwizart < kwizart at gmail.com > - 0.1.7-9 - Drop monitor-nvidia (will be bundled in the main package) - Comment out the oyranos default policy until some profiles are available within the repository. - Reenable oyranos-config with tweaks for multilibs (will be properly fixed later with pkgconfig) - Add Requirement needed by oyranos_moni.pc - Add README-Fedora-ICC_PROFILES * Wed Feb 20 2008 kwizart < kwizart at gmail.com > - 0.1.7-8 - Uses color-filesystem BR and macros - Split the doc - Split monitor-nvidia from the main package and use alternatives - Fix wrong file encoding not-utf8 ChangeLog - Tweak oyranos_version.h - Remove oyranos-config (we should use pkgconfig instead) - Repackage the sources. * Thu Aug 16 2007 kwizart < kwizart at gmail.com > - 0.1.7-7 - Move oyranos-config to -devel - Add Requires elektra-devel for oyranos-devel - Use ldconfig for -libs only - Fix .pc files * Thu Aug 16 2007 kwizart < kwizart at gmail.com > - 0.1.7-6 - Move man3 to -devel - Remove .a and .la after install step - Drop the elektra keys registration for now: http://www.libelektra.org/Best_Practices_When_Creating_Keys User will have to register them by himself * Tue Jul 10 2007 kwizart < kwizart at gmail.com > - 0.1.7-5 - Directory ownership for %%{_datadir}/color/settings - Drop unused macros * Sun Jun 17 2007 kwizart < kwizart at gmail.com > - 0.1.7-4 - Uses patches to fix things - Removed unused macros - Removed patented icc profiles * Mon May 14 2007 kwizart < kwizart at gmail.com > - 0.1.7-3 - Fixed remaining rpaths * Sat May 12 2007 kwizart < kwizart at gmail.com > - 0.1.7-2 - Disabled internal elektra. - Exclude oyranos-config. - Include Various Licenses files. * Sun Apr 10 2007 kwizart < kwizart at gmail.com > - 0.1.7-1 - Update to final 0.1.7 * Sun Apr 1 2007 kwizart < kwizart at gmail.com > - 0.1.7-0.1.rc8 - Initial Fedora release * Sat Sep 16 2006 Kai-Uwe Behrmann - set default policy if no settings are found * Sat May 28 2005 - Kai-Uwe Behrmann - packaging * Tue Apr 21 2005 Kai-Uwe Behrmann - first release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 17:44:53 -0000 1.1 +++ .cvsignore 7 Mar 2008 19:17:46 -0000 1.2 @@ -0,0 +1 @@ +oyranos-repack-0.1.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 17:44:53 -0000 1.1 +++ sources 7 Mar 2008 19:17:46 -0000 1.2 @@ -0,0 +1 @@ +7db310bbdaea1c603941783b71372f52 oyranos-repack-0.1.7.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 19:22:28 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Fri, 7 Mar 2008 19:22:28 GMT Subject: rpms/oyranos/F-8 oyranos.spec,1.1,1.2 Message-ID: <200803071922.m27JMSkB027230@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/oyranos/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188 Modified Files: oyranos.spec Log Message: Fix before import Index: oyranos.spec =================================================================== RCS file: /cvs/pkgs/rpms/oyranos/F-8/oyranos.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- oyranos.spec 7 Mar 2008 19:17:46 -0000 1.1 +++ oyranos.spec 7 Mar 2008 19:21:52 -0000 1.2 @@ -42,6 +42,7 @@ BuildRequires: libXxf86vm-devel BuildRequires: color-filesystem Requires: color-filesystem +Requires: %{name}-libs = %{version}-%{release} #Requires: color-icc-profiles #Requires(post): /usr/sbin/elektra-kdb @@ -59,7 +60,6 @@ %package libs Summary: Libraries for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} %description libs The Colour Management System (CMS) Oyranos is intented to coordinate device From fedora-extras-commits at redhat.com Fri Mar 7 19:24:58 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Fri, 7 Mar 2008 19:24:58 GMT Subject: rpms/ocaml-json-wheel/F-8 ocaml-json-wheel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803071924.m27JOwhu027445@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-json-wheel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27385/F-8 Modified Files: .cvsignore sources Added Files: ocaml-json-wheel.spec Log Message: Initial CVS import. --- NEW FILE ocaml-json-wheel.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-json-wheel Version: 1.0.4 Release: 4%{?dist} Summary: OCaml library for parsing JSON Group: Development/Libraries License: BSD URL: http://martin.jambon.free.fr/json-wheel.html Source0: http://martin.jambon.free.fr/json-wheel-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ocamlnet-devel BuildRequires: ocaml-pcre-devel BuildRequires: pcre-devel %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description JSON library for OCaml following RFC 4627. If you use this library, consider installing ocaml-json-static, the syntax extension to the language which makes using JSON much easier. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n json-wheel-%{version} %build make strip jsoncat %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs mkdir -p $RPM_BUILD_ROOT%{_bindir} make BINDIR=$RPM_BUILD_ROOT%{_bindir} install # Remove *.cmo and *.o files. These aren't needed for # anything because they are included in the *.cma/*.a. rm $RPM_BUILD_ROOT%{_libdir}/ocaml/json-wheel/*.cmo rm $RPM_BUILD_ROOT%{_libdir}/ocaml/json-wheel/*.o %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/json-wheel %if %opt %exclude %{_libdir}/ocaml/json-wheel/*.a %exclude %{_libdir}/ocaml/json-wheel/*.cmxa %exclude %{_libdir}/ocaml/json-wheel/*.cmx %endif %exclude %{_libdir}/ocaml/json-wheel/*.mli %exclude %{_libdir}/ocaml/json-wheel/*.ml %{_bindir}/jsoncat %files devel %defattr(-,root,root,-) %doc LICENSE Changes README html %if %opt %{_libdir}/ocaml/json-wheel/*.a %{_libdir}/ocaml/json-wheel/*.cmxa %{_libdir}/ocaml/json-wheel/*.cmx %endif %{_libdir}/ocaml/json-wheel/*.mli %{_libdir}/ocaml/json-wheel/*.ml %changelog * Wed Mar 5 2008 Richard W.M. Jones - 1.0.4-4 - Remove ExcludeArch ppc64. * Wed Mar 5 2008 Richard W.M. Jones - 1.0.4-3 - Don't distribute the *.cmo and *.o files. - Better way to install jsoncat in the right directory. * Sat Mar 1 2008 Richard W.M. Jones - 1.0.4-2 - Missing BR ocaml-pcre-devel. - Missing BR pcre-devel. * Thu Feb 28 2008 Richard W.M. Jones - 1.0.4-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-wheel/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 17:48:53 -0000 1.1 +++ .cvsignore 7 Mar 2008 19:24:25 -0000 1.2 @@ -0,0 +1 @@ +json-wheel-1.0.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-wheel/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 17:48:53 -0000 1.1 +++ sources 7 Mar 2008 19:24:25 -0000 1.2 @@ -0,0 +1 @@ +667e42357cc7e1719292c6a3342a6489 json-wheel-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 19:25:06 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Fri, 7 Mar 2008 19:25:06 GMT Subject: rpms/ocaml-json-wheel/devel ocaml-json-wheel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803071925.m27JP6Uc027480@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-json-wheel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27392/devel Modified Files: .cvsignore sources Added Files: ocaml-json-wheel.spec Log Message: Initial CVS import. --- NEW FILE ocaml-json-wheel.spec --- %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} Name: ocaml-json-wheel Version: 1.0.4 Release: 4%{?dist} Summary: OCaml library for parsing JSON Group: Development/Libraries License: BSD URL: http://martin.jambon.free.fr/json-wheel.html Source0: http://martin.jambon.free.fr/json-wheel-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ocamlnet-devel BuildRequires: ocaml-pcre-devel BuildRequires: pcre-devel %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description JSON library for OCaml following RFC 4627. If you use this library, consider installing ocaml-json-static, the syntax extension to the language which makes using JSON much easier. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep %setup -q -n json-wheel-%{version} %build make strip jsoncat %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs mkdir -p $RPM_BUILD_ROOT%{_bindir} make BINDIR=$RPM_BUILD_ROOT%{_bindir} install # Remove *.cmo and *.o files. These aren't needed for # anything because they are included in the *.cma/*.a. rm $RPM_BUILD_ROOT%{_libdir}/ocaml/json-wheel/*.cmo rm $RPM_BUILD_ROOT%{_libdir}/ocaml/json-wheel/*.o %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE %{_libdir}/ocaml/json-wheel %if %opt %exclude %{_libdir}/ocaml/json-wheel/*.a %exclude %{_libdir}/ocaml/json-wheel/*.cmxa %exclude %{_libdir}/ocaml/json-wheel/*.cmx %endif %exclude %{_libdir}/ocaml/json-wheel/*.mli %exclude %{_libdir}/ocaml/json-wheel/*.ml %{_bindir}/jsoncat %files devel %defattr(-,root,root,-) %doc LICENSE Changes README html %if %opt %{_libdir}/ocaml/json-wheel/*.a %{_libdir}/ocaml/json-wheel/*.cmxa %{_libdir}/ocaml/json-wheel/*.cmx %endif %{_libdir}/ocaml/json-wheel/*.mli %{_libdir}/ocaml/json-wheel/*.ml %changelog * Wed Mar 5 2008 Richard W.M. Jones - 1.0.4-4 - Remove ExcludeArch ppc64. * Wed Mar 5 2008 Richard W.M. Jones - 1.0.4-3 - Don't distribute the *.cmo and *.o files. - Better way to install jsoncat in the right directory. * Sat Mar 1 2008 Richard W.M. Jones - 1.0.4-2 - Missing BR ocaml-pcre-devel. - Missing BR pcre-devel. * Thu Feb 28 2008 Richard W.M. Jones - 1.0.4-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-wheel/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 17:48:53 -0000 1.1 +++ .cvsignore 7 Mar 2008 19:24:30 -0000 1.2 @@ -0,0 +1 @@ +json-wheel-1.0.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-wheel/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 17:48:53 -0000 1.1 +++ sources 7 Mar 2008 19:24:30 -0000 1.2 @@ -0,0 +1 @@ +667e42357cc7e1719292c6a3342a6489 json-wheel-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 19:26:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 19:26:29 GMT Subject: rpms/perl-Devel-Profiler/devel perl-Devel-Profiler-perl510.patch, NONE, 1.1 perl-Devel-Profiler.spec, 1.2, 1.3 Message-ID: <200803071926.m27JQTex027573@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Devel-Profiler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27540 Modified Files: perl-Devel-Profiler.spec Added Files: perl-Devel-Profiler-perl510.patch Log Message: fix for perl 5.10 perl-Devel-Profiler-perl510.patch: --- NEW FILE perl-Devel-Profiler-perl510.patch --- diff -up Devel-Profiler-0.04/lib/Devel/Profiler.pm.BAD Devel-Profiler-0.04/lib/Devel/Profiler.pm --- Devel-Profiler-0.04/lib/Devel/Profiler.pm.BAD 2008-03-07 14:20:17.000000000 -0500 +++ Devel-Profiler-0.04/lib/Devel/Profiler.pm 2008-03-07 14:21:03.000000000 -0500 @@ -151,9 +151,14 @@ sub scan { } # found a code ref? then instrument it - instrument($pkg, $sym, $code) - if defined($code = *{$glob}{CODE}) and ref $code eq 'CODE'; - + if (ref \$glob ne 'GLOB') { + # Something stranger in the typeglob, which will expand to (at + # least) a prototype if we take a reference to it. + instrument($pkg, $sym, \&{"$pkg$sym"}); + } else { + instrument($pkg, $sym, $code) + if defined($code = *{$glob}{CODE}) and ref $code eq 'CODE'; + } } } } diff -up Devel-Profiler-0.04/t/09fcntl.t.BAD Devel-Profiler-0.04/t/09fcntl.t --- Devel-Profiler-0.04/t/09fcntl.t.BAD 2008-03-07 14:21:11.000000000 -0500 +++ Devel-Profiler-0.04/t/09fcntl.t 2008-03-07 14:21:27.000000000 -0500 @@ -8,7 +8,14 @@ foo(); END # make sure the call tree looks right -check_tree(< 5.009) { + # Fcntl's constants are now directly defined, so constant() isn't called. + check_tree(< - 0.04-4 +- Fix for perl 5.10.0 + * Thu Mar 06 2008 Tom "spot" Callaway - 0.04-3 -Rebuild for new perl +- Rebuild for new perl * Mon Jul 16 2007 Steven Pritchard 0.04-2 - BR ExtUtils::MakeMaker and Test::More. From fedora-extras-commits at redhat.com Fri Mar 7 19:27:12 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Fri, 7 Mar 2008 19:27:12 GMT Subject: rpms/ocaml-json-wheel/F-8 ocaml-json-wheel.spec,1.1,1.2 Message-ID: <200803071927.m27JRChq027637@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-json-wheel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27611 Modified Files: ocaml-json-wheel.spec Log Message: * Fri Mar 7 2008 Richard W.M. Jones - 1.0.4-5 - Add ExcludeArch ppc64 for F-8 (only). Index: ocaml-json-wheel.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-wheel/F-8/ocaml-json-wheel.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocaml-json-wheel.spec 7 Mar 2008 19:24:25 -0000 1.1 +++ ocaml-json-wheel.spec 7 Mar 2008 19:26:38 -0000 1.2 @@ -3,7 +3,7 @@ Name: ocaml-json-wheel Version: 1.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml library for parsing JSON Group: Development/Libraries @@ -11,6 +11,7 @@ URL: http://martin.jambon.free.fr/json-wheel.html Source0: http://martin.jambon.free.fr/json-wheel-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: ppc64 BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel @@ -98,6 +99,9 @@ %changelog +* Fri Mar 7 2008 Richard W.M. Jones - 1.0.4-5 +- Add ExcludeArch ppc64 for F-8 (only). + * Wed Mar 5 2008 Richard W.M. Jones - 1.0.4-4 - Remove ExcludeArch ppc64. From fedora-extras-commits at redhat.com Fri Mar 7 19:28:36 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Fri, 7 Mar 2008 19:28:36 GMT Subject: rpms/color-filesystem/F-8 color-filesystem.spec,NONE,1.1 Message-ID: <200803071928.m27JSaEn027677@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/color-filesystem/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27670 Added Files: color-filesystem.spec Log Message: Initial import for F-8 --- NEW FILE color-filesystem.spec --- Name: color-filesystem Version: 1 Release: 2 Summary: Color filesystem layout Group: System Environment/Base License: Public Domain BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: filesystem Requires: rpm %description This package provides some directories that are required/used to store color. %prep # Nothing to prep %build # Nothing to build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/color/icc mkdir -p $RPM_BUILD_ROOT%{_datadir}/color/cmms mkdir -p $RPM_BUILD_ROOT%{_datadir}/color/settings # rpm macros mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.color< - 1-2 - Add settings color dir * Sat Feb 2 2008 kwizart < kwizart at gmail.com > - 1-1 - Initial package. From fedora-extras-commits at redhat.com Fri Mar 7 19:34:45 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Fri, 7 Mar 2008 19:34:45 GMT Subject: rpms/gtk-vnc/F-8 gtk-vnc-0.3.4-scaling-crash.patch, NONE, 1.1 gtk-vnc.spec, 1.9, 1.10 sources, 1.4, 1.5 gtk-vnc-0.3.2-keystate-tracking.patch, 1.1, NONE Message-ID: <200803071934.m27JYj3V027919@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/gtk-vnc/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27888 Modified Files: gtk-vnc.spec sources Added Files: gtk-vnc-0.3.4-scaling-crash.patch Removed Files: gtk-vnc-0.3.2-keystate-tracking.patch Log Message: Update to 0.3.4 release gtk-vnc-0.3.4-scaling-crash.patch: --- NEW FILE gtk-vnc-0.3.4-scaling-crash.patch --- diff -r 02bc30c3e8f6 src/vncdisplay.c --- a/src/vncdisplay.c Wed Mar 05 19:21:36 2008 -0600 +++ b/src/vncdisplay.c Thu Mar 06 17:50:12 2008 -0500 @@ -1084,6 +1084,12 @@ static gboolean configure_event(GtkWidge static gboolean configure_event(GtkWidget *widget, GdkEventConfigure *configure, gpointer data G_GNUC_UNUSED) { + VncDisplay *obj = VNC_DISPLAY(widget); + VncDisplayPrivate *priv = obj->priv; + + if (priv->fb.data == NULL) + return FALSE; + rescale_display(VNC_DISPLAY(widget), configure->width, configure->height); Index: gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/F-8/gtk-vnc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtk-vnc.spec 31 Jan 2008 16:54:05 -0000 1.9 +++ gtk-vnc.spec 7 Mar 2008 19:34:09 -0000 1.10 @@ -1,16 +1,28 @@ # -*- rpm-spec -*- +# Plugin isn't ready for real world use yet - it needs +# a security audit at very least +%define with_plugin 0 + Summary: A GTK widget for VNC clients Name: gtk-vnc -Version: 0.3.2 -Release: 2%{?dist} +Version: 0.3.4 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch1: %{name}-%{version}-keystate-tracking.patch +Patch1: %{name}-%{version}-scaling-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gtk-vnc.sf.net/ -BuildRequires: gtk2-devel pygtk2-devel python-devel gnutls-devel zlib-devel +BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel +BuildRequires: gnutls-devel gtkglext-devel +%if %{with_plugin} +%if "%{fedora}" > "8" +BuildRequires: xulrunner-devel +%else +BuildRequires: firefox-devel +%endif +%endif %description gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines @@ -40,21 +52,43 @@ A module allowing use of the GTK-VNC widget from python +%if %{with_plugin} +%package plugin +Summary: Mozilla plugin for the gtk-vnc library +Group: Development/Libraries +Requires: %{name} = %{version} + +%description plugin +gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines +allowing it to be completely asynchronous while remaining single threaded. + +This package provides a web browser plugin for Mozilla compatible +browsers. +%endif + %prep %setup -q %patch1 -p1 %build +%if %{with_plugin} +%configure --enable-plugin=yes +%else %configure -make +%endif +%__make %{?_smp_mflags} %install rm -fr %{buildroot} -make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/python*/site-packages/*.a rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la +%if %{with_plugin} +rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.a +rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la +%endif %clean rm -fr %{buildroot} @@ -81,7 +115,17 @@ %doc examples/gvncviewer.py %{_libdir}/python*/site-packages/gtkvnc.so +%if %{with_plugin} +%files plugin +%defattr(-, root, root) +%{_libdir}/mozilla/plugins/%{name}-plugin.so +%endif + %changelog +* Thu Mar 6 2008 Daniel P. Berrange - 0.3.4-1.fc8 +- Update to 0.3.4 release +- Fix crash with OpenGL scaling code + * Thu Jan 31 2008 Daniel P. Berrange - 0.3.2-2.fc8 - Fix modifier state tracking (rhbz #427997) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Dec 2007 18:04:57 -0000 1.4 +++ sources 7 Mar 2008 19:34:09 -0000 1.5 @@ -1 +1 @@ -d87f4921c031c77335907c19ca1dbf03 gtk-vnc-0.3.2.tar.gz +5ccf094bfb47ad5fe224d7feca175de2 gtk-vnc-0.3.4.tar.gz --- gtk-vnc-0.3.2-keystate-tracking.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 7 19:43:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 19:43:29 GMT Subject: rpms/perl-XML-Validator-Schema/devel perl-XML-Validator-Schema.spec, 1.2, 1.3 Message-ID: <200803071943.m27JhT6U028118@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Validator-Schema/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28091 Modified Files: perl-XML-Validator-Schema.spec Log Message: add missing BR Index: perl-XML-Validator-Schema.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Validator-Schema/devel/perl-XML-Validator-Schema.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-XML-Validator-Schema.spec 7 Mar 2008 02:21:38 -0000 1.2 +++ perl-XML-Validator-Schema.spec 7 Mar 2008 19:42:54 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-XML-Validator-Schema Version: 1.08 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Validate XML against a subset of W3C XML Schema License: GPL+ or Artistic Group: Development/Libraries @@ -12,6 +12,7 @@ BuildRequires: perl(XML::Filter::BufferText) BuildRequires: perl(XML::SAX) >= 0.12 BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) Requires: perl(Tree::DAG_Node) Requires: perl(XML::Filter::BufferText) Requires: perl(XML::SAX) >= 0.12 @@ -52,8 +53,11 @@ %{_mandir}/man3/* %changelog +* Fri Mar 07 2008 Tom "spot" Callaway - 1.08-3 +- add missing BR for tests + * Thu Mar 06 2008 Tom "spot" Callaway - 1.08-2 -Rebuild for new perl +- Rebuild for new perl * Thu Mar 15 2007 Andreas Thienemann 1.08-1 - Specfile autogenerated by cpanspec 1.69.1. From fedora-extras-commits at redhat.com Fri Mar 7 19:44:06 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 19:44:06 GMT Subject: rpms/kdeedu/devel kdeedu-4.0.2-cfitsio.patch, 1.1, 1.2 kdeedu.spec, 1.88, 1.89 Message-ID: <200803071944.m27Ji6kt028179@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdeedu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28156/devel Modified Files: kdeedu-4.0.2-cfitsio.patch kdeedu.spec Log Message: - fix cfitsio detection by adding another hardcoded directory (cfitsio.pc is broken in the Fedora cfitsio package, #436539) kdeedu-4.0.2-cfitsio.patch: Index: kdeedu-4.0.2-cfitsio.patch =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu-4.0.2-cfitsio.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdeedu-4.0.2-cfitsio.patch 7 Mar 2008 19:10:14 -0000 1.1 +++ kdeedu-4.0.2-cfitsio.patch 7 Mar 2008 19:43:57 -0000 1.2 @@ -1,26 +1,11 @@ diff -ur kdeedu-4.0.2/cmake/modules/FindCFitsio.cmake kdeedu-4.0.2-cfitsio/cmake/modules/FindCFitsio.cmake --- kdeedu-4.0.2/cmake/modules/FindCFitsio.cmake 2008-01-05 00:56:03.000000000 +0100 -+++ kdeedu-4.0.2-cfitsio/cmake/modules/FindCFitsio.cmake 2008-03-07 20:07:07.000000000 +0100 -@@ -20,13 +20,22 @@ - ++++ kdeedu-4.0.2-cfitsio/cmake/modules/FindCFitsio.cmake 2008-03-07 20:42:06.000000000 +0100 +@@ -21,6 +21,7 @@ else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) -+ IF (NOT WIN32) -+ # use pkg-config to get the directories and then use these values -+ # in the FIND_PATH() and FIND_LIBRARY() calls -+ INCLUDE(UsePkgConfig) -+ PKGCONFIG(cfitsio _CFitsioIncDir _CFitsioLinkDir _CFitsioLinkFlags _CFitsioCflags) -+ ENDIF (NOT WIN32) -+ find_path(CFITSIO_INCLUDE_DIR fitsio.h -+ ${_CFitsioIncDir} ++ /usr/include/cfitsio ${_obIncDir} ${GNUWIN32_DIR}/include ) - - find_library(CFITSIO_LIBRARIES NAMES cfitsio - PATHS -+ ${_CFitsioLinkDir} - ${_obLinkDir} - ${GNUWIN32_DIR}/lib - ) Index: kdeedu.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- kdeedu.spec 7 Mar 2008 19:10:14 -0000 1.88 +++ kdeedu.spec 7 Mar 2008 19:43:57 -0000 1.89 @@ -9,7 +9,8 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2 # fix linking against OpenBabel Patch0: kdeedu-4.0.2-openbabel.patch -# fix cfitsio detection by using pkgconfig +# fix cfitsio detection by adding another hardcoded directory +# (cfitsio.pc is broken in the Fedora cfitsio package, #436539) Patch1: kdeedu-4.0.2-cfitsio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -167,7 +168,7 @@ %changelog * Fri Mar 07 2008 Kevin Kofler 4.0.2-3 -- fix cfitsio detection by using pkgconfig +- fix cfitsio detection by adding another hardcoded directory * Fri Mar 07 2008 Kevin Kofler 4.0.2-2 - reenable BR openbabel-devel, fix build with it From fedora-extras-commits at redhat.com Fri Mar 7 19:48:22 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 19:48:22 GMT Subject: rpms/perl-XML-Validator-Schema/devel .cvsignore, 1.2, 1.3 perl-XML-Validator-Schema.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803071948.m27JmMmK028306@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Validator-Schema/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28270 Modified Files: .cvsignore perl-XML-Validator-Schema.spec sources Log Message: 1.10 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Validator-Schema/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Mar 2007 16:48:20 -0000 1.2 +++ .cvsignore 7 Mar 2008 19:47:42 -0000 1.3 @@ -1 +1 @@ -XML-Validator-Schema-1.08.tar.gz +XML-Validator-Schema-1.10.tar.gz Index: perl-XML-Validator-Schema.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Validator-Schema/devel/perl-XML-Validator-Schema.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-XML-Validator-Schema.spec 7 Mar 2008 19:42:54 -0000 1.3 +++ perl-XML-Validator-Schema.spec 7 Mar 2008 19:47:42 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-XML-Validator-Schema -Version: 1.08 -Release: 3%{?dist} +Version: 1.10 +Release: 1%{?dist} Summary: Validate XML against a subset of W3C XML Schema License: GPL+ or Artistic Group: Development/Libraries @@ -12,7 +12,7 @@ BuildRequires: perl(XML::Filter::BufferText) BuildRequires: perl(XML::SAX) >= 0.12 BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Test::More) +BuildRequires: perl(Test::More), perl(XML::SAX::Writer) Requires: perl(Tree::DAG_Node) Requires: perl(XML::Filter::BufferText) Requires: perl(XML::SAX) >= 0.12 @@ -53,6 +53,10 @@ %{_mandir}/man3/* %changelog +* Fri Mar 07 2008 Tom "spot" Callaway - 1.10-1 +- BR: XML::SAX::Writer +- bump to 1.10 + * Fri Mar 07 2008 Tom "spot" Callaway - 1.08-3 - add missing BR for tests Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Validator-Schema/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Mar 2007 16:48:20 -0000 1.2 +++ sources 7 Mar 2008 19:47:42 -0000 1.3 @@ -1 +1 @@ -4f9decc25d2b484df80ee4adfa912f12 XML-Validator-Schema-1.08.tar.gz +c77e5098bd02bbbbb47a22a8b9d4c554 XML-Validator-Schema-1.10.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 19:50:50 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Fri, 7 Mar 2008 19:50:50 GMT Subject: rpms/openoffice.org/devel workspace.cmcfixes43.patch, 1.1.2.2, 1.1.2.3 Message-ID: <200803071950.m27Joo5t028404@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28383 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 workspace.cmcfixes43.patch Log Message: add workspace.cmcfixes43.patch workspace.cmcfixes43.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1.2.2 -r 1.1.2.3 workspace.cmcfixes43.patch Index: workspace.cmcfixes43.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/Attic/workspace.cmcfixes43.patch,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- workspace.cmcfixes43.patch 7 Mar 2008 17:52:31 -0000 1.1.2.2 +++ workspace.cmcfixes43.patch 7 Mar 2008 19:50:44 -0000 1.1.2.3 @@ -450,30010 +450,6 @@ OBJFILES=\ $(OBJ)$/HelpLinker.obj \ $(OBJ)$/HelpCompiler.obj -Index: tools/config_office/configure -diff -u tools/config_office/configure:1.221 tools/config_office/configure:1.221.14.2 ---- tools/config_office/configure:1.221 Tue Feb 19 04:37:19 2008 -+++ tools/config_office/configure Thu Mar 6 01:46:23 2008 -@@ -1,26 +1,55 @@ - #! /bin/sh - # From configure.in Revision . - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. -+# Generated by GNU Autoconf 2.61. - # --# Copyright (C) 2003 Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## - --# Be Bourne compatible -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh - fi --DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -@@ -30,8 +59,43 @@ - fi - - -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ - # Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done - PS1='$ ' - PS2='> ' - PS4='+ ' -@@ -45,18 +109,19 @@ - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else -- $as_unset $as_var -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi - done - - # Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false -@@ -64,157 +129,388 @@ - - - # Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -+# CDPATH. -+$as_unset CDPATH - --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh -+if test "x$CONFIG_SHELL" = x; then -+ if (eval ":") 2>/dev/null; then [...29648 lines suppressed...] --if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then -- with_system_stdlibs=yes -- AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) -- echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn -+if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then -+ if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then -+ with_system_stdlibs=yes -+ AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) -+ echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn -+ fi - fi - - dnl =================================================================== -@@ -3361,7 +3370,8 @@ - with_system_python=yes - fi - AC_MSG_CHECKING([which python to use]) --if test -n "$with_system_python" && test "$with_system_python" != "no"; then -+if test -n "$with_system_python" -o -n "$with_system_libs" && \ -+ test "$with_system_python" != "no"; then - SYSTEM_PYTHON=YES - AC_MSG_RESULT([external]) - AM_PATH_PYTHON([2.2]) -@@ -3669,7 +3679,8 @@ - dnl Check for system boost - dnl =================================================================== - AC_MSG_CHECKING([which boost to use]) --if test -n "$with_system_boost" && test "$with_system_boost" != "no"; then -+if test -n "$with_system_boost" -o -n "$with_system_headers" && \ -+ test "$with_system_boost" != "no"; then - AC_MSG_RESULT([external]) - SYSTEM_BOOST=YES - AC_LANG_PUSH([C++]) -@@ -3689,7 +3700,8 @@ - dnl Check for system vigra - dnl =================================================================== - AC_MSG_CHECKING([which vigra to use]) --if test -n "$with_system_vigra" && test "$with_system_vigra" != "no"; then -+if test -n "$with_system_vigra" -o -n "$with_system_headers" && \ -+ test "$with_system_vigra" != "no"; then - AC_MSG_RESULT([external]) - SYSTEM_VIGRA=YES - AC_LANG_PUSH([C++]) -@@ -3707,7 +3719,8 @@ - dnl Check for system odbc - dnl =================================================================== - AC_MSG_CHECKING([which odbc headers to use]) --if test -n "$with_system_odbc_headers" && test "$with_system_odbc_headers" != "no"; then -+if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \ -+ test "$with_system_odbc_headers" != "no"; then - AC_MSG_RESULT([external]) - SYSTEM_ODBC_HEADERS=YES - -@@ -3794,7 +3807,9 @@ - AC_MSG_RESULT([external]) - SYSTEM_MOZILLA=YES - AC_MSG_CHECKING([which Mozilla flavour to use]) -- if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then -+ if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then -+ MOZ_FLAVOUR=libxul -+ elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then - MOZ_FLAVOUR=xulrunner - elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then - MOZ_FLAVOUR=seamonkey -@@ -3803,12 +3818,18 @@ - elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then - MOZ_FLAVOUR=mozilla - else -- MOZ_FLAVOUR=xulrunner -+ MOZ_FLAVOUR=libxul - fi - tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst();'` - AC_MSG_RESULT($tmp) - -- PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom ) -+ PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" ) -+ if test -z "$STANDALONENSS"; then -+ PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss ) -+ else -+ NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`" -+ AC_SUBST(NSS_LIB) -+ fi - - if $PKG_CONFIG --exists nspr ; then - PKG_CHECK_MODULES( MOZ_NSPR, nspr ) -@@ -3818,12 +3839,14 @@ - PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr ) - fi - -- PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" ) -- if test -z "$STANDALONENSS"; then -- PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss ) -+ if $PKG_CONFIG --exists libxul ; then -+ PKG_CHECK_MODULES( MOZILLAXPCOM, libxul ) -+ MOZ_INC=`$PKG_CONFIG --variable=includedir libxul` -+ MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul` - else -- NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`" -- AC_SUBST(NSS_LIB) -+ PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom ) -+ MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom` -+ MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom` - fi - - save_CPPFLAGS="$CPPFLAGS" -@@ -3839,8 +3862,6 @@ - CPPFLAGS="$save_CPPFLAGS" - LIBS="$save_LIBS" - -- MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom` -- MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom` - MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS - if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then - AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap]) -@@ -3853,6 +3874,13 @@ - Please recompile $tmp with --enable-ldap or use --with-openldap.]) - fi - fi -+ -+ #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges -+ #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul -+ if test "$MOZ_FLAVOUR" == "libxul"; then -+ MOZ_FLAVOUR="mozilla" -+ fi -+ - elif test "$enable_mozilla" = "no"; then - AC_MSG_RESULT([none]) - WITH_MOZILLA=NO -@@ -3989,7 +4017,8 @@ - dnl Check for system sane - dnl =================================================================== - AC_MSG_CHECKING([which sane header to use]) --if test -n "$with_system_sane_header" && test "$with_system_sane_header" != "no"; then -+if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \ -+ test "$with_system_sane_header" != "no"; then - AC_MSG_RESULT([external]) - SYSTEM_SANE_HEADER=YES - AC_CHECK_HEADER(sane/sane.h, [], -@@ -4186,7 +4215,8 @@ - XRENDER_LINK=NO - fi - AC_MSG_CHECKING([which Xrender headers to use]) --if test -n "$with_system_xrender_headers" && test "$with_system_xrender_headers" != "no"; then -+if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \ -+ test "$with_system_xrender_headers" != "no"; then - AC_MSG_RESULT([external]) - SYSTEM_XRENDER_HEADERS=YES - AC_CHECK_HEADER(X11/extensions/Xrender.h, [], -@@ -4421,7 +4451,8 @@ - dnl Check for system hunspell - dnl =================================================================== - AC_MSG_CHECKING([which libhunspell to use]) --if test -n "$with_system_hunspell" && test "$with_system_hunspell" != "no"; then -+if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \ -+ test "$with_system_hunspell" != "no"; then - AC_MSG_RESULT([external]) - SYSTEM_HUNSPELL=YES - AC_LANG_PUSH([C++]) -@@ -4449,7 +4480,8 @@ - dnl Checking for altlinuxhyph - dnl =================================================================== - AC_MSG_CHECKING([which altlinuxhyph to use]) --if test -n "$with_system_altlinuxhyph" && test "$with_system_altlinuxyph" != "no"; then -+if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \ -+ test "$with_system_altlinuxhyph" != "no"; then - AC_MSG_RESULT([external]) - SYSTEM_HYPH=YES - AC_CHECK_HEADER(hyphen.h, [], Index: udk/jvmaccess/util/gcc3.map diff -u /dev/null udk/jvmaccess/util/gcc3.map:1.1.2.1 --- /dev/null Fri Mar 7 09:03:35 2008 @@ -30709,28 +705,6 @@ #ifdef GCC namespace std -Index: tools/solenv/inc/libs.mk -diff -u tools/solenv/inc/libs.mk:1.126 tools/solenv/inc/libs.mk:1.126.10.1 ---- tools/solenv/inc/libs.mk:1.126 Mon Feb 25 08:42:00 2008 -+++ tools/solenv/inc/libs.mk Wed Mar 5 09:24:45 2008 -@@ -327,7 +327,7 @@ - SABLOT3RDLIB=-lsablot - APP3RDLIB=-lapp - SAMPLE3RDLIB=-lsample --HNJLIB=-lhnj -+HNJLIB*=-lhnj - MYSPELLLIB=-lmyspell - COSVLIB=-lcosv - UDMLIB=-ludm -@@ -483,7 +483,7 @@ - SABLOT3RDLIB= $(LIBPRE) sablot.lib - APP3RDLIB= $(LIBPRE) app.lib - SAMPLE3RDLIB= $(LIBPRE) sample.lib --HNJLIB= libhnj.lib -+HNJLIB*=libhnj.lib - MYSPELLLIB= $(LIBPRE) myspell.lib - COSVLIB= $(LIBPRE) cosv.lib - UDMLIB= $(LIBPRE) udm.lib Index: udk/stoc/test/registry_tdprovider/makefile.mk diff -u udk/stoc/test/registry_tdprovider/makefile.mk:1.4 udk/stoc/test/registry_tdprovider/makefile.mk:1.4.88.1 --- udk/stoc/test/registry_tdprovider/makefile.mk:1.4 Thu Sep 8 01:30:08 2005 From fedora-extras-commits at redhat.com Fri Mar 7 20:04:16 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 7 Mar 2008 20:04:16 GMT Subject: extras-repoclosure rc-modified,1.21,1.22 Message-ID: <200803072004.m27K4G2u003407@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3391 Modified Files: rc-modified Log Message: implement a different multi-lib problems hack, which can be disabled via options Index: rc-modified =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- rc-modified 3 Mar 2008 14:21:59 -0000 1.21 +++ rc-modified 7 Mar 2008 20:04:15 -0000 1.22 @@ -50,13 +50,15 @@ parser.add_option("-r", "--repoid", default=[], action='append', help="specify repo ids to query, can be specified multiple times (default is all enabled)") parser.add_option("-t", "--tempcache", default=False, action="store_true", - help="Use a temp dir for storing/accessing yum-cache") + help="use a temp dir for storing/accessing yum-cache") parser.add_option("-d", "--cachedir", default='', help="specify a custom directory for storing/accessing yum-cache") parser.add_option("-q", "--quiet", default=0, action="store_true", help="quiet (no output to stderr)") parser.add_option("-n", "--newest", default=0, action="store_true", help="check only the newest packages in the repos") + parser.add_option("", "--nomultilibhack", default=False, action="store_true", + help="disable multi-lib hack") (opts, args) = parser.parse_args() return (opts, args) @@ -72,7 +74,9 @@ if hasattr(self.repos, 'sqlite'): self.repos.sqlite = False self.repos._selectSackType() - + + self.guessMultiLibProbs = True + def evrTupletoVer(self,tuple): """convert and evr tuple to a version string, return None if nothing to convert""" @@ -100,10 +104,41 @@ except TypeError: self.repos.populateSack(which=[repo.id], with='filelists') + def isnewest(self, pkg): + newest = pkg.pkgtup in self.newestpkgtuplist + + if not self.guessMultiLibProbs: + return newest + + # Multi-lib hack: + # + # This is supposed to catch corner-cases, such as: + # Base-arch pkg was updated, but a corresponding compat-arch pkg + # is not included in the repo, because e.g. it was repackaged + # and no longer is pulled in by the multi-lib resolver. + # Assume, that if it the old compat-arch pkg is in the repo, + # there is no upgrade path from biarch installs to single-arch + # (the one pkg upgrades two installed pkgs with different arch) + + if newest: + return newest # the trivial case + + (n,a,e,v,r) = pkg.pkgtup + for provpkg in self.pkgSack.returnNewestByName(n): + prov_a = provpkg.pkgtup[1] + if prov_a=='noarch' or prov_a==a: + (prov_e, prov_v, prov_r) = provpkg.pkgtup[2:] + vercmp = rpmUtils.miscutils.compareEVR( (prov_e,prov_v,prov_r), (e,v,r) ) + if vercmp>0: # provpkg is newer + return False + # No noarch/same-arch pkg is newer, but a basearch pkg may be newer + # and therefore be the only one in newestpkgtuplist. + return True + def getBrokenDeps(self, newest=False): unresolved = {} resolved = {} - newestpkgtuplist = [] + self.newestpkgtuplist = [] if newest: if yum.__version__ >= '2.9': # TODO: check pkgs = self.pkgSack.returnNewestByName() @@ -111,7 +146,7 @@ pkgs = [] for l in self.pkgSack.returnNewestByName(): pkgs.extend(l) - newestpkgtuplist = ListPackageSack(pkgs).simplePkgList() + self.newestpkgtuplist = ListPackageSack(pkgs).simplePkgList() pkgs = self.pkgSack.returnNewestByNameArch() else: @@ -154,7 +189,7 @@ pass if len(resolve_sack) < 1: - if newest and pkg.pkgtup not in newestpkgtuplist: + if newest and not self.isnewest(pkg): break if not unresolved.has_key(pkg): unresolved[pkg] = [] @@ -189,7 +224,7 @@ if resolved_by_newest: resolved[(req,flags,ver)] = 1 else: - if newest and pkg.pkgtup not in newestpkgtuplist: + if newest and not self.isnewest(pkg): break if not unresolved.has_key(pkg): unresolved[pkg] = [] @@ -204,6 +239,7 @@ def main(): (opts, cruft) = parseArgs() my = RepoClosure(arch = opts.arch, config = opts.config) + my.guessMultiLibProbs = not opts.nomultilibhack if opts.repoid: for repo in my.repos.repos.values(): From fedora-extras-commits at redhat.com Fri Mar 7 20:05:00 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Fri, 7 Mar 2008 20:05:00 GMT Subject: rpms/system-switch-mail/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 system-switch-mail.spec, 1.16, 1.17 Message-ID: <200803072005.m27K50kq003437@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/system-switch-mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3387 Modified Files: .cvsignore sources system-switch-mail.spec Log Message: respin Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/system-switch-mail/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 10 Apr 2007 16:47:09 -0000 1.13 +++ .cvsignore 7 Mar 2008 20:04:26 -0000 1.14 @@ -8,3 +8,4 @@ system-switch-mail-0.5.25-8.tar.bz2 system-switch-mail-0.5.25-10.tar.bz2 system-switch-mail-0.5.25-13.tar.bz2 +system-switch-mail-0.5.26-1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/system-switch-mail/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 10 Apr 2007 16:47:09 -0000 1.13 +++ sources 7 Mar 2008 20:04:26 -0000 1.14 @@ -1 +1 @@ -a57e614601299f811ea67bd4ed4c21e4 system-switch-mail-0.5.25-13.tar.bz2 +3f544e0232c3aca626abdccec5e408c0 system-switch-mail-0.5.26-1.tar.bz2 Index: system-switch-mail.spec =================================================================== RCS file: /cvs/extras/rpms/system-switch-mail/devel/system-switch-mail.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- system-switch-mail.spec 10 Apr 2007 16:47:09 -0000 1.16 +++ system-switch-mail.spec 7 Mar 2008 20:04:26 -0000 1.17 @@ -1,7 +1,7 @@ Summary: The Mail Transport Agent Switcher Name: system-switch-mail -Version: 0.5.25 -Release: 13 +Version: 0.5.26 +Release: 1 Source0: %{name}-%{version}-%{release}.tar.bz2 License: GPL Group: Applications/System @@ -9,8 +9,8 @@ BuildArch: noarch -Requires: newt -Requires: /usr/sbin/alternatives +Requires: newt-python +Requires: chkconfig Requires: python >= 2.3 Requires: usermode @@ -77,6 +77,16 @@ %{_datadir}/%{name}/switchmail.glade %changelog +* Fri Mar 07 2008 Than Ngo 0.5.26-1 +- 0.5.26 release + - use chkconfig to configure selected MTA to start automatically (#436359) + - add missing file in POTFILES.in (#433456) + - use correct python version (#427571) + - chkconfig off/on after mta is switched (#246092) + - Require newt-python (#251363) + - remove obsolete translation (#332461) + - add man page (#427570) + * Tue Apr 10 2007 Than Ngo - 0.5.25-13 - add support for ssmtp and esmtp From fedora-extras-commits at redhat.com Fri Mar 7 20:08:20 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Fri, 7 Mar 2008 20:08:20 GMT Subject: rpms/color-filesystem/F-8 color-filesystem.spec,1.1,1.2 Message-ID: <200803072008.m27K8K3b003528@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/color-filesystem/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3499 Modified Files: color-filesystem.spec Log Message: bump for F-8 Index: color-filesystem.spec =================================================================== RCS file: /cvs/pkgs/rpms/color-filesystem/F-8/color-filesystem.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- color-filesystem.spec 7 Mar 2008 19:28:30 -0000 1.1 +++ color-filesystem.spec 7 Mar 2008 20:07:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: color-filesystem Version: 1 -Release: 2 +Release: 3 Summary: Color filesystem layout Group: System Environment/Base @@ -51,6 +51,9 @@ %config %{_sysconfdir}/rpm/macros.color %changelog +* Fri Mar 7 2008 kwizart < kwizart at gmail.com > - 1-3 +- bump + * Tue Mar 4 2008 kwizart < kwizart at gmail.com > - 1-2 - Add settings color dir From fedora-extras-commits at redhat.com Fri Mar 7 20:11:31 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Fri, 7 Mar 2008 20:11:31 GMT Subject: rpms/color-filesystem/devel color-filesystem.spec,1.2,1.3 Message-ID: <200803072011.m27KBVlq003612@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/color-filesystem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3587 Modified Files: color-filesystem.spec Log Message: Bump Index: color-filesystem.spec =================================================================== RCS file: /cvs/pkgs/rpms/color-filesystem/devel/color-filesystem.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- color-filesystem.spec 4 Mar 2008 11:57:38 -0000 1.2 +++ color-filesystem.spec 7 Mar 2008 20:10:54 -0000 1.3 @@ -1,6 +1,6 @@ Name: color-filesystem Version: 1 -Release: 2 +Release: 4 Summary: Color filesystem layout Group: System Environment/Base @@ -51,6 +51,12 @@ %config %{_sysconfdir}/rpm/macros.color %changelog +* Fri Mar 7 2008 kwizart < kwizart at gmail.com > - 1-4 +- Bump + +* Fri Mar 7 2008 kwizart < kwizart at gmail.com > - 1-3 +- bump + * Tue Mar 4 2008 kwizart < kwizart at gmail.com > - 1-2 - Add settings color dir From fedora-extras-commits at redhat.com Fri Mar 7 20:13:17 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 20:13:17 GMT Subject: rpms/perl-XML-Xerces/devel perl-XML-Xerces-xerces28.patch, NONE, 1.1 perl-XML-Xerces.spec, 1.4, 1.5 Message-ID: <200803072013.m27KDHus003705@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Xerces/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3640 Modified Files: perl-XML-Xerces.spec Added Files: perl-XML-Xerces-xerces28.patch Log Message: 2.8.0 support hack perl-XML-Xerces-xerces28.patch: --- NEW FILE perl-XML-Xerces-xerces28.patch --- diff -up XML-Xerces-2.7.0-0/Makefile.PL.BAD XML-Xerces-2.7.0-0/Makefile.PL --- XML-Xerces-2.7.0-0/Makefile.PL.BAD 2008-03-07 14:58:18.000000000 -0500 +++ XML-Xerces-2.7.0-0/Makefile.PL 2008-03-07 14:58:24.000000000 -0500 @@ -27,7 +27,7 @@ use File::Basename; # We need to know which version of libxerces we are to use. # As of Xerces-C 1.5.1, minor version numbers are used -my $XERCES_MAJOR_VERSION = '2.7'; +my $XERCES_MAJOR_VERSION = '2.8'; my $XERCES_MINOR_VERSION = '0'; my $XERCES_LIB_VERSION = "$XERCES_MAJOR_VERSION.$XERCES_MINOR_VERSION"; my $XERCES_PERL_VERSION = $XERCES_LIB_VERSION . '-0'; Index: perl-XML-Xerces.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Xerces/devel/perl-XML-Xerces.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-XML-Xerces.spec 7 Mar 2008 02:21:46 -0000 1.4 +++ perl-XML-Xerces.spec 7 Mar 2008 20:12:40 -0000 1.5 @@ -3,13 +3,14 @@ Name: perl-XML-Xerces Version: %{ver}_%{PatchLevel} -Release: 7%{?dist} +Release: 8%{?dist} Summary: Perl API to Xerces XML parser Group: Development/Libraries License: ASL 2.0 URL: http://xerces.apache.org/xerces-p/ Source: http://www.apache.org/dist/xml/xerces-p/XML-Xerces-%{ver}-%{PatchLevel}.tar.gz +Patch0: perl-XML-Xerces-xerces28.patch BuildRoot: %{_tmppath}/%{name}-%{ver}-%{PatchLevel}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) @@ -37,6 +38,7 @@ %prep %setup -q -n XML-Xerces-%{ver}-%{PatchLevel} +%patch0 -p1 %build @@ -71,8 +73,11 @@ %changelog +* Fri Mar 7 2008 Tom "spot" Callaway - 2.7.0_0-8 +- tell the code that 2.8.0 is fine + * Thu Mar 06 2008 Tom "spot" Callaway - 2.7.0_0-7 -Rebuild for new perl +- Rebuild for new perl * Wed Feb 20 2008 Fedora Release Engineering - 2.7.0_0-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Fri Mar 7 20:14:01 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:14:01 GMT Subject: rpms/certmaster/EL-4 certmaster.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200803072014.m27KE1DI003875@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/certmaster/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3704/EL-4 Modified Files: certmaster.spec sources Log Message: This is 0.18 Index: certmaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-4/certmaster.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- certmaster.spec 27 Feb 2008 19:19:58 -0000 1.1 +++ certmaster.spec 7 Mar 2008 20:13:26 -0000 1.2 @@ -74,11 +74,9 @@ %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then - /usr/lib/lsb/install_initd /etc/init.d/certmasterd /usr/lib/lsb/install_initd /etc/init.d/certmaster # for red hat distros elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --add certmasterd /sbin/chkconfig --add certmaster # or, the old fashioned way else @@ -93,24 +91,23 @@ %preun if [ "$1" = 0 ] ; then - /etc/init.d/certmasterd stop > /dev/null 2>&1 /etc/init.d/certmaster stop > /dev/null 2>&1 if [ -x /usr/lib/lsb/remove_initd ]; then - /usr/lib/lsb/remove_initd /etc/init.d/certmasterd /usr/lib/lsb/remove_initd /etc/init.d/certmaster elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --del certmasterd /sbin/chkconfig --del certmaster else - rm -f /etc/rc.d/rc?.d/???certmasterd rm -f /etc/rc.d/rc?.d/???certmaster fi fi %changelog -* Tue Feb 26 2008 Michael DeHaan - 0.18-1 -- bump for Fedora submission +* Fri Mar 07 2008 Michael DeHaan - 0.18-1 +- release bump + +* Mon Feb 25 2008 Adrian Likins - 0.1-1 +- remove certmasterd references * Thu Feb 7 2008 Michael DeHaan - 0.1-1 - initial version, split off from func project, WIP Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Feb 2008 19:14:35 -0000 1.2 +++ sources 7 Mar 2008 20:13:26 -0000 1.3 @@ -1 +1 @@ -8de40bf96f91dfa260246bafbeeb014f certmaster-0.18.tar.gz +d661004b7eb0c7b43f57f0a510232bd2 certmaster-0.18.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 20:14:07 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:14:07 GMT Subject: rpms/certmaster/EL-5 certmaster.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200803072014.m27KE794003886@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/certmaster/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3704/EL-5 Modified Files: certmaster.spec sources Log Message: This is 0.18 Index: certmaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-5/certmaster.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- certmaster.spec 27 Feb 2008 19:20:10 -0000 1.1 +++ certmaster.spec 7 Mar 2008 20:13:31 -0000 1.2 @@ -74,11 +74,9 @@ %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then - /usr/lib/lsb/install_initd /etc/init.d/certmasterd /usr/lib/lsb/install_initd /etc/init.d/certmaster # for red hat distros elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --add certmasterd /sbin/chkconfig --add certmaster # or, the old fashioned way else @@ -93,24 +91,23 @@ %preun if [ "$1" = 0 ] ; then - /etc/init.d/certmasterd stop > /dev/null 2>&1 /etc/init.d/certmaster stop > /dev/null 2>&1 if [ -x /usr/lib/lsb/remove_initd ]; then - /usr/lib/lsb/remove_initd /etc/init.d/certmasterd /usr/lib/lsb/remove_initd /etc/init.d/certmaster elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --del certmasterd /sbin/chkconfig --del certmaster else - rm -f /etc/rc.d/rc?.d/???certmasterd rm -f /etc/rc.d/rc?.d/???certmaster fi fi %changelog -* Tue Feb 26 2008 Michael DeHaan - 0.18-1 -- bump for Fedora submission +* Fri Mar 07 2008 Michael DeHaan - 0.18-1 +- release bump + +* Mon Feb 25 2008 Adrian Likins - 0.1-1 +- remove certmasterd references * Thu Feb 7 2008 Michael DeHaan - 0.1-1 - initial version, split off from func project, WIP Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Feb 2008 19:14:39 -0000 1.2 +++ sources 7 Mar 2008 20:13:31 -0000 1.3 @@ -1 +1 @@ -8de40bf96f91dfa260246bafbeeb014f certmaster-0.18.tar.gz +d661004b7eb0c7b43f57f0a510232bd2 certmaster-0.18.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 20:14:10 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:14:10 GMT Subject: rpms/certmaster/F-7 certmaster.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200803072014.m27KEA0V003893@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/certmaster/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3704/F-7 Modified Files: certmaster.spec sources Log Message: This is 0.18 Index: certmaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-7/certmaster.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- certmaster.spec 27 Feb 2008 19:20:15 -0000 1.1 +++ certmaster.spec 7 Mar 2008 20:13:37 -0000 1.2 @@ -74,11 +74,9 @@ %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then - /usr/lib/lsb/install_initd /etc/init.d/certmasterd /usr/lib/lsb/install_initd /etc/init.d/certmaster # for red hat distros elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --add certmasterd /sbin/chkconfig --add certmaster # or, the old fashioned way else @@ -93,24 +91,23 @@ %preun if [ "$1" = 0 ] ; then - /etc/init.d/certmasterd stop > /dev/null 2>&1 /etc/init.d/certmaster stop > /dev/null 2>&1 if [ -x /usr/lib/lsb/remove_initd ]; then - /usr/lib/lsb/remove_initd /etc/init.d/certmasterd /usr/lib/lsb/remove_initd /etc/init.d/certmaster elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --del certmasterd /sbin/chkconfig --del certmaster else - rm -f /etc/rc.d/rc?.d/???certmasterd rm -f /etc/rc.d/rc?.d/???certmaster fi fi %changelog -* Tue Feb 26 2008 Michael DeHaan - 0.18-1 -- bump for Fedora submission +* Fri Mar 07 2008 Michael DeHaan - 0.18-1 +- release bump + +* Mon Feb 25 2008 Adrian Likins - 0.1-1 +- remove certmasterd references * Thu Feb 7 2008 Michael DeHaan - 0.1-1 - initial version, split off from func project, WIP Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Feb 2008 19:14:44 -0000 1.2 +++ sources 7 Mar 2008 20:13:37 -0000 1.3 @@ -1 +1 @@ -8de40bf96f91dfa260246bafbeeb014f certmaster-0.18.tar.gz +d661004b7eb0c7b43f57f0a510232bd2 certmaster-0.18.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 20:14:15 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:14:15 GMT Subject: rpms/certmaster/F-8 certmaster.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200803072014.m27KEFsU003897@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/certmaster/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3704/F-8 Modified Files: certmaster.spec sources Log Message: This is 0.18 Index: certmaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-8/certmaster.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- certmaster.spec 27 Feb 2008 19:20:25 -0000 1.1 +++ certmaster.spec 7 Mar 2008 20:13:41 -0000 1.2 @@ -74,11 +74,9 @@ %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then - /usr/lib/lsb/install_initd /etc/init.d/certmasterd /usr/lib/lsb/install_initd /etc/init.d/certmaster # for red hat distros elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --add certmasterd /sbin/chkconfig --add certmaster # or, the old fashioned way else @@ -93,24 +91,23 @@ %preun if [ "$1" = 0 ] ; then - /etc/init.d/certmasterd stop > /dev/null 2>&1 /etc/init.d/certmaster stop > /dev/null 2>&1 if [ -x /usr/lib/lsb/remove_initd ]; then - /usr/lib/lsb/remove_initd /etc/init.d/certmasterd /usr/lib/lsb/remove_initd /etc/init.d/certmaster elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --del certmasterd /sbin/chkconfig --del certmaster else - rm -f /etc/rc.d/rc?.d/???certmasterd rm -f /etc/rc.d/rc?.d/???certmaster fi fi %changelog -* Tue Feb 26 2008 Michael DeHaan - 0.18-1 -- bump for Fedora submission +* Fri Mar 07 2008 Michael DeHaan - 0.18-1 +- release bump + +* Mon Feb 25 2008 Adrian Likins - 0.1-1 +- remove certmasterd references * Thu Feb 7 2008 Michael DeHaan - 0.1-1 - initial version, split off from func project, WIP Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Feb 2008 19:14:54 -0000 1.2 +++ sources 7 Mar 2008 20:13:41 -0000 1.3 @@ -1 +1 @@ -8de40bf96f91dfa260246bafbeeb014f certmaster-0.18.tar.gz +d661004b7eb0c7b43f57f0a510232bd2 certmaster-0.18.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 20:14:19 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:14:19 GMT Subject: rpms/certmaster/devel certmaster.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200803072014.m27KEJdh003903@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/certmaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3704/devel Modified Files: certmaster.spec sources Log Message: This is 0.18 Index: certmaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/devel/certmaster.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- certmaster.spec 27 Feb 2008 19:20:30 -0000 1.1 +++ certmaster.spec 7 Mar 2008 20:13:45 -0000 1.2 @@ -74,11 +74,9 @@ %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then - /usr/lib/lsb/install_initd /etc/init.d/certmasterd /usr/lib/lsb/install_initd /etc/init.d/certmaster # for red hat distros elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --add certmasterd /sbin/chkconfig --add certmaster # or, the old fashioned way else @@ -93,24 +91,23 @@ %preun if [ "$1" = 0 ] ; then - /etc/init.d/certmasterd stop > /dev/null 2>&1 /etc/init.d/certmaster stop > /dev/null 2>&1 if [ -x /usr/lib/lsb/remove_initd ]; then - /usr/lib/lsb/remove_initd /etc/init.d/certmasterd /usr/lib/lsb/remove_initd /etc/init.d/certmaster elif [ -x /sbin/chkconfig ]; then - /sbin/chkconfig --del certmasterd /sbin/chkconfig --del certmaster else - rm -f /etc/rc.d/rc?.d/???certmasterd rm -f /etc/rc.d/rc?.d/???certmaster fi fi %changelog -* Tue Feb 26 2008 Michael DeHaan - 0.18-1 -- bump for Fedora submission +* Fri Mar 07 2008 Michael DeHaan - 0.18-1 +- release bump + +* Mon Feb 25 2008 Adrian Likins - 0.1-1 +- remove certmasterd references * Thu Feb 7 2008 Michael DeHaan - 0.1-1 - initial version, split off from func project, WIP Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Feb 2008 19:14:59 -0000 1.2 +++ sources 7 Mar 2008 20:13:45 -0000 1.3 @@ -1 +1 @@ -8de40bf96f91dfa260246bafbeeb014f certmaster-0.18.tar.gz +d661004b7eb0c7b43f57f0a510232bd2 certmaster-0.18.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 20:15:53 2008 From: fedora-extras-commits at redhat.com (Guenther Deschner (gd)) Date: Fri, 7 Mar 2008 20:15:53 GMT Subject: rpms/samba/devel samba-3.2.0pre2-cifs_spnego.diff, NONE, 1.1 samba.spec, 1.145, 1.146 Message-ID: <200803072015.m27KFr2T003984@cvs-int.fedora.redhat.com> Author: gd Update of /cvs/pkgs/rpms/samba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3949 Modified Files: samba.spec Added Files: samba-3.2.0pre2-cifs_spnego.diff Log Message: - Create separate packages for samba-winbind and samba-winbind-devel - Add cifs.spnego helper Guenther samba-3.2.0pre2-cifs_spnego.diff: --- NEW FILE samba-3.2.0pre2-cifs_spnego.diff --- commit 9eaaf17d30388ef9446fb18e69197baa699b7eac Author: G??nther Deschner Date: Thu Mar 6 19:47:28 2008 +0100 Fix the build of cifs.spnego. Guenther diff --git a/source/Makefile.in b/source/Makefile.in index 7dfa312..8ae62fa 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1326,7 +1326,7 @@ bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ -bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ +bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) \ -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ0) $(KRB5LIBS) \ Index: samba.spec =================================================================== RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- samba.spec 5 Mar 2008 21:26:26 -0000 1.145 +++ samba.spec 7 Mar 2008 20:15:10 -0000 1.146 @@ -6,7 +6,7 @@ Name: samba Epoch: 0 Version: 3.2.0 -Release: 1.pre2.5%{?dist} +Release: 1.pre2.6%{?dist} License: GPLv3+ and LGPLv3+ Group: System Environment/Daemons URL: http://www.samba.org/ @@ -48,6 +48,7 @@ patch202: samba-3.2.0pre1-buildfix.patch Patch203: samba-3.2.0pre2-build_fixes.patch Patch204: samba-3.2.0pre2-libnetapi_fix.diff +Patch205: samba-3.2.0pre2-cifs_spnego.diff Requires(pre): samba-common = %{epoch}:%{version}-%{release} Requires: pam >= 0:0.64 @@ -101,6 +102,29 @@ packages of Samba. +%package winbind +Summary: Samba winbind +Group: Applications/System +Requires: samba-common = %{epoch}:%{version}-%{release} +Requires(pre): /usr/sbin/groupadd +Requires(post): /sbin/chkconfig, /sbin/service, coreutils +Requires(preun): /sbin/chkconfig, /sbin/service + +%description winbind +The samba-winbind package provides the winbind daemon, a NSS library, a PAM +module and some client tools. Winbind enables Linux to be a full member in +Windows domains and to use Windows user and group accounts on Linux. + + +%package winbind-devel +Summary: Developer tools for the winbind library +Group: Development +Requires: samba-winbind = %{epoch}:%{version}-%{release} + +%description winbind-devel +The samba-winbind package provides developer tools for the wbclient library. + + %package swat Summary: The Samba SMB server Web configuration program Group: Applications/System @@ -138,6 +162,7 @@ %description -n libsmbclient The libsmbclient contains the SMB client library from the Samba suite. + %package -n libsmbclient-devel Summary: Developer tools for the SMB client library Group: Development @@ -147,6 +172,7 @@ The libsmbclient-devel package contains the header files and libraries needed to develop programs that link against the SMB client library in the Samba suite. + %package -n libtdb Summary: The TDB library and tools Group: Applications/System @@ -155,6 +181,7 @@ %description -n libtdb The TDB library from the Samba suite. + %package -n tdb-tools Summary: The TDB tools Group: Applications/System @@ -164,6 +191,7 @@ %description -n tdb-tools Some TDB tools from the Samba suite. + %package -n libtdb-devel Summary: Developer tools for the TDB library Group: Development @@ -174,6 +202,7 @@ The libtdb-devel package contains the header files and libraries needed to develop programs that link against the TDB library in the Samba suite. + %package -n libtalloc Summary: The talloc library Group: Applications/System @@ -182,6 +211,7 @@ %description -n libtalloc The talloc library from the Samba suite. + %package -n libtalloc-devel Summary: Developer tools for the talloc library Group: Development @@ -222,6 +252,7 @@ #%patch200 -p0 -b .inotify # FIXME: does not compile %patch203 -p1 -b .build_fixes %patch204 -p1 -b .libnetapi +%patch205 -p1 -b .cifs_spnego mv source/VERSION source/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION @@ -272,7 +303,8 @@ --with-configdir=%{_sysconfdir}/samba \ --with-pammodulesdir=%{_lib}/security \ --with-swatdir=%{_datadir}/swat \ - --with-shared-modules=idmap_ad,idmap_rid + --with-shared-modules=idmap_ad,idmap_rid \ + --with-cifsspnego # --with-cluster-support \ # --with-aio-support \ @@ -290,7 +322,7 @@ -C lib/netapi/examples make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ - debug2html smbfilter + debug2html smbfilter bin/cifs.spnego ( cd client ; gcc -o mount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c ) ( cd client ; gcc -o umount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c ) @@ -417,6 +449,7 @@ install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs +install -m755 source/bin/cifs.spnego $RPM_BUILD_ROOT/sbin/cifs.spnego install -m 755 source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name} @@ -437,6 +470,7 @@ # why are these getting installed in the wrong place? rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs +rm -f $RPM_BUILD_ROOT%{_sbindir}/cifs.spnego %clean @@ -465,11 +499,17 @@ #%postun -%pre common +%pre winbind /usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || : -%post common +%post winbind /sbin/chkconfig --add winbind + +if [ "$1" -ge "1" ]; then + /sbin/service winbind condrestart >/dev/null 2>&1 || : +fi + +%post common /sbin/ldconfig # This script must be run always on installs or upgrades @@ -587,11 +627,7 @@ rm -f %{_sysconfdir}/samba/schannel_store.tdb fi -if [ "$1" -ge "1" ]; then - /sbin/service winbind condrestart >/dev/null 2>&1 || : -fi - -%preun common +%preun winbind if [ $1 = 0 ] ; then /sbin/service winbind stop >/dev/null 2>&1 || : /sbin/chkconfig --del winbind @@ -608,6 +644,18 @@ %postun -n libsmbclient /sbin/ldconfig +%post -n libtdb +/sbin/ldconfig + +%postun -n libtdb +/sbin/ldconfig + +%post -n libtalloc +/sbin/ldconfig + +%postun -n libtalloc +/sbin/ldconfig + %files %defattr(-,root,root) %{_sbindir}/smbd @@ -648,6 +696,7 @@ %defattr(-,root,root) /sbin/mount.cifs /sbin/umount.cifs +/sbin/cifs.spnego %{_bindir}/rpcclient %{_bindir}/smbcacls %{_bindir}/findsmb @@ -679,20 +728,12 @@ %{_libdir}/samba/valid.dat %{_libdir}/libnss_wins.so /%{_lib}/libnss_wins.so.2 -%{_libdir}/libnss_winbind.so -/%{_lib}/libnss_winbind.so.2 -/%{_lib}/security/pam_winbind.so %{_libdir}/libnetapi.so* -%{_libdir}/libwbclient.so* %{_includedir}/netapi.h -%{_includedir}/wbclient.h %{_libdir}/pkgconfig/netapi.pc -%{_libdir}/pkgconfig/wbclient.pc %{_bindir}/net %{_bindir}/testparm %{_bindir}/smbpasswd -%{_bindir}/wbinfo -%{_bindir}/ntlm_auth %{_bindir}/pdbedit %{_bindir}/profiles %{_bindir}/smbcquotas @@ -702,49 +743,61 @@ %{_bindir}/ldbedit %{_bindir}/ldbmodify %{_bindir}/ldbsearch -%{_sbindir}/winbindd -%{_libdir}/samba/idmap -%{_libdir}/samba/nss_info %dir /var/lib/samba %attr(700,root,root) %dir /var/lib/samba/private -%dir /var/run/winbindd -%attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged %dir /var/lib/samba/scripts %config(noreplace) %{_sysconfdir}/samba/smb.conf %config(noreplace) %{_sysconfdir}/samba/lmhosts %config(noreplace) %{_sysconfdir}/sysconfig/samba -%config(noreplace) %{_sysconfdir}/security/pam_winbind.conf %dir %{_sysconfdir}/samba %attr(0700,root,root) %dir /var/log/samba %attr(0700,root,root) %dir /var/log/samba/old -%{_initrddir}/winbind %{_mandir}/man1/ldbadd.1.* %{_mandir}/man1/ldbdel.1.* %{_mandir}/man1/ldbedit.1.* %{_mandir}/man1/ldbmodify.1.* %{_mandir}/man1/ldbsearch.1.* -%{_mandir}/man1/ntlm_auth.1* %{_mandir}/man1/profiles.1* %{_mandir}/man1/smbcquotas.1* %{_mandir}/man1/smbcontrol.1* -%{_mandir}/man1/wbinfo.1* #%{_mandir}/man1/vfstest.1* %{_mandir}/man1/testparm.1* %{_mandir}/man1/smbstatus.1* %{_mandir}/man5/smbpasswd.5* %{_mandir}/man5/smb.conf.5* %{_mandir}/man5/lmhosts.5* -%{_mandir}/man7/pam_winbind.7* -%{_mandir}/man7/libsmbclient.7* %{_mandir}/man8/smbpasswd.8* %{_mandir}/man8/pdbedit.8* %{_mandir}/man8/net.8* -%{_mandir}/man8/winbindd.8* -%{_mandir}/man8/idmap_*.8* %doc README COPYING Manifest %doc WHATSNEW.txt Roadmap +%files winbind +%{_bindir}/ntlm_auth +%{_bindir}/wbinfo +%{_libdir}/libnss_winbind.so +%{_libdir}/libwbclient.so.* +%{_libdir}/samba/idmap +%{_libdir}/samba/nss_info +/%{_lib}/libnss_winbind.so.2 +/%{_lib}/security/pam_winbind.so +%{_sbindir}/winbindd +%dir /var/run/winbindd +%attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged +%config(noreplace) %{_sysconfdir}/security/pam_winbind.conf +%{_initrddir}/winbind +%{_mandir}/man1/ntlm_auth.1* +%{_mandir}/man1/wbinfo.1* +%{_mandir}/man7/pam_winbind.7* +%{_mandir}/man8/winbindd.8* +%{_mandir}/man8/idmap_*.8* + +%files winbind-devel +%{_includedir}/wbclient.h +%{_libdir}/libwbclient.so +%{_libdir}/pkgconfig/wbclient.pc + %files doc %doc docs/REVISION docs/Samba3-Developers-Guide.pdf docs/Samba3-ByExample.pdf %doc docs/Samba3-HOWTO.pdf docs/THANKS docs/history @@ -761,6 +814,7 @@ %{_libdir}/libsmbsharemodes.so %{_libdir}/pkgconfig/smbclient.pc %{_libdir}/pkgconfig/smbsharemodes.pc +%{_mandir}/man7/libsmbclient.7* %files -n libtalloc %{_libdir}/libtalloc.so.* @@ -794,7 +848,11 @@ %{_datadir}/pixmaps/samba/logo-small.png %changelog -* Wed Mar 05 2008 Guenther Deschner - 3.2.0-1pre2.3 +* Thu Mar 06 2008 Guenther Deschner - 3.2.0-1.pre2.6 +- Create separate packages for samba-winbind and samba-winbind-devel +- Add cifs.spnego helper + +* Wed Mar 05 2008 Guenther Deschner - 3.2.0-1.pre2.3 - Update to 3.2.0pre2 - Add talloc and tdb lib and devel packages - Add domainjoin-gui package From fedora-extras-commits at redhat.com Fri Mar 7 20:17:27 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:17:27 GMT Subject: rpms/certmaster/EL-4 .cvsignore, 1.2, 1.3 certmaster.spec, 1.2, 1.3 sources, 1.3, 1.4 version, 1.1, 1.2 Message-ID: <200803072017.m27KHRNw004201@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/certmaster/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4086/EL-4 Modified Files: .cvsignore certmaster.spec sources version Log Message: 0.19. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Feb 2008 19:14:35 -0000 1.2 +++ .cvsignore 7 Mar 2008 20:16:48 -0000 1.3 @@ -1 +1,2 @@ certmaster-0.18.tar.gz +certmaster-0.19.tar.gz Index: certmaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-4/certmaster.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- certmaster.spec 7 Mar 2008 20:13:26 -0000 1.2 +++ certmaster.spec 7 Mar 2008 20:16:48 -0000 1.3 @@ -103,7 +103,7 @@ %changelog -* Fri Mar 07 2008 Michael DeHaan - 0.18-1 +* Fri Mar 07 2008 Michael DeHaan - 0.19-1 - release bump * Mon Feb 25 2008 Adrian Likins - 0.1-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2008 20:13:26 -0000 1.3 +++ sources 7 Mar 2008 20:16:48 -0000 1.4 @@ -1 +1,2 @@ d661004b7eb0c7b43f57f0a510232bd2 certmaster-0.18.tar.gz +4eaa9876b0c158dcf2f099b330f0eeb6 certmaster-0.19.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-4/version,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- version 27 Feb 2008 19:19:58 -0000 1.1 +++ version 7 Mar 2008 20:16:48 -0000 1.2 @@ -1 +1 @@ -0.18 1 +0.19 1 From fedora-extras-commits at redhat.com Fri Mar 7 20:17:31 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:17:31 GMT Subject: rpms/certmaster/EL-5 .cvsignore, 1.2, 1.3 certmaster.spec, 1.2, 1.3 sources, 1.3, 1.4 version, 1.1, 1.2 Message-ID: <200803072017.m27KHV5B004215@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/certmaster/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4086/EL-5 Modified Files: .cvsignore certmaster.spec sources version Log Message: 0.19. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Feb 2008 19:14:39 -0000 1.2 +++ .cvsignore 7 Mar 2008 20:16:57 -0000 1.3 @@ -1 +1,2 @@ certmaster-0.18.tar.gz +certmaster-0.19.tar.gz Index: certmaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-5/certmaster.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- certmaster.spec 7 Mar 2008 20:13:31 -0000 1.2 +++ certmaster.spec 7 Mar 2008 20:16:57 -0000 1.3 @@ -103,7 +103,7 @@ %changelog -* Fri Mar 07 2008 Michael DeHaan - 0.18-1 +* Fri Mar 07 2008 Michael DeHaan - 0.19-1 - release bump * Mon Feb 25 2008 Adrian Likins - 0.1-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2008 20:13:31 -0000 1.3 +++ sources 7 Mar 2008 20:16:57 -0000 1.4 @@ -1 +1,2 @@ d661004b7eb0c7b43f57f0a510232bd2 certmaster-0.18.tar.gz +4eaa9876b0c158dcf2f099b330f0eeb6 certmaster-0.19.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/EL-5/version,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- version 27 Feb 2008 19:20:10 -0000 1.1 +++ version 7 Mar 2008 20:16:57 -0000 1.2 @@ -1 +1 @@ -0.18 1 +0.19 1 From fedora-extras-commits at redhat.com Fri Mar 7 20:17:41 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:17:41 GMT Subject: rpms/certmaster/F-7 .cvsignore, 1.2, 1.3 certmaster.spec, 1.2, 1.3 sources, 1.3, 1.4 version, 1.1, 1.2 Message-ID: <200803072017.m27KHfm7004227@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/certmaster/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4086/F-7 Modified Files: .cvsignore certmaster.spec sources version Log Message: 0.19. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Feb 2008 19:14:44 -0000 1.2 +++ .cvsignore 7 Mar 2008 20:17:01 -0000 1.3 @@ -1 +1,2 @@ certmaster-0.18.tar.gz +certmaster-0.19.tar.gz Index: certmaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-7/certmaster.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- certmaster.spec 7 Mar 2008 20:13:37 -0000 1.2 +++ certmaster.spec 7 Mar 2008 20:17:01 -0000 1.3 @@ -103,7 +103,7 @@ %changelog -* Fri Mar 07 2008 Michael DeHaan - 0.18-1 +* Fri Mar 07 2008 Michael DeHaan - 0.19-1 - release bump * Mon Feb 25 2008 Adrian Likins - 0.1-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-7/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2008 20:13:37 -0000 1.3 +++ sources 7 Mar 2008 20:17:01 -0000 1.4 @@ -1 +1,2 @@ d661004b7eb0c7b43f57f0a510232bd2 certmaster-0.18.tar.gz +4eaa9876b0c158dcf2f099b330f0eeb6 certmaster-0.19.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-7/version,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- version 27 Feb 2008 19:20:15 -0000 1.1 +++ version 7 Mar 2008 20:17:01 -0000 1.2 @@ -1 +1 @@ -0.18 1 +0.19 1 From fedora-extras-commits at redhat.com Fri Mar 7 20:17:44 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:17:44 GMT Subject: rpms/certmaster/F-8 .cvsignore, 1.2, 1.3 certmaster.spec, 1.2, 1.3 sources, 1.3, 1.4 version, 1.1, 1.2 Message-ID: <200803072017.m27KHirL004239@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/certmaster/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4086/F-8 Modified Files: .cvsignore certmaster.spec sources version Log Message: 0.19. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Feb 2008 19:14:54 -0000 1.2 +++ .cvsignore 7 Mar 2008 20:17:11 -0000 1.3 @@ -1 +1,2 @@ certmaster-0.18.tar.gz +certmaster-0.19.tar.gz Index: certmaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-8/certmaster.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- certmaster.spec 7 Mar 2008 20:13:41 -0000 1.2 +++ certmaster.spec 7 Mar 2008 20:17:11 -0000 1.3 @@ -103,7 +103,7 @@ %changelog -* Fri Mar 07 2008 Michael DeHaan - 0.18-1 +* Fri Mar 07 2008 Michael DeHaan - 0.19-1 - release bump * Mon Feb 25 2008 Adrian Likins - 0.1-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2008 20:13:41 -0000 1.3 +++ sources 7 Mar 2008 20:17:11 -0000 1.4 @@ -1 +1,2 @@ d661004b7eb0c7b43f57f0a510232bd2 certmaster-0.18.tar.gz +4eaa9876b0c158dcf2f099b330f0eeb6 certmaster-0.19.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/F-8/version,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- version 27 Feb 2008 19:20:25 -0000 1.1 +++ version 7 Mar 2008 20:17:11 -0000 1.2 @@ -1 +1 @@ -0.18 1 +0.19 1 From fedora-extras-commits at redhat.com Fri Mar 7 20:17:54 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:17:54 GMT Subject: rpms/certmaster/devel .cvsignore, 1.2, 1.3 certmaster.spec, 1.2, 1.3 sources, 1.3, 1.4 version, 1.1, 1.2 Message-ID: <200803072017.m27KHsQp004254@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/certmaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4086/devel Modified Files: .cvsignore certmaster.spec sources version Log Message: 0.19. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Feb 2008 19:14:59 -0000 1.2 +++ .cvsignore 7 Mar 2008 20:17:15 -0000 1.3 @@ -1 +1,2 @@ certmaster-0.18.tar.gz +certmaster-0.19.tar.gz Index: certmaster.spec =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/devel/certmaster.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- certmaster.spec 7 Mar 2008 20:13:45 -0000 1.2 +++ certmaster.spec 7 Mar 2008 20:17:15 -0000 1.3 @@ -103,7 +103,7 @@ %changelog -* Fri Mar 07 2008 Michael DeHaan - 0.18-1 +* Fri Mar 07 2008 Michael DeHaan - 0.19-1 - release bump * Mon Feb 25 2008 Adrian Likins - 0.1-1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2008 20:13:45 -0000 1.3 +++ sources 7 Mar 2008 20:17:15 -0000 1.4 @@ -1 +1,2 @@ d661004b7eb0c7b43f57f0a510232bd2 certmaster-0.18.tar.gz +4eaa9876b0c158dcf2f099b330f0eeb6 certmaster-0.19.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/certmaster/devel/version,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- version 27 Feb 2008 19:20:30 -0000 1.1 +++ version 7 Mar 2008 20:17:15 -0000 1.2 @@ -1 +1 @@ -0.18 1 +0.19 1 From fedora-extras-commits at redhat.com Fri Mar 7 20:19:37 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Fri, 7 Mar 2008 20:19:37 GMT Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec,1.9,1.10 Message-ID: <200803072019.m27KJbLj004583@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/gnome-web-photo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4473 Modified Files: gnome-web-photo.spec Log Message: Add dep on unstable, and on libtool and gnome-common for autoreconf Index: gnome-web-photo.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnome-web-photo.spec 7 Mar 2008 17:58:06 -0000 1.9 +++ gnome-web-photo.spec 7 Mar 2008 20:18:59 -0000 1.10 @@ -17,9 +17,11 @@ BuildRequires: libxml2-devel BuildRequires: gnome-vfs2-devel #BuildRequires: gecko-devel >= 1.8 -BuildRequires: gecko-devel = %{gecko_version} +BuildRequires: gecko-devel-unstable = %{gecko_version} BuildRequires: libjpeg-devel BuildRequires: gettext perl(XML::Parser) +# Required for the xulrunner patch +BuildRequires: libtool gnome-common Patch0: xulrunner19.patch From fedora-extras-commits at redhat.com Fri Mar 7 20:19:59 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:19:59 GMT Subject: rpms/func/EL-4 .cvsignore, 1.5, 1.6 func.spec, 1.4, 1.5 sources, 1.5, 1.6 version, 1.4, 1.5 Message-ID: <200803072019.m27KJxSH004670@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4535/EL-4 Modified Files: .cvsignore func.spec sources version Log Message: This is 0.18 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Feb 2008 20:26:20 -0000 1.5 +++ .cvsignore 7 Mar 2008 20:19:23 -0000 1.6 @@ -2,3 +2,4 @@ func-0.14.tar.gz func-0.16.tar.gz func-0.17.tar.gz +func-0.18.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-4/func.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- func.spec 8 Feb 2008 20:26:20 -0000 1.4 +++ func.spec 7 Mar 2008 20:19:23 -0000 1.5 @@ -3,7 +3,7 @@ %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) -Summary: Remote config, monitoring, and management api +Summary: Remote management framework Name: func Source1: version Version: %(echo `awk '{ print $1 }' %{SOURCE1}`) @@ -13,6 +13,7 @@ Group: Applications/System Requires: python >= 2.3 Requires: pyOpenSSL +Requires: certmaster >= 0.1 BuildRequires: python-devel %if %is_suse BuildRequires: gettext-devel @@ -29,7 +30,7 @@ %description -func is a remote api for mangement, configation, and monitoring of systems. +func is a remote api for mangement, configuration, and monitoring of systems. %prep %setup -q @@ -51,18 +52,14 @@ %endif %{_bindir}/funcd %{_bindir}/func -%{_bindir}/certmaster -%{_bindir}/certmaster-ca %{_bindir}/func-inventory %{_bindir}/func-create-module +#%{_bindir}/update-func /etc/init.d/funcd -/etc/init.d/certmaster %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/minion-acl.d/ -%dir %{_sysconfdir}/pki/%{name} %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf -%config(noreplace) /etc/func/certmaster.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -83,55 +80,52 @@ %dir /var/log/func %dir /var/lib/func -%dir /var/lib/func/certmaster %doc AUTHORS README LICENSE %{_mandir}/man1/func.1.gz %{_mandir}/man1/func-inventory.1.gz %{_mandir}/man1/funcd.1.gz -%{_mandir}/man1/certmaster.1.gz -%{_mandir}/man1/certmaster-ca.1.gz %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then /usr/lib/lsb/install_initd /etc/init.d/funcd - /usr/lib/lsb/install_initd /etc/init.d/certmaster # for red hat distros elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add funcd - /sbin/chkconfig --add certmaster # or, the old fashioned way else for i in 2 3 4 5; do ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd - ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster done for i in 1 6; do ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd - ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster done fi + +# upgrade old installs if needed +#/usr/bin/update-func + exit 0 %preun if [ "$1" = 0 ] ; then /etc/init.d/funcd stop > /dev/null 2>&1 - /etc/init.d/certmaster stop > /dev/null 2>&1 if [ -x /usr/lib/lsb/remove_initd ]; then /usr/lib/lsb/remove_initd /etc/init.d/funcd - /usr/lib/lsb/remove_initd /etc/init.d/certmaster elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del funcd - /sbin/chkconfig --del certmaster else rm -f /etc/rc.d/rc?.d/???funcd - rm -f /etc/rc.d/rc?.d/???certmaster fi fi + %changelog +* Mon Mar 03 2008 Adrian Likins - 0.18-1 +- split off certmaster + * Fri Feb 8 2008 Michael DeHaan - 0.17-1 - bugfix release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Feb 2008 20:26:20 -0000 1.5 +++ sources 7 Mar 2008 20:19:23 -0000 1.6 @@ -1,2 +1,3 @@ 8e49dac6869cb562425b22d642e4e3a9 func-0.16.tar.gz 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz +def199858286218daef908e871f2e7ca func-0.18.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-4/version,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- version 8 Feb 2008 20:26:20 -0000 1.4 +++ version 7 Mar 2008 20:19:23 -0000 1.5 @@ -1 +1 @@ -0.17 1 +0.18 1 From fedora-extras-commits at redhat.com Fri Mar 7 20:20:05 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:20:05 GMT Subject: rpms/func/EL-5 .cvsignore, 1.5, 1.6 func.spec, 1.4, 1.5 sources, 1.5, 1.6 version, 1.4, 1.5 Message-ID: <200803072020.m27KK5ws004682@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4535/EL-5 Modified Files: .cvsignore func.spec sources version Log Message: This is 0.18 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Feb 2008 20:26:30 -0000 1.5 +++ .cvsignore 7 Mar 2008 20:19:29 -0000 1.6 @@ -2,3 +2,4 @@ func-0.14.tar.gz func-0.16.tar.gz func-0.17.tar.gz +func-0.18.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-5/func.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- func.spec 8 Feb 2008 20:26:30 -0000 1.4 +++ func.spec 7 Mar 2008 20:19:29 -0000 1.5 @@ -3,7 +3,7 @@ %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) -Summary: Remote config, monitoring, and management api +Summary: Remote management framework Name: func Source1: version Version: %(echo `awk '{ print $1 }' %{SOURCE1}`) @@ -13,6 +13,7 @@ Group: Applications/System Requires: python >= 2.3 Requires: pyOpenSSL +Requires: certmaster >= 0.1 BuildRequires: python-devel %if %is_suse BuildRequires: gettext-devel @@ -29,7 +30,7 @@ %description -func is a remote api for mangement, configation, and monitoring of systems. +func is a remote api for mangement, configuration, and monitoring of systems. %prep %setup -q @@ -51,18 +52,14 @@ %endif %{_bindir}/funcd %{_bindir}/func -%{_bindir}/certmaster -%{_bindir}/certmaster-ca %{_bindir}/func-inventory %{_bindir}/func-create-module +#%{_bindir}/update-func /etc/init.d/funcd -/etc/init.d/certmaster %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/minion-acl.d/ -%dir %{_sysconfdir}/pki/%{name} %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf -%config(noreplace) /etc/func/certmaster.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -83,55 +80,52 @@ %dir /var/log/func %dir /var/lib/func -%dir /var/lib/func/certmaster %doc AUTHORS README LICENSE %{_mandir}/man1/func.1.gz %{_mandir}/man1/func-inventory.1.gz %{_mandir}/man1/funcd.1.gz -%{_mandir}/man1/certmaster.1.gz -%{_mandir}/man1/certmaster-ca.1.gz %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then /usr/lib/lsb/install_initd /etc/init.d/funcd - /usr/lib/lsb/install_initd /etc/init.d/certmaster # for red hat distros elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add funcd - /sbin/chkconfig --add certmaster # or, the old fashioned way else for i in 2 3 4 5; do ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd - ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster done for i in 1 6; do ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd - ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster done fi + +# upgrade old installs if needed +#/usr/bin/update-func + exit 0 %preun if [ "$1" = 0 ] ; then /etc/init.d/funcd stop > /dev/null 2>&1 - /etc/init.d/certmaster stop > /dev/null 2>&1 if [ -x /usr/lib/lsb/remove_initd ]; then /usr/lib/lsb/remove_initd /etc/init.d/funcd - /usr/lib/lsb/remove_initd /etc/init.d/certmaster elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del funcd - /sbin/chkconfig --del certmaster else rm -f /etc/rc.d/rc?.d/???funcd - rm -f /etc/rc.d/rc?.d/???certmaster fi fi + %changelog +* Mon Mar 03 2008 Adrian Likins - 0.18-1 +- split off certmaster + * Fri Feb 8 2008 Michael DeHaan - 0.17-1 - bugfix release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Feb 2008 20:26:30 -0000 1.5 +++ sources 7 Mar 2008 20:19:29 -0000 1.6 @@ -1,2 +1,3 @@ 8e49dac6869cb562425b22d642e4e3a9 func-0.16.tar.gz 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz +def199858286218daef908e871f2e7ca func-0.18.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/EL-5/version,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- version 8 Feb 2008 20:26:30 -0000 1.4 +++ version 7 Mar 2008 20:19:29 -0000 1.5 @@ -1 +1 @@ -0.17 1 +0.18 1 From fedora-extras-commits at redhat.com Fri Mar 7 20:20:11 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:20:11 GMT Subject: rpms/func/F-7 .cvsignore, 1.5, 1.6 func.spec, 1.4, 1.5 sources, 1.5, 1.6 version, 1.4, 1.5 Message-ID: <200803072020.m27KKBws004697@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4535/F-7 Modified Files: .cvsignore func.spec sources version Log Message: This is 0.18 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/F-7/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Feb 2008 20:26:36 -0000 1.5 +++ .cvsignore 7 Mar 2008 20:19:35 -0000 1.6 @@ -2,3 +2,4 @@ func-0.14.tar.gz func-0.16.tar.gz func-0.17.tar.gz +func-0.18.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/F-7/func.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- func.spec 8 Feb 2008 20:26:36 -0000 1.4 +++ func.spec 7 Mar 2008 20:19:35 -0000 1.5 @@ -3,7 +3,7 @@ %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) -Summary: Remote config, monitoring, and management api +Summary: Remote management framework Name: func Source1: version Version: %(echo `awk '{ print $1 }' %{SOURCE1}`) @@ -13,6 +13,7 @@ Group: Applications/System Requires: python >= 2.3 Requires: pyOpenSSL +Requires: certmaster >= 0.1 BuildRequires: python-devel %if %is_suse BuildRequires: gettext-devel @@ -29,7 +30,7 @@ %description -func is a remote api for mangement, configation, and monitoring of systems. +func is a remote api for mangement, configuration, and monitoring of systems. %prep %setup -q @@ -51,18 +52,14 @@ %endif %{_bindir}/funcd %{_bindir}/func -%{_bindir}/certmaster -%{_bindir}/certmaster-ca %{_bindir}/func-inventory %{_bindir}/func-create-module +#%{_bindir}/update-func /etc/init.d/funcd -/etc/init.d/certmaster %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/minion-acl.d/ -%dir %{_sysconfdir}/pki/%{name} %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf -%config(noreplace) /etc/func/certmaster.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -83,55 +80,52 @@ %dir /var/log/func %dir /var/lib/func -%dir /var/lib/func/certmaster %doc AUTHORS README LICENSE %{_mandir}/man1/func.1.gz %{_mandir}/man1/func-inventory.1.gz %{_mandir}/man1/funcd.1.gz -%{_mandir}/man1/certmaster.1.gz -%{_mandir}/man1/certmaster-ca.1.gz %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then /usr/lib/lsb/install_initd /etc/init.d/funcd - /usr/lib/lsb/install_initd /etc/init.d/certmaster # for red hat distros elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add funcd - /sbin/chkconfig --add certmaster # or, the old fashioned way else for i in 2 3 4 5; do ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd - ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster done for i in 1 6; do ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd - ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster done fi + +# upgrade old installs if needed +#/usr/bin/update-func + exit 0 %preun if [ "$1" = 0 ] ; then /etc/init.d/funcd stop > /dev/null 2>&1 - /etc/init.d/certmaster stop > /dev/null 2>&1 if [ -x /usr/lib/lsb/remove_initd ]; then /usr/lib/lsb/remove_initd /etc/init.d/funcd - /usr/lib/lsb/remove_initd /etc/init.d/certmaster elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del funcd - /sbin/chkconfig --del certmaster else rm -f /etc/rc.d/rc?.d/???funcd - rm -f /etc/rc.d/rc?.d/???certmaster fi fi + %changelog +* Mon Mar 03 2008 Adrian Likins - 0.18-1 +- split off certmaster + * Fri Feb 8 2008 Michael DeHaan - 0.17-1 - bugfix release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/F-7/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Feb 2008 20:26:36 -0000 1.5 +++ sources 7 Mar 2008 20:19:35 -0000 1.6 @@ -1,2 +1,3 @@ 8e49dac6869cb562425b22d642e4e3a9 func-0.16.tar.gz 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz +def199858286218daef908e871f2e7ca func-0.18.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/F-7/version,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- version 8 Feb 2008 20:26:36 -0000 1.4 +++ version 7 Mar 2008 20:19:35 -0000 1.5 @@ -1 +1 @@ -0.17 1 +0.18 1 From fedora-extras-commits at redhat.com Fri Mar 7 20:20:21 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:20:21 GMT Subject: rpms/func/F-8 .cvsignore, 1.5, 1.6 func.spec, 1.4, 1.5 sources, 1.5, 1.6 version, 1.4, 1.5 Message-ID: <200803072020.m27KKL9O004714@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4535/F-8 Modified Files: .cvsignore func.spec sources version Log Message: This is 0.18 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Feb 2008 20:26:47 -0000 1.5 +++ .cvsignore 7 Mar 2008 20:19:41 -0000 1.6 @@ -2,3 +2,4 @@ func-0.14.tar.gz func-0.16.tar.gz func-0.17.tar.gz +func-0.18.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/F-8/func.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- func.spec 8 Feb 2008 20:26:47 -0000 1.4 +++ func.spec 7 Mar 2008 20:19:41 -0000 1.5 @@ -3,7 +3,7 @@ %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) -Summary: Remote config, monitoring, and management api +Summary: Remote management framework Name: func Source1: version Version: %(echo `awk '{ print $1 }' %{SOURCE1}`) @@ -13,6 +13,7 @@ Group: Applications/System Requires: python >= 2.3 Requires: pyOpenSSL +Requires: certmaster >= 0.1 BuildRequires: python-devel %if %is_suse BuildRequires: gettext-devel @@ -29,7 +30,7 @@ %description -func is a remote api for mangement, configation, and monitoring of systems. +func is a remote api for mangement, configuration, and monitoring of systems. %prep %setup -q @@ -51,18 +52,14 @@ %endif %{_bindir}/funcd %{_bindir}/func -%{_bindir}/certmaster -%{_bindir}/certmaster-ca %{_bindir}/func-inventory %{_bindir}/func-create-module +#%{_bindir}/update-func /etc/init.d/funcd -/etc/init.d/certmaster %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/minion-acl.d/ -%dir %{_sysconfdir}/pki/%{name} %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf -%config(noreplace) /etc/func/certmaster.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -83,55 +80,52 @@ %dir /var/log/func %dir /var/lib/func -%dir /var/lib/func/certmaster %doc AUTHORS README LICENSE %{_mandir}/man1/func.1.gz %{_mandir}/man1/func-inventory.1.gz %{_mandir}/man1/funcd.1.gz -%{_mandir}/man1/certmaster.1.gz -%{_mandir}/man1/certmaster-ca.1.gz %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then /usr/lib/lsb/install_initd /etc/init.d/funcd - /usr/lib/lsb/install_initd /etc/init.d/certmaster # for red hat distros elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add funcd - /sbin/chkconfig --add certmaster # or, the old fashioned way else for i in 2 3 4 5; do ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd - ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster done for i in 1 6; do ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd - ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster done fi + +# upgrade old installs if needed +#/usr/bin/update-func + exit 0 %preun if [ "$1" = 0 ] ; then /etc/init.d/funcd stop > /dev/null 2>&1 - /etc/init.d/certmaster stop > /dev/null 2>&1 if [ -x /usr/lib/lsb/remove_initd ]; then /usr/lib/lsb/remove_initd /etc/init.d/funcd - /usr/lib/lsb/remove_initd /etc/init.d/certmaster elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del funcd - /sbin/chkconfig --del certmaster else rm -f /etc/rc.d/rc?.d/???funcd - rm -f /etc/rc.d/rc?.d/???certmaster fi fi + %changelog +* Mon Mar 03 2008 Adrian Likins - 0.18-1 +- split off certmaster + * Fri Feb 8 2008 Michael DeHaan - 0.17-1 - bugfix release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Feb 2008 20:26:47 -0000 1.5 +++ sources 7 Mar 2008 20:19:41 -0000 1.6 @@ -1,2 +1,3 @@ 8e49dac6869cb562425b22d642e4e3a9 func-0.16.tar.gz 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz +def199858286218daef908e871f2e7ca func-0.18.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/F-8/version,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- version 8 Feb 2008 20:26:47 -0000 1.4 +++ version 7 Mar 2008 20:19:41 -0000 1.5 @@ -1 +1 @@ -0.17 1 +0.18 1 From fedora-extras-commits at redhat.com Fri Mar 7 20:20:26 2008 From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan)) Date: Fri, 7 Mar 2008 20:20:26 GMT Subject: rpms/func/devel .cvsignore, 1.5, 1.6 func.spec, 1.6, 1.7 sources, 1.6, 1.7 version, 1.5, 1.6 Message-ID: <200803072020.m27KKQfq004720@cvs-int.fedora.redhat.com> Author: mdehaan Update of /cvs/pkgs/rpms/func/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4535/devel Modified Files: .cvsignore func.spec sources version Log Message: This is 0.18 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/func/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Feb 2008 20:27:01 -0000 1.5 +++ .cvsignore 7 Mar 2008 20:19:51 -0000 1.6 @@ -2,3 +2,4 @@ func-0.14.tar.gz func-0.16.tar.gz func-0.17.tar.gz +func-0.18.tar.gz Index: func.spec =================================================================== RCS file: /cvs/pkgs/rpms/func/devel/func.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- func.spec 8 Feb 2008 20:27:01 -0000 1.6 +++ func.spec 7 Mar 2008 20:19:51 -0000 1.7 @@ -3,7 +3,7 @@ %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) -Summary: Remote config, monitoring, and management api +Summary: Remote management framework Name: func Source1: version Version: %(echo `awk '{ print $1 }' %{SOURCE1}`) @@ -13,6 +13,7 @@ Group: Applications/System Requires: python >= 2.3 Requires: pyOpenSSL +Requires: certmaster >= 0.1 BuildRequires: python-devel %if %is_suse BuildRequires: gettext-devel @@ -29,7 +30,7 @@ %description -func is a remote api for mangement, configation, and monitoring of systems. +func is a remote api for mangement, configuration, and monitoring of systems. %prep %setup -q @@ -51,18 +52,14 @@ %endif %{_bindir}/funcd %{_bindir}/func -%{_bindir}/certmaster -%{_bindir}/certmaster-ca %{_bindir}/func-inventory %{_bindir}/func-create-module +#%{_bindir}/update-func /etc/init.d/funcd -/etc/init.d/certmaster %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/minion-acl.d/ -%dir %{_sysconfdir}/pki/%{name} %dir /etc/func/modules/ %config(noreplace) /etc/func/minion.conf -%config(noreplace) /etc/func/certmaster.conf %config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion @@ -83,55 +80,52 @@ %dir /var/log/func %dir /var/lib/func -%dir /var/lib/func/certmaster %doc AUTHORS README LICENSE %{_mandir}/man1/func.1.gz %{_mandir}/man1/func-inventory.1.gz %{_mandir}/man1/funcd.1.gz -%{_mandir}/man1/certmaster.1.gz -%{_mandir}/man1/certmaster-ca.1.gz %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then /usr/lib/lsb/install_initd /etc/init.d/funcd - /usr/lib/lsb/install_initd /etc/init.d/certmaster # for red hat distros elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add funcd - /sbin/chkconfig --add certmaster # or, the old fashioned way else for i in 2 3 4 5; do ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd - ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster done for i in 1 6; do ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd - ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster done fi + +# upgrade old installs if needed +#/usr/bin/update-func + exit 0 %preun if [ "$1" = 0 ] ; then /etc/init.d/funcd stop > /dev/null 2>&1 - /etc/init.d/certmaster stop > /dev/null 2>&1 if [ -x /usr/lib/lsb/remove_initd ]; then /usr/lib/lsb/remove_initd /etc/init.d/funcd - /usr/lib/lsb/remove_initd /etc/init.d/certmaster elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del funcd - /sbin/chkconfig --del certmaster else rm -f /etc/rc.d/rc?.d/???funcd - rm -f /etc/rc.d/rc?.d/???certmaster fi fi + %changelog +* Mon Mar 03 2008 Adrian Likins - 0.18-1 +- split off certmaster + * Fri Feb 8 2008 Michael DeHaan - 0.17-1 - bugfix release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/func/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Feb 2008 20:27:01 -0000 1.6 +++ sources 7 Mar 2008 20:19:51 -0000 1.7 @@ -1 +1,2 @@ 991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz +def199858286218daef908e871f2e7ca func-0.18.tar.gz Index: version =================================================================== RCS file: /cvs/pkgs/rpms/func/devel/version,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- version 8 Feb 2008 20:27:01 -0000 1.5 +++ version 7 Mar 2008 20:19:51 -0000 1.6 @@ -1 +1 @@ -0.17 1 +0.18 1 From fedora-extras-commits at redhat.com Fri Mar 7 20:21:13 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 7 Mar 2008 20:21:13 GMT Subject: rpms/bluez-gnome/devel .cvsignore, 1.18, 1.19 bluez-gnome.spec, 1.44, 1.45 sources, 1.18, 1.19 Message-ID: <200803072021.m27KLDGX004915@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4710 Modified Files: .cvsignore bluez-gnome.spec sources Log Message: * Fri Mar 07 2008 - Bastien Nocera - 0.24-1 - Update to 0.24 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 24 Feb 2008 19:13:42 -0000 1.18 +++ .cvsignore 7 Mar 2008 20:20:36 -0000 1.19 @@ -1 +1 @@ -bluez-gnome-0.23.tar.gz +bluez-gnome-0.24.tar.gz Index: bluez-gnome.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- bluez-gnome.spec 4 Mar 2008 14:05:05 -0000 1.44 +++ bluez-gnome.spec 7 Mar 2008 20:20:36 -0000 1.45 @@ -1,6 +1,6 @@ Name: bluez-gnome -Version: 0.23 -Release: 2%{?dist} +Version: 0.24 +Release: 1%{?dist} Summary: Bluetooth pairing and control applet Group: Applications/System @@ -21,7 +21,7 @@ Obsoletes: bluez-pin Provides: dbus-bluez-pin-helper -Requires: gvfs >= 0.1.9 +Requires: gvfs >= 0.1.11-2 Requires: obex-data-server Requires(post): shared-mime-info @@ -138,6 +138,9 @@ %{_datadir}/man/man1/bluetooth-analyzer.1.gz %changelog +* Fri Mar 07 2008 - Bastien Nocera - 0.24-1 +- Update to 0.24 + * Tue Mar 04 2008 - Bastien Nocera - 0.23-2 - Add dependency on a gvfs with ObexFTP support Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 24 Feb 2008 19:13:42 -0000 1.18 +++ sources 7 Mar 2008 20:20:36 -0000 1.19 @@ -1 +1 @@ -5544d8ff56de711445b4d178cea39c80 bluez-gnome-0.23.tar.gz +38c838524b960f8b408bfd1b66b14e2d bluez-gnome-0.24.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 20:36:39 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Fri, 7 Mar 2008 20:36:39 GMT Subject: rpms/system-switch-mail/devel system-switch-mail.spec,1.17,1.18 Message-ID: <200803072036.m27Kadls005246@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/system-switch-mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5226 Modified Files: system-switch-mail.spec Log Message: add missing man page Index: system-switch-mail.spec =================================================================== RCS file: /cvs/extras/rpms/system-switch-mail/devel/system-switch-mail.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- system-switch-mail.spec 7 Mar 2008 20:04:26 -0000 1.17 +++ system-switch-mail.spec 7 Mar 2008 20:36:06 -0000 1.18 @@ -65,6 +65,7 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name}/functions.py* %{_datadir}/%{name}/switchmail_tui.py* +%{_mandir}/man1/* %config(noreplace) /etc/pam.d/* %config(noreplace) /etc/security/console.apps/%{name}* From fedora-extras-commits at redhat.com Fri Mar 7 20:43:10 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 20:43:10 GMT Subject: rpms/perl-Math-Pari/devel Math-Pari-2.010709-perl510.patch, NONE, 1.1 perl-Math-Pari.spec, 1.11, 1.12 Message-ID: <200803072043.m27KhAfF005410@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Math-Pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5377 Modified Files: perl-Math-Pari.spec Added Files: Math-Pari-2.010709-perl510.patch Log Message: fix for perl 5.10 Math-Pari-2.010709-perl510.patch: --- NEW FILE Math-Pari-2.010709-perl510.patch --- diff -up Math-Pari-2.010709/Pari.xs.BAD Math-Pari-2.010709/Pari.xs --- Math-Pari-2.010709/Pari.xs.BAD 2008-03-07 15:22:21.000000000 -0500 +++ Math-Pari-2.010709/Pari.xs 2008-03-07 15:36:28.000000000 -0500 @@ -101,6 +101,35 @@ STRLEN n___a; frame on the entry into the function for which SV is the argument. */ +#define PARI_MAGIC_TYPE ((char)0336) +#define PARI_MAGIC_PRIVATE 0x2020 + +static IV* +PARI_SV_to_IVp(SV *const sv) +{ + MAGIC *mg; + for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) { + if (mg->mg_type == PARI_MAGIC_TYPE + && mg->mg_private == PARI_MAGIC_PRIVATE) + return (IV *) &mg->mg_ptr; + } + assert(0); + return NULL; +} + +#define SV_to_GEN_IV(tsv) \ + ((SvTYPE(tsv) == SVt_PVAV) ? *PARI_SV_to_IVp(tsv) : SvIV(tsv)) + +#if PERL_VERSION > 9 +/* 5.9.x and later assert that you're not using SvPVX() and SvCUR() on arrays, + so need a little more code to cheat round this. */ +# define ARRAY_POST_59(sv) (SvTYPE(sv) == SVt_PVAV) +# define AvARRAY_set(sv, val) AvARRAY(sv) = (val) +#else +# define ARRAY_POST_59(sv) 0 +# define AvARRAY_set(sv, val) /* This will never be called. */ +#endif + #define GENmovedOffStack ((char*) 1) /* Just an atom. */ #define GENfirstOnStack ((char*) 2) /* Just an atom. */ #define GENheap NULL @@ -158,8 +187,13 @@ realloc(void *mp, size_t nbytes) } \ if (isonstack(in)) { \ SV* g = SvRV(sv); \ - SvCUR(g) = oldavma - bot; \ - SvPVX(g) = (char*)PariStack; \ + if(ARRAY_POST_59(g)) { \ + AvFILLp(g) = oldavma - bot; \ + AvARRAY_set(g, (SV**)PariStack); \ + } else { \ + SvCUR(g) = oldavma - bot; \ + SvPVX(g) = (char*)PariStack; \ + } \ PariStack = g; \ perlavma = avma; \ onStack_inc; \ @@ -246,10 +280,16 @@ make_PariAV(SV *sv) #endif SV *newsub = newRV_noinc((SV*)av); /* cannot use sv, it may be sv_restore()d */ + MAGIC *mg; (void)SvUPGRADE((SV*)av, SVt_PVAV); +#if PERL_VERSION < 9 SvPVX(av) = s; - SvIVX(av) = i; +#else + AvARRAY(av) = (SV**)s; +#endif + mg = sv_magicext((SV*)av, NULL, PARI_MAGIC_TYPE, NULL, (void*)i, 0); + mg->mg_private = PARI_MAGIC_PRIVATE; sv_magic((SV*)av, newsub, 'P', Nullch, 0); SvREFCNT_dec(newsub); /* now RC(newsub)==1 */ /* We avoid an reference loop, so should be careful on DESTROY */ @@ -419,7 +459,7 @@ findVariable(SV *sv, int generate) if (SvSTASH(tsv) == pariStash) { is_pari: { - GEN x = (GEN)SvIV(tsv); + GEN x = (GEN)SV_to_GEN_IV(tsv); if (typ(x) == t_POL /* Polynomial. */ && lgef(x)==4 /* 2 terms */ && (gcmp0((GEN)x[2])) /* Free */ @@ -435,7 +475,7 @@ findVariable(SV *sv, int generate) /* Itsn't good to croak: $v=PARIvar 'v'; vector(3,$v,'v'); */ if (generate) /*croak("Same iterator in embedded PARI loop construct")*/; - return (entree*) SvIV(tsv); + return (entree*) SV_to_GEN_IV(tsv); } } else if (sv_derived_from(sv, "Math::Pari")) { /* Avoid recursion */ if (sv_derived_from(sv, "Math::Pari::Ep")) @@ -702,13 +742,13 @@ sv2pari(SV* sv) if (SvSTASH(tsv) == pariStash) { is_pari: { - IV tmp = SvIV(tsv); + IV tmp = SV_to_GEN_IV(tsv); return (GEN) tmp; } } else if (SvSTASH(tsv) == pariEpStash) { is_pari_ep: { - IV tmp = SvIV(tsv); + IV tmp = SV_to_GEN_IV(tsv); return (GEN)(((entree*) tmp)->value); } } else if (sv_derived_from(sv, "Math::Pari")) { /* Avoid recursion */ @@ -1108,6 +1148,7 @@ installPerlFunctionCV(SV* cv, char *name char *code, *s; I32 req = numargs, opt = 0; entree *ep; + MAGIC *mg; if(SvROK(cv)) cv = SvRV(cv); @@ -1150,7 +1191,9 @@ installPerlFunctionCV(SV* cv, char *name } *s = '\0'; } - ((CV*)cv)->sv_any->xof_off = numargs; /* XXXX Nasty of us... */ + mg = sv_magicext((SV*)cv, NULL, PARI_MAGIC_TYPE, NULL, + INT2PTR(char *, numargs), 0); + mg->mg_private = PARI_MAGIC_PRIVATE; SAVEINT(doing_PARI_autoload); doing_PARI_autoload = 1; ep = install((void*)SvREFCNT_inc(cv), name, code); @@ -1183,9 +1226,19 @@ moveoffstack_newer_than(SV* sv) for (sv1 = PariStack; sv1 != sv; sv1 = nextsv) { ret++; - nextsv = (SV *) SvPVX(sv1); - SvPVX(sv1) = GENmovedOffStack; /* Mark as moved off stack. */ - SvIVX(sv1) = (IV) gclone((GEN)SvIV(sv1)); + if (ARRAY_POST_59(sv1)) { + nextsv = (SV *)AvARRAY(sv1); + AvARRAY_set(sv1, (SV **)GENmovedOffStack); /* Mark as moved off stack. */ + } else { + nextsv = (SV *) SvPVX(sv1); + SvPVX(sv1) = GENmovedOffStack; /* Mark as moved off stack. */ + } + if(SvTYPE(sv1) == SVt_PVAV) { + IV *p = PARI_SV_to_IVp(sv1); + *p = (IV) gclone((GEN)*p); + } else { + SvIVX(sv1) = (IV) gclone((GEN)SvIV(sv1)); + } onStack_dec; offStack_inc; } @@ -1216,7 +1269,7 @@ callPerlFunction(entree *ep, ...) { va_list args; SV *cv = (SV*) ep->value; - int numargs = ((CV*)cv)->sv_any->xof_off; /* XXXX Nasty of us... */ + int numargs = *PARI_SV_to_IVp(cv); GEN res; int i; dSP; @@ -3738,11 +3791,13 @@ DESTROY(rv) { /* PariStack keeps the latest SV that keeps a GEN on stack. */ SV* sv = SvRV(rv); - char* type = SvPVX(sv); /* The value of PariStack when the + char* type = ARRAY_POST_59(sv) ? (char *)AvARRAY(sv) : SvPVX(sv); + /* The value of PariStack when the * variable was created, thus the * previous SV that keeps a GEN from * stack, or some atoms. */ - long oldavma = SvCUR(sv) + bot; /* The value of avma on the entry + long oldavma = (ARRAY_POST_59(sv) ? AvFILLp(sv) : SvCUR(sv)) + bot; + /* The value of avma on the entry * to function having the SV as * argument. */ long howmany; @@ -3762,11 +3817,15 @@ DESTROY(rv) AvFILLp((AV*)sv) = -1; } #endif - SvPVX(sv) = GENheap; /* To avoid extra free() in moveoff.... */ + if (ARRAY_POST_59(sv)) { + AvARRAY_set(sv, (SV **)GENheap); + } else { + SvPVX(sv) = GENheap; /* To avoid extra free() in moveoff.... */ + } if (type == GENheap) /* Leave it alone? XXXX */ /* break */ ; else if (type == GENmovedOffStack) {/* Know that it _was temporary. */ - killbloc((GEN)SvIV(sv)); + killbloc((GEN)SV_to_GEN_IV(sv)); } else { /* Still on stack */ if (type != (char*)PariStack) { /* But not the newest one. */ Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Math-Pari.spec 5 Mar 2008 18:34:21 -0000 1.11 +++ perl-Math-Pari.spec 7 Mar 2008 20:42:35 -0000 1.12 @@ -14,12 +14,13 @@ # testing with a development version of PARI, as this expression evaluates # the latest version of GP/PARI the perl module was tested with. %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e') -Release: 5%{?dist} +Release: 6%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Math-Pari/ Source0: http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{version}.tar.gz Source1: http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/pari-%{pariversion}.tgz +Patch0: Math-Pari-2.010709-perl510.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker) @@ -31,6 +32,7 @@ %prep %setup -q -n Math-Pari-%{version} -a 1 +%patch0 -p1 # Remove redundant provides (there's also a versioned one) %global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(Math::Pari)'" @@ -74,6 +76,9 @@ %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog +* Fri Mar 7 2008 Tom "spot" Callaway - 2.010709-6 +- fix for perl 5.10 (many many thanks to Nicholas Clark) + * Wed Mar 5 2008 Tom "spot" Callaway - 2.010709-5 - rebuild for new perl From fedora-extras-commits at redhat.com Fri Mar 7 20:57:44 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 7 Mar 2008 20:57:44 GMT Subject: rpms/kdelibs/devel kdelibs-4.0.2-branding.patch, NONE, 1.1 kdelibs.spec, 1.288, 1.289 Message-ID: <200803072057.m27KvirN005695@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdelibs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5660 Modified Files: kdelibs.spec Added Files: kdelibs-4.0.2-branding.patch Log Message: * Fri Mar 07 2008 Rex Dieter 4.0.2-8 - touchup KDE_DISTRIBUTION_TEXT - add Fedora/V-R to KHTML UA string (thanks caillon) kdelibs-4.0.2-branding.patch: --- NEW FILE kdelibs-4.0.2-branding.patch --- diff -up kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp --- kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding 2008-01-04 18:00:15.000000000 -0600 +++ kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp 2008-03-07 14:49:46.000000000 -0600 @@ -73,7 +73,7 @@ KProtocolManagerPrivate::~KProtocolManag // DEFAULT USERAGENT STRING #define CFG_DEFAULT_UAGENT(X) \ -QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \ +QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko) Fedora/@@VERSION_RELEASE@@") \ .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE) #define PRIVATE_DATA \ Index: kdelibs.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.288 retrieving revision 1.289 diff -u -r1.288 -r1.289 --- kdelibs.spec 6 Mar 2008 11:36:25 -0000 1.288 +++ kdelibs.spec 7 Mar 2008 20:57:11 -0000 1.289 @@ -3,7 +3,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.2 -Release: 7%{?dist} +Release: 8%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -63,6 +63,8 @@ # install all .css files and Doxyfile.global in kdelibs-common to build # kdepimlibs-apidocs against Patch8: kdelibs-4.0.2-install-all-css.patch +# add Fedora/V-R to KHTML UA string +Patch9: kdelibs-4.0.2-branding.patch # upstream patches Patch100: kdelibs-4.0.x-kio.patch @@ -174,6 +176,8 @@ %endif %patch7 -p1 -b .dcop-servicetype %patch8 -p1 -b .all-css +%patch9 -p1 -b .branding +sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp # upstream patches %patch100 -p1 -b .kio @@ -182,7 +186,7 @@ mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="Fedora package %{name}-%{version}-%{release}" .. +%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" .. popd make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 @@ -328,6 +332,10 @@ %changelog +* Fri Mar 07 2008 Rex Dieter 4.0.2-8 +- touchup KDE_DISTRIBUTION_TEXT +- add Fedora/V-R to KHTML UA string (thanks caillon) + * Thu Mar 06 2008 Kevin Kofler 4.0.2-7 - exclude apidocs from the main package From fedora-extras-commits at redhat.com Fri Mar 7 20:59:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 20:59:29 GMT Subject: rpms/perl-Math-Pari/devel perl-Math-Pari.spec,1.12,1.13 Message-ID: <200803072059.m27KxTUl005793@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Math-Pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5764 Modified Files: perl-Math-Pari.spec Log Message: disable tests due to buildserver oddities Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Math-Pari.spec 7 Mar 2008 20:42:35 -0000 1.12 +++ perl-Math-Pari.spec 7 Mar 2008 20:58:56 -0000 1.13 @@ -14,7 +14,7 @@ # testing with a development version of PARI, as this expression evaluates # the latest version of GP/PARI the perl module was tested with. %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e') -Release: 6%{?dist} +Release: 7%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Math-Pari/ @@ -49,7 +49,7 @@ %{__make} %{?_smp_mflags} %check -%{__make} test +# %{__make} test %install %{__rm} -rf %{buildroot} @@ -76,6 +76,9 @@ %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog +* Fri Mar 7 2008 Tom "spot" Callaway - 2.010709-7 +- disable tests, they're being weird in the buildservers + * Fri Mar 7 2008 Tom "spot" Callaway - 2.010709-6 - fix for perl 5.10 (many many thanks to Nicholas Clark) From fedora-extras-commits at redhat.com Fri Mar 7 21:01:13 2008 From: fedora-extras-commits at redhat.com (Dan Smith (danms)) Date: Fri, 7 Mar 2008 21:01:13 GMT Subject: rpms/libvirt-cim/devel .cvsignore, 1.4, 1.5 libvirt-cim.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200803072101.m27L1DKM012922@cvs-int.fedora.redhat.com> Author: danms Update of /cvs/pkgs/rpms/libvirt-cim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5850 Modified Files: .cvsignore libvirt-cim.spec sources Log Message: Fix bug preventing lifecycle changes with KVM guests Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2008 21:05:46 -0000 1.4 +++ .cvsignore 7 Mar 2008 21:00:39 -0000 1.5 @@ -1 +1,2 @@ libvirt-cim-0.3.tar.gz +kvm_method.patch Index: libvirt-cim.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libvirt-cim.spec 4 Mar 2008 21:05:46 -0000 1.9 +++ libvirt-cim.spec 7 Mar 2008 21:00:39 -0000 1.10 @@ -3,7 +3,7 @@ Summary: A CIM provider for libvirt Name: libvirt-cim Version: 0.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries Source: libvirt-cim-%{version}.tar.gz @@ -18,6 +18,7 @@ BuildRequires: libcmpiutil-devel BuildConflicts: sblim-cmpi-devel Patch0: parse.patch +Patch1: kvm_method.patch %description Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC @@ -30,6 +31,7 @@ chmod -f -x src/* libxkutil/* schema/* README doc/* #base_schema/README* chmod +X src/* libxkutil/* schema/* %patch0 -p1 +%patch1 -p1 %build %configure --disable-werror @@ -99,6 +101,9 @@ /etc/ld.so.conf.d/libvirt-cim.conf %changelog +* Fri Mar 07 2008 Dan Smith - 0.3-2 +- Added KVM method enablement patch + * Mon Mar 03 2008 Dan Smith - 0.3-1 - Updated to latest upstream source Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Mar 2008 21:05:46 -0000 1.5 +++ sources 7 Mar 2008 21:00:39 -0000 1.6 @@ -1 +1,2 @@ 528908c9daf98c077f90b7df6fdf1c0a libvirt-cim-0.3.tar.gz +36bbef64cba0015daf6eb34d054a2751 kvm_method.patch From fedora-extras-commits at redhat.com Fri Mar 7 21:09:46 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Fri, 7 Mar 2008 21:09:46 GMT Subject: rpms/midori/devel midori.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803072109.m27L9kHp013320@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/midori/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13258 Modified Files: .cvsignore sources Added Files: midori.spec Log Message: Initial import (#435661) --- NEW FILE midori.spec --- ## Dependency: WebKit SVN 29723+ ## This is the EVR for its sufficient Fedora package. %global webkit_min_version 1.0.0-0.6.svn30667 Name: midori Version: 0.0.17 Release: 2%{?dist} Summary: A lightweight GTK+ web browser Group: Applications/Internet License: LGPLv2.1+ URL: http://software.twotoasts.de/?page=midori Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: WebKit-gtk-devel >= %{webkit_min_version} BuildRequires: libsexy-devel BuildRequires: libxml2-devel BuildRequires: desktop-file-utils Requires: WebKit-gtk >= %{webkit_min_version} %description Midori is a lightweight web browser, and has many features expected of a modern browser, including: * Full integration with GTK+2. * Fast rendering with WebKit. * Tabs, windows and session management. * Bookmarks are stored with XBEL. * Searchbox based on OpenSearch. * Custom context menu actions. * User scripts and user styles support. * Extensible via Lua scripts. The project is currently in an early alpha state. The features are still being implemented, and some are still quite incomplete. %prep %setup -q chmod a-x src/main.c %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} desktop-file-install \ --vendor fedora \ --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/midori %{_datadir}/applications/fedora-%{name}.desktop %changelog * Mon Mar 03 2008 Peter Gordon - 0.0.17-2 - Cleanups from review (bug 435661): (1) Fix consistency of tabs/spaces usage. (2) Fix source permissions. (3) Add desktop-file-utils build dependency. * Sun Mar 02 2008 Peter Gordon - 0.0.17-1 - Initial packaging for Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/midori/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 18:04:02 -0000 1.1 +++ .cvsignore 7 Mar 2008 21:09:01 -0000 1.2 @@ -0,0 +1 @@ +midori-0.0.17.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/midori/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 18:04:02 -0000 1.1 +++ sources 7 Mar 2008 21:09:01 -0000 1.2 @@ -0,0 +1 @@ +58d1b7ed282540030eb1b5803b760865 midori-0.0.17.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 21:10:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 21:10:02 GMT Subject: rpms/perl-XML-Xerces/devel perl-XML-Xerces-2.7.0-0-perl510.patch, NONE, 1.1 perl-XML-Xerces.spec, 1.5, 1.6 Message-ID: <200803072110.m27LA2Od013328@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Xerces/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13293 Modified Files: perl-XML-Xerces.spec Added Files: perl-XML-Xerces-2.7.0-0-perl510.patch Log Message: perl 5.10 fix, fixed BR perl-XML-Xerces-2.7.0-0-perl510.patch: --- NEW FILE perl-XML-Xerces-2.7.0-0-perl510.patch --- diff -up XML-Xerces-2.7.0-0/Xerces.cpp.BAD XML-Xerces-2.7.0-0/Xerces.cpp --- XML-Xerces-2.7.0-0/Xerces.cpp.BAD 2008-03-07 15:48:27.000000000 -0500 +++ XML-Xerces-2.7.0-0/Xerces.cpp 2008-03-07 15:48:34.000000000 -0500 @@ -1216,7 +1216,7 @@ SWIG_Perl_ConvertPacked(SWIG_MAYBE_PERL_ #define SWIG_croak(x) { SWIG_Error(SWIG_RuntimeError, x); SWIG_fail; } -typedef XS(SwigPerlWrapper); +typedef XSPROTO(SwigPerlWrapper); typedef SwigPerlWrapper *SwigPerlWrapperPtr; /* Structure for command table */ Index: perl-XML-Xerces.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Xerces/devel/perl-XML-Xerces.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-XML-Xerces.spec 7 Mar 2008 20:12:40 -0000 1.5 +++ perl-XML-Xerces.spec 7 Mar 2008 21:09:28 -0000 1.6 @@ -3,19 +3,19 @@ Name: perl-XML-Xerces Version: %{ver}_%{PatchLevel} -Release: 8%{?dist} +Release: 9%{?dist} Summary: Perl API to Xerces XML parser Group: Development/Libraries License: ASL 2.0 URL: http://xerces.apache.org/xerces-p/ Source: http://www.apache.org/dist/xml/xerces-p/XML-Xerces-%{ver}-%{PatchLevel}.tar.gz -Patch0: perl-XML-Xerces-xerces28.patch +Patch0: perl-XML-Xerces-2.7.0-0-perl510.patch BuildRoot: %{_tmppath}/%{name}-%{ver}-%{PatchLevel}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) -BuildRequires: xerces-c-devel >= %{ver} +BuildRequires: xerces-c27-devel >= %{ver} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -73,6 +73,10 @@ %changelog +* Fri Mar 7 2008 Tom "spot" Callaway - 2.7.0_0-9 +- ok, so we can't really lie to it. Use the compat BR instead. +- patch for perl 5.10 change + * Fri Mar 7 2008 Tom "spot" Callaway - 2.7.0_0-8 - tell the code that 2.8.0 is fine From fedora-extras-commits at redhat.com Fri Mar 7 21:13:55 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Fri, 7 Mar 2008 21:13:55 GMT Subject: rpms/libgnomeui/devel .cvsignore, 1.49, 1.50 libgnomeui.spec, 1.90, 1.91 sources, 1.49, 1.50 Message-ID: <200803072113.m27LDtY3013508@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/libgnomeui/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13477 Modified Files: .cvsignore libgnomeui.spec sources Log Message: * Fri Mar 07 2008 - Bastien Nocera - 2.21.93-1 - Update to 2.21.93 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgnomeui/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 26 Feb 2008 04:53:29 -0000 1.49 +++ .cvsignore 7 Mar 2008 21:13:19 -0000 1.50 @@ -1 +1 @@ -libgnomeui-2.21.92.tar.bz2 +libgnomeui-2.21.93.tar.bz2 Index: libgnomeui.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgnomeui/devel/libgnomeui.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- libgnomeui.spec 26 Feb 2008 05:26:37 -0000 1.90 +++ libgnomeui.spec 7 Mar 2008 21:13:19 -0000 1.91 @@ -17,7 +17,7 @@ Summary: GNOME base GUI library Name: libgnomeui -Version: 2.21.92 +Version: 2.21.93 Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/libgnomeui/2.21/%{name}-%{version}.tar.bz2 @@ -150,6 +150,9 @@ %{_datadir}/gtk-doc/html/libgnomeui %changelog +* Fri Mar 07 2008 - Bastien Nocera - 2.21.93-1 +- Update to 2.21.93 + * Mon Feb 25 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgnomeui/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 26 Feb 2008 04:53:29 -0000 1.49 +++ sources 7 Mar 2008 21:13:19 -0000 1.50 @@ -1 +1 @@ -71445ea42fc2eb561f80d5a0a65e076a libgnomeui-2.21.92.tar.bz2 +1f27a78c33dd88810142277812189607 libgnomeui-2.21.93.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 21:18:49 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 7 Mar 2008 21:18:49 GMT Subject: rpms/kdewebdev/F-7 kdewebdev.spec,1.43,1.44 Message-ID: <200803072118.m27LInsw013693@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdewebdev/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13636/F-7 Modified Files: kdewebdev.spec Log Message: typo Index: kdewebdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdewebdev/F-7/kdewebdev.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- kdewebdev.spec 4 Mar 2008 17:39:16 -0000 1.43 +++ kdewebdev.spec 7 Mar 2008 21:18:15 -0000 1.44 @@ -37,7 +37,7 @@ BuildRequires: libxslt-devel libxml2-devel %if 0%{?rhel} == 4 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241) -BuildRequires; libgcrypt-devel +BuildRequires: libgcrypt-devel %endif BuildRequires: perl From fedora-extras-commits at redhat.com Fri Mar 7 21:18:53 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 7 Mar 2008 21:18:53 GMT Subject: rpms/kdewebdev/F-8 kdewebdev.spec,1.43,1.44 Message-ID: <200803072118.m27LIrc1013696@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdewebdev/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13636/F-8 Modified Files: kdewebdev.spec Log Message: typo Index: kdewebdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdewebdev/F-8/kdewebdev.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- kdewebdev.spec 4 Mar 2008 17:37:29 -0000 1.43 +++ kdewebdev.spec 7 Mar 2008 21:18:20 -0000 1.44 @@ -37,7 +37,7 @@ BuildRequires: libxslt-devel libxml2-devel %if 0%{?rhel} == 4 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241) -BuildRequires; libgcrypt-devel +BuildRequires: libgcrypt-devel %endif BuildRequires: perl From fedora-extras-commits at redhat.com Fri Mar 7 21:19:51 2008 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 7 Mar 2008 21:19:51 GMT Subject: rpms/cfitsio/devel cfitsio.spec,1.25,1.26 Message-ID: <200803072119.m27LJpto013754@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13616 Modified Files: cfitsio.spec Log Message: Fix pkgconfig files with sed. BZ 436539 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- cfitsio.spec 11 Feb 2008 22:02:42 -0000 1.25 +++ cfitsio.spec 7 Mar 2008 21:19:12 -0000 1.26 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.060 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -38,7 +38,7 @@ Summary: Static cfitsio library %description static -Static cfitsio library; avoid use is possible. +Static cfitsio library; avoid use if possible. %prep %setup -q -n cfitsio @@ -51,6 +51,10 @@ %configure make shared %{?_smp_mflags} unset FC +# Manually fix pkgconfig .pc file (BZ 436539) +sed 's|${exec_prefix}/lib|${exec_prefix}/%{_lib}|' cfitsio.pc >cfitsio.pc.new +sed 's|${prefix}/include|${prefix}/include/%{name}|' cfitsio.pc.new >cfitsio.pc +rm -f cfitsio.pc.new %install rm -rf %{buildroot} @@ -85,6 +89,11 @@ %{_libdir}/libcfitsio.a %changelog +* Fri Mar 7 2008 Matthew Truch - 3.060-3 +- Properly indicated include and lib directories in .pc file + (BZ 436539) +- Fix typo in -static descrition. + * Mon Feb 11 2008 Matthew Truch - 3.060-2 - Bump release for rebuild. From fedora-extras-commits at redhat.com Fri Mar 7 21:20:05 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 7 Mar 2008 21:20:05 GMT Subject: extras-repoclosure rc-modified,1.22,1.23 Message-ID: <200803072120.m27LK51j013814@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13718 Modified Files: rc-modified Log Message: ... and that's the infamous corner-case with noarch->arch switch of pkgs Index: rc-modified =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- rc-modified 7 Mar 2008 20:04:15 -0000 1.22 +++ rc-modified 7 Mar 2008 21:20:05 -0000 1.23 @@ -120,10 +120,11 @@ # there is no upgrade path from biarch installs to single-arch # (the one pkg upgrades two installed pkgs with different arch) - if newest: + (n,a,e,v,r) = pkg.pkgtup + + if newest or a=='noarch': return newest # the trivial case - (n,a,e,v,r) = pkg.pkgtup for provpkg in self.pkgSack.returnNewestByName(n): prov_a = provpkg.pkgtup[1] if prov_a=='noarch' or prov_a==a: From fedora-extras-commits at redhat.com Fri Mar 7 21:22:08 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Fri, 7 Mar 2008 21:22:08 GMT Subject: rpms/switchdesk/devel .cvsignore, 1.20, 1.21 sources, 1.22, 1.23 switchdesk.spec, 1.33, 1.34 Message-ID: <200803072122.m27LM8N5013890@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/switchdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13858 Modified Files: .cvsignore sources switchdesk.spec Log Message: - 4.0.9 - remove obsolete translation (#335231) - fix permission of po files (#435031) - start fluxbox correctly (#415181) - start icewm correctly (#288891) - own /usr/share/switchdesk (#233917) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/switchdesk/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 22 Jan 2007 14:22:31 -0000 1.20 +++ .cvsignore 7 Mar 2008 21:21:35 -0000 1.21 @@ -9,3 +9,4 @@ switchdesk-4.0.8-5.tar.bz2 switchdesk-4.0.8-6.tar.bz2 switchdesk-4.0.8-7.tar.bz2 +switchdesk-4.0.9-1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/switchdesk/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Jan 2007 14:22:31 -0000 1.22 +++ sources 7 Mar 2008 21:21:35 -0000 1.23 @@ -1 +1 @@ -10c5df8023db091ff4fa60d5792a27fa switchdesk-4.0.8-7.tar.bz2 +17049eed6e0ef448c28815a7cf6642eb switchdesk-4.0.9-1.tar.bz2 Index: switchdesk.spec =================================================================== RCS file: /cvs/extras/rpms/switchdesk/devel/switchdesk.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- switchdesk.spec 22 Jan 2007 14:22:31 -0000 1.33 +++ switchdesk.spec 7 Mar 2008 21:21:35 -0000 1.34 @@ -1,13 +1,11 @@ -%define desktop_file 1 - Name: switchdesk Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel. -Version: 4.0.8 -Release: 7 +Version: 4.0.9 +Release: 1 Source: %{name}-%{version}-%{release}.tar.bz2 License: GPL Group: User Interface/Desktops -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: intltool BuildRequires: gettext @@ -50,13 +48,8 @@ make install DESTDIR=%{buildroot} -%if %{desktop_file} - mkdir -p %{buildroot}%{_datadir}/applications - install -m 644 switchdesk.desktop %{buildroot}%{_datadir}/applications/ -%else - mkdir %{buildroot}/etc/X11/applnk/System - install -m 644 switchdesk.desktop %{buildroot}/etc/X11/applnk/System/ -%endif +mkdir -p %{buildroot}%{_datadir}/applications +install -p -m 644 switchdesk.desktop %{buildroot}%{_datadir}/applications/ %find_lang %{name} @@ -65,6 +58,7 @@ %files %defattr(-,root,root) +%dir %{_datadir}/switchdesk %{_bindir}/switchdesk %{_bindir}/switchdesk-helper %{_datadir}/switchdesk/Xclients* @@ -76,13 +70,17 @@ %{_datadir}/%{name}/pixmaps %{_datadir}/%{name}/*.glade %{_datadir}/%{name}/*.py* -%if %{desktop_file} %{_datadir}/applications/* -%else -/etc/X11/applnk/System/* -%endif %changelog +* Fri Mar 07 2008 Than Ngo 4.0.9-1 +- 4.0.9 + - remove obsolete translation (#335231) + - fix permission of po files (#435031) + - start fluxbox correctly (#415181) + - start icewm correctly (#288891) + - own /usr/share/switchdesk (#233917) + * Mon Jan 22 2007 Than Ngo - 4.0.8-7 - fix #174513, it supports any window manager From fedora-extras-commits at redhat.com Fri Mar 7 21:26:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 21:26:11 +0000 Subject: [pkgdb] xercesc-27 was added for xavierb Message-ID: <200803072128.m27LS6wd000627@bastion.fedora.phx.redhat.com> Tom Callaway (spot) has added Package xercesc-27 with summary Compatibility package for Xerces C++ 2.7.0 Tom Callaway (spot) has approved Package xercesc-27 Tom Callaway (spot) has added a Fedora devel branch for xercesc-27 with an owner of xavierb Tom Callaway (spot) has approved xercesc-27 in Fedora devel Tom Callaway (spot) has approved Package xercesc-27 Tom Callaway (spot) has set commit to Approved for cvsextras on xercesc-27 (Fedora devel) Tom Callaway (spot) has set build to Approved for cvsextras on xercesc-27 (Fedora devel) Tom Callaway (spot) has set checkout to Approved for cvsextras on xercesc-27 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xercesc-27 From fedora-extras-commits at redhat.com Fri Mar 7 21:26:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 21:26:13 +0000 Subject: [pkgdb] xercesc-27 (Fedora, devel) updated by spot Message-ID: <200803072128.m27LS6wg000627@bastion.fedora.phx.redhat.com> Tom Callaway (spot) Approved cvsextras for commit access on xercesc-27 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xercesc-27 From fedora-extras-commits at redhat.com Fri Mar 7 21:26:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 21:26:40 GMT Subject: rpms/xercesc-27 - New directory Message-ID: <200803072126.m27LQeKD014087@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xercesc-27 In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsu14054/rpms/xercesc-27 Log Message: Directory /cvs/extras/rpms/xercesc-27 added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 21:26:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 21:26:43 GMT Subject: rpms/xercesc-27/devel - New directory Message-ID: <200803072126.m27LQhTN014101@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xercesc-27/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsu14054/rpms/xercesc-27/devel Log Message: Directory /cvs/extras/rpms/xercesc-27/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 21:26:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 21:26:49 GMT Subject: rpms/xercesc-27 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803072126.m27LQnJB014126@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xercesc-27 In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsu14054/rpms/xercesc-27 Added Files: Makefile import.log Log Message: Setup of module xercesc-27 --- NEW FILE Makefile --- # Top level Makefile for module xercesc-27 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 21:26:52 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 21:26:52 GMT Subject: rpms/xercesc-27/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803072126.m27LQqWG014144@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xercesc-27/devel In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsu14054/rpms/xercesc-27/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xercesc-27 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xercesc-27 # $Id: Makefile,v 1.1 2008/03/07 21:26:49 spot Exp $ NAME := xercesc-27 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 21:35:22 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Fri, 7 Mar 2008 21:35:22 GMT Subject: rpms/midori/F-8 midori.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803072135.m27LZMEF014413@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/midori/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14380 Modified Files: .cvsignore sources Added Files: midori.spec Log Message: Initial import (#435661) --- NEW FILE midori.spec --- ## Dependency: WebKit SVN 29723+ ## This is the EVR for its sufficient Fedora package. %global webkit_min_version 1.0.0-0.6.svn30667 Name: midori Version: 0.0.17 Release: 2%{?dist} Summary: A lightweight GTK+ web browser Group: Applications/Internet License: LGPLv2.1+ URL: http://software.twotoasts.de/?page=midori Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: WebKit-gtk-devel >= %{webkit_min_version} BuildRequires: libsexy-devel BuildRequires: libxml2-devel BuildRequires: desktop-file-utils Requires: WebKit-gtk >= %{webkit_min_version} %description Midori is a lightweight web browser, and has many features expected of a modern browser, including: * Full integration with GTK+2. * Fast rendering with WebKit. * Tabs, windows and session management. * Bookmarks are stored with XBEL. * Searchbox based on OpenSearch. * Custom context menu actions. * User scripts and user styles support. * Extensible via Lua scripts. The project is currently in an early alpha state. The features are still being implemented, and some are still quite incomplete. %prep %setup -q chmod a-x src/main.c %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} desktop-file-install \ --vendor fedora \ --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/midori %{_datadir}/applications/fedora-%{name}.desktop %changelog * Mon Mar 03 2008 Peter Gordon - 0.0.17-2 - Cleanups from review (bug 435661): (1) Fix consistency of tabs/spaces usage. (2) Fix source permissions. (3) Add desktop-file-utils build dependency. * Sun Mar 02 2008 Peter Gordon - 0.0.17-1 - Initial packaging for Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/midori/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 18:04:02 -0000 1.1 +++ .cvsignore 7 Mar 2008 21:34:48 -0000 1.2 @@ -0,0 +1 @@ +midori-0.0.17.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/midori/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 18:04:02 -0000 1.1 +++ sources 7 Mar 2008 21:34:48 -0000 1.2 @@ -0,0 +1 @@ +58d1b7ed282540030eb1b5803b760865 midori-0.0.17.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 21:40:10 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Fri, 7 Mar 2008 21:40:10 GMT Subject: rpms/cinepaint/devel cinepaint-0.22-gcc43_cine.patch, NONE, 1.1 icc_examin-0.44-gcc43.patch, NONE, 1.1 cinepaint-0.22-multilib.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 cinepaint.spec, 1.8, 1.9 Message-ID: <200803072140.m27LeABX014506@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/cinepaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14466 Modified Files: .cvsignore sources cinepaint.spec Added Files: cinepaint-0.22-gcc43_cine.patch icc_examin-0.44-gcc43.patch cinepaint-0.22-multilib.patch Log Message: - Add BR Oyranos 0.1.7 - Update icc_examin to 0.44 - Fix cinepaint and icc_examin for gcc43 cinepaint-0.22-gcc43_cine.patch: --- NEW FILE cinepaint-0.22-gcc43_cine.patch --- diff -up cinepaint-0.22-1/plug-ins/pdf/pdf.cpp.gcc43_cine cinepaint-0.22-1/plug-ins/pdf/pdf.cpp --- cinepaint-0.22-1/plug-ins/pdf/pdf.cpp.gcc43_cine 2008-02-27 20:21:42.000000000 +0100 +++ cinepaint-0.22-1/plug-ins/pdf/pdf.cpp 2008-02-27 20:23:24.000000000 +0100 @@ -36,7 +36,7 @@ #define PLUG_IN_AUTHOR "Kai-Uwe Behrmann " #define PLUG_IN_COPYRIGHT "Copyright 2005-2006 Kai-Uwe Behrmann" - +#include // strlen strcmp strrchr #include "pdf.h" #include "pdf_dialog.h" diff -up cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp.gcc43_cine cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp --- cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp.gcc43_cine 2008-02-27 19:56:20.000000000 +0100 +++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp 2008-02-27 19:57:42.000000000 +0100 @@ -26,6 +26,7 @@ */ #include #include // pow() +#include // strlen strcpy #include "br_types.hpp" // ImageID #include "br_enums.hpp" // DataType, ReportWhat diff -up cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp.gcc43_cine cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp --- cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp.gcc43_cine 2008-02-27 20:02:53.000000000 +0100 +++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp 2008-02-27 20:03:15.000000000 +0100 @@ -34,6 +34,7 @@ #include +#include // strlen #include "TNT/tnt_misc.hpp" // proof_least_square_fit() #include "TNT/tnt_stopwatch.hpp" #include "TNT/jama_qr.hpp" // JAMA::QR icc_examin-0.44-gcc43.patch: --- NEW FILE icc_examin-0.44-gcc43.patch --- diff -up icc_examin-0.44/icc_oyranos.h.gcc43 icc_examin-0.44/icc_oyranos.h --- icc_examin-0.44/icc_oyranos.h.gcc43 2007-04-24 19:20:59.000000000 +0200 +++ icc_examin-0.44/icc_oyranos.h 2008-02-25 13:44:16.000000000 +0100 @@ -37,6 +37,8 @@ #include #include #include +#include + class Oyranos; class Speicher; class ICCprofile; @@ -146,8 +148,8 @@ class Oyranos int byte, int kanaele, const char* ausgangs_profil__geraet, - int byte, - int kanaele, + int byte2, + int kanaele2, int farb_intent, const char* cmm, // 4 bytes 'lcms' 'APPL' int cmm_optionen); // BPC, precission @@ -156,8 +158,8 @@ class Oyranos int byte, int kanaele, const char* ausgangs_profil__geraet, - int byte, - int kanaele, + int byte2, + int kanaele2, int farb_intent, const char* cmm, // 4 bytes 'lcms' 'APPL' int cmm_optionen, @@ -167,8 +169,8 @@ class Oyranos int byte, int kanaele, const char* ausgangs_profil__geraet, - int byte, - int kanaele, + int byte2, + int kanaele2, int farb_intent, const char* cmm, // 4 bytes 'lcms' 'APPL' int cmm_optionen, @@ -185,8 +187,8 @@ class Oyranos int byte, int kanaele, const char* ausgangs_profil__geraet, - int byte, - int kanaele, + int byte2, + int kanaele2, int farb_intent, int cmm_optionen, const char* simulations_profil, diff -up icc_examin-0.44/icc_speicher.h.gcc43 icc_examin-0.44/icc_speicher.h --- icc_examin-0.44/icc_speicher.h.gcc43 2007-04-25 16:36:35.000000000 +0200 +++ icc_examin-0.44/icc_speicher.h 2008-02-25 13:44:16.000000000 +0100 @@ -33,6 +33,8 @@ #include "icc_utils.h" #include +#include +#include #define DBG_SPEICHER_START if(icc_debug >= 3) DBG_PROG_START #define DBG_SPEICHER_ENDE if(icc_debug >= 3) DBG_PROG_ENDE diff -up icc_examin-0.44/icc_oyranos_extern.cpp.gcc43 icc_examin-0.44/icc_oyranos_extern.cpp --- icc_examin-0.44/icc_oyranos_extern.cpp.gcc43 2008-02-25 13:50:04.000000000 +0100 +++ icc_examin-0.44/icc_oyranos_extern.cpp 2008-02-25 13:51:52.000000000 +0100 @@ -29,6 +29,7 @@ #include "icc_utils.h" #include "icc_fenster.h" +#include using namespace icc_examin_ns; cinepaint-0.22-multilib.patch: --- NEW FILE cinepaint-0.22-multilib.patch --- diff -up cinepaint-0.22-1/cinepainttool.in.multilib cinepaint-0.22-1/cinepainttool.in --- cinepaint-0.22-1/cinepainttool.in.multilib 2008-03-07 21:48:32.000000000 +0100 +++ cinepaint-0.22-1/cinepainttool.in 2008-03-07 21:52:08.000000000 +0100 @@ -4,7 +4,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ exec_prefix_set=no datarootdir=@datarootdir@ -plug_in_dir=@programplugindir@ +plug_in_dir=`pkg-config --variable programplugindir cinepaint-gtk` programdotdir=@programdotdir@ programdatadir=@programdatadir@ datadir=@datadir@ @@ -71,8 +71,8 @@ if test $# -eq 0; then fi if test x${GTK_CONFIG+set} != xset ; then - gtk_cflags="@GTK_CFLAGS@ -I$include_dir" - gtk_libs='@GTK_LIBS@' + gtk_cflags="`pkg-config --cflags gtk+-2.0` -I$include_dir" + gtk_libs="`pkg-config --libs gtk+-2.0`" else gtk_cflags=`$GTK_CONFIG --cflags` gtk_libs=`$GTK_CONFIG --libs` @@ -89,7 +89,7 @@ else fi if test x${CFLAGS+set} != xset ; then - cflags='@CFLAGS@' + cflags="$CFLAGS" else cflags="$CFLAGS" fi @@ -165,9 +165,9 @@ while test $# -gt 0; do ;; --libs | --libs-nocinepaintui) my_gtk_libs= - libdirs=-L at libdir@ + libdirs="-L`pkg-config --variable libdir cinepaint-gtk`" for i in $gtk_libs ; do - if test $i != -L at libdir@ ; then + if test $i != -L$(pkg-config --variable libdir cinepaint-gtk) ; then if test -z "$my_gtk_libs" ; then my_gtk_libs="$i" else Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jul 2007 10:17:09 -0000 1.2 +++ .cvsignore 7 Mar 2008 21:39:36 -0000 1.3 @@ -1 +1,2 @@ cinepaint-0.22-1.tar.gz +icc_examin-0.44.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jul 2007 10:17:09 -0000 1.2 +++ sources 7 Mar 2008 21:39:36 -0000 1.3 @@ -1 +1,2 @@ f360587240db6b6d2f0bfd94c420c492 cinepaint-0.22-1.tar.gz +81e9bba15a777d53fbeb03acd65f7338 icc_examin-0.44.tar.gz Index: cinepaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cinepaint.spec 19 Feb 2008 10:29:51 -0000 1.8 +++ cinepaint.spec 7 Mar 2008 21:39:36 -0000 1.9 @@ -13,22 +13,27 @@ License: GPLv2+ and LGPLv2+ and MIT URL: http://www.cinepaint.org/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{cinever}.tar.gz +# http://www.behrmann.name/index.php?option=com_content&task=view&id=33&Itemid=69 +Source1: http://kwizart.fedorapeople.org/SOURCES/icc_examin-0.44.tar.gz Patch0: cinepaint-0.22-0-icc_helfer_fltk.patch Patch1: cinepaint-0.22-0-nonweak-symbol.patch Patch2: cinepaint-0.22-0-rm_rpath.patch Patch3: cinepaint-0.22-0-pc_req.patch Patch4: cinepaint-0.22-0-libdir.patch Patch5: cinepaint-0.22-md5_rm_RSA.patch +Patch6: cinepaint-0.22-multilib.patch +Patch8: cinepaint-0.22-gcc43_cine.patch +Patch11: icc_examin-0.44-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%ifnarch %{ix86} ppc +#ifnarch %{ix86} ppc BuildRequires: autoconf -%endif +#endif BuildRequires: desktop-file-utils BuildRequires: docbook-utils BuildRequires: flex BuildRequires: fltk-devel -BuildRequires: ftgl-devel +BuildRequires: ftgl-devel BuildRequires: gettext BuildRequires: gtk2-devel >= 2.10.8 BuildRequires: gutenprint-devel >= 5.0.0 @@ -40,11 +45,11 @@ BuildRequires: libXpm-devel BuildRequires: libXxf86vm-devel BuildRequires: OpenEXR-devel >= 1.6.0 -#BuildRequires: oyranos-devel +BuildRequires: oyranos-devel Requires: freefont Requires: pygtk2 -#Requires: oyranos +Requires: oyranos Requires: %{name}-libs = %{version}-%{release} Requires(post): desktop-file-utils @@ -88,10 +93,25 @@ %patch3 -p1 -b .req %patch4 -p1 -b .libdir %patch5 -p1 -b .rm_RSA +%patch6 -p1 -b .multilib +%patch8 -p1 -b .gcc43_cine + +%setup -q -D -T -a 1 -n cinepaint-%{cinever} +pushd icc_examin-0.44 +%patch11 -p1 -b .gcc43 +popd + +rm -rf plug-ins/icc_examin/icc_examin +# Fix default path FreeSans.ttf +sed -i -e 's|/usr/X11R6/lib/X11/fonts/truetype/FreeSans.ttf|%{_datadir}/fonts/freefont/FreeSans.ttf|' \ + icc_examin-0.44/icc_gl.cpp +sed -i -e 's|fonts/FreeSans.ttf|fonts/freefont/FreeSans.ttf|' icc_examin-0.44/icc_gl.cpp + +cp -pR icc_examin-0.44 plug-ins/icc_examin/icc_examin -%ifnarch %{ix86} ppc +#ifnarch %{ix86} ppc autoconf -%endif +#endif for i in AUTHORS COPYING LICENSE README ;do install -p -m 0644 libhalf/$i $i.libhalf @@ -140,6 +160,9 @@ --mode 644 \ ${RPM_BUILD_ROOT}%{_datadir}/applications/cinepaint.desktop +# Fix multilib cinepaint-devel +touch -r ChangeLog ${RPM_BUILD_ROOT}%{_bindir}/cinepainttool + %find_lang %{name} %find_lang cinepaint-script-fu @@ -166,8 +189,8 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README -%exclude %{_bindir}/cinepainttool -%{_bindir}/* +%{_bindir}/cinepaint +%{_bindir}/cinepaint-remote %{_mandir}/man1/* %{_datadir}/applications/*%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -195,8 +218,12 @@ %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 0.22.1-6 -- Autorebuild for GCC 4.3 +* Fri Mar 7 2008 kwizart < kwizart at gmail.com > - 0.22.1-7 +- Add BR Oyranos 0.1.7 + +* Wed Feb 15 2008 kwizart < kwizart at gmail.com > - 0.22.1-6 +- Update icc_examin to 0.44 +- Fix cinepaint and icc_examin for gcc43 * Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.22.1-5 - Rebuild to new OpenEXR From fedora-extras-commits at redhat.com Fri Mar 7 21:43:09 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 21:43:09 +0000 Subject: [pkgdb] distcc was added for denis Message-ID: <200803072145.m27Lj4WX001397@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package distcc with summary Distributed C/C++ compilation Kevin Fenzi (kevin) has approved Package distcc Kevin Fenzi (kevin) has added a Fedora devel branch for distcc with an owner of denis Kevin Fenzi (kevin) has approved distcc in Fedora devel Kevin Fenzi (kevin) has approved Package distcc Kevin Fenzi (kevin) has set commit to Approved for cvsextras on distcc (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on distcc (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on distcc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/distcc From fedora-extras-commits at redhat.com Fri Mar 7 21:43:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 21:43:30 +0000 Subject: [pkgdb] distcc (Fedora, 8) updated by kevin Message-ID: <200803072145.m27LjPAB001430@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for distcc Kevin Fenzi (kevin) has set commit to Approved for cvsextras on distcc (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on distcc (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on distcc (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on distcc (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/distcc From fedora-extras-commits at redhat.com Fri Mar 7 21:43:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 21:43:30 +0000 Subject: [pkgdb] distcc (Fedora, 7) updated by kevin Message-ID: <200803072145.m27LjPAE001430@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for distcc Kevin Fenzi (kevin) has set commit to Approved for cvsextras on distcc (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on distcc (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on distcc (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on distcc (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/distcc From fedora-extras-commits at redhat.com Fri Mar 7 21:43:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Fri, 07 Mar 2008 21:43:30 +0000 Subject: [pkgdb] distcc (Fedora, devel) updated by kevin Message-ID: <200803072145.m27LjPAH001430@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on distcc (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/distcc From fedora-extras-commits at redhat.com Fri Mar 7 21:44:08 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 21:44:08 GMT Subject: rpms/distcc - New directory Message-ID: <200803072144.m27Li8nY014692@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/distcc In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH14659/rpms/distcc Log Message: Directory /cvs/extras/rpms/distcc added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 21:44:12 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 21:44:12 GMT Subject: rpms/distcc/devel - New directory Message-ID: <200803072144.m27LiC2i014706@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/distcc/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH14659/rpms/distcc/devel Log Message: Directory /cvs/extras/rpms/distcc/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 7 21:44:16 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 21:44:16 GMT Subject: rpms/distcc Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803072144.m27LiG9b014731@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/distcc In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH14659/rpms/distcc Added Files: Makefile import.log Log Message: Setup of module distcc --- NEW FILE Makefile --- # Top level Makefile for module distcc all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Mar 7 21:44:19 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 7 Mar 2008 21:44:19 GMT Subject: rpms/distcc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803072144.m27LiJX2014747@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/distcc/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH14659/rpms/distcc/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module distcc --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: distcc # $Id: Makefile,v 1.1 2008/03/07 21:44:16 kevin Exp $ NAME := distcc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Mar 7 22:01:54 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Fri, 7 Mar 2008 22:01:54 GMT Subject: rpms/midori/F-7 midori.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803072201.m27M1sD2022728@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/midori/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22474 Modified Files: .cvsignore sources Added Files: midori.spec Log Message: Initial import (#435661) --- NEW FILE midori.spec --- ## Dependency: WebKit SVN 29723+ ## This is the EVR for its sufficient Fedora package. %global webkit_min_version 1.0.0-0.6.svn30667 Name: midori Version: 0.0.17 Release: 2%{?dist} Summary: A lightweight GTK+ web browser Group: Applications/Internet License: LGPLv2.1+ URL: http://software.twotoasts.de/?page=midori Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: WebKit-gtk-devel >= %{webkit_min_version} BuildRequires: libsexy-devel BuildRequires: libxml2-devel BuildRequires: desktop-file-utils Requires: WebKit-gtk >= %{webkit_min_version} %description Midori is a lightweight web browser, and has many features expected of a modern browser, including: * Full integration with GTK+2. * Fast rendering with WebKit. * Tabs, windows and session management. * Bookmarks are stored with XBEL. * Searchbox based on OpenSearch. * Custom context menu actions. * User scripts and user styles support. * Extensible via Lua scripts. The project is currently in an early alpha state. The features are still being implemented, and some are still quite incomplete. %prep %setup -q chmod a-x src/main.c %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} desktop-file-install \ --vendor fedora \ --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/midori %{_datadir}/applications/fedora-%{name}.desktop %changelog * Mon Mar 03 2008 Peter Gordon - 0.0.17-2 - Cleanups from review (bug 435661): (1) Fix consistency of tabs/spaces usage. (2) Fix source permissions. (3) Add desktop-file-utils build dependency. * Sun Mar 02 2008 Peter Gordon - 0.0.17-1 - Initial packaging for Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/midori/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 18:04:02 -0000 1.1 +++ .cvsignore 7 Mar 2008 22:01:17 -0000 1.2 @@ -0,0 +1 @@ +midori-0.0.17.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/midori/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 18:04:02 -0000 1.1 +++ sources 7 Mar 2008 22:01:17 -0000 1.2 @@ -0,0 +1 @@ +58d1b7ed282540030eb1b5803b760865 midori-0.0.17.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 22:12:29 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 7 Mar 2008 22:12:29 GMT Subject: rpms/perl/devel 32891.patch,NONE,1.1 perl.spec,1.151,1.152 Message-ID: <200803072212.m27MCTEx022907@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22884 Modified Files: perl.spec Added Files: 32891.patch Log Message: change 32891, sitedir/sitearch in /usr/local 32891.patch: --- NEW FILE 32891.patch --- --- perl-5.10.0/op.c 2007-12-18 05:47:07.000000000 -0500 +++ perl-5.10.0/op.c 2007-12-31 11:15:57.000000000 -0500 @@ -3992,6 +3992,7 @@ static const char no_list_state[] = "Initialization of state variables" " in list context currently forbidden"; OP *curop; + bool maybe_common_vars = TRUE; PL_modcount = 0; /* Grandfathering $[ assignment here. Bletch.*/ @@ -4009,6 +4010,65 @@ o = newBINOP(OP_AASSIGN, flags, list(force_list(right)), curop); o->op_private = (U8)(0 | (flags >> 8)); + if ((left->op_type == OP_LIST + || (left->op_type == OP_NULL && left->op_targ == OP_LIST))) + { + OP* lop = ((LISTOP*)left)->op_first; + maybe_common_vars = FALSE; + while (lop) { + if (lop->op_type == OP_PADSV || + lop->op_type == OP_PADAV || + lop->op_type == OP_PADHV || + lop->op_type == OP_PADANY) { + if (!(lop->op_private & OPpLVAL_INTRO)) + maybe_common_vars = TRUE; + + if (lop->op_private & OPpPAD_STATE) { + if (left->op_private & OPpLVAL_INTRO) { + /* Each variable in state($a, $b, $c) = ... */ + } + else { + /* Each state variable in + (state $a, my $b, our $c, $d, undef) = ... */ + } + yyerror(no_list_state); + } else { + /* Each my variable in + (state $a, my $b, our $c, $d, undef) = ... */ + } + } else if (lop->op_type == OP_UNDEF || + lop->op_type == OP_PUSHMARK) { + /* undef may be interesting in + (state $a, undef, state $c) */ + } else { + /* Other ops in the list. */ + maybe_common_vars = TRUE; + } + lop = lop->op_sibling; + } + } + else if ((left->op_private & OPpLVAL_INTRO) + && ( left->op_type == OP_PADSV + || left->op_type == OP_PADAV + || left->op_type == OP_PADHV + || left->op_type == OP_PADANY)) + { + maybe_common_vars = FALSE; + if (left->op_private & OPpPAD_STATE) { + /* All single variable list context state assignments, hence + state ($a) = ... + (state $a) = ... + state @a = ... + state (@a) = ... + (state @a) = ... + state %a = ... + state (%a) = ... + (state %a) = ... + */ + yyerror(no_list_state); + } + } + /* PL_generation sorcery: * an assignment like ($a,$b) = ($c,$d) is easier than * ($a,$b) = ($c,$a), since there is no need for temporary vars. @@ -4023,7 +4083,7 @@ * to store these values, evil chicanery is done with SvUVX(). */ - { + if (maybe_common_vars) { OP *lastop = o; PL_generation++; for (curop = LINKLIST(o); curop != o; curop = LINKLIST(curop)) { @@ -4084,54 +4144,6 @@ o->op_private |= OPpASSIGN_COMMON; } - if ((left->op_type == OP_LIST - || (left->op_type == OP_NULL && left->op_targ == OP_LIST))) { - OP* lop = ((LISTOP*)left)->op_first; - while (lop) { - if (lop->op_type == OP_PADSV || - lop->op_type == OP_PADAV || - lop->op_type == OP_PADHV || - lop->op_type == OP_PADANY) { - if (lop->op_private & OPpPAD_STATE) { - if (left->op_private & OPpLVAL_INTRO) { - /* Each variable in state($a, $b, $c) = ... */ - } - else { - /* Each state variable in - (state $a, my $b, our $c, $d, undef) = ... */ - } - yyerror(no_list_state); - } else { - /* Each my variable in - (state $a, my $b, our $c, $d, undef) = ... */ - } - } else { - /* Other ops in the list. undef may be interesting in - (state $a, undef, state $c) */ - } - lop = lop->op_sibling; - } - } - else if (((left->op_private & (OPpLVAL_INTRO | OPpPAD_STATE)) - == (OPpLVAL_INTRO | OPpPAD_STATE)) - && ( left->op_type == OP_PADSV - || left->op_type == OP_PADAV - || left->op_type == OP_PADHV - || left->op_type == OP_PADANY)) - { - /* All single variable list context state assignments, hence - state ($a) = ... - (state $a) = ... - state @a = ... - state (@a) = ... - (state @a) = ... - state %a = ... - state (%a) = ... - (state %a) = ... - */ - yyerror(no_list_state); - } - if (right && right->op_type == OP_SPLIT && !PL_madskills) { OP* tmpop = ((LISTOP*)right)->op_first; if (tmpop && (tmpop->op_type == OP_PUSHRE)) { Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- perl.spec 22 Feb 2008 12:42:53 -0000 1.151 +++ perl.spec 7 Mar 2008 22:11:53 -0000 1.152 @@ -16,7 +16,7 @@ Name: perl Version: %{perl_version} -Release: 7%{?dist} +Release: 8%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -62,6 +62,9 @@ # systems. Patch10: perl-5.10.0-x86_64-io-test-failure.patch +# http://public.activestate.com/cgi-bin/perlbrowse/p/32891 +Patch11: 32891.patch + BuildRoot: %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcsh, dos2unix, man, groff BuildRequires: gdbm-devel, db4-devel, zlib-devel @@ -131,6 +134,7 @@ Obsoletes: perl-File-Temp < 0.18 Conflicts: perl-File-Temp + Requires: perl-libs = %{perl_epoch}:%{perl_version}-%{release} Requires: db4 = %{db4_major}.%{db4_minor}.%{db4_patch} @@ -778,6 +782,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 # # Candidates for doc recoding (need case by case review): @@ -849,10 +854,10 @@ %ifarch %{multilib_64_archs} -Dlibpth="/usr/local/lib64 /lib64 %{_prefix}/lib64" \ -Dprivlib="%{_prefix}/lib/perl5/%{perl_version}" \ - -Dsitelib="%{_prefix}/lib/perl5/site_perl/%{perl_version}" \ + -Dsitelib="%{_prefix}/local/lib/perl5/site_perl/%{perl_version}" \ -Dvendorlib="%{_prefix}/lib/perl5/vendor_perl/%{perl_version}" \ -Darchlib="%{_libdir}/perl5/%{perl_version}/%{perl_archname}" \ - -Dsitearch="%{_libdir}/perl5/site_perl/%{perl_version}/%{perl_archname}" \ + -Dsitearch="%{_prefix}/local/%{_lib}/perl5/site_perl/%{perl_version}/%{perl_archname}" \ -Dvendorarch="%{_libdir}/perl5/vendor_perl/%{perl_version}/%{perl_archname}" \ %endif -Darchname=%{_arch}-%{_os} \ @@ -892,7 +897,6 @@ %ifarch %{multilib_64_archs} mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/%{perl_version} -mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/site_perl/%{perl_version} mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/vendor_perl/%{perl_version} mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/vendor_perl/%{perl_version}/auto %endif @@ -1564,6 +1568,10 @@ # Old changelog entries are preserved in CVS. %changelog +* Fri Mar 7 2008 Tom "spot" Callaway 4:5.10.0-8 +- use /usr/local for sitelib/sitearch dirs +- patch 32891 for significant performance improvement + * Fri Feb 22 2008 Stepan Kasal - 4:5.10.0-7 - Add perl-File-Temp provides/obsoletes/conflicts (#433836), reported by Bill McGonigle From fedora-extras-commits at redhat.com Fri Mar 7 22:20:35 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Fri, 7 Mar 2008 22:20:35 GMT Subject: rpms/cinepaint/devel cinepaint-0.22-multilib.patch, 1.1, 1.2 cinepaint.spec, 1.9, 1.10 Message-ID: <200803072220.m27MKZQ8023090@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/cinepaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23045 Modified Files: cinepaint-0.22-multilib.patch cinepaint.spec Log Message: Fix for multilib cinepaint-0.22-multilib.patch: Index: cinepaint-0.22-multilib.patch =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint-0.22-multilib.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cinepaint-0.22-multilib.patch 7 Mar 2008 21:39:36 -0000 1.1 +++ cinepaint-0.22-multilib.patch 7 Mar 2008 22:20:26 -0000 1.2 @@ -1,15 +1,6 @@ diff -up cinepaint-0.22-1/cinepainttool.in.multilib cinepaint-0.22-1/cinepainttool.in --- cinepaint-0.22-1/cinepainttool.in.multilib 2008-03-07 21:48:32.000000000 +0100 +++ cinepaint-0.22-1/cinepainttool.in 2008-03-07 21:52:08.000000000 +0100 -@@ -4,7 +4,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - exec_prefix_set=no - datarootdir=@datarootdir@ --plug_in_dir=@programplugindir@ -+plug_in_dir=`pkg-config --variable programplugindir cinepaint-gtk` - programdotdir=@programdotdir@ - programdatadir=@programdatadir@ - datadir=@datadir@ @@ -71,8 +71,8 @@ if test $# -eq 0; then fi @@ -35,10 +26,10 @@ --libs | --libs-nocinepaintui) my_gtk_libs= - libdirs=-L at libdir@ -+ libdirs="-L`pkg-config --variable libdir cinepaint-gtk`" ++ libdirs="-L`pkg-config --variable libdir gtk+-2.0`" for i in $gtk_libs ; do - if test $i != -L at libdir@ ; then -+ if test $i != -L$(pkg-config --variable libdir cinepaint-gtk) ; then ++ if test $i != -L`pkg-config --variable libdir gtk+-2.0` ; then if test -z "$my_gtk_libs" ; then my_gtk_libs="$i" else Index: cinepaint.spec =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cinepaint.spec 7 Mar 2008 21:39:36 -0000 1.9 +++ cinepaint.spec 7 Mar 2008 22:20:26 -0000 1.10 @@ -6,7 +6,7 @@ Name: cinepaint Version: %(echo %{cinever} |sed 's|-|.|') -Release: 6%{?dist} +Release: 7%{?dist} Summary: CinePaint is a tool for manipulating images Group: Applications/Multimedia @@ -161,6 +161,8 @@ ${RPM_BUILD_ROOT}%{_datadir}/applications/cinepaint.desktop # Fix multilib cinepaint-devel +sed -i -e 's|plug_in_dir=%{_libdir}/cinepaint/%{cinever}|plug_in_dir="$(pkg-config --variable programplugindir cinepaint-gtk)"|' \ + ${RPM_BUILD_ROOT}%{_bindir}/cinepainttool touch -r ChangeLog ${RPM_BUILD_ROOT}%{_bindir}/cinepainttool From fedora-extras-commits at redhat.com Fri Mar 7 22:30:48 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 22:30:48 GMT Subject: rpms/kdebase3/devel kdebase-3.5-khotkeys-crash.patch, NONE, 1.1 kdebase3.spec, 1.44, 1.45 Message-ID: <200803072230.m27MUmUW023318@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23291/devel Modified Files: kdebase3.spec Added Files: kdebase-3.5-khotkeys-crash.patch Log Message: Sync from F8: * Mon Mar 03 2008 Than Ngo 3.5.9-4 - apply upstream patch to fix crash in khotkey kdebase-3.5-khotkeys-crash.patch: --- NEW FILE kdebase-3.5-khotkeys-crash.patch --- Index: khotkeys/kcontrol/condition_list_widget.cpp =================================================================== --- khotkeys/kcontrol/condition_list_widget.cpp (Revision 781669) +++ khotkeys/kcontrol/condition_list_widget.cpp (Revision 781670) @@ -221,10 +221,14 @@ } void Condition_list_widget::delete_pressed() +{ + if ( selected_item ) { - conditions.remove( selected_item->condition()); // we own it - delete selected_item; // CHECKME snad vyvola signaly pro enable() + conditions.remove( selected_item->condition()); // we own it + delete selected_item; // CHECKME snad vyvola signaly pro enable() + selected_item = NULL; } +} void Condition_list_widget::modify_pressed() { Index: khotkeys/kcontrol/actions_listview_widget.cpp =================================================================== --- khotkeys/kcontrol/actions_listview_widget.cpp (Revision 781557) +++ khotkeys/kcontrol/actions_listview_widget.cpp (Revision 781558) @@ -110,6 +110,7 @@ // if( nw == NULL ) // nw = current_action()->itemBelow(); delete saved_current_item; + saved_current_item = NULL; recent_item = NULL; // if( nw != NULL ) // { Index: kdebase3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- kdebase3.spec 28 Feb 2008 18:24:20 -0000 1.44 +++ kdebase3.spec 7 Mar 2008 22:30:14 -0000 1.45 @@ -12,7 +12,7 @@ %define _with_samba --with-samba Version: 3.5.9 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} > 8 Name: kdebase3 @@ -85,6 +85,7 @@ # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch Patch200: kdebase-3.5.7-kde#83974.patch Patch201: kdebase-3.5.9-lmsensors.patch +Patch202: kdebase-3.5-khotkeys-crash.patch # security fixes @@ -297,6 +298,7 @@ ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch #patch200 -p4 -b .kde#83974 %patch201 -p0 -b .sensor +%patch202 -p0 -b .khotkeys-crash %if "%{name}" != "kdebase" # hacks to omit stuff that doesn't support DO_NOT_COMPILE @@ -793,6 +795,9 @@ %changelog +* Mon Mar 03 2008 Than Ngo 3.5.9-4 +- apply upstream patch to fix crash in khotkey + * Thu Feb 28 2008 Than Ngo 3.5.9-3 - apply upstream patch to unbreak lmsensors support again From fedora-extras-commits at redhat.com Fri Mar 7 22:33:05 2008 From: fedora-extras-commits at redhat.com (Josef Kubin (jkubin)) Date: Fri, 7 Mar 2008 22:33:05 GMT Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.93,1.94 Message-ID: <200803072233.m27MX5ij023387@cvs-int.fedora.redhat.com> Author: jkubin Update of /cvs/pkgs/rpms/selinux-policy/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23351 Modified Files: policy-20070501.patch Log Message: Added exim_manage_log(system_mail_t) policy-20070501.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.93 -r 1.94 policy-20070501.patch Index: policy-20070501.patch =================================================================== RCS file: /cvs/pkgs/rpms/selinux-policy/F-7/policy-20070501.patch,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- policy-20070501.patch 29 Feb 2008 14:10:46 -0000 1.93 +++ policy-20070501.patch 7 Mar 2008 22:33:01 -0000 1.94 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-2.6.4/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/man/man8/ftpd_selinux.8 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/man/man8/ftpd_selinux.8 2008-03-07 23:27:34.000000000 +0100 @@ -12,7 +12,7 @@ .TP chcon -R -t public_content_t /var/ftp @@ -12,7 +12,7 @@ .TP diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.6.4/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2007-05-07 20:50:57.000000000 +0200 -+++ serefpolicy-2.6.4/policy/flask/access_vectors 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/flask/access_vectors 2008-03-07 23:27:34.000000000 +0100 @@ -598,6 +598,8 @@ shmempwd shmemgrp @@ -43,7 +43,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classes serefpolicy-2.6.4/policy/flask/security_classes --- nsaserefpolicy/policy/flask/security_classes 2007-05-07 20:50:57.000000000 +0200 -+++ serefpolicy-2.6.4/policy/flask/security_classes 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/flask/security_classes 2008-03-07 23:27:34.000000000 +0100 @@ -97,4 +97,6 @@ class dccp_socket @@ -53,7 +53,7 @@ # FLASK diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.6.4/policy/global_booleans --- nsaserefpolicy/policy/global_booleans 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/global_booleans 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/global_booleans 2008-03-07 23:27:34.000000000 +0100 @@ -4,7 +4,6 @@ # file should be used. # @@ -72,7 +72,7 @@ ##

diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.6.4/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/global_tunables 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/global_tunables 2008-03-07 23:27:34.000000000 +0100 @@ -102,12 +102,6 @@ ## gen_tunable(use_samba_home_dirs,false) @@ -101,7 +101,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.6.4/policy/mls --- nsaserefpolicy/policy/mls 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/mls 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/mls 2008-03-07 23:27:34.000000000 +0100 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or @@ -175,7 +175,7 @@ mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.6.4/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2007-05-07 20:51:04.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/acct.te 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/acct.te 2008-03-07 23:27:34.000000000 +0100 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -186,7 +186,7 @@ logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-2.6.4/policy/modules/admin/alsa.fc --- nsaserefpolicy/policy/modules/admin/alsa.fc 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/alsa.fc 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/alsa.fc 2008-03-07 23:27:34.000000000 +0100 @@ -1,4 +1,11 @@ +/etc/alsa/asound\.state -- gen_context(system_u:object_r:alsa_etc_rw_t,s0) @@ -201,7 +201,7 @@ +/bin/alsaunmute -- gen_context(system_u:object_r:alsa_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.if serefpolicy-2.6.4/policy/modules/admin/alsa.if --- nsaserefpolicy/policy/modules/admin/alsa.if 2007-05-07 20:51:04.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/alsa.if 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/alsa.if 2008-03-07 23:27:34.000000000 +0100 @@ -74,3 +74,39 @@ read_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t) read_lnk_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t) @@ -244,7 +244,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-2.6.4/policy/modules/admin/alsa.te --- nsaserefpolicy/policy/modules/admin/alsa.te 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/alsa.te 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/alsa.te 2008-03-07 23:27:34.000000000 +0100 @@ -1,5 +1,5 @@ -policy_module(alsa,1.1.0) @@ -325,7 +325,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.6.4/policy/modules/admin/amanda.if --- nsaserefpolicy/policy/modules/admin/amanda.if 2007-05-07 20:51:04.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/amanda.if 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/amanda.if 2008-03-07 23:27:34.000000000 +0100 @@ -71,6 +71,26 @@ ######################################## @@ -360,7 +360,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.6.4/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/amanda.te 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/amanda.te 2008-03-07 23:27:34.000000000 +0100 @@ -1,5 +1,5 @@ -policy_module(amanda,1.5.0) @@ -489,14 +489,14 @@ -') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.4/policy/modules/admin/amtu.fc --- nsaserefpolicy/policy/modules/admin/amtu.fc 1970-01-01 01:00:00.000000000 +0100 -+++ serefpolicy-2.6.4/policy/modules/admin/amtu.fc 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/amtu.fc 2008-03-07 23:27:34.000000000 +0100 @@ -0,0 +1,3 @@ + +/usr/bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.6.4/policy/modules/admin/amtu.if --- nsaserefpolicy/policy/modules/admin/amtu.if 1970-01-01 01:00:00.000000000 +0100 -+++ serefpolicy-2.6.4/policy/modules/admin/amtu.if 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/amtu.if 2008-03-07 23:27:34.000000000 +0100 @@ -0,0 +1,53 @@ +##

+## abstract Machine Test Utility @@ -553,7 +553,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.6.4/policy/modules/admin/amtu.te --- nsaserefpolicy/policy/modules/admin/amtu.te 1970-01-01 01:00:00.000000000 +0100 -+++ serefpolicy-2.6.4/policy/modules/admin/amtu.te 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/amtu.te 2008-03-07 23:27:34.000000000 +0100 @@ -0,0 +1,57 @@ +policy_module(amtu,1.0.23) + @@ -614,7 +614,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.6.4/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/bootloader.te 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/bootloader.te 2008-03-07 23:27:34.000000000 +0100 @@ -65,6 +65,8 @@ files_tmp_filetrans(bootloader_t,bootloader_tmp_t,{ dir file lnk_file chr_file blk_file }) # for tune2fs (cjp: ?) @@ -634,7 +634,7 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.6.4/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/consoletype.te 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/consoletype.te 2008-03-07 23:27:34.000000000 +0100 @@ -8,7 +8,12 @@ type consoletype_t; @@ -679,7 +679,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.6.4/policy/modules/admin/dmesg.te --- nsaserefpolicy/policy/modules/admin/dmesg.te 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/dmesg.te 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/dmesg.te 2008-03-07 23:27:34.000000000 +0100 @@ -10,6 +10,7 @@ type dmesg_t; type dmesg_exec_t; @@ -690,7 +690,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.6.4/policy/modules/admin/dmidecode.te --- nsaserefpolicy/policy/modules/admin/dmidecode.te 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/dmidecode.te 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/dmidecode.te 2008-03-07 23:27:34.000000000 +0100 @@ -22,6 +22,7 @@ # Allow dmidecode to read /dev/mem @@ -701,7 +701,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.6.4/policy/modules/admin/kudzu.te --- nsaserefpolicy/policy/modules/admin/kudzu.te 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/kudzu.te 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/kudzu.te 2008-03-07 23:27:34.000000000 +0100 @@ -21,8 +21,8 @@ # Local policy # @@ -724,7 +724,7 @@ init_telinit(kudzu_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-2.6.4/policy/modules/admin/logrotate.te --- nsaserefpolicy/policy/modules/admin/logrotate.te 2007-05-07 20:51:04.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/logrotate.te 2008-02-24 19:06:48.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/admin/logrotate.te 2008-03-07 23:27:34.000000000 +0100 @@ -75,6 +75,7 @@ mls_file_read_up(logrotate_t) mls_file_write_down(logrotate_t) @@ -735,7 +735,7 @@ selinux_get_enforce_mode(logrotate_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.6.4/policy/modules/admin/logwatch.te --- nsaserefpolicy/policy/modules/admin/logwatch.te 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/admin/logwatch.te 2008-02-24 19:06:48.000000000 +0100 [...1957 lines suppressed...] # /etc/lvm(/.*)? gen_context(system_u:object_r:lvm_etc_t,s0) @@ -14229,7 +14230,7 @@ /etc/lvm/lock(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.6.4/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/lvm.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/lvm.te 2008-03-07 23:27:34.000000000 +0100 @@ -16,6 +16,7 @@ type lvm_t; type lvm_exec_t; @@ -14310,7 +14311,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.6.4/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/modutils.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/modutils.te 2008-03-07 23:27:34.000000000 +0100 @@ -43,7 +43,7 @@ # insmod local policy # @@ -14382,7 +14383,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-2.6.4/policy/modules/system/mount.fc --- nsaserefpolicy/policy/modules/system/mount.fc 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/mount.fc 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/mount.fc 2008-03-07 23:27:34.000000000 +0100 @@ -1,4 +1,2 @@ /bin/mount.* -- gen_context(system_u:object_r:mount_exec_t,s0) /bin/umount.* -- gen_context(system_u:object_r:mount_exec_t,s0) @@ -14390,7 +14391,7 @@ -/usr/bin/fusermount -- gen_context(system_u:object_r:mount_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.6.4/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/mount.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/mount.te 2008-03-07 23:27:34.000000000 +0100 @@ -9,6 +9,13 @@ ifdef(`targeted_policy',` ## @@ -14558,7 +14559,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/netlabel.te serefpolicy-2.6.4/policy/modules/system/netlabel.te --- nsaserefpolicy/policy/modules/system/netlabel.te 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/netlabel.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/netlabel.te 2008-03-07 23:27:34.000000000 +0100 @@ -20,6 +20,10 @@ allow netlabel_mgmt_t self:capability net_admin; allow netlabel_mgmt_t self:netlink_socket create_socket_perms; @@ -14572,7 +14573,7 @@ libs_use_ld_so(netlabel_mgmt_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-2.6.4/policy/modules/system/raid.te --- nsaserefpolicy/policy/modules/system/raid.te 2007-05-07 20:51:01.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/raid.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/raid.te 2008-03-07 23:27:34.000000000 +0100 @@ -19,7 +19,7 @@ # Local policy # @@ -14600,7 +14601,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.6.4/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.fc 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.fc 2008-03-07 23:27:34.000000000 +0100 @@ -40,6 +40,7 @@ /usr/sbin/setfiles.* -- gen_context(system_u:object_r:setfiles_exec_t,s0) /usr/sbin/setsebool -- gen_context(system_u:object_r:semanage_exec_t,s0) @@ -14611,7 +14612,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.6.4/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.if 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.if 2008-03-07 23:27:34.000000000 +0100 @@ -445,6 +445,7 @@ role $2 types run_init_t; allow run_init_t $3:chr_file rw_term_perms; @@ -14677,7 +14678,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.4/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2007-05-07 20:51:01.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/selinuxutil.te 2008-03-07 23:27:34.000000000 +0100 @@ -1,10 +1,8 @@ policy_module(selinuxutil,1.5.0) @@ -14920,7 +14921,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-2.6.4/policy/modules/system/sysnetwork.if --- nsaserefpolicy/policy/modules/system/sysnetwork.if 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.if 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.if 2008-03-07 23:27:34.000000000 +0100 @@ -520,6 +520,9 @@ files_search_etc($1) @@ -14933,7 +14934,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.6.4/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/sysnetwork.te 2008-03-07 23:27:34.000000000 +0100 @@ -45,7 +45,7 @@ dontaudit dhcpc_t self:capability sys_tty_config; # for access("/etc/bashrc", X_OK) on Red Hat @@ -14983,7 +14984,7 @@ allow ifconfig_t self:udp_socket create_socket_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.6.4/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/udev.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/udev.te 2008-03-07 23:27:34.000000000 +0100 @@ -18,11 +18,6 @@ type udev_etc_t alias etc_udev_t; files_config_file(udev_etc_t) @@ -15119,7 +15120,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.6.4/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-05-07 20:51:01.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/unconfined.fc 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/unconfined.fc 2008-03-07 23:27:34.000000000 +0100 @@ -10,4 +10,5 @@ /usr/bin/valgrind -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) /usr/local/RealPlayer/realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) @@ -15128,7 +15129,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.6.4/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/unconfined.if 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/unconfined.if 2008-03-07 23:27:34.000000000 +0100 @@ -18,7 +18,7 @@ ') @@ -15232,7 +15233,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.6.4/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/unconfined.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/unconfined.te 2008-03-07 23:27:34.000000000 +0100 @@ -6,6 +6,15 @@ # Declarations # @@ -15334,7 +15335,7 @@ dbus_stub(unconfined_execmem_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.6.4/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/userdomain.if 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/userdomain.if 2008-03-07 23:27:34.000000000 +0100 @@ -114,6 +114,22 @@ # Allow making the stack executable via mprotect. allow $1_t self:process execstack; @@ -15921,7 +15922,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.6.4/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2007-05-07 20:51:01.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/userdomain.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/userdomain.te 2008-03-07 23:27:34.000000000 +0100 @@ -15,7 +15,6 @@ # Declarations # @@ -16119,7 +16120,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.6.4/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2007-05-07 20:51:01.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/xen.if 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/xen.if 2008-03-07 23:27:34.000000000 +0100 @@ -72,12 +72,34 @@ ') @@ -16204,7 +16205,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.6.4/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2007-05-07 20:51:02.000000000 +0200 -+++ serefpolicy-2.6.4/policy/modules/system/xen.te 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/modules/system/xen.te 2008-03-07 23:27:34.000000000 +0100 @@ -25,6 +25,10 @@ domain_type(xend_t) init_daemon_domain(xend_t, xend_exec_t) @@ -16348,7 +16349,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_patterns.spt serefpolicy-2.6.4/policy/support/misc_patterns.spt --- nsaserefpolicy/policy/support/misc_patterns.spt 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/support/misc_patterns.spt 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/support/misc_patterns.spt 2008-03-07 23:27:34.000000000 +0100 @@ -41,11 +41,6 @@ # # Other process permissions @@ -16363,7 +16364,7 @@ allow $1 $2:{ file lnk_file } { read getattr }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.6.4/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/policy/support/obj_perm_sets.spt 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/policy/support/obj_perm_sets.spt 2008-03-07 23:27:34.000000000 +0100 @@ -203,7 +203,6 @@ define(`add_entry_dir_perms',`{ getattr search lock ioctl write add_name }') define(`del_entry_dir_perms',`{ getattr search lock ioctl write remove_name }') @@ -16397,7 +16398,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.6.4/Rules.modular --- nsaserefpolicy/Rules.modular 2007-05-07 20:51:05.000000000 +0200 -+++ serefpolicy-2.6.4/Rules.modular 2008-02-24 19:06:49.000000000 +0100 ++++ serefpolicy-2.6.4/Rules.modular 2008-03-07 23:27:34.000000000 +0100 @@ -167,7 +167,7 @@ # these have to run individually because order matters: $(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true From fedora-extras-commits at redhat.com Fri Mar 7 22:36:06 2008 From: fedora-extras-commits at redhat.com (Josef Kubin (jkubin)) Date: Fri, 7 Mar 2008 22:36:06 GMT Subject: rpms/selinux-policy/F-7 selinux-policy.spec,1.519,1.520 Message-ID: <200803072236.m27Ma6Wh023447@cvs-int.fedora.redhat.com> Author: jkubin Update of /cvs/pkgs/rpms/selinux-policy/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23412 Modified Files: selinux-policy.spec Log Message: Index: selinux-policy.spec =================================================================== RCS file: /cvs/pkgs/rpms/selinux-policy/F-7/selinux-policy.spec,v retrieving revision 1.519 retrieving revision 1.520 diff -u -r1.519 -r1.520 --- selinux-policy.spec 29 Feb 2008 14:09:20 -0000 1.519 +++ selinux-policy.spec 7 Mar 2008 22:35:30 -0000 1.520 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.6.4 -Release: 71%{?dist} +Release: 72%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -365,6 +365,9 @@ %endif %changelog +* Fri Mar 7 2008 Josef Kubin 2.6.4-72 +- Allow exim to manage log + * Mon Feb 24 2008 Josef Kubin 2.6.4-71 - Dontaudit rule for groupadd_t From fedora-extras-commits at redhat.com Fri Mar 7 22:38:58 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Fri, 7 Mar 2008 22:38:58 GMT Subject: comps comps-f7.xml.in, 1.318, 1.319 comps-f8.xml.in, 1.231, 1.232 comps-f9.xml.in, 1.295, 1.296 Message-ID: <200803072238.m27McwKv023565@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23496 Modified Files: comps-f7.xml.in comps-f8.xml.in comps-f9.xml.in Log Message: Add midori. Index: comps-f7.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v retrieving revision 1.318 retrieving revision 1.319 diff -u -r1.318 -r1.319 --- comps-f7.xml.in 7 Mar 2008 17:28:11 -0000 1.318 +++ comps-f7.xml.in 7 Mar 2008 22:38:28 -0000 1.319 @@ -1831,6 +1831,7 @@ linphone logjam mail-notification + midori Miro mugshot ochusha Index: comps-f8.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- comps-f8.xml.in 7 Mar 2008 17:28:11 -0000 1.231 +++ comps-f8.xml.in 7 Mar 2008 22:38:28 -0000 1.232 @@ -1954,6 +1954,7 @@ linphone logjam mail-notification + midori Miro mugshot ochusha Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- comps-f9.xml.in 7 Mar 2008 17:28:11 -0000 1.295 +++ comps-f9.xml.in 7 Mar 2008 22:38:28 -0000 1.296 @@ -1968,6 +1968,7 @@ linphone logjam mail-notification + midori Miro mugshot ochusha From fedora-extras-commits at redhat.com Fri Mar 7 22:39:14 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 22:39:14 GMT Subject: rpms/kdebase3/devel kdebase3.spec,1.45,1.46 Message-ID: <200803072239.m27MdEwL023575@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23534/devel Modified Files: kdebase3.spec Log Message: * Fri Mar 07 2008 Kevin Kofler - 3.5.9-5 - f9+: omit all of khelpcenter again, we only need the khelpcenter.desktop service description, so move that to kdebase-runtime which actually provides khelpcenter Index: kdebase3.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- kdebase3.spec 7 Mar 2008 22:30:14 -0000 1.45 +++ kdebase3.spec 7 Mar 2008 22:38:41 -0000 1.46 @@ -12,7 +12,7 @@ %define _with_samba --with-samba Version: 3.5.9 -Release: 4%{?dist} +Release: 5%{?dist} %if 0%{?fedora} > 8 Name: kdebase3 @@ -327,7 +327,7 @@ %if "%{name}" != "kdebase" export DO_NOT_COMPILE="kappfinder kdesktop klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins" export DO_NOT_COMPILE="$DO_NOT_COMPILE konqueror kscreensaver ksysguard knetattach kwin" -export DO_NOT_COMPILE="$DO_NOT_COMPILE kdialog kicker ksplashml kxkb" +export DO_NOT_COMPILE="$DO_NOT_COMPILE kdialog kicker ksplashml khelpcenter kxkb" export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi" # Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves, # kate for kscope, kdesu until we figure out what to do about it) @@ -795,6 +795,11 @@ %changelog +* Fri Mar 07 2008 Kevin Kofler - 3.5.9-5 +- f9+: omit all of khelpcenter again, we only need the khelpcenter.desktop + service description, so move that to kdebase-runtime which actually + provides khelpcenter + * Mon Mar 03 2008 Than Ngo 3.5.9-4 - apply upstream patch to fix crash in khotkey From fedora-extras-commits at redhat.com Fri Mar 7 22:47:39 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Fri, 7 Mar 2008 22:47:39 GMT Subject: rpms/perl-Sys-Virt/devel perl-Sys-Virt-0.1.2-free.patch, NONE, 1.1 perl-Sys-Virt.spec, 1.12, 1.13 Message-ID: <200803072247.m27MldAe023766@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/perl-Sys-Virt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23735 Modified Files: perl-Sys-Virt.spec Added Files: perl-Sys-Virt-0.1.2-free.patch Log Message: Fix use of free() in XS binding perl-Sys-Virt-0.1.2-free.patch: --- NEW FILE perl-Sys-Virt-0.1.2-free.patch --- diff -rup Sys-Virt-0.1.2.orig/Virt.xs Sys-Virt-0.1.2.new/Virt.xs --- Sys-Virt-0.1.2.orig/Virt.xs 2008-02-23 14:15:14.000000000 -0500 +++ Sys-Virt-0.1.2.new/Virt.xs 2008-03-07 17:36:28.000000000 -0500 @@ -197,13 +197,14 @@ list_domain_ids(con, maxids) PPCODE: Newx(ids, maxids, int); if ((nid = virConnectListDomains(con, ids, maxids)) < 0) { + Safefree(ids); _croak_error(virConnGetLastError(con)); } EXTEND(SP, nid); for (i = 0 ; i < nid ; i++) { PUSHs(sv_2mortal(newSViv(ids[i]))); } - free(ids); + Safefree(ids); int @@ -227,7 +228,7 @@ list_defined_domain_names(con, maxnames) PPCODE: Newx(names, maxnames, char *); if ((ndom = virConnectListDefinedDomains(con, names, maxnames)) < 0) { - free(names); + Safefree(names); _croak_error(virConnGetLastError(con)); } EXTEND(SP, ndom); @@ -235,7 +236,7 @@ list_defined_domain_names(con, maxnames) PUSHs(sv_2mortal(newSVpv(names[i], 0))); free(names[i]); } - free(names); + Safefree(names); int @@ -258,6 +259,7 @@ list_network_names(con, maxnames) PPCODE: Newx(names, maxnames, char *); if ((nnet = virConnectListNetworks(con, names, maxnames)) < 0) { + Safefree(names); _croak_error(virConnGetLastError(con)); } EXTEND(SP, nnet); @@ -265,7 +267,7 @@ list_network_names(con, maxnames) PUSHs(sv_2mortal(newSVpv(names[i], 0))); free(names[i]); } - free(names); + Safefree(names); int @@ -289,7 +291,7 @@ list_defined_network_names(con, maxnames PPCODE: Newx(names, maxnames, char *); if ((ndom = virConnectListDefinedNetworks(con, names, maxnames)) < 0) { - free(names); + Safefree(names); _croak_error(virConnGetLastError(con)); } EXTEND(SP, ndom); @@ -297,7 +299,7 @@ list_defined_network_names(con, maxnames PUSHs(sv_2mortal(newSVpv(names[i], 0))); free(names[i]); } - free(names); + Safefree(names); void Index: perl-Sys-Virt.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Sys-Virt/devel/perl-Sys-Virt.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Sys-Virt.spec 7 Mar 2008 02:17:12 -0000 1.12 +++ perl-Sys-Virt.spec 7 Mar 2008 22:47:03 -0000 1.13 @@ -1,11 +1,12 @@ Name: perl-Sys-Virt Version: 0.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Represent and manage a libvirt hypervisor connection License: GPLv2+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Sys-Virt/ Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-%{version}.tar.gz +Patch1: %{name}-%{version}-free.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::Pod) @@ -21,6 +22,7 @@ %prep %setup -q -n Sys-Virt-%{version} +%patch1 -p1 sed -i -e '/Sys-Virt\.spec/d' Makefile.PL sed -i -e '/\.spec\.PL$/d' MANIFEST @@ -59,6 +61,9 @@ %{_mandir}/man3/* %changelog +* Fri Mar 07 2008 Daniel P. Berrange - 0.1.2-3 +- Fix calls to free() in XS binding + * Thu Mar 06 2008 Tom "spot" Callaway - 0.1.2-2 Rebuild for new perl From fedora-extras-commits at redhat.com Fri Mar 7 22:48:53 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 22:48:53 GMT Subject: rpms/kdebase-runtime/devel khelpcenter.desktop, NONE, 1.1 kdebase-runtime.spec, 1.16, 1.17 Message-ID: <200803072248.m27Mmr7d023845@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23819/devel Modified Files: kdebase-runtime.spec Added Files: khelpcenter.desktop Log Message: * Fri Mar 07 2008 Kevin Kofler 4.0.2-2 - if building for a KDE 4 desktop, include the khelpcenter.desktop service description for KDE 3 here so help works in KDE 3 apps --- NEW FILE khelpcenter.desktop --- [Desktop Entry] Encoding=UTF-8 Name=KHelpCenter Name[af]=Khulpsentrum Name[be]=?????????? ???????????????? KDE Name[bg]=?????????????? ???????????? Name[cs]=Centrum n??pov??dy Name[csb]=Centr??m P??m??c?? Name[cy]=KCanolfanCymorth Name[da]=KHj??lpecenter Name[de]=KDE-Hilfezentrum Name[en_GB]=KHelpCentre Name[eo]=KHelpCentro Name[es]=KHelpcenter Name[et]=KDE abikeskus Name[fr]=Centre d'aide de KDE Name[gl]=Centro de Axuda de KDE Name[hi]=??????-???????????????-??????????????? Name[is]=Hj??lparkerfi KDE Name[ja]=K ????????????????????? Name[lo]=???????????????????????????????????? - K Name[lv]=KPal??dz??basCentrs Name[mn]=??????-???????????????????? ?????? Name[nds]=KDE-H??lpzentrum Name[ne]=??????????????? ??????????????? ????????????????????? Name[nso]=KBogare bja Thuso Name[pa]=??????????????????????????????????????? Name[pl]=Centrum Pomocy Name[pt_BR]=Centro de Ajuda Name[ro]=Centrul de ajutor KDE Name[ru]=?????????? ?????????????? Name[rw]=K-UmwanyaGufasha Name[sv]=Hj??lpcentralen Name[ta]=K??????????????????????????? Name[te]=?????????????????? ????????????????????? Name[tg]=?????????????? ?????????????? Name[th]=?????????????????????????????????????????? K Name[tr]=KDE Yard??m Merkezi Name[uz]=?????????? ?????????????? Name[ven]=Senthara ya thuso ya K Name[vi]=Trung t??m Tr??? gi??p KDE Name[wa]=KCinteDAidance Name[zh_CN]=KHelpcenter Comment=The KDE Help Center Comment[af]=Die Kde Hulp Sentrum Comment[ar]=???????? KDE ???????????????? Comment[az]=KDE Yard??m M??rk??zi Comment[be]=?????????? ???????????????? KDE Comment[bg]=???????????? ???? ?????????????? ???????????????????? Comment[bn]=??????.??????.???. ????????????????????? ????????????????????? Comment[br]=Kreizenn sikour KDE Comment[bs]=KDE centar za pomo?? Comment[ca]=El centre d'ajuda KDE Comment[cs]=Centrum n??pov??dy prost??ed?? KDE Comment[csb]=Centr??m P??m??c?? KDE Comment[cy]=Canolfan Cymorth KDE Comment[da]=KDE's hj??lpecenter Comment[de]=Das KDE-Hilfezentrum Comment[el]=???? ???????????? ???????????????? ?????? KDE Comment[en_GB]=The KDE Help Centre Comment[eo]=La KDE-helpocentro Comment[es]=El centro de ayuda de KDE Comment[et]=KDE abikeskus Comment[eu]=KDE laguntza gunea Comment[fa]=???????? ?????? KDE Comment[fi]=KDE:n Ohje Comment[fr]=Le centre de documentation de KDE Comment[fy]=It KDE-dokumintaasjesintrum Comment[ga]=L??rionad Cabhrach KDE Comment[gl]=O Centro de Axuda de KDE Comment[he]=???????? ?????????? ???? KDE Comment[hi]=??????????????? ????????? ?????????????????? Comment[hr]=KDE pomo?? Comment[hu]=KDE Seg??ts??g Comment[id]=Pusat Bantuan KDE Comment[is]=Hj??lparkerfi KDE Comment[it]=La guida di KDE Comment[ja]=KDE ????????????????????? Comment[kk]=KDE ???????????????? ???????????????? Comment[km]=????????????????????????????????????????????????????????? KDE Comment[ko]=KDE ????????? ?????? Comment[lo]=????????????????????????????????????????????? KDE Comment[lt]=KDE pagalbos centras Comment[lv]=KDE Pal??dz??bas Centrs Comment[mk]=KDE ???????????????? ???? ?????????? Comment[mn]=??????-???????????????????? ?????? Comment[ms]=Pusat Bantuan KDE Comment[mt]=??entru tal-G??ajnuna KDE Comment[nb]=KDE Hjelpesenter Comment[nds]=Dat KDE-H??lpzentrum Comment[ne]=??????????????? ??????????????? ????????????????????? Comment[nl]=Het KDE-documentatiecentrum Comment[nn]=KDE Hjelpesenter Comment[nso]=Bogare bja Thuso ya KDE Comment[oc]=Lo centre d'ajuda KDE Comment[pa]=??????????????? ?????????????????? ??????????????? Comment[pl]=Centrum Pomocy KDE Comment[pt]=O Centro de Ajuda do KDE Comment[pt_BR]=Centro de Ajuda do KDE Comment[ro]=Centrul de ajutor al KDE Comment[ru]=?????????? ?????????????? KDE Comment[rw]=KDE Ifashayobora Hagati Comment[se]=KDE veahkkeguovdd???? Comment[sk]=KDE Centrum pomocn??k Comment[sl]=Sredi????e pomo??i za KDE Comment[sr]=KDE ???????????? ???? ?????????? Comment[sr at Latn]=KDE centar za pomo?? Comment[sv]=KDE:s hj??lpcentral Comment[ta]=KDE ???????????? ??????????????? Comment[te]=??????????????? ???????????? ????????????????????? Comment[tg]=?????????????? ???????????????? KDE Comment[th]=??????????????????????????????????????????????????? KDE Comment[tr]=KDE Yard??m Merkezi Comment[tt]=KDE Y??rd??m ??z??ge Comment[uk]=?????????? ?????????????? KDE Comment[uz]=KDE ?????????? ?????????????? Comment[ven]=Senthara ya thuso ya KDE Comment[vi]=Trung t??m Tr??? gi??p KDE Comment[wa]=Li Cinte d' aidance KDE Comment[xh]=Umbindi woncedo lwe KDE Comment[zh_CN]=KDE ???????????? Comment[zh_TW]=KDE ???????????? Comment[zu]=Indawo Yosizi ye-KDE Icon=khelpcenter DocPath=khelpcenter/index.html Type=Service Terminal=false Exec=khelpcenter %u SwallowExec= SwallowTitle= X-KDE-StartupNotify=true Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- kdebase-runtime.spec 29 Feb 2008 13:13:21 -0000 1.16 +++ kdebase-runtime.spec 7 Mar 2008 22:48:18 -0000 1.17 @@ -9,12 +9,14 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: User Interface/Desktops URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2 +# KDE 3 version of this service description +Source1: khelpcenter.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: kdebase4-runtime < %{version}-%{release} @@ -164,6 +166,11 @@ # remove country flags because some people/countries forbid some other # people/countries' flags :-( rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png +# install this service for KDE 3 applications +# NOTE: This is not a standard .desktop file, but an "almost standard" one +# installed into a KDE-3-specific directory, as usual for KDE 3 services, +# so we can't use desktop-file-install for it. +install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/ %endif @@ -214,10 +221,15 @@ %{_kde4_datadir}/locale/en_US/entry.desktop %{_kde4_datadir}/locale/l10n/*.desktop %{_kde4_datadir}/locale/l10n/*/entry.desktop +%{_datadir}/services/khelpcenter.desktop %endif %changelog +* Fri Mar 07 2008 Kevin Kofler 4.0.2-2 +- if building for a KDE 4 desktop, include the khelpcenter.desktop service + description for KDE 3 here so help works in KDE 3 apps + * Fri Feb 29 2008 Than Ngo 4.0.2-1 - 4.0.2 From fedora-extras-commits at redhat.com Fri Mar 7 22:53:36 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Fri, 7 Mar 2008 22:53:36 GMT Subject: rpms/distcc/devel distcc-2.18.3-avahi.patch, NONE, 1.1 distcc.spec, NONE, 1.1 distccd.init, NONE, 1.1 hosts.sample, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803072253.m27Mra9g023972@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/distcc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23929/devel Modified Files: .cvsignore sources Added Files: distcc-2.18.3-avahi.patch distcc.spec distccd.init hosts.sample Log Message: Initial import distcc-2.18.3-avahi.patch: --- NEW FILE distcc-2.18.3-avahi.patch --- --- distcc-2.18.3/Makefile.in 2004-10-24 07:05:48.000000000 +0200 +++ distcc-2.18.3.lennart/Makefile.in 2007-12-30 16:05:58.000000000 +0100 @@ -180,6 +180,7 @@ distcc_obj = src/backoff.o \ src/ssh.o src/state.o src/strip.o \ src/timefile.o src/traceenv.o \ src/where.o \ + @ZEROCONF_DISTCC_OBJS@ \ $(common_obj) distccd_obj = src/access.o \ @@ -187,6 +188,7 @@ distccd_obj = src/access.o \ src/ncpus.o \ src/prefork.o \ src/serve.o src/setuid.o src/srvnet.o src/srvrpc.o src/state.o \ + @ZEROCONF_DISTCCD_OBJS@ \ $(common_obj) @BUILD_POPT@ # Objects that need to be linked in to build monitors --- distcc-2.18.3/src/distcc.c 2004-10-02 02:47:07.000000000 +0200 +++ distcc-2.18.3.lennart/src/distcc.c 2007-12-30 13:55:27.000000000 +0100 @@ -83,6 +83,9 @@ static void dcc_show_usage(void) " COMPILER defaults to \"cc\"\n" " --help explain usage and exit\n" " --version show version and exit\n" +" --show-hosts show host list and exit\n" +" -j calculate the concurrency level from\n" +" the host list.\n" "\n" "Environment variables:\n" " See the manual page for a complete list.\n" @@ -135,7 +138,46 @@ static void dcc_client_catch_signals(voi signal(SIGHUP, &dcc_client_signalled); } +static void dcc_free_hostlist(struct dcc_hostdef *list) { + while (list) { + struct dcc_hostdef *l = list; + list = list->next; + dcc_free_hostdef(l); + } +} + +static void dcc_show_hosts(void) { + struct dcc_hostdef *list, *l; + int nhosts; + + if (dcc_get_hostlist(&list, &nhosts) != 0) { + rs_log_crit("Failed to get host list"); + return; + } + + for (l = list; l; l = l->next) + printf("%s\n", l->hostdef_string); + + dcc_free_hostlist(list); +} + +static void dcc_concurrency_level(void) { + struct dcc_hostdef *list, *l; + int nhosts; + int nslots = 0; + + if (dcc_get_hostlist(&list, &nhosts) != 0) { + rs_log_crit("Failed to get host list"); + return; + } + + for (l = list; l; l = l->next) + nslots += l->n_slots; + dcc_free_hostlist(list); + + printf("%i\n", nslots); +} /** * distcc client entry point. @@ -182,6 +224,18 @@ int main(int argc, char **argv) ret = 0; goto out; } + + if (!strcmp(argv[1], "--show-hosts")) { + dcc_show_hosts(); + ret = 0; + goto out; + } + + if (!strcmp(argv[1], "-j")) { + dcc_concurrency_level(); + ret = 0; + goto out; + } dcc_find_compiler(argv, &compiler_args); /* compiler_args is now respectively either "cc -c hello.c" or --- distcc-2.18.3/src/distcc.h 2004-11-21 19:36:30.000000000 +0100 +++ distcc-2.18.3.lennart/src/distcc.h 2007-12-30 13:55:27.000000000 +0100 @@ -112,7 +112,7 @@ int dcc_parse_hosts_env(struct dcc_hostd int *ret_nhosts); int dcc_parse_hosts(const char *where, const char *source_name, struct dcc_hostdef **ret_list, - int *ret_nhosts); + int *ret_nhosts, struct dcc_hostdef **ret_prev); /* ncpu.c */ int dcc_ncpus(int *); @@ -226,6 +226,7 @@ int dcc_get_tempdir(const char **); int dcc_make_tmpnam(const char *, const char *suffix, char **); int dcc_mkdir(const char *path) WARN_UNUSED; +int dcc_get_subdir(const char *name, char **path_ret) WARN_UNUSED; int dcc_get_lock_dir(char **path_ret) WARN_UNUSED; int dcc_get_state_dir(char **path_ret) WARN_UNUSED; int dcc_get_top_dir(char **path_ret) WARN_UNUSED; --- distcc-2.18.3/src/dopt.c 2004-10-24 07:05:48.000000000 +0200 +++ distcc-2.18.3.lennart/src/dopt.c 2007-12-30 13:55:27.000000000 +0100 @@ -93,6 +93,10 @@ enum { opt_log_level }; +#ifdef HAVE_AVAHI +/* Flag for enabling/disabling Zeroconf using Avahi */ +int opt_zeroconf = 0; +#endif const struct poptOption options[] = { { "allow", 'a', POPT_ARG_STRING, 0, 'a', 0, 0 }, @@ -115,6 +119,9 @@ const struct poptOption options[] = { { "verbose", 0, POPT_ARG_NONE, 0, 'v', 0, 0 }, { "version", 0, POPT_ARG_NONE, 0, 'V', 0, 0 }, { "wizard", 'W', POPT_ARG_NONE, 0, 'W', 0, 0 }, +#ifdef HAVE_AVAHI + { "zeroconf", 0, POPT_ARG_NONE, &opt_zeroconf, 0, 0, 0 }, +#endif { 0, 0, 0, 0, 0, 0, 0 } }; @@ -137,6 +144,9 @@ static void distccd_show_usage(void) " -p, --port PORT TCP port to listen on\n" " --listen ADDRESS IP address to listen on\n" " -a, --allow IP[/BITS] client address access control\n" +#ifdef HAVE_AVAHI +" --zeroconf register via mDNS/DNS-SD\n" +#endif " Debug and trace:\n" " --log-level=LEVEL set detail level for log file\n" " levels: critical, error, warning, notice, info, debug\n" --- distcc-2.18.3/src/dopt.h 2004-07-30 03:12:13.000000000 +0200 +++ distcc-2.18.3.lennart/src/dopt.h 2007-12-30 13:55:27.000000000 +0100 @@ -38,3 +38,7 @@ extern int opt_log_stderr; extern int opt_lifetime; extern char *opt_listen_addr; extern int opt_niceness; + +#ifdef HAVE_AVAHI +extern int opt_zeroconf; +#endif --- distcc-2.18.3/src/dparent.c 2004-10-24 07:05:48.000000000 +0200 +++ distcc-2.18.3.lennart/src/dparent.c 2007-12-30 13:55:27.000000000 +0100 @@ -70,6 +70,7 @@ #include "types.h" #include "daemon.h" #include "netutil.h" +#include "zeroconf.h" static void dcc_nofork_parent(int listen_fd) NORETURN; static void dcc_detach(void); @@ -94,6 +95,9 @@ int dcc_standalone_server(void) int listen_fd; int n_cpus; int ret; +#ifdef HAVE_AVAHI + void *avahi = NULL; +#endif if ((ret = dcc_socket_listen(arg_port, &listen_fd, opt_listen_addr)) != 0) return ret; @@ -131,6 +135,14 @@ int dcc_standalone_server(void) /* Don't catch signals until we've detached or created a process group. */ dcc_daemon_catch_signals(); +#ifdef HAVE_AVAHI + /* Zeroconf registration */ + if (opt_zeroconf) { + if (!(avahi = dcc_zeroconf_register((uint16_t) arg_port, n_cpus))) + return EXIT_CONNECT_FAILED; + } +#endif + /* This is called in the master daemon, whether that is detached or * not. */ dcc_master_pid = getpid(); @@ -138,10 +150,21 @@ int dcc_standalone_server(void) if (opt_no_fork) { dcc_log_daemon_started("non-forking daemon"); dcc_nofork_parent(listen_fd); + ret = 0; } else { [...11704 lines suppressed...] -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines -# This sed command replaces #undef with comments. This is necessary, for +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : +do + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def _ACEOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - rm -f $ac_file - mv $tmp/config.h $ac_file + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi -done -_ACEOF + rm -f "$tmp/out12" + ;; + + + esac + +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF --- NEW FILE distcc.spec --- Name: distcc Version: 2.18.3 Release: 4%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ URL: http://distcc.samba.org/ Source0: http://distcc.samba.org/ftp/distcc/distcc-%{version}.tar.bz2 Source1: hosts.sample Source2: distccd.init Patch0: distcc-2.18.3-avahi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: popt-devel BuildRequires: libgnomeui-devel BuildRequires: pango-devel BuildRequires: python BuildRequires: desktop-file-utils BuildRequires: avahi-devel %description distcc is a program to distribute compilation of C or C++ code across several machines on a network. distcc should always generate the same results as a local compile, is simple to install and use, and is often two or more times faster than a local compile. %package server Summary: Server for distributed C/C++ compilation Group: Development/Tools License: GPLv2+ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig %description server This package contains the compilation server needed to use %{name}. %prep %setup -q %patch0 -p1 -b .avahi %build %configure --with-gnome --with-docdir=%{_datadir}/doc/%{name}-%{version} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Move desktop file to right directory mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*.desktop $RPM_BUILD_ROOT%{_datadir}/applications/ sed -i 's at Icon=@Icon=%{_datadir}/%{name}/@' $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop # Install sample hosts file install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts # Install sample distccd config file install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/distccd # Install distccd init file install -Dm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/distccd %post update-desktop-database &> /dev/null ||: %post server [ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||: %preun server [ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||: %postun update-desktop-database &> /dev/null ||: %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_datadir}/doc/%{name}-%{version} %{_bindir}/distcc %{_bindir}/distccmon* %{_mandir}/man1/distcc.* %{_mandir}/man1/distccmon* %{_datadir}/%{name} %{_datadir}/applications/*.desktop %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/hosts %files server %defattr(-,root,root,-) %doc COPYING README %{_bindir}/distccd %{_sysconfdir}/init.d/* %{_mandir}/man1/distccd* %config(noreplace) %{_sysconfdir}/sysconfig/distccd %changelog * Fri Feb 22 2008 Denis Leroy - 2.18.3-4 - Added Avahi support patch from Lennart * Tue Feb 19 2008 Denis Leroy - 2.18.3-3 - LSB header for init script * Mon Feb 18 2008 Denis Leroy - 2.18.3-2 - Fixed Source0 URL, fixed init script * Mon Feb 4 2008 Denis Leroy - 2.18.3-1 - First version --- NEW FILE distccd.init --- #!/bin/sh # # distccd - A distributed compilation server. # # # chkconfig: - 80 20 # description: distccd - distcc distributed compilation server # ### BEGIN INIT INFO # Provides: distccd # Required-Start: $network $syslog $local_fs # Required-Stop: $network $syslog $local_fs # Default-Stop: 0 1 2 6 # Short-Description: Distributed C/C++ Compilation Server # Description: distcc is a program to distribute compilation of C or C++ # code across several machines on a network. distcc should # always generate the same results as a local compile, is # simple to install and use, and is often two or more times # faster than a local compile. ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions exec="/usr/bin/distccd" prog="distccd" # Default variables SYSCONFIG="/etc/sysconfig/distccd" OPTIONS="" USER="nobody" DISTCCPATH="$PATH" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 [ -z "$OPTIONS" ] && exit 6 echo -n $"Starting $prog: " DISTCCD_PATH="$DISTCCPATH" $prog --daemon --user "$USER" $OPTIONS && success || failure retval=$? echo [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n $"Stopping $prog: " killproc $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } reload() { restart } force_reload() { restart } rh_status() { # run checks to determine if the service is running or use generic status status $prog } rh_status_q() { rh_status >/dev/null 2>&1 } case "$1" in start) rh_status_q && exit 0 $1 ;; stop) rh_status_q || exit 0 $1 ;; restart) $1 ;; reload) rh_status_q || exit 7 $1 ;; force-reload) force_reload ;; status) rh_status ;; condrestart|try-restart) rh_status_q || exit 0 restart ;; *) echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" exit 2 esac exit $? --- NEW FILE hosts.sample --- # The grammar of the host file is, informally: # # DISTCC_HOSTS = HOSTSPEC ... # HOSTSPEC = LOCAL_HOST | SSH_HOST | TCP_HOST | OLDSTYLE_TCP_HOST # LOCAL_HOST = localhost[/LIMIT] # SSH_HOST = [USER]@HOSTID[/LIMIT][:COMMAND][OPTIONS] # TCP_HOST = HOSTID[:PORT][/LIMIT][OPTIONS] # OLDSTYLE_TCP_HOST = HOSTID[/LIMIT][:PORT][OPTIONS] # HOSTID = HOSTNAME | IPV4 # OPTIONS = ,OPTION[OPTIONS] # OPTION = lzo Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/distcc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 21:44:16 -0000 1.1 +++ .cvsignore 7 Mar 2008 22:53:03 -0000 1.2 @@ -0,0 +1 @@ +distcc-2.18.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/distcc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 21:44:16 -0000 1.1 +++ sources 7 Mar 2008 22:53:03 -0000 1.2 @@ -0,0 +1 @@ +0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 23:01:37 2008 From: fedora-extras-commits at redhat.com (Josef Kubin (jkubin)) Date: Fri, 7 Mar 2008 23:01:37 GMT Subject: rpms/selinux-policy/F-7 policy-20070501.patch,1.94,1.95 Message-ID: <200803072301.m27N1bDA031271@cvs-int.fedora.redhat.com> Author: jkubin Update of /cvs/pkgs/rpms/selinux-policy/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24086 Modified Files: policy-20070501.patch Log Message: fix for a small typing error policy-20070501.patch: Index: policy-20070501.patch =================================================================== RCS file: /cvs/pkgs/rpms/selinux-policy/F-7/policy-20070501.patch,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- policy-20070501.patch 7 Mar 2008 22:33:01 -0000 1.94 +++ policy-20070501.patch 7 Mar 2008 23:01:24 -0000 1.95 @@ -8409,7 +8409,7 @@ optional_policy(` + exim_domtrans(system_mail_t) -+ exim_manage_log(system_mail_t) ++ exim_manage_logs(system_mail_t) +') + +optional_policy(` From fedora-extras-commits at redhat.com Fri Mar 7 23:03:31 2008 From: fedora-extras-commits at redhat.com (Chauvet (kwizart)) Date: Fri, 7 Mar 2008 23:03:31 GMT Subject: rpms/cinepaint/devel cinepaint-0.22-multilib.patch,1.2,1.3 Message-ID: <200803072303.m27N3Vuo031336@cvs-int.fedora.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/cinepaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31308 Modified Files: cinepaint-0.22-multilib.patch Log Message: more multilib improvements cinepaint-0.22-multilib.patch: Index: cinepaint-0.22-multilib.patch =================================================================== RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint-0.22-multilib.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cinepaint-0.22-multilib.patch 7 Mar 2008 22:20:26 -0000 1.2 +++ cinepaint-0.22-multilib.patch 7 Mar 2008 23:03:26 -0000 1.3 @@ -1,6 +1,6 @@ diff -up cinepaint-0.22-1/cinepainttool.in.multilib cinepaint-0.22-1/cinepainttool.in ---- cinepaint-0.22-1/cinepainttool.in.multilib 2008-03-07 21:48:32.000000000 +0100 -+++ cinepaint-0.22-1/cinepainttool.in 2008-03-07 21:52:08.000000000 +0100 +--- cinepaint-0.22-1/cinepainttool.in.multilib 2008-03-07 23:19:19.000000000 +0100 ++++ cinepaint-0.22-1/cinepainttool.in 2008-03-07 23:36:50.000000000 +0100 @@ -71,8 +71,8 @@ if test $# -eq 0; then fi @@ -29,7 +29,28 @@ + libdirs="-L`pkg-config --variable libdir gtk+-2.0`" for i in $gtk_libs ; do - if test $i != -L at libdir@ ; then -+ if test $i != -L`pkg-config --variable libdir gtk+-2.0` ; then ++ if test $i != "-L`pkg-config --variable libdir gtk+-2.0`" ; then if test -z "$my_gtk_libs" ; then my_gtk_libs="$i" else +@@ -202,9 +202,9 @@ while test $# -gt 0; do + fi + glib_libs="$glib_ldflags `echo $gtk_libs | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`" + my_glib_libs= +- libdirs=-L at libdir@ ++ libdirs=-L`pkg-config --variable libdir gtk+-2.0` + for i in $glib_libs ; do +- if test $i != -L at libdir@ ; then ++ if test $i != -L`pkg-config --variable libdir gtk+-2.0` ; then + if test -z "$my_glib_libs" ; then + my_glib_libs="$i" + else +@@ -212,7 +212,7 @@ while test $# -gt 0; do + fi + fi + done +- echo -L at libdir@ -lcinepaint -lcinepaintHalf $my_glib_libs ++ echo -L`pkg-config --variable libdir gtk+-2.0` -lcinepaint -lcinepaintHalf $my_glib_libs + ;; + --install-dir) + echo "$plug_in_dir/plug-ins" From fedora-extras-commits at redhat.com Fri Mar 7 23:05:26 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 23:05:26 GMT Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.17,1.18 Message-ID: <200803072305.m27N5Qeb031441@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31389/devel Modified Files: kdebase-runtime.spec Log Message: Fix install command. Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- kdebase-runtime.spec 7 Mar 2008 22:48:18 -0000 1.17 +++ kdebase-runtime.spec 7 Mar 2008 23:04:47 -0000 1.18 @@ -170,7 +170,7 @@ # NOTE: This is not a standard .desktop file, but an "almost standard" one # installed into a KDE-3-specific directory, as usual for KDE 3 services, # so we can't use desktop-file-install for it. -install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/ +install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop %endif From fedora-extras-commits at redhat.com Fri Mar 7 23:10:36 2008 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Fri, 7 Mar 2008 23:10:36 GMT Subject: rpms/kernel/devel linux-2.6-ia32-syscall-restart-ptrace64.patch, NONE, 1.1 kernel.spec, 1.483, 1.484 Message-ID: <200803072310.m27NAaLn031554@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31519 Modified Files: kernel.spec Added Files: linux-2.6-ia32-syscall-restart-ptrace64.patch Log Message: x86_64: fix 32-bit process syscall restart via 64-bit ptrace (#436183) linux-2.6-ia32-syscall-restart-ptrace64.patch: --- NEW FILE linux-2.6-ia32-syscall-restart-ptrace64.patch --- >From a5bf891054c4f8b2be0da8fc5fd3c91e1e0bd069 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 7 Mar 2008 14:44:09 -0800 Subject: [PATCH] x86_64 ptrace orig_ax on ia32 task This makes 64-bit ptrace calls setting the 64-bit orig_ax field for a 32-bit task sign-extend the low 32 bits up to 64. This matches what a 64-bit debugger expects when tracing a 32-bit task. This follows on my "x86_64 ia32 syscall restart fix". This didn't matter until that was fixed. The debugger ignores or zeros the high half of every register slot it sets (including the orig_rax pseudo-register) uniformly. It expects that the setting of the low 32 bits always has the same meaning as a 32-bit debugger setting those same 32 bits with native 32-bit facilities. This never arose before because the syscall restart check never matched any -ERESTART* values due to lack of sign extension. Before that fix, even 32-bit ptrace setting orig_eax to -1 failed to trigger the restart check anyway. So this was never noticed as a regression of 64-bit debuggers vs 32-bit debuggers on the same 64-bit kernel. Signed-off-by: Roland McGrath --- arch/x86/kernel/ptrace.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index f8eed1b..92b44e1 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -322,6 +322,20 @@ static int putreg(struct task_struct *child, case offsetof(struct user_regs_struct, flags): return set_flags(child, value); +#ifdef CONFIG_IA32_EMULATION + case offsetof(struct user_regs_struct, orig_ax): + /* + * For a 32-bit task, setting only the low 32 bits and + * leaving the high bits untouched (all 0) has the same + * effect as setting those bits via 32-bit ptrace would. + * This means sign-extending an orig_eax of -1, which + * here is an orig_rax of (u32)-1. + */ + if (test_tsk_thread_flag(child, TIF_IA32)) + value = (long) (s32) value; + break; +#endif + #ifdef CONFIG_X86_64 case offsetof(struct user_regs_struct,fs_base): if (value >= TASK_SIZE_OF(child)) -- 1.5.4.1 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.483 retrieving revision 1.484 diff -u -r1.483 -r1.484 --- kernel.spec 7 Mar 2008 18:54:31 -0000 1.483 +++ kernel.spec 7 Mar 2008 23:10:01 -0000 1.484 @@ -248,7 +248,7 @@ # no need to build headers again for these arches, # they can just use i386 and ppc64 headers -%ifarch i586 i686 ppc64iseries +%ifarch i586 i686 ppc64iseries %define with_headers 0 %endif @@ -581,6 +581,7 @@ Patch75: linux-2.6-x86-debug-boot.patch Patch80: linux-2.6-ia32-syscall-restart.patch +Patch81: linux-2.6-ia32-syscall-restart-ptrace64.patch Patch123: linux-2.6-ppc-rtc.patch Patch140: linux-2.6-ps3-ehci-iso.patch @@ -1013,6 +1014,7 @@ ApplyPatch linux-2.6-x86-tune-generic.patch ApplyPatch linux-2.6-ia32-syscall-restart.patch +ApplyPatch linux-2.6-ia32-syscall-restart-ptrace64.patch # # PowerPC @@ -1204,7 +1206,7 @@ echo "# $Arch" > configs/$i cat .config >> configs/$i done -# end of kernel config +# end of kernel config %endif # get rid of unwanted files resulting from patch fuzz @@ -1752,6 +1754,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Fri Mar 7 2008 Roland McGrath +- x86_64: fix 32-bit process syscall restart via 64-bit ptrace (#436183) + * Fri Mar 07 2008 Dave Jones - Enable unused symbols. From fedora-extras-commits at redhat.com Fri Mar 7 23:20:17 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Fri, 7 Mar 2008 23:20:17 GMT Subject: rpms/perl-Test-AutoBuild/devel perl-Test-AutoBuild-1.2.2-git-output.patch, NONE, 1.1 perl-Test-AutoBuild.spec, 1.8, 1.9 Message-ID: <200803072320.m27NKHcS031700@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/perl-Test-AutoBuild/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31665 Modified Files: perl-Test-AutoBuild.spec Added Files: perl-Test-AutoBuild-1.2.2-git-output.patch Log Message: Fixed test case for change in GIT output perl-Test-AutoBuild-1.2.2-git-output.patch: --- NEW FILE perl-Test-AutoBuild-1.2.2-git-output.patch --- diff -rup Test-AutoBuild-1.2.2/lib/Test/AutoBuild/Repository/Git.pm Test-AutoBuild-1.2.2.new/lib/Test/AutoBuild/Repository/Git.pm --- Test-AutoBuild-1.2.2/lib/Test/AutoBuild/Repository/Git.pm 2007-12-09 21:23:35.000000000 -0500 +++ Test-AutoBuild-1.2.2.new/lib/Test/AutoBuild/Repository/Git.pm 2008-03-07 17:55:10.000000000 -0500 @@ -239,6 +239,7 @@ sub _get_changes { # ignore } } elsif (defined $logs{$hash}->{description}) { + next if $line =~ /^\s*\s*$/; $line =~ s/(^\s*)|(\s*$)//g; if ($logs{$hash}->{description} eq "") { $logs{$hash}->{description} .= $line; diff -rup Test-AutoBuild-1.2.2/t/110-Repository-Git.t Test-AutoBuild-1.2.2.new/t/110-Repository-Git.t --- Test-AutoBuild-1.2.2/t/110-Repository-Git.t 2007-12-09 21:23:35.000000000 -0500 +++ Test-AutoBuild-1.2.2.new/t/110-Repository-Git.t 2008-03-07 17:57:35.000000000 -0500 @@ -69,13 +69,13 @@ SKIP: { user => "Daniel Berrange ", date => "1197239956", files => ["a"], - description => "Change 1 on trunk\n")}, 1); + description => "Change 1 on trunk")}, 1); &checkout(3, "head", $head, 1197239967, "2\n", 1, { "3c4dfa7" => Test::AutoBuild::Change->new(number => "3c4dfa7", user => "Daniel Berrange ", date => "1197239966", files => ["a"], - description => "Change 2 on trunk\n")}, 2); + description => "Change 2 on trunk")}, 2); #&checkout("head", $head, 1109844423, "2\n", 0, { }, 3 ); @@ -85,12 +85,12 @@ SKIP: { user => "Daniel Berrange ", date => "1197239986", files => ["a"], - description => "Change 3 on branch\n"), + description => "Change 3 on branch"), "3870532" => Test::AutoBuild::Change->new(number => "3870532", user => "Daniel Berrange ", date => "1197240006", files => ["a"], - description => "Change 4 on trunk\n"), }, 4 ); + description => "Change 4 on trunk"), }, 4 ); &checkout(6, "branch", $branch, 1197240007, "3\n", 0, {}, 3); #&checkout("head", $head, 1109844447, "4\n", 0, { }, 7); @@ -98,23 +98,23 @@ SKIP: { user => "Daniel Berrange ", date => "1197240016", files => ["a"], - description => "Change 5 on branch\n") }, 5 ); + description => "Change 5 on branch") }, 5 ); &checkout(8, "head", $head, 1197240027, "6\n", 1, { "10c317b" => Test::AutoBuild::Change->new(number => "10c317b", user => "Daniel Berrange ", date => "1197240016", files => ["a"], - description => "Change 5 on branch\n"), + description => "Change 5 on branch"), "f92574d"=> Test::AutoBuild::Change->new(number => "f92574d", user => "Daniel Berrange ", date => "1197240016", files => [], - description => "Merge branch 'wibble'\n"), + description => "Merge branch 'wibble'"), "0273df1"=> Test::AutoBuild::Change->new(number => "0273df1", user => "Daniel Berrange ", date => "1197240026", files => ["a"], - description => "Change 6 on trunk\n") }, 6 ); + description => "Change 6 on trunk") }, 6 ); &checkout(9, "branch", $branch, 1197240027, "5\n", 0, {}, 5); } Index: perl-Test-AutoBuild.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-AutoBuild/devel/perl-Test-AutoBuild.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Test-AutoBuild.spec 7 Mar 2008 02:17:27 -0000 1.8 +++ perl-Test-AutoBuild.spec 7 Mar 2008 23:19:39 -0000 1.9 @@ -12,11 +12,12 @@ Summary: Framework for performing continuous, unattended, automated software builds Name: perl-%{appname} Version: 1.2.2 -Release: 2%{_extra_release} +Release: 3%{_extra_release} License: GPLv2+ Group: Development/Tools Url: http://autobuild.org/ Source: http://www.cpan.org/authors/id/D/DA/DANBERR/%{appname}-%{version}.tar.gz +Patch1: %{name}-%{version}-git-output.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -33,6 +34,8 @@ BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) +BuildRequires: perl(YAML::Syck) +BuildRequires: perl(Test::YAML::Meta::Version) BuildRequires: cvs >= 1.11 BuildRequires: subversion >= 1.0.0 BuildRequires: tla >= 1.1.0 @@ -235,6 +238,7 @@ %prep %setup -q -n %{appname}-%{version} +%patch1 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -423,6 +427,10 @@ %config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass %changelog +* Fri Mar 07 2008 Daniel P. Berrange - 1.2.2-3.fc9 +- Fix parsing of GIT output +- Added missing build requires for META.yml test case + * Thu Mar 06 2008 Tom "spot" Callaway - 1.2.2-2 Rebuild for new perl From fedora-extras-commits at redhat.com Fri Mar 7 23:24:09 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Fri, 7 Mar 2008 23:24:09 GMT Subject: rpms/roundup/devel .cvsignore, 1.5, 1.6 roundup.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200803072324.m27NO9QN031842@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/roundup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31798 Modified Files: .cvsignore roundup.spec sources Log Message: roundup-1.4.4-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/roundup/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Feb 2008 22:10:02 -0000 1.5 +++ .cvsignore 7 Mar 2008 23:23:30 -0000 1.6 @@ -1 +1 @@ -roundup-1.4.2.tar.gz +roundup-1.4.4.tar.gz Index: roundup.spec =================================================================== RCS file: /cvs/extras/rpms/roundup/devel/roundup.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- roundup.spec 20 Feb 2008 22:10:02 -0000 1.11 +++ roundup.spec 7 Mar 2008 23:23:30 -0000 1.12 @@ -2,7 +2,7 @@ Summary: Simple and flexible issue-tracking system Name: roundup -Version: 1.4.2 +Version: 1.4.4 Release: 1%{dist} License: MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %doc README.Fedora COPYING.txt %changelog +* Fri Mar 7 2008 Paul P. Komkoff Jr - 1.4.4-1 +- new upstream version with security fixes + * Wed Feb 20 2008 Paul P. Komkoff Jr - 1.4.1-2 - new upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/roundup/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Feb 2008 22:10:02 -0000 1.5 +++ sources 7 Mar 2008 23:23:30 -0000 1.6 @@ -1 +1 @@ -264b6f060eaf99666e927df4844be895 roundup-1.4.2.tar.gz +6a9f6fc272d833ef0179b00e63010a08 roundup-1.4.4.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 23:33:03 2008 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Fri, 7 Mar 2008 23:33:03 GMT Subject: rpms/libmtp/devel .cvsignore, 1.14, 1.15 libmtp.spec, 1.18, 1.19 sources, 1.14, 1.15 Message-ID: <200803072333.m27NX3lK032049@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libmtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32017 Modified Files: .cvsignore libmtp.spec sources Log Message: New upstream bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 2 Mar 2008 20:40:50 -0000 1.14 +++ .cvsignore 7 Mar 2008 23:32:23 -0000 1.15 @@ -1 +1 @@ -libmtp-0.2.6.tar.gz +libmtp-0.2.6.1.tar.gz Index: libmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libmtp.spec 2 Mar 2008 20:40:50 -0000 1.18 +++ libmtp.spec 7 Mar 2008 23:32:23 -0000 1.19 @@ -2,7 +2,7 @@ # RPM repository. Name: libmtp -Version: 0.2.6 +Version: 0.2.6.1 Release: 1%{?dist} Summary: A software library for MTP media players URL: http://libmtp.sourceforge.net/ @@ -108,6 +108,9 @@ %changelog +* Sat Mar 8 2008 Linus Walleij 0.2.6.1-1 +- New upstream bugfix release. + * Sun Mar 2 2008 Linus Walleij 0.2.6-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmtp/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 Mar 2008 20:40:50 -0000 1.14 +++ sources 7 Mar 2008 23:32:23 -0000 1.15 @@ -1 +1 @@ -a320b724a00ff17d97e7ccbf74ad01f0 libmtp-0.2.6.tar.gz +02770a7b4bfb91cd9e1bd26eaa84770b libmtp-0.2.6.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 23:40:40 2008 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Fri, 7 Mar 2008 23:40:40 GMT Subject: rpms/dvipdfmx/devel dvipdfmx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803072340.m27NeeoG032330@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/dvipdfmx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299/devel Modified Files: .cvsignore sources Added Files: dvipdfmx.spec Log Message: Initial package import. --- NEW FILE dvipdfmx.spec --- # These macros need to match what is in the texlive-texmf package. For # this reason texlive-texmf is a BuildRequires, and it installs an rpm # macro file that defines them. Here we define them in case they're # not set. %{!?_texmf_main: %define _texmf_main %{_datadir}/texmf} %{!?_texmf_conf: %define _texmf_conf %{_sysconfdir}/texmf} %define snapshot 20071115 Name: dvipdfmx Version: 0 Release: 0.20.%{snapshot}cvs%{?dist} Summary: A DVI to PDF translator Group: Applications/Publishing License: GPLv2+ URL: http://project.ktug.or.kr/dvipdfmx/ Source0: http://project.ktug.or.kr/dvipdfmx/snapshot/current/%{name}-%{snapshot}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kpathsea-devel libpng-devel zlib-devel libpaper-devel texlive-texmf Requires: texlive-texmf-fonts Requires: ghostscript Requires(post): /usr/bin/mktexlsr Requires(postun): /usr/bin/mktexlsr %description The dvipdfmx (formerly dvipdfm-cjk) project provides an eXtended version of the dvipdfm, a DVI to PDF translator developed by Mark A. Wicks. The primary goal of this project is to support multi-byte character encodings and large character sets for East Asian languages. The secondary goal is to support as many features as pdfTeX developed by Han The Thanh. This project is a combined work of the dvipdfm-jpn project by Shunsaku Hirata and its modified one, dvipdfm-kor, by Jin-Hwan Cho. %prep %setup -q -n %{name}-%{snapshot} %build %configure make %{?_smp_mflags} # create customized cid-x.map for dvipdfmx (#418091) cat <> cid-x.map %% %% ASCII pTeX Examples %% %% Ryumin and GothicBBB found in PostScript printers: rml H !Ryumin-Light gbm H !GothicBBB-Medium rmlv V !Ryumin-Light gbmv V !GothicBBB-Medium EOF %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' mkdir -p %{buildroot}%{_texmf_conf}/dvipdfm mv cid-x.map %{buildroot}%{_texmf_conf}/dvipdfm/ %clean rm -rf $RPM_BUILD_ROOT %post /usr/bin/mktexlsr > /dev/null 2>&1 || : %postun /usr/bin/mktexlsr > /dev/null 2>&1 || : %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_bindir}/dvipdfmx %{_bindir}/xbb %dir %{_texmf_conf}/dvipdfm/ %config(noreplace) %{_texmf_conf}/dvipdfm/cid-x.map %{_texmf_main}/dvipdfm %{_texmf_main}/fonts/cmap/EUC-UCS2 %{_texmf_main}/fonts/cmap/UniKSCms-UCS2-H %{_texmf_main}/fonts/cmap/UniKSCms-UCS2-V %{_texmf_main}/fonts/map/dvipdfmx/cid-x.map %{_texmf_main}/fonts/map/glyphlist/glyphlist.txt %{_texmf_main}/fonts/map/glyphlist/pdfglyphlist.txt %changelog * Sun Feb 17 2008 Jonathan G. Underwood - 0-0.20.20071115cvs - Remove obsolete and Provides for dvipdfm - Explicitly list contents of bindir in file list - Fix version and release tags to be guideline conforming - Add INSTALL='install -p' to make install - Add macro definitions from texlive-texmf spec file in case not defined - Remove NEWS and TODO from doc file list * Sun Feb 17 2008 Jonathan G. Underwood - 20071115-1 - Initial separate package - formerly part of texlive Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvipdfmx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 00:23:10 -0000 1.1 +++ .cvsignore 7 Mar 2008 23:40:07 -0000 1.2 @@ -0,0 +1 @@ +dvipdfmx-20071115.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvipdfmx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 00:23:10 -0000 1.1 +++ sources 7 Mar 2008 23:40:07 -0000 1.2 @@ -0,0 +1 @@ +55b30f37da7be24e6a065e286d1f1b2b dvipdfmx-20071115.tar.gz From fedora-extras-commits at redhat.com Fri Mar 7 23:43:21 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 23:43:21 GMT Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.18,1.19 Message-ID: <200803072343.m27NhLfH032470@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdebase-runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32446/devel Modified Files: kdebase-runtime.spec Log Message: * Fri Mar 07 2008 Kevin Kofler 4.0.2-3 - BR libxcb-devel everywhere (including F7) Index: kdebase-runtime.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- kdebase-runtime.spec 7 Mar 2008 23:04:47 -0000 1.18 +++ kdebase-runtime.spec 7 Mar 2008 23:42:48 -0000 1.19 @@ -9,7 +9,7 @@ Name: kdebase-runtime Summary: K Desktop Environment - Runtime Version: 4.0.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -52,9 +52,7 @@ BuildRequires: strigi-devel >= 0.5.7 BuildRequires: xine-lib-devel # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support -%if 0%{?fedora} > 7 -BuildRequires: libxcb-devel -%endif +BuildRequires: libxcb-devel # needed? BuildRequires: xorg-x11-font-utils BuildRequires: xorg-x11-proto-devel @@ -226,6 +224,9 @@ %changelog +* Fri Mar 07 2008 Kevin Kofler 4.0.2-3 +- BR libxcb-devel everywhere (including F7) + * Fri Mar 07 2008 Kevin Kofler 4.0.2-2 - if building for a KDE 4 desktop, include the khelpcenter.desktop service description for KDE 3 here so help works in KDE 3 apps From fedora-extras-commits at redhat.com Fri Mar 7 23:50:30 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 23:50:30 GMT Subject: rpms/soprano/F-7 .cvsignore, 1.7, 1.8 soprano.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200803072350.m27NoUV1032628@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32583/F-7 Modified Files: .cvsignore soprano.spec sources Log Message: Sync from devel: * Thu Mar 6 2008 Kevin Kofler 2.0.3-2 - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen and qt4-doc when building apidocs * Tue Mar 4 2008 Kevin Kofler 2.0.3-1 - update to 2.0.3 (bugfix release) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-7/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Feb 2008 14:48:59 -0000 1.7 +++ .cvsignore 7 Mar 2008 23:49:57 -0000 1.8 @@ -1 +1 @@ -soprano-2.0.2.tar.bz2 +soprano-2.0.3.tar.bz2 Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-7/soprano.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- soprano.spec 22 Feb 2008 14:48:59 -0000 1.9 +++ soprano.spec 7 Mar 2008 23:49:57 -0000 1.10 @@ -1,12 +1,13 @@ # fedora review: http://bugzilla.redhat.com/248120 -# TODO: package apidocs (make apidox, BR doxygen and qt4-doc) +# set this to 0 to disable -apidocs for a faster build +%define apidocs 1 Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.0.2 -Release: 1%{?dist} +Version: 2.0.3 +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -21,6 +22,11 @@ # older packages had clucene-config.h in the wrong place BuildRequires: clucene-core-devel >= 0.9.20-2 +%if "%{?apidocs}" == "1" +BuildRequires: doxygen +BuildRequires: qt4-doc +%endif + %description %{summary}. @@ -33,6 +39,15 @@ %description devel %{summary}. +%package apidocs +Group: Development/Documentation +Summary: Soprano API documentation +Requires: %{name} = %{?epoch:%{epoch}:}%{version} + +%description apidocs +This package includes the Soprano API documentation in HTML +format for easy browsing. + %prep %setup -q -n soprano-%{version}%{?beta} @@ -40,10 +55,14 @@ %build -%cmake . +%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` make %{?_smp_mflags} +%if "%{?apidocs}" == "1" +make apidox +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -79,8 +98,21 @@ %{_includedir}/soprano/ %{_includedir}/Soprano/ +%if "%{?apidocs}" == "1" +%files apidocs +%defattr(-,root,root,-) +%doc docs/html +%endif + %changelog +* Thu Mar 6 2008 Kevin Kofler 2.0.3-2 +- build apidocs and put them into an -apidocs subpackage (can be turned off) +- BR doxygen and qt4-doc when building apidocs + +* Tue Mar 4 2008 Kevin Kofler 2.0.3-1 +- update to 2.0.3 (bugfix release) + * Fri Feb 22 2008 Kevin Kofler 2.0.2-1 - update to 2.0.2 (bugfix release) - drop glibc/open (missing mode) patch (fixed upstream) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-7/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Feb 2008 14:48:59 -0000 1.7 +++ sources 7 Mar 2008 23:49:57 -0000 1.8 @@ -1 +1 @@ -3863508b700bd1651633fe1853d5f858 soprano-2.0.2.tar.bz2 +3f33799c6ebd03048621057d268fb62f soprano-2.0.3.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 7 23:50:34 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Fri, 7 Mar 2008 23:50:34 GMT Subject: rpms/soprano/F-8 .cvsignore, 1.7, 1.8 soprano.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200803072350.m27NoYKZ032633@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/soprano/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32583/F-8 Modified Files: .cvsignore soprano.spec sources Log Message: Sync from devel: * Thu Mar 6 2008 Kevin Kofler 2.0.3-2 - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen and qt4-doc when building apidocs * Tue Mar 4 2008 Kevin Kofler 2.0.3-1 - update to 2.0.3 (bugfix release) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Feb 2008 14:49:03 -0000 1.7 +++ .cvsignore 7 Mar 2008 23:50:00 -0000 1.8 @@ -1 +1 @@ -soprano-2.0.2.tar.bz2 +soprano-2.0.3.tar.bz2 Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-8/soprano.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- soprano.spec 22 Feb 2008 14:49:03 -0000 1.11 +++ soprano.spec 7 Mar 2008 23:50:00 -0000 1.12 @@ -1,12 +1,13 @@ # fedora review: http://bugzilla.redhat.com/248120 -# TODO: package apidocs (make apidox, BR doxygen and qt4-doc) +# set this to 0 to disable -apidocs for a faster build +%define apidocs 1 Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.0.2 -Release: 1%{?dist} +Version: 2.0.3 +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -21,6 +22,11 @@ # older packages had clucene-config.h in the wrong place BuildRequires: clucene-core-devel >= 0.9.20-2 +%if "%{?apidocs}" == "1" +BuildRequires: doxygen +BuildRequires: qt4-doc +%endif + %description %{summary}. @@ -33,6 +39,15 @@ %description devel %{summary}. +%package apidocs +Group: Development/Documentation +Summary: Soprano API documentation +Requires: %{name} = %{?epoch:%{epoch}:}%{version} + +%description apidocs +This package includes the Soprano API documentation in HTML +format for easy browsing. + %prep %setup -q -n soprano-%{version}%{?beta} @@ -40,10 +55,14 @@ %build -%cmake . +%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` make %{?_smp_mflags} +%if "%{?apidocs}" == "1" +make apidox +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -79,8 +98,21 @@ %{_includedir}/soprano/ %{_includedir}/Soprano/ +%if "%{?apidocs}" == "1" +%files apidocs +%defattr(-,root,root,-) +%doc docs/html +%endif + %changelog +* Thu Mar 6 2008 Kevin Kofler 2.0.3-2 +- build apidocs and put them into an -apidocs subpackage (can be turned off) +- BR doxygen and qt4-doc when building apidocs + +* Tue Mar 4 2008 Kevin Kofler 2.0.3-1 +- update to 2.0.3 (bugfix release) + * Fri Feb 22 2008 Kevin Kofler 2.0.2-1 - update to 2.0.2 (bugfix release) - drop glibc/open (missing mode) patch (fixed upstream) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soprano/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Feb 2008 14:49:03 -0000 1.7 +++ sources 7 Mar 2008 23:50:00 -0000 1.8 @@ -1 +1 @@ -3863508b700bd1651633fe1853d5f858 soprano-2.0.2.tar.bz2 +3f33799c6ebd03048621057d268fb62f soprano-2.0.3.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 00:01:05 2008 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Sat, 8 Mar 2008 00:01:05 GMT Subject: rpms/ruby-mysql/devel .cvsignore, 1.5, 1.6 ruby-mysql.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200803080001.m2801531006010@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/pkgs/rpms/ruby-mysql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv355 Modified Files: .cvsignore ruby-mysql.spec sources Log Message: * Fri Mar 7 2008 Orion Poplawski - 2.7.5-1 - Update to 2.7.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ruby-mysql/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Feb 2008 19:01:15 -0000 1.5 +++ .cvsignore 8 Mar 2008 00:00:31 -0000 1.6 @@ -1 +1 @@ -mysql-ruby-2.7.4.tar.gz +mysql-ruby-2.7.5.tar.gz Index: ruby-mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ruby-mysql/devel/ruby-mysql.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ruby-mysql.spec 9 Feb 2008 19:01:15 -0000 1.9 +++ ruby-mysql.spec 8 Mar 2008 00:00:31 -0000 1.10 @@ -2,7 +2,7 @@ %{!?ruby_sitearchdir: %define ruby_sitearchdir %(/usr/bin/ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")} Name: ruby-mysql -Version: 2.7.4 +Version: 2.7.5 Release: 1%{?dist} Summary: A Ruby interface to MySQL @@ -39,6 +39,9 @@ %{ruby_sitearchdir}/mysql.so %changelog +* Fri Mar 7 2008 Orion Poplawski - 2.7.5-1 +- Update to 2.7.5 + * Sat Feb 9 2008 Orion Poplawski - 2.7.4-1 - Update to 2.7.4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ruby-mysql/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Feb 2008 19:01:15 -0000 1.5 +++ sources 8 Mar 2008 00:00:31 -0000 1.6 @@ -1 +1 @@ -1a98d1b5cde1f7c6bb5ae8ce8d35a683 mysql-ruby-2.7.4.tar.gz +4e42869196aa84ca17e70ab2287f8830 mysql-ruby-2.7.5.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 00:11:11 2008 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 8 Mar 2008 00:11:11 GMT Subject: rpms/gnash/devel .cvsignore, 1.5, 1.6 gnash.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200803080011.m280BBpb007771@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/gnash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7708 Modified Files: .cvsignore gnash.spec sources Log Message: * Fri Mar 7 2008 Patrice Dumas 0.8.2-1 - update to 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnash/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Sep 2007 11:56:09 -0000 1.5 +++ .cvsignore 8 Mar 2008 00:10:36 -0000 1.6 @@ -1 +1 @@ -gnash-0.8.1.tar.gz +gnash-0.8.2.tar.gz Index: gnash.spec =================================================================== RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnash.spec 19 Feb 2008 18:14:50 -0000 1.14 +++ gnash.spec 8 Mar 2008 00:10:36 -0000 1.15 @@ -1,18 +1,16 @@ Name: gnash -Version: 0.8.1 -Release: 7%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: GNU flash movie player Group: Applications/Multimedia License: GPLv3+ URL: http://www.gnu.org/software/gnash/ Source0: http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz -# from Martin Stransky -Patch0: gnash-plugin.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel -BuildRequires: boost-devel curl-devel +BuildRequires: boost-devel curl-devel freetype-devel fontconfig-devel # the opengl devel packages are required by gtkglext-devel # monolithic Xorg #BuildRequires: xorg-x11-devel @@ -20,14 +18,14 @@ #BuildRequires: libGLU-devel libGL-devel BuildRequires: SDL-devel BuildRequires: agg-devel -BuildRequires: kdelibs-devel +BuildRequires: kdelibs3-devel BuildRequires: gtkglext-devel BuildRequires: docbook2X BuildRequires: gstreamer-devel >= 0.10 BuildRequires: scrollkeeper -Requires(post): scrollkeeper -Requires(postun): scrollkeeper +#Requires(post): scrollkeeper +#Requires(postun): scrollkeeper Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires(post): /sbin/install-info @@ -58,50 +56,41 @@ %description klash The gnash flash movie player plugin for Konqueror. -# cygnal just segfaults for me -#%package cygnal -#Summary: Streaming media server -#Requires: %{name} = %{version}-%{release} -#Group: Applications/Multimedia +%package cygnal +Summary: Streaming media server +Requires: %{name} = %{version}-%{release} +Group: Applications/Multimedia -#%description cygnal -#Cygnal is a streaming media server that's Flash aware. +%description cygnal +Cygnal is a streaming media server that's Flash aware. %prep %setup -q -%patch0 -p1 -b .plugin chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} + iconv -f latin1 -t utf8 < AUTHORS > AUTHORS.utf8 touch -r AUTHORS AUTHORS.utf8 mv AUTHORS.utf8 AUTHORS %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh -%configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \ - --enable-ghelp --enable-docbook --enable-media=GST \ +# --enable-ghelp is disabled +%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \ + --disable-docbook --enable-media=GST \ --disable-dependency-tracking --disable-rpath \ + --enable-cygnal \ + --enable-gui=gtk,kde,sdl,fb \ --with-qtdir=$QTDIR #doesn't work currently: %%{?_smp_mflags} make -# texinfo and therefore info generation is broken, still we have the -# code to regenerate them -pushd doc/C -rm gnash.html gnash.1 gnash.info gnash.texi actionscript.html \ - actionscript.info actionscript.texi -make man html info -pushd asspec -rm asspec.info asspec.html asspec.texi -make html info -popd -popd - %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install install-plugin \ + DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la #rm \ # $RPM_BUILD_ROOT%{_libdir}/libgnashamf.so \ @@ -112,25 +101,36 @@ # $RPM_BUILD_ROOT%{_libdir}/libgnashserver.so \ # $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \ # $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so -rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper +#rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper rm -f $RPM_BUILD_ROOT%{_infodir}/dir # don't package libltdl related files! -rm \ - $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl* +#rm \ +# $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl* rm \ $RPM_BUILD_ROOT%{_includedir}/ltdl.h # info isn't generated rightly -rm -rf \ - $RPM_BUILD_ROOT%{_infodir}/ +#rm -rf \ +# $RPM_BUILD_ROOT%{_infodir}/ # omf/scrollkeeper related files are broken, some files are missing, and # omf files are wrong -rm -rf \ - $RPM_BUILD_ROOT%{_datadir}/omf +#rm -rf \ +# $RPM_BUILD_ROOT%{_datadir}/omf # cygnal just segfaults #rm \ # $RPM_BUILD_ROOT%{_bindir}/cygnal # cp -p doc/C/actionscript.info $RPM_BUILD_ROOT%{_infodir}/ +mkdir -p $RPM_BUILD_ROOT%{_infodir}/ +cp doc/C/gnash_*.info $RPM_BUILD_ROOT%{_infodir}/ + +rm -rf __dist_docs +mkdir __dist_docs +mv $RPM_BUILD_ROOT%{_datadir}/doc/gnash/* __dist_docs/ +rmdir $RPM_BUILD_ROOT%{_datadir}/doc/gnash +cp doc/C/gnash*.html __dist_docs/ + +chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \ + $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo %find_lang %{name} @@ -145,13 +145,17 @@ #/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || : #/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || : #/sbin/install-info %{_infodir}/actionscript.info %{_infodir}/dir || : +/sbin/install-info %{_infodir}/gnash_ref.info %{_infodir}/dir || : +/sbin/install-info %{_infodir}/gnash_user.info %{_infodir}/dir || : %preun -#if [ $1 = 0 ]; then +if [ $1 = 0 ]; then #/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : #/sbin/install-info --delete %{_infodir}/asspec.info %{_infodir}/dir || : #/sbin/install-info --delete %{_infodir}/actionscript.info %{_infodir}/dir || : -#fi + /sbin/install-info --delete %{_infodir}/gnash_ref.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/gnash_user.info %{_infodir}/dir || : +fi %postun /sbin/ldconfig @@ -160,17 +164,24 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc README AUTHORS COPYING NEWS -%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html -%doc doc/C/images +#%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html +#%doc doc/C/images +%doc __dist_docs/* +%{_bindir}/dumpshm +%{_bindir}/fb-gnash %{_bindir}/gtk-gnash +%{_bindir}/sdl-gnash +%{_bindir}/soldumper %{_bindir}/gnash -%{_bindir}/gparser %{_bindir}/gprocessor %{_libdir}/gnash/ #%{_libdir}/libgnash*-*.so #%{_libdir}/libklash*-*.so -%{_mandir}/man1/gnash* -#%{_infodir}/gnash* +%{_mandir}/man1/gnash.1* +%{_mandir}/man1/dumpshm.1* +%{_mandir}/man1/gprocessor.1* +%{_mandir}/man1/soldumper.1* +%{_infodir}/gnash* %{_datadir}/gnash/ #%{_datadir}/omf/gnash/ @@ -181,18 +192,17 @@ %files klash %defattr(-,root,root,-) %{_bindir}/kde-gnash -%{_libdir}/kde3/libklashpart.* %{_datadir}/apps/klash/ -#%{_datadir}/config/klashrc %{_datadir}/services/klash_part.desktop -#%files cygnal -#%defattr(-,root,root,-) -#%{_bindir}/cygnal +%files cygnal +%defattr(-,root,root,-) +%{_bindir}/cygnal +%{_mandir}/man1/cygnal.1* %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 0.8.1-7 -- Autorebuild for GCC 4.3 +* Fri Mar 7 2008 Patrice Dumas 0.8.2-1 +- update to 0.8.2 * Sat Oct 27 2007 Patrice Dumas 0.8.1-6 - add patch from Martin Stransky to fix wrapped plugin #281061 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnash/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Sep 2007 11:56:09 -0000 1.5 +++ sources 8 Mar 2008 00:10:36 -0000 1.6 @@ -1 +1 @@ -28e9f4bd71154a89f6f683c3e7651e64 gnash-0.8.1.tar.gz +24dfad0b553254faa06cf1bc1a43fef9 gnash-0.8.2.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 00:11:39 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 8 Mar 2008 00:11:39 GMT Subject: rpms/nntpgrab/F-7 nntpgrab.spec, 1.4, 1.5 sources, 1.4, 1.5 nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch, 1.1, NONE Message-ID: <200803080011.m280BdUa007849@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7717/F-7 Modified Files: nntpgrab.spec sources Removed Files: nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch Log Message: - Update to version 0.2.4 - Drop upstreamed patches Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-7/nntpgrab.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nntpgrab.spec 5 Feb 2008 17:02:04 -0000 1.4 +++ nntpgrab.spec 8 Mar 2008 00:11:05 -0000 1.5 @@ -1,11 +1,10 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab -Version: 0.2.3 +Version: 0.2.4 Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 -Patch0: nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -77,7 +76,6 @@ %prep %setup -q -%patch0 -p2 %build %configure @@ -145,6 +143,10 @@ %{_libdir}/pkgconfig/nntpgrab.pc %changelog +* Sat Mar 8 2008 Erik van Pienbroek - 0.2.4-1 +- Update to version 0.2.4 +- Drop upstreamed patches + * Tue Feb 5 2008 Erik van Pienbroek - 0.2.3-1 - Update to 0.2.3. Fixes regression in 0.2.2 - Added a patch to fix an off-by-one error Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-7/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Feb 2008 21:40:51 -0000 1.4 +++ sources 8 Mar 2008 00:11:05 -0000 1.5 @@ -1 +1 @@ -388cabda133f1ef131263c84e0937647 nntpgrab-0.2.3.tar.bz2 +88b402cbd695fb3d277d343f1e7934fe nntpgrab-0.2.4.tar.bz2 --- nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 8 00:11:42 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 8 Mar 2008 00:11:42 GMT Subject: rpms/nntpgrab/F-8 nntpgrab.spec, 1.5, 1.6 sources, 1.4, 1.5 nntpgrab-0.2-gtk-2-12-7-fix.patch, 1.1, NONE nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch, 1.1, NONE Message-ID: <200803080011.m280Bgqj007862@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7717/F-8 Modified Files: nntpgrab.spec sources Removed Files: nntpgrab-0.2-gtk-2-12-7-fix.patch nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch Log Message: - Update to version 0.2.4 - Drop upstreamed patches Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/nntpgrab.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nntpgrab.spec 1 Mar 2008 11:29:13 -0000 1.5 +++ nntpgrab.spec 8 Mar 2008 00:11:09 -0000 1.6 @@ -1,12 +1,10 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab -Version: 0.2.3 -Release: 2%{?dist} +Version: 0.2.4 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 -Patch0: nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch -Patch1: nntpgrab-0.2-gtk-2-12-7-fix.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -78,8 +76,6 @@ %prep %setup -q -%patch0 -p2 -%patch1 -p1 %build %configure @@ -147,6 +143,10 @@ %{_libdir}/pkgconfig/nntpgrab.pc %changelog +* Sat Mar 8 2008 Erik van Pienbroek - 0.2.4-1 +- Update to version 0.2.4 +- Drop upstreamed patches + * Sat Mar 1 2008 Erik van Pienbroek - 0.2.3-2 - The program would always crash with GTK 2.12.7 or higher. Added a patch to avoid this crash (GNOME BZ #514162) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Feb 2008 21:40:54 -0000 1.4 +++ sources 8 Mar 2008 00:11:09 -0000 1.5 @@ -1 +1 @@ -388cabda133f1ef131263c84e0937647 nntpgrab-0.2.3.tar.bz2 +88b402cbd695fb3d277d343f1e7934fe nntpgrab-0.2.4.tar.bz2 --- nntpgrab-0.2-gtk-2-12-7-fix.patch DELETED --- --- nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 8 00:11:46 2008 From: fedora-extras-commits at redhat.com (Erik van Pienbroek (epienbro)) Date: Sat, 8 Mar 2008 00:11:46 GMT Subject: rpms/nntpgrab/devel .cvsignore, 1.4, 1.5 nntpgrab.spec, 1.5, 1.6 sources, 1.4, 1.5 nntpgrab-0.2-gtk-2-12-7-fix.patch, 1.1, NONE nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch, 1.1, NONE Message-ID: <200803080011.m280BkCd007868@cvs-int.fedora.redhat.com> Author: epienbro Update of /cvs/pkgs/rpms/nntpgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7717/devel Modified Files: .cvsignore nntpgrab.spec sources Removed Files: nntpgrab-0.2-gtk-2-12-7-fix.patch nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch Log Message: - Update to version 0.2.4 - Drop upstreamed patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Feb 2008 21:40:58 -0000 1.4 +++ .cvsignore 8 Mar 2008 00:11:12 -0000 1.5 @@ -1 +1 @@ -nntpgrab-0.2.3.tar.bz2 +nntpgrab-0.2.4.tar.bz2 Index: nntpgrab.spec =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nntpgrab.spec 1 Mar 2008 11:29:19 -0000 1.5 +++ nntpgrab.spec 8 Mar 2008 00:11:12 -0000 1.6 @@ -1,12 +1,10 @@ Summary: NNTPGrab is a program to download files from the usenet Name: nntpgrab -Version: 0.2.3 -Release: 2%{?dist} +Version: 0.2.4 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Internet Source: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2 -Patch0: nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch -Patch1: nntpgrab-0.2-gtk-2-12-7-fix.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.nntpgrab.nl @@ -78,8 +76,6 @@ %prep %setup -q -%patch0 -p2 -%patch1 -p1 %build %configure @@ -147,6 +143,10 @@ %{_libdir}/pkgconfig/nntpgrab.pc %changelog +* Sat Mar 8 2008 Erik van Pienbroek - 0.2.4-1 +- Update to version 0.2.4 +- Drop upstreamed patches + * Sat Mar 1 2008 Erik van Pienbroek - 0.2.3-2 - The program would always crash with GTK 2.12.7 or higher. Added a patch to avoid this crash (GNOME BZ #514162) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nntpgrab/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Feb 2008 21:40:58 -0000 1.4 +++ sources 8 Mar 2008 00:11:12 -0000 1.5 @@ -1 +1 @@ -388cabda133f1ef131263c84e0937647 nntpgrab-0.2.3.tar.bz2 +88b402cbd695fb3d277d343f1e7934fe nntpgrab-0.2.4.tar.bz2 --- nntpgrab-0.2-gtk-2-12-7-fix.patch DELETED --- --- nntpgrab-0.2-nntp-plugin-off-by-one-fix.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 8 00:15:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:22 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested watchbugzilla Message-ID: <200803080017.m280H4bh006363@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the watchbugzilla acl on xdvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:08 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:08 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested approveacls Message-ID: <200803080017.m280H5ld006370@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the approveacls acl on xdvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:22 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:22 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested commit Message-ID: <200803080017.m280H4bm006363@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the commit acl on xdvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:25 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:25 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested watchcommits Message-ID: <200803080017.m280H7Cf006440@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the watchcommits acl on xdvipdfmx (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:18 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:18 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested watchbugzilla Message-ID: <200803080017.m280H5lh006370@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the watchbugzilla acl on xdvipdfmx (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:33 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:33 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested watchcommits Message-ID: <200803080017.m280H7Cj006440@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the watchcommits acl on xdvipdfmx (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:20 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested commit Message-ID: <200803080017.m280HHwR006512@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the commit acl on xdvipdfmx (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:35 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:35 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested approveacls Message-ID: <200803080017.m280HIMP006533@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the approveacls acl on xdvipdfmx (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:41 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested watchbugzilla Message-ID: <200803080017.m280HIMT006533@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the watchbugzilla acl on xdvipdfmx (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:27 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:27 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested watchcommits Message-ID: <200803080017.m280HHwV006512@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the watchcommits acl on xdvipdfmx (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:29 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested commit Message-ID: <200803080017.m280HHwZ006512@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the commit acl on xdvipdfmx (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:15:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:15:30 +0000 Subject: [pkgdb] xdvipdfmx: jgu has requested approveacls Message-ID: <200803080017.m280HQrp006612@bastion.fedora.phx.redhat.com> Jonathan G. Underwood (jgu) has requested the approveacls acl on xdvipdfmx (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:19:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:19:42 +0000 Subject: [pkgdb] xdvipdfmx had acl change status Message-ID: <200803080021.m280LO8U006799@bastion.fedora.phx.redhat.com> Neal Becker (nbecker) has set the watchbugzilla acl on xdvipdfmx (Fedora devel) to Approved for Jonathan G. Underwood (jgu) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:19:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:19:32 +0000 Subject: [pkgdb] xdvipdfmx had acl change status Message-ID: <200803080021.m280LTnV006822@bastion.fedora.phx.redhat.com> Neal Becker (nbecker) has set the watchcommits acl on xdvipdfmx (Fedora devel) to Approved for Jonathan G. Underwood (jgu) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:19:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:19:36 +0000 Subject: [pkgdb] xdvipdfmx had acl change status Message-ID: <200803080021.m280LTna006822@bastion.fedora.phx.redhat.com> Neal Becker (nbecker) has set the commit acl on xdvipdfmx (Fedora devel) to Approved for Jonathan G. Underwood (jgu) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:19:54 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 00:19:54 +0000 Subject: [pkgdb] xdvipdfmx had acl change status Message-ID: <200803080021.m280LO8Z006799@bastion.fedora.phx.redhat.com> Neal Becker (nbecker) has set the approveacls acl on xdvipdfmx (Fedora devel) to Approved for Jonathan G. Underwood (jgu) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvipdfmx From fedora-extras-commits at redhat.com Sat Mar 8 00:20:15 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 8 Mar 2008 00:20:15 GMT Subject: rpms/TurboGears/devel .cvsignore, 1.10, 1.11 TurboGears.spec, 1.34, 1.35 sources, 1.10, 1.11 Message-ID: <200803080020.m280KFwW008113@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/TurboGears/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8079 Modified Files: .cvsignore TurboGears.spec sources Log Message: * Fri Mar 7 2008 Luke Macken 1.0.4.4-1 - Update to 1.0.4.4 - Remove the setuptools and sqlalchemy-backport patches Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 1 Feb 2008 07:07:52 -0000 1.10 +++ .cvsignore 8 Mar 2008 00:19:40 -0000 1.11 @@ -1 +1 @@ -TurboGears-1.0.4.3.tar.gz +TurboGears-1.0.4.4.tar.gz Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- TurboGears.spec 1 Mar 2008 04:04:15 -0000 1.34 +++ TurboGears.spec 8 Mar 2008 00:19:40 -0000 1.35 @@ -2,17 +2,14 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: TurboGears -Version: 1.0.4.3 -Release: 3%{?dist} +Version: 1.0.4.4 +Release: 1%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages License: MIT URL: http://www.turbogears.org Source0: http://files.turbogears.org/eggs/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-setuptools.patch -# Upstream fixes for sqlalchemy -Patch1: %{name}-1.0.4.3-sqlalchemy-backport.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -66,8 +63,6 @@ %prep %setup -q -%patch0 -b .setuptools -%patch1 -p1 -b .sa %build @@ -89,6 +84,10 @@ %{python_sitelib}/turbogears/ %changelog +* Fri Mar 7 2008 Luke Macken 1.0.4.4-1 +- Update to 1.0.4.4 +- Remove the setuptools and sqlalchemy-backport patches + * Fri Feb 29 2008 Luke Macken 1.0.4.3-3 - Require python-paste-script >= 1.6.2 (Bug #435525) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 1 Feb 2008 07:07:52 -0000 1.10 +++ sources 8 Mar 2008 00:19:40 -0000 1.11 @@ -1 +1 @@ -a19eb069bd8dde75c23ec8f9eceef38e TurboGears-1.0.4.3.tar.gz +a03a66fcf7d687fd7bd4205a01fd21dd TurboGears-1.0.4.4.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 00:20:57 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 8 Mar 2008 00:20:57 GMT Subject: rpms/TurboGears/devel TurboGears-1.0.4.3-setuptools.patch, 1.2, NONE TurboGears-1.0.4.3-sqlalchemy-backport.patch, 1.1, NONE Message-ID: <200803080020.m280KvG3008148@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/TurboGears/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8141 Removed Files: TurboGears-1.0.4.3-setuptools.patch TurboGears-1.0.4.3-sqlalchemy-backport.patch Log Message: Weee, no more patches. --- TurboGears-1.0.4.3-setuptools.patch DELETED --- --- TurboGears-1.0.4.3-sqlalchemy-backport.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 8 00:28:52 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Sat, 8 Mar 2008 00:28:52 GMT Subject: rpms/python-psyco/devel python-psyco.spec,1.17,1.18 Message-ID: <200803080028.m280SqTF008383@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-psyco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8352 Modified Files: python-psyco.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 1.5.1-9 - Handle egg info files Index: python-psyco.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-psyco/devel/python-psyco.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- python-psyco.spec 7 Mar 2008 16:41:40 -0000 1.17 +++ python-psyco.spec 8 Mar 2008 00:28:12 -0000 1.18 @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 1.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: The Python Specialing Compiler @@ -53,12 +53,12 @@ %dir %{python_sitearch}/psyco %{python_sitearch}/psyco/*.pyo %if 0%{?fedora} >= 9 - %{python_sitearch}/%{name}-%{version}-py2.5.egg-info + %{python_sitearch}/pysco-%{version}-py2.5.egg-info %endif %changelog -* Fri Mar 07 2008 Jesse Keating - 1.5.1-8 +* Fri Mar 07 2008 Jesse Keating - 1.5.1-9 - Handle egg info files * Tue Feb 19 2008 Fedora Release Engineering - 1.5.1-7 From fedora-extras-commits at redhat.com Sat Mar 8 00:35:06 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Sat, 8 Mar 2008 00:35:06 GMT Subject: rpms/python-quixote/devel python-quixote.spec,1.14,1.15 Message-ID: <200803080035.m280Z6rP008586@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-quixote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8564 Modified Files: python-quixote.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 2.4-8 - Drop the pyver stuff, not needed. - Fix the multiple file listings Index: python-quixote.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-quixote/devel/python-quixote.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-quixote.spec 7 Mar 2008 16:44:07 -0000 1.14 +++ python-quixote.spec 8 Mar 2008 00:34:27 -0000 1.15 @@ -4,7 +4,7 @@ Name: python-quixote Version: 2.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A highly Pythonic Web application framework Group: Development/Libraries @@ -44,33 +44,15 @@ %doc doc/ CHANGES README TODO LICENSE %dir %{python_sitearch}/quixote %{python_sitearch}/quixote/* -%{python_sitearch}/quixote/*.pyc -%{python_sitearch}/quixote/*.pyo -%dir %{python_sitearch}/quixote/demo/ -%{python_sitearch}/quixote/demo/*.py -%{python_sitearch}/quixote/demo/*.pyc -%{python_sitearch}/quixote/demo/*.ptl -%{python_sitearch}/quixote/demo/*.pyo -%dir %{python_sitearch}/quixote/form/ -%{python_sitearch}/quixote/form/*.py -%{python_sitearch}/quixote/form/*.pyc -%{python_sitearch}/quixote/form/*.pyo -%dir %{python_sitearch}/quixote/server/ -%{python_sitearch}/quixote/server/*.py -%{python_sitearch}/quixote/server/*.pyc -%{python_sitearch}/quixote/server/*.pyo -%{python_sitearch}/quixote/ptl/*.py -%{python_sitearch}/quixote/ptl/*.pyc -%{python_sitearch}/quixote/ptl/*.so -%{python_sitearch}/quixote/ptl/*.pyo -%{python_sitearch}/quixote/html/*.py -%{python_sitearch}/quixote/html/*.pyc -%{python_sitearch}/quixote/html/*.so -%{python_sitearch}/quixote/html/*.pyo + +%if 0%{?fedora} >= 9 + %{python_sitearch}/Quixote-%{version}-py2.5.egg-info +%endif %changelog -* Fri Mar 07 2008 Jesse Keating - 2.4-7 +* Fri Mar 07 2008 Jesse Keating - 2.4-8 - Drop the pyver stuff, not needed. +- Fix the multiple file listings * Tue Feb 19 2008 Fedora Release Engineering - 2.4-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Mar 8 00:40:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 8 Mar 2008 00:40:49 GMT Subject: rpms/perl/devel perl.spec,1.152,1.153 Message-ID: <200803080040.m280enBM008722@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8700 Modified Files: perl.spec Log Message: get rid of broken conflicts Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- perl.spec 7 Mar 2008 22:11:53 -0000 1.152 +++ perl.spec 8 Mar 2008 00:40:14 -0000 1.153 @@ -16,7 +16,7 @@ Name: perl Version: %{perl_version} -Release: 8%{?dist} +Release: 9%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -132,7 +132,6 @@ # Long history in 3rd-party repositories: Provides: perl-File-Temp = 0.18 Obsoletes: perl-File-Temp < 0.18 -Conflicts: perl-File-Temp Requires: perl-libs = %{perl_epoch}:%{perl_version}-%{release} @@ -1568,6 +1567,9 @@ # Old changelog entries are preserved in CVS. %changelog +* Fri Mar 7 2008 Tom "spot" Callaway 4:5.10.0-9 +- get rid of bad conflicts on perl-File-Temp + * Fri Mar 7 2008 Tom "spot" Callaway 4:5.10.0-8 - use /usr/local for sitelib/sitearch dirs - patch 32891 for significant performance improvement From fedora-extras-commits at redhat.com Sat Mar 8 00:55:01 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Sat, 8 Mar 2008 00:55:01 GMT Subject: rpms/python-psyco/devel python-psyco.spec,1.18,1.19 Message-ID: <200803080055.m280t1ff008986@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/python-psyco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8966 Modified Files: python-psyco.spec Log Message: * Fri Mar 07 2008 Jesse Keating - 1.5.1-10 - Handle egg info files Index: python-psyco.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-psyco/devel/python-psyco.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- python-psyco.spec 8 Mar 2008 00:28:12 -0000 1.18 +++ python-psyco.spec 8 Mar 2008 00:54:26 -0000 1.19 @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 1.5.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The Python Specialing Compiler @@ -53,12 +53,12 @@ %dir %{python_sitearch}/psyco %{python_sitearch}/psyco/*.pyo %if 0%{?fedora} >= 9 - %{python_sitearch}/pysco-%{version}-py2.5.egg-info + %{python_sitearch}/%{srcname}-%{version}-py2.5.egg-info %endif %changelog -* Fri Mar 07 2008 Jesse Keating - 1.5.1-9 +* Fri Mar 07 2008 Jesse Keating - 1.5.1-10 - Handle egg info files * Tue Feb 19 2008 Fedora Release Engineering - 1.5.1-7 From fedora-extras-commits at redhat.com Sat Mar 8 00:56:31 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 8 Mar 2008 00:56:31 GMT Subject: rpms/perl/devel perl.spec,1.153,1.154 Message-ID: <200803080056.m280uVXo009057@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9037 Modified Files: perl.spec Log Message: note patchlevel.h Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- perl.spec 8 Mar 2008 00:40:14 -0000 1.153 +++ perl.spec 8 Mar 2008 00:55:41 -0000 1.154 @@ -16,7 +16,7 @@ Name: perl Version: %{perl_version} -Release: 9%{?dist} +Release: 10%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -894,6 +894,10 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# Local patches +cd $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/ +perl -x patchlevel.h '32891 fix big slowdown in 5.10 @_ parameter passing' + %ifarch %{multilib_64_archs} mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/%{perl_version} mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/vendor_perl/%{perl_version} @@ -969,6 +973,10 @@ # Compress Changes* to save space %{__gzip} Changes* +# Local patch tracking +cd $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/ +perl -x patchlevel.h '32891 fix big slowdown in 5.10 @_ parameter passing' + %clean rm -rf $RPM_BUILD_ROOT @@ -1567,6 +1575,9 @@ # Old changelog entries are preserved in CVS. %changelog +* Fri Mar 7 2008 Tom "spot" Callaway 4:5.10.0-10 +- note 32891 in patchlevel.h + * Fri Mar 7 2008 Tom "spot" Callaway 4:5.10.0-9 - get rid of bad conflicts on perl-File-Temp From fedora-extras-commits at redhat.com Sat Mar 8 01:04:09 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Sat, 8 Mar 2008 01:04:09 GMT Subject: rpms/TurboGears/devel TurboGears.spec,1.35,1.36 Message-ID: <200803080104.m28149XA016372@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/TurboGears/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16345 Modified Files: TurboGears.spec Log Message: * Working URL for the source line. Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- TurboGears.spec 8 Mar 2008 00:19:40 -0000 1.35 +++ TurboGears.spec 8 Mar 2008 01:03:35 -0000 1.36 @@ -9,7 +9,7 @@ Group: Development/Languages License: MIT URL: http://www.turbogears.org -Source0: http://files.turbogears.org/eggs/%{name}-%{version}.tar.gz +Source0: http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From fedora-extras-commits at redhat.com Sat Mar 8 01:09:02 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 8 Mar 2008 01:09:02 GMT Subject: rpms/perl/devel perl.spec,1.154,1.155 Message-ID: <200803080109.m28192RH016500@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16458 Modified Files: perl.spec Log Message: note patchlevel.h properly Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- perl.spec 8 Mar 2008 00:55:41 -0000 1.154 +++ perl.spec 8 Mar 2008 01:08:07 -0000 1.155 @@ -16,7 +16,7 @@ Name: perl Version: %{perl_version} -Release: 10%{?dist} +Release: 11%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -894,10 +894,6 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# Local patches -cd $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/ -perl -x patchlevel.h '32891 fix big slowdown in 5.10 @_ parameter passing' - %ifarch %{multilib_64_archs} mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/%{perl_version} mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/vendor_perl/%{perl_version} @@ -975,6 +971,16 @@ # Local patch tracking cd $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/ +perl -x patchlevel.h 'Fedora Patch1: Permit suidperl to install as nonroot' +perl -x patchlevel.h 'Fedora Patch2: Removes date check, Fedora/RHEL specific' +perl -x patchlevel.h 'Fedora Patch3: Fedora/RHEL use links instead of lynx' +perl -x patchlevel.h 'Fedora Patch4: Work around annoying rpath issue' +perl -x patchlevel.h 'Fedora Patch5: support for libdir64' +perl -x patchlevel.h 'Fedora Patch6: use libresolv instead of libbind' +perl -x patchlevel.h 'Fedora Patch7: USE_MM_LD_RUN_PATH' +perl -x patchlevel.h 'Fedora Patch8: Skip hostname tests, due to builders not being network capable' +perl -x patchlevel.h 'Fedora Patch9: Update Sys::Syslog to 0.24' +perl -x patchlevel.h 'Fedora Patch10: Dont run one io test due to random builder failures' perl -x patchlevel.h '32891 fix big slowdown in 5.10 @_ parameter passing' %clean @@ -1575,6 +1581,9 @@ # Old changelog entries are preserved in CVS. %changelog +* Fri Mar 7 2008 Tom "spot" Callaway 4:5.10.0-11 +- only do it once, and do it for all our patches + * Fri Mar 7 2008 Tom "spot" Callaway 4:5.10.0-10 - note 32891 in patchlevel.h From fedora-extras-commits at redhat.com Sat Mar 8 01:47:26 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 8 Mar 2008 01:47:26 GMT Subject: rpms/epiphany/devel epiphany-xulrunner19.patch, 1.3, 1.4 epiphany.spec, 1.183, 1.184 Message-ID: <200803080147.m281lQ0l017093@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17068 Modified Files: epiphany-xulrunner19.patch epiphany.spec Log Message: * Fri Mar 7 2008 Christopher Aillon - 2.21.92-3 - Update the xulrunner patch and tweak the useragent epiphany-xulrunner19.patch: Index: epiphany-xulrunner19.patch =================================================================== RCS file: /cvs/extras/rpms/epiphany/devel/epiphany-xulrunner19.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- epiphany-xulrunner19.patch 26 Feb 2008 05:37:11 -0000 1.3 +++ epiphany-xulrunner19.patch 8 Mar 2008 01:47:20 -0000 1.4 @@ -573,3 +573,46 @@ endif # We set GPATH here; this gives us semantics for GNU make +--- epiphany-2.21.92/embed/mozilla/FilePicker.cpp.xulrunner19 2008-02-18 08:41:03.000000000 -0500 ++++ epiphany-2.21.92/embed/mozilla/FilePicker.cpp 2008-03-07 18:50:46.000000000 -0500 +@@ -32,12 +32,11 @@ + + #include + #include +-#include + #include + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -357,22 +356,18 @@ + return NS_OK; + } + +-/* readonly attribute nsIFileURL fileURL; */ +-NS_IMETHODIMP GFilePicker::GetFileURL(nsIFileURL **aFileURL) ++/* readonly attribute nsIURI fileURL; */ ++NS_IMETHODIMP GFilePicker::GetFileURL(nsIURI **aFileURL) + { + NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE); + +- LOG ("GFilePicker::GetFileURL"); ++ LOG ("GFilePicker::GetFileURI"); + + nsCOMPtr file; + GetFile (getter_AddRefs(file)); + NS_ENSURE_TRUE (file, NS_ERROR_FAILURE); + +- nsCOMPtr fileURL = do_CreateInstance (NS_STANDARDURL_CONTRACTID); +- fileURL->SetFile(file); +- NS_IF_ADDREF(*aFileURL = fileURL); +- +- return NS_OK; ++ return NS_NewFileURI(aFileURL, file); + } + + /* readonly attribute nsISimpleEnumerator files; */ Index: epiphany.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- epiphany.spec 26 Feb 2008 20:34:14 -0000 1.183 +++ epiphany.spec 8 Mar 2008 01:47:20 -0000 1.184 @@ -8,7 +8,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.21.92 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -96,10 +96,13 @@ %patch1 -p1 -b .use-pango %patch2 -p1 -b .default-bookmarks %patch3 -p1 -b .wrapped-plugins - -# In order to build the tarball, this patch is already applied in the tarball %patch4 -p1 -b .xulrunner19 autoreconf +# Fedora Epiphany version +cat >> data/default-prefs-common.js << EOF +pref("general.useragent.vendor", "Fedora"); +pref("general.useragent.vendorSub", "%{version}-%{release}"); +EOF %build # Build with -Os as it helps the browser; also, don't override mozilla's warning @@ -214,6 +217,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Fri Mar 7 2008 Christopher Aillon - 2.21.92-3 +- Update the xulrunner patch and tweak the useragent + * Tue Feb 26 2008 Christopher Aillon - 2.21.92-2 - Stop shipping LowContrastLargePrint icons From fedora-extras-commits at redhat.com Sat Mar 8 02:07:20 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Sat, 8 Mar 2008 02:07:20 GMT Subject: rpms/xmoto-edit/devel xmoto-edit.spec,1.8,1.9 Message-ID: <200803080207.m2827KJb024558@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/xmoto-edit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24534 Modified Files: xmoto-edit.spec Log Message: Probable fix for BZ 436504. Index: xmoto-edit.spec =================================================================== RCS file: /cvs/pkgs/rpms/xmoto-edit/devel/xmoto-edit.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xmoto-edit.spec 9 Feb 2008 05:01:50 -0000 1.8 +++ xmoto-edit.spec 8 Mar 2008 02:06:41 -0000 1.9 @@ -1,6 +1,6 @@ Name: xmoto-edit Version: 0.2.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Challenging 2D Motocross Platform Game - Level Editor Group: Amusements/Games @@ -13,6 +13,7 @@ # Formerly at http://viewvc.tuxfamily.org/svn_xmoto_xmotoedit/trunk/xmoto-edit.6.gz, # this is now 404. Will follow up with upstream. Patch0: xmoto-edit-man.patch +Patch1: xmoto-edit-0.2.4-Editor-flag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,6 +33,7 @@ %prep %setup -q %patch0 +%patch1 -p0 %build %configure --with-enable-zoom=1 @@ -77,6 +79,9 @@ %changelog +* Fri Mar 07 2008 Jon Ciesla 0.2.4-13 +- Fix xmoto flag, BZ 436504. + * Fri Feb 08 2008 Jon Ciesla 0.2.4-12 - GCC 4.3 rebuild. From fedora-extras-commits at redhat.com Sat Mar 8 02:30:56 2008 From: fedora-extras-commits at redhat.com (Jon Ciesla (limb)) Date: Sat, 8 Mar 2008 02:30:56 GMT Subject: rpms/xmoto-edit/devel xmoto-edit-0.2.4-Editor-flag.patch,NONE,1.1 Message-ID: <200803080230.m282Uuev024831@cvs-int.fedora.redhat.com> Author: limb Update of /cvs/pkgs/rpms/xmoto-edit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24817 Added Files: xmoto-edit-0.2.4-Editor-flag.patch Log Message: Oops. xmoto-edit-0.2.4-Editor-flag.patch: --- NEW FILE xmoto-edit-0.2.4-Editor-flag.patch --- --- src/Editor.cpp 2008-03-07 17:07:58.000000000 -0600 +++ src/Editor.cpp 2008-03-07 17:07:58.000000000 -0600 @@ -1363,7 +1363,7 @@ m_Log.msg("Playing it."); char cBuf[256]; - sprintf(cBuf,"%s -win -level \"%s\"",XMOTOCOMMAND,m_pLevelSrc->getID().c_str()); + sprintf(cBuf,"%s -win --level \"%s\"",XMOTOCOMMAND,m_pLevelSrc->getID().c_str()); system(cBuf); setState(ES_DEFAULT); break; From fedora-extras-commits at redhat.com Sat Mar 8 04:09:20 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 8 Mar 2008 04:09:20 GMT Subject: rpms/xulrunner/devel .cvsignore, 1.34, 1.35 sources, 1.35, 1.36 xulrunner-mozconfig, 1.13, 1.14 xulrunner.spec, 1.86, 1.87 Message-ID: <200803080409.m2849KDt008941@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8840 Modified Files: .cvsignore sources xulrunner-mozconfig xulrunner.spec Log Message: * Fri Mar 7 2008 Christopher Aillon 1.9-0.beta4.36 - Update to latest trunk (2008-03-07) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 7 Mar 2008 04:10:31 -0000 1.34 +++ .cvsignore 8 Mar 2008 04:08:38 -0000 1.35 @@ -1 +1 @@ -mozilla-20080306.tar.bz2 +mozilla-20080307.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 7 Mar 2008 04:10:31 -0000 1.35 +++ sources 8 Mar 2008 04:08:38 -0000 1.36 @@ -1 +1 @@ -fbff40b3066f26c96d634225a3e6c0cb mozilla-20080306.tar.bz2 +fca1862f707adea24792d8f00241fba6 mozilla-20080307.tar.bz2 Index: xulrunner-mozconfig =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-mozconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xulrunner-mozconfig 5 Mar 2008 22:57:58 -0000 1.13 +++ xulrunner-mozconfig 8 Mar 2008 04:08:38 -0000 1.14 @@ -22,7 +22,6 @@ ac_add_options --enable-application=xulrunner ac_add_options --disable-javaxpcom ac_add_options --enable-extensions=default -ac_add_options --disable-crashreporter export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- xulrunner.spec 7 Mar 2008 04:10:31 -0000 1.86 +++ xulrunner.spec 8 Mar 2008 04:08:38 -0000 1.87 @@ -7,14 +7,14 @@ %define version_internal 1.9pre %if ! %{official_branding} -%define cvsdate 20080306 +%define cvsdate 20080307 %define nightly .nightly%{cvsdate} %endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.beta4.35%{?nightly}%{?dist} +Release: 0.beta4.36%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -398,6 +398,9 @@ #--------------------------------------------------------------------- %changelog +* Fri Mar 7 2008 Christopher Aillon 1.9-0.beta4.36 +- Update to latest trunk (2008-03-07) + * Thu Mar 6 2008 Christopher Aillon 1.9-0.beta4.35 - Update to latest trunk (2008-03-06) From fedora-extras-commits at redhat.com Sat Mar 8 04:10:02 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 8 Mar 2008 04:10:02 GMT Subject: rpms/firefox/devel .cvsignore, 1.64, 1.65 firefox-mozconfig, 1.13, 1.14 firefox.sh.in, 1.30, 1.31 firefox.spec, 1.269, 1.270 sources, 1.75, 1.76 Message-ID: <200803080410.m284A2BN009069@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8886 Modified Files: .cvsignore firefox-mozconfig firefox.sh.in firefox.spec sources Log Message: * Fri Mar 7 2008 Christopher Aillon 3.0-0.beta4.36 - Update to latest trunk (2008-03-07) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- .cvsignore 7 Mar 2008 04:09:57 -0000 1.64 +++ .cvsignore 8 Mar 2008 04:08:51 -0000 1.65 @@ -1 +1 @@ -mozilla-20080306.tar.bz2 +mozilla-20080307.tar.bz2 Index: firefox-mozconfig =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox-mozconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- firefox-mozconfig 19 Dec 2007 21:35:22 -0000 1.13 +++ firefox-mozconfig 8 Mar 2008 04:08:51 -0000 1.14 @@ -24,7 +24,6 @@ ac_add_options --enable-canvas ac_add_options --enable-startup-notification ac_add_options --enable-libxul -ac_add_options --disable-crashreporter export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 Index: firefox.sh.in =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.sh.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- firefox.sh.in 30 Jan 2008 14:16:28 -0000 1.30 +++ firefox.sh.in 8 Mar 2008 04:08:51 -0000 1.31 @@ -128,6 +128,12 @@ # export MOZ_DISABLE_PANGO # +## +## Disable the GNOME crash dialog, Moz has it's own +## +GNOME_DISABLE_CRASH_DIALOG=1 +export GNOME_DISABLE_CRASH_DIALOG + # OK, here's where all the real work gets done # check system locale Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- firefox.spec 7 Mar 2008 04:09:57 -0000 1.269 +++ firefox.spec 8 Mar 2008 04:08:51 -0000 1.270 @@ -7,20 +7,20 @@ %define mozappdir %{_libdir}/%{name}-%{version_internal} %define gecko_version 1.9 -%define xulrunner_version 1.9-0.beta4.35 +%define xulrunner_version 1.9-0.beta4.36 %define official_branding 0 %define build_langpacks 0 %if ! %{official_branding} -%define cvsdate 20080306 +%define cvsdate 20080307 %define nightly .nightly%{cvsdate} %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.beta4.35%{?nightly}%{?dist} +Release: 0.beta4.36%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -315,7 +315,10 @@ #--------------------------------------------------------------------- %changelog -* Thu Mar 6 2008 Christopher Aillon 3.0-0.beta3.35 +* Fri Mar 7 2008 Christopher Aillon 3.0-0.beta4.36 +- Update to latest trunk (2008-03-07) + +* Thu Mar 6 2008 Christopher Aillon 3.0-0.beta4.35 - Update to latest trunk (2008-03-06) * Tue Mar 4 2008 Christopher Aillon 3.0-0.beta3.34 Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/sources,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- sources 7 Mar 2008 04:09:57 -0000 1.75 +++ sources 8 Mar 2008 04:08:51 -0000 1.76 @@ -1 +1 @@ -fbff40b3066f26c96d634225a3e6c0cb mozilla-20080306.tar.bz2 +fca1862f707adea24792d8f00241fba6 mozilla-20080307.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 04:29:48 2008 From: fedora-extras-commits at redhat.com (James Antill (james)) Date: Sat, 8 Mar 2008 04:29:48 GMT Subject: rpms/python/devel python-2.5.1-socketmodule-constants.patch, NONE, 1.1 python.spec, 1.129, 1.130 Message-ID: <200803080429.m284Tmba009946@cvs-int.fedora.redhat.com> Author: james Update of /cvs/pkgs/rpms/python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9917 Modified Files: python.spec Added Files: python-2.5.1-socketmodule-constants.patch Log Message: * Sat Mar 8 2008 James Antill - 2.5.1-22 - Add constants to socketmodule - Resolves: bug#436560 python-2.5.1-socketmodule-constants.patch: --- NEW FILE python-2.5.1-socketmodule-constants.patch --- --- Python-2.5.1i-orig/Modules/socketmodule.c 2008-03-07 16:38:47.000000000 -0500 +++ Python-2.5.1/Modules/socketmodule.c 2008-03-07 16:41:09.000000000 -0500 @@ -4507,6 +4507,60 @@ #ifdef SO_TYPE PyModule_AddIntConstant(m, "SO_TYPE", SO_TYPE); #endif +#ifdef SO_SNDBUFFORCE + PyModule_AddIntConstant(m, "SO_SNDBUFFORCE", SO_SNDBUFFORCE); +#endif +#ifdef SO_RCVBUFFORCE + PyModule_AddIntConstant(m, "SO_RCVBUFFORCE", SO_RCVBUFFORCE); +#endif +#ifdef SO_NO_CHECK + PyModule_AddIntConstant(m, "SO_NO_CHECK", SO_NO_CHECK); +#endif +#ifdef SO_PRIORITY + PyModule_AddIntConstant(m, "SO_PRIORITY", SO_PRIORITY); +#endif +#ifdef SO_BSDCOMPAT + PyModule_AddIntConstant(m, "SO_BSDCOMPAT", SO_BSDCOMPAT); +#endif +#ifdef SO_PASSCRED + PyModule_AddIntConstant(m, "SO_PASSCRED", SO_PASSCRED); +#endif +#ifdef SO_PEERCRED + PyModule_AddIntConstant(m, "SO_PEERCRED", SO_PEERCRED); +#endif +#ifdef SO_SECURITY_AUTHENTICATION + PyModule_AddIntConstant(m, "SO_SECURITY_AUTHENTICATION", SO_SECURITY_AUTHENTICATION); +#endif +#ifdef SO_SECURITY_ENCRYPTION_TRANSPORT + PyModule_AddIntConstant(m, "SO_SECURITY_ENCRYPTION_TRANSPORT", SO_SECURITY_ENCRYPTION_TRANSPORT); +#endif +#ifdef SO_SECURITY_ENCRYPTION_NETWORK + PyModule_AddIntConstant(m, "SO_SECURITY_ENCRYPTION_NETWORK", SO_SECURITY_ENCRYPTION_NETWORK); +#endif +#ifdef SO_BINDTODEVICE + PyModule_AddIntConstant(m, "SO_BINDTODEVICE", SO_BINDTODEVICE); +#endif +#ifdef SO_ATTACH_FILTER + PyModule_AddIntConstant(m, "SO_ATTACH_FILTER", SO_ATTACH_FILTER); +#endif +#ifdef SO_DETACH_FILTER + PyModule_AddIntConstant(m, "SO_DETACH_FILTER", SO_DETACH_FILTER); +#endif +#ifdef SO_PEERNAME + PyModule_AddIntConstant(m, "SO_PEERNAME", SO_PEERNAME); +#endif +#ifdef SO_TIMESTAMP + PyModule_AddIntConstant(m, "SO_TIMESTAMP", SO_TIMESTAMP); +#endif +#ifdef SO_PEERSEC + PyModule_AddIntConstant(m, "SO_PEERSEC", SO_PEERSEC); +#endif +#ifdef SO_PASSSEC + PyModule_AddIntConstant(m, "SO_PASSSEC", SO_PASSSEC); +#endif +#ifdef SO_TIMESTAMPNS + PyModule_AddIntConstant(m, "SO_TIMESTAMPNS", SO_TIMESTAMPNS); +#endif /* Maximum number of connections for "listen" */ #ifdef SOMAXCONN Index: python.spec =================================================================== RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- python.spec 19 Feb 2008 05:51:37 -0000 1.129 +++ python.spec 8 Mar 2008 04:29:13 -0000 1.130 @@ -20,7 +20,7 @@ Summary: An interpreted, interactive, object-oriented programming language. Name: %{python} Version: 2.5.1 -Release: 22%{?dist} +Release: 23%{?dist} License: Python Software Foundation License v2 Group: Development/Languages Provides: python-abi = %{pybasever} @@ -40,6 +40,7 @@ Patch10: python-2.5.1-binutils-no-dep.patch Patch11: python-2.5.1-codec-ascii-tolower.patch Patch12: python-2.5.1-pysqlite.patch +Patch13: python-2.5.1-socketmodule-constants.patch # upstreamed @@ -205,6 +206,7 @@ %patch10 -p1 -b .binutils-no-dep %patch11 -p1 -b .ascii-tolower %patch12 -p1 -b .pysqlite-2.3.3-minimal +%patch13 -p1 -b .socketmodule %ifarch alpha ia64 # 64bit, but not lib64 arches need this too... @@ -502,6 +504,10 @@ %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so %changelog +* Sat Mar 8 2008 James Antill - 2.5.1-22 +- Add constants to socketmodule +- Resolves: bug#436560 + * Tue Feb 19 2008 Fedora Release Engineering - 2.5.1-22 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Sat Mar 8 05:50:43 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 8 Mar 2008 05:50:43 GMT Subject: rpms/xulrunner/devel crashreporter-gcc43.patch, NONE, 1.1 xulrunner.spec, 1.87, 1.88 Message-ID: <200803080550.m285ohgR017924@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17883 Modified Files: xulrunner.spec Added Files: crashreporter-gcc43.patch Log Message: attempt to fix build bustage crashreporter-gcc43.patch: --- NEW FILE crashreporter-gcc43.patch --- Index: toolkit/crashreporter/client/crashreporter_linux.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/crashreporter/client/crashreporter_linux.cpp,v retrieving revision 1.16 diff -d -u -p -r1.16 crashreporter_linux.cpp --- toolkit/crashreporter/client/crashreporter_linux.cpp 7 Mar 2008 22:17:17 -0000 1.16 +++ toolkit/crashreporter/client/crashreporter_linux.cpp 8 Mar 2008 05:48:24 -0000 @@ -47,6 +47,7 @@ #include #include +#include #include Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- xulrunner.spec 8 Mar 2008 04:08:38 -0000 1.87 +++ xulrunner.spec 8 Mar 2008 05:50:05 -0000 1.88 @@ -31,6 +31,7 @@ Source100: find-external-requires # build patches +Patch1: crashreporter-gcc43.patch Patch4: mozilla-build.patch Patch5: xulrunner-path.patch Patch6: xulrunner-version.patch @@ -115,6 +116,7 @@ %prep %setup -q -n mozilla +%patch1 -p0 -b .crashreporter %patch4 -p1 %patch5 -p1 %patch6 -p1 -b .ver From fedora-extras-commits at redhat.com Sat Mar 8 06:10:34 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 8 Mar 2008 06:10:34 GMT Subject: rpms/epiphany/F-8 epiphany.spec,1.172,1.173 Message-ID: <200803080610.m286AY41025302@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25279 Modified Files: epiphany.spec Log Message: * Sat Mar 8 2008 Christopher Aillon - 2.20.2-4 - Update the useragent for Fedora Index: epiphany.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany/F-8/epiphany.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- epiphany.spec 8 Feb 2008 17:28:03 -0000 1.172 +++ epiphany.spec 8 Mar 2008 06:09:56 -0000 1.173 @@ -8,7 +8,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.20.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -87,6 +87,12 @@ %patch1 -p1 -b .use-pango %patch2 -p1 -b .default-bookmarks %patch3 -p1 -b .wrapped-plugins +# Fedora Epiphany version +cat >> data/default-prefs-common.js << EOF +pref("general.useragent.vendor", "Fedora"); +pref("general.useragent.vendorSub", "%{version}-%{release}"); +EOF + %build %ifnarch s390 s390x @@ -193,6 +199,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Sat Mar 8 2008 Christopher Aillon - 2.20.2-4 +- Update the useragent for Fedora + * Fri Feb 8 2008 Christopher Aillon - 2.20.2-3 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Sat Mar 8 06:12:29 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 8 Mar 2008 06:12:29 GMT Subject: rpms/epiphany/F-7 epiphany.spec,1.152,1.153 Message-ID: <200803080612.m286CToR025384@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25366 Modified Files: epiphany.spec Log Message: * Sat Mar 8 2008 Christopher Aillon - 2.18.3-7 - Update the useragent for Fedora Index: epiphany.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany/F-7/epiphany.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- epiphany.spec 8 Feb 2008 17:28:49 -0000 1.152 +++ epiphany.spec 8 Mar 2008 06:11:56 -0000 1.153 @@ -9,7 +9,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.18.3 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -85,6 +85,11 @@ %patch0 -p1 -b .homepage %patch1 -p1 -b .use-pango %patch2 -p1 -b .default-bookmarks +# Fedora Epiphany version +cat >> data/default-prefs-common.js << EOF +pref("general.useragent.vendor", "Fedora"); +pref("general.useragent.vendorSub", "%{version}-%{release}"); +EOF %build %ifnarch s390 s390x @@ -178,6 +183,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Sat Mar 8 2008 Christopher Aillon - 2.18.3-7 +- Update the useragent for Fedora + * Fri Feb 8 2008 Christopher Aillon - 2.18.3-6 - Rebuild against newer gecko From fedora-extras-commits at redhat.com Sat Mar 8 06:56:12 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 8 Mar 2008 06:56:12 GMT Subject: rpms/xulrunner/devel crashreporter-gcc43.patch,1.1,1.2 Message-ID: <200803080656.m286uCmr025896@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25869 Modified Files: crashreporter-gcc43.patch Log Message: include cstring crashreporter-gcc43.patch: Index: crashreporter-gcc43.patch =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/crashreporter-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- crashreporter-gcc43.patch 8 Mar 2008 05:50:05 -0000 1.1 +++ crashreporter-gcc43.patch 8 Mar 2008 06:56:08 -0000 1.2 @@ -9,7 +9,7 @@ #include #include -+#include ++#include #include From fedora-extras-commits at redhat.com Sat Mar 8 07:01:17 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 8 Mar 2008 07:01:17 GMT Subject: rpms/epiphany/F-8 .cvsignore, 1.63, 1.64 epiphany.spec, 1.173, 1.174 sources, 1.65, 1.66 Message-ID: <200803080701.m2871HhP000695@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25987 Modified Files: .cvsignore epiphany.spec sources Log Message: * Sat Mar 8 2008 Christopher Aillon - 2.20.3-1 - Update to 2.20.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/epiphany/F-8/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 16 Oct 2007 04:05:52 -0000 1.63 +++ .cvsignore 8 Mar 2008 07:00:43 -0000 1.64 @@ -1 +1 @@ -epiphany-2.20.1.tar.bz2 +epiphany-2.20.3.tar.bz2 Index: epiphany.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany/F-8/epiphany.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- epiphany.spec 8 Mar 2008 06:09:56 -0000 1.173 +++ epiphany.spec 8 Mar 2008 07:00:43 -0000 1.174 @@ -7,8 +7,8 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany -Version: 2.20.2 -Release: 4%{?dist} +Version: 2.20.3 +Release: 1%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -199,6 +199,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Sat Mar 8 2008 Christopher Aillon - 2.20.3-1 +- Update to 2.20.3 + * Sat Mar 8 2008 Christopher Aillon - 2.20.2-4 - Update the useragent for Fedora Index: sources =================================================================== RCS file: /cvs/extras/rpms/epiphany/F-8/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 27 Nov 2007 15:14:14 -0000 1.65 +++ sources 8 Mar 2008 07:00:43 -0000 1.66 @@ -1 +1 @@ -587325089ee4bf21f7406d56b9add4ca epiphany-2.20.2.tar.bz2 +df2861b3e91bef6d365f50187b6170cb epiphany-2.20.3.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 08:28:44 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sat, 8 Mar 2008 08:28:44 GMT Subject: rpms/pinot/devel pinot-0.83-gcc43-fixes.patch, NONE, 1.1 pinot.spec, 1.27, 1.28 Message-ID: <200803080828.m288SiAE008792@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/pinot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8769 Modified Files: pinot.spec Added Files: pinot-0.83-gcc43-fixes.patch Log Message: fix gcc43 build pinot-0.83-gcc43-fixes.patch: --- NEW FILE pinot-0.83-gcc43-fixes.patch --- diff -upNr pinot-0.83.orign/IndexSearch/cjkv/CJKVTokenizer.cc pinot-0.83/IndexSearch/cjkv/CJKVTokenizer.cc --- pinot-0.83.orign/IndexSearch/cjkv/CJKVTokenizer.cc 2008-02-26 14:16:53.000000000 +0100 +++ pinot-0.83/IndexSearch/cjkv/CJKVTokenizer.cc 2008-03-08 09:24:41.000000000 +0100 @@ -19,7 +19,7 @@ #include #include - +#include #include "CJKVTokenizer.h" #ifndef HAVE_UNICODE_H diff -upNr pinot-0.83.orign/IndexSearch/Xapian/XapianEngine.cpp pinot-0.83/IndexSearch/Xapian/XapianEngine.cpp --- pinot-0.83.orign/IndexSearch/Xapian/XapianEngine.cpp 2008-02-23 08:53:32.000000000 +0100 +++ pinot-0.83/IndexSearch/Xapian/XapianEngine.cpp 2008-03-08 09:23:17.000000000 +0100 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include Index: pinot.spec =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- pinot.spec 2 Mar 2008 13:19:01 -0000 1.27 +++ pinot.spec 8 Mar 2008 08:28:10 -0000 1.28 @@ -1,6 +1,6 @@ Name: pinot Version: 0.83 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Personal search and metasearch for the Desktop Group: User Interface/Desktops @@ -8,7 +8,7 @@ URL: http://pinot.berlios.de/ Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz Patch0: fix_lang_detect.patch - +Patch1: pinot-0.83-gcc43-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sqlite-devel >= 3.3.1 @@ -53,6 +53,7 @@ %prep %setup -q %patch0 -p1 -b .lang_detect +%patch1 -p1 -b .gcc43 %build %configure @@ -117,6 +118,9 @@ %changelog +* Sat Mar 08 2008 Adel Gadllah 0.83-2 +- Fix gcc-4.3 build + * Sun Mar 02 2008 Adel Gadllah 0.83-1 - Update to 0.83 - Drop upstreamed patches From fedora-extras-commits at redhat.com Sat Mar 8 08:40:30 2008 From: fedora-extras-commits at redhat.com (Adel Gadllah (drago01)) Date: Sat, 8 Mar 2008 08:40:30 GMT Subject: rpms/pinot/devel pinot-0.83-gcc43-fixes.patch,1.1,1.2 Message-ID: <200803080840.m288eUUT009004@cvs-int.fedora.redhat.com> Author: drago01 Update of /cvs/pkgs/rpms/pinot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8983 Modified Files: pinot-0.83-gcc43-fixes.patch Log Message: fix build pinot-0.83-gcc43-fixes.patch: Index: pinot-0.83-gcc43-fixes.patch =================================================================== RCS file: /cvs/pkgs/rpms/pinot/devel/pinot-0.83-gcc43-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pinot-0.83-gcc43-fixes.patch 8 Mar 2008 08:28:10 -0000 1.1 +++ pinot-0.83-gcc43-fixes.patch 8 Mar 2008 08:40:26 -0000 1.2 @@ -21,3 +21,14 @@ #include #include #include +diff -upNr pinot-0.83.orign/UI/GTK2/src/pinot-dbus-daemon.cc pinot-0.83/UI/GTK2/src/pinot-dbus-daemon.cc +--- pinot-0.83.orign/UI/GTK2/src/pinot-dbus-daemon.cc 2008-02-21 07:46:44.000000000 +0100 ++++ pinot-0.83/UI/GTK2/src/pinot-dbus-daemon.cc 2008-03-08 09:38:37.000000000 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include From fedora-extras-commits at redhat.com Sat Mar 8 09:37:17 2008 From: fedora-extras-commits at redhat.com (Michal Fabry (furby)) Date: Sat, 8 Mar 2008 09:37:17 GMT Subject: rpms/webcpp/devel webcpp-0.8.4-typo.patch, NONE, 1.1 webcpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803080937.m289bHlw016886@cvs-int.fedora.redhat.com> Author: furby Update of /cvs/pkgs/rpms/webcpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16856/devel Modified Files: .cvsignore sources Added Files: webcpp-0.8.4-typo.patch webcpp.spec Log Message: Initial import webcpp-0.8.4-typo.patch: --- NEW FILE webcpp-0.8.4-typo.patch --- --- webcpp-0.8.4-src/webcpp/engine.cpp.orig 2004-01-05 00:52:47.000000000 +0000 +++ webcpp-0.8.4-src/webcpp/engine.cpp 2007-11-23 01:07:06.000000000 +0000 @@ -1005,7 +1005,7 @@ \n\
\ web c plus plus
\n\ -\n\\n
\n"; +\n\n
\n"; *IO << made; } --- NEW FILE webcpp.spec --- Name: webcpp Version: 0.8.4 Release: 1%{?dist} Summary: Convert C++ code to HTML License: GPLv2 Group: Development/Tools URL: http://webcpp.sourceforge.net Source: http://prdownloads.sourceforge.net/webcpp/%{name}-%{version}-src.tar.gz Patch0: webcpp-0.8.4-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Web C Plus Plus is a command line utility that takes your source code, and converts it into an HTML file using a fully customizable syntax highlighting engine and colour schemes. This is useful if you want to post your code online and make it easier to read, or to make online programming tutorials. %prep %setup -qn %{name}-%{version}-src %patch0 -p1 -b .typo %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -Dpm 755 %{name}/webcpp $RPM_BUILD_ROOT%{_bindir}/webcpp %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README docs.html %{_bindir}/webcpp %changelog * Fri Nov 23 2007 Michal Fabry - 0.8.4-1 - First build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/webcpp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 17:47:12 -0000 1.1 +++ .cvsignore 8 Mar 2008 09:36:42 -0000 1.2 @@ -0,0 +1 @@ +webcpp-0.8.4-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/webcpp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 17:47:12 -0000 1.1 +++ sources 8 Mar 2008 09:36:42 -0000 1.2 @@ -0,0 +1 @@ +201306053f50857e70dca6a4748ebf07 webcpp-0.8.4-src.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 09:39:57 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sat, 8 Mar 2008 09:39:57 GMT Subject: rpms/roundup/devel roundup.spec,1.12,1.13 Message-ID: <200803080939.m289dvl8016981@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/roundup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16954 Modified Files: roundup.spec Log Message: Add in the bug number Index: roundup.spec =================================================================== RCS file: /cvs/extras/rpms/roundup/devel/roundup.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- roundup.spec 7 Mar 2008 23:23:30 -0000 1.12 +++ roundup.spec 8 Mar 2008 09:39:22 -0000 1.13 @@ -82,7 +82,7 @@ %changelog * Fri Mar 7 2008 Paul P. Komkoff Jr - 1.4.4-1 -- new upstream version with security fixes +- new upstream version with security fixes (bz#436546) * Wed Feb 20 2008 Paul P. Komkoff Jr - 1.4.1-2 - new upstream version From fedora-extras-commits at redhat.com Sat Mar 8 09:43:25 2008 From: fedora-extras-commits at redhat.com (Michal Fabry (furby)) Date: Sat, 8 Mar 2008 09:43:25 GMT Subject: rpms/webcpp/F-8 webcpp-0.8.4-typo.patch, NONE, 1.1 webcpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803080943.m289hPK9017108@cvs-int.fedora.redhat.com> Author: furby Update of /cvs/pkgs/rpms/webcpp/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17080/F-8 Modified Files: .cvsignore sources Added Files: webcpp-0.8.4-typo.patch webcpp.spec Log Message: Initial import webcpp-0.8.4-typo.patch: --- NEW FILE webcpp-0.8.4-typo.patch --- --- webcpp-0.8.4-src/webcpp/engine.cpp.orig 2004-01-05 00:52:47.000000000 +0000 +++ webcpp-0.8.4-src/webcpp/engine.cpp 2007-11-23 01:07:06.000000000 +0000 @@ -1005,7 +1005,7 @@ \n\
\ web c plus plus
\n\ -\n\\n
\n"; +\n\n
\n"; *IO << made; } --- NEW FILE webcpp.spec --- Name: webcpp Version: 0.8.4 Release: 1%{?dist} Summary: Convert C++ code to HTML License: GPLv2 Group: Development/Tools URL: http://webcpp.sourceforge.net Source: http://prdownloads.sourceforge.net/webcpp/%{name}-%{version}-src.tar.gz Patch0: webcpp-0.8.4-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Web C Plus Plus is a command line utility that takes your source code, and converts it into an HTML file using a fully customizable syntax highlighting engine and colour schemes. This is useful if you want to post your code online and make it easier to read, or to make online programming tutorials. %prep %setup -qn %{name}-%{version}-src %patch0 -p1 -b .typo %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -Dpm 755 %{name}/webcpp $RPM_BUILD_ROOT%{_bindir}/webcpp %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README docs.html %{_bindir}/webcpp %changelog * Fri Nov 23 2007 Michal Fabry - 0.8.4-1 - First build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/webcpp/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 17:47:12 -0000 1.1 +++ .cvsignore 8 Mar 2008 09:42:52 -0000 1.2 @@ -0,0 +1 @@ +webcpp-0.8.4-src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/webcpp/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 17:47:12 -0000 1.1 +++ sources 8 Mar 2008 09:42:52 -0000 1.2 @@ -0,0 +1 @@ +201306053f50857e70dca6a4748ebf07 webcpp-0.8.4-src.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 10:09:10 2008 From: fedora-extras-commits at redhat.com (Michal Fabry (furby)) Date: Sat, 8 Mar 2008 10:09:10 GMT Subject: rpms/webcpp/devel webcpp-0.8.4-gcc43.patch, NONE, 1.1 webcpp.spec, 1.1, 1.2 Message-ID: <200803081009.m28A9ATK024615@cvs-int.fedora.redhat.com> Author: furby Update of /cvs/pkgs/rpms/webcpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24580 Modified Files: webcpp.spec Added Files: webcpp-0.8.4-gcc43.patch Log Message: fix for gcc 4.3 webcpp-0.8.4-gcc43.patch: --- NEW FILE webcpp-0.8.4-gcc43.patch --- diff -urp webcpp-0.8.4-src.orig/webcpp/main.cpp webcpp-0.8.4-src/webcpp/main.cpp --- webcpp-0.8.4-src.orig/webcpp/main.cpp 2004-01-05 01:52:47.000000000 +0100 +++ webcpp-0.8.4-src/webcpp/main.cpp 2008-03-08 10:45:17.000000000 +0100 @@ -24,6 +24,7 @@ #include "driver.h" #include +#include using namespace std; int main(int argc, char **argv) { Index: webcpp.spec =================================================================== RCS file: /cvs/pkgs/rpms/webcpp/devel/webcpp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- webcpp.spec 8 Mar 2008 09:36:42 -0000 1.1 +++ webcpp.spec 8 Mar 2008 10:08:12 -0000 1.2 @@ -1,12 +1,13 @@ Name: webcpp Version: 0.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert C++ code to HTML License: GPLv2 Group: Development/Tools URL: http://webcpp.sourceforge.net Source: http://prdownloads.sourceforge.net/webcpp/%{name}-%{version}-src.tar.gz Patch0: webcpp-0.8.4-typo.patch +Patch1: webcpp-0.8.4-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -19,6 +20,7 @@ %prep %setup -qn %{name}-%{version}-src %patch0 -p1 -b .typo +%patch1 -p1 -b .gcc43 %build %configure @@ -40,6 +42,9 @@ %changelog -* Fri Nov 23 2007 Michal Fabry - 0.8.4-1 +* Sat Mar 08 2008 Michal Fabry - 0.8.4-2 +- fix build with gcc 4.3 + +* Fri Nov 23 2007 Michal Fabry - 0.8.4-1 - First build From fedora-extras-commits at redhat.com Sat Mar 8 11:07:48 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Sat, 8 Mar 2008 11:07:48 GMT Subject: rpms/xerces-c27/devel Makefile,1.1,1.2 Message-ID: <200803081107.m28B7mvX032419@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/xerces-c27/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32386/devel Modified Files: Makefile Log Message: Fix Makefile after the module rename Index: Makefile =================================================================== RCS file: /cvs/pkgs/rpms/xerces-c27/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 7 Mar 2008 21:26:49 -0000 1.1 +++ Makefile 8 Mar 2008 11:07:10 -0000 1.2 @@ -1,6 +1,6 @@ -# Makefile for source rpm: xercesc-27 +# Makefile for source rpm: xerces-c27 # $Id$ -NAME := xercesc-27 +NAME := xerces-c27 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Sat Mar 8 11:15:57 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Sat, 8 Mar 2008 11:15:57 GMT Subject: rpms/xerces-c27/devel xerces-c27.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803081115.m28BFv0p032582@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/xerces-c27/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32503/devel Modified Files: .cvsignore sources Added Files: xerces-c27.spec Log Message: Initial import. --- NEW FILE xerces-c27.spec --- Summary: Validating XML Parser Name: xerces-c27 Version: 2.7.0 Release: 4%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://xml.apache.org/xerces-c/ # The 2.7.0 tarball is not available anymore, even from # http://archive.apache.org/dist/xerces/c/sources/ Source: http://www.apache.org/dist/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Xerces-C is a validating XML parser written in a portable subset of C++. Xerces-C makes it easy to give your application the ability to read and write XML data. A shared library is provided for parsing, generating, manipulating, and validating XML documents. Xerces-C is faithful to the XML 1.0 recommendation and associated standards ( DOM 1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces). Note that this package contains Xerces-C++ 2.7.0 for compatibility with applications that cannot use a newer version. %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains the header files, static libraries and development documentation for xerces-c 2.7.0. If you like to develop programs using xerces-c 2.7.0, you will need to install %{name}-devel. %package doc Group: Documentation Summary: Documentation for Xerces-C++ validating XML parser %description doc Documentation for Xerces-C++ 2.7.0. Xerces-C++ is a validating XML parser written in a portable subset of C++. Xerces-C++ makes it easy to give your application the ability to read and write XML data. A shared library is provided for parsing, generating, manipulating, and validating XML documents. %prep %setup -q -n xerces-c-src_2_7_0 rm -rf doc/html/resources/.svn find ./doc -type f -perm 755 -exec chmod 644 {} \; find ./samples -type f -perm 755 -exec chmod 644 {} \; %{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in iconv -f iso8859-1 -t utf-8 credits.txt > credits.txt.conv && mv -f credits.txt.conv credits.txt; for i in feedback.xml migration.xml releases_archive.xml; do { iconv -f iso8859-1 -t utf-8 doc/$i > doc/$i.conv && mv -f doc/$i.conv doc/$i; }; done; %build export XERCESCROOT="$PWD" # Let Makefiles be verbose find -name 'Makefile.*' | while read f; do sed -i -e 's/$Q//g' \ -e 's/{MAKE} -s/(MAKE)/g' \ -e '/echo \" (/d' \ $f done # Remove conflicting flags from runConfigure find -name runConfigure | while read f; do sed -i -e 's/-w -O -DNDEBUG/-DNDEBUG/g' $f done cd $XERCESCROOT/src/xercesc %ifarch alpha ppc64 s390x sparc64 x86_64 CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -b64 -P %{_prefix} -C --libdir="%{_libdir}" %else CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -b32 -P %{_prefix} -C --libdir="%{_libdir}" %endif # not smp safe %{__make} %install %{__rm} -rf $RPM_BUILD_ROOT export XERCESCROOT="$PWD" %{__make} install -C src/xercesc DESTDIR="$RPM_BUILD_ROOT" /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} mkdir -p $RPM_BUILD_ROOT%{_libdir}/xerces-c-2.7.0 cd $RPM_BUILD_ROOT%{_libdir}/xerces-c-2.7.0/ ln -s ../libxerces-c.so.27 libxerces-c.so ln -s ../libxerces-depdom.so.27 libxerces-depdom.so cd - rm $RPM_BUILD_ROOT%{_libdir}/libxerces*.so mkdir -p $RPM_BUILD_ROOT%{_includedir}/xercesc-2.7.0 mv $RPM_BUILD_ROOT%{_includedir}/xercesc $RPM_BUILD_ROOT%{_includedir}/xercesc-2.7.0 %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(0644,root,root,0755) %doc LICENSE.txt %{_libdir}/libxerces*.so.* %files devel %defattr(0644,root,root,0755) %dir %{_libdir}/xerces-c-2.7.0 %{_libdir}/xerces-c-2.7.0/libxerces*.so %{_includedir}/xercesc-2.7.0/ %files doc %defattr(0644,root,root,0755) %doc Readme.html LICENSE NOTICE STATUS credits.txt doc samples %changelog * Wed Feb 27 2008 Xavier Bachelot - 2.7.0-4 - Better descriptions. * Tue Feb 26 2008 Xavier Bachelot - 2.7.0-3 - Fix some non-utf8 files. - Fix files and dirs permissions. - Properly own dir. * Tue Feb 26 2008 Xavier Bachelot - 2.7.0-2 - Better files relocation. * Mon Feb 18 2008 Xavier Bachelot - 2.7.0-1 - Initial build. - Spec file forked from original xerces-c package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xerces-c27/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 21:26:49 -0000 1.1 +++ .cvsignore 8 Mar 2008 11:15:24 -0000 1.2 @@ -0,0 +1 @@ +xerces-c-src_2_7_0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xerces-c27/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 21:26:49 -0000 1.1 +++ sources 8 Mar 2008 11:15:24 -0000 1.2 @@ -0,0 +1 @@ +04169609449a8846bc1e6891c04cadf4 xerces-c-src_2_7_0.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 12:13:26 2008 From: fedora-extras-commits at redhat.com (Martin Sourada (mso)) Date: Sat, 8 Mar 2008 12:13:26 GMT Subject: rpms/gtk-nodoka-engine/devel .cvsignore, 1.7, 1.8 gtk-nodoka-engine.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200803081213.m28CDQHJ007983@cvs-int.fedora.redhat.com> Author: mso Update of /cvs/extras/rpms/gtk-nodoka-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7957 Modified Files: .cvsignore gtk-nodoka-engine.spec sources Log Message: 0.7 RC1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 26 Jan 2008 11:55:29 -0000 1.7 +++ .cvsignore 8 Mar 2008 12:12:52 -0000 1.8 @@ -1 +1 @@ -gtk-nodoka-engine-0.6.90.2.tar.gz +gtk-nodoka-engine-0.6.99.1.tar.gz Index: gtk-nodoka-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gtk-nodoka-engine.spec 8 Feb 2008 21:36:19 -0000 1.14 +++ gtk-nodoka-engine.spec 8 Mar 2008 12:12:52 -0000 1.15 @@ -2,8 +2,8 @@ %define nogtk2 %(pkg-config gtk+-2.0 --modversion &> /dev/null; echo $?) Name: gtk-nodoka-engine -Version: 0.6.90.2 -Release: 2%{?dist} +Version: 0.6.99.1 +Release: 1%{?dist} Summary: The Nodoka GTK Theme Engine Group: System Environment/Libraries @@ -65,9 +65,13 @@ %changelog +* Sat Mar 08 2008 Martin Sourada - 0.6.99.1-1 +- 0.7 RC1 + * Fri Feb 08 2008 Martin Sourada - 0.6.90.2-2 - Rebuild for gcc 4.3 - Use full source path + * Sat Jan 26 2008 Martin Sourada - 0.6.90.2-1 - Update to 0.7. beta 2 release - mostly bug fixes Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 26 Jan 2008 11:55:29 -0000 1.7 +++ sources 8 Mar 2008 12:12:52 -0000 1.8 @@ -1 +1 @@ -603a513f6426a0c5c9a7fd9c04a5021d gtk-nodoka-engine-0.6.90.2.tar.gz +24d5febf83a529f390f65f059678eb20 gtk-nodoka-engine-0.6.99.1.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 13:01:45 2008 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 8 Mar 2008 13:01:45 GMT Subject: comps comps-f7.xml.in, 1.319, 1.320 comps-f8.xml.in, 1.232, 1.233 comps-f9.xml.in, 1.296, 1.297 Message-ID: <200803081301.m28D1jmg015651@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11786 Modified Files: comps-f7.xml.in comps-f8.xml.in comps-f9.xml.in Log Message: add xfce4-time-out-plugin Index: comps-f7.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v retrieving revision 1.319 retrieving revision 1.320 diff -u -r1.319 -r1.320 --- comps-f7.xml.in 7 Mar 2008 22:38:28 -0000 1.319 +++ comps-f7.xml.in 8 Mar 2008 13:01:14 -0000 1.320 @@ -3939,6 +3939,7 @@ xfce4-smartbookmark-plugin xfce4-systemload-plugin xfce4-taskmanager + xfce4-time-out-plugin xfce4-timer-plugin xfce4-verve-plugin xfce4-wavelan-plugin Index: comps-f8.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- comps-f8.xml.in 7 Mar 2008 22:38:28 -0000 1.232 +++ comps-f8.xml.in 8 Mar 2008 13:01:14 -0000 1.233 @@ -4207,6 +4207,7 @@ xfce4-smartbookmark-plugin xfce4-systemload-plugin xfce4-taskmanager + xfce4-time-out-plugin xfce4-timer-plugin xfce4-verve-plugin xfce4-wavelan-plugin Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- comps-f9.xml.in 7 Mar 2008 22:38:28 -0000 1.296 +++ comps-f9.xml.in 8 Mar 2008 13:01:14 -0000 1.297 @@ -4262,6 +4262,7 @@ xfce4-smartbookmark-plugin xfce4-systemload-plugin xfce4-taskmanager + xfce4-time-out-plugin xfce4-timer-plugin xfce4-verve-plugin xfce4-wavelan-plugin From fedora-extras-commits at redhat.com Sat Mar 8 13:13:59 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sat, 8 Mar 2008 13:13:59 GMT Subject: rpms/roundup/F-7 .cvsignore, 1.3, 1.4 roundup.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200803081313.m28DDxdU015817@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/roundup/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15773/F-7 Modified Files: .cvsignore roundup.spec sources Log Message: roundup-1.4.4-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/roundup/F-7/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Jul 2007 19:17:22 -0000 1.3 +++ .cvsignore 8 Mar 2008 13:13:26 -0000 1.4 @@ -1 +1 @@ -roundup-1.3.3.tar.gz +roundup-1.4.4.tar.gz Index: roundup.spec =================================================================== RCS file: /cvs/extras/rpms/roundup/F-7/roundup.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- roundup.spec 19 Jul 2007 04:01:31 -0000 1.9 +++ roundup.spec 8 Mar 2008 13:13:26 -0000 1.10 @@ -2,11 +2,11 @@ Summary: Simple and flexible issue-tracking system Name: roundup -Version: 1.3.3 -Release: 2%{dist} +Version: 1.4.4 +Release: 1%{dist} License: MIT Group: Applications/Engineering -Source: http://dl.sourceforge.net/roundup/roundup-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/r/%{name}/%{name}-%{version}.tar.gz Source1: roundup.conf Source2: roundup Source3: README.Fedora @@ -81,6 +81,15 @@ %doc README.Fedora COPYING.txt %changelog +* Fri Mar 7 2008 Paul P. Komkoff Jr - 1.4.4-1 +- new upstream version with security fixes (bz#436546) + +* Wed Feb 20 2008 Paul P. Komkoff Jr - 1.4.1-2 +- new upstream version + +* Wed Jan 23 2008 Paul P. Komkoff Jr - 1.4.1-1 +- new upstream version + * Thu Jul 19 2007 Paul P. Komkoff Jr - 1.3.3-2 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/roundup/F-7/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Jul 2007 19:17:22 -0000 1.3 +++ sources 8 Mar 2008 13:13:26 -0000 1.4 @@ -1 +1 @@ -aefc6ae5684b3760643666f9e2e47e2f roundup-1.3.3.tar.gz +6a9f6fc272d833ef0179b00e63010a08 roundup-1.4.4.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 13:14:06 2008 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sat, 8 Mar 2008 13:14:06 GMT Subject: rpms/roundup/F-8 .cvsignore, 1.3, 1.4 roundup.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200803081314.m28DE61V015822@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/roundup/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15773/F-8 Modified Files: .cvsignore roundup.spec sources Log Message: roundup-1.4.4-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/roundup/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Jul 2007 19:17:22 -0000 1.3 +++ .cvsignore 8 Mar 2008 13:13:29 -0000 1.4 @@ -1 +1 @@ -roundup-1.3.3.tar.gz +roundup-1.4.4.tar.gz Index: roundup.spec =================================================================== RCS file: /cvs/extras/rpms/roundup/F-8/roundup.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- roundup.spec 19 Jul 2007 04:01:34 -0000 1.9 +++ roundup.spec 8 Mar 2008 13:13:29 -0000 1.10 @@ -2,11 +2,11 @@ Summary: Simple and flexible issue-tracking system Name: roundup -Version: 1.3.3 -Release: 2%{dist} +Version: 1.4.4 +Release: 1%{dist} License: MIT Group: Applications/Engineering -Source: http://dl.sourceforge.net/roundup/roundup-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/r/%{name}/%{name}-%{version}.tar.gz Source1: roundup.conf Source2: roundup Source3: README.Fedora @@ -81,6 +81,15 @@ %doc README.Fedora COPYING.txt %changelog +* Fri Mar 7 2008 Paul P. Komkoff Jr - 1.4.4-1 +- new upstream version with security fixes (bz#436546) + +* Wed Feb 20 2008 Paul P. Komkoff Jr - 1.4.1-2 +- new upstream version + +* Wed Jan 23 2008 Paul P. Komkoff Jr - 1.4.1-1 +- new upstream version + * Thu Jul 19 2007 Paul P. Komkoff Jr - 1.3.3-2 - add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/roundup/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Jul 2007 19:17:22 -0000 1.3 +++ sources 8 Mar 2008 13:13:29 -0000 1.4 @@ -1 +1 @@ -aefc6ae5684b3760643666f9e2e47e2f roundup-1.3.3.tar.gz +6a9f6fc272d833ef0179b00e63010a08 roundup-1.4.4.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 13:52:43 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sat, 8 Mar 2008 13:52:43 GMT Subject: rpms/xastir/F-8 xastir.png,1.1,1.2 xastir.spec,1.4,1.5 Message-ID: <200803081352.m28DqhMP016310@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xastir/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16289 Modified Files: xastir.png xastir.spec Log Message: fix icon and rebuild with wget Index: xastir.spec =================================================================== RCS file: /cvs/pkgs/rpms/xastir/F-8/xastir.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xastir.spec 2 Mar 2008 18:27:22 -0000 1.4 +++ xastir.spec 8 Mar 2008 13:52:08 -0000 1.5 @@ -1,7 +1,7 @@ Summary : Amateur Station Tracking and Reporting system for amateur radio Name : xastir Version : 1.9.2 -Release : 4%{?dist} +Release : 5%{?dist} License : GPLv2 Group : Applications/Internet Source0 : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz @@ -10,6 +10,8 @@ Patch0 : xastir-1.9.2-libdir.patch URL : http://www.xastir.org BuildRoot : %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires : wget +BuildRequires : wget BuildRequires : lesstif-devel BuildRequires : libXt-devel BuildRequires : festival @@ -36,6 +38,10 @@ %build #./bootstrap.sh +#aclocal +#autoheader +#autoconf +#automake -a -c %configure --without-graphicsmagick --with-rtree make %{?_smp_mflags} for f in README ChangeLog ; do @@ -53,7 +59,6 @@ rm -rf %{buildroot}/usr/share/doc #remove gpx2shape because of unsupported dependency Geo::Shapelib rm %{buildroot}/usr/share/xastir/gpx2shape -# no upstream .desktop or icon yet mkdir -p %{buildroot}/usr/share/pixmaps/ cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="fedora" \ @@ -72,6 +77,7 @@ %{_mandir}/man1/xastir.* %attr(0644,root,root) %{_datadir}/xastir/Coordinate.pm %{_datadir}/xastir +#%{_libdir}/xastir ##%{_datadir}/xastir/help #%{_datadir}/xastir/config ##%{_datadir}/xastir/symbols @@ -87,6 +93,11 @@ %doc README.MAPS README.win32 UPGRADE %changelog +* Sat Mar 8 2008 Lucian Langa - 1.9.2-5 +- Install correct xastir icon +- Misc cleanups +- Rebuild with wget support + * Sat Mar 2 2008 Lucian Langa - 1.9.2-4 - Misc cleanups From fedora-extras-commits at redhat.com Sat Mar 8 15:01:28 2008 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Sat, 8 Mar 2008 15:01:28 GMT Subject: rpms/alsa-plugins/devel alsa-plugins-1.0.16-pulseclose.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 alsa-plugins.spec, 1.10, 1.11 sources, 1.3, 1.4 1.0.14-buffer-attr.patch, 1.1, NONE 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch, 1.1, NONE 1.0.14-state-xrun.patch, 1.1, NONE Message-ID: <200803081501.m28F1Sg1000411@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/alsa-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25699/devel Modified Files: .cvsignore alsa-plugins.spec sources Added Files: alsa-plugins-1.0.16-pulseclose.patch Removed Files: 1.0.14-buffer-attr.patch 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch 1.0.14-state-xrun.patch Log Message: Fix pidgin crash alsa-plugins-1.0.16-pulseclose.patch: --- NEW FILE alsa-plugins-1.0.16-pulseclose.patch --- If stream connection failes, don't assume that stream is connected upon closing. diff -urp alsa-plugins-1.0.16.orig/pulse/pcm_pulse.c alsa-plugins-1.0.16/pulse/pcm_pulse.c --- alsa-plugins-1.0.16.orig/pulse/pcm_pulse.c 2008-02-05 10:25:00.000000000 +0100 +++ alsa-plugins-1.0.16/pulse/pcm_pulse.c 2008-03-08 14:33:43.000000000 +0100 @@ -112,12 +112,14 @@ static int pulse_stop(snd_pcm_ioplug_t * pa_threaded_mainloop_lock(pcm->p->mainloop); - assert(pcm->stream); - err = pulse_check_connection(pcm->p); if (err < 0) goto finish; + /* If stream connection fails, this gets called anyway */ + if (pcm->stream == NULL) + goto finish; + o = pa_stream_flush(pcm->stream, pulse_stream_success_cb, pcm->p); assert(o); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Jan 2008 08:00:22 -0000 1.3 +++ .cvsignore 8 Mar 2008 15:00:45 -0000 1.4 @@ -1 +1 @@ -alsa-plugins-1.0.15.tar.bz2 +alsa-plugins-1.0.16.tar.bz2 Index: alsa-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- alsa-plugins.spec 4 Mar 2008 18:16:56 -0000 1.10 +++ alsa-plugins.spec 8 Mar 2008 15:00:45 -0000 1.11 @@ -1,6 +1,6 @@ Name: alsa-plugins -Version: 1.0.15 -Release: 4%{?dist} +Version: 1.0.16 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ License: GPLv2+ and LGPLv2+ @@ -13,10 +13,8 @@ Source5: upmix.conf Source6: vdownmix.conf Source7: pulse-default.conf -Patch0: 1.0.14-buffer-attr.patch -Patch1: 1.0.14-state-xrun.patch -Patch2: 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch Patch3: alsa-plugins-1.0.15-pulsehint.patch +Patch4: alsa-plugins-1.0.16-pulseclose.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -98,10 +96,8 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .buffer_attr -%patch1 -p1 -b .state_xrun -%patch2 -p1 -b .pulse-SND_PCM_STATE_PREPARED %patch3 -p1 -b .pulsehint +%patch4 -p1 -b .pulseclose %build %configure --disable-static \ @@ -175,6 +171,10 @@ %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Sat Mar 08 2008 Lubomir Kundrak - 1.0.16-1 +- New upstream, dropping upstreamed patches +- Do not assert fail when pulseaudio is unavailable (#435148) + * Tue Mar 04 2008 Lubomir Kundrak - 1.0.15-4 - Be more heplful when there's PulseAudio trouble. - This may save us some bogus bug reports Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Jan 2008 08:00:22 -0000 1.3 +++ sources 8 Mar 2008 15:00:45 -0000 1.4 @@ -1 +1 @@ -908c2dd7ec33bc8e1fcd5e92c7e5e125 alsa-plugins-1.0.15.tar.bz2 +5906aff0d0dc84dee9624d395db4cfc6 alsa-plugins-1.0.16.tar.bz2 --- 1.0.14-buffer-attr.patch DELETED --- --- 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch DELETED --- --- 1.0.14-state-xrun.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 8 15:13:23 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Sat, 8 Mar 2008 15:13:23 GMT Subject: rpms/gnome-scan/F-8 .cvsignore, 1.2, 1.3 gnome-scan.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803081513.m28FDNuE000647@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/pkgs/rpms/gnome-scan/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv618 Modified Files: .cvsignore gnome-scan.spec sources Log Message: * Sat Mar 08 2008 Deji Akingunola - 0.5.93-1 - New release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-scan/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Nov 2007 16:42:55 -0000 1.2 +++ .cvsignore 8 Mar 2008 15:12:45 -0000 1.3 @@ -1 +1 @@ -gnome-scan-0.5.3.tar.bz2 +gnome-scan-0.5.93.tar.bz2 Index: gnome-scan.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-scan/F-8/gnome-scan.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-scan.spec 10 Nov 2007 16:42:55 -0000 1.1 +++ gnome-scan.spec 8 Mar 2008 15:12:45 -0000 1.2 @@ -1,16 +1,11 @@ Summary: Gnome solution for scanning in the desktop on top of libsane Name: gnome-scan -Version: 0.5.3 -Release: 0.1.20071030svn%{?dist} +Version: 0.5.93 +Release: 1%{?dist} Group: Applications/System License: LGPLv2+ URL: http://home.gna.org/gnomescan/ -#Source0: http://download.gna.org/gnomescan/%{name}-%{version}.tar.gz -# Tarball generated from svn checkout on the date referenced in the spec -# 'Release' field. The tarball can be re-generated as follows; -# svn co -r 458 http://svn.gnome.org/svn/gnome-scan/trunk/ gnome-scan-svn20071030 -# cd gnome-scan-svn20071030 && ./autogen.sh && make distcheck -Source0: %{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libgnomeui-devel sane-backends-devel BuildRequires: gegl-devel gimp-devel @@ -40,6 +35,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig gtk2-devel Requires: gegl-devel libgnomeui-devel +Obsoletes: gnomescan-devel < 0.5 %description devel Contains development headers and libraries for gnome-scan @@ -112,8 +108,15 @@ %{_libdir}/libgnomescan.so %{_libdir}/gnome-scan-1.0/*.so %{_libdir}/pkgconfig/gnome-scan.pc +%doc %{_datadir}/gtk-doc/html/gnome-scan*/ %changelog +* Sat Mar 08 2008 Deji Akingunola - 0.5.93-1 +- New release + +* Tue Jan 15 2008 Deji Akingunola - 0.5.3-0.2.20071030svn +- Add Obsolete tag for the -devel subpackage too. + * Tue Oct 30 2007 Deji Akingunola - 0.5.3-0.1.20071030svn - Update to a SVN snapshot that build against current gegl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-scan/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Nov 2007 16:42:55 -0000 1.2 +++ sources 8 Mar 2008 15:12:45 -0000 1.3 @@ -1 +1 @@ -0d109c93e2876cf778d5d7e9a7dc1b2e gnome-scan-0.5.3.tar.bz2 +1e08cf7ea0358bc4078bdc21b32792c7 gnome-scan-0.5.93.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 15:17:51 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 8 Mar 2008 15:17:51 GMT Subject: rpms/ClanLib/devel ClanLib-0.8.0-memset.patch, NONE, 1.1 ClanLib.spec, 1.15, 1.16 Message-ID: <200803081517.m28FHp83000760@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ClanLib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734 Modified Files: ClanLib.spec Added Files: ClanLib-0.8.0-memset.patch Log Message: * Sat Mar 8 2008 Hans de Goede 0.8.0-11 - Add a patch from Dave Jones fixing various wrong invocations of memset ClanLib-0.8.0-memset.patch: --- NEW FILE ClanLib-0.8.0-memset.patch --- --- ClanLib-0.8.0/Sources/Core/System/Generic/clanstring.cpp~ 2008-03-07 20:23:48.000000000 -0500 +++ ClanLib-0.8.0/Sources/Core/System/Generic/clanstring.cpp 2008-03-07 20:25:20.000000000 -0500 @@ -87,7 +87,7 @@ void CL_String::arg(std::string &format, char number[10]; std::string num_string = "%"; - memset(number, 10, 0); + memset(number, 0, 10); snprintf(number, 10, "%d", num); num_string += number; @@ -112,7 +112,7 @@ void CL_String::arg(std::string &format, { char arg[10]; - memset(arg, 10, 0); + memset(arg, 0, 10); snprintf(arg, 10, "%d", number); CL_String::arg(format, arg, num); @@ -122,7 +122,7 @@ void CL_String::arg(std::string &format, { char arg[32]; - memset(arg, 32, 0); + memset(arg, 0, 32); snprintf(arg, 32, "%f", number); CL_String::arg(format, arg, num); @@ -132,7 +132,7 @@ void CL_String::arg(std::string &format, { char arg[32]; - memset(arg, 32, 0); + memset(arg, 0, 32); snprintf(arg, 32, "%#f", number); CL_String::arg(format, arg, num); @@ -141,7 +141,7 @@ void CL_String::arg(std::string &format, std::string CL_String::from_int(int value) { char str[32]; - memset(str, 32, 0); + memset(str, 0, 32); snprintf(str, 32, "%d", value); return std::string(str); } @@ -149,7 +149,7 @@ std::string CL_String::from_int(int valu std::string CL_String::from_float(float value) { char str[32]; - memset(str, 32, 0); + memset(str, 0, 32); snprintf(str, 32, "%f", value); return std::string(str); } @@ -157,7 +157,7 @@ std::string CL_String::from_float(float std::string CL_String::from_double(double value) { char str[32]; - memset(str, 32, 0); + memset(str, 0, 32); snprintf(str, 32, "%#f", value); return std::string(str); } Index: ClanLib.spec =================================================================== RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ClanLib.spec 2 Mar 2008 12:05:44 -0000 1.15 +++ ClanLib.spec 8 Mar 2008 15:17:15 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Cross platform C++ game library Name: ClanLib Version: 0.8.0 -Release: 10%{?dist} +Release: 11%{?dist} Group: System Environment/Libraries License: zlib URL: http://www.clanlib.org/ @@ -15,6 +15,7 @@ Patch1: ClanLib-0.8.0-tex-format.patch Patch2: ClanLib-0.8.0-gcc43.patch Patch3: ClanLib-0.8.0-alsa.patch +Patch4: ClanLib-0.8.0-memset.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel BuildRequires: libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel @@ -43,6 +44,7 @@ %patch1 -p1 -z .texfmt %patch2 -p1 -z .gcc43 %patch3 -p1 -z .alsa +%patch4 -p1 -z .memset # fixup pc files sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in sed -i 's|Libs: -L${libdir}|Libs: -L${libdir}/%{name}-0.8|' \ @@ -92,6 +94,9 @@ %changelog +* Sat Mar 8 2008 Hans de Goede 0.8.0-11 +- Add a patch from Dave Jones fixing various wrong invocations of memset + * Sun Mar 2 2008 Hans de Goede 0.8.0-10 - Add support for audio output through alsa (original ClanLib only supports OSS??), this also adds support for using pulseaudio through alsa From fedora-extras-commits at redhat.com Sat Mar 8 15:29:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 8 Mar 2008 15:29:30 GMT Subject: rpms/perl-XML-Xerces/devel perl-XML-Xerces.spec,1.6,1.7 Message-ID: <200803081529.m28FTUog000970@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Xerces/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv941 Modified Files: perl-XML-Xerces.spec Log Message: more variables so it can find the compat bits Index: perl-XML-Xerces.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Xerces/devel/perl-XML-Xerces.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-XML-Xerces.spec 7 Mar 2008 21:09:28 -0000 1.6 +++ perl-XML-Xerces.spec 8 Mar 2008 15:28:51 -0000 1.7 @@ -3,7 +3,7 @@ Name: perl-XML-Xerces Version: %{ver}_%{PatchLevel} -Release: 9%{?dist} +Release: 10%{?dist} Summary: Perl API to Xerces XML parser Group: Development/Libraries @@ -43,6 +43,8 @@ %build export XERCESCROOT=%{_prefix} +export XERCES_LIB=%{_libdir} +export XERCES_INCLUDE=%{_includedir}/xercesc-2.7.0 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -73,6 +75,9 @@ %changelog +* Sat Mar 8 2008 Tom "spot" Callaway - 2.7.0_0-10 +- tell it where the compat bits are + * Fri Mar 7 2008 Tom "spot" Callaway - 2.7.0_0-9 - ok, so we can't really lie to it. Use the compat BR instead. - patch for perl 5.10 change From fedora-extras-commits at redhat.com Sat Mar 8 15:48:38 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 8 Mar 2008 15:48:38 GMT Subject: rpms/perl-XML-Xerces/devel perl-XML-Xerces.spec,1.7,1.8 Message-ID: <200803081548.m28FmcZv001279@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-XML-Xerces/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1256 Modified Files: perl-XML-Xerces.spec Log Message: fix library path Index: perl-XML-Xerces.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-XML-Xerces/devel/perl-XML-Xerces.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-XML-Xerces.spec 8 Mar 2008 15:28:51 -0000 1.7 +++ perl-XML-Xerces.spec 8 Mar 2008 15:48:03 -0000 1.8 @@ -3,14 +3,14 @@ Name: perl-XML-Xerces Version: %{ver}_%{PatchLevel} -Release: 10%{?dist} +Release: 11%{?dist} Summary: Perl API to Xerces XML parser Group: Development/Libraries License: ASL 2.0 URL: http://xerces.apache.org/xerces-p/ Source: http://www.apache.org/dist/xml/xerces-p/XML-Xerces-%{ver}-%{PatchLevel}.tar.gz -Patch0: perl-XML-Xerces-2.7.0-0-perl510.patch +Patch0: %{name}-%{ver}-%{PatchLevel}-perl510.patch BuildRoot: %{_tmppath}/%{name}-%{ver}-%{PatchLevel}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) @@ -43,8 +43,8 @@ %build export XERCESCROOT=%{_prefix} -export XERCES_LIB=%{_libdir} -export XERCES_INCLUDE=%{_includedir}/xercesc-2.7.0 +export XERCES_LIB=%{_libdir}/xerces-c-%{ver}/ +export XERCES_INCLUDE=%{_includedir}/xercesc-%{ver} %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -75,6 +75,9 @@ %changelog +* Sat Mar 8 2008 Tom "spot" Callaway - 2.7.0_0-11 +- be more specific as to the library dir. + * Sat Mar 8 2008 Tom "spot" Callaway - 2.7.0_0-10 - tell it where the compat bits are From fedora-extras-commits at redhat.com Sat Mar 8 16:15:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 8 Mar 2008 16:15:24 GMT Subject: rpms/ocsinventory-client/devel ocsinventory-client.spec,1.10,1.11 Message-ID: <200803081615.m28GFOuZ008795@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ocsinventory-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8771 Modified Files: ocsinventory-client.spec Log Message: fixups for new perl Index: ocsinventory-client.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocsinventory-client/devel/ocsinventory-client.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ocsinventory-client.spec 7 Mar 2008 01:53:22 -0000 1.10 +++ ocsinventory-client.spec 8 Mar 2008 16:14:50 -0000 1.11 @@ -9,7 +9,7 @@ Name: ocsinventory-client Version: 1.01 -Release: 7%{?dist}%{?ocstag:.}%{?ocstag} +Release: 8%{?dist}%{?ocstag:.}%{?ocstag} Summary: Open Computer and Software Inventory Next Generation client Group: Development/Libraries @@ -24,7 +24,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl +BuildRequires: perl(Compress::Zlib), perl(LWP), perl(Net::IP), perl(Net::SSLeay), perl(XML::Simple) + %if %{?fedora}0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %else @@ -171,7 +172,7 @@ %doc changelogs README README.fedora %lang(fr) %doc README.fedora.fr %{perl_vendorlib}/Ocsinventory -%{_sbindir}/ocsinventory-client.pl +%{_bindir}/ocsinventory-client.pl %dir %{_localstatedir}/log/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/ocsinv.* @@ -180,8 +181,12 @@ %changelog +* Sat Mar 08 2008 Tom "spot" Callaway - 1.01-8 +- add more BR for perl bits +- perl script ending up in %%{_bindir} instead of %%{_sbindir} + * Thu Mar 06 2008 Tom "spot" Callaway - 1.01-7 -Rebuild for new perl +- Rebuild for new perl * Mon Oct 15 2007 Tom "spot" Callaway 1.01-6 - correct license tag From fedora-extras-commits at redhat.com Sat Mar 8 16:49:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj)) Date: Sat, 8 Mar 2008 16:49:26 GMT Subject: rpms/horde/devel .cvsignore, 1.5, 1.6 horde.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200803081649.m28GnQQl009294@cvs-int.fedora.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/horde/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9263/devel Modified Files: .cvsignore horde.spec sources Log Message: Update to 3.1.7 Lincese tag update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/horde/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Jan 2008 05:43:46 -0000 1.5 +++ .cvsignore 8 Mar 2008 16:48:51 -0000 1.6 @@ -1 +1 @@ -horde-3.1.6.tar.gz +horde-3.1.7.tar.gz Index: horde.spec =================================================================== RCS file: /cvs/pkgs/rpms/horde/devel/horde.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- horde.spec 15 Jan 2008 05:43:46 -0000 1.5 +++ horde.spec 8 Mar 2008 16:48:51 -0000 1.6 @@ -1,12 +1,12 @@ Name: horde -Version: 3.1.6 +Version: 3.1.7 Release: 1%{?dist} Summary: The common Horde Framework for all Horde applications Source0: ftp://ftp.horde.org/pub/horde/tarballs/horde-%{version}.tar.gz Source1: registry.php Group: Applications/Internet -License: LGPL +License: LGPLv2+ URL: http://www.horde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -253,6 +253,10 @@ %doc README.Fedora %changelog +* Sat Mar 8 2008 Jan ONDREJ (SAL) 3.1.7-1 +- Update to 3.1.7 +- Lincese tag update + * Mon Jan 11 2008 Brandon Holbrook 3.1.6-1 - Update to 3.1.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/horde/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Jan 2008 05:43:46 -0000 1.5 +++ sources 8 Mar 2008 16:48:51 -0000 1.6 @@ -1 +1 @@ -9aebe8ef36bfc16a64513f49750fc2a0 horde-3.1.6.tar.gz +c0e693f88d95e395671abbff2ab6df53 horde-3.1.7.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 16:54:34 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sat, 8 Mar 2008 16:54:34 GMT Subject: rpms/xastir/devel xastir.desktop, NONE, 1.1 xastir.png, NONE, 1.1 xastir.spec, 1.1, 1.2 Message-ID: <200803081654.m28GsYqA009451@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xastir/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9425 Modified Files: xastir.spec Added Files: xastir.desktop xastir.png Log Message: xastir icon + wget support --- NEW FILE xastir.desktop --- [Desktop Entry] Encoding=UTF-8 Name=xastir GenericName=Xastir Comment=Amateur Station Tracking and Reporting system for amateur radio Exec=xastir Icon=xastir.png Terminal=false Type=Application Categories=HamRadio; Version=1.0 Index: xastir.spec =================================================================== RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xastir.spec 1 Mar 2008 08:16:26 -0000 1.1 +++ xastir.spec 8 Mar 2008 16:54:01 -0000 1.2 @@ -1,13 +1,17 @@ Summary : Amateur Station Tracking and Reporting system for amateur radio Name : xastir Version : 1.9.2 -Release : 2%{?dist} +Release : 4%{?dist} License : GPLv2 Group : Applications/Internet -Source : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz +Source0 : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz +Source1 : %{name}.desktop +Source2 : %{name}.png Patch0 : xastir-1.9.2-libdir.patch URL : http://www.xastir.org BuildRoot : %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires : wget +BuildRequires : wget BuildRequires : lesstif-devel BuildRequires : libXt-devel BuildRequires : festival @@ -19,6 +23,7 @@ BuildRequires : proj-devel BuildRequires : python BuildRequires : shapelib-devel +BuildRequires : desktop-file-utils %description Xastir is a graphical application that interfaces HAM radio @@ -33,6 +38,10 @@ %build #./bootstrap.sh +#aclocal +#autoheader +#autoconf +#automake -a -c %configure --without-graphicsmagick --with-rtree make %{?_smp_mflags} for f in README ChangeLog ; do @@ -50,6 +59,11 @@ rm -rf %{buildroot}/usr/share/doc #remove gpx2shape because of unsupported dependency Geo::Shapelib rm %{buildroot}/usr/share/xastir/gpx2shape +mkdir -p %{buildroot}/usr/share/pixmaps/ +cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png +desktop-file-install --vendor="fedora" \ + --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} + %clean @@ -63,19 +77,30 @@ %{_mandir}/man1/xastir.* %attr(0644,root,root) %{_datadir}/xastir/Coordinate.pm %{_datadir}/xastir -%{_datadir}/xastir/help +#%{_libdir}/xastir +##%{_datadir}/xastir/help #%{_datadir}/xastir/config -%{_datadir}/xastir/symbols -%{_datadir}/xastir/maps +##%{_datadir}/xastir/symbols +##%{_datadir}/xastir/maps #%{_datadir}/xastir/Counties #%{_datadir}/xastir/fcc #%{_datadir}/xastir/GNIS #%{_datadir}/xastir/sounds +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/applications/*%{name}.desktop %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE %doc README README.Contributing README.CVS README.Getting-Started %doc README.MAPS README.win32 UPGRADE %changelog +* Sat Mar 8 2008 Lucian Langa - 1.9.2-4 +- Install correct xastir icon +- Misc cleanups +- Rebuild with wget support + +* Sat Mar 2 2008 Lucian Langa - 1.9.2-3 +- Added desktop and icon file + * Sat Feb 23 2008 Lucian Langa - 1.9.2-2 - Moved scripts from libdir to datadir From fedora-extras-commits at redhat.com Sat Mar 8 16:55:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj)) Date: Sat, 8 Mar 2008 16:55:40 GMT Subject: rpms/horde/F-7 .cvsignore, 1.5, 1.6 horde.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200803081655.m28Gte4e009515@cvs-int.fedora.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/horde/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9482/F-7 Modified Files: .cvsignore horde.spec sources Log Message: Update to 3.1.7 Lincese tag update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/horde/F-7/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 Feb 2008 09:05:42 -0000 1.5 +++ .cvsignore 8 Mar 2008 16:55:07 -0000 1.6 @@ -1 +1 @@ -horde-3.1.6.tar.gz +horde-3.1.7.tar.gz Index: horde.spec =================================================================== RCS file: /cvs/pkgs/rpms/horde/F-7/horde.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- horde.spec 26 Feb 2008 09:05:43 -0000 1.5 +++ horde.spec 8 Mar 2008 16:55:07 -0000 1.6 @@ -1,12 +1,12 @@ Name: horde -Version: 3.1.6 +Version: 3.1.7 Release: 1%{?dist} Summary: The common Horde Framework for all Horde applications Source0: ftp://ftp.horde.org/pub/horde/tarballs/horde-%{version}.tar.gz Source1: registry.php Group: Applications/Internet -License: LGPL +License: LGPLv2+ URL: http://www.horde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -253,6 +253,10 @@ %doc README.Fedora %changelog +* Sat Mar 8 2008 Jan ONDREJ (SAL) 3.1.7-1 +- Update to 3.1.7 +- Lincese tag update + * Mon Jan 11 2008 Brandon Holbrook 3.1.6-1 - Update to 3.1.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/horde/F-7/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 26 Feb 2008 09:05:43 -0000 1.5 +++ sources 8 Mar 2008 16:55:07 -0000 1.6 @@ -1 +1 @@ -9aebe8ef36bfc16a64513f49750fc2a0 horde-3.1.6.tar.gz +c0e693f88d95e395671abbff2ab6df53 horde-3.1.7.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 16:57:03 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?J=C3=A1n_ONDREJ?= (ondrejj)) Date: Sat, 8 Mar 2008 16:57:03 GMT Subject: rpms/horde/F-8 .cvsignore, 1.5, 1.6 horde.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200803081657.m28Gv346009659@cvs-int.fedora.redhat.com> Author: ondrejj Update of /cvs/pkgs/rpms/horde/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9613/F-8 Modified Files: .cvsignore horde.spec sources Log Message: Update to 3.1.7 Lincese tag update Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/horde/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 Feb 2008 09:03:34 -0000 1.5 +++ .cvsignore 8 Mar 2008 16:56:27 -0000 1.6 @@ -1 +1 @@ -horde-3.1.6.tar.gz +horde-3.1.7.tar.gz Index: horde.spec =================================================================== RCS file: /cvs/pkgs/rpms/horde/F-8/horde.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- horde.spec 26 Feb 2008 09:03:34 -0000 1.5 +++ horde.spec 8 Mar 2008 16:56:27 -0000 1.6 @@ -1,12 +1,12 @@ Name: horde -Version: 3.1.6 +Version: 3.1.7 Release: 1%{?dist} Summary: The common Horde Framework for all Horde applications Source0: ftp://ftp.horde.org/pub/horde/tarballs/horde-%{version}.tar.gz Source1: registry.php Group: Applications/Internet -License: LGPL +License: LGPLv2+ URL: http://www.horde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -253,6 +253,10 @@ %doc README.Fedora %changelog +* Sat Mar 8 2008 Jan ONDREJ (SAL) 3.1.7-1 +- Update to 3.1.7 +- Lincese tag update + * Mon Jan 11 2008 Brandon Holbrook 3.1.6-1 - Update to 3.1.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/horde/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 26 Feb 2008 09:03:34 -0000 1.5 +++ sources 8 Mar 2008 16:56:27 -0000 1.6 @@ -1 +1 @@ -9aebe8ef36bfc16a64513f49750fc2a0 horde-3.1.6.tar.gz +c0e693f88d95e395671abbff2ab6df53 horde-3.1.7.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 17:21:50 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sat, 8 Mar 2008 17:21:50 GMT Subject: rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.24.2.1, 1.24.2.2 Message-ID: <200803081721.m28HLolf017304@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17279 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-1.9.87.rh151357.setlangtolocale.patch Log Message: adjust patch openoffice.org-1.9.87.rh151357.setlangtolocale.patch: Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -u -r1.24.2.1 -r1.24.2.2 --- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 7 Mar 2008 14:32:37 -0000 1.24.2.1 +++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 8 Mar 2008 17:21:43 -0000 1.24.2.2 @@ -791,7 +791,16 @@ diff -u -r1.17 substitutepathvars.cxx --- openoffice.org.orig/framework/source/services/substitutepathvars.cxx 16 Sep 2006 14:12:15 -0000 1.17 +++ openoffice.org/framework/source/services/substitutepathvars.cxx 28 Jun 2007 13:59:22 -0000 -@@ -1264,7 +1264,10 @@ +@@ -84,6 +84,8 @@ + #include + #endif + ++#include ++ + #ifndef _OSL_MUTEX_HXX_ + #include + #endif +@@ -1266,7 +1268,10 @@ Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE ); rtl::OUString aLocaleStr; if ( aLocale >>= aLocaleStr ) From fedora-extras-commits at redhat.com Sat Mar 8 17:55:17 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sat, 8 Mar 2008 17:55:17 GMT Subject: rpms/xastir/F-7 xastir-1.9.2-libdir.patch, NONE, 1.1 xastir.desktop, NONE, 1.1 xastir.png, NONE, 1.1 xastir.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803081755.m28HtHct017806@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/xastir/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17776/F-7 Modified Files: .cvsignore sources Added Files: xastir-1.9.2-libdir.patch xastir.desktop xastir.png xastir.spec Log Message: initial import for F7 xastir-1.9.2-libdir.patch: --- NEW FILE xastir-1.9.2-libdir.patch --- diff -Naur xastir-1.9.2/Makefile.in xastir-libdir/Makefile.in --- xastir-1.9.2/Makefile.in 2007-11-06 19:12:46.000000000 +0200 +++ xastir-libdir/Makefile.in 2008-02-23 14:56:11.000000000 +0200 @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd diff -Naur xastir-1.9.2/scripts/Makefile.in xastir-libdir/scripts/Makefile.in --- xastir-1.9.2/scripts/Makefile.in 2007-11-06 19:12:43.000000000 +0200 +++ xastir-libdir/scripts/Makefile.in 2008-02-23 14:48:22.000000000 +0200 @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --- NEW FILE xastir.desktop --- [Desktop Entry] Encoding=UTF-8 Name=xastir GenericName=Xastir Comment=Amateur Station Tracking and Reporting system for amateur radio Exec=xastir Icon=xastir.png Terminal=false Type=Application Categories=HamRadio; Version=1.0 --- NEW FILE xastir.spec --- Summary : Amateur Station Tracking and Reporting system for amateur radio Name : xastir Version : 1.9.2 Release : 4%{?dist} License : GPLv2 Group : Applications/Internet Source0 : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz Source1 : %{name}.desktop Source2 : %{name}.png Patch0 : xastir-1.9.2-libdir.patch URL : http://www.xastir.org BuildRoot : %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires : wget BuildRequires : wget BuildRequires : lesstif-devel BuildRequires : libXt-devel BuildRequires : festival BuildRequires : ImageMagick-devel BuildRequires : dos2unix BuildRequires : libax25-devel BuildRequires : curl-devel BuildRequires : pcre-devel BuildRequires : proj-devel BuildRequires : python BuildRequires : shapelib-devel BuildRequires : desktop-file-utils %description Xastir is a graphical application that interfaces HAM radio and internet access to realtime mapping software. Install XASTIR if you are interested in APRS(tm) and HAM radio software. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .libdir %build #./bootstrap.sh #aclocal #autoheader #autoconf #automake -a -c %configure --without-graphicsmagick --with-rtree make %{?_smp_mflags} for f in README ChangeLog ; do mv $f $f.iso88591 iconv -o $f -f iso88591 -t utf8 $f.iso88591 rm -f $f.iso88591 done dos2unix scripts/toporama250k.pl %install rm -rf %{buildroot} make install DESTDIR="%{buildroot}" INSTALL="install -p" #fix wrong doc-path instalation in make install target #or else we'll get unpacked files rm -rf %{buildroot}/usr/share/doc #remove gpx2shape because of unsupported dependency Geo::Shapelib rm %{buildroot}/usr/share/xastir/gpx2shape mkdir -p %{buildroot}/usr/share/pixmaps/ cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/xastir %{_bindir}/xastir_udp_client %{_bindir}/callpass %{_mandir}/man1/xastir.* %attr(0644,root,root) %{_datadir}/xastir/Coordinate.pm %{_datadir}/xastir #%{_libdir}/xastir ##%{_datadir}/xastir/help #%{_datadir}/xastir/config ##%{_datadir}/xastir/symbols ##%{_datadir}/xastir/maps #%{_datadir}/xastir/Counties #%{_datadir}/xastir/fcc #%{_datadir}/xastir/GNIS #%{_datadir}/xastir/sounds %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/*%{name}.desktop %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE %doc README README.Contributing README.CVS README.Getting-Started %doc README.MAPS README.win32 UPGRADE %changelog * Sat Mar 8 2008 Lucian Langa - 1.9.2-4 - Install correct xastir icon - Misc cleanups - Rebuild with wget support * Sat Mar 2 2008 Lucian Langa - 1.9.2-3 - Added desktop and icon file * Sat Feb 23 2008 Lucian Langa - 1.9.2-2 - Moved scripts from libdir to datadir * Fri Feb 22 2008 Lucian Langa - 1.9.2-1 - Updated to Fedora Packaging specifications * Thu Jul 03 2003 Alan Crosswell - 1.2.1 my patches now integrated into the main trunk. * Sat Jun 21 2003 Alan Crosswell - added xastir-maps.patch * Mon Jun 16 2003 Alan Crosswell - 1.2.0 * Fri Jun 06 2003 Alan Crosswell - June 5 snapshot * Thu May 15 2003 Alan Crosswell - start with chuck's spec file for 1.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xastir/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Feb 2008 19:57:04 -0000 1.1 +++ .cvsignore 8 Mar 2008 17:54:42 -0000 1.2 @@ -0,0 +1 @@ +xastir-1.9.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xastir/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Feb 2008 19:57:04 -0000 1.1 +++ sources 8 Mar 2008 17:54:42 -0000 1.2 @@ -0,0 +1 @@ +8608afa8f8f0c441a37ba72aeeccdcac xastir-1.9.2.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 18:05:40 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 8 Mar 2008 18:05:40 GMT Subject: rpms/smolt/devel .cvsignore, 1.21, 1.22 smolt.spec, 1.47, 1.48 sources, 1.22, 1.23 Message-ID: <200803081805.m28I5eKF025158@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25117 Modified Files: .cvsignore smolt.spec sources Log Message: upstream released new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 5 Mar 2008 20:46:52 -0000 1.21 +++ .cvsignore 8 Mar 2008 18:05:02 -0000 1.22 @@ -1 +1 @@ -smolt-1.1.1.tar.gz +smolt-1.1.1.1.tar.gz Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- smolt.spec 5 Mar 2008 20:46:52 -0000 1.47 +++ smolt.spec 8 Mar 2008 18:05:02 -0000 1.48 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 1.1.1 +Version: 1.1.1.1 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -173,6 +173,9 @@ %{_bindir}/smoltGui %changelog +* Sat Mar 08 2008 Mike McGrath - 1.1.1.1-1 +- Upstream released new version + * Wed Mar 05 2008 Mike McGrath - 1.1.1-1 - Upstream released new version - Manfiles added Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 5 Mar 2008 20:46:52 -0000 1.22 +++ sources 8 Mar 2008 18:05:02 -0000 1.23 @@ -1 +1 @@ -7ec5dc8f7550be524dfd9467bb59f06c smolt-1.1.1.tar.gz +c723a6808de0954e8e3e9228c7c94946 smolt-1.1.1.1.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 18:16:53 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 8 Mar 2008 18:16:53 GMT Subject: rpms/xulrunner/devel crashreporter-gcc43.patch,1.2,1.3 Message-ID: <200803081816.m28IGrtg025388@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25358 Modified Files: crashreporter-gcc43.patch Log Message: another attempt at fixing the build crashreporter-gcc43.patch: Index: crashreporter-gcc43.patch =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/crashreporter-gcc43.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- crashreporter-gcc43.patch 8 Mar 2008 06:56:08 -0000 1.2 +++ crashreporter-gcc43.patch 8 Mar 2008 18:16:49 -0000 1.3 @@ -1,15 +1,31 @@ +Index: toolkit/crashreporter/nsExceptionHandler.cpp +=================================================================== +RCS file: /cvsroot/mozilla/toolkit/crashreporter/nsExceptionHandler.cpp,v +retrieving revision 1.36 +diff -d -u -p -r1.36 nsExceptionHandler.cpp +--- toolkit/crashreporter/nsExceptionHandler.cpp 9 Feb 2008 02:40:47 -0000 1.36 ++++ toolkit/crashreporter/nsExceptionHandler.cpp 8 Mar 2008 17:23:54 -0000 +@@ -66,7 +66,7 @@ + #endif + + #include +-#include ++#include + #include + #include + #include Index: toolkit/crashreporter/client/crashreporter_linux.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/crashreporter/client/crashreporter_linux.cpp,v retrieving revision 1.16 diff -d -u -p -r1.16 crashreporter_linux.cpp --- toolkit/crashreporter/client/crashreporter_linux.cpp 7 Mar 2008 22:17:17 -0000 1.16 -+++ toolkit/crashreporter/client/crashreporter_linux.cpp 8 Mar 2008 05:48:24 -0000 ++++ toolkit/crashreporter/client/crashreporter_linux.cpp 8 Mar 2008 17:23:54 -0000 @@ -47,6 +47,7 @@ #include #include -+#include ++#include #include From fedora-extras-commits at redhat.com Sat Mar 8 18:53:27 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 8 Mar 2008 18:53:27 GMT Subject: rpms/kdelibs4/F-7 kdelibs-4.0.2-branding.patch, NONE, 1.1 kdelibs-4.0.2-install-all-css.patch, NONE, 1.1 kdelibs-4.0.x-kio.patch, NONE, 1.1 kdelibs4.spec, 1.11, 1.12 kdelibs-3.93.0-kde149703.diff, 1.1, NONE kdelibs-4.0.1-autostart.patch, 1.1, NONE kdelibs-4.0.1-kde#771201-khtml.patch, 1.1, NONE kdelibs-4.0.1-objectembed-handling.patch, 1.1, NONE Message-ID: <200803081853.m28IrRTf025950@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs4/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25884/F-7 Modified Files: kdelibs4.spec Added Files: kdelibs-4.0.2-branding.patch kdelibs-4.0.2-install-all-css.patch kdelibs-4.0.x-kio.patch Removed Files: kdelibs-3.93.0-kde149703.diff kdelibs-4.0.1-autostart.patch kdelibs-4.0.1-kde#771201-khtml.patch kdelibs-4.0.1-objectembed-handling.patch Log Message: Sync from devel: * Fri Mar 07 2008 Rex Dieter 4.0.2-8 - touchup KDE_DISTRIBUTION_TEXT - add Fedora/V-R to KHTML UA string (thanks caillon) * Thu Mar 06 2008 Kevin Kofler 4.0.2-7 - exclude apidocs from the main package * Thu Mar 06 2008 Than Ngo 4.0.2-6 - apply upstream patch to fix issue in KPropertiesDialog * Thu Mar 06 2008 Kevin Kofler 4.0.2-5 - also install Doxyfile.global in -common to build kdepimlibs-apidocs against * Wed Mar 05 2008 Kevin Kofler 4.0.2-4 - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen, graphviz and qt4-doc when building apidocs * Fri Feb 29 2008 Than Ngo 4.0.2-3 - rebuilt * Fri Feb 29 2008 Kevin Kofler 4.0.2-2 - drop obsolete kde#149703 patch (fixed upstream by code rewrite) - drop backports from 4.0.2: objectembed-handling, autostart, kde#771201-khtml * Thu Feb 28 2008 Than Ngo 4.0.2-1 - 4.0.2 * Wed Feb 27 2008 Luk???? Tinkl - 4.0.1-8 - add Fedora branding to the package (#434815) * Mon Feb 25 2008 Rex Dieter 4.0.1-7 - -devel: own %%_kde4_libdir/kde4/plugins (thanks wolfy!) kdelibs-4.0.2-branding.patch: --- NEW FILE kdelibs-4.0.2-branding.patch --- diff -up kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp --- kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding 2008-01-04 18:00:15.000000000 -0600 +++ kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp 2008-03-07 14:49:46.000000000 -0600 @@ -73,7 +73,7 @@ KProtocolManagerPrivate::~KProtocolManag // DEFAULT USERAGENT STRING #define CFG_DEFAULT_UAGENT(X) \ -QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \ +QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko) Fedora/@@VERSION_RELEASE@@") \ .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE) #define PRIVATE_DATA \ kdelibs-4.0.2-install-all-css.patch: --- NEW FILE kdelibs-4.0.2-install-all-css.patch --- diff -ur kdelibs-4.0.2/doc/common/CMakeLists.txt kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt --- kdelibs-4.0.2/doc/common/CMakeLists.txt 2008-01-05 01:00:05.000000000 +0100 +++ kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt 2008-03-06 05:18:11.000000000 +0100 @@ -7,6 +7,8 @@ xml.dcl doxygen.css tabs.css + kde.css flat.css print.css + Doxyfile.global header.html footer.html mainheader.html kdelibs-4.0.x-kio.patch: --- NEW FILE kdelibs-4.0.x-kio.patch --- diff -up kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp.kio kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp --- kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp.kio 2008-01-05 01:00:16.000000000 +0100 +++ kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp 2008-03-06 12:34:08.000000000 +0100 @@ -879,7 +879,7 @@ void KOpenWithDialogPrivate::_k_slotOK() KConfigGroup cg = desktop->desktopGroup(); cg.writeEntry("Type", "Application"); cg.writeEntry("Name", initialServiceName); - cg.writePathEntry("Exec", fullExec); + cg.writeEntry("Exec", fullExec); if (terminal->isChecked()) { cg.writeEntry("Terminal", true); diff -up kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp.kio kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp --- kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp.kio 2008-01-31 00:54:05.000000000 +0100 +++ kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp 2008-03-06 12:31:52.000000000 +0100 @@ -3015,7 +3015,7 @@ KDesktopPropsPlugin::KDesktopPropsPlugin QString nameStr = _config.readName(); QString genNameStr = _config.readGenericName(); QString commentStr = _config.readComment(); - QString commandStr = config.readPathEntry( "Exec", QString() ); + QString commandStr = config.readEntry( "Exec", QString() ); if (commandStr.startsWith(QLatin1String("ksystraycmd "))) { commandStr.remove(0, 12); @@ -3176,9 +3176,9 @@ void KDesktopPropsPlugin::applyChanges() config.writeEntry( "GenericName", d->w->genNameEdit->text(), KConfigGroup::Persistent|KConfigGroup::Localized ); // for compat if (d->m_systrayBool) - config.writePathEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") ); + config.writeEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") ); else - config.writePathEntry( "Exec", d->w->commandEdit->text() ); + config.writeEntry( "Exec", d->w->commandEdit->text() ); config.writePathEntry( "Path", d->w->pathEdit->lineEdit()->text() ); // Write mimeTypes Index: kdelibs4.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/kdelibs4.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kdelibs4.spec 20 Feb 2008 02:17:35 -0000 1.11 +++ kdelibs4.spec 8 Mar 2008 18:52:54 -0000 1.12 @@ -1,10 +1,9 @@ - -# TODO: -# 1. package some noarch bits separately: apidocs. +# set this to 0 to disable -apidocs for a faster build +%define apidocs 1 Summary: K Desktop Environment 4 - Libraries -Version: 4.0.1 -Release: 6%{?dist}.1 +Version: 4.0.2 +Release: 8%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -47,8 +46,6 @@ # make -devel packages parallel-installable Patch0: kdelibs-3.95.0-parallel_devel.patch -# fix kde#149703 -Patch1: kdelibs-3.93.0-kde149703.diff # fix kde#149705 Patch2: kdelibs-3.95.0-kde149705.patch # Force Phonon to use the ALSA default device by default @@ -63,11 +60,14 @@ # fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin # (can't talk over D-Bus to an app only supporting DCOP) Patch7: kdelibs-4.0.1-dcop-servicetype.patch +# install all .css files and Doxyfile.global in kdelibs-common to build +# kdepimlibs-apidocs against +Patch8: kdelibs-4.0.2-install-all-css.patch +# add Fedora/V-R to KHTML UA string +Patch9: kdelibs-4.0.2-branding.patch # upstream patches -Patch100: kdelibs-4.0.1-objectembed-handling.patch -Patch101: kdelibs-4.0.1-autostart.patch -Patch102: kdelibs-4.0.1-kde#771201-khtml.patch +Patch100: kdelibs-4.0.x-kio.patch BuildRequires: qt4-devel >= 4.3.0 Requires: qt4 >= %{_qt4_version} @@ -110,6 +110,12 @@ BuildRequires: openssh-clients BuildRequires: subversion +%if "%{?apidocs}" == "1" +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: qt4-doc +%endif + %description Libraries for the K Desktop Environment 4. @@ -138,12 +144,28 @@ This package includes the header files you will need to compile applications for KDE 4. +%package apidocs +Group: Development/Documentation +Summary: KDE 4 API documentation +Requires: %{name} = %{?epoch:%{epoch}:}%{version} +%if "%{name}" == "kdelibs" +Provides: kdelibs4-apidocs = %{version}-%{release} +#else +# Don't do that for now, we'd need to make sure all Requires: kdelibs-apidocs +# (in kdevelop etc.) are fixed to kdelibs3-apidocs first and it may not be +# worth it anyway. +#Provides: kdelibs-apidocs = 6:%{version}-%{release} +%endif + +%description apidocs +This package includes the KDE 4 API documentation in HTML +format for easy browsing. + %prep %setup -q -n kdelibs-%{version} %patch0 -p1 -b .parallel_devel -%patch1 -p1 -b .kde149703 %patch2 -p1 -b .kde149705 %patch4 -p1 -b .alsa-default %if 0%{?fedora} >= 9 @@ -153,23 +175,27 @@ %patch6 -p1 -b .openssl %endif %patch7 -p1 -b .dcop-servicetype +%patch8 -p1 -b .all-css +%patch9 -p1 -b .branding +sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp # upstream patches -%patch100 -p0 -b .objectembed-handling -%patch101 -p1 -b .xdg-autostart -%patch102 -p0 -b .kde#771201-khtml +%patch100 -p1 -b .kio %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" .. popd make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 -# FIXME/TODO: apidocs -# doc/api/doxygen.sh --doxdatadir=doc/common . +# build apidocs +%if "%{?apidocs}" == "1" +export QTDOCDIR=`pkg-config --variable=docdir Qt` +doc/api/doxygen.sh . +%endif %install @@ -211,6 +237,12 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh +# install apidocs and generator script +install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh +%if "%{?apidocs}" == "1" +cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs +%endif + %post /sbin/ldconfig ||: @@ -251,10 +283,17 @@ %{_kde4_docdir}/HTML/en/* %{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/libkdeinit4_*.so -%{_kde4_libdir}/kde4/ -%exclude %{_kde4_libdir}/kde4/devel/ +%dir %{_kde4_libdir}/kde4/ +%{_kde4_libdir}/kde4/*.so +%{_kde4_libdir}/kde4/libexec/ +%dir %{_kde4_libdir}/kde4/plugins/ +%{_kde4_libdir}/kde4/plugins/imageformats/ +%{_kde4_libdir}/kde4/plugins/phonon_platform/ %{_kde4_sysconfdir}/xdg/menus/*.menu %doc %{_mandir}/man*/* +%if "%{?apidocs}" == "1" +%exclude %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ +%endif # kdelibs-common comes from here for fedora >= 9 %if "%{name}" == "kdelibs" %exclude %{_kde4_configdir}/kdebug.areas @@ -277,18 +316,56 @@ %doc KDE4PORTING.html %{_kde4_bindir}/kconfig_compiler4 %{_kde4_bindir}/makekdewidgets4 +%{_kde4_bindir}/kde4-doxygen.sh %{_kde4_appsdir}/cmake/ %{_kde4_appsdir}/kdewidgets/ -%dir %{_kde4_libdir}/kde4/plugins/designer -%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.* %{_kde4_appsdir}/ksgmltools2/ %{_kde4_includedir}/* %{_kde4_libdir}/kde4/devel/ +%{_kde4_libdir}/kde4/plugins/designer/ + +%if "%{?apidocs}" == "1" +%files apidocs +%defattr(-,root,root,-) +%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ +%endif %changelog -* Wed Feb 20 2008 Kevin Kofler 4.0.1-6.fc7.1 -- bump Release to work around Koji bug +* Fri Mar 07 2008 Rex Dieter 4.0.2-8 +- touchup KDE_DISTRIBUTION_TEXT +- add Fedora/V-R to KHTML UA string (thanks caillon) + +* Thu Mar 06 2008 Kevin Kofler 4.0.2-7 +- exclude apidocs from the main package + +* Thu Mar 06 2008 Than Ngo 4.0.2-6 +- apply upstream patch to fix issue in KPropertiesDialog + +* Thu Mar 06 2008 Kevin Kofler 4.0.2-5 +- also install Doxyfile.global in -common to build kdepimlibs-apidocs against + +* Wed Mar 05 2008 Kevin Kofler 4.0.2-4 +- install all .css files in kdelibs-common to build kdepimlibs-apidocs against +- install doxygen.sh as kde4-doxygen.sh in -devel +- build apidocs and put them into an -apidocs subpackage (can be turned off) +- BR doxygen, graphviz and qt4-doc when building apidocs + +* Fri Feb 29 2008 Than Ngo 4.0.2-3 +- rebuilt + +* Fri Feb 29 2008 Kevin Kofler 4.0.2-2 +- drop obsolete kde#149703 patch (fixed upstream by code rewrite) +- drop backports from 4.0.2: objectembed-handling, autostart, kde#771201-khtml + +* Thu Feb 28 2008 Than Ngo 4.0.2-1 +- 4.0.2 + +* Wed Feb 27 2008 Luk???? Tinkl - 4.0.1-8 +- add Fedora branding to the package (#434815) + +* Mon Feb 25 2008 Rex Dieter 4.0.1-7 +- -devel: own %%_kde4_libdir/kde4/plugins (thanks wolfy!) * Tue Feb 19 2008 Kevin Kofler 4.0.1-6 - fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin --- kdelibs-3.93.0-kde149703.diff DELETED --- --- kdelibs-4.0.1-autostart.patch DELETED --- --- kdelibs-4.0.1-kde#771201-khtml.patch DELETED --- --- kdelibs-4.0.1-objectembed-handling.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 8 18:53:32 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 8 Mar 2008 18:53:32 GMT Subject: rpms/kdelibs4/F-8 kdelibs-4.0.2-branding.patch, NONE, 1.1 kdelibs-4.0.2-install-all-css.patch, NONE, 1.1 kdelibs-4.0.x-kio.patch, NONE, 1.1 kdelibs4.spec, 1.11, 1.12 kdelibs-3.93.0-kde149703.diff, 1.1, NONE kdelibs-4.0.1-autostart.patch, 1.1, NONE kdelibs-4.0.1-kde#771201-khtml.patch, 1.1, NONE kdelibs-4.0.1-objectembed-handling.patch, 1.1, NONE Message-ID: <200803081853.m28IrWCf025953@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25884/F-8 Modified Files: kdelibs4.spec Added Files: kdelibs-4.0.2-branding.patch kdelibs-4.0.2-install-all-css.patch kdelibs-4.0.x-kio.patch Removed Files: kdelibs-3.93.0-kde149703.diff kdelibs-4.0.1-autostart.patch kdelibs-4.0.1-kde#771201-khtml.patch kdelibs-4.0.1-objectembed-handling.patch Log Message: Sync from devel: * Fri Mar 07 2008 Rex Dieter 4.0.2-8 - touchup KDE_DISTRIBUTION_TEXT - add Fedora/V-R to KHTML UA string (thanks caillon) * Thu Mar 06 2008 Kevin Kofler 4.0.2-7 - exclude apidocs from the main package * Thu Mar 06 2008 Than Ngo 4.0.2-6 - apply upstream patch to fix issue in KPropertiesDialog * Thu Mar 06 2008 Kevin Kofler 4.0.2-5 - also install Doxyfile.global in -common to build kdepimlibs-apidocs against * Wed Mar 05 2008 Kevin Kofler 4.0.2-4 - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen, graphviz and qt4-doc when building apidocs * Fri Feb 29 2008 Than Ngo 4.0.2-3 - rebuilt * Fri Feb 29 2008 Kevin Kofler 4.0.2-2 - drop obsolete kde#149703 patch (fixed upstream by code rewrite) - drop backports from 4.0.2: objectembed-handling, autostart, kde#771201-khtml * Thu Feb 28 2008 Than Ngo 4.0.2-1 - 4.0.2 * Wed Feb 27 2008 Luk???? Tinkl - 4.0.1-8 - add Fedora branding to the package (#434815) * Mon Feb 25 2008 Rex Dieter 4.0.1-7 - -devel: own %%_kde4_libdir/kde4/plugins (thanks wolfy!) kdelibs-4.0.2-branding.patch: --- NEW FILE kdelibs-4.0.2-branding.patch --- diff -up kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp --- kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding 2008-01-04 18:00:15.000000000 -0600 +++ kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp 2008-03-07 14:49:46.000000000 -0600 @@ -73,7 +73,7 @@ KProtocolManagerPrivate::~KProtocolManag // DEFAULT USERAGENT STRING #define CFG_DEFAULT_UAGENT(X) \ -QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \ +QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko) Fedora/@@VERSION_RELEASE@@") \ .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE) #define PRIVATE_DATA \ kdelibs-4.0.2-install-all-css.patch: --- NEW FILE kdelibs-4.0.2-install-all-css.patch --- diff -ur kdelibs-4.0.2/doc/common/CMakeLists.txt kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt --- kdelibs-4.0.2/doc/common/CMakeLists.txt 2008-01-05 01:00:05.000000000 +0100 +++ kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt 2008-03-06 05:18:11.000000000 +0100 @@ -7,6 +7,8 @@ xml.dcl doxygen.css tabs.css + kde.css flat.css print.css + Doxyfile.global header.html footer.html mainheader.html kdelibs-4.0.x-kio.patch: --- NEW FILE kdelibs-4.0.x-kio.patch --- diff -up kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp.kio kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp --- kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp.kio 2008-01-05 01:00:16.000000000 +0100 +++ kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp 2008-03-06 12:34:08.000000000 +0100 @@ -879,7 +879,7 @@ void KOpenWithDialogPrivate::_k_slotOK() KConfigGroup cg = desktop->desktopGroup(); cg.writeEntry("Type", "Application"); cg.writeEntry("Name", initialServiceName); - cg.writePathEntry("Exec", fullExec); + cg.writeEntry("Exec", fullExec); if (terminal->isChecked()) { cg.writeEntry("Terminal", true); diff -up kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp.kio kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp --- kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp.kio 2008-01-31 00:54:05.000000000 +0100 +++ kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp 2008-03-06 12:31:52.000000000 +0100 @@ -3015,7 +3015,7 @@ KDesktopPropsPlugin::KDesktopPropsPlugin QString nameStr = _config.readName(); QString genNameStr = _config.readGenericName(); QString commentStr = _config.readComment(); - QString commandStr = config.readPathEntry( "Exec", QString() ); + QString commandStr = config.readEntry( "Exec", QString() ); if (commandStr.startsWith(QLatin1String("ksystraycmd "))) { commandStr.remove(0, 12); @@ -3176,9 +3176,9 @@ void KDesktopPropsPlugin::applyChanges() config.writeEntry( "GenericName", d->w->genNameEdit->text(), KConfigGroup::Persistent|KConfigGroup::Localized ); // for compat if (d->m_systrayBool) - config.writePathEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") ); + config.writeEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") ); else - config.writePathEntry( "Exec", d->w->commandEdit->text() ); + config.writeEntry( "Exec", d->w->commandEdit->text() ); config.writePathEntry( "Path", d->w->pathEdit->lineEdit()->text() ); // Write mimeTypes Index: kdelibs4.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kdelibs4.spec 19 Feb 2008 22:30:08 -0000 1.11 +++ kdelibs4.spec 8 Mar 2008 18:52:57 -0000 1.12 @@ -1,10 +1,9 @@ - -# TODO: -# 1. package some noarch bits separately: apidocs. +# set this to 0 to disable -apidocs for a faster build +%define apidocs 1 Summary: K Desktop Environment 4 - Libraries -Version: 4.0.1 -Release: 6%{?dist} +Version: 4.0.2 +Release: 8%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -47,8 +46,6 @@ # make -devel packages parallel-installable Patch0: kdelibs-3.95.0-parallel_devel.patch -# fix kde#149703 -Patch1: kdelibs-3.93.0-kde149703.diff # fix kde#149705 Patch2: kdelibs-3.95.0-kde149705.patch # Force Phonon to use the ALSA default device by default @@ -63,11 +60,14 @@ # fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin # (can't talk over D-Bus to an app only supporting DCOP) Patch7: kdelibs-4.0.1-dcop-servicetype.patch +# install all .css files and Doxyfile.global in kdelibs-common to build +# kdepimlibs-apidocs against +Patch8: kdelibs-4.0.2-install-all-css.patch +# add Fedora/V-R to KHTML UA string +Patch9: kdelibs-4.0.2-branding.patch # upstream patches -Patch100: kdelibs-4.0.1-objectembed-handling.patch -Patch101: kdelibs-4.0.1-autostart.patch -Patch102: kdelibs-4.0.1-kde#771201-khtml.patch +Patch100: kdelibs-4.0.x-kio.patch BuildRequires: qt4-devel >= 4.3.0 Requires: qt4 >= %{_qt4_version} @@ -110,6 +110,12 @@ BuildRequires: openssh-clients BuildRequires: subversion +%if "%{?apidocs}" == "1" +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: qt4-doc +%endif + %description Libraries for the K Desktop Environment 4. @@ -138,12 +144,28 @@ This package includes the header files you will need to compile applications for KDE 4. +%package apidocs +Group: Development/Documentation +Summary: KDE 4 API documentation +Requires: %{name} = %{?epoch:%{epoch}:}%{version} +%if "%{name}" == "kdelibs" +Provides: kdelibs4-apidocs = %{version}-%{release} +#else +# Don't do that for now, we'd need to make sure all Requires: kdelibs-apidocs +# (in kdevelop etc.) are fixed to kdelibs3-apidocs first and it may not be +# worth it anyway. +#Provides: kdelibs-apidocs = 6:%{version}-%{release} +%endif + +%description apidocs +This package includes the KDE 4 API documentation in HTML +format for easy browsing. + %prep %setup -q -n kdelibs-%{version} %patch0 -p1 -b .parallel_devel -%patch1 -p1 -b .kde149703 %patch2 -p1 -b .kde149705 %patch4 -p1 -b .alsa-default %if 0%{?fedora} >= 9 @@ -153,23 +175,27 @@ %patch6 -p1 -b .openssl %endif %patch7 -p1 -b .dcop-servicetype +%patch8 -p1 -b .all-css +%patch9 -p1 -b .branding +sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp # upstream patches -%patch100 -p0 -b .objectembed-handling -%patch101 -p1 -b .xdg-autostart -%patch102 -p0 -b .kde#771201-khtml +%patch100 -p1 -b .kio %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" .. popd make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 -# FIXME/TODO: apidocs -# doc/api/doxygen.sh --doxdatadir=doc/common . +# build apidocs +%if "%{?apidocs}" == "1" +export QTDOCDIR=`pkg-config --variable=docdir Qt` +doc/api/doxygen.sh . +%endif %install @@ -211,6 +237,12 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh +# install apidocs and generator script +install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh +%if "%{?apidocs}" == "1" +cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs +%endif + %post /sbin/ldconfig ||: @@ -251,10 +283,17 @@ %{_kde4_docdir}/HTML/en/* %{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/libkdeinit4_*.so -%{_kde4_libdir}/kde4/ -%exclude %{_kde4_libdir}/kde4/devel/ +%dir %{_kde4_libdir}/kde4/ +%{_kde4_libdir}/kde4/*.so +%{_kde4_libdir}/kde4/libexec/ +%dir %{_kde4_libdir}/kde4/plugins/ +%{_kde4_libdir}/kde4/plugins/imageformats/ +%{_kde4_libdir}/kde4/plugins/phonon_platform/ %{_kde4_sysconfdir}/xdg/menus/*.menu %doc %{_mandir}/man*/* +%if "%{?apidocs}" == "1" +%exclude %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ +%endif # kdelibs-common comes from here for fedora >= 9 %if "%{name}" == "kdelibs" %exclude %{_kde4_configdir}/kdebug.areas @@ -277,16 +316,57 @@ %doc KDE4PORTING.html %{_kde4_bindir}/kconfig_compiler4 %{_kde4_bindir}/makekdewidgets4 +%{_kde4_bindir}/kde4-doxygen.sh %{_kde4_appsdir}/cmake/ %{_kde4_appsdir}/kdewidgets/ -%dir %{_kde4_libdir}/kde4/plugins/designer -%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.* %{_kde4_appsdir}/ksgmltools2/ %{_kde4_includedir}/* %{_kde4_libdir}/kde4/devel/ +%{_kde4_libdir}/kde4/plugins/designer/ + +%if "%{?apidocs}" == "1" +%files apidocs +%defattr(-,root,root,-) +%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ +%endif %changelog +* Fri Mar 07 2008 Rex Dieter 4.0.2-8 +- touchup KDE_DISTRIBUTION_TEXT +- add Fedora/V-R to KHTML UA string (thanks caillon) + +* Thu Mar 06 2008 Kevin Kofler 4.0.2-7 +- exclude apidocs from the main package + +* Thu Mar 06 2008 Than Ngo 4.0.2-6 +- apply upstream patch to fix issue in KPropertiesDialog + +* Thu Mar 06 2008 Kevin Kofler 4.0.2-5 +- also install Doxyfile.global in -common to build kdepimlibs-apidocs against + +* Wed Mar 05 2008 Kevin Kofler 4.0.2-4 +- install all .css files in kdelibs-common to build kdepimlibs-apidocs against +- install doxygen.sh as kde4-doxygen.sh in -devel +- build apidocs and put them into an -apidocs subpackage (can be turned off) +- BR doxygen, graphviz and qt4-doc when building apidocs + +* Fri Feb 29 2008 Than Ngo 4.0.2-3 +- rebuilt + +* Fri Feb 29 2008 Kevin Kofler 4.0.2-2 +- drop obsolete kde#149703 patch (fixed upstream by code rewrite) +- drop backports from 4.0.2: objectembed-handling, autostart, kde#771201-khtml + +* Thu Feb 28 2008 Than Ngo 4.0.2-1 +- 4.0.2 + +* Wed Feb 27 2008 Luk???? Tinkl - 4.0.1-8 +- add Fedora branding to the package (#434815) + +* Mon Feb 25 2008 Rex Dieter 4.0.1-7 +- -devel: own %%_kde4_libdir/kde4/plugins (thanks wolfy!) + * Tue Feb 19 2008 Kevin Kofler 4.0.1-6 - fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin --- kdelibs-3.93.0-kde149703.diff DELETED --- --- kdelibs-4.0.1-autostart.patch DELETED --- --- kdelibs-4.0.1-kde#771201-khtml.patch DELETED --- --- kdelibs-4.0.1-objectembed-handling.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 8 19:01:51 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 8 Mar 2008 19:01:51 GMT Subject: rpms/kdelibs4/F-7 .cvsignore,1.7,1.8 sources,1.7,1.8 Message-ID: <200803081901.m28J1pwv000820@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs4/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv777/F-7 Modified Files: .cvsignore sources Log Message: Sync from devel: * Fri Mar 07 2008 Rex Dieter 4.0.2-8 - touchup KDE_DISTRIBUTION_TEXT - add Fedora/V-R to KHTML UA string (thanks caillon) * Thu Mar 06 2008 Kevin Kofler 4.0.2-7 - exclude apidocs from the main package * Thu Mar 06 2008 Than Ngo 4.0.2-6 - apply upstream patch to fix issue in KPropertiesDialog * Thu Mar 06 2008 Kevin Kofler 4.0.2-5 - also install Doxyfile.global in -common to build kdepimlibs-apidocs against * Wed Mar 05 2008 Kevin Kofler 4.0.2-4 - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen, graphviz and qt4-doc when building apidocs * Fri Feb 29 2008 Than Ngo 4.0.2-3 - rebuilt * Fri Feb 29 2008 Kevin Kofler 4.0.2-2 - drop obsolete kde#149703 patch (fixed upstream by code rewrite) - drop backports from 4.0.2: objectembed-handling, autostart, kde#771201-khtml * Thu Feb 28 2008 Than Ngo 4.0.2-1 - 4.0.2 * Wed Feb 27 2008 Luk???? Tinkl - 4.0.1-8 - add Fedora branding to the package (#434815) * Mon Feb 25 2008 Rex Dieter 4.0.1-7 - -devel: own %%_kde4_libdir/kde4/plugins (thanks wolfy!) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 Feb 2008 03:52:08 -0000 1.7 +++ .cvsignore 8 Mar 2008 19:01:18 -0000 1.8 @@ -1,2 +1 @@ -kdelibs-4.0.0.tar.bz2 -kdelibs-4.0.1.tar.bz2 +kdelibs-4.0.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Feb 2008 03:52:08 -0000 1.7 +++ sources 8 Mar 2008 19:01:18 -0000 1.8 @@ -1 +1 @@ -4a756aa3cc8926efba2ee0b8a5e078dd kdelibs-4.0.1.tar.bz2 +4456adf94796a61c869c0803f7746bf9 kdelibs-4.0.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 19:01:55 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Sat, 8 Mar 2008 19:01:55 GMT Subject: rpms/kdelibs4/F-8 .cvsignore,1.7,1.8 sources,1.7,1.8 Message-ID: <200803081901.m28J1tAw000824@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kdelibs4/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv777/F-8 Modified Files: .cvsignore sources Log Message: Sync from devel: * Fri Mar 07 2008 Rex Dieter 4.0.2-8 - touchup KDE_DISTRIBUTION_TEXT - add Fedora/V-R to KHTML UA string (thanks caillon) * Thu Mar 06 2008 Kevin Kofler 4.0.2-7 - exclude apidocs from the main package * Thu Mar 06 2008 Than Ngo 4.0.2-6 - apply upstream patch to fix issue in KPropertiesDialog * Thu Mar 06 2008 Kevin Kofler 4.0.2-5 - also install Doxyfile.global in -common to build kdepimlibs-apidocs against * Wed Mar 05 2008 Kevin Kofler 4.0.2-4 - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen, graphviz and qt4-doc when building apidocs * Fri Feb 29 2008 Than Ngo 4.0.2-3 - rebuilt * Fri Feb 29 2008 Kevin Kofler 4.0.2-2 - drop obsolete kde#149703 patch (fixed upstream by code rewrite) - drop backports from 4.0.2: objectembed-handling, autostart, kde#771201-khtml * Thu Feb 28 2008 Than Ngo 4.0.2-1 - 4.0.2 * Wed Feb 27 2008 Luk???? Tinkl - 4.0.1-8 - add Fedora branding to the package (#434815) * Mon Feb 25 2008 Rex Dieter 4.0.1-7 - -devel: own %%_kde4_libdir/kde4/plugins (thanks wolfy!) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 Feb 2008 03:52:17 -0000 1.7 +++ .cvsignore 8 Mar 2008 19:01:21 -0000 1.8 @@ -1,2 +1 @@ -kdelibs-4.0.0.tar.bz2 -kdelibs-4.0.1.tar.bz2 +kdelibs-4.0.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Feb 2008 03:52:17 -0000 1.7 +++ sources 8 Mar 2008 19:01:21 -0000 1.8 @@ -1 +1 @@ -4a756aa3cc8926efba2ee0b8a5e078dd kdelibs-4.0.1.tar.bz2 +4456adf94796a61c869c0803f7746bf9 kdelibs-4.0.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 19:04:30 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 8 Mar 2008 19:04:30 GMT Subject: rpms/python-turboflot/devel .cvsignore, 1.6, 1.7 python-turboflot.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200803081904.m28J4UOi000964@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-turboflot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv940 Modified Files: .cvsignore python-turboflot.spec sources Log Message: * Sat Mar 08 2008 Luke Macken - 0.1.0-1 - Update to jQuery 1.2.3 and flot 0.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Feb 2008 00:32:07 -0000 1.6 +++ .cvsignore 8 Mar 2008 19:03:56 -0000 1.7 @@ -1 +1 @@ -TurboFlot-0.0.9.tar.bz2 +TurboFlot-0.1.0.tar.bz2 Index: python-turboflot.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/devel/python-turboflot.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-turboflot.spec 28 Feb 2008 00:32:07 -0000 1.5 +++ python-turboflot.spec 8 Mar 2008 19:03:56 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-turboflot -Version: 0.0.9 +Version: 0.1.0 Release: 1%{?dist} Summary: A TurboGears widget for Flot, a jQuery plotting library @@ -44,6 +44,9 @@ %changelog +* Sat Mar 08 2008 Luke Macken - 0.1.0-1 +- Update to jQuery 1.2.3 and flot 0.4 + * Tue Feb 27 2008 Luke Macken - 0.0.9-1 - 0.0.9, which contains the following changes, thanks to Arthur Clune: - Support an optional graph 'label' Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Feb 2008 00:32:07 -0000 1.6 +++ sources 8 Mar 2008 19:03:56 -0000 1.7 @@ -1 +1 @@ -09e9ab460953ca829b6cac54a51e7a36 TurboFlot-0.0.9.tar.bz2 +fd31dbf30ff6fb7e72e50b8508d96e25 TurboFlot-0.1.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 19:07:41 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sat, 8 Mar 2008 19:07:41 GMT Subject: rpms/aprsd/F-8 aprsd-2.2.5-15-sysconfdir.patch, 1.1, 1.2 aprsd.init, 1.1, 1.2 aprsd.spec, 1.1, 1.2 Message-ID: <200803081907.m28J7ftn001088@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/aprsd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1058 Modified Files: aprsd-2.2.5-15-sysconfdir.patch aprsd.init aprsd.spec Log Message: log dir patch and logrotate support aprsd-2.2.5-15-sysconfdir.patch: Index: aprsd-2.2.5-15-sysconfdir.patch =================================================================== RCS file: /cvs/pkgs/rpms/aprsd/F-8/aprsd-2.2.5-15-sysconfdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aprsd-2.2.5-15-sysconfdir.patch 1 Mar 2008 08:04:44 -0000 1.1 +++ aprsd-2.2.5-15-sysconfdir.patch 8 Mar 2008 19:07:36 -0000 1.2 @@ -1,6 +1,7 @@ +diff -Naur aprsd-2.2.5-15/src/aprsd.cpp aprsd-home/src/aprsd.cpp --- aprsd-2.2.5-15/src/aprsd.cpp 2003-05-29 06:09:39.000000000 +0300 -+++ aprsd-home/src/aprsd.cpp 2008-02-22 16:25:22.000000000 +0200 -@@ -97,7 +97,7 @@ ++++ aprsd-home/src/aprsd.cpp 2008-03-08 15:42:46.000000000 +0200 +@@ -97,17 +97,17 @@ string szAprsPath; int msgsn; @@ -8,4 +9,22 @@ +const string HOMEDIR("/etc/aprsd"); const string CONFPATH(""); const string CONFFILE("aprsd.conf"); - const string MAINLOG("aprsd.log"); +-const string MAINLOG("aprsd.log"); +-const string STSMLOG("thirdparty.log"); +-const string RFLOG("rf.log"); +-const string UDPLOG("udp.log"); +-const string ERRORLOG("error.log"); +-const string DEBUGLOG("debug.log"); +-const string REJECTLOG("reject.log"); +-const string LOOPLOG("loop.log"); ++const string MAINLOG("/var/log/aprsd/aprsd.log"); ++const string STSMLOG("/var/log/aprsd/thirdparty.log"); ++const string RFLOG("/var/log/aprsd/rf.log"); ++const string UDPLOG("/var/log/aprsd/udp.log"); ++const string ERRORLOG("/var/log/aprsd/error.log"); ++const string DEBUGLOG("/var/log/aprsd/debug.log"); ++const string REJECTLOG("/var/log/aprsd/reject.log"); ++const string LOOPLOG("/var/log/aprsd/loop.log"); + const string WELCOME("welcome.txt"); + const string TNC_INIT("INIT.TNC"); + const string TNC_RESTORE("RESTORE.TNC"); Index: aprsd.init =================================================================== RCS file: /cvs/pkgs/rpms/aprsd/F-8/aprsd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aprsd.init 1 Mar 2008 08:04:44 -0000 1.1 +++ aprsd.init 8 Mar 2008 19:07:36 -0000 1.2 @@ -32,7 +32,7 @@ echo -n $"Starting $prog: " daemon /usr/bin/aprsd -d RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/aprsd echo else RETVAL=1 @@ -46,7 +46,7 @@ killproc $prog RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/aprsd return $RETVAL } @@ -64,7 +64,7 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/$prog ]; then + if [ -f /var/lock/subsys/aprsd ]; then stop start RETVAL=$? Index: aprsd.spec =================================================================== RCS file: /cvs/pkgs/rpms/aprsd/F-8/aprsd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aprsd.spec 1 Mar 2008 08:04:44 -0000 1.1 +++ aprsd.spec 8 Mar 2008 19:07:36 -0000 1.2 @@ -2,7 +2,7 @@ Name: aprsd Summary: Internet gateway and client access to amateur radio APRS packet data Version: 2.2.5 -Release: %{uprel}.2%{?dist} +Release: %{uprel}.3%{?dist} Group: Applications/Internet License: GPLv2+ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz @@ -12,6 +12,7 @@ Source4: user.deny Source5: welcome.txt Source6: RESTORE.TNC +Source7: aprsd.logrotate Patch0: aprsd-2.2.5-15-compile.patch Patch1: aprsd-2.2.5-15-gcc43-port.patch Patch2: aprsd-2.2.5-15-sysconfdir.patch @@ -42,12 +43,16 @@ make install DESTDIR="%{buildroot}" INSTALL="install -p" mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}/{aprsd,rc.d/init.d} +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/aprsd/aprsd.conf install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/aprsd install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/aprsd/INIT.TNC install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/aprsd/user.deny install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/aprsd/welcome.txt install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/aprsd/RESTORE.TNC +install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/aprsd +mkdir -p %{buildroot}%{_localstatedir} +mkdir -p %{buildroot}%{_localstatedir}/log/aprsd %clean rm -rf %{buildroot} @@ -67,7 +72,9 @@ %{_bindir}/aprspass %{_sysconfdir}/rc.d/init.d/aprsd %dir %{_sysconfdir}/aprsd +%dir %{_localstatedir}/log/aprsd %config(noreplace) %{_sysconfdir}/aprsd/* +%config(noreplace) %{_sysconfdir}/logrotate.d/aprsd %doc AUTHORS %doc COPYING %doc ChangeLog @@ -78,6 +85,10 @@ %doc doc/qalgorithm.html %changelog +* Fri Mar 8 2008 Lucian Langa - 2.2.5-15.3 +- Patched to localstatedir +- Added logrotation support + * Fri Feb 22 2008 Lucian Langa - 2.2.5-15.2 - Patched homedir to obey default sysconfdir - Patched to compile for gcc-4.3 From fedora-extras-commits at redhat.com Sat Mar 8 19:09:54 2008 From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga)) Date: Sat, 8 Mar 2008 19:09:54 GMT Subject: rpms/aprsd/F-8 aprsd.logrotate,NONE,1.1 Message-ID: <200803081909.m28J9sUC001170@cvs-int.fedora.redhat.com> Author: lucilanga Update of /cvs/pkgs/rpms/aprsd/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1163 Added Files: aprsd.logrotate Log Message: log dir patch and logrotate support --- NEW FILE aprsd.logrotate --- /var/log/aprsd/aprsd.log { weekly rotate 4 } /var/log/aprsd/thirdparty.log { daily rotate 4 } /var/log/aprsd/udp.log { daily rotate 4 } /var/log/aprsd/rf.log { daily rotate 4 } /var/log/aprsd/loop.log { daily rotate 4 } /var/log/aprsd/reject.log { daily rotate 2 } From fedora-extras-commits at redhat.com Sat Mar 8 19:13:05 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:13:05 GMT Subject: comps comps-f9.xml.in,1.297,1.298 Message-ID: <200803081913.m28JD5Kn001349@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1328 Modified Files: comps-f9.xml.in Log Message: Fix typo Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- comps-f9.xml.in 8 Mar 2008 13:01:14 -0000 1.297 +++ comps-f9.xml.in 8 Mar 2008 19:12:35 -0000 1.298 @@ -1968,7 +1968,7 @@ linphone logjam mail-notification - midori + midori Miro mugshot ochusha From fedora-extras-commits at redhat.com Sat Mar 8 19:20:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:20:44 GMT Subject: comps comps-f8.xml.in,1.233,1.234 comps-f7.xml.in,1.320,1.321 Message-ID: <200803081920.m28JKi4D001459@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1438 Modified Files: comps-f8.xml.in comps-f7.xml.in Log Message: Fix typos Index: comps-f8.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f8.xml.in,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- comps-f8.xml.in 8 Mar 2008 13:01:14 -0000 1.233 +++ comps-f8.xml.in 8 Mar 2008 19:20:13 -0000 1.234 @@ -1954,7 +1954,7 @@ linphone logjam mail-notification - midori + midori Miro mugshot ochusha Index: comps-f7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f7.xml.in,v retrieving revision 1.320 retrieving revision 1.321 diff -u -r1.320 -r1.321 --- comps-f7.xml.in 8 Mar 2008 13:01:14 -0000 1.320 +++ comps-f7.xml.in 8 Mar 2008 19:20:13 -0000 1.321 @@ -1831,7 +1831,7 @@ linphone logjam mail-notification - midori + midori Miro mugshot ochusha From fedora-extras-commits at redhat.com Sat Mar 8 19:28:06 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:28:06 +0000 Subject: [pkgdb] java-1.6.0-openjdk was added for fitzsim Message-ID: <200803081930.m28JUFkW017384@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package java-1.6.0-openjdk with summary OpenJDK 6 Kevin Fenzi (kevin) has approved Package java-1.6.0-openjdk Kevin Fenzi (kevin) has added a Fedora devel branch for java-1.6.0-openjdk with an owner of fitzsim Kevin Fenzi (kevin) has approved java-1.6.0-openjdk in Fedora devel Kevin Fenzi (kevin) has approved Package java-1.6.0-openjdk Kevin Fenzi (kevin) has set commit to Approved for cvsextras on java-1.6.0-openjdk (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on java-1.6.0-openjdk (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on java-1.6.0-openjdk (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.6.0-openjdk From fedora-extras-commits at redhat.com Sat Mar 8 19:28:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:28:11 +0000 Subject: [pkgdb] java-1.6.0-openjdk (Fedora, devel) updated by kevin Message-ID: <200803081930.m28JUKBA017404@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on java-1.6.0-openjdk (Fedora devel) for langel Kevin Fenzi (kevin) approved watchcommits on java-1.6.0-openjdk (Fedora devel) for langel Kevin Fenzi (kevin) approved commit on java-1.6.0-openjdk (Fedora devel) for langel Kevin Fenzi (kevin) approved build on java-1.6.0-openjdk (Fedora devel) for langel Kevin Fenzi (kevin) approved approveacls on java-1.6.0-openjdk (Fedora devel) for langel Kevin Fenzi (kevin) Approved cvsextras for commit access on java-1.6.0-openjdk (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/java-1.6.0-openjdk From fedora-extras-commits at redhat.com Sat Mar 8 19:28:52 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:28:52 GMT Subject: rpms/java-1.6.0-openjdk - New directory Message-ID: <200803081928.m28JSqug001655@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/java-1.6.0-openjdk In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNW1613/rpms/java-1.6.0-openjdk Log Message: Directory /cvs/extras/rpms/java-1.6.0-openjdk added to the repository From fedora-extras-commits at redhat.com Sat Mar 8 19:28:54 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:28:54 GMT Subject: rpms/java-1.6.0-openjdk/devel - New directory Message-ID: <200803081928.m28JSs0b001669@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNW1613/rpms/java-1.6.0-openjdk/devel Log Message: Directory /cvs/extras/rpms/java-1.6.0-openjdk/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 8 19:28:57 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:28:57 GMT Subject: rpms/java-1.6.0-openjdk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803081928.m28JSvHp001696@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/java-1.6.0-openjdk In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNW1613/rpms/java-1.6.0-openjdk Added Files: Makefile import.log Log Message: Setup of module java-1.6.0-openjdk --- NEW FILE Makefile --- # Top level Makefile for module java-1.6.0-openjdk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Mar 8 19:28:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:28:59 GMT Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803081929.m28JSxSn001712@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNW1613/rpms/java-1.6.0-openjdk/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module java-1.6.0-openjdk --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: java-1.6.0-openjdk # $Id: Makefile,v 1.1 2008/03/08 19:28:57 kevin Exp $ NAME := java-1.6.0-openjdk SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Mar 8 19:30:23 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 19:30:23 GMT Subject: rpms/python-fpconst/EL-5 python-fpconst.spec,1.4,1.5 Message-ID: <200803081930.m28JUN4V001817@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1745/EL-5 Modified Files: python-fpconst.spec Log Message: fix Source0 URL Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/EL-5/python-fpconst.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-fpconst.spec 30 Sep 2007 17:15:53 -0000 1.4 +++ python-fpconst.spec 8 Mar 2008 19:29:50 -0000 1.5 @@ -2,13 +2,13 @@ Name: python-fpconst Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages License: ASL 2.0 URL: http://research.warnes.net/statcomp/projects/RStatServer/fpconst -Source0: http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/rsoap/fpconst-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -48,15 +48,18 @@ %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-2 +- Fix %%Source0 URL + * Sun Sep 30 2007 Christopher Stone 0.7.3-1 - Upstream sync - Update source URL - Some spec file cleanups -* Fri Dec 08 2006 Christopher Stone 0.7.2-3.fc7.2 +* Fri Dec 08 2006 Christopher Stone 0.7.2-3.2 - Add python-devel to BR -* Fri Dec 08 2006 Christopher Stone 0.7.2-3.fc7.1 +* Fri Dec 08 2006 Christopher Stone 0.7.2-3.1 - python(abi) = 0:2.5 * Wed Sep 06 2006 Christopher Stone 0.7.2-3 From fedora-extras-commits at redhat.com Sat Mar 8 19:30:28 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 19:30:28 GMT Subject: rpms/python-fpconst/F-7 python-fpconst.spec,1.6,1.7 Message-ID: <200803081930.m28JUS3B001820@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1745/F-7 Modified Files: python-fpconst.spec Log Message: fix Source0 URL Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/F-7/python-fpconst.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-fpconst.spec 30 Sep 2007 17:15:50 -0000 1.6 +++ python-fpconst.spec 8 Mar 2008 19:29:54 -0000 1.7 @@ -2,13 +2,13 @@ Name: python-fpconst Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages License: ASL 2.0 URL: http://research.warnes.net/statcomp/projects/RStatServer/fpconst -Source0: http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/rsoap/fpconst-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -48,15 +48,18 @@ %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-2 +- Fix %%Source0 URL + * Sun Sep 30 2007 Christopher Stone 0.7.3-1 - Upstream sync - Update source URL - Some spec file cleanups -* Fri Dec 08 2006 Christopher Stone 0.7.2-3.fc7.2 +* Fri Dec 08 2006 Christopher Stone 0.7.2-3.2 - Add python-devel to BR -* Fri Dec 08 2006 Christopher Stone 0.7.2-3.fc7.1 +* Fri Dec 08 2006 Christopher Stone 0.7.2-3.1 - python(abi) = 0:2.5 * Wed Sep 06 2006 Christopher Stone 0.7.2-3 From fedora-extras-commits at redhat.com Sat Mar 8 19:30:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:30:29 +0000 Subject: [pkgdb] mediawiki-openid was added for athimm Message-ID: <200803081932.m28JWcCV017599@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package mediawiki-openid with summary The OpenID extension for MediaWiki Kevin Fenzi (kevin) has approved Package mediawiki-openid Kevin Fenzi (kevin) has added a Fedora devel branch for mediawiki-openid with an owner of athimm Kevin Fenzi (kevin) has approved mediawiki-openid in Fedora devel Kevin Fenzi (kevin) has approved Package mediawiki-openid Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mediawiki-openid (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mediawiki-openid (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mediawiki-openid (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-openid From fedora-extras-commits at redhat.com Sat Mar 8 19:30:31 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 19:30:31 GMT Subject: rpms/python-fpconst/F-8 python-fpconst.spec,1.6,1.7 Message-ID: <200803081930.m28JUVZn001823@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1745/F-8 Modified Files: python-fpconst.spec Log Message: fix Source0 URL Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/F-8/python-fpconst.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-fpconst.spec 30 Sep 2007 17:15:56 -0000 1.6 +++ python-fpconst.spec 8 Mar 2008 19:29:58 -0000 1.7 @@ -2,13 +2,13 @@ Name: python-fpconst Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages License: ASL 2.0 URL: http://research.warnes.net/statcomp/projects/RStatServer/fpconst -Source0: http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/rsoap/fpconst-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -48,15 +48,18 @@ %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-2 +- Fix %%Source0 URL + * Sun Sep 30 2007 Christopher Stone 0.7.3-1 - Upstream sync - Update source URL - Some spec file cleanups -* Fri Dec 08 2006 Christopher Stone 0.7.2-3.fc7.2 +* Fri Dec 08 2006 Christopher Stone 0.7.2-3.2 - Add python-devel to BR -* Fri Dec 08 2006 Christopher Stone 0.7.2-3.fc7.1 +* Fri Dec 08 2006 Christopher Stone 0.7.2-3.1 - python(abi) = 0:2.5 * Wed Sep 06 2006 Christopher Stone 0.7.2-3 From fedora-extras-commits at redhat.com Sat Mar 8 19:30:38 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 19:30:38 GMT Subject: rpms/python-fpconst/devel python-fpconst.spec,1.6,1.7 Message-ID: <200803081930.m28JUckC001826@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1745/devel Modified Files: python-fpconst.spec Log Message: fix Source0 URL Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/devel/python-fpconst.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-fpconst.spec 30 Sep 2007 17:15:56 -0000 1.6 +++ python-fpconst.spec 8 Mar 2008 19:30:01 -0000 1.7 @@ -2,13 +2,13 @@ Name: python-fpconst Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages License: ASL 2.0 URL: http://research.warnes.net/statcomp/projects/RStatServer/fpconst -Source0: http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/rsoap/fpconst-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -48,15 +48,18 @@ %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-2 +- Fix %%Source0 URL + * Sun Sep 30 2007 Christopher Stone 0.7.3-1 - Upstream sync - Update source URL - Some spec file cleanups -* Fri Dec 08 2006 Christopher Stone 0.7.2-3.fc7.2 +* Fri Dec 08 2006 Christopher Stone 0.7.2-3.2 - Add python-devel to BR -* Fri Dec 08 2006 Christopher Stone 0.7.2-3.fc7.1 +* Fri Dec 08 2006 Christopher Stone 0.7.2-3.1 - python(abi) = 0:2.5 * Wed Sep 06 2006 Christopher Stone 0.7.2-3 From fedora-extras-commits at redhat.com Sat Mar 8 19:30:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:30:45 +0000 Subject: [pkgdb] mediawiki-openid (Fedora, 8) updated by kevin Message-ID: <200803081932.m28JWsWL017654@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for mediawiki-openid Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mediawiki-openid (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mediawiki-openid (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mediawiki-openid (Fedora 8) Kevin Fenzi (kevin) Denied cvsextras for commit access on mediawiki-openid (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-openid From fedora-extras-commits at redhat.com Sat Mar 8 19:30:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:30:46 +0000 Subject: [pkgdb] mediawiki-openid (Fedora, 7) updated by kevin Message-ID: <200803081932.m28JWsWO017654@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for mediawiki-openid Kevin Fenzi (kevin) has set commit to Approved for cvsextras on mediawiki-openid (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on mediawiki-openid (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on mediawiki-openid (Fedora 7) Kevin Fenzi (kevin) Denied cvsextras for commit access on mediawiki-openid (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-openid From fedora-extras-commits at redhat.com Sat Mar 8 19:30:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:30:46 +0000 Subject: [pkgdb] mediawiki-openid (Fedora, devel) updated by kevin Message-ID: <200803081932.m28JWsWR017654@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Denied cvsextras for commit access on mediawiki-openid (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki-openid From fedora-extras-commits at redhat.com Sat Mar 8 19:31:15 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:31:15 GMT Subject: rpms/mediawiki-openid - New directory Message-ID: <200803081931.m28JVFZA001880@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mediawiki-openid In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseq1837/rpms/mediawiki-openid Log Message: Directory /cvs/extras/rpms/mediawiki-openid added to the repository From fedora-extras-commits at redhat.com Sat Mar 8 19:31:18 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:31:18 GMT Subject: rpms/mediawiki-openid/devel - New directory Message-ID: <200803081931.m28JVIl0001894@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mediawiki-openid/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseq1837/rpms/mediawiki-openid/devel Log Message: Directory /cvs/extras/rpms/mediawiki-openid/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 8 19:31:25 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:31:25 GMT Subject: rpms/mediawiki-openid Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803081931.m28JVP5g001921@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mediawiki-openid In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseq1837/rpms/mediawiki-openid Added Files: Makefile import.log Log Message: Setup of module mediawiki-openid --- NEW FILE Makefile --- # Top level Makefile for module mediawiki-openid all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Mar 8 19:31:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:31:28 GMT Subject: rpms/mediawiki-openid/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803081931.m28JVSk5001937@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/mediawiki-openid/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseq1837/rpms/mediawiki-openid/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mediawiki-openid --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: mediawiki-openid # $Id: Makefile,v 1.1 2008/03/08 19:31:25 kevin Exp $ NAME := mediawiki-openid SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Mar 8 19:32:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:32:36 +0000 Subject: [pkgdb] maradns was added for static Message-ID: <200803081934.m28JYiCZ017926@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package maradns with summary Security-aware DNS Server Kevin Fenzi (kevin) has approved Package maradns Kevin Fenzi (kevin) has added a Fedora devel branch for maradns with an owner of static Kevin Fenzi (kevin) has approved maradns in Fedora devel Kevin Fenzi (kevin) has approved Package maradns Kevin Fenzi (kevin) has set commit to Approved for cvsextras on maradns (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on maradns (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on maradns (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/maradns From fedora-extras-commits at redhat.com Sat Mar 8 19:32:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:32:46 +0000 Subject: [pkgdb] maradns (Fedora, 8) updated by kevin Message-ID: <200803081934.m28JYtfb017948@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for maradns Kevin Fenzi (kevin) has set commit to Approved for cvsextras on maradns (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on maradns (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on maradns (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on maradns (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/maradns From fedora-extras-commits at redhat.com Sat Mar 8 19:32:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:32:46 +0000 Subject: [pkgdb] maradns (Fedora EPEL, 5) updated by kevin Message-ID: <200803081934.m28JYtfe017948@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for maradns Kevin Fenzi (kevin) has set commit to Approved for cvsextras on maradns (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on maradns (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on maradns (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on maradns (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/maradns From fedora-extras-commits at redhat.com Sat Mar 8 19:32:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:32:46 +0000 Subject: [pkgdb] maradns (Fedora, devel) updated by kevin Message-ID: <200803081934.m28JYtfh017948@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on maradns (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/maradns From fedora-extras-commits at redhat.com Sat Mar 8 19:33:03 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 8 Mar 2008 19:33:03 GMT Subject: rpms/python-turboflot/F-7 .cvsignore, 1.3, 1.4 python-turboflot.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200803081933.m28JX3VW002257@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-turboflot/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2229 Modified Files: .cvsignore python-turboflot.spec sources Log Message: Update to jQuery 1.2.3 and flot 0.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-7/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Mar 2008 17:26:28 -0000 1.3 +++ .cvsignore 8 Mar 2008 19:32:29 -0000 1.4 @@ -1 +1 @@ -TurboFlot-0.0.9.tar.bz2 +TurboFlot-0.1.0.tar.bz2 Index: python-turboflot.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-7/python-turboflot.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-turboflot.spec 1 Mar 2008 17:26:28 -0000 1.2 +++ python-turboflot.spec 8 Mar 2008 19:32:29 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-turboflot -Version: 0.0.9 +Version: 0.1.0 Release: 1%{?dist} Summary: A TurboGears widget for Flot, a jQuery plotting library @@ -44,6 +44,9 @@ %changelog +* Sat Mar 08 2008 Luke Macken - 0.1.0-1 +- Update to jQuery 1.2.3 and flot 0.4 + * Tue Feb 27 2008 Luke Macken - 0.0.9-1 - 0.0.9, which contains the following changes, thanks to Arthur Clune: - Support an optional graph 'label' Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-7/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Mar 2008 17:26:28 -0000 1.3 +++ sources 8 Mar 2008 19:32:29 -0000 1.4 @@ -1 +1 @@ -09e9ab460953ca829b6cac54a51e7a36 TurboFlot-0.0.9.tar.bz2 +fd31dbf30ff6fb7e72e50b8508d96e25 TurboFlot-0.1.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 19:33:18 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:33:18 GMT Subject: rpms/maradns - New directory Message-ID: <200803081933.m28JXI4m002324@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/maradns In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBc2253/rpms/maradns Log Message: Directory /cvs/extras/rpms/maradns added to the repository From fedora-extras-commits at redhat.com Sat Mar 8 19:33:24 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:33:24 GMT Subject: rpms/maradns/devel - New directory Message-ID: <200803081933.m28JXOdS002338@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/maradns/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBc2253/rpms/maradns/devel Log Message: Directory /cvs/extras/rpms/maradns/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 8 19:33:28 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:33:28 GMT Subject: rpms/maradns Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803081933.m28JXSQw002367@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/maradns In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBc2253/rpms/maradns Added Files: Makefile import.log Log Message: Setup of module maradns --- NEW FILE Makefile --- # Top level Makefile for module maradns all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Mar 8 19:33:31 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:33:31 GMT Subject: rpms/maradns/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803081933.m28JXVUv002387@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/maradns/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBc2253/rpms/maradns/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module maradns --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: maradns # $Id: Makefile,v 1.1 2008/03/08 19:33:28 kevin Exp $ NAME := maradns SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Mar 8 19:33:40 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:33:40 +0000 Subject: [pkgdb] dropbear (Fedora EPEL, 4) updated by kevin Message-ID: <200803081935.m28JZn07018145@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for dropbear Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dropbear (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dropbear (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dropbear (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dropbear From fedora-extras-commits at redhat.com Sat Mar 8 19:33:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:33:41 +0000 Subject: [pkgdb] dropbear (Fedora EPEL, 5) updated by kevin Message-ID: <200803081935.m28JZn0A018145@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for dropbear Kevin Fenzi (kevin) has set commit to Approved for cvsextras on dropbear (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on dropbear (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on dropbear (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/dropbear From fedora-extras-commits at redhat.com Sat Mar 8 19:35:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:35:49 +0000 Subject: [pkgdb] ocsinventory-agent was added for remi Message-ID: <200803081937.m28JbwO9018315@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package ocsinventory-agent with summary Open Computer and Software Inventory Next Generation client Kevin Fenzi (kevin) has approved Package ocsinventory-agent Kevin Fenzi (kevin) has added a Fedora devel branch for ocsinventory-agent with an owner of remi Kevin Fenzi (kevin) has approved ocsinventory-agent in Fedora devel Kevin Fenzi (kevin) has approved Package ocsinventory-agent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocsinventory-agent (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocsinventory-agent (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocsinventory-agent (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory-agent From fedora-extras-commits at redhat.com Sat Mar 8 19:36:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:36:11 +0000 Subject: [pkgdb] ocsinventory-agent (Fedora, 8) updated by kevin Message-ID: <200803081938.m28JcKpQ018349@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for ocsinventory-agent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocsinventory-agent (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocsinventory-agent (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocsinventory-agent (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocsinventory-agent (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory-agent From fedora-extras-commits at redhat.com Sat Mar 8 19:36:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:36:11 +0000 Subject: [pkgdb] ocsinventory-agent (Fedora, 7) updated by kevin Message-ID: <200803081938.m28JcKpR018349@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for ocsinventory-agent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocsinventory-agent (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocsinventory-agent (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocsinventory-agent (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocsinventory-agent (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory-agent From fedora-extras-commits at redhat.com Sat Mar 8 19:36:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:36:11 +0000 Subject: [pkgdb] ocsinventory-agent (Fedora EPEL, 4) updated by kevin Message-ID: <200803081938.m28JcK8L018344@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for ocsinventory-agent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocsinventory-agent (Fedora EPEL 4) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocsinventory-agent (Fedora EPEL 4) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocsinventory-agent (Fedora EPEL 4) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocsinventory-agent (Fedora EPEL 4) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory-agent From fedora-extras-commits at redhat.com Sat Mar 8 19:36:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:36:11 +0000 Subject: [pkgdb] ocsinventory-agent (Fedora, devel) updated by kevin Message-ID: <200803081938.m28JcKpU018349@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on ocsinventory-agent (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory-agent From fedora-extras-commits at redhat.com Sat Mar 8 19:36:12 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Sat, 08 Mar 2008 19:36:12 +0000 Subject: [pkgdb] ocsinventory-agent (Fedora EPEL, 5) updated by kevin Message-ID: <200803081938.m28JcK8O018344@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for ocsinventory-agent Kevin Fenzi (kevin) has set commit to Approved for cvsextras on ocsinventory-agent (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on ocsinventory-agent (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on ocsinventory-agent (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on ocsinventory-agent (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ocsinventory-agent From fedora-extras-commits at redhat.com Sat Mar 8 19:36:50 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:36:50 GMT Subject: rpms/ocsinventory-agent - New directory Message-ID: <200803081936.m28JaoDQ002842@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocsinventory-agent In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYr2801/rpms/ocsinventory-agent Log Message: Directory /cvs/extras/rpms/ocsinventory-agent added to the repository From fedora-extras-commits at redhat.com Sat Mar 8 19:36:56 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:36:56 GMT Subject: rpms/ocsinventory-agent/devel - New directory Message-ID: <200803081936.m28Jau1v002860@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocsinventory-agent/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYr2801/rpms/ocsinventory-agent/devel Log Message: Directory /cvs/extras/rpms/ocsinventory-agent/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 8 19:37:02 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:37:02 GMT Subject: rpms/ocsinventory-agent Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803081937.m28Jb2Vj002891@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocsinventory-agent In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYr2801/rpms/ocsinventory-agent Added Files: Makefile import.log Log Message: Setup of module ocsinventory-agent --- NEW FILE Makefile --- # Top level Makefile for module ocsinventory-agent all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Mar 8 19:37:09 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Sat, 8 Mar 2008 19:37:09 GMT Subject: rpms/ocsinventory-agent/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803081937.m28Jb9OW002911@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/ocsinventory-agent/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYr2801/rpms/ocsinventory-agent/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ocsinventory-agent --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ocsinventory-agent # $Id: Makefile,v 1.1 2008/03/08 19:37:02 kevin Exp $ NAME := ocsinventory-agent SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Mar 8 19:39:11 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sat, 8 Mar 2008 19:39:11 GMT Subject: rpms/python-turboflot/F-8 .cvsignore, 1.3, 1.4 python-turboflot.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200803081939.m28JdB4Q003323@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-turboflot/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3268 Modified Files: .cvsignore python-turboflot.spec sources Log Message: Update to jQuery 1.2.3 and flot 0.4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Mar 2008 17:21:01 -0000 1.3 +++ .cvsignore 8 Mar 2008 19:38:38 -0000 1.4 @@ -1 +1 @@ -TurboFlot-0.0.9.tar.bz2 +TurboFlot-0.1.0.tar.bz2 Index: python-turboflot.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-8/python-turboflot.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-turboflot.spec 1 Mar 2008 17:21:01 -0000 1.2 +++ python-turboflot.spec 8 Mar 2008 19:38:38 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-turboflot -Version: 0.0.9 +Version: 0.1.0 Release: 1%{?dist} Summary: A TurboGears widget for Flot, a jQuery plotting library @@ -44,6 +44,9 @@ %changelog +* Sat Mar 08 2008 Luke Macken - 0.1.0-1 +- Update to jQuery 1.2.3 and flot 0.4 + * Tue Feb 27 2008 Luke Macken - 0.0.9-1 - 0.0.9, which contains the following changes, thanks to Arthur Clune: - Support an optional graph 'label' Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-turboflot/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Mar 2008 17:21:01 -0000 1.3 +++ sources 8 Mar 2008 19:38:38 -0000 1.4 @@ -1 +1 @@ -09e9ab460953ca829b6cac54a51e7a36 TurboFlot-0.0.9.tar.bz2 +fd31dbf30ff6fb7e72e50b8508d96e25 TurboFlot-0.1.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 19:46:28 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Sat, 8 Mar 2008 19:46:28 GMT Subject: rpms/fast-user-switch-applet/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE error-dialog.patch, 1.1, NONE fast-user-switch-applet-2.17.3-defaults.patch, 1.1, NONE fast-user-switch-applet-2.17.3-username.patch, 1.2, NONE fast-user-switch-applet-2.17.4-socket-check.patch, 1.1, NONE fast-user-switch-applet-2.20.0-username.patch, 1.1, NONE fast-user-switch-applet.spec, 1.20, NONE many-users.patch, 1.1, NONE no-session.patch, 1.1, NONE sources, 1.5, NONE startx.patch, 1.2, NONE throttle.patch, 1.1, NONE Message-ID: <200803081946.m28JkSYL003521@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/fast-user-switch-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3507 Added Files: dead.package Removed Files: Makefile error-dialog.patch fast-user-switch-applet-2.17.3-defaults.patch fast-user-switch-applet-2.17.3-username.patch fast-user-switch-applet-2.17.4-socket-check.patch fast-user-switch-applet-2.20.0-username.patch fast-user-switch-applet.spec many-users.patch no-session.patch sources startx.patch throttle.patch Log Message: Remove package which is obsoleted by gdm-user-switch-applet --- NEW FILE dead.package --- Replaced by gdm subpackage "gdm-user-switch-applet" --- Makefile DELETED --- --- error-dialog.patch DELETED --- --- fast-user-switch-applet-2.17.3-defaults.patch DELETED --- --- fast-user-switch-applet-2.17.3-username.patch DELETED --- --- fast-user-switch-applet-2.17.4-socket-check.patch DELETED --- --- fast-user-switch-applet-2.20.0-username.patch DELETED --- --- fast-user-switch-applet.spec DELETED --- --- many-users.patch DELETED --- --- no-session.patch DELETED --- --- sources DELETED --- --- startx.patch DELETED --- --- throttle.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 8 19:49:16 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Sat, 8 Mar 2008 19:49:16 GMT Subject: comps comps-f9.xml.in,1.298,1.299 Message-ID: <200803081949.m28JnGvZ003597@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3574 Modified Files: comps-f9.xml.in Log Message: Replace fast-user-switch-applet with gdm-user-switch-applet Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.298 retrieving revision 1.299 diff -u -r1.298 -r1.299 --- comps-f9.xml.in 8 Mar 2008 19:12:35 -0000 1.298 +++ comps-f9.xml.in 8 Mar 2008 19:48:46 -0000 1.299 @@ -1728,7 +1728,7 @@ evince evince-djvu evince-dvi - fast-user-switch-applet + gdm-user-switch-applet file-roller gcalctool gedit From fedora-extras-commits at redhat.com Sat Mar 8 19:52:45 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 8 Mar 2008 19:52:45 GMT Subject: rpms/mediawiki-openid/devel mediawiki-openid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803081952.m28JqjUe003648@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/mediawiki-openid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3445/devel Modified Files: .cvsignore sources Added Files: mediawiki-openid.spec Log Message: --- NEW FILE mediawiki-openid.spec --- Summary: The OpenID extension for MediaWiki Name: mediawiki-openid Version: 0.7.0 Release: 5 License: GPLv2+ Group: Development/Tools URL: http://www.mediawiki.org/wiki/Extension:OpenID #Source0: http://wikitravel.org/software/MediaWiki-OpenID-%{version}.tar.gz # svn export http://svn.wikimedia.org/svnroot/mediawiki/tags/extensions/OpenID/REL0_7_0 MediaWiki-OpenID-%{version} # tar -jpcf MediaWiki-OpenID-%{version}.tar.bz2 MediaWiki-OpenID-%{version} Source0: MediaWiki-OpenID-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: mediawiki, php-pear-Auth-OpenID, php-pear-Services-Yadis %description This extension lets users log in with an OpenID instead of a username and password. An OpenID is a special URL that people can use to log in to a Web site. The extension also lets users who have an account on the wiki log in to other OpenID-aware Web sites with their wiki user page as their OpenID. %prep %setup -q -n MediaWiki-OpenID-%{version} cat >> README.1st < - 0.7.0-5 - Move *.sql to %%doc. - move part of %%description to a README.1st file. - add empty %%build. * Thu Nov 29 2007 Axel Thimm - 0.7.0-4 - Update to 0.7.0 (Peter Lemenkov (lemenkov at gmail.com)). * Thu Feb 1 2007 Axel Thimm - 0.6.1-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki-openid/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2008 19:31:25 -0000 1.1 +++ .cvsignore 8 Mar 2008 19:52:12 -0000 1.2 @@ -0,0 +1 @@ +MediaWiki-OpenID-0.7.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki-openid/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2008 19:31:25 -0000 1.1 +++ sources 8 Mar 2008 19:52:12 -0000 1.2 @@ -0,0 +1 @@ +498b174500f51b509bbb58f8d54a2928 MediaWiki-OpenID-0.7.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 20:03:06 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 20:03:06 GMT Subject: rpms/python-fpconst/EL-5 python-fpconst.spec,1.5,1.6 Message-ID: <200803082003.m28K36PN011199@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11129/EL-5 Modified Files: python-fpconst.spec Log Message: Add egg-info to %files Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/EL-5/python-fpconst.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-fpconst.spec 8 Mar 2008 19:29:50 -0000 1.5 +++ python-fpconst.spec 8 Mar 2008 20:02:32 -0000 1.6 @@ -2,7 +2,7 @@ Name: python-fpconst Version: 0.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages @@ -45,9 +45,13 @@ %{python_sitelib}/*.py %{python_sitelib}/*.pyc %{python_sitelib}/*.pyo +%{python_sitelib}/*.egg-info %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-3 +- Add egg-info to %%files + * Sat Mar 08 2008 Christopher Stone 0.7.3-2 - Fix %%Source0 URL From fedora-extras-commits at redhat.com Sat Mar 8 20:03:09 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 20:03:09 GMT Subject: rpms/python-fpconst/F-7 python-fpconst.spec,1.7,1.8 Message-ID: <200803082003.m28K39nS011202@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11129/F-7 Modified Files: python-fpconst.spec Log Message: Add egg-info to %files Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/F-7/python-fpconst.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-fpconst.spec 8 Mar 2008 19:29:54 -0000 1.7 +++ python-fpconst.spec 8 Mar 2008 20:02:36 -0000 1.8 @@ -2,7 +2,7 @@ Name: python-fpconst Version: 0.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages @@ -45,9 +45,13 @@ %{python_sitelib}/*.py %{python_sitelib}/*.pyc %{python_sitelib}/*.pyo +%{python_sitelib}/*.egg-info %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-3 +- Add egg-info to %%files + * Sat Mar 08 2008 Christopher Stone 0.7.3-2 - Fix %%Source0 URL From fedora-extras-commits at redhat.com Sat Mar 8 20:03:12 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 20:03:12 GMT Subject: rpms/python-fpconst/F-8 python-fpconst.spec,1.7,1.8 Message-ID: <200803082003.m28K3C21011205@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11129/F-8 Modified Files: python-fpconst.spec Log Message: Add egg-info to %files Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/F-8/python-fpconst.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-fpconst.spec 8 Mar 2008 19:29:58 -0000 1.7 +++ python-fpconst.spec 8 Mar 2008 20:02:39 -0000 1.8 @@ -2,7 +2,7 @@ Name: python-fpconst Version: 0.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages @@ -45,9 +45,13 @@ %{python_sitelib}/*.py %{python_sitelib}/*.pyc %{python_sitelib}/*.pyo +%{python_sitelib}/*.egg-info %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-3 +- Add egg-info to %%files + * Sat Mar 08 2008 Christopher Stone 0.7.3-2 - Fix %%Source0 URL From fedora-extras-commits at redhat.com Sat Mar 8 20:03:16 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 20:03:16 GMT Subject: rpms/python-fpconst/devel python-fpconst.spec,1.7,1.8 Message-ID: <200803082003.m28K3GUr011208@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11129/devel Modified Files: python-fpconst.spec Log Message: Add egg-info to %files Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/devel/python-fpconst.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-fpconst.spec 8 Mar 2008 19:30:01 -0000 1.7 +++ python-fpconst.spec 8 Mar 2008 20:02:43 -0000 1.8 @@ -2,7 +2,7 @@ Name: python-fpconst Version: 0.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages @@ -45,9 +45,13 @@ %{python_sitelib}/*.py %{python_sitelib}/*.pyc %{python_sitelib}/*.pyo +%{python_sitelib}/*.egg-info %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-3 +- Add egg-info to %%files + * Sat Mar 08 2008 Christopher Stone 0.7.3-2 - Fix %%Source0 URL From fedora-extras-commits at redhat.com Sat Mar 8 20:09:45 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 8 Mar 2008 20:09:45 GMT Subject: rpms/ocsinventory-agent/devel ocsinventory-agent.README, NONE, 1.1 ocsinventory-agent.README.fr, NONE, 1.1 ocsinventory-agent.cron, NONE, 1.1 ocsinventory-agent.logrotate, NONE, 1.1 ocsinventory-agent.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803082009.m28K9jPd011345@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/ocsinventory-agent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11288 Modified Files: .cvsignore sources Added Files: ocsinventory-agent.README ocsinventory-agent.README.fr ocsinventory-agent.cron ocsinventory-agent.logrotate ocsinventory-agent.spec Log Message: new package --- NEW FILE ocsinventory-agent.README --- Thie RPM install the OCS Inventory NG client It is configure to generate, daily, a local report: /var/lib/ocsinventory-agent/.ocs If you want it to automaticaly transfer the result to your organization communication server, or if you want to use the ocs TAG, edit the configuration file: /etc/ocsinventory/ocsinventory-agent.cfg If you want to deploy this client on a important number of computer, you can generate a already configured RPM with rpmbuild -bb \ --define "ocstag tagvalue" \ --define "ocsserver ocsserver.domain.tld:port" \ ocsinventory-agent-.src.rpm Result will be : ocsinventory-agent-..noarch.rpm When using a personalized RPM, the cron is enabled by default. --- NEW FILE ocsinventory-agent.README.fr --- Ce RPM installe l'agent d"OCS Inventory NG" Il est configur?? pour g??n??rer quotidiennement un rapport local : /var/lib/ocsinventory-agent/.ocs Si vous souhaitez transmettre ce rapport au serveur de communication de votre organisation, ou si vous souhaitez utiliser le TAG ocs, ??ditez le fichier de configuration : /etc/ocsinventory/ocsinventory-agent.cfg Si vous d??sirez d??ployer ce client sur un parc important, vous pouvez g??n??rer un RPM pr??configur?? ?? l'aide de la commande rpmbuild -bb \ --define "ocstag tagvalue" \ --define "ocsserver ocsserver.domain.tld:port" \ ocsinventory-agent-.src.rpm Le r??sultat sera : ocsinventory-agent-..noarch.rpm Dans le cas d'un RPM personalis??, le "cron" est activ?? par d??faut. --- NEW FILE ocsinventory-agent.cron --- #!/bin/bash NAME=ocsinventory-agent exec >>/var/log/$NAME/$NAME.log 2>&1 [ -f /etc/sysconfig/$NAME ] || exit 0 source /etc/sysconfig/$NAME i=0 while [ $i -lt ${#OCSMODE[*]} ] do if [ ${OCSMODE[$i]:-none} == cron ]; then OPTS= if [ ! -z "${OCSPAUSE[$i]}" ]; then OPTS="--wait ${OCSPAUSE[$i]}" fi if [ ! -z "${OCSTAG[$i]}" ]; then OPTS="$OPTS --tag=${OCSTAG[$i]}" fi if [ "z${OCSSERVER[$i]}" = 'zlocal' ]; then # Local inventory OPTS="$OPTS --local=/var/lib/$NAME" elif [ ! -z "${OCSSERVER[$i]}" ]; then # Remote inventory OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}" fi echo "[$(date '+%D %T')]" Running $NAME $OPTS /usr/sbin/$NAME $OPTS fi ((i++)) done echo "[$(date '+%D %T')]" End of cron job --- NEW FILE ocsinventory-agent.logrotate --- # Rotate OCS Inventory NG agent logs daily, only if not empty # Save 7 days old logs under compressed mode /var/log/ocsinventory-agent/*.log { daily rotate 7 compress notifempty missingok } --- NEW FILE ocsinventory-agent.spec --- # Can, optionaly, be define at build time (see README.RPM) # - ocstag : administrative tag # - ocsserver : OCS Inventory NG communication serveur Name: ocsinventory-agent Version: 0.0.8.2 Summary: Open Computer and Software Inventory Next Generation client #Release: 1%{?dist}%{?ocstag:.%{ocstag}} #Source0: http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-%{version}.tar.gz #Source0: http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz # cvs -z3 -d:pserver:anonymous at ocsinventory.cvs.sourceforge.net:/cvsroot/ocsinventory co -D "2008-03-05" -P unified_unix_agent # tar cvzf /home/extras/SOURCES/Ocsinventory-Agent-cvs.tgz --exclude CVS unified_unix_agent Release: 0.5.20080305%{?dist}%{?ocstag:.%{ocstag}} Source0: Ocsinventory-Agent-cvs.tgz Source1: %{name}.logrotate Source2: %{name}.cron Source11: %{name}.README Source12: %{name}.README.fr Group: Development/Libraries License: GPLv2 URL: http://www.ocsinventory-ng.org/ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Module::Install) perl(XML::Simple) perl(LWP) perl(Net::IP) perl(Digest::MD5) perl(File::Temp) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: net-tools, pciutils Requires: %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.hourly Requires: perl(HTTP::Request) Requires: perl(Proc::Daemon) # Optionnal : dmidecode on x86, /proc in ppc # Requires: %{_sbindir}/dmidecode # Optionnal : ipdiscover or nmap, monitor-edid not available on Fedora # Requires: ocsinventory-ipdiscover, nmap, monitor-edid Obsoletes: ocsinventory-client <= 1.01 Provides: ocsinventory-client = 1.02 # use the following line when version is strictly above 1.01 # ocsinventory-client = %{version}-%{release} %description Open Computer and Software Inventory Next Generation is an application designed to help a network or system administrator keep track of computer configuration and software installed on the network. It also allows deploying softwares, commands or files on Windows and Linux client computers. %{name} provides the client for Linux (Unified Unix Agent). %description -l fr Open Computer and Software Inventory Next Generation est une application destin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil sur la configuration des machines du r??seau et sur les logiciels qui y sont install??s. Elle autorise aussi la t??l??diffusion (ou d??ploiement) de logiciels, de commandes ou de fichiers sur les clients Windows ou Linux. %{name} fournit le client pour Linux (Agent Unix Unifi??) %prep #%setup -q -n Ocsinventory-Agent-%{version} %setup -q -n unified_unix_agent cat <%{name}.conf # # OCS Inventory "Unix Unified Agent" Configuration File # used by hourly cron job # %if 0%{?ocsserver:1} # Mode, change to "none" to disable OCSMODE[0]=cron %else # Mode, change to "cron" to activate OCSMODE[0]=none %endif # can be used to override the %{name}.cfg setup. # OCSSERVER[0]=http://your.ocsserver.name/ocsinventory # # corresponds with --local=%{_localstatedir}/lib/%{name} # OCSSERVER[0]=local # Wait before inventory OCSPAUSE[0]=100 # Administrative TAG (optional, must be filed before first inventory) OCSTAG[0]=%{?ocstag} EOF cat <%{name}.cfg # # OCS Inventory "Unix Unified Agent" Configuration File # # options used by cron job overides this (see /etc/sysconfig/%{name}) # %if 0%{?ocsserver:1} server = http://%{ocsserver}/ocsinventory %else # Server URL, unconmment if needed # server = http://your.ocsserver.name/ocsinventory %endif # Administrative TAG (optional, must be filed before first inventory) # tag = your_tag # How to log, can be File,Stderr,Syslog logger = Stderr logfile = %{_localstatedir}/log/%{name}/%{name}.log EOF cp %{SOURCE11} README.RPM cp %{SOURCE12} README.RPM.fr %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+rwX,go+rX,go-w %{buildroot}/* # Move exe to root directory mv %{buildroot}%{_bindir} %{buildroot}%{_sbindir} %{__mkdir_p} %{buildroot}%{_localstatedir}/{log,lib}/%{name} %{__mkdir_p} %{buildroot}%{_sysconfdir}/{logrotate.d,sysconfig,cron.hourly,ocsinventory} %{__install} -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name} sed -e 's;/etc/;%{_sysconfdir}/;' \ -e 's;/var/;%{_localstatedir}/;' \ -e 's;/usr/sbin/;%{_sbindir}/;' \ %{SOURCE2} > %{buildroot}%{_sysconfdir}/cron.hourly/%{name} chmod +x %{buildroot}%{_sysconfdir}/cron.hourly/%{name} %{__install} -m 644 %{name}.cfg %{buildroot}%{_sysconfdir}/ocsinventory/%{name}.cfg # Remove some unusefull files (which brings unresolvable deps) rm -rf %{buildroot}%{perl_vendorlib}/Ocsinventory/Agent/Backend/OS/Win32* # Only need for manual installation rm %{buildroot}%{perl_vendorlib}/Ocsinventory/postinst.pl %clean rm -rf %{buildroot} %files %defattr(-, root, root, -) %doc AUTHORS Changes LICENSE README THANKS README.RPM %lang(fr) %doc README.RPM.fr %{perl_vendorlib}/Ocsinventory %{_sbindir}/%{name} %dir %{_localstatedir}/log/%{name} %dir %{_localstatedir}/lib/%{name} %dir %{_sysconfdir}/ocsinventory %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/ocsinventory/%{name}.cfg %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_sysconfdir}/cron.hourly/%{name} %{_mandir}/man1/%{name}.* %changelog * Fri Mar 7 2008 Remi Collet 0.0.8.2-0.5.20080305 - patches from review (Patrice Dumas) * Wed Mar 5 2008 Remi Collet 0.0.8.2-0.4.20080305 - update to 2008-03-05 - add /etc/sysconfig/ocsinventory-agent config file for cron job * Mon Mar 3 2008 Remi Collet 0.0.8.2-0.3.20080302 - only enable cron when server is configured * Sun Mar 2 2008 Remi Collet 0.0.8.2-0.2.20080302 - from Review, see #435593 * Sun Mar 2 2008 Remi Collet 0.0.8.2-0.1.20080302 - update to 0.0.8.2 from CVS * Fri Feb 22 2008 Remi Collet 0.0.8.2-0.1.20080222 - update to 0.0.8.2 from CVS * Sun Feb 17 2008 Remi Collet 0.0.8.1-0.1.20080217 - update to 0.0.8.1 from CVS - change config file used from /etc/ocsinventory-agent/ocsinv.conf to /etc/ocsinventory/ocsinventory-agent.cfg * Sat Jan 26 2008 Remi Collet 0.0.7-1 - update to 0.0.7 * Sat Dec 28 2007 Remi Collet 0.0.6.2-1 - update to 0.0.6.2 * Mon Apr 16 2007 Remi Collet 0.0.6-1 - update to 0.0.6 * Sat Feb 10 2007 Remi Collet 0.0.5-0.20070409 - cvs update 20070409 - create cron.daily file - create logrotate.d file - create ocsinv.conf - cvs update 20070405 - cvs update 20070403 * Sat Feb 10 2007 Remi Collet 0.0.2-0.20070210 - initial spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ocsinventory-agent/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2008 19:37:02 -0000 1.1 +++ .cvsignore 8 Mar 2008 20:09:11 -0000 1.2 @@ -0,0 +1 @@ +Ocsinventory-Agent-cvs.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ocsinventory-agent/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2008 19:37:02 -0000 1.1 +++ sources 8 Mar 2008 20:09:11 -0000 1.2 @@ -0,0 +1 @@ +13152620c60690d563c318097800c04a Ocsinventory-Agent-cvs.tgz From fedora-extras-commits at redhat.com Sat Mar 8 20:10:12 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 8 Mar 2008 20:10:12 GMT Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec, 1.44, 1.45 wpa_supplicant.sysconfig, 1.4, 1.5 Message-ID: <200803082010.m28KACAL011354@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/wpa_supplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11320 Modified Files: wpa_supplicant.spec wpa_supplicant.sysconfig Log Message: * Sat Mar 8 2008 Dan Williams - 1:0.6.3-4 - Fix log file path in service config file Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- wpa_supplicant.spec 6 Mar 2008 22:51:39 -0000 1.44 +++ wpa_supplicant.spec 8 Mar 2008 20:09:35 -0000 1.45 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.6.3 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -147,6 +147,9 @@ %{_bindir}/wpa_gui %changelog +* Sat Mar 8 2008 Dan Williams - 1:0.6.3-4 +- Fix log file path in service config file + * Thu Mar 6 2008 Dan Williams - 1:0.6.3-3 - Don't start the supplicant by default when installed (rh #436380) Index: wpa_supplicant.sysconfig =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.sysconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wpa_supplicant.sysconfig 6 Dec 2007 23:40:35 -0000 1.4 +++ wpa_supplicant.sysconfig 8 Mar 2008 20:09:35 -0000 1.5 @@ -9,4 +9,4 @@ # Other arguments # -u Enable the D-Bus interface (required for use with NetworkManager) # -f Log to /var/log/wpa_supplicant.log -OTHER_ARGS="-u -f" +OTHER_ARGS="-u -f /var/log/wpa_supplicant.log" From fedora-extras-commits at redhat.com Sat Mar 8 20:13:22 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 8 Mar 2008 20:13:22 GMT Subject: rpms/ocsinventory-agent/devel ocsinventory-agent.spec,1.1,1.2 Message-ID: <200803082013.m28KDMS2011527@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/ocsinventory-agent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11480 Modified Files: ocsinventory-agent.spec Log Message: typo Index: ocsinventory-agent.spec =================================================================== RCS file: /cvs/extras/rpms/ocsinventory-agent/devel/ocsinventory-agent.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ocsinventory-agent.spec 8 Mar 2008 20:09:11 -0000 1.1 +++ ocsinventory-agent.spec 8 Mar 2008 20:12:49 -0000 1.2 @@ -11,7 +11,7 @@ #Source0: http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz # cvs -z3 -d:pserver:anonymous at ocsinventory.cvs.sourceforge.net:/cvsroot/ocsinventory co -D "2008-03-05" -P unified_unix_agent -# tar cvzf /home/extras/SOURCES/Ocsinventory-Agent-cvs.tgz --exclude CVS unified_unix_agent +# tar cvzf Ocsinventory-Agent-cvs.tgz --exclude CVS unified_unix_agent Release: 0.5.20080305%{?dist}%{?ocstag:.%{ocstag}} Source0: Ocsinventory-Agent-cvs.tgz From fedora-extras-commits at redhat.com Sat Mar 8 20:13:36 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 8 Mar 2008 20:13:36 GMT Subject: rpms/wpa_supplicant/F-8 wpa_supplicant-0.5.10-default-log-file.patch, NONE, 1.1 wpa_supplicant.spec, 1.46, 1.47 wpa_supplicant.sysconfig, 1.5, 1.6 Message-ID: <200803082013.m28KDa2S011541@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/wpa_supplicant/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11501 Modified Files: wpa_supplicant.spec wpa_supplicant.sysconfig Added Files: wpa_supplicant-0.5.10-default-log-file.patch Log Message: * Sat Mar 8 2008 Dan Williams - 0.5.10-4 - Fix log file path in service config file wpa_supplicant-0.5.10-default-log-file.patch: --- NEW FILE wpa_supplicant-0.5.10-default-log-file.patch --- diff -up wpa_supplicant-0.5.10/main.c.default-log wpa_supplicant-0.5.10/main.c --- wpa_supplicant-0.5.10/main.c.default-log 2008-03-08 15:02:45.000000000 -0500 +++ wpa_supplicant-0.5.10/main.c 2008-03-08 15:05:27.000000000 -0500 @@ -67,7 +67,7 @@ static void usage(void) " -d = increase debugging verbosity (-dd even more)\n" " -D = driver name\n" #ifdef CONFIG_DEBUG_FILE - " -f = log output to debug file instead of stdout\n" + " -f = log output to debug file instead of stdout (default: /var/log/wpa_supplicant.log)\n" #endif /* CONFIG_DEBUG_FILE */ " -g = global ctrl_interface\n" " -K = include keys (passwords, etc.) in debug output\n" @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) wpa_supplicant_fd_workaround(); for (;;) { - c = getopt(argc, argv, "b:Bc:C:D:df:g:hi:KLNp:P:qtuvwW"); + c = getopt(argc, argv, "b:Bc:C:D:df::g:hi:KLNp:P:qtuvwW"); if (c < 0) break; switch (c) { @@ -178,7 +178,10 @@ int main(int argc, char *argv[]) #endif /* CONFIG_NO_STDOUT_DEBUG */ #ifdef CONFIG_DEBUG_FILE case 'f': - params.wpa_debug_file_path = optarg; + if (!optarg) + params.wpa_debug_file_path = "/var/log/wpa_supplicant.log"; + else + params.wpa_debug_file_path = optarg; break; #endif /* CONFIG_DEBUG_FILE */ case 'g': Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- wpa_supplicant.spec 6 Mar 2008 22:50:45 -0000 1.46 +++ wpa_supplicant.spec 8 Mar 2008 20:12:58 -0000 1.47 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.5.10 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -20,6 +20,7 @@ Patch3: wpa_supplicant-0.5.7-flush-debug-output.patch Patch4: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch Patch5: wpa_supplicant-0.5.10-dbus-service-file.patch +Patch6: wpa_supplicant-0.5.10-default-log-file.patch URL: http://w1.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +54,7 @@ %patch3 -p1 -b .flush-debug-output %patch4 -p1 -b .use-IW_ENCODE_TEMP %patch5 -p1 -b .dbus-service-file +%patch6 -p1 -b .default-log-file %build cp %{SOURCE1} ./.config @@ -141,6 +143,9 @@ %{_bindir}/wpa_gui %changelog +* Sat Mar 8 2008 Dan Williams - 0.5.10-4 +- Fix log file path in service config file + * Thu Mar 6 2008 Dan Williams - 0.5.10-3 - Don't start the supplicant by default when installed (rh #436380) Index: wpa_supplicant.sysconfig =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.sysconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wpa_supplicant.sysconfig 3 Dec 2007 19:03:45 -0000 1.5 +++ wpa_supplicant.sysconfig 8 Mar 2008 20:12:58 -0000 1.6 @@ -9,4 +9,4 @@ # Other arguments # -u Enable the D-Bus interface (required for use with NetworkManager) # -f Log to /var/log/wpa_supplicant.log -OTHER_ARGS="-u -f" +OTHER_ARGS="-u -f /var/log/wpa_supplicant.log" From fedora-extras-commits at redhat.com Sat Mar 8 20:20:59 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Sat, 8 Mar 2008 20:20:59 GMT Subject: rpms/kernel/devel patch-2.6.25-rc4-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.776, 1.777 kernel.spec, 1.484, 1.485 sources, 1.736, 1.737 upstream, 1.658, 1.659 linux-2.6-ia32-syscall-restart-ptrace64.patch, 1.1, NONE patch-2.6.25-rc4-git2.bz2.sign, 1.1, NONE Message-ID: <200803082020.m28KKxk2011832@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11793 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.25-rc4-git3.bz2.sign Removed Files: linux-2.6-ia32-syscall-restart-ptrace64.patch patch-2.6.25-rc4-git2.bz2.sign Log Message: * Sat Mar 8 2008 Chuck Ebbert - 2.6.25-rc4-git3 --- NEW FILE patch-2.6.25-rc4-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBH0kOlyGugalF9Dw4RAh1eAJkBFTCmgECIHO5jrn4YHy4TgMO+3wCeLNT0 qsm8dq7UKf9YGbFAHC8tYds= =Flkm -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.776 retrieving revision 1.777 diff -u -r1.776 -r1.777 --- .cvsignore 7 Mar 2008 17:35:11 -0000 1.776 +++ .cvsignore 8 Mar 2008 20:20:22 -0000 1.777 @@ -5,4 +5,4 @@ kernel-2.6.24 linux-2.6.24.tar.bz2 patch-2.6.25-rc4.bz2 -patch-2.6.25-rc4-git2.bz2 +patch-2.6.25-rc4-git3.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.484 retrieving revision 1.485 diff -u -r1.484 -r1.485 --- kernel.spec 7 Mar 2008 23:10:01 -0000 1.484 +++ kernel.spec 8 Mar 2008 20:20:23 -0000 1.485 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 4 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -581,7 +581,6 @@ Patch75: linux-2.6-x86-debug-boot.patch Patch80: linux-2.6-ia32-syscall-restart.patch -Patch81: linux-2.6-ia32-syscall-restart-ptrace64.patch Patch123: linux-2.6-ppc-rtc.patch Patch140: linux-2.6-ps3-ehci-iso.patch @@ -1014,7 +1013,6 @@ ApplyPatch linux-2.6-x86-tune-generic.patch ApplyPatch linux-2.6-ia32-syscall-restart.patch -ApplyPatch linux-2.6-ia32-syscall-restart-ptrace64.patch # # PowerPC @@ -1754,6 +1752,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Sat Mar 8 2008 Chuck Ebbert +- 2.6.25-rc4-git3 + * Fri Mar 7 2008 Roland McGrath - x86_64: fix 32-bit process syscall restart via 64-bit ptrace (#436183) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.736 retrieving revision 1.737 diff -u -r1.736 -r1.737 --- sources 7 Mar 2008 17:35:11 -0000 1.736 +++ sources 8 Mar 2008 20:20:23 -0000 1.737 @@ -1,3 +1,3 @@ 3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2 a4cc0fd5bda60e498246b6d69c873895 patch-2.6.25-rc4.bz2 -c5ef4bb448856fd4aa88f4444c7ebdf9 patch-2.6.25-rc4-git2.bz2 +3798c3ab4cd019dc4877b6ce21b1cd87 patch-2.6.25-rc4-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.658 retrieving revision 1.659 diff -u -r1.658 -r1.659 --- upstream 7 Mar 2008 17:35:11 -0000 1.658 +++ upstream 8 Mar 2008 20:20:23 -0000 1.659 @@ -1,3 +1,3 @@ linux-2.6.24.tar.bz2 patch-2.6.25-rc4.bz2 -patch-2.6.25-rc4-git2.bz2 +patch-2.6.25-rc4-git3.bz2 --- linux-2.6-ia32-syscall-restart-ptrace64.patch DELETED --- --- patch-2.6.25-rc4-git2.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Sat Mar 8 20:21:38 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 8 Mar 2008 20:21:38 GMT Subject: rpms/mediawiki-openid/F-7 mediawiki-openid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803082021.m28KLcba011873@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/mediawiki-openid/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11821/F-7 Modified Files: .cvsignore sources Added Files: mediawiki-openid.spec Log Message: first package builds --- NEW FILE mediawiki-openid.spec --- Summary: The OpenID extension for MediaWiki Name: mediawiki-openid Version: 0.7.0 Release: 5 License: GPLv2+ Group: Development/Tools URL: http://www.mediawiki.org/wiki/Extension:OpenID #Source0: http://wikitravel.org/software/MediaWiki-OpenID-%{version}.tar.gz # svn export http://svn.wikimedia.org/svnroot/mediawiki/tags/extensions/OpenID/REL0_7_0 MediaWiki-OpenID-%{version} # tar -jpcf MediaWiki-OpenID-%{version}.tar.bz2 MediaWiki-OpenID-%{version} Source0: MediaWiki-OpenID-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: mediawiki, php-pear-Auth-OpenID, php-pear-Services-Yadis %description This extension lets users log in with an OpenID instead of a username and password. An OpenID is a special URL that people can use to log in to a Web site. The extension also lets users who have an account on the wiki log in to other OpenID-aware Web sites with their wiki user page as their OpenID. %prep %setup -q -n MediaWiki-OpenID-%{version} cat >> README.1st < - 0.7.0-5 - Move *.sql to %%doc. - move part of %%description to a README.1st file. - add empty %%build. * Thu Nov 29 2007 Axel Thimm - 0.7.0-4 - Update to 0.7.0 (Peter Lemenkov (lemenkov at gmail.com)). * Thu Feb 1 2007 Axel Thimm - 0.6.1-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki-openid/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2008 19:31:25 -0000 1.1 +++ .cvsignore 8 Mar 2008 20:20:58 -0000 1.2 @@ -0,0 +1 @@ +MediaWiki-OpenID-0.7.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki-openid/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2008 19:31:25 -0000 1.1 +++ sources 8 Mar 2008 20:20:58 -0000 1.2 @@ -0,0 +1 @@ +498b174500f51b509bbb58f8d54a2928 MediaWiki-OpenID-0.7.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 20:21:43 2008 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 8 Mar 2008 20:21:43 GMT Subject: rpms/mediawiki-openid/F-8 mediawiki-openid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803082021.m28KLh6p011879@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/mediawiki-openid/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11821/F-8 Modified Files: .cvsignore sources Added Files: mediawiki-openid.spec Log Message: first package builds --- NEW FILE mediawiki-openid.spec --- Summary: The OpenID extension for MediaWiki Name: mediawiki-openid Version: 0.7.0 Release: 5 License: GPLv2+ Group: Development/Tools URL: http://www.mediawiki.org/wiki/Extension:OpenID #Source0: http://wikitravel.org/software/MediaWiki-OpenID-%{version}.tar.gz # svn export http://svn.wikimedia.org/svnroot/mediawiki/tags/extensions/OpenID/REL0_7_0 MediaWiki-OpenID-%{version} # tar -jpcf MediaWiki-OpenID-%{version}.tar.bz2 MediaWiki-OpenID-%{version} Source0: MediaWiki-OpenID-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: mediawiki, php-pear-Auth-OpenID, php-pear-Services-Yadis %description This extension lets users log in with an OpenID instead of a username and password. An OpenID is a special URL that people can use to log in to a Web site. The extension also lets users who have an account on the wiki log in to other OpenID-aware Web sites with their wiki user page as their OpenID. %prep %setup -q -n MediaWiki-OpenID-%{version} cat >> README.1st < - 0.7.0-5 - Move *.sql to %%doc. - move part of %%description to a README.1st file. - add empty %%build. * Thu Nov 29 2007 Axel Thimm - 0.7.0-4 - Update to 0.7.0 (Peter Lemenkov (lemenkov at gmail.com)). * Thu Feb 1 2007 Axel Thimm - 0.6.1-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki-openid/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2008 19:31:25 -0000 1.1 +++ .cvsignore 8 Mar 2008 20:21:08 -0000 1.2 @@ -0,0 +1 @@ +MediaWiki-OpenID-0.7.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki-openid/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2008 19:31:25 -0000 1.1 +++ sources 8 Mar 2008 20:21:08 -0000 1.2 @@ -0,0 +1 @@ +498b174500f51b509bbb58f8d54a2928 MediaWiki-OpenID-0.7.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 20:27:25 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 8 Mar 2008 20:27:25 GMT Subject: rpms/goffice/devel .cvsignore, 1.6, 1.7 goffice.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200803082027.m28KRPGX012156@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/goffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12131 Modified Files: .cvsignore goffice.spec sources Log Message: * Sat Mar 8 2008 Hans de Goede 0.6.2-1 - New upstream version 0.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 25 Jan 2008 23:10:17 -0000 1.6 +++ .cvsignore 8 Mar 2008 20:26:51 -0000 1.7 @@ -1 +1 @@ -goffice-0.6.1.tar.bz2 +goffice-0.6.2.tar.bz2 Index: goffice.spec =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/goffice.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- goffice.spec 19 Feb 2008 08:32:23 -0000 1.16 +++ goffice.spec 8 Mar 2008 20:26:51 -0000 1.17 @@ -1,6 +1,6 @@ Name: goffice -Version: 0.6.1 -Release: 2%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Goffice support libraries Group: System Environment/Libraries # bug filed upstream about this being GPL v2 only: @@ -73,6 +73,9 @@ %changelog +* Sat Mar 8 2008 Hans de Goede 0.6.2-1 +- New upstream version 0.6.2 + * Tue Feb 19 2008 Fedora Release Engineering - 0.6.1-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Jan 2008 23:10:17 -0000 1.6 +++ sources 8 Mar 2008 20:26:51 -0000 1.7 @@ -1 +1 @@ -faa72fc615f34b4da8c72d06420f5260 goffice-0.6.1.tar.bz2 +f52d78cffbcfc3c13336fd308ea3926e goffice-0.6.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 20:28:04 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 8 Mar 2008 20:28:04 GMT Subject: rpms/gnumeric/devel .cvsignore, 1.6, 1.7 gnumeric.spec, 1.37, 1.38 sources, 1.6, 1.7 Message-ID: <200803082028.m28KS4gv012242@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12164 Modified Files: .cvsignore gnumeric.spec sources Log Message: * Sat Mar 8 2008 Hans de Goede 1:1.8.2-1 - New upstream release 1.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 25 Jan 2008 23:14:28 -0000 1.6 +++ .cvsignore 8 Mar 2008 20:27:30 -0000 1.7 @@ -1 +1 @@ -gnumeric-1.8.1.tar.bz2 +gnumeric-1.8.2.tar.bz2 Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gnumeric.spec 19 Feb 2008 08:31:32 -0000 1.37 +++ gnumeric.spec 8 Mar 2008 20:27:30 -0000 1.38 @@ -1,7 +1,7 @@ Name: gnumeric Epoch: 1 -Version: 1.8.1 -Release: 2%{?dist} +Version: 1.8.2 +Release: 1%{?dist} Summary: Spreadsheet program for GNOME Group: Applications/Productivity # bug filed upstream about this being GPL v2 only: @@ -187,6 +187,9 @@ %changelog +* Sat Mar 8 2008 Hans de Goede 1:1.8.2-1 +- New upstream release 1.8.2 + * Tue Feb 19 2008 Fedora Release Engineering - 1:1.8.1-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 25 Jan 2008 16:29:18 -0000 1.6 +++ sources 8 Mar 2008 20:27:30 -0000 1.7 @@ -1 +1 @@ -a80ae52484b07d772297dcde6c0dab47 gnumeric-1.8.1.tar.bz2 +f60edc6ca42daa2fb3717f3c90fa8a6e gnumeric-1.8.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 8 20:28:48 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 8 Mar 2008 20:28:48 GMT Subject: rpms/scummvm/devel scummvm-0.11.1-lure-sound-bug-fixes.patch, NONE, 1.1 scummvm-0.11.1-lure-sound-channel-alloc.patch, NONE, 1.1 scummvm-0.11.1-lure-volume-fixes.patch, NONE, 1.1 scummvm.spec, 1.11, 1.12 Message-ID: <200803082028.m28KSmUo012322@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12285 Modified Files: scummvm.spec Added Files: scummvm-0.11.1-lure-sound-bug-fixes.patch scummvm-0.11.1-lure-sound-channel-alloc.patch scummvm-0.11.1-lure-volume-fixes.patch Log Message: * Sat Mar 8 2008 Hans de Goede 0.11.1-2 - Various bugfixes to lure sound support - Enable libfluidsynth support scummvm-0.11.1-lure-sound-bug-fixes.patch: --- NEW FILE scummvm-0.11.1-lure-sound-bug-fixes.patch --- diff -up scummvm-0.11.1/engines/lure/sound.cpp.fix scummvm-0.11.1/engines/lure/sound.cpp --- scummvm-0.11.1/engines/lure/sound.cpp.fix 2008-03-08 09:47:40.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.cpp 2008-03-08 09:47:50.000000000 +0100 @@ -52,7 +52,7 @@ SoundManager::SoundManager() { _isRoland = midiDriver != MD_ADLIB; _nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")); - Common::set_to(_channelsInUse, _channelsInUse+NUM_CHANNELS_OUTER, false); + Common::set_to(_channelsInUse, _channelsInUse+NUM_CHANNELS, false); _driver = MidiDriver::createMidi(midiDriver); int statusCode = _driver->open(); @@ -64,7 +64,7 @@ SoundManager::SoundManager() { if (_nativeMT32) _driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); - for (index = 0; index < NUM_CHANNELS_INNER; ++index) { + for (index = 0; index < NUM_CHANNELS; ++index) { _channelsInner[index].midiChannel = _driver->allocateChannel(); _channelsInner[index].isMusic = false; _channelsInner[index].volume = game.sfxVolume(); @@ -174,7 +174,7 @@ void SoundManager::killSounds() { // Clear the active sounds _activeSounds.clear(); - Common::set_to(_channelsInUse, _channelsInUse+NUM_CHANNELS_OUTER, false); + Common::set_to(_channelsInUse, _channelsInUse+NUM_CHANNELS, false); } void SoundManager::addSound(uint8 soundIndex, bool tidyFlag) { @@ -189,28 +189,16 @@ void SoundManager::addSound(uint8 soundI return; SoundDescResource &rec = soundDescs()[soundIndex]; - int numChannels = 2; //(rec.numChannels >> 2) & 3; + int numChannels = 4; //(rec.numChannels >> 2) & 3; - int channelCtr = 0; - while (channelCtr <= (NUM_CHANNELS_OUTER - numChannels)) { + int channelCtr; + for (channelCtr = 0; channelCtr < NUM_CHANNELS; channelCtr += 4) { if (!_channelsInUse[channelCtr]) { - bool foundSpace = true; - - int channelCtr2 = 1; - while (channelCtr2 < numChannels) { - foundSpace = !_channelsInUse[channelCtr + channelCtr2]; - if (!foundSpace) break; - ++channelCtr2; - } - - if (foundSpace) - break; + break; } - - ++channelCtr; } - if (channelCtr > NUM_CHANNELS_OUTER - numChannels) { + if (channelCtr >= NUM_CHANNELS) { // No channels free debugC(ERROR_BASIC, kLureDebugSounds, "SoundManager::addSound - no channels free"); return; @@ -226,21 +214,20 @@ void SoundManager::addSound(uint8 soundI newEntry->flags = rec.flags; newEntry->volume = rec.volume; _activeSounds.push_back(newEntry); - - // Map each two channels to four of the 16 available channels - byte innerChannel = (channelCtr / 2) * 4; - musicInterface_Play(rec.soundNumber, innerChannel); - setVolume(rec.soundNumber, rec.volume); + + musicInterface_Play(rec.soundNumber, channelCtr); + musicInterface_SetVolume(channelCtr, rec.volume); } void SoundManager::addSound2(uint8 soundIndex) { debugC(ERROR_BASIC, kLureDebugSounds, "SoundManager::addSound2 index=%d", soundIndex); tidySounds(); - if (soundIndex == 6) + if (soundIndex == 6) { // Chinese torture - addSound(6); - else { + stopSound(6); // sometimes its still playing when restarted + addSound(6, false); + } else { SoundDescResource &descEntry = soundDescs()[soundIndex]; SoundDescResource *rec = findSound(descEntry.soundNumber); if (rec == NULL) @@ -274,7 +261,7 @@ void SoundManager::setVolume(uint8 sound void SoundManager::setVolume(uint8 volume) { debugC(ERROR_BASIC, kLureDebugSounds, "SoundManager::setVolume volume=%d", volume); - for (int index = 0; index < NUM_CHANNELS_INNER; ++index) { + for (int index = 0; index < NUM_CHANNELS; ++index) { _channelsInner[index].midiChannel->volume(volume); _channelsInner[index].volume = volume; } @@ -316,7 +303,7 @@ void SoundManager::tidySounds() { while (i != _activeSounds.end()) { SoundDescResource *rec = *i; - if (musicInterface_CheckPlaying(rec->soundNumber & 0x7f)) + if (musicInterface_CheckPlaying(rec->soundNumber)) // Still playing, so move to next entry ++i; else { @@ -355,7 +342,7 @@ void SoundManager::restoreSounds() { Common::set_to(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, true); musicInterface_Play(rec->soundNumber, rec->channel); - musicInterface_SetVolume(rec->soundNumber, rec->volume); + musicInterface_SetVolume(rec->channel, rec->volume); } ++i; @@ -423,7 +410,7 @@ void SoundManager::musicInterface_Play(u uint8 *soundStart = _soundData->data() + dataOfs; uint32 dataSize; - if (soundNumber == _soundsTotal - 1) + if (soundNum == _soundsTotal - 1) dataSize = _soundData->size() - dataOfs; else { uint32 nextDataOfs = READ_LE_UINT32(_soundData->data() + (soundNum + 1) * 4 + 2); @@ -431,7 +418,7 @@ void SoundManager::musicInterface_Play(u } g_system->lockMutex(_soundMutex); - MidiMusic *sound = new MidiMusic(_driver, _channelsInner, channelNumber, soundNumber, + MidiMusic *sound = new MidiMusic(_driver, _channelsInner, channelNumber, soundNum, isMusic, soundStart, dataSize); sound->setVolume(volume); _playingSounds.push_back(sound); @@ -574,7 +561,7 @@ void SoundManager::doTimer() { /*------------------------------------------------------------------------*/ -MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS_INNER], +MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], uint8 channelNum, uint8 soundNum, bool isMusic, void *soundData, uint32 size) { Game &game = Game::getReference(); _driver = driver; @@ -684,7 +671,7 @@ void MidiMusic::send(uint32 b) { byte channel = _channelNumber + ((byte)(b & 0x0F) % _numChannels); #endif - if ((channel >= NUM_CHANNELS_INNER) || (_channels[channel].midiChannel == NULL)) + if ((channel >= NUM_CHANNELS) || (_channels[channel].midiChannel == NULL)) return; if ((b & 0xFFF0) == 0x07B0) { diff -up scummvm-0.11.1/engines/lure/sound.h.fix scummvm-0.11.1/engines/lure/sound.h --- scummvm-0.11.1/engines/lure/sound.h.fix 2008-03-08 09:47:40.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.h 2008-03-08 09:47:50.000000000 +0100 @@ -35,8 +35,7 @@ class MidiParser; namespace Lure { -#define NUM_CHANNELS_OUTER 8 -#define NUM_CHANNELS_INNER 16 +#define NUM_CHANNELS 16 struct ChannelEntry { MidiChannel *midiChannel; @@ -66,7 +65,7 @@ private: bool _passThrough; public: - MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS_INNER], + MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], uint8 channelNum, uint8 soundNum, bool isMusic, void *soundData, uint32 size); ~MidiMusic(); void setVolume(int volume); @@ -112,8 +111,8 @@ private: MidiDriver *_driver; ManagedList _activeSounds; ManagedList _playingSounds; - ChannelEntry _channelsInner[NUM_CHANNELS_INNER]; - bool _channelsInUse[NUM_CHANNELS_OUTER]; + ChannelEntry _channelsInner[NUM_CHANNELS]; + bool _channelsInUse[NUM_CHANNELS]; bool _isPlaying; bool _nativeMT32; bool _isRoland; scummvm-0.11.1-lure-sound-channel-alloc.patch: --- NEW FILE scummvm-0.11.1-lure-sound-channel-alloc.patch --- diff -up scummvm-0.11.1/engines/lure/sound.h.alloc scummvm-0.11.1/engines/lure/sound.h --- scummvm-0.11.1/engines/lure/sound.h.alloc 2008-03-08 21:13:28.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.h 2008-03-08 21:13:37.000000000 +0100 @@ -66,7 +66,7 @@ private: public: MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], - uint8 channelNum, uint8 soundNum, bool isMusic, void *soundData, uint32 size); + uint8 channelNum, uint8 soundNum, bool isMusic, uint8 numChannels, void *soundData, uint32 size); ~MidiMusic(); void setVolume(int volume); int getVolume() { return _volume; } @@ -152,7 +152,7 @@ public: // The following methods implement the external sound player module void musicInterface_Initialise(); - void musicInterface_Play(uint8 soundNumber, uint8 channelNumber); + void musicInterface_Play(uint8 soundNumber, uint8 channelNumber, uint8 numChannels=4); void musicInterface_Stop(uint8 soundNumber); bool musicInterface_CheckPlaying(uint8 soundNumber); void musicInterface_SetVolume(uint8 channelNum, uint8 volume); diff -up scummvm-0.11.1/engines/lure/sound.cpp.alloc scummvm-0.11.1/engines/lure/sound.cpp --- scummvm-0.11.1/engines/lure/sound.cpp.alloc 2008-03-08 21:13:28.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.cpp 2008-03-08 21:13:37.000000000 +0100 @@ -189,16 +189,24 @@ void SoundManager::addSound(uint8 soundI return; SoundDescResource &rec = soundDescs()[soundIndex]; - int numChannels = 4; //(rec.numChannels >> 2) & 3; + int numChannels; - int channelCtr; - for (channelCtr = 0; channelCtr < NUM_CHANNELS; channelCtr += 4) { - if (!_channelsInUse[channelCtr]) { + if (_isRoland) + numChannels = (rec.numChannels & 3) + 1; + else + numChannels = ((rec.numChannels >> 2) & 3) + 1; + + int channelCtr, channelCtr2; + for (channelCtr = 0; channelCtr <= (NUM_CHANNELS-numChannels); channelCtr ++) { + for (channelCtr2 = 0; channelCtr2 < numChannels; channelCtr2++) + if (_channelsInUse[channelCtr+channelCtr2]) + break; + + if (channelCtr2 == numChannels) break; - } } - if (channelCtr >= NUM_CHANNELS) { + if (channelCtr > (NUM_CHANNELS-numChannels)) { // No channels free debugC(ERROR_BASIC, kLureDebugSounds, "SoundManager::addSound - no channels free"); return; @@ -218,7 +226,7 @@ void SoundManager::addSound(uint8 soundI newEntry->volume = 240; /* 255 causes clipping with adlib */ _activeSounds.push_back(newEntry); - musicInterface_Play(rec.soundNumber, channelCtr); + musicInterface_Play(rec.soundNumber, channelCtr, numChannels); musicInterface_SetVolume(channelCtr, newEntry->volume); } @@ -335,7 +343,7 @@ void SoundManager::restoreSounds() { if ((rec->numChannels != 0) && ((rec->flags & SF_RESTORE) != 0)) { Common::set_to(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, true); - musicInterface_Play(rec->soundNumber, rec->channel); + musicInterface_Play(rec->soundNumber, rec->channel, rec->numChannels); musicInterface_SetVolume(rec->channel, rec->volume); } @@ -377,7 +385,7 @@ void SoundManager::fadeOut() { // musicInterface_Play // Play the specified sound -void SoundManager::musicInterface_Play(uint8 soundNumber, uint8 channelNumber) { +void SoundManager::musicInterface_Play(uint8 soundNumber, uint8 channelNumber, uint8 numChannels) { debugC(ERROR_INTERMEDIATE, kLureDebugSounds, "musicInterface_Play soundNumber=%d, channel=%d", soundNumber, channelNumber); Game &game = Game::getReference(); @@ -413,7 +421,7 @@ void SoundManager::musicInterface_Play(u g_system->lockMutex(_soundMutex); MidiMusic *sound = new MidiMusic(_driver, _channelsInner, channelNumber, soundNum, - isMusic, soundStart, dataSize); + isMusic, numChannels, soundStart, dataSize); _playingSounds.push_back(sound); g_system->unlockMutex(_soundMutex); } @@ -555,14 +563,14 @@ void SoundManager::doTimer() { /*------------------------------------------------------------------------*/ MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], - uint8 channelNum, uint8 soundNum, bool isMusic, void *soundData, uint32 size) { + uint8 channelNum, uint8 soundNum, bool isMusic, uint8 numChannels, void *soundData, uint32 size) { _driver = driver; _channels = channels; _soundNumber = soundNum; _channelNumber = channelNum; _isMusic = isMusic; - _numChannels = 4; + _numChannels = numChannels; _volume = 0; for (int i = 0; i < _numChannels; ++i) { /* 90 is power on default for midi compliant devices */ scummvm-0.11.1-lure-volume-fixes.patch: --- NEW FILE scummvm-0.11.1-lure-volume-fixes.patch --- diff -up scummvm-0.11.1/engines/lure/sound.cpp.volume scummvm-0.11.1/engines/lure/sound.cpp --- scummvm-0.11.1/engines/lure/sound.cpp.volume 2008-03-08 19:34:23.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.cpp 2008-03-08 21:10:03.000000000 +0100 @@ -66,8 +66,8 @@ SoundManager::SoundManager() { for (index = 0; index < NUM_CHANNELS; ++index) { _channelsInner[index].midiChannel = _driver->allocateChannel(); - _channelsInner[index].isMusic = false; - _channelsInner[index].volume = game.sfxVolume(); + /* 90 is power on default for midi compliant devices */ + _channelsInner[index].volume = 90; } } } @@ -212,11 +212,14 @@ void SoundManager::addSound(uint8 soundI newEntry->channel = channelCtr; newEntry->numChannels = numChannels; newEntry->flags = rec.flags; - newEntry->volume = rec.volume; + if (_isRoland) + newEntry->volume = rec.volume; + else /* resource volumes do not seem to work well with our adlib emu */ + newEntry->volume = 240; /* 255 causes clipping with adlib */ _activeSounds.push_back(newEntry); musicInterface_Play(rec.soundNumber, channelCtr); - musicInterface_SetVolume(channelCtr, rec.volume); + musicInterface_SetVolume(channelCtr, newEntry->volume); } void SoundManager::addSound2(uint8 soundIndex) { @@ -258,15 +261,6 @@ void SoundManager::setVolume(uint8 sound musicInterface_SetVolume(entry->channel, volume); } -void SoundManager::setVolume(uint8 volume) { - debugC(ERROR_BASIC, kLureDebugSounds, "SoundManager::setVolume volume=%d", volume); - - for (int index = 0; index < NUM_CHANNELS; ++index) { - _channelsInner[index].midiChannel->volume(volume); - _channelsInner[index].volume = volume; - } -} - uint8 SoundManager::descIndexOf(uint8 soundNumber) { SoundDescResource *rec = soundDescs(); @@ -420,7 +414,6 @@ void SoundManager::musicInterface_Play(u g_system->lockMutex(_soundMutex); MidiMusic *sound = new MidiMusic(_driver, _channelsInner, channelNumber, soundNum, isMusic, soundStart, dataSize); - sound->setVolume(volume); _playingSounds.push_back(sound); g_system->unlockMutex(_soundMutex); } @@ -563,19 +556,19 @@ void SoundManager::doTimer() { MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], uint8 channelNum, uint8 soundNum, bool isMusic, void *soundData, uint32 size) { - Game &game = Game::getReference(); _driver = driver; _channels = channels; _soundNumber = soundNum; _channelNumber = channelNum; + _isMusic = isMusic; _numChannels = 4; _volume = 0; for (int i = 0; i < _numChannels; ++i) { - _channels[_channelNumber + i].isMusic = isMusic; - _channels[_channelNumber + i].volume = isMusic ? game.musicVolume() : game.sfxVolume(); + /* 90 is power on default for midi compliant devices */ + _channels[_channelNumber + i].volume = 90; } - setVolume(0xff); + setVolume(240); /* 255 causes clipping with mastervol 192 and adlib */ _passThrough = false; @@ -633,10 +626,14 @@ void MidiMusic::setVolume(int volume) { _volume = volume; + Game &game = Game::getReference(); + volume *= _isMusic ? game.musicVolume() : game.sfxVolume(); + for (int i = 0; i < _numChannels; ++i) { if (_channels[_channelNumber + i].midiChannel != NULL) _channels[_channelNumber + i].midiChannel->volume( - _channels[_channelNumber + i].volume * _volume / 255); + _channels[_channelNumber + i].volume * + volume / 65025); } } @@ -675,10 +672,12 @@ void MidiMusic::send(uint32 b) { return; if ((b & 0xFFF0) == 0x07B0) { - // Adjust volume changes by master volume + // Adjust volume changes by song and master volume byte volume = (byte)((b >> 16) & 0x7F); _channels[channel].volume = volume; - volume = volume * _volume / 255; + Game &game = Game::getReference(); + int master_volume = _isMusic ? game.musicVolume() : game.sfxVolume(); + volume = volume * _volume * master_volume / 65025; b = (b & 0xFF00FFFF) | (volume << 16); } else if ((b & 0xF0) == 0xC0) { if (Sound.isRoland() && !Sound.hasNativeMT32()) { diff -up scummvm-0.11.1/engines/lure/sound.h.volume scummvm-0.11.1/engines/lure/sound.h --- scummvm-0.11.1/engines/lure/sound.h.volume 2008-03-08 19:34:28.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.h 2008-03-08 20:37:45.000000000 +0100 @@ -39,7 +39,6 @@ namespace Lure { struct ChannelEntry { MidiChannel *midiChannel; - bool isMusic; uint8 volume; }; @@ -55,6 +54,7 @@ private: MidiDriver *_driver; MidiParser *_parser; ChannelEntry *_channels; + bool _isMusic; bool _isPlaying; void queueUpdatePos(); @@ -138,7 +138,6 @@ public: void stopSound(uint8 soundIndex); void killSound(uint8 soundNumber); void setVolume(uint8 soundNumber, uint8 volume); - void setVolume(uint8 volume); void tidySounds(); uint8 descIndexOf(uint8 soundNumber); SoundDescResource *findSound(uint8 soundNumber); Index: scummvm.spec =================================================================== RCS file: /cvs/extras/rpms/scummvm/devel/scummvm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scummvm.spec 2 Mar 2008 21:46:21 -0000 1.11 +++ scummvm.spec 8 Mar 2008 20:28:15 -0000 1.12 @@ -1,6 +1,6 @@ Name: scummvm Version: 0.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interpreter for several adventure games Group: Applications/Emulators License: GPLv2+ @@ -10,9 +10,12 @@ Source1: scummvm-icons.tar.gz Patch0: scummvm-0.11.0-nostrip.patch Patch1: scummvm-0.9.1-no-execstack.patch +Patch2: scummvm-0.11.1-lure-sound-bug-fixes.patch +Patch3: scummvm-0.11.1-lure-volume-fixes.patch +Patch4: scummvm-0.11.1-lure-sound-channel-alloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel libvorbis-devel flac-devel zlib-devel -BuildRequires: desktop-file-utils +BuildRequires: fluidsynth-devel desktop-file-utils %ifarch %{ix86} BuildRequires: nasm %endif @@ -33,6 +36,9 @@ %setup -q -a 1 %patch0 -p1 -b .nostrip %patch1 -p1 -b .execstack +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \ dists/%{name}.desktop @@ -45,7 +51,7 @@ # The disables are so that these don't accidently get build in when rebuilding # on a system with the necesarry deps installed ./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \ - --datadir=%{_datadir} --disable-mpeg2 --disable-mad --disable-fluidsynth + --datadir=%{_datadir} --disable-mpeg2 --disable-mad make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" @@ -104,6 +110,10 @@ %changelog +* Sat Mar 8 2008 Hans de Goede 0.11.1-2 +- Various bugfixes to lure sound support +- Enable libfluidsynth support + * Sat Mar 1 2008 Hans de Goede 0.11.1-1 - New upstream version 0.11.1 From fedora-extras-commits at redhat.com Sat Mar 8 20:36:52 2008 From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb)) Date: Sat, 8 Mar 2008 20:36:52 GMT Subject: rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.901-libpciaccess.patch, 1.6, 1.7 xorg-x11-drv-openchrome.spec, 1.14, 1.15 Message-ID: <200803082036.m28KaqM8012559@cvs-int.fedora.redhat.com> Author: xavierb Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12531 Modified Files: openchrome-0.2.901-libpciaccess.patch xorg-x11-drv-openchrome.spec Log Message: - Yet another revision of the libpciaccess patch. openchrome-0.2.901-libpciaccess.patch: Index: openchrome-0.2.901-libpciaccess.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.901-libpciaccess.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- openchrome-0.2.901-libpciaccess.patch 7 Mar 2008 15:14:26 -0000 1.6 +++ openchrome-0.2.901-libpciaccess.patch 8 Mar 2008 20:36:47 -0000 1.7 @@ -56,9 +56,174 @@ AM_CONDITIONAL(DEBUG, test x$DEBUG = xyes) if test "$DEBUG" = yes; then AC_DEFINE(HAVE_DEBUG,1,[Enable debug support]) -diff -Naur src/via_driver.c src/via_driver.c +diff -Naur src/via_driver.h src/via_driver.h +--- src/via_driver.h 2008-01-02 19:01:32.000000000 +0100 ++++ src/via_driver.h 2008-01-10 12:20:18.000000000 +0100 +@@ -66,6 +66,10 @@ + #include "via_dmabuffer.h" + #include "via_3d.h" + ++#ifdef XSERVER_LIBPCIACCESS ++#include ++#endif ++ + #ifdef XF86DRI + #define _XF86DRI_SERVER_ + #include "sarea.h" +@@ -234,8 +238,15 @@ + int agpMem; + + CloseScreenProcPtr CloseScreen; +- pciVideoPtr PciInfo; +- PCITAG PciTag; ++ #if XSERVER_LIBPCIACCESS ++ struct pci_device *PciInfo; ++ int mmio_bar; ++ int fb_bar; ++ PCITAG PciTag; ++ #else ++ pciVideoPtr PciInfo; ++ PCITAG PciTag; ++ #endif + int Chipset; + int ChipId; + int ChipRev; +diff -Naur src/via_dri.c src/via_dri.c +--- src/via_dri.c 2007-06-14 22:45:45.000000000 +0200 ++++ src/via_dri.c 2008-01-10 12:20:18.000000000 +0100 +@@ -111,9 +111,15 @@ + + pVIADRI->irqEnabled = drmGetInterruptFromBusID + (pVia->drmFD, ++#if XSERVER_LIBPCIACCESS ++ ((pVia->PciInfo->domain << 8) | pVia->PciInfo->bus), ++ pVia->PciInfo->dev, pVia->PciInfo->func ++#else + ((pciConfigPtr)pVia->PciInfo->thisCard)->busnum, + ((pciConfigPtr)pVia->PciInfo->thisCard)->devnum, +- ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum); ++ ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum ++#endif ++ ); + if ((drmCtlInstHandler(pVia->drmFD, pVIADRI->irqEnabled))) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "[drm] Failure adding irq handler. " +@@ -677,9 +683,15 @@ + pDRIInfo->clientDriverName = VIAClientDriverName; + pDRIInfo->busIdString = xalloc(64); + sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d", ++#if XSERVER_LIBPCIACCESS ++ ((pVia->PciInfo->domain << 8) | pVia->PciInfo->bus), ++ pVia->PciInfo->dev, pVia->PciInfo->func ++#else + ((pciConfigPtr)pVia->PciInfo->thisCard)->busnum, + ((pciConfigPtr)pVia->PciInfo->thisCard)->devnum, +- ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum); ++ ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum ++#endif ++ ); + pDRIInfo->ddxDriverMajorVersion = VIA_DRIDDX_VERSION_MAJOR; + pDRIInfo->ddxDriverMinorVersion = VIA_DRIDDX_VERSION_MINOR; + pDRIInfo->ddxDriverPatchVersion = VIA_DRIDDX_VERSION_PATCH; +diff -Naur src/via.h src/via.h +--- src/via.h 2007-09-10 22:51:07.000000000 +0200 ++++ src/via.h 2008-01-10 12:20:18.000000000 +0100 +@@ -25,7 +25,7 @@ + #ifndef _VIA_H_ + #define _VIA_H_ 1 + +-#include "xorgVersion.h" ++//#include "xorgVersion.h" + + #include + #include +@@ -664,4 +664,20 @@ + + #define VBE_DEFAULT_REFRESH 6000 + ++#if XSERVER_LIBPCIACCESS ++#define VIA_MEMBASE(p,n) (p)->regions[(n)].base_addr ++#define VENDOR_ID(p) (p)->vendor_id ++#define DEVICE_ID(p) (p)->device_id ++#define SUBVENDOR_ID(p) (p)->subvendor_id ++#define SUBSYS_ID(p) (p)->subdevice_id ++#define CHIP_REVISION(p) (p)->revision ++#else ++#define VIA_MEMBASE(p,n) (p)->memBase[n] ++#define VENDOR_ID(p) (p)->vendor ++#define DEVICE_ID(p) (p)->chipType ++#define SUBVENDOR_ID(p) (p)->subsysVendor ++#define SUBSYS_ID(p) (p)->subsysCard ++#define CHIP_REVISION(p) (p)->chipRev ++#endif ++ + #endif /* _VIA_H_ */ +diff -Naur ChangeLog ChangeLog +--- ChangeLog 2008-01-02 19:31:02.000000000 +0100 ++++ ChangeLog 2008-01-10 12:20:18.000000000 +0100 +@@ -1,3 +1,21 @@ ++2008-03-06 Jon Nettleton ++ ++ * src/via.h: ++ * src/via_driver.c: (VIAPreInit): ++ * src/via_id.c: (ViaCheckCardId): ++ ++ Switched ViaCheckCardId to use the macros defined in ++ via.h. This allows it to work with libpciaccess enabled ++ xorg servers as well as legacy versions. ++ ++2007-12-31 Jon Nettleton ++ ++ * src/via_driver.c: (VIAPreInit), (VIAMapMMIO): ++ ++ Finally got a chance to work some more on libpciaccess. ++ Memory detection is still not 100% proper but should be ++ more functional and working at least. ++ + 2007-10-29 Benno Schulenberg + + * src/via_driver.c: (VIAPreInit): +--- src/via_id.c 2008-03-06 20:30:31.000000000 +0100 ++++ src/via_id.c 2008-03-06 22:25:29.000000000 +0100 +@@ -30,6 +30,7 @@ + #endif + + #include "via_driver.h" ++#include "via.h" + #include "via_id.h" + + /* +@@ -218,15 +218,15 @@ + struct ViaCardIdStruct *Id; + VIAPtr pVia = VIAPTR(pScrn); + +- if ((pVia->PciInfo->subsysVendor == pVia->PciInfo->vendor) && +- (pVia->PciInfo->subsysCard == pVia->PciInfo->chipType)) ++ if ((SUBVENDOR_ID(pVia->PciInfo) == VENDOR_ID(pVia->PciInfo)) && ++ (SUBSYS_ID(pVia->PciInfo) == DEVICE_ID(pVia->PciInfo))) + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Manufacturer plainly copied main PCI IDs to subsystem/card IDs.\n"); + + for (Id = ViaCardId; Id->String; Id++) { + if ((Id->Chip == pVia->Chipset) && +- (Id->Vendor == pVia->PciInfo->subsysVendor) && +- (Id->Device == pVia->PciInfo->subsysCard)) { ++ (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) && ++ (Id->Device == SUBSYS_ID(pVia->PciInfo))) { + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s.\n", Id->String); + pVia->Id = Id; + return; +@@ -235,7 +235,7 @@ + + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unknown Card-Ids (%4X|%4X|%4X); please report to openchrome-users at openchrome.org\n", +- pVia->PciInfo->chipType, pVia->PciInfo->subsysVendor, pVia->PciInfo->subsysCard); ++ DEVICE_ID(pVia->PciInfo), SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo)); + pVia->Id = NULL; + } + --- src/via_driver.c 2008-01-02 18:58:40.000000000 +0100 -+++ src/via_driver.c 2008-01-10 12:37:37.000000000 +0100 ++++ src/via_driver.c 2008-03-07 22:39:15.000000000 +0100 @@ -50,7 +50,30 @@ /* Prototypes. */ @@ -193,7 +358,7 @@ + { + scrn->driverVersion = VIA_VERSION; + scrn->driverName = DRIVER_NAME; -+ scrn->name = "VIA"; ++ scrn->name = "CHROME"; + scrn->Probe = NULL; + + entity = xf86GetEntityInfo (entity_num); @@ -269,157 +434,52 @@ } if (pVia->Chipset == VIA_CLE266) -@@ -961,52 +1074,6 @@ - - xf86DrvMsg(pScrn->scrnIndex, from, "Chipset revision: %d\n", pVia->ChipRev); - -- xfree(pEnt); -- -- /* Detect the amount of installed RAM */ -- from = X_PROBED; -- switch (pVia->Chipset) { -- case VIA_CLE266: -- case VIA_KM400: -- pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ; -- break; -- case VIA_PM800: -- case VIA_VM800: -- case VIA_K8M800: -- pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ; -- break; -- case VIA_K8M890: -- case VIA_P4M890: -- case VIA_P4M900: -- case VIA_CX700: -- pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ; -- break; -- default: -- if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "Using old memory-detection method.\n"); -- bMemSize = hwp->readSeq(hwp, 0x39); -- if (bMemSize > 16 && bMemSize <= 128) -- pScrn->videoRam = (bMemSize + 1) << 9; -- else if (bMemSize > 0 && bMemSize < 31) -- pScrn->videoRam = bMemSize << 12; -- else { -- from = X_DEFAULT; -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "Memory size detection failed: using 16 MB.\n"); -- pScrn->videoRam = 16 << 10; -- } -- } else { -- from = X_DEFAULT; -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "No memory-detection done. Use VideoRAM option.\n"); -- } -- } -- -- if (from == X_PROBED) -- xf86DrvMsg(pScrn->scrnIndex, from, -- "Probed amount of VideoRAM = %d kB\n", pScrn->videoRam); -- - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Setting up default chipset options...\n"); - if (!VIASetupDefaultOptions(pScrn)) { -@@ -1019,9 +1086,16 @@ - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Starting to parse config file options...\n"); - -- if (xf86GetOptValInteger(VIAOptions, OPTION_VIDEORAM, &pScrn->videoRam)) -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "Setting amount of VideoRAM to %d kB\n", pScrn->videoRam); -+ pScrn->videoRam = pEnt->device->videoRam; -+ from = xf86GetOptValInteger(VIAOptions, OPTION_VIDEORAM, -+ &pScrn->videoRam) ? -+ X_CONFIG : X_PROBED; -+ xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM is set to %d kB\n", -+ pScrn->videoRam); -+ if (pScrn->videoRam != pEnt->device->videoRam) -+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -+ "Detected VideoRAM was %d kB!\n", pEnt->device->videoRam); -+ xfree(pEnt); - - //pVia->shadowFB = FALSE; - from = xf86GetOptValBool(VIAOptions, OPTION_SHADOW_FB, &pVia->shadowFB) ? -@@ -1378,8 +1452,10 @@ - - /* maybe throw in some more sanity checks here */ - -+#if !XSERVER_LIBPCIACCESS - pVia->PciTag = pciTag(pVia->PciInfo->bus, pVia->PciInfo->device, - pVia->PciInfo->func); -+#endif - - if (!VIAMapMMIO(pScrn)) { - VIAFreeRec(pScrn); -@@ -1440,6 +1518,65 @@ - return FALSE; - } - -+ from = X_PROBED; -+ -+ /* Detect the amount of installed RAM */ -+ switch (pVia->Chipset) { -+ case VIA_CLE266: -+ case VIA_KM400: +@@ -968,18 +1081,33 @@ + switch (pVia->Chipset) { + case VIA_CLE266: + case VIA_KM400: +#if XSERVER_LIBPCIACCESS + pci_device_cfg_read_u32 (bridge, & pScrn->videoRam, 0xE1); + pScrn->videoRam = (1 << ( ( pScrn->videoRam & 0x70) >> 4 )) << 10 ; +#else -+ pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ; -+ break; + pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ; +#endif -+ case VIA_PM800: -+ case VIA_VM800: -+ case VIA_K8M800: + break; + case VIA_PM800: + case VIA_VM800: + case VIA_K8M800: +#if XSERVER_LIBPCIACCESS + pci_device_cfg_read_u32 (bridge, & pScrn->videoRam, 0xA1); + pScrn->videoRam = (1 << ( ( pScrn->videoRam & 0x70) >> 4 )) << 10 ; +#else -+ pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ; -+ break; + pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ; +#endif -+ case VIA_K8M890: -+ case VIA_P4M900: -+ case VIA_CX700: + break; + case VIA_K8M890: + case VIA_P4M890: + case VIA_P4M900: + case VIA_CX700: +#if XSERVER_LIBPCIACCESS + pci_device_cfg_read_u32 (bridge, & pScrn->videoRam, 0xA1); + pScrn->videoRam = (1 << ( ( pScrn->videoRam & 0x70) >> 4 )) << 12 ; +#else -+ pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ; -+ break; + pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ; ++#endif + break; + default: + if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) { +@@ -1378,8 +1506,10 @@ + + /* maybe throw in some more sanity checks here */ + ++#if !XSERVER_LIBPCIACCESS + pVia->PciTag = pciTag(pVia->PciInfo->bus, pVia->PciInfo->device, + pVia->PciInfo->func); +#endif -+ default: -+ if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) { -+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -+ "Using old memory-detection method."); -+ bMemSize = hwp->readSeq(hwp, 0x39); -+ if (bMemSize > 16 && bMemSize <= 128) -+ pScrn->videoRam = (bMemSize + 1) << 9; -+ else if (bMemSize > 0 && bMemSize < 31) -+ pScrn->videoRam = bMemSize << 12; -+ else { -+ from = X_DEFAULT; -+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -+ "Memory size detection failed: using 16 MB.\n"); -+ pScrn->videoRam = 16 << 10; -+ } -+ } else { -+ from = X_DEFAULT; -+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -+ "No memory-detection done. Use VideoRAM option."); -+ } -+ } -+ -+ if (from == X_PROBED) -+ xf86DrvMsg(pScrn->scrnIndex, from, "Probed VideoRAM = %d kB\n", -+ pScrn->videoRam); -+ - /* Split FB for SAMM */ - /* FIXME: For now, split FB into two equal sections. This should - * be able to be adjusted by user with a config option. */ -@@ -2046,26 +2183,74 @@ + + if (!VIAMapMMIO(pScrn)) { + VIAFreeRec(pScrn); +@@ -2046,26 +2176,74 @@ VIAMapMMIO(ScrnInfoPtr pScrn) { VIAPtr pVia = VIAPTR(pScrn); @@ -499,7 +559,7 @@ if (!pVia->MapBase || !pVia->BltBase) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -@@ -2111,6 +2296,9 @@ +@@ -2111,6 +2289,9 @@ VIAMapFB(ScrnInfoPtr pScrn) { VIAPtr pVia = VIAPTR(pScrn); @@ -509,7 +569,7 @@ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAMapFB\n")); xf86DrvMsg(pScrn->scrnIndex, X_PROBED, -@@ -2125,6 +2313,7 @@ +@@ -2125,6 +2306,7 @@ * in the OS support layer. */ @@ -517,7 +577,7 @@ unsigned char *tmp; tmp = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pVia->PciTag, pVia->FrameBufferBase, -@@ -2143,10 +2332,24 @@ +@@ -2143,10 +2325,24 @@ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)tmp, pVia->videoRambytes); @@ -542,7 +602,7 @@ pVia->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, pVia->PciTag, pVia->FrameBufferBase, pVia->videoRambytes); -@@ -2156,6 +2359,7 @@ +@@ -2156,6 +2352,7 @@ "Internal error: could not map framebuffer\n"); return FALSE; } @@ -550,7 +610,7 @@ pVia->FBFreeStart = (pScrn->displayWidth * pScrn->bitsPerPixel >> 3) * pScrn->virtualY; -@@ -2166,7 +2370,11 @@ +@@ -2166,7 +2363,11 @@ pVia->FBBase, pVia->FBFreeStart, pVia->FBFreeEnd); } @@ -562,7 +622,7 @@ pScrn->fbOffset = 0; if(pVia->IsSecondary) pScrn->fbOffset = pScrn->videoRam << 10; -@@ -2184,6 +2392,16 @@ +@@ -2184,6 +2385,16 @@ /* Disable MMIO */ ViaSeqMask(VGAHWPTR(pScrn), 0x1A, 0x00, 0x60); @@ -579,7 +639,7 @@ if (pVia->MapBase) xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pVia->MapBase, VIA_MMIO_REGSIZE); -@@ -2192,6 +2410,7 @@ +@@ -2192,6 +2403,7 @@ if (pVia->FBBase) xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pVia->FBBase, pVia->videoRambytes); @@ -587,161 +647,3 @@ } static void -diff -Naur src/via_driver.h src/via_driver.h ---- src/via_driver.h 2008-01-02 19:01:32.000000000 +0100 -+++ src/via_driver.h 2008-01-10 12:20:18.000000000 +0100 -@@ -66,6 +66,10 @@ - #include "via_dmabuffer.h" - #include "via_3d.h" - -+#ifdef XSERVER_LIBPCIACCESS -+#include -+#endif -+ - #ifdef XF86DRI - #define _XF86DRI_SERVER_ - #include "sarea.h" -@@ -234,8 +238,15 @@ - int agpMem; - - CloseScreenProcPtr CloseScreen; -- pciVideoPtr PciInfo; -- PCITAG PciTag; -+ #if XSERVER_LIBPCIACCESS -+ struct pci_device *PciInfo; -+ int mmio_bar; -+ int fb_bar; -+ PCITAG PciTag; -+ #else -+ pciVideoPtr PciInfo; -+ PCITAG PciTag; -+ #endif - int Chipset; - int ChipId; - int ChipRev; -diff -Naur src/via_dri.c src/via_dri.c ---- src/via_dri.c 2007-06-14 22:45:45.000000000 +0200 -+++ src/via_dri.c 2008-01-10 12:20:18.000000000 +0100 -@@ -111,9 +111,15 @@ - - pVIADRI->irqEnabled = drmGetInterruptFromBusID - (pVia->drmFD, -+#if XSERVER_LIBPCIACCESS -+ ((pVia->PciInfo->domain << 8) | pVia->PciInfo->bus), -+ pVia->PciInfo->dev, pVia->PciInfo->func -+#else - ((pciConfigPtr)pVia->PciInfo->thisCard)->busnum, - ((pciConfigPtr)pVia->PciInfo->thisCard)->devnum, -- ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum); -+ ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum -+#endif -+ ); - if ((drmCtlInstHandler(pVia->drmFD, pVIADRI->irqEnabled))) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "[drm] Failure adding irq handler. " -@@ -677,9 +683,15 @@ - pDRIInfo->clientDriverName = VIAClientDriverName; - pDRIInfo->busIdString = xalloc(64); - sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d", -+#if XSERVER_LIBPCIACCESS -+ ((pVia->PciInfo->domain << 8) | pVia->PciInfo->bus), -+ pVia->PciInfo->dev, pVia->PciInfo->func -+#else - ((pciConfigPtr)pVia->PciInfo->thisCard)->busnum, - ((pciConfigPtr)pVia->PciInfo->thisCard)->devnum, -- ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum); -+ ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum -+#endif -+ ); - pDRIInfo->ddxDriverMajorVersion = VIA_DRIDDX_VERSION_MAJOR; - pDRIInfo->ddxDriverMinorVersion = VIA_DRIDDX_VERSION_MINOR; - pDRIInfo->ddxDriverPatchVersion = VIA_DRIDDX_VERSION_PATCH; -diff -Naur src/via.h src/via.h ---- src/via.h 2007-09-10 22:51:07.000000000 +0200 -+++ src/via.h 2008-01-10 12:20:18.000000000 +0100 -@@ -25,7 +25,7 @@ - #ifndef _VIA_H_ - #define _VIA_H_ 1 - --#include "xorgVersion.h" -+//#include "xorgVersion.h" - - #include - #include -@@ -664,4 +664,20 @@ - - #define VBE_DEFAULT_REFRESH 6000 - -+#if XSERVER_LIBPCIACCESS -+#define VIA_MEMBASE(p,n) (p)->regions[(n)].base_addr -+#define VENDOR_ID(p) (p)->vendor_id -+#define DEVICE_ID(p) (p)->device_id -+#define SUBVENDOR_ID(p) (p)->subvendor_id -+#define SUBSYS_ID(p) (p)->subdevice_id -+#define CHIP_REVISION(p) (p)->revision -+#else -+#define VIA_MEMBASE(p,n) (p)->memBase[n] -+#define VENDOR_ID(p) (p)->vendor -+#define DEVICE_ID(p) (p)->chipType -+#define SUBVENDOR_ID(p) (p)->subsysVendor -+#define SUBSYS_ID(p) (p)->subsysCard -+#define CHIP_REVISION(p) (p)->chipRev -+#endif -+ - #endif /* _VIA_H_ */ -diff -Naur ChangeLog ChangeLog ---- ChangeLog 2008-01-02 19:31:02.000000000 +0100 -+++ ChangeLog 2008-01-10 12:20:18.000000000 +0100 -@@ -1,3 +1,21 @@ -+2008-03-06 Jon Nettleton -+ -+ * src/via.h: -+ * src/via_driver.c: (VIAPreInit): -+ * src/via_id.c: (ViaCheckCardId): -+ -+ Switched ViaCheckCardId to use the macros defined in -+ via.h. This allows it to work with libpciaccess enabled -+ xorg servers as well as legacy versions. -+ -+2007-12-31 Jon Nettleton -+ -+ * src/via_driver.c: (VIAPreInit), (VIAMapMMIO): -+ -+ Finally got a chance to work some more on libpciaccess. -+ Memory detection is still not 100% proper but should be -+ more functional and working at least. -+ - 2007-10-29 Benno Schulenberg - - * src/via_driver.c: (VIAPreInit): ---- src/via_id.c 2008-03-06 20:30:31.000000000 +0100 -+++ src/via_id.c 2008-03-06 22:25:29.000000000 +0100 -@@ -218,15 +218,15 @@ - struct ViaCardIdStruct *Id; - VIAPtr pVia = VIAPTR(pScrn); - -- if ((pVia->PciInfo->subsysVendor == pVia->PciInfo->vendor) && -- (pVia->PciInfo->subsysCard == pVia->PciInfo->chipType)) -+ if ((SUBVENDOR_ID(pVia->PciInfo) == VENDOR_ID(pVia->PciInfo)) && -+ (SUBSYS_ID(pVia->PciInfo) == DEVICE_ID(pVia->PciInfo))) - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Manufacturer plainly copied main PCI IDs to subsystem/card IDs.\n"); - - for (Id = ViaCardId; Id->String; Id++) { - if ((Id->Chip == pVia->Chipset) && -- (Id->Vendor == pVia->PciInfo->subsysVendor) && -- (Id->Device == pVia->PciInfo->subsysCard)) { -+ (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) && -+ (Id->Device == SUBSYS_ID(pVia->PciInfo))) { - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s.\n", Id->String); - pVia->Id = Id; - return; -@@ -235,7 +235,7 @@ - - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Unknown Card-Ids (%4X|%4X|%4X); please report to openchrome-users at openchrome.org\n", -- pVia->PciInfo->chipType, pVia->PciInfo->subsysVendor, pVia->PciInfo->subsysCard); -+ DEVICE_ID(pVia->PciInfo), SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo)); - pVia->Id = NULL; - } - Index: xorg-x11-drv-openchrome.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xorg-x11-drv-openchrome.spec 7 Mar 2008 15:14:26 -0000 1.14 +++ xorg-x11-drv-openchrome.spec 8 Mar 2008 20:36:47 -0000 1.15 @@ -9,7 +9,7 @@ Summary: Xorg X11 openchrome video driver Name: xorg-x11-drv-openchrome Version: 0.2.901 -Release: 11%{?dist} +Release: 12%{?dist} URL: http://www.openchrome.org License: MIT Group: User Interface/X Hardware Support @@ -109,7 +109,10 @@ %changelog -* Thu Mar 07 2008 Xavier Bachelot - 0.2.901-11 +* Sat Mar 08 2008 Xavier Bachelot - 0.2.901-12 +- Yet another revision of the libpciaccess patch. + +* Fri Mar 07 2008 Xavier Bachelot - 0.2.901-11 - Fix a typo in libpciaccess patch. * Fri Mar 07 2008 Adam Jackson 0.2.901-10 From fedora-extras-commits at redhat.com Sat Mar 8 20:37:28 2008 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 8 Mar 2008 20:37:28 GMT Subject: rpms/ocsinventory-client/devel Makefile, 1.1, NONE ocsinventory-client.README, 1.2, NONE ocsinventory-client.README.fr, 1.2, NONE ocsinventory-client.patch, 1.2, NONE ocsinventory-client.spec, 1.11, NONE sources, 1.4, NONE Message-ID: <200803082037.m28KbSBN012626@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/ocsinventory-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12608 Removed Files: Makefile ocsinventory-client.README ocsinventory-client.README.fr ocsinventory-client.patch ocsinventory-client.spec sources Log Message: dead.package, obsoleted by ocsinventory-agent. --- Makefile DELETED --- --- ocsinventory-client.README DELETED --- --- ocsinventory-client.README.fr DELETED --- --- ocsinventory-client.patch DELETED --- --- ocsinventory-client.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Sat Mar 8 20:39:49 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 8 Mar 2008 20:39:49 GMT Subject: rpms/perl/devel perl-5.10.0-Archive-Extract-0.26.patch, NONE, 1.1 perl-5.10.0-Module-Load-Conditional-0.24.patch, NONE, 1.1 perl.spec, 1.155, 1.156 Message-ID: <200803082039.m28Kdnta012709@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12655 Modified Files: perl.spec Added Files: perl-5.10.0-Archive-Extract-0.26.patch perl-5.10.0-Module-Load-Conditional-0.24.patch Log Message: Update Archive::Extract to 0.26 Update Module::Load::Conditional to 0.24 Conditionalize reporting of multilib patch perl-5.10.0-Archive-Extract-0.26.patch: --- NEW FILE perl-5.10.0-Archive-Extract-0.26.patch --- diff -up perl-5.10.0/lib/Archive/Extract/t/01_Archive-Extract.t.BAD perl-5.10.0/lib/Archive/Extract/t/01_Archive-Extract.t --- perl-5.10.0/lib/Archive/Extract/t/01_Archive-Extract.t.BAD 2007-12-18 05:47:07.000000000 -0500 +++ perl-5.10.0/lib/Archive/Extract/t/01_Archive-Extract.t 2008-03-08 14:55:53.000000000 -0500 @@ -58,6 +58,7 @@ use_ok($Class); $Archive::Extract::VERBOSE = $Archive::Extract::VERBOSE = $Debug; $Archive::Extract::WARN = $Archive::Extract::WARN = $Debug ? 1 : 0; + my $tmpl = { ### plain files 'x.bz2' => { programs => [qw[bunzip2]], @@ -105,6 +106,11 @@ my $tmpl = { method => 'is_zip', outfile => 'a', }, + 'x.lzma' => { programs => [qw[unlzma]], + modules => [qw[Compress::unLZMA]], + method => 'is_lzma', + outfile => 'a', + }, ### with a directory 'y.tbz' => { programs => [qw[bunzip2 tar]], modules => [qw[Archive::Tar @@ -291,7 +297,7 @@ for my $switch (0,1) { ### where to extract to -- try both dir and file for gz files ### XXX test me! #my @outs = $ae->is_gz ? ($abs_path, $OutDir) : ($OutDir); - my @outs = $ae->is_gz || $ae->is_bz2 || $ae->is_Z + my @outs = $ae->is_gz || $ae->is_bz2 || $ae->is_Z || $ae->is_lzma ? ($abs_path) : ($OutDir); diff -up perl-5.10.0/lib/Archive/Extract.pm.BAD perl-5.10.0/lib/Archive/Extract.pm --- perl-5.10.0/lib/Archive/Extract.pm.BAD 2007-12-18 05:47:07.000000000 -0500 +++ perl-5.10.0/lib/Archive/Extract.pm 2008-03-08 14:55:15.000000000 -0500 @@ -28,14 +28,15 @@ use constant ZIP => 'zip'; use constant BZ2 => 'bz2'; use constant TBZ => 'tbz'; use constant Z => 'Z'; +use constant LZMA => 'lzma'; use vars qw[$VERSION $PREFER_BIN $PROGRAMS $WARN $DEBUG]; -$VERSION = '0.24'; +$VERSION = '0.26'; $PREFER_BIN = 0; $WARN = 1; $DEBUG = 0; -my @Types = ( TGZ, TAR, GZ, ZIP, BZ2, TBZ, Z ); # same as all constants +my @Types = ( TGZ, TAR, GZ, ZIP, BZ2, TBZ, Z, LZMA ); # same as all constants local $Params::Check::VERBOSE = $Params::Check::VERBOSE = 1; @@ -75,6 +76,7 @@ Archive::Extract - A generic archive ext $ae->is_zip; # is it a .zip file? $ae->is_bz2; # is it a .bz2 file? $ae->is_tbz; # is it a .tar.bz2 or .tbz file? + $ae->is_lzma; # is it a .lzma file? ### absolute path to the archive you provided ### $ae->archive; @@ -84,13 +86,14 @@ Archive::Extract - A generic archive ext $ae->bin_gzip # path to /bin/gzip, if found $ae->bin_unzip # path to /bin/unzip, if found $ae->bin_bunzip2 # path to /bin/bunzip2 if found + $ae->bin_unlzma # path to /bin/unlzma if found =head1 DESCRIPTION Archive::Extract is a generic archive extraction mechanism. It allows you to extract any archive file of the type .tar, .tar.gz, -.gz, .Z, tar.bz2, .tbz, .bz2 or .zip without having to worry how it +.gz, .Z, tar.bz2, .tbz, .bz2, .zip or .lzma without having to worry how it does so, or use different interfaces for each type by using either perl modules, or commandline tools on your system. @@ -101,7 +104,7 @@ See the C section further ### see what /bin/programs are available ### $PROGRAMS = {}; -for my $pgm (qw[tar unzip gzip bunzip2 uncompress]) { +for my $pgm (qw[tar unzip gzip bunzip2 uncompress unlzma]) { $PROGRAMS->{$pgm} = can_run($pgm); } @@ -114,6 +117,7 @@ my $Mapping = { is_tbz => '_untar', is_bz2 => '_bunzip2', is_Z => '_uncompress', + is_lzma => '_unlzma', }; { @@ -183,6 +187,11 @@ Corresponds to a C<.bz2> suffix. Bzip2 compressed tar file, as produced by, for exmample C. Corresponds to a C<.tbz> or C<.tar.bz2> suffix. +=item lzma + +Lzma compressed file, as produced by C. +Corresponds to a C<.lzma> suffix. + =back Returns a C object on success, or false on failure. @@ -209,6 +218,7 @@ Returns a C object on $ar =~ /.+?\.(?:tbz2?|tar\.bz2?)$/i ? TBZ : $ar =~ /.+?\.bz2$/i ? BZ2 : $ar =~ /.+?\.Z$/ ? Z : + $ar =~ /.+?\.lzma$/ ? LZMA : ''; } @@ -283,9 +293,9 @@ sub extract { ### to. my $dir; { ### a foo.gz file - if( $self->is_gz or $self->is_bz2 or $self->is_Z) { + if( $self->is_gz or $self->is_bz2 or $self->is_Z or $self->is_lzma ) { - my $cp = $self->archive; $cp =~ s/\.(?:gz|bz2?|Z)$//i; + my $cp = $self->archive; $cp =~ s/\.(?:gz|bz2?|Z|lzma)$//i; ### to is a dir? if ( -d $to ) { @@ -418,6 +428,11 @@ See the C method for details. Returns true if the file is of type C<.zip>. See the C method for details. +=head2 $ae->is_lzma + +Returns true if the file is of type C<.lzma>. +See the C method for details. + =cut ### quick check methods ### @@ -428,6 +443,7 @@ sub is_zip { return $_[0]->type eq ZIP sub is_tbz { return $_[0]->type eq TBZ } sub is_bz2 { return $_[0]->type eq BZ2 } sub is_Z { return $_[0]->type eq Z } +sub is_lzma { return $_[0]->type eq LZMA } =pod @@ -443,6 +459,10 @@ Returns the full path to your gzip binar Returns the full path to your unzip binary, if found +=head2 $ae->bin_unlzma + +Returns the full path to your unlzma binary, if found + =cut ### paths to commandline tools ### @@ -452,6 +472,8 @@ sub bin_tar { return $PROGRAMS-> sub bin_bunzip2 { return $PROGRAMS->{'bunzip2'} if $PROGRAMS->{'bunzip2'} } sub bin_uncompress { return $PROGRAMS->{'uncompress'} if $PROGRAMS->{'uncompress'} } +sub bin_unlzma { return $PROGRAMS->{'unlzma'} if $PROGRAMS->{'unlzma'} } + =head2 $bool = $ae->have_old_bunzip2 Older versions of C, from before the C release, @@ -478,8 +500,16 @@ sub have_old_bunzip2 { ### $ echo $? ### 1 ### HATEFUL! + + ### double hateful: bunzip2 --version also hangs if input is a pipe + ### See #32370: Archive::Extract will hang if stdin is a pipe [+PATCH] + ### So, we have to provide *another* argument which is a fake filename, + ### just so it wont try to read from stdin to print it's version.. + ### *sigh* + ### Even if the file exists, it won't clobber or change it. my $buffer; - scalar run( command => [$self->bin_bunzip2, '--version'], + scalar run( + command => [$self->bin_bunzip2, '--version', 'NoSuchFile'], verbose => 0, buffer => \$buffer ); @@ -499,7 +529,6 @@ sub have_old_bunzip2 { # ################################# - ### untar wrapper... goes to either Archive::Tar or /bin/tar ### depending on $PREFER_BIN sub _untar { @@ -1141,6 +1170,96 @@ sub _bunzip2_cz2 { ################################# # +# unlzma code +# +################################# + +### unlzma wrapper... goes to either Compress::unLZMA or /bin/unlzma +### depending on $PREFER_BIN +sub _unlzma { + my $self = shift; + + my @methods = qw[_unlzma_cz _unlzma_bin]; + @methods = reverse @methods if $PREFER_BIN; + + for my $method (@methods) { + $self->_extractor($method) && return 1 if $self->$method(); + } + + return $self->_error(loc("Unable to unlzma file '%1'", $self->archive)); +} + +sub _unlzma_bin { + my $self = shift; + + ### check for /bin/unlzma -- we need it ### + return $self->_error(loc("No '%1' program found", '/bin/unlzma')) + unless $self->bin_unlzma; + + my $fh = FileHandle->new('>'. $self->_gunzip_to) or + return $self->_error(loc("Could not open '%1' for writing: %2", + $self->_gunzip_to, $! )); + + my $cmd = [ $self->bin_unlzma, '-c', $self->archive ]; + + my $buffer; + unless( scalar run( command => $cmd, + verbose => $DEBUG, + buffer => \$buffer ) + ) { + return $self->_error(loc("Unable to unlzma '%1': %2", + $self->archive, $buffer)); + } + + ### no buffers available? + if( !IPC::Cmd->can_capture_buffer and !$buffer ) { + $self->_error( $self->_no_buffer_content( $self->archive ) ); + } + + print $fh $buffer if defined $buffer; + + close $fh; + + ### set what files where extract, and where they went ### + $self->files( [$self->_gunzip_to] ); + $self->extract_path( File::Spec->rel2abs(cwd()) ); + + return 1; +} + +sub _unlzma_cz { + my $self = shift; + + my $use_list = { 'Compress::unLZMA' => '0.0' }; + unless( can_load( modules => $use_list ) ) { + return $self->_error(loc("You do not have '%1' installed - Please " . + "install it as soon as possible.", 'Compress::unLZMA')); + } + + my $fh = FileHandle->new('>'. $self->_gunzip_to) or + return $self->_error(loc("Could not open '%1' for writing: %2", + $self->_gunzip_to, $! )); + + my $buffer; + $buffer = Compress::unLZMA::uncompressfile( $self->archive ); + unless ( defined $buffer ) { + return $self->_error(loc("Could not unlzma '%1': %2", + $self->archive, $@)); + } + + print $fh $buffer if defined $buffer; + + close $fh; + + ### set what files where extract, and where they went ### + $self->files( [$self->_gunzip_to] ); + $self->extract_path( File::Spec->rel2abs(cwd()) ); + + return 1; +} + +################################# +# # Error code # ################################# @@ -1208,7 +1327,7 @@ C will not be able to C can use either pure perl modules or command line programs under the hood. Some of the pure perl modules (like -C take the entire contents of the archive into memory, +C and Compress::unLZMA) take the entire contents of the archive into memory, which may not be feasible on your system. Consider setting the global variable C<$Archive::Extract::PREFER_BIN> to C<1>, which will prefer the use of command line programs and won't consume so much memory. perl-5.10.0-Module-Load-Conditional-0.24.patch: --- NEW FILE perl-5.10.0-Module-Load-Conditional-0.24.patch --- diff -up perl-5.10.0/lib/Module/Load/Conditional.pm.BAD perl-5.10.0/lib/Module/Load/Conditional.pm --- perl-5.10.0/lib/Module/Load/Conditional.pm.BAD 2007-12-18 05:47:07.000000000 -0500 +++ perl-5.10.0/lib/Module/Load/Conditional.pm 2008-03-08 15:26:18.000000000 -0500 @@ -9,7 +9,7 @@ use Locale::Maketext::Simple Style => ' use Carp (); use File::Spec (); use FileHandle (); -use version qw[qv]; +use version; use constant ON_VMS => $^O eq 'VMS'; @@ -18,7 +18,7 @@ BEGIN { $FIND_VERSION $ERROR $CHECK_INC_HASH]; use Exporter; @ISA = qw[Exporter]; - $VERSION = '0.22'; + $VERSION = '0.24'; $VERBOSE = 0; $FIND_VERSION = 1; $CHECK_INC_HASH = 0; @@ -280,8 +280,14 @@ sub check_install { ### use qv(), as it will deal with developer release number ### ie ones containing _ as well. This addresses bug report ### #29348: Version compare logic doesn't handle alphas? + ### + ### Update from JPeacock: apparently qv() and version->new + ### are different things, and we *must* use version->new + ### here, or things like #30056 might start happening $href->{uptodate} = - qv( $args->{version} ) <= qv( $href->{version} ) ? 1 : 0; + version->new( $args->{version} ) <= version->new( $href->{version} ) + ? 1 + : 0; } return $href; @@ -301,7 +307,8 @@ sub _parse_version { ### regex breaks under -T, we must modifiy it so ### it captures the entire expression, and eval /that/ ### rather than $_, which is insecure. - + my $taint_safe_str = do { $str =~ /(^.*$)/sm; $1 }; + if( $str =~ /(?new + ### are different things, and we *must* use version->new + ### here, or things like #30056 might start happening if ( !$args->{nocache} && defined $CACHE->{$mod}->{usable} - && (qv($CACHE->{$mod}->{version}||0) >= qv($href->{$mod})) + && (version->new( $CACHE->{$mod}->{version}||0 ) + >= version->new( $href->{$mod} ) ) ) { $error = loc( q[Already tried to use '%1', which was unsuccessful], $mod); last BLOCK; Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- perl.spec 8 Mar 2008 01:08:07 -0000 1.155 +++ perl.spec 8 Mar 2008 20:38:57 -0000 1.156 @@ -16,7 +16,7 @@ Name: perl Version: %{perl_version} -Release: 11%{?dist} +Release: 12%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -45,25 +45,31 @@ Patch5: perl-5.8.0-libdir64.patch # Fedora/RHEL specific (use libresolv instead of libbind) -Patch6: perl-5.8.6-libresolv.patch +Patch6: perl-5.8.6-libresolv.patch # FIXME: May need the "Fedora" references removed before upstreaming -Patch7: perl-5.10.0-USE_MM_LD_RUN_PATH.patch +Patch7: perl-5.10.0-USE_MM_LD_RUN_PATH.patch # Skip hostname tests, since hostname lookup isn't available in Fedora # buildroots by design. -Patch8: perl-5.10.0-disable_test_hosts.patch +Patch8: perl-5.10.0-disable_test_hosts.patch # Bump Sys::Syslog to 0.24 to fix test failure case -Patch9: perl-5.10.0-SysSyslog-0.24.patch +Patch9: perl-5.10.0-SysSyslog-0.24.patch # The Fedora builders started randomly failing this futime test # only on x86_64, so we just don't run it. Works fine on normal # systems. -Patch10: perl-5.10.0-x86_64-io-test-failure.patch +Patch10: perl-5.10.0-x86_64-io-test-failure.patch # http://public.activestate.com/cgi-bin/perlbrowse/p/32891 -Patch11: 32891.patch +Patch11: 32891.patch + +# Bump Archive::Extract to 0.26 for clean upgrade +Patch12: perl-5.10.0-Archive-Extract-0.26.patch + +# Update Module::Load::Conditional to 0.24 for clean upgrade +Patch13: perl-5.10.0-Module-Load-Conditional-0.24.patch BuildRoot: %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcsh, dos2unix, man, groff @@ -281,8 +287,7 @@ Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -# It's really 0.83_09, but we drop the _09. -Version: 0.83 +Version: 0.84 Requires: perl(IPC::Run) >= 0.79 Requires: perl(Module::Pluggable) >= 2.4 Requires: perl(Module::CoreList) @@ -376,8 +381,7 @@ Group: Development/Libraries License: GPL+ or Artistic Epoch: 0 -# Really 0.13_04, but we drop the _04. -Version: 0.13 +Version: 0.14 Requires: perl(IPC::Cmd) >= 0.36 Requires: perl(Module::Load::Conditional) >= 0.04 Requires: perl(Params::Check) >= 0.07 @@ -524,7 +528,7 @@ Group: Development/Languages License: GPL+ or Artistic Epoch: 0 -Version: 2.12 +Version: 2.13 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} Requires: perl(version) @@ -782,6 +786,8 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 # # Candidates for doc recoding (need case by case review): @@ -975,13 +981,17 @@ perl -x patchlevel.h 'Fedora Patch2: Removes date check, Fedora/RHEL specific' perl -x patchlevel.h 'Fedora Patch3: Fedora/RHEL use links instead of lynx' perl -x patchlevel.h 'Fedora Patch4: Work around annoying rpath issue' +%ifarch %{multilib_64_archs} perl -x patchlevel.h 'Fedora Patch5: support for libdir64' +%endif perl -x patchlevel.h 'Fedora Patch6: use libresolv instead of libbind' perl -x patchlevel.h 'Fedora Patch7: USE_MM_LD_RUN_PATH' perl -x patchlevel.h 'Fedora Patch8: Skip hostname tests, due to builders not being network capable' perl -x patchlevel.h 'Fedora Patch9: Update Sys::Syslog to 0.24' perl -x patchlevel.h 'Fedora Patch10: Dont run one io test due to random builder failures' perl -x patchlevel.h '32891 fix big slowdown in 5.10 @_ parameter passing' +perl -x patchlevel.h 'Fedora Patch12: Update Archive::Extract to 0.26' +perl -x patchlevel.h 'Fedora Patch13: Update Module::Load::Conditional to 0.24' %clean rm -rf $RPM_BUILD_ROOT @@ -1581,6 +1591,11 @@ # Old changelog entries are preserved in CVS. %changelog +* Fri Mar 7 2008 Tom "spot" Callaway 4:5.10.0-12 +- conditionalize multilib patch report in patchlevel.h +- Update Archive::Extract to 0.26 +- Update Module::Load::Conditional to 0.24 + * Fri Mar 7 2008 Tom "spot" Callaway 4:5.10.0-11 - only do it once, and do it for all our patches From fedora-extras-commits at redhat.com Sat Mar 8 20:52:10 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Sat, 8 Mar 2008 20:52:10 GMT Subject: rpms/openoffice.org/devel pseudoworkspace.valgrind1.patch, 1.27.2.1, 1.27.2.2 Message-ID: <200803082052.m28KqANc012963@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12942 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 pseudoworkspace.valgrind1.patch Log Message: adjust patch pseudoworkspace.valgrind1.patch: Index: pseudoworkspace.valgrind1.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v retrieving revision 1.27.2.1 retrieving revision 1.27.2.2 diff -u -r1.27.2.1 -r1.27.2.2 --- pseudoworkspace.valgrind1.patch 7 Mar 2008 14:32:38 -0000 1.27.2.1 +++ pseudoworkspace.valgrind1.patch 8 Mar 2008 20:52:05 -0000 1.27.2.2 @@ -1,18 +1,3 @@ -Index: source/dialog/numpages.cxx -=================================================================== -RCS file: /cvs/graphics/svx/source/dialog/numpages.cxx,v -retrieving revision 1.52 -diff -u -r1.52 numpages.cxx ---- openoffice.org.orig/svx/source/dialog/numpages.cxx 12 Oct 2006 12:19:44 -0000 1.52 -+++ openoffice.org/svx/source/dialog/numpages.cxx 5 Jan 2007 14:34:15 -0000 -@@ -2954,6 +2954,7 @@ - pActNum(0), - pSaveNum(0), - nActNumLvl( USHRT_MAX ), -+ bModified(false), bPreset(false), - nNumItemId(SID_ATTR_NUMBERING_RULE), - bInInintControl(FALSE) - { Index: source/ui/dialog/SwSpellDialogChildWindow.cxx =================================================================== RCS file: /cvs/sw/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx,v From fedora-extras-commits at redhat.com Sat Mar 8 20:55:30 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 8 Mar 2008 20:55:30 GMT Subject: rpms/python-eyed3/devel .cvsignore, 1.5, 1.6 python-eyed3.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200803082055.m28KtU2X013064@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/python-eyed3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13038 Modified Files: .cvsignore python-eyed3.spec sources Log Message: * Sat Mar 8 2008 Brian Pepple - 0.6.15-1 - Update to 0.6.15. - Update license tag. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-eyed3/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 May 2007 17:48:25 -0000 1.5 +++ .cvsignore 8 Mar 2008 20:54:54 -0000 1.6 @@ -1 +1 @@ -eyeD3-0.6.14.tar.gz +eyeD3-0.6.15.tar.gz Index: python-eyed3.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-eyed3/devel/python-eyed3.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-eyed3.spec 18 May 2007 17:48:25 -0000 1.6 +++ python-eyed3.spec 8 Mar 2008 20:54:54 -0000 1.7 @@ -1,12 +1,12 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-eyed3 -Version: 0.6.14 +Version: 0.6.15 Release: 1%{?dist} Summary: Python module for processing ID3 tags Group: Development/Languages -License: GPL +License: GPLv2+ URL: http://eyed3.nicfit.net/ Source0: http://eyed3.nicfit.net/releases/eyeD3-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +53,10 @@ %changelog +* Sat Mar 8 2008 Brian Pepple - 0.6.15-1 +- Update to 0.6.15. +- Update license tag. + * Fri May 18 2007 Brian Pepple - 0.6.14-1 - Update to 0.6.14. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-eyed3/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 May 2007 17:48:25 -0000 1.5 +++ sources 8 Mar 2008 20:54:54 -0000 1.6 @@ -1 +1 @@ -c4f81b3cbb72993244f27ab740abbccc eyeD3-0.6.14.tar.gz +4dad246be4ff711e3e8fb9812696b7d1 eyeD3-0.6.15.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 21:29:54 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 8 Mar 2008 21:29:54 GMT Subject: rpms/smolt/EL-5 smolt.spec,1.31,1.32 sources,1.20,1.21 Message-ID: <200803082129.m28LTsNE020675@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20607/EL-5 Modified Files: smolt.spec sources Log Message: upstream released new version Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/EL-5/smolt.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- smolt.spec 6 Mar 2008 04:19:20 -0000 1.31 +++ smolt.spec 8 Mar 2008 21:29:13 -0000 1.32 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 1.1.1 +Version: 1.1.1.1 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -173,6 +173,9 @@ %{_bindir}/smoltGui %changelog +* Sat Mar 08 2008 Mike McGrath - 1.1.1.1-1 +- Upstream released new version + * Wed Mar 05 2008 Mike McGrath - 1.1.1-1 - Upstream released new version - Manfiles added Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/EL-5/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 6 Mar 2008 04:19:20 -0000 1.20 +++ sources 8 Mar 2008 21:29:13 -0000 1.21 @@ -1 +1 @@ -7ec5dc8f7550be524dfd9467bb59f06c smolt-1.1.1.tar.gz +c723a6808de0954e8e3e9228c7c94946 smolt-1.1.1.1.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 21:29:58 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 8 Mar 2008 21:29:58 GMT Subject: rpms/smolt/F-7 smolt.spec,1.33,1.34 sources,1.21,1.22 Message-ID: <200803082129.m28LTwL0020679@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20607/F-7 Modified Files: smolt.spec sources Log Message: upstream released new version Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/F-7/smolt.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- smolt.spec 6 Mar 2008 04:19:30 -0000 1.33 +++ smolt.spec 8 Mar 2008 21:29:25 -0000 1.34 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 1.1.1 +Version: 1.1.1.1 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -173,6 +173,9 @@ %{_bindir}/smoltGui %changelog +* Sat Mar 08 2008 Mike McGrath - 1.1.1.1-1 +- Upstream released new version + * Wed Mar 05 2008 Mike McGrath - 1.1.1-1 - Upstream released new version - Manfiles added Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/F-7/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 6 Mar 2008 04:19:30 -0000 1.21 +++ sources 8 Mar 2008 21:29:25 -0000 1.22 @@ -1 +1 @@ -7ec5dc8f7550be524dfd9467bb59f06c smolt-1.1.1.tar.gz +c723a6808de0954e8e3e9228c7c94946 smolt-1.1.1.1.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 21:30:08 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 8 Mar 2008 21:30:08 GMT Subject: rpms/smolt/F-8 smolt.spec,1.41,1.42 sources,1.21,1.22 Message-ID: <200803082130.m28LU8bV020686@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/smolt/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20607/F-8 Modified Files: smolt.spec sources Log Message: upstream released new version Index: smolt.spec =================================================================== RCS file: /cvs/extras/rpms/smolt/F-8/smolt.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- smolt.spec 6 Mar 2008 04:19:34 -0000 1.41 +++ smolt.spec 8 Mar 2008 21:29:28 -0000 1.42 @@ -1,6 +1,6 @@ Name: smolt Summary: Fedora hardware profiler -Version: 1.1.1 +Version: 1.1.1.1 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -173,6 +173,9 @@ %{_bindir}/smoltGui %changelog +* Sat Mar 08 2008 Mike McGrath - 1.1.1.1-1 +- Upstream released new version + * Wed Mar 05 2008 Mike McGrath - 1.1.1-1 - Upstream released new version - Manfiles added Index: sources =================================================================== RCS file: /cvs/extras/rpms/smolt/F-8/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 6 Mar 2008 04:19:34 -0000 1.21 +++ sources 8 Mar 2008 21:29:28 -0000 1.22 @@ -1 +1 @@ -7ec5dc8f7550be524dfd9467bb59f06c smolt-1.1.1.tar.gz +c723a6808de0954e8e3e9228c7c94946 smolt-1.1.1.1.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 21:47:17 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Mar 2008 21:47:17 GMT Subject: rebuild-scripts bumpspecfile.py,1.9,1.10 Message-ID: <200803082147.m28LlHsG021046@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/rebuild-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21030 Modified Files: bumpspecfile.py Log Message: add GPL header Index: bumpspecfile.py =================================================================== RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bumpspecfile.py 27 Feb 2008 14:44:13 -0000 1.9 +++ bumpspecfile.py 8 Mar 2008 21:47:17 -0000 1.10 @@ -1,5 +1,19 @@ #!/usr/bin/python -t # -*- mode: Python; indent-tabs-mode: nil; -*- +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import errno, os, sys import re From fedora-extras-commits at redhat.com Sat Mar 8 21:47:50 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Mar 2008 21:47:50 GMT Subject: rebuild-scripts bumpspecfile.py,1.10,1.11 Message-ID: <200803082147.m28LloWD021078@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/rebuild-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21062 Modified Files: bumpspecfile.py Log Message: add -v/--verbose option Index: bumpspecfile.py =================================================================== RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bumpspecfile.py 8 Mar 2008 21:47:17 -0000 1.10 +++ bumpspecfile.py 8 Mar 2008 21:47:47 -0000 1.11 @@ -24,7 +24,9 @@ pass class SpecFile: - def __init__(self, filename): + def __init__(self, filename, verbose=False): + self.verbose = verbose + self.filename = filename f = open(filename,"r") self.lines = f.readlines() @@ -123,7 +125,8 @@ new = self.increaseMain(old) except BumpSpecError: new = self.increaseFallback(old) - self.debugdiff(old, new) + if self.verbose: + self.debugdiff(old, new) # group 0 is the full line that defines the release return match.group(0).replace(old, new) @@ -133,6 +136,7 @@ f.close() def debugdiff(self, old, new): + print self.filename print '-%s' % old print '+%s\n' % new @@ -143,6 +147,8 @@ help="changelog comment (default:- rebuilt)") parser.add_option("-u", "--userstring", default=None, help="user name+email string") + parser.add_option("-v", "--verbose", default=False, action='store_true', + help="more output") (opts, args) = parser.parse_args() userstring = os.getenv('RPM_PACKAGER') @@ -153,7 +159,7 @@ userstring = opts.userstring for aspec in args: - s = SpecFile(aspec) + s = SpecFile(aspec, opts.verbose) s.bumpRelease() s.writeFile(aspec) From fedora-extras-commits at redhat.com Sat Mar 8 21:48:40 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Mar 2008 21:48:40 GMT Subject: rebuild-scripts bumpspecfile.py,1.11,1.12 Message-ID: <200803082148.m28LmeYD021105@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/rebuild-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21089 Modified Files: bumpspecfile.py Log Message: try MAILTO env after RPM_PACKAGER env Index: bumpspecfile.py =================================================================== RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bumpspecfile.py 8 Mar 2008 21:47:47 -0000 1.11 +++ bumpspecfile.py 8 Mar 2008 21:48:40 -0000 1.12 @@ -153,9 +153,11 @@ userstring = os.getenv('RPM_PACKAGER') if not userstring and not opts.userstring: - print 'ERROR: Set $RPM_PACKAGER environment variable or use option -u!' - sys.exit(errno.EINVAL) - elif opts.userstring: + userstring = os.getenv('MAILTO') + if not userstring: + print 'ERROR: Set $RPM_PACKAGER environment variable or use option -u!' + sys.exit(errno.EINVAL) + if opts.userstring: userstring = opts.userstring for aspec in args: From fedora-extras-commits at redhat.com Sat Mar 8 21:50:37 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Mar 2008 21:50:37 GMT Subject: rebuild-scripts bumpspecfile.py,1.12,1.13 Message-ID: <200803082150.m28LobMI021158@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/rebuild-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21120 Modified Files: bumpspecfile.py Log Message: make one pattern case-incensitive release scheme usage statistics, Fedora development 2008-03-08: 1: 5472 2: 6 3: 10 4: 1 5: 19 Index: bumpspecfile.py =================================================================== RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bumpspecfile.py 8 Mar 2008 21:48:40 -0000 1.12 +++ bumpspecfile.py 8 Mar 2008 21:50:36 -0000 1.13 @@ -35,10 +35,9 @@ def bumpRelease(self): bump_patterns = [(re.compile(r"^Release:\s*(\d+.*)", re.I), self.increase), (re.compile(r"^%define\s+rel\s+(\d+.*)"), self.increase), - (re.compile(r"^%define\s+release\s+(\d+.*)"), self.increase), - (re.compile(r"^%define\s+RELEASE\s+(\d+.*)"), self.increase), + (re.compile(r"^%define\s+release\s+(\d+.*)", re.I), self.increase), + (re.compile(r"^Release:\s+%release_func\s+(\d+.*)"), self.increase), (re.compile(r"^%define\s+baserelease\s+(\d+.*)"), self.increase), - (re.compile(r"^Release:\s+%release_func\s+(\d+.*)"), self.increase) ] skip_pattern = re.compile(r"\$Revision:") for i in range(len(self.lines)): From fedora-extras-commits at redhat.com Sat Mar 8 21:51:11 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 21:51:11 GMT Subject: rpms/python-fpconst/EL-5 python-fpconst.spec,1.6,1.7 Message-ID: <200803082151.m28LpBC5021223@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21162/EL-5 Modified Files: python-fpconst.spec Log Message: oops Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/EL-5/python-fpconst.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-fpconst.spec 8 Mar 2008 20:02:32 -0000 1.6 +++ python-fpconst.spec 8 Mar 2008 21:50:38 -0000 1.7 @@ -2,7 +2,7 @@ Name: python-fpconst Version: 0.7.3 -Release: 3%{?dist} +Release: 3%{?dist}.1 Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages @@ -45,10 +45,12 @@ %{python_sitelib}/*.py %{python_sitelib}/*.pyc %{python_sitelib}/*.pyo -%{python_sitelib}/*.egg-info %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-3.1 +- Ooops, egg-info only applies to devel + * Sat Mar 08 2008 Christopher Stone 0.7.3-3 - Add egg-info to %%files From fedora-extras-commits at redhat.com Sat Mar 8 21:51:16 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 21:51:16 GMT Subject: rpms/python-fpconst/F-7 python-fpconst.spec,1.8,1.9 Message-ID: <200803082151.m28LpGAY021229@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21162/F-7 Modified Files: python-fpconst.spec Log Message: oops Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/F-7/python-fpconst.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-fpconst.spec 8 Mar 2008 20:02:36 -0000 1.8 +++ python-fpconst.spec 8 Mar 2008 21:50:42 -0000 1.9 @@ -2,7 +2,7 @@ Name: python-fpconst Version: 0.7.3 -Release: 3%{?dist} +Release: 3%{?dist}.1 Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages @@ -45,10 +45,12 @@ %{python_sitelib}/*.py %{python_sitelib}/*.pyc %{python_sitelib}/*.pyo -%{python_sitelib}/*.egg-info %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-3.1 +- Ooops, egg-info only applies to devel + * Sat Mar 08 2008 Christopher Stone 0.7.3-3 - Add egg-info to %%files From fedora-extras-commits at redhat.com Sat Mar 8 21:51:21 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Mar 2008 21:51:21 GMT Subject: rebuild-scripts bumpspecfile.py,1.13,1.14 Message-ID: <200803082151.m28LpLGM021255@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/rebuild-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21239 Modified Files: bumpspecfile.py Log Message: print spec filename in same line as WARNING msg Index: bumpspecfile.py =================================================================== RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- bumpspecfile.py 8 Mar 2008 21:50:36 -0000 1.13 +++ bumpspecfile.py 8 Mar 2008 21:51:21 -0000 1.14 @@ -73,14 +73,12 @@ if pre == '': if post.find('rc')>=0: - print 'WARNING: Bad pre-release versioning scheme!' - print self.filename + print 'WARNING: Bad pre-release versioning scheme:', self.filename raise BumpSpecError new = `value+1`+post else: if value == None or value > 10000: - print 'WARNING: Bad pre-release versioning scheme!' - print self.filename + print 'WARNING: Bad pre-release versioning scheme:', self.filename raise BumpSpecError new = '0.'+`value+1`+post return new From fedora-extras-commits at redhat.com Sat Mar 8 21:51:24 2008 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 8 Mar 2008 21:51:24 GMT Subject: rpms/python-fpconst/F-8 python-fpconst.spec,1.8,1.9 Message-ID: <200803082151.m28LpOCV021258@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/python-fpconst/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21162/F-8 Modified Files: python-fpconst.spec Log Message: oops Index: python-fpconst.spec =================================================================== RCS file: /cvs/extras/rpms/python-fpconst/F-8/python-fpconst.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-fpconst.spec 8 Mar 2008 20:02:39 -0000 1.8 +++ python-fpconst.spec 8 Mar 2008 21:50:46 -0000 1.9 @@ -2,7 +2,7 @@ Name: python-fpconst Version: 0.7.3 -Release: 3%{?dist} +Release: 3%{?dist}.1 Summary: Python module for handling IEEE 754 floating point special values Group: Development/Languages @@ -45,10 +45,12 @@ %{python_sitelib}/*.py %{python_sitelib}/*.pyc %{python_sitelib}/*.pyo -%{python_sitelib}/*.egg-info %changelog +* Sat Mar 08 2008 Christopher Stone 0.7.3-3.1 +- Ooops, egg-info only applies to devel + * Sat Mar 08 2008 Christopher Stone 0.7.3-3 - Add egg-info to %%files From fedora-extras-commits at redhat.com Sat Mar 8 21:52:23 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Mar 2008 21:52:23 GMT Subject: rebuild-scripts bumpspecfile.py,1.14,1.15 Message-ID: <200803082152.m28LqNfO021289@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/rebuild-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21273 Modified Files: bumpspecfile.py Log Message: don't process remaining spec files lines if a release value was bumped already Index: bumpspecfile.py =================================================================== RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- bumpspecfile.py 8 Mar 2008 21:51:21 -0000 1.14 +++ bumpspecfile.py 8 Mar 2008 21:52:23 -0000 1.15 @@ -40,11 +40,17 @@ (re.compile(r"^%define\s+baserelease\s+(\d+.*)"), self.increase), ] skip_pattern = re.compile(r"\$Revision:") + bumped = False for i in range(len(self.lines)): if skip_pattern.search(self.lines[i]): continue for bumpit, bumpit_func in bump_patterns: - self.lines[i] = bumpit.sub(bumpit_func, self.lines[i]) + (self.lines[i], n) = bumpit.subn(bumpit_func, self.lines[i], 1) + if n: + bumped = True + break + if bumped: + break def addChangelogEntry(self, evr, entry, email): if len(evr): From fedora-extras-commits at redhat.com Sat Mar 8 21:53:42 2008 From: fedora-extras-commits at redhat.com (Xavier LAMIEN (laxathom)) Date: Sat, 8 Mar 2008 21:53:42 GMT Subject: rpms/gnu-smalltalk/devel gnu-smalltlak-3.0.2-am.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 gnu-smalltalk.spec, 1.34, 1.35 sources, 1.10, 1.11 Message-ID: <200803082153.m28Lrg2O021372@cvs-int.fedora.redhat.com> Author: laxathom Update of /cvs/pkgs/rpms/gnu-smalltalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21336 Modified Files: .cvsignore gnu-smalltalk.spec sources Added Files: gnu-smalltlak-3.0.2-am.patch Log Message: updating files against new release gnu-smalltlak-3.0.2-am.patch: --- NEW FILE gnu-smalltlak-3.0.2-am.patch --- diff -up smalltalk-3.0.2/configure.ac.false smalltalk-3.0.2/configure.ac --- smalltalk-3.0.2/configure.ac.false 2008-03-08 22:21:23.000000000 +0100 +++ smalltalk-3.0.2/configure.ac 2008-03-08 22:23:10.000000000 +0100 @@ -7,7 +7,7 @@ dnl with this software. dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([GNU Smalltalk], 3.0.2, help-smalltalk at gnu.org, smalltalk) +AC_INIT([GNU Smalltalk], 3.0.2, help-smalltalk at gnu.org, gnu-smalltalk) MAINTAINER="bonzini at gnu.org" dnl CURRENT:REVISION:AGE means this is the REVISION-th version of @@ -72,7 +72,6 @@ AM_MISSING_PROG(AUTOM4TE, autom4te, $mis dnl dnl ------------------------------ SUBDIRS -------------------- -AC_CONFIG_SUBDIRS(libffi) case $ac_configure_args in *--enable-subdir) ;; @@ -88,7 +87,6 @@ AC_ARG_ENABLE(generational-gc, *) enable_generational_gc=yes ;; esac]) if test $enable_generational_gc != no; then - AC_CONFIG_SUBDIRS(sigsegv) AC_DEFINE(HAVE_SIGSEGV_H, 1, [Define to 1 if libsigsegv is being used]) fi diff -up smalltalk-3.0.2/Makefile.am.false smalltalk-3.0.2/Makefile.am --- smalltalk-3.0.2/Makefile.am.false 2008-03-08 22:34:26.000000000 +0100 +++ smalltalk-3.0.2/Makefile.am 2008-03-08 22:36:39.000000000 +0100 @@ -19,10 +19,10 @@ AUTOMAKE_OPTIONS = gnu 1.8 ACLOCAL_AMFLAGS = -I build-aux -PACKAGE=smalltalk -gstdatadir=$(pkgdatadir) +PACKAGE=gnu-smalltalk +gstdatadir=$(libdir)/@PACKAGE@ -DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \ +DIST_SUBDIRS = lib-src snprintfv lightning opcode libgst \ . $(ALL_PACKAGES) tests doc SUBDIRS = lib-src lightning $(subdirs) @@ -57,6 +57,7 @@ dist_noinst_SCRIPTS = build-aux/texi2dvi ########################################################### pkgconfigdir = $(libdir)/pkgconfig +imagedir = ${libdir}/@PACKAGE@ nodist_pkgconfig_DATA = gnu-smalltalk.pc pkglib_DATA = libc.la diff -up smalltalk-3.0.2/libgst/Makefile.am.false smalltalk-3.0.2/libgst/Makefile.am --- smalltalk-3.0.2/libgst/Makefile.am.false 2008-03-08 22:23:57.000000000 +0100 +++ smalltalk-3.0.2/libgst/Makefile.am 2008-03-08 22:28:47.000000000 +0100 @@ -1,5 +1,7 @@ LIBTOOL += --tag=LIBGST +LIBFFI_INCLUDES = `pkg-config libffi --cflags` +LIBFFI_LIBS = `pkg-config libffi --libs` LEX_OUTPUT_ROOT = lex.yy ## CFLAGS=-O0 -g AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c @@ -7,8 +9,9 @@ AM_YFLAGS = -vy AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \ -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(pkglibdir)\" \ -DLIBEXEC_PATH=\"$(libexecdir)/$(PACKAGE)\" \ - -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \ - -I$(top_builddir)/libffi/include $(INCLIGHTNING) \ + -I$(top_srcdir)/lib-src $(LIBFFI_INCLUDES) \ + $(INCLIGHTNING) \ + @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src if !HAVE_INSTALLED_LIGHTNING @@ -16,9 +19,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/lightning -I$(top_srcdir) -I$(top_builddir) endif -if HAVE_SIGSEGV -AM_CPPFLAGS += -I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src -endif include_HEADERS = gstpub.h gst.h lib_LTLIBRARIES = libgst.la @@ -28,15 +28,11 @@ CLEANFILES = genprims$(EXEEXT) genbc$(EX # definitions for libgst.la libgst_la_LIBADD=$(top_builddir)/lib-src/library.la \ - $(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@ + -lffi @LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@ libgst_la_DEPENDENCIES=$(top_builddir)/lib-src/library.la \ - $(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@ + @LIBSNPRINTFV@ -if HAVE_SIGSEGV -libgst_la_LIBADD += $(top_builddir)/sigsegv/src/libsigsegv.la -libgst_la_DEPENDENCIES += $(top_builddir)/sigsegv/src/libsigsegv.la -endif libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \ -export-symbols-regex "^gst_.*" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnu-smalltalk/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Sep 2007 19:36:36 -0000 1.8 +++ .cvsignore 8 Mar 2008 21:53:09 -0000 1.9 @@ -1 +1 @@ -smalltalk-2.3.6.tar.gz +smalltalk-3.0.2.tar.gz Index: gnu-smalltalk.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gnu-smalltalk.spec 17 Feb 2008 20:26:57 -0000 1.34 +++ gnu-smalltalk.spec 8 Mar 2008 21:53:09 -0000 1.35 @@ -1,9 +1,9 @@ Summary: GNU Smalltalk Name: gnu-smalltalk -Version: 3.0.1 -Release: 3%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz -Patch1: gst-3.0.1-am.patch +Patch1: gnu-smalltalk-3.0.2-am.patch Patch2: gst-3.0-tst117.patch Patch3: gst-3.0.1-ffi.patch License: GPLv2 @@ -173,6 +173,9 @@ %{_datadir}/emacs/site-lisp/* %changelog +* Sat Mar 08 2008 Xavier Lamien - 3.0.2-1 +- Updated release. + * Sun Feb 17 2008 Jochen Schmitt 3.0.1-3 - Use system libffi Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnu-smalltalk/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 10 Feb 2008 20:45:28 -0000 1.10 +++ sources 8 Mar 2008 21:53:09 -0000 1.11 @@ -1 +1 @@ -dbd1bc308dda3a4ef936dce2b78faa5a smalltalk-3.0.1.tar.gz +2c471da97c8a174d9b0f6586555ebb0c smalltalk-3.0.2.tar.gz From fedora-extras-commits at redhat.com Sat Mar 8 23:39:31 2008 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 8 Mar 2008 23:39:31 GMT Subject: rebuild-scripts bumpspecfile.py,1.15,1.16 Message-ID: <200803082339.m28NdVZB004478@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/rebuild-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4445 Modified Files: bumpspecfile.py Log Message: Some pkgs mix jpp style versioning with fedora pre-release versioning, so be more strict in matching/bumping them. Index: bumpspecfile.py =================================================================== RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- bumpspecfile.py 8 Mar 2008 21:52:23 -0000 1.15 +++ bumpspecfile.py 8 Mar 2008 23:39:31 -0000 1.16 @@ -91,8 +91,14 @@ def increaseJPP(self, release): """Fedora jpackage release versioning scheme""" + + if release.startswith('0.'): + # Then it is the Fedora pre-release versioning scheme + # at the beginning. + return self.increaseMain(release) + old = release - relre = re.compile(r'(?P
0\.)?(?P\d+)(?Pjpp\.)(?P.*)', re.I)
+        relre = re.compile(r'^(?P
0\.)?(?P\d+)(?Pjpp\.)(?P.*)', re.I)
         relmatch = relre.search(release)
         if not relmatch:  # pattern match failed
             raise BumpSpecError



From fedora-extras-commits at redhat.com  Sat Mar  8 23:50:47 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sat, 8 Mar 2008 23:50:47 GMT
Subject: rpms/kdepimlibs/F-7 .cvsignore, 1.9, 1.10 kdepimlibs.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <200803082350.m28NolRK004721@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4633/F-7

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
Sync from devel:

* Thu Mar 06 2008 Kevin Kofler  4.0.2-2
- build apidocs and put them into an -apidocs subpackage (can be turned off)
- BR doxygen, graphviz and qt4-doc when building apidocs

* Thu Feb 28 2008 Than Ngo  4.0.2-1
- 4.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Feb 2008 14:06:11 -0000	1.9
+++ .cvsignore	8 Mar 2008 23:50:14 -0000	1.10
@@ -1,2 +1,3 @@
 kdepimlibs-4.0.0.tar.bz2
 kdepimlibs-4.0.1.tar.bz2
+kdepimlibs-4.0.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-7/kdepimlibs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdepimlibs.spec	7 Feb 2008 14:06:11 -0000	1.15
+++ kdepimlibs.spec	8 Mar 2008 23:50:14 -0000	1.16
@@ -1,7 +1,15 @@
+%if 0%{?fedora} > 8
+# set this to 0 to disable -apidocs for a faster build
+%define apidocs 1
+%else
+# don't build apidocs on Fedora < 9 for now, because we don't have the required
+# files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
+%define apidocs 0
+%endif
 
 Name: kdepimlibs
 
-Version: 4.0.1
+Version: 4.0.2
 Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -23,6 +31,12 @@
 BuildRequires: openldap-devel
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
+%if "%{?apidocs}" == "1"
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: qt4-doc
+%endif
+
 %description
 Personal Information Management (PIM) libraries for the
 K Desktop Environment 4.
@@ -38,6 +52,15 @@
 %description devel
 Header files for developing applications using %{name}.
 
+%package apidocs
+Group: Development/Documentation
+Summary: kdepimlibs API documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}
+
+%description apidocs
+This package includes the kdepimlibs API documentation in HTML
+format for easy browsing.
+
 
 %prep
 %setup -q -n kdepimlibs-%{version}
@@ -52,6 +75,12 @@
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+# build apidocs
+%if "%{?apidocs}" == "1"
+export QTDOCDIR=`pkg-config --variable=docdir Qt`
+kde4-doxygen.sh --doxdatadir=%{_kde4_docdir}/HTML/en/common .
+%endif
+
 
 %install
 rm -rf %{buildroot}
@@ -75,6 +104,12 @@
 done
 popd
 
+# install apidocs
+%if "%{?apidocs}" == "1"
+mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
+cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs
+%endif
+
 
 %post -p /sbin/ldconfig
 
@@ -105,8 +140,21 @@
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
 
+%if "%{?apidocs}" == "1"
+%files apidocs
+%defattr(-,root,root,-)
+%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs/
+%endif
+
 
 %changelog
+* Thu Mar 06 2008 Kevin Kofler  4.0.2-2
+- build apidocs and put them into an -apidocs subpackage (can be turned off)
+- BR doxygen, graphviz and qt4-doc when building apidocs
+
+* Thu Feb 28 2008 Than Ngo  4.0.2-1
+- 4.0.2
+
 * Wed Jan 30 2008 Kevin Kofler  4.0.1-2
 - don't delete kconf_update script, it has been fixed to do the right thing
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Feb 2008 14:06:11 -0000	1.9
+++ sources	8 Mar 2008 23:50:14 -0000	1.10
@@ -1 +1 @@
-537b2034b48bc0c7b732f9fcf2b3397f  kdepimlibs-4.0.1.tar.bz2
+4d158d6b0fd44a9521b1a7c0fcc8315c  kdepimlibs-4.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar  8 23:50:50 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sat, 8 Mar 2008 23:50:50 GMT
Subject: rpms/kdepimlibs/F-8 .cvsignore, 1.9, 1.10 kdepimlibs.spec, 1.16,
	1.17 sources, 1.9, 1.10
Message-ID: <200803082350.m28Nooxa004728@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4633/F-8

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
Sync from devel:

* Thu Mar 06 2008 Kevin Kofler  4.0.2-2
- build apidocs and put them into an -apidocs subpackage (can be turned off)
- BR doxygen, graphviz and qt4-doc when building apidocs

* Thu Feb 28 2008 Than Ngo  4.0.2-1
- 4.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Feb 2008 14:06:23 -0000	1.9
+++ .cvsignore	8 Mar 2008 23:50:17 -0000	1.10
@@ -1,2 +1,3 @@
 kdepimlibs-4.0.0.tar.bz2
 kdepimlibs-4.0.1.tar.bz2
+kdepimlibs-4.0.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/kdepimlibs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdepimlibs.spec	7 Feb 2008 14:06:23 -0000	1.16
+++ kdepimlibs.spec	8 Mar 2008 23:50:17 -0000	1.17
@@ -1,7 +1,15 @@
+%if 0%{?fedora} > 8
+# set this to 0 to disable -apidocs for a faster build
+%define apidocs 1
+%else
+# don't build apidocs on Fedora < 9 for now, because we don't have the required
+# files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
+%define apidocs 0
+%endif
 
 Name: kdepimlibs
 
-Version: 4.0.1
+Version: 4.0.2
 Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -23,6 +31,12 @@
 BuildRequires: openldap-devel
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
+%if "%{?apidocs}" == "1"
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: qt4-doc
+%endif
+
 %description
 Personal Information Management (PIM) libraries for the
 K Desktop Environment 4.
@@ -38,6 +52,15 @@
 %description devel
 Header files for developing applications using %{name}.
 
+%package apidocs
+Group: Development/Documentation
+Summary: kdepimlibs API documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}
+
+%description apidocs
+This package includes the kdepimlibs API documentation in HTML
+format for easy browsing.
+
 
 %prep
 %setup -q -n kdepimlibs-%{version}
@@ -52,6 +75,12 @@
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+# build apidocs
+%if "%{?apidocs}" == "1"
+export QTDOCDIR=`pkg-config --variable=docdir Qt`
+kde4-doxygen.sh --doxdatadir=%{_kde4_docdir}/HTML/en/common .
+%endif
+
 
 %install
 rm -rf %{buildroot}
@@ -75,6 +104,12 @@
 done
 popd
 
+# install apidocs
+%if "%{?apidocs}" == "1"
+mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
+cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs
+%endif
+
 
 %post -p /sbin/ldconfig
 
@@ -105,8 +140,21 @@
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
 
+%if "%{?apidocs}" == "1"
+%files apidocs
+%defattr(-,root,root,-)
+%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs/
+%endif
+
 
 %changelog
+* Thu Mar 06 2008 Kevin Kofler  4.0.2-2
+- build apidocs and put them into an -apidocs subpackage (can be turned off)
+- BR doxygen, graphviz and qt4-doc when building apidocs
+
+* Thu Feb 28 2008 Than Ngo  4.0.2-1
+- 4.0.2
+
 * Wed Jan 30 2008 Kevin Kofler  4.0.1-2
 - don't delete kconf_update script, it has been fixed to do the right thing
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Feb 2008 14:06:23 -0000	1.9
+++ sources	8 Mar 2008 23:50:17 -0000	1.10
@@ -1 +1 @@
-537b2034b48bc0c7b732f9fcf2b3397f  kdepimlibs-4.0.1.tar.bz2
+4d158d6b0fd44a9521b1a7c0fcc8315c  kdepimlibs-4.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Mar  8 23:57:10 2008
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 8 Mar 2008 23:57:10 GMT
Subject: rpms/knetstats/devel knetstats.spec,1.14,1.15
Message-ID: <200803082357.m28NvAh5004897@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/knetstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4874

Modified Files:
	knetstats.spec 
Log Message:
fix the bad dates in %changelog - RPM warns about them and the resulting incorrect chronological order!


Index: knetstats.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetstats/devel/knetstats.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- knetstats.spec	27 Feb 2008 07:48:48 -0000	1.14
+++ knetstats.spec	8 Mar 2008 23:56:37 -0000	1.15
@@ -68,10 +68,10 @@
 %{_docdir}/HTML/en/%{name}/
 
 %Changelog
-* Web Feb 27 2007 Chitlesh Goorah  - 1.6.1-7
+* Wed Feb 27 2008 Chitlesh Goorah  - 1.6.1-7
 - fixed cvs commit issues
 
-* Web Feb 20 2007 Chitlesh Goorah  - 1.6.1-6
+* Wed Feb 20 2008 Chitlesh Goorah  - 1.6.1-6
 - fixed for KDE4
 - rebuild with kde3 compatibility packages
 



From fedora-extras-commits at redhat.com  Sun Mar  9 00:00:36 2008
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 9 Mar 2008 00:00:36 GMT
Subject: rpms/xpilot-ng/devel xpilot-ng.spec,1.14,1.15
Message-ID: <200803090000.m2900amJ004985@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/xpilot-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4958

Modified Files:
	xpilot-ng.spec 
Log Message:
Fix: error: %changelog entries must start with *


Index: xpilot-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpilot-ng/devel/xpilot-ng.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xpilot-ng.spec	18 Feb 2008 22:18:24 -0000	1.14
+++ xpilot-ng.spec	9 Mar 2008 00:00:01 -0000	1.15
@@ -267,6 +267,7 @@
 %{logwatch_scripts}/shared/applyxpilotdate
 
 %changelog
+* Fri Feb 18 2008 Wart 
 - Better Sourceforge download URL
 
 * Fri Feb 18 2008 Wart  4.7.2-14



From fedora-extras-commits at redhat.com  Sun Mar  9 00:14:14 2008
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 9 Mar 2008 00:14:14 GMT
Subject: rebuild-scripts bumpspecfile.py,1.16,1.17
Message-ID: <200803090014.m290EEOx012787@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12771

Modified Files:
	bumpspecfile.py 
Log Message:
return error if no release pattern matched anything in the entire spec file


Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bumpspecfile.py	8 Mar 2008 23:39:31 -0000	1.16
+++ bumpspecfile.py	9 Mar 2008 00:14:14 -0000	1.17
@@ -52,6 +52,11 @@
             if bumped:
                 break
 
+        if not bumped:  # no match at all
+            if self.verbose:
+                print >> sys.stderr, 'ERROR: No release value matched:', self.filename
+            sys.exit(1)
+
     def addChangelogEntry(self, evr, entry, email):
         if len(evr):
             evrstring = ' - %s' % evr



From fedora-extras-commits at redhat.com  Sun Mar  9 00:16:31 2008
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Mar 2008 00:16:31 GMT
Subject: rpms/sunifdef/devel sunifdef.spec,1.11,1.12
Message-ID: <200803090016.m290GVLP012833@cvs-int.fedora.redhat.com>

Author: jgu

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

Modified Files:
	sunifdef.spec 
Log Message:
* Sun Mar  9 2008 Jonathan G. Underwood  - 3.1.3-2
- Fix Source0 URL



Index: sunifdef.spec
===================================================================
RCS file: /cvs/extras/rpms/sunifdef/devel/sunifdef.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sunifdef.spec	6 Feb 2008 23:02:55 -0000	1.11
+++ sunifdef.spec	9 Mar 2008 00:15:58 -0000	1.12
@@ -1,11 +1,11 @@
 Name: sunifdef           
 Version: 3.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A commandline tool for simplifying the preprocessor conditionals in source code
 Group: Development/Languages
 License: BSD       
 URL: http://www.sunifdef.strudl.org/
-Source0: ftp://ftp.strudl.org/sunifdef/nix/stable/%{name}-%{version}.tar.gz
+Source0: http://www.strudl.org/public_ftp/sunifdef/nix/stable/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Beware: the '#' may never be the first non-blank character on a line,
@@ -54,6 +54,9 @@
 %{_mandir}/man1/sunifdef.1.gz
 
 %changelog
+* Sun Mar  9 2008 Jonathan G. Underwood  - 3.1.3-2
+- Fix Source0 URL
+
 * Wed Feb  6 2008 Jonathan G. Underwood  - 3.1.3-1
 - Update to version 3.1.3
 



From fedora-extras-commits at redhat.com  Sun Mar  9 00:17:59 2008
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Mar 2008 00:17:59 GMT
Subject: rpms/sunifdef/F-8 sunifdef.spec,1.11,1.12
Message-ID: <200803090017.m290Hxbl012914@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/sunifdef/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12889

Modified Files:
	sunifdef.spec 
Log Message:
* Sun Mar  9 2008 Jonathan G. Underwood  - 3.1.3-2
- Fix Source0 URL



Index: sunifdef.spec
===================================================================
RCS file: /cvs/extras/rpms/sunifdef/F-8/sunifdef.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sunifdef.spec	6 Feb 2008 23:04:53 -0000	1.11
+++ sunifdef.spec	9 Mar 2008 00:17:24 -0000	1.12
@@ -1,11 +1,11 @@
 Name: sunifdef           
 Version: 3.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A commandline tool for simplifying the preprocessor conditionals in source code
 Group: Development/Languages
 License: BSD       
 URL: http://www.sunifdef.strudl.org/
-Source0: ftp://ftp.strudl.org/sunifdef/nix/stable/%{name}-%{version}.tar.gz
+Source0: http://www.strudl.org/public_ftp/sunifdef/nix/stable/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Beware: the '#' may never be the first non-blank character on a line,
@@ -54,6 +54,9 @@
 %{_mandir}/man1/sunifdef.1.gz
 
 %changelog
+* Sun Mar  9 2008 Jonathan G. Underwood  - 3.1.3-2
+- Fix Source0 URL
+
 * Wed Feb  6 2008 Jonathan G. Underwood  - 3.1.3-1
 - Update to version 3.1.3
 



From fedora-extras-commits at redhat.com  Sun Mar  9 00:18:46 2008
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 9 Mar 2008 00:18:46 GMT
Subject: rpms/sunifdef/F-7 sunifdef.spec,1.9,1.10
Message-ID: <200803090018.m290IkAX012976@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/sunifdef/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12954

Modified Files:
	sunifdef.spec 
Log Message:
* Sun Mar  9 2008 Jonathan G. Underwood  - 3.1.3-2
- Fix Source0 URL



Index: sunifdef.spec
===================================================================
RCS file: /cvs/extras/rpms/sunifdef/F-7/sunifdef.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sunifdef.spec	6 Feb 2008 23:06:32 -0000	1.9
+++ sunifdef.spec	9 Mar 2008 00:18:13 -0000	1.10
@@ -1,11 +1,11 @@
 Name: sunifdef           
 Version: 3.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A commandline tool for simplifying the preprocessor conditionals in source code
 Group: Development/Languages
 License: BSD       
 URL: http://www.sunifdef.strudl.org/
-Source0: ftp://ftp.strudl.org/sunifdef/nix/stable/%{name}-%{version}.tar.gz
+Source0: http://www.strudl.org/public_ftp/sunifdef/nix/stable/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Beware: the '#' may never be the first non-blank character on a line,
@@ -54,6 +54,9 @@
 %{_mandir}/man1/sunifdef.1.gz
 
 %changelog
+* Sun Mar  9 2008 Jonathan G. Underwood  - 3.1.3-2
+- Fix Source0 URL
+
 * Wed Feb  6 2008 Jonathan G. Underwood  - 3.1.3-1
 - Update to version 3.1.3
 



From fedora-extras-commits at redhat.com  Sun Mar  9 00:24:46 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 00:24:46 GMT
Subject: rpms/perl/devel perl-5.10.0-Archive-Extract-0.26.patch, 1.1,
	1.2 perl.spec, 1.156, 1.157
Message-ID: <200803090024.m290Ok6X013100@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13077

Modified Files:
	perl-5.10.0-Archive-Extract-0.26.patch perl.spec 
Log Message:
add missing lzma test file

perl-5.10.0-Archive-Extract-0.26.patch:

Index: perl-5.10.0-Archive-Extract-0.26.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl-5.10.0-Archive-Extract-0.26.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-5.10.0-Archive-Extract-0.26.patch	8 Mar 2008 20:38:57 -0000	1.1
+++ perl-5.10.0-Archive-Extract-0.26.patch	9 Mar 2008 00:24:39 -0000	1.2
@@ -296,3 +296,23 @@
  which may not be feasible on your system. Consider setting the global
  variable C<$Archive::Extract::PREFER_BIN> to C<1>, which will prefer
  the use of command line programs and won't consume so much memory.
+diff -up perl-5.10.0/lib/Archive/Extract/t/src/x.lzma.packed.BAD perl-5.10.0/lib/Archive/Extract/t/src/x.lzma.packed
+--- perl-5.10.0/lib/Archive/Extract/t/src/x.lzma.packed.BAD	2008-03-08 19:20:41.000000000 -0500
++++ perl-5.10.0/lib/Archive/Extract/t/src/x.lzma.packed	2008-03-08 19:20:33.000000000 -0500
+@@ -0,0 +1,16 @@
++#########################################################################
++This is a binary file that was packed with the 'uupacktool.pl' which
++is included in the Perl distribution.
++
++To unpack this file use the following command:
++
++     uupacktool.pl -u lib/Archive/Extract/t/src/x.lzma.packed lib/Archive/Extract/t/src/x.lzma
++
++To recreate it use the following command:
++
++     uupacktool.pl -p lib/Archive/Extract/t/src/x.lzma lib/Archive/Extract/t/src/x.lzma.packed
++
++Created at Sat Mar  8 19:20:33 2008
++#########################################################################
++__UU__
++270``@```````````````````


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- perl.spec	8 Mar 2008 20:38:57 -0000	1.156
+++ perl.spec	9 Mar 2008 00:24:39 -0000	1.157
@@ -16,7 +16,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        12%{?dist}
+Release:        13%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -1591,6 +1591,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Sat Mar  8 2008 Tom "spot" Callaway  4:5.10.0-13
+- add missing lzma test file
+
 * Fri Mar  7 2008 Tom "spot" Callaway  4:5.10.0-12
 - conditionalize multilib patch report in patchlevel.h
 - Update Archive::Extract to 0.26



From fedora-extras-commits at redhat.com  Sun Mar  9 00:45:19 2008
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 9 Mar 2008 00:45:19 GMT
Subject: rebuild-scripts bumpspecfile.py,1.17,1.18
Message-ID: <200803090045.m290jJE5013464@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13446

Modified Files:
	bumpspecfile.py 
Log Message:
return early from lines-loop if matched


Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bumpspecfile.py	9 Mar 2008 00:14:14 -0000	1.17
+++ bumpspecfile.py	9 Mar 2008 00:45:18 -0000	1.18
@@ -40,21 +40,17 @@
                        (re.compile(r"^%define\s+baserelease\s+(\d+.*)"), self.increase),
                        ]
         skip_pattern = re.compile(r"\$Revision:")
-        bumped = False
         for i in range(len(self.lines)):
             if skip_pattern.search(self.lines[i]):
                 continue
             for bumpit, bumpit_func in bump_patterns:
                 (self.lines[i], n) = bumpit.subn(bumpit_func, self.lines[i], 1)
-                if n:
-                    bumped = True
-                    break
-            if bumped:
-                break
-
-        if not bumped:  # no match at all
-            if self.verbose:
-                print >> sys.stderr, 'ERROR: No release value matched:', self.filename
+                if n:  # bumped
+                    return
+        # Here, no line matched at all.
+        # TODO: Bump ^Release: ... line least-insignificant.
+        if self.verbose:
+            print >> sys.stderr, 'ERROR: No release value matched:', self.filename
             sys.exit(1)
 
     def addChangelogEntry(self, evr, entry, email):



From fedora-extras-commits at redhat.com  Sun Mar  9 00:47:35 2008
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 9 Mar 2008 00:47:35 GMT
Subject: rebuild-scripts bumpspecfile.py,1.18,1.19
Message-ID: <200803090047.m290lZUE013512@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13496

Modified Files:
	bumpspecfile.py 
Log Message:
strip white-space right of Release when bumping right-most


Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bumpspecfile.py	9 Mar 2008 00:45:18 -0000	1.18
+++ bumpspecfile.py	9 Mar 2008 00:47:34 -0000	1.19
@@ -123,7 +123,7 @@
             post = relmatch.group('post')
             new = prefix+self.increaseMain(post)
         else:
-            new = old+'.1'
+            new = old.rstrip()+'.1'
         return new
 
     def increase(self, match):



From fedora-extras-commits at redhat.com  Sun Mar  9 01:06:08 2008
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 9 Mar 2008 01:06:08 GMT
Subject: rebuild-scripts bumpspecfile.py,1.19,1.20
Message-ID: <200803090106.m29168hQ021015@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20999

Modified Files:
	bumpspecfile.py 
Log Message:
bump unrecognised spec files right-most in the "Release:" line


Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bumpspecfile.py	9 Mar 2008 00:47:34 -0000	1.19
+++ bumpspecfile.py	9 Mar 2008 01:06:08 -0000	1.20
@@ -47,8 +47,19 @@
                 (self.lines[i], n) = bumpit.subn(bumpit_func, self.lines[i], 1)
                 if n:  # bumped
                     return
+        
         # Here, no line matched at all.
-        # TODO: Bump ^Release: ... line least-insignificant.
+        # Happens with macro-overloaded spec files e.g.
+        # Bump ^Release: ... line least-insignificant.
+        for i in range(len(self.lines)):
+            if self.lines[i].startswith('Release:'):
+                old = self.lines[i][len('Release:'):].rstrip()
+                new = self.increaseFallback(old)
+                if self.verbose:
+                    self.debugdiff(old, new)
+                self.lines[i] = self.lines[i].replace(old, new)
+                return
+
         if self.verbose:
             print >> sys.stderr, 'ERROR: No release value matched:', self.filename
             sys.exit(1)



From fedora-extras-commits at redhat.com  Sun Mar  9 01:19:44 2008
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 9 Mar 2008 01:19:44 GMT
Subject: rpms/twinkle/devel twinkle-1.2-gcc43.patch, NONE, 1.1 sources, 1.5, 
	1.6 .cvsignore, 1.5, 1.6 twinkle.spec, 1.10,
	1.11 twinkle-1.1-gcc43.patch, 1.1, NONE
Message-ID: <200803090119.m291Jii6021464@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	sources .cvsignore twinkle.spec 
Added Files:
	twinkle-1.2-gcc43.patch 
Removed Files:
	twinkle-1.1-gcc43.patch 
Log Message:
Update to 1.2


twinkle-1.2-gcc43.patch:

--- NEW FILE twinkle-1.2-gcc43.patch ---
diff -Nur twinkle-1.2.orig/src/sockets/socket.cpp twinkle-1.2/src/sockets/socket.cpp
--- twinkle-1.2.orig/src/sockets/socket.cpp	2008-02-26 14:10:50.000000000 -0700
+++ twinkle-1.2/src/sockets/socket.cpp	2008-03-08 18:07:16.000000000 -0700
@@ -133,7 +133,7 @@
 	return ret;
 }
 
-int t_socket_udp::send(const void *data, int data_size) {
+ssize_t t_socket_udp::send(const void *data, int data_size) {
 	int ret = ::send(sd, data, data_size, 0);
 	if (ret < 0) throw errno;
 
diff -Nur twinkle-1.2.orig/src/sockets/url.cpp twinkle-1.2/src/sockets/url.cpp
--- twinkle-1.2.orig/src/sockets/url.cpp	2008-03-01 23:52:56.000000000 -0700
+++ twinkle-1.2/src/sockets/url.cpp	2008-03-08 17:44:34.000000000 -0700
@@ -28,6 +28,7 @@
 #include "socket.h"
 #include "url.h"
 #include "util.h"
+#include 
 
 // TODO: handle hex charactest (eg. %20x) correctly.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Aug 2007 03:57:16 -0000	1.5
+++ sources	9 Mar 2008 01:19:05 -0000	1.6
@@ -1 +1 @@
-40f8341a4a82c06d00bd1b326d9c6bbf  twinkle-1.1.tar.gz
+5f396d9367d7260732298c821639773b  twinkle-1.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Aug 2007 03:57:16 -0000	1.5
+++ .cvsignore	9 Mar 2008 01:19:05 -0000	1.6
@@ -1 +1 @@
-twinkle-1.1.tar.gz
+twinkle-1.2.tar.gz


Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- twinkle.spec	9 Feb 2008 23:01:33 -0000	1.10
+++ twinkle.spec	9 Mar 2008 01:19:05 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           twinkle
-Version:        1.1
-Release:        5%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -8,7 +8,7 @@
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
 Patch0:         twinkle-1.1-msg.patch
-Patch1:		twinkle-1.1-gcc43.patch
+Patch1:		twinkle-1.2-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -29,7 +29,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .msg
-%patch1 -p1 -b .gcc
+%patch1 -p1 -b .gcc43
 
 %build
 %configure
@@ -62,6 +62,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Sat Mar 08 2008 Kevin Fenzi  - 1.2-1
+- Update to 1.2
+
 * Sat Feb 09 2008 Kevin Fenzi  - 1.1-5
 - Rebuild for gcc-4.3
 - Rebuild for new cctrp and commoncpp2


--- twinkle-1.1-gcc43.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  9 01:39:22 2008
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Sun, 9 Mar 2008 01:39:22 GMT
Subject: rpms/xorg-x11-drv-evdev/devel make-git-snapshot.sh, NONE,
	1.1 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xorg-x11-drv-evdev.spec, 1.21, 1.22
Message-ID: <200803090139.m291dMNT021802@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21766/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Added Files:
	make-git-snapshot.sh 
Log Message:
evdev 2.0 git snapshot



--- NEW FILE make-git-snapshot.sh ---
#!/bin/sh

DIRNAME=xf86-input-evdev-$( date +%Y%m%d )

rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/xorg/driver/xf86-input-evdev $DIRNAME
cd $DIRNAME
if [ -z "$1" ]; then
    git log | head -1
else
    git checkout $1
fi
git log | head -1 | awk '{ print $2 }' > ../commitid
git repack -a -d
cd ..
tar jcf $DIRNAME.tar.bz2 $DIRNAME
rm -rf $DIRNAME


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Nov 2007 20:01:13 -0000	1.9
+++ .cvsignore	9 Mar 2008 01:38:46 -0000	1.10
@@ -1 +1 @@
-xf86-input-evdev-1.2.0.tar.bz2
+xf86-input-evdev-20080308.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Nov 2007 20:01:13 -0000	1.9
+++ sources	9 Mar 2008 01:38:46 -0000	1.10
@@ -1 +1 @@
-0c7c41d3f1637bb559e80c2ad708f05d  xf86-input-evdev-1.2.0.tar.bz2
+0a667c800d57c5d79aff9568e29399a9  xf86-input-evdev-20080308.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-evdev.spec	20 Feb 2008 07:20:45 -0000	1.21
+++ xorg-x11-drv-evdev.spec	9 Mar 2008 01:38:46 -0000	1.22
@@ -4,19 +4,24 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
+%define gitdate 20080308
+
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.99.1
+Release: 0.1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source1:    make-git-snapshot.sh
 
 ExcludeArch: s390 s390x
 
+BuildRequires: autoconf automake libtool
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
@@ -25,9 +30,10 @@
 X.Org X11 evdev input driver.
 
 %prep
-%setup -q -n %{tarball}-%{version}
+%setup -q -n %{tarball}-%{gitdate}
 
 %build
+autoreconf -v --install || exit 1
 %configure --disable-static
 make
 
@@ -49,6 +55,9 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Fri Mar 07 2008 Adam Jackson  1.99.1-0.1
+- evdev 2.0 git snapshot
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 1.2.0-2
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Sun Mar  9 01:43:14 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 01:43:14 GMT
Subject: rpms/perl/devel perl.spec,1.157,1.158
Message-ID: <200803090143.m291hEpI021974@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21938

Modified Files:
	perl.spec 
Log Message:
back out Archive::Extract


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- perl.spec	9 Mar 2008 00:24:39 -0000	1.157
+++ perl.spec	9 Mar 2008 01:42:40 -0000	1.158
@@ -16,7 +16,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        13%{?dist}
+Release:        14%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -65,11 +65,8 @@
 # http://public.activestate.com/cgi-bin/perlbrowse/p/32891
 Patch11:        32891.patch
 
-# Bump Archive::Extract to 0.26 for clean upgrade
-Patch12:        perl-5.10.0-Archive-Extract-0.26.patch
-
 # Update Module::Load::Conditional to 0.24 for clean upgrade
-Patch13:	perl-5.10.0-Module-Load-Conditional-0.24.patch
+Patch12:	perl-5.10.0-Module-Load-Conditional-0.24.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcsh, dos2unix, man, groff
@@ -557,7 +554,7 @@
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        0.22
+Version:        0.24
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Module-Load-Conditional
@@ -787,7 +784,6 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -990,8 +986,7 @@
 perl -x patchlevel.h 'Fedora Patch9: Update Sys::Syslog to 0.24'
 perl -x patchlevel.h 'Fedora Patch10: Dont run one io test due to random builder failures'
 perl -x patchlevel.h '32891 fix big slowdown in 5.10 @_ parameter passing'
-perl -x patchlevel.h 'Fedora Patch12: Update Archive::Extract to 0.26'
-perl -x patchlevel.h 'Fedora Patch13: Update Module::Load::Conditional to 0.24'
+perl -x patchlevel.h 'Fedora Patch12: Update Module::Load::Conditional to 0.24'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1591,6 +1586,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Sat Mar  8 2008 Tom "spot" Callaway  4:5.10.0-14
+- back out Archive::Extract patch, causing odd test failure
+
 * Sat Mar  8 2008 Tom "spot" Callaway  4:5.10.0-13
 - add missing lzma test file
 



From fedora-extras-commits at redhat.com  Sun Mar  9 01:43:55 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Mar 2008 01:43:55 GMT
Subject: rpms/kdebase-runtime/F-7 khelpcenter.desktop, NONE, 1.1 .cvsignore, 
	1.5, 1.6 kdebase-runtime.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200803090143.m291htPW022060@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21966/F-7

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	khelpcenter.desktop 
Log Message:
Sync from devel:

* Fri Mar 07 2008 Kevin Kofler  4.0.2-3
- BR libxcb-devel everywhere (including F7)

* Fri Mar 07 2008 Kevin Kofler  4.0.2-2
- if building for a KDE 4 desktop, include the khelpcenter.desktop service
  description for KDE 3 here so help works in KDE 3 apps

* Fri Feb 29 2008 Than Ngo  4.0.2-1
- 4.0.2

* Mon Feb 25 2008 Rex Dieter  4.0.1-3
- %%files: don't own %%_kde4_libdir/kde4/plugins (thanks wolfy!)

* Sat Feb 23 2008 Kevin Kofler  4.0.1-2
- reenable kio_smb everywhere (including F9) now that we have a GPLv3 qt4
  (kio_smb itself is already GPLv2+)


--- NEW FILE khelpcenter.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=KHelpCenter
Name[af]=Khulpsentrum
Name[be]=?????????? ???????????????? KDE
Name[bg]=?????????????? ????????????
Name[cs]=Centrum n??pov??dy
Name[csb]=Centr??m P??m??c??
Name[cy]=KCanolfanCymorth
Name[da]=KHj??lpecenter
Name[de]=KDE-Hilfezentrum
Name[en_GB]=KHelpCentre
Name[eo]=KHelpCentro
Name[es]=KHelpcenter
Name[et]=KDE abikeskus
Name[fr]=Centre d'aide de KDE
Name[gl]=Centro de Axuda de KDE
Name[hi]=??????-???????????????-???????????????
Name[is]=Hj??lparkerfi KDE
Name[ja]=K ?????????????????????
Name[lo]=???????????????????????????????????? - K
Name[lv]=KPal??dz??basCentrs
Name[mn]=??????-???????????????????? ??????
Name[nds]=KDE-H??lpzentrum
Name[ne]=??????????????? ??????????????? ?????????????????????
Name[nso]=KBogare bja Thuso
Name[pa]=???????????????????????????????????????
Name[pl]=Centrum Pomocy
Name[pt_BR]=Centro de Ajuda
Name[ro]=Centrul de ajutor KDE
Name[ru]=?????????? ??????????????
Name[rw]=K-UmwanyaGufasha
Name[sv]=Hj??lpcentralen
Name[ta]=K???????????????????????????
Name[te]=?????????????????? ?????????????????????
Name[tg]=?????????????? ??????????????
Name[th]=?????????????????????????????????????????? K
Name[tr]=KDE Yard??m Merkezi
Name[uz]=?????????? ??????????????
Name[ven]=Senthara ya thuso ya K
Name[vi]=Trung t??m Tr??? gi??p KDE
Name[wa]=KCinteDAidance
Name[zh_CN]=KHelpcenter
Comment=The KDE Help Center
Comment[af]=Die Kde Hulp Sentrum
Comment[ar]=???????? KDE ????????????????
Comment[az]=KDE Yard??m M??rk??zi
Comment[be]=?????????? ???????????????? KDE
Comment[bg]=???????????? ???? ?????????????? ????????????????????
Comment[bn]=??????.??????.???. ????????????????????? ?????????????????????
Comment[br]=Kreizenn sikour KDE
Comment[bs]=KDE centar za pomo??
Comment[ca]=El centre d'ajuda KDE
Comment[cs]=Centrum n??pov??dy prost??ed?? KDE
Comment[csb]=Centr??m P??m??c?? KDE
Comment[cy]=Canolfan Cymorth KDE
Comment[da]=KDE's hj??lpecenter
Comment[de]=Das KDE-Hilfezentrum
Comment[el]=???? ???????????? ???????????????? ?????? KDE
Comment[en_GB]=The KDE Help Centre
Comment[eo]=La KDE-helpocentro
Comment[es]=El centro de ayuda de KDE
Comment[et]=KDE abikeskus
Comment[eu]=KDE laguntza gunea
Comment[fa]=???????? ?????? KDE
Comment[fi]=KDE:n Ohje
Comment[fr]=Le centre de documentation de KDE
Comment[fy]=It KDE-dokumintaasjesintrum
Comment[ga]=L??rionad Cabhrach KDE
Comment[gl]=O Centro de Axuda de KDE
Comment[he]=???????? ?????????? ???? KDE
Comment[hi]=??????????????? ????????? ??????????????????
Comment[hr]=KDE pomo??
Comment[hu]=KDE Seg??ts??g
Comment[id]=Pusat Bantuan KDE
Comment[is]=Hj??lparkerfi KDE
Comment[it]=La guida di KDE
Comment[ja]=KDE ?????????????????????
Comment[kk]=KDE ???????????????? ????????????????
Comment[km]=????????????????????????????????????????????????????????? KDE
Comment[ko]=KDE ????????? ??????
Comment[lo]=????????????????????????????????????????????? KDE
Comment[lt]=KDE pagalbos centras
Comment[lv]=KDE Pal??dz??bas Centrs
Comment[mk]=KDE ???????????????? ???? ??????????
Comment[mn]=??????-???????????????????? ??????
Comment[ms]=Pusat Bantuan KDE
Comment[mt]=??entru tal-G??ajnuna KDE
Comment[nb]=KDE Hjelpesenter
Comment[nds]=Dat KDE-H??lpzentrum
Comment[ne]=??????????????? ??????????????? ?????????????????????
Comment[nl]=Het KDE-documentatiecentrum
Comment[nn]=KDE Hjelpesenter
Comment[nso]=Bogare bja Thuso ya KDE
Comment[oc]=Lo centre d'ajuda KDE
Comment[pa]=??????????????? ?????????????????? ???????????????
Comment[pl]=Centrum Pomocy KDE
Comment[pt]=O Centro de Ajuda do KDE
Comment[pt_BR]=Centro de Ajuda do KDE
Comment[ro]=Centrul de ajutor al KDE
Comment[ru]=?????????? ?????????????? KDE
Comment[rw]=KDE Ifashayobora Hagati
Comment[se]=KDE veahkkeguovdd????
Comment[sk]=KDE Centrum pomocn??k
Comment[sl]=Sredi????e pomo??i za KDE
Comment[sr]=KDE ???????????? ???? ??????????
Comment[sr at Latn]=KDE centar za pomo??
Comment[sv]=KDE:s hj??lpcentral
Comment[ta]=KDE ???????????? ???????????????
Comment[te]=??????????????? ???????????? ?????????????????????
Comment[tg]=?????????????? ???????????????? KDE
Comment[th]=??????????????????????????????????????????????????? KDE
Comment[tr]=KDE Yard??m Merkezi
Comment[tt]=KDE Y??rd??m ??z??ge
Comment[uk]=?????????? ?????????????? KDE
Comment[uz]=KDE ?????????? ??????????????
Comment[ven]=Senthara ya thuso ya KDE
Comment[vi]=Trung t??m Tr??? gi??p KDE
Comment[wa]=Li Cinte d' aidance KDE
Comment[xh]=Umbindi woncedo lwe KDE
Comment[zh_CN]=KDE ????????????
Comment[zh_TW]=KDE ????????????
Comment[zu]=Indawo Yosizi ye-KDE
Icon=khelpcenter
DocPath=khelpcenter/index.html
Type=Service
Terminal=false
Exec=khelpcenter %u
SwallowExec=
SwallowTitle=
X-KDE-StartupNotify=true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Feb 2008 15:23:24 -0000	1.5
+++ .cvsignore	9 Mar 2008 01:43:12 -0000	1.6
@@ -1,2 +1,3 @@
 kdebase-runtime-4.0.0.tar.bz2
 kdebase-runtime-4.0.1.tar.bz2
+kdebase-runtime-4.0.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/kdebase-runtime.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdebase-runtime.spec	7 Feb 2008 15:23:25 -0000	1.4
+++ kdebase-runtime.spec	9 Mar 2008 01:43:12 -0000	1.5
@@ -2,18 +2,21 @@
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %define kde3_desktop 1
-%define _with_samba --with-samba
 %endif
 
+%define _with_samba --with-samba
+
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.0.1
-Release:       1%{?dist}
+Version:       4.0.2
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
+# KDE 3 version of this service description
+Source1:       khelpcenter.desktop
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdebase4-runtime < %{version}-%{release}
@@ -49,9 +52,7 @@
 BuildRequires: strigi-devel >= 0.5.7
 BuildRequires: xine-lib-devel
 # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-%if 0%{?fedora} > 7 
-BuildRequires:  libxcb-devel
-%endif
+BuildRequires: libxcb-devel
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -163,6 +164,11 @@
 # remove country flags because some people/countries forbid some other
 # people/countries' flags :-(
 rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png
+# install this service for KDE 3 applications
+# NOTE: This is not a standard .desktop file, but an "almost standard" one
+#       installed into a KDE-3-specific directory, as usual for KDE 3 services,
+#       so we can't use desktop-file-install for it.
+install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
 %endif
 
 
@@ -197,7 +203,9 @@
 %{_kde4_datadir}/sounds/*
 %{_kde4_docdir}/HTML/en/
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/libexec/*
+%{_kde4_libdir}/kde4/plugins/styles/
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
 
@@ -211,10 +219,28 @@
 %{_kde4_datadir}/locale/en_US/entry.desktop
 %{_kde4_datadir}/locale/l10n/*.desktop
 %{_kde4_datadir}/locale/l10n/*/entry.desktop
+%{_datadir}/services/khelpcenter.desktop
 %endif
 
 
 %changelog
+* Fri Mar 07 2008 Kevin Kofler  4.0.2-3
+- BR libxcb-devel everywhere (including F7)
+
+* Fri Mar 07 2008 Kevin Kofler  4.0.2-2
+- if building for a KDE 4 desktop, include the khelpcenter.desktop service
+  description for KDE 3 here so help works in KDE 3 apps
+
+* Fri Feb 29 2008 Than Ngo  4.0.2-1
+- 4.0.2
+
+* Mon Feb 25 2008 Rex Dieter  4.0.1-3
+- %%files: don't own %%_kde4_libdir/kde4/plugins (thanks wolfy!)
+
+* Sat Feb 23 2008 Kevin Kofler  4.0.1-2
+- reenable kio_smb everywhere (including F9) now that we have a GPLv3 qt4
+  (kio_smb itself is already GPLv2+)
+
 * Wed Jan 30 2008 Rex Dieter  4.0.1-1
 - 4.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Feb 2008 15:23:25 -0000	1.5
+++ sources	9 Mar 2008 01:43:12 -0000	1.6
@@ -1 +1 @@
-f6dbc7f6580d971ce2748c2773999a6a  kdebase-runtime-4.0.1.tar.bz2
+28d979899554d731e20d4b88b44092ae  kdebase-runtime-4.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 01:44:08 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Mar 2008 01:44:08 GMT
Subject: rpms/kdebase-runtime/F-8 khelpcenter.desktop, NONE, 1.1 .cvsignore, 
	1.5, 1.6 kdebase-runtime.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200803090144.m291i8TF022072@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21966/F-8

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	khelpcenter.desktop 
Log Message:
Sync from devel:

* Fri Mar 07 2008 Kevin Kofler  4.0.2-3
- BR libxcb-devel everywhere (including F7)

* Fri Mar 07 2008 Kevin Kofler  4.0.2-2
- if building for a KDE 4 desktop, include the khelpcenter.desktop service
  description for KDE 3 here so help works in KDE 3 apps

* Fri Feb 29 2008 Than Ngo  4.0.2-1
- 4.0.2

* Mon Feb 25 2008 Rex Dieter  4.0.1-3
- %%files: don't own %%_kde4_libdir/kde4/plugins (thanks wolfy!)

* Sat Feb 23 2008 Kevin Kofler  4.0.1-2
- reenable kio_smb everywhere (including F9) now that we have a GPLv3 qt4
  (kio_smb itself is already GPLv2+)


--- NEW FILE khelpcenter.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=KHelpCenter
Name[af]=Khulpsentrum
Name[be]=?????????? ???????????????? KDE
Name[bg]=?????????????? ????????????
Name[cs]=Centrum n??pov??dy
Name[csb]=Centr??m P??m??c??
Name[cy]=KCanolfanCymorth
Name[da]=KHj??lpecenter
Name[de]=KDE-Hilfezentrum
Name[en_GB]=KHelpCentre
Name[eo]=KHelpCentro
Name[es]=KHelpcenter
Name[et]=KDE abikeskus
Name[fr]=Centre d'aide de KDE
Name[gl]=Centro de Axuda de KDE
Name[hi]=??????-???????????????-???????????????
Name[is]=Hj??lparkerfi KDE
Name[ja]=K ?????????????????????
Name[lo]=???????????????????????????????????? - K
Name[lv]=KPal??dz??basCentrs
Name[mn]=??????-???????????????????? ??????
Name[nds]=KDE-H??lpzentrum
Name[ne]=??????????????? ??????????????? ?????????????????????
Name[nso]=KBogare bja Thuso
Name[pa]=???????????????????????????????????????
Name[pl]=Centrum Pomocy
Name[pt_BR]=Centro de Ajuda
Name[ro]=Centrul de ajutor KDE
Name[ru]=?????????? ??????????????
Name[rw]=K-UmwanyaGufasha
Name[sv]=Hj??lpcentralen
Name[ta]=K???????????????????????????
Name[te]=?????????????????? ?????????????????????
Name[tg]=?????????????? ??????????????
Name[th]=?????????????????????????????????????????? K
Name[tr]=KDE Yard??m Merkezi
Name[uz]=?????????? ??????????????
Name[ven]=Senthara ya thuso ya K
Name[vi]=Trung t??m Tr??? gi??p KDE
Name[wa]=KCinteDAidance
Name[zh_CN]=KHelpcenter
Comment=The KDE Help Center
Comment[af]=Die Kde Hulp Sentrum
Comment[ar]=???????? KDE ????????????????
Comment[az]=KDE Yard??m M??rk??zi
Comment[be]=?????????? ???????????????? KDE
Comment[bg]=???????????? ???? ?????????????? ????????????????????
Comment[bn]=??????.??????.???. ????????????????????? ?????????????????????
Comment[br]=Kreizenn sikour KDE
Comment[bs]=KDE centar za pomo??
Comment[ca]=El centre d'ajuda KDE
Comment[cs]=Centrum n??pov??dy prost??ed?? KDE
Comment[csb]=Centr??m P??m??c?? KDE
Comment[cy]=Canolfan Cymorth KDE
Comment[da]=KDE's hj??lpecenter
Comment[de]=Das KDE-Hilfezentrum
Comment[el]=???? ???????????? ???????????????? ?????? KDE
Comment[en_GB]=The KDE Help Centre
Comment[eo]=La KDE-helpocentro
Comment[es]=El centro de ayuda de KDE
Comment[et]=KDE abikeskus
Comment[eu]=KDE laguntza gunea
Comment[fa]=???????? ?????? KDE
Comment[fi]=KDE:n Ohje
Comment[fr]=Le centre de documentation de KDE
Comment[fy]=It KDE-dokumintaasjesintrum
Comment[ga]=L??rionad Cabhrach KDE
Comment[gl]=O Centro de Axuda de KDE
Comment[he]=???????? ?????????? ???? KDE
Comment[hi]=??????????????? ????????? ??????????????????
Comment[hr]=KDE pomo??
Comment[hu]=KDE Seg??ts??g
Comment[id]=Pusat Bantuan KDE
Comment[is]=Hj??lparkerfi KDE
Comment[it]=La guida di KDE
Comment[ja]=KDE ?????????????????????
Comment[kk]=KDE ???????????????? ????????????????
Comment[km]=????????????????????????????????????????????????????????? KDE
Comment[ko]=KDE ????????? ??????
Comment[lo]=????????????????????????????????????????????? KDE
Comment[lt]=KDE pagalbos centras
Comment[lv]=KDE Pal??dz??bas Centrs
Comment[mk]=KDE ???????????????? ???? ??????????
Comment[mn]=??????-???????????????????? ??????
Comment[ms]=Pusat Bantuan KDE
Comment[mt]=??entru tal-G??ajnuna KDE
Comment[nb]=KDE Hjelpesenter
Comment[nds]=Dat KDE-H??lpzentrum
Comment[ne]=??????????????? ??????????????? ?????????????????????
Comment[nl]=Het KDE-documentatiecentrum
Comment[nn]=KDE Hjelpesenter
Comment[nso]=Bogare bja Thuso ya KDE
Comment[oc]=Lo centre d'ajuda KDE
Comment[pa]=??????????????? ?????????????????? ???????????????
Comment[pl]=Centrum Pomocy KDE
Comment[pt]=O Centro de Ajuda do KDE
Comment[pt_BR]=Centro de Ajuda do KDE
Comment[ro]=Centrul de ajutor al KDE
Comment[ru]=?????????? ?????????????? KDE
Comment[rw]=KDE Ifashayobora Hagati
Comment[se]=KDE veahkkeguovdd????
Comment[sk]=KDE Centrum pomocn??k
Comment[sl]=Sredi????e pomo??i za KDE
Comment[sr]=KDE ???????????? ???? ??????????
Comment[sr at Latn]=KDE centar za pomo??
Comment[sv]=KDE:s hj??lpcentral
Comment[ta]=KDE ???????????? ???????????????
Comment[te]=??????????????? ???????????? ?????????????????????
Comment[tg]=?????????????? ???????????????? KDE
Comment[th]=??????????????????????????????????????????????????? KDE
Comment[tr]=KDE Yard??m Merkezi
Comment[tt]=KDE Y??rd??m ??z??ge
Comment[uk]=?????????? ?????????????? KDE
Comment[uz]=KDE ?????????? ??????????????
Comment[ven]=Senthara ya thuso ya KDE
Comment[vi]=Trung t??m Tr??? gi??p KDE
Comment[wa]=Li Cinte d' aidance KDE
Comment[xh]=Umbindi woncedo lwe KDE
Comment[zh_CN]=KDE ????????????
Comment[zh_TW]=KDE ????????????
Comment[zu]=Indawo Yosizi ye-KDE
Icon=khelpcenter
DocPath=khelpcenter/index.html
Type=Service
Terminal=false
Exec=khelpcenter %u
SwallowExec=
SwallowTitle=
X-KDE-StartupNotify=true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Feb 2008 15:23:29 -0000	1.5
+++ .cvsignore	9 Mar 2008 01:43:26 -0000	1.6
@@ -1,2 +1,3 @@
 kdebase-runtime-4.0.0.tar.bz2
 kdebase-runtime-4.0.1.tar.bz2
+kdebase-runtime-4.0.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/kdebase-runtime.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdebase-runtime.spec	7 Feb 2008 15:23:29 -0000	1.4
+++ kdebase-runtime.spec	9 Mar 2008 01:43:26 -0000	1.5
@@ -2,18 +2,21 @@
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %define kde3_desktop 1
-%define _with_samba --with-samba
 %endif
 
+%define _with_samba --with-samba
+
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.0.1
-Release:       1%{?dist}
+Version:       4.0.2
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
+# KDE 3 version of this service description
+Source1:       khelpcenter.desktop
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdebase4-runtime < %{version}-%{release}
@@ -49,9 +52,7 @@
 BuildRequires: strigi-devel >= 0.5.7
 BuildRequires: xine-lib-devel
 # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-%if 0%{?fedora} > 7 
-BuildRequires:  libxcb-devel
-%endif
+BuildRequires: libxcb-devel
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -163,6 +164,11 @@
 # remove country flags because some people/countries forbid some other
 # people/countries' flags :-(
 rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png
+# install this service for KDE 3 applications
+# NOTE: This is not a standard .desktop file, but an "almost standard" one
+#       installed into a KDE-3-specific directory, as usual for KDE 3 services,
+#       so we can't use desktop-file-install for it.
+install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
 %endif
 
 
@@ -197,7 +203,9 @@
 %{_kde4_datadir}/sounds/*
 %{_kde4_docdir}/HTML/en/
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/libexec/*
+%{_kde4_libdir}/kde4/plugins/styles/
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
 
@@ -211,10 +219,28 @@
 %{_kde4_datadir}/locale/en_US/entry.desktop
 %{_kde4_datadir}/locale/l10n/*.desktop
 %{_kde4_datadir}/locale/l10n/*/entry.desktop
+%{_datadir}/services/khelpcenter.desktop
 %endif
 
 
 %changelog
+* Fri Mar 07 2008 Kevin Kofler  4.0.2-3
+- BR libxcb-devel everywhere (including F7)
+
+* Fri Mar 07 2008 Kevin Kofler  4.0.2-2
+- if building for a KDE 4 desktop, include the khelpcenter.desktop service
+  description for KDE 3 here so help works in KDE 3 apps
+
+* Fri Feb 29 2008 Than Ngo  4.0.2-1
+- 4.0.2
+
+* Mon Feb 25 2008 Rex Dieter  4.0.1-3
+- %%files: don't own %%_kde4_libdir/kde4/plugins (thanks wolfy!)
+
+* Sat Feb 23 2008 Kevin Kofler  4.0.1-2
+- reenable kio_smb everywhere (including F9) now that we have a GPLv3 qt4
+  (kio_smb itself is already GPLv2+)
+
 * Wed Jan 30 2008 Rex Dieter  4.0.1-1
 - 4.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Feb 2008 15:23:29 -0000	1.5
+++ sources	9 Mar 2008 01:43:26 -0000	1.6
@@ -1 +1 @@
-f6dbc7f6580d971ce2748c2773999a6a  kdebase-runtime-4.0.1.tar.bz2
+28d979899554d731e20d4b88b44092ae  kdebase-runtime-4.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 01:44:11 2008
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 9 Mar 2008 01:44:11 GMT
Subject: rebuild-scripts bumpspecfile.py,1.20,1.21
Message-ID: <200803090144.m291iBJP022092@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22076

Modified Files:
	bumpspecfile.py 
Log Message:
for fedora jpp scheme with pre-releases always bump right of "jpp."


Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bumpspecfile.py	9 Mar 2008 01:06:08 -0000	1.20
+++ bumpspecfile.py	9 Mar 2008 01:44:10 -0000	1.21
@@ -104,29 +104,18 @@
     def increaseJPP(self, release):
         """Fedora jpackage release versioning scheme"""
 
-        if release.startswith('0.'):
-            # Then it is the Fedora pre-release versioning scheme
-            # at the beginning.
-            return self.increaseMain(release)
-
-        old = release
-        relre = re.compile(r'^(?P
0\.)?(?P\d+)(?Pjpp\.)(?P.*)', re.I)
+        relre = re.compile(r'(?P\.)?(?P\d+)(?Pjpp\.)(?P.*)', re.I)
         relmatch = relre.search(release)
         if not relmatch:  # pattern match failed
             raise BumpSpecError
         
-        pre = relmatch.group('pre') or ''
-        value = int(relmatch.group('rel'))
-        jpp = relmatch.group('jpp')
         post = relmatch.group('post')
-
         newpost = self.increaseMain(post)
-        new = pre+str(value)+jpp+newpost
+        new = release.replace(post, newpost)
         return new
 
     def increaseFallback(self, release):
         """bump at the very-right or add .1 as a last resort"""
-        old = release
         relre = re.compile(r'(?P.+\.)(?P\d+$)', re.I)
         relmatch = relre.search(release)
         if relmatch:
@@ -134,7 +123,7 @@
             post = relmatch.group('post')
             new = prefix+self.increaseMain(post)
         else:
-            new = old.rstrip()+'.1'
+            new = release.rstrip()+'.1'
         return new
 
     def increase(self, match):



From fedora-extras-commits at redhat.com  Sun Mar  9 01:48:07 2008
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sun, 9 Mar 2008 01:48:07 GMT
Subject: rpms/granule/F-8 granule.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <200803090148.m291m72i022253@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22221

Modified Files:
	granule.spec sources 
Log Message:
F-8: granule-1.3.0 build 2


Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/F-8/granule.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- granule.spec	10 Feb 2008 21:46:38 -0000	1.8
+++ granule.spec	9 Mar 2008 01:47:34 -0000	1.9
@@ -4,7 +4,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.3.0
-Release:    0%{?dist}
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/granule/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Feb 2008 21:46:38 -0000	1.5
+++ sources	9 Mar 2008 01:47:34 -0000	1.6
@@ -1 +1 @@
-0448084abbfe40884dd8e13f56b3b87e  granule-1.3.0.tar.gz
+7d19feaee6d6702bde84441b1b9c5fb3  granule-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  9 02:17:53 2008
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Sun, 9 Mar 2008 02:17:53 GMT
Subject: rpms/clutter-gst/F-8 .cvsignore, 1.3, 1.4 clutter-gst.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200803090217.m292HrEr030010@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/clutter-gst/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29923/F-8

Modified Files:
	.cvsignore clutter-gst.spec sources 
Log Message:

Update to 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clutter-gst/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2007 19:38:49 -0000	1.3
+++ .cvsignore	9 Mar 2008 02:17:19 -0000	1.4
@@ -1 +1 @@
-clutter-gst-0.4.0.tar.gz
+clutter-gst-0.6.1.tar.gz


Index: clutter-gst.spec
===================================================================
RCS file: /cvs/extras/rpms/clutter-gst/F-8/clutter-gst.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clutter-gst.spec	3 Sep 2007 19:38:49 -0000	1.2
+++ clutter-gst.spec	9 Mar 2008 02:17:19 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           clutter-gst
-Version:        0.4.0
+Version:        0.6.1
 Release:        1%{?dist}
 Summary:        ClutterMedia interface to GStreamer
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.6/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  clutter-devel gstreamer-plugins-base-devel gstreamer-devel 
@@ -45,20 +45,23 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-%exclude %{_libdir}/libclutter-gst-0.4.la
-%{_libdir}/libclutter-gst-0.4.so.0
-%{_libdir}/libclutter-gst-0.4.so.0.400.0
+%exclude %{_libdir}/libclutter-gst-0.6.la
+%{_libdir}/libclutter-gst-0.6.so.0
+%{_libdir}/libclutter-gst-0.6.so.0.601.0
 %{_datadir}/gtk-doc/html/clutter-gst
 
 %files devel
 %defattr(-,root,root,-)
 %doc
 %{_includedir}/*
-%{_libdir}/pkgconfig/clutter-gst-0.4.pc
-%{_libdir}/libclutter-gst-0.4.so
+%{_libdir}/pkgconfig/clutter-gst-0.6.pc
+%{_libdir}/libclutter-gst-0.6.so
 
 %changelog
 
+* Sat Mar  8 2008 Allisson Azevedo  0.6.1-1
+- Update to 0.6.1
+
 * Mon Sep  3 2007 Allisson Azevedo  0.4.0-1
 - Update to 0.4.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clutter-gst/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2007 19:38:49 -0000	1.3
+++ sources	9 Mar 2008 02:17:19 -0000	1.4
@@ -1 +1 @@
-9b6ff997131619705a9d3796d38929c9  clutter-gst-0.4.0.tar.gz
+cdee16fa97ed109a6850ecbbcfff9aea  clutter-gst-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  9 02:18:12 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Mar 2008 02:18:12 GMT
Subject: rpms/kdebase4/F-7 kdebase-4.0.2-favicons.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 kdebase4.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200803090218.m292IC7P030051@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29950/F-7

Modified Files:
	.cvsignore kdebase4.spec sources 
Added Files:
	kdebase-4.0.2-favicons.patch 
Log Message:
Sync from devel:

* Fri Feb 29 2008 Luk???? Tinkl  4.0.2-2
- fix favicons infinite loop

* Thu Feb 28 2008 Than Ngo  4.0.2-1
- 4.0.2

* Mon Feb 18 2008 Than Ngo  4.0.1-4
- fix nsplugins hangs during login

kdebase-4.0.2-favicons.patch:

--- NEW FILE kdebase-4.0.2-favicons.patch ---
--- apps/lib/konq/favicons/favicons.cpp	2008/02/28 19:30:44	780317
+++ apps/lib/konq/favicons/favicons.cpp	2008/02/28 19:32:10	780318
@@ -232,9 +232,11 @@
         if( ir.canRead() ) {
 
             while( ir.imageCount() > 1
-              && ir.currentImageRect() != QRect( 0, 0, desired.width(), desired.height() )
-              && ir.imageCount() >= ir.currentImageNumber() )
-                ir.jumpToNextImage();
+              && ir.currentImageRect() != QRect(0, 0, desired.width(), desired.height())) {
+                if (!ir.jumpToNextImage()) {
+                    break;
+                }
+            }
             ir.setScaledSize( desired );
             QImage img = ir.read();
             if( !img.isNull() ) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Feb 2008 18:00:32 -0000	1.6
+++ .cvsignore	9 Mar 2008 02:17:33 -0000	1.7
@@ -1 +1 @@
-kdebase-4.0.1.tar.bz2
+kdebase-4.0.2.tar.bz2


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/kdebase4.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdebase4.spec	7 Feb 2008 18:00:32 -0000	1.8
+++ kdebase4.spec	9 Mar 2008 02:17:33 -0000	1.9
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.0.1
-Release: 3%{?dist}
+Version: 4.0.2
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -23,6 +23,8 @@
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+# upstream patches
+Patch0:    kdebase-4.0.2-favicons.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde-filesystem >= 4
@@ -128,6 +130,7 @@
 
 %prep
 %setup -q -n kdebase-%{version}
+%patch0 -p0 -b .favicons
 
 %build
 
@@ -306,6 +309,15 @@
 
 
 %changelog
+* Fri Feb 29 2008 Luk???? Tinkl  4.0.2-2
+- fix favicons infinite loop
+
+* Thu Feb 28 2008 Than Ngo  4.0.2-1
+- 4.0.2
+
+* Mon Feb 18 2008 Than Ngo  4.0.1-4
+- fix nsplugins hangs during login
+
 * Mon Feb 04 2008 Than Ngo  4.0.1-3
 - respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Feb 2008 18:00:32 -0000	1.6
+++ sources	9 Mar 2008 02:17:33 -0000	1.7
@@ -1 +1 @@
-c665c4758ac8739ad120c3ca0070136a  kdebase-4.0.1.tar.bz2
+19cb1996626417f2bf23e9bcbd7dbf00  kdebase-4.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 02:18:15 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Mar 2008 02:18:15 GMT
Subject: rpms/kdebase4/F-8 kdebase-4.0.2-favicons.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 kdebase4.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200803090218.m292IFZ2030059@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29950/F-8

Modified Files:
	.cvsignore kdebase4.spec sources 
Added Files:
	kdebase-4.0.2-favicons.patch 
Log Message:
Sync from devel:

* Fri Feb 29 2008 Luk???? Tinkl  4.0.2-2
- fix favicons infinite loop

* Thu Feb 28 2008 Than Ngo  4.0.2-1
- 4.0.2

* Mon Feb 18 2008 Than Ngo  4.0.1-4
- fix nsplugins hangs during login

kdebase-4.0.2-favicons.patch:

--- NEW FILE kdebase-4.0.2-favicons.patch ---
--- apps/lib/konq/favicons/favicons.cpp	2008/02/28 19:30:44	780317
+++ apps/lib/konq/favicons/favicons.cpp	2008/02/28 19:32:10	780318
@@ -232,9 +232,11 @@
         if( ir.canRead() ) {
 
             while( ir.imageCount() > 1
-              && ir.currentImageRect() != QRect( 0, 0, desired.width(), desired.height() )
-              && ir.imageCount() >= ir.currentImageNumber() )
-                ir.jumpToNextImage();
+              && ir.currentImageRect() != QRect(0, 0, desired.width(), desired.height())) {
+                if (!ir.jumpToNextImage()) {
+                    break;
+                }
+            }
             ir.setScaledSize( desired );
             QImage img = ir.read();
             if( !img.isNull() ) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Feb 2008 18:00:38 -0000	1.6
+++ .cvsignore	9 Mar 2008 02:17:42 -0000	1.7
@@ -1 +1 @@
-kdebase-4.0.1.tar.bz2
+kdebase-4.0.2.tar.bz2


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/kdebase4.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kdebase4.spec	7 Feb 2008 18:00:38 -0000	1.10
+++ kdebase4.spec	9 Mar 2008 02:17:42 -0000	1.11
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.0.1
-Release: 3%{?dist}
+Version: 4.0.2
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -23,6 +23,8 @@
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+# upstream patches
+Patch0:    kdebase-4.0.2-favicons.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde-filesystem >= 4
@@ -128,6 +130,7 @@
 
 %prep
 %setup -q -n kdebase-%{version}
+%patch0 -p0 -b .favicons
 
 %build
 
@@ -306,6 +309,15 @@
 
 
 %changelog
+* Fri Feb 29 2008 Luk???? Tinkl  4.0.2-2
+- fix favicons infinite loop
+
+* Thu Feb 28 2008 Than Ngo  4.0.2-1
+- 4.0.2
+
+* Mon Feb 18 2008 Than Ngo  4.0.1-4
+- fix nsplugins hangs during login
+
 * Mon Feb 04 2008 Than Ngo  4.0.1-3
 - respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Feb 2008 18:00:38 -0000	1.6
+++ sources	9 Mar 2008 02:17:42 -0000	1.7
@@ -1 +1 @@
-c665c4758ac8739ad120c3ca0070136a  kdebase-4.0.1.tar.bz2
+19cb1996626417f2bf23e9bcbd7dbf00  kdebase-4.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 02:36:55 2008
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 9 Mar 2008 02:36:55 GMT
Subject: rebuild-scripts bumpspecfile.py,1.21,1.22
Message-ID: <200803090236.m292atjq030429@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30413

Modified Files:
	bumpspecfile.py 
Log Message:
handle bad pre-release values and drop re.I where it is not needed


Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bumpspecfile.py	9 Mar 2008 01:44:10 -0000	1.21
+++ bumpspecfile.py	9 Mar 2008 02:36:54 -0000	1.22
@@ -78,45 +78,47 @@
                 break
 
     def increaseMain(self, release):
-        relre = re.compile(r'^(?P
0\.)?(?P\d+)(?P.*)', re.I)
+        if release.startswith('0.'):
+            relre = re.compile(r'^0\.(?P\d+)(?P.*)')
+            pre = True
+        else:
+            relre = re.compile(r'^(?P\d+)(?P.*)')
+            pre = False
         relmatch = relre.search(release)
         if not relmatch:  # pattern match failed
             raise BumpSpecError
-        pre = relmatch.group('pre') or ''
         value = int(relmatch.group('rel'))
         post = relmatch.group('post')
 
-        old = pre
-        old += relmatch.group('rel')+post
-        
-        if pre == '':
+        if not pre:
             if post.find('rc')>=0:
                 print 'WARNING: Bad pre-release versioning scheme:', self.filename
                 raise BumpSpecError
             new = `value+1`+post
         else:
-            if value == None or value > 10000:
-                print 'WARNING: Bad pre-release versioning scheme:', self.filename
-                raise BumpSpecError
             new = '0.'+`value+1`+post
         return new
 
     def increaseJPP(self, release):
         """Fedora jpackage release versioning scheme"""
 
-        relre = re.compile(r'(?P\.)?(?P\d+)(?Pjpp\.)(?P.*)', re.I)
+        relre = re.compile(r'(?P.*)(?P\d+)(?Pjpp\.)(?P.*)')
         relmatch = relre.search(release)
         if not relmatch:  # pattern match failed
             raise BumpSpecError
         
+        prefix = relmatch.group('prefix')
+        value = int(relmatch.group('rel'))
+        jpp = relmatch.group('jpp')
         post = relmatch.group('post')
+
         newpost = self.increaseMain(post)
-        new = release.replace(post, newpost)
+        new = prefix+str(value)+jpp+newpost
         return new
 
     def increaseFallback(self, release):
         """bump at the very-right or add .1 as a last resort"""
-        relre = re.compile(r'(?P.+\.)(?P\d+$)', re.I)
+        relre = re.compile(r'(?P.+\.)(?P\d+$)')
         relmatch = relre.search(release)
         if relmatch:
             prefix = relmatch.group('prefix')



From fedora-extras-commits at redhat.com  Sun Mar  9 02:39:57 2008
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 9 Mar 2008 02:39:57 GMT
Subject: rebuild-scripts bumpspecfile.py,1.22,1.23
Message-ID: <200803090239.m292dvM4030514@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30498

Modified Files:
	bumpspecfile.py 
Log Message:
xastir.spec puts spaces between "Release" and ":"


Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bumpspecfile.py	9 Mar 2008 02:36:54 -0000	1.22
+++ bumpspecfile.py	9 Mar 2008 02:39:57 -0000	1.23
@@ -33,10 +33,10 @@
         f.close()
         
     def bumpRelease(self):
-        bump_patterns = [(re.compile(r"^Release:\s*(\d+.*)", re.I), self.increase), 
+        bump_patterns = [(re.compile(r"^Release\s*:\s*(\d+.*)", re.I), self.increase), 
                        (re.compile(r"^%define\s+rel\s+(\d+.*)"), self.increase), 
                        (re.compile(r"^%define\s+release\s+(\d+.*)", re.I), self.increase), 
-                       (re.compile(r"^Release:\s+%release_func\s+(\d+.*)"), self.increase),
+                       (re.compile(r"^Release\s*:\s+%release_func\s+(\d+.*)"), self.increase),
                        (re.compile(r"^%define\s+baserelease\s+(\d+.*)"), self.increase),
                        ]
         skip_pattern = re.compile(r"\$Revision:")



From fedora-extras-commits at redhat.com  Sun Mar  9 02:40:56 2008
From: fedora-extras-commits at redhat.com (Allisson Azevedo (allisson))
Date: Sun, 9 Mar 2008 02:40:56 GMT
Subject: rpms/clutter-gtk/F-8 .cvsignore, 1.3, 1.4 clutter-gtk.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200803090240.m292eueb030559@cvs-int.fedora.redhat.com>

Author: allisson

Update of /cvs/extras/rpms/clutter-gtk/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30531/F-8

Modified Files:
	.cvsignore clutter-gtk.spec sources 
Log Message:

Update to 0.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clutter-gtk/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Sep 2007 19:53:57 -0000	1.3
+++ .cvsignore	9 Mar 2008 02:40:21 -0000	1.4
@@ -1 +1 @@
-clutter-gtk-0.4.0.tar.gz
+clutter-gtk-0.6.0.tar.gz


Index: clutter-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/clutter-gtk/F-8/clutter-gtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clutter-gtk.spec	3 Sep 2007 19:53:57 -0000	1.2
+++ clutter-gtk.spec	9 Mar 2008 02:40:21 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           clutter-gtk
-Version:        0.4.0
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        A basic GTK clutter widget
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.clutter-project.org
-Source0:        http://www.clutter-project.org/sources/%{name}/0.4/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.6/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel clutter-devel       
@@ -50,21 +50,24 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS
-%exclude %{_libdir}/libclutter-gtk-0.4.la
-%{_libdir}/libclutter-gtk-0.4.so.0
-%{_libdir}/libclutter-gtk-0.4.so.0.400.0
+%exclude %{_libdir}/*.la
+%{_libdir}/libclutter-gtk-0.6.so.0
+%{_libdir}/libclutter-gtk-0.6.so.0.600.0
 %{_datadir}/gtk-doc/html/clutter-gtk
 
 
 %files devel
 %defattr(-,root,root,-)
 %doc
-%{_libdir}/pkgconfig/clutter-gtk-0.4.pc
-%{_libdir}/libclutter-gtk-0.4.so
-%{_includedir}/clutter-0.4/clutter-gtk
+%{_libdir}/pkgconfig/clutter-gtk-0.6.pc
+%{_libdir}/libclutter-gtk-0.6.so
+%{_includedir}/clutter-0.6/clutter-gtk
 
 %changelog
 
+* Sat Mar  8 2008 Allisson Azevedo  0.6.0-1
+- Update to 0.6.0
+
 * Mon Sep  3 2007 Allisson Azevedo  0.4.0-1
 - Update to 0.4.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clutter-gtk/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Sep 2007 19:53:57 -0000	1.3
+++ sources	9 Mar 2008 02:40:21 -0000	1.4
@@ -1 +1 @@
-c3daf6a39749a10d4f5c9fbd3ea1da72  clutter-gtk-0.4.0.tar.gz
+34591bdec4d2498e10ce4dd5aed6ada4  clutter-gtk-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  9 02:44:43 2008
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 9 Mar 2008 02:44:43 GMT
Subject: rpms/cacti/devel cacti.spec,1.20,1.21
Message-ID: <200803090244.m292ihrn030717@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30694

Modified Files:
	cacti.spec 
Log Message:
fix date in last changelog entry -- RPM complains about it


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cacti.spec	14 Feb 2008 14:15:00 -0000	1.20
+++ cacti.spec	9 Mar 2008 02:43:59 -0000	1.21
@@ -100,7 +100,7 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
-* Thu Nov 14 2008 Mike McGrath  - 0.8.7b-1
+* Thu Feb 14 2008 Mike McGrath  - 0.8.7b-1
 - Upstream released new version
 
 * Fri Nov 23 2007 Mike McGrath  - 0.8.7a-2



From fedora-extras-commits at redhat.com  Sun Mar  9 03:00:25 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 03:00:25 GMT
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.39,1.40
Message-ID: <200803090300.m2930P5D030948@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30923

Modified Files:
	perl-PDL.spec 
Log Message:
perl 5.10 fix from p5p


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- perl-PDL.spec	7 Mar 2008 02:13:33 -0000	1.39
+++ perl-PDL.spec	9 Mar 2008 02:59:44 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -17,6 +17,7 @@
 Patch7:         perl-PDL-2.4.3-fortran.patch
 Patch8:	        perl-PDL-2.4.3-test_hdf.patch
 Patch9:	        perl-PDL-2.4.3-gsl.patch
+Patch10:        PDL-2.4.3-perl510.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -61,6 +62,7 @@
 %patch7 -p1 -b .fortran
 %patch8 -p1 -b .patch_hdf
 %patch9 -p1 -b .gsl
+%patch10 -p1 -b .perl510
 
 # Provides: explicitly filter perl(Inline)
 cat <<__EOF__ > %{name}-findperlprovides
@@ -142,8 +144,11 @@
 
 
 %changelog
+* Sat Mar 08 2008 Tom "spot" Callaway  - 2.4.3-9
+- patch to fix build against perl 5.10, get useful random numbers
+
 * Thu Mar 06 2008 Tom "spot" Callaway  - 2.4.3-8
-Rebuild for new perl
+- Rebuild for new perl
 
 * Tue Mar 04 2008 Orion Poplawski  - 2.4.3-7
 - Add patch to build GSL support with GSL 1.10



From fedora-extras-commits at redhat.com  Sun Mar  9 03:03:20 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 03:03:20 GMT
Subject: rpms/perl-PDL/devel PDL-2.4.3-perl510.patch, NONE, 1.1 perl-PDL.spec,
	1.40, 1.41
Message-ID: <200803090303.m2933KfS005780@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5746

Modified Files:
	perl-PDL.spec 
Added Files:
	PDL-2.4.3-perl510.patch 
Log Message:
perl 5.10 fix from p5p

PDL-2.4.3-perl510.patch:

--- NEW FILE PDL-2.4.3-perl510.patch ---
diff -up PDL-2.4.3/Basic/Primitive/Makefile.PL.BAD PDL-2.4.3/Basic/Primitive/Makefile.PL
--- PDL-2.4.3/Basic/Primitive/Makefile.PL.BAD	2008-03-08 21:37:30.000000000 -0500
+++ PDL-2.4.3/Basic/Primitive/Makefile.PL	2008-03-08 21:38:16.000000000 -0500
@@ -5,6 +5,7 @@
 # any external PDL module.
 
 use ExtUtils::MakeMaker;
+use Config;
 
 PDL::Core::Dev->import();
 
@@ -43,6 +44,13 @@ EOT
 #);
 %hash = pdlpp_stdargs_int(@::pack);
 $hash{LIBS}->[0] .= ' -lm';
+
+# If we don't do this, and Perl core is using the wrapped API, then it will
+# call (say) srand48_r(), and get its random numbers from drand48_r(), but we
+# will get ours from drand48(), and srand48() never gets called.
+$hash{CCFLAGS} ||= $Config{ccflags};
+$hash{CCFLAGS} .= ' -DPERL_REENTR_API';
+
 WriteMakefile(%hash);
 
 sub MY::postamble {


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- perl-PDL.spec	9 Mar 2008 02:59:44 -0000	1.40
+++ perl-PDL.spec	9 Mar 2008 03:02:44 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Sat Mar 08 2008 Tom "spot" Callaway  - 2.4.3-10
+- actually commit patch to cvs
+
 * Sat Mar 08 2008 Tom "spot" Callaway  - 2.4.3-9
 - patch to fix build against perl 5.10, get useful random numbers
 



From fedora-extras-commits at redhat.com  Sun Mar  9 03:42:45 2008
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sun, 9 Mar 2008 03:42:45 GMT
Subject: rpms/granule/devel granule.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <200803090342.m293gjNw006371@cvs-int.fedora.redhat.com>

Author: vlg

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

Modified Files:
	granule.spec sources 
Log Message:
devel: granule-1.3.0 build 2


Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/granule.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- granule.spec	10 Feb 2008 20:43:06 -0000	1.8
+++ granule.spec	9 Mar 2008 03:42:08 -0000	1.9
@@ -4,7 +4,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.3.0
-Release:    0%{?dist}
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Feb 2008 20:43:06 -0000	1.5
+++ sources	9 Mar 2008 03:42:08 -0000	1.6
@@ -1 +1 @@
-0448084abbfe40884dd8e13f56b3b87e  granule-1.3.0.tar.gz
+7d19feaee6d6702bde84441b1b9c5fb3  granule-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  9 04:38:44 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 04:38:44 GMT
Subject: rpms/perl-PDL/devel perl-PDL-2.4.3-noDISPLAY.patch, NONE,
	1.1 perl-PDL.spec, 1.41, 1.42
Message-ID: <200803090438.m294ciQk011501@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11466

Modified Files:
	perl-PDL.spec 
Added Files:
	perl-PDL-2.4.3-noDISPLAY.patch 
Log Message:
fix the broken GL test case

perl-PDL-2.4.3-noDISPLAY.patch:

--- NEW FILE perl-PDL-2.4.3-noDISPLAY.patch ---
diff -up PDL-2.4.3/Graphics/TriD/OpenGL/test.pl.BAD PDL-2.4.3/Graphics/TriD/OpenGL/test.pl
--- PDL-2.4.3/Graphics/TriD/OpenGL/test.pl.BAD	2008-03-08 23:17:13.000000000 -0500
+++ PDL-2.4.3/Graphics/TriD/OpenGL/test.pl	2008-03-08 23:19:34.000000000 -0500
@@ -11,6 +11,14 @@ $SIG{__DIE__} = sub {print Carp::longmes
 STDOUT->autoflush(1);
 STDERR->autoflush(1);
 
+sub hasDISPLAY {
+  return defined $ENV{DISPLAY} && $ENV{DISPLAY} !~ /^\s*$/;
+}
+
+if ( ! hasDISPLAY()) {
+  exit;
+}
+
 use PDL::Graphics::OpenGL;
 
 my $numwins = shift;


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- perl-PDL.spec	9 Mar 2008 03:02:44 -0000	1.41
+++ perl-PDL.spec	9 Mar 2008 04:38:02 -0000	1.42
@@ -18,6 +18,7 @@
 Patch8:	        perl-PDL-2.4.3-test_hdf.patch
 Patch9:	        perl-PDL-2.4.3-gsl.patch
 Patch10:        PDL-2.4.3-perl510.patch
+Patch11:        perl-PDL-2.4.3-noDISPLAY.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -63,6 +64,7 @@
 %patch8 -p1 -b .patch_hdf
 %patch9 -p1 -b .gsl
 %patch10 -p1 -b .perl510
+%patch11 -p1 -b .noDISPLAY
 
 # Provides: explicitly filter perl(Inline)
 cat <<__EOF__ > %{name}-findperlprovides
@@ -126,6 +128,10 @@
 %check
 unset DISPLAY
 export PERL5LIB=`pwd`/blib/lib
+# set PERL_DL_NONLAZY=0
+#   The default behavior causes some problems because opengl.pd builds an interface for all functions
+#   defined in gl.h and glu.h even though they might not actually be in the opengl libraries.
+sed -i 's|PERL_DL_NONLAZY=1 $(FULLPERLRUN)|PERL_DL_NONLAZY=0 $(FULLPERLRUN)|g' Graphics/TriD/OpenGL/Makefile
 make test
 
 %clean
@@ -145,7 +151,8 @@
 
 %changelog
 * Sat Mar 08 2008 Tom "spot" Callaway  - 2.4.3-10
-- actually commit patch to cvs
+- PERL_DL_NONLAZY=0 for all the GL tests
+- don't run GL tests if DISPLAY is unset
 
 * Sat Mar 08 2008 Tom "spot" Callaway  - 2.4.3-9
 - patch to fix build against perl 5.10, get useful random numbers



From fedora-extras-commits at redhat.com  Sun Mar  9 04:46:35 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 04:46:35 GMT
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.42,1.43
Message-ID: <200803090446.m294kZRV011760@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11716

Modified Files:
	perl-PDL.spec 
Log Message:
fix the broken GL test case


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- perl-PDL.spec	9 Mar 2008 04:38:02 -0000	1.42
+++ perl-PDL.spec	9 Mar 2008 04:45:43 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -150,7 +150,7 @@
 
 
 %changelog
-* Sat Mar 08 2008 Tom "spot" Callaway  - 2.4.3-10
+* Sat Mar 08 2008 Tom "spot" Callaway  - 2.4.3-11
 - PERL_DL_NONLAZY=0 for all the GL tests
 - don't run GL tests if DISPLAY is unset
 



From fedora-extras-commits at redhat.com  Sun Mar  9 08:39:32 2008
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 9 Mar 2008 08:39:32 GMT
Subject: rpms/timidity++/devel TiMidity++-2.13.2-ipv6-fixes.patch, NONE,
	1.1 timidity++.spec, 1.27, 1.28
Message-ID: <200803090839.m298dWBh014692@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/timidity++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14640

Modified Files:
	timidity++.spec 
Added Files:
	TiMidity++-2.13.2-ipv6-fixes.patch 
Log Message:
* Sun Mar  9 2008 Hans de Goede  2.13.2-14
- Fix local ipv6 clients being rejected when running in server mode


TiMidity++-2.13.2-ipv6-fixes.patch:

--- NEW FILE TiMidity++-2.13.2-ipv6-fixes.patch ---
--- TiMidity++-2.13.2/interface/server_c.c	2008-03-09 09:20:52.000000000 +0100
+++ TiMidity++-2.13.2.new/interface/server_c.c	2008-03-09 09:11:16.000000000 +0100
@@ -310,7 +310,7 @@
     s = getaddrinfo(NULL, service, &hints, &result);
     if (s)
     {
-        fprintf(stderr, "getaddrinfo ", gai_strerror(s));
+        fprintf(stderr, "getaddrinfo %s", gai_strerror(s));
         return -1;
     }
 
@@ -921,8 +921,9 @@
                 return send_status(513, "Security violation: Address mismatch");
             break;
         case AF_INET6:
-            if (((struct sockaddr_in6 *) &control_client)->sin6_addr.s6_addr != 
-                ((struct sockaddr_in6 *) &in)->sin6_addr.s6_addr)
+            if (memcmp(
+                ((struct sockaddr_in6 *) &control_client)->sin6_addr.s6_addr,
+                ((struct sockaddr_in6 *) &in)->sin6_addr.s6_addr, 16))
                 return send_status(513, "Security violation: Address mismatch");
             break;
     }


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- timidity++.spec	4 Mar 2008 19:50:58 -0000	1.27
+++ timidity++.spec	9 Mar 2008 08:38:51 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2
 Source1: fedora-timidity.desktop
@@ -21,6 +21,7 @@
 Patch14: TiMidity++-2.13.2-ipv6.patch
 Patch15: TiMidity++-2.13.2-dynlibroot.patch
 Patch16: TiMidity++-2.13.2-cfgfile-name.patch
+Patch17: TiMidity++-2.13.2-ipv6-fixes.patch
 
 License: GPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +56,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 
 %build
@@ -117,6 +119,9 @@
 
 
 %changelog
+* Sun Mar  9 2008 Hans de Goede  2.13.2-14
+- Fix local ipv6 clients being rejected when running in server mode
+
 * Mon Mar  3 2008 Hans de Goede  2.13.2-13
 - Merge review fixes (bz 226492)
   - merge patch0 into patch16, drop patch0



From fedora-extras-commits at redhat.com  Sun Mar  9 08:41:57 2008
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 9 Mar 2008 08:41:57 GMT
Subject: rpms/timidity++/F-8 TiMidity++-2.13.2-ipv6-fixes.patch, NONE,
	1.1 timidity++.spec, 1.20, 1.21
Message-ID: <200803090841.m298fvrk014895@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/timidity++/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14817

Modified Files:
	timidity++.spec 
Added Files:
	TiMidity++-2.13.2-ipv6-fixes.patch 
Log Message:
* Sun Mar  9 2008 Hans de Goede  2.13.2-14
- Fix local ipv6 clients being rejected when running in server mode


TiMidity++-2.13.2-ipv6-fixes.patch:

--- NEW FILE TiMidity++-2.13.2-ipv6-fixes.patch ---
--- TiMidity++-2.13.2/interface/server_c.c	2008-03-09 09:20:52.000000000 +0100
+++ TiMidity++-2.13.2.new/interface/server_c.c	2008-03-09 09:11:16.000000000 +0100
@@ -310,7 +310,7 @@
     s = getaddrinfo(NULL, service, &hints, &result);
     if (s)
     {
-        fprintf(stderr, "getaddrinfo ", gai_strerror(s));
+        fprintf(stderr, "getaddrinfo %s", gai_strerror(s));
         return -1;
     }
 
@@ -921,8 +921,9 @@
                 return send_status(513, "Security violation: Address mismatch");
             break;
         case AF_INET6:
-            if (((struct sockaddr_in6 *) &control_client)->sin6_addr.s6_addr != 
-                ((struct sockaddr_in6 *) &in)->sin6_addr.s6_addr)
+            if (memcmp(
+                ((struct sockaddr_in6 *) &control_client)->sin6_addr.s6_addr,
+                ((struct sockaddr_in6 *) &in)->sin6_addr.s6_addr, 16))
                 return send_status(513, "Security violation: Address mismatch");
             break;
     }


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/F-8/timidity++.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- timidity++.spec	4 Mar 2008 21:27:09 -0000	1.20
+++ timidity++.spec	9 Mar 2008 08:41:24 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2
 Source1: fedora-timidity.desktop
@@ -21,6 +21,7 @@
 Patch14: TiMidity++-2.13.2-ipv6.patch
 Patch15: TiMidity++-2.13.2-dynlibroot.patch
 Patch16: TiMidity++-2.13.2-cfgfile-name.patch
+Patch17: TiMidity++-2.13.2-ipv6-fixes.patch
 
 License: GPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +56,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 
 %build
@@ -117,6 +119,9 @@
 
 
 %changelog
+* Sun Mar  9 2008 Hans de Goede  2.13.2-14
+- Fix local ipv6 clients being rejected when running in server mode
+
 * Mon Mar  3 2008 Hans de Goede  2.13.2-13
 - Merge review fixes (bz 226492)
   - merge patch0 into patch16, drop patch0



From fedora-extras-commits at redhat.com  Sun Mar  9 08:42:11 2008
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 9 Mar 2008 08:42:11 GMT
Subject: rpms/timidity++/F-7 TiMidity++-2.13.2-ipv6-fixes.patch, NONE,
	1.1 timidity++.spec, 1.15, 1.16
Message-ID: <200803090842.m298gBnP014940@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/timidity++/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14853

Modified Files:
	timidity++.spec 
Added Files:
	TiMidity++-2.13.2-ipv6-fixes.patch 
Log Message:
* Sun Mar  9 2008 Hans de Goede  2.13.2-14
- Fix local ipv6 clients being rejected when running in server mode


TiMidity++-2.13.2-ipv6-fixes.patch:

--- NEW FILE TiMidity++-2.13.2-ipv6-fixes.patch ---
--- TiMidity++-2.13.2/interface/server_c.c	2008-03-09 09:20:52.000000000 +0100
+++ TiMidity++-2.13.2.new/interface/server_c.c	2008-03-09 09:11:16.000000000 +0100
@@ -310,7 +310,7 @@
     s = getaddrinfo(NULL, service, &hints, &result);
     if (s)
     {
-        fprintf(stderr, "getaddrinfo ", gai_strerror(s));
+        fprintf(stderr, "getaddrinfo %s", gai_strerror(s));
         return -1;
     }
 
@@ -921,8 +921,9 @@
                 return send_status(513, "Security violation: Address mismatch");
             break;
         case AF_INET6:
-            if (((struct sockaddr_in6 *) &control_client)->sin6_addr.s6_addr != 
-                ((struct sockaddr_in6 *) &in)->sin6_addr.s6_addr)
+            if (memcmp(
+                ((struct sockaddr_in6 *) &control_client)->sin6_addr.s6_addr,
+                ((struct sockaddr_in6 *) &in)->sin6_addr.s6_addr, 16))
                 return send_status(513, "Security violation: Address mismatch");
             break;
     }


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/F-7/timidity++.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- timidity++.spec	4 Mar 2008 21:32:39 -0000	1.15
+++ timidity++.spec	9 Mar 2008 08:41:35 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2
 Source1: fedora-timidity.desktop
@@ -21,6 +21,7 @@
 Patch14: TiMidity++-2.13.2-ipv6.patch
 Patch15: TiMidity++-2.13.2-dynlibroot.patch
 Patch16: TiMidity++-2.13.2-cfgfile-name.patch
+Patch17: TiMidity++-2.13.2-ipv6-fixes.patch
 
 License: GPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +56,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 
 %build
@@ -117,6 +119,9 @@
 
 
 %changelog
+* Sun Mar  9 2008 Hans de Goede  2.13.2-14
+- Fix local ipv6 clients being rejected when running in server mode
+
 * Mon Mar  3 2008 Hans de Goede  2.13.2-13
 - Merge review fixes (bz 226492)
   - merge patch0 into patch16, drop patch0



From fedora-extras-commits at redhat.com  Sun Mar  9 10:18:13 2008
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Mar 2008 10:18:13 GMT
Subject: rpms/ushare/devel ushare-conf.patch, NONE, 1.1 ushare-error.patch, 
	NONE, 1.1 ushare.spec, 1.18, 1.19
Message-ID: <200803091018.m29AID4F032351@cvs-int.fedora.redhat.com>

Author: tanguy

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

Modified Files:
	ushare.spec 
Added Files:
	ushare-conf.patch ushare-error.patch 
Log Message:


ushare-conf.patch:

--- NEW FILE ushare-conf.patch ---
--- ushare-1.1a/scripts/ushare.conf	2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/scripts/ushare.conf.new	2008-03-09 09:53:12.000000000 +0100
@@ -31,15 +31,15 @@
 USHARE_OVERRIDE_ICONV_ERR=
 
 # Enable Web interface (yes/no)
-ENABLE_WEB=
+USHARE_ENABLE_WEB=
 
 # Enable Telnet control interface (yes/no)
-ENABLE_TELNET=
+USHARE_ENABLE_TELNET=
 
 # Use XboX 360 compatibility mode (yes/no)
-ENABLE_XBOX=
+USHARE_ENABLE_XBOX=
 
 # Use DLNA profile (yes/no)
 # This is needed for PlayStation3 to work (among other devices)
-ENABLE_DLNA=
+USHARE_ENABLE_DLNA=
 

ushare-error.patch:

--- NEW FILE ushare-error.patch ---
--- ushare-1.1a/src/ushare.c	2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/src/ushare.c.new	2008-03-09 09:58:06.000000000 +0100
@@ -424,8 +424,6 @@
     if ((itf->ifa_flags & IFF_UP)
         && !strncmp (itf->ifa_name, interface, IFNAMSIZ))
     {
-      log_error (_("Interface %s is down.\n"), interface);
-      log_error (_("Recheck uShare's configuration and try again !\n"));
       freeifaddrs (itflist);
       return true;
     }


Index: ushare.spec
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/ushare.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ushare.spec	2 Feb 2008 16:24:25 -0000	1.18
+++ ushare.spec	9 Mar 2008 10:17:31 -0000	1.19
@@ -1,13 +1,15 @@
 Summary: UPnP (TM) A/V Media Server
 Name: ushare
 Version: 1.1a
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://ushare.geexbox.org/
 
 Source: http://ushare.geexbox.org/releases/%{name}-%{version}.tar.bz2
 Source1:ushare.init
+Patch0: ushare-conf.patch
+Patch1: ushare-error.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libupnp-devel, pkgconfig
@@ -25,6 +27,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 iconv -f ISO_8859-1 -t UTF-8 AUTHORS --output AUTHORS.utf8
 cp -af AUTHORS.utf8 AUTHORS
 
@@ -74,6 +78,9 @@
 %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/
 
 %changelog
+* Sun Mar 09 2008 Eric Tanguy  - 1.1a-4
+- BZ 436605 & 436607
+
 * Fri Jan 25 2008 Eric Tanguy  - 1.1a-3
 - Correct some spec error
 



From fedora-extras-commits at redhat.com  Sun Mar  9 10:24:03 2008
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Mar 2008 10:24:03 GMT
Subject: rpms/ushare/F-8 ushare-conf.patch, NONE, 1.1 ushare-error.patch,
	NONE, 1.1 ushare.spec, 1.17, 1.18
Message-ID: <200803091024.m29AO37t032634@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32586

Modified Files:
	ushare.spec 
Added Files:
	ushare-conf.patch ushare-error.patch 
Log Message:


ushare-conf.patch:

--- NEW FILE ushare-conf.patch ---
--- ushare-1.1a/scripts/ushare.conf	2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/scripts/ushare.conf.new	2008-03-09 09:53:12.000000000 +0100
@@ -31,15 +31,15 @@
 USHARE_OVERRIDE_ICONV_ERR=
 
 # Enable Web interface (yes/no)
-ENABLE_WEB=
+USHARE_ENABLE_WEB=
 
 # Enable Telnet control interface (yes/no)
-ENABLE_TELNET=
+USHARE_ENABLE_TELNET=
 
 # Use XboX 360 compatibility mode (yes/no)
-ENABLE_XBOX=
+USHARE_ENABLE_XBOX=
 
 # Use DLNA profile (yes/no)
 # This is needed for PlayStation3 to work (among other devices)
-ENABLE_DLNA=
+USHARE_ENABLE_DLNA=
 

ushare-error.patch:

--- NEW FILE ushare-error.patch ---
--- ushare-1.1a/src/ushare.c	2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/src/ushare.c.new	2008-03-09 09:58:06.000000000 +0100
@@ -424,8 +424,6 @@
     if ((itf->ifa_flags & IFF_UP)
         && !strncmp (itf->ifa_name, interface, IFNAMSIZ))
     {
-      log_error (_("Interface %s is down.\n"), interface);
-      log_error (_("Recheck uShare's configuration and try again !\n"));
       freeifaddrs (itflist);
       return true;
     }


Index: ushare.spec
===================================================================
RCS file: /cvs/extras/rpms/ushare/F-8/ushare.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ushare.spec	3 Feb 2008 07:56:30 -0000	1.17
+++ ushare.spec	9 Mar 2008 10:23:15 -0000	1.18
@@ -1,13 +1,15 @@
 Summary: UPnP (TM) A/V Media Server
 Name: ushare
 Version: 1.1a
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://ushare.geexbox.org/
 
 Source: http://ushare.geexbox.org/releases/%{name}-%{version}.tar.bz2
 Source1:ushare.init
+Patch0: ushare-conf.patch
+Patch1: ushare-error.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libupnp-devel, pkgconfig
@@ -25,6 +27,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 iconv -f ISO_8859-1 -t UTF-8 AUTHORS --output AUTHORS.utf8
 cp -af AUTHORS.utf8 AUTHORS
 
@@ -74,6 +78,9 @@
 %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/
 
 %changelog
+* Sun Mar 09 2008 Eric Tanguy  - 1.1a-4
+- BZ 436605 & 436607
+
 * Fri Jan 25 2008 Eric Tanguy  - 1.1a-3
 - Correct some spec error
 



From fedora-extras-commits at redhat.com  Sun Mar  9 10:27:48 2008
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 9 Mar 2008 10:27:48 GMT
Subject: rpms/ushare/F-7 ushare-conf.patch, NONE, 1.1 ushare-error.patch,
	NONE, 1.1 ushare.spec, 1.17, 1.18
Message-ID: <200803091027.m29ARmen000382@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv336

Modified Files:
	ushare.spec 
Added Files:
	ushare-conf.patch ushare-error.patch 
Log Message:


ushare-conf.patch:

--- NEW FILE ushare-conf.patch ---
--- ushare-1.1a/scripts/ushare.conf	2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/scripts/ushare.conf.new	2008-03-09 09:53:12.000000000 +0100
@@ -31,15 +31,15 @@
 USHARE_OVERRIDE_ICONV_ERR=
 
 # Enable Web interface (yes/no)
-ENABLE_WEB=
+USHARE_ENABLE_WEB=
 
 # Enable Telnet control interface (yes/no)
-ENABLE_TELNET=
+USHARE_ENABLE_TELNET=
 
 # Use XboX 360 compatibility mode (yes/no)
-ENABLE_XBOX=
+USHARE_ENABLE_XBOX=
 
 # Use DLNA profile (yes/no)
 # This is needed for PlayStation3 to work (among other devices)
-ENABLE_DLNA=
+USHARE_ENABLE_DLNA=
 

ushare-error.patch:

--- NEW FILE ushare-error.patch ---
--- ushare-1.1a/src/ushare.c	2007-12-09 14:03:36.000000000 +0100
+++ ushare-1.1a/src/ushare.c.new	2008-03-09 09:58:06.000000000 +0100
@@ -424,8 +424,6 @@
     if ((itf->ifa_flags & IFF_UP)
         && !strncmp (itf->ifa_name, interface, IFNAMSIZ))
     {
-      log_error (_("Interface %s is down.\n"), interface);
-      log_error (_("Recheck uShare's configuration and try again !\n"));
       freeifaddrs (itflist);
       return true;
     }


Index: ushare.spec
===================================================================
RCS file: /cvs/extras/rpms/ushare/F-7/ushare.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ushare.spec	3 Feb 2008 07:59:22 -0000	1.17
+++ ushare.spec	9 Mar 2008 10:27:14 -0000	1.18
@@ -1,13 +1,15 @@
 Summary: UPnP (TM) A/V Media Server
 Name: ushare
 Version: 1.1a
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://ushare.geexbox.org/
 
 Source: http://ushare.geexbox.org/releases/%{name}-%{version}.tar.bz2
 Source1:ushare.init
+Patch0: ushare-conf.patch
+Patch1: ushare-error.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libupnp-devel, pkgconfig
@@ -25,6 +27,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 iconv -f ISO_8859-1 -t UTF-8 AUTHORS --output AUTHORS.utf8
 cp -af AUTHORS.utf8 AUTHORS
 
@@ -74,6 +78,9 @@
 %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/
 
 %changelog
+* Sun Mar 09 2008 Eric Tanguy  - 1.1a-4
+- BZ 436605 & 436607
+
 * Fri Jan 25 2008 Eric Tanguy  - 1.1a-3
 - Correct some spec error
 



From fedora-extras-commits at redhat.com  Sun Mar  9 11:07:38 2008
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Sun, 9 Mar 2008 11:07:38 GMT
Subject: rpms/netpbm/devel .cvsignore, 1.33, 1.34 netpbm.spec, 1.105,
	1.106 sources, 1.37, 1.38
Message-ID: <200803091107.m29B7cJ1009017@cvs-int.fedora.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore netpbm.spec sources 
Log Message:
* Sun Mar  9 2008 Jindrich Novy  10.35.40-1
- update to 10.35.40 (fixes pgmdeshadow, pgmmedian, pgmbentley and pamtosvg)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	25 Feb 2008 04:49:12 -0000	1.33
+++ .cvsignore	9 Mar 2008 11:07:04 -0000	1.34
@@ -1 +1 @@
-netpbm-10.35.39.tar.bz2
+netpbm-10.35.40.tar.bz2


Index: netpbm.spec
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- netpbm.spec	25 Feb 2008 04:49:12 -0000	1.105
+++ netpbm.spec	9 Mar 2008 11:07:04 -0000	1.106
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.39
+Version: 10.35.40
 Release: 1%{?dist}
 License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
 Group: System Environment/Libraries
@@ -117,8 +117,8 @@
 TOP=`pwd`
 make \
 	CC=%{__cc} \
-	CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions" \
 	LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
+	CFLAGS="$RPM_OPT_FLAGS -fPIC -fPIC -flax-vector-conversions" \
 	LADD="-lm" \
 	JPEGINC_DIR=%{_includedir} \
 	PNGINC_DIR=%{_includedir} \
@@ -211,6 +211,9 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Sun Mar  9 2008 Jindrich Novy  10.35.40-1
+- update to 10.35.40 (fixes pgmdeshadow, pgmmedian, pgmbentley and pamtosvg)
+
 * Mon Feb 25 2008 Jindrich Novy  10.35.39-1
 - update to 10.35.39 (fixes crash in pamtosvg)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	25 Feb 2008 04:49:12 -0000	1.37
+++ sources	9 Mar 2008 11:07:04 -0000	1.38
@@ -1 +1 @@
-705381e0525acbdb81d7fdc39dbcd65b  netpbm-10.35.39.tar.bz2
+6a9ea0f93f3559e572e5050c12ed14e9  netpbm-10.35.40.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 11:14:11 2008
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Sun, 9 Mar 2008 11:14:11 GMT
Subject: rpms/netpbm/devel netpbm.spec,1.106,1.107
Message-ID: <200803091114.m29BEBE5009160@cvs-int.fedora.redhat.com>

Author: jnovy

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

Modified Files:
	netpbm.spec 
Log Message:
fix typo in CFLAGS



Index: netpbm.spec
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- netpbm.spec	9 Mar 2008 11:07:04 -0000	1.106
+++ netpbm.spec	9 Mar 2008 11:13:25 -0000	1.107
@@ -118,7 +118,7 @@
 make \
 	CC=%{__cc} \
 	LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
-	CFLAGS="$RPM_OPT_FLAGS -fPIC -fPIC -flax-vector-conversions" \
+	CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions" \
 	LADD="-lm" \
 	JPEGINC_DIR=%{_includedir} \
 	PNGINC_DIR=%{_includedir} \



From fedora-extras-commits at redhat.com  Sun Mar  9 11:29:33 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sun, 9 Mar 2008 11:29:33 GMT
Subject: rpms/openoffice.org/F-7 openoffice.org.spec,1.1204,1.1205
Message-ID: <200803091129.m29BTXvZ009401@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9374

Modified Files:
	openoffice.org.spec 
Log Message:
add unopkg


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1204
retrieving revision 1.1205
diff -u -r1.1204 -r1.1205
--- openoffice.org.spec	18 Feb 2008 09:41:29 -0000	1.1204
+++ openoffice.org.spec	9 Mar 2008 11:28:59 -0000	1.1205
@@ -1442,6 +1442,10 @@
 echo exec %{instdir}/program/soffice -writer \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oowriter
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oowriter
 
+echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/unopkg
+echo exec %{instdir}/program/unopkg \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/unopkg
+chmod a+x $RPM_BUILD_ROOT/%{_bindir}/unopkg
+
 echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/oocalc
 echo exec %{instdir}/program/soffice -calc \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oocalc
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oocalc
@@ -2203,6 +2207,7 @@
 %{_bindir}/openoffice.org
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
+%{_bindir}/unopkg
 #gnome integration
 %{instdir}/program/gnome-set-default-application
 #icons and mime



From fedora-extras-commits at redhat.com  Sun Mar  9 11:30:53 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sun, 9 Mar 2008 11:30:53 GMT
Subject: rpms/openoffice.org/F-8 openoffice.org.spec,1.1348,1.1349
Message-ID: <200803091130.m29BUrMU009452@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9407

Modified Files:
	openoffice.org.spec 
Log Message:
add unopkg


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1348
retrieving revision 1.1349
diff -u -r1.1348 -r1.1349
--- openoffice.org.spec	18 Feb 2008 09:38:59 -0000	1.1348
+++ openoffice.org.spec	9 Mar 2008 11:29:42 -0000	1.1349
@@ -1499,6 +1499,10 @@
 echo exec %{instdir}/program/soffice -view \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/ooviewdoc
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/ooviewdoc
 
+echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/unopkg
+echo exec %{instdir}/program/unopkg \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/unopkg
+chmod a+x $RPM_BUILD_ROOT/%{_bindir}/unopkg
+
 echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/oowriter
 echo exec %{instdir}/program/soffice -writer \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oowriter
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oowriter
@@ -2265,6 +2269,7 @@
 %{_bindir}/openoffice.org
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
+%{_bindir}/unopkg
 #gnome integration
 %{instdir}/program/gnome-set-default-application
 #icons and mime



From fedora-extras-commits at redhat.com  Sun Mar  9 11:36:47 2008
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun, 9 Mar 2008 11:36:47 GMT
Subject: rpms/gnomeradio/devel gnomeradio.spec,1.6,1.7
Message-ID: <200803091136.m29BalMS009538@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/gnomeradio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9514

Modified Files:
	gnomeradio.spec 
Log Message:
- rebuild against new libgnome-media-profiles


Index: gnomeradio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomeradio/devel/gnomeradio.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnomeradio.spec	23 Feb 2008 21:41:12 -0000	1.6
+++ gnomeradio.spec	9 Mar 2008 11:36:10 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Graphical FM-Tuner program for GNOME
 Name: gnomeradio
 Version: 1.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/
@@ -105,6 +105,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %changelog
+* Sun Mar 09 2008 Dominik Mierzejewski  - 1.7-6
+- rebuild against new libgnome-media-profiles
+
 * Sat Feb 23 2008 Dominik Mierzejewski  - 1.7-5
 - backport some segfault fixes from SVN
 



From fedora-extras-commits at redhat.com  Sun Mar  9 11:48:27 2008
From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai))
Date: Sun, 9 Mar 2008 11:48:27 GMT
Subject: rpms/sepostgresql/devel sepostgresql-sepgsql-8.3.0-2.patch, 1.2,
	1.3 sepostgresql.init, 1.16, 1.17 sepostgresql.spec, 1.17,
	1.18 sepostgresql.te, 1.16, 1.17
Message-ID: <200803091148.m29BmR8I009794@cvs-int.fedora.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9765

Modified Files:
	sepostgresql-sepgsql-8.3.0-2.patch sepostgresql.init 
	sepostgresql.spec sepostgresql.te 
Log Message:
BUGFIX: more conprehensive fixes in "SELECT COUNT(*) ..."


sepostgresql-sepgsql-8.3.0-2.patch:

Index: sepostgresql-sepgsql-8.3.0-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-sepgsql-8.3.0-2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sepostgresql-sepgsql-8.3.0-2.patch	2 Mar 2008 08:10:12 -0000	1.2
+++ sepostgresql-sepgsql-8.3.0-2.patch	9 Mar 2008 11:48:19 -0000	1.3
@@ -2829,8 +2829,8 @@
 +}
 diff -rpNU3 pgace/src/backend/security/sepgsql/proxy.c sepgsql/src/backend/security/sepgsql/proxy.c
 --- pgace/src/backend/security/sepgsql/proxy.c	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql/src/backend/security/sepgsql/proxy.c	2008-03-02 17:00:56.000000000 +0900
-@@ -0,0 +1,1606 @@
++++ sepgsql/src/backend/security/sepgsql/proxy.c	2008-03-06 20:29:42.000000000 +0900
+@@ -0,0 +1,1604 @@
 +/*
 + * src/backend/security/sepgsqlProxy.c
 + *   SE-PostgreSQL Query Proxy function to walk on query node tree
@@ -3231,34 +3231,6 @@
 +	return selist;
 +}
 +
-+static List *walkAggrefHelper(List *selist, Query *query, Node *node)
-+{
-+	if (node == NULL)
-+		return selist;
-+
-+	if (IsA(node, RangeTblRef)) {
-+		RangeTblRef *rtr = (RangeTblRef *) node;
-+		RangeTblEntry *rte = rt_fetch(rtr->rtindex, query->rtable);
-+
-+		if (rte->rtekind == RTE_RELATION)
-+			selist = addEvalPgAttribute(selist, rte, 0, DB_COLUMN__SELECT);
-+	} else if (IsA(node, JoinExpr)) {
-+		JoinExpr *j = (JoinExpr *) node;
-+
-+		selist = walkAggrefHelper(selist, query, j->larg);
-+		selist = walkAggrefHelper(selist, query, j->rarg);
-+	} else if (IsA(node, FromExpr)) {
-+		FromExpr *fm = (FromExpr *)node;
-+		ListCell *l;
-+
-+		foreach (l, fm->fromlist)
-+			selist = walkAggrefHelper(selist, query, lfirst(l));
-+	} else {
-+		elog(ERROR, "SELinux: unexpected node type (%d) at Query->fromlist", nodeTag(node));
-+	}
-+	return selist;
-+}
-+
 +static List *sepgsqlWalkExpr(List *selist, queryChain *qc, Node *node, int flags)
 +{
 +	if (node == NULL)
@@ -3296,10 +3268,6 @@
 +
 +		selist = addEvalPgProc(selist, aggref->aggfnoid, DB_PROCEDURE__EXECUTE);
 +		selist = sepgsqlWalkExpr(selist, qc, (Node *) aggref->args, flags);
-+		if (aggref->aggstar) {
-+			Query *query = getQueryFromChain(qc);
-+			selist = walkAggrefHelper(selist, query, (Node *) query->jointree);
-+		}
 +		break;
 +	}
 +	case T_OpExpr:
@@ -3655,6 +3623,34 @@
 +	return selist;
 +}
 +
++static List *__checkSelectTargets(List *selist, Query *query, Node *node)
++{
++	if (node == NULL)
++		return selist;
++
++	if (IsA(node, RangeTblRef)) {
++		RangeTblRef *rtr = (RangeTblRef *) node;
++		RangeTblEntry *rte = rt_fetch(rtr->rtindex, query->rtable);
++
++		if (rte->rtekind == RTE_RELATION)
++			selist = addEvalPgClass(selist, rte, DB_TABLE__SELECT);
++	} else if (IsA(node, JoinExpr)) {
++		JoinExpr *j = (JoinExpr *) node;
++
++		selist = __checkSelectTargets(selist, query, j->larg);
++		selist = __checkSelectTargets(selist, query, j->rarg);
++	} else if (IsA(node, FromExpr)) {
++		FromExpr *fm = (FromExpr *)node;
++		ListCell *l;
++
++		foreach (l, fm->fromlist)
++			selist = __checkSelectTargets(selist, query, lfirst(l));
++	} else {
++		elog(ERROR, "SELinux: unexpected node type (%d) at Query->fromlist", nodeTag(node));
++	}
++	return selist;
++}
++
 +static List *proxyRteSubQuery(List *selist, queryChain *qc, Query *query)
 +{
 +	CmdType cmdType = query->commandType;
@@ -3672,6 +3668,8 @@
 +
 +	switch (cmdType) {
 +	case CMD_SELECT:
++		selist = __checkSelectTargets(selist, query, (Node *)query->jointree);
++
 +	case CMD_UPDATE:
 +	case CMD_INSERT:
 +		foreach (l, query->targetList) {


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sepostgresql.init	2 Mar 2008 08:10:12 -0000	1.16
+++ sepostgresql.init	9 Mar 2008 11:48:19 -0000	1.17
@@ -9,7 +9,7 @@
 
 PGVERSION="8.3.0"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-SEPGVERSION="2.121"
+SEPGVERSION="2.129"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sepostgresql.spec	2 Mar 2008 08:10:12 -0000	1.17
+++ sepostgresql.spec	9 Mar 2008 11:48:19 -0000	1.18
@@ -13,7 +13,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.3.0
-Release: 2.121%{?sepgsql_extension}%{?dist}
+Release: 2.129%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -211,6 +211,9 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Sun Mar  9 2008  - sepostgresql-8.3.0-2.129
+- BUGFIX: more conprehensive fixes in "SELECT COUNT(*) ..."
+
 * Sun Mar  2 2008  - sepostgresql-8.3.0-2.120
 - BUGFIX: CREATE TABLE statement with explicit labeled columns
 - BUGFIX: SELECT count(*) does not filter unallowed tuples


Index: sepostgresql.te
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.te,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sepostgresql.te	2 Mar 2008 08:10:12 -0000	1.16
+++ sepostgresql.te	9 Mar 2008 11:48:19 -0000	1.17
@@ -1,7 +1,12 @@
-policy_module(sepostgresql, 2.121)
+policy_module(sepostgresql, 2.129)
 
 gen_require(`
-	all_userspace_class_perms
+        class db_database all_db_database_perms;
+        class db_table all_db_table_perms;
+        class db_procedure all_db_procedure_perms;
+        class db_column all_db_column_perms;
+        class db_tuple all_db_tuple_perms;
+        class db_blob all_db_blob_perms;
 
 	type postgresql_t, unlabeled_t;
 	attribute domain, file_type;



From fedora-extras-commits at redhat.com  Sun Mar  9 12:00:50 2008
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Sun, 9 Mar 2008 12:00:50 GMT
Subject: rpms/matchbox-window-manager/devel
	matchbox-window-manager-1.2-keysyms.patch, NONE,
	1.1 matchbox-window-manager.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200803091200.m29C0olv010047@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/matchbox-window-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10015/devel

Modified Files:
	.cvsignore sources 
Added Files:
	matchbox-window-manager-1.2-keysyms.patch 
	matchbox-window-manager.spec 
Log Message:
Import from OLPC-2 branch


matchbox-window-manager-1.2-keysyms.patch:

--- NEW FILE matchbox-window-manager-1.2-keysyms.patch ---
--- trunk/matchbox-window-manager/src/keys.c	2006/07/19 16:55:26	1361
+++ trunk/matchbox-window-manager/src/keys.c	2007/11/01 12:43:20	1761
@@ -35,10 +35,12 @@
 
   for (keycode = min_kc; keycode <= max_kc; keycode++) {
     for (col = 0; (k = XKeycodeToKeysym (w->dpy, keycode, col))
-           != NoSymbol; col++)
-      if (k == keysym && col == 1) {
+           != NoSymbol; col++) {
+      if (k == keysym && col == 1)
         return True;
-      }
+      if (k == keysym)
+	break;
+    }
   }  
   return False;
 }


--- NEW FILE matchbox-window-manager.spec ---
%define libmatchbox_devel_ver 1.9-2
%define alphatag 20070628svn

Summary:       Window manager for the Matchbox Desktop
Name:          matchbox-window-manager
Version:       1.2
Release:       3.%{alphatag}
Url:           http://projects.o-hand.com/matchbox/
# svn checkout http://svn.o-hand.com/repos/matchbox/trunk/matchbox-window-manager
License:       GPL
Group:         User Interface/Desktops
Source0:       %{name}-%{version}-%{alphatag}.tar.gz

Patch1: matchbox-window-manager-1.2-keysyms.patch

Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pkgconfig 
BuildRequires:  expat-devel
BuildRequires:  libmatchbox-devel >= %{libmatchbox_devel_ver}
BuildRequires:  startup-notification-devel
BuildRequires:  libpng-devel
BuildRequires:  libjpeg-devel
BuildRequires:  pango-devel
BuildRequires:  libXcomposite-devel
BuildRequires:  libXfixes-devel
BuildRequires:  libXdamage-devel
BuildRequires:  libXrender-devel
BuildRequires:  libXcursor-devel
Requires:       filesystem

%description
Matchbox is a base environment for the X Window System running on non-desktop
embedded platforms such as handhelds, set-top boxes, kiosks and anything else
for which screen space, input mechanisms or system resources are limited.

This package contains the window manager from Matchbox.

%prep
%setup -q

%patch1 -p2 -b .keysyms

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc AUTHORS README ChangeLog COPYING
%{_bindir}/*
%dir %{_sysconfdir}/matchbox
%config(noreplace) %{_sysconfdir}/matchbox/kbdconfig
%dir %{_datadir}/matchbox
%{_datadir}/matchbox/*
%{_datadir}/themes/*

%changelog
* Fri Nov  9 2007 Marco Pesenti Gritti  - 1.2-3.20070628svn
- Add patch to fix some keybindings

* Thu Jun 28 2007 Marco Pesenti Gritti  - 1.2-2.20070628svn
- New snapshot

* Tue Jun 19 2007 Marco Pesenti Gritti  1.2-1
- Update source to 1.2

* Tue Jun 19 2007 John (J5) Palmieri  1.9-3
- Fix buildroot
- Add COPYING license file to docs
- Added {} braces around % macros
- Own {_sysconfdir}/matchbox directory
- Own {_datadir}/matchbox

* Sat Feb 24 2007 Marco Pesenti Gritti  1.1-6.cvs20072402.6
- Update to cvs20072402

* Wed Jan 31 2007 Marco Pesenti Gritti  1.1-5.cvs20073101.6
- Update to cvs20073101

* Wed Dec 20 2006 Marco Pesenti Gritti  1.1-5.cvs20061219.5
- Build with Xcursor support

* Tue Dec 19 2006 Marco Pesenti Gritti  1.1-5.cvs20061219.4
- Update to cvs20061219

* Tue Oct 17 2006 Marco Pesenti Gritti  1.1-5.cvs20060911.3
- Temporarily drop composite

* Thu Oct  5 2006 Marco Pesenti Gritti  1.1-5.cvs20060911.2
- Enable composite
- Add some composite dependencies

* Mon Sep 11 2006 Marco Pesenti Gritti  1.1-5.cvs20060911.1
- Remove some gconf leftovers

* Mon Sep 11 2006 Marco Pesenti Gritti  1.1-5.cvs20060911.0
- Rebuild

* Mon Sep 11 2006 Marco Pesenti Gritti  1.1-cvs20060911-1
- Update

* Mon Aug 21 2006 Marco Pesenti Gritti  1.1-3
- Rebuild
- Depend on libmatchbox 1.9-2
- Do not package gconf schemas

* Mon Aug 21 2006 Marco Pesenti Gritti  1.1-3
- Build with the default options

* Mon Aug 21 2006 Marco Pesenti Gritti  1.1-2
- Missing build reqs

* Mon Aug 21 2006 Marco Pesenti Gritti  1.1-1
- Update to 1.1

* Thu Aug 25 2005 Austin Acton  0.9.5-1mdk
- New release 0.9.5

* Thu May 12 2005 Austin Acton  0.9.4-1mdk
- 0.9.4
- new URLs

* Mon Jan 24 2005 Austin Acton  0.9.2-1mdk
- 0.9.2

* Mon Jan 10 2005 Austin Acton  0.9-1mdk
- 0.9

* Wed Sep 29 2004 Austin Acton  0.8.4-1mdk
- 0.8.4

* Mon Aug 23 2004 Austin Acton  0.8.3-2mdk
- fix schemas

* Mon Aug 23 2004 Austin Acton  0.8.3-1mdk
- 0.8.3

* Tue Aug 10 2004 Austin Acton  0.8.2-3mdk
- buildrequires xsettings

* Tue Jul 27 2004 Austin Acton  0.8.2-1mdk
- enable startup-notification

* Mon Jul 20 2004 Austin Acton  0.8.2-1mdk
- 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/matchbox-window-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jun 2007 16:33:24 -0000	1.1
+++ .cvsignore	9 Mar 2008 12:00:13 -0000	1.2
@@ -0,0 +1 @@
+matchbox-window-manager-1.2-20070628svn.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/matchbox-window-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jun 2007 16:33:24 -0000	1.1
+++ sources	9 Mar 2008 12:00:13 -0000	1.2
@@ -0,0 +1 @@
+c6f51019f59e9b9d8a3bedcaaebbfefc  matchbox-window-manager-1.2-20070628svn.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  9 12:05:20 2008
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Sun, 9 Mar 2008 12:05:20 GMT
Subject: rpms/matchbox-window-manager/devel matchbox-window-manager.spec, 1.1,
	1.2
Message-ID: <200803091205.m29C5KML017296@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/matchbox-window-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17268

Modified Files:
	matchbox-window-manager.spec 
Log Message:
* Sun Mar  9 2008 Marco Pesenti Gritti  - 1.2-3.20070628svn
- Add dist tag




Index: matchbox-window-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/matchbox-window-manager/devel/matchbox-window-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- matchbox-window-manager.spec	9 Mar 2008 12:00:13 -0000	1.1
+++ matchbox-window-manager.spec	9 Mar 2008 12:04:43 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:       Window manager for the Matchbox Desktop
 Name:          matchbox-window-manager
 Version:       1.2
-Release:       3.%{alphatag}
+Release:       3.%{alphatag}%{?dist}
 Url:           http://projects.o-hand.com/matchbox/
 # svn checkout http://svn.o-hand.com/repos/matchbox/trunk/matchbox-window-manager
 License:       GPL
@@ -62,6 +62,9 @@
 %{_datadir}/themes/*
 
 %changelog
+* Sun Mar  9 2008 Marco Pesenti Gritti  - 1.2-3.20070628svn
+- Add dist tag
+
 * Fri Nov  9 2007 Marco Pesenti Gritti  - 1.2-3.20070628svn
 - Add patch to fix some keybindings
 



From fedora-extras-commits at redhat.com  Sun Mar  9 12:15:31 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 9 Mar 2008 12:15:31 GMT
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.48,
	1.49
Message-ID: <200803091215.m29CFVMI017489@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17465

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
* Sun Mar 09 2008 - Bastien Nocera  - 0.10.17.2-4
- Disable libvisual for now (#435771)



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gstreamer-plugins-base.spec	4 Mar 2008 21:32:04 -0000	1.48
+++ gstreamer-plugins-base.spec	9 Mar 2008 12:14:37 -0000	1.49
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.17.2
-Release:  	3%{?dist}	
+Release:  	4%{?dist}	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -32,7 +32,8 @@
 BuildRequires:  pango-devel
 BuildRequires:  libXv-devel
 BuildRequires:  cdparanoia-devel
-BuildRequires:  libvisual-devel
+# https://bugzilla.redhat.com/show_bug.cgi?id=435771
+#BuildRequires:  libvisual-devel
 Obsoletes:	gstreamer-plugins
 
 # documentation
@@ -133,7 +134,8 @@
 %{_libdir}/gstreamer-%{majorminor}/libgstalsa.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgnomevfs.so
-%{_libdir}/gstreamer-%{majorminor}/libgstlibvisual.so
+# https://bugzilla.redhat.com/show_bug.cgi?id=435771
+#%{_libdir}/gstreamer-%{majorminor}/libgstlibvisual.so
 %{_libdir}/gstreamer-%{majorminor}/libgstogg.so
 %{_libdir}/gstreamer-%{majorminor}/libgstpango.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttheora.so
@@ -246,6 +248,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Sun Mar 09 2008 - Bastien Nocera  - 0.10.17.2-4
+- Disable libvisual for now (#435771)
+
 * Tue Mar 04 2008 Adam Jackson  0.10.17.2-3
 - gstpb-0.10.15-cd-speed.patch: Set default CD read speed to something
   sensible. (#431178)



From fedora-extras-commits at redhat.com  Sun Mar  9 12:19:50 2008
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 9 Mar 2008 12:19:50 GMT
Subject: rpms/audacious/devel audacious.spec,1.34,1.35
Message-ID: <200803091219.m29CJofb017616@cvs-int.fedora.redhat.com>

Author: ertzing

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

Modified Files:
	audacious.spec 
Log Message:

- Fix Source0 URL



Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- audacious.spec	11 Feb 2008 19:22:58 -0000	1.34
+++ audacious.spec	9 Mar 2008 12:19:09 -0000	1.35
@@ -9,7 +9,7 @@
 License:        GPLv2
 URL:            http://audacious-media-player.org/
 
-Source0:        http://static.audacious-media-player.org/release/audacious-%{version}.tgz
+Source0:        http://distfiles.atheme.org/audacious-%{version}.tgz
 Patch0:         audacious-1.3.1-xmms-skins.patch
 Patch1:         audacious-1.4.0-default-skin.patch
 # Patch2:         audacious-1.1.0-no-rpath.patch



From fedora-extras-commits at redhat.com  Sun Mar  9 12:20:45 2008
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 9 Mar 2008 12:20:45 GMT
Subject: rpms/audacious/F-8 audacious.spec,1.27,1.28
Message-ID: <200803091220.m29CKjSH017672@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17637

Modified Files:
	audacious.spec 
Log Message:

- Fix Source0 URL



Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/F-8/audacious.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- audacious.spec	2 Jan 2008 20:55:32 -0000	1.27
+++ audacious.spec	9 Mar 2008 12:20:12 -0000	1.28
@@ -9,7 +9,7 @@
 License:        GPLv2
 URL:            http://audacious-media-player.org/
 
-Source0:        http://static.audacious-media-player.org/release/audacious-%{version}.tgz
+Source0:        http://distfiles.atheme.org/audacious-%{version}.tgz
 Patch0:         audacious-1.3.1-xmms-skins.patch
 Patch1:         audacious-1.4.0-default-skin.patch
 # Patch2:         audacious-1.1.0-no-rpath.patch



From fedora-extras-commits at redhat.com  Sun Mar  9 12:21:37 2008
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 9 Mar 2008 12:21:37 GMT
Subject: rpms/audacious/F-7 audacious.spec,1.24,1.25
Message-ID: <200803091221.m29CLbOl017698@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17678

Modified Files:
	audacious.spec 
Log Message:

- Fix Source0 URL



Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/F-7/audacious.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- audacious.spec	12 Jul 2007 19:01:52 -0000	1.24
+++ audacious.spec	9 Mar 2008 12:21:03 -0000	1.25
@@ -7,7 +7,7 @@
 License:        GPL
 URL:            http://audacious-media-player.org/
 
-Source0:        http://static.audacious-media-player.org/release/audacious-%{version}.tgz
+Source0:        http://distfiles.atheme.org/audacious-%{version}.tgz
 Patch0:         audacious-1.3.1-xmms-skins.patch
 Patch1:         audacious-1.3.1-default-skin.patch
 # Patch2:         audacious-1.1.0-no-rpath.patch



From fedora-extras-commits at redhat.com  Sun Mar  9 12:29:04 2008
From: fedora-extras-commits at redhat.com (KaiGai Kohei (kaigai))
Date: Sun, 9 Mar 2008 12:29:04 GMT
Subject: rpms/sepostgresql/F-8 sepostgresql-8.2.6-1.patch, 1.4,
	1.5 sepostgresql.init, 1.13, 1.14 sepostgresql.spec, 1.13,
	1.14 sepostgresql.te, 1.13, 1.14
Message-ID: <200803091229.m29CT489018043@cvs-int.fedora.redhat.com>

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18005

Modified Files:
	sepostgresql-8.2.6-1.patch sepostgresql.init sepostgresql.spec 
	sepostgresql.te 
Log Message:
BUGFIX: SELECT count(*) was not filtered correctly.


sepostgresql-8.2.6-1.patch:

Index: sepostgresql-8.2.6-1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql-8.2.6-1.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sepostgresql-8.2.6-1.patch	2 Mar 2008 15:49:16 -0000	1.4
+++ sepostgresql-8.2.6-1.patch	9 Mar 2008 12:28:59 -0000	1.5
@@ -4913,8 +4913,8 @@
 +}
 diff -rpNU3 base/src/backend/security/sepgsqlProxy.c sepgsql/src/backend/security/sepgsqlProxy.c
 --- base/src/backend/security/sepgsqlProxy.c	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql/src/backend/security/sepgsqlProxy.c	2008-03-03 00:42:02.000000000 +0900
-@@ -0,0 +1,1501 @@
++++ sepgsql/src/backend/security/sepgsqlProxy.c	2008-03-06 20:38:36.000000000 +0900
+@@ -0,0 +1,1497 @@
 +/*
 + * src/backend/security/sepgsqlProxy.c
 + *   SE-PostgreSQL Query Proxy function to walk on query node tree
@@ -5306,36 +5306,6 @@
 +	return selist;
 +}
 +
-+static List *walkAggrefHelper(List *selist, Query *query, Node *node)
-+{
-+	if (node == NULL)
-+		return selist;
-+
-+	if (IsA(node, RangeTblRef)) {
-+		RangeTblRef *rtr = (RangeTblRef *) node;
-+		RangeTblEntry *rte = list_nth(query->rtable, rtr->rtindex - 1);
-+
-+		if (rte->rtekind == RTE_RELATION) {
-+			selist = addEvalPgClass(selist, rte, DB_TABLE__SELECT);
-+			selist = addEvalPgAttribute(selist, rte, 0, DB_COLUMN__SELECT);
-+		}
-+	} else if (IsA(node, JoinExpr)) {
-+		JoinExpr *j = (JoinExpr *) node;
-+
-+		selist = walkAggrefHelper(selist, query, j->larg);
-+		selist = walkAggrefHelper(selist, query, j->rarg);
-+	} else if (IsA(node, FromExpr)) {
-+		FromExpr *fm = (FromExpr *)node;
-+		ListCell *l;
-+
-+		foreach (l, fm->fromlist)
-+			selist = walkAggrefHelper(selist, query, lfirst(l));
-+	} else {
-+		elog(ERROR, "SELinux: unexpected node type (%d) at Query->fromlist", nodeTag(node));
-+	}
-+	return selist;
-+}
-+
 +static List *sepgsqlWalkExpr(List *selist, queryChain *qc, Node *node, int flags)
 +{
 +	if (node == NULL)
@@ -5372,10 +5342,6 @@
 +
 +		selist = addEvalPgProc(selist, aggref->aggfnoid, DB_PROCEDURE__EXECUTE);
 +		selist = sepgsqlWalkExpr(selist, qc, (Node *) aggref->args, flags);
-+		if (aggref->aggstar) {
-+			Query *query = getQueryFromChain(qc);
-+			selist = walkAggrefHelper(selist, query, (Node *) query->jointree);
-+		}
 +		break;
 +	}
 +	case T_OpExpr:
@@ -5707,6 +5673,34 @@
 +	return selist;
 +}
 +
++static List *__checkSelectTargets(List *selist, Query *query, Node *node)
++{
++	if (node == NULL)
++		return selist;
++
++	if (IsA(node, RangeTblRef)) {
++		RangeTblRef *rtr = (RangeTblRef *) node;
++		RangeTblEntry *rte = list_nth(query->rtable, rtr->rtindex - 1);
++
++		if (rte->rtekind == RTE_RELATION)
++			selist = addEvalPgClass(selist, rte, DB_TABLE__SELECT);
++	} else if (IsA(node, JoinExpr)) {
++		JoinExpr *j = (JoinExpr *) node;
++
++		selist = __checkSelectTargets(selist, query, j->larg);
++		selist = __checkSelectTargets(selist, query, j->rarg);
++	} else if (IsA(node, FromExpr)) {
++		FromExpr *fm = (FromExpr *)node;
++		ListCell *l;
++
++		foreach (l, fm->fromlist)
++			selist = __checkSelectTargets(selist, query, lfirst(l));
++	} else {
++		elog(ERROR, "SELinux: unexpected node type (%d) at Query->fromlist", nodeTag(node));
++	}
++    return selist;
++}
++
 +static List *proxyRteSubQuery(List *selist, queryChain *qc, Query *query)
 +{
 +	CmdType cmdType = query->commandType;
@@ -5722,7 +5716,9 @@
 +	/* rewrite outer join */
 +	rewriteOuterJoinTree((Node *) query->jointree, query, false);
 +
-+	if (cmdType != CMD_SELECT) {
++	if (cmdType == CMD_SELECT) {
++		selist = __checkSelectTargets(selist, query, (Node *)query->jointree);
++	} else {
 +		rte = list_nth(query->rtable, query->resultRelation - 1);
 +		Assert(IsA(rte, RangeTblEntry) && rte->rtekind==RTE_RELATION);
 +		switch (cmdType) {


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sepostgresql.init	2 Mar 2008 15:49:17 -0000	1.13
+++ sepostgresql.init	9 Mar 2008 12:28:59 -0000	1.14
@@ -9,7 +9,7 @@
 
 PGVERSION="8.2.6"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-SEPGVERSION="1.225"
+SEPGVERSION="1.231"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sepostgresql.spec	2 Mar 2008 15:49:17 -0000	1.13
+++ sepostgresql.spec	9 Mar 2008 12:28:59 -0000	1.14
@@ -13,7 +13,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.2.6
-Release: 1.225%{?sepgsql_extension}%{?dist}
+Release: 1.231%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -206,7 +206,7 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
-* Sun Mar  2 2008  - 8.2.6-1.225
+* Sun Mar  2 2008  - 8.2.6-1.231
 - bugfix: SELECT count(*) was not filtered correctly.
 
 * Wed Feb  6 2008  - 8.2.6-1.208


Index: sepostgresql.te
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.te,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sepostgresql.te	2 Mar 2008 15:49:17 -0000	1.13
+++ sepostgresql.te	9 Mar 2008 12:28:59 -0000	1.14
@@ -1,4 +1,4 @@
-policy_module(sepostgresql, 1.225)
+policy_module(sepostgresql, 1.231)
 
 gen_require(`
 	class db_database all_db_database_perms;



From fedora-extras-commits at redhat.com  Sun Mar  9 12:47:55 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 9 Mar 2008 12:47:55 GMT
Subject: rpms/totem/devel totem.spec,1.170,1.171
Message-ID: <200803091247.m29Clt2h018519@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18478

Modified Files:
	totem.spec 
Log Message:
* Sun Mar 09 2008 - Bastien Nocera  - 2.23.0-3
- Remove PPC/PPC64 ExcludeArch



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- totem.spec	7 Mar 2008 16:10:21 -0000	1.170
+++ totem.spec	9 Mar 2008 12:47:04 -0000	1.171
@@ -1,7 +1,7 @@
 %define with_xine 1
 
 %define gstreamer_version 0.10.1
-%define gstreamer_plugins_base_version 0.10.14-3
+%define gstreamer_plugins_base_version 0.10.17.2-4
 %define gstreamer_plugins_good_version 0.10.0
 %define gtk2_version 2.12.1
 %define gecko_version 1.9
@@ -61,9 +61,6 @@
 
 Obsoletes: nautilus-media
 
-# See bug 435771
-ExcludeArch: ppc ppc64
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=458324
 Patch0: totem-xul-4.patch
 
@@ -427,6 +424,9 @@
 %endif
 
 %changelog
+* Sun Mar 09 2008 - Bastien Nocera  - 2.23.0-3
+- Remove PPC/PPC64 ExcludeArch
+
 * Fri Mar 07 2008 - Bastien Nocera  - 2.23.0-2
 - Re-add missing nautilus files section
 - Fix obsoletes and provides to upgrade from the broken 2.21.96



From fedora-extras-commits at redhat.com  Sun Mar  9 12:52:08 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Sun, 9 Mar 2008 12:52:08 GMT
Subject: rpms/totem/devel totem.spec,1.171,1.172
Message-ID: <200803091252.m29Cq8Fs018615@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18592

Modified Files:
	totem.spec 
Log Message:
Up release



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- totem.spec	9 Mar 2008 12:47:04 -0000	1.171
+++ totem.spec	9 Mar 2008 12:51:29 -0000	1.172
@@ -10,7 +10,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.23.0
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/



From fedora-extras-commits at redhat.com  Sun Mar  9 13:44:16 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 13:44:16 GMT
Subject: rpms/Perlbal/devel .cvsignore, 1.3, 1.4 Perlbal.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200803091344.m29DiGNe026335@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/Perlbal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26309

Modified Files:
	.cvsignore Perlbal.spec sources 
Log Message:
1.70


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Perlbal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Feb 2008 04:49:07 -0000	1.3
+++ .cvsignore	9 Mar 2008 13:43:42 -0000	1.4
@@ -1 +1 @@
-Perlbal-1.60.tar.gz
+Perlbal-1.70.tar.gz


Index: Perlbal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Perlbal/devel/Perlbal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Perlbal.spec	8 Feb 2008 05:04:59 -0000	1.4
+++ Perlbal.spec	9 Mar 2008 13:43:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           Perlbal
-Version:        1.60
-Release:        2%{?dist}
+Version:        1.70
+Release:        1%{?dist}
 Summary:        Reverse-proxy load balancer and webserver
 License:        GPL+ or Artistic
 Group:          System Environment/Daemons
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Tom "spot" Callaway  1.70-1
+- 1.70 (fixes build for perl 5.10.0)
+
 * Thu Feb 07 2008 Tom "spot" Callaway  1.60-2
 - don't need patch, merged with 1.60
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Perlbal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Feb 2008 04:49:07 -0000	1.3
+++ sources	9 Mar 2008 13:43:42 -0000	1.4
@@ -1 +1 @@
-b05b4b8ed02bdd74af9b445f1578b757  Perlbal-1.60.tar.gz
+3267a45b06cc187d177ad9b9ecc2f68f  Perlbal-1.70.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  9 13:46:40 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 13:46:40 GMT
Subject: rpms/perl-Perlbal-XS-HTTPHeaders/devel
	perl-Perlbal-XS-HTTPHeaders.spec, 1.3, 1.4
Message-ID: <200803091346.m29DkeVD026405@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Perlbal-XS-HTTPHeaders/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26387

Modified Files:
	perl-Perlbal-XS-HTTPHeaders.spec 
Log Message:
new perl


Index: perl-Perlbal-XS-HTTPHeaders.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perlbal-XS-HTTPHeaders/devel/perl-Perlbal-XS-HTTPHeaders.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Perlbal-XS-HTTPHeaders.spec	16 Feb 2008 13:08:32 -0000	1.3
+++ perl-Perlbal-XS-HTTPHeaders.spec	9 Mar 2008 13:46:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Perlbal-XS-HTTPHeaders
 Version:        0.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perlbal extension for processing HTTP headers
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Mar  9 2008 Tom "spot" Callaway  0.19-5
+- rebuild for new perl (again)
+
 * Sat Feb 16 2008 Ruben Kerkhof  0.19-4
 - Rebuild for gcc 4.3
 



From fedora-extras-commits at redhat.com  Sun Mar  9 14:04:07 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 9 Mar 2008 14:04:07 GMT
Subject: rpms/gnash/devel gnash.spec,1.15,1.16 gnash-plugin.patch,1.1,NONE
Message-ID: <200803091404.m29E47TY001289@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	gnash.spec 
Removed Files:
	gnash-plugin.patch 
Log Message:
improve description, remove upstreamed patch


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnash.spec	8 Mar 2008 00:10:36 -0000	1.15
+++ gnash.spec	9 Mar 2008 14:03:26 -0000	1.16
@@ -32,8 +32,13 @@
 Requires(preun): /sbin/install-info
 
 %description
-Gnash is a GNU Flash movie player based on GameSWF,
-and supports many SWF v7 features.
+Gnash is capable of reading up to SWF v9 files and opcodes, but primarily
+supports SWF v7, with better SWF v8 and v9 support under heavy development.
+With the 0.8.2 release, Gnash includes initial parser support for SWF v8
+and v9. Not all ActionScript 2 classes are implemented yet, but all of
+the most heavily used ones are. Many ActionScript 2 classes are partially
+implemented; there is support for all of the commonly used methods of each
+class.
 
 %package plugin
 Summary:   Web-client flash movie player plugin 


--- gnash-plugin.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  9 14:43:01 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 9 Mar 2008 14:43:01 GMT
Subject: rpms/gnash/F-7 .cvsignore, 1.5, 1.6 gnash.spec, 1.9, 1.10 sources,
	1.5, 1.6 gnash-CVE-2007-2500.patch, 1.1, NONE gnash-README.fedora,
	1.1, NONE gnash-configure-pkgconfig.patch, 1.1,
	NONE gnash-continue_on_info_install_error.patch, 1.1,
	NONE gnash-plugin-tempfile-dir.patch, 1.1,
	NONE gnash-plugin.patch, 1.1, NONE
Message-ID: <200803091443.m29Eh1nx001815@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1757/F-7

Modified Files:
	.cvsignore gnash.spec sources 
Removed Files:
	gnash-CVE-2007-2500.patch gnash-README.fedora 
	gnash-configure-pkgconfig.patch 
	gnash-continue_on_info_install_error.patch 
	gnash-plugin-tempfile-dir.patch gnash-plugin.patch 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2007 15:57:50 -0000	1.5
+++ .cvsignore	9 Mar 2008 14:42:23 -0000	1.6
@@ -1 +1 @@
-gnash-0.8.1.tar.gz
+gnash-0.8.2.tar.gz


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/gnash.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnash.spec	27 Oct 2007 23:08:06 -0000	1.9
+++ gnash.spec	9 Mar 2008 14:42:23 -0000	1.10
@@ -1,18 +1,16 @@
 Name:           gnash
-Version:        0.8.1
-Release:        6%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
 Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
-# from Martin Stransky
-Patch0:         gnash-plugin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
-BuildRequires:  boost-devel curl-devel 
+BuildRequires:  boost-devel curl-devel freetype-devel fontconfig-devel
 # the opengl devel packages are required by gtkglext-devel
 # monolithic Xorg
 #BuildRequires:  xorg-x11-devel
@@ -20,22 +18,27 @@
 #BuildRequires:  libGLU-devel libGL-devel
 BuildRequires:  SDL-devel 
 BuildRequires:  agg-devel 
-BuildRequires:  kdelibs-devel
+BuildRequires:  kdelibs3-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  docbook2X
 BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  scrollkeeper
 
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
+#Requires(post): scrollkeeper
+#Requires(postun): scrollkeeper
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
 %description
-Gnash is a GNU Flash movie player based on GameSWF,
-and supports many SWF v7 features.
+Gnash is capable of reading up to SWF v9 files and opcodes, but primarily
+supports SWF v7, with better SWF v8 and v9 support under heavy development.
+With the 0.8.2 release, Gnash includes initial parser support for SWF v8
+and v9. Not all ActionScript 2 classes are implemented yet, but all of
+the most heavily used ones are. Many ActionScript 2 classes are partially
+implemented; there is support for all of the commonly used methods of each
+class.
 
 %package plugin
 Summary:   Web-client flash movie player plugin 
@@ -58,50 +61,41 @@
 %description klash
 The gnash flash movie player plugin for Konqueror.
 
-# cygnal just segfaults for me
-#%package cygnal
-#Summary:   Streaming media server
-#Requires:  %{name} = %{version}-%{release}
-#Group:     Applications/Multimedia
+%package cygnal
+Summary:   Streaming media server
+Requires:  %{name} = %{version}-%{release}
+Group:     Applications/Multimedia
 
-#%description cygnal
-#Cygnal is a streaming media server that's Flash aware.
+%description cygnal
+Cygnal is a streaming media server that's Flash aware.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .plugin
 
 chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} 
+
 iconv -f latin1 -t utf8 < AUTHORS > AUTHORS.utf8
 touch -r AUTHORS AUTHORS.utf8
 mv AUTHORS.utf8 AUTHORS
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
-  --enable-ghelp --enable-docbook --enable-media=GST \
+# --enable-ghelp is disabled
+%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
+  --disable-docbook --enable-media=GST \
   --disable-dependency-tracking --disable-rpath \
+  --enable-cygnal \
+  --enable-gui=gtk,kde,sdl,fb \
   --with-qtdir=$QTDIR
 #doesn't work currently: %%{?_smp_mflags}
 make 
 
-# texinfo and therefore info generation is broken, still we have the
-# code to regenerate them
-pushd doc/C
-rm gnash.html gnash.1 gnash.info gnash.texi actionscript.html \
-   actionscript.info actionscript.texi
-make man html info
-pushd asspec
-rm asspec.info asspec.html asspec.texi
-make html info
-popd
-popd
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install install-plugin \
+ DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
 #rm \
 # $RPM_BUILD_ROOT%{_libdir}/libgnashamf.so \
@@ -112,25 +106,36 @@
 # $RPM_BUILD_ROOT%{_libdir}/libgnashserver.so \
 # $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \
 # $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+#rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # don't package libltdl related files!
-rm \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
+#rm \
+# $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
 rm \
  $RPM_BUILD_ROOT%{_includedir}/ltdl.h
 # info isn't generated rightly
-rm -rf \
- $RPM_BUILD_ROOT%{_infodir}/
+#rm -rf \
+# $RPM_BUILD_ROOT%{_infodir}/
 # omf/scrollkeeper related files are broken, some files are missing, and
 # omf files are wrong
-rm -rf \
- $RPM_BUILD_ROOT%{_datadir}/omf
+#rm -rf \
+# $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
 #rm \
 # $RPM_BUILD_ROOT%{_bindir}/cygnal
 
 # cp -p doc/C/actionscript.info $RPM_BUILD_ROOT%{_infodir}/
+mkdir -p $RPM_BUILD_ROOT%{_infodir}/
+cp doc/C/gnash_*.info $RPM_BUILD_ROOT%{_infodir}/
+
+rm -rf __dist_docs
+mkdir __dist_docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc/gnash/* __dist_docs/
+rmdir $RPM_BUILD_ROOT%{_datadir}/doc/gnash
+cp doc/C/gnash*.html __dist_docs/
+
+chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \
+ $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo
 
 %find_lang %{name}
 
@@ -145,13 +150,17 @@
 #/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 #/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
 #/sbin/install-info %{_infodir}/actionscript.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/gnash_ref.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/gnash_user.info %{_infodir}/dir || :
 
 %preun
-#if [ $1 = 0 ]; then
+if [ $1 = 0 ]; then
     #/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
     #/sbin/install-info --delete %{_infodir}/asspec.info %{_infodir}/dir || :
     #/sbin/install-info --delete %{_infodir}/actionscript.info %{_infodir}/dir || :
-#fi
+    /sbin/install-info --delete %{_infodir}/gnash_ref.info %{_infodir}/dir || :
+    /sbin/install-info --delete %{_infodir}/gnash_user.info %{_infodir}/dir || :
+fi
 
 %postun
 /sbin/ldconfig
@@ -160,17 +169,24 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
-%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html
-%doc doc/C/images
+#%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html
+#%doc doc/C/images
+%doc __dist_docs/*
+%{_bindir}/dumpshm
+%{_bindir}/fb-gnash
 %{_bindir}/gtk-gnash
+%{_bindir}/sdl-gnash
+%{_bindir}/soldumper
 %{_bindir}/gnash
-%{_bindir}/gparser
 %{_bindir}/gprocessor
 %{_libdir}/gnash/
 #%{_libdir}/libgnash*-*.so
 #%{_libdir}/libklash*-*.so
-%{_mandir}/man1/gnash*
-#%{_infodir}/gnash*
+%{_mandir}/man1/gnash.1*
+%{_mandir}/man1/dumpshm.1*
+%{_mandir}/man1/gprocessor.1*
+%{_mandir}/man1/soldumper.1*
+%{_infodir}/gnash*
 %{_datadir}/gnash/
 #%{_datadir}/omf/gnash/
 
@@ -181,16 +197,18 @@
 %files klash
 %defattr(-,root,root,-)
 %{_bindir}/kde-gnash
-%{_libdir}/kde3/libklashpart.*
 %{_datadir}/apps/klash/
-#%{_datadir}/config/klashrc
 %{_datadir}/services/klash_part.desktop
 
-#%files cygnal
-#%defattr(-,root,root,-)
-#%{_bindir}/cygnal
+%files cygnal
+%defattr(-,root,root,-)
+%{_bindir}/cygnal
+%{_mandir}/man1/cygnal.1*
 
 %changelog
+* Fri Mar  7 2008 Patrice Dumas  0.8.2-1
+- update to 0.8.2
+
 * Sat Oct 27 2007 Patrice Dumas  0.8.1-6
 - add patch from Martin Stransky to fix wrapped plugin #281061
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2007 15:57:50 -0000	1.5
+++ sources	9 Mar 2008 14:42:23 -0000	1.6
@@ -1 +1 @@
-28e9f4bd71154a89f6f683c3e7651e64  gnash-0.8.1.tar.gz
+24dfad0b553254faa06cf1bc1a43fef9  gnash-0.8.2.tar.gz


--- gnash-CVE-2007-2500.patch DELETED ---


--- gnash-README.fedora DELETED ---


--- gnash-configure-pkgconfig.patch DELETED ---


--- gnash-continue_on_info_install_error.patch DELETED ---


--- gnash-plugin-tempfile-dir.patch DELETED ---


--- gnash-plugin.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  9 14:43:09 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 9 Mar 2008 14:43:09 GMT
Subject: rpms/gnash/F-8 .cvsignore, 1.5, 1.6 gnash.spec, 1.14, 1.15 sources, 
	1.5, 1.6 gnash-plugin.patch, 1.1, NONE
Message-ID: <200803091443.m29Eh9DL001822@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1757/F-8

Modified Files:
	.cvsignore gnash.spec sources 
Removed Files:
	gnash-plugin.patch 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2007 11:56:09 -0000	1.5
+++ .cvsignore	9 Mar 2008 14:42:31 -0000	1.6
@@ -1 +1 @@
-gnash-0.8.1.tar.gz
+gnash-0.8.2.tar.gz


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-8/gnash.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnash.spec	27 Oct 2007 23:08:42 -0000	1.14
+++ gnash.spec	9 Mar 2008 14:42:31 -0000	1.15
@@ -1,18 +1,16 @@
 Name:           gnash
-Version:        0.8.1
-Release:        6%{?dist}.1
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
 Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
-# from Martin Stransky
-Patch0:         gnash-plugin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
-BuildRequires:  boost-devel curl-devel 
+BuildRequires:  boost-devel curl-devel freetype-devel fontconfig-devel
 # the opengl devel packages are required by gtkglext-devel
 # monolithic Xorg
 #BuildRequires:  xorg-x11-devel
@@ -20,22 +18,27 @@
 #BuildRequires:  libGLU-devel libGL-devel
 BuildRequires:  SDL-devel 
 BuildRequires:  agg-devel 
-BuildRequires:  kdelibs-devel
+BuildRequires:  kdelibs3-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  docbook2X
 BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  scrollkeeper
 
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
+#Requires(post): scrollkeeper
+#Requires(postun): scrollkeeper
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
 %description
-Gnash is a GNU Flash movie player based on GameSWF,
-and supports many SWF v7 features.
+Gnash is capable of reading up to SWF v9 files and opcodes, but primarily
+supports SWF v7, with better SWF v8 and v9 support under heavy development.
+With the 0.8.2 release, Gnash includes initial parser support for SWF v8
+and v9. Not all ActionScript 2 classes are implemented yet, but all of
+the most heavily used ones are. Many ActionScript 2 classes are partially
+implemented; there is support for all of the commonly used methods of each
+class.
 
 %package plugin
 Summary:   Web-client flash movie player plugin 
@@ -58,50 +61,41 @@
 %description klash
 The gnash flash movie player plugin for Konqueror.
 
-# cygnal just segfaults for me
-#%package cygnal
-#Summary:   Streaming media server
-#Requires:  %{name} = %{version}-%{release}
-#Group:     Applications/Multimedia
+%package cygnal
+Summary:   Streaming media server
+Requires:  %{name} = %{version}-%{release}
+Group:     Applications/Multimedia
 
-#%description cygnal
-#Cygnal is a streaming media server that's Flash aware.
+%description cygnal
+Cygnal is a streaming media server that's Flash aware.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .plugin
 
 chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} 
+
 iconv -f latin1 -t utf8 < AUTHORS > AUTHORS.utf8
 touch -r AUTHORS AUTHORS.utf8
 mv AUTHORS.utf8 AUTHORS
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
-  --enable-ghelp --enable-docbook --enable-media=GST \
+# --enable-ghelp is disabled
+%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
+  --disable-docbook --enable-media=GST \
   --disable-dependency-tracking --disable-rpath \
+  --enable-cygnal \
+  --enable-gui=gtk,kde,sdl,fb \
   --with-qtdir=$QTDIR
 #doesn't work currently: %%{?_smp_mflags}
 make 
 
-# texinfo and therefore info generation is broken, still we have the
-# code to regenerate them
-pushd doc/C
-rm gnash.html gnash.1 gnash.info gnash.texi actionscript.html \
-   actionscript.info actionscript.texi
-make man html info
-pushd asspec
-rm asspec.info asspec.html asspec.texi
-make html info
-popd
-popd
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install install-plugin \
+ DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
 #rm \
 # $RPM_BUILD_ROOT%{_libdir}/libgnashamf.so \
@@ -112,25 +106,36 @@
 # $RPM_BUILD_ROOT%{_libdir}/libgnashserver.so \
 # $RPM_BUILD_ROOT%{_libdir}/libgnashplayer.so \
 # $RPM_BUILD_ROOT%{_libdir}/libklashplayer.so
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+#rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # don't package libltdl related files!
-rm \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
+#rm \
+# $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
 rm \
  $RPM_BUILD_ROOT%{_includedir}/ltdl.h
 # info isn't generated rightly
-rm -rf \
- $RPM_BUILD_ROOT%{_infodir}/
+#rm -rf \
+# $RPM_BUILD_ROOT%{_infodir}/
 # omf/scrollkeeper related files are broken, some files are missing, and
 # omf files are wrong
-rm -rf \
- $RPM_BUILD_ROOT%{_datadir}/omf
+#rm -rf \
+# $RPM_BUILD_ROOT%{_datadir}/omf
 # cygnal just segfaults
 #rm \
 # $RPM_BUILD_ROOT%{_bindir}/cygnal
 
 # cp -p doc/C/actionscript.info $RPM_BUILD_ROOT%{_infodir}/
+mkdir -p $RPM_BUILD_ROOT%{_infodir}/
+cp doc/C/gnash_*.info $RPM_BUILD_ROOT%{_infodir}/
+
+rm -rf __dist_docs
+mkdir __dist_docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc/gnash/* __dist_docs/
+rmdir $RPM_BUILD_ROOT%{_datadir}/doc/gnash
+cp doc/C/gnash*.html __dist_docs/
+
+chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \
+ $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo
 
 %find_lang %{name}
 
@@ -145,13 +150,17 @@
 #/sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 #/sbin/install-info %{_infodir}/asspec.info %{_infodir}/dir || :
 #/sbin/install-info %{_infodir}/actionscript.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/gnash_ref.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/gnash_user.info %{_infodir}/dir || :
 
 %preun
-#if [ $1 = 0 ]; then
+if [ $1 = 0 ]; then
     #/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
     #/sbin/install-info --delete %{_infodir}/asspec.info %{_infodir}/dir || :
     #/sbin/install-info --delete %{_infodir}/actionscript.info %{_infodir}/dir || :
-#fi
+    /sbin/install-info --delete %{_infodir}/gnash_ref.info %{_infodir}/dir || :
+    /sbin/install-info --delete %{_infodir}/gnash_user.info %{_infodir}/dir || :
+fi
 
 %postun
 /sbin/ldconfig
@@ -160,17 +169,24 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
-%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html
-%doc doc/C/images
+#%doc doc/C/gnash.html doc/C/actionscript.html doc/C/asspec/asspec.html
+#%doc doc/C/images
+%doc __dist_docs/*
+%{_bindir}/dumpshm
+%{_bindir}/fb-gnash
 %{_bindir}/gtk-gnash
+%{_bindir}/sdl-gnash
+%{_bindir}/soldumper
 %{_bindir}/gnash
-%{_bindir}/gparser
 %{_bindir}/gprocessor
 %{_libdir}/gnash/
 #%{_libdir}/libgnash*-*.so
 #%{_libdir}/libklash*-*.so
-%{_mandir}/man1/gnash*
-#%{_infodir}/gnash*
+%{_mandir}/man1/gnash.1*
+%{_mandir}/man1/dumpshm.1*
+%{_mandir}/man1/gprocessor.1*
+%{_mandir}/man1/soldumper.1*
+%{_infodir}/gnash*
 %{_datadir}/gnash/
 #%{_datadir}/omf/gnash/
 
@@ -181,17 +197,19 @@
 %files klash
 %defattr(-,root,root,-)
 %{_bindir}/kde-gnash
-%{_libdir}/kde3/libklashpart.*
 %{_datadir}/apps/klash/
-#%{_datadir}/config/klashrc
 %{_datadir}/services/klash_part.desktop
 
-#%files cygnal
-#%defattr(-,root,root,-)
-#%{_bindir}/cygnal
+%files cygnal
+%defattr(-,root,root,-)
+%{_bindir}/cygnal
+%{_mandir}/man1/cygnal.1*
 
 %changelog
-* Sat Oct 27 2007 Patrice Dumas  0.8.1-6.1
+* Fri Mar  7 2008 Patrice Dumas  0.8.2-1
+- update to 0.8.2
+
+* Sat Oct 27 2007 Patrice Dumas  0.8.1-6
 - add patch from Martin Stransky to fix wrapped plugin #281061
 
 * Thu Sep 20 2007 Patrice Dumas  0.8.1-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2007 11:56:09 -0000	1.5
+++ sources	9 Mar 2008 14:42:31 -0000	1.6
@@ -1 +1 @@
-28e9f4bd71154a89f6f683c3e7651e64  gnash-0.8.1.tar.gz
+24dfad0b553254faa06cf1bc1a43fef9  gnash-0.8.2.tar.gz


--- gnash-plugin.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  9 14:44:14 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sun, 9 Mar 2008 14:44:14 GMT
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo86588.sw.buildfix.patch, NONE,
	1.1.2.1 openoffice.org.spec, 1.1440.2.4, 1.1440.2.5
Message-ID: <200803091444.m29EiE9d001911@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1838

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Added Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-3.0.0.ooo86588.sw.buildfix.patch 
Log Message:
add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch

openoffice.org-3.0.0.ooo86588.sw.buildfix.patch:

--- NEW FILE openoffice.org-3.0.0.ooo86588.sw.buildfix.patch ---
Index: source/filter/xml/xmlmeta.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/xml/xmlmeta.cxx,v
retrieving revision 1.17.76.4
diff -u -r1.17.76.4 xmlmeta.cxx
--- openoffice.org.orig/sw/source/filter/xml/xmlmeta.cxx	18 Dec 2007 18:30:32 -0000	1.17.76.4
+++ openoffice.org/sw/source/filter/xml/xmlmeta.cxx	3 Mar 2008 10:05:21 -0000
@@ -156,8 +156,8 @@
 struct statistic {
     SvXMLTokenMapAttrs token;
     const char* name;
-    sal_uInt16 SwDocStat::* target16;
-    sal_uInt32 SwDocStat::* target32;
+    USHORT SwDocStat::* target16;
+    ULONG  SwDocStat::* target32; /* or 64, on LP64 platforms */
 };
 
 static const struct statistic s_stats [] = {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.4
retrieving revision 1.1440.2.5
diff -u -r1.1440.2.4 -r1.1440.2.5
--- openoffice.org.spec	7 Mar 2008 17:05:50 -0000	1.1440.2.4
+++ openoffice.org.spec	9 Mar 2008 14:43:40 -0000	1.1440.2.5
@@ -140,6 +140,7 @@
 Patch66: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
 Patch67: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
 Patch68: workspace.cmcfixes43.patch
+Patch69: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1093,6 +1094,7 @@
 %patch66 -p1 -b .ooo86268.desktop.visibilitycockup.patch
 %patch67 -p1 -b .oooXXXXX.psprint.debugcups.patch
 %patch68 -p1 -b .workspace.cmcfixes43.patch
+%patch69 -p1 -b .ooo86588.sw.buildfix.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2868,7 +2870,7 @@
 
 
 %6changelog
-* Fri Mar 07 2008 Caolan McNamara  - 1:3.0.0-0.1.1
+* Sun Mar 09 2008 Caolan McNamara  - 1:3.0.0-0.1.1
 - extend selinux bodge to ia64 
 - drop integrated workspace.notes2.patch
 - drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
@@ -2877,6 +2879,7 @@
 - drop integrated openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
 - drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
 - add workspace.cmcfixes43.patch
+- add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 
 * Thu Mar 06 2008 Caolan McNamara  - 1:2.4.0-9.1
 - next release candidate



From fedora-extras-commits at redhat.com  Sun Mar  9 14:45:45 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 9 Mar 2008 14:45:45 GMT
Subject: rpms/tetex-tex4ht/F-8 .cvsignore, 1.10, 1.11 sources, 1.11,
	1.12 tetex-tex4ht-1.0-rebuild.patch, 1.2, 1.3 tetex-tex4ht.spec,
	1.12, 1.13
Message-ID: <200803091445.m29Ejj6p001993@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1953

Modified Files:
	.cvsignore sources tetex-tex4ht-1.0-rebuild.patch 
	tetex-tex4ht.spec 
Log Message:
* Mon Dec 31 2007 Patrice Dumas  1.0.2007_12_19_2154-1.1
- update to 1.0.2007_12_19_2154
- new debian patch, new literate sources
- adapt for texlive



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-8/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Sep 2007 09:53:30 -0000	1.10
+++ .cvsignore	9 Mar 2008 14:45:10 -0000	1.11
@@ -1,4 +1,4 @@
-tex4ht-1.0.2007_09_04_0340.tar.gz
+tex4ht_20071211-2.diff.gz
+tex4ht-lit-20071220.zip
 tex4ht-all-20070609.zip
-tex4ht-lit-20070904.zip
-tex4ht_20070904-1.diff.gz
+tex4ht-1.0.2007_12_19_2154.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Sep 2007 09:53:30 -0000	1.11
+++ sources	9 Mar 2008 14:45:10 -0000	1.12
@@ -1,4 +1,4 @@
-dc7d1b45f9053ad3387eaadda2167b5b  tex4ht-1.0.2007_09_04_0340.tar.gz
+92845008562a935dd214358e2491df75  tex4ht_20071211-2.diff.gz
+0789ef4f7c6983747301d41228633391  tex4ht-lit-20071220.zip
 32fa3f44611fd86259aad939444b87d8  tex4ht-all-20070609.zip
-bd797ccaf2f6819f21ce4e8827cee519  tex4ht-lit-20070904.zip
-a0650cd770a1362fb054c3cf1a3ec6b2  tex4ht_20070904-1.diff.gz
+f1b9eeb9d39364cc0fe21727665f0edd  tex4ht-1.0.2007_12_19_2154.tar.gz

tetex-tex4ht-1.0-rebuild.patch:

Index: tetex-tex4ht-1.0-rebuild.patch
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-8/tetex-tex4ht-1.0-rebuild.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-tex4ht-1.0-rebuild.patch	21 Sep 2007 09:53:30 -0000	1.2
+++ tetex-tex4ht-1.0-rebuild.patch	9 Mar 2008 14:45:10 -0000	1.3
@@ -1,25 +1,15 @@
-diff -up tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh
---- tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh.rebuild	2007-09-21 07:52:12.000000000 +0200
-+++ tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh	2007-09-21 08:01:07.000000000 +0200
-@@ -260,11 +260,17 @@ done
+diff -up tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh
+--- tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh.rebuild	2008-01-01 01:08:01.000000000 +0100
++++ tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh	2008-01-01 01:10:45.000000000 +0100
+@@ -273,10 +273,7 @@ htlatex tex4ht-ooffice "xhtml,3,sections
  
- # The xttl files are for the experimental speech support.
- # These are built using xhlatex.
-+# use javac
-+# and xttl/jsml.4xt, and base/*/xv4ht.cat and the xtpipes dtd
- htlatex xtpipes "xhtml,3,next" "" "-d./"
--xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
--xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
--xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
--htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./"
-+#xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
-+htlatex tex4ht-docbook-xtpipes "xhtml,next,3" "" "-d./"
-+#xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
-+htlatex tex4ht-oo-xtpipes "xhtml,next,3" "" "-d./"
-+#xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
-+htlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
-+#htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./"
-+htlatex tex4ht-xhtml-xtpipes "xhtml,next,3" "" "-d./"
- xhlatex tex4ht-html-speech "html,3,sections+"
+ for htype in info-mml info-svg info-javahelp info-ooffice
+ do
+-   latex tex4ht-${htype}.tex
+-   latex tex4ht-${htype}.tex
+-   latex tex4ht-${htype}.tex
+-   #htlatex tex4ht-${htype} "html,sections+"
++   htlatex tex4ht-${htype} "html,sections+"
+ done
  
- movefiles
+ latex tex4ht-bibtex2


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-8/tetex-tex4ht.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tetex-tex4ht.spec	21 Sep 2007 09:53:30 -0000	1.12
+++ tetex-tex4ht.spec	9 Mar 2008 14:45:10 -0000	1.13
@@ -4,8 +4,8 @@
 
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
-Version:       1.0.2007_09_04_0340
-Release:       1%{?dist}
+Version:       1.0.2007_12_19_2154
+Release:       2%{?dist}.1
 License:       LPPL
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
@@ -18,21 +18,20 @@
 Source2:       tex4ht-lppl.txt
 # unversioned upstream litteral source, downloaded with wget -N
 #Source3:       http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-lit.zip
-Source3:       tex4ht-lit-20070904.zip
+Source3:       tex4ht-lit-20071220.zip
 Source4:       http://www.cse.ohio-state.edu/~gurari/tpf/ProTex.sty
 Source5:       http://www.cse.ohio-state.edu/~gurari/tpf/AlProTex.sty
 Source6:       http://www.cse.ohio-state.edu/~gurari/tpf/DraTex.sty
 Source7:       http://www.cse.ohio-state.edu/~gurari/tpf/AlDraTex.sty
 # debian
-Patch1:         http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20070904-1.diff.gz
-# patch similar from debian/lit/texmf.cnf.patch, modified to fit fedora
-Patch2:        texmf.cnf.patch
+Patch1:        http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20071211-2.diff.gz
 # update debian rebuild script
-Patch3:        tetex-tex4ht-1.0-rebuild.patch
+#Patch3:        tetex-tex4ht-1.0-rebuild.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# kpsewhich should be brought in by kpathsea-devel anyway
 BuildRequires:  /usr/bin/kpsewhich
-BuildRequires:  tetex-fonts
+#BuildRequires:  kpathsea-devel
 BuildRequires:  java-devel /usr/bin/fastjar
 # for uudecode to generate the debian tutorial images
 BuildRequires:  sharutils
@@ -40,9 +39,9 @@
 Requires:       netpbm-progs
 # ImageMagick, pstoedit depends on ghostscript and gs is in ghostscript
 Requires:       ImageMagick pstoedit
-# dvips is in tetex-dvips. tetex-latex depends on tetex-dvips.
-# dvipng is in tetex. tetex-latex depends on tetex.
-Requires:       tetex-latex
+# dvips is in texlive-dvips. texlive-latex provides tetex-latex and 
+# depends on texlive-dvips.
+Requires:       tetex-latex /usr/bin/dvipng
 Requires:       java
 Requires(post):   /usr/bin/texhash
 Requires(postun): /usr/bin/texhash
@@ -81,23 +80,25 @@
 cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/
 
 # avoid duplicating the debian patches
-# used as a source of inspiration
-patch -p1 < debian/patches/add_Makefile.diff
-patch -p1 < debian/patches/add_xtpipes_support
-patch -p1 < debian/patches/add_manpage.diff
-# not used
-patch -p1 < debian/patches/add_scripts_sh.diff
 patch -p1 < debian/patches/fix_mk4ht.diff
 # hardcoded /usr/share
 patch -p1 < debian/patches/fix_tex4ht_env.diff
+# use the debian man page
+patch -p1 < debian/patches/add_manpage.diff
+# Makefile used as a source of inspiration
+patch -p1 < debian/patches/add_Makefile.diff
+patch -p1 < debian/patches/add_xtpipes_support
+patch -p1 < debian/patches/Makefile_indep_arch
+# scripts and texmf.cnf excerpt for debian not used
+patch -p1 < debian/patches/add_scripts_sh.diff
+patch -p1 < debian/patches/add_texmf_cnf.diff
 
+# patches for literate sources
 patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff
 patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff
 #%patch4 -p1 -b .nohome
 
-cp -p %{PATCH2} debian/lit/
-
-%patch3 -p1 -b .rebuild
+#%patch3 -p1 -b .rebuild
 
 chmod a+x debian/lit/rebuild.sh
 
@@ -191,6 +192,17 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Mon Dec 31 2007 Patrice Dumas  1.0.2007_12_19_2154-1.1
+- update to 1.0.2007_12_19_2154
+- new debian patch, new literate sources
+- adapt for texlive
+
+* Sun Nov 25 2007 Patrice Dumas  1.0.2007_11_19_2329-1
+- update to 1.0.2007_11_19_2329 and use new literate sources
+
+* Sun Nov 11 2007 Patrice Dumas  1.0.2007_11_07_1645-1
+- update to 1.0.2007_11_07_1645
+
 * Fri Sep 21 2007 Patrice Dumas  1.0.2007_09_04_0340-1
 - update to 1.0.2007_09_04_0340
 - use all the debian patches



From fedora-extras-commits at redhat.com  Sun Mar  9 15:02:25 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 9 Mar 2008 15:02:25 GMT
Subject: rpms/tetex-tex4ht/F-7 .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 tetex-tex4ht.spec, 1.9, 1.10 tetex-tex4ht-1.0-prev.patch,
	1.1, NONE tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch, 1.1, NONE
Message-ID: <200803091502.m29F2Pl3009481@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9446

Modified Files:
	.cvsignore sources tetex-tex4ht.spec 
Removed Files:
	tetex-tex4ht-1.0-prev.patch 
	tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch 
Log Message:
* Mon Dec 31 2007 Patrice Dumas  1.0.2007_12_19_2154-1.1
- update to 1.0.2007_12_19_2154
- new debian patch, new literate sources
- adapt for texlive



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Nov 2006 00:41:27 -0000	1.8
+++ .cvsignore	9 Mar 2008 15:01:50 -0000	1.9
@@ -1,4 +1,4 @@
-tex4ht-all-20050228.zip
-tex4ht-lit-20061028.zip
-tex4ht_20060913-1.diff.gz
-tex4ht-1.0.2006_10_28_1705.tar.gz
+tex4ht_20071211-2.diff.gz
+tex4ht-lit-20071220.zip
+tex4ht-all-20070609.zip
+tex4ht-1.0.2007_12_19_2154.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Nov 2006 00:41:27 -0000	1.9
+++ sources	9 Mar 2008 15:01:50 -0000	1.10
@@ -1,4 +1,4 @@
-26eb8df2d6631794b3df0d6fb87a0219  tex4ht-all-20050228.zip
-a2837b2bd29e66afb574f1d0f99d4190  tex4ht-lit-20061028.zip
-a69edc1e15d23777bc89b9f3132930b0  tex4ht_20060913-1.diff.gz
-de456f43632f5fb321f5bdbeeb92dfe1  tex4ht-1.0.2006_10_28_1705.tar.gz
+92845008562a935dd214358e2491df75  tex4ht_20071211-2.diff.gz
+0789ef4f7c6983747301d41228633391  tex4ht-lit-20071220.zip
+32fa3f44611fd86259aad939444b87d8  tex4ht-all-20070609.zip
+f1b9eeb9d39364cc0fe21727665f0edd  tex4ht-1.0.2007_12_19_2154.tar.gz


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-7/tetex-tex4ht.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tetex-tex4ht.spec	3 Nov 2006 00:41:27 -0000	1.9
+++ tetex-tex4ht.spec	9 Mar 2008 15:01:50 -0000	1.10
@@ -1,48 +1,48 @@
 %{!?_texmf: %define _texmf %(eval "[ -x /usr/bin/kpsewhich ] && echo `kpsewhich -expand-var '$TEXMFMAIN'` || echo %{_datadir}/texmf")}
 
+%define _scriptsdir %{_datadir}/tex4ht
+
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
-Version:       1.0.2006_10_28_1705
-Release:       1%{?dist}
-License:       LaTeX Project Public License
+Version:       1.0.2007_12_19_2154
+Release:       2%{?dist}.1
+License:       LPPL
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
 Source0:       http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-%{version}.tar.gz
 # Source1 is only used for documentation
 # renamed to tex4ht-all-YYYYMMDD.zip - based on last timestamp in directory
-Source1: tex4ht-all-20050228.zip
+Source1:       tex4ht-all-20070609.zip
 # unversioned upstream source, downloaded with wget -N
 #Source1 http://www.cse.ohio-state.edu/~gurari/TeX4ht/tex4ht-all.zip
 Source2:       tex4ht-lppl.txt
 # unversioned upstream litteral source, downloaded with wget -N
 #Source3:       http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-lit.zip
-Source3:       tex4ht-lit-20061028.zip
+Source3:       tex4ht-lit-20071220.zip
 Source4:       http://www.cse.ohio-state.edu/~gurari/tpf/ProTex.sty
 Source5:       http://www.cse.ohio-state.edu/~gurari/tpf/AlProTex.sty
 Source6:       http://www.cse.ohio-state.edu/~gurari/tpf/DraTex.sty
 Source7:       http://www.cse.ohio-state.edu/~gurari/tpf/AlDraTex.sty
-#Patch0:        tex4ht-1.0.2006_10_24_0142-paths.patch
 # debian
-Patch1:         http://ftp.debian.org/debian/pool/main/t/tex4ht/tex4ht_20060913-1.diff.gz
-# patch similar from debian/lit/texmf.cnf.patch, modified to fit fedora
-Patch2:        texmf.cnf.patch
+Patch1:        http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20071211-2.diff.gz
 # update debian rebuild script
-Patch3:        tetex-tex4ht-1.0-prev.patch
-# if building from litteral sources, install xtpipes files in dest
-Patch4:        tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch
+#Patch3:        tetex-tex4ht-1.0-rebuild.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# kpsewhich should be brought in by kpathsea-devel anyway
 BuildRequires:  /usr/bin/kpsewhich
-BuildRequires:  tetex-fonts
+#BuildRequires:  kpathsea-devel
+BuildRequires:  java-devel /usr/bin/fastjar
 # for uudecode to generate the debian tutorial images
 BuildRequires:  sharutils
 # pnmcrop and pnmtopng are in netpbm-progs. 
 Requires:       netpbm-progs
 # ImageMagick, pstoedit depends on ghostscript and gs is in ghostscript
 Requires:       ImageMagick pstoedit
-# dvips is in tetex-dvips. tetex-latex depends on tetex-dvips.
-# dvipng is in tetex. tetex-latex depends on tetex.
-Requires:       tetex-latex
+# dvips is in texlive-dvips. texlive-latex provides tetex-latex and 
+# depends on texlive-dvips.
+Requires:       tetex-latex /usr/bin/dvipng
+Requires:       java
 Requires(post):   /usr/bin/texhash
 Requires(postun): /usr/bin/texhash
 Obsoletes:      tex4ht < %{version}-%{release}
@@ -60,46 +60,56 @@
 
 %prep
 %setup -q -n tex4ht-%{version}
+# debian patch
 %patch1 -p1
 
-# apply debian path which avoids using xtpipes since we cannot compile it
-patch -p1 < debian/patches/fix_mk4ht.diff
-
 chmod a-x src/*.c
-cp %{SOURCE2} lppl.txt
-mkdir doc
-cp %{SOURCE1} doc
-pushd doc 
-unzip tex4ht-all-*.zip
-rm *.zip
+cp -p %{SOURCE2} lppl.txt
+# unzip the all source for the doc
+mkdir doc/
+pushd doc/
+  unzip %{SOURCE1}
+  rm *.zip
 popd
-mkdir lit
-cp %{SOURCE3} lit
+mkdir lit/
 pushd lit
-unzip tex4ht-lit-*.zip
-rm *.zip
-chmod 0644 *.tex
+  unzip %{SOURCE3}
+  chmod 0644 *.tex
 popd
-cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/
 
-# avoid duplicating the debian patches while still allowing to rebuild
-# from literate sources
-patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff
-patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff
-%patch4 -p1 -b .nohome
+cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/
 
+# avoid duplicating the debian patches
+patch -p1 < debian/patches/fix_mk4ht.diff
+# hardcoded /usr/share
+patch -p1 < debian/patches/fix_tex4ht_env.diff
+# use the debian man page
 patch -p1 < debian/patches/add_manpage.diff
+# Makefile used as a source of inspiration
+patch -p1 < debian/patches/add_Makefile.diff
+patch -p1 < debian/patches/add_xtpipes_support
+patch -p1 < debian/patches/Makefile_indep_arch
+# scripts and texmf.cnf excerpt for debian not used
+patch -p1 < debian/patches/add_scripts_sh.diff
+patch -p1 < debian/patches/add_texmf_cnf.diff
 
-cp %{PATCH2} debian/lit/
+# patches for literate sources
+patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff
+patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff
+#%patch4 -p1 -b .nohome
 
-%patch3 -p1 -b .prev
+#%patch3 -p1 -b .rebuild
 
-chmod a+x debian/lit/rebuild.sh*
+chmod a+x debian/lit/rebuild.sh
 
 (cd debian/images; for i in *.uue; do uudecode $i; done; mv *.png ../html)
 
 find  texmf -type f -exec chmod a-x \{\} \;
 
+# add ht shebang
+echo "#! /bin/sh" | cat - bin/unix/ht > ht.new
+mv ht.new bin/unix/ht
+
 %build
 pushd src
 CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H \
@@ -107,33 +117,42 @@
 LDFLAGS=-lkpathsea
 gcc -o tex4ht $CFLAGS tex4ht.c $LDFLAGS
 gcc -o t4ht $CFLAGS t4ht.c $LDFLAGS
-popd
 
-# files in bin/ht/unix have a shebang but use xtpipes
+# adapted from debian Makefile
+mkdir class
+javac -d class -source 1.5 java/*.java java/xtpipes/*.java java/xtpipes/util/*.java
+fastjar -c -f tex4ht.jar -m java/manifest -C class .
+popd
 
-# add shebangs to the scripts that lacks one
-for file in bin/unix/*; do
-    if grep '^#! */' $file > /dev/null 2>&1; then continue; fi 
-    echo "#! /bin/sh" | cat - $file > $file.new
-    mv $file.new $file
-done
+# beware of the %% that have to be protected as %%%%
+sed \
+  -e "s;^i.*/ht-fonts/;i%{_texmf}/tex4ht/ht-fonts/;" \
+  -e "s;^tpath/tex/;t%{_texmf}/;" \
+  -e "s;%%%%~/texmf-dist/;%{_texmf}/;" \
+ texmf/tex4ht/base/unix/tex4ht.env > tex4ht.env
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d -m755 $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_scriptsdir}
 install -m755 src/tex4ht $RPM_BUILD_ROOT%{_bindir}
 install -m755 src/t4ht $RPM_BUILD_ROOT%{_bindir}
-#install -m755 bin/ht/unix/* $RPM_BUILD_ROOT%{_bindir}
-install -m755 bin/unix/* $RPM_BUILD_ROOT%{_bindir}
+install -m755 bin/ht/unix/* $RPM_BUILD_ROOT%{_bindir}
+#install -p -m755 bin/unix/* $RPM_BUILD_ROOT%{_scriptsdir}
+#for script in httex htlatex httexi htcontext htxetex htxelatex mk4ht; do
+#  install -p -m755 bin/unix/$script $RPM_BUILD_ROOT%{_bindir}
+#done
+#install -p -m755 bin/unix/ht $RPM_BUILD_ROOT%{_bindir}/tex4ht-ht
+install -p -m644 src/tex4ht.jar $RPM_BUILD_ROOT%{_scriptsdir}
 
-pushd texmf
-install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
-cp tex4ht/base/unix/tex4ht.env $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
+mkdir -p $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
+cp tex4ht.env $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
 
+pushd texmf
 cp -pr tex4ht/ht-fonts $RPM_BUILD_ROOT%{_texmf}/tex4ht
+cp -pr tex4ht/xtpipes $RPM_BUILD_ROOT%{_texmf}/tex4ht
 
-install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex/generic
+mkdir -p $RPM_BUILD_ROOT%{_texmf}/tex/generic
 cp -pr tex/generic/tex4ht $RPM_BUILD_ROOT%{_texmf}/tex/generic
 popd
 
@@ -143,7 +162,7 @@
    > README.kpathsea 
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-sed -e 's;@SCRIPTSDIR@;%{_bindir};' \
+sed -e 's;@SCRIPTSDIR@;%{_scriptsdir};' \
  -e 's;@TEX4HTDIR@;%{_texmf}/tex4ht/base/unix;' \
  -e 's;@TEXMFCNF@;%{_texmf}/web2c/texmf.cnf;' \
  -e 's;@HTFDIR@;%{_texmf}/tex4ht/ht-fonts;' \
@@ -157,6 +176,12 @@
 %defattr(-,root,root,-)
 %{_texmf}/tex4ht/
 %{_texmf}/tex/generic/tex4ht/
+#%{_bindir}/ht*
+#%{_bindir}/tex4ht-ht
+#%{_bindir}/mk4ht
+#%{_bindir}/tex4ht
+#%{_bindir}/t4ht
+%{_scriptsdir}/
 %{_bindir}/*
 %{_mandir}/man1/tex4ht.1*
 %doc lppl.txt doc tutorial README.kpathsea 
@@ -168,6 +193,25 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Mon Dec 31 2007 Patrice Dumas  1.0.2007_12_19_2154-1.1
+- update to 1.0.2007_12_19_2154
+- new debian patch, new literate sources
+- adapt for texlive
+
+* Sun Nov 25 2007 Patrice Dumas  1.0.2007_11_19_2329-1
+- update to 1.0.2007_11_19_2329 and use new literate sources
+
+* Sun Nov 11 2007 Patrice Dumas  1.0.2007_11_07_1645-1
+- update to 1.0.2007_11_07_1645
+
+* Fri Sep 21 2007 Patrice Dumas  1.0.2007_09_04_0340-1
+- update to 1.0.2007_09_04_0340
+- use all the debian patches
+
+* Sat Aug  4 2007 Patrice Dumas  1.0.2007_07_17_0228-1
+- update to 1.0.2007_07_17_0228
+- rename tetex-tex4ht-1.0-prev.patch to tetex-tex4ht-1.0-rebuild.patch
+
 * Fri Nov  3 2006 Patrice Dumas  1.0.2006_10_28_1705-1
 - update
 - use debian patchset


--- tetex-tex4ht-1.0-prev.patch DELETED ---


--- tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  9 15:11:25 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 9 Mar 2008 15:11:25 GMT
Subject: rpms/tetex-tex4ht/F-7 tetex-tex4ht.spec,1.10,1.11
Message-ID: <200803091511.m29FBPp9009744@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9683

Modified Files:
	tetex-tex4ht.spec 
Log Message:
Fix scripts in source path.



Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-7/tetex-tex4ht.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tetex-tex4ht.spec	9 Mar 2008 15:01:50 -0000	1.10
+++ tetex-tex4ht.spec	9 Mar 2008 15:10:50 -0000	1.11
@@ -5,7 +5,7 @@
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
 Version:       1.0.2007_12_19_2154
-Release:       2%{?dist}.1
+Release:       2%{?dist}.2
 License:       LPPL
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
@@ -137,7 +137,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_scriptsdir}
 install -m755 src/tex4ht $RPM_BUILD_ROOT%{_bindir}
 install -m755 src/t4ht $RPM_BUILD_ROOT%{_bindir}
-install -m755 bin/ht/unix/* $RPM_BUILD_ROOT%{_bindir}
+install -m755 bin/unix/* $RPM_BUILD_ROOT%{_bindir}
 #install -p -m755 bin/unix/* $RPM_BUILD_ROOT%{_scriptsdir}
 #for script in httex htlatex httexi htcontext htxetex htxelatex mk4ht; do
 #  install -p -m755 bin/unix/$script $RPM_BUILD_ROOT%{_bindir}
@@ -193,7 +193,7 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
-* Mon Dec 31 2007 Patrice Dumas  1.0.2007_12_19_2154-1.1
+* Mon Dec 31 2007 Patrice Dumas  1.0.2007_12_19_2154-1.2
 - update to 1.0.2007_12_19_2154
 - new debian patch, new literate sources
 - adapt for texlive



From fedora-extras-commits at redhat.com  Sun Mar  9 15:12:13 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 9 Mar 2008 15:12:13 GMT
Subject: rpms/tetex-tex4ht/F-7 tetex-tex4ht-1.0-rebuild.patch,NONE,1.1
Message-ID: <200803091512.m29FCDWI009793@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9782

Added Files:
	tetex-tex4ht-1.0-rebuild.patch 
Log Message:
add tetex-tex4ht-1.0-rebuild.patch which is not really needed, but sync with F-8

tetex-tex4ht-1.0-rebuild.patch:

--- NEW FILE tetex-tex4ht-1.0-rebuild.patch ---
diff -up tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh
--- tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh.rebuild	2008-01-01 01:08:01.000000000 +0100
+++ tex4ht-1.0.2007_12_19_2154/debian/lit/rebuild.sh	2008-01-01 01:10:45.000000000 +0100
@@ -273,10 +273,7 @@ htlatex tex4ht-ooffice "xhtml,3,sections
 
 for htype in info-mml info-svg info-javahelp info-ooffice
 do
-   latex tex4ht-${htype}.tex
-   latex tex4ht-${htype}.tex
-   latex tex4ht-${htype}.tex
-   #htlatex tex4ht-${htype} "html,sections+"
+   htlatex tex4ht-${htype} "html,sections+"
 done
 
 latex tex4ht-bibtex2



From fedora-extras-commits at redhat.com  Sun Mar  9 15:22:12 2008
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Sun, 9 Mar 2008 15:22:12 GMT
Subject: rpms/sunbird/devel sunbird-0.7-uilocale.patch, NONE,
	1.1 sunbird.spec, 1.1, 1.2
Message-ID: <200803091522.m29FMCKX010011@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9983/devel

Modified Files:
	sunbird.spec 
Added Files:
	sunbird-0.7-uilocale.patch 
Log Message:
Try to use the correct locale (#436693)


sunbird-0.7-uilocale.patch:

--- NEW FILE sunbird-0.7-uilocale.patch ---
Guess the UI locale to use.  If only intl.locale.matchOS worked...
Lubomir Kundrak 

--- mozilla/calendar/sunbird/app/mozilla.in.orig	2008-02-28 14:08:25.000000000 +0100
+++ mozilla/calendar/sunbird/app/mozilla.in	2008-02-28 14:08:52.000000000 +0100
@@ -249,6 +249,22 @@ done
 
 export MRE_HOME
 
+# Try without a local variant first, then with a local variant
+# So that pt-BR doesn't try to use pt for example
+
+SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
+MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
+
+if [ -f $dist_bin/extensions/langpack-${MOZLOCALE}@sunbird.mozilla.org/chrome/$MOZLOCALE.jar ]
+then
+        set -- "$@" -UILocale $MOZLOCALE
+else
+        if [ -f $dist_bin/extensions/langpack-${SHORTMOZLOCALE}@sunbird.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]
+        then
+                set -- "$@" -UILocale $SHORTMOZLOCALE
+        fi
+fi
+
 ## Start addon scripts
 moz_pis_startstop_scripts "start"
 


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sunbird.spec	19 Feb 2008 17:49:15 -0000	1.1
+++ sunbird.spec	9 Mar 2008 15:21:34 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           sunbird
 Version:        0.7
-Release:        8%{?official:.official}%{?dist}
+Release:        9%{?official:.official}%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
@@ -17,9 +17,9 @@
 Source3:        mozilla-extension-update.sh
 Source100:      find-external-requires
 
-# build patches
 Patch1:         sunbird-0.3.1-link-layout.patch
 Patch2:         sunbird-0.7-path.patch
+Patch3:         sunbird-0.7-uilocale.patch
    
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,8 +73,9 @@
 
 %prep
 %setup -q -n mozilla
-%patch1   -p1 -b .link-layout
-%patch2   -p1 -b .path
+%patch1 -p1 -b .link-layout
+%patch2 -p1 -b .path
+%patch3 -p1 -b .uilocale
 # Fix source perms to avoid errors in the debuginfo RPM (bug 357661)
 find . -type f \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x '{}' \;
 
@@ -272,6 +273,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Lubomir Kundrak  0.7-9
+- Try to use the correct locale (#436693)
+
 * Mon Jan 21 2008 Lubomir Kundrak  0.7-8
 - Streamlined BuildRequires a bit
 - Do not provide stuff that has to be provided by firefox



From fedora-extras-commits at redhat.com  Sun Mar  9 15:23:56 2008
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Sun, 9 Mar 2008 15:23:56 GMT
Subject: rpms/sunbird/EL-5 sunbird-0.7-uilocale.patch, NONE, 1.1 sunbird.spec,
	1.1, 1.2
Message-ID: <200803091523.m29FNuIF010201@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10141/EL-5

Modified Files:
	sunbird.spec 
Added Files:
	sunbird-0.7-uilocale.patch 
Log Message:
merge from devel

sunbird-0.7-uilocale.patch:

--- NEW FILE sunbird-0.7-uilocale.patch ---
Guess the UI locale to use.  If only intl.locale.matchOS worked...
Lubomir Kundrak 

--- mozilla/calendar/sunbird/app/mozilla.in.orig	2008-02-28 14:08:25.000000000 +0100
+++ mozilla/calendar/sunbird/app/mozilla.in	2008-02-28 14:08:52.000000000 +0100
@@ -249,6 +249,22 @@ done
 
 export MRE_HOME
 
+# Try without a local variant first, then with a local variant
+# So that pt-BR doesn't try to use pt for example
+
+SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
+MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
+
+if [ -f $dist_bin/extensions/langpack-${MOZLOCALE}@sunbird.mozilla.org/chrome/$MOZLOCALE.jar ]
+then
+        set -- "$@" -UILocale $MOZLOCALE
+else
+        if [ -f $dist_bin/extensions/langpack-${SHORTMOZLOCALE}@sunbird.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]
+        then
+                set -- "$@" -UILocale $SHORTMOZLOCALE
+        fi
+fi
+
 ## Start addon scripts
 moz_pis_startstop_scripts "start"
 


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/EL-5/sunbird.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sunbird.spec	19 Feb 2008 17:52:03 -0000	1.1
+++ sunbird.spec	9 Mar 2008 15:23:22 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           sunbird
 Version:        0.7
-Release:        8%{?official:.official}%{?dist}
+Release:        9%{?official:.official}%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
@@ -17,9 +17,9 @@
 Source3:        mozilla-extension-update.sh
 Source100:      find-external-requires
 
-# build patches
 Patch1:         sunbird-0.3.1-link-layout.patch
 Patch2:         sunbird-0.7-path.patch
+Patch3:         sunbird-0.7-uilocale.patch
    
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,8 +73,9 @@
 
 %prep
 %setup -q -n mozilla
-%patch1   -p1 -b .link-layout
-%patch2   -p1 -b .path
+%patch1 -p1 -b .link-layout
+%patch2 -p1 -b .path
+%patch3 -p1 -b .uilocale
 # Fix source perms to avoid errors in the debuginfo RPM (bug 357661)
 find . -type f \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x '{}' \;
 
@@ -272,6 +273,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Lubomir Kundrak  0.7-9
+- Try to use the correct locale (#436693)
+
 * Mon Jan 21 2008 Lubomir Kundrak  0.7-8
 - Streamlined BuildRequires a bit
 - Do not provide stuff that has to be provided by firefox



From fedora-extras-commits at redhat.com  Sun Mar  9 15:24:04 2008
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Sun, 9 Mar 2008 15:24:04 GMT
Subject: rpms/sunbird/F-8 sunbird-0.7-uilocale.patch, NONE, 1.1 sunbird.spec,
	1.1, 1.2
Message-ID: <200803091524.m29FO4ir010236@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10171/F-8

Modified Files:
	sunbird.spec 
Added Files:
	sunbird-0.7-uilocale.patch 
Log Message:
merge from devel

sunbird-0.7-uilocale.patch:

--- NEW FILE sunbird-0.7-uilocale.patch ---
Guess the UI locale to use.  If only intl.locale.matchOS worked...
Lubomir Kundrak 

--- mozilla/calendar/sunbird/app/mozilla.in.orig	2008-02-28 14:08:25.000000000 +0100
+++ mozilla/calendar/sunbird/app/mozilla.in	2008-02-28 14:08:52.000000000 +0100
@@ -249,6 +249,22 @@ done
 
 export MRE_HOME
 
+# Try without a local variant first, then with a local variant
+# So that pt-BR doesn't try to use pt for example
+
+SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
+MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
+
+if [ -f $dist_bin/extensions/langpack-${MOZLOCALE}@sunbird.mozilla.org/chrome/$MOZLOCALE.jar ]
+then
+        set -- "$@" -UILocale $MOZLOCALE
+else
+        if [ -f $dist_bin/extensions/langpack-${SHORTMOZLOCALE}@sunbird.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]
+        then
+                set -- "$@" -UILocale $SHORTMOZLOCALE
+        fi
+fi
+
 ## Start addon scripts
 moz_pis_startstop_scripts "start"
 


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-8/sunbird.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sunbird.spec	19 Feb 2008 17:52:39 -0000	1.1
+++ sunbird.spec	9 Mar 2008 15:23:27 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           sunbird
 Version:        0.7
-Release:        8%{?official:.official}%{?dist}
+Release:        9%{?official:.official}%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
@@ -17,9 +17,9 @@
 Source3:        mozilla-extension-update.sh
 Source100:      find-external-requires
 
-# build patches
 Patch1:         sunbird-0.3.1-link-layout.patch
 Patch2:         sunbird-0.7-path.patch
+Patch3:         sunbird-0.7-uilocale.patch
    
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,8 +73,9 @@
 
 %prep
 %setup -q -n mozilla
-%patch1   -p1 -b .link-layout
-%patch2   -p1 -b .path
+%patch1 -p1 -b .link-layout
+%patch2 -p1 -b .path
+%patch3 -p1 -b .uilocale
 # Fix source perms to avoid errors in the debuginfo RPM (bug 357661)
 find . -type f \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x '{}' \;
 
@@ -272,6 +273,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Lubomir Kundrak  0.7-9
+- Try to use the correct locale (#436693)
+
 * Mon Jan 21 2008 Lubomir Kundrak  0.7-8
 - Streamlined BuildRequires a bit
 - Do not provide stuff that has to be provided by firefox



From fedora-extras-commits at redhat.com  Sun Mar  9 15:44:03 2008
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Sun, 9 Mar 2008 15:44:03 GMT
Subject: rpms/dovecot/devel .cvsignore, 1.34, 1.35 dovecot.spec, 1.98,
	1.99 sources, 1.37, 1.38
Message-ID: <200803091544.m29Fi3WT010576@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10546

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Sun Mar 09 2008 Tomas Janousek  - 1:1.0.13-6
- update to latest upstream stable (1.0.13)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	7 Jan 2008 10:22:38 -0000	1.34
+++ .cvsignore	9 Mar 2008 15:43:23 -0000	1.35
@@ -1,4 +1,4 @@
-dovecot-1.0.10.tar.gz
-dovecot-1.0.10.tar.gz.sig
+dovecot-1.0.13.tar.gz
+dovecot-1.0.13.tar.gz.sig
 dovecot-sieve-1.0.2.tar.gz
 dovecot-sieve-1.0.2.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- dovecot.spec	21 Feb 2008 02:39:09 -0000	1.98
+++ dovecot.spec	9 Mar 2008 15:43:23 -0000	1.99
@@ -1,9 +1,9 @@
 #%define dovecot_hg a744ae38a9e1
 #%define sieve_hg 0367450c9382
-%define upstream 1.0.10
+%define upstream 1.0.13
 %define sieve_upstream 1.0.2
-%define pkg_version 1.0.10
-%define my_release 5
+%define pkg_version 1.0.13
+%define my_release 6
 %define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.2
 %define pkg_sieve_release %{my_release}%{?dist}
@@ -414,6 +414,9 @@
 #%endif
 
 %changelog
+* Sun Mar 09 2008 Tomas Janousek  - 1:1.0.13-6
+- update to latest upstream stable (1.0.13)
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 1:1.0.10-5
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	7 Jan 2008 10:22:38 -0000	1.37
+++ sources	9 Mar 2008 15:43:23 -0000	1.38
@@ -1,4 +1,4 @@
-c050fa2a7dae8984d432595e3e8183e1  dovecot-1.0.10.tar.gz
-4d12a255570e83809ba2019b61efe889  dovecot-1.0.10.tar.gz.sig
+281bd9dee8d6c1674977257acc80ce64  dovecot-1.0.13.tar.gz
+e0cf121ac0819a6a85eb94b21bc45889  dovecot-1.0.13.tar.gz.sig
 508926fc9ff8e0f6e13506e237d4916b  dovecot-sieve-1.0.2.tar.gz
 fdb27eafe011a7a1ed92531f334e4f8c  dovecot-sieve-1.0.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Sun Mar  9 15:48:14 2008
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Sun, 9 Mar 2008 15:48:14 GMT
Subject: rpms/dovecot/F-8 .cvsignore, 1.34, 1.35 dovecot.spec, 1.95,
	1.96 sources, 1.37, 1.38
Message-ID: <200803091548.m29FmEMS010692@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/pkgs/rpms/dovecot/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10670

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Sun Mar 09 2008 Tomas Janousek  - 1:1.0.13-6
- update to latest upstream stable (1.0.13)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-8/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	7 Jan 2008 10:25:12 -0000	1.34
+++ .cvsignore	9 Mar 2008 15:47:39 -0000	1.35
@@ -1,4 +1,4 @@
-dovecot-1.0.10.tar.gz
-dovecot-1.0.10.tar.gz.sig
+dovecot-1.0.13.tar.gz
+dovecot-1.0.13.tar.gz.sig
 dovecot-sieve-1.0.2.tar.gz
 dovecot-sieve-1.0.2.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-8/dovecot.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- dovecot.spec	7 Jan 2008 10:25:12 -0000	1.95
+++ dovecot.spec	9 Mar 2008 15:47:39 -0000	1.96
@@ -1,9 +1,9 @@
 #%define dovecot_hg a744ae38a9e1
 #%define sieve_hg 0367450c9382
-%define upstream 1.0.10
+%define upstream 1.0.13
 %define sieve_upstream 1.0.2
-%define pkg_version 1.0.10
-%define my_release 4
+%define pkg_version 1.0.13
+%define my_release 6
 %define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.2
 %define pkg_sieve_release %{my_release}%{?dist}
@@ -414,6 +414,9 @@
 #%endif
 
 %changelog
+* Sun Mar 09 2008 Tomas Janousek  - 1:1.0.13-6
+- update to latest upstream stable (1.0.13)
+
 * Fri Jan 07 2008 Tomas Janousek  - 1:1.0.10-4
 - update to latest upstream stable (1.0.10)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-8/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	7 Jan 2008 10:25:12 -0000	1.37
+++ sources	9 Mar 2008 15:47:39 -0000	1.38
@@ -1,4 +1,4 @@
-c050fa2a7dae8984d432595e3e8183e1  dovecot-1.0.10.tar.gz
-4d12a255570e83809ba2019b61efe889  dovecot-1.0.10.tar.gz.sig
+281bd9dee8d6c1674977257acc80ce64  dovecot-1.0.13.tar.gz
+e0cf121ac0819a6a85eb94b21bc45889  dovecot-1.0.13.tar.gz.sig
 508926fc9ff8e0f6e13506e237d4916b  dovecot-sieve-1.0.2.tar.gz
 fdb27eafe011a7a1ed92531f334e4f8c  dovecot-sieve-1.0.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Sun Mar  9 15:50:45 2008
From: fedora-extras-commits at redhat.com (Tomas Janousek (tjanouse))
Date: Sun, 9 Mar 2008 15:50:45 GMT
Subject: rpms/dovecot/F-7 .cvsignore, 1.31, 1.32 dovecot.spec, 1.84,
	1.85 sources, 1.32, 1.33
Message-ID: <200803091550.m29FojRN010803@cvs-int.fedora.redhat.com>

Author: tjanouse

Update of /cvs/pkgs/rpms/dovecot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10773

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Sun Mar 09 2008 Tomas Janousek  - 1.0.13-18
- update to latest upstream stable (1.0.13)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-7/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	7 Jan 2008 10:46:11 -0000	1.31
+++ .cvsignore	9 Mar 2008 15:50:05 -0000	1.32
@@ -1,4 +1,4 @@
-dovecot-1.0.10.tar.gz
-dovecot-1.0.10.tar.gz.sig
+dovecot-1.0.13.tar.gz
+dovecot-1.0.13.tar.gz.sig
 dovecot-sieve-1.0.2.tar.gz
 dovecot-sieve-1.0.2.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-7/dovecot.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- dovecot.spec	7 Jan 2008 10:46:11 -0000	1.84
+++ dovecot.spec	9 Mar 2008 15:50:05 -0000	1.85
@@ -1,7 +1,7 @@
-%define upstream 1.0.10
+%define upstream 1.0.13
 %define sieve_upstream 1.0.2
-%define pkg_version 1.0.10
-%define my_release 17
+%define pkg_version 1.0.13
+%define my_release 18
 %define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.2
 %define pkg_sieve_release %{my_release}%{?dist}
@@ -300,6 +300,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Tomas Janousek  - 1.0.13-18
+- update to latest upstream stable (1.0.13)
+
 * Mon Jan 07 2008 Tomas Janousek  - 1.0.10-17
 - update to latest upstream stable (1.0.10)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-7/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	7 Jan 2008 10:46:11 -0000	1.32
+++ sources	9 Mar 2008 15:50:05 -0000	1.33
@@ -1,4 +1,4 @@
-c050fa2a7dae8984d432595e3e8183e1  dovecot-1.0.10.tar.gz
-4d12a255570e83809ba2019b61efe889  dovecot-1.0.10.tar.gz.sig
+281bd9dee8d6c1674977257acc80ce64  dovecot-1.0.13.tar.gz
+e0cf121ac0819a6a85eb94b21bc45889  dovecot-1.0.13.tar.gz.sig
 508926fc9ff8e0f6e13506e237d4916b  dovecot-sieve-1.0.2.tar.gz
 fdb27eafe011a7a1ed92531f334e4f8c  dovecot-sieve-1.0.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Sun Mar  9 15:51:23 2008
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Sun, 9 Mar 2008 15:51:23 GMT
Subject: rpms/alsa-plugins/devel alsa-plugins.spec, 1.11, 1.12 jack.conf, 1.1,
	1.2 pcm-oss.conf, 1.1, 1.2 pulse-default.conf, 1.2,
	1.3 samplerate.conf, 1.1, 1.2 upmix.conf, 1.1, 1.2 vdownmix.conf,
	1.1, 1.2
Message-ID: <200803091551.m29FpN6H010881@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10807

Modified Files:
	alsa-plugins.spec jack.conf pcm-oss.conf pulse-default.conf 
	samplerate.conf upmix.conf vdownmix.conf 
Log Message:
* Sun Mar 09 2008 Lubomir Kundrak  - 1.0.16-2
- Add descriptions to various PCM plugins, so they're visible in aplay -L



Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- alsa-plugins.spec	8 Mar 2008 15:00:45 -0000	1.11
+++ alsa-plugins.spec	9 Mar 2008 15:50:49 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
 Version:        1.0.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
 License:        GPLv2+ and LGPLv2+
@@ -171,6 +171,9 @@
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* Sun Mar 09 2008 Lubomir Kundrak  - 1.0.16-2
+- Add descriptions to various PCM plugins, so they're visible in aplay -L
+
 * Sat Mar 08 2008 Lubomir Kundrak  - 1.0.16-1
 - New upstream, dropping upstreamed patches
 - Do not assert fail when pulseaudio is unavailable (#435148)


Index: jack.conf
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/jack.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jack.conf	8 Aug 2007 05:40:33 -0000	1.1
+++ jack.conf	9 Mar 2008 15:50:49 -0000	1.2
@@ -1,4 +1,5 @@
 # The jack plugin configuration
+# $Id$
 
 pcm.jack {
 	type jack
@@ -10,4 +11,7 @@
 		0 alsa_pcm:capture_1
 		1 alsa_pcm:pcapture_1
 	}
+	hint {
+		description "JACK Audio Connection Kit"
+	}
 }


Index: pcm-oss.conf
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/pcm-oss.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcm-oss.conf	8 Aug 2007 05:40:33 -0000	1.1
+++ pcm-oss.conf	9 Mar 2008 15:50:49 -0000	1.2
@@ -3,4 +3,7 @@
 pcm.oss {
 	type oss
 	device /dev/dsp
+	hint {
+		description "Open Sound System"
+	}
 }


Index: pulse-default.conf
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/pulse-default.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pulse-default.conf	18 Oct 2007 12:52:05 -0000	1.2
+++ pulse-default.conf	9 Mar 2008 15:50:49 -0000	1.3
@@ -1,22 +1,35 @@
 # PulseAudio plugin configuration
+# $Id$
 
 # Let's create a virtual device "pulse" for mixer and PCM
 
 pcm.pulse {
     type pulse
+    hint {
+        description "PulseAudio Sound Server"
+    }
 }
 
 ctl.pulse {
     type pulse
+    hint {
+        description "PulseAudio Sound Server"
+    }
 }
 
 # Let's make it the default!
 
 pcm.!default {
     type pulse
+    hint {
+        description "Default"
+    }
 }
 
 ctl.!default {
     type pulse
+    hint {
+        description "Default"
+    }
 }
 


Index: samplerate.conf
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/samplerate.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samplerate.conf	8 Aug 2007 05:40:33 -0000	1.1
+++ samplerate.conf	9 Mar 2008 15:50:49 -0000	1.2
@@ -1,7 +1,11 @@
 # samplerate plugin configuration
+# $Id$
 
 pcm.my_rate {
 	type rate
 	slave.pcm "hw"
 	converter "samplerate"
+	hint {
+		description "External rate converter"
+	}
 }


Index: upmix.conf
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/upmix.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upmix.conf	8 Aug 2007 05:40:33 -0000	1.1
+++ upmix.conf	9 Mar 2008 15:50:49 -0000	1.2
@@ -1,6 +1,10 @@
 # upmix plugin configuration
+# $Id$
 
 pcm.upmix51 {
 	type upmix
 	slave.pcm "surround51"
+	hint {
+		description "Upmixer channel expander"
+	}
 }


Index: vdownmix.conf
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/vdownmix.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdownmix.conf	8 Aug 2007 05:40:33 -0000	1.1
+++ vdownmix.conf	9 Mar 2008 15:50:49 -0000	1.2
@@ -1,11 +1,18 @@
 # vdownmix plugin configuration
+# $Id$
 
 pcm.!surround51 {
 	type vdownmix
 	slave.pcm "default"
+	hint {
+		description "Downmixer to stereo from surround51"
+	}
 }
 
 pcm.!surround40 {
 	type vdownmix
 	slave.pcm "default"
+	hint {
+		description "Downmixer to stereo from surround40"
+	}
 }



From fedora-extras-commits at redhat.com  Sun Mar  9 16:52:30 2008
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 9 Mar 2008 16:52:30 GMT
Subject: rpms/jd/F-7 .cvsignore, 1.184, 1.185 jd.spec, 1.209, 1.210 sources, 
	1.185, 1.186
Message-ID: <200803091652.m29GqU2K019006@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18934/F-7

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Mar 10 2008 Mamoru Tasaka  - 2.0.0-0.3.svn1892
- svn 1892 (version 2.0.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- .cvsignore	2 Mar 2008 18:02:20 -0000	1.184
+++ .cvsignore	9 Mar 2008 16:51:56 -0000	1.185
@@ -1,3 +1,3 @@
 jd-1.9.9-beta080225.tgz
 jd-2.0.0-svn1763_jdsksy.tgz
-jd-2.0.0-svn1886_trunk.tgz
+jd-2.0.0-svn1892_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- jd.spec	2 Mar 2008 18:02:20 -0000	1.209
+++ jd.spec	9 Mar 2008 16:51:56 -0000	1.210
@@ -22,7 +22,7 @@
 
 %if             %use_trunk
 %define         main_ver      2.0.0
-%define         strtag        svn1886_trunk
+%define         strtag        svn1892_trunk
 %define         _pre_release  1
 %endif
 
@@ -143,8 +143,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Mar  3 2008 Mamoru Tasaka  - 2.0.0-0.3.svn1886
-- svn 1886 (version 2.0.0)
+* Mon Mar 10 2008 Mamoru Tasaka  - 2.0.0-0.3.svn1892
+- svn 1892 (version 2.0.0)
 
 * Mon Feb 25 2008 Mamoru Tasaka  - 1.9.9-0.3.beta080225
 - 1.9.9 beta 080225


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- sources	2 Mar 2008 18:02:20 -0000	1.185
+++ sources	9 Mar 2008 16:51:56 -0000	1.186
@@ -1,3 +1,3 @@
 5fcca1803f2f0ab384f79236e0d3f392  jd-1.9.9-beta080225.tgz
 e0de8ba3fde4a2f4ccf989f8b4842076  jd-2.0.0-svn1763_jdsksy.tgz
-47b6e9f5f1ba0ee282a86cfea6be365b  jd-2.0.0-svn1886_trunk.tgz
+fda045510621d0457e7c23b142493085  jd-2.0.0-svn1892_trunk.tgz



From fedora-extras-commits at redhat.com  Sun Mar  9 16:52:34 2008
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 9 Mar 2008 16:52:34 GMT
Subject: rpms/jd/F-8 .cvsignore, 1.205, 1.206 jd.spec, 1.237, 1.238 sources, 
	1.206, 1.207
Message-ID: <200803091652.m29GqYOv019011@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18934/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Mar 10 2008 Mamoru Tasaka  - 2.0.0-0.3.svn1892
- svn 1892 (version 2.0.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- .cvsignore	2 Mar 2008 18:02:29 -0000	1.205
+++ .cvsignore	9 Mar 2008 16:52:00 -0000	1.206
@@ -1,3 +1,3 @@
 jd-1.9.9-beta080225.tgz
 jd-2.0.0-svn1763_jdsksy.tgz
-jd-2.0.0-svn1886_trunk.tgz
+jd-2.0.0-svn1892_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- jd.spec	2 Mar 2008 18:02:29 -0000	1.237
+++ jd.spec	9 Mar 2008 16:52:00 -0000	1.238
@@ -22,7 +22,7 @@
 
 %if             %use_trunk
 %define         main_ver      2.0.0
-%define         strtag        svn1886_trunk
+%define         strtag        svn1892_trunk
 %define         _pre_release  1
 %endif
 
@@ -143,8 +143,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Mar  3 2008 Mamoru Tasaka  - 2.0.0-0.3.svn1886
-- svn 1886 (version 2.0.0)
+* Mon Mar 10 2008 Mamoru Tasaka  - 2.0.0-0.3.svn1892
+- svn 1892 (version 2.0.0)
 
 * Mon Feb 25 2008 Mamoru Tasaka  - 1.9.9-0.3.beta080225
 - 1.9.9 beta 080225


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- sources	2 Mar 2008 18:02:29 -0000	1.206
+++ sources	9 Mar 2008 16:52:00 -0000	1.207
@@ -1,3 +1,3 @@
 5fcca1803f2f0ab384f79236e0d3f392  jd-1.9.9-beta080225.tgz
 e0de8ba3fde4a2f4ccf989f8b4842076  jd-2.0.0-svn1763_jdsksy.tgz
-47b6e9f5f1ba0ee282a86cfea6be365b  jd-2.0.0-svn1886_trunk.tgz
+fda045510621d0457e7c23b142493085  jd-2.0.0-svn1892_trunk.tgz



From fedora-extras-commits at redhat.com  Sun Mar  9 16:52:38 2008
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 9 Mar 2008 16:52:38 GMT
Subject: rpms/jd/devel .cvsignore, 1.211, 1.212 jd.spec, 1.245, 1.246 sources,
	1.212, 1.213
Message-ID: <200803091652.m29Gqcts019016@cvs-int.fedora.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Mar 10 2008 Mamoru Tasaka  - 2.0.0-0.3.svn1892
- svn 1892 (version 2.0.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- .cvsignore	2 Mar 2008 18:02:34 -0000	1.211
+++ .cvsignore	9 Mar 2008 16:52:04 -0000	1.212
@@ -1,3 +1,3 @@
 jd-1.9.9-beta080225.tgz
 jd-2.0.0-svn1763_jdsksy.tgz
-jd-2.0.0-svn1886_trunk.tgz
+jd-2.0.0-svn1892_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- jd.spec	2 Mar 2008 18:02:35 -0000	1.245
+++ jd.spec	9 Mar 2008 16:52:04 -0000	1.246
@@ -22,7 +22,7 @@
 
 %if             %use_trunk
 %define         main_ver      2.0.0
-%define         strtag        svn1886_trunk
+%define         strtag        svn1892_trunk
 %define         _pre_release  1
 %endif
 
@@ -143,8 +143,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Mar  3 2008 Mamoru Tasaka  - 2.0.0-0.3.svn1886
-- svn 1886 (version 2.0.0)
+* Mon Mar 10 2008 Mamoru Tasaka  - 2.0.0-0.3.svn1892
+- svn 1892 (version 2.0.0)
 
 * Mon Feb 25 2008 Mamoru Tasaka  - 1.9.9-0.3.beta080225
 - 1.9.9 beta 080225


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- sources	2 Mar 2008 18:02:35 -0000	1.212
+++ sources	9 Mar 2008 16:52:04 -0000	1.213
@@ -1,3 +1,3 @@
 5fcca1803f2f0ab384f79236e0d3f392  jd-1.9.9-beta080225.tgz
 e0de8ba3fde4a2f4ccf989f8b4842076  jd-2.0.0-svn1763_jdsksy.tgz
-47b6e9f5f1ba0ee282a86cfea6be365b  jd-2.0.0-svn1886_trunk.tgz
+fda045510621d0457e7c23b142493085  jd-2.0.0-svn1892_trunk.tgz



From fedora-extras-commits at redhat.com  Sun Mar  9 16:53:32 2008
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Sun, 9 Mar 2008 16:53:32 GMT
Subject: rpms/samba/F-8 .cvsignore, 1.47, 1.48 samba.spec, 1.144,
	1.145 sources, 1.51, 1.52
Message-ID: <200803091653.m29GrW4q019056@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19029

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
* Sun Mar  9 2008 Simo Sorce  3.0.28a-0.fc8
- New upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-8/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	10 Dec 2007 15:49:53 -0000	1.47
+++ .cvsignore	9 Mar 2008 16:52:59 -0000	1.48
@@ -1 +1 @@
-samba-3.0.28.tar.gz
+samba-3.0.28a.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-8/samba.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- samba.spec	10 Dec 2007 15:49:53 -0000	1.144
+++ samba.spec	9 Mar 2008 16:52:59 -0000	1.145
@@ -1,7 +1,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.0.28
+Version: 3.0.28a
 Release: 0%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
@@ -133,7 +133,7 @@
 %prep
 # TAG: change for non-pre
 #%setup -q -n samba-3.0.25rc3
-%setup -q 
+%setup -q
 
 # copy Red Hat specific scripts
 mkdir packaging/Fedora
@@ -176,7 +176,7 @@
 %endif
 %ifarch ia64
 #libtoolize --copy --force     # get it to recognize IA-64
-#autoheader                                               
+#autoheader
 #autoconf
 EXTRA="-D_LARGEFILE64_SOURCE"
 %endif
@@ -237,7 +237,7 @@
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba/winbindd_privileged
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba/scripts
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/swat/using_samba
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/samba/codepages 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/samba/codepages
 mkdir -p $RPM_BUILD_ROOT/var/run/winbindd
 
 cd source
@@ -643,6 +643,9 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Sun Mar  9 2008 Simo Sorce  3.0.28a-0.fc8
+- New upstream bugfix release
+
 * Mon Dec 10 2007 Simo Sorce  3.0.28-0.fc8
 - Fix CVE-2007-6015
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-8/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	10 Dec 2007 15:49:53 -0000	1.51
+++ sources	9 Mar 2008 16:52:59 -0000	1.52
@@ -1 +1 @@
-d5718a793e2bc1ad7faa30f0a042abe5  samba-3.0.28.tar.gz
+59754cb0c19da6e65c42d0a163c5885a  samba-3.0.28a.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  9 16:59:39 2008
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 9 Mar 2008 16:59:39 GMT
Subject: rpms/iso-codes/devel .cvsignore, 1.16, 1.17 iso-codes.spec, 1.22,
	1.23 sources, 1.16, 1.17
Message-ID: <200803091659.m29GxdAM019216@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/iso-codes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19171

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Sun Mar  9 2008 Christopher Aillon  2.0-1
- Update to 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Feb 2008 05:54:43 -0000	1.16
+++ .cvsignore	9 Mar 2008 16:59:05 -0000	1.17
@@ -1 +1 @@
-iso-codes-1.9.tar.bz2
+iso-codes-2.0.tar.bz2


Index: iso-codes.spec
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- iso-codes.spec	27 Feb 2008 06:00:48 -0000	1.22
+++ iso-codes.spec	9 Mar 2008 16:59:05 -0000	1.23
@@ -3,7 +3,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	1.9
+Version:	2.0
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
@@ -61,6 +61,9 @@
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Sun Mar  9 2008 Christopher Aillon  2.0-1
+- Update to 2.0
+
 * Wed Feb 27 2008 Christopher Aillon  1.9-1
 - Update to 1.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	27 Feb 2008 05:54:43 -0000	1.16
+++ sources	9 Mar 2008 16:59:05 -0000	1.17
@@ -1 +1 @@
-989fd746ece164c0de2a919acf03b9cc  iso-codes-1.9.tar.bz2
+58e7fee45749583e11a3880c8e1ae567  iso-codes-2.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 17:02:17 2008
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Sun, 9 Mar 2008 17:02:17 GMT
Subject: rpms/ggobi/devel ggobi.desktop, NONE, 1.1 ggobi.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200803091702.m29H2HET026610@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/ggobi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21973/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ggobi.desktop ggobi.spec 
Log Message:
Initial import of ggobi.



--- NEW FILE ggobi.desktop ---
[Desktop Entry]
Name=GGobi
GenericName=GGobi
Comment=Multivariate interactive graphics for exploratory data analysis
Categories=Astronomy;Science;Education;
Icon=ggobi
Exec=ggobi
Terminal=false
Type=Application


--- NEW FILE ggobi.spec ---
Name:		ggobi      
Version:	2.1.7
Release:	1%{?dist}
Summary:	Open source visualization for exploring high-dimensional data 
Group:		Applications/Engineering
License:	GPLv2
URL:		http://www.ggobi.org/ 
Source0:	http://www.ggobi.org/downloads/ggobi-%{version}.tar.bz2 
Source1:	ggobi.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libxml2-devel gtk2-devel, desktop-file-utils
Requires:	gtk2, libxml2 >= 2.6

%description
GGobi is an open source visualization program for
exploring high-dimensional data. It provides highly dynamic
and interactive graphics such as tours, as well as familiar
graphics such as the scatterplot, barchart and parallel coordinates plots.
Plots are interactive and linked with brushing and identification.

%package devel
Summary:	Open source visualization for exploring high-dimensional data
Group:		Development/Libraries	
Requires:	%{name} = %{version}-%{release}

%description devel
GGobi devel files

%prep
%setup -q

%build
%configure --with-all-plugins --datadir=%{_libdir} --disable-rpath
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
make ggobirc
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
rm $RPM_BUILD_ROOT%{_libdir}/applications/ggobi.desktop
mv $RPM_BUILD_ROOT%{_libdir}/pixmaps/ggobi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ggobi.png

desktop-file-install					\
  --vendor fedora 					\
  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ABOUT-NLS AUTHORS ChangeLog COPYING CPLicense.txt INSTALL README
%{_bindir}/ggobi
%{_libdir}/*.so.*
%{_libdir}/ggobi
%{_datadir}/pixmaps/ggobi.png
%{_datadir}/applications/*.desktop
%exclude %{_libdir}/*.la

%files devel
%{_includedir}/ggobi
%{_libdir}/*.so
%{_libdir}/pkgconfig/ggobi.pc

%changelog
* Mon Dec 31 2007 Marek Mahut  - 2.1.7-1
- Update to 2.1.7
- Light review of the spec file

* Sat Feb 17 2007 Zachary Whitley  - 2.1.4-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ggobi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2008 17:59:45 -0000	1.1
+++ .cvsignore	9 Mar 2008 17:01:40 -0000	1.2
@@ -0,0 +1 @@
+ggobi-2.1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ggobi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2008 17:59:45 -0000	1.1
+++ sources	9 Mar 2008 17:01:40 -0000	1.2
@@ -0,0 +1 @@
+96009a660aefa49c36e2d0d69a14d1b9  ggobi-2.1.7.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 17:07:25 2008
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 9 Mar 2008 17:07:25 GMT
Subject: rpms/xulrunner/devel xulrunner-mozconfig,1.14,1.15
Message-ID: <200803091707.m29H7PPQ026722@cvs-int.fedora.redhat.com>

Author: caillon

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

Modified Files:
	xulrunner-mozconfig 
Log Message:
disable crashreporter again since it doesn't build on gcc4.3.  don't really want to use it that badly, anyway


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-mozconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xulrunner-mozconfig	8 Mar 2008 04:08:38 -0000	1.14
+++ xulrunner-mozconfig	9 Mar 2008 17:06:50 -0000	1.15
@@ -22,6 +22,7 @@
 ac_add_options --enable-application=xulrunner
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-extensions=default
+ac_add_options --disable-crashreporter
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1



From fedora-extras-commits at redhat.com  Sun Mar  9 17:14:54 2008
From: fedora-extras-commits at redhat.com (Marek Mahut (mmahut))
Date: Sun, 9 Mar 2008 17:14:54 GMT
Subject: rpms/ggobi/F-8 ggobi.desktop, NONE, 1.1 ggobi.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <200803091714.m29HEs5V026916@cvs-int.fedora.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/ggobi/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26888

Modified Files:
	sources 
Added Files:
	ggobi.desktop ggobi.spec 
Log Message:
Initial ggobi import for Fedora 8



--- NEW FILE ggobi.desktop ---
[Desktop Entry]
Name=GGobi
GenericName=GGobi
Comment=Multivariate interactive graphics for exploratory data analysis
Categories=Astronomy;Science;Education;
Icon=ggobi
Exec=ggobi
Terminal=false
Type=Application


--- NEW FILE ggobi.spec ---
Name:		ggobi      
Version:	2.1.7
Release:	1%{?dist}
Summary:	Open source visualization for exploring high-dimensional data 
Group:		Applications/Engineering
License:	GPLv2
URL:		http://www.ggobi.org/ 
Source0:	http://www.ggobi.org/downloads/ggobi-%{version}.tar.bz2 
Source1:	ggobi.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libxml2-devel gtk2-devel, desktop-file-utils
Requires:	gtk2, libxml2 >= 2.6

%description
GGobi is an open source visualization program for
exploring high-dimensional data. It provides highly dynamic
and interactive graphics such as tours, as well as familiar
graphics such as the scatterplot, barchart and parallel coordinates plots.
Plots are interactive and linked with brushing and identification.

%package devel
Summary:	Open source visualization for exploring high-dimensional data
Group:		Development/Libraries	
Requires:	%{name} = %{version}-%{release}

%description devel
GGobi devel files

%prep
%setup -q

%build
%configure --with-all-plugins --datadir=%{_libdir} --disable-rpath
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
make ggobirc
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
rm $RPM_BUILD_ROOT%{_libdir}/applications/ggobi.desktop
mv $RPM_BUILD_ROOT%{_libdir}/pixmaps/ggobi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ggobi.png

desktop-file-install					\
  --vendor fedora 					\
  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ABOUT-NLS AUTHORS ChangeLog COPYING CPLicense.txt INSTALL README
%{_bindir}/ggobi
%{_libdir}/*.so.*
%{_libdir}/ggobi
%{_datadir}/pixmaps/ggobi.png
%{_datadir}/applications/*.desktop
%exclude %{_libdir}/*.la

%files devel
%{_includedir}/ggobi
%{_libdir}/*.so
%{_libdir}/pkgconfig/ggobi.pc

%changelog
* Mon Dec 31 2007 Marek Mahut  - 2.1.7-1
- Update to 2.1.7
- Light review of the spec file

* Sat Feb 17 2007 Zachary Whitley  - 2.1.4-1
- Initial RPM release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ggobi/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2008 17:59:45 -0000	1.1
+++ sources	9 Mar 2008 17:14:17 -0000	1.2
@@ -0,0 +1 @@
+96009a660aefa49c36e2d0d69a14d1b9  ggobi-2.1.7.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 17:39:51 2008
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 9 Mar 2008 17:39:51 GMT
Subject: rpms/firefox/devel firefox-mozconfig,1.14,1.15
Message-ID: <200803091739.m29HdpgF027423@cvs-int.fedora.redhat.com>

Author: caillon

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

Modified Files:
	firefox-mozconfig 
Log Message:
disable crashreporter again since it doesn't compile and we don't really have a symbol server anyway...


Index: firefox-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox-mozconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- firefox-mozconfig	8 Mar 2008 04:08:51 -0000	1.14
+++ firefox-mozconfig	9 Mar 2008 17:39:14 -0000	1.15
@@ -24,6 +24,7 @@
 ac_add_options --enable-canvas
 ac_add_options --enable-startup-notification
 ac_add_options --enable-libxul
+ac_add_options --disable-crashreporter
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1



From fedora-extras-commits at redhat.com  Sun Mar  9 17:43:34 2008
From: fedora-extras-commits at redhat.com (Simo Sorce (simo))
Date: Sun, 9 Mar 2008 17:43:34 GMT
Subject: rpms/samba/F-7 .cvsignore, 1.46, 1.47 samba.spec, 1.141,
	1.142 sources, 1.50, 1.51
Message-ID: <200803091743.m29HhYFb027544@cvs-int.fedora.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27520

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
* Sun Mar  9 2008 Simo Sorce  3.0.28a-0.fc7
- New upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	10 Dec 2007 16:01:06 -0000	1.46
+++ .cvsignore	9 Mar 2008 17:42:58 -0000	1.47
@@ -1 +1 @@
-samba-3.0.28.tar.gz
+samba-3.0.28a.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/samba.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- samba.spec	10 Dec 2007 16:01:06 -0000	1.141
+++ samba.spec	9 Mar 2008 17:42:58 -0000	1.142
@@ -1,7 +1,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.0.28
+Version: 3.0.28a
 Release: 0%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
@@ -133,7 +133,7 @@
 %prep
 # TAG: change for non-pre
 #%setup -q -n samba-3.0.25rc3
-%setup -q 
+%setup -q
 
 # copy Red Hat specific scripts
 mkdir packaging/Fedora
@@ -176,7 +176,7 @@
 %endif
 %ifarch ia64
 #libtoolize --copy --force     # get it to recognize IA-64
-#autoheader                                               
+#autoheader
 #autoconf
 EXTRA="-D_LARGEFILE64_SOURCE"
 %endif
@@ -642,6 +642,9 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Sun Mar  9 2008 Simo Sorce  3.0.28a-0.fc7
+- New upstream bugfix release
+
 * Mon Dec 10 2007 Simo Sorce  3.0.28-0.fc7
 - Fix CVE-2007-6015
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	10 Dec 2007 16:01:06 -0000	1.50
+++ sources	9 Mar 2008 17:42:59 -0000	1.51
@@ -1 +1 @@
-d5718a793e2bc1ad7faa30f0a042abe5  samba-3.0.28.tar.gz
+59754cb0c19da6e65c42d0a163c5885a  samba-3.0.28a.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  9 17:49:54 2008
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Sun, 9 Mar 2008 17:49:54 GMT
Subject: rpms/kernel/devel config-generic,1.79,1.80
Message-ID: <200803091749.m29Hnscg027686@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27652

Modified Files:
	config-generic 
Log Message:
cluster scheduler config options, remove a dupe


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- config-generic	7 Mar 2008 18:54:31 -0000	1.79
+++ config-generic	9 Mar 2008 17:49:19 -0000	1.80
@@ -3141,6 +3141,10 @@
 CONFIG_SCHED_DEBUG=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_CGROUP_SCHED=y
+# CONFIG_CGROUP_MEM_RES_CTLR is not set
 
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y
@@ -3459,10 +3463,4 @@
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MEMSTICK_TIFM_MS=m
 
-CONFIG_GROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_SCHED=y
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
-
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set



From fedora-extras-commits at redhat.com  Sun Mar  9 18:01:58 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 18:01:58 GMT
Subject: rpms/pilot-link/devel pilot-link.spec,1.74,1.75
Message-ID: <200803091801.m29I1wVL002428@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pilot-link/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29304

Modified Files:
	pilot-link.spec 
Log Message:
new perl


Index: pilot-link.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- pilot-link.spec	3 Mar 2008 10:12:41 -0000	1.74
+++ pilot-link.spec	9 Mar 2008 18:01:23 -0000	1.75
@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -193,6 +193,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sun Mar  9 2008 Tom "spot" Callaway  2:0.12.3-11
+- rebuild for perl 5.10.0
+
 * Mon Mar  3 2008 Ivana Varekova  - 2:0.12.3-10
 - Synchronize with F-8 branch:
 - add Z22 patch



From fedora-extras-commits at redhat.com  Sun Mar  9 18:06:33 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 18:06:33 GMT
Subject: rpms/libapreq2/devel libapreq2.spec,1.37,1.38
Message-ID: <200803091806.m29I6XO6002664@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/libapreq2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2615

Modified Files:
	libapreq2.spec 
Log Message:

Update for new perl



Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libapreq2.spec	8 Feb 2008 23:18:22 -0000	1.37
+++ libapreq2.spec	9 Mar 2008 18:05:53 -0000	1.38
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.rc2.14%{?dist}
+Release:        0.15.rc2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -172,6 +172,9 @@
 
 
 %changelog
+* Wed Feb 27 2008 Tom "spot" Callaway  - 2.09-0.15.rc2
+- Rebuild for perl 5.10 (again)
+
 * Sat Feb  9 2008 Tom "spot" Callaway  - 2.09-0.rc2.14
 - rebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Sun Mar  9 18:06:36 2008
From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb))
Date: Sun, 9 Mar 2008 18:06:36 GMT
Subject: rpms/xorg-x11-drv-openchrome/devel
	openchrome-0.2.901-old_memory_detection.patch, NONE,
	1.1 xorg-x11-drv-openchrome.spec, 1.15, 1.16
Message-ID: <200803091806.m29I6aR4002667@cvs-int.fedora.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2629

Modified Files:
	xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.901-old_memory_detection.patch 
Log Message:
- Temporarily revert to old memory detection method. We need something that
  works out of the box for F9 Beta.


openchrome-0.2.901-old_memory_detection.patch:

--- NEW FILE openchrome-0.2.901-old_memory_detection.patch ---
--- src/via_driver.c (revision 537)
+++ src/via_driver.c (revision 539)
@@ -1544,6 +1544,6 @@
 #else
             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ;
+#endif
             break;
-#endif
         case VIA_PM800:
         case VIA_VM800:
@@ -1554,6 +1554,6 @@
 #else
             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ;
+#endif
             break;
-#endif
         case VIA_K8M890:
         case VIA_P4M900:
@@ -1564,6 +1564,6 @@
 #else
             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ;
+#endif
             break;
-#endif
         default:
             if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) {


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-openchrome.spec	8 Mar 2008 20:36:47 -0000	1.15
+++ xorg-x11-drv-openchrome.spec	9 Mar 2008 18:06:00 -0000	1.16
@@ -9,7 +9,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.901
-Release:	12%{?dist}
+Release:	13%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -22,6 +22,7 @@
 Patch2:         openchrome-0.2.901-replace_xf86memcpy.patch
 Patch3:         openchrome-0.2.901-P4M900_fifo_settings.patch
 Patch4:         openchrome-0.2.901-VM800_xv_LCD.patch
+Patch5:         openchrome-0.2.901-old_memory_detection.patch
 ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pkgconfig
@@ -61,6 +62,7 @@
 %patch2 -p0 -b .xf86memcpy
 %patch3 -p0 -b .P4M900_fifo
 %patch4 -p0 -b .VM800_xv_LCD
+%patch5 -p0 -R -b .old_memory-detection
 
 %build
 autoreconf
@@ -109,6 +111,10 @@
 
 
 %changelog
+* Sun Mar 09 2008 Xavier Bachelot  - 0.2.901-13
+- Temporarily revert to old memory detection method. We need something that
+  works out of the box for F9 Beta.
+
 * Sat Mar 08 2008 Xavier Bachelot  - 0.2.901-12
 - Yet another revision of the libpciaccess patch.
 



From fedora-extras-commits at redhat.com  Sun Mar  9 18:08:13 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sun, 9 Mar 2008 18:08:13 GMT
Subject: rpms/openoffice.org/devel .cvsignore, 1.150, 1.151 sources, 1.273,
	1.274
Message-ID: <200803091808.m29I8D9g002798@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2769

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- .cvsignore	6 Mar 2008 09:50:42 -0000	1.150
+++ .cvsignore	9 Mar 2008 18:07:37 -0000	1.151
@@ -4,4 +4,4 @@
 Tigert-templates.tar.gz
 unowinreg.dll
 bengali.sdf
-OOH680_m9.tar.bz2
+OOH680_m10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- sources	6 Mar 2008 09:50:42 -0000	1.273
+++ sources	9 Mar 2008 18:07:37 -0000	1.274
@@ -4,4 +4,4 @@
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 0c0e868b34329d90a7c9a92f1704775c  bengali.sdf
-af3f35cf2f34b2ab2415605955769516  OOH680_m9.tar.bz2
+7a5f2700ed20c0016be3c58ce81960a0  OOH680_m10.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 18:09:06 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 9 Mar 2008 18:09:06 GMT
Subject: rpms/perl-Locale-Maketext-Lexicon/devel
	perl-Locale-Maketext-Lexicon.spec, 1.15, 1.16
Message-ID: <200803091809.m29I96r0002853@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2814

Modified Files:
	perl-Locale-Maketext-Lexicon.spec 
Log Message:
new perl


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Locale-Maketext-Lexicon.spec	14 Feb 2008 07:21:21 -0000	1.15
+++ perl-Locale-Maketext-Lexicon.spec	9 Mar 2008 18:08:31 -0000	1.16
@@ -1,6 +1,6 @@
 Name: 		perl-Locale-Maketext-Lexicon
 Version: 	0.66
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary: 	Extract translatable strings from source
 %if "%{version}" > "0.60"
 License:	MIT
@@ -69,6 +69,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Feb 27 2008 Tom "spot" Callaway  - 0.66-2
+- Rebuild for perl 5.10 (again)
+
 * Thu Feb 14 2008 Ralf Cors??pius  - 0.66-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sun Mar  9 18:09:38 2008
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Sun, 9 Mar 2008 18:09:38 GMT
Subject: rpms/synaptics/devel 10-synaptics.fdi, NONE,
	1.1 synaptics-0.14.6-tap-to-click.patch, NONE,
	1.1 synaptics.spec, 1.30, 1.31
Message-ID: <200803091809.m29I9cSw002936@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/synaptics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2833

Modified Files:
	synaptics.spec 
Added Files:
	10-synaptics.fdi synaptics-0.14.6-tap-to-click.patch 
Log Message:
* Sun Mar 09 2008 Adam Jackson  0.14.6-4
- 10-synaptics.fdi: Get hal to report the X driver as synaptics for
  touchpads we support.
- synaptics-0.14.6-tap-to-click.patch: Disable tap to click by default in
  the name of accessibility.



--- NEW FILE 10-synaptics.fdi ---


  
    
      
	synaptics
      
      
	synaptics
      
    
  


synaptics-0.14.6-tap-to-click.patch:

--- NEW FILE synaptics-0.14.6-tap-to-click.patch ---
diff -up synaptics-0.14.6/synaptics.c.jx synaptics-0.14.6/synaptics.c
--- synaptics-0.14.6/synaptics.c.jx	2008-03-09 13:55:18.000000000 -0400
+++ synaptics-0.14.6/synaptics.c	2008-03-09 14:03:31.000000000 -0400
@@ -395,13 +395,13 @@ SynapticsPreInit(InputDriverPtr drv, IDe
     pars->touchpad_off = xf86SetIntOption(opts, "TouchpadOff", 0);
     pars->guestmouse_off = xf86SetBoolOption(opts, "GuestMouseOff", FALSE);
     pars->locked_drags = xf86SetBoolOption(opts, "LockedDrags", FALSE);
-    pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 2);
-    pars->tap_action[RB_TAP] = xf86SetIntOption(opts, "RBCornerButton", 3);
+    pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 0);
+    pars->tap_action[RB_TAP] = xf86SetIntOption(opts, "RBCornerButton", 0);
     pars->tap_action[LT_TAP] = xf86SetIntOption(opts, "LTCornerButton", 0);
     pars->tap_action[LB_TAP] = xf86SetIntOption(opts, "LBCornerButton", 0);
-    pars->tap_action[F1_TAP] = xf86SetIntOption(opts, "TapButton1",     1);
-    pars->tap_action[F2_TAP] = xf86SetIntOption(opts, "TapButton2",     2);
-    pars->tap_action[F3_TAP] = xf86SetIntOption(opts, "TapButton3",     3);
+    pars->tap_action[F1_TAP] = xf86SetIntOption(opts, "TapButton1",     0);
+    pars->tap_action[F2_TAP] = xf86SetIntOption(opts, "TapButton2",     0);
+    pars->tap_action[F3_TAP] = xf86SetIntOption(opts, "TapButton3",     0);
     pars->circular_scrolling = xf86SetBoolOption(opts, "CircularScrolling", FALSE);
     pars->circular_trigger   = xf86SetIntOption(opts, "CircScrollTrigger", 0);
     pars->circular_pad       = xf86SetBoolOption(opts, "CircularPad", FALSE);


Index: synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- synaptics.spec	4 Mar 2008 22:38:08 -0000	1.30
+++ synaptics.spec	9 Mar 2008 18:08:40 -0000	1.31
@@ -2,20 +2,23 @@
 
 Name:           synaptics
 Version:        0.14.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
 License:        GPL
 URL:            http://w1.894.telia.com/~u89404340/touchpad/
 Source0:        http://w1.894.telia.com/~u89404340/touchpad/files/%{name}-%{version}.tar.bz2
+Source1:	10-synaptics.fdi
 Patch0: synaptics-0.14.6-delibcwrap.patch
 Patch1: synaptics-0.14.6-newx.patch
+Patch2: synaptics-0.14.6-tap-to-click.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-x11-server-sdk >= 1.0.99.901
 BuildRequires:  libX11-devel, libXi-devel, libXext-devel
 Requires:       xorg-x11-server-Xorg >= 1.0.99.901
+Requires:	hal
 # This is what it should be, but the buildsystem is a disaster
 # ExcludeArch:	s390 s390x
 ExclusiveArch: %{ix86} x86_64 ppc ppc64
@@ -47,6 +50,7 @@
 %if "%{?fedora}" >= "9"
 %patch1 -p1 -b .newx
 %endif
+%patch2 -p1 -b .tap
 # remove included XFree86 headers
 rm -rf Xincludes
 
@@ -61,18 +65,28 @@
 	ARCH='%{_arch}' \
 	install
 
+install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+install -m 0644 ../10-synaptics.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc COMPATIBILITY FILES INSTALL INSTALL.DE INSTALL.FR LICENSE README README.alps TODO
+%{_datadir}/hal/fdi/policy/20thirdparty/10-synaptics.fdi
 %{moduledir}/input/*
 %{_bindir}/synclient
 %{_bindir}/syndaemon
 %{_mandir}/man?/*
 
 %changelog
+* Sun Mar 09 2008 Adam Jackson  0.14.6-4
+- 10-synaptics.fdi: Get hal to report the X driver as synaptics for
+  touchpads we support.
+- synaptics-0.14.6-tap-to-click.patch: Disable tap to click by default in
+  the name of accessibility.
+
 * Wed Mar 05 2008 Dave Airlie  0.14.6-3
 - rebuild for ppc64
 



From fedora-extras-commits at redhat.com  Sun Mar  9 18:09:51 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sun, 9 Mar 2008 18:09:51 GMT
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1440,1.1441
Message-ID: <200803091809.m29I9pP2002979@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2846

Modified Files:
	openoffice.org.spec 
Log Message:
next release candidate


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440
retrieving revision 1.1441
diff -u -r1.1440 -r1.1441
--- openoffice.org.spec	6 Mar 2008 09:52:37 -0000	1.1440
+++ openoffice.org.spec	9 Mar 2008 18:09:03 -0000	1.1441
@@ -1,5 +1,5 @@
 %define oootag OOH680
-%define ooomilestone 9
+%define ooomilestone 10
 %define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -1565,17 +1565,13 @@
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
 
-
 pushd $RPM_BUILD_ROOT/%{instdir}/share/xdg/
 chmod u+w *.desktop
-# rhbz#156677 use GenericNames
-for file in base.desktop calc.desktop impress.desktop writer.desktop; do
-    sed -i -e '/^Name/d' $file
-    sed -i -e 's/GenericName/Name/g' $file
-done
-# rhbz#156067 don't version the icons
 for file in *.desktop; do
+    # rhbz#156067 don't version the icons
     sed -i -e s/$ICONPRODUCTVERSION//g $file
+    # rhbz#156677 remove the version from Name=
+    sed -i -e s/$LONGICONPRODUCTVERSION//g $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "TryExec=oobase" >> base.desktop
@@ -1591,7 +1587,6 @@
 echo "TryExec=oodraw" >> draw.desktop
 # rh#156677# / rh#186515#
 echo "NoDisplay=true" >> math.desktop
-echo "NoDisplay=true" >> draw.desktop
 chmod u-w *.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
@@ -2878,6 +2873,10 @@
 
 
 %changelog
+* Sun Mar 09 2008 Caolan McNamara  - 1:2.4.0-10.1
+- next release candidate
+- rhbz#293791 Restore draw back to the menus and revert to upstream app names
+
 * Thu Mar 06 2008 Caolan McNamara  - 1:2.4.0-9.1
 - next release candidate
 



From fedora-extras-commits at redhat.com  Sun Mar  9 18:13:11 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sun, 9 Mar 2008 18:13:11 GMT
Subject: rpms/openoffice.org/devel .cvsignore, 1.150.2.1,
	1.150.2.2 openoffice.org.spec, 1.1440.2.5, 1.1440.2.6
Message-ID: <200803091813.m29IDB5F003082@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3054

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	.cvsignore openoffice.org.spec 
Log Message:
merge


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.150.2.1
retrieving revision 1.150.2.2
diff -u -r1.150.2.1 -r1.150.2.2
--- .cvsignore	7 Mar 2008 14:32:37 -0000	1.150.2.1
+++ .cvsignore	9 Mar 2008 18:12:22 -0000	1.150.2.2
@@ -4,5 +4,4 @@
 Tigert-templates.tar.gz
 unowinreg.dll
 bengali.sdf
-OOH680_m9.tar.bz2
 DEV300_m1.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.5
retrieving revision 1.1440.2.6
diff -u -r1.1440.2.5 -r1.1440.2.6
--- openoffice.org.spec	9 Mar 2008 14:43:40 -0000	1.1440.2.5
+++ openoffice.org.spec	9 Mar 2008 18:12:22 -0000	1.1440.2.6
@@ -1557,17 +1557,13 @@
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
 
-
 pushd $RPM_BUILD_ROOT/%{instdir}/share/xdg/
 chmod u+w *.desktop
-# rhbz#156677 use GenericNames
-for file in base.desktop calc.desktop impress.desktop writer.desktop; do
-    sed -i -e '/^Name/d' $file
-    sed -i -e 's/GenericName/Name/g' $file
-done
-# rhbz#156067 don't version the icons
 for file in *.desktop; do
+    # rhbz#156067 don't version the icons
     sed -i -e s/$ICONPRODUCTVERSION//g $file
+    # rhbz#156677 remove the version from Name=
+    sed -i -e s/$LONGICONPRODUCTVERSION//g $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "TryExec=oobase" >> base.desktop
@@ -1583,7 +1579,6 @@
 echo "TryExec=oodraw" >> draw.desktop
 # rh#156677# / rh#186515#
 echo "NoDisplay=true" >> math.desktop
-echo "NoDisplay=true" >> draw.desktop
 chmod u-w *.desktop
 # relocate the .desktop and icon files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
@@ -2868,8 +2863,7 @@
 %{python_py_sitearch}/uno.py*
 %{python_py_sitearch}/unohelper.py*
 
-
-%6changelog
+%changelog
 * Sun Mar 09 2008 Caolan McNamara  - 1:3.0.0-0.1.1
 - extend selinux bodge to ia64 
 - drop integrated workspace.notes2.patch
@@ -2881,6 +2875,10 @@
 - add workspace.cmcfixes43.patch
 - add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 
+* Sun Mar 09 2008 Caolan McNamara  - 1:2.4.0-10.1
+- next release candidate
+- rhbz#293791 Restore draw back to the menus and revert to upstream app names
+
 * Thu Mar 06 2008 Caolan McNamara  - 1:2.4.0-9.1
 - next release candidate
 



From fedora-extras-commits at redhat.com  Sun Mar  9 18:14:04 2008
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Sun, 9 Mar 2008 18:14:04 GMT
Subject: rpms/synaptics/devel synaptics.spec,1.31,1.32
Message-ID: <200803091814.m29IE4Gp003109@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/synaptics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3085

Modified Files:
	synaptics.spec 
Log Message:
* Sun Mar 09 2008 Adam Jackson  0.14.6-4
- 10-synaptics.fdi: Get hal to report the X driver as synaptics for
  touchpads we support.
- synaptics-0.14.6-tap-to-click.patch: Disable tap to click by default in
  the name of accessibility.



Index: synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- synaptics.spec	9 Mar 2008 18:08:40 -0000	1.31
+++ synaptics.spec	9 Mar 2008 18:13:29 -0000	1.32
@@ -66,7 +66,7 @@
 	install
 
 install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
-install -m 0644 ../10-synaptics.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-extras-commits at redhat.com  Sun Mar  9 18:24:18 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sun, 9 Mar 2008 18:24:18 GMT
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.6,
	1.1440.2.7
Message-ID: <200803091824.m29IOI6g003271@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3251

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Log Message:
SRC680 -> DEV300


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.6
retrieving revision 1.1440.2.7
diff -u -r1.1440.2.6 -r1.1440.2.7
--- openoffice.org.spec	9 Mar 2008 18:12:22 -0000	1.1440.2.6
+++ openoffice.org.spec	9 Mar 2008 18:23:44 -0000	1.1440.2.7
@@ -143,6 +143,7 @@
 Patch69: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 
 %define instdir %{_libdir}/openoffice.org
+%define OFFICEUPD 300
 
 %description
 OpenOffice.org is an Open Source, community-developed, multi-platform
@@ -1232,13 +1233,13 @@
 
 #add enough to the sdk to build the kde vcl plug out of tree
 cp -r solenv/ $RPM_BUILD_ROOT/%{instdir}/sdk
-cp solver/680/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{instdir}/sdk/linux/bin
-cp -r solver/680/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/vos $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{instdir}/sdk/linux/bin
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{instdir}/sdk/include
 
 #configure sdk
 pushd $RPM_BUILD_ROOT/%{instdir}/sdk
@@ -1267,7 +1268,7 @@
     echo export DMAKEROOT=%{instdir}/sdk/solenv/inc/startup >> setdevelenv_unix.sh
     echo export OS="LINUX" >> setdevelenv_unix.sh
     echo export SOLARENV=%{instdir}/sdk/solenv >> setdevelenv_unix.sh
-    echo export SOLARVER="\`pwd\`/solver/680" >> setdevelenv_unix.sh
+    echo export SOLARVER="\`pwd\`/solver/%{OFFICEUPD}" >> setdevelenv_unix.sh
     echo export SOLARVERSION="\$SOLARVER" >> setdevelenv_unix.sh
     echo export INPATH="$INPATH" >> setdevelenv_unix.sh
     echo export OUTPATH="$OUTPATH" >> setdevelenv_unix.sh
@@ -1314,7 +1315,7 @@
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/uno_packages/cache/* || :
 
 #add the debugging libsalalloc_malloc.so.3 library
-cp -f solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
+cp -f solver/%{OFFICEUPD}/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
 
 #We don't need to carry around all the letter templates for all the languages 
 #in each langpack! In addition, all the bitmaps are the same!



From fedora-extras-commits at redhat.com  Sun Mar  9 18:42:43 2008
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Sun, 9 Mar 2008 18:42:43 GMT
Subject: rpms/linuxwacom/devel 10-linuxwacom.fdi, NONE, 1.1 linuxwacom.spec, 
	1.53, 1.54
Message-ID: <200803091842.m29IghLp003474@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3452

Modified Files:
	linuxwacom.spec 
Added Files:
	10-linuxwacom.fdi 
Log Message:
* Sun Mar 09 2008 Adam Jackson  0.7.9.8-3
- 10-linuxwacom.fdi: Blind attempt at supporting hotplug.



--- NEW FILE 10-linuxwacom.fdi ---



  
    
      
	linuxwacom
      
    
  



Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- linuxwacom.spec	5 Mar 2008 19:42:36 -0000	1.53
+++ linuxwacom.spec	9 Mar 2008 18:42:09 -0000	1.54
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.7.9.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -11,6 +11,7 @@
 URL:		http://linuxwacom.sourceforge.net
 Source0:	http://prdownloads.sourceforge.net/linuxwacom/%{tarname}.tar.bz2
 Source1:	60-wacom.rules
+Source2:	10-linuxwacom.fdi
 Patch1:		linuxwacom-0.7.6.3-delibcwrap.patch
 Patch2:		linuxwacom-disable_stack_protector.patch
 Patch3:		linuxwacom-0.7.8.3-sdk-me-harder.patch
@@ -76,6 +77,9 @@
     mv $RPM_BUILD_ROOT/wacom_drv.so $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/input
 fi
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -90,6 +94,7 @@
 %{_bindir}/wacdump
 %{_bindir}/xidump
 %{_bindir}/xsetwacom
+%{_datadir}/hal/fdi/policy/20thirdparty/10-linuxwacom.fdi
 %{_libdir}/libwacomcfg*so.*
 %{_mandir}/man4/wacom.4*
 %{_sysconfdir}/udev/rules.d/60-wacom.rules
@@ -102,6 +107,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Sun Mar 09 2008 Adam Jackson  0.7.9.8-3
+- 10-linuxwacom.fdi: Blind attempt at supporting hotplug.
+
 * Wed Mar 05 2008 Aristeu Rozanski  - 0.7.9.8-2
 - Removed configuration tools
 



From fedora-extras-commits at redhat.com  Sun Mar  9 18:45:58 2008
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 9 Mar 2008 18:45:58 GMT
Subject: rpms/ClanLib/F-8 ClanLib-0.8.0-alsa.patch, NONE,
	1.1 ClanLib-0.8.0-gcc43.patch, NONE,
	1.1 ClanLib-0.8.0-memset.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 ClanLib.spec, 1.11, 1.12 sources, 1.3,
	1.4 ClanLib-0.8.0-gcc41.patch, 1.1,
	NONE ClanLib-0.8.0-grave_key.patch, 1.1, NONE
Message-ID: <200803091845.m29IjwdL003578@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3540

Modified Files:
	.cvsignore ClanLib.spec sources 
Added Files:
	ClanLib-0.8.0-alsa.patch ClanLib-0.8.0-gcc43.patch 
	ClanLib-0.8.0-memset.patch 
Removed Files:
	ClanLib-0.8.0-gcc41.patch ClanLib-0.8.0-grave_key.patch 
Log Message:
* Sat Mar  8 2008 Hans de Goede  0.8.0-11
- Add a patch from Dave Jones fixing various wrong invocations of memset


ClanLib-0.8.0-alsa.patch:

--- NEW FILE ClanLib-0.8.0-alsa.patch ---
diff -up ClanLib-0.8.0/Sources/Sound/Makefile.am.alsa ClanLib-0.8.0/Sources/Sound/Makefile.am
--- ClanLib-0.8.0/Sources/Sound/Makefile.am.alsa	2008-03-02 10:43:33.000000000 +0100
+++ ClanLib-0.8.0/Sources/Sound/Makefile.am	2008-03-02 10:54:51.000000000 +0100
@@ -38,12 +38,15 @@ else
 libclanSound_la_SOURCES += \
 Unix/soundoutput_oss.cpp \
 Unix/soundoutput_oss.h \
+Unix/soundoutput_alsa.cpp \
+Unix/soundoutput_alsa.h \
 SoundProviders/Unix/soundprovider_recorder_oss.cpp \
 SoundProviders/Unix/soundprovider_recorder_oss.h
 endif
 
 libclanSound_la_LDFLAGS = \
   -release $(LT_RELEASE) \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+  -lasound
 
 # EOF #
diff -up ClanLib-0.8.0/Sources/Sound/soundoutput.cpp.alsa ClanLib-0.8.0/Sources/Sound/soundoutput.cpp
--- ClanLib-0.8.0/Sources/Sound/soundoutput.cpp.alsa	2005-10-25 12:39:25.000000000 +0200
+++ ClanLib-0.8.0/Sources/Sound/soundoutput.cpp	2008-03-02 10:48:33.000000000 +0100
@@ -40,6 +40,7 @@
 #ifdef __APPLE__
 #include "MacOSX/soundoutput_macosx.h"
 #else
+#include "Unix/soundoutput_alsa.h"
 #include "Unix/soundoutput_oss.h"
 #endif
 #endif
@@ -66,6 +67,15 @@ CL_SoundOutput::CL_SoundOutput(const CL_
 #ifdef __APPLE__
 	impl = new CL_SoundOutput_MacOSX(desc.get_mixing_frequency());
 #else
+#ifdef __linux__
+	CL_SoundOutput_alsa *alsa_impl;
+	alsa_impl = new CL_SoundOutput_alsa(desc.get_mixing_frequency());
+	if (alsa_impl->handle)
+		impl = alsa_impl;
+	else
+		delete alsa_impl;
+	if (!impl)
+#endif
 	impl = new CL_SoundOutput_OSS(desc.get_mixing_frequency());
 #endif
 #endif
diff -up ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.cpp.alsa ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.cpp
--- ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.cpp.alsa	2008-03-02 10:49:14.000000000 +0100
+++ ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.cpp	2008-03-02 11:03:43.000000000 +0100
@@ -0,0 +1,161 @@
+/*
+**  ClanLib SDK
+**  Copyright (c) 1997-2008 The ClanLib Team
+**
+**  This software is provided 'as-is', without any express or implied
+**  warranty.  In no event will the authors be held liable for any damages
+**  arising from the use of this software.
+**
+**  Permission is granted to anyone to use this software for any purpose,
+**  including commercial applications, and to alter it and redistribute it
+**  freely, subject to the following restrictions:
+**
+**  1. The origin of this software must not be misrepresented; you must not
+**     claim that you wrote the original software. If you use this software
+**     in a product, an acknowledgment in the product documentation would be
+**     appreciated but is not required.
+**  2. Altered source versions must be plainly marked as such, and must not be
+**     misrepresented as being the original software.
+**  3. This notice may not be removed or altered from any source distribution.
+**
+**  Note: Some of the libraries ClanLib may link to may have additional
+**  requirements or restrictions.
+**
+**  File Author(s):
+**
+**    Magnus Norddahl
+**    Hans de Goede
+**    (if your name is missing here, please add it)
+*/
+
+#include "Sound/precomp.h"
+#include "soundoutput_alsa.h"
+#include "API/Core/System/error.h"
+#include "API/Core/System/cl_assert.h"
+#include "API/Core/System/system.h"
+#include "API/Core/System/log.h"
+
+#ifdef __linux__
+
+/////////////////////////////////////////////////////////////////////////////
+// CL_SoundOutput_alsa construction:
+
+CL_SoundOutput_alsa::CL_SoundOutput_alsa(int mixing_frequency) :
+	CL_SoundOutput_Generic(mixing_frequency), frames_in_buffer(4096),
+	frames_in_period(1024)
+{
+	int rc;
+	snd_pcm_hw_params_t *hwparams;
+	
+	rc = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 0);
+	if (rc < 0)
+	{
+		CL_Log::log("warn", "ClanSound: Couldn't open sound device, disabling sound");
+		handle = NULL;
+		return;
+	}
+
+	snd_pcm_hw_params_alloca(&hwparams);
+	snd_pcm_hw_params_any(handle, hwparams);
+	snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
+	snd_pcm_hw_params_set_format(handle, hwparams, SND_PCM_FORMAT_S16);
+	snd_pcm_hw_params_set_channels(handle, hwparams, 2);
+	snd_pcm_hw_params_set_rate_near(handle, hwparams,
+				(unsigned int *)&this->mixing_frequency, 0);
+	snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &frames_in_buffer);
+	frames_in_period = frames_in_buffer / 4;
+	snd_pcm_hw_params_set_period_size_near(handle, hwparams, &frames_in_period, 0);
+	
+	rc = snd_pcm_hw_params(handle, hwparams);
+	if (rc < 0)
+	{
+		CL_Log::log("warn", "ClanSound: Couldn't initialize sound device, disabling sound");
+		snd_pcm_close(handle);
+		handle = NULL;
+		return;
+	}
+	
+	snd_pcm_hw_params_get_period_size(hwparams, &frames_in_period, 0);
+
+	start_mixer_thread();
+}
+
+CL_SoundOutput_alsa::~CL_SoundOutput_alsa()
+{
+	stop_mixer_thread();
+	if (handle) {
+		snd_pcm_close(handle);
+		handle = NULL;
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CL_SoundOutput_alsa operations:
+
+void CL_SoundOutput_alsa::silence()
+{
+	/* Note: not supported by all hardware! */
+	if (handle)
+		snd_pcm_pause(handle, 1);
+}
+
+bool CL_SoundOutput_alsa::is_full()
+{
+	int rc;
+	snd_pcm_sframes_t delay;
+	
+	if (handle == NULL) return false;
+	
+	rc = snd_pcm_delay(handle, &delay);
+	if (rc < 0) {
+		CL_Log::log("debug", "ClanSound: snd_pcm_delay() failed!?");
+		return false;
+	}
+
+	/* See if there is more then one period free in the buffer */
+	return delay > (snd_pcm_sframes_t)(frames_in_buffer - frames_in_period);
+}
+
+int CL_SoundOutput_alsa::get_fragment_size()
+{
+	return frames_in_period;
+}
+
+void CL_SoundOutput_alsa::write_fragment(short *data)
+{
+	snd_pcm_sframes_t rc;
+
+	if (handle == NULL) return;
+
+	switch(snd_pcm_state(handle)) {
+		case SND_PCM_STATE_XRUN:
+		case SND_PCM_STATE_SUSPENDED:
+			snd_pcm_prepare(handle);
+			break;
+		case SND_PCM_STATE_PAUSED:
+			snd_pcm_pause(handle, 0);
+			break;
+		default:
+			break;
+	}
+
+	rc = snd_pcm_writei(handle, data, frames_in_period);
+	if (rc < 0)
+		CL_Log::log("debug", "ClanSound: snd_pcm_writei() failed!");
+}
+
+void CL_SoundOutput_alsa::wait()
+{
+	if(handle == NULL)
+	{
+		CL_System::sleep(100);
+		return;
+	}
+	/* wait upto 1 second */
+	snd_pcm_wait(handle, 1000);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CL_SoundOutput_alsa implementation:
+
+#endif
diff -up ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.h.alsa ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.h
--- ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.h.alsa	2008-03-02 10:49:20.000000000 +0100
+++ ClanLib-0.8.0/Sources/Sound/Unix/soundoutput_alsa.h	2008-03-02 10:43:09.000000000 +0100
@@ -0,0 +1,76 @@
+/*
+**  ClanLib SDK
+**  Copyright (c) 1997-2008 The ClanLib Team
+**
+**  This software is provided 'as-is', without any express or implied
+**  warranty.  In no event will the authors be held liable for any damages
+**  arising from the use of this software.
+**
+**  Permission is granted to anyone to use this software for any purpose,
+**  including commercial applications, and to alter it and redistribute it
+**  freely, subject to the following restrictions:
+**
+**  1. The origin of this software must not be misrepresented; you must not
+**     claim that you wrote the original software. If you use this software
+**     in a product, an acknowledgment in the product documentation would be
+**     appreciated but is not required.
+**  2. Altered source versions must be plainly marked as such, and must not be
+**     misrepresented as being the original software.
+**  3. This notice may not be removed or altered from any source distribution.
+**
+**  Note: Some of the libraries ClanLib may link to may have additional
+**  requirements or restrictions.
+**
+**  File Author(s):
+**
+**    Magnus Norddahl
+**    Hans de Goede
+**    (if your name is missing here, please add it)
+*/
+
+#ifndef header_soundoutput_alsa
+#define header_soundoutput_alsa
+
+#ifdef __linux__
+
+#include "../soundoutput_generic.h"
+#include  
+
+class CL_SoundOutput_alsa : public CL_SoundOutput_Generic
+{
+//! Construction:
+public:
+	CL_SoundOutput_alsa(int mixing_frequency);
+	
+	~CL_SoundOutput_alsa();
+
+//! Attributes:
+public:
+	snd_pcm_t *handle;
+	snd_pcm_uframes_t frames_in_period;
+	snd_pcm_uframes_t frames_in_buffer;
+
+//! Operations:
+public:
+	//: Called when we have no samples to play - and wants to tell the soundcard
+	//: about this possible event.
+	virtual void silence();
+
+	//: Returns true if all fragments are filled with data.
+	virtual bool is_full();
+
+	//: Returns the buffer size used by device (returned as num [stereo] samples).
+	virtual int get_fragment_size();
+
+	//: Writes a fragment to the soundcard.
+	virtual void write_fragment(short *data);
+
+	//: Waits until output source isn't full anymore.
+	virtual void wait();
+
+//! Implementation:
+private:
+};
+
+#endif
+#endif
diff -up ClanLib-0.8.0/Sources/Sound/Makefile.in.alsa ClanLib-0.8.0/Sources/Sound/Makefile.in
--- ClanLib-0.8.0/Sources/Sound/Makefile.in.alsa	2008-03-02 10:43:38.000000000 +0100
+++ ClanLib-0.8.0/Sources/Sound/Makefile.in	2008-03-02 10:54:53.000000000 +0100
@@ -46,6 +46,8 @@ target_triplet = @target@
 @WIN32_FALSE at am__append_2 = \
 @WIN32_FALSE at Unix/soundoutput_oss.cpp \
 @WIN32_FALSE at Unix/soundoutput_oss.h \
+ at WIN32_FALSE@Unix/soundoutput_alsa.cpp \
+ at WIN32_FALSE@Unix/soundoutput_alsa.h \
 @WIN32_FALSE at SoundProviders/Unix/soundprovider_recorder_oss.cpp \
 @WIN32_FALSE at SoundProviders/Unix/soundprovider_recorder_oss.h
 
@@ -90,12 +92,13 @@ am__libclanSound_la_SOURCES_DIST =  \
 	SoundProviders/Win32/soundprovider_recorder_directsound.cpp \
 	SoundProviders/Win32/soundprovider_recorder_directsound.h \
 	Unix/soundoutput_oss.cpp Unix/soundoutput_oss.h \
+	Unix/soundoutput_alsa.cpp Unix/soundoutput_alsa.h \
 	SoundProviders/Unix/soundprovider_recorder_oss.cpp \
 	SoundProviders/Unix/soundprovider_recorder_oss.h
 am__dirstamp = $(am__leading_dot)dirstamp
 @WIN32_TRUE at am__objects_1 = Win32/soundoutput_directsound.lo \
 @WIN32_TRUE@	SoundProviders/Win32/soundprovider_recorder_directsound.lo
- at WIN32_FALSE@am__objects_2 = Unix/soundoutput_oss.lo \
+ at WIN32_FALSE@am__objects_2 = Unix/soundoutput_oss.lo Unix/soundoutput_alsa.lo \
 @WIN32_FALSE@	SoundProviders/Unix/soundprovider_recorder_oss.lo
 am_libclanSound_la_OBJECTS = SoundFilters/echofilter_generic.lo \
 	SoundFilters/fadefilter_generic.lo \
@@ -324,7 +327,8 @@ libclanSound_la_SOURCES = SoundFilters/e
 	soundprovider_session.cpp $(am__append_1) $(am__append_2)
 libclanSound_la_LDFLAGS = \
   -release $(LT_RELEASE) \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+  -lasound
 
 all: all-am
 
@@ -448,6 +452,8 @@ Unix/$(DEPDIR)/$(am__dirstamp):
 	@: > Unix/$(DEPDIR)/$(am__dirstamp)
 Unix/soundoutput_oss.lo: Unix/$(am__dirstamp) \
 	Unix/$(DEPDIR)/$(am__dirstamp)
+Unix/soundoutput_alsa.lo: Unix/$(am__dirstamp) \
+	Unix/$(DEPDIR)/$(am__dirstamp)
 SoundProviders/Unix/$(am__dirstamp):
 	@$(mkdir_p) SoundProviders/Unix
 	@: > SoundProviders/Unix/$(am__dirstamp)
@@ -488,6 +494,8 @@ mostlyclean-compile:
 	-rm -f SoundProviders/soundprovider_wave_session.lo
 	-rm -f Unix/soundoutput_oss.$(OBJEXT)
 	-rm -f Unix/soundoutput_oss.lo
+	-rm -f Unix/soundoutput_alsa.$(OBJEXT)
+	-rm -f Unix/soundoutput_alsa.lo
 	-rm -f Win32/soundoutput_directsound.$(OBJEXT)
 	-rm -f Win32/soundoutput_directsound.lo
 
@@ -522,6 +530,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at SoundProviders/Unix/$(DEPDIR)/soundprovider_recorder_oss.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at SoundProviders/Win32/$(DEPDIR)/soundprovider_recorder_directsound.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at Unix/$(DEPDIR)/soundoutput_oss.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at Unix/$(DEPDIR)/soundoutput_alsa.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at Win32/$(DEPDIR)/soundoutput_directsound.Plo at am__quote@
 
 .cpp.o:

ClanLib-0.8.0-gcc43.patch:

--- NEW FILE ClanLib-0.8.0-gcc43.patch ---
diff -up ClanLib-0.8.0/Sources/Sound/precomp.h~ ClanLib-0.8.0/Sources/Sound/precomp.h
--- ClanLib-0.8.0/Sources/Sound/precomp.h~	2008-01-04 22:14:27.000000000 +0100
+++ ClanLib-0.8.0/Sources/Sound/precomp.h	2008-01-04 22:14:27.000000000 +0100
@@ -47,6 +47,8 @@
 #include 
 #endif
 
+#include 
+
 #include "API/signals.h"
 #include "API/Core/System/error.h"
 
diff -up ClanLib-0.8.0/Sources/Core/precomp.h~ ClanLib-0.8.0/Sources/Core/precomp.h
--- ClanLib-0.8.0/Sources/Core/precomp.h~	2008-01-04 22:15:04.000000000 +0100
+++ ClanLib-0.8.0/Sources/Core/precomp.h	2008-01-04 22:15:04.000000000 +0100
@@ -47,6 +47,8 @@
 #include "API/Core/System/error.h"
 #include "API/Core/System/clanstring.h"
 
+#include 
+
 #ifdef __BORLANDC__
 #define BAD_MATH
 #endif
diff -up ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp~ ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp
--- ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp~	2008-01-04 22:05:44.000000000 +0100
+++ ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp	2008-01-04 22:05:44.000000000 +0100
@@ -33,6 +33,7 @@
 #endif
 #include 
 #include 
+#include 
 #include "directory_scanner_unix.h"
 
 CL_DirectoryScanner_Unix::CL_DirectoryScanner_Unix ()
diff -up ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp~ ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp
--- ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp~	2008-01-04 22:41:21.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp	2008-01-04 22:41:21.000000000 +0100
@@ -29,6 +29,7 @@
 
 #ifdef USE_GETADDR
 
+#include 
 #include "ip_address_getaddr.h"
 #include "API/Core/System/error.h"
 #include "API/Core/System/mutex.h"
diff -up ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp~ ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp
--- ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp~	2008-01-04 22:42:11.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp	2008-01-04 22:42:11.000000000 +0100
@@ -38,6 +38,7 @@
 
 #include "socket_generic.h"
 #include 
+#include 
 #include "API/Core/System/clanstring.h"
 
 /////////////////////////////////////////////////////////////////////////////
diff -up ClanLib-0.8.0/Sources/Network/Socket/socket.cpp~ ClanLib-0.8.0/Sources/Network/Socket/socket.cpp
--- ClanLib-0.8.0/Sources/Network/Socket/socket.cpp~	2008-01-04 22:41:45.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/Socket/socket.cpp	2008-01-04 22:41:45.000000000 +0100
@@ -42,6 +42,7 @@
 #define INVALID_SOCKET -1
 #endif
 
+#include 
 #include "socket_generic.h"
 #include "API/Core/System/error.h"
 #include "API/Core/System/log.h"
diff -up ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h~ ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h
--- ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h~	2008-01-04 22:43:16.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h	2008-01-04 22:43:16.000000000 +0100
@@ -35,6 +35,7 @@
 #endif
 
 #include 
+#include 
 #include "API/Core/IOData/inputsource.h"
 #include "API/Core/IOData/outputsource.h"
 
diff -up ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp
--- ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp~	2008-01-04 22:39:20.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp	2008-01-04 22:39:20.000000000 +0100
@@ -27,6 +27,7 @@
 **    (if your name is missing here, please add it)
 */
 
+#include 
 #include "API/Network/NetSession/netstream.h"
 #include "API/Network/NetSession/netsession.h"
 #include "netstream_generic.h"
diff -up ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp
--- ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp~	2008-01-04 22:40:28.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp	2008-01-04 22:40:28.000000000 +0100
@@ -27,6 +27,7 @@
 **    (if your name is missing here, please add it)
 */
 
+#include 
 #include "netcomputer_generic.h"
 #include "netstream_generic.h"
 #include "netsession_generic.h"
diff -up ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp
--- ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp~	2008-01-04 22:40:01.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp	2008-01-04 22:40:01.000000000 +0100
@@ -27,6 +27,7 @@
 **    (if your name is missing here, please add it)
 */
 
+#include 
 #include "API/Network/NetSession/outputsource_netpacket.h"
 #include "API/Network/NetSession/netpacket.h"
 #include "outputsource_netpacket_generic.h"
diff -up ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp
--- ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp~	2008-01-04 22:26:18.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp	2008-01-04 22:26:18.000000000 +0100
@@ -27,6 +27,7 @@
 **    (if your name is missing here, please add it)
 */
 
+#include 
 #include "API/Core/System/cl_assert.h"
 #include "API/Network/NetSession/inputsource_netpacket.h"
 #include "API/Network/NetSession/netpacket.h"
diff -up ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp~ ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp
--- ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp~	2008-01-04 22:25:14.000000000 +0100
+++ ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp	2008-01-04 22:25:14.000000000 +0100
@@ -27,6 +27,7 @@
 **    (if your name is missing here, please add it)
 */
 
+#include 
 #include "API/Display/font.h"
 #include "API/Display/display.h"
 #include "API/Core/System/system.h"
diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp
--- ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp~	2008-01-04 22:22:25.000000000 +0100
+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp	2008-01-04 22:22:25.000000000 +0100
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "API/Core/System/error.h"
 #include "API/Display/keys.h"
diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp
--- ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp~	2008-01-04 22:23:19.000000000 +0100
+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp	2008-01-04 22:23:19.000000000 +0100
@@ -28,6 +28,7 @@
 */
 
 #include 
+#include 
 #include "API/Core/System/log.h"
 #include "API/Display/input_device.h"
 #include "API/Display/input_event.h"
diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp
--- ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp~	2008-01-04 22:22:51.000000000 +0100
+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp	2008-01-04 22:22:51.000000000 +0100
@@ -28,6 +28,7 @@
 */
 
 #include 
+#include 
 #include "API/Display/input_device.h"
 #include "API/Display/input_event.h"
 #include "API/Display/keys.h"
diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp
--- ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp~	2008-01-04 22:18:55.000000000 +0100
+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp	2008-01-04 22:18:55.000000000 +0100
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "API/Core/System/error.h"
 #include "API/Core/System/clanstring.h"
diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp
--- ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp~	2008-01-04 22:18:00.000000000 +0100
+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp	2008-01-04 22:18:00.000000000 +0100
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "API/Core/Math/point.h"
 #include "API/Core/System/clanstring.h"
diff -up ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h~ ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h
--- ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h~	2008-01-04 22:07:15.000000000 +0100
+++ ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h	2008-01-04 22:07:15.000000000 +0100
@@ -2530,7 +2530,7 @@ public:
 	typedef CLuint (CL_GLFUNC *ptr_glCreateShaderObjectARB )(CLenum shaderType);
 	typedef CLvoid (CL_GLFUNC *ptr_glShaderSourceARB)(CLuint shaderObj, CLsizei count, const CLchar* *string, const CLint *length);
 	typedef CLvoid (CL_GLFUNC *ptr_glCompileShaderARB)(CLuint shaderObj);
-	typedef CLuint (CL_GLFUNC *ptr_glCreateProgramObjectARB)(CLvoid);
+	typedef CLuint (CL_GLFUNC *ptr_glCreateProgramObjectARB)(void);
 	typedef CLvoid (CL_GLFUNC *ptr_glAttachObjectARB)(CLuint containerObj, CLuint attachedObj);
 	typedef CLvoid (CL_GLFUNC *ptr_glLinkProgramARB)(CLuint programObj);
 	typedef CLvoid (CL_GLFUNC *ptr_glUseProgramObjectARB)(CLuint programObj);
diff -up ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h~ ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h
--- ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h~	2008-01-04 22:12:09.000000000 +0100
+++ ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h	2008-01-04 22:12:09.000000000 +0100
@@ -48,6 +48,7 @@
 #pragma once
 #endif
 
+#include 
 #include "outline_provider.h"
 
 class CL_OutlineProviderFile_Generic;
diff -up ClanLib-0.8.0/Sources/Display/display_precomp.h~ ClanLib-0.8.0/Sources/Display/display_precomp.h
--- ClanLib-0.8.0/Sources/Display/display_precomp.h~	2008-01-04 22:09:47.000000000 +0100
+++ ClanLib-0.8.0/Sources/Display/display_precomp.h	2008-01-04 22:09:47.000000000 +0100
@@ -33,5 +33,7 @@
 #include 
 #endif
 
+#include 
+
 #include "API/Core/System/cl_assert.h"
 
diff -up ClanLib-0.8.0/Sources/GUI/precomp.h~ ClanLib-0.8.0/Sources/GUI/precomp.h
--- ClanLib-0.8.0/Sources/GUI/precomp.h~	2008-01-04 22:16:06.000000000 +0100
+++ ClanLib-0.8.0/Sources/GUI/precomp.h	2008-01-04 22:16:06.000000000 +0100
@@ -37,6 +37,8 @@
 #ifdef _MSC_VER
 #pragma warning (disable:4786)
 
+#include 
+
 #include "API/core.h"
 #include "API/display.h"
 
diff -up ClanLib-0.8.0/Examples/CTalk/precomp.h~ ClanLib-0.8.0/Examples/CTalk/precomp.h
--- ClanLib-0.8.0/Examples/CTalk/precomp.h~	2008-01-04 22:15:50.000000000 +0100
+++ ClanLib-0.8.0/Examples/CTalk/precomp.h	2008-01-04 22:15:50.000000000 +0100
@@ -10,4 +10,6 @@
 #include 
 #include 
 
+#include 
+
 #endif
diff -up ClanLib-0.8.0/Utilities/GUIEditor/precomp.h~ ClanLib-0.8.0/Utilities/GUIEditor/precomp.h
--- ClanLib-0.8.0/Utilities/GUIEditor/precomp.h~	2008-01-04 22:16:07.000000000 +0100
+++ ClanLib-0.8.0/Utilities/GUIEditor/precomp.h	2008-01-04 22:16:07.000000000 +0100
@@ -9,4 +9,6 @@
 #include 
 #include 
 
+#include 
+
 #endif
diff -up ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp~ ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp
--- ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp~	2008-01-04 21:54:35.000000000 +0100
+++ ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp	2008-01-04 21:54:35.000000000 +0100
@@ -53,6 +53,7 @@
 
 #include 
 #include 
+#include  // for PATH_MAX
 
 /////////////////////////////////////////////////////////////////////////////
 // Operations

ClanLib-0.8.0-memset.patch:

--- NEW FILE ClanLib-0.8.0-memset.patch ---
--- ClanLib-0.8.0/Sources/Core/System/Generic/clanstring.cpp~	2008-03-07 20:23:48.000000000 -0500
+++ ClanLib-0.8.0/Sources/Core/System/Generic/clanstring.cpp	2008-03-07 20:25:20.000000000 -0500
@@ -87,7 +87,7 @@ void CL_String::arg(std::string &format,
 	char number[10];
 	std::string num_string = "%";
 	
-	memset(number, 10, 0);
+	memset(number, 0, 10);
 	snprintf(number, 10, "%d", num);
 	
 	num_string += number;
@@ -112,7 +112,7 @@ void CL_String::arg(std::string &format,
 {
 	char arg[10];
 	
-	memset(arg, 10, 0);
+	memset(arg, 0, 10);
 	snprintf(arg, 10, "%d", number);
 	
 	CL_String::arg(format, arg, num);
@@ -122,7 +122,7 @@ void CL_String::arg(std::string &format,
 {
 	char arg[32];
 
-	memset(arg, 32, 0);
+	memset(arg, 0, 32);
 	snprintf(arg, 32, "%f", number);
 	
 	CL_String::arg(format, arg, num);
@@ -132,7 +132,7 @@ void CL_String::arg(std::string &format,
 {
 	char arg[32];
 	
-	memset(arg, 32, 0);
+	memset(arg, 0, 32);
 	snprintf(arg, 32, "%#f", number);
 	
 	CL_String::arg(format, arg, num);
@@ -141,7 +141,7 @@ void CL_String::arg(std::string &format,
 std::string CL_String::from_int(int value)
 {
 	char str[32];
-	memset(str, 32, 0);
+	memset(str, 0, 32);
 	snprintf(str, 32, "%d", value);
 	return std::string(str);
 }
@@ -149,7 +149,7 @@ std::string CL_String::from_int(int valu
 std::string CL_String::from_float(float value)
 {
 	char str[32];
-	memset(str, 32, 0);
+	memset(str, 0, 32);
 	snprintf(str, 32, "%f", value);
 	return std::string(str);
 }
@@ -157,7 +157,7 @@ std::string CL_String::from_float(float 
 std::string CL_String::from_double(double value)
 {
 	char str[32];
-	memset(str, 32, 0);
+	memset(str, 0, 32);
 	snprintf(str, 32, "%#f", value);
 	return std::string(str);
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Aug 2006 10:39:27 -0000	1.3
+++ .cvsignore	9 Mar 2008 18:45:21 -0000	1.4
@@ -1 +1,2 @@
 ClanLib-0.8.0.tgz
+ClanLib-0.8.0-generated-docs.tar.gz


Index: ClanLib.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/F-8/ClanLib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ClanLib.spec	3 Aug 2007 11:03:41 -0000	1.11
+++ ClanLib.spec	9 Mar 2008 18:45:21 -0000	1.12
@@ -1,18 +1,26 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib
 Version:        0.8.0
-Release:        6%{?dist}
+Release:        11%{?dist}
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://www.clanlib.org/
 Source0:        http://www.clanlib.org/download/releases-0.8/%{name}-%{version}.tgz
+# Prebuild docs to avoid multilib conflicts. To regenerate, build and install
+# ClanLib without passing --disable-docs (requires perl, libxslt) and then:
+# mv $RPM_BUILD_ROOT%{_datadir}/doc/clanlib html
+# tar cvfz ClanLib-%{version}-generated-docs.tar.gz html
+Source1:        ClanLib-%{version}-generated-docs.tar.gz
 Patch0:         ClanLib-0.8.0-fullscreen.patch
 Patch1:         ClanLib-0.8.0-tex-format.patch
+Patch2:         ClanLib-0.8.0-gcc43.patch
+Patch3:         ClanLib-0.8.0-alsa.patch
+Patch4:         ClanLib-0.8.0-memset.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
 BuildRequires:  libvorbis-devel mikmod-devel SDL-devel SDL_gfx-devel
-BuildRequires:  libpng-devel libjpeg-devel libxslt perl
+BuildRequires:  libpng-devel libjpeg-devel
 Provides:       clanlib = %{version}-%{release}
 
 %description
@@ -31,9 +39,12 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 %patch0 -p1 -z .fs
 %patch1 -p1 -z .texfmt
+%patch2 -p1 -z .gcc43
+%patch3 -p1 -z .alsa
+%patch4 -p1 -z .memset
 # fixup pc files
 sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in
 sed -i 's|Libs:   -L${libdir}|Libs:   -L${libdir}/%{name}-0.8|' \
@@ -41,7 +52,8 @@
 
 
 %build
-%configure --disable-dependency-tracking --disable-static --enable-dyn
+%configure --disable-dependency-tracking --disable-static --enable-dyn \
+  --disable-docs
 make %{?_smp_mflags}
 
 
@@ -57,8 +69,6 @@
 for i in $RPM_BUILD_ROOT%{_libdir}/%{name}-0.8/*; do
   ln -sf ../`readlink $i` $i
 done
-# for %doc
-mv $RPM_BUILD_ROOT%{_datadir}/doc/clanlib html
 
 
 %clean
@@ -84,6 +94,22 @@
 
 
 %changelog
+* Sat Mar  8 2008 Hans de Goede  0.8.0-11
+- Add a patch from Dave Jones fixing various wrong invocations of memset
+
+* Sun Mar  2 2008 Hans de Goede  0.8.0-10
+- Add support for audio output through alsa (original ClanLib only supports
+  OSS??), this also adds support for using pulseaudio through alsa
+
+* Tue Feb 19 2008 Fedora Release Engineering  - 0.8.0-9
+- Autorebuild for GCC 4.3
+
+* Fri Jan  4 2008 Hans de Goede  0.8.0-8
+- Fix building with gcc 4.3
+
+* Sun Oct 21 2007 Hans de Goede  0.8.0-7
+- Fix multilib conflicts in generated Reference documentation (bz 340851)
+
 * Fri Aug  3 2007 Hans de Goede  0.8.0-6
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Aug 2006 10:39:28 -0000	1.3
+++ sources	9 Mar 2008 18:45:21 -0000	1.4
@@ -1 +1,2 @@
 3e183a801a31f646b012db2d82f97ff3  ClanLib-0.8.0.tgz
+e552916511247b59b1f220421dd68539  ClanLib-0.8.0-generated-docs.tar.gz


--- ClanLib-0.8.0-gcc41.patch DELETED ---


--- ClanLib-0.8.0-grave_key.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  9 19:42:33 2008
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 9 Mar 2008 19:42:33 GMT
Subject: rpms/empathy/devel .cvsignore, 1.10, 1.11 empathy.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <200803091942.m29JgX3R015620@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15596

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
Update to 0.21.91


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Feb 2008 18:31:53 -0000	1.10
+++ .cvsignore	9 Mar 2008 19:41:59 -0000	1.11
@@ -1 +1 @@
-empathy-0.21.90.tar.bz2
+empathy-0.21.91.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- empathy.spec	22 Feb 2008 18:31:53 -0000	1.17
+++ empathy.spec	9 Mar 2008 19:41:59 -0000	1.18
@@ -10,7 +10,7 @@
 %global	tp_glib_min_version	0.7.0		
 
 Name:		empathy
-Version:	0.21.90
+Version:	0.21.91
 Release:	1%{?dist}
 Summary:	GNOME Instant Messaging Client
 
@@ -49,7 +49,7 @@
 ##       PackageKit and friends?
 Requires:	telepathy-gabble
 Requires:	telepathy-salut
-	
+
 Requires(pre):	GConf2
 
 Requires(post):	GConf2
@@ -227,6 +227,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Peter Gordon  - 0.21.91-1
+- Update to new upstream release (0.21.90)
+
 * Fri Feb 22 2008 Peter Gordon  - 0.21.90-1
 - Update to new upstream release (0.21.90)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Feb 2008 18:31:53 -0000	1.10
+++ sources	9 Mar 2008 19:41:59 -0000	1.11
@@ -1 +1 @@
-6a9f253a151d180ea6ff621727124e24  empathy-0.21.90.tar.bz2
+e25d4bfd0c91b53bff498c6bbfd1bfc1  empathy-0.21.91.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 19:45:36 2008
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 9 Mar 2008 19:45:36 GMT
Subject: rpms/ClanLib06/F-8 ClanLib-0.6.5-alsa.patch, NONE,
	1.1 ClanLib-0.6.5-gcc4.3.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 ClanLib06.spec, 1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200803091945.m29Jjaea015687@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib06/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15652

Modified Files:
	.cvsignore ClanLib06.spec sources 
Added Files:
	ClanLib-0.6.5-alsa.patch ClanLib-0.6.5-gcc4.3.patch 
Log Message:
* Sun Mar  2 2008 Hans de Goede  0.6.5-12
- Add support for audio output through alsa (original ClanLib only supports
  OSS??), this also adds support for using pulseaudio through alsa


ClanLib-0.6.5-alsa.patch:

--- NEW FILE ClanLib-0.6.5-alsa.patch ---
diff -up /dev/null ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/alsa.cpp
--- /dev/null	2008-03-02 13:00:58.162258534 +0100
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/alsa.cpp	2008-03-02 13:32:17.000000000 +0100
@@ -0,0 +1,167 @@
+/*
+**  ClanLib SDK
+**  Copyright (c) 1997-2008 The ClanLib Team
+**
+**  This software is provided 'as-is', without any express or implied
+**  warranty.  In no event will the authors be held liable for any damages
+**  arising from the use of this software.
+**
+**  Permission is granted to anyone to use this software for any purpose,
+**  including commercial applications, and to alter it and redistribute it
+**  freely, subject to the following restrictions:
+**
+**  1. The origin of this software must not be misrepresented; you must not
+**     claim that you wrote the original software. If you use this software
+**     in a product, an acknowledgment in the product documentation would be
+**     appreciated but is not required.
+**  2. Altered source versions must be plainly marked as such, and must not be
+**     misrepresented as being the original software.
+**  3. This notice may not be removed or altered from any source distribution.
+**
+**  Note: Some of the libraries ClanLib may link to may have additional
+**  requirements or restrictions.
+**
+**  File Author(s):
+**
+**    Magnus Norddahl
+**    Hans de Goede
+**    (if your name is missing here, please add it)
+*/
+
+#include "alsa.h"
+#include "API/Core/System/error.h"
+#include "API/Core/System/cl_assert.h"
+#include "API/Core/System/system.h"
+#include 
+
+#ifdef USE_CLANSOUND
+#ifdef __linux__
+
+/////////////////////////////////////////////////////////////////////////////
+// CL_SoundOutput_alsa construction:
+
+CL_SoundOutput_alsa::CL_SoundOutput_alsa() :
+	frames_in_buffer(2048), frames_in_period(512)
+{
+	int rc;
+	snd_pcm_hw_params_t *hwparams;
+	unsigned int mixing_frequency = 22050;
+	
+	rc = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 0);
+	if (rc < 0)
+	{
+		std::cout <<  "ClanSound: Warning, Couldn't open sound device, disabling sound\n";
+		handle = NULL;
+		return;
+	}
+
+	snd_pcm_hw_params_alloca(&hwparams);
+	snd_pcm_hw_params_any(handle, hwparams);
+	snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
+	snd_pcm_hw_params_set_format(handle, hwparams, SND_PCM_FORMAT_S16);
+	snd_pcm_hw_params_set_channels(handle, hwparams, 2);
+	snd_pcm_hw_params_set_rate_near(handle, hwparams, &mixing_frequency, 0);
+	snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &frames_in_buffer);
+	frames_in_period = frames_in_buffer / 4;
+	snd_pcm_hw_params_set_period_size_near(handle, hwparams, &frames_in_period, 0);
+	
+	rc = snd_pcm_hw_params(handle, hwparams);
+	if (rc < 0)
+	{
+		std::cout << "ClanSound: Warning, Couldn't initialize sound device, disabling sound\n";
+		snd_pcm_close(handle);
+		handle = NULL;
+		return;
+	}
+	
+	snd_pcm_hw_params_get_period_size(hwparams, &frames_in_period, 0);
+	snd_pcm_hw_params_get_rate(hwparams, &mixing_frequency, 0);
+
+	float percent_wrong = mixing_frequency / (float) 22050;
+	if (percent_wrong < 0.90 || percent_wrong > 1.10)
+	{
+		snd_pcm_close(handle);
+		/* Taken from oss driver, maybe make this a warning too? */
+		throw CL_Error("ClanSound: Mixing rate (22.05 kHz) not supported by soundcard.");
+	}
+}
+
+CL_SoundOutput_alsa::~CL_SoundOutput_alsa()
+{
+	if (handle) {
+		snd_pcm_close(handle);
+		handle = NULL;
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CL_SoundOutput_alsa operations:
+
+void CL_SoundOutput_alsa::silence()
+{
+	/* Note: not supported by all hardware! */
+	if (handle)
+		snd_pcm_pause(handle, 1);
+}
+
+bool CL_SoundOutput_alsa::is_full()
+{
+	int rc;
+	snd_pcm_sframes_t delay;
+	
+	if (handle == NULL) return false;
+	
+	rc = snd_pcm_delay(handle, &delay);
+	if (rc < 0) {
+		std::cout << "ClanSound: Warning, snd_pcm_delay() failed!?\n";
+		return false;
+	}
+
+	/* See if there is more then one period free in the buffer */
+	return delay > (snd_pcm_sframes_t)(frames_in_buffer - frames_in_period);
+}
+
+int CL_SoundOutput_alsa::get_frag_size()
+{
+	return frames_in_period;
+}
+
+void CL_SoundOutput_alsa::write_fragment(short *data)
+{
+	snd_pcm_sframes_t rc;
+
+	if (handle == NULL) return;
+
+	switch(snd_pcm_state(handle)) {
+		case SND_PCM_STATE_XRUN:
+		case SND_PCM_STATE_SUSPENDED:
+			snd_pcm_prepare(handle);
+			break;
+		case SND_PCM_STATE_PAUSED:
+			snd_pcm_pause(handle, 0);
+			break;
+		default:
+			break;
+	}
+
+	rc = snd_pcm_writei(handle, data, frames_in_period);
+	if (rc < 0)
+		std::cout << "ClanSound: Warning, snd_pcm_writei() failed!\n";
+}
+
+void CL_SoundOutput_alsa::wait()
+{
+	if(handle == NULL)
+	{
+		CL_System::sleep(100);
+		return;
+	}
+	/* wait upto 1 second */
+	snd_pcm_wait(handle, 1000);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CL_SoundOutput_alsa implementation:
+
+#endif
+#endif
diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.h.alsa ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.h
--- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.h.alsa	2001-09-08 21:24:21.000000000 +0200
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.h	2008-03-02 13:18:19.000000000 +0100
@@ -10,6 +10,8 @@
 #ifndef header_oss
 #define header_oss
 
+#include "alsa.h"
+
 class CL_CSOutput
 {
 public:
@@ -35,6 +37,9 @@ public:
 private:
 	int dev_dsp_fd;
 	int frag_size;
+#ifdef __linux__
+	CL_SoundOutput_alsa *alsa;
+#endif
 };
 
 #endif
diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.cpp.alsa ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.cpp
--- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.cpp.alsa	2002-07-02 22:56:33.000000000 +0200
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/oss.cpp	2008-03-02 13:18:19.000000000 +0100
@@ -37,6 +37,14 @@ bool has_sound = true;
 
 CL_CSOutput::CL_CSOutput()
 {
+#ifdef __linux__
+	alsa = new CL_SoundOutput_alsa();
+	if (!alsa->handle) {
+		delete alsa;
+		alsa = NULL;
+	} else
+		return;
+#endif	
 	dev_dsp_fd = open(DSP_DEVICE, O_WRONLY|O_NONBLOCK);
 	if (dev_dsp_fd == -1)
 	{
@@ -99,6 +107,13 @@ CL_CSOutput::CL_CSOutput()
 
 CL_CSOutput::~CL_CSOutput()
 {
+#ifdef __linux__
+	if (alsa) {
+		delete alsa;
+		alsa = NULL;
+		return;
+	}
+#endif
 	if (dev_dsp_fd != -1) close(dev_dsp_fd);
 }
 
@@ -106,12 +121,22 @@ void CL_CSOutput::silence()
 // Called when we have no samples to play - and wants to tell the soundcard
 // about this possible event.
 {
+#ifdef __linux__
+	if (alsa) {
+		alsa->silence();
+		return;
+	}
+#endif
 	ioctl(dev_dsp_fd, SNDCTL_DSP_POST, 0);
 }
 
 bool CL_CSOutput::is_full()
 // Returns true if all fragments are filled with data.
 {
+#ifdef __linux__
+	if (alsa)
+		return alsa->is_full();
+#endif
 	if (!has_sound) return false;
 	audio_buf_info info;
 	int err = ioctl(dev_dsp_fd, SNDCTL_DSP_GETOSPACE, &info);
@@ -128,17 +153,33 @@ bool CL_CSOutput::is_full()
 int CL_CSOutput::get_frag_size()
 // Returns the buffer size used by device (returned as num [stereo] samples).
 {
+#ifdef __linux__
+	if (alsa)
+		return alsa->get_frag_size();
+#endif
 	return frag_size/4;
 }
 
 void CL_CSOutput::write_fragment(short *data)
 // Writes a fragment to the soundcard.
 {
+#ifdef __linux__
+	if (alsa) {
+		alsa->write_fragment(data);
+		return;
+	}
+#endif
 	write(dev_dsp_fd, data, frag_size);
 }
 
 void CL_CSOutput::wait()
 {
+#ifdef __linux__
+	if (alsa) {
+		alsa->wait();
+		return;
+	}
+#endif
 	if(!has_sound)
 	{
 		CL_System::sleep(100);
diff -up /dev/null ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/alsa.h
--- /dev/null	2008-03-02 13:00:58.162258534 +0100
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/alsa.h	2008-03-02 13:23:03.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+**  ClanLib SDK
+**  Copyright (c) 1997-2008 The ClanLib Team
+**
+**  This software is provided 'as-is', without any express or implied
+**  warranty.  In no event will the authors be held liable for any damages
+**  arising from the use of this software.
+**
+**  Permission is granted to anyone to use this software for any purpose,
+**  including commercial applications, and to alter it and redistribute it
+**  freely, subject to the following restrictions:
+**
+**  1. The origin of this software must not be misrepresented; you must not
+**     claim that you wrote the original software. If you use this software
+**     in a product, an acknowledgment in the product documentation would be
+**     appreciated but is not required.
+**  2. Altered source versions must be plainly marked as such, and must not be
+**     misrepresented as being the original software.
+**  3. This notice may not be removed or altered from any source distribution.
+**
+**  Note: Some of the libraries ClanLib may link to may have additional
+**  requirements or restrictions.
+**
+**  File Author(s):
+**
+**    Magnus Norddahl
+**    Hans de Goede
+**    (if your name is missing here, please add it)
+*/
+
+#ifndef header_soundoutput_alsa
+#define header_soundoutput_alsa
+
+#ifdef __linux__
+
+#include  
+
+class CL_SoundOutput_alsa
+{
+//! Construction:
+public:
+	CL_SoundOutput_alsa();
+	
+	~CL_SoundOutput_alsa();
+
+//! Attributes:
+public:
+	snd_pcm_t *handle;
+	snd_pcm_uframes_t frames_in_buffer;
+	snd_pcm_uframes_t frames_in_period;
+
+//! Operations:
+public:
+	//: Called when we have no samples to play - and wants to tell the soundcard
+	//: about this possible event.
+	void silence();
+
+	//: Returns true if all fragments are filled with data.
+	bool is_full();
+
+	//: Returns the buffer size used by device (returned as num [stereo] samples).
+	int get_frag_size();
+
+	//: Writes a fragment to the soundcard.
+	void write_fragment(short *data);
+
+	//: Waits until output source isn't full anymore.
+	void wait();
+
+//! Implementation:
+private:
+};
+
+#endif
+#endif
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.alsa ClanLib-0.6.5/Setup/Unix/Makefile.sound.in
--- ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.alsa	2008-03-02 13:18:19.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.sound.in	2008-03-02 13:30:35.000000000 +0100
@@ -42,6 +42,7 @@ OBJF_SOUND_CLANSOUND = \
 	Libs/Intermediate/cardplayback_clan.o \
 	Libs/Intermediate/mixer.o \
 	Libs/Intermediate/oss.o \
+	Libs/Intermediate/alsa.o \
 	Libs/Intermediate/cdaudio_linux.o
 
 OBJF_SOUND_INTEL_ASM = \
@@ -51,8 +52,8 @@ OBJF_SOUND_ALL = $(OBJF_SOUND_GENERIC) $
 
 Libs/libclanSound.so: Libs/libclanCore.so $(OBJF_SOUND_ALL)
 	@echo "Building Libs/libclanSound.so"
-	@echo $(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore
-	@$(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore
+	@echo $(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore -lasound
+	@$(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore -lasound
 	@ln -s -f libclanSound.so.$(D_VERSION_MINOR) Libs/libclanSound.so.$(D_VERSION_MAJOR)
 	@ln -s -f libclanSound.so.$(D_VERSION_MAJOR) Libs/libclanSound.so
 

ClanLib-0.6.5-gcc4.3.patch:

--- NEW FILE ClanLib-0.6.5-gcc4.3.patch ---
diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_static.cpp~ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_static.cpp
--- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_static.cpp~	2008-01-04 22:10:49.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_static.cpp	2008-01-04 22:10:49.000000000 +0100
@@ -18,6 +18,7 @@
 
 #ifdef USE_CLANSOUND
 
+#include 
 #include 
 #include 
 #include 
diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/soundbuffer_static_clan.cpp~ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/soundbuffer_static_clan.cpp
--- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/soundbuffer_static_clan.cpp~	2008-01-04 22:10:28.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/soundbuffer_static_clan.cpp	2008-01-04 22:10:28.000000000 +0100
@@ -22,6 +22,7 @@
 
 #ifdef USE_CLANSOUND
 
+#include 
 #include 
 #include "API/Core/System/cl_assert.h"
 #include 
diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_stream.cpp~ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_stream.cpp
--- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_stream.cpp~	2008-01-04 22:17:25.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_stream.cpp	2008-01-04 22:17:25.000000000 +0100
@@ -22,6 +22,7 @@
 
 #ifdef USE_CLANSOUND
 
+#include 
 #include 
 #include 
 #include "API/Core/System/cl_assert.h"
diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/mixer.cpp~ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/mixer.cpp
--- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/mixer.cpp~	2008-01-04 22:24:13.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/mixer.cpp	2008-01-04 22:24:13.000000000 +0100
@@ -14,6 +14,8 @@
 #include 
 #include 
 
+#include 
+
 #ifdef USE_I386_ASSEMBLER
 #if defined(__BORLANDC__) && !defined(USE_TASM)
   #undef USE_I386_ASSEMBLER
diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp~ ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp
--- ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp~	2008-01-04 22:07:45.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp	2008-01-04 22:07:45.000000000 +0100
@@ -20,6 +20,7 @@
 #pragma warning (disable:4786)
 #endif
 
+#include 
 #include "API/Core/IOData/cl_endian.h"
 #include "API/Core/IOData/inputsource_provider.h"
 #include "API/Core/IOData/inputsource.h"
diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp~ ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp
--- ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp~	2008-01-04 22:08:27.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp	2008-01-04 22:08:27.000000000 +0100
@@ -20,6 +20,7 @@
 #pragma warning (disable:4786)
 #endif
 
+#include 
 #include "API/Core/System/cl_assert.h"
 #include "API/Core/System/error.h"
 #include "API/Core/IOData/cl_endian.h"
diff -up ClanLib-0.6.5/Sources/Sound/SoundFilters/inverse_echofilter_generic.cpp~ ClanLib-0.6.5/Sources/Sound/SoundFilters/inverse_echofilter_generic.cpp
--- ClanLib-0.6.5/Sources/Sound/SoundFilters/inverse_echofilter_generic.cpp~	2008-01-04 22:08:58.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/SoundFilters/inverse_echofilter_generic.cpp	2008-01-04 22:08:58.000000000 +0100
@@ -21,6 +21,7 @@
 #ifdef BORLAND
 #include 
 #endif
+#include 
 
 CL_InverseEchoFilter::CL_InverseEchoFilter(int buffer_size)
 {
diff -up ClanLib-0.6.5/Sources/Core/precomp.h~ ClanLib-0.6.5/Sources/Core/precomp.h
--- ClanLib-0.6.5/Sources/Core/precomp.h~	2008-01-04 22:00:37.000000000 +0100
+++ ClanLib-0.6.5/Sources/Core/precomp.h	2008-01-04 22:00:37.000000000 +0100
@@ -33,6 +33,8 @@
 #include "API/signals.h"
 #include "API/Core/System/error.h"
 
+#include 
+
 #ifdef __BORLANDC__
 #define BAD_MATH
 #endif
diff -up ClanLib-0.6.5/Sources/Network/Generic/netvariables_generic.h~ ClanLib-0.6.5/Sources/Network/Generic/netvariables_generic.h
--- ClanLib-0.6.5/Sources/Network/Generic/netvariables_generic.h~	2008-01-04 22:55:25.000000000 +0100
+++ ClanLib-0.6.5/Sources/Network/Generic/netvariables_generic.h	2008-01-04 22:55:25.000000000 +0100
@@ -16,6 +16,7 @@
 #define header_netvariables_generic
 
 #include 
+#include 
 #include "API/Core/IOData/inputsource.h"
 #include "API/Core/IOData/outputsource.h"
 
diff -up ClanLib-0.6.5/Sources/Network/Generic/ip_address.cpp~ ClanLib-0.6.5/Sources/Network/Generic/ip_address.cpp
--- ClanLib-0.6.5/Sources/Network/Generic/ip_address.cpp~	2008-01-04 22:56:42.000000000 +0100
+++ ClanLib-0.6.5/Sources/Network/Generic/ip_address.cpp	2008-01-04 22:56:42.000000000 +0100
@@ -11,6 +11,7 @@
 
 	------------------------------------------------------------------------
 */
+#include 
 #include "API/Network/ip_address.h"
 #include "API/Core/System/error.h"
 
diff -up ClanLib-0.6.5/Sources/Network/Generic/socket_generic.cpp~ ClanLib-0.6.5/Sources/Network/Generic/socket_generic.cpp
--- ClanLib-0.6.5/Sources/Network/Generic/socket_generic.cpp~	2008-01-04 22:56:19.000000000 +0100
+++ ClanLib-0.6.5/Sources/Network/Generic/socket_generic.cpp	2008-01-04 22:56:19.000000000 +0100
@@ -16,6 +16,7 @@
 #pragma warning (disable:4786)
 #endif
 
+#include 
 #include "socket_generic.h"
 
 /////////////////////////////////////////////////////////////////////////////
diff -up ClanLib-0.6.5/Sources/Network/Generic/socket.cpp~ ClanLib-0.6.5/Sources/Network/Generic/socket.cpp
--- ClanLib-0.6.5/Sources/Network/Generic/socket.cpp~	2008-01-04 22:56:00.000000000 +0100
+++ ClanLib-0.6.5/Sources/Network/Generic/socket.cpp	2008-01-04 22:56:00.000000000 +0100
@@ -25,6 +25,7 @@
 #define INVALID_SOCKET -1
 #endif
 
+#include 
 #include "socket_generic.h"
 #include "API/Core/System/error.h"
 
diff -up ClanLib-0.6.5/Sources/Display/Display/X11/display_xwindow.h~ ClanLib-0.6.5/Sources/Display/Display/X11/display_xwindow.h
--- ClanLib-0.6.5/Sources/Display/Display/X11/display_xwindow.h~	2008-01-04 22:06:31.000000000 +0100
+++ ClanLib-0.6.5/Sources/Display/Display/X11/display_xwindow.h	2008-01-04 22:06:31.000000000 +0100
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "target_ximage_std.h"
 #include "target_ximage_shm.h"
diff -up ClanLib-0.6.5/Sources/GUI/precomp.h~ ClanLib-0.6.5/Sources/GUI/precomp.h
--- ClanLib-0.6.5/Sources/GUI/precomp.h~	2008-01-04 22:17:09.000000000 +0100
+++ ClanLib-0.6.5/Sources/GUI/precomp.h	2008-01-04 22:17:09.000000000 +0100
@@ -4,6 +4,8 @@
 #ifdef WIN32
 #pragma warning (disable:4786)
 
+#include 
+
 // Framework
 #include "API/GUI/component.h"
 #include "API/GUI/component_manager.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jul 2006 14:03:00 -0000	1.2
+++ .cvsignore	9 Mar 2008 19:45:03 -0000	1.3
@@ -1 +1,2 @@
 ClanLib-0.6.5-1.tar.gz
+ClanLib-0.6.5-generated-docs.tar.gz


Index: ClanLib06.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/F-8/ClanLib06.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClanLib06.spec	3 Aug 2007 12:31:15 -0000	1.6
+++ ClanLib06.spec	9 Mar 2008 19:45:03 -0000	1.7
@@ -1,20 +1,27 @@
 Summary:        Version 0.6 of this Cross platform C++ game library
 Name:           ClanLib06
 Version:        0.6.5
-Release:        8%{?dist}
+Release:        12%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.clanlib.org/
 Source0:        http://www.clanlib.org/download/legacy/ClanLib-%{version}-1.tar.gz
+# prebuild docs to avoid multilib conflicts. To regenerate untar and configure,
+# cd Documentation, make, make install HTML_PREFIX=`pwd`/html, cd ..,
+# tar cvfz ClanLib-%{version}-generated-docs.tar.gz Documentation/html
+Source1:        ClanLib-%{version}-generated-docs.tar.gz
 Patch0:         ClanLib-0.6.5-debian.patch
 Patch1:         ClanLib-0.6.5-suse.patch
 Patch2:         ClanLib-0.6.5-tolua++.patch
 Patch3:         ClanLib-0.6.5-smalljpg.patch
+Patch4:         ClanLib-0.6.5-gcc4.3.patch
+Patch5:         ClanLib-0.6.5-alsa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXext-devel libXt-devel libGLU-devel
 BuildRequires:  libICE-devel libXxf86vm-devel xorg-x11-proto-devel
 BuildRequires:  libvorbis-devel libpng-devel libjpeg-devel mikmod-devel
-BuildRequires:  tolua++-devel Hermes-devel freetype-devel autoconf perl
+BuildRequires:  tolua++-devel Hermes-devel freetype-devel autoconf
+BuildRequires:  alsa-lib-devel
 Provides:       clanlib06 = %{version}-%{release}
 
 %description
@@ -34,11 +41,13 @@
 
 
 %prep
-%setup -q -n ClanLib-%{version}
+%setup -q -a 1 -n ClanLib-%{version}
 %patch0 -p1 -z .deb
 %patch1 -p1 -z .suse
 %patch2 -p1 -z .tolua++
 %patch3 -p1 -z .smalljpg
+%patch4 -p1 -z .gcc43
+%patch5 -p1 -z .alsa
 # mark asm files as NOT needing execstack
 for i in `find Sources -name '*.s'`; do
   echo '.section .note.GNU-stack,"", at progbits' >> $i
@@ -51,21 +60,16 @@
 ARCH_CONFIG_FLAGS=--enable-asm386
 %endif
 %configure --disable-dependency-tracking --disable-debug --enable-dyn \
-  $ARCH_CONFIG_FLAGS
+  --disable-directfb $ARCH_CONFIG_FLAGS
 tolua++ -o Sources/Lua/clanbindings.cpp Sources/Lua/clanbindings.pkg
 make %{?_smp_mflags}
-pushd Documentation
-make %{?_smp_mflags}
-popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.a
-pushd Documentation
-make install HTML_PREFIX=`pwd`/html
-popd
+chmod -x $RPM_BUILD_ROOT%{_mandir}/man1/clanlib-config.1*
 
 
 %clean
@@ -92,6 +96,22 @@
 
 
 %changelog
+* Sun Mar  2 2008 Hans de Goede  0.6.5-12
+- Add support for audio output through alsa (original ClanLib only supports
+  OSS??), this also adds support for using pulseaudio through alsa
+
+* Sun Feb 17 2008 Hans de Goede  0.6.5-11
+- Rebuild for new libmikmod
+- Rebuild with gcc 4.3
+
+* Fri Jan  4 2008 Hans de Goede  0.6.5-10
+- Fix building with gcc 4.3
+
+* Sun Oct 21 2007 Hans de Goede  0.6.5-9
+- Explictily disable directfb support, so that it doesn't accidentally get
+  build on system which have directfb installed
+- Fix multilib conflict in the Reference documentation (bz 340861)
+
 * Fri Aug  3 2007 Hans de Goede  0.6.5-8
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jul 2006 14:03:00 -0000	1.2
+++ sources	9 Mar 2008 19:45:03 -0000	1.3
@@ -1 +1,2 @@
 7115921953ef6fa45102c28622493650  ClanLib-0.6.5-1.tar.gz
+cfc8671faa0b41c6fb21433670edc109  ClanLib-0.6.5-generated-docs.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  9 19:58:17 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Mar 2008 19:58:17 GMT
Subject: rpms/kde-settings/devel kde-settings.spec,1.33,1.34
Message-ID: <200803091958.m29JwHsH015987@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15863/devel

Modified Files:
	kde-settings.spec 
Log Message:
* Sun Mar 09 2008 Kevin Kofler  4.0-11.1
- symlink /etc/kderc to /etc/kde4rc


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kde-settings.spec	19 Feb 2008 19:30:22 -0000	1.33
+++ kde-settings.spec	9 Mar 2008 19:57:44 -0000	1.34
@@ -7,7 +7,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.0
-Release: %{rel}%{?dist}
+Release: %{rel}%{?dist}.1
 
 Group:   System Environment/Base
 License: Public Domain
@@ -69,6 +69,8 @@
 rm -rf   %{buildroot}%{_datadir}/config/kdm
 ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
 
+ln -s kderc %{buildroot}%{_sysconfdir}/kde4rc
+
 %clean
 rm -rf %{buildroot}
 
@@ -99,6 +101,7 @@
 %config(noreplace) /etc/pam.d/kscreensaver
 # drop noreplace, so we can be sure to get the new kiosk bits
 %config %{_sysconfdir}/kderc
+%config %{_sysconfdir}/kde4rc
 %{_datadir}/kde-settings/
 
 %files kdm
@@ -126,6 +129,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Kevin Kofler  4.0-11.1
+- symlink /etc/kderc to /etc/kde4rc
+
 * Tue Feb 19 2008 Rex Dieter  4.0-11
 - kdmrc: BootManager=Grub (#374011)
 - omit errant clock_pannelapplet_wkid..._rc (#431890)



From fedora-extras-commits at redhat.com  Sun Mar  9 19:59:23 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Mar 2008 19:59:23 GMT
Subject: rpms/kde-settings/F-8 kde-settings.spec,1.22,1.23
Message-ID: <200803091959.m29JxNTM016025@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-settings/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15999/F-8

Modified Files:
	kde-settings.spec 
Log Message:
* Sun Mar 09 2008 Kevin Kofler  3.5-37.1
- symlink /etc/kderc to /etc/kde4rc


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-8/kde-settings.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kde-settings.spec	19 Feb 2008 13:43:47 -0000	1.22
+++ kde-settings.spec	9 Mar 2008 19:58:44 -0000	1.23
@@ -4,7 +4,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 3.5
-Release: %{rel}%{?dist}
+Release: %{rel}%{?dist}.1
 
 Group:   System Environment/Base
 License: Public Domain
@@ -71,6 +71,8 @@
 rm -rf   %{buildroot}%{_datadir}/config/kdm
 ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
 
+ln -s kderc %{buildroot}%{_sysconfdir}/kde4rc
+
 
 %clean
 rm -rf %{buildroot}
@@ -100,6 +102,7 @@
 %{_sysconfdir}/skel/.kde/
 # drop noreplace, so we can be sure to get the new kiosk bits
 %config %{_sysconfdir}/kderc
+%config %{_sysconfdir}/kde4rc
 %{_datadir}/kde-settings/
 
 %files kdm
@@ -126,6 +129,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Kevin Kofler  3.5-37.1
+- symlink /etc/kderc to /etc/kde4rc
+
 * Tue Feb 19 2008 Rex Dieter  3.5-37
 - omit errant clock_pannelapplet_wkid..._rc (#431890)
 - include pulseaudio.sh, gpg-agent-*.sh scripts in tarball too



From fedora-extras-commits at redhat.com  Sun Mar  9 20:00:37 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Sun, 9 Mar 2008 20:00:37 GMT
Subject: rpms/kde-settings/F-7 kde-settings.spec,1.14,1.15
Message-ID: <200803092000.m29K0bwK016132@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-settings/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16070/F-7

Modified Files:
	kde-settings.spec 
Log Message:
* Sun Mar 09 2008 Kevin Kofler  3.5-30.3
- symlink /etc/kderc to /etc/kde4rc


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-7/kde-settings.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kde-settings.spec	4 Feb 2008 15:24:33 -0000	1.14
+++ kde-settings.spec	9 Mar 2008 19:59:58 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 3.5
-Release: %{rel}%{?dist}.2
+Release: %{rel}%{?dist}.3
 
 Group:   System Environment/Base
 License: Public Domain
@@ -63,6 +63,8 @@
 install -p -m0755 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/kde/env/gpg-agent-startup.sh
 install -p -m0755 -D %{SOURCE11} %{buildroot}%{_sysconfdir}/kde/shutdown/gpg-agent-shutdown.sh
 
+ln -s kderc %{buildroot}%{_sysconfdir}/kde4rc
+
 
 %clean
 rm -rf %{buildroot}
@@ -92,6 +94,7 @@
 %{_sysconfdir}/skel/.kde/
 # drop noreplace, so we can be sure to get the new kiosk bits
 %config %{_sysconfdir}/kderc
+%config %{_sysconfdir}/kde4rc
 %{_datadir}/kde-settings/
 
 %files kdm
@@ -114,6 +117,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Kevin Kofler  3.5-30.3
+- symlink /etc/kderc to /etc/kde4rc
+
 * Mon Feb 04 2008 Rex Dieter  3.5-30.2
 - -kdm: Req: xorg-x11-xfs (#431398)
 



From fedora-extras-commits at redhat.com  Sun Mar  9 20:02:50 2008
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sun, 9 Mar 2008 20:02:50 GMT
Subject: rpms/empathy/devel empathy.spec,1.18,1.19
Message-ID: <200803092002.m29K2oTW023309@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23287

Modified Files:
	empathy.spec 
Log Message:
Slight %changelog entry fix due to copy/paste typo.


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- empathy.spec	9 Mar 2008 19:41:59 -0000	1.18
+++ empathy.spec	9 Mar 2008 20:02:17 -0000	1.19
@@ -228,7 +228,7 @@
 
 %changelog
 * Sun Mar 09 2008 Peter Gordon  - 0.21.91-1
-- Update to new upstream release (0.21.90)
+- Update to new upstream release (0.21.91)
 
 * Fri Feb 22 2008 Peter Gordon  - 0.21.90-1
 - Update to new upstream release (0.21.90)



From fedora-extras-commits at redhat.com  Sun Mar  9 20:26:24 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Sun, 9 Mar 2008 20:26:24 GMT
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1441,
	1.1442 openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch, 
	1.1, NONE
Message-ID: <200803092026.m29KQOGD023602@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23578

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch 
Log Message:
remove 86268


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1441
retrieving revision 1.1442
diff -u -r1.1441 -r1.1442
--- openoffice.org.spec	9 Mar 2008 18:09:03 -0000	1.1441
+++ openoffice.org.spec	9 Mar 2008 20:25:48 -0000	1.1442
@@ -143,8 +143,7 @@
 Patch69: openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
 Patch70: openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
 Patch71: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch72: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
-Patch73: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch72: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1101,8 +1100,7 @@
 %patch69 -p1 -b .ooo85931.svx.getentrypos.patch
 %patch70 -p1 -b .ooo86123.ucb.newneon.patch
 %patch71 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch72 -p1 -b .ooo86268.desktop.visibilitycockup.patch
-%patch73 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch72 -p1 -b .oooXXXXX.psprint.debugcups.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2876,6 +2874,7 @@
 * Sun Mar 09 2008 Caolan McNamara  - 1:2.4.0-10.1
 - next release candidate
 - rhbz#293791 Restore draw back to the menus and revert to upstream app names
+- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
 
 * Thu Mar 06 2008 Caolan McNamara  - 1:2.4.0-9.1
 - next release candidate


--- openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Mar  9 21:26:16 2008
From: fedora-extras-commits at redhat.com (Will Woods (wwoods))
Date: Sun, 9 Mar 2008 21:26:16 GMT
Subject: rpms/gnome-panel/devel
	gnome-panel-2.21.92-about-this-computer.patch, 
	NONE, 1.1 gnome-panel.spec, 1.273, 1.274
Message-ID: <200803092126.m29LQGcm031768@cvs-int.fedora.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31737

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.21.92-about-this-computer.patch 
Log Message:
add about-this-computer patch

gnome-panel-2.21.92-about-this-computer.patch:

--- NEW FILE gnome-panel-2.21.92-about-this-computer.patch ---
diff -up gnome-panel-2.21.92/gnome-panel/panel-menu-items.c.about-this-computer gnome-panel-2.21.92/gnome-panel/panel-menu-items.c
--- gnome-panel-2.21.92/gnome-panel/panel-menu-items.c.about-this-computer	2008-03-08 14:35:22.000000000 -0500
+++ gnome-panel-2.21.92/gnome-panel/panel-menu-items.c	2008-03-09 16:48:07.000000000 -0400
@@ -1128,6 +1128,8 @@ panel_desktop_menu_item_append_menu (Gtk
 	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
 	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
 	panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL);
+	if (panel_has_desktop_file ("about-this-computer.desktop"))
+		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
 
 	if (parent->priv->append_lock_logout)
 		panel_menu_items_append_lock_logout (menu);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- gnome-panel.spec	4 Mar 2008 01:29:05 -0000	1.273
+++ gnome-panel.spec	9 Mar 2008 21:25:43 -0000	1.274
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.21.92
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2
 
@@ -94,6 +94,7 @@
 # Drop this patch for now, it should have AT LEAST been moved
 # to an upstream bugzilla by now
 #Patch6: gnome-panel-2.16.0-compiz-support.patch
+Patch7: gnome-panel-2.21.92-about-this-computer.patch
 
 # the next three patches belong together
 # http://bugzilla.gnome.org/show_bug.cgi?id=470966
@@ -157,6 +158,7 @@
 %patch3 -p1 -b .switch-user
 %patch4 -p1 -b .search
 #%patch6 -p0 -b .compiz-support
+%patch7 -p1 -b .about-this-computer
 %patch8 -p1 -b .launcher-desktop-files
 %patch9 -p1 -b .desktop-file-monitoring
 %patch10 -p1 -b .preferred-apps
@@ -351,6 +353,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Mar  8 2008 Will Woods  - 2.21.92-6
+- Add "About This Computer" item to System menu if it exists
+
 * Mon Mar  3 2008 Matthias Clasen  - 2.21.92-5
 - Fix a redraw problem with the clock map
 



From fedora-extras-commits at redhat.com  Sun Mar  9 21:28:59 2008
From: fedora-extras-commits at redhat.com (Will Woods (wwoods))
Date: Sun, 9 Mar 2008 21:28:59 GMT
Subject: rpms/gnome-system-monitor/devel about-this-computer.desktop, NONE, 
	1.1 gnome-system-monitor-2.21.92-system-tab-arg.patch, NONE,
	1.1 gnome-system-monitor.spec, 1.108, 1.109
Message-ID: <200803092128.m29LSxuN031888@cvs-int.fedora.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31859

Modified Files:
	gnome-system-monitor.spec 
Added Files:
	about-this-computer.desktop 
	gnome-system-monitor-2.21.92-system-tab-arg.patch 
Log Message:
add --show-system-tab flag and about-this-computer.desktop


--- NEW FILE about-this-computer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=About This Computer
Name[en_US]=About This Computer 
Comment=Get some basic information about this computer 
Comment[en_US]=Get some basic information about this computer
Exec=gnome-system-monitor --show-system-tab
Icon=computer
Terminal=false
Type=Application
Categories=X-System-About;
StartupNotify=true
OnlyShowIn=GNOME;

gnome-system-monitor-2.21.92-system-tab-arg.patch:

--- NEW FILE gnome-system-monitor-2.21.92-system-tab-arg.patch ---
diff -up gnome-system-monitor-2.21.92/src/procman.h.system-tab-arg gnome-system-monitor-2.21.92/src/procman.h
--- gnome-system-monitor-2.21.92/src/procman.h.system-tab-arg	2008-03-08 10:18:31.000000000 -0500
+++ gnome-system-monitor-2.21.92/src/procman.h	2008-03-08 10:18:31.000000000 -0500
@@ -58,6 +58,7 @@ enum
 static const unsigned MIN_UPDATE_INTERVAL =   1 * 1000;
 static const unsigned MAX_UPDATE_INTERVAL = 100 * 1000;
 
+#define SHOW_SYSTEM_TAB_CMD "SHOWSYSTAB" /* elegant, eh */
 
 enum ProcmanTab
 {
diff -up gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg gnome-system-monitor-2.21.92/src/procman.cpp
--- gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg	2008-03-08 10:18:31.000000000 -0500
+++ gnome-system-monitor-2.21.92/src/procman.cpp	2008-03-08 10:36:19.000000000 -0500
@@ -626,14 +626,20 @@ cb_server (const gchar *msg, gpointer us
 {
 	GdkWindow *window;
 	ProcData *procdata;
-	guint32 timestamp;
+	guint32 timestamp = 0;
 
 	window = gdk_get_default_root_window ();
 
 	procdata = *(ProcData**)user_data;
 	g_assert (procdata != NULL);
 
-	timestamp = strtoul(msg, NULL, 0);
+    procman_debug("cb_server(%s)", msg);
+	if (msg != NULL && strcmp(SHOW_SYSTEM_TAB_CMD, msg) == 0) {
+		procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message");
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO);
+		cb_change_current_page (GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata);
+	} else 
+		timestamp = strtoul(msg, NULL, 0);
 
 	if (timestamp == 0)
 	{
@@ -669,12 +675,28 @@ main (int argc, char *argv[])
 	ProcData *procdata;
 	BaconMessageConnection *conn;
 
+	/* Parse commandline arguments */
+	GError *error = NULL;
+	GOptionContext *context;
+	static gboolean show_system_tab = FALSE;
+	static GOptionEntry entries[] = 
+	{
+		{ "show-system-tab", 's', 0, G_OPTION_ARG_NONE, &show_system_tab, "Show the System tab", NULL },
+		{ NULL }
+	};
+
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
 	startup_timestamp = get_startup_timestamp();
 
+	context = g_option_context_new("- a simple process and system monitor.");
+	g_option_context_set_ignore_unknown_options(context, TRUE);
+	g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
+	g_option_context_parse(context, &argc, &argv, &error);
+	g_option_context_free(context);
+
 	Gtk::Main kit(&argc, &argv);
 	procman_debug("post gtk_init");
 
@@ -691,6 +713,9 @@ main (int argc, char *argv[])
 
 		timestamp = g_strdup_printf ("%" G_GUINT32_FORMAT, startup_timestamp);
 
+		if (show_system_tab)
+			bacon_message_connection_send(conn, SHOW_SYSTEM_TAB_CMD);
+
 		bacon_message_connection_send (conn, timestamp);
 
 		gdk_notify_startup_complete ();
@@ -727,6 +752,12 @@ main (int argc, char *argv[])
 
 	g_assert(procdata->app);
 			
+	if (show_system_tab) {
+		procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request");
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO);
+		cb_change_current_page (GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata);
+	}
+
  	gtk_widget_show(procdata->app);
        
 	procman_debug("begin gtk_main");


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- gnome-system-monitor.spec	7 Mar 2008 04:44:39 -0000	1.108
+++ gnome-system-monitor.spec	9 Mar 2008 21:28:25 -0000	1.109
@@ -13,11 +13,12 @@
 Summary: Simple process monitor
 Name: gnome-system-monitor
 Version: 2.21.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
 Source: http://download.gnome.org/sources/gnome-system-monitor/2.21/%{name}-%{version}.tar.bz2
+Source1: about-this-computer.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: GConf2-devel
 BuildRequires: gnome-vfs2-devel
@@ -42,6 +43,7 @@
 
 # send upstream: http://bugzilla.gnome.org/show_bug.cgi?id=491462
 Patch0: gnome-system-monitor-2.21.92-polkit.patch
+Patch1: gnome-system-monitor-2.21.92-system-tab-arg.patch
 
 Requires: PolicyKit-gnome >= %{polkit_gnome_version}
 Requires(pre): GConf2 >= %{gconf_version}
@@ -56,6 +58,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .polkit
+%patch1 -p1 -b .system-tab-arg
 
 %build
 autoreconf
@@ -76,6 +79,8 @@
   --remove-category Application				    \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 %find_lang %{name} --with-gnome
 
@@ -118,6 +123,9 @@
 
 
 %changelog
+* Sat Mar  8 2008 Will Woods  - 2.21.92-3
+- Add --show-system-tab commandline flag and about-this-computer.desktop
+
 * Thu Mar  6 2008 Matthias Clasen  - 2.21.92-2
 - Don't OnlyShowIn=GNOME
 



From fedora-extras-commits at redhat.com  Sun Mar  9 21:34:24 2008
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Sun, 9 Mar 2008 21:34:24 GMT
Subject: rpms/sunbird/EL-5 sunbird.spec,1.2,1.2.2.1
Message-ID: <200803092134.m29LYOCO032143@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32083

Modified Files:
      Tag: sunbird-0_7-10_nonparallel1
	sunbird.spec 
Log Message:
A tree has grown on the spot
Where her body did rest
Blood seeped in the soil
>From the knife in her chest
The bugs serve time in her skeletal jail
I wonder how the bugs remember Gail

Everybody would say
You can still hear her laugh
In the shadows on a cold winter's day
A dog dug up a bone and wagged it's tail
I wonder how that I'll remember Gail

The bugs serve time in her skeletal jail
I wonder how the bugs remember Gail



Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/EL-5/sunbird.spec,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- sunbird.spec	9 Mar 2008 15:23:22 -0000	1.2
+++ sunbird.spec	9 Mar 2008 21:33:51 -0000	1.2.2.1
@@ -5,7 +5,7 @@
 
 Name:           sunbird
 Version:        0.7
-Release:        9%{?official:.official}%{?dist}
+Release:        10%{?official:.official}%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
@@ -273,6 +273,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Lubomir Kundrak  0.7-10
+- Parallel builds were giving non-predictable builds. Disable them.
+
 * Thu Feb 28 2008 Lubomir Kundrak  0.7-9
 - Try to use the correct locale (#436693)
 



From fedora-extras-commits at redhat.com  Sun Mar  9 21:53:53 2008
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Sun, 9 Mar 2008 21:53:53 GMT
Subject: rpms/sunbird/EL-5 sunbird.spec,1.2.2.1,1.2.2.2
Message-ID: <200803092153.m29Lrraq032367@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32339

Modified Files:
      Tag: sunbird-0_7-10_nonparallel1
	sunbird.spec 
Log Message:
actually do the change


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/EL-5/sunbird.spec,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- sunbird.spec	9 Mar 2008 21:33:51 -0000	1.2.2.1
+++ sunbird.spec	9 Mar 2008 21:53:16 -0000	1.2.2.2
@@ -93,7 +93,6 @@
 mk_add_options BUILD_OFFICIAL=1
 ac_add_options --enable-official-branding
 %endif
-mk_add_options MOZ_MAKE_FLAGS=%{?_smp_mflags}
 ac_add_options --enable-application=calendar
 ac_add_options --prefix=%{_prefix}
 ac_add_options --libdir=%{_libdir}



From fedora-extras-commits at redhat.com  Sun Mar  9 22:04:23 2008
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 9 Mar 2008 22:04:23 GMT
Subject: rpms/xulrunner/devel .cvsignore, 1.35, 1.36 sources, 1.36,
	1.37 xulrunner.spec, 1.88, 1.89
Message-ID: <200803092204.m29M4NWF007235@cvs-int.fedora.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
* Fri Mar  7 2008 Christopher Aillon  1.9-0.beta4.36
- Update to latest trunk (2008-03-07)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	8 Mar 2008 04:08:38 -0000	1.35
+++ .cvsignore	9 Mar 2008 22:03:49 -0000	1.36
@@ -1 +1 @@
-mozilla-20080307.tar.bz2
+mozilla-20080309.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	8 Mar 2008 04:08:38 -0000	1.36
+++ sources	9 Mar 2008 22:03:49 -0000	1.37
@@ -1 +1 @@
-fca1862f707adea24792d8f00241fba6  mozilla-20080307.tar.bz2
+bcb090a222651dd712fd79f4b3058daf  mozilla-20080309.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- xulrunner.spec	8 Mar 2008 05:50:05 -0000	1.88
+++ xulrunner.spec	9 Mar 2008 22:03:49 -0000	1.89
@@ -7,14 +7,14 @@
 %define version_internal  1.9pre
 
 %if ! %{official_branding}
-%define cvsdate 20080307
-%define nightly .nightly%{cvsdate}
+%define cvsdate 20080309
+%define nightly .cvs%{cvsdate}
 %endif
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.beta4.36%{?nightly}%{?dist}
+Release:        0.37%{?nightly}%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -400,6 +400,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Sun Mar  9 2008 Christopher Aillon  1.0-0.37
+- Update to latest trunk (2008-03-09)
+
 * Fri Mar  7 2008 Christopher Aillon  1.9-0.beta4.36
 - Update to latest trunk (2008-03-07)
 



From fedora-extras-commits at redhat.com  Sun Mar  9 22:04:56 2008
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 9 Mar 2008 22:04:56 GMT
Subject: rpms/firefox/devel .cvsignore, 1.65, 1.66 firefox.spec, 1.270,
	1.271 sources, 1.76, 1.77
Message-ID: <200803092204.m29M4uN4007293@cvs-int.fedora.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Sun Mar  9 2008 Christopher Aillon  3.0-0.37
- Update to latest trunk (2008-03-09)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	8 Mar 2008 04:08:51 -0000	1.65
+++ .cvsignore	9 Mar 2008 22:04:20 -0000	1.66
@@ -1 +1 @@
-mozilla-20080307.tar.bz2
+mozilla-20080309.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- firefox.spec	8 Mar 2008 04:08:51 -0000	1.270
+++ firefox.spec	9 Mar 2008 22:04:20 -0000	1.271
@@ -7,20 +7,19 @@
 %define mozappdir 		%{_libdir}/%{name}-%{version_internal}
 
 %define gecko_version	1.9
-%define xulrunner_version 1.9-0.beta4.36
 
 %define official_branding    0
 %define build_langpacks      0
 
 %if ! %{official_branding}
-%define cvsdate 20080307
-%define nightly .nightly%{cvsdate}
+%define cvsdate 20080309
+%define nightly .cvs%{cvsdate}
 %endif
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.0
-Release:        0.beta4.36%{?nightly}%{?dist}
+Release:        0.37%{?nightly}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -72,7 +71,7 @@
 BuildRequires:  gecko-devel-unstable >= %{gecko_version}
 
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
-Requires:       xulrunner >= %{xulrunner_version}
+Requires:       xulrunner >= %{gecko_version}-%{release}
 Requires:       system-bookmarks
 Obsoletes:      mozilla <= 37:1.7.13
 Provides:       webclient
@@ -315,6 +314,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Sun Mar  9 2008 Christopher Aillon  3.0-0.37
+- Update to latest trunk (2008-03-09)
+
 * Fri Mar  7 2008 Christopher Aillon  3.0-0.beta4.36
 - Update to latest trunk (2008-03-07)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	8 Mar 2008 04:08:51 -0000	1.76
+++ sources	9 Mar 2008 22:04:20 -0000	1.77
@@ -1 +1 @@
-fca1862f707adea24792d8f00241fba6  mozilla-20080307.tar.bz2
+bcb090a222651dd712fd79f4b3058daf  mozilla-20080309.tar.bz2



From fedora-extras-commits at redhat.com  Sun Mar  9 22:39:07 2008
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 9 Mar 2008 22:39:07 GMT
Subject: rpms/xfce4-dict-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-dict-plugin.spec, 1.6, 1.7
Message-ID: <200803092239.m29Md7Nm007721@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dict-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7697

Modified Files:
	.cvsignore sources xfce4-dict-plugin.spec 
Log Message:
* Sun Mar 09 2008 Christoph Wickert  - 0.3.0-1
- Update to 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict-plugin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Jan 2007 11:30:00 -0000	1.3
+++ .cvsignore	9 Mar 2008 22:38:34 -0000	1.4
@@ -1 +1 @@
-xfce4-dict-plugin-0.2.1.tar.bz2
+xfce4-dict-plugin-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2007 11:30:00 -0000	1.3
+++ sources	9 Mar 2008 22:38:34 -0000	1.4
@@ -1 +1 @@
-2ef7f110883a9d9316fd06a1c2a327da  xfce4-dict-plugin-0.2.1.tar.bz2
+5745be80e6e755412bca9c129e35bd70  xfce4-dict-plugin-0.3.0.tar.gz


Index: xfce4-dict-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict-plugin/devel/xfce4-dict-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-dict-plugin.spec	18 Feb 2008 23:45:39 -0000	1.6
+++ xfce4-dict-plugin.spec	9 Mar 2008 22:38:34 -0000	1.7
@@ -1,12 +1,12 @@
 Name:		xfce4-dict-plugin
-Version:	0.2.1
-Release:	4%{?dist}
+Version:	0.3.0
+Release:	1%{?dist}
 Summary:	A Xfce panel plugin to query a Dict server
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.90.2
@@ -44,11 +44,15 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
+%{_bindir}/xfce4-popup-dict
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
 %{_datadir}/icons/hicolor/scalable/apps/dict-icon.svg
 
 %changelog
+* Sun Mar 09 2008 Christoph Wickert  - 0.3.0-1
+- Update to 0.3.0
+
 * Mon Feb 18 2008 Fedora Release Engineering  - 0.2.1-4
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Sun Mar  9 23:01:23 2008
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Sun, 9 Mar 2008 23:01:23 GMT
Subject: rpms/gnomeradio/devel gnomeradio.spec,1.7,1.8
Message-ID: <200803092301.m29N1Nji015278@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/gnomeradio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8106

Modified Files:
	gnomeradio.spec 
Log Message:
- prepare to disable ppc* builds in case bug #435771 is not fixed in time


Index: gnomeradio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomeradio/devel/gnomeradio.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnomeradio.spec	9 Mar 2008 11:36:10 -0000	1.7
+++ gnomeradio.spec	9 Mar 2008 23:00:46 -0000	1.8
@@ -23,6 +23,8 @@
 Requires(post): GConf2
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
+# missing gnome-media(-devel) (bug #435771)
+ExcludeArch: ppc ppc64
 
 %description
 Gnomeradio is a FM-radio tuner for the GNOME desktop. It should work with
@@ -106,7 +108,7 @@
 
 %changelog
 * Sun Mar 09 2008 Dominik Mierzejewski  - 1.7-6
-- rebuild against new libgnome-media-profiles
+- disable ppc*, because of missing gnome-media(-devel) (bug #435771)
 
 * Sat Feb 23 2008 Dominik Mierzejewski  - 1.7-5
 - backport some segfault fixes from SVN



From fedora-extras-commits at redhat.com  Sun Mar  9 23:30:02 2008
From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb))
Date: Sun, 9 Mar 2008 23:30:02 GMT
Subject: rpms/audit/devel .cvsignore, 1.88, 1.89 audit.spec, 1.164,
	1.165 sources, 1.110, 1.111
Message-ID: <200803092330.m29NU2YO015873@cvs-int.fedora.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15837

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Sun Mar 09 2008 Steve Grubb  1.6.9-1
- Apply hidden attribute cleanup patch (Miloslav Trmac)
- Apply auparse expression interface patch (Miloslav Trmac)
- Fix potential memleak in audit event dispatcher
- Update system-config-audit to version 0.4.6 (Miloslav Trmac)
- audisp-prelude alerts now controlled by config file
- Updated syscall table for 2.6.25 kernel
- Apply patch correcting acct field being misencoded (Miloslav Trmac)
- Added watched account login detection for prelude plugin



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore	14 Feb 2008 19:51:04 -0000	1.88
+++ .cvsignore	9 Mar 2008 23:29:28 -0000	1.89
@@ -85,3 +85,4 @@
 audit-1.6.6.tar.gz
 audit-1.6.7.tar.gz
 audit-1.6.8.tar.gz
+audit-1.6.9.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- audit.spec	25 Feb 2008 11:27:40 -0000	1.164
+++ audit.spec	9 Mar 2008 23:29:28 -0000	1.165
@@ -1,12 +1,12 @@
-%define sca_version 0.4.5
-%define sca_release 10
+%define sca_version 0.4.6
+%define sca_release 1
 %define selinux_variants mls strict targeted
 %define selinux_policyver 3.2.5 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.6.8
+Version: 1.6.9
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -239,11 +239,12 @@
 %{_includedir}/auparse.h
 %{_includedir}/auparse-defs.h
 %{_mandir}/man3/*
+%{_mandir}/man5/ausearch-expression.5.gz
 
 %files libs-python
 %defattr(-,root,root)
-%{_libdir}/python?.?/site-packages/_audit.so
-%{_libdir}/python?.?/site-packages/auparse.so
+%attr(755,root,root) %{_libdir}/python?.?/site-packages/_audit.so
+%attr(755,root,root) %{_libdir}/python?.?/site-packages/auparse.so
 %{_libdir}/python?.?/site-packages/auparse-*.egg-info
 %{python_sitelib}/audit.py*
 
@@ -288,7 +289,9 @@
 %attr(750,root,root) /sbin/audispd-zos-remote
 %attr(644,root,root) %{_datadir}/selinux/*/audispd-zos-remote.pp
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/au-prelude.conf
+%config(noreplace) %attr(640,root,root) /etc/audisp/audisp-prelude.conf
 %attr(750,root,root) /sbin/audisp-prelude
+%attr(644,root,root) %{_mandir}/man5/audisp-prelude.conf.5.gz
 %attr(644,root,root) %{_mandir}/man8/audisp-prelude.8.gz
 
 %files -n system-config-audit -f system-config-audit.lang
@@ -307,6 +310,16 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Sun Mar 09 2008 Steve Grubb  1.6.9-1
+- Apply hidden attribute cleanup patch (Miloslav Trmac)
+- Apply auparse expression interface patch (Miloslav Trmac)
+- Fix potential memleak in audit event dispatcher
+- Update system-config-audit to version 0.4.6 (Miloslav Trmac)
+- audisp-prelude alerts now controlled by config file
+- Updated syscall table for 2.6.25 kernel
+- Apply patch correcting acct field being misencoded (Miloslav Trmac)
+- Added watched account login detection for prelude plugin
+
 * Thu Feb 14 2008 Steve Grubb  1.6.8-1
 - Update for gcc 4.3
 - Cleanup descriptors in audispd before running plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- sources	14 Feb 2008 19:51:04 -0000	1.110
+++ sources	9 Mar 2008 23:29:28 -0000	1.111
@@ -1 +1 @@
-67cd6d2995bbb0a8b3c37ce484d758f5  audit-1.6.8.tar.gz
+7e055793c057883f39b10d8ba783de98  audit-1.6.9.tar.gz



From fedora-extras-commits at redhat.com  Sun Mar  9 23:49:28 2008
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Sun, 9 Mar 2008 23:49:28 GMT
Subject: rpms/gnome-settings-daemon/devel
	gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.12, 1.13
Message-ID: <200803092349.m29NnSHt016200@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16166

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch 
Log Message:
- Don't set keyboard model on startup from gconf if evdev is being used.
  Evdev needs to use its own keyboard model to work right.


gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch:

--- NEW FILE gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch ---
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index a633167..7896d85 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -152,6 +152,12 @@ apply_xkb_settings (void)
 
         gkbd_keyboard_config_load_from_x_current (¤t_sys_kbd_config,
                                                   NULL);
+        /* Ignore model if using evdev, since evdev needs its own model
+         */
+        if (strcmp (initial_sys_kbd_config.model, "evdev") == 0) {
+                g_free (current_kbd_config.model);
+                current_kbd_config.model = g_strdup ("evdev");
+        }
         /* Activate - only if different! */
         if (!gkbd_keyboard_config_equals
             (¤t_kbd_config, ¤t_sys_kbd_config)) {


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-settings-daemon.spec	2 Mar 2008 22:21:35 -0000	1.12
+++ gnome-settings-daemon.spec	9 Mar 2008 23:48:54 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.21.92
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -29,6 +29,7 @@
 BuildRequires:	perl(XML::Parser)
 
 Patch1:         add-randr-12.patch
+Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -49,6 +50,7 @@
 %setup -q
 
 %patch1 -p1 -b .add-randr-12
+%patch2 -p1 -b .ignore-layout-if-using-evdev
 
 %build
 %configure --enable-static=no
@@ -123,6 +125,10 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Sun Mar  9 2008 Ray Strode  - 2.21.92-3
+- Don't set keyboard model on startup from gconf if evdev is being used.
+  Evdev needs to use its own keyboard model to work right.
+
 * Sun Mar  2 2008 Soren Sandmann  - 2.21.92-2
 - Update randr patch to handle video key
 



From fedora-extras-commits at redhat.com  Mon Mar 10 00:24:29 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 10 Mar 2008 00:24:29 GMT
Subject: rpms/kdelibs/devel kdelibs-4.0.2-no-cache-kdeglobals-paths.patch,
	NONE, 1.1 kdelibs.spec, 1.289, 1.290
Message-ID: <200803100024.m2A0OTvk023767@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23743/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.2-no-cache-kdeglobals-paths.patch 
Log Message:
* Mon Mar 10 2008 Kevin Kofler  4.0.2-9
- fix kdeglobals not being found in profile (e.g. kde-settings) directory

kdelibs-4.0.2-no-cache-kdeglobals-paths.patch:

--- NEW FILE kdelibs-4.0.2-no-cache-kdeglobals-paths.patch ---
diff -ur kdelibs-4.0.2/kdecore/config/kconfig.cpp kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig.cpp
--- kdelibs-4.0.2/kdecore/config/kconfig.cpp	2008-01-05 01:00:39.000000000 +0100
+++ kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig.cpp	2008-03-09 23:58:41.000000000 +0100
@@ -60,12 +60,6 @@
 {
     sGlobalFileName = componentData.dirs()->saveLocation("config") +
                           QString::fromLatin1("kdeglobals");
-    if (wantGlobals()) {
-        const KStandardDirs *const dirs = componentData.dirs();
-        foreach(const QString& dir, dirs->findAllResources("config", QLatin1String("kdeglobals")) +
-                                    dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
-            globalFiles.push_front(dir);
-    }
     const QString etc_kderc =
 #ifdef Q_WS_WIN
         QFile::decodeName( QByteArray(::getenv("WINDIR")) + "\\kde4rc" );
@@ -75,15 +69,11 @@
     KEntryMap tmp;
     // first entry is always /etc/kderc or empty if cannot read
     if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
-        if (!globalFiles.contains(etc_kderc))
-            globalFiles.push_front(etc_kderc);
-
         if (!mappingsRegistered) {
             KSharedPtr backend = KConfigBackend::create(componentData, etc_kderc, QLatin1String("INI"));
             backend->parseConfig( "en_US", tmp, KConfigBackend::ParseDefaults);
         }
     } else {
-        globalFiles.push_front(QString());
         mappingsRegistered = true;
     }
 
@@ -372,10 +362,31 @@
 
 void KConfigPrivate::parseGlobalFiles()
 {
+    QStringList globalFiles;
+
+    if (wantGlobals()) {
+        const KStandardDirs *const dirs = componentData.dirs();
+        foreach(const QString& dir, dirs->findAllResources("config", QLatin1String("kdeglobals")) +
+                                    dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
+            globalFiles.push_front(dir);
+    }
+    const QString etc_kderc =
+#ifdef Q_WS_WIN
+        QFile::decodeName( QByteArray(::getenv("WINDIR")) + "\\kde4rc" );
+#else
+        QLatin1String("/etc/kde4rc");
+#endif
+    KEntryMap tmp;
+    // first entry is always /etc/kderc or empty if cannot read
+    if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
+        if (!globalFiles.contains(etc_kderc))
+            globalFiles.push_front(etc_kderc);
+    } else {
+        globalFiles.push_front(QString());
+    }
+
 //    qDebug() << "parsing global files" << globalFiles;
 
-    // TODO: can we cache the values in etc_kderc / other global files
-    //       on a per-application basis?
     const QByteArray utf8Locale = locale.toUtf8();
     foreach(const QString& file, globalFiles) {
         KConfigBackend::ParseOptions parseOpts = KConfigBackend::ParseGlobal|KConfigBackend::ParseExpansions;
diff -ur kdelibs-4.0.2/kdecore/config/kconfig_p.h kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig_p.h
--- kdelibs-4.0.2/kdecore/config/kconfig_p.h	2008-01-05 01:00:39.000000000 +0100
+++ kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig_p.h	2008-03-09 23:50:26.000000000 +0100
@@ -82,7 +82,6 @@
 
     KEntryMap entryMap;
     QString backendType;
-    QStringList globalFiles;
     QStack extraFiles;
 
     QString locale;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- kdelibs.spec	7 Mar 2008 20:57:11 -0000	1.289
+++ kdelibs.spec	10 Mar 2008 00:23:52 -0000	1.290
@@ -3,7 +3,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -65,6 +65,9 @@
 Patch8: kdelibs-4.0.2-install-all-css.patch
 # add Fedora/V-R to KHTML UA string
 Patch9: kdelibs-4.0.2-branding.patch
+# don't cache kdeglobals paths because they change after profile directories
+# are loaded from kde4rc
+Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
 
 # upstream patches
 Patch100: kdelibs-4.0.x-kio.patch
@@ -178,6 +181,7 @@
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
+%patch10 -p1 -b .no-cache-kdeglobals-paths
 
 # upstream patches
 %patch100 -p1 -b .kio
@@ -332,6 +336,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Kevin Kofler  4.0.2-9
+- fix kdeglobals not being found in profile (e.g. kde-settings) directory
+
 * Fri Mar 07 2008 Rex Dieter  4.0.2-8
 - touchup KDE_DISTRIBUTION_TEXT
 - add Fedora/V-R to KHTML UA string (thanks caillon)



From fedora-extras-commits at redhat.com  Mon Mar 10 00:27:36 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 10 Mar 2008 00:27:36 GMT
Subject: rpms/kdelibs4/F-7 kdelibs-4.0.2-no-cache-kdeglobals-paths.patch,
	NONE, 1.1 kdelibs4.spec, 1.12, 1.13
Message-ID: <200803100027.m2A0Ra5n023938@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23879/F-7

Modified Files:
	kdelibs4.spec 
Added Files:
	kdelibs-4.0.2-no-cache-kdeglobals-paths.patch 
Log Message:
Sync from kdelibs/devel:

* Mon Mar 10 2008 Kevin Kofler  4.0.2-9
- fix kdeglobals not being found in profile (e.g. kde-settings) directory

kdelibs-4.0.2-no-cache-kdeglobals-paths.patch:

--- NEW FILE kdelibs-4.0.2-no-cache-kdeglobals-paths.patch ---
diff -ur kdelibs-4.0.2/kdecore/config/kconfig.cpp kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig.cpp
--- kdelibs-4.0.2/kdecore/config/kconfig.cpp	2008-01-05 01:00:39.000000000 +0100
+++ kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig.cpp	2008-03-09 23:58:41.000000000 +0100
@@ -60,12 +60,6 @@
 {
     sGlobalFileName = componentData.dirs()->saveLocation("config") +
                           QString::fromLatin1("kdeglobals");
-    if (wantGlobals()) {
-        const KStandardDirs *const dirs = componentData.dirs();
-        foreach(const QString& dir, dirs->findAllResources("config", QLatin1String("kdeglobals")) +
-                                    dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
-            globalFiles.push_front(dir);
-    }
     const QString etc_kderc =
 #ifdef Q_WS_WIN
         QFile::decodeName( QByteArray(::getenv("WINDIR")) + "\\kde4rc" );
@@ -75,15 +69,11 @@
     KEntryMap tmp;
     // first entry is always /etc/kderc or empty if cannot read
     if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
-        if (!globalFiles.contains(etc_kderc))
-            globalFiles.push_front(etc_kderc);
-
         if (!mappingsRegistered) {
             KSharedPtr backend = KConfigBackend::create(componentData, etc_kderc, QLatin1String("INI"));
             backend->parseConfig( "en_US", tmp, KConfigBackend::ParseDefaults);
         }
     } else {
-        globalFiles.push_front(QString());
         mappingsRegistered = true;
     }
 
@@ -372,10 +362,31 @@
 
 void KConfigPrivate::parseGlobalFiles()
 {
+    QStringList globalFiles;
+
+    if (wantGlobals()) {
+        const KStandardDirs *const dirs = componentData.dirs();
+        foreach(const QString& dir, dirs->findAllResources("config", QLatin1String("kdeglobals")) +
+                                    dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
+            globalFiles.push_front(dir);
+    }
+    const QString etc_kderc =
+#ifdef Q_WS_WIN
+        QFile::decodeName( QByteArray(::getenv("WINDIR")) + "\\kde4rc" );
+#else
+        QLatin1String("/etc/kde4rc");
+#endif
+    KEntryMap tmp;
+    // first entry is always /etc/kderc or empty if cannot read
+    if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
+        if (!globalFiles.contains(etc_kderc))
+            globalFiles.push_front(etc_kderc);
+    } else {
+        globalFiles.push_front(QString());
+    }
+
 //    qDebug() << "parsing global files" << globalFiles;
 
-    // TODO: can we cache the values in etc_kderc / other global files
-    //       on a per-application basis?
     const QByteArray utf8Locale = locale.toUtf8();
     foreach(const QString& file, globalFiles) {
         KConfigBackend::ParseOptions parseOpts = KConfigBackend::ParseGlobal|KConfigBackend::ParseExpansions;
diff -ur kdelibs-4.0.2/kdecore/config/kconfig_p.h kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig_p.h
--- kdelibs-4.0.2/kdecore/config/kconfig_p.h	2008-01-05 01:00:39.000000000 +0100
+++ kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig_p.h	2008-03-09 23:50:26.000000000 +0100
@@ -82,7 +82,6 @@
 
     KEntryMap entryMap;
     QString backendType;
-    QStringList globalFiles;
     QStack extraFiles;
 
     QString locale;


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/kdelibs4.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdelibs4.spec	8 Mar 2008 18:52:54 -0000	1.12
+++ kdelibs4.spec	10 Mar 2008 00:27:03 -0000	1.13
@@ -3,7 +3,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -65,6 +65,9 @@
 Patch8: kdelibs-4.0.2-install-all-css.patch
 # add Fedora/V-R to KHTML UA string
 Patch9: kdelibs-4.0.2-branding.patch
+# don't cache kdeglobals paths because they change after profile directories
+# are loaded from kde4rc
+Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
 
 # upstream patches
 Patch100: kdelibs-4.0.x-kio.patch
@@ -178,6 +181,7 @@
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
+%patch10 -p1 -b .no-cache-kdeglobals-paths
 
 # upstream patches
 %patch100 -p1 -b .kio
@@ -332,6 +336,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Kevin Kofler  4.0.2-9
+- fix kdeglobals not being found in profile (e.g. kde-settings) directory
+
 * Fri Mar 07 2008 Rex Dieter  4.0.2-8
 - touchup KDE_DISTRIBUTION_TEXT
 - add Fedora/V-R to KHTML UA string (thanks caillon)



From fedora-extras-commits at redhat.com  Mon Mar 10 00:27:39 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 10 Mar 2008 00:27:39 GMT
Subject: rpms/kdelibs4/F-8 kdelibs-4.0.2-no-cache-kdeglobals-paths.patch,
	NONE, 1.1 kdelibs4.spec, 1.12, 1.13
Message-ID: <200803100027.m2A0Rdm6023941@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23879/F-8

Modified Files:
	kdelibs4.spec 
Added Files:
	kdelibs-4.0.2-no-cache-kdeglobals-paths.patch 
Log Message:
Sync from kdelibs/devel:

* Mon Mar 10 2008 Kevin Kofler  4.0.2-9
- fix kdeglobals not being found in profile (e.g. kde-settings) directory

kdelibs-4.0.2-no-cache-kdeglobals-paths.patch:

--- NEW FILE kdelibs-4.0.2-no-cache-kdeglobals-paths.patch ---
diff -ur kdelibs-4.0.2/kdecore/config/kconfig.cpp kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig.cpp
--- kdelibs-4.0.2/kdecore/config/kconfig.cpp	2008-01-05 01:00:39.000000000 +0100
+++ kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig.cpp	2008-03-09 23:58:41.000000000 +0100
@@ -60,12 +60,6 @@
 {
     sGlobalFileName = componentData.dirs()->saveLocation("config") +
                           QString::fromLatin1("kdeglobals");
-    if (wantGlobals()) {
-        const KStandardDirs *const dirs = componentData.dirs();
-        foreach(const QString& dir, dirs->findAllResources("config", QLatin1String("kdeglobals")) +
-                                    dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
-            globalFiles.push_front(dir);
-    }
     const QString etc_kderc =
 #ifdef Q_WS_WIN
         QFile::decodeName( QByteArray(::getenv("WINDIR")) + "\\kde4rc" );
@@ -75,15 +69,11 @@
     KEntryMap tmp;
     // first entry is always /etc/kderc or empty if cannot read
     if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
-        if (!globalFiles.contains(etc_kderc))
-            globalFiles.push_front(etc_kderc);
-
         if (!mappingsRegistered) {
             KSharedPtr backend = KConfigBackend::create(componentData, etc_kderc, QLatin1String("INI"));
             backend->parseConfig( "en_US", tmp, KConfigBackend::ParseDefaults);
         }
     } else {
-        globalFiles.push_front(QString());
         mappingsRegistered = true;
     }
 
@@ -372,10 +362,31 @@
 
 void KConfigPrivate::parseGlobalFiles()
 {
+    QStringList globalFiles;
+
+    if (wantGlobals()) {
+        const KStandardDirs *const dirs = componentData.dirs();
+        foreach(const QString& dir, dirs->findAllResources("config", QLatin1String("kdeglobals")) +
+                                    dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
+            globalFiles.push_front(dir);
+    }
+    const QString etc_kderc =
+#ifdef Q_WS_WIN
+        QFile::decodeName( QByteArray(::getenv("WINDIR")) + "\\kde4rc" );
+#else
+        QLatin1String("/etc/kde4rc");
+#endif
+    KEntryMap tmp;
+    // first entry is always /etc/kderc or empty if cannot read
+    if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
+        if (!globalFiles.contains(etc_kderc))
+            globalFiles.push_front(etc_kderc);
+    } else {
+        globalFiles.push_front(QString());
+    }
+
 //    qDebug() << "parsing global files" << globalFiles;
 
-    // TODO: can we cache the values in etc_kderc / other global files
-    //       on a per-application basis?
     const QByteArray utf8Locale = locale.toUtf8();
     foreach(const QString& file, globalFiles) {
         KConfigBackend::ParseOptions parseOpts = KConfigBackend::ParseGlobal|KConfigBackend::ParseExpansions;
diff -ur kdelibs-4.0.2/kdecore/config/kconfig_p.h kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig_p.h
--- kdelibs-4.0.2/kdecore/config/kconfig_p.h	2008-01-05 01:00:39.000000000 +0100
+++ kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig_p.h	2008-03-09 23:50:26.000000000 +0100
@@ -82,7 +82,6 @@
 
     KEntryMap entryMap;
     QString backendType;
-    QStringList globalFiles;
     QStack extraFiles;
 
     QString locale;


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdelibs4.spec	8 Mar 2008 18:52:57 -0000	1.12
+++ kdelibs4.spec	10 Mar 2008 00:27:06 -0000	1.13
@@ -3,7 +3,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -65,6 +65,9 @@
 Patch8: kdelibs-4.0.2-install-all-css.patch
 # add Fedora/V-R to KHTML UA string
 Patch9: kdelibs-4.0.2-branding.patch
+# don't cache kdeglobals paths because they change after profile directories
+# are loaded from kde4rc
+Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
 
 # upstream patches
 Patch100: kdelibs-4.0.x-kio.patch
@@ -178,6 +181,7 @@
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
+%patch10 -p1 -b .no-cache-kdeglobals-paths
 
 # upstream patches
 %patch100 -p1 -b .kio
@@ -332,6 +336,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Kevin Kofler  4.0.2-9
+- fix kdeglobals not being found in profile (e.g. kde-settings) directory
+
 * Fri Mar 07 2008 Rex Dieter  4.0.2-8
 - touchup KDE_DISTRIBUTION_TEXT
 - add Fedora/V-R to KHTML UA string (thanks caillon)



From fedora-extras-commits at redhat.com  Mon Mar 10 00:28:26 2008
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Mon, 10 Mar 2008 00:28:26 GMT
Subject: rpms/uncrustify/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 uncrustify.spec, 1.8, 1.9
Message-ID: <200803100028.m2A0SQhp023984@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/uncrustify/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23947

Modified Files:
	.cvsignore sources uncrustify.spec 
Log Message:
Update to 0.45



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	13 Feb 2008 23:56:00 -0000	1.7
+++ .cvsignore	10 Mar 2008 00:27:49 -0000	1.8
@@ -1 +1 @@
-uncrustify-0.44.tgz
+uncrustify-0.45.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Feb 2008 23:56:00 -0000	1.7
+++ sources	10 Mar 2008 00:27:49 -0000	1.8
@@ -1 +1 @@
-4dce868af8ec620fa7a2e958aa6cbf8f  uncrustify-0.44.tgz
+10f769992f3dd3f228d728d0f6cac4a2  uncrustify-0.45.tgz


Index: uncrustify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/devel/uncrustify.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- uncrustify.spec	13 Feb 2008 23:56:00 -0000	1.8
+++ uncrustify.spec	10 Mar 2008 00:27:49 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		uncrustify
-Version:	0.44
+Version:	0.45
 Release: 	1%{?dist}
 Summary:	Reformat Source
 
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Sun Mar  9 2008 Neal Becker  - 0.45-1
+- Update to 0.45
+
 * Wed Feb 13 2008 Neal Becker  - 0.44-1
 - Update to 0.44
 



From fedora-extras-commits at redhat.com  Mon Mar 10 00:32:59 2008
From: fedora-extras-commits at redhat.com (Xavier Bachelot (xavierb))
Date: Mon, 10 Mar 2008 00:32:59 GMT
Subject: rpms/xorg-x11-drv-openchrome/devel
	openchrome-0.2.901-libpciaccess.patch, 1.7,
	1.8 xorg-x11-drv-openchrome.spec, 1.16, 1.17
Message-ID: <200803100032.m2A0WxR0024163@cvs-int.fedora.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24140

Modified Files:
	openchrome-0.2.901-libpciaccess.patch 
	xorg-x11-drv-openchrome.spec 
Log Message:
- Revert to last good version of the libpciaccess patch.

openchrome-0.2.901-libpciaccess.patch:

Index: openchrome-0.2.901-libpciaccess.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.901-libpciaccess.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openchrome-0.2.901-libpciaccess.patch	8 Mar 2008 20:36:47 -0000	1.7
+++ openchrome-0.2.901-libpciaccess.patch	10 Mar 2008 00:32:56 -0000	1.8
@@ -187,11 +187,11 @@
 +++ src/via_id.c	2008-03-06 22:25:29.000000000 +0100
 @@ -30,6 +30,7 @@
  #endif
- 
+
  #include "via_driver.h"
 +#include "via.h"
  #include "via_id.h"
- 
+
  /*
 @@ -218,15 +218,15 @@
      struct ViaCardIdStruct *Id;
@@ -222,8 +222,9 @@
      pVia->Id = NULL;
  }
  
+diff -Naur src/via_driver.c src/via_driver.c
 --- src/via_driver.c	2008-01-02 18:58:40.000000000 +0100
-+++ src/via_driver.c	2008-03-07 22:39:15.000000000 +0100
++++ src/via_driver.c	2008-01-10 12:37:37.000000000 +0100
 @@ -50,7 +50,30 @@
  
  /* Prototypes. */
@@ -434,52 +435,158 @@
      }
  
      if (pVia->Chipset == VIA_CLE266)
-@@ -968,18 +1081,33 @@
-     switch (pVia->Chipset) {
-         case VIA_CLE266:
-         case VIA_KM400:
+@@ -961,52 +1074,6 @@
+ 
+     xf86DrvMsg(pScrn->scrnIndex, from, "Chipset revision: %d\n", pVia->ChipRev);
+ 
+-    xfree(pEnt);
+-
+-    /* Detect the amount of installed RAM */
+-    from = X_PROBED;
+-    switch (pVia->Chipset) {
+-        case VIA_CLE266:
+-        case VIA_KM400:
+-            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ;
+-            break;
+-        case VIA_PM800:
+-        case VIA_VM800:
+-        case VIA_K8M800:
+-            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ;
+-            break;
+-        case VIA_K8M890:
+-        case VIA_P4M890:
+-        case VIA_P4M900:
+-        case VIA_CX700:
+-            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ;
+-            break;
+-        default:
+-            if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) {
+-                xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+-                           "Using old memory-detection method.\n");
+-                bMemSize = hwp->readSeq(hwp, 0x39);
+-                if (bMemSize > 16 && bMemSize <= 128)
+-                    pScrn->videoRam = (bMemSize + 1) << 9;
+-                else if (bMemSize > 0 && bMemSize < 31)
+-                    pScrn->videoRam = bMemSize << 12;
+-                else {
+-                    from = X_DEFAULT;
+-                    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+-                               "Memory size detection failed: using 16 MB.\n");
+-                    pScrn->videoRam = 16 << 10;
+-                }
+-            } else {
+-                from = X_DEFAULT;
+-                xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+-                           "No memory-detection done.  Use VideoRAM option.\n");
+-            }
+-    }
+-
+-    if (from == X_PROBED)
+-        xf86DrvMsg(pScrn->scrnIndex, from,
+-                   "Probed amount of VideoRAM = %d kB\n", pScrn->videoRam);
+-
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
+ 	       "Setting up default chipset options...\n");
+     if (!VIASetupDefaultOptions(pScrn)) {
+@@ -1019,9 +1086,16 @@
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
+ 	       "Starting to parse config file options...\n");
+ 
+-    if (xf86GetOptValInteger(VIAOptions, OPTION_VIDEORAM, &pScrn->videoRam))
+-        xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-                   "Setting amount of VideoRAM to %d kB\n", pScrn->videoRam);
++    pScrn->videoRam = pEnt->device->videoRam;
++    from = xf86GetOptValInteger(VIAOptions, OPTION_VIDEORAM,
++				&pScrn->videoRam) ? 
++	X_CONFIG : X_PROBED;
++    xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM is set to %d kB\n",
++               pScrn->videoRam);
++    if (pScrn->videoRam != pEnt->device->videoRam)
++        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++                   "Detected VideoRAM was %d kB!\n", pEnt->device->videoRam);
++    xfree(pEnt);
+ 
+     //pVia->shadowFB = FALSE;
+     from = xf86GetOptValBool(VIAOptions, OPTION_SHADOW_FB, &pVia->shadowFB) ? 
+@@ -1378,8 +1452,10 @@
+ 
+     /* maybe throw in some more sanity checks here */
+ 
++#if !XSERVER_LIBPCIACCESS
+     pVia->PciTag = pciTag(pVia->PciInfo->bus, pVia->PciInfo->device,
+                           pVia->PciInfo->func);
++#endif
+ 
+     if (!VIAMapMMIO(pScrn)) {
+ 	VIAFreeRec(pScrn);
+@@ -1440,6 +1518,66 @@
+         return FALSE;
+     }
+ 
++    from = X_PROBED;
++
++    /* Detect the amount of installed RAM */
++    switch (pVia->Chipset) {
++        case VIA_CLE266:
++        case VIA_KM400:
 +#if XSERVER_LIBPCIACCESS
 +            pci_device_cfg_read_u32 (bridge, & pScrn->videoRam, 0xE1);
 +            pScrn->videoRam = (1 << ( ( pScrn->videoRam & 0x70) >> 4 )) << 10 ;
 +#else
-             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ;
++            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ;
++            break;
 +#endif
-             break;
-         case VIA_PM800:
-         case VIA_VM800:
-         case VIA_K8M800:
++        case VIA_PM800:
++        case VIA_VM800:
++        case VIA_K8M800:
 +#if XSERVER_LIBPCIACCESS
 +            pci_device_cfg_read_u32 (bridge, & pScrn->videoRam, 0xA1);
 +            pScrn->videoRam = (1 << ( ( pScrn->videoRam & 0x70) >> 4 )) << 10 ;
 +#else
-             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ;
++            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ;
++            break;
 +#endif
-             break;
-         case VIA_K8M890:
-         case VIA_P4M890:
-         case VIA_P4M900:
-         case VIA_CX700:
++        case VIA_K8M890:
++        case VIA_P4M890:
++        case VIA_P4M900:
++        case VIA_CX700:
 +#if XSERVER_LIBPCIACCESS
 +            pci_device_cfg_read_u32 (bridge, & pScrn->videoRam, 0xA1);
 +            pScrn->videoRam = (1 << ( ( pScrn->videoRam & 0x70) >> 4 )) << 12 ;
 +#else
-             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ;
++            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ;
++            break;
 +#endif
-             break;
-         default:
-             if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) {
-@@ -1378,8 +1506,10 @@
- 
-     /* maybe throw in some more sanity checks here */
- 
-+#if !XSERVER_LIBPCIACCESS
-     pVia->PciTag = pciTag(pVia->PciInfo->bus, pVia->PciInfo->device,
-                           pVia->PciInfo->func);
-+#endif
- 
-     if (!VIAMapMMIO(pScrn)) {
- 	VIAFreeRec(pScrn);
-@@ -2046,26 +2176,74 @@
++        default:
++            if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) {
++                xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++                          "Using old memory-detection method.\n");
++                bMemSize = hwp->readSeq(hwp, 0x39);
++                if (bMemSize > 16 && bMemSize <= 128)
++                    pScrn->videoRam = (bMemSize + 1) << 9;
++                else if (bMemSize > 0 && bMemSize < 31)
++                    pScrn->videoRam = bMemSize << 12;
++                else {
++                    from = X_DEFAULT;
++                    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++                               "Memory size detection failed: using 16 MB.\n");
++                    pScrn->videoRam = 16 << 10;
++                }
++            } else {
++                from = X_DEFAULT;
++                xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++                          "No memory-detection done.  Use VideoRAM option.\n");
++            }
++    }
++
++    if (from == X_PROBED)
++        xf86DrvMsg(pScrn->scrnIndex, from, "Probed VideoRAM = %d kB\n",
++                   pScrn->videoRam);
++
+     /* Split FB for SAMM */
+     /* FIXME: For now, split FB into two equal sections. This should
+      *        be able to be adjusted by user with a config option. */
+@@ -2046,26 +2183,74 @@
  VIAMapMMIO(ScrnInfoPtr pScrn)
  {
      VIAPtr pVia = VIAPTR(pScrn);
@@ -559,7 +666,7 @@
  
      if (!pVia->MapBase || !pVia->BltBase) {
          xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -2111,6 +2289,9 @@
+@@ -2111,6 +2296,9 @@
  VIAMapFB(ScrnInfoPtr pScrn)
  {
      VIAPtr pVia = VIAPTR(pScrn);
@@ -569,7 +676,7 @@
  
      DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAMapFB\n"));
      xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-@@ -2125,6 +2306,7 @@
+@@ -2125,6 +2313,7 @@
  	 * in the OS support layer.
  	 */
  
@@ -577,7 +684,7 @@
          unsigned char *tmp; 
          tmp = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
  			    pVia->PciTag, pVia->FrameBufferBase,
-@@ -2143,10 +2325,24 @@
+@@ -2143,10 +2332,24 @@
          xf86UnMapVidMem(pScrn->scrnIndex, (pointer)tmp,
                          pVia->videoRambytes);
  
@@ -602,7 +709,7 @@
          pVia->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
                                       pVia->PciTag, pVia->FrameBufferBase,
                                       pVia->videoRambytes);
-@@ -2156,6 +2352,7 @@
+@@ -2156,6 +2359,7 @@
                         "Internal error: could not map framebuffer\n");
              return FALSE;
          }
@@ -610,7 +717,7 @@
  
          pVia->FBFreeStart = (pScrn->displayWidth * pScrn->bitsPerPixel >> 3) *
                              pScrn->virtualY;
-@@ -2166,7 +2363,11 @@
+@@ -2166,7 +2370,11 @@
                     pVia->FBBase, pVia->FBFreeStart, pVia->FBFreeEnd);
      }
  
@@ -622,7 +729,7 @@
      pScrn->fbOffset = 0;
      if(pVia->IsSecondary) pScrn->fbOffset = pScrn->videoRam << 10;
  
-@@ -2184,6 +2385,16 @@
+@@ -2184,6 +2392,16 @@
      /* Disable MMIO */
      ViaSeqMask(VGAHWPTR(pScrn), 0x1A, 0x00, 0x60);
  
@@ -639,7 +746,7 @@
      if (pVia->MapBase)
          xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pVia->MapBase, VIA_MMIO_REGSIZE);
  
-@@ -2192,6 +2403,7 @@
+@@ -2192,6 +2410,7 @@
  
      if (pVia->FBBase)
          xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pVia->FBBase, pVia->videoRambytes);


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-openchrome.spec	9 Mar 2008 18:06:00 -0000	1.16
+++ xorg-x11-drv-openchrome.spec	10 Mar 2008 00:32:56 -0000	1.17
@@ -9,7 +9,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.901
-Release:	13%{?dist}
+Release:	14%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -22,7 +22,6 @@
 Patch2:         openchrome-0.2.901-replace_xf86memcpy.patch
 Patch3:         openchrome-0.2.901-P4M900_fifo_settings.patch
 Patch4:         openchrome-0.2.901-VM800_xv_LCD.patch
-Patch5:         openchrome-0.2.901-old_memory_detection.patch
 ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pkgconfig
@@ -62,7 +61,6 @@
 %patch2 -p0 -b .xf86memcpy
 %patch3 -p0 -b .P4M900_fifo
 %patch4 -p0 -b .VM800_xv_LCD
-%patch5 -p0 -R -b .old_memory-detection
 
 %build
 autoreconf
@@ -111,6 +109,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Xavier Bachelot  - 0.2.901-14
+- Revert to last good version of the libpciaccess patch.
+
 * Sun Mar 09 2008 Xavier Bachelot  - 0.2.901-13
 - Temporarily revert to old memory detection method. We need something that
   works out of the box for F9 Beta.



From fedora-extras-commits at redhat.com  Mon Mar 10 00:37:58 2008
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Mon, 10 Mar 2008 00:37:58 GMT
Subject: rpms/uncrustify/devel uncrustify.spec,1.9,1.10
Message-ID: <200803100037.m2A0bwr6024287@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/uncrustify/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24261

Modified Files:
	uncrustify.spec 
Log Message:
Add docs



Index: uncrustify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/devel/uncrustify.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- uncrustify.spec	10 Mar 2008 00:27:49 -0000	1.9
+++ uncrustify.spec	10 Mar 2008 00:37:21 -0000	1.10
@@ -26,7 +26,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
+install -m644 documentation/uncrustify.1 $RPM_BUILD_ROOT/%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -37,7 +38,7 @@
 %doc COPYING AUTHORS README NEWS BUGS
 %{_bindir}/uncrustify
 %{_datadir}/uncrustify
-
+%{_mandir}/man1/uncrustify.1*
 
 
 %changelog



From fedora-extras-commits at redhat.com  Mon Mar 10 00:39:18 2008
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Mon, 10 Mar 2008 00:39:18 GMT
Subject: rpms/uncrustify/F-8 uncrustify.spec,1.8,1.9
Message-ID: <200803100039.m2A0dI9I024366@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/uncrustify/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24343

Modified Files:
	uncrustify.spec 
Log Message:
Update to 0.45
Add docs



Index: uncrustify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-8/uncrustify.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- uncrustify.spec	13 Feb 2008 23:58:12 -0000	1.8
+++ uncrustify.spec	10 Mar 2008 00:38:44 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		uncrustify
-Version:	0.44
+Version:	0.45
 Release: 	1%{?dist}
 Summary:	Reformat Source
 
@@ -26,7 +26,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
+install -m644 documentation/uncrustify.1 $RPM_BUILD_ROOT/%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -37,10 +38,13 @@
 %doc COPYING AUTHORS README NEWS BUGS
 %{_bindir}/uncrustify
 %{_datadir}/uncrustify
-
+%{_mandir}/man1/uncrustify.1*
 
 
 %changelog
+* Sun Mar  9 2008 Neal Becker  - 0.45-1
+- Update to 0.45
+
 * Wed Feb 13 2008 Neal Becker  - 0.44-1
 - Update to 0.44
 



From fedora-extras-commits at redhat.com  Mon Mar 10 00:41:00 2008
From: fedora-extras-commits at redhat.com (Neal Becker (nbecker))
Date: Mon, 10 Mar 2008 00:41:00 GMT
Subject: rpms/uncrustify/F-7 uncrustify.spec,1.5,1.6
Message-ID: <200803100041.m2A0f0MA024452@cvs-int.fedora.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/uncrustify/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24425

Modified Files:
	uncrustify.spec 
Log Message:
Update to 0.45
Add docs



Index: uncrustify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-7/uncrustify.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- uncrustify.spec	13 Feb 2008 23:59:26 -0000	1.5
+++ uncrustify.spec	10 Mar 2008 00:40:23 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		uncrustify
-Version:	0.44
+Version:	0.45
 Release: 	1%{?dist}
 Summary:	Reformat Source
 
@@ -26,7 +26,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
+install -m644 documentation/uncrustify.1 $RPM_BUILD_ROOT/%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -37,10 +38,13 @@
 %doc COPYING AUTHORS README NEWS BUGS
 %{_bindir}/uncrustify
 %{_datadir}/uncrustify
-
+%{_mandir}/man1/uncrustify.1*
 
 
 %changelog
+* Sun Mar  9 2008 Neal Becker  - 0.45-1
+- Update to 0.45
+
 * Wed Feb 13 2008 Neal Becker  - 0.44-1
 - Update to 0.44
 



From fedora-extras-commits at redhat.com  Mon Mar 10 00:48:43 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 10 Mar 2008 00:48:43 GMT
Subject: rpms/kde-settings/F-7 kde-settings.spec,1.15,1.16
Message-ID: <200803100048.m2A0mhui024616@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-settings/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24596/F-7

Modified Files:
	kde-settings.spec 
Log Message:
* Mon Mar 10 2008 Kevin Kofler  3.5-30.4
- revert #431398 fix (only a bandaid, doesn't fix underlying problem)


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-7/kde-settings.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kde-settings.spec	9 Mar 2008 19:59:58 -0000	1.15
+++ kde-settings.spec	10 Mar 2008 00:48:05 -0000	1.16
@@ -4,7 +4,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 3.5
-Release: %{rel}%{?dist}.3
+Release: %{rel}%{?dist}.4
 
 Group:   System Environment/Base
 License: Public Domain
@@ -38,7 +38,6 @@
 Requires: redhat-artwork
 %endif
 Requires: xorg-x11-xdm
-Requires: xorg-x11-xfs
 %description kdm
 %{summary}.
 
@@ -117,6 +116,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Kevin Kofler  3.5-30.4
+- revert #431398 fix (only a bandaid, doesn't fix underlying problem)
+
 * Sun Mar 09 2008 Kevin Kofler  3.5-30.3
 - symlink /etc/kderc to /etc/kde4rc
 



From fedora-extras-commits at redhat.com  Mon Mar 10 01:21:53 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 01:21:53 GMT
Subject: rpms/xorg-x11-drv-ark/devel ark-pciaccess.patch, NONE,
	1.1 xorg-x11-drv-ark.spec, 1.17, 1.18
Message-ID: <200803100121.m2A1Lri8032396@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ark/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32271

Modified Files:
	xorg-x11-drv-ark.spec 
Added Files:
	ark-pciaccess.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  - 0.6.0-8
- Rebuild with pciaccess fixes.


ark-pciaccess.patch:

--- NEW FILE ark-pciaccess.patch ---
commit c87ab37ba6b06d81f024800f776cd20ff5a3a5b1
Author: Dave Airlie 
Date:   Mon Mar 10 10:13:42 2008 +1000

    ark: add basic pciaccess support

diff --git a/configure.ac b/configure.ac
index 87a7472..71a35cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,10 +62,23 @@ AC_SUBST([CFLAGS])
 AC_SUBST([INCLUDES])
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
 
 # Checks for header files.
 AC_HEADER_STDC
 
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
+
 DRIVER_NAME=ark
 AC_SUBST([DRIVER_NAME])
 
diff --git a/src/ark.h b/src/ark.h
index eed1553..fbbef48 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -27,8 +27,12 @@ typedef struct _ARKRegRec {
 
 
 typedef struct _ARKRec {
+#ifndef XSERVER_LIBPCIACCESS	
 	pciVideoPtr		PciInfo;
 	PCITAG			PciTag;
+#else
+	struct pci_device       *PciInfo;
+#endif
 	EntityInfoPtr		pEnt;
 	CARD32			IOAddress;
 	CARD32			FBAddress;
diff --git a/src/ark_driver.c b/src/ark_driver.c
index e5ee7e5..24418ff 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -366,7 +366,11 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
 		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipID override: 0x%04X\n",
 			   pARK->Chipset);
 	} else {
+#ifndef XSERVER_LIBPCIACCESS
 		pARK->Chipset = pARK->PciInfo->chipType;
+#else
+		pARK->Chipset = pARK->PciInfo->device_id;
+#endif
 		pScrn->chipset = (char *)xf86TokenToString(ARKChipsets,
 							   pARK->Chipset);
 	}
@@ -375,15 +379,21 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
 		pARK->ChipRev = pEnt->device->chipRev;
 		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
 			   pARK->ChipRev);
-	} else
+	} else {
+#ifndef XSERVER_LIBPCIACCESS
 		pARK->ChipRev = pARK->PciInfo->chipRev;
-
+#else
+		pARK->ChipRev = pARK->PciInfo->revision;
+#endif
+	}
 	xfree(pEnt);
 
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Chipset: \"%s\"\n", pScrn->chipset);
 
+#ifndef XSERVER_LIBPCIACCESS
 	pARK->PciTag = pciTag(pARK->PciInfo->bus, pARK->PciInfo->device,
 			      pARK->PciInfo->func);
+#endif
 
 	/* unlock CRTC[0-7] */
 	outb(hwp->PIOOffset + hwp->IOBase + 4, 0x11);
@@ -1048,12 +1058,32 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
 	/* extended to cover MMIO space at 0xB8000 */
 	hwp->MapSize = 0x20000;
 
+#ifndef XSERVER_LIBPCIACCESS
 	pARK->MMIOBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO,
 					     pARK->PciTag, 0xb8000, 0x8000);
 
 	pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
 				     pARK->PciTag, pARK->FBAddress,
 				     pScrn->videoRam * 1024);
+#else
+
+	pARK->MMIOBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO,
+					     pARK->PciInfo, 0xb8000, 0x8000);
+
+	{
+		void** result = (void**)&pARK->FBBase;
+		int err = pci_device_map_range(pARK->PciInfo,
+					       pARK->FBAddress,
+					       pScrn->videoRam * 1024,
+					       PCI_DEV_MAP_FLAG_WRITABLE |
+					       PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+					       result);
+		
+		if (err) 
+			return FALSE;
+	}
+#endif
+
 	if (!pARK->FBBase) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 			   "Cound not map framebuffer\n");
@@ -1071,8 +1101,12 @@ static void ARKUnmapMem(ScrnInfoPtr pScrn)
 	/* XXX vgaHWMapMem() isn't called explicitly, so is this correct? */
 	vgaHWUnmapMem(pScrn);
 
+#ifndef XSERVER_LIBPCIACCESS
 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pARK->FBBase,
 			pScrn->videoRam * 1024);
+#else
+	pci_device_unmap_range(pARK->PciInfo, pARK->FBBase, pScrn->videoRam * 1024);
+#endif
 }
 
 


Index: xorg-x11-drv-ark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ark/devel/xorg-x11-drv-ark.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-ark.spec	20 Feb 2008 07:08:14 -0000	1.17
+++ xorg-x11-drv-ark.spec	10 Mar 2008 01:21:18 -0000	1.18
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ark video driver
 Name:      xorg-x11-drv-ark
 Version:   0.6.0
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,8 +14,11 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ark.xinf
 
+Patch0: ark-pciaccess.patch
+
 ExcludeArch: s390 s390x
 
+BuildRequires: automake autoconf libtool
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
 Requires:  hwdata
@@ -27,7 +30,10 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .pciaccess
+
 %build
+autoreconf -v --install
 %configure --disable-static
 make
 
@@ -51,6 +57,9 @@
 %{_datadir}/hwdata/videoaliases/ark.xinf
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  - 0.6.0-8
+- Rebuild with pciaccess fixes.
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 0.6.0-7
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 02:02:03 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 02:02:03 GMT
Subject: rpms/xorg-x11-drv-ast/devel ast-pciaccess.patch, NONE,
	1.1 xorg-x11-drv-ast.spec, 1.9, 1.10
Message-ID: <200803100202.m2A223FL008085@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ast/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv873

Modified Files:
	xorg-x11-drv-ast.spec 
Added Files:
	ast-pciaccess.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  0.81.0-8
- pciaccess conversion


ast-pciaccess.patch:

--- NEW FILE ast-pciaccess.patch ---
diff --git a/configure.ac b/configure.ac
index 61b7a39..52af4cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-ast],
-        0.81.0,
+        0.84.7,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-ast)
 
@@ -58,10 +58,22 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
 
 # Checks for header files.
 AC_HEADER_STDC
 
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
 
diff --git a/src/ast.h b/src/ast.h
index e1f0426..cc878e9 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -23,10 +23,13 @@
 #include 
 #include 
 
+#include "ast_pcirename.h"
+
 /* Compiler Options */
 #define	Accel_2D
 /* #define MMIO_2D */
 #define HWC
+/* #define PATCH_ABI_VERSION */
 
 /* Vendor & Device Info */
 #ifndef PCI_VENDOR_AST
@@ -37,12 +40,18 @@
 #define PCI_CHIP_AST2000		0x2000		
 #endif
 
+typedef enum _CHIP_ID {
+    VGALegacy,
+    AST2000,
+    AST2100	
+} CHIP_ID;
+
 /* AST REC Info */
 #define AST_NAME 			"AST"
 #define AST_DRIVER_NAME 		"ast"
-#define AST_MAJOR_VERSION 		0
-#define AST_MINOR_VERSION 		81
-#define AST_PATCH_VERSION		0
+#define AST_MAJOR_VERSION 		PACKAGE_VERSION_MAJOR
+#define AST_MINOR_VERSION 		PACKAGE_VERSION_MINOR
+#define AST_PATCH_VERSION		PACKAGE_VERSION_PATCHLEVEL
 #define AST_VERSION	\
         ((AST_MAJOR_VERSION << 20) | (AST_MINOR_VERSION << 10) | AST_PATCH_VERSION)
 
@@ -54,6 +63,9 @@
 #define CMD_QUEUE_GUARD_BAND    	0x00000020
 #define DEFAULT_HWC_NUM			0x00000002
 
+/* Patch Info */
+#define ABI_VIDEODRV_VERSION_PATCH	SET_ABI_VERSION(0, 5)
+
 /* Data Type Definition */
 typedef INT32  		LONG;
 typedef CARD8   	UCHAR;
@@ -120,8 +132,12 @@ typedef struct {
 typedef struct _ASTRec {
 	
     EntityInfoPtr 	pEnt;
-    pciVideoPtr 	PciInfo;
-    PCITAG 		PciTag;
+#ifndef XSERVER_LIBPCIACCESS	
+	pciVideoPtr		PciInfo;
+	PCITAG			PciTag;
+#else
+	struct pci_device       *PciInfo;
+#endif
 
     OptionInfoPtr 	Options;
     DisplayModePtr      ModePtr;		    
@@ -132,6 +148,8 @@ typedef struct _ASTRec {
 
     CloseScreenProcPtr CloseScreen;
     ScreenBlockHandlerProcPtr BlockHandler;
+
+    UCHAR		jChipType;
              
     Bool 		noAccel;
     Bool 		noHWC;
diff --git a/src/ast_2dtool.h b/src/ast_2dtool.h
index 193d3cd..b6ca79d 100644
--- a/src/ast_2dtool.h
+++ b/src/ast_2dtool.h
@@ -61,23 +61,28 @@ typedef struct  _PKT_SC
 } PKT_SC, *PPKT_SC;
 
 /* Eng Reg. Limitation */
-#define	MAX_SRC_PITCH				0x1FFF
-#define	MAX_DST_PITCH				0x1FFF
-#define	MAX_DST_HEIGHT				0x7FF
 #define	MAX_SRC_X				0x7FF
 #define	MAX_SRC_Y				0x7FF
 #define	MAX_DST_X				0x7FF
 #define	MAX_DST_Y				0x7FF
-#define	MAX_RECT_WIDTH				0x7FF
-#define	MAX_RECT_HEIGHT				0x7FF
-#define MAX_CLIP				0xFFF
 
-#define MAX_LINE_X        			0x7FF   
-#define MAX_LINE_Y           			0x7FF
-#define MAX_LINE_ERR   				0x3FFFFF        
-#define MAX_LINE_WIDTH   			0x7FF        
-#define MAX_LINE_K1				0x3FFFFF           
-#define MAX_LINE_K2				0x3FFFFF
+#define	MASK_SRC_PITCH				0x1FFF
+#define	MASK_DST_PITCH				0x1FFF
+#define	MASK_DST_HEIGHT				0x7FF
+#define	MASK_SRC_X				0xFFF
+#define	MASK_SRC_Y				0xFFF
+#define	MASK_DST_X				0xFFF
+#define	MASK_DST_Y				0xFFF
+#define	MASK_RECT_WIDTH				0x7FF
+#define	MASK_RECT_HEIGHT			0x7FF
+#define MASK_CLIP				0xFFF
+
+#define MASK_LINE_X        			0xFFF   
+#define MASK_LINE_Y           			0xFFF
+#define MASK_LINE_ERR   			0x3FFFFF        
+#define MASK_LINE_WIDTH   			0x7FF        
+#define MASK_LINE_K1				0x3FFFFF           
+#define MASK_LINE_K2				0x3FFFFF
 
 #define MAX_PATReg_Size				256
 
@@ -195,10 +200,10 @@ typedef struct _LINEPARAM {
 
 typedef struct {
 	
-    ULONG X1;
-    ULONG Y1;
-    ULONG X2;
-    ULONG Y2;	
+    LONG X1;
+    LONG Y1;
+    LONG X2;
+    LONG Y2;	
     
 } _LINEInfo;
 
@@ -208,91 +213,91 @@ typedef struct {
       { \
         do { \
            *(ULONG *)(MMIOREG_SRC_BASE) = (ULONG) (base); \
-        } while (*(ULONG *)(MMIOREG_SRC_BASE) != (ULONG) (base)); \
+        } while (*(volatile ULONG *)(MMIOREG_SRC_BASE) != (ULONG) (base)); \
       }
 #define ASTSetupSRCPitch_MMIO(pitch) \
       { \
         do { \
            *(ULONG *)(MMIOREG_SRC_PITCH) = (ULONG)(pitch << 16); \
-        } while (*(ULONG *)(MMIOREG_SRC_PITCH) != (ULONG)(pitch << 16)); \
+        } while (*(volatile ULONG *)(MMIOREG_SRC_PITCH) != (ULONG)(pitch << 16)); \
       }
 #define ASTSetupDSTBase_MMIO(base) \
       { \
         do { \
            *(ULONG *)(MMIOREG_DST_BASE) = (ULONG)(base); \
-        } while (*(ULONG *)(MMIOREG_DST_BASE) != (ULONG)(base)); \
+        } while (*(volatile ULONG *)(MMIOREG_DST_BASE) != (ULONG)(base)); \
       }      
 #define ASTSetupDSTPitchHeight_MMIO(pitch, height) \
       { \
         ULONG dstpitch; \
-        dstpitch = (ULONG)((pitch << 16) + ((height) & MAX_DST_HEIGHT)); \
+        dstpitch = (ULONG)((pitch << 16) + ((height) & MASK_DST_HEIGHT)); \
         do { \
            *(ULONG *)(MMIOREG_DST_PITCH) = dstpitch; \
-        } while (*(ULONG *)(MMIOREG_DST_PITCH) != dstpitch); \
+        } while (*(volatile ULONG *)(MMIOREG_DST_PITCH) != dstpitch); \
       }      
 #define ASTSetupDSTXY_MMIO(x, y) \
       { \
         ULONG dstxy; \
-        dstxy = (ULONG)(((x & MAX_DST_X) << 16) + (y & MAX_DST_Y)); \
+        dstxy = (ULONG)(((x & MASK_DST_X) << 16) + (y & MASK_DST_Y)); \
         do { \
            *(ULONG *)(MMIOREG_DST_XY) = dstxy; \
-        } while (*(ULONG *)(MMIOREG_DST_XY) != dstxy); \
+        } while (*(volatile ULONG *)(MMIOREG_DST_XY) != dstxy); \
       }           
 #define ASTSetupSRCXY_MMIO(x, y) \
       { \
         ULONG srcxy; \
-        srcxy = (ULONG)(((x & MAX_SRC_X) << 16) + (y & MAX_SRC_Y)); \
+        srcxy = (ULONG)(((x & MASK_SRC_X) << 16) + (y & MASK_SRC_Y)); \
         do { \
            *(ULONG *)(MMIOREG_SRC_XY) = srcxy; \
-        } while (*(ULONG *)(MMIOREG_SRC_XY) != srcxy); \
+        } while (*(volatile ULONG *)(MMIOREG_SRC_XY) != srcxy); \
       }             
 #define ASTSetupRECTXY_MMIO(x, y) \
       { \
         ULONG rectxy; \
-        rectxy = (ULONG)(((x & MAX_RECT_WIDTH) << 16) + (y & MAX_RECT_WIDTH)); \
+        rectxy = (ULONG)(((x & MASK_RECT_WIDTH) << 16) + (y & MASK_RECT_WIDTH)); \
         do { \
            *(ULONG *)(MMIOREG_RECT_XY) = rectxy; \
-        } while (*(ULONG *)(MMIOREG_RECT_XY) != rectxy); \
+        } while (*(volatile ULONG *)(MMIOREG_RECT_XY) != rectxy); \
       }  
 #define ASTSetupFG_MMIO(color) \
       { \
         do { \
            *(ULONG *)(MMIOREG_FG) = (ULONG)(color); \
-        } while (*(ULONG *)(MMIOREG_FG) != (ULONG)(color)); \
+        } while (*(volatile ULONG *)(MMIOREG_FG) != (ULONG)(color)); \
       } 
 #define ASTSetupBG_MMIO(color) \
       { \
         do { \
            *(ULONG *)(MMIOREG_BG) = (ULONG)(color); \
-        } while (*(ULONG *)(MMIOREG_BG) != (ULONG)(color)); \
+        } while (*(volatile ULONG *)(MMIOREG_BG) != (ULONG)(color)); \
       }
 #define ASTSetupMONO1_MMIO(pat) \
       { \
         do { \
           *(ULONG *)(MMIOREG_MONO1) = (ULONG)(pat); \
-        } while (*(ULONG *)(MMIOREG_MONO1) != (ULONG)(pat)); \
+        } while (*(volatile ULONG *)(MMIOREG_MONO1) != (ULONG)(pat)); \
       } 
 #define ASTSetupMONO2_MMIO(pat) \
       { \
         do { \
           *(ULONG *)(MMIOREG_MONO2) = (ULONG)(pat); \
-        } while (*(ULONG *)(MMIOREG_MONO2) != (ULONG)(pat)); \
+        } while (*(volatile ULONG *)(MMIOREG_MONO2) != (ULONG)(pat)); \
       }
 #define ASTSetupCLIP1_MMIO(left, top) \
       { \
        ULONG clip1; \
-       clip1 = (ULONG)(((left & MAX_CLIP) << 16) + (top & MAX_CLIP)); \
+       clip1 = (ULONG)(((left & MASK_CLIP) << 16) + (top & MASK_CLIP)); \
        do { \
           *(ULONG *)(MMIOREG_CLIP1) = clip1; \
-       } while (*(ULONG *)(MMIOREG_CLIP1) != clip1); \
+       } while (*(volatile ULONG *)(MMIOREG_CLIP1) != clip1); \
       } 
 #define ASTSetupCLIP2_MMIO(right, bottom) \
       { \
        ULONG clip2; \
-       clip2 = (ULONG)(((right & MAX_CLIP) << 16) + (bottom & MAX_CLIP)); \
+       clip2 = (ULONG)(((right & MASK_CLIP) << 16) + (bottom & MASK_CLIP)); \
        do { \
           *(ULONG *)(MMIOREG_CLIP2) = clip2; \
-       } while (*(ULONG *)(MMIOREG_CLIP2) != clip2); \
+       } while (*(volatile ULONG *)(MMIOREG_CLIP2) != clip2); \
       }                                                                                               
 #define ASTSetupCMDReg_MMIO(reg) \
       { \
@@ -302,57 +307,57 @@ typedef struct {
       { \
        do { \
           *(ULONG *)(MMIOREG_PAT + patreg*4) = (ULONG)(pat); \
-       } while (*(ULONG *)(MMIOREG_PAT + patreg*4) != (ULONG)(pat)); \
+       } while (*(volatile ULONG *)(MMIOREG_PAT + patreg*4) != (ULONG)(pat)); \
       }      
                                 
 /* Line CMD */
 #define ASTSetupLineXY_MMIO(x, y) \
       { \
         ULONG linexy; \
-        linexy = (ULONG)(((x & MAX_LINE_X) << 16) + (y & MAX_LINE_Y)); \
+        linexy = (ULONG)(((x & MASK_LINE_X) << 16) + (y & MASK_LINE_Y)); \
         do { \
            *(ULONG *)(MMIOREG_LINE_XY) = linexy; \
-        } while (*(ULONG *)(MMIOREG_LINE_XY) != linexy); \
+        } while (*(volatile ULONG *)(MMIOREG_LINE_XY) != linexy); \
       }
 #define ASTSetupLineXMErrTerm_MMIO(xm, err) \
       { \
         ULONG lineerr; \
-        lineerr = (ULONG)((xm << 24) + (err & MAX_LINE_ERR)); \
+        lineerr = (ULONG)((xm << 24) + (err & MASK_LINE_ERR)); \
         do { \
            *(ULONG *)(MMIOREG_LINE_Err) = lineerr; \
-        } while (*(ULONG *)(MMIOREG_LINE_Err) != lineerr); \
+        } while (*(volatile ULONG *)(MMIOREG_LINE_Err) != lineerr); \
       }      
 #define ASTSetupLineWidth_MMIO(width) \
       { \
         ULONG linewidth; \
-        linewidth = (ULONG)((width & MAX_LINE_WIDTH) << 16); \
+        linewidth = (ULONG)((width & MASK_LINE_WIDTH) << 16); \
         do { \
           *(ULONG *)(MMIOREG_LINE_WIDTH) = linewidth; \
-        } while (*(ULONG *)(MMIOREG_LINE_WIDTH) != linewidth); \
+        } while (*(volatile ULONG *)(MMIOREG_LINE_WIDTH) != linewidth); \
       }
 #define ASTSetupLineK1Term_MMIO(err) \
       { \
         do { \
-          *(ULONG *)(MMIOREG_LINE_K1) = (ULONG)(err & MAX_LINE_K1); \
-        } while (*(ULONG *)(MMIOREG_LINE_K1) != (ULONG)(err & MAX_LINE_K1)); \
+          *(ULONG *)(MMIOREG_LINE_K1) = (ULONG)(err & MASK_LINE_K1); \
+        } while (*(volatile ULONG *)(MMIOREG_LINE_K1) != (ULONG)(err & MASK_LINE_K1)); \
       }            
 #define ASTSetupLineK2Term_MMIO(err) \
       { \
         do { \
-           *(ULONG *)(MMIOREG_LINE_K2) = (ULONG)(err & MAX_LINE_K2); \
-        } while (*(ULONG *)(MMIOREG_LINE_K2) != (ULONG)(err & MAX_LINE_K2)); \
+           *(ULONG *)(MMIOREG_LINE_K2) = (ULONG)(err & MASK_LINE_K2); \
+        } while (*(volatile ULONG *)(MMIOREG_LINE_K2) != (ULONG)(err & MASK_LINE_K2)); \
       }
 #define ASTSetupLineStyle1_MMIO(pat) \
       { \
         do { \
            *(ULONG *)(MMIOREG_LINE_STYLE1) = (ULONG)(pat); \
-        } while (*(ULONG *)(MMIOREG_LINE_STYLE1) != (ULONG)(pat)); \
+        } while (*(volatile ULONG *)(MMIOREG_LINE_STYLE1) != (ULONG)(pat)); \
       } 
 #define ASTSetupLineStyle2_MMIO(pat) \
       { \
         do { \
           *(ULONG *)(MMIOREG_LINE_STYLE2) = (ULONG)(pat); \
-        } while (*(ULONG *)(MMIOREG_LINE_STYLE2) != (ULONG)(pat)); \
+        } while (*(volatile ULONG *)(MMIOREG_LINE_STYLE2) != (ULONG)(pat)); \
       }     
                                 
 /* CMDQ Mode Macro */ 
@@ -377,22 +382,22 @@ typedef struct {
 #define ASTSetupDSTPitchHeight(addr, pitch, height) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_DST_PITCH); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)((pitch << 16) + ((height) & MAX_DST_HEIGHT));					\
+        addr->PKT_SC_dwData[0] = (ULONG)((pitch << 16) + ((height) & MASK_DST_HEIGHT));					\
       }      
 #define ASTSetupDSTXY(addr, x, y) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_DST_XY); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)(((x & MAX_DST_X) << 16) + (y & MAX_DST_Y));					\
+        addr->PKT_SC_dwData[0] = (ULONG)(((x & MASK_DST_X) << 16) + (y & MASK_DST_Y));					\
       }           
 #define ASTSetupSRCXY(addr, x, y) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_SRC_XY); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)(((x & MAX_SRC_X) << 16) + (y & MAX_SRC_Y));					\
+        addr->PKT_SC_dwData[0] = (ULONG)(((x & MASK_SRC_X) << 16) + (y & MASK_SRC_Y));					\
       }             
 #define ASTSetupRECTXY(addr, x, y) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_RECT_XY); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)(((x & MAX_RECT_WIDTH) << 16) + (y & MAX_RECT_WIDTH));					\
+        addr->PKT_SC_dwData[0] = (ULONG)(((x & MASK_RECT_WIDTH) << 16) + (y & MASK_RECT_WIDTH));					\
       }  
 #define ASTSetupFG(addr, color) \
       { \
@@ -417,12 +422,12 @@ typedef struct {
 #define ASTSetupCLIP1(addr, left, top) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_CLIP1); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)(((left & MAX_CLIP) << 16) + (top & MAX_CLIP));	\
+        addr->PKT_SC_dwData[0] = (ULONG)(((left & MASK_CLIP) << 16) + (top & MASK_CLIP));	\
       }            
 #define ASTSetupCLIP2(addr, right, bottom) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_CLIP2); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)(((right & MAX_CLIP) << 16) + (bottom & MAX_CLIP));	\
+        addr->PKT_SC_dwData[0] = (ULONG)(((right & MASK_CLIP) << 16) + (bottom & MASK_CLIP));	\
       }                                                                                                    
 #define ASTSetupCMDReg(addr, reg) \
       { \
@@ -439,27 +444,27 @@ typedef struct {
 #define ASTSetupLineXY(addr, x, y) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_XY); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)(((x & MAX_LINE_X) << 16) + (y & MAX_LINE_Y));					\
+        addr->PKT_SC_dwData[0] = (ULONG)(((x & MASK_LINE_X) << 16) + (y & MASK_LINE_Y));					\
       }
 #define ASTSetupLineXMErrTerm(addr, xm, err) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_Err); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)((xm << 24) + (err & MAX_LINE_ERR));					\
+        addr->PKT_SC_dwData[0] = (ULONG)((xm << 24) + (err & MASK_LINE_ERR));					\
       }      
 #define ASTSetupLineWidth(addr, width) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_WIDTH); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)((width & MAX_LINE_WIDTH) << 16);				\
+        addr->PKT_SC_dwData[0] = (ULONG)((width & MASK_LINE_WIDTH) << 16);				\
       }            
 #define ASTSetupLineK1Term(addr, err) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_K1); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)(err & MAX_LINE_K1);				\
+        addr->PKT_SC_dwData[0] = (ULONG)(err & MASK_LINE_K1);				\
       }            
 #define ASTSetupLineK2Term(addr, err) \
       { \
         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_K2); 	\
-        addr->PKT_SC_dwData[0] = (ULONG)(err & MAX_LINE_K2);				\
+        addr->PKT_SC_dwData[0] = (ULONG)(err & MASK_LINE_K2);				\
       }     
 #define ASTSetupLineStyle1(addr, pat) \
       { \
diff --git a/src/ast_accel.c b/src/ast_accel.c
index 689235e..1ef3095 100644
--- a/src/ast_accel.c
+++ b/src/ast_accel.c
@@ -256,7 +256,6 @@ ASTAccelInit(ScreenPtr pScreen)
         infoPtr->ClippingFlags = HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY 	|
                 		 HARDWARE_CLIP_MONO_8x8_FILL		|
                 		 HARDWARE_CLIP_COLOR_8x8_FILL	 	|
-                		 HARDWARE_CLIP_SOLID_FILL		|     
                 		 HARDWARE_CLIP_SOLID_LINE 		| 
                 		 HARDWARE_CLIP_DASHED_LINE 		| 
                 		 HARDWARE_CLIP_SOLID_LINE; 
@@ -338,11 +337,13 @@ ASTSubsequentScreenToScreenCopy(ScrnInfoPtr pScrn, int x1, int y1, int x2,
 /*
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentScreenToScreenCopy\n");
 */
-
+        
     /* Modify Reg. Value */
     cmdreg = pAST->ulCMDReg;
     if (pAST->EnableClip)
         cmdreg |= CMD_ENABLE_CLIP;
+    else
+        cmdreg &= ~CMD_ENABLE_CLIP;            
     srcbase = dstbase = 0;
 
     if (y1 >= MAX_SRC_Y)
@@ -479,7 +480,9 @@ ASTSubsequentSolidFillRect(ScrnInfoPtr pScrn,
     /* Modify Reg. Value */
     cmdreg = pAST->ulCMDReg;
     if (pAST->EnableClip)
-        cmdreg |= CMD_ENABLE_CLIP;    
+        cmdreg |= CMD_ENABLE_CLIP;
+    else
+        cmdreg &= ~CMD_ENABLE_CLIP;               
     dstbase = 0;
 
     if (dst_y >= pScrn->virtualY) 
@@ -587,7 +590,9 @@ static void ASTSubsequentSolidHorVertLine(ScrnInfoPtr pScrn,
     /* Modify Reg. Value */
     cmdreg = (pAST->ulCMDReg & (~CMD_MASK)) | CMD_BITBLT;
     if (pAST->EnableClip)
-        cmdreg |= CMD_ENABLE_CLIP;    
+        cmdreg |= CMD_ENABLE_CLIP;
+    else
+        cmdreg &= ~CMD_ENABLE_CLIP;            
     dstbase = 0;
     
     if(dir == DEGREES_0) {			/* horizontal */
@@ -659,6 +664,8 @@ static void ASTSubsequentSolidTwoPointLine(ScrnInfoPtr pScrn,
         ulCommand &= ~CMD_NOT_DRAW_LAST_PIXEL;
     if (pAST->EnableClip)
         ulCommand |= CMD_ENABLE_CLIP;
+    else
+        ulCommand &= ~CMD_ENABLE_CLIP;        
     dstbase = 0;
     miny = (y1 > y2) ? y2 : y1;
     maxy = (y1 > y2) ? y1 : y2;
@@ -667,7 +674,7 @@ static void ASTSubsequentSolidTwoPointLine(ScrnInfoPtr pScrn,
         y1 -= miny;
         y2 -= miny;
     }
-    
+     
     LineInfo.X1 = x1;
     LineInfo.Y1 = y1;
     LineInfo.X2 = x2;
@@ -703,6 +710,9 @@ static void ASTSubsequentSolidTwoPointLine(ScrnInfoPtr pScrn,
               
         /* Update Write Pointer */
         mUpdateWritePointer;                
+
+        /* Patch KDE pass abnormal point, ycchen at 052507 */
+        vWaitEngIdle(pScrn, pAST);
         
     }
     else
@@ -814,6 +824,8 @@ ASTSubsequentDashedTwoPointLine(ScrnInfoPtr pScrn,
         ulCommand &= ~CMD_NOT_DRAW_LAST_PIXEL;
     if (pAST->EnableClip)
         ulCommand |= CMD_ENABLE_CLIP;
+    else
+        ulCommand &= ~CMD_ENABLE_CLIP;          
     dstbase = 0;        
     miny = (y1 > y2) ? y2 : y1;
     maxy = (y1 > y2) ? y1 : y2;
@@ -822,7 +834,7 @@ ASTSubsequentDashedTwoPointLine(ScrnInfoPtr pScrn,
         y1 -= miny;
         y2 -= miny;
     }
-
+    
     LineInfo.X1 = x1;
     LineInfo.Y1 = y1;
     LineInfo.X2 = x2;
@@ -858,7 +870,10 @@ ASTSubsequentDashedTwoPointLine(ScrnInfoPtr pScrn,
               
         /* Update Write Pointer */
         mUpdateWritePointer;
-              
+
+        /* Patch KDE pass abnormal point, ycchen at 052507 */
+        vWaitEngIdle(pScrn, pAST);
+               
     }
     else
     {                  
@@ -951,7 +966,9 @@ ASTSubsequentMonoPatternFill(ScrnInfoPtr pScrn,
     /* Modify Reg. Value */
     cmdreg = pAST->ulCMDReg;
     if (pAST->EnableClip)
-        cmdreg |= CMD_ENABLE_CLIP;    
+        cmdreg |= CMD_ENABLE_CLIP;
+    else
+        cmdreg &= ~CMD_ENABLE_CLIP;              
     dstbase = 0;
 
     if (dst_y >= pScrn->virtualY) 
@@ -1070,7 +1087,9 @@ ASTSubsequentColor8x8PatternFillRect(ScrnInfoPtr pScrn, int patx, int paty,
     /* Modify Reg. Value */
     cmdreg = pAST->ulCMDReg;
     if (pAST->EnableClip)
-        cmdreg |= CMD_ENABLE_CLIP;    
+        cmdreg |= CMD_ENABLE_CLIP;
+    else
+        cmdreg &= ~CMD_ENABLE_CLIP;              
     dstbase = 0;
 
     if (dst_y >= pScrn->virtualY) 
@@ -1184,7 +1203,9 @@ ASTSubsequentCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
     /* Modify Reg. Value */
     cmdreg = pAST->ulCMDReg;
     if (pAST->EnableClip)
-        cmdreg |= CMD_ENABLE_CLIP;    
+        cmdreg |= CMD_ENABLE_CLIP;
+    else
+        cmdreg &= ~CMD_ENABLE_CLIP;              
     dstbase = 0;
 
     if (dst_y >= pScrn->virtualY) 
@@ -1308,7 +1329,9 @@ ASTSubsequentScreenToScreenColorExpandFill(ScrnInfoPtr pScrn,
     /* Modify Reg. Value */
     cmdreg = pAST->ulCMDReg;
     if (pAST->EnableClip)
-        cmdreg |= CMD_ENABLE_CLIP;    
+        cmdreg |= CMD_ENABLE_CLIP;
+    else
+        cmdreg &= ~CMD_ENABLE_CLIP;            
     dstbase = 0;
     if (dst_y >= pScrn->virtualY) 
     {   
diff --git a/src/ast_cursor.c b/src/ast_cursor.c
index 9d30e5c..aaa9cb3 100644
--- a/src/ast_cursor.c
+++ b/src/ast_cursor.c
@@ -62,7 +62,7 @@
 Bool ASTCursorInit(ScreenPtr pScreen);
 Bool bInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST);
 static void ASTShowCursor(ScrnInfoPtr pScrn); 
-static void ASTHideCursor(ScrnInfoPtr pScrn);
+void ASTHideCursor(ScrnInfoPtr pScrn);
 static void ASTSetCursorPosition(ScrnInfoPtr pScrn, int x, int y);
 static void ASTSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg);
 static void ASTLoadCursorImage(ScrnInfoPtr pScrn, UCHAR *src);
@@ -146,7 +146,7 @@ ASTShowCursor(ScrnInfoPtr pScrn)
     
 }
 
-static void
+void
 ASTHideCursor(ScrnInfoPtr pScrn)
 {
     ASTRecPtr  pAST = ASTPTR(pScrn);
@@ -235,8 +235,8 @@ ASTLoadCursorImage(ScrnInfoPtr pScrn, UCHAR *src)
        	    for (k=7; k>0; k-=2)
        	    {
                 jTempSrcAnd32 = *((UCHAR *) pjSrcAnd);
-                jTempSrcXor32 = *((UCHAR *) pjSrcXor);   
-                ulTempDstAnd32[0] = ((jTempSrcAnd32 >> k) & 0x01) ? 0x00008000L:0x00L;   
+                jTempSrcXor32 = *((UCHAR *) pjSrcXor);
+                ulTempDstAnd32[0] = ((jTempSrcAnd32 >> k) & 0x01) ? 0x00008000L:0x00L;
                 ulTempDstXor32[0] = ((jTempSrcXor32 >> k) & 0x01) ? 0x00004000L:0x00L;                   	                                  	                 
                 ulTempDstData32[0] = ((jTempSrcXor32 >> k) & 0x01) ? pAST->HWCInfo.fg:pAST->HWCInfo.bg;                   	                                  	                                                   
                 ulTempDstAnd32[1] = ((jTempSrcAnd32 >> (k-1)) & 0x01) ? 0x80000000L:0x00L;   
diff --git a/src/ast_driver.c b/src/ast_driver.c
index 8967c9b..5ae07e3 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -78,6 +78,7 @@ extern void vDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST);
 extern Bool ASTAccelInit(ScreenPtr pScreen);
 
 extern Bool ASTCursorInit(ScreenPtr pScreen);
+extern void ASTHideCursor(ScrnInfoPtr pScrn);
 
 /* Mandatory functions */
 static void ASTIdentify(int flags);
@@ -108,7 +109,7 @@ static Bool ASTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
  * This is intentionally screen-independent.  It indicates the binding
  * choice made in the first PreInit.
  */
-DriverRec AST = {
+_X_EXPORT DriverRec AST = {
    AST_VERSION,
    AST_DRIVER_NAME,
    ASTIdentify,
@@ -248,12 +249,16 @@ static XF86ModuleVersionInfo astVersRec = {
    XORG_VERSION_CURRENT,
    AST_MAJOR_VERSION, AST_MINOR_VERSION, AST_PATCH_VERSION,
    ABI_CLASS_VIDEODRV,
+#ifdef PATCH_ABI_VERSION
+   ABI_VIDEODRV_VERSION_PATCH,
+#else 
    ABI_VIDEODRV_VERSION,
+#endif
    MOD_CLASS_VIDEODRV,
    {0, 0, 0, 0}
 };
 
-XF86ModuleData astModuleData = { &astVersRec, astSetup, NULL };
+_X_EXPORT XF86ModuleData astModuleData = { &astVersRec, astSetup, NULL };
 
 static pointer
 astSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -334,6 +339,7 @@ ASTProbe(DriverPtr drv, int flags)
       return FALSE;
     }
 
+#ifndef XSERVER_LIBPCIACCESS
    /*
     * This probing is just checking the PCI data the server already
     * collected.
@@ -341,6 +347,7 @@ ASTProbe(DriverPtr drv, int flags)
     if (xf86GetPciVideoInfo() == NULL) {
 	return FALSE;
     }
+#endif
 
     numUsed = xf86MatchPciInstances(AST_NAME, PCI_VENDOR_AST,
 				   ASTChipsets, ASTPciChipsets,
@@ -512,8 +519,10 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
    pAST = ASTPTR(pScrn);
    pAST->pEnt    = xf86GetEntityInfo(pScrn->entityList[0]);
    pAST->PciInfo = xf86GetPciInfoForEntity(pAST->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
    pAST->PciTag  = pciTag(pAST->PciInfo->bus, pAST->PciInfo->device,
 			  pAST->PciInfo->func);
+#endif
 
    /* Process the options
     * pScrn->confScreen, pScrn->display, pScrn->monitor, pScrn->numEntities, 
@@ -544,7 +553,7 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
    } else {
       from = X_PROBED;
       pScrn->chipset = (char *)xf86TokenToString(ASTChipsets,
-						 pAST->PciInfo->chipType);
+						 PCI_DEV_DEVICE_ID(pAST->PciInfo));
    }
    if (pAST->pEnt->device->chipRev >= 0) {
       xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
@@ -563,16 +572,16 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
     /* "Patch" the PIOOffset inside vgaHW in order to force
      * the vgaHW module to use our relocated i/o ports.
      */
-    VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + pAST->PciInfo->ioBase[2] - 0x380;
+    VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
 	
-    pAST->RelocateIO = (IOADDRESS)(pAST->PciInfo->ioBase[2] + pAST->IODBase);
+    pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase);
 	
    if (pAST->pEnt->device->MemBase != 0) {
       pAST->FBPhysAddr = pAST->pEnt->device->MemBase;
       from = X_CONFIG;
    } else {
-      if (pAST->PciInfo->memBase[0] != 0) {
-	 pAST->FBPhysAddr = pAST->PciInfo->memBase[0] & 0xFFF00000;
+      if (PCI_REGION_BASE(pAST->PciInfo, 0, REGION_MEM) != 0) {
+	 pAST->FBPhysAddr = PCI_REGION_BASE(pAST->PciInfo, 0, REGION_MEM) & 0xFFF00000;
 	 from = X_PROBED;
       } else {
 	 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -588,8 +597,8 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
       pAST->MMIOPhysAddr = pAST->pEnt->device->IOBase;
       from = X_CONFIG;
    } else {
-      if (pAST->PciInfo->memBase[1]) {
-	 pAST->MMIOPhysAddr = pAST->PciInfo->memBase[1] & 0xFFFF0000;
+      if (PCI_REGION_BASE(pAST->PciInfo, 1, REGION_MEM)) {
+	 pAST->MMIOPhysAddr = PCI_REGION_BASE(pAST->PciInfo, 1, REGION_IO) & 0xFFFF0000;
 	 from = X_PROBED;
       } else {
 	 xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -627,6 +636,12 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
    pScrn->memPhysBase = (ULONG)pAST->FBPhysAddr;
    pScrn->fbOffset = 0;
 
+   /* Get Revision */
+   if (PCI_DEV_REVISION(pAST->PciInfo) >= 0x10)
+       pAST->jChipType = AST2100;
+   else
+       pAST->jChipType = AST2000;
+
    /* Do DDC 
     * should be done after xf86CollectOptions
     */
@@ -641,12 +656,21 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
    clockRanges->interlaceAllowed = FALSE;
    clockRanges->doubleScanAllowed = FALSE;
    
-   i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
+   /* Add for AST2100, ycchen at 061807 */
+   if (pAST->jChipType == AST2100)
+       i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
 			 pScrn->display->modes, clockRanges,
-			 0, 320, 1600, 8 * pScrn->bitsPerPixel,
+			 0, 320, 1920, 8 * pScrn->bitsPerPixel,
 			 200, 1200,
 			 pScrn->display->virtualX, pScrn->display->virtualY,
 			 pAST->FbMapSize, LOOKUP_BEST_REFRESH);
+   else
+       i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
+			 pScrn->display->modes, clockRanges,
+			 0, 320, 1600, 8 * pScrn->bitsPerPixel,
+			 200, 1200,
+			 pScrn->display->virtualX, pScrn->display->virtualY,
+			 pAST->FbMapSize, LOOKUP_BEST_REFRESH);   
 
    if (i == -1) {
       ASTFreeRec(pScrn);
@@ -884,7 +908,8 @@ ASTSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
    if (pAST->pHWCPtr) {
        xf86FreeOffscreenLinear(pAST->pHWCPtr);		/* free HWC Cache */
        pAST->pHWCPtr = NULL;      
-   }    
+   }
+   ASTHideCursor(pScrn);
 #endif
 
 #ifdef Accel_2D 
@@ -942,7 +967,8 @@ ASTLeaveVT(int scrnIndex, int flags)
    if (pAST->pHWCPtr) {
        xf86FreeOffscreenLinear(pAST->pHWCPtr);		/* free HWC Cache */
        pAST->pHWCPtr = NULL;      
-   }    
+   }
+   ASTHideCursor(pScrn);
 #endif
 
 #ifdef Accel_2D  
@@ -971,6 +997,8 @@ static ModeStatus
 ASTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
 
+   ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+   ASTRecPtr   pAST  = ASTPTR(pScrn);
    Bool Flags = MODE_NOMODE;
    	
    if (mode->Flags & V_INTERLACE) {
@@ -988,6 +1016,13 @@ ASTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
       }   	
       return Flags;   	
    }
+
+   /* Add for AST2100, ycchen at 061807 */
+   if (pAST->jChipType == AST2100)
+   {
+       if ( (mode->CrtcHDisplay == 1920) && (mode->CrtcVDisplay == 1200) )
+           return MODE_OK;
+   }
    
    switch (mode->CrtcHDisplay)
    {
@@ -1064,7 +1099,8 @@ ASTCloseScreen(int scrnIndex, ScreenPtr pScreen)
    if (pAST->pHWCPtr) {
        xf86FreeOffscreenLinear(pAST->pHWCPtr);		/* free HWC Cache */
        pAST->pHWCPtr = NULL;      
-   }    
+   }
+   ASTHideCursor(pScrn);
 #endif
    	   
 #ifdef Accel_2D  
@@ -1103,7 +1139,7 @@ ASTSave(ScrnInfoPtr pScrn)
    ASTRecPtr pAST;
    vgaRegPtr vgaReg;
    ASTRegPtr astReg;   
-   int i;
+   int i, icount=0;
 
    pAST = ASTPTR(pScrn);
    vgaReg = &VGAHWPTR(pScrn)->SavedReg;
@@ -1115,9 +1151,13 @@ ASTSave(ScrnInfoPtr pScrn)
    /* Ext. Save */
    vASTOpenKey(pScrn);
    
-   for (i=0; i<0x50; i++)
-       GetIndexReg(CRTC_PORT, (UCHAR) (i+0x80), astReg->ExtCRTC[i]);   	
-   
+   /* fixed Console Switch Refresh Rate Incorrect issue, ycchen at 051106 */   
+   for (i=0x81; i<=0xB6; i++)
+       GetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
+   for (i=0xBC; i<=0xC1; i++)
+       GetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
+   GetIndexReg(CRTC_PORT, (UCHAR) (0xBB), astReg->ExtCRTC[icount]);
+
 }
 
 static void
@@ -1126,7 +1166,7 @@ ASTRestore(ScrnInfoPtr pScrn)
    ASTRecPtr pAST;
    vgaRegPtr vgaReg;
    ASTRegPtr astReg;   
-   int i;
+   int i, icount=0;
 
    pAST = ASTPTR(pScrn);
    vgaReg = &VGAHWPTR(pScrn)->SavedReg;
@@ -1140,9 +1180,13 @@ ASTRestore(ScrnInfoPtr pScrn)
    /* Ext. restore */
    vASTOpenKey(pScrn);
    
-   for (i=0; i<0x50; i++)
-       SetIndexReg(CRTC_PORT, (UCHAR) (i+0x80), astReg->ExtCRTC[i]);   	
-   
+   /* fixed Console Switch Refresh Rate Incorrect issue, ycchen at 051106 */
+   for (i=0x81; i<=0xB6; i++)
+       SetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
+   for (i=0xBC; i<=0xC1; i++)
+       SetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
+   SetIndexReg(CRTC_PORT, (UCHAR) (0xBB), astReg->ExtCRTC[icount]);
+
 }
 
 static void
@@ -1193,7 +1237,8 @@ vFillASTModeInfo (ScrnInfoPtr pScrn)
     pAST->VideoModeInfo.ScreenWidth = pScrn->virtualX;   
     pAST->VideoModeInfo.ScreenHeight = pScrn->virtualY;   
     pAST->VideoModeInfo.bitsPerPixel = pScrn->bitsPerPixel;   
-    pAST->VideoModeInfo.ScreenPitch = pScrn->virtualX * ((pScrn->bitsPerPixel + 1) / 8) ;       
+    /* Fixed screen pitch incorrect in some specific monitor, ycchen at 071707 */
+    pAST->VideoModeInfo.ScreenPitch = pScrn->displayWidth * ((pScrn->bitsPerPixel + 1) / 8) ;
 
 }
 
diff --git a/src/ast_mode.c b/src/ast_mode.c
index 776ac39..624c465 100644
--- a/src/ast_mode.c
+++ b/src/ast_mode.c
@@ -130,7 +130,7 @@ VBIOS_STDTABLE_STRUCT StdTable[] = {
 };
 
 VBIOS_ENHTABLE_STRUCT  Res640x480Table[] = {
-    { 800, 640, 8, 96, 525, 480, 2, 2, VCLK28_322,	/* 60Hz */
+    { 800, 640, 8, 96, 525, 480, 2, 2, VCLK25_175,	/* 60Hz */
       (SyncNN | HBorder | VBorder | Charx8Dot), 60, 1, 0x2E },
     { 832, 640, 16, 40, 520, 480, 1, 3, VCLK31_5,	/* 72Hz */
       (SyncNN | HBorder | VBorder | Charx8Dot), 72, 2, 0x2E  },
@@ -167,7 +167,7 @@ VBIOS_ENHTABLE_STRUCT  Res1024x768Table[] = {
     {1312, 1024, 16, 96, 800, 768, 1, 3, VCLK78_75,	/* 75Hz */ 
       (SyncPP | Charx8Dot), 75, 3, 0x31 },      
     {1376, 1024, 48, 96, 808, 768, 1, 3, VCLK94_5,	/* 85Hz */ 
-      (SyncPP | Charx8Dot), 85, 4, 0x31 },  
+      (SyncPP | Charx8Dot), 84, 4, 0x31 },  
     {1376, 1024, 48, 96, 808, 768, 1, 3, VCLK94_5,	/* end */ 
       (SyncPP | Charx8Dot), 0xFF, 4, 0x31 },             
 };
@@ -187,7 +187,14 @@ VBIOS_ENHTABLE_STRUCT  Res1600x1200Table[] = {
     {2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162,	/* 60Hz */ 
       (SyncPP | Charx8Dot), 60, 1, 0x33 }, 
     {2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162,	/* end */ 
-      (SyncPP | Charx8Dot), 60, 1, 0x33 },         
+      (SyncPP | Charx8Dot), 0xFF, 1, 0x33 },         
+};
+
+VBIOS_ENHTABLE_STRUCT  Res1920x1200Table[] = {	
+    {2592, 1920,136, 200, 1245, 1200, 3, 6, VCLK193_25,	/* 60Hz */ 
+      (SyncPP | Charx8Dot), 60, 1, 0x33 }, 
+    {2592, 1920,136, 200, 1245, 1200, 3, 6, VCLK193_25,	/* end */ 
+      (SyncPP | Charx8Dot), 0xFF, 1, 0x33 }, 
 };
 
 VBIOS_DCLK_INFO DCLKTable [] = {
@@ -207,6 +214,7 @@ VBIOS_DCLK_INFO DCLKTable [] = {
     {0x85, 0x24, 0x00},                        	        /* 0D: VCLK135         	*/
     {0x67, 0x22, 0x00},                        	        /* 0E: VCLK157_5       	*/
     {0x6A, 0x22, 0x00},				        /* 0F: VCLK162         	*/
+    {0x61, 0x2C, 0x81},				        /* 10: VCLK193_25      	*/    
 };
 
 VBIOS_DAC_INFO DAC_TEXT[] = {
@@ -423,8 +431,10 @@ Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_
          break;
     case 1600:
          pVGAModeInfo->pEnhTableEntry = (PVBIOS_ENHTABLE_STRUCT) &Res1600x1200Table[ulRefreshRateIndex];
-         break;                  
-    default:
+         break;
+    case 1920:
+         pVGAModeInfo->pEnhTableEntry = (PVBIOS_ENHTABLE_STRUCT) &Res1920x1200Table[ulRefreshRateIndex];
+         break;        default:
          return (FALSE);     
     }
 
@@ -633,7 +643,7 @@ void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMo
 
     SetIndexRegMask(CRTC_PORT,0xC0, 0x00,  pDCLKPtr->Param1); 
     SetIndexRegMask(CRTC_PORT,0xC1, 0x00,  pDCLKPtr->Param2);    
-    SetIndexRegMask(CRTC_PORT,0xBB, 0xCF,  ((pDCLKPtr->Param3 & 0x03) << 4));                                                                                                       
+    SetIndexRegMask(CRTC_PORT,0xBB, 0x0F, (pDCLKPtr->Param3 & 0x80) | ((pDCLKPtr->Param3 & 0x03) << 4) );                                                                                                       
     	
 }
 
diff --git a/src/ast_mode.h b/src/ast_mode.h
index 0a8e20c..b1926a3 100644
--- a/src/ast_mode.h
+++ b/src/ast_mode.h
@@ -21,7 +21,7 @@
  */
 
 /* Mode Limitation */
-#define MAX_HResolution		1600
+#define MAX_HResolution		1920
 #define MAX_VResolution		1200
  
 /* Std. Table Index Definition */
@@ -48,6 +48,7 @@
 #define VCLK135        		0x0D
 #define VCLK157_5      		0x0E
 #define VCLK162        		0x0F
+#define VCLK193_25     		0x10
 
 /* Flags Definition */
 #define Charx8Dot               0x00000001
diff --git a/src/ast_pcirename.h b/src/ast_pcirename.h
new file mode 100644
index 0000000..cbd3dcf
--- /dev/null
+++ b/src/ast_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef ASTPCIRENAME_H
+#define ASTPCIRENAME_H
+
+enum region_type {
+    REGION_MEM,
+    REGION_IO 
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus,    \
+                                    (_pcidev)->device, \
+                                    (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type)             \
+    (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+                             : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+    (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev)        (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev)        (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev)      (((_pcidev)->domain << 8) | \
+                                    (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev)      ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b)        ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff --git a/src/ast_tool.c b/src/ast_tool.c
index 7a2165d..11d3085 100644
--- a/src/ast_tool.c
+++ b/src/ast_tool.c
@@ -67,10 +67,24 @@ ASTMapMem(ScrnInfoPtr pScrn)
 {
    ASTRecPtr pAST = ASTPTR(pScrn);
 
-
+#ifndef XSERVER_LIBPCIACCESS
    pAST->FBVirtualAddr = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
 				 pAST->PciTag,
 				 pAST->FBPhysAddr, pAST->FbMapSize);
+#else
+   {
+     void** result = (void**)&pAST->FBVirtualAddr;
+     int err = pci_device_map_range(pAST->PciInfo,
+				    pAST->FBPhysAddr,
+				    pAST->FbMapSize,
+				    PCI_DEV_MAP_FLAG_WRITABLE |
+				    PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+				    result);
+     
+     if (err) 
+			return FALSE;
+   }
+#endif
 				 
    if (!pAST->FBVirtualAddr)
       return FALSE;
@@ -82,9 +96,13 @@ Bool
 ASTUnmapMem(ScrnInfoPtr pScrn)
 {
    ASTRecPtr pAST = ASTPTR(pScrn);
- 
+
+#ifndef XSERVER_LIBPCIACCESS 
    xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pAST->FBVirtualAddr,
 		   pAST->FbMapSize);
+#else
+   pci_device_unmap_range(pAST->PciInfo, pAST->FBVirtualAddr, pAST->FbMapSize);
+#endif
 		   
    pAST->FBVirtualAddr = 0;
    
@@ -97,15 +115,33 @@ ASTMapMMIO(ScrnInfoPtr pScrn)
    int mmioFlags;
    ASTRecPtr pAST = ASTPTR(pScrn);
 
+#ifndef XSERVER_LIBPCIACCESS
+
 #if !defined(__alpha__)
    mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT;
 #else
    mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT | VIDMEM_SPARSE;
 #endif
 
+
    pAST->MMIOVirtualAddr = xf86MapPciMem(pScrn->scrnIndex, mmioFlags,
 				         pAST->PciTag,
 				         pAST->MMIOPhysAddr, pAST->MMIOMapSize);
+
+#else
+   {
+     void** result = (void**)&pAST->MMIOVirtualAddr;
+     int err = pci_device_map_range(pAST->PciInfo,
+				    pAST->MMIOPhysAddr,
+				    pAST->MMIOMapSize,
+				    PCI_DEV_MAP_FLAG_WRITABLE,
+				    result);
+     
+     if (err) 
+			return FALSE;
+   }
+
+#endif
    if (!pAST->MMIOVirtualAddr)
       return FALSE;
 
@@ -117,8 +153,12 @@ ASTUnmapMMIO(ScrnInfoPtr pScrn)
 {
    ASTRecPtr pAST = ASTPTR(pScrn);
 
+#ifndef XSERVER_LIBPCIACCESS
    xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pAST->MMIOVirtualAddr,
 		   pAST->MMIOMapSize);
+#else
+   pci_device_unmap_range(pAST->PciInfo, pAST->MMIOVirtualAddr, pAST->MMIOMapSize);
+#endif
    pAST->MMIOVirtualAddr = 0;
    
 }
diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
index a464a01..a833b3b 100644
--- a/src/ast_vgatool.c
+++ b/src/ast_vgatool.c
@@ -128,7 +128,13 @@ GetMaxDCLK(ScrnInfoPtr pScrn)
 
    *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000;
    *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x00000001;
-   
+
+   *(ULONG *) (pAST->MMIOVirtualAddr + 0x10100) = 0x000000A8;
+
+   do {
+      ;	
+   } while (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10100) != 0x000000A8);
+   	   
    /* Get BusWidth */
    ulData = *(ULONG * ) (pAST->MMIOVirtualAddr + 0x10004);       
    if (ulData & 0x40)
@@ -137,9 +143,7 @@ GetMaxDCLK(ScrnInfoPtr pScrn)
       ulDRAMBusWidth = 32;
           
    /* Get MCLK */
-   {
-       *(ULONG *) (pAST->MMIOVirtualAddr + 0x10100) = 0x000000A8;
-   	
+   {   	
        ulData = *(ULONG *) (pAST->MMIOVirtualAddr + 0x10120);       
        ulData2 = *(ULONG *) (pAST->MMIOVirtualAddr + 0x10170);       
        if (ulData2 & 0x2000)


Index: xorg-x11-drv-ast.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ast/devel/xorg-x11-drv-ast.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-ast.spec	20 Feb 2008 07:09:23 -0000	1.9
+++ xorg-x11-drv-ast.spec	10 Mar 2008 02:00:39 -0000	1.10
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ast video driver
 Name:      xorg-x11-drv-ast
 Version:   0.81.0
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,8 +14,11 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ast.xinf
 
+Patch0: ast-pciaccess.patch
+
 ExcludeArch: s390 s390x
 
+BuildRequires: automake autoconf libtool
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
 Requires:  hwdata
@@ -27,7 +30,10 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .pciaccess
+
 %build
+autoreconf -v --install
 %configure --disable-static --disable-dri
 make
 
@@ -52,6 +58,9 @@
 %{_datadir}/hwdata/videoaliases/ast.xinf
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  0.81.0-8
+- pciaccess conversion
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 0.81.0-7
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 02:24:17 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 02:24:17 GMT
Subject: rpms/xorg-x11-drv-s3/devel s3-pciaccess.patch, NONE,
	1.1 xorg-x11-drv-s3.spec, 1.21, 1.22
Message-ID: <200803100224.m2A2OHMu008407@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-s3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8377

Modified Files:
	xorg-x11-drv-s3.spec 
Added Files:
	s3-pciaccess.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  0.5.0-7
- pciaccess conversion


s3-pciaccess.patch:

--- NEW FILE s3-pciaccess.patch ---
diff --git a/configure.ac b/configure.ac
index c6f47b0..461313b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,10 +58,22 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
 
 # Checks for header files.
 AC_HEADER_STDC
 
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
 
diff --git a/src/s3.h b/src/s3.h
index 814b76b..444fd3e 100644
--- a/src/s3.h
+++ b/src/s3.h
@@ -30,6 +30,7 @@
 #ifndef _S3_H
 #define _S3_H
 
+#include "s3_pcirename.h"
 #include 
 
 #include "xf86.h"
@@ -86,7 +87,9 @@ typedef struct {
 
 typedef struct _S3Rec {
         pciVideoPtr             PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
         PCITAG                  PciTag;
+#endif
         EntityInfoPtr           pEnt;
         unsigned long           IOAddress;
         unsigned long           FBAddress; 
@@ -164,10 +167,10 @@ typedef struct _S3Rec {
 
 
 #define DRIVER_NAME     "s3"
-#define DRIVER_VERSION  "0.5.0"
-#define VERSION_MAJOR   0
-#define VERSION_MINOR   5
-#define PATCHLEVEL      0
+#define DRIVER_VERSION  PACKAGE_VERSION
+#define VERSION_MAJOR   PACKAGE_VERSION_MAJOR
+#define VERSION_MINOR   PACKAGE_VERSION_MINOR
+#define PATCHLEVEL      PACKAGE_VERSION_PATCHLEVEL
 #define S3_VERSION     ((VERSION_MAJOR << 24) | \
                         (VERSION_MINOR << 16) | PATCHLEVEL)
 
diff --git a/src/s3_Trio64DAC.c b/src/s3_Trio64DAC.c
index cb4de3a..5bb8b3c 100644
--- a/src/s3_Trio64DAC.c
+++ b/src/s3_Trio64DAC.c
@@ -327,7 +327,7 @@ void S3Trio64DAC_Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
 			       135000, 270000);
 	else if (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX)
 		S3TrioSetClock(pScrn, mode->Clock, 2, 1, 1, 31, 0, 3, 2,
-			       170000, 270000);
+			       170000, 340000);
 	else
 		S3TrioSetClock(pScrn, mode->Clock, 2, 1, 1, 31, 0, 3, 2,
 			       135000, 270000);
diff --git a/src/s3_bios.c b/src/s3_bios.c
index 5ef1eb3..8fe14dc 100644
--- a/src/s3_bios.c
+++ b/src/s3_bios.c
@@ -46,8 +46,13 @@ static unsigned char *find_bios_string(S3Ptr pS3, int BIOSbase,
 
 	if (!init) {
 		init = 1;
+#ifndef XSERVER_LIBPCIACCESS
 		if (xf86ReadDomainMemory(pS3->PciTag, BIOSbase, BIOS_BSIZE, bios) != BIOS_BSIZE)
 			return NULL;
+#else
+		if (pci_device_read_rom(pS3->PciInfo, bios))
+		        return NULL;
+#endif
 		if ((bios[0] != 0x55) || (bios[1] != 0xaa))
 			return NULL;
 	}
diff --git a/src/s3_driver.c b/src/s3_driver.c
index 924b073..c2ec292 100644
--- a/src/s3_driver.c
+++ b/src/s3_driver.c
@@ -499,7 +499,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
                 xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipID override: 0x%04X\n",
                            pS3->Chipset);
         } else {
-                pS3->Chipset = pS3->PciInfo->chipType;   
+  	        pS3->Chipset = PCI_DEV_DEVICE_ID(pS3->PciInfo);
                 pScrn->chipset = (char *)xf86TokenToString(S3Chipsets,
                                                            pS3->Chipset);
         }                                                  
@@ -508,14 +508,16 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
                 xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
                            pS3->ChipRev);
         } else
-                pS3->ChipRev = pS3->PciInfo->chipRev;    
+	        pS3->ChipRev = PCI_DEV_REVISION(pS3->PciInfo);
         
         xfree(pEnt);
         
         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Chipset: \"%s\"\n", pScrn->chipset);
         
+#ifndef XSERVER_LIBPCIACCESS
         pS3->PciTag = pciTag(pS3->PciInfo->bus, pS3->PciInfo->device,
                              pS3->PciInfo->func);        
+#endif
 
 	switch (pS3->Chipset) {
 	case PCI_CHIP_964_0:
@@ -531,7 +533,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
 		break;
 	}
 
-	pS3->FBAddress = pS3->PciInfo->memBase[0];
+	pS3->FBAddress = PCI_REGION_BASE(pS3->PciInfo, 0, REGION_MEM);
 	pScrn->memPhysBase = pS3->FBAddress;
 	pScrn->fbOffset = 0;
 	
@@ -1016,9 +1018,25 @@ static Bool S3MapMem(ScrnInfoPtr pScrn)
 	S3Ptr pS3 = S3PTR(pScrn);
 
 	if (pS3->S3NewMMIO) {
+
+
+#ifndef XSERVER_LIBPCIACCESS
 		pS3->MMIOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
 					      pS3->PciTag, pS3->IOAddress,
 					      S3_NEWMMIO_REGSIZE);
+#else
+		{
+			void** result = (void**)&pS3->MMIOBase;
+			int err = pci_device_map_range(pS3->PciInfo,
+						       pS3->IOAddress,
+						       S3_NEWMMIO_REGSIZE,
+						       PCI_DEV_MAP_FLAG_WRITABLE,
+						       result);
+			
+			if (err) 
+				return FALSE;
+		}
+#endif
 		if (!pS3->MMIOBase) {
 			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 				   "Could not map MMIO\n");
@@ -1026,9 +1044,25 @@ static Bool S3MapMem(ScrnInfoPtr pScrn)
 		}
 	}
 
+#ifndef XSERVER_LIBPCIACCESS
 	pS3->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
 				    pS3->PciTag, pS3->FBAddress,
 				    pScrn->videoRam * 1024);
+
+#else
+	{
+		void** result = (void**)&pS3->FBBase;
+		int err = pci_device_map_range(pS3->PciInfo,
+					       pS3->FBAddress,
+					       pS3->videoRam * 1024,
+					       PCI_DEV_MAP_FLAG_WRITABLE |
+					       PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+					       result);
+		
+		if (err) 
+			return FALSE;
+	}
+#endif
 	if (!pS3->FBBase) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 			   "Could not map framebuffer\n");
@@ -1045,11 +1079,21 @@ static void S3UnmapMem(ScrnInfoPtr pScrn)
 {
 	S3Ptr pS3 = S3PTR(pScrn);
 
-	if (pS3->S3NewMMIO)
+	if (pS3->S3NewMMIO) {
+#ifndef XSERVER_LIBPCIACCESS
 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pS3->MMIOBase,
 				S3_NEWMMIO_REGSIZE);
+#else
+		pci_device_unmap_range(pS3->PciInfo, pS3->MMIOBase, S3_NEWMMIO_REGSIZE);
+#endif
+	}
+	
+#ifndef XSERVER_LIBPCIACCESS
 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pS3->FBBase,
 			pScrn->videoRam * 1024);
+#else
+	pci_device_unmap_range(pS3->PciInfo, pS3->FBBase, pScrn->videoRam * 1024);
+#endif
 
 	return;
 }
@@ -1847,11 +1891,47 @@ void S3BankZero(ScrnInfoPtr pScrn)
 	outb(vgaCRReg, tmp);
 }
 
-
-
-static void S3DisplayPowerManagementSet(ScrnInfoPtr pScrn,
-					int PowerManagementMode, int flags)
+static void
+S3DisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode,
+			    int flags)
 {
-	vgaHWDPMSSet(pScrn, PowerManagementMode, flags);
+     S3Ptr pS3 = S3PTR(pScrn);
+     switch (pS3->Chipset) {
+     case PCI_CHIP_TRIO64V2_DXGX:
+     case PCI_CHIP_TRIO:
+     case PCI_CHIP_AURORA64VP:
+     case PCI_CHIP_TRIO64UVP:
+     {
+	  int srd;
+      
+	  outb(0x3c4, 0x08);
+	  outb(0x3c5, 0x06);	  /* unlock extended sequence registers */
+
+	  outb(0x3c4, 0x0d);
+	  srd = inb(0x3c5) & 0xf;  /* clear the sync control bits */
+  
+	  switch (PowerManagementMode) {
+	  case DPMSModeOn:
+	       /* Screen: On; HSync: On, VSync: On */
+	       break;
+	  case DPMSModeStandby:
+	       /* Screen: Off; HSync: Off, VSync: On */
+	       srd |= 0x10;
+	       break;
+	  case DPMSModeSuspend:
+	       /* Screen: Off; HSync: On, VSync: Off */
+	       srd |= 0x40;
+	       break;
+	  case DPMSModeOff:
+	       /* Screen: Off; HSync: Off, VSync: Off */
+	       srd |= 0x50;
+	       break;
+	  }
+	  outb(0x3c4, 0x0d);
+	  outb(0x3c5, srd);
+	  break;
+     }
+     default:
+	  vgaHWDPMSSet(pScrn, PowerManagementMode, flags);
+     }
 }
-
diff --git a/src/s3_pcirename.h b/src/s3_pcirename.h
new file mode 100644
index 0000000..9321046
--- /dev/null
+++ b/src/s3_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef S3PCIRENAME_H
+#define S3PCIRENAME_H
+
+enum region_type {
+    REGION_MEM,
+    REGION_IO 
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus,    \
+                                    (_pcidev)->device, \
+                                    (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type)             \
+    (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+                             : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+    (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev)        (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev)        (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev)      (((_pcidev)->domain << 8) | \
+                                    (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev)      ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b)        ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff --git a/src/s3_video.c b/src/s3_video.c
index 77f4930..8189fdf 100644
--- a/src/s3_video.c
+++ b/src/s3_video.c
@@ -30,6 +30,8 @@
 #include "config.h"
 #endif
 
+#define S3_NEWMMIO	/* previously defined in Imakefile in monolith */
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 


Index: xorg-x11-drv-s3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-s3/devel/xorg-x11-drv-s3.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-s3.spec	20 Feb 2008 07:41:21 -0000	1.21
+++ xorg-x11-drv-s3.spec	10 Mar 2008 02:23:40 -0000	1.22
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 s3 video driver
 Name:      xorg-x11-drv-s3
 Version:   0.5.0
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -15,9 +15,11 @@
 Source1:   s3.xinf
 
 Patch0: s3-0.5.0-newmmio.patch
+Patch1: s3-pciaccess.patch
 
 ExcludeArch: s390 s390x
 
+BuildRequires: automake autoconf libtool
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
 Requires: hwdata
@@ -28,15 +30,17 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch -p1 -b .newmmio
+%patch0 -p1 -b .newmmio
+%patch1 -p1 -b .pciaccess
 
 %build
+autoreconf -v --install
 %configure --disable-static
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
+autoreconf -v --install
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
@@ -55,6 +59,9 @@
 %{_datadir}/hwdata/videoaliases/s3.xinf
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  0.5.0-7
+- pciaccess conversion
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 0.5.0-6
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 02:29:27 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 02:29:27 GMT
Subject: rpms/rarian/devel .cvsignore, 1.7, 1.8 rarian.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <200803100229.m2A2TRZt008626@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/rarian/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8574

Modified Files:
	.cvsignore rarian.spec sources 
Log Message:

* Mon Feb 18 2008 Matthew Barnes  - 0.8.0-1
- Update to 0.8.0
- Silence xmlcatalog commands (RH bug #433315).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Feb 2008 02:56:13 -0000	1.7
+++ .cvsignore	10 Mar 2008 02:28:50 -0000	1.8
@@ -1,2 +1 @@
-rarian-0.7.1.tar.bz2
-scrollkeeper-omf.dtd
+rarian-0.8.0.tar.bz2


Index: rarian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/rarian.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rarian.spec	18 Feb 2008 15:58:52 -0000	1.14
+++ rarian.spec	10 Mar 2008 02:28:50 -0000	1.15
@@ -1,8 +1,8 @@
 ### Abstract ###
 
 Name: rarian
-Version: 0.7.1
-Release: 3%{?dist}
+Version: 0.8.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Summary: Rarian is a documentation meta-data library
@@ -85,10 +85,10 @@
 CATALOG=/etc/xml/catalog
 /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
   "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" \
-  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG >& /dev/null || :
 /usr/bin/xmlcatalog --noout --add "rewriteURI" \
   "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" \
-  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG >& /dev/null || :
 
 %postun -p /sbin/ldconfig
 
@@ -98,7 +98,7 @@
 if [ $1 = 0 ]; then
   CATALOG=/etc/xml/catalog
   /usr/bin/xmlcatalog --noout --del \
-    "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+    "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG >& /dev/null || :
 fi
 
 %files
@@ -122,6 +122,10 @@
 %{_libdir}/pkgconfig/rarian.pc
 
 %changelog
+* Mon Feb 18 2008 Matthew Barnes  - 0.8.0-1
+- Update to 0.8.0
+- Silence xmlcatalog commands (RH bug #433315).
+
 * Mon Feb 18 2008 Matthew Barnes  - 0.7.1-3
 - Require libxml2 in %%post and %%postun (RH bug #433268).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Jan 2008 16:18:45 -0000	1.6
+++ sources	10 Mar 2008 02:28:50 -0000	1.7
@@ -1 +1 @@
-f2a2755d62cecc717af2b5432ae0f390  rarian-0.7.1.tar.bz2
+67e2d3ab27edcebdae9b85733712805e  rarian-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 02:29:44 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 02:29:44 GMT
Subject: rpms/yelp/devel .cvsignore, 1.41, 1.42 sources, 1.43, 1.44 yelp.spec,
	1.129, 1.130
Message-ID: <200803100229.m2A2Tihr008672@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8597

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:

* Sun Mar 09 2008 Matthew Barnes  - 2.22.0-1
- Update to 2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	29 Jan 2008 01:52:06 -0000	1.41
+++ .cvsignore	10 Mar 2008 02:29:09 -0000	1.42
@@ -1 +1 @@
-yelp-2.21.90.tar.bz2
+yelp-2.22.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	29 Jan 2008 01:52:06 -0000	1.43
+++ sources	10 Mar 2008 02:29:09 -0000	1.44
@@ -1 +1 @@
-d6f95ed528994cde4834b52d483da66b  yelp-2.21.90.tar.bz2
+941e67796bbc332c1db3d63771ae2590  yelp-2.22.0.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- yelp.spec	28 Feb 2008 15:05:21 -0000	1.129
+++ yelp.spec	10 Mar 2008 02:29:09 -0000	1.130
@@ -11,7 +11,7 @@
 %define libxml_version 2.6.5
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
-%define rarian_version 0.5.0
+%define rarian_version 0.7.0
 %define gecko_version 1.9
 
 %define pango_version 1.0.99
@@ -19,8 +19,8 @@
 
 Summary: A system documentation reader from the Gnome project
 Name: yelp
-Version: 2.21.90
-Release: 4%{?dist}
+Version: 2.22.0
+Release: 1%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.21/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -159,6 +159,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Sun Mar 09 2008 Matthew Barnes  - 2.22.0-1
+- Update to 2.22.0
+
 * Thu Feb 28 2008 Martin Stransky  - 2.21.90-4
 - updated xulrunner patch, rebuild against xulrunner
 



From fedora-extras-commits at redhat.com  Mon Mar 10 02:31:03 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 02:31:03 GMT
Subject: rpms/xorg-x11-drv-i740/devel i740-pciaccess.patch, NONE,
	1.1 xorg-x11-drv-i740.spec, 1.16, 1.17
Message-ID: <200803100231.m2A2V3Pt008763@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i740/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8725

Modified Files:
	xorg-x11-drv-i740.spec 
Added Files:
	i740-pciaccess.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  1.1.0-7
- pciaccess conversion


i740-pciaccess.patch:

--- NEW FILE i740-pciaccess.patch ---
diff --git a/configure.ac b/configure.ac
index e5524fb..bf213be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,10 +58,23 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
 
 # Checks for header files.
 AC_HEADER_STDC
 
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
+
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
 
diff --git a/src/i740.h b/src/i740.h
index 267c13c..aa31e3c 100644
--- a/src/i740.h
+++ b/src/i740.h
@@ -36,6 +36,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _I740_H_
 #define _I740_H_
 
+#include "i740_pcirename.h"
+
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 
@@ -99,7 +101,9 @@ typedef struct _I740Rec {
   unsigned long MMIOAddr;
   EntityInfoPtr pEnt;
   pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
   PCITAG PciTag;
+#endif
   int HasSGRAM;
   I740RegRec SavedReg;
   I740RegRec ModeReg;
diff --git a/src/i740_driver.c b/src/i740_driver.c
index c21163d..ee25967 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -142,9 +142,9 @@ static Bool I740UnmapMem(ScrnInfoPtr pScrn);
 #define I740_VERSION 4000
 #define I740_NAME "I740"
 #define I740_DRIVER_NAME "i740"
-#define I740_MAJOR_VERSION 1
-#define I740_MINOR_VERSION 1
-#define I740_PATCHLEVEL 0
+#define I740_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define I740_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define I740_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
 
 _X_EXPORT DriverRec I740 = {
   I740_VERSION,
@@ -508,8 +508,10 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
   if (!vgaHWGetHWRec(pScrn)) return FALSE;
 
   pI740->PciInfo = xf86GetPciInfoForEntity(pI740->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
   pI740->PciTag = pciTag(pI740->PciInfo->bus, pI740->PciInfo->device,
 			 pI740->PciInfo->func);
+#endif
 
   if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone))
       return FALSE;
@@ -598,7 +600,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
 	       pI740->pEnt->device->chipID);
   } else {
     from = X_PROBED;
-    pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, pI740->PciInfo->chipType);
+    pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, PCI_DEV_DEVIE_ID(pI740->PciInfo));
   }
   if (pI740->pEnt->device->chipRev >= 0) {
     xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
@@ -611,8 +613,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
     pI740->LinearAddr = pI740->pEnt->device->MemBase;
     from = X_CONFIG;
   } else {
-    if (pI740->PciInfo->memBase[1] != 0) {
-      pI740->LinearAddr = pI740->PciInfo->memBase[0]&0xFF000000;
+    if (PCI_REGION_BASE(pI740->PciInfo, 0, REGION_MEM) != 0) {
+      pI740->LinearAddr = PCI_REGION_BASE(pI740->PciInfo, 0, REGION_MEM)&0xFF000000;
       from = X_PROBED;
     } else {
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
@@ -628,8 +630,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
     pI740->MMIOAddr = pI740->pEnt->device->IOBase;
     from = X_CONFIG;
   } else {
-    if (pI740->PciInfo->memBase[1]) {
-      pI740->MMIOAddr = pI740->PciInfo->memBase[1]&0xFFF80000;
+    if (PCI_REGION_BASE(pI740->PciInfo, 1, REGION_MEM)) {
+      pI740->MMIOAddr = PCI_REGION_BASE(pI740->PciInfo, 1, REGION_MEM)&0xFFF80000;
       from = X_PROBED;
     } else {
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -871,18 +873,48 @@ static Bool I740MapMem(ScrnInfoPtr pScrn)
 
   pI740 = I740PTR(pScrn);
 
+#ifndef XSERVER_LIBPCIACCESS
   mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT;
 
   pI740->MMIOBase = xf86MapPciMem(pScrn->scrnIndex, mmioFlags, 
 				      pI740->PciTag, 
 				      pI740->MMIOAddr,
 				      0x80000);
+#else
+  {
+    void** result = (void**)&pI740->MMIOBase;
+    int err = pci_device_map_range(pI740->PciInfo,
+				   pI740->MMIOAddr,
+				   0x80000,
+				   PCI_DEV_MAP_FLAG_WRITABLE,
+				   result);
+    
+    if (err) 
+      return FALSE;
+  }
+
+#endif
   if (!pI740->MMIOBase) return FALSE;
 
+#ifndef XSERVER_LIBPCIACCESS
   pI740->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
 				pI740->PciTag,
 				pI740->LinearAddr,
 				pI740->FbMapSize);
+#else
+  {
+    void** result = (void**)&pI740->FbBase;
+    int err = pci_device_map_range(pI740->PciInfo,
+				   pI740->LinearAddr,
+				   pI740->FbMapSize,
+				   PCI_DEV_MAP_FLAG_WRITABLE |
+				   PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+				   result);
+    
+    if (err) 
+      return FALSE;
+  }
+#endif
   if (!pI740->FbBase) return FALSE;
 
   return TRUE;
@@ -894,10 +926,18 @@ static Bool I740UnmapMem(ScrnInfoPtr pScrn)
 
   pI740 = I740PTR(pScrn);
 
+#ifndef XSERVER_LIBPCIACCESS
   xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pI740->MMIOBase, 0x80000);
+#else
+  pci_device_unmap_range(pI740->PciInfo, pI740->MMIOBase, 0x80000);
+#endif
   pI740->MMIOBase=0;
 
+#ifndef XSERVER_LIBPCIACCESS
   xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pI740->FbBase, pI740->FbMapSize);
+#else
+  pci_device_unmap_range(pI740->PciInfo, pI740->FbBase, pI740->FbMapSize);
+#endif
   pI740->FbBase = 0;
   return TRUE;
 }
diff --git a/src/i740_pcirename.h b/src/i740_pcirename.h
new file mode 100644
index 0000000..cbd3dcf
--- /dev/null
+++ b/src/i740_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef ASTPCIRENAME_H
+#define ASTPCIRENAME_H
+
+enum region_type {
+    REGION_MEM,
+    REGION_IO 
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus,    \
+                                    (_pcidev)->device, \
+                                    (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type)             \
+    (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+                             : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+    (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev)        (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev)        (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev)      (((_pcidev)->domain << 8) | \
+                                    (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev)      ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b)        ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */


Index: xorg-x11-drv-i740.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i740/devel/xorg-x11-drv-i740.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-i740.spec	20 Feb 2008 07:26:06 -0000	1.16
+++ xorg-x11-drv-i740.spec	10 Mar 2008 02:30:24 -0000	1.17
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 i740 video driver
 Name:      xorg-x11-drv-i740
 Version:   1.1.0
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,8 +14,11 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i740.xinf
 
+Patch1: i740-pciaccess.patch
+
 ExcludeArch: s390 s390x
 
+BuildRequires: automake autoconf libtool
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
 Requires:  hwdata
@@ -27,7 +30,9 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch1 -p1 -b .pciaccess
 %build
+autoreconf -v --install
 %configure --disable-static
 make
 
@@ -53,6 +58,9 @@
 %{_mandir}/man4/i740.4*
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  1.1.0-7
+- pciaccess conversion
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 1.1.0-6
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 02:32:24 2008
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 10 Mar 2008 02:32:24 GMT
Subject: rpms/ustr/devel ustr.spec,1.19,1.20
Message-ID: <200803100232.m2A2WOTb008848@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/ustr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8814

Modified Files:
	ustr.spec 
Log Message:
* Sun Mar  9 2008 James Antill  - 1.0.4-6
- Fix dir. ownership bug.
- Resolves: rhbz#436711



Index: ustr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/devel/ustr.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ustr.spec	6 Mar 2008 03:49:32 -0000	1.19
+++ ustr.spec	10 Mar 2008 02:31:50 -0000	1.20
@@ -27,7 +27,7 @@
 
 Name: ustr
 Version: 1.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: String library, very low memory overhead, simple to import
 Group: System Environment/Libraries
 License: MIT or LGPLv2+ or BSD
@@ -125,7 +125,7 @@
 %{_datadir}/ustr-%{version}
 %{_bindir}/ustr-import
 %if %{multilib_inst}
-%{_libexecdir}/ustr-%{version}/ustr-import*
+%{_libexecdir}/ustr-%{version}
 %endif
 %{_includedir}/ustr.h
 %{_includedir}/ustr-*.h
@@ -151,6 +151,10 @@
 
 
 %changelog
+* Sun Mar  9 2008 James Antill  - 1.0.4-6
+- Fix dir. ownership bug.
+- Resolves: rhbz#436711
+
 * Wed Mar  5 2008 James Antill  - 1.0.4-5
 - New new upstream: 1.0.4
 



From fedora-extras-commits at redhat.com  Mon Mar 10 02:35:21 2008
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 10 Mar 2008 02:35:21 GMT
Subject: rpms/ustr/F-8 ustr.spec,1.8,1.9
Message-ID: <200803100235.m2A2ZLKw008943@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/ustr/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8915

Modified Files:
	ustr.spec 
Log Message:
* Sun Mar  9 2008 James Antill  - 1.0.4-6
- Fix missing multilib. dir. ownership
- Resolves: rhbz#436711



Index: ustr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/F-8/ustr.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ustr.spec	6 Mar 2008 04:01:06 -0000	1.8
+++ ustr.spec	10 Mar 2008 02:34:45 -0000	1.9
@@ -27,7 +27,7 @@
 
 Name: ustr
 Version: 1.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: String library, very low memory overhead, simple to import
 Group: System Environment/Libraries
 License: MIT or LGPLv2+ or BSD
@@ -125,7 +125,7 @@
 %{_datadir}/ustr-%{version}
 %{_bindir}/ustr-import
 %if %{multilib_inst}
-%{_libexecdir}/ustr-%{version}/ustr-import*
+%{_libexecdir}/ustr-%{version}
 %endif
 %{_includedir}/ustr.h
 %{_includedir}/ustr-*.h
@@ -151,6 +151,10 @@
 
 
 %changelog
+* Sun Mar  9 2008 James Antill  - 1.0.4-6
+- Fix missing multilib. dir. ownership
+- Resolves: rhbz#436711
+
 * Wed Mar  5 2008 James Antill  - 1.0.4-5
 - New new upstream: 1.0.4
 



From fedora-extras-commits at redhat.com  Mon Mar 10 02:37:22 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 02:37:22 +0000
Subject: [pkgdb] fprobe-ulog (Fedora EPEL, 4) updated by kevin
Message-ID: <200803100239.m2A2dppD019754@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 4 branch for fprobe-ulog
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fprobe-ulog (Fedora EPEL 4)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fprobe-ulog (Fedora EPEL 4)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fprobe-ulog (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fprobe-ulog



From fedora-extras-commits at redhat.com  Mon Mar 10 02:37:22 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 02:37:22 +0000
Subject: [pkgdb] fprobe-ulog (Fedora EPEL, 5) updated by kevin
Message-ID: <200803100239.m2A2dppG019754@bastion.fedora.phx.redhat.com>

Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for fprobe-ulog
Kevin Fenzi (kevin) has set commit to Approved for cvsextras on fprobe-ulog (Fedora EPEL 5)
Kevin Fenzi (kevin) has set build to Approved for cvsextras on fprobe-ulog (Fedora EPEL 5)
Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on fprobe-ulog (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fprobe-ulog



From fedora-extras-commits at redhat.com  Mon Mar 10 02:45:57 2008
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Mar 2008 02:45:57 GMT
Subject: rpms/sigscheme/devel sigscheme.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200803100245.m2A2jv0R009349@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/sigscheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9313/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sigscheme.spec 
Log Message:
Initial import



--- NEW FILE sigscheme.spec ---
Name:		sigscheme
Version:	0.7.6
Release:	2%{?dist}
License:	BSD
URL:		http://code.google.com/p/sigscheme/wiki/SigScheme
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libgcroots-devel

Source0:	http://sigscheme.googlecode.com/files/%{name}-%{version}.tar.bz2


Summary:	R5RS Scheme interpreter for embedded use
Group:		Development/Languages

%description
sigscheme is a R5RS Scheme interpreter that features small footprint,
low memory consumption, multibytes characters handling and more.

%package devel
Summary:	Development files for sigscheme
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
sigscheme is a R5RS Scheme interpreter that features small footprint,
low memory consumption, multibytes characters handling and more.

This package contains header files and development library.

%prep
%setup -q

%build
%configure --disable-static --with-libgcroots=installed
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p"

# Remove unnecessary files
rm $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT%{_docdir}/sigscheme

%clean
rm -rf  $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr (-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS QALog README RELNOTE TODO
%doc doc/*.html doc/*.txt
%{_bindir}/sscm
%{_libdir}/libsscm.so.*

%files devel
%defattr (-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS QALog README RELNOTE TODO
%{_includedir}/sigscheme
%{_libdir}/libsscm.so
%{_libdir}/pkgconfig/sigscheme.pc

%changelog
* Wed Mar  5 2008 Akira TAGOH  - 0.7.6-2
- Get rid of the explicit dependency of ldconfig. (#436059)
- Fix the timestamp issue.

* Wed Mar  5 2008 Akira TAGOH  - 0.7.6-1
- Initial packaging.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sigscheme/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2008 17:55:10 -0000	1.1
+++ .cvsignore	10 Mar 2008 02:45:19 -0000	1.2
@@ -0,0 +1 @@
+sigscheme-0.7.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sigscheme/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2008 17:55:10 -0000	1.1
+++ sources	10 Mar 2008 02:45:20 -0000	1.2
@@ -0,0 +1 @@
+1763a037e8e1c8e015f90221557e4ec9  sigscheme-0.7.6.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 02:49:12 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 02:49:12 GMT
Subject: rpms/gnome-python2/devel .cvsignore, 1.33, 1.34 gnome-python2.spec, 
	1.16, 1.17 sources, 1.33, 1.34
Message-ID: <200803100249.m2A2nCiZ009445@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9419

Modified Files:
	.cvsignore gnome-python2.spec sources 
Log Message:

* Sun Mar 09 2008 Matthew Barnes  - 2.22.0-1.fc9
- Update to 2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	23 Feb 2008 22:13:56 -0000	1.33
+++ .cvsignore	10 Mar 2008 02:48:34 -0000	1.34
@@ -1 +1 @@
-gnome-python-2.21.1.tar.bz2
+gnome-python-2.22.0.tar.bz2


Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-python2.spec	23 Feb 2008 22:13:56 -0000	1.16
+++ gnome-python2.spec	10 Mar 2008 02:48:34 -0000	1.17
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for 2.19.1
+# Last updated for 2.22.0
 # The order here corresponds to that in configure.ac,
 # for easier comparison.  Please do not alphabetize.
 %define pygtk_version                   2.10.3
@@ -20,14 +20,14 @@
 ### Abstract ###
 
 Name: gnome-python2
-Version: 2.21.1
+Version: 2.22.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: The sources for the PyGNOME Python extension module
 URL: http://download.gnome.org/sources/gnome-python/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Source: http://download.gnome.org/sources/gnome-python/2.20/gnome-python-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-python/2.22/gnome-python-%{version}.tar.bz2
 
 ### Dependencies ###
 
@@ -188,6 +188,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Sun Mar 09 2008 Matthew Barnes  - 2.22.0-1.fc9
+- Update to 2.22.0
+
 * Sat Feb 23 2008 Matthew Barnes  - 2.21.0-3.fc9
 - Update to 2.21.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	23 Feb 2008 22:13:56 -0000	1.33
+++ sources	10 Mar 2008 02:48:34 -0000	1.34
@@ -1 +1 @@
-21ccbf207dc4c8e165046e0c831baae2  gnome-python-2.21.1.tar.bz2
+ff84c54314adec195149c59365e35a13  gnome-python-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 02:53:33 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 02:53:33 GMT
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.19,
	1.20 gnome-python2-desktop.spec, 1.26, 1.27 sources, 1.19, 1.20
Message-ID: <200803100253.m2A2rXjm009661@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9628

Modified Files:
	.cvsignore gnome-python2-desktop.spec sources 
Log Message:

* Sun Mar 09 2008 Matthew Barnes  - 2.22.0-1.fc9
- Update to 2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	23 Feb 2008 22:12:55 -0000	1.19
+++ .cvsignore	10 Mar 2008 02:52:48 -0000	1.20
@@ -1 +1 @@
-gnome-python-desktop-2.21.3.tar.bz2
+gnome-python-desktop-2.22.0.tar.bz2


Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-python2-desktop.spec	23 Feb 2008 22:12:55 -0000	1.26
+++ gnome-python2-desktop.spec	10 Mar 2008 02:52:48 -0000	1.27
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for version 2.19.1
+# Last updated for version 2.22.0
 # The order here corresponds to that in configure.ac,
 # for easier comparison.  Please do not alphabetize.
 %define pygtk_version                   2.10.3
@@ -13,18 +13,19 @@
 %define libgtop_version                 2.13.0
 %define nautilus_cd_burner_version      2.15.3
 %define gnome_media_version             2.10.0
+%define gconf2_version			2.10.0
 %define metacity_version                2.19.8
 %define librsvg2_version                2.13.93
 %define gnome_keyring_version           0.5.0
 %define gnome_desktop_version           2.10.0
 %define totem_version                   1.4.0
-%define bug_buddy_version               2.16.0
 %define eds_version			1.4.0
+%define bug_buddy_version               2.16.0
 
 ### Abstract ###
 
 Name: gnome-python2-desktop
-Version: 2.21.3
+Version: 2.22.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Languages
@@ -41,6 +42,7 @@
 BuildRequires: bug-buddy >= %{bug_buddy_version}
 BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: glib2-devel >= %{glib_version}
+BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
@@ -298,6 +300,9 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Sun Mar 09 2008 Matthew Barnes  - 2.22.0-1.fc9
+- Update to 2.22.0
+
 * Sat Feb 23 2008 Matthew Barnes  - 2.21.3-1.fc9
 - Update to 2.21.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	23 Feb 2008 22:12:55 -0000	1.19
+++ sources	10 Mar 2008 02:52:48 -0000	1.20
@@ -1 +1 @@
-f6f10bde245a2e333422dee253b3260a  gnome-python-desktop-2.21.3.tar.bz2
+504877a973f6abc0788283232cd703cb  gnome-python-desktop-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 03:08:37 2008
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 10 Mar 2008 03:08:37 GMT
Subject: rpms/perl-JSON-XS/devel .cvsignore, 1.5, 1.6 perl-JSON-XS.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200803100308.m2A38bsa017124@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17098

Modified Files:
	.cvsignore perl-JSON-XS.spec sources 
Log Message:
* Sun Mar 09 2008 Chris Weyl  2.01-1
- update to 2.x series before F9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON-XS/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Oct 2007 15:22:56 -0000	1.5
+++ .cvsignore	10 Mar 2008 03:08:03 -0000	1.6
@@ -1 +1 @@
-JSON-XS-1.52.tar.gz
+JSON-XS-2.01.tar.gz


Index: perl-JSON-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON-XS/devel/perl-JSON-XS.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-JSON-XS.spec	7 Mar 2008 02:05:27 -0000	1.8
+++ perl-JSON-XS.spec	10 Mar 2008 03:08:03 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-JSON-XS
-Version:        1.52
-Release:        3%{?dist}
+Version:        2.01 
+Release:        1%{?dist}
 Summary:        JSON serialising/deserialising, done correctly and fast
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -36,8 +36,8 @@
 
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
+find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} %{buildroot}/*
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Mar 09 2008 Chris Weyl  2.01-1
+- update to 2.x series before F9
+
 * Thu Mar 06 2008 Tom "spot" Callaway  - 1.52-3
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON-XS/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Oct 2007 15:22:56 -0000	1.5
+++ sources	10 Mar 2008 03:08:03 -0000	1.6
@@ -1 +1 @@
-bf8a8846be96ea36bd832de39fbef879  JSON-XS-1.52.tar.gz
+9e802215f9c915f2b3edfaeaba8cf2fb  JSON-XS-2.01.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 03:20:29 2008
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 10 Mar 2008 03:20:29 GMT
Subject: rpms/perl-JSON/devel .cvsignore, 1.6, 1.7 perl-JSON.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200803100320.m2A3KT9D017284@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-JSON/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17259

Modified Files:
	.cvsignore perl-JSON.spec sources 
Log Message:
* Sun Mar 09 2008 Chris Weyl  2.07-1
- update to 2.x series before F9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Nov 2007 02:17:02 -0000	1.6
+++ .cvsignore	10 Mar 2008 03:19:50 -0000	1.7
@@ -1 +1 @@
-JSON-1.15.tar.gz
+JSON-2.07.tar.gz


Index: perl-JSON.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON/devel/perl-JSON.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-JSON.spec	5 Mar 2008 16:51:42 -0000	1.7
+++ perl-JSON.spec	10 Mar 2008 03:19:50 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-JSON
-Version:        1.15
-Release:        2%{?dist}
+Version:        2.07 
+Release:        1%{?dist}
 Summary:        Parse and convert to JSON (JavaScript Object Notation)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -37,14 +37,15 @@
 %setup -q -n JSON-%{version}
 
 # make rpmlint happy...
-find . -type f -exec chmod -c -x {} \;
-sed -i 's/\r//' README t/*.t
+find .  -type f -exec chmod -c -x {} + 
+find t/ -type f -exec perl -pi -e 's|^#! perl|#!/usr/bin/perl|' {} +
+sed -i 's/\r//' README t/*
 
 # Filter unwanted Provides:
 cat << \EOF > %{name}-prov
 #!/bin/sh
 %{__perl_provides} $* |\
-  sed -e '/perl(My.*)/d'
+  sed -e '/perl(My.*)/d; /perl(_unicode_handling)/d'
 EOF
 
 %define __perl_provides %{_builddir}/JSON-%{version}/%{name}-prov
@@ -59,7 +60,7 @@
 
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -type f -name .packlist -exec rm -f {} +
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} %{buildroot}/*
@@ -77,6 +78,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Mar 09 2008 Chris Weyl  2.07-1
+- update to 2.x series before F9
+
 * Wed Mar  5 2008 Tom "spot" Callaway  1.15-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-JSON/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Nov 2007 02:17:02 -0000	1.6
+++ sources	10 Mar 2008 03:19:50 -0000	1.7
@@ -1 +1 @@
-4f96dd0b68b644bc07453afc29105b7c  JSON-1.15.tar.gz
+1ca7b2851f1a8e835eec46d013da8a2b  JSON-2.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 03:42:08 2008
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Mon, 10 Mar 2008 03:42:08 GMT
Subject: rpms/maradns/devel maradns.init, NONE, 1.1 maradns.spec, NONE,
	1.1 zoneserver.init, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200803100342.m2A3g8l7018025@cvs-int.fedora.redhat.com>

Author: static

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

Modified Files:
	.cvsignore sources 
Added Files:
	maradns.init maradns.spec zoneserver.init 
Log Message:
Initial checkin



--- NEW FILE maradns.init ---
#!/bin/bash
# MaraDNS	This shell script takes care of starting and stopping MaraDNS
# chkconfig: - 55 45
# description: MaraDNS is secure Domain Name Server (DNS)
# probe: true

# Copyright 2005-2006 Sam Trenholme

# TERMS

# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:

# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.

# This software is provided 'as is' with no guarantees of correctness or
# fitness for purpose.

# This is a script which stops and starts the MaraDNS process
# The first line points to bash because I don't have a true Solaris /bin/sh
# to test this against.

# The following is a pointer to the MaraDNS program
if [ -x "/usr/sbin/maradns" ] ; then
	MARADNS="/usr/sbin/maradns"
elif [ -x "/usr/sbin/maradns.authonly" ] ; then
	MARADNS="/usr/sbin/maradns.authonly"
elif [ -x "/usr/local/sbin/maradns" ] ; then
	MARADNS="/usr/local/sbin/maradns"
elif [ -x "/usr/local/sbin/maradns.authonly" ] ; then
	MARADNS="/usr/local/sbin/maradns.authonly"
else
	echo unable to find maradns
	exit 1
fi

# The following is a pointer to the duende daemonizer
if [ -x "/usr/sbin/duende" ] ; then
	DUENDE="/usr/sbin/duende"
elif [ -x "/usr/local/sbin/duende" ] ; then
	DUENDE="/usr/local/sbin/duende"
elif [ -x "/usr/local/bin/duende" ] ; then
	DUENDE="/usr/local/bin/duende"
elif [ -x "/usr/bin/duende" ] ; then
	DUENDE="/usr/bin/duende"
else
	echo unable to find duende
	exit 1
fi

# The following is the directory we place MaraDNS log entries in
LOGDIR="/var/log"

# The following is a list of all mararc files which we will load or
# unload;
# Simple case: Only one MaraDNS process, using the /etc/mararc file
MARARCS="/etc/mararc"
# Case two: Three MaraDNS processes, one using /etc/mararc.1, the second one
# using /etc/mararc.2, and the third one using /etc/mararc.3
# (this is not as essential as it was in the 1.0 days; MaraDNS can now bind
#  to multiple IPs)
#MARARCS="/etc/mararc.1 /etc/mararc.2 /etc/mararc.3"

# source function library
. /etc/rc.d/init.d/functions

RETVAL=0

start() {
	echo -n $"Starting all MaraDNS processes: "
	for rcfile in $MARARCS ; do
		echo -n $"$rcfile "
		# Duende syslogs MaraDNS' output messages and daemonizes MaraDNS
		daemon $DUENDE $MARADNS -f $rcfile || RETVAL=$?
	done
	echo
	[ $RETVAL -eq 0 ] && echo `pidof maradns` > /var/run/maradns.pid && touch /var/lock/subsys/maradns
}

stop() {
	echo -n $"Stopping MaraDNS: "
	killproc maradns
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/maradns
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|reload)
	stop
	start
	;;
  condrestart)
	[ -f /var/lock/subsys/maradns ] && restart
	;;
  status)
	status maradns
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
	exit 1
esac

exit $RETVAL



--- NEW FILE maradns.spec ---
Name:		maradns
Version:	1.3.07.08
Release:	1%{?dist}
Summary:	Authoritative and recursive DNS server made with security in mind

Source0:	http://www.maradns.org/download/1.3/%{version}/%{name}-%{version}.tar.bz2
Source1:	maradns.init
Source2:	zoneserver.init
Group:		System Environment/Daemons
License:	BSD
URL:		http://www.maradns.org/

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(pre):		shadow-utils
Requires(post):		/sbin/chkconfig
Requires(preun):	/sbin/chkconfig
Requires(preun):	/sbin/service
Requires:		initscripts

%description
MaraDNS is a package that implements the Domain Name Service (DNS), an
essential internet service. MaraDNS has the following advantages:
	* Secure.
	* Supported.
	* Easy to use.
	* Small.
	* Open Source.

%prep
%setup -q

# wrong permissions
chmod 0644 doc/en/man/make.pdf
chmod 0644 doc/en/tutorial/make.index
chmod 0644 doc/en/webpage/make.page

# wrong EOL encoding
pushd doc
sed -i 's/\r//' pt_br/source/compile.ej
sed -i 's/\r//' pt_br/source/authoritative.ej
sed -i 's/\r//' pt_br/source/dangling.ej
sed -i 's/\r//' pt_br/source/zoneserver.ej
sed -i 's/\r//' pt_br/source/csv2.ej
popd

# wrong char encoding
pushd doc/pt_br/source
for file in *; do
	iconv -f iso8859-1 -t utf-8 $file > $file.new && mv $file.new $file
done
popd


%build

# We don't use %%configure here because this is a homebrew configure not generated by autoconf

./configure
%{__make} %{?_smp_mflags} FLAGS="%{optflags} -DSELECT_PROBLEM"


%install
%{__rm} -rf %{buildroot}

# create /etc/maradns and /etc/mararc first
%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/maradns/logger/
%{__install} -D -m 0644 build/rpm.mararc %{buildroot}%{_sysconfdir}/mararc

# sbin files
%{__install} -D -m 0755 server/maradns %{buildroot}%{_sbindir}/maradns
%{__install} -D -m 0755 tcp/zoneserver %{buildroot}%{_sbindir}/zoneserver

# bin files
%{__install} -D -m 0755 tcp/getzone %{buildroot}%{_bindir}/getzone
%{__install} -D -m 0755 tcp/fetchzone %{buildroot}%{_bindir}/fetchzone
%{__install} -D -m 0755 tools/askmara %{buildroot}%{_bindir}/askmara
%{__install} -D -m 0755 tools/duende %{buildroot}%{_bindir}/duende

# man pages
%{__install} -d -m 0755 %{buildroot}%{_mandir}/man{1,5,8}
%{__install} -D -m 0644 -t %{buildroot}%{_mandir}/man1/ \
	doc/en/man/askmara.1 \
	doc/en/man/getzone.1 \
	doc/en/man/fetchzone.1
%{__install} -D -m 0644 -t %{buildroot}%{_mandir}/man5/ \
	doc/en/man/csv1.5 \
	doc/en/man/csv2.5 \
	doc/en/man/csv2_txt.5 \
	doc/en/man/mararc.5
%{__install} -D -m 0644 -t %{buildroot}%{_mandir}/man8/ \
	doc/en/man/maradns.8 \
	doc/en/man/zoneserver.8 \
	doc/en/man/duende.8

# init files
%{__install} -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/maradns
%{__install} -D -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/maradns-zoneserver

%{__rm} CHANGELOG CREDITS FAQ
ln -fs en/changelog.txt CHANGELOG
ln -fs en/credits.txt CREDITS
ln -fs en/faq.txt FAQ


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING CREDITS FAQ doc/*
%doc maradns.gpg.key

%config(noreplace) %{_sysconfdir}/mararc
%attr(-,maradns,maradns) %{_sysconfdir}/maradns/
%{_sysconfdir}/init.d/maradns
%{_sysconfdir}/init.d/maradns-zoneserver

%{_bindir}/askmara
%{_bindir}/duende
%{_bindir}/fetchzone
%{_bindir}/getzone
%{_sbindir}/maradns
%{_sbindir}/zoneserver

%{_mandir}/man1/askmara.1*
%{_mandir}/man1/getzone.1*
%{_mandir}/man1/fetchzone.1*
%{_mandir}/man5/csv1.5*
%{_mandir}/man5/csv2.5*
%{_mandir}/man5/csv2_txt.5*
%{_mandir}/man5/mararc.5*
%{_mandir}/man8/maradns.8*
%{_mandir}/man8/zoneserver.8*
%{_mandir}/man8/duende.8*


%pre
if [ $1 -eq 1 ]; then
	getent group maradns >/dev/null || groupadd -r maradns
	getent passwd maradns >/dev/null || \
	useradd -r -g maradns -d /etc/maradns -s /sbin/nologin \
		-c "MaraDns chroot user" maradns
	exit 0
fi


%post
if [ $1 -eq 1 ]; then
	echo maradns_uid=$(id -u maradns) >> %{_sysconfdir}/mararc
	echo maradns_gid=$(id -g maradns) >> %{_sysconfdir}/mararc
	/sbin/chkconfig --add maradns
	/sbin/chkconfig --add maradns-zoneserver
fi


%preun
if [ $1 -eq 0 ]; then
	/sbin/service maradns stop &>/dev/null || :
	/sbin/chkconfig --del maradns
	/sbin/service maradns-zoneserver stop &>/dev/null || :
	/sbin/chkconfig --del maradns-zoneserver
fi

%postun
if [ $1 -eq 1 ]; then
	/sbin/service maradns condrestart &>/dev/null || :
	/sbin/service maradns-zoneserver condrestart &>/dev/null || :
fi


%changelog
* Mon Jan 28 2008 Brandon Holbrook  - 1.3.07.08-1
- Updated to 1.3.07.08

* Mon Oct  1 2007 Brandon Holbrook  - 1.2.12.08-1
- Updated to 1.2.12.08
- Converted non-UTF8-encoded files to UTF8

* Thu Aug 23 2007 Brandon Holbrook  - 1.2.12.07-1
- Updated to 1.2.12.07
- Added a maradns user/group for chroot

* Thu Jun 28 2007 Brandon Holbrook  - 1.2.12.06-3
- fix some tarball permissions and line endings
- Created new init scripts with more functions

* Sun Jun 24 2007 Brandon Holbrook  - 1.2.12.06-2
- manually run ./configure and make rather than the included ./compile.sh
	to preserve optflags
- Add dependency on chkconfig and initscripts

* Sat Jun 23 2007 Brandon Holbrook  - 1.2.12.06-1
- Release 1.2.12.06
- Rewritten to call install manually instead of 'make install'


--- NEW FILE zoneserver.init ---
#!/bin/bash
# MaraDNS Zoneserver	This shell script takes care of starting and stopping MaraDNS' Zone Server daemon
# chkconfig: - 55 45
# description: MaraDNS Zoneserver is responsible for handling DNS zone transfers as well as any TCP DNS queries
# probe: true

# Copyright 2005-2006 Sam Trenholme

# TERMS

# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:

# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.

# This software is provided 'as is' with no guarantees of correctness or
# fitness for purpose.

# This is a script which stops and starts the MaraDNS zoneserver process
# The first line points to bash because I don't have a true Solaris /bin/sh
# to test this against.

# The following is a pointer to the MaraDNS program
if [ -x "/usr/sbin/zoneserver" ] ; then
	ZONESERVER="/usr/sbin/zoneserver"
elif [ -x "/usr/local/sbin/zoneserver" ] ; then
	ZONESERVER="/usr/local/sbin/zoneserver"
else
	echo unable to find zoneserver
	exit 1
fi

# The following is a pointer to the duende daemonizer
if [ -x "/usr/sbin/duende" ] ; then
	DUENDE="/usr/sbin/duende"
elif [ -x "/usr/local/sbin/duende" ] ; then
	DUENDE="/usr/local/sbin/duende"
elif [ -x "/usr/bin/duende" ] ; then
	DUENDE="/usr/bin/duende"
elif [ -x "/usr/local/bin/duende" ] ; then
	DUENDE="/usr/local/bin/duende"
else
	echo unable to find duende
	exit 1
fi

# The following is the directory we place MaraDNS log entries in
LOGDIR="/var/log"

# The following is a list of all mararc files which we will load or
# unload;
# Simple case: Only one MaraDNS zoneserver process, using the /etc/mararc file
MARARCS="/etc/mararc"
# Case two: Three MaraDNS processes, one using /etc/mararc.1, the second one
# using /etc/mararc.2, and the third one using /etc/mararc.3
#MARARCS="/etc/mararc.1 /etc/mararc.2 /etc/mararc.3"

# source function library
. /etc/rc.d/init.d/functions

RETVAL=0

start() {
	echo -n $"Starting all MaraDNS-Zoneserver processes: "
	for rcfile in $MARARCS ; do
		echo -n $"$rcfile "
		# Duende syslogs MaraDNS' output messages and daemonizes MaraDNS
		daemon $DUENDE $ZONESERVER -f $rcfile || RETVAL=$?
	done
	echo
	[ $RETVAL -eq 0 ] && echo `pidof zoneserver` > /var/run/zoneserver.pid && touch /var/lock/subsys/maradns-zoneserver
}

stop() {
	echo -n $"Stopping MaraDNS-Zoneserver: "
	killproc zoneserver
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/maradns-zoneserver
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|reload)
	stop
	start
	;;
  condrestart)
	[ -f /var/lock/subsys/maradns-zoneserver ] && restart
	;;
  status)
	status zoneserver
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
	exit 1
esac

exit $RETVAL



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maradns/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Mar 2008 19:33:28 -0000	1.1
+++ .cvsignore	10 Mar 2008 03:41:34 -0000	1.2
@@ -0,0 +1 @@
+maradns-1.3.07.08.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maradns/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Mar 2008 19:33:28 -0000	1.1
+++ sources	10 Mar 2008 03:41:34 -0000	1.2
@@ -0,0 +1 @@
+d44d7e1309c7c05654e62b52c6ab6822  maradns-1.3.07.08.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 03:42:14 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 03:42:14 GMT
Subject: rpms/xorg-x11-drv-s3virge/devel s3v-pciaccess.patch, NONE,
	1.1 xorg-x11-drv-s3virge.spec, 1.16, 1.17
Message-ID: <200803100342.m2A3gE4s018030@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-s3virge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17962

Modified Files:
	xorg-x11-drv-s3virge.spec 
Added Files:
	s3v-pciaccess.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  1.9.1-7
- pciaccess conversion


s3v-pciaccess.patch:

--- NEW FILE s3v-pciaccess.patch ---
diff --git a/configure.ac b/configure.ac
index d4cf68f..43e2a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,10 +58,23 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
 
 # Checks for header files.
 AC_HEADER_STDC
 
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
+
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
 
diff --git a/src/s3v.h b/src/s3v.h
index a20630d..90800b6 100644
--- a/src/s3v.h
+++ b/src/s3v.h
@@ -28,6 +28,8 @@ in this Software without prior written authorization from the XFree86 Project.
 #ifndef _S3V_H
 #define _S3V_H
 
+#include "s3v_pcirename.h"
+
 #include 
 
 /* All drivers should typically include these */
diff --git a/src/s3v_dga.c b/src/s3v_dga.c
index 4449a67..626963f 100644
--- a/src/s3v_dga.c
+++ b/src/s3v_dga.c
@@ -67,12 +67,7 @@ in this Software without prior written authorization from the XFree86 Project.
 #include "xaa.h"
 #include "xaalocal.h"
 #include "s3v.h"
-#if 0
-#include "mga_bios.h"
-#include "mga.h"
-#include "mga_reg.h"
-#include "mga_macros.h"
-#endif
+
 #include "dgaproc.h"
 
 
@@ -84,10 +79,7 @@ static void S3V_SetViewport(ScrnInfoPtr, int, int, int);
 static void S3V_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
 static void S3V_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
 /* dummy... */
-#if 0
-static void MGA_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, 
-					unsigned long);
-#endif
+
 
 static
 DGAFunctionRec S3V_DGAFuncs = {
@@ -326,19 +318,7 @@ S3V_BlitRect(
     }
 }
 
-#if 0
-static void 
-MGA_BlitTransRect(
-   ScrnInfoPtr pScrn, 
-   int srcx, int srcy, 
-   int w, int h, 
-   int dstx, int dsty,
-   unsigned long color
-){
-  /* this one should be separate since the XAA function would
-     prohibit usage of ~0 as the key */
-}
-#endif
+
 
 static Bool 
 S3V_OpenFramebuffer(
@@ -352,7 +332,7 @@ S3V_OpenFramebuffer(
     S3VPtr ps3v = S3VPTR(pScrn);
 
     *name = NULL; 		/* no special device */
-    *mem = (unsigned char*)ps3v->PciInfo->memBase[0];
+    *mem = (unsigned char*)PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM);
     *size = ps3v->videoRambytes;
     *offset = 0;
     *flags = DGA_NEED_ROOT;
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 49f87af..e5d8f8a 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -29,6 +29,7 @@ in this Software without prior written authorization from the XFree86 Project.
 #include "config.h"
 #endif
 
+#include 
 #include "xf86Resources.h"
 /* Needed by Resources Access Control (RAC) */
 #include "xf86RAC.h"
@@ -121,10 +122,10 @@ static int pix24bpp = 0;
  
 #define S3VIRGE_NAME "S3VIRGE"
 #define S3VIRGE_DRIVER_NAME "s3virge"
-#define S3VIRGE_VERSION_NAME "1.9.1"
-#define S3VIRGE_VERSION_MAJOR   1
-#define S3VIRGE_VERSION_MINOR   9
-#define S3VIRGE_PATCHLEVEL      1
+#define S3VIRGE_VERSION_NAME PACKAGE_VERSION
+#define S3VIRGE_VERSION_MAJOR   PACKAGE_VERSION_MAJOR
+#define S3VIRGE_VERSION_MINOR   PACKAGE_VERSION_MINOR
+#define S3VIRGE_PATCHLEVEL      PACKAGE_VERSION_PATCHLEVEL
 #define S3VIRGE_DRIVER_VERSION ((S3VIRGE_VERSION_MAJOR << 24) | \
 				(S3VIRGE_VERSION_MINOR << 16) | \
 				S3VIRGE_PATCHLEVEL)
@@ -418,7 +419,7 @@ s3virgeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 #endif /* XFree86LOADER */
 
 
-static unsigned char *find_bios_string(PCITAG Tag, int BIOSbase, char *match1, char *match2)
+static unsigned char *find_bios_string(S3VPtr ps3v, int BIOSbase, char *match1, char *match2)
 {
 #define BIOS_BSIZE 1024
 #define BIOS_BASE  0xc0000
@@ -429,8 +430,13 @@ static unsigned char *find_bios_string(PCITAG Tag, int BIOSbase, char *match1, c
 
    if (!init) {
       init = 1;
-      if (xf86ReadDomainMemory(Tag, BIOSbase, BIOS_BSIZE, bios) != BIOS_BSIZE)
+#ifndef XSERVER_LIBPCIACCESS
+      if (xf86ReadDomainMemory(ps3v->PciTag, BIOSbase, BIOS_BSIZE, bios) != BIOS_BSIZE)
 	 return NULL;
+#else
+      if (pci_device_read_rom(ps3v->PciInfo, bios))
+	return NULL;
+#endif
       if ((bios[0] != 0x55) || (bios[1] != 0xaa))
 	 return NULL;
    }
@@ -521,9 +527,12 @@ S3VProbe(DriverPtr drv, int flags)
 	 */
 	return FALSE;
     }
+
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86GetPciVideoInfo() == NULL) {
 	return FALSE;
     }
+#endif
 
     numUsed = xf86MatchPciInstances(S3VIRGE_NAME, PCI_S3_VENDOR_ID,
 				    S3VChipsets, S3VPciChipsets, devSections,
@@ -941,7 +950,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
 		   ps3v->Chipset);
     } else {
 	from = X_PROBED;
-	ps3v->Chipset = ps3v->PciInfo->chipType;
+	ps3v->Chipset = PCI_DEV_DEVICE_ID(ps3v->PciInfo);
 	pScrn->chipset = (char *)xf86TokenToString(S3VChipsets, ps3v->Chipset);
     }								    
     
@@ -950,7 +959,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
 		   ps3v->ChipRev);
     } else {
-	ps3v->ChipRev = ps3v->PciInfo->chipRev;
+        ps3v->ChipRev = PCI_DEV_REVISION(ps3v->PciInfo);
     }
     xfree(pEnt);
     
@@ -975,8 +984,10 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
 
     xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", pScrn->chipset);
 	
+#ifndef XSERVER_LIBPCIACCESS
     ps3v->PciTag = pciTag(ps3v->PciInfo->bus, ps3v->PciInfo->device,
 			  ps3v->PciInfo->func);
+#endif
 
     /* Handle XVideo after we know chipset, so we can give an */
     /* intelligent comment about support */
@@ -1197,7 +1208,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
     *      <= 8bpp: 191500
     */
 
-   if (find_bios_string(ps3v->PciTag, BIOS_BASE, "S3 86C325",
+   if (find_bios_string(ps3v, BIOS_BASE, "S3 86C325",
 			"MELCO WGP-VG VIDEO BIOS") != NULL) {
       if (xf86GetVerbosity())
 	 xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "MELCO BIOS found\n");
@@ -2298,15 +2309,30 @@ S3VMapMem(ScrnInfoPtr pScrn)
 					/* so that we can use registers map */
 					/* structure - see newmmio.h */
 					/* around 0x10000 from MemBase */
+#ifndef XSERVER_LIBPCIACCESS
   ps3v->MapBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, ps3v->PciTag,
-			ps3v->PciInfo->memBase[0] + S3_NEWMMIO_REGBASE,
-			S3_NEWMMIO_REGSIZE);
+				PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM) + S3_NEWMMIO_REGBASE,
+				S3_NEWMMIO_REGSIZE);
 
   ps3v->MapBaseDense = xf86MapPciMem(pScrn->scrnIndex,
-			VIDMEM_MMIO_32BIT,
-			ps3v->PciTag,
-			ps3v->PciInfo->memBase[0] + S3_NEWMMIO_REGBASE,
-			0x8000);
+				     VIDMEM_MMIO_32BIT,
+				     ps3v->PciTag,
+				     PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM) + S3_NEWMMIO_REGBASE,
+				     0x8000);
+#else
+  {
+    void** result = (void**)&ps3v->MapBase;
+    int err = pci_device_map_range(ps3v->PciInfo,
+				   PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM) + S3_NEWMMIO_REGBASE,
+				   S3_NEWMMIO_REGSIZE,
+				   PCI_DEV_MAP_FLAG_WRITABLE,
+				   result);
+    
+    if (err) 
+      return FALSE;
+  }
+  ps3v->MapBaseDense = ps3v->MapBase;
+#endif
 
   if( !ps3v->MapBase ) {
     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -2315,10 +2341,26 @@ S3VMapMem(ScrnInfoPtr pScrn)
   }
 					/* Map the framebuffer */
   if (ps3v->videoRambytes) { /* not set in PreInit() */
+#ifndef XSERVER_LIBPCIACCESS
       ps3v->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, 
-				   ps3v->PciTag, ps3v->PciInfo->memBase[0],
+				   ps3v->PciTag, PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM),
 				   ps3v->videoRambytes );
 
+#else
+      {
+	void** result = (void**)&ps3v->FBBase;
+	int err = pci_device_map_range(ps3v->PciInfo,
+				       PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM),
+				       ps3v->videoRambytes,
+				       PCI_DEV_MAP_FLAG_WRITABLE |
+				       PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+				       result);
+	
+	if (err) 
+	  return FALSE;
+      }
+#endif
+
       if( !ps3v->FBBase ) {
 	  xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		     "Internal error: could not map framebuffer.\n");
@@ -2329,7 +2371,7 @@ S3VMapMem(ScrnInfoPtr pScrn)
       ps3v->FBStart = ps3v->FBBase;
   }
   
-  pScrn->memPhysBase = ps3v->PciInfo->memBase[0];
+  pScrn->memPhysBase = PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM);
   pScrn->fbOffset = 0;
 
   				/* Set up offset to hwcursor memory area */
@@ -2376,14 +2418,24 @@ S3VUnmapMem(ScrnInfoPtr pScrn)
     ps3v->PrimaryVidMapped = FALSE;
   }
 
+#ifndef XSERVER_LIBPCIACCESS
   xf86UnMapVidMem(pScrn->scrnIndex, (pointer)ps3v->MapBase,
 		  S3_NEWMMIO_REGSIZE);
+#else
+  pci_device_unmap_range(ps3v->PciInfo, ps3v->MapBase,
+			 S3_NEWMMIO_REGSIZE);
+#endif
+
+#ifndef XSERVER_LIBPCIACCESS
   if (ps3v->FBBase)
       xf86UnMapVidMem(pScrn->scrnIndex, (pointer)ps3v->FBBase,
 		      ps3v->videoRambytes);
   xf86UnMapVidMem(pScrn->scrnIndex, (pointer)ps3v->MapBaseDense,
 		  0x8000);
-
+#else
+  pci_device_unmap_range(ps3v->PciInfo, ps3v->FBBase,
+			 ps3v->videoRambytes);
+#endif
   return;
 }
 
@@ -3633,9 +3685,9 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
    * (EE 06/03/99)
    */
   outb(vgaCRIndex, 0x59);         /*@@@EE*/
-  outb(vgaCRReg, ps3v->PciInfo->memBase[0] >> 24);  
+  outb(vgaCRReg, PCI_REGION_MEM(ps3v->PciInfo, 0, REGION_MEM) >> 24);  
   outb(vgaCRIndex, 0x5A);
-  outb(vgaCRReg, ps3v->PciInfo->memBase[0] >> 16);
+  outb(vgaCRReg, PCI_REGION_MEM(ps3v->PciInfo, 0, REGION_MEM) >> 16);
   outb(vgaCRIndex, 0x53);
 #endif
   /* Save register for restore */
diff --git a/src/s3v_pcirename.h b/src/s3v_pcirename.h
new file mode 100644
index 0000000..9321046
--- /dev/null
+++ b/src/s3v_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef S3PCIRENAME_H
+#define S3PCIRENAME_H
+
+enum region_type {
+    REGION_MEM,
+    REGION_IO 
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus,    \
+                                    (_pcidev)->device, \
+                                    (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type)             \
+    (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+                             : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+    (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev)        (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev)        (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev)      (((_pcidev)->domain << 8) | \
+                                    (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev)      ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b)        ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff --git a/src/s3v_xv.c b/src/s3v_xv.c
index 5e5476d..ea015c4 100644
--- a/src/s3v_xv.c
+++ b/src/s3v_xv.c
@@ -64,11 +64,7 @@ static XF86VideoAdaptorPtr S3VSetupImageVideoOverlay(ScreenPtr);
 static int  S3VSetPortAttributeOverlay(ScrnInfoPtr, Atom, INT32, pointer);
 static int  S3VGetPortAttributeOverlay(ScrnInfoPtr, Atom ,INT32 *, pointer);
 
-#if 0
-static XF86VideoAdaptorPtr MGASetupImageVideoTexture(ScreenPtr);
-static int  MGASetPortAttributeTexture(ScrnInfoPtr, Atom, INT32, pointer);
-static int  MGAGetPortAttributeTexture(ScrnInfoPtr, Atom ,INT32 *, pointer);
-#endif
+
 static void S3VStopVideo(ScrnInfoPtr, pointer, Bool);
 static void S3VQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, 
 			unsigned int *, unsigned int *, pointer);
@@ -78,9 +74,6 @@ static int  S3VPutImage(ScrnInfoPtr, short, short, short, short, short,
 static int  S3VQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, 
 			unsigned short *,  int *, int *);
 
-#if 0
-static void MGABlockHandler(int, pointer, pointer, pointer);
-#endif
 
 static void S3VResetVideoOverlay(ScrnInfoPtr);
 
@@ -132,28 +125,8 @@ void S3VInitVideo(ScreenPtr pScreen)
        && ps3v->XVideo
        )
     {
-#if 0
-	if((pMga->Overlay8Plus24 /* || dualhead */ || pMga->TexturedVideo) &&
-	   (pScrn->bitsPerPixel != 24))
-        {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using texture video\n");
-	    newAdaptor = MGASetupImageVideoTexture(pScreen);
-	    pMga->TexturedVideo = TRUE;
-	} else {
-#endif
-
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using overlay video\n");
 	    newAdaptor = S3VSetupImageVideoOverlay(pScreen);
-
-#if 0
-	    pMga->TexturedVideo = FALSE;
-	}*/
-
-	if(!pMga->Overlay8Plus24 /* && !dualhead */)	  
-	  S3VInitOffscreenImages(pScreen);
-	pMga->BlockHandler = pScreen->BlockHandler;
-	pScreen->BlockHandler = MGABlockHandler;
-#endif
     }
     
 
@@ -241,43 +214,9 @@ S3VSetPortAttributeOverlay(
   INT32 value, 
   pointer data
 ){
-#if 0
-  MGAPtr pMga = MGAPTR(pScrn);
-  MGAPortPrivPtr pPriv = pMga->portPrivate;
-
-  CHECK_DMA_QUIESCENT(pMga, pScrn);
-
-  if(attribute == xvBrightness) {
-	if((value < -128) || (value > 127))
-	   return BadValue;
-	pPriv->brightness = value;
-	OUTREG(MGAREG_BESLUMACTL, ((pPriv->brightness & 0xff) << 16) |
-			           (pPriv->contrast & 0xff));
-  } else
-  if(attribute == xvContrast) {
-	if((value < 0) || (value > 255))
-	   return BadValue;
-	pPriv->contrast = value;
-	OUTREG(MGAREG_BESLUMACTL, ((pPriv->brightness & 0xff) << 16) |
-			           (pPriv->contrast & 0xff));
-  } else
-  if(attribute == xvColorKey) {
-	pPriv->colorKey = value;
-	outMGAdac(0x55, (pPriv->colorKey & pScrn->mask.red) >> 
-		    pScrn->offset.red);
-	outMGAdac(0x56, (pPriv->colorKey & pScrn->mask.green) >> 
-		    pScrn->offset.green);
-	outMGAdac(0x57, (pPriv->colorKey & pScrn->mask.blue) >> 
-		    pScrn->offset.blue);
-	REGION_EMPTY(pScrn->pScreen, &pPriv->clip);   
-  } else 
-#endif
 
 return BadMatch;
 
-#if 0
-  return Success;
-#endif
 }
 
 static int 
@@ -287,26 +226,10 @@ S3VGetPortAttributeOverlay(
   INT32 *value, 
   pointer data
 ){
-#if 0
-  MGAPtr pMga = MGAPTR(pScrn);
-  MGAPortPrivPtr pPriv = pMga->portPrivate;
-
-  if(attribute == xvBrightness) {
-	*value = pPriv->brightness;
-  } else
-  if(attribute == xvContrast) {
-	*value = pPriv->contrast;
-  } else
-  if(attribute == xvColorKey) {
-	*value = pPriv->colorKey;
-  } else 
-#endif
+
 
 return BadMatch;
 
-#if 0
-  return Success;
-#endif
 }
 
 
@@ -438,15 +361,8 @@ S3VSetupImageVideoOverlay(ScreenPtr pScreen)
     adapt->pFormats = Formats;
     adapt->nPorts = 1;
     adapt->pAttributes = NULL /*Attributes*/;
-#if 0
-    if (pMga->Chipset == PCI_CHIP_MGAG400) {
-	adapt->nImages = 4;
-	adapt->nAttributes = 3;
-    } else {
-#endif
-	adapt->nImages = 3;
-	adapt->nAttributes = 0;
-	/* }*/
+    adapt->nImages = 3;
+    adapt->nAttributes = 0;
     adapt->pImages = Images;
     adapt->PutVideo = NULL;
     adapt->PutStill = NULL;
@@ -475,13 +391,6 @@ S3VStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
   S3VPtr ps3v = S3VPTR(pScrn);
   S3VPortPrivPtr pPriv = ps3v->portPrivate;
 
-#if 0
-  MGAPtr pMga = MGAPTR(pScrn);
-  MGAPortPrivPtr pPriv = pMga->portPrivate;
-
-  if(pMga->TexturedVideo) return;
-#endif
-
   REGION_EMPTY(pScrn->pScreen, &pPriv->clip);   
 
   if(shutdown) {
@@ -602,12 +511,6 @@ S3VDisplayVideoOverlay(
    if(!ps3v->NeedSTREAMS)
      return;
 
-#if 0
-    /* got 64 scanlines to do it in */
-    tmp = INREG(MGAREG_VCOUNT) + 64;
-    if(tmp > pScrn->currentMode->VDisplay)
-	tmp -= pScrn->currentMode->VDisplay;
-#endif
     
     /* Reference at http://www.webartz.com/fourcc/ */
       /* Looks like ViRGE only supports YUY2 and Y211?, */
@@ -860,14 +763,6 @@ S3VPutImage(
     dst_start = ps3v->FBStart + offset + left + (top * dstPitch);
     /*dst_start = pMga->FbStart + offset + left + (top * dstPitch);*/
 
-#if 0
-    if(pMga->TexturedVideo && pMga->AccelInfoRec->NeedToSync &&
-	((long)data != pPriv->lastPort)) 
-    {
-	MGAStormSync(pScrn);
-	pMga->AccelInfoRec->NeedToSync = FALSE;
-    }
-#endif
 
     switch(id) {
     case FOURCC_YV12:
@@ -895,17 +790,7 @@ S3VPutImage(
         break;
     }
 
-#if 0
-    if(pMga->TexturedVideo) {
-	pPriv->lastPort = (long)data;
-	MGADisplayVideoTexture(pScrn, id, offset, 
-		REGION_NUM_RECTS(clipBoxes), REGION_RECTS(clipBoxes),
-		width, height, dstPitch, src_x, src_y, src_w, src_h,
-		drw_x, drw_y, drw_w, drw_h);
-	pPriv->videoStatus = FREE_TIMER;
-	pPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
-    } else {
-#endif
+
     /* update cliplist */
 	if(!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
 	    REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
@@ -918,10 +803,7 @@ S3VPutImage(
 	     x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h);
 
 	pPriv->videoStatus = CLIENT_VIDEO_ON;
-#if 0
-    }
-    pMga->VideoTimerCallback = MGAVideoTimerCallback;
-#endif
+
 
     return Success;
 }
@@ -934,22 +816,11 @@ S3VQueryImageAttributes(
     unsigned short *w, unsigned short *h, 
     int *pitches, int *offsets
 ){
-#if 0
-    MGAPtr pMga = MGAPTR(pScrn);
-#endif
+
     int size, tmp;
 
-#if 0
-    if(pMga->TexturedVideo) {
-	if(*w > 2046) *w = 2046;
-	if(*h > 2046) *h = 2046;
-    } else {
-#endif
 	if(*w > 1024) *w = 1024;
 	if(*h > 1024) *h = 1024;
-#if 0
-    }
-#endif
 
     *w = (*w + 1) & ~1;
     if(offsets) offsets[0] = 0;


Index: xorg-x11-drv-s3virge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-s3virge/devel/xorg-x11-drv-s3virge.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-s3virge.spec	20 Feb 2008 07:42:16 -0000	1.16
+++ xorg-x11-drv-s3virge.spec	10 Mar 2008 03:41:25 -0000	1.17
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 s3virge video driver
 Name:      xorg-x11-drv-s3virge
 Version:   1.9.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,8 +14,11 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   s3virge.xinf
 
+Patch0: s3v-pciaccess.patch
+
 ExcludeArch: s390 s390x
 
+BuildRequires: automake autoconf libtool
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
 Requires:  hwdata
@@ -27,7 +30,10 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .pciaccess
+
 %build
+autoreconf -v --install
 %configure --disable-static
 make
 
@@ -53,6 +59,9 @@
 %{_mandir}/man4/s3virge.4*
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  1.9.1-7
+- pciaccess conversion
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 1.9.1-6
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 03:45:43 2008
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Mon, 10 Mar 2008 03:45:43 GMT
Subject: rpms/maradns/F-8 maradns.init, NONE, 1.1 maradns.spec, NONE,
	1.1 zoneserver.init, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200803100345.m2A3jhKN018174@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/maradns/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18141

Modified Files:
	.cvsignore sources 
Added Files:
	maradns.init maradns.spec zoneserver.init 
Log Message:
Initial checkin



--- NEW FILE maradns.init ---
#!/bin/bash
# MaraDNS	This shell script takes care of starting and stopping MaraDNS
# chkconfig: - 55 45
# description: MaraDNS is secure Domain Name Server (DNS)
# probe: true

# Copyright 2005-2006 Sam Trenholme

# TERMS

# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:

# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.

# This software is provided 'as is' with no guarantees of correctness or
# fitness for purpose.

# This is a script which stops and starts the MaraDNS process
# The first line points to bash because I don't have a true Solaris /bin/sh
# to test this against.

# The following is a pointer to the MaraDNS program
if [ -x "/usr/sbin/maradns" ] ; then
	MARADNS="/usr/sbin/maradns"
elif [ -x "/usr/sbin/maradns.authonly" ] ; then
	MARADNS="/usr/sbin/maradns.authonly"
elif [ -x "/usr/local/sbin/maradns" ] ; then
	MARADNS="/usr/local/sbin/maradns"
elif [ -x "/usr/local/sbin/maradns.authonly" ] ; then
	MARADNS="/usr/local/sbin/maradns.authonly"
else
	echo unable to find maradns
	exit 1
fi

# The following is a pointer to the duende daemonizer
if [ -x "/usr/sbin/duende" ] ; then
	DUENDE="/usr/sbin/duende"
elif [ -x "/usr/local/sbin/duende" ] ; then
	DUENDE="/usr/local/sbin/duende"
elif [ -x "/usr/local/bin/duende" ] ; then
	DUENDE="/usr/local/bin/duende"
elif [ -x "/usr/bin/duende" ] ; then
	DUENDE="/usr/bin/duende"
else
	echo unable to find duende
	exit 1
fi

# The following is the directory we place MaraDNS log entries in
LOGDIR="/var/log"

# The following is a list of all mararc files which we will load or
# unload;
# Simple case: Only one MaraDNS process, using the /etc/mararc file
MARARCS="/etc/mararc"
# Case two: Three MaraDNS processes, one using /etc/mararc.1, the second one
# using /etc/mararc.2, and the third one using /etc/mararc.3
# (this is not as essential as it was in the 1.0 days; MaraDNS can now bind
#  to multiple IPs)
#MARARCS="/etc/mararc.1 /etc/mararc.2 /etc/mararc.3"

# source function library
. /etc/rc.d/init.d/functions

RETVAL=0

start() {
	echo -n $"Starting all MaraDNS processes: "
	for rcfile in $MARARCS ; do
		echo -n $"$rcfile "
		# Duende syslogs MaraDNS' output messages and daemonizes MaraDNS
		daemon $DUENDE $MARADNS -f $rcfile || RETVAL=$?
	done
	echo
	[ $RETVAL -eq 0 ] && echo `pidof maradns` > /var/run/maradns.pid && touch /var/lock/subsys/maradns
}

stop() {
	echo -n $"Stopping MaraDNS: "
	killproc maradns
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/maradns
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|reload)
	stop
	start
	;;
  condrestart)
	[ -f /var/lock/subsys/maradns ] && restart
	;;
  status)
	status maradns
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
	exit 1
esac

exit $RETVAL



--- NEW FILE maradns.spec ---
Name:		maradns
Version:	1.3.07.08
Release:	1%{?dist}
Summary:	Authoritative and recursive DNS server made with security in mind

Source0:	http://www.maradns.org/download/1.3/%{version}/%{name}-%{version}.tar.bz2
Source1:	maradns.init
Source2:	zoneserver.init
Group:		System Environment/Daemons
License:	BSD
URL:		http://www.maradns.org/

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(pre):		shadow-utils
Requires(post):		/sbin/chkconfig
Requires(preun):	/sbin/chkconfig
Requires(preun):	/sbin/service
Requires:		initscripts

%description
MaraDNS is a package that implements the Domain Name Service (DNS), an
essential internet service. MaraDNS has the following advantages:
	* Secure.
	* Supported.
	* Easy to use.
	* Small.
	* Open Source.

%prep
%setup -q

# wrong permissions
chmod 0644 doc/en/man/make.pdf
chmod 0644 doc/en/tutorial/make.index
chmod 0644 doc/en/webpage/make.page

# wrong EOL encoding
pushd doc
sed -i 's/\r//' pt_br/source/compile.ej
sed -i 's/\r//' pt_br/source/authoritative.ej
sed -i 's/\r//' pt_br/source/dangling.ej
sed -i 's/\r//' pt_br/source/zoneserver.ej
sed -i 's/\r//' pt_br/source/csv2.ej
popd

# wrong char encoding
pushd doc/pt_br/source
for file in *; do
	iconv -f iso8859-1 -t utf-8 $file > $file.new && mv $file.new $file
done
popd


%build

# We don't use %%configure here because this is a homebrew configure not generated by autoconf

./configure
%{__make} %{?_smp_mflags} FLAGS="%{optflags} -DSELECT_PROBLEM"


%install
%{__rm} -rf %{buildroot}

# create /etc/maradns and /etc/mararc first
%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/maradns/logger/
%{__install} -D -m 0644 build/rpm.mararc %{buildroot}%{_sysconfdir}/mararc

# sbin files
%{__install} -D -m 0755 server/maradns %{buildroot}%{_sbindir}/maradns
%{__install} -D -m 0755 tcp/zoneserver %{buildroot}%{_sbindir}/zoneserver

# bin files
%{__install} -D -m 0755 tcp/getzone %{buildroot}%{_bindir}/getzone
%{__install} -D -m 0755 tcp/fetchzone %{buildroot}%{_bindir}/fetchzone
%{__install} -D -m 0755 tools/askmara %{buildroot}%{_bindir}/askmara
%{__install} -D -m 0755 tools/duende %{buildroot}%{_bindir}/duende

# man pages
%{__install} -d -m 0755 %{buildroot}%{_mandir}/man{1,5,8}
%{__install} -D -m 0644 -t %{buildroot}%{_mandir}/man1/ \
	doc/en/man/askmara.1 \
	doc/en/man/getzone.1 \
	doc/en/man/fetchzone.1
%{__install} -D -m 0644 -t %{buildroot}%{_mandir}/man5/ \
	doc/en/man/csv1.5 \
	doc/en/man/csv2.5 \
	doc/en/man/csv2_txt.5 \
	doc/en/man/mararc.5
%{__install} -D -m 0644 -t %{buildroot}%{_mandir}/man8/ \
	doc/en/man/maradns.8 \
	doc/en/man/zoneserver.8 \
	doc/en/man/duende.8

# init files
%{__install} -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/maradns
%{__install} -D -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/maradns-zoneserver

%{__rm} CHANGELOG CREDITS FAQ
ln -fs en/changelog.txt CHANGELOG
ln -fs en/credits.txt CREDITS
ln -fs en/faq.txt FAQ


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING CREDITS FAQ doc/*
%doc maradns.gpg.key

%config(noreplace) %{_sysconfdir}/mararc
%attr(-,maradns,maradns) %{_sysconfdir}/maradns/
%{_sysconfdir}/init.d/maradns
%{_sysconfdir}/init.d/maradns-zoneserver

%{_bindir}/askmara
%{_bindir}/duende
%{_bindir}/fetchzone
%{_bindir}/getzone
%{_sbindir}/maradns
%{_sbindir}/zoneserver

%{_mandir}/man1/askmara.1*
%{_mandir}/man1/getzone.1*
%{_mandir}/man1/fetchzone.1*
%{_mandir}/man5/csv1.5*
%{_mandir}/man5/csv2.5*
%{_mandir}/man5/csv2_txt.5*
%{_mandir}/man5/mararc.5*
%{_mandir}/man8/maradns.8*
%{_mandir}/man8/zoneserver.8*
%{_mandir}/man8/duende.8*


%pre
if [ $1 -eq 1 ]; then
	getent group maradns >/dev/null || groupadd -r maradns
	getent passwd maradns >/dev/null || \
	useradd -r -g maradns -d /etc/maradns -s /sbin/nologin \
		-c "MaraDns chroot user" maradns
	exit 0
fi


%post
if [ $1 -eq 1 ]; then
	echo maradns_uid=$(id -u maradns) >> %{_sysconfdir}/mararc
	echo maradns_gid=$(id -g maradns) >> %{_sysconfdir}/mararc
	/sbin/chkconfig --add maradns
	/sbin/chkconfig --add maradns-zoneserver
fi


%preun
if [ $1 -eq 0 ]; then
	/sbin/service maradns stop &>/dev/null || :
	/sbin/chkconfig --del maradns
	/sbin/service maradns-zoneserver stop &>/dev/null || :
	/sbin/chkconfig --del maradns-zoneserver
fi

%postun
if [ $1 -eq 1 ]; then
	/sbin/service maradns condrestart &>/dev/null || :
	/sbin/service maradns-zoneserver condrestart &>/dev/null || :
fi


%changelog
* Mon Jan 28 2008 Brandon Holbrook  - 1.3.07.08-1
- Updated to 1.3.07.08

* Mon Oct  1 2007 Brandon Holbrook  - 1.2.12.08-1
- Updated to 1.2.12.08
- Converted non-UTF8-encoded files to UTF8

* Thu Aug 23 2007 Brandon Holbrook  - 1.2.12.07-1
- Updated to 1.2.12.07
- Added a maradns user/group for chroot

* Thu Jun 28 2007 Brandon Holbrook  - 1.2.12.06-3
- fix some tarball permissions and line endings
- Created new init scripts with more functions

* Sun Jun 24 2007 Brandon Holbrook  - 1.2.12.06-2
- manually run ./configure and make rather than the included ./compile.sh
	to preserve optflags
- Add dependency on chkconfig and initscripts

* Sat Jun 23 2007 Brandon Holbrook  - 1.2.12.06-1
- Release 1.2.12.06
- Rewritten to call install manually instead of 'make install'


--- NEW FILE zoneserver.init ---
#!/bin/bash
# MaraDNS Zoneserver	This shell script takes care of starting and stopping MaraDNS' Zone Server daemon
# chkconfig: - 55 45
# description: MaraDNS Zoneserver is responsible for handling DNS zone transfers as well as any TCP DNS queries
# probe: true

# Copyright 2005-2006 Sam Trenholme

# TERMS

# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:

# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.

# This software is provided 'as is' with no guarantees of correctness or
# fitness for purpose.

# This is a script which stops and starts the MaraDNS zoneserver process
# The first line points to bash because I don't have a true Solaris /bin/sh
# to test this against.

# The following is a pointer to the MaraDNS program
if [ -x "/usr/sbin/zoneserver" ] ; then
	ZONESERVER="/usr/sbin/zoneserver"
elif [ -x "/usr/local/sbin/zoneserver" ] ; then
	ZONESERVER="/usr/local/sbin/zoneserver"
else
	echo unable to find zoneserver
	exit 1
fi

# The following is a pointer to the duende daemonizer
if [ -x "/usr/sbin/duende" ] ; then
	DUENDE="/usr/sbin/duende"
elif [ -x "/usr/local/sbin/duende" ] ; then
	DUENDE="/usr/local/sbin/duende"
elif [ -x "/usr/bin/duende" ] ; then
	DUENDE="/usr/bin/duende"
elif [ -x "/usr/local/bin/duende" ] ; then
	DUENDE="/usr/local/bin/duende"
else
	echo unable to find duende
	exit 1
fi

# The following is the directory we place MaraDNS log entries in
LOGDIR="/var/log"

# The following is a list of all mararc files which we will load or
# unload;
# Simple case: Only one MaraDNS zoneserver process, using the /etc/mararc file
MARARCS="/etc/mararc"
# Case two: Three MaraDNS processes, one using /etc/mararc.1, the second one
# using /etc/mararc.2, and the third one using /etc/mararc.3
#MARARCS="/etc/mararc.1 /etc/mararc.2 /etc/mararc.3"

# source function library
. /etc/rc.d/init.d/functions

RETVAL=0

start() {
	echo -n $"Starting all MaraDNS-Zoneserver processes: "
	for rcfile in $MARARCS ; do
		echo -n $"$rcfile "
		# Duende syslogs MaraDNS' output messages and daemonizes MaraDNS
		daemon $DUENDE $ZONESERVER -f $rcfile || RETVAL=$?
	done
	echo
	[ $RETVAL -eq 0 ] && echo `pidof zoneserver` > /var/run/zoneserver.pid && touch /var/lock/subsys/maradns-zoneserver
}

stop() {
	echo -n $"Stopping MaraDNS-Zoneserver: "
	killproc zoneserver
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/maradns-zoneserver
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|reload)
	stop
	start
	;;
  condrestart)
	[ -f /var/lock/subsys/maradns-zoneserver ] && restart
	;;
  status)
	status zoneserver
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
	exit 1
esac

exit $RETVAL



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maradns/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Mar 2008 19:33:28 -0000	1.1
+++ .cvsignore	10 Mar 2008 03:45:10 -0000	1.2
@@ -0,0 +1 @@
+maradns-1.3.07.08.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maradns/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Mar 2008 19:33:28 -0000	1.1
+++ sources	10 Mar 2008 03:45:10 -0000	1.2
@@ -0,0 +1 @@
+d44d7e1309c7c05654e62b52c6ab6822  maradns-1.3.07.08.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 03:47:57 2008
From: fedora-extras-commits at redhat.com (Brandon Holbrook (static))
Date: Mon, 10 Mar 2008 03:47:57 GMT
Subject: rpms/maradns/EL-5 maradns.init, NONE, 1.1 maradns.spec, NONE,
	1.1 zoneserver.init, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200803100347.m2A3lvRD018276@cvs-int.fedora.redhat.com>

Author: static

Update of /cvs/extras/rpms/maradns/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18240

Modified Files:
	.cvsignore sources 
Added Files:
	maradns.init maradns.spec zoneserver.init 
Log Message:
Initial checkin



--- NEW FILE maradns.init ---
#!/bin/bash
# MaraDNS	This shell script takes care of starting and stopping MaraDNS
# chkconfig: - 55 45
# description: MaraDNS is secure Domain Name Server (DNS)
# probe: true

# Copyright 2005-2006 Sam Trenholme

# TERMS

# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:

# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.

# This software is provided 'as is' with no guarantees of correctness or
# fitness for purpose.

# This is a script which stops and starts the MaraDNS process
# The first line points to bash because I don't have a true Solaris /bin/sh
# to test this against.

# The following is a pointer to the MaraDNS program
if [ -x "/usr/sbin/maradns" ] ; then
	MARADNS="/usr/sbin/maradns"
elif [ -x "/usr/sbin/maradns.authonly" ] ; then
	MARADNS="/usr/sbin/maradns.authonly"
elif [ -x "/usr/local/sbin/maradns" ] ; then
	MARADNS="/usr/local/sbin/maradns"
elif [ -x "/usr/local/sbin/maradns.authonly" ] ; then
	MARADNS="/usr/local/sbin/maradns.authonly"
else
	echo unable to find maradns
	exit 1
fi

# The following is a pointer to the duende daemonizer
if [ -x "/usr/sbin/duende" ] ; then
	DUENDE="/usr/sbin/duende"
elif [ -x "/usr/local/sbin/duende" ] ; then
	DUENDE="/usr/local/sbin/duende"
elif [ -x "/usr/local/bin/duende" ] ; then
	DUENDE="/usr/local/bin/duende"
elif [ -x "/usr/bin/duende" ] ; then
	DUENDE="/usr/bin/duende"
else
	echo unable to find duende
	exit 1
fi

# The following is the directory we place MaraDNS log entries in
LOGDIR="/var/log"

# The following is a list of all mararc files which we will load or
# unload;
# Simple case: Only one MaraDNS process, using the /etc/mararc file
MARARCS="/etc/mararc"
# Case two: Three MaraDNS processes, one using /etc/mararc.1, the second one
# using /etc/mararc.2, and the third one using /etc/mararc.3
# (this is not as essential as it was in the 1.0 days; MaraDNS can now bind
#  to multiple IPs)
#MARARCS="/etc/mararc.1 /etc/mararc.2 /etc/mararc.3"

# source function library
. /etc/rc.d/init.d/functions

RETVAL=0

start() {
	echo -n $"Starting all MaraDNS processes: "
	for rcfile in $MARARCS ; do
		echo -n $"$rcfile "
		# Duende syslogs MaraDNS' output messages and daemonizes MaraDNS
		daemon $DUENDE $MARADNS -f $rcfile || RETVAL=$?
	done
	echo
	[ $RETVAL -eq 0 ] && echo `pidof maradns` > /var/run/maradns.pid && touch /var/lock/subsys/maradns
}

stop() {
	echo -n $"Stopping MaraDNS: "
	killproc maradns
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/maradns
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|reload)
	stop
	start
	;;
  condrestart)
	[ -f /var/lock/subsys/maradns ] && restart
	;;
  status)
	status maradns
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
	exit 1
esac

exit $RETVAL



--- NEW FILE maradns.spec ---
Name:		maradns
Version:	1.3.07.08
Release:	1%{?dist}
Summary:	Authoritative and recursive DNS server made with security in mind

Source0:	http://www.maradns.org/download/1.3/%{version}/%{name}-%{version}.tar.bz2
Source1:	maradns.init
Source2:	zoneserver.init
Group:		System Environment/Daemons
License:	BSD
URL:		http://www.maradns.org/

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(pre):		shadow-utils
Requires(post):		/sbin/chkconfig
Requires(preun):	/sbin/chkconfig
Requires(preun):	/sbin/service
Requires:		initscripts

%description
MaraDNS is a package that implements the Domain Name Service (DNS), an
essential internet service. MaraDNS has the following advantages:
	* Secure.
	* Supported.
	* Easy to use.
	* Small.
	* Open Source.

%prep
%setup -q

# wrong permissions
chmod 0644 doc/en/man/make.pdf
chmod 0644 doc/en/tutorial/make.index
chmod 0644 doc/en/webpage/make.page

# wrong EOL encoding
pushd doc
sed -i 's/\r//' pt_br/source/compile.ej
sed -i 's/\r//' pt_br/source/authoritative.ej
sed -i 's/\r//' pt_br/source/dangling.ej
sed -i 's/\r//' pt_br/source/zoneserver.ej
sed -i 's/\r//' pt_br/source/csv2.ej
popd

# wrong char encoding
pushd doc/pt_br/source
for file in *; do
	iconv -f iso8859-1 -t utf-8 $file > $file.new && mv $file.new $file
done
popd


%build

# We don't use %%configure here because this is a homebrew configure not generated by autoconf

./configure
%{__make} %{?_smp_mflags} FLAGS="%{optflags} -DSELECT_PROBLEM"


%install
%{__rm} -rf %{buildroot}

# create /etc/maradns and /etc/mararc first
%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/maradns/logger/
%{__install} -D -m 0644 build/rpm.mararc %{buildroot}%{_sysconfdir}/mararc

# sbin files
%{__install} -D -m 0755 server/maradns %{buildroot}%{_sbindir}/maradns
%{__install} -D -m 0755 tcp/zoneserver %{buildroot}%{_sbindir}/zoneserver

# bin files
%{__install} -D -m 0755 tcp/getzone %{buildroot}%{_bindir}/getzone
%{__install} -D -m 0755 tcp/fetchzone %{buildroot}%{_bindir}/fetchzone
%{__install} -D -m 0755 tools/askmara %{buildroot}%{_bindir}/askmara
%{__install} -D -m 0755 tools/duende %{buildroot}%{_bindir}/duende

# man pages
%{__install} -d -m 0755 %{buildroot}%{_mandir}/man{1,5,8}
%{__install} -D -m 0644 -t %{buildroot}%{_mandir}/man1/ \
	doc/en/man/askmara.1 \
	doc/en/man/getzone.1 \
	doc/en/man/fetchzone.1
%{__install} -D -m 0644 -t %{buildroot}%{_mandir}/man5/ \
	doc/en/man/csv1.5 \
	doc/en/man/csv2.5 \
	doc/en/man/csv2_txt.5 \
	doc/en/man/mararc.5
%{__install} -D -m 0644 -t %{buildroot}%{_mandir}/man8/ \
	doc/en/man/maradns.8 \
	doc/en/man/zoneserver.8 \
	doc/en/man/duende.8

# init files
%{__install} -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/maradns
%{__install} -D -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/maradns-zoneserver

%{__rm} CHANGELOG CREDITS FAQ
ln -fs en/changelog.txt CHANGELOG
ln -fs en/credits.txt CREDITS
ln -fs en/faq.txt FAQ


%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING CREDITS FAQ doc/*
%doc maradns.gpg.key

%config(noreplace) %{_sysconfdir}/mararc
%attr(-,maradns,maradns) %{_sysconfdir}/maradns/
%{_sysconfdir}/init.d/maradns
%{_sysconfdir}/init.d/maradns-zoneserver

%{_bindir}/askmara
%{_bindir}/duende
%{_bindir}/fetchzone
%{_bindir}/getzone
%{_sbindir}/maradns
%{_sbindir}/zoneserver

%{_mandir}/man1/askmara.1*
%{_mandir}/man1/getzone.1*
%{_mandir}/man1/fetchzone.1*
%{_mandir}/man5/csv1.5*
%{_mandir}/man5/csv2.5*
%{_mandir}/man5/csv2_txt.5*
%{_mandir}/man5/mararc.5*
%{_mandir}/man8/maradns.8*
%{_mandir}/man8/zoneserver.8*
%{_mandir}/man8/duende.8*


%pre
if [ $1 -eq 1 ]; then
	getent group maradns >/dev/null || groupadd -r maradns
	getent passwd maradns >/dev/null || \
	useradd -r -g maradns -d /etc/maradns -s /sbin/nologin \
		-c "MaraDns chroot user" maradns
	exit 0
fi


%post
if [ $1 -eq 1 ]; then
	echo maradns_uid=$(id -u maradns) >> %{_sysconfdir}/mararc
	echo maradns_gid=$(id -g maradns) >> %{_sysconfdir}/mararc
	/sbin/chkconfig --add maradns
	/sbin/chkconfig --add maradns-zoneserver
fi


%preun
if [ $1 -eq 0 ]; then
	/sbin/service maradns stop &>/dev/null || :
	/sbin/chkconfig --del maradns
	/sbin/service maradns-zoneserver stop &>/dev/null || :
	/sbin/chkconfig --del maradns-zoneserver
fi

%postun
if [ $1 -eq 1 ]; then
	/sbin/service maradns condrestart &>/dev/null || :
	/sbin/service maradns-zoneserver condrestart &>/dev/null || :
fi


%changelog
* Mon Jan 28 2008 Brandon Holbrook  - 1.3.07.08-1
- Updated to 1.3.07.08

* Mon Oct  1 2007 Brandon Holbrook  - 1.2.12.08-1
- Updated to 1.2.12.08
- Converted non-UTF8-encoded files to UTF8

* Thu Aug 23 2007 Brandon Holbrook  - 1.2.12.07-1
- Updated to 1.2.12.07
- Added a maradns user/group for chroot

* Thu Jun 28 2007 Brandon Holbrook  - 1.2.12.06-3
- fix some tarball permissions and line endings
- Created new init scripts with more functions

* Sun Jun 24 2007 Brandon Holbrook  - 1.2.12.06-2
- manually run ./configure and make rather than the included ./compile.sh
	to preserve optflags
- Add dependency on chkconfig and initscripts

* Sat Jun 23 2007 Brandon Holbrook  - 1.2.12.06-1
- Release 1.2.12.06
- Rewritten to call install manually instead of 'make install'


--- NEW FILE zoneserver.init ---
#!/bin/bash
# MaraDNS Zoneserver	This shell script takes care of starting and stopping MaraDNS' Zone Server daemon
# chkconfig: - 55 45
# description: MaraDNS Zoneserver is responsible for handling DNS zone transfers as well as any TCP DNS queries
# probe: true

# Copyright 2005-2006 Sam Trenholme

# TERMS

# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:

# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.

# This software is provided 'as is' with no guarantees of correctness or
# fitness for purpose.

# This is a script which stops and starts the MaraDNS zoneserver process
# The first line points to bash because I don't have a true Solaris /bin/sh
# to test this against.

# The following is a pointer to the MaraDNS program
if [ -x "/usr/sbin/zoneserver" ] ; then
	ZONESERVER="/usr/sbin/zoneserver"
elif [ -x "/usr/local/sbin/zoneserver" ] ; then
	ZONESERVER="/usr/local/sbin/zoneserver"
else
	echo unable to find zoneserver
	exit 1
fi

# The following is a pointer to the duende daemonizer
if [ -x "/usr/sbin/duende" ] ; then
	DUENDE="/usr/sbin/duende"
elif [ -x "/usr/local/sbin/duende" ] ; then
	DUENDE="/usr/local/sbin/duende"
elif [ -x "/usr/bin/duende" ] ; then
	DUENDE="/usr/bin/duende"
elif [ -x "/usr/local/bin/duende" ] ; then
	DUENDE="/usr/local/bin/duende"
else
	echo unable to find duende
	exit 1
fi

# The following is the directory we place MaraDNS log entries in
LOGDIR="/var/log"

# The following is a list of all mararc files which we will load or
# unload;
# Simple case: Only one MaraDNS zoneserver process, using the /etc/mararc file
MARARCS="/etc/mararc"
# Case two: Three MaraDNS processes, one using /etc/mararc.1, the second one
# using /etc/mararc.2, and the third one using /etc/mararc.3
#MARARCS="/etc/mararc.1 /etc/mararc.2 /etc/mararc.3"

# source function library
. /etc/rc.d/init.d/functions

RETVAL=0

start() {
	echo -n $"Starting all MaraDNS-Zoneserver processes: "
	for rcfile in $MARARCS ; do
		echo -n $"$rcfile "
		# Duende syslogs MaraDNS' output messages and daemonizes MaraDNS
		daemon $DUENDE $ZONESERVER -f $rcfile || RETVAL=$?
	done
	echo
	[ $RETVAL -eq 0 ] && echo `pidof zoneserver` > /var/run/zoneserver.pid && touch /var/lock/subsys/maradns-zoneserver
}

stop() {
	echo -n $"Stopping MaraDNS-Zoneserver: "
	killproc zoneserver
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/maradns-zoneserver
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|reload)
	stop
	start
	;;
  condrestart)
	[ -f /var/lock/subsys/maradns-zoneserver ] && restart
	;;
  status)
	status zoneserver
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
	exit 1
esac

exit $RETVAL



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maradns/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Mar 2008 19:33:28 -0000	1.1
+++ .cvsignore	10 Mar 2008 03:47:22 -0000	1.2
@@ -0,0 +1 @@
+maradns-1.3.07.08.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maradns/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Mar 2008 19:33:28 -0000	1.1
+++ sources	10 Mar 2008 03:47:22 -0000	1.2
@@ -0,0 +1 @@
+d44d7e1309c7c05654e62b52c6ab6822  maradns-1.3.07.08.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 03:52:26 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 03:52:26 GMT
Subject: rpms/gucharmap/devel .cvsignore, 1.10, 1.11 gucharmap.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <200803100352.m2A3qQAh018422@cvs-int.fedora.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	31 Jan 2008 01:49:21 -0000	1.10
+++ .cvsignore	10 Mar 2008 03:51:51 -0000	1.11
@@ -1 +1 @@
-gucharmap-2.21.90.tar.bz2
+gucharmap-2.22.0.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gucharmap.spec	31 Jan 2008 01:49:21 -0000	1.19
+++ gucharmap.spec	10 Mar 2008 03:51:51 -0000	1.20
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.21.90
+Version:        2.22.0
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -11,7 +11,7 @@
 License:        GPLv2+ and GFDL+ and MIT
 # GPL for the source code, GFDL for the docs, MIT for Unicode data
 URL:            http://live.gnome.org/Gucharmap
-Source:         http://download.gnome.org/sources/gucharmap/2.21/gucharmap-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gucharmap/2.22/gucharmap-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gnome-doc-utils >= 0.3.2
@@ -67,8 +67,6 @@
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
-  --remove-category="Application"                           \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 %find_lang gucharmap --with-gnome
@@ -130,6 +128,9 @@
 
 
 %changelog
+* Sun Mar  9 2008 Matthias Clasen  - 2.22.0-1
+- Update to 2.22.0
+
 * Wed Jan 30 2008 Matthias Clasen  - 2.21.90-1
 - Update to 2.21.90
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gucharmap/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Jan 2008 01:49:21 -0000	1.10
+++ sources	10 Mar 2008 03:51:51 -0000	1.11
@@ -1 +1 @@
-2ea951a946aff86a0ee77b8b1ffffabc  gucharmap-2.21.90.tar.bz2
+aff0c556ab360e0d6c63be911260637e  gucharmap-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 04:08:30 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 04:08:30 GMT
Subject: rpms/xorg-x11-drv-siliconmotion/devel siliconmotion-git.patch, NONE,
	1.1 xorg-x11-drv-siliconmotion.spec, 1.16, 1.17
Message-ID: <200803100408.m2A48Ulu026272@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-siliconmotion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26224

Modified Files:
	xorg-x11-drv-siliconmotion.spec 
Added Files:
	siliconmotion-git.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  1.5.1-5
- pciaccess conversion


siliconmotion-git.patch:

--- NEW FILE siliconmotion-git.patch ---
diff --git a/configure.ac b/configure.ac
index a5fde7a..ad1ba4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,10 +58,22 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
 
 # Checks for header files.
 AC_HEADER_STDC
 
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
 
diff --git a/src/smi.h b/src/smi.h
index 88aa65a..75e4554 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -31,6 +31,8 @@ authorization from the XFree86 Project and Silicon Motion.
 #ifndef _SMI_H
 #define _SMI_H
 
+#include "smi_pcirename.h"
+
 #include 
 #include 
 
@@ -187,7 +189,9 @@ typedef struct
     Bool		useEXA;	/* enable exa acceleration */
 
     pciVideoPtr		PciInfo;	/* PCI info vars */
+#ifndef XSERVER_LIBPCIACCESS
     PCITAG		PciTag;
+#endif
     int			Chipset;	/* Chip info, set using PCI
 					   above */
     int			ChipRev;
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 9b2ff4b..11a3ef4 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -89,10 +89,10 @@ static void SMI_DetectPanelSize(ScrnInfoPtr pScrn);
 
 #define SILICONMOTION_NAME          "Silicon Motion"
 #define SILICONMOTION_DRIVER_NAME   "siliconmotion"
-#define SILICONMOTION_VERSION_NAME  "1.4.1"
-#define SILICONMOTION_VERSION_MAJOR 1
-#define SILICONMOTION_VERSION_MINOR 4
-#define SILICONMOTION_PATCHLEVEL    1
+#define SILICONMOTION_VERSION_NAME  PACKAGE_VERSION
+#define SILICONMOTION_VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define SILICONMOTION_VERSION_MINOR PACKAGE_VERSION_MINOR
+#define SILICONMOTION_PATCHLEVEL    PACKAGE_VERSION_PATCHLEVEL
 #define SILICONMOTION_DRIVER_VERSION ((SILICONMOTION_VERSION_MAJOR << 24) | \
                                       (SILICONMOTION_VERSION_MINOR << 16) | \
                                       (SILICONMOTION_PATCHLEVEL))
@@ -447,10 +447,12 @@ SMI_Probe(DriverPtr drv, int flags)
 	return FALSE;
     }
 
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86GetPciVideoInfo() == NULL) {
 	LEAVE_PROC("SMI_Probe");
 	return FALSE;
     }
+#endif
 
     numUsed = xf86MatchPciInstances(SILICONMOTION_NAME, PCI_SMI_VENDOR_ID,
 				    SMIChipsets, SMIPciChipsets, devSections,
@@ -821,7 +823,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
 		   pSmi->Chipset);
     } else {
 	from = X_PROBED;
-	pSmi->Chipset = pSmi->PciInfo->chipType;
+	pSmi->Chipset = PCI_DEV_DEVICE_ID(pSmi->PciInfo);
 	pScrn->chipset = (char *) xf86TokenToString(SMIChipsets, pSmi->Chipset);
     }
 
@@ -830,7 +832,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
 		   pSmi->ChipRev);
     } else {
-	pSmi->ChipRev = pSmi->PciInfo->chipRev;
+        pSmi->ChipRev = PCI_DEV_REVISION(pSmi->PciInfo);
     }
     xfree(pEnt);
 
@@ -854,8 +856,10 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
 
     xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", pScrn->chipset);
 
+#ifndef XSERVER_LIBPCIACCESS
     pSmi->PciTag = pciTag(pSmi->PciInfo->bus, pSmi->PciInfo->device,
 		   	  pSmi->PciInfo->func);
+#endif
 
     pSmi->Dualhead = FALSE;
     if (xf86ReturnOptValBool(pSmi->Options, OPTION_DUALHEAD, FALSE) &&
@@ -1785,30 +1789,43 @@ SMI_MapMem(ScrnInfoPtr pScrn)
     /* Map the Lynx register space */
     switch (pSmi->Chipset) {
     default:
-	memBase = pSmi->PciInfo->memBase[0] + 0x400000;
+      memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM) + 0x400000;
 	pSmi->MapSize = 0x10000;
 	break;
     case SMI_COUGAR3DR:
-	memBase = pSmi->PciInfo->memBase[1];
+        memBase = PCI_REGION_BASE(pSmi->PciInfo, 1, REGION_MEM);
 	pSmi->MapSize = 0x200000;
 	break;
     case SMI_LYNX3D:
-	memBase = pSmi->PciInfo->memBase[0] + 0x680000;
+	memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM) + 0x680000;
 	pSmi->MapSize = 0x180000;
 	break;
     case SMI_LYNXEM:
     case SMI_LYNXEMplus:
-	memBase = pSmi->PciInfo->memBase[0] + 0x400000;
+	memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM) + 0x400000;
 	pSmi->MapSize = 0x400000;
 	break;
     case SMI_LYNX3DM:
-	memBase = pSmi->PciInfo->memBase[0];
+	memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM);
 	pSmi->MapSize = 0x200000;
 	break;
     }
+#ifndef XSERVER_LIBPCIACCESS
     pSmi->MapBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pSmi->PciTag,
 				  memBase, pSmi->MapSize);
-
+#else
+    {
+      void** result = (void**)&pSmi->MapBase;
+      int err = pci_device_map_range(pSmi->PciInfo,
+				     memBase,
+				     pSmi->MapSize,
+				     PCI_DEV_MAP_FLAG_WRITABLE,
+				     result);
+      
+      if (err) 
+	return FALSE;
+    }
+#endif
     if (pSmi->MapBase == NULL) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Internal error: could not map "
 		   "MMIO registers.\n");
@@ -1872,7 +1889,7 @@ SMI_MapMem(ScrnInfoPtr pScrn)
 		   "DataPort=%p - %p\n", pSmi->DataPortBase,
 		   pSmi->DataPortBase + pSmi->DataPortSize - 1);
 
-    pScrn->memPhysBase = pSmi->PciInfo->memBase[0];
+    pScrn->memPhysBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM);
 
     SMI_EnableMmio(pScrn);
 
@@ -1887,11 +1904,26 @@ SMI_MapMem(ScrnInfoPtr pScrn)
 
 	pScrn->fbOffset = pSmi->FBOffset + pSmi->fbMapOffset;
 
+#ifndef XSERVER_LIBPCIACCESS
 	pSmi->FBBase = xf86MapPciMem(pScrn->scrnIndex,
 				     VIDMEM_FRAMEBUFFER,
 				     pSmi->PciTag,
 				     pScrn->memPhysBase + pSmi->fbMapOffset,
 				     pSmi->videoRAMBytes);
+#else
+	{
+	  void** result = (void**)&pSmi->FBBase;
+	  int err = pci_device_map_range(pSmi->PciInfo,
+					 pScrn->memPhysBase + pSmi->fbMapOffset,
+					 pSmi->videoRAMBytes,
+					 PCI_DEV_MAP_FLAG_WRITABLE |
+					 PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+					 result);
+	  
+	  if (err) 
+	    return FALSE;
+	}
+#endif
 	    
 	if (pSmi->FBBase == NULL) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Internal error: could not "
@@ -2563,7 +2595,7 @@ SMI_ModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 
     if (pSmi->MCLK > 0) {
 	SMI_CommonCalcClock(pScrn->scrnIndex, pSmi->MCLK,
-			    1, 1, 63, 0, 2,
+			    1, 1, 63, 0, 0,
                             pScrn->clockRanges->minClock,
                             pScrn->clockRanges->maxClock,
                             &new->SR6A, &new->SR6B);
@@ -2588,7 +2620,7 @@ SMI_ModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
     vclk = mode->Clock;
     if (SMI_LYNX_SERIES(pSmi->Chipset)) {
         SMI_CommonCalcClock(pScrn->scrnIndex, vclk,
-			1, 1, 63, 0, 2,
+			1, 1, 63, 0, 3,
                         pScrn->clockRanges->minClock,
                         pScrn->clockRanges->maxClock,
                         &new->SR6C, &new->SR6D);
diff --git a/src/smi_exa.c b/src/smi_exa.c
index da3e36b..575ab65 100644
--- a/src/smi_exa.c
+++ b/src/smi_exa.c
@@ -77,8 +77,8 @@ SMI_EXAInit(ScreenPtr pScreen)
 
     /* Memory Manager */
     pSmi->EXADriverPtr->memoryBase = pSmi->FBBase + pSmi->FBOffset;
-    pSmi->EXADriverPtr->memorySize = pSmi->FBReserved - 1024;
-    pSmi->EXADriverPtr->offScreenBase = pSmi->width * pSmi->height * pSmi->Bpp + 1024;
+    pSmi->EXADriverPtr->memorySize = pSmi->FBReserved;
+    pSmi->EXADriverPtr->offScreenBase = pSmi->width * pSmi->height * pSmi->Bpp;
 
     /* Flags */
     pSmi->EXADriverPtr->flags = EXA_TWO_BITBLT_DIRECTIONS;
@@ -96,6 +96,14 @@ SMI_EXAInit(ScreenPtr pScreen)
     pSmi->EXADriverPtr->maxX = 4096;
     pSmi->EXADriverPtr->maxY = 4096;
 
+    if (pScrn->bitsPerPixel == 24) {
+	pSmi->EXADriverPtr->maxX = 4096 / 3;
+
+	if (pSmi->Chipset == SMI_LYNX) {
+	    pSmi->EXADriverPtr->maxY = 4096 / 3;
+	}
+    }
+
     pSmi->EXADriverPtr->pixmapPitchAlign  = 16;
     pSmi->EXADriverPtr->pixmapOffsetAlign = 8;
 
@@ -112,8 +120,8 @@ SMI_EXAInit(ScreenPtr pScreen)
     pSmi->EXADriverPtr->Solid = SMI_Solid;
     pSmi->EXADriverPtr->DoneSolid = SMI_DoneSolid;
 
-    /* DFS & UTS */
 #if 0
+    /* DFS & UTS */
     pSmi->EXADriverPtr->UploadToScreen = SMI_UploadToScreen;
     pSmi->EXADriverPtr->DownloadFromScreen = SMI_DownloadFromScreen;
 #endif
@@ -460,30 +468,37 @@ SMI_UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
 {
     ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
     SMIPtr pSmi = SMIPTR(pScrn);
-    int i, j, dwords, Bpp, queue, dst_pitch;
-    CARD32 *srcp, *dataport;
+    int dst_pitch, source_pitch, align, aligned_pitch;
     unsigned long dst_offset;
 
     ENTER_PROC("SMI_UploadToScreen");
     DEBUG((VERBLEV, "x=%d y=%d w=%d h=%d src=%d src_pitch=%d\n",
 	   x, y, w, h, src, src_pitch));
 
+    if (pDst->drawable.bitsPerPixel == 24) {
+	align = 16;
+    } else {
+	align = 128 / pDst->drawable.bitsPerPixel;
+    }
+
+    aligned_pitch = (src_pitch + align - 1) & ~(align - 1);
+
     /* calculate pitch in pixel unit */
     dst_pitch  = exaGetPixmapPitch(pDst) / (pDst->drawable.bitsPerPixel >> 3);
+    source_pitch = src_pitch / (pDst->drawable.bitsPerPixel >> 3);
     /* calculate offset in 8 byte (64 bit) unit */
     dst_offset = exaGetPixmapOffset(pDst) >> 3;
 
-    Bpp = pDst->drawable.bitsPerPixel / 8;
-    dwords = (((w * Bpp) + 3) >> 2) * h;
-
     pSmi->AccelCmd = 0xCC /* GXcopy */
 		   | SMI_HOSTBLT_WRITE
 		   | SMI_QUICK_START;
 
+    /* set clipping */
+    SMI_SetClippingRectangle(pScrn, x, y, x+w, y+h);
 
-    WaitQueue(1);
-    /* Destination Window Width */
-    WRITE_DPR(pSmi, 0x3C, (dst_pitch << 16));
+    WaitQueue(7);
+    /* Destination and Source Window Widths */
+    WRITE_DPR(pSmi, 0x3C, (dst_pitch << 16) | (source_pitch & 0xFFFF));
 
     if (pDst->drawable.bitsPerPixel == 24) {
 	x *= 3;
@@ -494,43 +509,27 @@ SMI_UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
 	}
     }
 
-    WaitQueue(9);
-    /* Destination Row Pitch */
-    WRITE_DPR(pSmi, 0x10, (dst_pitch << 16));
+    /* Source and Destination Row Pitch */
+    WRITE_DPR(pSmi, 0x10, (dst_pitch << 16) | (source_pitch & 0xFFFF));
     /* Drawing engine data format */
     WRITE_DPR(pSmi, 0x1C, SMI_DEDataFormat(pDst));
-    /* Destination Base Address (offset) */
+    /* Source and Destination Base Address (offset) */
+    WRITE_DPR(pSmi, 0x40, 0);
     WRITE_DPR(pSmi, 0x44, dst_offset);
 
-    /* set l/r clipping */
-    WRITE_DPR(pSmi, 0x2C, (0xFFFF0000 | x | 0x2000));
-    WRITE_DPR(pSmi, 0x30, (0xFFFF0000 | (x + w)));
-
     WRITE_DPR(pSmi, 0x0C, pSmi->AccelCmd);
     WRITE_DPR(pSmi, 0x00, 0);
     WRITE_DPR(pSmi, 0x04, (x << 16) | (y * 0xFFFF));
     WRITE_DPR(pSmi, 0x08, (w << 16) | (h & 0xFFFF));
 
-
-    srcp = (CARD32 *)src;
-    dataport = (CARD32 *)pSmi->DataPortBase;
-    queue = pSmi->DataPortSize;
-    while (dwords) {
-	if (queue < 4) {
-	    /* XXX: check if the hw is ok with this */
-	    dataport = (CARD32 *)pSmi->DataPortBase;
-	    queue = pSmi->DataPortSize;
-	}
-	memcpy(dataport, srcp, 4);
-	queue -= 4;
-	dwords--;
-	srcp++;
-	dataport++;
+    while (h--) {
+	WaitQueue(aligned_pitch);
+	memcpy(pSmi->DataPortBase, src, aligned_pitch);
+	src += src_pitch;
     }
 
-    WaitQueue(1);
     /* disable clipping */
-    WRITE_DPR(pSmi, 0x2C, 0);
+    SMI_DisableClipping(pScrn);
 
     exaWaitSync(pDst->drawable.pScreen);
 
diff --git a/src/smi_pcirename.h b/src/smi_pcirename.h
new file mode 100644
index 0000000..9321046
--- /dev/null
+++ b/src/smi_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef S3PCIRENAME_H
+#define S3PCIRENAME_H
+
+enum region_type {
+    REGION_MEM,
+    REGION_IO 
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus,    \
+                                    (_pcidev)->device, \
+                                    (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type)             \
+    (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+                             : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+    (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev)        (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev)        (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev)      (((_pcidev)->domain << 8) | \
+                                    (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev)      ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b)        ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */


Index: xorg-x11-drv-siliconmotion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-siliconmotion/devel/xorg-x11-drv-siliconmotion.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-siliconmotion.spec	20 Feb 2008 07:44:20 -0000	1.16
+++ xorg-x11-drv-siliconmotion.spec	10 Mar 2008 04:07:56 -0000	1.17
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 siliconmotion video driver
 Name:      xorg-x11-drv-siliconmotion
 Version: 1.5.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -14,8 +14,10 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   siliconmotion.xinf
 
+Patch0: siliconmotion-git.patch
 ExcludeArch: s390 s390x
 
+BuildRequires: automake autoconf libtool
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
 Requires:  hwdata
@@ -26,8 +28,10 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .git
 
 %build
+autoreconf -v --install
 %configure --disable-static
 make
 
@@ -53,6 +57,9 @@
 %{_mandir}/man4/siliconmotion.4*
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  1.5.1-5
+- pciaccess conversion
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 1.5.1-4
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 04:12:51 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:12:51 +0000
Subject: [pkgdb] mediawiki: static has given up watchbugzilla
Message-ID: <200803100415.m2A4FKdC022727@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchbugzilla acl on mediawiki (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:12:52 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:12:52 +0000
Subject: [pkgdb] mediawiki: static has given up watchcommits
Message-ID: <200803100415.m2A4FM6m022732@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchcommits acl on mediawiki (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:12:58 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:12:58 +0000
Subject: [pkgdb] mediawiki: static has given up watchbugzilla
Message-ID: <200803100415.m2A4FM6p022732@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchbugzilla acl on mediawiki (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:12:59 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:12:59 +0000
Subject: [pkgdb] mediawiki: static has given up watchcommits
Message-ID: <200803100415.m2A4FS4G022784@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchcommits acl on mediawiki (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:02 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:02 +0000
Subject: [pkgdb] mediawiki: static has given up watchbugzilla
Message-ID: <200803100415.m2A4FS4J022784@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchbugzilla acl on mediawiki (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:04 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:04 +0000
Subject: [pkgdb] mediawiki: static has given up watchcommits
Message-ID: <200803100415.m2A4FKdF022727@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchcommits acl on mediawiki (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:08 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:08 +0000
Subject: [pkgdb] mediawiki: static has given up watchbugzilla
Message-ID: <200803100415.m2A4FKdI022727@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchbugzilla acl on mediawiki (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:09 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:09 +0000
Subject: [pkgdb] mediawiki: static has given up watchcommits
Message-ID: <200803100415.m2A4FM6s022732@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchcommits acl on mediawiki (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:13 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:13 +0000
Subject: [pkgdb] mediawiki: static has given up watchbugzilla
Message-ID: <200803100415.m2A4FS4M022784@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchbugzilla acl on mediawiki (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:14 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:14 +0000
Subject: [pkgdb] mediawiki: static has given up watchcommits
Message-ID: <200803100415.m2A4FhFu022909@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchcommits acl on mediawiki (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:20 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:20 +0000
Subject: [pkgdb] mediawiki: static has given up watchbugzilla
Message-ID: <200803100415.m2A4Fo2p022932@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchbugzilla acl on mediawiki (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:23 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:23 +0000
Subject: [pkgdb] mediawiki: static has given up watchcommits
Message-ID: <200803100415.m2A4Fo2s022932@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchcommits acl on mediawiki (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:25 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:25 +0000
Subject: [pkgdb] mediawiki: static has given up watchbugzilla
Message-ID: <200803100415.m2A4Ftd5022977@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchbugzilla acl on mediawiki (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:27 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:27 +0000
Subject: [pkgdb] mediawiki: static has given up watchcommits
Message-ID: <200803100415.m2A4Ftd8022977@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchcommits acl on mediawiki (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:29 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:29 +0000
Subject: [pkgdb] mediawiki: static has given up watchbugzilla
Message-ID: <200803100415.m2A4FhFx022909@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchbugzilla acl on mediawiki (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:34 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 04:13:34 +0000
Subject: [pkgdb] mediawiki: static has given up watchcommits
Message-ID: <200803100416.m2A4Fo2v022932@bastion.fedora.phx.redhat.com>

Brandon Holbrook (static) has given up the watchcommits acl on mediawiki (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From fedora-extras-commits at redhat.com  Mon Mar 10 04:13:44 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 04:13:44 GMT
Subject: rpms/metacity/devel .cvsignore, 1.68, 1.69 metacity.spec, 1.147,
	1.148 sources, 1.68, 1.69
Message-ID: <200803100413.m2A4DilA026449@cvs-int.fedora.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	28 Feb 2008 03:10:24 -0000	1.68
+++ .cvsignore	10 Mar 2008 04:12:54 -0000	1.69
@@ -1 +1 @@
-metacity-2.21.21.tar.bz2
+metacity-2.22.0.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- metacity.spec	28 Feb 2008 03:10:24 -0000	1.147
+++ metacity.spec	10 Mar 2008 04:12:54 -0000	1.148
@@ -1,9 +1,9 @@
 Summary: Metacity window manager
 Name: metacity
-Version: 2.21.21
+Version: 2.22.0
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
-Source0: http://download.gnome.org/sources/metacity/2.21/metacity-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/metacity/2.22/metacity-%{version}.tar.bz2
 Patch0: default-theme.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=106249
 Patch2: skip-taskbar-tab.patch
@@ -151,6 +151,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 2.22.0-1
+- Update to 2.22.0
+
 * Wed Feb 27 2008 Matthias Clasen  - 2.21.21-1
 - Update to 2.21.21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	28 Feb 2008 03:10:24 -0000	1.68
+++ sources	10 Mar 2008 04:12:54 -0000	1.69
@@ -1 +1 @@
-4379689f6883876e69f6919c9fa2c7c6  metacity-2.21.21.tar.bz2
+8cb6d02cf66a1003532b4f5d2754d696  metacity-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 04:22:23 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 04:22:23 GMT
Subject: rpms/gnome-backgrounds/devel .cvsignore, 1.9,
	1.10 gnome-backgrounds.spec, 1.13, 1.14 sources, 1.9, 1.10
Message-ID: <200803100422.m2A4MNDr026775@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26733

Modified Files:
	.cvsignore gnome-backgrounds.spec sources 
Log Message:
2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Sep 2007 03:34:22 -0000	1.9
+++ .cvsignore	10 Mar 2008 04:21:48 -0000	1.10
@@ -1 +1 @@
-gnome-backgrounds-2.20.0.tar.bz2
+gnome-backgrounds-2.22.0.tar.bz2


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-backgrounds.spec	18 Sep 2007 03:34:22 -0000	1.13
+++ gnome-backgrounds.spec	10 Mar 2008 04:21:48 -0000	1.14
@@ -1,11 +1,11 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.20.0
+Version: 2.22.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-backgrounds/2.20/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-backgrounds/2.22/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -52,6 +52,9 @@
 %{_datadir}/backgrounds/*
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 2.22.0-1
+- Update to 2.22.0
+
 * Mon Sep 17 2007 Matthias Clasen  - 2.20.0-1
 - Update to 2.20.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Sep 2007 03:34:22 -0000	1.9
+++ sources	10 Mar 2008 04:21:48 -0000	1.10
@@ -1 +1 @@
-391c0c64407c5bd2a52207b0298beac4  gnome-backgrounds-2.20.0.tar.bz2
+1997e020288ea6b91ed460c2c6bfc8d4  gnome-backgrounds-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 04:24:34 2008
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Mon, 10 Mar 2008 04:24:34 GMT
Subject: rpms/gdm/devel gdm.spec, 1.339, 1.340 sources, 1.74,
	1.75 gdm-2.21.9-check-capslock-state-not-capslock-light-state.patch, 
	1.1, NONE gdm-2.21.9-dont-steal-all-keypresses.patch, 1.1, NONE
Message-ID: <200803100424.m2A4OY3B026903@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26856

Modified Files:
	gdm.spec sources 
Removed Files:
	gdm-2.21.9-check-capslock-state-not-capslock-light-state.patch 
	gdm-2.21.9-dont-steal-all-keypresses.patch 
Log Message:
- Update to latest snapshot



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- gdm.spec	7 Mar 2008 08:31:15 -0000	1.339
+++ gdm.spec	10 Mar 2008 04:23:58 -0000	1.340
@@ -19,7 +19,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.21.9
-Release: 0.2008.02.29.3%{?dist}
+Release: 0.2008.03.10.1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -89,10 +89,6 @@
 
 Requires: audit-libs >= %{libauditver}
 
-Patch0: gdm-2.21.9-dont-steal-all-keypresses.patch
-Patch1: gdm-2.21.9-check-capslock-state-not-capslock-light-state.patch
-Patch2:	gdm-2.21.9-signal.patch
-
 Patch99: gdm-2.21.8-fedora-logo.patch
 
 %package user-switch-applet
@@ -113,10 +109,6 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .dont-steal-all-keypresses
-%patch1 -p1 -b .check-capslock-state-not-capslock-light-state
-%patch2 -p1 -b .signal
-
 %patch99 -p1 -b .fedora-logo
 
 %build
@@ -124,9 +116,6 @@
 cp -f %{SOURCE2} data/gdm-autologin
 cp -f %{SOURCE3} utils/gdmsetup-pam
 
-intltoolize --force
-autoreconf
-
 %configure --with-pam-prefix=%{_sysconfdir} \
 	   --enable-console-helper \
 	   --disable-scrollkeeper  \
@@ -311,6 +300,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Mon Mar 10 2008 Ray Strode  - 1:2.21.9-0.2008.03.10.1
+- Update to latest snapshot
+
 * Fri Mar 7 2008 David Woodhouse  - 1:2.21.9-0.2008.02.29.3
 - Fix endianness breakage in signal pipes (#436333)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	29 Feb 2008 22:04:23 -0000	1.74
+++ sources	10 Mar 2008 04:23:58 -0000	1.75
@@ -1 +1 @@
-7e8c358319a47254882f2504d24ce53c  gdm-2.21.9.tar.gz
+7e2fed99bab30b4f571dab578b465be9  gdm-2.21.9.tar.gz


--- gdm-2.21.9-check-capslock-state-not-capslock-light-state.patch DELETED ---


--- gdm-2.21.9-dont-steal-all-keypresses.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 04:29:39 2008
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Mar 2008 04:29:39 GMT
Subject: rpms/ruby/devel .cvsignore, 1.24, 1.25 ruby.spec, 1.114,
	1.115 sources, 1.22, 1.23
Message-ID: <200803100429.m2A4Tdn2027161@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ruby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27101

Modified Files:
	.cvsignore ruby.spec sources 
Log Message:
* Tue Mar  4 2008 Akira TAGOH  - 1.8.6.114-1
- Security fix for CVE-2008-1145.
- Improve a spec file. (#226381)
  - Correct License tag.
  - Fix a timestamp issue.
  - Own a arch-specific directory.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	28 Dec 2007 02:42:45 -0000	1.24
+++ .cvsignore	10 Mar 2008 04:28:30 -0000	1.25
@@ -20,3 +20,4 @@
 ruby-1.8.6-p111.tar.bz2
 rubyfaq-990927.tar.gz
 rubyfaq-jp-990927.tar.gz
+ruby-1.8.6-p114.tar.bz2


Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ruby.spec	20 Feb 2008 03:41:02 -0000	1.114
+++ ruby.spec	10 Mar 2008 04:28:30 -0000	1.115
@@ -1,6 +1,6 @@
 %define	rubyxver	1.8
 %define	rubyver		1.8.6
-%define _patchlevel	111
+%define _patchlevel	114
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
 %define	arcver		%{rubyver}%{?patchlevel}
@@ -12,8 +12,8 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	9%{?dist}
-License:	Ruby or GPL+
+Release:	1%{?dist}
+License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc
@@ -313,7 +313,7 @@
 %ifnarch ppc64
 # installing ruby-mode
 cd %{name}-%{arcver}
-cp misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
+cp -p misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
 
 ## for ruby-mode
 pushd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
@@ -385,6 +385,7 @@
 %doc %{name}-%{arcver}/LGPL
 %dir %{_prefix}/lib/ruby
 %dir %{_prefix}/lib/ruby/%{rubyxver}
+%dir %{_prefix}/lib/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
 %ifarch ppc64 s390x sparc64 x86_64
 %dir %{_libdir}/ruby
 %dir %{_libdir}/ruby/%{rubyxver}
@@ -511,6 +512,13 @@
 %endif
 
 %changelog
+* Tue Mar  4 2008 Akira TAGOH  - 1.8.6.114-1
+- Security fix for CVE-2008-1145.
+- Improve a spec file. (#226381)
+  - Correct License tag.
+  - Fix a timestamp issue.
+  - Own a arch-specific directory.
+
 * Tue Feb 19 2008 Fedora Release Engineering  - 1.8.6.111-9
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	28 Dec 2007 02:42:45 -0000	1.22
+++ sources	10 Mar 2008 04:28:30 -0000	1.23
@@ -3,3 +3,4 @@
 e1d38b7d4f1be55726d6927a3395ce3b  ruby-1.8.6-p111.tar.bz2
 634c25b14e19925d10af3720d72e8741  rubyfaq-990927.tar.gz
 4fcec898f51d8371cc42d0a013940469  rubyfaq-jp-990927.tar.gz
+b4d0c74497f684814bcfbb41b7384a71  ruby-1.8.6-p114.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 04:32:16 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 04:32:16 GMT
Subject: rpms/gnome-backgrounds/devel gnome-backgrounds-paths.patch, NONE,
	1.1 gnome-backgrounds.spec, 1.14,
	1.15 gnome-backgrounds-2.14.0-paths.patch, 1.2, NONE
Message-ID: <200803100432.m2A4WGFI027229@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27206

Modified Files:
	gnome-backgrounds.spec 
Added Files:
	gnome-backgrounds-paths.patch 
Removed Files:
	gnome-backgrounds-2.14.0-paths.patch 
Log Message:
update patch


gnome-backgrounds-paths.patch:

--- NEW FILE gnome-backgrounds-paths.patch ---
diff -up gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in.paths gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in
--- gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in.paths	2007-12-21 20:11:28.000000000 -0500
+++ gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in	2008-03-10 00:27:27.000000000 -0400
@@ -5,7 +5,7 @@
     
     <_name>Boats Pattern
-    @datadir@/pixmaps/backgrounds/gnome/tiles/pattern-boats.svg
+    @datadir@/backgrounds/tiles/pattern-boats.svg
     wallpaper
     vertical-gradient
     #FCAF3E
@@ -15,7 +15,7 @@
     
     <_name>Clouds Pattern
-    @datadir@/pixmaps/backgrounds/gnome/tiles/pattern-clouds.svg
+    @datadir@/backgrounds/tiles/pattern-clouds.svg
     wallpaper
     vertical-gradient
     #729FCF
@@ -25,7 +25,7 @@
     
     <_name>Stars Pattern
-    @datadir@/pixmaps/backgrounds/gnome/tiles/pattern-stars.svg
+    @datadir@/backgrounds/tiles/pattern-stars.svg
     wallpaper
     vertical-gradient
     #332133
diff -up gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in.paths gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in
--- gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in.paths	2007-12-21 20:11:28.000000000 -0500
+++ gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in	2008-03-10 00:27:27.000000000 -0400
@@ -5,7 +5,7 @@
     
     <_name>Ellipses (Translucent)
-    @datadir@/pixmaps/backgrounds/gnome/translucent/ellipsis.svg
+    @datadir@/backgrounds/translucent/ellipsis.svg
     stretched
     solid
     #BABDB6
@@ -14,7 +14,7 @@
     
     <_name>Tentacles (Translucent)
-    @datadir@/pixmaps/backgrounds/gnome/translucent/tentacles.svg
+    @datadir@/backgrounds/translucent/tentacles.svg
     stretched
     solid
     #366B04
diff -up gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in.paths gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in
--- gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in.paths	2007-12-21 20:12:53.000000000 -0500
+++ gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in	2008-03-10 00:29:38.000000000 -0400
@@ -5,21 +5,21 @@
 	
 		<_name>Fresh Flower
-		@datadir@/pixmaps/backgrounds/gnome/nature/FreshFlower.jpg
+		@datadir@/backgrounds/nature/FreshFlower.jpg
 		zoom
 	
 	
 		
 		<_name>Open Flower
-		@datadir@/pixmaps/backgrounds/gnome/nature/OpenFlower.jpg
+		@datadir@/backgrounds/nature/OpenFlower.jpg
 		zoom
 	
 	
 		
 		<_name>Green Meadow
-		@datadir@/pixmaps/backgrounds/gnome/nature/GreenMeadow.jpg
+		@datadir@/backgrounds/nature/GreenMeadow.jpg
 		zoom
 	
 
diff -up gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in.paths gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in
--- gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in.paths	2007-12-21 20:11:28.000000000 -0500
+++ gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in	2008-03-10 00:27:27.000000000 -0400
@@ -5,7 +5,7 @@
     
     <_name>GNOME Curves
-    @datadir@/pixmaps/backgrounds/gnome/branded/GNOME-Curves.png
+    @datadir@/backgrounds/images/branded/GNOME-Curves.png
     zoom
     solid
     #76848F


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-backgrounds.spec	10 Mar 2008 04:21:48 -0000	1.14
+++ gnome-backgrounds.spec	10 Mar 2008 04:31:41 -0000	1.15
@@ -14,7 +14,7 @@
 # for /usr/share/backgrounds
 Requires: desktop-backgrounds-basic
 
-Patch0: gnome-backgrounds-2.14.0-paths.patch
+Patch0: gnome-backgrounds-paths.patch
 
 %description
 The gnome-backgrounds package contains images and tiles


--- gnome-backgrounds-2.14.0-paths.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 04:36:44 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 04:36:44 GMT
Subject: rpms/libgnome/devel .cvsignore, 1.40, 1.41 libgnome.spec, 1.114,
	1.115 sources, 1.40, 1.41 black-background.patch, 1.1,
	NONE libgnome-2.15.1-stat-homedir.patch, 1.1,
	NONE libgnome-2.20.1-default-filechooser-backend.patch, 1.2, NONE
Message-ID: <200803100436.m2A4aiYo027375@cvs-int.fedora.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore libgnome.spec sources 
Removed Files:
	black-background.patch libgnome-2.15.1-stat-homedir.patch 
	libgnome-2.20.1-default-filechooser-backend.patch 
Log Message:
2.21.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	29 Jan 2008 15:34:40 -0000	1.40
+++ .cvsignore	10 Mar 2008 04:36:07 -0000	1.41
@@ -1 +1 @@
-libgnome-2.21.90.tar.bz2
+libgnome-2.21.91.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- libgnome.spec	22 Feb 2008 22:51:43 -0000	1.114
+++ libgnome.spec	10 Mar 2008 04:36:07 -0000	1.115
@@ -12,8 +12,8 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.21.90
-Release: 3%{?dist}
+Version: 2.21.91
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.21/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -64,7 +64,6 @@
 # backport from upstream svn
 Patch9: im-setting.patch
 
-Patch10: libgnome-2.20.1-default-filechooser-backend.patch
 
 %description
 
@@ -117,7 +116,6 @@
 %patch6 -p1 -b .default-settings
 %patch7 -p1 -b .default-esd
 %patch9 -p1 -b .im-setting
-%patch10 -p1 -b .default-filechooser-backend
 
 %build
 aclocal
@@ -198,6 +196,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 2.21.91-1
+- Update to 2.21.91
+
 * Fri Feb 22 2008 Matthias Clasen  - 2.21.90-3
 - Make gio the default filechooser backend
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	29 Jan 2008 15:34:40 -0000	1.40
+++ sources	10 Mar 2008 04:36:07 -0000	1.41
@@ -1 +1 @@
-d0c03f5ce6ee0ddd52896ab1ef9e9386  libgnome-2.21.90.tar.bz2
+bdaae1a55fd9ea624ce46ccdf2e5d96d  libgnome-2.21.91.tar.bz2


--- black-background.patch DELETED ---


--- libgnome-2.15.1-stat-homedir.patch DELETED ---


--- libgnome-2.20.1-default-filechooser-backend.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 04:40:46 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 04:40:46 GMT
Subject: rpms/xorg-x11-drv-chips/devel chips-pciaccess.patch, NONE,
	1.1 xorg-x11-drv-chips.spec, 1.15, 1.16
Message-ID: <200803100440.m2A4ekei027720@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-chips/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27553

Modified Files:
	xorg-x11-drv-chips.spec 
Added Files:
	chips-pciaccess.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  1.1.1-7
- pciaccess conversion


chips-pciaccess.patch:

--- NEW FILE chips-pciaccess.patch ---
diff --git a/configure.ac b/configure.ac
index d5e02ba..8c87eb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,20 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
 # Checks for header files.
 AC_HEADER_STDC
diff --git a/src/ct_accel.c b/src/ct_accel.c
index d56f009..1ccb480 100644
--- a/src/ct_accel.c
+++ b/src/ct_accel.c
@@ -1182,7 +1182,7 @@ CTNAME(CacheMonoStipple)(ScrnInfoPtr pScrn, PixmapPtr pPix)
     } else 		funcNo = 2;
 
     pad = (((pCache->w * bpp) + 31) >> 5) << 2;
-    dstPtr = data = (unsigned char*)ALLOCATE_LOCAL(pad * pCache->h);
+    dstPtr = data = (unsigned char*)xalloc(pad * pCache->h);
     srcPtr = (unsigned char*)pPix->devPrivate.ptr;
     StippleFunc = StippleTab[funcNo];
     
@@ -1210,7 +1210,7 @@ CTNAME(CacheMonoStipple)(ScrnInfoPtr pScrn, PixmapPtr pPix)
 	pScrn, pCache->x, pCache->y, pCache->w, pCache->h, data,
 	pad, bpp, pScrn->depth);
 
-    DEALLOCATE_LOCAL(data);
+    xfree(data);
 
     return pCache;
 }
diff --git a/src/ct_driver.c b/src/ct_driver.c
index e905603..c05798f 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -113,8 +113,12 @@
 
 
 /* Needed for the 1 and 4 bpp framebuffers */
+#ifdef HAVE_XF1BPP
 #include "xf1bpp.h"
+#endif
+#ifdef HAVE_XF4BPP
 #include "xf4bpp.h"
+#endif
 
 /* Needed by Resources Access Control (RAC) */
 #include "xf86RAC.h"
@@ -137,7 +141,12 @@
 /* Mandatory functions */
 static const OptionInfoRec *	CHIPSAvailableOptions(int chipid, int busid);
 static void     CHIPSIdentify(int flags);
+#ifdef XSERVER_LIBPCIACCESS
+static Bool     CHIPSPciProbe(DriverPtr drv, int entity_num,
+			      struct pci_device *dev, intptr_t match_data);
+#else
 static Bool     CHIPSProbe(DriverPtr drv, int flags);
+#endif
 static Bool     CHIPSPreInit(ScrnInfoPtr pScrn, int flags);
 static Bool     CHIPSScreenInit(int Index, ScreenPtr pScreen, int argc,
                                   char **argv);
@@ -465,9 +474,28 @@ static DisplayModeRec ChipsNTSCMode = {
 #define CHIPS_VERSION 4000
 #define CHIPS_NAME "CHIPS"
 #define CHIPS_DRIVER_NAME "chips"
-#define CHIPS_MAJOR_VERSION 1
-#define CHIPS_MINOR_VERSION 1
-#define CHIPS_PATCHLEVEL 1
+#define CHIPS_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define CHIPS_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define CHIPS_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
+
+
+#ifdef XSERVER_LIBPCIACCESS
+
+#define CHIPS_DEVICE_MATCH(d, i) \
+  { PCI_VENDOR_CHIPSTECH, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
+
+static const struct pci_id_match chips_device_match[] = {
+  CHIPS_DEVICE_MATCH(PCI_CHIP_65545, 0),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_65548, 0),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_65550, 0),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_65554, 0),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_65555, 0),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_68554, 0),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_69000, 0),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_69030, 0),
+  { 0, 0, 0 },
+};
+#endif
 
 /*
  * This contains the functions needed by the server after loading the driver
@@ -481,10 +509,20 @@ _X_EXPORT DriverRec CHIPS = {
 	CHIPS_VERSION,
 	CHIPS_DRIVER_NAME,
 	CHIPSIdentify,
+#ifdef XSERVER_LIBPCIACCESS
+	NULL,
+#else
 	CHIPSProbe,
+#endif
 	CHIPSAvailableOptions,
 	NULL,
-	0
+	0,
+	NULL,
+
+#ifdef XSERVER_LIBPCIACCESS
+	chips_device_match,
+	CHIPSPciProbe,
+#endif
 };
 
 static SymTabRec CHIPSChipsets[] = {
@@ -507,6 +545,7 @@ static SymTabRec CHIPSChipsets[] = {
     { -1,			NULL }
 };
 
+
 /* Conversion PCI ID to chipset name */
 static PciChipsets CHIPSPCIchipsets[] = {
     { CHIPS_CT65545, PCI_CHIP_65545, RES_SHARED_VGA },
@@ -685,8 +724,12 @@ static const char *vgahwSymbols[] = {
 
 #ifdef XFree86LOADER
 static const char *miscfbSymbols[] = {
+#ifdef HAVE_XF1BPP
     "xf1bppScreenInit",
+#endif
+#ifdef HAVE_XF4BPP
     "xf4bppScreenInit",
+#endif
     "cfb8_16ScreenInit",
     NULL
 };
@@ -854,6 +897,68 @@ CHIPSAvailableOptions(int chipid, int busid)
 }
 
 /* Mandatory */
+#ifdef XSERVER_LIBPCIACCESS
+Bool
+CHIPSPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev,
+	    intptr_t match_data)
+{
+    ScrnInfoPtr pScrn = NULL;
+    EntityInfoPtr pEnt;
+    CHIPSPtr cPtr;
+
+    /* Allocate a ScrnInfoRec and claim the slot */
+    pScrn = xf86ConfigPciEntity(pScrn, 0, entity_num, CHIPSPCIchipsets, NULL,
+				NULL, NULL, NULL, NULL);
+    if (pScrn != NULL) {
+	/* Fill in what we can of the ScrnInfoRec */
+	pScrn->driverVersion	= CHIPS_VERSION;
+	pScrn->driverName	= CHIPS_DRIVER_NAME;
+	pScrn->name		= CHIPS_NAME;
+	pScrn->Probe		= NULL;
+	pScrn->PreInit		= CHIPSPreInit;
+	pScrn->ScreenInit	= CHIPSScreenInit;
+	pScrn->SwitchMode	= CHIPSSwitchMode;
+	pScrn->AdjustFrame	= CHIPSAdjustFrame;
+	pScrn->EnterVT		= CHIPSEnterVT;
+	pScrn->LeaveVT		= CHIPSLeaveVT;
+	pScrn->FreeScreen	= CHIPSFreeScreen;
+	pScrn->ValidMode	= CHIPSValidMode;
+
+	/*
+	 * For cards that can do dual head per entity, mark the entity
+	 * as sharable. 
+	 */
+	pEnt = xf86GetEntityInfo(entity_num);
+	if (pEnt->chipset == CHIPS_CT69030) {
+	    CHIPSEntPtr cPtrEnt = NULL;
+	    DevUnion *pPriv;
+
+	    xf86SetEntitySharable(entity_num);
+	    /* Allocate an entity private if necessary */
+	    if (CHIPSEntityIndex < 0)
+	      CHIPSEntityIndex = xf86AllocateEntityPrivateIndex();
+	    pPriv = xf86GetEntityPrivate(pScrn->entityList[0], CHIPSEntityIndex);
+	    if (!pPriv->ptr) {
+		pPriv->ptr = xnfcalloc(sizeof(CHIPSEntRec), 1);
+		cPtrEnt = pPriv->ptr;
+		cPtrEnt->lastInstance = -1;
+	    } else {
+		cPtrEnt = pPriv->ptr;
+	    }
+	    /*
+	     * Set the entity instance for this instance of the driver.  For
+	     * dual head per card, instance 0 is the "master" instance, driving
+	     * the primary head, and instance 1 is the "slave".
+	     */
+	    cPtrEnt->lastInstance++;
+	    xf86SetEntityInstanceForScreen(pScrn, pScrn->entityList[0],
+					   cPtrEnt->lastInstance);
+	}
+    }
+
+    return (pScrn != NULL);
+}
+#else
 static Bool
 CHIPSProbe(DriverPtr drv, int flags)
 {
@@ -974,6 +1079,7 @@ CHIPSProbe(DriverPtr drv, int flags)
     xfree(devSections);
     return foundScreen;
 }
+#endif
 
 static int
 chipsFindIsaDevice(GDevPtr dev)
@@ -1107,9 +1213,11 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
 	if (cPtr->pEnt->location.type == BUS_PCI) {
 	    pciPtr = xf86GetPciInfoForEntity(cPtr->pEnt->index);
 	    cPtr->PciInfo = pciPtr;
+#ifndef XSERVER_LIBPCIACCESS
 	    cPtr->PciTag = pciTag(cPtr->PciInfo->bus, 
 				  cPtr->PciInfo->device,
 				  cPtr->PciInfo->func);
+#endif
 	}
     }
     /* INT10 */
@@ -1290,6 +1398,7 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
 
     /* Load bpp-specific modules */
     switch (pScrn->bitsPerPixel) {
+#ifdef HAVE_XF1BPP
     case 1:
 	if (xf86LoadSubModule(pScrn, "xf1bpp") == NULL) {
 	    vbeFree(cPtr->pVbe);
@@ -1299,6 +1408,8 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
 	}	
 	xf86LoaderReqSymbols("xf1bppScreenInit", NULL);
 	break;
+#endif
+#ifdef HAVE_XF4BPP
     case 4:
 	if (xf86LoadSubModule(pScrn, "xf4bpp") == NULL) {
 	    vbeFree(cPtr->pVbe);
@@ -1308,6 +1419,7 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
 	}	
 	xf86LoaderReqSymbols("xf4bppScreenInit", NULL);
 	break;
+#endif
     case 16:
 	if (cPtr->Flags & ChipsOverlay8plus16) {
 	    if (xf86LoadSubModule(pScrn, "xf8_16bpp") == NULL) {
@@ -1536,10 +1648,10 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
 	    /* Tack on 0x800000 to access the big-endian aperture? */
 #if X_BYTE_ORDER == X_BIG_ENDIAN
 	    if (BE_SWAP_APRETURE(pScrn,cPtr))
-		cPtr->FbAddress =  (cPtr->PciInfo->memBase[0] & 0xff800000) + 0x800000L;
+	        cPtr->FbAddress =  (PCI_REGION_BASE(cPtr->PciInfo, 0, REGION_MEM) & 0xff800000) + 0x800000L;
 	    else
 #endif
-		cPtr->FbAddress =  cPtr->PciInfo->memBase[0] & 0xff800000;
+	        cPtr->FbAddress =  PCI_REGION_BASE(cPtr->PciInfo, 0, REGION_MEM) & 0xff800000;
 
 	    from = X_PROBED;
 	    if (xf86RegisterResources(cPtr->pEnt->index,NULL,ResNone))
@@ -3108,7 +3220,7 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags)
 		mask &= 0xCF;
 	}
 	if (cPtr->pEnt->location.type == BUS_PCI) {
-	    cPtr->FbAddress =  cPtr->PciInfo->memBase[0] & 0xff800000;
+	    cPtr->FbAddress =  PCI_REGION_BASE(cPtr->PciInfo, 0, REGION_MEM) & 0xff800000;
 	    if (xf86RegisterResources(cPtr->pEnt->index,NULL,ResNone))
 		useLinear = FALSE;
 		from = X_PROBED;
@@ -4014,18 +4126,22 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     }
 
     switch (pScrn->bitsPerPixel) {
+#ifdef HAVE_XF1BPP
     case 1:
 	ret = xf1bppScreenInit(pScreen, FBStart,
  		        width,height,
 			pScrn->xDpi, pScrn->yDpi,
 			displayWidth);
 	break;
+#endif
+#ifdef HAVE_XF4BPP
     case 4:
 	ret = xf4bppScreenInit(pScreen, FBStart,
  		        width,height,
 			pScrn->xDpi, pScrn->yDpi,
 			displayWidth);
 	break;
+#endif
     case 16:
       if (cPtr->Flags & ChipsOverlay8plus16) {
 	  ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + 
@@ -7028,6 +7144,7 @@ chipsMapMem(ScrnInfoPtr pScrn)
     if (cPtr->Flags & ChipsLinearSupport) {
 	if (cPtr->UseMMIO) {
 	    if (IS_HiQV(cPtr)) {
+#ifndef XSERVER_LIBPCIACCESS
 		if (cPtr->pEnt->location.type == BUS_PCI)
 		    cPtr->MMIOBase = xf86MapPciMem(pScrn->scrnIndex,
 			   VIDMEM_MMIO_32BIT,cPtr->PciTag, cPtr->IOAddress,
@@ -7035,7 +7152,20 @@ chipsMapMem(ScrnInfoPtr pScrn)
 		 else 
 		    cPtr->MMIOBase = xf86MapVidMem(pScrn->scrnIndex,
 			   VIDMEM_MMIO_32BIT, cPtr->IOAddress, 0x20000L);
+#else
+		{
+		  void** result = (void**)&cPtr->MMIOBase;
+		  int err = pci_device_map_range(cPtr->PciInfo,
+						 cPtr->IOAddress,
+						 0x20000L,
+						 PCI_DEV_MAP_FLAG_WRITABLE,
+						 result);
+		  if (err) 
+		    return FALSE;
+		}
+#endif
 	    } else {
+#ifndef XSERVER_LIBPCIACCESS
 		if (cPtr->pEnt->location.type == BUS_PCI)
 		    cPtr->MMIOBase = xf86MapPciMem(pScrn->scrnIndex,
 			  VIDMEM_MMIO_32BIT, cPtr->PciTag, cPtr->IOAddress,
@@ -7043,6 +7173,18 @@ chipsMapMem(ScrnInfoPtr pScrn)
 		else
 		    cPtr->MMIOBase = xf86MapVidMem(pScrn->scrnIndex,
 			  VIDMEM_MMIO_32BIT, cPtr->IOAddress, 0x10000L);
+#else
+		{
+		  void** result = (void**)&cPtr->MMIOBase;
+		  int err = pci_device_map_range(cPtr->PciInfo,
+						 cPtr->IOAddress,
+						 0x10000L,
+						 PCI_DEV_MAP_FLAG_WRITABLE,
+						 result);
+		  if (err) 
+		    return FALSE;
+		}
+#endif
 	    }
 
 	    if (cPtr->MMIOBase == NULL)
@@ -7065,6 +7207,7 @@ chipsMapMem(ScrnInfoPtr pScrn)
 	    }
 	  }
 
+#ifndef XSERVER_LIBPCIACCESS
 	  if (cPtr->pEnt->location.type == BUS_PCI)
 	      cPtr->FbBase = xf86MapPciMem(pScrn->scrnIndex,VIDMEM_FRAMEBUFFER,
  			          cPtr->PciTag, Addr, Map);
@@ -7072,14 +7215,32 @@ chipsMapMem(ScrnInfoPtr pScrn)
 	  else
 	      cPtr->FbBase = xf86MapVidMem(pScrn->scrnIndex,VIDMEM_FRAMEBUFFER,
 					   Addr, Map);
+#else
+	  {
+	    void** result = (void**)&cPtr->FbBase;
+	    int err = pci_device_map_range(cPtr->PciInfo,
+					   Addr,
+					   Map,
+					   PCI_DEV_MAP_FLAG_WRITABLE |
+					   PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+					   result);
+	    if (err) 
+	      return FALSE;
+	  }
+
+#endif
 
 	  if (cPtr->FbBase == NULL)
 	      return FALSE;
 	}
 	if (cPtr->Flags & ChipsFullMMIOSupport) {
+#ifndef XSERVER_LIBPCIACCESS
 		cPtr->MMIOBaseVGA = xf86MapPciMem(pScrn->scrnIndex,
 						  VIDMEM_MMIO,cPtr->PciTag,
 						  cPtr->IOAddress, 0x2000L);
+#else
+		cPtr->MMIOBaseVGA = cPtr->MMIOBase;
+#endif
 	    /* 69030 MMIO Fix.
 	     *
 	     * The hardware lets us map the PipeB data registers
@@ -7089,9 +7250,22 @@ chipsMapMem(ScrnInfoPtr pScrn)
 	     * pipe and to toggle between them as necessary. -GHB
 	     */
 	    if (cPtr->Flags & ChipsDualChannelSupport)
+#ifndef XSERVER_LIBPCIACCESS
 	       	cPtr->MMIOBasePipeB = xf86MapPciMem(pScrn->scrnIndex,
 				      VIDMEM_MMIO,cPtr->PciTag,
 				      cPtr->IOAddress + 0x800000, 0x2000L);
+#else
+	    {
+	      void** result = (void**)&cPtr->MMIOBasePipeB;
+	      int err = pci_device_map_range(cPtr->PciInfo,
+					     cPtr->IOAddress + 0x800000,
+					     0x2000L,
+					     PCI_DEV_MAP_FLAG_WRITABLE,
+					     result);
+	      if (err) 
+		return FALSE;
+	    }
+#endif
 
 	    cPtr->MMIOBasePipeA = cPtr->MMIOBaseVGA;
 	}
@@ -7115,21 +7289,39 @@ chipsUnmapMem(ScrnInfoPtr pScrn)
 
     if (cPtr->Flags & ChipsLinearSupport) {
 	if (IS_HiQV(cPtr)) {
+#ifndef XSERVER_LIBPCIACCESS
 	    if (cPtr->MMIOBase)
 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)cPtr->MMIOBase,
 				0x20000);
 	    if (cPtr->MMIOBasePipeB)
 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)cPtr->MMIOBasePipeB,
 				0x20000);
+#else
+	    if (cPtr->MMIOBase)
+	      pci_device_unmap_range(cPtr->PciInfo, cPtr->MMIOBase, 0x20000);
+	    
+	    if (cPtr->MMIOBasePipeB)
+	      pci_device_unmap_range(cPtr->PciInfo, cPtr->MMIOBasePipeB, 0x2000);
+	      
+#endif
 	    cPtr->MMIOBasePipeB = NULL;
 	} else {
+#ifndef XSERVER_LIBPCIACCESS
 	  if (cPtr->MMIOBase)
 	      xf86UnMapVidMem(pScrn->scrnIndex, (pointer)cPtr->MMIOBase,
 			      0x10000);
+#else
+	    if (cPtr->MMIOBase)
+	      pci_device_unmap_range(cPtr->PciInfo, cPtr->MMIOBase, 0x10000);
+#endif
 	}
 	cPtr->MMIOBase = NULL;
+#ifndef XSERVER_LIBPCIACCESS
 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)cPtr->FbBase, 
 			cPtr->FbMapSize);
+#else
+	pci_device_unmap_range(cPtr->PciInfo, cPtr->FbBase, cPtr->FbMapSize);
+#endif
     }
     cPtr->FbBase = NULL;
     
diff --git a/src/ct_driver.h b/src/ct_driver.h
index 0c5b604..2b5dc7a 100644
--- a/src/ct_driver.h
+++ b/src/ct_driver.h
@@ -28,6 +28,7 @@
 #ifndef _CT_DRIVER_H_
 #define _CT_DRIVER_H_
 
+#include "ct_pcirename.h"
 #include "xaa.h"
 #include "vbe.h"
 #include "xaalocal.h"		/* XAA internals as we replace some of XAA */
diff --git a/src/ct_pcirename.h b/src/ct_pcirename.h
new file mode 100644
index 0000000..f0f5cf8
--- /dev/null
+++ b/src/ct_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef CIRPCIRENAME_H
+#define CIRPCIRENAME_H
+
+enum region_type {
+    REGION_MEM,
+    REGION_IO 
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus,    \
+                                    (_pcidev)->device, \
+                                    (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type)             \
+    (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+                             : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+    (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev)        (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev)        (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev)      (((_pcidev)->domain << 8) | \
+                                    (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev)      ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b)        ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff --git a/src/ct_video.c b/src/ct_video.c
index 19467d7..01b93ca 100644
--- a/src/ct_video.c
+++ b/src/ct_video.c
@@ -638,8 +638,8 @@ CHIPSDisplayVideo(
 	if (dblscan) 
 	    tmp = cPtr->VideoZoomMax >> 1;
 	if (drw_h > src_h)
-	    tmp = tmp * src_h / drw_h;
-	cPtr->writeMR(cPtr, 0x33, tmp);
+           tmp = 256 * src_h / drw_h;
+       cPtr->writeMR(cPtr, 0x33, tmp & 0xFC);
     }
     cPtr->writeMR(cPtr, 0x1F, m1f); 
     cPtr->writeMR(cPtr, 0x1E, m1e);


Index: xorg-x11-drv-chips.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-chips/devel/xorg-x11-drv-chips.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-chips.spec	20 Feb 2008 07:11:17 -0000	1.15
+++ xorg-x11-drv-chips.spec	10 Mar 2008 04:39:50 -0000	1.16
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 chips video driver
 Name:      xorg-x11-drv-chips
 Version: 1.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,8 +14,11 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   chips.xinf
 
+Patch0: chips-pciaccess.patch
+
 ExcludeArch: s390 s390x
 
+BuildRequires: automake autoconf libtool
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
 Requires:  hwdata
@@ -26,8 +29,10 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .pciaccess
 
 %build
+autoreconf -v --install
 %configure --disable-static
 make
 
@@ -53,6 +58,9 @@
 %{_mandir}/man4/chips.4*
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  1.1.1-7
+- pciaccess conversion
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 1.1.1-6
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 04:40:51 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 04:40:51 GMT
Subject: rpms/xorg-x11-drv-i740/devel i740-pciaccess.patch, 1.1,
	1.2 xorg-x11-drv-i740.spec, 1.17, 1.18
Message-ID: <200803100440.m2A4epE3027782@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i740/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27632

Modified Files:
	i740-pciaccess.patch xorg-x11-drv-i740.spec 
Log Message:
* Mon Mar 10 2008 Dave Airlie  1.1.0-8
- fix some bugs in pciaccess conversion


i740-pciaccess.patch:

Index: i740-pciaccess.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i740/devel/i740-pciaccess.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i740-pciaccess.patch	10 Mar 2008 02:30:24 -0000	1.1
+++ i740-pciaccess.patch	10 Mar 2008 04:40:40 -0000	1.2
@@ -50,7 +50,7 @@
    I740RegRec SavedReg;
    I740RegRec ModeReg;
 diff --git a/src/i740_driver.c b/src/i740_driver.c
-index c21163d..ee25967 100644
+index c21163d..f118637 100644
 --- a/src/i740_driver.c
 +++ b/src/i740_driver.c
 @@ -142,9 +142,9 @@ static Bool I740UnmapMem(ScrnInfoPtr pScrn);
@@ -66,7 +66,21 @@
  
  _X_EXPORT DriverRec I740 = {
    I740_VERSION,
-@@ -508,8 +508,10 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
+@@ -378,11 +378,13 @@ I740Probe(DriverPtr drv, int flags) {
+     return FALSE;
+   }
+ 
++#ifndef XSERVER_LIBPCIACCESS
+   /* 
+      Since these Probing is just checking the PCI data the server already
+      collected.
+   */
+   if (!xf86GetPciVideoInfo()) return FALSE;
++#endif
+  
+   /* Look for Intel based chips */
+   numUsed = xf86MatchPciInstances(I740_NAME, PCI_VENDOR_INTEL,
+@@ -508,8 +510,10 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
    if (!vgaHWGetHWRec(pScrn)) return FALSE;
  
    pI740->PciInfo = xf86GetPciInfoForEntity(pI740->pEnt->index);
@@ -77,16 +91,16 @@
  
    if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone))
        return FALSE;
-@@ -598,7 +600,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
+@@ -598,7 +602,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
  	       pI740->pEnt->device->chipID);
    } else {
      from = X_PROBED;
 -    pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, pI740->PciInfo->chipType);
-+    pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, PCI_DEV_DEVIE_ID(pI740->PciInfo));
++    pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, PCI_DEV_DEVICE_ID(pI740->PciInfo));
    }
    if (pI740->pEnt->device->chipRev >= 0) {
      xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
-@@ -611,8 +613,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
+@@ -611,8 +615,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
      pI740->LinearAddr = pI740->pEnt->device->MemBase;
      from = X_CONFIG;
    } else {
@@ -97,7 +111,7 @@
        from = X_PROBED;
      } else {
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
-@@ -628,8 +630,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
+@@ -628,8 +632,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
      pI740->MMIOAddr = pI740->pEnt->device->IOBase;
      from = X_CONFIG;
    } else {
@@ -108,7 +122,7 @@
        from = X_PROBED;
      } else {
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -871,18 +873,48 @@ static Bool I740MapMem(ScrnInfoPtr pScrn)
+@@ -871,18 +875,48 @@ static Bool I740MapMem(ScrnInfoPtr pScrn)
  
    pI740 = I740PTR(pScrn);
  
@@ -157,7 +171,7 @@
    if (!pI740->FbBase) return FALSE;
  
    return TRUE;
-@@ -894,10 +926,18 @@ static Bool I740UnmapMem(ScrnInfoPtr pScrn)
+@@ -894,10 +928,18 @@ static Bool I740UnmapMem(ScrnInfoPtr pScrn)
  
    pI740 = I740PTR(pScrn);
  
@@ -178,7 +192,7 @@
  }
 diff --git a/src/i740_pcirename.h b/src/i740_pcirename.h
 new file mode 100644
-index 0000000..cbd3dcf
+index 0000000..e783713
 --- /dev/null
 +++ b/src/i740_pcirename.h
 @@ -0,0 +1,122 @@
@@ -210,8 +224,8 @@
 + * library. The main purpose being to facilitate source code compatibility.
 + */
 +
-+#ifndef ASTPCIRENAME_H
-+#define ASTPCIRENAME_H
++#ifndef I740PCIRENAME_H
++#define I740PCIRENAME_H
 +
 +enum region_type {
 +    REGION_MEM,
@@ -303,4 +317,4 @@
 +
 +#endif /* XSERVER_LIBPCIACCESS */
 +
-+#endif /* CIRPCIRENAME_H */
++#endif /* i740PCIRENAME_H */


Index: xorg-x11-drv-i740.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i740/devel/xorg-x11-drv-i740.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-i740.spec	10 Mar 2008 02:30:24 -0000	1.17
+++ xorg-x11-drv-i740.spec	10 Mar 2008 04:40:40 -0000	1.18
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 i740 video driver
 Name:      xorg-x11-drv-i740
 Version:   1.1.0
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/i740.4*
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  1.1.0-8
+- fix some bugs in pciaccess conversion
+
 * Mon Mar 10 2008 Dave Airlie  1.1.0-7
 - pciaccess conversion
 



From fedora-extras-commits at redhat.com  Mon Mar 10 04:45:43 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 04:45:43 GMT
Subject: rpms/xorg-x11-drv-i810/devel intel-quirk-dvo.patch, NONE,
	1.1 xorg-x11-drv-i810.spec, 1.83, 1.84
Message-ID: <200803100445.m2A4jhWw028067@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27995

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-quirk-dvo.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  2.2.1-10
- quirk Motion Computing M1200


intel-quirk-dvo.patch:

--- NEW FILE intel-quirk-dvo.patch ---
>From fc05efbe67e04ffead79bc19eb7d28635ec7a10f Mon Sep 17 00:00:00 2001
From: Dave Airlie 
Date: Mon, 10 Mar 2008 14:43:24 +1000
Subject: [PATCH] quirk: add DVO ivch quirk

---
 src/i830_quirks.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index 2486e41..c7d32cd 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -238,6 +238,9 @@ static i830_quirk i830_quirk_list[] = {
     /* Toshiba i830M laptop (fix bug 11148) */
     { PCI_CHIP_I830_M, 0x1179, 0xff00, quirk_ivch_dvob },
 
+    /* Motion Computing M1200 reported on irc */
+    { PCI_CHIP_I830_M, 0x14c0, 0x0012, quirk_ivch_dvob },
+
     /* Samsung Q35 has no TV output */
     { PCI_CHIP_I945_GM, 0x144d, 0xc504, quirk_ignore_tv },
     /* Samsung Q45 has no TV output */
-- 
1.5.3.3



Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- xorg-x11-drv-i810.spec	7 Mar 2008 06:53:24 -0000	1.83
+++ xorg-x11-drv-i810.spec	10 Mar 2008 04:44:53 -0000	1.84
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -24,6 +24,7 @@
 Patch4: intel-2.1.1-fix-xv-compiz.patch
 Patch5: intel-2.1.1-efi.patch
 Patch6: intel-2.1.1-pciaccess-version.patch
+Patch7: intel-quirk-dvo.patch
 
 Patch100: intel-master.patch
 Patch101: intel-batchbuffer.patch
@@ -65,6 +66,7 @@
 #patch4 -p1 -b .xv-compiz
 %patch5 -p1 -b .efi
 %patch6 -p1 -b .pciaccessvers
+%patch7 -p1 -b .quirk
 %patch100 -p1 -b .intel-master
 
 cd ../xf86-video-intel-%{batchbuffer_version}
@@ -135,6 +137,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  2.2.1-10
+- quirk Motion Computing M1200
+
 * Fri Mar 07 2008 Dave Airlie  2.2.1-9
 - update modesetting patch to include 965 video + fix for memory
   space leak



From fedora-extras-commits at redhat.com  Mon Mar 10 04:45:57 2008
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Mon, 10 Mar 2008 04:45:57 GMT
Subject: rpms/gdm/devel gdm.spec,1.340,1.341
Message-ID: <200803100445.m2A4jvSX028084@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28031

Modified Files:
	gdm.spec 
Log Message:
add unpackaged files



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- gdm.spec	10 Mar 2008 04:23:58 -0000	1.340
+++ gdm.spec	10 Mar 2008 04:45:24 -0000	1.341
@@ -282,6 +282,8 @@
 %{_bindir}/gdmflexiserver
 %{_datadir}/gdm/*.glade
 %{_sysconfdir}/gconf/schemas/*.schemas
+%{_datadir}/gdm/gdb-cmd
+%{_libexecdir}/gdm-crash-logger
 %dir %{_datadir}/gdm
 %dir %{_datadir}/gdm/autostart
 %dir %{_datadir}/gdm/autostart/LoginWindow



From fedora-extras-commits at redhat.com  Mon Mar 10 04:54:00 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 04:54:00 GMT
Subject: rpms/gnome-keyring/devel .cvsignore, 1.40, 1.41 gnome-keyring.spec, 
	1.82, 1.83 sources, 1.40, 1.41
Message-ID: <200803100454.m2A4s0aT028496@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28422

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	25 Feb 2008 05:00:12 -0000	1.40
+++ .cvsignore	10 Mar 2008 04:53:24 -0000	1.41
@@ -1 +1 @@
-gnome-keyring-2.21.92.tar.bz2
+gnome-keyring-2.22.0.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-keyring.spec	25 Feb 2008 05:00:12 -0000	1.82
+++ gnome-keyring.spec	10 Mar 2008 04:53:24 -0000	1.83
@@ -7,11 +7,11 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.21.92
+Version: 2.22.0
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.21/gnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring/2.22/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 2.22.0-1
+- Update to 2.22.0
+
 * Sun Feb 24 2008 Matthias Clasen  - 2.21.92-1
 - Update to 2.21.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	25 Feb 2008 05:00:12 -0000	1.40
+++ sources	10 Mar 2008 04:53:24 -0000	1.41
@@ -1 +1 @@
-b572faa578cb2e12d637830797da2793  gnome-keyring-2.21.92.tar.bz2
+d27c5bf11579069eb694f93b71364bb4  gnome-keyring-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 04:55:34 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 04:55:34 GMT
Subject: rpms/xorg-x11-drv-tseng/devel tseng-pciaccess.patch, NONE,
	1.1 xorg-x11-drv-tseng.spec, 1.17, 1.18
Message-ID: <200803100455.m2A4tYG6028636@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-tseng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28570

Modified Files:
	xorg-x11-drv-tseng.spec 
Added Files:
	tseng-pciaccess.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  1.1.0-9
- pciaccess conversion


tseng-pciaccess.patch:

--- NEW FILE tseng-pciaccess.patch ---
diff --git a/configure.ac b/configure.ac
index dd17541..e47d253 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,20 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
 # Checks for header files.
 AC_HEADER_STDC
diff --git a/src/tseng.h b/src/tseng.h
index ec3c461..c83883d 100644
--- a/src/tseng.h
+++ b/src/tseng.h
@@ -4,6 +4,7 @@
 #ifndef _TSENG_H
 #define _TSENG_H
 
+#include "tseng_pcirename.h"
 #include 
 
 /* All drivers should typically include these */
@@ -35,8 +36,12 @@
 #include "micmap.h"
 
 /* Needed for the 1 and 4 bpp framebuffers */
+#ifdef HAVE_XF1BPP
 #include "xf1bpp.h"
+#endif
+#ifdef HAVE_XF4BPP
 #include "xf4bpp.h"
+#endif
 #include "fb.h"
 
 /* Drivers using the XAA interface ... */
@@ -106,7 +111,9 @@ typedef struct {
     unsigned char *BresenhamTable;
     /* normal stuff starts here */
     pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
     PCITAG PciTag;
+#endif
 
     Bool UsePCIRetry;		       /* Do we use PCI-retry or busy-waiting */
     Bool UseAccel;		       /* Do we use the XAA acceleration architecture */
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index cdfe3d7..2c70dc4 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -417,9 +417,11 @@ TsengProbe(DriverPtr drv, int flags)
 	return FALSE;
     }
 
+#ifndef XSERVER_LIBPCIACCESS
     /* PCI only driver now. */
     if (!xf86GetPciVideoInfo())
         return FALSE;
+#endif
 
     /* XXX maybe this can go some time soon */
     /*
@@ -476,7 +478,7 @@ TsengPreInitPCI(ScrnInfoPtr pScrn)
     /* Set up ChipType, ChipRev and pScrn->chipset.
      * This last one is usually not done manually, but
      * it's for informative use only anyway. */
-    switch (pTseng->PciInfo->chipType) {
+    switch (PCI_DEV_DEVICE_ID(pTseng->PciInfo)) {
     case PCI_CHIP_ET4000_W32P_A:
 	pTseng->ChipType = ET4000;
 	pTseng->ChipRev = REV_A;
@@ -500,7 +502,7 @@ TsengPreInitPCI(ScrnInfoPtr pScrn)
     case PCI_CHIP_ET6000:
 	pTseng->ChipType = ET6000;
 
-        if (pTseng->PciInfo->chipRev < 0x70) {
+        if (PCI_DEV_REVISION(pTseng->PciInfo) < 0x70) {
             pScrn->chipset = "ET6000";
             pTseng->ChipRev = REV_ET6000;
         } else {
@@ -510,24 +512,26 @@ TsengPreInitPCI(ScrnInfoPtr pScrn)
 	break;
     default:
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unknown Tseng PCI ID: %X\n",
-                   pTseng->PciInfo->chipType);
+                   PCI_DEV_DEVICE_ID(pTseng->PciInfo));
 	return FALSE;
     }
 
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Chipset: \"%s\"\n", pScrn->chipset);
 
+#ifndef XSERVER_LIBPCIACCESS
     pTseng->PciTag = pciTag(pTseng->PciInfo->bus, pTseng->PciInfo->device,
 	pTseng->PciInfo->func);
+#endif
 
     /* only the ET6000 implements a PCI IO address */
     if (pTseng->ChipType == ET6000) {
-        if (!pTseng->PciInfo->ioBase[1]) {
+        if (!PCI_REGION_BASE(pTseng->PciInfo, 1, REGION_IO)) {
             xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                        "No valid PCI I/O address in PCI config space\n");
             return FALSE;
         }
 
-        pTseng->ET6000IOAddress = pTseng->PciInfo->ioBase[1];
+        pTseng->ET6000IOAddress = PCI_REGION_BASE(pTseng->PciInfo, 1, REGION_IO);
         
         xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "ET6000 PCI I/O registers at 0x%lX\n",
                    (unsigned long)pTseng->ET6000IOAddress);
@@ -942,12 +946,12 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
     PDEBUG("	TsengGetFbAddress\n");
 
     /* base0 is the framebuffer and base1 is the PCI IO space. */
-    if (!pTseng->PciInfo->memBase[0]) {
+    if (PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                    "No valid Framebuffer address in PCI config space;\n");
         return FALSE;
     } else
-        pTseng->FbAddress = pTseng->PciInfo->memBase[0];
+        pTseng->FbAddress = PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM);
 
 
     if (xf86RegisterResources(pTseng->pEnt->index,NULL,ResNone)) {
@@ -1233,6 +1237,7 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
 
     /* Load bpp-specific modules */
     switch (pScrn->bitsPerPixel) {
+#ifdef HAVE_XF1BPP
     case 1:
 	if (xf86LoadSubModule(pScrn, "xf1bpp") == NULL) {
 	  TsengFreeRec(pScrn);
@@ -1240,6 +1245,8 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
 	}
 	xf86LoaderReqSymbols("xf1bppScreenInit", NULL);
 	break;
+#endif
+#ifdef HAVE_XF4BPP
     case 4:
 	if (xf86LoadSubModule(pScrn, "xf4bpp") == NULL) {
 	  TsengFreeRec(pScrn);
@@ -1247,6 +1254,7 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
 	}
 	xf86LoaderReqSymbols("xf4bppScreenInit", NULL);
 	break;
+#endif
     default:
 	if (xf86LoadSubModule(pScrn, "fb") == NULL) {
 	  TsengFreeRec(pScrn);
@@ -1451,18 +1459,22 @@ TsengScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
      */
 
     switch (pScrn->bitsPerPixel) {
+#ifdef HAVE_XF1BPP
     case 1:
 	ret = xf1bppScreenInit(pScreen, pTseng->FbBase,
 			pScrn->virtualX, pScrn->virtualY,
 			pScrn->xDpi, pScrn->yDpi,
 			pScrn->displayWidth);
 	break;
+#endif
+#ifdef HAVE_XF4BPP
     case 4:
 	ret = xf4bppScreenInit(pScreen, pTseng->FbBase,
 			pScrn->virtualX, pScrn->virtualY,
 			pScrn->xDpi, pScrn->yDpi,
 			pScrn->displayWidth);
 	break;
+#endif
     default:
         ret  = fbScreenInit(pScreen, pTseng->FbBase,
 			pScrn->virtualX, pScrn->virtualY,
@@ -1680,10 +1692,25 @@ TsengMapMem(ScrnInfoPtr pScrn)
 	return FALSE;
     }
 
+#ifndef XSERVER_LIBPCIACCESS
     pTseng->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
                                    pTseng->PciTag,
                                    (unsigned long)pTseng->FbAddress,
                                    pTseng->FbMapSize);
+#else
+    {
+      void** result = (void**)&pTseng->FbBase;
+      int err = pci_device_map_range(pTseng->PciInfo,
+				     pTseng->FbAddress,
+				     pTseng->FbMapSize,
+				     PCI_DEV_MAP_FLAG_WRITABLE |
+				     PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+				     result);
+      
+      if (err) 
+	return FALSE;
+    }
+#endif
     if (pTseng->FbBase == NULL) {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                    "Could not mmap linear video memory.\n");
@@ -1692,10 +1719,14 @@ TsengMapMem(ScrnInfoPtr pScrn)
 
     /* need some sanity here */
     if (pTseng->UseAccel) {
+#ifndef XSERVER_LIBPCIACCESS
         pTseng->MMioBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
                                          pTseng->PciTag,
                                          (unsigned long)pTseng->FbAddress,
                                          pTseng->FbMapSize);
+#else
+	pTseng->MMioBase = pTseng->FbBase;
+#endif
         if (!pTseng->MMioBase) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		       "Could not mmap mmio memory.\n");
@@ -1717,7 +1748,11 @@ TsengUnmapMem(ScrnInfoPtr pScrn)
 
     PDEBUG("	TsengUnmapMem\n");
 
+#ifndef XSERVER_LIBPCIACCESS
     xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pTseng->FbBase, pTseng->FbMapSize);
+#else
+    pci_device_unmap_range(pTseng->PciInfo, pTseng->FbBase, pTseng->FbMapSize);
+#endif
 
     vgaHWUnmapMem(pScrn);
 
diff --git a/src/tseng_pcirename.h b/src/tseng_pcirename.h
new file mode 100644
index 0000000..f0f5cf8
--- /dev/null
+++ b/src/tseng_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef CIRPCIRENAME_H
+#define CIRPCIRENAME_H
+
+enum region_type {
+    REGION_MEM,
+    REGION_IO 
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus,    \
+                                    (_pcidev)->device, \
+                                    (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type)             \
+    (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+                             : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+    (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev)        (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev)        (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev)      (((_pcidev)->domain << 8) | \
+                                    (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev)      ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b)        ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */


Index: xorg-x11-drv-tseng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-tseng/devel/xorg-x11-drv-tseng.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-tseng.spec	20 Feb 2008 07:52:01 -0000	1.17
+++ xorg-x11-drv-tseng.spec	10 Mar 2008 04:54:44 -0000	1.18
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 tseng video driver
 Name:      xorg-x11-drv-tseng
 Version:   1.1.0
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -15,9 +15,11 @@
 Source1:   tseng.xinf
 
 Patch0: tseng-1.1.0-defaultdepth.patch
+Patch1: tseng-pciaccess.patch
 
 ExcludeArch: s390 s390x
 
+BuildRequires: automake autoconf libtool
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
 Requires:  hwdata
@@ -29,8 +31,10 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .defaultdepth
+%patch1 -p1 -b .pciaccess
 
 %build
+autoreconf -v --install
 %configure --disable-static
 make
 
@@ -56,6 +60,9 @@
 %{_mandir}/man4/tseng.4*
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  1.1.0-9
+- pciaccess conversion
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 1.1.0-8
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 04:58:03 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 04:58:03 GMT
Subject: rpms/orca/devel .cvsignore, 1.28, 1.29 orca.spec, 1.41, 1.42 sources,
	1.29, 1.30
Message-ID: <200803100458.m2A4w3oJ028808@cvs-int.fedora.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	26 Feb 2008 04:29:03 -0000	1.28
+++ .cvsignore	10 Mar 2008 04:57:16 -0000	1.29
@@ -1 +1 @@
-orca-2.21.92.tar.bz2
+orca-2.22.0.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/orca.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- orca.spec	26 Feb 2008 04:29:03 -0000	1.41
+++ orca.spec	10 Mar 2008 04:57:16 -0000	1.42
@@ -15,7 +15,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.21.92
+Version:	2.22.0
 Release: 	1%{?dist}
 Summary:	Flexible, extensible, and powerful assistive technology
 
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 2.22.0-1
+- Update to 2.22.0
+
 * Mon Feb 25 2008 Matthias Clasen  - 2.21.92-1
 - Update to 2.21.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orca/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	26 Feb 2008 04:29:03 -0000	1.29
+++ sources	10 Mar 2008 04:57:16 -0000	1.30
@@ -1 +1 @@
-44c6614a5b78b30a9a0cf3f0bbafe705  orca-2.21.92.tar.bz2
+a49e1c39261c916e8d9c7bc26740d085  orca-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 04:59:20 2008
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Mon, 10 Mar 2008 04:59:20 GMT
Subject: rpms/firefox/devel firefox.spec,1.271,1.272
Message-ID: <200803100459.m2A4xKJb028924@cvs-int.fedora.redhat.com>

Author: caillon

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

Modified Files:
	firefox.spec 
Log Message:
make the useragent VR match the rpm


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- firefox.spec	9 Mar 2008 22:04:20 -0000	1.271
+++ firefox.spec	10 Mar 2008 04:58:11 -0000	1.272
@@ -169,7 +169,7 @@
 %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
 
 # set up our default preferences
-%{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version_internal}-%{release},g' > rh-default-prefs
+%{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > rh-default-prefs
 
 # set up our default homepage
 %{__cat} >> rh-default-prefs << EOF



From fedora-extras-commits at redhat.com  Mon Mar 10 05:01:09 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 05:01:09 GMT
Subject: rpms/ldm/devel ldm.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200803100501.m2A519Dk003117@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28971

Modified Files:
	ldm.spec sources 
Log Message:
new upstream snapshot



Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ldm.spec	23 Jan 2008 22:35:49 -0000	1.1
+++ ldm.spec	10 Mar 2008 05:00:17 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           ldm
 Version:        0.1
-Release:        0.4.20080123%{?dist}
+Release:        0.5.20080310%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
-# bzr snapshot::
-#   bzr checkout --lightweight -r 791 http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
+# bzr snapshot
+#   bzr checkout --lightweight -r 825 http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 #   cd ldm-trunk
 #   ./mkdst --test
 # tarball is ldm-%{version}.tar.bz2
@@ -16,6 +16,9 @@
 
 BuildRequires:  gtk2-devel
 
+Requires:       nc
+Requires:       openssh-clients
+
 %description
 LTSP Display Manager handles network logins for remote desktop sessions.
 
@@ -31,6 +34,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+cd $RPM_BUILD_ROOT/%{_datadir}/ldm/themes
+    ln -s ltsp default
+cd -
+
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/ldm/
 
 
 %clean
@@ -45,9 +53,12 @@
 %{_datadir}/ldm/
 %{_mandir}/man1/ldm.1.gz
 %{_datadir}/ltsp/screen.d/ldm
-
+%dir %{_localstatedir}/run/ldm/
 
 %changelog
+* Mon Mar 10 2008 Warren Togami  - 0.1-0.5.20080310
+- new upstream snapshot
+
 * Wed Jan 16 2008 Warren Togami  - 0.1-0.3.20080116
 - Add rc.d directory, make ldm-script executable
 - Move ldm-script and rc.d to libexecdir/ldm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jan 2008 22:35:49 -0000	1.2
+++ sources	10 Mar 2008 05:00:17 -0000	1.3
@@ -1 +1 @@
-04c950d755b93c5482842d1fc44149e1  ldm-0.1.tar.bz2
+294d91b81c63d1c790d488e05e4e2b66  ldm-0.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 05:02:54 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 05:02:54 GMT
Subject: rpms/ldm/F-8 ldm.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200803100502.m2A52stx003880@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3781

Modified Files:
	ldm.spec sources 
Log Message:
new upstream snapshot



Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-8/ldm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ldm.spec	23 Jan 2008 22:46:08 -0000	1.1
+++ ldm.spec	10 Mar 2008 05:02:14 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           ldm
 Version:        0.1
-Release:        0.4.20080123%{?dist}
+Release:        0.5.20080310%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
-# bzr snapshot::
-#   bzr checkout --lightweight -r 791 http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
+# bzr snapshot
+#   bzr checkout --lightweight -r 825 http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 #   cd ldm-trunk
 #   ./mkdst --test
 # tarball is ldm-%{version}.tar.bz2
@@ -16,6 +16,9 @@
 
 BuildRequires:  gtk2-devel
 
+Requires:       nc
+Requires:       openssh-clients
+
 %description
 LTSP Display Manager handles network logins for remote desktop sessions.
 
@@ -31,6 +34,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+cd $RPM_BUILD_ROOT/%{_datadir}/ldm/themes
+    ln -s ltsp default
+cd -
+
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/ldm/
 
 
 %clean
@@ -45,9 +53,12 @@
 %{_datadir}/ldm/
 %{_mandir}/man1/ldm.1.gz
 %{_datadir}/ltsp/screen.d/ldm
-
+%dir %{_localstatedir}/run/ldm/
 
 %changelog
+* Mon Mar 10 2008 Warren Togami  - 0.1-0.5.20080310
+- new upstream snapshot
+
 * Wed Jan 16 2008 Warren Togami  - 0.1-0.3.20080116
 - Add rc.d directory, make ldm-script executable
 - Move ldm-script and rc.d to libexecdir/ldm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jan 2008 22:46:08 -0000	1.2
+++ sources	10 Mar 2008 05:02:14 -0000	1.3
@@ -1 +1 @@
-04c950d755b93c5482842d1fc44149e1  ldm-0.1.tar.bz2
+294d91b81c63d1c790d488e05e4e2b66  ldm-0.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 05:03:04 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 10 Mar 2008 05:03:04 GMT
Subject: rpms/kdelibs/devel kdelibs.spec,1.290,1.291
Message-ID: <200803100503.m2A5343x003890@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3792/devel

Modified Files:
	kdelibs.spec 
Log Message:
* Mon Mar 10 2008 Kevin Kofler  4.0.2-10
- work around #436725: BuildConflicts: gnash so graphviz gets a valid libltdl


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- kdelibs.spec	10 Mar 2008 00:23:52 -0000	1.290
+++ kdelibs.spec	10 Mar 2008 05:02:23 -0000	1.291
@@ -3,7 +3,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -117,6 +117,8 @@
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: qt4-doc
+# work around #436725
+BuildConflicts: gnash
 %endif
 
 %description
@@ -336,6 +338,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Kevin Kofler  4.0.2-10
+- work around #436725: BuildConflicts: gnash so graphviz gets a valid libltdl
+
 * Mon Mar 10 2008 Kevin Kofler  4.0.2-9
 - fix kdeglobals not being found in profile (e.g. kde-settings) directory
 



From fedora-extras-commits at redhat.com  Mon Mar 10 05:04:07 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 05:04:07 GMT
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.27, 
	1.28
Message-ID: <200803100504.m2A547aV004022@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3900

Modified Files:
	gnome-python2-desktop.spec 
Log Message:

* Sun Mar 09 2008 Matthew Barnes  - 2.22.0-1.fc9
- Update to 2.22.0
- Exclude gnome-python2-nautilus-cd-burner from ppc and ppc64.



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-python2-desktop.spec	10 Mar 2008 02:52:48 -0000	1.27
+++ gnome-python2-desktop.spec	10 Mar 2008 05:03:19 -0000	1.28
@@ -57,7 +57,7 @@
 BuildRequires: pygtk2-devel >= %{pygtk_version}
 BuildRequires: python-devel
 BuildRequires: totem-pl-parser-devel >= %{totem_version}
-%ifnarch s390 s390x
+%ifnarch s390 s390x ppc ppc64
 BuildRequires: gnome-media-devel >= %{gnome_media_version}
 BuildRequires: nautilus-cd-burner-devel >= %{nautilus_cd_burner_version}
 %endif
@@ -302,6 +302,7 @@
 %changelog
 * Sun Mar 09 2008 Matthew Barnes  - 2.22.0-1.fc9
 - Update to 2.22.0
+- Exclude gnome-python2-nautilus-cd-burner from ppc and ppc64.
 
 * Sat Feb 23 2008 Matthew Barnes  - 2.21.3-1.fc9
 - Update to 2.21.3



From fedora-extras-commits at redhat.com  Mon Mar 10 05:18:53 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 05:18:53 GMT
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.28,
	1.29 gnome-doc-utils.spec, 1.45, 1.46 sources, 1.28, 1.29
Message-ID: <200803100518.m2A5Ir5c004731@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-doc-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4681

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	12 Feb 2008 19:39:52 -0000	1.28
+++ .cvsignore	10 Mar 2008 05:18:05 -0000	1.29
@@ -1 +1 @@
-gnome-doc-utils-0.12.1.tar.bz2
+gnome-doc-utils-0.12.2.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-doc-utils.spec	18 Feb 2008 16:35:11 -0000	1.45
+++ gnome-doc-utils.spec	10 Mar 2008 05:18:05 -0000	1.46
@@ -1,8 +1,8 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.12.1
-Release: 2%{?dist}
+Version: 0.12.2
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools
 Summary: Documentation utilities for the GNOME project
@@ -96,6 +96,9 @@
 %{_datadir}/xml/gnome
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 0.12.2-1
+- Update to 0.12.2
+
 * Mon Feb 18 2008 Matthew Barnes  - 0.12.1-2
 - Package review corrections (RH bug #225816).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	12 Feb 2008 19:39:52 -0000	1.28
+++ sources	10 Mar 2008 05:18:05 -0000	1.29
@@ -1 +1 @@
-3e55a31a62985076131e603062371ac7  gnome-doc-utils-0.12.1.tar.bz2
+e1a9e9ba923b8950f8803c90ebeaadb8  gnome-doc-utils-0.12.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 05:27:39 2008
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Mar 2008 05:27:39 GMT
Subject: rpms/ruby/devel ruby.spec,1.115,1.116
Message-ID: <200803100527.m2A5Rdca005145@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ruby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5064

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- ruby.spec	10 Mar 2008 04:28:30 -0000	1.115
+++ ruby.spec	10 Mar 2008 05:27:02 -0000	1.116
@@ -385,7 +385,9 @@
 %doc %{name}-%{arcver}/LGPL
 %dir %{_prefix}/lib/ruby
 %dir %{_prefix}/lib/ruby/%{rubyxver}
+%ifnarch ppc64 s390x sparc64 x86_64
 %dir %{_prefix}/lib/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
+%endif
 %ifarch ppc64 s390x sparc64 x86_64
 %dir %{_libdir}/ruby
 %dir %{_libdir}/ruby/%{rubyxver}



From fedora-extras-commits at redhat.com  Mon Mar 10 05:29:00 2008
From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler))
Date: Mon, 10 Mar 2008 05:29:00 GMT
Subject: rpms/kdelibs/devel kdelibs.spec,1.291,1.292
Message-ID: <200803100529.m2A5T037005307@cvs-int.fedora.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5202/devel

Modified Files:
	kdelibs.spec 
Log Message:
BuildConflicts appears to have no effect in Koji, BR libtool-ltdl instead (to workaround #436725).


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- kdelibs.spec	10 Mar 2008 05:02:23 -0000	1.291
+++ kdelibs.spec	10 Mar 2008 05:28:14 -0000	1.292
@@ -118,7 +118,7 @@
 BuildRequires: graphviz
 BuildRequires: qt4-doc
 # work around #436725
-BuildConflicts: gnash
+BuildRequires: libtool-ltdl
 %endif
 
 %description
@@ -339,7 +339,7 @@
 
 %changelog
 * Mon Mar 10 2008 Kevin Kofler  4.0.2-10
-- work around #436725: BuildConflicts: gnash so graphviz gets a valid libltdl
+- work around #436725: BR: libtool-ltdl so graphviz gets a valid libltdl
 
 * Mon Mar 10 2008 Kevin Kofler  4.0.2-9
 - fix kdeglobals not being found in profile (e.g. kde-settings) directory



From fedora-extras-commits at redhat.com  Mon Mar 10 05:33:30 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 05:33:30 GMT
Subject: rpms/gnome-python2-desktop/devel gnome-python2-desktop.spec, 1.28, 
	1.29
Message-ID: <200803100533.m2A5XUiv005775@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5710

Modified Files:
	gnome-python2-desktop.spec 
Log Message:
Try again.



Index: gnome-python2-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/gnome-python2-desktop.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-python2-desktop.spec	10 Mar 2008 05:03:19 -0000	1.28
+++ gnome-python2-desktop.spec	10 Mar 2008 05:32:42 -0000	1.29
@@ -144,7 +144,7 @@
 This module contains a wrapper that allows the use of libgtop via
 Python.
 
-%ifnarch s390 s390x
+%ifnarch s390 s390x ppc ppc64
 %package -n gnome-python2-nautilus-cd-burner
 Summary: Python bindings for interacting with nautilus-cd-burner
 License: GPLv2+
@@ -271,7 +271,7 @@
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gtop.so
 
-%ifnarch s390 s390x
+%ifnarch s390 s390x ppc ppc64
 %files -n gnome-python2-nautilus-cd-burner
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/nautilusburn.so
@@ -285,7 +285,7 @@
 
 %files -n gnome-python2-totem
 %defattr(-,root,root,-)
-%ifnarch s390 s390x
+%ifnarch s390 s390x ppc ppc64
 %{python_sitearch}/gtk-2.0/mediaprofiles.so
 %endif
 %{python_sitearch}/gtk-2.0/totem



From fedora-extras-commits at redhat.com  Mon Mar 10 05:36:51 2008
From: fedora-extras-commits at redhat.com (James Antill (james))
Date: Mon, 10 Mar 2008 05:36:51 GMT
Subject: rpms/ustr/EL-5 ustr.spec,1.6,1.7
Message-ID: <200803100536.m2A5apcJ005936@cvs-int.fedora.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/ustr/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5902

Modified Files:
	ustr.spec 
Log Message:
* Sun Mar  9 2008 James Antill  - 1.0.4-6
- Fix missing multilib. dir. ownership
- Resolves: rhbz#436711



Index: ustr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/EL-5/ustr.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ustr.spec	6 Mar 2008 04:01:46 -0000	1.6
+++ ustr.spec	10 Mar 2008 05:36:11 -0000	1.7
@@ -27,7 +27,7 @@
 
 Name: ustr
 Version: 1.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: String library, very low memory overhead, simple to import
 Group: System Environment/Libraries
 License: MIT or LGPLv2+ or BSD
@@ -125,7 +125,7 @@
 %{_datadir}/ustr-%{version}
 %{_bindir}/ustr-import
 %if %{multilib_inst}
-%{_libexecdir}/ustr-%{version}/ustr-import*
+%{_libexecdir}/ustr-%{version}
 %endif
 %{_includedir}/ustr.h
 %{_includedir}/ustr-*.h
@@ -151,6 +151,10 @@
 
 
 %changelog
+* Sun Mar  9 2008 James Antill  - 1.0.4-6
+- Fix missing multilib. dir. ownership
+- Resolves: rhbz#436711
+
 * Wed Mar  5 2008 James Antill  - 1.0.4-5
 - New new upstream: 1.0.4
 



From fedora-extras-commits at redhat.com  Mon Mar 10 05:41:00 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 05:41:00 GMT
Subject: rpms/xorg-x11-drv-voodoo/devel .cvsignore, 1.9, 1.10 commitid, 1.1, 
	1.2 sources, 1.9, 1.10 xorg-x11-drv-voodoo.spec, 1.19, 1.20
Message-ID: <200803100541.m2A5f0Hf006160@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6112

Modified Files:
	.cvsignore commitid sources xorg-x11-drv-voodoo.spec 
Log Message:
* Mon Mar 10 2008 Dave Airlie  1.1.1-3.20080310
- update to fixed snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Mar 2008 23:38:00 -0000	1.9
+++ .cvsignore	10 Mar 2008 05:40:25 -0000	1.10
@@ -1 +1 @@
-xf86-video-voodoo-20080303.tar.bz2
+xf86-video-voodoo-20080310.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/commitid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commitid	3 Mar 2008 23:38:00 -0000	1.1
+++ commitid	10 Mar 2008 05:40:25 -0000	1.2
@@ -1 +1 @@
-2a2703732fb045f2f87d80eb56c8d9c1a58031f2
+51b6eec500f23e4c9a012a1ab4fe9b4012bc3703


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Mar 2008 23:38:00 -0000	1.9
+++ sources	10 Mar 2008 05:40:25 -0000	1.10
@@ -1 +1 @@
-b8ed6a70ff0eb4fece0f76b89025bced  xf86-video-voodoo-20080303.tar.bz2
+47f0fcf035446ec29f385a31825d8b0f  xf86-video-voodoo-20080310.tar.bz2


Index: xorg-x11-drv-voodoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-voodoo/devel/xorg-x11-drv-voodoo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-voodoo.spec	3 Mar 2008 23:38:00 -0000	1.19
+++ xorg-x11-drv-voodoo.spec	10 Mar 2008 05:40:25 -0000	1.20
@@ -1,7 +1,7 @@
 %define tarball xf86-video-voodoo
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20080303
+%define gitdate 20080310
 
 Summary:   Xorg X11 voodoo video driver
 Name:      xorg-x11-drv-voodoo
@@ -59,6 +59,9 @@
 %{_mandir}/man4/voodoo.4*
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  1.1.1-3.20080310
+- update to fixed snapshot
+
 * Mon Mar 03 2008 Adam Jackson  1.1.1-3.20080303
 - git snapshot for pciaccess conversion
 



From fedora-extras-commits at redhat.com  Mon Mar 10 05:44:00 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 05:44:00 GMT
Subject: rpms/xorg-x11-drv-neomagic/devel neomagic-1.1.1-pciaccess.patch, 1.1,
	1.2 xorg-x11-drv-neomagic.spec, 1.15, 1.16
Message-ID: <200803100544.m2A5i0Sd006269@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6246

Modified Files:
	neomagic-1.1.1-pciaccess.patch xorg-x11-drv-neomagic.spec 
Log Message:
* Mon Mar 10 2008 Dave Airlie  1.1.1-7
- fixup neomagic pciaccess support


neomagic-1.1.1-pciaccess.patch:

Index: neomagic-1.1.1-pciaccess.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel/neomagic-1.1.1-pciaccess.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- neomagic-1.1.1-pciaccess.patch	27 Feb 2008 01:47:49 -0000	1.1
+++ neomagic-1.1.1-pciaccess.patch	10 Mar 2008 05:43:55 -0000	1.2
@@ -2,6 +2,14 @@
 index 50c0a20..1b0f433 100644
 --- a/configure.ac
 +++ b/configure.ac
+@@ -47,6 +47,7 @@ AC_ARG_WITH(xorg-module-dir,
+             [moduledir="$withval"],
+             [moduledir="$libdir/xorg/modules"])
+ 
++
+ # Checks for extensions
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 @@ -59,10 +60,22 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
  sdkdir=$(pkg-config --variable=sdkdir xorg-server)
  
@@ -61,7 +69,7 @@
      XAAInfoRecPtr	AccelInfoRec;
      NEOACLRec Accel;
 diff --git a/src/neo_driver.c b/src/neo_driver.c
-index 1fca1f5..3d18916 100644
+index 1fca1f5..fec51ce 100644
 --- a/src/neo_driver.c
 +++ b/src/neo_driver.c
 @@ -158,9 +158,9 @@ static int      neoFindMode(int xres, int yres, int depth);
@@ -77,7 +85,19 @@
  
  /*
   * This is intentionally screen-independent.  It indicates the binding
-@@ -778,9 +778,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -612,7 +612,10 @@ NEOProbe(DriverPtr drv, int flags)
+     }
+   
+     /* PCI BUS */
+-    if (xf86GetPciVideoInfo() ) {
++#ifndef XSERVER_LIBPCIACCESS
++    if (xf86GetPciVideoInfo() )
++#endif
++    {
+ 	numUsed = xf86MatchPciInstances(NEO_NAME, PCI_VENDOR_NEOMAGIC,
+ 					NEOChipsets, NEOPCIchipsets, 
+ 					devSections,numDevSections,
+@@ -778,9 +781,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
  	/* This driver can handle ISA and PCI buses */
  	if (nPtr->pEnt->location.type == BUS_PCI) {
  	    nPtr->PciInfo = xf86GetPciInfoForEntity(nPtr->pEnt->index);
@@ -89,7 +109,7 @@
  	}
      }
      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Chipset is a ");
-@@ -1221,7 +1223,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1221,7 +1226,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
  	
      if (nPtr->pEnt->location.type == BUS_PCI) {
  	if (!nPtr->NeoLinearAddr) {
@@ -98,7 +118,7 @@
  	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
  		       "FB base address is set at 0x%lX.\n",
  		       nPtr->NeoLinearAddr);
-@@ -1241,8 +1243,8 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1241,8 +1246,8 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
  	    case NM2230:
  	    case NM2360:
  	    case NM2380:
@@ -109,7 +129,7 @@
  		break;
  	    }
  	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-@@ -2057,6 +2059,8 @@ neoMapMem(ScrnInfoPtr pScrn)
+@@ -2057,6 +2062,8 @@ neoMapMem(ScrnInfoPtr pScrn)
      if (!nPtr->noLinear) {
  	if (!nPtr->noMMIO) {
  	    if (nPtr->pEnt->location.type == BUS_PCI){
@@ -118,7 +138,7 @@
  		nPtr->NeoMMIOBase =
  		    xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
  				  nPtr->PciTag, nPtr->NeoMMIOAddr,
-@@ -2067,6 +2071,29 @@ neoMapMem(ScrnInfoPtr pScrn)
+@@ -2067,6 +2074,29 @@ neoMapMem(ScrnInfoPtr pScrn)
  				      nPtr->PciTag, nPtr->NeoMMIOAddr2,
  				      0x100000L);
  		}
@@ -148,7 +168,7 @@
  	    } else
  		nPtr->NeoMMIOBase =
  		    xf86MapVidMem(pScrn->scrnIndex,
-@@ -2077,11 +2104,26 @@ neoMapMem(ScrnInfoPtr pScrn)
+@@ -2077,11 +2107,26 @@ neoMapMem(ScrnInfoPtr pScrn)
  	}
  
  	if (nPtr->pEnt->location.type == BUS_PCI)
@@ -175,6 +195,37 @@
  	else
  	    nPtr->NeoFbBase =
  		xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+@@ -2106,16 +2151,30 @@ neoUnmapMem(ScrnInfoPtr pScrn)
+     NEOPtr nPtr = NEOPTR(pScrn);
+ 
+     if (!nPtr->noLinear) {
++#ifndef XSERVER_LIBPCIACCESS
+       if (nPtr->NeoMMIOBase)
+ 	  xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoMMIOBase,
+ 			  0x200000L);
++#else
++      if (nPtr->NeoMMIOBase)
++	  pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoMMIOBase, 0x200000L);
++#endif
+       nPtr->NeoMMIOBase = NULL;
++#ifndef XSERVER_LIBPCIACCESS
+       if (nPtr->NeoMMIOBase2)
+ 	  xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoMMIOBase2,
+ 			  0x100000L);
++#else
++      if (nPtr->NeoMMIOBase2)
++	  pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoMMIOBase2, 0x100000L);
++#endif
+       nPtr->NeoMMIOBase2 = NULL;
++#ifndef XSERVER_LIBPCIACCESS
+       xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoFbBase,
+ 		    nPtr->NeoFbMapSize); 
++#else
++      pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoFbBase, nPtr->NeoFbMapSize);
++#endif
+     }
+     nPtr->NeoFbBase = NULL;
+     
 diff --git a/src/neo_pcirename.h b/src/neo_pcirename.h
 new file mode 100644
 index 0000000..f0f5cf8


Index: xorg-x11-drv-neomagic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel/xorg-x11-drv-neomagic.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-neomagic.spec	27 Feb 2008 01:47:49 -0000	1.15
+++ xorg-x11-drv-neomagic.spec	10 Mar 2008 05:43:55 -0000	1.16
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
 Version:   1.1.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -60,6 +60,9 @@
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  1.1.1-7
+- fixup neomagic pciaccess support
+
 * Wed Feb 27 2008 Dave Airlie  - 1.1.1-6
 - add pciaccess support
 



From fedora-extras-commits at redhat.com  Mon Mar 10 05:50:51 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 05:50:51 GMT
Subject: rpms/gnome-system-monitor/devel about-this-computer.desktop, 1.1,
	1.2 gnome-system-monitor.spec, 1.109, 1.110
Message-ID: <200803100550.m2A5opwJ006568@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-system-monitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6529

Modified Files:
	about-this-computer.desktop gnome-system-monitor.spec 
Log Message:
Fix up "About this computer"



Index: about-this-computer.desktop
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/about-this-computer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- about-this-computer.desktop	9 Mar 2008 21:28:25 -0000	1.1
+++ about-this-computer.desktop	10 Mar 2008 05:50:10 -0000	1.2
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=About This Computer
 Name[en_US]=About This Computer 
 Comment=Get some basic information about this computer 
@@ -10,4 +9,5 @@
 Type=Application
 Categories=X-System-About;
 StartupNotify=true
-OnlyShowIn=GNOME;
+# we don't want this in the regular menus at all
+NotShowIn=GNOME;


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- gnome-system-monitor.spec	9 Mar 2008 21:28:25 -0000	1.109
+++ gnome-system-monitor.spec	10 Mar 2008 05:50:10 -0000	1.110
@@ -13,7 +13,7 @@
 Summary: Simple process monitor
 Name: gnome-system-monitor
 Version: 2.21.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 2.21.92-4
+- Don't show "About this computer" in the regular menus
+
 * Sat Mar  8 2008 Will Woods  - 2.21.92-3
 - Add --show-system-tab commandline flag and about-this-computer.desktop
 



From fedora-extras-commits at redhat.com  Mon Mar 10 06:05:25 2008
From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga))
Date: Mon, 10 Mar 2008 06:05:25 GMT
Subject: rpms/aprsd/F-7 aprsd.logrotate, NONE,
	1.1 aprsd-2.2.5-15-sysconfdir.patch, 1.1, 1.2 aprsd.init, 1.1,
	1.2 aprsd.spec, 1.1, 1.2
Message-ID: <200803100605.m2A65PeA014344@cvs-int.fedora.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/aprsd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14304/F-7

Modified Files:
	aprsd-2.2.5-15-sysconfdir.patch aprsd.init aprsd.spec 
Added Files:
	aprsd.logrotate 
Log Message:
aprsd-2.2.5-15.3 for fc7


--- NEW FILE aprsd.logrotate ---
/var/log/aprsd/aprsd.log {
        weekly
        rotate 4
}

/var/log/aprsd/thirdparty.log {
        daily
        rotate 4
}
/var/log/aprsd/udp.log {
        daily
        rotate 4
}
/var/log/aprsd/rf.log {
        daily
        rotate 4
}

/var/log/aprsd/loop.log {
        daily
        rotate 4
}

/var/log/aprsd/reject.log {
        daily
        rotate 2
}

aprsd-2.2.5-15-sysconfdir.patch:

Index: aprsd-2.2.5-15-sysconfdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/F-7/aprsd-2.2.5-15-sysconfdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprsd-2.2.5-15-sysconfdir.patch	1 Mar 2008 08:01:50 -0000	1.1
+++ aprsd-2.2.5-15-sysconfdir.patch	10 Mar 2008 06:05:14 -0000	1.2
@@ -1,6 +1,7 @@
+diff -Naur aprsd-2.2.5-15/src/aprsd.cpp aprsd-home/src/aprsd.cpp
 --- aprsd-2.2.5-15/src/aprsd.cpp	2003-05-29 06:09:39.000000000 +0300
-+++ aprsd-home/src/aprsd.cpp	2008-02-22 16:25:22.000000000 +0200
-@@ -97,7 +97,7 @@
++++ aprsd-home/src/aprsd.cpp	2008-03-08 15:42:46.000000000 +0200
+@@ -97,17 +97,17 @@
  string szAprsPath;
  int msgsn;
  
@@ -8,4 +9,22 @@
 +const string HOMEDIR("/etc/aprsd");
  const string CONFPATH("");
  const string CONFFILE("aprsd.conf");
- const string MAINLOG("aprsd.log");
+-const string MAINLOG("aprsd.log");
+-const string STSMLOG("thirdparty.log");
+-const string RFLOG("rf.log");
+-const string UDPLOG("udp.log");
+-const string ERRORLOG("error.log");
+-const string DEBUGLOG("debug.log");
+-const string REJECTLOG("reject.log");
+-const string LOOPLOG("loop.log");
++const string MAINLOG("/var/log/aprsd/aprsd.log");
++const string STSMLOG("/var/log/aprsd/thirdparty.log");
++const string RFLOG("/var/log/aprsd/rf.log");
++const string UDPLOG("/var/log/aprsd/udp.log");
++const string ERRORLOG("/var/log/aprsd/error.log");
++const string DEBUGLOG("/var/log/aprsd/debug.log");
++const string REJECTLOG("/var/log/aprsd/reject.log");
++const string LOOPLOG("/var/log/aprsd/loop.log");
+ const string WELCOME("welcome.txt");
+ const string TNC_INIT("INIT.TNC");
+ const string TNC_RESTORE("RESTORE.TNC");


Index: aprsd.init
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/F-7/aprsd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprsd.init	1 Mar 2008 08:01:50 -0000	1.1
+++ aprsd.init	10 Mar 2008 06:05:14 -0000	1.2
@@ -32,7 +32,7 @@
                         echo -n $"Starting $prog: "
                         daemon /usr/bin/aprsd -d
                         RETVAL=$?
-                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/aprsd
                         echo
         else
                 RETVAL=1
@@ -46,7 +46,7 @@
         killproc $prog
         RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/aprsd
         return $RETVAL
 }
 
@@ -64,7 +64,7 @@
         RETVAL=$?
         ;;
   condrestart)
-        if [ -f /var/lock/subsys/$prog ]; then
+        if [ -f /var/lock/subsys/aprsd ]; then
             stop
             start
             RETVAL=$?


Index: aprsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/F-7/aprsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprsd.spec	1 Mar 2008 08:01:50 -0000	1.1
+++ aprsd.spec	10 Mar 2008 06:05:14 -0000	1.2
@@ -2,7 +2,7 @@
 Name: aprsd
 Summary: Internet gateway and client access to amateur radio APRS packet data
 Version: 2.2.5
-Release: %{uprel}.2%{?dist}
+Release: %{uprel}.3%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz
@@ -12,6 +12,7 @@
 Source4: user.deny
 Source5: welcome.txt
 Source6: RESTORE.TNC
+Source7: aprsd.logrotate
 Patch0: aprsd-2.2.5-15-compile.patch
 Patch1: aprsd-2.2.5-15-gcc43-port.patch
 Patch2: aprsd-2.2.5-15-sysconfdir.patch
@@ -42,12 +43,16 @@
 make install DESTDIR="%{buildroot}" INSTALL="install -p"
 mkdir -p %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}%{_sysconfdir}/{aprsd,rc.d/init.d}
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/aprsd/aprsd.conf
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/aprsd
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/aprsd/INIT.TNC
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/aprsd/user.deny
 install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/aprsd/welcome.txt
 install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/aprsd/RESTORE.TNC
+install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/aprsd
+mkdir -p %{buildroot}%{_localstatedir}
+mkdir -p %{buildroot}%{_localstatedir}/log/aprsd
 
 %clean
 rm -rf %{buildroot}
@@ -67,7 +72,9 @@
 %{_bindir}/aprspass
 %{_sysconfdir}/rc.d/init.d/aprsd
 %dir %{_sysconfdir}/aprsd
+%dir %{_localstatedir}/log/aprsd
 %config(noreplace) %{_sysconfdir}/aprsd/*
+%config(noreplace) %{_sysconfdir}/logrotate.d/aprsd
 %doc AUTHORS
 %doc COPYING
 %doc ChangeLog
@@ -78,6 +85,10 @@
 %doc doc/qalgorithm.html
 
 %changelog
+* Fri Mar  8 2008 Lucian Langa  - 2.2.5-15.3
+- Patched to localstatedir
+- Added logrotation support
+
 * Fri Feb 22 2008 Lucian Langa  - 2.2.5-15.2
 - Patched homedir to obey default sysconfdir
 - Patched to compile for gcc-4.3



From fedora-extras-commits at redhat.com  Mon Mar 10 06:09:12 2008
From: fedora-extras-commits at redhat.com (Lucian Langa (lucilanga))
Date: Mon, 10 Mar 2008 06:09:12 GMT
Subject: rpms/aprsd/devel aprsd.logrotate, NONE,
	1.1 aprsd-2.2.5-15-sysconfdir.patch, 1.1, 1.2 aprsd.init, 1.1,
	1.2 aprsd.spec, 1.1, 1.2
Message-ID: <200803100609.m2A69Cs8014641@cvs-int.fedora.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/aprsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14594/devel

Modified Files:
	aprsd-2.2.5-15-sysconfdir.patch aprsd.init aprsd.spec 
Added Files:
	aprsd.logrotate 
Log Message:
aprsd-2.2.5-15.3 for devel


--- NEW FILE aprsd.logrotate ---
/var/log/aprsd/aprsd.log {
        weekly
        rotate 4
}

/var/log/aprsd/thirdparty.log {
        daily
        rotate 4
}
/var/log/aprsd/udp.log {
        daily
        rotate 4
}
/var/log/aprsd/rf.log {
        daily
        rotate 4
}

/var/log/aprsd/loop.log {
        daily
        rotate 4
}

/var/log/aprsd/reject.log {
        daily
        rotate 2
}

aprsd-2.2.5-15-sysconfdir.patch:

Index: aprsd-2.2.5-15-sysconfdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/devel/aprsd-2.2.5-15-sysconfdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprsd-2.2.5-15-sysconfdir.patch	1 Mar 2008 07:55:06 -0000	1.1
+++ aprsd-2.2.5-15-sysconfdir.patch	10 Mar 2008 06:09:00 -0000	1.2
@@ -1,6 +1,7 @@
+diff -Naur aprsd-2.2.5-15/src/aprsd.cpp aprsd-home/src/aprsd.cpp
 --- aprsd-2.2.5-15/src/aprsd.cpp	2003-05-29 06:09:39.000000000 +0300
-+++ aprsd-home/src/aprsd.cpp	2008-02-22 16:25:22.000000000 +0200
-@@ -97,7 +97,7 @@
++++ aprsd-home/src/aprsd.cpp	2008-03-08 15:42:46.000000000 +0200
+@@ -97,17 +97,17 @@
  string szAprsPath;
  int msgsn;
  
@@ -8,4 +9,22 @@
 +const string HOMEDIR("/etc/aprsd");
  const string CONFPATH("");
  const string CONFFILE("aprsd.conf");
- const string MAINLOG("aprsd.log");
+-const string MAINLOG("aprsd.log");
+-const string STSMLOG("thirdparty.log");
+-const string RFLOG("rf.log");
+-const string UDPLOG("udp.log");
+-const string ERRORLOG("error.log");
+-const string DEBUGLOG("debug.log");
+-const string REJECTLOG("reject.log");
+-const string LOOPLOG("loop.log");
++const string MAINLOG("/var/log/aprsd/aprsd.log");
++const string STSMLOG("/var/log/aprsd/thirdparty.log");
++const string RFLOG("/var/log/aprsd/rf.log");
++const string UDPLOG("/var/log/aprsd/udp.log");
++const string ERRORLOG("/var/log/aprsd/error.log");
++const string DEBUGLOG("/var/log/aprsd/debug.log");
++const string REJECTLOG("/var/log/aprsd/reject.log");
++const string LOOPLOG("/var/log/aprsd/loop.log");
+ const string WELCOME("welcome.txt");
+ const string TNC_INIT("INIT.TNC");
+ const string TNC_RESTORE("RESTORE.TNC");


Index: aprsd.init
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/devel/aprsd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprsd.init	1 Mar 2008 07:55:06 -0000	1.1
+++ aprsd.init	10 Mar 2008 06:09:00 -0000	1.2
@@ -32,7 +32,7 @@
                         echo -n $"Starting $prog: "
                         daemon /usr/bin/aprsd -d
                         RETVAL=$?
-                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/aprsd
                         echo
         else
                 RETVAL=1
@@ -46,7 +46,7 @@
         killproc $prog
         RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/aprsd
         return $RETVAL
 }
 
@@ -64,7 +64,7 @@
         RETVAL=$?
         ;;
   condrestart)
-        if [ -f /var/lock/subsys/$prog ]; then
+        if [ -f /var/lock/subsys/aprsd ]; then
             stop
             start
             RETVAL=$?


Index: aprsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aprsd/devel/aprsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprsd.spec	1 Mar 2008 07:55:06 -0000	1.1
+++ aprsd.spec	10 Mar 2008 06:09:00 -0000	1.2
@@ -2,7 +2,7 @@
 Name: aprsd
 Summary: Internet gateway and client access to amateur radio APRS packet data
 Version: 2.2.5
-Release: %{uprel}.2%{?dist}
+Release: %{uprel}.3%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{uprel}.tar.gz
@@ -12,6 +12,7 @@
 Source4: user.deny
 Source5: welcome.txt
 Source6: RESTORE.TNC
+Source7: aprsd.logrotate
 Patch0: aprsd-2.2.5-15-compile.patch
 Patch1: aprsd-2.2.5-15-gcc43-port.patch
 Patch2: aprsd-2.2.5-15-sysconfdir.patch
@@ -42,12 +43,16 @@
 make install DESTDIR="%{buildroot}" INSTALL="install -p"
 mkdir -p %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}%{_sysconfdir}/{aprsd,rc.d/init.d}
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/aprsd/aprsd.conf
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/aprsd
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/aprsd/INIT.TNC
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/aprsd/user.deny
 install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/aprsd/welcome.txt
 install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/aprsd/RESTORE.TNC
+install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/aprsd
+mkdir -p %{buildroot}%{_localstatedir}
+mkdir -p %{buildroot}%{_localstatedir}/log/aprsd
 
 %clean
 rm -rf %{buildroot}
@@ -67,7 +72,9 @@
 %{_bindir}/aprspass
 %{_sysconfdir}/rc.d/init.d/aprsd
 %dir %{_sysconfdir}/aprsd
+%dir %{_localstatedir}/log/aprsd
 %config(noreplace) %{_sysconfdir}/aprsd/*
+%config(noreplace) %{_sysconfdir}/logrotate.d/aprsd
 %doc AUTHORS
 %doc COPYING
 %doc ChangeLog
@@ -78,6 +85,10 @@
 %doc doc/qalgorithm.html
 
 %changelog
+* Fri Mar  8 2008 Lucian Langa  - 2.2.5-15.3
+- Patched to localstatedir
+- Added logrotation support
+
 * Fri Feb 22 2008 Lucian Langa  - 2.2.5-15.2
 - Patched homedir to obey default sysconfdir
 - Patched to compile for gcc-4.3



From fedora-extras-commits at redhat.com  Mon Mar 10 06:09:33 2008
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Mon, 10 Mar 2008 06:09:33 GMT
Subject: rpms/libsvm/devel LibSVM-svm-toy-48.png, NONE,
	1.1 libsvm-svm-toy-gtk.desktop, NONE,
	1.1 libsvm-svm-toy-qt.desktop, NONE, 1.1 libsvm.spec, 1.14, 1.15
Message-ID: <200803100609.m2A69XMH014693@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14587/devel

Modified Files:
	libsvm.spec 
Added Files:
	LibSVM-svm-toy-48.png libsvm-svm-toy-gtk.desktop 
	libsvm-svm-toy-qt.desktop 
Log Message:
Fix [Bug 436392]


--- NEW FILE libsvm-svm-toy-gtk.desktop ---
[Desktop Entry]
Name=svm-toy-gtk
GenericName=svm-toy GTK version
Comment=GTK version of svm-toy (libsvm demostration program)
Exec=svm-toy-gtk
Icon=libsvm-svm-toy-gtk-48
StartupNotify=true
Terminal=false
Type=Application
Categories=GTK;Education;Science;Math;DataVisualization


--- NEW FILE libsvm-svm-toy-qt.desktop ---
[Desktop Entry]
Name=svm-toy-qt
GenericName=svm-toy QT version
Comment=QT version of svm-toy (libsvm demostration program)
Exec=svm-toy-qt
Icon=libsvm-svm-toy-qt-48
StartupNotify=true
Terminal=false
Type=Application
Categories=QT;Education;Science;Math;DataVisualization


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libsvm.spec	7 Feb 2008 04:07:39 -0000	1.14
+++ libsvm.spec	10 Mar 2008 06:08:59 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.85
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,6 +10,9 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
 Source2:        http://www.csie.ntu.edu.tw/~cjlin/papers/guide/guide.pdf
+Source3:        libsvm-svm-toy-gtk.desktop
+Source4:        libsvm-svm-toy-qt.desktop
+Source5:        LibSVM-svm-toy-48.png
 Patch0:         %{name}-%{version}.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -42,9 +45,10 @@
 %package python
 Summary:    Python tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  python-devel >= 2.4 gawk gnuplot
+BuildRequires:  python-devel >= 2.4 gawk
 #gnuplot is required by easy.py
 Requires:       %{name} = %{version}-%{release}
+Requires:       gnuplot
 
 %description python
 Python tools and interfaces for libsvm.
@@ -69,6 +73,7 @@
 Group:      Development/Libraries
 BuildRequires:  gtk2-devel
 BuildRequires:  gtk2
+BuildRequires:  desktop-file-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description svm-toy-gtk
@@ -80,6 +85,7 @@
 Group:      Development/Libraries
 BuildRequires:  qt-devel
 BuildRequires:  qt
+BuildRequires:  desktop-file-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description svm-toy-qt
@@ -89,8 +95,13 @@
 %prep
 %setup -q 
 %patch0 -p0 -b .bak 
-cp ../../SOURCES/log ChangeLog
-cp ../../SOURCES/guide.pdf .
+cp %{SOURCE1} ChangeLog
+cp %{SOURCE2} .
+cp %{SOURCE3} .
+cp %{SOURCE4} .
+cp %{SOURCE5} libsvm-svm-toy-gtk-48.png
+cp %{SOURCE5} libsvm-svm-toy-qt-48.png
+
 
 
 %build
@@ -109,12 +120,35 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}"
 #cd ${RPM_BUILD_ROOT}%{libdir_libsvm}; ln -sf %{name}.so.%{version} %{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+cp libsvm-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+cp libsvm-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+
+desktop-file-install --delete-original --vendor=fedora \
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-gtk.desktop \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-qt.desktop \
+
 
 
 %post -p /sbin/ldconfig
 
+%post svm-toy-gtk
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %postun -p /sbin/ldconfig
 
+%postun svm-toy-gtk
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -152,14 +186,23 @@
 %defattr(-,root,root,-)
 %doc svm-toy/gtk/README
 %{_bindir}/svm-toy-gtk
+%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-gtk-48.png
 
 %files svm-toy-qt
 %defattr(-,root,root,-)
 %doc svm-toy/qt/README
 %{_bindir}/svm-toy-qt
+%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-qt-48.png
 
 
 %changelog
+* Tue Feb 11 2008 Ding-Yi Chen  - 2.85-5
+- [Bug 436392]: Fix by copy from right place.
+-  Add desktop files and icons for svm-toy-gtk and svm-toy-qt
+
+* Tue Feb 11 2008 Ding-Yi Chen  - 2.85-4
+- Move gnuplot from BuildRequires to Requires
+
 * Thu Feb 07 2008 Ding-Yi Chen  - 2.85-3
 - Fix linker name (libsvm.so)
 - Linked to dynamic libraries



From fedora-extras-commits at redhat.com  Mon Mar 10 06:19:21 2008
From: fedora-extras-commits at redhat.com (Huang Peng (phuang))
Date: Mon, 10 Mar 2008 06:19:21 GMT
Subject: rpms/scim-python/devel .cvsignore, 1.8, 1.9 scim-python.spec, 1.12, 
	1.13 sources, 1.8, 1.9
Message-ID: <200803100619.m2A6JL34015119@cvs-int.fedora.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15085

Modified Files:
	.cvsignore scim-python.spec sources 
Log Message:
Update to 0.1.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-python/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Jan 2008 07:45:52 -0000	1.8
+++ .cvsignore	10 Mar 2008 06:18:48 -0000	1.9
@@ -1 +1,6 @@
-scim-python-0.1.9.tar.bz2
+scim-python-0.1.10.tar.gz
+pinyin-database-0.1.10.5.tar.bz2
+xingma-cangjie5-0.1.10.tar.bz2
+xingma-erbi-qingsong-0.1.10.tar.bz2
+xingma-wubi86-0.1.10.tar.bz2
+xingma-zhengma-0.1.10.tar.bz2


Index: scim-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-python/devel/scim-python.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scim-python.spec	19 Feb 2008 19:26:49 -0000	1.12
+++ scim-python.spec	10 Mar 2008 06:18:48 -0000	1.13
@@ -2,17 +2,22 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path scim-0.1
 Name:       scim-python
-Version:    0.1.9
-Release:    2%{?dist}
+Version:    0.1.10
+Release:    1%{?dist}
 Summary:    Python wrapper for Smart Common Input Method platform
 
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/scim-python/
-Source0:    http://scim-python.googlecode.com/files/%{name}-%{version}.tar.bz2
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:    http://scim-python.googlecode.com/files/%{name}-%{version}.tar.gz
+Source1:    http://scim-python.googlecode.com/files/pinyin-database-0.1.10.5.tar.bz2
+Source2:    http://scim-python.googlecode.com/files/xingma-zhengma-0.1.10.tar.bz2
+Source3:    http://scim-python.googlecode.com/files/xingma-wubi86-0.1.10.tar.bz2
+Source4:    http://scim-python.googlecode.com/files/xingma-erbi-qingsong-0.1.10.tar.bz2
+Source5:    http://scim-python.googlecode.com/files/xingma-cangjie5-0.1.10.tar.bz2
 
-BuildRequires:  scim-devel, gettext-devel, libtool, python-devel, pygtk2-devel, perl(XML::Parser) python-enchant
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  scim-devel, gettext-devel, libtool, python-devel, pygtk2-devel, perl(XML::Parser)
 Requires:   scim, pygtk2
 
 %description
@@ -21,55 +26,141 @@
 %package english
 Summary:    Python english IM engine 
 Group:      System Environment/Libraries
+BuildRequires:  python-enchant
 Requires:   %{name} = %{version}-%{release} python-enchant
 
 %description english
 This package contains a python english IM engine.
 
+%package pinyin
+Summary:    Two python chinese pinyin IM engines 
+Group:      System Environment/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description pinyin
+This package contains two python chinese pinyin IM engines.
+
+
 %package chinese
-Summary:    Python chinese IM engine 
+Summary:    Python chinese IM engines 
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
+Requires:   %{name}-pinyin = %{version}-%{release}
+Requires:   %{name}-xingma-cangjie = %{version}-%{release}
+Requires:   %{name}-xingma-erbi = %{version}-%{release}
+Requires:   %{name}-xingma-wubi = %{version}-%{release}
+Requires:   %{name}-xingma-zhengma = %{version}-%{release}
 
 %description chinese
-This package contains a python chinese IM engine.
+This package contains some python chinese IM engines.
+
+%package xingma
+Summary:    Python XingMa IM engine 
+Group:      System Environment/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description xingma
+This package contains a python XingMa IM engine.
+
+%package xingma-cangjie
+Summary:    CangJie table for Python XingMa IM engine 
+Group:      System Environment/Libraries
+Requires:   %{name}-xingma = %{version}-%{release}
+
+%description xingma-cangjie
+This package contains a CangJie table for python XingMa IM engine.
+
+%package xingma-erbi
+Summary:    ErBi table for Python XingMa IM engine 
+Group:      System Environment/Libraries
+Requires:   %{name}-xingma = %{version}-%{release}
+
+%description xingma-erbi
+This package contains an ErBi table for python XingMa IM engine.
+
+%package xingma-wubi
+Summary:    WuBi table for Python XingMa IM engine 
+Group:      System Environment/Libraries
+Requires:   %{name}-xingma = %{version}-%{release}
+
+%description xingma-wubi
+This package contains an ZhengMa table for python XingMa IM engine.
+
+%package xingma-zhengma
+Summary:    ZhengMa table for Python XingMa IM engine 
+Group:      System Environment/Libraries
+Requires:   %{name}-xingma = %{version}-%{release}
 
+%description xingma-zhengma
+This package contains an ZhengMa table for python XingMa IM engine.
 
 %prep
-%setup -q
+%setup -q -a1 -a2 -a3 -a4 -a5
+mv py.db python/engine/PinYin/
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-english-writer --enable-pinyin
 # make -C po update-gmo
-make %{?_smp_mflags}
+make NO_INDEX=true %{?_smp_mflags}
+python python/engine/XingMa/XMCreateDB.py -o -s cangjie5.txt.bz2 -p data/pinyin_table.txt
+python python/engine/XingMa/XMCreateDB.py -o -s erbi-qs.txt.bz2 -p data/pinyin_table.txt
+python python/engine/XingMa/XMCreateDB.py -o -s wubi.txt.bz2 -p data/pinyin_table.txt
+python python/engine/XingMa/XMCreateDB.py -o -s zhengma.txt.bz2 -p data/pinyin_table.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
+make NO_INDEX=true DESTDIR=${RPM_BUILD_ROOT} install
 rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{mod_path}/scim/_scim.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/1.4.0/SetupUI/zhengjuui.la
+install -m 644 cangjie5.db $RPM_BUILD_ROOT%{_datadir}/scim-python/engine/XingMa/tables/
+install -m 644 cangjie.png $RPM_BUILD_ROOT%{_datadir}/scim/icons/
+install -m 644 erbi-qs.db $RPM_BUILD_ROOT%{_datadir}/scim-python/engine/XingMa/tables/
+install -m 644 erbi-qs.png $RPM_BUILD_ROOT%{_datadir}/scim/icons/
+install -m 644 wubi.db $RPM_BUILD_ROOT%{_datadir}/scim-python/engine/XingMa/tables/
+install -m 644 wubi.png $RPM_BUILD_ROOT%{_datadir}/scim/icons/
+install -m 644 zhengma.db $RPM_BUILD_ROOT%{_datadir}/scim-python/engine/XingMa/tables/
+install -m 644 zhengma.png $RPM_BUILD_ROOT%{_datadir}/scim/icons/
+
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post chinese
+%post pinyin
 cd /usr/share/scim-python/engine/PinYin
-echo "Creating INDEX in phrases database."
+echo "Creating INDEX."
 python -c "import PYSQLiteDB; db = PYSQLiteDB.PYSQLiteDB (); db.create_indexes ();"
 
+%post xingma-cangjie
+XMCreateDB -i -n %{_datadir}/scim-python/engine/XingMa/tables/cangjie5.db
+
+%post xingma-erbi
+XMCreateDB -i -n %{_datadir}/scim-python/engine/XingMa/tables/erbi-qs.db
+
+%post xingma-wubi
+XMCreateDB -i -n %{_datadir}/scim-python/engine/XingMa/tables/wubi.db
+
+%post xingma-zhengma
+XMCreateDB -i -n %{_datadir}/scim-python/engine/XingMa/tables/zhengma.db
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
 %{python_sitearch}/%{mod_path}/
 %{python_sitearch}/scim.pth
-%{_libdir}/scim-1.0/1.4.0/IMEngine/scim-python-engine.so
-%{_libdir}/scim-1.0/1.4.0/SetupUI/scim-python-setup.so
+%{_libdir}/scim-1.0/1.4.0/IMEngine/python.so
+%{_libdir}/scim-1.0/1.4.0/Helper/python.so
+%{_libdir}/scim-1.0/1.4.0/SetupUI/python.so
 %dir %{_datadir}/scim-python/
 %dir %{_datadir}/scim-python/engine
 %{_datadir}/scim-python/engine/__init__.*
 %dir %{_datadir}/scim-python/setupui
 %{_datadir}/scim-python/setupui/__init__.*
-%{_datadir}/scim/icons/*
+%dir %{_datadir}/scim-python/helper
+%{_datadir}/scim-python/helper/__init__.*
+%{_datadir}/scim/icons/scim-python.png
 
 %files english
 %defattr(-,root,root,-)
@@ -78,10 +169,49 @@
 
 %files chinese
 %defattr(-,root,root,-)
+
+%files pinyin
+%defattr(-,root,root,-)
+%{_datadir}/scim-python/data/pinyin_table.txt
 %{_datadir}/scim-python/engine/PinYin
-# %{_datadir}/scim-python/setupui/PinYin
+%{_datadir}/scim-python/helper/PinYinSetup
+%{_datadir}/scim-python/helper/ZhengJuSetup
+
+%files xingma
+%defattr(-,root,root,-)
+%{_bindir}/XMCreateDB
+%{_datadir}/scim-python/engine/XingMa/*.py
+%{_datadir}/scim-python/engine/XingMa/*.pyc
+%{_datadir}/scim-python/engine/XingMa/*.pyo
+%{_datadir}/scim-python/engine/XingMa/tables/.keep
+%{_datadir}/scim/icons/py-mode.png
+%{_datadir}/scim/icons/xm-mode.png
+
+%files xingma-cangjie
+%defattr(-,root,root,-)
+%{_datadir}/scim-python/engine/XingMa/tables/cangjie5.db
+%{_datadir}/scim/icons/cangjie.png
+
+%files xingma-erbi
+%defattr(-,root,root,-)
+%{_datadir}/scim-python/engine/XingMa/tables/erbi-qs.db
+%{_datadir}/scim/icons/erbi-qs.png
+
+%files xingma-wubi
+%defattr(-,root,root,-)
+%{_datadir}/scim-python/engine/XingMa/tables/wubi.db
+%{_datadir}/scim/icons/wubi.png
+
+%files xingma-zhengma
+%defattr(-,root,root,-)
+%{_datadir}/scim-python/engine/XingMa/tables/zhengma.db
+%{_datadir}/scim/icons/zhengma.png
+
 
 %changelog
+* Mon Mar 10 2008 Huang Peng  - 0.1.10-1
+- Update to 0.1.10.
+
 * Tue Feb 19 2008 Fedora Release Engineering  - 0.1.9-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-python/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Jan 2008 07:45:52 -0000	1.8
+++ sources	10 Mar 2008 06:18:48 -0000	1.9
@@ -1 +1,6 @@
-d1d4f7834f3be6091308ba282e0b945b  scim-python-0.1.9.tar.bz2
+ece811b79448e5b97112bfbeebc53be9  scim-python-0.1.10.tar.gz
+140a7dd821e8e74299bfb2089993838b  pinyin-database-0.1.10.5.tar.bz2
+7145d6f6c15ade44820d5fdf71f87b53  xingma-cangjie5-0.1.10.tar.bz2
+b57d2ec272686603693ef9f8280880a8  xingma-erbi-qingsong-0.1.10.tar.bz2
+39b574455b483c42d56f0ae54e458401  xingma-wubi86-0.1.10.tar.bz2
+23bbfcc75c71a5db19a4f8e79be0027e  xingma-zhengma-0.1.10.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 06:28:57 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 06:28:57 GMT
Subject: rpms/xorg-x11-drv-amd/devel amd-pciaccess.patch, NONE,
	1.1 xorg-x11-drv-amd.spec, 1.16, 1.17
Message-ID: <200803100628.m2A6SvGv017173@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-amd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16763

Modified Files:
	xorg-x11-drv-amd.spec 
Added Files:
	amd-pciaccess.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  0.0-24.20070625
- pciaccess fixups


amd-pciaccess.patch:

--- NEW FILE amd-pciaccess.patch ---
diff --git a/configure.ac b/configure.ac
index c219e06..b13576f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,10 +86,21 @@ PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
 
 # Checks for header files.
 AC_HEADER_STDC
 
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
 AC_SUBST([AMD_CFLAGS])
diff --git a/src/amd.h b/src/amd.h
index 8eb2253..fe2ac54 100644
--- a/src/amd.h
+++ b/src/amd.h
@@ -28,6 +28,8 @@
 #ifndef _AMD_GEODE_H_
 #define _AMD_GEODE_H_
 
+#include "amd_pcirename.h"
+
 #include "xaa.h"
 #include "exa.h"
 #include "xf86Cursor.h"
diff --git a/src/amd_driver.c b/src/amd_driver.c
index 42e49ba..b153295 100644
--- a/src/amd_driver.c
+++ b/src/amd_driver.c
@@ -419,7 +419,10 @@ AmdProbe(DriverPtr drv, int flags)
     }
     DEBUGMSG(1, (0, X_INFO, "AmdProbe: Before MatchPciInstances!\n"));
     /* PCI BUS */
-    if (xf86GetPciVideoInfo()) {
+#ifndef XSERVER_LIBPCIACCESS
+    if (xf86GetPciVideoInfo()) 
+#endif
+    {
         numUsed = xf86MatchPciInstances(AMD_NAME, PCI_VENDOR_ID_NS,
             GeodeChipsets, GeodePCIchipsets,
             devSections, numDevSections, drv, &usedChips);
diff --git a/src/amd_gx_driver.c b/src/amd_gx_driver.c
index da4fa0b..09ad47a 100644
--- a/src/amd_gx_driver.c
+++ b/src/amd_gx_driver.c
@@ -317,7 +317,27 @@ GXSaveScreen(ScreenPtr pScrn, int mode)
 
 
 /* Common function - used by the LX too */
-
+#ifdef XSERVER_LIBPCIACCESS
+static inline void * map_pci_mem(ScrnInfoPtr pScrni, int vram,
+				 struct pci_device *dev,
+				 int bar, int size)
+{
+  void *ptr;
+  void** result = (void**)&ptr;
+  int map_size = size ? size : dev->regions[bar].size;
+    
+  int err = pci_device_map_range(dev,
+				 dev->regions[bar].base_addr
+				 map_size,
+				 PCI_DEV_MAP_FLAG_WRITABLE |
+				 (vram ? PCI_DEV_MAP_FLAG_WRITE_COMBINE : 0),
+				 result);
+  
+  if (err) 
+    return NULL;
+  return ptr;
+}
+#endif
 
 
 extern unsigned long gfx_gx2_scratch_base;
@@ -330,6 +350,7 @@ GXMapMem(ScrnInfoPtr pScrni)
 
   pciVideoRec *pci = xf86GetPciInfoForEntity(pGeode->pEnt->index);
 
+#ifndef XSERVER_LIBPCIACCESS
   gfx_virt_regptr = (unsigned char *)xf86MapVidMem(index, VIDMEM_MMIO,
 						   pci->memBase[2], pci->size[2]);
 
@@ -341,6 +362,12 @@ GXMapMem(ScrnInfoPtr pScrni)
 
   gfx_virt_fbptr = (unsigned char *)xf86MapVidMem(index, VIDMEM_FRAMEBUFFER,
 						  pci->memBase[0], pGeode->FBAvail);
+#else
+  gfx_virt_regptr = map_pci_mem(pScrni, 0, pci, 2, 0);
+  gfx_virt_gpptr = map_pci_mem(pScrni, 0, pci, 1, 0);
+  gfx_virt_vidptr = map_pci_mem(pScrni, 0, pci, 3, 0);
+  gfx_virt_fbptr = map_pci_mem(pScrni, 1, pci, 0, pGeode->FBAvail);
+#endif
 
   gfx_gx2_scratch_base = pGeode->FBAvail - 0x4000;
 
diff --git a/src/amd_lx_driver.c b/src/amd_lx_driver.c
index a2db90e..09882de 100644
--- a/src/amd_lx_driver.c
+++ b/src/amd_lx_driver.c
@@ -391,6 +391,27 @@ LXWriteMSR(unsigned long addr, unsigned long lo, unsigned long hi)
     LX_MSR_WRITE(addr, lo, hi);
 }
 
+#ifdef XSERVER_LIBPCIACCESS
+static inline void * map_pci_mem(ScrnInfoPtr pScrni, int vram,
+				 struct pci_device *dev,
+				 int bar, int size)
+{
+  void *ptr;
+  void** result = (void**)&ptr;
+  int map_size = size ? size : dev->regions[bar].size;
+    
+  int err = pci_device_map_range(dev,
+				 dev->regions[bar].base_addr
+				 map_size,
+				 PCI_DEV_MAP_FLAG_WRITABLE |
+				 (vram ? PCI_DEV_MAP_FLAG_WRITE_COMBINE : 0),
+				 result);
+  
+  if (err) 
+    return NULL;
+  return ptr;
+}
+#endif
 
 static Bool
 LXMapMem(ScrnInfoPtr pScrni)
@@ -403,6 +424,7 @@ LXMapMem(ScrnInfoPtr pScrni)
     pciVideoRec *pci = xf86GetPciInfoForEntity(pGeode->pEnt->index);
     tag = pciTag(pci->bus, pci->device, pci->func);
 
+#ifndef XSERVER_LIBPCIACCESS
     cim_gp_ptr = (unsigned char *)xf86MapPciMem(index, VIDMEM_MMIO,
 						tag, pci->memBase[1], LX_GP_REG_SIZE);
 
@@ -417,18 +439,26 @@ LXMapMem(ScrnInfoPtr pScrni)
 
     cim_fb_ptr = (unsigned char *)xf86MapPciMem(index, VIDMEM_FRAMEBUFFER,
 						tag, pci->memBase[0], pGeode->FBAvail + CIM_CMD_BFR_SZ);
+#else
+    cim_gp_ptr = map_pci_mem(pScrni, 0, pci, 1, LX_GP_REG_SIZE);
+    cim_vg_ptr = map_pci_mem(pScrni, 0, pci, 2, LX_VG_REG_SIZE);
+    cim_vid_ptr = map_pci_mem(pScrni, 0, pci, 3, LX_VID_REG_SIZE);
+    cim_vip_ptr = map_pci_mem(pScrni, 0, pci, 4, LX_VIP_REG_SIZE);
+    cim_fb_ptr = map_pci_mem(pScrni, 1, pci, 0, pGeode->FBAvail + CIM_CMD_BFR_SZ);
+#endif
 
     if (pScrni->memPhysBase == 0)
-      pScrni->memPhysBase = pci->memBase[0];
+      pScrni->memPhysBase = PCI_REGION_BASE(pci, 0, REGION_MEM);
+      
 
-    cmd_bfr_phys = pci->memBase[0] + pGeode->CmdBfrOffset;
+    cmd_bfr_phys = PCI_REGION_BASE(pci, 0, REGION_MEM) + pGeode->CmdBfrOffset;
     cim_cmd_base_ptr = cim_fb_ptr + pGeode->CmdBfrOffset;
 
     if (!cim_gp_ptr || !cim_vg_ptr || !cim_vid_ptr || !cim_fb_ptr ||
 	!cim_vip_ptr)
       return FALSE;
 
-    gp_set_frame_buffer_base(pci->memBase[0], pGeode->FBAvail);
+    gp_set_frame_buffer_base(PCI_REGION_BASE(pci, 0, REGION_MEM), pGeode->FBAvail);
     gp_set_command_buffer_base(cmd_bfr_phys, 0, pGeode->CmdBfrSize);
 
     XpressROMPtr = xf86MapVidMem(index, VIDMEM_FRAMEBUFFER, 0xF0000, 0x10000);
diff --git a/src/amd_pcirename.h b/src/amd_pcirename.h
new file mode 100644
index 0000000..f0f5cf8
--- /dev/null
+++ b/src/amd_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef CIRPCIRENAME_H
+#define CIRPCIRENAME_H
+
+enum region_type {
+    REGION_MEM,
+    REGION_IO 
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus,    \
+                                    (_pcidev)->device, \
+                                    (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev)  (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type)             \
+    (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+                             : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+    (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev)  ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev)        (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev)       ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev)      ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev)        (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev)      (((_pcidev)->domain << 8) | \
+                                    (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev)       ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev)      ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b)        ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+    pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+    pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-amd.spec	20 Feb 2008 07:06:20 -0000	1.16
+++ xorg-x11-drv-amd.spec	10 Mar 2008 06:28:02 -0000	1.17
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   23.%{gitdate}%{?dist}
+Release:   24.%{gitdate}%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
@@ -38,6 +38,7 @@
 Patch0: lx-disable-compression.patch
 Patch1: amd-build-fixes.patch
 Patch2: lx-downscaling-fix.patch
+Patch3: amd-pciaccess.patch
 
 %description 
 X.Org X11 AMD Geode video driver.
@@ -47,6 +48,7 @@
 %patch0 -p1 -b .jx
 %patch1 -p1 -b .build-fix
 %patch2 -p1 -b .lx-downscale-fix
+%patch3 -p1 -b .pciaccess
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -55,6 +57,7 @@
 fi
 
 %build
+autoreconf -v --install
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
 	     --enable-visibility
 make
@@ -80,6 +83,9 @@
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  0.0-24.20070625
+- pciaccess fixups
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 0.0-23.20070625
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 06:41:23 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 06:41:23 GMT
Subject: rpms/xorg-x11-drv-amd/devel .cvsignore, 1.7, 1.8 sources, 1.9,
	1.10 xorg-x11-drv-amd.spec, 1.17, 1.18 amd-build-fixes.patch,
	1.1, NONE amd-pciaccess.patch, 1.1,
	NONE lx-downscaling-fix.patch, 1.1, NONE
Message-ID: <200803100641.m2A6fNp7022504@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-amd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22186

Modified Files:
	.cvsignore sources xorg-x11-drv-amd.spec 
Removed Files:
	amd-build-fixes.patch amd-pciaccess.patch 
	lx-downscaling-fix.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  0.0-25.20080310
- resnapshot for pciaccess goodness



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-amd/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Oct 2006 23:05:00 -0000	1.7
+++ .cvsignore	10 Mar 2008 06:40:49 -0000	1.8
@@ -1 +1 @@
-xf86-video-amd-0.0-git20061016.tar.bz2
+xf86-video-amd-0.0-git20080310.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-amd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Jun 2007 19:40:06 -0000	1.9
+++ sources	10 Mar 2008 06:40:49 -0000	1.10
@@ -1 +1 @@
-330632bf2bfe0c80094dc288788367ab  xf86-video-amd-0.0-git20070625.tar.bz2
+0965e0e8b02811ed42bb00540878f14c  xf86-video-amd-0.0-git20080310.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-amd.spec	10 Mar 2008 06:28:02 -0000	1.17
+++ xorg-x11-drv-amd.spec	10 Mar 2008 06:40:49 -0000	1.18
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20070625
+%define gitdate 20080310
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   24.%{gitdate}%{?dist}
+Release:   25.%{gitdate}%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
@@ -36,19 +36,13 @@
 %endif
 
 Patch0: lx-disable-compression.patch
-Patch1: amd-build-fixes.patch
-Patch2: lx-downscaling-fix.patch
-Patch3: amd-pciaccess.patch
 
 %description 
 X.Org X11 AMD Geode video driver.
 
 %prep
-%setup -q -n %{tarball}-2.7.6.5
+%setup -q -n %{tarball}-2.7.7.6
 %patch0 -p1 -b .jx
-%patch1 -p1 -b .build-fix
-%patch2 -p1 -b .lx-downscale-fix
-%patch3 -p1 -b .pciaccess
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -83,6 +77,9 @@
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  0.0-25.20080310
+- resnapshot for pciaccess goodness
+
 * Mon Mar 10 2008 Dave Airlie  0.0-24.20070625
 - pciaccess fixups
 


--- amd-build-fixes.patch DELETED ---


--- amd-pciaccess.patch DELETED ---


--- lx-downscaling-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 07:03:55 2008
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Mar 2008 07:03:55 GMT
Subject: rpms/sunbird/devel sunbird.spec,1.2,1.3
Message-ID: <200803100703.m2A73txR006652@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6043/devel

Modified Files:
	sunbird.spec 
Log Message:
Parralel makes were failing unpredictably



Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sunbird.spec	9 Mar 2008 15:21:34 -0000	1.2
+++ sunbird.spec	10 Mar 2008 07:03:21 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           sunbird
 Version:        0.7
-Release:        9%{?official:.official}%{?dist}
+Release:        10%{?official:.official}%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
@@ -93,7 +93,6 @@
 mk_add_options BUILD_OFFICIAL=1
 ac_add_options --enable-official-branding
 %endif
-mk_add_options MOZ_MAKE_FLAGS=%{?_smp_mflags}
 ac_add_options --enable-application=calendar
 ac_add_options --prefix=%{_prefix}
 ac_add_options --libdir=%{_libdir}
@@ -273,6 +272,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Lubomir Kundrak  0.7-10
+- Parralel makes were failing unpredictably
+
 * Thu Feb 28 2008 Lubomir Kundrak  0.7-9
 - Try to use the correct locale (#436693)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 07:07:05 2008
From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak))
Date: Mon, 10 Mar 2008 07:07:05 GMT
Subject: rpms/sunbird/EL-5 sunbird.spec,1.2,1.3
Message-ID: <200803100707.m2A775V1007385@cvs-int.fedora.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7204/EL-5

Modified Files:
	sunbird.spec 
Log Message:
merge from devel


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/EL-5/sunbird.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sunbird.spec	9 Mar 2008 15:23:22 -0000	1.2
+++ sunbird.spec	10 Mar 2008 07:06:23 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           sunbird
 Version:        0.7
-Release:        9%{?official:.official}%{?dist}
+Release:        10%{?official:.official}%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
@@ -93,7 +93,6 @@
 mk_add_options BUILD_OFFICIAL=1
 ac_add_options --enable-official-branding
 %endif
-mk_add_options MOZ_MAKE_FLAGS=%{?_smp_mflags}
 ac_add_options --enable-application=calendar
 ac_add_options --prefix=%{_prefix}
 ac_add_options --libdir=%{_libdir}
@@ -273,6 +272,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Lubomir Kundrak  0.7-10
+- Parralel makes were failing unpredictably
+
 * Thu Feb 28 2008 Lubomir Kundrak  0.7-9
 - Try to use the correct locale (#436693)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 07:20:16 2008
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 10 Mar 2008 07:20:16 GMT
Subject: rpms/tvtime/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tvtime.spec,
	1.32, 1.33
Message-ID: <200803100720.m2A7KGSw008923@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/tvtime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8880

Modified Files:
	.cvsignore sources tvtime.spec 
Log Message:
* Mon Mar 10 2008 Tomas Smetana  1.0.2-1
- update to 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tvtime/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Sep 2005 09:14:01 -0000	1.7
+++ .cvsignore	10 Mar 2008 07:19:39 -0000	1.8
@@ -1,6 +1 @@
-tvtime-0.9.12.tar.gz
-tvtime-0.9.13.tar.gz
-tvtime-0.9.14.tar.gz
-tvtime-0.9.15.tar.gz
-tvtime-0.99.tar.gz
-tvtime-1.0.1.tar.gz
+tvtime-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tvtime/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Sep 2005 09:14:01 -0000	1.7
+++ sources	10 Mar 2008 07:19:39 -0000	1.8
@@ -1 +1 @@
-e7c7951fa1aabd15254cfbc17fe8a976  tvtime-1.0.1.tar.gz
+4b3d03afe61be239b08b5e522cd8afed  tvtime-1.0.2.tar.gz


Index: tvtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- tvtime.spec	6 Mar 2008 13:03:47 -0000	1.32
+++ tvtime.spec	10 Mar 2008 07:19:39 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A high quality TV viewer
 Name: tvtime
-Version: 1.0.1
-Release: 8%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
@@ -102,6 +102,9 @@
 %{_bindir}/tvtime
 
 %changelog
+* Mon Mar 10 2008 Tomas Smetana  1.0.2-1
+- update to 1.0.2
+
 * Thu Mar 06 2008 Tomas Smetana  1.0.1-8
 - fix #235622 - X error when toggling fullscreen
 



From fedora-extras-commits at redhat.com  Mon Mar 10 07:24:25 2008
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 10 Mar 2008 07:24:25 GMT
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.47, 1.48 dejavu-fonts.spec,
	1.77, 1.78 sources, 1.47, 1.48
Message-ID: <200803100724.m2A7OP8c009151@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9111/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
2.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	5 Mar 2008 06:57:22 -0000	1.47
+++ .cvsignore	10 Mar 2008 07:23:49 -0000	1.48
@@ -1 +1 @@
-dejavu-fonts-2.23-20080305-2191.tar.bz2
+dejavu-fonts-2.24.tar.bz2


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- dejavu-fonts.spec	5 Mar 2008 06:57:22 -0000	1.77
+++ dejavu-fonts.spec	10 Mar 2008 07:23:49 -0000	1.78
@@ -5,10 +5,10 @@
 %define archivename %{name}-%{archiveversion}
 
 #define alphatag .20080228svn2189
-%define alphatag .rc1
+#define alphatag .rc1
 
-%define archiveversion 2.23-20080305-2191
-#define archiveversion %{version}
+#define archiveversion 2.23-20080305-2191
+%define archiveversion %{version}
 
 
 # Let the perl maintainer worry about Unicode.org data files
@@ -17,7 +17,7 @@
 
 Name:      %{fontname}-fonts
 Version:   2.24
-Release:   0.2%{?alphatag}%{?dist}
+Release:   1%{?alphatag}%{?dist}
 Summary:   DejaVu fonts, mature typefaces
 
 Group:     User Interface/X
@@ -185,7 +185,11 @@
 
 
 %changelog
-* Mon Mar 4 2008 
+* Mon Mar 10 2008 
+??? 2.24-1
+??? 2.24 final
+
+* Tue Mar 4 2008 
 ??? 2.24-0.2.rc1
 ??? rc time
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	5 Mar 2008 06:57:22 -0000	1.47
+++ sources	10 Mar 2008 07:23:49 -0000	1.48
@@ -1 +1 @@
-0dd52a6dbefc8d49de85f509679bff9d  dejavu-fonts-2.23-20080305-2191.tar.bz2
+ad358f2951325f3bf687e4f318831bcd  dejavu-fonts-2.24.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 07:32:39 2008
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Mar 2008 07:32:39 GMT
Subject: rpms/ruby/F-8 ruby-1.8.6.111-gcc43.patch, NONE, 1.1 .cvsignore, 1.22,
	1.23 ruby.spec, 1.104, 1.105 sources, 1.21, 1.22
Message-ID: <200803100732.m2A7WdaX009555@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ruby/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9501

Modified Files:
	.cvsignore ruby.spec sources 
Added Files:
	ruby-1.8.6.111-gcc43.patch 
Log Message:
* Tue Mar  4 2008 Akira TAGOH  - 1.8.6.114-1
- Security fix for CVE-2008-1145.
- Improve a spec file. (#226381)
  - Correct License tag.
  - Fix a timestamp issue.
  - Own a arch-specific directory.

ruby-1.8.6.111-gcc43.patch:

--- NEW FILE ruby-1.8.6.111-gcc43.patch ---
diff -pruN ruby-1.8.6-p111.orig/ext/socket/socket.c ruby-1.8.6-p111/ext/socket/socket.c
--- ruby-1.8.6-p111.orig/ext/socket/socket.c	2007-05-23 00:08:43.000000000 +0900
+++ ruby-1.8.6-p111/ext/socket/socket.c	2008-02-19 11:24:22.000000000 +0900
@@ -893,10 +893,10 @@ port_str(port, pbuf, len)
 }
 
 #ifndef NI_MAXHOST
-# define 1025
+# define NI_MAXHOST 1025
 #endif
 #ifndef NI_MAXSERV
-# define 32
+# define NI_MAXSERV 32
 #endif
 
 static struct addrinfo*


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-8/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	29 Oct 2007 12:53:12 -0000	1.22
+++ .cvsignore	10 Mar 2008 07:32:01 -0000	1.23
@@ -16,3 +16,4 @@
 ruby-1.8.6-p36.tar.bz2
 ruby-1.8.6-p110.tar.bz2
 ruby-1.8.6-p111.tar.bz2
+ruby-1.8.6-p114.tar.bz2


Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-8/ruby.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ruby.spec	29 Oct 2007 12:53:12 -0000	1.104
+++ ruby.spec	10 Mar 2008 07:32:01 -0000	1.105
@@ -1,18 +1,19 @@
-%define manver		1.4.6
 %define	rubyxver	1.8
 %define	rubyver		1.8.6
-%define _patchlevel	111
+%define _patchlevel	114
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
+%define	arcver		%{rubyver}%{?patchlevel}
 %define	sitedir		%{_libdir}/ruby/site_ruby
 # This is required to ensure that noarch files puts under /usr/lib/... for
 # multilib because ruby library is installed under /usr/{lib,lib64}/ruby anyway.
 %define	sitedir2	%{_prefix}/lib/ruby/site_ruby
+%define	_normalized_cpu	%(echo `echo %{_target_cpu} | sed 's/^ppc/powerpc/'`)
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
 Release:	1%{?dist}
-License:	Ruby or GPL+
+License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc
@@ -20,15 +21,13 @@
 BuildRequires:	emacs
 %endif
 
-Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{rubyver}%{?patchlevel}.tar.bz2
-##Source1:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz
-Source1:	%{name}-man-%{manver}.tar.bz2
-Source2:	http://www7.tok2.com/home/misc/files/%{name}/%{name}-refm-rdp-1.8.1-ja-html.tar.gz
-##Source3:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-990927.tar.gz
-Source3:	rubyfaq-990927.tar.bz2
-##Source4:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-jp-990927.tar.gz
-Source4:	rubyfaq-jp-990927.tar.bz2
-Source5:	irb.1
+Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{rubyxver}/%{name}-%{arcver}.tar.bz2
+## Dead link
+##Source1:	http://www7.tok2.com/home/misc/files/%{name}/%{name}-refm-rdp-1.8.1-ja-html.tar.gz
+Source1:	%{name}-refm-rdp-1.8.1-ja-html.tar.gz
+Source2:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-990927.tar.gz
+Source3:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-jp-990927.tar.gz
+Source4:	irb.1
 Source10:	ruby-mode-init.el
 
 Patch1:		ruby-deadcode.patch
@@ -37,6 +36,7 @@
 Patch22:	ruby-deprecated-search-path.patch
 Patch23:	ruby-multilib.patch
 Patch24:	ruby-1.8.6.111-CVE-2007-5162.patch
+Patch25:	ruby-1.8.6.111-gcc43.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -64,6 +64,7 @@
 Summary:	A Ruby development environment
 Group:		Development/Languages
 Requires:	%{name}-libs = %{version}-%{release}
+Provides:	%{name}-libs-static = %{version}-%{release}
 
 %description devel
 Header files and libraries for building a extension library for the
@@ -94,7 +95,8 @@
 %package rdoc
 Summary:	A tool to generate documentation from Ruby source files
 Group:		Development/Languages
-Requires:	%{name} = %{version}-%{release}
+## ruby-irb requires ruby
+#Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-irb = %{version}-%{release}
 Provides:	rdoc = %{version}-%{release}
 Obsoletes:	rdoc <= %{version}-%{release}
@@ -127,7 +129,8 @@
 %package ri
 Summary:	Ruby interactive reference
 Group:		Documentation
-Requires:	%{name} = %{version}-%{release}
+## ruby-irb requires ruby, which ruby-rdoc requires
+#Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-rdoc = %{version}-%{release}
 Provides:	ri = %{version}-%{release}
 Obsoletes:	ri <= %{version}-%{release}
@@ -140,12 +143,12 @@
 
 
 %prep
-%setup -q -c -a 1 -a 3 -a 4
+%setup -q -c -a 2 -a 3
 mkdir -p ruby-refm-ja
 pushd ruby-refm-ja
-tar fxz %{SOURCE2}
+tar fxz %{SOURCE1}
 popd
-pushd %{name}-%{rubyver}%{?patchlevel}
+pushd %{name}-%{arcver}
 %patch1 -p1
 %patch20 -p1
 %patch21 -p1
@@ -154,10 +157,11 @@
 %patch23 -p1
 %endif
 %patch24 -p1
+%patch25 -p1
 popd
 
 %build
-pushd %{name}-%{rubyver}%{?patchlevel}
+pushd %{name}-%{arcver}
 for i in config.sub config.guess; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
 done
@@ -180,7 +184,7 @@
   --disable-rpath \
   --with-ruby-prefix=%{_prefix}/lib
 
-make RUBY_INSTALL_NAME=ruby %{?_smp_mflags}
+make RUBY_INSTALL_NAME=ruby %{?_smp_mflags} COPY="cp -p" %{?_smp_mflags}
 %ifarch ia64
 # Miscompilation? Buggy code?
 rm -f parse.o
@@ -190,7 +194,7 @@
 popd
 
 %check
-pushd %{name}-%{rubyver}%{?patchlevel}
+pushd %{name}-%{arcver}
 %ifnarch ppc64
 make test
 %endif
@@ -200,32 +204,31 @@
 rm -rf $RPM_BUILD_ROOT
 
 %ifnarch ppc64
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-#%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/ruby-mode
-#%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/site-start.d
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 %endif
 
 # installing documents and exapmles...
+rm -rf tmp-ruby-docs
 mkdir tmp-ruby-docs
 cd tmp-ruby-docs
 
 # for ruby.rpm
 mkdir ruby ruby-libs ruby-devel ruby-tcltk ruby-docs irb
 cd ruby
-(cd ../../%{name}-%{rubyver}%{?patchlevel} && tar cf - sample) | tar xvf -
+(cd ../../%{name}-%{arcver} && tar cf - sample) | tar xvf -
 cd ..
 
 # for ruby-libs
 cd ruby-libs
-(cd ../../%{name}-%{rubyver}%{?patchlevel} && tar cf - lib/README*) | tar xvf -
-(cd ../../%{name}-%{rubyver}%{?patchlevel}/doc && tar cf - .) | tar xvf -
-(cd ../../%{name}-%{rubyver}%{?patchlevel} &&
+(cd ../../%{name}-%{arcver} && tar cf - lib/README*) | tar xf -
+(cd ../../%{name}-%{arcver}/doc && tar cf - .) | tar xf -
+(cd ../../%{name}-%{arcver} &&
  tar cf - `find ext \
   -mindepth 1 \
   \( -path '*/sample/*' -o -path '*/demo/*' \) -o \
   \( -name '*.rb' -not -path '*/lib/*' -not -name extconf.rb \) -o \
-  \( -name 'README*' -o -name '*.txt*' -o -name 'MANUAL*' \)`) | tar xvf -
+  \( -name 'README*' -o -name '*.txt*' -o -name 'MANUAL*' \)`) | tar xf -
 cd ..
 
 # for irb
@@ -244,7 +247,7 @@
 for target in tcltklib tk
 do
  (cd ../ruby-libs &&
-  tar cf - `find . -path "*/$target/*"`) | tar xvf -
+  tar cf - `find . -path "*/$target/*"`) | tar xf -
  (cd ../ruby-libs &&
   rm -rf `find . -name "$target" -type d`)
 done
@@ -252,11 +255,10 @@
 
 # for ruby-docs
 cd ruby-docs
-mkdir doc-en refm-ja faq-en faq-ja
-(cd ../../ruby-man-`echo %{manver} | sed -e 's/\.[0-9]*$//'` && tar cf - .) | (cd doc-en && tar xvf -)
-(cd ../../ruby-refm-ja && tar cf - .) | (cd refm-ja && tar xvf -)
-(cd ../../rubyfaq && tar cf - .) | (cd faq-en && tar xvf -)
-(cd ../../rubyfaq-jp && tar cf - .) | (cd faq-ja && tar xvf -)
+mkdir refm-ja faq-en faq-ja
+(cd ../../ruby-refm-ja && tar cf - .) | (cd refm-ja && tar xf -)
+(cd ../../rubyfaq && tar cf - .) | (cd faq-en && tar xf -)
+(cd ../../rubyfaq-jp && tar cf - .) | (cd faq-ja && tar xf -)
 
 (cd faq-ja &&
  for f in rubyfaq-jp*.html
@@ -265,15 +267,12 @@
    < $f > `echo $f | sed -e's/-jp//'`
   rm -f $f; \
  done)
-# make sure that all doc files are the world-readable
-find -type f | xargs chmod 0644
-
 cd ..
 
 # fixing `#!' paths
 for f in `find . -type f`
 do
-  sed -e 's,^#![ 	]*\([^ 	]*\)/\(ruby\|with\|perl\|env\),#!/usr/bin/\2,' < $f > $f.n
+  sed -e 's,^#![ 	]*\([^ 	]*\)/\(ruby\|wish\|perl\|env\),#!/usr/bin/\2,' < $f > $f.n
   if ! cmp $f $f.n
   then
     mv -f $f.n $f
@@ -282,35 +281,39 @@
   fi
 done
 
+# make sure that all doc files are the world-readable
+find -type f | xargs chmod 0644
+
+# convert to utf-8
+for i in `find -type f`; do
+	iconv -f utf-8 -t utf-8 $i > /dev/null 2>&1 || (iconv -f euc-jp -t utf-8 $i > $i.new && mv $i.new $i || exit 1)
+	if [ $? != 0 ]; then
+		iconv -f iso8859-1 -t utf-8 $i > $.new && mv $i.new $i || exit 1
+	fi
+done
+
 # done
 cd ..
 
 # installing binaries ...
-make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{rubyver}%{?patchlevel} DESTDIR=$RPM_BUILD_ROOT install
-
-_cpu=`echo %{_target_cpu} | sed 's/^ppc/powerpc/'`
+make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{arcver} DESTDIR=$RPM_BUILD_ROOT install
 
 # generate ri doc
-rubybuilddir=$RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{rubyver}%{?patchlevel}
-LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} RUBYLIB=$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}:$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os} make -C $rubybuilddir DESTDIR=$RPM_BUILD_ROOT install-doc
-#DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $rubybuilddir -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $rubybuilddir/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $rubybuilddir
+rubybuilddir=$RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{arcver}
+rm -rf %{name}-%{arcver}/.ext/rdoc
+LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} RUBYLIB=$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}:$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os} make -C $rubybuilddir DESTDIR=$RPM_BUILD_ROOT install-doc
+#DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $rubybuilddir -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/ -I $rubybuilddir/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $rubybuilddir
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver}
-%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
-
-%ifarch ppc64 s390x sparc64 x86_64
-# correct archdir
-#mv $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}/* $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/
-#rmdir $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}
-%endif
+mkdir -p $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver}
+mkdir -p $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
 
 # XXX: installing irb
-install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
+install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %ifnarch ppc64
 # installing ruby-mode
-cd %{name}-%{rubyver}%{?patchlevel}
-cp misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
+cd %{name}-%{arcver}
+cp -p misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
 
 ## for ruby-mode
 pushd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
@@ -320,149 +323,234 @@
 emacs --no-site-file -q -batch -l path.el -f batch-byte-compile *.el
 rm -f path.el*
 popd
-install -m 644 %{SOURCE10} \
+install -p -m 644 %{SOURCE10} \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 
 cd ..
 %endif
 
-# listing all files in ruby-all.files
-(find $RPM_BUILD_ROOT -type f -o -type l) |
- sort | uniq | sed -e "s,^$RPM_BUILD_ROOT,," \
-                   -e "s,\(/man/man./.*\)$,\1*," > ruby-all.files
-egrep '(\.[ah]|libruby\.so)$' ruby-all.files > ruby-devel.files
-
-_rubytmpfile=`mktemp -t %{name}-%{version}-%{release}-tmp-%(%{__id_u -n}).XXXXXXXXXX`
-# for ruby-tcltk.rpm
-cp /dev/null ruby-tcltk.files
-for f in `find %{name}-%{rubyver}%{?patchlevel}/ext/tk/lib -type f; find %{name}-%{rubyver}%{?patchlevel}/.ext -type f -name '*.so'; find %{name}-%{rubyver}%{?patchlevel}/ext/tk -type f -name '*.so'`
-do
-  egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || :
+# remove shebang
+for i in $RPM_BUILD_ROOT%{_prefix}/lib/ruby/1.8/{abbrev,generator,irb/{cmd/subirb,ext/save-history},matrix,rdoc/{markup/sample/rdoc2latex,parsers/parse_rb},set,tsort}.rb; do
+	sed -i -e '/^#!.*/,1D' $i
 done
-sort ruby-tcltk.files | uniq - $_rubytmpfile && mv $_rubytmpfile ruby-tcltk.files
-
-# for irb.rpm
-fgrep 'irb' ruby-all.files > irb.files
-
-# for ri
-cp /dev/null ri.files
-fgrep '%{_datadir}/ri' ruby-all.files >> ri.files
-fgrep '%{_bindir}/ri' ruby-all.files >> ri.files
-
-# for rdoc
-cp /dev/null rdoc.files
-fgrep rdoc ruby-all.files >> rdoc.files
-
-# for ruby-libs
-cp /dev/null ruby-libs.files
-(fgrep    '%{_prefix}/lib' ruby-all.files; 
- fgrep -h '%{_prefix}/lib' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \
- sort | uniq -u > ruby-libs.files
-
-%ifnarch ppc64
-# for ruby-mode
-cp /dev/null ruby-mode.files
-fgrep '.el' ruby-all.files >> ruby-mode.files
-%else
-touch ruby-mode.files
-%endif
-
-# for ruby.rpm
-sort ruby-all.files \
- ruby-libs.files ruby-devel.files ruby-tcltk.files irb.files ruby-mode.files ri.files rdoc.files | 
- uniq -u > ruby.files
-
-# for arch-dependent dir
-rbconfig=`find $RPM_BUILD_ROOT -name rbconfig.rb`
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
-arch=`$RPM_BUILD_ROOT%{_bindir}/ruby -r $rbconfig -e 'printf ("%s\n", Config::CONFIG["arch"])'`
-cat <<__EOF__ >> ruby-libs.files
-%%dir %%{_libdir}/ruby/%%{rubyxver}/$arch
-%%dir %%{_libdir}/ruby/%%{rubyxver}/$arch/digest
-__EOF__
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -f *.files
 rm -rf tmp-ruby-docs
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
-%files -f ruby.files
-%defattr(-, root, root)
-%doc %{name}-%{rubyver}%{?patchlevel}/COPYING*
-%doc %{name}-%{rubyver}%{?patchlevel}/ChangeLog
-%doc %{name}-%{rubyver}%{?patchlevel}/GPL
-%doc %{name}-%{rubyver}%{?patchlevel}/LEGAL
-%doc %{name}-%{rubyver}%{?patchlevel}/LGPL
-%doc %{name}-%{rubyver}%{?patchlevel}/NEWS 
-%doc %{name}-%{rubyver}%{?patchlevel}/README
-%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.ja
-%doc %{name}-%{rubyver}%{?patchlevel}/ToDo 
-%doc %{name}-%{rubyver}%{?patchlevel}/doc/ChangeLog-1.8.0
-%doc %{name}-%{rubyver}%{?patchlevel}/doc/NEWS-1.8.0
+%files
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
+%doc %{name}-%{arcver}/NEWS 
+%doc %{name}-%{arcver}/README
+%lang(ja) %doc %{name}-%{arcver}/README.ja
+%doc %{name}-%{arcver}/ToDo 
+%doc %{name}-%{arcver}/doc/ChangeLog-1.8.0
+%doc %{name}-%{arcver}/doc/NEWS-1.8.0
 %doc tmp-ruby-docs/ruby/*
-
-%files devel -f ruby-devel.files
-%defattr(-, root, root)
-%doc %{name}-%{rubyver}%{?patchlevel}/README.EXT
-%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.EXT.ja
-
-%files libs -f ruby-libs.files
-%defattr(-, root, root)
-%doc %{name}-%{rubyver}%{?patchlevel}/README
-%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.ja
-%doc %{name}-%{rubyver}%{?patchlevel}/COPYING*
-%doc %{name}-%{rubyver}%{?patchlevel}/ChangeLog
-%doc %{name}-%{rubyver}%{?patchlevel}/GPL
-%doc %{name}-%{rubyver}%{?patchlevel}/LEGAL
-%doc %{name}-%{rubyver}%{?patchlevel}/LGPL
-%dir %{_libdir}/ruby
+%{_bindir}/ruby
+%{_bindir}/erb
+%{_bindir}/testrb
+%{_mandir}/man1/ruby.1*
+
+%files devel
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
+%doc %{name}-%{arcver}/README.EXT
+%lang(ja) %doc %{name}-%{arcver}/README.EXT.ja
+%{_libdir}/libruby.so
+%{_libdir}/libruby-static.a
+%{_libdir}/ruby/%{rubyxver}/*/*.h
+
+%files libs
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/README
+%lang(ja) %doc %{name}-%{arcver}/README.ja
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
 %dir %{_prefix}/lib/ruby
-%dir %{_libdir}/ruby/%{rubyxver}
 %dir %{_prefix}/lib/ruby/%{rubyxver}
-%dir %{_prefix}/lib/ruby/%{rubyxver}/cgi
-%dir %{_prefix}/lib/ruby/%{rubyxver}/net
-%dir %{_prefix}/lib/ruby/%{rubyxver}/shell
-%dir %{_prefix}/lib/ruby/%{rubyxver}/uri
+%ifnarch ppc64 s390x sparc64 x86_64
+%dir %{_prefix}/lib/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
+%endif
+%ifarch ppc64 s390x sparc64 x86_64
+%dir %{_libdir}/ruby
+%dir %{_libdir}/ruby/%{rubyxver}
+%dir %{_libdir}/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
 %{sitedir}
+%endif
 %{sitedir2}
-
-%files tcltk -f ruby-tcltk.files
-%defattr(-, root, root)
+## the following files should goes into ruby-tcltk package.
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/*tk.rb
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/tcltk.rb
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/tk
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/tk*.rb
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/tkextlib
+%exclude %{_libdir}/ruby/%{rubyxver}/*/tcltklib.so
+%exclude %{_libdir}/ruby/%{rubyxver}/*/tkutil.so
+## the following files should goes into ruby-rdoc package.
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/rdoc
+## the following files should goes into ruby-irb package.
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/irb.rb
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/irb
+## files in ruby-libs from here
+%{_prefix}/lib/ruby/%{rubyxver}/*.rb
+%{_prefix}/lib/ruby/%{rubyxver}/bigdecimal
+%{_prefix}/lib/ruby/%{rubyxver}/cgi
+%{_prefix}/lib/ruby/%{rubyxver}/date
+%{_prefix}/lib/ruby/%{rubyxver}/digest
+%{_prefix}/lib/ruby/%{rubyxver}/dl
+%{_prefix}/lib/ruby/%{rubyxver}/drb
+%{_prefix}/lib/ruby/%{rubyxver}/io
+%{_prefix}/lib/ruby/%{rubyxver}/net
+%{_prefix}/lib/ruby/%{rubyxver}/openssl
+%{_prefix}/lib/ruby/%{rubyxver}/optparse
+%{_prefix}/lib/ruby/%{rubyxver}/racc
+%{_prefix}/lib/ruby/%{rubyxver}/rexml
+%{_prefix}/lib/ruby/%{rubyxver}/rinda
+%{_prefix}/lib/ruby/%{rubyxver}/rss
+%{_prefix}/lib/ruby/%{rubyxver}/runit
+%{_prefix}/lib/ruby/%{rubyxver}/shell
+%{_prefix}/lib/ruby/%{rubyxver}/soap
+%{_prefix}/lib/ruby/%{rubyxver}/test
+%{_prefix}/lib/ruby/%{rubyxver}/uri
+%{_prefix}/lib/ruby/%{rubyxver}/webrick
+%{_prefix}/lib/ruby/%{rubyxver}/wsdl
+%{_prefix}/lib/ruby/%{rubyxver}/xmlrpc
+%{_prefix}/lib/ruby/%{rubyxver}/xsd
+%{_prefix}/lib/ruby/%{rubyxver}/yaml
+%{_libdir}/libruby.so.*
+%{_libdir}/ruby/%{rubyxver}/*/*.so
+%{_libdir}/ruby/%{rubyxver}/*/digest
+%{_libdir}/ruby/%{rubyxver}/*/io
+%{_libdir}/ruby/%{rubyxver}/*/racc
+%{_libdir}/ruby/%{rubyxver}/*/rbconfig.rb
+
+%files tcltk
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
 %doc tmp-ruby-docs/ruby-tcltk/ext/*
-
-%files rdoc -f rdoc.files
-%defattr(-, root, root)
-%dir %{_libdir}/ruby
-%dir %{_libdir}/ruby/%{rubyxver}
-
-%files irb -f irb.files
-%defattr(-, root, root)
+%{_prefix}/lib/ruby/%{rubyxver}/*-tk.rb
+%{_prefix}/lib/ruby/%{rubyxver}/tcltk.rb
+%{_prefix}/lib/ruby/%{rubyxver}/tk
+%{_prefix}/lib/ruby/%{rubyxver}/tk*.rb
+%{_prefix}/lib/ruby/%{rubyxver}/tkextlib
+%{_libdir}/ruby/%{rubyxver}/*/tcltklib.so
+%{_libdir}/ruby/%{rubyxver}/*/tkutil.so
+
+%files rdoc
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
+%{_bindir}/rdoc
+%{_prefix}/lib/ruby/%{rubyxver}/rdoc
+
+%files irb
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
 %doc tmp-ruby-docs/irb/*
-%dir %{_prefix}/lib/ruby/%{rubyxver}/irb
-%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc
-%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc/ja
-
-%files ri -f ri.files
-%defattr(-, root, root)
-%dir %{_datadir}/ri
+%{_bindir}/irb
+%{_prefix}/lib/ruby/%{rubyxver}/irb.rb
+%{_prefix}/lib/ruby/%{rubyxver}/irb
+%{_mandir}/man1/irb.1*
+
+%files ri
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
+%{_bindir}/ri
+%{_datadir}/ri
 
 %files docs
-%defattr(-, root, root)
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
 %doc tmp-ruby-docs/ruby-docs/*
 %doc tmp-ruby-docs/ruby-libs/*
 
 %ifnarch ppc64
-%files mode -f ruby-mode.files 
-%defattr(-, root, root)
-%doc %{name}-%{rubyver}%{?patchlevel}/misc/README
-%dir %{_datadir}/emacs/site-lisp/ruby-mode
+%files mode
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
+%doc %{name}-%{arcver}/misc/README
+%{_datadir}/emacs/site-lisp/ruby-mode
+%{_datadir}/emacs/site-lisp/site-start.d/ruby-mode-init.el
 %endif
 
 %changelog
+* Tue Mar  4 2008 Akira TAGOH  - 1.8.6.114-1
+- Security fix for CVE-2008-1145.
+- Improve a spec file. (#226381)
+  - Correct License tag.
+  - Fix a timestamp issue.
+  - Own a arch-specific directory.
+
+* Tue Feb 19 2008 Fedora Release Engineering  - 1.8.6.111-9
+- Autorebuild for GCC 4.3
+
+* Tue Feb 19 2008 Akira TAGOH  - 1.8.6.111-8
+- Rebuild for gcc-4.3.
+
+* Tue Jan 15 2008 Akira TAGOH  - 1.8.6.111-7
+- Revert the change of libruby-static.a. (#428384)
+
+* Fri Jan 11 2008 Akira TAGOH  - 1.8.6.111-6
+- Fix an unnecessary replacement for shebang. (#426835)
+
+* Fri Jan  4 2008 Akira TAGOH  - 1.8.6.111-5
+- Rebuild.
+
+* Fri Dec 28 2007 Akira TAGOH  - 1.8.6.111-4
+- Clean up again.
+
+* Fri Dec 21 2007 Akira TAGOH  - 1.8.6.111-3
+- Clean up the spec file.
+- Remove ruby-man-1.4.6 stuff. this is entirely the out-dated document.
+  this could be replaced by ri.
+- Disable the static library building.
+
+* Tue Dec 04 2007 Release Engineering  - 1.8.6.111-2
+ - Rebuild for openssl bump
+
+* Wed Oct 31 2007 Akira TAGOH 
+- Fix the dead link.
+
 * Mon Oct 29 2007 Akira TAGOH  - 1.8.6.111-1
 - New upstream release.
 - ruby-1.8.6.111-CVE-2007-5162.patch: Update a bit with backporting the changes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-8/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	29 Oct 2007 12:53:12 -0000	1.21
+++ sources	10 Mar 2008 07:32:01 -0000	1.22
@@ -1,5 +1,5 @@
 8336b859400795ec51d05878c1a658b7  ruby-man-1.4.6.tar.bz2
 d65e3a216d6d345a2a6f1aa8758c2f75  ruby-refm-rdp-1.8.1-ja-html.tar.gz
-7f3e181c0be9a1579e43a5a8b26372d6  rubyfaq-990927.tar.bz2
-8aa2e2da327dc43ff6e46e634eb657b6  rubyfaq-jp-990927.tar.bz2
-e1d38b7d4f1be55726d6927a3395ce3b  ruby-1.8.6-p111.tar.bz2
+634c25b14e19925d10af3720d72e8741  rubyfaq-990927.tar.gz
+4fcec898f51d8371cc42d0a013940469  rubyfaq-jp-990927.tar.gz
+b4d0c74497f684814bcfbb41b7384a71  ruby-1.8.6-p114.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 07:39:32 2008
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 10 Mar 2008 07:39:32 GMT
Subject: rpms/db4/devel db4.spec,1.55,1.56
Message-ID: <200803100739.m2A7dWxd009876@cvs-int.fedora.redhat.com>

Author: jnovy

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

Modified Files:
	db4.spec 
Log Message:
* Mon Mar 10 2008 Jindrich Novy  4.6.21-4
- don't list headers twice in filelist (#436701)



Index: db4.spec
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/db4.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- db4.spec	25 Feb 2008 05:16:50 -0000	1.55
+++ db4.spec	10 Mar 2008 07:38:58 -0000	1.56
@@ -8,7 +8,7 @@
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
 Version: 4.6.21
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Patch2: db-4.3.29-sparc64.patch
@@ -326,7 +326,7 @@
 %{_libdir}/libdb_cxx.so
 %{_libdir}/libdb_cxx-%{__soversion}.la
 %{_libdir}/%{_libcxx_a}
-%{_includedir}/%{name}
+%dir %{_includedir}/%{name}
 %{_includedir}/%{name}/db.h
 %{_includedir}/%{name}/db_185.h
 %{_includedir}/%{name}/db_cxx.h
@@ -350,6 +350,9 @@
 %endif
 
 %changelog
+* Mon Mar 10 2008 Jindrich Novy  4.6.21-4
+- don't list headers twice in filelist (#436701)
+
 * Mon Feb 25 2008 Jindrich Novy  4.6.21-3
 - manual rebuild because of gcc-4.3 (#434185)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 07:39:53 2008
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 10 Mar 2008 07:39:53 GMT
Subject: rpms/scim/devel scim-1.4.7-remove-help-frame.patch, NONE,
	1.1 scim.spec, 1.110, 1.111
Message-ID: <200803100739.m2A7drRb009889@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	scim.spec 
Added Files:
	scim-1.4.7-remove-help-frame.patch 
Log Message:
remove the frame around the help text in the help dialog


scim-1.4.7-remove-help-frame.patch:

--- NEW FILE scim-1.4.7-remove-help-frame.patch ---
diff -u scim-1.4.7/extras/panel/scim_panel_gtk.cpp\~ scim-1.4.7/extras/panel/scim_panel_gtk.cpp
--- scim-1.4.7/extras/panel/scim_panel_gtk.cpp~	2007-10-12 11:17:29.000000000 +1000
+++ scim-1.4.7/extras/panel/scim_panel_gtk.cpp	2008-03-10 17:03:06.000000000 +1000
@@ -975,9 +975,6 @@
 
     // Create help window
     {
-        GtkWidget *frame;
-        GtkWidget *vbox;
-
         _help_dialog = gtk_dialog_new_with_buttons (_("SCIM Help"),
                                 NULL,
                                 GtkDialogFlags (0),
@@ -995,18 +992,9 @@
                                   G_CALLBACK (gtk_widget_hide_on_delete),
                                   GTK_OBJECT (_help_dialog));
 
-        frame = gtk_frame_new (_("Smart Common Input Method"));
-
-        gtk_box_pack_start (GTK_BOX (GTK_DIALOG (_help_dialog)->vbox), frame, TRUE, TRUE, 0);
-        gtk_widget_show (frame);
-
-        vbox = gtk_vbox_new (FALSE, 8);
-        gtk_container_add (GTK_CONTAINER (frame), vbox);
-        gtk_widget_show (vbox);
-
         _help_scroll = gtk_scrolled_window_new (NULL, NULL);
         gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (_help_scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-        gtk_box_pack_start (GTK_BOX (vbox), _help_scroll, TRUE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (GTK_DIALOG (_help_dialog)->vbox), _help_scroll, TRUE, TRUE, 0);
         gtk_widget_show (_help_scroll);
 
         _help_area = gtk_label_new ("");

Diff finished.  Mon Mar 10 17:09:52 2008


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- scim.spec	5 Mar 2008 04:05:12 -0000	1.110
+++ scim.spec	10 Mar 2008 07:39:11 -0000	1.111
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   16%{?dist}
+Release:   17%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -41,6 +41,7 @@
 Patch20:   scim-1.4.7-fix-fallback.patch
 Patch21:   scim-1.4.7-fix-capslock.patch
 Patch22:   scim-1.4.7-fix-gdm.patch
+Patch23:   scim-1.4.7-remove-help-frame.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -162,6 +163,7 @@
 %patch20 -p1 -b .20-fix-fallback
 %patch21 -p1 -b .21-fix-capslock
 %patch22 -p1 -b .22-fix-gdm
+%patch23 -p1 -b .23-help-frame
 
 %if %{snapshot}
 ./bootstrap
@@ -299,6 +301,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Jens Petersen  - 1.4.7-17
+- remove the frame around the help text in the help dialog
+
 * Wed Mar 5 2008 Huang Peng  - 1.4.7-16
 - Remove scim-restart script for fixing #435889.
 



From fedora-extras-commits at redhat.com  Mon Mar 10 07:42:36 2008
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Mar 2008 07:42:36 GMT
Subject: rpms/ruby/F-7 ruby.spec,1.102,1.103 sources,1.21,1.22
Message-ID: <200803100742.m2A7gafk010108@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ruby/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10068

Modified Files:
	ruby.spec sources 
Log Message:
* Tue Mar  4 2008 Akira TAGOH  - 1.8.6.114-1
- Security fix for CVE-2008-1145.
- Improve a spec file. (#226381)
  - Correct License tag.
  - Fix a timestamp issue.
  - Own a arch-specific directory.


Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-7/ruby.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ruby.spec	29 Oct 2007 13:08:37 -0000	1.102
+++ ruby.spec	10 Mar 2008 07:42:02 -0000	1.103
@@ -1,18 +1,19 @@
-%define manver		1.4.6
 %define	rubyxver	1.8
 %define	rubyver		1.8.6
-%define _patchlevel	111
+%define _patchlevel	114
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
+%define	arcver		%{rubyver}%{?patchlevel}
 %define	sitedir		%{_libdir}/ruby/site_ruby
 # This is required to ensure that noarch files puts under /usr/lib/... for
 # multilib because ruby library is installed under /usr/{lib,lib64}/ruby anyway.
 %define	sitedir2	%{_prefix}/lib/ruby/site_ruby
+%define	_normalized_cpu	%(echo `echo %{_target_cpu} | sed 's/^ppc/powerpc/'`)
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
 Release:	1%{?dist}
-License:	Ruby or GPL+
+License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc
@@ -20,15 +21,13 @@
 BuildRequires:	emacs
 %endif
 
-Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{rubyver}%{?patchlevel}.tar.bz2
-##Source1:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz
-Source1:	%{name}-man-%{manver}.tar.bz2
-Source2:	http://www7.tok2.com/home/misc/files/%{name}/%{name}-refm-rdp-1.8.1-ja-html.tar.gz
-##Source3:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-990927.tar.gz
-Source3:	rubyfaq-990927.tar.bz2
-##Source4:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-jp-990927.tar.gz
-Source4:	rubyfaq-jp-990927.tar.bz2
-Source5:	irb.1
+Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{rubyxver}/%{name}-%{arcver}.tar.bz2
+## Dead link
+##Source1:	http://www7.tok2.com/home/misc/files/%{name}/%{name}-refm-rdp-1.8.1-ja-html.tar.gz
+Source1:	%{name}-refm-rdp-1.8.1-ja-html.tar.gz
+Source2:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-990927.tar.gz
+Source3:	ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-jp-990927.tar.gz
+Source4:	irb.1
 Source10:	ruby-mode-init.el
 
 Patch1:		ruby-deadcode.patch
@@ -37,6 +36,7 @@
 Patch22:	ruby-deprecated-search-path.patch
 Patch23:	ruby-multilib.patch
 Patch24:	ruby-1.8.6.111-CVE-2007-5162.patch
+Patch25:	ruby-1.8.6.111-gcc43.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -64,6 +64,7 @@
 Summary:	A Ruby development environment
 Group:		Development/Languages
 Requires:	%{name}-libs = %{version}-%{release}
+Provides:	%{name}-libs-static = %{version}-%{release}
 
 %description devel
 Header files and libraries for building a extension library for the
@@ -94,7 +95,8 @@
 %package rdoc
 Summary:	A tool to generate documentation from Ruby source files
 Group:		Development/Languages
-Requires:	%{name} = %{version}-%{release}
+## ruby-irb requires ruby
+#Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-irb = %{version}-%{release}
 Provides:	rdoc = %{version}-%{release}
 Obsoletes:	rdoc <= %{version}-%{release}
@@ -127,7 +129,8 @@
 %package ri
 Summary:	Ruby interactive reference
 Group:		Documentation
-Requires:	%{name} = %{version}-%{release}
+## ruby-irb requires ruby, which ruby-rdoc requires
+#Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-rdoc = %{version}-%{release}
 Provides:	ri = %{version}-%{release}
 Obsoletes:	ri <= %{version}-%{release}
@@ -140,12 +143,12 @@
 
 
 %prep
-%setup -q -c -a 1 -a 3 -a 4
+%setup -q -c -a 2 -a 3
 mkdir -p ruby-refm-ja
 pushd ruby-refm-ja
-tar fxz %{SOURCE2}
+tar fxz %{SOURCE1}
 popd
-pushd %{name}-%{rubyver}%{?patchlevel}
+pushd %{name}-%{arcver}
 %patch1 -p1
 %patch20 -p1
 %patch21 -p1
@@ -154,10 +157,11 @@
 %patch23 -p1
 %endif
 %patch24 -p1
+%patch25 -p1
 popd
 
 %build
-pushd %{name}-%{rubyver}%{?patchlevel}
+pushd %{name}-%{arcver}
 for i in config.sub config.guess; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
 done
@@ -180,7 +184,7 @@
   --disable-rpath \
   --with-ruby-prefix=%{_prefix}/lib
 
-make RUBY_INSTALL_NAME=ruby %{?_smp_mflags}
+make RUBY_INSTALL_NAME=ruby %{?_smp_mflags} COPY="cp -p" %{?_smp_mflags}
 %ifarch ia64
 # Miscompilation? Buggy code?
 rm -f parse.o
@@ -190,7 +194,7 @@
 popd
 
 %check
-pushd %{name}-%{rubyver}%{?patchlevel}
+pushd %{name}-%{arcver}
 %ifnarch ppc64
 make test
 %endif
@@ -200,32 +204,31 @@
 rm -rf $RPM_BUILD_ROOT
 
 %ifnarch ppc64
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-#%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/ruby-mode
-#%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/site-start.d
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 %endif
 
 # installing documents and exapmles...
+rm -rf tmp-ruby-docs
 mkdir tmp-ruby-docs
 cd tmp-ruby-docs
 
 # for ruby.rpm
 mkdir ruby ruby-libs ruby-devel ruby-tcltk ruby-docs irb
 cd ruby
-(cd ../../%{name}-%{rubyver}%{?patchlevel} && tar cf - sample) | tar xvf -
+(cd ../../%{name}-%{arcver} && tar cf - sample) | tar xvf -
 cd ..
 
 # for ruby-libs
 cd ruby-libs
-(cd ../../%{name}-%{rubyver}%{?patchlevel} && tar cf - lib/README*) | tar xvf -
-(cd ../../%{name}-%{rubyver}%{?patchlevel}/doc && tar cf - .) | tar xvf -
-(cd ../../%{name}-%{rubyver}%{?patchlevel} &&
+(cd ../../%{name}-%{arcver} && tar cf - lib/README*) | tar xf -
+(cd ../../%{name}-%{arcver}/doc && tar cf - .) | tar xf -
+(cd ../../%{name}-%{arcver} &&
  tar cf - `find ext \
   -mindepth 1 \
   \( -path '*/sample/*' -o -path '*/demo/*' \) -o \
   \( -name '*.rb' -not -path '*/lib/*' -not -name extconf.rb \) -o \
-  \( -name 'README*' -o -name '*.txt*' -o -name 'MANUAL*' \)`) | tar xvf -
+  \( -name 'README*' -o -name '*.txt*' -o -name 'MANUAL*' \)`) | tar xf -
 cd ..
 
 # for irb
@@ -244,7 +247,7 @@
 for target in tcltklib tk
 do
  (cd ../ruby-libs &&
-  tar cf - `find . -path "*/$target/*"`) | tar xvf -
+  tar cf - `find . -path "*/$target/*"`) | tar xf -
  (cd ../ruby-libs &&
   rm -rf `find . -name "$target" -type d`)
 done
@@ -252,11 +255,10 @@
 
 # for ruby-docs
 cd ruby-docs
-mkdir doc-en refm-ja faq-en faq-ja
-(cd ../../ruby-man-`echo %{manver} | sed -e 's/\.[0-9]*$//'` && tar cf - .) | (cd doc-en && tar xvf -)
-(cd ../../ruby-refm-ja && tar cf - .) | (cd refm-ja && tar xvf -)
-(cd ../../rubyfaq && tar cf - .) | (cd faq-en && tar xvf -)
-(cd ../../rubyfaq-jp && tar cf - .) | (cd faq-ja && tar xvf -)
+mkdir refm-ja faq-en faq-ja
+(cd ../../ruby-refm-ja && tar cf - .) | (cd refm-ja && tar xf -)
+(cd ../../rubyfaq && tar cf - .) | (cd faq-en && tar xf -)
+(cd ../../rubyfaq-jp && tar cf - .) | (cd faq-ja && tar xf -)
 
 (cd faq-ja &&
  for f in rubyfaq-jp*.html
@@ -265,15 +267,12 @@
    < $f > `echo $f | sed -e's/-jp//'`
   rm -f $f; \
  done)
-# make sure that all doc files are the world-readable
-find -type f | xargs chmod 0644
-
 cd ..
 
 # fixing `#!' paths
 for f in `find . -type f`
 do
-  sed -e 's,^#![ 	]*\([^ 	]*\)/\(ruby\|with\|perl\|env\),#!/usr/bin/\2,' < $f > $f.n
+  sed -e 's,^#![ 	]*\([^ 	]*\)/\(ruby\|wish\|perl\|env\),#!/usr/bin/\2,' < $f > $f.n
   if ! cmp $f $f.n
   then
     mv -f $f.n $f
@@ -282,35 +281,39 @@
   fi
 done
 
+# make sure that all doc files are the world-readable
+find -type f | xargs chmod 0644
+
+# convert to utf-8
+for i in `find -type f`; do
+	iconv -f utf-8 -t utf-8 $i > /dev/null 2>&1 || (iconv -f euc-jp -t utf-8 $i > $i.new && mv $i.new $i || exit 1)
+	if [ $? != 0 ]; then
+		iconv -f iso8859-1 -t utf-8 $i > $.new && mv $i.new $i || exit 1
+	fi
+done
+
 # done
 cd ..
 
 # installing binaries ...
-make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{rubyver}%{?patchlevel} DESTDIR=$RPM_BUILD_ROOT install
-
-_cpu=`echo %{_target_cpu} | sed 's/^ppc/powerpc/'`
+make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{arcver} DESTDIR=$RPM_BUILD_ROOT install
 
 # generate ri doc
-rubybuilddir=$RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{rubyver}%{?patchlevel}
-LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} RUBYLIB=$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}:$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os} make -C $rubybuilddir DESTDIR=$RPM_BUILD_ROOT install-doc
-#DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $rubybuilddir -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $rubybuilddir/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $rubybuilddir
+rubybuilddir=$RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{arcver}
+rm -rf %{name}-%{arcver}/.ext/rdoc
+LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} RUBYLIB=$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}:$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os} make -C $rubybuilddir DESTDIR=$RPM_BUILD_ROOT install-doc
+#DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $rubybuilddir -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/ -I $rubybuilddir/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $rubybuilddir
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver}
-%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
-
-%ifarch ppc64 s390x sparc64 x86_64
-# correct archdir
-#mv $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}/* $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/
-#rmdir $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}
-%endif
+mkdir -p $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver}
+mkdir -p $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
 
 # XXX: installing irb
-install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
+install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %ifnarch ppc64
 # installing ruby-mode
-cd %{name}-%{rubyver}%{?patchlevel}
-cp misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
+cd %{name}-%{arcver}
+cp -p misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
 
 ## for ruby-mode
 pushd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
@@ -320,149 +323,234 @@
 emacs --no-site-file -q -batch -l path.el -f batch-byte-compile *.el
 rm -f path.el*
 popd
-install -m 644 %{SOURCE10} \
+install -p -m 644 %{SOURCE10} \
 	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 
 cd ..
 %endif
 
-# listing all files in ruby-all.files
-(find $RPM_BUILD_ROOT -type f -o -type l) |
- sort | uniq | sed -e "s,^$RPM_BUILD_ROOT,," \
-                   -e "s,\(/man/man./.*\)$,\1*," > ruby-all.files
-egrep '(\.[ah]|libruby\.so)$' ruby-all.files > ruby-devel.files
-
-_rubytmpfile=`mktemp -t %{name}-%{version}-%{release}-tmp-%(%{__id_u -n}).XXXXXXXXXX`
-# for ruby-tcltk.rpm
-cp /dev/null ruby-tcltk.files
-for f in `find %{name}-%{rubyver}%{?patchlevel}/ext/tk/lib -type f; find %{name}-%{rubyver}%{?patchlevel}/.ext -type f -name '*.so'; find %{name}-%{rubyver}%{?patchlevel}/ext/tk -type f -name '*.so'`
-do
-  egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || :
+# remove shebang
+for i in $RPM_BUILD_ROOT%{_prefix}/lib/ruby/1.8/{abbrev,generator,irb/{cmd/subirb,ext/save-history},matrix,rdoc/{markup/sample/rdoc2latex,parsers/parse_rb},set,tsort}.rb; do
+	sed -i -e '/^#!.*/,1D' $i
 done
-sort ruby-tcltk.files | uniq - $_rubytmpfile && mv $_rubytmpfile ruby-tcltk.files
-
-# for irb.rpm
-fgrep 'irb' ruby-all.files > irb.files
-
-# for ri
-cp /dev/null ri.files
-fgrep '%{_datadir}/ri' ruby-all.files >> ri.files
-fgrep '%{_bindir}/ri' ruby-all.files >> ri.files
-
-# for rdoc
-cp /dev/null rdoc.files
-fgrep rdoc ruby-all.files >> rdoc.files
-
-# for ruby-libs
-cp /dev/null ruby-libs.files
-(fgrep    '%{_prefix}/lib' ruby-all.files; 
- fgrep -h '%{_prefix}/lib' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \
- sort | uniq -u > ruby-libs.files
-
-%ifnarch ppc64
-# for ruby-mode
-cp /dev/null ruby-mode.files
-fgrep '.el' ruby-all.files >> ruby-mode.files
-%else
-touch ruby-mode.files
-%endif
-
-# for ruby.rpm
-sort ruby-all.files \
- ruby-libs.files ruby-devel.files ruby-tcltk.files irb.files ruby-mode.files ri.files rdoc.files | 
- uniq -u > ruby.files
-
-# for arch-dependent dir
-rbconfig=`find $RPM_BUILD_ROOT -name rbconfig.rb`
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
-arch=`$RPM_BUILD_ROOT%{_bindir}/ruby -r $rbconfig -e 'printf ("%s\n", Config::CONFIG["arch"])'`
-cat <<__EOF__ >> ruby-libs.files
-%%dir %%{_libdir}/ruby/%%{rubyxver}/$arch
-%%dir %%{_libdir}/ruby/%%{rubyxver}/$arch/digest
-__EOF__
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -f *.files
 rm -rf tmp-ruby-docs
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
-%files -f ruby.files
-%defattr(-, root, root)
-%doc %{name}-%{rubyver}%{?patchlevel}/COPYING*
-%doc %{name}-%{rubyver}%{?patchlevel}/ChangeLog
-%doc %{name}-%{rubyver}%{?patchlevel}/GPL
-%doc %{name}-%{rubyver}%{?patchlevel}/LEGAL
-%doc %{name}-%{rubyver}%{?patchlevel}/LGPL
-%doc %{name}-%{rubyver}%{?patchlevel}/NEWS 
-%doc %{name}-%{rubyver}%{?patchlevel}/README
-%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.ja
-%doc %{name}-%{rubyver}%{?patchlevel}/ToDo 
-%doc %{name}-%{rubyver}%{?patchlevel}/doc/ChangeLog-1.8.0
-%doc %{name}-%{rubyver}%{?patchlevel}/doc/NEWS-1.8.0
+%files
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
+%doc %{name}-%{arcver}/NEWS 
+%doc %{name}-%{arcver}/README
+%lang(ja) %doc %{name}-%{arcver}/README.ja
+%doc %{name}-%{arcver}/ToDo 
+%doc %{name}-%{arcver}/doc/ChangeLog-1.8.0
+%doc %{name}-%{arcver}/doc/NEWS-1.8.0
 %doc tmp-ruby-docs/ruby/*
-
-%files devel -f ruby-devel.files
-%defattr(-, root, root)
-%doc %{name}-%{rubyver}%{?patchlevel}/README.EXT
-%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.EXT.ja
-
-%files libs -f ruby-libs.files
-%defattr(-, root, root)
-%doc %{name}-%{rubyver}%{?patchlevel}/README
-%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.ja
-%doc %{name}-%{rubyver}%{?patchlevel}/COPYING*
-%doc %{name}-%{rubyver}%{?patchlevel}/ChangeLog
-%doc %{name}-%{rubyver}%{?patchlevel}/GPL
-%doc %{name}-%{rubyver}%{?patchlevel}/LEGAL
-%doc %{name}-%{rubyver}%{?patchlevel}/LGPL
-%dir %{_libdir}/ruby
+%{_bindir}/ruby
+%{_bindir}/erb
+%{_bindir}/testrb
+%{_mandir}/man1/ruby.1*
+
+%files devel
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
+%doc %{name}-%{arcver}/README.EXT
+%lang(ja) %doc %{name}-%{arcver}/README.EXT.ja
+%{_libdir}/libruby.so
+%{_libdir}/libruby-static.a
+%{_libdir}/ruby/%{rubyxver}/*/*.h
+
+%files libs
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/README
+%lang(ja) %doc %{name}-%{arcver}/README.ja
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
 %dir %{_prefix}/lib/ruby
-%dir %{_libdir}/ruby/%{rubyxver}
 %dir %{_prefix}/lib/ruby/%{rubyxver}
-%dir %{_prefix}/lib/ruby/%{rubyxver}/cgi
-%dir %{_prefix}/lib/ruby/%{rubyxver}/net
-%dir %{_prefix}/lib/ruby/%{rubyxver}/shell
-%dir %{_prefix}/lib/ruby/%{rubyxver}/uri
+%ifnarch ppc64 s390x sparc64 x86_64
+%dir %{_prefix}/lib/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
+%endif
+%ifarch ppc64 s390x sparc64 x86_64
+%dir %{_libdir}/ruby
+%dir %{_libdir}/ruby/%{rubyxver}
+%dir %{_libdir}/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
 %{sitedir}
+%endif
 %{sitedir2}
-
-%files tcltk -f ruby-tcltk.files
-%defattr(-, root, root)
+## the following files should goes into ruby-tcltk package.
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/*tk.rb
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/tcltk.rb
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/tk
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/tk*.rb
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/tkextlib
+%exclude %{_libdir}/ruby/%{rubyxver}/*/tcltklib.so
+%exclude %{_libdir}/ruby/%{rubyxver}/*/tkutil.so
+## the following files should goes into ruby-rdoc package.
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/rdoc
+## the following files should goes into ruby-irb package.
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/irb.rb
+%exclude %{_prefix}/lib/ruby/%{rubyxver}/irb
+## files in ruby-libs from here
+%{_prefix}/lib/ruby/%{rubyxver}/*.rb
+%{_prefix}/lib/ruby/%{rubyxver}/bigdecimal
+%{_prefix}/lib/ruby/%{rubyxver}/cgi
+%{_prefix}/lib/ruby/%{rubyxver}/date
+%{_prefix}/lib/ruby/%{rubyxver}/digest
+%{_prefix}/lib/ruby/%{rubyxver}/dl
+%{_prefix}/lib/ruby/%{rubyxver}/drb
+%{_prefix}/lib/ruby/%{rubyxver}/io
+%{_prefix}/lib/ruby/%{rubyxver}/net
+%{_prefix}/lib/ruby/%{rubyxver}/openssl
+%{_prefix}/lib/ruby/%{rubyxver}/optparse
+%{_prefix}/lib/ruby/%{rubyxver}/racc
+%{_prefix}/lib/ruby/%{rubyxver}/rexml
+%{_prefix}/lib/ruby/%{rubyxver}/rinda
+%{_prefix}/lib/ruby/%{rubyxver}/rss
+%{_prefix}/lib/ruby/%{rubyxver}/runit
+%{_prefix}/lib/ruby/%{rubyxver}/shell
+%{_prefix}/lib/ruby/%{rubyxver}/soap
+%{_prefix}/lib/ruby/%{rubyxver}/test
+%{_prefix}/lib/ruby/%{rubyxver}/uri
+%{_prefix}/lib/ruby/%{rubyxver}/webrick
+%{_prefix}/lib/ruby/%{rubyxver}/wsdl
+%{_prefix}/lib/ruby/%{rubyxver}/xmlrpc
+%{_prefix}/lib/ruby/%{rubyxver}/xsd
+%{_prefix}/lib/ruby/%{rubyxver}/yaml
+%{_libdir}/libruby.so.*
+%{_libdir}/ruby/%{rubyxver}/*/*.so
+%{_libdir}/ruby/%{rubyxver}/*/digest
+%{_libdir}/ruby/%{rubyxver}/*/io
+%{_libdir}/ruby/%{rubyxver}/*/racc
+%{_libdir}/ruby/%{rubyxver}/*/rbconfig.rb
+
+%files tcltk
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
 %doc tmp-ruby-docs/ruby-tcltk/ext/*
-
-%files rdoc -f rdoc.files
-%defattr(-, root, root)
-%dir %{_libdir}/ruby
-%dir %{_libdir}/ruby/%{rubyxver}
-
-%files irb -f irb.files
-%defattr(-, root, root)
+%{_prefix}/lib/ruby/%{rubyxver}/*-tk.rb
+%{_prefix}/lib/ruby/%{rubyxver}/tcltk.rb
+%{_prefix}/lib/ruby/%{rubyxver}/tk
+%{_prefix}/lib/ruby/%{rubyxver}/tk*.rb
+%{_prefix}/lib/ruby/%{rubyxver}/tkextlib
+%{_libdir}/ruby/%{rubyxver}/*/tcltklib.so
+%{_libdir}/ruby/%{rubyxver}/*/tkutil.so
+
+%files rdoc
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
+%{_bindir}/rdoc
+%{_prefix}/lib/ruby/%{rubyxver}/rdoc
+
+%files irb
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
 %doc tmp-ruby-docs/irb/*
-%dir %{_prefix}/lib/ruby/%{rubyxver}/irb
-%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc
-%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc/ja
-
-%files ri -f ri.files
-%defattr(-, root, root)
-%dir %{_datadir}/ri
+%{_bindir}/irb
+%{_prefix}/lib/ruby/%{rubyxver}/irb.rb
+%{_prefix}/lib/ruby/%{rubyxver}/irb
+%{_mandir}/man1/irb.1*
+
+%files ri
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
+%{_bindir}/ri
+%{_datadir}/ri
 
 %files docs
-%defattr(-, root, root)
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
 %doc tmp-ruby-docs/ruby-docs/*
 %doc tmp-ruby-docs/ruby-libs/*
 
 %ifnarch ppc64
-%files mode -f ruby-mode.files 
-%defattr(-, root, root)
-%doc %{name}-%{rubyver}%{?patchlevel}/misc/README
-%dir %{_datadir}/emacs/site-lisp/ruby-mode
+%files mode
+%defattr(-, root, root, -)
+%doc %{name}-%{arcver}/COPYING*
+%doc %{name}-%{arcver}/ChangeLog
+%doc %{name}-%{arcver}/GPL
+%doc %{name}-%{arcver}/LEGAL
+%doc %{name}-%{arcver}/LGPL
+%doc %{name}-%{arcver}/misc/README
+%{_datadir}/emacs/site-lisp/ruby-mode
+%{_datadir}/emacs/site-lisp/site-start.d/ruby-mode-init.el
 %endif
 
 %changelog
+* Tue Mar  4 2008 Akira TAGOH  - 1.8.6.114-1
+- Security fix for CVE-2008-1145.
+- Improve a spec file. (#226381)
+  - Correct License tag.
+  - Fix a timestamp issue.
+  - Own a arch-specific directory.
+
+* Tue Feb 19 2008 Fedora Release Engineering  - 1.8.6.111-9
+- Autorebuild for GCC 4.3
+
+* Tue Feb 19 2008 Akira TAGOH  - 1.8.6.111-8
+- Rebuild for gcc-4.3.
+
+* Tue Jan 15 2008 Akira TAGOH  - 1.8.6.111-7
+- Revert the change of libruby-static.a. (#428384)
+
+* Fri Jan 11 2008 Akira TAGOH  - 1.8.6.111-6
+- Fix an unnecessary replacement for shebang. (#426835)
+
+* Fri Jan  4 2008 Akira TAGOH  - 1.8.6.111-5
+- Rebuild.
+
+* Fri Dec 28 2007 Akira TAGOH  - 1.8.6.111-4
+- Clean up again.
+
+* Fri Dec 21 2007 Akira TAGOH  - 1.8.6.111-3
+- Clean up the spec file.
+- Remove ruby-man-1.4.6 stuff. this is entirely the out-dated document.
+  this could be replaced by ri.
+- Disable the static library building.
+
+* Tue Dec 04 2007 Release Engineering  - 1.8.6.111-2
+ - Rebuild for openssl bump
+
+* Wed Oct 31 2007 Akira TAGOH 
+- Fix the dead link.
+
 * Mon Oct 29 2007 Akira TAGOH  - 1.8.6.111-1
 - New upstream release.
 - ruby-1.8.6.111-CVE-2007-5162.patch: Update a bit with backporting the changes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-7/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	29 Oct 2007 13:08:37 -0000	1.21
+++ sources	10 Mar 2008 07:42:02 -0000	1.22
@@ -1,5 +1,5 @@
 8336b859400795ec51d05878c1a658b7  ruby-man-1.4.6.tar.bz2
 d65e3a216d6d345a2a6f1aa8758c2f75  ruby-refm-rdp-1.8.1-ja-html.tar.gz
-7f3e181c0be9a1579e43a5a8b26372d6  rubyfaq-990927.tar.bz2
-8aa2e2da327dc43ff6e46e634eb657b6  rubyfaq-jp-990927.tar.bz2
-e1d38b7d4f1be55726d6927a3395ce3b  ruby-1.8.6-p111.tar.bz2
+634c25b14e19925d10af3720d72e8741  rubyfaq-990927.tar.gz
+4fcec898f51d8371cc42d0a013940469  rubyfaq-jp-990927.tar.gz
+b4d0c74497f684814bcfbb41b7384a71  ruby-1.8.6-p114.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 07:42:50 2008
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Mar 2008 07:42:50 GMT
Subject: rpms/ruby/F-7 ruby-1.8.6.111-gcc43.patch,NONE,1.1
Message-ID: <200803100742.m2A7goIV010132@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/ruby/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10121

Added Files:
	ruby-1.8.6.111-gcc43.patch 
Log Message:


ruby-1.8.6.111-gcc43.patch:

--- NEW FILE ruby-1.8.6.111-gcc43.patch ---
diff -pruN ruby-1.8.6-p111.orig/ext/socket/socket.c ruby-1.8.6-p111/ext/socket/socket.c
--- ruby-1.8.6-p111.orig/ext/socket/socket.c	2007-05-23 00:08:43.000000000 +0900
+++ ruby-1.8.6-p111/ext/socket/socket.c	2008-02-19 11:24:22.000000000 +0900
@@ -893,10 +893,10 @@ port_str(port, pbuf, len)
 }
 
 #ifndef NI_MAXHOST
-# define 1025
+# define NI_MAXHOST 1025
 #endif
 #ifndef NI_MAXSERV
-# define 32
+# define NI_MAXSERV 32
 #endif
 
 static struct addrinfo*



From fedora-extras-commits at redhat.com  Mon Mar 10 07:44:03 2008
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Mon, 10 Mar 2008 07:44:03 GMT
Subject: rpms/libsvm/F-7 LibSVM-svm-toy-48.png, NONE,
	1.1 libsvm-svm-toy-gtk.desktop, NONE,
	1.1 libsvm-svm-toy-qt.desktop, NONE, 1.1 libsvm.spec, 1.10, 1.11
Message-ID: <200803100744.m2A7i3eX010250@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10205/F-7

Modified Files:
	libsvm.spec 
Added Files:
	LibSVM-svm-toy-48.png libsvm-svm-toy-gtk.desktop 
	libsvm-svm-toy-qt.desktop 
Log Message:
Fix [Bug 436392]


--- NEW FILE libsvm-svm-toy-gtk.desktop ---
[Desktop Entry]
Name=svm-toy-gtk
GenericName=svm-toy GTK version
Comment=GTK version of svm-toy (libsvm demostration program)
Exec=svm-toy-gtk
Icon=libsvm-svm-toy-gtk-48
StartupNotify=true
Terminal=false
Type=Application
Categories=GTK;Education;Science;Math;DataVisualization


--- NEW FILE libsvm-svm-toy-qt.desktop ---
[Desktop Entry]
Name=svm-toy-qt
GenericName=svm-toy QT version
Comment=QT version of svm-toy (libsvm demostration program)
Exec=svm-toy-qt
Icon=libsvm-svm-toy-qt-48
StartupNotify=true
Terminal=false
Type=Application
Categories=QT;Education;Science;Math;DataVisualization


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-7/libsvm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libsvm.spec	7 Feb 2008 04:47:53 -0000	1.10
+++ libsvm.spec	10 Mar 2008 07:43:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.85
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,6 +10,9 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
 Source2:        http://www.csie.ntu.edu.tw/~cjlin/papers/guide/guide.pdf
+Source3:        libsvm-svm-toy-gtk.desktop
+Source4:        libsvm-svm-toy-qt.desktop
+Source5:        LibSVM-svm-toy-48.png
 Patch0:         %{name}-%{version}.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -42,9 +45,10 @@
 %package python
 Summary:    Python tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  python-devel >= 2.4 gawk gnuplot
+BuildRequires:  python-devel >= 2.4 gawk
 #gnuplot is required by easy.py
 Requires:       %{name} = %{version}-%{release}
+Requires:       gnuplot
 
 %description python
 Python tools and interfaces for libsvm.
@@ -69,6 +73,7 @@
 Group:      Development/Libraries
 BuildRequires:  gtk2-devel
 BuildRequires:  gtk2
+BuildRequires:  desktop-file-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description svm-toy-gtk
@@ -80,6 +85,7 @@
 Group:      Development/Libraries
 BuildRequires:  qt-devel
 BuildRequires:  qt
+BuildRequires:  desktop-file-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description svm-toy-qt
@@ -89,8 +95,13 @@
 %prep
 %setup -q 
 %patch0 -p0 -b .bak 
-cp ../../SOURCES/log ChangeLog
-cp ../../SOURCES/guide.pdf .
+cp %{SOURCE1} ChangeLog
+cp %{SOURCE2} .
+cp %{SOURCE3} .
+cp %{SOURCE4} .
+cp %{SOURCE5} libsvm-svm-toy-gtk-48.png
+cp %{SOURCE5} libsvm-svm-toy-qt-48.png
+
 
 
 %build
@@ -109,12 +120,35 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}"
 #cd ${RPM_BUILD_ROOT}%{libdir_libsvm}; ln -sf %{name}.so.%{version} %{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+cp libsvm-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+cp libsvm-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+
+desktop-file-install --delete-original --vendor=fedora \
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-gtk.desktop \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-qt.desktop \
+
 
 
 %post -p /sbin/ldconfig
 
+%post svm-toy-gtk
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %postun -p /sbin/ldconfig
 
+%postun svm-toy-gtk
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -152,14 +186,23 @@
 %defattr(-,root,root,-)
 %doc svm-toy/gtk/README
 %{_bindir}/svm-toy-gtk
+%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-gtk-48.png
 
 %files svm-toy-qt
 %defattr(-,root,root,-)
 %doc svm-toy/qt/README
 %{_bindir}/svm-toy-qt
+%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-qt-48.png
 
 
 %changelog
+* Tue Feb 11 2008 Ding-Yi Chen  - 2.85-5
+- [Bug 436392]: Fix by copy from right place.
+-  Add desktop files and icons for svm-toy-gtk and svm-toy-qt
+
+* Tue Feb 11 2008 Ding-Yi Chen  - 2.85-4
+- Move gnuplot from BuildRequires to Requires
+
 * Thu Feb 07 2008 Ding-Yi Chen  - 2.85-3
 - Fix linker name (libsvm.so)
 - Linked to dynamic libraries



From fedora-extras-commits at redhat.com  Mon Mar 10 07:50:26 2008
From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen))
Date: Mon, 10 Mar 2008 07:50:26 GMT
Subject: rpms/libsvm/F-8 LibSVM-svm-toy-48.png, NONE,
	1.1 libsvm-svm-toy-gtk.desktop, NONE,
	1.1 libsvm-svm-toy-qt.desktop, NONE, 1.1 libsvm.spec, 1.13, 1.14
Message-ID: <200803100750.m2A7oQZN010506@cvs-int.fedora.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10468/F-8

Modified Files:
	libsvm.spec 
Added Files:
	LibSVM-svm-toy-48.png libsvm-svm-toy-gtk.desktop 
	libsvm-svm-toy-qt.desktop 
Log Message:
Fix [Bug 436392]


--- NEW FILE libsvm-svm-toy-gtk.desktop ---
[Desktop Entry]
Name=svm-toy-gtk
GenericName=svm-toy GTK version
Comment=GTK version of svm-toy (libsvm demostration program)
Exec=svm-toy-gtk
Icon=libsvm-svm-toy-gtk-48
StartupNotify=true
Terminal=false
Type=Application
Categories=GTK;Education;Science;Math;DataVisualization


--- NEW FILE libsvm-svm-toy-qt.desktop ---
[Desktop Entry]
Name=svm-toy-qt
GenericName=svm-toy QT version
Comment=QT version of svm-toy (libsvm demostration program)
Exec=svm-toy-qt
Icon=libsvm-svm-toy-qt-48
StartupNotify=true
Terminal=false
Type=Application
Categories=QT;Education;Science;Math;DataVisualization


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-8/libsvm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libsvm.spec	7 Feb 2008 05:14:23 -0000	1.13
+++ libsvm.spec	10 Mar 2008 07:49:46 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.85
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,6 +10,9 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
 Source2:        http://www.csie.ntu.edu.tw/~cjlin/papers/guide/guide.pdf
+Source3:        libsvm-svm-toy-gtk.desktop
+Source4:        libsvm-svm-toy-qt.desktop
+Source5:        LibSVM-svm-toy-48.png
 Patch0:         %{name}-%{version}.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -42,9 +45,10 @@
 %package python
 Summary:    Python tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  python-devel >= 2.4 gawk gnuplot
+BuildRequires:  python-devel >= 2.4 gawk
 #gnuplot is required by easy.py
 Requires:       %{name} = %{version}-%{release}
+Requires:       gnuplot
 
 %description python
 Python tools and interfaces for libsvm.
@@ -69,6 +73,7 @@
 Group:      Development/Libraries
 BuildRequires:  gtk2-devel
 BuildRequires:  gtk2
+BuildRequires:  desktop-file-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description svm-toy-gtk
@@ -80,6 +85,7 @@
 Group:      Development/Libraries
 BuildRequires:  qt-devel
 BuildRequires:  qt
+BuildRequires:  desktop-file-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description svm-toy-qt
@@ -89,8 +95,13 @@
 %prep
 %setup -q 
 %patch0 -p0 -b .bak 
-cp ../../SOURCES/log ChangeLog
-cp ../../SOURCES/guide.pdf .
+cp %{SOURCE1} ChangeLog
+cp %{SOURCE2} .
+cp %{SOURCE3} .
+cp %{SOURCE4} .
+cp %{SOURCE5} libsvm-svm-toy-gtk-48.png
+cp %{SOURCE5} libsvm-svm-toy-qt-48.png
+
 
 
 %build
@@ -109,12 +120,35 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}"
 #cd ${RPM_BUILD_ROOT}%{libdir_libsvm}; ln -sf %{name}.so.%{version} %{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+cp libsvm-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+cp libsvm-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+
+desktop-file-install --delete-original --vendor=fedora \
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-gtk.desktop \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-qt.desktop \
+
 
 
 %post -p /sbin/ldconfig
 
+%post svm-toy-gtk
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %postun -p /sbin/ldconfig
 
+%postun svm-toy-gtk
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -152,14 +186,23 @@
 %defattr(-,root,root,-)
 %doc svm-toy/gtk/README
 %{_bindir}/svm-toy-gtk
+%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-gtk-48.png
 
 %files svm-toy-qt
 %defattr(-,root,root,-)
 %doc svm-toy/qt/README
 %{_bindir}/svm-toy-qt
+%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-qt-48.png
 
 
 %changelog
+* Tue Feb 11 2008 Ding-Yi Chen  - 2.85-5
+- [Bug 436392]: Fix by copy from right place.
+-  Add desktop files and icons for svm-toy-gtk and svm-toy-qt
+
+* Tue Feb 11 2008 Ding-Yi Chen  - 2.85-4
+- Move gnuplot from BuildRequires to Requires
+
 * Thu Feb 07 2008 Ding-Yi Chen  - 2.85-3
 - Fix linker name (libsvm.so)
 - Linked to dynamic libraries



From fedora-extras-commits at redhat.com  Mon Mar 10 09:06:58 2008
From: fedora-extras-commits at redhat.com (Dave Airlie (airlied))
Date: Mon, 10 Mar 2008 09:06:58 GMT
Subject: rpms/xorg-x11-drv-amd/devel amd-pciaccess-fix.patch, NONE,
	1.1 xorg-x11-drv-amd.spec, 1.18, 1.19
Message-ID: <200803100906.m2A96w1f026039@cvs-int.fedora.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-amd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26004

Modified Files:
	xorg-x11-drv-amd.spec 
Added Files:
	amd-pciaccess-fix.patch 
Log Message:
* Mon Mar 10 2008 Dave Airlie  0.0-25.20080310
- resnapshot for pciaccess goodness


amd-pciaccess-fix.patch:

--- NEW FILE amd-pciaccess-fix.patch ---
diff --git a/src/amd_gx_driver.c b/src/amd_gx_driver.c
index 09ad47a..3c66d05 100644
--- a/src/amd_gx_driver.c
+++ b/src/amd_gx_driver.c
@@ -327,7 +327,7 @@ static inline void * map_pci_mem(ScrnInfoPtr pScrni, int vram,
   int map_size = size ? size : dev->regions[bar].size;
     
   int err = pci_device_map_range(dev,
-				 dev->regions[bar].base_addr
+				 dev->regions[bar].base_addr,
 				 map_size,
 				 PCI_DEV_MAP_FLAG_WRITABLE |
 				 (vram ? PCI_DEV_MAP_FLAG_WRITE_COMBINE : 0),
@@ -348,7 +348,7 @@ GXMapMem(ScrnInfoPtr pScrni)
   GeodeRec *pGeode = GEODEPTR(pScrni);
   int index = pScrni->scrnIndex;
 
-  pciVideoRec *pci = xf86GetPciInfoForEntity(pGeode->pEnt->index);
+  pciVideoPtr pci = xf86GetPciInfoForEntity(pGeode->pEnt->index);
 
 #ifndef XSERVER_LIBPCIACCESS
   gfx_virt_regptr = (unsigned char *)xf86MapVidMem(index, VIDMEM_MMIO,
diff --git a/src/amd_gx_randr.c b/src/amd_gx_randr.c
index a4fa743..96f3f5d 100644
--- a/src/amd_gx_randr.c
+++ b/src/amd_gx_randr.c
@@ -33,6 +33,7 @@
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86DDC.h"
+#include "xf86Module.h"
 #include "mipointer.h"
 #include "windowstr.h"
 #include 
@@ -40,7 +41,6 @@
 
 #include "amd.h"
 
-static int GXRandRIndex;
 static int GXRandRGeneration;
 
 typedef struct _GXRandRInfo
@@ -55,7 +55,20 @@ typedef struct _GXRandRInfo
     Rotation supported_rotations;      /* driver supported */
 } XF86RandRInfoRec, *XF86RandRInfoPtr;
 
-#define XF86RANDRINFO(p)    ((XF86RandRInfoPtr) (p)->devPrivates[GXRandRIndex].ptr)
+#define AMD_OLDPRIV (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
+
+#if AMD_OLDPRIV
+
+static int GXRandRIndex;
+#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) (p)->devPrivates[GXRandRIndex].ptr)
+#else
+
+static DevPrivateKey GXRandRKey;
+#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
+			  dixLookupPrivate(&(p)->devPrivates, GXRandRKey));
+
+
+#endif
 
 static int
 GXRandRModeRefresh(DisplayModePtr mode)
@@ -299,10 +312,15 @@ GXRandRInit(ScreenPtr pScreen, int rotation)
     rrScrPrivPtr rp;
 
     if (GXRandRGeneration != serverGeneration) {
-	GXRandRIndex = AllocateScreenPrivateIndex();
 	GXRandRGeneration = serverGeneration;
     }
 
+#if AMD_OLDPRIV
+    GXRandRIndex = AllocateScreenPrivateIndex();
+#else
+    GXRandRKey = &GXRandRKey;
+#endif
+
     pRandr = xcalloc(sizeof(XF86RandRInfoRec), 1);
     if (pRandr == NULL)
 	return FALSE;
@@ -326,6 +344,10 @@ GXRandRInit(ScreenPtr pScreen, int rotation)
     pRandr->supported_rotations = rotation;
     pRandr->maxX = pRandr->maxY = 0;
 
+#if AMD_OLDPRIV
     pScreen->devPrivates[GXRandRIndex].ptr = pRandr;
+#else
+    dixSetPrivate(&pScreen->devPrivates, GXRandRKey, pRandr);
+#endif
     return TRUE;
 }
diff --git a/src/amd_lx_driver.c b/src/amd_lx_driver.c
index 09882de..6acd09f 100644
--- a/src/amd_lx_driver.c
+++ b/src/amd_lx_driver.c
@@ -401,7 +401,7 @@ static inline void * map_pci_mem(ScrnInfoPtr pScrni, int vram,
   int map_size = size ? size : dev->regions[bar].size;
     
   int err = pci_device_map_range(dev,
-				 dev->regions[bar].base_addr
+				 dev->regions[bar].base_addr,
 				 map_size,
 				 PCI_DEV_MAP_FLAG_WRITABLE |
 				 (vram ? PCI_DEV_MAP_FLAG_WRITE_COMBINE : 0),
@@ -419,12 +419,14 @@ LXMapMem(ScrnInfoPtr pScrni)
     GeodeRec *pGeode = GEODEPTR(pScrni);
     int index = pScrni->scrnIndex;
     unsigned long cmd_bfr_phys;
+
+    pciVideoPtr pci = xf86GetPciInfoForEntity(pGeode->pEnt->index);
+
+#ifndef XSERVER_LIBPCIACCESS
     PCITAG tag;
 
-    pciVideoRec *pci = xf86GetPciInfoForEntity(pGeode->pEnt->index);
     tag = pciTag(pci->bus, pci->device, pci->func);
 
-#ifndef XSERVER_LIBPCIACCESS
     cim_gp_ptr = (unsigned char *)xf86MapPciMem(index, VIDMEM_MMIO,
 						tag, pci->memBase[1], LX_GP_REG_SIZE);
 
diff --git a/src/amd_lx_randr.c b/src/amd_lx_randr.c
index e46ae20..155eefa 100644
--- a/src/amd_lx_randr.c
+++ b/src/amd_lx_randr.c
@@ -40,7 +40,6 @@
 
 #include "amd.h"
 
-static int LXRandRIndex;
 static int LXRandRGeneration;
 
 typedef struct _LXRandRInfo
@@ -55,8 +54,20 @@ typedef struct _LXRandRInfo
     Rotation supported_rotations;      /* driver supported */
 } XF86RandRInfoRec, *XF86RandRInfoPtr;
 
+#define AMD_OLDPRIV (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
+#if AMD_OLDPRIV
+
+static int LXRandRIndex;
 #define XF86RANDRINFO(p) ((XF86RandRInfoPtr) (p)->devPrivates[LXRandRIndex].ptr)
 
+#else
+
+static DevPrivateKey LXRandRKey;
+#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
+			  dixLookupPrivate(&(p)->devPrivates, LXRandRKey));
+
+#endif
+
 static int
 LXRandRModeRefresh(DisplayModePtr mode)
 {
@@ -299,10 +310,15 @@ LXRandRInit(ScreenPtr pScreen, int rotation)
     rrScrPrivPtr rp;
 
     if (LXRandRGeneration != serverGeneration) {
-	LXRandRIndex = AllocateScreenPrivateIndex();
 	LXRandRGeneration = serverGeneration;
     }
 
+#if AMD_OLDPRIV
+    LXRandRIndex = AllocateScreenPrivateIndex();
+#else
+    LXRandRKey = &LXRandRKey;
+#endif
+
     pRandr = xcalloc(sizeof(XF86RandRInfoRec), 1);
     if (pRandr == NULL)
 	return FALSE;
@@ -326,6 +342,10 @@ LXRandRInit(ScreenPtr pScreen, int rotation)
     pRandr->supported_rotations = rotation;
     pRandr->maxX = pRandr->maxY = 0;
 
+#if AMD_OLDPRIV
     pScreen->devPrivates[LXRandRIndex].ptr = pRandr;
+#else
+    dixSetPrivate(&pScreen->devPrivates, LXRandRKey, pRandr);
+#endif
     return TRUE;
 }


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-drv-amd.spec	10 Mar 2008 06:40:49 -0000	1.18
+++ xorg-x11-drv-amd.spec	10 Mar 2008 09:05:55 -0000	1.19
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   25.%{gitdate}%{?dist}
+Release:   26.%{gitdate}%{?dist}
 URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
@@ -36,6 +36,7 @@
 %endif
 
 Patch0: lx-disable-compression.patch
+Patch1: amd-pciaccess-fix.patch
 
 %description 
 X.Org X11 AMD Geode video driver.
@@ -43,6 +44,7 @@
 %prep
 %setup -q -n %{tarball}-2.7.7.6
 %patch0 -p1 -b .jx
+%patch1 -p1 -b .pciaccess
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -77,6 +79,9 @@
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Mon Mar 10 2008 Dave Airlie  0.0-26.20080310
+- finally pciaccess build for AMD
+
 * Mon Mar 10 2008 Dave Airlie  0.0-25.20080310
 - resnapshot for pciaccess goodness
 



From fedora-extras-commits at redhat.com  Mon Mar 10 09:15:21 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano))
Date: Mon, 10 Mar 2008 09:15:21 GMT
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.43,1.44
Message-ID: <200803100915.m2A9FLMY026188@cvs-int.fedora.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-PDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26143

Modified Files:
	perl-PDL.spec 
Log Message:
Uncomment part of spec file fix build issue.



Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- perl-PDL.spec	9 Mar 2008 04:45:43 -0000	1.43
+++ perl-PDL.spec	10 Mar 2008 09:14:20 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -128,7 +128,7 @@
 %check
 unset DISPLAY
 export PERL5LIB=`pwd`/blib/lib
-# set PERL_DL_NONLAZY=0
+ set PERL_DL_NONLAZY=0
 #   The default behavior causes some problems because opengl.pd builds an interface for all functions
 #   defined in gl.h and glu.h even though they might not actually be in the opengl libraries.
 sed -i 's|PERL_DL_NONLAZY=1 $(FULLPERLRUN)|PERL_DL_NONLAZY=0 $(FULLPERLRUN)|g' Graphics/TriD/OpenGL/Makefile
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Marcela Maslanova  - 2.4.3-12
+- PERL_DL_NONLAZY=0 was uncommented in check part of spec.
+
 * Sat Mar 08 2008 Tom "spot" Callaway  - 2.4.3-11
 - PERL_DL_NONLAZY=0 for all the GL tests
 - don't run GL tests if DISPLAY is unset



From fedora-extras-commits at redhat.com  Mon Mar 10 09:34:39 2008
From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg))
Date: Mon, 10 Mar 2008 09:34:39 GMT
Subject: rpms/libmatchbox/devel Makefile, 1.2, 1.3 libmatchbox.spec, 1.3,
	1.4 sources, 1.3, 1.4 dead.package, 1.1, NONE
Message-ID: <200803100934.m2A9YdYC026556@cvs-int.fedora.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/libmatchbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26525/devel

Added Files:
	Makefile libmatchbox.spec sources 
Removed Files:
	dead.package 
Log Message:
Import from the F-7 branch



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	10 Mar 2008 09:33:51 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: libmatchbox
+# $Id$
+NAME := libmatchbox
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: libmatchbox.spec
===================================================================
RCS file: libmatchbox.spec
diff -N libmatchbox.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libmatchbox.spec	10 Mar 2008 09:33:51 -0000	1.4
@@ -0,0 +1,101 @@
+Summary:        Libraries for the Matchbox Desktop
+Name:           libmatchbox 
+Version:        1.9
+Release:        3%{?dist}
+Url:            http://projects.o-hand.com/matchbox/
+License:        LGPL
+Group:          Development/Libraries 
+Source:         http://projects.o-hand.com/matchbox/sources/libmatchbox/%{version}/%{name}-%{version}.tar.bz2
+BuildRequires:  pango-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libjpeg-devel
+Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+Matchbox is a base environment for the X Window System running on non-desktop
+embedded platforms such as handhelds, set-top boxes, kiosks and anything else
+for which screen space, input mechanisms or system resources are limited.
+
+%package devel
+Group:          Development/C
+Summary:        Static libraries and header files from %{name}
+Provides:       matchbox-devel = %{version}-%{release}
+Provides:       %{name}-devel = %{version}-%{release}
+Provides:       lib%{name}-devel = %{version}-%{release}
+Provides:       libmb-devel = %{version}-%{release}
+Requires:       libmatchbox = %{version}
+Requires:       pkgconfig
+
+%description devel
+Static libraries and header files from %{name}
+
+%prep
+%setup -q
+
+%build
+%configure --enable-png --enable-jpeg --enable-pango
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files 
+%defattr(-,root,root, -)
+%_libdir/*.so.*
+
+%files devel
+%defattr(-,root,root, -)
+%doc AUTHORS ChangeLog README COPYING
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so
+%dir %{_includedir}/libmb
+%{_includedir}/libmb/*.h
+
+%changelog
+* Tue Jun 19 2007 John (J5) Palmieri  1.9-3
+- Fixed License to be LGPL
+- Add COPYING license file to docs
+- Fixed Group
+- Fixed buildroot
+- Added {} braces around % macros
+- Removed .la and .a files 
+- Own {_includedir}/libmb directory
+- Add dist tag to release
+- Add smpflags  flag to make
+- Remove use of boken makeinstall macro
+ 
+* Mon Aug 21 2006 Marco Pesenti Gritti  1.9-2
+- Disable xsettings
+
+* Mon Aug 21 2006 Marco Pesenti Gritti  1.9-1
+- Update to 1.9
+
+* Thu May 12 2005 Austin Acton  1.7-1mdk
+- New release 1.7
+- fix URLs
+
+* Mon Jan 24 2005 Austin Acton  1.6-1mdk
+- 1.6
+
+* Tue Jan 4 2005 Austin Acton  1.5-1mdk
+- 1.5
+
+* Wed Sep 29 2004 Austin Acton  1.4-1mdk
+- 1.4
+
+* Mon Aug 23 2004 Austin Acton  1.3-1mdk
+- 1.3
+
+* Mon Jul 20 2004 Austin Acton  1.2-1mdk
+- initial package


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	10 Mar 2008 09:33:51 -0000	1.4
@@ -0,0 +1 @@
+9f73e7515cc4679171a5db180dc1343b  libmatchbox-1.9.tar.bz2


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 09:39:32 2008
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 10 Mar 2008 09:39:32 GMT
Subject: rpms/distcc/F-8 distcc.spec, NONE, 1.1 distccd.init, NONE,
	1.1 hosts.sample, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200803100939.m2A9dWqr026700@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/distcc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26671

Modified Files:
	.cvsignore sources 
Added Files:
	distcc.spec distccd.init hosts.sample 
Log Message:
Initial import


--- NEW FILE distcc.spec ---

Name:       distcc
Version:    2.18.3
Release:    4%{?dist}
Summary:    Distributed C/C++ compilation
Group:      Development/Tools
License:    GPLv2+
URL:        http://distcc.samba.org/
Source0:    http://distcc.samba.org/ftp/distcc/distcc-%{version}.tar.bz2
Source1:    hosts.sample
Source2:    distccd.init
Patch0:     distcc-2.18.3-avahi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: popt-devel
BuildRequires: libgnomeui-devel
BuildRequires: pango-devel
BuildRequires: python
BuildRequires: desktop-file-utils
BuildRequires: avahi-devel


%description
distcc is a program to distribute compilation of C or C++ code across
several machines on a network. distcc should always generate the same
results as a local compile, is simple to install and use, and is often
two or more times faster than a local compile.


%package     server
Summary:    Server for distributed C/C++ compilation
Group:      Development/Tools
License:    GPLv2+

Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig


%description server
This package contains the compilation server needed to use %{name}.


%prep
%setup -q
%patch0 -p1 -b .avahi


%build
%configure --with-gnome --with-docdir=%{_datadir}/doc/%{name}-%{version}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Move desktop file to right directory
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*.desktop $RPM_BUILD_ROOT%{_datadir}/applications/
sed -i 's at Icon=@Icon=%{_datadir}/%{name}/@' $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop

# Install sample hosts file
install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts

# Install sample distccd config file
install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/distccd

# Install distccd init file
install -Dm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/distccd


%post
update-desktop-database &> /dev/null ||:


%post server
[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||:


%preun server
[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||:


%postun
update-desktop-database &> /dev/null ||:


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name}-%{version}
%{_bindir}/distcc
%{_bindir}/distccmon*
%{_mandir}/man1/distcc.*
%{_mandir}/man1/distccmon*
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/hosts


%files server
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/distccd
%{_sysconfdir}/init.d/*
%{_mandir}/man1/distccd*
%config(noreplace) %{_sysconfdir}/sysconfig/distccd


%changelog
* Fri Feb 22 2008 Denis Leroy  - 2.18.3-4
- Added Avahi support patch from Lennart

* Tue Feb 19 2008 Denis Leroy  - 2.18.3-3
- LSB header for init script

* Mon Feb 18 2008 Denis Leroy  - 2.18.3-2
- Fixed Source0 URL, fixed init script

* Mon Feb  4 2008 Denis Leroy  - 2.18.3-1
- First version



--- NEW FILE distccd.init ---
#!/bin/sh
#
# distccd - A distributed compilation server.
#
#
# chkconfig: - 80 20
# description: distccd - distcc distributed compilation server
#

### BEGIN INIT INFO
# Provides: distccd
# Required-Start: $network $syslog $local_fs
# Required-Stop: $network $syslog $local_fs
# Default-Stop: 0 1 2 6 
# Short-Description: Distributed C/C++ Compilation Server
# Description: distcc is a program to distribute compilation of C or C++
#              code across several machines on a network. distcc should
#              always generate the same results as a local compile, is
#              simple to install and use, and is often two or more times
#              faster than a local compile.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/bin/distccd"
prog="distccd"

# Default variables
SYSCONFIG="/etc/sysconfig/distccd"
OPTIONS=""
USER="nobody"
DISTCCPATH="$PATH"

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
	[ -x $exec ] || exit 5
	[ -z "$OPTIONS" ] && exit 6
	echo -n $"Starting $prog: "
	DISTCCD_PATH="$DISTCCPATH" $prog --daemon --user "$USER" $OPTIONS && success || failure
	retval=$?
	echo
	[ $retval -eq 0 ] && touch $lockfile
	return $retval
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $prog
	retval=$?
	echo
	[ $retval -eq 0 ] && rm -f $lockfile
	return $retval
}

restart() {
	stop
	start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}

case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE hosts.sample ---
# The grammar of the host file is, informally:
#
#  DISTCC_HOSTS = HOSTSPEC ...
#  HOSTSPEC = LOCAL_HOST | SSH_HOST | TCP_HOST | OLDSTYLE_TCP_HOST
#  LOCAL_HOST = localhost[/LIMIT]
#  SSH_HOST = [USER]@HOSTID[/LIMIT][:COMMAND][OPTIONS]
#  TCP_HOST = HOSTID[:PORT][/LIMIT][OPTIONS]
#  OLDSTYLE_TCP_HOST = HOSTID[/LIMIT][:PORT][OPTIONS]
#  HOSTID = HOSTNAME | IPV4
#  OPTIONS = ,OPTION[OPTIONS]
#  OPTION = lzo


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/distcc/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2008 21:44:16 -0000	1.1
+++ .cvsignore	10 Mar 2008 09:38:48 -0000	1.2
@@ -0,0 +1 @@
+distcc-2.18.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/distcc/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2008 21:44:16 -0000	1.1
+++ sources	10 Mar 2008 09:38:48 -0000	1.2
@@ -0,0 +1 @@
+0d6b80a1efc3a3d816c4f4175f63eaa2  distcc-2.18.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 09:43:20 2008
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 10 Mar 2008 09:43:20 GMT
Subject: rpms/distcc/F-8 distcc-2.18.3-avahi.patch,NONE,1.1
Message-ID: <200803100943.m2A9hKEh026834@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/distcc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26814

Added Files:
	distcc-2.18.3-avahi.patch 
Log Message:
Avahi patch initial checkin

distcc-2.18.3-avahi.patch:

--- NEW FILE distcc-2.18.3-avahi.patch ---
--- distcc-2.18.3/Makefile.in	2004-10-24 07:05:48.000000000 +0200
+++ distcc-2.18.3.lennart/Makefile.in	2007-12-30 16:05:58.000000000 +0100
@@ -180,6 +180,7 @@ distcc_obj = src/backoff.o						\
 	src/ssh.o src/state.o src/strip.o				\
 	src/timefile.o src/traceenv.o					\
 	src/where.o							\
+	@ZEROCONF_DISTCC_OBJS@						\
 	$(common_obj)
 
 distccd_obj = src/access.o						\
@@ -187,6 +188,7 @@ distccd_obj = src/access.o						\
 	src/ncpus.o							\
 	src/prefork.o							\
 	src/serve.o src/setuid.o src/srvnet.o src/srvrpc.o src/state.o	\
+	@ZEROCONF_DISTCCD_OBJS@						\
 	$(common_obj) @BUILD_POPT@
 
 # Objects that need to be linked in to build monitors
--- distcc-2.18.3/src/distcc.c	2004-10-02 02:47:07.000000000 +0200
+++ distcc-2.18.3.lennart/src/distcc.c	2007-12-30 13:55:27.000000000 +0100
@@ -83,6 +83,9 @@ static void dcc_show_usage(void)
 "   COMPILER                   defaults to \"cc\"\n"
 "   --help                     explain usage and exit\n"
 "   --version                  show version and exit\n"
+"   --show-hosts               show host list and exit\n"
+"   -j                         calculate the concurrency level from\n"
+"                              the host list.\n"
 "\n"
 "Environment variables:\n"
 "   See the manual page for a complete list.\n"
@@ -135,7 +138,46 @@ static void dcc_client_catch_signals(voi
     signal(SIGHUP, &dcc_client_signalled);
 }
 
+static void dcc_free_hostlist(struct dcc_hostdef *list) {
+    while (list) {
+        struct dcc_hostdef *l = list;
+        list = list->next;
+        dcc_free_hostdef(l);
+    }
+}
+
+static void dcc_show_hosts(void) {
+    struct dcc_hostdef *list, *l;
+    int nhosts;
+    
+    if (dcc_get_hostlist(&list, &nhosts) != 0) {
+        rs_log_crit("Failed to get host list");
+        return;
+    }
+
+    for (l = list; l; l = l->next)
+        printf("%s\n", l->hostdef_string);
+
+    dcc_free_hostlist(list);
+}
+
+static void dcc_concurrency_level(void) {
+    struct dcc_hostdef *list, *l;
+    int nhosts;
+    int nslots = 0;
+    
+    if (dcc_get_hostlist(&list, &nhosts) != 0) {
+        rs_log_crit("Failed to get host list");
+        return;
+    }
+
+    for (l = list; l; l = l->next)
+        nslots += l->n_slots;
 
+    dcc_free_hostlist(list);
+
+    printf("%i\n", nslots);
+}
 
 /**
  * distcc client entry point.
@@ -182,6 +224,18 @@ int main(int argc, char **argv)
             ret = 0;
             goto out;
         }
+
+        if (!strcmp(argv[1], "--show-hosts")) {
+            dcc_show_hosts();
+            ret = 0;
+            goto out;
+        }
+
+        if (!strcmp(argv[1], "-j")) {
+            dcc_concurrency_level();
+            ret = 0;
+            goto out;
+        }
         
         dcc_find_compiler(argv, &compiler_args);
         /* compiler_args is now respectively either "cc -c hello.c" or
--- distcc-2.18.3/src/distcc.h	2004-11-21 19:36:30.000000000 +0100
+++ distcc-2.18.3.lennart/src/distcc.h	2007-12-30 13:55:27.000000000 +0100
@@ -112,7 +112,7 @@ int dcc_parse_hosts_env(struct dcc_hostd
                         int *ret_nhosts);
 int dcc_parse_hosts(const char *where, const char *source_name,
                     struct dcc_hostdef **ret_list,
-                    int *ret_nhosts);
+                    int *ret_nhosts, struct dcc_hostdef **ret_prev);
 
 /* ncpu.c */
 int dcc_ncpus(int *);
@@ -226,6 +226,7 @@ int dcc_get_tempdir(const char **);
 int dcc_make_tmpnam(const char *, const char *suffix, char **);
 
 int dcc_mkdir(const char *path) WARN_UNUSED;
+int dcc_get_subdir(const char *name, char **path_ret) WARN_UNUSED;
 int dcc_get_lock_dir(char **path_ret) WARN_UNUSED;
 int dcc_get_state_dir(char **path_ret) WARN_UNUSED;
 int dcc_get_top_dir(char **path_ret) WARN_UNUSED;
--- distcc-2.18.3/src/dopt.c	2004-10-24 07:05:48.000000000 +0200
+++ distcc-2.18.3.lennart/src/dopt.c	2007-12-30 13:55:27.000000000 +0100
@@ -93,6 +93,10 @@ enum {
     opt_log_level
 };
 
+#ifdef HAVE_AVAHI
+/* Flag for enabling/disabling Zeroconf using Avahi */
+int opt_zeroconf = 0;
+#endif
 
 const struct poptOption options[] = {
     { "allow", 'a',      POPT_ARG_STRING, 0, 'a', 0, 0 },
@@ -115,6 +119,9 @@ const struct poptOption options[] = {
     { "verbose", 0,      POPT_ARG_NONE, 0, 'v', 0, 0 },
     { "version", 0,      POPT_ARG_NONE, 0, 'V', 0, 0 },
     { "wizard", 'W',     POPT_ARG_NONE, 0, 'W', 0, 0 },
+#ifdef HAVE_AVAHI    
+    { "zeroconf", 0,     POPT_ARG_NONE, &opt_zeroconf, 0, 0, 0 },
+#endif    
     { 0, 0, 0, 0, 0, 0, 0 }
 };
 
@@ -137,6 +144,9 @@ static void distccd_show_usage(void)
 "    -p, --port PORT            TCP port to listen on\n"
 "    --listen ADDRESS           IP address to listen on\n"
 "    -a, --allow IP[/BITS]      client address access control\n"
+#ifdef HAVE_AVAHI
+"    --zeroconf                 register via mDNS/DNS-SD\n"
+#endif
 "  Debug and trace:\n"
 "    --log-level=LEVEL          set detail level for log file\n"
 "      levels: critical, error, warning, notice, info, debug\n"
--- distcc-2.18.3/src/dopt.h	2004-07-30 03:12:13.000000000 +0200
+++ distcc-2.18.3.lennart/src/dopt.h	2007-12-30 13:55:27.000000000 +0100
@@ -38,3 +38,7 @@ extern int opt_log_stderr;
 extern int opt_lifetime;
 extern char *opt_listen_addr;
 extern int opt_niceness;
+
+#ifdef HAVE_AVAHI
+extern int opt_zeroconf;
+#endif
--- distcc-2.18.3/src/dparent.c	2004-10-24 07:05:48.000000000 +0200
+++ distcc-2.18.3.lennart/src/dparent.c	2007-12-30 13:55:27.000000000 +0100
@@ -70,6 +70,7 @@
 #include "types.h"
 #include "daemon.h"
 #include "netutil.h"
+#include "zeroconf.h"
 
 static void dcc_nofork_parent(int listen_fd) NORETURN;
 static void dcc_detach(void);
@@ -94,6 +95,9 @@ int dcc_standalone_server(void)
     int listen_fd;
     int n_cpus;
     int ret;
+#ifdef HAVE_AVAHI
+    void *avahi = NULL;
+#endif
 
     if ((ret = dcc_socket_listen(arg_port, &listen_fd, opt_listen_addr)) != 0)
         return ret;
@@ -131,6 +135,14 @@ int dcc_standalone_server(void)
     /* Don't catch signals until we've detached or created a process group. */
     dcc_daemon_catch_signals();
 
+#ifdef HAVE_AVAHI      
+    /* Zeroconf registration */
+    if (opt_zeroconf) {
+        if (!(avahi = dcc_zeroconf_register((uint16_t) arg_port, n_cpus)))
+            return EXIT_CONNECT_FAILED;
+    }
+#endif
+        
     /* This is called in the master daemon, whether that is detached or
      * not.  */
     dcc_master_pid = getpid();
@@ -138,10 +150,21 @@ int dcc_standalone_server(void)
     if (opt_no_fork) {
         dcc_log_daemon_started("non-forking daemon");   
         dcc_nofork_parent(listen_fd);
+        ret = 0;
     } else {
[...11704 lines suppressed...]
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
 
-# This sed command replaces #undef with comments.  This is necessary, for
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments.  This is necessary, for
 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
 _ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
   rm -f conftest.defines
   mv conftest.tail conftest.defines
 done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
+rm -f conftest.defines conftest.tail
 
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
 cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
   if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
       rm -f $ac_file
-      mv $tmp/config.h $ac_file
+      mv "$tmp/config.h" $ac_file
     fi
   else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
+    echo "/* $configure_input  */"
+    cat "$ac_result"
   fi
-done
-_ACEOF
+  rm -f "$tmp/out12"
+ ;;
+
+
+  esac
+
+done # for ac_tag
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
 _ACEOF



From fedora-extras-commits at redhat.com  Mon Mar 10 09:44:24 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 09:44:24 GMT
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch,
	NONE, 1.1 openoffice.org.spec, 1.1442, 1.1443
Message-ID: <200803100944.m2A9iOoV026910@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26877

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch 
Log Message:
Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch

openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch:

--- NEW FILE openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch ---
Index: source/msole/olepersist.cxx
===================================================================
RCS file: /cvs/framework/embeddedobj/source/msole/olepersist.cxx,v
retrieving revision 1.36
diff -u -r1.36 olepersist.cxx
--- openoffice.org.orig/embeddedobj/source/msole/olepersist.cxx	6 Jul 2007 10:10:50 -0000	1.36
+++ openoffice.org/embeddedobj/source/msole/olepersist.cxx	10 Mar 2008 09:35:36 -0000
@@ -664,8 +664,8 @@
 
 	for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
 	{
-		::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
-		aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+		::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) + 
+			::rtl::OUString::valueOf( (sal_Int32)nInd );
 		if ( xNameContainer->hasByName( aStreamName ) )
 			xNameContainer->removeByName( aStreamName );
 	}
@@ -737,8 +737,8 @@
 				{
 					for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ )
 					{
-						::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
-						aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+						::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) +
+							::rtl::OUString::valueOf( (sal_Int32)nInd );
 						try
 						{
 							bExists = xNameContainer->hasByName( aStreamName );
@@ -787,8 +787,8 @@
 		{
 			for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
 			{
-				::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
-				aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+				::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) +
+					rtl::OUString::valueOf( (sal_Int32)nInd );
 				uno::Reference< io::XStream > xCachedCopyStream;
 				try
 				{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1442
retrieving revision 1.1443
diff -u -r1.1442 -r1.1443
--- openoffice.org.spec	9 Mar 2008 20:25:48 -0000	1.1442
+++ openoffice.org.spec	10 Mar 2008 09:43:36 -0000	1.1443
@@ -144,6 +144,7 @@
 Patch70: openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
 Patch71: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
 Patch72: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch73: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1101,6 +1102,7 @@
 %patch70 -p1 -b .ooo86123.ucb.newneon.patch
 %patch71 -p1 -b .ooo86080.unopkg.bodge.patch
 %patch72 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch73 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2875,6 +2877,7 @@
 - next release candidate
 - rhbz#293791 Restore draw back to the menus and revert to upstream app names
 - drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
 
 * Thu Mar 06 2008 Caolan McNamara  - 1:2.4.0-9.1
 - next release candidate



From fedora-extras-commits at redhat.com  Mon Mar 10 09:48:35 2008
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Mar 2008 09:48:35 GMT
Subject: rpms/uim/devel .cvsignore, 1.19, 1.20 sources, 1.18, 1.19 uim.spec, 
	1.52, 1.53
Message-ID: <200803100948.m2A9mZhL027069@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27031

Modified Files:
	.cvsignore sources uim.spec 
Log Message:
* Wed Mar  5 2008 Akira TAGOH  - 1.4.2-1
- New upstream release.
- Remove patches because of no longer needed.
  - uim-1.4.1-m17n-not-list-nil-im.patch
  - uim-1.4.1-gcc43.patch
- Remove libgcroots.so.* (#436751)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	19 Mar 2007 09:46:03 -0000	1.19
+++ .cvsignore	10 Mar 2008 09:48:01 -0000	1.20
@@ -19,3 +19,4 @@
 uim-1.3.0.tar.bz2
 uim-1.4.0.tar.bz2
 uim-1.4.1.tar.bz2
+uim-1.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	19 Mar 2007 09:46:03 -0000	1.18
+++ sources	10 Mar 2008 09:48:01 -0000	1.19
@@ -1 +1 @@
-f2d0da38626e0d96116e7bd72a0bc596  uim-1.4.1.tar.bz2
+f5ac910cfa668343c73ca93e314d80ba  uim-1.4.2.tar.bz2


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- uim.spec	31 Jan 2008 07:39:54 -0000	1.52
+++ uim.spec	10 Mar 2008 09:48:01 -0000	1.53
@@ -2,8 +2,8 @@
 %define uninst_xinput alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 
 Name:		uim
-Version:	1.4.1
-Release:	11%{?dist}
+Version:	1.4.2
+Release:	1%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -26,8 +26,6 @@
 Source0:	http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:	xinput.d-uim
 Source2:	uim-init.el
-Patch0:		uim-1.4.1-m17n-not-list-nil-im.patch
-Patch1:		uim-1.4.1-gcc43.patch
 
 
 Summary:	A multilingual input method library
@@ -170,8 +168,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .m17n-nil
-%patch1 -p1 -b .gcc43
 
 
 %build
@@ -193,9 +189,8 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/uim/plugin/*la
 rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
-rm -f $RPM_BUILD_ROOT%{_includedir}/gcroots.h
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcroots.*
 rm -rf $RPM_BUILD_ROOT%{_includedir}/sigscheme
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcroots.a
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sigscheme
 rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm
 
@@ -387,6 +382,13 @@
 %dir %{_datadir}/uim
 
 %changelog
+* Wed Mar  5 2008 Akira TAGOH  - 1.4.2-1
+- New upstream release.
+- Remove patches because of no longer needed.
+  - uim-1.4.1-m17n-not-list-nil-im.patch
+  - uim-1.4.1-gcc43.patch
+- Remove libgcroots.so.* (#436751)
+
 * Thu Jan 31 2008 Akira TAGOH  - 1.4.1-11
 - Use full path to bring up XIM server.
 - uim-1.4.1-gcc43.patch: Fix a build fail with gcc-4.3.



From fedora-extras-commits at redhat.com  Mon Mar 10 09:52:02 2008
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 10 Mar 2008 09:52:02 GMT
Subject: rpms/kdelibs3/devel kdelibs-3.5.9-kate-regression.patch, NONE,
	1.1 kdelibs3.spec, 1.19, 1.20
Message-ID: <200803100952.m2A9q2Tm027245@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.9-kate-regression.patch 
Log Message:
- apply upstream patch to fix regression in kate (bz#436384)


kdelibs-3.5.9-kate-regression.patch:

--- NEW FILE kdelibs-3.5.9-kate-regression.patch ---
--- 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/08 14:17:43	772352
+++ 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:02:18	777286
@@ -186,7 +186,7 @@
 {
   if (newLine)
   {
-    if (m_line > int(line) || (m_line == int(line) && m_col > int(col)))
+    if (m_line > int(line) || (m_line == int(line) && m_col >= int(col)))
     {
       if(m_line == int(line))
          m_col -= col;


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kdelibs3.spec	4 Mar 2008 23:07:30 -0000	1.19
+++ kdelibs3.spec	10 Mar 2008 09:51:15 -0000	1.20
@@ -23,7 +23,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -79,6 +79,7 @@
 Patch103: kdelibs-3.5.0-101956.patch
 
 ## upstream patches
+Patch200: kdelibs-3.5.9-kate-regression.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -244,6 +245,7 @@
 %patch102 -p0 -b .kde#137675
 
 # upstream patches
+%patch200 -p1 -b .kate-regression
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -571,6 +573,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Than Ngo  3.5.9-5
+- apply upstream patch to fix regression in kate (bz#436384)
+
 * Tue Mar 04 2008 Kevin Kofler  - 3.5.9-4
 - hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 09:52:15 2008
From: fedora-extras-commits at redhat.com (Tomas Bzatek (tbzatek))
Date: Mon, 10 Mar 2008 09:52:15 GMT
Subject: rpms/nautilus/F-8 fm_properties_owner_change_crash.patch, NONE,
	1.1 nautilus.spec, 1.175, 1.176
Message-ID: <200803100952.m2A9qFP8027265@cvs-int.fedora.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27190

Modified Files:
	nautilus.spec 
Added Files:
	fm_properties_owner_change_crash.patch 
Log Message:
* Fri Mar  7 2008 - Tomas Bzatek  - 2.20.0-9
- Fix Properties window owner change crash (#432249)


fm_properties_owner_change_crash.patch:

--- NEW FILE fm_properties_owner_change_crash.patch ---
Index: src/file-manager/fm-properties-window.c
===================================================================
--- src/file-manager/fm-properties-window.c	(revision 13898)
+++ src/file-manager/fm-properties-window.c	(working copy)
@@ -2067,7 +2068,9 @@
 	g_assert (NAUTILUS_IS_FILE (file));
 
 	owner_text = combo_box_get_active_entry (combo_box, 0);
-	name_array = g_strsplit (owner_text, " - ", 2);
+        if (! owner_text)
+	    return;
+    	name_array = g_strsplit (owner_text, " - ", 2);
 	new_owner = name_array[0];
 	g_free (owner_text);
 	cur_owner = nautilus_file_get_owner_name (file);


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-8/nautilus.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- nautilus.spec	21 Feb 2008 14:45:30 -0000	1.175
+++ nautilus.spec	10 Mar 2008 09:51:25 -0000	1.176
@@ -18,7 +18,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.20.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
@@ -90,6 +90,9 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=430333
 Patch10:	nautilus-2.20.0-92_from_svn_no_buggy_signal_handler.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=432249
+Patch11:	fm_properties_owner_change_crash.patch
+
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -128,6 +131,7 @@
 %patch8 -p1 -b .small-font-fix
 %patch9 -p0 -b .audio-preview
 %patch10 -p1 -b .stuck-segfault
+%patch11 -p0 -b .ownerchange
 
 %build
 
@@ -236,6 +240,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Mar  7 2008 - Tomas Bzatek  - 2.20.0-9
+- Fix Properties window owner change crash (#432249)
+
 * Thu Feb 21 2008 - Tomas Bzatek  - 2.20.0-8
 - Fix "(USER): debug log dumped due to signal 11" loop (#430333)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 09:54:36 2008
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 10 Mar 2008 09:54:36 GMT
Subject: rpms/kdelibs/F-8 kdelibs-3.5.9-kate-regression.patch, NONE,
	1.1 kdelibs.spec, 1.250, 1.251
Message-ID: <200803100954.m2A9sam2027441@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27416

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.9-kate-regression.patch 
Log Message:
apply upstream patch to fix regression in kate (bz#436384)


kdelibs-3.5.9-kate-regression.patch:

--- NEW FILE kdelibs-3.5.9-kate-regression.patch ---
--- 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/08 14:17:43	772352
+++ 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:02:18	777286
@@ -186,7 +186,7 @@
 {
   if (newLine)
   {
-    if (m_line > int(line) || (m_line == int(line) && m_col > int(col)))
+    if (m_line > int(line) || (m_line == int(line) && m_col >= int(col)))
     {
       if(m_line == int(line))
          m_col -= col;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-8/kdelibs.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- kdelibs.spec	4 Mar 2008 23:10:00 -0000	1.250
+++ kdelibs.spec	10 Mar 2008 09:53:58 -0000	1.251
@@ -23,7 +23,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -79,6 +79,7 @@
 Patch103: kdelibs-3.5.0-101956.patch
 
 ## upstream patches
+Patch200: kdelibs-3.5.9-kate-regression.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -244,6 +245,7 @@
 %patch102 -p0 -b .kde#137675
 
 # upstream patches
+%patch200 -p1 -b .kate-regression
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -571,6 +573,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Than Ngo  3.5.9-5
+- apply upstream patch to fix regression in kate (bz#436384)
+
 * Tue Mar 04 2008 Kevin Kofler  - 3.5.9-4
 - hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 09:56:28 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 09:56:28 GMT
Subject: rpms/liboil/devel liboil-0.3.13-disable-altivec.patch, NONE,
	1.1 liboil.spec, 1.28, 1.29 liboil-0.3.12-altivec-sigill-2.patch,
	1.1, NONE liboil-0.3.12-altivec-sigill.patch, 1.2,
	NONE liboil-0.3.12-disable-altivec.patch, 1.2,
	NONE liboil-0.3.12-ppc64-configure.patch, 1.1,
	NONE liboil-0.3.3-gccoptfixes.patch, 1.1, NONE
Message-ID: <200803100956.m2A9uSep027523@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/liboil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27481

Modified Files:
	liboil.spec 
Added Files:
	liboil-0.3.13-disable-altivec.patch 
Removed Files:
	liboil-0.3.12-altivec-sigill-2.patch 
	liboil-0.3.12-altivec-sigill.patch 
	liboil-0.3.12-disable-altivec.patch 
	liboil-0.3.12-ppc64-configure.patch 
	liboil-0.3.3-gccoptfixes.patch 
Log Message:
* Mon Mar 10 2008 - Bastien Nocera  - 0.3.13-4
- Try disabling Altivec for now


liboil-0.3.13-disable-altivec.patch:

--- NEW FILE liboil-0.3.13-disable-altivec.patch ---
--- liboil-0.3.13/configure.orig	2008-03-10 09:49:04.000000000 +0000
+++ liboil-0.3.13/configure	2008-03-10 09:49:42.000000000 +0000
@@ -15519,7 +15519,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  flag_ok=yes
+  flag_ok=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -16266,7 +16266,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  flag_ok=yes
+  flag_ok=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5


Index: liboil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- liboil.spec	27 Feb 2008 01:35:19 -0000	1.28
+++ liboil.spec	10 Mar 2008 09:55:22 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 # See COPYING which details everything, various BSD licenses apply
 License: BSD
 Group: System Environment/Libraries
@@ -9,21 +9,9 @@
 Source: http://liboil.freedesktop.org/download/liboil-%{version}.tar.gz
 
 Patch1: liboil-0.3.13-s390.patch
-# PPC64 isn't being detected properly
-# http://bugzilla.redhat.com/242418
-# Patch2: liboil-0.3.12-ppc64-configure.patch
-
-# Disable PPC altogether, as oil_prototype_from_string() crashes in malloc
-# otherwise
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c16
-#Patch2: liboil-0.3.12-disable-altivec.patch
-
-# Fix SIGILL handling for CPU tests
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179
-#Patch3: liboil-0.3.12-altivec-sigill.patch
-#Patch4: liboil-0.3.12-altivec-sigill-2.patch
+Patch2: liboil-0.3.13-disable-altivec.patch
 # from upstream git
-Patch5: clobber-ecx.patch
+Patch3: clobber-ecx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
@@ -53,12 +41,8 @@
 %prep
 %setup -q
 %patch1 -p1 -b .s390
-#%patch2 -p0 -b .ppc64
-#pushd liboil
-#%patch3 -p0 -b .altivec
-#%patch4 -p0 -b .altivec2
-#popd
-%patch5 -p1 -b .clobber-ecx
+%patch2 -p1 -b .disable-altivec
+%patch3 -p1 -b .clobber-ecx
 
 # Disable Altivec, so that liboil doesn't SIGILL on non-Altivec PPCs
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c15
@@ -106,6 +90,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 - Bastien Nocera  - 0.3.13-4
+- Try disabling Altivec for now
+
 * Tue Feb 26 2008 Matthias Clasen   - 0.3.13-3
 - Use the upstream fix instead
 


--- liboil-0.3.12-altivec-sigill-2.patch DELETED ---


--- liboil-0.3.12-altivec-sigill.patch DELETED ---


--- liboil-0.3.12-disable-altivec.patch DELETED ---


--- liboil-0.3.12-ppc64-configure.patch DELETED ---


--- liboil-0.3.3-gccoptfixes.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 09:59:33 2008
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 10 Mar 2008 09:59:33 GMT
Subject: rpms/kdelibs/F-7 kdelibs-3.5.9-kate-regression.patch, NONE,
	1.1 kdelibs.spec, 1.232, 1.233
Message-ID: <200803100959.m2A9xXA9027687@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27643

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.9-kate-regression.patch 
Log Message:
apply upstream patch to fix regression in kate (bz#436384)


kdelibs-3.5.9-kate-regression.patch:

--- NEW FILE kdelibs-3.5.9-kate-regression.patch ---
--- 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/08 14:17:43	772352
+++ 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:02:18	777286
@@ -186,7 +186,7 @@
 {
   if (newLine)
   {
-    if (m_line > int(line) || (m_line == int(line) && m_col > int(col)))
+    if (m_line > int(line) || (m_line == int(line) && m_col >= int(col)))
     {
       if(m_line == int(line))
          m_col -= col;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- kdelibs.spec	4 Mar 2008 23:09:52 -0000	1.232
+++ kdelibs.spec	10 Mar 2008 09:58:58 -0000	1.233
@@ -23,7 +23,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -79,6 +79,7 @@
 Patch103: kdelibs-3.5.0-101956.patch
 
 ## upstream patches
+Patch200: kdelibs-3.5.9-kate-regression.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -244,6 +245,7 @@
 %patch102 -p0 -b .kde#137675
 
 # upstream patches
+%patch200 -p1 -b .kate-regression
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -571,6 +573,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Than Ngo  3.5.9-5
+- apply upstream patch to fix regression in kate (bz#436384)
+
 * Tue Mar 04 2008 Kevin Kofler  - 3.5.9-4
 - hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 09:59:55 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Mar 2008 09:59:55 GMT
Subject: rpms/halevt/devel .cvsignore, 1.2, 1.3 halevt.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200803100959.m2A9xtZc027728@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	.cvsignore halevt.spec sources 
Log Message:
* Mon Mar 10 2008 Patrice Dumas  0.0.8-1
- update to 0.0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/halevt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2008 00:38:26 -0000	1.2
+++ .cvsignore	10 Mar 2008 09:59:20 -0000	1.3
@@ -1 +1 @@
-halevt-0.0.7.tar.gz
+halevt-0.0.8.tar.gz


Index: halevt.spec
===================================================================
RCS file: /cvs/extras/rpms/halevt/devel/halevt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- halevt.spec	19 Feb 2008 18:16:35 -0000	1.2
+++ halevt.spec	10 Mar 2008 09:59:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           halevt
-Version:        0.0.7
-Release:        2%{?dist}
+Version:        0.0.8
+Release:        1%{?dist}
 Summary:        Generic handler for HAL events
 
 Group:          Applications/System
@@ -84,6 +84,9 @@
 %dir %attr(755,halevt,halevt) %{_localstatedir}/lib/halevt
 
 %changelog
+* Mon Mar 10 2008 Patrice Dumas  0.0.8-1
+- update to 0.0.8
+
 * Tue Feb 19 2008 Fedora Release Engineering  - 0.0.7-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/halevt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2008 00:38:26 -0000	1.2
+++ sources	10 Mar 2008 09:59:20 -0000	1.3
@@ -1 +1 @@
-15a541bc0747dbb0a58daeb80ecf5e7f  halevt-0.0.7.tar.gz
+4c1342f86100d96c8cf5f040349b3767  halevt-0.0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 10:05:52 2008
From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch))
Date: Mon, 10 Mar 2008 10:05:52 GMT
Subject: rpms/gdb/devel gdb-6.6-buildid-locate.patch, 1.9, 1.10 gdb.spec,
	1.273, 1.274
Message-ID: <200803101005.m2AA5qaH002570@cvs-int.fedora.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2532

Modified Files:
	gdb-6.6-buildid-locate.patch gdb.spec 
Log Message:
* Mon Mar 10 2008 Jan Kratochvil  - 6.7.50.20080227-3
- build-id warnings integrated more with rpm and the lists of the warnings got
  replaced usually by a single-line `debuginfo-install' advice.
  - FIXME: Testsuite needs an update for the new pre-prompt messages.
- Fix the `--with upstream' compilation - gstack/pstack are now omitted.


gdb-6.6-buildid-locate.patch:

Index: gdb-6.6-buildid-locate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb-6.6-buildid-locate.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gdb-6.6-buildid-locate.patch	3 Mar 2008 16:13:47 -0000	1.9
+++ gdb-6.6-buildid-locate.patch	10 Mar 2008 10:05:44 -0000	1.10
@@ -16,16 +16,22 @@
 2008-02-21  Jan Kratochvil  
 	Rename `debug build-id' to `build-id-verbose'.
 	Provide its level 0 to disable the build-id messages.
+	New description of `build-id-verbose' in the documentation.
 	Resolve the RH Bug 432164.
 
 2008-02-24  Jan Kratochvil  
 
 	Port to GDB-6.8pre.
 
+2008-03-09  Jan Kratochvil  
+
+	Implement the `debuginfo-install' rpm/yum integration.
+	Resolve the RH Bug 435581.
+
 Index: gdb-6.7.50.20080227/gdb/Makefile.in
 ===================================================================
---- gdb-6.7.50.20080227.orig/gdb/Makefile.in	2008-03-01 10:30:49.000000000 +0100
-+++ gdb-6.7.50.20080227/gdb/Makefile.in	2008-03-01 10:38:01.000000000 +0100
+--- gdb-6.7.50.20080227.orig/gdb/Makefile.in	2008-03-10 00:48:52.000000000 +0100
++++ gdb-6.7.50.20080227/gdb/Makefile.in	2008-03-10 00:48:53.000000000 +0100
 @@ -392,7 +392,7 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcode
  CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
  	$(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
@@ -45,6 +51,15 @@
  core-regset.o: core-regset.c $(defs_h) $(command_h) $(gdbcore_h) \
  	$(inferior_h) $(target_h) $(regcache_h) $(gdb_string_h) $(gregset_h)
  cp-abi.o: cp-abi.c $(defs_h) $(value_h) $(cp_abi_h) $(command_h) $(gdbcmd_h) \
+@@ -2117,7 +2118,7 @@ event-loop.o: event-loop.c $(defs_h) $(e
+ event-top.o: event-top.c $(defs_h) $(top_h) $(inferior_h) $(target_h) \
+ 	$(terminal_h) $(event_loop_h) $(event_top_h) $(interps_h) \
+ 	$(exceptions_h) $(cli_script_h) $(gdbcmd_h) $(readline_h) \
+-	$(readline_history_h)
++	$(readline_history_h) $(symfile_h)
+ exceptions.o: exceptions.c $(defs_h) $(exceptions_h) $(breakpoint_h) \
+ 	$(target_h) $(inferior_h) $(annotate_h) $(ui_out_h) $(gdb_assert_h) \
+ 	$(gdb_string_h) $(serial_h)
 @@ -2884,7 +2885,8 @@ symfile.o: symfile.c $(defs_h) $(bfdlink
  	$(gdb_stabs_h) $(gdb_obstack_h) $(completer_h) $(bcache_h) \
  	$(hashtab_h) $(readline_h) $(gdb_assert_h) $(block_h) \
@@ -55,10 +70,19 @@
  symfile-mem.o: symfile-mem.c $(defs_h) $(symtab_h) $(gdbcore_h) \
  	$(objfiles_h) $(exceptions_h) $(gdbcmd_h) $(target_h) $(value_h) \
  	$(symfile_h) $(observer_h) $(auxv_h) $(elf_common_h)
+@@ -3325,7 +3327,7 @@ tui-hooks.o: $(srcdir)/tui/tui-hooks.c $
+ tui-interp.o: $(srcdir)/tui/tui-interp.c $(defs_h) $(interps_h) $(top_h) \
+ 	$(event_top_h) $(event_loop_h) $(ui_out_h) $(cli_out_h) \
+ 	$(tui_data_h) $(readline_h) $(tui_win_h) $(tui_h) $(tui_io_h) \
+-	$(exceptions_h)
++	$(exceptions_h) $(symfile_h)
+ 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-interp.c
+ tui-io.o: $(srcdir)/tui/tui-io.c $(defs_h) $(target_h) \
+ 	$(event_loop_h) $(event_top_h) $(command_h) $(top_h) $(tui_h) \
 Index: gdb-6.7.50.20080227/gdb/corelow.c
 ===================================================================
 --- gdb-6.7.50.20080227.orig/gdb/corelow.c	2008-02-09 14:45:33.000000000 +0100
-+++ gdb-6.7.50.20080227/gdb/corelow.c	2008-03-01 10:30:50.000000000 +0100
++++ gdb-6.7.50.20080227/gdb/corelow.c	2008-03-10 00:49:19.000000000 +0100
 @@ -45,6 +45,10 @@
  #include "exceptions.h"
  #include "solib.h"
@@ -76,7 +100,7 @@
  
 +static int build_id_core_loads = 1;
 +
-+static void 
++static void
 +build_id_locate_exec (int from_tty)
 +{
 +  CORE_ADDR at_entry;
@@ -98,7 +122,7 @@
 +  if (exec_filename != NULL)
 +    exec_file_attach (exec_filename, from_tty);
 +  else
-+    build_id_print_missing (_("the main executable file"), build_id_filename);
++    debug_print_missing (_("the main executable file"), build_id_filename);
 +  xfree (build_id_filename);
 +
 +  /* `.note.gnu.build-id' section exists even for files without a separate
@@ -115,7 +139,7 @@
 +	symbol_file_add_main (exec_filename, from_tty);
 +      /* For EXEC_FILENAME NULL we were already complaining above.  */
 +      if (symfile_objfile == NULL && exec_filename != NULL)
-+	build_id_print_missing (exec_filename, build_id_filename);
++	debug_print_missing (exec_filename, build_id_filename);
 +    }
 +  xfree (build_id_filename);
 +
@@ -157,8 +181,8 @@
  }
 Index: gdb-6.7.50.20080227/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.7.50.20080227.orig/gdb/doc/gdb.texinfo	2008-03-01 10:30:50.000000000 +0100
-+++ gdb-6.7.50.20080227/gdb/doc/gdb.texinfo	2008-03-01 10:38:02.000000000 +0100
+--- gdb-6.7.50.20080227.orig/gdb/doc/gdb.texinfo	2008-03-10 00:48:52.000000000 +0100
++++ gdb-6.7.50.20080227/gdb/doc/gdb.texinfo	2008-03-10 00:49:42.000000000 +0100
 @@ -12208,6 +12208,27 @@ information files.
  
  @end table
@@ -167,7 +191,7 @@
 +
 + at table @code
 +
-+ at kindex set build-id-verbose 
++ at kindex set build-id-verbose
 + at item set build-id-verbose 0
 +No additional messages are printed.
 +
@@ -187,10 +211,40 @@
  @cindex @code{.gnu_debuglink} sections
  @cindex debug link sections
  A debug link is a special section of the executable file named
+Index: gdb-6.7.50.20080227/gdb/event-top.c
+===================================================================
+--- gdb-6.7.50.20080227.orig/gdb/event-top.c	2008-01-01 23:53:09.000000000 +0100
++++ gdb-6.7.50.20080227/gdb/event-top.c	2008-03-10 00:48:53.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include 
+ #include "exceptions.h"
+ #include "cli/cli-script.h"     /* for reset_command_nest_depth */
++#include "symfile.h"
+ 
+ /* For dont_repeat() */
+ #include "gdbcmd.h"
+@@ -192,6 +193,8 @@ cli_command_loop (void)
+       char *a_prompt;
+       char *gdb_prompt = get_prompt ();
+ 
++      debug_flush_missing ();
++
+       /* Tell readline what the prompt to display is and what function it
+          will need to call after a whole line is read. This also displays
+          the first prompt. */
+@@ -263,6 +266,8 @@ display_gdb_prompt (char *new_prompt)
+   /* Reset the nesting depth used when trace-commands is set.  */
+   reset_command_nest_depth ();
+ 
++  debug_flush_missing ();
++
+   /* Each interpreter has its own rules on displaying the command
+      prompt.  */
+   if (!current_interp_display_prompt_p ())
 Index: gdb-6.7.50.20080227/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.7.50.20080227.orig/gdb/solib-svr4.c	2008-03-01 10:30:48.000000000 +0100
-+++ gdb-6.7.50.20080227/gdb/solib-svr4.c	2008-03-01 10:30:50.000000000 +0100
+--- gdb-6.7.50.20080227.orig/gdb/solib-svr4.c	2008-03-10 00:48:51.000000000 +0100
++++ gdb-6.7.50.20080227/gdb/solib-svr4.c	2008-03-10 00:48:53.000000000 +0100
 @@ -967,9 +967,34 @@ svr4_current_sos (void)
  		free_so (new);
  	      else
@@ -220,8 +274,8 @@
 +			  xfree (name);
 +			}
 +		      else
-+			build_id_print_missing (new->so_name,
-+						build_id_filename);
++			debug_print_missing (new->so_name, build_id_filename);
++
 +		      xfree (build_id_filename);
 +		      xfree (build_id);
 +		    }
@@ -231,8 +285,8 @@
  		      fprintf_unfiltered (gdb_stdlog, 
 Index: gdb-6.7.50.20080227/gdb/symfile.c
 ===================================================================
---- gdb-6.7.50.20080227.orig/gdb/symfile.c	2008-03-01 10:30:48.000000000 +0100
-+++ gdb-6.7.50.20080227/gdb/symfile.c	2008-03-01 10:47:02.000000000 +0100
+--- gdb-6.7.50.20080227.orig/gdb/symfile.c	2008-03-10 00:48:51.000000000 +0100
++++ gdb-6.7.50.20080227/gdb/symfile.c	2008-03-10 00:49:33.000000000 +0100
 @@ -54,6 +54,9 @@
  #include "varobj.h"
  #include "elf-bfd.h"
@@ -717,7 +771,7 @@
  
    if (retval != NULL && !build_id_verify (retval, build_id))
      {
-@@ -1323,9 +1723,202 @@ build_id_to_debug_filename (struct build
+@@ -1323,9 +1723,433 @@ build_id_to_debug_filename (struct build
        retval = NULL;
      }
  
@@ -735,151 +789,378 @@
 +#include 
 +#include 
 +
-+static void
-+rpm_print_debuginfo (const char *filename)
++/* This MISSING_RPM_HASH tracker is used to collect all the missing rpm files
++   and avoid their duplicities during a single inferior run.  */
++
++static struct htab *missing_rpm_hash;
++
++/* This MISSING_RPM_LIST tracker is used to collect and print as a single line
++   all the rpms right before the nearest GDB prompt.  It gets cleared after
++   each such print (it is questionable if we should clear it after the print).
++   */
++
++struct missing_rpm
++  {
++    struct missing_rpm *next;
++    char rpm[1];
++  };
++static struct missing_rpm *missing_rpm_list;
++static int missing_rpm_list_entries;
++
++/* Returns the count of newly added rpms.  */
++
++static int
++missing_rpm_enlist (const char *filename)
 +{
 +  static int rpm_init_done = 0;
 +  rpmts ts;
 +  rpmdbMatchIterator mi;
++  int count = 0;
++
++  if (filename == NULL)
++    return 0;
 +
 +  if (!rpm_init_done)
 +    {
 +      if (rpmReadConfigFiles(NULL, NULL) != 0)
 +	{
 +	  warning (_("Error reading the rpm configuration files"));
-+	  return;
++	  return 0;
 +	}
 +      rpm_init_done = 1;
 +    }
 +
 +  ts = rpmtsCreate ();
-+  
++
 +  mi = rpmtsInitIterator (ts, RPMTAG_BASENAMES, filename, 0);
 +  if (mi != NULL)
 +    {
-+      int printed = 0;
-+
 +      for (;;)
 +	{
 +	  Header h;
-+	  char *s;
-+	  const char *errmsg;
++	  char *s, *srcrpm, *verrel, *debuginfo;
++	  union
++	    {
++	      void *voidp;
++	      char *s;
++	    }
++	  sourcerpm, arch;
++	  char **slot;
++	  rpmdbMatchIterator mi_debuginfo;
 +
 +	  h = rpmdbNextIterator (mi);
 +	  if (h == NULL)
 +	    break;
 +
-+	  s = headerSprintf (h, " %{name}", rpmTagTable, rpmHeaderFormats,
-+			     &errmsg);
-+	  if (s == NULL)
-+	    warning (_("Error querying rpm file `%s': %s"), filename, errmsg);
-+	  else
++	  if (!headerGetEntry (h, RPMTAG_SOURCERPM, NULL, &sourcerpm.voidp,
++			       NULL))
++	    {
++	      warning (_("Error querying the rpm file `%s' %s"), filename,
++		       "RPMTAG_SOURCERPM");
++	      continue;
++	    }
++	  srcrpm = sourcerpm.s + strlen (sourcerpm.s) - (sizeof ".src.rpm" - 1);
++	  if (srcrpm < sourcerpm.s || strcmp (srcrpm, ".src.rpm") != 0)
++	    {
++error_parsing_sourcerpm:
++	      warning (_("Error parsing %%{sourcerpm} of the rpm file `%s': %s"),
++		       filename, sourcerpm.s);
++	      continue;
++	    }
++	  s = srcrpm;
++
++	  /* Skip the release.  */
++
++	  while (s > sourcerpm.s && s[-1] != '-')
++	    s--;
++	  if (s == sourcerpm.s)
++	    goto error_parsing_sourcerpm;
++	  s--;
++
++	  /* Skip the version.  */
++
++	  while (s > sourcerpm.s && s[-1] != '-')
++	    s--;
++	  if (s == sourcerpm.s)
++	    goto error_parsing_sourcerpm;
++	  s--;
++	  verrel = s;
++
++	  if (!headerGetEntry (h, RPMTAG_ARCH, NULL, &arch.voidp, NULL))
++	    {
++	      warning (_("Error querying the rpm file `%s' %s"), filename,
++		       "RPMTAG_ARCH");
++	      continue;
++	    }
++
++	  /* The allocated memory gets utilized below for MISSING_RPM_HASH.  */
++
++	  debuginfo = xmalloc (strlen (sourcerpm.s) + strlen (arch.s) + 32);
++
++	  /* Verify the debuginfo file is not already installed.  */
++
++	  sprintf (debuginfo, "%.*s-debuginfo%.*s.%s",
++		   (int) (verrel - sourcerpm.s), sourcerpm.s,
++		   (int) (srcrpm - verrel), verrel, arch.s);
++	  mi_debuginfo = rpmtsInitIterator (ts, RPMDBI_LABEL, debuginfo, 0);
++	  if (mi_debuginfo != NULL)
 +	    {
-+	      if (!printed)
-+	        {
-+		  fprintf_unfiltered (gdb_stdout,
-+				      _("Getting all the debuginfos: %s"),
-+				      "debuginfo-install");
-+		  printed = 1;
++	      Header h_debuginfo;
++
++	      h_debuginfo = rpmdbNextIterator (mi_debuginfo);
++	      rpmdbFreeIterator (mi_debuginfo);
++	      if (h_debuginfo != NULL)
++		{
++		  xfree (debuginfo);
++
++		  /* We ignore any != 0 for possibly already enlisted rpms as
++		     it should not hurt much.  */
++
++		  count = 0;
++		  break;
 +		}
-+	      /* Space (' ') delimited was insted by HEADERSPRINTF above.  */
-+	      fputs_unfiltered (s, gdb_stdout);
 +	    }
-+	}
 +
-+      if (printed)
-+	fputs_unfiltered ("\n", gdb_stdout);
++	  /* Base package name for `debuginfo-install'.  We do not use `yum'
++	     as its command
++		 yum --enablerepo='*-debuginfo' install BASE-debuginfo.ARCH
++	     would be more complicated than just:
++		 debuginfo-install BASE.ARCH
++	     We do not need to supply the version-release as
++	     `debuginfo-install' always installs only the debuginfo matching
++	     the currently installed rpm.  Still we must supply `.%{arch}' as
++	     we may have multilib (multiple arch-differing rpm packages)
++	     installed.
++	     FUTURE: After multiple debuginfo versions simultaneously installed
++	     get supported we may need to supply the version-release here.  */
++
++	  sprintf (debuginfo, "%.*s.%s", (int) (verrel - sourcerpm.s),
++		   sourcerpm.s, arch.s);
++
++	  if (missing_rpm_hash == NULL)
++	    {
++	      /* DEL_F is passed NULL as MISSING_RPM_LIST's HTAB_DELETE
++		 should not deallocate the entries.  */
++
++	      missing_rpm_hash = htab_create_alloc (64, htab_hash_string,
++			       (int (*) (const void *, const void *)) streq,
++						    NULL, xcalloc, xfree);
++	    }
++	  slot = (char **) htab_find_slot (missing_rpm_hash, debuginfo, INSERT);
++	  /* XCALLOC never returns NULL.  */
++	  gdb_assert (slot != NULL);
++	  if (*slot == NULL)
++	    {
++	      struct missing_rpm *missing_rpm;
++
++	      *slot = debuginfo;
++
++	      missing_rpm = xmalloc (sizeof (*missing_rpm) + strlen (debuginfo));
++	      strcpy (missing_rpm->rpm, debuginfo);
++	      missing_rpm->next = missing_rpm_list;
++	      missing_rpm_list = missing_rpm;
++	      missing_rpm_list_entries++;
++	    }
++	  else
++	    xfree (debuginfo);
++	  count++;
++	}
 +
 +      rpmdbFreeIterator (mi);
 +    }
 +
 +  rpmtsFree (ts);
++
++  return count;
++}
++
++static int
++missing_rpm_list_compar (const char *const *ap, const char *const *bp)
++{
++  return strcoll (*ap, *bp);
++}
++
++/* It returns a NULL-terminated array of strings needing to be FREEd.  It may
++   also return only NULL.  */
++
++static void
++missing_rpm_list_print (void)
++{
++  char **array, **array_iter;
++  struct missing_rpm *list_iter;
++
++  if (missing_rpm_list_entries == 0)
++    return;
++
++  array = xmalloc (sizeof (*array) * missing_rpm_list_entries);
++  array_iter = array;
++  for (list_iter = missing_rpm_list; list_iter != NULL;
++       list_iter = list_iter->next)
++    {
++      *array_iter++ = list_iter->rpm;
++    }
++  gdb_assert (array_iter == array + missing_rpm_list_entries);
++
++  qsort (array, missing_rpm_list_entries, sizeof (*array),
++	 (int (*) (const void *, const void *)) missing_rpm_list_compar);
++
++  printf (_("Missing separate debuginfos, use: %s"), "debuginfo-install");
++  for (array_iter = array; array_iter < array + missing_rpm_list_entries;
++       array_iter++)
++    {
++      putchar (' ');
++      fputs (*array_iter, stdout);
++    }
++  putchar ('\n');
++
++  xfree (array);
++  while (missing_rpm_list != NULL)
++    {
++      list_iter = missing_rpm_list;
++      missing_rpm_list = list_iter->next;
++      xfree (list_iter);
++    }
++  missing_rpm_list_entries = 0;
++}
++
++static void
++missing_rpm_change (void)
++{
++  debug_flush_missing ();
++
++  gdb_assert (missing_rpm_list == NULL);
++  if (missing_rpm_hash != NULL)
++    {
++      htab_delete (missing_rpm_hash);
++      missing_rpm_hash = NULL;
++    }
++}
++
++enum missing_exec
++  {
++    /* Init state.  EXEC_BFD also still could be NULL.  */
++    MISSING_EXEC_NOT_TRIED,
++    /* We saw a non-NULL EXEC_BFD but RPM has no info about it.  */
++    MISSING_EXEC_NOT_FOUND,
++    /* We found EXEC_BFD by RPM and we either have its symbols (either embedded
++       or separate) or the main executable's RPM is now contained in
++       MISSING_RPM_HASH.  */
++    MISSING_EXEC_ENLISTED
++  };
++static enum missing_exec missing_exec = MISSING_EXEC_NOT_TRIED;
++
++void
++debug_flush_missing (void)
++{
++  missing_rpm_list_print ();
 +}
 +
-+struct missing_debuginfos
++/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages
++     yum --enablerepo='*-debuginfo' install ...
++   avoidance.  */
++
++struct missing_filepair
 +  {
 +    char *binary;
 +    char *debug;
 +    char data[1];
 +  };
 +
-+static struct htab *missing_debuginfos_hash;
-+static struct obstack missing_debuginfos_obstack;
++static struct htab *missing_filepair_hash;
++static struct obstack missing_filepair_obstack;
 +
 +static void *
-+missing_debuginfos_xcalloc (size_t nmemb, size_t nmemb_size)
++missing_filepair_xcalloc (size_t nmemb, size_t nmemb_size)
 +{
 +  void *retval;
 +  size_t size = nmemb * nmemb_size;
-+  
-+  retval = obstack_alloc (&missing_debuginfos_obstack, size);
++
++  retval = obstack_alloc (&missing_filepair_obstack, size);
 +  memset (retval, 0, size);
 +  return retval;
 +}
 +
 +static hashval_t
-+missing_debuginfos_hash_func (const struct missing_debuginfos *elem)
++missing_filepair_hash_func (const struct missing_filepair *elem)
 +{
-+  return htab_hash_string (elem->binary) ^ htab_hash_string (elem->debug);
++  hashval_t retval = 0;
++
++  retval ^= htab_hash_string (elem->binary);
++  if (elem->debug != NULL)
++    retval ^= htab_hash_string (elem->debug);
++
++  return retval;
 +}
 +
 +static int
-+missing_debuginfos_eq (const struct missing_debuginfos *elem1,
-+		       const struct missing_debuginfos *elem2)
++missing_filepair_eq (const struct missing_filepair *elem1,
++		       const struct missing_filepair *elem2)
 +{
 +  return strcmp (elem1->binary, elem2->binary) == 0
-+         && strcmp (elem1->debug, elem2->debug) == 0;
++         && ((elem1->debug == NULL && elem2->debug == NULL)
++	     || strcmp (elem1->debug, elem2->debug) == 0);
 +}
 +
 +static void
-+missing_debuginfos_change (void)
++missing_filepair_change (void)
 +{
-+  if (missing_debuginfos_hash != NULL)
++  if (missing_filepair_hash != NULL)
 +    {
-+      obstack_free (&missing_debuginfos_obstack, NULL);
-+      /* All their memory came just from MISSING_DEBUGINFOS_OBSTACK.  */
-+      missing_debuginfos_hash = NULL;
++      obstack_free (&missing_filepair_obstack, NULL);
++      /* All their memory came just from missing_filepair_OBSTACK.  */
++      missing_filepair_hash = NULL;
 +    }
++  missing_exec = MISSING_EXEC_NOT_TRIED;
 +}
 +
 +static void
-+missing_debuginfos_change_inferior_created (struct target_ops *objfile,
-+					    int from_tty)
++debug_print_executable_changed (void *unused)
 +{
-+  missing_debuginfos_change ();
++  missing_rpm_change ();
++  missing_filepair_change ();
 +}
 +
++/* Notify user the file BINARY with (possibly NULL) associated separate debug
++   information file DEBUG is missing.  DEBUG may or may not be the build-id
++   file such as would be:
++     /usr/lib/debug/.build-id/dd/b1d2ce632721c47bb9e8679f369e2295ce71be.debug
++   */
++
 +void
-+build_id_print_missing (const char *binary, const char *debug)
++debug_print_missing (const char *binary, const char *debug)
 +{
-+  char *exec_filename = NULL;
 +  size_t binary_len0 = strlen (binary) + 1;
-+  size_t debug_len0 = strlen (debug) + 1;
-+  struct missing_debuginfos *missing_debuginfos;
-+  struct missing_debuginfos **slot;
++  size_t debug_len0 = debug ? strlen (debug) + 1 : 0;
++  struct missing_filepair *missing_filepair;
++  struct missing_filepair **slot;
 +
 +  if (build_id_verbose < BUILD_ID_VERBOSE_FILENAMES)
 +    return;
 +
-+  if (missing_debuginfos_hash == NULL)
++  if (missing_filepair_hash == NULL)
 +    {
-+      obstack_init (&missing_debuginfos_obstack);
-+      missing_debuginfos_hash = htab_create_alloc (64,
-+	(hashval_t (*) (const void *)) missing_debuginfos_hash_func,
-+	(int (*) (const void *, const void *)) missing_debuginfos_eq, NULL,
-+	missing_debuginfos_xcalloc, NULL);
++      obstack_init (&missing_filepair_obstack);
++      missing_filepair_hash = htab_create_alloc (64,
++	(hashval_t (*) (const void *)) missing_filepair_hash_func,
++	(int (*) (const void *, const void *)) missing_filepair_eq, NULL,
++	missing_filepair_xcalloc, NULL);
 +    }
 +
-+  missing_debuginfos = obstack_alloc (&missing_debuginfos_obstack,
-+				      sizeof (*missing_debuginfos) - 1
++  missing_filepair = obstack_alloc (&missing_filepair_obstack,
++				      sizeof (*missing_filepair) - 1
 +				      + binary_len0 + debug_len0);
-+  missing_debuginfos->binary = missing_debuginfos->data;
-+  memcpy (missing_debuginfos->binary, binary, binary_len0);
-+  missing_debuginfos->debug = missing_debuginfos->binary + binary_len0;
-+  memcpy (missing_debuginfos->debug, debug, debug_len0);
++  missing_filepair->binary = missing_filepair->data;
++  memcpy (missing_filepair->binary, binary, binary_len0);
++  if (debug != NULL)
++    {
++      missing_filepair->debug = missing_filepair->binary + binary_len0;
++      memcpy (missing_filepair->debug, debug, debug_len0);
++    }
++  else
++    missing_filepair->debug = NULL;
 +
-+  slot = (struct missing_debuginfos **) htab_find_slot (missing_debuginfos_hash,
-+							missing_debuginfos,
++  slot = (struct missing_filepair **) htab_find_slot (missing_filepair_hash,
++							missing_filepair,
 +							INSERT);
 +
 +  /* While it may be still printed duplicitely with the missing debuginfo file
@@ -889,38 +1170,42 @@
 +
 +  if (*slot != NULL)
 +    {
-+      obstack_free (&missing_debuginfos_obstack, missing_debuginfos);
++      obstack_free (&missing_filepair_obstack, missing_filepair);
 +      return;
 +    }
-+  *slot = missing_debuginfos;
++  *slot = missing_filepair;
 +
-+  fprintf_unfiltered (gdb_stdlog, _("Missing separate debuginfo for %s\n"),
-+		      binary);
-+
-+  fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"),
-+		      "yum --enablerepo='*-debuginfo' install", debug);
-+
-+  if (exec_bfd != NULL)
-+    exec_filename = bfd_get_filename (exec_bfd);
-+  if (exec_filename != NULL)
++  if (missing_exec == MISSING_EXEC_NOT_TRIED)
 +    {
-+      static char *last_exec_filename;
++      char *exec_filename;
 +
-+      if (last_exec_filename == NULL
-+	  || strcmp (exec_filename, last_exec_filename) != 0)
++      exec_filename = get_exec_file (0);
++      if (exec_filename != NULL)
 +	{
-+	  xfree (last_exec_filename);
-+	  last_exec_filename = xstrdup (exec_filename);
-+
-+	  rpm_print_debuginfo (exec_filename);
++	  if (missing_rpm_enlist (exec_filename) == 0)
++	    missing_exec = MISSING_EXEC_NOT_FOUND;
++	  else
++	    missing_exec = MISSING_EXEC_ENLISTED;
 +	}
 +    }
++  if (missing_exec != MISSING_EXEC_ENLISTED)
++    if (missing_rpm_enlist (binary) == 0 && missing_rpm_enlist (debug) == 0)
++      {
++	/* We do not collect and flush these messages as each such message
++	   already requires its own separate lines.  */
++
++	fprintf_unfiltered (gdb_stdlog,
++			    _("Missing separate debuginfo for %s\n"), binary);
++        if (debug != NULL)
++	  fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"),
++			      "yum --enablerepo='*-debuginfo' install", debug);
++      }
 +}
 +
  static char *
  get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out)
  {
-@@ -1411,32 +2004,36 @@ static char *
+@@ -1411,32 +2235,36 @@ static char *
  find_separate_debug_file (struct objfile *objfile)
  {
    asection *sect;
@@ -966,7 +1251,7 @@
      }
  
    basename = get_debug_link_info (objfile, &crc32);
-@@ -1444,7 +2041,7 @@ find_separate_debug_file (struct objfile
+@@ -1444,7 +2272,7 @@ find_separate_debug_file (struct objfile
    if (basename == NULL)
      /* There's no separate debug info, hence there's no way we could
         load it => no warning.  */
@@ -975,7 +1260,7 @@
  
    dir = xstrdup (objfile->name);
  
-@@ -1460,23 +2057,19 @@ find_separate_debug_file (struct objfile
+@@ -1460,23 +2288,19 @@ find_separate_debug_file (struct objfile
    gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i]));
    dir[i+1] = '\0';
  
@@ -1006,7 +1291,7 @@
  
    /* Then try in the subdirectory named DEBUG_SUBDIRECTORY.  */
    strcpy (debugfile, dir);
-@@ -1485,11 +2078,7 @@ find_separate_debug_file (struct objfile
+@@ -1485,11 +2309,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -1019,7 +1304,7 @@
  
    /* Then try in the global debugfile directory.  */
    strcpy (debugfile, debug_file_directory);
-@@ -1498,11 +2087,7 @@ find_separate_debug_file (struct objfile
+@@ -1498,11 +2318,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -1032,7 +1317,7 @@
  
    /* If the file is in the sysroot, try using its base path in the
       global debugfile directory.  */
-@@ -1517,20 +2102,19 @@ find_separate_debug_file (struct objfile
+@@ -1517,20 +2333,18 @@ find_separate_debug_file (struct objfile
        strcat (debugfile, basename);
  
        if (separate_debug_file_exists (debugfile, crc32, objfile->name))
@@ -1049,8 +1334,7 @@
 -    xfree (canon_name);
  
 +  debugfile = NULL;
-+  if (build_id_filename != NULL)
-+    build_id_print_missing (objfile->name, build_id_filename);
++  debug_print_missing (objfile->name, build_id_filename);
 +
 +cleanup_return_debugfile:
 +  xfree (build_id_filename);
@@ -1062,7 +1346,7 @@
  }
  
  
-@@ -4220,4 +4804,16 @@ the global debug-file directory prepende
+@@ -4220,4 +5034,16 @@ the global debug-file directory prepende
  				     NULL,
  				     show_debug_file_directory,
  				     &setlist, &showlist);
@@ -1077,13 +1361,13 @@
 +			    show_build_id_verbose,
 +			    &setlist, &showlist);
 +
-+  observer_attach_inferior_created (missing_debuginfos_change_inferior_created);
++  observer_attach_executable_changed (debug_print_executable_changed);
  }
 Index: gdb-6.7.50.20080227/gdb/symfile.h
 ===================================================================
 --- gdb-6.7.50.20080227.orig/gdb/symfile.h	2008-02-03 23:13:29.000000000 +0100
-+++ gdb-6.7.50.20080227/gdb/symfile.h	2008-03-01 10:30:50.000000000 +0100
-@@ -358,6 +358,13 @@ extern int symfile_map_offsets_to_segmen
++++ gdb-6.7.50.20080227/gdb/symfile.h	2008-03-10 00:48:53.000000000 +0100
+@@ -358,6 +358,14 @@ extern int symfile_map_offsets_to_segmen
  struct symfile_segment_data *get_symfile_segment_data (bfd *abfd);
  void free_symfile_segment_data (struct symfile_segment_data *data);
  
@@ -1092,8 +1376,30 @@
 +extern struct build_id *build_id_addr_get (CORE_ADDR addr);
 +extern char *build_id_to_filename (struct build_id *build_id,
 +				   char **link_return, int add_debug_suffix);
-+extern void build_id_print_missing (const char *binary, const char *debug);
++extern void debug_print_missing (const char *binary, const char *debug);
++extern void debug_flush_missing (void);
 +
  /* From dwarf2read.c */
  
  extern int dwarf2_has_info (struct objfile *);
+Index: gdb-6.7.50.20080227/gdb/tui/tui-interp.c
+===================================================================
+--- gdb-6.7.50.20080227.orig/gdb/tui/tui-interp.c	2008-01-01 23:53:22.000000000 +0100
++++ gdb-6.7.50.20080227/gdb/tui/tui-interp.c	2008-03-10 00:48:53.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include "tui/tui.h"
+ #include "tui/tui-io.h"
+ #include "exceptions.h"
++#include "symfile.h"
+ 
+ /* Set to 1 when the TUI mode must be activated when we first start
+    gdb.  */
+@@ -128,6 +129,8 @@ tui_command_loop (void *data)
+       char *a_prompt;
+       char *gdb_prompt = get_prompt ();
+ 
++      debug_flush_missing ();
++
+       /* Tell readline what the prompt to display is and what function
+          it will need to call after a whole line is read. This also
+          displays the first prompt.  */


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- gdb.spec	4 Mar 2008 14:42:19 -0000	1.273
+++ gdb.spec	10 Mar 2008 10:05:44 -0000	1.274
@@ -13,7 +13,7 @@
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 2%{?_with_upstream:.upstream}%{?dist}
+Release: 3%{?_with_upstream:.upstream}%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -38,9 +38,11 @@
 Obsoletes: gdb64 < 5.3.91
 %endif
 
+%if 0%{!?_with_upstream:1}
 # The last Rawhide release was (no dist tag) pstack-1.2-7.2.2
 Obsoletes: pstack < 1.2-7.2.2.1
 Provides: pstack = 1.2-7.2.2.1
+%endif	# 1%{?_with_upstream:0}
 
 # GDB patches have the format `gdb--bz-.patch'.
 # They should be created using patch level 1: diff -up ./gdb (or gdb-6.3/gdb).
@@ -685,11 +687,13 @@
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+%if 0%{!?_with_upstream:1}
 # pstack obsoletion
 
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1/gstack.1
 ln -s gstack.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/pstack.1.gz
 ln -s gstack $RPM_BUILD_ROOT%{_bindir}/pstack
+%endif	# 1%{?_with_upstream:0}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -717,12 +721,14 @@
 %{_bindir}/gcore
 %{_bindir}/gdb
 %{_bindir}/gdbtui
-%{_bindir}/gstack
-%{_bindir}/pstack
 %{_mandir}/*/gdb.1*
 %{_mandir}/*/gdbtui.1*
+%if 0%{!?_with_upstream:1}
+%{_bindir}/gstack
+%{_bindir}/pstack
 %{_mandir}/*/gstack.1*
 %{_mandir}/*/pstack.1*
+%endif	# 1%{?_with_upstream:0}
 %{_infodir}/annotate.info*
 %{_infodir}/gdb.info*
 %{_infodir}/gdbint.info*
@@ -735,6 +741,12 @@
 %{_mandir}/*/gdbserver.1*
 
 %changelog
+* Mon Mar 10 2008 Jan Kratochvil  - 6.7.50.20080227-3
+- build-id warnings integrated more with rpm and the lists of the warnings got
+  replaced usually by a single-line `debuginfo-install' advice.
+  - FIXME: Testsuite needs an update for the new pre-prompt messages.
+- Fix the `--with upstream' compilation - gstack/pstack are now omitted.
+
 * Tue Mar  4 2008 Jan Kratochvil  - 6.7.50.20080227-2
 - Drop the unused `ChangeLog.RedHat' file stubs.
 - New rpm option `--with upstream' to drop the Fedora patches for testing.



From fedora-extras-commits at redhat.com  Mon Mar 10 10:06:08 2008
From: fedora-extras-commits at redhat.com (Jan Kratochvil (jkratoch))
Date: Mon, 10 Mar 2008 10:06:08 GMT
Subject: rpms/gdb/F-8 gdb-6.6-buildid-locate.patch, 1.7, 1.8 gdb.spec, 1.260,
	1.261
Message-ID: <200803101006.m2AA68nJ002638@cvs-int.fedora.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2574

Modified Files:
	gdb-6.6-buildid-locate.patch gdb.spec 
Log Message:
* Mon Mar 10 2008 Jan Kratochvil  - 6.6-44
- build-id warnings integrated more with rpm and the lists of the warnings got
  replaced usually by a single-line `debuginfo-install' advice.
  - FIXME: Testsuite needs an update for the new pre-prompt messages.


gdb-6.6-buildid-locate.patch:

Index: gdb-6.6-buildid-locate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-8/gdb-6.6-buildid-locate.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdb-6.6-buildid-locate.patch	21 Feb 2008 21:41:37 -0000	1.7
+++ gdb-6.6-buildid-locate.patch	10 Mar 2008 10:05:57 -0000	1.8
@@ -1,12 +1,16 @@
 [base]
 
+2007-10-16  Jan Kratochvil  
+
+	Port to GDB-6.7.
+
 2008-01-22  Jan Kratochvil  
 	option "build-id-core-loads": Fix it to be an "on"/"off" type.
 	More intuitive build-id missing files messages.
 	Lookup also the main executable from the rpm database.
 	Suppress duplicite buil-id missing files warnings.
 
-2008-01-24  Jan Kratochvil  
+2008-01-26  Jan Kratochvil  
 	Print the shared libraries names unconditionally.
 
 2008-02-21  Jan Kratochvil  
@@ -15,9 +19,23 @@
 	New description of `build-id-verbose' in the documentation.
 	Resolve the RH Bug 432164.
 
-diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.6-unpatched/gdb/Makefile.in gdb-6.6-patched/gdb/Makefile.in
---- gdb-6.6-unpatched/gdb/Makefile.in	2008-02-21 04:44:49.000000000 +0100
-+++ gdb-6.6-patched/gdb/Makefile.in	2008-02-21 04:10:55.000000000 +0100
+2008-02-24  Jan Kratochvil  
+
+	Port to GDB-6.8pre.
+
+2008-03-09  Jan Kratochvil  
+
+	Implement the `debuginfo-install' rpm/yum integration.
+	Resolve the RH Bug 435581.
+
+2008-03-09  Jan Kratochvil  
+
+	Backport to GDB-6.6.
+
+Index: gdb-6.6/gdb/Makefile.in
+===================================================================
+--- gdb-6.6.orig/gdb/Makefile.in	2008-03-10 00:42:35.000000000 +0100
++++ gdb-6.6/gdb/Makefile.in	2008-03-10 00:42:35.000000000 +0100
 @@ -383,7 +383,7 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcode
  CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) \
  	$(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
@@ -37,7 +55,17 @@
  core-regset.o: core-regset.c $(defs_h) $(command_h) $(gdbcore_h) \
  	$(inferior_h) $(target_h) $(gdb_string_h) $(gregset_h)
  cp-abi.o: cp-abi.c $(defs_h) $(value_h) $(cp_abi_h) $(command_h) $(gdbcmd_h) \
-@@ -2785,7 +2786,8 @@ symfile.o: symfile.c $(defs_h) $(bfdlink
+@@ -2009,7 +2010,8 @@ event-loop.o: event-loop.c $(defs_h) $(e
+ 	$(gdb_string_h) $(exceptions_h) $(gdb_assert_h) $(gdb_select_h)
+ event-top.o: event-top.c $(defs_h) $(top_h) $(inferior_h) $(target_h) \
+ 	$(terminal_h) $(event_loop_h) $(event_top_h) $(interps_h) \
+-	$(exceptions_h) $(gdbcmd_h) $(readline_h) $(readline_history_h)
++	$(exceptions_h) $(gdbcmd_h) $(readline_h) $(readline_history_h) \
++	$(symfile_h)
+ exceptions.o: exceptions.c $(defs_h) $(exceptions_h) $(breakpoint_h) \
+ 	$(target_h) $(inferior_h) $(annotate_h) $(ui_out_h) $(gdb_assert_h) \
+ 	$(gdb_string_h) $(serial_h)
+@@ -2785,7 +2787,8 @@ symfile.o: symfile.c $(defs_h) $(bfdlink
  	$(gdb_stabs_h) $(gdb_obstack_h) $(completer_h) $(bcache_h) \
  	$(hashtab_h) $(readline_h) $(gdb_assert_h) $(block_h) \
  	$(gdb_string_h) $(gdb_stat_h) $(observer_h) $(exec_h) \
@@ -47,9 +75,19 @@
  symfile-mem.o: symfile-mem.c $(defs_h) $(symtab_h) $(gdbcore_h) \
  	$(objfiles_h) $(exceptions_h) $(gdbcmd_h) $(target_h) $(value_h) \
  	$(symfile_h) $(observer_h) $(auxv_h) $(elf_common_h)
-diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.6-unpatched/gdb/corelow.c gdb-6.6-patched/gdb/corelow.c
---- gdb-6.6-unpatched/gdb/corelow.c	2008-02-21 04:44:49.000000000 +0100
-+++ gdb-6.6-patched/gdb/corelow.c	2008-02-21 04:10:55.000000000 +0100
+@@ -3216,7 +3219,7 @@ tui-hooks.o: $(srcdir)/tui/tui-hooks.c $
+ tui-interp.o: $(srcdir)/tui/tui-interp.c $(defs_h) $(interps_h) $(top_h) \
+ 	$(event_top_h) $(event_loop_h) $(ui_out_h) $(cli_out_h) \
+ 	$(tui_data_h) $(readline_h) $(tui_win_h) $(tui_h) $(tui_io_h) \
+-	$(exceptions_h)
++	$(exceptions_h) $(symtab_h) $(symfile_h)
+ 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-interp.c
+ tui-io.o: $(srcdir)/tui/tui-io.c $(defs_h) $(target_h) \
+ 	$(event_loop_h) $(event_top_h) $(command_h) $(top_h) $(tui_h) \
+Index: gdb-6.6/gdb/corelow.c
+===================================================================
+--- gdb-6.6.orig/gdb/corelow.c	2006-04-18 21:20:06.000000000 +0200
++++ gdb-6.6/gdb/corelow.c	2008-03-10 00:42:58.000000000 +0100
 @@ -46,6 +46,10 @@
  #include "gdb_assert.h"
  #include "exceptions.h"
@@ -61,13 +99,13 @@
  
  
  #ifndef O_LARGEFILE
-@@ -253,6 +257,57 @@ add_to_thread_list (bfd *abfd, asection 
+@@ -253,6 +257,56 @@ add_to_thread_list (bfd *abfd, asection 
      inferior_ptid = pid_to_ptid (thread_id);	/* Yes, make it current */
  }
  
 +static int build_id_core_loads = 1;
 +
-+static void 
++static void
 +build_id_locate_exec (int from_tty)
 +{
 +  CORE_ADDR at_entry;
@@ -89,8 +127,7 @@
 +  if (exec_filename != NULL)
 +    exec_file_attach (exec_filename, from_tty);
 +  else
-+    build_id_print_missing (_("the main executable file"), build_id_filename,
-+			    1);
++    debug_print_missing (_("the main executable file"), build_id_filename);
 +  xfree (build_id_filename);
 +
 +  /* `.note.gnu.build-id' section exists even for files without a separate
@@ -107,7 +144,7 @@
 +	symbol_file_add_main (exec_filename, from_tty);
 +      /* For EXEC_FILENAME NULL we were already complaining above.  */
 +      if (symfile_objfile == NULL && exec_filename != NULL)
-+	build_id_print_missing (exec_filename, build_id_filename, 1);
++	debug_print_missing (exec_filename, build_id_filename);
 +    }
 +  xfree (build_id_filename);
 +
@@ -119,7 +156,7 @@
  /* This routine opens and sets up the core file bfd.  */
  
  static void
-@@ -349,6 +404,15 @@ core_open (char *filename, int from_tty)
+@@ -349,6 +403,15 @@ core_open (char *filename, int from_tty)
    ontop = !push_target (&core_ops);
    discard_cleanups (old_chain);
  
@@ -135,7 +172,7 @@
    /* This is done first, before anything has a chance to query the
       inferior for information such as symbols.  */
    post_create_inferior (&core_ops, from_tty);
-@@ -662,4 +726,11 @@ _initialize_corelow (void)
+@@ -662,4 +725,11 @@ _initialize_corelow (void)
  
    if (!coreops_suppress_target)
      add_target (&core_ops);
@@ -147,10 +184,11 @@
 +			   NULL, NULL, NULL,
 +			   &setlist, &showlist);
  }
-diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.6-unpatched/gdb/doc/gdb.texinfo gdb-6.6-patched/gdb/doc/gdb.texinfo
---- gdb-6.6-unpatched/gdb/doc/gdb.texinfo	2008-02-21 04:44:15.000000000 +0100
-+++ gdb-6.6-patched/gdb/doc/gdb.texinfo	2008-02-21 04:43:15.000000000 +0100
-@@ -11940,6 +11940,27 @@ information files.
+Index: gdb-6.6/gdb/doc/gdb.texinfo
+===================================================================
+--- gdb-6.6.orig/gdb/doc/gdb.texinfo	2008-03-10 00:42:35.000000000 +0100
++++ gdb-6.6/gdb/doc/gdb.texinfo	2008-03-10 00:43:33.000000000 +0100
+@@ -11939,6 +11939,27 @@ information files.
  
  @end table
  
@@ -158,7 +196,7 @@
 +
 + at table @code
 +
-+ at kindex set build-id-verbose 
++ at kindex set build-id-verbose
 + at item set build-id-verbose 0
 +No additional messages are printed.
 +
@@ -178,10 +216,41 @@
  @cindex @code{.gnu_debuglink} sections
  @cindex debug links
  A debug link is a special section of the executable file named
-diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.6-unpatched/gdb/solib-svr4.c gdb-6.6-patched/gdb/solib-svr4.c
---- gdb-6.6-unpatched/gdb/solib-svr4.c	2008-02-21 04:44:49.000000000 +0100
-+++ gdb-6.6-patched/gdb/solib-svr4.c	2008-02-21 04:10:55.000000000 +0100
-@@ -943,10 +943,35 @@ svr4_current_sos (void)
+Index: gdb-6.6/gdb/event-top.c
+===================================================================
+--- gdb-6.6.orig/gdb/event-top.c	2006-12-06 17:54:13.000000000 +0100
++++ gdb-6.6/gdb/event-top.c	2008-03-10 00:42:35.000000000 +0100
+@@ -33,6 +33,7 @@
+ #include 
+ #include "exceptions.h"
+ #include "cli/cli-script.h"     /* for reset_command_nest_depth */
++#include "symfile.h"
+ 
+ /* For dont_repeat() */
+ #include "gdbcmd.h"
+@@ -194,6 +195,8 @@ cli_command_loop (void)
+      prompt, otherwise just print the prompt. */
+   if (async_command_editing_p)
+     {
++      debug_flush_missing ();
++
+       /* Tell readline what the prompt to display is and what function it
+          will need to call after a whole line is read. This also displays
+          the first prompt. */
+@@ -264,6 +267,8 @@ display_gdb_prompt (char *new_prompt)
+   /* Reset the nesting depth used when trace-commands is set.  */
+   reset_command_nest_depth ();
+ 
++  debug_flush_missing ();
++
+   /* Each interpreter has its own rules on displaying the command
+      prompt.  */
+   if (!current_interp_display_prompt_p ())
+Index: gdb-6.6/gdb/solib-svr4.c
+===================================================================
+--- gdb-6.6.orig/gdb/solib-svr4.c	2008-03-10 00:42:32.000000000 +0100
++++ gdb-6.6/gdb/solib-svr4.c	2008-03-10 00:42:35.000000000 +0100
+@@ -943,10 +943,36 @@ svr4_current_sos (void)
  		}
                else
                  {
@@ -191,8 +260,6 @@
 +
 +		  strncpy (new->so_original_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
 +		  new->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
- 		  xfree (buffer);
--		  strcpy (new->so_original_name, new->so_name);
 +		  /* May get overwritten below.  */
 +		  strcpy (new->so_name, new->so_original_name);
 +
@@ -211,18 +278,22 @@
 +			  xfree (name);
 +			}
 +		      else
-+			build_id_print_missing (new->so_name, build_id_filename,
-+						1);
++			debug_print_missing (new->so_name, build_id_filename);
++
 +		      xfree (build_id_filename);
 +		      xfree (build_id);
 +		    }
 +
+ 		  xfree (buffer);
+-		  strcpy (new->so_original_name, new->so_name);
++
  		  if (debug_solib)
  		    {
  		      fprintf_unfiltered (gdb_stdlog, 
-diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.6-unpatched/gdb/symfile.c gdb-6.6-patched/gdb/symfile.c
---- gdb-6.6-unpatched/gdb/symfile.c	2008-02-21 04:46:25.000000000 +0100
-+++ gdb-6.6-patched/gdb/symfile.c	2008-02-21 04:47:36.000000000 +0100
+Index: gdb-6.6/gdb/symfile.c
+===================================================================
+--- gdb-6.6.orig/gdb/symfile.c	2008-03-10 00:42:35.000000000 +0100
++++ gdb-6.6/gdb/symfile.c	2008-03-10 00:43:24.000000000 +0100
 @@ -54,6 +54,9 @@
  #include "exec.h"
  #include "parser-defs.h"
@@ -241,7 +312,7 @@
  
  
  int (*deprecated_ui_load_progress_hook) (const char *section, unsigned long num);
-@@ -1141,16 +1145,65 @@ symbol_file_clear (int from_tty)
+@@ -1120,16 +1124,65 @@ symbol_file_clear (int from_tty)
        printf_unfiltered (_("No symbol file now.\n"));
  }
  
@@ -309,7 +380,7 @@
  {
    struct build_id *retval;
  
-@@ -1166,6 +1219,348 @@ build_id_bfd_get (bfd *abfd)
+@@ -1145,6 +1198,348 @@ build_id_bfd_get (bfd *abfd)
    return retval;
  }
  
@@ -658,7 +729,7 @@
  /* Return if FILENAME has NT_GNU_BUILD_ID matching the CHECK value.  */
  
  static int
-@@ -1180,7 +1575,7 @@ build_id_verify (const char *filename, s
+@@ -1159,7 +1554,7 @@ build_id_verify (const char *filename, s
    if (abfd == NULL)
      return 0;
  
@@ -667,7 +738,7 @@
  
    if (found == NULL)
      warning (_("File \"%s\" has no build-id, file skipped"), filename);
-@@ -1198,8 +1593,9 @@ build_id_verify (const char *filename, s
+@@ -1177,8 +1572,9 @@ build_id_verify (const char *filename, s
  
  static char *debug_file_directory = NULL;
  
@@ -679,7 +750,7 @@
  {
    char *link, *s, *retval = NULL;
    gdb_byte *data = build_id->data;
-@@ -1207,7 +1603,9 @@ build_id_to_debug_filename (struct build
+@@ -1186,7 +1582,9 @@ build_id_to_debug_filename (struct build
  
    /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
    link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
@@ -690,7 +761,7 @@
    s = link + sprintf (link, "%s/.build-id/", debug_file_directory);
    if (size > 0)
      {
-@@ -1218,12 +1616,14 @@ build_id_to_debug_filename (struct build
+@@ -1197,12 +1595,14 @@ build_id_to_debug_filename (struct build
      *s++ = '/';
    while (size-- > 0)
      s += sprintf (s, "%02x", (unsigned) *data++);
@@ -707,7 +778,7 @@
  
    if (retval != NULL && !build_id_verify (retval, build_id))
      {
-@@ -1231,9 +1631,206 @@ build_id_to_debug_filename (struct build
+@@ -1210,9 +1610,433 @@ build_id_to_debug_filename (struct build
        retval = NULL;
      }
  
@@ -725,152 +796,378 @@
 +#include 
 +#include 
 +
-+static void
-+rpm_print_debuginfo (const char *filename)
++/* This MISSING_RPM_HASH tracker is used to collect all the missing rpm files
++   and avoid their duplicities during a single inferior run.  */
++
++static struct htab *missing_rpm_hash;
++
++/* This MISSING_RPM_LIST tracker is used to collect and print as a single line
++   all the rpms right before the nearest GDB prompt.  It gets cleared after
++   each such print (it is questionable if we should clear it after the print).
++   */
++
++struct missing_rpm
++  {
++    struct missing_rpm *next;
++    char rpm[1];
++  };
++static struct missing_rpm *missing_rpm_list;
++static int missing_rpm_list_entries;
++
++/* Returns the count of newly added rpms.  */
++
++static int
++missing_rpm_enlist (const char *filename)
 +{
 +  static int rpm_init_done = 0;
 +  rpmts ts;
 +  rpmdbMatchIterator mi;
++  int count = 0;
++
++  if (filename == NULL)
++    return 0;
 +
 +  if (!rpm_init_done)
 +    {
 +      if (rpmReadConfigFiles(NULL, NULL) != 0)
 +	{
 +	  warning (_("Error reading the rpm configuration files"));
-+	  return;
++	  return 0;
 +	}
 +      rpm_init_done = 1;
 +    }
 +
 +  ts = rpmtsCreate ();
-+  
++
 +  mi = rpmtsInitIterator (ts, RPMTAG_BASENAMES, filename, 0);
 +  if (mi != NULL)
 +    {
-+      int printed = 0;
-+
 +      for (;;)
 +	{
 +	  Header h;
-+	  char *s;
-+	  const char *errmsg;
++	  char *s, *srcrpm, *verrel, *debuginfo;
++	  union
++	    {
++	      void *voidp;
++	      char *s;
++	    }
++	  sourcerpm, arch;
++	  char **slot;
++	  rpmdbMatchIterator mi_debuginfo;
 +
 +	  h = rpmdbNextIterator (mi);
 +	  if (h == NULL)
 +	    break;
 +
-+	  s = headerSprintf (h, " %{name}", rpmTagTable, rpmHeaderFormats,
-+			     &errmsg);
-+	  if (s == NULL)
-+	    warning (_("Error querying rpm file `%s': %s"), filename, errmsg);
-+	  else
++	  if (!headerGetEntry (h, RPMTAG_SOURCERPM, NULL, &sourcerpm.voidp,
++			       NULL))
 +	    {
-+	      if (!printed)
-+	        {
-+		  fprintf_unfiltered (gdb_stdout,
-+				      _("Getting all the debuginfos: %s"),
-+				      "debuginfo-install");
-+		  printed = 1;
++	      warning (_("Error querying the rpm file `%s' %s"), filename,
++		       "RPMTAG_SOURCERPM");
++	      continue;
++	    }
++	  srcrpm = sourcerpm.s + strlen (sourcerpm.s) - (sizeof ".src.rpm" - 1);
++	  if (srcrpm < sourcerpm.s || strcmp (srcrpm, ".src.rpm") != 0)
++	    {
++error_parsing_sourcerpm:
++	      warning (_("Error parsing %%{sourcerpm} of the rpm file `%s': %s"),
++		       filename, sourcerpm.s);
++	      continue;
++	    }
++	  s = srcrpm;
++
++	  /* Skip the release.  */
++
++	  while (s > sourcerpm.s && s[-1] != '-')
++	    s--;
++	  if (s == sourcerpm.s)
++	    goto error_parsing_sourcerpm;
++	  s--;
++
++	  /* Skip the version.  */
++
++	  while (s > sourcerpm.s && s[-1] != '-')
++	    s--;
++	  if (s == sourcerpm.s)
++	    goto error_parsing_sourcerpm;
++	  s--;
++	  verrel = s;
++
++	  if (!headerGetEntry (h, RPMTAG_ARCH, NULL, &arch.voidp, NULL))
++	    {
++	      warning (_("Error querying the rpm file `%s' %s"), filename,
++		       "RPMTAG_ARCH");
++	      continue;
++	    }
++
++	  /* The allocated memory gets utilized below for MISSING_RPM_HASH.  */
++
++	  debuginfo = xmalloc (strlen (sourcerpm.s) + strlen (arch.s) + 32);
++
++	  /* Verify the debuginfo file is not already installed.  */
++
++	  sprintf (debuginfo, "%.*s-debuginfo%.*s.%s",
++		   (int) (verrel - sourcerpm.s), sourcerpm.s,
++		   (int) (srcrpm - verrel), verrel, arch.s);
++	  mi_debuginfo = rpmtsInitIterator (ts, RPMDBI_LABEL, debuginfo, 0);
++	  if (mi_debuginfo != NULL)
++	    {
++	      Header h_debuginfo;
++
++	      h_debuginfo = rpmdbNextIterator (mi_debuginfo);
++	      rpmdbFreeIterator (mi_debuginfo);
++	      if (h_debuginfo != NULL)
++		{
++		  xfree (debuginfo);
++
++		  /* We ignore any != 0 for possibly already enlisted rpms as
++		     it should not hurt much.  */
++
++		  count = 0;
++		  break;
 +		}
-+	      /* Space (' ') delimited was insted by HEADERSPRINTF above.  */
-+	      fputs_unfiltered (s, gdb_stdout);
 +	    }
-+	}
 +
-+      if (printed)
-+	fputs_unfiltered ("\n", gdb_stdout);
++	  /* Base package name for `debuginfo-install'.  We do not use `yum'
++	     as its command
++		 yum --enablerepo='*-debuginfo' install BASE-debuginfo.ARCH
++	     would be more complicated than just:
++		 debuginfo-install BASE.ARCH
++	     We do not need to supply the version-release as
++	     `debuginfo-install' always installs only the debuginfo matching
++	     the currently installed rpm.  Still we must supply `.%{arch}' as
++	     we may have multilib (multiple arch-differing rpm packages)
++	     installed.
++	     FUTURE: After multiple debuginfo versions simultaneously installed
++	     get supported we may need to supply the version-release here.  */
++
++	  sprintf (debuginfo, "%.*s.%s", (int) (verrel - sourcerpm.s),
++		   sourcerpm.s, arch.s);
++
++	  if (missing_rpm_hash == NULL)
++	    {
++	      /* DEL_F is passed NULL as MISSING_RPM_LIST's HTAB_DELETE
++		 should not deallocate the entries.  */
++
++	      missing_rpm_hash = htab_create_alloc (64, htab_hash_string,
++			       (int (*) (const void *, const void *)) streq,
++						    NULL, xcalloc, xfree);
++	    }
++	  slot = (char **) htab_find_slot (missing_rpm_hash, debuginfo, INSERT);
++	  /* XCALLOC never returns NULL.  */
++	  gdb_assert (slot != NULL);
++	  if (*slot == NULL)
++	    {
++	      struct missing_rpm *missing_rpm;
++
++	      *slot = debuginfo;
++
++	      missing_rpm = xmalloc (sizeof (*missing_rpm) + strlen (debuginfo));
++	      strcpy (missing_rpm->rpm, debuginfo);
++	      missing_rpm->next = missing_rpm_list;
++	      missing_rpm_list = missing_rpm;
++	      missing_rpm_list_entries++;
++	    }
++	  else
++	    xfree (debuginfo);
++	  count++;
++	}
 +
 +      rpmdbFreeIterator (mi);
 +    }
 +
 +  rpmtsFree (ts);
++
++  return count;
++}
++
++static int
++missing_rpm_list_compar (const char *const *ap, const char *const *bp)
++{
++  return strcoll (*ap, *bp);
 +}
 +
-+struct missing_debuginfos
++/* It returns a NULL-terminated array of strings needing to be FREEd.  It may
++   also return only NULL.  */
++
++static void
++missing_rpm_list_print (void)
++{
++  char **array, **array_iter;
++  struct missing_rpm *list_iter;
++
++  if (missing_rpm_list_entries == 0)
++    return;
++
++  array = xmalloc (sizeof (*array) * missing_rpm_list_entries);
++  array_iter = array;
++  for (list_iter = missing_rpm_list; list_iter != NULL;
++       list_iter = list_iter->next)
++    {
++      *array_iter++ = list_iter->rpm;
++    }
++  gdb_assert (array_iter == array + missing_rpm_list_entries);
++
++  qsort (array, missing_rpm_list_entries, sizeof (*array),
++	 (int (*) (const void *, const void *)) missing_rpm_list_compar);
++
++  printf (_("Missing separate debuginfos, use: %s"), "debuginfo-install");
++  for (array_iter = array; array_iter < array + missing_rpm_list_entries;
++       array_iter++)
++    {
++      putchar (' ');
++      fputs (*array_iter, stdout);
++    }
++  putchar ('\n');
++
++  xfree (array);
++  while (missing_rpm_list != NULL)
++    {
++      list_iter = missing_rpm_list;
++      missing_rpm_list = list_iter->next;
++      xfree (list_iter);
++    }
++  missing_rpm_list_entries = 0;
++}
++
++static void
++missing_rpm_change (void)
++{
++  debug_flush_missing ();
++
++  gdb_assert (missing_rpm_list == NULL);
++  if (missing_rpm_hash != NULL)
++    {
++      htab_delete (missing_rpm_hash);
++      missing_rpm_hash = NULL;
++    }
++}
++
++enum missing_exec
++  {
++    /* Init state.  EXEC_BFD also still could be NULL.  */
++    MISSING_EXEC_NOT_TRIED,
++    /* We saw a non-NULL EXEC_BFD but RPM has no info about it.  */
++    MISSING_EXEC_NOT_FOUND,
++    /* We found EXEC_BFD by RPM and we either have its symbols (either embedded
++       or separate) or the main executable's RPM is now contained in
++       MISSING_RPM_HASH.  */
++    MISSING_EXEC_ENLISTED
++  };
++static enum missing_exec missing_exec = MISSING_EXEC_NOT_TRIED;
++
++void
++debug_flush_missing (void)
++{
++  missing_rpm_list_print ();
++}
++
++/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages
++     yum --enablerepo='*-debuginfo' install ...
++   avoidance.  */
++
++struct missing_filepair
 +  {
 +    char *binary;
 +    char *debug;
 +    char data[1];
 +  };
 +
-+static struct htab *missing_debuginfos_hash;
-+static struct obstack missing_debuginfos_obstack;
++static struct htab *missing_filepair_hash;
++static struct obstack missing_filepair_obstack;
 +
 +static void *
-+missing_debuginfos_xcalloc (size_t nmemb, size_t nmemb_size)
++missing_filepair_xcalloc (size_t nmemb, size_t nmemb_size)
 +{
 +  void *retval;
 +  size_t size = nmemb * nmemb_size;
-+  
-+  retval = obstack_alloc (&missing_debuginfos_obstack, size);
++
++  retval = obstack_alloc (&missing_filepair_obstack, size);
 +  memset (retval, 0, size);
 +  return retval;
 +}
 +
 +static hashval_t
-+missing_debuginfos_hash_func (const struct missing_debuginfos *elem)
++missing_filepair_hash_func (const struct missing_filepair *elem)
 +{
-+  return htab_hash_string (elem->binary) ^ htab_hash_string (elem->debug);
++  hashval_t retval = 0;
++
++  retval ^= htab_hash_string (elem->binary);
++  if (elem->debug != NULL)
++    retval ^= htab_hash_string (elem->debug);
++
++  return retval;
 +}
 +
 +static int
-+missing_debuginfos_eq (const struct missing_debuginfos *elem1,
-+		       const struct missing_debuginfos *elem2)
++missing_filepair_eq (const struct missing_filepair *elem1,
++		       const struct missing_filepair *elem2)
 +{
 +  return strcmp (elem1->binary, elem2->binary) == 0
-+         && strcmp (elem1->debug, elem2->debug) == 0;
++         && ((elem1->debug == NULL && elem2->debug == NULL)
++	     || strcmp (elem1->debug, elem2->debug) == 0);
 +}
 +
 +static void
-+missing_debuginfos_change (void)
++missing_filepair_change (void)
 +{
-+  if (missing_debuginfos_hash != NULL)
++  if (missing_filepair_hash != NULL)
 +    {
-+      obstack_free (&missing_debuginfos_obstack, NULL);
-+      /* All their memory came just from MISSING_DEBUGINFOS_OBSTACK.  */
-+      missing_debuginfos_hash = NULL;
++      obstack_free (&missing_filepair_obstack, NULL);
++      /* All their memory came just from missing_filepair_OBSTACK.  */
++      missing_filepair_hash = NULL;
 +    }
++  missing_exec = MISSING_EXEC_NOT_TRIED;
 +}
 +
 +static void
-+missing_debuginfos_change_inferior_created (struct target_ops *objfile,
-+					    int from_tty)
++debug_print_executable_changed (void *unused)
 +{
-+  missing_debuginfos_change ();
++  missing_rpm_change ();
++  missing_filepair_change ();
 +}
 +
++/* Notify user the file BINARY with (possibly NULL) associated separate debug
++   information file DEBUG is missing.  DEBUG may or may not be the build-id
++   file such as would be:
++     /usr/lib/debug/.build-id/dd/b1d2ce632721c47bb9e8679f369e2295ce71be.debug
++   */
++
 +void
-+build_id_print_missing (const char *binary, const char *debug,
-+			int print_filename)
++debug_print_missing (const char *binary, const char *debug)
 +{
-+  char *exec_filename = NULL;
 +  size_t binary_len0 = strlen (binary) + 1;
-+  size_t debug_len0 = strlen (debug) + 1;
-+  struct missing_debuginfos *missing_debuginfos;
-+  struct missing_debuginfos **slot;
++  size_t debug_len0 = debug ? strlen (debug) + 1 : 0;
++  struct missing_filepair *missing_filepair;
++  struct missing_filepair **slot;
 +
 +  if (build_id_verbose < BUILD_ID_VERBOSE_FILENAMES)
 +    return;
 +
-+  if (missing_debuginfos_hash == NULL)
++  if (missing_filepair_hash == NULL)
 +    {
-+      obstack_init (&missing_debuginfos_obstack);
-+      missing_debuginfos_hash = htab_create_alloc (64,
-+	(hashval_t (*) (const void *)) missing_debuginfos_hash_func,
-+	(int (*) (const void *, const void *)) missing_debuginfos_eq, NULL,
-+	missing_debuginfos_xcalloc, NULL);
++      obstack_init (&missing_filepair_obstack);
++      missing_filepair_hash = htab_create_alloc (64,
++	(hashval_t (*) (const void *)) missing_filepair_hash_func,
++	(int (*) (const void *, const void *)) missing_filepair_eq, NULL,
++	missing_filepair_xcalloc, NULL);
 +    }
 +
-+  missing_debuginfos = obstack_alloc (&missing_debuginfos_obstack,
-+				      sizeof (*missing_debuginfos) - 1
++  missing_filepair = obstack_alloc (&missing_filepair_obstack,
++				      sizeof (*missing_filepair) - 1
 +				      + binary_len0 + debug_len0);
-+  missing_debuginfos->binary = missing_debuginfos->data;
-+  memcpy (missing_debuginfos->binary, binary, binary_len0);
-+  missing_debuginfos->debug = missing_debuginfos->binary + binary_len0;
-+  memcpy (missing_debuginfos->debug, debug, debug_len0);
++  missing_filepair->binary = missing_filepair->data;
++  memcpy (missing_filepair->binary, binary, binary_len0);
++  if (debug != NULL)
++    {
++      missing_filepair->debug = missing_filepair->binary + binary_len0;
++      memcpy (missing_filepair->debug, debug, debug_len0);
++    }
++  else
++    missing_filepair->debug = NULL;
 +
-+  slot = (struct missing_debuginfos **) htab_find_slot (missing_debuginfos_hash,
-+							missing_debuginfos,
++  slot = (struct missing_filepair **) htab_find_slot (missing_filepair_hash,
++							missing_filepair,
 +							INSERT);
 +
 +  /* While it may be still printed duplicitely with the missing debuginfo file
@@ -880,41 +1177,53 @@
 +
 +  if (*slot != NULL)
 +    {
-+      obstack_free (&missing_debuginfos_obstack, missing_debuginfos);
++      obstack_free (&missing_filepair_obstack, missing_filepair);
 +      return;
 +    }
-+  *slot = missing_debuginfos;
++  *slot = missing_filepair;
 +
-+  if (print_filename)
-+    fprintf_unfiltered (gdb_stdlog, _("Missing separate debuginfo for %s\n"),
-+			binary);
-+  else
-+    fprintf_unfiltered (gdb_stdlog, _("(no separate debuginfo file found)\n"));
-+
-+  fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"),
-+		      "yum --enablerepo='*-debuginfo' install", debug);
-+
-+  if (exec_bfd != NULL)
-+    exec_filename = bfd_get_filename (exec_bfd);
-+  if (exec_filename != NULL)
++  if (missing_exec == MISSING_EXEC_NOT_TRIED)
 +    {
-+      static char *last_exec_filename;
++      char *exec_filename;
 +
-+      if (last_exec_filename == NULL
-+	  || strcmp (exec_filename, last_exec_filename) != 0)
++      exec_filename = get_exec_file (0);
++      if (exec_filename != NULL)
 +	{
-+	  xfree (last_exec_filename);
-+	  last_exec_filename = xstrdup (exec_filename);
-+
-+	  rpm_print_debuginfo (exec_filename);
++	  if (missing_rpm_enlist (exec_filename) == 0)
++	    missing_exec = MISSING_EXEC_NOT_FOUND;
++	  else
++	    missing_exec = MISSING_EXEC_ENLISTED;
 +	}
 +    }
++  if (missing_exec != MISSING_EXEC_ENLISTED)
++    if (missing_rpm_enlist (binary) == 0 && missing_rpm_enlist (debug) == 0)
++      {
++	/* We do not collect and flush these messages as each such message
++	   already requires its own separate lines.  */
++
++	fprintf_unfiltered (gdb_stdlog,
++			    _("Missing separate debuginfo for %s\n"), binary);
++        if (debug != NULL)
++	  fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"),
++			      "yum --enablerepo='*-debuginfo' install", debug);
++      }
 +}
 +
  static char *
  get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out)
  {
-@@ -1326,23 +1923,27 @@ find_separate_debug_file (struct objfile
+@@ -1297,31 +2121,35 @@ static char *
+ find_separate_debug_file (struct objfile *objfile)
+ {
+   asection *sect;
+-  char *basename;
+-  char *dir;
+-  char *debugfile;
++  char *basename = NULL;
++  char *dir = NULL;
++  char *debugfile = NULL;
+   char *name_copy;
+   bfd_size_type debuglink_size;
    unsigned long crc32;
    int i;
    struct build_id *build_id;
@@ -940,63 +1249,90 @@
  	}
        else if (build_id_name != NULL)
 -        return build_id_name;
-+        {
++	{
 +	  xfree (build_id_filename);
 +	  return build_id_name;
 +	}
      }
  
    basename = get_debug_link_info (objfile, &crc32);
-@@ -1350,7 +1951,10 @@ find_separate_debug_file (struct objfile
+@@ -1329,7 +2157,7 @@ find_separate_debug_file (struct objfile
    if (basename == NULL)
      /* There's no separate debug info, hence there's no way we could
         load it => no warning.  */
 -    return NULL;
-+    {
-+      xfree (build_id_filename);
-+      return NULL;
-+    }
++    goto cleanup_return_debugfile;
  
    dir = xstrdup (objfile->name);
  
-@@ -1379,6 +1983,7 @@ find_separate_debug_file (struct objfile
+@@ -1345,23 +2173,19 @@ find_separate_debug_file (struct objfile
+   gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i]));
+   dir[i+1] = '\0';
+ 
+-  debugfile = alloca (strlen (debug_file_directory) + 1
+-                      + strlen (dir)
+-                      + strlen (DEBUG_SUBDIRECTORY)
+-                      + strlen ("/")
+-                      + strlen (basename)
+-                      + 1);
++  debugfile = xmalloc (strlen (debug_file_directory) + 1
++		       + strlen (dir)
++		       + strlen (DEBUG_SUBDIRECTORY)
++		       + strlen ("/")
++		       + strlen (basename)
++		       + 1);
+ 
+   /* First try in the same directory as the original file.  */
+   strcpy (debugfile, dir);
+   strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
-     {
-+      xfree (build_id_filename);
-       xfree (basename);
-       xfree (dir);
-       return xstrdup (debugfile);
-@@ -1392,6 +1997,7 @@ find_separate_debug_file (struct objfile
+-    {
+-      xfree (basename);
+-      xfree (dir);
+-      return xstrdup (debugfile);
+-    }
++    goto cleanup_return_debugfile;
+ 
+   /* Then try in the subdirectory named DEBUG_SUBDIRECTORY.  */
+   strcpy (debugfile, dir);
+@@ -1370,11 +2194,7 @@ find_separate_debug_file (struct objfile
+   strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
-     {
-+      xfree (build_id_filename);
-       xfree (basename);
-       xfree (dir);
-       return xstrdup (debugfile);
-@@ -1405,11 +2011,20 @@ find_separate_debug_file (struct objfile
+-    {
+-      xfree (basename);
+-      xfree (dir);
+-      return xstrdup (debugfile);
+-    }
++    goto cleanup_return_debugfile;
+ 
+   /* Then try in the global debugfile directory.  */
+   strcpy (debugfile, debug_file_directory);
+@@ -1383,15 +2203,16 @@ find_separate_debug_file (struct objfile
+   strcat (debugfile, basename);
  
    if (separate_debug_file_exists (debugfile, crc32, objfile->name))
-     {
-+      xfree (build_id_filename);
-       xfree (basename);
-       xfree (dir);
-       return xstrdup (debugfile);
-     }
+-    {
+-      xfree (basename);
+-      xfree (dir);
+-      return xstrdup (debugfile);
+-    }
++    goto cleanup_return_debugfile;
  
-+  if (build_id_filename != NULL)
-+    {
-+      /* The filename is already printed for shared libraries.  */
-+      build_id_print_missing (objfile->name, build_id_filename,
-+			      1);
-+      xfree (build_id_filename);
-+    }
++  debugfile = NULL;
++  debug_print_missing (objfile->name, build_id_filename);
 +
++cleanup_return_debugfile:
++  xfree (build_id_filename);
    xfree (basename);
    xfree (dir);
-   return NULL;
-@@ -4045,4 +4660,16 @@ the global debug-file directory prepende
+-  return NULL;
++  return debugfile;
+ }
+ 
+ 
+@@ -4024,4 +4845,16 @@ the global debug-file directory prepende
  				     NULL,
  				     show_debug_file_directory,
  				     &setlist, &showlist);
@@ -1011,11 +1347,12 @@
 +			    show_build_id_verbose,
 +			    &setlist, &showlist);
 +
-+  observer_attach_inferior_created (missing_debuginfos_change_inferior_created);
++  observer_attach_executable_changed (debug_print_executable_changed);
  }
-diff -u -X /home/jkratoch/.diffi.list -rup gdb-6.6-unpatched/gdb/symfile.h gdb-6.6-patched/gdb/symfile.h
---- gdb-6.6-unpatched/gdb/symfile.h	2008-02-21 04:44:49.000000000 +0100
-+++ gdb-6.6-patched/gdb/symfile.h	2008-02-21 04:10:55.000000000 +0100
+Index: gdb-6.6/gdb/symfile.h
+===================================================================
+--- gdb-6.6.orig/gdb/symfile.h	2005-12-17 23:34:03.000000000 +0100
++++ gdb-6.6/gdb/symfile.h	2008-03-10 00:42:35.000000000 +0100
 @@ -322,6 +322,14 @@ extern bfd_byte *symfile_relocate_debug_
  extern void dwarf_build_psymtabs (struct objfile *, int, file_ptr,
  				  unsigned int, file_ptr, unsigned int);
@@ -1025,9 +1362,22 @@
 +extern struct build_id *build_id_addr_get (CORE_ADDR addr);
 +extern char *build_id_to_filename (struct build_id *build_id,
 +				   char **link_return, int add_debug_suffix);
-+extern void build_id_print_missing (const char *binary, const char *debug,
-+				    int print_filename);
++extern void debug_print_missing (const char *binary, const char *debug);
++extern void debug_flush_missing (void);
 +
  /* From dwarf2read.c */
  
  extern int dwarf2_has_info (struct objfile *);
+Index: gdb-6.6/gdb/tui/tui-interp.c
+===================================================================
+--- gdb-6.6.orig/gdb/tui/tui-interp.c	2005-12-23 20:10:02.000000000 +0100
++++ gdb-6.6/gdb/tui/tui-interp.c	2008-03-10 00:42:35.000000000 +0100
+@@ -32,6 +32,8 @@
+ #include "tui/tui.h"
+ #include "tui/tui-io.h"
+ #include "exceptions.h"
++#include "symtab.h"
++#include "symfile.h"
+ 
+ /* Set to 1 when the TUI mode must be activated when we first start gdb.  */
+ static int tui_start_enabled = 0;


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-8/gdb.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- gdb.spec	21 Feb 2008 21:41:37 -0000	1.260
+++ gdb.spec	10 Mar 2008 10:05:57 -0000	1.261
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 43%{?dist}
+Release: 44%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -721,6 +721,11 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Mon Mar 10 2008 Jan Kratochvil  - 6.6-44
+- build-id warnings integrated more with rpm and the lists of the warnings got
+  replaced usually by a single-line `debuginfo-install' advice.
+  - FIXME: Testsuite needs an update for the new pre-prompt messages.
+
 * Thu Feb 21 2008 Jan Kratochvil  - 6.6-43
 - Rename `set debug build-id' as `set build-id-verbose', former level 1 moved
   to level 2, default value is now 1, use `set build-id-verbose 0' now to



From fedora-extras-commits at redhat.com  Mon Mar 10 10:06:57 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 10:06:57 GMT
Subject: rpms/totem/devel totem.spec,1.172,1.173
Message-ID: <200803101006.m2AA6v9e002709@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2576

Modified Files:
	totem.spec 
Log Message:
Force newer liboil



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- totem.spec	9 Mar 2008 12:51:29 -0000	1.172
+++ totem.spec	10 Mar 2008 10:06:01 -0000	1.173
@@ -82,6 +82,7 @@
 BuildRequires: gstreamer-devel >= %gstreamer_version
 BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version
 BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
+BuildRequires: liboil >= 0.3.13-4
 
 %description gstreamer
 This package provides the gstreamer backend for the Totem media player.



From fedora-extras-commits at redhat.com  Mon Mar 10 10:11:42 2008
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 10 Mar 2008 10:11:42 GMT
Subject: rpms/sane-backends/devel sane-backends.spec,1.106,1.107
Message-ID: <200803101011.m2AABgxa002866@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2832

Modified Files:
	sane-backends.spec 
Log Message:
remove ancient sane-devel obsoletes/provides
remove libs/doc/gphoto2 conditionals
fix build root
add arch-specific provides/requires (#436657)



Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sane-backends.spec	19 Feb 2008 10:01:00 -0000	1.106
+++ sane-backends.spec	10 Mar 2008 10:10:56 -0000	1.107
@@ -1,28 +1,7 @@
-# --with/--without options:
-# gphoto2:        support gphoto2 backend
-# gphoto2_split:  ship gphoto2 backend in separate subpackage
-# libs_split:     ship libraries in separate subpackage
-# docs_split:     ship documentation in separate subpackage
-
-%bcond_without gphoto2_support
-%if %{with gphoto2_support}
-%bcond_without gphoto2_split
-%else
-%bcond_with gphoto2_split
-%endif
-
-%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-%bcond_without libs_split
-%bcond_with docs_split
-%else
-%bcond_with libs_split
-%bcond_without docs_split
-%endif
-
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.19
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -35,7 +14,7 @@
 Patch4: sane-backends-1.0.19-policykit.patch
 Patch5: sane-backends-1.0.19-uninitialized.patch
 URL: http://www.sane-project.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildRequires: tetex-latex
 BuildRequires: libusb-devel
 BuildRequires: libieee1284-devel
@@ -44,9 +23,7 @@
 BuildRequires: autoconf
 BuildRequires: libtool
 BuildRequires: gettext
-%if %{with gphoto2_support}
 BuildRequires: gphoto2-devel
-%endif
 Requires: pam >= 0.78-2
 Requires: hal >= 0.4.0
 ExcludeArch: s390 s390x
@@ -60,55 +37,37 @@
 %package devel
 Summary: SANE development toolkit
 Group: Development/Libraries
-Requires: sane-backends = %{version}-%{release}, libusb-devel, libieee1284-devel
+Requires: sane-backends = %{version}-%{release}
+Requires: libusb-devel
+Requires: libieee1284-devel
 Requires: pkgconfig
-%if %{with gphoto2_support}
 Requires: gphoto2-devel
-%endif
-Obsoletes: sane-devel
-Provides: sane-devel
 
 %description devel
 This package contains static libraries and header files for writing Scanner
 Access Now Easy (SANE) modules.
 
-%if %{with docs_split}
-%package docs
-Summary: Additional documentation for SANE
-Group: Documentation
-
-%description docs
-Additional documentation for SANE, a universal scanner interface.
-%endif
-
-%if %{with libs_split}
 %package libs
 Summary: SANE libraries
 Group: System Environment/Libraries
 Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: sane-backends <= 1.0.17-12
-%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-%if ! %{with docs_split}
 Obsoletes: sane-backends-docs <= 1.0.17-12
 Provides: sane-backends-docs = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
+Provides: sane-backends-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libs
 This package contains the SANE libraries which are needed by applications that
 want to access scanners.
 
-%if %{with gphoto2_split}
 %package libs-gphoto2
 Summary: SANE libraries for gphoto2
 Group: System Environment/Libraries
-Requires: sane-backends-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: sane-backends-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libs-gphoto2
 This package contains the SANE libraries which are needed by applications that
 want to access digital cameras.
-%endif
-%endif
 
 %prep
 %setup -q
@@ -130,11 +89,7 @@
 
 %build
 %configure \
-%if %{with gphoto2_support}
-    --with-gphoto2=%{_prefix}\
-%else
-    --without-gphoto2 \
-%endif
+    --with-gphoto2=%{_prefix} \
     --with-docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
 
@@ -161,13 +116,8 @@
 %clean
 rm -rf %{buildroot}
 
-%if %{with libs_split}
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
-%else
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-%endif
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -182,50 +132,19 @@
 %{_bindir}/scanimage
 %{_sbindir}/*
 
-%if ! %{with libs_split}
-%{_libdir}/libsane*.so.*
-%dir %{_libdir}/sane
-%{_libdir}/sane/*.so.*
-%endif
-
-%if ! %{with docs_split}
 %doc %{_docdir}/*
-%else
-%doc %{_docdir}/*
-%exclude %{_docdir}/%{name}-%{version}/sane-backends.html
-%exclude %{_docdir}/%{name}-%{version}/sane-backends-external.html
-%exclude %{_docdir}/%{name}-%{version}/sane-mfgs.html
-%exclude %{_docdir}/%{name}-%{version}/sane-mfgs-external.html
-%exclude %{_docdir}/%{name}-%{version}/sane.dvi
-%exclude %{_docdir}/%{name}-%{version}/sane.ps
-%endif
 
-%if %{with libs_split}
 %files libs
 %defattr(-, root, root)
 %{_libdir}/libsane*.so.*
 %dir %{_libdir}/sane
 %{_libdir}/sane/*.so*
 
-%if %{with gphoto2_split}
 %exclude %{_libdir}/sane/*gphoto2.so*
 
 %files libs-gphoto2
 %defattr(-, root, root)
 %{_libdir}/sane/*gphoto2.so.*
-%endif
-%endif
-
-%if %{with docs_split}
-%files docs
-%defattr(-, root, root)
-%doc %{_docdir}/%{name}-%{version}/sane-backends.html
-%doc %{_docdir}/%{name}-%{version}/sane-backends-external.html
-%doc %{_docdir}/%{name}-%{version}/sane-mfgs.html
-%doc %{_docdir}/%{name}-%{version}/sane-mfgs-external.html
-%doc %{_docdir}/%{name}-%{version}/sane.dvi
-%doc %{_docdir}/%{name}-%{version}/sane.ps
-%endif
 
 %files devel
 %defattr(-,root,root)
@@ -237,6 +156,12 @@
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Mon Mar 10 2008 Nils Philippsen  - 1.0.19-7
+- remove ancient sane-devel obsoletes/provides
+- remove libs/doc/gphoto2 conditionals
+- fix build root
+- add arch-specific provides/requires (#436657)
+
 * Tue Feb 19 2008 Nils Philippsen  - 1.0.19-6
 - move libsane-gphoto2.so into -libs-gphoto2
 - recode spec file to UTF-8



From fedora-extras-commits at redhat.com  Mon Mar 10 10:20:43 2008
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 10 Mar 2008 10:20:43 GMT
Subject: rpms/uim/devel uim.spec,1.53,1.54
Message-ID: <200803101020.m2AAKhrt003065@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3019

Modified Files:
	uim.spec 
Log Message:



Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- uim.spec	10 Mar 2008 09:48:01 -0000	1.53
+++ uim.spec	10 Mar 2008 10:20:09 -0000	1.54
@@ -190,6 +190,7 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcroots.*
+rm -rf $RPM_BUILD_ROOT%{_includedir}/gcroots.h
 rm -rf $RPM_BUILD_ROOT%{_includedir}/sigscheme
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sigscheme
 rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm



From fedora-extras-commits at redhat.com  Mon Mar 10 10:32:03 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Mar 2008 10:32:03 GMT
Subject: rpms/cernlib/EL-5 cernlib-212-print-test-results.dpatch, NONE,
	1.1 cernlib-213-fix-test-suite-build.dpatch, NONE,
	1.1 cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch, NONE,
	1.1 cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch, NONE,
	1.1 cernlib-217-abend-on-mathlib-test-failure.dpatch, NONE,
	1.1 cernlib-807-static-link-some-tests-on-64-bit.dpatch, NONE,
	1.1 geant321-213-fix-test-suite-build.dpatch, NONE,
	1.1 geant321-807-static-link-some-tests-on-64-bit.dpatch, NONE,
	1.1 mclibs-213-fix-test-suite-build.dpatch, NONE,
	1.1 mclibs-220-compile-isajet-with-isarun.dpatch, NONE,
	1.1 mclibs-807-static-link-some-tests-on-64-bit.dpatch, NONE,
	1.1 .cvsignore, 1.5,
	1.6 210-improve-cfortran-header-files.dpatch, 1.1,
	1.2 315-fixes-for-MacOSX.dpatch, 1.4,
	1.5 700-remove-kernlib-from-packlib-Imakefile.dpatch, 1.1,
	1.2 702-patch-Imakefiles-for-packlib-mathlib.dpatch, 1.1,
	1.2 802-create-shared-libraries.dpatch, 1.2,
	1.3 cernlib-102-dont-optimize-some-code.dpatch, 1.1,
	1.2 cernlib-211-support-amd64-and-itanium.dpatch, 1.1,
	1.2 cernlib-211-support-digital-alpha.dpatch, 1.2,
	1.3 cernlib-303-shadow-passwords-supported.dpatch, 1.1,
	1.2 cernlib-304-update-Imake-config-files.dpatch, 1.2,
	1.3 cernlib-308-use-canonical-cfortran-location.dpatch, 1.1,
	1.2 cernlib-321-support-gfortran.dpatch, 1.2,
	1.3 cernlib-600-use-host.def-config-file.dpatch, 1.1,
	1.2 cernlib-800-implement-shared-library-rules-in-Imake.dpatch,
	1.2, 1.3 cernlib-803-link-binaries-dynamically.dpatch, 1.2,
	1.3 cernlib.spec, 1.40,
	1.41 geant321-001-fix-missing-fluka.dpatch, 1.2,
	1.3 geant321-003-geant-dummy-functions.dpatch, 1.1,
	1.2 geant321-203-compile-geant-with-ertrak.dpatch, 1.1,
	1.2 geant321-806-bump-mathlib-and-dependents-sonames.dpatch, 1.1,
	1.2 mclibs-321-support-gfortran.dpatch, 1.1,
	1.2 paw-108-quote-protect-comis-script.dpatch, 1.1,
	1.2 paw-200-comis-allow-special-chars-in-path.dpatch, 1.1,
	1.2 paw-211-support-amd64-and-itanium.dpatch, 1.1,
	1.2 paw-308-use-canonical-cfortran-location.dpatch, 1.1,
	1.2 paw-320-support-ifort-and-gfortran.dpatch, 1.1,
	1.2 paw-803-link-binaries-dynamically.dpatch, 1.1,
	1.2 paw-804-workaround-for-comis-mdpool-struct-location.dpatch,
	1.1, 1.2 sources, 1.6, 1.7 cernlib-64test.patch, 1.1,
	NONE cernlib-segf_eudtest.patch, 1.1, NONE cernlib-test.patch,
	1.1, NONE
Message-ID: <200803101032.m2AAW39a003394@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3297

Modified Files:
	.cvsignore 210-improve-cfortran-header-files.dpatch 
	315-fixes-for-MacOSX.dpatch 
	700-remove-kernlib-from-packlib-Imakefile.dpatch 
	702-patch-Imakefiles-for-packlib-mathlib.dpatch 
	802-create-shared-libraries.dpatch 
	cernlib-102-dont-optimize-some-code.dpatch 
	cernlib-211-support-amd64-and-itanium.dpatch 
	cernlib-211-support-digital-alpha.dpatch 
	cernlib-303-shadow-passwords-supported.dpatch 
	cernlib-304-update-Imake-config-files.dpatch 
	cernlib-308-use-canonical-cfortran-location.dpatch 
	cernlib-321-support-gfortran.dpatch 
	cernlib-600-use-host.def-config-file.dpatch 
	cernlib-800-implement-shared-library-rules-in-Imake.dpatch 
	cernlib-803-link-binaries-dynamically.dpatch cernlib.spec 
	geant321-001-fix-missing-fluka.dpatch 
	geant321-003-geant-dummy-functions.dpatch 
	geant321-203-compile-geant-with-ertrak.dpatch 
	geant321-806-bump-mathlib-and-dependents-sonames.dpatch 
	mclibs-321-support-gfortran.dpatch 
	paw-108-quote-protect-comis-script.dpatch 
	paw-200-comis-allow-special-chars-in-path.dpatch 
	paw-211-support-amd64-and-itanium.dpatch 
	paw-308-use-canonical-cfortran-location.dpatch 
	paw-320-support-ifort-and-gfortran.dpatch 
	paw-803-link-binaries-dynamically.dpatch 
	paw-804-workaround-for-comis-mdpool-struct-location.dpatch 
	sources 
Added Files:
	cernlib-212-print-test-results.dpatch 
	cernlib-213-fix-test-suite-build.dpatch 
	cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch 
	cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch 
	cernlib-217-abend-on-mathlib-test-failure.dpatch 
	cernlib-807-static-link-some-tests-on-64-bit.dpatch 
	geant321-213-fix-test-suite-build.dpatch 
	geant321-807-static-link-some-tests-on-64-bit.dpatch 
	mclibs-213-fix-test-suite-build.dpatch 
	mclibs-220-compile-isajet-with-isarun.dpatch 
	mclibs-807-static-link-some-tests-on-64-bit.dpatch 
Removed Files:
	cernlib-64test.patch cernlib-segf_eudtest.patch 
	cernlib-test.patch 
Log Message:
sync with devel, without ABI incompatible changes


--- NEW FILE cernlib-212-print-test-results.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 212-print-test-results.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Explicitly output test program exit codes.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.rules cernlib-2006.dfsg.2/src/config/Imake.rules
--- cernlib-2006.dfsg.2~/src/config/Imake.rules	2005-04-18 15:39:25.000000000 +0000
+++ cernlib-2006.dfsg.2/src/config/Imake.rules	2007-12-13 18:52:12.000000000 +0000
@@ -2373,13 +2373,15 @@
 test:: ProgramTargetName(program) data inputdata			@@\
 	@echo Testing $(PACKAGE_NAME)					@@\
 	@echo "  ... using" program						@@\
-	@Concat(.,$(PATHSEP))ProgramTargetName(program)			@@\
+	@Concat(.,$(PATHSEP))ProgramTargetName(program)	; \		@@\
+	result="$$?" ; echo "Test result = $$result" ; exit "$$result"	@@\
 									@@\
 else									@@\
 test:: ProgramTargetName(program) data inputdata			@@\
 	@echo Testing $(PACKAGE_NAME)					@@\
 	@echo "  ... using" program					@@\
-	@Concat(.,$(PATHSEP))ProgramTargetName(program) < inputdata	@@\
+	@Concat(.,$(PATHSEP))ProgramTargetName(program) < inputdata ; \	@@\
+	result="$$?" ; echo "Test result = $$result" ; exit "$$result"	@@\
 									@@\
 endif									@@\
 									@@\


--- NEW FILE cernlib-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/bvsl/test/Imakefile cernlib-2006.dfsg.2/src/mathlib/bvsl/test/Imakefile
--- cernlib-2006.dfsg.2~/src/mathlib/bvsl/test/Imakefile	1996-03-21 17:19:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/mathlib/bvsl/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -6,7 +6,7 @@
 
 DefinePackageLibrary(bvsltst)
 
-CernlibFortranProgramTarget(bvslt,tsbvsl.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib kernlib)
+CernlibFortranProgramTarget(bvslt,tsbvsl.o,libbvsltst.a,libbvsltst.a,mathlib kernlib)
 
 TestTarget(bvslt,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/tests/Imakefile
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/Imakefile	2005-03-24 16:40:10.000000000 +0000
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -63,7 +63,7 @@
 
 DefinePackageLibrary(gentest)
 
-CernlibFortranProgramTarget(gent,main.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(gent,main.o,libgentest.a,libgentest.a,packlib mathlib)
 
 
 TestTarget(gent,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest1/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest1/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest1/Imakefile	1996-03-08 15:21:45.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest1/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -11,9 +11,9 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ptest1_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest1_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
-CernlibFortranProgramTarget(ptest1_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest1_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ptest1_32,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest2/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest2/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest2/Imakefile	1996-03-08 15:21:45.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest2/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -10,9 +10,9 @@
 SpecialFortranObjectRule(main_32,main,NullParameter,-DCERNLIB_PH32BIT)
 SpecialFortranObjectRule(test2_32,test2,NullParameter,-DCERNLIB_PH32BIT)
 
-CernlibFortranProgramTarget(ptest2_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest2_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
-CernlibFortranProgramTarget(ptest2_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest2_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ptest2_32,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest3/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest3/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest3/Imakefile	1996-03-08 15:21:46.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest3/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -12,9 +12,9 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ptest3_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest3_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
-CernlibFortranProgramTarget(ptest3_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest3_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ptest3_32,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile	1996-10-02 15:36:27.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -2,7 +2,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ffread,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ffread,NullParameter,test.input)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile	1996-02-20 15:46:21.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -5,11 +5,11 @@
 
 DefinePackageLibrary(hbtlib)
 
-CernlibFortranProgramTarget(hbtest,hexam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(hbtest,hexam.o,libhbtlib.a,libhbtlib.a,packlib)
 
-CernlibFortranProgramTarget(hbdiff,htdiffb.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(hbdiff,htdiffb.o,libhbtlib.a,libhbtlib.a,mathlib)
 
-CernlibFortranProgramTarget(hmerge,hmerg.o hmergin.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(hmerge,hmerg.o hmergin.o,libhbtlib.a,libhbtlib.a,mathlib)
 
 TestTarget(hbtest,NullParameter,NullParameter)
 TestTarget(hbdiff,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/tests/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/tests/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/tests/Imakefile	1996-02-20 15:46:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/tests/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -1,6 +1,6 @@
 #if 0
 /* this is not yet understood */
-CernlibFortranProgramTarget(hbtest,test_fp.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(hbtest,test_fp.o,NullParameter,NullParameter,packlib)
 
 
 TestTarget(hbtest)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kapack/test/Imakefile cernlib-2006.dfsg.2/src/packlib/kapack/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kapack/test/Imakefile	1996-12-02 15:29:51.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kapack/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -1,7 +1,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(kapack,test1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(kapack,test1.o,NullParameter,NullParameter,kernlib packlib)
 
 /* the kapack test, or better kamake asks for a file name only in unix.
  *  on VMS, the file is opened on unit 11, resulting in for011.dat
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile	1996-10-02 15:37:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -5,7 +5,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ktest,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib kernlib)
+CernlibFortranProgramTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
 
 TestTarget(ktest,NullParameter,ktest.inp)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/minuit/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/minuit/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/minuit/examples/Imakefile	1997-10-23 17:04:15.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/minuit/examples/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -9,6 +9,6 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
-CernlibFortranProgramTarget(minuit,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(minuit,$(OBJS),NullParameter,NullParameter,packlib)
 
 TestTarget(minuit,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile	1996-03-12 08:13:30.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -5,6 +5,6 @@
 
 SubdirLibraryTarget(zbookt,NullParameter)
 
-CernlibFortranProgramTarget(zexam,zexam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
 
 TestTarget(zexam,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile	1997-08-29 13:33:57.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -41,27 +41,27 @@
 
 testrz: zebrz1 zebrz2 zebrz3
 
-CernlibFortranProgramTarget(zebmz1,zebmz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebmz1,zebmz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebfz1,zebfz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz2,zebfz2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz3,zebfz3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz4,zebfz4.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz5,zebfz5.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz6,zebfz6.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz7,zebfz7.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz8,zebfz8.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz9,zebfz9.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebfz1,zebfz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz2,zebfz2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz3,zebfz3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz4,zebfz4.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz5,zebfz5.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz6,zebfz6.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz7,zebfz7.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz8,zebfz8.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz9,zebfz9.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebfc1,zebfc1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfc2,zebfc2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfc3,zebfc3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebfc1,zebfc1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfc2,zebfc2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfc3,zebfc3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebjz1,zebjz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebjz1,zebjz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebrz1,zebrz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebrz2,zebrz2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebrz3,zebrz3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebrz1,zebrz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebrz2,zebrz2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebrz3,zebrz3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
 TestTarget(zebmz1,zxtest.dat,NullParameter)
 


--- NEW FILE cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 214-fix-kernnum-funcs-on-64-bit.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Attempt to fix kernnum use of pointer differences on 64-bit arches.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cxj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cxj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JX  =  (IADDR(X2) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cyj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/czj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/czj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/czj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/czj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dxj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dxj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JX  =  (IADDR(X2) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dyj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dzj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rxj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rxj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JX  =   (IADDR(X2) - IADDR(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =   IPTRDIFF(X2, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/ryj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/ryj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/ryj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/ryj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =   (IADDR(Y2) - IADDR(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =   IPTRDIFF(Y2, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rzj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =   (IADDR(Z2) - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =   IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cdi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cdi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cdi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cdi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           ID  =  (IADDR(D2)  - IADDR(D)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          ID  =  IPTRDIFF(D2, D) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cujk.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cujk.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           JU  =  (IADDR(U12) - IADDR(U)) / 8
           KU  =  (IADDR(U22) - IADDR(U)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JU  =  IPTRDIFF(U12, U) / 8
+          KU  =  IPTRDIFF(U22, U) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IX  =  (IADDR(X2)  - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IX  =  (IADDR(X21) - IADDR(X)) / 8
           JX  =  (IADDR(X12) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X21, X) / 8
+          JX  =  IPTRDIFF(X12, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IY  =  (IADDR(Y21) - IADDR(Y)) / 8
           JY  =  (IADDR(Y12) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IY  =  IPTRDIFF(Y21, Y) / 8
+          JY  =  IPTRDIFF(Y12, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyj.inc	1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czi.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IZ  =  (IADDR(Z2)  - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IZ  =  (IADDR(Z21) - IADDR(Z)) / 8
           JZ  =  (IADDR(Z12) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z21, Z) / 8
+          JZ  =  IPTRDIFF(Z12, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czj.inc	1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ddi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ddi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ddi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ddi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           ID  =  (IADDR(D2)  - IADDR(D)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          ID  =  IPTRDIFF(D2, D) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dujk.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dujk.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           JU  =  (IADDR(U12) - IADDR(U)) / 8
           KU  =  (IADDR(U22) - IADDR(U)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JU  =  IPTRDIFF(U12, U) / 8
+          KU  =  IPTRDIFF(U22, U) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IX  =  (IADDR(X2)  - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IX  =  (IADDR(X21) - IADDR(X)) / 8
           JX  =  (IADDR(X12) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X21, X) / 8
+          JX  =  IPTRDIFF(X12, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IY  =  (IADDR(Y21) - IADDR(Y)) / 8
           JY  =  (IADDR(Y12) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IY  =  IPTRDIFF(Y21, Y) / 8
+          JY  =  IPTRDIFF(Y12, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyj.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzi.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IZ  =  (IADDR(Z2)  - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IZ  =  (IADDR(Z21) - IADDR(Z)) / 8
           JZ  =  (IADDR(Z12) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z21, Z) / 8
+          JZ  =  IPTRDIFF(Z12, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzj.inc	1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rdi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rdi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rdi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rdi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           ID  =  (IADDR(D2)  - IADDR(D)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          ID  =  IPTRDIFF(D2, D) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rujk.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rujk.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           JU  =  (IADDR(U12) - IADDR(U)) / 4
           KU  =  (IADDR(U22) - IADDR(U)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JU  =  IPTRDIFF(U12, U) / 4
+          KU  =  IPTRDIFF(U22, U) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IX  =  (IADDR(X2)  - IADDR(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X2, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IX  =  (IADDR(X21) - IADDR(X)) / 4
           JX  =  (IADDR(X12) - IADDR(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X21, X) / 4
+          JX  =  IPTRDIFF(X12, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IY  =  (IADDR(Y21) - IADDR(Y)) / 4
           JY  =  (IADDR(Y12) - IADDR(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IY  =  IPTRDIFF(Y21, Y) / 4
+          JY  =  IPTRDIFF(Y12, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryj.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =   (IADDR(Y2) - IADDR(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =   IPTRDIFF(Y2, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IZ  =  (IADDR(Z2)  - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IZ  =  (IADDR(Z21) - IADDR(Z)) / 4
           JZ  =  (IADDR(Z12) - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z21, Z) / 4
+          JZ  =  IPTRDIFF(Z12, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzj.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =   (IADDR(Z2) - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =   IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/dlocf.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/dlocf.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/dlocf.inc	1996-02-15 17:49:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/dlocf.inc	2008-01-02 20:02:31.000000000 +0000
@@ -57,3 +57,12 @@
           IZ  =  (IADDR(Z21(1)) - LOCZ) / 8
           LZ  =  (IADDR(Z12(1)) - LOCZ) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IF(MIN0(M,N,K) .LE. 0)  RETURN
+          IX  =  IPTRDIFF(X21(1), X(1)) / 8
+          JX  =  IPTRDIFF(X12(1), X(1)) / 8
+          JY  =  IPTRDIFF(Y21(1), Y(1)) / 8
+          LY  =  IPTRDIFF(Y12(1), Y(1)) / 8
+          IZ  =  IPTRDIFF(Z21(1), Z(1)) / 8
+          LZ  =  IPTRDIFF(Z12(1), Z(1)) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/rlocf.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/rlocf.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/rlocf.inc	1996-02-15 17:49:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/rlocf.inc	2008-01-02 20:02:31.000000000 +0000
@@ -57,3 +57,12 @@
           IZ  =  (IADDR(Z21(1)) - LOCZ) / 4
           LZ  =  (IADDR(Z12(1)) - LOCZ) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IF(MIN0(M,N,K) .LE. 0)  RETURN
+          IX  =  IPTRDIFF(X21(1), X(1)) / 4
+          JX  =  IPTRDIFF(X12(1), X(1)) / 4
+          JY  =  IPTRDIFF(Y21(1), Y(1)) / 4
+          LY  =  IPTRDIFF(Y12(1), Y(1)) / 4
+          IZ  =  IPTRDIFF(Z21(1), Z(1)) / 4
+          LZ  =  IPTRDIFF(Z12(1), Z(1)) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/zisxy.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/zisxy.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/zisxy.inc	1996-02-15 17:49:01.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/zisxy.inc	2008-01-02 20:02:31.000000000 +0000
@@ -9,9 +9,15 @@
 *
 * zisxy.inc
 *
+#ifdef CERNLIB_NUM64
+	  IF(IPTRSAME(Z(1), X(1)) .EQ. 1)  GOTO 30
+	  IF(IPTRSAME(Z(1), Y(1)) .EQ. 1)  GOTO 40
+	  IF(IPTRSAME(X(1), Y(1)) .EQ. 1)  GOTO 20
+#else
           IF(LOCZ .EQ. LOCX)  GOTO 30
           IF(LOCZ .EQ. LOCY)  GOTO 40
           IF(LOCX .EQ. LOCY)  GOTO 20
+#endif
   10      LY1L  =  1
           LZ1L  =  1
           DO 13     L  =  1, K
@@ -68,7 +74,11 @@
              LZII  =  LZII + IZ + LZ
   24         CONTINUE
           RETURN
+#ifdef CERNLIB_NUM64
+  30      IF(IPTRSAME(X(1), Y(1)) .EQ. 1)  GOTO 50
+#else
   30      IF(LOCX .EQ. LOCY)  GOTO 50
+#endif
           LXI1  =  1
           DO 34     I  =  1, M
              LY1L  =  1
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/kernnum/pilot.h cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/kernnum/pilot.h
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/kernnum/pilot.h	1997-02-04 17:36:48.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/kernnum/pilot.h	2008-01-02 20:02:31.000000000 +0000
@@ -19,7 +19,7 @@
 #endif
 #endif
 
-#if defined(CERNLIB_LINUX)||defined(CERNLIB_MSDOS) && !defined(CERNLIB_WINNT)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_QMLXIA64) || defined(CERNLIB_MSDOS) && !defined(CERNLIB_WINNT)
 #ifndef CERNLIB_NUMIB2
 #define CERNLIB_NUMIB2
 #endif
@@ -31,6 +31,18 @@
 #endif
 #endif
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#ifndef CERNLIB_NUM64
+#define CERNLIB_NUM64
+#endif
+#ifdef CERNLIB_NUMD38
+#undef CERNLIB_NUMD38
+#endif
+#ifndef CERNLIB_NUMD279
+#define CERNLIB_NUMD279
+#endif
+#endif
+
 #if defined(CERNLIB_VAXVMS)
 #ifndef CERNLIB_NUMDE
 #define CERNLIB_NUMDE
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h	1997-02-04 17:36:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h	2008-01-02 20:02:31.000000000 +0000
@@ -44,6 +44,11 @@
 #ifndef CERNLIB_NUMLN
 #define CERNLIB_NUMLN
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#ifndef CERNLIB_NUM64
+#define CERNLIB_NUM64
+#endif
+#endif
 #endif
 
 #if defined(CERNLIB_MSDOS)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F	1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F	2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
           IF(N .LE. 0)  RETURN
           CVDIST  =  DISTF(X(1),Y(1))
           IF(N .LE. 1)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
@@ -26,6 +26,10 @@
           JX  =  (%LOC(X2) - %LOC(X)) / 8
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LX  =  1
           LY  =  1
           DO 10     J  =  2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F	1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F	2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
           IF(N .LE. 0)  RETURN
           DVDIST  =  DISTF(X(1),Y(1))
           IF(N .LE. 1)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
@@ -26,6 +26,10 @@
           JX  =  (%LOC(X2) - %LOC(X)) / 8
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LX  =  1
           LY  =  1
           DO 10     J  =  2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F	1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F	2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
           IF(N .LE. 0)  RETURN
           RVDIST  =  DISTF(X(1),Y(1))
           IF(N .LE. 1)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
           JY  =  LOCF(Y2) - LOCF(Y)
 #endif
@@ -26,6 +26,10 @@
           JX  =  (%LOC(X2) - %LOC(X)) / 4
           JY  =  (%LOC(Y2) - %LOC(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+          JY  =  IPTRDIFF(Y2, Y) / 4
+#endif
           LX  =  1
           LY  =  1
           DO 10     J  =  2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/check3.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/check3.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/check3.F	1996-03-21 17:16:07.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/check3.F	2008-01-02 20:02:31.000000000 +0000
@@ -343,7 +343,7 @@
           I  =  1
           IF(N .EQ. 1)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -352,6 +352,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+#endif
           DO 10     J  =  2, N
              LXJ  =  LXJ + JX
              T    =  ABSF(X(LXJ))
@@ -373,7 +376,7 @@
           I  =  1
           IF(N .EQ. 1)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -382,6 +385,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  2, N
              LXJ  =  LXJ + JX
              T    =  ABSF(X(LXJ))
@@ -403,7 +409,7 @@
           I  =  1
           IF(N .EQ. 1)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -412,6 +418,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  2, N
              LXJ  =  LXJ + JX
              T    =  ABSF(X(LXJ))
@@ -441,7 +450,7 @@
           RVSUMA  =  0.
           IF(N .LE. 0)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -450,6 +459,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+#endif
           DO 10     J  =  1, N
              RVSUMA  =  RVSUMA + ABS(X(LXJ))
              LXJ  =  LXJ + JX
@@ -461,7 +473,7 @@
           DVSUMA  =  0.
           IF(N .LE. 0)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -470,6 +482,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  1, N
              DVSUMA  =  DVSUMA + ABS(SNGL(X(LXJ)))
              LXJ  =  LXJ + JX
@@ -481,7 +496,7 @@
           CVSUMA  =  0.
           IF(N .LE. 0)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -490,6 +505,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  1, N
           CVSUMA = CVSUMA + AMAX1(ABS(REAL(X(LXJ))),ABS(AIMAG(X(LXJ))))
           LXJ  =  LXJ + JX
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F	1996-03-21 17:16:08.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F	2008-01-02 20:02:31.000000000 +0000
@@ -329,7 +329,7 @@
           IF(.NOT. OK)  WRITE(IOUNIT,1000) N, IFAIL
           IF(N .LE. 0) RETURN
           KFAIL  =  IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JY  =  LOCF(Y2) - LOCF(Y)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -338,6 +338,9 @@
 #if defined(CERNLIB_NUMDE)
           JY  =  (%LOC(Y2) - %LOC(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 4
+#endif
           LY     =  (KFAIL - 1)*JY + 1
           S      =  Y(LY)
           Y(LY)  =  ZERO
@@ -366,7 +369,7 @@
           IF(.NOT. OK)  WRITE(IOUNIT,1000) N, IFAIL
           IF(N .LE. 0) RETURN
           KFAIL  =  IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -375,6 +378,9 @@
 #if defined(CERNLIB_NUMDE)
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LY     =  (KFAIL - 1)*JY + 1
           S      =  Y(LY)
           Y(LY)  =  ZERO
@@ -403,7 +409,7 @@
           IF(.NOT. OK)  WRITE(IOUNIT,1000) N, IFAIL
           IF(N .LE. 0) RETURN
           KFAIL  =  IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -412,6 +418,9 @@
 #if defined(CERNLIB_NUMDE)
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LY     =  (KFAIL - 1)*JY + 1
           S      =  Y(LY)
           Y(LY)  =  ZERO
@@ -1139,7 +1148,7 @@
           XS2  =  ZERO
           XM2  =  ZERO
           IF(N .LE. 0)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -1148,6 +1157,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+#endif
           LX  =  1
           S1  =  ZERO
           S2  =  ZERO
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F	1996-03-21 17:16:10.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F	2008-01-02 20:03:24.000000000 +0000
@@ -251,7 +251,8 @@
      +           3X,7H IDIM =,I5, 3X, 4H E =,1PE12.3)
           END
           SUBROUTINE TSING(N,A,R,OK,FACT,SETEX,RABS,VXCH)
-          REAL      A(*),     R(*),     DET(2)
+          REAL      A(*),     R(*)
+          DOUBLE PRECISION    DET(2)
           LOGICAL   OK,       OKDET
 #include "kernnumt/sysdat.inc"
 #include "ch3dat.inc"


--- NEW FILE cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 216-use-cernlib-gamma-not-intrinsic.dpatch by Kevin B. McCarty 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Force use of mathlib gamma function in mathlib tests.
## DP: Built-in libc gamma function may not be sufficiently precise,
## DP: see, e.g., http://gcc.gnu.org/ml/fortran/2007-10/msg00096.html etc.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/algama.F cernlib-2006.dfsg.2/src/mathlib/gen/c/algama.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/algama.F	1996-04-01 07:01:54.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/algama.F	2008-01-29 10:02:41.000000000 -0800
@@ -10,6 +10,7 @@
 #if (defined(CERNLIB_DOUBLE))&&(!defined(CERNLIB_IBM))
       FUNCTION ALGAMA(X)
       DOUBLE PRECISION DLGAMA,D
+      EXTERNAL DLGAMA
 
       ENTRY ALOGAM(X)
 
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/alogam.F cernlib-2006.dfsg.2/src/mathlib/gen/c/alogam.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/alogam.F	1996-04-01 07:01:54.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/alogam.F	2008-01-29 10:03:54.000000000 -0800
@@ -9,6 +9,7 @@
 #include "gen/pilot.h"
 #if (defined(CERNLIB_DOUBLE))&&(defined(CERNLIB_IBM))
       FUNCTION ALOGAM(X)
+      EXTERNAL ALGAMA
       ALOGAM = ALGAMA(X)
       END
 #endif
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/bsja64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/bsja64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/bsja64.F	1996-04-01 07:02:08.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/bsja64.F	2008-01-29 10:00:11.000000000 -0800
@@ -21,9 +21,11 @@
 #if defined(CERNLIB_DOUBLE)
       PARAMETER (NAMEJ = 'BSJA/DBSJA',
      1           NAMEI = 'BSIA/DBSIA')
+      EXTERNAL DGAMMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       PARAMETER (NAMEJ = 'BSJA', NAMEI = 'BSIA')
+      EXTERNAL GAMMA
 #endif
       LOGICAL LJA,LIA,LEV,LER
       DIMENSION B(0:*),BA(0:100),RR(0:100)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/cbsja64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/cbsja64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/cbsja64.F	1996-04-01 07:02:09.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/cbsja64.F	2008-01-29 10:00:11.000000000 -0800
@@ -21,9 +21,11 @@
       CHARACTER NAME*(*)
 #if defined(CERNLIB_DOUBLE)
       PARAMETER (NAME = 'CBSJA/WBSJA')
+      EXTERNAL DGAMMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       PARAMETER (NAME = 'CBSJA')
+      EXTERNAL GAMMA
 #endif
       LOGICAL LER
       DIMENSION CB(0:*),CBA(0:100),RR(0:100)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/dlogam.F cernlib-2006.dfsg.2/src/mathlib/gen/c/dlogam.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/dlogam.F	1996-04-01 07:01:55.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/dlogam.F	2008-01-29 10:04:25.000000000 -0800
@@ -9,6 +9,7 @@
 #include "gen/pilot.h"
 #if defined(CERNLIB_IBM)
       FUNCTION DLOGAM(X)
+      EXTERNAL DLGAMA
 #include "gen/imp64.inc"
       DLOGAM = DLGAMA(X)
       END
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/gagnc64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/gagnc64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/gagnc64.F	1996-04-01 07:02:05.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/gagnc64.F	2008-01-29 10:04:48.000000000 -0800
@@ -25,9 +25,11 @@
       CHARACTER NAME*(*)
       CHARACTER*80 ERRTXT
 #if !defined(CERNLIB_DOUBLE)
+      EXTERNAL ALGAMA
       PARAMETER (NAME = 'RGAGNC')
 #endif
 #if defined(CERNLIB_DOUBLE)
+      EXTERNAL DLGAMA
       PARAMETER (NAME = 'RGAGNC/DGAGNC')
 #endif
 
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/gapnc64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/gapnc64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/gapnc64.F	1996-04-01 07:02:05.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/gapnc64.F	2008-01-29 10:03:35.000000000 -0800
@@ -24,9 +24,11 @@
       CHARACTER NAME*(*)
       CHARACTER*80 ERRTXT
 #if !defined(CERNLIB_DOUBLE)
+      EXTERNAL ALGAMA
       PARAMETER (NAME = 'RGAPNC')
 #endif
 #if defined(CERNLIB_DOUBLE)
+      EXTERNAL DLGAMA
       PARAMETER (NAME = 'RGAPNC/DGAPNC')
 #endif
       PARAMETER (EPS = 5D-14)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/rrizet64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/rrizet64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rrizet64.F	1996-04-01 07:02:00.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rrizet64.F	2008-01-29 10:00:11.000000000 -0800
@@ -14,12 +14,14 @@
 C
       CHARACTER*(*) NAME
       PARAMETER(NAME='RRIZET/DRIZET')
+      EXTERNAL DGAMMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       FUNCTION RRIZET(X)
 C
       CHARACTER*(*) NAME
       PARAMETER(NAME='RRIZET')
+      EXTERNAL GAMMA
 #endif
 C
       DIMENSION P1(0:8),P2(0:8),P3(0:9),P4(0:8)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/g/gamdis.F cernlib-2006.dfsg.2/src/mathlib/gen/g/gamdis.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/g/gamdis.F	1996-04-01 07:02:43.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/g/gamdis.F	2008-01-29 10:00:11.000000000 -0800
@@ -28,6 +28,8 @@
       PARAMETER (Z1 = 1, HALF = Z1/2, QUAR = Z1/4)
       PARAMETER (C1 = 3*Z1/2, KMAX = 300)
 
+      EXTERNAL GAMMA
+
       DATA C
      1/ 0.5772157,-0.6558781,-0.0420026, 0.1665386,-0.0421977,
      2 -0.0096220, 0.0072189,-0.0011652,-0.0002152, 0.0001281,
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c302m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/c302m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c302m.F	1996-04-01 07:01:13.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/c302m.F	2008-01-29 10:00:11.000000000 -0800
@@ -36,6 +36,7 @@
 #include "gen/imp64.inc"
 
       REAL GAMMA
+      EXTERNAL GAMMA, DGAMMA
       CHARACTER*6 TFUNC(2)
 #include "iorc.inc"
 C
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c310m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/c310m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c310m.F	1996-04-01 07:01:14.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/c310m.F	2008-01-29 10:02:19.000000000 -0800
@@ -36,6 +36,7 @@
 
 #include "imp64r.inc"
       REAL  ALGAMA
+      EXTERNAL ALGAMA
 C     Set maximum error allowed for test to be considered successful
       DIMENSION TOL(2),TOLIBM(2)
 
@@ -50,6 +51,7 @@
 #if defined(CERNLIB_DOUBLE)
       DIMENSION  Y(7),T(7)
       REAL            RT(7)
+      EXTERNAL DLGAMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       REAL       Y(7),T(7)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/e408m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/e408m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/e408m.F	1998-11-05 02:41:34.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/e408m.F	2008-01-29 10:00:11.000000000 -0800
@@ -44,6 +44,12 @@
       DATA TXT(2) /'EXP(-X**2)  (-1 <= X <= 1)  LUKE 3.2.2(8)'/
       DATA TXT(3) /'J_1(X)      (-1 <= X <= 1)  LUKE 9.7(7)'/
 
+#if defined(CERNLIB_DOUBLE)
+      EXTERNAL DGAMMA
+#else
+      EXTERNAL GAMMA
+#endif
+
 #if !defined(CERNLIB_WINNT) && !defined(CERNLIB_LINUX)
 # if defined(CERNLIB_DOUBLE)
       GVSUM(N,B,C) = DVSUM(N,B,C)


--- NEW FILE cernlib-217-abend-on-mathlib-test-failure.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 217-abend-on-mathlib-test-failure.dpatch by Kevin B. McCarty 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Force mathlib test program to exit non-zero if any test fails.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/main.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/main.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/main.F	1996-09-17 01:53:22.000000000 -0700
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/main.F	2008-02-22 12:24:43.000000000 -0800
@@ -332,5 +332,7 @@
 #endif
 C     Close output streams
       IF (LOUT .NE. 6) CLOSE(UNIT=LOUT)
+C     Exit non-zero if any test failed           
+      IF (NFAIL .NE. 0) CALL EXITF(1)
       STOP
       END


--- NEW FILE cernlib-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Statically link certain test programs against CERN libraries on
## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
## DP: broken there.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -2,7 +2,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
+#else
 CernlibFortranProgramTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
+#endif
 
 TestTarget(ffread,NullParameter,test.input)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile	2007-12-17 17:55:51.000000000 +0000
@@ -5,6 +5,12 @@
 
 DefinePackageLibrary(hbtlib)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#undef CernlibFortranProgramTarget
+#define CernlibFortranProgramTarget(a,b,c,d,e) \
+	CernlibFortranStaticTarget(a,b,c,d,e)
+#endif
+
 CernlibFortranProgramTarget(hbtest,hexam.o,libhbtlib.a,libhbtlib.a,packlib)
 
 CernlibFortranProgramTarget(hbdiff,htdiffb.o,libhbtlib.a,libhbtlib.a,mathlib)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -5,7 +5,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
+#else
 CernlibFortranProgramTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
+#endif
 
 TestTarget(ktest,NullParameter,ktest.inp)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -5,6 +5,10 @@
 
 SubdirLibraryTarget(zbookt,NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
+#else
 CernlibFortranProgramTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
+#endif
 
 TestTarget(zexam,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -41,6 +41,12 @@
 
 testrz: zebrz1 zebrz2 zebrz3
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#undef CernlibFortranProgramTarget
+#define CernlibFortranProgramTarget(a,b,c,d,e) \
+	CernlibFortranStaticTarget(a,b,c,d,e)
+#endif
+
 CernlibFortranProgramTarget(zebmz1,zebmz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
 CernlibFortranProgramTarget(zebfz1,zebfz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)


--- NEW FILE geant321-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.

@DPATCH@
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile	1997-04-10 08:33:14.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam1,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam1,gexam1.dat,gexam1.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile	1997-04-10 08:33:20.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -13,7 +13,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam2,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam2,gexam2.dat,gexam2.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile	1997-04-10 08:33:34.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam3,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam3,gexam3.dat,gexam3.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile	1997-04-10 08:33:37.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -14,7 +14,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam4,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam4,gexam4.dat,gexam4.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile	1997-04-10 08:33:38.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam5,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam5,gexam5.dat,gexam5.input)
 


--- NEW FILE geant321-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by Kevin B. McCarty 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Statically link certain test programs against CERN libraries on
## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
## DP: broken there.

@DPATCH@
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile	2008-01-04 17:05:50.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile	2008-01-04 17:10:09.000000000 -0800
@@ -3,7 +3,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam1,gexam1.dat,gexam1.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile	2008-01-04 17:10:55.000000000 -0800
@@ -13,7 +13,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam2,gexam2.dat,gexam2.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile	2008-01-04 17:11:26.000000000 -0800
@@ -3,7 +3,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam3,gexam3.dat,gexam3.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile	2008-01-04 17:11:57.000000000 -0800
@@ -14,7 +14,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam4,gexam4.dat,gexam4.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile	2008-01-04 17:12:26.000000000 -0800
@@ -3,7 +3,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam5,gexam5.dat,gexam5.input)
 


--- NEW FILE mclibs-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/cojets/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/cojets/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/cojets/test/Imakefile	1996-03-27 09:32:16.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/cojets/test/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(cojetst,test.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib kernlib)
+CernlibFortranProgramTarget(cojetst,test.o,NullParameter,NullParameter,mathlib kernlib cojets)
 
 CopyFile(test.input,test.in)
 
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile	1997-03-14 17:32:14.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -4,11 +4,10 @@
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
-CernlibFortranProgramTarget(eudtest,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
 
 TestTarget(eudtest,eurodec.dat,eutitle.dat)
 
 CopyFile(eutitle.data,eutitle.dat)
 
 LinkFileFromDir($(TOP)$(PACKAGETOP),eurodec.dat)
-
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/herwig/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/herwig/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/herwig/test/Imakefile	1997-01-06 17:06:42.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/herwig/test/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -4,6 +4,6 @@
 DefinePackageLibrary(NullParameter)
 
 
-CernlibFortranProgramTarget(herwigt,test.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(herwigt,test.o,NullParameter,NullParameter,kernlib herwig)
 
 TestTarget(herwigt,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/isajet/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/isajet/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/isajet/test/Imakefile	2000-07-25 16:21:34.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/isajet/test/Imakefile	2008-01-04 18:59:02.000000000 +0000
@@ -6,6 +6,6 @@
 
 LinkFileFromDir($(TOP)$(PACKAGETOP),isajet.dat)
 
-CernlibFortranProgramTarget(isajett,isajett.o,$(PACKAGE_LIB),$(PACKAGE_LIB),pdflib804 mathlib kernlib)
+CernlibFortranProgramTarget(isajett,isajett.o,NullParameter,NullParameter,pdflib804 mathlib kernlib isajet)
 
 TestTarget(isajett,isajet.dat,test.input)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/pdf/tpdf/Imakefile mclibs-2006.dfsg.2/src/mclibs/pdf/tpdf/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/pdf/tpdf/Imakefile	2000-04-19 13:52:13.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/pdf/tpdf/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -13,13 +13,13 @@
 DefinePackageLibrary(NullParameter)
 
 
-CernlibFortranProgramTarget(testpdf,testpdf.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testpdf,testpdf.o,NullParameter,NullParameter,mathlib pdflib)
 
-CernlibFortranProgramTarget(testpdg,testpdg.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testpdg,testpdg.o,NullParameter,NullParameter,mathlib pdflib)
 
-CernlibFortranProgramTarget(testgam,testgam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testgam,testgam.o,NullParameter,NullParameter,mathlib pdflib)
 
-CernlibFortranProgramTarget(test_npdf,test_npdf.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(test_npdf,test_npdf.o,NullParameter,NullParameter,mathlib pdflib)
 
 TestTarget(testpdf,NullParameter,NullParameter)
 TestTarget(testpdg,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/photos/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/photos/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/photos/test/Imakefile	1999-03-26 10:53:26.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/photos/test/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -2,6 +2,6 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(photost,phodem.o pseudo_jetset.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(photost,phodem.o pseudo_jetset.o,NullParameter,NullParameter,kernlib photos)
 
 TestTarget(photost,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/phtools/wicoexam/Imakefile mclibs-2006.dfsg.2/src/phtools/wicoexam/Imakefile
--- mclibs-2006.dfsg.2~/src/phtools/wicoexam/Imakefile	1996-03-22 16:42:50.000000000 +0000
+++ mclibs-2006.dfsg.2/src/phtools/wicoexam/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -1,5 +1,5 @@
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(wicot,wicoex.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(wicot,wicoex.o,NullParameter,NullParameter,packlib phtools)
 
 TestTarget(wicot,NullParameter,NullParameter)


--- NEW FILE mclibs-220-compile-isajet-with-isarun.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 220-compile-isajet-with-isarun.dpatch by Kevin B. McCarty 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Compile isajet library including isaset() function.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/isajet/isajet/pilot.h mclibs-2006.dfsg.2/src/mclibs/isajet/isajet/pilot.h
--- mclibs-2006.dfsg.2~/src/mclibs/isajet/isajet/pilot.h	2001-10-08 06:16:58.000000000 -0700
+++ mclibs-2006.dfsg.2/src/mclibs/isajet/isajet/pilot.h	2008-02-06 12:52:46.000000000 -0800
@@ -41,3 +41,6 @@
 #ifndef CERNLIB_MOVEFTN
 #define CERNLIB_MOVEFTN
 #endif
+#ifndef CERNLIB_INTERACT
+#define CERNLIB_INTERACT
+#endif


--- NEW FILE mclibs-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by Kevin B. McCarty 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Statically link certain test programs against CERN libraries on
## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
## DP: broken there.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile	2008-01-08 09:47:10.000000000 -0800
+++ mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile	2008-01-08 09:48:35.000000000 -0800
@@ -4,7 +4,11 @@
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
+#else
 CernlibFortranProgramTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
+#endif
 
 TestTarget(eudtest,eurodec.dat,eutitle.dat)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2007 23:27:43 -0000	1.5
+++ .cvsignore	10 Mar 2008 10:31:30 -0000	1.6
@@ -1,6 +1,6 @@
 2006_src-free.tar.gz
 patchy.tar.gz
-geant321_3.21.14.dfsg-5.diff.gz
-mclibs_2006.dfsg.2-1.diff.gz
-paw_2.14.04.dfsg.2-1.diff.gz
-cernlib_2006.dfsg.2-2.diff.gz
+geant321_3.21.14.dfsg-7.diff.gz
+mclibs_2006.dfsg.2-5.diff.gz
+paw_2.14.04.dfsg.2-2.diff.gz
+cernlib_2006.dfsg.2-11.diff.gz


Index: 210-improve-cfortran-header-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/210-improve-cfortran-header-files.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 210-improve-cfortran-header-files.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 210-improve-cfortran-header-files.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -3,7 +3,7 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Protect against multiple inclusion and add explicit dependency on
-## DP: cfortran.h to the Cernlib C headers.
+## DP: cfortran.h to the CERNLIB C headers.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/cfortran/comis.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h


Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 315-fixes-for-MacOSX.dpatch	19 Dec 2007 23:27:43 -0000	1.4
+++ 315-fixes-for-MacOSX.dpatch	10 Mar 2008 10:31:30 -0000	1.5
@@ -2,7 +2,7 @@
 ## 315-fixes-for-MacOSX.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch set (mostly due to Keisuke Fujii) to allow Cernlib to compile
+## DP: Patch set (mostly due to Keisuke Fujii) to allow CERNLIB to compile
 ## DP: and run on OS X.
 
 @DPATCH@


Index: 700-remove-kernlib-from-packlib-Imakefile.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/700-remove-kernlib-from-packlib-Imakefile.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 700-remove-kernlib-from-packlib-Imakefile.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 700-remove-kernlib-from-packlib-Imakefile.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 700-remove-kernlib-from-packlib-Imakefile.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch packlib Imakefile after moving kernlib out of tree.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/Imakefile


Index: 702-patch-Imakefiles-for-packlib-mathlib.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/702-patch-Imakefiles-for-packlib-mathlib.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 702-patch-Imakefiles-for-packlib-mathlib.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 702-patch-Imakefiles-for-packlib-mathlib.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -83,7 +83,7 @@
 -LIBDIRS= gen bvsl
 +LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
  
- /* Lapack is independent of Cernlib and should be installed as one of
+ /* Lapack is independent of CERNLIB and should be installed as one of
     the build dependencies.
 diff -urNad cernlib-2005.05.09/src/packlib/hbook/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile
 --- cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	1969-12-31 19:00:00.000000000 -0500


Index: 802-create-shared-libraries.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/802-create-shared-libraries.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 802-create-shared-libraries.dpatch	2 Dec 2005 09:57:41 -0000	1.2
+++ 802-create-shared-libraries.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -42,7 +42,7 @@
  InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
 +InstallSharedLibrary(geant321,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */
  /*
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile	1996-12-19 14:19:18.000000000 +0000


Index: cernlib-102-dont-optimize-some-code.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-102-dont-optimize-some-code.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-102-dont-optimize-some-code.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ cernlib-102-dont-optimize-some-code.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -6,9 +6,21 @@
 ## DP: (either compiler crash or broken code generation).
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	1996-06-12 11:25:38.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-09 11:14:52.470486750 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/c/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/Imakefile	1999-09-24 07:27:41.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/Imakefile	2008-02-22 12:06:26.000000000 -0800
+@@ -117,3 +117,8 @@
+ SpecialFortranLibObjectRule(nzerfz64,nzerfz64,-O,NullParameter)
+ SpecialFortranLibObjectRule(wclbes,wclbes,-O,NullParameter)
+ #endif
++
++#if defined(CERNLIB_GFORTRAN) && ! defined(CERNLIB_IBM)
++/* -O3 optimization causes minor floating point inaccuracies in gfortran 4.2 */
++SpecialFortranLibObjectRule(gamma64,gamma64,-O0,NullParameter)
++#endif
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/d/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/d/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/d/Imakefile	1996-06-12 08:25:38.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/d/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -19,6 +19,11 @@
  SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
  	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
@@ -38,9 +50,9 @@
  FORTRANSAVEOPTION = FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/e/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile
---- cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	1996-05-01 09:21:54.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	2005-06-09 11:16:07.058731880 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/e/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/e/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/e/Imakefile	1996-05-01 06:21:54.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/e/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -12,6 +12,11 @@
  
  #if defined(CERNLIB_DOUBLE)
@@ -53,9 +65,22 @@
  #else
  SRCS_F:= $(SRCS_F) chsum128.F rchebn.F rcspln128.F
  #endif
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	1996-06-10 06:20:57.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	2005-06-09 11:09:34.621022534 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/tcgen/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/tcgen/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/tcgen/Imakefile	1997-02-04 09:36:14.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/tcgen/Imakefile	2008-02-22 12:08:44.000000000 -0800
+@@ -63,4 +63,9 @@
+ SRCS_F := $(SRCS_F) chtoi.F itoch.F
+ #endif
+ 
++#if defined(CERNLIB_GFORTRAN)
++/* -O2 optimization causes miscompiled code in gfortran 4.3 on ia64 */
++SpecialFortranLibObjectRule(tlsc,tlsc,-O0,NullParameter)
++#endif
++
+ SubdirLibraryTarget(NullParameter,NullParameter)
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/c204fort/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/c204fort/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/c204fort/Imakefile	1996-06-10 03:20:57.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/c204fort/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -14,6 +14,11 @@
  FDEBUGFLAGS=+O1
  #endif
@@ -68,9 +93,9 @@
  FORTRANSAVEOPTION = FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	1996-06-12 06:04:36.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	2005-06-09 11:10:40.068274255 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/g900fort/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/g900fort/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/g900fort/Imakefile	1996-06-12 03:04:36.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/g900fort/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -4,6 +4,11 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif


Index: cernlib-211-support-amd64-and-itanium.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-211-support-amd64-and-itanium.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-211-support-amd64-and-itanium.dpatch	19 Dec 2007 23:27:43 -0000	1.1
+++ cernlib-211-support-amd64-and-itanium.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,16 +2,16 @@
 ## 211-support-amd64-and-itanium.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Large patch from Harald Vogt  to make Cernlib work better
+## DP: Large patch from Harald Vogt  to make CERNLIB work better
 ## DP: (at least when statically linked) on 64-bit architectures.
 ## DP: Slightly modified in an attempt to keep ABI compatibility of the
 ## DP: dynamic libraries; not that it matters much as they don't work well
 ## DP: when dynamically linked on 64-bit anyway.
 
 @DPATCH@
-diff -urNad cernlib-2005.dfsg~/src/cfortran/hbook.h cernlib-2005.dfsg/src/cfortran/hbook.h
---- cernlib-2005.dfsg~/src/cfortran/hbook.h	1999-11-15 12:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/cfortran/hbook.h	2006-09-20 20:12:21.887676289 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/cfortran/hbook.h cernlib-2006.dfsg.2/src/cfortran/hbook.h
+--- cernlib-2006.dfsg.2~/src/cfortran/hbook.h	1999-11-15 17:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/cfortran/hbook.h	2007-12-14 21:41:27.000000000 +0000
 @@ -489,6 +489,10 @@
  #define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
          CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
@@ -37,9 +37,9 @@
  PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
  #define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2005.dfsg/src/packlib/cspack/cspack/hcntpar.inc
---- cernlib-2005.dfsg~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 10:44:16.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/cspack/cspack/hcntpar.inc	2006-09-20 20:12:21.887676289 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2006.dfsg.2/src/packlib/cspack/cspack/hcntpar.inc
+--- cernlib-2006.dfsg.2~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 15:44:16.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/cspack/cspack/hcntpar.inc	2007-12-14 21:41:27.000000000 +0000
 @@ -22,7 +22,7 @@
       +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
       +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
@@ -49,9 +49,9 @@
  *
  
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c cernlib-2005.dfsg/src/packlib/cspack/sysreq/netreq.c
---- cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c	2006-09-20 20:12:20.249025177 -0400
-+++ cernlib-2005.dfsg/src/packlib/cspack/sysreq/netreq.c	2006-09-20 20:12:22.046642443 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/cspack/sysreq/netreq.c cernlib-2006.dfsg.2/src/packlib/cspack/sysreq/netreq.c
+--- cernlib-2006.dfsg.2~/src/packlib/cspack/sysreq/netreq.c	2007-12-14 21:41:17.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/cspack/sysreq/netreq.c	2007-12-14 21:41:27.000000000 +0000
 @@ -341,7 +341,7 @@
                  return(-errno);
          }
@@ -61,9 +61,9 @@
  		TRACE(2, "sysreq", "RecvStr(RepLen): (errno=%d)", errno);
                  (void) close(s);
  		END_TRACE();
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2005.dfsg/src/packlib/hbook/hbook/hcntpar.inc
---- cernlib-2005.dfsg~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 12:07:52.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hbook/hcntpar.inc	2006-09-20 20:12:22.104630097 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2006.dfsg.2/src/packlib/hbook/hbook/hcntpar.inc
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 17:07:52.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hbook/hcntpar.inc	2007-12-14 21:41:27.000000000 +0000
 @@ -24,7 +24,7 @@
       +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
       +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
@@ -73,9 +73,9 @@
  *
  
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hcreatem.F cernlib-2005.dfsg/src/packlib/hbook/hmmap/hcreatem.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hcreatem.F	1996-03-13 05:13:20.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hmmap/hcreatem.F	2006-09-20 20:12:22.326582841 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hcreatem.F cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hcreatem.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hcreatem.F	1996-03-13 10:13:20.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hcreatem.F	2007-12-14 21:41:27.000000000 +0000
 @@ -39,11 +39,11 @@
  ************************************************************************
  *
@@ -101,9 +101,9 @@
  #if (defined(CERNLIB_DECS))&&(!defined(CERNLIB_ALPHA))
        ICOMAD(1) = 4*LOCF(ICOMAD(1)) + MFEN
        ICOMAD(1) = ((ICOMAD(1)+4095)/4096)*4096
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hmapm.F cernlib-2005.dfsg/src/packlib/hbook/hmmap/hmapm.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hmapm.F	2001-10-02 05:06:15.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/hbook/hmmap/hmapm.F	2006-09-20 20:12:22.343579222 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hmapm.F cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hmapm.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hmapm.F	2001-10-02 09:06:15.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hmapm.F	2007-12-14 21:41:27.000000000 +0000
 @@ -54,11 +54,11 @@
  ************************************************************************
  *
@@ -129,9 +129,9 @@
  #if defined(CERNLIB_DECS)
        ICOMAD(1) = 4*LOCF(ICOMAD(1)) + MFEN
        ICOMAD(1) = ((ICOMAD(1)+4095)/4096)*4096
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hballoc.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hballoc.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 12:07:56.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hballoc.F	2006-09-20 20:12:22.343579222 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hballoc.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hballoc.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 17:07:56.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hballoc.F	2007-12-14 21:41:27.000000000 +0000
 @@ -42,3 +42,26 @@
        ENDIF
  *
@@ -159,9 +159,9 @@
 +      ENDIF
 +*
 +      END
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hbnt.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hbnt.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 12:07:56.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hbnt.F	2006-09-20 20:12:22.344579009 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hbnt.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hbnt.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 17:07:56.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hbnt.F	2007-12-14 21:41:27.000000000 +0000
 @@ -269,11 +269,13 @@
   ************************************************************************
   *      *         *                                                     *
@@ -177,9 +177,9 @@
   ************************************************************************
  #endif
  *
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgnt2.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgnt2.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 10:42:35.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgnt2.F	2006-09-20 20:12:22.344579009 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgnt2.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgnt2.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 15:42:35.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgnt2.F	2007-12-14 21:41:27.000000000 +0000
 @@ -34,7 +34,13 @@
  #include "hbook/hcrecv.inc"
  *
@@ -218,9 +218,9 @@
           ENDIF
           LQ(LTMP1-IQ(LTMP1+1)) = LBLOK
  *
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntbf.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntbf.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 12:07:57.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntbf.F	2006-09-20 20:12:22.345578796 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntbf.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntbf.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 17:07:57.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntbf.F	2007-12-14 21:41:27.000000000 +0000
 @@ -26,3 +26,13 @@
        CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
  *
@@ -235,9 +235,9 @@
 +      CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
 +*
 +      END
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntf.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntf.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 10:42:35.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntf.F	2006-09-20 20:14:51.026922890 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntf.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntf.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 15:42:35.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntf.F	2007-12-14 21:41:27.000000000 +0000
 @@ -37,6 +37,13 @@
        INTEGER       ILOGIC
        LOGICAL       LOGIC, INDVAR, USEBUF
@@ -289,9 +289,9 @@
           ENDIF
  *
     40 CONTINUE
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 12:44:52.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile	2006-09-20 20:12:22.345578796 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 16:44:52.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/Imakefile	2007-12-14 21:41:27.000000000 +0000
 @@ -11,6 +11,10 @@
  	sleepf.c signalf.c sigprnt.c sigunbl.c stati.c systei.c \ @@\
  	tminit.c unlini.c tmread.c
@@ -303,9 +303,9 @@
  #ifndef CERNLIB_OS9
  SRCS_C += timel.c lstati.c
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/chkloc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/chkloc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/chkloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/chkloc.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/chkloc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/chkloc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/chkloc.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/chkloc.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,10 @@
 +/*
 + * Utility routine for locf and locb 
@@ -317,9 +317,9 @@
 +#include "lp64gs/chkloc.c"
 +#endif
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumptn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumptn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2004-07-29 10:07:43.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumptn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumptn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2004-07-29 14:07:43.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -20,8 +20,10 @@
   */
  #include "kerngen/pilot.h"
@@ -333,9 +333,9 @@
  #else
  /*>    ROUTINE JUMPTN
    CERN PROGLIB# Z043    JUMPTN          .VERSION KERNFOR  4.40  940929
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumpxn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2004-07-29 10:07:43.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumpxn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2004-07-29 14:07:43.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -20,8 +20,10 @@
   */
  #include "kerngen/pilot.h"
@@ -348,9 +348,9 @@
  #else
  /*>    ROUTINE JUMPXN
    CERN PROGLIB# Z042    JUMPXN          .VERSION KERNFOR  4.40  940929
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lenocc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lenocc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lenocc.c	1997-10-23 12:25:11.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lenocc.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lenocc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lenocc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lenocc.c	1997-10-23 16:25:11.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lenocc.c	2007-12-14 21:41:27.000000000 +0000
 @@ -46,7 +46,7 @@
  
  /*        look at the last ntail characters   */
@@ -360,9 +360,9 @@
        for (i = ntail; i > 0; i--)
          { if (*--chcur != ' ')       goto exit; }
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 10:26:37.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c	2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locb.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locb.c	2007-12-14 21:41:27.000000000 +0000
 @@ -26,6 +26,9 @@
  # define DummyDef
  #endif
@@ -382,9 +382,9 @@
  #undef CERNLIB_TCGEN_LOCB
  #endif
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locf.c	2004-07-29 10:06:07.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locf.c	2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locf.c	2004-07-29 14:06:07.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locf.c	2007-12-14 21:41:27.000000000 +0000
 @@ -50,6 +50,8 @@
  #include "irtdgs/locf.c"
  #elif defined(CERNLIB_QMVAOS)
@@ -420,9 +420,9 @@
  }
  #undef Dummy2LocPar
  #undef DummyDef
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,58 @@
 +/*
 + *
@@ -482,16 +482,16 @@
 +}
 +/*> END <----------------------------------------------------------*/
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,83 @@
 +/*
 + * $Id$
 + *
 + * $Log$
-+ * Revision 1.1  2007/12/19 23:27:43  pertusus
-+ * sync with devel
++ * Revision 1.2  2008/03/10 10:31:30  pertusus
++ * sync with devel, without ABI incompatible changes
 + *
 + * Revision 1.1.1.1  1996/02/15 17:49:32  mclareni
 + * Kernlib
@@ -572,16 +572,16 @@
 +    return;
 +}
 +/*> END <----------------------------------------------------------*/
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,92 @@
 +/*
 + * $Id$
 + *
 + * $Log$
-+ * Revision 1.1  2007/12/19 23:27:43  pertusus
-+ * sync with devel
++ * Revision 1.2  2008/03/10 10:31:30  pertusus
++ * sync with devel, without ABI incompatible changes
 + *
 + * Revision 1.1.1.1  1996/02/15 17:49:32  mclareni
 + * Kernlib
@@ -671,10 +671,10 @@
 +    return;
 +}
 +/*> END <----------------------------------------------------------*/
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	2006-09-20 20:12:22.584527921 -0400
-@@ -0,0 +1,12 @@
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	2007-12-14 21:52:38.000000000 +0000
+@@ -0,0 +1,37 @@
 +/*>    ROUTINE LOCB
 +  CERN PROGLIB# N101    LOCB            .VERSION KERNFOR  4.36  930602
 +*/
@@ -687,9 +687,34 @@
 +   return (chkloc(iadr));
 +}
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	2006-09-20 20:12:22.584527921 -0400
++#include     /* for ptrdiff_t, size_t */
++#include      /* for fprintf */
++#include     /* for exit    */
++
++int iptrdiff_(iadr1, iadr2)
++   char * iadr1, * iadr2;
++{
++  long diff = (long)iadr1 - (long)iadr2;
++  if (diff < (long)INT32_MIN || diff > (long)INT32_MAX) {
++      fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
++      fprintf(stderr, "IPTRDIFF: difference of addresses %p and %p\n", iadr1, iadr2);
++      fprintf(stderr, "cannot be stored in 32-bit signed integer!\n");
++      fprintf(stderr, "This may result in program crash or incorrect results\n");
++      fprintf(stderr, "Therefore we will stop here\n");
++      fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
++      exit (999);
++  }
++  else return (int)diff;
++}
++
++int iptrsame_(iadr1, iadr2)
++   char * iadr1, * iadr2;
++{
++  return (size_t)iadr1 == (size_t)iadr2 ? 1 : 0;
++}
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,10 @@
 +/*>    ROUTINE LOCF
 +  CERN PROGLIB# N100    LOCF            .VERSION KERNFOR  4.36  930602
@@ -701,9 +726,9 @@
 +{
 +   return ( (chkloc(iadr)) >> 2 );
 +}
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/signalf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/signalf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/signalf.c	1999-10-06 10:17:01.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/signalf.c	2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/signalf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/signalf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/signalf.c	1999-10-06 14:17:01.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/signalf.c	2007-12-14 21:41:27.000000000 +0000
 @@ -45,6 +45,7 @@
  C-        function value = adr of previous handler
  */
@@ -742,9 +767,9 @@
  #ifndef __GNUC__
        if (oldhand == SIG_ERR)  istat = -1;
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/kkern.c cernlib-2005.dfsg/src/packlib/kuip/code_kuip/kkern.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/kkern.c	1996-05-01 08:08:38.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_kuip/kkern.c	2006-09-20 20:12:22.585527708 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_kuip/kkern.c cernlib-2006.dfsg.2/src/packlib/kuip/code_kuip/kkern.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_kuip/kkern.c	1996-05-01 12:08:38.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_kuip/kkern.c	2007-12-14 21:41:27.000000000 +0000
 @@ -39,7 +39,8 @@
    if( len >= (sizeof blanks) * 4 ) {
  
@@ -755,9 +780,9 @@
      case 7:
        if( str[--len] != ' ' ) return len + 1;
      case 6:
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kmbrow.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/kmbrow.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kmbrow.c	1996-03-08 10:33:08.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/kmbrow.c	2006-09-20 20:12:22.586527495 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kmbrow.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kmbrow.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kmbrow.c	1996-03-08 15:33:08.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kmbrow.c	2007-12-14 21:41:27.000000000 +0000
 @@ -278,7 +278,7 @@
     char         *path, *title;
     char          cval[MAX_string], cval1[MAX_string];
@@ -767,9 +792,9 @@
  
     BrObject *brobj;
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kuxxt.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/kuxxt.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kuxxt.c	1996-03-08 10:33:11.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/kuxxt.c	2006-09-20 20:12:22.587527283 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kuxxt.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kuxxt.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kuxxt.c	1996-03-08 15:33:11.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kuxxt.c	2007-12-14 21:41:27.000000000 +0000
 @@ -340,7 +340,7 @@
  {
          (void) XDeleteContext( XtDisplay( UxTopLevel ),
@@ -788,9 +813,9 @@
  
          return ( UX_NO_ERROR );
  }
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdcmp.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdcmp.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdcmp.c	1996-03-15 10:54:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdcmp.c	2006-09-20 20:12:22.587527283 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdcmp.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdcmp.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdcmp.c	1996-03-15 15:54:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdcmp.c	2007-12-14 21:41:27.000000000 +0000
 @@ -1541,7 +1541,11 @@
  
     Widget cpanel = stag->command_panel;
@@ -804,9 +829,9 @@
     KmParameter *par   = cmd->par[ipar];
     KmParFile   *pfil  = par->ptype;
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdgra.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdgra.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdgra.c	1996-03-08 10:33:07.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdgra.c	2006-09-20 20:12:22.588527070 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdgra.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdgra.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdgra.c	1996-03-08 15:33:07.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdgra.c	2007-12-14 21:41:27.000000000 +0000
 @@ -289,11 +289,12 @@
     km_graph_init_callbacks (km_graphicsDraw, graph_widget, wkid, 0);
  }
@@ -822,9 +847,9 @@
     if (flag == 0) {
         XtAddCallback(draw, XmNexposeCallback,
                       (XtCallbackProc)drawing_area_callback, graph_widget);
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkuip.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkuip.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkuip.c	2006-09-20 20:12:20.148046676 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkuip.c	2006-09-20 20:12:22.589526857 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkuip.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkuip.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkuip.c	2007-12-14 21:41:17.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkuip.c	2007-12-14 21:41:27.000000000 +0000
 @@ -1687,7 +1687,7 @@
              XmStringFree(xmstr);
         } /* end for ... */
@@ -852,9 +877,9 @@
             XtManageChild(PdMenu);
          }
      }
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/help.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/help.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/help.c	1996-03-08 10:33:04.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/help.c	2006-09-20 20:12:22.590526644 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/help.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/help.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/help.c	1996-03-08 15:33:04.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/help.c	2007-12-14 21:41:27.000000000 +0000
 @@ -309,7 +309,7 @@
      int     *type;
      XmAnyCallbackStruct *call_data;
@@ -864,9 +889,9 @@
  
     if (help[t])
        XRaiseWindow(XtDisplay(help[t]), XtWindow(help[t]));
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/kxterm.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/kxterm.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/kxterm.c	2005-04-18 11:40:49.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/kxterm.c	2006-09-20 20:12:22.591526431 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/kxterm.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/kxterm.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/kxterm.c	2005-04-18 15:40:49.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/kxterm.c	2007-12-14 21:41:27.000000000 +0000
 @@ -1533,7 +1533,7 @@
       XtPointer cbs;
  {
@@ -876,9 +901,9 @@
     Boolean result = True;
  
     text_w = get_selection_owner(widget);
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/uxxt.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/uxxt.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/uxxt.c	1996-03-08 10:33:04.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/uxxt.c	2006-09-20 20:12:22.591526431 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/uxxt.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/uxxt.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/uxxt.c	1996-03-08 15:33:04.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/uxxt.c	2007-12-14 21:41:27.000000000 +0000
 @@ -340,7 +340,7 @@
  {
          (void) XDeleteContext( XtDisplay( UxTopLevel ),
@@ -897,9 +922,9 @@
  
          return ( UX_NO_ERROR );
  }
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/zerror.F cernlib-2005.dfsg/src/packlib/zbook/code/zerror.F
---- cernlib-2005.dfsg~/src/packlib/zbook/code/zerror.F	1996-03-08 07:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/zerror.F	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/zerror.F cernlib-2006.dfsg.2/src/packlib/zbook/code/zerror.F
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/zerror.F	1996-03-08 12:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/zerror.F	2007-12-14 21:41:27.000000000 +0000
 @@ -16,6 +16,10 @@
  C     ******************************************************************
  C
@@ -934,9 +959,9 @@
  C
        IF (NEWERR.LE.0)RETURN
  C
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/zjump.c cernlib-2005.dfsg/src/packlib/zbook/code/zjump.c
---- cernlib-2005.dfsg~/src/packlib/zbook/code/zjump.c	1996-03-08 07:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/zjump.c	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/zjump.c cernlib-2006.dfsg.2/src/packlib/zbook/code/zjump.c
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/zjump.c	2007-12-14 21:41:27.000000000 +0000
 @@ -7,6 +7,9 @@
   *
   */
@@ -971,9 +996,9 @@
  }
  #endif
 +#endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/ztrap.F cernlib-2005.dfsg/src/packlib/zbook/code/ztrap.F
---- cernlib-2005.dfsg~/src/packlib/zbook/code/ztrap.F	1996-03-08 07:01:13.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/ztrap.F	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/ztrap.F cernlib-2006.dfsg.2/src/packlib/zbook/code/ztrap.F
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/ztrap.F	1996-03-08 12:01:13.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/ztrap.F	2007-12-14 21:41:27.000000000 +0000
 @@ -48,8 +48,10 @@
  #if defined(CERNLIB_BESM6)
        IZ(JZ+19) = LOCF(IUSER)
@@ -986,9 +1011,9 @@
  #endif
        END
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.dfsg/src/packlib/zebra/test/brztest/btest2.F
---- cernlib-2005.dfsg~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 11:16:16.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/zebra/test/brztest/btest2.F	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/brztest/btest2.F cernlib-2006.dfsg.2/src/packlib/zebra/test/brztest/btest2.F
+--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zebra/test/brztest/btest2.F	2007-12-14 21:41:27.000000000 +0000
 @@ -29,6 +29,15 @@
  ********************************************************************************
  *


Index: cernlib-211-support-digital-alpha.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-211-support-digital-alpha.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-211-support-digital-alpha.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ cernlib-211-support-digital-alpha.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -27,7 +27,7 @@
      if ( jadr != 0x6000000000000000) {
 +#elif defined (__alpha__)
 +    if ( jadr != 0x0000000100000000) {
-+#else  /* amd64 */
++#else  /* amd64 or ppc64 */
 +    if ( jadr != 0) {
  #endif
        fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");


Index: cernlib-303-shadow-passwords-supported.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-303-shadow-passwords-supported.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-303-shadow-passwords-supported.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ cernlib-303-shadow-passwords-supported.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 303-shadow-passwords-supported.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow Cern's server code to read from /etc/shadow.
+## DP: Allow CERN's server code to read from /etc/shadow.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c


Index: cernlib-304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-304-update-Imake-config-files.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-304-update-Imake-config-files.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ cernlib-304-update-Imake-config-files.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -3,19 +3,19 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Use Imake.cf stolen from recent XFree86 code, as it is much more
-## DP: up-to-date than the Imake.cf in Cernlib source.  Also update linux.cf
+## DP: up-to-date than the Imake.cf in CERNLIB source.  Also update linux.cf
 ## DP: to support most Linux architectures.
 
 @DPATCH@
-diff -urNad cernlib-2006.dfsg~/src/config/Imake.cf cernlib-2006.dfsg/src/config/Imake.cf
---- cernlib-2006.dfsg~/src/config/Imake.cf	2006-09-15 05:34:47.000000000 -0400
-+++ cernlib-2006.dfsg/src/config/Imake.cf	2007-01-09 19:03:04.701920749 -0500
-@@ -1,27 +1,10 @@
+diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.cf cernlib-2006.dfsg.2/src/config/Imake.cf
+--- cernlib-2006.dfsg.2~/src/config/Imake.cf	2006-09-15 02:34:47.000000000 -0700
++++ cernlib-2006.dfsg.2/src/config/Imake.cf	2008-01-11 09:52:56.000000000 -0800
+@@ -1,27 +1,5 @@
 -/* $Id$
 - *
 - * $Log$
-- * Revision 1.2  2007/12/19 23:27:43  pertusus
-- * sync with devel
+- * Revision 1.3  2008/03/10 10:31:30  pertusus
+- * sync with devel, without ABI incompatible changes
 - *
 - * Revision 1.6  2006/09/15 09:34:47  mclareni
 - * Submitted mods for gcc4/gfortran and MacOSX, corrected to work also on slc4 with gcc3.4 and 4.1
@@ -36,22 +36,46 @@
 - * X11R6 config files unmodified
 - *
 - *
-+/* This is the Imake.cf file stolen from XFree86 4.3.0, patched for Debian
-+   (version 4.3.0.dfsg.1-4).  It is a major improvement (several years ahead)
-+   of the Imake.cf file originally packed with Cernlib.
-+   -- Kevin McCarty, for Debian
-  */
+- */
 -XCOMM $XConsortium: Imake.cf,v 1.19 95/01/05 19:24:32 kaleb Exp $
-+
++XCOMM $XdotOrg: util/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $
 +XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
  /*
   * To add support for another platform:
   * 
-@@ -40,184 +23,358 @@
+@@ -40,257 +18,586 @@
   *
   *     4.  Create a .cf file with the name given by MacroFile.
   */
-+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.81 2003/02/18 16:51:45 tsi Exp $
++XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
+ 
+-#ifdef ultrix
+-#define MacroIncludeFile 
+-#define MacroFile ultrix.cf
+-#ifdef vax
+-#undef vax
+-#define VaxArchitecture
+-#endif
+-#ifdef mips
+-#undef mips
+-#define MipsArchitecture
++#if defined(__APPLE__)
++# undef __APPLE__
++# define MacroIncludeFile 
++# define MacroFile MacOSX.cf
++# define MacOSXArchitecture
++# define DarwinArchitecture
++# ifdef __ppc__
++#  define PpcDarwinArchitecture
++#  undef __ppc__
++# endif
++# ifdef __i386__
++#  define i386DarwinArchitecture
++#  undef __i386__
++# endif
+ #endif
+-#undef ultrix
+-#define UltrixArchitecture
 +
 +#if defined(clipper) || defined(__clipper__)
 +# undef clipper
@@ -73,20 +97,8 @@
 +#undef _X86_
 +#undef __CYGWIN__
 +#endif /* CYGWIN */
- 
- #ifdef ultrix
--#define MacroIncludeFile 
--#define MacroFile ultrix.cf
--#ifdef vax
--#undef vax
--#define VaxArchitecture
--#endif
--#ifdef mips
--#undef mips
--#define MipsArchitecture
--#endif
--#undef ultrix
--#define UltrixArchitecture
++
++#ifdef ultrix
 +# define MacroIncludeFile 
 +# define MacroFile ultrix.cf
 +# ifdef vax
@@ -102,12 +114,13 @@
 +# define UltrixArchitecture
  #endif /* ultrix */
  
- #if defined(vax) && !defined(UltrixArchitecture)
+-#if defined(vax) && !defined(UltrixArchitecture)
 -#define MacroIncludeFile 
 -#define MacroFile bsd.cf
 -#undef vax
 -#define BSDArchitecture
 -#define VaxArchitecture
++#if defined(vax) && !defined(UltrixArchitecture) && !defined(__OpenBSD__)
 +# define MacroIncludeFile 
 +# define MacroFile bsd.cf
 +# undef vax
@@ -115,16 +128,20 @@
 +# define VaxArchitecture
  #endif /* vax */
  
- #ifdef bsdi
+-#ifdef bsdi
 -#define MacroIncludeFile 
 -#define MacroFile bsdi.cf
 -#undef bsdi
 -#define BSD386Architecture
 -#define i386BsdArchitecture
 -#define i386Architecture
++#ifdef __bsdi__
 +# define MacroIncludeFile 
 +# define MacroFile bsdi.cf
-+# undef bsdi
++# undef __bsdi__
++# ifdef bsdi
++#  undef bsdi
++# endif
 +# define BSDOSArchitecture
 +# if defined(__i386__) || defined(i386)
 +#  define i386BsdArchitecture
@@ -132,7 +149,14 @@
 +#  undef i386
 +#  undef __i386__
 +# endif
++# if defined(__ppc__) || defined(ppc)
++#  define PpcBsdArchitecture
++#  define PpcArchitecture
++#  undef ppc
++#  undef __ppc__
++# endif
 +# if defined(__sparc__) || defined(__sparc_v9__) || defined(sparc)
++#  define SparcBsdArchitecture
 +#  define SparcArchitecture
 +#  undef sparc
 +#  undef __sparc__
@@ -140,10 +164,23 @@
 +# endif
  #endif /* bsdi */
  
+-#ifdef __NetBSD__
+-#define MacroIncludeFile 
+-#define MacroFile NetBSD.cf
+-#undef __NetBSD__
+-#define NetBSDArchitecture
+-#ifdef __i386__
+-#define i386BsdArchitecture
+-#define i386Architecture
+-#endif
+-#if defined(__sparc__) || defined(sparc)
+-#define SparcArchitecture
+-#undef sparc
 +#ifdef __OpenBSD__
 +# undef __OpenBSD__
 +# undef __NetBSD__
 +# define OpenBSDArchitecture
++# define KOpenBSDArchitecture
 +# define MacroIncludeFile 
 +# define MacroFile OpenBSD.cf
 +# ifdef __i386__
@@ -159,7 +196,7 @@
 +#  endif
 +#  undef sparc
 +# endif
-+# ifdef mips
++# if defined(__mips__) || defined(mips)
 +#   define MipsArchitecture
 +#   ifdef arc
 +#     define ArcArchitecture
@@ -176,7 +213,13 @@
 +#   undef __alpha__
 +#   undef alpha
 +# endif
-+# ifdef mc68020
++# if defined(__amd64__) || defined(__x86_64__)
++#   define AMD64Architecture
++#   undef __amd64__
++#   undef __x86_64__
++#   undef amd64
++# endif
++# if defined(__mc68020__) || defined(mc68020)
 +#  define Mc68020Architecture
 +#  if defined(amiga)
 +#   define AmigaArchitecture
@@ -201,30 +244,35 @@
 +#  undef mc68000
 +# endif
 +# ifdef __powerpc__
-+#  define PPCArchitecture
++#  define PpcArchitecture
 +#  undef __powerpc__
 +#  undef __macppc__
 +#  undef macppc
 +# endif
++# ifdef __vax__
++#  undef vax
++#  undef __vax__
++#  define VaxArchitecture
++# endif
++# ifdef __hppa__
++#  ifndef HPArchitecture
++#   define HPArchitecture
++#  endif
++#  undef __hppa__
++# endif /* __hppa__ */
 +#endif /* OpenBSD */
 +
- #ifdef __NetBSD__
--#define MacroIncludeFile 
--#define MacroFile NetBSD.cf
--#undef __NetBSD__
--#define NetBSDArchitecture
--#ifdef __i386__
--#define i386BsdArchitecture
--#define i386Architecture
--#endif
--#if defined(__sparc__) || defined(sparc)
--#define SparcArchitecture
--#undef sparc
--#endif
++/* Systems based on kernel of OpenBSD */
++#if defined(__OpenBSD_kernel__)
++#define KOpenBSDArchitecture
+ #endif
++
++#ifdef __NetBSD__
 +# define MacroIncludeFile 
 +# define MacroFile NetBSD.cf
 +# undef __NetBSD__
 +# define NetBSDArchitecture
++# define KNetBSDArchitecture
 +# ifdef __i386__
 +#  define i386BsdArchitecture
 +#  define i386Architecture
@@ -262,7 +310,7 @@
 +#   undef __vax__
 +# endif
 +# ifdef __powerpc__
-+#   define PPCArchitecture
++#   define PpcArchitecture
 +#   undef __powerpc__
 +# endif
  #endif /* NetBSD */
@@ -275,17 +323,44 @@
 -#ifdef __i386__
 -#define i386BsdArchitecture
 -#define i386Architecture
-+#ifdef __GNU_FreeBSD__
-+#define MacroIncludeFile 
-+#define MacroFile gnu-freebsd.cf
-+#define GNUFreeBSDArchitecture
++/* Systems based on kernel of NetBSD */
++#if defined(__NetBSD_kernel__)
++#define KNetBSDArchitecture
  #endif
 +
++#ifdef __DragonFly__
++# define MacroIncludeFile 
++# define MacroFile DragonFly.cf
++# undef __DragonFly__
++# undef __FreeBSD__
++# define DragonFlyArchitecture
++# define FreeBSDArchitecture
++# ifdef __i386__
++#  define i386BsdArchitecture
++#  define i386Architecture
++#  undef i386
++# endif
++# ifdef __sparc64__
++#  define Sparc64Architecture
++#  undef __sparc64__
++# endif
++# ifdef __ia64__
++#  define ia64Architecture
++#  undef __ia64__
++# endif
++# ifdef __amd64__
++#  define x86_64Architecture
++#  undef __amd64__
++#  undef __x86_64__
++# endif
++#endif /* __DragonFly__ */
++
 +#ifdef __FreeBSD__
 +# define MacroIncludeFile 
 +# define MacroFile FreeBSD.cf
 +# undef __FreeBSD__
 +# define FreeBSDArchitecture
++# define KFreeBSDArchitecture
 +# ifdef __i386__
 +#  define i386BsdArchitecture
 +#  define i386Architecture
@@ -300,9 +375,22 @@
 +#  define Sparc64Architecture
 +#  undef __sparc64__
 +# endif
++# ifdef __ia64__
++#  define ia64Architecture
++#  undef __ia64__
++# endif
++# ifdef __amd64__
++#  define AMD64Architecture
++#  undef __amd64__
++#  undef __x86_64__
++# endif
++# ifdef __powerpc__
++#  define PpcArchitecture
++#  undef __powerpc__
++# endif
  #endif /* __FreeBSD__ */
  
- #ifdef AMOEBA
+-#ifdef AMOEBA
 -/* Should be before the 'sun' entry because we may be cross-compiling */
 -#define MacroIncludeFile 
 -#define MacroFile Amoeba.cf
@@ -318,11 +406,16 @@
 -#define SunArchitecture
 -#endif
 -#endif
--#endif
++/* Systems based on kernel of FreeBSD */
++#if defined(__FreeBSD_kernel__)
++#define KFreeBSDArchitecture
+ #endif
 -#undef i80386
 -#undef mc68000
 -#undef sparc
 -#undef sun
++
++#ifdef AMOEBA
 + /* Should be before the 'sun' entry because we may be cross-compiling */
 +# define MacroIncludeFile 
 +# define MacroFile Amoeba.cf
@@ -374,11 +467,22 @@
 +# endif
 +# ifdef sparc
 +#  undef sparc
-+# define SparcArchitecture
++#  define SparcArchitecture
++# endif
++# ifdef __sparcv9
++#  undef __sparcv9
++#  define Sparc64Architecture
 +# endif
 +# ifdef mc68000
 +#  undef mc68000
-+# define Sun3Architecture
++#  define Sun3Architecture
++# endif
++# if defined(__amd64) || defined(__x86_64)
++#  undef __amd64
++#  undef __x86_64
++#  undef amd64
++#  undef i386
++#  define AMD64Architecture
 +# endif
 +# ifdef i386
 +#  undef i386
@@ -399,9 +503,18 @@
 +# define HPArchitecture
  #endif /* hpux */
  
-+#ifdef sco
+-#ifdef USL
+-#define MacroIncludeFile 
+-#define MacroFile usl.cf
+-#undef USL
+-#undef SVR4
+-#define SVR4Architecture
+-#define i386Architecture
+-#endif /* USL */
++#ifdef __SCO__
 +# define MacroIncludeFile 
 +# define MacroFile sco5.cf
++# undef __SCO__
 +# undef sco
 +# undef USL
 +# undef SYSV
@@ -414,24 +527,60 @@
 +# define SVR3Architecture
 +# define i386ScoArchitecture
 +# define i386Sco325Architecture
-+#endif /* sco - SCO Open Server 5 */
++# undef i386
++# undef i486
++# undef i586
++# undef i686
++# undef k6
++# undef __i386__
++# undef __i486__
++# undef __i586__
++# undef __i686__
++# undef __k6__
++# undef __i386
++# undef __i486
++# undef __i586
++# undef __i686
++# undef __k6
++# undef pentium
++# undef __pentium
++# undef pentiumpro
++# undef __pentiumpro
++#endif /* __SCO__ - SCO Open Server 5 */
 +
- #ifdef USL
--#define MacroIncludeFile 
--#define MacroFile usl.cf
--#undef USL
--#undef SVR4
--#define SVR4Architecture
--#define i386Architecture
++#ifdef __UNIXWARE__
 +# define MacroIncludeFile 
 +# define MacroFile usl.cf
++# undef __UNIXWARE__
 +# undef USL
 +# undef SVR4
 +# undef i386
++# undef SVR5
++# undef SYSV5
 +# define SVR4Architecture
 +# define i386Architecture
 +# define USLArchitecture
- #endif /* USL */
++# define UnixWareArchitecture
++# undef i386
++# undef i486
++# undef i586
++# undef i686
++# undef k6
++# undef __i386__
++# undef __i486__
++# undef __i586__
++# undef __i686__
++# undef __k6__
++# undef __i386
++# undef __i486
++# undef __i586
++# undef __i686
++# undef __k6
++# undef pentium
++# undef __pentium
++# undef pentiumpro
++# undef __pentiumpro
++#endif /* __UNIXWARE__ */
  
  #ifdef NCR
 -#define MacroIncludeFile 
@@ -539,21 +688,13 @@
 +# define MacIIArchitecture
  #endif /* macII */
  
- #ifdef __APPLE__
-@@ -225,72 +382,89 @@
- # define MacroFile MacOSX.cf
- # define MacOSXArchitecture
- # define DarwinArchitecture
-+# ifdef __ppc__
-+#  define PpcDarwinArchitecture
-+#  undef __ppc__
-+# endif
-+# ifdef __i386__
-+#  define i386DarwinArchitecture
-+#  undef __i386__
-+# endif
- #endif
- 
+-#ifdef __APPLE__
+-# define MacroIncludeFile 
+-# define MacroFile MacOSX.cf
+-# define MacOSXArchitecture
+-# define DarwinArchitecture
+-#endif
+-
  #ifdef _CRAY
 -#define MacroIncludeFile 
 -#define MacroFile cray.cf
@@ -651,7 +792,11 @@
 +# endif
 +# ifdef _IBMR2
 +#  undef _IBMR2
-+#  define RsArchitecture
++#  if (DefaultOSMajorVersion < 5)
++#   define RsArchitecture
++#  else
++#   define PpcArchitecture
++#  endif
 +# endif
  #endif /* ibm */
  
@@ -681,7 +826,7 @@
  #endif /* luna */
  
  #ifdef Mips
-@@ -317,9 +491,14 @@
+@@ -317,9 +624,14 @@
  # endif
  #endif /* MOTOROLA */
  
@@ -697,7 +842,7 @@
  # endif
  # define SVR4Architecture
  # define MacroIncludeFile 
-@@ -329,13 +508,42 @@
+@@ -329,13 +641,42 @@
  
  #ifdef SYSV
  # ifdef i386
@@ -744,7 +889,7 @@
  # ifdef SVR4
  #  define i386Architecture
  #  define SVR4Architecture
-@@ -343,18 +551,46 @@
+@@ -343,18 +684,46 @@
  #  define MacroIncludeFile 
  #  define MacroFile svr4.cf
  #  undef SVR4
@@ -800,7 +945,7 @@
  #endif /* DGUX */
  
  #ifdef __convex__
-@@ -366,101 +602,405 @@
+@@ -366,101 +735,446 @@
  # define ConvexArchitecture
  #endif /* _convex_ */
  
@@ -847,16 +992,17 @@
 +# undef SVR4
  #endif /* Oki */
  
- #ifdef WIN32
+-#ifdef WIN32
 -#define MacroIncludeFile 
 -#define MacroFile Win32.cf
 -#define Win32Architecture
++#if defined(WIN32) && !defined(__GNUC__)
 +# define MacroIncludeFile 
 +# define MacroFile Win32.cf
 +# define Win32Architecture
  #endif /* WIN32 */
  
- #ifdef linux 
+-#ifdef linux 
 -#ifdef  PPC
 -#define MacroIncludeFile 
 -#define MacroFile       linux-pmac.cf
@@ -875,12 +1021,33 @@
 -#define MacroFile linux.cf
 -#undef linux
 -#define LinuxArchitecture
--#define i386Architecture
++#if defined(WIN32) && defined(__GNUC__)
++#define MacroIncludeFile 
++#define MacroFile mingw.cf
++#define Win32Architecture
++#define mingwArchitecture
+ #define i386Architecture
 -#endif
+-#endif /* linux */
++#undef i386
++#undef i486
++#undef i586
++#undef i686
++#undef __i386__
++#undef _X86_
++#undef __MINGW32__
++#endif /* CYGWIN */
++
++#if defined(linux) || defined(__GLIBC__)
 +# define MacroIncludeFile 
 +# define MacroFile linux.cf
 +# undef linux
-+# define LinuxArchitecture
++# ifdef __linux__
++#  define LinuxArchitecture
++# endif
++# ifdef __GLIBC__
++#  define GNUArchitecture
++# endif
 +# ifdef i386
 +#  ifndef i386Architecture
 +#   define i386Architecture
@@ -997,21 +1164,31 @@
 +#  undef arm
 +#  undef __arm
 +#  undef __arm__
++#  if defined(__ARMEB__)
++#   define Arm32ebArchitecture
++#  endif
++#  undef __ARMEB__
 +# endif
 +# ifdef mc68000
 +#  define Mc68020Architecture
 +#  undef mc68000
 +# endif /* mc68000 */
-+# ifdef powerpc
-+#  define PPCArchitecture
++# if defined (powerpc) && !defined(__powerpc64__) && !defined (powerpc64)
++#  define PpcArchitecture
 +#  undef powerpc
 +# endif
-+# ifdef __powerpc__
-+#  ifndef PPCArchitecture
-+#   define PPCArchitecture
++# if defined (__powerpc__) && !defined(__powerpc64__) && !defined (powerpc64)
++#  ifndef PpcArchitecture
++#   define PpcArchitecture
 +#  endif
 +#  undef __powerpc__
 +# endif
++# ifdef __powerpc64__
++#  ifndef Ppc64Architecture
++#   define Ppc64Architecture
++#  endif
++#  undef __powerpc64__
++# endif
 +# ifdef sparc
 +#  define SparcArchitecture
 +#  undef sparc
@@ -1080,25 +1257,27 @@
 +#  undef __SH4__
 +# endif /* __SH4__ */
 +/* for compatibility with 3.3.x */
-+# ifdef PPCArchitecture
++# ifdef PpcArchitecture
 +#  define PowerPCArchitecture
 +# endif
 +# if defined(__s390x__)
 +#  define s390xArchitecture
 +#  undef __s390x__
 +# endif
-+# if defined(__x86_64__)
++# if defined(__amd64__) || defined (__x86_64__)
++#  undef __amd64__
 +#  undef __x86_64__
-+#  define x86_64Architecture
++#  define AMD64Architecture
 +# endif
-+# if defined(x86_64__)
++# if defined(amd64__) || defined (x86_64__)
++#  undef amd64__
 +#  undef x86_64__
-+#  ifndef x86_64Architecture
-+#   define x86_64Architecture
++#  ifndef AMD64Architecture
++#   define AMD64Architecture
 +#  endif
 +# endif
- #endif /* linux */
- 
++#endif /* linux || __GLIBC__ */
++
 +#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
 +# define MacroIncludeFile 
 +# define MacroFile lynx.cf
@@ -1113,7 +1292,7 @@
 +#  undef __x86__
 +# endif
 +# ifdef __powerpc__
-+#  define PPCArchitecture
++#  define PpcArchitecture
 +#  undef __powerpc__
 +# endif
 +# if defined(sparc) || defined(__sparc__)
@@ -1122,11 +1301,11 @@
 +#  undef __sparc__
 +# endif
 +/* for compatibility with 3.3.x */
-+# ifdef PPCArchitecture
++# ifdef PpcArchitecture
 +#  define PowerPCArchitecture
 +# endif
 +#endif /* LynxOS AT/PPC/microSPARC */
-+
+ 
  #ifdef __uxp__
 -#define MacroIncludeFile 
 -#define MacroFile fujitsu.cf
@@ -1188,10 +1367,7 @@
 +# define MacroIncludeFile 
 +# define MacroFile nec.cf
 +# define NecArchitecture
- #endif
--#define MacroIncludeFile 
--#define MacroFile nec.cf
--#define NecArchitecture
++#endif
 +
 +#ifdef minix 
 +#define MacroIncludeFile 
@@ -1201,15 +1377,27 @@
 +#define i386Architecture
 +#endif /* minix */
 +
-+#ifdef MACH
-+#ifdef __GNU__
++/* Systems with GNU libc and userland */
++#if defined(__GNU__)
++#define GNUArchitecture
 +#define MacroIncludeFile 
 +#define MacroFile gnu.cf
++#ifdef __i386__
++#define i386Architecture
+ #endif
+-#define MacroIncludeFile 
+-#define MacroFile nec.cf
+-#define NecArchitecture
+ #endif
+ 
++#ifdef MACH
++#ifdef __GNU__
++/* Mach-based GNU system */
 +#define GNUMachArchitecture
 +#else
 +#define MacroIncludeFile 
 +#define MacroFile mach.cf
- #endif
++#endif
 +#undef MACH
 +#ifdef	i386
 +#define i386MachArchitecture
@@ -1217,7 +1405,7 @@
 +#endif	/* i386 */
 +#undef i386
 +#endif /* MACH */
- 
++
 +/* On NetBSD, `unix' is not defined, and cpp emits a warning every time
 + * it sees a test using the `unix' symbol */
 +#if !defined(NetBSDArchitecture) || (defined(NetBSDArchitecture) && DefaultOSMajorVersion == 1 && DefaultOSMinorVersion <= 3)
@@ -1273,9 +1461,21 @@
  
  #ifndef MacroIncludeFile
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-diff -urNad cernlib-2006.dfsg~/src/config/linux.cf cernlib-2006.dfsg/src/config/linux.cf
---- cernlib-2006.dfsg~/src/config/linux.cf	2006-09-15 05:34:48.000000000 -0400
-+++ cernlib-2006.dfsg/src/config/linux.cf	2007-01-09 19:17:01.559270079 -0500
+diff -urNad cernlib-2006.dfsg.2~/src/config/linux-lp64.cf cernlib-2006.dfsg.2/src/config/linux-lp64.cf
+--- cernlib-2006.dfsg.2~/src/config/linux-lp64.cf	2006-12-20 06:21:03.000000000 -0800
++++ cernlib-2006.dfsg.2/src/config/linux-lp64.cf	2008-01-11 09:36:29.000000000 -0800
+@@ -153,7 +153,7 @@
+ # define XargsCmd               xargs
+ # define FortranSaveFlags       -fno-automatic
+ # define OptimisedFortranFlags  -O0 -g -funroll-loops -fomit-frame-pointer
+-# define DefaultFCOptions       -fno-second-underscore
++# define DefaultFCOptions       -fno-automatic -fno-second-underscore
+ # define NoOpFortranDebugFlags  -O0
+ # define CernlibSystem          -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_GFORTRAN -DCERNLIB_QMLXIA64
+ 
+diff -urNad cernlib-2006.dfsg.2~/src/config/linux.cf cernlib-2006.dfsg.2/src/config/linux.cf
+--- cernlib-2006.dfsg.2~/src/config/linux.cf	2006-09-15 02:34:48.000000000 -0700
++++ cernlib-2006.dfsg.2/src/config/linux.cf	2008-01-11 10:00:21.000000000 -0800
 @@ -68,20 +68,20 @@
  #define OSVendor		/**/
  #define OSMajorVersion		2
@@ -1301,7 +1501,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -97,38 +97,302 @@
+@@ -97,38 +97,307 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1372,11 +1572,11 @@
 +   Debian patched (version 4.3.0.dfsg.1-4), plus additional
 +   OptimizationLevel macro.
 +   
-+   Additional Cernlib-specific per-architecture flags also added.
++   Additional CERNLIB-specific per-architecture flags also added.
 +   --Kevin McCarty */
 +
 +/* Note: we are now using CERNLIB_PPC as an endianness test (which is about
-+   all that the Cernlib source uses it for); I introduced a new define
++   all that the CERNLIB source uses it for); I introduced a new define
 +   CERNLIB_POWERPC for the three occasions when we specifically want to
 +   test for powerpc chips.
 +*/
@@ -1478,7 +1678,7 @@
 +# endif
 +# define DefaultCCOptions       -malign-int
 +# define DefaultFCOptions       -malign-int -fno-automatic \
-+                                -fno-second-underscore -fugly-complex
++                                -fno-second-underscore
 +# define LinuxMachineDefines    -D__mc68000__
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
@@ -1488,7 +1688,7 @@
 +/* # define PositionIndependentCplusplusFlags -fpic */
 +#endif /* Mc68020Architecture */
 +
-+#ifdef PPCArchitecture
++#if defined(PpcArchitecture) || defined(Ppc64Architecture)
 +# define DefaultCCOptions       -fsigned-char
 +# ifndef OptimizationLevel
 +#  define OptimizationLevel	-O3
@@ -1498,11 +1698,18 @@
 +# endif
 +# define LinuxMachineDefines    -D__powerpc__
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
-+# define CernlibMachineDefines	-DCERNLIB_PPC -DCERNLIB_POWERPC
++# ifdef Ppc64Architecture
++#  define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#  define CernlibMachineDefines	-DCERNLIB_PPC -DCERNLIB_POWERPC \
++				-DCERNLIB_QMLXIA64
++#  define CERNLIB_QMLXIA64
++# else
++#  define CernlibMachineDefines	-DCERNLIB_PPC -DCERNLIB_POWERPC
++#  define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines
++# endif
 +# define CERNLIB_PPC
 +# define CERNLIB_POWERPC
-+#endif /* PPCArchitecture */
++#endif /* PpcArchitecture || Ppc64Architecture */
 +
 +#ifdef SparcArchitecture
 +# ifndef OptimizationLevel
@@ -1584,7 +1791,7 @@
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
 +#endif
 +
-+#ifdef x86_64Architecture
++#ifdef AMD64Architecture
 +# ifndef OptimizationLevel
 +#  define OptimizationLevel	-O3
 +# endif
@@ -1592,13 +1799,11 @@
 +#  define OptimizedCDebugFlags  OptimizationLevel
 +# endif
 +# define LinuxMachineDefines    -D__x86_64__
-+# define DefaultFCOptions       -fno-automatic \
-+                                -fno-second-underscore -fugly-complex
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 +# define CernlibMachineDefines  -DCERNLIB_QMLXIA64
 +# define CERNLIB_QMLXIA64
-+#endif /* x86_64Architecture */
++#endif /* AMD64Architecture */
 +
 +#ifndef StandardDefines
 +# define StandardDefines        -Dlinux LinuxMachineDefines LinuxSourceDefines
@@ -1618,7 +1823,7 @@
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
  # define ManSuffix	1x
-@@ -163,7 +427,7 @@
+@@ -163,7 +432,7 @@
  #define FortranSaveFlags	/* */ /* Everything static !? */
  #define OptimisedFortranFlags   -g -pc 64 -tp p6
  #define DefaultFCOptions        -Msave -fpic -Kieee
@@ -1627,7 +1832,7 @@
  
  #else
  
-@@ -174,19 +438,18 @@
+@@ -174,19 +443,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1659,7 +1864,7 @@
   
  #else
  
-@@ -197,19 +460,18 @@
+@@ -197,19 +465,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1691,7 +1896,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */
-@@ -222,25 +484,28 @@
+@@ -222,25 +489,30 @@
  #else
  
  # ifdef Hasgfortran
@@ -1719,9 +1924,12 @@
  # define XargsCmd               xargs
  # define FortranSaveFlags       -fno-automatic
 -# define OptimisedFortranFlags  -O0 -g -funroll-loops -fomit-frame-pointer
-+# define OptimisedFortranFlags  OptimizedCDebugFlags -funroll-loops
+-# define DefaultFCOptions       -fno-second-underscore
++# define OptimisedFortranFlags  OptimizedCDebugFlags /* -funroll-loops */
 +/* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */
- # define DefaultFCOptions       -fno-second-underscore
++# ifndef DefaultFCOptions
++# define DefaultFCOptions       -fno-range-check -fno-automatic -fno-second-underscore
++# endif
  # define NoOpFortranDebugFlags  -O0
 -# define CernlibSystem          -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_GFORTRAN
 +# define CernlibSystem          CernlibDefaultDefines CernlibMachineDefines \
@@ -1729,7 +1937,7 @@
  
  #define CERNLIB_GFORTRAN
   
-@@ -249,17 +514,32 @@
+@@ -249,17 +521,32 @@
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
  
@@ -1765,7 +1973,7 @@
  
  # endif
  # endif
-@@ -280,7 +560,7 @@
+@@ -280,7 +567,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */


Index: cernlib-308-use-canonical-cfortran-location.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-308-use-canonical-cfortran-location.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-308-use-canonical-cfortran-location.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ cernlib-308-use-canonical-cfortran-location.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 308-use-canonical-cfortran-location.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: All code compiled at Cernlib build-time should look for cfortran.h
+## DP: All code compiled at CERNLIB build-time should look for cfortran.h
 ## DP: at .
 
 @DPATCH@


Index: cernlib-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-321-support-gfortran.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-321-support-gfortran.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ cernlib-321-support-gfortran.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -2,12 +2,15 @@
 ## 321-support-gfortran.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support compilation with gfortran.  Patch thanks to Harald Vogt
+## DP: Support compilation with gfortran.  Patch thanks to Harald Vogt, plus:
+## DP: - Extra hack to IOSTAT EOF return value to support gfortran-4.3.
+## DP: - Work around gfortran's refusal to initialize 4-byte integer with
+## DP:   unsigned constant > 0x7fffffff.
 
 @DPATCH@
 diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F
---- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F	1996-04-01 10:01:53.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F	2007-04-21 19:45:12.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F	1996-04-01 07:01:53.000000000 -0800
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F	2008-02-11 15:40:44.000000000 -0800
 @@ -45,7 +45,16 @@
           MT=3
           Z(1)=SQRT(SQRT(-D))
@@ -48,8 +51,8 @@
        W3=0
        IF(W1*W2 .NE. 0) W3=-Q/(8*W1*W2)
 diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F
---- cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F	1996-04-01 10:02:54.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F	2007-04-21 19:45:12.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F	1996-04-01 07:02:54.000000000 -0800
++++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F	2008-02-11 15:40:44.000000000 -0800
 @@ -14,10 +14,12 @@
        VECTOR(I) = RNDM(I)
    100 CONTINUE
@@ -66,8 +69,8 @@
        RETURN
        END
 diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile
---- cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile	1999-11-15 08:25:58.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile	2007-04-21 19:45:12.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile	1999-11-15 05:25:58.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile	2008-02-11 15:40:44.000000000 -0800
 @@ -13,7 +13,19 @@
  #endif
  
@@ -89,33 +92,33 @@
  
  SubdirLibraryTarget(NullParameter,NullParameter)
 diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile
---- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2006-09-04 08:32:59.000000000 -0400
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2007-04-21 19:45:41.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2006-09-04 05:32:59.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2008-02-11 15:40:44.000000000 -0800
 @@ -1,6 +1,6 @@
  
 -SRCS_F= irndm.F qnext.F rdmin.F
-+SRCS_F= irndm.F qnext.F rdmin.F getarg.F
++SRCS_F= irndm.F qnext.F rdmin.F kernlibgetarg.F
  
 -SRCS_C= lshift.c ishftr.c getarg.c
 +SRCS_C= lshift.c ishftr.c /* getarg.c */
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F
---- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F	2007-04-21 19:48:39.000000000 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F	1969-12-31 16:00:00.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F	2008-02-11 15:40:44.000000000 -0800
 @@ -0,0 +1,19 @@
 +*     Wrapper GETARG routine for gfortran,
 +*     originally written by Harald Vogt 
 +*
-+      SUBROUTINE GETARG (JARG, CHARG)
++*     SUBROUTINE GETARG (JARG, CHARG)
 +*     The following stuff is required to use gfortrans inline routine GETARG
 +*     It is required to avoid the calling GETARG here which conflicts
 +*     to the Fortran rules
-+      CHARACTER    CHARG*(*)
-+      CALL MYGETARG (JARG, CHARG)
-+      END
++*     CHARACTER    CHARG*(*)
++*     CALL MYGETARG (JARG, CHARG)
++*     END
 +
-+      SUBROUTINE MYGETARG (JARG, CHARG)
++      SUBROUTINE KERNLIBGETARG (JARG, CHARG)
 +      CHARACTER    CHARG*(*)
 +*     gfortran translates the following line to a call
 +*     to its library routine _gfortran_getarg_i4
@@ -123,3 +126,32 @@
 +      CALL GETARG (JARG, CHARG)
 +      END
 + 
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kfor.h cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kfor.h	2006-09-15 02:35:30.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h	2008-02-11 15:40:44.000000000 -0800
+@@ -1031,7 +1031,7 @@
+ #if !defined(CERNLIB_GFORTRAN)
+ #define  Getarg           F77_NAME(getarg,GETARG)
+ #else
+-#define  Getarg           _gfortran_getarg_i4
++#define  Getarg           F77_NAME(kernlibgetarg,KERNLIBGETARG)
+ #endif
+                  extern SUBROUTINE Getarg;
+ #define  Goparm           F77_NAME(goparm,GOPARM)
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/fq/fzdaeof.inc cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc
+--- cernlib-2006.dfsg.2~/src/packlib/zebra/fq/fzdaeof.inc	2006-09-15 02:35:31.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc	2008-02-11 15:40:44.000000000 -0800
+@@ -46,8 +46,12 @@
+ #elif defined(CERNLIB_WINDOWS)
+ *    only valid for dec fortran (e.g. not f2c + microsoft c)
+       PARAMETER    (IOSEOF = 36)
+-#elif defined(CERNLIB_GFORTRAN)
++#elif defined(CERNLIB_GFORTRAN) && defined(__GNUC__) && defined(__GNUC_MINOR__)
++# if (__GNUC__ > 4 || __GNUC_MINOR__ >= 3)
++      PARAMETER    (IOSEOF = 5002)
++# else
+       PARAMETER    (IOSEOF = 3)
++# endif
+ #elif 1
+       PARAMETER    (IOSEOF = -1)
+ #endif


Index: cernlib-600-use-host.def-config-file.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-600-use-host.def-config-file.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-600-use-host.def-config-file.dpatch	19 Dec 2007 23:27:43 -0000	1.1
+++ cernlib-600-use-host.def-config-file.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 600-use-host.def-config-file.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Use host.def for Debian-specific CERNLIB build options.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/config/site.def cernlib-2005.05.09.dfsg/src/config/site.def


Index: cernlib-800-implement-shared-library-rules-in-Imake.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-800-implement-shared-library-rules-in-Imake.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-800-implement-shared-library-rules-in-Imake.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ cernlib-800-implement-shared-library-rules-in-Imake.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -84,7 +84,7 @@
 +#elif defined(LinuxArchitecture) /* added by Kevin McCarty
 +				    for Debian, 15 May 2002 */
 +#ifndef SharedLibraryTargetName
-+#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME).$(CERN_LEVEL))
++#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME)$(TOOL_NAME).$(CERN_LEVEL))
 +#endif
 +
 +#ifndef SharedLibrarySonameName


Index: cernlib-803-link-binaries-dynamically.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib-803-link-binaries-dynamically.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-803-link-binaries-dynamically.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ cernlib-803-link-binaries-dynamically.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -2,13 +2,13 @@
 ## 803-link-binaries-dynamically.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link binaries dynamically against Cern libraries.
+## DP: Link binaries dynamically against CERN libraries.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules
---- cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:19.991403858 -0400
-+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:23.699609849 -0400
-@@ -189,13 +189,13 @@
+diff -urNad cernlib-2006.dfsg.2~/src/config/fortran.rules cernlib-2006.dfsg.2/src/config/fortran.rules
+--- cernlib-2006.dfsg.2~/src/config/fortran.rules	2007-12-14 01:25:54.000000000 +0000
++++ cernlib-2006.dfsg.2/src/config/fortran.rules	2007-12-14 01:34:31.000000000 +0000
+@@ -189,7 +189,7 @@
   */
  #ifndef CernlibDependLibrary
  #define CernlibDependLibrary(cernlibs)\
@@ -17,23 +17,33 @@
  #endif
  
  /* Helper to use cernlib command
+@@ -202,17 +202,22 @@
+  *   cernlib utility to find give all required libraries ( ie. no extra
+  *   syslibs needed.
   */
- #ifndef CernlibCmd
--#define CernlibCmd(libraries)cernlib libraries
-+#define CernlibCmd(libraries)cernlib -dy libraries
- #endif
- /*
-  * CernlibFortranProgramTarget - rule to link fortran program using
-@@ -207,7 +207,7 @@
+-#ifndef CernlibFortranProgramTarget
+-#define CernlibFortranProgramTarget(program,objects,deplibs,locallibs,cernlibs)\
++#ifndef CernlibFortranStaticTarget
++#define CernlibFortranStaticTarget(program,objects,deplibs,locallibs,cernlibs)\
  ProgramTargetName(program): SetWin32ObjSuffix(objects) deplibs CernlibDependLibrary(cernlibs)	@@\
  	RemoveTargetProgram($@)						@@\
  	@echo "Linking with cern libraries"				@@\
 -	@cernlib cernlibs						@@\
-+	@cernlib -dy cernlibs						@@\
++	@CernlibCmd(cernlibs)						@@\
  	CernlibFortranLinkRule($@,$(FCLDOPTIONS),objects,locallibs $(LDLIBS),CernlibCmd(cernlibs)) @@\
  									@@\
  clean::									@@\
-@@ -233,8 +233,8 @@
+ 	RemoveFile(ProgramTargetName(program))				@@\
+ 
++#endif /*CernlibFortranStaticTarget */
++
++#ifndef CernlibFortranProgramTarget
++#define CernlibFortranProgramTarget(program,objects,deplibs,locallibs,cernlibs)\
++CernlibFortranStaticTarget(program,objects,deplibs,locallibs,-dy cernlibs)
+ #endif /*CernlibFortranProgramTarget */
+ 
+ /*
+@@ -233,8 +238,8 @@
  ProgramTargetName(program): objects deplibs CernlibDependLibrary(cernlibs) @@\
  	RemoveTargetProgram($@)						@@\
  	@echo "Linking with cern libraries"				@@\
@@ -44,9 +54,9 @@
  									@@\
  clean::									@@\
  	RemoveFile(ProgramTargetName(program))				@@\
-diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
---- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:18.903636773 -0400
-+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:23.699609849 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/Imakefile	2007-12-14 01:25:53.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/Imakefile	2007-12-14 01:25:57.000000000 +0000
 @@ -13,14 +13,14 @@
  DefinePackageLibrary(kxtlib)
  


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cernlib.spec	1 Jan 2008 00:41:14 -0000	1.40
+++ cernlib.spec	10 Mar 2008 10:31:30 -0000	1.41
@@ -55,7 +55,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       21%{?dist}
+Release:       27%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -138,10 +138,10 @@
 Source204: cernlib-debian-copyright.in
 
 # debian patchsets
-Patch100001: http://ftp.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-2.diff.gz
-Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-1.diff.gz
-Patch100003: http://ftp.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-1.diff.gz
-Patch100004: http://ftp.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-5.diff.gz
+Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-11.diff.gz
+Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-2.diff.gz
+Patch100003: http://ftp.de.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-5.diff.gz
+Patch100004: http://ftp.de.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-7.diff.gz
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: geant321-001-fix-missing-fluka.dpatch
@@ -210,6 +210,16 @@
 Patch21101: cernlib-211-support-amd64-and-itanium.dpatch
 Patch21102: paw-211-support-amd64-and-itanium.dpatch
 Patch2111: cernlib-211-support-digital-alpha.dpatch
+Patch212: cernlib-212-print-test-results.dpatch
+Patch21301: cernlib-213-fix-test-suite-build.dpatch
+Patch21302: geant321-213-fix-test-suite-build.dpatch
+Patch21303: mclibs-213-fix-test-suite-build.dpatch
+Patch214: cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch
+# not in latest debian cernlib and doesn't seems to be useful on fedora
+#Patch215: cernlib-215-work-around-g77-bug-on-ia64.dpatch
+Patch216: cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch
+Patch217: cernlib-217-abend-on-mathlib-test-failure.dpatch
+Patch220: mclibs-220-compile-isajet-with-isarun.dpatch
 Patch300: cernlib-300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -289,6 +299,9 @@
 Patch80602: paw-806-bump-mathlib-and-dependents-sonames.dpatch
 Patch80603: geant321-806-bump-mathlib-and-dependents-sonames.dpatch
 Patch80604: mclibs-806-bump-mathlib-and-dependents-sonames.dpatch
+Patch80701: cernlib-807-static-link-some-tests-on-64-bit.dpatch
+Patch80702: geant321-807-static-link-some-tests-on-64-bit.dpatch
+Patch80703: mclibs-807-static-link-some-tests-on-64-bit.dpatch
 
 # change the cernlib script such that -llapack -lblas is used instead of 
 # cernlib lapack
@@ -300,21 +313,10 @@
 Patch1200: cernlib-script.patch
 # don't stop if the CERN variable isn't defined
 Patch1201: cernlib-gxint-script.diff
-# not needed in 2006
-#Patch1203: cernlib-hwuli2_use_dimag.diff 
-#Patch1204: cernlib-hwhiga_use_dimag.diff
 # modify the cernlib man page to fit with the distribution
 Patch1206: cernlib-man_static.patch
 # modify the debian cernlib paw desktop file icon name
 Patch1207: cernlib-fedora_desktop.patch
-# fix tests Imakefiles
-Patch1208: cernlib-test.patch
-# don't recurse in eurodec for tests because the testcase segfaults
-Patch1210: cernlib-segf_eudtest.patch
-# kernlib/kernnum packlib/{ffread hbook kuip zbook zebra} test error on 64 bit
-# packlib/{ffread hbook kuip} segfaults on ppc64
-Patch1211: cernlib-64test.patch
-
 
 # patchy 4
 # not applied as it has allready been done by the sed one-liner in 
@@ -610,6 +612,15 @@
 %patch -P 21101 -p1
 %patch -P 21102 -p1
 %patch -P 2111 -p1
+%patch -P 212 -p1
+%patch -P 21301 -p1
+%patch -P 21302 -p1
+%patch -P 21303 -p1
+%patch -P 214 -p1
+#%patch -P 215 -p1
+%patch -P 216 -p1
+%patch -P 217 -p1
+%patch -P 220 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -752,20 +763,15 @@
 %patch -P 80602 -p1
 %patch -P 80603 -p1
 %patch -P 80604 -p1
+%patch -P 80701 -p1
+%patch -P 80702 -p1
+%patch -P 80703 -p1
 
 %patch -P 1504 -p2 -b .np_flags
 #%patch -P 1505 -p1
 %patch -P 1506 -p2 -b .curdir
 
 %patch -P 1201
-#%patch -P 1203
-#%patch -P 1204
-%patch -P 1208 -p2 -b .test
-%patch -P 1210 -p2 -b .segf_eudtest
-
-%ifarch x86_64 ppc64
-%patch -P 1211 -p2 -b .64test
-%endif
 
 # remove CVS directories
 find . -depth -type d -name CVS -exec rm -rf {} ';' 
@@ -799,7 +805,9 @@
 # incompatible for functions.
 %if %{with gfortran}
 TOOL_SONAME=_gfortran
+TOOL_NAME=_gfortran
 export TOOL_SONAME
+export TOOL_NAME
 %endif
 
 # set the CERN and CERN_LEVEL environment variables in shell scripts
@@ -825,11 +833,18 @@
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    ../patchy/ylist ../patchy/yindex
 
+%if %{with gfortran}
+FC_COMPILER=gfortran
+%else
+FC_COMPILER=g77
+%endif
+
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
 # and substitue the name of the cernlib link script
 sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' \
   -e 's/`cernlib /`cernlib%{?compiler} /' \
+  -e 's/"f77"/"'$FC_COMPILER'"/' \
   src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
@@ -850,7 +865,7 @@
 
 # use the debian cernlib script for dynamic libraries support.
 # remove -lg2c to the link commands, because libg2c.so isn't available, 
-# it is found by g77/gfortran if needed.
+# it is found by g77/gfortran if needed, and similar with -lgfortran.
 # don't add %{_libdir} to the directory searched in for libraries, 
 # since it is already in the list.
 sed -e 's:@PREFIX@:%{_prefix}:g' \
@@ -858,6 +873,7 @@
   -e 's:@VERSION@:%{verdir}:g' \
   -e 's:@LIBPREFIX@::g' \
   -e 's/-lg2c//' \
+  -e 's/-lgfortran//' \
   ../cernlib.in > src/scripts/cernlib
 # to remove reference to monolithic X directories
 #  -e 's/-L\$XDIR\(64\)\? //' \
@@ -1135,7 +1151,7 @@
 %{__install} -d -m755 %{buildroot}/%{_datadir}/X11/app-defaults
 %{__install} -p -m644 ../../*/debian/add-ons/app-defaults/* %{buildroot}/%{_datadir}/X11/app-defaults/
 
-sed -e 's/Exec=paw++/Exec=paw++%{?compiler_string}/' -e 's/PAW++/PAW++%{?compiler_string}/' \
+sed -e 's/Exec=paw++/Exec=paw++%{?compiler_string}/' -e 's/Paw++/Paw++%{?compiler_string}/' \
  ../../paw*/debian/add-ons/misc/paw++.desktop > paw++%{?compiler_string}.desktop
 desktop-file-install --vendor="fedora"               \
   --dir=%{buildroot}/%{_datadir}/applications         \
@@ -1177,16 +1193,22 @@
 cd $CERN_ROOT/build
 
 # no test in code_motif paw_motif scripts patchy pawlib
-test_dirs='graflib mclibs kernlib mathlib packlib phtools'
+test_dirs='graflib mclibs kernlib mathlib packlib phtools geant321'
 
-%ifnarch x86_64 ppc64
-test_dirs="$test_dirs geant321"
-%endif
+#%ifnarch x86_64 ppc64
+#test_dirs="$test_dirs geant321"
+#%endif
+rm -f __dist_failed_builds
 
 for dir in $test_dirs; do
-make -C $dir test
+make -C $dir test || echo $dir >> __dist_failed_builds
 done
 
+if [ -f __dist_failed_builds ]; then
+echo "DIST TESTS FAILED"
+cat __dist_failed_builds
+fi
+
 
 %clean
 rm -rf %{buildroot}
@@ -1418,6 +1440,18 @@
 %endif
 
 %changelog
+* Tue Feb 26 2008 Patrice Dumas  2006-27
+- new mclibs and geant321 patchsets
+
+* Sun Feb 24 2008 Patrice Dumas  2006-25
+- new cernlib and paw patchsets
+
+* Sun Jan 13 2008 Patrice Dumas  2006-23
+- new cernlib debian patcheset
+
+* Tue Jan  8 2008 Patrice Dumas  2006-22
+- new debian patchesets
+
 * Mon Dec 31 2007 Patrice Dumas  2006-21
 - no --build-id for EL-5
 


Index: geant321-001-fix-missing-fluka.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/geant321-001-fix-missing-fluka.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geant321-001-fix-missing-fluka.dpatch	19 Dec 2007 23:27:43 -0000	1.2
+++ geant321-001-fix-missing-fluka.dpatch	10 Mar 2008 10:31:30 -0000	1.3
@@ -2,18 +2,18 @@
 ## 001-fix-missing-fluka.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Deal with FLUKA code having been purged from Debian's Cernlib source.
+## DP: Deal with FLUKA code having been purged from Debian's CERNLIB source.
 
 @DPATCH@
-diff -urNad geant321-3.21.14~/src/geant321/Imakefile geant321-3.21.14/src/geant321/Imakefile
---- geant321-3.21.14~/src/geant321/Imakefile	1998-03-05 06:20:07.000000000 -0500
-+++ geant321-3.21.14/src/geant321/Imakefile	2007-01-30 17:37:26.209615233 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/Imakefile geant321-3.21.14.dfsg/src/geant321/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/Imakefile	1998-03-05 03:20:07.000000000 -0800
++++ geant321-3.21.14.dfsg/src/geant321/Imakefile	2008-01-04 17:00:47.000000000 -0800
 @@ -4,10 +4,11 @@
  
  AllTarget(geant321)
  
 -LIBDIRS= block cdf cgpack fiface fluka gbase gcons gdraw \ @@\
-+/* Fluka removed from Debian source package for copyright reasons. */
++/* FLUKA removed from Debian source package for copyright reasons. */
 +LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
           geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
  	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
@@ -26,7 +26,7 @@
  InstallLibrary(geant321,$(CERN_LIBDIR))
  InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
  
-+/* Fluka removed from Debian source package for copyright reasons. */
++/* FLUKA removed from Debian source package for copyright reasons. */
 +/*
  SubdirDataFile($(LIBRARY),flukaaf.dat,data)
  
@@ -35,9 +35,23 @@
  
  /* This will install the correct link for xsneut95.dat at CERN;
   * If you want a local copy of the file, just copy it there
-diff -urNad geant321-3.21.14~/src/geant321/geant321/gcnmec.inc geant321-3.21.14/src/geant321/geant321/gcnmec.inc
---- geant321-3.21.14~/src/geant321/geant321/gcnmec.inc	1995-10-24 06:20:31.000000000 -0400
-+++ geant321-3.21.14/src/geant321/geant321/gcnmec.inc	2007-01-30 17:39:15.301513801 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/examples/Imakefile	1996-03-06 09:31:38.000000000 -0800
++++ geant321-3.21.14.dfsg/src/geant321/examples/Imakefile	2008-01-04 17:01:20.000000000 -0800
+@@ -1,7 +1,10 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' /* for NamedMakeSubdirs */
+ 
++/* gexam4 needs fluka
+ SUBDIRS= gexam1 gexam2 gexam3 gexam4 gexam5
++*/
++SUBDIRS= gexam1 gexam2 gexam3 gexam5
+ 
+ TestSubdirs($(SUBDIRS))
+ 
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/geant321/gcnmec.inc geant321-3.21.14.dfsg/src/geant321/geant321/gcnmec.inc
+--- geant321-3.21.14.dfsg~/src/geant321/geant321/gcnmec.inc	1995-10-24 03:20:31.000000000 -0700
++++ geant321-3.21.14.dfsg/src/geant321/geant321/gcnmec.inc	2008-01-04 17:00:47.000000000 -0800
 @@ -16,13 +16,14 @@
        PARAMETER(NMECA=45,IBLOWN=23)
        CHARACTER*4 CHNMEC(NMECA)
@@ -55,9 +69,9 @@
       +     'HADG',  'INEG',  'ELAG',  'FISG',  'CAPG',
       +     'LOSS',  'PHOT',  'ANNI',  'COMP',  'BREM',
       +     'PAIR',  'DRAY',  'PFIS',  'RAYL',  'MUNU',
-diff -urNad geant321-3.21.14~/src/geant321/miface/Imakefile geant321-3.21.14/src/geant321/miface/Imakefile
---- geant321-3.21.14~/src/geant321/miface/Imakefile	1995-10-24 06:21:53.000000000 -0400
-+++ geant321-3.21.14/src/geant321/miface/Imakefile	2007-01-30 17:37:26.319591944 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/miface/Imakefile geant321-3.21.14.dfsg/src/geant321/miface/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/miface/Imakefile	1995-10-24 03:21:53.000000000 -0700
++++ geant321-3.21.14.dfsg/src/geant321/miface/Imakefile	2008-01-04 17:00:47.000000000 -0800
 @@ -1,5 +1,5 @@
  SRCS_F= \ @@\
 -	 gfmdis.F gfmfin.F gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F


Index: geant321-003-geant-dummy-functions.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/geant321-003-geant-dummy-functions.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-003-geant-dummy-functions.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ geant321-003-geant-dummy-functions.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 003-geant-dummy-functions.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add stub Geant functions to avoid missing symbols due to Fluka removal.
+## DP: Add stub GEANT functions to avoid missing symbols due to FLUKA removal.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile
@@ -12,7 +12,7 @@
  SRCS_F= gfkine.F gfvert.F gludky.F glund.F glundi.F gpkine.F \ @@\
  	gpkinx.F gpvert.F gskine.F gskinu.F gsvert.F gsveru.F gtau.F
  
-+/* Dummy file containing stubs for deleted Fluka and mclibs functions: */
++/* Dummy file containing stubs for deleted FLUKA and mclibs functions: */
 +SRCS_C= dummy.c
 +
  #ifdef CERNLIB_QMVAOS
@@ -47,7 +47,7 @@
 +
 +static void print_dummy(const char *domain, const char *function)
 +{
-+  fprintf(stderr, "Geant321: Now in dummy %s routine.\n", function);
++  fprintf(stderr, "GEANT 3.21: Now in dummy %s routine.\n", function);
 +  fprintf(stderr,
 +"If you see this message, you are presumably trying to call (possibly\n"
 +"indirectly) the %s routine");
@@ -64,7 +64,7 @@
 +  else if (strcmp(domain, "Fluka") == 0)
 +    fprintf(stderr,
 +" in the FLUKA library.\n"
-+"FLUKA is unfortunately not available in this distribution of Cernlib for\n"
++"FLUKA is unfortunately not available in this distribution of CERNLIB for\n"
 +"licensing reasons"
 +#if defined (CERNLIB_DEBIAN)
 +"; please see the file /usr/share/doc/geant321/README.Debian\n"
@@ -75,7 +75,7 @@
 +    );
 +  
 +  else if (strcmp(domain, "User") == 0)
-+    fprintf(stderr, ".  This routine is not built into Geant;\n"
++    fprintf(stderr, ".  This routine is not built into GEANT;\n"
 +"you must write code for it yourself.  Please see the documentation"
 +#if defined (CERNLIB_DEBIAN)
 +"\n(for instance in the geant321-doc package)"
@@ -118,7 +118,7 @@
 +WEAKDUMMY(Fluka, SITSAO, sitsao_, double);
 +
 +/* The following dummy functions are added due to the removal
-+ * of the corresponding code from Geant (it is also part of FLUKA).
++ * of the corresponding code from GEANT (it is also part of FLUKA).
 + * We are constrained to keep the ABI for the dynamic library, so
 + * these dummy functions must be kept until next time the libgeant321
 + * soversion is changed. */


Index: geant321-203-compile-geant-with-ertrak.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/geant321-203-compile-geant-with-ertrak.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-203-compile-geant-with-ertrak.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ geant321-203-compile-geant-with-ertrak.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -11,7 +11,7 @@
 @@ -5,11 +5,12 @@
  AllTarget(geant321)
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */
 +/* Ertrak added to Debian since I saw no reason to leave it out. */
  LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
           geocad ggeom gheisha ghits ghrout ghutils giface \ @@\


Index: geant321-806-bump-mathlib-and-dependents-sonames.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/geant321-806-bump-mathlib-and-dependents-sonames.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-806-bump-mathlib-and-dependents-sonames.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ geant321-806-bump-mathlib-and-dependents-sonames.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -17,4 +17,4 @@
 +
  AllTarget(geant321)
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */


Index: mclibs-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/mclibs-321-support-gfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mclibs-321-support-gfortran.dpatch	19 Dec 2007 23:27:43 -0000	1.1
+++ mclibs-321-support-gfortran.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -21,11 +21,13 @@
 diff -urNad mclibs-2005.dfsg~/src/mclibs/isajet/test/Imakefile mclibs-2005.dfsg/src/mclibs/isajet/test/Imakefile
 --- mclibs-2005.dfsg~/src/mclibs/isajet/test/Imakefile	2000-07-25 12:21:34.000000000 -0400
 +++ mclibs-2005.dfsg/src/mclibs/isajet/test/Imakefile	2006-09-27 13:49:49.783806148 -0400
-@@ -8,4 +8,7 @@
+@@ -8,4 +8,9 @@
  
- CernlibFortranProgramTarget(isajett,isajett.o,$(PACKAGE_LIB),$(PACKAGE_LIB),pdflib804 mathlib kernlib)
+ CernlibFortranProgramTarget(isajett,isajett.o,NullParameter,NullParameter,pdflib804 mathlib kernlib isajet)
  
 +#if !defined(CERNLIB_GFORTRAN)
 +/* breaks on 'STOP 99' if compiled with gfortran */
  TestTarget(isajett,isajet.dat,test.input)
++#else
++test::
 +#endif


Index: paw-108-quote-protect-comis-script.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-108-quote-protect-comis-script.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-108-quote-protect-comis-script.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-108-quote-protect-comis-script.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 108-quote-protect-comis-script.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Try to be whitespace-safe in script generated at runtime by COMIS.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F


Index: paw-200-comis-allow-special-chars-in-path.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-200-comis-allow-special-chars-in-path.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-200-comis-allow-special-chars-in-path.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-200-comis-allow-special-chars-in-path.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 200-comis-allow-special-chars-in-path.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Allow certain additional characters in paths to COMIS macros.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F


Index: paw-211-support-amd64-and-itanium.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-211-support-amd64-and-itanium.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-211-support-amd64-and-itanium.dpatch	19 Dec 2007 23:27:43 -0000	1.1
+++ paw-211-support-amd64-and-itanium.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -166,7 +166,7 @@
 --- paw-2.14.04~/src/pawlib/comis/code/csitgpl.F	1969-12-31 19:00:00.000000000 -0500
 +++ paw-2.14.04/src/pawlib/comis/code/csitgpl.F	2006-09-08 14:44:11.808264160 -0400
 @@ -0,0 +1,32 @@
-+* Comis
++* COMIS
 +*
 +*
 +#if (defined(CERNLIB_QMLXIA64))
@@ -306,7 +306,7 @@
 --- paw-2.14.04~/src/pawlib/comis/code/csrtgpl.F	1969-12-31 19:00:00.000000000 -0500
 +++ paw-2.14.04/src/pawlib/comis/code/csrtgpl.F	2006-09-08 14:44:11.808264160 -0400
 @@ -0,0 +1,31 @@
-+* Comis
++* COMIS
 +*
 +*
 +#if (defined(CERNLIB_QMLXIA64))


Index: paw-308-use-canonical-cfortran-location.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-308-use-canonical-cfortran-location.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-308-use-canonical-cfortran-location.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-308-use-canonical-cfortran-location.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 308-use-canonical-cfortran-location.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: All code compiled at Cernlib build-time should look for cfortran.h
+## DP: All code compiled at CERNLIB build-time should look for cfortran.h
 ## DP: at .
 
 @DPATCH@


Index: paw-320-support-ifort-and-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-320-support-ifort-and-gfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-320-support-ifort-and-gfortran.dpatch	11 Sep 2006 22:32:35 -0000	1.1
+++ paw-320-support-ifort-and-gfortran.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -5,9 +5,9 @@
 ## DP: Support use of ifort, icc and/or gfortran as default compilers.
 
 @DPATCH@
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/csinit.F paw-2.14.04/src/pawlib/comis/code/csinit.F
---- paw-2.14.04~/src/pawlib/comis/code/csinit.F	2006-09-07 17:57:19.881356063 -0400
-+++ paw-2.14.04/src/pawlib/comis/code/csinit.F	2006-09-07 18:04:23.085153626 -0400
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/code/csinit.F paw-2.14.04.dfsg.2/src/pawlib/comis/code/csinit.F
+--- paw-2.14.04.dfsg.2~/src/pawlib/comis/code/csinit.F	2007-12-12 23:52:57.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/comis/code/csinit.F	2007-12-12 23:52:59.000000000 +0000
 @@ -217,8 +217,18 @@
  #endif
  #if (defined(CERNLIB_LINUX))
@@ -27,9 +27,57 @@
  #endif
  #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
        ITMPLEN=CSTMPD(CHPATH, 256)
-diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/Imakefile paw-2.14.04/src/pawlib/paw/ntuple/Imakefile
---- paw-2.14.04~/src/pawlib/paw/ntuple/Imakefile	2006-09-07 17:57:19.916348611 -0400
-+++ paw-2.14.04/src/pawlib/paw/ntuple/Imakefile	2006-09-07 17:57:35.628002463 -0400
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/deccc/Imakefile paw-2.14.04.dfsg.2/src/pawlib/comis/deccc/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/comis/deccc/Imakefile	2005-04-18 15:41:06.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/comis/deccc/Imakefile	2007-12-12 23:55:32.000000000 +0000
+@@ -45,8 +45,12 @@
+ #endif
+ 
+ #if defined(CERNLIB_LINUX)
++#if defined(CERNLIB_GFORTRAN)
++EXTRA_DEFINES := $(EXTRA_DEFINES) -DgFortran
++#else
+ EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
+ #endif
++#endif
+ 
+ #if defined(CERNLIB_SUN) && !defined(CERNLIB_SOLARIS)
+ CCOPTIONS=
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/paw/cpaw/Imakefile paw-2.14.04.dfsg.2/src/pawlib/paw/cpaw/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/paw/cpaw/Imakefile	1999-06-28 15:28:22.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/paw/cpaw/Imakefile	2007-12-12 23:56:19.000000000 +0000
+@@ -15,8 +15,12 @@
+ #endif
+ 
+ #if defined(CERNLIB_LINUX)
++#if defined(CERNLIB_GFORTRAN)
++EXTRA_DEFINES := $(EXTRA_DEFINES) -DgFortran
++#else
+ EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
+ #endif
++#endif
+ 
+ #if defined(CERNLIB_BUGREPORT)
+ SRCS_C := $(SRCS_C) bugrep.c
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/paw/mlpfit/Imakefile paw-2.14.04.dfsg.2/src/pawlib/paw/mlpfit/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/paw/mlpfit/Imakefile	2000-04-28 14:12:13.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/paw/mlpfit/Imakefile	2007-12-12 23:57:04.000000000 +0000
+@@ -9,8 +9,12 @@
+ #endif
+ 
+ #if defined(CERNLIB_LINUX)
++#if defined(CERNLIB_GFORTRAN)
++EXTRA_DEFINES := $(EXTRA_DEFINES) -DgFortran
++#else
+ EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
+ #endif
++#endif
+ 
+ #ifndef CERNLIB_VAXVMS
+ EXTRA_INCLUDES := $(EXTRA_INCLUDES) -I$(VPATH)
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/paw/ntuple/Imakefile paw-2.14.04.dfsg.2/src/pawlib/paw/ntuple/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/paw/ntuple/Imakefile	2007-12-12 23:52:58.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/paw/ntuple/Imakefile	2007-12-12 23:52:59.000000000 +0000
 @@ -16,9 +16,17 @@
  EXTRA_DEFINES := $(EXTRA_DEFINES) -Dextname
  #endif


Index: paw-803-link-binaries-dynamically.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-803-link-binaries-dynamically.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-803-link-binaries-dynamically.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-803-link-binaries-dynamically.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 803-link-binaries-dynamically.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link binaries dynamically against Cern libraries.
+## DP: Link binaries dynamically against CERN libraries.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile


Index: paw-804-workaround-for-comis-mdpool-struct-location.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/paw-804-workaround-for-comis-mdpool-struct-location.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-804-workaround-for-comis-mdpool-struct-location.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-804-workaround-for-comis-mdpool-struct-location.dpatch	10 Mar 2008 10:31:30 -0000	1.2
@@ -2,7 +2,7 @@
 ## 804-workaround-for-comis-mdpool-struct-location.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Hack to workaround Comis not liking it when code has a negative
+## DP: Hack to workaround COMIS not liking it when code has a negative
 ## DP: offset from the mdpool struct (as is the case when using shared
 ## DP: libraries on some arches).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Dec 2007 23:27:43 -0000	1.6
+++ sources	10 Mar 2008 10:31:30 -0000	1.7
@@ -1,6 +1,6 @@
 fe71a3f6b95ff2151c5a4690116a0358  2006_src-free.tar.gz
 b1f550eedc545a02f0ab58eb7d550480  patchy.tar.gz
-c3133b7a5885bd1ee7e47d4f4e76beca  geant321_3.21.14.dfsg-5.diff.gz
-3978b81499f205062b540aa58bb79193  mclibs_2006.dfsg.2-1.diff.gz
-90982e80623338cf2d4b4a9efb445f8c  paw_2.14.04.dfsg.2-1.diff.gz
-2a9795aed7895477a2759dc34e7f9b96  cernlib_2006.dfsg.2-2.diff.gz
+9a19d3bd4bd63c0ee2431c8d28f308b9  geant321_3.21.14.dfsg-7.diff.gz
+c65e057e938076f73645a193d497aaf4  mclibs_2006.dfsg.2-5.diff.gz
+5e99d1d8d0e632475879e12afe6ad748  paw_2.14.04.dfsg.2-2.diff.gz
+f8628a35f2a422dfaf09edc526d448e9  cernlib_2006.dfsg.2-11.diff.gz


--- cernlib-64test.patch DELETED ---


--- cernlib-segf_eudtest.patch DELETED ---


--- cernlib-test.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 10:36:06 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Mar 2008 10:36:06 GMT
Subject: rpms/gnash/devel gnash.spec,1.16,1.17
Message-ID: <200803101036.m2AAa6gg003567@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	gnash.spec 
Log Message:
* Mon Mar 10 2008 Patrice Dumas  0.8.2-2
- don't ship libltdl.so.3 (#436725)



Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnash.spec	9 Mar 2008 14:03:26 -0000	1.16
+++ gnash.spec	10 Mar 2008 10:35:31 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gnash
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
@@ -109,8 +109,8 @@
 #rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # don't package libltdl related files!
-#rm \
-# $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
+rm \
+ $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
 rm \
  $RPM_BUILD_ROOT%{_includedir}/ltdl.h
 # info isn't generated rightly
@@ -206,6 +206,9 @@
 %{_mandir}/man1/cygnal.1*
 
 %changelog
+* Mon Mar 10 2008 Patrice Dumas  0.8.2-2
+- don't ship libltdl.so.3 (#436725)
+
 * Fri Mar  7 2008 Patrice Dumas  0.8.2-1
 - update to 0.8.2
 



From fedora-extras-commits at redhat.com  Mon Mar 10 10:36:24 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Mar 2008 10:36:24 GMT
Subject: rpms/cernlib-g77/EL-5 cernlib-212-print-test-results.dpatch, NONE, 
	1.1 cernlib-213-fix-test-suite-build.dpatch, NONE,
	1.1 cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch, NONE,
	1.1 cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch, NONE,
	1.1 cernlib-217-abend-on-mathlib-test-failure.dpatch, NONE,
	1.1 cernlib-807-static-link-some-tests-on-64-bit.dpatch, NONE,
	1.1 geant321-213-fix-test-suite-build.dpatch, NONE,
	1.1 geant321-807-static-link-some-tests-on-64-bit.dpatch, NONE,
	1.1 mclibs-213-fix-test-suite-build.dpatch, NONE,
	1.1 mclibs-220-compile-isajet-with-isarun.dpatch, NONE,
	1.1 mclibs-807-static-link-some-tests-on-64-bit.dpatch, NONE,
	1.1 .cvsignore, 1.2,
	1.3 210-improve-cfortran-header-files.dpatch, 1.1,
	1.2 315-fixes-for-MacOSX.dpatch, 1.1,
	1.2 700-remove-kernlib-from-packlib-Imakefile.dpatch, 1.1,
	1.2 702-patch-Imakefiles-for-packlib-mathlib.dpatch, 1.1,
	1.2 802-create-shared-libraries.dpatch, 1.1,
	1.2 cernlib-102-dont-optimize-some-code.dpatch, 1.1,
	1.2 cernlib-211-support-amd64-and-itanium.dpatch, 1.1,
	1.2 cernlib-211-support-digital-alpha.dpatch, 1.1,
	1.2 cernlib-303-shadow-passwords-supported.dpatch, 1.1,
	1.2 cernlib-304-update-Imake-config-files.dpatch, 1.1,
	1.2 cernlib-308-use-canonical-cfortran-location.dpatch, 1.1,
	1.2 cernlib-321-support-gfortran.dpatch, 1.1,
	1.2 cernlib-600-use-host.def-config-file.dpatch, 1.1,
	1.2 cernlib-800-implement-shared-library-rules-in-Imake.dpatch,
	1.1, 1.2 cernlib-803-link-binaries-dynamically.dpatch, 1.1,
	1.2 cernlib-g77.spec, 1.2,
	1.3 geant321-001-fix-missing-fluka.dpatch, 1.1,
	1.2 geant321-003-geant-dummy-functions.dpatch, 1.1,
	1.2 geant321-203-compile-geant-with-ertrak.dpatch, 1.1,
	1.2 geant321-806-bump-mathlib-and-dependents-sonames.dpatch, 1.1,
	1.2 mclibs-321-support-gfortran.dpatch, 1.1,
	1.2 paw-108-quote-protect-comis-script.dpatch, 1.1,
	1.2 paw-200-comis-allow-special-chars-in-path.dpatch, 1.1,
	1.2 paw-211-support-amd64-and-itanium.dpatch, 1.1,
	1.2 paw-308-use-canonical-cfortran-location.dpatch, 1.1,
	1.2 paw-320-support-ifort-and-gfortran.dpatch, 1.1,
	1.2 paw-803-link-binaries-dynamically.dpatch, 1.1,
	1.2 paw-804-workaround-for-comis-mdpool-struct-location.dpatch,
	1.1, 1.2 sources, 1.2, 1.3 cernlib-64test.patch, 1.1,
	NONE cernlib-segf_eudtest.patch, 1.1, NONE cernlib-test.patch,
	1.1, NONE
Message-ID: <200803101036.m2AAaOnY003609@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib-g77/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3467

Modified Files:
	.cvsignore 210-improve-cfortran-header-files.dpatch 
	315-fixes-for-MacOSX.dpatch 
	700-remove-kernlib-from-packlib-Imakefile.dpatch 
	702-patch-Imakefiles-for-packlib-mathlib.dpatch 
	802-create-shared-libraries.dpatch 
	cernlib-102-dont-optimize-some-code.dpatch 
	cernlib-211-support-amd64-and-itanium.dpatch 
	cernlib-211-support-digital-alpha.dpatch 
	cernlib-303-shadow-passwords-supported.dpatch 
	cernlib-304-update-Imake-config-files.dpatch 
	cernlib-308-use-canonical-cfortran-location.dpatch 
	cernlib-321-support-gfortran.dpatch 
	cernlib-600-use-host.def-config-file.dpatch 
	cernlib-800-implement-shared-library-rules-in-Imake.dpatch 
	cernlib-803-link-binaries-dynamically.dpatch cernlib-g77.spec 
	geant321-001-fix-missing-fluka.dpatch 
	geant321-003-geant-dummy-functions.dpatch 
	geant321-203-compile-geant-with-ertrak.dpatch 
	geant321-806-bump-mathlib-and-dependents-sonames.dpatch 
	mclibs-321-support-gfortran.dpatch 
	paw-108-quote-protect-comis-script.dpatch 
	paw-200-comis-allow-special-chars-in-path.dpatch 
	paw-211-support-amd64-and-itanium.dpatch 
	paw-308-use-canonical-cfortran-location.dpatch 
	paw-320-support-ifort-and-gfortran.dpatch 
	paw-803-link-binaries-dynamically.dpatch 
	paw-804-workaround-for-comis-mdpool-struct-location.dpatch 
	sources 
Added Files:
	cernlib-212-print-test-results.dpatch 
	cernlib-213-fix-test-suite-build.dpatch 
	cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch 
	cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch 
	cernlib-217-abend-on-mathlib-test-failure.dpatch 
	cernlib-807-static-link-some-tests-on-64-bit.dpatch 
	geant321-213-fix-test-suite-build.dpatch 
	geant321-807-static-link-some-tests-on-64-bit.dpatch 
	mclibs-213-fix-test-suite-build.dpatch 
	mclibs-220-compile-isajet-with-isarun.dpatch 
	mclibs-807-static-link-some-tests-on-64-bit.dpatch 
Removed Files:
	cernlib-64test.patch cernlib-segf_eudtest.patch 
	cernlib-test.patch 
Log Message:
sync with devel, without ABI incompatible changes


--- NEW FILE cernlib-212-print-test-results.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 212-print-test-results.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Explicitly output test program exit codes.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.rules cernlib-2006.dfsg.2/src/config/Imake.rules
--- cernlib-2006.dfsg.2~/src/config/Imake.rules	2005-04-18 15:39:25.000000000 +0000
+++ cernlib-2006.dfsg.2/src/config/Imake.rules	2007-12-13 18:52:12.000000000 +0000
@@ -2373,13 +2373,15 @@
 test:: ProgramTargetName(program) data inputdata			@@\
 	@echo Testing $(PACKAGE_NAME)					@@\
 	@echo "  ... using" program						@@\
-	@Concat(.,$(PATHSEP))ProgramTargetName(program)			@@\
+	@Concat(.,$(PATHSEP))ProgramTargetName(program)	; \		@@\
+	result="$$?" ; echo "Test result = $$result" ; exit "$$result"	@@\
 									@@\
 else									@@\
 test:: ProgramTargetName(program) data inputdata			@@\
 	@echo Testing $(PACKAGE_NAME)					@@\
 	@echo "  ... using" program					@@\
-	@Concat(.,$(PATHSEP))ProgramTargetName(program) < inputdata	@@\
+	@Concat(.,$(PATHSEP))ProgramTargetName(program) < inputdata ; \	@@\
+	result="$$?" ; echo "Test result = $$result" ; exit "$$result"	@@\
 									@@\
 endif									@@\
 									@@\


--- NEW FILE cernlib-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/bvsl/test/Imakefile cernlib-2006.dfsg.2/src/mathlib/bvsl/test/Imakefile
--- cernlib-2006.dfsg.2~/src/mathlib/bvsl/test/Imakefile	1996-03-21 17:19:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/mathlib/bvsl/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -6,7 +6,7 @@
 
 DefinePackageLibrary(bvsltst)
 
-CernlibFortranProgramTarget(bvslt,tsbvsl.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib kernlib)
+CernlibFortranProgramTarget(bvslt,tsbvsl.o,libbvsltst.a,libbvsltst.a,mathlib kernlib)
 
 TestTarget(bvslt,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/tests/Imakefile
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/Imakefile	2005-03-24 16:40:10.000000000 +0000
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -63,7 +63,7 @@
 
 DefinePackageLibrary(gentest)
 
-CernlibFortranProgramTarget(gent,main.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(gent,main.o,libgentest.a,libgentest.a,packlib mathlib)
 
 
 TestTarget(gent,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest1/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest1/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest1/Imakefile	1996-03-08 15:21:45.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest1/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -11,9 +11,9 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ptest1_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest1_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
-CernlibFortranProgramTarget(ptest1_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest1_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ptest1_32,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest2/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest2/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest2/Imakefile	1996-03-08 15:21:45.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest2/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -10,9 +10,9 @@
 SpecialFortranObjectRule(main_32,main,NullParameter,-DCERNLIB_PH32BIT)
 SpecialFortranObjectRule(test2_32,test2,NullParameter,-DCERNLIB_PH32BIT)
 
-CernlibFortranProgramTarget(ptest2_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest2_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
-CernlibFortranProgramTarget(ptest2_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest2_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ptest2_32,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest3/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest3/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest3/Imakefile	1996-03-08 15:21:46.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest3/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -12,9 +12,9 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ptest3_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest3_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
-CernlibFortranProgramTarget(ptest3_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest3_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ptest3_32,NullParameter,NullParameter)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile	1996-10-02 15:36:27.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -2,7 +2,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ffread,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
 
 TestTarget(ffread,NullParameter,test.input)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile	1996-02-20 15:46:21.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -5,11 +5,11 @@
 
 DefinePackageLibrary(hbtlib)
 
-CernlibFortranProgramTarget(hbtest,hexam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(hbtest,hexam.o,libhbtlib.a,libhbtlib.a,packlib)
 
-CernlibFortranProgramTarget(hbdiff,htdiffb.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(hbdiff,htdiffb.o,libhbtlib.a,libhbtlib.a,mathlib)
 
-CernlibFortranProgramTarget(hmerge,hmerg.o hmergin.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(hmerge,hmerg.o hmergin.o,libhbtlib.a,libhbtlib.a,mathlib)
 
 TestTarget(hbtest,NullParameter,NullParameter)
 TestTarget(hbdiff,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/tests/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/tests/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/tests/Imakefile	1996-02-20 15:46:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/tests/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -1,6 +1,6 @@
 #if 0
 /* this is not yet understood */
-CernlibFortranProgramTarget(hbtest,test_fp.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(hbtest,test_fp.o,NullParameter,NullParameter,packlib)
 
 
 TestTarget(hbtest)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kapack/test/Imakefile cernlib-2006.dfsg.2/src/packlib/kapack/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kapack/test/Imakefile	1996-12-02 15:29:51.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kapack/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -1,7 +1,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(kapack,test1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(kapack,test1.o,NullParameter,NullParameter,kernlib packlib)
 
 /* the kapack test, or better kamake asks for a file name only in unix.
  *  on VMS, the file is opened on unit 11, resulting in for011.dat
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile	1996-10-02 15:37:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -5,7 +5,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(ktest,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib kernlib)
+CernlibFortranProgramTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
 
 TestTarget(ktest,NullParameter,ktest.inp)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/minuit/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/minuit/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/minuit/examples/Imakefile	1997-10-23 17:04:15.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/minuit/examples/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -9,6 +9,6 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
-CernlibFortranProgramTarget(minuit,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(minuit,$(OBJS),NullParameter,NullParameter,packlib)
 
 TestTarget(minuit,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile	1996-03-12 08:13:30.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -5,6 +5,6 @@
 
 SubdirLibraryTarget(zbookt,NullParameter)
 
-CernlibFortranProgramTarget(zexam,zexam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
 
 TestTarget(zexam,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile	1997-08-29 13:33:57.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile	2007-12-14 00:14:11.000000000 +0000
@@ -41,27 +41,27 @@
 
 testrz: zebrz1 zebrz2 zebrz3
 
-CernlibFortranProgramTarget(zebmz1,zebmz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebmz1,zebmz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebfz1,zebfz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz2,zebfz2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz3,zebfz3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz4,zebfz4.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz5,zebfz5.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz6,zebfz6.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz7,zebfz7.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz8,zebfz8.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz9,zebfz9.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebfz1,zebfz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz2,zebfz2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz3,zebfz3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz4,zebfz4.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz5,zebfz5.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz6,zebfz6.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz7,zebfz7.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz8,zebfz8.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz9,zebfz9.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebfc1,zebfc1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfc2,zebfc2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfc3,zebfc3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebfc1,zebfc1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfc2,zebfc2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfc3,zebfc3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebjz1,zebjz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebjz1,zebjz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
-CernlibFortranProgramTarget(zebrz1,zebrz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebrz2,zebrz2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebrz3,zebrz3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebrz1,zebrz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebrz2,zebrz2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebrz3,zebrz3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
 TestTarget(zebmz1,zxtest.dat,NullParameter)
 


--- NEW FILE cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 214-fix-kernnum-funcs-on-64-bit.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Attempt to fix kernnum use of pointer differences on 64-bit arches.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cxj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cxj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JX  =  (IADDR(X2) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cyj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/czj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/czj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/czj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/czj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dxj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dxj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JX  =  (IADDR(X2) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dyj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dzj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rxj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rxj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JX  =   (IADDR(X2) - IADDR(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =   IPTRDIFF(X2, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/ryj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/ryj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/ryj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/ryj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =   (IADDR(Y2) - IADDR(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =   IPTRDIFF(Y2, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rzj.inc	1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =   (IADDR(Z2) - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =   IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cdi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cdi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cdi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cdi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           ID  =  (IADDR(D2)  - IADDR(D)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          ID  =  IPTRDIFF(D2, D) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cujk.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cujk.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           JU  =  (IADDR(U12) - IADDR(U)) / 8
           KU  =  (IADDR(U22) - IADDR(U)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JU  =  IPTRDIFF(U12, U) / 8
+          KU  =  IPTRDIFF(U22, U) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IX  =  (IADDR(X2)  - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IX  =  (IADDR(X21) - IADDR(X)) / 8
           JX  =  (IADDR(X12) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X21, X) / 8
+          JX  =  IPTRDIFF(X12, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IY  =  (IADDR(Y21) - IADDR(Y)) / 8
           JY  =  (IADDR(Y12) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IY  =  IPTRDIFF(Y21, Y) / 8
+          JY  =  IPTRDIFF(Y12, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyj.inc	1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czi.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IZ  =  (IADDR(Z2)  - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IZ  =  (IADDR(Z21) - IADDR(Z)) / 8
           JZ  =  (IADDR(Z12) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z21, Z) / 8
+          JZ  =  IPTRDIFF(Z12, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czj.inc	1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ddi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ddi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ddi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ddi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           ID  =  (IADDR(D2)  - IADDR(D)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          ID  =  IPTRDIFF(D2, D) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dujk.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dujk.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           JU  =  (IADDR(U12) - IADDR(U)) / 8
           KU  =  (IADDR(U22) - IADDR(U)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JU  =  IPTRDIFF(U12, U) / 8
+          KU  =  IPTRDIFF(U22, U) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IX  =  (IADDR(X2)  - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IX  =  (IADDR(X21) - IADDR(X)) / 8
           JX  =  (IADDR(X12) - IADDR(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X21, X) / 8
+          JX  =  IPTRDIFF(X12, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IY  =  (IADDR(Y21) - IADDR(Y)) / 8
           JY  =  (IADDR(Y12) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IY  =  IPTRDIFF(Y21, Y) / 8
+          JY  =  IPTRDIFF(Y12, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyj.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =  (IADDR(Y2) - IADDR(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzi.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IZ  =  (IADDR(Z2)  - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IZ  =  (IADDR(Z21) - IADDR(Z)) / 8
           JZ  =  (IADDR(Z12) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z21, Z) / 8
+          JZ  =  IPTRDIFF(Z12, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzj.inc	1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =  (IADDR(Z2) - IADDR(Z)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =  IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rdi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rdi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rdi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rdi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           ID  =  (IADDR(D2)  - IADDR(D)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          ID  =  IPTRDIFF(D2, D) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rujk.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rujk.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           JU  =  (IADDR(U12) - IADDR(U)) / 4
           KU  =  (IADDR(U22) - IADDR(U)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JU  =  IPTRDIFF(U12, U) / 4
+          KU  =  IPTRDIFF(U22, U) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IX  =  (IADDR(X2)  - IADDR(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X2, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IX  =  (IADDR(X21) - IADDR(X)) / 4
           JX  =  (IADDR(X12) - IADDR(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IX  =  IPTRDIFF(X21, X) / 4
+          JX  =  IPTRDIFF(X12, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IY  =  (IADDR(Y21) - IADDR(Y)) / 4
           JY  =  (IADDR(Y12) - IADDR(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IY  =  IPTRDIFF(Y21, Y) / 4
+          JY  =  IPTRDIFF(Y12, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryj.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JY  =   (IADDR(Y2) - IADDR(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =   IPTRDIFF(Y2, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzi.inc	1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzi.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           IZ  =  (IADDR(Z2)  - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzij.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzij.inc	2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
           IZ  =  (IADDR(Z21) - IADDR(Z)) / 4
           JZ  =  (IADDR(Z12) - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IZ  =  IPTRDIFF(Z21, Z) / 4
+          JZ  =  IPTRDIFF(Z12, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzj.inc	1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzj.inc	2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
 #if defined(CERNLIB_NUMIB1)
           JZ  =   (IADDR(Z2) - IADDR(Z)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JZ  =   IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/dlocf.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/dlocf.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/dlocf.inc	1996-02-15 17:49:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/dlocf.inc	2008-01-02 20:02:31.000000000 +0000
@@ -57,3 +57,12 @@
           IZ  =  (IADDR(Z21(1)) - LOCZ) / 8
           LZ  =  (IADDR(Z12(1)) - LOCZ) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          IF(MIN0(M,N,K) .LE. 0)  RETURN
+          IX  =  IPTRDIFF(X21(1), X(1)) / 8
+          JX  =  IPTRDIFF(X12(1), X(1)) / 8
+          JY  =  IPTRDIFF(Y21(1), Y(1)) / 8
+          LY  =  IPTRDIFF(Y12(1), Y(1)) / 8
+          IZ  =  IPTRDIFF(Z21(1), Z(1)) / 8
+          LZ  =  IPTRDIFF(Z12(1), Z(1)) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/rlocf.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/rlocf.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/rlocf.inc	1996-02-15 17:49:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/rlocf.inc	2008-01-02 20:02:31.000000000 +0000
@@ -57,3 +57,12 @@
           IZ  =  (IADDR(Z21(1)) - LOCZ) / 4
           LZ  =  (IADDR(Z12(1)) - LOCZ) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          IF(MIN0(M,N,K) .LE. 0)  RETURN
+          IX  =  IPTRDIFF(X21(1), X(1)) / 4
+          JX  =  IPTRDIFF(X12(1), X(1)) / 4
+          JY  =  IPTRDIFF(Y21(1), Y(1)) / 4
+          LY  =  IPTRDIFF(Y12(1), Y(1)) / 4
+          IZ  =  IPTRDIFF(Z21(1), Z(1)) / 4
+          LZ  =  IPTRDIFF(Z12(1), Z(1)) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/zisxy.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/zisxy.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/zisxy.inc	1996-02-15 17:49:01.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/zisxy.inc	2008-01-02 20:02:31.000000000 +0000
@@ -9,9 +9,15 @@
 *
 * zisxy.inc
 *
+#ifdef CERNLIB_NUM64
+	  IF(IPTRSAME(Z(1), X(1)) .EQ. 1)  GOTO 30
+	  IF(IPTRSAME(Z(1), Y(1)) .EQ. 1)  GOTO 40
+	  IF(IPTRSAME(X(1), Y(1)) .EQ. 1)  GOTO 20
+#else
           IF(LOCZ .EQ. LOCX)  GOTO 30
           IF(LOCZ .EQ. LOCY)  GOTO 40
           IF(LOCX .EQ. LOCY)  GOTO 20
+#endif
   10      LY1L  =  1
           LZ1L  =  1
           DO 13     L  =  1, K
@@ -68,7 +74,11 @@
              LZII  =  LZII + IZ + LZ
   24         CONTINUE
           RETURN
+#ifdef CERNLIB_NUM64
+  30      IF(IPTRSAME(X(1), Y(1)) .EQ. 1)  GOTO 50
+#else
   30      IF(LOCX .EQ. LOCY)  GOTO 50
+#endif
           LXI1  =  1
           DO 34     I  =  1, M
              LY1L  =  1
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/kernnum/pilot.h cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/kernnum/pilot.h
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/kernnum/pilot.h	1997-02-04 17:36:48.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/kernnum/pilot.h	2008-01-02 20:02:31.000000000 +0000
@@ -19,7 +19,7 @@
 #endif
 #endif
 
-#if defined(CERNLIB_LINUX)||defined(CERNLIB_MSDOS) && !defined(CERNLIB_WINNT)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_QMLXIA64) || defined(CERNLIB_MSDOS) && !defined(CERNLIB_WINNT)
 #ifndef CERNLIB_NUMIB2
 #define CERNLIB_NUMIB2
 #endif
@@ -31,6 +31,18 @@
 #endif
 #endif
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#ifndef CERNLIB_NUM64
+#define CERNLIB_NUM64
+#endif
+#ifdef CERNLIB_NUMD38
+#undef CERNLIB_NUMD38
+#endif
+#ifndef CERNLIB_NUMD279
+#define CERNLIB_NUMD279
+#endif
+#endif
+
 #if defined(CERNLIB_VAXVMS)
 #ifndef CERNLIB_NUMDE
 #define CERNLIB_NUMDE
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h	1997-02-04 17:36:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h	2008-01-02 20:02:31.000000000 +0000
@@ -44,6 +44,11 @@
 #ifndef CERNLIB_NUMLN
 #define CERNLIB_NUMLN
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#ifndef CERNLIB_NUM64
+#define CERNLIB_NUM64
+#endif
+#endif
 #endif
 
 #if defined(CERNLIB_MSDOS)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F	1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F	2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
           IF(N .LE. 0)  RETURN
           CVDIST  =  DISTF(X(1),Y(1))
           IF(N .LE. 1)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
@@ -26,6 +26,10 @@
           JX  =  (%LOC(X2) - %LOC(X)) / 8
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LX  =  1
           LY  =  1
           DO 10     J  =  2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F	1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F	2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
           IF(N .LE. 0)  RETURN
           DVDIST  =  DISTF(X(1),Y(1))
           IF(N .LE. 1)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
@@ -26,6 +26,10 @@
           JX  =  (%LOC(X2) - %LOC(X)) / 8
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LX  =  1
           LY  =  1
           DO 10     J  =  2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F	1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F	2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
           IF(N .LE. 0)  RETURN
           RVDIST  =  DISTF(X(1),Y(1))
           IF(N .LE. 1)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
           JY  =  LOCF(Y2) - LOCF(Y)
 #endif
@@ -26,6 +26,10 @@
           JX  =  (%LOC(X2) - %LOC(X)) / 4
           JY  =  (%LOC(Y2) - %LOC(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+          JY  =  IPTRDIFF(Y2, Y) / 4
+#endif
           LX  =  1
           LY  =  1
           DO 10     J  =  2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/check3.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/check3.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/check3.F	1996-03-21 17:16:07.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/check3.F	2008-01-02 20:02:31.000000000 +0000
@@ -343,7 +343,7 @@
           I  =  1
           IF(N .EQ. 1)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -352,6 +352,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+#endif
           DO 10     J  =  2, N
              LXJ  =  LXJ + JX
              T    =  ABSF(X(LXJ))
@@ -373,7 +376,7 @@
           I  =  1
           IF(N .EQ. 1)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -382,6 +385,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  2, N
              LXJ  =  LXJ + JX
              T    =  ABSF(X(LXJ))
@@ -403,7 +409,7 @@
           I  =  1
           IF(N .EQ. 1)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -412,6 +418,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  2, N
              LXJ  =  LXJ + JX
              T    =  ABSF(X(LXJ))
@@ -441,7 +450,7 @@
           RVSUMA  =  0.
           IF(N .LE. 0)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -450,6 +459,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+#endif
           DO 10     J  =  1, N
              RVSUMA  =  RVSUMA + ABS(X(LXJ))
              LXJ  =  LXJ + JX
@@ -461,7 +473,7 @@
           DVSUMA  =  0.
           IF(N .LE. 0)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -470,6 +482,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  1, N
              DVSUMA  =  DVSUMA + ABS(SNGL(X(LXJ)))
              LXJ  =  LXJ + JX
@@ -481,7 +496,7 @@
           CVSUMA  =  0.
           IF(N .LE. 0)  RETURN
           LXJ  =  1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  (LOCF(X2) - LOCF(X)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -490,6 +505,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 8
+#endif
           DO 10     J  =  1, N
           CVSUMA = CVSUMA + AMAX1(ABS(REAL(X(LXJ))),ABS(AIMAG(X(LXJ))))
           LXJ  =  LXJ + JX
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F	1996-03-21 17:16:08.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F	2008-01-02 20:02:31.000000000 +0000
@@ -329,7 +329,7 @@
           IF(.NOT. OK)  WRITE(IOUNIT,1000) N, IFAIL
           IF(N .LE. 0) RETURN
           KFAIL  =  IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JY  =  LOCF(Y2) - LOCF(Y)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -338,6 +338,9 @@
 #if defined(CERNLIB_NUMDE)
           JY  =  (%LOC(Y2) - %LOC(Y)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 4
+#endif
           LY     =  (KFAIL - 1)*JY + 1
           S      =  Y(LY)
           Y(LY)  =  ZERO
@@ -366,7 +369,7 @@
           IF(.NOT. OK)  WRITE(IOUNIT,1000) N, IFAIL
           IF(N .LE. 0) RETURN
           KFAIL  =  IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -375,6 +378,9 @@
 #if defined(CERNLIB_NUMDE)
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LY     =  (KFAIL - 1)*JY + 1
           S      =  Y(LY)
           Y(LY)  =  ZERO
@@ -403,7 +409,7 @@
           IF(.NOT. OK)  WRITE(IOUNIT,1000) N, IFAIL
           IF(N .LE. 0) RETURN
           KFAIL  =  IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JY  =  (LOCF(Y2) - LOCF(Y)) / 2
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -412,6 +418,9 @@
 #if defined(CERNLIB_NUMDE)
           JY  =  (%LOC(Y2) - %LOC(Y)) / 8
 #endif
+#if defined(CERNLIB_NUM64)
+          JY  =  IPTRDIFF(Y2, Y) / 8
+#endif
           LY     =  (KFAIL - 1)*JY + 1
           S      =  Y(LY)
           Y(LY)  =  ZERO
@@ -1139,7 +1148,7 @@
           XS2  =  ZERO
           XM2  =  ZERO
           IF(N .LE. 0)  RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
           JX  =  LOCF(X2) - LOCF(X)
 #endif
 #if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -1148,6 +1157,9 @@
 #if defined(CERNLIB_NUMDE)
           JX  =  (%LOC(X2) - %LOC(X)) / 4
 #endif
+#if defined(CERNLIB_NUM64)
+          JX  =  IPTRDIFF(X2, X) / 4
+#endif
           LX  =  1
           S1  =  ZERO
           S2  =  ZERO
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F	1996-03-21 17:16:10.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F	2008-01-02 20:03:24.000000000 +0000
@@ -251,7 +251,8 @@
      +           3X,7H IDIM =,I5, 3X, 4H E =,1PE12.3)
           END
           SUBROUTINE TSING(N,A,R,OK,FACT,SETEX,RABS,VXCH)
-          REAL      A(*),     R(*),     DET(2)
+          REAL      A(*),     R(*)
+          DOUBLE PRECISION    DET(2)
           LOGICAL   OK,       OKDET
 #include "kernnumt/sysdat.inc"
 #include "ch3dat.inc"


--- NEW FILE cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 216-use-cernlib-gamma-not-intrinsic.dpatch by Kevin B. McCarty 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Force use of mathlib gamma function in mathlib tests.
## DP: Built-in libc gamma function may not be sufficiently precise,
## DP: see, e.g., http://gcc.gnu.org/ml/fortran/2007-10/msg00096.html etc.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/algama.F cernlib-2006.dfsg.2/src/mathlib/gen/c/algama.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/algama.F	1996-04-01 07:01:54.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/algama.F	2008-01-29 10:02:41.000000000 -0800
@@ -10,6 +10,7 @@
 #if (defined(CERNLIB_DOUBLE))&&(!defined(CERNLIB_IBM))
       FUNCTION ALGAMA(X)
       DOUBLE PRECISION DLGAMA,D
+      EXTERNAL DLGAMA
 
       ENTRY ALOGAM(X)
 
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/alogam.F cernlib-2006.dfsg.2/src/mathlib/gen/c/alogam.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/alogam.F	1996-04-01 07:01:54.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/alogam.F	2008-01-29 10:03:54.000000000 -0800
@@ -9,6 +9,7 @@
 #include "gen/pilot.h"
 #if (defined(CERNLIB_DOUBLE))&&(defined(CERNLIB_IBM))
       FUNCTION ALOGAM(X)
+      EXTERNAL ALGAMA
       ALOGAM = ALGAMA(X)
       END
 #endif
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/bsja64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/bsja64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/bsja64.F	1996-04-01 07:02:08.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/bsja64.F	2008-01-29 10:00:11.000000000 -0800
@@ -21,9 +21,11 @@
 #if defined(CERNLIB_DOUBLE)
       PARAMETER (NAMEJ = 'BSJA/DBSJA',
      1           NAMEI = 'BSIA/DBSIA')
+      EXTERNAL DGAMMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       PARAMETER (NAMEJ = 'BSJA', NAMEI = 'BSIA')
+      EXTERNAL GAMMA
 #endif
       LOGICAL LJA,LIA,LEV,LER
       DIMENSION B(0:*),BA(0:100),RR(0:100)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/cbsja64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/cbsja64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/cbsja64.F	1996-04-01 07:02:09.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/cbsja64.F	2008-01-29 10:00:11.000000000 -0800
@@ -21,9 +21,11 @@
       CHARACTER NAME*(*)
 #if defined(CERNLIB_DOUBLE)
       PARAMETER (NAME = 'CBSJA/WBSJA')
+      EXTERNAL DGAMMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       PARAMETER (NAME = 'CBSJA')
+      EXTERNAL GAMMA
 #endif
       LOGICAL LER
       DIMENSION CB(0:*),CBA(0:100),RR(0:100)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/dlogam.F cernlib-2006.dfsg.2/src/mathlib/gen/c/dlogam.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/dlogam.F	1996-04-01 07:01:55.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/dlogam.F	2008-01-29 10:04:25.000000000 -0800
@@ -9,6 +9,7 @@
 #include "gen/pilot.h"
 #if defined(CERNLIB_IBM)
       FUNCTION DLOGAM(X)
+      EXTERNAL DLGAMA
 #include "gen/imp64.inc"
       DLOGAM = DLGAMA(X)
       END
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/gagnc64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/gagnc64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/gagnc64.F	1996-04-01 07:02:05.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/gagnc64.F	2008-01-29 10:04:48.000000000 -0800
@@ -25,9 +25,11 @@
       CHARACTER NAME*(*)
       CHARACTER*80 ERRTXT
 #if !defined(CERNLIB_DOUBLE)
+      EXTERNAL ALGAMA
       PARAMETER (NAME = 'RGAGNC')
 #endif
 #if defined(CERNLIB_DOUBLE)
+      EXTERNAL DLGAMA
       PARAMETER (NAME = 'RGAGNC/DGAGNC')
 #endif
 
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/gapnc64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/gapnc64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/gapnc64.F	1996-04-01 07:02:05.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/gapnc64.F	2008-01-29 10:03:35.000000000 -0800
@@ -24,9 +24,11 @@
       CHARACTER NAME*(*)
       CHARACTER*80 ERRTXT
 #if !defined(CERNLIB_DOUBLE)
+      EXTERNAL ALGAMA
       PARAMETER (NAME = 'RGAPNC')
 #endif
 #if defined(CERNLIB_DOUBLE)
+      EXTERNAL DLGAMA
       PARAMETER (NAME = 'RGAPNC/DGAPNC')
 #endif
       PARAMETER (EPS = 5D-14)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/rrizet64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/rrizet64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rrizet64.F	1996-04-01 07:02:00.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rrizet64.F	2008-01-29 10:00:11.000000000 -0800
@@ -14,12 +14,14 @@
 C
       CHARACTER*(*) NAME
       PARAMETER(NAME='RRIZET/DRIZET')
+      EXTERNAL DGAMMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       FUNCTION RRIZET(X)
 C
       CHARACTER*(*) NAME
       PARAMETER(NAME='RRIZET')
+      EXTERNAL GAMMA
 #endif
 C
       DIMENSION P1(0:8),P2(0:8),P3(0:9),P4(0:8)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/g/gamdis.F cernlib-2006.dfsg.2/src/mathlib/gen/g/gamdis.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/g/gamdis.F	1996-04-01 07:02:43.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/g/gamdis.F	2008-01-29 10:00:11.000000000 -0800
@@ -28,6 +28,8 @@
       PARAMETER (Z1 = 1, HALF = Z1/2, QUAR = Z1/4)
       PARAMETER (C1 = 3*Z1/2, KMAX = 300)
 
+      EXTERNAL GAMMA
+
       DATA C
      1/ 0.5772157,-0.6558781,-0.0420026, 0.1665386,-0.0421977,
      2 -0.0096220, 0.0072189,-0.0011652,-0.0002152, 0.0001281,
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c302m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/c302m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c302m.F	1996-04-01 07:01:13.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/c302m.F	2008-01-29 10:00:11.000000000 -0800
@@ -36,6 +36,7 @@
 #include "gen/imp64.inc"
 
       REAL GAMMA
+      EXTERNAL GAMMA, DGAMMA
       CHARACTER*6 TFUNC(2)
 #include "iorc.inc"
 C
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c310m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/c310m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c310m.F	1996-04-01 07:01:14.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/c310m.F	2008-01-29 10:02:19.000000000 -0800
@@ -36,6 +36,7 @@
 
 #include "imp64r.inc"
       REAL  ALGAMA
+      EXTERNAL ALGAMA
 C     Set maximum error allowed for test to be considered successful
       DIMENSION TOL(2),TOLIBM(2)
 
@@ -50,6 +51,7 @@
 #if defined(CERNLIB_DOUBLE)
       DIMENSION  Y(7),T(7)
       REAL            RT(7)
+      EXTERNAL DLGAMA
 #endif
 #if !defined(CERNLIB_DOUBLE)
       REAL       Y(7),T(7)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/e408m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/e408m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/e408m.F	1998-11-05 02:41:34.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/e408m.F	2008-01-29 10:00:11.000000000 -0800
@@ -44,6 +44,12 @@
       DATA TXT(2) /'EXP(-X**2)  (-1 <= X <= 1)  LUKE 3.2.2(8)'/
       DATA TXT(3) /'J_1(X)      (-1 <= X <= 1)  LUKE 9.7(7)'/
 
+#if defined(CERNLIB_DOUBLE)
+      EXTERNAL DGAMMA
+#else
+      EXTERNAL GAMMA
+#endif
+
 #if !defined(CERNLIB_WINNT) && !defined(CERNLIB_LINUX)
 # if defined(CERNLIB_DOUBLE)
       GVSUM(N,B,C) = DVSUM(N,B,C)


--- NEW FILE cernlib-217-abend-on-mathlib-test-failure.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 217-abend-on-mathlib-test-failure.dpatch by Kevin B. McCarty 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Force mathlib test program to exit non-zero if any test fails.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/main.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/main.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/main.F	1996-09-17 01:53:22.000000000 -0700
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/main.F	2008-02-22 12:24:43.000000000 -0800
@@ -332,5 +332,7 @@
 #endif
 C     Close output streams
       IF (LOUT .NE. 6) CLOSE(UNIT=LOUT)
+C     Exit non-zero if any test failed           
+      IF (NFAIL .NE. 0) CALL EXITF(1)
       STOP
       END


--- NEW FILE cernlib-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Statically link certain test programs against CERN libraries on
## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
## DP: broken there.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -2,7 +2,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
+#else
 CernlibFortranProgramTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
+#endif
 
 TestTarget(ffread,NullParameter,test.input)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile	2007-12-17 17:55:51.000000000 +0000
@@ -5,6 +5,12 @@
 
 DefinePackageLibrary(hbtlib)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#undef CernlibFortranProgramTarget
+#define CernlibFortranProgramTarget(a,b,c,d,e) \
+	CernlibFortranStaticTarget(a,b,c,d,e)
+#endif
+
 CernlibFortranProgramTarget(hbtest,hexam.o,libhbtlib.a,libhbtlib.a,packlib)
 
 CernlibFortranProgramTarget(hbdiff,htdiffb.o,libhbtlib.a,libhbtlib.a,mathlib)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -5,7 +5,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
+#else
 CernlibFortranProgramTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
+#endif
 
 TestTarget(ktest,NullParameter,ktest.inp)
 
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -5,6 +5,10 @@
 
 SubdirLibraryTarget(zbookt,NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
+#else
 CernlibFortranProgramTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
+#endif
 
 TestTarget(zexam,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile	2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile	2007-12-17 17:53:50.000000000 +0000
@@ -41,6 +41,12 @@
 
 testrz: zebrz1 zebrz2 zebrz3
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#undef CernlibFortranProgramTarget
+#define CernlibFortranProgramTarget(a,b,c,d,e) \
+	CernlibFortranStaticTarget(a,b,c,d,e)
+#endif
+
 CernlibFortranProgramTarget(zebmz1,zebmz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
 
 CernlibFortranProgramTarget(zebfz1,zebfz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)


--- NEW FILE geant321-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.

@DPATCH@
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile	1997-04-10 08:33:14.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam1,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam1,gexam1.dat,gexam1.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile	1997-04-10 08:33:20.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -13,7 +13,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam2,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam2,gexam2.dat,gexam2.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile	1997-04-10 08:33:34.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam3,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam3,gexam3.dat,gexam3.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile	1997-04-10 08:33:37.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -14,7 +14,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam4,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam4,gexam4.dat,gexam4.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile	1997-04-10 08:33:38.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile	2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(exam5,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
 
 TestTarget(exam5,gexam5.dat,gexam5.input)
 


--- NEW FILE geant321-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by Kevin B. McCarty 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Statically link certain test programs against CERN libraries on
## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
## DP: broken there.

@DPATCH@
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile	2008-01-04 17:05:50.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile	2008-01-04 17:10:09.000000000 -0800
@@ -3,7 +3,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam1,gexam1.dat,gexam1.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile	2008-01-04 17:10:55.000000000 -0800
@@ -13,7 +13,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam2,gexam2.dat,gexam2.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile	2008-01-04 17:11:26.000000000 -0800
@@ -3,7 +3,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam3,gexam3.dat,gexam3.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile	2008-01-04 17:11:57.000000000 -0800
@@ -14,7 +14,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam4,gexam4.dat,gexam4.input)
 
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile	2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile	2008-01-04 17:12:26.000000000 -0800
@@ -3,7 +3,11 @@
 
 DefinePackageLibrary(NullParameter)
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
 CernlibFortranProgramTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
 
 TestTarget(exam5,gexam5.dat,gexam5.input)
 


--- NEW FILE mclibs-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/cojets/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/cojets/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/cojets/test/Imakefile	1996-03-27 09:32:16.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/cojets/test/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -3,7 +3,7 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(cojetst,test.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib kernlib)
+CernlibFortranProgramTarget(cojetst,test.o,NullParameter,NullParameter,mathlib kernlib cojets)
 
 CopyFile(test.input,test.in)
 
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile	1997-03-14 17:32:14.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -4,11 +4,10 @@
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
-CernlibFortranProgramTarget(eudtest,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
 
 TestTarget(eudtest,eurodec.dat,eutitle.dat)
 
 CopyFile(eutitle.data,eutitle.dat)
 
 LinkFileFromDir($(TOP)$(PACKAGETOP),eurodec.dat)
-
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/herwig/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/herwig/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/herwig/test/Imakefile	1997-01-06 17:06:42.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/herwig/test/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -4,6 +4,6 @@
 DefinePackageLibrary(NullParameter)
 
 
-CernlibFortranProgramTarget(herwigt,test.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(herwigt,test.o,NullParameter,NullParameter,kernlib herwig)
 
 TestTarget(herwigt,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/isajet/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/isajet/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/isajet/test/Imakefile	2000-07-25 16:21:34.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/isajet/test/Imakefile	2008-01-04 18:59:02.000000000 +0000
@@ -6,6 +6,6 @@
 
 LinkFileFromDir($(TOP)$(PACKAGETOP),isajet.dat)
 
-CernlibFortranProgramTarget(isajett,isajett.o,$(PACKAGE_LIB),$(PACKAGE_LIB),pdflib804 mathlib kernlib)
+CernlibFortranProgramTarget(isajett,isajett.o,NullParameter,NullParameter,pdflib804 mathlib kernlib isajet)
 
 TestTarget(isajett,isajet.dat,test.input)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/pdf/tpdf/Imakefile mclibs-2006.dfsg.2/src/mclibs/pdf/tpdf/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/pdf/tpdf/Imakefile	2000-04-19 13:52:13.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/pdf/tpdf/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -13,13 +13,13 @@
 DefinePackageLibrary(NullParameter)
 
 
-CernlibFortranProgramTarget(testpdf,testpdf.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testpdf,testpdf.o,NullParameter,NullParameter,mathlib pdflib)
 
-CernlibFortranProgramTarget(testpdg,testpdg.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testpdg,testpdg.o,NullParameter,NullParameter,mathlib pdflib)
 
-CernlibFortranProgramTarget(testgam,testgam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testgam,testgam.o,NullParameter,NullParameter,mathlib pdflib)
 
-CernlibFortranProgramTarget(test_npdf,test_npdf.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(test_npdf,test_npdf.o,NullParameter,NullParameter,mathlib pdflib)
 
 TestTarget(testpdf,NullParameter,NullParameter)
 TestTarget(testpdg,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/photos/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/photos/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/photos/test/Imakefile	1999-03-26 10:53:26.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/photos/test/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -2,6 +2,6 @@
 
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(photost,phodem.o pseudo_jetset.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(photost,phodem.o pseudo_jetset.o,NullParameter,NullParameter,kernlib photos)
 
 TestTarget(photost,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/phtools/wicoexam/Imakefile mclibs-2006.dfsg.2/src/phtools/wicoexam/Imakefile
--- mclibs-2006.dfsg.2~/src/phtools/wicoexam/Imakefile	1996-03-22 16:42:50.000000000 +0000
+++ mclibs-2006.dfsg.2/src/phtools/wicoexam/Imakefile	2008-01-04 18:57:55.000000000 +0000
@@ -1,5 +1,5 @@
 DefinePackageLibrary(NullParameter)
 
-CernlibFortranProgramTarget(wicot,wicoex.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(wicot,wicoex.o,NullParameter,NullParameter,packlib phtools)
 
 TestTarget(wicot,NullParameter,NullParameter)


--- NEW FILE mclibs-220-compile-isajet-with-isarun.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 220-compile-isajet-with-isarun.dpatch by Kevin B. McCarty 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Compile isajet library including isaset() function.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/isajet/isajet/pilot.h mclibs-2006.dfsg.2/src/mclibs/isajet/isajet/pilot.h
--- mclibs-2006.dfsg.2~/src/mclibs/isajet/isajet/pilot.h	2001-10-08 06:16:58.000000000 -0700
+++ mclibs-2006.dfsg.2/src/mclibs/isajet/isajet/pilot.h	2008-02-06 12:52:46.000000000 -0800
@@ -41,3 +41,6 @@
 #ifndef CERNLIB_MOVEFTN
 #define CERNLIB_MOVEFTN
 #endif
+#ifndef CERNLIB_INTERACT
+#define CERNLIB_INTERACT
+#endif


--- NEW FILE mclibs-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by Kevin B. McCarty 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Statically link certain test programs against CERN libraries on
## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
## DP: broken there.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile	2008-01-08 09:47:10.000000000 -0800
+++ mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile	2008-01-08 09:48:35.000000000 -0800
@@ -4,7 +4,11 @@
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
+#else
 CernlibFortranProgramTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
+#endif
 
 TestTarget(eudtest,eurodec.dat,eutitle.dat)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2007 00:37:10 -0000	1.2
+++ .cvsignore	10 Mar 2008 10:35:43 -0000	1.3
@@ -1,6 +1,6 @@
 2006_src-free.tar.gz
 patchy.tar.gz
-geant321_3.21.14.dfsg-5.diff.gz
-mclibs_2006.dfsg.2-1.diff.gz
-paw_2.14.04.dfsg.2-1.diff.gz
-cernlib_2006.dfsg.2-2.diff.gz
+geant321_3.21.14.dfsg-7.diff.gz
+mclibs_2006.dfsg.2-5.diff.gz
+paw_2.14.04.dfsg.2-2.diff.gz
+cernlib_2006.dfsg.2-11.diff.gz


Index: 210-improve-cfortran-header-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/210-improve-cfortran-header-files.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 210-improve-cfortran-header-files.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ 210-improve-cfortran-header-files.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -3,7 +3,7 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Protect against multiple inclusion and add explicit dependency on
-## DP: cfortran.h to the Cernlib C headers.
+## DP: cfortran.h to the CERNLIB C headers.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/cfortran/comis.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h


Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 315-fixes-for-MacOSX.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ 315-fixes-for-MacOSX.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 315-fixes-for-MacOSX.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch set (mostly due to Keisuke Fujii) to allow Cernlib to compile
+## DP: Patch set (mostly due to Keisuke Fujii) to allow CERNLIB to compile
 ## DP: and run on OS X.
 
 @DPATCH@


Index: 700-remove-kernlib-from-packlib-Imakefile.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/700-remove-kernlib-from-packlib-Imakefile.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 700-remove-kernlib-from-packlib-Imakefile.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ 700-remove-kernlib-from-packlib-Imakefile.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 700-remove-kernlib-from-packlib-Imakefile.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch packlib Imakefile after moving kernlib out of tree.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/Imakefile


Index: 702-patch-Imakefiles-for-packlib-mathlib.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/702-patch-Imakefiles-for-packlib-mathlib.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 702-patch-Imakefiles-for-packlib-mathlib.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ 702-patch-Imakefiles-for-packlib-mathlib.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -83,7 +83,7 @@
 -LIBDIRS= gen bvsl
 +LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
  
- /* Lapack is independent of Cernlib and should be installed as one of
+ /* Lapack is independent of CERNLIB and should be installed as one of
     the build dependencies.
 diff -urNad cernlib-2005.05.09/src/packlib/hbook/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile
 --- cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	1969-12-31 19:00:00.000000000 -0500


Index: 802-create-shared-libraries.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/802-create-shared-libraries.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 802-create-shared-libraries.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ 802-create-shared-libraries.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -42,7 +42,7 @@
  InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
 +InstallSharedLibrary(geant321,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */
  /*
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile	1996-12-19 14:19:18.000000000 +0000


Index: cernlib-102-dont-optimize-some-code.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-102-dont-optimize-some-code.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-102-dont-optimize-some-code.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-102-dont-optimize-some-code.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -6,9 +6,21 @@
 ## DP: (either compiler crash or broken code generation).
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	1996-06-12 11:25:38.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-09 11:14:52.470486750 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/c/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/Imakefile	1999-09-24 07:27:41.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/Imakefile	2008-02-22 12:06:26.000000000 -0800
+@@ -117,3 +117,8 @@
+ SpecialFortranLibObjectRule(nzerfz64,nzerfz64,-O,NullParameter)
+ SpecialFortranLibObjectRule(wclbes,wclbes,-O,NullParameter)
+ #endif
++
++#if defined(CERNLIB_GFORTRAN) && ! defined(CERNLIB_IBM)
++/* -O3 optimization causes minor floating point inaccuracies in gfortran 4.2 */
++SpecialFortranLibObjectRule(gamma64,gamma64,-O0,NullParameter)
++#endif
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/d/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/d/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/d/Imakefile	1996-06-12 08:25:38.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/d/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -19,6 +19,11 @@
  SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
  	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
@@ -38,9 +50,9 @@
  FORTRANSAVEOPTION = FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/e/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile
---- cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	1996-05-01 09:21:54.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	2005-06-09 11:16:07.058731880 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/e/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/e/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/e/Imakefile	1996-05-01 06:21:54.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/e/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -12,6 +12,11 @@
  
  #if defined(CERNLIB_DOUBLE)
@@ -53,9 +65,22 @@
  #else
  SRCS_F:= $(SRCS_F) chsum128.F rchebn.F rcspln128.F
  #endif
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	1996-06-10 06:20:57.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	2005-06-09 11:09:34.621022534 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/tcgen/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/tcgen/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/tcgen/Imakefile	1997-02-04 09:36:14.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/tcgen/Imakefile	2008-02-22 12:08:44.000000000 -0800
+@@ -63,4 +63,9 @@
+ SRCS_F := $(SRCS_F) chtoi.F itoch.F
+ #endif
+ 
++#if defined(CERNLIB_GFORTRAN)
++/* -O2 optimization causes miscompiled code in gfortran 4.3 on ia64 */
++SpecialFortranLibObjectRule(tlsc,tlsc,-O0,NullParameter)
++#endif
++
+ SubdirLibraryTarget(NullParameter,NullParameter)
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/c204fort/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/c204fort/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/c204fort/Imakefile	1996-06-10 03:20:57.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/c204fort/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -14,6 +14,11 @@
  FDEBUGFLAGS=+O1
  #endif
@@ -68,9 +93,9 @@
  FORTRANSAVEOPTION = FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	1996-06-12 06:04:36.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	2005-06-09 11:10:40.068274255 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/g900fort/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/g900fort/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/g900fort/Imakefile	1996-06-12 03:04:36.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/g900fort/Imakefile	2008-02-22 12:06:26.000000000 -0800
 @@ -4,6 +4,11 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif


Index: cernlib-211-support-amd64-and-itanium.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-211-support-amd64-and-itanium.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-211-support-amd64-and-itanium.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-211-support-amd64-and-itanium.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,16 +2,16 @@
 ## 211-support-amd64-and-itanium.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Large patch from Harald Vogt  to make Cernlib work better
+## DP: Large patch from Harald Vogt  to make CERNLIB work better
 ## DP: (at least when statically linked) on 64-bit architectures.
 ## DP: Slightly modified in an attempt to keep ABI compatibility of the
 ## DP: dynamic libraries; not that it matters much as they don't work well
 ## DP: when dynamically linked on 64-bit anyway.
 
 @DPATCH@
-diff -urNad cernlib-2005.dfsg~/src/cfortran/hbook.h cernlib-2005.dfsg/src/cfortran/hbook.h
---- cernlib-2005.dfsg~/src/cfortran/hbook.h	1999-11-15 12:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/cfortran/hbook.h	2006-09-20 20:12:21.887676289 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/cfortran/hbook.h cernlib-2006.dfsg.2/src/cfortran/hbook.h
+--- cernlib-2006.dfsg.2~/src/cfortran/hbook.h	1999-11-15 17:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/cfortran/hbook.h	2007-12-14 21:41:27.000000000 +0000
 @@ -489,6 +489,10 @@
  #define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
          CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
@@ -37,9 +37,9 @@
  PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
  #define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2005.dfsg/src/packlib/cspack/cspack/hcntpar.inc
---- cernlib-2005.dfsg~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 10:44:16.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/cspack/cspack/hcntpar.inc	2006-09-20 20:12:21.887676289 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2006.dfsg.2/src/packlib/cspack/cspack/hcntpar.inc
+--- cernlib-2006.dfsg.2~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 15:44:16.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/cspack/cspack/hcntpar.inc	2007-12-14 21:41:27.000000000 +0000
 @@ -22,7 +22,7 @@
       +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
       +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
@@ -49,9 +49,9 @@
  *
  
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c cernlib-2005.dfsg/src/packlib/cspack/sysreq/netreq.c
---- cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c	2006-09-20 20:12:20.249025177 -0400
-+++ cernlib-2005.dfsg/src/packlib/cspack/sysreq/netreq.c	2006-09-20 20:12:22.046642443 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/cspack/sysreq/netreq.c cernlib-2006.dfsg.2/src/packlib/cspack/sysreq/netreq.c
+--- cernlib-2006.dfsg.2~/src/packlib/cspack/sysreq/netreq.c	2007-12-14 21:41:17.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/cspack/sysreq/netreq.c	2007-12-14 21:41:27.000000000 +0000
 @@ -341,7 +341,7 @@
                  return(-errno);
          }
@@ -61,9 +61,9 @@
  		TRACE(2, "sysreq", "RecvStr(RepLen): (errno=%d)", errno);
                  (void) close(s);
  		END_TRACE();
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2005.dfsg/src/packlib/hbook/hbook/hcntpar.inc
---- cernlib-2005.dfsg~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 12:07:52.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hbook/hcntpar.inc	2006-09-20 20:12:22.104630097 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2006.dfsg.2/src/packlib/hbook/hbook/hcntpar.inc
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 17:07:52.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hbook/hcntpar.inc	2007-12-14 21:41:27.000000000 +0000
 @@ -24,7 +24,7 @@
       +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
       +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
@@ -73,9 +73,9 @@
  *
  
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hcreatem.F cernlib-2005.dfsg/src/packlib/hbook/hmmap/hcreatem.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hcreatem.F	1996-03-13 05:13:20.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hmmap/hcreatem.F	2006-09-20 20:12:22.326582841 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hcreatem.F cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hcreatem.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hcreatem.F	1996-03-13 10:13:20.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hcreatem.F	2007-12-14 21:41:27.000000000 +0000
 @@ -39,11 +39,11 @@
  ************************************************************************
  *
@@ -101,9 +101,9 @@
  #if (defined(CERNLIB_DECS))&&(!defined(CERNLIB_ALPHA))
        ICOMAD(1) = 4*LOCF(ICOMAD(1)) + MFEN
        ICOMAD(1) = ((ICOMAD(1)+4095)/4096)*4096
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hmapm.F cernlib-2005.dfsg/src/packlib/hbook/hmmap/hmapm.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hmapm.F	2001-10-02 05:06:15.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/hbook/hmmap/hmapm.F	2006-09-20 20:12:22.343579222 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hmapm.F cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hmapm.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hmapm.F	2001-10-02 09:06:15.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hmapm.F	2007-12-14 21:41:27.000000000 +0000
 @@ -54,11 +54,11 @@
  ************************************************************************
  *
@@ -129,9 +129,9 @@
  #if defined(CERNLIB_DECS)
        ICOMAD(1) = 4*LOCF(ICOMAD(1)) + MFEN
        ICOMAD(1) = ((ICOMAD(1)+4095)/4096)*4096
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hballoc.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hballoc.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 12:07:56.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hballoc.F	2006-09-20 20:12:22.343579222 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hballoc.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hballoc.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 17:07:56.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hballoc.F	2007-12-14 21:41:27.000000000 +0000
 @@ -42,3 +42,26 @@
        ENDIF
  *
@@ -159,9 +159,9 @@
 +      ENDIF
 +*
 +      END
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hbnt.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hbnt.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 12:07:56.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hbnt.F	2006-09-20 20:12:22.344579009 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hbnt.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hbnt.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 17:07:56.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hbnt.F	2007-12-14 21:41:27.000000000 +0000
 @@ -269,11 +269,13 @@
   ************************************************************************
   *      *         *                                                     *
@@ -177,9 +177,9 @@
   ************************************************************************
  #endif
  *
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgnt2.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgnt2.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 10:42:35.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgnt2.F	2006-09-20 20:12:22.344579009 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgnt2.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgnt2.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 15:42:35.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgnt2.F	2007-12-14 21:41:27.000000000 +0000
 @@ -34,7 +34,13 @@
  #include "hbook/hcrecv.inc"
  *
@@ -218,9 +218,9 @@
           ENDIF
           LQ(LTMP1-IQ(LTMP1+1)) = LBLOK
  *
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntbf.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntbf.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 12:07:57.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntbf.F	2006-09-20 20:12:22.345578796 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntbf.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntbf.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 17:07:57.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntbf.F	2007-12-14 21:41:27.000000000 +0000
 @@ -26,3 +26,13 @@
        CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
  *
@@ -235,9 +235,9 @@
 +      CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
 +*
 +      END
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntf.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntf.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 10:42:35.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntf.F	2006-09-20 20:14:51.026922890 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntf.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntf.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 15:42:35.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntf.F	2007-12-14 21:41:27.000000000 +0000
 @@ -37,6 +37,13 @@
        INTEGER       ILOGIC
        LOGICAL       LOGIC, INDVAR, USEBUF
@@ -289,9 +289,9 @@
           ENDIF
  *
     40 CONTINUE
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 12:44:52.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile	2006-09-20 20:12:22.345578796 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 16:44:52.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/Imakefile	2007-12-14 21:41:27.000000000 +0000
 @@ -11,6 +11,10 @@
  	sleepf.c signalf.c sigprnt.c sigunbl.c stati.c systei.c \ @@\
  	tminit.c unlini.c tmread.c
@@ -303,9 +303,9 @@
  #ifndef CERNLIB_OS9
  SRCS_C += timel.c lstati.c
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/chkloc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/chkloc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/chkloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/chkloc.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/chkloc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/chkloc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/chkloc.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/chkloc.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,10 @@
 +/*
 + * Utility routine for locf and locb 
@@ -317,9 +317,9 @@
 +#include "lp64gs/chkloc.c"
 +#endif
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumptn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumptn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2004-07-29 10:07:43.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumptn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumptn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2004-07-29 14:07:43.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumptn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -20,8 +20,10 @@
   */
  #include "kerngen/pilot.h"
@@ -333,9 +333,9 @@
  #else
  /*>    ROUTINE JUMPTN
    CERN PROGLIB# Z043    JUMPTN          .VERSION KERNFOR  4.40  940929
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumpxn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2004-07-29 10:07:43.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumpxn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2004-07-29 14:07:43.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumpxn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -20,8 +20,10 @@
   */
  #include "kerngen/pilot.h"
@@ -348,9 +348,9 @@
  #else
  /*>    ROUTINE JUMPXN
    CERN PROGLIB# Z042    JUMPXN          .VERSION KERNFOR  4.40  940929
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lenocc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lenocc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lenocc.c	1997-10-23 12:25:11.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lenocc.c	2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lenocc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lenocc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lenocc.c	1997-10-23 16:25:11.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lenocc.c	2007-12-14 21:41:27.000000000 +0000
 @@ -46,7 +46,7 @@
  
  /*        look at the last ntail characters   */
@@ -360,9 +360,9 @@
        for (i = ntail; i > 0; i--)
          { if (*--chcur != ' ')       goto exit; }
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 10:26:37.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c	2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locb.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locb.c	2007-12-14 21:41:27.000000000 +0000
 @@ -26,6 +26,9 @@
  # define DummyDef
  #endif
@@ -382,9 +382,9 @@
  #undef CERNLIB_TCGEN_LOCB
  #endif
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locf.c	2004-07-29 10:06:07.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locf.c	2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locf.c	2004-07-29 14:06:07.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locf.c	2007-12-14 21:41:27.000000000 +0000
 @@ -50,6 +50,8 @@
  #include "irtdgs/locf.c"
  #elif defined(CERNLIB_QMVAOS)
@@ -420,9 +420,9 @@
  }
  #undef Dummy2LocPar
  #undef DummyDef
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,58 @@
 +/*
 + *
@@ -482,16 +482,16 @@
 +}
 +/*> END <----------------------------------------------------------*/
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,83 @@
 +/*
 + * $Id$
 + *
 + * $Log$
-+ * Revision 1.1  2007/12/31 00:37:10  pertusus
-+ * sync with devel
++ * Revision 1.2  2008/03/10 10:35:43  pertusus
++ * sync with devel, without ABI incompatible changes
 + *
 + * Revision 1.1.1.1  1996/02/15 17:49:32  mclareni
 + * Kernlib
@@ -572,16 +572,16 @@
 +    return;
 +}
 +/*> END <----------------------------------------------------------*/
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,92 @@
 +/*
 + * $Id$
 + *
 + * $Log$
-+ * Revision 1.1  2007/12/31 00:37:10  pertusus
-+ * sync with devel
++ * Revision 1.2  2008/03/10 10:35:43  pertusus
++ * sync with devel, without ABI incompatible changes
 + *
 + * Revision 1.1.1.1  1996/02/15 17:49:32  mclareni
 + * Kernlib
@@ -671,10 +671,10 @@
 +    return;
 +}
 +/*> END <----------------------------------------------------------*/
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	2006-09-20 20:12:22.584527921 -0400
-@@ -0,0 +1,12 @@
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c	2007-12-14 21:52:38.000000000 +0000
+@@ -0,0 +1,37 @@
 +/*>    ROUTINE LOCB
 +  CERN PROGLIB# N101    LOCB            .VERSION KERNFOR  4.36  930602
 +*/
@@ -687,9 +687,34 @@
 +   return (chkloc(iadr));
 +}
 +
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	2006-09-20 20:12:22.584527921 -0400
++#include     /* for ptrdiff_t, size_t */
++#include      /* for fprintf */
++#include     /* for exit    */
++
++int iptrdiff_(iadr1, iadr2)
++   char * iadr1, * iadr2;
++{
++  long diff = (long)iadr1 - (long)iadr2;
++  if (diff < (long)INT32_MIN || diff > (long)INT32_MAX) {
++      fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
++      fprintf(stderr, "IPTRDIFF: difference of addresses %p and %p\n", iadr1, iadr2);
++      fprintf(stderr, "cannot be stored in 32-bit signed integer!\n");
++      fprintf(stderr, "This may result in program crash or incorrect results\n");
++      fprintf(stderr, "Therefore we will stop here\n");
++      fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
++      exit (999);
++  }
++  else return (int)diff;
++}
++
++int iptrsame_(iadr1, iadr2)
++   char * iadr1, * iadr2;
++{
++  return (size_t)iadr1 == (size_t)iadr2 ? 1 : 0;
++}
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c	2007-12-14 21:41:27.000000000 +0000
 @@ -0,0 +1,10 @@
 +/*>    ROUTINE LOCF
 +  CERN PROGLIB# N100    LOCF            .VERSION KERNFOR  4.36  930602
@@ -701,9 +726,9 @@
 +{
 +   return ( (chkloc(iadr)) >> 2 );
 +}
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/signalf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/signalf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/signalf.c	1999-10-06 10:17:01.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/signalf.c	2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/signalf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/signalf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/signalf.c	1999-10-06 14:17:01.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/signalf.c	2007-12-14 21:41:27.000000000 +0000
 @@ -45,6 +45,7 @@
  C-        function value = adr of previous handler
  */
@@ -742,9 +767,9 @@
  #ifndef __GNUC__
        if (oldhand == SIG_ERR)  istat = -1;
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/kkern.c cernlib-2005.dfsg/src/packlib/kuip/code_kuip/kkern.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/kkern.c	1996-05-01 08:08:38.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_kuip/kkern.c	2006-09-20 20:12:22.585527708 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_kuip/kkern.c cernlib-2006.dfsg.2/src/packlib/kuip/code_kuip/kkern.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_kuip/kkern.c	1996-05-01 12:08:38.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_kuip/kkern.c	2007-12-14 21:41:27.000000000 +0000
 @@ -39,7 +39,8 @@
    if( len >= (sizeof blanks) * 4 ) {
  
@@ -755,9 +780,9 @@
      case 7:
        if( str[--len] != ' ' ) return len + 1;
      case 6:
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kmbrow.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/kmbrow.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kmbrow.c	1996-03-08 10:33:08.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/kmbrow.c	2006-09-20 20:12:22.586527495 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kmbrow.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kmbrow.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kmbrow.c	1996-03-08 15:33:08.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kmbrow.c	2007-12-14 21:41:27.000000000 +0000
 @@ -278,7 +278,7 @@
     char         *path, *title;
     char          cval[MAX_string], cval1[MAX_string];
@@ -767,9 +792,9 @@
  
     BrObject *brobj;
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kuxxt.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/kuxxt.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kuxxt.c	1996-03-08 10:33:11.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/kuxxt.c	2006-09-20 20:12:22.587527283 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kuxxt.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kuxxt.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kuxxt.c	1996-03-08 15:33:11.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kuxxt.c	2007-12-14 21:41:27.000000000 +0000
 @@ -340,7 +340,7 @@
  {
          (void) XDeleteContext( XtDisplay( UxTopLevel ),
@@ -788,9 +813,9 @@
  
          return ( UX_NO_ERROR );
  }
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdcmp.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdcmp.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdcmp.c	1996-03-15 10:54:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdcmp.c	2006-09-20 20:12:22.587527283 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdcmp.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdcmp.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdcmp.c	1996-03-15 15:54:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdcmp.c	2007-12-14 21:41:27.000000000 +0000
 @@ -1541,7 +1541,11 @@
  
     Widget cpanel = stag->command_panel;
@@ -804,9 +829,9 @@
     KmParameter *par   = cmd->par[ipar];
     KmParFile   *pfil  = par->ptype;
  
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdgra.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdgra.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdgra.c	1996-03-08 10:33:07.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdgra.c	2006-09-20 20:12:22.588527070 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdgra.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdgra.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdgra.c	1996-03-08 15:33:07.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdgra.c	2007-12-14 21:41:27.000000000 +0000
 @@ -289,11 +289,12 @@
     km_graph_init_callbacks (km_graphicsDraw, graph_widget, wkid, 0);
  }
@@ -822,9 +847,9 @@
     if (flag == 0) {
         XtAddCallback(draw, XmNexposeCallback,
                       (XtCallbackProc)drawing_area_callback, graph_widget);
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkuip.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkuip.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkuip.c	2006-09-20 20:12:20.148046676 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkuip.c	2006-09-20 20:12:22.589526857 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkuip.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkuip.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkuip.c	2007-12-14 21:41:17.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkuip.c	2007-12-14 21:41:27.000000000 +0000
 @@ -1687,7 +1687,7 @@
              XmStringFree(xmstr);
         } /* end for ... */
@@ -852,9 +877,9 @@
             XtManageChild(PdMenu);
          }
      }
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/help.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/help.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/help.c	1996-03-08 10:33:04.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/help.c	2006-09-20 20:12:22.590526644 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/help.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/help.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/help.c	1996-03-08 15:33:04.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/help.c	2007-12-14 21:41:27.000000000 +0000
 @@ -309,7 +309,7 @@
      int     *type;
      XmAnyCallbackStruct *call_data;
@@ -864,9 +889,9 @@
  
     if (help[t])
        XRaiseWindow(XtDisplay(help[t]), XtWindow(help[t]));
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/kxterm.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/kxterm.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/kxterm.c	2005-04-18 11:40:49.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/kxterm.c	2006-09-20 20:12:22.591526431 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/kxterm.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/kxterm.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/kxterm.c	2005-04-18 15:40:49.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/kxterm.c	2007-12-14 21:41:27.000000000 +0000
 @@ -1533,7 +1533,7 @@
       XtPointer cbs;
  {
@@ -876,9 +901,9 @@
     Boolean result = True;
  
     text_w = get_selection_owner(widget);
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/uxxt.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/uxxt.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/uxxt.c	1996-03-08 10:33:04.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/uxxt.c	2006-09-20 20:12:22.591526431 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/uxxt.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/uxxt.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/uxxt.c	1996-03-08 15:33:04.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/uxxt.c	2007-12-14 21:41:27.000000000 +0000
 @@ -340,7 +340,7 @@
  {
          (void) XDeleteContext( XtDisplay( UxTopLevel ),
@@ -897,9 +922,9 @@
  
          return ( UX_NO_ERROR );
  }
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/zerror.F cernlib-2005.dfsg/src/packlib/zbook/code/zerror.F
---- cernlib-2005.dfsg~/src/packlib/zbook/code/zerror.F	1996-03-08 07:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/zerror.F	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/zerror.F cernlib-2006.dfsg.2/src/packlib/zbook/code/zerror.F
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/zerror.F	1996-03-08 12:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/zerror.F	2007-12-14 21:41:27.000000000 +0000
 @@ -16,6 +16,10 @@
  C     ******************************************************************
  C
@@ -934,9 +959,9 @@
  C
        IF (NEWERR.LE.0)RETURN
  C
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/zjump.c cernlib-2005.dfsg/src/packlib/zbook/code/zjump.c
---- cernlib-2005.dfsg~/src/packlib/zbook/code/zjump.c	1996-03-08 07:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/zjump.c	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/zjump.c cernlib-2006.dfsg.2/src/packlib/zbook/code/zjump.c
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/zjump.c	2007-12-14 21:41:27.000000000 +0000
 @@ -7,6 +7,9 @@
   *
   */
@@ -971,9 +996,9 @@
  }
  #endif
 +#endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/ztrap.F cernlib-2005.dfsg/src/packlib/zbook/code/ztrap.F
---- cernlib-2005.dfsg~/src/packlib/zbook/code/ztrap.F	1996-03-08 07:01:13.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/ztrap.F	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/ztrap.F cernlib-2006.dfsg.2/src/packlib/zbook/code/ztrap.F
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/ztrap.F	1996-03-08 12:01:13.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/ztrap.F	2007-12-14 21:41:27.000000000 +0000
 @@ -48,8 +48,10 @@
  #if defined(CERNLIB_BESM6)
        IZ(JZ+19) = LOCF(IUSER)
@@ -986,9 +1011,9 @@
  #endif
        END
  #endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.dfsg/src/packlib/zebra/test/brztest/btest2.F
---- cernlib-2005.dfsg~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 11:16:16.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/zebra/test/brztest/btest2.F	2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/brztest/btest2.F cernlib-2006.dfsg.2/src/packlib/zebra/test/brztest/btest2.F
+--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zebra/test/brztest/btest2.F	2007-12-14 21:41:27.000000000 +0000
 @@ -29,6 +29,15 @@
  ********************************************************************************
  *


Index: cernlib-211-support-digital-alpha.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-211-support-digital-alpha.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-211-support-digital-alpha.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-211-support-digital-alpha.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -27,7 +27,7 @@
      if ( jadr != 0x6000000000000000) {
 +#elif defined (__alpha__)
 +    if ( jadr != 0x0000000100000000) {
-+#else  /* amd64 */
++#else  /* amd64 or ppc64 */
 +    if ( jadr != 0) {
  #endif
        fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");


Index: cernlib-303-shadow-passwords-supported.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-303-shadow-passwords-supported.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-303-shadow-passwords-supported.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-303-shadow-passwords-supported.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 303-shadow-passwords-supported.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow Cern's server code to read from /etc/shadow.
+## DP: Allow CERN's server code to read from /etc/shadow.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c


Index: cernlib-304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-304-update-Imake-config-files.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-304-update-Imake-config-files.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-304-update-Imake-config-files.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -3,19 +3,19 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Use Imake.cf stolen from recent XFree86 code, as it is much more
-## DP: up-to-date than the Imake.cf in Cernlib source.  Also update linux.cf
+## DP: up-to-date than the Imake.cf in CERNLIB source.  Also update linux.cf
 ## DP: to support most Linux architectures.
 
 @DPATCH@
-diff -urNad cernlib-2006.dfsg~/src/config/Imake.cf cernlib-2006.dfsg/src/config/Imake.cf
---- cernlib-2006.dfsg~/src/config/Imake.cf	2006-09-15 05:34:47.000000000 -0400
-+++ cernlib-2006.dfsg/src/config/Imake.cf	2007-01-09 19:03:04.701920749 -0500
-@@ -1,27 +1,10 @@
+diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.cf cernlib-2006.dfsg.2/src/config/Imake.cf
+--- cernlib-2006.dfsg.2~/src/config/Imake.cf	2006-09-15 02:34:47.000000000 -0700
++++ cernlib-2006.dfsg.2/src/config/Imake.cf	2008-01-11 09:52:56.000000000 -0800
+@@ -1,27 +1,5 @@
 -/* $Id$
 - *
 - * $Log$
-- * Revision 1.1  2007/12/31 00:37:10  pertusus
-- * sync with devel
+- * Revision 1.2  2008/03/10 10:35:43  pertusus
+- * sync with devel, without ABI incompatible changes
 - *
 - * Revision 1.6  2006/09/15 09:34:47  mclareni
 - * Submitted mods for gcc4/gfortran and MacOSX, corrected to work also on slc4 with gcc3.4 and 4.1
@@ -36,22 +36,46 @@
 - * X11R6 config files unmodified
 - *
 - *
-+/* This is the Imake.cf file stolen from XFree86 4.3.0, patched for Debian
-+   (version 4.3.0.dfsg.1-4).  It is a major improvement (several years ahead)
-+   of the Imake.cf file originally packed with Cernlib.
-+   -- Kevin McCarty, for Debian
-  */
+- */
 -XCOMM $XConsortium: Imake.cf,v 1.19 95/01/05 19:24:32 kaleb Exp $
-+
++XCOMM $XdotOrg: util/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $
 +XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
  /*
   * To add support for another platform:
   * 
-@@ -40,184 +23,358 @@
+@@ -40,257 +18,586 @@
   *
   *     4.  Create a .cf file with the name given by MacroFile.
   */
-+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.81 2003/02/18 16:51:45 tsi Exp $
++XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
+ 
+-#ifdef ultrix
+-#define MacroIncludeFile 
+-#define MacroFile ultrix.cf
+-#ifdef vax
+-#undef vax
+-#define VaxArchitecture
+-#endif
+-#ifdef mips
+-#undef mips
+-#define MipsArchitecture
++#if defined(__APPLE__)
++# undef __APPLE__
++# define MacroIncludeFile 
++# define MacroFile MacOSX.cf
++# define MacOSXArchitecture
++# define DarwinArchitecture
++# ifdef __ppc__
++#  define PpcDarwinArchitecture
++#  undef __ppc__
++# endif
++# ifdef __i386__
++#  define i386DarwinArchitecture
++#  undef __i386__
++# endif
+ #endif
+-#undef ultrix
+-#define UltrixArchitecture
 +
 +#if defined(clipper) || defined(__clipper__)
 +# undef clipper
@@ -73,20 +97,8 @@
 +#undef _X86_
 +#undef __CYGWIN__
 +#endif /* CYGWIN */
- 
- #ifdef ultrix
--#define MacroIncludeFile 
--#define MacroFile ultrix.cf
--#ifdef vax
--#undef vax
--#define VaxArchitecture
--#endif
--#ifdef mips
--#undef mips
--#define MipsArchitecture
--#endif
--#undef ultrix
--#define UltrixArchitecture
++
++#ifdef ultrix
 +# define MacroIncludeFile 
 +# define MacroFile ultrix.cf
 +# ifdef vax
@@ -102,12 +114,13 @@
 +# define UltrixArchitecture
  #endif /* ultrix */
  
- #if defined(vax) && !defined(UltrixArchitecture)
+-#if defined(vax) && !defined(UltrixArchitecture)
 -#define MacroIncludeFile 
 -#define MacroFile bsd.cf
 -#undef vax
 -#define BSDArchitecture
 -#define VaxArchitecture
++#if defined(vax) && !defined(UltrixArchitecture) && !defined(__OpenBSD__)
 +# define MacroIncludeFile 
 +# define MacroFile bsd.cf
 +# undef vax
@@ -115,16 +128,20 @@
 +# define VaxArchitecture
  #endif /* vax */
  
- #ifdef bsdi
+-#ifdef bsdi
 -#define MacroIncludeFile 
 -#define MacroFile bsdi.cf
 -#undef bsdi
 -#define BSD386Architecture
 -#define i386BsdArchitecture
 -#define i386Architecture
++#ifdef __bsdi__
 +# define MacroIncludeFile 
 +# define MacroFile bsdi.cf
-+# undef bsdi
++# undef __bsdi__
++# ifdef bsdi
++#  undef bsdi
++# endif
 +# define BSDOSArchitecture
 +# if defined(__i386__) || defined(i386)
 +#  define i386BsdArchitecture
@@ -132,7 +149,14 @@
 +#  undef i386
 +#  undef __i386__
 +# endif
++# if defined(__ppc__) || defined(ppc)
++#  define PpcBsdArchitecture
++#  define PpcArchitecture
++#  undef ppc
++#  undef __ppc__
++# endif
 +# if defined(__sparc__) || defined(__sparc_v9__) || defined(sparc)
++#  define SparcBsdArchitecture
 +#  define SparcArchitecture
 +#  undef sparc
 +#  undef __sparc__
@@ -140,10 +164,23 @@
 +# endif
  #endif /* bsdi */
  
+-#ifdef __NetBSD__
+-#define MacroIncludeFile 
+-#define MacroFile NetBSD.cf
+-#undef __NetBSD__
+-#define NetBSDArchitecture
+-#ifdef __i386__
+-#define i386BsdArchitecture
+-#define i386Architecture
+-#endif
+-#if defined(__sparc__) || defined(sparc)
+-#define SparcArchitecture
+-#undef sparc
 +#ifdef __OpenBSD__
 +# undef __OpenBSD__
 +# undef __NetBSD__
 +# define OpenBSDArchitecture
++# define KOpenBSDArchitecture
 +# define MacroIncludeFile 
 +# define MacroFile OpenBSD.cf
 +# ifdef __i386__
@@ -159,7 +196,7 @@
 +#  endif
 +#  undef sparc
 +# endif
-+# ifdef mips
++# if defined(__mips__) || defined(mips)
 +#   define MipsArchitecture
 +#   ifdef arc
 +#     define ArcArchitecture
@@ -176,7 +213,13 @@
 +#   undef __alpha__
 +#   undef alpha
 +# endif
-+# ifdef mc68020
++# if defined(__amd64__) || defined(__x86_64__)
++#   define AMD64Architecture
++#   undef __amd64__
++#   undef __x86_64__
++#   undef amd64
++# endif
++# if defined(__mc68020__) || defined(mc68020)
 +#  define Mc68020Architecture
 +#  if defined(amiga)
 +#   define AmigaArchitecture
@@ -201,30 +244,35 @@
 +#  undef mc68000
 +# endif
 +# ifdef __powerpc__
-+#  define PPCArchitecture
++#  define PpcArchitecture
 +#  undef __powerpc__
 +#  undef __macppc__
 +#  undef macppc
 +# endif
++# ifdef __vax__
++#  undef vax
++#  undef __vax__
++#  define VaxArchitecture
++# endif
++# ifdef __hppa__
++#  ifndef HPArchitecture
++#   define HPArchitecture
++#  endif
++#  undef __hppa__
++# endif /* __hppa__ */
 +#endif /* OpenBSD */
 +
- #ifdef __NetBSD__
--#define MacroIncludeFile 
--#define MacroFile NetBSD.cf
--#undef __NetBSD__
--#define NetBSDArchitecture
--#ifdef __i386__
--#define i386BsdArchitecture
--#define i386Architecture
--#endif
--#if defined(__sparc__) || defined(sparc)
--#define SparcArchitecture
--#undef sparc
--#endif
++/* Systems based on kernel of OpenBSD */
++#if defined(__OpenBSD_kernel__)
++#define KOpenBSDArchitecture
+ #endif
++
++#ifdef __NetBSD__
 +# define MacroIncludeFile 
 +# define MacroFile NetBSD.cf
 +# undef __NetBSD__
 +# define NetBSDArchitecture
++# define KNetBSDArchitecture
 +# ifdef __i386__
 +#  define i386BsdArchitecture
 +#  define i386Architecture
@@ -262,7 +310,7 @@
 +#   undef __vax__
 +# endif
 +# ifdef __powerpc__
-+#   define PPCArchitecture
++#   define PpcArchitecture
 +#   undef __powerpc__
 +# endif
  #endif /* NetBSD */
@@ -275,17 +323,44 @@
 -#ifdef __i386__
 -#define i386BsdArchitecture
 -#define i386Architecture
-+#ifdef __GNU_FreeBSD__
-+#define MacroIncludeFile 
-+#define MacroFile gnu-freebsd.cf
-+#define GNUFreeBSDArchitecture
++/* Systems based on kernel of NetBSD */
++#if defined(__NetBSD_kernel__)
++#define KNetBSDArchitecture
  #endif
 +
++#ifdef __DragonFly__
++# define MacroIncludeFile 
++# define MacroFile DragonFly.cf
++# undef __DragonFly__
++# undef __FreeBSD__
++# define DragonFlyArchitecture
++# define FreeBSDArchitecture
++# ifdef __i386__
++#  define i386BsdArchitecture
++#  define i386Architecture
++#  undef i386
++# endif
++# ifdef __sparc64__
++#  define Sparc64Architecture
++#  undef __sparc64__
++# endif
++# ifdef __ia64__
++#  define ia64Architecture
++#  undef __ia64__
++# endif
++# ifdef __amd64__
++#  define x86_64Architecture
++#  undef __amd64__
++#  undef __x86_64__
++# endif
++#endif /* __DragonFly__ */
++
 +#ifdef __FreeBSD__
 +# define MacroIncludeFile 
 +# define MacroFile FreeBSD.cf
 +# undef __FreeBSD__
 +# define FreeBSDArchitecture
++# define KFreeBSDArchitecture
 +# ifdef __i386__
 +#  define i386BsdArchitecture
 +#  define i386Architecture
@@ -300,9 +375,22 @@
 +#  define Sparc64Architecture
 +#  undef __sparc64__
 +# endif
++# ifdef __ia64__
++#  define ia64Architecture
++#  undef __ia64__
++# endif
++# ifdef __amd64__
++#  define AMD64Architecture
++#  undef __amd64__
++#  undef __x86_64__
++# endif
++# ifdef __powerpc__
++#  define PpcArchitecture
++#  undef __powerpc__
++# endif
  #endif /* __FreeBSD__ */
  
- #ifdef AMOEBA
+-#ifdef AMOEBA
 -/* Should be before the 'sun' entry because we may be cross-compiling */
 -#define MacroIncludeFile 
 -#define MacroFile Amoeba.cf
@@ -318,11 +406,16 @@
 -#define SunArchitecture
 -#endif
 -#endif
--#endif
++/* Systems based on kernel of FreeBSD */
++#if defined(__FreeBSD_kernel__)
++#define KFreeBSDArchitecture
+ #endif
 -#undef i80386
 -#undef mc68000
 -#undef sparc
 -#undef sun
++
++#ifdef AMOEBA
 + /* Should be before the 'sun' entry because we may be cross-compiling */
 +# define MacroIncludeFile 
 +# define MacroFile Amoeba.cf
@@ -374,11 +467,22 @@
 +# endif
 +# ifdef sparc
 +#  undef sparc
-+# define SparcArchitecture
++#  define SparcArchitecture
++# endif
++# ifdef __sparcv9
++#  undef __sparcv9
++#  define Sparc64Architecture
 +# endif
 +# ifdef mc68000
 +#  undef mc68000
-+# define Sun3Architecture
++#  define Sun3Architecture
++# endif
++# if defined(__amd64) || defined(__x86_64)
++#  undef __amd64
++#  undef __x86_64
++#  undef amd64
++#  undef i386
++#  define AMD64Architecture
 +# endif
 +# ifdef i386
 +#  undef i386
@@ -399,9 +503,18 @@
 +# define HPArchitecture
  #endif /* hpux */
  
-+#ifdef sco
+-#ifdef USL
+-#define MacroIncludeFile 
+-#define MacroFile usl.cf
+-#undef USL
+-#undef SVR4
+-#define SVR4Architecture
+-#define i386Architecture
+-#endif /* USL */
++#ifdef __SCO__
 +# define MacroIncludeFile 
 +# define MacroFile sco5.cf
++# undef __SCO__
 +# undef sco
 +# undef USL
 +# undef SYSV
@@ -414,24 +527,60 @@
 +# define SVR3Architecture
 +# define i386ScoArchitecture
 +# define i386Sco325Architecture
-+#endif /* sco - SCO Open Server 5 */
++# undef i386
++# undef i486
++# undef i586
++# undef i686
++# undef k6
++# undef __i386__
++# undef __i486__
++# undef __i586__
++# undef __i686__
++# undef __k6__
++# undef __i386
++# undef __i486
++# undef __i586
++# undef __i686
++# undef __k6
++# undef pentium
++# undef __pentium
++# undef pentiumpro
++# undef __pentiumpro
++#endif /* __SCO__ - SCO Open Server 5 */
 +
- #ifdef USL
--#define MacroIncludeFile 
--#define MacroFile usl.cf
--#undef USL
--#undef SVR4
--#define SVR4Architecture
--#define i386Architecture
++#ifdef __UNIXWARE__
 +# define MacroIncludeFile 
 +# define MacroFile usl.cf
++# undef __UNIXWARE__
 +# undef USL
 +# undef SVR4
 +# undef i386
++# undef SVR5
++# undef SYSV5
 +# define SVR4Architecture
 +# define i386Architecture
 +# define USLArchitecture
- #endif /* USL */
++# define UnixWareArchitecture
++# undef i386
++# undef i486
++# undef i586
++# undef i686
++# undef k6
++# undef __i386__
++# undef __i486__
++# undef __i586__
++# undef __i686__
++# undef __k6__
++# undef __i386
++# undef __i486
++# undef __i586
++# undef __i686
++# undef __k6
++# undef pentium
++# undef __pentium
++# undef pentiumpro
++# undef __pentiumpro
++#endif /* __UNIXWARE__ */
  
  #ifdef NCR
 -#define MacroIncludeFile 
@@ -539,21 +688,13 @@
 +# define MacIIArchitecture
  #endif /* macII */
  
- #ifdef __APPLE__
-@@ -225,72 +382,89 @@
- # define MacroFile MacOSX.cf
- # define MacOSXArchitecture
- # define DarwinArchitecture
-+# ifdef __ppc__
-+#  define PpcDarwinArchitecture
-+#  undef __ppc__
-+# endif
-+# ifdef __i386__
-+#  define i386DarwinArchitecture
-+#  undef __i386__
-+# endif
- #endif
- 
+-#ifdef __APPLE__
+-# define MacroIncludeFile 
+-# define MacroFile MacOSX.cf
+-# define MacOSXArchitecture
+-# define DarwinArchitecture
+-#endif
+-
  #ifdef _CRAY
 -#define MacroIncludeFile 
 -#define MacroFile cray.cf
@@ -651,7 +792,11 @@
 +# endif
 +# ifdef _IBMR2
 +#  undef _IBMR2
-+#  define RsArchitecture
++#  if (DefaultOSMajorVersion < 5)
++#   define RsArchitecture
++#  else
++#   define PpcArchitecture
++#  endif
 +# endif
  #endif /* ibm */
  
@@ -681,7 +826,7 @@
  #endif /* luna */
  
  #ifdef Mips
-@@ -317,9 +491,14 @@
+@@ -317,9 +624,14 @@
  # endif
  #endif /* MOTOROLA */
  
@@ -697,7 +842,7 @@
  # endif
  # define SVR4Architecture
  # define MacroIncludeFile 
-@@ -329,13 +508,42 @@
+@@ -329,13 +641,42 @@
  
  #ifdef SYSV
  # ifdef i386
@@ -744,7 +889,7 @@
  # ifdef SVR4
  #  define i386Architecture
  #  define SVR4Architecture
-@@ -343,18 +551,46 @@
+@@ -343,18 +684,46 @@
  #  define MacroIncludeFile 
  #  define MacroFile svr4.cf
  #  undef SVR4
@@ -800,7 +945,7 @@
  #endif /* DGUX */
  
  #ifdef __convex__
-@@ -366,101 +602,405 @@
+@@ -366,101 +735,446 @@
  # define ConvexArchitecture
  #endif /* _convex_ */
  
@@ -847,16 +992,17 @@
 +# undef SVR4
  #endif /* Oki */
  
- #ifdef WIN32
+-#ifdef WIN32
 -#define MacroIncludeFile 
 -#define MacroFile Win32.cf
 -#define Win32Architecture
++#if defined(WIN32) && !defined(__GNUC__)
 +# define MacroIncludeFile 
 +# define MacroFile Win32.cf
 +# define Win32Architecture
  #endif /* WIN32 */
  
- #ifdef linux 
+-#ifdef linux 
 -#ifdef  PPC
 -#define MacroIncludeFile 
 -#define MacroFile       linux-pmac.cf
@@ -875,12 +1021,33 @@
 -#define MacroFile linux.cf
 -#undef linux
 -#define LinuxArchitecture
--#define i386Architecture
++#if defined(WIN32) && defined(__GNUC__)
++#define MacroIncludeFile 
++#define MacroFile mingw.cf
++#define Win32Architecture
++#define mingwArchitecture
+ #define i386Architecture
 -#endif
+-#endif /* linux */
++#undef i386
++#undef i486
++#undef i586
++#undef i686
++#undef __i386__
++#undef _X86_
++#undef __MINGW32__
++#endif /* CYGWIN */
++
++#if defined(linux) || defined(__GLIBC__)
 +# define MacroIncludeFile 
 +# define MacroFile linux.cf
 +# undef linux
-+# define LinuxArchitecture
++# ifdef __linux__
++#  define LinuxArchitecture
++# endif
++# ifdef __GLIBC__
++#  define GNUArchitecture
++# endif
 +# ifdef i386
 +#  ifndef i386Architecture
 +#   define i386Architecture
@@ -997,21 +1164,31 @@
 +#  undef arm
 +#  undef __arm
 +#  undef __arm__
++#  if defined(__ARMEB__)
++#   define Arm32ebArchitecture
++#  endif
++#  undef __ARMEB__
 +# endif
 +# ifdef mc68000
 +#  define Mc68020Architecture
 +#  undef mc68000
 +# endif /* mc68000 */
-+# ifdef powerpc
-+#  define PPCArchitecture
++# if defined (powerpc) && !defined(__powerpc64__) && !defined (powerpc64)
++#  define PpcArchitecture
 +#  undef powerpc
 +# endif
-+# ifdef __powerpc__
-+#  ifndef PPCArchitecture
-+#   define PPCArchitecture
++# if defined (__powerpc__) && !defined(__powerpc64__) && !defined (powerpc64)
++#  ifndef PpcArchitecture
++#   define PpcArchitecture
 +#  endif
 +#  undef __powerpc__
 +# endif
++# ifdef __powerpc64__
++#  ifndef Ppc64Architecture
++#   define Ppc64Architecture
++#  endif
++#  undef __powerpc64__
++# endif
 +# ifdef sparc
 +#  define SparcArchitecture
 +#  undef sparc
@@ -1080,25 +1257,27 @@
 +#  undef __SH4__
 +# endif /* __SH4__ */
 +/* for compatibility with 3.3.x */
-+# ifdef PPCArchitecture
++# ifdef PpcArchitecture
 +#  define PowerPCArchitecture
 +# endif
 +# if defined(__s390x__)
 +#  define s390xArchitecture
 +#  undef __s390x__
 +# endif
-+# if defined(__x86_64__)
++# if defined(__amd64__) || defined (__x86_64__)
++#  undef __amd64__
 +#  undef __x86_64__
-+#  define x86_64Architecture
++#  define AMD64Architecture
 +# endif
-+# if defined(x86_64__)
++# if defined(amd64__) || defined (x86_64__)
++#  undef amd64__
 +#  undef x86_64__
-+#  ifndef x86_64Architecture
-+#   define x86_64Architecture
++#  ifndef AMD64Architecture
++#   define AMD64Architecture
 +#  endif
 +# endif
- #endif /* linux */
- 
++#endif /* linux || __GLIBC__ */
++
 +#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
 +# define MacroIncludeFile 
 +# define MacroFile lynx.cf
@@ -1113,7 +1292,7 @@
 +#  undef __x86__
 +# endif
 +# ifdef __powerpc__
-+#  define PPCArchitecture
++#  define PpcArchitecture
 +#  undef __powerpc__
 +# endif
 +# if defined(sparc) || defined(__sparc__)
@@ -1122,11 +1301,11 @@
 +#  undef __sparc__
 +# endif
 +/* for compatibility with 3.3.x */
-+# ifdef PPCArchitecture
++# ifdef PpcArchitecture
 +#  define PowerPCArchitecture
 +# endif
 +#endif /* LynxOS AT/PPC/microSPARC */
-+
+ 
  #ifdef __uxp__
 -#define MacroIncludeFile 
 -#define MacroFile fujitsu.cf
@@ -1188,10 +1367,7 @@
 +# define MacroIncludeFile 
 +# define MacroFile nec.cf
 +# define NecArchitecture
- #endif
--#define MacroIncludeFile 
--#define MacroFile nec.cf
--#define NecArchitecture
++#endif
 +
 +#ifdef minix 
 +#define MacroIncludeFile 
@@ -1201,15 +1377,27 @@
 +#define i386Architecture
 +#endif /* minix */
 +
-+#ifdef MACH
-+#ifdef __GNU__
++/* Systems with GNU libc and userland */
++#if defined(__GNU__)
++#define GNUArchitecture
 +#define MacroIncludeFile 
 +#define MacroFile gnu.cf
++#ifdef __i386__
++#define i386Architecture
+ #endif
+-#define MacroIncludeFile 
+-#define MacroFile nec.cf
+-#define NecArchitecture
+ #endif
+ 
++#ifdef MACH
++#ifdef __GNU__
++/* Mach-based GNU system */
 +#define GNUMachArchitecture
 +#else
 +#define MacroIncludeFile 
 +#define MacroFile mach.cf
- #endif
++#endif
 +#undef MACH
 +#ifdef	i386
 +#define i386MachArchitecture
@@ -1217,7 +1405,7 @@
 +#endif	/* i386 */
 +#undef i386
 +#endif /* MACH */
- 
++
 +/* On NetBSD, `unix' is not defined, and cpp emits a warning every time
 + * it sees a test using the `unix' symbol */
 +#if !defined(NetBSDArchitecture) || (defined(NetBSDArchitecture) && DefaultOSMajorVersion == 1 && DefaultOSMinorVersion <= 3)
@@ -1273,9 +1461,21 @@
  
  #ifndef MacroIncludeFile
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-diff -urNad cernlib-2006.dfsg~/src/config/linux.cf cernlib-2006.dfsg/src/config/linux.cf
---- cernlib-2006.dfsg~/src/config/linux.cf	2006-09-15 05:34:48.000000000 -0400
-+++ cernlib-2006.dfsg/src/config/linux.cf	2007-01-09 19:17:01.559270079 -0500
+diff -urNad cernlib-2006.dfsg.2~/src/config/linux-lp64.cf cernlib-2006.dfsg.2/src/config/linux-lp64.cf
+--- cernlib-2006.dfsg.2~/src/config/linux-lp64.cf	2006-12-20 06:21:03.000000000 -0800
++++ cernlib-2006.dfsg.2/src/config/linux-lp64.cf	2008-01-11 09:36:29.000000000 -0800
+@@ -153,7 +153,7 @@
+ # define XargsCmd               xargs
+ # define FortranSaveFlags       -fno-automatic
+ # define OptimisedFortranFlags  -O0 -g -funroll-loops -fomit-frame-pointer
+-# define DefaultFCOptions       -fno-second-underscore
++# define DefaultFCOptions       -fno-automatic -fno-second-underscore
+ # define NoOpFortranDebugFlags  -O0
+ # define CernlibSystem          -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_GFORTRAN -DCERNLIB_QMLXIA64
+ 
+diff -urNad cernlib-2006.dfsg.2~/src/config/linux.cf cernlib-2006.dfsg.2/src/config/linux.cf
+--- cernlib-2006.dfsg.2~/src/config/linux.cf	2006-09-15 02:34:48.000000000 -0700
++++ cernlib-2006.dfsg.2/src/config/linux.cf	2008-01-11 10:00:21.000000000 -0800
 @@ -68,20 +68,20 @@
  #define OSVendor		/**/
  #define OSMajorVersion		2
@@ -1301,7 +1501,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -97,38 +97,302 @@
+@@ -97,38 +97,307 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1372,11 +1572,11 @@
 +   Debian patched (version 4.3.0.dfsg.1-4), plus additional
 +   OptimizationLevel macro.
 +   
-+   Additional Cernlib-specific per-architecture flags also added.
++   Additional CERNLIB-specific per-architecture flags also added.
 +   --Kevin McCarty */
 +
 +/* Note: we are now using CERNLIB_PPC as an endianness test (which is about
-+   all that the Cernlib source uses it for); I introduced a new define
++   all that the CERNLIB source uses it for); I introduced a new define
 +   CERNLIB_POWERPC for the three occasions when we specifically want to
 +   test for powerpc chips.
 +*/
@@ -1478,7 +1678,7 @@
 +# endif
 +# define DefaultCCOptions       -malign-int
 +# define DefaultFCOptions       -malign-int -fno-automatic \
-+                                -fno-second-underscore -fugly-complex
++                                -fno-second-underscore
 +# define LinuxMachineDefines    -D__mc68000__
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
@@ -1488,7 +1688,7 @@
 +/* # define PositionIndependentCplusplusFlags -fpic */
 +#endif /* Mc68020Architecture */
 +
-+#ifdef PPCArchitecture
++#if defined(PpcArchitecture) || defined(Ppc64Architecture)
 +# define DefaultCCOptions       -fsigned-char
 +# ifndef OptimizationLevel
 +#  define OptimizationLevel	-O3
@@ -1498,11 +1698,18 @@
 +# endif
 +# define LinuxMachineDefines    -D__powerpc__
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
-+# define CernlibMachineDefines	-DCERNLIB_PPC -DCERNLIB_POWERPC
++# ifdef Ppc64Architecture
++#  define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#  define CernlibMachineDefines	-DCERNLIB_PPC -DCERNLIB_POWERPC \
++				-DCERNLIB_QMLXIA64
++#  define CERNLIB_QMLXIA64
++# else
++#  define CernlibMachineDefines	-DCERNLIB_PPC -DCERNLIB_POWERPC
++#  define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines
++# endif
 +# define CERNLIB_PPC
 +# define CERNLIB_POWERPC
-+#endif /* PPCArchitecture */
++#endif /* PpcArchitecture || Ppc64Architecture */
 +
 +#ifdef SparcArchitecture
 +# ifndef OptimizationLevel
@@ -1584,7 +1791,7 @@
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
 +#endif
 +
-+#ifdef x86_64Architecture
++#ifdef AMD64Architecture
 +# ifndef OptimizationLevel
 +#  define OptimizationLevel	-O3
 +# endif
@@ -1592,13 +1799,11 @@
 +#  define OptimizedCDebugFlags  OptimizationLevel
 +# endif
 +# define LinuxMachineDefines    -D__x86_64__
-+# define DefaultFCOptions       -fno-automatic \
-+                                -fno-second-underscore -fugly-complex
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 +# define CernlibMachineDefines  -DCERNLIB_QMLXIA64
 +# define CERNLIB_QMLXIA64
-+#endif /* x86_64Architecture */
++#endif /* AMD64Architecture */
 +
 +#ifndef StandardDefines
 +# define StandardDefines        -Dlinux LinuxMachineDefines LinuxSourceDefines
@@ -1618,7 +1823,7 @@
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
  # define ManSuffix	1x
-@@ -163,7 +427,7 @@
+@@ -163,7 +432,7 @@
  #define FortranSaveFlags	/* */ /* Everything static !? */
  #define OptimisedFortranFlags   -g -pc 64 -tp p6
  #define DefaultFCOptions        -Msave -fpic -Kieee
@@ -1627,7 +1832,7 @@
  
  #else
  
-@@ -174,19 +438,18 @@
+@@ -174,19 +443,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1659,7 +1864,7 @@
   
  #else
  
-@@ -197,19 +460,18 @@
+@@ -197,19 +465,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1691,7 +1896,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */
-@@ -222,25 +484,28 @@
+@@ -222,25 +489,30 @@
  #else
  
  # ifdef Hasgfortran
@@ -1719,9 +1924,12 @@
  # define XargsCmd               xargs
  # define FortranSaveFlags       -fno-automatic
 -# define OptimisedFortranFlags  -O0 -g -funroll-loops -fomit-frame-pointer
-+# define OptimisedFortranFlags  OptimizedCDebugFlags -funroll-loops
+-# define DefaultFCOptions       -fno-second-underscore
++# define OptimisedFortranFlags  OptimizedCDebugFlags /* -funroll-loops */
 +/* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */
- # define DefaultFCOptions       -fno-second-underscore
++# ifndef DefaultFCOptions
++# define DefaultFCOptions       -fno-range-check -fno-automatic -fno-second-underscore
++# endif
  # define NoOpFortranDebugFlags  -O0
 -# define CernlibSystem          -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_GFORTRAN
 +# define CernlibSystem          CernlibDefaultDefines CernlibMachineDefines \
@@ -1729,7 +1937,7 @@
  
  #define CERNLIB_GFORTRAN
   
-@@ -249,17 +514,32 @@
+@@ -249,17 +521,32 @@
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
  
@@ -1765,7 +1973,7 @@
  
  # endif
  # endif
-@@ -280,7 +560,7 @@
+@@ -280,7 +567,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */


Index: cernlib-308-use-canonical-cfortran-location.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-308-use-canonical-cfortran-location.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-308-use-canonical-cfortran-location.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-308-use-canonical-cfortran-location.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 308-use-canonical-cfortran-location.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: All code compiled at Cernlib build-time should look for cfortran.h
+## DP: All code compiled at CERNLIB build-time should look for cfortran.h
 ## DP: at .
 
 @DPATCH@


Index: cernlib-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-321-support-gfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-321-support-gfortran.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-321-support-gfortran.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,12 +2,15 @@
 ## 321-support-gfortran.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support compilation with gfortran.  Patch thanks to Harald Vogt
+## DP: Support compilation with gfortran.  Patch thanks to Harald Vogt, plus:
+## DP: - Extra hack to IOSTAT EOF return value to support gfortran-4.3.
+## DP: - Work around gfortran's refusal to initialize 4-byte integer with
+## DP:   unsigned constant > 0x7fffffff.
 
 @DPATCH@
 diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F
---- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F	1996-04-01 10:01:53.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F	2007-04-21 19:45:12.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F	1996-04-01 07:01:53.000000000 -0800
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F	2008-02-11 15:40:44.000000000 -0800
 @@ -45,7 +45,16 @@
           MT=3
           Z(1)=SQRT(SQRT(-D))
@@ -48,8 +51,8 @@
        W3=0
        IF(W1*W2 .NE. 0) W3=-Q/(8*W1*W2)
 diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F
---- cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F	1996-04-01 10:02:54.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F	2007-04-21 19:45:12.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F	1996-04-01 07:02:54.000000000 -0800
++++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F	2008-02-11 15:40:44.000000000 -0800
 @@ -14,10 +14,12 @@
        VECTOR(I) = RNDM(I)
    100 CONTINUE
@@ -66,8 +69,8 @@
        RETURN
        END
 diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile
---- cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile	1999-11-15 08:25:58.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile	2007-04-21 19:45:12.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile	1999-11-15 05:25:58.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile	2008-02-11 15:40:44.000000000 -0800
 @@ -13,7 +13,19 @@
  #endif
  
@@ -89,33 +92,33 @@
  
  SubdirLibraryTarget(NullParameter,NullParameter)
 diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile
---- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2006-09-04 08:32:59.000000000 -0400
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2007-04-21 19:45:41.000000000 -0400
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2006-09-04 05:32:59.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2008-02-11 15:40:44.000000000 -0800
 @@ -1,6 +1,6 @@
  
 -SRCS_F= irndm.F qnext.F rdmin.F
-+SRCS_F= irndm.F qnext.F rdmin.F getarg.F
++SRCS_F= irndm.F qnext.F rdmin.F kernlibgetarg.F
  
 -SRCS_C= lshift.c ishftr.c getarg.c
 +SRCS_C= lshift.c ishftr.c /* getarg.c */
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F
---- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F	1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F	2007-04-21 19:48:39.000000000 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F	1969-12-31 16:00:00.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F	2008-02-11 15:40:44.000000000 -0800
 @@ -0,0 +1,19 @@
 +*     Wrapper GETARG routine for gfortran,
 +*     originally written by Harald Vogt 
 +*
-+      SUBROUTINE GETARG (JARG, CHARG)
++*     SUBROUTINE GETARG (JARG, CHARG)
 +*     The following stuff is required to use gfortrans inline routine GETARG
 +*     It is required to avoid the calling GETARG here which conflicts
 +*     to the Fortran rules
-+      CHARACTER    CHARG*(*)
-+      CALL MYGETARG (JARG, CHARG)
-+      END
++*     CHARACTER    CHARG*(*)
++*     CALL MYGETARG (JARG, CHARG)
++*     END
 +
-+      SUBROUTINE MYGETARG (JARG, CHARG)
++      SUBROUTINE KERNLIBGETARG (JARG, CHARG)
 +      CHARACTER    CHARG*(*)
 +*     gfortran translates the following line to a call
 +*     to its library routine _gfortran_getarg_i4
@@ -123,3 +126,32 @@
 +      CALL GETARG (JARG, CHARG)
 +      END
 + 
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kfor.h cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kfor.h	2006-09-15 02:35:30.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h	2008-02-11 15:40:44.000000000 -0800
+@@ -1031,7 +1031,7 @@
+ #if !defined(CERNLIB_GFORTRAN)
+ #define  Getarg           F77_NAME(getarg,GETARG)
+ #else
+-#define  Getarg           _gfortran_getarg_i4
++#define  Getarg           F77_NAME(kernlibgetarg,KERNLIBGETARG)
+ #endif
+                  extern SUBROUTINE Getarg;
+ #define  Goparm           F77_NAME(goparm,GOPARM)
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/fq/fzdaeof.inc cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc
+--- cernlib-2006.dfsg.2~/src/packlib/zebra/fq/fzdaeof.inc	2006-09-15 02:35:31.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc	2008-02-11 15:40:44.000000000 -0800
+@@ -46,8 +46,12 @@
+ #elif defined(CERNLIB_WINDOWS)
+ *    only valid for dec fortran (e.g. not f2c + microsoft c)
+       PARAMETER    (IOSEOF = 36)
+-#elif defined(CERNLIB_GFORTRAN)
++#elif defined(CERNLIB_GFORTRAN) && defined(__GNUC__) && defined(__GNUC_MINOR__)
++# if (__GNUC__ > 4 || __GNUC_MINOR__ >= 3)
++      PARAMETER    (IOSEOF = 5002)
++# else
+       PARAMETER    (IOSEOF = 3)
++# endif
+ #elif 1
+       PARAMETER    (IOSEOF = -1)
+ #endif


Index: cernlib-600-use-host.def-config-file.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-600-use-host.def-config-file.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-600-use-host.def-config-file.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-600-use-host.def-config-file.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 600-use-host.def-config-file.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Use host.def for Debian-specific CERNLIB build options.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/config/site.def cernlib-2005.05.09.dfsg/src/config/site.def


Index: cernlib-800-implement-shared-library-rules-in-Imake.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-800-implement-shared-library-rules-in-Imake.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-800-implement-shared-library-rules-in-Imake.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-800-implement-shared-library-rules-in-Imake.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -84,7 +84,7 @@
 +#elif defined(LinuxArchitecture) /* added by Kevin McCarty
 +				    for Debian, 15 May 2002 */
 +#ifndef SharedLibraryTargetName
-+#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME).$(CERN_LEVEL))
++#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME)$(TOOL_NAME).$(CERN_LEVEL))
 +#endif
 +
 +#ifndef SharedLibrarySonameName


Index: cernlib-803-link-binaries-dynamically.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-803-link-binaries-dynamically.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-803-link-binaries-dynamically.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-803-link-binaries-dynamically.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,13 +2,13 @@
 ## 803-link-binaries-dynamically.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link binaries dynamically against Cern libraries.
+## DP: Link binaries dynamically against CERN libraries.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules
---- cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:19.991403858 -0400
-+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:23.699609849 -0400
-@@ -189,13 +189,13 @@
+diff -urNad cernlib-2006.dfsg.2~/src/config/fortran.rules cernlib-2006.dfsg.2/src/config/fortran.rules
+--- cernlib-2006.dfsg.2~/src/config/fortran.rules	2007-12-14 01:25:54.000000000 +0000
++++ cernlib-2006.dfsg.2/src/config/fortran.rules	2007-12-14 01:34:31.000000000 +0000
+@@ -189,7 +189,7 @@
   */
  #ifndef CernlibDependLibrary
  #define CernlibDependLibrary(cernlibs)\
@@ -17,23 +17,33 @@
  #endif
  
  /* Helper to use cernlib command
+@@ -202,17 +202,22 @@
+  *   cernlib utility to find give all required libraries ( ie. no extra
+  *   syslibs needed.
   */
- #ifndef CernlibCmd
--#define CernlibCmd(libraries)cernlib libraries
-+#define CernlibCmd(libraries)cernlib -dy libraries
- #endif
- /*
-  * CernlibFortranProgramTarget - rule to link fortran program using
-@@ -207,7 +207,7 @@
+-#ifndef CernlibFortranProgramTarget
+-#define CernlibFortranProgramTarget(program,objects,deplibs,locallibs,cernlibs)\
++#ifndef CernlibFortranStaticTarget
++#define CernlibFortranStaticTarget(program,objects,deplibs,locallibs,cernlibs)\
  ProgramTargetName(program): SetWin32ObjSuffix(objects) deplibs CernlibDependLibrary(cernlibs)	@@\
  	RemoveTargetProgram($@)						@@\
  	@echo "Linking with cern libraries"				@@\
 -	@cernlib cernlibs						@@\
-+	@cernlib -dy cernlibs						@@\
++	@CernlibCmd(cernlibs)						@@\
  	CernlibFortranLinkRule($@,$(FCLDOPTIONS),objects,locallibs $(LDLIBS),CernlibCmd(cernlibs)) @@\
  									@@\
  clean::									@@\
-@@ -233,8 +233,8 @@
+ 	RemoveFile(ProgramTargetName(program))				@@\
+ 
++#endif /*CernlibFortranStaticTarget */
++
++#ifndef CernlibFortranProgramTarget
++#define CernlibFortranProgramTarget(program,objects,deplibs,locallibs,cernlibs)\
++CernlibFortranStaticTarget(program,objects,deplibs,locallibs,-dy cernlibs)
+ #endif /*CernlibFortranProgramTarget */
+ 
+ /*
+@@ -233,8 +238,8 @@
  ProgramTargetName(program): objects deplibs CernlibDependLibrary(cernlibs) @@\
  	RemoveTargetProgram($@)						@@\
  	@echo "Linking with cern libraries"				@@\
@@ -44,9 +54,9 @@
  									@@\
  clean::									@@\
  	RemoveFile(ProgramTargetName(program))				@@\
-diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
---- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:18.903636773 -0400
-+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:23.699609849 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/Imakefile	2007-12-14 01:25:53.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/Imakefile	2007-12-14 01:25:57.000000000 +0000
 @@ -13,14 +13,14 @@
  DefinePackageLibrary(kxtlib)
  


Index: cernlib-g77.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-g77.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-g77.spec	31 Dec 2007 10:13:40 -0000	1.2
+++ cernlib-g77.spec	10 Mar 2008 10:35:43 -0000	1.3
@@ -55,7 +55,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       21%{?dist}
+Release:       27%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -138,10 +138,10 @@
 Source204: cernlib-debian-copyright.in
 
 # debian patchsets
-Patch100001: http://ftp.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-2.diff.gz
-Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-1.diff.gz
-Patch100003: http://ftp.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-1.diff.gz
-Patch100004: http://ftp.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-5.diff.gz
+Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-11.diff.gz
+Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-2.diff.gz
+Patch100003: http://ftp.de.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-5.diff.gz
+Patch100004: http://ftp.de.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-7.diff.gz
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: geant321-001-fix-missing-fluka.dpatch
@@ -210,6 +210,16 @@
 Patch21101: cernlib-211-support-amd64-and-itanium.dpatch
 Patch21102: paw-211-support-amd64-and-itanium.dpatch
 Patch2111: cernlib-211-support-digital-alpha.dpatch
+Patch212: cernlib-212-print-test-results.dpatch
+Patch21301: cernlib-213-fix-test-suite-build.dpatch
+Patch21302: geant321-213-fix-test-suite-build.dpatch
+Patch21303: mclibs-213-fix-test-suite-build.dpatch
+Patch214: cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch
+# not in latest debian cernlib and doesn't seems to be useful on fedora
+#Patch215: cernlib-215-work-around-g77-bug-on-ia64.dpatch
+Patch216: cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch
+Patch217: cernlib-217-abend-on-mathlib-test-failure.dpatch
+Patch220: mclibs-220-compile-isajet-with-isarun.dpatch
 Patch300: cernlib-300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -289,6 +299,9 @@
 Patch80602: paw-806-bump-mathlib-and-dependents-sonames.dpatch
 Patch80603: geant321-806-bump-mathlib-and-dependents-sonames.dpatch
 Patch80604: mclibs-806-bump-mathlib-and-dependents-sonames.dpatch
+Patch80701: cernlib-807-static-link-some-tests-on-64-bit.dpatch
+Patch80702: geant321-807-static-link-some-tests-on-64-bit.dpatch
+Patch80703: mclibs-807-static-link-some-tests-on-64-bit.dpatch
 
 # change the cernlib script such that -llapack -lblas is used instead of 
 # cernlib lapack
@@ -300,21 +313,10 @@
 Patch1200: cernlib-script.patch
 # don't stop if the CERN variable isn't defined
 Patch1201: cernlib-gxint-script.diff
-# not needed in 2006
-#Patch1203: cernlib-hwuli2_use_dimag.diff 
-#Patch1204: cernlib-hwhiga_use_dimag.diff
 # modify the cernlib man page to fit with the distribution
 Patch1206: cernlib-man_static.patch
 # modify the debian cernlib paw desktop file icon name
 Patch1207: cernlib-fedora_desktop.patch
-# fix tests Imakefiles
-Patch1208: cernlib-test.patch
-# don't recurse in eurodec for tests because the testcase segfaults
-Patch1210: cernlib-segf_eudtest.patch
-# kernlib/kernnum packlib/{ffread hbook kuip zbook zebra} test error on 64 bit
-# packlib/{ffread hbook kuip} segfaults on ppc64
-Patch1211: cernlib-64test.patch
-
 
 # patchy 4
 # not applied as it has allready been done by the sed one-liner in 
@@ -610,6 +612,15 @@
 %patch -P 21101 -p1
 %patch -P 21102 -p1
 %patch -P 2111 -p1
+%patch -P 212 -p1
+%patch -P 21301 -p1
+%patch -P 21302 -p1
+%patch -P 21303 -p1
+%patch -P 214 -p1
+#%patch -P 215 -p1
+%patch -P 216 -p1
+%patch -P 217 -p1
+%patch -P 220 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -752,20 +763,15 @@
 %patch -P 80602 -p1
 %patch -P 80603 -p1
 %patch -P 80604 -p1
+%patch -P 80701 -p1
+%patch -P 80702 -p1
+%patch -P 80703 -p1
 
 %patch -P 1504 -p2 -b .np_flags
 #%patch -P 1505 -p1
 %patch -P 1506 -p2 -b .curdir
 
 %patch -P 1201
-#%patch -P 1203
-#%patch -P 1204
-%patch -P 1208 -p2 -b .test
-%patch -P 1210 -p2 -b .segf_eudtest
-
-%ifarch x86_64 ppc64
-%patch -P 1211 -p2 -b .64test
-%endif
 
 # remove CVS directories
 find . -depth -type d -name CVS -exec rm -rf {} ';' 
@@ -799,7 +805,9 @@
 # incompatible for functions.
 %if %{with gfortran}
 TOOL_SONAME=_gfortran
+TOOL_NAME=_gfortran
 export TOOL_SONAME
+export TOOL_NAME
 %endif
 
 # set the CERN and CERN_LEVEL environment variables in shell scripts
@@ -825,11 +833,18 @@
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    ../patchy/ylist ../patchy/yindex
 
+%if %{with gfortran}
+FC_COMPILER=gfortran
+%else
+FC_COMPILER=g77
+%endif
+
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
 # and substitue the name of the cernlib link script
 sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' \
   -e 's/`cernlib /`cernlib%{?compiler} /' \
+  -e 's/"f77"/"'$FC_COMPILER'"/' \
   src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
@@ -850,7 +865,7 @@
 
 # use the debian cernlib script for dynamic libraries support.
 # remove -lg2c to the link commands, because libg2c.so isn't available, 
-# it is found by g77/gfortran if needed.
+# it is found by g77/gfortran if needed, and similar with -lgfortran.
 # don't add %{_libdir} to the directory searched in for libraries, 
 # since it is already in the list.
 sed -e 's:@PREFIX@:%{_prefix}:g' \
@@ -858,6 +873,7 @@
   -e 's:@VERSION@:%{verdir}:g' \
   -e 's:@LIBPREFIX@::g' \
   -e 's/-lg2c//' \
+  -e 's/-lgfortran//' \
   ../cernlib.in > src/scripts/cernlib
 # to remove reference to monolithic X directories
 #  -e 's/-L\$XDIR\(64\)\? //' \
@@ -1135,7 +1151,7 @@
 %{__install} -d -m755 %{buildroot}/%{_datadir}/X11/app-defaults
 %{__install} -p -m644 ../../*/debian/add-ons/app-defaults/* %{buildroot}/%{_datadir}/X11/app-defaults/
 
-sed -e 's/Exec=paw++/Exec=paw++%{?compiler_string}/' -e 's/PAW++/PAW++%{?compiler_string}/' \
+sed -e 's/Exec=paw++/Exec=paw++%{?compiler_string}/' -e 's/Paw++/Paw++%{?compiler_string}/' \
  ../../paw*/debian/add-ons/misc/paw++.desktop > paw++%{?compiler_string}.desktop
 desktop-file-install --vendor="fedora"               \
   --dir=%{buildroot}/%{_datadir}/applications         \
@@ -1177,16 +1193,22 @@
 cd $CERN_ROOT/build
 
 # no test in code_motif paw_motif scripts patchy pawlib
-test_dirs='graflib mclibs kernlib mathlib packlib phtools'
+test_dirs='graflib mclibs kernlib mathlib packlib phtools geant321'
 
-%ifnarch x86_64 ppc64
-test_dirs="$test_dirs geant321"
-%endif
+#%ifnarch x86_64 ppc64
+#test_dirs="$test_dirs geant321"
+#%endif
+rm -f __dist_failed_builds
 
 for dir in $test_dirs; do
-make -C $dir test
+make -C $dir test || echo $dir >> __dist_failed_builds
 done
 
+if [ -f __dist_failed_builds ]; then
+echo "DIST TESTS FAILED"
+cat __dist_failed_builds
+fi
+
 
 %clean
 rm -rf %{buildroot}
@@ -1418,6 +1440,18 @@
 %endif
 
 %changelog
+* Tue Feb 26 2008 Patrice Dumas  2006-27
+- new mclibs and geant321 patchsets
+
+* Sun Feb 24 2008 Patrice Dumas  2006-25
+- new cernlib and paw patchsets
+
+* Sun Jan 13 2008 Patrice Dumas  2006-23
+- new cernlib debian patcheset
+
+* Tue Jan  8 2008 Patrice Dumas  2006-22
+- new debian patchesets
+
 * Mon Dec 31 2007 Patrice Dumas  2006-21
 - no --build-id for EL-5
 


Index: geant321-001-fix-missing-fluka.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/geant321-001-fix-missing-fluka.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-001-fix-missing-fluka.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ geant321-001-fix-missing-fluka.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,18 +2,18 @@
 ## 001-fix-missing-fluka.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Deal with FLUKA code having been purged from Debian's Cernlib source.
+## DP: Deal with FLUKA code having been purged from Debian's CERNLIB source.
 
 @DPATCH@
-diff -urNad geant321-3.21.14~/src/geant321/Imakefile geant321-3.21.14/src/geant321/Imakefile
---- geant321-3.21.14~/src/geant321/Imakefile	1998-03-05 06:20:07.000000000 -0500
-+++ geant321-3.21.14/src/geant321/Imakefile	2007-01-30 17:37:26.209615233 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/Imakefile geant321-3.21.14.dfsg/src/geant321/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/Imakefile	1998-03-05 03:20:07.000000000 -0800
++++ geant321-3.21.14.dfsg/src/geant321/Imakefile	2008-01-04 17:00:47.000000000 -0800
 @@ -4,10 +4,11 @@
  
  AllTarget(geant321)
  
 -LIBDIRS= block cdf cgpack fiface fluka gbase gcons gdraw \ @@\
-+/* Fluka removed from Debian source package for copyright reasons. */
++/* FLUKA removed from Debian source package for copyright reasons. */
 +LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
           geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
  	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
@@ -26,7 +26,7 @@
  InstallLibrary(geant321,$(CERN_LIBDIR))
  InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
  
-+/* Fluka removed from Debian source package for copyright reasons. */
++/* FLUKA removed from Debian source package for copyright reasons. */
 +/*
  SubdirDataFile($(LIBRARY),flukaaf.dat,data)
  
@@ -35,9 +35,23 @@
  
  /* This will install the correct link for xsneut95.dat at CERN;
   * If you want a local copy of the file, just copy it there
-diff -urNad geant321-3.21.14~/src/geant321/geant321/gcnmec.inc geant321-3.21.14/src/geant321/geant321/gcnmec.inc
---- geant321-3.21.14~/src/geant321/geant321/gcnmec.inc	1995-10-24 06:20:31.000000000 -0400
-+++ geant321-3.21.14/src/geant321/geant321/gcnmec.inc	2007-01-30 17:39:15.301513801 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/examples/Imakefile	1996-03-06 09:31:38.000000000 -0800
++++ geant321-3.21.14.dfsg/src/geant321/examples/Imakefile	2008-01-04 17:01:20.000000000 -0800
+@@ -1,7 +1,10 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' /* for NamedMakeSubdirs */
+ 
++/* gexam4 needs fluka
+ SUBDIRS= gexam1 gexam2 gexam3 gexam4 gexam5
++*/
++SUBDIRS= gexam1 gexam2 gexam3 gexam5
+ 
+ TestSubdirs($(SUBDIRS))
+ 
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/geant321/gcnmec.inc geant321-3.21.14.dfsg/src/geant321/geant321/gcnmec.inc
+--- geant321-3.21.14.dfsg~/src/geant321/geant321/gcnmec.inc	1995-10-24 03:20:31.000000000 -0700
++++ geant321-3.21.14.dfsg/src/geant321/geant321/gcnmec.inc	2008-01-04 17:00:47.000000000 -0800
 @@ -16,13 +16,14 @@
        PARAMETER(NMECA=45,IBLOWN=23)
        CHARACTER*4 CHNMEC(NMECA)
@@ -55,9 +69,9 @@
       +     'HADG',  'INEG',  'ELAG',  'FISG',  'CAPG',
       +     'LOSS',  'PHOT',  'ANNI',  'COMP',  'BREM',
       +     'PAIR',  'DRAY',  'PFIS',  'RAYL',  'MUNU',
-diff -urNad geant321-3.21.14~/src/geant321/miface/Imakefile geant321-3.21.14/src/geant321/miface/Imakefile
---- geant321-3.21.14~/src/geant321/miface/Imakefile	1995-10-24 06:21:53.000000000 -0400
-+++ geant321-3.21.14/src/geant321/miface/Imakefile	2007-01-30 17:37:26.319591944 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/miface/Imakefile geant321-3.21.14.dfsg/src/geant321/miface/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/miface/Imakefile	1995-10-24 03:21:53.000000000 -0700
++++ geant321-3.21.14.dfsg/src/geant321/miface/Imakefile	2008-01-04 17:00:47.000000000 -0800
 @@ -1,5 +1,5 @@
  SRCS_F= \ @@\
 -	 gfmdis.F gfmfin.F gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F


Index: geant321-003-geant-dummy-functions.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/geant321-003-geant-dummy-functions.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-003-geant-dummy-functions.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ geant321-003-geant-dummy-functions.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 003-geant-dummy-functions.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add stub Geant functions to avoid missing symbols due to Fluka removal.
+## DP: Add stub GEANT functions to avoid missing symbols due to FLUKA removal.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile
@@ -12,7 +12,7 @@
  SRCS_F= gfkine.F gfvert.F gludky.F glund.F glundi.F gpkine.F \ @@\
  	gpkinx.F gpvert.F gskine.F gskinu.F gsvert.F gsveru.F gtau.F
  
-+/* Dummy file containing stubs for deleted Fluka and mclibs functions: */
++/* Dummy file containing stubs for deleted FLUKA and mclibs functions: */
 +SRCS_C= dummy.c
 +
  #ifdef CERNLIB_QMVAOS
@@ -47,7 +47,7 @@
 +
 +static void print_dummy(const char *domain, const char *function)
 +{
-+  fprintf(stderr, "Geant321: Now in dummy %s routine.\n", function);
++  fprintf(stderr, "GEANT 3.21: Now in dummy %s routine.\n", function);
 +  fprintf(stderr,
 +"If you see this message, you are presumably trying to call (possibly\n"
 +"indirectly) the %s routine");
@@ -64,7 +64,7 @@
 +  else if (strcmp(domain, "Fluka") == 0)
 +    fprintf(stderr,
 +" in the FLUKA library.\n"
-+"FLUKA is unfortunately not available in this distribution of Cernlib for\n"
++"FLUKA is unfortunately not available in this distribution of CERNLIB for\n"
 +"licensing reasons"
 +#if defined (CERNLIB_DEBIAN)
 +"; please see the file /usr/share/doc/geant321/README.Debian\n"
@@ -75,7 +75,7 @@
 +    );
 +  
 +  else if (strcmp(domain, "User") == 0)
-+    fprintf(stderr, ".  This routine is not built into Geant;\n"
++    fprintf(stderr, ".  This routine is not built into GEANT;\n"
 +"you must write code for it yourself.  Please see the documentation"
 +#if defined (CERNLIB_DEBIAN)
 +"\n(for instance in the geant321-doc package)"
@@ -118,7 +118,7 @@
 +WEAKDUMMY(Fluka, SITSAO, sitsao_, double);
 +
 +/* The following dummy functions are added due to the removal
-+ * of the corresponding code from Geant (it is also part of FLUKA).
++ * of the corresponding code from GEANT (it is also part of FLUKA).
 + * We are constrained to keep the ABI for the dynamic library, so
 + * these dummy functions must be kept until next time the libgeant321
 + * soversion is changed. */


Index: geant321-203-compile-geant-with-ertrak.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/geant321-203-compile-geant-with-ertrak.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-203-compile-geant-with-ertrak.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ geant321-203-compile-geant-with-ertrak.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -11,7 +11,7 @@
 @@ -5,11 +5,12 @@
  AllTarget(geant321)
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */
 +/* Ertrak added to Debian since I saw no reason to leave it out. */
  LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
           geocad ggeom gheisha ghits ghrout ghutils giface \ @@\


Index: geant321-806-bump-mathlib-and-dependents-sonames.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/geant321-806-bump-mathlib-and-dependents-sonames.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-806-bump-mathlib-and-dependents-sonames.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ geant321-806-bump-mathlib-and-dependents-sonames.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -17,4 +17,4 @@
 +
  AllTarget(geant321)
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */


Index: mclibs-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/mclibs-321-support-gfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mclibs-321-support-gfortran.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ mclibs-321-support-gfortran.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -21,11 +21,13 @@
 diff -urNad mclibs-2005.dfsg~/src/mclibs/isajet/test/Imakefile mclibs-2005.dfsg/src/mclibs/isajet/test/Imakefile
 --- mclibs-2005.dfsg~/src/mclibs/isajet/test/Imakefile	2000-07-25 12:21:34.000000000 -0400
 +++ mclibs-2005.dfsg/src/mclibs/isajet/test/Imakefile	2006-09-27 13:49:49.783806148 -0400
-@@ -8,4 +8,7 @@
+@@ -8,4 +8,9 @@
  
- CernlibFortranProgramTarget(isajett,isajett.o,$(PACKAGE_LIB),$(PACKAGE_LIB),pdflib804 mathlib kernlib)
+ CernlibFortranProgramTarget(isajett,isajett.o,NullParameter,NullParameter,pdflib804 mathlib kernlib isajet)
  
 +#if !defined(CERNLIB_GFORTRAN)
 +/* breaks on 'STOP 99' if compiled with gfortran */
  TestTarget(isajett,isajet.dat,test.input)
++#else
++test::
 +#endif


Index: paw-108-quote-protect-comis-script.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/paw-108-quote-protect-comis-script.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-108-quote-protect-comis-script.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ paw-108-quote-protect-comis-script.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 108-quote-protect-comis-script.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Try to be whitespace-safe in script generated at runtime by COMIS.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F


Index: paw-200-comis-allow-special-chars-in-path.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/paw-200-comis-allow-special-chars-in-path.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-200-comis-allow-special-chars-in-path.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ paw-200-comis-allow-special-chars-in-path.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 200-comis-allow-special-chars-in-path.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Allow certain additional characters in paths to COMIS macros.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F


Index: paw-211-support-amd64-and-itanium.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/paw-211-support-amd64-and-itanium.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-211-support-amd64-and-itanium.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ paw-211-support-amd64-and-itanium.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -166,7 +166,7 @@
 --- paw-2.14.04~/src/pawlib/comis/code/csitgpl.F	1969-12-31 19:00:00.000000000 -0500
 +++ paw-2.14.04/src/pawlib/comis/code/csitgpl.F	2006-09-08 14:44:11.808264160 -0400
 @@ -0,0 +1,32 @@
-+* Comis
++* COMIS
 +*
 +*
 +#if (defined(CERNLIB_QMLXIA64))
@@ -306,7 +306,7 @@
 --- paw-2.14.04~/src/pawlib/comis/code/csrtgpl.F	1969-12-31 19:00:00.000000000 -0500
 +++ paw-2.14.04/src/pawlib/comis/code/csrtgpl.F	2006-09-08 14:44:11.808264160 -0400
 @@ -0,0 +1,31 @@
-+* Comis
++* COMIS
 +*
 +*
 +#if (defined(CERNLIB_QMLXIA64))


Index: paw-308-use-canonical-cfortran-location.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/paw-308-use-canonical-cfortran-location.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-308-use-canonical-cfortran-location.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ paw-308-use-canonical-cfortran-location.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 308-use-canonical-cfortran-location.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: All code compiled at Cernlib build-time should look for cfortran.h
+## DP: All code compiled at CERNLIB build-time should look for cfortran.h
 ## DP: at .
 
 @DPATCH@


Index: paw-320-support-ifort-and-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/paw-320-support-ifort-and-gfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-320-support-ifort-and-gfortran.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ paw-320-support-ifort-and-gfortran.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -5,9 +5,9 @@
 ## DP: Support use of ifort, icc and/or gfortran as default compilers.
 
 @DPATCH@
-diff -urNad paw-2.14.04~/src/pawlib/comis/code/csinit.F paw-2.14.04/src/pawlib/comis/code/csinit.F
---- paw-2.14.04~/src/pawlib/comis/code/csinit.F	2006-09-07 17:57:19.881356063 -0400
-+++ paw-2.14.04/src/pawlib/comis/code/csinit.F	2006-09-07 18:04:23.085153626 -0400
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/code/csinit.F paw-2.14.04.dfsg.2/src/pawlib/comis/code/csinit.F
+--- paw-2.14.04.dfsg.2~/src/pawlib/comis/code/csinit.F	2007-12-12 23:52:57.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/comis/code/csinit.F	2007-12-12 23:52:59.000000000 +0000
 @@ -217,8 +217,18 @@
  #endif
  #if (defined(CERNLIB_LINUX))
@@ -27,9 +27,57 @@
  #endif
  #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
        ITMPLEN=CSTMPD(CHPATH, 256)
-diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/Imakefile paw-2.14.04/src/pawlib/paw/ntuple/Imakefile
---- paw-2.14.04~/src/pawlib/paw/ntuple/Imakefile	2006-09-07 17:57:19.916348611 -0400
-+++ paw-2.14.04/src/pawlib/paw/ntuple/Imakefile	2006-09-07 17:57:35.628002463 -0400
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/deccc/Imakefile paw-2.14.04.dfsg.2/src/pawlib/comis/deccc/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/comis/deccc/Imakefile	2005-04-18 15:41:06.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/comis/deccc/Imakefile	2007-12-12 23:55:32.000000000 +0000
+@@ -45,8 +45,12 @@
+ #endif
+ 
+ #if defined(CERNLIB_LINUX)
++#if defined(CERNLIB_GFORTRAN)
++EXTRA_DEFINES := $(EXTRA_DEFINES) -DgFortran
++#else
+ EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
+ #endif
++#endif
+ 
+ #if defined(CERNLIB_SUN) && !defined(CERNLIB_SOLARIS)
+ CCOPTIONS=
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/paw/cpaw/Imakefile paw-2.14.04.dfsg.2/src/pawlib/paw/cpaw/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/paw/cpaw/Imakefile	1999-06-28 15:28:22.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/paw/cpaw/Imakefile	2007-12-12 23:56:19.000000000 +0000
+@@ -15,8 +15,12 @@
+ #endif
+ 
+ #if defined(CERNLIB_LINUX)
++#if defined(CERNLIB_GFORTRAN)
++EXTRA_DEFINES := $(EXTRA_DEFINES) -DgFortran
++#else
+ EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
+ #endif
++#endif
+ 
+ #if defined(CERNLIB_BUGREPORT)
+ SRCS_C := $(SRCS_C) bugrep.c
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/paw/mlpfit/Imakefile paw-2.14.04.dfsg.2/src/pawlib/paw/mlpfit/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/paw/mlpfit/Imakefile	2000-04-28 14:12:13.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/paw/mlpfit/Imakefile	2007-12-12 23:57:04.000000000 +0000
+@@ -9,8 +9,12 @@
+ #endif
+ 
+ #if defined(CERNLIB_LINUX)
++#if defined(CERNLIB_GFORTRAN)
++EXTRA_DEFINES := $(EXTRA_DEFINES) -DgFortran
++#else
+ EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
+ #endif
++#endif
+ 
+ #ifndef CERNLIB_VAXVMS
+ EXTRA_INCLUDES := $(EXTRA_INCLUDES) -I$(VPATH)
+diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/paw/ntuple/Imakefile paw-2.14.04.dfsg.2/src/pawlib/paw/ntuple/Imakefile
+--- paw-2.14.04.dfsg.2~/src/pawlib/paw/ntuple/Imakefile	2007-12-12 23:52:58.000000000 +0000
++++ paw-2.14.04.dfsg.2/src/pawlib/paw/ntuple/Imakefile	2007-12-12 23:52:59.000000000 +0000
 @@ -16,9 +16,17 @@
  EXTRA_DEFINES := $(EXTRA_DEFINES) -Dextname
  #endif


Index: paw-803-link-binaries-dynamically.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/paw-803-link-binaries-dynamically.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-803-link-binaries-dynamically.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ paw-803-link-binaries-dynamically.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 803-link-binaries-dynamically.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link binaries dynamically against Cern libraries.
+## DP: Link binaries dynamically against CERN libraries.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile


Index: paw-804-workaround-for-comis-mdpool-struct-location.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/paw-804-workaround-for-comis-mdpool-struct-location.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-804-workaround-for-comis-mdpool-struct-location.dpatch	31 Dec 2007 00:37:10 -0000	1.1
+++ paw-804-workaround-for-comis-mdpool-struct-location.dpatch	10 Mar 2008 10:35:43 -0000	1.2
@@ -2,7 +2,7 @@
 ## 804-workaround-for-comis-mdpool-struct-location.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Hack to workaround Comis not liking it when code has a negative
+## DP: Hack to workaround COMIS not liking it when code has a negative
 ## DP: offset from the mdpool struct (as is the case when using shared
 ## DP: libraries on some arches).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Dec 2007 00:37:10 -0000	1.2
+++ sources	10 Mar 2008 10:35:43 -0000	1.3
@@ -1,6 +1,6 @@
 fe71a3f6b95ff2151c5a4690116a0358  2006_src-free.tar.gz
 b1f550eedc545a02f0ab58eb7d550480  patchy.tar.gz
-c3133b7a5885bd1ee7e47d4f4e76beca  geant321_3.21.14.dfsg-5.diff.gz
-3978b81499f205062b540aa58bb79193  mclibs_2006.dfsg.2-1.diff.gz
-90982e80623338cf2d4b4a9efb445f8c  paw_2.14.04.dfsg.2-1.diff.gz
-2a9795aed7895477a2759dc34e7f9b96  cernlib_2006.dfsg.2-2.diff.gz
+9a19d3bd4bd63c0ee2431c8d28f308b9  geant321_3.21.14.dfsg-7.diff.gz
+c65e057e938076f73645a193d497aaf4  mclibs_2006.dfsg.2-5.diff.gz
+5e99d1d8d0e632475879e12afe6ad748  paw_2.14.04.dfsg.2-2.diff.gz
+f8628a35f2a422dfaf09edc526d448e9  cernlib_2006.dfsg.2-11.diff.gz


--- cernlib-64test.patch DELETED ---


--- cernlib-segf_eudtest.patch DELETED ---


--- cernlib-test.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 10:38:14 2008
From: fedora-extras-commits at redhat.com (Huang Peng (phuang))
Date: Mon, 10 Mar 2008 10:38:14 GMT
Subject: rpms/scim-python/F-8 scim-python.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <200803101038.m2AAcE8E003682@cvs-int.fedora.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/scim-python/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3636

Modified Files:
	scim-python.spec sources 
Log Message:
Update to 0.1.10


Index: scim-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-python/F-8/scim-python.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-python.spec	8 Jan 2008 08:16:12 -0000	1.9
+++ scim-python.spec	10 Mar 2008 10:37:41 -0000	1.10
@@ -2,17 +2,22 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define mod_path scim-0.1
 Name:       scim-python
-Version:    0.1.9
+Version:    0.1.10
 Release:    1%{?dist}
 Summary:    Python wrapper for Smart Common Input Method platform
 
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/scim-python/
-Source0:    http://scim-python.googlecode.com/files/%{name}-%{version}.tar.bz2
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:    http://scim-python.googlecode.com/files/%{name}-%{version}.tar.gz
+Source1:    http://scim-python.googlecode.com/files/pinyin-database-0.1.10.5.tar.bz2
+Source2:    http://scim-python.googlecode.com/files/xingma-zhengma-0.1.10.tar.bz2
+Source3:    http://scim-python.googlecode.com/files/xingma-wubi86-0.1.10.tar.bz2
+Source4:    http://scim-python.googlecode.com/files/xingma-erbi-qingsong-0.1.10.tar.bz2
+Source5:    http://scim-python.googlecode.com/files/xingma-cangjie5-0.1.10.tar.bz2
 
-BuildRequires:  scim-devel, gettext-devel, libtool, python-devel, pygtk2-devel, perl(XML::Parser), python-enchant
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  scim-devel, gettext-devel, libtool, python-devel, pygtk2-devel, perl(XML::Parser)
 Requires:   scim, pygtk2
 
 %description
@@ -21,55 +26,141 @@
 %package english
 Summary:    Python english IM engine 
 Group:      System Environment/Libraries
+BuildRequires:  python-enchant
 Requires:   %{name} = %{version}-%{release} python-enchant
 
 %description english
 This package contains a python english IM engine.
 
+%package pinyin
+Summary:    Two python chinese pinyin IM engines 
+Group:      System Environment/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description pinyin
+This package contains two python chinese pinyin IM engines.
+
+
 %package chinese
-Summary:    Python chinese IM engine 
+Summary:    Python chinese IM engines 
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
+Requires:   %{name}-pinyin = %{version}-%{release}
+Requires:   %{name}-xingma-cangjie = %{version}-%{release}
+Requires:   %{name}-xingma-erbi = %{version}-%{release}
+Requires:   %{name}-xingma-wubi = %{version}-%{release}
+Requires:   %{name}-xingma-zhengma = %{version}-%{release}
 
 %description chinese
-This package contains a python chinese IM engine.
+This package contains some python chinese IM engines.
+
+%package xingma
+Summary:    Python XingMa IM engine 
+Group:      System Environment/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description xingma
+This package contains a python XingMa IM engine.
+
+%package xingma-cangjie
+Summary:    CangJie table for Python XingMa IM engine 
+Group:      System Environment/Libraries
+Requires:   %{name}-xingma = %{version}-%{release}
+
+%description xingma-cangjie
+This package contains a CangJie table for python XingMa IM engine.
+
+%package xingma-erbi
+Summary:    ErBi table for Python XingMa IM engine 
+Group:      System Environment/Libraries
+Requires:   %{name}-xingma = %{version}-%{release}
+
+%description xingma-erbi
+This package contains an ErBi table for python XingMa IM engine.
+
+%package xingma-wubi
+Summary:    WuBi table for Python XingMa IM engine 
+Group:      System Environment/Libraries
+Requires:   %{name}-xingma = %{version}-%{release}
+
+%description xingma-wubi
+This package contains an ZhengMa table for python XingMa IM engine.
+
+%package xingma-zhengma
+Summary:    ZhengMa table for Python XingMa IM engine 
+Group:      System Environment/Libraries
+Requires:   %{name}-xingma = %{version}-%{release}
 
+%description xingma-zhengma
+This package contains an ZhengMa table for python XingMa IM engine.
 
 %prep
-%setup -q
+%setup -q -a1 -a2 -a3 -a4 -a5
+mv py.db python/engine/PinYin/
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-english-writer --enable-pinyin
 # make -C po update-gmo
-make %{?_smp_mflags}
+make NO_INDEX=true %{?_smp_mflags}
+python python/engine/XingMa/XMCreateDB.py -o -s cangjie5.txt.bz2 -p data/pinyin_table.txt
+python python/engine/XingMa/XMCreateDB.py -o -s erbi-qs.txt.bz2 -p data/pinyin_table.txt
+python python/engine/XingMa/XMCreateDB.py -o -s wubi.txt.bz2 -p data/pinyin_table.txt
+python python/engine/XingMa/XMCreateDB.py -o -s zhengma.txt.bz2 -p data/pinyin_table.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
+make NO_INDEX=true DESTDIR=${RPM_BUILD_ROOT} install
 rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{mod_path}/scim/_scim.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/1.4.0/SetupUI/zhengjuui.la
+install -m 644 cangjie5.db $RPM_BUILD_ROOT%{_datadir}/scim-python/engine/XingMa/tables/
+install -m 644 cangjie.png $RPM_BUILD_ROOT%{_datadir}/scim/icons/
+install -m 644 erbi-qs.db $RPM_BUILD_ROOT%{_datadir}/scim-python/engine/XingMa/tables/
+install -m 644 erbi-qs.png $RPM_BUILD_ROOT%{_datadir}/scim/icons/
+install -m 644 wubi.db $RPM_BUILD_ROOT%{_datadir}/scim-python/engine/XingMa/tables/
+install -m 644 wubi.png $RPM_BUILD_ROOT%{_datadir}/scim/icons/
+install -m 644 zhengma.db $RPM_BUILD_ROOT%{_datadir}/scim-python/engine/XingMa/tables/
+install -m 644 zhengma.png $RPM_BUILD_ROOT%{_datadir}/scim/icons/
+
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post chinese
+%post pinyin
 cd /usr/share/scim-python/engine/PinYin
-echo "Creating INDEX in phrases database."
+echo "Creating INDEX."
 python -c "import PYSQLiteDB; db = PYSQLiteDB.PYSQLiteDB (); db.create_indexes ();"
 
+%post xingma-cangjie
+XMCreateDB -i -n %{_datadir}/scim-python/engine/XingMa/tables/cangjie5.db
+
+%post xingma-erbi
+XMCreateDB -i -n %{_datadir}/scim-python/engine/XingMa/tables/erbi-qs.db
+
+%post xingma-wubi
+XMCreateDB -i -n %{_datadir}/scim-python/engine/XingMa/tables/wubi.db
+
+%post xingma-zhengma
+XMCreateDB -i -n %{_datadir}/scim-python/engine/XingMa/tables/zhengma.db
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
 %{python_sitearch}/%{mod_path}/
 %{python_sitearch}/scim.pth
-%{_libdir}/scim-1.0/1.4.0/IMEngine/scim-python-engine.so
-%{_libdir}/scim-1.0/1.4.0/SetupUI/scim-python-setup.so
+%{_libdir}/scim-1.0/1.4.0/IMEngine/python.so
+%{_libdir}/scim-1.0/1.4.0/Helper/python.so
+%{_libdir}/scim-1.0/1.4.0/SetupUI/python.so
 %dir %{_datadir}/scim-python/
 %dir %{_datadir}/scim-python/engine
 %{_datadir}/scim-python/engine/__init__.*
 %dir %{_datadir}/scim-python/setupui
 %{_datadir}/scim-python/setupui/__init__.*
-%{_datadir}/scim/icons/*
+%dir %{_datadir}/scim-python/helper
+%{_datadir}/scim-python/helper/__init__.*
+%{_datadir}/scim/icons/scim-python.png
 
 %files english
 %defattr(-,root,root,-)
@@ -78,18 +169,57 @@
 
 %files chinese
 %defattr(-,root,root,-)
+
+%files pinyin
+%defattr(-,root,root,-)
+%{_datadir}/scim-python/data/pinyin_table.txt
 %{_datadir}/scim-python/engine/PinYin
-# %{_datadir}/scim-python/setupui/PinYin
+%{_datadir}/scim-python/helper/PinYinSetup
+%{_datadir}/scim-python/helper/ZhengJuSetup
+
+%files xingma
+%defattr(-,root,root,-)
+%{_bindir}/XMCreateDB
+%{_datadir}/scim-python/engine/XingMa/*.py
+%{_datadir}/scim-python/engine/XingMa/*.pyc
+%{_datadir}/scim-python/engine/XingMa/*.pyo
+%{_datadir}/scim-python/engine/XingMa/tables/.keep
+%{_datadir}/scim/icons/py-mode.png
+%{_datadir}/scim/icons/xm-mode.png
+
+%files xingma-cangjie
+%defattr(-,root,root,-)
+%{_datadir}/scim-python/engine/XingMa/tables/cangjie5.db
+%{_datadir}/scim/icons/cangjie.png
+
+%files xingma-erbi
+%defattr(-,root,root,-)
+%{_datadir}/scim-python/engine/XingMa/tables/erbi-qs.db
+%{_datadir}/scim/icons/erbi-qs.png
+
+%files xingma-wubi
+%defattr(-,root,root,-)
+%{_datadir}/scim-python/engine/XingMa/tables/wubi.db
+%{_datadir}/scim/icons/wubi.png
+
+%files xingma-zhengma
+%defattr(-,root,root,-)
+%{_datadir}/scim-python/engine/XingMa/tables/zhengma.db
+%{_datadir}/scim/icons/zhengma.png
+
 
 %changelog
-* Tue Jan 08 2008 Huang Peng  - 0.1.9-1
+* Mon Mar 10 2008 Huang Peng  - 0.1.10-1
+- Update to 0.1.10.
+
+* Fri Jan 08 2008 Huang Peng  - 0.1.8-1
 - Add post script to create indexes in pinyin phrase database.
 - Update to 0.1.9.
 
-* Thu Dec 28 2007 Huang Peng  - 0.1.8-1
+* Fri Dec 28 2007 Huang Peng  - 0.1.8-1
 - Update to 0.1.8.
 
-* Thu Dec 21 2007 Huang Peng  - 0.1.7-1
+* Fri Dec 21 2007 Huang Peng  - 0.1.7-1
 - Update to 0.1.7.
 
 * Thu Dec 05 2007 Huang Peng  - 0.1.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-python/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Jan 2008 08:16:12 -0000	1.7
+++ sources	10 Mar 2008 10:37:41 -0000	1.8
@@ -1 +1,6 @@
-d1d4f7834f3be6091308ba282e0b945b  scim-python-0.1.9.tar.bz2
+ece811b79448e5b97112bfbeebc53be9  scim-python-0.1.10.tar.gz
+140a7dd821e8e74299bfb2089993838b  pinyin-database-0.1.10.5.tar.bz2
+7145d6f6c15ade44820d5fdf71f87b53  xingma-cangjie5-0.1.10.tar.bz2
+b57d2ec272686603693ef9f8280880a8  xingma-erbi-qingsong-0.1.10.tar.bz2
+39b574455b483c42d56f0ae54e458401  xingma-wubi86-0.1.10.tar.bz2
+23bbfcc75c71a5db19a4f8e79be0027e  xingma-zhengma-0.1.10.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 10:38:31 2008
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Mar 2008 10:38:31 GMT
Subject: rpms/gnash/devel gnash.spec,1.17,1.18
Message-ID: <200803101038.m2AAcVC5003689@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	gnash.spec 
Log Message:
more precise gnasl libraries list


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnash.spec	10 Mar 2008 10:35:31 -0000	1.17
+++ gnash.spec	10 Mar 2008 10:37:53 -0000	1.18
@@ -179,7 +179,7 @@
 %{_bindir}/soldumper
 %{_bindir}/gnash
 %{_bindir}/gprocessor
-%{_libdir}/gnash/
+%{_libdir}/gnash/libgnash*
 #%{_libdir}/libgnash*-*.so
 #%{_libdir}/libklash*-*.so
 %{_mandir}/man1/gnash.1*



From fedora-extras-commits at redhat.com  Mon Mar 10 10:44:25 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 10:44:25 GMT
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch,
	NONE, 1.1.2.1 openoffice.org.langpack-common.template, 1.1,
	1.1.2.1 openoffice.org.spec, 1.1440.2.7, 1.1440.2.8
	openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch, 
	1.1, NONE
Message-ID: <200803101044.m2AAiPkG003907@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3880

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.langpack-common.template openoffice.org.spec 
Added Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch 
Removed Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch 
Log Message:
new patterns

openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch:

--- NEW FILE openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch ---
Index: source/msole/olepersist.cxx
===================================================================
RCS file: /cvs/framework/embeddedobj/source/msole/olepersist.cxx,v
retrieving revision 1.36
diff -u -r1.36 olepersist.cxx
--- openoffice.org.orig/embeddedobj/source/msole/olepersist.cxx	6 Jul 2007 10:10:50 -0000	1.36
+++ openoffice.org/embeddedobj/source/msole/olepersist.cxx	10 Mar 2008 09:35:36 -0000
@@ -664,8 +664,8 @@
 
 	for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
 	{
-		::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
-		aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+		::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) + 
+			::rtl::OUString::valueOf( (sal_Int32)nInd );
 		if ( xNameContainer->hasByName( aStreamName ) )
 			xNameContainer->removeByName( aStreamName );
 	}
@@ -737,8 +737,8 @@
 				{
 					for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ )
 					{
-						::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
-						aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+						::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) +
+							::rtl::OUString::valueOf( (sal_Int32)nInd );
 						try
 						{
 							bExists = xNameContainer->hasByName( aStreamName );
@@ -787,8 +787,8 @@
 		{
 			for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
 			{
-				::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
-				aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
+				::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" ) +
+					rtl::OUString::valueOf( (sal_Int32)nInd );
 				uno::Reference< io::XStream > xCachedCopyStream;
 				try
 				{


Index: openoffice.org.langpack-common.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-common.template,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org.langpack-common.template	19 Feb 2007 16:05:46 -0000	1.1
+++ openoffice.org.langpack-common.template	10 Mar 2008 10:43:49 -0000	1.1.2.1
@@ -2,7 +2,7 @@
 %dir %{instdir}
 %dir %{instdir}/program
 %dir %{instdir}/program/resource
-%{instdir}/program/resource/*680LANG.res 
+%{instdir}/program/resource/*LANG.res 
 %dir %{instdir}/share
 %dir %{instdir}/share/readme
 %{instdir}/share/readme/LICENSE_LANG


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.7
retrieving revision 1.1440.2.8
diff -u -r1.1440.2.7 -r1.1440.2.8
--- openoffice.org.spec	9 Mar 2008 18:23:44 -0000	1.1440.2.7
+++ openoffice.org.spec	10 Mar 2008 10:43:49 -0000	1.1440.2.8
@@ -141,9 +141,12 @@
 Patch67: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
 Patch68: workspace.cmcfixes43.patch
 Patch69: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
+Patch70: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
 
 %define instdir %{_libdir}/openoffice.org
 %define OFFICEUPD 300
+%define UPD
+%define SOPOST l*
 
 %description
 OpenOffice.org is an Open Source, community-developed, multi-platform
@@ -1096,6 +1099,7 @@
 %patch67 -p1 -b .oooXXXXX.psprint.debugcups.patch
 %patch68 -p1 -b .workspace.cmcfixes43.patch
 %patch69 -p1 -b .ooo86588.sw.buildfix.patch
+%patch70 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1723,7 +1727,7 @@
 %{instdir}/program/about.bmp
 %{instdir}/program/acceptor.uno.so
 %{instdir}/program/addin
-%{instdir}/program/basprov680*.uno.so
+%{instdir}/program/basprov%{SOPOST}.uno.so
 %{instdir}/program/bootstraprc
 %{instdir}/program/bridgefac.uno.so
 %{instdir}/program/canvasfactory.uno.so
@@ -1766,9 +1770,9 @@
 %{instdir}/program/configmgrrc
 %{instdir}/program/connector.uno.so
 %{instdir}/program/crash_report
-%{instdir}/program/deployment680*.uno.so
-%{instdir}/program/deploymentgui680*.uno.so
-%{instdir}/program/dlgprov680*.uno.so
+%{instdir}/program/deployment%{SOPOST}.uno.so
+%{instdir}/program/deploymentgui%{SOPOST}.uno.so
+%{instdir}/program/dlgprov%{SOPOST}.uno.so
 %{instdir}/program/fpicker.uno.so
 %{instdir}/program/fps_gnome.uno.so
 %{instdir}/program/fps_office.uno.so
@@ -1787,89 +1791,89 @@
 %{instdir}/program/jvmfwk3rc
 %{instdir}/program/kde-open-url
 %{instdir}/program/legacy_binfilters.rdb
-%{instdir}/program/libabp680*.so
-%{instdir}/program/libacc680*.so
+%{instdir}/program/libabp%{SOPOST}.so
+%{instdir}/program/libacc%{SOPOST}.so
 %{instdir}/program/libadabas2.so
 %{instdir}/program/libaffine_uno_uno.so
 %{instdir}/program/libavmedia*.so
-%{instdir}/program/libbasctl680*.so
-%{instdir}/program/libbf_sb680*.so
-%{instdir}/program/libbf_frm680*.so
-%{instdir}/program/libbf_go680*.so
-%{instdir}/program/libbf_migratefilter680*.so
-%{instdir}/program/libbf_ofa680*.so
-%{instdir}/program/libbf_sch680*.so
-%{instdir}/program/libbf_sd680*.so
-%{instdir}/program/libbf_sm680*.so
-%{instdir}/program/libbf_so680*.so
-%{instdir}/program/libbf_svx680*.so
-%{instdir}/program/libbf_sw680*.so
-%{instdir}/program/libbf_wrapper680*.so
-%{instdir}/program/libbf_xo680*.so
-%{instdir}/program/libbib680*.so
-%{instdir}/program/libbindet680*.so
+%{instdir}/program/libbasctl%{SOPOST}.so
+%{instdir}/program/libbf_sb%{SOPOST}.so
+%{instdir}/program/libbf_frm%{SOPOST}.so
+%{instdir}/program/libbf_go%{SOPOST}.so
+%{instdir}/program/libbf_migratefilter%{SOPOST}.so
+%{instdir}/program/libbf_ofa%{SOPOST}.so
+%{instdir}/program/libbf_sch%{SOPOST}.so
+%{instdir}/program/libbf_sd%{SOPOST}.so
+%{instdir}/program/libbf_sm%{SOPOST}.so
+%{instdir}/program/libbf_so%{SOPOST}.so
+%{instdir}/program/libbf_svx%{SOPOST}.so
+%{instdir}/program/libbf_sw%{SOPOST}.so
+%{instdir}/program/libbf_wrapper%{SOPOST}.so
+%{instdir}/program/libbf_xo%{SOPOST}.so
+%{instdir}/program/libbib%{SOPOST}.so
+%{instdir}/program/libbindet%{SOPOST}.so
 %{instdir}/program/libcached1.so
-%{instdir}/program/libcanvastools680*.so
-%{instdir}/program/libchart*680*.so
+%{instdir}/program/libcanvastools%{SOPOST}.so
+%{instdir}/program/libchart*%{SOPOST}.so
 %{instdir}/program/libcollator_data.so
-%{instdir}/program/libcppcanvas680*.so
+%{instdir}/program/libcppcanvas%{SOPOST}.so
 %{instdir}/program/libcppu.so
 %{instdir}/program/libcppu.so.3
 %{instdir}/program/libcppuhelper3gcc3.so
 %{instdir}/program/libcppuhelpergcc3.so
 %{instdir}/program/libcppuhelpergcc3.so.3
-%{instdir}/program/libctl680*.so
-%{instdir}/program/libcui680*.so
-%{instdir}/program/libdba680*.so
-%{instdir}/program/libdbacfg680*.so
-%{instdir}/program/libdbase680*.so
-%{instdir}/program/libdbaxml680*.so
-%{instdir}/program/libdbp680*.so
+%{instdir}/program/libctl%{SOPOST}.so
+%{instdir}/program/libcui%{SOPOST}.so
+%{instdir}/program/libdba%{SOPOST}.so
+%{instdir}/program/libdbacfg%{SOPOST}.so
+%{instdir}/program/libdbase%{SOPOST}.so
+%{instdir}/program/libdbaxml%{SOPOST}.so
+%{instdir}/program/libdbp%{SOPOST}.so
 %{instdir}/program/libdbpool2.so
-%{instdir}/program/libdbtools680*.so
-%{instdir}/program/libdbu680*.so
-%{instdir}/program/libdeploymentmisc680*.so
+%{instdir}/program/libdbtools%{SOPOST}.so
+%{instdir}/program/libdbu%{SOPOST}.so
+%{instdir}/program/libdeploymentmisc%{SOPOST}.so
 %{instdir}/program/libdict_ja.so
 %{instdir}/program/libdict_zh.so
-%{instdir}/program/libeggtray680*.so
+%{instdir}/program/libeggtray%{SOPOST}.so
 %{instdir}/program/libembobj.so
 %{instdir}/program/libemboleobj.so
 %{instdir}/program/libevoab*.so
 %{instdir}/program/libevtatt.so
-%{instdir}/program/libegi680*.so    
-%{instdir}/program/libeme680*.so
-%{instdir}/program/libemp680*.so    
-%{instdir}/program/libepb680*.so
-%{instdir}/program/libepg680*.so    
-%{instdir}/program/libepp680*.so
-%{instdir}/program/libeps680*.so    
-%{instdir}/program/libept680*.so
-%{instdir}/program/libera680*.so    
-%{instdir}/program/libeti680*.so
-%{instdir}/program/libexp680*.so    
-%{instdir}/program/libicd680*.so
-%{instdir}/program/libicg680*.so
-%{instdir}/program/libidx680*.so
-%{instdir}/program/libime680*.so
+%{instdir}/program/libegi%{SOPOST}.so    
+%{instdir}/program/libeme%{SOPOST}.so
+%{instdir}/program/libemp%{SOPOST}.so    
+%{instdir}/program/libepb%{SOPOST}.so
+%{instdir}/program/libepg%{SOPOST}.so    
+%{instdir}/program/libepp%{SOPOST}.so
+%{instdir}/program/libeps%{SOPOST}.so    
+%{instdir}/program/libept%{SOPOST}.so
+%{instdir}/program/libera%{SOPOST}.so    
+%{instdir}/program/libeti%{SOPOST}.so
+%{instdir}/program/libexp%{SOPOST}.so    
+%{instdir}/program/libicd%{SOPOST}.so
+%{instdir}/program/libicg%{SOPOST}.so
+%{instdir}/program/libidx%{SOPOST}.so
+%{instdir}/program/libime%{SOPOST}.so
 %{instdir}/program/libindex_data.so
-%{instdir}/program/libipb680*.so
-%{instdir}/program/libipd680*.so
-%{instdir}/program/libips680*.so
-%{instdir}/program/libipt680*.so
-%{instdir}/program/libipx680*.so
-%{instdir}/program/libira680*.so
-%{instdir}/program/libitg680*.so
-%{instdir}/program/libiti680*.so
+%{instdir}/program/libipb%{SOPOST}.so
+%{instdir}/program/libipd%{SOPOST}.so
+%{instdir}/program/libips%{SOPOST}.so
+%{instdir}/program/libipt%{SOPOST}.so
+%{instdir}/program/libipx%{SOPOST}.so
+%{instdir}/program/libira%{SOPOST}.so
+%{instdir}/program/libitg%{SOPOST}.so
+%{instdir}/program/libiti%{SOPOST}.so
 %{instdir}/program/libofficebean.so
-%{instdir}/program/libfile680*.so
+%{instdir}/program/libfile%{SOPOST}.so
 %{instdir}/program/libfilterconfig1.so
-%{instdir}/program/libflat680*.so
-%{instdir}/program/libfrm680*.so
+%{instdir}/program/libflat%{SOPOST}.so
+%{instdir}/program/libfrm%{SOPOST}.so
 %{instdir}/program/libgcc3_uno.so
-%{instdir}/program/libguesslang680*.so
-%{instdir}/program/libhelplinker680*.so
+%{instdir}/program/libguesslang%{SOPOST}.so
+%{instdir}/program/libhelplinker%{SOPOST}.so
 %{instdir}/program/libhsqldb2.so
-%{instdir}/program/libhyphen680*.so
+%{instdir}/program/libhyphen%{SOPOST}.so
 %{instdir}/program/libi18nregexpgcc3.so
 %{instdir}/program/libjava_uno.so
 %{instdir}/program/libjdbc2.so
@@ -1880,9 +1884,9 @@
 %{instdir}/program/libjvmaccessgcc3.so.3
 %{instdir}/program/libjvmfwk.so
 %{instdir}/program/libjvmfwk.so.3
-%{instdir}/program/liblegacy_binfilters680*.so
-%{instdir}/program/liblng680*.so
-%{instdir}/program/liblog680*.so
+%{instdir}/program/liblegacy_binfilters%{SOPOST}.so
+%{instdir}/program/liblng%{SOPOST}.so
+%{instdir}/program/liblog%{SOPOST}.so
 %{instdir}/program/liblocaledata_en.so
 %{instdir}/program/liblocaledata_es.so
 %{instdir}/program/liblocaledata_euro.so
@@ -1892,17 +1896,17 @@
 %{instdir}/program/libnpsoplugin.so
 %{instdir}/program/libodbc2.so
 %{instdir}/program/libodbcbase2.so
-%{instdir}/program/liboffacc680*.so
-%{instdir}/program/libpcr680*.so
-%{instdir}/program/libpdffilter680*.so
-%{instdir}/program/libpl680*.so
-%{instdir}/program/libpreload680*.so
-%{instdir}/program/libprotocolhandler680*.so
-%{instdir}/program/libqstart_gtk680*.so
+%{instdir}/program/liboffacc%{SOPOST}.so
+%{instdir}/program/libpcr%{SOPOST}.so
+%{instdir}/program/libpdffilter%{SOPOST}.so
+%{instdir}/program/libpl%{SOPOST}.so
+%{instdir}/program/libpreload%{SOPOST}.so
+%{instdir}/program/libprotocolhandler%{SOPOST}.so
+%{instdir}/program/libqstart_gtk%{SOPOST}.so
 %{instdir}/program/librecentfile.so
 %{instdir}/program/libreg.so
 %{instdir}/program/libreg.so.3
-%{instdir}/program/libres680*.so
+%{instdir}/program/libres%{SOPOST}.so
 %{instdir}/program/librmcxt.so
 %{instdir}/program/librmcxt.so.3
 %{instdir}/program/libsal.so
@@ -1910,24 +1914,24 @@
 %{instdir}/program/libsalhelper3gcc3.so
 %{instdir}/program/libsalhelpergcc3.so
 %{instdir}/program/libsalhelpergcc3.so.3
-%{instdir}/program/libscn680*.so
+%{instdir}/program/libscn%{SOPOST}.so
 %{instdir}/program/libscriptframe.so
-%{instdir}/program/libsd680*.so
+%{instdir}/program/libsd%{SOPOST}.so
 %{instdir}/program/libsdbc2.so
-%{instdir}/program/libsdbt680*so
-%{instdir}/program/libsdd680*.so
-%{instdir}/program/libsdui680*.so
-%{instdir}/program/libspa680*.so
-%{instdir}/program/libspell680*.so
+%{instdir}/program/libsdbt%{SOPOST}so
+%{instdir}/program/libsdd%{SOPOST}.so
+%{instdir}/program/libsdui%{SOPOST}.so
+%{instdir}/program/libspa%{SOPOST}.so
+%{instdir}/program/libspell%{SOPOST}.so
 %{instdir}/program/libsrtrs1.so
 %{instdir}/program/libstore.so
 %{instdir}/program/libstore.so.3
-%{instdir}/program/libsts680*.so
-%{instdir}/program/libsvx680*.so
-%{instdir}/program/libsw680*.so
+%{instdir}/program/libsts%{SOPOST}.so
+%{instdir}/program/libsvx%{SOPOST}.so
+%{instdir}/program/libsw%{SOPOST}.so
 %{instdir}/program/libtextconv_dict.so
-%{instdir}/program/libtextconversiondlgs680*.so
-%{instdir}/program/libtfu680*.so
+%{instdir}/program/libtextconversiondlgs%{SOPOST}.so
+%{instdir}/program/libtfu%{SOPOST}.so
 %{instdir}/program/libtvhlp1.so
 %{instdir}/program/libucbhelper4gcc3.so
 %{instdir}/program/libucpchelp1.so
@@ -1944,21 +1948,21 @@
 %{instdir}/program/libuno_sal.so.3
 %{instdir}/program/libuno_salhelpergcc3.so
 %{instdir}/program/libuno_salhelpergcc3.so.3
-%{instdir}/program/libunoxml680*.so
+%{instdir}/program/libunoxml%{SOPOST}.so
 %{instdir}/program/libunsafe_uno_uno.so
-%{instdir}/program/libupdchk680*.so
+%{instdir}/program/libupdchk%{SOPOST}.so
 %{instdir}/program/liburp_uno.so
-%{instdir}/program/libuui680*.so
-%{instdir}/program/libvclplug_gen680*.so
-%{instdir}/program/libvclplug_gtk680*.so
-%{instdir}/program/libxmlfa680*.so
-%{instdir}/program/libxmlfd680*.so
-%{instdir}/program/libxmx680*.so
-%{instdir}/program/libxof680*.so
+%{instdir}/program/libuui%{SOPOST}.so
+%{instdir}/program/libvclplug_gen%{SOPOST}.so
+%{instdir}/program/libvclplug_gtk%{SOPOST}.so
+%{instdir}/program/libxmlfa%{SOPOST}.so
+%{instdir}/program/libxmlfd%{SOPOST}.so
+%{instdir}/program/libxmx%{SOPOST}.so
+%{instdir}/program/libxof%{SOPOST}.so
 %{instdir}/program/libxsec_fw.so
 %{instdir}/program/libxsec_xmlsec.so
-%{instdir}/program/libxsltdlg680*.so
-%{instdir}/program/libxsltfilter680*.so
+%{instdir}/program/libxsltdlg%{SOPOST}.so
+%{instdir}/program/libxsltfilter%{SOPOST}.so
 %{instdir}/program/libxstor.so
 %{instdir}/program/migrationoo2.uno.so
 %{instdir}/program/namingservice.uno.so
@@ -1974,66 +1978,66 @@
 %{instdir}/program/reflection.uno.so
 %{instdir}/program/remotebridge.uno.so
 %dir %{instdir}/program/resource
-%{instdir}/program/resource/avmedia680en-US.res
-%{instdir}/program/resource/abp680en-US.res
-%{instdir}/program/resource/acc680en-US.res
-%{instdir}/program/resource/basctl680en-US.res
-%{instdir}/program/resource/bf_frm680en-US.res
-%{instdir}/program/resource/bf_ofa680en-US.res
-%{instdir}/program/resource/bf_sch680en-US.res
-%{instdir}/program/resource/bf_sd680en-US.res
-%{instdir}/program/resource/bf_svx680en-US.res
-%{instdir}/program/resource/bf_sw680en-US.res
-%{instdir}/program/resource/bib680en-US.res
-%{instdir}/program/resource/cal680en-US.res
-%{instdir}/program/resource/chartcontroller680en-US.res
-%{instdir}/program/resource/dba680en-US.res
-%{instdir}/program/resource/dbp680en-US.res
-%{instdir}/program/resource/dbu680en-US.res
-%{instdir}/program/resource/dbw680en-US.res
-%{instdir}/program/resource/deployment680en-US.res
-%{instdir}/program/resource/deploymentgui680en-US.res
-%{instdir}/program/resource/dkt680en-US.res
-%{instdir}/program/resource/egi680en-US.res
-%{instdir}/program/resource/eme680en-US.res
-%{instdir}/program/resource/epb680en-US.res
-%{instdir}/program/resource/epg680en-US.res
-%{instdir}/program/resource/epp680en-US.res
-%{instdir}/program/resource/eps680en-US.res
-%{instdir}/program/resource/ept680en-US.res
-%{instdir}/program/resource/eur680en-US.res
-%{instdir}/program/resource/fps_office680en-US.res
-%{instdir}/program/resource/frm680en-US.res
-%{instdir}/program/resource/fwe680en-US.res
-%{instdir}/program/resource/gal680en-US.res
-%{instdir}/program/resource/imp680en-US.res
-%{instdir}/program/resource/ofa680en-US.res
-%{instdir}/program/resource/ooo680en-US.res
-%{instdir}/program/resource/pcr680en-US.res
-%{instdir}/program/resource/pdffilter680en-US.res
-%{instdir}/program/resource/preload680en-US.res
-%{instdir}/program/resource/productregistration680en-US.res
-%{instdir}/program/resource/san680en-US.res
-%{instdir}/program/resource/sb680en-US.res
-%{instdir}/program/resource/sd680en-US.res
-%{instdir}/program/resource/sdbcl680en-US.res
-%{instdir}/program/resource/sfx680en-US.res
-%{instdir}/program/resource/spa680en-US.res
-%{instdir}/program/resource/sdbt680en-US.res
-%{instdir}/program/resource/svs680en-US.res
-%{instdir}/program/resource/svt680en-US.res
-%{instdir}/program/resource/svx680en-US.res
-%{instdir}/program/resource/sw680en-US.res
-%{instdir}/program/resource/textconversiondlgs680en-US.res
-%{instdir}/program/resource/tfu680en-US.res
-%{instdir}/program/resource/tk680en-US.res
-%{instdir}/program/resource/tpl680en-US.res
-%{instdir}/program/resource/uui680en-US.res
-%{instdir}/program/resource/updchk680en-US.res
-%{instdir}/program/resource/vcl680en-US.res
-%{instdir}/program/resource/wzi680en-US.res
-%{instdir}/program/resource/xmlsec680en-US.res
-%{instdir}/program/resource/xsltdlg680en-US.res
+%{instdir}/program/resource/avmedia%{UPD}en-US.res
+%{instdir}/program/resource/abp%{UPD}en-US.res
+%{instdir}/program/resource/acc%{UPD}en-US.res
+%{instdir}/program/resource/basctl%{UPD}en-US.res
+%{instdir}/program/resource/bf_frm%{UPD}en-US.res
+%{instdir}/program/resource/bf_ofa%{UPD}en-US.res
+%{instdir}/program/resource/bf_sch%{UPD}en-US.res
+%{instdir}/program/resource/bf_sd%{UPD}en-US.res
+%{instdir}/program/resource/bf_svx%{UPD}en-US.res
+%{instdir}/program/resource/bf_sw%{UPD}en-US.res
+%{instdir}/program/resource/bib%{UPD}en-US.res
+%{instdir}/program/resource/cal%{UPD}en-US.res
+%{instdir}/program/resource/chartcontroller%{UPD}en-US.res
+%{instdir}/program/resource/dba%{UPD}en-US.res
+%{instdir}/program/resource/dbp%{UPD}en-US.res
+%{instdir}/program/resource/dbu%{UPD}en-US.res
+%{instdir}/program/resource/dbw%{UPD}en-US.res
+%{instdir}/program/resource/deployment%{UPD}en-US.res
+%{instdir}/program/resource/deploymentgui%{UPD}en-US.res
+%{instdir}/program/resource/dkt%{UPD}en-US.res
+%{instdir}/program/resource/egi%{UPD}en-US.res
+%{instdir}/program/resource/eme%{UPD}en-US.res
+%{instdir}/program/resource/epb%{UPD}en-US.res
+%{instdir}/program/resource/epg%{UPD}en-US.res
+%{instdir}/program/resource/epp%{UPD}en-US.res
+%{instdir}/program/resource/eps%{UPD}en-US.res
+%{instdir}/program/resource/ept%{UPD}en-US.res
+%{instdir}/program/resource/eur%{UPD}en-US.res
+%{instdir}/program/resource/fps_office%{UPD}en-US.res
+%{instdir}/program/resource/frm%{UPD}en-US.res
+%{instdir}/program/resource/fwe%{UPD}en-US.res
+%{instdir}/program/resource/gal%{UPD}en-US.res
+%{instdir}/program/resource/imp%{UPD}en-US.res
+%{instdir}/program/resource/ofa%{UPD}en-US.res
+%{instdir}/program/resource/ooo%{UPD}en-US.res
+%{instdir}/program/resource/pcr%{UPD}en-US.res
+%{instdir}/program/resource/pdffilter%{UPD}en-US.res
+%{instdir}/program/resource/preload%{UPD}en-US.res
+%{instdir}/program/resource/productregistration%{UPD}en-US.res
+%{instdir}/program/resource/san%{UPD}en-US.res
+%{instdir}/program/resource/sb%{UPD}en-US.res
+%{instdir}/program/resource/sd%{UPD}en-US.res
+%{instdir}/program/resource/sdbcl%{UPD}en-US.res
+%{instdir}/program/resource/sfx%{UPD}en-US.res
+%{instdir}/program/resource/spa%{UPD}en-US.res
+%{instdir}/program/resource/sdbt%{UPD}en-US.res
+%{instdir}/program/resource/svs%{UPD}en-US.res
+%{instdir}/program/resource/svt%{UPD}en-US.res
+%{instdir}/program/resource/svx%{UPD}en-US.res
+%{instdir}/program/resource/sw%{UPD}en-US.res
+%{instdir}/program/resource/textconversiondlgs%{UPD}en-US.res
+%{instdir}/program/resource/tfu%{UPD}en-US.res
+%{instdir}/program/resource/tk%{UPD}en-US.res
+%{instdir}/program/resource/tpl%{UPD}en-US.res
+%{instdir}/program/resource/uui%{UPD}en-US.res
+%{instdir}/program/resource/updchk%{UPD}en-US.res
+%{instdir}/program/resource/vcl%{UPD}en-US.res
+%{instdir}/program/resource/wzi%{UPD}en-US.res
+%{instdir}/program/resource/xmlsec%{UPD}en-US.res
+%{instdir}/program/resource/xsltdlg%{UPD}en-US.res
 %{instdir}/program/sax.uno.so
 %{instdir}/program/senddoc
 %{instdir}/program/services.rdb
@@ -2048,7 +2052,7 @@
 %{instdir}/program/spadmin
 %{instdir}/program/spadmin.bin
 %{instdir}/program/streams.uno.so
-%{instdir}/program/stringresource680*.uno.so
+%{instdir}/program/stringresource%{SOPOST}.uno.so
 %{instdir}/program/sunjavaplugin.so
 %{instdir}/program/svtmisc.uno.so
 %{instdir}/program/syssh.uno.so
@@ -2292,7 +2296,7 @@
 %{instdir}/share/xslt/import/spreadsheetml
 %{instdir}/share/xslt/import/wordml
 #spellchecking lib
-%{instdir}/program/liblnth680*.so
+%{instdir}/program/liblnth%{SOPOST}.so
 #launchers
 %{_bindir}/openoffice.org-1.9
 %{_bindir}/openoffice.org-2.0
@@ -2319,36 +2323,36 @@
 %{instdir}/program/fsstorage.uno.so
 %{instdir}/program/gconfbe1.uno.so
 %{instdir}/program/i18npool.uno.so
-%{instdir}/program/libbasegfx680*.so
+%{instdir}/program/libbasegfx%{SOPOST}.so
 %{instdir}/program/libcomphelp4gcc3.so
-%{instdir}/program/libdtransX11680*.so
+%{instdir}/program/libdtransX11%{SOPOST}.so
 %{instdir}/program/libfileacc.so
-%{instdir}/program/libfwe680*.so
-%{instdir}/program/libfwi680*.so
-%{instdir}/program/libfwk680*.so
-%{instdir}/program/libfwl680*.so
-%{instdir}/program/libfwm680*.so
-%{instdir}/program/libgo680*.so
+%{instdir}/program/libfwe%{SOPOST}.so
+%{instdir}/program/libfwi%{SOPOST}.so
+%{instdir}/program/libfwk%{SOPOST}.so
+%{instdir}/program/libfwl%{SOPOST}.so
+%{instdir}/program/libfwm%{SOPOST}.so
+%{instdir}/program/libgo%{SOPOST}.so
 %{instdir}/program/libi18nisolang*.so
 %{instdir}/program/libi18nutilgcc3.so
-%{instdir}/program/libj680*_g.so
+%{instdir}/program/libj%{SOPOST}_g.so
 %{instdir}/program/libpackage2.so
-%{instdir}/program/libpsp680*.so
-%{instdir}/program/libsb680*.so
-%{instdir}/program/libsfx680*.so
-%{instdir}/program/libsot680*.so
-%{instdir}/program/libspl680*.so
-%{instdir}/program/libsvl680*.so
-%{instdir}/program/libsvt680*.so
-%{instdir}/program/libtk680*.so
-%{instdir}/program/libtl680*.so
+%{instdir}/program/libpsp%{SOPOST}.so
+%{instdir}/program/libsb%{SOPOST}.so
+%{instdir}/program/libsfx%{SOPOST}.so
+%{instdir}/program/libsot%{SOPOST}.so
+%{instdir}/program/libspl%{SOPOST}.so
+%{instdir}/program/libsvl%{SOPOST}.so
+%{instdir}/program/libsvt%{SOPOST}.so
+%{instdir}/program/libtk%{SOPOST}.so
+%{instdir}/program/libtl%{SOPOST}.so
 %{instdir}/program/libucb1.so
 %{instdir}/program/libucpfile1.so
-%{instdir}/program/libutl680*.so
-%{instdir}/program/libvcl680*.so
+%{instdir}/program/libutl%{SOPOST}.so
+%{instdir}/program/libvcl%{SOPOST}.so
 %{instdir}/program/libvos3gcc3.so
-%{instdir}/program/libxcr680*.so
-%{instdir}/program/libxo680*.so
+%{instdir}/program/libxcr%{SOPOST}.so
+%{instdir}/program/libxo%{SOPOST}.so
 %{instdir}/program/localebe1.uno.so
 %{instdir}/program/sysmgr1.uno.so
 %{instdir}/program/ucpgvfs1.uno.so
@@ -2396,12 +2400,12 @@
 %defattr(-,root,root,-)
 %{instdir}/help/en/sdatabase.*
 %{instdir}/program/sbase
-%{instdir}/program/librpt*680*.so
+%{instdir}/program/librpt*%{SOPOST}.so
 %dir %{instdir}/program/resource
-%{instdir}/program/resource/cnr680en-US.res
-%{instdir}/program/resource/rpt680en-US.res
-%{instdir}/program/resource/rptui680en-US.res
-%{instdir}/program/resource/sdberr680en-US.res
+%{instdir}/program/resource/cnr%{UPD}en-US.res
+%{instdir}/program/resource/rpt%{UPD}en-US.res
+%{instdir}/program/resource/rptui%{UPD}en-US.res
+%{instdir}/program/resource/sdberr%{UPD}en-US.res
 %dir %{instdir}/share/registry
 %dir %{instdir}/share/registry/modules
 %dir %{instdir}/share/registry/modules/org
@@ -2447,18 +2451,18 @@
 %dir %{instdir}/help/en
 %{instdir}/help/en/scalc.*
 %dir %{instdir}/program
-%{instdir}/program/libanalysis680*.so
-%{instdir}/program/libbf_sc680*.so
-%{instdir}/program/libcalc680*.so
-%{instdir}/program/libdate680*.so
-%{instdir}/program/libsc680*.so
-%{instdir}/program/libscd680*.so
-%{instdir}/program/libscui680*.so
+%{instdir}/program/libanalysis%{SOPOST}.so
+%{instdir}/program/libbf_sc%{SOPOST}.so
+%{instdir}/program/libcalc%{SOPOST}.so
+%{instdir}/program/libdate%{SOPOST}.so
+%{instdir}/program/libsc%{SOPOST}.so
+%{instdir}/program/libscd%{SOPOST}.so
+%{instdir}/program/libscui%{SOPOST}.so
 %dir %{instdir}/program/resource
-%{instdir}/program/resource/analysis680en-US.res
-%{instdir}/program/resource/bf_sc680en-US.res
-%{instdir}/program/resource/date680en-US.res
-%{instdir}/program/resource/sc680en-US.res
+%{instdir}/program/resource/analysis%{UPD}en-US.res
+%{instdir}/program/resource/bf_sc%{UPD}en-US.res
+%{instdir}/program/resource/date%{UPD}en-US.res
+%{instdir}/program/resource/sc%{UPD}en-US.res
 %{instdir}/program/scalc
 %{instdir}/program/scalc.bin
 %dir %{instdir}/share
@@ -2494,7 +2498,7 @@
 %{_datadir}/mimelnk/application/*spreadsheet*
 %{_bindir}/oocalc
 #vba
-%{instdir}/program/libvbaobj680*.uno.so
+%{instdir}/program/libvbaobj%{SOPOST}.uno.so
 
 %post calc
 update-desktop-database -q %{_datadir}/applications
@@ -2570,9 +2574,9 @@
 %{instdir}/help/en/swriter.*
 %dir %{instdir}/program
 %{instdir}/program/libhwp.so
-%{instdir}/program/libswd680*.so
-%{instdir}/program/libswui680*.so
-%{instdir}/program/libwpft680*.so
+%{instdir}/program/libswd%{SOPOST}.so
+%{instdir}/program/libswui%{SOPOST}.so
+%{instdir}/program/libwpft%{SOPOST}.so
 %{instdir}/program/swriter
 %{instdir}/program/swriter.bin
 %dir %{instdir}/share
@@ -2687,11 +2691,11 @@
 %dir %{instdir}/help/en
 %{instdir}/help/en/smath.*
 %dir %{instdir}/program
-%{instdir}/program/libsm680*.so
-%{instdir}/program/libsmd680*.so
+%{instdir}/program/libsm%{SOPOST}.so
+%{instdir}/program/libsmd%{SOPOST}.so
 %dir %{instdir}/program/resource
-%{instdir}/program/resource/bf_sm680en-US.res
-%{instdir}/program/resource/sm680en-US.res
+%{instdir}/program/resource/bf_sm%{UPD}en-US.res
+%{instdir}/program/resource/sm%{UPD}en-US.res
 %{instdir}/program/smath
 %dir %{instdir}/share/registry
 %dir %{instdir}/share/registry/data
@@ -2734,8 +2738,8 @@
 %defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/program
-%{instdir}/program/libflash680*.so
-%{instdir}/program/libsvgfilter680*.so
+%{instdir}/program/libflash%{SOPOST}.so
+%{instdir}/program/libsvgfilter%{SOPOST}.so
 %dir %{instdir}/share/registry
 %dir %{instdir}/share/registry/modules
 %dir %{instdir}/share/registry/modules/org
@@ -2795,13 +2799,13 @@
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/hid.lst
-%{instdir}/program/libcommuni680*.so
+%{instdir}/program/libcommuni%{SOPOST}.so
 %{instdir}/program/libsalalloc_malloc.so.3
-%{instdir}/program/libsimplecm680*.so
+%{instdir}/program/libsimplecm%{SOPOST}.so
 %{instdir}/program/testtoolrc
 %{instdir}/program/testtool.bin
 %dir %{instdir}/program/resource
-%{instdir}/program/resource/stt680en-US.res
+%{instdir}/program/resource/stt%{UPD}en-US.res
 
 %files sdk
 %defattr(-,root,root,-)
@@ -2837,8 +2841,8 @@
 %defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/program
-%{instdir}/program/libbasebmp680*.so
-%{instdir}/program/libvclplug_svp680*.so
+%{instdir}/program/libbasebmp%{SOPOST}.so
+%{instdir}/program/libvclplug_svp%{SOPOST}.so
 
 %files pyuno
 %defattr(-,root,root,-)
@@ -2879,6 +2883,8 @@
 * Sun Mar 09 2008 Caolan McNamara  - 1:2.4.0-10.1
 - next release candidate
 - rhbz#293791 Restore draw back to the menus and revert to upstream app names
+- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
 
 * Thu Mar 06 2008 Caolan McNamara  - 1:2.4.0-9.1
 - next release candidate


--- openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 10:46:13 2008
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 10 Mar 2008 10:46:13 GMT
Subject: rpms/openssl/devel ca-bundle.crt,1.8,1.9 openssl.spec,1.103,1.104
Message-ID: <200803101046.m2AAkDZA004007@cvs-int.fedora.redhat.com>

Author: jorton

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

Modified Files:
	ca-bundle.crt openssl.spec 
Log Message:
* Mon Mar 10 2008 Joe Orton  0.9.8g-6
- update to new root CA bundle from mozilla.org (r1.45)



Index: ca-bundle.crt
===================================================================
RCS file: /cvs/extras/rpms/openssl/devel/ca-bundle.crt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ca-bundle.crt	15 Oct 2007 15:20:47 -0000	1.8
+++ ca-bundle.crt	10 Mar 2008 10:45:35 -0000	1.9
@@ -3,7 +3,7 @@
 #
 # Source: mozilla/security/nss/lib/ckfw/builtins/certdata.txt
 #
-# Generated from certdata.txt RCS revision 1.44
+# Generated from certdata.txt RCS revision 1.45
 #
 Certificate:
     Data:
@@ -9073,3 +9073,729 @@
 -----END CERTIFICATE-----
 
 
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            44:af:b0:80:d6:a3:27:ba:89:30:39:86:2e:f8:40:6b
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: O=Digital Signature Trust Co., CN=DST Root CA X3
+        Validity
+            Not Before: Sep 30 21:12:19 2000 GMT
+            Not After : Sep 30 14:01:15 2021 GMT
+        Subject: O=Digital Signature Trust Co., CN=DST Root CA X3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:df:af:e9:97:50:08:83:57:b4:cc:62:65:f6:90:
+                    82:ec:c7:d3:2c:6b:30:ca:5b:ec:d9:c3:7d:c7:40:
+                    c1:18:14:8b:e0:e8:33:76:49:2a:e3:3f:21:49:93:
+                    ac:4e:0e:af:3e:48:cb:65:ee:fc:d3:21:0f:65:d2:
+                    2a:d9:32:8f:8c:e5:f7:77:b0:12:7b:b5:95:c0:89:
+                    a3:a9:ba:ed:73:2e:7a:0c:06:32:83:a2:7e:8a:14:
+                    30:cd:11:a0:e1:2a:38:b9:79:0a:31:fd:50:bd:80:
+                    65:df:b7:51:63:83:c8:e2:88:61:ea:4b:61:81:ec:
+                    52:6b:b9:a2:e2:4b:1a:28:9f:48:a3:9e:0c:da:09:
+                    8e:3e:17:2e:1e:dd:20:df:5b:c6:2a:8a:ab:2e:bd:
+                    70:ad:c5:0b:1a:25:90:74:72:c5:7b:6a:ab:34:d6:
+                    30:89:ff:e5:68:13:7b:54:0b:c8:d6:ae:ec:5a:9c:
+                    92:1e:3d:64:b3:8c:c6:df:bf:c9:41:70:ec:16:72:
+                    d5:26:ec:38:55:39:43:d0:fc:fd:18:5c:40:f1:97:
+                    eb:d5:9a:9b:8d:1d:ba:da:25:b9:c6:d8:df:c1:15:
+                    02:3a:ab:da:6e:f1:3e:2e:f5:5c:08:9c:3c:d6:83:
+                    69:e4:10:9b:19:2a:b6:29:57:e3:e5:3d:9b:9f:f0:
+                    02:5d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                C4:A7:B1:A4:7B:2C:71:FA:DB:E1:4B:90:75:FF:C4:15:60:85:89:10
+    Signature Algorithm: sha1WithRSAEncryption
+        a3:1a:2c:9b:17:00:5c:a9:1e:ee:28:66:37:3a:bf:83:c7:3f:
+        4b:c3:09:a0:95:20:5d:e3:d9:59:44:d2:3e:0d:3e:bd:8a:4b:
+        a0:74:1f:ce:10:82:9c:74:1a:1d:7e:98:1a:dd:cb:13:4b:b3:
+        20:44:e4:91:e9:cc:fc:7d:a5:db:6a:e5:fe:e6:fd:e0:4e:dd:
+        b7:00:3a:b5:70:49:af:f2:e5:eb:02:f1:d1:02:8b:19:cb:94:
+        3a:5e:48:c4:18:1e:58:19:5f:1e:02:5a:f0:0c:f1:b1:ad:a9:
+        dc:59:86:8b:6e:e9:91:f5:86:ca:fa:b9:66:33:aa:59:5b:ce:
+        e2:a7:16:73:47:cb:2b:cc:99:b0:37:48:cf:e3:56:4b:f5:cf:
+        0f:0c:72:32:87:c6:f0:44:bb:53:72:6d:43:f5:26:48:9a:52:
+        67:b7:58:ab:fe:67:76:71:78:db:0d:a2:56:14:13:39:24:31:
+        85:a2:a8:02:5a:30:47:e1:dd:50:07:bc:02:09:90:00:eb:64:
+        63:60:9b:16:bc:88:c9:12:e6:d2:7d:91:8b:f9:3d:32:8d:65:
+        b4:e9:7c:b1:57:76:ea:c5:b6:28:39:bf:15:65:1c:c8:f6:77:
+        96:6a:0a:8d:77:0b:d8:91:0b:04:8e:07:db:29:b6:0a:ee:9d:
+        82:35:35:10
+SHA1 Fingerprint=DA:C9:02:4F:54:D8:F6:DF:94:93:5F:B1:73:26:38:CA:6A:D7:7C:13
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            0d:5e:99:0a:d6:9d:b7:78:ec:d8:07:56:3b:86:15:d9
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=Digital Signature Trust, OU=DST ACES, CN=DST ACES CA X6
+        Validity
+            Not Before: Nov 20 21:19:58 2003 GMT
+            Not After : Nov 20 21:19:58 2017 GMT
+        Subject: C=US, O=Digital Signature Trust, OU=DST ACES, CN=DST ACES CA X6
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:b9:3d:f5:2c:c9:94:dc:75:8a:95:5d:63:e8:84:
+                    77:76:66:b9:59:91:5c:46:dd:92:3e:9f:f9:0e:03:
+                    b4:3d:61:92:bd:23:26:b5:63:ee:92:d2:9e:d6:3c:
+                    c8:0d:90:5f:64:81:b1:a8:08:0d:4c:d8:f9:d3:05:
+                    28:52:b4:01:25:c5:95:1c:0c:7e:3e:10:84:75:cf:
+                    c1:19:91:63:cf:e8:a8:91:88:b9:43:52:bb:80:b1:
+                    55:89:8b:31:fa:d0:b7:76:be:41:3d:30:9a:a4:22:
+                    25:17:73:e8:1e:e2:d3:ac:2a:bd:5b:38:21:d5:2a:
+                    4b:d7:55:7d:e3:3a:55:bd:d7:6d:6b:02:57:6b:e6:
+                    47:7c:08:c8:82:ba:de:a7:87:3d:a1:6d:b8:30:56:
+                    c2:b3:02:81:5f:2d:f5:e2:9a:30:18:28:b8:66:d3:
+                    cb:01:96:6f:ea:8a:45:55:d6:e0:9d:ff:67:2b:17:
+                    02:a6:4e:1a:6a:11:0b:7e:b7:7b:e7:98:d6:8c:76:
+                    6f:c1:3b:db:50:93:7e:e5:d0:8e:1f:37:b8:bd:ba:
+                    c6:9f:6c:e9:7c:33:f2:32:3c:26:47:fa:27:24:02:
+                    c9:7e:1d:5b:88:42:13:6a:35:7c:7d:35:e9:2e:66:
+                    91:72:93:d5:32:26:c4:74:f5:53:a3:b3:5d:9a:f6:
+                    09:cb
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Digital Signature, Non Repudiation, Certificate Sign, CRL Sign
+            X509v3 Subject Alternative Name: 
+                email:pki-ops at trustdst.com
+            X509v3 Certificate Policies: 
+                Policy: 2.16.840.1.101.3.2.1.1.1
+                  CPS: http://www.trustdst.com/certificates/policy/ACES-index.html
+
+            X509v3 Subject Key Identifier: 
+                09:72:06:4E:18:43:0F:E5:D6:CC:C3:6A:8B:31:7B:78:8F:A8:83:B8
+    Signature Algorithm: sha1WithRSAEncryption
+        a3:d8:8e:d6:b2:db:ce:05:e7:32:cd:01:d3:04:03:e5:76:e4:
+        56:2b:9c:99:90:e8:08:30:6c:df:7d:3d:ee:e5:bf:b5:24:40:
+        84:49:e1:d1:28:ae:c4:c2:3a:53:30:88:f1:f5:77:6e:51:ca:
+        fa:ff:99:af:24:5f:1b:a0:fd:f2:ac:84:ca:df:a9:f0:5f:04:
+        2e:ad:16:bf:21:97:10:81:3d:e3:ff:87:8d:32:dc:94:e5:47:
+        8a:5e:6a:13:c9:94:95:3d:d2:ee:c8:34:95:d0:80:d4:ad:32:
+        08:80:54:3c:e0:bd:52:53:d7:52:7c:b2:69:3f:7f:7a:cf:6a:
+        74:ca:fa:04:2a:9c:4c:5a:06:a5:e9:20:ad:45:66:0f:69:f1:
+        dd:bf:e9:e3:32:8b:fa:e0:c1:86:4d:72:3c:2e:d8:93:78:0a:
+        2a:f8:d8:d2:27:3d:19:89:5f:5a:7b:8a:3b:cc:0c:da:51:ae:
+        c7:0b:f7:2b:b0:37:05:ec:bc:57:23:e2:38:d2:9b:68:f3:56:
+        12:88:4f:42:7c:b8:31:c4:b5:db:e4:c8:21:34:e9:48:11:35:
+        ee:fa:c7:92:57:c5:9f:34:e4:c7:f6:f7:0e:0b:4c:9c:68:78:
+        7b:71:31:c7:eb:1e:e0:67:41:f3:b7:a0:a7:cd:e5:7a:33:36:
+        6a:fa:9a:2b
+SHA1 Fingerprint=40:54:DA:6F:1C:3F:40:74:AC:ED:0F:EC:CD:DB:79:D1:53:FB:90:1D
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
+ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
+MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
+VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
+FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
+ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
+gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
+fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
+ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
+ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
+c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
+dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
+aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
+hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
+QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
+h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
+rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
+9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: CN=T\xC3\x9CRKTRUST Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1, C=TR, L=ANKARA, O=(c) 2005 T\xC3\x9CRKTRUST Bilgi \xC4\xB0leti\xC5\x9Fim ve Bili\xC5\x9Fim G\xC3\xBCvenli\xC4\x9Fi Hizmetleri A.\xC5\x9E.
+        Validity
+            Not Before: May 13 10:27:17 2005 GMT
+            Not After : Mar 22 10:27:17 2015 GMT
+        Subject: CN=T\xC3\x9CRKTRUST Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1, C=TR, L=ANKARA, O=(c) 2005 T\xC3\x9CRKTRUST Bilgi \xC4\xB0leti\xC5\x9Fim ve Bili\xC5\x9Fim G\xC3\xBCvenli\xC4\x9Fi Hizmetleri A.\xC5\x9E.
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:ca:52:05:d6:63:03:d8:1c:5f:dd:d2:7b:5d:f2:
+                    0c:60:61:5b:6b:3b:74:2b:78:0d:7d:45:bd:22:74:
+                    e8:8c:03:c1:c6:11:2a:3d:95:bc:a9:94:b0:bb:91:
+                    97:c8:69:7c:84:c5:b4:91:6c:6c:13:6a:a4:55:ad:
+                    a4:85:e8:95:7e:b3:00:af:00:c2:05:18:f5:70:9d:
+                    36:8b:ae:cb:e4:1b:81:7f:93:88:fb:6a:55:bb:7d:
+                    85:92:ce:ba:58:9f:db:32:c5:bd:5d:ef:22:4a:2f:
+                    41:07:7e:49:61:b3:86:ec:4e:a6:41:6e:84:bc:03:
+                    ec:f5:3b:1c:c8:1f:c2:ee:a8:ee:ea:12:4a:8d:14:
+                    cf:f3:0a:e0:50:39:f9:08:35:f8:11:59:ad:e7:22:
+                    ea:4b:ca:14:06:de:42:ba:b2:99:f3:2d:54:88:10:
+                    06:ea:e1:1a:3e:3d:67:1f:fb:ce:fb:7c:82:e8:11:
+                    5d:4a:c1:b9:14:ea:54:d9:66:9b:7c:89:7d:04:9a:
+                    62:c9:e9:52:3c:9e:9c:ef:d2:f5:26:e4:e6:e5:18:
+                    7c:8b:6e:df:6c:cc:78:5b:4f:72:b2:cb:5c:3f:8c:
+                    05:8d:d1:4c:8c:ad:92:c7:e1:78:7f:65:6c:49:06:
+                    50:2c:9e:32:c2:d7:4a:c6:75:8a:59:4e:75:6f:47:
+                    5e:c1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+        15:f5:55:ff:37:96:80:59:21:a4:fc:a1:15:4c:20:f6:d4:5f:
+        da:03:24:fc:cf:90:1a:f4:21:0a:9a:ee:3a:b1:6a:ef:ef:f8:
+        60:d1:4c:36:66:45:1d:f3:66:02:74:04:7b:92:30:a8:de:0a:
+        76:0f:ef:95:6e:bd:c9:37:e6:1a:0d:ac:89:48:5b:cc:83:36:
+        c2:f5:46:5c:59:82:56:b4:d5:fe:23:b4:d8:54:1c:44:ab:c4:
+        a7:e5:14:ce:3c:41:61:7c:43:e6:cd:c4:81:09:8b:24:fb:54:
+        25:d6:16:a8:96:0c:67:07:6f:b3:50:47:e3:1c:24:28:dd:2a:
+        98:a4:61:fe:db:ea:12:37:bc:01:1a:34:85:bd:6e:4f:e7:91:
+        72:07:44:85:1e:58:ca:54:44:dd:f7:ac:b9:cb:89:21:72:db:
+        8f:c0:69:29:97:2a:a3:ae:18:23:97:1c:41:2a:8b:7c:2a:c1:
+        7c:90:e8:a9:28:c0:d3:91:c6:ad:28:87:40:68:b5:ff:ec:a7:
+        d2:d3:38:18:9c:d3:7d:69:5d:f0:c6:a5:1e:24:1b:a3:47:fc:
+        69:07:68:e7:e4:9a:b4:ed:0f:a1:87:87:02:ce:87:d2:48:4e:
+        e1:bc:ff:cb:f1:72:92:44:64:03:25:ea:de:5b:6e:9f:c9:f2:
+        4e:ac:dd:c7
+SHA1 Fingerprint=79:98:A3:08:E1:4D:65:85:E6:C2:1E:15:3A:71:9F:BA:5A:D3:4A:D9
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg
+MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
+dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz
+MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy
+dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD
+VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg
+xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu
+xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7
+XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k
+heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J
+YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C
+urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1
+JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51
+b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
+9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7
+kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh
+fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA
+aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS
+RGQDJereW26fyfJOrN3H
+-----END CERTIFICATE-----
+
+
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: CN=T\xC3\x9CRKTRUST Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1, C=TR, L=Ankara, O=T\xC3\x9CRKTRUST Bilgi \xC4\xB0leti\xC5\x9Fim ve Bili\xC5\x9Fim G\xC3\xBCvenli\xC4\x9Fi Hizmetleri A.\xC5\x9E. (c) Kas\xC4\xB1m 2005
+        Validity
+            Not Before: Nov  7 10:07:57 2005 GMT
+            Not After : Sep 16 10:07:57 2015 GMT
+        Subject: CN=T\xC3\x9CRKTRUST Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1, C=TR, L=Ankara, O=T\xC3\x9CRKTRUST Bilgi \xC4\xB0leti\xC5\x9Fim ve Bili\xC5\x9Fim G\xC3\xBCvenli\xC4\x9Fi Hizmetleri A.\xC5\x9E. (c) Kas\xC4\xB1m 2005
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:a9:36:7e:c3:91:43:4c:c3:19:98:08:c8:c7:58:
+                    7b:4f:16:8c:a5:ce:49:01:1f:73:0e:ac:75:13:a6:
+                    fa:9e:2c:20:de:d8:90:0e:0a:d1:69:d2:27:fb:aa:
+                    77:9f:27:52:25:e2:cb:5d:d8:d8:83:50:17:7d:8a:
+                    b5:82:3f:04:8e:b4:d5:f0:49:a7:64:b7:1e:2e:5f:
+                    20:9c:50:75:4f:af:e1:b5:41:14:f4:98:92:88:c7:
+                    e5:e5:64:47:61:47:79:fd:c0:51:f1:c1:99:e7:dc:
+                    ce:6a:fb:af:b5:01:30:dc:46:1c:ef:8a:ec:95:ef:
+                    dc:ff:af:10:1c:eb:9d:d8:b0:aa:6a:85:18:0d:17:
+                    c9:3e:bf:f1:9b:d0:09:89:42:fd:a0:42:b4:9d:89:
+                    51:55:29:cf:1b:70:bc:84:54:ad:c1:13:1f:98:f4:
+                    2e:76:60:8b:5d:3f:9a:ad:ca:0c:bf:a7:56:5b:8f:
+                    77:b8:d5:9e:79:49:92:3f:e0:f1:97:24:7a:6c:9b:
+                    17:0f:6d:ef:53:98:91:2b:e4:0f:be:59:79:07:78:
+                    bb:97:95:f4:9f:69:d4:58:87:0a:a9:e3:cc:b6:58:
+                    19:9f:26:21:b1:c4:59:8d:b2:41:75:c0:ad:69:ce:
+                    9c:00:08:f2:36:ff:3e:f0:a1:0f:1a:ac:14:fd:a6:
+                    60:0f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                D9:37:B3:4E:05:FD:D9:CF:9F:12:16:AE:B6:89:2F:EB:25:3A:88:1C
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+        72:60:96:b7:c9:dc:d8:29:5e:23:85:5f:b2:b3:2d:76:fb:88:
+        d7:17:fe:7b:6d:45:b8:f6:85:6c:9f:22:fc:2a:10:22:ec:aa:
+        b9:30:f6:ab:58:d6:39:10:31:99:29:00:bd:89:66:41:fb:74:
+        de:91:c1:18:0b:9f:b5:61:cb:9d:3a:be:f5:a8:94:a3:22:55:
+        6e:17:49:ff:d2:29:f1:38:26:5d:ef:a5:aa:3a:f9:71:7b:e6:
+        da:58:1d:d3:74:c2:01:fa:3e:69:58:5f:ad:cb:68:be:14:2e:
+        9b:6c:c0:b6:dc:a0:26:fa:77:1a:e2:24:da:1a:37:e0:67:ad:
+        d1:73:83:0d:a5:1a:1d:6e:12:92:7e:84:62:00:17:bd:bc:25:
+        18:57:f2:d7:a9:6f:59:88:bc:34:b7:2e:85:78:9d:96:dc:14:
+        c3:2c:8a:52:9b:96:8c:52:66:3d:86:16:8b:47:b8:51:09:8c:
+        ea:7d:cd:88:72:b3:60:33:b1:f0:0a:44:ef:0f:f5:09:37:88:
+        24:0e:2c:6b:20:3a:a2:fa:11:f2:40:35:9c:44:68:63:3b:ac:
+        33:6f:63:bc:2c:bb:f2:d2:cb:76:7d:7d:88:d8:1d:c8:05:1d:
+        6e:bc:94:a9:66:8c:77:71:c7:fa:91:fa:2f:51:9e:e9:39:52:
+        b6:e7:04:42
+SHA1 Fingerprint=B4:35:D4:E1:11:9D:1C:66:90:A7:49:EB:B3:94:BD:63:7B:A7:82:B7
+-----BEGIN CERTIFICATE-----
+MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3
+WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv
+bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU
+UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw
+bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe
+LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef
+J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh
+R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ
+Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX
+JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p
+zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S
+Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq
+ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
+Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz
+gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH
+uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS
+y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI=
+-----END CERTIFICATE-----
+
+
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            4e:b2:00:67:0c:03:5d:4f
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=CH, O=SwissSign AG, CN=SwissSign Platinum CA - G2
+        Validity
+            Not Before: Oct 25 08:36:00 2006 GMT
+            Not After : Oct 25 08:36:00 2036 GMT
+        Subject: C=CH, O=SwissSign AG, CN=SwissSign Platinum CA - G2
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    00:ca:df:a2:02:e2:da:f8:fc:07:16:b1:de:60:aa:
+                    de:96:5c:64:1f:c7:2f:7e:cf:67:fa:44:42:d6:76:
+                    63:95:ae:eb:af:72:20:8a:45:47:86:62:78:86:d6:
+                    20:39:26:f4:ae:a3:fd:23:e7:a5:9c:b5:22:21:19:
+                    b7:37:93:22:c0:50:9c:82:7b:d4:d5:04:44:5c:cb:
+                    b4:c2:9f:92:be:24:d8:7b:67:22:e2:69:5f:e5:05:
+                    78:d4:87:d9:71:70:33:25:53:b4:87:3b:29:90:28:
+                    36:9a:55:44:30:68:a4:83:97:7f:0d:1e:9c:76:ff:
+                    15:9d:60:97:00:8d:8a:85:03:ec:80:be:ea:2c:6e:
+                    10:51:92:cc:7e:d5:a3:33:d8:d6:49:de:58:2a:af:
+                    f6:16:eb:4b:7b:90:32:97:b9:ba:9d:58:f1:f8:57:
+                    49:04:1e:a2:5d:06:70:dd:71:db:f9:dd:8b:9a:1b:
+                    8c:cf:3d:a3:4d:ce:cb:7c:f6:bb:9c:a0:fa:09:ce:
+                    23:62:b2:e9:0d:1f:e2:72:28:8f:9f:ac:68:20:7d:
+                    6f:3b:a8:85:31:09:7f:0b:c7:e8:65:e9:e3:78:0e:
+                    09:67:30:8b:34:82:fb:5d:e0:cc:9d:81:6d:62:ee:
+                    08:1e:04:2c:4e:9b:ec:fe:a9:4f:5f:fd:69:78:ef:
+                    09:1f:a1:b4:bf:fa:f3:ef:90:1e:4c:05:8b:1e:ea:
+                    7a:91:7a:c3:d7:e5:fb:30:bc:6c:1b:10:58:98:f7:
+                    1a:5f:d0:29:32:03:13:46:4d:61:6a:85:4c:52:74:
+                    2f:06:1f:7b:11:e2:84:97:c6:99:f3:6d:7f:d7:67:
+                    83:7e:13:68:d8:71:28:5a:d8:ce:dd:e8:10:14:9a:
+                    fe:6d:23:87:6e:8e:5a:70:3c:d5:8d:09:00:a7:aa:
+                    bc:b0:31:37:6d:c8:84:14:1e:5b:bd:45:63:20:6b:
+                    4b:74:8c:bd:db:3a:0e:c1:cf:5a:16:8f:a5:98:f2:
+                    76:89:b2:13:12:3b:0b:77:77:ac:bb:e5:3c:29:4a:
+                    92:72:ca:61:1a:2b:5e:4c:e2:83:74:77:fa:35:48:
+                    7a:85:4d:8d:9a:53:c4:df:78:ca:97:91:48:2b:45:
+                    2b:01:f7:1c:1a:a2:ed:18:ba:0a:bd:83:fa:6f:bc:
+                    8d:57:93:3b:d4:d4:a6:ce:1e:f1:a0:b1:ce:ab:fd:
+                    2b:28:9a:4f:1b:d7:c3:72:db:a4:c4:bf:5d:4c:f5:
+                    dd:7b:96:69:ee:68:80:e6:e7:98:ba:36:b7:fe:6e:
+                    ed:2b:bd:20:f8:65:19:da:55:09:7e:25:dc:fe:61:
+                    62:72:f9:7e:18:02:ef:63:b4:d0:fb:af:e5:3b:63:
+                    8c:67:8f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                50:AF:CC:07:87:15:47:6F:38:C5:B4:65:D1:DE:95:AA:E9:DF:9C:CC
+            X509v3 Authority Key Identifier: 
+                keyid:50:AF:CC:07:87:15:47:6F:38:C5:B4:65:D1:DE:95:AA:E9:DF:9C:CC
+
+            X509v3 Certificate Policies: 
+                Policy: 2.16.756.1.89.1.1.1.1
+                  CPS: http://repository.swisssign.com/
+
+    Signature Algorithm: sha1WithRSAEncryption
+        08:85:a6:f5:16:0c:fc:44:1a:c1:63:e0:f9:55:46:08:fc:70:
+        1c:42:28:96:8e:b7:c5:c1:41:75:4e:09:71:79:e5:6d:96:ca:
+        4b:a5:88:60:d0:30:74:b8:ca:08:dc:b4:30:9e:40:07:16:6b:
+        65:95:77:01:ae:a4:b7:35:0b:81:da:71:15:a9:74:17:38:7b:
+        58:ca:f9:2f:fb:c0:65:76:8d:5b:01:b9:7d:de:82:3d:64:b8:
+        be:14:74:a3:0a:54:d3:2c:95:18:17:35:f5:51:6b:3f:8f:a2:
+        96:61:39:78:6b:4b:e5:a6:a0:f8:53:df:51:10:93:62:e7:80:
+        2f:e2:d1:e0:bc:8e:36:46:77:33:ec:b8:fb:8e:9a:2c:89:4d:
+        31:11:0f:26:9e:04:bb:b7:04:8d:0b:f2:b9:fc:5a:9d:3b:16:
+        b7:2f:c8:98:ab:fe:8a:50:59:2e:a3:3b:fc:29:5d:8b:c1:4b:
+        c9:e2:8a:13:1d:b1:bf:bb:42:1d:52:dd:4e:d8:14:5e:10:c6:
+        31:07:ef:71:27:f7:1b:39:09:dc:82:ea:8b:b3:95:86:5e:fd:
+        f5:da:5d:31:a6:e0:31:b6:94:e6:44:49:74:c5:16:e5:f7:1f:
+        03:61:28:c5:c8:cb:12:a0:42:4b:f9:6b:88:08:8d:b4:32:18:
+        f3:75:9f:c4:7f:00:4f:05:95:9c:a3:17:02:c3:b3:53:9b:aa:
+        20:39:29:2b:66:fa:9d:af:5e:b3:92:d2:b5:a6:e1:1a:f9:2d:
+        41:69:81:14:b4:b4:b5:ed:89:3d:ce:fb:a9:9d:35:42:44:b1:
+        1c:14:73:81:cf:2a:01:35:9a:31:d5:2d:8f:6d:84:df:80:4d:
+        57:e3:3f:c5:84:75:da:89:c6:30:bb:eb:8f:cb:22:08:a0:ae:
+        aa:f1:03:6c:3a:4b:4d:09:a5:0e:72:c6:56:6b:21:42:4e:23:
+        25:14:68:ae:76:0a:7c:0c:07:70:64:f9:9a:2f:f6:05:39:26:
+        c6:0c:8f:19:7f:43:5e:6e:f4:5b:15:2f:db:61:5d:e6:67:2f:
+        3f:08:94:f9:60:b4:98:31:da:74:f1:84:93:71:4d:5f:fb:60:
+        58:d1:fb:c4:c1:6d:89:a2:bb:20:1f:9d:71:91:cb:32:9b:13:
+        3d:3e:7d:92:52:35:ac:92:94:a2:d3:18:c2:7c:c7:ea:af:76:
+        05:16:dd:67:27:c2:7e:1c:07:22:21:f3:40:0a:1b:34:07:44:
+        13:c2:84:6a:8e:df:19:5a:bf:7f:eb:1d:e2:1a:38:d1:5c:af:
+        47:92:6b:80:b5:30:a5:c9:8d:d8:ab:31:81:1f:df:c2:66:37:
+        d3:93:a9:85:86:79:65:d2
+SHA1 Fingerprint=56:E0:FA:C0:3B:8F:18:23:55:18:E5:D3:11:CA:E8:C2:43:31:AB:66
+-----BEGIN CERTIFICATE-----
+MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE
+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu
+IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw
+WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD
+ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y
+IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn
+IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+
+6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob
+jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw
+izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl
++zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY
+zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP
+pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF
+KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW
+ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB
+AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0
+ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
+IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA
+A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0
+uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+
+FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7
+jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/
+u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D
+YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1
+puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa
+icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG
+DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x
+kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z
+Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
+-----END CERTIFICATE-----
+
+
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            bb:40:1c:43:f5:5e:4f:b0
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=CH, O=SwissSign AG, CN=SwissSign Gold CA - G2
+        Validity
+            Not Before: Oct 25 08:30:35 2006 GMT
+            Not After : Oct 25 08:30:35 2036 GMT
+        Subject: C=CH, O=SwissSign AG, CN=SwissSign Gold CA - G2
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    00:af:e4:ee:7e:8b:24:0e:12:6e:a9:50:2d:16:44:
+                    3b:92:92:5c:ca:b8:5d:84:92:42:13:2a:bc:65:57:
+                    82:40:3e:57:24:cd:50:8b:25:2a:b7:6f:fc:ef:a2:
+                    d0:c0:1f:02:24:4a:13:96:8f:23:13:e6:28:58:00:
+                    a3:47:c7:06:a7:84:23:2b:bb:bd:96:2b:7f:55:cc:
+                    8b:c1:57:1f:0e:62:65:0f:dd:3d:56:8a:73:da:ae:
+                    7e:6d:ba:81:1c:7e:42:8c:20:35:d9:43:4d:84:fa:
+                    84:db:52:2c:f3:0e:27:77:0b:6b:bf:11:2f:72:78:
+                    9f:2e:d8:3e:e6:18:37:5a:2a:72:f9:da:62:90:92:
+                    95:ca:1f:9c:e9:b3:3c:2b:cb:f3:01:13:bf:5a:cf:
+                    c1:b5:0a:60:bd:dd:b5:99:64:53:b8:a0:96:b3:6f:
+                    e2:26:77:91:8c:e0:62:10:02:9f:34:0f:a4:d5:92:
+                    33:51:de:be:8d:ba:84:7a:60:3c:6a:db:9f:2b:ec:
+                    de:de:01:3f:6e:4d:e5:50:86:cb:b4:af:ed:44:40:
+                    c5:ca:5a:8c:da:d2:2b:7c:a8:ee:be:a6:e5:0a:aa:
+                    0e:a5:df:05:52:b7:55:c7:22:5d:32:6a:97:97:63:
+                    13:db:c9:db:79:36:7b:85:3a:4a:c5:52:89:f9:24:
+                    e7:9d:77:a9:82:ff:55:1c:a5:71:69:2b:d1:02:24:
+                    f2:b3:26:d4:6b:da:04:55:e5:c1:0a:c7:6d:30:37:
+                    90:2a:e4:9e:14:33:5e:16:17:55:c5:5b:b5:cb:34:
+                    89:92:f1:9d:26:8f:a1:07:d4:c6:b2:78:50:db:0c:
+                    0c:0b:7c:0b:8c:41:d7:b9:e9:dd:8c:88:f7:a3:4d:
+                    b2:32:cc:d8:17:da:cd:b7:ce:66:9d:d4:fd:5e:ff:
+                    bd:97:3e:29:75:e7:7e:a7:62:58:af:25:34:a5:41:
+                    c7:3d:bc:0d:50:ca:03:03:0f:08:5a:1f:95:73:78:
+                    62:bf:af:72:14:69:0e:a5:e5:03:0e:78:8e:26:28:
+                    42:f0:07:0b:62:20:10:67:39:46:fa:a9:03:cc:04:
+                    38:7a:66:ef:20:83:b5:8c:4a:56:8e:91:00:fc:8e:
+                    5c:82:de:88:a0:c3:e2:68:6e:7d:8d:ef:3c:dd:65:
+                    f4:5d:ac:51:ef:24:80:ae:aa:56:97:6f:f9:ad:7d:
+                    da:61:3f:98:77:3c:a5:91:b6:1c:8c:26:da:65:a2:
+                    09:6d:c1:e2:54:e3:b9:ca:4c:4c:80:8f:77:7b:60:
+                    9a:1e:df:b6:f2:48:1e:0e:ba:4e:54:6d:98:e0:e1:
+                    a2:1a:a2:77:50:cf:c4:63:92:ec:47:19:9d:eb:e6:
+                    6b:ce:c1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                5B:25:7B:96:A4:65:51:7E:B8:39:F3:C0:78:66:5E:E8:3A:E7:F0:EE
+            X509v3 Authority Key Identifier: 
+                keyid:5B:25:7B:96:A4:65:51:7E:B8:39:F3:C0:78:66:5E:E8:3A:E7:F0:EE
+
+            X509v3 Certificate Policies: 
+                Policy: 2.16.756.1.89.1.2.1.1
+                  CPS: http://repository.swisssign.com/
+
+    Signature Algorithm: sha1WithRSAEncryption
+        27:ba:e3:94:7c:f1:ae:c0:de:17:e6:e5:d8:d5:f5:54:b0:83:
+        f4:bb:cd:5e:05:7b:4f:9f:75:66:af:3c:e8:56:7e:fc:72:78:
+        38:03:d9:2b:62:1b:00:b9:f8:e9:60:cd:cc:ce:51:8a:c7:50:
+        31:6e:e1:4a:7e:18:2f:69:59:b6:3d:64:81:2b:e3:83:84:e6:
+        22:87:8e:7d:e0:ee:02:99:61:b8:1e:f4:b8:2b:88:12:16:84:
+        c2:31:93:38:96:31:a6:b9:3b:53:3f:c3:24:93:56:5b:69:92:
+        ec:c5:c1:bb:38:00:e3:ec:17:a9:b8:dc:c7:7c:01:83:9f:32:
+        47:ba:52:22:34:1d:32:7a:09:56:a7:7c:25:36:a9:3d:4b:da:
+        c0:82:6f:0a:bb:12:c8:87:4b:27:11:f9:1e:2d:c7:93:3f:9e:
+        db:5f:26:6b:52:d9:2e:8a:f1:14:c6:44:8d:15:a9:b7:bf:bd:
+        de:a6:1a:ee:ae:2d:fb:48:77:17:fe:bb:ec:af:18:f5:2a:51:
+        f0:39:84:97:95:6c:6e:1b:c3:2b:c4:74:60:79:25:b0:0a:27:
+        df:df:5e:d2:39:cf:45:7d:42:4b:df:b3:2c:1e:c5:c6:5d:ca:
+        55:3a:a0:9c:69:9a:8f:da:ef:b2:b0:3c:9f:87:6c:12:2b:65:
+        70:15:52:31:1a:24:cf:6f:31:23:50:1f:8c:4f:8f:23:c3:74:
+        41:63:1c:55:a8:14:dd:3e:e0:51:50:cf:f1:1b:30:56:0e:92:
+        b0:82:85:d8:83:cb:22:64:bc:2d:b8:25:d5:54:a2:b8:06:ea:
+        ad:92:a4:24:a0:c1:86:b5:4a:13:6a:47:cf:2e:0b:56:95:54:
+        cb:ce:9a:db:6a:b4:a6:b2:db:41:08:86:27:77:f7:6a:a0:42:
+        6c:0b:38:ce:d7:75:50:32:92:c2:df:2b:30:22:48:d0:d5:41:
+        38:25:5d:a4:e9:5d:9f:c6:94:75:d0:45:fd:30:97:43:8f:90:
+        ab:0a:c7:86:73:60:4a:69:2d:de:a5:78:d7:06:da:6a:9e:4b:
+        3e:77:3a:20:13:22:01:d0:bf:68:9e:63:60:6b:35:4d:0b:6d:
+        ba:a1:3d:c0:93:e0:7f:23:b3:55:ad:72:25:4e:46:f9:d2:16:
+        ef:b0:64:c1:01:9e:e9:ca:a0:6a:98:0e:cf:d8:60:f2:2f:49:
+        b8:e4:42:e1:38:35:16:f4:c8:6e:4f:f7:81:56:e8:ba:a3:be:
+        23:af:ae:fd:6f:03:e0:02:3b:30:76:fa:1b:6d:41:cf:01:b1:
+        e9:b8:c9:66:f4:db:26:f3:3a:a4:74:f2:49:24:5b:c9:b0:d0:
+        57:c1:fa:3e:7a:e1:97:c9
+SHA1 Fingerprint=D8:C5:38:8A:B7:30:1B:1B:6E:D4:7A:E6:45:25:3A:6F:9F:1A:27:61
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
+biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
+MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
+d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
+76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
+6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
+emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
+MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
+MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
+MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
+FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
+aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
+gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
+qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
+lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
+8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
+45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
+UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
+O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
+bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
+GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
+77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
+hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
+92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
+Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
+ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
+Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            4f:1b:d4:2f:54:bb:2f:4b
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=CH, O=SwissSign AG, CN=SwissSign Silver CA - G2
+        Validity
+            Not Before: Oct 25 08:32:46 2006 GMT
+            Not After : Oct 25 08:32:46 2036 GMT
+        Subject: C=CH, O=SwissSign AG, CN=SwissSign Silver CA - G2
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    00:c4:f1:87:7f:d3:78:31:f7:38:c9:f8:c3:99:43:
+                    bc:c7:f7:bc:37:e7:4e:71:ba:4b:8f:a5:73:1d:5c:
+                    6e:98:ae:03:57:ae:38:37:43:2f:17:3d:1f:c8:ce:
+                    68:10:c1:78:ae:19:03:2b:10:fa:2c:79:83:f6:e8:
+                    b9:68:b9:55:f2:04:44:a7:39:f9:fc:04:8b:1e:f1:
+                    a2:4d:27:f9:61:7b:ba:b7:e5:a2:13:b6:eb:61:3e:
+                    d0:6c:d1:e6:fb:fa:5e:ed:1d:b4:9e:a0:35:5b:a1:
+                    92:cb:f0:49:92:fe:85:0a:05:3e:e6:d9:0b:e2:4f:
+                    bb:dc:95:37:fc:91:e9:32:35:22:d1:1f:3a:4e:27:
+                    85:9d:b0:15:94:32:da:61:0d:47:4d:60:42:ae:92:
+                    47:e8:83:5a:50:58:e9:8a:8b:b9:5d:a1:dc:dd:99:
+                    4a:1f:36:67:bb:48:e4:83:b6:37:eb:48:3a:af:0f:
+                    67:8f:17:07:e8:04:ca:ef:6a:31:87:d4:c0:b6:f9:
+                    94:71:7b:67:64:b8:b6:91:4a:42:7b:65:2e:30:6a:
+                    0c:f5:90:ee:95:e6:f2:cd:82:ec:d9:a1:4a:ec:f6:
+                    b2:4b:e5:45:85:e6:6d:78:93:04:2e:9c:82:6d:36:
+                    a9:c4:31:64:1f:86:83:0b:2a:f4:35:0a:78:c9:55:
+                    cf:41:b0:47:e9:30:9f:99:be:61:a8:06:84:b9:28:
+                    7a:5f:38:d9:1b:a9:38:b0:83:7f:73:c1:c3:3b:48:
+                    2a:82:0f:21:9b:b8:cc:a8:35:c3:84:1b:83:b3:3e:
+                    be:a4:95:69:01:3a:89:00:78:04:d9:c9:f4:99:19:
+                    ab:56:7e:5b:8b:86:39:15:91:a4:10:2c:09:32:80:
+                    60:b3:93:c0:2a:b6:18:0b:9d:7e:8d:49:f2:10:4a:
+                    7f:f9:d5:46:2f:19:92:a3:99:a7:26:ac:bb:8c:3c:
+                    e6:0e:bc:47:07:dc:73:51:f1:70:64:2f:08:f9:b4:
+                    47:1d:30:6c:44:ea:29:37:85:92:68:66:bc:83:38:
+                    fe:7b:39:2e:d3:50:f0:1f:fb:5e:60:b6:a9:a6:fa:
+                    27:41:f1:9b:18:72:f2:f5:84:74:4a:c9:67:c4:54:
+                    ae:48:64:df:8c:d1:6e:b0:1d:e1:07:8f:08:1e:99:
+                    9c:71:e9:4c:d8:a5:f7:47:12:1f:74:d1:51:9e:86:
+                    f3:c2:a2:23:40:0b:73:db:4b:a6:e7:73:06:8c:c1:
+                    a0:e9:c1:59:ac:46:fa:e6:2f:f8:cf:71:9c:46:6d:
+                    b9:c4:15:8d:38:79:03:45:48:ef:c4:5d:d7:08:ee:
+                    87:39:22:86:b2:0d:0f:58:43:f7:71:a9:48:2e:fd:
+                    ea:d6:1f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                17:A0:CD:C1:E4:41:B6:3A:5B:3B:CB:45:9D:BD:1C:C2:98:FA:86:58
+            X509v3 Authority Key Identifier: 
+                keyid:17:A0:CD:C1:E4:41:B6:3A:5B:3B:CB:45:9D:BD:1C:C2:98:FA:86:58
+
+            X509v3 Certificate Policies: 
+                Policy: 2.16.756.1.89.1.3.1.1
+                  CPS: http://repository.swisssign.com/
+
+    Signature Algorithm: sha1WithRSAEncryption
+        73:c6:81:e0:27:d2:2d:0f:e0:95:30:e2:9a:41:7f:50:2c:5f:
+        5f:62:61:a9:86:6a:69:18:0c:74:49:d6:5d:84:ea:41:52:18:
+        6f:58:ad:50:56:20:6a:c6:bd:28:69:58:91:dc:91:11:35:a9:
+        3a:1d:bc:1a:a5:60:9e:d8:1f:7f:45:91:69:d9:7e:bb:78:72:
+        c1:06:0f:2a:ce:8f:85:70:61:ac:a0:cd:0b:b8:39:29:56:84:
+        32:4e:86:bb:3d:c4:2a:d9:d7:1f:72:ee:fe:51:a1:22:41:b1:
+        71:02:63:1a:82:b0:62:ab:5e:57:12:1f:df:cb:dd:75:a0:c0:
+        5d:79:90:8c:1b:e0:50:e6:de:31:fe:98:7b:70:5f:a5:90:d8:
+        ad:f8:02:b6:6f:d3:60:dd:40:4b:22:c5:3d:ad:3a:7a:9f:1a:
+        1a:47:91:79:33:ba:82:dc:32:69:03:96:6e:1f:4b:f0:71:fe:
+        e3:67:72:a0:b1:bf:5c:8b:e4:fa:99:22:c7:84:b9:1b:8d:23:
+        97:3f:ed:25:e0:cf:65:bb:f5:61:04:ef:dd:1e:b2:5a:41:22:
+        5a:a1:9f:5d:2c:e8:5b:c9:6d:a9:0c:0c:78:aa:60:c6:56:8f:
+        01:5a:0c:68:bc:69:19:79:c4:1f:7e:97:05:bf:c5:e9:24:51:
+        5e:d4:d5:4b:53:ed:d9:23:5a:36:03:65:a3:c1:03:ad:41:30:
+        f3:46:1b:85:90:af:65:b5:d5:b1:e4:16:5b:78:75:1d:97:7a:
+        6d:59:a9:2a:8f:7b:de:c3:87:89:10:99:49:73:78:c8:3d:bd:
+        51:35:74:2a:d5:f1:7e:69:1b:2a:bb:3b:bd:25:b8:9a:5a:3d:
+        72:61:90:66:87:ee:0c:d6:4d:d4:11:74:0b:6a:fe:0b:03:fc:
+        a3:55:57:89:fe:4a:cb:ae:5b:17:05:c8:f2:8d:23:31:53:38:
+        d2:2d:6a:3f:82:b9:8d:08:6a:f7:5e:41:74:6e:c3:11:7e:07:
+        ac:29:60:91:3f:38:ca:57:10:0d:bd:30:2f:c7:a5:e6:41:a0:
+        da:ae:05:87:9a:a0:a4:65:6c:4c:09:0c:89:ba:b8:d3:b9:c0:
+        93:8a:30:fa:8d:e5:9a:6b:15:01:4e:67:aa:da:62:56:3e:84:
+        08:66:d2:c4:36:7d:a7:3e:10:fc:88:e0:d4:80:e5:00:bd:aa:
+        f3:4e:06:a3:7a:6a:f9:62:72:e3:09:4f:eb:9b:0e:01:23:f1:
+        9f:bb:7c:dc:dc:6c:11:97:25:b2:f2:b4:63:14:d2:06:2a:67:
+        8c:83:f5:ce:ea:07:d8:9a:6a:1e:ec:e4:0a:bb:2a:4c:eb:09:
+        60:39:ce:ca:62:d8:2e:6e
+SHA1 Fingerprint=9B:AA:E5:9F:56:EE:21:CB:43:5A:BE:25:93:DF:A7:F0:40:D1:1D:CB
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
+IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
+RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
+U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
+Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
+YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
+nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
+6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
+eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
+c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
+MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
+HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
+jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
+5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
+rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
+F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
+wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
+AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
+WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
+xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
+2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
+IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
+aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
+em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
+dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
+OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
+tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+


Index: openssl.spec
===================================================================
RCS file: /cvs/extras/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- openssl.spec	20 Feb 2008 05:36:13 -0000	1.103
+++ openssl.spec	10 Mar 2008 10:45:36 -0000	1.104
@@ -22,7 +22,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8g
-Release: 5%{?dist}
+Release: 6%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -369,6 +369,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Mar 10 2008 Joe Orton  0.9.8g-6
+- update to new root CA bundle from mozilla.org (r1.45)
+
 * Wed Feb 20 2008 Fedora Release Engineering  - 0.9.8g-5
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 10:49:35 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 10:49:35 GMT
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.8,
	1.1440.2.9
Message-ID: <200803101049.m2AAnZw9004152@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4101

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Log Message:
new patterns


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.8
retrieving revision 1.1440.2.9
diff -u -r1.1440.2.8 -r1.1440.2.9
--- openoffice.org.spec	10 Mar 2008 10:43:49 -0000	1.1440.2.8
+++ openoffice.org.spec	10 Mar 2008 10:48:46 -0000	1.1440.2.9
@@ -145,7 +145,7 @@
 
 %define instdir %{_libdir}/openoffice.org
 %define OFFICEUPD 300
-%define UPD
+%define UPD %nil
 %define SOPOST l*
 
 %description



From fedora-extras-commits at redhat.com  Mon Mar 10 10:51:39 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 10:51:39 GMT
Subject: rpms/totem/devel totem.spec,1.173,1.174
Message-ID: <200803101051.m2AApdav004281@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4249

Modified Files:
	totem.spec 
Log Message:
Another try at the liboil dep



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- totem.spec	10 Mar 2008 10:06:01 -0000	1.173
+++ totem.spec	10 Mar 2008 10:51:05 -0000	1.174
@@ -82,7 +82,7 @@
 BuildRequires: gstreamer-devel >= %gstreamer_version
 BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version
 BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
-BuildRequires: liboil >= 0.3.13-4
+BuildRequires: liboil > 0.3.13-3
 
 %description gstreamer
 This package provides the gstreamer backend for the Totem media player.



From fedora-extras-commits at redhat.com  Mon Mar 10 10:57:57 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 10:57:57 GMT
Subject: rpms/libgnomeui/devel libgnomeui-gio-fix-threading.patch, NONE,
	1.1 libgnomeui.spec, 1.91, 1.92
Message-ID: <200803101057.m2AAvvxE004442@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgnomeui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392

Modified Files:
	libgnomeui.spec 
Added Files:
	libgnomeui-gio-fix-threading.patch 
Log Message:
* Mon Mar 10 2008 - Bastien Nocera  - 2.21.93-2
- Add patch to avoid hang on error in the filechooser under EOG


libgnomeui-gio-fix-threading.patch:

--- NEW FILE libgnomeui-gio-fix-threading.patch ---
Index: gtkfilesystemgio.c
===================================================================
--- gtkfilesystemgio.c	(revision 5575)
+++ gtkfilesystemgio.c	(working copy)
@@ -396,7 +396,9 @@
   GtkFileSystemGio *impl;
 
   impl = GTK_FILE_SYSTEM_GIO (user_data);
+  gdk_threads_enter ();
   g_signal_emit_by_name (impl, "volumes-changed");
+  gdk_threads_leave ();
 }
 
 static gchar *
@@ -654,7 +656,9 @@
 				     NULL, NULL, NULL);
 
       folder->finished_loading = TRUE;
+      gdk_threads_enter ();
       g_signal_emit_by_name (folder, "finished-loading", 0);
+      gdk_threads_leave ();
       g_object_unref (folder);
       return;
     }
@@ -678,7 +682,9 @@
 				      enumerator_files_callback,
 				      folder);
 
+  gdk_threads_enter ();
   g_signal_emit_by_name (folder, "files-added", added_files);
+  gdk_threads_leave ();
   g_slist_foreach (added_files, (GFunc) g_free, NULL);
   g_slist_free (added_files);
 
@@ -701,10 +707,14 @@
   switch (event)
     {
     case G_FILE_MONITOR_EVENT_CREATED:
+      gdk_threads_enter ();
       g_signal_emit_by_name (folder, "files-added", files);
+      gdk_threads_leave ();
       break;
     case G_FILE_MONITOR_EVENT_DELETED:
+      gdk_threads_enter ();
       g_signal_emit_by_name (folder, "files-removed", files);
+      gdk_threads_leave ();
       break;
     default:
       break;
@@ -754,9 +764,11 @@
       g_object_unref (enumerator);
     }
 
+  gdk_threads_enter ();
   ((GtkFileSystemGetFolderCallback) handle->callback) (GTK_FILE_SYSTEM_HANDLE (handle),
 						       GTK_FILE_FOLDER (folder),
 						       error, handle->data);
+  gdk_threads_leave ();
 }
 
 static GtkFileSystemHandle *
@@ -925,8 +937,10 @@
     }
   else
     {
+      gdk_threads_enter ();
       ((GtkFileSystemGetInfoCallback) handle->callback) (GTK_FILE_SYSTEM_HANDLE (handle),
 							 NULL, error, handle->data);
+      gdk_threads_leave ();
     }
 }
 
@@ -968,8 +982,10 @@
       return;
     }
 
+  gdk_threads_enter ();
   ((GtkFileSystemGetInfoCallback) handle->callback) (GTK_FILE_SYSTEM_HANDLE (handle),
 						     info, error, handle->data);
+  gdk_threads_leave ();
 
   if (info)
     gtk_file_info_free (info);
@@ -1028,8 +1044,11 @@
 
   g_file_make_directory (file, handle->cancellable, &error);
 
+  gdk_threads_enter ();
   ((GtkFileSystemCreateFolderCallback) handle->callback) (GTK_FILE_SYSTEM_HANDLE (handle),
 							  idle_data->path, error, handle->data);
+  gdk_threads_leave ();
+
   g_object_unref (file);
   gtk_file_path_free (idle_data->path);
   g_slice_free (CreateFolderData, idle_data);
@@ -1184,9 +1203,12 @@
 
   g_volume_mount_finish (G_VOLUME (source_object), res, &error);
 
+  gdk_threads_enter ();
   ((GtkFileSystemVolumeMountCallback) handle->callback) (GTK_FILE_SYSTEM_HANDLE (handle),
                                                          (GtkFileSystemVolume *) source_object,
                                                          error, handle->data);
+  gdk_threads_leave ();
+
   if (error)
     g_error_free (error);
 }
@@ -1203,9 +1225,12 @@
 
   g_drive_poll_for_media_finish (G_DRIVE (source_object), res, &error);
 
+  gdk_threads_enter ();
   ((GtkFileSystemVolumeMountCallback) handle->callback) (GTK_FILE_SYSTEM_HANDLE (handle),
                                                          (GtkFileSystemVolume *) source_object,
                                                          error, handle->data);
+  gdk_threads_leave ();
+
   if (error)
     g_error_free (error);
 }


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- libgnomeui.spec	7 Mar 2008 21:13:19 -0000	1.91
+++ libgnomeui.spec	10 Mar 2008 10:57:07 -0000	1.92
@@ -18,11 +18,13 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.21.93
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnomeui/2.21/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=517276
 Patch0: gio-thumbnail.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=520903
+Patch1: libgnomeui-gio-fix-threading.patch
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -105,6 +107,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gio-thumbnail
+%patch1 -p0 -b .gio-hang
 
 aclocal
 automake
@@ -150,6 +153,9 @@
 %{_datadir}/gtk-doc/html/libgnomeui
 
 %changelog
+* Mon Mar 10 2008 - Bastien Nocera  - 2.21.93-2
+- Add patch to avoid hang on error in the filechooser under EOG
+
 * Fri Mar 07 2008 - Bastien Nocera  - 2.21.93-1
 - Update to 2.21.93
 



From fedora-extras-commits at redhat.com  Mon Mar 10 10:59:07 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 10:59:07 GMT
Subject: rpms/totem/devel totem.spec,1.174,1.175
Message-ID: <200803101059.m2AAx7nU004534@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4493

Modified Files:
	totem.spec 
Log Message:
revert last commit



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- totem.spec	10 Mar 2008 10:51:05 -0000	1.174
+++ totem.spec	10 Mar 2008 10:58:17 -0000	1.175
@@ -82,7 +82,7 @@
 BuildRequires: gstreamer-devel >= %gstreamer_version
 BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version
 BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
-BuildRequires: liboil > 0.3.13-3
+BuildRequires: liboil >= 0.3.13-4
 
 %description gstreamer
 This package provides the gstreamer backend for the Totem media player.



From fedora-extras-commits at redhat.com  Mon Mar 10 10:59:37 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 10:59:37 GMT
Subject: rpms/hunspell-fr/devel .cvsignore, 1.4, 1.5 hunspell-fr.spec, 1.4, 
	1.5 sources, 1.4, 1.5
Message-ID: <200803101059.m2AAxb2P004590@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-fr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4527

Modified Files:
	.cvsignore hunspell-fr.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Feb 2008 09:43:12 -0000	1.4
+++ .cvsignore	10 Mar 2008 10:59:00 -0000	1.5
@@ -1 +1 @@
-fr_FR_2-1-0.zip
+fr_FR_2-2-0.zip


Index: hunspell-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/hunspell-fr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hunspell-fr.spec	7 Feb 2008 09:43:12 -0000	1.4
+++ hunspell-fr.spec	10 Mar 2008 10:59:00 -0000	1.5
@@ -1,8 +1,8 @@
 Name: hunspell-fr
 Summary: French hunspell dictionaries
-Version: 2.1.0
+Version: 2.2.0
 Release: 1%{?dist}
-Source: http://dico.savant.free.fr/_download/fr_FR_2-1-0.zip
+Source: http://dico.savant.free.fr/_download/fr_FR_2-2-0.zip
 Group: Applications/Text
 URL: http://dico.savant.free.fr/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +43,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Mon Mar 10 2008 Caolan McNamara  - 2.2.0-1
+- latest version
+
 * Thu Feb 07 2008 Caolan McNamara  - 2.1.0-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Feb 2008 09:43:12 -0000	1.4
+++ sources	10 Mar 2008 10:59:00 -0000	1.5
@@ -1 +1 @@
-a1ebd937909077d2e94e9fa194de1f57  fr_FR_2-1-0.zip
+2856271da8ea5471f5a125d1665f1dc3  fr_FR_2-2-0.zip



From fedora-extras-commits at redhat.com  Mon Mar 10 11:04:51 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 11:04:51 GMT
Subject: rpms/totem/devel totem.spec,1.175,1.176
Message-ID: <200803101104.m2AB4pj8011865@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11834

Modified Files:
	totem.spec 
Log Message:
* Mon Mar 10 2008 - Bastien Nocera  - 2.23.0-4
- Try to build with a liboil with Altivec disabled



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- totem.spec	10 Mar 2008 10:58:17 -0000	1.175
+++ totem.spec	10 Mar 2008 11:04:12 -0000	1.176
@@ -10,7 +10,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.23.0
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 License: GPLv2 with exception
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -425,6 +425,9 @@
 %endif
 
 %changelog
+* Mon Mar 10 2008 - Bastien Nocera  - 2.23.0-4
+- Try to build with a liboil with Altivec disabled
+
 * Sun Mar 09 2008 - Bastien Nocera  - 2.23.0-3
 - Remove PPC/PPC64 ExcludeArch
 



From fedora-extras-commits at redhat.com  Mon Mar 10 11:20:14 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 11:20:14 GMT
Subject: rpms/libgnomeui/devel libgnomeui.spec,1.92,1.93
Message-ID: <200803101120.m2ABKErP012217@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgnomeui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12183

Modified Files:
	libgnomeui.spec 
Log Message:
Fix patch application



Index: libgnomeui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- libgnomeui.spec	10 Mar 2008 10:57:07 -0000	1.92
+++ libgnomeui.spec	10 Mar 2008 11:19:27 -0000	1.93
@@ -107,7 +107,9 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gio-thumbnail
+pushd file-chooser/
 %patch1 -p0 -b .gio-hang
+popd
 
 aclocal
 automake



From fedora-extras-commits at redhat.com  Mon Mar 10 11:23:14 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 11:23:14 +0000
Subject: [pkgdb] gdal: mmahut has requested watchcommits
Message-ID: <200803101125.m2ABPlp2008377@bastion.fedora.phx.redhat.com>

Marek Mahut (mmahut) has requested the watchcommits acl on gdal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gdal



From fedora-extras-commits at redhat.com  Mon Mar 10 11:23:12 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 11:23:12 +0000
Subject: [pkgdb] gdal: mmahut has requested watchbugzilla
Message-ID: <200803101125.m2ABPkf3008376@bastion.fedora.phx.redhat.com>

Marek Mahut (mmahut) has requested the watchbugzilla acl on gdal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gdal



From fedora-extras-commits at redhat.com  Mon Mar 10 11:23:16 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 11:23:16 +0000
Subject: [pkgdb] gdal: mmahut has requested commit
Message-ID: <200803101125.m2ABPkf6008376@bastion.fedora.phx.redhat.com>

Marek Mahut (mmahut) has requested the commit acl on gdal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gdal



From fedora-extras-commits at redhat.com  Mon Mar 10 11:23:20 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 11:23:20 +0000
Subject: [pkgdb] gdal: mmahut has requested approveacls
Message-ID: <200803101125.m2ABPsO6008437@bastion.fedora.phx.redhat.com>

Marek Mahut (mmahut) has requested the approveacls acl on gdal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gdal



From fedora-extras-commits at redhat.com  Mon Mar 10 11:26:10 2008
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 10 Mar 2008 11:26:10 GMT
Subject: rpms/kdelibs/F-8 kdelibs-3.5.9-kate-regression.patch,1.1,1.2
Message-ID: <200803101126.m2ABQAGq012450@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12425

Modified Files:
	kdelibs-3.5.9-kate-regression.patch 
Log Message:
apply upstream patch to fix regression in kate (bz#436384)


kdelibs-3.5.9-kate-regression.patch:

Index: kdelibs-3.5.9-kate-regression.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-8/kdelibs-3.5.9-kate-regression.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-3.5.9-kate-regression.patch	10 Mar 2008 09:53:58 -0000	1.1
+++ kdelibs-3.5.9-kate-regression.patch	10 Mar 2008 11:26:06 -0000	1.2
@@ -1,5 +1,5 @@
---- 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/08 14:17:43	772352
-+++ 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:02:18	777286
+--- kdelibs/kate/part/katesupercursor.cpp	2008/02/08 14:17:43	772352
++++ kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:02:18	777286
 @@ -186,7 +186,7 @@
  {
    if (newLine)



From fedora-extras-commits at redhat.com  Mon Mar 10 11:27:43 2008
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 10 Mar 2008 11:27:43 GMT
Subject: rpms/kdelibs/F-7 kdelibs-3.5.9-kate-regression.patch,1.1,1.2
Message-ID: <200803101127.m2ABRhFo012530@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12509

Modified Files:
	kdelibs-3.5.9-kate-regression.patch 
Log Message:
apply upstream patch to fix regression in kate (bz#436384)


kdelibs-3.5.9-kate-regression.patch:

Index: kdelibs-3.5.9-kate-regression.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-7/kdelibs-3.5.9-kate-regression.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-3.5.9-kate-regression.patch	10 Mar 2008 09:58:58 -0000	1.1
+++ kdelibs-3.5.9-kate-regression.patch	10 Mar 2008 11:27:38 -0000	1.2
@@ -1,5 +1,5 @@
---- 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/08 14:17:43	772352
-+++ 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:02:18	777286
+--- kdelibs/kate/part/katesupercursor.cpp	2008/02/08 14:17:43	772352
++++ kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:02:18	777286
 @@ -186,7 +186,7 @@
  {
    if (newLine)



From fedora-extras-commits at redhat.com  Mon Mar 10 11:34:06 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 11:34:06 GMT
Subject: rpms/totem-pl-parser/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 totem-pl-parser.spec, 1.9, 1.10
Message-ID: <200803101134.m2ABY6n3012670@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem-pl-parser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12644

Modified Files:
	.cvsignore sources totem-pl-parser.spec 
Log Message:
* Mon Mar 10 2008 - Bastien Nocera  - 2.22.0-1
- Update to 2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Feb 2008 19:43:33 -0000	1.5
+++ .cvsignore	10 Mar 2008 11:33:31 -0000	1.6
@@ -1 +1 @@
-totem-pl-parser-2.21.92.tar.bz2
+totem-pl-parser-2.22.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Feb 2008 19:43:33 -0000	1.5
+++ sources	10 Mar 2008 11:33:31 -0000	1.6
@@ -1 +1 @@
-48849576a68cf39d6d82c9ac58d277c3  totem-pl-parser-2.21.92.tar.bz2
+2781db263be2252a00e25ad8bc406482  totem-pl-parser-2.22.0.tar.bz2


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- totem-pl-parser.spec	24 Feb 2008 19:43:33 -0000	1.9
+++ totem-pl-parser.spec	10 Mar 2008 11:33:31 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		totem-pl-parser
-Version:	2.21.92
+Version:	2.22.0
 Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Mon Mar 10 2008 - Bastien Nocera  - 2.22.0-1
+- Update to 2.22.0
+
 * Sun Feb 24 2008 - Bastien Nocera  - 2.21.92-1
 - Update to 2.21.92
 



From fedora-extras-commits at redhat.com  Mon Mar 10 11:36:17 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 11:36:17 +0000
Subject: [pkgdb] sg3_utils: denis has requested commit
Message-ID: <200803101138.m2ABcpPm008827@bastion.fedora.phx.redhat.com>

Denis Leroy (denis) has requested the commit acl on sg3_utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From fedora-extras-commits at redhat.com  Mon Mar 10 11:36:22 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 11:36:22 +0000
Subject: [pkgdb] sg3_utils: denis has requested commit
Message-ID: <200803101138.m2ABct2Q008847@bastion.fedora.phx.redhat.com>

Denis Leroy (denis) has requested the commit acl on sg3_utils (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From fedora-extras-commits at redhat.com  Mon Mar 10 11:36:25 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 11:36:25 +0000
Subject: [pkgdb] sg3_utils: denis has requested commit
Message-ID: <200803101138.m2ABct2T008847@bastion.fedora.phx.redhat.com>

Denis Leroy (denis) has requested the commit acl on sg3_utils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sg3_utils



From fedora-extras-commits at redhat.com  Mon Mar 10 11:50:33 2008
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Mon, 10 Mar 2008 11:50:33 GMT
Subject: rpms/sysprof-kmod/F-8 sysprof-kmod.spec,1.92,1.93
Message-ID: <200803101150.m2ABoXPj012938@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12910

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for kernel 2.6.24.3-12.fc8


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/F-8/sysprof-kmod.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- sysprof-kmod.spec	7 Feb 2008 21:49:00 -0000	1.92
+++ sysprof-kmod.spec	10 Mar 2008 11:49:56 -0000	1.93
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.23.14-115.fc8}
+%{!?kversion: %define kversion 2.6.24.3-12.fc8}
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
 



From fedora-extras-commits at redhat.com  Mon Mar 10 11:56:09 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 11:56:09 GMT
Subject: rpms/gnome-phone-manager/F-8 gnome-phone-manager.spec,1.13,1.14
Message-ID: <200803101156.m2ABu9xk013122@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-phone-manager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13094

Modified Files:
	gnome-phone-manager.spec 
Log Message:
* Mon Mar 10 2008 - Bastien Nocera  - 0.40-2
- Rebuild against new gnokii



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-phone-manager/F-8/gnome-phone-manager.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-phone-manager.spec	14 Nov 2007 13:35:29 -0000	1.13
+++ gnome-phone-manager.spec	10 Mar 2008 11:55:36 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.40
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPLv2+
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -14,7 +14,7 @@
 BuildRequires: 	gnome-bluetooth-devel
 BuildRequires:	libbtctl-devel
 BuildRequires:	bluez-libs-devel
-BuildRequires:	gnokii-devel
+BuildRequires:	gnokii-devel >= 0.6.22
 BuildRequires:	gstreamer-devel >= 0.10
 BuildRequires:	gnome-icon-theme >= 2.19.1
 # For libebook (evolution address book)
@@ -105,6 +105,9 @@
 %{_datadir}/mission-control/profiles/*
 
 %changelog
+* Mon Mar 10 2008 - Bastien Nocera  - 0.40-2
+- Rebuild against new gnokii
+
 * Wed Nov 14 2007 - Bastien Nocera  - 0.40-1
 - Update to 0.40
 - Add experimental telepathy backend in a subpackage



From fedora-extras-commits at redhat.com  Mon Mar 10 12:05:36 2008
From: fedora-extras-commits at redhat.com (Martin Stransky (stransky))
Date: Mon, 10 Mar 2008 12:05:36 GMT
Subject: rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.5-sleep.patch, 1.1,
	1.2 nspluginwrapper.spec, 1.44, 1.45
Message-ID: <200803101205.m2AC5aDq020526@cvs-int.fedora.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20498

Modified Files:
	nspluginwrapper-0.9.91.5-sleep.patch nspluginwrapper.spec 
Log Message:
updated the sleep patch

nspluginwrapper-0.9.91.5-sleep.patch:

Index: nspluginwrapper-0.9.91.5-sleep.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-0.9.91.5-sleep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-0.9.91.5-sleep.patch	6 Mar 2008 13:18:07 -0000	1.1
+++ nspluginwrapper-0.9.91.5-sleep.patch	10 Mar 2008 12:05:30 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up nspluginwrapper-0.9.91.5/src/npw-viewer.c.old nspluginwrapper-0.9.91.5/src/npw-viewer.c
---- nspluginwrapper-0.9.91.5/src/npw-viewer.c.old	2008-03-06 13:51:03.000000000 +0100
-+++ nspluginwrapper-0.9.91.5/src/npw-viewer.c	2008-03-06 14:00:05.000000000 +0100
+diff -up nspluginwrapper-0.9.91.5/src/npw-viewer.c.sleep nspluginwrapper-0.9.91.5/src/npw-viewer.c
+--- nspluginwrapper-0.9.91.5/src/npw-viewer.c.sleep	2008-03-10 12:50:21.000000000 +0100
++++ nspluginwrapper-0.9.91.5/src/npw-viewer.c	2008-03-10 12:51:42.000000000 +0100
 @@ -3039,14 +3039,14 @@ static GPollFD xt_event_poll_fd;
  static gboolean xt_event_prepare(GSource *source, gint *timeout)
  {
@@ -18,9 +18,13 @@
  	  return TRUE;
    }
    return FALSE;
-@@ -3057,9 +3057,9 @@ static gboolean xt_event_dispatch(GSourc
-   int i;
-   for (i = 0; i < 5; i++) {
+@@ -3054,12 +3054,11 @@ static gboolean xt_event_check(GSource *
+ 
+ static gboolean xt_event_dispatch(GSource *source, GSourceFunc callback, gpointer user_data)
+ {
+-  int i;
+-  for (i = 0; i < 5; i++) {
++  while(1) {
  	int mask = XtAppPending(x_app_context);
 -	if ((mask & XtIMXEvent) == 0)
 +	if ((mask) == 0)
@@ -30,7 +34,7 @@
    }
    return TRUE;
  }
-@@ -3073,17 +3073,6 @@ static GSourceFuncs xt_event_funcs = {
+@@ -3073,17 +3072,6 @@ static GSourceFuncs xt_event_funcs = {
    (GSourceDummyMarshal)NULL
  };
  
@@ -48,7 +52,7 @@
  // RPC events
  static GPollFD rpc_event_poll_fd;
  
-@@ -3208,10 +3197,6 @@ static int do_main(int argc, char **argv
+@@ -3208,10 +3196,6 @@ static int do_main(int argc, char **argv
    xt_event_poll_fd.revents = 0;
    g_source_add_poll(xt_source, &xt_event_poll_fd);
  
@@ -59,7 +63,7 @@
    // Initialize RPC events listener
    GSource *rpc_source = g_source_new(&rpc_event_funcs, sizeof(GSource));
    if (rpc_source == NULL) {
-@@ -3232,7 +3217,6 @@ static int do_main(int argc, char **argv
+@@ -3232,7 +3216,6 @@ static int do_main(int argc, char **argv
    gtk_main();
    D(bug("--- EXIT ---\n"));
  


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- nspluginwrapper.spec	6 Mar 2008 13:18:07 -0000	1.44
+++ nspluginwrapper.spec	10 Mar 2008 12:05:30 -0000	1.45
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	24%{?dist}
+Release:	25%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -239,6 +239,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Mar 10 2008 Martin Stransky  0.9.91.5-25
+- updated the sleep patch
+
 * Thu Mar 06 2008 Martin Stransky  0.9.91.5-24
 - added experimental patch for #426968 - nspluginwrapper wakes up too much
 



From fedora-extras-commits at redhat.com  Mon Mar 10 12:17:24 2008
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 10 Mar 2008 12:17:24 GMT
Subject: rpms/python-paste-script/devel python-paste-script.spec,1.12,1.13
Message-ID: <200803101217.m2ACHOx0020785@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste-script/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20734

Modified Files:
	python-paste-script.spec 
Log Message:
Require python-paste >= 1.3


Index: python-paste-script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-script/devel/python-paste-script.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-paste-script.spec	29 Feb 2008 04:59:27 -0000	1.12
+++ python-paste-script.spec	10 Mar 2008 12:16:44 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           python-paste-script
 Version:        1.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A pluggable command-line frontend
 Group:          System Environment/Libraries
 License:        MIT
@@ -13,8 +13,8 @@
 BuildArch:      noarch
 
 BuildRequires:  python-devel
-BuildRequires: python-setuptools-devel
-Requires:       python-paste, python-paste-deploy, python-cheetah
+BuildRequires:  python-setuptools-devel
+Requires:       python-paste >= 1.3, python-paste-deploy, python-cheetah
 
 %description
 Paster is pluggable command-line frontend, including commands to setup package
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Luke Macken  - 1.6.2-2
+- Require python-paste >= 1.3
+
 * Thu Feb 28 2008 Luke Macken  - 1.6.2-1
 - Update to 1.6.2
 



From fedora-extras-commits at redhat.com  Mon Mar 10 12:17:34 2008
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 10 Mar 2008 12:17:34 GMT
Subject: devel/vim 7.1.267,NONE,1.1
Message-ID: <200803101217.m2ACHYFV020832@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20788

Added Files:
	7.1.267 
Log Message:
- patchlevel 267


--- NEW FILE 7.1.267 ---
To: vim-dev at vim.org
Subject: Patch 7.1.267
Fcc: outbox
From: Bram Moolenaar 
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.267
Problem:    When changing folds cursor may be positioned in the wrong place.
Solution:   Call changed_window_setting_win() instead of
	    changed_window_setting().
Files:	    src/fold.c


*** ../vim-7.1.266/src/fold.c	Sun Jan 13 21:57:25 2008
--- src/fold.c	Wed Mar  5 12:48:43 2008
***************
*** 2307,2313 ****
  
      /* If some fold changed, need to redraw and position cursor. */
      if (fold_changed && wp->w_p_fen)
! 	changed_window_setting();
  
      /* If we updated folds past "bot", need to redraw more lines.  Don't do
       * this in other situations, the changed lines will be redrawn anyway and
--- 2307,2313 ----
  
      /* If some fold changed, need to redraw and position cursor. */
      if (fold_changed && wp->w_p_fen)
! 	changed_window_setting_win(wp);
  
      /* If we updated folds past "bot", need to redraw more lines.  Don't do
       * this in other situations, the changed lines will be redrawn anyway and
*** ../vim-7.1.266/src/version.c	Wed Feb 27 16:13:09 2008
--- src/version.c	Thu Mar  6 22:43:05 2008
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     267,
  /**/

-- 
>From "know your smileys":
 %	Bike accident.  A bit far-fetched, I suppose; although...
             o      _     _         _
     _o     /\_   _ \\o  (_)\__/o  (_)
   _< \_   _>(_) (_)/<_    \_| \   _|/' \/
  (_)>(_) (_)        (_)   (_)    (_)'  _\o_

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Mar 10 12:17:42 2008
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 10 Mar 2008 12:17:42 GMT
Subject: devel/vim 7.1.268,NONE,1.1
Message-ID: <200803101217.m2ACHgp6020857@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20848

Added Files:
	7.1.268 
Log Message:
- patchlevel 268


--- NEW FILE 7.1.268 ---
To: vim-dev at vim.org
Subject: Patch 7.1.268
Fcc: outbox
From: Bram Moolenaar 
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.268
Problem:    Always shows "+" at end of screen line with: ":set
	    listchars=eol:$,extends:+ nowrap list cursorline" (Gary Johnson)
Solution:   Check for lcs_eol_one instead of lcs_eol.
Files:	    src/screen.c


*** ../vim-7.1.267/src/screen.c	Wed Feb 20 14:15:45 2008
--- src/screen.c	Sun Mar  9 14:26:14 2008
***************
*** 4527,4533 ****
  #endif
  		    col == W_WIDTH(wp) - 1)
  		&& (*ptr != NUL
! 		    || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str)
  		    || (n_extra && (c_extra != NUL || *p_extra != NUL))))
  	{
  	    c = lcs_ext;
--- 4527,4533 ----
  #endif
  		    col == W_WIDTH(wp) - 1)
  		&& (*ptr != NUL
! 		    || (wp->w_p_list && lcs_eol_one > 0)
  		    || (n_extra && (c_extra != NUL || *p_extra != NUL))))
  	{
  	    c = lcs_ext;
*** ../vim-7.1.267/src/version.c	Thu Mar  6 22:44:45 2008
--- src/version.c	Sun Mar  9 14:24:59 2008
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     268,
  /**/

-- 
>From "know your smileys":
 :-*	A big kiss!

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-extras-commits at redhat.com  Mon Mar 10 12:17:44 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 12:17:44 GMT
Subject: rpms/totem-pl-parser/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 totem-pl-parser.spec, 1.10, 1.11
Message-ID: <200803101217.m2ACHi4K020872@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem-pl-parser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20697

Modified Files:
	.cvsignore sources totem-pl-parser.spec 
Log Message:
* Mon Mar 10 2008 - Bastien Nocera  - 2.22.1-1
- Update to 2.22.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Mar 2008 11:33:31 -0000	1.6
+++ .cvsignore	10 Mar 2008 12:17:04 -0000	1.7
@@ -1 +1 @@
-totem-pl-parser-2.22.0.tar.bz2
+totem-pl-parser-2.22.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Mar 2008 11:33:31 -0000	1.6
+++ sources	10 Mar 2008 12:17:04 -0000	1.7
@@ -1 +1 @@
-2781db263be2252a00e25ad8bc406482  totem-pl-parser-2.22.0.tar.bz2
+6a43a727205ae0a379e325c50ace0a40  totem-pl-parser-2.22.1.tar.bz2


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- totem-pl-parser.spec	10 Mar 2008 11:33:31 -0000	1.10
+++ totem-pl-parser.spec	10 Mar 2008 12:17:04 -0000	1.11
@@ -1,5 +1,5 @@
 Name:		totem-pl-parser
-Version:	2.22.0
+Version:	2.22.1
 Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Mon Mar 10 2008 - Bastien Nocera  - 2.22.1-1
+- Update to 2.22.1
+
 * Mon Mar 10 2008 - Bastien Nocera  - 2.22.0-1
 - Update to 2.22.0
 



From fedora-extras-commits at redhat.com  Mon Mar 10 12:18:41 2008
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 10 Mar 2008 12:18:41 GMT
Subject: devel/vim 7.1.269, NONE, 1.1 vim.spec, 1.195, 1.196 README.patches, 
	1.98, 1.99
Message-ID: <200803101218.m2ACIfxj020960@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20883

Modified Files:
	vim.spec README.patches 
Added Files:
	7.1.269 
Log Message:
- patchlevel 269


--- NEW FILE 7.1.269 ---
To: vim-dev at vim.org
Subject: Patch 7.1.269
Fcc: outbox
From: Bram Moolenaar 
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.269
Problem:    The matchparen plugin has an arbitrary limit for the number of
	    lines to look for a match.
Solution:   Rely on the searchpair() timeout.
Files:	    runtime/plugin/matchparen.vim


*** ../vim-7.1.268/runtime/plugin/matchparen.vim	Sun Jan  6 20:05:36 2008
--- runtime/plugin/matchparen.vim	Wed Feb 27 22:39:32 2008
***************
*** 1,6 ****
  " Vim plugin for showing matching parens
  " Maintainer:  Bram Moolenaar 
! " Last Change: 2008 Jan 06
  
  " Exit quickly when:
  " - this plugin was already loaded (or disabled)
--- 1,6 ----
  " Vim plugin for showing matching parens
  " Maintainer:  Bram Moolenaar 
! " Last Change: 2008 Feb 27
  
  " Exit quickly when:
  " - this plugin was already loaded (or disabled)
***************
*** 34,40 ****
    endif
  
    " Avoid that we remove the popup menu.
!   if pumvisible()
      return
    endif
  
--- 34,41 ----
    endif
  
    " Avoid that we remove the popup menu.
!   " Return when there are no colors (looks like the cursor jumps).
!   if pumvisible() || (&t_Co < 8 && !has("gui_running"))
      return
    endif
  
***************
*** 60,98 ****
    endif
  
    " Figure out the arguments for searchpairpos().
-   " Restrict the search to visible lines with "stopline".
-   " And avoid searching very far (e.g., for closed folds and long lines)
-   " The "viewable" variables give a range in which we can scroll while keeping
-   " the cursor at the same position
-   " adjustedScrolloff accounts for very large numbers of scrolloff
-   let adjustedScrolloff = min([&scrolloff, (line('w$') - line('w0')) / 2])
-   let bottom_viewable = min([line('$'), c_lnum + &lines - adjustedScrolloff - 2])
-   let top_viewable = max([1, c_lnum-&lines+adjustedScrolloff + 2])
-   " one of these stoplines will be adjusted below, but the current values are
-   " minimal boundaries within the current window
-   let stoplinebottom = line('w$')
-   let stoplinetop = line('w0')
    if i % 2 == 0
      let s_flags = 'nW'
      let c2 = plist[i + 1]
-     if has("byte_offset") && has("syntax_items") && &smc > 0
-       let stopbyte = min([line2byte("$"), line2byte(".") + col(".") + &smc * 2])
-       let stopline = min([bottom_viewable, byte2line(stopbyte)])
-     else
-       let stopline = min([bottom_viewable, c_lnum + 100])
-     endif
-     let stoplinebottom = stopline
    else
      let s_flags = 'nbW'
      let c2 = c
      let c = plist[i - 1]
-     if has("byte_offset") && has("syntax_items") && &smc > 0
-       let stopbyte = max([1, line2byte(".") + col(".") - &smc * 2])
-       let stopline = max([top_viewable, byte2line(stopbyte)])
-     else
-       let stopline = max([top_viewable, c_lnum - 100])
-     endif
-     let stoplinetop = stopline
    endif
    if c == '['
      let c = '\['
--- 61,73 ----
***************
*** 111,120 ****
  	\ '=~?  "string\\|character\\|singlequote\\|comment"'
    execute 'if' s_skip '| let s_skip = 0 | endif'
  
    try
!     " Limit the search time to 500 msec to avoid a hang on very long lines.
!     let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline, 500)
    catch /E118/
      let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
    endtry
  
--- 86,132 ----
  	\ '=~?  "string\\|character\\|singlequote\\|comment"'
    execute 'if' s_skip '| let s_skip = 0 | endif'
  
+   " Limit the search to lines visible in the window.
+   let stoplinebottom = line('w$')
+   let stoplinetop = line('w0')
+   if i % 2 == 0
+     let stopline = stoplinebottom
+   else
+     let stopline = stoplinetop
+   endif
+ 
    try
!     " Limit the search time to 300 msec to avoid a hang on very long lines.
!     " This fails when a timeout is not supported.
!     let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline, 300)
    catch /E118/
+     " Can't use the timeout, restrict the stopline a bit more to avoid taking
+     " a long time on closed folds and long lines.
+     " The "viewable" variables give a range in which we can scroll while
+     " keeping the cursor at the same position.
+     " adjustedScrolloff accounts for very large numbers of scrolloff.
+     let adjustedScrolloff = min([&scrolloff, (line('w$') - line('w0')) / 2])
+     let bottom_viewable = min([line('$'), c_lnum + &lines - adjustedScrolloff - 2])
+     let top_viewable = max([1, c_lnum-&lines+adjustedScrolloff + 2])
+     " one of these stoplines will be adjusted below, but the current values are
+     " minimal boundaries within the current window
+     if i % 2 == 0
+       if has("byte_offset") && has("syntax_items") && &smc > 0
+ 	let stopbyte = min([line2byte("$"), line2byte(".") + col(".") + &smc * 2])
+ 	let stopline = min([bottom_viewable, byte2line(stopbyte)])
+       else
+ 	let stopline = min([bottom_viewable, c_lnum + 100])
+       endif
+       let stoplinebottom = stopline
+     else
+       if has("byte_offset") && has("syntax_items") && &smc > 0
+ 	let stopbyte = max([1, line2byte(".") + col(".") - &smc * 2])
+ 	let stopline = max([top_viewable, byte2line(stopbyte)])
+       else
+ 	let stopline = max([top_viewable, c_lnum - 100])
+       endif
+       let stoplinetop = stopline
+     endif
      let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
    endtry
  
*** ../vim-7.1.268/src/version.c	Sun Mar  9 14:30:12 2008
--- src/version.c	Sun Mar  9 16:21:00 2008
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     269,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
93. New mail alarm on your palmtop annoys other churchgoers.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: vim.spec
===================================================================
RCS file: /cvs/extras/devel/vim/vim.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- vim.spec	3 Mar 2008 18:36:04 -0000	1.195
+++ vim.spec	10 Mar 2008 12:18:00 -0000	1.196
@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 266
+%define patchlevel 269
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -320,6 +320,9 @@
 Patch264: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.264
 Patch265: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.265
 Patch266: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.266
+Patch267: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.267
+Patch268: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.268
+Patch269: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.269
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -721,6 +724,9 @@
 %patch264 -p0
 %patch265 -p0
 %patch266 -p0
+%patch267 -p0
+%patch268 -p0
+%patch269 -p0
 
 
 # install spell files
@@ -1123,6 +1129,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Mar 10 2008 Karsten Hopp  7.1.269-1
+- patchlevel 269
+- rebuild with new perl (#436731)
+
 * Mon Mar 03 2008 Karsten Hopp  7.1.266-1
 - patchlevel 266
 - add minimal help page for /bin/vi (#173974)


Index: README.patches
===================================================================
RCS file: /cvs/extras/devel/vim/README.patches,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- README.patches	3 Mar 2008 14:41:24 -0000	1.98
+++ README.patches	10 Mar 2008 12:18:00 -0000	1.99
@@ -298,3 +298,6 @@
   6295  7.1.264  crash when C-indenting
   1310  7.1.265  hang when completing file name and space in 'isfname'
   2510  7.1.266  version string returned by terminal may be used as typed input
+  1957  7.1.267  when changing folds cursor may be positioned in a wrong place
+  1576  7.1.268  always shows "+" at end of screen line with 'cursurline'
+  6183  7.1.269  matchparen plugin has an arbitrary line number limit



From fedora-extras-commits at redhat.com  Mon Mar 10 12:28:44 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 12:28:44 GMT
Subject: rpms/gnome-phone-manager/devel .cvsignore, 1.7,
	1.8 gnome-phone-manager.spec, 1.15, 1.16 sources, 1.7,
	1.8 sms.profile, 1.1, NONE
Message-ID: <200803101228.m2ACSiwQ021224@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21187

Modified Files:
	.cvsignore gnome-phone-manager.spec sources 
Removed Files:
	sms.profile 
Log Message:
* Mon Mar 10 2008 - Bastien Nocera  - 0.50-1
- Update to 0.50



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Nov 2007 13:37:54 -0000	1.7
+++ .cvsignore	10 Mar 2008 12:27:51 -0000	1.8
@@ -1 +1 @@
-gnome-phone-manager-0.40.tar.bz2
+gnome-phone-manager-0.50.tar.bz2


Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-phone-manager.spec	20 Feb 2008 00:34:31 -0000	1.15
+++ gnome-phone-manager.spec	10 Mar 2008 12:27:51 -0000	1.16
@@ -1,11 +1,10 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
-Version: 	0.40
-Release: 	3%{?dist}
+Version: 	0.50
+Release: 	1%{?dist}
 License: 	GPLv2+
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
-Source1:	sms.profile
 URL: 		http://usefulinc.com/software/phonemgr/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel
@@ -55,7 +54,7 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # This should be in empathy instead
-install -m0644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/mission-control/profiles/sms.profile
+install -m0644 -D telepathy/sms.profile $RPM_BUILD_ROOT%{_datadir}/mission-control/profiles/sms.profile
 
 %find_lang %{name}
 desktop-file-install \
@@ -105,6 +104,9 @@
 %{_datadir}/mission-control/profiles/*
 
 %changelog
+* Mon Mar 10 2008 - Bastien Nocera  - 0.50-1
+- Update to 0.50
+
 * Tue Feb 19 2008 Fedora Release Engineering  - 0.40-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Nov 2007 13:37:55 -0000	1.7
+++ sources	10 Mar 2008 12:27:51 -0000	1.8
@@ -1 +1 @@
-38537c212e9b2395cf89187ab2be3b9a  gnome-phone-manager-0.40.tar.bz2
+dbafdfb467f8ac82dc48aa6770797f2a  gnome-phone-manager-0.50.tar.bz2


--- sms.profile DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 12:37:58 2008
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 10 Mar 2008 12:37:58 GMT
Subject: rpms/smartmontools/devel .cvsignore, 1.4, 1.5 smartmontools.spec,
	1.42, 1.43 sources, 1.4, 1.5
Message-ID: <200803101237.m2ACbwA3021477@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/smartmontools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21455

Modified Files:
	.cvsignore smartmontools.spec sources 
Log Message:
* Mon Mar 10 2008 Tomas Smetana  - 1:5.38-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 May 2006 07:54:10 -0000	1.4
+++ .cvsignore	10 Mar 2008 12:37:22 -0000	1.5
@@ -1 +1 @@
-smartmontools-5.36.tar.gz
+smartmontools-5.38.tar.gz


Index: smartmontools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- smartmontools.spec	12 Feb 2008 07:40:17 -0000	1.42
+++ smartmontools.spec	10 Mar 2008 12:37:22 -0000	1.43
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
-Version:	5.37
-Release: 	8.5%{?dist}
+Version:	5.38
+Release: 	1%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -10,10 +10,8 @@
 Source1:	smartd.initd
 Source2:	smartd-conf.py
 Source3:	smartmontools.sysconf
-Patch1:		smartmontools-5.37-cloexec.patch
-Patch2:		smartmontools-5.37-3ware.patch
-Patch3:     smartmontools-5.37-addrinfo.patch
-Patch4:     smartmontools-5.37-buildfix.patch
+Patch1:		smartmontools-5.38-cloexec.patch
+Patch2:     smartmontools-5.37-addrinfo.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 PreReq:		/sbin/chkconfig /sbin/service
@@ -42,9 +40,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .cloexec
-%patch2 -p1 -b .3ware
-%patch3 -p1 -b .addrinfo
-%patch4 -p1 -b .buildfix
+%patch2 -p1 -b .addrinfo
 
 %build
 ./autogen.sh
@@ -109,6 +105,9 @@
 %exclude %{_sbindir}/smartd-conf.py[co]
 
 %changelog
+* Mon Mar 10 2008 Tomas Smetana  - 1:5.38-1
+- new upstream version
+
 * Tue Feb 12 2008 Tomas Smetana  - 1:5.37-8.5
 - rebuild (gcc-4.3)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smartmontools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Feb 2007 08:57:04 -0000	1.4
+++ sources	10 Mar 2008 12:37:22 -0000	1.5
@@ -1 +1 @@
-4ab3668b7d1362ce923f64a211e0e568  smartmontools-5.37.tar.gz
+a282846532ecbd6b4a28072373b3a70b  smartmontools-5.38.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 12:41:06 2008
From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana))
Date: Mon, 10 Mar 2008 12:41:06 GMT
Subject: rpms/smartmontools/devel smartmontools-5.38-cloexec.patch,NONE,1.1
Message-ID: <200803101241.m2ACf6um021566@cvs-int.fedora.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/smartmontools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21557

Added Files:
	smartmontools-5.38-cloexec.patch 
Log Message:
add cloexec patch

smartmontools-5.38-cloexec.patch:

--- NEW FILE smartmontools-5.38-cloexec.patch ---
diff -up smartmontools-5.38/os_linux.cpp.cloexec smartmontools-5.38/os_linux.cpp
--- smartmontools-5.38/os_linux.cpp.cloexec	2008-03-10 10:01:25.000000000 +0100
+++ smartmontools-5.38/os_linux.cpp	2008-03-10 10:09:26.000000000 +0100
@@ -171,7 +171,7 @@ static char prev_scsi_dev[128];
 
 // equivalent to open(path, flags)
 int deviceopen(const char *pathname, char *type){
-  int fd;
+  int fd = -1;
 
   if (0 == strcmp(type,"SCSI")) {
     strncpy(prev_scsi_dev, pathname, sizeof(prev_scsi_dev) - 1);
@@ -186,9 +186,9 @@ int deviceopen(const char *pathname, cha
     // The purpose of the next code line is to limit the scope of
     // this change as a release is pending (and smartd needs a rewrite).
     if (0 == strncmp(pathname, prev_scsi_dev, sizeof(prev_scsi_dev)))
-      return open(pathname, O_RDWR | O_NONBLOCK);
+      fd = open(pathname, O_RDWR | O_NONBLOCK);
     else
-      return open(pathname, O_RDONLY | O_NONBLOCK);
+      fd = open(pathname, O_RDONLY | O_NONBLOCK);
   } else if (0 == strcmp(type,"ATA_3WARE_9000")) {
     // the device nodes for this controller are dynamically assigned,
     // so we need to check that they exist with the correct major
@@ -198,7 +198,7 @@ int deviceopen(const char *pathname, cha
         errno=ENXIO;
       return -1;
     }
-    return open(pathname, O_RDONLY | O_NONBLOCK);
+    fd = open(pathname, O_RDONLY | O_NONBLOCK);
   }
   else if (0 == strcmp(type,"ATA_3WARE_678K")) {
     // the device nodes for this controller are dynamically assigned,
@@ -209,15 +209,17 @@ int deviceopen(const char *pathname, cha
         errno=ENXIO;
       return -1;
     }
-    return open(pathname, O_RDONLY | O_NONBLOCK);
+    fd = open(pathname, O_RDONLY | O_NONBLOCK);
   }
   else if(0 == strcmp(type, "CCISS")) {
     // the device is a cciss smart array device.
-    return open(pathname, O_RDWR | O_NONBLOCK);
+    fd = open(pathname, O_RDWR | O_NONBLOCK);
   }
-  else
-    return -1;
 
+  if (fd != -1) {
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
+  }
+  return fd;
 }
 
 // equivalent to close(file descriptor)



From fedora-extras-commits at redhat.com  Mon Mar 10 12:42:32 2008
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Mar 2008 12:42:32 GMT
Subject: rpms/konversation/devel konversation.spec, 1.13, 1.14 kdegcc4.patch,
	1.1, NONE
Message-ID: <200803101242.m2ACgWoc021655@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21617

Modified Files:
	konversation.spec 
Removed Files:
	kdegcc4.patch 
Log Message:
* Mon Mar 10 2008 Rex Dieter  - 1.0.1-5
- drop Requires: kdebase3 (#435873)
- f9+: dfi vendor fedora -> kde
- %doc ChangeLog COPYING README TODO



Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- konversation.spec	8 Feb 2008 06:02:29 -0000	1.13
+++ konversation.spec	10 Mar 2008 12:41:52 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           konversation
 Version:        1.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,8 +9,17 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase3-devel  >= 3.4, desktop-file-utils, gettext
-Requires:       kdebase3 >= 3.4
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+%if 0%{?fedora} > 8 
+BuildRequires:  kdelibs3-devel
+%define vendor_path kde
+%else
+BuildRequires:  kdelibs-devel
+%define vendor_pre fedora
+%define vendor_prefix -%{vendor_pre} 
+%endif
 
 
 %description
@@ -25,21 +34,27 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure
+
+%configure \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-final
+
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
+
 desktop-file-install \
---dir $RPM_BUILD_ROOT%{_datadir}/applications \
---vendor=fedora \
---add-category=X-Fedora \
+--dir="$RPM_BUILD_ROOT%{_datadir}/applications/%{?vendor_path}" \
+--vendor="%{?vendor_pre}" \
 --delete-original \
 $RPM_BUILD_ROOT%{_datadir}/applications/kde/konversation.desktop
 
+# CVE-2007-4400
 rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konversation/scripts/media
 
 ## File lists
@@ -54,9 +69,11 @@
 done
 fi
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 touch --no-create %{_datadir}/icons/crystalsvg || :
@@ -68,13 +85,13 @@
 
 %files  -f %{name}.lang
 %defattr(-,root,root,-)
-%doc
+%doc ChangeLog COPYING README TODO 
 %{_bindir}/konversation
 %{_bindir}/konversationircprotocolhandler
-%{_datadir}/applications/fedora-konversation.desktop
+%{_datadir}/applications/%{?vendor_path}/%{?vendor_prefix}konversation.desktop
 %{_datadir}/apps/kconf_update/*
 %{_datadir}/apps/konversation
-%config %{_datadir}/config.kcfg/konversation.kcfg
+%{_datadir}/config.kcfg/konversation.kcfg
 %{_datadir}/icons/crystalsvg/*/actions/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/services/konvirc.protocol
@@ -82,6 +99,11 @@
 
 
 %changelog
+* Mon Mar 10 2008 Rex Dieter  - 1.0.1-5
+- drop Requires: kdebase3 (#435873)
+- f9+: dfi vendor fedora -> kde
+- %%doc ChangeLog COPYING README TODO
+
 * Thu Feb 07 2008 Dennis Gilmore  - 1.0.1-4
 - remove /usr/share/apps/konversation/scripts/media for CVE-2007-4400
 


--- kdegcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 12:49:31 2008
From: fedora-extras-commits at redhat.com (Joe Orton (jorton))
Date: Mon, 10 Mar 2008 12:49:31 GMT
Subject: rpms/neon/devel neon-0.28.1.tar.gz.asc, NONE, 1.1 .cvsignore, 1.12, 
	1.13 neon.spec, 1.40, 1.41 sources, 1.11, 1.12 upstream, 1.5, 1.6
Message-ID: <200803101249.m2ACnVQ0021859@cvs-int.fedora.redhat.com>

Author: jorton

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

Modified Files:
	.cvsignore neon.spec sources upstream 
Added Files:
	neon-0.28.1.tar.gz.asc 
Log Message:
* Mon Mar 10 2008 Joe Orton  0.28.1-2
- update to 0.28.1



--- NEW FILE neon-0.28.1.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)

iD8DBQBH1StCR/aWnQ5EzwwRAopaAKDLenQ2+TY8G7jqGUJ/g63SitSlrwCg1IhK
VHlmIJ0S8ZFj9nxTx05rrLo=
=3/Tw
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Feb 2008 20:09:38 -0000	1.12
+++ .cvsignore	10 Mar 2008 12:48:58 -0000	1.13
@@ -1 +1 @@
-neon-0.28.0.tar.gz
+neon-0.28.1.tar.gz


Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- neon.spec	26 Feb 2008 22:26:28 -0000	1.40
+++ neon.spec	10 Mar 2008 12:48:58 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.28.0
-Release: 3
+Version: 0.28.1
+Release: 2
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
@@ -72,6 +72,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Mar 10 2008 Joe Orton  0.28.1-2
+- update to 0.28.1
+
 * Tue Feb 26 2008 Joe Orton  0.28.0-3
 - rebuild against pakchois
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Feb 2008 20:09:38 -0000	1.11
+++ sources	10 Mar 2008 12:48:58 -0000	1.12
@@ -1 +1 @@
-9d938e1e46003cae11d9e6f596da8c95  neon-0.28.0.tar.gz
+516c576c0ca5c0a01ad24d018093cfee  neon-0.28.1.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/upstream,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- upstream	8 Feb 2008 20:09:38 -0000	1.5
+++ upstream	10 Mar 2008 12:48:58 -0000	1.6
@@ -1 +1 @@
-neon-0.28.0.tar.gz
+neon-0.28.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 12:49:45 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 12:49:45 GMT
Subject: rpms/gnome-phone-manager/devel gpm-telepathy-workaround.patch, NONE,
	1.1 gnome-phone-manager.spec, 1.16, 1.17
Message-ID: <200803101249.m2ACnjck021901@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21793

Modified Files:
	gnome-phone-manager.spec 
Added Files:
	gpm-telepathy-workaround.patch 
Log Message:
* Mon Mar 10 2008 - Bastien Nocera  - 0.50-2
- Work-around for telepathy brokeness


gpm-telepathy-workaround.patch:

--- NEW FILE gpm-telepathy-workaround.patch ---
--- configure.orig	2008-03-10 12:43:16.000000000 +0000
+++ configure	2008-03-10 12:43:26.000000000 +0000
@@ -22928,12 +22928,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_TELEPATHY_CFLAGS="$TELEPATHY_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"telepathy-glib\"") >&5
-  ($PKG_CONFIG --exists --print-errors "telepathy-glib") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 dbus-glib-1 telepathy-glib\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 dbus-glib-1 telepathy-glib") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib" 2>/dev/null`
+  pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 dbus-glib-1 telepathy-glib" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22946,12 +22946,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_TELEPATHY_LIBS="$TELEPATHY_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"telepathy-glib\"") >&5
-  ($PKG_CONFIG --exists --print-errors "telepathy-glib") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 dbus-glib-1 telepathy-glib\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 dbus-glib-1 telepathy-glib") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs "telepathy-glib" 2>/dev/null`
+  pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs "glib-2.0 dbus-glib-1 telepathy-glib" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22970,9 +22970,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "telepathy-glib"`
+	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 dbus-glib-1 telepathy-glib"`
         else
-	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "telepathy-glib"`
+	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 dbus-glib-1 telepathy-glib"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$TELEPATHY_PKG_ERRORS" >&5


Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-phone-manager.spec	10 Mar 2008 12:27:51 -0000	1.16
+++ gnome-phone-manager.spec	10 Mar 2008 12:49:05 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.50
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPLv2+
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -23,6 +23,9 @@
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=436773
+Patch1:		gpm-telepathy-workaround.patch
+
 %description
 This program will connect to your mobile phone over a serial port,
 either via a cable, infrared (IrDA) or Bluetooth connection.
@@ -44,6 +47,7 @@
 
 %prep
 %setup -q
+%patch1 -p0 -b .telepathy-cflags
 
 %build
 %configure
@@ -104,6 +108,9 @@
 %{_datadir}/mission-control/profiles/*
 
 %changelog
+* Mon Mar 10 2008 - Bastien Nocera  - 0.50-2
+- Work-around for telepathy brokeness
+
 * Mon Mar 10 2008 - Bastien Nocera  - 0.50-1
 - Update to 0.50
 



From fedora-extras-commits at redhat.com  Mon Mar 10 13:10:34 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 13:10:34 GMT
Subject: rpms/vinagre/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 vinagre.spec, 1.16, 1.17
Message-ID: <200803101310.m2ADAYbk029369@cvs-int.fedora.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
0.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Feb 2008 04:22:18 -0000	1.7
+++ .cvsignore	10 Mar 2008 13:10:02 -0000	1.8
@@ -1 +1 @@
-vinagre-0.4.92.tar.bz2
+vinagre-0.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Feb 2008 04:22:18 -0000	1.7
+++ sources	10 Mar 2008 13:10:02 -0000	1.8
@@ -1 +1 @@
-bfb4f65a9a3d05d9973748940d0c92a8  vinagre-0.4.92.tar.bz2
+3d5febbf26565e2095355848064a796a  vinagre-0.5.0.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/extras/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vinagre.spec	26 Feb 2008 04:22:18 -0000	1.16
+++ vinagre.spec	10 Mar 2008 13:10:02 -0000	1.17
@@ -1,12 +1,12 @@
 Name:		vinagre
-Version:	0.4.92
+Version:	0.5.0
 Release:	1%{?dist}
 Summary:	VNC client for the GNOME desktop
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.gnome.org/~jwendell/vinagre/
-Source0:	http://download.gnome.org/sources/vinagre/0.4/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/vinagre/0.5/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -99,6 +99,9 @@
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 0.5.0-1
+- Update to 0.5.0
+
 * Mon Feb 25 2008 Matthias Clasen  - 0.4.92-1
 - Update to 0.4.92
 



From fedora-extras-commits at redhat.com  Mon Mar 10 13:15:03 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 13:15:03 GMT
Subject: rpms/atk/devel atk.spec,1.57,1.58
Message-ID: <200803101315.m2ADF3de029509@cvs-int.fedora.redhat.com>

Author: mclasen

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

Modified Files:
	atk.spec 
Log Message:
1.22.0



Index: atk.spec
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/atk.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- atk.spec	25 Feb 2008 20:30:50 -0000	1.57
+++ atk.spec	10 Mar 2008 13:14:08 -0000	1.58
@@ -2,11 +2,11 @@
 
 Summary: Interfaces for accessibility support
 Name: atk
-Version: 1.21.92
+Version: 1.22.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/atk/1.21/atk-%{version}.tar.bz2 
+Source: http://download.gnome.org/sources/atk/1.22/atk-%{version}.tar.bz2 
 URL: http://developer.gnome.org/projects/gap/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -72,6 +72,9 @@
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 1.22.0-1
+- Update to 1.22.0
+
 * Mon Feb 25 2008 Matthias Clasen  - 1.21.92-1
 - Update to 1.21.92
 



From fedora-extras-commits at redhat.com  Mon Mar 10 13:17:35 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 13:17:35 GMT
Subject: rpms/atk/devel .cvsignore,1.35,1.36 sources,1.35,1.36
Message-ID: <200803101317.m2ADHZuX029621@cvs-int.fedora.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore sources 
Log Message:
1.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	25 Feb 2008 20:30:50 -0000	1.35
+++ .cvsignore	10 Mar 2008 13:16:46 -0000	1.36
@@ -1 +1 @@
-atk-1.21.92.tar.bz2
+atk-1.22.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	25 Feb 2008 20:30:50 -0000	1.35
+++ sources	10 Mar 2008 13:16:46 -0000	1.36
@@ -1 +1 @@
-93b61b9a1e41e45b44cb8413be6af56e  atk-1.21.92.tar.bz2
+06a2b39a22d5ca35c47435da6b9643ac  atk-1.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 13:24:10 2008
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon, 10 Mar 2008 13:24:10 GMT
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.17,1.18
Message-ID: <200803101324.m2ADOA0Z029745@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29725

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Add man page



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-phone-manager.spec	10 Mar 2008 12:49:05 -0000	1.17
+++ gnome-phone-manager.spec	10 Mar 2008 13:23:35 -0000	1.18
@@ -100,6 +100,7 @@
 %{_bindir}/gnome-phone-manager
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome-phone-manager/
+%{_mandir}/man1/gnome-phone-manager.1.gz
 
 %files telepathy
 %{_libexecdir}/telepathy-phoney



From fedora-extras-commits at redhat.com  Mon Mar 10 13:36:07 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 13:36:07 GMT
Subject: rpms/openoffice.org/devel workspace.cmcfixes43.patch, 1.1.2.3,
	1.1.2.4
Message-ID: <200803101336.m2ADa7wd030043@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30023

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	workspace.cmcfixes43.patch 
Log Message:
add system lpsolve

workspace.cmcfixes43.patch:

Index: workspace.cmcfixes43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/Attic/workspace.cmcfixes43.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- workspace.cmcfixes43.patch	7 Mar 2008 19:50:44 -0000	1.1.2.3
+++ workspace.cmcfixes43.patch	10 Mar 2008 13:35:57 -0000	1.1.2.4
@@ -105,7 +105,7 @@
 Index: udk/testtools/source/bridgetest/component.LINUXIgcc3.map
 diff -u udk/testtools/source/bridgetest/component.LINUXIgcc3.map:1.3 udk/testtools/source/bridgetest/component.LINUXIgcc3.map:removed
 --- udk/testtools/source/bridgetest/component.LINUXIgcc3.map:1.3	Fri Sep  9 05:21:49 2005
-+++ udk/testtools/source/bridgetest/component.LINUXIgcc3.map	Fri Mar  7 09:02:56 2008
++++ udk/testtools/source/bridgetest/component.LINUXIgcc3.map	Mon Mar 10 06:32:43 2008
 @@ -1,46 +0,0 @@
 -#*************************************************************************
 -#
@@ -155,7 +155,7 @@
 -};
 Index: udk/testtools/source/bridgetest/component.gcc3.map
 diff -u /dev/null udk/testtools/source/bridgetest/component.gcc3.map:1.1.2.1
---- /dev/null	Fri Mar  7 09:02:56 2008
+--- /dev/null	Mon Mar 10 06:32:43 2008
 +++ udk/testtools/source/bridgetest/component.gcc3.map	Mon Mar  3 02:54:31 2008
 @@ -0,0 +1,46 @@
 +#*************************************************************************
@@ -247,7 +247,7 @@
  .ENDIF
 Index: udk/cppuhelper/qa/propertysetmixin/test.gcc3.map
 diff -u /dev/null udk/cppuhelper/qa/propertysetmixin/test.gcc3.map:1.1.2.1
---- /dev/null	Fri Mar  7 09:03:01 2008
+--- /dev/null	Mon Mar 10 06:32:46 2008
 +++ udk/cppuhelper/qa/propertysetmixin/test.gcc3.map	Mon Mar  3 01:51:55 2008
 @@ -0,0 +1,44 @@
 +#*************************************************************************
@@ -294,9 +294,19 @@
 +    local:
 +        *;
 +};
+Index: sc/scext/prj/build.lst
+diff -u sc/scext/prj/build.lst:1.4 sc/scext/prj/build.lst:1.4.2.1
+--- sc/scext/prj/build.lst:1.4	Mon Feb 11 00:55:26 2008
++++ sc/scext/prj/build.lst	Mon Mar 10 05:19:15 2008
+@@ -1,4 +1,4 @@
+-scx	scext	:	offuh comphelper lpsolve tools transex3 rsc NULL
++scx	scext	:	offuh comphelper LPSOLVE:lpsolve tools transex3 rsc NULL
+ scx	scext									usr1	-	all	scx_mkout NULL
+ scx	scext\prj								get		-	all	scx_prj NULL
+ scx	scext\source\solver						nmake	-	all	scx_solver NULL
 Index: porting/sal/qa/rtl/textenc/gcc3_export.map
 diff -u /dev/null porting/sal/qa/rtl/textenc/gcc3_export.map:1.1.2.1
---- /dev/null	Fri Mar  7 09:03:08 2008
+--- /dev/null	Mon Mar 10 06:32:58 2008
 +++ porting/sal/qa/rtl/textenc/gcc3_export.map	Mon Mar  3 02:49:08 2008
 @@ -0,0 +1,44 @@
 +#*************************************************************************
@@ -346,7 +356,7 @@
 Index: porting/sal/qa/rtl/textenc/linuxigcc3_export.map
 diff -u porting/sal/qa/rtl/textenc/linuxigcc3_export.map:1.3 porting/sal/qa/rtl/textenc/linuxigcc3_export.map:removed
 --- porting/sal/qa/rtl/textenc/linuxigcc3_export.map:1.3	Thu Sep  8 08:52:16 2005
-+++ porting/sal/qa/rtl/textenc/linuxigcc3_export.map	Fri Mar  7 09:03:08 2008
++++ porting/sal/qa/rtl/textenc/linuxigcc3_export.map	Mon Mar 10 06:32:58 2008
 @@ -1,44 +0,0 @@
 -#*************************************************************************
 -#
@@ -435,6 +445,38 @@
  #endif
  
  /* Define if you have the  header file. */
+Index: installation/scp2/source/calc/file_calc.scp
+diff -u installation/scp2/source/calc/file_calc.scp:1.38 installation/scp2/source/calc/file_calc.scp:1.38.42.1
+--- installation/scp2/source/calc/file_calc.scp:1.38	Tue Feb  5 07:51:55 2008
++++ installation/scp2/source/calc/file_calc.scp	Mon Mar 10 05:19:09 2008
+@@ -37,10 +37,12 @@
+ 
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Solver, solver)
+ 
++#ifndef SYSTEM_LPSOLVE
+ File gid_File_Lib_Lpsolve
+     Name = SPECIAL_NAME(lpsolve55);
+     PACKED_LIB_FILE_BODY_PATCH;
+ End
++#endif
+ 
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Analysis, analysis)
+ 
+Index: installation/scp2/source/calc/makefile.mk
+diff -u installation/scp2/source/calc/makefile.mk:1.6 installation/scp2/source/calc/makefile.mk:1.6.1008.1
+--- installation/scp2/source/calc/makefile.mk:1.6	Thu Sep  8 18:21:34 2005
++++ installation/scp2/source/calc/makefile.mk	Mon Mar 10 05:19:09 2008
+@@ -49,6 +49,10 @@
+ SCPDEFS+=-DWITHOUT_BINFILTER
+ .ENDIF
+ 
++.IF "$(SYSTEM_LPSOLVE)" == "YES"
++SCPDEFS+=-DSYSTEM_LPSOLVE
++.ENDIF
++
+ SCP_PRODUCT_TYPE=osl
+ PARFILES= \
+         module_calc.par              \
 Index: util/xmlhelp/source/com/sun/star/help/makefile.mk
 diff -u util/xmlhelp/source/com/sun/star/help/makefile.mk:1.32 util/xmlhelp/source/com/sun/star/help/makefile.mk:1.32.2.1
 --- util/xmlhelp/source/com/sun/star/help/makefile.mk:1.32	Mon Feb 25 23:46:38 2008
@@ -450,9 +492,258 @@
  OBJFILES=\
          $(OBJ)$/HelpLinker.obj \
          $(OBJ)$/HelpCompiler.obj
+Index: tools/config_office/configure.in
+diff -u tools/config_office/configure.in:1.249 tools/config_office/configure.in:1.249.12.3
+--- tools/config_office/configure.in:1.249	Tue Feb 19 04:37:37 2008
++++ tools/config_office/configure.in	Mon Mar 10 05:21:09 2008
+@@ -278,9 +278,15 @@
+ ],,)
+ AC_ARG_WITH(system-libs,
+ [  --with-system-libs      Use libs already on system -- enables all
+-                          --with-system-* flags except mozilla, python and
++                          --with-system-* flags except mozilla and
+                           odbc/sane/xrender-header(s)
+ ],,)
++AC_ARG_WITH(system-headers,
++[  --with-system-headers   Use headers already on system -- enables all
++                          --with-system-* flags for external packages
++                          whose headers are the only entities used i.e.
++                          boost/vigra/odbc/sane/xrender-header(s)
++],,)
+ AC_ARG_WITH(system-jars,
+ [  --without-system-jars   When building with --with-system-libs, also the
+                           needed jars are expected on the system. Use this to
+@@ -461,12 +467,16 @@
+ AC_ARG_WITH(system-altlinuxhyph,
+ [  --with-system-altlinuxhyph    Use ALTLinuxhyph already on system
+ ],,)
++AC_ARG_WITH(system-lpsolve,
++[  --with-system-lpsolve         Use lpsolve already on system
++],,)
+ AC_ARG_WITH(system-mozilla,
+ [  --with-system-mozilla   Use mozilla already on system. Note that some
+                           components cannot be built against a contemporary
+                           mozilla. The flavour used can be specified by
+                           --with-system-mozilla=. Supported are:
+-                          xulrunner (default), firefox, seamonkey, mozilla
++                          libxul (default), xulrunner, firefox, seamonkey,
++                          mozilla
+ ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
+ AC_ARG_WITH(stlport,
+ [  --with-stlport         The location that STLport is installed in. The STL
+@@ -3151,10 +3161,12 @@
+ dnl ===================================================================
+ dnl Check for prelinked libgcc_s.so.1
+ dnl ===================================================================
+-if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
+-  with_system_stdlibs=yes
+-  AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
+-  echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
++if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
++  if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
++    with_system_stdlibs=yes
++    AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
++    echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
++  fi
+ fi
+ 
+ dnl ===================================================================
+@@ -3361,7 +3373,8 @@
+    with_system_python=yes
+ fi
+ AC_MSG_CHECKING([which python to use])
+-if test -n "$with_system_python" && test "$with_system_python" != "no"; then
++if test -n "$with_system_python" -o -n "$with_system_libs" && \
++	test "$with_system_python" != "no"; then
+    SYSTEM_PYTHON=YES
+    AC_MSG_RESULT([external])
+    AM_PATH_PYTHON([2.2])
+@@ -3669,7 +3682,8 @@
+ dnl Check for system boost
+ dnl ===================================================================
+ AC_MSG_CHECKING([which boost to use])
+-if test -n "$with_system_boost" && test "$with_system_boost" != "no"; then
++if test -n "$with_system_boost" -o -n "$with_system_headers" && \
++	test "$with_system_boost" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_BOOST=YES
+    AC_LANG_PUSH([C++])
+@@ -3689,7 +3703,8 @@
+ dnl Check for system vigra
+ dnl ===================================================================
+ AC_MSG_CHECKING([which vigra to use])
+-if test -n "$with_system_vigra" && test "$with_system_vigra" != "no"; then
++if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
++	test "$with_system_vigra" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_VIGRA=YES
+    AC_LANG_PUSH([C++])
+@@ -3707,7 +3722,8 @@
+ dnl Check for system odbc
+ dnl ===================================================================
+ AC_MSG_CHECKING([which odbc headers to use])
+-if test -n "$with_system_odbc_headers" && test "$with_system_odbc_headers" != "no"; then
++if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \
++	test "$with_system_odbc_headers" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_ODBC_HEADERS=YES
+ 
+@@ -3794,7 +3810,9 @@
+     AC_MSG_RESULT([external])
+     SYSTEM_MOZILLA=YES
+     AC_MSG_CHECKING([which Mozilla flavour to use])
+-    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
++    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
++      MOZ_FLAVOUR=libxul
++    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
+       MOZ_FLAVOUR=xulrunner
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
+       MOZ_FLAVOUR=seamonkey
+@@ -3803,12 +3821,18 @@
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
+       MOZ_FLAVOUR=mozilla
+     else
+-      MOZ_FLAVOUR=xulrunner
++      MOZ_FLAVOUR=libxul
+     fi
+     tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst();'`
+     AC_MSG_RESULT($tmp)
+ 
+-    PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
++    PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
++    if test -z "$STANDALONENSS"; then
++        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
++    else
++        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
++        AC_SUBST(NSS_LIB)
++    fi
+ 
+     if $PKG_CONFIG --exists nspr ; then
+       PKG_CHECK_MODULES( MOZ_NSPR, nspr )
+@@ -3818,12 +3842,14 @@
+       PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
+     fi
+ 
+-    PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
+-    if test -z "$STANDALONENSS"; then
+-        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
++    if $PKG_CONFIG --exists libxul ; then
++      PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
++      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
++      MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
+     else
+-        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
+-        AC_SUBST(NSS_LIB)
++      PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
++      MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
++      MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
+     fi
+ 
+     save_CPPFLAGS="$CPPFLAGS"
+@@ -3839,8 +3865,6 @@
+     CPPFLAGS="$save_CPPFLAGS"
+     LIBS="$save_LIBS"
+ 
+-    MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
+-    MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
+     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
+     if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
+       AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
+@@ -3853,6 +3877,13 @@
+ Please recompile $tmp with --enable-ldap or use --with-openldap.])
+       fi
+     fi
++
++    #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
++    #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
++    if test "$MOZ_FLAVOUR" == "libxul"; then
++        MOZ_FLAVOUR="mozilla"
++    fi
++
+ elif test "$enable_mozilla" = "no"; then
+     AC_MSG_RESULT([none])
+     WITH_MOZILLA=NO
+@@ -3989,7 +4020,8 @@
+ dnl Check for system sane
+ dnl ===================================================================
+ AC_MSG_CHECKING([which sane header to use])
+-if test -n "$with_system_sane_header" && test "$with_system_sane_header" != "no"; then
++if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
++	test "$with_system_sane_header" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_SANE_HEADER=YES
+    AC_CHECK_HEADER(sane/sane.h, [],
+@@ -4186,7 +4218,8 @@
+    XRENDER_LINK=NO
+ fi
+ AC_MSG_CHECKING([which Xrender headers to use])
+-if test -n "$with_system_xrender_headers" && test "$with_system_xrender_headers" != "no"; then
++if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
++	test "$with_system_xrender_headers" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_XRENDER_HEADERS=YES
+    AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
+@@ -4421,7 +4454,8 @@
+ dnl Check for system hunspell
+ dnl ===================================================================
+ AC_MSG_CHECKING([which libhunspell to use])
+-if test -n "$with_system_hunspell" && test "$with_system_hunspell" != "no"; then
++if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
++	test "$with_system_hunspell" != "no"; then
+     AC_MSG_RESULT([external])
+     SYSTEM_HUNSPELL=YES
+     AC_LANG_PUSH([C++])
+@@ -4449,7 +4483,8 @@
+ dnl Checking for altlinuxhyph
+ dnl ===================================================================
+ AC_MSG_CHECKING([which altlinuxhyph to use])
+-if test -n "$with_system_altlinuxhyph" && test "$with_system_altlinuxyph" != "no"; then
++if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
++	test "$with_system_altlinuxhyph" != "no"; then
+     AC_MSG_RESULT([external])
+     SYSTEM_HYPH=YES
+     AC_CHECK_HEADER(hyphen.h, [],
+@@ -4491,6 +4526,25 @@
+ fi
+ AC_SUBST(SYSTEM_MYTHES)
+ 
++dnl ===================================================================
++dnl Checking for lpsolve
++dnl ===================================================================
++AC_MSG_CHECKING([which lpsolve to use])
++if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
++	test "$with_system_lpsolve" != "no"; then
++    AC_MSG_RESULT([external])
++    SYSTEM_LPSOLVE=YES
++    AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
++       [ AC_MSG_ERROR(lpsolve headers not found.)], [])
++    AC_CHECK_LIB(lpsolve55, make_lp, ,
++        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
++else
++    AC_MSG_RESULT([internal])
++    SYSTEM_LPSOLVE=NO
++    BUILD_TYPE="$BUILD_TYPE LPSOLVE"
++fi
++AC_SUBST(SYSTEM_LPSOLVE)
++
+ dnl ***************************************
+ dnl testing libc version for Linux...
+ dnl ***************************************
+Index: tools/config_office/set_soenv.in
+diff -u tools/config_office/set_soenv.in:1.174 tools/config_office/set_soenv.in:1.174.6.1
+--- tools/config_office/set_soenv.in:1.174	Wed Feb 27 02:03:23 2008
++++ tools/config_office/set_soenv.in	Mon Mar 10 05:21:10 2008
+@@ -2025,6 +2025,7 @@
+ ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
+ ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
+ ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
++ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",   "e" );
+ ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
+ ToFile( "HYPHEN_LIB",        "@HYPHEN_LIB@",       "e" );
+ ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
 Index: udk/jvmaccess/util/gcc3.map
 diff -u /dev/null udk/jvmaccess/util/gcc3.map:1.1.2.1
---- /dev/null	Fri Mar  7 09:03:35 2008
+--- /dev/null	Mon Mar 10 06:33:43 2008
 +++ udk/jvmaccess/util/gcc3.map	Mon Mar  3 01:38:57 2008
 @@ -0,0 +1,96 @@
 +#*************************************************************************
@@ -554,7 +845,7 @@
 Index: udk/jvmaccess/util/gcc3_linux_intel.map
 diff -u udk/jvmaccess/util/gcc3_linux_intel.map:1.14 udk/jvmaccess/util/gcc3_linux_intel.map:removed
 --- udk/jvmaccess/util/gcc3_linux_intel.map:1.14	Tue Jul  3 05:42:50 2007
-+++ udk/jvmaccess/util/gcc3_linux_intel.map	Fri Mar  7 09:03:35 2008
++++ udk/jvmaccess/util/gcc3_linux_intel.map	Mon Mar 10 06:33:43 2008
 @@ -1,96 +0,0 @@
 -#*************************************************************************
 -#
@@ -705,6 +996,41 @@
  
  #ifdef GCC
  namespace std
+Index: tools/solenv/config/sdev300.ini
+diff -u tools/solenv/config/sdev300.ini:1.2 tools/solenv/config/sdev300.ini:1.2.10.1
+--- tools/solenv/config/sdev300.ini:1.2	Mon Feb 25 08:39:12 2008
++++ tools/solenv/config/sdev300.ini	Mon Mar 10 05:19:44 2008
+@@ -86,7 +86,7 @@
+ 		{
+ 			BIG_SVX TRUE
+ 			BMP_WRITES_FLAG TRUE
+-            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT REPORTDESIGN SDEXT
++            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT LPSOLVE XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT REPORTDESIGN SDEXT
+ 			RES_ENUS TRUE
+ 			RES_GER TRUE
+ 			NO_REC_RES TRUE
+Index: tools/solenv/inc/libs.mk
+diff -u tools/solenv/inc/libs.mk:1.126 tools/solenv/inc/libs.mk:1.126.10.1
+--- tools/solenv/inc/libs.mk:1.126	Mon Feb 25 08:42:00 2008
++++ tools/solenv/inc/libs.mk	Wed Mar  5 09:24:45 2008
+@@ -327,7 +327,7 @@
+ SABLOT3RDLIB=-lsablot
+ APP3RDLIB=-lapp
+ SAMPLE3RDLIB=-lsample
+-HNJLIB=-lhnj
++HNJLIB*=-lhnj
+ MYSPELLLIB=-lmyspell
+ COSVLIB=-lcosv
+ UDMLIB=-ludm
+@@ -483,7 +483,7 @@
+ SABLOT3RDLIB= $(LIBPRE) sablot.lib
+ APP3RDLIB= $(LIBPRE) app.lib
+ SAMPLE3RDLIB= $(LIBPRE) sample.lib
+-HNJLIB= libhnj.lib
++HNJLIB*=libhnj.lib
+ MYSPELLLIB= $(LIBPRE) myspell.lib
+ COSVLIB= $(LIBPRE) cosv.lib
+ UDMLIB= $(LIBPRE) udm.lib
 Index: udk/stoc/test/registry_tdprovider/makefile.mk
 diff -u udk/stoc/test/registry_tdprovider/makefile.mk:1.4 udk/stoc/test/registry_tdprovider/makefile.mk:1.4.88.1
 --- udk/stoc/test/registry_tdprovider/makefile.mk:1.4	Thu Sep  8 01:30:08 2005
@@ -723,7 +1049,7 @@
 Index: udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map
 diff -u udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:1.3 udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:removed
 --- udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:1.3	Thu Sep  8 01:30:31 2005
-+++ udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map	Fri Mar  7 09:03:51 2008
++++ udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map	Mon Mar 10 06:34:10 2008
 @@ -1,46 +0,0 @@
 -#*************************************************************************
 -#
@@ -773,7 +1099,7 @@
 -};
 Index: udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map
 diff -u /dev/null udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map:1.1.2.1
---- /dev/null	Fri Mar  7 09:03:51 2008
+--- /dev/null	Mon Mar 10 06:34:10 2008
 +++ udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map	Mon Mar  3 02:52:36 2008
 @@ -0,0 +1,46 @@
 +#*************************************************************************
@@ -840,7 +1166,7 @@
 Index: udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map
 diff -u udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:1.3 udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:removed
 --- udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:1.3	Thu Sep  8 01:32:51 2005
-+++ udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map	Fri Mar  7 09:03:51 2008
++++ udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map	Mon Mar 10 06:34:10 2008
 @@ -1,46 +0,0 @@
 -#*************************************************************************
 -#
@@ -890,7 +1216,7 @@
 -};
 Index: udk/stoc/test/tdmanager/testtdmanager.gcc3.map
 diff -u /dev/null udk/stoc/test/tdmanager/testtdmanager.gcc3.map:1.1.2.1
---- /dev/null	Fri Mar  7 09:03:51 2008
+--- /dev/null	Mon Mar 10 06:34:10 2008
 +++ udk/stoc/test/tdmanager/testtdmanager.gcc3.map	Mon Mar  3 02:51:41 2008
 @@ -0,0 +1,46 @@
 +#*************************************************************************



From fedora-extras-commits at redhat.com  Mon Mar 10 13:38:11 2008
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 10 Mar 2008 13:38:11 GMT
Subject: devel/switchdesk .cvsignore, 1.21, 1.22 sources, 1.23,
	1.24 switchdesk.spec, 1.34, 1.35
Message-ID: <200803101338.m2ADcB32030152@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/devel/switchdesk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30130

Modified Files:
	.cvsignore sources switchdesk.spec 
Log Message:
update po files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/switchdesk/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	7 Mar 2008 21:21:35 -0000	1.21
+++ .cvsignore	10 Mar 2008 13:37:38 -0000	1.22
@@ -10,3 +10,4 @@
 switchdesk-4.0.8-6.tar.bz2
 switchdesk-4.0.8-7.tar.bz2
 switchdesk-4.0.9-1.tar.bz2
+switchdesk-4.0.9-2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/devel/switchdesk/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	7 Mar 2008 21:21:35 -0000	1.23
+++ sources	10 Mar 2008 13:37:38 -0000	1.24
@@ -1 +1 @@
-17049eed6e0ef448c28815a7cf6642eb  switchdesk-4.0.9-1.tar.bz2
+b83e849fba288d5b8c375a3ac959accf  switchdesk-4.0.9-2.tar.bz2


Index: switchdesk.spec
===================================================================
RCS file: /cvs/extras/devel/switchdesk/switchdesk.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- switchdesk.spec	7 Mar 2008 21:21:35 -0000	1.34
+++ switchdesk.spec	10 Mar 2008 13:37:38 -0000	1.35
@@ -1,7 +1,7 @@
 Name: switchdesk
 Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel.
 Version: 4.0.9
-Release: 1
+Release: 2
 Source: %{name}-%{version}-%{release}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
@@ -73,6 +73,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Mar 10 2008 Than Ngo  4.0.9-2
+- update po files
+
 * Fri Mar 07 2008 Than Ngo  4.0.9-1
 - 4.0.9
    - remove obsolete translation (#335231)



From fedora-extras-commits at redhat.com  Mon Mar 10 13:44:06 2008
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 10 Mar 2008 13:44:06 GMT
Subject: rpms/linuxwacom/devel 10-linuxwacom.fdi, 1.1, 1.2 linuxwacom.spec, 
	1.54, 1.55
Message-ID: <200803101344.m2ADi6aZ030362@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30340

Modified Files:
	10-linuxwacom.fdi linuxwacom.spec 
Log Message:
* Mon Mar 10 2008 Adam Jackson  0.7.9.8-4
- 10-linuxwacom.fdi: Fix driver name.



Index: 10-linuxwacom.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/10-linuxwacom.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 10-linuxwacom.fdi	9 Mar 2008 18:42:09 -0000	1.1
+++ 10-linuxwacom.fdi	10 Mar 2008 13:43:32 -0000	1.2
@@ -4,7 +4,7 @@
   
     
       
-	linuxwacom
+	wacom
       
     
   


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- linuxwacom.spec	9 Mar 2008 18:42:09 -0000	1.54
+++ linuxwacom.spec	10 Mar 2008 13:43:32 -0000	1.55
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.7.9.8
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -107,6 +107,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Mon Mar 10 2008 Adam Jackson  0.7.9.8-4
+- 10-linuxwacom.fdi: Fix driver name.
+
 * Sun Mar 09 2008 Adam Jackson  0.7.9.8-3
 - 10-linuxwacom.fdi: Blind attempt at supporting hotplug.
 



From fedora-extras-commits at redhat.com  Mon Mar 10 13:57:46 2008
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 10 Mar 2008 13:57:46 GMT
Subject: rpms/xorg-x11-drv-via/devel dead.package, NONE, 1.1 Makefile, 1.2, 
	NONE sources, 1.8, NONE via.xinf, 1.2,
	NONE xorg-x11-drv-via.spec, 1.26, NONE
Message-ID: <200803101357.m2ADvkT9030639@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-via/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30632

Added Files:
	dead.package 
Removed Files:
	Makefile sources via.xinf xorg-x11-drv-via.spec 
Log Message:
dead package


--- NEW FILE dead.package ---
Obsoleted by xorg-x11-drv-unichrome


--- Makefile DELETED ---


--- sources DELETED ---


--- via.xinf DELETED ---


--- xorg-x11-drv-via.spec DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 14:00:26 2008
From: fedora-extras-commits at redhat.com (Permaine Cheung (pcheung))
Date: Mon, 10 Mar 2008 14:00:26 GMT
Subject: rpms/bsh/devel bsh.spec,1.16,1.17
Message-ID: <200803101400.m2AE0QiC030701@cvs-int.fedora.redhat.com>

Author: pcheung

Update of /cvs/pkgs/rpms/bsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30669

Modified Files:
	bsh.spec 
Log Message:
Fix bugzilla 436675. Separate menu entry into desktop subpackage.




Index: bsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bsh/devel/bsh.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bsh.spec	6 Mar 2008 13:18:43 -0000	1.16
+++ bsh.spec	10 Mar 2008 13:59:44 -0000	1.17
@@ -32,7 +32,7 @@
 
 Name:           bsh
 Version:        1.3.0
-Release:        12jpp.2%{?dist}
+Release:        12jpp.3%{?dist}
 Epoch:          0
 Summary:        Lightweight Scripting for Java
 License:        LGPL
@@ -107,6 +107,14 @@
 %description demo
 Demonstrations and samples for %{name}.
 
+%package desktop
+Summary:        %{name} integration for the desktop
+Group:          Development/Java
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description desktop
+Contains a menu entry for %{name}.
+
 %prep
 %setup -q -n BeanShell
 %patch0 -p1
@@ -274,11 +282,13 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post desktop
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
+
+%post
 %update_maven_depmap
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -288,11 +298,13 @@
 %endif
 exit 0
 
-%postun
+%postun desktop
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
+
+%postun
 %update_maven_depmap
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -306,12 +318,9 @@
 %defattr(-,root,root)
 %doc src/Changes.html src/License.txt src/README.txt
 %attr(0755,root,root) %{_bindir}/%{name}
-%attr(0755,root,root) %{_bindir}/%{name}-desktop
 %attr(0755,root,root) %{_bindir}/%{name}doc
 %{_javadir}/*
 %dir %{_datadir}/%{name}
-%{_datadir}/applications/*%{name}-desktop.desktop
-%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 %{_datadir}/%{name}/webapps
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}
@@ -334,7 +343,15 @@
 %doc tests/README.txt tests/Interactive/README
 %{_datadir}/%{name}/*
 
+%files desktop
+%attr(0755,root,root) %{_bindir}/%{name}-desktop
+%{_datadir}/applications/*%{name}-desktop.desktop
+%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
+
 %changelog
+* Mon Mar 10 2008 Permaine Cheung  0:1.3.0-12jpp.3
+- Fix bugzilla 436675. Separate menu entry into desktop subpackage.
+
 * Thu Mar 06 2008 Permaine Cheung  0:1.3.0-12jpp.2
 - Fix bugzilla 417491. Thanks Ville Skytta for the patch.
 - Add menu entry and startup script for bsh desktop.



From fedora-extras-commits at redhat.com  Mon Mar 10 14:04:21 2008
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Mon, 10 Mar 2008 14:04:21 GMT
Subject: rpms/gdm/devel gdm-2.21.9-prevent-some-spurious-wakeups.patch, NONE,
	1.1 gdm.spec, 1.341, 1.342
Message-ID: <200803101404.m2AE4Lu5005561@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5504

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.21.9-prevent-some-spurious-wakeups.patch 
Log Message:
- Prevent some spurious wake ups caused by the
  timed login timer animation


gdm-2.21.9-prevent-some-spurious-wakeups.patch:

--- NEW FILE gdm-2.21.9-prevent-some-spurious-wakeups.patch ---
--- gdm-2.21.9/gui/simple-greeter/gdm-chooser-widget.c	(revision 5978)
+++ gdm-2.21.9/gui/simple-greeter/gdm-chooser-widget.c	(working copy)
@@ -82,6 +82,7 @@ struct GdmChooserWidgetPrivate
         gint                     number_of_separated_rows;
         gint                     number_of_rows_with_status;
         gint                     number_of_rows_with_images;
+        gint                     number_of_active_timers;
 
         guint                    update_idle_id;
         guint                    animation_timeout_id;
@@ -2034,6 +2035,7 @@ start_timer (GdmChooserWidget    *widget
         gtk_list_store_set (widget->priv->list_store, &iter,
                             CHOOSER_TIMER_VALUE_COLUMN, 0.0, -1);
 
+        widget->priv->number_of_active_timers++;
         if (widget->priv->timer_animation_timeout_id == 0) {
                 g_assert (g_hash_table_size (widget->priv->rows_with_timers) == 1);
 
@@ -2067,6 +2069,12 @@ stop_timer (GdmChooserWidget    *widget,
                             0.0, -1);
         gtk_list_store_set (widget->priv->list_store, &iter,
                             CHOOSER_TIMER_VALUE_COLUMN, 0.0, -1);
+
+        widget->priv->number_of_active_timers--;
+        if (widget->priv->number_of_active_timers == 0) {
+                g_source_remove (widget->priv->timer_animation_timeout_id);
+                widget->priv->timer_animation_timeout_id = 0;
+        }
 }
 
 static void


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- gdm.spec	10 Mar 2008 04:45:24 -0000	1.341
+++ gdm.spec	10 Mar 2008 14:03:28 -0000	1.342
@@ -19,7 +19,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.21.9
-Release: 0.2008.03.10.1%{?dist}
+Release: 0.2008.03.10.2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -89,6 +89,7 @@
 
 Requires: audit-libs >= %{libauditver}
 
+Patch0: gdm-2.21.9-prevent-some-spurious-wakeups.patch
 Patch99: gdm-2.21.8-fedora-logo.patch
 
 %package user-switch-applet
@@ -109,6 +110,7 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .prevent-some-spurious-wakeups
 %patch99 -p1 -b .fedora-logo
 
 %build
@@ -302,6 +304,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Mon Mar 10 2008 Ray Strode  - 1:2.21.9-0.2008.03.10.2
+- Prevent some spurious wake ups caused by the
+  timed login timer animation
+
 * Mon Mar 10 2008 Ray Strode  - 1:2.21.9-0.2008.03.10.1
 - Update to latest snapshot
 



From fedora-extras-commits at redhat.com  Mon Mar 10 14:08:17 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 14:08:17 GMT
Subject: rpms/at-spi/devel .cvsignore, 1.46, 1.47 at-spi.spec, 1.83,
	1.84 sources, 1.46, 1.47
Message-ID: <200803101408.m2AE8Hj8005711@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5676

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	25 Feb 2008 20:38:36 -0000	1.46
+++ .cvsignore	10 Mar 2008 14:07:41 -0000	1.47
@@ -1 +1 @@
-at-spi-1.21.92.tar.bz2
+at-spi-1.22.0.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- at-spi.spec	5 Mar 2008 16:44:23 -0000	1.83
+++ at-spi.spec	10 Mar 2008 14:07:41 -0000	1.84
@@ -9,10 +9,10 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.21.92
-Release: 2%{?dist}
+Version: 1.22.0
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
-Source0: http://download.gnome.org/sources/at-spi/1.21/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/at-spi/1.22/%{name}-%{version}.tar.bz2
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 1.22.0-1
+- Update to 1.22.0
+
 * Wed Mar  5 2008 Christopher Aillon  - 1.21-92-2
 - Perf improvement work from Ginn Chen to help a11y-enabled-firefox3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	25 Feb 2008 20:38:36 -0000	1.46
+++ sources	10 Mar 2008 14:07:41 -0000	1.47
@@ -1 +1 @@
-99f4e93714d2ddbf1a7b9011b4893c4f  at-spi-1.21.92.tar.bz2
+85dc343588016ecf854830fab0cd6fdc  at-spi-1.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 14:10:10 2008
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Mon, 10 Mar 2008 14:10:10 GMT
Subject: rpms/kernel/devel kernel.spec, 1.485,
	1.486 linux-2.6-firewire-git-pending.patch, 1.13,
	1.14 linux-2.6-firewire-git-update.patch, 1.8, 1.9
Message-ID: <200803101410.m2AEAAgQ005820@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5772

Modified Files:
	kernel.spec linux-2.6-firewire-git-pending.patch 
	linux-2.6-firewire-git-update.patch 
Log Message:
* Mon Mar 10 2008 Jarod Wilson 
- firewire: additional debug output if config ROM read fails



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- kernel.spec	8 Mar 2008 20:20:23 -0000	1.485
+++ kernel.spec	10 Mar 2008 14:09:35 -0000	1.486
@@ -1752,6 +1752,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Mon Mar 10 2008 Jarod Wilson 
+- firewire: additional debug output if config ROM read fails
+
 * Sat Mar  8 2008 Chuck Ebbert 
 - 2.6.25-rc4-git3
 

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-firewire-git-pending.patch	7 Mar 2008 06:46:59 -0000	1.13
+++ linux-2.6-firewire-git-pending.patch	10 Mar 2008 14:09:35 -0000	1.14
@@ -3,693 +3,1028 @@
 # tree, which we think we're going to want...
 #
 
-read_bus_info_block() is repeatedly called by workqueue jobs.
-These will step on each others toes eventually if there are multiple
-workqueue threads, and we end up with corrupt config ROM images.
+
+Increase reconnect management orb timeout.
+
+Signed-off-by: Jarod Wilson 
+
+---
+
+ drivers/firewire/fw-sbp2.c |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
+index d6d62c6..da315cf 100644
+--- a/drivers/firewire/fw-sbp2.c
++++ b/drivers/firewire/fw-sbp2.c
+@@ -170,6 +170,7 @@ struct sbp2_target {
+  */
+ #define SBP2_MIN_LOGIN_ORB_TIMEOUT	5000U	/* Timeout in ms */
+ #define SBP2_MAX_LOGIN_ORB_TIMEOUT	40000U	/* Timeout in ms */
++#define SBP2_MAX_RECONNECT_ORB_TIMEOUT	6000U	/* Timeout in ms */
+ #define SBP2_ORB_TIMEOUT		2000U	/* Timeout in ms */
+ #define SBP2_ORB_NULL			0x80000000
+ #define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000
+@@ -538,14 +539,24 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
+ 	orb->request.status_fifo.low  =
+ 		cpu_to_be32(lu->address_handler.offset);
+ 
+-	if (function == SBP2_LOGIN_REQUEST) {
++	switch (function) {
++
++	case SBP2_LOGIN_REQUEST:
+ 		/* Ask for 2^2 == 4 seconds reconnect grace period */
+ 		orb->request.misc |= cpu_to_be32(
+ 			MANAGEMENT_ORB_RECONNECT(2) |
+ 			MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login));
+ 		timeout = lu->tgt->mgt_orb_timeout;
+-	} else {
++		break;
++
++	case SBP2_RECONNECT_REQUEST:
++		timeout = min(SBP2_MAX_RECONNECT_ORB_TIMEOUT,
++			      lu->tgt->mgt_orb_timeout);
++		break;
++
++	default:
+ 		timeout = SBP2_ORB_TIMEOUT;
++		break;
+ 	}
+ 
+ 	init_completion(&orb->done);
+
+
+
+Use bitwise and to get reg in handle_registers.
+
+Signed-off-by: Jarod Wilson 
+
+---
+
+ drivers/firewire/fw-transaction.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
+index 56f7ee9..e550535 100644
+--- a/drivers/firewire/fw-transaction.c
++++ b/drivers/firewire/fw-transaction.c
+@@ -791,7 +791,7 @@ handle_registers(struct fw_card *card, struct fw_request *request,
+ 		 unsigned long long offset,
+ 		 void *payload, size_t length, void *callback_data)
+ {
+-	int reg = offset - CSR_REGISTER_BASE;
++	int reg = offset & ~CSR_REGISTER_BASE;
+ 	unsigned long long bus_time;
+ 	__be32 *data = payload;
+
+
+
+Trivial change to replace more meaningless (to the untrained eye) hex
+values with defined CSR constants.
+
+Signed-off-by: Jarod Wilson 
+
+---
+
+ drivers/firewire/fw-device.c      |    2 +-
+ drivers/firewire/fw-transaction.c |    9 ++++++---
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
+index 19f2fc4..f559c63 100644
+--- a/drivers/firewire/fw-device.c
++++ b/drivers/firewire/fw-device.c
+@@ -410,7 +410,7 @@ read_rom(struct fw_device *device, int generation, int index, u32 *data)
+ 
+ 	init_completion(&callback_data.done);
+ 
+-	offset = 0xfffff0000400ULL + index * 4;
++	offset = (CSR_REGISTER_BASE | CSR_CONFIG_ROM) + index * 4;
+ 	fw_send_request(device->card, &t, TCODE_READ_QUADLET_REQUEST,
+ 			device->node_id, generation, device->max_speed,
+ 			offset, NULL, 4, complete_transaction, &callback_data);
+diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
+index 99529e5..56f7ee9 100644
+--- a/drivers/firewire/fw-transaction.c
++++ b/drivers/firewire/fw-transaction.c
+@@ -396,7 +396,8 @@ const struct fw_address_region fw_high_memory_region =
+ const struct fw_address_region fw_private_region =
+ 	{ .start = 0xffffe0000000ULL, .end = 0xfffff0000000ULL,  };
+ const struct fw_address_region fw_csr_region =
+-	{ .start = 0xfffff0000000ULL, .end = 0xfffff0000800ULL,  };
++	{ .start = CSR_REGISTER_BASE,
++	  .end   = CSR_REGISTER_BASE | CSR_CONFIG_ROM_END,  };
+ const struct fw_address_region fw_unit_space_region =
+ 	{ .start = 0xfffff0000900ULL, .end = 0x1000000000000ULL, };
+ EXPORT_SYMBOL(fw_low_memory_region);
+@@ -741,7 +742,8 @@ fw_core_handle_response(struct fw_card *card, struct fw_packet *p)
+ EXPORT_SYMBOL(fw_core_handle_response);
+ 
+ static const struct fw_address_region topology_map_region =
+-	{ .start = 0xfffff0001000ull, .end = 0xfffff0001400ull, };
++	{ .start = CSR_REGISTER_BASE | CSR_TOPOLOGY_MAP,
++	  .end   = CSR_REGISTER_BASE | CSR_TOPOLOGY_MAP_END, };
+ 
+ static void
+ handle_topology_map(struct fw_card *card, struct fw_request *request,
+@@ -779,7 +781,8 @@ static struct fw_address_handler topology_map = {
+ };
+ 
+ static const struct fw_address_region registers_region =
+-	{ .start = 0xfffff0000000ull, .end = 0xfffff0000400ull, };
++	{ .start = CSR_REGISTER_BASE,
++	  .end   = CSR_REGISTER_BASE | CSR_CONFIG_ROM, };
+ 
+ static void
+ handle_registers(struct fw_card *card, struct fw_request *request,
+From stefanr at s5r6.in-berlin.de Sat Mar  8 16:38:16 2008
+Return-Path: 
+Received: from mail.boston.redhat.com ([unix socket])
+	 by mail.boston.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
+	 Sat, 08 Mar 2008 16:39:18 -0500
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by mail.boston.redhat.com (8.13.1/8.13.1) with ESMTP id m28LdHte029996
+	for ; Sat, 8 Mar 2008 16:39:18 -0500
+Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
+	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m28LdHkg017884
+	for ; Sat, 8 Mar 2008 16:39:17 -0500
+Received: from lists-outbound.sourceforge.net (lists-outbound.sourceforge.net [66.35.250.225])
+	by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id m28LceZI022672
+	for ; Sat, 8 Mar 2008 16:38:40 -0500
+Received: from sc8-sf-list1-new.sourceforge.net (sc8-sf-list1-new-b.sourceforge.net [10.3.1.93])
+	by sc8-sf-spam2.sourceforge.net (Postfix) with ESMTP
+	id 9659912301; Sat,  8 Mar 2008 13:38:34 -0800 (PST)
+Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91]
+	helo=mail.sourceforge.net)
+	by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43)
+	id 1JY6kT-00038D-Vk for linux1394-devel at lists.sourceforge.net;
+	Sat, 08 Mar 2008 13:38:34 -0800
+Received: from einhorn.in-berlin.de ([192.109.42.8] ident=root)
+	by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256)
+	(Exim 4.44) id 1JY6kR-0003im-Eq
+	for linux1394-devel at lists.sourceforge.net;
+	Sat, 08 Mar 2008 13:38:33 -0800
+X-Envelope-From: stefanr at s5r6.in-berlin.de
+Received: from stein (k5.avc-online.de [83.221.230.29]) (authenticated bits=0)
+	by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id
+	m28LcMtv012469
+	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
+	Sat, 8 Mar 2008 22:38:28 +0100
+Date: Sat, 8 Mar 2008 22:38:16 +0100 (CET)
+From: Stefan Richter 
+Subject: [PATCH] firewire: warn on fatal condition in topology code
+To: linux1394-devel at lists.sourceforge.net
+Message-ID: 
+MIME-Version: 1.0
+Content-Disposition: INLINE
+X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
+X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32
+X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8
+X-Spam-Report: Spam Filtering performed by sourceforge.net.
+	See http://spamassassin.org/tag/ for more details.
+	Report problems to
+	http://sf.net/tracker/?func=add&group_id=1&atid=200001
+Cc: linux-kernel at vger.kernel.org
+X-BeenThere: linux1394-devel at lists.sourceforge.net
+X-Mailman-Version: 2.1.8
+Precedence: list
+List-Id: Linux IEEE 1394 development list
+	
+List-Unsubscribe: , 
+	
+List-Archive: 
+List-Post: 
+List-Help: 
+List-Subscribe: , 
+	
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Sender: linux1394-devel-bounces at lists.sourceforge.net
+Errors-To: linux1394-devel-bounces at lists.sourceforge.net
+X-RedHat-Spam-Score: -0.809 
+X-Length: 5020
+X-UID: 3936
+
+If this ever happens to anybody, we want to have it in his log.
+
+Signed-off-by: Stefan Richter 
+---
+ drivers/firewire/fw-topology.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: linux/drivers/firewire/fw-topology.c
+===================================================================
+--- linux.orig/drivers/firewire/fw-topology.c
++++ linux/drivers/firewire/fw-topology.c
+@@ -21,6 +21,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include "fw-transaction.h"
+ #include "fw-topology.h"
+@@ -425,8 +426,8 @@ update_tree(struct fw_card *card, struct
+ 	node1 = fw_node(list1.next);
+ 
+ 	while (&node0->link != &list0) {
++		WARN_ON(node0->port_count != node1->port_count);
+ 
+-		/* assert(node0->port_count == node1->port_count); */
+ 		if (node0->link_on && !node1->link_on)
+ 			event = FW_NODE_LINK_OFF;
+ 		else if (!node0->link_on && node1->link_on)
+
+-- 
+Stefan Richter
+-=====-==--- --== -=---
+http://arcgraph.de/sr/
+
+
+-------------------------------------------------------------------------
+This SF.net email is sponsored by: Microsoft
+Defy all challenges. Microsoft(R) Visual Studio 2008.
+http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
+_______________________________________________
+mailing list linux1394-devel at lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/linux1394-devel
+
+From stefanr at s5r6.in-berlin.de Sat Mar  8 18:27:20 2008
+Return-Path: 
+Received: from mail.boston.redhat.com ([unix socket])
+	 by mail.boston.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
+	 Sat, 08 Mar 2008 18:28:31 -0500
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by mail.boston.redhat.com (8.13.1/8.13.1) with ESMTP id m28NSVSq011980
+	for ; Sat, 8 Mar 2008 18:28:31 -0500
+Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
+	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m28NSUb1015266
+	for ; Sat, 8 Mar 2008 18:28:30 -0500
+Received: from lists-outbound.sourceforge.net (lists-outbound.sourceforge.net [66.35.250.225])
+	by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id m28NRqYa019208
+	for ; Sat, 8 Mar 2008 18:27:53 -0500
+Received: from sc8-sf-list1-new.sourceforge.net (sc8-sf-list1-new-b.sourceforge.net [10.3.1.93])
+	by sc8-sf-spam2.sourceforge.net (Postfix) with ESMTP
+	id 37FEFFA22; Sat,  8 Mar 2008 15:27:47 -0800 (PST)
+Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92]
+	helo=mail.sourceforge.net)
+	by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43)
+	id 1JY8S9-0008Pp-Fd for linux1394-devel at lists.sourceforge.net;
+	Sat, 08 Mar 2008 15:27:45 -0800
+Received: from einhorn.in-berlin.de ([192.109.42.8] ident=root)
+	by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256)
+	(Exim 4.44) id 1JY8S5-000097-QA
+	for linux1394-devel at lists.sourceforge.net;
+	Sat, 08 Mar 2008 15:27:45 -0800
+X-Envelope-From: stefanr at s5r6.in-berlin.de
+Received: from stein (k5.avc-online.de [83.221.230.29]) (authenticated bits=0)
+	by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id
+	m28NRPtg010333
+	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
+	Sun, 9 Mar 2008 00:27:33 +0100
+Date: Sun, 9 Mar 2008 00:27:20 +0100 (CET)
+From: Stefan Richter 
+Subject: [PATCH] firewire: update Kconfig help text
+To: linux1394-devel at lists.sourceforge.net
+Message-ID: 
+MIME-Version: 1.0
+Content-Disposition: INLINE
+X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
+X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32
+X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8
+X-Spam-Report: Spam Filtering performed by sourceforge.net.
+	See http://spamassassin.org/tag/ for more details.
+	Report problems to
+	http://sf.net/tracker/?func=add&group_id=1&atid=200001
+Cc: linux-kernel at vger.kernel.org
+X-BeenThere: linux1394-devel at lists.sourceforge.net
+X-Mailman-Version: 2.1.8
+Precedence: list
+List-Id: Linux IEEE 1394 development list
+	
+List-Unsubscribe: , 
+	
+List-Archive: 
+List-Post: 
+List-Help: 
+List-Subscribe: , 
+	
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Sender: linux1394-devel-bounces at lists.sourceforge.net
+Errors-To: linux1394-devel-bounces at lists.sourceforge.net
+X-RedHat-Spam-Score: -0.813 
+X-Length: 6999
+X-UID: 3940
+
+Remove some less necessary information, point out that video1394 and
+dv1394 should be blacklisted along with ohci1394.
+
+Signed-off-by: Stefan Richter 
+---
+ drivers/firewire/Kconfig |   50 ++++++++++++++-------------------------
+ 1 file changed, 19 insertions(+), 31 deletions(-)
+
+Index: linux/drivers/firewire/Kconfig
+===================================================================
+--- linux.orig/drivers/firewire/Kconfig
++++ linux/drivers/firewire/Kconfig
+@@ -1,5 +1,3 @@
+-# -*- shell-script -*-
+-
+ comment "An alternative FireWire stack is available with EXPERIMENTAL=y"
+ 	depends on EXPERIMENTAL=n
+ 
+@@ -21,27 +19,7 @@ config FIREWIRE
+           NOTE:
+ 
+ 	  You should only build ONE of the stacks, unless you REALLY know what
+-	  you are doing.  If you install both, you should configure them only as
+-	  modules rather than link them statically, and you should blacklist one
+-	  of the concurrent low-level drivers in /etc/modprobe.conf.  Add either
+-
+-	      blacklist firewire-ohci
+-	  or
+-	      blacklist ohci1394
+-
+-	  there depending on which driver you DON'T want to have auto-loaded.
+-	  You can optionally do the same with the other IEEE 1394/ FireWire
+-	  drivers.
+-
+-	  If you have an old modprobe which doesn't implement the blacklist
+-	  directive, use either
+-
+-	       install firewire-ohci /bin/true
+-	  or
+-	       install ohci1394 /bin/true
+-
+-	  and so on, depending on which modules you DON't want to have
+-	  auto-loaded.
++	  you are doing.
+ 
+ config FIREWIRE_OHCI
+ 	tristate "Support for OHCI FireWire host controllers"
+@@ -57,8 +35,24 @@ config FIREWIRE_OHCI
+ 
+           NOTE:
+ 
+-	  If you also build ohci1394 of the classic stack, blacklist either
+-	  ohci1394 or firewire-ohci to let hotplug load only the desired driver.
++	  You should only build ohci1394 or firewire-ohci, but not both.
++	  If you nevertheless want to install both, you should configure them
++	  only as modules and blacklist the driver(s) which you don't want to
++	  have auto-loaded.  Add either
++
++	      blacklist firewire-ohci
++	  or
++	      blacklist ohci1394
++	      blacklist video1394
++	      blacklist dv1394
++
++	  to /etc/modprobe.conf or /etc/modprobe.d/* and update modprobe.conf
++	  depending on your distribution.  The latter two modules should be
++	  blacklisted together with ohci1394 because they depend on ohci1394.
++
++	  If you have an old modprobe which doesn't implement the blacklist
++	  directive, use "install modulename /bin/true" for the modules to be
++	  blacklisted.
+ 
+ config FIREWIRE_SBP2
+ 	tristate "Support for storage devices (SBP-2 protocol driver)"
+@@ -75,9 +69,3 @@ config FIREWIRE_SBP2
+ 
+ 	  You should also enable support for disks, CD-ROMs, etc. in the SCSI
+ 	  configuration section.
+-
+-          NOTE:
+-
+-	  If you also build sbp2 of the classic stack, blacklist either sbp2
+-	  or firewire-sbp2 to let hotplug load only the desired driver.
+-
+
+-- 
+Stefan Richter
+-=====-==--- --== -=--=
+http://arcgraph.de/sr/
+
+
+-------------------------------------------------------------------------
+This SF.net email is sponsored by: Microsoft
+Defy all challenges. Microsoft(R) Visual Studio 2008.
+http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
+_______________________________________________
+mailing list linux1394-devel at lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/linux1394-devel
+
+Adds a goofy routine to dump the configuration ROM as far as it could be
+read, if fw-core failed to get it all.
 
 Signed-off-by: Stefan Richter 
 ---
- drivers/firewire/fw-device.c |   41 +++++++++++++++++++++++------------
- 1 file changed, 27 insertions(+), 14 deletions(-)
+
+We may want to reduce it to printing
+  - any encountered Extended ROM keys,
+  - the number of quadlets that were successfully read
+    (in the last attempt, or in the most successfull attempt?),
+  - the return code of the last attempt
+before submitting to mainline.
+
+ drivers/firewire/fw-device.c |  126 ++++++++++++++++++++++-------------
+ drivers/firewire/fw-device.h |    1 
+ 2 files changed, 82 insertions(+), 45 deletions(-)
 
 Index: linux/drivers/firewire/fw-device.c
 ===================================================================
 --- linux.orig/drivers/firewire/fw-device.c
 +++ linux/drivers/firewire/fw-device.c
-@@ -400,6 +400,9 @@ read_rom(struct fw_device *device, int g
+@@ -18,6 +18,7 @@
+  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -422,8 +423,12 @@ read_rom(struct fw_device *device, int g
  	return callback_data.rcode;
  }
  
-+#define READ_BIB_ROM_SIZE	256
-+#define READ_BIB_STACK_SIZE	16
-+
+-#define READ_BIB_ROM_SIZE	256
+-#define READ_BIB_STACK_SIZE	16
++#define MAX_CONFIG_ROM_SIZE ((CSR_CONFIG_ROM_END - CSR_CONFIG_ROM) / 4)
++
++struct config_rom_image {
++	u32 rom[MAX_CONFIG_ROM_SIZE];
++	DECLARE_BITMAP(read, MAX_CONFIG_ROM_SIZE);
++};
+ 
  /*
   * Read the bus info block, perform a speed probe, and read all of the rest of
-  * the config ROM.  We do all this with a cached bus generation.  If the bus
-@@ -409,16 +412,23 @@ read_rom(struct fw_device *device, int g
+@@ -432,35 +437,36 @@ read_rom(struct fw_device *device, int g
+  * It's better to start all over in this case because the node from which we
+  * are reading the ROM may have changed the ROM during the reset.
   */
- static int read_bus_info_block(struct fw_device *device, int generation)
+-static int read_bus_info_block(struct fw_device *device, int generation)
++static int read_bus_info_block(struct fw_device *device, int generation,
++			       struct config_rom_image *rom_img)
  {
--	static u32 rom[256];
--	u32 stack[16], sp, key;
--	int i, end, length;
-+	u32 *rom, *stack;
-+	u32 sp, key;
-+	int i, end, length, ret = -1;
-+
-+	rom = kmalloc(sizeof(*rom) * READ_BIB_ROM_SIZE +
-+		      sizeof(*stack) * READ_BIB_STACK_SIZE, GFP_KERNEL);
-+	if (rom == NULL)
-+		return -ENOMEM;
-+
-+	stack = &rom[READ_BIB_ROM_SIZE];
+-	u32 *rom, *stack, *old_rom, *new_rom;
++	u32 *rom, *old_rom, *new_rom;
++	u32 stack[16];
+ 	u32 sp, key;
+-	int i, end, length, ret = -1;
++	int i, end, length, ret;
+ 
+-	rom = kmalloc(sizeof(*rom) * READ_BIB_ROM_SIZE +
+-		      sizeof(*stack) * READ_BIB_STACK_SIZE, GFP_KERNEL);
+-	if (rom == NULL)
++	if (rom_img == NULL)
+ 		return -ENOMEM;
+-
+-	stack = &rom[READ_BIB_ROM_SIZE];
++	rom = rom_img->rom;
  
  	device->max_speed = SCODE_100;
  
  	/* First read the bus info block. */
  	for (i = 0; i < 5; i++) {
- 		if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE)
--			return -1;
-+			goto out;
+-		if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE)
+-			goto out;
++		ret = read_rom(device, generation, i, &rom[i]);
++		if (ret != RCODE_COMPLETE)
++			return ret;
++		__set_bit(i, rom_img->read);
  		/*
  		 * As per IEEE1212 7.2, during power-up, devices can
  		 * reply with a 0 for the first quadlet of the config
-@@ -428,7 +438,7 @@ static int read_bus_info_block(struct fw
+-		 * rom to indicate that they are booting (for example,
++		 * ROM to indicate that they are booting (for example,
+ 		 * if the firmware is on the disk of a external
+ 		 * harddisk).  In that case we just fail, and the
  		 * retry mechanism will try again later.
  		 */
  		if (i == 0 && rom[i] == 0)
--			return -1;
-+			goto out;
+-			goto out;
++			return -EAGAIN;
  	}
  
  	device->max_speed = device->node->max_speed;
-@@ -478,26 +488,26 @@ static int read_bus_info_block(struct fw
+@@ -484,15 +490,17 @@ static int read_bus_info_block(struct fw
+ 			device->max_speed = device->card->link_speed;
+ 
+ 		while (device->max_speed > SCODE_100) {
+-			if (read_rom(device, generation, 0, &dummy) ==
+-			    RCODE_COMPLETE)
++			ret = read_rom(device, generation, 0, &dummy);
++			if (ret == RCODE_COMPLETE)
+ 				break;
++			if (ret == RCODE_GENERATION)
++				return ret;
+ 			device->max_speed--;
+ 		}
+ 	}
+ 
+ 	/*
+-	 * Now parse the config rom.  The config rom is a recursive
++	 * Now parse the config ROM.  The config ROM is a recursive
+ 	 * directory structure so we parse it using a stack of
+ 	 * references to the blocks that make up the structure.  We
+ 	 * push a reference to the root directory on the stack to
+@@ -504,44 +512,49 @@ static int read_bus_info_block(struct fw
+ 	while (sp > 0) {
+ 		/*
+ 		 * Pop the next block reference of the stack.  The
+-		 * lower 24 bits is the offset into the config rom,
++		 * lower 24 bits is the offset into the config ROM,
+ 		 * the upper 8 bits are the type of the reference the
+ 		 * block.
  		 */
  		key = stack[--sp];
  		i = key & 0xffffff;
--		if (i >= ARRAY_SIZE(rom))
-+		if (i >= READ_BIB_ROM_SIZE)
+-		if (i >= READ_BIB_ROM_SIZE)
++		if (i >= MAX_CONFIG_ROM_SIZE) {
  			/*
  			 * The reference points outside the standard
- 			 * config rom area, something's fishy.
+-			 * config rom area, something's fishy.
++			 * config ROM area.
  			 */
--			return -1;
-+			goto out;
- 
+-			goto out;
+-
++			if (key >> 24 == (CSR_EXTENDED_ROM | CSR_LEAF))
++				fw_error("Extended ROM not supported\n");
++			return -EINVAL;
++		}
  		/* Read header quadlet for the block to get the length. */
- 		if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE)
--			return -1;
-+			goto out;
+-		if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE)
+-			goto out;
++		ret = read_rom(device, generation, i, &rom[i]);
++		if (ret != RCODE_COMPLETE)
++			return ret;
++		__set_bit(i, rom_img->read);
  		end = i + (rom[i] >> 16) + 1;
  		i++;
--		if (end > ARRAY_SIZE(rom))
-+		if (end > READ_BIB_ROM_SIZE)
+-		if (end > READ_BIB_ROM_SIZE)
++		if (end > MAX_CONFIG_ROM_SIZE) {
  			/*
  			 * This block extends outside standard config
  			 * area (and the array we're reading it
  			 * into).  That's broken, so ignore this
  			 * device.
  			 */
--			return -1;
-+			goto out;
- 
+-			goto out;
+-
++			return -EINVAL;
++		}
  		/*
  		 * Now read in the block.  If this is a directory
-@@ -507,9 +517,9 @@ static int read_bus_info_block(struct fw
+ 		 * block, check the entries as we read them to see if
+ 		 * it references another block, and push it in that case.
+ 		 */
  		while (i < end) {
- 			if (read_rom(device, generation, i, &rom[i]) !=
- 			    RCODE_COMPLETE)
--				return -1;
-+				goto out;
+-			if (read_rom(device, generation, i, &rom[i]) !=
+-			    RCODE_COMPLETE)
+-				goto out;
++			ret = read_rom(device, generation, i, &rom[i]);
++			if (ret != RCODE_COMPLETE)
++				return ret;
++			__set_bit(i, rom_img->read);
  			if ((key >> 30) == 3 && (rom[i] >> 30) > 1 &&
--			    sp < ARRAY_SIZE(stack))
-+			    sp < READ_BIB_STACK_SIZE)
+-			    sp < READ_BIB_STACK_SIZE)
++			    sp < ARRAY_SIZE(stack))
  				stack[sp++] = i + rom[i];
  			i++;
  		}
-@@ -519,11 +529,14 @@ static int read_bus_info_block(struct fw
+@@ -552,7 +565,7 @@ static int read_bus_info_block(struct fw
+ 	old_rom = device->config_rom;
+ 	new_rom = kmemdup(rom, length * 4, GFP_KERNEL);
+ 	if (new_rom == NULL)
+-		goto out;
++		return -ENOMEM;
  
- 	device->config_rom = kmalloc(length * 4, GFP_KERNEL);
- 	if (device->config_rom == NULL)
--		return -1;
-+		goto out;
- 	memcpy(device->config_rom, rom, length * 4);
- 	device->config_rom_length = length;
-+	ret = 0;
-+ out:
-+	kfree(rom);
+ 	down_write(&fw_device_rwsem);
+ 	device->config_rom = new_rom;
+@@ -560,14 +573,25 @@ static int read_bus_info_block(struct fw
+ 	up_write(&fw_device_rwsem);
+ 
+ 	kfree(old_rom);
+-	ret = 0;
+ 	device->cmc = rom[2] & 1 << 30;
+- out:
+-	kfree(rom);
  
--	return 0;
-+	return ret;
+-	return ret;
++	return 0;
++}
++
++static void dump_config_rom(struct config_rom_image *rom_img)
++{
++	int i;
++
++	if (rom_img == NULL || !test_bit(0, rom_img->read))
++		return;
++
++	fw_notify("config ROM read so far:\n");
++	for_each_bit(i, rom_img->read, MAX_CONFIG_ROM_SIZE)
++		printk(KERN_NOTICE "%x: %08x\n",
++		       CSR_CONFIG_ROM + i * 4, rom_img->rom[i]);
  }
  
++
  static void fw_unit_release(struct device *dev)
-
--- 
-Stefan Richter
--=====-==--- --== ---=-
-http://arcgraph.de/sr/
-
-
-When a device changes its configuration ROM, it announces this with a
-bus reset.  firewire-core has to check which node initiated a bus reset
-and whether any unit directories went away or were added on this node.
-
-Tested with an IOI FWB-IDE01AB which has its link-on bit set if bus
-power is available but does not respond to ROM read requests if self
-power is off.  This implements
-  - recognition of the units if self power is switched on after fw-core
-    gave up the initial attempt to read the config ROM,
-  - shutdown of the units when self power is switched off.
-
-Also tested with a second PC running Linux/ieee1394.  When the eth1394
-driver is inserted and removed on that node, fw-core now notices the
-addition and removal of the IPv4 unit on the ieee1394 node.
-
-Signed-off-by: Stefan Richter 
----
-
-Applies after "firewire: replace static ROM cache by allocated cache".
-
- drivers/firewire/fw-cdev.c     |   18 ++--
- drivers/firewire/fw-device.c   |  147 ++++++++++++++++++++++++++++++---
- drivers/firewire/fw-topology.c |    3 
- drivers/firewire/fw-topology.h |   11 +-
- 4 files changed, 158 insertions(+), 21 deletions(-)
-
-Index: linux/drivers/firewire/fw-cdev.c
-===================================================================
---- linux.orig/drivers/firewire/fw-cdev.c
-+++ linux/drivers/firewire/fw-cdev.c
-@@ -32,6 +32,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include "fw-transaction.h"
-@@ -269,20 +270,25 @@ static int ioctl_get_info(struct client 
  {
- 	struct fw_cdev_get_info *get_info = buffer;
- 	struct fw_cdev_event_bus_reset bus_reset;
-+	struct fw_device *device = client->device;
-+	unsigned long ret = 0;
- 
- 	client->version = get_info->version;
- 	get_info->version = FW_CDEV_VERSION;
- 
-+	down(&device->device.sem);
- 	if (get_info->rom != 0) {
- 		void __user *uptr = u64_to_uptr(get_info->rom);
- 		size_t want = get_info->rom_length;
--		size_t have = client->device->config_rom_length * 4;
-+		size_t have;
- 
--		if (copy_to_user(uptr, client->device->config_rom,
--				 min(want, have)))
--			return -EFAULT;
-+		have = device->config_rom_length * 4;
-+		ret = copy_to_user(uptr, device->config_rom, min(want, have));
- 	}
--	get_info->rom_length = client->device->config_rom_length * 4;
-+	get_info->rom_length = device->config_rom_length * 4;
-+	up(&device->device.sem);
-+	if (ret != 0)
-+		return -EFAULT;
- 
- 	client->bus_reset_closure = get_info->bus_reset_closure;
- 	if (get_info->bus_reset != 0) {
-@@ -293,7 +299,7 @@ static int ioctl_get_info(struct client 
- 			return -EFAULT;
+ 	struct fw_unit *unit = fw_unit(dev);
+@@ -697,27 +721,32 @@ static void fw_device_init(struct work_s
+ {
+ 	struct fw_device *device =
+ 		container_of(work, struct fw_device, work.work);
++	struct config_rom_image *rom_img;
+ 	int minor, err;
+ 
++	rom_img = kzalloc(sizeof(*rom_img), GFP_KERNEL);
++
+ 	/*
+ 	 * All failure paths here set node->data to NULL, so that we
+ 	 * don't try to do device_for_each_child() on a kfree()'d
+ 	 * device.
+ 	 */
+ 
+-	if (read_bus_info_block(device, device->generation) < 0) {
++	err = read_bus_info_block(device, device->generation, rom_img);
++	if (err) {
+ 		if (device->config_rom_retries < MAX_RETRIES &&
+ 		    atomic_read(&device->state) == FW_DEVICE_INITIALIZING) {
+ 			device->config_rom_retries++;
+ 			schedule_delayed_work(&device->work, RETRY_DELAY);
+ 		} else {
+-			fw_notify("giving up on config rom for node id %x\n",
+-				  device->node_id);
++			fw_notify("giving up on config ROM for node id %x "
++				  "(returned %d)\n", device->node_id, err);
++			dump_config_rom(rom_img);
+ 			if (device->node == device->card->root_node)
+ 				schedule_delayed_work(&device->card->work, 0);
+ 			fw_device_release(&device->device);
+ 		}
+-		return;
++		goto out;
  	}
  
--	get_info->card = client->device->card->index;
-+	get_info->card = device->card->index;
+ 	err = -ENOMEM;
+@@ -786,7 +815,7 @@ static void fw_device_init(struct work_s
+ 	if (device->node == device->card->root_node)
+ 		schedule_delayed_work(&device->card->work, 0);
  
- 	return 0;
- }
-Index: linux/drivers/firewire/fw-device.c
-===================================================================
---- linux.orig/drivers/firewire/fw-device.c
-+++ linux/drivers/firewire/fw-device.c
-@@ -26,6 +26,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-@@ -160,9 +161,9 @@ static void fw_device_release(struct dev
- 	 * Take the card lock so we don't set this to NULL while a
- 	 * FW_NODE_UPDATED callback is being handled.
- 	 */
--	spin_lock_irqsave(&device->card->lock, flags);
-+	spin_lock_irqsave(&card->lock, flags);
- 	device->node->data = NULL;
--	spin_unlock_irqrestore(&device->card->lock, flags);
-+	spin_unlock_irqrestore(&card->lock, flags);
- 
- 	fw_node_put(device->node);
- 	kfree(device->config_rom);
-@@ -337,10 +338,14 @@ static ssize_t
- config_rom_show(struct device *dev, struct device_attribute *attr, char *buf)
- {
- 	struct fw_device *device = fw_device(dev);
-+	size_t length;
+-	return;
++	goto out;
  
--	memcpy(buf, device->config_rom, device->config_rom_length * 4);
-+	down(&dev->sem);
-+	length = device->config_rom_length * 4;
-+	memcpy(buf, device->config_rom, length);
-+	up(&dev->sem);
+  error_with_cdev:
+ 	down_write(&fw_device_rwsem);
+@@ -796,6 +825,8 @@ static void fw_device_init(struct work_s
+ 	fw_device_put(device);		/* fw_device_idr's reference */
  
--	return device->config_rom_length * 4;
-+	return length;
+ 	put_device(&device->device);	/* our reference */
++ out:
++	kfree(rom_img);
  }
  
- static ssize_t
-@@ -412,7 +417,7 @@ read_rom(struct fw_device *device, int g
-  */
- static int read_bus_info_block(struct fw_device *device, int generation)
- {
--	u32 *rom, *stack;
-+	u32 *rom, *stack, *old_rom, *new_rom;
- 	u32 sp, key;
- 	int i, end, length, ret = -1;
+ static int update_unit(struct device *dev, void *data)
+@@ -854,6 +885,7 @@ static void fw_device_refresh(struct wor
+ 		container_of(work, struct fw_device, work.work);
+ 	struct fw_card *card = device->card;
+ 	int node_id = device->node_id;
++	struct config_rom_image *rom_img = NULL;
+ 
+ 	switch (reread_bus_info_block(device, device->generation)) {
+ 	case REREAD_BIB_ERROR:
+@@ -890,13 +922,15 @@ static void fw_device_refresh(struct wor
+ 	 */
+ 	device_for_each_child(&device->device, NULL, shutdown_unit);
  
-@@ -527,11 +532,18 @@ static int read_bus_info_block(struct fw
- 			length = i;
- 	}
+-	if (read_bus_info_block(device, device->generation) < 0) {
++	rom_img = kzalloc(sizeof(*rom_img), GFP_KERNEL);
++
++	if (read_bus_info_block(device, device->generation, rom_img) != 0) {
+ 		if (device->config_rom_retries < MAX_RETRIES &&
+ 		    atomic_read(&device->state) == FW_DEVICE_INITIALIZING) {
+ 			device->config_rom_retries++;
+ 			schedule_delayed_work(&device->work, RETRY_DELAY);
  
--	device->config_rom = kmalloc(length * 4, GFP_KERNEL);
--	if (device->config_rom == NULL)
-+	old_rom = device->config_rom;
-+	new_rom = kmemdup(rom, length * 4, GFP_KERNEL);
-+	if (new_rom == NULL)
- 		goto out;
--	memcpy(device->config_rom, rom, length * 4);
-+
-+	/* serialize with readers via sysfs or ioctl */
-+	down(&device->device.sem);
-+	device->config_rom = new_rom;
- 	device->config_rom_length = length;
-+	up(&device->device.sem);
-+
-+	kfree(old_rom);
- 	ret = 0;
-  out:
- 	kfree(rom);
-@@ -724,7 +736,7 @@ static void fw_device_init(struct work_s
- 	if (atomic_cmpxchg(&device->state,
- 		    FW_DEVICE_INITIALIZING,
- 		    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) {
--		fw_device_shutdown(&device->work.work);
-+		fw_device_shutdown(work);
- 	} else {
- 		if (device->config_rom_retries)
- 			fw_notify("created device %s: GUID %08x%08x, S%d00, "
-@@ -738,6 +750,7 @@ static void fw_device_init(struct work_s
- 				  device->device.bus_id,
- 				  device->config_rom[3], device->config_rom[4],
- 				  1 << device->max_speed);
-+		device->config_rom_retries = 0;
+-			return;
++			goto out;
+ 		}
+ 		goto give_up;
  	}
+@@ -910,16 +944,18 @@ static void fw_device_refresh(struct wor
  
- 	/*
-@@ -784,6 +797,104 @@ static void fw_device_update(struct work
- 	device_for_each_child(&device->device, NULL, update_unit);
+ 	fw_notify("refreshed device %s\n", device->device.bus_id);
+ 	device->config_rom_retries = 0;
+-	goto out;
++	goto out_bm;
+ 
+  give_up:
+ 	fw_notify("giving up on refresh of device %s\n", device->device.bus_id);
+  gone:
+ 	atomic_set(&device->state, FW_DEVICE_SHUTDOWN);
+ 	fw_device_shutdown(work);
+- out:
++ out_bm:
+ 	if (node_id == card->root_node->node_id)
+ 		schedule_delayed_work(&card->work, 0);
++ out:
++	kfree(rom_img);
  }
  
-+enum {
-+	REREAD_BIB_ERROR,
-+	REREAD_BIB_GONE,
-+	REREAD_BIB_UNCHANGED,
-+	REREAD_BIB_CHANGED,
-+};
-+
-+/* Reread and compare bus info block and header of root directory */
-+static int reread_bus_info_block(struct fw_device *device, int generation)
-+{
-+	u32 q;
-+	int i;
-+
-+	for (i = 0; i < 6; i++) {
-+		if (read_rom(device, generation, i, &q) != RCODE_COMPLETE)
-+			return REREAD_BIB_ERROR;
-+
-+		if (i == 0 && q == 0)
-+			return REREAD_BIB_GONE;
-+
-+		if (i > device->config_rom_length || q != device->config_rom[i])
-+			return REREAD_BIB_CHANGED;
-+	}
-+
-+	return REREAD_BIB_UNCHANGED;
-+}
-+
-+static void fw_device_refresh(struct work_struct *work)
-+{
-+	struct fw_device *device =
-+		container_of(work, struct fw_device, work.work);
-+	struct fw_card *card = device->card;
-+	int node_id = device->node_id;
-+
-+	switch (reread_bus_info_block(device, device->generation)) {
-+	case REREAD_BIB_ERROR:
-+		if (device->config_rom_retries < MAX_RETRIES / 2 &&
-+		    atomic_read(&device->state) == FW_DEVICE_INITIALIZING) {
-+			device->config_rom_retries++;
-+			schedule_delayed_work(&device->work, RETRY_DELAY / 2);
-+
-+			return;
-+		}
-+		goto give_up;
-+
-+	case REREAD_BIB_GONE:
-+		goto gone;
-+
-+	case REREAD_BIB_UNCHANGED:
-+		if (atomic_cmpxchg(&device->state,
-+			    FW_DEVICE_INITIALIZING,
-+			    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
-+			goto gone;
-+
-+		fw_device_update(work);
-+		device->config_rom_retries = 0;
-+
-+		return;
-+	}
-+
-+	/*
-+	 * Something changed.  We keep things simple and don't investigate
-+	 * further.  We just destroy all previous units and create new ones.
-+	 */
-+	device_for_each_child(&device->device, NULL, shutdown_unit);
-+
-+	if (read_bus_info_block(device, device->generation) < 0) {
-+		if (device->config_rom_retries < MAX_RETRIES &&
-+		    atomic_read(&device->state) == FW_DEVICE_INITIALIZING) {
-+			device->config_rom_retries++;
-+			schedule_delayed_work(&device->work, RETRY_DELAY);
-+
-+			return;
-+		}
-+		goto give_up;
-+	}
-+
-+	create_units(device);
-+
-+	if (atomic_cmpxchg(&device->state,
-+		    FW_DEVICE_INITIALIZING,
-+		    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
-+		goto gone;
-+
-+	fw_notify("refreshed device %s\n", device->device.bus_id);
-+	device->config_rom_retries = 0;
-+	goto out;
-+
-+ give_up:
-+	fw_notify("giving up on refresh of device %s\n", device->device.bus_id);
-+ gone:
-+	atomic_set(&device->state, FW_DEVICE_SHUTDOWN);
-+	fw_device_shutdown(work);
-+ out:
-+	if (node_id == card->root_node->node_id)
-+		schedule_delayed_work(&card->work, 0);
-+}
-+
  void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
- {
- 	struct fw_device *device;
-@@ -793,7 +904,7 @@ void fw_node_event(struct fw_card *card,
- 	case FW_NODE_LINK_ON:
- 		if (!node->link_on)
- 			break;
--
-+ create:
- 		device = kzalloc(sizeof(*device), GFP_ATOMIC);
- 		if (device == NULL)
- 			break;
-@@ -832,6 +943,22 @@ void fw_node_event(struct fw_card *card,
- 		schedule_delayed_work(&device->work, INITIAL_DELAY);
- 		break;
- 
-+	case FW_NODE_INITIATED_RESET:
-+		device = node->data;
-+		if (device == NULL)
-+			goto create;
-+
-+		device->node_id = node->node_id;
-+		smp_wmb();  /* update node_id before generation */
-+		device->generation = card->generation;
-+		if (atomic_cmpxchg(&device->state,
-+			    FW_DEVICE_RUNNING,
-+			    FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) {
-+			PREPARE_DELAYED_WORK(&device->work, fw_device_refresh);
-+			schedule_delayed_work(&device->work, INITIAL_DELAY);
-+		}
-+		break;
-+
- 	case FW_NODE_UPDATED:
- 		if (!node->link_on || node->data == NULL)
- 			break;
-Index: linux/drivers/firewire/fw-topology.c
-===================================================================
---- linux.orig/drivers/firewire/fw-topology.c
-+++ linux/drivers/firewire/fw-topology.c
-@@ -107,6 +107,7 @@ static struct fw_node *fw_node_create(u3
- 	node->node_id = LOCAL_BUS | SELF_ID_PHY_ID(sid);
- 	node->link_on = SELF_ID_LINK_ON(sid);
- 	node->phy_speed = SELF_ID_PHY_SPEED(sid);
-+	node->initiated_reset = SELF_ID_PHY_INITIATOR(sid);
- 	node->port_count = port_count;
- 
- 	atomic_set(&node->ref_count, 1);
-@@ -430,6 +431,8 @@ update_tree(struct fw_card *card, struct
- 			event = FW_NODE_LINK_OFF;
- 		else if (!node0->link_on && node1->link_on)
- 			event = FW_NODE_LINK_ON;
-+		else if (node1->initiated_reset && node1->link_on)
-+			event = FW_NODE_INITIATED_RESET;
- 		else
- 			event = FW_NODE_UPDATED;
- 
-Index: linux/drivers/firewire/fw-topology.h
+Index: linux/drivers/firewire/fw-device.h
 ===================================================================
---- linux.orig/drivers/firewire/fw-topology.h
-+++ linux/drivers/firewire/fw-topology.h
-@@ -20,11 +20,12 @@
- #define __fw_topology_h
- 
- enum {
--	FW_NODE_CREATED =   0x00,
--	FW_NODE_UPDATED =   0x01,
--	FW_NODE_DESTROYED = 0x02,
--	FW_NODE_LINK_ON =   0x03,
--	FW_NODE_LINK_OFF =  0x04,
-+	FW_NODE_CREATED,
-+	FW_NODE_UPDATED,
-+	FW_NODE_DESTROYED,
-+	FW_NODE_LINK_ON,
-+	FW_NODE_LINK_OFF,
-+	FW_NODE_INITIATED_RESET,
- };
+--- linux.orig/drivers/firewire/fw-device.h
++++ linux/drivers/firewire/fw-device.h
+@@ -142,6 +142,7 @@ static inline void fw_unit_put(struct fw
+ #define CSR_DEPENDENT_INFO	0x14
+ #define CSR_MODEL		0x17
+ #define CSR_INSTANCE		0x18
++#define CSR_EXTENDED_ROM	0x1b
+ #define CSR_DIRECTORY_ID	0x20
  
- struct fw_node {
+ struct fw_csr_iterator {
 
 -- 
 Stefan Richter
--=====-==--- --== ---==
+-=====-==--- --== -=---
 http://arcgraph.de/sr/
 
 
-Increase reconnect management orb timeout value.
+-------------------------------------------------------------------------
+This SF.net email is sponsored by: Microsoft
+Defy all challenges. Microsoft(R) Visual Studio 2008.
+http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
+_______________________________________________
+mailing list linux1394-devel at lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/linux1394-devel
+
+From stefanr at s5r6.in-berlin.de Sun Mar  9 16:49:34 2008
+Return-Path: 
+Received: from mail.boston.redhat.com ([unix socket])
+	 by mail.boston.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
+	 Sun, 09 Mar 2008 16:50:37 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by mail.boston.redhat.com (8.13.1/8.13.1) with ESMTP id m29KobM5006784
+	for ; Sun, 9 Mar 2008 16:50:37 -0400
+Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
+	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m29KoaO1023147
+	for ; Sun, 9 Mar 2008 16:50:36 -0400
+Received: from lists-outbound.sourceforge.net (lists-outbound.sourceforge.net [66.35.250.225])
+	by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id m29Ko2Zt022736
+	for ; Sun, 9 Mar 2008 16:50:03 -0400
+Received: from sc8-sf-list1-new.sourceforge.net (sc8-sf-list1-new-b.sourceforge.net [10.3.1.93])
+	by sc8-sf-spam2.sourceforge.net (Postfix) with ESMTP
+	id AD813136FC; Sun,  9 Mar 2008 12:49:56 -0800 (PST)
+Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91]
+	helo=mail.sourceforge.net)
+	by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43)
+	id 1JYSSw-0004vO-IA for linux1394-devel at lists.sourceforge.net;
+	Sun, 09 Mar 2008 13:49:54 -0700
+Received: from einhorn.in-berlin.de ([192.109.42.8] ident=root)
+	by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256)
+	(Exim 4.44) id 1JYSSu-0003DS-D4
+	for linux1394-devel at lists.sourceforge.net;
+	Sun, 09 Mar 2008 13:49:54 -0700
+X-Envelope-From: stefanr at s5r6.in-berlin.de
+Received: from stein (k5.avc-online.de [83.221.230.29]) (authenticated bits=0)
+	by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id
+	m29Kndg7021845
+	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
+	Sun, 9 Mar 2008 21:49:45 +0100
+Date: Sun, 9 Mar 2008 21:49:34 +0100 (CET)
+From: Stefan Richter 
+Subject: [PATCH] firewire: debug AT, AR, and selfID-complete events
+To: linux1394-devel at lists.sourceforge.net
+Message-ID: 
+MIME-Version: 1.0
+Content-Disposition: INLINE
+X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
+X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32
+X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8
+X-Spam-Report: Spam Filtering performed by sourceforge.net.
+	See http://spamassassin.org/tag/ for more details.
+	Report problems to
+	http://sf.net/tracker/?func=add&group_id=1&atid=200001
+Cc: linux-kernel at vger.kernel.org
+X-BeenThere: linux1394-devel at lists.sourceforge.net
+X-Mailman-Version: 2.1.8
+Precedence: list
+List-Id: Linux IEEE 1394 development list
+	
+List-Unsubscribe: , 
+	
+List-Archive: 
+List-Post: 
+List-Help: 
+List-Subscribe: , 
+	
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Sender: linux1394-devel-bounces at lists.sourceforge.net
+Errors-To: linux1394-devel-bounces at lists.sourceforge.net
+X-RedHat-Spam-Score: -0.813 
+X-Length: 10709
+X-UID: 3944
+
+This adds debug printks for asynchronous transmission and reception and
+for self ID reception.  The debug code is per default deactivated by #if
+blocks.
 
-Signed-off-by: Jarod Wilson 
+Signed-off-by: Stefan Richter 
 ---
 
- drivers/firewire/fw-sbp2.c |   15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
+I am undecided whether this is OK for mainline, and whether the debug
+options should become a Kconfig option or runtime options.
 
-diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
-index d6d62c6..da315cf 100644
---- a/drivers/firewire/fw-sbp2.c
-+++ b/drivers/firewire/fw-sbp2.c
-@@ -170,6 +170,7 @@ struct sbp2_target {
-  */
- #define SBP2_MIN_LOGIN_ORB_TIMEOUT	5000U	/* Timeout in ms */
- #define SBP2_MAX_LOGIN_ORB_TIMEOUT	40000U	/* Timeout in ms */
-+#define SBP2_MAX_RECONNECT_ORB_TIMEOUT	6000U	/* Timeout in ms */
- #define SBP2_ORB_TIMEOUT		2000U	/* Timeout in ms */
- #define SBP2_ORB_NULL			0x80000000
- #define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000
-@@ -538,14 +539,24 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
- 	orb->request.status_fifo.low  =
- 		cpu_to_be32(lu->address_handler.offset);
- 
--	if (function == SBP2_LOGIN_REQUEST) {
-+	switch (function) {
-+
-+	case SBP2_LOGIN_REQUEST:
- 		/* Ask for 2^2 == 4 seconds reconnect grace period */
- 		orb->request.misc |= cpu_to_be32(
- 			MANAGEMENT_ORB_RECONNECT(2) |
- 			MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login));
- 		timeout = lu->tgt->mgt_orb_timeout;
--	} else {
-+		break;
-+
-+	case SBP2_RECONNECT_REQUEST:
-+		timeout = min(SBP2_MAX_RECONNECT_ORB_TIMEOUT,
-+			      lu->tgt->mgt_orb_timeout);
-+		break;
-+
-+	default:
- 		timeout = SBP2_ORB_TIMEOUT;
-+		break;
- 	}
- 
- 	init_completion(&orb->done);
-
-
-
-Per the SBP-2 specification, all SBP-2 target devices must have a BUSY_TIMEOUT
-register. Per the 1394-1995 specification, the retry_limt portion of the
-register should be set to 0x0 initially, and set on the target by a logged in
-initiator (i.e., a Linux host w/firewire controller(s)).
-
-Well, as it turns out, lots of devices these days have actually moved on to
-starting to implement SBP-3 compliance, which says that retry_limit should
-default to 0xf instead (yes, SBP-3 stomps directly on 1394-1995, oops).
-
-Prior to this change, the firewire driver stack didn't touch retry_limit, and
-any SBP-3 compliant device worked fine, while SBP-2 compliant ones were unable
-to retransmit when the host returned an ack_busy_X, which resulted in stalled
-out I/O, eventually causing the SCSI layer to give up and offline the device.
-
-The simple fix is for us to set retry_limit to 0xf in the register for all
-devices (which actually matches what the old ieee1394 stack did).
-
-Prior to this change, a hard disk behind an SBP-2 Prolific PL-3507 bridge chip
-would routinely encounter buffer I/O errors and wind up offlined by the SCSI
-layer. With this change, I've encountered zero I/O failures moving tens of GB
-of data around.
+It may be temporarily useful to the few driver developers.  Do we want
+end users to provide us with debug logs of this kind?  Then it should
+be one or two runtime options.
 
-Signed-off-by: Jarod Wilson 
-
----
 
-Update: use CSR_BUSY_TIMEOUT from fw-transaction.h instead of needlessly
-        creating an SBP2_BUSY_TIMEOUT
+ drivers/firewire/fw-ohci.c |  113 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 113 insertions(+)
 
- drivers/firewire/fw-sbp2.c |   31 +++++++++++++++++++++++++++----
- 1 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
-index d6d62c6..fbf5b7a 100644
---- a/drivers/firewire/fw-sbp2.c
-+++ b/drivers/firewire/fw-sbp2.c
-@@ -173,6 +173,7 @@ struct sbp2_target {
- #define SBP2_ORB_TIMEOUT		2000U	/* Timeout in ms */
- #define SBP2_ORB_NULL			0x80000000
- #define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000
-+#define SBP2_RETRY_LIMIT		0xf	/* 15 retries */
+Index: linux/drivers/firewire/fw-ohci.c
+===================================================================
+--- linux.orig/drivers/firewire/fw-ohci.c
++++ linux/drivers/firewire/fw-ohci.c
+@@ -40,6 +40,9 @@
+ #include "fw-ohci.h"
+ #include "fw-transaction.h"
  
- /* Unit directory keys */
- #define SBP2_CSR_UNIT_CHARACTERISTICS	0x3a
-@@ -800,6 +801,30 @@ static void sbp2_target_put(struct sbp2_target *tgt)
- 	kref_put(&tgt->kref, sbp2_release_target);
++#define FIREWIRE_OHCI_DEBUG_AT_AR	0
++#define FIREWIRE_OHCI_DEBUG_SELFIDS	0
++
+ #define DESCRIPTOR_OUTPUT_MORE		0
+ #define DESCRIPTOR_OUTPUT_LAST		(1 << 12)
+ #define DESCRIPTOR_INPUT_MORE		(2 << 12)
+@@ -316,6 +319,71 @@ static int ar_context_add_page(struct ar
+ 	return 0;
  }
  
-+static void
-+complete_set_busy_timeout(struct fw_card *card, int rcode,
-+			  void *payload, size_t length, void *done)
++#if FIREWIRE_OHCI_DEBUG_AT_AR
++static void debug_ar_at_event(char dir, int speed, u32 *header, int evt)
 +{
-+	complete(done);
++	static const char *evts[] = {
++		[0x00] = "evt_no_status",	[0x01] = "-reserved-",
++		[0x02] = "evt_long_packet",	[0x03] = "evt_missing_ack",
++		[0x04] = "evt_underrun",	[0x05] = "evt_overrun",
++		[0x06] = "evt_descriptor_read",	[0x07] = "evt_data_read",
++		[0x08] = "evt_data_write",	[0x09] = "evt_bus_reset",
++		[0x0a] = "evt_timeout",		[0x0b] = "evt_tcode_err",
++		[0x0c] = "-reserved-",		[0x0d] = "-reserved-",
++		[0x0e] = "evt_unknown",		[0x0f] = "evt_flushed",
++		[0x10] = "-reserved-",		[0x11] = "ack_complete",
++		[0x12] = "ack_pending ",	[0x13] = "-reserved-",
++		[0x14] = "ack_busy_X",		[0x15] = "ack_busy_A",
++		[0x16] = "ack_busy_B",		[0x17] = "-reserved-",
++		[0x18] = "-reserved-",		[0x19] = "-reserved-",
++		[0x1a] = "-reserved-",		[0x1b] = "ack_tardy",
++		[0x1c] = "-reserved-",		[0x1d] = "ack_data_error",
++		[0x1e] = "ack_type_error",	[0x1f] = "-reserved-",
++	};
++	static const char *tcodes[] = {
++		[0x0] = "quadlet write request", [0x1] = "block write request",
++		[0x2] = "write response",	 [0x3] = "-reserved-",
++		[0x4] = "quadlet read request",	 [0x5] = "block read request",
++		[0x6] = "quadlet read response", [0x7] = "block read response",
++		[0x8] = "cycle start",		 [0x9] = "lock request",
++		[0xa] = "async stream packet",	 [0xb] = "lock response",
++		[0xc] = "-reserved-",		 [0xd] = "-reserved-",
++		[0xe] = "link internal",	 [0xf] = "reserved",
++	};
++	static const char *phys[] = {
++		[0x0] = "phy config packet",	 [0x1] = "link-on packet",
++		[0x2] = "self-id packet",	 [0x3] = "-reserved-",
++	};
++	int tcode = header[0] >> 4 & 0xf;
++
++	evt &= 0x1f;
++	if (header[0] == ~header[1])
++		printk(KERN_DEBUG "A%c evt %02x: %s, %s, %08x\n",
++		       dir, evt, evts[evt], phys[header[0] >> 30 & 0x3],
++		       header[0]);
++	else if (tcode == 0xe)
++		printk(KERN_DEBUG "A%c evt %02x: %s, %s\n",
++		       dir, evt, evts[evt], tcodes[tcode]);
++	else if (tcode == 0x0 || tcode == 0x1 ||
++		 tcode == 0x4 || tcode == 0x5 || tcode == 0x9)
++		printk(KERN_DEBUG "A%c evt %02x: tcode %x spd %x tl %02x "
++		       "src %04x dest %04x: "
++		       "%s, %s, %04x%08x\n",
++		       dir, evt, tcode, speed, header[0] >> 10 & 0x3f,
++		       header[1] >> 16, header[0] >> 16,
++		       evts[evt], tcodes[tcode], header[1] & 0xffff, header[2]);
++	else
++		printk(KERN_DEBUG "A%c evt %02x: tcode %x spd %x tl %02x "
++		       "src %04x dest %04x: "
++		       "%s, %s\n",
++		       dir, evt, tcode, speed, header[0] >> 10 & 0x3f,
++		       header[1] >> 16, header[0] >> 16,
++		       evts[evt], tcodes[tcode]);
 +}
++#else
++#define debug_ar_at_event(dir, speed, header, evt)
++#endif /* FIREWIRE_OHCI_DEBUG_AT_AR */
++
+ #if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
+ #define cond_le32_to_cpu(v) \
+ 	(ohci->old_uninorth ? (__force __u32)(v) : le32_to_cpu(v))
+@@ -376,6 +444,8 @@ static __le32 *handle_ar_packet(struct a
+ 	p.timestamp  = status & 0xffff;
+ 	p.generation = ohci->request_generation;
+ 
++	debug_ar_at_event('R', p.speed, p.header, status >> 16 & 0x1f);
 +
-+static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)
+ 	/*
+ 	 * The OHCI bus reset handler synthesizes a phy packet with
+ 	 * the new generation number when a bus reset happens (see
+@@ -824,6 +894,8 @@ static int handle_at_packet(struct conte
+ 	evt = le16_to_cpu(last->transfer_status) & 0x1f;
+ 	packet->timestamp = le16_to_cpu(last->res_count);
+ 
++	debug_ar_at_event('T', packet->speed, packet->header, evt);
++
+ 	switch (evt) {
+ 	case OHCI1394_evt_timeout:
+ 		/* Async response transmit timed out. */
+@@ -1005,6 +1077,45 @@ at_context_transmit(struct context *ctx,
+ 
+ }
+ 
++#if FIREWIRE_OHCI_DEBUG_SELFIDS
++static char _p(u32 *s, int shift)
 +{
-+	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
-+	DECLARE_COMPLETION_ONSTACK(done);
-+	struct fw_transaction t;
-+	static u32 busy_timeout;
-+
-+	/* FIXME: we should try to set dual-phase cycle_limit too */
-+	busy_timeout = cpu_to_be32(SBP2_RETRY_LIMIT);
-+
-+	fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST,
-+			lu->tgt->node_id, lu->generation, device->max_speed,
-+			CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, &busy_timeout,
-+			sizeof(busy_timeout), complete_set_busy_timeout, &done);
-+	wait_for_completion(&done);
++	static const char port_connected[] = { '.', '-', 'p', 'c', };
++
++	return port_connected[*s >> shift & 3];
 +}
 +
- static void sbp2_reconnect(struct work_struct *work);
- 
- static void sbp2_login(struct work_struct *work)
-@@ -851,10 +876,8 @@ static void sbp2_login(struct work_struct *work)
- 	fw_notify("%s: logged in to LUN %04x (%d retries)\n",
- 		  tgt->bus_id, lu->lun, lu->retries);
- 
--#if 0
--	/* FIXME: The linux1394 sbp2 does this last step. */
--	sbp2_set_busy_timeout(scsi_id);
--#endif
-+	/* set appropriate retry limit(s) in BUSY_TIMEOUT register */
-+	sbp2_set_busy_timeout(lu);
++static void debug_selfid_complete_event(int self_id_count, u32 *s)
++{
++	static const char *speed[] = {
++		[0] = "S100", [1] = "S200", [2] = "S400",    [3] = "beta",
++	};
++	static const char *power[] = {
++		[0] = "+0W",  [1] = "+15W", [2] = "+30W",    [3] = "+45W",
++		[4] = "-3W",  [5] = " ?W",  [6] = "-3..-6W", [7] = "-3..-10W",
++	};
++
++	for (; self_id_count--; ++s)
++		if ((*s & 1 << 23) == 0)
++			printk(KERN_DEBUG "selfID 0: %08x, phy %d [%c%c%c] "
++			       "%s gc=%d %s %s%s%s%s\n",
++			       *s, *s >> 24 & 63, _p(s, 6), _p(s, 4), _p(s, 2),
++			       speed[*s >> 14 & 3], *s >> 16 & 63,
++			       power[*s >> 8 & 7], *s >> 22 & 1 ? "L" : "",
++			       *s >> 11 & 1 ? "c" : "", *s & 2 ? "i" : "",
++			       *s & 1 ? "..." : "");
++		else
++			printk(KERN_DEBUG "selfID n: %08x, phy %d "
++			       "[%c%c%c%c%c%c%c%c]%s\n",
++			       *s, *s >> 24 & 63,
++			       _p(s, 16), _p(s, 14), _p(s, 12), _p(s, 10),
++			       _p(s,  8), _p(s,  6), _p(s,  4), _p(s,  2),
++			       *s & 1 ? "..." : "");
++}
++#else
++#define debug_selfid_complete_event(self_id_count, s)
++#endif /* FIREWIRE_OHCI_DEBUG_SELFIDS */
++
+ static void bus_reset_tasklet(unsigned long data)
+ {
+ 	struct fw_ohci *ohci = (struct fw_ohci *)data;
+@@ -1115,6 +1226,8 @@ static void bus_reset_tasklet(unsigned l
+ 		dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,
+ 				  free_rom, free_rom_bus);
  
- 	PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect);
- 	sbp2_agent_reset(lu);
-
----
-
-Try to write dual-phase retry protocol limits to BUSY_TIMEOUT register.
-- The dual-phase retry protocol is optional to implement, and if not 
-  supported, writes to the dual-phase portion of the register will be
-  ignored. We try to write the original 1394-1995 default here.
-- In the case of devices that are also SBP-3-compliant, all writes are 
-  ignored, as the register is read-only, but contains single-phase retry of
-  15, which is what we're trying to set for all SBP-2 device anyway, so this
-  write attempt is safe and yields more consistent behavior for all devices.
-
-See section 8.3.2.3.5 of the 1394-1995 spec, section 6.2 of the SBP-2 spec,
-and section 6.4 of the SBP-3 spec for further details.
++	debug_selfid_complete_event(self_id_count, ohci->self_id_buffer);
++
+ 	fw_core_handle_bus_reset(&ohci->card, ohci->node_id, generation,
+ 				 self_id_count, ohci->self_id_buffer);
+ }
 
-Signed-off-by: Jarod Wilson 
----
+-- 
+Stefan Richter
+-=====-==--- --== -=--=
+http://arcgraph.de/sr/
 
-Update: refresh for updated patch 1/2 using CSR_BUSY_TIMEOUT
 
- drivers/firewire/fw-sbp2.c |   22 +++++++++++++++++++---
- 1 files changed, 19 insertions(+), 3 deletions(-)
+-------------------------------------------------------------------------
+This SF.net email is sponsored by: Microsoft
+Defy all challenges. Microsoft(R) Visual Studio 2008.
+http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
+_______________________________________________
+mailing list linux1394-devel at lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/linux1394-devel
 
-diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
-index fbf5b7a..763f653 100644
---- a/drivers/firewire/fw-sbp2.c
-+++ b/drivers/firewire/fw-sbp2.c
-@@ -173,7 +173,8 @@ struct sbp2_target {
- #define SBP2_ORB_TIMEOUT		2000U	/* Timeout in ms */
- #define SBP2_ORB_NULL			0x80000000
- #define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000
--#define SBP2_RETRY_LIMIT		0xf	/* 15 retries */
-+#define SBP2_RETRY_LIMIT		0xf		/* 15 retries */
-+#define SBP2_CYCLE_LIMIT		(0xc8 << 12)	/* 200 125us cycles */
- 
- /* Unit directory keys */
- #define SBP2_CSR_UNIT_CHARACTERISTICS	0x3a
-@@ -808,6 +809,22 @@ complete_set_busy_timeout(struct fw_card *card, int rcode,
- 	complete(done);
- }
- 
-+/*
-+ * Write retransmit retry values into the BUSY_TIMEOUT register.
-+ * - The single-phase retry protocol is supported by all SBP-2 devices, but the
-+ *   default retry_limit value is 0 (i.e. never retry transmission). We write a
-+ *   saner value after logging into the device.
-+ * - The dual-phase retry protocol is optional to implement, and if not
-+ *   supported, writes to the dual-phase portion of the register will be
-+ *   ignored. We try to write the original 1394-1995 default here.
-+ * - In the case of devices that are also SBP-3-compliant, all writes are
-+ *   ignored, as the register is read-only, but contains single-phase retry of
-+ *   15, which is what we're trying to set for all SBP-2 device anyway, so this
-+ *   write attempt is safe and yields more consistent behavior for all devices.
-+ *
-+ * See section 8.3.2.3.5 of the 1394-1995 spec, section 6.2 of the SBP-2 spec,
-+ * and section 6.4 of the SBP-3 spec for further details.
-+ */
- static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)
- {
- 	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
-@@ -815,8 +832,7 @@ static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)
- 	struct fw_transaction t;
- 	static u32 busy_timeout;
- 
--	/* FIXME: we should try to set dual-phase cycle_limit too */
--	busy_timeout = cpu_to_be32(SBP2_RETRY_LIMIT);
-+	busy_timeout = cpu_to_be32(SBP2_CYCLE_LIMIT | SBP2_RETRY_LIMIT);
- 
- 	fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST,
- 			lu->tgt->node_id, lu->generation, device->max_speed,

linux-2.6-firewire-git-update.patch:

Index: linux-2.6-firewire-git-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-update.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-firewire-git-update.patch	3 Mar 2008 21:12:45 -0000	1.8
+++ linux-2.6-firewire-git-update.patch	10 Mar 2008 14:09:35 -0000	1.9
@@ -1,21 +1,26 @@
-git diff in linux1394-git tree vs. 2.6.25-rc3-git4, 03/03/2008
-
- Documentation/debugging-via-ohci1394.txt |   13 ++-
- drivers/firewire/fw-card.c               |   38 ----------
- drivers/firewire/fw-device.h             |   27 ++++---
- drivers/firewire/fw-ohci.c               |  114 +++++++++++++++++++++-------
- drivers/firewire/fw-sbp2.c               |  120 ++++++++++++------------------
+ Documentation/debugging-via-ohci1394.txt |   13 +-
+ drivers/firewire/fw-card.c               |   40 +-----
+ drivers/firewire/fw-cdev.c               |   13 ++-
+ drivers/firewire/fw-device.c             |  261 ++++++++++++++++++++++++------
+ drivers/firewire/fw-device.h             |   38 ++++--
+ drivers/firewire/fw-ohci.c               |  114 ++++++++++---
+ drivers/firewire/fw-sbp2.c               |  175 +++++++++++---------
+ drivers/firewire/fw-topology.c           |    3 +
+ drivers/firewire/fw-topology.h           |   11 +-
  drivers/firewire/fw-transaction.c        |    2 +-
- drivers/firewire/fw-transaction.h        |   10 +--
+ drivers/firewire/fw-transaction.h        |   10 +-
  drivers/ieee1394/csr.c                   |    6 +-
  drivers/ieee1394/dv1394.c                |    3 +-
+ drivers/ieee1394/highlevel.c             |    6 +-
+ drivers/ieee1394/ieee1394_core.c         |    2 +-
  drivers/ieee1394/nodemgr.c               |    6 +-
- drivers/ieee1394/ohci1394.c              |  109 ++++++++++++---------------
+ drivers/ieee1394/ohci1394.c              |  111 ++++++-------
+ drivers/ieee1394/pcilynx.c               |   12 +-
  drivers/ieee1394/raw1394.c               |    1 -
- drivers/ieee1394/sbp2.c                  |    7 +-
+ drivers/ieee1394/sbp2.c                  |   11 +-
  drivers/ieee1394/video1394.c             |    3 +-
- lib/Kconfig.debug                        |   10 +++
- 15 files changed, 233 insertions(+), 236 deletions(-)
+ lib/Kconfig.debug                        |   10 ++
+ 22 files changed, 538 insertions(+), 313 deletions(-)
 
 diff --git a/Documentation/debugging-via-ohci1394.txt b/Documentation/debugging-via-ohci1394.txt
 index c360d4e..371ba27 100644
@@ -42,9 +47,18 @@
  To activate it, enable CONFIG_PROVIDE_OHCI1394_DMA_INIT (Kernel hacking menu:
  Provide code for enabling DMA over FireWire early on boot) and pass the
 diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
-index a034627..140b34d 100644
+index a034627..7e4012d 100644
 --- a/drivers/firewire/fw-card.c
 +++ b/drivers/firewire/fw-card.c
+@@ -331,7 +331,7 @@ fw_card_bm_work(struct work_struct *work)
+ 		 */
+ 		spin_unlock_irqrestore(&card->lock, flags);
+ 		goto out;
+-	} else if (root_device->config_rom[2] & BIB_CMC) {
++	} else if (root_device->cmc) {
+ 		/*
+ 		 * FIXME: I suppose we should set the cmstr bit in the
+ 		 * STATE_CLEAR register of this node, as described in
 @@ -398,7 +398,6 @@ fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
  {
  	static atomic_t index = ATOMIC_INIT(-1);
@@ -107,11 +121,560 @@
  int
  fw_core_initiate_bus_reset(struct fw_card *card, int short_reset)
  {
+diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
+index 46bc197..4a54192 100644
+--- a/drivers/firewire/fw-cdev.c
++++ b/drivers/firewire/fw-cdev.c
+@@ -269,21 +269,28 @@ static int ioctl_get_info(struct client *client, void *buffer)
+ {
+ 	struct fw_cdev_get_info *get_info = buffer;
+ 	struct fw_cdev_event_bus_reset bus_reset;
++	unsigned long ret = 0;
+ 
+ 	client->version = get_info->version;
+ 	get_info->version = FW_CDEV_VERSION;
+ 
++	down_read(&fw_device_rwsem);
++
+ 	if (get_info->rom != 0) {
+ 		void __user *uptr = u64_to_uptr(get_info->rom);
+ 		size_t want = get_info->rom_length;
+ 		size_t have = client->device->config_rom_length * 4;
+ 
+-		if (copy_to_user(uptr, client->device->config_rom,
+-				 min(want, have)))
+-			return -EFAULT;
++		ret = copy_to_user(uptr, client->device->config_rom,
++				   min(want, have));
+ 	}
+ 	get_info->rom_length = client->device->config_rom_length * 4;
+ 
++	up_read(&fw_device_rwsem);
++
++	if (ret != 0)
++		return -EFAULT;
++
+ 	client->bus_reset_closure = get_info->bus_reset_closure;
+ 	if (get_info->bus_reset != 0) {
+ 		void __user *uptr = u64_to_uptr(get_info->bus_reset);
+diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
+index 870125a..19f2fc4 100644
+--- a/drivers/firewire/fw-device.c
++++ b/drivers/firewire/fw-device.c
+@@ -25,7 +25,7 @@
+ #include 
+ #include 
+ #include 
+-#include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -160,9 +160,9 @@ static void fw_device_release(struct device *dev)
+ 	 * Take the card lock so we don't set this to NULL while a
+ 	 * FW_NODE_UPDATED callback is being handled.
+ 	 */
+-	spin_lock_irqsave(&device->card->lock, flags);
++	spin_lock_irqsave(&card->lock, flags);
+ 	device->node->data = NULL;
+-	spin_unlock_irqrestore(&device->card->lock, flags);
++	spin_unlock_irqrestore(&card->lock, flags);
+ 
+ 	fw_node_put(device->node);
+ 	kfree(device->config_rom);
+@@ -195,7 +195,9 @@ show_immediate(struct device *dev, struct device_attribute *dattr, char *buf)
+ 		container_of(dattr, struct config_rom_attribute, attr);
+ 	struct fw_csr_iterator ci;
+ 	u32 *dir;
+-	int key, value;
++	int key, value, ret = -ENOENT;
++
++	down_read(&fw_device_rwsem);
+ 
+ 	if (is_fw_unit(dev))
+ 		dir = fw_unit(dev)->directory;
+@@ -204,11 +206,15 @@ show_immediate(struct device *dev, struct device_attribute *dattr, char *buf)
+ 
+ 	fw_csr_iterator_init(&ci, dir);
+ 	while (fw_csr_iterator_next(&ci, &key, &value))
+-		if (attr->key == key)
+-			return snprintf(buf, buf ? PAGE_SIZE : 0,
+-					"0x%06x\n", value);
++		if (attr->key == key) {
++			ret = snprintf(buf, buf ? PAGE_SIZE : 0,
++				       "0x%06x\n", value);
++			break;
++		}
++
++	up_read(&fw_device_rwsem);
+ 
+-	return -ENOENT;
++	return ret;
+ }
+ 
+ #define IMMEDIATE_ATTR(name, key)				\
+@@ -221,9 +227,11 @@ show_text_leaf(struct device *dev, struct device_attribute *dattr, char *buf)
+ 		container_of(dattr, struct config_rom_attribute, attr);
+ 	struct fw_csr_iterator ci;
+ 	u32 *dir, *block = NULL, *p, *end;
+-	int length, key, value, last_key = 0;
++	int length, key, value, last_key = 0, ret = -ENOENT;
+ 	char *b;
+ 
++	down_read(&fw_device_rwsem);
++
+ 	if (is_fw_unit(dev))
+ 		dir = fw_unit(dev)->directory;
+ 	else
+@@ -238,18 +246,20 @@ show_text_leaf(struct device *dev, struct device_attribute *dattr, char *buf)
+ 	}
+ 
+ 	if (block == NULL)
+-		return -ENOENT;
++		goto out;
+ 
+ 	length = min(block[0] >> 16, 256U);
+ 	if (length < 3)
+-		return -ENOENT;
++		goto out;
+ 
+ 	if (block[1] != 0 || block[2] != 0)
+ 		/* Unknown encoding. */
+-		return -ENOENT;
++		goto out;
+ 
+-	if (buf == NULL)
+-		return length * 4;
++	if (buf == NULL) {
++		ret = length * 4;
++		goto out;
++	}
+ 
+ 	b = buf;
+ 	end = &block[length + 1];
+@@ -259,8 +269,11 @@ show_text_leaf(struct device *dev, struct device_attribute *dattr, char *buf)
+ 	/* Strip trailing whitespace and add newline. */
+ 	while (b--, (isspace(*b) || *b == '\0') && b > buf);
+ 	strcpy(b + 1, "\n");
++	ret = b + 2 - buf;
++ out:
++	up_read(&fw_device_rwsem);
+ 
+-	return b + 2 - buf;
++	return ret;
+ }
+ 
+ #define TEXT_LEAF_ATTR(name, key)				\
+@@ -337,19 +350,28 @@ static ssize_t
+ config_rom_show(struct device *dev, struct device_attribute *attr, char *buf)
+ {
+ 	struct fw_device *device = fw_device(dev);
++	size_t length;
+ 
+-	memcpy(buf, device->config_rom, device->config_rom_length * 4);
++	down_read(&fw_device_rwsem);
++	length = device->config_rom_length * 4;
++	memcpy(buf, device->config_rom, length);
++	up_read(&fw_device_rwsem);
+ 
+-	return device->config_rom_length * 4;
++	return length;
+ }
+ 
+ static ssize_t
+ guid_show(struct device *dev, struct device_attribute *attr, char *buf)
+ {
+ 	struct fw_device *device = fw_device(dev);
++	int ret;
++
++	down_read(&fw_device_rwsem);
++	ret = snprintf(buf, PAGE_SIZE, "0x%08x%08x\n",
++		       device->config_rom[3], device->config_rom[4]);
++	up_read(&fw_device_rwsem);
+ 
+-	return snprintf(buf, PAGE_SIZE, "0x%08x%08x\n",
+-			device->config_rom[3], device->config_rom[4]);
++	return ret;
+ }
+ 
+ static struct device_attribute fw_device_attributes[] = {
+@@ -400,6 +422,9 @@ read_rom(struct fw_device *device, int generation, int index, u32 *data)
+ 	return callback_data.rcode;
+ }
+ 
++#define READ_BIB_ROM_SIZE	256
++#define READ_BIB_STACK_SIZE	16
++
+ /*
+  * Read the bus info block, perform a speed probe, and read all of the rest of
+  * the config ROM.  We do all this with a cached bus generation.  If the bus
+@@ -409,16 +434,23 @@ read_rom(struct fw_device *device, int generation, int index, u32 *data)
+  */
+ static int read_bus_info_block(struct fw_device *device, int generation)
+ {
+-	static u32 rom[256];
+-	u32 stack[16], sp, key;
+-	int i, end, length;
++	u32 *rom, *stack, *old_rom, *new_rom;
++	u32 sp, key;
++	int i, end, length, ret = -1;
++
++	rom = kmalloc(sizeof(*rom) * READ_BIB_ROM_SIZE +
++		      sizeof(*stack) * READ_BIB_STACK_SIZE, GFP_KERNEL);
++	if (rom == NULL)
++		return -ENOMEM;
++
++	stack = &rom[READ_BIB_ROM_SIZE];
+ 
+ 	device->max_speed = SCODE_100;
+ 
+ 	/* First read the bus info block. */
+ 	for (i = 0; i < 5; i++) {
+ 		if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE)
+-			return -1;
++			goto out;
+ 		/*
+ 		 * As per IEEE1212 7.2, during power-up, devices can
+ 		 * reply with a 0 for the first quadlet of the config
+@@ -428,7 +460,7 @@ static int read_bus_info_block(struct fw_device *device, int generation)
+ 		 * retry mechanism will try again later.
+ 		 */
+ 		if (i == 0 && rom[i] == 0)
+-			return -1;
++			goto out;
+ 	}
+ 
+ 	device->max_speed = device->node->max_speed;
+@@ -478,26 +510,26 @@ static int read_bus_info_block(struct fw_device *device, int generation)
+ 		 */
+ 		key = stack[--sp];
+ 		i = key & 0xffffff;
+-		if (i >= ARRAY_SIZE(rom))
++		if (i >= READ_BIB_ROM_SIZE)
+ 			/*
+ 			 * The reference points outside the standard
+ 			 * config rom area, something's fishy.
+ 			 */
+-			return -1;
++			goto out;
+ 
+ 		/* Read header quadlet for the block to get the length. */
+ 		if (read_rom(device, generation, i, &rom[i]) != RCODE_COMPLETE)
+-			return -1;
++			goto out;
+ 		end = i + (rom[i] >> 16) + 1;
+ 		i++;
+-		if (end > ARRAY_SIZE(rom))
++		if (end > READ_BIB_ROM_SIZE)
+ 			/*
+ 			 * This block extends outside standard config
+ 			 * area (and the array we're reading it
+ 			 * into).  That's broken, so ignore this
+ 			 * device.
+ 			 */
+-			return -1;
++			goto out;
+ 
+ 		/*
+ 		 * Now read in the block.  If this is a directory
+@@ -507,9 +539,9 @@ static int read_bus_info_block(struct fw_device *device, int generation)
+ 		while (i < end) {
+ 			if (read_rom(device, generation, i, &rom[i]) !=
+ 			    RCODE_COMPLETE)
+-				return -1;
++				goto out;
+ 			if ((key >> 30) == 3 && (rom[i] >> 30) > 1 &&
+-			    sp < ARRAY_SIZE(stack))
++			    sp < READ_BIB_STACK_SIZE)
+ 				stack[sp++] = i + rom[i];
+ 			i++;
+ 		}
+@@ -517,13 +549,23 @@ static int read_bus_info_block(struct fw_device *device, int generation)
+ 			length = i;
+ 	}
+ 
+-	device->config_rom = kmalloc(length * 4, GFP_KERNEL);
+-	if (device->config_rom == NULL)
+-		return -1;
+-	memcpy(device->config_rom, rom, length * 4);
++	old_rom = device->config_rom;
++	new_rom = kmemdup(rom, length * 4, GFP_KERNEL);
++	if (new_rom == NULL)
++		goto out;
++
++	down_write(&fw_device_rwsem);
++	device->config_rom = new_rom;
+ 	device->config_rom_length = length;
++	up_write(&fw_device_rwsem);
+ 
+-	return 0;
++	kfree(old_rom);
++	ret = 0;
++	device->cmc = rom[2] & 1 << 30;
++ out:
++	kfree(rom);
++
++	return ret;
+ }
+ 
+ static void fw_unit_release(struct device *dev)
+@@ -592,7 +634,14 @@ static int shutdown_unit(struct device *device, void *data)
+ 	return 0;
+ }
+ 
+-static DECLARE_RWSEM(idr_rwsem);
++/*
++ * fw_device_rwsem acts as dual purpose mutex:
++ *   - serializes accesses to fw_device_idr,
++ *   - serializes accesses to fw_device.config_rom/.config_rom_length and
++ *     fw_unit.directory, unless those accesses happen at safe occasions
++ */
++DECLARE_RWSEM(fw_device_rwsem);
++
+ static DEFINE_IDR(fw_device_idr);
+ int fw_cdev_major;
+ 
+@@ -600,11 +649,11 @@ struct fw_device *fw_device_get_by_devt(dev_t devt)
+ {
+ 	struct fw_device *device;
+ 
+-	down_read(&idr_rwsem);
++	down_read(&fw_device_rwsem);
+ 	device = idr_find(&fw_device_idr, MINOR(devt));
+ 	if (device)
+ 		fw_device_get(device);
+-	up_read(&idr_rwsem);
++	up_read(&fw_device_rwsem);
+ 
+ 	return device;
+ }
+@@ -619,9 +668,9 @@ static void fw_device_shutdown(struct work_struct *work)
+ 	device_for_each_child(&device->device, NULL, shutdown_unit);
+ 	device_unregister(&device->device);
+ 
+-	down_write(&idr_rwsem);
++	down_write(&fw_device_rwsem);
+ 	idr_remove(&fw_device_idr, minor);
+-	up_write(&idr_rwsem);
++	up_write(&fw_device_rwsem);
+ 	fw_device_put(device);
+ }
+ 
+@@ -674,10 +723,10 @@ static void fw_device_init(struct work_struct *work)
+ 	err = -ENOMEM;
+ 
+ 	fw_device_get(device);
+-	down_write(&idr_rwsem);
++	down_write(&fw_device_rwsem);
+ 	if (idr_pre_get(&fw_device_idr, GFP_KERNEL))
+ 		err = idr_get_new(&fw_device_idr, device, &minor);
+-	up_write(&idr_rwsem);
++	up_write(&fw_device_rwsem);
+ 
+ 	if (err < 0)
+ 		goto error;
+@@ -711,7 +760,7 @@ static void fw_device_init(struct work_struct *work)
+ 	if (atomic_cmpxchg(&device->state,
+ 		    FW_DEVICE_INITIALIZING,
+ 		    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) {
+-		fw_device_shutdown(&device->work.work);
++		fw_device_shutdown(work);
+ 	} else {
+ 		if (device->config_rom_retries)
+ 			fw_notify("created device %s: GUID %08x%08x, S%d00, "
+@@ -725,6 +774,7 @@ static void fw_device_init(struct work_struct *work)
+ 				  device->device.bus_id,
+ 				  device->config_rom[3], device->config_rom[4],
+ 				  1 << device->max_speed);
++		device->config_rom_retries = 0;
+ 	}
+ 
+ 	/*
+@@ -739,9 +789,9 @@ static void fw_device_init(struct work_struct *work)
+ 	return;
+ 
+  error_with_cdev:
+-	down_write(&idr_rwsem);
++	down_write(&fw_device_rwsem);
+ 	idr_remove(&fw_device_idr, minor);
+-	up_write(&idr_rwsem);
++	up_write(&fw_device_rwsem);
+  error:
+ 	fw_device_put(device);		/* fw_device_idr's reference */
+ 
+@@ -771,6 +821,107 @@ static void fw_device_update(struct work_struct *work)
+ 	device_for_each_child(&device->device, NULL, update_unit);
+ }
+ 
++enum {
++	REREAD_BIB_ERROR,
++	REREAD_BIB_GONE,
++	REREAD_BIB_UNCHANGED,
++	REREAD_BIB_CHANGED,
++};
++
++/* Reread and compare bus info block and header of root directory */
++static int reread_bus_info_block(struct fw_device *device, int generation)
++{
++	u32 q;
++	int i;
++
++	for (i = 0; i < 6; i++) {
++		if (read_rom(device, generation, i, &q) != RCODE_COMPLETE)
++			return REREAD_BIB_ERROR;
++
++		if (i == 0 && q == 0)
++			return REREAD_BIB_GONE;
++
++		if (i > device->config_rom_length || q != device->config_rom[i])
++			return REREAD_BIB_CHANGED;
++	}
++
++	return REREAD_BIB_UNCHANGED;
++}
++
++static void fw_device_refresh(struct work_struct *work)
++{
++	struct fw_device *device =
++		container_of(work, struct fw_device, work.work);
++	struct fw_card *card = device->card;
++	int node_id = device->node_id;
++
++	switch (reread_bus_info_block(device, device->generation)) {
++	case REREAD_BIB_ERROR:
++		if (device->config_rom_retries < MAX_RETRIES / 2 &&
++		    atomic_read(&device->state) == FW_DEVICE_INITIALIZING) {
++			device->config_rom_retries++;
++			schedule_delayed_work(&device->work, RETRY_DELAY / 2);
++
++			return;
++		}
++		goto give_up;
++
++	case REREAD_BIB_GONE:
++		goto gone;
++
++	case REREAD_BIB_UNCHANGED:
++		if (atomic_cmpxchg(&device->state,
++			    FW_DEVICE_INITIALIZING,
++			    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
++			goto gone;
++
++		fw_device_update(work);
++		device->config_rom_retries = 0;
++
++		return;
++
++	case REREAD_BIB_CHANGED:
++		break;
++	}
++
++	/*
++	 * Something changed.  We keep things simple and don't investigate
++	 * further.  We just destroy all previous units and create new ones.
++	 */
++	device_for_each_child(&device->device, NULL, shutdown_unit);
++
++	if (read_bus_info_block(device, device->generation) < 0) {
++		if (device->config_rom_retries < MAX_RETRIES &&
++		    atomic_read(&device->state) == FW_DEVICE_INITIALIZING) {
++			device->config_rom_retries++;
++			schedule_delayed_work(&device->work, RETRY_DELAY);
++
++			return;
++		}
++		goto give_up;
++	}
++
++	create_units(device);
++
++	if (atomic_cmpxchg(&device->state,
++		    FW_DEVICE_INITIALIZING,
++		    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
++		goto gone;
++
++	fw_notify("refreshed device %s\n", device->device.bus_id);
++	device->config_rom_retries = 0;
++	goto out;
++
++ give_up:
++	fw_notify("giving up on refresh of device %s\n", device->device.bus_id);
++ gone:
++	atomic_set(&device->state, FW_DEVICE_SHUTDOWN);
++	fw_device_shutdown(work);
++ out:
++	if (node_id == card->root_node->node_id)
++		schedule_delayed_work(&card->work, 0);
++}
++
+ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
+ {
+ 	struct fw_device *device;
+@@ -780,7 +931,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
+ 	case FW_NODE_LINK_ON:
+ 		if (!node->link_on)
+ 			break;
+-
++ create:
+ 		device = kzalloc(sizeof(*device), GFP_ATOMIC);
+ 		if (device == NULL)
+ 			break;
+@@ -819,6 +970,22 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
+ 		schedule_delayed_work(&device->work, INITIAL_DELAY);
+ 		break;
+ 
++	case FW_NODE_INITIATED_RESET:
++		device = node->data;
++		if (device == NULL)
++			goto create;
++
++		device->node_id = node->node_id;
++		smp_wmb();  /* update node_id before generation */
++		device->generation = card->generation;
++		if (atomic_cmpxchg(&device->state,
++			    FW_DEVICE_RUNNING,
++			    FW_DEVICE_INITIALIZING) == FW_DEVICE_RUNNING) {
++			PREPARE_DELAYED_WORK(&device->work, fw_device_refresh);
++			schedule_delayed_work(&device->work, INITIAL_DELAY);
++		}
++		break;
++
+ 	case FW_NODE_UPDATED:
+ 		if (!node->link_on || node->data == NULL)
+ 			break;
 diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
-index 78ecd39..0d771fd 100644
+index 78ecd39..5f131f5 100644
 --- a/drivers/firewire/fw-device.h
 +++ b/drivers/firewire/fw-device.h
-@@ -64,28 +64,24 @@ struct fw_device {
+@@ -21,6 +21,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ enum fw_device_state {
+@@ -46,6 +47,11 @@ struct fw_attribute_group {
+  * fw_device.node_id is guaranteed to be current too.
+  *
+  * The same applies to fw_device.card->node_id vs. fw_device.generation.
++ *
++ * fw_device.config_rom and fw_device.config_rom_length may be accessed during
++ * the lifetime of any fw_unit belonging to the fw_device, before device_del()
++ * was called on the last fw_unit.  Alternatively, they may be accessed while
++ * holding fw_device_rwsem.
+  */
+ struct fw_device {
+ 	atomic_t state;
+@@ -53,6 +59,7 @@ struct fw_device {
+ 	int node_id;
+ 	int generation;
+ 	unsigned max_speed;
++	bool cmc;
+ 	struct fw_card *card;
+ 	struct device device;
+ 	struct list_head link;
+@@ -64,28 +71,24 @@ struct fw_device {
  	struct fw_attribute_group attribute_group;
  };
  
@@ -144,7 +707,19 @@
  {
  	put_device(&device->device);
  }
-@@ -104,12 +100,23 @@ struct fw_unit {
+@@ -96,20 +99,35 @@ int fw_device_enable_phys_dma(struct fw_device *device);
+ void fw_device_cdev_update(struct fw_device *device);
+ void fw_device_cdev_remove(struct fw_device *device);
+ 
++extern struct rw_semaphore fw_device_rwsem;
+ extern int fw_cdev_major;
+ 
++/*
++ * fw_unit.directory must not be accessed after device_del(&fw_unit.device).
++ */
+ struct fw_unit {
+ 	struct device device;
+ 	u32 *directory;
  	struct fw_attribute_group attribute_group;
  };
  
@@ -468,20 +1043,30 @@
  		fw_error("pci_enable_device failed\n");
  		return err;
 diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
-index 03069a4..d6d62c6 100644
+index 03069a4..366981b 100644
 --- a/drivers/firewire/fw-sbp2.c
 +++ b/drivers/firewire/fw-sbp2.c
-@@ -174,9 +174,6 @@ struct sbp2_target {
+@@ -153,6 +153,7 @@ struct sbp2_target {
+ 	struct list_head lu_list;
+ 
+ 	u64 management_agent_address;
++	u64 guid;
+ 	int directory_id;
+ 	int node_id;
+ 	int address_high;
+@@ -173,9 +174,8 @@ struct sbp2_target {
+ #define SBP2_ORB_TIMEOUT		2000U	/* Timeout in ms */
  #define SBP2_ORB_NULL			0x80000000
  #define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000
- 
+-
 -#define SBP2_DIRECTION_TO_MEDIA		0x0
 -#define SBP2_DIRECTION_FROM_MEDIA	0x1
--
++#define SBP2_RETRY_LIMIT		0xf		/* 15 retries */
++#define SBP2_CYCLE_LIMIT		(0xc8 << 12)	/* 200 125us cycles */
+ 
  /* Unit directory keys */
  #define SBP2_CSR_UNIT_CHARACTERISTICS	0x3a
- #define SBP2_CSR_FIRMWARE_REVISION	0x3c
-@@ -223,8 +220,8 @@ struct sbp2_status {
+@@ -223,8 +223,8 @@ struct sbp2_status {
  };
  
  struct sbp2_pointer {
@@ -492,7 +1077,7 @@
  };
  
  struct sbp2_orb {
-@@ -252,8 +249,8 @@ struct sbp2_management_orb {
+@@ -252,8 +252,8 @@ struct sbp2_management_orb {
  	struct {
  		struct sbp2_pointer password;
  		struct sbp2_pointer response;
@@ -503,7 +1088,7 @@
  		struct sbp2_pointer status_fifo;
  	} request;
  	__be32 response[4];
-@@ -262,20 +259,17 @@ struct sbp2_management_orb {
+@@ -262,20 +262,17 @@ struct sbp2_management_orb {
  	struct sbp2_status status;
  };
  
@@ -527,7 +1112,7 @@
  #define COMMAND_ORB_REQUEST_FORMAT(v)	((v) << 29)
  #define COMMAND_ORB_NOTIFY		((1) << 31)
  
-@@ -284,7 +278,7 @@ struct sbp2_command_orb {
+@@ -284,7 +281,7 @@ struct sbp2_command_orb {
  	struct {
  		struct sbp2_pointer next;
  		struct sbp2_pointer data_descriptor;
@@ -536,7 +1121,7 @@
  		u8 command_block[12];
  	} request;
  	struct scsi_cmnd *cmd;
-@@ -453,8 +447,7 @@ sbp2_send_orb(struct sbp2_orb *orb, struct sbp2_logical_unit *lu,
+@@ -453,8 +450,7 @@ sbp2_send_orb(struct sbp2_orb *orb, struct sbp2_logical_unit *lu,
  	unsigned long flags;
  
  	orb->pointer.high = 0;
@@ -546,7 +1131,7 @@
  
  	spin_lock_irqsave(&device->card->lock, flags);
  	list_add_tail(&orb->link, &lu->orb_list);
-@@ -530,31 +523,31 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
+@@ -530,31 +526,31 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
  	if (dma_mapping_error(orb->response_bus))
  		goto fail_mapping_response;
  
@@ -590,7 +1175,7 @@
  	init_completion(&orb->done);
  	orb->base.callback = complete_management_orb;
  
-@@ -599,8 +592,7 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
+@@ -599,8 +595,7 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
  			 sizeof(orb->response), DMA_FROM_DEVICE);
   fail_mapping_response:
  	if (response)
@@ -600,7 +1185,7 @@
  	kref_put(&orb->base.kref, free_orb);
  
  	return retval;
-@@ -695,10 +687,8 @@ static void sbp2_conditionally_block(struct sbp2_logical_unit *lu)
+@@ -695,10 +690,8 @@ static void sbp2_conditionally_block(struct sbp2_logical_unit *lu)
  	if (!tgt->dont_block && !lu->blocked &&
  	    lu->generation != card->generation) {
  		lu->blocked = true;
@@ -612,7 +1197,7 @@
  	}
  	spin_unlock_irqrestore(&card->lock, flags);
  }
-@@ -725,10 +715,8 @@ static void sbp2_conditionally_unblock(struct sbp2_logical_unit *lu)
+@@ -725,10 +718,8 @@ static void sbp2_conditionally_unblock(struct sbp2_logical_unit *lu)
  	}
  	spin_unlock_irqrestore(&card->lock, flags);
  
@@ -624,7 +1209,7 @@
  }
  
  /*
-@@ -790,7 +778,7 @@ static void sbp2_release_target(struct kref *kref)
+@@ -790,7 +781,7 @@ static void sbp2_release_target(struct kref *kref)
  	scsi_remove_host(shost);
  	fw_notify("released %s\n", tgt->bus_id);
  
@@ -633,7 +1218,53 @@
  	scsi_host_put(shost);
  	fw_device_put(device);
  }
-@@ -855,11 +843,10 @@ static void sbp2_login(struct work_struct *work)
+@@ -812,6 +803,45 @@ static void sbp2_target_put(struct sbp2_target *tgt)
+ 	kref_put(&tgt->kref, sbp2_release_target);
+ }
+ 
++static void
++complete_set_busy_timeout(struct fw_card *card, int rcode,
++			  void *payload, size_t length, void *done)
++{
++	complete(done);
++}
++
++/*
++ * Write retransmit retry values into the BUSY_TIMEOUT register.
++ * - The single-phase retry protocol is supported by all SBP-2 devices, but the
++ *   default retry_limit value is 0 (i.e. never retry transmission). We write a
++ *   saner value after logging into the device.
++ * - The dual-phase retry protocol is optional to implement, and if not
++ *   supported, writes to the dual-phase portion of the register will be
++ *   ignored. We try to write the original 1394-1995 default here.
++ * - In the case of devices that are also SBP-3-compliant, all writes are
++ *   ignored, as the register is read-only, but contains single-phase retry of
++ *   15, which is what we're trying to set for all SBP-2 device anyway, so this
++ *   write attempt is safe and yields more consistent behavior for all devices.
++ *
++ * See section 8.3.2.3.5 of the 1394-1995 spec, section 6.2 of the SBP-2 spec,
++ * and section 6.4 of the SBP-3 spec for further details.
++ */
++static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)
++{
++	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
++	DECLARE_COMPLETION_ONSTACK(done);
++	struct fw_transaction t;
++	static u32 busy_timeout;
++
++	busy_timeout = cpu_to_be32(SBP2_CYCLE_LIMIT | SBP2_RETRY_LIMIT);
++
++	fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST,
++			lu->tgt->node_id, lu->generation, device->max_speed,
++			CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, &busy_timeout,
++			sizeof(busy_timeout), complete_set_busy_timeout, &done);
++	wait_for_completion(&done);
++}
++
+ static void sbp2_reconnect(struct work_struct *work);
+ 
+ static void sbp2_login(struct work_struct *work)
+@@ -855,19 +885,16 @@ static void sbp2_login(struct work_struct *work)
  	tgt->address_high = local_node_id << 16;
  	sbp2_set_generation(lu, generation);
  
@@ -648,7 +1279,25 @@
  
  	fw_notify("%s: logged in to LUN %04x (%d retries)\n",
  		  tgt->bus_id, lu->lun, lu->retries);
-@@ -1091,6 +1078,7 @@ static int sbp2_probe(struct device *dev)
+ 
+-#if 0
+-	/* FIXME: The linux1394 sbp2 does this last step. */
+-	sbp2_set_busy_timeout(scsi_id);
+-#endif
++	/* set appropriate retry limit(s) in BUSY_TIMEOUT register */
++	sbp2_set_busy_timeout(lu);
+ 
+ 	PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect);
+ 	sbp2_agent_reset(lu);
+@@ -1083,6 +1110,7 @@ static int sbp2_probe(struct device *dev)
+ 	kref_init(&tgt->kref);
+ 	INIT_LIST_HEAD(&tgt->lu_list);
+ 	tgt->bus_id = unit->device.bus_id;
++	tgt->guid = (u64)device->config_rom[3] << 32 | device->config_rom[4];
+ 
+ 	if (fw_device_enable_phys_dma(device) < 0)
+ 		goto fail_shost_put;
+@@ -1091,6 +1119,7 @@ static int sbp2_probe(struct device *dev)
  		goto fail_shost_put;
  
  	fw_device_get(device);
@@ -656,7 +1305,7 @@
  
  	/* Initialize to values that won't match anything in our table. */
  	firmware_revision = 0xff000000;
-@@ -1106,8 +1094,6 @@ static int sbp2_probe(struct device *dev)
+@@ -1106,8 +1135,6 @@ static int sbp2_probe(struct device *dev)
  
  	sbp2_init_workarounds(tgt, model, firmware_revision);
  
@@ -665,7 +1314,7 @@
  	/* Do the login in a workqueue so we can easily reschedule retries. */
  	list_for_each_entry(lu, &tgt->lu_list, link)
  		sbp2_queue_work(lu, 0);
-@@ -1339,9 +1325,12 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,
+@@ -1339,9 +1366,12 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,
  	 * tables.
  	 */
  	if (count == 1 && sg_dma_len(sg) < SBP2_MAX_SG_ELEMENT_LENGTH) {
@@ -681,7 +1330,7 @@
  		return 0;
  	}
  
-@@ -1362,16 +1351,14 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,
+@@ -1362,16 +1392,14 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,
  				goto fail_page_table;
  			}
  			l = min(sg_len, SBP2_MAX_SG_ELEMENT_LENGTH);
@@ -700,7 +1349,7 @@
  	orb->page_table_bus =
  		dma_map_single(device->card->device, orb->page_table,
  			       sizeof(orb->page_table), DMA_TO_DEVICE);
-@@ -1385,11 +1372,10 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,
+@@ -1385,11 +1413,10 @@ sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device,
  	 * initiator (i.e. us), but data_descriptor can refer to data
  	 * on other nodes so we need to put our ID in descriptor.high.
  	 */
@@ -716,7 +1365,7 @@
  
  	return 0;
  
-@@ -1435,8 +1421,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
+@@ -1435,8 +1462,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
  	orb->done = done;
  	orb->cmd  = cmd;
  
@@ -726,7 +1375,7 @@
  	/*
  	 * At speed 100 we can do 512 bytes per packet, at speed 200,
  	 * 1024 bytes per packet etc.  The SBP-2 max_payload field
-@@ -1445,25 +1430,17 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
+@@ -1445,25 +1471,17 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
  	 */
  	max_payload = min(device->max_speed + 7,
  			  device->card->max_receive - 1);
@@ -755,7 +1404,7 @@
  	memcpy(orb->request.command_block, cmd->cmnd, COMMAND_SIZE(*cmd->cmnd));
  
  	orb->base.callback = complete_command_orb;
-@@ -1491,11 +1468,8 @@ static int sbp2_scsi_slave_alloc(struct scsi_device *sdev)
+@@ -1491,11 +1509,8 @@ static int sbp2_scsi_slave_alloc(struct scsi_device *sdev)
  
  	sdev->allow_restart = 1;
  
@@ -769,6 +1418,68 @@
  
  	if (lu->tgt->workarounds & SBP2_WORKAROUND_INQUIRY_36)
  		sdev->inquiry_len = 36;
+@@ -1553,16 +1568,14 @@ sbp2_sysfs_ieee1394_id_show(struct device *dev, struct device_attribute *attr,
+ {
+ 	struct scsi_device *sdev = to_scsi_device(dev);
+ 	struct sbp2_logical_unit *lu;
+-	struct fw_device *device;
+ 
+ 	if (!sdev)
+ 		return 0;
+ 
+ 	lu = sdev->hostdata;
+-	device = fw_device(lu->tgt->unit->device.parent);
+ 
+-	return sprintf(buf, "%08x%08x:%06x:%04x\n",
+-			device->config_rom[3], device->config_rom[4],
++	return sprintf(buf, "%016llx:%06x:%04x\n",
++			(unsigned long long)lu->tgt->guid,
+ 			lu->tgt->directory_id, lu->lun);
+ }
+ 
+diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
+index e47bb04..25e8725 100644
+--- a/drivers/firewire/fw-topology.c
++++ b/drivers/firewire/fw-topology.c
+@@ -107,6 +107,7 @@ static struct fw_node *fw_node_create(u32 sid, int port_count, int color)
+ 	node->node_id = LOCAL_BUS | SELF_ID_PHY_ID(sid);
+ 	node->link_on = SELF_ID_LINK_ON(sid);
+ 	node->phy_speed = SELF_ID_PHY_SPEED(sid);
++	node->initiated_reset = SELF_ID_PHY_INITIATOR(sid);
+ 	node->port_count = port_count;
+ 
+ 	atomic_set(&node->ref_count, 1);
+@@ -430,6 +431,8 @@ update_tree(struct fw_card *card, struct fw_node *root)
+ 			event = FW_NODE_LINK_OFF;
+ 		else if (!node0->link_on && node1->link_on)
+ 			event = FW_NODE_LINK_ON;
++		else if (node1->initiated_reset && node1->link_on)
++			event = FW_NODE_INITIATED_RESET;
+ 		else
+ 			event = FW_NODE_UPDATED;
+ 
+diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
+index cedc1ec..addb9f8 100644
+--- a/drivers/firewire/fw-topology.h
++++ b/drivers/firewire/fw-topology.h
+@@ -20,11 +20,12 @@
+ #define __fw_topology_h
+ 
+ enum {
+-	FW_NODE_CREATED =   0x00,
+-	FW_NODE_UPDATED =   0x01,
+-	FW_NODE_DESTROYED = 0x02,
+-	FW_NODE_LINK_ON =   0x03,
+-	FW_NODE_LINK_OFF =  0x04,
++	FW_NODE_CREATED,
++	FW_NODE_UPDATED,
++	FW_NODE_DESTROYED,
++	FW_NODE_LINK_ON,
++	FW_NODE_LINK_OFF,
++	FW_NODE_INITIATED_RESET,
+ };
+ 
+ struct fw_node {
 diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
 index 7fcc59d..99529e5 100644
 --- a/drivers/firewire/fw-transaction.c
@@ -858,6 +1569,50 @@
  };
  
  
+diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
+index b642546..fa2bfec 100644
+--- a/drivers/ieee1394/highlevel.c
++++ b/drivers/ieee1394/highlevel.c
+@@ -339,7 +339,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
+ 	if ((alignment & 3) || (alignment > 0x800000000000ULL) ||
+ 	    (hweight64(alignment) != 1)) {
+ 		HPSB_ERR("%s called with invalid alignment: 0x%048llx",
+-			 __FUNCTION__, (unsigned long long)alignment);
++			 __func__, (unsigned long long)alignment);
+ 		return retval;
+ 	}
+ 
+@@ -354,7 +354,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
+ 	if (((start|end) & ~align_mask) || (start >= end) ||
+ 	    (end > CSR1212_ALL_SPACE_END)) {
+ 		HPSB_ERR("%s called with invalid addresses "
+-			 "(start = %012Lx  end = %012Lx)", __FUNCTION__,
++			 "(start = %012Lx  end = %012Lx)", __func__,
+ 			 (unsigned long long)start,(unsigned long long)end);
+ 		return retval;
+ 	}
+@@ -422,7 +422,7 @@ int hpsb_register_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,
+ 
+ 	if (((start|end) & 3) || (start >= end) ||
+ 	    (end > CSR1212_ALL_SPACE_END)) {
+-		HPSB_ERR("%s called with invalid addresses", __FUNCTION__);
++		HPSB_ERR("%s called with invalid addresses", __func__);
+ 		return 0;
+ 	}
+ 
+diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
+index 36c747b..942bf1f 100644
+--- a/drivers/ieee1394/ieee1394_core.c
++++ b/drivers/ieee1394/ieee1394_core.c
+@@ -242,7 +242,7 @@ int hpsb_bus_reset(struct hpsb_host *host)
+ {
+ 	if (host->in_bus_reset) {
+ 		HPSB_NOTICE("%s called while bus reset already in progress",
+-			    __FUNCTION__);
++			    __func__);
+ 		return 1;
+ 	}
+ 
 diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
 index 511e432..70afa37 100644
 --- a/drivers/ieee1394/nodemgr.c
@@ -876,9 +1631,18 @@
  		    id->vendor_id != ud->vendor_id)
  			continue;
 diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
-index 969de2a..29b8910 100644
+index 969de2a..0808bae 100644
 --- a/drivers/ieee1394/ohci1394.c
 +++ b/drivers/ieee1394/ohci1394.c
+@@ -708,7 +708,7 @@ static void insert_packet(struct ti_ohci *ohci,
+                                 /* FIXME: do something about it */
+                                 PRINT(KERN_ERR,
+                                       "%s: packet data addr: %p size %Zd bytes "
+-                                      "cross page boundary", __FUNCTION__,
++				      "cross page boundary", __func__,
+                                       packet->data, packet->data_size);
+                         }
+ #endif
 @@ -2993,15 +2993,9 @@ do {						\
  	return err;				\
  } while (0)
@@ -1080,6 +1844,62 @@
  	if (err) {
  		PRINT(KERN_ERR, "pci_enable_device failed with %d", err);
  		return err;
+diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
+index 8af01ab..9c35e0d 100644
+--- a/drivers/ieee1394/pcilynx.c
++++ b/drivers/ieee1394/pcilynx.c
+@@ -226,7 +226,7 @@ static int get_phy_reg(struct ti_lynx *lynx, int addr)
+         if (addr > 15) {
+                 PRINT(KERN_ERR, lynx->id,
+                       "%s: PHY register address %d out of range",
+-		      __FUNCTION__, addr);
++		      __func__, addr);
+                 return -1;
+         }
+ 
+@@ -238,7 +238,7 @@ static int get_phy_reg(struct ti_lynx *lynx, int addr)
+ 
+                 if (i > 10000) {
+                         PRINT(KERN_ERR, lynx->id, "%s: runaway loop, aborting",
+-			      __FUNCTION__);
++			      __func__);
+                         retval = -1;
+                         break;
+                 }
+@@ -261,13 +261,13 @@ static int set_phy_reg(struct ti_lynx *lynx, int addr, int val)
+ 
+         if (addr > 15) {
+                 PRINT(KERN_ERR, lynx->id,
+-                      "%s: PHY register address %d out of range", __FUNCTION__, addr);
++		      "%s: PHY register address %d out of range", __func__, addr);
+                 return -1;
+         }
+ 
+         if (val > 0xff) {
+                 PRINT(KERN_ERR, lynx->id,
+-                      "%s: PHY register value %d out of range", __FUNCTION__, val);
++		      "%s: PHY register value %d out of range", __func__, val);
+                 return -1;
+         }
+ 
+@@ -287,7 +287,7 @@ static int sel_phy_reg_page(struct ti_lynx *lynx, int page)
+ 
+         if (page > 7) {
+                 PRINT(KERN_ERR, lynx->id,
+-                      "%s: PHY page %d out of range", __FUNCTION__, page);
++		      "%s: PHY page %d out of range", __func__, page);
+                 return -1;
+         }
+ 
+@@ -309,7 +309,7 @@ static int sel_phy_reg_port(struct ti_lynx *lynx, int port)
+ 
+         if (port > 15) {
+                 PRINT(KERN_ERR, lynx->id,
+-                      "%s: PHY port %d out of range", __FUNCTION__, port);
++		      "%s: PHY port %d out of range", __func__, port);
+                 return -1;
+         }
+ 
 diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
 index 37e7e10..3634785 100644
 --- a/drivers/ieee1394/raw1394.c
@@ -1093,9 +1913,27 @@
  
  /******************************************************************************/
 diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
-index 9e2b196..29e6663 100644
+index 9e2b196..d5b9281 100644
 --- a/drivers/ieee1394/sbp2.c
 +++ b/drivers/ieee1394/sbp2.c
+@@ -610,7 +610,7 @@ static struct sbp2_command_info *sbp2util_allocate_command_orb(
+ 		cmd->Current_SCpnt = Current_SCpnt;
+ 		list_add_tail(&cmd->list, &lu->cmd_orb_inuse);
+ 	} else
+-		SBP2_ERR("%s: no orbs available", __FUNCTION__);
++		SBP2_ERR("%s: no orbs available", __func__);
+ 	spin_unlock_irqrestore(&lu->cmd_orb_lock, flags);
+ 	return cmd;
+ }
+@@ -1289,7 +1289,7 @@ static int sbp2_set_busy_timeout(struct sbp2_lu *lu)
+ 
+ 	data = cpu_to_be32(SBP2_BUSY_TIMEOUT_VALUE);
+ 	if (hpsb_node_write(lu->ne, SBP2_BUSY_TIMEOUT_ADDRESS, &data, 4))
+-		SBP2_ERR("%s error", __FUNCTION__);
++		SBP2_ERR("%s error", __func__);
+ 	return 0;
+ }
+ 
 @@ -1980,11 +1980,8 @@ static int sbp2scsi_slave_alloc(struct scsi_device *sdev)
  	lu->sdev = sdev;
  	sdev->allow_restart = 1;



From fedora-extras-commits at redhat.com  Mon Mar 10 14:12:50 2008
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Mon, 10 Mar 2008 14:12:50 GMT
Subject: rpms/kernel/devel linux-2.6-firewire-git-pending.patch,1.14,1.15
Message-ID: <200803101412.m2AECofM005901@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5872

Modified Files:
	linux-2.6-firewire-git-pending.patch 
Log Message:
Minor clean-up of patch, don't need all those mail headers in there...

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-firewire-git-pending.patch	10 Mar 2008 14:09:35 -0000	1.14
+++ linux-2.6-firewire-git-pending.patch	10 Mar 2008 14:12:04 -0000	1.15
@@ -137,75 +137,8 @@
  
  static void
  handle_registers(struct fw_card *card, struct fw_request *request,
-From stefanr at s5r6.in-berlin.de Sat Mar  8 16:38:16 2008
-Return-Path: 
-Received: from mail.boston.redhat.com ([unix socket])
-	 by mail.boston.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
-	 Sat, 08 Mar 2008 16:39:18 -0500
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by mail.boston.redhat.com (8.13.1/8.13.1) with ESMTP id m28LdHte029996
-	for ; Sat, 8 Mar 2008 16:39:18 -0500
-Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
-	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m28LdHkg017884
-	for ; Sat, 8 Mar 2008 16:39:17 -0500
-Received: from lists-outbound.sourceforge.net (lists-outbound.sourceforge.net [66.35.250.225])
-	by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id m28LceZI022672
-	for ; Sat, 8 Mar 2008 16:38:40 -0500
-Received: from sc8-sf-list1-new.sourceforge.net (sc8-sf-list1-new-b.sourceforge.net [10.3.1.93])
-	by sc8-sf-spam2.sourceforge.net (Postfix) with ESMTP
-	id 9659912301; Sat,  8 Mar 2008 13:38:34 -0800 (PST)
-Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91]
-	helo=mail.sourceforge.net)
-	by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43)
-	id 1JY6kT-00038D-Vk for linux1394-devel at lists.sourceforge.net;
-	Sat, 08 Mar 2008 13:38:34 -0800
-Received: from einhorn.in-berlin.de ([192.109.42.8] ident=root)
-	by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256)
-	(Exim 4.44) id 1JY6kR-0003im-Eq
-	for linux1394-devel at lists.sourceforge.net;
-	Sat, 08 Mar 2008 13:38:33 -0800
-X-Envelope-From: stefanr at s5r6.in-berlin.de
-Received: from stein (k5.avc-online.de [83.221.230.29]) (authenticated bits=0)
-	by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id
-	m28LcMtv012469
-	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
-	Sat, 8 Mar 2008 22:38:28 +0100
-Date: Sat, 8 Mar 2008 22:38:16 +0100 (CET)
-From: Stefan Richter 
-Subject: [PATCH] firewire: warn on fatal condition in topology code
-To: linux1394-devel at lists.sourceforge.net
-Message-ID: 
-MIME-Version: 1.0
-Content-Disposition: INLINE
-X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
-X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32
-X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8
-X-Spam-Report: Spam Filtering performed by sourceforge.net.
-	See http://spamassassin.org/tag/ for more details.
-	Report problems to
-	http://sf.net/tracker/?func=add&group_id=1&atid=200001
-Cc: linux-kernel at vger.kernel.org
-X-BeenThere: linux1394-devel at lists.sourceforge.net
-X-Mailman-Version: 2.1.8
-Precedence: list
-List-Id: Linux IEEE 1394 development list
-	
-List-Unsubscribe: , 
-	
-List-Archive: 
-List-Post: 
-List-Help: 
-List-Subscribe: , 
-	
-Content-Type: text/plain;
-  charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Sender: linux1394-devel-bounces at lists.sourceforge.net
-Errors-To: linux1394-devel-bounces at lists.sourceforge.net
-X-RedHat-Spam-Score: -0.809 
-X-Length: 5020
-X-UID: 3936
+
+
 
 If this ever happens to anybody, we want to have it in his log.
 
@@ -243,84 +176,6 @@
 http://arcgraph.de/sr/
 
 
--------------------------------------------------------------------------
-This SF.net email is sponsored by: Microsoft
-Defy all challenges. Microsoft(R) Visual Studio 2008.
-http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
-_______________________________________________
-mailing list linux1394-devel at lists.sourceforge.net
-https://lists.sourceforge.net/lists/listinfo/linux1394-devel
-
-From stefanr at s5r6.in-berlin.de Sat Mar  8 18:27:20 2008
-Return-Path: 
-Received: from mail.boston.redhat.com ([unix socket])
-	 by mail.boston.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
-	 Sat, 08 Mar 2008 18:28:31 -0500
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by mail.boston.redhat.com (8.13.1/8.13.1) with ESMTP id m28NSVSq011980
-	for ; Sat, 8 Mar 2008 18:28:31 -0500
-Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
-	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m28NSUb1015266
-	for ; Sat, 8 Mar 2008 18:28:30 -0500
-Received: from lists-outbound.sourceforge.net (lists-outbound.sourceforge.net [66.35.250.225])
-	by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id m28NRqYa019208
-	for ; Sat, 8 Mar 2008 18:27:53 -0500
-Received: from sc8-sf-list1-new.sourceforge.net (sc8-sf-list1-new-b.sourceforge.net [10.3.1.93])
-	by sc8-sf-spam2.sourceforge.net (Postfix) with ESMTP
-	id 37FEFFA22; Sat,  8 Mar 2008 15:27:47 -0800 (PST)
-Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92]
-	helo=mail.sourceforge.net)
-	by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43)
-	id 1JY8S9-0008Pp-Fd for linux1394-devel at lists.sourceforge.net;
-	Sat, 08 Mar 2008 15:27:45 -0800
-Received: from einhorn.in-berlin.de ([192.109.42.8] ident=root)
-	by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256)
-	(Exim 4.44) id 1JY8S5-000097-QA
-	for linux1394-devel at lists.sourceforge.net;
-	Sat, 08 Mar 2008 15:27:45 -0800
-X-Envelope-From: stefanr at s5r6.in-berlin.de
-Received: from stein (k5.avc-online.de [83.221.230.29]) (authenticated bits=0)
-	by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id
-	m28NRPtg010333
-	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
-	Sun, 9 Mar 2008 00:27:33 +0100
-Date: Sun, 9 Mar 2008 00:27:20 +0100 (CET)
-From: Stefan Richter 
-Subject: [PATCH] firewire: update Kconfig help text
-To: linux1394-devel at lists.sourceforge.net
-Message-ID: 
-MIME-Version: 1.0
-Content-Disposition: INLINE
-X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
-X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32
-X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8
-X-Spam-Report: Spam Filtering performed by sourceforge.net.
-	See http://spamassassin.org/tag/ for more details.
-	Report problems to
-	http://sf.net/tracker/?func=add&group_id=1&atid=200001
-Cc: linux-kernel at vger.kernel.org
-X-BeenThere: linux1394-devel at lists.sourceforge.net
-X-Mailman-Version: 2.1.8
-Precedence: list
-List-Id: Linux IEEE 1394 development list
-	
-List-Unsubscribe: , 
-	
-List-Archive: 
-List-Post: 
-List-Help: 
-List-Subscribe: , 
-	
-Content-Type: text/plain;
-  charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Sender: linux1394-devel-bounces at lists.sourceforge.net
-Errors-To: linux1394-devel-bounces at lists.sourceforge.net
-X-RedHat-Spam-Score: -0.813 
-X-Length: 6999
-X-UID: 3940
-
 Remove some less necessary information, point out that video1394 and
 dv1394 should be blacklisted along with ohci1394.
 
@@ -412,14 +267,6 @@
 http://arcgraph.de/sr/
 
 
--------------------------------------------------------------------------
-This SF.net email is sponsored by: Microsoft
-Defy all challenges. Microsoft(R) Visual Studio 2008.
-http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
-_______________________________________________
-mailing list linux1394-devel at lists.sourceforge.net
-https://lists.sourceforge.net/lists/listinfo/linux1394-devel
-
 Adds a goofy routine to dump the configuration ROM as far as it could be
 read, if fw-core failed to get it all.
 
@@ -758,84 +605,6 @@
 http://arcgraph.de/sr/
 
 
--------------------------------------------------------------------------
-This SF.net email is sponsored by: Microsoft
-Defy all challenges. Microsoft(R) Visual Studio 2008.
-http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
-_______________________________________________
-mailing list linux1394-devel at lists.sourceforge.net
-https://lists.sourceforge.net/lists/listinfo/linux1394-devel
-
-From stefanr at s5r6.in-berlin.de Sun Mar  9 16:49:34 2008
-Return-Path: 
-Received: from mail.boston.redhat.com ([unix socket])
-	 by mail.boston.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
-	 Sun, 09 Mar 2008 16:50:37 -0400
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by mail.boston.redhat.com (8.13.1/8.13.1) with ESMTP id m29KobM5006784
-	for ; Sun, 9 Mar 2008 16:50:37 -0400
-Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
-	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m29KoaO1023147
-	for ; Sun, 9 Mar 2008 16:50:36 -0400
-Received: from lists-outbound.sourceforge.net (lists-outbound.sourceforge.net [66.35.250.225])
-	by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id m29Ko2Zt022736
-	for ; Sun, 9 Mar 2008 16:50:03 -0400
-Received: from sc8-sf-list1-new.sourceforge.net (sc8-sf-list1-new-b.sourceforge.net [10.3.1.93])
-	by sc8-sf-spam2.sourceforge.net (Postfix) with ESMTP
-	id AD813136FC; Sun,  9 Mar 2008 12:49:56 -0800 (PST)
-Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91]
-	helo=mail.sourceforge.net)
-	by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43)
-	id 1JYSSw-0004vO-IA for linux1394-devel at lists.sourceforge.net;
-	Sun, 09 Mar 2008 13:49:54 -0700
-Received: from einhorn.in-berlin.de ([192.109.42.8] ident=root)
-	by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256)
-	(Exim 4.44) id 1JYSSu-0003DS-D4
-	for linux1394-devel at lists.sourceforge.net;
-	Sun, 09 Mar 2008 13:49:54 -0700
-X-Envelope-From: stefanr at s5r6.in-berlin.de
-Received: from stein (k5.avc-online.de [83.221.230.29]) (authenticated bits=0)
-	by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id
-	m29Kndg7021845
-	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
-	Sun, 9 Mar 2008 21:49:45 +0100
-Date: Sun, 9 Mar 2008 21:49:34 +0100 (CET)
-From: Stefan Richter 
-Subject: [PATCH] firewire: debug AT, AR, and selfID-complete events
-To: linux1394-devel at lists.sourceforge.net
-Message-ID: 
-MIME-Version: 1.0
-Content-Disposition: INLINE
-X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
-X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32
-X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8
-X-Spam-Report: Spam Filtering performed by sourceforge.net.
-	See http://spamassassin.org/tag/ for more details.
-	Report problems to
-	http://sf.net/tracker/?func=add&group_id=1&atid=200001
-Cc: linux-kernel at vger.kernel.org
-X-BeenThere: linux1394-devel at lists.sourceforge.net
-X-Mailman-Version: 2.1.8
-Precedence: list
-List-Id: Linux IEEE 1394 development list
-	
-List-Unsubscribe: , 
-	
-List-Archive: 
-List-Post: 
-List-Help: 
-List-Subscribe: , 
-	
-Content-Type: text/plain;
-  charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Sender: linux1394-devel-bounces at lists.sourceforge.net
-Errors-To: linux1394-devel-bounces at lists.sourceforge.net
-X-RedHat-Spam-Score: -0.813 
-X-Length: 10709
-X-UID: 3944
-
 This adds debug printks for asynchronous transmission and reception and
 for self ID reception.  The debug code is per default deactivated by #if
 blocks.
@@ -1020,11 +789,3 @@
 http://arcgraph.de/sr/
 
 
--------------------------------------------------------------------------
-This SF.net email is sponsored by: Microsoft
-Defy all challenges. Microsoft(R) Visual Studio 2008.
-http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
-_______________________________________________
-mailing list linux1394-devel at lists.sourceforge.net
-https://lists.sourceforge.net/lists/listinfo/linux1394-devel
-



From fedora-extras-commits at redhat.com  Mon Mar 10 14:18:22 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 14:18:22 GMT
Subject: rpms/vim/devel vim.spec,1.196,1.197
Message-ID: <200803101418.m2AEIMTS005989@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/vim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5956

Modified Files:
	vim.spec 
Log Message:
add missing perl BR


Index: vim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim/devel/vim.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- vim.spec	10 Mar 2008 12:18:00 -0000	1.196
+++ vim.spec	10 Mar 2008 14:17:23 -0000	1.197
@@ -24,7 +24,7 @@
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -344,6 +344,7 @@
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel ncurses-devel gettext perl-devel
+BuildRequires: perl(ExtUtils::Embed)
 BuildRequires: libacl-devel gpm-devel autoconf
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
@@ -1129,6 +1130,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Mar 10 2008 Tom "spot" Callaway  7.1.269-2
+- BR: ExtUtils::Embed to find perl headers
+
 * Mon Mar 10 2008 Karsten Hopp  7.1.269-1
 - patchlevel 269
 - rebuild with new perl (#436731)



From fedora-extras-commits at redhat.com  Mon Mar 10 14:20:01 2008
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 10 Mar 2008 14:20:01 GMT
Subject: rpms/linuxwacom/devel linuxwacom.spec,1.55,1.56
Message-ID: <200803101420.m2AEK19S006061@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6038

Modified Files:
	linuxwacom.spec 
Log Message:
* Mon Mar 10 2008 Adam Jackson  0.7.9.8-5
- Drop the no-stack-protector patch, it's way obsolete.



Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- linuxwacom.spec	10 Mar 2008 13:43:32 -0000	1.55
+++ linuxwacom.spec	10 Mar 2008 14:19:22 -0000	1.56
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.7.9.8
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -13,7 +13,6 @@
 Source1:	60-wacom.rules
 Source2:	10-linuxwacom.fdi
 Patch1:		linuxwacom-0.7.6.3-delibcwrap.patch
-Patch2:		linuxwacom-disable_stack_protector.patch
 Patch3:		linuxwacom-0.7.8.3-sdk-me-harder.patch
 Patch4:		linuxwacom-0.7.9.7-fix_build.patch
 
@@ -43,7 +42,6 @@
 %setup -q -n %{tarname}
 
 #patch1 -p1 -b .delibcwrap
-%patch2 -p1
 %patch3 -p1 -b .sdk
 %patch4 -p1
 
@@ -107,6 +105,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Mon Mar 10 2008 Adam Jackson  0.7.9.8-5
+- Drop the no-stack-protector patch, it's way obsolete.
+
 * Mon Mar 10 2008 Adam Jackson  0.7.9.8-4
 - 10-linuxwacom.fdi: Fix driver name.
 



From fedora-extras-commits at redhat.com  Mon Mar 10 14:20:49 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 14:20:49 GMT
Subject: rpms/gail/devel .cvsignore, 1.36, 1.37 gail.spec, 1.71, 1.72 sources,
	1.36, 1.37
Message-ID: <200803101420.m2AEKnck006181@cvs-int.fedora.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gail.spec sources 
Log Message:
1.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gail/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	15 Jan 2008 00:18:57 -0000	1.36
+++ .cvsignore	10 Mar 2008 14:20:15 -0000	1.37
@@ -1 +1 @@
-gail-1.21.5.tar.bz2
+gail-1.22.0.tar.bz2


Index: gail.spec
===================================================================
RCS file: /cvs/extras/rpms/gail/devel/gail.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gail.spec	9 Feb 2008 04:21:46 -0000	1.71
+++ gail.spec	10 Mar 2008 14:20:15 -0000	1.72
@@ -4,10 +4,10 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
-Version: 1.21.5
-Release: 2%{?dist}
+Version: 1.22.0
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap
-Source0: http://download.gnome.org/sources/gail/1.20/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gail/1.22/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=495799
 Patch0: system-log-crash.patch
 License: LGPLv2+
@@ -86,6 +86,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 1.22.0-1
+- Update to 1.22.0
+
 * Fri Feb  8 2008 Matthias Clasen  - 1.21.5-2
 - Rebuild for gcc 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gail/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	15 Jan 2008 00:18:57 -0000	1.36
+++ sources	10 Mar 2008 14:20:15 -0000	1.37
@@ -1 +1 @@
-b89153b2f76094b5e7bc23f92b8f73f4  gail-1.21.5.tar.bz2
+ff500cc53d088bb7f13d35a4fcf81e80  gail-1.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 14:21:02 2008
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Mon, 10 Mar 2008 14:21:02 GMT
Subject: rpms/java-1.6.0-openjdk/devel README.plugin, NONE, 1.1 README.src, 
	NONE, 1.1 generate-fedora-zip.sh, NONE,
	1.1 java-1.6.0-openjdk-jhat.patch, NONE,
	1.1 java-1.6.0-openjdk-makefile.patch, NONE,
	1.1 java-1.6.0-openjdk-trademark.patch, NONE,
	1.1 java-1.6.0-openjdk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200803101421.m2AEL2DT006185@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6135

Modified Files:
	.cvsignore sources 
Added Files:
	README.plugin README.src generate-fedora-zip.sh 
	java-1.6.0-openjdk-jhat.patch 
	java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk-trademark.patch java-1.6.0-openjdk.spec 
Log Message:
* Fri Feb 15 2008 Lillian Angel  - 1:1.6.0.0-0.1.b06
- Adapted for java-1.6.0-openjdk.




--- NEW FILE README.plugin ---
The java-1.6.0-openjdk-plugin subpackage contains a version of
gcjwebplugin that has been modified to run on the IcedTea class
libraries.  The package manages an alternatives symlink,
/usr/lib/mozilla/plugins/libjavaplugin.so, so that gcjwebplugin is
recognized by the Firefox web browser.


--- NEW FILE README.src ---
The java-1.6.0-openjdk-src subpackage contains the complete IcedTea
class library source code for use by IDE indexers and debuggers.


--- NEW FILE generate-fedora-zip.sh ---
#!/bin/sh

# Untar openjdk source zip.
mkdir openjdk
tar xf $1 -C openjdk

# Patch trademark with proper trademark license.
patch -p0 < java-1.6.0-openjdk-trademark.patch

# Remove idl sources with questionable license headers.
rm -f \
  openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl \
  openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set \
  openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl \
  openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set

# Remove test sources with questionable license headers.
rm -f \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
   openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
   openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
   openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
   openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
   openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
   openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
   openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
   openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
   openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
   openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
   openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
   openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
   openjdk/jdk/test/java/util/Locale/LocaleTest.java \
   openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
   openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
   openjdk/jdk/test/sun/text/resources/LocaleDataTest.java

# Remove jhat sources.  Most have questionable license headers.
rm -rf \
  openjdk/jdk/src/share/classes/com/sun/tools/hat \
  openjdk/jdk/test/sun/tools/jhat

# Remove J2DBench sources, some of which have questionable license
# headers.
rm -rf \
  openjdk/jdk/src/share/demo/java2d/J2DBench

# Create new zip with new name.
NEW_ZIP=$(echo $1 | sed -e 's/\.tar.gz/-fedora.tar.gz/')
tar czf $NEW_ZIP openjdk/*

# Remove old unzipped openjdk dir.
rm -rf openjdk

java-1.6.0-openjdk-jhat.patch:

--- NEW FILE java-1.6.0-openjdk-jhat.patch ---
diff -ruN openjdkb21/openjdk/jdk/make/launchers/Makefile openjdk/jdk/make/launchers/Makefile
--- openjdkb21/openjdk/jdk/make/launchers/Makefile	2007-09-27 03:52:09.000000000 -0400
+++ openjdk/jdk/make/launchers/Makefile	2007-10-15 10:18:32.000000000 -0400
@@ -70,7 +70,6 @@
 $(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
   -J-Djconsole.showOutputViewer, )
 $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )
-$(call make-launcher, jhat, com.sun.tools.hat.Main, , )
 $(call make-launcher, jinfo, sun.tools.jinfo.JInfo, \
   -J-Dsun.jvm.hotspot.debugger.useProcDebugger \
   -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
diff -ruN openjdkb21/openjdk/jdk/make/sun/tools/Makefile openjdk/jdk/make/sun/tools/Makefile
--- openjdkb21/openjdk/jdk/make/sun/tools/Makefile	2007-09-27 03:52:13.000000000 -0400
+++ openjdk/jdk/make/sun/tools/Makefile	2007-10-15 10:16:52.000000000 -0400
@@ -42,7 +42,6 @@
   sun/tools/jstack \
   sun/tools/jstat \
   sun/tools/jstatd \
-  com/sun/tools/hat \
   com/sun/tools/script/shell \
   sun/jvmstat
 
@@ -50,13 +49,6 @@
 FILES_copy += \
   $(CLASSDESTDIR)/sun/tools/jstat/resources/jstat_options
 
-# Extra jhat files
-JHAT_RESOURCEDIR = $(CLASSDESTDIR)/com/sun/tools/hat/resources
-FILES_copy += \
-  $(JHAT_RESOURCEDIR)/hat.js \
-  $(JHAT_RESOURCEDIR)/oqlhelp.html \
-  $(JHAT_RESOURCEDIR)/platform_names.txt
-
 # Extra jrunscript files
 JRUNSCRIPT_RESOURCEDIR = $(CLASSDESTDIR)/com/sun/tools/script/shell
 FILES_copy += \
diff -ruN openjdkb21/openjdk/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh openjdk/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh
--- openjdkb21/openjdk/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh	2007-09-27 04:20:15.000000000 -0400
+++ openjdk/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh	2007-10-15 10:19:33.000000000 -0400
@@ -49,10 +49,6 @@
 ${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES \
     DumpHeap ${DUMPFILE} || exit 2
 
-# check that heap dump is parsable
-${TESTJAVA}/bin/jhat -parseonly true ${DUMPFILE}
-if [ $? != 0 ]; then failed=1; fi
-
 # dump file is large so remove it
 rm ${DUMPFILE}
 
--- oldopenjdk/jdk/make/common/Release.gmk	2008-02-05 11:31:07.000000000 -0500
+++ openjdk/jdk/make/common/Release.gmk	2008-02-05 11:32:09.000000000 -0500
@@ -371,7 +371,6 @@
 	com/sun/tools/example/debug/expr \
 	com/sun/tools/example/debug/tty  \
 	com/sun/tools/extcheck  \
-	com/sun/tools/hat       \
 	com/sun/tools/javac     \
 	com/sun/tools/javadoc   \
 	com/sun/tools/apt       \
@@ -468,8 +462,7 @@
        wsgen$(EXE_SUFFIX) \
        wsimport$(EXE_SUFFIX) \
         schemagen$(EXE_SUFFIX) \
-       jsadebugd$(EXE_SUFFIX) \
-       jhat$(EXE_SUFFIX)
+       jsadebugd$(EXE_SUFFIX)
 
 # The following get removed from the JRE after the bulk-copy of LIBDIR...
 NOTJRELIBS = tools.jar \

java-1.6.0-openjdk-makefile.patch:

--- NEW FILE java-1.6.0-openjdk-makefile.patch ---
--- Makefile.am	2008-02-15 14:45:38.000000000 -0500
+++ Makefile.am	2008-02-15 15:17:35.000000000 -0500
@@ -149,15 +149,6 @@
 endif
 
 stamps/download.stamp:
-	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
-	 | $(MD5SUM) --check ; \
-	then \
-	 if [ $(OPENJDK_SRC_ZIP) ] ; \
-	 then \
-	   mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
-	 fi ; \
-	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
-	fi
 	mkdir -p stamps
 	touch stamps/download.stamp
 
@@ -228,8 +219,7 @@
 stamps/extract.stamp: stamps/download.stamp
 	if ! test -d openjdk ; \
 	then \
-	  mkdir openjdk ; \
-	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
+	  $(TAR) xf $(OPENJDK_SRC_ZIP); \
 	  chmod -R ug+w openjdk ; \
 	fi
 	mkdir -p stamps
--- Makefile.in	2008-02-15 14:50:16.000000000 -0500
+++ Makefile.in	2008-02-15 15:17:39.000000000 -0500
@@ -715,15 +715,6 @@
 	mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
 
 stamps/download.stamp:
-	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
-	 | $(MD5SUM) --check ; \
-	then \
-	 if [ $(OPENJDK_SRC_ZIP) ] ; \
-	 then \
-	   mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
-	 fi ; \
-	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
-	fi
 	mkdir -p stamps
 	touch stamps/download.stamp
 
@@ -740,8 +731,7 @@
 stamps/extract.stamp: stamps/download.stamp
 	if ! test -d openjdk ; \
 	then \
-	  mkdir openjdk ; \
-	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
+	  $(TAR) xf $(OPENJDK_SRC_ZIP); \
 	  chmod -R ug+w openjdk ; \
 	fi
 	mkdir -p stamps

java-1.6.0-openjdk-trademark.patch:

--- NEW FILE java-1.6.0-openjdk-trademark.patch ---
--- TRADEMARK	2008-02-28 22:24:12.000000000 -0500
+++ openjdk/TRADEMARK	2008-03-10 10:06:40.000000000 -0400
@@ -2,32 +2,34 @@
 
 OpenJDK (the "Name") is a trademark of Sun Microsystems, Inc. (the "Owner").
 Owner permits any person obtaining a copy of this software (the "Software")
-which is based on original software available at one of the following websites:
-http://download.java.net/openjdk, http://hg.openjdk.java.net/jdk6, or
-http://openjdk.java.net (each a "Website", with the original software made
+which is based on original software  retrieved from one of the following websites:
+_http://download.java.net/openjdk_, _http://hg.openjdk.java.net/jdk6_, or
+_http://openjdk.java.net _ (each a "Website", with the original software made
 available by the Owner on a Website being known as the "Website Software") to
 use the Name in package names and version strings of the Software subject to
 the following conditions:
 
-  - The Software is a substantially complete implementation of the OpenJDK
-    development kit or runtime environment code made available by Owner on a
-    Website, and the vast majority of the Software code is identical to the
-    upstream Website Software;
-
-  - No permission is granted to use the Name as the name of any freestanding
-    distribution of software, or other product or service;
-
-  - The Owner makes no warranties of any kind respecting the Name and all
-    representations and warranties, including any implied warranty of
-    merchantability, fitness for a particular purpose or non-infringement
-    are hereby disclaimed; and
+ - The Software is a substantially complete implementation of the OpenJDK
+   development kit or runtime environment code made available by Owner on a
+   Website, and the vast majority of the Software code is identical to the
+   upstream Website Software;
 
-  - This notice and the following legend are included in all copies of the
-    Software or portions of it:
+ - No permission is hereby granted to use the Name in any other manner,
+   unless such use constitutes "fair use."
 
-        OpenJDK is a trademark or registered trademark of Sun Microsystems,
-        Inc. in the United States and other countries.
+
+ - The Owner makes no warranties of any kind respecting the Name and all
+   representations and warranties, including any implied warranty of
+   merchantability, fitness for a particular purpose or non-infringement
+   are hereby disclaimed; and
+
+ - This notice and the following legend are included in all copies of the
+   Software or portions of it:
+
+       OpenJDK is a trademark or registered trademark of Sun Microsystems,
+       Inc. in the United States and other countries.
 
 The Name may also be used in connection with descriptions of the Software that
 constitute "fair use," such as "derived from the OpenJDK code base" or "based
 on the OpenJDK source code."
+


--- NEW FILE java-1.6.0-openjdk.spec ---
# If gcjbootstrap is 1 IcedTea is bootstrapped against
# java-1.5.0-gcj-devel.  If gcjbootstrap is 0 IcedTea is built against
# java-1.7.0-icedtea-devel.
%define gcjbootstrap 0

%define icedteaver 1.0
%define icedteasnapshot -3547877ecc7bb77b74983190d1ba3f06dce7e16b
%define openjdkver b06
%define openjdkdate 28_feb_2008

%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/

%define accessmajorver 1.19
%define accessminorver 2
%define accessver %{accessmajorver}.%{accessminorver}
%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/

%define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
%define openjdkurl %{openjdkurlbase}%{openjdkver}/
%define fedorazip  openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz

%define mauvedate 2007-09-12

%ifarch x86_64
%define archbuild amd64
%define archinstall amd64
%else
%ifarch ppc
%define archbuild ppc
%define archinstall ppc
%else
%ifarch ppc64
%define archbuild ppc64
%define archinstall ppc64
%else
%define archbuild i586
%define archinstall i386
%endif
%endif
%endif

%define buildoutputdir openjdk/control/build/linux-%{archbuild}

%if %{gcjbootstrap}
%define icedteaopt %{nil}
%else
%define icedteaopt --with-icedtea
%endif

# Convert an absolute path to a relative path.  Each symbolic link is
# specified relative to the directory in which it is installed so that
# it will resolve properly within chrooted installations.
%define script 'use File::Spec; print File::Spec->abs2rel($ARGV[0], $ARGV[1])'
%define abs2rel %{__perl} -e %{script}

# Hard-code libdir on 64-bit architectures to make the 64-bit JDK
# simply be another alternative.
%ifarch x86_64 ppc64
%define syslibdir       %{_prefix}/lib64
%define _libdir         %{_prefix}/lib
%define archname        %{name}.%{_arch}
%define localpolicy     jce_%{javaver}_%{origin}_local_policy.%{_arch}
%define uspolicy        jce_%{javaver}_%{origin}_us_export_policy.%{_arch}
%define javaplugin      libjavaplugin.so.%{_arch}
%else
%define syslibdir       %{_libdir}
%define archname        %{name}
%define localpolicy     jce_%{javaver}_%{origin}_local_policy
%define uspolicy        jce_%{javaver}_%{origin}_us_export_policy
%define javaplugin      libjavaplugin.so
%endif

# Standard JPackage naming and versioning defines.
%define origin          openjdk
%define priority        16000
%define javaver         1.6.0
%define buildver        0

# Standard JPackage directories and symbolic links.
# Make 64-bit JDKs just another alternative on 64-bit architectures.
%ifarch x86_64 ppc64
%define sdklnk          java-%{javaver}-%{origin}.%{_arch}
%define jrelnk          jre-%{javaver}-%{origin}.%{_arch}
%define sdkdir          %{name}-%{version}.%{_arch}
%else
%define sdklnk          java-%{javaver}-%{origin}
%define jrelnk          jre-%{javaver}-%{origin}
%define sdkdir          %{name}-%{version}
%endif
%define jredir          %{sdkdir}/jre
%define sdkbindir       %{_jvmdir}/%{sdklnk}/bin
%define jrebindir       %{_jvmdir}/%{jrelnk}/bin
%ifarch x86_64 ppc64
%define jvmjardir       %{_jvmjardir}/%{name}-%{version}.%{_arch}
%else
%define jvmjardir       %{_jvmjardir}/%{name}-%{version}
%endif

# Prevent brp-java-repack-jars from being run.
%define __jar_repack 0

Name:    java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
Release: 0.1.%{openjdkver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4.  java-1.5.0-ibm packages
# also included the epoch in their virtual provides.  This created a
# situation where in-the-wild java-1.5.0-ibm packages provided "java =
# 1:1.5.0".  In RPM terms, "1.6.0 < 1:1.5.0" since 1.6.0 is
# interpreted as 0:1.6.0.  So the "java >= 1.6.0" requirement would be
# satisfied by the 1:1.5.0 packages.  Thus we need to set the epoch in
# JDK package >= 1.6.0 to 1, and packages referring to JDK virtual
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
Epoch:   1
Summary: OpenJDK Runtime Environment
Group:   Development/Languages

License:  GPLv2 with exceptions
URL:      http://icedtea.classpath.org/
Source0:  %{url}download/source/icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz
Source1:  %{fedorazip}
# Save icedtea.classpath.org space and bandwidth.
# NoSource: 1
Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
Source3:  %{genurl}generate-fedora-zip.sh
Source4:  README.src
Source5:  README.plugin
Source6:  mauve-%{mauvedate}.tar.gz
Source7:  mauve_tests
Patch0:   java-1.6.0-openjdk-makefile.patch
# FIXME: The licenses in the jhat sources need to be fixed with proper 
# GPL Licenses.
Patch1:   java-1.6.0-openjdk-jhat.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: alsa-lib-devel
BuildRequires: cups-devel
BuildRequires: giflib-devel
BuildRequires: lesstif-devel
BuildRequires: libX11-devel
BuildRequires: libXi-devel
BuildRequires: libXp-devel
BuildRequires: libXt-devel
BuildRequires: libXtst-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: wget
BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRequires: xorg-x11-proto-devel
BuildRequires: mercurial
BuildRequires: ant
BuildRequires: libXinerama-devel
%if %{gcjbootstrap}
BuildRequires: java-1.5.0-gcj-devel
%else
BuildRequires: java-1.7.0-icedtea-devel
%endif
# Mauve build requirements.
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: xorg-x11-fonts-Type1
BuildRequires: xorg-x11-fonts-misc
BuildRequires: freetype-devel
BuildRequires: fontconfig
# Java Access Bridge for GNOME build requirements.
BuildRequires: at-spi-devel
BuildRequires: gawk
BuildRequires: libbonobo-devel
BuildRequires: pkgconfig >= 0.9.0
BuildRequires: xorg-x11-utils
# gcjwebplugin build requirements.
BuildRequires: gecko-devel
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
# zero-assembler build requirement
%ifarch ppc ppc64
BuildRequires: libffi-devel
%endif

Requires: libjpeg = 6b
# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
# cacerts.
Requires: openssl
# Require jpackage-utils for ant
Requires: jpackage-utils >= 1.7.3-1jpp.3
# Require zoneinfo data provided by tzdata-java subpackage.
Requires: tzdata-java
# Post requires alternatives to install tool alternatives.
Requires(post):   %{_sbindir}/alternatives
# Postun requires alternatives to uninstall tool alternatives.
Requires(postun): %{_sbindir}/alternatives

# Standard JPackage base provides.
Provides: jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
Provides: jre-%{origin} = %{epoch}:%{version}-%{release}
Provides: jre-%{javaver} = %{epoch}:%{version}-%{release}
Provides: java-%{javaver} = %{epoch}:%{version}-%{release}
Provides: jre = %{javaver}
Provides: java-%{origin} = %{epoch}:%{version}-%{release}
Provides: java = %{epoch}:%{javaver}
# Standard JPackage extensions provides.
Provides: jndi = %{epoch}:%{version}
Provides: jndi-ldap = %{epoch}:%{version}
Provides: jndi-cos = %{epoch}:%{version}
Provides: jndi-rmi = %{epoch}:%{version}
Provides: jndi-dns = %{epoch}:%{version}
Provides: jaas = %{epoch}:%{version}
Provides: jsse = %{epoch}:%{version}
Provides: jce = %{epoch}:%{version}
Provides: jdbc-stdext = 3.0
Provides: java-sasl = %{epoch}:%{version}

%description
The OpenJDK runtime environment.

%package devel
Summary: OpenJDK Development Environment
Group:   Development/Tools

# Require base package.
Requires:         %{name} = %{epoch}:%{version}-%{release}
# Post requires alternatives to install tool alternatives.
Requires(post):   %{_sbindir}/alternatives
# Postun requires alternatives to uninstall tool alternatives.
Requires(postun): %{_sbindir}/alternatives

#i Standard JPackage devel provides.
Provides: java-sdk-%{javaver}-%{origin} = %{epoch}:%{version}
Provides: java-sdk-%{javaver} = %{epoch}:%{version}
Provides: java-sdk-%{origin} = %{epoch}:%{version}
Provides: java-sdk = %{epoch}:%{javaver}
Provides: java-%{javaver}-devel = %{epoch}:%{version}
Provides: java-devel-%{origin} = %{epoch}:%{version}
Provides: java-devel = %{epoch}:%{javaver}

%description devel
The OpenJDK development tools.

%package demo
Summary: OpenJDK Demos
Group:   Development/Languages

Requires: %{name} = %{epoch}:%{version}-%{release}

%description demo
The OpenJDK demos.

%package src
Summary: OpenJDK Source Bundle
Group:   Development/Languages

Requires: %{name} = %{epoch}:%{version}-%{release}

%description src
The OpenJDK source bundle.

%package javadoc
Summary: OpenJDK API Documentation
Group:   Documentation

# Post requires alternatives to install javadoc alternative.
Requires(post):   %{_sbindir}/alternatives
# Postun requires alternatives to uninstall javadoc alternative.
Requires(postun): %{_sbindir}/alternatives

# Standard JPackage javadoc provides.
Provides: java-javadoc = %{epoch}:%{version}-%{release}
Provides: java-%{javaver}-javadoc = %{epoch}:%{version}-%{release}

%description javadoc
The OpenJDK API documentation.

%package plugin
Summary: OpenJDK Web Browser Plugin
Group:   Applications/Internet

Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{syslibdir}/mozilla/plugins
# Post requires alternatives to install plugin alternative.
Requires(post):   %{_sbindir}/alternatives
# Postun requires alternatives to uninstall plugin alternative.
Requires(postun): %{_sbindir}/alternatives

# Standard JPackage plugin provides.
Provides: java-plugin = %{javaver}
Provides: java-%{javaver}-plugin = %{epoch}:%{version}

%description plugin
The OpenJDK web browser plugin.

%prep
%setup -q -n icedtea6-%{icedteaver}
%setup -q -n icedtea6-%{icedteaver} -T -D -a 6
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
%patch0
cp %{SOURCE4} .
cp %{SOURCE5} .
cp %{SOURCE7} .

%build
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
pushd openjdk-ecj
  patch -l -p1 < %{PATCH1}
popd
%endif
make stamps/patch.stamp
patch -l -p0 < %{PATCH1}
make
pushd java-access-bridge-%{accessver}
  export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
  export PATH=$JAVA_HOME/bin:$PATH
  ./configure
  make
  cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib
  cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
popd
# Running Mauve to check for regressions
pushd mauve-%{mauvedate}
  ./configure 
  make
  echo ====================MAUVE TESTING========================
  export DISPLAY=:20
  Xvfb :20 -screen 0 1x1x24 -ac& 
  echo $! > Xvfb.pid
  ( $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java \
  -file %{SOURCE7} \
  -timeout 30000 2>&1 | tee mauve_output ) || :
  kill -9 `cat Xvfb.pid`
  unset DISPLAY
  rm -f Xvfb.pid
  echo ====================MAUVE TESTING END====================
popd

%install
rm -rf $RPM_BUILD_ROOT

pushd %{buildoutputdir}/j2sdk-image

  # Install main files.
  install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
  cp -a bin include lib src.zip $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
  install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
  cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}

  # Install extension symlinks.
  install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir}
  pushd $RPM_BUILD_ROOT%{jvmjardir}
    RELATIVE=$(%{abs2rel} %{_jvmdir}/%{jredir}/lib %{jvmjardir})
    ln -sf $RELATIVE/jsse.jar jsse-%{version}.jar
    ln -sf $RELATIVE/jce.jar jce-%{version}.jar
    ln -sf $RELATIVE/rt.jar jndi-%{version}.jar
    ln -sf $RELATIVE/rt.jar jndi-ldap-%{version}.jar
    ln -sf $RELATIVE/rt.jar jndi-cos-%{version}.jar
    ln -sf $RELATIVE/rt.jar jndi-rmi-%{version}.jar
    ln -sf $RELATIVE/rt.jar jaas-%{version}.jar
    ln -sf $RELATIVE/rt.jar jdbc-stdext-%{version}.jar
    ln -sf jdbc-stdext-%{version}.jar jdbc-stdext-3.0.jar
    ln -sf $RELATIVE/rt.jar sasl-%{version}.jar
    for jar in *-%{version}.jar
    do
      if [ x%{version} != x%{javaver} ]
      then
        ln -sf $jar $(echo $jar | sed "s|-%{version}.jar|-%{javaver}.jar|g")
      fi
      ln -sf $jar $(echo $jar | sed "s|-%{version}.jar|.jar|g")
    done
  popd

  # Install JCE policy symlinks.
  install -d -m 755 $RPM_BUILD_ROOT%{_jvmprivdir}/%{archname}/jce/vanilla
  for file in local_policy.jar US_export_policy.jar
  do
    mv -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/$file \
      $RPM_BUILD_ROOT%{_jvmprivdir}/%{archname}/jce/vanilla
    # Touch files for ghosts.
    touch $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/$file
  done

  # Install versionless symlinks.
  pushd $RPM_BUILD_ROOT%{_jvmdir}
    ln -sf %{jredir} %{jrelnk}
    ln -sf %{sdkdir} %{sdklnk}
  popd

  pushd $RPM_BUILD_ROOT%{_jvmjardir}
    ln -sf %{sdkdir} %{jrelnk}
    ln -sf %{sdkdir} %{sdklnk}
  popd

  # Remove javaws man page.
  rm -f man/man1/javaws.1

  # Install man pages.
  install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
  for manpage in man/man1/*
  do
    # Convert man pages to UTF8 encoding.
    iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp
    mv -f $manpage.tmp $manpage
    install -m 644 -p $manpage $RPM_BUILD_ROOT%{_mandir}/man1/$(basename \
      $manpage .1)-%{name}.1
  done

  # Install demos and samples.
  cp -a demo $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
  mkdir -p sample/rmi
  mv bin/java-rmi.cgi sample/rmi
  cp -a sample $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}

popd

# Install Javadoc documentation.
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
#FIXME: This needs to be fixed upstream.
iconv -f ISO_8859-1 -t UTF8 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/THIRD_PARTY_README \
  -o $RPM_BUILD_ROOT%{_javadocdir}/%{name}/THIRD_PARTY_README


# Find JRE directories.
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
  | grep -v jre/lib/security \
  | sed 's|'$RPM_BUILD_ROOT'|%dir |' \
  > %{name}.files
# Find JRE files.
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
  | grep -v jre/lib/security \
  | grep -v gcjwebplugin.so \
  | sed 's|'$RPM_BUILD_ROOT'||' \
  >> %{name}.files
# Find demo directories.
find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \
  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample -type d \
  | sed 's|'$RPM_BUILD_ROOT'|%dir |' \
  > %{name}-demo.files
# Find non-documentation demo files.
find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \
  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample \
  -type f -o -type l | sort \
  | grep -v README \
  | sed 's|'$RPM_BUILD_ROOT'||' \
  >> %{name}-demo.files
# Find documentation demo files.
find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \
  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample \
  -type f -o -type l | sort \
  | grep README \
  | sed 's|'$RPM_BUILD_ROOT'||' \
  | sed 's|^|%doc |' \
  >> %{name}-demo.files

%clean
rm -rf $RPM_BUILD_ROOT

# FIXME: identical binaries are copied, not linked. This needs to be 
# fixed upstream.
%post
ext=.gz
alternatives \
  --install %{_bindir}/java java %{jrebindir}/java %{priority} \
  --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
  --slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
  --slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
  --slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
  --slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
  --slave %{_bindir}/policytool policytool %{jrebindir}/policytool \
  --slave %{_bindir}/rmid rmid %{jrebindir}/rmid \
  --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir}/rmiregistry \
  --slave %{_bindir}/servertool servertool %{jrebindir}/servertool \
  --slave %{_bindir}/tnameserv tnameserv %{jrebindir}/tnameserv \
  --slave %{_bindir}/unpack200 unpack200 %{jrebindir}/unpack200 \
  --slave %{_mandir}/man1/java.1$ext java.1$ext \
  %{_mandir}/man1/java-%{name}.1$ext \
  --slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \
  %{_mandir}/man1/keytool-%{name}.1$ext \
  --slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \
  %{_mandir}/man1/orbd-%{name}.1$ext \
  --slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \
  %{_mandir}/man1/pack200-%{name}.1$ext \
  --slave %{_mandir}/man1/policytool.1$ext policytool.1$ext \
  %{_mandir}/man1/policytool-%{name}.1$ext \
  --slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \
  %{_mandir}/man1/rmid-%{name}.1$ext \
  --slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \
  %{_mandir}/man1/rmiregistry-%{name}.1$ext \
  --slave %{_mandir}/man1/servertool.1$ext servertool.1$ext \
  %{_mandir}/man1/servertool-%{name}.1$ext \
  --slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \
  %{_mandir}/man1/tnameserv-%{name}.1$ext \
  --slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \
  %{_mandir}/man1/unpack200-%{name}.1$ext

alternatives \
  --install %{_jvmdir}/jre-%{origin} \
  jre_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \
  --slave %{_jvmjardir}/jre-%{origin} \
  jre_%{origin}_exports %{_jvmjardir}/%{jrelnk}

alternatives \
  --install %{_jvmdir}/jre-%{javaver} \
  jre_%{javaver} %{_jvmdir}/%{jrelnk} %{priority} \
  --slave %{_jvmjardir}/jre-%{javaver} \
  jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}

alternatives \
  --install \
  %{_jvmdir}/%{jrelnk}/lib/security/local_policy.jar \
  %{localpolicy} \
  %{_jvmprivdir}/%{archname}/jce/vanilla/local_policy.jar \
  %{priority} \
  --slave \
  %{_jvmdir}/%{jrelnk}/lib/security/US_export_policy.jar \
  %{uspolicy} \
  %{_jvmprivdir}/%{archname}/jce/vanilla/US_export_policy.jar

%postun
if [ $1 -eq 0 ]
then
  alternatives --remove java %{jrebindir}/java
  alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
  alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
  alternatives --remove \
    %{localpolicy} \
    %{_jvmprivdir}/%{archname}/jce/vanilla/local_policy.jar
fi

%post devel
ext=.gz
alternatives \
  --install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \
  --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdklnk} \
  --slave %{_jvmjardir}/java java_sdk_exports %{_jvmjardir}/%{sdklnk} \
  --slave %{_bindir}/appletviewer appletviewer %{sdkbindir}/appletviewer \
  --slave %{_bindir}/apt apt %{sdkbindir}/apt \
  --slave %{_bindir}/extcheck extcheck %{sdkbindir}/extcheck \
  --slave %{_bindir}/jar jar %{sdkbindir}/jar \
  --slave %{_bindir}/jarsigner jarsigner %{sdkbindir}/jarsigner \
  --slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \
  --slave %{_bindir}/javah javah %{sdkbindir}/javah \
  --slave %{_bindir}/javap javap %{sdkbindir}/javap \
  --slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \
  --slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \
  --slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \
  --slave %{_bindir}/jinfo jinfo %{sdkbindir}/jinfo \
  --slave %{_bindir}/jmap jmap %{sdkbindir}/jmap \
  --slave %{_bindir}/jps jps %{sdkbindir}/jps \
  --slave %{_bindir}/jrunscript jrunscript %{sdkbindir}/jrunscript \
  --slave %{_bindir}/jsadebugd jsadebugd %{sdkbindir}/jsadebugd \
  --slave %{_bindir}/jstack jstack %{sdkbindir}/jstack \
  --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \
  --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \
  --slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \
  --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \
  --slave %{_bindir}/schemagen schemagen %{sdkbindir}/schemagen \
  --slave %{_bindir}/serialver serialver %{sdkbindir}/serialver \
  --slave %{_bindir}/wsgen wsgen %{sdkbindir}/wsgen \
  --slave %{_bindir}/wsimport wsimport %{sdkbindir}/wsimport \
  --slave %{_bindir}/xjc xjc %{sdkbindir}/xjc \
  --slave %{_mandir}/man1/appletviewer.1$ext appletviewer.1$ext \
  %{_mandir}/man1/appletviewer-%{name}.1$ext \
  --slave %{_mandir}/man1/apt.1$ext apt.1$ext \
  %{_mandir}/man1/apt-%{name}.1$ext \
  --slave %{_mandir}/man1/extcheck.1$ext extcheck.1$ext \
  %{_mandir}/man1/extcheck-%{name}.1$ext \
  --slave %{_mandir}/man1/jar.1$ext jar.1$ext \
  %{_mandir}/man1/jar-%{name}.1$ext \
  --slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \
  %{_mandir}/man1/jarsigner-%{name}.1$ext \
  --slave %{_mandir}/man1/javac.1$ext javac.1$ext \
  %{_mandir}/man1/javac-%{name}.1$ext \
  --slave %{_mandir}/man1/javadoc.1$ext javadoc.1$ext \
  %{_mandir}/man1/javadoc-%{name}.1$ext \
  --slave %{_mandir}/man1/javah.1$ext javah.1$ext \
  %{_mandir}/man1/javah-%{name}.1$ext \
  --slave %{_mandir}/man1/javap.1$ext javap.1$ext \
  %{_mandir}/man1/javap-%{name}.1$ext \
  --slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \
  %{_mandir}/man1/jconsole-%{name}.1$ext \
  --slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \
  %{_mandir}/man1/jdb-%{name}.1$ext \
  --slave %{_mandir}/man1/jhat.1$ext jhat.1$ext \
  %{_mandir}/man1/jhat-%{name}.1$ext \
  --slave %{_mandir}/man1/jinfo.1$ext jinfo.1$ext \
  %{_mandir}/man1/jinfo-%{name}.1$ext \
  --slave %{_mandir}/man1/jmap.1$ext jmap.1$ext \
  %{_mandir}/man1/jmap-%{name}.1$ext \
  --slave %{_mandir}/man1/jps.1$ext jps.1$ext \
  %{_mandir}/man1/jps-%{name}.1$ext \
  --slave %{_mandir}/man1/jrunscript.1$ext jrunscript.1$ext \
  %{_mandir}/man1/jrunscript-%{name}.1$ext \
  --slave %{_mandir}/man1/jsadebugd.1$ext jsadebugd.1$ext \
  %{_mandir}/man1/jsadebugd-%{name}.1$ext \
  --slave %{_mandir}/man1/jstack.1$ext jstack.1$ext \
  %{_mandir}/man1/jstack-%{name}.1$ext \
  --slave %{_mandir}/man1/jstat.1$ext jstat.1$ext \
  %{_mandir}/man1/jstat-%{name}.1$ext \
  --slave %{_mandir}/man1/jstatd.1$ext jstatd.1$ext \
  %{_mandir}/man1/jstatd-%{name}.1$ext \
  --slave %{_mandir}/man1/native2ascii.1$ext native2ascii.1$ext \
  %{_mandir}/man1/native2ascii-%{name}.1$ext \
  --slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \
  %{_mandir}/man1/rmic-%{name}.1$ext \
  --slave %{_mandir}/man1/schemagen.1$ext schemagen.1$ext \
  %{_mandir}/man1/schemagen-%{name}.1$ext \
  --slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \
  %{_mandir}/man1/serialver-%{name}.1$ext \
  --slave %{_mandir}/man1/wsgen.1$ext wsgen.1$ext \
  %{_mandir}/man1/wsgen-%{name}.1$ext \
  --slave %{_mandir}/man1/wsimport.1$ext wsimport.1$ext \
  %{_mandir}/man1/wsimport-%{name}.1$ext \
  --slave %{_mandir}/man1/xjc.1$ext xjc.1$ext \
  %{_mandir}/man1/xjc-%{name}.1$ext

alternatives \
  --install %{_jvmdir}/java-%{origin} \
  java_sdk_%{origin} %{_jvmdir}/%{sdklnk} %{priority} \
  --slave %{_jvmjardir}/java-%{origin} \
  java_sdk_%{origin}_exports %{_jvmjardir}/%{sdklnk}

alternatives \
  --install %{_jvmdir}/java-%{javaver} \
  java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} %{priority} \
  --slave %{_jvmjardir}/java-%{javaver} \
  java_sdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}

%postun devel
if [ $1 -eq 0 ]
then
  alternatives --remove javac %{sdkbindir}/javac
  alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdklnk}
  alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
fi

%post javadoc
alternatives \
  --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{name}/api \
  %{priority}

%postun javadoc
if [ $1 -eq 0 ]
then
  alternatives --remove javadocdir %{_javadocdir}/%{name}/api
fi

%post plugin
alternatives \
  --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so %{priority}

%postun plugin
if [ $1 -eq 0 ]
then
  alternatives --remove %{javaplugin} \
    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
fi

%files -f %{name}.files
%defattr(-,root,root,-)
%doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%doc %{buildoutputdir}/j2sdk-image/jre/README.html
%doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README
%doc AUTHORS
%doc COPYING
%doc ChangeLog
%doc NEWS
%doc README
%dir %{_jvmdir}/%{sdkdir}
%{_jvmdir}/%{jrelnk}
%{_jvmjardir}/%{jrelnk}
%{_jvmprivdir}/*
%{jvmjardir}
%dir %{_jvmdir}/%{jredir}/lib/security
#FIXME: These should be replaced by symlinks into /etc.
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
%ghost %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
%{_mandir}/man1/java-%{name}.1*
%{_mandir}/man1/keytool-%{name}.1*
%{_mandir}/man1/orbd-%{name}.1*
%{_mandir}/man1/pack200-%{name}.1*
%{_mandir}/man1/policytool-%{name}.1*
%{_mandir}/man1/rmid-%{name}.1*
%{_mandir}/man1/rmiregistry-%{name}.1*
%{_mandir}/man1/servertool-%{name}.1*
%{_mandir}/man1/tnameserv-%{name}.1*
%{_mandir}/man1/unpack200-%{name}.1*

%files devel
%defattr(-,root,root,-)
%doc %{buildoutputdir}/j2sdk-image/ASSEMBLY_EXCEPTION
%doc %{buildoutputdir}/j2sdk-image/LICENSE
%doc %{buildoutputdir}/j2sdk-image/README.html
%doc %{buildoutputdir}/j2sdk-image/THIRD_PARTY_README
%dir %{_jvmdir}/%{sdkdir}/bin
%dir %{_jvmdir}/%{sdkdir}/include
%dir %{_jvmdir}/%{sdkdir}/lib
%{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
%{_jvmdir}/%{sdkdir}/lib/*
%{_jvmdir}/%{sdklnk}
%{_jvmjardir}/%{sdklnk}
%{_mandir}/man1/appletviewer-%{name}.1*
%{_mandir}/man1/apt-%{name}.1*
%{_mandir}/man1/extcheck-%{name}.1*
%{_mandir}/man1/idlj-%{name}.1*
%{_mandir}/man1/jar-%{name}.1*
%{_mandir}/man1/jarsigner-%{name}.1*
%{_mandir}/man1/javac-%{name}.1*
%{_mandir}/man1/javadoc-%{name}.1*
%{_mandir}/man1/javah-%{name}.1*
%{_mandir}/man1/javap-%{name}.1*
%{_mandir}/man1/jconsole-%{name}.1*
%{_mandir}/man1/jdb-%{name}.1*
%{_mandir}/man1/jhat-%{name}.1*
%{_mandir}/man1/jinfo-%{name}.1*
%{_mandir}/man1/jmap-%{name}.1*
%{_mandir}/man1/jps-%{name}.1*
%{_mandir}/man1/jrunscript-%{name}.1*
%{_mandir}/man1/jsadebugd-%{name}.1*
%{_mandir}/man1/jstack-%{name}.1*
%{_mandir}/man1/jstat-%{name}.1*
%{_mandir}/man1/jstatd-%{name}.1*
%{_mandir}/man1/native2ascii-%{name}.1*
%{_mandir}/man1/rmic-%{name}.1*
%{_mandir}/man1/schemagen-%{name}.1*
%{_mandir}/man1/serialver-%{name}.1*
%{_mandir}/man1/wsgen-%{name}.1*
%{_mandir}/man1/wsimport-%{name}.1*
%{_mandir}/man1/xjc-%{name}.1*

%files demo -f %{name}-demo.files
%defattr(-,root,root,-)

%files src
%defattr(-,root,root,-)
%doc README.src
%{_jvmdir}/%{sdkdir}/src.zip
%doc mauve_tests
%doc mauve-%{mauvedate}/mauve_output

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}

%files plugin
%defattr(-,root,root,-)
%doc README.plugin
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so

%changelog
* Fri Feb 15 2008 Lillian Angel  - 1:1.6.0.0-0.1.b06
- Adapted for java-1.6.0-openjdk.

* Wed Feb 13 2008 Lillian Angel  - 1.7.0.0-0.25.b24
- Added libffi requirement for ppc/64.

* Wed Feb 13 2008 Lillian Angel  - 1.7.0.0-0.25.b24
- Updated icedteaver to 1.6.
- Updated release.

* Mon Feb 11 2008 Lillian Angel  - 1.7.0.0-0.24.b24
- Added libjpeg-6b as a requirement.
- Resolves rhbz#432181

* Mon Jan 28 2008 Lillian Angel  - 1.7.0.0-0.24.b24
- Kill Xvfb after it completes mauve tests.

* Mon Jan 21 2008 Thomas Fitzsimmons  - 1.7.0.0-0.24.b24
- Remove cgibindir macro.
- Remove icedtearelease.
- Remove binfmt_misc support.
- Remove .snapshot from changelog lines wider than 80 columns.

* Tue Jan 08 2008 Lillian Angel  - 1.7.0.0-0.23.b24.snapshot
- Added xorg-x11-fonts-misc as a build requirement for Mauve.
- Updated mauve_tests.

* Mon Jan 07 2008 Lillian Angel  - 1.7.0.0-0.23.b24.snapshot
- Updated Mauve's build requirements.
- Excluding Mauve tests that try to access the network.
- Added Xvfb functionality to mauve tests to avoid display-related failures.
- Resolves rhbz#427614

* Thu Jan 03 2008 Lillian Angel  - 1.7.0.0-0.23.b24.snapshot
- Added mercurial as a Build Requirement.
- Fixed archbuild/archinstall if-block.

* Thu Jan 03 2008 Lillian Angel  - 1.7.0.0-0.23.b24.snapshot
- Removed BuildRequirement firefox-devel
- Added BuildRequirement gecko-devel
- Resolves rhbz#427350

* Fri Dec 28 2007 Lillian Angel  - 1.7.0.0-0.23.b24.snapshot
- Updated icedtea source.
- Resolves rhbz#426142

* Thu Dec 13 2007 Lillian Angel  - 1.7.0.0-0.23.b24.snapshot
- Updated icedteaver.
- Updated Release.
- Updated buildoutputdir.
- Removed openjdkdate.
- Updated openjdkver.
- Updated openjdkzip and fedorazip.
- Added Requires: jpackage-utils.
- Removed java-1.7.0-makefile.patch.
- Updated patch list.
- Resolves rhbz#411941
- Resolves rhbz#399221
- Resolves rhbz#318621

* Thu Dec  6 2007 Thomas Fitzsimmons  - 1.7.0.0-0.22.b23
- Clear bootstrap mode on ppc and ppc64.

* Wed Dec  5 2007 Thomas Fitzsimmons  - 1.7.0.0-0.21.b23
- Update icedteasnapshot.

* Fri Nov 30 2007 Thomas Fitzsimmons  - 1.7.0.0-0.21.b23
- Update icedteasnapshot.
- Remove ExclusiveArch.
- Assume i386.
- Add support for ppc and ppc64.
- Bootstrap on ppc and ppc64.

* Thu Nov 15 2007 Thomas Fitzsimmons  - 1.7.0.0-0.20.b23
- Add giflib-devel build requirement.

* Thu Nov 15 2007 Thomas Fitzsimmons  - 1.7.0.0-0.20.b23
- Add libjpeg-devel and libpng-devel build requirements.

* Thu Nov 15 2007 Lillian Angel  - 1.7.0.0-0.20.b23.snapshot
- Added gcjbootstrap.
- Updated openjdkver and openjdkdate to new b23 release.
- Updated Release.
- Added gcjbootstrap checks in.
- Resolves: rhbz#333721

* Mon Oct 15 2007 Lillian Angel  - 1.7.0.0-0.19.b21.snapshot
- Updated release.

* Fri Oct 12 2007 Lillian Angel  - 1.7.0.0-0.18.b21.snapshot
- Updated release.

* Fri Oct 12 2007 Lillian Angel  - 1.7.0.0-0.17.b21.snapshot
- Added jhat patch back in.

* Thu Oct 11 2007 Lillian Angel  - 1.7.0.0-0.17.b21.snapshot
- Update icedtearelease.
- Update icedteasnapshot.
- Update openjdkver.
- Update openjdkdate.
- Updated genurl.
- Removed unneeded patches.
- Removed gcjbootstrap.
- Removed icedteaopt.
- Removed all gcj related checks.
- Resolves: rhbz#317041 
- Resolves: rhbz#314211 
- Resolves: rhbz#314141 
- Resolves: rhbz#301691

* Mon Oct 1 2007 Lillian Angel  - 1.7.0.0-0.16.b19.snapshot
- Listed mauve_output as a doc file instead of a source.
- Added mauve_tests to the src files as doc.

* Fri Sep 28 2007 Lillian Angel  - 1.7.0.0-0.16.b19.snapshot
- Fixed testing. Output is stored in a file and passes/debug info is not shown.

* Thu Sep 27 2007 Thomas Fitzsimmons  - 1.7.0.0-0.16.b19
- Apply patch to use system tzdata.
- Require tzdata-java.
- Fix mauve shell fragment.

* Thu Sep 27 2007 Lillian Angel  - 1.7.0.0-0.15.b19.snapshot
- Removed jtreg setup line.

* Wed Sep 26 2007 Lillian Angel  - 1.7.0.0-0.15.b19.snapshot
- Removed jtreg.  Does not adhere to Fedora guidelines.

* Tue Sep 25 2007 Lillian Angel  - 1.7.0.0-0.15.b19.snapshot
- Fixed running of Xvfb so it does not terminate after a successful
  test.
- Fixed mauve and jtreg test runs to not break the build when an error
  is thrown

* Mon Sep 24 2007 Lillian Angel  - 1.7.0.0-0.15.b19.snapshot
- Added JTreg zip as source
- Run JTreg tests after build for smoke testing.
- Added Xvfb as build requirement.

* Wed Sep 12 2007 Lillian Angel  - 1.7.0.0-0.15.b19.snapshot
- Added Mauve tarball as source.
- Added mauve_tests as source.
- Run Mauve after build for regression testing.

* Thu Sep  7 2007 Thomas Fitzsimmons  - 1.7.0.0-0.15.b18
- Do not require openssl for build.
- Require openssl.
- Set gcjbootstrap to 0.
- Remove generate-cacerts.pl.
- Update icedtearelease.
- Update icedteasnapshot.
- Update openjdkver.
- Update openjdkdate.

* Wed Sep  5 2007 Thomas Fitzsimmons  - 1.7.0.0-0.15.b18
- Rename javadoc master alternative javadocdir.
- Resolves: rhbz#269901

* Wed Sep  5 2007 Thomas Fitzsimmons  - 1.7.0.0-0.15.b18
- Remove epoch in plugin provides.
- Bump release number.
- Resolves: rhbz#274001

* Mon Aug 27 2007 Thomas Fitzsimmons  - 1.7.0.0-0.14.b18
- Include idlj man page in files list.

* Mon Aug 27 2007 Thomas Fitzsimmons  - 1.7.0.0-0.14.b18
- Add documentation for plugin and src subpackages.
- Fix plugin alternative on x86_64.
- Add java-1.7.0-icedtea-win32.patch.
- Rename modzip.sh generate-fedora-zip.sh.
- Keep patches in main directory.
- Namespace patches.
- Add java-1.7.0-icedtea-win32.patch, README.plugin and README.src.
- Bump release number.

* Mon Aug 27 2007 Lillian Angel  - 1.7.0.0-0.13.b18.snapshot
- Added line to run modzip.sh to remove specific files from the openjdk zip.
- Defined new openjdk zip created by modzip.sh as newopenjdkzip.
- Added line to patch the IcedTea Makefile. No need to download openjdk zip.
- Updated genurl.
- Updated icedteasnapshot.

* Fri Aug 24 2007 Thomas Fitzsimmons  - 1.7.0.0-0.13.b18
- Remove RMI CGI script and subpackage.
- Fix Java Access Bridge for GNOME URL.

* Thu Aug 23 2007 Thomas Fitzsimmons  - 1.7.0.0-0.12.b18
- Fully qualify Java Access Bridge for GNOME and generate-cacerts
  source paths.
- Fix plugin post alternatives invocation.
- Include IcedTea documentation.
- Update icedteasnapshot.

* Tue Aug 21 2007 Thomas Fitzsimmons  - 1.7.0.0-0.11.b18
- Revert change to configure macro.

* Mon Aug 20 2007 Thomas Fitzsimmons  - 1.7.0.0-0.11.b18
- Fix rpmlint errors.

* Mon Aug 20 2007 Thomas Fitzsimmons  - 1.7.0.0-0.11.b18
- Add missing development alternatives.
- Bump accessver to 1.19.2.
- Bump icedteaver.
- Set icedteasnapshot.
- Define icedtearelease.
- Bump openjdkver.
- Bump openjdkdate.
- Bump release number.
- Add plugin build requirements and subpackage.

* Tue Jul 31 2007 Lillian Angel  - 1.7.0.0-0.10.b16.1.2
- Bump icedteaver.
- Updated icedteasnapshot.
- Updated release to include icedteaver.

* Wed Jul 25 2007 Lillian Angel  - 1.7.0.0-0.9.b16
- Updated icedteasnapshot.
- Bump openjdkver.
- Bump openjdkdate.
- Bump release number.

* Wed Jul 18 2007 Thomas Fitzsimmons  - 1.7.0.0-0.8.b15
- Only build rmi subpackage on non-x86_64 architectures.

* Wed Jul 18 2007 Thomas Fitzsimmons  - 1.7.0.0-0.8.b15
- Bump icedteaver.
- Update icedteasnapshot.

* Fri Jul 13 2007 Thomas Fitzsimmons  - 1.7.0.0-0.8.b15
- Add rmi subpackage.
- Remove name-version javadoc directory.

* Fri Jul 13 2007 Thomas Fitzsimmons  - 1.7.0.0-0.8.b15
- Set man extension to .gz in base and devel post sections.

* Thu Jul 12 2007 Thomas Fitzsimmons  - 1.7.0.0-0.7.b15
- Clear icedteasnapshot.
- Bump release number.

* Wed Jul 11 2007 Lillian Angel  - 1.7.0.0-0.6.b15
- Updated icedteasnapshot.
- Bump openjdkver.
- Bump openjdkdate.
- Bump release number.

* Thu Jul  5 2007 Thomas Fitzsimmons  - 1.7.0.0-0.5.b14
- Define icedteasnapshot.

* Wed Jul  4 2007 Thomas Fitzsimmons  - 1.7.0.0-0.4.b14
- Prevent jar repacking.

* Wed Jul  4 2007 Thomas Fitzsimmons  - 1.7.0.0-0.4.b14
- Include generate-cacerts.pl.
- Generate and install cacerts file.

* Tue Jul  3 2007 Thomas Fitzsimmons  - 1.7.0.0-0.4.b14
- Add javadoc subpackage.
- Add Java Access Bridge for GNOME.
- Add support for executable JAR files.
- Bump alternatives priority to 17000.

* Thu Jun 28 2007 Thomas Fitzsimmons  - 1.7.0.0-0.4.b14
- Add support for executable jar files.
- Bump icedteaver.
- Bump openjdkver.
- Bump openjdkdate.
- Bump release number.

* Tue Jun 19 2007 Thomas Fitzsimmons  - 1.7.0.0-0.3.b13
- Import IcedTea 1.1.
- Bump icedteaver.
- Bump openjdkver.
- Bump openjdkdate.
- Bump release number.
- Use --with-openjdk-src-zip.

* Tue Jun 12 2007 Thomas Fitzsimmons  - 1.7.0.0-0.2.b12
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Mar 2008 19:28:57 -0000	1.1
+++ .cvsignore	10 Mar 2008 14:20:27 -0000	1.2
@@ -0,0 +1,5 @@
+java-access-bridge-1.19.2.tar.gz
+mauve-2007-09-12.tar.gz
+openjdk-6-src-b06-28_feb_2008-fedora.tar.gz
+icedtea6-1.0-3547877ecc7bb77b74983190d1ba3f06dce7e16b.tar.gz
+mauve_tests


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Mar 2008 19:28:57 -0000	1.1
+++ sources	10 Mar 2008 14:20:27 -0000	1.2
@@ -0,0 +1,5 @@
+ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
+abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
+51b5a40fe2dfb4e3239eba637c5b4f44  icedtea6-1.0-3547877ecc7bb77b74983190d1ba3f06dce7e16b.tar.gz
+7a0c160c03012cd40957a7a112e25038  mauve_tests
+e24e99eeae81f32fa7d958fc75757b83  openjdk-6-src-b06-28_feb_2008-fedora.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 14:45:27 2008
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 10 Mar 2008 14:45:27 GMT
Subject: rpms/kde-settings/devel .cvsignore, 1.24, 1.25 kde-settings.spec,
	1.34, 1.35 sources, 1.22, 1.23
Message-ID: <200803101445.m2AEjRxQ006856@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6805

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
- gestures disable as default
- omit kdesktoprc



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	19 Feb 2008 19:30:22 -0000	1.24
+++ .cvsignore	10 Mar 2008 14:44:54 -0000	1.25
@@ -1,4 +0,0 @@
-kde-settings-4.0-9.tar.bz2
-bookmarks.xml
-kde-settings-4.0-10.tar.bz2
-kde-settings-4.0-11.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kde-settings.spec	9 Mar 2008 19:57:44 -0000	1.34
+++ kde-settings.spec	10 Mar 2008 14:44:54 -0000	1.35
@@ -2,7 +2,7 @@
 # THIS SPECFILE IS FOR F9+ ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
 
-%define rel 11
+%define rel 12
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -129,6 +129,10 @@
 
 
 %changelog
+* Mon Mar 10 2008 Than Ngo  4.0-12.1
+- gestures disable as default
+- omit kdesktoprc
+
 * Sun Mar 09 2008 Kevin Kofler  4.0-11.1
 - symlink /etc/kderc to /etc/kde4rc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	19 Feb 2008 19:30:22 -0000	1.22
+++ sources	10 Mar 2008 14:44:54 -0000	1.23
@@ -1 +1 @@
-bfdb7d8fb80676378794bb9e5bee042d  kde-settings-4.0-11.tar.bz2
+d5574f1ea503d55f9a2b765da1d32690  kde-settings-4.0-12.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 14:45:31 2008
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Mon, 10 Mar 2008 14:45:31 GMT
Subject: rpms/hal-info/devel .cvsignore, 1.10, 1.11 hal-info.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <200803101445.m2AEjVB4006866@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6799

Modified Files:
	.cvsignore hal-info.spec sources 
Log Message:
- Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Feb 2008 23:24:34 -0000	1.10
+++ .cvsignore	10 Mar 2008 14:44:56 -0000	1.11
@@ -1,2 +1 @@
-hal-info-20071212.tar.gz
-hal-info-20080215.tar.gz
+hal-info-20080310.tar.gz


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- hal-info.spec	6 Mar 2008 00:02:28 -0000	1.14
+++ hal-info.spec	10 Mar 2008 14:44:56 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Device information files for HAL
 Name: hal-info
-Version: 20080215
-Release: 2%{?dist}
+Version: 20080310
+Release: 1%{?dist}
 License: AFL/GPL
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
@@ -40,6 +40,9 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Mon Mar 10 2008 Ray Strode  - 20080310-1%{?dist}
+- Update to latest upstream release
+
 * Wed Mar  5 2008 Dan Williams  - 20080215-2%{?dist}
 - Fix modem tags for Kyocera KPC-650
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Feb 2008 23:24:34 -0000	1.10
+++ sources	10 Mar 2008 14:44:56 -0000	1.11
@@ -1 +1 @@
-1bbd1c30ce804ec41900a2b8b82a43f1  hal-info-20080215.tar.gz
+6f90973db96213558f5a9f4b81ad6685  hal-info-20080310.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 14:53:00 2008
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 10 Mar 2008 14:53:00 GMT
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.48,
	1.49 kdebase-workspace-4.0.2-Gestures.patch, 1.1, NONE
Message-ID: <200803101453.m2AEr0pr007097@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7049

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.0.2-Gestures.patch 
Log Message:
add gestures=false in kde-settings, remove kdebase-workspace-4.0.2-Gestures.patch



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdebase-workspace.spec	7 Mar 2008 15:49:08 -0000	1.48
+++ kdebase-workspace.spec	10 Mar 2008 14:52:15 -0000	1.49
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.2
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -15,8 +15,7 @@
 
 Patch1: kdebase-workspace-4.0.1-redhat-startkde.patch
 Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch
-Patch3: kdebase-workspace-4.0.2-Gestures.patch
-Patch4: kdebase-workspace-4.0.2-plasma-konsole.patch
+Patch3: kdebase-workspace-4.0.2-plasma-konsole.patch
 
 # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
 # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886
@@ -109,9 +108,7 @@
 %patch1 -p1 -b .redhat-startkde
 # ConsoleKit support for KDM (#228111, kde#147790)
 %patch2 -p1 -b .consolekit
-%patch3 -p1 -b .gestures
-%patch4 -p1 -b .plasma-konsole
-#patch5 -p1 -b .simplelauch
+%patch3 -p1 -b .plasma-konsole
 
 # upstream patches
 %patch100 -p1 -b .kde#155362
@@ -228,6 +225,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Than Ngo  4.0.2-6
+- add gestures=false in kde-settings, remove kdebase-workspace-4.0.2-Gestures.patch
+
 * Thu Mar 06 2008 Than Ngo  4.0.2-5
 - typo fix
 


--- kdebase-workspace-4.0.2-Gestures.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 14:58:47 2008
From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange))
Date: Mon, 10 Mar 2008 14:58:47 GMT
Subject: rpms/virt-viewer/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 virt-viewer.spec, 1.7,
	1.8 virt-viewer-0.0.2-hide-passwd.patch, 1.1,
	NONE virt-viewer-0.0.2-vnc-credential-name.patch, 1.1,
	NONE virt-viewer-0.0.2-window-title.patch, 1.1, NONE
Message-ID: <200803101458.m2AEwlah007475@cvs-int.fedora.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/virt-viewer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7421

Modified Files:
	.cvsignore sources virt-viewer.spec 
Removed Files:
	virt-viewer-0.0.2-hide-passwd.patch 
	virt-viewer-0.0.2-vnc-credential-name.patch 
	virt-viewer-0.0.2-window-title.patch 
Log Message:
Update to 0.0.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-viewer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2007 00:40:26 -0000	1.3
+++ .cvsignore	10 Mar 2008 14:58:12 -0000	1.4
@@ -1 +1,5 @@
-virt-viewer-0.0.2.tar.gz
+.build*.log
+*.rpm
+x86_64
+i386
+virt-viewer-*.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-viewer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2007 00:40:26 -0000	1.3
+++ sources	10 Mar 2008 14:58:12 -0000	1.4
@@ -1 +1 @@
-9dfec5581975346183b977767aee4700  virt-viewer-0.0.2.tar.gz
+feb97e8e0df27fbeeeefe733b49cc157  virt-viewer-0.0.3.tar.gz


Index: virt-viewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-viewer/devel/virt-viewer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- virt-viewer.spec	18 Feb 2008 21:14:10 -0000	1.7
+++ virt-viewer.spec	10 Mar 2008 14:58:12 -0000	1.8
@@ -1,55 +1,91 @@
 # -*- rpm-spec -*-
 
+# Plugin isn't ready for real world use yet - it needs
+# a security audit at very least
+%define _with_plugin %{?with_plugin:1}%{!?with_plugin:0}
+
 Name: virt-viewer
-Version: 0.0.2
-Release: 4%{?dist}
+Version: 0.0.3
+Release: 1%{?dist}
 Summary: Virtual Machine Viewer
-
 Group: Applications/System
 License: GPLv2+
 URL: http://virt-manager.org/
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
-Patch1: %{name}-%{version}-vnc-credential-name.patch
-Patch2: %{name}-%{version}-hide-passwd.patch
-Patch3: %{name}-%{version}-window-title.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: openssh-clients
 
 BuildRequires: gtk2-devel
 BuildRequires: libvirt-devel >= 0.3.1-4.fc8
 BuildRequires: libxml2-devel
-BuildRequires: gtk-vnc-devel >= 0.1.0
+BuildRequires: gtk-vnc-devel >= 0.3.4
 BuildRequires: /usr/bin/pod2man
+%if %{_with_plugin}
+%if "%{fedora}" > "8"
+BuildRequires: xulrunner-devel
+%else
+BuildRequires: firefox-devel
+%endif
+%endif
 
 %description
 Virtual Machine Viewer provides a graphical console client for connecting
 to virtual machines. It uses the GTK-VNC widget to provide the display,
 and libvirt for looking up VNC server details.
 
+%if %{_with_plugin}
+%package plugin
+Summary: Mozilla plugin for the gtk-vnc library
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description plugin
+gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
+allowing it to be completely asynchronous while remaining single threaded.
+
+This package provides a web browser plugin for Mozilla compatible
+browsers.
+%endif
+
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
+%if %{_with_plugin}
+%configure --enable-plugin=yes
+%else
 %configure
-make %{?_smp_mflags}
+%endif
+%__make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install  DESTDIR=$RPM_BUILD_ROOT
+%__make install  DESTDIR=$RPM_BUILD_ROOT
+%if %{_with_plugin}
+rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.a
+rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING AUTHORS NEWS
+%doc README COPYING AUTHORS ChangeLog NEWS
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}*
 
+%if %{_with_plugin}
+%files plugin
+%defattr(-, root, root)
+%{_libdir}/mozilla/plugins/%{name}-plugin.so
+%endif
+
 %changelog
+* Mon Mar 10 2008 Daniel P. Berrange  - 0.0.3-1.fc9
+- Updated to 0.0.3 release
+
 * Mon Feb 18 2008 Fedora Release Engineering  - 0.0.2-4
 - Autorebuild for GCC 4.3
 


--- virt-viewer-0.0.2-hide-passwd.patch DELETED ---


--- virt-viewer-0.0.2-vnc-credential-name.patch DELETED ---


--- virt-viewer-0.0.2-window-title.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:00:52 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:00:52 GMT
Subject: rpms/perl-Archive-Extract/devel dead.package, NONE,
	1.1 perl-Archive-Extract.spec, 1.10, NONE sources, 1.10, NONE
Message-ID: <200803101500.m2AF0qv9007669@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Archive-Extract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Archive-Extract/devel

Added Files:
	dead.package 
Removed Files:
	perl-Archive-Extract.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Archive-Extract.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:01:36 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:01:36 GMT
Subject: rpms/perl-Archive-Tar/devel dead.package, NONE,
	1.1 perl-Archive-Tar.spec, 1.27, NONE sources, 1.10, NONE
Message-ID: <200803101501.m2AF1adZ014847@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Archive-Tar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Archive-Tar/devel

Added Files:
	dead.package 
Removed Files:
	perl-Archive-Tar.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Archive-Tar.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:01:47 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:01:47 GMT
Subject: rpms/perl-CPANPLUS/devel dead.package, NONE,
	1.1 CPANPLUS-filter-provides.sh, 1.1,
	NONE CPANPLUS-filter-requires.sh, 1.1, NONE perl-CPANPLUS.spec,
	1.10, NONE sources, 1.9, NONE
Message-ID: <200803101501.m2AF1lKv014863@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-CPANPLUS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-CPANPLUS/devel

Added Files:
	dead.package 
Removed Files:
	CPANPLUS-filter-provides.sh CPANPLUS-filter-requires.sh 
	perl-CPANPLUS.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- CPANPLUS-filter-provides.sh DELETED ---


--- CPANPLUS-filter-requires.sh DELETED ---


--- perl-CPANPLUS.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:01:56 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:01:56 GMT
Subject: rpms/perl-Compress-Raw-Zlib/devel dead.package, NONE,
	1.1 perl-Compress-Raw-Zlib.spec, 1.6, NONE sources, 1.3, NONE
Message-ID: <200803101501.m2AF1uoQ014888@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Compress-Raw-Zlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Compress-Raw-Zlib/devel

Added Files:
	dead.package 
Removed Files:
	perl-Compress-Raw-Zlib.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Compress-Raw-Zlib.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:02:05 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:02:05 GMT
Subject: rpms/perl-Compress-Zlib/devel dead.package, NONE,
	1.1 perl-Compress-Zlib.spec, 1.31, NONE sources, 1.11, NONE
Message-ID: <200803101502.m2AF25xs014918@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Compress-Zlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Compress-Zlib/devel

Added Files:
	dead.package 
Removed Files:
	perl-Compress-Zlib.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Compress-Zlib.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:02:09 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:02:09 GMT
Subject: rpms/perl-Digest-SHA/devel dead.package, NONE,
	1.1 perl-Digest-SHA.spec, 1.4, NONE sources, 1.3, NONE
Message-ID: <200803101502.m2AF29gx014935@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Digest-SHA/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Digest-SHA/devel

Added Files:
	dead.package 
Removed Files:
	perl-Digest-SHA.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Digest-SHA.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:02:24 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:02:24 GMT
Subject: rpms/perl-ExtUtils-CBuilder/devel dead.package, NONE,
	1.1 perl-ExtUtils-CBuilder.spec, 1.23, NONE sources, 1.16, NONE
Message-ID: <200803101502.m2AF2OgL014967@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-ExtUtils-CBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-ExtUtils-CBuilder/devel

Added Files:
	dead.package 
Removed Files:
	perl-ExtUtils-CBuilder.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-ExtUtils-CBuilder.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:02:30 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:02:30 GMT
Subject: rpms/perl-ExtUtils-ParseXS/devel dead.package, NONE,
	1.1 perl-ExtUtils-ParseXS.spec, 1.18, NONE sources, 1.11, NONE
Message-ID: <200803101502.m2AF2UKW014991@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-ExtUtils-ParseXS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-ExtUtils-ParseXS/devel

Added Files:
	dead.package 
Removed Files:
	perl-ExtUtils-ParseXS.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-ExtUtils-ParseXS.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:02:33 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:02:33 GMT
Subject: rpms/perl-File-Fetch/devel dead.package, NONE,
	1.1 perl-File-Fetch.spec, 1.7, NONE sources, 1.6, NONE
Message-ID: <200803101502.m2AF2XHS015008@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-File-Fetch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-File-Fetch/devel

Added Files:
	dead.package 
Removed Files:
	perl-File-Fetch.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-File-Fetch.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:02:39 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:02:39 GMT
Subject: rpms/perl-IO-Compress-Base/devel dead.package, NONE,
	1.1 perl-IO-Compress-Base.spec, 1.5, NONE sources, 1.3, NONE
Message-ID: <200803101502.m2AF2dtD015030@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-IO-Compress-Base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-IO-Compress-Base/devel

Added Files:
	dead.package 
Removed Files:
	perl-IO-Compress-Base.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-IO-Compress-Base.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:02:48 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:02:48 GMT
Subject: rpms/perl-IO-Compress-Zlib/devel dead.package, NONE,
	1.1 perl-IO-Compress-Zlib.spec, 1.3, NONE sources, 1.3, NONE
Message-ID: <200803101502.m2AF2mVu015049@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-IO-Compress-Zlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-IO-Compress-Zlib/devel

Added Files:
	dead.package 
Removed Files:
	perl-IO-Compress-Zlib.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-IO-Compress-Zlib.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:02:58 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:02:58 GMT
Subject: rpms/perl-IO-Zlib/devel dead.package, NONE, 1.1 perl-IO-Zlib.spec,
	1.9, NONE sources, 1.3, NONE
Message-ID: <200803101502.m2AF2wfH015068@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-IO-Zlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-IO-Zlib/devel

Added Files:
	dead.package 
Removed Files:
	perl-IO-Zlib.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-IO-Zlib.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:03:10 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:03:10 GMT
Subject: rpms/perl-IPC-Cmd/devel dead.package, NONE, 1.1 perl-IPC-Cmd.spec,
	1.8, NONE sources, 1.8, NONE
Message-ID: <200803101503.m2AF3AJm015088@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-IPC-Cmd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-IPC-Cmd/devel

Added Files:
	dead.package 
Removed Files:
	perl-IPC-Cmd.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-IPC-Cmd.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:03:14 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:03:14 GMT
Subject: rpms/perl-Locale-Maketext-Simple/devel dead.package, NONE,
	1.1 perl-Locale-Maketext-Simple.spec, 1.7, NONE sources, 1.6, NONE
Message-ID: <200803101503.m2AF3Eua015109@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Locale-Maketext-Simple/devel

Added Files:
	dead.package 
Removed Files:
	perl-Locale-Maketext-Simple.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Locale-Maketext-Simple.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:03:25 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:03:25 GMT
Subject: rpms/perl-Log-Message/devel dead.package, NONE,
	1.1 perl-Log-Message.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <200803101503.m2AF3P40015135@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Log-Message/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Log-Message/devel

Added Files:
	dead.package 
Removed Files:
	perl-Log-Message.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Log-Message.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:03:36 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:03:36 GMT
Subject: rpms/perl-Log-Message-Simple/devel dead.package, NONE,
	1.1 perl-Log-Message-Simple.spec, 1.6, NONE sources, 1.4, NONE
Message-ID: <200803101503.m2AF3a9L015156@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Log-Message-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Log-Message-Simple/devel

Added Files:
	dead.package 
Removed Files:
	perl-Log-Message-Simple.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Log-Message-Simple.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:03:47 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:03:47 GMT
Subject: rpms/perl-Module-Build/devel dead.package, NONE,
	1.1 perl-Module-Build.spec, 1.28, NONE sources, 1.16, NONE
Message-ID: <200803101503.m2AF3ldJ015177@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Module-Build/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Module-Build/devel

Added Files:
	dead.package 
Removed Files:
	perl-Module-Build.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Module-Build.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:03:58 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:03:58 GMT
Subject: rpms/perl-Module-CoreList/devel dead.package, NONE,
	1.1 perl-Module-CoreList.spec, 1.18, NONE sources, 1.14, NONE
Message-ID: <200803101503.m2AF3w35015193@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Module-CoreList/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Module-CoreList/devel

Added Files:
	dead.package 
Removed Files:
	perl-Module-CoreList.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Module-CoreList.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:04:08 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:04:08 GMT
Subject: rpms/perl-Module-Load/devel dead.package, NONE,
	1.1 perl-Module-Load.spec, 1.4, NONE sources, 1.3, NONE
Message-ID: <200803101504.m2AF48QG015209@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Module-Load/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Module-Load/devel

Added Files:
	dead.package 
Removed Files:
	perl-Module-Load.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Module-Load.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:04:20 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:04:20 GMT
Subject: rpms/perl-Module-Load-Conditional/devel dead.package, NONE,
	1.1 perl-Module-Load-Conditional.spec, 1.9, NONE sources, 1.8, NONE
Message-ID: <200803101504.m2AF4KL9015230@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Module-Load-Conditional/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Module-Load-Conditional/devel

Added Files:
	dead.package 
Removed Files:
	perl-Module-Load-Conditional.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Module-Load-Conditional.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:04:25 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:04:25 GMT
Subject: rpms/perl-Module-Loaded/devel dead.package, NONE,
	1.1 perl-Module-Loaded.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <200803101504.m2AF4PCp015250@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Module-Loaded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Module-Loaded/devel

Added Files:
	dead.package 
Removed Files:
	perl-Module-Loaded.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Module-Loaded.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:04:35 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:04:35 GMT
Subject: rpms/perl-Module-Pluggable/devel dead.package, NONE,
	1.1 perl-Module-Pluggable.spec, 1.10, NONE sources, 1.7, NONE
Message-ID: <200803101504.m2AF4Z4J015268@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Module-Pluggable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Module-Pluggable/devel

Added Files:
	dead.package 
Removed Files:
	perl-Module-Pluggable.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Module-Pluggable.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:05:09 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:05:09 GMT
Subject: rpms/perl-Object-Accessor/devel dead.package, NONE,
	1.1 perl-Object-Accessor.spec, 1.9, NONE sources, 1.6, NONE
Message-ID: <200803101505.m2AF59c6015304@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Object-Accessor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Object-Accessor/devel

Added Files:
	dead.package 
Removed Files:
	perl-Object-Accessor.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Object-Accessor.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:05:16 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:05:16 GMT
Subject: rpms/perl-Package-Constants/devel dead.package, NONE,
	1.1 perl-Package-Constants.spec, 1.5, NONE sources, 1.2, NONE
Message-ID: <200803101505.m2AF5Gao015322@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Package-Constants/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Package-Constants/devel

Added Files:
	dead.package 
Removed Files:
	perl-Package-Constants.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Package-Constants.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:06:07 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:06:07 GMT
Subject: rpms/perl-Params-Check/devel dead.package, NONE,
	1.1 perl-Params-Check.spec, 1.5, NONE sources, 1.4, NONE
Message-ID: <200803101506.m2AF67sM015440@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Params-Check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Params-Check/devel

Added Files:
	dead.package 
Removed Files:
	perl-Params-Check.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Params-Check.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:06:14 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:06:14 GMT
Subject: rpms/perl-Pod-Escapes/devel dead.package, NONE,
	1.1 perl-Pod-Escapes.spec, 1.12, NONE sources, 1.2, NONE
Message-ID: <200803101506.m2AF6EwP015456@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Pod-Escapes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Pod-Escapes/devel

Added Files:
	dead.package 
Removed Files:
	perl-Pod-Escapes.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Pod-Escapes.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:07:05 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:07:05 GMT
Subject: rpms/perl-Pod-Simple/devel dead.package, NONE,
	1.1 perl-Pod-Simple.spec, 1.13, NONE sources, 1.5, NONE
Message-ID: <200803101507.m2AF75vo015520@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Pod-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Pod-Simple/devel

Added Files:
	dead.package 
Removed Files:
	perl-Pod-Simple.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Pod-Simple.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:07:12 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:07:12 GMT
Subject: rpms/perl-Term-UI/devel dead.package, NONE, 1.1 perl-Term-UI.spec,
	1.6, NONE sources, 1.5, NONE
Message-ID: <200803101507.m2AF7COF015549@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Term-UI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Term-UI/devel

Added Files:
	dead.package 
Removed Files:
	perl-Term-UI.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Term-UI.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:07:17 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:07:17 GMT
Subject: rpms/perl-Time-Piece/devel dead.package, NONE,
	1.1 perl-Time-Piece.spec, 1.9, NONE sources, 1.3, NONE
Message-ID: <200803101507.m2AF7H88015567@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Time-Piece/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-Time-Piece/devel

Added Files:
	dead.package 
Removed Files:
	perl-Time-Piece.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-Time-Piece.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:07:28 2008
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 10 Mar 2008 15:07:28 GMT
Subject: rpms/kernel/devel patch-2.6.25-rc5.bz2.sign, NONE, 1.1 .cvsignore, 
	1.777, 1.778 kernel.spec, 1.486, 1.487 sources, 1.737,
	1.738 upstream, 1.659, 1.660 patch-2.6.25-rc4-git3.bz2.sign, 1.1,
	NONE patch-2.6.25-rc4.bz2.sign, 1.1, NONE
Message-ID: <200803101507.m2AF7SlE015589@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15484

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.25-rc5.bz2.sign 
Removed Files:
	patch-2.6.25-rc4-git3.bz2.sign patch-2.6.25-rc4.bz2.sign 
Log Message:
* Mon Mar 10 2008 Dave Jones 
- 2.6.25-rc5



--- NEW FILE patch-2.6.25-rc5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBH1Mr4yGugalF9Dw4RAmFRAKCPjjFpol+PhsAsyFWPxcPA8Kt7uACgkyHg
GnI8P8ow+IvoBwFeExgHGIs=
=Ny6Z
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.777
retrieving revision 1.778
diff -u -r1.777 -r1.778
--- .cvsignore	8 Mar 2008 20:20:22 -0000	1.777
+++ .cvsignore	10 Mar 2008 15:06:49 -0000	1.778
@@ -4,5 +4,5 @@
 temp-*
 kernel-2.6.24
 linux-2.6.24.tar.bz2
-patch-2.6.25-rc4.bz2
+patch-2.6.25-rc5.bz2
 patch-2.6.25-rc4-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- kernel.spec	10 Mar 2008 14:09:35 -0000	1.486
+++ kernel.spec	10 Mar 2008 15:06:49 -0000	1.487
@@ -43,9 +43,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 4
+%define rcrev 5
 # The git snapshot level
-%define gitrev 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1752,6 +1752,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Mon Mar 10 2008 Dave Jones 
+- 2.6.25-rc5
+
 * Mon Mar 10 2008 Jarod Wilson 
 - firewire: additional debug output if config ROM read fails
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.737
retrieving revision 1.738
diff -u -r1.737 -r1.738
--- sources	8 Mar 2008 20:20:23 -0000	1.737
+++ sources	10 Mar 2008 15:06:49 -0000	1.738
@@ -1,3 +1,2 @@
 3f23ad4b69d0a552042d1ed0f4399857  linux-2.6.24.tar.bz2
-a4cc0fd5bda60e498246b6d69c873895  patch-2.6.25-rc4.bz2
-3798c3ab4cd019dc4877b6ce21b1cd87  patch-2.6.25-rc4-git3.bz2
+6f5fbe9f3655e53c561c4fea9bf2f525  patch-2.6.25-rc5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.659
retrieving revision 1.660
diff -u -r1.659 -r1.660
--- upstream	8 Mar 2008 20:20:23 -0000	1.659
+++ upstream	10 Mar 2008 15:06:49 -0000	1.660
@@ -1,3 +1,2 @@
 linux-2.6.24.tar.bz2
-patch-2.6.25-rc4.bz2
-patch-2.6.25-rc4-git3.bz2
+patch-2.6.25-rc5.bz2


--- patch-2.6.25-rc4-git3.bz2.sign DELETED ---


--- patch-2.6.25-rc4.bz2.sign DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:07:28 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 15:07:28 GMT
Subject: rpms/perl-version/devel dead.package, NONE, 1.1 perl-version.spec, 
	1.11, NONE sources, 1.9, NONE
Message-ID: <200803101507.m2AF7SXh015591@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-version/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7568/perl-version/devel

Added Files:
	dead.package 
Removed Files:
	perl-version.spec sources 
Log Message:

Packages have been obsoleted by base perl 5.10.0.



--- NEW FILE dead.package ---
Package obsoleted by the base perl package in 5.10.0.


--- perl-version.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 15:09:16 2008
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Mon, 10 Mar 2008 15:09:16 GMT
Subject: rpms/authconfig/devel .cvsignore, 1.65, 1.66 authconfig.spec, 1.93, 
	1.94 sources, 1.73, 1.74
Message-ID: <200803101509.m2AF9GoZ015649@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15623

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Mon Mar 10 2008 Tomas Mraz  - 5.4.0-1
- include config-util in console.apps files
- add support for saving/restoring backups of configuration
  files affected by authconfig (#433776)
- improve the authconfig manual page (#432023, #432938)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	18 Jan 2008 10:42:46 -0000	1.65
+++ .cvsignore	10 Mar 2008 15:08:40 -0000	1.66
@@ -1 +1 @@
-authconfig-5.3.20.tar.bz2
+authconfig-5.4.0.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- authconfig.spec	20 Feb 2008 05:33:33 -0000	1.93
+++ authconfig.spec	10 Mar 2008 15:08:40 -0000	1.94
@@ -1,18 +1,14 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.3.20
-# Don't change release in elvis CVS, up version after merging all patches
-# from dist CVS instead.
-Release: 2%{?dist}
+Version: 5.4.0
+Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# The upstream project is hosted in CVS on:
-URL: http://rhlinux.redhat.com/
-# The project doesn't have http site with downloadable tarballs yet.
-Source: %{name}-%{version}.tar.bz2
-Requires: newt-python, pam >= 0.99.8.1-14, usermode, python
+URL: https://fedorahosted.org/authconfig
+Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
+Requires: newt-python, pam >= 0.99.10.0, usermode, python
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
 Conflicts: nss_ldap < 254
 BuildRequires: glib2-devel, python >= 2.4.1, python-devel
@@ -81,6 +77,7 @@
 %config(noreplace) %{_sysconfdir}/pam.d/authconfig-tui
 %config(noreplace) %{_sysconfdir}/security/console.apps/authconfig
 %config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-tui
+%attr(700,root,root) %dir %{_localstatedir}/%{name}
 
 %files gtk
 %defattr(-,root,root,-)
@@ -98,8 +95,14 @@
 %{_datadir}/pixmaps/*
 
 %changelog
-* Wed Feb 20 2008 Fedora Release Engineering  - 5.3.20-2
-- Autorebuild for GCC 4.3
+* Mon Mar 10 2008 Tomas Mraz  - 5.4.0-1
+- include config-util in console.apps files
+- add support for saving/restoring backups of configuration
+  files affected by authconfig (#433776)
+- improve the authconfig manual page (#432023, #432938)
+
+* Tue Jan 29 2008 Tomas Mraz  - 5.3.21-1
+- correct the fix for bug #237956
 
 * Fri Jan 18 2008 Tomas Mraz  - 5.3.20-1
 - update translations


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	18 Jan 2008 10:42:46 -0000	1.73
+++ sources	10 Mar 2008 15:08:40 -0000	1.74
@@ -1 +1 @@
-f0187a868b30b5dd66b78c2e07d247d4  authconfig-5.3.20.tar.bz2
+0acddc0eabcd5fc6bb4c471b8058f0de  authconfig-5.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 15:12:19 2008
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Mon, 10 Mar 2008 15:12:19 GMT
Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.2,
	1.3 java-1.6.0-openjdk.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200803101512.m2AFCJmZ015755@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15723

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Log Message:
Updated sources




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2008 14:20:27 -0000	1.2
+++ .cvsignore	10 Mar 2008 15:11:44 -0000	1.3
@@ -3,3 +3,4 @@
 openjdk-6-src-b06-28_feb_2008-fedora.tar.gz
 icedtea6-1.0-3547877ecc7bb77b74983190d1ba3f06dce7e16b.tar.gz
 mauve_tests
+icedtea6-1.0-e96715b7deaa5bdf2c756248b3d0f8e901ae208c.tar.gz


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.6.0-openjdk.spec	10 Mar 2008 14:20:27 -0000	1.1
+++ java-1.6.0-openjdk.spec	10 Mar 2008 15:11:44 -0000	1.2
@@ -4,7 +4,7 @@
 %define gcjbootstrap 0
 
 %define icedteaver 1.0
-%define icedteasnapshot -3547877ecc7bb77b74983190d1ba3f06dce7e16b
+%define icedteasnapshot -e96715b7deaa5bdf2c756248b3d0f8e901ae208c
 %define openjdkver b06
 %define openjdkdate 28_feb_2008
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2008 14:20:27 -0000	1.2
+++ sources	10 Mar 2008 15:11:44 -0000	1.3
@@ -1,5 +1,5 @@
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
-51b5a40fe2dfb4e3239eba637c5b4f44  icedtea6-1.0-3547877ecc7bb77b74983190d1ba3f06dce7e16b.tar.gz
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 e24e99eeae81f32fa7d958fc75757b83  openjdk-6-src-b06-28_feb_2008-fedora.tar.gz
+68625e8f2997dde7f33174cae5ffecad  icedtea6-1.0-e96715b7deaa5bdf2c756248b3d0f8e901ae208c.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 15:28:32 2008
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 10 Mar 2008 15:28:32 GMT
Subject: rpms/kde-settings/devel .cvsignore, 1.25, 1.26 kde-settings.spec,
	1.35, 1.36 sources, 1.23, 1.24
Message-ID: <200803101528.m2AFSWT3016130@cvs-int.fedora.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16100

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
make oxygen the default windows manager



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	10 Mar 2008 14:44:54 -0000	1.25
+++ .cvsignore	10 Mar 2008 15:27:42 -0000	1.26
@@ -0,0 +1 @@
+kde-settings-4.0-13.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kde-settings.spec	10 Mar 2008 14:44:54 -0000	1.35
+++ kde-settings.spec	10 Mar 2008 15:27:42 -0000	1.36
@@ -2,7 +2,7 @@
 # THIS SPECFILE IS FOR F9+ ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
 
-%define rel 12
+%define rel 13
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Than Ngo  4.0-13.1
+- make oxygen the default windows manager
+
 * Mon Mar 10 2008 Than Ngo  4.0-12.1
 - gestures disable as default
 - omit kdesktoprc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	10 Mar 2008 14:44:54 -0000	1.23
+++ sources	10 Mar 2008 15:27:42 -0000	1.24
@@ -1 +1 @@
-d5574f1ea503d55f9a2b765da1d32690  kde-settings-4.0-12.tar.bz2
+418819af35bf5467b793b32094bd0aff  kde-settings-4.0-13.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 15:30:15 2008
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Mar 2008 15:30:15 GMT
Subject: rpms/kdegraphics/F-8 kdegraphics.spec,1.118,1.119
Message-ID: <200803101530.m2AFUFDW016221@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16184

Modified Files:
	kdegraphics.spec 
Log Message:
rhel-related fixes



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-8/kdegraphics.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kdegraphics.spec	16 Feb 2008 03:25:32 -0000	1.118
+++ kdegraphics.spec	10 Mar 2008 15:29:40 -0000	1.119
@@ -22,7 +22,7 @@
 Summary: K Desktop Environment - Graphics Applications
 Epoch:   7
 Version: 3.5.9
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -37,7 +37,9 @@
 Provides: kdegraphics3 = %{version}-%{release}
 
 Requires: ghostscript
+%if 0%{?fedora}
 Requires: gocr
+%endif
 
 %if 0%{?libs}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -148,14 +150,6 @@
 %patch2 -p1 -b .xorg
 %patch3 -p1 -b .gcc-warning
 
-
-%if ! 0%{?extras}
-  DO_NOT_COMPILE=""
-  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfax"
-  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfaxview"
-  export DO_NOT_COMPILE="$DO_NOT_COMPILE kpovmodeler"
-%endif
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -164,6 +158,13 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
+%if ! 0%{?extras}
+  DO_NOT_COMPILE=""
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfax"
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfaxview"
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kpovmodeler"
+%endif
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -352,10 +353,12 @@
 %if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
+%if 0%{?extras}
 %exclude %{_libdir}/libkfaximage.la
 %exclude %{_libdir}/libkpovmodeler.la
 %exclude %{_libdir}/libkpovmodeler.so.*
 %endif
+%endif
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 
@@ -363,9 +366,11 @@
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
 %{_libdir}/lib*.so
+%if 0%{?extras}
 #exclude %{_libdir}/libkpovmodeler.so
 %exclude %{_libdir}/libkfaximage.so
 %exclude %{_libdir}/libkdeinit_*.so
+%endif
 
 
 %changelog



From fedora-extras-commits at redhat.com  Mon Mar 10 15:32:19 2008
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Mar 2008 15:32:19 GMT
Subject: rpms/kdeaddons/F-8 kdeaddons.spec,1.68,1.69
Message-ID: <200803101532.m2AFWJ7L016317@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaddons/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16277

Modified Files:
	kdeaddons.spec 
Log Message:
rhel-related fixes



Index: kdeaddons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-8/kdeaddons.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdeaddons.spec	16 Feb 2008 13:40:55 -0000	1.68
+++ kdeaddons.spec	10 Mar 2008 15:31:45 -0000	1.69
@@ -2,7 +2,7 @@
 Name:    kdeaddons
 Summary: K Desktop Environment - Plugins
 Version: 3.5.9
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -26,8 +26,10 @@
 BuildRequires: xmms-devel
 
 Requires: kdebase3 >= %{version}
+%if 0%{?fedora}
 # used in jpegorient (#312641)
 Requires: python-exif
+%endif
 Requires: which
 
 Requires(post): /sbin/ldconfig



From fedora-extras-commits at redhat.com  Mon Mar 10 15:41:09 2008
From: fedora-extras-commits at redhat.com (Dave Jones (davej))
Date: Mon, 10 Mar 2008 15:41:09 GMT
Subject: rpms/kernel/devel config-generic,1.80,1.81
Message-ID: <200803101541.m2AFf9QW016631@cvs-int.fedora.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16562

Modified Files:
	config-generic 
Log Message:
remove dupe


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- config-generic	9 Mar 2008 17:49:19 -0000	1.80
+++ config-generic	10 Mar 2008 15:40:17 -0000	1.81
@@ -2897,7 +2897,6 @@
 CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 # CONFIG_CIFS_DEBUG2 is not set
-CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y



From fedora-extras-commits at redhat.com  Mon Mar 10 15:45:22 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 15:45:22 GMT
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch,
	NONE, 1.1 openoffice.org.spec, 1.1443, 1.1444
Message-ID: <200803101545.m2AFjM8Z016745@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16695

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch 
Log Message:
Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch

openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch:

--- NEW FILE openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch ---
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.72.8.2
diff -u -r1.72.8.2 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	23 Jan 2008 17:17:10 -0000	1.72.8.2
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	10 Mar 2008 15:32:32 -0000
@@ -1158,8 +1169,8 @@
 
     if( m_pParent )
     {
-        nX = ((long)m_pParent->maGeometry.nWidth - (long)maGeometry.nWidth)/2;
-        nY = ((long)m_pParent->maGeometry.nHeight - (long)maGeometry.nHeight)/2;
+        nX = ((int)m_pParent->maGeometry.nWidth - (int)maGeometry.nWidth)/2;
+        nY = ((int)m_pParent->maGeometry.nHeight - (int)maGeometry.nHeight)/2;
 
     }
     else
@@ -1191,8 +1202,8 @@
                     break;
                 }
         }
-        nX = nScreenX + (nScreenWidth - (long)maGeometry.nWidth)/2;
-        nY = nScreenY + (nScreenHeight - (long)maGeometry.nHeight)/2;
+        nX = nScreenX + (nScreenWidth - (int)maGeometry.nWidth)/2;
+        nY = nScreenY + (nScreenHeight - (int)maGeometry.nHeight)/2;
     }
     SetPosSize( nX, nY, 0, 0, SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y );
 }
@@ -1426,25 +1438,25 @@
         Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen ); 
         if( ! (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
         {
-            if( nX < (long)maGeometry.nLeftDecoration )
+            if( nX < (int)maGeometry.nLeftDecoration )
                 nX = maGeometry.nLeftDecoration;
-            if( nY < (long)maGeometry.nTopDecoration )
+            if( nY < (int)maGeometry.nTopDecoration )
                 nY = maGeometry.nTopDecoration;
-            if( (nX + (long)maGeometry.nWidth + (long)maGeometry.nRightDecoration) > (long)aScreenSize.Width() )
+            if( (nX + (int)maGeometry.nWidth + (int)maGeometry.nRightDecoration) > aScreenSize.Width() )
                 nX = aScreenSize.Width() - maGeometry.nWidth - maGeometry.nRightDecoration;
-            if( (nY + (long)maGeometry.nHeight + (long)maGeometry.nBottomDecoration) > (long)aScreenSize.Height() )
+            if( (nY + (int)maGeometry.nHeight + (int)maGeometry.nBottomDecoration) > aScreenSize.Height() )
                 nY = aScreenSize.Height() - maGeometry.nHeight - maGeometry.nBottomDecoration;
         }
         else
         {
-            if( nX + (long)maGeometry.nWidth < 10 )
-                nX = 10 - (long)maGeometry.nWidth;
-            if( nY + (long)maGeometry.nHeight < 10 )
-                nY = 10 - (long)maGeometry.nHeight;
-            if( nX > (long)aScreenSize.Width() - 10 )
-                nX = (long)aScreenSize.Width() - 10;
-            if( nY > (long)aScreenSize.Height() - 10 )
-                nY = (long)aScreenSize.Height() - 10;
+            if( nX + (int)maGeometry.nWidth < 10 )
+                nX = 10 - (int)maGeometry.nWidth;
+            if( nY + (int)maGeometry.nHeight < 10 )
+                nY = 10 - (int)maGeometry.nHeight;
+            if( nX > aScreenSize.Width() - 10 )
+                nX = aScreenSize.Width() - 10;
+            if( nY > aScreenSize.Height() - 10 )
+                nY = aScreenSize.Height() - 10;
         }
 
         if( nX != maGeometry.nX || nY != maGeometry.nY )
Index: unx/source/window/salframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/window/salframe.cxx,v
retrieving revision 1.219.110.3
diff -u -r1.219.110.3 salframe.cxx
--- openoffice.org.orig/vcl/unx/source/window/salframe.cxx	25 Jan 2008 16:37:31 -0000	1.219.110.3
+++ openoffice.org/unx/source/window/salframe.cxx	10 Mar 2008 15:32:43 -0000
@@ -1714,14 +1714,14 @@
                 }
                 
                 // adjust position so that frame fits onto screen
-                if( aPosSize.Right()+(long)aGeom.nRightDecoration > aScreenSize.Width()-1 )
-                    aPosSize.Move( (long)aScreenSize.Width() - (long)aPosSize.Right() - (long)aGeom.nRightDecoration, 0 );
-                if( aPosSize.Bottom()+(long)aGeom.nBottomDecoration > aScreenSize.Height()-1 )
-                    aPosSize.Move( 0, (long)aScreenSize.Height() - (long)aPosSize.Bottom() - (long)aGeom.nBottomDecoration );
-                if( aPosSize.Left() < (long)aGeom.nLeftDecoration )
-                    aPosSize.Move( (long)aGeom.nLeftDecoration - (long)aPosSize.Left(), 0 );
-                if( aPosSize.Top() < (long)aGeom.nTopDecoration )
-                    aPosSize.Move( 0, (long)aGeom.nTopDecoration - (long)aPosSize.Top() );
+                if( aPosSize.Right()+(int)aGeom.nRightDecoration > aScreenSize.Width()-1 )
+                    aPosSize.Move( aScreenSize.Width() - aPosSize.Right() - (int)aGeom.nRightDecoration, 0 );
+                if( aPosSize.Bottom()+(int)aGeom.nBottomDecoration > aScreenSize.Height()-1 )
+                    aPosSize.Move( 0, aScreenSize.Height() - aPosSize.Bottom() - (int)aGeom.nBottomDecoration );
+                if( aPosSize.Left() < (int)aGeom.nLeftDecoration )
+                    aPosSize.Move( (int)aGeom.nLeftDecoration - aPosSize.Left(), 0 );
+                if( aPosSize.Top() < (int)aGeom.nTopDecoration )
+                    aPosSize.Move( 0, (int)aGeom.nTopDecoration - aPosSize.Top() );
             }
             
             // resize with new args


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1443
retrieving revision 1.1444
diff -u -r1.1443 -r1.1444
--- openoffice.org.spec	10 Mar 2008 09:43:36 -0000	1.1443
+++ openoffice.org.spec	10 Mar 2008 15:44:25 -0000	1.1444
@@ -1,6 +1,6 @@
 %define oootag OOH680
 %define ooomilestone 10
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -145,6 +145,7 @@
 Patch71: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
 Patch72: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
 Patch73: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch74: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1103,6 +1104,7 @@
 %patch71 -p1 -b .ooo86080.unopkg.bodge.patch
 %patch72 -p1 -b .oooXXXXX.psprint.debugcups.patch
 %patch73 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch74 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2873,6 +2875,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Caolan McNamara  - 1:2.4.0-10.2
+- Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+
 * Sun Mar 09 2008 Caolan McNamara  - 1:2.4.0-10.1
 - next release candidate
 - rhbz#293791 Restore draw back to the menus and revert to upstream app names



From fedora-extras-commits at redhat.com  Mon Mar 10 15:45:28 2008
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 10 Mar 2008 15:45:28 GMT
Subject: rpms/ntp/devel ntp-4.2.4p4-ipv6.patch,NONE,1.1 ntp.spec,1.77,1.78
Message-ID: <200803101545.m2AFjSil016748@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16704

Modified Files:
	ntp.spec 
Added Files:
	ntp-4.2.4p4-ipv6.patch 
Log Message:
- fix building IPv6 support with new glibc-headers (#436713)


ntp-4.2.4p4-ipv6.patch:

--- NEW FILE ntp-4.2.4p4-ipv6.patch ---
diff -up ntp-4.2.4p4/configure.ipv6 ntp-4.2.4p4/configure
--- ntp-4.2.4p4/configure.ipv6	2008-03-10 13:39:45.000000000 +0100
+++ ntp-4.2.4p4/configure	2008-03-10 16:15:39.000000000 +0100
@@ -52780,15 +52780,19 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#define _GNU_SOURCE
 #include 
 #include 
 #include 
+;
 $isc_netinetin6_hack
 $isc_netinet6in6_hack
 
+;
 int
 main ()
 {
+;
 struct in6_pktinfo xyzzy; return (0);
   ;
   return 0;


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ntp.spec	29 Feb 2008 14:54:31 -0000	1.77
+++ ntp.spec	10 Mar 2008 15:44:55 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: Synchronizes system time using the Network Time Protocol (NTP)
 Name: ntp
 Version: 4.2.4p4
-Release: 4%{?dist}
+Release: 5%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -59,6 +59,7 @@
 Patch18: ntp-4.2.4p4-bcast.patch
 Patch19: ntp-4.2.4p0-retcode.patch
 Patch20: ntp-4.2.4p2-noif.patch
+Patch21: ntp-4.2.4p4-ipv6.patch
 
 URL: http://www.ntp.org
 Requires(pre): shadow-utils 
@@ -103,6 +104,7 @@
 %patch18 -p1 -b .bcast
 %patch19 -p1 -b .retcode
 %patch20 -p1 -b .noif
+%patch21 -p1 -b .ipv6
 
 %ifarch ia64
 %patch5 -p1 -b .linkfastmath
@@ -239,6 +241,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Miroslav Lichvar  4.2.4p4-5
+- fix building IPv6 support with new glibc-headers (#436713)
+
 * Fri Feb 29 2008 Miroslav Lichvar  4.2.4p4-4
 - reset kernel frequency when -x option is used
 - create separate init script for ntpdate



From fedora-extras-commits at redhat.com  Mon Mar 10 15:47:25 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 15:47:25 GMT
Subject: rpms/openoffice.org/F-8
	openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch,
	NONE, 1.1 openoffice.org.spec, 1.1349, 1.1350
Message-ID: <200803101547.m2AFlPTn016881@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16819

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch 
Log Message:
Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch

openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch:

--- NEW FILE openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch ---
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.72.8.2
diff -u -r1.72.8.2 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	23 Jan 2008 17:17:10 -0000	1.72.8.2
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	10 Mar 2008 15:32:32 -0000
@@ -1158,8 +1169,8 @@
 
     if( m_pParent )
     {
-        nX = ((long)m_pParent->maGeometry.nWidth - (long)maGeometry.nWidth)/2;
-        nY = ((long)m_pParent->maGeometry.nHeight - (long)maGeometry.nHeight)/2;
+        nX = ((int)m_pParent->maGeometry.nWidth - (int)maGeometry.nWidth)/2;
+        nY = ((int)m_pParent->maGeometry.nHeight - (int)maGeometry.nHeight)/2;
 
     }
     else
@@ -1191,8 +1202,8 @@
                     break;
                 }
         }
-        nX = nScreenX + (nScreenWidth - (long)maGeometry.nWidth)/2;
-        nY = nScreenY + (nScreenHeight - (long)maGeometry.nHeight)/2;
+        nX = nScreenX + (nScreenWidth - (int)maGeometry.nWidth)/2;
+        nY = nScreenY + (nScreenHeight - (int)maGeometry.nHeight)/2;
     }
     SetPosSize( nX, nY, 0, 0, SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y );
 }
@@ -1426,25 +1438,25 @@
         Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen ); 
         if( ! (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
         {
-            if( nX < (long)maGeometry.nLeftDecoration )
+            if( nX < (int)maGeometry.nLeftDecoration )
                 nX = maGeometry.nLeftDecoration;
-            if( nY < (long)maGeometry.nTopDecoration )
+            if( nY < (int)maGeometry.nTopDecoration )
                 nY = maGeometry.nTopDecoration;
-            if( (nX + (long)maGeometry.nWidth + (long)maGeometry.nRightDecoration) > (long)aScreenSize.Width() )
+            if( (nX + (int)maGeometry.nWidth + (int)maGeometry.nRightDecoration) > aScreenSize.Width() )
                 nX = aScreenSize.Width() - maGeometry.nWidth - maGeometry.nRightDecoration;
-            if( (nY + (long)maGeometry.nHeight + (long)maGeometry.nBottomDecoration) > (long)aScreenSize.Height() )
+            if( (nY + (int)maGeometry.nHeight + (int)maGeometry.nBottomDecoration) > aScreenSize.Height() )
                 nY = aScreenSize.Height() - maGeometry.nHeight - maGeometry.nBottomDecoration;
         }
         else
         {
-            if( nX + (long)maGeometry.nWidth < 10 )
-                nX = 10 - (long)maGeometry.nWidth;
-            if( nY + (long)maGeometry.nHeight < 10 )
-                nY = 10 - (long)maGeometry.nHeight;
-            if( nX > (long)aScreenSize.Width() - 10 )
-                nX = (long)aScreenSize.Width() - 10;
-            if( nY > (long)aScreenSize.Height() - 10 )
-                nY = (long)aScreenSize.Height() - 10;
+            if( nX + (int)maGeometry.nWidth < 10 )
+                nX = 10 - (int)maGeometry.nWidth;
+            if( nY + (int)maGeometry.nHeight < 10 )
+                nY = 10 - (int)maGeometry.nHeight;
+            if( nX > aScreenSize.Width() - 10 )
+                nX = aScreenSize.Width() - 10;
+            if( nY > aScreenSize.Height() - 10 )
+                nY = aScreenSize.Height() - 10;
         }
 
         if( nX != maGeometry.nX || nY != maGeometry.nY )
Index: unx/source/window/salframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/window/salframe.cxx,v
retrieving revision 1.219.110.3
diff -u -r1.219.110.3 salframe.cxx
--- openoffice.org.orig/vcl/unx/source/window/salframe.cxx	25 Jan 2008 16:37:31 -0000	1.219.110.3
+++ openoffice.org/unx/source/window/salframe.cxx	10 Mar 2008 15:32:43 -0000
@@ -1714,14 +1714,14 @@
                 }
                 
                 // adjust position so that frame fits onto screen
-                if( aPosSize.Right()+(long)aGeom.nRightDecoration > aScreenSize.Width()-1 )
-                    aPosSize.Move( (long)aScreenSize.Width() - (long)aPosSize.Right() - (long)aGeom.nRightDecoration, 0 );
-                if( aPosSize.Bottom()+(long)aGeom.nBottomDecoration > aScreenSize.Height()-1 )
-                    aPosSize.Move( 0, (long)aScreenSize.Height() - (long)aPosSize.Bottom() - (long)aGeom.nBottomDecoration );
-                if( aPosSize.Left() < (long)aGeom.nLeftDecoration )
-                    aPosSize.Move( (long)aGeom.nLeftDecoration - (long)aPosSize.Left(), 0 );
-                if( aPosSize.Top() < (long)aGeom.nTopDecoration )
-                    aPosSize.Move( 0, (long)aGeom.nTopDecoration - (long)aPosSize.Top() );
+                if( aPosSize.Right()+(int)aGeom.nRightDecoration > aScreenSize.Width()-1 )
+                    aPosSize.Move( aScreenSize.Width() - aPosSize.Right() - (int)aGeom.nRightDecoration, 0 );
+                if( aPosSize.Bottom()+(int)aGeom.nBottomDecoration > aScreenSize.Height()-1 )
+                    aPosSize.Move( 0, aScreenSize.Height() - aPosSize.Bottom() - (int)aGeom.nBottomDecoration );
+                if( aPosSize.Left() < (int)aGeom.nLeftDecoration )
+                    aPosSize.Move( (int)aGeom.nLeftDecoration - aPosSize.Left(), 0 );
+                if( aPosSize.Top() < (int)aGeom.nTopDecoration )
+                    aPosSize.Move( 0, (int)aGeom.nTopDecoration - aPosSize.Top() );
             }
             
             // resize with new args


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1349
retrieving revision 1.1350
diff -u -r1.1349 -r1.1350
--- openoffice.org.spec	9 Mar 2008 11:29:42 -0000	1.1349
+++ openoffice.org.spec	10 Mar 2008 15:46:33 -0000	1.1350
@@ -168,6 +168,7 @@
 Patch86: openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
 Patch87: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
 Patch88: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch89: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1131,6 +1132,7 @@
 %patch86 -p1 -b .ooo85931.svx.getentrypos.patch
 %patch87 -p1 -b .ooo83878.unopkg.enablelinking.patch
 %patch88 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch89 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2852,6 +2854,7 @@
 - Resolves: rhbz#429897 one click print with lpr-only backend fix
 - Resolves: rhbz#431606 require jre not java
 - Resolves: rhbz#431805 openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
+- Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
 - add openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
 - add openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
 



From fedora-extras-commits at redhat.com  Mon Mar 10 15:47:29 2008
From: fedora-extras-commits at redhat.com (Lillian Angel (langel))
Date: Mon, 10 Mar 2008 15:47:29 GMT
Subject: rpms/java-1.6.0-openjdk/devel .cvsignore,1.3,1.4
Message-ID: <200803101547.m2AFlTG9016888@cvs-int.fedora.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16815

Modified Files:
	.cvsignore 
Log Message:
Updated cvsignore




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Mar 2008 15:11:44 -0000	1.3
+++ .cvsignore	10 Mar 2008 15:46:50 -0000	1.4
@@ -1,6 +1,5 @@
 java-access-bridge-1.19.2.tar.gz
 mauve-2007-09-12.tar.gz
 openjdk-6-src-b06-28_feb_2008-fedora.tar.gz
-icedtea6-1.0-3547877ecc7bb77b74983190d1ba3f06dce7e16b.tar.gz
 mauve_tests
 icedtea6-1.0-e96715b7deaa5bdf2c756248b3d0f8e901ae208c.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 15:49:08 2008
From: fedora-extras-commits at redhat.com (Ray Strode (rstrode))
Date: Mon, 10 Mar 2008 15:49:08 GMT
Subject: rpms/gdm/F-8 gdm-2.20.3-cap-user-list-length.patch, NONE,
	1.1 gdm.spec, 1.317, 1.318
Message-ID: <200803101549.m2AFn8qb016978@cvs-int.fedora.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16937

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.20.3-cap-user-list-length.patch 
Log Message:
- Cap user list to 1000 users (bug 383051)


gdm-2.20.3-cap-user-list-length.patch:

--- NEW FILE gdm-2.20.3-cap-user-list-length.patch ---
diff -up gdm-2.20.3/gui/gdmuser.c.cap-user-list-length gdm-2.20.3/gui/gdmuser.c
--- gdm-2.20.3/gui/gdmuser.c.cap-user-list-length	2008-03-10 11:43:49.000000000 -0400
+++ gdm-2.20.3/gui/gdmuser.c	2008-03-10 11:43:53.000000000 -0400
@@ -266,7 +266,7 @@ setup_user (struct passwd *pwent,
 	    gboolean read_faces)
 {
     GdmUser *user;
-    int cnt = 0;
+    static int cnt = 0;
 
     if (pwent->pw_shell && 
 	gdm_check_shell (pwent->pw_shell) &&


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-8/gdm.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- gdm.spec	8 Jan 2008 15:35:28 -0000	1.317
+++ gdm.spec	10 Mar 2008 15:48:30 -0000	1.318
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -65,6 +65,9 @@
 # FIXME need to file upstream and get fixed in 2.20
 Patch44: gdm-2.18.4-tcp-wrappers.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=383051
+Patch45: gdm-2.20.3-cap-user-list-length.patch
+
 Patch100: gdm-2.20.2-change-defaults.patch
 Patch101: stupid-bullets.patch
 
@@ -154,6 +157,7 @@
 %patch41 -p1 -b .pixbuf-ref
 %patch43 -p1 -b .keymouselistener-segfault
 %patch44 -p1 -b .tcp-wrappers
+%patch45 -p1 -b .cap-user-list-length
 
 %patch100 -p1 -b .change-defaults
 %patch101 -p1 -b .stupid-bullets
@@ -368,6 +372,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Mon Mar 10 2008 Ray Strode  - 1:2.20.3-2
+- Cap user list to 1000 users (bug 383051)
+
 * Tue Jan 08 2008 - Bastien Nocera  - 1:2.20.3-1
 - Update to 2.20.3
 - Remove obsolete patches



From fedora-extras-commits at redhat.com  Mon Mar 10 16:01:19 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 16:01:19 GMT
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch, NONE,
	1.1.2.1 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch,
	1.1, 1.1.2.1 openoffice.org.spec, 1.1440.2.9, 1.1440.2.10
Message-ID: <200803101601.m2AG1JfC024313@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17247

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 
	openoffice.org.spec 
Added Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch 
Log Message:
merge

openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch:

--- NEW FILE openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch ---
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.72.8.2
diff -u -r1.72.8.2 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	23 Jan 2008 17:17:10 -0000	1.72.8.2
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	10 Mar 2008 15:32:32 -0000
@@ -1158,8 +1169,8 @@
 
     if( m_pParent )
     {
-        nX = ((long)m_pParent->maGeometry.nWidth - (long)maGeometry.nWidth)/2;
-        nY = ((long)m_pParent->maGeometry.nHeight - (long)maGeometry.nHeight)/2;
+        nX = ((int)m_pParent->maGeometry.nWidth - (int)maGeometry.nWidth)/2;
+        nY = ((int)m_pParent->maGeometry.nHeight - (int)maGeometry.nHeight)/2;
 
     }
     else
@@ -1191,8 +1202,8 @@
                     break;
                 }
         }
-        nX = nScreenX + (nScreenWidth - (long)maGeometry.nWidth)/2;
-        nY = nScreenY + (nScreenHeight - (long)maGeometry.nHeight)/2;
+        nX = nScreenX + (nScreenWidth - (int)maGeometry.nWidth)/2;
+        nY = nScreenY + (nScreenHeight - (int)maGeometry.nHeight)/2;
     }
     SetPosSize( nX, nY, 0, 0, SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y );
 }
@@ -1426,25 +1438,25 @@
         Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen ); 
         if( ! (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
         {
-            if( nX < (long)maGeometry.nLeftDecoration )
+            if( nX < (int)maGeometry.nLeftDecoration )
                 nX = maGeometry.nLeftDecoration;
-            if( nY < (long)maGeometry.nTopDecoration )
+            if( nY < (int)maGeometry.nTopDecoration )
                 nY = maGeometry.nTopDecoration;
-            if( (nX + (long)maGeometry.nWidth + (long)maGeometry.nRightDecoration) > (long)aScreenSize.Width() )
+            if( (nX + (int)maGeometry.nWidth + (int)maGeometry.nRightDecoration) > aScreenSize.Width() )
                 nX = aScreenSize.Width() - maGeometry.nWidth - maGeometry.nRightDecoration;
-            if( (nY + (long)maGeometry.nHeight + (long)maGeometry.nBottomDecoration) > (long)aScreenSize.Height() )
+            if( (nY + (int)maGeometry.nHeight + (int)maGeometry.nBottomDecoration) > aScreenSize.Height() )
                 nY = aScreenSize.Height() - maGeometry.nHeight - maGeometry.nBottomDecoration;
         }
         else
         {
-            if( nX + (long)maGeometry.nWidth < 10 )
-                nX = 10 - (long)maGeometry.nWidth;
-            if( nY + (long)maGeometry.nHeight < 10 )
-                nY = 10 - (long)maGeometry.nHeight;
-            if( nX > (long)aScreenSize.Width() - 10 )
-                nX = (long)aScreenSize.Width() - 10;
-            if( nY > (long)aScreenSize.Height() - 10 )
-                nY = (long)aScreenSize.Height() - 10;
+            if( nX + (int)maGeometry.nWidth < 10 )
+                nX = 10 - (int)maGeometry.nWidth;
+            if( nY + (int)maGeometry.nHeight < 10 )
+                nY = 10 - (int)maGeometry.nHeight;
+            if( nX > aScreenSize.Width() - 10 )
+                nX = aScreenSize.Width() - 10;
+            if( nY > aScreenSize.Height() - 10 )
+                nY = aScreenSize.Height() - 10;
         }
 
         if( nX != maGeometry.nX || nY != maGeometry.nY )
Index: unx/source/window/salframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/window/salframe.cxx,v
retrieving revision 1.219.110.3
diff -u -r1.219.110.3 salframe.cxx
--- openoffice.org.orig/vcl/unx/source/window/salframe.cxx	25 Jan 2008 16:37:31 -0000	1.219.110.3
+++ openoffice.org/unx/source/window/salframe.cxx	10 Mar 2008 15:32:43 -0000
@@ -1714,14 +1714,14 @@
                 }
                 
                 // adjust position so that frame fits onto screen
-                if( aPosSize.Right()+(long)aGeom.nRightDecoration > aScreenSize.Width()-1 )
-                    aPosSize.Move( (long)aScreenSize.Width() - (long)aPosSize.Right() - (long)aGeom.nRightDecoration, 0 );
-                if( aPosSize.Bottom()+(long)aGeom.nBottomDecoration > aScreenSize.Height()-1 )
-                    aPosSize.Move( 0, (long)aScreenSize.Height() - (long)aPosSize.Bottom() - (long)aGeom.nBottomDecoration );
-                if( aPosSize.Left() < (long)aGeom.nLeftDecoration )
-                    aPosSize.Move( (long)aGeom.nLeftDecoration - (long)aPosSize.Left(), 0 );
-                if( aPosSize.Top() < (long)aGeom.nTopDecoration )
-                    aPosSize.Move( 0, (long)aGeom.nTopDecoration - (long)aPosSize.Top() );
+                if( aPosSize.Right()+(int)aGeom.nRightDecoration > aScreenSize.Width()-1 )
+                    aPosSize.Move( aScreenSize.Width() - aPosSize.Right() - (int)aGeom.nRightDecoration, 0 );
+                if( aPosSize.Bottom()+(int)aGeom.nBottomDecoration > aScreenSize.Height()-1 )
+                    aPosSize.Move( 0, aScreenSize.Height() - aPosSize.Bottom() - (int)aGeom.nBottomDecoration );
+                if( aPosSize.Left() < (int)aGeom.nLeftDecoration )
+                    aPosSize.Move( (int)aGeom.nLeftDecoration - aPosSize.Left(), 0 );
+                if( aPosSize.Top() < (int)aGeom.nTopDecoration )
+                    aPosSize.Move( 0, (int)aGeom.nTopDecoration - aPosSize.Top() );
             }
             
             // resize with new args

openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch:

Index: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch	1 Aug 2007 12:04:00 -0000	1.1
+++ openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch	10 Mar 2008 16:00:23 -0000	1.1.2.1
@@ -108,3 +108,18 @@
      {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB,
       AUTOLAYOUT_OBJ},
      {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB,
+Index: source/token/tokens.txt
+===================================================================
+RCS file: /cvs/xml/oox/source/token/tokens.txt,v
+retrieving revision 1.2
+diff -u -r1.2 tokens.txt
+--- openoffice.org.orig/oox/source/token/tokens.txt	17 Jan 2008 08:06:07 -0000	1.2
++++ openoffice.org/oox/source/token/tokens.txt	10 Mar 2008 15:57:51 -0000
+@@ -2431,6 +2431,7 @@
+ handoutMasterId
+ handoutMasterIdLst
+ handoutView
++handouts
+ handouts1
+ handouts2
+ handouts3


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.9
retrieving revision 1.1440.2.10
diff -u -r1.1440.2.9 -r1.1440.2.10
--- openoffice.org.spec	10 Mar 2008 10:48:46 -0000	1.1440.2.9
+++ openoffice.org.spec	10 Mar 2008 16:00:23 -0000	1.1440.2.10
@@ -142,6 +142,7 @@
 Patch68: workspace.cmcfixes43.patch
 Patch69: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 Patch70: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch71: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
 
 %define instdir %{_libdir}/openoffice.org
 %define OFFICEUPD 300
@@ -1100,6 +1101,7 @@
 %patch68 -p1 -b .workspace.cmcfixes43.patch
 %patch69 -p1 -b .ooo86588.sw.buildfix.patch
 %patch70 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch71 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2880,6 +2882,15 @@
 - add workspace.cmcfixes43.patch
 - add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 
+* Mon Mar 10 2008 Caolan McNamara  - 1:2.4.0-10.2
+- Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+
+* Sun Mar 09 2008 Caolan McNamara  - 1:2.4.0-10.1
+- next release candidate
+- rhbz#293791 Restore draw back to the menus and revert to upstream app names
+- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+
 * Sun Mar 09 2008 Caolan McNamara  - 1:2.4.0-10.1
 - next release candidate
 - rhbz#293791 Restore draw back to the menus and revert to upstream app names



From fedora-extras-commits at redhat.com  Mon Mar 10 16:03:18 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 16:03:18 GMT
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.10,
	1.1440.2.11
Message-ID: <200803101603.m2AG3Iu8024499@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24454

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Log Message:
merge


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.10
retrieving revision 1.1440.2.11
diff -u -r1.1440.2.10 -r1.1440.2.11
--- openoffice.org.spec	10 Mar 2008 16:00:23 -0000	1.1440.2.10
+++ openoffice.org.spec	10 Mar 2008 16:02:29 -0000	1.1440.2.11
@@ -2871,7 +2871,7 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
-* Sun Mar 09 2008 Caolan McNamara  - 1:3.0.0-0.1.1
+* Mon Mar 10 2008 Caolan McNamara  - 1:3.0.0-0.1.1
 - extend selinux bodge to ia64 
 - drop integrated workspace.notes2.patch
 - drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch



From fedora-extras-commits at redhat.com  Mon Mar 10 16:03:40 2008
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Mon, 10 Mar 2008 16:03:40 GMT
Subject: rpms/kdelibs3/devel kdelibs-3.5.9-kate-regression.patch,1.1,1.2
Message-ID: <200803101603.m2AG3etW024554@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	kdelibs-3.5.9-kate-regression.patch 
Log Message:


kdelibs-3.5.9-kate-regression.patch:

Index: kdelibs-3.5.9-kate-regression.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs-3.5.9-kate-regression.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-3.5.9-kate-regression.patch	10 Mar 2008 09:51:15 -0000	1.1
+++ kdelibs-3.5.9-kate-regression.patch	10 Mar 2008 16:03:32 -0000	1.2
@@ -1,5 +1,5 @@
---- 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/08 14:17:43	772352
-+++ 3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:02:18	777286
+--- kdelibs/kate/part/katesupercursor.cpp	2008/02/08 14:17:43	772352
++++ kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:02:18	777286
 @@ -186,7 +186,7 @@
  {
    if (newLine)



From fedora-extras-commits at redhat.com  Mon Mar 10 16:14:30 2008
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 10 Mar 2008 16:14:30 GMT
Subject: rpms/telepathy-glib/devel telepathy-glib.spec,1.10,1.11
Message-ID: <200803101614.m2AGEUmj024789@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24762

Modified Files:
	telepathy-glib.spec 
Log Message:
* Mon Mar 10 2008 Brian Pepple  - 0.7.5-2
- Add requires for glib2-devel to devel package. (#436773)



Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- telepathy-glib.spec	7 Mar 2008 17:07:50 -0000	1.10
+++ telepathy-glib.spec	10 Mar 2008 16:13:50 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           telepathy-glib
 Version:        0.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GLib bindings for Telepathy
 
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@
 BuildRequires:  gtk-doc
 BuildRequires:  dbus-devel >= 0.95
 BuildRequires:	dbus-glib-devel >= 0.73
+BuildRequires:	glib2-devel >= 2.10
 BuildRequires:	libxslt
 BuildRequires:	python
 
@@ -27,8 +28,9 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	telepathy-filesystem
-Requires:	dbus-devel
-Requires:	dbus-glib-devel
+Requires:	dbus-devel >= 0.95
+Requires:	dbus-glib-devel >= 0.73
+Requires:	glib2-devel >= 2.10
 Requires:	pkgconfig
 
 
@@ -81,6 +83,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Brian Pepple  - 0.7.5-2
+- Add requires for glib2-devel to devel package. (#436773)
+
 * Fri Mar  7 2008 Brian Pepple  - 0.7.5-1
 - Update to 0.7.5.
 - Remove hack to fix ppc64 build.  fixed upstream.



From fedora-extras-commits at redhat.com  Mon Mar 10 16:18:26 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 16:18:26 GMT
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1444,1.1445
Message-ID: <200803101618.m2AGIQ10024912@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24869

Modified Files:
	openoffice.org.spec 
Log Message:
perl-Compress-Zlib subsumed


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1444
retrieving revision 1.1445
diff -u -r1.1444 -r1.1445
--- openoffice.org.spec	10 Mar 2008 15:44:25 -0000	1.1444
+++ openoffice.org.spec	10 Mar 2008 16:17:30 -0000	1.1445
@@ -56,18 +56,17 @@
 Source4:	http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz
 Source5:        http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
-BuildRequires:	zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
-BuildRequires:  perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, bc
-BuildRequires:	gdb, %{java_devel}, zlib-devel, vigra-devel, hsqldb, libXt-devel
-BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
-BuildRequires:	libcurl-devel, boost-devel, python-devel, expat-devel
-BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
-BuildRequires:	libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
-BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
-BuildRequires:  libxslt-devel, db4-devel, xulrunner-devel, libwpd-devel, 
-BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel, nss-devel >= 3.11.7-8
-BuildRequires:  xerces-j2, hyphen-devel, openssl-devel
+BuildRequires:	zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++, gdb
+BuildRequires:	binutils, %{java_devel}, boost-devel, zlib-devel, vigra-devel
+BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
+BuildRequires:	neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
+BuildRequires:	libXt-devel, libICE-devel, libjpeg-devel, db4-devel, 
+BuildRequires:	xulrunner-devel, libwpd-devel, hunspell-devel, unixODBC-devel
+BuildRequires:	sane-backends-devel, libicu-devel, perl-Archive-Zip, 
+BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, desktop-file-utils
+BuildRequires:	evolution-data-server-devel, libtextcat-devel, nss-devel
+BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel,
+BuildRequires:	openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh



From fedora-extras-commits at redhat.com  Mon Mar 10 16:22:38 2008
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Mon, 10 Mar 2008 16:22:38 GMT
Subject: rpms/epiphany/devel .cvsignore, 1.68, 1.69 epiphany.spec, 1.184,
	1.185 sources, 1.70, 1.71
Message-ID: <200803101622.m2AGMcZK025019@cvs-int.fedora.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
* Mon Mar 10 2008 Christopher Aillon  - 2.22.0-1
- Update to 2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	26 Feb 2008 05:37:11 -0000	1.68
+++ .cvsignore	10 Mar 2008 16:22:02 -0000	1.69
@@ -1 +1 @@
-epiphany-2.21.92.tar.bz2
+epiphany-2.22.0.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- epiphany.spec	8 Mar 2008 01:47:20 -0000	1.184
+++ epiphany.spec	10 Mar 2008 16:22:02 -0000	1.185
@@ -7,8 +7,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.21.92
-Release: 3%{?dist}
+Version: 2.22.0
+Release: 1%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -217,6 +217,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Mar 10 2008 Christopher Aillon  - 2.22.0-1
+- Update to 2.22.0
+
 * Fri Mar  7 2008 Christopher Aillon  - 2.21.92-3
 - Update the xulrunner patch and tweak the useragent
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	26 Feb 2008 05:37:11 -0000	1.70
+++ sources	10 Mar 2008 16:22:02 -0000	1.71
@@ -1 +1 @@
-2e0199851122ecb9d5f2863d92e18aa8  epiphany-2.21.92.tar.bz2
+81ad67d1ad706930a295a7ed9887bf5f  epiphany-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 16:27:08 2008
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Mar 2008 16:27:08 GMT
Subject: rpms/kdeartwork/F-8 kdeartwork.spec,1.64,1.65
Message-ID: <200803101627.m2AGR8Tl025166@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25130

Modified Files:
	kdeartwork.spec 
Log Message:
rhel fixes (no xscreensaver)



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-8/kdeartwork.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kdeartwork.spec	16 Feb 2008 22:15:52 -0000	1.64
+++ kdeartwork.spec	10 Mar 2008 16:26:30 -0000	1.65
@@ -1,6 +1,8 @@
 
 ## Conditional build:
+%if 0%{?fedora}
 %define _with_xscreensaver --with-xscreensaver
+%endif
 
 %define final 1 
 



From fedora-extras-commits at redhat.com  Mon Mar 10 16:29:49 2008
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 10 Mar 2008 16:29:49 GMT
Subject: rpms/perl-Log-Trivial/devel perl-Log-Trivial.spec,1.1,1.2
Message-ID: <200803101629.m2AGTnLM025273@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/perl-Log-Trivial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25226

Modified Files:
	perl-Log-Trivial.spec 
Log Message:
* Mon Mar 10 2008 Orion Poplawski  0.31-2
- Rebuild for perl 5.10



Index: perl-Log-Trivial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Trivial/devel/perl-Log-Trivial.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Trivial.spec	26 Feb 2008 17:55:35 -0000	1.1
+++ perl-Log-Trivial.spec	10 Mar 2008 16:29:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Log-Trivial
 Version:        0.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Very simple tool for writing very simple log files
 License:        GPLv3+
 Group:          Development/Libraries
@@ -55,5 +55,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Mar 10 2008 Orion Poplawski  0.31-2
+- Rebuild for perl 5.10
+
 * Fri Feb 22 2008 Orion Poplawski  0.31-1
 - Specfile autogenerated by cpanspec 1.74.



From fedora-extras-commits at redhat.com  Mon Mar 10 16:29:59 2008
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 10 Mar 2008 16:29:59 GMT
Subject: rpms/texlive-texmf/devel sources, 1.4, 1.5 texlive-texmf.spec, 1.19,
	1.20 texlive.2007.ls-R, 1.1, 1.2 texlive.2007.zip.list, 1.3, 1.4
Message-ID: <200803101629.m2AGTxZJ025313@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/texlive-texmf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25252

Modified Files:
	sources texlive-texmf.spec texlive.2007.ls-R 
	texlive.2007.zip.list 
Log Message:
* Mon Mar 10 2008 Jindrich Novy  - 2007-17
- add styles from upstream collection-latexextra to have more
  complete LaTeX distribution (#436180)
- move tex-preview dependency to texlive-texmf-latex (#436699)
- remove tex4ht completely from lists
- regenerate ls-Rs



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2008 16:45:06 -0000	1.4
+++ sources	10 Mar 2008 16:29:26 -0000	1.5
@@ -2,4 +2,4 @@
 c24f99d1fd399acecc2f3070c23f43f1  platex209.tar.bz2
 9eb48ecb66cfd626865222564545de1c  ptex-texmf-2.5.tar.gz
 97c26c0067177fb633616f8611561bc7  texlive.texmf-var-2007.zip
-64d27853026b019f14b8b277864e999d  texlive.texmf-2007.tar.lzma
+4293cc193a7352544119a6d7cf723105  texlive.texmf-2007.tar.lzma


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- texlive-texmf.spec	3 Mar 2008 16:45:06 -0000	1.19
+++ texlive-texmf.spec	10 Mar 2008 16:29:26 -0000	1.20
@@ -12,7 +12,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -62,10 +62,6 @@
 BuildRequires:  sed >= 3.95 ghostscript lzma
 
 Requires:	texlive-texmf-errata = %{version}
-%if !%{f8_packaging}
-Requires:	tex-preview
-%endif
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -126,6 +122,11 @@
 Summary:	Texmf files needed for texlive-latex
 Requires:	texlive-texmf = %{version}-%{release}
 Requires:	texlive-texmf-errata-latex = %{version}
+%if !%{f8_packaging}
+Requires:	tex-preview
+%else
+Requires:	tetex-preview
+%endif
 
 %description latex
 This package contains the components of the TEXMF tree needed for the
@@ -402,15 +403,11 @@
 # remove win32 dvipdfm file
 rm %{buildroot}%{_texmf_main}/dvipdfm/config/config-win32
 
-# remove tex4ht, it's packaged separately (#411501)
-rm -rf %{buildroot}%{_texmf_main}/tex/generic/tex4ht
-rm -rf %{buildroot}%{_texmf_main}/tex4ht
-
-%if !%{f8_packaging}
 # remove preview, it's now packaged separately (#425805)
 rm -rf %{buildroot}%{_texmf_main}/tex/latex/preview/
 rm -rf %{buildroot}%{_texmf_main}/doc/latex/preview/
 
+%if !%{f8_packaging}
 # remove $TEXMFMAIN/tex/texinfo to not to clash with texinfo (#226488)
 rm -rf %{buildroot}%{_texmf_main}/tex/texinfo/
 %endif
@@ -515,12 +512,15 @@
 %{_texmf_main}/metapost/config/
 %{_texmf_main}/metapost/mfpic/
 %{_texmf_main}/metapost/misc/
+%{_texmf_main}/metapost/makecirc/
 %{_texmf_main}/metapost/mpattern/
 %{_texmf_main}/metapost/support/
+%{_texmf_main}/metapost/texpower/
 %{_texmf_main}/omega/
 %{_texmf_main}/scripts/hyphen/
 %{_texmf_main}/scripts/oberdiek/
 %{_texmf_main}/scripts/pkfix/
+%{_texmf_main}/scripts/ppower4/
 %{_texmf_main}/scripts/ps2eps/
 %{_texmf_main}/texconfig/
 %dir %{_texmf_main}/tex
@@ -550,10 +550,8 @@
 # will result in a couple files being owned by texmf and texmf-fonts
 #  texmf/tex/generic/babel/{frenchb.cfg,hyphen.cfg}
 #  Not really worth worrying about.
-%{_texmf_main}/tex/generic/b*/
-%{_texmf_main}/tex/generic/config/
-%{_texmf_main}/tex/generic/[d-h]*/
-%{_texmf_main}/tex/generic/[m-o]*/
+%{_texmf_main}/tex/generic/[a-h]*/
+%{_texmf_main}/tex/generic/[j-o]*/
 %{_texmf_main}/tex/generic/p[a-f]*/
 %{_texmf_main}/tex/generic/pgf/basiclayer/
 %{_texmf_main}/tex/generic/pgf/frontendlayer/
@@ -730,6 +728,13 @@
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Mon Mar 10 2008 Jindrich Novy  - 2007-17
+- add styles from upstream collection-latexextra to have more
+  complete LaTeX distribution (#436180)
+- move tex-preview dependency to texlive-texmf-latex (#436699)
+- remove tex4ht completely from lists
+- regenerate ls-Rs
+
 * Mon Mar 03 2008 Jindrich Novy  - 2007-16
 - update texlive package list to ship complete upstream XeTeX
   TeXLive distribution


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 texlive.2007.ls-R
Index: texlive.2007.ls-R
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive.2007.ls-R,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- texlive.2007.ls-R	28 Jan 2008 07:23:26 -0000	1.1
+++ texlive.2007.ls-R	10 Mar 2008 16:29:26 -0000	1.2
@@ -36,13 +36,18 @@
 base
 bibtopic
 camel
+directory
 dk-bib
 dtk
+figbib
+geomsty
 gloss
 gustlib
 index
 jurabib
+lsc
 minitoc
+msc
 revtex
 
 ./bibtex/bib/adrconv:
@@ -58,6 +63,10 @@
 ./bibtex/bib/camel:
 camel.bib
 
+./bibtex/bib/directory:
+business.bib
+family.bib
+
 ./bibtex/bib/dk-bib:
 litteratur.bib
 
@@ -65,6 +74,12 @@
 beispiel.bib
 dtk.bib
 
+./bibtex/bib/figbib:
+figbib_sample.bib
+
+./bibtex/bib/geomsty:
+manual.bib
+
 ./bibtex/bib/gloss:
 glsbase.bib
 sample.bib
@@ -81,32 +96,52 @@
 jbtest.bib
 jbtesthu.bib
 
+./bibtex/bib/lsc:
+lsc.bib
+
 ./bibtex/bib/minitoc:
 fminitoc.bib
 minitoc.bib
 mtc-add.bib
 
+./bibtex/bib/msc:
+biblio.bib
+
 ./bibtex/bib/revtex:
 apssamp.bib
 
 ./bibtex/bst:
+achemso
 adrconv
 aguplus
 ams
+babelbib
 base
 camel
 context
+directory
 dk-bib
 dtk
+figbib
 germbib
 gloss
 gustlib
+hc
 index
 jurabib
 minitoc
+mslapa
 multibib
 natbib
+opcit
+oxford
 revtex
+savetrees
+smflatex
+
+./bibtex/bst/achemso:
+achemso.bst
+achemsol.bst
 
 ./bibtex/bst/adrconv:
 adrconv.bst
@@ -127,6 +162,27 @@
 amsru.bst
 amsry.bst
 
+./bibtex/bst/babelbib:
+bababbr3.bst
+bababbr3-fl.bst
+bababbr3-lf.bst
+bababbrv.bst
+bababbrv-fl.bst
+bababbrv-lf.bst
+babalpha.bst
+babalpha-fl.bst
+babalpha-lf.bst
+babamspl.bst
+babplai3.bst
+babplai3-fl.bst
+babplai3-lf.bst
+babplain.bst
+babplain-fl.bst
+babplain-lf.bst
+babunsrt.bst
+babunsrt-fl.bst
+babunsrt-lf.bst
+
 ./bibtex/bst/base:
 abbrv.bst
 acm.bst
@@ -146,6 +202,17 @@
 cont-no.bst
 cont-ti.bst
 
+./bibtex/bst/directory:
+address.bst
+address-html.bst
+address-ldif.bst
+address-vcard.bst
+birthday.bst
+email.bst
+email-html.bst
+letter.bst
+phone.bst
+
 ./bibtex/bst/dk-bib:
 dk-abbrv.bst
 dk-alpha.bst
@@ -156,6 +223,10 @@
 ./bibtex/bst/dtk:
 dtk.bst
 
+./bibtex/bst/figbib:
+figbib1.bst
+figbib.bst
+
 ./bibtex/bst/germbib:
 gerabbrv.bst
 geralpha.bst
@@ -173,6 +244,10 @@
 plplain.bst
 plunsrt.bst
 
+./bibtex/bst/hc:
+hc-de.bst
+hc-en.bst
+
 ./bibtex/bst/index:
 xagsm.bst
 xplain.bst
@@ -187,6 +262,9 @@
 en-mtc.bst
 fr-mtc.bst
 
+./bibtex/bst/mslapa:
+mslapa.bst
+
 ./bibtex/bst/multibib:
 mbplain.bst
 
@@ -195,10 +273,25 @@
 plainnat.bst
 unsrtnat.bst
 
+./bibtex/bst/opcit:
+opcit.bst
+
+./bibtex/bst/oxford:
+oxford_en.bst
+oxford_in.bst
+oxford_se.bst
+
 ./bibtex/bst/revtex:
 apsrev.bst
 apsrmp.bst
 
+./bibtex/bst/savetrees:
+savetrees.bst
[...9216 lines suppressed...]
+
 ./tex/latex/xkeyval:
 keyval.tex
 pst-xkey.sty
@@ -25063,12 +23022,26 @@
 xkvtxhdr.tex
 xkvview.sty
 
+./tex/latex/xmpincl:
+xmpincl.sty
+
 ./tex/latex/xtab:
 xtab.sty
 
+./tex/latex/xytree:
+xytree.sty
+
+./tex/latex/yafoot:
+dblfnote.sty
+fnpos.sty
+pfnote.sty
+
 ./tex/latex/yfonts:
 yfonts.sty
 
+./tex/latex/yplan:
+yplan.sty
+
 ./tex/latex/zapfchan:
 8ruzc.fd
 omluzc.fd
@@ -25080,6 +23053,9 @@
 ./tex/latex/zapfding:
 uuzd.fd
 
+./tex/latex/zed-csp:
+zed-csp.sty
+
 ./tex/latex/zefonts:
 omlzer.fd
 omszer.fd
@@ -25120,9 +23096,11 @@
 antt
 armenian
 base
+calendar
 config
 cweb
 cyrplain
+esint-type1
 etex
 fp
 gustlib
@@ -25130,6 +23108,7 @@
 levy
 misc
 omega
+patch
 pgf
 plgraph
 plnfss
@@ -25168,6 +23147,17 @@
 webmac.tex
 wlist.tex
 
+./tex/plain/calendar:
+a5.sty
+a6.sty
+block.sty
+calend0.tex
+calend1.tex
+feasts.tex
+moon.tex
+sun.tex
+wall.sty
+
 ./tex/plain/config:
 aleph.ini
 bplain.ini
@@ -25204,6 +23194,9 @@
 txxdefs.tex
 txxextra.tex
 
+./tex/plain/esint-type1:
+esint.tex
+
 ./tex/plain/etex:
 etexdefs.lib
 etex.src
@@ -25270,6 +23263,9 @@
 grlccode.tex
 omega.tex
 
+./tex/plain/patch:
+patch.tex
+
 ./tex/plain/pgf:
 basiclayer
 frontendlayer
@@ -25358,6 +23354,7 @@
 platex-pl.ini
 
 ./tex/texinfo:
+texinfo.ini
 texinfo.tex
 txi-cs.tex
 txi-de.tex
@@ -25369,19 +23366,42 @@
 txi-no.tex
 txi-pl.tex
 txi-pt.tex
-txi-ru.tex
-txi-sr.tex
 txi-tr.tex
-txi-uk.tex
 
 ./tex/xelatex:
+euenc
+fontspec
 graphics
+philokalia
 xetexconfig
 xetexurl
+xltxtra
+xunicode
+
+./tex/xelatex/euenc:
+eu1enc.def
+lm
+
+./tex/xelatex/euenc/lm:
+eu1lmdh.fd
+eu1lmr.fd
+eu1lmss.fd
+eu1lmssq.fd
+eu1lmtt.fd
+eu1lmvtt.fd
+
+./tex/xelatex/fontspec:
+fontspec.cfg
+fontspec-doc-style.sty
+fontspec.sty
 
 ./tex/xelatex/graphics:
 xetex.def
 
+./tex/xelatex/philokalia:
+eu1plk.fd
+philokalia.sty
+
 ./tex/xelatex/xetexconfig:
 crop.cfg
 geometry.cfg
@@ -25389,6 +23409,12 @@
 ./tex/xelatex/xetexurl:
 url.sty
 
+./tex/xelatex/xltxtra:
+xltxtra.sty
+
+./tex/xelatex/xunicode:
+xunicode.sty
+
 ./texconfig:
 g
 generic
@@ -25434,7 +23460,6 @@
 cp852-pl.tcx
 cp8bit.tcx
 empty.tcx
-etex
 fmtutil.cnf
 il1-t1.tcx
 il2-cs.tcx
@@ -25454,25 +23479,15 @@
 mktexupd
 natural.tcx
 omega.pool
-pdfetex
 pdftex.pool
 ptex.pool
 tcvn-t5.tcx
 texmf.cnf
 tex.pool
 updmap.cfg
-updmap.cfg.old
 viscii-t5.tcx
 xetex.pool
 
-./web2c/etex:
-jadetex.fmt
-jadetex.log
-
-./web2c/pdfetex:
-pdfjadetex.fmt
-pdfjadetex.log
-
 ./xdvi:
 pixmaps
 XDvi


Index: texlive.2007.zip.list
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive.2007.zip.list,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- texlive.2007.zip.list	3 Mar 2008 16:45:06 -0000	1.3
+++ texlive.2007.zip.list	10 Mar 2008 16:29:26 -0000	1.4
@@ -1,30 +1,42 @@
+a0poster.zip
 aastex.zip
 abc.zip
 abstract.zip
+achemso.zip
 acronym.zip
 adrconv.zip
+adrlist.zip
 aeguill.zip
 ae.zip
 aguplus.zip
+akletter.zip
 albertus.zip
 algorithms.zip
+altfont.zip
 amscls.zip
 amsfonts.zip
 amsmath.zip
 amsrefs.zip
 amstex.zip
 ams.zip
+answers.zip
 antp.zip
 antt.zip
 anysize.zip
 apl.zip
 appendix.zip
 arabtex.zip
+arcs.zip
 armenian.zip
+arrayjob.zip
+assignment.zip
 atqolive.zip
+attachfile.zip
+authorindex.zip
+autotab.zip
 avantgar.zip
-babel.zip
 babelbib.zip
+babel.zip
 barcode2.zip
 bbm.zip
 bbold.zip
@@ -32,6 +44,7 @@
 begriff.zip
 belleek.zip
 beton.zip
+bez123.zip
 bezos.zip
 bghyphen.zip
 bibleref.zip
@@ -45,14 +58,17 @@
 bin-cweb.zip
 bin-cyrillic.zip
 bin-dvicopy.zip
-bin-dvipdfm.zip
 bin-dvipdfmx.zip
+bin-dvipdfm.zip
 bin-dvipsk.zip
 bin-kpathsea.zip
 bin-latex.zip
 bin-metafont.zip
 bin-omega.zip
+binomexp.zip
 bin-pdftex.zip
+bin-perltex.zip
+bin-ppower4.zip
 bin-pstools.zip
 bin-tetex.zip
 bin-texconfig.zip
@@ -64,123 +80,264 @@
 bin-ttfutils.zip
 bin-web.zip
 bin-xetex.zip
+bizcard.zip
+blindtext.zip
+boites.zip
+booklet.zip
 bookman.zip
 booktabs.zip
+bophook.zip
+boxhandler.zip
+breakurl.zip
 brushscr.zip
+bussproofs.zip
 bytefield.zip
+calendar.zip
 calrsfs.zip
+calxxxx.zip
 camel.zip
 captcont.zip
 caption.zip
 carlisle.zip
+casyl.zip
+cbcoptic.zip
 cb.zip
 ccaption.zip
 ccfonts.zip
 cc-pl.zip
+cd-cover.zip
+cdpbundl.zip
+cd.zip
+cellspace.zip
 changebar.zip
 chappg.zip
+chapterfolder.zip
 charter.zip
 chemcono.zip
-cite.zip
+china2e.zip
+circ.zip
 citeref.zip
+cite.zip
+cjw.zip
 clarendo.zip
 clefval.zip
+clock.zip
 cmap.zip
 cmbright.zip
 cmcyr.zip
+cmdtrack.zip
 cmextra.zip
 cmex.zip
+cmsd.zip
 cm.zip
+codepage.zip
+colorinfo.zip
 colortbl.zip
+combine.zip
 comment.zip
 concmath.zip
+concprog.zip
 concrete.zip
 context.zip
+contour.zip
+cooking.zip
+coollist.zip
+coolstr.zip
+cooltooltips.zip
+cool.zip
+coordsys.zip
 coronet.zip
 count1to.zip
 courier.zip
+courseoutline.zip
+coursepaper.zip
+coverpage.zip
 crop.zip
+crossreference.zip
 crosswrd.zip
 cslatex.zip
 csplain.zip
+csquotes.zip
+csvtools.zip
 cs.zip
 ctable.zip
+cuisine.zip
 currvita.zip
+cursor.zip
 curves.zip
 custom-bib.zip
+cv.zip
 cweb.zip
+cwpuzzle.zip
 cyrillic.zip
 cyrplain.zip
+dashbox.zip
+dashrule.zip
+dateiliste.zip
+datenumber.zip
+datetime.zip
 dcpic.zip
+decimal.zip
+deleq.zip
+diagnose.zip
+dialogl.zip
+dichokey.zip
 dinbrief.zip
+directory.zip
 dk-bib.zip
+dnaseq.zip
+docmfp.zip
 doipubmed.zip
+dotseqn.zip
 dottex.zip
 doublestroke.zip
+dpfloat.zip
 draftcopy.zip
+draftwatermark.zip
+dropping.zip
 dtk.zip
+dvdcoll.zip
 dvips.zip
+easy.zip
+ebezier.zip
+eCards.zip
 ecc.zip
 ecltree.zip
 ec.zip
+eemeir.zip
 eepic.zip
+egplot.zip
 eijkhout.zip
+ellipsis.zip
+elmath.zip
+elpres.zip
+empheq.zip
 emulateapj.zip
+em.zip
 enctex.zip
 endfloat.zip
+endheads.zip
+engpron.zip
+engrec.zip
 enumitem.zip
+envbig.zip
+envlab.zip
+epigraph.zip
+epiolmec.zip
 eplain.zip
 epsf.zip
+eqlist.zip
+eqname.zip
+eqparbox.zip
+esdiff.zip
 ESIEEcv.zip
+esint-type1.zip
 esint.zip
 eskdx.zip
 eskd.zip
 eso-pic.zip
+etaremune.zip
 etex.zip
 euenc.zip
 eulervm.zip
 euler.zip
+europecv.zip
 eurosym.zip
 euxm.zip
+everypage.zip
 everysel.zip
 everyshi.zip
+examdesign.zip
+examplep.zip
+exam.zip
+exercise.zip
+expdlist.zip
 expl3.zip
+export.zip
+extract.zip
 extsizes.zip
 facsimile.zip
+fancybox.zip
 fancyhdr.zip
 fancynum.zip
 fancyref.zip
 fancyvrb.zip
 FAQ-en.zip
 fax.zip
+figbib.zip
+figsize.zip
 filecontents.zip
+fink.zip
+fixfoot.zip
+fixme.zip
+flabels.zip
+flagderiv.zip
+flashcards.zip
+flippdf.zip
 floatflt.zip
 floatrow.zip
 float.zip
+flowfram.zip
+fmp.zip
+fmtcount.zip
+fnbreak.zip
+fncychap.zip
+foilhtml.zip
 fontinst.zip
 fontname.zip
 fontspec.zip
 footbib.zip
 footmisc.zip
 footnpag.zip
+forloop.zip
+formlett.zip
+formular.zip
 fpl.zip
 fp.zip
+fribrief.zip
+fullblck.zip
+fullpict.zip
+fundus.zip
 garamond.zip
+gauss.zip
 g-brief.zip
 genmisc.zip
+genmpage.zip
 geometry.zip
+geomsty.zip
 german.zip
 germbib.zip
+ginpenc.zip
 glossary.zip
 gloss.zip
+gmdoc.zip
+gmiflink.zip
+gmutils.zip
+gmverb.zip
 gnuplottex.zip
 gothic.zip
 graphics.zip
+graphicx-psmin.zip
 greek.zip
+grfpaste.zip
+grnumalt.zip
+GuIT.zip
 gustlib.zip
+hanging.zip
+HA-prosper.zip
+harpoon.zip
+hc.zip
 helvetic.zip
 hepthesis.zip
+hhtensor.zip
+hilowres.zip
+histogr.zip
+hitec.zip
+hpsdiss.zip
+hvfloat.zip
 hyperref.zip
+hyperxmp.zip
+hyper.zip
 hyphenat.zip
 hyphen-base.zip
 hyphen-basque.zip
@@ -216,120 +373,233 @@
 hyphen-ukenglish.zip
 hyphen-usorbian.zip
 hyphen-welsh.zip
+ifmslide.zip
 ifxetex.zip
 impatient-fr.zip
 impatient.zip
 index.zip
+interactiveworkbook.zip
+invoice.zip
+ipa.zip
+iso10303.zip
+isodate.zip
+isorot.zip
+isotope.zip
+iso.zip
 jknapltx.zip
 jurabib.zip
+kalender.zip
+kastrup.zip
 kdgreek.zip
+kerntest.zip
+keystroke.zip
 knuth.zip
 koma-script.zip
 kopka.zip
+labbook.zip
+labelcas.zip
 labels.zip
 lambda.zip
 lastpage.zip
 latexconfig.zip
 latex-fonts.zip
 latex-graphics-companion.zip
+latex-tds.zip
 latex.zip
 layouts.zip
+lazylist.zip
 lcd.zip
+lcg.zip
+leaflet.zip
 leftidx.zip
+lettre.zip
 lettrgth.zip
 lettrine.zip
 levy.zip
+lewis.zip
 lfb.zip
+lhelp.zip
 lh.zip
+limap.zip
 lineno.zip
+lipsum.zip
 listings.zip
-lm.zip
+listliketab.zip
+listofsymbols.zip
+lkproof.zip
 lmextra.zip
+lm.zip
 localloc.zip
 logpap.zip
+lsc.zip
 lshort-russian.zip
+ltablex.zip
 ltabptch.zip
+ltxindex.zip
 ltxmisc.zip
 ly1.zip
+mailing.zip
+makebox.zip
+makecell.zip
+makecirc.zip
+makecmds.zip
+makedtx.zip
+makeglos.zip
 malayalam.zip
 manfnt.zip
+manuscript.zip
+mapcodes.zip
+maple.zip
+marginnote.zip
 marigold.zip
 marvosym.zip
 mathcomp.zip
 mathdesign.zip
 mathpazo.zip
+maybemath.zip
 mcaption.zip
+mceinleger.zip
+mcite.zip
 mdwtools.zip
 memoir.zip
+menu.zip
 metafont.zip
 metapost.zip
+method.zip
+metre.zip
 mex.zip
 mff.zip
 mflogo.zip
 mfnfss.zip
 mfpic.zip
+mftinc.zip
 mhequ.zip
 mh.zip
 microtype.zip
+minipage-marginpar.zip
 minitoc.zip
+minutes.zip
 misc209.zip
 misc.zip
+mla-paper.zip
 mltex.zip
+moderncv.zip
+modroman.zip
+morehelp.zip
+moresize.zip
 moreverb.zip
+movie15.zip
 mparhack.zip
 mpattern.zip
+msc.zip
+msg.zip
+mslapa.zip
+mtgreek.zip
+multenum.zip
+multibbl.zip
 multibib.zip
+multicap.zip
 multido.zip
 multirow.zip
 multitoc.zip
+mwrite.zip
+nag.zip
+namespc.zip
 natbib.zip
+ncclatex.zip
+ncctools.zip
 ncntrsbk.zip
+newfile.zip
 newlfm.zip
+newthm.zip
+newvbtm.zip
 niceframe.zip
+noitcrul.zip
 nomencl.zip
 nomentbl.zip
+nonfloat.zip
+notes.zip
+ntabbing.zip
 ntgclass.zip
 ntheorem-vn.zip
 ntheorem.zip
+numprint.zip
 oberdiek.zip
+ocr-latex.zip
+octavo.zip
 oesch.zip
 ofs.zip
 oinuit.zip
+oldstyle.zip
 omega.zip
 onlyamsmath.zip
+opcit.zip
 optima.zip
 otibet.zip
+outliner.zip
+outline.zip
 overpic.zip
+oxford.zip
+pagenote.zip
+pageno.zip
 palatino.zip
 papercdcase.zip
 papertex.zip
+paper.zip
 paralist.zip
 paresse.zip
+patchcmd.zip
+patch.zip
+pauldoc.zip
+pawpict.zip
 pb-diagram.zip
+pbox.zip
+pbsheet.zip
 pclnfss.zip
+pdfcprot.zip
 pdfpages.zip
+pdfscreen.zip
+pdfslide.zip
+pdfsync.zip
 pdftex-def.zip
 pdf-trans.zip
 pdftricks.zip
+pdfwin.zip
 pecha.zip
+perltex.zip
+permute.zip
 pgf.zip
 philokalia.zip
+photo.zip
 picinpar.zip
 pict2e.zip
 pictex.zip
+pittetd.zip
 placeins.zip
 plain.zip
+plates.zip
 platex.zip
 plgraph.zip
 plnfss.zip
+plweb.zip
 pl.zip
 polyglot.zip
+polynom.zip
+polytable.zip
+postcards.zip
 powerdot.zip
+ppower4.zip
+ppr-prv.zip
 prelim2e.zip
 preprint.zip
+prettyref.zip
 preview.zip
 probsoln.zip
+progkeys.zip
 program.zip
+progress.zip
+prosper.zip
+protocol.zip
 psfragx.zip
 psfrag.zip
 psgo.zip
@@ -351,6 +621,7 @@
 pst-lens.zip
 pst-math.zip
 pst-osci.zip
+pst-pdf.zip
 pst-poly.zip
 pstricks-add.zip
 pstricks.zip
@@ -359,96 +630,216 @@
 pst-uml.zip
 pst-vue3d.zip
 pxfonts.zip
+qcm.zip
 qfonts.zip
 qobitree.zip
 qpxqtx.zip
+qsymbols.zip
+quotchap.zip
 ragged2e.zip
+randtext.zip
+rccol.zip
+rcsinfo.zip
 rcs.zip
+rectopma.zip
+refcheck.zip
+refman.zip
+refstyle.zip
+regcount.zip
+register.zip
+relenc.zip
+repeatindex.zip
+resume.zip
 revtex.zip
+rlepsf.zip
+rmpage.zip
+robustcommand.zip
+robustindex.zip
+romannum.zip
 rotating.zip
 rotfloat.zip
+rotpages.zip
 rsfs.zip
+rst.zip
+rtkinenc.zip
 ruhyphen.zip
 sae.zip
+sauerj.zip
 sauter.zip
+savefnmark.zip
+savesym.zip
+savetrees.zip
+scalebar.zip
 scale.zip
 schedule.zip
+sciwordconv.zip
 screenplay.zip
+script.zip
+sectionbox.zip
 sectsty.zip
+semantic.zip
 semaphor.zip
 seminar.zip
 semioneside.zip
+seqsplit.zip
 setspace.zip
+sf298.zip
+sffms.zip
+shadbox.zip
+shadethm.zip
 shapepar.zip
+shortlst.zip
+shorttoc.zip
 showdim.zip
+showexpl.zip
 showlabels.zip
 sidecap.zip
 SIunits.zip
 skak.zip
+slantsc.zip
 slashbox.zip
+slidenotes.zip
+smalltableof.zip
+smartref.zip
+smflatex.zip
+snapshot.zip
 soul.zip
+sparklines.zip
+splitbib.zip
+splitindex.zip
+spotcolor.zip
+sprite.zip
+srcltx.zip
+sseq.zip
+ssqquote.zip
+stack.zip
+statistik.zip
 stdclsdv.zip
+stdpage.zip
 stmaryrd.zip
+sttools.zip
+subeqnarray.zip
+subeqn.zip
 subfigure.zip
 subfig.zip
+subfloat.zip
+substr.zip
 supertabular.zip
+svgcolor.zip
+svninfo.zip
+svn-multi.zip
+svn.zip
 symbol.zip
+syntax.zip
+syntrace.zip
+synttree.zip
 t2.zip
+Tabbing.zip
+tableaux.zip
+tabto-ltx.zip
 tabulary.zip
+talk.zip
 tap.zip
-tex4ht.zip
+taupin.zip
+tcldoc.zip
+technics.zip
 texdraw.zip
 tex-gyre.zip
 texinfo.zip
 texlive-en.zip
+texlogos.zip
+texmate.zip
+texpower.zip
 tex-ps.zip
+texshade.zip
 textcase.zip
 textfit.zip
 textmerg.zip
 textpos.zip
 thumbpdf.zip
+thumb.zip
+ticket.zip
+timesht.zip
 timesnew.zip
 times.zip
+timing.zip
+titlefoot.zip
 titlesec.zip
+titling.zip
 tocbibind.zip
 tocloft.zip
+tocvsec2.zip
+todo.zip
+tokenizer.zip
+toolbox.zip
 tools.zip
+topfloat.zip
 totpages.zip
+tracking.zip
+trfsigns.zip
+trsym.zip
 truetype.zip
+twoup.zip
 txfonts.zip
 type1cm.zip
 typedref.zip
+typogrid.zip
 ucs.zip
 ukrhyph.zip
+ulsy.zip
 umlaute.zip
 uml.zip
+umoline.zip
 umrand.zip
+underlin.zip
+undertilde.zip
 units.zip
 univers.zip
 upquote.zip
+ushort.zip
 utf8mex.zip
+varindex.zip
+vector.zip
+versions.zip
 vertex.zip
+vhistory.zip
+vita.zip
 vmargin.zip
 vntex.zip
+volumes.zip
 vpe.zip
+vrsion.zip
 vtex.zip
 wallpaper.zip
+warning.zip
+warpcol.zip
 wasysym.zip
 wasy.zip
 was.zip
+webeq.zip
+williams.zip
+wordcount.zip
+wordlike.zip
 wrapfig.zip
 xbmc.zip
 xcolor.zip
-xetex.zip
+xdoc.zip
 xetexconfig.zip
 xetexurl.zip
+xetex.zip
+xifthen.zip
 xkeyval.zip
 xltxtra.zip
+xmpincl.zip
 xtab.zip
 xu-hyphen.zip
 xunicode.zip
 xypic.zip
+xytree.zip
+yafoot.zip
 yfonts.zip
+yplan.zip
 zapfchan.zip
 zapfding.zip
+zed-csp.zip
 zefonts.zip



From fedora-extras-commits at redhat.com  Mon Mar 10 16:38:22 2008
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 10 Mar 2008 16:38:22 GMT
Subject: rpms/texlive/devel texlive.spec,1.31,1.32
Message-ID: <200803101638.m2AGcMnR025515@cvs-int.fedora.redhat.com>

Author: jnovy

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

Modified Files:
	texlive.spec 
Log Message:
* Sat Mar 08 2008 Jindrich Novy  - 2007-24
- put back dvipdfmx requires for xelatex (#433225)
- don't compile unpackaged stuff
- enable parallel build



Index: texlive.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- texlive.spec	4 Mar 2008 15:22:16 -0000	1.31
+++ texlive.spec	10 Mar 2008 16:37:49 -0000	1.32
@@ -27,7 +27,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	23%{?dist}
+Release:	24%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -229,7 +229,7 @@
 Group: Applications/Publishing
 Requires: texlive = %{version}-%{release}
 Requires: texlive-texmf-xetex = %{version}
-#Requires: dvipdfmx
+Requires: dvipdfmx
 
 %description xetex
 XeTeX is a TeX typesetting engine using Unicode and supporting modern
@@ -576,17 +576,27 @@
 %if %{disable_lcdf_typetools}
 	--with-lcdf-typetools=no \
 %endif
-	--with-mf-x-toolkit=yes \
 	--without-xdvik \
-	--without-cxx-runtime-hack
+	--with-mf-x-toolkit=yes \
+	--without-cxx-runtime-hack \
+%if !%{f8_packaging}
+	--without-dvipng \
+	--without-dvipdfmx \
+	--without-xdvipdfmx
+%endif
 
 # Remove everything except:
 # icu: includes some changes
 # md5: the aladdin md5 code (not a library)
 %{__rm} -r libs/{curl,expat,freetype,freetype2,gd,howto,jpeg,libgnuw32,libgsw32,libpng,libttf,ncurses,regex,unzip,zlib,type1,t1lib,xpdf}/
 
-# %%{?_smp_mflags} does not work in texlive-2007/libs/icu-xetex/common
+# parallel build fails in libs/icu-xetex/common, build this one sequentially
+cd libs/icu-xetex
 make
+cd -
+
+# compile the rest parallelly
+make %{?_smp_mflags}
 
 cd texk/web2c/ptex-src-%{ptex_src_ver}
 ./configure EUC
@@ -712,7 +722,9 @@
 # move the configuration files that should be under user control
 mkdir -p %{buildroot}%{_texmf_conf}/{web2c/,dvipdfm/}
 mv %{buildroot}%{_texmf_main}/web2c/mktexdir.opt %{buildroot}%{_texmf_conf}/web2c/
+%if %{f8_packaging}
 mv %{buildroot}%{_texmf_main}/dvipdfm/cid-x.map %{buildroot}%{_texmf_conf}/dvipdfm/
+%endif
 
 # separated projects
 rm %{buildroot}%{_bindir}/devnag
@@ -721,19 +733,6 @@
 # remove unused ConTeXt stuff
 rm %{buildroot}%{_mandir}/man1/texfind.1* %{buildroot}%{_mandir}/man1/fdf2tex.1*
 
-%if !%{f8_packaging}
-# remove dvipng, it's now packaged separately (#431356)
-rm %{buildroot}%{_bindir}/dvipng %{buildroot}%{_mandir}/man1/dvipng.1* %{buildroot}%{_infodir}/dvipng.info*
-
-# remove dvipdfmx, it's now packaged separately (#433225)
-rm -rf %{buildroot}%{_texmf_main}/texk/dvipdfmx/ \
-       %{buildroot}%{_texmf_main}/dvipdfm/ \
-       %{buildroot}%{_texmf_conf}/dvipdfm/
-rm %{buildroot}%{_bindir}/dvipdfmx
-rm %{buildroot}%{_bindir}/xdvipdfmx
-%endif
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -1164,9 +1163,11 @@
 %doc texk/dvipdfmx/AUTHORS texk/dvipdfmx/ChangeLog
 %doc texk/dvipdfmx/COPYING texk/dvipdfmx/README
 %dir %{_texmf_conf}/dvipdfm/
+%if %{f8_packaging}
 %config(noreplace) %{_texmf_conf}/dvipdfm/cid-x.map
 %{_bindir}/dvipdfmx
 %{_bindir}/xdvipdfmx
+%endif
 %{_texmf_main}/dvipdfm/
 %endif
 
@@ -1239,6 +1240,11 @@
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Sat Mar 08 2008 Jindrich Novy  - 2007-24
+- put back dvipdfmx requires for xelatex (#433225)
+- don't compile unpackaged stuff
+- enable parallel build
+
 * Tue Mar 04 2008 Jindrich Novy  - 2007-23
 - move MetaPost back to the main package from texlive-context
 - don't package dvipdfmx, it is now packaged separately (#433225)



From fedora-extras-commits at redhat.com  Mon Mar 10 16:38:47 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 16:38:47 +0000
Subject: [pkgdb] perl-Net-Amazon-EC2 was added for rrati
Message-ID: <200803101641.m2AGfOVN020321@bastion.fedora.phx.redhat.com>

Warren Togami ??? (wtogami) has added Package perl-Net-Amazon-EC2 with summary Perl interface to the Amazon Elastic Compute Cloud (EC2)
Warren Togami ??? (wtogami) has approved Package perl-Net-Amazon-EC2
Warren Togami ??? (wtogami) has added a Fedora devel branch for perl-Net-Amazon-EC2 with an owner of rrati
Warren Togami ??? (wtogami) has approved perl-Net-Amazon-EC2 in Fedora devel
Warren Togami ??? (wtogami) has approved Package perl-Net-Amazon-EC2
Warren Togami ??? (wtogami) has set commit to Approved for cvsextras on perl-Net-Amazon-EC2 (Fedora devel)
Warren Togami ??? (wtogami) has set build to Approved for cvsextras on perl-Net-Amazon-EC2 (Fedora devel)
Warren Togami ??? (wtogami) has set checkout to Approved for cvsextras on perl-Net-Amazon-EC2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Amazon-EC2



From fedora-extras-commits at redhat.com  Mon Mar 10 16:38:49 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 16:38:49 +0000
Subject: [pkgdb] perl-Net-Amazon-EC2 (Fedora, devel) updated by wtogami
Message-ID: <200803101641.m2AGfQZv020341@bastion.fedora.phx.redhat.com>

Warren Togami ??? (wtogami) approved watchbugzilla on perl-Net-Amazon-EC2 (Fedora devel) for perl-sig
Warren Togami ??? (wtogami) approved watchcommits on perl-Net-Amazon-EC2 (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Amazon-EC2



From fedora-extras-commits at redhat.com  Mon Mar 10 16:39:48 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 16:39:48 +0000
Subject: [pkgdb] perl-Net-Amazon-S3 was added for rrati
Message-ID: <200803101642.m2AGgPtn020394@bastion.fedora.phx.redhat.com>

Warren Togami ??? (wtogami) has added Package perl-Net-Amazon-S3 with summary Use the Amazon Simple Storage Service (S3)
Warren Togami ??? (wtogami) has approved Package perl-Net-Amazon-S3
Warren Togami ??? (wtogami) has added a Fedora devel branch for perl-Net-Amazon-S3 with an owner of rrati
Warren Togami ??? (wtogami) has approved perl-Net-Amazon-S3 in Fedora devel
Warren Togami ??? (wtogami) has approved Package perl-Net-Amazon-S3
Warren Togami ??? (wtogami) has set commit to Approved for cvsextras on perl-Net-Amazon-S3 (Fedora devel)
Warren Togami ??? (wtogami) has set build to Approved for cvsextras on perl-Net-Amazon-S3 (Fedora devel)
Warren Togami ??? (wtogami) has set checkout to Approved for cvsextras on perl-Net-Amazon-S3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Amazon-S3



From fedora-extras-commits at redhat.com  Mon Mar 10 16:39:49 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 16:39:49 +0000
Subject: [pkgdb] perl-Net-Amazon-S3 (Fedora, devel) updated by wtogami
Message-ID: <200803101642.m2AGfQa0020341@bastion.fedora.phx.redhat.com>

Warren Togami ??? (wtogami) approved watchbugzilla on perl-Net-Amazon-S3 (Fedora devel) for perl-sig
Warren Togami ??? (wtogami) approved watchcommits on perl-Net-Amazon-S3 (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Net-Amazon-S3



From fedora-extras-commits at redhat.com  Mon Mar 10 16:40:20 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 16:40:20 +0000
Subject: [pkgdb] perl-LWP-UserAgent-Determined was added for rrati
Message-ID: <200803101642.m2AGgPtq020394@bastion.fedora.phx.redhat.com>

Warren Togami ??? (wtogami) has added Package perl-LWP-UserAgent-Determined with summary A virtual browser that retries errors
Warren Togami ??? (wtogami) has approved Package perl-LWP-UserAgent-Determined
Warren Togami ??? (wtogami) has added a Fedora devel branch for perl-LWP-UserAgent-Determined with an owner of rrati
Warren Togami ??? (wtogami) has approved perl-LWP-UserAgent-Determined in Fedora devel
Warren Togami ??? (wtogami) has approved Package perl-LWP-UserAgent-Determined
Warren Togami ??? (wtogami) has set commit to Approved for cvsextras on perl-LWP-UserAgent-Determined (Fedora devel)
Warren Togami ??? (wtogami) has set build to Approved for cvsextras on perl-LWP-UserAgent-Determined (Fedora devel)
Warren Togami ??? (wtogami) has set checkout to Approved for cvsextras on perl-LWP-UserAgent-Determined (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-LWP-UserAgent-Determined



From fedora-extras-commits at redhat.com  Mon Mar 10 16:40:21 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 16:40:21 +0000
Subject: [pkgdb] perl-LWP-UserAgent-Determined (Fedora,
	devel) updated by wtogami
Message-ID: <200803101642.m2AGfQa3020341@bastion.fedora.phx.redhat.com>

Warren Togami ??? (wtogami) approved watchbugzilla on perl-LWP-UserAgent-Determined (Fedora devel) for perl-sig
Warren Togami ??? (wtogami) approved watchcommits on perl-LWP-UserAgent-Determined (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-LWP-UserAgent-Determined



From fedora-extras-commits at redhat.com  Mon Mar 10 16:43:02 2008
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Mon, 10 Mar 2008 16:43:02 GMT
Subject: rpms/kernel/F-8 kernel.spec, 1.368,
	1.369 linux-2.6-firewire-git-pending.patch, 1.2, 1.3
Message-ID: <200803101643.m2AGh2pQ025736@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25681

Modified Files:
	kernel.spec linux-2.6-firewire-git-pending.patch 
Log Message:
* Mon Mar 10 2008 Jarod Wilson  2.6.24.3-23
- firewire-sbp2: improved ability to reconnect to devices
  following a bus reset
- firewire-sbp2: set proper I/O retry limits in SBP-2 devices



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- kernel.spec	6 Mar 2008 20:56:27 -0000	1.368
+++ kernel.spec	10 Mar 2008 16:42:26 -0000	1.369
@@ -1920,6 +1920,11 @@
 
 
 %changelog
+* Mon Mar 10 2008 Jarod Wilson  2.6.24.3-23
+- firewire-sbp2: improved ability to reconnect to devices
+  following a bus reset
+- firewire-sbp2: set proper I/O retry limits in SBP-2 devices
+
 * Thu Mar 06 2008 Chuck Ebbert  2.6.24.3-22
 - Fix libata DMA masking for HPT and SVW (possible fix for #433557)
 

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-firewire-git-pending.patch	4 Mar 2008 05:03:18 -0000	1.2
+++ linux-2.6-firewire-git-pending.patch	10 Mar 2008 16:42:26 -0000	1.3
@@ -485,3 +485,214 @@
 http://arcgraph.de/sr/
 
 
+Increase reconnect management orb timeout value.
+
+Signed-off-by: Jarod Wilson 
+---
+
+ drivers/firewire/fw-sbp2.c |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
+index d6d62c6..da315cf 100644
+--- a/drivers/firewire/fw-sbp2.c
++++ b/drivers/firewire/fw-sbp2.c
+@@ -170,6 +170,7 @@ struct sbp2_target {
+  */
+ #define SBP2_MIN_LOGIN_ORB_TIMEOUT	5000U	/* Timeout in ms */
+ #define SBP2_MAX_LOGIN_ORB_TIMEOUT	40000U	/* Timeout in ms */
++#define SBP2_MAX_RECONNECT_ORB_TIMEOUT	6000U	/* Timeout in ms */
+ #define SBP2_ORB_TIMEOUT		2000U	/* Timeout in ms */
+ #define SBP2_ORB_NULL			0x80000000
+ #define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000
+@@ -538,14 +539,24 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
+ 	orb->request.status_fifo.low  =
+ 		cpu_to_be32(lu->address_handler.offset);
+ 
+-	if (function == SBP2_LOGIN_REQUEST) {
++	switch (function) {
++
++	case SBP2_LOGIN_REQUEST:
+ 		/* Ask for 2^2 == 4 seconds reconnect grace period */
+ 		orb->request.misc |= cpu_to_be32(
+ 			MANAGEMENT_ORB_RECONNECT(2) |
+ 			MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login));
+ 		timeout = lu->tgt->mgt_orb_timeout;
+-	} else {
++		break;
++
++	case SBP2_RECONNECT_REQUEST:
++		timeout = min(SBP2_MAX_RECONNECT_ORB_TIMEOUT,
++			      lu->tgt->mgt_orb_timeout);
++		break;
++
++	default:
+ 		timeout = SBP2_ORB_TIMEOUT;
++		break;
+ 	}
+ 
+ 	init_completion(&orb->done);
+
+
+
+Per the SBP-2 specification, all SBP-2 target devices must have a BUSY_TIMEOUT
+register. Per the 1394-1995 specification, the retry_limt portion of the
+register should be set to 0x0 initially, and set on the target by a logged in
+initiator (i.e., a Linux host w/firewire controller(s)).
+
+Well, as it turns out, lots of devices these days have actually moved on to
+starting to implement SBP-3 compliance, which says that retry_limit should
+default to 0xf instead (yes, SBP-3 stomps directly on 1394-1995, oops).
+
+Prior to this change, the firewire driver stack didn't touch retry_limit, and
+any SBP-3 compliant device worked fine, while SBP-2 compliant ones were unable
+to retransmit when the host returned an ack_busy_X, which resulted in stalled
+out I/O, eventually causing the SCSI layer to give up and offline the device.
+
+The simple fix is for us to set retry_limit to 0xf in the register for all
+devices (which actually matches what the old ieee1394 stack did).
+
+Prior to this change, a hard disk behind an SBP-2 Prolific PL-3507 bridge chip
+would routinely encounter buffer I/O errors and wind up offlined by the SCSI
+layer. With this change, I've encountered zero I/O failures moving tens of GB
+of data around.
+
+Signed-off-by: Jarod Wilson 
+
+---
+
+Update: use CSR_BUSY_TIMEOUT from fw-transaction.h instead of needlessly
+        creating an SBP2_BUSY_TIMEOUT
+
+ drivers/firewire/fw-sbp2.c |   31 +++++++++++++++++++++++++++----
+ 1 files changed, 27 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
+index d6d62c6..fbf5b7a 100644
+--- a/drivers/firewire/fw-sbp2.c
++++ b/drivers/firewire/fw-sbp2.c
+@@ -173,6 +173,7 @@ struct sbp2_target {
+ #define SBP2_ORB_TIMEOUT		2000U	/* Timeout in ms */
+ #define SBP2_ORB_NULL			0x80000000
+ #define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000
++#define SBP2_RETRY_LIMIT		0xf	/* 15 retries */
+ 
+ /* Unit directory keys */
+ #define SBP2_CSR_UNIT_CHARACTERISTICS	0x3a
+@@ -800,6 +801,30 @@ static void sbp2_target_put(struct sbp2_target *tgt)
+ 	kref_put(&tgt->kref, sbp2_release_target);
+ }
+ 
++static void
++complete_set_busy_timeout(struct fw_card *card, int rcode,
++			  void *payload, size_t length, void *done)
++{
++	complete(done);
++}
++
++static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)
++{
++	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
++	DECLARE_COMPLETION_ONSTACK(done);
++	struct fw_transaction t;
++	static u32 busy_timeout;
++
++	/* FIXME: we should try to set dual-phase cycle_limit too */
++	busy_timeout = cpu_to_be32(SBP2_RETRY_LIMIT);
++
++	fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST,
++			lu->tgt->node_id, lu->generation, device->max_speed,
++			CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, &busy_timeout,
++			sizeof(busy_timeout), complete_set_busy_timeout, &done);
++	wait_for_completion(&done);
++}
++
+ static void sbp2_reconnect(struct work_struct *work);
+ 
+ static void sbp2_login(struct work_struct *work)
+@@ -851,10 +876,8 @@ static void sbp2_login(struct work_struct *work)
+ 	fw_notify("%s: logged in to LUN %04x (%d retries)\n",
+ 		  tgt->bus_id, lu->lun, lu->retries);
+ 
+-#if 0
+-	/* FIXME: The linux1394 sbp2 does this last step. */
+-	sbp2_set_busy_timeout(scsi_id);
+-#endif
++	/* set appropriate retry limit(s) in BUSY_TIMEOUT register */
++	sbp2_set_busy_timeout(lu);
+ 
+ 	PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect);
+ 	sbp2_agent_reset(lu);
+
+---
+
+Try to write dual-phase retry protocol limits to BUSY_TIMEOUT register.
+- The dual-phase retry protocol is optional to implement, and if not 
+  supported, writes to the dual-phase portion of the register will be
+  ignored. We try to write the original 1394-1995 default here.
+- In the case of devices that are also SBP-3-compliant, all writes are 
+  ignored, as the register is read-only, but contains single-phase retry of
+  15, which is what we're trying to set for all SBP-2 device anyway, so this
+  write attempt is safe and yields more consistent behavior for all devices.
+
+See section 8.3.2.3.5 of the 1394-1995 spec, section 6.2 of the SBP-2 spec,
+and section 6.4 of the SBP-3 spec for further details.
+
+Signed-off-by: Jarod Wilson 
+---
+
+Update: refresh for updated patch 1/2 using CSR_BUSY_TIMEOUT
+
+ drivers/firewire/fw-sbp2.c |   22 +++++++++++++++++++---
+ 1 files changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
+index fbf5b7a..763f653 100644
+--- a/drivers/firewire/fw-sbp2.c
++++ b/drivers/firewire/fw-sbp2.c
+@@ -173,7 +173,8 @@ struct sbp2_target {
+ #define SBP2_ORB_TIMEOUT		2000U	/* Timeout in ms */
+ #define SBP2_ORB_NULL			0x80000000
+ #define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000
+-#define SBP2_RETRY_LIMIT		0xf	/* 15 retries */
++#define SBP2_RETRY_LIMIT		0xf		/* 15 retries */
++#define SBP2_CYCLE_LIMIT		(0xc8 << 12)	/* 200 125us cycles */
+ 
+ /* Unit directory keys */
+ #define SBP2_CSR_UNIT_CHARACTERISTICS	0x3a
+@@ -808,6 +809,22 @@ complete_set_busy_timeout(struct fw_card *card, int rcode,
+ 	complete(done);
+ }
+ 
++/*
++ * Write retransmit retry values into the BUSY_TIMEOUT register.
++ * - The single-phase retry protocol is supported by all SBP-2 devices, but the
++ *   default retry_limit value is 0 (i.e. never retry transmission). We write a
++ *   saner value after logging into the device.
++ * - The dual-phase retry protocol is optional to implement, and if not
++ *   supported, writes to the dual-phase portion of the register will be
++ *   ignored. We try to write the original 1394-1995 default here.
++ * - In the case of devices that are also SBP-3-compliant, all writes are
++ *   ignored, as the register is read-only, but contains single-phase retry of
++ *   15, which is what we're trying to set for all SBP-2 device anyway, so this
++ *   write attempt is safe and yields more consistent behavior for all devices.
++ *
++ * See section 8.3.2.3.5 of the 1394-1995 spec, section 6.2 of the SBP-2 spec,
++ * and section 6.4 of the SBP-3 spec for further details.
++ */
+ static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)
+ {
+ 	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
+@@ -815,8 +832,7 @@ static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu)
+ 	struct fw_transaction t;
+ 	static u32 busy_timeout;
+ 
+-	/* FIXME: we should try to set dual-phase cycle_limit too */
+-	busy_timeout = cpu_to_be32(SBP2_RETRY_LIMIT);
++	busy_timeout = cpu_to_be32(SBP2_CYCLE_LIMIT | SBP2_RETRY_LIMIT);
+ 
+ 	fw_send_request(device->card, &t, TCODE_WRITE_QUADLET_REQUEST,
+ 			lu->tgt->node_id, lu->generation, device->max_speed,
+
+
+



From fedora-extras-commits at redhat.com  Mon Mar 10 16:43:06 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:43:06 GMT
Subject: rpms/perl-LWP-UserAgent-Determined - New directory
Message-ID: <200803101643.m2AGh6XU025740@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-LWP-UserAgent-Determined
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsb25655/rpms/perl-LWP-UserAgent-Determined

Log Message:
Directory /cvs/extras/rpms/perl-LWP-UserAgent-Determined added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 10 16:43:10 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:43:10 GMT
Subject: rpms/perl-LWP-UserAgent-Determined/devel - New directory
Message-ID: <200803101643.m2AGhAS7025755@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-LWP-UserAgent-Determined/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsb25655/rpms/perl-LWP-UserAgent-Determined/devel

Log Message:
Directory /cvs/extras/rpms/perl-LWP-UserAgent-Determined/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 10 16:43:19 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:43:19 GMT
Subject: rpms/perl-LWP-UserAgent-Determined Makefile, NONE, 1.1 import.log, 
	NONE, 1.1
Message-ID: <200803101643.m2AGhJhn025782@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-LWP-UserAgent-Determined
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsb25655/rpms/perl-LWP-UserAgent-Determined

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-LWP-UserAgent-Determined


--- NEW FILE Makefile ---
# Top level Makefile for module perl-LWP-UserAgent-Determined
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Mar 10 16:43:22 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:43:22 GMT
Subject: rpms/perl-LWP-UserAgent-Determined/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200803101643.m2AGhMVH025798@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-LWP-UserAgent-Determined/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsb25655/rpms/perl-LWP-UserAgent-Determined/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-LWP-UserAgent-Determined


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-LWP-UserAgent-Determined
# $Id: Makefile,v 1.1 2008/03/10 16:43:19 wtogami Exp $
NAME := perl-LWP-UserAgent-Determined
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Mar 10 16:43:50 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:43:50 GMT
Subject: rpms/perl-Net-Amazon-S3 - New directory
Message-ID: <200803101643.m2AGhoXY025846@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-Net-Amazon-S3
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsD25817/rpms/perl-Net-Amazon-S3

Log Message:
Directory /cvs/extras/rpms/perl-Net-Amazon-S3 added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 10 16:44:00 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:44:00 GMT
Subject: rpms/perl-Net-Amazon-S3/devel - New directory
Message-ID: <200803101644.m2AGi0bS025867@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-Net-Amazon-S3/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsD25817/rpms/perl-Net-Amazon-S3/devel

Log Message:
Directory /cvs/extras/rpms/perl-Net-Amazon-S3/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 10 16:44:04 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:44:04 GMT
Subject: rpms/perl-Net-Amazon-S3 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200803101644.m2AGi4d5025892@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-Net-Amazon-S3
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsD25817/rpms/perl-Net-Amazon-S3

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Net-Amazon-S3


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Net-Amazon-S3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Mar 10 16:44:08 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:44:08 GMT
Subject: rpms/perl-Net-Amazon-S3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200803101644.m2AGi8OY025908@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-Net-Amazon-S3/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsD25817/rpms/perl-Net-Amazon-S3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Net-Amazon-S3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Net-Amazon-S3
# $Id: Makefile,v 1.1 2008/03/10 16:44:05 wtogami Exp $
NAME := perl-Net-Amazon-S3
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Mar 10 16:44:38 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:44:38 GMT
Subject: rpms/perl-Net-Amazon-EC2 - New directory
Message-ID: <200803101644.m2AGic7t025956@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-Net-Amazon-EC2
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsr25927/rpms/perl-Net-Amazon-EC2

Log Message:
Directory /cvs/extras/rpms/perl-Net-Amazon-EC2 added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 10 16:44:44 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:44:44 GMT
Subject: rpms/perl-Net-Amazon-EC2/devel - New directory
Message-ID: <200803101644.m2AGiipG025973@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-Net-Amazon-EC2/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsr25927/rpms/perl-Net-Amazon-EC2/devel

Log Message:
Directory /cvs/extras/rpms/perl-Net-Amazon-EC2/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 10 16:44:50 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:44:50 GMT
Subject: rpms/perl-Net-Amazon-EC2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200803101644.m2AGioc2025999@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-Net-Amazon-EC2
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsr25927/rpms/perl-Net-Amazon-EC2

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Net-Amazon-EC2


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Net-Amazon-EC2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Mar 10 16:44:54 2008
From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami))
Date: Mon, 10 Mar 2008 16:44:54 GMT
Subject: rpms/perl-Net-Amazon-EC2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200803101644.m2AGisJZ026014@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/perl-Net-Amazon-EC2/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsr25927/rpms/perl-Net-Amazon-EC2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Net-Amazon-EC2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Net-Amazon-EC2
# $Id: Makefile,v 1.1 2008/03/10 16:44:51 wtogami Exp $
NAME := perl-Net-Amazon-EC2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Mar 10 17:04:26 2008
From: fedora-extras-commits at redhat.com (Robert H. Rati (rrati))
Date: Mon, 10 Mar 2008 17:04:26 GMT
Subject: rpms/perl-Net-Amazon-EC2/devel perl-Net-Amazon-EC2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200803101704.m2AH4QVL001126@cvs-int.fedora.redhat.com>

Author: rrati

Update of /cvs/pkgs/rpms/perl-Net-Amazon-EC2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1100/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Net-Amazon-EC2.spec 
Log Message:
Initial packaging.



--- NEW FILE perl-Net-Amazon-EC2.spec ---
Summary: Perl interface to the Amazon Elastic Compute Cloud (EC2)
Name: perl-Net-Amazon-EC2
Version: 0.06
Release: 1%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/~jkim/Net-Amazon-EC2/
Source0: http://search.cpan.org/CPAN/authors/id/J/JK/JKIM/Net-Amazon-EC2-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)


BuildArch: noarch
BuildRequires: perl
BuildRequires: perl(Digest::HMAC_SHA1) >= 1.01
BuildRequires: perl(XML::Simple) >= 2.18
BuildRequires: perl(Moose) >= 0.33
BuildRequires: perl(Test::More)
BuildRequires: perl(MIME::Base64)
BuildRequires: perl(LWP::UserAgent)
BuildRequires: perl(HTTP::Date)
BuildRequires: perl(URI)
BuildRequires: perl(Params::Validate)


Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
This module provides an interface to the Amazon Elastic Compute Cloud (EC2)


%prep
%setup -q -n Net-Amazon-EC2-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
chmod -R u+w %{buildroot}/*


%check
make test


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/Net/Amazon/EC2.pm
%{perl_vendorlib}/Net/Amazon/EC2/ConfirmProductInstanceResponse.pm
%{perl_vendorlib}/Net/Amazon/EC2/ConsoleOutput.pm
%{perl_vendorlib}/Net/Amazon/EC2/DescribeImageAttribute.pm
%{perl_vendorlib}/Net/Amazon/EC2/DescribeImagesResponse.pm
%{perl_vendorlib}/Net/Amazon/EC2/DescribeKeyPairsResponse.pm
%{perl_vendorlib}/Net/Amazon/EC2/Error.pm
%{perl_vendorlib}/Net/Amazon/EC2/Errors.pm
%{perl_vendorlib}/Net/Amazon/EC2/GroupSet.pm
%{perl_vendorlib}/Net/Amazon/EC2/InstanceState.pm
%{perl_vendorlib}/Net/Amazon/EC2/IpPermission.pm
%{perl_vendorlib}/Net/Amazon/EC2/IpRange.pm
%{perl_vendorlib}/Net/Amazon/EC2/KeyPair.pm
%{perl_vendorlib}/Net/Amazon/EC2/LaunchPermission.pm
%{perl_vendorlib}/Net/Amazon/EC2/LaunchPermissionOperation.pm
%{perl_vendorlib}/Net/Amazon/EC2/ProductCode.pm
%{perl_vendorlib}/Net/Amazon/EC2/ProductInstanceResponse.pm
%{perl_vendorlib}/Net/Amazon/EC2/ReservationInfo.pm
%{perl_vendorlib}/Net/Amazon/EC2/RunInstance.pm
%{perl_vendorlib}/Net/Amazon/EC2/RunningInstances.pm
%{perl_vendorlib}/Net/Amazon/EC2/SecurityGroup.pm
%{perl_vendorlib}/Net/Amazon/EC2/TerminateInstancesResponse.pm
%{perl_vendorlib}/Net/Amazon/EC2/UserData.pm
%{perl_vendorlib}/Net/Amazon/EC2/UserIdGroupPair.pm
%{_mandir}/man3/Net::Amazon::EC2.3pm.gz

%changelog
* Thu Mar  6 2008  Robert Rati  - 0.06-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon-EC2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Mar 2008 16:44:51 -0000	1.1
+++ .cvsignore	10 Mar 2008 17:03:51 -0000	1.2
@@ -0,0 +1 @@
+Net-Amazon-EC2-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon-EC2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2008 16:44:51 -0000	1.1
+++ sources	10 Mar 2008 17:03:51 -0000	1.2
@@ -0,0 +1 @@
+3621ca7f99444ae4f176ccbeb514e0f6  Net-Amazon-EC2-0.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 17:11:42 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 17:11:42 GMT
Subject: rpms/evolution-sharp/devel .cvsignore, 1.16,
	1.17 evolution-sharp.spec, 1.46, 1.47 sources, 1.16, 1.17
Message-ID: <200803101711.m2AHBgm9001315@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25541

Modified Files:
	.cvsignore evolution-sharp.spec sources 
Log Message:

* Mon Mar 10 2008 Matthew Barnes  - 0.16.0-1.fc9
- Update to 0.16.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	28 Feb 2008 15:41:21 -0000	1.16
+++ .cvsignore	10 Mar 2008 17:11:06 -0000	1.17
@@ -1 +1 @@
-evolution-sharp-0.15.92.tar.bz2
+evolution-sharp-0.16.0.tar.bz2


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- evolution-sharp.spec	28 Feb 2008 15:41:21 -0000	1.46
+++ evolution-sharp.spec	10 Mar 2008 17:11:06 -0000	1.47
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: evolution-sharp
-Version: 0.15.92
+Version: 0.16.0
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -76,6 +76,9 @@
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Mon Mar 10 2008 Matthew Barnes  - 0.16.0-1.fc9
+- Update to 0.16.0
+
 * Tue Feb 26 2008 Matthew Barnes  - 0.15.92-1.fc9
 - Update to 0.15.92
 - Remove patch for RH bug #221555 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	28 Feb 2008 15:41:21 -0000	1.16
+++ sources	10 Mar 2008 17:11:06 -0000	1.17
@@ -1 +1 @@
-7e76eb94d300d3d51d61f3b2e696db8d  evolution-sharp-0.15.92.tar.bz2
+866d3bca8a7e564035f42fc7f9096fe2  evolution-sharp-0.16.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 17:12:10 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 17:12:10 GMT
Subject: rpms/evolution-exchange/devel .cvsignore, 1.18,
	1.19 evolution-exchange.spec, 1.27, 1.28 sources, 1.18, 1.19
Message-ID: <200803101712.m2AHCALh001342@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26099

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:

* Mon Mar 10 2008 Matthew Barnes  - 2.22.0-1.fc9
- Update to 2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	25 Feb 2008 20:51:27 -0000	1.18
+++ .cvsignore	10 Mar 2008 17:11:06 -0000	1.19
@@ -1 +1 @@
-evolution-exchange-2.21.92.tar.bz2
+evolution-exchange-2.22.0.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- evolution-exchange.spec	25 Feb 2008 20:51:27 -0000	1.27
+++ evolution-exchange.spec	10 Mar 2008 17:11:06 -0000	1.28
@@ -22,7 +22,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.21.92
+Version: 2.22.0
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
@@ -148,6 +148,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Mar 10 2008 Matthew Barnes  - 2.22.0-1.fc9
+- Update to 2.22.0
+
 * Mon Feb 25 2008 Matthew Barnes  - 2.21.92-1.fc9
 - Update to 2.21.92
 - Disable -Werror since libical now insists on emitting #warnings.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	25 Feb 2008 20:51:27 -0000	1.18
+++ sources	10 Mar 2008 17:11:06 -0000	1.19
@@ -1 +1 @@
-df0684770984566e722e91758fdaaa2e  evolution-exchange-2.21.92.tar.bz2
+fea02f97cc8fe62dca0d50ffdc19e416  evolution-exchange-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 17:12:32 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 17:12:32 GMT
Subject: rpms/gtkhtml3/devel .cvsignore, 1.70, 1.71 gtkhtml3.spec, 1.113,
	1.114 sources, 1.70, 1.71
Message-ID: <200803101712.m2AHCWQr001351@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24907

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:

* Mon Mar 10 2008 Matthew Barnes  - 3.18.0-1.fc9
- Update to 3.18.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	25 Feb 2008 17:32:22 -0000	1.70
+++ .cvsignore	10 Mar 2008 17:11:04 -0000	1.71
@@ -1 +1 @@
-gtkhtml-3.17.92.tar.bz2
+gtkhtml-3.18.0.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- gtkhtml3.spec	25 Feb 2008 17:32:22 -0000	1.113
+++ gtkhtml3.spec	10 Mar 2008 17:11:04 -0000	1.114
@@ -1,4 +1,5 @@
 %define gnome_icon_theme_version 1.2.3
+%define gtk2_version 2.12.0
 %define intltool_version 0.35.5
 %define libbonobo_version 2.20.3
 %define gtkhtml_major 3.14
@@ -9,7 +10,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.17.92
+Version: 3.18.0
 Release: 1%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
@@ -31,6 +32,7 @@
 BuildRequires: gail-devel
 BuildRequires: gettext
 BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libglade2-devel >= 2.0
@@ -122,7 +124,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Mon Feb 25 2008 Matthew Barnes  - 2.17.92-1.fc9
+* Mon Mar 10 2008 Matthew Barnes  - 3.18.0-1.fc9
+- Update to 3.18.0
+
+* Mon Feb 25 2008 Matthew Barnes  - 3.17.92-1.fc9
 - Update to 3.17.92
 - Add BR: libbonobo >= 2.20.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	25 Feb 2008 17:32:22 -0000	1.70
+++ sources	10 Mar 2008 17:11:04 -0000	1.71
@@ -1 +1 @@
-1a623f907df84b0dae60e472a0d612b9  gtkhtml-3.17.92.tar.bz2
+ec541b078ea9fbb1dd93f77075f77bd8  gtkhtml-3.18.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 17:14:22 2008
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 10 Mar 2008 17:14:22 GMT
Subject: rpms/ocsinventory-agent/devel ocsinventory-agent.spec,1.2,1.3
Message-ID: <200803101714.m2AHEM5w001445@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-agent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1394

Modified Files:
	ocsinventory-agent.spec 
Log Message:
rebuild against perl 5.10


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/devel/ocsinventory-agent.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocsinventory-agent.spec	8 Mar 2008 20:12:49 -0000	1.2
+++ ocsinventory-agent.spec	10 Mar 2008 17:13:48 -0000	1.3
@@ -12,7 +12,7 @@
 
 # cvs -z3 -d:pserver:anonymous at ocsinventory.cvs.sourceforge.net:/cvsroot/ocsinventory co  -D "2008-03-05" -P unified_unix_agent
 # tar cvzf Ocsinventory-Agent-cvs.tgz --exclude CVS unified_unix_agent
-Release:   0.5.20080305%{?dist}%{?ocstag:.%{ocstag}}
+Release:   0.6.20080305%{?dist}%{?ocstag:.%{ocstag}}
 Source0:   Ocsinventory-Agent-cvs.tgz
 
 Source1:   %{name}.logrotate
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Remi Collet  0.0.8.2-0.6.20080305
+- rebuild against perl 5.10
+
 * Fri Mar  7 2008 Remi Collet  0.0.8.2-0.5.20080305
 - patches from review (Patrice Dumas)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 17:14:56 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 17:14:56 GMT
Subject: rpms/evolution-data-server/devel
	evolution-data-server-2.22.0-implicit-function-declaration.patch,
	NONE, 1.1 .cvsignore, 1.82, 1.83 evolution-data-server.spec,
	1.209, 1.210 sources, 1.82, 1.83
	evolution-data-server-2.21.92-implicit-function-declarations.patch,
	1.1, NONE
Message-ID: <200803101714.m2AHEuhR001525@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1361

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Added Files:
	evolution-data-server-2.22.0-implicit-function-declaration.patch 
Removed Files:
	evolution-data-server-2.21.92-implicit-function-declarations.patch 
Log Message:

* Mon Mar 10 2008 Matthew Barnes  - 2.22.0-1.fc9
- Update to 2.22.0


evolution-data-server-2.22.0-implicit-function-declaration.patch:

--- NEW FILE evolution-data-server-2.22.0-implicit-function-declaration.patch ---
diff -up evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c.implicit-function-declaration evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c
--- evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c.implicit-function-declaration	2008-03-10 12:39:02.000000000 -0400
+++ evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c	2008-03-10 12:39:18.000000000 -0400
@@ -1,6 +1,7 @@
 /* access_properties_and_parameters.c */
 
 #include 
+#include 
 #include 
 
 /* Get a particular parameter out of a component. This routine will
diff -up evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c.implicit-function-declaration evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c
--- evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c.implicit-function-declaration	2008-02-22 04:50:11.000000000 -0500
+++ evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c	2008-03-10 12:28:44.000000000 -0400
@@ -31,6 +31,7 @@
 
 #include  /* for printf */
 #include 
+#include  /* for free */
 #include  /* For strerror */
 
 #include 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	25 Feb 2008 18:50:51 -0000	1.82
+++ .cvsignore	10 Mar 2008 17:14:08 -0000	1.83
@@ -1 +1 @@
-evolution-data-server-2.21.92.tar.bz2
+evolution-data-server-2.22.0.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- evolution-data-server.spec	25 Feb 2008 18:50:51 -0000	1.209
+++ evolution-data-server.spec	10 Mar 2008 17:14:08 -0000	1.210
@@ -5,6 +5,7 @@
 %define nntp_support 1
 
 %define glib2_version 2.15.3
+%define gtk2_version 2.10.0
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
 %define libbonobo_version 2.20.3
@@ -26,7 +27,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.21.92
+Version: 2.22.0
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -52,8 +53,7 @@
 # RH bug #243296
 Patch14: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-# Can't have an unstable release without one...
-Patch15: evolution-data-server-2.21.92-implicit-function-declarations.patch
+Patch15: evolution-data-server-2.22.0-implicit-function-declaration.patch
 
 ### Build Dependencies ###
 
@@ -63,10 +63,11 @@
 BuildRequires: db4-devel
 BuildRequires: flex
 BuildRequires: gettext
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-vfs2-devel
 BuildRequires: gnutls-devel
 BuildRequires: gtk-doc >= %{gtk_doc_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libglade2-devel
@@ -132,7 +133,7 @@
 %patch12 -p1 -b .fix-ldap-query
 %patch13 -p1 -b .camel-folder-summary-crash
 %patch14 -p1 -b .fix-64bit-acinclude
-%patch15 -p1 -b .implicit-function-declarations
+%patch15 -p1 -b .implicit-function-declaration
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -375,6 +376,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Mar 10 2008 Matthew Barnes  - 2.22.0-1.fc9
+- Update to 2.22.0
+
 * Mon Feb 25 2008 Matthew Barnes  - 2.21.92-1.fc9
 - Update to 2.21.92
 - Remove patch for GNOME bug #516074 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	25 Feb 2008 18:50:51 -0000	1.82
+++ sources	10 Mar 2008 17:14:08 -0000	1.83
@@ -1 +1 @@
-b2a02de49f0f48d3664a107d53140ebb  evolution-data-server-2.21.92.tar.bz2
+0f29044dc21a4bfb915cafafde8f4d6b  evolution-data-server-2.22.0.tar.bz2


--- evolution-data-server-2.21.92-implicit-function-declarations.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 17:15:48 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 17:15:48 GMT
Subject: rpms/perl-Algorithm-CurveFit/devel perl-Algorithm-CurveFit.spec, 1.1,
	1.2
Message-ID: <200803101715.m2AHFmpN001574@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Algorithm-CurveFit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1534

Modified Files:
	perl-Algorithm-CurveFit.spec 
Log Message:
new perl


Index: perl-Algorithm-CurveFit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Algorithm-CurveFit/devel/perl-Algorithm-CurveFit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Algorithm-CurveFit.spec	25 Feb 2008 22:26:31 -0000	1.1
+++ perl-Algorithm-CurveFit.spec	10 Mar 2008 17:15:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-CurveFit
 Version:        1.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Nonlinear Least Squares Curve Fitting
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -51,5 +51,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Mar 10 2008 Tom "spot" Callaway  1.03-2
+- rebuild for new perl
+
 * Wed Feb 20 2008 Patrice Dumas  1.03-1
 - Specfile autogenerated by cpanspec 1.74.



From fedora-extras-commits at redhat.com  Mon Mar 10 17:21:30 2008
From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes))
Date: Mon, 10 Mar 2008 17:21:30 GMT
Subject: rpms/evolution/devel .cvsignore, 1.87, 1.88 evolution.spec, 1.326, 
	1.327 sources, 1.87, 1.88
Message-ID: <200803101721.m2AHLUVk001853@cvs-int.fedora.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1815

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:

* Mon Mar 10 2008 Matthew Barnes  - 2.22.0-1.fc9
- Update to 2.22.0
- Remove patch for CVE-2008-0072 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- .cvsignore	25 Feb 2008 19:43:55 -0000	1.87
+++ .cvsignore	10 Mar 2008 17:20:53 -0000	1.88
@@ -1 +1 @@
-evolution-2.21.92.tar.bz2
+evolution-2.22.0.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- evolution.spec	5 Mar 2008 15:41:03 -0000	1.326
+++ evolution.spec	10 Mar 2008 17:20:53 -0000	1.327
@@ -7,7 +7,7 @@
 %define gnome_pilot_version 2.0.15
 %define gnomevfs2_version 2.4
 %define gtk2_version 2.12.0
-%define gtkhtml_version 3.17.3
+%define gtkhtml_version 3.17.5
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
 %define libbonobo_version 2.20.3
@@ -45,8 +45,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.21.92
-Release: 2%{?dist}
+Version: 2.22.0
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -81,9 +81,6 @@
 # RH bug #176400
 Patch15: evolution-2.9.1-im-context-reset.patch
 
-# RH bug #436082 / CVE-2008-0072
-Patch16: evolution-2.21.92-CVE-2008-0072.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -226,7 +223,6 @@
 %patch13 -p1 -b .fix-conduit-dir
 %patch14 -p1 -b .no-gnome-common
 %patch15 -p1 -b .im-context-reset
-%patch16 -p1 -b .CVE-2008-0072
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -654,6 +650,10 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Mon Mar 10 2008 Matthew Barnes  - 2.22.0-1.fc9
+- Update to 2.22.0
+- Remove patch for CVE-2008-0072 (fixed upstream).
+
 * Tue Mar 04 2008 Matthew Barnes  - 2.21.92-2.fc9
 - Add patch for CVE-2008-0072 (format string vulnerability).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sources	25 Feb 2008 19:43:55 -0000	1.87
+++ sources	10 Mar 2008 17:20:53 -0000	1.88
@@ -1 +1 @@
-8635bc402bf3ba6f57bb3a7635bafd5c  evolution-2.21.92.tar.bz2
+22567465cfba2658fd0a9be03f8c854f  evolution-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 17:23:06 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 17:23:06 GMT
Subject: rpms/sound-juicer/devel .cvsignore, 1.43, 1.44 sound-juicer.spec,
	1.92, 1.93 sources, 1.45, 1.46
Message-ID: <200803101723.m2AHN6bD001957@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/sound-juicer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1921

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	26 Feb 2008 17:51:41 -0000	1.43
+++ .cvsignore	10 Mar 2008 17:22:18 -0000	1.44
@@ -1 +1 @@
-sound-juicer-2.21.92.tar.bz2
+sound-juicer-2.22.0.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- sound-juicer.spec	4 Mar 2008 00:23:36 -0000	1.92
+++ sound-juicer.spec	10 Mar 2008 17:22:18 -0000	1.93
@@ -12,11 +12,11 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.21.92
-Release:	2%{?dist}
+Version:	2.22.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
-Source:		http://download.gnome.org/sources/sound-juicer/2.21/%{name}-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/sound-juicer/2.22/%{name}-%{version}.tar.bz2
 URL:		http://www.burtonini.com/blog/computers/sound-juicer
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 Requires:	cdparanoia
@@ -122,6 +122,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 2.22.0-1
+- Update to 2.22.0
+
 * Tue Mar 04 2008 - Bastien Nocera  - 2.21.92-2
 - ExcludeArch ppc and ppc64 added (#435771)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sound-juicer/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	26 Feb 2008 17:51:41 -0000	1.45
+++ sources	10 Mar 2008 17:22:18 -0000	1.46
@@ -1 +1 @@
-afc3d7df83070b06442ac459c337c7c6  sound-juicer-2.21.92.tar.bz2
+20f83a28915b7d7029198396258d1b4f  sound-juicer-2.22.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 17:42:21 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 17:42:21 GMT
Subject: rpms/perl-Math-MatrixReal/devel perl-Math-MatrixReal.spec,1.1,1.2
Message-ID: <200803101742.m2AHgLYo002225@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Math-MatrixReal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2190

Modified Files:
	perl-Math-MatrixReal.spec 
Log Message:
new perl


Index: perl-Math-MatrixReal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-MatrixReal/devel/perl-Math-MatrixReal.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-MatrixReal.spec	22 Feb 2008 22:12:26 -0000	1.1
+++ perl-Math-MatrixReal.spec	10 Mar 2008 17:41:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Math-MatrixReal
 Version:        2.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate matrix of reals
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,5 +45,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Mar 10 2008 Tom "spot" Callaway  2.03-2
+- rebuild for new perl
+
 * Wed Feb 20 2008 Patrice Dumas  2.03-1
 - Specfile almost autogenerated by cpanspec 1.74.



From fedora-extras-commits at redhat.com  Mon Mar 10 17:43:50 2008
From: fedora-extras-commits at redhat.com (Robert H. Rati (rrati))
Date: Mon, 10 Mar 2008 17:43:50 GMT
Subject: rpms/perl-Net-Amazon-S3/devel
	Net-Amazon-S3-0.43-conditional_include.patch, NONE,
	1.1 perl-Net-Amazon-S3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200803101743.m2AHhoCr002365@cvs-int.fedora.redhat.com>

Author: rrati

Update of /cvs/pkgs/rpms/perl-Net-Amazon-S3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2309/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Net-Amazon-S3-0.43-conditional_include.patch 
	perl-Net-Amazon-S3.spec 
Log Message:
Initial packaging


Net-Amazon-S3-0.43-conditional_include.patch:

--- NEW FILE Net-Amazon-S3-0.43-conditional_include.patch ---
--- Net-Amazon-S3-0.43/t/01api.t	2008-02-28 07:51:44.000000000 +0000
+++ Net-Amazon-S3-0.43/t/01api.t.cond_include	2008-03-07 00:37:11.013945981 +0000
@@ -3,7 +3,8 @@
 use warnings;
 use strict;
 use lib 'lib';
-use Digest::MD5::File qw(file_md5_hex);
+eval "use Digest::MD5::File qw(file_md5_hex)";
+die "couldn't load module : Digest::MD5::File" if ( $@ && $ENV{'AMAZON_S3_EXPENSIVE_TESTS'} );
 use Test::More;
 
 unless ( $ENV{'AMAZON_S3_EXPENSIVE_TESTS'} ) {


--- NEW FILE perl-Net-Amazon-S3.spec ---
Summary: Use the Amazon Simple Storage Service (S3)
Name: perl-Net-Amazon-S3
Version: 0.43
Release: 1%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Net-Amazon-S3/
Source0: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/Net-Amazon-S3-%{version}.tar.gz
Patch0: Net-Amazon-S3-0.43-conditional_include.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch: noarch
BuildRequires: perl
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
#BuildRequires: perl(Digest::MD5::File)


Requires: perl-URI
Requires: perl
Requires: perl(LWP::UserAgent::Determined)
Requires: perl(XML::LibXML)
Requires: perl(XML::LibXML::XPathContext)


%description
This module provides a Perlish interface to Amazon S3. From the
developer blurb: "Amazon S3 is storage for the Internet. It is designed
to make web-scale computing easier for developers. Amazon S3 provides a
simple web services interface that can be used to store and retrieve any
amount of data, at any time, from anywhere on the web. It gives any
developer access to the same highly scalable, reliable, fast,
inexpensive data storage infrastructure that Amazon uses to run its own
global network of web sites. The service aims to maximize benefits of
scale and to pass those benefits on to developers".

To find out more about S3, please visit: http://s3.amazonaws.com/


%prep
%setup -q -n Net-Amazon-S3-%{version}
%patch0 -p1


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
chmod -R u+w %{buildroot}/*


%check
make test


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGES README
%{perl_vendorlib}/Net/Amazon/S3.pm
%{perl_vendorlib}/Net/Amazon/S3/Bucket.pm
%{_mandir}/man3/Net::Amazon::S3.3pm.gz
%{_mandir}/man3/Net::Amazon::S3::Bucket.3pm.gz


%changelog
* Thu Mar  6 2008  Robert Rati  - 0.43-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon-S3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Mar 2008 16:44:05 -0000	1.1
+++ .cvsignore	10 Mar 2008 17:43:06 -0000	1.2
@@ -0,0 +1 @@
+Net-Amazon-S3-0.43.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-Amazon-S3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2008 16:44:05 -0000	1.1
+++ sources	10 Mar 2008 17:43:06 -0000	1.2
@@ -0,0 +1 @@
+43c2b21e4908d5ffa5093b40ff764691  Net-Amazon-S3-0.43.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 17:43:53 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 17:43:53 GMT
Subject: rpms/perl-Math-Symbolic/devel perl-Math-Symbolic.spec,1.1,1.2
Message-ID: <200803101743.m2AHhroQ002397@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Math-Symbolic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2324

Modified Files:
	perl-Math-Symbolic.spec 
Log Message:
new perl


Index: perl-Math-Symbolic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Symbolic/devel/perl-Math-Symbolic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Symbolic.spec	22 Feb 2008 22:27:05 -0000	1.1
+++ perl-Math-Symbolic.spec	10 Mar 2008 17:43:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Math-Symbolic
 Version:        0.510
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Symbolic calculations
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -62,5 +62,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Mar 10 2008 Tom "spot" Callaway  0.510-2
+- rebuild for new perl
+
 * Wed Feb 20 2008 Patrice Dumas  0.510-1
 - Specfile mostly autogenerated by cpanspec 1.74.



From fedora-extras-commits at redhat.com  Mon Mar 10 17:45:19 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 17:45:19 GMT
Subject: rpms/perl-VCS-LibCVS/devel perl-VCS-LibCVS.spec,1.1,1.2
Message-ID: <200803101745.m2AHjJcZ002510@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-VCS-LibCVS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2486

Modified Files:
	perl-VCS-LibCVS.spec 
Log Message:
new perl


Index: perl-VCS-LibCVS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-VCS-LibCVS/devel/perl-VCS-LibCVS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-VCS-LibCVS.spec	12 Feb 2008 18:24:39 -0000	1.1
+++ perl-VCS-LibCVS.spec	10 Mar 2008 17:44:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-VCS-LibCVS
 Version:        1.0002
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Access CVS working directories and repositories
 License:        GPLv2+ or Artistic 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Mar 10 2008 Tom "spot" Callaway  - 1.0002-3
+- rebuild for new perl
+
 * Mon Feb 11 2008 Robin Norwood  - 1.0002-2
 - Make fake provides have an explicit version to fix rpmlint warnings.
 



From fedora-extras-commits at redhat.com  Mon Mar 10 17:52:10 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 17:52:10 GMT
Subject: rpms/gnome-applets/devel .cvsignore, 1.60, 1.61 gnome-applets.spec, 
	1.271, 1.272 sources, 1.64, 1.65
Message-ID: <200803101752.m2AHqAkA002790@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2757

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	26 Feb 2008 16:22:50 -0000	1.60
+++ .cvsignore	10 Mar 2008 17:51:26 -0000	1.61
@@ -1 +1 @@
-gnome-applets-2.21.92.tar.bz2
+gnome-applets-2.22.0.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- gnome-applets.spec	26 Feb 2008 17:29:12 -0000	1.271
+++ gnome-applets.spec	10 Mar 2008 17:51:26 -0000	1.272
@@ -34,13 +34,13 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.21.92
+Version:	2.22.0
 Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
-Source: 	http://download.gnome.org/sources/%{name}/2.21/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
 Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -338,7 +338,10 @@
 %{_sysconfdir}/pam.d/*
 %{_sysconfdir}/security/console.apps/*
 
-%changelog
+%`changelog
+* Mon Mar 10 2008 Matthias Clasen  - 1:2.22.0-1
+- Update to 2.22.0
+
 * Tue Feb 26 2008 Matthias Clasen  - 1:2.21.92-1
 - Update to 2.21.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	26 Feb 2008 17:03:09 -0000	1.64
+++ sources	10 Mar 2008 17:51:26 -0000	1.65
@@ -1,2 +1,2 @@
-54a58919c72dfa7e6654f9932b482b36  gnome-applets-2.21.92.tar.bz2
+cd31cc9171cc350e7d0074b1a8092fbd  gnome-applets-2.22.0.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From fedora-extras-commits at redhat.com  Mon Mar 10 17:58:48 2008
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Mar 2008 17:58:48 GMT
Subject: rpms/perl-Config-General/devel .cvsignore, 1.8,
	1.9 perl-Config-General.spec, 1.15, 1.16 sources, 1.8, 1.9
Message-ID: <200803101758.m2AHwmmX002937@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/perl-Config-General/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2902

Modified Files:
	.cvsignore perl-Config-General.spec sources 
Log Message:
* Tue Mar  4 2008 Ville Skytt??  - 2.38-1
- 2.38.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-General/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Nov 2007 20:41:20 -0000	1.8
+++ .cvsignore	10 Mar 2008 17:57:57 -0000	1.9
@@ -1 +1 @@
-Config-General-2.37.tar.gz
+Config-General-2.38.tar.gz


Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-General/devel/perl-Config-General.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Config-General.spec	8 Feb 2008 16:54:52 -0000	1.15
+++ perl-Config-General.spec	10 Mar 2008 17:57:57 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Config-General
-Version:        2.37
-Release:        2%{?dist}
+Version:        2.38
+Release:        1%{?dist}
 Summary:        Generic configuration module for Perl
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Mar  4 2008 Ville Skytt??  - 2.38-1
+- 2.38.
+
 * Fri Feb  8 2008 Tom "spot" Callaway  - 2.37-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-General/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Nov 2007 20:41:20 -0000	1.8
+++ sources	10 Mar 2008 17:57:57 -0000	1.9
@@ -1 +1 @@
-5acba3605c33cce32f032459b006f445  Config-General-2.37.tar.gz
+064dae485b7840a6aaf6454ad479ab61  Config-General-2.38.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 18:04:23 2008
From: fedora-extras-commits at redhat.com (Robert H. Rati (rrati))
Date: Mon, 10 Mar 2008 18:04:23 GMT
Subject: rpms/perl-LWP-UserAgent-Determined/devel
	perl-LWP-UserAgent-Determined.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200803101804.m2AI4NFU010325@cvs-int.fedora.redhat.com>

Author: rrati

Update of /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10302/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-LWP-UserAgent-Determined.spec 
Log Message:
Initial Packaging



--- NEW FILE perl-LWP-UserAgent-Determined.spec ---
Summary: A virtual browser that retries errors
Name: perl-LWP-UserAgent-Determined
Version: 1.03
Release: 1%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/%{pkg_name}/
Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/LWP-UserAgent-Determined-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch: noarch
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(LWP::UserAgent)


%description
This class works just like LWP::UserAgent (and is based on it, by being a
subclass of it), except that when you use it to get a web page but run into
a possibly-temporary error (like a DNS lookup timeout), it'll wait a few
seconds and retry a few times.


%prep
%setup -q -n LWP-UserAgent-Determined-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
chmod -R u+w %{buildroot}/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{perl_vendorlib}/LWP/UserAgent/Determined.pm
%{_mandir}/man3/LWP::UserAgent::Determined.3pm.gz


%changelog
* Fri Mar  7 2008 Robert Rati  - 1.03-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Mar 2008 16:43:19 -0000	1.1
+++ .cvsignore	10 Mar 2008 18:03:49 -0000	1.2
@@ -0,0 +1 @@
+LWP-UserAgent-Determined-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2008 16:43:19 -0000	1.1
+++ sources	10 Mar 2008 18:03:49 -0000	1.2
@@ -0,0 +1 @@
+5a6c0a9e219dc06234698b49addef458  LWP-UserAgent-Determined-1.03.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 18:09:39 2008
From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen))
Date: Mon, 10 Mar 2008 18:09:39 GMT
Subject: rpms/vino/devel .cvsignore, 1.32, 1.33 sources, 1.32, 1.33 vino.spec,
	1.67, 1.68
Message-ID: <200803101809.m2AI9dwN010501@cvs-int.fedora.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10473

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	26 Feb 2008 04:19:53 -0000	1.32
+++ .cvsignore	10 Mar 2008 18:08:30 -0000	1.33
@@ -1 +1 @@
-vino-2.21.92.tar.bz2
+vino-2.22.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	26 Feb 2008 04:19:53 -0000	1.32
+++ sources	10 Mar 2008 18:08:30 -0000	1.33
@@ -1 +1 @@
-6e20153bf43fb107fa224ba92c06da21  vino-2.21.92.tar.bz2
+c4bb4a18f264ad8dc21e7200911a0412  vino-2.22.0.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- vino.spec	26 Feb 2008 04:19:53 -0000	1.67
+++ vino.spec	10 Mar 2008 18:08:30 -0000	1.68
@@ -8,10 +8,10 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.21.92
+Version: 2.22.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/vino/2.21/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/vino/2.22/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -107,6 +107,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Mar 10 2008 Matthias Clasen  - 2.22.0-1
+- Update to 2.22.0
+
 * Mon Feb 25 2008 Matthias Clasen  - 2.21.92-1
 - Update 2.21.92
 



From fedora-extras-commits at redhat.com  Mon Mar 10 18:33:26 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 18:33:26 GMT
Subject: rpms/winpdb/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 winpdb.spec,
	1.7, 1.8
Message-ID: <200803101833.m2AIXQWX010927@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/winpdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10859

Modified Files:
	.cvsignore sources winpdb.spec 
Log Message:
1.3.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Jan 2008 15:43:41 -0000	1.6
+++ .cvsignore	10 Mar 2008 18:32:52 -0000	1.7
@@ -1 +1 @@
-winpdb-1.3.4.tar.gz
+winpdb-1.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Jan 2008 15:43:41 -0000	1.6
+++ sources	10 Mar 2008 18:32:52 -0000	1.7
@@ -1 +1 @@
-967777e159f3fd836771160e24bf3e2e  winpdb-1.3.4.tar.gz
+7d50e92bf57dadf61b16b7fa8df16b50  winpdb-1.3.6.tar.gz


Index: winpdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/winpdb/devel/winpdb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- winpdb.spec	21 Jan 2008 15:59:26 -0000	1.7
+++ winpdb.spec	10 Mar 2008 18:32:52 -0000	1.8
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		winpdb
-Version:	1.3.4
-Release:	1%{?dist}.1
+Version:	1.3.6
+Release:	1%{?dist}
 Summary:	An advanced python debugger
 Group:		Development/Debuggers
 License:	GPLv2+
@@ -49,6 +49,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Mar 10 2008 Tom "spot" Callaway  - 1.3.6-1
+- update to 1.3.6
+
 * Mon Jan 21 2008 Tom "spot" Callaway  - 1.3.4-1.1
 - bump to 1.3.4
 - actually finish writing the changelog



From fedora-extras-commits at redhat.com  Mon Mar 10 18:37:04 2008
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Mon, 10 Mar 2008 18:37:04 GMT
Subject: rpms/cscope/devel cscope-15.5-samelist.patch, NONE, 1.1 cscope.spec,
	1.33, 1.34
Message-ID: <200803101837.m2AIb451011736@cvs-int.fedora.redhat.com>

Author: nhorman

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

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.5-samelist.patch 
Log Message:
Resolves: bz 436648

cscope-15.5-samelist.patch:

--- NEW FILE cscope-15.5-samelist.patch ---
diff -up cscope-15.5/src/build.c.orig cscope-15.5/src/build.c
--- cscope-15.5/src/build.c.orig	2008-03-10 14:12:49.000000000 -0400
+++ cscope-15.5/src/build.c	2008-03-10 14:13:32.000000000 -0400
@@ -106,16 +106,17 @@ samelist(FILE *oldrefs, char **names, in
 {
 	char	oldname[PATHLEN + 1];	/* name in old cross-reference */
 	int	oldcount;
-	int	i;
+	int	i, matchcnt;
 
 	/* see if the number of names is the same */
-	if (fscanf(oldrefs, "%d", &oldcount) != 1 ||
+	if (fscanf(oldrefs, "%d\n", &oldcount) != 1 ||
 	    oldcount != count) {
 		return(NO);
 	}
 	/* see if the name list is the same */
 	for (i = 0; i < count; ++i) {
-		if (! fgets(oldname, sizeof(oldname), oldrefs)||
+		matchcnt = fscanf(oldrefs,"%s\n",oldname);
+		if ((! matchcnt) ||
 		    strnotequal(oldname, names[i])) {
 			return(NO);
 		}


Index: cscope.spec
===================================================================
RCS file: /cvs/extras/rpms/cscope/devel/cscope.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cscope.spec	19 Feb 2008 16:05:50 -0000	1.33
+++ cscope.spec	10 Mar 2008 18:36:31 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 17%{?dist}
+Release: 18%{?dist}
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -24,6 +24,7 @@
 Patch8:cscope-15.5-ocs-sysdir.patch
 Patch9:cscope-15.5-putstring-overflow.patch
 Patch10: cscope-15.5-fscanf-overflows.patch
+Patch11: cscope-15.5-samelist.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -45,6 +46,7 @@
 %patch8 -p1
 %patch9 -p1 
 %patch10 -p1
+%patch11 -p1
 
 %build
 %configure
@@ -93,6 +95,9 @@
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Mon Mar 10 2008 Neil Horman  -15.5-18
+- Fix samelist to properly absorb newlines (bz 436648)
+
 * Tue Feb 19 2008 Fedora Release Engineering  - 15.5-17
 - Autorebuild for GCC 4.3
 



From fedora-extras-commits at redhat.com  Mon Mar 10 18:46:42 2008
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Mar 2008 18:46:42 GMT
Subject: rpms/qt4/devel qt4.spec,1.93,1.94
Message-ID: <200803101846.m2AIkgFu011962@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11942

Modified Files:
	qt4.spec 
Log Message:
* Mon Mar 10 2008 Rex Dieter  4.3.4-5
- -x11: move qdbusviewer here



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- qt4.spec	5 Mar 2008 12:35:07 -0000	1.93
+++ qt4.spec	10 Mar 2008 18:45:59 -0000	1.94
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -543,8 +543,12 @@
 %{_qt4_datadir}/phrasebooks/
 %{_qt4_libdir}/libQtCore.so.*
 %if "%{?qdbus}" == "-qdbus"
-%{_bindir}/qdbus*
-%{_qt4_bindir}/qdbus*
+%{_bindir}/qdbus
+%{_bindir}/qdbuscpp2xml
+%{_bindir}/qdbusxml2cpp
+%{_qt4_bindir}/qdbus
+%{_qt4_bindir}/qdbuscpp2xml
+%{_qt4_bindir}/qdbusxml2cpp
 %{_qt4_libdir}/libQtDBus.so.*
 %endif
 %{_qt4_libdir}/libQtNetwork.so.*
@@ -569,12 +573,12 @@
 %{_qt4_plugindir}/*
 %exclude %{_qt4_plugindir}/designer
 %exclude %{_qt4_plugindir}/sqldrivers
-# Qt Assistant
-%{_qt4_bindir}/assistant*
 %{_bindir}/assistant*
-#-config bits
-%{_qt4_bindir}/qt*config*
+%{_bindir}/qdbusviewer
 %{_bindir}/qt*config*
+%{_qt4_bindir}/assistant*
+%{_qt4_bindir}/qdbusviewer
+%{_qt4_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
@@ -660,6 +664,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 Rex Dieter  4.3.4-5
+- -x11: move qdbusviewer here
+
 * Wed Mar 05 2008 Than Ngo  4.3.4-4
 - upstream patch to fix 4.3 regression
 



From fedora-extras-commits at redhat.com  Mon Mar 10 18:49:39 2008
From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert))
Date: Mon, 10 Mar 2008 18:49:39 GMT
Subject: rpms/kernel/F-8 linux-2.6-acpi-disable-gpe-fix.patch, NONE,
	1.1 linux-2.6-x86-clear-df-for-signals.patch, NONE,
	1.1 kernel.spec, 1.369, 1.370 linux-2.6-utrace-tracehook.patch,
	1.18, 1.19
Message-ID: <200803101849.m2AIndAU012124@cvs-int.fedora.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12087

Modified Files:
	kernel.spec linux-2.6-utrace-tracehook.patch 
Added Files:
	linux-2.6-acpi-disable-gpe-fix.patch 
	linux-2.6-x86-clear-df-for-signals.patch 
Log Message:
* Mon Mar 10 2008 Chuck Ebbert  2.6.24.3-24
- ACPI: really disable stray GPEs (#251744)
- x86: clear direction flag before calling signal handlers


linux-2.6-acpi-disable-gpe-fix.patch:

--- NEW FILE linux-2.6-acpi-disable-gpe-fix.patch ---
Disable stray GPE correctly
https://bugzilla.redhat.com/show_bug.cgi?id=251744
http://bugzilla.kernel.org/show_bug.cgi?id=6217

Sighed-off-by: Zhang Rui 
---
 drivers/acpi/events/evgpe.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/acpi/events/evgpe.c
===================================================================
--- linux-2.6.orig/drivers/acpi/events/evgpe.c
+++ linux-2.6/drivers/acpi/events/evgpe.c
@@ -248,7 +248,8 @@ acpi_status acpi_ev_disable_gpe(struct a
 
 	ACPI_FUNCTION_TRACE(ev_disable_gpe);
 
-	if (!(gpe_event_info->flags & ACPI_GPE_ENABLE_MASK)) {
+	if (gpe_event_info->flags &&
+		(!(gpe_event_info->flags & ACPI_GPE_ENABLE_MASK))) {
 		return_ACPI_STATUS(AE_OK);
 	}
 

linux-2.6-x86-clear-df-for-signals.patch:

--- NEW FILE linux-2.6-x86-clear-df-for-signals.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e40cd10ccff3d9fbffd57b93780bee4b7b9bff51
Commit:     e40cd10ccff3d9fbffd57b93780bee4b7b9bff51
Parent:     ce4796d1e16cf3761dc2a02b8d588667d05b3078
Author:     Aurelien Jarno 
AuthorDate: Wed Mar 5 19:14:24 2008 +0100
Committer:  Ingo Molnar 
CommitDate: Fri Mar 7 16:39:14 2008 +0100

    x86: clear DF before calling signal handler
    
    The Linux kernel currently does not clear the direction flag before
    calling a signal handler, whereas the x86/x86-64 ABI requires that.
    
    Linux had this behavior/bug forever, but this becomes a real problem
    with gcc version 4.3, which assumes that the direction flag is
    correctly cleared at the entry of a function.
    
    This patches changes the setup_frame() functions to clear the
    direction before entering the signal handler.
    
    Signed-off-by: Aurelien Jarno 
    Signed-off-by: Ingo Molnar 
    Acked-by: H. Peter Anvin 
---
 arch/x86/ia32/ia32_signal.c |    4 ++--
 arch/x86/kernel/signal_32.c |    4 ++--
 arch/x86/kernel/signal_64.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 1c0503b..5e7771a 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -500,7 +500,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
 	regs->ss = __USER32_DS;
 
 	set_fs(USER_DS);
-	regs->eflags &= ~TF_MASK;
+	regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF);
 	if (test_thread_flag(TIF_SINGLESTEP))
 		ptrace_notify(SIGTRAP);
 
@@ -600,7 +600,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 	regs->ss = __USER32_DS;
 
 	set_fs(USER_DS);
-	regs->eflags &= ~TF_MASK;
+	regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF);
 	if (test_thread_flag(TIF_SINGLESTEP))
 		ptrace_notify(SIGTRAP);
 
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index caee1f0..0157a6f 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -407,7 +407,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
 	 * The tracer may want to single-step inside the
 	 * handler too.
 	 */
-	regs->eflags &= ~TF_MASK;
+	regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF);
 	if (test_thread_flag(TIF_SINGLESTEP))
 		ptrace_notify(SIGTRAP);
 
@@ -500,7 +500,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 	 * The tracer may want to single-step inside the
 	 * handler too.
 	 */
-	regs->eflags &= ~TF_MASK;
+	regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF);
 	if (test_thread_flag(TIF_SINGLESTEP))
 		ptrace_notify(SIGTRAP);
 
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index 7347bb1..56b72fb 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -295,7 +295,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 	   see include/asm-x86_64/uaccess.h for details. */
 	set_fs(USER_DS);
 
-	regs->eflags &= ~TF_MASK;
+	regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF);
 	if (test_thread_flag(TIF_SINGLESTEP))
 		ptrace_notify(SIGTRAP);
 #ifdef DEBUG_SIG


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- kernel.spec	10 Mar 2008 16:42:26 -0000	1.369
+++ kernel.spec	10 Mar 2008 18:49:01 -0000	1.370
@@ -588,6 +588,7 @@
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
 Patch76: linux-2.6-x86-dont-use-p6-nops.patch
+Patch77: linux-2.6-x86-clear-df-for-signals.patch
 
 Patch86: linux-2.6-alsa-support-sis7019.patch
 Patch87: linux-2.6-alsa-hda-stac-dmic.patch
@@ -675,6 +676,7 @@
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
 Patch761: linux-2.6-acpi-video-backlight-rationalize.patch
 Patch763: linux-2.6-acpi-video-fix-multiple-busses.patch
+Patch766: linux-2.6-acpi-disable-gpe-fix.patch
 Patch784: linux-2.6-acpi-eeepc-hotkey.patch
 
 Patch820: linux-2.6-compile-fixes.patch
@@ -1002,6 +1004,10 @@
 # Revert -stable pieces we get from elsewhere here
 ApplyPatch linux-2.6-upstream-reverts.patch -R
 
+# clear DF before calling signal handlers
+# (must be applied before utrace)
+ApplyPatch linux-2.6-x86-clear-df-for-signals.patch
+
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
 ApplyPatch linux-2.6-utrace-tracehook.patch
@@ -1220,15 +1226,6 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 # actually mask the intended DMA modes from the blacklist
 ApplyPatch linux-2.6-libata-fix-hpt-svw-dma-masking.patch
-# Enable ACPI ATA objects
-# add option to disable PATA DMA
-# fix resume failure on some systems
-# serverworks is broken with some drive combinations
-# fix libata IORDY handling
-# fix ATA tape drives
-# allow 12-byte SCSI commands for ATAPI devices
-# fix ahci reset
-# work around broken lba48 disks
 
 # wireless patches headed for 2.6.25
 ApplyPatch linux-2.6-wireless.patch
@@ -1257,17 +1254,13 @@
 ApplyPatch linux-2.6-netdev-atl2.patch
 
 # ACPI/PM patches
-# fix EC init
 # fix multiple ACPI brightness problems (#427518)
 ApplyPatch linux-2.6-acpi-video-backlight-rationalize.patch
 ApplyPatch linux-2.6-acpi-video-fix-multiple-busses.patch
-# fix date/time display when using PM_TRACE
-# Send button state on create / resume
-# fix cpuidle regressions
-# fix EC init
+# disable stray gpe properly
+ApplyPatch linux-2.6-acpi-disable-gpe-fix.patch
 # Eeepc hotkey driver
 ApplyPatch linux-2.6-acpi-eeepc-hotkey.patch
-# fix EC init fix
 
 # Fix excessive wakeups
 # Make hdaps timer only tick when in use.
@@ -1920,6 +1913,10 @@
 
 
 %changelog
+* Mon Mar 10 2008 Chuck Ebbert  2.6.24.3-24
+- ACPI: really disable stray GPEs (#251744)
+- x86: clear direction flag before calling signal handlers
+
 * Mon Mar 10 2008 Jarod Wilson  2.6.24.3-23
 - firewire-sbp2: improved ability to reconnect to devices
   following a bus reset

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-utrace-tracehook.patch	15 Feb 2008 23:58:53 -0000	1.18
+++ linux-2.6-utrace-tracehook.patch	10 Mar 2008 18:49:01 -0000	1.19
@@ -875,23 +875,25 @@
  
 --- linux-2.6/arch/x86/ia32/ia32_signal.c
 +++ linux-2.6/arch/x86/ia32/ia32_signal.c
-@@ -492,11 +492,7 @@ int ia32_setup_frame(int sig, struct k_s
+@@ -492,11 +492,8 @@ int ia32_setup_frame(int sig, struct k_s
  
  	regs->cs = __USER32_CS; 
  	regs->ss = __USER32_DS; 
 -
  	set_fs(USER_DS);
--	regs->eflags &= ~TF_MASK;
+-	regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF);
++	regs->eflags &= ~X86_EFLAGS_DF;
 -	if (test_thread_flag(TIF_SINGLESTEP))
 -		ptrace_notify(SIGTRAP);
  
  #if DEBUG_SIG
  	printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n",
-@@ -600,9 +596,6 @@ int ia32_setup_rt_frame(int sig, struct 
+@@ -600,9 +596,7 @@ int ia32_setup_rt_frame(int sig, struct 
  	regs->ss = __USER32_DS; 
  
  	set_fs(USER_DS);
--	regs->eflags &= ~TF_MASK;
+-	regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF);
++	regs->eflags &= ~X86_EFLAGS_DF;
 -	if (test_thread_flag(TIF_SINGLESTEP))
 -		ptrace_notify(SIGTRAP);
  
@@ -1000,11 +1002,12 @@
  #include 
  #include 
  #include 
-@@ -295,9 +295,6 @@ static int setup_rt_frame(int sig, struc
+@@ -295,9 +295,7 @@ static int setup_rt_frame(int sig, struc
  	   see include/asm-x86_64/uaccess.h for details. */
  	set_fs(USER_DS);
  
--	regs->eflags &= ~TF_MASK;
+-	regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF);
++	regs->eflags &= ~X86_EFLAGS_DF;
 -	if (test_thread_flag(TIF_SINGLESTEP))
 -		ptrace_notify(SIGTRAP);
  #ifdef DEBUG_SIG
@@ -1430,7 +1433,7 @@
  #include 
  #include 
  #include 
-@@ -390,16 +390,6 @@ static int setup_frame(int sig, struct k
+@@ -390,16 +390,7 @@ static int setup_frame(int sig, struct k
  	regs->xss = __USER_DS;
  	regs->xcs = __USER_CS;
  
@@ -1440,14 +1443,15 @@
 -	 * The tracer may want to single-step inside the
 -	 * handler too.
 -	 */
--	regs->eflags &= ~TF_MASK;
+-	regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF);
++	regs->eflags &= ~X86_EFLAGS_DF;
 -	if (test_thread_flag(TIF_SINGLESTEP))
 -		ptrace_notify(SIGTRAP);
 -
  #if DEBUG_SIG
  	printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",
  		current->comm, current->pid, frame, regs->eip, frame->pretcode);
-@@ -483,16 +473,6 @@ static int setup_rt_frame(int sig, struc
+@@ -483,16 +473,7 @@ static int setup_rt_frame(int sig, struc
  	regs->xss = __USER_DS;
  	regs->xcs = __USER_CS;
  
@@ -1457,7 +1461,8 @@
 -	 * The tracer may want to single-step inside the
 -	 * handler too.
 -	 */
--	regs->eflags &= ~TF_MASK;
+-	regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF);
++	regs->eflags &= ~X86_EFLAGS_DF;
 -	if (test_thread_flag(TIF_SINGLESTEP))
 -		ptrace_notify(SIGTRAP);
 -



From fedora-extras-commits at redhat.com  Mon Mar 10 18:54:48 2008
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Mar 2008 18:54:48 GMT
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.20,1.21
Message-ID: <200803101854.m2AIsmRj012259@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12208/kdelibs3/devel

Modified Files:
	kdelibs3.spec 
Log Message:
fix typo/thinko in Obsoletes



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kdelibs3.spec	10 Mar 2008 09:51:15 -0000	1.20
+++ kdelibs3.spec	10 Mar 2008 18:54:06 -0000	1.21
@@ -32,7 +32,7 @@
 %else
 Name: kdelibs
 Epoch: 6
-Obsoletes: kdelibs3 = %{version}-%{release}
+Obsoletes: kdelibs3 < %{version}-%{release}
 Provides: kdelibs3 = %{version}-%{release}
 %define include_crystalsvg 1
 %endif



From fedora-extras-commits at redhat.com  Mon Mar 10 18:54:52 2008
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Mar 2008 18:54:52 GMT
Subject: rpms/kdelibs/F-7 kdelibs.spec,1.233,1.234
Message-ID: <200803101854.m2AIsq7i012262@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12208/kdelibs/F-7

Modified Files:
	kdelibs.spec 
Log Message:
fix typo/thinko in Obsoletes



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- kdelibs.spec	10 Mar 2008 09:58:58 -0000	1.233
+++ kdelibs.spec	10 Mar 2008 18:54:18 -0000	1.234
@@ -32,7 +32,7 @@
 %else
 Name: kdelibs
 Epoch: 6
-Obsoletes: kdelibs3 = %{version}-%{release}
+Obsoletes: kdelibs3 < %{version}-%{release}
 Provides: kdelibs3 = %{version}-%{release}
 %define include_crystalsvg 1
 %endif



From fedora-extras-commits at redhat.com  Mon Mar 10 18:55:05 2008
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Mar 2008 18:55:05 GMT
Subject: rpms/kdelibs/F-8 kdelibs.spec,1.251,1.252
Message-ID: <200803101855.m2AIt5FF012265@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12208/kdelibs/F-8

Modified Files:
	kdelibs.spec 
Log Message:
fix typo/thinko in Obsoletes



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-8/kdelibs.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- kdelibs.spec	10 Mar 2008 09:53:58 -0000	1.251
+++ kdelibs.spec	10 Mar 2008 18:54:22 -0000	1.252
@@ -32,7 +32,7 @@
 %else
 Name: kdelibs
 Epoch: 6
-Obsoletes: kdelibs3 = %{version}-%{release}
+Obsoletes: kdelibs3 < %{version}-%{release}
 Provides: kdelibs3 = %{version}-%{release}
 %define include_crystalsvg 1
 %endif



From fedora-extras-commits at redhat.com  Mon Mar 10 18:59:45 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 18:59:45 +0000
Subject: [pkgdb] pyamanith was added for spot
Message-ID: <200803101902.m2AJ2Oo0026464@bastion.fedora.phx.redhat.com>

Tom Callaway (spot) has added Package pyamanith with summary Python bindings for Amanith
Tom Callaway (spot) has approved Package pyamanith
Tom Callaway (spot) has added a Fedora devel branch for pyamanith with an owner of spot
Tom Callaway (spot) has approved pyamanith in Fedora devel
Tom Callaway (spot) has approved Package pyamanith
Tom Callaway (spot) has set commit to Approved for cvsextras on pyamanith (Fedora devel)
Tom Callaway (spot) has set build to Approved for cvsextras on pyamanith (Fedora devel)
Tom Callaway (spot) has set checkout to Approved for cvsextras on pyamanith (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyamanith



From fedora-extras-commits at redhat.com  Mon Mar 10 19:00:39 2008
From: fedora-extras-commits at redhat.com (Adam Jackson (ajax))
Date: Mon, 10 Mar 2008 19:00:39 GMT
Subject: rpms/hal/devel hal-0.5.10-set-property-direct.patch, NONE,
	1.1 hal.spec, 1.146, 1.147
Message-ID: <200803101900.m2AJ0d7v012464@cvs-int.fedora.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12437

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.10-set-property-direct.patch 
Log Message:
* Mon Mar 10 2008 Adam Jackson  0.5.11-0.git20080304.4
- hal-0.5.10-set-property-direct.patch: Add --direct option to
  hal-set-property(1).


hal-0.5.10-set-property-direct.patch:

--- NEW FILE hal-0.5.10-set-property-direct.patch ---
diff -up hal-0.5.10/tools/hal_set_property.c.jx hal-0.5.10/tools/hal_set_property.c
--- hal-0.5.10/tools/hal_set_property.c.jx	2007-07-26 14:00:28.000000000 -0400
+++ hal-0.5.10/tools/hal_set_property.c	2008-03-10 14:22:58.000000000 -0400
@@ -66,7 +66,7 @@ usage (int argc, char *argv[])
  "           (--int  | --string  | --bool  |\n"
  "            --strlist-pre  | --strlist-post  |\n"
  "            --strlist-rem  | --double  | --remove)\n"
- "           [--help] [--version]\n");
+ "           [--direct] [--help] [--version]\n");
 	fprintf (stderr,
  "\n" "        --udi            Unique Device Id\n"
  "        --key            Key of the property to set\n"
@@ -81,6 +81,7 @@ usage (int argc, char *argv[])
  "        --strlist-post   Append a string to a list\n"
  "        --strlist-rem    Remove a string from a list\n"
  "        --remove         Indicates that the property should be removed\n"
+ "        --direct         Use direct HAL connection\n"
  "        --version        Show version and exit\n"
  "        --help           Show this information and exit\n"
  "\n"
@@ -114,6 +115,7 @@ main (int argc, char *argv[])
 	dbus_bool_t is_version = FALSE;
 	int type = PROP_INVALID;
 	DBusError error;
+	dbus_bool_t direct = FALSE;
 
 	if (argc <= 1) {
 		usage (argc, argv);
@@ -135,6 +137,7 @@ main (int argc, char *argv[])
 			{"strlist-pre", 1, NULL, 0},
 			{"strlist-post", 1, NULL, 0},
 			{"strlist-rem", 1, NULL, 0},
+			{"direct", 0, NULL, 0},
 			{"remove", 0, NULL, 0},
 			{"version", 0, NULL, 0},
 			{"help", 0, NULL, 0},
@@ -188,6 +191,8 @@ main (int argc, char *argv[])
 				type = PROP_STRLIST_REM;
 			} else if (strcmp (opt, "remove") == 0) {
 				remove = TRUE;
+			} else if (strcmp (opt, "direct") == 0) {
+				direct = TRUE;
 			} else if (strcmp (opt, "udi") == 0) {
 				udi = strdup (optarg);
 			} else if (strcmp (opt, "version") == 0) {
@@ -215,24 +220,32 @@ main (int argc, char *argv[])
 	
 	fprintf (stderr, "\n");
 	
-	dbus_error_init (&error);	
-	if ((hal_ctx = libhal_ctx_new ()) == NULL) {
-		fprintf (stderr, "error: libhal_ctx_new\n");
-		return 1;
-	}
-	if (!libhal_ctx_set_dbus_connection (hal_ctx, dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
-		fprintf (stderr, "error: libhal_ctx_set_dbus_connection: %s: %s\n", error.name, error.message);
-		LIBHAL_FREE_DBUS_ERROR (&error);
-		return 1;
-	}
-	if (!libhal_ctx_init (hal_ctx, &error)) {
-		if (dbus_error_is_set(&error)) {
-			fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
-			dbus_error_free (&error);
+	dbus_error_init (&error);
+	if (direct) {
+		if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
+			fprintf (stderr, "error: libhal_ctx_init_direct\n");
+			LIBHAL_FREE_DBUS_ERROR (&error);
+			return 1;
+		}
+	} else {
+		if ((hal_ctx = libhal_ctx_new ()) == NULL) {
+			fprintf (stderr, "error: libhal_ctx_new\n");
+			return 1;
+		}
+		if (!libhal_ctx_set_dbus_connection (hal_ctx, dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
+			fprintf (stderr, "error: libhal_ctx_set_dbus_connection: %s: %s\n", error.name, error.message);
+			LIBHAL_FREE_DBUS_ERROR (&error);
+			return 1;
+		}
+		if (!libhal_ctx_init (hal_ctx, &error)) {
+			if (dbus_error_is_set(&error)) {
+				fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
+				dbus_error_free (&error);
+			}
+			fprintf (stderr, "Could not initialise connection to hald.\n"
+					"Normally this means the HAL daemon (hald) is not running or not ready.\n");
+			return 1;
 		}
-		fprintf (stderr, "Could not initialise connection to hald.\n"
-				 "Normally this means the HAL daemon (hald) is not running or not ready.\n");
-		return 1;
 	}
 
 	if (remove) {


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- hal.spec	5 Mar 2008 16:19:57 -0000	1.146
+++ hal.spec	10 Mar 2008 19:00:05 -0000	1.147
@@ -26,10 +26,11 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.11
-Release: 0.git20080304.3%{?dist}
+Release: 0.git20080304.4%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20080304.2.tar.gz
 Patch0: hal-0.5.11-vio.patch
+Patch1: hal-0.5.10-set-property-direct.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -123,6 +124,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .vio
+%patch1 -p1 -b .direct
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
@@ -238,6 +240,10 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Mon Mar 10 2008 Adam Jackson  0.5.11-0.git20080304.4
+- hal-0.5.10-set-property-direct.patch: Add --direct option to
+  hal-set-property(1).
+
 * Wed Mar  5 2008 David Zeuthen  - 0.5.11-0.git20080304.3%{?dist}
 - vio support (#431045, thanks dwmw2)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 19:01:35 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 19:01:35 +0000
Subject: [pkgdb] PyAmanith was added for spot
Message-ID: <200803101904.m2AJ4DP9026561@bastion.fedora.phx.redhat.com>

Tom Callaway (spot) has added Package PyAmanith with summary Python bindings for Amanith
Tom Callaway (spot) has approved Package PyAmanith
Tom Callaway (spot) has added a Fedora devel branch for PyAmanith with an owner of spot
Tom Callaway (spot) has approved PyAmanith in Fedora devel
Tom Callaway (spot) has approved Package PyAmanith
Tom Callaway (spot) has set commit to Approved for cvsextras on PyAmanith (Fedora devel)
Tom Callaway (spot) has set build to Approved for cvsextras on PyAmanith (Fedora devel)
Tom Callaway (spot) has set checkout to Approved for cvsextras on PyAmanith (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PyAmanith



From fedora-extras-commits at redhat.com  Mon Mar 10 19:01:45 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 19:01:45 +0000
Subject: [pkgdb] PyAmanith (Fedora, 8) updated by spot
Message-ID: <200803101904.m2AJ4OMV026583@bastion.fedora.phx.redhat.com>

Tom Callaway (spot) added a Fedora 8 branch for PyAmanith
Tom Callaway (spot) has set commit to Approved for cvsextras on PyAmanith (Fedora 8)
Tom Callaway (spot) has set build to Approved for cvsextras on PyAmanith (Fedora 8)
Tom Callaway (spot) has set checkout to Approved for cvsextras on PyAmanith (Fedora 8)
Tom Callaway (spot) Approved cvsextras for commit access on PyAmanith (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PyAmanith



From fedora-extras-commits at redhat.com  Mon Mar 10 19:01:45 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 19:01:45 +0000
Subject: [pkgdb] PyAmanith (Fedora, 7) updated by spot
Message-ID: <200803101904.m2AJ4OMT026583@bastion.fedora.phx.redhat.com>

Tom Callaway (spot) added a Fedora 7 branch for PyAmanith
Tom Callaway (spot) has set commit to Approved for cvsextras on PyAmanith (Fedora 7)
Tom Callaway (spot) has set build to Approved for cvsextras on PyAmanith (Fedora 7)
Tom Callaway (spot) has set checkout to Approved for cvsextras on PyAmanith (Fedora 7)
Tom Callaway (spot) Approved cvsextras for commit access on PyAmanith (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PyAmanith



From fedora-extras-commits at redhat.com  Mon Mar 10 19:01:45 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 19:01:45 +0000
Subject: [pkgdb] PyAmanith (Fedora, devel) updated by spot
Message-ID: <200803101904.m2AJ4OMX026583@bastion.fedora.phx.redhat.com>

Tom Callaway (spot) Approved cvsextras for commit access on PyAmanith (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PyAmanith



From fedora-extras-commits at redhat.com  Mon Mar 10 19:02:23 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:02:23 GMT
Subject: rpms/PyAmanith - New directory
Message-ID: <200803101902.m2AJ2NS7019815@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/PyAmanith
In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsx19763/rpms/PyAmanith

Log Message:
Directory /cvs/extras/rpms/PyAmanith added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 10 19:02:34 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:02:34 GMT
Subject: rpms/PyAmanith/devel - New directory
Message-ID: <200803101902.m2AJ2YNa019835@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/PyAmanith/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsx19763/rpms/PyAmanith/devel

Log Message:
Directory /cvs/extras/rpms/PyAmanith/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 10 19:02:48 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:02:48 GMT
Subject: rpms/PyAmanith Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200803101902.m2AJ2mKd019865@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/PyAmanith
In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsx19763/rpms/PyAmanith

Added Files:
	Makefile import.log 
Log Message:
Setup of module PyAmanith


--- NEW FILE Makefile ---
# Top level Makefile for module PyAmanith
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Mar 10 19:02:55 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:02:55 GMT
Subject: rpms/PyAmanith/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200803101902.m2AJ2tDx019883@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/PyAmanith/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsx19763/rpms/PyAmanith/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module PyAmanith


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: PyAmanith
# $Id: Makefile,v 1.1 2008/03/10 19:02:48 spot Exp $
NAME := PyAmanith
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Mar 10 19:05:16 2008
From: fedora-extras-commits at redhat.com (Robert H. Rati (rrati))
Date: Mon, 10 Mar 2008 19:05:16 GMT
Subject: rpms/perl-LWP-UserAgent-Determined/devel
	perl-LWP-UserAgent-Determined.spec, 1.1, 1.2
Message-ID: <200803101905.m2AJ5Gag020131@cvs-int.fedora.redhat.com>

Author: rrati

Update of /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20093

Modified Files:
	perl-LWP-UserAgent-Determined.spec 
Log Message:
Remove the checks since they access the internet



Index: perl-LWP-UserAgent-Determined.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel/perl-LWP-UserAgent-Determined.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-LWP-UserAgent-Determined.spec	10 Mar 2008 18:03:49 -0000	1.1
+++ perl-LWP-UserAgent-Determined.spec	10 Mar 2008 19:04:38 -0000	1.2
@@ -36,8 +36,8 @@
 chmod -R u+w %{buildroot}/*
 
 
-%check
-make test
+#%check
+#make test
 
 
 %clean



From fedora-extras-commits at redhat.com  Mon Mar 10 19:07:13 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:07:13 GMT
Subject: rpms/ntfs-3g/devel ntfs-3g-1.2216-nomtab.patch, NONE,
	1.1 ntfs-3g.spec, 1.27, 1.28
Message-ID: <200803101907.m2AJ7De0020236@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20204

Modified Files:
	ntfs-3g.spec 
Added Files:
	ntfs-3g-1.2216-nomtab.patch 
Log Message:
1.2310

ntfs-3g-1.2216-nomtab.patch:

--- NEW FILE ntfs-3g-1.2216-nomtab.patch ---
diff -up ntfs-3g-1.2216/src/ntfs-3g.c.BAD ntfs-3g-1.2216/src/ntfs-3g.c
--- ntfs-3g-1.2216/src/ntfs-3g.c.BAD	2008-02-27 11:40:33.000000000 -0500
+++ ntfs-3g-1.2216/src/ntfs-3g.c	2008-02-27 13:17:57.000000000 -0500
@@ -1947,10 +1947,11 @@ static int parse_options(int argc, char 
 {
 	int c;
 
-	static const char *sopt = "-o:hv";
+	static const char *sopt = "-o:hnv";
 	static const struct option lopt[] = {
 		{ "options",	 required_argument,	NULL, 'o' },
 		{ "help",	 no_argument,		NULL, 'h' },
+		{ "nomtab",	 no_argument,		NULL, 'n' },
 		{ "verbose",	 no_argument,		NULL, 'v' },
 		{ NULL,		 0,			NULL,  0  }
 	};
@@ -1989,6 +1990,11 @@ static int parse_options(int argc, char 
 			if (strappend(&opts.options, optarg))
 				return -1;
 			break;
+		case 'n':
+			/* We must handle the 'nomtab' option even if
+			 * we don't use it because mount(8) passes it.
+			 */
+			break;
 		case 'h':
 			usage();
 			exit(9);


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ntfs-3g.spec	26 Feb 2008 19:19:11 -0000	1.27
+++ ntfs-3g.spec	10 Mar 2008 19:06:20 -0000	1.28
@@ -4,11 +4,12 @@
 
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.2216
-Release:	3%{?dist}
+Version:	1.2310
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://www.ntfs-3g.org/%{name}-%{version}.tgz
+Patch0:		ntfs-3g-1.2216-nomtab.patch
 URL:		http://www.ntfs-3g.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_externalfuse}
@@ -46,6 +47,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -102,7 +104,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING CREDITS NEWS README
+# COPYING disappeared in 1.2310
+%doc AUTHORS ChangeLog CREDITS NEWS README
 /sbin/mount.ntfs
 %attr(754,root,root) /sbin/mount.ntfs-3g
 /sbin/mount.ntfs-fuse
@@ -121,6 +124,10 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Mon Mar 10 2008 Tom "spot" Callaway  - 2:1.2310-1
+- update to 1.2310
+- make -n a noop (bz 403291)
+
 * Tue Feb 26 2008 Tom "spot" Callaway  - 2:1.2216-3
 - rebuild against fixed gcc (PR35264, bugzilla 433546)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 19:09:58 2008
From: fedora-extras-commits at redhat.com (Robert H. Rati (rrati))
Date: Mon, 10 Mar 2008 19:09:58 GMT
Subject: rpms/perl-LWP-UserAgent-Determined/devel
	perl-LWP-UserAgent-Determined.spec, 1.2, 1.3
Message-ID: <200803101909.m2AJ9w7k020343@cvs-int.fedora.redhat.com>

Author: rrati

Update of /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20311

Modified Files:
	perl-LWP-UserAgent-Determined.spec 
Log Message:
Bumbed the release number



Index: perl-LWP-UserAgent-Determined.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel/perl-LWP-UserAgent-Determined.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-LWP-UserAgent-Determined.spec	10 Mar 2008 19:04:38 -0000	1.2
+++ perl-LWP-UserAgent-Determined.spec	10 Mar 2008 19:09:23 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A virtual browser that retries errors
 Name: perl-LWP-UserAgent-Determined
 Version: 1.03
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/%{pkg_name}/
@@ -52,5 +52,8 @@
 
 
 %changelog
+* Fri Mar  7 2008 Robert Rati  - 1.03-2
+- Removed the %check tag because the tests attempt to access
+  the internet
 * Fri Mar  7 2008 Robert Rati  - 1.03-1
 - Initial release



From fedora-extras-commits at redhat.com  Mon Mar 10 19:10:24 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 19:10:24 +0000
Subject: [pkgdb] egd was added for spot
Message-ID: <200803101913.m2AJD3OY027108@bastion.fedora.phx.redhat.com>

Tom Callaway (spot) has added Package egd with summary Entropy Gathering Daemon
Tom Callaway (spot) has approved Package egd
Tom Callaway (spot) has added a Fedora devel branch for egd with an owner of spot
Tom Callaway (spot) has approved egd in Fedora devel
Tom Callaway (spot) has approved Package egd
Tom Callaway (spot) has set commit to Approved for cvsextras on egd (Fedora devel)
Tom Callaway (spot) has set build to Approved for cvsextras on egd (Fedora devel)
Tom Callaway (spot) has set checkout to Approved for cvsextras on egd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/egd



From fedora-extras-commits at redhat.com  Mon Mar 10 19:10:39 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 19:10:39 +0000
Subject: [pkgdb] egd (Fedora, 8) updated by spot
Message-ID: <200803101913.m2AJDIc4027131@bastion.fedora.phx.redhat.com>

Tom Callaway (spot) added a Fedora 8 branch for egd
Tom Callaway (spot) has set commit to Approved for cvsextras on egd (Fedora 8)
Tom Callaway (spot) has set build to Approved for cvsextras on egd (Fedora 8)
Tom Callaway (spot) has set checkout to Approved for cvsextras on egd (Fedora 8)
Tom Callaway (spot) Approved cvsextras for commit access on egd (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/egd



From fedora-extras-commits at redhat.com  Mon Mar 10 19:10:40 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 19:10:40 +0000
Subject: [pkgdb] egd (Fedora, devel) updated by spot
Message-ID: <200803101913.m2AJDIc6027131@bastion.fedora.phx.redhat.com>

Tom Callaway (spot) Approved cvsextras for commit access on egd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/egd



From fedora-extras-commits at redhat.com  Mon Mar 10 19:10:39 2008
From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb))
Date: Mon, 10 Mar 2008 19:10:39 +0000
Subject: [pkgdb] egd (Fedora, 7) updated by spot
Message-ID: <200803101913.m2AJDIc2027131@bastion.fedora.phx.redhat.com>

Tom Callaway (spot) added a Fedora 7 branch for egd
Tom Callaway (spot) has set commit to Approved for cvsextras on egd (Fedora 7)
Tom Callaway (spot) has set build to Approved for cvsextras on egd (Fedora 7)
Tom Callaway (spot) has set checkout to Approved for cvsextras on egd (Fedora 7)
Tom Callaway (spot) Approved cvsextras for commit access on egd (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/egd



From fedora-extras-commits at redhat.com  Mon Mar 10 19:11:09 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:11:09 GMT
Subject: rpms/egd - New directory
Message-ID: <200803101911.m2AJB97Y020477@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/egd
In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsr20443/rpms/egd

Log Message:
Directory /cvs/extras/rpms/egd added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 10 19:11:12 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:11:12 GMT
Subject: rpms/egd/devel - New directory
Message-ID: <200803101911.m2AJBCPe020491@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/egd/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsr20443/rpms/egd/devel

Log Message:
Directory /cvs/extras/rpms/egd/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Mar 10 19:11:25 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:11:25 GMT
Subject: rpms/egd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200803101911.m2AJBPKK020516@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/egd
In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsr20443/rpms/egd

Added Files:
	Makefile import.log 
Log Message:
Setup of module egd


--- NEW FILE Makefile ---
# Top level Makefile for module egd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Mar 10 19:11:30 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:11:30 GMT
Subject: rpms/egd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200803101911.m2AJBUDs020537@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/egd/devel
In directory cvs-int.fedora.redhat.com:/home/fedora/spot/CVSROOT/admin/tmpcvsr20443/rpms/egd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module egd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: egd
# $Id: Makefile,v 1.1 2008/03/10 19:11:25 spot Exp $
NAME := egd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Mar 10 19:18:24 2008
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Mon, 10 Mar 2008 19:18:24 GMT
Subject: rpms/kexec-tools/F-8 kexec-tools-1.102pre-ppc64-devtree.patch, NONE,
	1.1 kexec-tools.spec, 1.108, 1.109
Message-ID: <200803101918.m2AJIOMQ020832@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20799

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.102pre-ppc64-devtree.patch 
Log Message:
Resolves bz 436740

kexec-tools-1.102pre-ppc64-devtree.patch:

--- NEW FILE kexec-tools-1.102pre-ppc64-devtree.patch ---
diff -up kexec-tools-testing-20070330/kexec/arch/ppc64/crashdump-ppc64.c.orig kexec-tools-testing-20070330/kexec/arch/ppc64/crashdump-ppc64.c
--- kexec-tools-testing-20070330/kexec/arch/ppc64/crashdump-ppc64.c.orig	2008-03-10 15:08:18.000000000 -0400
+++ kexec-tools-testing-20070330/kexec/arch/ppc64/crashdump-ppc64.c	2008-03-10 15:15:27.000000000 -0400
@@ -129,7 +129,8 @@ static int get_crash_memory_ranges(struc
 		goto err;
 	}
 	while ((dentry = readdir(dir)) != NULL) {
-		if (strncmp(dentry->d_name, "memory@", 7))
+		if (strncmp(dentry->d_name, "memory@", 7) &&
+			strcmp(dentry->d_name, "memory"))
 			continue;
 		strcpy(fname, device_tree);
 		strcat(fname, dentry->d_name);
diff -up kexec-tools-testing-20070330/kexec/arch/ppc64/kexec-ppc64.c.orig kexec-tools-testing-20070330/kexec/arch/ppc64/kexec-ppc64.c
--- kexec-tools-testing-20070330/kexec/arch/ppc64/kexec-ppc64.c.orig	2008-03-10 15:08:18.000000000 -0400
+++ kexec-tools-testing-20070330/kexec/arch/ppc64/kexec-ppc64.c	2008-03-10 15:15:27.000000000 -0400
@@ -101,7 +101,7 @@ err1:
 }
 
 /*
- * Count the memory@ nodes under /proc/device-tree and populate the
+ * Count the memory nodes under /proc/device-tree and populate the
  * max_memory_ranges variable. This variable replaces MAX_MEMORY_RANGES
  * macro used earlier.
  */
@@ -118,7 +118,8 @@ static int count_memory_ranges()
 
 	while ((dentry = readdir(dir)) != NULL) {
 		if (strncmp(dentry->d_name, "memory@", 7) &&
-		    strncmp(dentry->d_name, "pci@", 4))
+			strcmp(dentry->d_name, "memory") &&
+			strncmp(dentry->d_name, "pci@", 4))
 			continue;
 		max_memory_ranges++;
 	}
@@ -144,7 +145,8 @@ static int get_base_ranges()
 		return -1;
 	}
 	while ((dentry = readdir(dir)) != NULL) {
-		if (strncmp(dentry->d_name, "memory@", 7))
+		if (strncmp(dentry->d_name, "memory@", 7) &&
+			strcmp(dentry->d_name, "memory"))
 			continue;
 		strcpy(fname, device_tree);
 		strcat(fname, dentry->d_name);
@@ -268,7 +270,8 @@ static int get_devtree_details(unsigned 
 
 	while ((dentry = readdir(dir)) != NULL) {
 		if (strncmp(dentry->d_name, "chosen", 6) &&
-			strncmp(dentry->d_name, "memory at 0", 8) &&
+			strncmp(dentry->d_name, "memory@", 7) &&
+			strcmp(dentry->d_name, "memory") &&
 			strncmp(dentry->d_name, "pci@", 4) &&
 			strncmp(dentry->d_name, "rtas", 4))
 			continue;
@@ -437,7 +440,8 @@ static int get_devtree_details(unsigned 
 				add_usable_mem_rgns(rtas_base, rtas_size);
 		} /* rtas */
 
-		if (strncmp(dentry->d_name, "memory at 0", 8) == 0) {
+		if (!strncmp(dentry->d_name, "memory@", 7) ||
+			!strcmp(dentry->d_name, "memory")) {
 			strcat(fname, "/reg");
 			if ((file = fopen(fname, "r")) == NULL) {
 				perror(fname);


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-8/kexec-tools.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- kexec-tools.spec	28 Feb 2008 16:25:31 -0000	1.108
+++ kexec-tools.spec	10 Mar 2008 19:17:51 -0000	1.109
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.102pre 
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -49,6 +49,7 @@
 Patch301: kexec-tools-1.102pre-ppc64_rmo_top.patch
 Patch302: kexec-tools-1.102pre-ppc64-buffer-overflow.patch
 Patch303: kexec-tools-1.102pre-ppc-boots-ppc64.patch
+Patch304: kexec-tools-1.102pre-ppc64-devtree.patch
 
 #
 # Patches 401 through 500 are meant for s390 kexec-tools enablement
@@ -84,6 +85,7 @@
 %patch301 -p1
 %patch302 -p1
 %patch303 -p1
+%patch304 -p1
 
 %patch501 -p1
 
@@ -224,6 +226,9 @@
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Mon Mar 10 2008 Neil Horman  - 1.102pre-6
+- Fix ppc64 devtree naming (bz 436740)
+
 * Thu Feb 28 2008 Neil Horman  - 1.102pre-5
 - Readding ability for ppc to boot 64 bit kernel (bz 405341)
 



From fedora-extras-commits at redhat.com  Mon Mar 10 19:41:33 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:41:33 GMT
Subject: rpms/PyAmanith/devel PyAmanith-0.3.34-buildfix.patch, NONE,
	1.1 PyAmanith-0.3.34-headersfix.patch, NONE, 1.1 PyAmanith.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200803101941.m2AJfXLD021267@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	PyAmanith-0.3.34-buildfix.patch 
	PyAmanith-0.3.34-headersfix.patch PyAmanith.spec 
Log Message:

initial import


PyAmanith-0.3.34-buildfix.patch:

--- NEW FILE PyAmanith-0.3.34-buildfix.patch ---
diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
--- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:33:20.000000000 -0500
+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:34:14.000000000 -0500
@@ -16,7 +16,7 @@ libs = ["amanith"]
 inc = [join("changes", "include"), join(amanith_base, "include"), "include"]
 lib = [join(amanith_base, "lib")]
 cc_args = []
-swig_args = ["-Ibuild/amanith"]
+swig_args = ["-Ichanges/include", "-Iinclude", "-I/usr/include"]
 
 if os.name == "nt":
   if debug:
diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
--- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:51:39.000000000 -0500
+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:51:45.000000000 -0500
@@ -38,15 +38,6 @@ class build_ext(_build_ext):
         relPath = join(root, file).replace(source + os.sep, "")
         shutil.copy(join(source, relPath), join(target, relPath))
   
-  def run(self):
-    # Ultimately this should use patch(1) or something, but for now
-    # we just copy the stuff over.
-    if not os.path.isdir(join("build", "amanith")):
-      os.makedirs(join("build", "amanith"))
-      shutil.copytree(join(amanith_base, "include"), join("build", "amanith", "include"))
-    self.copy("changes", join("build", "amanith"))
-    _build_ext.run(self)
-
 ext_amanith = Extension('_amanith', ['amanith.i'],
                         include_dirs = inc,
                         library_dirs = lib,
diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
--- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:53:25.000000000 -0500
+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:53:39.000000000 -0500
@@ -39,10 +39,7 @@ class build_ext(_build_ext):
         shutil.copy(join(source, relPath), join(target, relPath))
   
 ext_amanith = Extension('_amanith', ['amanith.i'],
-                        include_dirs = inc,
-                        library_dirs = lib,
-                        libraries = libs,
-                        extra_compile_args = cc_args)
+			swig_opts = swig_args, extra_compile_args = swig_args, libraries = libs)
                         
 setup(name = 'PyAmanith',
       version = '0.3.34',

PyAmanith-0.3.34-headersfix.patch:

--- NEW FILE PyAmanith-0.3.34-headersfix.patch ---
diff -up PyAmanith-0.3.34/headers.i.BAD PyAmanith-0.3.34/headers.i
--- PyAmanith-0.3.34/headers.i.BAD	2007-11-15 09:55:15.000000000 -0500
+++ PyAmanith-0.3.34/headers.i	2007-11-15 09:57:38.000000000 -0500
@@ -1,59 +1,59 @@
 /* All the rest comes from the headers */
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-/*%include */
-%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+/*%include */
+%include 
diff -up PyAmanith-0.3.34/include/pyamanith.h.BAD PyAmanith-0.3.34/include/pyamanith.h
--- PyAmanith-0.3.34/include/pyamanith.h.BAD	2007-11-15 11:03:36.000000000 -0500
+++ PyAmanith-0.3.34/include/pyamanith.h	2007-11-15 11:03:44.000000000 -0500
@@ -59,7 +59,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 


--- NEW FILE PyAmanith.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:			PyAmanith
Summary: 		Python bindings for Amanith
Version:		0.3.35
Release:		2%{?dist}
# Exception is permission to link to Amanith, which is QPL.
License:		GPLv2+ with exceptions
Group:			Development/Tools
Source0:		http://muksuluuri.ath.cx/~skyostil/projects/pyamanith/dist/%{name}-%{version}.tar.gz
URL:			http://unrealvoodoo.org/hiteck/projects/pyamanith/
Patch0:			PyAmanith-0.3.34-buildfix.patch
Patch1:			PyAmanith-0.3.34-headersfix.patch
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:		python-devel, amanith-devel, swig

%description
PyAmanith is a Python wrapper for the Amanith (http://www.amanith.org) 2D 
vector graphics library. It strives to offer a pythonic interface to the 
library and make all its features accessible.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
# convert to utf-8, fix end of line encoding
for i in README PKG-INFO; do
  sed -i -e 's|\r||g' $i
  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
  mv $i{.utf8,}
done
sed -i -e 's|\r||g' changes/include/amanith/1d/gbsplinecurve1d.swig.h
chmod -x changes/include/amanith/1d/gbsplinecurve1d.swig.h

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 755 $RPM_BUILD_ROOT%{python_sitearch}/_amanith.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README PKG-INFO COPYING
%{python_sitearch}/_amanith.so
%{python_sitearch}/amanith.py*
%if 0%{?fedora} >= 9
%{python_sitearch}/*.egg-info
%endif

%changelog
* Thu Feb 28 2008 Tom "spot" Callaway  0.3.35-2
- include COPYING file
- fix permissions on .so file
- pickup egg-info for f9+

* Thu Nov 15 2007 Tom "spot" Callaway  0.3.35-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/PyAmanith/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Mar 2008 19:02:48 -0000	1.1
+++ .cvsignore	10 Mar 2008 19:41:00 -0000	1.2
@@ -0,0 +1 @@
+PyAmanith-0.3.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/PyAmanith/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2008 19:02:48 -0000	1.1
+++ sources	10 Mar 2008 19:41:00 -0000	1.2
@@ -0,0 +1 @@
+eb833bc3b6ac6c30eb7252756dde3786  PyAmanith-0.3.35.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 19:43:17 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:43:17 GMT
Subject: rpms/egd/devel egd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200803101943.m2AJhHHu021398@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	egd.spec 
Log Message:

initial import



--- NEW FILE egd.spec ---
Name:		egd
Summary: 	Entropy Gathering Daemon
Version:	0.9
Release:	1%{?dist}
License:	GPL+ or MIT
Group:		Applications/System
Source0:	http://download.sourceforge.net/egd/%{name}-%{version}.tar.gz
URL:		http://egd.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	perl(Digest::SHA1), perl(ExtUtils::MakeMaker), perl(FindBin), perl(IO::Socket)
BuildArch:	noarch
# These are necessary for egd to do anything useful for entropy.
Requires:	procps, net-tools, coreutils, util-linux, tcpdump

%description
EGD is an Entropy Gathering Daemon meant to be used on systems that can run GPG 
but which don't have a convenient (or reliable) source of random bits. It is a 
regular user-space program that sits around, running programs like 'w' and 
'last' and 'vmstat', collecting the randomness (or at least the 
unpredictability) inherent in the output of these system statistics programs 
when used on a reasonably busy system. It slowly stirs the output of these 
gathering programs into a pool of entropy, much like the linux kernel device, 
and allows other programs to read out random bits from this pool.

%prep
%setup -q

%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 ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING COPYING.xfree86 README
%{_bindir}/egd.pl

%changelog
* Wed Feb 27 2008 Tom "spot" Callaway  0.9-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/egd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Mar 2008 19:11:25 -0000	1.1
+++ .cvsignore	10 Mar 2008 19:42:44 -0000	1.2
@@ -0,0 +1 @@
+egd-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/egd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2008 19:11:25 -0000	1.1
+++ sources	10 Mar 2008 19:42:45 -0000	1.2
@@ -0,0 +1 @@
+0d7f762fbf723c78ef72dac9da6f3195  egd-0.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 19:45:17 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:45:17 GMT
Subject: rpms/PyAmanith/F-7 PyAmanith-0.3.34-buildfix.patch, NONE,
	1.1 PyAmanith-0.3.34-headersfix.patch, NONE, 1.1 PyAmanith.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200803101945.m2AJjHFf021507@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/PyAmanith/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21453/F-7

Modified Files:
	sources 
Added Files:
	PyAmanith-0.3.34-buildfix.patch 
	PyAmanith-0.3.34-headersfix.patch PyAmanith.spec 
Log Message:

branching


PyAmanith-0.3.34-buildfix.patch:

--- NEW FILE PyAmanith-0.3.34-buildfix.patch ---
diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
--- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:33:20.000000000 -0500
+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:34:14.000000000 -0500
@@ -16,7 +16,7 @@ libs = ["amanith"]
 inc = [join("changes", "include"), join(amanith_base, "include"), "include"]
 lib = [join(amanith_base, "lib")]
 cc_args = []
-swig_args = ["-Ibuild/amanith"]
+swig_args = ["-Ichanges/include", "-Iinclude", "-I/usr/include"]
 
 if os.name == "nt":
   if debug:
diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
--- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:51:39.000000000 -0500
+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:51:45.000000000 -0500
@@ -38,15 +38,6 @@ class build_ext(_build_ext):
         relPath = join(root, file).replace(source + os.sep, "")
         shutil.copy(join(source, relPath), join(target, relPath))
   
-  def run(self):
-    # Ultimately this should use patch(1) or something, but for now
-    # we just copy the stuff over.
-    if not os.path.isdir(join("build", "amanith")):
-      os.makedirs(join("build", "amanith"))
-      shutil.copytree(join(amanith_base, "include"), join("build", "amanith", "include"))
-    self.copy("changes", join("build", "amanith"))
-    _build_ext.run(self)
-
 ext_amanith = Extension('_amanith', ['amanith.i'],
                         include_dirs = inc,
                         library_dirs = lib,
diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
--- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:53:25.000000000 -0500
+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:53:39.000000000 -0500
@@ -39,10 +39,7 @@ class build_ext(_build_ext):
         shutil.copy(join(source, relPath), join(target, relPath))
   
 ext_amanith = Extension('_amanith', ['amanith.i'],
-                        include_dirs = inc,
-                        library_dirs = lib,
-                        libraries = libs,
-                        extra_compile_args = cc_args)
+			swig_opts = swig_args, extra_compile_args = swig_args, libraries = libs)
                         
 setup(name = 'PyAmanith',
       version = '0.3.34',

PyAmanith-0.3.34-headersfix.patch:

--- NEW FILE PyAmanith-0.3.34-headersfix.patch ---
diff -up PyAmanith-0.3.34/headers.i.BAD PyAmanith-0.3.34/headers.i
--- PyAmanith-0.3.34/headers.i.BAD	2007-11-15 09:55:15.000000000 -0500
+++ PyAmanith-0.3.34/headers.i	2007-11-15 09:57:38.000000000 -0500
@@ -1,59 +1,59 @@
 /* All the rest comes from the headers */
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-/*%include */
-%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+/*%include */
+%include 
diff -up PyAmanith-0.3.34/include/pyamanith.h.BAD PyAmanith-0.3.34/include/pyamanith.h
--- PyAmanith-0.3.34/include/pyamanith.h.BAD	2007-11-15 11:03:36.000000000 -0500
+++ PyAmanith-0.3.34/include/pyamanith.h	2007-11-15 11:03:44.000000000 -0500
@@ -59,7 +59,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 


--- NEW FILE PyAmanith.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:			PyAmanith
Summary: 		Python bindings for Amanith
Version:		0.3.35
Release:		2%{?dist}
# Exception is permission to link to Amanith, which is QPL.
License:		GPLv2+ with exceptions
Group:			Development/Tools
Source0:		http://muksuluuri.ath.cx/~skyostil/projects/pyamanith/dist/%{name}-%{version}.tar.gz
URL:			http://unrealvoodoo.org/hiteck/projects/pyamanith/
Patch0:			PyAmanith-0.3.34-buildfix.patch
Patch1:			PyAmanith-0.3.34-headersfix.patch
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:		python-devel, amanith-devel, swig

%description
PyAmanith is a Python wrapper for the Amanith (http://www.amanith.org) 2D 
vector graphics library. It strives to offer a pythonic interface to the 
library and make all its features accessible.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
# convert to utf-8, fix end of line encoding
for i in README PKG-INFO; do
  sed -i -e 's|\r||g' $i
  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
  mv $i{.utf8,}
done
sed -i -e 's|\r||g' changes/include/amanith/1d/gbsplinecurve1d.swig.h
chmod -x changes/include/amanith/1d/gbsplinecurve1d.swig.h

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 755 $RPM_BUILD_ROOT%{python_sitearch}/_amanith.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README PKG-INFO COPYING
%{python_sitearch}/_amanith.so
%{python_sitearch}/amanith.py*
%if 0%{?fedora} >= 9
%{python_sitearch}/*.egg-info
%endif

%changelog
* Thu Feb 28 2008 Tom "spot" Callaway  0.3.35-2
- include COPYING file
- fix permissions on .so file
- pickup egg-info for f9+

* Thu Nov 15 2007 Tom "spot" Callaway  0.3.35-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyAmanith/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2008 19:02:48 -0000	1.1
+++ sources	10 Mar 2008 19:44:40 -0000	1.2
@@ -0,0 +1 @@
+eb833bc3b6ac6c30eb7252756dde3786  PyAmanith-0.3.35.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 19:45:23 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:45:23 GMT
Subject: rpms/PyAmanith/F-8 PyAmanith-0.3.34-buildfix.patch, NONE,
	1.1 PyAmanith-0.3.34-headersfix.patch, NONE, 1.1 PyAmanith.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <200803101945.m2AJjNeF021517@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/PyAmanith/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21453/F-8

Modified Files:
	sources 
Added Files:
	PyAmanith-0.3.34-buildfix.patch 
	PyAmanith-0.3.34-headersfix.patch PyAmanith.spec 
Log Message:

branching


PyAmanith-0.3.34-buildfix.patch:

--- NEW FILE PyAmanith-0.3.34-buildfix.patch ---
diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
--- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:33:20.000000000 -0500
+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:34:14.000000000 -0500
@@ -16,7 +16,7 @@ libs = ["amanith"]
 inc = [join("changes", "include"), join(amanith_base, "include"), "include"]
 lib = [join(amanith_base, "lib")]
 cc_args = []
-swig_args = ["-Ibuild/amanith"]
+swig_args = ["-Ichanges/include", "-Iinclude", "-I/usr/include"]
 
 if os.name == "nt":
   if debug:
diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
--- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:51:39.000000000 -0500
+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:51:45.000000000 -0500
@@ -38,15 +38,6 @@ class build_ext(_build_ext):
         relPath = join(root, file).replace(source + os.sep, "")
         shutil.copy(join(source, relPath), join(target, relPath))
   
-  def run(self):
-    # Ultimately this should use patch(1) or something, but for now
-    # we just copy the stuff over.
-    if not os.path.isdir(join("build", "amanith")):
-      os.makedirs(join("build", "amanith"))
-      shutil.copytree(join(amanith_base, "include"), join("build", "amanith", "include"))
-    self.copy("changes", join("build", "amanith"))
-    _build_ext.run(self)
-
 ext_amanith = Extension('_amanith', ['amanith.i'],
                         include_dirs = inc,
                         library_dirs = lib,
diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
--- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:53:25.000000000 -0500
+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:53:39.000000000 -0500
@@ -39,10 +39,7 @@ class build_ext(_build_ext):
         shutil.copy(join(source, relPath), join(target, relPath))
   
 ext_amanith = Extension('_amanith', ['amanith.i'],
-                        include_dirs = inc,
-                        library_dirs = lib,
-                        libraries = libs,
-                        extra_compile_args = cc_args)
+			swig_opts = swig_args, extra_compile_args = swig_args, libraries = libs)
                         
 setup(name = 'PyAmanith',
       version = '0.3.34',

PyAmanith-0.3.34-headersfix.patch:

--- NEW FILE PyAmanith-0.3.34-headersfix.patch ---
diff -up PyAmanith-0.3.34/headers.i.BAD PyAmanith-0.3.34/headers.i
--- PyAmanith-0.3.34/headers.i.BAD	2007-11-15 09:55:15.000000000 -0500
+++ PyAmanith-0.3.34/headers.i	2007-11-15 09:57:38.000000000 -0500
@@ -1,59 +1,59 @@
 /* All the rest comes from the headers */
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-%include 
-/*%include */
-%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+%include 
+/*%include */
+%include 
diff -up PyAmanith-0.3.34/include/pyamanith.h.BAD PyAmanith-0.3.34/include/pyamanith.h
--- PyAmanith-0.3.34/include/pyamanith.h.BAD	2007-11-15 11:03:36.000000000 -0500
+++ PyAmanith-0.3.34/include/pyamanith.h	2007-11-15 11:03:44.000000000 -0500
@@ -59,7 +59,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 


--- NEW FILE PyAmanith.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:			PyAmanith
Summary: 		Python bindings for Amanith
Version:		0.3.35
Release:		2%{?dist}
# Exception is permission to link to Amanith, which is QPL.
License:		GPLv2+ with exceptions
Group:			Development/Tools
Source0:		http://muksuluuri.ath.cx/~skyostil/projects/pyamanith/dist/%{name}-%{version}.tar.gz
URL:			http://unrealvoodoo.org/hiteck/projects/pyamanith/
Patch0:			PyAmanith-0.3.34-buildfix.patch
Patch1:			PyAmanith-0.3.34-headersfix.patch
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:		python-devel, amanith-devel, swig

%description
PyAmanith is a Python wrapper for the Amanith (http://www.amanith.org) 2D 
vector graphics library. It strives to offer a pythonic interface to the 
library and make all its features accessible.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
# convert to utf-8, fix end of line encoding
for i in README PKG-INFO; do
  sed -i -e 's|\r||g' $i
  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
  mv $i{.utf8,}
done
sed -i -e 's|\r||g' changes/include/amanith/1d/gbsplinecurve1d.swig.h
chmod -x changes/include/amanith/1d/gbsplinecurve1d.swig.h

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 755 $RPM_BUILD_ROOT%{python_sitearch}/_amanith.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README PKG-INFO COPYING
%{python_sitearch}/_amanith.so
%{python_sitearch}/amanith.py*
%if 0%{?fedora} >= 9
%{python_sitearch}/*.egg-info
%endif

%changelog
* Thu Feb 28 2008 Tom "spot" Callaway  0.3.35-2
- include COPYING file
- fix permissions on .so file
- pickup egg-info for f9+

* Thu Nov 15 2007 Tom "spot" Callaway  0.3.35-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyAmanith/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2008 19:02:48 -0000	1.1
+++ sources	10 Mar 2008 19:44:47 -0000	1.2
@@ -0,0 +1 @@
+eb833bc3b6ac6c30eb7252756dde3786  PyAmanith-0.3.35.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 19:48:50 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:48:50 GMT
Subject: rpms/egd/F-7 egd.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200803101948.m2AJmoX4021733@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/egd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21661/F-7

Modified Files:
	sources 
Added Files:
	egd.spec 
Log Message:
branching


--- NEW FILE egd.spec ---
Name:		egd
Summary: 	Entropy Gathering Daemon
Version:	0.9
Release:	1%{?dist}
License:	GPL+ or MIT
Group:		Applications/System
Source0:	http://download.sourceforge.net/egd/%{name}-%{version}.tar.gz
URL:		http://egd.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	perl(Digest::SHA1), perl(ExtUtils::MakeMaker), perl(FindBin), perl(IO::Socket)
BuildArch:	noarch
# These are necessary for egd to do anything useful for entropy.
Requires:	procps, net-tools, coreutils, util-linux, tcpdump

%description
EGD is an Entropy Gathering Daemon meant to be used on systems that can run GPG 
but which don't have a convenient (or reliable) source of random bits. It is a 
regular user-space program that sits around, running programs like 'w' and 
'last' and 'vmstat', collecting the randomness (or at least the 
unpredictability) inherent in the output of these system statistics programs 
when used on a reasonably busy system. It slowly stirs the output of these 
gathering programs into a pool of entropy, much like the linux kernel device, 
and allows other programs to read out random bits from this pool.

%prep
%setup -q

%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 ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING COPYING.xfree86 README
%{_bindir}/egd.pl

%changelog
* Wed Feb 27 2008 Tom "spot" Callaway  0.9-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/egd/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2008 19:11:25 -0000	1.1
+++ sources	10 Mar 2008 19:48:16 -0000	1.2
@@ -0,0 +1 @@
+0d7f762fbf723c78ef72dac9da6f3195  egd-0.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 19:48:49 2008
From: fedora-extras-commits at redhat.com (Miroslav Lichvar (mlichvar))
Date: Mon, 10 Mar 2008 19:48:49 GMT
Subject: rpms/ntp/devel ntp-4.2.4p4-cmsgalign.patch, NONE,
	1.1 ntp-4.2.4p4-bcast.patch, 1.1, 1.2 ntp.spec, 1.78, 1.79
Message-ID: <200803101948.m2AJmnUH021730@cvs-int.fedora.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21704

Modified Files:
	ntp-4.2.4p4-bcast.patch ntp.spec 
Added Files:
	ntp-4.2.4p4-cmsgalign.patch 
Log Message:
- avoid unaligned memory access (#435301)
- fix receiving broadcasts on 255.255.255.255


ntp-4.2.4p4-cmsgalign.patch:

--- NEW FILE ntp-4.2.4p4-cmsgalign.patch ---
diff -up ntp-4.2.4p4/ntpd/ntp_io.c.cmsgalign ntp-4.2.4p4/ntpd/ntp_io.c
--- ntp-4.2.4p4/ntpd/ntp_io.c.cmsgalign	2008-03-10 20:01:21.000000000 +0100
+++ ntp-4.2.4p4/ntpd/ntp_io.c	2008-03-10 20:04:02.000000000 +0100
@@ -2933,8 +2933,8 @@ read_network_packet(SOCKET fd, struct in
 	msghdr.msg_namelen    = sizeof(rb->recv_srcadr);
 	msghdr.msg_iov        = &iovec;
 	msghdr.msg_iovlen     = 1;
-	msghdr.msg_control    = (void *)&control;
-	msghdr.msg_controllen = sizeof(control);
+	msghdr.msg_control    = (void *)((long)(control + 7) & -8); /* align to 8 bytes */
+	msghdr.msg_controllen = sizeof(control) - 8;
 	msghdr.msg_flags      = 0;
 	rb->recv_length       = recvmsg(fd, &msghdr, 0);
 #endif

ntp-4.2.4p4-bcast.patch:

Index: ntp-4.2.4p4-bcast.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp-4.2.4p4-bcast.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntp-4.2.4p4-bcast.patch	26 Oct 2007 13:27:54 -0000	1.1
+++ ntp-4.2.4p4-bcast.patch	10 Mar 2008 19:48:46 -0000	1.2
@@ -66,8 +66,8 @@
  	struct msghdr msghdr;
  	struct iovec iovec;
 -	char control[TIMESTAMP_CTLMSGBUF_SIZE];	/* pick up control messages */
-+	char control[sizeof (struct cmsghdr) +
-+		sizeof (struct in_pktinfo) + 8];	/* pick up control messages */
++	char control[sizeof (struct cmsghdr) * 2 + sizeof (struct timeval) +
++		sizeof (struct in_pktinfo) + 32];	/* pick up control messages */
  #endif
  
  	/*


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ntp.spec	10 Mar 2008 15:44:55 -0000	1.78
+++ ntp.spec	10 Mar 2008 19:48:46 -0000	1.79
@@ -60,6 +60,7 @@
 Patch19: ntp-4.2.4p0-retcode.patch
 Patch20: ntp-4.2.4p2-noif.patch
 Patch21: ntp-4.2.4p4-ipv6.patch
+Patch22: ntp-4.2.4p4-cmsgalign.patch
 
 URL: http://www.ntp.org
 Requires(pre): shadow-utils 
@@ -105,6 +106,7 @@
 %patch19 -p1 -b .retcode
 %patch20 -p1 -b .noif
 %patch21 -p1 -b .ipv6
+%patch22 -p1 -b .cmsgalign
 
 %ifarch ia64
 %patch5 -p1 -b .linkfastmath
@@ -243,6 +245,8 @@
 %changelog
 * Mon Mar 10 2008 Miroslav Lichvar  4.2.4p4-5
 - fix building IPv6 support with new glibc-headers (#436713)
+- avoid unaligned memory access (#435301)
+- fix receiving broadcasts on 255.255.255.255
 
 * Fri Feb 29 2008 Miroslav Lichvar  4.2.4p4-4
 - reset kernel frequency when -x option is used



From fedora-extras-commits at redhat.com  Mon Mar 10 19:48:56 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:48:56 GMT
Subject: rpms/egd/F-8 egd.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <200803101948.m2AJmuwD021738@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/egd/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21661/F-8

Modified Files:
	sources 
Added Files:
	egd.spec 
Log Message:
branching


--- NEW FILE egd.spec ---
Name:		egd
Summary: 	Entropy Gathering Daemon
Version:	0.9
Release:	1%{?dist}
License:	GPL+ or MIT
Group:		Applications/System
Source0:	http://download.sourceforge.net/egd/%{name}-%{version}.tar.gz
URL:		http://egd.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	perl(Digest::SHA1), perl(ExtUtils::MakeMaker), perl(FindBin), perl(IO::Socket)
BuildArch:	noarch
# These are necessary for egd to do anything useful for entropy.
Requires:	procps, net-tools, coreutils, util-linux, tcpdump

%description
EGD is an Entropy Gathering Daemon meant to be used on systems that can run GPG 
but which don't have a convenient (or reliable) source of random bits. It is a 
regular user-space program that sits around, running programs like 'w' and 
'last' and 'vmstat', collecting the randomness (or at least the 
unpredictability) inherent in the output of these system statistics programs 
when used on a reasonably busy system. It slowly stirs the output of these 
gathering programs into a pool of entropy, much like the linux kernel device, 
and allows other programs to read out random bits from this pool.

%prep
%setup -q

%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 ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING COPYING.xfree86 README
%{_bindir}/egd.pl

%changelog
* Wed Feb 27 2008 Tom "spot" Callaway  0.9-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/egd/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2008 19:11:25 -0000	1.1
+++ sources	10 Mar 2008 19:48:20 -0000	1.2
@@ -0,0 +1 @@
+0d7f762fbf723c78ef72dac9da6f3195  egd-0.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Mar 10 19:51:51 2008
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 10 Mar 2008 19:51:51 GMT
Subject: rpms/ntfs-3g/devel .cvsignore, 1.19, 1.20 ntfs-3g.spec, 1.28,
	1.29 sources, 1.20, 1.21
Message-ID: <200803101951.m2AJppkk021931@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21869

Modified Files:
	.cvsignore ntfs-3g.spec sources 
Log Message:
update sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	18 Feb 2008 20:34:46 -0000	1.19
+++ .cvsignore	10 Mar 2008 19:51:03 -0000	1.20
@@ -1 +1 @@
-ntfs-3g-1.2216.tgz
+ntfs-3g-1.2310.tgz


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ntfs-3g.spec	10 Mar 2008 19:06:20 -0000	1.28
+++ ntfs-3g.spec	10 Mar 2008 19:51:03 -0000	1.29
@@ -5,7 +5,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.2310
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://www.ntfs-3g.org/%{name}-%{version}.tgz
@@ -124,6 +124,9 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Mon Mar 10 2008 Tom "spot" Callaway  - 2:1.2310-2
+- update sources
+
 * Mon Mar 10 2008 Tom "spot" Callaway  - 2:1.2310-1
 - update to 1.2310
 - make -n a noop (bz 403291)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	18 Feb 2008 20:34:46 -0000	1.20
+++ sources	10 Mar 2008 19:51:03 -0000	1.21
@@ -1 +1 @@
-d1664636d38e4ce8eb2af1f09bc5a15d  ntfs-3g-1.2216.tgz
+70579e20da7cb5c1649096c6bf6d1b73  ntfs-3g-1.2310.tgz



From fedora-extras-commits at redhat.com  Mon Mar 10 19:57:45 2008
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 10 Mar 2008 19:57:45 GMT
Subject: rpms/openoffice.org/devel
	openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch,
	1.2, 1.2.2.1 openoffice.org.spec, 1.1440.2.11,
	1.1440.2.12 workspace.cmcfixes43.patch, 1.1.2.4,
	1.1.2.5 openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch, 
	1.1, NONE
Message-ID: <200803101957.m2AJvj7H022082@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22051

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch 
	openoffice.org.spec workspace.cmcfixes43.patch 
Removed Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch 
Log Message:
remove subsumed patch

openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch:

Index: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch	15 Jan 2008 12:30:51 -0000	1.2
+++ openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch	10 Mar 2008 19:57:24 -0000	1.2.2.1
@@ -356,14 +356,3 @@
                  aSuppLocales.realloc(numlocs);
  
              } else {
---- openoffice.org.orig/solenv/inc/libs.mk	2007-12-12 13:15:14.000000000 +0000
-+++ openoffice.org/inc/libs.mk	2008-01-08 08:56:51.000000000 +0000
-@@ -326,7 +326,7 @@
- SABLOT3RDLIB=-lsablot
- APP3RDLIB=-lapp
- SAMPLE3RDLIB=-lsample
--HNJLIB=-lhnj
-+HNJLIB=-lhyphen
- MYSPELLLIB=-lmyspell
- COSVLIB=-lcosv
- UDMLIB=-ludm


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.11
retrieving revision 1.1440.2.12
diff -u -r1.1440.2.11 -r1.1440.2.12
--- openoffice.org.spec	10 Mar 2008 16:02:29 -0000	1.1440.2.11
+++ openoffice.org.spec	10 Mar 2008 19:57:24 -0000	1.1440.2.12
@@ -56,18 +56,17 @@
 Source4:	http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz
 Source5:        http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
-BuildRequires:	zip, findutils, autoconf, flex, bison, gperf, ant, icu, gcc-c++
-BuildRequires:  perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, bc
-BuildRequires:	gdb, %{java_devel}, zlib-devel, vigra-devel, hsqldb, libXt-devel
-BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
-BuildRequires:	libcurl-devel, boost-devel, python-devel, expat-devel
-BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
-BuildRequires:	libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
-BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
-BuildRequires:  libxslt-devel, db4-devel, xulrunner-devel, libwpd-devel
-BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel, nss-devel >= 3.11.7-8
-BuildRequires:  xerces-j2, hyphen-devel, openssl-devel, lpsolve-devel
+BuildRequires:	zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++, gdb
+BuildRequires:	binutils, %{java_devel}, boost-devel, zlib-devel, vigra-devel
+BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
+BuildRequires:	neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
+BuildRequires:	libXt-devel, libICE-devel, libjpeg-devel, db4-devel
+BuildRequires:	xulrunner-devel, libwpd-devel, hunspell-devel, unixODBC-devel
+BuildRequires:	sane-backends-devel, libicu-devel, perl-Archive-Zip, gperf
+BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, desktop-file-utils
+BuildRequires:	evolution-data-server-devel, libtextcat-devel, nss-devel
+BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel,
+BuildRequires:	openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh, lpsolve-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
@@ -127,22 +126,20 @@
 Patch53: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
 Patch54: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
 Patch55: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch56: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
-Patch57: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch58: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch59: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch60: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch61: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch62: workspace.cairotext01.patch
-Patch63: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch64: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch65: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch66: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
-Patch67: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch68: workspace.cmcfixes43.patch
-Patch69: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
-Patch70: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch71: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+Patch56: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch57: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch58: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch59: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch60: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch61: workspace.cairotext01.patch
+Patch62: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch63: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch64: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch65: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch66: workspace.cmcfixes43.patch
+Patch67: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
+Patch68: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch69: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
 
 %define instdir %{_libdir}/openoffice.org
 %define OFFICEUPD 300
@@ -1086,22 +1083,20 @@
 %patch53 -p1 -b .ooo84676.ucb.davprotocol.patch
 %patch54 -p1 -b .ooo84621.sw.insertexcel.patch
 %patch55 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch56 -p1 -b .ooo86670.config_office.xpcomasxul.patch
-%patch57 -p1 -b .ooo85097.desktop.pagein.patch
-%patch58 -p1
-%patch59 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch60 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch61 -p1 -b .ooo85448.emptyrpath.patch
-%patch62 -p1 -b .workspace.cairotext01.patch
-%patch63 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch64 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch65 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch66 -p1 -b .ooo86268.desktop.visibilitycockup.patch
-%patch67 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch68 -p1 -b .workspace.cmcfixes43.patch
-%patch69 -p1 -b .ooo86588.sw.buildfix.patch
-%patch70 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch71 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
+%patch56 -p1 -b .ooo85097.desktop.pagein.patch
+%patch57 -p1
+%patch58 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch59 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch60 -p1 -b .ooo85448.emptyrpath.patch
+%patch61 -p1 -b .workspace.cairotext01.patch
+%patch62 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch63 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch64 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch65 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch66 -p1 -b .workspace.cmcfixes43.patch
+%patch67 -p1 -b .ooo86588.sw.buildfix.patch
+%patch68 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch69 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2879,6 +2874,7 @@
 - drop integrated workspace.gcc430two.patch
 - drop integrated openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
 - drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
+- drop subsumed openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
 - add workspace.cmcfixes43.patch
 - add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 

workspace.cmcfixes43.patch:

Index: workspace.cmcfixes43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/Attic/workspace.cmcfixes43.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- workspace.cmcfixes43.patch	10 Mar 2008 13:35:57 -0000	1.1.2.4
+++ workspace.cmcfixes43.patch	10 Mar 2008 19:57:24 -0000	1.1.2.5
@@ -294,16 +294,6 @@
 +    local:
 +        *;
 +};
-Index: sc/scext/prj/build.lst
-diff -u sc/scext/prj/build.lst:1.4 sc/scext/prj/build.lst:1.4.2.1
---- sc/scext/prj/build.lst:1.4	Mon Feb 11 00:55:26 2008
-+++ sc/scext/prj/build.lst	Mon Mar 10 05:19:15 2008
-@@ -1,4 +1,4 @@
--scx	scext	:	offuh comphelper lpsolve tools transex3 rsc NULL
-+scx	scext	:	offuh comphelper LPSOLVE:lpsolve tools transex3 rsc NULL
- scx	scext									usr1	-	all	scx_mkout NULL
- scx	scext\prj								get		-	all	scx_prj NULL
- scx	scext\source\solver						nmake	-	all	scx_solver NULL
 Index: porting/sal/qa/rtl/textenc/gcc3_export.map
 diff -u /dev/null porting/sal/qa/rtl/textenc/gcc3_export.map:1.1.2.1
 --- /dev/null	Mon Mar 10 06:32:58 2008


--- openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 20:05:03 2008
From: fedora-extras-commits at redhat.com (John W. Linville (linville))
Date: Mon, 10 Mar 2008 20:05:03 GMT
Subject: rpms/kernel/devel config-generic, 1.81, 1.82 kernel.spec, 1.487,
	1.488 linux-2.6-wireless-pending.patch, 1.33,
	1.34 linux-2.6-wireless-pending-too.patch, 1.4, NONE
Message-ID: <200803102005.m2AK53H4029394@cvs-int.fedora.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29355

Modified Files:
	config-generic kernel.spec linux-2.6-wireless-pending.patch 
Removed Files:
	linux-2.6-wireless-pending-too.patch 
Log Message:
wireless updates from 2008-03-07


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- config-generic	10 Mar 2008 15:40:17 -0000	1.81
+++ config-generic	10 Mar 2008 20:04:14 -0000	1.82
@@ -1250,6 +1250,7 @@
 CONFIG_MAC80211_RC_DEFAULT="pid"
 CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_SIMPLE=y
+CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_MAC80211_DEBUGFS=y
 # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- kernel.spec	10 Mar 2008 15:06:49 -0000	1.487
+++ kernel.spec	10 Mar 2008 20:04:14 -0000	1.488
@@ -611,7 +611,6 @@
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
-Patch682: linux-2.6-wireless-pending-too.patch
 Patch690: linux-2.6-at76.patch
 
 Patch820: linux-2.6-compile-fixes.patch
@@ -1112,8 +1111,6 @@
 #ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.26
 ApplyPatch linux-2.6-wireless-pending.patch
-# temporary backport of some later wireless patches
-ApplyPatch linux-2.6-wireless-pending-too.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
@@ -1752,6 +1749,97 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Mon Mar 10 2008 John W. Linville 
+- iwlwifi: Moving EEPROM handling in iwlcore module
+- ath5k: struct ath5k_desc cleanups
+- ath5k: move rx and tx status structures out of hardware descriptor
+- ath5k: add notes about rx timestamp
+- ath5k: work around wrong beacon rx timestamp in IBSS mode
+- libertas: convert KEY_MATERIAL to a direct command
+- libertas: add LED control TLV to types.h
+- libertas: convert 802_11_SCAN to a direct command
+- libertas: clean up scan.c, remove zeromac and bcastmac
+- iwlwifi: Cancel scanning upon association
+- iwlwifi: 802.11n spec removes AUTO offset for FAT channel
+- WEXT: add mesh interface type
+- mac80211: add mesh interface type
+- mac80211: clean up mesh code
+- mac80211: mesh hwmp locking fixes
+- mac80211: enable mesh in Kconfig
+- mac80211: add missing "break" statement in mesh code
+- mac80211: clarify mesh Kconfig
+- mac80211: export mesh_plink_broken
+- mac80211: clean up mesh RX path a bit more
+- mac80211: fix kernel-doc comment for mesh_plink_deactivate
+- mac80211: reorder a few fields in sta_info
+- mac80211: split ieee80211_txrx_data
+- mac80211: RCU-ify STA info structure access
+- mac80211: split sta_info_add
+- mac80211: clean up sta_info and document locking
+- mac80211: remove STA entries when taking down interface
+- mac80211: don't clear next_hop in path reclaim
+- mac80211: add documentation book
+- mac80211: fix sta_info mesh timer bug
+- b43: verify sta_notify mac80211 callback
+- mac80211: always insert key into list
+- mac80211: fix hardware scan completion
+- mac80211: don't call conf_tx under RCU lock
+- wireless: correct warnings from using '%llx' for type 'u64'
+- wireless: various definitions for mesh networking
+- nl80211/cfg80211: support for mesh, sta dumping
+- mac80211: mesh function and data structures definitions
+- mac80211: support functions for mesh
+- mac80211: support for mesh interfaces in mac80211 data path
+- mac80211: mesh data structures and first mesh changes
+- mac80211: mesh changes to the MLME
+- mac80211: mesh peer link implementation
+- mac80211: mesh path table implementation
+- mac80211: code for on-demand Hybrid Wireless Mesh Protocol
+- mac80211: mesh statistics and config through debugfs
+- mac80211: mesh path and mesh peer configuration
+- mac80211: complete the mesh (interface handling) code
+- mac80211: fix mesh endianness sparse warnings and unmark it as broken
+- mac80211: fix incorrect parenthesis
+- mac80211: move comment to better location
+- mac80211: breakdown mesh network attributes in different extra fields for wext
+- mac80211: clean up use of endianness conversion functions
+- mac80211: delete mesh_path timer on mesh_path removal
+- mac80211: always force mesh_path deletions
+- mac80211: add PLINK_ prefix and kernel doc to enum plink_state
+- mac80211: path IE fields macros, fix alignment problems and clean up
+- mac80211: fix mesh_path and sta_info get_by_idx functions
+- zd1211rw: support for mesh interface and beaconing
+- ssb: Add Gigabit Ethernet driver
+- b43: Add QOS support
+- b43: Rename the DMA ring pointers
+- b43: Add TX statistics debugging counters
+- b43: Fix failed frames status report typo
+- ath5k: Add RF2413 srev values
+- ath5k: Add RF2413 initial settings
+- ath5k: Identify RF2413 and deal with PHY_SPENDING
+- ath5k: more RF2413 stuff
+- ath5k: Remove RF5413 from rf gain optimization functions
+- ath5k: Fixes for PCI-E cards
+- ath5k: Make some changes to follow register dumps.
+- ath5k: Add 2413 to srev_names so that it shows up during module load
+- iwlwifi: fix potential lock inversion deadlock
+- mac80211: adding mac80211_tx_control_flags and HT flags
+- iwlwifi: use mac80211_tx_control_flags
+- mac80211: document IEEE80211_TXCTL_OFDM_HT
+- iwlwifi: grab NIC access when disabling aggregations
+- iwlwifi: removing unused priv->config
+- iwlwifi: refactor init geos function
+- iwlwifi: Fix 52 rate report in rx status
+- iwlwifi: extract iwl-csr.h
+- iwlwifi: Move HBUS address to iwl-csr.h
+- iwlwifi: add struct iwl_cfg
+- iwlwifi: Take the fw file name from the iwl_cfg.
+- iwlwifi: fix locking unbalance in 4965 rate scale
+- iwlwifi: add iwl-core module
+- iwlwifi: queue functions cleanup
+- iwlwifi: Fix 3945 rate scaling
+- iwlwifi: 3945 split tx_complete to command and packet function
+
 * Mon Mar 10 2008 Dave Jones 
 - 2.6.25-rc5
 

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.33 -r 1.34 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- linux-2.6-wireless-pending.patch	5 Mar 2008 01:09:02 -0000	1.33
+++ linux-2.6-wireless-pending.patch	10 Mar 2008 20:04:14 -0000	1.34
@@ -1,3 +1,1311 @@
+commit deedf504302ff747985db081352e045ff7087a11
+Author: Reinette Chatre 
+Date:   Fri Mar 7 13:47:20 2008 -0800
+
+    iwlwifi: fix potential lock inversion deadlock
+    
+    This is a change to a previous patch ("iwlwifi: 3945 split tx_complete
+    to command and packet function") to ensure we do not have hardirq safe
+    locks (priv->lock in this case) depend on hardirq unsafe locks.
+    
+    We only call iwl3945_tx_queue_reclaim while in a tasklet so we have to use
+    the irqsafe version of the function.
+    
+    Signed-off-by: Reinette Chatre 
+    Signed-off-by: Tomas Winkler 
+    Signed-off-by: John W. Linville 
+
+commit f868f4e196177ee96f77304ab707a0ad5ddd6fe4
+Author: John W. Linville 
+Date:   Fri Mar 7 16:38:43 2008 -0500
+
+    wireless: correct warnings from using '%llx' for type 'u64'
+    
+    drivers/net/wireless/ath5k/debug.c: In function 'read_file_tsf': drivers/net/wireless/ath5k/debug.c:203: warning: format '%016llx'
+    expects type 'long long unsigned int', but argument 4 has type 'u64' drivers/net/wireless/ath5k/debug.c:203: warning: format '%016llx'
+    expects type 'long long unsigned int', but argument 4 has type 'u64' drivers/net/wireless/ath5k/debug.c: In function 'read_file_beacon':
+    drivers/net/wireless/ath5k/debug.c:274: warning: format '%016llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
+    drivers/net/wireless/ath5k/debug.c:274: warning: format '%016llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
+    
+    drivers/net/wireless/iwlwifi/iwl-4965.c: In function 'iwl4965_tx_status_reply_compressed_ba':
+    drivers/net/wireless/iwlwifi/iwl-4965.c:3907: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
+    drivers/net/wireless/iwlwifi/iwl-4965.c: In function 'iwl4965_rx_reply_compressed_ba':
+    drivers/net/wireless/iwlwifi/iwl-4965.c:4039: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type '__le64'
+    drivers/net/wireless/iwlwifi/iwl-4965.c:4046: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
+    drivers/net/wireless/iwlwifi/iwl4965-base.c: In function 'iwl4965_tx_status_reply_tx':
+    drivers/net/wireless/iwlwifi/iwl4965-base.c:3661: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64'
+    
+    Signed-off-by: John W. Linville 
+
+commit 6ba81c2c989291c5893014f84805ce9d196778b0
+Author: Bruno Randolf 
+Date:   Wed Mar 5 18:36:26 2008 +0900
+
+    ath5k: work around wrong beacon rx timestamp in IBSS mode
+    
+    atheros hardware has a problem with the rx timestamp of some IBSS beacons when
+    they caused a TSF update (they have the same BSSID).
+    
+    the rx timestamp is wrong especially if the beacon frames get bigger than 78
+    byte (at least on AR5213 and AR5414 hardware). in that case ath5k_extend_tsf()
+    will assume a rs_tstamp overflow and give us a timestamp too far in the past
+    which will cause mac80211 to merge IBSS on every beacon (which is not necessary
+    since the BSSID already matches). but in this case we know that the HW must
+    have synced to the beacons TSF and the rx timestamp must be later than that so
+    we can adjust mactime accordingly.
+    
+    also rename the function to ath5k_check_ibss_tsf() and change comments, since
+    "hw merge" is better described as a TSF update.
+    
+    drivers/net/wireless/ath5k/base.c:      Changes-licensed-under: 3-Clause-BSD
+    
+    Signed-off-by: Bruno Randolf 
+    Signed-off-by: John W. Linville 
+
+commit e14296cabac60806606b4ebc1a83ee4697876346
+Author: Bruno Randolf 
+Date:   Wed Mar 5 18:36:05 2008 +0900
+
+    ath5k: add notes about rx timestamp
+    
+    add comments about the fact that we don't know when exactly the atheros
+    hardware takes the RX timestamp.
+    
+    drivers/net/wireless/ath5k/base.c:      Changes-licensed-under: 3-Clause-BSD
+    
+    Signed-off-by: Bruno Randolf 
+    Signed-off-by: John W. Linville 
+
+commit b47f407bef0d5349dacf65cd3560a976609d4b45
+Author: Bruno Randolf 
+Date:   Wed Mar 5 18:35:45 2008 +0900
+
+    ath5k: move rx and tx status structures out of hardware descriptor
+    
+    move ath5k_tx_status and ath5k_rx_status structures out of the hardware
+    descriptor since they are not accessed by the hardware at all. they just
+    contain converted information from the hardware descriptor. since they are only
+    used in the rx and tx tasklets there is also no use to keep them for each
+    descriptor.
+    
+    drivers/net/wireless/ath5k/ath5k.h:     Changes-licensed-under: ISC
+    drivers/net/wireless/ath5k/base.c:      Changes-licensed-under: 3-Clause-BSD
+    drivers/net/wireless/ath5k/debug.c:     Changes-licensed-under: GPL
+    drivers/net/wireless/ath5k/debug.h:     Changes-licensed-under: GPL
+    drivers/net/wireless/ath5k/hw.c:        Changes-licensed-under: ISC
+    
+    Signed-off-by: Bruno Randolf 
+    Signed-off-by: John W. Linville 
+
+commit 19fd6e5510f6991148e2210753b58f0eab95e0f6
+Author: Bruno Randolf 
+Date:   Wed Mar 5 18:35:23 2008 +0900
+
+    ath5k: struct ath5k_desc cleanups
+    
+    * make struct ath5k_desc clearer by directly including unions of structures,
+      which correspond to the hardware descriptors of different HW versions (5210
+      and 5212). before they were casted at onto ath5k_desc at different points
+      (e.g.  ds_hw[2]).
+    
+    * rename some structures and variable names to make their use clearer, e.g.
+      struct ath5k_hw_4w_tx_desc to ath5k_hw_4w_tx_ctl.
+    
+    * substitute "old" with "5210" and "new" with "5212" (eg. rename
+      ath5k_hw_proc_new_rx_status() to ath5k_hw_proc_5212_rx_status()) because old
+      and new are relative and we might have a newer structure at some point.
+    
+    * unify structs ath5k_hw_old_rx_status and ath5k_hw_new_rx_status into one
+      ath5k_hw_rx_status, because they only differ in the flags and masks.
+    
+    drivers/net/wireless/ath5k/ath5k.h:     Changes-licensed-under: ISC
+    drivers/net/wireless/ath5k/debug.c:     Changes-licensed-under: GPL
+    drivers/net/wireless/ath5k/hw.c:        Changes-licensed-under: ISC
+    drivers/net/wireless/ath5k/hw.h:        Changes-licensed-under: ISC
+    
+    Signed-off-by: Bruno Randolf 
+    Signed-off-by: John W. Linville 
+
+commit b095d03a7d724db7379b73f64b6035f7be2e0a7c
+Author: Ron Rindjunsky 
+Date:   Thu Mar 6 17:36:56 2008 -0800
+
+    iwlwifi: grab NIC access when disabling aggregations
+    
+    This patch grabs NIC access inside iwl4965_tx_queue_agg_disable, instead of the
+    caller doing it.
+    The caller must still hold priv->lock when calling the function.
+    
+    Signed-off-by: Max Stepanov 
+    Signed-off-by: Emmanuel Grumbach 
+    Signed-off-by: Ron Rindjunsky 
+    Signed-off-by: Tomas Winkler 
+    Signed-off-by: John W. Linville 
+
+commit 91c066f27b6dacb6589fb5190af373fb9f993397
+Author: Tomas Winkler 
+Date:   Thu Mar 6 17:36:55 2008 -0800
+
+    iwlwifi: 3945 split tx_complete to command and packet function
+    
+    This patch
+    1. removes cmd completion from iwl3945_tx_queue_reclaim
+    and creates iwl3945_cmd_queue_reclaim.
+    1. removes 11n relevant elements from this function
+    2. removes call to ieee80211_tx_status_irqsafe
+    and uses ieee80211_tx_status only
+    
+    Signed-off-by: Tomas Winkler 
+    Signed-off-by: Reinette Chatre 
+    Signed-off-by: John W. Linville 
+
+commit 28447f3cfdf72f6ea97b50cc1eefe35602107dff
+Author: Tomas Winkler 
+Date:   Thu Mar 6 17:36:54 2008 -0800
+
+    iwlwifi: Fix 3945 rate scaling
+    
+    This patch fix 3945 rate scaling after cfg80211 rate/band changes
+    
+    Signed-off-by: Tomas Winkler 
+    Signed-off-by: Reinette Chatre 
+    Signed-off-by: John W. Linville 
+
+commit c54b679ddcd91604fd0d144cd793a0ddbd0ae03d
+Author: Tomas Winkler 
+Date:   Thu Mar 6 17:36:53 2008 -0800
+
+    iwlwifi: queue functions cleanup
+    
+    This patch moves
+    1. iwl_queue_inc_wrap and int iwl_queue_dec_wrap
+    into  iwl-helpers.h these two functions are identical to common
+    for both iwl3956 and iwl4965
+    2. renames x2_queue_used to iwl3945_x2_queue_used
+    3. exports iwl3945_queue_space out of iwl3964-base.c
+    
+    Signed-off-by: Tomas Winkler 
+    Signed-off-by: Reinette Chatre 
+    Signed-off-by: John W. Linville 
+
+commit 34cf6ff6dd42cbc61fd652f893dcf71eed6052a5
[...30632 lines suppressed...]
++!Finclude/net/mac80211.h ieee80211_if_init_conf
++!Finclude/net/mac80211.h ieee80211_if_conf
++    
++
++    
++      Receive and transmit processing
++      
++        what should be here
++        TBD
++        
++          This should describe the receive and transmit
++          paths in mac80211/the drivers as well as
++          transmit status handling.
++        
++      
++      
++        Frame format
++!Pinclude/net/mac80211.h Frame format
++      
++      
++        Alignment issues
++        TBD
++      
++      
++        Calling into mac80211 from interrupts
++!Pinclude/net/mac80211.h Calling mac80211 from interrupts
++      
++      
++        functions/definitions
++!Finclude/net/mac80211.h ieee80211_rx_status
++!Finclude/net/mac80211.h mac80211_rx_flags
++!Finclude/net/mac80211.h ieee80211_tx_control
++!Finclude/net/mac80211.h ieee80211_tx_status_flags
++!Finclude/net/mac80211.h ieee80211_rx
++!Finclude/net/mac80211.h ieee80211_rx_irqsafe
++!Finclude/net/mac80211.h ieee80211_tx_status
++!Finclude/net/mac80211.h ieee80211_tx_status_irqsafe
++!Finclude/net/mac80211.h ieee80211_rts_get
++!Finclude/net/mac80211.h ieee80211_rts_duration
++!Finclude/net/mac80211.h ieee80211_ctstoself_get
++!Finclude/net/mac80211.h ieee80211_ctstoself_duration
++!Finclude/net/mac80211.h ieee80211_generic_frame_duration
++!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb
++!Finclude/net/mac80211.h ieee80211_get_hdrlen
++!Finclude/net/mac80211.h ieee80211_wake_queue
++!Finclude/net/mac80211.h ieee80211_stop_queue
++!Finclude/net/mac80211.h ieee80211_start_queues
++!Finclude/net/mac80211.h ieee80211_stop_queues
++!Finclude/net/mac80211.h ieee80211_wake_queues
++      
++    
++
++    
++      Frame filtering
++!Pinclude/net/mac80211.h Frame filtering
++!Finclude/net/mac80211.h ieee80211_filter_flags
++    
++  
++
++  
++    Advanced driver interface
++    
++      
++       Information contained within this part of the book is
++       of interest only for advanced interaction of mac80211
++       with drivers to exploit more hardware capabilities and
++       improve performance.
++      
++    
++
++    
++      Hardware crypto acceleration
++!Pinclude/net/mac80211.h Hardware crypto acceleration
++
++!Finclude/net/mac80211.h set_key_cmd
++!Finclude/net/mac80211.h ieee80211_key_conf
++!Finclude/net/mac80211.h ieee80211_key_alg
++!Finclude/net/mac80211.h ieee80211_key_flags
++    
++
++    
++      Multiple queues and QoS support
++      TBD
++!Finclude/net/mac80211.h ieee80211_tx_queue_params
++!Finclude/net/mac80211.h ieee80211_tx_queue_stats_data
++!Finclude/net/mac80211.h ieee80211_tx_queue
++    
++
++    
++      Access point mode support
++      TBD
++      Some parts of the if_conf should be discussed here instead
++      
++        Insert notes about VLAN interfaces with hw crypto here or
++        in the hw crypto chapter.
++      
++!Finclude/net/mac80211.h ieee80211_get_buffered_bc
++!Finclude/net/mac80211.h ieee80211_beacon_get
++    
++
++    
++      Supporting multiple virtual interfaces
++      TBD
++      
++        Note: WDS with identical MAC address should almost always be OK
++      
++      
++        Insert notes about having multiple virtual interfaces with
++        different MAC addresses here, note which configurations are
++        supported by mac80211, add notes about supporting hw crypto
++        with it.
++      
++    
++
++    
++      Hardware scan offload
++      TBD
++!Finclude/net/mac80211.h ieee80211_scan_completed
++    
++  
++
++  
++    Rate control interface
++    
++      TBD
++      
++       This part of the book describes the rate control algorithm
++       interface and how it relates to mac80211 and drivers.
++      
++    
++    
++      dummy chapter
++      TBD
++    
++  
++
++  
++    Internals
++    
++      TBD
++      
++       This part of the book describes mac80211 internals.
++      
++    
++
++    
++      Key handling
++      
++        Key handling basics
++!Pnet/mac80211/key.c Key handling basics
++      
++      
++        MORE TBD
++        TBD
++      
++    
++
++    
++      Receive processing
++      TBD
++    
++
++    
++      Transmit processing
++      TBD
++    
++
++    
++      Station info handling
++      
++        Programming information
++!Fnet/mac80211/sta_info.h sta_info
++!Fnet/mac80211/sta_info.h ieee80211_sta_info_flags
++      
++      
++        STA information lifetime rules
++!Pnet/mac80211/sta_info.c STA information lifetime rules
++      
++    
++
++    
++      Synchronisation
++      TBD
++      Locking, lots of RCU
++    
++  
++
+diff -up linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig linux-2.6.24.noarch/Documentation/DocBook/Makefile
+--- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig	2008-03-10 14:49:12.000000000 -0400
++++ linux-2.6.24.noarch/Documentation/DocBook/Makefile	2008-03-10 15:20:34.000000000 -0400
+@@ -11,7 +11,8 @@ DOCBOOKS := wanbook.xml z8530book.xml mc
+ 	    procfs-guide.xml writing_usb_driver.xml networking.xml \
+ 	    kernel-api.xml filesystems.xml lsm.xml usb.xml \
+ 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
+-	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml
++	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
++	    mac80211.xml
+ 
+ ###
+ # The build process is as follows (targets):


--- linux-2.6-wireless-pending-too.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Mar 10 20:09:27 2008
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 10 Mar 2008 20:09:27 GMT
Subject: comps comps-f9.xml.in,1.299,1.300
Message-ID: <200803102009.m2AK9RaW029517@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29498

Modified Files:
	comps-f9.xml.in 
Log Message:
going with packagekit by default for the beta



Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f9.xml.in,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- comps-f9.xml.in	8 Mar 2008 19:48:46 -0000	1.299
+++ comps-f9.xml.in	10 Mar 2008 20:08:57 -0000	1.300
@@ -9,7 +9,7 @@
     true
     
       authconfig-gtk
-      pirut
+      gnome-packagekit
       system-config-boot
       system-config-date
       system-config-keyboard
@@ -32,6 +32,7 @@
       luma
       opyum
       pessulus
+      pirut
       qtparted
       system-config-kickstart
       yumex
@@ -267,7 +268,7 @@
       words
       ypbind
       yum
-      yum-updatesd
+      yum-updatesd
       yum-utils
       zip
       apmd



From fedora-extras-commits at redhat.com  Mon Mar 10 20:16:55 2008
From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh))
Date: Mon, 10 Mar 2008 20:16:55 GMT
Subject: rpms/selinux-policy/devel policy-20071130.patch, 1.92,
	1.93 selinux-policy.spec, 1.627, 1.628
Message-ID: <200803102016.m2AKGtIZ029626@cvs-int.fedora.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29592

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
* Mon Mar 10 2008 Dan Walsh  3.3.1-13
- Additional changes for MLS policy


policy-20071130.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.92 -r 1.93 policy-20071130.patch
Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- policy-20071130.patch	6 Mar 2008 22:25:06 -0000	1.92
+++ policy-20071130.patch	10 Mar 2008 20:16:22 -0000	1.93
@@ -2050,7 +2050,7 @@
  ifdef(`distro_suse', `
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.3.1/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2007-05-18 11:12:44.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/admin/rpm.if	2008-02-26 08:29:22.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/rpm.if	2008-03-09 08:33:16.000000000 -0400
 @@ -152,6 +152,24 @@
  
  ########################################
@@ -2076,10 +2076,31 @@
  ##	Send and receive messages from
  ##	rpm over dbus.
  ##
-@@ -173,6 +191,27 @@ +@@ -173,6 +191,48 @@ ######################################## ## ++## dontaudit attempts to Send and receive messages from ++## rpm over dbus. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`rpm_dontaudit_dbus_chat',` ++ gen_require(` ++ type rpm_t; ++ class dbus send_msg; ++ ') ++ ++ dontaudit $1 rpm_t:dbus send_msg; ++ dontaudit rpm_t $1:dbus send_msg; ++') ++ ++######################################## ++## +## Send and receive messages from +## rpm_script over dbus. +## @@ -2104,7 +2125,7 @@ ## Create, read, write, and delete the RPM log. ## ## -@@ -210,6 +249,24 @@ +@@ -210,6 +270,24 @@ ######################################## ## @@ -2129,7 +2150,7 @@ ## Create, read, write, and delete RPM ## script temporary files. ## -@@ -225,7 +282,29 @@ +@@ -225,7 +303,29 @@ ') files_search_tmp($1) @@ -2159,7 +2180,7 @@ ') ######################################## -@@ -289,3 +368,157 @@ +@@ -289,3 +389,157 @@ dontaudit $1 rpm_var_lib_t:file manage_file_perms; dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms; ') @@ -5055,7 +5076,7 @@ +HOME_DIR/\.macromedia(/.*)? gen_context(system_u:object_r:user_nsplugin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.3.1/policy/modules/apps/nsplugin.if --- nsaserefpolicy/policy/modules/apps/nsplugin.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.if 2008-03-04 14:46:08.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.if 2008-03-10 14:36:14.000000000 -0400 @@ -0,0 +1,344 @@ + +## policy for nsplugin @@ -5272,7 +5293,7 @@ + nsplugin_use($1, $2) + + optional_policy(` -+ xserver_common_app_template($2, nsplugin_t) ++ xserver_common_app_to_user($2, nsplugin_t) + ') + + role $3 types nsplugin_t; @@ -5403,8 +5424,8 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.3.1/policy/modules/apps/nsplugin.te --- nsaserefpolicy/policy/modules/apps/nsplugin.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.te 2008-03-04 10:03:36.000000000 -0500 -@@ -0,0 +1,154 @@ ++++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.te 2008-03-10 14:35:49.000000000 -0400 +@@ -0,0 +1,166 @@ + +policy_module(nsplugin,1.0.0) + @@ -5471,6 +5492,7 @@ + +dev_read_rand(nsplugin_t) +dev_read_sound(nsplugin_t) ++dev_write_sound(nsplugin_t) + +kernel_read_kernel_sysctls(nsplugin_t) +kernel_read_system_state(nsplugin_t) @@ -5495,6 +5517,7 @@ +miscfiles_manage_home_fonts(nsplugin_t) + +userdom_read_user_home_content_files(user, nsplugin_t) ++userdom_read_user_tmp_files(user, nsplugin_t) +userdom_write_user_tmp_sockets(user, nsplugin_t) +userdom_dontaudit_append_unpriv_home_content_files(nsplugin_t) + @@ -5503,6 +5526,10 @@ +') + +optional_policy(` ++ gnome_exec_gconf(nsplugin_t) ++') ++ ++optional_policy(` + mozilla_read_user_home_files(user, nsplugin_t) + mozilla_write_user_home_files(user, nsplugin_t) +') @@ -5511,6 +5538,7 @@ + xserver_stream_connect_xdm_xserver(nsplugin_t) + xserver_xdm_rw_shm(nsplugin_t) + xserver_read_xdm_tmp_files(nsplugin_t) ++ xserver_read_user_xauth(user, nsplugin_t) +') + +######################################## @@ -5519,16 +5547,18 @@ +# + +allow nsplugin_config_t self:capability { sys_nice setuid setgid }; -+allow nsplugin_config_t self:process { setsched getsched execmem }; ++allow nsplugin_config_t self:process { setsched sigkill getsched execmem }; +allow nsplugin_t self:sem create_sem_perms; +allow nsplugin_t self:shm create_shm_perms; ++allow nsplugin_t self:msgq create_msgq_perms; + +allow nsplugin_config_t self:fifo_file rw_file_perms; +allow nsplugin_config_t self:unix_stream_socket create_stream_socket_perms; + +manage_dirs_pattern(nsplugin_t, nsplugin_tmp_t, nsplugin_tmp_t) +manage_files_pattern(nsplugin_t, nsplugin_tmp_t, nsplugin_tmp_t) -+files_tmp_filetrans(nsplugin_t, nsplugin_tmp_t, { file dir }) ++manage_sock_files_pattern(nsplugin_t, nsplugin_tmp_t, nsplugin_tmp_t) ++files_tmp_filetrans(nsplugin_t, nsplugin_tmp_t, { file dir sock_file }) + +can_exec(nsplugin_config_t, nsplugin_rw_t) +manage_dirs_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t) @@ -5559,6 +5589,9 @@ +userdom_search_all_users_home_content(nsplugin_config_t) + +nsplugin_domtrans(nsplugin_config_t) ++ ++allow nsplugin_t user_home_t:dir { write read }; ++allow nsplugin_t user_home_t:file write; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-3.3.1/policy/modules/apps/screen.fc --- nsaserefpolicy/policy/modules/apps/screen.fc 2007-10-12 08:56:02.000000000 -0400 +++ serefpolicy-3.3.1/policy/modules/apps/screen.fc 2008-02-26 08:29:22.000000000 -0500 @@ -10430,7 +10463,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.3.1/policy/modules/services/consolekit.te --- nsaserefpolicy/policy/modules/services/consolekit.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/consolekit.te 2008-02-26 10:37:39.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/consolekit.te 2008-03-10 13:34:57.000000000 -0400 @@ -13,6 +13,9 @@ type consolekit_var_run_t; files_pid_file(consolekit_var_run_t) @@ -10470,7 +10503,7 @@ # needs to read /var/lib/dbus/machine-id files_read_var_lib_files(consolekit_t) -@@ -47,16 +57,33 @@ +@@ -47,16 +57,37 @@ auth_use_nsswitch(consolekit_t) @@ -10492,22 +10525,26 @@ +hal_ptrace(consolekit_t) +mcs_ptrace_all(consolekit_t) + ++optional_policy(` ++ cron_read_system_job_lib_files(consolekit_t) ++') ++ optional_policy(` - dbus_system_bus_client_template(consolekit, consolekit_t) [...2097 lines suppressed...] interface(`userdom_getattr_sysadm_home_dirs',` gen_require(` @@ -31198,7 +31449,7 @@ ') ######################################## -@@ -4551,10 +4700,10 @@ +@@ -4551,10 +4701,10 @@ # interface(`userdom_dontaudit_getattr_sysadm_home_dirs',` gen_require(` @@ -31211,7 +31462,7 @@ ') ######################################## -@@ -4569,10 +4718,10 @@ +@@ -4569,10 +4719,10 @@ # interface(`userdom_search_sysadm_home_dirs',` gen_require(` @@ -31224,7 +31475,7 @@ ') ######################################## -@@ -4588,10 +4737,10 @@ +@@ -4588,10 +4738,10 @@ # interface(`userdom_dontaudit_search_sysadm_home_dirs',` gen_require(` @@ -31237,7 +31488,7 @@ ') ######################################## -@@ -4606,10 +4755,10 @@ +@@ -4606,10 +4756,10 @@ # interface(`userdom_list_sysadm_home_dirs',` gen_require(` @@ -31250,7 +31501,7 @@ ') ######################################## -@@ -4625,10 +4774,10 @@ +@@ -4625,10 +4775,10 @@ # interface(`userdom_dontaudit_list_sysadm_home_dirs',` gen_require(` @@ -31263,7 +31514,7 @@ ') ######################################## -@@ -4644,12 +4793,11 @@ +@@ -4644,12 +4794,11 @@ # interface(`userdom_dontaudit_read_sysadm_home_content_files',` gen_require(` @@ -31279,7 +31530,7 @@ ') ######################################## -@@ -4676,10 +4824,10 @@ +@@ -4676,10 +4825,10 @@ # interface(`userdom_sysadm_home_dir_filetrans',` gen_require(` @@ -31292,7 +31543,7 @@ ') ######################################## -@@ -4694,10 +4842,10 @@ +@@ -4694,10 +4843,10 @@ # interface(`userdom_search_sysadm_home_content_dirs',` gen_require(` @@ -31305,7 +31556,7 @@ ') ######################################## -@@ -4712,13 +4860,13 @@ +@@ -4712,13 +4861,13 @@ # interface(`userdom_read_sysadm_home_content_files',` gen_require(` @@ -31323,7 +31574,7 @@ ') ######################################## -@@ -4754,11 +4902,49 @@ +@@ -4754,11 +4903,49 @@ # interface(`userdom_search_all_users_home_dirs',` gen_require(` @@ -31374,7 +31625,7 @@ ') ######################################## -@@ -4778,6 +4964,14 @@ +@@ -4778,6 +4965,14 @@ files_list_home($1) allow $1 home_dir_type:dir list_dir_perms; @@ -31389,7 +31640,7 @@ ') ######################################## -@@ -4839,6 +5033,26 @@ +@@ -4839,6 +5034,26 @@ ######################################## ## @@ -31416,7 +31667,7 @@ ## Create, read, write, and delete all directories ## in all users home directories. ## -@@ -4859,6 +5073,25 @@ +@@ -4859,6 +5074,25 @@ ######################################## ## @@ -31442,7 +31693,7 @@ ## Create, read, write, and delete all files ## in all users home directories. ## -@@ -4879,6 +5112,26 @@ +@@ -4879,6 +5113,26 @@ ######################################## ## @@ -31469,7 +31720,7 @@ ## Create, read, write, and delete all symlinks ## in all users home directories. ## -@@ -5115,7 +5368,7 @@ +@@ -5115,7 +5369,7 @@ # interface(`userdom_relabelto_generic_user_home_dirs',` gen_require(` @@ -31478,7 +31729,7 @@ ') files_search_home($1) -@@ -5304,6 +5557,50 @@ +@@ -5304,6 +5558,50 @@ ######################################## ## @@ -31529,7 +31780,7 @@ ## Create, read, write, and delete directories in ## unprivileged users home directories. ## -@@ -5509,6 +5806,42 @@ +@@ -5509,6 +5807,42 @@ ######################################## ## @@ -31572,7 +31823,7 @@ ## Read and write unprivileged user ttys. ## ## -@@ -5674,6 +6007,42 @@ +@@ -5674,6 +6008,42 @@ ######################################## ## @@ -31615,7 +31866,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5704,3 +6073,368 @@ +@@ -5704,3 +6074,368 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') @@ -33213,11 +33464,24 @@ +## Policy for user user diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.te serefpolicy-3.3.1/policy/modules/users/user.te --- nsaserefpolicy/policy/modules/users/user.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/users/user.te 2008-02-26 08:29:22.000000000 -0500 -@@ -0,0 +1,4 @@ ++++ serefpolicy-3.3.1/policy/modules/users/user.te 2008-03-10 11:57:48.000000000 -0400 +@@ -0,0 +1,17 @@ +policy_module(user,1.0.1) +userdom_unpriv_user_template(user) + ++optional_policy(` ++ kerneloops_dontaudit_dbus_chat(user_t) ++') ++ ++optional_policy(` ++ rpm_dontaudit_dbus_chat(user_t) ++') ++ ++optional_policy(` ++ setroubleshoot_dontaudit_stream_connect(user_t) ++') ++ ++ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.3.1/policy/modules/users/webadm.fc --- nsaserefpolicy/policy/modules/users/webadm.fc 1969-12-31 19:00:00.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.627 retrieving revision 1.628 diff -u -r1.627 -r1.628 --- selinux-policy.spec 6 Mar 2008 21:50:52 -0000 1.627 +++ selinux-policy.spec 10 Mar 2008 20:16:22 -0000 1.628 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -388,6 +388,9 @@ %endif %changelog +* Mon Mar 10 2008 Dan Walsh 3.3.1-13 +- Additional changes for MLS policy + * Thu Mar 6 2008 Dan Walsh 3.3.1-12 - Fix initrc_context generation for MLS From fedora-extras-commits at redhat.com Mon Mar 10 20:31:23 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Mon, 10 Mar 2008 20:31:23 GMT Subject: rpms/kernel/F-8 kernel.spec, 1.370, 1.371 linux-2.6-utrace-tracehook.patch, 1.19, 1.20 linux-2.6-x86-clear-df-for-signals.patch, 1.1, 1.2 Message-ID: <200803102031.m2AKVNQU029941@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29880 Modified Files: kernel.spec linux-2.6-utrace-tracehook.patch linux-2.6-x86-clear-df-for-signals.patch Log Message: * Mon Mar 10 2008 Chuck Ebbert 2.6.24.3-25 - Use better fix for clearing the direction flag for x86 signal handlers. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.370 retrieving revision 1.371 diff -u -r1.370 -r1.371 --- kernel.spec 10 Mar 2008 18:49:01 -0000 1.370 +++ kernel.spec 10 Mar 2008 20:30:28 -0000 1.371 @@ -1004,10 +1004,6 @@ # Revert -stable pieces we get from elsewhere here ApplyPatch linux-2.6-upstream-reverts.patch -R -# clear DF before calling signal handlers -# (must be applied before utrace) -ApplyPatch linux-2.6-x86-clear-df-for-signals.patch - # Roland's utrace ptrace replacement. # Main patch includes i386, x86_64, powerpc. ApplyPatch linux-2.6-utrace-tracehook.patch @@ -1067,6 +1063,8 @@ #ApplyPatch linux-2.6-x86-debug-boot.patch # allow i686 kernel to boot on non-mainstream processors ApplyPatch linux-2.6-x86-dont-use-p6-nops.patch +# clear DF before calling signal handlers +ApplyPatch linux-2.6-x86-clear-df-for-signals.patch # # PowerPC @@ -1913,6 +1911,9 @@ %changelog +* Mon Mar 10 2008 Chuck Ebbert 2.6.24.3-25 +- Use better fix for clearing the direction flag for x86 signal handlers. + * Mon Mar 10 2008 Chuck Ebbert 2.6.24.3-24 - ACPI: really disable stray GPEs (#251744) - x86: clear direction flag before calling signal handlers linux-2.6-utrace-tracehook.patch: Index: linux-2.6-utrace-tracehook.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-utrace-tracehook.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- linux-2.6-utrace-tracehook.patch 10 Mar 2008 18:49:01 -0000 1.19 +++ linux-2.6-utrace-tracehook.patch 10 Mar 2008 20:30:28 -0000 1.20 @@ -875,25 +875,23 @@ --- linux-2.6/arch/x86/ia32/ia32_signal.c +++ linux-2.6/arch/x86/ia32/ia32_signal.c -@@ -492,11 +492,8 @@ int ia32_setup_frame(int sig, struct k_s +@@ -492,11 +492,7 @@ int ia32_setup_frame(int sig, struct k_s regs->cs = __USER32_CS; regs->ss = __USER32_DS; - set_fs(USER_DS); -- regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); -+ regs->eflags &= ~X86_EFLAGS_DF; +- regs->eflags &= ~TF_MASK; - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); #if DEBUG_SIG printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n", -@@ -600,9 +596,7 @@ int ia32_setup_rt_frame(int sig, struct +@@ -600,9 +596,6 @@ int ia32_setup_rt_frame(int sig, struct regs->ss = __USER32_DS; set_fs(USER_DS); -- regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); -+ regs->eflags &= ~X86_EFLAGS_DF; +- regs->eflags &= ~TF_MASK; - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); @@ -1002,12 +1000,11 @@ #include #include #include -@@ -295,9 +295,7 @@ static int setup_rt_frame(int sig, struc +@@ -295,9 +295,6 @@ static int setup_rt_frame(int sig, struc see include/asm-x86_64/uaccess.h for details. */ set_fs(USER_DS); -- regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); -+ regs->eflags &= ~X86_EFLAGS_DF; +- regs->eflags &= ~TF_MASK; - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); #ifdef DEBUG_SIG @@ -1433,7 +1430,7 @@ #include #include #include -@@ -390,16 +390,7 @@ static int setup_frame(int sig, struct k +@@ -390,16 +390,6 @@ static int setup_frame(int sig, struct k regs->xss = __USER_DS; regs->xcs = __USER_CS; @@ -1443,15 +1440,14 @@ - * The tracer may want to single-step inside the - * handler too. - */ -- regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); -+ regs->eflags &= ~X86_EFLAGS_DF; +- regs->eflags &= ~TF_MASK; - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); - #if DEBUG_SIG printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n", current->comm, current->pid, frame, regs->eip, frame->pretcode); -@@ -483,16 +473,7 @@ static int setup_rt_frame(int sig, struc +@@ -483,16 +473,6 @@ static int setup_rt_frame(int sig, struc regs->xss = __USER_DS; regs->xcs = __USER_CS; @@ -1461,8 +1457,7 @@ - * The tracer may want to single-step inside the - * handler too. - */ -- regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); -+ regs->eflags &= ~X86_EFLAGS_DF; +- regs->eflags &= ~TF_MASK; - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); - linux-2.6-x86-clear-df-for-signals.patch: Index: linux-2.6-x86-clear-df-for-signals.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-x86-clear-df-for-signals.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-x86-clear-df-for-signals.patch 10 Mar 2008 18:49:01 -0000 1.1 +++ linux-2.6-x86-clear-df-for-signals.patch 10 Mar 2008 20:30:28 -0000 1.2 @@ -1,86 +1,29 @@ +Upstream: + Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e40cd10ccff3d9fbffd57b93780bee4b7b9bff51 Commit: e40cd10ccff3d9fbffd57b93780bee4b7b9bff51 -Parent: ce4796d1e16cf3761dc2a02b8d588667d05b3078 -Author: Aurelien Jarno -AuthorDate: Wed Mar 5 19:14:24 2008 +0100 -Committer: Ingo Molnar -CommitDate: Fri Mar 7 16:39:14 2008 +0100 - x86: clear DF before calling signal handler - - The Linux kernel currently does not clear the direction flag before - calling a signal handler, whereas the x86/x86-64 ABI requires that. - - Linux had this behavior/bug forever, but this becomes a real problem - with gcc version 4.3, which assumes that the direction flag is - correctly cleared at the entry of a function. - - This patches changes the setup_frame() functions to clear the - direction before entering the signal handler. - - Signed-off-by: Aurelien Jarno - Signed-off-by: Ingo Molnar - Acked-by: H. Peter Anvin ---- - arch/x86/ia32/ia32_signal.c | 4 ++-- - arch/x86/kernel/signal_32.c | 4 ++-- - arch/x86/kernel/signal_64.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) +Simplified fix for utrace kernel. + -diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c -index 1c0503b..5e7771a 100644 ---- a/arch/x86/ia32/ia32_signal.c -+++ b/arch/x86/ia32/ia32_signal.c -@@ -500,7 +500,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, - regs->ss = __USER32_DS; - - set_fs(USER_DS); -- regs->eflags &= ~TF_MASK; -+ regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); - -@@ -600,7 +600,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, - regs->ss = __USER32_DS; - - set_fs(USER_DS); -- regs->eflags &= ~TF_MASK; -+ regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); - -diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c -index caee1f0..0157a6f 100644 ---- a/arch/x86/kernel/signal_32.c -+++ b/arch/x86/kernel/signal_32.c -@@ -407,7 +407,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, - * The tracer may want to single-step inside the - * handler too. - */ -- regs->eflags &= ~TF_MASK; -+ regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); - -@@ -500,7 +500,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, - * The tracer may want to single-step inside the - * handler too. - */ -- regs->eflags &= ~TF_MASK; -+ regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); - -diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c -index 7347bb1..56b72fb 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c -@@ -295,7 +295,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, - see include/asm-x86_64/uaccess.h for details. */ - set_fs(USER_DS); +@@ -384,7 +384,7 @@ handle_signal(unsigned long sig, siginfo + * The tracer may want to single-step inside the + * handler too. + */ +- regs->eflags &= ~TF_MASK; ++ regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); + tracehook_report_handle_signal(sig, ka, oldset, regs); + } -- regs->eflags &= ~TF_MASK; -+ regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); - #ifdef DEBUG_SIG +--- a/arch/x86/kernel/signal_32.c ++++ b/arch/x86/kernel/signal_32.c +@@ -540,7 +540,7 @@ handle_signal(unsigned long sig, siginfo + * The tracer may want to single-step inside the + * handler too. + */ +- regs->eflags &= ~TF_MASK; ++ regs->eflags &= ~(TF_MASK | X86_EFLAGS_DF); + tracehook_report_handle_signal(sig, ka, oldset, regs); + } From fedora-extras-commits at redhat.com Mon Mar 10 20:34:27 2008 From: fedora-extras-commits at redhat.com (Joel Andres Granados Moreno (jgranado)) Date: Mon, 10 Mar 2008 20:34:27 GMT Subject: rpms/firstaidkit/devel .cvsignore, 1.2, 1.3 firstaidkit.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803102034.m2AKYRgB029996@cvs-int.fedora.redhat.com> Author: jgranado Update of /cvs/pkgs/rpms/firstaidkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29972 Modified Files: .cvsignore firstaidkit.spec sources Log Message: update to version 0.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Jan 2008 08:32:28 -0000 1.2 +++ .cvsignore 10 Mar 2008 20:33:53 -0000 1.3 @@ -1 +1 @@ -firstaidkit-0.1.0.tar.bz2 +firstaidkit-0.1.1.tar.bz2 Index: firstaidkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- firstaidkit.spec 15 Jan 2008 08:32:28 -0000 1.1 +++ firstaidkit.spec 10 Mar 2008 20:33:53 -0000 1.2 @@ -1,8 +1,10 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +#I don't want the unpackaged file check +%define _unpackaged_files_terminate_build 0 Name: firstaidkit -Version: 0.1.0 -Release: 6%{?dist} +Version: 0.1.1 +Release: 1%{?dist} Summary: System Rescue Tool Group: Applications/System @@ -12,58 +14,83 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel -# Maybe its just enough with the python-setuptools-devel. Lets use both for now. +# Take this away in the future. when f7 is gone. %if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel %else BuildRequires: python-setuptools %endif - BuildArch: noarch +%description +A tool that automates simple and common system recovery tasks. + %package devel Group: Applications/System Summary: Devel package for firstaidkit Requires: %{name} = %{version}-%{release} +%description devel +Provides the examples and requires firstaidkit without plugins. + + %package plugin-all Group: Applications/System Summary: All firstaidkit plugins -# -# Since there are no plugins yet, this section only has firstaidkit as requires. -# Requires: %{name} = %{version}-%{release} - -%description -A tool that automates simple and common system recovery tasks. - -%description devel -Provides the examples and requires firstaidkit without plugins. - %description plugin-all This package provides all the necessary firstaidkit plugins. It probes the system and according to what it finds, it installs the needed firstaidkit plugins. + +%package plugin-undelete-partitions +Group: Applications/System +Summary: FirstAidKit plugin to recover erased partitions +BuildRequires: python-devel, parted-devel, pkgconfig +Requires: parted + +%description plugin-undelete-partitions +This FirstAidKit plugin automates the recovery of erased partitions. + + +%package plugin-passwd +Group: Applications/System +Summary: FirstAidKit plugin to manipulate passwd system + +%description plugin-passwd +This plugin provides operations for convenient manipulation +with the password system. + + %prep %setup -q %build %{__python} setup.py build +%{__make} subdirs %install %{__rm} -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1 -%{__install} -p doc/fakplugin.1 doc/firstaidkit.1 $RPM_BUILD_ROOT/%{_mandir}/man1 -%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/examples +#docs +%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT%{_sysconfdir} +%{__install} -p doc/fakplugin.1 doc/firstaidkit.1 $RPM_BUILD_ROOT%{_mandir}/man1 +#examples %{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/examples +%{__mv} -f plugins/plugin_examples $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/examples +#configuration +%{__install} -p etc/firstaidkit.conf $RPM_BUILD_ROOT%{_sysconfdir} + +#plugins +%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions +%{__cp} -f plugins/plugin_undelete_partitions/{*.py,_undelpart.so} $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions/ +%{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/ -%{__cp} -rfp plugins/* $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/examples %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -76,6 +103,7 @@ %{python_sitelib}/pyfirstaidkit %{python_sitelib}/%{name}-%{version}-py2.5.egg-info %{_bindir}/firstaidkit +%{_sysconfdir}/firstaidkit.conf %attr(0644,root,root) %{_mandir}/man1/firstaidkit.1.gz %files devel @@ -84,7 +112,17 @@ %files plugin-all +%files plugin-undelete-partitions +%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions/*.py +%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions/*.so + +%files plugin-passwd +%{_libdir}/firstaidkit-plugins/passwd.py + %Changelog +* Mon Mar 10 2008 Joel Granados 0.1.1-1 +- new version + * Wed Jan 09 2008 Joel Granados 0.1.0-6 - Put examples under the firstaidkit-plugins dir - Create a firstaidkit-plugin-all package Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Jan 2008 08:32:28 -0000 1.2 +++ sources 10 Mar 2008 20:33:53 -0000 1.3 @@ -1 +1 @@ -7a4e783e4c95d875cb8b15d2d119dfc6 firstaidkit-0.1.0.tar.bz2 +4c02212aed61ba72d979401995ac04a5 firstaidkit-0.1.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 20:35:56 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Mon, 10 Mar 2008 20:35:56 GMT Subject: comps/po bg.po,1.6,1.7 Message-ID: <200803102035.m2AKZupI030082@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30056/po Modified Files: bg.po Log Message: 2008-03-10 Alexander Todorov (via atodorov at fedoraproject.org) * po/bg.po: unfuzzy Index: bg.po =================================================================== RCS file: /cvs/pkgs/comps/po/bg.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bg.po 29 Sep 2007 10:28:58 -0000 1.6 +++ bg.po 10 Mar 2008 20:35:26 -0000 1.7 @@ -1,605 +1,179 @@ # translation of comps.pot to Bulgarian # This file is distributed under the same license as the PACKAGE package. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER. # # ?????????????? ???????????????????? , 2004, 2005. # Doncho N. Gunchev , 2007. # Miroslav Ivanov , 2007. +# Alexander Todorov , 2008. msgid "" msgstr "" "Project-Id-Version: bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-29 01:43-0700\n" -"PO-Revision-Date: 2007-09-29 13:24+0300\n" -"Last-Translator: Doncho N. Gunchev \n" +"POT-Creation-Date: 2008-02-28 17:56-0700\n" +"PO-Revision-Date: 2008-03-10 21:23+0100\n" +"Last-Translator: Alexander Todorov \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"Content-Transfer-Encoding: 8bit" -#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1 -#: ../comps-f8.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." msgstr "???????? ?????????????? ?????????????? ??????????, ?????????? ???????????? ?????????? ???? ?????????? ????????????." -#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2 -#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 +#: ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "?????????????????????????????? ??????????????????????" -#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5 -#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +msgid "Afrikaans Support" +msgstr "?????????????????? ???? ????????????????" + +#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +msgid "Albanian Support" +msgstr "?????????????????? ???? ????????????????" + +#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 +#: ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "????????????????????" -#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3 -#: ../comps-el5.xml.in.h:3 -msgid "Applications for a variety of tasks" +#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +msgid "Applications to perform a variety of tasks" msgstr "???????????????????? ???? ???????????????????????? ????????????" -#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7 -#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 +#: ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8 -#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 +#: ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10 -#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 -msgid "Authoring and Publishing" -msgstr "?????????????????? ?? ????????????????????" - -#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12 -#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 -msgid "Base System" -msgstr "???????????? ??????????????" - -#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31 -#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 -msgid "Desktop Environments" -msgstr "?????????????? ??????????" - -#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32 -#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 -msgid "Desktop environments" -msgstr "?????????????? ??????????" - -#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33 -#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 -msgid "Development" -msgstr "????????????????????" - -#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35 -#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 -msgid "Development Tools" -msgstr "?????????????????????? ???? ????????????????????" - -#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12 -#: ../comps-el5.xml.in.h:13 -msgid "Dialup Networking Support" -msgstr "?????????????????? ???? Dailup ??????????" - -#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39 -#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 -msgid "Editors" -msgstr "??????????????????" - -#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40 -#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 -msgid "Educational Software" -msgstr "???????????? ??????????????" - -#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41 -#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 -msgid "Educational software for learning" -msgstr "???????????? ?????????????? ???? ??????????" - -#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42 -#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 -msgid "Engineering and Scientific" -msgstr "?????????????????????? ?? ??????????" - -#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46 -#: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 -msgid "FTP Server" -msgstr "FTP ????????????" - -#: ../comps-fe5.xml.in.h:19 ../comps-fe6.xml.in.h:20 ../comps-f7.xml.in.h:51 -#: ../comps-f8.xml.in.h:54 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 -msgid "" -"From CD recording to playing audio CDs and multimedia files, this package " -"group allows you to work with sound and video on the system." -msgstr "" -"???? ?????????? ???? ?????????????? ?????????????? ???? ?????????????????????? ???? ????????????, ?????????? ?? ???????????????????????? " -"??????????????, ???????? ?????????? ???????????? ?????????????????? ???????????? ?? ?????????? ?? ?????????? ???? ??????????????????." - -#: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52 -#: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 -msgid "GNOME Desktop Environment" -msgstr "GNOME ?????????????? ??????????" - -#: ../comps-fe5.xml.in.h:21 ../comps-fe6.xml.in.h:22 ../comps-f7.xml.in.h:53 -#: ../comps-f8.xml.in.h:56 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 -msgid "GNOME Software Development" -msgstr "GNOME ???????????????????? ???? ??????????????" - -#: ../comps-fe5.xml.in.h:22 ../comps-fe6.xml.in.h:23 ../comps-el4.xml.in.h:21 -#: ../comps-el5.xml.in.h:22 -msgid "" -"GNOME is a powerful, graphical user interface which includes a panel, " -"desktop, system icons, and a graphical file manager." -msgstr "" -"GNOME ?? ?????????? ???????????????? ??????????, ?????????? ?????????????? ??????????, ?????????????? ????????, ???????????????? " -"?????????? ?? ???????????????? ???????????? ????????????????." - -#: ../comps-fe5.xml.in.h:23 ../comps-fe6.xml.in.h:24 ../comps-f7.xml.in.h:57 -#: ../comps-f8.xml.in.h:60 ../comps-el5.xml.in.h:23 -msgid "Games and Entertainment" -msgstr "???????? ?? ????????????????????" - -#: ../comps-fe5.xml.in.h:24 ../comps-fe6.xml.in.h:25 ../comps-f7.xml.in.h:60 -#: ../comps-f8.xml.in.h:63 ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24 -msgid "Graphical Internet" -msgstr "???????????????? ????????????????" - -#: ../comps-fe5.xml.in.h:25 ../comps-fe6.xml.in.h:26 ../comps-f7.xml.in.h:61 -#: ../comps-f8.xml.in.h:64 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 -msgid "Graphics" -msgstr "???????????????? ??????????????????????" - -#: ../comps-fe5.xml.in.h:26 ../comps-fe6.xml.in.h:27 ../comps-f7.xml.in.h:64 -#: ../comps-f8.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26 -msgid "Hardware Support" -msgstr "?????????????????? ??????????????????" - -#: ../comps-fe5.xml.in.h:27 ../comps-fe6.xml.in.h:28 ../comps-f7.xml.in.h:65 -#: ../comps-f8.xml.in.h:68 ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27 -msgid "Hebrew Support" -msgstr "?????????????????? ???? ??????????" - -#: ../comps-fe5.xml.in.h:28 ../comps-fe6.xml.in.h:29 ../comps-f7.xml.in.h:70 -#: ../comps-f8.xml.in.h:73 ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28 -msgid "" -"Install these packages in order to develop GTK+ and GNOME graphical " -"applications." -msgstr "" -"???????????????????????? ????????????????, ???? ???? ???????????? ???? ???????????????????????? ???????????????????? ???? GTK+ ?? " -"GNOME." - -#: ../comps-fe5.xml.in.h:29 ../comps-fe6.xml.in.h:30 ../comps-f7.xml.in.h:71 -#: ../comps-f8.xml.in.h:74 -msgid "" -"Install these packages in order to develop GTK+ and XFCE graphical " -"applications." -msgstr "" -"???????????????????????? ???????? ???????????????? ???? ???? ???????????? ???? ???????????????????????? GTK+ ?? XFCE ???????????????? " -"????????????????????." - -#: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:72 -#: ../comps-f8.xml.in.h:75 ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29 -msgid "Install these packages to develop QT and KDE graphical applications." -msgstr "" -"???????????????????????? ???????????????? ???? ???? ???????????? ???? ???????????????????????? QT ?? KDE ???????????????? " -"????????????????????." - -#: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:74 -#: ../comps-f8.xml.in.h:77 ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30 -msgid "" -"Install this group of packages to use the base graphical (X) user interface." -msgstr "???????????????????????? ???????????????? ???? ???? ???????????????????? ?????????????? ???????????????? ?????????????????? (??)." - -#: ../comps-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:78 -#: ../comps-f8.xml.in.h:82 ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 -msgid "Japanese Support" -msgstr "?????????????????? ???? ??????????????" - -#: ../comps-fe5.xml.in.h:33 ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 -#: ../comps-el4.xml.in.h:30 -msgid "Java" -msgstr "Java" - -#: ../comps-fe5.xml.in.h:34 ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 -#: ../comps-el4.xml.in.h:31 -msgid "Java Development" -msgstr "Java ????????????????????" - -#: ../comps-fe5.xml.in.h:35 ../comps-fe6.xml.in.h:34 ../comps-f7.xml.in.h:81 -#: ../comps-f8.xml.in.h:85 ../comps-el4.xml.in.h:32 ../comps-el5.xml.in.h:32 -msgid "KDE (K Desktop Environment)" -msgstr "?????? (?? ?????????????? ??????????)" - -#: ../comps-fe5.xml.in.h:36 ../comps-fe6.xml.in.h:35 ../comps-f7.xml.in.h:82 -#: ../comps-f8.xml.in.h:86 ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33 -msgid "KDE Software Development" -msgstr "KDE ?????????????????? ????????????????????" - -#: ../comps-fe5.xml.in.h:37 ../comps-fe6.xml.in.h:36 ../comps-el4.xml.in.h:34 -#: ../comps-el5.xml.in.h:34 -msgid "" -"KDE is a powerful, graphical user interface which includes a panel, desktop, " -"system icons, and a graphical file manager." -msgstr "" -"KDE e ??????????, ???????????????? ??????????, ?????????? ?????????????? ??????????, ??????????????, ???????????????? ?????????? ?? " -"???????????????? ???????? ????????????????." - -#: ../comps-fe5.xml.in.h:38 ../comps-fe6.xml.in.h:37 ../comps-f7.xml.in.h:94 -#: ../comps-f8.xml.in.h:100 ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 -msgid "Mail Server" -msgstr "???????????????? ????????????" - -#: ../comps-fe5.xml.in.h:39 ../comps-fe6.xml.in.h:38 ../comps-f7.xml.in.h:100 -#: ../comps-f8.xml.in.h:108 ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 -msgid "Network Servers" -msgstr "?????????????? ??????????????" - -#: ../comps-fe5.xml.in.h:40 ../comps-fe6.xml.in.h:39 ../comps-f7.xml.in.h:101 -#: ../comps-f8.xml.in.h:109 ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 -msgid "News Server" -msgstr "???????????????????? ????????????" - -#: ../comps-fe5.xml.in.h:41 ../comps-fe6.xml.in.h:40 ../comps-f7.xml.in.h:104 -#: ../comps-f8.xml.in.h:112 ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 -msgid "Office/Productivity" -msgstr "????????/??????????????????????????" - -#: ../comps-fe5.xml.in.h:42 ../comps-fe6.xml.in.h:41 ../comps-f7.xml.in.h:106 -#: ../comps-f8.xml.in.h:115 ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 -msgid "" -"Packages which provide functionality for developing and building " -"applications." -msgstr "" -"???????????? ???????????????????????? ???????????????????????????? ???????????????????? ???? ???????????????????????? ?? ?????????????????????? " -"???? ????????????????????." - -#: ../comps-fe5.xml.in.h:43 ../comps-fe6.xml.in.h:42 ../comps-f7.xml.in.h:119 -#: ../comps-f8.xml.in.h:128 ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 -msgid "Servers" -msgstr "??????????????" - -#: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:120 -#: ../comps-f8.xml.in.h:129 ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 -msgid "" -"Simple window managers that aren't part of a larger desktop environment." -msgstr "" -"???????????? ?????????????????? ???? ???????????????? ?????????? ???? ???? ???????? ???? ????-???????????? ?????????????? ??????????." - -#: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:125 -#: ../comps-f8.xml.in.h:134 ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 -msgid "Software used for running network servers" -msgstr "?????????????? ???? ?????????????? ???? ?????????????? ????????????" - -#: ../comps-fe5.xml.in.h:46 ../comps-fe6.xml.in.h:45 ../comps-el4.xml.in.h:43 -#: ../comps-el5.xml.in.h:43 -msgid "" -"Sometimes called text editors, these are programs that allow you to create " -"and edit files. These include Emacs and Vi." -msgstr "" -"????????????????????, ?????????? ???????????????? ???????????????? ??????????????????, ???????????????????? ?????????????????????? ?? " -"?????????????????????????? ???? ??????????????. ???? ???????????????? emacs ?? vi." - -#: ../comps-fe5.xml.in.h:47 ../comps-fe6.xml.in.h:46 ../comps-f7.xml.in.h:128 -#: ../comps-f8.xml.in.h:137 ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 -msgid "Sound and Video" -msgstr "?????????? ?? ??????????" - -#: ../comps-fe5.xml.in.h:48 ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 -#: ../comps-el4.xml.in.h:45 -msgid "Support for developing programs in the Java programming language." -msgstr "?????????????????? ???? ???????????????????? ???? ???????????????? ???? ???????????????????? ???????? Java." - -#: ../comps-fe5.xml.in.h:49 ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 -#: ../comps-el4.xml.in.h:46 -msgid "Support for running programs written in the Java programming language." -msgstr "?????????????????? ???? ???????????????? ???????????????? ???? ???????????????????? ???????? Java." - -#: ../comps-fe5.xml.in.h:50 ../comps-fe6.xml.in.h:47 ../comps-f7.xml.in.h:136 -#: ../comps-f8.xml.in.h:145 ../comps-el4.xml.in.h:47 ../comps-el5.xml.in.h:45 -msgid "System Tools" -msgstr "???????????????? ??????????????????????" - -#: ../comps-fe5.xml.in.h:51 ../comps-fe6.xml.in.h:48 ../comps-f7.xml.in.h:140 -#: ../comps-f8.xml.in.h:149 ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 -msgid "Text-based Internet" -msgstr "???????????????? ????????????????" - -#: ../comps-fe5.xml.in.h:52 ../comps-fe6.xml.in.h:49 ../comps-el4.xml.in.h:49 -#: ../comps-el5.xml.in.h:47 -msgid "The XEmacs text editor." -msgstr "?????????????????? ???????????????? XEmacs." - -#: ../comps-fe5.xml.in.h:53 ../comps-fe6.xml.in.h:50 ../comps-f7.xml.in.h:143 -#: ../comps-f8.xml.in.h:151 ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 -msgid "The applications include office suites, PDF viewers, and more." -msgstr "???????????????????????? ???????????????? ???????? ????????????, ???????????????? ???? ?????????????? ???? PDF ?? ??????????." - -#: ../comps-fe5.xml.in.h:54 ../comps-fe6.xml.in.h:51 ../comps-f7.xml.in.h:145 -#: ../comps-f8.xml.in.h:153 ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 -msgid "These packages allow you to configure an IMAP or SMTP mail server." -msgstr "???????? ???????????? ???????????????????? ?????????????????????? IMAP ?????? SMTP ???????????????? ??????????????." - -#: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:147 -#: ../comps-f8.xml.in.h:155 ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 -msgid "" -"These packages are helpful when developing web applications or web pages." -msgstr "" -"???????? ???????????? ???? ?????????????? ?????? ???????????????????????? ???? ?????? ???????????????????? ?????? ????????????????." - -#: ../comps-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53 ../comps-el4.xml.in.h:53 -#: ../comps-el5.xml.in.h:51 -msgid "" -"These tools allow you to create documentation in the DocBook format and " -"convert them to HTML, PDF, Postscript, and text." -msgstr "" -"???????? ?????????????????????? ???????????????????? ?????????????????????? ???? ???????????????????????? ?? DocBook ???????????? ?? " -"???????????????????????????? ?? ?? HTML, PDF, Postscript ?????? ??????????." - -#: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:154 -#: ../comps-f8.xml.in.h:162 ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 -msgid "These tools allow you to run a Web server on the system." -msgstr "???????? ?????????????????????? ???????????????????? ???????????????????? ???? ?????? ???????????? ?? ??????????????????." - -#: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:155 -#: ../comps-f8.xml.in.h:163 ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 -msgid "These tools allow you to run an FTP server on the system." -msgstr "???????? ?????????????????????????? ???????????????????? ???????????????????? ???? FTP ???????????? ?? ??????????????????." - -#: ../comps-fe5.xml.in.h:59 ../comps-fe6.xml.in.h:56 ../comps-f7.xml.in.h:156 -#: ../comps-f8.xml.in.h:164 ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 -msgid "" -"These tools include core development tools such as automake, gcc, perl, " -"python, and debuggers." -msgstr "" -"?????????????????????????? ???????????????? ???????????????? ?????????????????????? ???? ???????????????????? ???????? automake, " -"gcc, perl, python, ?????????? ?? ????????????????." - -#: ../comps-fe5.xml.in.h:60 ../comps-fe6.xml.in.h:57 ../comps-f7.xml.in.h:157 -#: ../comps-f8.xml.in.h:165 ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 -msgid "This group allows you to configure the system as a news server." -msgstr "" -"???????? ?????????????? ?????????????????? ?????????????????????? ???? ?????????????????? ???? ???????????? ???????? ???????????????????? " -"????????????." - -#: ../comps-fe5.xml.in.h:61 ../comps-fe6.xml.in.h:58 ../comps-f7.xml.in.h:160 -#: ../comps-f8.xml.in.h:168 ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 -msgid "This group includes graphical email, Web, and chat clients." -msgstr "???????? ?????????? ?????????????? ?????????????? ???? ???????????????? ????????, ?????? ?? ??????." - -#: ../comps-fe5.xml.in.h:62 ../comps-fe6.xml.in.h:59 ../comps-f7.xml.in.h:161 -#: ../comps-f8.xml.in.h:169 ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 -msgid "" -"This group includes packages for performing mathematical and scientific " -"computations and plotting, as well as unit conversion." -msgstr "" -"???????? ?????????? ?????????????? ???????????? ???? ???????????????????? ???? ?????????????????????????? ?? ???????????? " -"????????????????????, ?????????????????????????? ?? ?????????????????????????? ???? ?????????? ??????????????." - -#: ../comps-fe5.xml.in.h:63 ../comps-fe6.xml.in.h:60 ../comps-f7.xml.in.h:162 -#: ../comps-f8.xml.in.h:170 ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 -msgid "This group includes packages to help you manipulate and scan images." -msgstr "" -"???????? ?????????? ???????????????? ????????????, ?????????? ???????????????????? ?????? ???????????????????????? ?? ?????????????????? ???? " -"??????????????????????." - -#: ../comps-fe5.xml.in.h:64 ../comps-fe6.xml.in.h:61 ../comps-f7.xml.in.h:163 -#: ../comps-f8.xml.in.h:171 ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 -msgid "" -"This group includes text-based email, Web, and chat clients. These " -"applications do not require the X Window System." -msgstr "" -"???????? ?????????? ?????????????? ???????????????? ?????????????? ???? ????????, ?????? ?? ??????. ???????? ???????????????????? ???? " -"???? ?????????????? ???? ?????????????? ???? ???????????????? ??." - -#: ../comps-fe5.xml.in.h:65 ../comps-fe6.xml.in.h:62 ../comps-f7.xml.in.h:164 -#: ../comps-f8.xml.in.h:172 ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 -msgid "" -"This group is a collection of graphical administration tools for the system, " -"such as for managing user accounts and configuring system hardware." -msgstr "" -"???????? ?????????? ?? ???????????????? ???? ???????????????? ?????????????????????? ???? ???????????????????????????? ???? " -"??????????????????, ???????? ???????????????? ???????????????????? ???? ?????????????????????????????? ?????????????? ?? ?????????????????? " -"???? ?????????????????? ??????????????." - -#: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63 ../comps-el4.xml.in.h:63 -#: ../comps-el5.xml.in.h:61 -msgid "This group is a collection of network servers for specific purposes" -msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????? ?????????????????? ????????????????????" - -#: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64 ../comps-el4.xml.in.h:64 -#: ../comps-el5.xml.in.h:62 -msgid "" -"This group is a collection of tools and resources of Arabic environments." -msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????????? ?????????????? ??????????." - -#: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:165 -#: ../comps-f8.xml.in.h:173 ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 -msgid "" -"This group is a collection of tools and resources of Armenian environments." -msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????." - -#: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67 ../comps-el4.xml.in.h:66 -#: ../comps-el5.xml.in.h:65 -msgid "" -"This group is a collection of tools and resources of Hebrew environments." -msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????." - -#: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68 ../comps-el4.xml.in.h:67 -#: ../comps-el5.xml.in.h:66 -msgid "" -"This group is a collection of tools and resources of Japanese environments." -msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????????? ?????????????? ??????????." - -#: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:166 -#: ../comps-f8.xml.in.h:174 ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 -msgid "" -"This group is a collection of tools for various hardware specific utilities." -msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????? ?????????????????? ????????????????????." - -#: ../comps-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:167 -#: ../comps-f8.xml.in.h:175 ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 -msgid "" -"This group is a collection of various tools for the system, such as the " -"client for connecting to SMB shares and tools to monitor network traffic." -msgstr "" -"???????? ?????????? ?? ???????????????? ???? ???????????????? ?????????????????????? ???? ??????????????????, ???????? ???????????? ???? " -"?????????????? ?????? SMB ?????????????????? ?????????????? ?? ?????????????????????? ???? ???????????????????? ???? ???????????????? " -"????????????." - -#: ../comps-fe5.xml.in.h:73 ../comps-fe6.xml.in.h:71 ../comps-f7.xml.in.h:179 -#: ../comps-f8.xml.in.h:187 ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 -msgid "Various core pieces of the system." -msgstr "???????????????? ???????????? ?????????? ???? ??????????????????." - -#: ../comps-fe5.xml.in.h:74 ../comps-fe6.xml.in.h:72 ../comps-f7.xml.in.h:180 -#: ../comps-f8.xml.in.h:188 ../comps-el5.xml.in.h:70 -msgid "Various ways to relax and spend your free time." -msgstr "???????????????? ???????????? ???? ?????????????????? ?? ???????????????????? ???? ???????????????????? ??????????." - -#: ../comps-fe5.xml.in.h:75 ../comps-fe6.xml.in.h:73 ../comps-f7.xml.in.h:184 -#: ../comps-f8.xml.in.h:192 ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:71 -msgid "Web Development" -msgstr "?????? ????????????????????" - -#: ../comps-fe5.xml.in.h:76 ../comps-fe6.xml.in.h:74 ../comps-f7.xml.in.h:185 -#: ../comps-f8.xml.in.h:193 ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:72 -msgid "Web Server" -msgstr "?????? ????????????" - -#: ../comps-fe5.xml.in.h:77 ../comps-fe6.xml.in.h:75 ../comps-f7.xml.in.h:187 -#: ../comps-f8.xml.in.h:195 ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 -msgid "Window Managers" -msgstr "?????????????????? ???? ????????????????" - -#: ../comps-fe5.xml.in.h:78 ../comps-fe6.xml.in.h:76 ../comps-f7.xml.in.h:190 -#: ../comps-f8.xml.in.h:198 ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 -msgid "X Window System" -msgstr "?????????????? ???? ???????????????? ??" - -#: ../comps-fe5.xml.in.h:79 ../comps-fe6.xml.in.h:77 ../comps-el4.xml.in.h:75 -#: ../comps-el5.xml.in.h:75 -msgid "XEmacs" -msgstr "XEmacs" - -#: ../comps-fe5.xml.in.h:80 ../comps-fe6.xml.in.h:78 ../comps-f7.xml.in.h:191 -#: ../comps-f8.xml.in.h:199 -msgid "XFCE" -msgstr "XFCE" - -#: ../comps-fe5.xml.in.h:81 ../comps-fe6.xml.in.h:79 ../comps-f7.xml.in.h:192 -#: ../comps-f8.xml.in.h:200 -msgid "XFCE Software Development" -msgstr "XFCE ?????????????????? ????????????????????" - -#: ../comps-fe6.xml.in.h:9 ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 -#: ../comps-el5.xml.in.h:8 -msgid "Czech Support" -msgstr "?????????????????? ???? ??????????" - -#: ../comps-fe6.xml.in.h:66 ../comps-el5.xml.in.h:64 -msgid "" -"This group is a collection of tools and resources of Czech environments." -msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????? ?????????????? ??????????." - -#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 -msgid "Afrikaans Support" -msgstr "?????????????????? ???? ????????????????" - -#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 -msgid "Albanian Support" -msgstr "?????????????????? ???? ????????????????" - -#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 -msgid "Applications to perform a variety of tasks" -msgstr "???????????????????? ???? ???????????????????????? ????????????" - -#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 +#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 msgid "Assamese Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 +#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 +#: ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 +msgid "Authoring and Publishing" +msgstr "?????????????????? ?? ????????????????????" + +#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 msgid "Base" msgstr "????????????" -#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 +#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 +#: ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 +msgid "Base System" +msgstr "???????????? ??????????????" + +#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 msgid "Basic support for the Ruby programming language." msgstr "???????????? ?????????????????? ???? ?????????? ???? ???????????????????????? ruby." -#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 +#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 msgid "Basque Support" msgstr "?????????????????? ???? ??????????" -#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 +#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 msgid "Belarusian Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 +#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 msgid "Bengali Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 +#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 msgid "Bhutanese Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 +#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 msgid "Bosnian Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 +#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19 msgid "Brazilian Portuguese Support" msgstr "?????????????????? ???? ?????????????????????? ??????????????????" -#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 +#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20 msgid "Breton Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 +#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22 msgid "Bulgarian Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 +#: ../comps-f7.xml.in.h:22 ../comps-f8.xml.in.h:23 ../comps-f9.xml.in.h:23 msgid "Catalan Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 +#: ../comps-f7.xml.in.h:23 ../comps-f8.xml.in.h:24 ../comps-f9.xml.in.h:24 msgid "Chinese Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 +#: ../comps-f7.xml.in.h:24 ../comps-f8.xml.in.h:25 ../comps-f9.xml.in.h:25 msgid "Clustering" msgstr "??????????????" -#: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 +#: ../comps-f7.xml.in.h:25 ../comps-f8.xml.in.h:26 ../comps-f9.xml.in.h:26 msgid "Clustering Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 +#: ../comps-f7.xml.in.h:26 ../comps-f8.xml.in.h:27 ../comps-f9.xml.in.h:27 msgid "Core" msgstr "????????????" -#: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 +#: ../comps-f7.xml.in.h:27 ../comps-f8.xml.in.h:28 ../comps-f9.xml.in.h:28 msgid "Croatian Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 +#: ../comps-f7.xml.in.h:28 ../comps-f8.xml.in.h:29 ../comps-f9.xml.in.h:29 +#: ../comps-el5.xml.in.h:8 +msgid "Czech Support" +msgstr "?????????????????? ???? ??????????" + +#: ../comps-f7.xml.in.h:29 ../comps-f8.xml.in.h:30 ../comps-f9.xml.in.h:30 msgid "DNS Name Server" msgstr "DNS ???????????? ???? ??????????" -#: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 +#: ../comps-f7.xml.in.h:30 ../comps-f8.xml.in.h:31 ../comps-f9.xml.in.h:31 msgid "Danish Support" msgstr "?????????????????? ???? ????????????" -#: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 +#: ../comps-f7.xml.in.h:31 ../comps-f8.xml.in.h:32 ../comps-f9.xml.in.h:32 +#: ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 +msgid "Desktop Environments" +msgstr "?????????????? ??????????" + +#: ../comps-f7.xml.in.h:32 ../comps-f8.xml.in.h:33 ../comps-f9.xml.in.h:33 +#: ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 +msgid "Desktop environments" +msgstr "?????????????? ??????????" + +#: ../comps-f7.xml.in.h:33 ../comps-f8.xml.in.h:34 ../comps-f9.xml.in.h:34 +#: ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 +msgid "Development" +msgstr "????????????????????" + +#: ../comps-f7.xml.in.h:34 ../comps-f8.xml.in.h:35 ../comps-f9.xml.in.h:35 msgid "Development Libraries" msgstr "???????????????????? ???? ????????????????????" -#: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 +#: ../comps-f7.xml.in.h:35 ../comps-f8.xml.in.h:36 ../comps-f9.xml.in.h:36 +#: ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 +msgid "Development Tools" +msgstr "?????????????????????? ???? ????????????????????" + +#: ../comps-f7.xml.in.h:36 ../comps-f8.xml.in.h:37 ../comps-f9.xml.in.h:37 msgid "Dial-up Networking Support" msgstr "?????????????????? ???? Dailup ??????????" -#: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 +#: ../comps-f7.xml.in.h:37 ../comps-f8.xml.in.h:38 ../comps-f9.xml.in.h:38 msgid "Dutch Support" msgstr "?????????????????? ???? ??????????????????" @@ -607,35 +181,84 @@ msgid "Eclipse" msgstr "Eclipse" -#: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 +#: ../comps-f7.xml.in.h:39 ../comps-f8.xml.in.h:39 ../comps-f9.xml.in.h:39 +#: ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 +msgid "Editors" +msgstr "??????????????????" + +#: ../comps-f7.xml.in.h:40 ../comps-f8.xml.in.h:40 ../comps-f9.xml.in.h:40 +#: ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 +msgid "Educational Software" +msgstr "???????????? ??????????????" + +#: ../comps-f7.xml.in.h:41 ../comps-f8.xml.in.h:41 ../comps-f9.xml.in.h:41 +#: ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 +msgid "Educational software for learning" +msgstr "???????????? ?????????????? ???? ??????????" + +#: ../comps-f7.xml.in.h:42 ../comps-f8.xml.in.h:42 ../comps-f9.xml.in.h:42 +#: ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 +msgid "Engineering and Scientific" +msgstr "?????????????????????? ?? ??????????" + +#: ../comps-f7.xml.in.h:43 ../comps-f8.xml.in.h:43 ../comps-f9.xml.in.h:43 msgid "English (UK) Support" msgstr "?????????????????? ???? ?????????????????? ??????????????????" -#: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 +#: ../comps-f7.xml.in.h:44 ../comps-f8.xml.in.h:44 ../comps-f9.xml.in.h:44 msgid "Estonian Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 +#: ../comps-f7.xml.in.h:45 ../comps-f8.xml.in.h:45 ../comps-f9.xml.in.h:45 msgid "Ethiopic Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 +#: ../comps-f7.xml.in.h:46 ../comps-f8.xml.in.h:46 ../comps-f9.xml.in.h:46 +#: ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 +msgid "FTP Server" +msgstr "FTP ????????????" + +#: ../comps-f7.xml.in.h:47 ../comps-f8.xml.in.h:47 ../comps-f9.xml.in.h:47 msgid "Faeroese Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 +#: ../comps-f7.xml.in.h:48 ../comps-f8.xml.in.h:49 ../comps-f9.xml.in.h:49 +#: ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 +msgid "Fedora Packager" +msgstr "?????????????????? ???? ???????????? ???? ????????????" + +#: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:50 msgid "Filipino Support" msgstr "?????????????????? ???? ????????????????????" -#: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 +#: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:51 msgid "Finnish Support" msgstr "?????????????????? ???? ????????????????????" -#: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:53 +#: ../comps-f7.xml.in.h:51 ../comps-f8.xml.in.h:54 ../comps-f9.xml.in.h:54 msgid "French Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 +#: ../comps-f7.xml.in.h:52 ../comps-f8.xml.in.h:55 ../comps-f9.xml.in.h:55 +#: ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 +msgid "" +"From CD recording to playing audio CDs and multimedia files, this package " +"group allows you to work with sound and video on the system." +msgstr "" +"???? ?????????? ???? ?????????????? ?????????????? ???? ?????????????????????? ???? ????????????, ?????????? ?? ???????????????????????? " +"??????????????, ???????? ?????????? ???????????? ?????????????????? ???????????? ?? ?????????? ?? ?????????? ???? ??????????????????." + +#: ../comps-f7.xml.in.h:53 ../comps-f8.xml.in.h:56 ../comps-f9.xml.in.h:56 +#: ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 +msgid "GNOME Desktop Environment" +msgstr "GNOME ?????????????? ??????????" + +#: ../comps-f7.xml.in.h:54 ../comps-f8.xml.in.h:57 ../comps-f9.xml.in.h:57 +#: ../comps-el4.xml.in.h:21 ../comps-el5.xml.in.h:22 +msgid "GNOME Software Development" +msgstr "GNOME ???????????????????? ???? ??????????????" + +#: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 ../comps-f9.xml.in.h:58 msgid "" "GNOME is a powerful graphical user interface which includes a panel, " "desktop, system icons, and a graphical file manager." @@ -643,66 +266,146 @@ "GNOME ?? ?????????? ???????????????? ?????????????????????????? ??????????????????, ?????????? ?????????????? ??????????, ?????????????? " "????????, ???????????????? ?????????? ?? ???????????????? ???????????? ????????????????." -#: ../comps-f7.xml.in.h:55 ../comps-f8.xml.in.h:58 +#: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 ../comps-f9.xml.in.h:59 msgid "Gaelic Support" msgstr "?????????????????? ???? ????????????" -#: ../comps-f7.xml.in.h:56 ../comps-f8.xml.in.h:59 +#: ../comps-f7.xml.in.h:57 ../comps-f8.xml.in.h:60 ../comps-f9.xml.in.h:60 msgid "Galician Support" msgstr "?????????????????? ???? ????????????????????" -#: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 +#: ../comps-f7.xml.in.h:58 ../comps-f8.xml.in.h:61 ../comps-f9.xml.in.h:61 +#: ../comps-el5.xml.in.h:24 +msgid "Games and Entertainment" +msgstr "???????? ?? ????????????????????" + +#: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 ../comps-f9.xml.in.h:62 msgid "Georgian Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:59 ../comps-f8.xml.in.h:62 -msgid "German Support" -msgstr "?????????????????? ???? ????????????" +#: ../comps-f7.xml.in.h:60 ../comps-f8.xml.in.h:63 ../comps-f9.xml.in.h:63 +msgid "German Support" +msgstr "?????????????????? ???? ????????????" + +#: ../comps-f7.xml.in.h:61 ../comps-f8.xml.in.h:64 ../comps-f9.xml.in.h:64 +#: ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 +msgid "Graphical Internet" +msgstr "???????????????? ????????????????" + +#: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 ../comps-f9.xml.in.h:65 +#: ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26 +msgid "Graphics" +msgstr "???????????????? ??????????????????????" -#: ../comps-f7.xml.in.h:62 ../comps-f8.xml.in.h:65 +#: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 ../comps-f9.xml.in.h:66 msgid "Greek Support" msgstr "?????????????????? ???? ????????????" -#: ../comps-f7.xml.in.h:63 ../comps-f8.xml.in.h:66 +#: ../comps-f7.xml.in.h:64 ../comps-f8.xml.in.h:67 ../comps-f9.xml.in.h:67 msgid "Gujarati Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 +#: ../comps-f7.xml.in.h:65 ../comps-f8.xml.in.h:68 ../comps-f9.xml.in.h:68 +#: ../comps-el4.xml.in.h:25 ../comps-el5.xml.in.h:27 +msgid "Hardware Support" +msgstr "?????????????????? ??????????????????" + +#: ../comps-f7.xml.in.h:66 ../comps-f8.xml.in.h:69 ../comps-f9.xml.in.h:69 +#: ../comps-el4.xml.in.h:26 ../comps-el5.xml.in.h:28 +msgid "Hebrew Support" +msgstr "?????????????????? ???? ??????????" + +#: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 ../comps-f9.xml.in.h:70 msgid "Hindi Support" msgstr "?????????????????? ???? ??????????" -#: ../comps-f7.xml.in.h:67 ../comps-f8.xml.in.h:70 +#: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 ../comps-f9.xml.in.h:71 msgid "Hungarian Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:68 ../comps-f8.xml.in.h:71 +#: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 ../comps-f9.xml.in.h:72 msgid "Icelandic Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:69 ../comps-f8.xml.in.h:72 +#: ../comps-f7.xml.in.h:70 ../comps-f8.xml.in.h:73 ../comps-f9.xml.in.h:73 msgid "Indonesian Support" msgstr "?????????????????? ???? ????????????????????????" -#: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 +#: ../comps-f7.xml.in.h:71 ../comps-f8.xml.in.h:74 ../comps-f9.xml.in.h:74 +#: ../comps-el4.xml.in.h:27 ../comps-el5.xml.in.h:29 +msgid "" +"Install these packages in order to develop GTK+ and GNOME graphical " +"applications." +msgstr "" +"???????????????????????? ????????????????, ???? ???? ???????????? ???? ???????????????????????? ???????????????????? ???? GTK+ ?? " +"GNOME." + +#: ../comps-f7.xml.in.h:72 ../comps-f8.xml.in.h:75 ../comps-f9.xml.in.h:75 +msgid "" +"Install these packages in order to develop GTK+ and XFCE graphical " +"applications." +msgstr "" +"???????????????????????? ???????? ???????????????? ???? ???? ???????????? ???? ???????????????????????? GTK+ ?? XFCE ???????????????? " +"????????????????????." + +#: ../comps-f7.xml.in.h:73 ../comps-f8.xml.in.h:76 ../comps-f9.xml.in.h:76 +#: ../comps-el4.xml.in.h:28 ../comps-el5.xml.in.h:30 +msgid "Install these packages to develop QT and KDE graphical applications." +msgstr "" +"???????????????????????? ???????????????? ???? ???? ???????????? ???? ???????????????????????? QT ?? KDE ???????????????? " +"????????????????????." + +#: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:77 msgid "" "Install these tools to enable the system to print or act as a print server." msgstr "" "???????????????????????? ?????????????????????????? ???? ???? ?????????????????? ???? ?????????????????? ???? ???????????? ?????? ???? " "???????????? ???????? ???????????? ???? ??????????." -#: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:79 +#: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:78 +#: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 +msgid "" +"Install this group of packages to use the base graphical (X) user interface." +msgstr "???????????????????????? ???????????????? ???? ???? ???????????????????? ?????????????? ???????????????? ?????????????????? (??)." + +#: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:80 msgid "Inuktitut Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 +#: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:81 msgid "Irish Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 +#: ../comps-f7.xml.in.h:78 ../comps-f8.xml.in.h:82 ../comps-f9.xml.in.h:82 msgid "Italian Support" msgstr "?????????????????? ???? ????????????????????" -#: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 +#: ../comps-f7.xml.in.h:79 ../comps-f8.xml.in.h:83 ../comps-f9.xml.in.h:83 +#: ../comps-el4.xml.in.h:30 ../comps-el5.xml.in.h:32 +msgid "Japanese Support" +msgstr "?????????????????? ???? ??????????????" + +#: ../comps-f7.xml.in.h:80 ../comps-f8.xml.in.h:84 ../comps-f9.xml.in.h:84 +#: ../comps-el4.xml.in.h:31 +msgid "Java" +msgstr "Java" + +#: ../comps-f7.xml.in.h:81 ../comps-f8.xml.in.h:85 ../comps-f9.xml.in.h:85 +#: ../comps-el4.xml.in.h:32 +msgid "Java Development" +msgstr "Java ????????????????????" + +#: ../comps-f7.xml.in.h:82 ../comps-f8.xml.in.h:86 ../comps-f9.xml.in.h:86 +#: ../comps-el4.xml.in.h:33 ../comps-el5.xml.in.h:33 +msgid "KDE (K Desktop Environment)" +msgstr "?????? (?? ?????????????? ??????????)" + +#: ../comps-f7.xml.in.h:83 ../comps-f8.xml.in.h:87 ../comps-f9.xml.in.h:87 +#: ../comps-el4.xml.in.h:34 ../comps-el5.xml.in.h:34 +msgid "KDE Software Development" +msgstr "KDE ?????????????????? ????????????????????" + +#: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 ../comps-f9.xml.in.h:88 msgid "" "KDE is a powerful graphical user interface which includes a panel, desktop, " "system icons, and a graphical file manager." @@ -710,147 +413,193 @@ "KDE e ?????????? ???????????????? ?????????????????????????? ??????????, ?????????? ?????????????? ??????????, ?????????????? ????????, " "???????????????? ?????????? ?? ???????????????? ???????? ????????????????." -#: ../comps-f7.xml.in.h:84 ../comps-f8.xml.in.h:88 +#: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 ../comps-f9.xml.in.h:89 msgid "Kannada Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:85 ../comps-f8.xml.in.h:89 +#: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:90 msgid "Khmer Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 +#: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:91 msgid "Korean Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 +#: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:92 msgid "Languages" msgstr "??????????" -#: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 +#: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:93 msgid "Lao Support" msgstr "?????????????????? ???? ??????" -#: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 +#: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:94 msgid "Latvian Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:95 +#: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:96 msgid "Legacy Network Server" msgstr "???????????????????????? ?????????????? ??????????????" -#: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 +#: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:97 msgid "Legacy Software Development" msgstr "???????????????????? ???? ?????????????????????? ??????????????" -#: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 +#: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:98 msgid "Legacy Software Support" msgstr "?????????????????? ???? ?????????????????????? ??????????????" -#: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 +#: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:99 msgid "Lithuanian Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 +#: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:101 +#: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36 +msgid "Mail Server" +msgstr "???????????????? ????????????" + +#: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:102 msgid "Malay Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 +#: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:103 msgid "Malayalam Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 +#: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:104 msgid "Maori Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 +#: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:105 msgid "Marathi Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:106 +#: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:107 msgid "MySQL Database" msgstr "???????? ?????????? MySQL" -#: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 +#: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:109 +#: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37 +msgid "Network Servers" +msgstr "?????????????? ??????????????" + +#: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:110 +#: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38 +msgid "News Server" +msgstr "???????????????????? ????????????" + +#: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:111 msgid "Northern Sotho Support" msgstr "?????????????????? ???? ?????????????? ??????????" -#: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 +#: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:112 msgid "Norwegian Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:114 +#: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:113 +#: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39 +msgid "Office/Productivity" +msgstr "????????/??????????????????????????" + +#: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:115 msgid "Oriya Support" msgstr "?????????????????? ???? ????????" -#: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 +#: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:116 +#: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40 +msgid "" +"Packages which provide functionality for developing and building " +"applications." +msgstr "" +"???????????? ???????????????????????? ???????????????????????????? ???????????????????? ???? ???????????????????????? ?? ?????????????????????? " +"???? ????????????????????." + +#: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:117 msgid "Persian Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 +#: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:118 msgid "Polish Support" msgstr "?????????????????? ???? ????????????" -#: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 +#: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:119 msgid "Portuguese Support" msgstr "?????????????????? ???? ??????????????????????" -#: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 +#: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:120 msgid "PostgreSQL Database" msgstr "???????? ?????????? PostgreSQL" -#: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 +#: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:121 msgid "Printing Support" msgstr "?????????????????? ???? ??????????" -#: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 +#: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:122 msgid "Punjabi Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 +#: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:123 msgid "Romanian Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 +#: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:124 msgid "Ruby" msgstr "Ruby" -#: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 +#: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:125 msgid "Russian Support" msgstr "?????????????????? ???? ??????????" -#: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 +#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:126 msgid "Samoan Support" msgstr "?????????????????? ???? ??????????" -#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 +#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:127 msgid "Serbian Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 +#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:128 msgid "Server Configuration Tools" msgstr "?????????????????????? ???? ?????????????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 +#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:129 +#: ../comps-el4.xml.in.h:41 ../comps-el5.xml.in.h:41 +msgid "Servers" +msgstr "??????????????" + +#: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:130 +#: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 +msgid "" +"Simple window managers that aren't part of a larger desktop environment." +msgstr "" +"???????????? ?????????????????? ???? ???????????????? ?????????? ???? ???? ???????? ???? ????-???????????? ?????????????? ??????????." + +#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:131 msgid "Sinhala Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 +#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:132 msgid "Slovak Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 +#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:133 msgid "Slovenian Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 +#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:134 msgid "Smallest possible installation" msgstr "??????-?????????????? ???????????????? ????????????????????" -#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 +#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:135 +#: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43 +msgid "Software used for running network servers" +msgstr "?????????????? ???? ?????????????? ???? ?????????????? ????????????" + +#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:136 msgid "Somali Support" msgstr "?????????????????? ???? ????????????????????" -#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 +#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:137 msgid "" "Sometimes called text editors, these are programs that allow you to create " "and edit text files. This includes Emacs and Vi." @@ -858,80 +607,122 @@ "???????????????? ???????????????? ???????????????? ??????????????????, ???????? ???? ???????????????? ?????????????????????? ???? " "?????????????????????? ?? ???????????????????? ???? ???????????????? ??????????????. ???????????????? ???? Emacs ?? Vi." -#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 +#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:138 +#: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45 +msgid "Sound and Video" +msgstr "?????????? ?? ??????????" + +#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:139 msgid "Southern Ndebele Support" msgstr "?????????????????? ???? ???????? ??????????????" -#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 +#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:140 msgid "Southern Sotho Support" msgstr "?????????????????? ???? ???????? ??????????" -#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 +#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:141 msgid "Spanish Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 +#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:142 +#: ../comps-el4.xml.in.h:46 +msgid "Support for developing programs in the Java programming language." +msgstr "?????????????????? ???? ???????????????????? ???? ???????????????? ???? ???????????????????? ???????? Java." + +#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:143 +#: ../comps-el4.xml.in.h:47 +msgid "Support for running programs written in the Java programming language." +msgstr "?????????????????? ???? ???????????????? ???????????????? ???? ???????????????????? ???????? Java." + +#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:144 msgid "Swati Support" msgstr "?????????????????? ???? ??????????" -#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 +#: ../comps-f7.xml.in.h:136 ../comps-f8.xml.in.h:145 ../comps-f9.xml.in.h:145 msgid "Swedish Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 +#: ../comps-f7.xml.in.h:137 ../comps-f8.xml.in.h:146 ../comps-f9.xml.in.h:146 +#: ../comps-el4.xml.in.h:48 ../comps-el5.xml.in.h:46 +msgid "System Tools" +msgstr "???????????????? ??????????????????????" + +#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:147 msgid "Tagalog Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 +#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:148 msgid "Tamil Support" msgstr "?????????????????? ???? ??????????" -#: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 +#: ../comps-f7.xml.in.h:140 ../comps-f8.xml.in.h:149 ../comps-f9.xml.in.h:149 msgid "Telugu Support" msgstr "?????????????????? ???? ????????????" -#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 +#: ../comps-f7.xml.in.h:141 ../comps-f8.xml.in.h:150 ../comps-f9.xml.in.h:150 +#: ../comps-el4.xml.in.h:49 ../comps-el5.xml.in.h:47 +msgid "Text-based Internet" +msgstr "???????????????? ????????????????" + +#: ../comps-f7.xml.in.h:142 ../comps-f8.xml.in.h:151 ../comps-f9.xml.in.h:151 msgid "Thai Support" msgstr "?????????????????? ???? ????????????????????" -#: ../comps-f7.xml.in.h:142 +#: ../comps-f7.xml.in.h:143 msgid "The Eclipse Integrated Development Environment." msgstr "?????????????????????????? ?????????? ???? ???????????????????? Eclipse." -#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 +#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:152 +#: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49 +msgid "The applications include office suites, PDF viewers, and more." +msgstr "???????????????????????? ???????????????? ???????? ????????????, ???????????????? ???? ?????????????? ???? PDF ?? ??????????." + +#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:153 msgid "" "The packages in this group are core libraries needed to develop applications." msgstr "" "???????????????? ?? ???????? ?????????? ???? ?????????????????? ????????????????????, ?????????? ???? ?????????? ???? " "???????????????????????? ???? ????????????????????." -#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 +#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:154 +#: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 +msgid "These packages allow you to configure an IMAP or SMTP mail server." +msgstr "???????? ???????????? ???????????????????? ?????????????????????? IMAP ?????? SMTP ???????????????? ??????????????." + +#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:155 msgid "" "These packages allow you to develop applications for the X Window System." msgstr "" "???????????????? ???????????????????? ???????????????????????? ???? ???????????????????? ???? ?????????????????? ???? ???????????????? ??." -#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 +#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:156 +#: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 +msgid "" +"These packages are helpful when developing web applications or web pages." +msgstr "" +"???????? ???????????? ???? ?????????????? ?????? ???????????????????????? ???? ?????? ???????????????????? ?????? ????????????????." + +#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:157 msgid "" "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "???????? ???????????? ???????????????? ?????????????? ?????????????? ???????? DHCP, Kerberos ?? NIS." -#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 +#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:158 msgid "" "These packages include servers for old network protocols such as rsh and " "telnet." msgstr "" "???????????????? ???????????????? ?????????????? ???? ?????????? ?????????????? ??????????????????, ???????? rsh ?? telnet." -#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 +#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:159 msgid "These packages provide a virtualization environment." msgstr "???????? ???????????? ?????????????????????? ?????????? ???? ??????????????????????????." -#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 +#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 ../comps-f9.xml.in.h:160 msgid "These packages provide compatibility with previous releases." msgstr "???????? ???????????? ???????????????????? ???????????????????????? ?? ???????????????? ??????????????." -#: ../comps-f7.xml.in.h:152 ../comps-f8.xml.in.h:160 +#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:161 msgid "" "These packages provide support for various locales including fonts and input " "methods." @@ -939,7 +730,7 @@ "???????????????? ???????????????????? ?????????????????????? ???? ???????????????? ?????????????? ?? ???????????????? ???????????????? ?? " "???????????? ???? ??????????????????." -#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 +#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:162 msgid "" "These tools allow you to create documents in the DocBook format and convert " "them into HTML, PDF, Postscript, and text." @@ -947,12 +738,38 @@ "???????? ?????????????????????? ???????????????????? ?????????????????????? ???? ???????????????????????? ?? DocBook ???????????? ?? " "???????????????????????????? ?? ?? HTML, PDF, Postscript ?????? ??????????." -#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 +#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:163 +#: ../comps-el4.xml.in.h:55 ../comps-el5.xml.in.h:53 +msgid "These tools allow you to run a Web server on the system." +msgstr "???????? ?????????????????????? ???????????????????? ???????????????????? ???? ?????? ???????????? ?? ??????????????????." + +#: ../comps-f7.xml.in.h:156 ../comps-f8.xml.in.h:164 ../comps-f9.xml.in.h:164 +#: ../comps-el4.xml.in.h:56 ../comps-el5.xml.in.h:54 +msgid "These tools allow you to run an FTP server on the system." +msgstr "???????? ?????????????????????????? ???????????????????? ???????????????????? ???? FTP ???????????? ?? ??????????????????." + +#: ../comps-f7.xml.in.h:157 ../comps-f8.xml.in.h:165 ../comps-f9.xml.in.h:165 +#: ../comps-el4.xml.in.h:57 ../comps-el5.xml.in.h:55 +msgid "" +"These tools include core development tools such as automake, gcc, perl, " +"python, and debuggers." +msgstr "" +"?????????????????????????? ???????????????? ???????????????? ?????????????????????? ???? ???????????????????? ???????? automake, " +"gcc, perl, python, ?????????? ?? ????????????????." + +#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:166 +#: ../comps-el4.xml.in.h:58 ../comps-el5.xml.in.h:56 +msgid "This group allows you to configure the system as a news server." +msgstr "" +"???????? ?????????????? ?????????????????? ?????????????????????? ???? ?????????????????? ???? ???????????? ???????? ???????????????????? " +"????????????." + +#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:167 msgid "This group contains all of Red Hat's custom server configuration tools." msgstr "" "???????? ?????????? ?????????????? ???????????????? ?????????????????????? ???? ?????????????????? ???? ?????????????? ???? Red Hat." -#: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 +#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:168 msgid "" "This group includes a minimal set of packages. Useful for creating small " "router/firewall boxes, for example." @@ -960,13 +777,75 @@ "?????????????? ?????????????? ?????????????????????? ?????????? ???? ????????????. ?????????????? ?? ???????????????? ???? ?????????????????? " "???? ?????????? ?????????????? ???? ????????????/?????????????? ??????????." -#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 +#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:169 +#: ../comps-el4.xml.in.h:59 ../comps-el5.xml.in.h:57 +msgid "This group includes graphical email, Web, and chat clients." +msgstr "???????? ?????????? ?????????????? ?????????????? ???? ???????????????? ????????, ?????? ?? ??????." + +#: ../comps-f7.xml.in.h:162 ../comps-f8.xml.in.h:170 ../comps-f9.xml.in.h:170 +#: ../comps-el4.xml.in.h:60 ../comps-el5.xml.in.h:58 +msgid "" +"This group includes packages for performing mathematical and scientific " +"computations and plotting, as well as unit conversion." +msgstr "" +"???????? ?????????? ?????????????? ???????????? ???? ???????????????????? ???? ?????????????????????????? ?? ???????????? " +"????????????????????, ?????????????????????????? ?? ?????????????????????????? ???? ?????????? ??????????????." + +#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:171 +#: ../comps-el4.xml.in.h:61 ../comps-el5.xml.in.h:59 +msgid "This group includes packages to help you manipulate and scan images." +msgstr "" +"???????? ?????????? ???????????????? ????????????, ?????????? ???????????????????? ?????? ???????????????????????? ?? ?????????????????? ???? " +"??????????????????????." + +#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:172 +#: ../comps-el4.xml.in.h:62 ../comps-el5.xml.in.h:60 +msgid "" +"This group includes text-based email, Web, and chat clients. These " +"applications do not require the X Window System." +msgstr "" +"???????? ?????????? ?????????????? ???????????????? ?????????????? ???? ????????, ?????? ?? ??????. ???????? ???????????????????? ???? " +"???? ?????????????? ???? ?????????????? ???? ???????????????? ??." + +#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:173 +#: ../comps-el4.xml.in.h:63 ../comps-el5.xml.in.h:61 +msgid "" +"This group is a collection of graphical administration tools for the system, " +"such as for managing user accounts and configuring system hardware." +msgstr "" +"???????? ?????????? ?? ???????????????? ???? ???????????????? ?????????????????????? ???? ???????????????????????????? ???? " +"??????????????????, ???????? ???????????????? ???????????????????? ???? ?????????????????????????????? ?????????????? ?? ?????????????????? " +"???? ?????????????????? ??????????????." + +#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:174 +#: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 +msgid "" +"This group is a collection of tools and resources of Armenian environments." +msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????." + +#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:175 +#: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 +msgid "" +"This group is a collection of tools for various hardware specific utilities." +msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????? ?????????????????? ????????????????????." + +#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:176 +#: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 +msgid "" +"This group is a collection of various tools for the system, such as the " +"client for connecting to SMB shares and tools to monitor network traffic." +msgstr "" +"???????? ?????????? ?? ???????????????? ???? ???????????????? ?????????????????????? ???? ??????????????????, ???????? ???????????? ???? " +"?????????????? ?????? SMB ?????????????????? ?????????????? ?? ?????????????????????? ???? ???????????????????? ???? ???????????????? " +"????????????." + +#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:177 msgid "" "This package group allows you to run a DNS name server (BIND) on the system." msgstr "" "???????? ?????????? ???????????? ?????????????????? ???????????????????????? ???? DNS ???????????? ???? ?????????? (BIND)." -#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 +#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:178 msgid "" "This package group allows you to share files between Linux and MS Windows" "(tm) systems." @@ -974,111 +853,226 @@ "???????? ?????????? ???????????? ?????????????????? ?????????????????????? ???? ?????????????? ?????????? ???????????? ?? MS Windows " "(tm) ??????????????." -#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 +#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:179 msgid "This package group contains packages useful for use with MySQL." msgstr "???????? ?????????? ?????????????? ????????????, ?????????????? ???? ???????????????? ?? MySQL." -#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 +#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 ../comps-f9.xml.in.h:180 msgid "This package group includes packages useful for use with Postgresql." msgstr "???????? ?????????? ?????????????? ????????????, ?????????????? ???? ???????????????? ?? Postgresql." -#: ../comps-f7.xml.in.h:172 ../comps-f8.xml.in.h:180 +#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 ../comps-f9.xml.in.h:181 msgid "Tibetan Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f7.xml.in.h:173 ../comps-f8.xml.in.h:181 +#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:182 msgid "Tonga Support" msgstr "?????????????????? ???? ??????????" -#: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 +#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:183 +#: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 +msgid "Tools and Utilities needed by a Fedora Packager" +msgstr "?????????????????????? ???? ?????????????????? ???? ???????????? ???? ????????????" + +#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 ../comps-f9.xml.in.h:184 msgid "Tsonga Support" msgstr "?????????????????? ???? ????????????" -#: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 +#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 ../comps-f9.xml.in.h:185 msgid "Tswana Support" msgstr "?????????????????? ???? ????????????" -#: ../comps-f7.xml.in.h:176 ../comps-f8.xml.in.h:184 +#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 ../comps-f9.xml.in.h:186 msgid "Turkish Support" msgstr "?????????????????? ???? ????????????" -#: ../comps-f7.xml.in.h:177 ../comps-f8.xml.in.h:185 +#: ../comps-f7.xml.in.h:179 ../comps-f8.xml.in.h:187 ../comps-f9.xml.in.h:187 msgid "Ukrainian Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f7.xml.in.h:178 ../comps-f8.xml.in.h:186 +#: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:188 msgid "Urdu Support" msgstr "?????????????????? ???? ????????" -#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 +#: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:189 +#: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 +msgid "Various core pieces of the system." +msgstr "???????????????? ???????????? ?????????? ???? ??????????????????." + +#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 ../comps-f9.xml.in.h:190 +#: ../comps-el5.xml.in.h:72 +msgid "Various ways to relax and spend your free time." +msgstr "???????????????? ???????????? ???? ?????????????????? ?? ???????????????????? ???? ???????????????????? ??????????." + +#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:191 msgid "Venda Support" msgstr "?????????????????? ???? ??????????" -#: ../comps-f7.xml.in.h:182 ../comps-f8.xml.in.h:190 +#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:192 msgid "Vietnamese Support" msgstr "?????????????????? ???? ????????????????????" -#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 +#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:193 msgid "Virtualization" msgstr "??????????????????????????" -#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 +#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:194 +#: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 +msgid "Web Development" +msgstr "?????? ????????????????????" + +#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:195 +#: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 +msgid "Web Server" +msgstr "?????? ????????????" + +#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:196 msgid "Welsh Support" msgstr "?????????????????? ???? ????????????" -#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 +#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:197 +#: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 +msgid "Window Managers" +msgstr "?????????????????? ???? ????????????????" + +#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:198 msgid "Windows File Server" msgstr "Windows ???????????? ????????????" -#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 +#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:199 msgid "X Software Development" msgstr "???????????????????? ???? ?????????????? ???? ??" -#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 +#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:200 +#: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 +msgid "X Window System" +msgstr "?????????????? ???? ???????????????? ??" + +#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:201 +msgid "XFCE" +msgstr "XFCE" + +#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:202 +msgid "XFCE Software Development" +msgstr "XFCE ?????????????????? ????????????????????" + +#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:203 msgid "Xhosa Support" msgstr "?????????????????? ???? ??????????" -#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 +#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:204 msgid "Zulu Support" msgstr "?????????????????? ???? ??????????????" -#: ../comps-f8.xml.in.h:21 +#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 msgid "Buildsystem building group" msgstr "?????????? ???? ???????????????????????? ??????????????" -#: ../comps-f8.xml.in.h:48 +#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:48 msgid "Fedora Eclipse" msgstr "Fedora Eclipse" -#: ../comps-f8.xml.in.h:51 +#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:52 msgid "Fonts" msgstr "????????????????" -#: ../comps-f8.xml.in.h:52 +#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:53 msgid "Fonts packages for rendering text on the desktop." msgstr "???????????? ?? ???????????????? ???? ?????????????????? ???? ?????????? ?? ?????????????????? ??????????." -#: ../comps-f8.xml.in.h:78 +#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:79 msgid "Integrated Development Environments based on Eclipse." msgstr "?????????????????????????? ?????????? ???? ???????????????????? ???????????????? ???? Eclipse." -#: ../comps-f8.xml.in.h:94 +#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:95 msgid "Legacy Fonts" msgstr "???????????????? ????????????????" -#: ../comps-f8.xml.in.h:99 -#, fuzzy +#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:100 msgid "Low Saxon Support" -msgstr "?????????????????? ???? Low ??????????????????" +msgstr "?????????????????? ???? ?????????????? ???? ?????????? ????????????????" -#: ../comps-f8.xml.in.h:105 +#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:106 msgid "Mongolian Support" msgstr "?????????????????? ???? ??????????????????" -#: ../comps-f8.xml.in.h:107 +#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:108 msgid "Nepali Support" msgstr "?????????????????? ???? ????????????????" -#: ../comps-f8.xml.in.h:113 +#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:114 msgid "Older bitmap and vector fonts packages" msgstr "????-?????????? ???????????? ?? ?????????????????? ?? ???????????????? ????????????????" + +#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +msgid "Applications for a variety of tasks" +msgstr "???????????????????? ???? ???????????????????????? ????????????" + +#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +msgid "Dialup Networking Support" +msgstr "?????????????????? ???? Dailup ??????????" + +#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 +msgid "" +"GNOME is a powerful, graphical user interface which includes a panel, " +"desktop, system icons, and a graphical file manager." +msgstr "" +"GNOME ?? ?????????? ???????????????? ??????????, ?????????? ?????????????? ??????????, ?????????????? ????????, ???????????????? " +"?????????? ?? ???????????????? ???????????? ????????????????." + +#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 +msgid "" +"KDE is a powerful, graphical user interface which includes a panel, desktop, " +"system icons, and a graphical file manager." +msgstr "" +"KDE e ??????????, ???????????????? ??????????, ?????????? ?????????????? ??????????, ??????????????, ???????????????? ?????????? ?? " +"???????????????? ???????? ????????????????." + +#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 +msgid "" +"Sometimes called text editors, these are programs that allow you to create " +"and edit files. These include Emacs and Vi." +msgstr "" +"????????????????????, ?????????? ???????????????? ???????????????? ??????????????????, ???????????????????? ?????????????????????? ?? " +"?????????????????????????? ???? ??????????????. ???? ???????????????? emacs ?? vi." + +#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +msgid "The XEmacs text editor." +msgstr "?????????????????? ???????????????? XEmacs." + +#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 +msgid "" +"These tools allow you to create documentation in the DocBook format and " +"convert them to HTML, PDF, Postscript, and text." +msgstr "" +"???????? ?????????????????????? ???????????????????? ?????????????????????? ???? ???????????????????????? ?? DocBook ???????????? ?? " +"???????????????????????????? ?? ?? HTML, PDF, Postscript ?????? ??????????." + +#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +msgid "This group is a collection of network servers for specific purposes" +msgstr "???????? ?????????? ?????????????? ?????????????????????? ???? ???????????????? ?????????????????? ????????????????????" + +#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 +msgid "" +"This group is a collection of tools and resources of Arabic environments." +msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????????? ?????????????? ??????????." + +#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 +msgid "" +"This group is a collection of tools and resources of Hebrew environments." +msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ???????????????? ?????????????? ??????????." + +#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 +msgid "" +"This group is a collection of tools and resources of Japanese environments." +msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????????? ?????????????? ??????????." + +#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +msgid "XEmacs" +msgstr "XEmacs" + +#: ../comps-el5.xml.in.h:65 +msgid "" +"This group is a collection of tools and resources of Czech environments." +msgstr "???????? ?????????? ?????????????? ?????????????????????? ?? ?????????????? ???? ?????????? ?????????????? ??????????." + From fedora-extras-commits at redhat.com Mon Mar 10 20:48:22 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 20:48:22 GMT Subject: rpms/glib2/devel .cvsignore, 1.83, 1.84 glib2.spec, 1.158, 1.159 sources, 1.85, 1.86 Message-ID: <200803102048.m2AKmMdr030267@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30221 Modified Files: .cvsignore glib2.spec sources Log Message: 2.16.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/.cvsignore,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- .cvsignore 25 Feb 2008 20:21:00 -0000 1.83 +++ .cvsignore 10 Mar 2008 20:47:46 -0000 1.84 @@ -1 +1 @@ -glib-2.15.6.tar.bz2 +glib-2.16.0.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- glib2.spec 3 Mar 2008 14:48:18 -0000 1.158 +++ glib2.spec 10 Mar 2008 20:47:46 -0000 1.159 @@ -2,12 +2,12 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.15.6 -Release: 2%{?dist} +Version: 2.16.0 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org -Source: http://download.gnome.org/sources/glib/2.15/glib-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/glib/2.16/glib-%{version}.tar.bz2 Source2: glib2.sh Source3: glib2.csh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,8 +18,6 @@ BuildRequires: libselinux-devel # for sys/inotify.h BuildRequires: glibc-devel -# fixed in upstream svn -Patch0: inline.patch %description @@ -53,7 +51,6 @@ %prep %setup -q -n glib-%{version} -%patch0 -p1 -b .inline %build %configure --disable-gtk-doc --enable-static @@ -126,6 +123,9 @@ %{_libdir}/lib*.a %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.16.0-1 +- Update to 2.16.0 + * Mon Mar 3 2008 Matthias Clasen - 2.15.6-2 - Fix inline support Index: sources =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/sources,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- sources 25 Feb 2008 20:21:00 -0000 1.85 +++ sources 10 Mar 2008 20:47:46 -0000 1.86 @@ -1 +1 @@ -62b1a3c1fa52b8d91b4535e4a4ab3057 glib-2.15.6.tar.bz2 +9b1e503956265050bc0bfd9feb2cc2d2 glib-2.16.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 20:48:38 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 10 Mar 2008 20:48:38 GMT Subject: rpms/kudzu/devel kudzu.spec,1.188,1.189 Message-ID: <200803102048.m2AKmcTO030279@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/kudzu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30247 Modified Files: kudzu.spec Log Message: nuke the binary & init script. *ding dong* Index: kudzu.spec =================================================================== RCS file: /cvs/extras/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- kudzu.spec 19 Feb 2008 16:22:43 -0000 1.188 +++ kudzu.spec 10 Mar 2008 20:48:05 -0000 1.189 @@ -1,6 +1,6 @@ Name: kudzu Version: 1.2.83 -Release: 2 +Release: 3 License: GPLv2 Summary: The Red Hat Linux hardware probing tool. Group: Applications/System @@ -40,28 +40,18 @@ install -m 755 fix-mouse-psaux $RPM_BUILD_ROOT/%{_sbindir} -%find_lang %{name} +rm -rf $RPM_BUILD_ROOT/sbin $RPM_BUILD_ROOT/%{_sbindir} $RPM_BUILD_ROOT/%{_mandir} +rm -rf $RPM_BUILD_ROOT/etc $RPM_BUILD_ROOT/%{_datadir} %clean rm -rf $RPM_BUILD_ROOT -%post -chkconfig --add kudzu +%triggerun -- kudzu < 1.2.83-3 +/sbin/chkconfig --del kudzu -%preun -if [ $1 = 0 ]; then - chkconfig --del kudzu -fi - -%files -f %{name}.lang +%files %defattr(-,root,root) %doc README hwconf-description -/sbin/kudzu -%{_sbindir}/kudzu -%{_sbindir}/fix-mouse-psaux -%{_mandir}/man8/* -%config(noreplace) /etc/sysconfig/kudzu -%config /etc/rc.d/init.d/kudzu %{_libdir}/python*/site-packages/* %Files devel @@ -71,6 +61,9 @@ %{_includedir}/kudzu %changelog +* Mon Mar 10 2008 Bill Nottingham 1.2.83-3 +- don't ship a kudzu binary or init script + * Tue Feb 19 2008 Fedora Release Engineering - 1.2.83-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 10 20:54:07 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 10 Mar 2008 20:54:07 GMT Subject: comps comps-f9.xml.in,1.300,1.301 Message-ID: <200803102054.m2AKs7oK030431@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30412 Modified Files: comps-f9.xml.in Log Message: i'm sure this will help the livecds fit Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- comps-f9.xml.in 10 Mar 2008 20:08:57 -0000 1.300 +++ comps-f9.xml.in 10 Mar 2008 20:53:37 -0000 1.301 @@ -622,7 +622,6 @@ iprutils iputils kbd - kudzu libgcc passwd policycoreutils From fedora-extras-commits at redhat.com Mon Mar 10 20:58:11 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Mon, 10 Mar 2008 20:58:11 GMT Subject: rpms/selinux-policy/devel policy-20071130.patch,1.93,1.94 Message-ID: <200803102058.m2AKwBm5030533@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30512 Modified Files: policy-20071130.patch Log Message: * Mon Mar 10 2008 Dan Walsh 3.3.1-13 - Additional changes for MLS policy policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- policy-20071130.patch 10 Mar 2008 20:16:22 -0000 1.93 +++ policy-20071130.patch 10 Mar 2008 20:58:06 -0000 1.94 @@ -14490,7 +14490,7 @@ +cron_read_system_job_lib_files(hald_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.3.1/policy/modules/services/inetd.te --- nsaserefpolicy/policy/modules/services/inetd.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/inetd.te 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/inetd.te 2008-03-10 16:49:55.000000000 -0400 @@ -30,6 +30,10 @@ type inetd_child_var_run_t; files_pid_file(inetd_child_var_run_t) @@ -23383,7 +23383,7 @@ /var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.3.1/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-12-04 11:02:50.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-10 14:41:25.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-10 16:54:19.000000000 -0400 @@ -12,9 +12,15 @@ ## ## @@ -23847,7 +23847,7 @@ # for when /tmp/.X11-unix is created by the system allow $2 xdm_t:fd use; -@@ -542,25 +540,540 @@ +@@ -542,25 +540,541 @@ allow $2 xdm_tmp_t:sock_file { read write }; dontaudit $2 xdm_t:tcp_socket { read write }; @@ -23995,6 +23995,7 @@ + class x_synthetic_event all_x_synthetic_event_perms; + + attribute xdm_x_domain; ++ attribute xserver_unconfined_type; + ') + + allow $1 self:x_cursor { create use setattr }; @@ -24084,6 +24085,7 @@ + allow $1 input_xevent_t:{ x_event x_synthetic_event } receive; + allow $1 $1:{ x_event x_synthetic_event } { send receive }; + allow $1 default_xevent_t:x_event receive; ++ allow $1 default_xevent_t:x_synthetic_event send; + + # can receive certain root window events + allow $1 focus_xevent_t:x_event receive; @@ -24122,7 +24124,6 @@ + allow $1 xdm_xserver_t:x_device { getattr getfocus use setattr }; + allow $1 xdm_xserver_t:x_resource read; + allow $1 xdm_xserver_t:x_server grab; -+ +') + +####################################### @@ -24394,7 +24395,7 @@ ') ') -@@ -593,26 +1106,44 @@ +@@ -593,26 +1107,44 @@ # template(`xserver_use_user_fonts',` gen_require(` @@ -24446,15 +24447,14 @@ ## Transition to a user Xauthority domain. ## ## -@@ -638,10 +1169,77 @@ +@@ -638,10 +1170,77 @@ # template(`xserver_domtrans_user_xauth',` gen_require(` - type $1_xauth_t, xauth_exec_t; + type xauth_exec_t, xauth_t; - ') - -- domtrans_pattern($2, xauth_exec_t, $1_xauth_t) ++ ') ++ + domtrans_pattern($2, xauth_exec_t, xauth_t) +') + @@ -24519,14 +24519,15 @@ +template(`xserver_read_user_iceauth',` + gen_require(` + type user_iceauth_home_t; -+ ') -+ + ') + +- domtrans_pattern($2, xauth_exec_t, $1_xauth_t) + # Read .Iceauthority file + allow $2 user_iceauth_home_t:file { getattr read }; ') ######################################## -@@ -671,10 +1269,10 @@ +@@ -671,10 +1270,10 @@ # template(`xserver_user_home_dir_filetrans_user_xauth',` gen_require(` @@ -24539,7 +24540,7 @@ ') ######################################## -@@ -760,7 +1358,7 @@ +@@ -760,7 +1359,7 @@ type xconsole_device_t; ') @@ -24548,7 +24549,7 @@ ') ######################################## -@@ -860,6 +1458,25 @@ +@@ -860,6 +1459,25 @@ ######################################## ## @@ -24574,7 +24575,7 @@ ## Read xdm-writable configuration files. ## ## -@@ -914,6 +1531,7 @@ +@@ -914,6 +1532,7 @@ files_search_tmp($1) allow $1 xdm_tmp_t:dir list_dir_perms; create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t) @@ -24582,7 +24583,7 @@ ') ######################################## -@@ -955,6 +1573,24 @@ +@@ -955,6 +1574,24 @@ ######################################## ## @@ -24607,7 +24608,7 @@ ## Execute the X server in the XDM X server domain. ## ## -@@ -965,15 +1601,47 @@ +@@ -965,15 +1602,47 @@ # interface(`xserver_domtrans_xdm_xserver',` gen_require(` @@ -24656,7 +24657,7 @@ ## Make an X session script an entrypoint for the specified domain. ## ## -@@ -1123,7 +1791,7 @@ +@@ -1123,7 +1792,7 @@ type xdm_xserver_tmp_t; ') @@ -24665,7 +24666,7 @@ ') ######################################## -@@ -1312,3 +1980,83 @@ +@@ -1312,3 +1981,83 @@ files_search_tmp($1) stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t) ') From fedora-extras-commits at redhat.com Mon Mar 10 20:59:00 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 20:59:00 GMT Subject: rpms/gvfs/devel .cvsignore, 1.12, 1.13 gvfs.spec, 1.30, 1.31 sources, 1.12, 1.13 Message-ID: <200803102059.m2AKx0YA030608@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gvfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30500 Modified Files: .cvsignore gvfs.spec sources Log Message: 0.2.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 4 Mar 2008 18:32:27 -0000 1.12 +++ .cvsignore 10 Mar 2008 20:58:26 -0000 1.13 @@ -1 +1 @@ -gvfs-0.1.11.tar.bz2 +gvfs-0.2.0.1.tar.bz2 Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gvfs.spec 6 Mar 2008 09:28:29 -0000 1.30 +++ gvfs.spec 10 Mar 2008 20:58:26 -0000 1.31 @@ -1,11 +1,11 @@ Summary: Backends for the gio framework in GLib Name: gvfs -Version: 0.1.11 -Release: 2%{?dist} +Version: 0.2.0.1 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org -Source: http://download.gnome.org/sources/gvfs/0.1/gvfs-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gvfs/0.2/gvfs-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig BuildRequires: glib2-devel >= 2.15.6 @@ -26,9 +26,6 @@ BuildRequires: bluez-libs-devel >= 3.12 BuildRequires: expat-devel -# Patches from head -Patch0: daemon_mount_deadlock.patch - %description The gvfs package provides backend implementations for the gio @@ -48,7 +45,6 @@ %prep %setup -q -%patch0 -p1 -b .deadlock %build %configure @@ -142,6 +138,9 @@ %{_libdir}/libgvfscommon.so %changelog +* Mon Mar 10 2008 Matthias Clasen - 0.2.0.1-1 +- Update to 0.2.0.1 + * Thu Mar 6 2008 Tomas Bzatek - 0.1.11-2 - Add patch that fixes a deadlock when foreign volume is removed Index: sources =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 4 Mar 2008 18:32:27 -0000 1.12 +++ sources 10 Mar 2008 20:58:26 -0000 1.13 @@ -1 +1 @@ -fd55418c31bb95f7f5f217f475887e86 gvfs-0.1.11.tar.bz2 +52efdadf6632b9260cbb3c8cbb6076c0 gvfs-0.2.0.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:06:31 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:06:31 GMT Subject: rpms/eog/devel .cvsignore, 1.58, 1.59 eog.spec, 1.106, 1.107 sources, 1.58, 1.59 Message-ID: <200803102106.m2AL6VLw005514@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/eog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5488 Modified Files: .cvsignore eog.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eog/devel/.cvsignore,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- .cvsignore 26 Feb 2008 03:43:48 -0000 1.58 +++ .cvsignore 10 Mar 2008 21:05:57 -0000 1.59 @@ -1 +1 @@ -eog-2.21.92.tar.bz2 +eog-2.22.0.tar.bz2 Index: eog.spec =================================================================== RCS file: /cvs/extras/rpms/eog/devel/eog.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- eog.spec 26 Feb 2008 03:43:48 -0000 1.106 +++ eog.spec 10 Mar 2008 21:05:57 -0000 1.107 @@ -13,10 +13,10 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.21.92 +Version: 2.22.0 Release: 1%{?dist} URL: http://www.gnome.org -Source: http://download.gnome.org/sources/eog/2.21/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/eog/2.22/%{name}-%{version}.tar.bz2 # needs to be redone #Patch0: eog-2.19.4-svgz.patch License: GPLv2+ and GFDL+ @@ -152,6 +152,9 @@ %{_libdir}/pkgconfig/eog.pc %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Mon Feb 25 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/eog/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 26 Feb 2008 03:43:48 -0000 1.58 +++ sources 10 Mar 2008 21:05:57 -0000 1.59 @@ -1 +1 @@ -880f4150075faa5fef95ebfb5f00dc2c eog-2.21.92.tar.bz2 +53928253e8f0265b6e7de80bfc51ab3a eog-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:09:44 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:09:44 GMT Subject: rpms/zenity/devel .cvsignore, 1.22, 1.23 sources, 1.22, 1.23 zenity.spec, 1.41, 1.42 Message-ID: <200803102109.m2AL9inR005651@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/zenity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5555 Modified Files: .cvsignore sources zenity.spec Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zenity/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 26 Feb 2008 03:34:31 -0000 1.22 +++ .cvsignore 10 Mar 2008 21:08:48 -0000 1.23 @@ -1 +1 @@ -zenity-2.21.1.tar.bz2 +zenity-2.22.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/zenity/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 26 Feb 2008 03:34:31 -0000 1.22 +++ sources 10 Mar 2008 21:08:48 -0000 1.23 @@ -1 +1 @@ -6785e49ab3271ba2d3c044d50fb3fca8 zenity-2.21.1.tar.bz2 +f482090f1bd4946a2f8aee8e73200b04 zenity-2.22.0.tar.bz2 Index: zenity.spec =================================================================== RCS file: /cvs/extras/rpms/zenity/devel/zenity.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- zenity.spec 26 Feb 2008 03:34:31 -0000 1.41 +++ zenity.spec 10 Mar 2008 21:08:48 -0000 1.42 @@ -1,11 +1,11 @@ Name: zenity -Version: 2.21.1 +Version: 2.22.0 Release: 1%{?dist} Summary: Display dialog boxes from shell scripts Group: Applications/System License: LGPLv2+ URL: http://directory.fsf.org/zenity.html -Source: http://download.gnome.org/sources/zenity/2.21/zenity-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/zenity/2.22/zenity-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -71,6 +71,9 @@ %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Mon Feb 25 2008 Matthias Clasen - 2.21.1-1 - Update to 2.21.1 From fedora-extras-commits at redhat.com Mon Mar 10 21:17:20 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:17:20 GMT Subject: rpms/gcalctool/devel .cvsignore, 1.37, 1.38 gcalctool.spec, 1.60, 1.61 sources, 1.38, 1.39 Message-ID: <200803102117.m2ALHKTi006822@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gcalctool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6350 Modified Files: .cvsignore gcalctool.spec sources Log Message: 5.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcalctool/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 24 Feb 2008 21:53:16 -0000 1.37 +++ .cvsignore 10 Mar 2008 21:16:25 -0000 1.38 @@ -1 +1 @@ -gcalctool-5.21.92.tar.bz2 +gcalctool-5.22.0.tar.bz2 Index: gcalctool.spec =================================================================== RCS file: /cvs/extras/rpms/gcalctool/devel/gcalctool.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- gcalctool.spec 24 Feb 2008 21:53:16 -0000 1.60 +++ gcalctool.spec 10 Mar 2008 21:16:25 -0000 1.61 @@ -1,12 +1,12 @@ Name: gcalctool -Version: 5.21.92 +Version: 5.22.0 Release: 1%{?dist} Summary: A desktop calculator Group: Applications/System License: GPLv2+ URL: http://directory.fsf.org/gcalctool.html -Source0: http://download.gnome.org/sources/gcalctool/5.21/gcalctool-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gcalctool/5.22/gcalctool-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel >= 1.5 @@ -100,6 +100,9 @@ %changelog +* Mon Mar 10 2008 Matthias Clasen - 5.22.0-1 +- Update to 5.22.0 + * Sun Feb 24 2008 Matthias Clasen - 5.21.92-1 - Update to 5.21.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcalctool/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 24 Feb 2008 21:53:16 -0000 1.38 +++ sources 10 Mar 2008 21:16:25 -0000 1.39 @@ -1 +1 @@ -443430d08ff8df165add3a03d37ed02e gcalctool-5.21.92.tar.bz2 +037ef812fe5562b4dda55b9eea82b77b gcalctool-5.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:21:03 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Mon, 10 Mar 2008 21:21:03 GMT Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xorg-x11-drv-evdev.spec, 1.22, 1.23 Message-ID: <200803102121.m2ALL3E2007107@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6956/devel Modified Files: .cvsignore sources xorg-x11-drv-evdev.spec Log Message: Today's git snap, minor fixes. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 9 Mar 2008 01:38:46 -0000 1.10 +++ .cvsignore 10 Mar 2008 21:20:28 -0000 1.11 @@ -1 +1 @@ -xf86-input-evdev-20080308.tar.bz2 +xf86-input-evdev-20080310.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 9 Mar 2008 01:38:46 -0000 1.10 +++ sources 10 Mar 2008 21:20:28 -0000 1.11 @@ -1 +1 @@ -0a667c800d57c5d79aff9568e29399a9 xf86-input-evdev-20080308.tar.bz2 +453cfa9b39dc1067068c9b35ea8820f7 xf86-input-evdev-20080310.tar.bz2 Index: xorg-x11-drv-evdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xorg-x11-drv-evdev.spec 9 Mar 2008 01:38:46 -0000 1.22 +++ xorg-x11-drv-evdev.spec 10 Mar 2008 21:20:28 -0000 1.23 @@ -4,12 +4,12 @@ %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/input -%define gitdate 20080308 +%define gitdate 20080310 Summary: Xorg X11 evdev input driver Name: xorg-x11-drv-evdev Version: 1.99.1 -Release: 0.1%{?dist} +Release: 0.2%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -55,6 +55,9 @@ %{_mandir}/man4/evdev.4* %changelog +* Mon Mar 10 2008 Adam Jackson 1.99.1-0.2 +- Updated snapshot, minor bug fixes. + * Fri Mar 07 2008 Adam Jackson 1.99.1-0.1 - evdev 2.0 git snapshot From fedora-extras-commits at redhat.com Mon Mar 10 21:21:29 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Mon, 10 Mar 2008 21:21:29 GMT Subject: rpms/pam_krb5/devel .cvsignore, 1.49, 1.50 pam_krb5.spec, 1.60, 1.61 sources, 1.49, 1.50 Message-ID: <200803102121.m2ALLTaE007220@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/pam_krb5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7022/devel Modified Files: .cvsignore pam_krb5.spec sources Log Message: - update to 2.2.23 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pam_krb5/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 8 Feb 2008 23:19:41 -0000 1.49 +++ .cvsignore 10 Mar 2008 21:20:48 -0000 1.50 @@ -1 +1 @@ -pam_krb5-2.2.22-1.tar.gz +pam_krb5-2.2.23-1.tar.gz Index: pam_krb5.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam_krb5/devel/pam_krb5.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- pam_krb5.spec 8 Feb 2008 23:19:41 -0000 1.60 +++ pam_krb5.spec 10 Mar 2008 21:20:48 -0000 1.61 @@ -1,6 +1,6 @@ Summary: A Pluggable Authentication Module for Kerberos 5. Name: pam_krb5 -Version: 2.2.22 +Version: 2.2.23 Release: 1 Source0: pam_krb5-%{version}-1.tar.gz License: BSD or LGPL+ @@ -48,6 +48,11 @@ # $Id$ %changelog +* Mon Mar 10 2008 Nalin Dahyabhai - 2.2.23-1 +- when we're changing passwords, force at least one attempt to authenticate + using the KDC, even in the pathological case where there's no previously- + entered password and we were told not to ask for one (#400611) + * Fri Feb 8 2008 Nalin Dahyabhai - 2.2.22-1 - make sure we don't fall out of the calling process's PAG when we check the .k5login (fallout from #371761) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pam_krb5/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 8 Feb 2008 23:19:41 -0000 1.49 +++ sources 10 Mar 2008 21:20:48 -0000 1.50 @@ -1 +1 @@ -6533c2e641c82a7635dcb8d14415a89c pam_krb5-2.2.22-1.tar.gz +09a1eb25ad7548f3029d867c98927a3d pam_krb5-2.2.23-1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 10 21:22:42 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:22:42 GMT Subject: rpms/gtksourceview2/devel .cvsignore, 1.13, 1.14 gtksourceview2.spec, 1.15, 1.16 sources, 1.13, 1.14 Message-ID: <200803102122.m2ALMgjo007451@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtksourceview2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7333 Modified Files: .cvsignore gtksourceview2.spec sources Log Message: 2.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtksourceview2/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 26 Feb 2008 04:55:41 -0000 1.13 +++ .cvsignore 10 Mar 2008 21:22:09 -0000 1.14 @@ -1 +1 @@ -gtksourceview-2.1.3.tar.bz2 +gtksourceview-2.2.0.tar.bz2 Index: gtksourceview2.spec =================================================================== RCS file: /cvs/extras/rpms/gtksourceview2/devel/gtksourceview2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gtksourceview2.spec 26 Feb 2008 04:55:41 -0000 1.15 +++ gtksourceview2.spec 10 Mar 2008 21:22:09 -0000 1.16 @@ -5,13 +5,13 @@ Summary: A library for viewing source files Name: gtksourceview2 -Version: 2.1.3 +Version: 2.2.0 Release: 1%{?dist} License: LGPLv2+ and GPLv2+ # the library itself is LGPL, some .lang files are GPL Group: System Environment/Libraries URL: http://gtksourceview.sourceforge.net/ -Source0: http://download.gnome.org/sources/gtksourceview/2.1/gtksourceview-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gtksourceview/2.2/gtksourceview-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-vfs2-devel BuildRequires: libxml2-devel @@ -81,6 +81,9 @@ %{_libdir}/*.so %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.2.0-1 +- Update to 2.2.0 + * Mon Feb 25 2008 Matthias Clasen - 2.1.3-1 - Update to 2.1.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtksourceview2/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 26 Feb 2008 04:55:41 -0000 1.13 +++ sources 10 Mar 2008 21:22:09 -0000 1.14 @@ -1 +1 @@ -bf4310ec51abc66e832c34210f4bc4c8 gtksourceview-2.1.3.tar.bz2 +f794b2bfea6f56bbdb6da494b5335f74 gtksourceview-2.2.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:29:51 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:29:51 GMT Subject: rpms/libxklavier/devel .cvsignore, 1.14, 1.15 libxklavier.spec, 1.35, 1.36 sources, 1.14, 1.15 Message-ID: <200803102129.m2ALTpBZ008555@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libxklavier/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8385 Modified Files: .cvsignore libxklavier.spec sources Log Message: 3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libxklavier/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 31 Jan 2008 04:24:08 -0000 1.14 +++ .cvsignore 10 Mar 2008 21:29:00 -0000 1.15 @@ -1 +1 @@ -libxklavier-3.4.tar.bz2 +libxklavier-3.5.tar.bz2 Index: libxklavier.spec =================================================================== RCS file: /cvs/extras/rpms/libxklavier/devel/libxklavier.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- libxklavier.spec 31 Jan 2008 04:24:08 -0000 1.35 +++ libxklavier.spec 10 Mar 2008 21:29:00 -0000 1.36 @@ -1,6 +1,6 @@ Summary: library providing high-level API for X Keyboard Extension Name: libxklavier -Version: 3.4 +Version: 3.5 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -11,7 +11,7 @@ BuildRequires: libX11-devel BuildRequires: libxml2-devel BuildRequires: glib2-devel >= 2.6.0 -Source: http://download.gnome.org/sources/libxklavier/3.4/libxklavier-3.4.tar.bz2 +Source: http://download.gnome.org/sources/libxklavier/3.5/libxklavier-3.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -58,7 +58,6 @@ %doc AUTHORS NEWS README COPYING.LIB %{_libdir}/lib*.so.* -%{_datadir}/libxklavier %files devel %defattr(-, root, root) @@ -69,6 +68,9 @@ %{_datadir}/gtk-doc/html/libxklavier/ %changelog +* Mon Mar 10 2008 Matthias Clasen - 3.5-1 +- Update to 3.5 + * Wed Jan 30 2008 Matthias Clasen - 3.4-1 - Update to 3.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libxklavier/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 31 Jan 2008 04:24:08 -0000 1.14 +++ sources 10 Mar 2008 21:29:00 -0000 1.15 @@ -1 +1 @@ -103a9b6278d84159d08b386c0b6a63b5 libxklavier-3.4.tar.bz2 +aa2c27e3a1ae4ad1d1f09f364c653086 libxklavier-3.5.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:30:58 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:30:58 GMT Subject: rpms/pango/devel .cvsignore, 1.70, 1.71 pango.spec, 1.133, 1.134 sources, 1.70, 1.71 Message-ID: <200803102130.m2ALUwd7008800@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/pango/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8501 Modified Files: .cvsignore pango.spec sources Log Message: 1.20.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pango/devel/.cvsignore,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- .cvsignore 26 Feb 2008 03:19:53 -0000 1.70 +++ .cvsignore 10 Mar 2008 21:30:24 -0000 1.71 @@ -1 +1 @@ -pango-1.19.4.tar.bz2 +pango-1.20.0.tar.bz2 Index: pango.spec =================================================================== RCS file: /cvs/extras/rpms/pango/devel/pango.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- pango.spec 26 Feb 2008 03:19:53 -0000 1.133 +++ pango.spec 10 Mar 2008 21:30:24 -0000 1.134 @@ -8,11 +8,11 @@ Summary: System for layout and rendering of internationalized text Name: pango -Version: 1.19.4 +Version: 1.20.0 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries -Source: http://download.gnome.org/sources/pango/1.19/pango-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/pango/1.20/pango-%{version}.tar.bz2 URL: http://www.pango.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -218,6 +218,9 @@ %changelog +* Mon Mar 10 2008 Matthias Clasen - 1.20.0-1 +- Update to 1.20.0 + * Mon Feb 25 2008 Matthias Clasen - 1.19.4-1 - Update to 1.19.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pango/devel/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- sources 26 Feb 2008 03:19:53 -0000 1.70 +++ sources 10 Mar 2008 21:30:24 -0000 1.71 @@ -1 +1 @@ -7cebf3a2cece56f94ce5b4bab8d4180d pango-1.19.4.tar.bz2 +f0959c4b9b058ba9e4d13fc9086b7e7d pango-1.20.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:36:17 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:36:17 GMT Subject: rpms/libgnome/devel .cvsignore, 1.41, 1.42 libgnome.spec, 1.115, 1.116 sources, 1.41, 1.42 Message-ID: <200803102136.m2ALaHrj009711@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9525 Modified Files: .cvsignore libgnome.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnome/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 10 Mar 2008 04:36:07 -0000 1.41 +++ .cvsignore 10 Mar 2008 21:35:42 -0000 1.42 @@ -1 +1 @@ -libgnome-2.21.91.tar.bz2 +libgnome-2.22.0.tar.bz2 Index: libgnome.spec =================================================================== RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- libgnome.spec 10 Mar 2008 04:36:07 -0000 1.115 +++ libgnome.spec 10 Mar 2008 21:35:42 -0000 1.116 @@ -12,10 +12,10 @@ Summary: GNOME base library Name: libgnome -Version: 2.21.91 +Version: 2.22.0 Release: 1%{?dist} URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/libgnome/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/libgnome/2.22/%{name}-%{version}.tar.bz2 Source1: desktop_gnome_peripherals_monitor.schemas License: LGPLv2+ Group: System Environment/Libraries @@ -196,6 +196,8 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 * Mon Mar 10 2008 Matthias Clasen - 2.21.91-1 - Update to 2.21.91 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnome/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 10 Mar 2008 04:36:07 -0000 1.41 +++ sources 10 Mar 2008 21:35:42 -0000 1.42 @@ -1 +1 @@ -bdaae1a55fd9ea624ce46ccdf2e5d96d libgnome-2.21.91.tar.bz2 +52db42762589826c66d27def66112807 libgnome-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:36:42 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Mon, 10 Mar 2008 21:36:42 GMT Subject: rpms/libvirt/devel libvirt-0.4.1-daemon-startup.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 libvirt.spec, 1.76, 1.77 Message-ID: <200803102136.m2ALagRO009804@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/libvirt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9649 Modified Files: .cvsignore libvirt.spec Added Files: libvirt-0.4.1-daemon-startup.patch Log Message: Fix daemon startup to avoid destroying networking libvirt-0.4.1-daemon-startup.patch: --- NEW FILE libvirt-0.4.1-daemon-startup.patch --- diff -rup libvirt-0.4.1.orig/qemud/qemud.c libvirt-0.4.1.new/qemud/qemud.c --- libvirt-0.4.1.orig/qemud/qemud.c 2008-03-10 17:31:09.000000000 -0400 +++ libvirt-0.4.1.new/qemud/qemud.c 2008-03-10 17:31:36.000000000 -0400 @@ -393,7 +393,7 @@ static int qemudGoDaemon(void) { case -1: return -1; default: - return nextpid; + _exit(0); } cleanup: @@ -418,8 +418,7 @@ static int qemudGoDaemon(void) { status != 0) { return -1; } - - return pid; + _exit(0); } } } @@ -2116,16 +2115,12 @@ int main(int argc, char **argv) { goto error1; if (godaemon) { - int pid; openlog("libvirtd", 0, 0); - pid = qemudGoDaemon(); - if (pid < 0) { + if (qemudGoDaemon() < 0) { qemudLog(QEMUD_ERR, _("Failed to fork as daemon: %s"), strerror(errno)); goto error1; } - if (pid > 0) - goto out; /* Choose the name of the PID file. */ if (!pid_file) { @@ -2172,7 +2167,6 @@ int main(int argc, char **argv) { if (godaemon) closelog(); - out: ret = 0; error2: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 3 Mar 2008 15:14:14 -0000 1.27 +++ .cvsignore 10 Mar 2008 21:36:01 -0000 1.28 @@ -1,26 +1,5 @@ -libvirt-0.0.3.tar.gz -libvirt-0.0.4.tar.gz -libvirt-0.0.5.tar.gz -libvirt-0.0.6.tar.gz -libvirt-0.1.0.tar.gz -libvirt-0.1.2.tar.gz -libvirt-0.1.1.tar.gz -libvirt-0.1.3.tar.gz -libvirt-0.1.4.tar.gz -libvirt-0.1.5.tar.gz -libvirt-0.1.6.tar.gz -libvirt-0.1.7.tar.gz -libvirt-0.1.8.tar.gz -libvirt-0.1.9.tar.gz -libvirt-0.1.10.tar.gz -libvirt-0.1.11.tar.gz -libvirt-0.2.0.tar.gz -libvirt-0.2.1.tar.gz -libvirt-0.2.2.tar.gz -libvirt-0.2.3.tar.gz -libvirt-0.3.0.tar.gz -libvirt-0.3.1.tar.gz -libvirt-0.3.2.tar.gz -libvirt-0.3.3.tar.gz -libvirt-0.4.0.tar.gz -libvirt-0.4.1.tar.gz +.build*.log +*.rpm +i686 +x86_64 +libvirt-*.tar.gz Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- libvirt.spec 3 Mar 2008 16:55:24 -0000 1.76 +++ libvirt.spec 10 Mar 2008 21:36:01 -0000 1.77 @@ -21,12 +21,13 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.4.1 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz Patch0: libvirt-0.4.1-qemud1.patch Patch1: libvirt-0.4.1-qemud2.patch +Patch2: %{name}-%{version}-daemon-startup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -140,6 +141,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # Xen is available only on i386 x86_64 ia64 @@ -280,6 +282,9 @@ %doc docs/examples/python %changelog +* Mon Mar 10 2008 Daniel P. Berrange - 0.4.1-3.fc9 +- Fixed daemon startup when run with --daemon flag + * Mon Mar 3 2008 Daniel Veillard - 0.4.1-2.fc9 - 2 patches found just after the release From fedora-extras-commits at redhat.com Mon Mar 10 21:38:22 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:38:22 GMT Subject: rpms/gnome-user-docs/devel .cvsignore, 1.22, 1.23 gnome-user-docs.spec, 1.33, 1.34 sources, 1.22, 1.23 Message-ID: <200803102138.m2ALcM41010097@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-user-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9910 Modified Files: .cvsignore gnome-user-docs.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-user-docs/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 12 Oct 2007 23:18:26 -0000 1.22 +++ .cvsignore 10 Mar 2008 21:37:45 -0000 1.23 @@ -1 +1 @@ -gnome-user-docs-2.20.1.tar.bz2 +gnome-user-docs-2.22.0.tar.bz2 Index: gnome-user-docs.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- gnome-user-docs.spec 12 Oct 2007 23:18:26 -0000 1.33 +++ gnome-user-docs.spec 10 Mar 2008 21:37:45 -0000 1.34 @@ -1,9 +1,9 @@ Summary: GNOME User Documentation Name: gnome-user-docs -Version: 2.20.1 +Version: 2.22.0 Release: 1%{?dist} License: GFDL+ -Source: http://download.gnome.org/sources/gnome-user-docs/2.20/gnome-user-docs-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-user-docs/2.22/gnome-user-docs-%{version}.tar.bz2 Group: Documentation BuildArch: noarch @@ -53,6 +53,9 @@ %dir %{_datadir}/omf/gnome-access-guide %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Fri Oct 12 2007 Matthias Clasen - 2.20.1-1 - Update to 2.20.1 (Accessibility guide updates and updated translations) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-user-docs/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 12 Oct 2007 23:18:26 -0000 1.22 +++ sources 10 Mar 2008 21:37:45 -0000 1.23 @@ -1 +1 @@ -d6bba44acaed20117769ec8dce378f71 gnome-user-docs-2.20.1.tar.bz2 +f3af808e754701b83105eab2f5ca690c gnome-user-docs-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:40:54 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:40:54 GMT Subject: rpms/gnome-themes/devel .cvsignore, 1.56, 1.57 gnome-themes.spec, 1.104, 1.105 sources, 1.61, 1.62 Message-ID: <200803102140.m2ALesp7010559@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-themes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10376 Modified Files: .cvsignore gnome-themes.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- .cvsignore 26 Feb 2008 04:34:52 -0000 1.56 +++ .cvsignore 10 Mar 2008 21:40:17 -0000 1.57 @@ -1 +1 @@ -gnome-themes-2.21.92.tar.bz2 +gnome-themes-2.22.0.tar.bz2 Index: gnome-themes.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- gnome-themes.spec 26 Feb 2008 04:34:52 -0000 1.104 +++ gnome-themes.spec 10 Mar 2008 21:40:17 -0000 1.105 @@ -1,9 +1,9 @@ Summary: Themes collection for GNOME Name: gnome-themes -Version: 2.21.92 +Version: 2.22.0 Release: 1%{?dist} URL: http://download.gnome.org/sources/gnome-themes/ -Source: http://download.gnome.org/sources/gnome-themes/2.21/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-themes/2.22/%{name}-%{version}.tar.bz2 License: LGPL+ Group: User Interface/Desktops BuildArch: noarch @@ -94,6 +94,9 @@ %doc AUTHORS COPYING NEWS README %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Mon Feb 25 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 26 Feb 2008 04:34:52 -0000 1.61 +++ sources 10 Mar 2008 21:40:17 -0000 1.62 @@ -1 +1 @@ -956f342179883c23350b28df714cb9f7 gnome-themes-2.21.92.tar.bz2 +e902194175c6f7298bd53e5aa7eef56b gnome-themes-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:41:03 2008 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Mon, 10 Mar 2008 21:41:03 GMT Subject: rpms/pam_krb5/devel .cvsignore, 1.50, 1.51 pam_krb5.spec, 1.61, 1.62 sources, 1.50, 1.51 Message-ID: <200803102141.m2ALf3Sw010623@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/pkgs/rpms/pam_krb5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10455/devel Modified Files: .cvsignore pam_krb5.spec sources Log Message: - update to 2.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pam_krb5/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 10 Mar 2008 21:20:48 -0000 1.50 +++ .cvsignore 10 Mar 2008 21:40:31 -0000 1.51 @@ -1 +1 @@ -pam_krb5-2.2.23-1.tar.gz +pam_krb5-2.3.0-1.tar.gz Index: pam_krb5.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam_krb5/devel/pam_krb5.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- pam_krb5.spec 10 Mar 2008 21:20:48 -0000 1.61 +++ pam_krb5.spec 10 Mar 2008 21:40:31 -0000 1.62 @@ -1,6 +1,6 @@ Summary: A Pluggable Authentication Module for Kerberos 5. Name: pam_krb5 -Version: 2.2.23 +Version: 2.3.0 Release: 1 Source0: pam_krb5-%{version}-1.tar.gz License: BSD or LGPL+ @@ -48,6 +48,10 @@ # $Id$ %changelog +* Mon Mar 10 2008 Nalin Dahyabhai - 2.3.0-1 +- add a "null_afs" option +- add a "token_strategy" option + * Mon Mar 10 2008 Nalin Dahyabhai - 2.2.23-1 - when we're changing passwords, force at least one attempt to authenticate using the KDC, even in the pathological case where there's no previously- Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pam_krb5/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 10 Mar 2008 21:20:48 -0000 1.50 +++ sources 10 Mar 2008 21:40:31 -0000 1.51 @@ -1 +1 @@ -09a1eb25ad7548f3029d867c98927a3d pam_krb5-2.2.23-1.tar.gz +83cdefd14a8104c7c1b8960267882912 pam_krb5-2.3.0-1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 10 21:44:25 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Mon, 10 Mar 2008 21:44:25 GMT Subject: rpms/kernel/F-8 config-generic, 1.51, 1.52 kernel.spec, 1.371, 1.372 linux-2.6-cfg80211-extras.patch, 1.3, 1.4 linux-2.6-wireless-pending.patch, 1.31, 1.32 Message-ID: <200803102144.m2ALiP0T011200@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11066 Modified Files: config-generic kernel.spec linux-2.6-cfg80211-extras.patch linux-2.6-wireless-pending.patch Log Message: wireless updates from 2008-03-07 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- config-generic 5 Mar 2008 01:41:44 -0000 1.51 +++ config-generic 10 Mar 2008 21:43:49 -0000 1.52 @@ -1227,6 +1227,7 @@ CONFIG_MAC80211_RC_DEFAULT="pid" CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_SIMPLE=y +CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.371 retrieving revision 1.372 diff -u -r1.371 -r1.372 --- kernel.spec 10 Mar 2008 20:30:28 -0000 1.371 +++ kernel.spec 10 Mar 2008 21:43:49 -0000 1.372 @@ -1230,8 +1230,6 @@ # wireless patches staged for 2.6.26 ApplyPatch linux-2.6-wireless-pending.patch ApplyPatch linux-2.6-wireless-pending-fixups.patch -# temporary backport of some later wireless patches -ApplyPatch linux-2.6-wireless-pending-too.patch # Add misc wireless bits from upstream wireless tree ApplyPatch linux-2.6-at76.patch @@ -1911,6 +1909,97 @@ %changelog +* Mon Mar 10 2008 John W. Linville 2.6.24.3-26 +- iwlwifi: Moving EEPROM handling in iwlcore module +- ath5k: struct ath5k_desc cleanups +- ath5k: move rx and tx status structures out of hardware descriptor +- ath5k: add notes about rx timestamp +- ath5k: work around wrong beacon rx timestamp in IBSS mode +- libertas: convert KEY_MATERIAL to a direct command +- libertas: add LED control TLV to types.h +- libertas: convert 802_11_SCAN to a direct command +- libertas: clean up scan.c, remove zeromac and bcastmac +- iwlwifi: Cancel scanning upon association +- iwlwifi: 802.11n spec removes AUTO offset for FAT channel +- WEXT: add mesh interface type +- mac80211: add mesh interface type +- mac80211: clean up mesh code +- mac80211: mesh hwmp locking fixes +- mac80211: enable mesh in Kconfig +- mac80211: add missing "break" statement in mesh code +- mac80211: clarify mesh Kconfig +- mac80211: export mesh_plink_broken +- mac80211: clean up mesh RX path a bit more +- mac80211: fix kernel-doc comment for mesh_plink_deactivate +- mac80211: reorder a few fields in sta_info +- mac80211: split ieee80211_txrx_data +- mac80211: RCU-ify STA info structure access +- mac80211: split sta_info_add +- mac80211: clean up sta_info and document locking +- mac80211: remove STA entries when taking down interface +- mac80211: don't clear next_hop in path reclaim +- mac80211: add documentation book +- mac80211: fix sta_info mesh timer bug +- b43: verify sta_notify mac80211 callback +- mac80211: always insert key into list +- mac80211: fix hardware scan completion +- mac80211: don't call conf_tx under RCU lock +- wireless: correct warnings from using '%llx' for type 'u64' +- wireless: various definitions for mesh networking +- nl80211/cfg80211: support for mesh, sta dumping +- mac80211: mesh function and data structures definitions +- mac80211: support functions for mesh +- mac80211: support for mesh interfaces in mac80211 data path +- mac80211: mesh data structures and first mesh changes +- mac80211: mesh changes to the MLME +- mac80211: mesh peer link implementation +- mac80211: mesh path table implementation +- mac80211: code for on-demand Hybrid Wireless Mesh Protocol +- mac80211: mesh statistics and config through debugfs +- mac80211: mesh path and mesh peer configuration +- mac80211: complete the mesh (interface handling) code +- mac80211: fix mesh endianness sparse warnings and unmark it as broken +- mac80211: fix incorrect parenthesis +- mac80211: move comment to better location +- mac80211: breakdown mesh network attributes in different extra fields for wext +- mac80211: clean up use of endianness conversion functions +- mac80211: delete mesh_path timer on mesh_path removal +- mac80211: always force mesh_path deletions +- mac80211: add PLINK_ prefix and kernel doc to enum plink_state +- mac80211: path IE fields macros, fix alignment problems and clean up +- mac80211: fix mesh_path and sta_info get_by_idx functions +- zd1211rw: support for mesh interface and beaconing +- ssb: Add Gigabit Ethernet driver +- b43: Add QOS support +- b43: Rename the DMA ring pointers +- b43: Add TX statistics debugging counters +- b43: Fix failed frames status report typo +- ath5k: Add RF2413 srev values +- ath5k: Add RF2413 initial settings +- ath5k: Identify RF2413 and deal with PHY_SPENDING +- ath5k: more RF2413 stuff +- ath5k: Remove RF5413 from rf gain optimization functions +- ath5k: Fixes for PCI-E cards +- ath5k: Make some changes to follow register dumps. +- ath5k: Add 2413 to srev_names so that it shows up during module load +- iwlwifi: fix potential lock inversion deadlock +- mac80211: adding mac80211_tx_control_flags and HT flags +- iwlwifi: use mac80211_tx_control_flags +- mac80211: document IEEE80211_TXCTL_OFDM_HT +- iwlwifi: grab NIC access when disabling aggregations +- iwlwifi: removing unused priv->config +- iwlwifi: refactor init geos function +- iwlwifi: Fix 52 rate report in rx status +- iwlwifi: extract iwl-csr.h +- iwlwifi: Move HBUS address to iwl-csr.h +- iwlwifi: add struct iwl_cfg +- iwlwifi: Take the fw file name from the iwl_cfg. +- iwlwifi: fix locking unbalance in 4965 rate scale +- iwlwifi: add iwl-core module +- iwlwifi: queue functions cleanup +- iwlwifi: Fix 3945 rate scaling +- iwlwifi: 3945 split tx_complete to command and packet function + * Mon Mar 10 2008 Chuck Ebbert 2.6.24.3-25 - Use better fix for clearing the direction flag for x86 signal handlers. linux-2.6-cfg80211-extras.patch: Index: linux-2.6-cfg80211-extras.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-cfg80211-extras.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-cfg80211-extras.patch 21 Feb 2008 19:11:27 -0000 1.3 +++ linux-2.6-cfg80211-extras.patch 10 Mar 2008 21:43:49 -0000 1.4 @@ -1,7 +1,7 @@ -diff -up linux-2.6.23.noarch/net/wireless/sysfs.c.orig linux-2.6.23.noarch/net/wireless/sysfs.c ---- linux-2.6.23.noarch/net/wireless/sysfs.c.orig 2007-11-21 16:19:19.000000000 -0500 -+++ linux-2.6.23.noarch/net/wireless/sysfs.c 2007-11-21 16:21:07.000000000 -0500 -@@ -39,9 +39,61 @@ static ssize_t _show_permaddr(struct dev +diff -up linux-2.6.24.noarch/net/wireless/sysfs.c.orig linux-2.6.24.noarch/net/wireless/sysfs.c +--- linux-2.6.24.noarch/net/wireless/sysfs.c.orig 2008-03-10 17:16:42.000000000 -0400 ++++ linux-2.6.24.noarch/net/wireless/sysfs.c 2008-03-10 17:20:55.000000000 -0400 +@@ -39,9 +39,62 @@ static ssize_t _show_permaddr(struct dev addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); } @@ -21,7 +21,8 @@ + + rtnl_lock(); + res = rdev->ops->add_virtual_intf(&rdev->wiphy, (char*)buf, -+ NL80211_IFTYPE_UNSPECIFIED, NULL); ++ NL80211_IFTYPE_UNSPECIFIED, ++ NULL, NULL); + rtnl_unlock(); + + return res ? res : len; linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.31 -r 1.32 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending.patch,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- linux-2.6-wireless-pending.patch 5 Mar 2008 01:41:44 -0000 1.31 +++ linux-2.6-wireless-pending.patch 10 Mar 2008 21:43:49 -0000 1.32 @@ -1,3 +1,1311 @@ +commit deedf504302ff747985db081352e045ff7087a11 +Author: Reinette Chatre +Date: Fri Mar 7 13:47:20 2008 -0800 + + iwlwifi: fix potential lock inversion deadlock + + This is a change to a previous patch ("iwlwifi: 3945 split tx_complete + to command and packet function") to ensure we do not have hardirq safe + locks (priv->lock in this case) depend on hardirq unsafe locks. + + We only call iwl3945_tx_queue_reclaim while in a tasklet so we have to use + the irqsafe version of the function. + + Signed-off-by: Reinette Chatre + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit f868f4e196177ee96f77304ab707a0ad5ddd6fe4 +Author: John W. Linville +Date: Fri Mar 7 16:38:43 2008 -0500 + + wireless: correct warnings from using '%llx' for type 'u64' + + drivers/net/wireless/ath5k/debug.c: In function 'read_file_tsf': drivers/net/wireless/ath5k/debug.c:203: warning: format '%016llx' + expects type 'long long unsigned int', but argument 4 has type 'u64' drivers/net/wireless/ath5k/debug.c:203: warning: format '%016llx' + expects type 'long long unsigned int', but argument 4 has type 'u64' drivers/net/wireless/ath5k/debug.c: In function 'read_file_beacon': + drivers/net/wireless/ath5k/debug.c:274: warning: format '%016llx' expects type 'long long unsigned int', but argument 4 has type 'u64' + drivers/net/wireless/ath5k/debug.c:274: warning: format '%016llx' expects type 'long long unsigned int', but argument 4 has type 'u64' + + drivers/net/wireless/iwlwifi/iwl-4965.c: In function 'iwl4965_tx_status_reply_compressed_ba': + drivers/net/wireless/iwlwifi/iwl-4965.c:3907: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64' + drivers/net/wireless/iwlwifi/iwl-4965.c: In function 'iwl4965_rx_reply_compressed_ba': + drivers/net/wireless/iwlwifi/iwl-4965.c:4039: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type '__le64' + drivers/net/wireless/iwlwifi/iwl-4965.c:4046: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64' + drivers/net/wireless/iwlwifi/iwl4965-base.c: In function 'iwl4965_tx_status_reply_tx': + drivers/net/wireless/iwlwifi/iwl4965-base.c:3661: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64' + + Signed-off-by: John W. Linville + +commit 6ba81c2c989291c5893014f84805ce9d196778b0 +Author: Bruno Randolf +Date: Wed Mar 5 18:36:26 2008 +0900 + + ath5k: work around wrong beacon rx timestamp in IBSS mode + + atheros hardware has a problem with the rx timestamp of some IBSS beacons when + they caused a TSF update (they have the same BSSID). + + the rx timestamp is wrong especially if the beacon frames get bigger than 78 + byte (at least on AR5213 and AR5414 hardware). in that case ath5k_extend_tsf() + will assume a rs_tstamp overflow and give us a timestamp too far in the past + which will cause mac80211 to merge IBSS on every beacon (which is not necessary + since the BSSID already matches). but in this case we know that the HW must + have synced to the beacons TSF and the rx timestamp must be later than that so + we can adjust mactime accordingly. + + also rename the function to ath5k_check_ibss_tsf() and change comments, since + "hw merge" is better described as a TSF update. + + drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD + + Signed-off-by: Bruno Randolf + Signed-off-by: John W. Linville + +commit e14296cabac60806606b4ebc1a83ee4697876346 +Author: Bruno Randolf +Date: Wed Mar 5 18:36:05 2008 +0900 + + ath5k: add notes about rx timestamp + + add comments about the fact that we don't know when exactly the atheros + hardware takes the RX timestamp. + + drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD + + Signed-off-by: Bruno Randolf + Signed-off-by: John W. Linville + +commit b47f407bef0d5349dacf65cd3560a976609d4b45 +Author: Bruno Randolf +Date: Wed Mar 5 18:35:45 2008 +0900 + + ath5k: move rx and tx status structures out of hardware descriptor + + move ath5k_tx_status and ath5k_rx_status structures out of the hardware + descriptor since they are not accessed by the hardware at all. they just + contain converted information from the hardware descriptor. since they are only + used in the rx and tx tasklets there is also no use to keep them for each + descriptor. + + drivers/net/wireless/ath5k/ath5k.h: Changes-licensed-under: ISC + drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD + drivers/net/wireless/ath5k/debug.c: Changes-licensed-under: GPL + drivers/net/wireless/ath5k/debug.h: Changes-licensed-under: GPL + drivers/net/wireless/ath5k/hw.c: Changes-licensed-under: ISC + + Signed-off-by: Bruno Randolf + Signed-off-by: John W. Linville + +commit 19fd6e5510f6991148e2210753b58f0eab95e0f6 +Author: Bruno Randolf +Date: Wed Mar 5 18:35:23 2008 +0900 + + ath5k: struct ath5k_desc cleanups + + * make struct ath5k_desc clearer by directly including unions of structures, + which correspond to the hardware descriptors of different HW versions (5210 + and 5212). before they were casted at onto ath5k_desc at different points + (e.g. ds_hw[2]). + + * rename some structures and variable names to make their use clearer, e.g. + struct ath5k_hw_4w_tx_desc to ath5k_hw_4w_tx_ctl. + + * substitute "old" with "5210" and "new" with "5212" (eg. rename + ath5k_hw_proc_new_rx_status() to ath5k_hw_proc_5212_rx_status()) because old + and new are relative and we might have a newer structure at some point. + + * unify structs ath5k_hw_old_rx_status and ath5k_hw_new_rx_status into one + ath5k_hw_rx_status, because they only differ in the flags and masks. + + drivers/net/wireless/ath5k/ath5k.h: Changes-licensed-under: ISC + drivers/net/wireless/ath5k/debug.c: Changes-licensed-under: GPL + drivers/net/wireless/ath5k/hw.c: Changes-licensed-under: ISC + drivers/net/wireless/ath5k/hw.h: Changes-licensed-under: ISC + + Signed-off-by: Bruno Randolf + Signed-off-by: John W. Linville + +commit b095d03a7d724db7379b73f64b6035f7be2e0a7c +Author: Ron Rindjunsky +Date: Thu Mar 6 17:36:56 2008 -0800 + + iwlwifi: grab NIC access when disabling aggregations + + This patch grabs NIC access inside iwl4965_tx_queue_agg_disable, instead of the + caller doing it. + The caller must still hold priv->lock when calling the function. + + Signed-off-by: Max Stepanov + Signed-off-by: Emmanuel Grumbach + Signed-off-by: Ron Rindjunsky + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 91c066f27b6dacb6589fb5190af373fb9f993397 +Author: Tomas Winkler +Date: Thu Mar 6 17:36:55 2008 -0800 + + iwlwifi: 3945 split tx_complete to command and packet function + + This patch + 1. removes cmd completion from iwl3945_tx_queue_reclaim + and creates iwl3945_cmd_queue_reclaim. + 1. removes 11n relevant elements from this function + 2. removes call to ieee80211_tx_status_irqsafe + and uses ieee80211_tx_status only + + Signed-off-by: Tomas Winkler + Signed-off-by: Reinette Chatre + Signed-off-by: John W. Linville + +commit 28447f3cfdf72f6ea97b50cc1eefe35602107dff +Author: Tomas Winkler +Date: Thu Mar 6 17:36:54 2008 -0800 + + iwlwifi: Fix 3945 rate scaling + + This patch fix 3945 rate scaling after cfg80211 rate/band changes + + Signed-off-by: Tomas Winkler + Signed-off-by: Reinette Chatre + Signed-off-by: John W. Linville + +commit c54b679ddcd91604fd0d144cd793a0ddbd0ae03d +Author: Tomas Winkler +Date: Thu Mar 6 17:36:53 2008 -0800 + + iwlwifi: queue functions cleanup + + This patch moves + 1. iwl_queue_inc_wrap and int iwl_queue_dec_wrap + into iwl-helpers.h these two functions are identical to common + for both iwl3956 and iwl4965 + 2. renames x2_queue_used to iwl3945_x2_queue_used + 3. exports iwl3945_queue_space out of iwl3964-base.c + + Signed-off-by: Tomas Winkler + Signed-off-by: Reinette Chatre + Signed-off-by: John W. Linville + +commit 34cf6ff6dd42cbc61fd652f893dcf71eed6052a5 [...30657 lines suppressed...] ++!Finclude/net/mac80211.h ieee80211_if_init_conf ++!Finclude/net/mac80211.h ieee80211_if_conf ++ ++ ++ ++ Receive and transmit processing ++ ++ what should be here ++ TBD ++ ++ This should describe the receive and transmit ++ paths in mac80211/the drivers as well as ++ transmit status handling. ++ ++ ++ ++ Frame format ++!Pinclude/net/mac80211.h Frame format ++ ++ ++ Alignment issues ++ TBD ++ ++ ++ Calling into mac80211 from interrupts ++!Pinclude/net/mac80211.h Calling mac80211 from interrupts ++ ++ ++ functions/definitions ++!Finclude/net/mac80211.h ieee80211_rx_status ++!Finclude/net/mac80211.h mac80211_rx_flags ++!Finclude/net/mac80211.h ieee80211_tx_control ++!Finclude/net/mac80211.h ieee80211_tx_status_flags ++!Finclude/net/mac80211.h ieee80211_rx ++!Finclude/net/mac80211.h ieee80211_rx_irqsafe ++!Finclude/net/mac80211.h ieee80211_tx_status ++!Finclude/net/mac80211.h ieee80211_tx_status_irqsafe ++!Finclude/net/mac80211.h ieee80211_rts_get ++!Finclude/net/mac80211.h ieee80211_rts_duration ++!Finclude/net/mac80211.h ieee80211_ctstoself_get ++!Finclude/net/mac80211.h ieee80211_ctstoself_duration ++!Finclude/net/mac80211.h ieee80211_generic_frame_duration ++!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb ++!Finclude/net/mac80211.h ieee80211_get_hdrlen ++!Finclude/net/mac80211.h ieee80211_wake_queue ++!Finclude/net/mac80211.h ieee80211_stop_queue ++!Finclude/net/mac80211.h ieee80211_start_queues ++!Finclude/net/mac80211.h ieee80211_stop_queues ++!Finclude/net/mac80211.h ieee80211_wake_queues ++ ++ ++ ++ ++ Frame filtering ++!Pinclude/net/mac80211.h Frame filtering ++!Finclude/net/mac80211.h ieee80211_filter_flags ++ ++ ++ ++ ++ Advanced driver interface ++ ++ ++ Information contained within this part of the book is ++ of interest only for advanced interaction of mac80211 ++ with drivers to exploit more hardware capabilities and ++ improve performance. ++ ++ ++ ++ ++ Hardware crypto acceleration ++!Pinclude/net/mac80211.h Hardware crypto acceleration ++ ++!Finclude/net/mac80211.h set_key_cmd ++!Finclude/net/mac80211.h ieee80211_key_conf ++!Finclude/net/mac80211.h ieee80211_key_alg ++!Finclude/net/mac80211.h ieee80211_key_flags ++ ++ ++ ++ Multiple queues and QoS support ++ TBD ++!Finclude/net/mac80211.h ieee80211_tx_queue_params ++!Finclude/net/mac80211.h ieee80211_tx_queue_stats_data ++!Finclude/net/mac80211.h ieee80211_tx_queue ++ ++ ++ ++ Access point mode support ++ TBD ++ Some parts of the if_conf should be discussed here instead ++ ++ Insert notes about VLAN interfaces with hw crypto here or ++ in the hw crypto chapter. ++ ++!Finclude/net/mac80211.h ieee80211_get_buffered_bc ++!Finclude/net/mac80211.h ieee80211_beacon_get ++ ++ ++ ++ Supporting multiple virtual interfaces ++ TBD ++ ++ Note: WDS with identical MAC address should almost always be OK ++ ++ ++ Insert notes about having multiple virtual interfaces with ++ different MAC addresses here, note which configurations are ++ supported by mac80211, add notes about supporting hw crypto ++ with it. ++ ++ ++ ++ ++ Hardware scan offload ++ TBD ++!Finclude/net/mac80211.h ieee80211_scan_completed ++ ++ ++ ++ ++ Rate control interface ++ ++ TBD ++ ++ This part of the book describes the rate control algorithm ++ interface and how it relates to mac80211 and drivers. ++ ++ ++ ++ dummy chapter ++ TBD ++ ++ ++ ++ ++ Internals ++ ++ TBD ++ ++ This part of the book describes mac80211 internals. ++ ++ ++ ++ ++ Key handling ++ ++ Key handling basics ++!Pnet/mac80211/key.c Key handling basics ++ ++ ++ MORE TBD ++ TBD ++ ++ ++ ++ ++ Receive processing ++ TBD ++ ++ ++ ++ Transmit processing ++ TBD ++ ++ ++ ++ Station info handling ++ ++ Programming information ++!Fnet/mac80211/sta_info.h sta_info ++!Fnet/mac80211/sta_info.h ieee80211_sta_info_flags ++ ++ ++ STA information lifetime rules ++!Pnet/mac80211/sta_info.c STA information lifetime rules ++ ++ ++ ++ ++ Synchronisation ++ TBD ++ Locking, lots of RCU ++ ++ ++ +diff -up linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig linux-2.6.24.noarch/Documentation/DocBook/Makefile +--- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig 2008-03-10 16:32:23.000000000 -0400 ++++ linux-2.6.24.noarch/Documentation/DocBook/Makefile 2008-03-10 16:53:16.000000000 -0400 +@@ -11,7 +11,8 @@ DOCBOOKS := wanbook.xml z8530book.xml mc + procfs-guide.xml writing_usb_driver.xml \ + kernel-api.xml filesystems.xml lsm.xml utrace.xml usb.xml \ + gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ +- genericirq.xml s390-drivers.xml uio-howto.xml ++ genericirq.xml s390-drivers.xml uio-howto.xml \ ++ mac80211.xml + + ### + # The build process is as follows (targets): From fedora-extras-commits at redhat.com Mon Mar 10 21:51:35 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:51:35 GMT Subject: rpms/libgnomeui/devel .cvsignore, 1.50, 1.51 libgnomeui.spec, 1.93, 1.94 sources, 1.50, 1.51 Message-ID: <200803102151.m2ALpZ0N012483@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgnomeui/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12135 Modified Files: .cvsignore libgnomeui.spec sources Log Message: 2.22.01 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomeui/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 7 Mar 2008 21:13:19 -0000 1.50 +++ .cvsignore 10 Mar 2008 21:50:39 -0000 1.51 @@ -1 +1 @@ -libgnomeui-2.21.93.tar.bz2 +libgnomeui-2.22.01.tar.bz2 Index: libgnomeui.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomeui/devel/libgnomeui.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- libgnomeui.spec 10 Mar 2008 11:19:27 -0000 1.93 +++ libgnomeui.spec 10 Mar 2008 21:50:39 -0000 1.94 @@ -17,14 +17,12 @@ Summary: GNOME base GUI library Name: libgnomeui -Version: 2.21.93 -Release: 2%{?dist} +Version: 2.22.01 +Release: 1%{?dist} URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/libgnomeui/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/libgnomeui/2.22/%{name}-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=517276 Patch0: gio-thumbnail.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=520903 -Patch1: libgnomeui-gio-fix-threading.patch License: LGPLv2+ Group: System Environment/Libraries @@ -107,9 +105,6 @@ %prep %setup -q %patch0 -p1 -b .gio-thumbnail -pushd file-chooser/ -%patch1 -p0 -b .gio-hang -popd aclocal automake @@ -155,6 +150,9 @@ %{_datadir}/gtk-doc/html/libgnomeui %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.01-1 +- Update to 2.22.01 + * Mon Mar 10 2008 - Bastien Nocera - 2.21.93-2 - Add patch to avoid hang on error in the filechooser under EOG Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomeui/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 7 Mar 2008 21:13:19 -0000 1.50 +++ sources 10 Mar 2008 21:50:39 -0000 1.51 @@ -1 +1 @@ -1f27a78c33dd88810142277812189607 libgnomeui-2.21.93.tar.bz2 +7d2bb24361f90201bcbf1327e1498251 libgnomeui-2.22.01.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:52:42 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:52:42 GMT Subject: rpms/eel2/devel .cvsignore, 1.57, 1.58 eel2.spec, 1.83, 1.84 sources, 1.57, 1.58 Message-ID: <200803102152.m2ALqgfa012575@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/eel2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12489 Modified Files: .cvsignore eel2.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eel2/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 26 Feb 2008 09:45:28 -0000 1.57 +++ .cvsignore 10 Mar 2008 21:51:54 -0000 1.58 @@ -1 +1 @@ -eel-2.21.92.tar.bz2 +eel-2.22.0.tar.bz2 Index: eel2.spec =================================================================== RCS file: /cvs/extras/rpms/eel2/devel/eel2.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- eel2.spec 26 Feb 2008 09:45:28 -0000 1.83 +++ eel2.spec 10 Mar 2008 21:51:54 -0000 1.84 @@ -15,11 +15,11 @@ Name: eel2 Summary: Eazel Extensions Library -Version: 2.21.92 +Version: 2.22.0 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries -Source: http://download.gnome.org/sources/eel/2.21/eel-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/eel/2.22/eel-%{version}.tar.bz2 URL: http://www.gnome.org/projects/nautilus/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,6 +107,9 @@ %{_includedir}/eel-2 %changelog +* Mon Mar 10 2008 Matthisa Clasen - 2.22.0-1 +- Update to 2.22.0 + * Tue Feb 26 2008 Tomas Bzatek - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/eel2/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 26 Feb 2008 09:45:28 -0000 1.57 +++ sources 10 Mar 2008 21:51:54 -0000 1.58 @@ -1 +1 @@ -0c0e2610c26e02b35456605ca24b91d3 eel-2.21.92.tar.bz2 +cd0db25194c154f07c39b45ca5943999 eel-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 21:57:07 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 21:57:07 GMT Subject: rpms/libbonobo/devel .cvsignore, 1.32, 1.33 libbonobo.spec, 1.72, 1.73 sources, 1.32, 1.33 Message-ID: <200803102157.m2ALv7NH012713@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libbonobo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12682 Modified Files: .cvsignore libbonobo.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libbonobo/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 30 Jan 2008 05:17:45 -0000 1.32 +++ .cvsignore 10 Mar 2008 21:56:25 -0000 1.33 @@ -1 +1 @@ -libbonobo-2.21.90.tar.bz2 +libbonobo-2.22.0.tar.bz2 Index: libbonobo.spec =================================================================== RCS file: /cvs/extras/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- libbonobo.spec 22 Feb 2008 21:35:02 -0000 1.72 +++ libbonobo.spec 10 Mar 2008 21:56:25 -0000 1.73 @@ -5,10 +5,10 @@ Summary: Bonobo component system Name: libbonobo -Version: 2.21.90 -Release: 3%{?dist} +Version: 2.22.0 +Release: 1%{?dist} URL: http://ftp.gnome.org -Source0: http://download.gnome.org/sources/libbonobo/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/libbonobo/2.22/%{name}-%{version}.tar.bz2 License: GPLv2+ and LGPLv2+ # bonobo-activation-server, bonobo-activation-sysconf and bonobo-slay are GPL # libbonobo and libbonobo-activation are LGPLv2+ @@ -122,6 +122,9 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Fri Feb 22 2008 Ray Strode - 2.21.90-3 - Drop upstreamed patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/libbonobo/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 30 Jan 2008 05:17:45 -0000 1.32 +++ sources 10 Mar 2008 21:56:25 -0000 1.33 @@ -1 +1 @@ -bcf24d3d3482a1875ce01b33cf154a85 libbonobo-2.21.90.tar.bz2 +998a576ad26784ac87eab99e96013527 libbonobo-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 22:03:26 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 10 Mar 2008 22:03:26 GMT Subject: rpms/supertuxkart/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 supertuxkart-0.3-default-fs.patch, 1.1, 1.2 supertuxkart-0.3-desktop.patch, 1.2, 1.3 supertuxkart-images-legal.txt, 1.1, 1.2 supertuxkart.spec, 1.5, 1.6 supertuxkart-0.3-gcc43.patch, 1.1, NONE Message-ID: <200803102203.m2AM3Q1g020044@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/supertuxkart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19977 Modified Files: .cvsignore sources supertuxkart-0.3-default-fs.patch supertuxkart-0.3-desktop.patch supertuxkart-images-legal.txt supertuxkart.spec Removed Files: supertuxkart-0.3-gcc43.patch Log Message: * Mon Mar 10 2008 Hans de Goede 0.4-1 - New upstream release 0.4 - Note this version includes a build in copy of the bullet physics library, this is a patched copy making use if a system version impossible Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/supertuxkart/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Aug 2007 12:13:32 -0000 1.3 +++ .cvsignore 10 Mar 2008 22:02:46 -0000 1.4 @@ -1,2 +1,2 @@ -supertuxkart-0.3-src.tar.bz2 +supertuxkart-0.4-src.tar.bz2 supertuxkart-alt-images.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/supertuxkart/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Aug 2007 12:13:32 -0000 1.3 +++ sources 10 Mar 2008 22:02:46 -0000 1.4 @@ -1,2 +1,2 @@ -4db5d46206ea72abed861cd524165944 supertuxkart-0.3-src.tar.bz2 -6a0e178696d239ef0dcd724725d525f9 supertuxkart-alt-images.tar.gz +badcaf9cb51afc11c1abf126b2cbba74 supertuxkart-0.4-src.tar.bz2 +9eec5e94b21ab45b1ebb56ca341fffb8 supertuxkart-alt-images.tar.gz supertuxkart-0.3-default-fs.patch: Index: supertuxkart-0.3-default-fs.patch =================================================================== RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-0.3-default-fs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- supertuxkart-0.3-default-fs.patch 15 Aug 2007 12:13:32 -0000 1.1 +++ supertuxkart-0.3-default-fs.patch 10 Mar 2008 22:02:46 -0000 1.2 @@ -1,10 +1,10 @@ -diff -up supertuxkart-0.3/src/user_config.cpp~ supertuxkart-0.3/src/user_config.cpp ---- supertuxkart-0.3/src/user_config.cpp~ 2007-08-15 13:45:09.000000000 +0200 -+++ supertuxkart-0.3/src/user_config.cpp 2007-08-15 13:45:09.000000000 +0200 -@@ -108,7 +108,7 @@ void UserConfig::setDefaults() - { - setFilename(); +diff -up supertuxkart-0.4/src/user_config.cpp.fs supertuxkart-0.4/src/user_config.cpp +--- supertuxkart-0.4/src/user_config.cpp.fs 2008-03-05 05:16:12.000000000 +0100 ++++ supertuxkart-0.4/src/user_config.cpp 2008-03-10 09:52:53.000000000 +0100 +@@ -117,7 +117,7 @@ void UserConfig::setDefaults() m_keyboard_debug = false; + m_track_debug = 0; + m_bullet_debug = false; - m_fullscreen = false; + m_fullscreen = true; m_no_start_screen = false; supertuxkart-0.3-desktop.patch: Index: supertuxkart-0.3-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-0.3-desktop.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- supertuxkart-0.3-desktop.patch 24 Sep 2007 19:55:57 -0000 1.2 +++ supertuxkart-0.3-desktop.patch 10 Mar 2008 22:02:46 -0000 1.3 @@ -1,6 +1,5 @@ -diff -up supertuxkart-0.3/data/supertuxkart.desktop.desktop supertuxkart-0.3/data/supertuxkart.desktop ---- supertuxkart-0.3/data/supertuxkart.desktop.desktop 2007-06-15 09:28:43.000000000 +0200 -+++ supertuxkart-0.3/data/supertuxkart.desktop 2007-09-24 21:24:54.000000000 +0200 +--- supertuxkart-0.4/data/supertuxkart.desktop.desktop 2008-03-05 23:45:56.000000000 +0100 ++++ supertuxkart-0.4/data/supertuxkart.desktop 2008-03-10 09:50:51.000000000 +0100 @@ -1,13 +1,12 @@ [Desktop Entry] Encoding=UTF-8 @@ -10,8 +9,8 @@ Comment=A kart racing game Comment[fr_FR]=Un jeu de karting Comment[ro_RO]=Un joc de curse cu carturi --Exec=supertuxkart -+Exec=supertuxkart-wrapper +-Exec=supertuxkart --log=file ++Exec=supertuxkart-wrapper --log=file Terminal=false StartupNotify=false Type=Application Index: supertuxkart-images-legal.txt =================================================================== RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-images-legal.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- supertuxkart-images-legal.txt 6 Oct 2006 14:37:02 -0000 1.1 +++ supertuxkart-images-legal.txt 10 Mar 2008 22:02:46 -0000 1.2 @@ -3,7 +3,6 @@ images/bananawrap.rgb images/lunchbox.rgb images/lunchbox2.rgb -"The cartoon-ish character" in images/adverts.rgb --- @@ -270,107 +269,3 @@ --------------------------------------------------------------- Greg DeKoenigsberg || Fedora Foundation || fedoraproject.org Be an Ambassador || http://fedoraproject.org/wiki/Ambassadors - ---- - -The PlanetPenguin Racer logo (http://projects.planetpenguin.de/racer/) in -images/adverts.rgb is copyrighted (GPL) and used with the permission of the -ppracer authors: - -Return-Path: -Received: from koko.hhs.nl ([145.52.2.16] verified) - by hhs.nl (CommuniGate Pro SMTP 4.3.6) - with ESMTP id 47974844 for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:54 +0200 -Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62) - (envelope-from ) - id 1FnXgB-00060S-GG - for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:54 +0200 -X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl -X-Spam-Level: -X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham - version=3.1.0 -Received: from exim (helo=koko) - by koko.hhs.nl with local-smtp (Exim 4.62) - (envelope-from ) - id 1FnXgB-00060K-99 - for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:51 +0200 -Received: from [217.160.131.21] (port=37440 helo=p15104914.pureserver.info) - by koko.hhs.nl with esmtp (Exim 4.62) - (envelope-from ) - id 1FnXgA-0005zz-NE - for j.w.r.degoede at hhs.nl; Tue, 06 Jun 2006 11:16:50 +0200 -Received: from [192.168.0.242] (p5493D342.dip.t-dialin.net [84.147.211.66]) - (authenticated (0 bits)) - by p15104914.pureserver.info (8.11.3/8.11.3/SuSE Linux 8.11.1-0.5) with ESMTP id k569GoU14013 - for ; Tue, 6 Jun 2006 11:16:50 +0200 -Subject: Re: PPracer "logo" usage -From: Volker =?ISO-8859-1?Q?Str=F6bel?= -To: Hans de Goede -In-Reply-To: <4482F398.8000306 at hhs.nl> -References: <4482F398.8000306 at hhs.nl> -Content-Type: text/plain -Date: Tue, 06 Jun 2006 11:14:08 +0200 -Message-Id: <1149585248.6996.2.camel at localhost.localdomain> -Mime-Version: 1.0 -X-Mailer: Evolution 2.6.1 -Content-Transfer-Encoding: 7bit -X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 06062006 #186743, status: clean - -Hi, -sorry for the late reply. - -It's ok with me to include the logo. -And nice to see, that someone finally replaces this old stuff with logos -from FOSS projects. - -Regards, -Volker - - -Am Sonntag, den 04.06.2006, 16:52 +0200 schrieb Hans de Goede: -> Hi, -> -> Did you receive my mail below? This is currently the last thing keeping -> me from releasing a tuxkart package for Fedora. If you don't want the -> ppracer logo included thats fine too, then I'll dig up some other -> graphics to put in there as "advertisements" -> -> Regards, -> -> Hans -> -> p.s. -> -> I've attached the "logo" as it will be included I did some gimp-ing to -> get it to be a little bit more square. Feel free to use it. -> -> -> --- -> -> -> Hi, -> -> First a short intro. I'm a Linux enthousiast / programmer and a packager -> for Fedora Extras which is an online community that packages software in -> the native package format for Fedora Core a (well known) Linux distribution. -> -> As such I'm currently in the progress of packaging tuxkart an opensource -> racing game, which is hosted and distributed from sf.net. One of the -> tracks on which you can race is an ordinary racing track with -> advertisement boards along the side. Currently these advertisements are -> a bit of a problem as they show logo's of big companies without their -> permission. Hence I'm currently busy replacing these logo's with -> something more suitable. I would like to use the ppracer "logo" * as -> one of the advertisements. Because of this I'm here by asking your -> permission for the use of the ppracer logo. -> -> The logo is in no way used to promote the game, it is shown as -> an add, so if it promotes anything it is ppracer. -> -> Thanks & Regards, -> -> Hans de Goede -> -> * The yellow "planet penguin racer" text above the menu where the -> tuxracer logo used to be -> Index: supertuxkart.spec =================================================================== RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- supertuxkart.spec 19 Feb 2008 09:43:23 -0000 1.5 +++ supertuxkart.spec 10 Mar 2008 22:02:46 -0000 1.6 @@ -1,18 +1,17 @@ Name: supertuxkart -Version: 0.3 -Release: 4%{?dist} +Version: 0.4 +Release: 1%{?dist} Summary: Kids 3D go-kart racing game featuring Tux Group: Amusements/Games License: GPLv2+ -URL: http://supertuxkart.berlios.de/ -Source0: http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.bz2 +URL: http://supertuxkart.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2 Source1: %{name}-alt-images.tar.gz Source2: %{name}-images-legal.txt Source3: %{name}.6 Patch0: supertuxkart-fhs.patch Patch1: supertuxkart-0.3-desktop.patch Patch2: supertuxkart-0.3-default-fs.patch -Patch3: supertuxkart-0.3-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: plib-devel SDL-devel freealut-devel mikmod-devel BuildRequires: libvorbis-devel desktop-file-utils @@ -30,12 +29,10 @@ %prep -%setup -q +%setup -q -a 1 %patch0 -p1 -z .fhs %patch1 -p1 -z .desktop %patch2 -p1 -z .fs -%patch3 -p1 -z .gcc43 -tar xfz %{SOURCE1} cp %{SOURCE2} . chmod -x AUTHORS COPYING ChangeLog README TODO src/robots/default_robot.* \ src/sdldrv.cpp @@ -100,6 +97,11 @@ %changelog +* Mon Mar 10 2008 Hans de Goede 0.4-1 +- New upstream release 0.4 +- Note this version includes a build in copy of the bullet physics library, + this is a patched copy making use if a system version impossible + * Tue Feb 19 2008 Fedora Release Engineering - 0.3-4 - Autorebuild for GCC 4.3 --- supertuxkart-0.3-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 10 22:03:29 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 22:03:29 GMT Subject: rpms/libbonoboui/devel .cvsignore, 1.33, 1.34 libbonoboui.spec, 1.61, 1.62 sources, 1.34, 1.35 Message-ID: <200803102203.m2AM3T4d020051@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libbonoboui/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19986 Modified Files: .cvsignore libbonoboui.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libbonoboui/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 29 Jan 2008 15:19:30 -0000 1.33 +++ .cvsignore 10 Mar 2008 22:02:53 -0000 1.34 @@ -1 +1 @@ -libbonoboui-2.21.90.tar.bz2 +libbonoboui-2.22.0.tar.bz2 Index: libbonoboui.spec =================================================================== RCS file: /cvs/extras/rpms/libbonoboui/devel/libbonoboui.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- libbonoboui.spec 19 Feb 2008 22:41:34 -0000 1.61 +++ libbonoboui.spec 10 Mar 2008 22:02:53 -0000 1.62 @@ -13,10 +13,10 @@ Summary: Bonobo user interface components Name: libbonoboui -Version: 2.21.90 +Version: 2.22.0 Release: 2%{?dist} URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/libbonoboui/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/libbonoboui/2.22/%{name}-%{version}.tar.bz2 License: GPLv2+ and LGPLv2+ # bonobo-browser is GPL, libbonoboui is LGPL Group: System Environment/Libraries @@ -119,6 +119,9 @@ %{_datadir}/gtk-doc/html/libbonoboui %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0-1 + * Tue Feb 19 2008 Fedora Release Engineering - 2.21.90-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libbonoboui/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 29 Jan 2008 15:19:31 -0000 1.34 +++ sources 10 Mar 2008 22:02:53 -0000 1.35 @@ -1 +1 @@ -926f1c7782c25e3f597c06d9aae42972 libbonoboui-2.21.90.tar.bz2 +e4e4d74c9387d08c956574f981cf91f2 libbonoboui-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 22:06:28 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 10 Mar 2008 22:06:28 +0000 Subject: [pkgdb] ltspfs was added for wtogami Message-ID: <200803102209.m2AM995g001784@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has added Package ltspfs with summary LTSP filesystem Warren Togami ??? (wtogami) has approved Package ltspfs Warren Togami ??? (wtogami) has added a Fedora devel branch for ltspfs with an owner of wtogami Warren Togami ??? (wtogami) has approved ltspfs in Fedora devel Warren Togami ??? (wtogami) has approved Package ltspfs Warren Togami ??? (wtogami) has set commit to Approved for cvsextras on ltspfs (Fedora devel) Warren Togami ??? (wtogami) has set build to Approved for cvsextras on ltspfs (Fedora devel) Warren Togami ??? (wtogami) has set checkout to Approved for cvsextras on ltspfs (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs From fedora-extras-commits at redhat.com Mon Mar 10 22:06:42 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Mon, 10 Mar 2008 22:06:42 +0000 Subject: [pkgdb] ltspfs (Fedora, 8) updated by wtogami Message-ID: <200803102209.m2AM9Mxd001811@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) added a Fedora 8 branch for ltspfs Warren Togami ??? (wtogami) has set commit to Approved for cvsextras on ltspfs (Fedora 8) Warren Togami ??? (wtogami) has set build to Approved for cvsextras on ltspfs (Fedora 8) Warren Togami ??? (wtogami) has set checkout to Approved for cvsextras on ltspfs (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs From fedora-extras-commits at redhat.com Mon Mar 10 22:09:30 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 22:09:30 GMT Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.6, 1.7 gnome-settings-daemon.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200803102209.m2AM9UiH020226@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-settings-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20190 Modified Files: .cvsignore gnome-settings-daemon.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 Feb 2008 22:26:07 -0000 1.6 +++ .cvsignore 10 Mar 2008 22:08:50 -0000 1.7 @@ -1 +1 @@ -gnome-settings-daemon-2.21.92.tar.bz2 +gnome-settings-daemon-2.22.0.tar.bz2 Index: gnome-settings-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnome-settings-daemon.spec 9 Mar 2008 23:48:54 -0000 1.13 +++ gnome-settings-daemon.spec 10 Mar 2008 22:08:50 -0000 1.14 @@ -1,12 +1,12 @@ Name: gnome-settings-daemon -Version: 2.21.92 -Release: 3%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons License: GPLv2+ URL: http://ftp.gnome.org/pub/gnome/sources/%{name} -Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.21/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.22/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): GConf2 >= 2.14 @@ -125,6 +125,9 @@ %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Mon Mar 10 2008 Matthias Clasen 2.22.0-1 +- Update to 2.22.0 + * Sun Mar 9 2008 Ray Strode - 2.21.92-3 - Don't set keyboard model on startup from gconf if evdev is being used. Evdev needs to use its own keyboard model to work right. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 Feb 2008 22:26:07 -0000 1.6 +++ sources 10 Mar 2008 22:08:50 -0000 1.7 @@ -1 +1 @@ -ffe23a8f9deaf822cbe0aaf97573a9c6 gnome-settings-daemon-2.21.92.tar.bz2 +5bb2b129342e3149c00892aa18926317 gnome-settings-daemon-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 22:14:33 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Mon, 10 Mar 2008 22:14:33 GMT Subject: rpms/ltspfs - New directory Message-ID: <200803102214.m2AMEXpJ020450@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/ltspfs In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsd20413/rpms/ltspfs Log Message: Directory /cvs/extras/rpms/ltspfs added to the repository From fedora-extras-commits at redhat.com Mon Mar 10 22:14:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Mon, 10 Mar 2008 22:14:40 GMT Subject: rpms/ltspfs/devel - New directory Message-ID: <200803102214.m2AMEe2R020466@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/ltspfs/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsd20413/rpms/ltspfs/devel Log Message: Directory /cvs/extras/rpms/ltspfs/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 10 22:14:43 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Mon, 10 Mar 2008 22:14:43 GMT Subject: rpms/ltspfs Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803102214.m2AMEhvS020491@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/ltspfs In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsd20413/rpms/ltspfs Added Files: Makefile import.log Log Message: Setup of module ltspfs --- NEW FILE Makefile --- # Top level Makefile for module ltspfs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Mar 10 22:14:49 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Mon, 10 Mar 2008 22:14:49 GMT Subject: rpms/ltspfs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803102214.m2AMEnP9020507@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/ltspfs/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsd20413/rpms/ltspfs/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ltspfs --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ltspfs # $Id: Makefile,v 1.1 2008/03/10 22:14:43 wtogami Exp $ NAME := ltspfs SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Mar 10 22:16:03 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 22:16:03 GMT Subject: rpms/libsoup/devel .cvsignore, 1.31, 1.32 libsoup.spec, 1.61, 1.62 sources, 1.31, 1.32 Message-ID: <200803102216.m2AMG3XB020669@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libsoup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20611 Modified Files: .cvsignore libsoup.spec sources Log Message: 2.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsoup/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 25 Feb 2008 21:01:47 -0000 1.31 +++ .cvsignore 10 Mar 2008 22:15:24 -0000 1.32 @@ -1 +1 @@ -libsoup-2.3.4.tar.bz2 +libsoup-2.4.0.tar.bz2 Index: libsoup.spec =================================================================== RCS file: /cvs/extras/rpms/libsoup/devel/libsoup.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- libsoup.spec 25 Feb 2008 21:01:47 -0000 1.61 +++ libsoup.spec 10 Mar 2008 22:15:24 -0000 1.62 @@ -3,14 +3,14 @@ ### Abstract ### Name: libsoup -Version: 2.3.4 +Version: 2.4.0 Release: 1%{?dist} License: LGPLv2 Group: Development/Libraries Summary: Soup, an HTTP library implementation URL: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source: libsoup-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/libsoup/2.4/libsoup-%{version}.tar.bz2 ### Build Dependencies ### @@ -78,6 +78,9 @@ %{_datadir}/gtk-doc/html/libsoup-2.4 %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.4.0-1 +- Update to 2.4.0 + * Mon Feb 25 2008 Matthew Barnes - 2.3.4-1 - Update to 2.3.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsoup/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 25 Feb 2008 21:01:47 -0000 1.31 +++ sources 10 Mar 2008 22:15:24 -0000 1.32 @@ -1 +1 @@ -2def3fc29e0377d18e150ddd39118c9a libsoup-2.3.4.tar.bz2 +16d325a14ee4da61f72fb21cd3ffa439 libsoup-2.4.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 22:16:29 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 10 Mar 2008 22:16:29 GMT Subject: rpms/supertuxkart/devel supertuxkart.spec,1.6,1.7 Message-ID: <200803102216.m2AMGTkn020676@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/supertuxkart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20646 Modified Files: supertuxkart.spec Log Message: * Mon Mar 10 2008 Hans de Goede 0.4-1 - New upstream release 0.4 - Note this version includes a build in copy of the bullet physics library, this is a patched copy making use if a system version impossible Index: supertuxkart.spec =================================================================== RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- supertuxkart.spec 10 Mar 2008 22:02:46 -0000 1.6 +++ supertuxkart.spec 10 Mar 2008 22:15:55 -0000 1.7 @@ -14,7 +14,7 @@ Patch2: supertuxkart-0.3-default-fs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: plib-devel SDL-devel freealut-devel mikmod-devel -BuildRequires: libvorbis-devel desktop-file-utils +BuildRequires: libvorbis-devel freeglut-devel desktop-file-utils Requires: hicolor-icon-theme opengl-games-utils # Provide so that yum install tuxkart will work, obsolete for auto upgrade Provides: tuxkart = 0.4.0-6 From fedora-extras-commits at redhat.com Mon Mar 10 22:18:48 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Mon, 10 Mar 2008 22:18:48 GMT Subject: rpms/ltspfs/devel ltspfs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803102218.m2AMImWL020790@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ltspfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20763/devel Modified Files: .cvsignore sources Added Files: ltspfs.spec Log Message: import --- NEW FILE ltspfs.spec --- Name: ltspfs Version: 0.4.2 Release: 0.1.20080310%{?dist} Summary: LTSP file system, daemon that runs on thin clients Group: System Environment/Base License: GPL+ URL: https://code.launchpad.net/ltspfs # bzr snapshot # bzr checkout --lightweight -r 44 http://bazaar.launchpad.net/~ltsp-upstream/ltspfs/ltspfs-trunk # cd ltspfs-trunk # ./mkdst --test # tarball is ltspfs-%{version}.tar.bz2 Source0: ltspfs-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel BuildRequires: libX11-devel BuildRequires: glib2-devel %package -n ltspfsd Group: System Environment/Base Summary: LTSP file system, userspace FUSE module that runs on a server %description Fuse based remote filesystem for LTSP thin clients LtspFS is a remote filesystem consisting of two parts: 1) A network server daemon that runs on the LTSP terminal. 2) A FUSE module that runs in userspace on the server, that connects with the daemon on the client. This package contains the userspace parts for the LTSP server. %description -n ltspfsd Fuse based remote filesystem daemon for LTSP thin clients LtspFS is a remote filesystem consisting of two parts: 1) A network server daemon that runs on the LTSP terminal. 2) A FUSE module that runs in userspace on the server, that connects with the daemon on the client. This package contains the daemon to be run on the LTSP thin client. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_bindir}/ltspfs %{_bindir}/lbmount %{_sbindir}/ltspfsmounter %{_datadir}/man/man1/ltspfs.1.gz %{_datadir}/man/man1/lbmount.1.gz %{_datadir}/man/man1/ltspfsmounter.1.gz %files -n ltspfsd %defattr(-,root,root,-) %{_bindir}/ltspfsd %{_sbindir}/cdpinger %{_sbindir}/ltspfs_mount %{_sbindir}/ltspfs_umount %{_sysconfdir}/udev/rules.d/88-ltsp.rules /lib/udev/add_fstab_entry /lib/udev/remove_fstab_entry %{_datadir}/ldm/ %{_datadir}/ldm/ %{_datadir}/man/man1/ltspfsd.1.gz %changelog * Mon Mar 10 2008 Warren Togami - 0.4.2-0.1.20080310 - spec fixes * Mon Mar 10 2008 Warren Togami - 0.4.2-0.20080310 - spec fixes * Mon Jan 14 2008 Warren Togami - 0.4.2-0.20080114 - initial package for review Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ltspfs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2008 22:14:43 -0000 1.1 +++ .cvsignore 10 Mar 2008 22:18:10 -0000 1.2 @@ -0,0 +1 @@ +ltspfs-0.4.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ltspfs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2008 22:14:43 -0000 1.1 +++ sources 10 Mar 2008 22:18:10 -0000 1.2 @@ -0,0 +1 @@ +7bfdb97cfa6cc732bb312ab34c9c6f4f ltspfs-0.4.2.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 22:28:12 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Mon, 10 Mar 2008 22:28:12 GMT Subject: rpms/kernel/F-8 linux-2.6-usb-serial-fix-recursive-lock.patch, NONE, 1.1 kernel.spec, 1.372, 1.373 Message-ID: <200803102228.m2AMSCbq021016@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20991 Modified Files: kernel.spec Added Files: linux-2.6-usb-serial-fix-recursive-lock.patch Log Message: * Mon Mar 10 2008 Chuck Ebbert 2.6.24.3-27 - usb-serial: fix deadlock (#431379) linux-2.6-usb-serial-fix-recursive-lock.patch: --- NEW FILE linux-2.6-usb-serial-fix-recursive-lock.patch --- >From zaitcev at redhat.com Wed Mar 5 11:39:23 2008 From: Pete Zaitcev Date: Tue, 4 Mar 2008 23:28:42 -0800 Subject: USB: fix usb-serial generic recursive lock To: greg at kroah.com Cc: zaitcev at redhat.com, linux-usb at vger.kernel.org Message-ID: <20080304232842.c783d383.zaitcev at redhat.com> Nobody should be using the generic usb-serial for anything other than testing. Still, it's not a good thing that it's easy to lock up. There is a traceback from NMI oopser here: https://bugzilla.redhat.com/show_bug.cgi?id=431379 But in short, if a line discipline has a chance to echo anything, input can loop back a write method. So, don't call tty_flip_buffer_push from under a lock taken on write path. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/generic.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -323,7 +323,7 @@ static void flush_and_resubmit_read_urb room = tty_buffer_request_room(tty, urb->actual_length); if (room) { tty_insert_flip_string(tty, urb->transfer_buffer, room); - tty_flip_buffer_push(tty); /* is this allowed from an URB callback ? */ + tty_flip_buffer_push(tty); } } @@ -349,10 +349,12 @@ void usb_serial_generic_read_bulk_callba /* Throttle the device if requested by tty */ spin_lock_irqsave(&port->lock, flags); - if (!(port->throttled = port->throttle_req)) - /* Handle data and continue reading from device */ + if (!(port->throttled = port->throttle_req)) { + spin_unlock_irqrestore(&port->lock, flags); flush_and_resubmit_read_urb(port); - spin_unlock_irqrestore(&port->lock, flags); + } else { + spin_unlock_irqrestore(&port->lock, flags); + } } EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.372 retrieving revision 1.373 diff -u -r1.372 -r1.373 --- kernel.spec 10 Mar 2008 21:43:49 -0000 1.372 +++ kernel.spec 10 Mar 2008 22:27:36 -0000 1.373 @@ -684,6 +684,7 @@ Patch1103: linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch Patch1308: linux-2.6-usb-ehci-hcd-respect-nousb.patch +Patch1309: linux-2.6-usb-serial-fix-recursive-lock.patch Patch1320: linux-2.6-isdn-hisax-fix-request_irq-oops.patch Patch1400: linux-2.6-smarter-relatime.patch @@ -1266,10 +1267,10 @@ # ACPI # USB -# Do USB suspend only on certain classes of device. -# initialize strange modem/storage device properly (from F7 kernel) # some usb disks spin down automatically and need allow_restart ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch +# usb-serial can deadlock (#431379) +ApplyPatch linux-2.6-usb-serial-fix-recursive-lock.patch # ISDN # fix request_irq oops @@ -1909,6 +1910,9 @@ %changelog +* Mon Mar 10 2008 Chuck Ebbert 2.6.24.3-27 +- usb-serial: fix deadlock (#431379) + * Mon Mar 10 2008 John W. Linville 2.6.24.3-26 - iwlwifi: Moving EEPROM handling in iwlcore module - ath5k: struct ath5k_desc cleanups From fedora-extras-commits at redhat.com Mon Mar 10 22:50:22 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Mon, 10 Mar 2008 22:50:22 GMT Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.45,1.46 Message-ID: <200803102250.m2AMoMvH021656@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/wpa_supplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21555 Modified Files: wpa_supplicant.spec Log Message: * Mon Mar 10 2008 Christopher Aillon - 1:0.6.3-5 - BuildRequires qt3-devel Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- wpa_supplicant.spec 8 Mar 2008 20:09:35 -0000 1.45 +++ wpa_supplicant.spec 10 Mar 2008 22:49:48 -0000 1.46 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.6.3 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -24,7 +24,7 @@ URL: http://w1.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel +BuildRequires: qt3-devel BuildRequires: openssl-devel BuildRequires: readline-devel BuildRequires: dbus-devel @@ -147,6 +147,9 @@ %{_bindir}/wpa_gui %changelog +* Mon Mar 10 2008 Christopher Aillon - 1:0.6.3-5 +- BuildRequires qt3-devel + * Sat Mar 8 2008 Dan Williams - 1:0.6.3-4 - Fix log file path in service config file From fedora-extras-commits at redhat.com Mon Mar 10 22:51:46 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 22:51:46 GMT Subject: rpms/GConf2/devel .cvsignore, 1.34, 1.35 GConf2.spec, 1.76, 1.77 sources, 1.34, 1.35 Message-ID: <200803102251.m2AMpkXR021821@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/GConf2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21548 Modified Files: .cvsignore GConf2.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GConf2/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 29 Jan 2008 16:36:32 -0000 1.34 +++ .cvsignore 10 Mar 2008 22:51:04 -0000 1.35 @@ -1 +1 @@ -GConf-2.21.90.tar.bz2 +GConf-2.22.0.tar.bz2 Index: GConf2.spec =================================================================== RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- GConf2.spec 19 Feb 2008 22:34:18 -0000 1.76 +++ GConf2.spec 10 Mar 2008 22:51:04 -0000 1.77 @@ -4,11 +4,11 @@ Summary: A process-transparent configuration system Name: GConf2 -Version: 2.21.90 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Base -Source: http://download.gnome.org/sources/GConf/2.21/GConf-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/GConf/2.22/GConf-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org @@ -132,6 +132,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Tue Feb 19 2008 Fedora Release Engineering - 2.21.90-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/GConf2/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 29 Jan 2008 16:36:32 -0000 1.34 +++ sources 10 Mar 2008 22:51:04 -0000 1.35 @@ -1 +1 @@ -225c3f9e164ad307c2825a523f511f7f GConf-2.21.90.tar.bz2 +a56c043afeb1052abaf45407409b0331 GConf-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 23:01:53 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Mon, 10 Mar 2008 23:01:53 GMT Subject: rpms/avahi/devel avahi.spec,1.104,1.105 Message-ID: <200803102301.m2AN1rBD029272@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/avahi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28559 Modified Files: avahi.spec Log Message: * Mon Mar 10 2008 Christopher Aillon - 0.6.22-9 - The qt3 subpackage should (Build)Require: qt3 Index: avahi.spec =================================================================== RCS file: /cvs/extras/rpms/avahi/devel/avahi.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- avahi.spec 3 Mar 2008 07:09:35 -0000 1.104 +++ avahi.spec 10 Mar 2008 23:01:11 -0000 1.105 @@ -6,7 +6,7 @@ %endif Name: avahi Version: 0.6.22 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Local network service discovery Group: System Environment/Base License: LGPLv2 @@ -21,7 +21,7 @@ BuildRequires: dbus-python BuildRequires: libxml2-python BuildRequires: gtk2-devel -BuildRequires: qt-devel +BuildRequires: qt3-devel BuildRequires: libglade2-devel BuildRequires: libdaemon-devel >= 0.11 BuildRequires: glib2-devel @@ -132,7 +132,7 @@ Summary: Qt3 libraries for avahi Group: System Environment/Base Requires: %{name} = %{version} -Requires: qt +Requires: qt3 %description qt3 Libraries for easy use of avahi from Qt3 applications. @@ -142,7 +142,7 @@ Group: Development/Libraries Requires: %{name}-devel = %{version} Requires: %{name}-qt3 = %{version} -Requires: qt-devel +Requires: qt3-devel %description qt3-devel The avahi-qt3-devel package contains the header files and libraries @@ -522,6 +522,9 @@ %endif %changelog +* Mon Mar 10 2008 Christopher Aillon - 0.6.22-9 +- The qt3 subpackage should (Build)Require: qt3 + * Mon Mar 03 2008 Kevin Kofler - 0.6.22-8 - updated (completed) German translation by Fabian Affolter (#427090) From fedora-extras-commits at redhat.com Mon Mar 10 23:09:13 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 23:09:13 GMT Subject: rpms/libgtop2/devel .cvsignore, 1.41, 1.42 libgtop2.spec, 1.61, 1.62 sources, 1.41, 1.42 Message-ID: <200803102309.m2AN9Dl5029472@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgtop2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29432 Modified Files: .cvsignore libgtop2.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgtop2/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 26 Feb 2008 04:43:05 -0000 1.41 +++ .cvsignore 10 Mar 2008 23:08:19 -0000 1.42 @@ -1 +1 @@ -libgtop-2.21.92.tar.bz2 +libgtop-2.22.0.tar.bz2 Index: libgtop2.spec =================================================================== RCS file: /cvs/extras/rpms/libgtop2/devel/libgtop2.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- libgtop2.spec 26 Feb 2008 04:43:05 -0000 1.61 +++ libgtop2.spec 10 Mar 2008 23:08:19 -0000 1.62 @@ -6,12 +6,12 @@ Name: libgtop2 Summary: libgtop library (version 2) -Version: 2.21.92 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} License: GPLv2+ -URL: http://download.gnome.org/sources/libgtop/2.21 +URL: http://download.gnome.org/sources/libgtop/2.22 Group: System Environment/Libraries -Source: http://download.gnome.org/sources/libgtop/2.21/libgtop-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/libgtop/2.22/libgtop-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: glib2 >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -75,6 +75,9 @@ %exclude %{_datadir}/info %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Mon Feb 25 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgtop2/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 26 Feb 2008 04:43:05 -0000 1.41 +++ sources 10 Mar 2008 23:08:19 -0000 1.42 @@ -1 +1 @@ -0cb43cb9fcd38ceb50b7d9aeec86f676 libgtop-2.21.92.tar.bz2 +c4f15d95dea6441a08b4f2260996becd libgtop-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 23:12:57 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 23:12:57 GMT Subject: rpms/tomboy/devel .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 tomboy.spec, 1.76, 1.77 Message-ID: <200803102312.m2ANCvXF029585@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/tomboy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29534 Modified Files: .cvsignore sources tomboy.spec Log Message: 0.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 4 Mar 2008 02:59:39 -0000 1.29 +++ .cvsignore 10 Mar 2008 23:12:24 -0000 1.30 @@ -1 +1 @@ -tomboy-0.9.8.tar.bz2 +tomboy-0.10.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 4 Mar 2008 02:59:39 -0000 1.29 +++ sources 10 Mar 2008 23:12:24 -0000 1.30 @@ -1 +1 @@ -e091169130f3af024148f25d7fe4aba3 tomboy-0.9.8.tar.bz2 +cf200d49beae64260b9e029b6dcc579a tomboy-0.10.0.tar.bz2 Index: tomboy.spec =================================================================== RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- tomboy.spec 4 Mar 2008 02:59:39 -0000 1.76 +++ tomboy.spec 10 Mar 2008 23:12:24 -0000 1.77 @@ -1,5 +1,5 @@ Name: tomboy -Version: 0.9.8 +Version: 0.10.0 Release: 1%{?dist} Summary: Tomboy is a desktop note-taking application for Linux and Unix @@ -9,7 +9,7 @@ # libtomboy contains GPL+ code # Mono.Addins is MIT URL: http://www.beatniksoftware.com/tomboy/ -Source0: http://download.gnome.org/sources/tomboy/0.9/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/tomboy/0.10/%{name}-%{version}.tar.bz2 Patch1: tomboy-wrapper.patch Patch2: no-start-here.patch @@ -116,6 +116,9 @@ %changelog +* Mon Mar 10 2008 Matthias Clasen - 0.10.0-1 +- Update to 0.10.0 + * Mon Mar 3 2008 Matthias Clasen - 0.9.8-1 - Update to 0.9.8 From fedora-extras-commits at redhat.com Mon Mar 10 23:14:45 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 10 Mar 2008 23:14:45 GMT Subject: rpms/z88dk/devel z88dk-1.8-makefile-fixes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 z88dk.spec, 1.12, 1.13 z88dk-1.7-makefile-fixes.patch, 1.1, NONE Message-ID: <200803102314.m2ANEjqI029693@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/z88dk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29605/devel Modified Files: .cvsignore sources z88dk.spec Added Files: z88dk-1.8-makefile-fixes.patch Removed Files: z88dk-1.7-makefile-fixes.patch Log Message: * Mon Mar 10 2008 Kevin Kofler - 1.8-1 - update to 1.8 - update makefile-fixes patch (most issues fixed upstream, only one left) z88dk-1.8-makefile-fixes.patch: --- NEW FILE z88dk-1.8-makefile-fixes.patch --- diff -ur z88dk/libsrc/time/Makefile z88dk-makefile-fixes/libsrc/time/Makefile --- z88dk/libsrc/time/Makefile 2006-06-18 19:59:40.000000000 +0200 +++ z88dk-makefile-fixes/libsrc/time/Makefile 2007-12-06 08:52:10.000000000 +0100 @@ -11,6 +11,8 @@ lzx: spectrum_time +lnewbrain: time newbrain_time + time: gmtime.o localtime.o mktime.o .c.o: @@ -25,6 +27,9 @@ spectrum_time: cd spectrum ; $(MAKE) ; cd .. +newbrain_time: + cd newbrain ; $(MAKE) ; cd .. + clean: $(RM) *.o* *.i *.sym *.map zcc_opt.def $(RM) zx81/*.o* Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Dec 2007 08:08:32 -0000 1.3 +++ .cvsignore 10 Mar 2008 23:13:46 -0000 1.4 @@ -1 +1 @@ -z88dk-src-1.7.tgz +z88dk-src-1.8.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Dec 2007 08:08:32 -0000 1.3 +++ sources 10 Mar 2008 23:13:46 -0000 1.4 @@ -1 +1 @@ -cbb910bcb8beb0b15b101a4420d3fb25 z88dk-src-1.7.tgz +f3a762cb6263430f76163e3e85fa1102 z88dk-src-1.8.tgz Index: z88dk.spec =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- z88dk.spec 9 Feb 2008 03:57:11 -0000 1.12 +++ z88dk.spec 10 Mar 2008 23:13:46 -0000 1.13 @@ -1,12 +1,12 @@ Summary: A Z80 cross compiler Name: z88dk -Version: 1.7 -Release: 3%{?dist} +Version: 1.8 +Release: 1%{?dist} License: Artistic clarified Group: Development/Tools Source: http://downloads.sourceforge.net/z88dk/z88dk-src-%{version}.tgz Patch0: z88make.patch -Patch1: z88dk-1.7-makefile-fixes.patch +Patch1: z88dk-1.8-makefile-fixes.patch Patch2: z88dk-1.7-64bit.patch URL: http://z88dk.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,6 +78,10 @@ %{_mandir}/man3z/ %changelog +* Mon Mar 10 2008 Kevin Kofler - 1.8-1 +- update to 1.8 +- update makefile-fixes patch (most issues fixed upstream, only one left) + * Sat Feb 9 2008 Kevin Kofler - 1.7-3 - rebuild for GCC 4.3 --- z88dk-1.7-makefile-fixes.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 10 23:16:28 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 23:16:28 GMT Subject: rpms/gnome-vfs2/devel .cvsignore, 1.53, 1.54 gnome-vfs2.spec, 1.176, 1.177 sources, 1.56, 1.57 Message-ID: <200803102316.m2ANGSU4029790@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-vfs2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29718 Modified Files: .cvsignore gnome-vfs2.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 31 Jan 2008 02:01:22 -0000 1.53 +++ .cvsignore 10 Mar 2008 23:15:33 -0000 1.54 @@ -1 +1 @@ -gnome-vfs-2.21.90.tar.bz2 +gnome-vfs-2.22.0.tar.bz2 Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- gnome-vfs2.spec 31 Jan 2008 02:31:37 -0000 1.176 +++ gnome-vfs2.spec 10 Mar 2008 23:15:33 -0000 1.177 @@ -13,13 +13,13 @@ Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 -Version: 2.21.90 +Version: 2.22.0 Release: 1%{?dist} License: LGPLv2 and LGPL+ and GPL+ # the daemon and the library are LGPLv2 # the modules are LGPL+ and GPL+ Group: System Environment/Libraries -Source0: http://download.gnome.org/source/gnome-vfs/2.21/gnome-vfs-%{version}.tar.bz2 +Source0: http://download.gnome.org/source/gnome-vfs/2.22/gnome-vfs-%{version}.tar.bz2 URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gnome-mime-data >= %{gnome_mime_data_version} @@ -235,6 +235,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Wed Jan 30 2008 Matthias Clasen - 2.21.90-1 - Update to 2.21.90 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 31 Jan 2008 02:01:22 -0000 1.56 +++ sources 10 Mar 2008 23:15:33 -0000 1.57 @@ -1 +1 @@ -410c73fe4d9f2c4b702be61e68636df2 gnome-vfs-2.21.90.tar.bz2 +369105fd82cb99e69e63acab8f3b89b7 gnome-vfs-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 23:17:32 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 10 Mar 2008 23:17:32 GMT Subject: rpms/sugar/devel sugar.spec,1.3,1.4 Message-ID: <200803102317.m2ANHWO0029868@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/sugar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29771 Modified Files: sugar.spec Log Message: missing Requires on numpy Index: sugar.spec =================================================================== RCS file: /cvs/extras/rpms/sugar/devel/sugar.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sugar.spec 19 Feb 2008 15:19:10 -0000 1.3 +++ sugar.spec 10 Mar 2008 23:16:55 -0000 1.4 @@ -3,7 +3,7 @@ Summary: OLPC desktop environment Name: sugar Version: 0.75.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://dev.laptop.org Source0: http://dev.laptop.org/pub/sugar/release/%{name}-%{version}.tar.bz2 License: GPL/LGPL @@ -38,6 +38,7 @@ Requires: python-telepathy Requires: telepathy-gabble Requires: telepathy-glib +Requires: numpy %description @@ -80,6 +81,9 @@ %{_datadir}/mime/packages/sugar.xml %changelog +* Mon Mar 10 2008 Dennis Gilmore - 0.75.0-3 +- Requires numpy + * Tue Feb 19 2008 Fedora Release Engineering - 0.75.0-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Mon Mar 10 23:20:43 2008 From: fedora-extras-commits at redhat.com (Christopher Edward Lumens (clumens)) Date: Mon, 10 Mar 2008 23:20:43 GMT Subject: rpms/anaconda/devel .cvsignore, 1.505, 1.506 anaconda.spec, 1.645, 1.646 sources, 1.637, 1.638 Message-ID: <200803102320.m2ANKhRL030107@cvs-int.fedora.redhat.com> Author: clumens Update of /cvs/pkgs/rpms/anaconda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30041 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.505 retrieving revision 1.506 diff -u -r1.505 -r1.506 --- .cvsignore 7 Mar 2008 00:28:44 -0000 1.505 +++ .cvsignore 10 Mar 2008 23:20:10 -0000 1.506 @@ -1 +1,2 @@ anaconda-11.4.0.48.tar.bz2 +anaconda-11.4.0.49.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.645 retrieving revision 1.646 diff -u -r1.645 -r1.646 --- anaconda.spec 7 Mar 2008 00:28:44 -0000 1.645 +++ anaconda.spec 10 Mar 2008 23:20:10 -0000 1.646 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.48 +Version: 11.4.0.49 Release: 1 License: GPLv2+ Group: Applications/System @@ -204,6 +204,15 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Mar 10 2008 Chris Lumens - 11.4.0.49-1 +- Use the full path to the .discinfo file (#436855). (clumens) +- List netinst.iso/boot.iso in .treeinfo (#436089) (katzj) +- Convinced to change the name back to boot.iso (katzj) +- Only pass the file path to {ftp,http}GetFileDesc. (clumens) +- Pass the correct NFS method parameter to stage2 (#436360). (clumens) +- Fix logging messages to not display the hostname twice. (clumens) +- Fix traceback with text mode adding iscsi (#436480) (katzj) + * Thu Mar 06 2008 Jeremy Katz - 11.4.0.48-1 - Don't use the bits from $UPDATES unless $UPDATES exists (katzj) - Fix horkage with busybox stuff. There's now start-stop-daemon (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v retrieving revision 1.637 retrieving revision 1.638 diff -u -r1.637 -r1.638 --- sources 7 Mar 2008 00:28:44 -0000 1.637 +++ sources 10 Mar 2008 23:20:10 -0000 1.638 @@ -1 +1 @@ -1e87c46df9f07b32a5f74d660e0de778 anaconda-11.4.0.48.tar.bz2 +28907f39eea29349233594e55799f45f anaconda-11.4.0.49.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 23:22:53 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 23:22:53 GMT Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.62, 1.63 gnome-system-monitor.spec, 1.110, 1.111 sources, 1.62, 1.63 Message-ID: <200803102322.m2ANMrgt030218@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-system-monitor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30176 Modified Files: .cvsignore gnome-system-monitor.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 26 Feb 2008 04:45:28 -0000 1.62 +++ .cvsignore 10 Mar 2008 23:22:05 -0000 1.63 @@ -1 +1 @@ -gnome-system-monitor-2.21.92.tar.bz2 +gnome-system-monitor-2.22.0.tar.bz2 Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- gnome-system-monitor.spec 10 Mar 2008 05:50:10 -0000 1.110 +++ gnome-system-monitor.spec 10 Mar 2008 23:22:05 -0000 1.111 @@ -12,12 +12,12 @@ Summary: Simple process monitor Name: gnome-system-monitor -Version: 2.21.92 -Release: 4%{?dist} +Version: 2.22.0 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.gnome.org/ -Source: http://download.gnome.org/sources/gnome-system-monitor/2.21/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-system-monitor/2.22/%{name}-%{version}.tar.bz2 Source1: about-this-computer.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: GConf2-devel @@ -123,6 +123,9 @@ %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Mon Mar 10 2008 Matthias Clasen - 2.21.92-4 - Don't show "About this computer" in the regular menus Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-system-monitor/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 26 Feb 2008 04:45:28 -0000 1.62 +++ sources 10 Mar 2008 23:22:05 -0000 1.63 @@ -1 +1 @@ -fc6e48aeceddc1c36b416b6e8b4875d8 gnome-system-monitor-2.21.92.tar.bz2 +7b809a4db72902ca5f47a63f62917d14 gnome-system-monitor-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 23:30:47 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 23:30:47 GMT Subject: rpms/gtk2-engines/devel .cvsignore, 1.48, 1.49 gtk2-engines.spec, 1.87, 1.88 sources, 1.49, 1.50 Message-ID: <200803102330.m2ANUlc6030461@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtk2-engines/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30432 Modified Files: .cvsignore gtk2-engines.spec sources Log Message: 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk2-engines/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 26 Feb 2008 03:53:47 -0000 1.48 +++ .cvsignore 10 Mar 2008 23:30:09 -0000 1.49 @@ -1 +1 @@ -gtk-engines-2.13.6.tar.bz2 +gtk-engines-2.14.0.tar.bz2 Index: gtk2-engines.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2-engines/devel/gtk2-engines.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- gtk2-engines.spec 26 Feb 2008 03:53:47 -0000 1.87 +++ gtk2-engines.spec 10 Mar 2008 23:30:09 -0000 1.88 @@ -2,12 +2,12 @@ Summary: Theme engines for GTK+ 2.0 Name: gtk2-engines -Version: 2.13.6 +Version: 2.14.0 Release: 1%{?dist} # for details on which engines are GPL vs LGPL, see COPYING License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries -Source: http://download.gnome.org/sources/gtk-engines/2.13/gtk-engines-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gtk-engines/2.14/gtk-engines-%{version}.tar.bz2 Patch0: gtk-engines-2.10.2-keep-default-tooltip-color.patch Conflicts: gnome-themes < 2.9.0 @@ -70,6 +70,9 @@ %{_datadir}/gtk-engines %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.14.0-1 +- Update to 2.14.0 + * Mon Feb 25 2008 Matthias Clasen - 2.13.6-1 - Update to 2.13.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk2-engines/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 26 Feb 2008 03:53:47 -0000 1.49 +++ sources 10 Mar 2008 23:30:09 -0000 1.50 @@ -1 +1 @@ -8b1dc1fc9412704d27b3ad642a8688ca gtk-engines-2.13.6.tar.bz2 +c4784ceacddbf818c22ce36b13f6c7a1 gtk-engines-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 23:34:39 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Mon, 10 Mar 2008 23:34:39 GMT Subject: rpms/kernel/F-8 kernel.spec, 1.373, 1.374 linux-2.6-wireless-pending.patch, 1.32, 1.33 Message-ID: <200803102334.m2ANYdOs030723@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30622 Modified Files: kernel.spec linux-2.6-wireless-pending.patch Log Message: * Mon Mar 10 2008 Chuck Ebbert 2.6.24.3-28 - Fix license in iwlcore driver. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.373 retrieving revision 1.374 diff -u -r1.373 -r1.374 --- kernel.spec 10 Mar 2008 22:27:36 -0000 1.373 +++ kernel.spec 10 Mar 2008 23:34:04 -0000 1.374 @@ -1910,6 +1910,9 @@ %changelog +* Mon Mar 10 2008 Chuck Ebbert 2.6.24.3-28 +- Fix license in iwlcore driver. + * Mon Mar 10 2008 Chuck Ebbert 2.6.24.3-27 - usb-serial: fix deadlock (#431379) linux-2.6-wireless-pending.patch: Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending.patch,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- linux-2.6-wireless-pending.patch 10 Mar 2008 21:43:49 -0000 1.32 +++ linux-2.6-wireless-pending.patch 10 Mar 2008 23:34:04 -0000 1.33 @@ -30768,7 +30768,7 @@ +MODULE_DESCRIPTION("iwl core"); +MODULE_VERSION(IWLWIFI_VERSION); +MODULE_AUTHOR(DRV_COPYRIGHT); -+MODULE_LICENSE("GPL/BSD"); ++MODULE_LICENSE("Dual BSD/GPL"); + +#ifdef CONFIG_IWL4965_DEBUG +u32 iwl4965_debug_level; From fedora-extras-commits at redhat.com Mon Mar 10 23:37:47 2008 From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen)) Date: Mon, 10 Mar 2008 23:37:47 GMT Subject: rpms/libsvm/devel libsvm-svm-toy-qt.desktop, 1.1, 1.2 libsvm.spec, 1.15, 1.16 Message-ID: <200803102337.m2ANblxM030972@cvs-int.fedora.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/libsvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30942/devel Modified Files: libsvm-svm-toy-qt.desktop libsvm.spec Log Message: Add desktop files in install section Index: libsvm-svm-toy-qt.desktop =================================================================== RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm-svm-toy-qt.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libsvm-svm-toy-qt.desktop 10 Mar 2008 06:08:59 -0000 1.1 +++ libsvm-svm-toy-qt.desktop 10 Mar 2008 23:37:12 -0000 1.2 @@ -7,4 +7,4 @@ StartupNotify=true Terminal=false Type=Application -Categories=QT;Education;Science;Math;DataVisualization +Categories=KDE;Education;Science;Math;DataVisualization Index: libsvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libsvm/devel/libsvm.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libsvm.spec 10 Mar 2008 06:08:59 -0000 1.15 +++ libsvm.spec 10 Mar 2008 23:37:12 -0000 1.16 @@ -1,6 +1,6 @@ Name: libsvm Version: 2.85 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A Library for Support Vector Machines Group: Development/Libraries @@ -99,8 +99,8 @@ cp %{SOURCE2} . cp %{SOURCE3} . cp %{SOURCE4} . -cp %{SOURCE5} libsvm-svm-toy-gtk-48.png -cp %{SOURCE5} libsvm-svm-toy-qt-48.png +cp %{SOURCE5} %{name}-svm-toy-gtk-48.png +cp %{SOURCE5} %{name}-svm-toy-qt-48.png @@ -121,13 +121,16 @@ #cd ${RPM_BUILD_ROOT}%{libdir_libsvm}; ln -sf %{name}.so.%{version} %{name}.so rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ -cp libsvm-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ -cp libsvm-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +cp %{name}-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +cp %{name}-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications +cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications desktop-file-install --delete-original --vendor=fedora \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-gtk.desktop \ - ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-qt.desktop \ + ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \ + ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop \ @@ -186,17 +189,22 @@ %defattr(-,root,root,-) %doc svm-toy/gtk/README %{_bindir}/svm-toy-gtk -%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-gtk-48.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-gtk-48.png +%{_datadir}/applications/fedora-%{name}-svm-toy-gtk.desktop %files svm-toy-qt %defattr(-,root,root,-) %doc svm-toy/qt/README %{_bindir}/svm-toy-qt -%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-qt-48.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-qt-48.png +%{_datadir}/applications/fedora-%{name}-svm-toy-qt.desktop %changelog -* Tue Feb 11 2008 Ding-Yi Chen - 2.85-5 +* Tue Mar 11 2008 Ding-Yi Chen - 2.85-6 +- Add desktop files in install section. + +* Mon Mar 10 2008 Ding-Yi Chen - 2.85-5 - [Bug 436392]: Fix by copy from right place. - Add desktop files and icons for svm-toy-gtk and svm-toy-qt From fedora-extras-commits at redhat.com Mon Mar 10 23:43:55 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 23:43:55 GMT Subject: rpms/pygtksourceview/devel .cvsignore, 1.9, 1.10 pygtksourceview.spec, 1.17, 1.18 sources, 1.9, 1.10 Message-ID: <200803102343.m2ANhtIM031153@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/pygtksourceview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31097 Modified Files: .cvsignore pygtksourceview.spec sources Log Message: 2.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 6 Feb 2008 06:09:33 -0000 1.9 +++ .cvsignore 10 Mar 2008 23:43:22 -0000 1.10 @@ -1 +1 @@ -pygtksourceview-2.1.1.tar.bz2 +pygtksourceview-2.2.0.tar.bz2 Index: pygtksourceview.spec =================================================================== RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/pygtksourceview.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- pygtksourceview.spec 6 Feb 2008 06:29:35 -0000 1.17 +++ pygtksourceview.spec 10 Mar 2008 23:43:22 -0000 1.18 @@ -5,14 +5,14 @@ %define gtksourceview_version 2.1.2 Name: pygtksourceview -Version: 2.1.1 +Version: 2.2.0 Release: 1%{?dist} Summary: Python bindings for gtksourceview Group: Development/Languages License: LGPL URL: http://download.gnome.org/sources/pygtksourceview/ -Source0: http://download.gnome.org/sources/pygtksourceview/2.0/pygtksourceview-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/pygtksourceview/2.2/pygtksourceview-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtksourceview2-devel >= %{gtksourceview_version} @@ -75,6 +75,9 @@ %{_datadir}/gtk-doc/html/pygtksourceview2 %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.2.0-1 +- Update to 2.2.0 + * Wed Feb 6 2008 Matthias Clasen - 2.1.1-1 - Update to 2.1.1 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pygtksourceview/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 6 Feb 2008 06:09:33 -0000 1.9 +++ sources 10 Mar 2008 23:43:22 -0000 1.10 @@ -1 +1 @@ -d720ed1bf48e421a0b14fed9b654a974 pygtksourceview-2.1.1.tar.bz2 +5dd0a9aa99168f989ed04123a65077e4 pygtksourceview-2.2.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 23:48:30 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 10 Mar 2008 23:48:30 GMT Subject: rpms/sugar/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sugar.spec, 1.4, 1.5 Message-ID: <200803102348.m2ANmUTa031339@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/sugar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31283 Modified Files: .cvsignore sources sugar.spec Log Message: update to 0.75.13 and add Requires numpy Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sugar/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Dec 2007 00:07:18 -0000 1.3 +++ .cvsignore 10 Mar 2008 23:47:57 -0000 1.4 @@ -1 +1 @@ -sugar-0.75.0.tar.bz2 +sugar-0.75.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sugar/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Dec 2007 00:07:18 -0000 1.3 +++ sources 10 Mar 2008 23:47:57 -0000 1.4 @@ -1 +1 @@ -5c14b6de5e84aa23b6dbcbfcde5cd49f sugar-0.75.0.tar.bz2 +0eb7d56675a6e8c62d4d335f13b24008 sugar-0.75.13.tar.bz2 Index: sugar.spec =================================================================== RCS file: /cvs/extras/rpms/sugar/devel/sugar.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sugar.spec 10 Mar 2008 23:16:55 -0000 1.4 +++ sugar.spec 10 Mar 2008 23:47:57 -0000 1.5 @@ -2,8 +2,8 @@ Summary: OLPC desktop environment Name: sugar -Version: 0.75.0 -Release: 3%{?dist} +Version: 0.75.13 +Release: 2%{?dist} URL: http://dev.laptop.org Source0: http://dev.laptop.org/pub/sugar/release/%{name}-%{version}.tar.bz2 License: GPL/LGPL @@ -60,6 +60,16 @@ make install DESTDIR=%{buildroot} %find_lang %name +%post +if (update-mime-database -v &> /dev/null); then + update-mime-database "%{_datadir}/mime" > /dev/null +fi + +%postun +if (update-mime-database -v &> /dev/null); then + update-mime-database "%{_datadir}/mime" > /dev/null +fi + %clean rm -rf %{buildroot} @@ -81,19 +91,52 @@ %{_datadir}/mime/packages/sugar.xml %changelog -* Mon Mar 10 2008 Dennis Gilmore - 0.75.0-3 +* Mon Mar 10 2008 Dennis Gilmore - 0.75.13-2 - Requires numpy -* Tue Feb 19 2008 Fedora Release Engineering - 0.75.0-2 -- Autorebuild for GCC 4.3 +* Tue Feb 12 2008 Marco Pesenti Gritti - 0.75.13-1 +- Updated translations + +* Sat Feb 9 2008 Marco Pesenti Gritti - 0.75.12-1 +- Revert fix for #5904 (not approved). Fix #6332. + +* Tue Jan 29 2008 Marco Pesenti Gritti - 0.75.11-1 +- Fix #5904 + +* Fri Jan 18 2008 Marco Pesenti Gritti - 0.75.10-1 +- Fix #1406 #5944 #6051 + +* Wed Jan 16 2008 Marco Pesenti Gritti - 0.75.8-2 +- Update the mime db. Fix #5815 + +* Fri Jan 11 2008 Marco Pesenti Gritti - 0.75.8-1 +- Fix #5489 #4562 #5765 #5559 #5493 #5573 #5648 + +* Thu Jan 10 2008 Marco Pesenti Gritti - 0.75.7-1 +- Fix #4145 #5538 #5760 #5532 #5884 + +* Sat Dec 22 2007 Marco Pesenti Gritti - 0.75.6-1 +- Fix #5489 + +* Wed Dec 19 2007 Marco Pesenti Gritti - 0.75.5-1 +- Fix #5526 #5512 #4909 + +* Wed Dec 19 2007 Marco Pesenti Gritti - 0.75.4-1 +- Fix #4906 #5382 #5364 + +* Wed Dec 12 2007 Marco Pesenti Gritti - 0.75.3-1 +- Fix #4965 + +* Tue Dec 11 2007 Marco Pesenti Gritti - 0.75.1-1 +- Fix #5154 #5221 #5080 -* Wed Dec 5 2007 Marco Pesenti Gritti - 0.75.0-1 +* Wed Dec 5 2007 Marco Pesenti Gritti - 0.75.0-1 - Update to 0.75.0 -* Fri Nov 30 2007 Marco Pesenti Gritti - 0.70.3-1 +* Fri Nov 30 2007 Marco Pesenti Gritti - 0.70.3-1 - Update to 0.70.3 -* Thu Nov 29 2007 Marco Pesenti Gritti - 0.70.2-2 +* Thu Nov 29 2007 Marco Pesenti Gritti - 0.70.2-2 - Change the jabber server * Tue Nov 20 2007 Marco Pesenti Gritti - 0.70.2-1 From fedora-extras-commits at redhat.com Mon Mar 10 23:48:38 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Mon, 10 Mar 2008 23:48:38 GMT Subject: rpms/z88dk/devel z88dk-1.8-makefile-usr-share.patch, NONE, 1.1 z88dk.spec, 1.13, 1.14 z88make.patch, 1.1, NONE Message-ID: <200803102348.m2ANmc6s031351@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/z88dk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31291/devel Modified Files: z88dk.spec Added Files: z88dk-1.8-makefile-usr-share.patch Removed Files: z88make.patch Log Message: - update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch - remove redundant sed (already covered by above patch) z88dk-1.8-makefile-usr-share.patch: --- NEW FILE z88dk-1.8-makefile-usr-share.patch --- diff -ur z88dk/Makefile z88dk-makefile-usr-share/Makefile --- z88dk/Makefile 2008-03-01 16:06:51.000000000 +0100 +++ z88dk-makefile-usr-share/Makefile 2008-03-11 00:45:08.000000000 +0100 @@ -7,7 +7,7 @@ # ---> Configurable parameters are below his point -prefix = /usr/local +prefix = /usr prefix_share = $(prefix)/share # The default machine, the lib/config/DEFAULT.cfg file is copied to zcc.cfg @@ -51,7 +51,7 @@ setup: - echo '#define PREFIX "${prefix}$"/lib/z88dk"' > src/config.h + echo '#define PREFIX "'$(prefix_share)'/z88dk"' > src/config.h echo '#define UNIX 1' >> src/config.h appmake: @@ -87,9 +87,9 @@ cd libsrc ; $(MAKE) install install-libs: - mkdir -p $(prefix)/lib/z88dk/lib/clibs - cp -R lib/clibs/* $(prefix)/lib/z88dk/lib/clibs/ - find $(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644 + mkdir -p $(prefix_share)/z88dk/lib/clibs + cp -R lib/clibs/* $(prefix_share)/z88dk/lib/clibs/ + find $(prefix_share)/z88dk/lib/clibs -type f | xargs chmod 644 install: Index: z88dk.spec =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- z88dk.spec 10 Mar 2008 23:13:46 -0000 1.13 +++ z88dk.spec 10 Mar 2008 23:47:56 -0000 1.14 @@ -5,7 +5,7 @@ License: Artistic clarified Group: Development/Tools Source: http://downloads.sourceforge.net/z88dk/z88dk-src-%{version}.tgz -Patch0: z88make.patch +Patch0: z88dk-1.8-makefile-usr-share.patch Patch1: z88dk-1.8-makefile-fixes.patch Patch2: z88dk-1.7-64bit.patch URL: http://z88dk.sourceforge.net/ @@ -18,6 +18,7 @@ %prep %setup -q -n z88dk +# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk %patch0 -p0 # Lots of buggy makefiles there %patch1 -p1 @@ -27,9 +28,6 @@ # Separate manpages from other docs and fix their permissions %{__mv} doc/netman . %{__chmod} 644 netman/man3z/* -# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk -%{__sed} -i -e 's@[$][(]prefix[)]/lib/z88dk@$(datadir)/z88dk at g' \ - -e 's@[$][{]prefix[}][$]/lib/z88dk@%{_datadir}/z88dk at g' Makefile # Fix files with wrong line endings and bad permissions /usr/bin/find doc examples src -type f -exec %{__sed} -i -e 's/\r*$//' {} \; /usr/bin/find doc examples src -type f -exec %{__chmod} 644 {} \; @@ -81,6 +79,8 @@ * Mon Mar 10 2008 Kevin Kofler - 1.8-1 - update to 1.8 - update makefile-fixes patch (most issues fixed upstream, only one left) +- update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch +- remove redundant sed (already covered by above patch) * Sat Feb 9 2008 Kevin Kofler - 1.7-3 - rebuild for GCC 4.3 --- z88make.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 10 23:50:17 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 23:50:17 GMT Subject: rpms/libwnck/devel .cvsignore, 1.60, 1.61 libwnck.spec, 1.94, 1.95 sources, 1.60, 1.61 Message-ID: <200803102350.m2ANoHfK031458@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libwnck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31403 Modified Files: .cvsignore libwnck.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libwnck/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 26 Feb 2008 18:20:43 -0000 1.60 +++ .cvsignore 10 Mar 2008 23:49:43 -0000 1.61 @@ -1 +1 @@ -libwnck-2.21.92.tar.bz2 +libwnck-2.22.0.tar.bz2 Index: libwnck.spec =================================================================== RCS file: /cvs/extras/rpms/libwnck/devel/libwnck.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- libwnck.spec 26 Feb 2008 18:20:43 -0000 1.94 +++ libwnck.spec 10 Mar 2008 23:49:43 -0000 1.95 @@ -5,10 +5,10 @@ Summary: Window Navigator Construction Kit Name: libwnck -Version: 2.21.92 +Version: 2.22.0 Release: 1%{?dist} URL: http://download.gnome.org/sources/libwnck/ -Source0: http://download.gnome.org/sources/libwnck/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/libwnck/2.22/%{name}-%{version}.tar.bz2 License: LGPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -95,6 +95,9 @@ %doc %{_datadir}/gtk-doc/html/libwnck %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Tue Feb 26 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libwnck/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 26 Feb 2008 18:20:43 -0000 1.60 +++ sources 10 Mar 2008 23:49:43 -0000 1.61 @@ -1 +1 @@ -bc6824f3572912c970d61fe0b0a30d0a libwnck-2.21.92.tar.bz2 +db7b86ef93ed08ee1562cd08206f9c66 libwnck-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 23:53:17 2008 From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen)) Date: Mon, 10 Mar 2008 23:53:17 GMT Subject: rpms/libsvm/F-7 libsvm-svm-toy-qt.desktop, 1.1, 1.2 libsvm.spec, 1.11, 1.12 Message-ID: <200803102353.m2ANrHew031579@cvs-int.fedora.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/libsvm/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31545/F-7 Modified Files: libsvm-svm-toy-qt.desktop libsvm.spec Log Message: Add desktop files in install section Index: libsvm-svm-toy-qt.desktop =================================================================== RCS file: /cvs/pkgs/rpms/libsvm/F-7/libsvm-svm-toy-qt.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libsvm-svm-toy-qt.desktop 10 Mar 2008 07:43:27 -0000 1.1 +++ libsvm-svm-toy-qt.desktop 10 Mar 2008 23:52:44 -0000 1.2 @@ -7,4 +7,4 @@ StartupNotify=true Terminal=false Type=Application -Categories=QT;Education;Science;Math;DataVisualization +Categories=KDE;Education;Science;Math;DataVisualization Index: libsvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libsvm/F-7/libsvm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libsvm.spec 10 Mar 2008 07:43:27 -0000 1.11 +++ libsvm.spec 10 Mar 2008 23:52:44 -0000 1.12 @@ -1,6 +1,6 @@ Name: libsvm Version: 2.85 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A Library for Support Vector Machines Group: Development/Libraries @@ -99,8 +99,8 @@ cp %{SOURCE2} . cp %{SOURCE3} . cp %{SOURCE4} . -cp %{SOURCE5} libsvm-svm-toy-gtk-48.png -cp %{SOURCE5} libsvm-svm-toy-qt-48.png +cp %{SOURCE5} %{name}-svm-toy-gtk-48.png +cp %{SOURCE5} %{name}-svm-toy-qt-48.png @@ -121,13 +121,16 @@ #cd ${RPM_BUILD_ROOT}%{libdir_libsvm}; ln -sf %{name}.so.%{version} %{name}.so rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ -cp libsvm-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ -cp libsvm-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +cp %{name}-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +cp %{name}-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications +cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications desktop-file-install --delete-original --vendor=fedora \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-gtk.desktop \ - ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-qt.desktop \ + ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \ + ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop \ @@ -186,17 +189,22 @@ %defattr(-,root,root,-) %doc svm-toy/gtk/README %{_bindir}/svm-toy-gtk -%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-gtk-48.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-gtk-48.png +%{_datadir}/applications/fedora-%{name}-svm-toy-gtk.desktop %files svm-toy-qt %defattr(-,root,root,-) %doc svm-toy/qt/README %{_bindir}/svm-toy-qt -%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-qt-48.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-qt-48.png +%{_datadir}/applications/fedora-%{name}-svm-toy-qt.desktop %changelog -* Tue Feb 11 2008 Ding-Yi Chen - 2.85-5 +* Tue Mar 11 2008 Ding-Yi Chen - 2.85-6 +- Add desktop files in install section. + +* Mon Mar 10 2008 Ding-Yi Chen - 2.85-5 - [Bug 436392]: Fix by copy from right place. - Add desktop files and icons for svm-toy-gtk and svm-toy-qt From fedora-extras-commits at redhat.com Mon Mar 10 23:55:57 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 23:55:57 GMT Subject: rpms/gedit/devel .cvsignore, 1.72, 1.73 gedit.spec, 1.152, 1.153 sources, 1.74, 1.75 Message-ID: <200803102355.m2ANtvjO031711@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31617 Modified Files: .cvsignore gedit.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gedit/devel/.cvsignore,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- .cvsignore 26 Feb 2008 04:16:14 -0000 1.72 +++ .cvsignore 10 Mar 2008 23:55:09 -0000 1.73 @@ -1 +1 @@ -gedit-2.21.2.tar.bz2 +gedit-2.22.0.tar.bz2 Index: gedit.spec =================================================================== RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- gedit.spec 7 Mar 2008 03:54:12 -0000 1.152 +++ gedit.spec 10 Mar 2008 23:55:09 -0000 1.153 @@ -17,12 +17,12 @@ Summary: gEdit is a small but powerful text editor for GNOME Name: gedit -Version: 2.21.2 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: Applications/Editors -Source0: http://download.gnome.org/sources/gedit/2.21/gedit-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gedit/2.22/gedit-%{version}.tar.bz2 URL: http://gedit.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -193,6 +193,9 @@ %changelog +* Mon Mar 10 2008 Matthias Clasen - 1:2.22.0-1 +- Update to 2.22.0 + * Thu Mar 6 2008 Matthias Clasen - 1:2.21.2-2 - Don't OnlyShowIn=GNOME Index: sources =================================================================== RCS file: /cvs/extras/rpms/gedit/devel/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 26 Feb 2008 04:16:14 -0000 1.74 +++ sources 10 Mar 2008 23:55:09 -0000 1.75 @@ -1 +1 @@ -fb4b37e7449a4a3b9eb768df214fe9b7 gedit-2.21.2.tar.bz2 +ce2e485d7639ed09a3e3b5a791df805a gedit-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 10 23:56:21 2008 From: fedora-extras-commits at redhat.com (Ding-Yi Chen (dchen)) Date: Mon, 10 Mar 2008 23:56:21 GMT Subject: rpms/libsvm/F-8 libsvm-svm-toy-qt.desktop, 1.1, 1.2 libsvm.spec, 1.14, 1.15 Message-ID: <200803102356.m2ANuLFA031769@cvs-int.fedora.redhat.com> Author: dchen Update of /cvs/pkgs/rpms/libsvm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31680/F-8 Modified Files: libsvm-svm-toy-qt.desktop libsvm.spec Log Message: Add desktop files in install section Index: libsvm-svm-toy-qt.desktop =================================================================== RCS file: /cvs/pkgs/rpms/libsvm/F-8/libsvm-svm-toy-qt.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libsvm-svm-toy-qt.desktop 10 Mar 2008 07:49:46 -0000 1.1 +++ libsvm-svm-toy-qt.desktop 10 Mar 2008 23:55:46 -0000 1.2 @@ -7,4 +7,4 @@ StartupNotify=true Terminal=false Type=Application -Categories=QT;Education;Science;Math;DataVisualization +Categories=KDE;Education;Science;Math;DataVisualization Index: libsvm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libsvm/F-8/libsvm.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libsvm.spec 10 Mar 2008 07:49:46 -0000 1.14 +++ libsvm.spec 10 Mar 2008 23:55:46 -0000 1.15 @@ -1,6 +1,6 @@ Name: libsvm Version: 2.85 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A Library for Support Vector Machines Group: Development/Libraries @@ -99,8 +99,8 @@ cp %{SOURCE2} . cp %{SOURCE3} . cp %{SOURCE4} . -cp %{SOURCE5} libsvm-svm-toy-gtk-48.png -cp %{SOURCE5} libsvm-svm-toy-qt-48.png +cp %{SOURCE5} %{name}-svm-toy-gtk-48.png +cp %{SOURCE5} %{name}-svm-toy-qt-48.png @@ -121,13 +121,16 @@ #cd ${RPM_BUILD_ROOT}%{libdir_libsvm}; ln -sf %{name}.so.%{version} %{name}.so rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ -cp libsvm-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ -cp libsvm-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +cp %{name}-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +cp %{name}-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications +cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications desktop-file-install --delete-original --vendor=fedora \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-gtk.desktop \ - ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-qt.desktop \ + ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \ + ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop \ @@ -186,17 +189,22 @@ %defattr(-,root,root,-) %doc svm-toy/gtk/README %{_bindir}/svm-toy-gtk -%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-gtk-48.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-gtk-48.png +%{_datadir}/applications/fedora-%{name}-svm-toy-gtk.desktop %files svm-toy-qt %defattr(-,root,root,-) %doc svm-toy/qt/README %{_bindir}/svm-toy-qt -%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-qt-48.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-qt-48.png +%{_datadir}/applications/fedora-%{name}-svm-toy-qt.desktop %changelog -* Tue Feb 11 2008 Ding-Yi Chen - 2.85-5 +* Tue Mar 11 2008 Ding-Yi Chen - 2.85-6 +- Add desktop files in install section. + +* Mon Mar 10 2008 Ding-Yi Chen - 2.85-5 - [Bug 436392]: Fix by copy from right place. - Add desktop files and icons for svm-toy-gtk and svm-toy-qt From fedora-extras-commits at redhat.com Mon Mar 10 23:57:48 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Mon, 10 Mar 2008 23:57:48 GMT Subject: rpms/python-virtinst/devel .cvsignore, 1.13, 1.14 python-virtinst.spec, 1.35, 1.36 sources, 1.13, 1.14 Message-ID: <200803102357.m2ANvmSh031884@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/python-virtinst/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31828 Modified Files: .cvsignore python-virtinst.spec sources Log Message: Update to 0.300.3 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 11 Jan 2008 01:42:21 -0000 1.13 +++ .cvsignore 10 Mar 2008 23:57:12 -0000 1.14 @@ -1,3 +1,4 @@ .build*.log *.rpm -virtinst-0.300.2.tar.gz +noarch +virtinst-0.300.3.tar.gz Index: python-virtinst.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- python-virtinst.spec 31 Jan 2008 17:05:48 -0000 1.35 +++ python-virtinst.spec 10 Mar 2008 23:57:12 -0000 1.36 @@ -10,8 +10,8 @@ Summary: Python modules for starting Xen guest installations Name: python-%{appname} -Version: 0.300.2 -Release: 3%{_extra_release} +Version: 0.300.3 +Release: 1%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz License: GPLv2+ Group: Development/Libraries @@ -72,6 +72,9 @@ %{_bindir}/virt-image %changelog +* Mon Mar 10 2008 Daniel P. Berrange - 0.300.3-1.fc9 +- Update to 0.300.3 release + * Thu Jan 31 2008 Daniel P. Berrange - 0.300.2-3.fc9 - Disable virt-viewer dep to allow non-X installs (rhbz #387971) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-virtinst/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 11 Jan 2008 01:42:21 -0000 1.13 +++ sources 10 Mar 2008 23:57:12 -0000 1.14 @@ -1 +1 @@ -7ad88b898f970cafe5ad32ccfab4fcf3 virtinst-0.300.2.tar.gz +6354d7c10f5167fbcc03e29280165b27 virtinst-0.300.3.tar.gz From fedora-extras-commits at redhat.com Mon Mar 10 23:58:16 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Mon, 10 Mar 2008 23:58:16 GMT Subject: rpms/cheese/devel .cvsignore, 1.6, 1.7 cheese.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <200803102358.m2ANwGWY031928@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/cheese/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31860 Modified Files: .cvsignore cheese.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cheese/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Feb 2008 05:23:50 -0000 1.6 +++ .cvsignore 10 Mar 2008 23:57:38 -0000 1.7 @@ -1 +1 @@ -cheese-2.21.92.tar.bz2 +cheese-2.22.0.tar.bz2 Index: cheese.spec =================================================================== RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cheese.spec 26 Feb 2008 05:51:48 -0000 1.15 +++ cheese.spec 10 Mar 2008 23:57:38 -0000 1.16 @@ -1,12 +1,12 @@ Name: cheese -Version: 2.21.92 +Version: 2.22.0 Release: 1%{?dist} Summary: A webcam application for snapshots and movies Group: Amusements/Graphics License: GPLv2+ URL: http://live.gnome.org/Cheese -Source0: http://download.gnome.org/sources/cheese/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/cheese/2.22/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.10.0 @@ -107,6 +107,9 @@ %{_libexecdir}/cheese %changelog +* Mon Mar 10 2008 Matthias Clasen 2.22.0-1 +- Update to 2.22.0 + * Tue Feb 26 2008 Matthias Clasen 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cheese/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Feb 2008 05:23:50 -0000 1.6 +++ sources 10 Mar 2008 23:57:38 -0000 1.7 @@ -1 +1 @@ -32caaf7c03317e7825049012b132fdea cheese-2.21.92.tar.bz2 +94aa1c9837d011c94e4c44d922cd4ea7 cheese-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 00:12:10 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 11 Mar 2008 00:12:10 GMT Subject: rpms/z88dk/devel z88dk.spec,1.14,1.15 Message-ID: <200803110012.m2B0CA24006957@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/z88dk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6901/devel Modified Files: z88dk.spec Log Message: Need -p1 instead of -p0 for the updated patch. Index: z88dk.spec =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- z88dk.spec 10 Mar 2008 23:47:56 -0000 1.14 +++ z88dk.spec 11 Mar 2008 00:11:24 -0000 1.15 @@ -19,7 +19,7 @@ %prep %setup -q -n z88dk # Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk -%patch0 -p0 +%patch0 -p1 # Lots of buggy makefiles there %patch1 -p1 # 64-bit fixes From fedora-extras-commits at redhat.com Tue Mar 11 00:14:10 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 11 Mar 2008 00:14:10 GMT Subject: rpms/twitux/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 twitux.spec, 1.4, 1.5 twitux-libsoup24.patch, 1.1, NONE Message-ID: <200803110014.m2B0EAUo007005@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/twitux/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979 Modified Files: .cvsignore sources twitux.spec Removed Files: twitux-libsoup24.patch Log Message: * Mon Mar 10 2008 Brian Pepple - 0.61-1 - Update to 0.61. - Add minimum requirements for glib2-devel & libsoup-devel. - Drop libsoup patch, fixed upstream. - Drop BR on libgnomeui-devel & openssl-devel. - Update url & source, and other minor formatting changes. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/twitux/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2008 18:31:41 -0000 1.2 +++ .cvsignore 11 Mar 2008 00:13:34 -0000 1.3 @@ -1 +1 @@ -twitux-0.60.tar.bz2 +twitux-0.61.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/twitux/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2008 18:31:41 -0000 1.2 +++ sources 11 Mar 2008 00:13:34 -0000 1.3 @@ -1 +1 @@ -0e0770bece93f63e30b443a6ae7d9f21 twitux-0.60.tar.bz2 +a7433890d8f5c778a683533f914c8683 twitux-0.61.tar.bz2 Index: twitux.spec =================================================================== RCS file: /cvs/pkgs/rpms/twitux/devel/twitux.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- twitux.spec 14 Feb 2008 13:30:34 -0000 1.4 +++ twitux.spec 11 Mar 2008 00:13:34 -0000 1.5 @@ -1,21 +1,31 @@ Name: twitux -Version: 0.60 -Release: 4%{?dist} +Version: 0.61 +Release: 1%{?dist} Summary: Twitux is a Twitter client for the Gnome desktop Group: Applications/Internet License: GPLv2+ -URL: http://live.gnome.org/DanielMorales/Twitux -Source0: http://suruware.com/twitux/twitux-%{version}.tar.bz2 -Patch0: %{name}-libsoup24.patch +URL: http://sourceforge.net/projects/twitux/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl-XML-Parser, libsexy-devel, aspell-devel, iso-codes-devel -BuildRequires: openssl-devel, GConf2-devel, libsoup-devel, libnotify-devel -BuildRequires: gettext, desktop-file-utils, libglade2-devel, libgnomeui-devel -BuildRequires: gnome-keyring-devel, dbus-devel +BuildRequires: libglade2-devel +BuildRequires: gnome-keyring-devel +BuildRequires: dbus-devel +BuildRequires: libsexy-devel +BuildRequires: GConf2-devel +BuildRequires: libsoup-devel >= 2.3.4 +BuildRequires: libnotify-devel +BuildRequires: glib2-devel >= 2.15.5 +BuildRequires: aspell-devel +BuildRequires: iso-codes-devel +BuildRequires: gettext +BuildRequires: perl-XML-Parser +BuildRequires: desktop-file-utils + Requires(pre): GConf2 -Requires(post): GConf2, desktop-file-utils +Requires(post): GConf2 +Requires(post): desktop-file-utils Requires(preun):GConf2 Requires(postun): desktop-file-utils @@ -26,7 +36,6 @@ %prep %setup -q -%patch0 -p1 -b .libsoup %build @@ -86,14 +95,21 @@ %files -f Twitux.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO -%{_sysconfdir}/gconf/schemas/twitux.schemas -%{_bindir}/* -%{_datadir}/twitux -%{_datadir}/applications/* +%{_bindir}/%{name} +%{_datadir}/%{name}/ +%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/twitux.* +%{_sysconfdir}/gconf/schemas/%{name}.schemas %changelog +* Mon Mar 10 2008 Brian Pepple - 0.61-1 +- Update to 0.61. +- Add minimum requirements for glib2-devel & libsoup-devel. +- Drop libsoup patch, fixed upstream. +- Drop BR on libgnomeui-devel & openssl-devel. +- Update url & source, and other minor formatting changes. + * Thu Feb 14 2008 Brian Pepple - 0.60-4 - Rebuild for new libsoup. --- twitux-libsoup24.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 00:30:08 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 11 Mar 2008 00:30:08 GMT Subject: rpms/z88dk/devel z88dk-1.8-makefile-usr-share.patch, 1.1, 1.2 z88dk.spec, 1.15, 1.16 Message-ID: <200803110030.m2B0U8MS007359@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/z88dk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7336/devel Modified Files: z88dk-1.8-makefile-usr-share.patch z88dk.spec Log Message: - use DESTDIR instead of makeinstall macro (fixes buildroot in .cfg files) z88dk-1.8-makefile-usr-share.patch: Index: z88dk-1.8-makefile-usr-share.patch =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk-1.8-makefile-usr-share.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- z88dk-1.8-makefile-usr-share.patch 10 Mar 2008 23:47:56 -0000 1.1 +++ z88dk-1.8-makefile-usr-share.patch 11 Mar 2008 00:30:03 -0000 1.2 @@ -1,6 +1,6 @@ diff -ur z88dk/Makefile z88dk-makefile-usr-share/Makefile --- z88dk/Makefile 2008-03-01 16:06:51.000000000 +0100 -+++ z88dk-makefile-usr-share/Makefile 2008-03-11 00:45:08.000000000 +0100 ++++ z88dk-makefile-usr-share/Makefile 2008-03-11 01:27:29.000000000 +0100 @@ -7,7 +7,7 @@ # ---> Configurable parameters are below his point @@ -26,9 +26,9 @@ - mkdir -p $(prefix)/lib/z88dk/lib/clibs - cp -R lib/clibs/* $(prefix)/lib/z88dk/lib/clibs/ - find $(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644 -+ mkdir -p $(prefix_share)/z88dk/lib/clibs -+ cp -R lib/clibs/* $(prefix_share)/z88dk/lib/clibs/ -+ find $(prefix_share)/z88dk/lib/clibs -type f | xargs chmod 644 ++ mkdir -p $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs ++ cp -R lib/clibs/* $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs/ ++ find $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs -type f | xargs chmod 644 install: Index: z88dk.spec =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- z88dk.spec 11 Mar 2008 00:11:24 -0000 1.15 +++ z88dk.spec 11 Mar 2008 00:30:03 -0000 1.16 @@ -19,6 +19,7 @@ %prep %setup -q -n z88dk # Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk +# Also support DESTDIR in install-libs %patch0 -p1 # Lots of buggy makefiles there %patch1 -p1 @@ -51,7 +52,7 @@ export ZCCCFG=%{_datadir}/z88dk-%{version}/lib/config/ %{__rm} -rf %{buildroot} %{__mkdir} %{buildroot} -%{makeinstall} install-libs +%{__make} install install-libs DESTDIR=%{buildroot} %{__mkdir_p} %{buildroot}%{_mandir}/man3z %{__cp} -p netman/man3z/* %{buildroot}%{_mandir}/man3z @@ -81,6 +82,7 @@ - update makefile-fixes patch (most issues fixed upstream, only one left) - update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch - remove redundant sed (already covered by above patch) +- use DESTDIR instead of makeinstall macro (fixes buildroot in .cfg files) * Sat Feb 9 2008 Kevin Kofler - 1.7-3 - rebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 00:30:57 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Tue, 11 Mar 2008 00:30:57 GMT Subject: rpms/xorg-x11-drv-glint/devel glint-pciaccess.patch, NONE, 1.1 xorg-x11-drv-glint.spec, 1.18, 1.19 Message-ID: <200803110030.m2B0Uvq4007433@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-glint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7375 Modified Files: xorg-x11-drv-glint.spec Added Files: glint-pciaccess.patch Log Message: * Tue Mar 11 2008 Dave Airlie 1.1.1-9 - pciaccess conversion glint-pciaccess.patch: --- NEW FILE glint-pciaccess.patch --- diff --git a/configure.ac b/configure.ac index e672296..2f9eeec 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,12 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. +SAVE_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" +AC_CHECK_DECL(XSERVER_LIBPCIACCESS, + [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], + [#include "xorg-server.h"]) +CPPFLAGS="$SAVE_CPPFLAGS" # Checks for header files. AC_HEADER_STDC @@ -96,6 +102,13 @@ if test "$DRI" = yes; then AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) fi +if test "x$XSERVER_LIBPCIACCESS" = xyes; then + PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) + XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" +fi +AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + + AC_SUBST([DRI_CFLAGS]) AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) diff --git a/src/glint.h b/src/glint.h index 1cf7f45..54f9d18 100644 --- a/src/glint.h +++ b/src/glint.h @@ -30,13 +30,19 @@ #ifndef _GLINT_H_ #define _GLINT_H_ +#include +#include +#include + +#include "glintpcirename.h" + #include "xaa.h" #include "xf86RamDac.h" #include "xf86cmap.h" #include "xf86i2c.h" #include "xf86DDC.h" #include "xf86xv.h" -#ifdef XF86DRI +#ifdef XF86DRI_DEVEL #include "xf86drm.h" #include "sarea.h" #define _XF86DRI_SERVER_ @@ -44,18 +50,15 @@ #include "GL/glxint.h" #include "glint_dripriv.h" #endif -#include -#include -#include #define GLINT_MAX_MULTI_DEVICES 2 #define GLINT_VERSION 4000 #define GLINT_NAME "GLINT" #define GLINT_DRIVER_NAME "glint" -#define GLINT_MAJOR_VERSION 1 -#define GLINT_MINOR_VERSION 1 -#define GLINT_PATCHLEVEL 1 +#define GLINT_MAJOR_VERSION PACKAGE_VERSION_MAJOR +#define GLINT_MINOR_VERSION PACKAGE_VERSION_MINOR +#define GLINT_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL typedef struct { CARD32 glintRegs[0x2000]; @@ -77,7 +80,9 @@ typedef struct { int numMultiDevices; int MultiChip; Bool MultiAperture; +#ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; +#endif EntityInfoPtr pEnt; GLINTEntPtr entityPrivate; RamDacHelperRecPtr RamDac; @@ -169,7 +174,7 @@ typedef struct { void (*VideoTimerCallback)(ScrnInfoPtr, Time); XF86VideoAdaptorPtr adaptor; int videoKey; -#ifdef XF86DRI +#ifdef XF86DRI_DEVEL Bool directRenderingEnabled; Bool PCIMode; DRIInfoPtr pDRIInfo; diff --git a/src/glint_dri.c b/src/glint_dri.c index fae1c80..b244b73 100644 --- a/src/glint_dri.c +++ b/src/glint_dri.c @@ -489,16 +489,18 @@ GLINTDRIScreenInit(ScreenPtr pScreen) if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) { pDRIInfo->busIdString = DRICreatePCIBusID(pGlint->PciInfo); } else { +#ifndef XSERVER_LIBPCIACCESS pDRIInfo->busIdString = xalloc(64); /* Freed in DRIDestroyInfoRec */ sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d", ((pciConfigPtr)pGlint->PciInfo->thisCard)->busnum, ((pciConfigPtr)pGlint->PciInfo->thisCard)->devnum, ((pciConfigPtr)pGlint->PciInfo->thisCard)->funcnum); +#endif } pDRIInfo->ddxDriverMajorVersion = GLINT_MAJOR_VERSION; pDRIInfo->ddxDriverMinorVersion = GLINT_MINOR_VERSION; pDRIInfo->ddxDriverPatchVersion = GLINT_PATCHLEVEL; - pDRIInfo->frameBufferPhysicalAddress = pGlint->FbAddress; + pDRIInfo->frameBufferPhysicalAddress = (pointer) pGlint->FbAddress; pDRIInfo->frameBufferSize = pGlint->FbMapSize; pDRIInfo->frameBufferStride = pScrn->displayWidth * (pScrn->bitsPerPixel >> 3); @@ -775,12 +777,9 @@ GLINTDRIScreenInit(ScreenPtr pScreen) if (pGlint->irq <= 0) { pGlint->irq = drmGetInterruptFromBusID(pGlint->drmSubFD, - ((pciConfigPtr)pGlint->PciInfo - ->thisCard)->busnum, - ((pciConfigPtr)pGlint->PciInfo - ->thisCard)->devnum, - ((pciConfigPtr)pGlint->PciInfo - ->thisCard)->funcnum); + PCI_CFG_BUS(pGlint->PciInfo), + PCI_CFG_DEV(pGlint->PciInfo), + PCI_CFG_FUNC(pGlint->PciInfo)); } return TRUE; diff --git a/src/glint_driver.c b/src/glint_driver.c index a1e2b3c..8f2bb76 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -344,7 +344,7 @@ const char *GLINTint10Symbols[] = { #ifdef XFree86LOADER -#ifdef XF86DRI +#ifdef XF86DRI_DEVEL static const char *drmSymbols[] = { "drmAddBufs", "drmAddMap", @@ -414,7 +414,7 @@ glintSetup(pointer module, pointer opts, int *errmaj, int *errmin) xaaSymbols, xf8_32bppSymbols, shadowSymbols, fbdevHWSymbols, GLINTint10Symbols, vbeSymbols, ramdacSymbols, -#ifdef XF86DRI +#ifdef XF86DRI_DEVEL drmSymbols, driSymbols, #endif NULL); @@ -651,10 +651,12 @@ GLINTProbe(DriverPtr drv, int flags) &devSections)) <= 0) { return FALSE; } - + +#ifndef XSERVER_LIBPCIACCESS checkusedPci = xf86GetPciVideoInfo(); - if (checkusedPci == NULL && devSections /* for xf86DoProbe */) { + if (checkusedPci == NULL && devSections /* for xf86DoProbe */) + { /* * Changed the behaviour to try probing using the FBDev support * when no PCI cards have been found. This is for systems without @@ -721,8 +723,9 @@ GLINTProbe(DriverPtr drv, int flags) xfree(devSections); - } else if (checkusedPci) { - + } else if (checkusedPci) +#endif +{ if (flags & PROBE_DETECT) { /* HACK, Currently when -configuring, we only return VGA * based chips. Manual configuring is necessary to poke @@ -745,8 +748,8 @@ GLINTProbe(DriverPtr drv, int flags) if (!(flags & PROBE_DETECT)) for (i = 0; i < numUsed; i++) { ScrnInfoPtr pScrn = NULL; - GLINTEntPtr pGlintEnt = NULL; - DevUnion *pPriv; + GLINTEntPtr pGlintEnt = NULL; + DevUnion *pPriv; pPci = xf86GetPciInfoForEntity(usedChips[i]); /* Allocate a ScrnInfoRec and claim the slot */ @@ -756,14 +759,16 @@ GLINTProbe(DriverPtr drv, int flags) /* Claim specifics, when we KNOW ! the board */ - +#ifndef XSERVER_LIBPCIACCESS /* Appian Jeronimo J2000 */ - if ((pPci->subsysVendor == 0x1097) && - (pPci->subsysCard == 0x3d32)) { + if ((PCI_SUB_VENDOR_ID(pPci) == 0x1097) && + (PCI_SUB_DEVICE_ID(pPci) == 0x3d32)) { int eIndex; + int init_func; + if (!xf86IsEntityShared(usedChips[i])) { eIndex = xf86ClaimPciSlot(pPci->bus, - pPci->device, + pPci->device, 1, drv, -1 /* XXX */, NULL, FALSE); @@ -778,15 +783,15 @@ GLINTProbe(DriverPtr drv, int flags) } } else /* Only claim other chips when GAMMA is used */ - if ((pPci->chipType == PCI_CHIP_GAMMA) || - (pPci->chipType == PCI_CHIP_GAMMA2) || - (pPci->chipType == PCI_CHIP_DELTA)) { + if ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA2) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_DELTA)) { while (*checkusedPci != NULL) { int eIndex; /* make sure we claim all but our source device */ - if ((pPci->bus == (*checkusedPci)->bus && - pPci->device == (*checkusedPci)->device) && - pPci->func != (*checkusedPci)->func) { + if ((pPci->bus == PCI_DEV_BUS(*checkusedPci) && + pPci->device == PCI_DEV_DEV((*checkusedPci)) && + pPci->func != PCI_DEV_FUNC(*checkusedPci))) { /* Claim other entities on the same card */ eIndex = xf86ClaimPciSlot((*checkusedPci)->bus, @@ -799,9 +804,9 @@ GLINTProbe(DriverPtr drv, int flags) xf86AddEntityToScreen(pScrn,eIndex); } else { ErrorF("BusID %d:%d:%d already claimed\n", - (*checkusedPci)->bus, - (*checkusedPci)->device, - (*checkusedPci)->func); + PCI_DEV_BUS(*checkusedPci), + PCI_DEV_DEV(*checkusedPci), + PCI_DEV_FUNC(*checkusedPci)); xfree(usedChips); return FALSE; } @@ -809,6 +814,7 @@ GLINTProbe(DriverPtr drv, int flags) checkusedPci++; } } +#endif /* Fill in what we can of the ScrnInfoRec */ pScrn->driverVersion = GLINT_VERSION; @@ -825,8 +831,8 @@ GLINTProbe(DriverPtr drv, int flags) /* Allow sharing if Appian J2000 detected */ /* (later Diamond FireGL3000 support too) */ - if ((pPci->subsysVendor == 0x1097) && - (pPci->subsysCard == 0x3d32)) { + if ((PCI_SUB_VENDOR_ID(pPci) == 0x1097) && + (PCI_SUB_DEVICE_ID(pPci) == 0x3d32)) { xf86SetEntitySharable(usedChips[i]); /* Allocate an entity private if necessary */ if (GLINTEntityIndex < 0) @@ -1031,8 +1037,10 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) if (pGlint->pEnt->location.type == BUS_PCI) { pGlint->PciInfo = xf86GetPciInfoForEntity(pGlint->pEnt->index); +#ifndef XSERVER_LIBPCIACCESS pGlint->PciTag = pciTag(pGlint->PciInfo->bus, pGlint->PciInfo->device, pGlint->PciInfo->func); +#endif } pGlint->InFifoSpace = 0; /* Force a Read of FIFO space on first run */ @@ -1046,14 +1054,14 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) for (i = 1; i < pScrn->numEntities; i++) { pEnt = xf86GetEntityInfo(pScrn->entityList[i]); pPci = xf86GetPciInfoForEntity(pEnt->index); - if ( (pPci->chipType == PCI_CHIP_MX) || - (pPci->chipType == PCI_CHIP_PERMEDIA) || - (pPci->chipType == PCI_CHIP_TI_PERMEDIA) || - (pPci->chipType == PCI_CHIP_500TX) || - (pPci->chipType == PCI_CHIP_300SX) || - (pPci->chipType == PCI_CHIP_R4) || - (pPci->chipType == PCI_CHIP_PERMEDIA3) ) { - pGlint->MultiChip = pPci->chipType; + if ( (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_MX) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_PERMEDIA) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_TI_PERMEDIA) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_500TX) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_300SX) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_R4) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_PERMEDIA3) ) { + pGlint->MultiChip = PCI_DEV_DEVICE_ID(pPci); if (pGlint->numMultiDevices >= GLINT_MAX_MULTI_DEVICES) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "%d multiple chips unsupported, aborting. (Max - 2)\n", @@ -1071,9 +1079,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]); pciVideoPtr pPci = xf86GetPciInfoForEntity(pEnt->index); - if ( ((pPci->chipType == PCI_CHIP_GAMMA) || - (pPci->chipType == PCI_CHIP_GAMMA2) || - (pPci->chipType == PCI_CHIP_DELTA)) && + if ( ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA2) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_DELTA)) && (pGlint->numMultiDevices == 0) ) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Gamma/Delta with ZERO connected chips, aborting\n"); @@ -1085,9 +1093,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]); pciVideoPtr pPci = xf86GetPciInfoForEntity(pEnt->index); - if ((pPci->chipType != PCI_CHIP_GAMMA) && - (pPci->chipType != PCI_CHIP_GAMMA2) && - (pPci->chipType != PCI_CHIP_DELTA)) { + if ((PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_GAMMA) && + (PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_GAMMA2) && + (PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_DELTA)) { GLINTProbeDDC(pScrn, pGlint->pEnt->index); return TRUE; } else @@ -1314,8 +1322,8 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) pGlint->Chipset); } else { from = X_PROBED; - pGlint->Chipset = pGlint->PciInfo->vendor << 16 | - pGlint->PciInfo->chipType; + pGlint->Chipset = PCI_DEV_VENDOR_ID(pGlint->PciInfo) << 16 | + PCI_DEV_DEVICE_ID(pGlint->PciInfo); pScrn->chipset = (char *)xf86TokenToString(GLINTChipsets, pGlint->Chipset); } @@ -1324,7 +1332,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n", pGlint->ChipRev); } else { - pGlint->ChipRev = pGlint->PciInfo->chipRev; + pGlint->ChipRev = PCI_DEV_REVISION(pGlint->PciInfo); } } @@ -1370,7 +1378,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) pGlint->FbAddress = pGlint->pEnt->device->MemBase; from = X_CONFIG; } else { - pGlint->FbAddress = pGlint->PciInfo->memBase[2] & 0xFF800000; + pGlint->FbAddress = PCI_REGION_BASE(pGlint->PciInfo, 2, REGION_MEM) & 0xFF800000; } if (pGlint->FbAddress) @@ -1380,11 +1388,11 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) /* Trap GAMMA & DELTA specification, with no linear address */ /* Find the first GLINT chip and use that address */ if (pGlint->FbAddress == 0) { - if (pGlint->MultiPciInfo[0]->memBase[2]) { - pGlint->FbAddress = pGlint->MultiPciInfo[0]->memBase[2]; + if (PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM)) { + pGlint->FbAddress = PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM); xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "FrameBuffer used from first rasterizer chip at 0x%lx\n", - pGlint->MultiPciInfo[0]->memBase[2]); + PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM)); } else { xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "No FrameBuffer memory - aborting\n"); @@ -1400,7 +1408,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) pGlint->IOAddress = pGlint->pEnt->device->IOBase; from = X_CONFIG; } else { - pGlint->IOAddress = pGlint->PciInfo->memBase[0] & 0xFFFFC000; + pGlint->IOAddress = PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0, REGION_MEM) & 0xFFFFC000; } if ((IS_J2000) && (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)) { @@ -1484,12 +1492,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) /* Delta has a bug, we need to fix it here */ { int basecopro = - pGlint->MultiPciInfo[0]->memBase[0] & 0xFFFFC000; - int basedelta = pGlint->PciInfo->memBase[0] & 0xFFFFC000; - int glintdelta = pGlint->PciTag; - int glintcopro = pciTag(pGlint->MultiPciInfo[0]->bus, - pGlint->MultiPciInfo[0]->device, - pGlint->MultiPciInfo[0]->func); + PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0, REGION_MEM) & 0xFFFFC000; + int basedelta = PCI_REGION_BASE(pGlint->PciInfo, 0, REGION_MEM) & 0xFFFFC000; + int dummy; int base3copro, offset; if( (basedelta & 0x20000) ^ (basecopro & 0x20000) ) { @@ -1499,7 +1504,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) } else { offset = 0x1c; /* base3 */ } - base3copro = pciReadLong(glintcopro, offset); + PCI_READ_LONG(pGlint->MultiPciInfo[0], &base3copro, offset); if( (basecopro & 0x20000) ^ (base3copro & 0x20000) ) { /* * oops, still different; we know that base3 @@ -1515,25 +1520,27 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) * read value * write new value */ - (void) pciReadLong(glintdelta, 0x10); - pciWriteLong(glintdelta, 0x10, 0xffffffff); - (void) pciReadLong(glintdelta, 0x10); - pciWriteLong(glintdelta, 0x10, base3copro); + PCI_READ_LONG(pGlint->PciInfo, &dummy, 0x10); + PCI_WRITE_LONG(pGlint->PciInfo, 0xffffffff, 0x10); + PCI_READ_LONG(pGlint->PciInfo, &dummy, 0x10); + PCI_WRITE_LONG(pGlint->PciInfo, base3copro, 0x10); /* * additionally,sometimes we see the baserom which might * confuse the chip, so let's make sure that is disabled */ - (void) pciReadLong(glintcopro, 0x30); - pciWriteLong(glintcopro, 0x30, 0xffffffff); - (void) pciReadLong(glintcopro, 0x30); - pciWriteLong(glintcopro, 0x30, 0); + PCI_READ_LONG(pGlint->MultiPciInfo[0], &dummy, 0x30); + PCI_WRITE_LONG(pGlint->MultiPciInfo[0], 0xffffffff, 0x30); + PCI_READ_LONG(pGlint->MultiPciInfo[0], &dummy, 0x30); + PCI_WRITE_LONG(pGlint->MultiPciInfo[0], 0, 0x30); /* * now update our internal structure accordingly */ - pGlint->IOAddress = - pGlint->PciInfo->memBase[0] = base3copro; + pGlint->IOAddress = base3copro; +#ifndef XSERVER_LIBPCIACCESS + pGlint->memBase[0] = base3copro; +#endif xf86DrvMsg(pScrn->scrnIndex, from, "Delta Bug - Changing MMIO registers to 0x%lX\n", (unsigned long)pGlint->IOAddress); @@ -2458,17 +2465,47 @@ GLINTMapMem(ScrnInfoPtr pScrn) * Map IO registers to virtual address space * We always map VGA IO registers - even if we don't need them */ +#ifndef XSERVER_LIBPCIACCESS pGlint->IOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO_32BIT, pGlint->PciTag, pGlint->IOAddress, 0x20000); +#else + { + void** result = (void**)&pGlint->IOBase; + int err = pci_device_map_range(pGlint->PciInfo, + pGlint->IOAddress, + 0x20000, + PCI_DEV_MAP_FLAG_WRITABLE, + result); + + if (err) + return FALSE; + } +#endif if (pGlint->IOBase == NULL) return FALSE; if (pGlint->FbMapSize != 0) { +#ifndef XSERVER_LIBPCIACCESS pGlint->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, pGlint->PciTag, pGlint->FbAddress, pGlint->FbMapSize); +#else + { + void** result = (void**)&pGlint->FbBase; + int err = pci_device_map_range(pGlint->PciInfo, + pGlint->FbAddress, + pGlint->FbMapSize, + PCI_DEV_MAP_FLAG_WRITABLE | + PCI_DEV_MAP_FLAG_WRITE_COMBINE, + result); + + if (err) + return FALSE; + } + +#endif if (pGlint->FbBase == NULL) return FALSE; } @@ -2503,11 +2540,20 @@ GLINTUnmapMem(ScrnInfoPtr pScrn) /* * Unmap IO registers to virtual address space */ +#ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->IOBase, 0x20000); +#else + pci_device_unmap_range(pGlint->PciInfo, pGlint->IOBase, 0x20000); +#endif pGlint->IOBase = NULL; - if (pGlint->FbBase != NULL) + if (pGlint->FbBase != NULL) { +#ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->FbBase, pGlint->FbMapSize); +#else + pci_device_unmap_range(pGlint->PciInfo, pGlint->FbBase, pGlint->FbMapSize); +#endif + } pGlint->FbBase = NULL; TRACE_EXIT("GLINTUnmapMem"); @@ -2924,7 +2970,7 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) return FALSE; } -#ifdef XF86DRI +#ifdef XF86DRI_DEVEL /* * Setup DRI after visuals have been established, but before fbScreenInit * is called. fbScreenInit will eventually call into the drivers @@ -3153,7 +3199,7 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) xf86DPMSInit(pScreen, (DPMSSetProcPtr)GLINTDisplayPowerManagementSet, 0); -#ifdef XF86DRI +#ifdef XF86DRI_DEVEL if (pGlint->directRenderingEnabled) { /* Now that mi, cfb, drm and others have done their thing, * complete the DRI setup. @@ -3462,7 +3508,7 @@ GLINTCloseScreen(int scrnIndex, ScreenPtr pScreen) GLINTPtr pGlint = GLINTPTR(pScrn); TRACE_ENTER("GLINTCloseScreen"); -#ifdef XF86DRI +#ifdef XF86DRI_DEVEL if (pGlint->directRenderingEnabled) { GLINTDRICloseScreen(pScreen); } diff --git a/src/glint_regs.h b/src/glint_regs.h index 122832d..426e9ae 100644 --- a/src/glint_regs.h +++ b/src/glint_regs.h @@ -34,46 +34,46 @@ #define PCI_CHIP_3DLABS_GAMMA2 0x0E /* The boards we know */ -#define IS_GLORIAXXL ((pGlint->PciInfo->subsysVendor == 0x1048) && \ - (pGlint->PciInfo->subsysCard == 0x0a42)) +#define IS_GLORIAXXL ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \ + (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0a42)) -#define IS_GLORIASYNERGY ((pGlint->PciInfo->subsysVendor == 0x1048) && \ - (pGlint->PciInfo->subsysCard == 0x0a32)) +#define IS_GLORIASYNERGY ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \ + (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0a32)) -#define IS_GMX2000 ((pGlint->PciInfo->subsysVendor == 0x3d3d) && \ - (pGlint->PciInfo->subsysCard == 0x0106)) +#define IS_GMX2000 ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x3d3d) && \ + (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0106)) -#define IS_J2000 ((pGlint->PciInfo->subsysVendor == 0x1097) && \ - (pGlint->PciInfo->subsysCard == 0x3d32)) +#define IS_J2000 ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1097) && \ + (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x3d32)) -#define IS_JPRO ((pGlint->PciInfo->subsysVendor == 0x1097) && \ - (pGlint->PciInfo->subsysCard == 0x3db3)) +#define IS_JPRO ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1097) && \ + (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x3db3)) /* COMPAQ OEM VX1 PCI * subsys == 0x0121 if VGA is enabled * subsys == 0x000a if VGA has never been enabled */ -#define IS_PCI_QVX1 (pGlint->PciInfo->subsysVendor == 0x3d3d && \ - ((pGlint->PciInfo->subsysCard == 0x0121) || \ - (pGlint->PciInfo->subsysCard == 0x000a))) +#define IS_PCI_QVX1 (PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x3d3d && \ + ((PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0121) || \ + (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x000a))) /* COMPAQ OEM VX1 AGP * subsys == 0x0144 if VGA is enabled * subsys == 0x000c if VGA has never been enabled */ -#define IS_AGP_QVX1 (pGlint->PciInfo->subsysVendor == 0x3d3d && \ - ((pGlint->PciInfo->subsysCard == 0x0144) || \ - (pGlint->PciInfo->subsysCard == 0x000c))) +#define IS_AGP_QVX1 (PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x3d3d && \ + ((PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0144) || \ + (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x000c))) #define IS_QVX1 (IS_PCI_QVX1 || IS_AGP_QVX1) -#define IS_ELSA_SYNERGY ((pGlint->PciInfo->subsysVendor == 0x1048) && \ - (pGlint->PciInfo->subsysCard == 0x0a32)) +#define IS_ELSA_SYNERGY ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \ + (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0a32)) /* COMPAQ OEM Permedia 2V with VGA disable jumper - 0x13e9 ? */ -#define IS_QPM2V ((pGlint->PciInfo->subsysVendor == 0x13e9) && \ - ((pGlint->PciInfo->subsysCard == 0x0100) || \ - (pGlint->PciInfo->subsysCard == 0x0002))) +#define IS_QPM2V ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x13e9) && \ + ((PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0100) || \ + (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0002))) /********************************************** * GLINT 500TX Configuration Region Registers * @@ -1282,7 +1282,7 @@ do{ \ } \ } -#ifndef XF86DRI +#ifndef XF86DRI_DEVEL #define LOADROP(rop) \ { \ if (pGlint->ROP != rop) { \ @@ -1307,7 +1307,7 @@ do{ \ } \ } -#ifndef XF86DRI +#ifndef XF86DRI_DEVEL #define DO_PLANEMASK(planemask) \ { \ if (planemask != pGlint->planemask) { \ diff --git a/src/glintpcirename.h b/src/glintpcirename.h new file mode 100644 index 0000000..c4beac6 --- /dev/null +++ b/src/glintpcirename.h @@ -0,0 +1,122 @@ +/* + * Copyright 2007 George Sapountzis + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess + * library. The main purpose being to facilitate source code compatibility. + */ + +#ifndef SISPCIRENAME_H +#define SISPCIRENAME_H + +enum region_type { + REGION_MEM, + REGION_IO +}; + +#ifndef XSERVER_LIBPCIACCESS + +/* pciVideoPtr */ +#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor) +#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType) +#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev) + +#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor) +#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard) + +#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \ + (_pcidev)->device, \ + (_pcidev)->func) +#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus) +#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device) +#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func) + +/* pciConfigPtr */ +#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag) +#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum) +#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum) +#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum) + +/* region addr: xfree86 uses different fields for memory regions and I/O ports */ +#define PCI_REGION_BASE(_pcidev, _b, _type) \ + (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \ + : (_pcidev)->ioBase[(_b)]) + +/* region size: xfree86 uses the log2 of the region size, + * but with zero meaning no region, not size of one XXX */ +#define PCI_REGION_SIZE(_pcidev, _b) \ + (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0) + +/* read/write PCI configuration space */ +#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \ + *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset)) + +#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \ + *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset)) + +#define PCI_WRITE_LONG(_pcidev, _value, _offset) \ + pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value)) + +#else /* XSERVER_LIBPCIACCESS */ + +typedef struct pci_device *pciVideoPtr; + +#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id) +#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id) +#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision) + +#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id) +#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id) + +/* pci-rework functions take a 'pci_device' parameter instead of a tag */ +#define PCI_DEV_TAG(_pcidev) (_pcidev) + +/* PCI_DEV macros, typically used in printf's, add domain ? XXX */ +#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus) +#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev) +#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func) + +/* pci-rework functions take a 'pci_device' parameter instead of a tag */ +#define PCI_CFG_TAG(_pcidev) (_pcidev) + +/* PCI_CFG macros, typically used in DRI init, contain the domain */ +#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \ + (_pcidev)->bus) +#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev) +#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func) + +#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr) +#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size) + +#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \ + pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset)) + +#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \ + pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset)) + +#define PCI_WRITE_LONG(_pcidev, _value, _offset) \ + pci_device_cfg_write_u32((_pcidev), (_value), (_offset)) + +#endif /* XSERVER_LIBPCIACCESS */ + +#endif /* SISPCIRENAME_H */ diff --git a/src/pm2_video.c b/src/pm2_video.c index e64d991..46d5d74 100644 --- a/src/pm2_video.c +++ b/src/pm2_video.c @@ -41,6 +41,8 @@ #include #include #include +#include +#include #undef MIN #undef ABS @@ -2767,9 +2769,9 @@ NewAdaptorPriv(ScrnInfoPtr pScrn, Bool VideoIO) xvipc.pAPriv = pAPriv; /* Server head ID */ xvipc.op = OP_CONNECT; - xvipc.a = pGlint->PciInfo->bus; - xvipc.b = pGlint->PciInfo->device; - xvipc.c = pGlint->PciInfo->func; + xvipc.a = PCI_DEV_BUS(pGlint->PciInfo); + xvipc.b = PCI_DEV_DEV(pGlint->PciInfo); + xvipc.c = PCI_DEV_FUNC(pGlint->PciInfo); xvipc.d = pScrn->videoRam << 10; /* XF86Config overrides probing */ @@ -3004,8 +3006,10 @@ Permedia2VideoInit(ScreenPtr pScreen) break; } - if (VideoIO) - switch (pciReadLong(pGlint->PciTag, PCI_SUBSYSTEM_ID_REG)) { + if (VideoIO) { + unsigned int temp; + PCI_READ_LONG(pGlint->PciInfo, &temp, PCI_SUBSYSTEM_ID_REG); + switch (temp) { case PCI_SUBSYSTEM_ID_WINNER_2000_P2A: case PCI_SUBSYSTEM_ID_WINNER_2000_P2C: case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2A: @@ -3016,7 +3020,7 @@ Permedia2VideoInit(ScreenPtr pScreen) xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 1, "No Xv vio support for this board\n"); VideoIO = FALSE; } - + } if (pGlint->NoAccel && !VideoIO) return; diff --git a/src/pm3_accel.c b/src/pm3_accel.c index e027c94..ed64669 100644 --- a/src/pm3_accel.c +++ b/src/pm3_accel.c @@ -67,7 +67,7 @@ #define PM3_OTHERWRITEMASK \ (pGlint->PM3_UsingSGRAM ? PM3FBSoftwareWriteMask : PM3FBHardwareWriteMask ) -#ifndef XF86DRI +#ifndef XF86DRI_DEVEL #define PM3_PLANEMASK(planemask) \ { \ if (planemask != pGlint->planemask) { \ diff --git a/src/pm3_dac.c b/src/pm3_dac.c index c390c4d..e11d190 100644 --- a/src/pm3_dac.c +++ b/src/pm3_dac.c @@ -65,10 +65,24 @@ Permedia3MemorySizeDetect(ScrnInfoPtr pScrn) * regardless of memory configuration */ pGlint->FbMapSize = 64*1024*1024; +#ifndef XSERVER_LIBPCIACCESS /* Mark as VIDMEM_MMIO to avoid write-combining while detecting memory */ pGlint->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pGlint->PciTag, pGlint->FbAddress, pGlint->FbMapSize); +#else + { + void** result = (void**)&pGlint->FbBase; + int err = pci_device_map_range(pGlint->PciInfo, + pGlint->FbAddress, + pGlint->FbMapSize, + PCI_DEV_MAP_FLAG_WRITABLE, + result); + + if (err) + return FALSE; + } +#endif if (pGlint->FbBase == NULL) return 0; @@ -119,8 +133,12 @@ Permedia3MemorySizeDetect(ScrnInfoPtr pScrn) GLINT_SLOW_WRITE_REG(temp, PM3MemBypassWriteMask); +#ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->FbBase, pGlint->FbMapSize); +#else + pci_device_unmap_range(pGlint->PciInfo, pGlint->FbBase, pGlint->FbMapSize); +#endif pGlint->FbBase = NULL; pGlint->FbMapSize = 0; @@ -466,10 +484,8 @@ Permedia3Init(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg) if (pGlint->MultiAperture) { STOREREG(GMultGLINTAperture, pGlint->realWidth); - STOREREG(GMultGLINT1, - pGlint->MultiPciInfo[0]->memBase[2] & 0xFF800000); - STOREREG(GMultGLINT2, - pGlint->MultiPciInfo[1]->memBase[2] & 0xFF800000); + STOREREG(GMultGLINT1, PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM) & 0xFF800000); + STOREREG(GMultGLINT2, PCI_REGION_BASE(pGlint->MultiPciInfo[1], 2, REGION_MEM) & 0xFF800000); } STOREREG(PM3MemBypassWriteMask, 0xffffffff); diff --git a/src/tx_accel.c b/src/tx_accel.c index 98dd624..14a689d 100644 --- a/src/tx_accel.c +++ b/src/tx_accel.c @@ -296,7 +296,7 @@ static void TXLoadCoord( ){ GLINTPtr pGlint = GLINTPTR(pScrn); -#ifndef XF86DRI +#ifndef XF86DRI_DEVEL if (w != pGlint->startxsub) { GLINT_WRITE_REG(w<<16, StartXSub); pGlint->startxsub = w; diff --git a/src/tx_dac.c b/src/tx_dac.c index 3ec4888..0ad4ef1 100644 --- a/src/tx_dac.c +++ b/src/tx_dac.c @@ -69,10 +69,8 @@ TXInit(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg) * as incorrect scanline interleaving when software rendering. */ STOREREG(GMultGLINTAperture, pGlint->realWidth); - STOREREG(GMultGLINT1, - pGlint->MultiPciInfo[0]->memBase[2] & 0xFF800000); - STOREREG(GMultGLINT2, - pGlint->MultiPciInfo[1]->memBase[2] & 0xFF800000); + STOREREG(GMultGLINT1, PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM) & 0xFF800000); + STOREREG(GMultGLINT2, PCI_REGION_BASE(pGlint->MultiPciInfo[1], 2, REGION_MEM) & 0xFF800000); } if (IS_GMX2000 || IS_GLORIAXXL) { Index: xorg-x11-drv-glint.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-glint/devel/xorg-x11-drv-glint.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xorg-x11-drv-glint.spec 20 Feb 2008 07:23:35 -0000 1.18 +++ xorg-x11-drv-glint.spec 11 Mar 2008 00:30:23 -0000 1.19 @@ -9,7 +9,7 @@ Summary: Xorg X11 glint video driver Name: xorg-x11-drv-glint Version: 1.1.1 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -18,8 +18,11 @@ Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 Source1: glint.xinf +Patch0: glint-pciaccess.patch + ExcludeArch: s390 s390x +BuildRequires: automake autoconf libtool BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6 %if %{with_dri} BuildRequires: mesa-libGL-devel >= 6.4-4 @@ -34,8 +37,10 @@ %prep %setup -q -n %{tarball}-%{version} +%patch0 -p1 -b .pciaccess %build +autoreconf -v --install %configure --disable-static \ %if ! %{with_dri} --disable-dri @@ -64,6 +69,9 @@ %{_mandir}/man4/glint.4* %changelog +* Tue Mar 11 2008 Dave Airlie 1.1.1-9 +- pciaccess conversion + * Wed Feb 20 2008 Fedora Release Engineering - 1.1.1-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 00:33:03 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 11 Mar 2008 00:33:03 GMT Subject: rpms/gdm/devel gdm.spec, 1.342, 1.343 sources, 1.75, 1.76 gdm-2.21.9-prevent-some-spurious-wakeups.patch, 1.1, NONE gdm-2.21.9-signal.patch, 1.1, NONE gdmthemetester.in, 1.1, NONE Message-ID: <200803110033.m2B0X3Hp007499@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7469 Modified Files: gdm.spec sources Removed Files: gdm-2.21.9-prevent-some-spurious-wakeups.patch gdm-2.21.9-signal.patch gdmthemetester.in Log Message: - Update to 2.21.9 Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.342 retrieving revision 1.343 diff -u -r1.342 -r1.343 --- gdm.spec 10 Mar 2008 14:03:28 -0000 1.342 +++ gdm.spec 11 Mar 2008 00:32:27 -0000 1.343 @@ -4,9 +4,6 @@ %define gtk2_version 2.6.0 %define libglade2_version 2.0.0 %define libgnomeui_version 2.2.0 -%define libgnomecanvas_version 2.0.0 -%define librsvg2_version 2.0.1 -%define libxml2_version 2.4.21 %define scrollkeeper_version 0.3.4 %define pam_version 0.99.8.1-11 %define desktop_file_utils_version 0.2.90 @@ -19,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.21.9 -Release: 0.2008.03.10.2%{?dist} +Release: 1%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -35,11 +32,7 @@ Requires: gtk2 >= 0:%{gtk2_version} Requires: libglade2 >= 0:%{libglade2_version} Requires: libgnomeui >= 0:%{libgnomeui_version} -Requires: libgnomecanvas >= 0:%{libgnomecanvas_version} -Requires: librsvg2 >= 0:%{librsvg2_version} -Requires: libxml2 >= 0:%{libxml2_version} Requires: pam >= 0:%{pam_version} -Requires: usermode Requires: /sbin/nologin Requires: system-logos Requires: fedorainfinity-gdm-theme @@ -50,6 +43,7 @@ Requires: ConsoleKit >= %{consolekit_version} Requires: PolicyKit-gnome >= %{polkit_version} Requires: gnome-settings-daemon >= 2.21.92 +Requires: iso-codes # since we use it, and pam spams the log if the module is missing Requires: gnome-keyring-pam Requires(post): scrollkeeper @@ -59,17 +53,11 @@ BuildRequires: gtk2-devel >= 0:%{gtk2_version} BuildRequires: libglade2-devel >= 0:%{libglade2_version} BuildRequires: libgnomeui-devel >= 0:%{libgnomeui_version} -BuildRequires: libgnomecanvas-devel >= 0:%{libgnomecanvas_version} -BuildRequires: librsvg2-devel >= 0:%{librsvg2_version} -BuildRequires: libxml2-devel >= 0:%{libxml2_version} -BuildRequires: usermode BuildRequires: pam-devel >= 0:%{pam_version} BuildRequires: fontconfig BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: gail-devel >= 0:%{gail_version} -BuildRequires: libgsf-devel BuildRequires: libtool automake autoconf -BuildRequires: libcroco-devel BuildRequires: libattr-devel BuildRequires: gettext BuildRequires: gnome-doc-utils @@ -89,7 +77,6 @@ Requires: audit-libs >= %{libauditver} -Patch0: gdm-2.21.9-prevent-some-spurious-wakeups.patch Patch99: gdm-2.21.8-fedora-logo.patch %package user-switch-applet @@ -110,7 +97,6 @@ %prep %setup -q -%patch0 -p1 -b .prevent-some-spurious-wakeups %patch99 -p1 -b .fedora-logo %build @@ -304,6 +290,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Mon Mar 10 2008 Jon McCann - 1:2.21.9-1 +- Update to 2.21.9 + * Mon Mar 10 2008 Ray Strode - 1:2.21.9-0.2008.03.10.2 - Prevent some spurious wake ups caused by the timed login timer animation Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- sources 10 Mar 2008 04:23:58 -0000 1.75 +++ sources 11 Mar 2008 00:32:27 -0000 1.76 @@ -1 +1 @@ -7e2fed99bab30b4f571dab578b465be9 gdm-2.21.9.tar.gz +457a18dfae730f9e3436080d25d26c68 gdm-2.21.9.tar.gz --- gdm-2.21.9-prevent-some-spurious-wakeups.patch DELETED --- --- gdm-2.21.9-signal.patch DELETED --- --- gdmthemetester.in DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 00:34:22 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Tue, 11 Mar 2008 00:34:22 GMT Subject: rpms/virt-manager/devel .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 virt-manager.spec, 1.31, 1.32 Message-ID: <200803110034.m2B0YMnO007627@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/virt-manager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7595 Modified Files: .cvsignore sources virt-manager.spec Log Message: Update to 0.5.4 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 11 Jan 2008 01:46:25 -0000 1.18 +++ .cvsignore 11 Mar 2008 00:33:40 -0000 1.19 @@ -1,3 +1,5 @@ *.src.rpm .build*.log -virt-manager-0.5.3.tar.gz +x86_64 +i686 +virt-manager-0.5.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 11 Jan 2008 01:46:25 -0000 1.18 +++ sources 11 Mar 2008 00:33:40 -0000 1.19 @@ -1 +1 @@ -39c0ff15b2df0571dae03d16c44fd46c virt-manager-0.5.3.tar.gz +9de921b119e897c28fb10335ca88e6dc virt-manager-0.5.4.tar.gz Index: virt-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- virt-manager.spec 18 Feb 2008 21:13:13 -0000 1.31 +++ virt-manager.spec 11 Mar 2008 00:33:40 -0000 1.32 @@ -7,8 +7,8 @@ %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} Name: virt-manager -Version: 0.5.3 -Release: 2%{_extra_release} +Version: 0.5.4 +Release: 1%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators @@ -23,7 +23,7 @@ Requires: pygtk2 >= 1.99.12-6 Requires: gnome-python2-gconf >= 1.99.11-7 # Absolutely require this version or newer -Requires: libvirt-python >= 0.3.3 +Requires: libvirt-python >= 0.4.0 # Definitely does not work with earlier due to python API changes Requires: dbus-python >= 0.61 # Might work with earlier, but this is what we've tested @@ -48,7 +48,7 @@ # For online help Requires: scrollkeeper # For the guest console -Requires: gtk-vnc-python +Requires: gtk-vnc-python >= 0.3.4 BuildRequires: pygtk2-devel BuildRequires: gtk2-devel @@ -158,6 +158,9 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Mon Mar 10 2008 Daniel P. Berrange - 0.5.4-1.fc9 +- Update to 0.5.4 release + * Mon Feb 18 2008 Fedora Release Engineering - 0.5.3-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 00:38:54 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 11 Mar 2008 00:38:54 GMT Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.53, 1.54 nautilus-cd-burner.spec, 1.99, 1.100 sources, 1.53, 1.54 Message-ID: <200803110038.m2B0csqA007753@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/nautilus-cd-burner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7718 Modified Files: .cvsignore nautilus-cd-burner.spec sources Log Message: - Update to 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 31 Jan 2008 04:32:12 -0000 1.53 +++ .cvsignore 11 Mar 2008 00:38:01 -0000 1.54 @@ -1 +1 @@ -nautilus-cd-burner-2.21.6.tar.bz2 +nautilus-cd-burner-2.22.0.tar.bz2 Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- nautilus-cd-burner.spec 31 Jan 2008 05:05:33 -0000 1.99 +++ nautilus-cd-burner.spec 11 Mar 2008 00:38:01 -0000 1.100 @@ -5,18 +5,18 @@ %define eel_version 2.13.3 %define nautilus_version 2.21.5 %define hal_version 0.5.7 -%define dbus_version 0.6 +%define dbus_version 0.6 %define gconf_version 2.14 %define gnome_mount_version 0.5 Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner -Version: 2.21.6 +Version: 2.22.0 Release: 1%{?dist} -Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/nautilus-cd-burner/2.22/%{name}-%{version}.tar.bz2 License: LGPL/GPL Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: mkisofs Requires: cdrecord %ifnarch s390 s390x @@ -108,7 +108,7 @@ %{_sysconfdir}/gconf/schemas/nautilus-cd-burner.schemas >& /dev/null || : fi -%postun +%postun /sbin/ldconfig update-desktop-database touch --no-create %{_datadir}/icons/hicolor @@ -138,6 +138,9 @@ %changelog +* Mon Mar 10 2008 Jon McCann - 2.22.0-1 +- Update to 2.22.0 + * Wed Jan 30 2008 Matthias Clasen - 2.21.6-1 - Update to 2.21.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-cd-burner/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 31 Jan 2008 04:32:12 -0000 1.53 +++ sources 11 Mar 2008 00:38:01 -0000 1.54 @@ -1 +1 @@ -3a9e4872db1b69f32635f10c5a043854 nautilus-cd-burner-2.21.6.tar.bz2 +e75c61879a12ab329fd2f3081b7e5d76 nautilus-cd-burner-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 00:41:34 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Tue, 11 Mar 2008 00:41:34 GMT Subject: rpms/kernel/devel linux-2.6-wireless-fixups.patch, NONE, 1.1 kernel.spec, 1.488, 1.489 Message-ID: <200803110041.m2B0fYbY007806@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7783 Modified Files: kernel.spec Added Files: linux-2.6-wireless-fixups.patch Log Message: use correct license tag for iwlcore.ko linux-2.6-wireless-fixups.patch: --- NEW FILE linux-2.6-wireless-fixups.patch --- diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c --- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c.orig 2008-03-10 20:34:32.000000000 -0400 +++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c 2008-03-10 20:34:09.000000000 -0400 @@ -39,7 +39,7 @@ MODULE_DESCRIPTION("iwl core"); MODULE_VERSION(IWLWIFI_VERSION); MODULE_AUTHOR(DRV_COPYRIGHT); -MODULE_LICENSE("GPL/BSD"); +MODULE_LICENSE("Dual BSD/GPL"); #ifdef CONFIG_IWL4965_DEBUG u32 iwl4965_debug_level; Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.488 retrieving revision 1.489 diff -u -r1.488 -r1.489 --- kernel.spec 10 Mar 2008 20:04:14 -0000 1.488 +++ kernel.spec 11 Mar 2008 00:40:59 -0000 1.489 @@ -611,6 +611,7 @@ Patch680: linux-2.6-wireless.patch Patch681: linux-2.6-wireless-pending.patch +Patch682: linux-2.6-wireless-fixups.patch Patch690: linux-2.6-at76.patch Patch820: linux-2.6-compile-fixes.patch @@ -1111,6 +1112,7 @@ #ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.26 ApplyPatch linux-2.6-wireless-pending.patch +ApplyPatch linux-2.6-wireless-fixups.patch # Add misc wireless bits from upstream wireless tree ApplyPatch linux-2.6-at76.patch @@ -1750,6 +1752,9 @@ %changelog * Mon Mar 10 2008 John W. Linville +- Use correct "Dual BSD/GPL" license tag for iwlcore.ko + +* Mon Mar 10 2008 John W. Linville - iwlwifi: Moving EEPROM handling in iwlcore module - ath5k: struct ath5k_desc cleanups - ath5k: move rx and tx status structures out of hardware descriptor From fedora-extras-commits at redhat.com Tue Mar 11 00:43:41 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Tue, 11 Mar 2008 00:43:41 GMT Subject: rpms/kernel/F-8 kernel.spec, 1.374, 1.375 linux-2.6-wireless-pending-fixups.patch, 1.1, 1.2 Message-ID: <200803110043.m2B0hfuf008025@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7971 Modified Files: kernel.spec linux-2.6-wireless-pending-fixups.patch Log Message: use correct license tag for iwlcore.ko Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.374 retrieving revision 1.375 diff -u -r1.374 -r1.375 --- kernel.spec 10 Mar 2008 23:34:04 -0000 1.374 +++ kernel.spec 11 Mar 2008 00:43:05 -0000 1.375 @@ -1910,6 +1910,9 @@ %changelog +* Mon Mar 10 2008 John W. Linville 2.6.24.3-29 +- Use correct "Dual BSD/GPL" license tag for iwlcore.ko + * Mon Mar 10 2008 Chuck Ebbert 2.6.24.3-28 - Fix license in iwlcore driver. linux-2.6-wireless-pending-fixups.patch: Index: linux-2.6-wireless-pending-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending-fixups.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-wireless-pending-fixups.patch 28 Feb 2008 03:18:34 -0000 1.1 +++ linux-2.6-wireless-pending-fixups.patch 11 Mar 2008 00:43:05 -0000 1.2 @@ -12,3 +12,15 @@ } } +diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c +--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c.orig 2008-03-10 20:34:32.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c 2008-03-10 20:34:09.000000000 -0400 +@@ -39,7 +39,7 @@ + MODULE_DESCRIPTION("iwl core"); + MODULE_VERSION(IWLWIFI_VERSION); + MODULE_AUTHOR(DRV_COPYRIGHT); +-MODULE_LICENSE("GPL/BSD"); ++MODULE_LICENSE("Dual BSD/GPL"); + + #ifdef CONFIG_IWL4965_DEBUG + u32 iwl4965_debug_level; From fedora-extras-commits at redhat.com Tue Mar 11 00:45:10 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 11 Mar 2008 00:45:10 GMT Subject: rpms/gnome-screensaver/devel .cvsignore, 1.44, 1.45 gnome-screensaver.spec, 1.179, 1.180 sources, 1.47, 1.48 Message-ID: <200803110045.m2B0jAPO008142@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gnome-screensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8098 Modified Files: .cvsignore gnome-screensaver.spec sources Log Message: - Update to 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 31 Jan 2008 04:37:35 -0000 1.44 +++ .cvsignore 11 Mar 2008 00:44:33 -0000 1.45 @@ -1 +1 @@ -gnome-screensaver-2.21.6.tar.bz2 +gnome-screensaver-2.22.0.tar.bz2 Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- gnome-screensaver.spec 31 Jan 2008 04:52:45 -0000 1.179 +++ gnome-screensaver.spec 11 Mar 2008 00:44:33 -0000 1.180 @@ -12,11 +12,11 @@ Summary: GNOME Screensaver Name: gnome-screensaver -Version: 2.21.6 +Version: 2.22.0 Release: 1%{?dist} License: GPLv2+ Group: Amusements/Graphics -Source0: http://download.gnome.org/sources/gnome-screensaver/2.20/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-screensaver/2.22/%{name}-%{version}.tar.bz2 Source1: gnome-screensaver-hide-xscreensaver.menu Patch1: gnome-screensaver-2.20.0-default-theme.patch @@ -74,7 +74,7 @@ simple, sane, secure defaults and be well integrated with the desktop. %prep -%setup -q +%setup -q %patch1 -p1 -b .use-floaters-by-default %patch2 -p1 -b .securitytoken %patch4 -p1 -b .gnome-keyring @@ -84,7 +84,7 @@ %build # grr, autoreconf seems to break with intltool 0.36.0, unless -# you intltoolize again +# you intltoolize again intltoolize --force autoreconf %configure --with-xscreensaverdir=/usr/share/xscreensaver/config \ @@ -121,7 +121,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas >/dev/null fi - + %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -147,6 +147,9 @@ %doc %{_mandir}/man1/*.1.gz %changelog +* Mon Mar 10 2008 Jon McCann - 2.22.0-1 +- Update to 2.22.0 + * Wed Jan 30 2008 Matthias Clasen - 2.21.6-1 - Update to 2.21.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 31 Jan 2008 04:37:35 -0000 1.47 +++ sources 11 Mar 2008 00:44:33 -0000 1.48 @@ -1 +1 @@ -84aa370347fd84c939ecdd318e771aa6 gnome-screensaver-2.21.6.tar.bz2 +3f307d340d511c97192a9dc9b83a69f5 gnome-screensaver-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 00:46:57 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Tue, 11 Mar 2008 00:46:57 GMT Subject: rpms/kernel/F-8 kernel.spec, 1.375, 1.376 linux-2.6-wireless-pending-fixups.patch, 1.2, 1.3 Message-ID: <200803110046.m2B0kv1H008307@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8223 Modified Files: kernel.spec linux-2.6-wireless-pending-fixups.patch Log Message: learn to read preceding changelog entries... Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.375 retrieving revision 1.376 diff -u -r1.375 -r1.376 --- kernel.spec 11 Mar 2008 00:43:05 -0000 1.375 +++ kernel.spec 11 Mar 2008 00:46:09 -0000 1.376 @@ -1910,6 +1910,9 @@ %changelog +* Mon Mar 10 2008 John W. Linville 2.6.24.3-30 +- Learn to read preceding changelogs... + * Mon Mar 10 2008 John W. Linville 2.6.24.3-29 - Use correct "Dual BSD/GPL" license tag for iwlcore.ko linux-2.6-wireless-pending-fixups.patch: Index: linux-2.6-wireless-pending-fixups.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending-fixups.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-wireless-pending-fixups.patch 11 Mar 2008 00:43:05 -0000 1.2 +++ linux-2.6-wireless-pending-fixups.patch 11 Mar 2008 00:46:09 -0000 1.3 @@ -12,15 +12,3 @@ } } -diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c ---- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c.orig 2008-03-10 20:34:32.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c 2008-03-10 20:34:09.000000000 -0400 -@@ -39,7 +39,7 @@ - MODULE_DESCRIPTION("iwl core"); - MODULE_VERSION(IWLWIFI_VERSION); - MODULE_AUTHOR(DRV_COPYRIGHT); --MODULE_LICENSE("GPL/BSD"); -+MODULE_LICENSE("Dual BSD/GPL"); - - #ifdef CONFIG_IWL4965_DEBUG - u32 iwl4965_debug_level; From fedora-extras-commits at redhat.com Tue Mar 11 01:14:35 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 01:14:35 GMT Subject: rpms/gedit/devel gedit.spec,1.153,1.154 Message-ID: <200803110114.m2B1EZHH016034@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15980 Modified Files: gedit.spec Log Message: up the pygtksourceview requirement Index: gedit.spec =================================================================== RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- gedit.spec 10 Mar 2008 23:55:09 -0000 1.153 +++ gedit.spec 11 Mar 2008 01:13:47 -0000 1.154 @@ -8,7 +8,7 @@ %define gtksourceview_version 2.0.0 %define pygtk_version 2.9.7 %define pygobject_version 2.11.5 -%define pygtksourceview_version 2.0.0 +%define pygtksourceview_version 2.2.0 %define gnome_python_desktop_version 2.15.90 %define gnome_doc_utils_version 0.3.2 %define gconf_version 2.14 From fedora-extras-commits at redhat.com Tue Mar 11 01:18:58 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 11 Mar 2008 01:18:58 GMT Subject: rpms/xorg-x11-server/devel xserver-1.5.0-x86emu.patch, NONE, 1.1 .cvsignore, 1.38, 1.39 commitid, 1.11, 1.12 sources, 1.33, 1.34 xorg-x11-server.spec, 1.302, 1.303 Message-ID: <200803110118.m2B1Iw0l016280@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16239/devel Modified Files: .cvsignore commitid sources xorg-x11-server.spec Added Files: xserver-1.5.0-x86emu.patch Log Message: Yet another snapshot. xserver-1.5.0-x86emu.patch: --- NEW FILE xserver-1.5.0-x86emu.patch --- >From 3820624b395ce6073bc86fcc93d4dd44c2cb07e4 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 10 Mar 2008 19:39:21 -0400 Subject: [PATCH] test x86emu fix --- hw/xfree86/int10/helper_exec.c | 55 ++++++++++++++++++++++++++++++++++----- 1 files changed, 48 insertions(+), 7 deletions(-) diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index de6fde5..da7a38a 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -459,7 +459,42 @@ Mem_wl(CARD32 addr, CARD32 val) static CARD32 PciCfg1Addr = 0; -#define OFFSET(Cfg1Addr) (Cfg1Addr & 0xff) +#define PCI_OFFSET(x) ((x) & 0x000000ff) +#define PCI_TAG(x) ((x) & 0xffffff00) + +static pci_device* +pci_device_for_cfg_address (CARD32 addr) +{ + struct pci_device *dev = NULL; + PCITAG tag = PCI_TAG(addr); + struct pci_slot_match slot_match = { + .domain = PCI_DOM_FROM_TAG(tag), + .bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)), + .dev = PCI_DEV_FROM_TAG(tag), + .func = PCI_FUNC_FROM_TAG(tag), + .match_data = 0 + }; + + iter = pci_slot_match_iterator_create (&slot_match); + if (iter) + dev = pci_device_next(iter); + if (!dev) { + char buf[128]; /* enough to store "%u@%u" */ + xf86FormatPciBusNumber(tag >> 16, buf); + ErrorF("Failed to find device matching %s:%u:%u\n", + buf, slot_match.dev, slot_match.func); + return NULL; + } + + if (pci_device_next(iter)) { + char buf[128]; /* enough to store "%u@%u" */ + xf86FormatPciBusNumber(tag >> 16, buf); + ErrorF("Multiple devices matching %s:%u:%u\n", + buf, slot_match.dev, slot_match.func); + } + + return dev; +} static int pciCfg1in(CARD16 addr, CARD32 *val) @@ -469,7 +504,8 @@ pciCfg1in(CARD16 addr, CARD32 *val) return 1; } if (addr == 0xCFC) { - pci_device_cfg_read_u32(Int10Current->dev, val, OFFSET(PciCfg1Addr)); + pci_device_cfg_read_u32(pci_device_for_cfg_address(PciCfg1Addr), + val, PCI_OFFSET(PciCfg1Addr)); if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_inl(%#x) = %8.8x\n", PciCfg1Addr, *val); return 1; @@ -487,7 +523,8 @@ pciCfg1out(CARD16 addr, CARD32 val) if (addr == 0xCFC) { if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_outl(%#x, %8.8x)\n", PciCfg1Addr, val); - pci_device_cfg_write_u32(Int10Current->dev, val, OFFSET(PciCfg1Addr)); + pci_device_cfg_write_u32(pci_device_for_cfg_address(PciCfg1Addr), + val, PCI_OFFSET(PciCfg1Addr)); return 1; } return 0; @@ -506,7 +543,8 @@ pciCfg1inw(CARD16 addr, CARD16 *val) if ((addr >= 0xCFC) && (addr <= 0xCFF)) { const unsigned offset = addr - 0xCFC; - pci_device_cfg_read_u16(Int10Current->dev, val, OFFSET(PciCfg1Addr) + offset); + pci_device_cfg_read_u16(pci_device_for_cfg_address(PciCfg1Addr), + val, PCI_OFFSET(PciCfg1Addr) + offset); if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_inw(%#x) = %4.4x\n", PciCfg1Addr + offset, *val); return 1; @@ -530,7 +568,8 @@ pciCfg1outw(CARD16 addr, CARD16 val) if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_outw(%#x, %4.4x)\n", PciCfg1Addr + offset, val); - pci_device_cfg_write_u16(Int10Current->dev, val, OFFSET(PciCfg1Addr) + offset); + pci_device_cfg_write_u16(pci_device_for_cfg_address(PciCfg1Addr), + val, PCI_OFFSET(PciCfg1Addr) + offset); return 1; } return 0; @@ -549,7 +588,8 @@ pciCfg1inb(CARD16 addr, CARD8 *val) if ((addr >= 0xCFC) && (addr <= 0xCFF)) { const unsigned offset = addr - 0xCFC; - pci_device_cfg_read_u8(Int10Current->dev, val, OFFSET(PciCfg1Addr) + offset); + pci_device_cfg_read_u8(pci_device_for_cfg_address(PciCfg1Addr), + val, PCI_OFFSET(PciCfg1Addr) + offset); if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_inb(%#x) = %2.2x\n", PciCfg1Addr + offset, *val); return 1; @@ -573,7 +613,8 @@ pciCfg1outb(CARD16 addr, CARD8 val) if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_outb(%#x, %2.2x)\n", PciCfg1Addr + offset, val); - pci_device_cfg_write_u8(Int10Current->dev, val, OFFSET(PciCfg1Addr) + offset); + pci_device_cfg_write_u8(pci_device_for_cfg_address(PciCfg1Addr), + val, PCI_OFFSET(PciCfg1Addr) + offset); return 1; } return 0; -- 1.5.3.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 7 Mar 2008 18:38:38 -0000 1.38 +++ .cvsignore 11 Mar 2008 01:18:22 -0000 1.39 @@ -1 +1 @@ -xorg-server-20080307.tar.bz2 +xorg-server-20080310.tar.bz2 Index: commitid =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- commitid 7 Mar 2008 18:38:38 -0000 1.11 +++ commitid 11 Mar 2008 01:18:22 -0000 1.12 @@ -1 +1 @@ -ef702d586697c4ae9092ab0a412719c11973ec60 +02feb14a678e3b8ad9acf0b6db8d159b4fd64147 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 7 Mar 2008 18:38:38 -0000 1.33 +++ sources 11 Mar 2008 01:18:22 -0000 1.34 @@ -1 +1 @@ -04ea8f94db434f0629b8ce7ff68a1087 xorg-server-20080307.tar.bz2 +5d8257eb3d8f466e7c48540cb3740a19 xorg-server-20080310.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- xorg-x11-server.spec 7 Mar 2008 18:38:38 -0000 1.302 +++ xorg-x11-server.spec 11 Mar 2008 01:18:22 -0000 1.303 @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080307 +%define gitdate 20080310 Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.901 -Release: 1.%{gitdate}%{?dist} +Release: 2.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -60,6 +60,8 @@ # This really could be done prettier. Patch5002: xserver-1.4.99-ssh-isnt-local.patch +Patch5003: xserver-1.5.0-x86emu.patch + %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri %define sdkdir %{_includedir}/xorg @@ -268,7 +270,8 @@ %setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %if 0%{gitdate} -git checkout -b fedora +# XXX hack +git checkout -b fedora 921cbc58036491eab491b4c7b07111f04aa58d40 # make it something you can push to. sed -i 's/git/&+ssh/' .git/config %else From fedora-extras-commits at redhat.com Tue Mar 11 01:20:43 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 11 Mar 2008 01:20:43 GMT Subject: rpms/gnome-power-manager/devel .cvsignore, 1.42, 1.43 gnome-power-manager.spec, 1.112, 1.113 sources, 1.42, 1.43 Message-ID: <200803110120.m2B1Khnv016372@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gnome-power-manager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16339 Modified Files: .cvsignore gnome-power-manager.spec sources Log Message: - Update to 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 14 Feb 2008 22:53:42 -0000 1.42 +++ .cvsignore 11 Mar 2008 01:20:06 -0000 1.43 @@ -1 +1 @@ -gnome-power-manager-2.21.92.tar.bz2 +gnome-power-manager-2.22.0.tar.bz2 Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- gnome-power-manager.spec 18 Feb 2008 16:47:35 -0000 1.112 +++ gnome-power-manager.spec 11 Mar 2008 01:20:06 -0000 1.113 @@ -4,15 +4,13 @@ Summary: GNOME Power Manager Name: gnome-power-manager -Version: 2.21.92 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} License: GPLv2+ and GFDL+ Group: Applications/System -Source: http://download.gnome.org/sources/gnome-power-manager/2.21/gnome-power-manager-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-power-manager/2.22/gnome-power-manager-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=483826 Patch0: no-background.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=514590 -Patch1: gc-leak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome-power.sourceforge.net/ BuildRequires: libgnomeui-devel @@ -41,15 +39,14 @@ Requires(postun): scrollkeeper %description -GNOME Power Manager uses the information and facilities provided by HAL -displaying icons and handling user callbacks in an interactive GNOME session. -GNOME Power Preferences allows authorised users to set policy and +GNOME Power Manager uses the information and facilities provided by HAL +displaying icons and handling user callbacks in an interactive GNOME session. +GNOME Power Preferences allows authorised users to set policy and change preferences. %prep %setup -q %patch0 -p1 -b .no-background -%patch1 -p1 -b .gc-leak %build %configure \ @@ -65,6 +62,9 @@ make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL +desktop-file-install --vendor gnome \ + --dir $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow \ + $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gnome-power-manager.desktop desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/gnome/autostart \ $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gnome-power-manager.desktop @@ -116,6 +116,7 @@ %{_sysconfdir}/gconf/schemas/*.schemas %{_datadir}/dbus-1/services/gnome-power-manager.service %{_datadir}/gnome/autostart/gnome-power-manager.desktop +%{_datadir}/gdm/autostart/LoginWindow/gnome-power-manager.desktop %{_datadir}/applications/gnome-power-preferences.desktop %{_datadir}/applications/gnome-power-statistics.desktop %{_datadir}/icons/hicolor/*/apps/* @@ -124,7 +125,10 @@ %{_datadir}/gnome-2.0/ui/GNOME_BrightnessApplet.xml %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml -%changelog +%changelog +* Mon Mar 10 2008 Jon McCann - 2.22.0-1 +- Update to 2.22.0 + * Mon Feb 18 2008 Matthias Clasen - 2.21.92-2 - Plug an X resource leak in the brightness applet @@ -396,4 +400,3 @@ * Fri Sep 02 2005 David Zeuthen 0.2.3.1-1 - Initial import based on an SRPM from Richard Hughes - Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 14 Feb 2008 22:53:42 -0000 1.42 +++ sources 11 Mar 2008 01:20:06 -0000 1.43 @@ -1 +1 @@ -bf7c9cb1c1ce32aea8a26e60d99c5343 gnome-power-manager-2.21.92.tar.bz2 +43c76a13a803a5c034f310bb20f91ff4 gnome-power-manager-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 01:25:10 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 01:25:10 GMT Subject: rpms/cheese/devel cheese.spec,1.16,1.17 Message-ID: <200803110125.m2B1PAkZ016490@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/cheese/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16470 Modified Files: cheese.spec Log Message: try to fix the build Index: cheese.spec =================================================================== RCS file: /cvs/extras/rpms/cheese/devel/cheese.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- cheese.spec 10 Mar 2008 23:57:38 -0000 1.16 +++ cheese.spec 11 Mar 2008 01:24:35 -0000 1.17 @@ -42,6 +42,7 @@ %prep %setup -q +libtoolize --force --copy autoreconf %build From fedora-extras-commits at redhat.com Tue Mar 11 01:29:28 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 01:29:28 GMT Subject: rpms/evince/devel .cvsignore, 1.43, 1.44 evince.spec, 1.114, 1.115 sources, 1.42, 1.43 Message-ID: <200803110129.m2B1TSSn016620@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/evince/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16589 Modified Files: .cvsignore evince.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/evince/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 13 Feb 2008 03:06:10 -0000 1.43 +++ .cvsignore 11 Mar 2008 01:28:49 -0000 1.44 @@ -1 +1 @@ -evince-2.21.91.tar.bz2 +evince-2.22.0.tar.bz2 Index: evince.spec =================================================================== RCS file: /cvs/extras/rpms/evince/devel/evince.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- evince.spec 4 Mar 2008 01:08:09 -0000 1.114 +++ evince.spec 11 Mar 2008 01:28:49 -0000 1.115 @@ -5,14 +5,14 @@ %define theme_version 2.17.1 Name: evince -Version: 2.21.91 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Summary: Document viewer License: GPLv2+ and GFDL+ Group: Applications/Publishing URL: http://www.gnome.org/projects/evince/ -Source0: http://download.gnome.org/sources/%{name}/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2 Patch0: evince-0.6.0-print-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -215,6 +215,9 @@ %{_libdir}/evince/backends/djvudocument.evince-backend %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Mon Mar 3 2008 Matthias Clasen - 2.21.91-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/evince/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 13 Feb 2008 03:06:10 -0000 1.42 +++ sources 11 Mar 2008 01:28:49 -0000 1.43 @@ -1 +1 @@ -923843329832f4c9ac7c8bbd925d5bd3 evince-2.21.91.tar.bz2 +9fc7eb5757549626b7515b853a5f6b97 evince-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 01:40:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 01:40:14 +0000 Subject: [pkgdb] ltsp was added for wtogami Message-ID: <200803110142.m2B1gvGg010050@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) has added Package ltsp with summary Linux Terminal Server Project Server and Client Warren Togami ??? (wtogami) has approved Package ltsp Warren Togami ??? (wtogami) has added a Fedora devel branch for ltsp with an owner of wtogami Warren Togami ??? (wtogami) has approved ltsp in Fedora devel Warren Togami ??? (wtogami) has approved Package ltsp Warren Togami ??? (wtogami) has set commit to Approved for cvsextras on ltsp (Fedora devel) Warren Togami ??? (wtogami) has set build to Approved for cvsextras on ltsp (Fedora devel) Warren Togami ??? (wtogami) has set checkout to Approved for cvsextras on ltsp (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ltsp From fedora-extras-commits at redhat.com Tue Mar 11 01:40:20 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 01:40:20 +0000 Subject: [pkgdb] ltsp (Fedora, 8) updated by wtogami Message-ID: <200803110143.m2B1gvGi010050@bastion.fedora.phx.redhat.com> Warren Togami ??? (wtogami) added a Fedora 8 branch for ltsp Warren Togami ??? (wtogami) has set commit to Approved for cvsextras on ltsp (Fedora 8) Warren Togami ??? (wtogami) has set build to Approved for cvsextras on ltsp (Fedora 8) Warren Togami ??? (wtogami) has set checkout to Approved for cvsextras on ltsp (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ltsp From fedora-extras-commits at redhat.com Tue Mar 11 01:42:19 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Tue, 11 Mar 2008 01:42:19 GMT Subject: rpms/ltsp - New directory Message-ID: <200803110142.m2B1gJ9q016913@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/ltsp In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsd16875/rpms/ltsp Log Message: Directory /cvs/extras/rpms/ltsp added to the repository From fedora-extras-commits at redhat.com Tue Mar 11 01:42:24 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Tue, 11 Mar 2008 01:42:24 GMT Subject: rpms/ltsp/devel - New directory Message-ID: <200803110142.m2B1gOHD016935@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/ltsp/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsd16875/rpms/ltsp/devel Log Message: Directory /cvs/extras/rpms/ltsp/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 11 01:42:28 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Tue, 11 Mar 2008 01:42:28 GMT Subject: rpms/ltsp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803110142.m2B1gSbX016964@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/ltsp In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsd16875/rpms/ltsp Added Files: Makefile import.log Log Message: Setup of module ltsp --- NEW FILE Makefile --- # Top level Makefile for module ltsp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Mar 11 01:42:32 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Tue, 11 Mar 2008 01:42:32 GMT Subject: rpms/ltsp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803110142.m2B1gWTS016982@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/ltsp/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/CVSROOT/admin/tmpcvsd16875/rpms/ltsp/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ltsp --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: ltsp # $Id: Makefile,v 1.1 2008/03/11 01:42:28 wtogami Exp $ NAME := ltsp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Mar 11 01:46:13 2008 From: fedora-extras-commits at redhat.com (Adam Goode (agoode)) Date: Tue, 11 Mar 2008 01:46:13 GMT Subject: rpms/vips/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 vips.spec, 1.16, 1.17 vips-7.12.5-gcc43.patch, 1.1, NONE Message-ID: <200803110146.m2B1kD9v017196@cvs-int.fedora.redhat.com> Author: agoode Update of /cvs/extras/rpms/vips/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17163 Modified Files: .cvsignore sources vips.spec Removed Files: vips-7.12.5-gcc43.patch Log Message: * Mon Mar 10 2008 Adam Goode - 7.14.0-1 - New release - Remove GCC 4.3 patch (upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/vips/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Sep 2007 03:08:08 -0000 1.7 +++ .cvsignore 11 Mar 2008 01:45:31 -0000 1.8 @@ -1 +1 @@ -vips-7.12.5.tar.gz +vips-7.14.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/vips/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Sep 2007 03:08:08 -0000 1.7 +++ sources 11 Mar 2008 01:45:31 -0000 1.8 @@ -1 +1 @@ -94bee1c2770cd7da63faa3c75f8c381f vips-7.12.5.tar.gz +d8c6652e46b3c29aa674cd0e86bb7a84 vips-7.14.0.tar.gz Index: vips.spec =================================================================== RCS file: /cvs/extras/rpms/vips/devel/vips.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- vips.spec 9 Feb 2008 07:59:09 -0000 1.16 +++ vips.spec 11 Mar 2008 01:45:31 -0000 1.17 @@ -1,16 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: vips -Version: 7.12.5 -Release: 5%{?dist} +Version: 7.14.0 +Release: 1%{?dist} Summary: Library for processing large images Group: System Environment/Libraries License: LGPLv2+ URL: http://www.vips.ecs.soton.ac.uk/ -Source0: http://www.vips.ecs.soton.ac.uk/vips-7.12/%{name}-%{version}.tar.gz - -Patch0: vips-7.12.5-gcc43.patch +Source0: http://www.vips.ecs.soton.ac.uk/vips-7.13/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,8 +75,6 @@ %setup -q find . -name 'CVS' -type d -print0 | xargs -0 rm -rf -%patch -P 0 -p1 -b .gcc43 - # make the version string consistent for multiarch export FAKE_BUILD_DATE=$(date -r %{SOURCE0}) sed -i "s/\\(IM_VERSION_STRING=\\)\$IM_VERSION-\`date\`/\\1\"\$IM_VERSION-$FAKE_BUILD_DATE\"/g" \ @@ -148,6 +144,10 @@ %changelog +* Mon Mar 10 2008 Adam Goode - 7.14.0-1 +- New release +- Remove GCC 4.3 patch (upstream) + * Sat Feb 9 2008 Adam Goode - 7.12.5-5 - Fix GCC 4.3 build --- vips-7.12.5-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 01:51:29 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?= (wtogami)) Date: Tue, 11 Mar 2008 01:51:29 GMT Subject: rpms/ltsp/devel ltsp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803110151.m2B1pTRX017373@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/ltsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17281/devel Modified Files: .cvsignore sources Added Files: ltsp.spec Log Message: import --- NEW FILE ltsp.spec --- Name: ltsp Version: 5.1.0 Release: 0.3.20080310%{?dist} Summary: Linux Terminal Server Project Server and Client Group: User Interface/Desktops License: GPLv2 and GPLv2+ URL: http://www.ltsp.org # bzr snapshot # bzr checkout --lightweight -r 636 http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk # cd ltsp-trunk # ./mkdst --test # tarball is ltsp-%{version}.tar.bz2 Source0: ltsp-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: popt-devel BuildRequires: flex bison BuildRequires: automake BuildRequires: libX11-devel %ifarch %{ix86} x86_64 # Need pxelinux.0 from syslinux if server is x86 BuildRequires: syslinux %endif BuildRequires: tftp-server # Need location of tftpboot directory from tftp-server %define _tftpdir %(cat /etc/xinetd.d/tftp |grep server_args | awk -F"-s " {'print $2'} || echo -n "/BOGUS/DIRECTORY") %description LTSP client and server %package client Summary: LTSP client Group: User Interface/Desktops Requires: chkconfig Requires: ltspfsd %description client LTSP client package This package contains the scripts necessary to boot as a LTSP5 thin client. %package server Summary: LTSP server Group: User Interface/Desktops # needed to install client chroots Requires: livecd-tools >= 015 Requires: tftp-server Requires: ltspfs Requires: dhcp Requires: gettext Requires(post): chkconfig Requires(preun): chkconfig %description server LTSP server package This package contains the scripts and services necessary to install and run a Linux Terminal Server. %ifarch %{ix86} x86_64 %package vmclient Summary: LTSP Virtual Machine Client Group: Applications/Emulators Requires: kvm Requires: bridge-utils %description vmclient Run a qemu-kvm virtual machine as a PXE client. This allows you to test a LTSP server without the hassle of having extra hardware. Requires your system to support hardware virtualization or it will be very slow. %endif %prep %setup -q %build pushd client/getltscfg make %{?_smp_mflags} popd pushd client/xrexecd ./autogen.sh %configure make %{?_smp_mflags} popd %install ##### make directories rm -rf $RPM_BUILD_ROOT # client mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/ # server mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/kickstart/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/chkconfig.d/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ltsp/swapfiles/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/ mkdir -p $RPM_BUILD_ROOT/opt/ltsp mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386/pxelinux.cfg/ mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64/pxelinux.cfg/ mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc/ mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc64/ ###### client install pushd client/xrexecd make install DESTDIR=$RPM_BUILD_ROOT popd install -m 0755 client/getltscfg/getltscfg $RPM_BUILD_ROOT/%{_bindir}/getltscfg install -m 0644 client/getltscfg/getltscfg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ install -m 0644 client/ltsp_config $RPM_BUILD_ROOT/%{_datadir}/ltsp/ install -m 0755 client/screen_session $RPM_BUILD_ROOT/%{_datadir}/ltsp/ install -m 0755 client/configure-x.sh $RPM_BUILD_ROOT/%{_datadir}/ltsp/ install -m 0644 client/initscripts/ltsp-init-common $RPM_BUILD_ROOT/%{_datadir}/ltsp/ install -m 0755 client/initscripts/RPM/ltsp-client-launch $RPM_BUILD_ROOT%{_sbindir} install -m 0644 client/rwtab.d/k12linux.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d cp -av client/screen.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/ touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed ### server install install -m 0755 server/nbdrootd $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/nbdswapd $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/ldminfod $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/ltsp-update-sshkeys $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/ltsp-build-client $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/ltsp-update-kernels $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/scripts/k12linux/chroot-creator $RPM_BUILD_ROOT%{_sbindir} install -m 0755 server/ltsp-swapfile-delete $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/ install -m 0644 server/xinetd.d/nbdrootd $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ install -m 0644 server/xinetd.d/nbdswapd $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ install -m 0644 server/xinetd.d/ldminfod $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ install -m 0644 server/configs/nbdswapd.conf $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ cp -pr server/configs/kickstart/* $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/kickstart/ install -m 0644 server/configs/k12linux/mkinitrd/ifcfg-eth0 $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/ install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-mkinitrd $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/ install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-network $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/ install -m 0644 server/services/sysconfig-ltsp-dhcpd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ltsp-dhcpd cp -pr server/plugins/* $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/ install -m 0755 server/services/ltsp-dhcpd.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ltsp-dhcpd install -m 0755 server/scripts/k12linux/ltsp-prepare-kernel $RPM_BUILD_ROOT/%{_sbindir}/ install -m 0755 server/scripts/k12linux/ltsp-server-initialize $RPM_BUILD_ROOT/%{_sbindir}/ install -m 0755 server/scripts/k12linux/hosts-update $RPM_BUILD_ROOT/%{_datadir}/ltsp/scripts/ install -m 0755 server/scripts/k12linux/dhcpd-update $RPM_BUILD_ROOT/%{_datadir}/ltsp/scripts/ cp -p server/scripts/k12linux/scripts.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/ cp -p server/scripts/k12linux/chkconfig.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chkconfig.d/ # configs install -m 0644 server/configs/k12linux/ifcfg-ltspbr0 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/ install -m 0644 server/configs/k12linux/ltsp-dhcpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ltsp-dhcpd.conf install -m 0644 server/configs/k12linux/ltsp-update-kernels.conf $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ install -m 0644 server/configs/k12linux/ltsp-build-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ install -m 0644 server/configs/k12linux/ltsp-server.conf $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ for arch in i386 x86_64 ppc ppc64; do install -m 0644 server/configs/k12linux/lts.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/$arch/ done echo "K12_DIST=%{dist}" | sed 's/\.//' > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/k12_dist cat server/configs/k12linux/k12_dist.template >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/k12_dist %ifarch %{ix86} x86_64 # PXE install -m 0644 server/configs/pxe-default.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386/pxelinux.cfg/default install -m 0644 server/configs/pxe-default.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64/pxelinux.cfg/default install -m 0644 /usr/lib/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386 install -m 0644 /usr/lib/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64 %endif %ifarch %{ix86} x86_64 # vmclient install -m 0755 vmclient/ltsp-vmclient $RPM_BUILD_ROOT%{_sbindir}/ install -m 0755 vmclient/ltsp-qemu-bridge-ifup $RPM_BUILD_ROOT%{_sbindir}/ %endif %clean rm -rf $RPM_BUILD_ROOT %post server /sbin/chkconfig --add ltsp-dhcpd %preun server if [ $1 = 0 ]; then /sbin/service ltsp-dhcpd status >/dev/null 2>&1 if [ $? = 3 ]; then /sbin/service ltsp-dhcpd stop >/dev/null 2>&1 fi /sbin/chkconfig --del ltsp-dhcpd || : /sbin/service xinetd reload > /dev/null 2>&1 || : fi %postun server if [ $1 -ge 1 ]; then /sbin/service ltsp-dhcpd condrestart >/dev/null 2>&1 fi %files client %defattr(-,root,root,-) %{_mandir}/man1/getltscfg.1.gz %{_bindir}/getltscfg %{_bindir}/xrexecd %{_sbindir}/ltsp-client-launch %dir %{_datadir}/ltsp %{_datadir}/ltsp/configure-x.sh %{_datadir}/ltsp/ltsp-init-common %{_datadir}/ltsp/ltsp_config %{_datadir}/ltsp/screen_session %{_datadir}/ltsp/screen.d/ # readonly-root related files %{_sysconfdir}/rwtab.d/* %{_localstatedir}/lib/random-seed %config(noreplace) %{_sysconfdir}/lts.conf %files server %defattr(-,root,root,-) %doc ChangeLog COPYING TODO %{_localstatedir}/lib/ltsp/swapfiles/ %dir %{_tftpdir}/ %dir %{_tftpdir}/ltsp/ %dir %{_tftpdir}/ltsp/i386/ %dir %{_tftpdir}/ltsp/i386/pxelinux.cfg/ %dir %{_tftpdir}/ltsp/x86_64/ %dir %{_tftpdir}/ltsp/x86_64/pxelinux.cfg/ %dir %{_tftpdir}/ltsp/ppc/ %dir %{_tftpdir}/ltsp/ppc64/ %ifarch %{ix86} x86_64 %{_tftpdir}/ltsp/i386/pxelinux.0 %{_tftpdir}/ltsp/x86_64/pxelinux.0 %config(noreplace) %{_tftpdir}/ltsp/i386/pxelinux.cfg/default %config(noreplace) %{_tftpdir}/ltsp/x86_64/pxelinux.cfg/default %endif %dir /opt/ltsp %{_sbindir}/ltsp-build-client %{_sbindir}/ltsp-prepare-kernel %{_sbindir}/ltsp-server-initialize %{_sbindir}/ltsp-update-kernels %{_datadir}/ltsp/scripts/ %{_datadir}/ltsp/scripts.d/ %{_datadir}/ltsp/chkconfig.d/ %{_datadir}/ltsp/plugins/ %{_sbindir}/ldminfod %{_sbindir}/ltsp-update-sshkeys %{_sbindir}/nbdrootd %{_sbindir}/nbdswapd %{_sbindir}/chroot-creator %{_sysconfdir}/cron.daily/ltsp-swapfile-delete %{_sysconfdir}/init.d/ltsp-dhcpd %{_sysconfdir}/sysconfig/k12_dist %config(noreplace) %{_sysconfdir}/xinetd.d/nbdrootd %config(noreplace) %{_sysconfdir}/xinetd.d/nbdswapd %config(noreplace) %{_sysconfdir}/xinetd.d/ldminfod %dir %{_sysconfdir}/ltsp/ # Configuration Files %config(noreplace) %{_sysconfdir}/sysconfig/ltsp-dhcpd %config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-ltspbr0 %config(noreplace) %{_sysconfdir}/ltsp/nbdswapd.conf %config(noreplace) %{_sysconfdir}/ltsp/ltsp-build-client.conf %config(noreplace) %{_sysconfdir}/ltsp/ltsp-server.conf %config(noreplace) %{_sysconfdir}/ltsp/ltsp-dhcpd.conf %config(noreplace) %{_sysconfdir}/ltsp/ltsp-update-kernels.conf %dir %{_sysconfdir}/ltsp/kickstart/ %dir %{_sysconfdir}/ltsp/kickstart/Fedora/ %config(noreplace) %{_sysconfdir}/ltsp/kickstart/Fedora/common.ks %dir %{_sysconfdir}/ltsp/kickstart/Fedora/8/ %dir %{_sysconfdir}/ltsp/kickstart/Fedora/9/ %config(noreplace) %{_sysconfdir}/ltsp/kickstart/*/*/*.ks %dir %{_sysconfdir}/ltsp/mkinitrd/ %config(noreplace) %{_sysconfdir}/ltsp/mkinitrd/* %config(noreplace)%{_tftpdir}/ltsp/*/lts.conf %ifarch %{ix86} x86_64 %files vmclient %defattr(-,root,root,-) %{_sbindir}/ltsp-vmclient %{_sbindir}/ltsp-qemu-bridge-ifup %endif %changelog * Mon Mar 10 2008 Warren Togami - 5.1.0-0.3.20080310 - make ppc build work Wont work yet, requires a kickstart files and possibly fixes elsewhere. * Mon Mar 10 2008 Warren Togami - 5.1.0-0.2.20080310 - improve init.d/ltsp-dhcpd script so restart works properly - add %%post and %%preun handling of ltsp-dhcpd - other spec fixes from mdomsch's review * Mon Mar 10 2008 Warren Togami - 5.1.0-0.1.20080310 - initial package for review Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Mar 2008 01:42:28 -0000 1.1 +++ .cvsignore 11 Mar 2008 01:50:45 -0000 1.2 @@ -0,0 +1 @@ +ltsp-5.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Mar 2008 01:42:28 -0000 1.1 +++ sources 11 Mar 2008 01:50:45 -0000 1.2 @@ -0,0 +1 @@ +028a94daf6d01bc8ea05ce9d808de3c7 ltsp-5.1.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 01:51:35 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 11 Mar 2008 01:51:35 GMT Subject: rpms/gnome-scan/devel .cvsignore, 1.4, 1.5 gnome-scan.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200803110151.m2B1pZYZ017378@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/pkgs/rpms/gnome-scan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17347 Modified Files: .cvsignore gnome-scan.spec sources Log Message: * Mon Mar 10 2008 Deji Akingunola - 0.6-1 - New release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-scan/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Feb 2008 07:15:55 -0000 1.4 +++ .cvsignore 11 Mar 2008 01:51:02 -0000 1.5 @@ -1 +1 @@ -gnome-scan-0.5.93.tar.bz2 +gnome-scan-0.6.tar.bz2 Index: gnome-scan.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-scan/devel/gnome-scan.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnome-scan.spec 28 Feb 2008 07:15:55 -0000 1.6 +++ gnome-scan.spec 11 Mar 2008 01:51:02 -0000 1.7 @@ -1,11 +1,11 @@ Summary: Gnome solution for scanning in the desktop on top of libsane Name: gnome-scan -Version: 0.5.93 +Version: 0.6 Release: 1%{?dist} Group: Applications/System License: LGPLv2+ URL: http://home.gna.org/gnomescan/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libgnomeui-devel sane-backends-devel BuildRequires: gegl-devel gimp-devel @@ -97,19 +97,20 @@ %files libs %defattr(-,root,root,-) -%dir %{_libdir}/gnome-scan-1.0 %{_libdir}/libgnomescan.so.* -%{_libdir}/gnome-scan-1.0/*.so.* +%{_libdir}/gnome-scan-1.0/ %files devel %defattr(-,root,root,-) %{_includedir}/gnome-scan-1.0/ %{_libdir}/libgnomescan.so -%{_libdir}/gnome-scan-1.0/*.so %{_libdir}/pkgconfig/gnome-scan.pc %doc %{_datadir}/gtk-doc/html/gnome-scan*/ %changelog +* Mon Mar 10 2008 Deji Akingunola - 0.6-1 +- New release + * Thu Feb 28 2008 Deji Akingunola - 0.5.93-1 - New release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-scan/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Feb 2008 07:15:55 -0000 1.5 +++ sources 11 Mar 2008 01:51:02 -0000 1.6 @@ -1 +1 @@ -1e08cf7ea0358bc4078bdc21b32792c7 gnome-scan-0.5.93.tar.bz2 +4bdf2d0ce27893aa802743d24b853afd gnome-scan-0.6.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 01:53:37 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 01:53:37 GMT Subject: rpms/PyAmanith/F-7 PyAmanith.spec,1.1,1.2 Message-ID: <200803110153.m2B1rblH017535@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/PyAmanith/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17470/F-7 Modified Files: PyAmanith.spec Log Message: gcc older than what is in f9 doesn't build correctly for ppc64 Index: PyAmanith.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyAmanith/F-7/PyAmanith.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PyAmanith.spec 10 Mar 2008 19:44:40 -0000 1.1 +++ PyAmanith.spec 11 Mar 2008 01:53:04 -0000 1.2 @@ -3,7 +3,7 @@ Name: PyAmanith Summary: Python bindings for Amanith Version: 0.3.35 -Release: 2%{?dist} +Release: 2%{?dist}.1 # Exception is permission to link to Amanith, which is QPL. License: GPLv2+ with exceptions Group: Development/Tools @@ -13,6 +13,8 @@ Patch1: PyAmanith-0.3.34-headersfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, amanith-devel, swig +# older gcc doesn't know how to handle it on ppc64 +ExcludeArch: ppc64 %description PyAmanith is a Python wrapper for the Amanith (http://www.amanith.org) 2D @@ -53,6 +55,9 @@ %endif %changelog +* Mon Mar 10 2008 Tom "spot" Callaway 0.3.35-2.1 +- older gcc than f9 doesn't work on ppc64 + * Thu Feb 28 2008 Tom "spot" Callaway 0.3.35-2 - include COPYING file - fix permissions on .so file From fedora-extras-commits at redhat.com Tue Mar 11 01:53:45 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 01:53:45 GMT Subject: rpms/PyAmanith/F-8 PyAmanith.spec,1.1,1.2 Message-ID: <200803110153.m2B1rjNO017545@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/PyAmanith/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17470/F-8 Modified Files: PyAmanith.spec Log Message: gcc older than what is in f9 doesn't build correctly for ppc64 Index: PyAmanith.spec =================================================================== RCS file: /cvs/pkgs/rpms/PyAmanith/F-8/PyAmanith.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PyAmanith.spec 10 Mar 2008 19:44:47 -0000 1.1 +++ PyAmanith.spec 11 Mar 2008 01:53:07 -0000 1.2 @@ -3,7 +3,7 @@ Name: PyAmanith Summary: Python bindings for Amanith Version: 0.3.35 -Release: 2%{?dist} +Release: 2%{?dist}.1 # Exception is permission to link to Amanith, which is QPL. License: GPLv2+ with exceptions Group: Development/Tools @@ -13,6 +13,8 @@ Patch1: PyAmanith-0.3.34-headersfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, amanith-devel, swig +# older gcc doesn't know how to handle it on ppc64 +ExcludeArch: ppc64 %description PyAmanith is a Python wrapper for the Amanith (http://www.amanith.org) 2D @@ -53,6 +55,9 @@ %endif %changelog +* Mon Mar 10 2008 Tom "spot" Callaway 0.3.35-2.1 +- older gcc than f9 doesn't work on ppc64 + * Thu Feb 28 2008 Tom "spot" Callaway 0.3.35-2 - include COPYING file - fix permissions on .so file From fedora-extras-commits at redhat.com Tue Mar 11 01:54:27 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 11 Mar 2008 01:54:27 GMT Subject: rpms/gnome-panel/devel .cvsignore, 1.71, 1.72 gnome-panel-2.21.5-ck-shutdown.patch, 1.1, 1.2 gnome-panel.spec, 1.274, 1.275 sources, 1.74, 1.75 Message-ID: <200803110154.m2B1sRFV017642@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17512 Modified Files: .cvsignore gnome-panel-2.21.5-ck-shutdown.patch gnome-panel.spec sources Log Message: - Update to 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- .cvsignore 26 Feb 2008 17:36:45 -0000 1.71 +++ .cvsignore 11 Mar 2008 01:53:38 -0000 1.72 @@ -1 +1 @@ -gnome-panel-2.21.92.tar.bz2 +gnome-panel-2.22.0.tar.bz2 gnome-panel-2.21.5-ck-shutdown.patch: Index: gnome-panel-2.21.5-ck-shutdown.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel-2.21.5-ck-shutdown.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-panel-2.21.5-ck-shutdown.patch 25 Jan 2008 20:35:06 -0000 1.1 +++ gnome-panel-2.21.5-ck-shutdown.patch 11 Mar 2008 01:53:38 -0000 1.2 @@ -2,7 +2,7 @@ =================================================================== --- gnome-panel/gnome-panel/panel-consolekit.c (revision 0) +++ gnome-panel/gnome-panel/panel-consolekit.c (revision 0) -@@ -0,0 +1,597 @@ +@@ -0,0 +1,618 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2008 Jon McCann @@ -84,9 +84,9 @@ + +static void +panel_consolekit_get_property (GObject *object, -+ guint prop_id, -+ GValue *value, -+ GParamSpec *pspec) ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec) +{ + PanelConsolekit *manager = PANEL_CONSOLEKIT (object); + @@ -233,7 +233,7 @@ + const char *new_owner, + PanelConsolekit *manager) +{ -+ if (strcmp (name, "org.freedesktop.ConsoleKit") != 0) ++ if (name != NULL && strcmp (name, "org.freedesktop.ConsoleKit") != 0) + return; + + if (manager->priv->ck_proxy != NULL) { @@ -269,6 +269,14 @@ + + parent_class = G_OBJECT_CLASS (panel_consolekit_parent_class); + ++ if (manager->priv->bus_proxy != NULL) { ++ g_object_unref (manager->priv->bus_proxy); ++ } ++ ++ if (manager->priv->ck_proxy != NULL) { ++ g_object_unref (manager->priv->ck_proxy); ++ } ++ + if (parent_class->finalize != NULL) + parent_class->finalize (object); +} @@ -340,16 +348,16 @@ + +static void +emit_restart_complete (PanelConsolekit *manager, -+ GError *error) ++ const char *error_message) +{ + GError *call_error; + + call_error = NULL; + -+ if (error != NULL) { ++ if (error_message != NULL) { + call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR, + PANEL_CONSOLEKIT_ERROR_RESTARTING, -+ error->message); ++ error_message); + } + + g_signal_emit (G_OBJECT (manager), @@ -394,8 +402,7 @@ + + if (! gained_privilege) { + if (error != NULL) { -+ g_warning ("system restart error: %s", error->message); -+ emit_restart_complete (manager, error); ++ emit_restart_complete (manager, error->message); + } + return; + } @@ -404,7 +411,7 @@ + res = try_system_restart (manager->priv->dbus_connection, &local_error); + if (! res) { + g_warning ("Unable to restart system: %s", local_error->message); -+ emit_restart_complete (manager, local_error); ++ emit_restart_complete (manager, local_error->message); + g_error_free (local_error); + return; + } @@ -421,17 +428,16 @@ + + if (! gained_privilege) { + if (error != NULL) { -+ g_warning ("system restart error: %s", error->message); -+ emit_restart_complete (manager, error); ++ emit_stop_complete (manager, error); + } + return; + } + + local_error = NULL; -+ res = try_system_restart (manager->priv->dbus_connection, &local_error); ++ res = try_system_stop (manager->priv->dbus_connection, &local_error); + if (! res) { -+ g_warning ("Unable to restart system: %s", local_error->message); -+ emit_restart_complete (manager, local_error); ++ g_warning ("Unable to stop system: %s", local_error->message); ++ emit_stop_complete (manager, local_error); + g_error_free (local_error); + return; + } @@ -459,62 +465,77 @@ +request_restart_priv (PanelConsolekit *manager, + GError *error) +{ -+ gboolean res = FALSE; +#ifdef HAVE_POLKIT ++ gboolean res = FALSE; ++ char *error_message = NULL; + PolKitAction *action; + guint xid; + pid_t pid; ++ GError *local_error; + + action = get_action_from_error (error); + + xid = 0; + pid = getpid (); + -+ g_error_free (error); -+ error = NULL; ++ local_error = NULL; + res = polkit_gnome_auth_obtain (action, + xid, + pid, + (PolKitGnomeAuthCB) system_restart_auth_cb, + manager, -+ &error); ++ &local_error); + polkit_action_unref (action); -+#endif /* HAVE POLKIT */ ++ if (local_error != NULL) { ++ error_message = g_strdup (local_error->message); ++ g_error_free (local_error); ++ } ++ + if (! res) { -+ emit_restart_complete (manager, error); -+ g_error_free (error); ++ emit_restart_complete (manager, error_message); ++ g_free (error_message); + } ++#else ++ g_assert_not_reached (); ++#endif /* HAVE POLKIT */ +} + +static void +request_stop_priv (PanelConsolekit *manager, + GError *error) +{ -+ gboolean res = FALSE; +#ifdef HAVE_POLKIT ++ gboolean res = FALSE; ++ char *error_message = NULL; + PolKitAction *action; + guint xid; + pid_t pid; ++ GError *local_error; + + action = get_action_from_error (error); + + xid = 0; + pid = getpid (); + -+ g_error_free (error); -+ error = NULL; ++ local_error = NULL; + res = polkit_gnome_auth_obtain (action, + xid, + pid, + (PolKitGnomeAuthCB) system_stop_auth_cb, + manager, -+ &error); ++ &local_error); + polkit_action_unref (action); -+#endif /* HAVE POLKIT */ ++ if (local_error != NULL) { ++ error_message = g_strdup (local_error->message); ++ g_error_free (local_error); ++ } + if (! res) { -+ emit_stop_complete (manager, error); -+ g_error_free (error); ++ emit_stop_complete (manager, error_message); ++ g_free (error_message); + } ++#else ++ g_assert_not_reached (); ++#endif /* HAVE POLKIT */ +} + +void @@ -538,10 +559,9 @@ + request_restart_priv (manager, error); + } else { + emit_restart_complete (manager, error); -+ g_error_free (error); + } ++ g_error_free (error); + } -+ +} + +void @@ -565,8 +585,8 @@ + request_stop_priv (manager, error); + } else { + emit_stop_complete (manager, error); -+ g_error_free (error); + } ++ g_error_free (error); + } +} + @@ -574,7 +594,7 @@ +panel_consolekit_can_restart (PanelConsolekit *manager) +{ +#ifdef HAVE_POLKIT -+ return TRUE; ++ return panel_consolekit_ensure_ck_connection (manager, NULL); +#else + return FALSE; +#endif @@ -584,7 +604,7 @@ +panel_consolekit_can_stop (PanelConsolekit *manager) +{ +#ifdef HAVE_POLKIT -+ return TRUE; ++ return panel_consolekit_ensure_ck_connection (manager, NULL); +#else + return FALSE; +#endif @@ -595,8 +615,9 @@ +{ + static PanelConsolekit *manager = NULL; + -+ if (manager == NULL) ++ if (manager == NULL) { + manager = panel_consolekit_new (); ++ } + + return g_object_ref (manager); +} @@ -684,7 +705,7 @@ +#endif /* PANEL_CONSOLEKIT_H */ Index: gnome-panel/gnome-panel/panel-logout.c =================================================================== ---- gnome-panel/gnome-panel/panel-logout.c (revision 10754) +--- gnome-panel/gnome-panel/panel-logout.c (revision 10951) +++ gnome-panel/gnome-panel/panel-logout.c (working copy) @@ -1,4 +1,5 @@ -/* @@ -693,7 +714,7 @@ * panel-logout.c: * * Copyright (C) 2006 Vincent Untz -@@ -33,6 +34,7 @@ +@@ -35,6 +36,7 @@ #include "panel-logout.h" #include "panel-gdm.h" #include "panel-power-manager.h" @@ -701,7 +722,7 @@ #include "panel-session.h" #include "panel-icon-names.h" -@@ -53,6 +55,7 @@ struct _PanelLogoutDialogPrivate { +@@ -55,6 +57,7 @@ struct _PanelLogoutDialogPrivate { PanelLogoutDialogType type; PanelPowerManager *power_manager; @@ -709,7 +730,7 @@ int timeout; unsigned int timeout_id; -@@ -74,7 +77,7 @@ enum { +@@ -76,7 +79,7 @@ enum { }; G_DEFINE_TYPE (PanelLogoutDialog, panel_logout, GTK_TYPE_MESSAGE_DIALOG); @@ -718,7 +739,7 @@ panel_logout_set_property (GObject *object, guint prop_id, const GValue *value, -@@ -89,7 +92,7 @@ panel_logout_set_property (GObject +@@ -91,7 +94,7 @@ panel_logout_set_property (GObject } } @@ -727,15 +748,78 @@ panel_logout_get_property (GObject *object, guint prop_id, GValue *value, -@@ -142,6 +145,7 @@ panel_logout_init (PanelLogoutDialog *lo - gtk_window_stick (GTK_WINDOW (logout_dialog)); +@@ -130,6 +133,59 @@ panel_logout_class_init (PanelLogoutDial + } + + static void ++ck_restart_error_window (GError *error) ++{ ++ GtkWidget *dialog; ++ const char *primary; ++ ++ g_assert (error != NULL); ++ ++ switch (error->code) { ++ case PANEL_CONSOLEKIT_ERROR_RESTARTING: ++ primary = _("Unable to restart system"); ++ break; ++ case PANEL_CONSOLEKIT_ERROR_STOPPING: ++ primary = _("Unable to stop system"); ++ break; ++ default: ++ g_assert_not_reached (); ++ } ++ ++ dialog = gtk_message_dialog_new (NULL, 0, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_NONE, ++ primary); ++ ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), ++ "%s", error->message); ++ ++ gtk_dialog_add_buttons (GTK_DIALOG (dialog), ++ GTK_STOCK_CLOSE, ++ NULL); ++ ++ gtk_dialog_set_default_response (GTK_DIALOG (dialog), ++ GTK_RESPONSE_CLOSE); ++ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); ++ gtk_window_set_title (GTK_WINDOW (dialog), ""); ++ ++ g_signal_connect (dialog, "response", ++ G_CALLBACK (gtk_widget_destroy), NULL); ++ ++ gtk_widget_show (dialog); ++} ++ ++static void ++on_ck_request_completed (PanelConsolekit *panel_consolekit, ++ GError *error) ++{ ++ if (error == NULL) { ++ /* request was successful */ ++ return; ++ } ++ ++} ++ ++static void + panel_logout_init (PanelLogoutDialog *logout_dialog) + { + logout_dialog->priv = PANEL_LOGOUT_DIALOG_GET_PRIVATE (logout_dialog); +@@ -146,6 +202,10 @@ panel_logout_init (PanelLogoutDialog *lo + GTK_WIN_POS_CENTER_ALWAYS); logout_dialog->priv->power_manager = panel_get_power_manager (); + logout_dialog->priv->consolekit = panel_get_consolekit (); ++ g_signal_connect (logout_dialog->priv->consolekit, ++ "request-completed", ++ G_CALLBACK (on_ck_request_completed), NULL); g_signal_connect (logout_dialog, "destroy", G_CALLBACK (panel_logout_destroy), NULL); -@@ -159,37 +163,91 @@ panel_logout_destroy (PanelLogoutDialog +@@ -163,37 +223,120 @@ panel_logout_destroy (PanelLogoutDialog g_object_unref (logout_dialog->priv->power_manager); logout_dialog->priv->power_manager = NULL; @@ -751,7 +835,7 @@ + gboolean ret; + + ret = panel_consolekit_can_restart (logout_dialog->priv->consolekit); -+ if (! ret) { ++ if (!ret) { + ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT); + } + return ret; @@ -763,12 +847,37 @@ + gboolean ret; + + ret = panel_consolekit_can_stop (logout_dialog->priv->consolekit); -+ if (! ret) { ++ if (!ret) { + ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN); + } + return ret; +} + ++gboolean ++panel_logout_supports_shutdown_reboot (void) ++{ ++ PanelConsolekit *consolekit; ++ gboolean ret; ++ ++ ret = FALSE; ++ ++ /* if we can do any then return true */ ++ ++ consolekit = panel_get_consolekit (); ++ if (consolekit != NULL) { ++ ret = panel_consolekit_can_restart (consolekit) ++ || panel_consolekit_can_stop (consolekit); ++ g_object_unref (consolekit); ++ } ++ ++ if (!ret) { ++ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT) ++ || gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN); ++ } ++ ++ return ret; ++} ++ +static void +do_request_logout (PanelConsolekit *consolekit) +{ @@ -780,6 +889,8 @@ +do_request_reboot (PanelConsolekit *consolekit) +{ + if (panel_consolekit_can_restart (consolekit)) { ++ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE); ++ panel_session_request_save (); + panel_consolekit_attempt_restart (consolekit); + } else { + gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT); @@ -791,6 +902,8 @@ +do_request_shutdown (PanelConsolekit *consolekit) +{ + if (panel_consolekit_can_stop (consolekit)) { ++ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE); ++ panel_session_request_save (); + panel_consolekit_attempt_stop (consolekit); + } else { + gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN); @@ -833,7 +946,7 @@ break; case PANEL_LOGOUT_RESPONSE_STD: if (panel_power_manager_can_hibernate (power_manager)) -@@ -206,6 +264,7 @@ panel_logout_response (PanelLogoutDialog +@@ -210,6 +353,7 @@ panel_logout_response (PanelLogoutDialog g_assert_not_reached (); } g_object_unref (power_manager); @@ -841,7 +954,7 @@ } static gboolean -@@ -357,7 +416,7 @@ panel_logout_new (PanelLogoutDialogType +@@ -361,7 +505,7 @@ panel_logout_new (PanelLogoutDialogType _("_Hibernate"), PANEL_LOGOUT_RESPONSE_STD); @@ -850,7 +963,7 @@ gtk_dialog_add_button (GTK_DIALOG (logout_dialog), _("_Restart"), PANEL_LOGOUT_RESPONSE_REBOOT); -@@ -366,7 +425,7 @@ panel_logout_new (PanelLogoutDialogType +@@ -370,7 +514,7 @@ panel_logout_new (PanelLogoutDialogType GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); @@ -859,9 +972,93 @@ gtk_dialog_add_button (GTK_DIALOG (logout_dialog), _("_Shut Down"), PANEL_LOGOUT_RESPONSE_SHUTDOWN); +Index: gnome-panel/gnome-panel/panel-logout.h +=================================================================== +--- gnome-panel/gnome-panel/panel-logout.h (revision 10951) ++++ gnome-panel/gnome-panel/panel-logout.h (working copy) +@@ -57,6 +57,8 @@ struct _PanelLogoutDialogClass { + + GType panel_logout_get_type (void) G_GNUC_CONST; + ++gboolean panel_logout_supports_shutdown_reboot (void); ++ + void panel_logout_new (PanelLogoutDialogType type, + GdkScreen *screen, + guint32 activate_time); +Index: gnome-panel/gnome-panel/panel-toplevel.c +=================================================================== +--- gnome-panel/gnome-panel/panel-toplevel.c (revision 10951) ++++ gnome-panel/gnome-panel/panel-toplevel.c (working copy) +@@ -3329,7 +3329,8 @@ panel_toplevel_get_animation_time (Panel + } + + static void +-panel_toplevel_start_animation (PanelToplevel *toplevel) ++panel_toplevel_start_animation (PanelToplevel *toplevel, ++ gboolean auto_hide) + { + GdkScreen *screen; + int monitor_width, monitor_height; +@@ -3480,7 +3481,7 @@ panel_toplevel_hide (PanelToplevel *t + } + + if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel)) +- panel_toplevel_start_animation (toplevel); ++ panel_toplevel_start_animation (toplevel, auto_hide); + else if (toplevel->priv->attached) + gtk_widget_hide (GTK_WIDGET (toplevel)); + +@@ -3528,7 +3529,7 @@ panel_toplevel_unhide (PanelToplevel *to + panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel); + + if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel)) +- panel_toplevel_start_animation (toplevel); ++ panel_toplevel_start_animation (toplevel, FALSE); + else if (toplevel->priv->attached) + gtk_widget_show (GTK_WIDGET (toplevel)); + +Index: gnome-panel/gnome-panel/panel-session.c +=================================================================== +--- gnome-panel/gnome-panel/panel-session.c (revision 10951) ++++ gnome-panel/gnome-panel/panel-session.c (working copy) +@@ -60,6 +60,34 @@ panel_session_request_logout (void) + recursion_guard--; + } + ++void ++panel_session_request_save (void) ++{ ++ GnomeClient *client; ++ static int recursion_guard = 0; ++ ++ if (recursion_guard) ++ return; ++ ++ recursion_guard++; ++ ++ if (!(client = gnome_master_client ())) ++ return; ++ ++ /* Only request a Global save. We only want a Local ++ * save if the user selects 'Save current setup' ++ * from the dialog. ++ */ ++ gnome_client_request_save (client, ++ GNOME_SAVE_GLOBAL, ++ FALSE, ++ GNOME_INTERACT_NONE, ++ TRUE, /* do not use the gnome-session gui */ ++ TRUE); ++ ++ recursion_guard--; ++} ++ + static void + panel_session_handle_die_request (GnomeClient *client) + { Index: gnome-panel/gnome-panel/panel-action-button.c =================================================================== ---- gnome-panel/gnome-panel/panel-action-button.c (revision 10754) +--- gnome-panel/gnome-panel/panel-action-button.c (revision 10951) +++ gnome-panel/gnome-panel/panel-action-button.c (working copy) @@ -46,7 +46,6 @@ #include "panel-lockdown.h" @@ -871,20 +1068,31 @@ #include "panel-icon-names.h" G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET); -@@ -182,9 +181,7 @@ panel_action_shutdown (GtkWidget *widget - static gboolean +@@ -183,8 +182,7 @@ static gboolean panel_action_shutdown_reboot_is_disabled (void) { -- return (panel_lockdown_get_disable_log_out() || + return (panel_lockdown_get_disable_log_out() || - (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) && - !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT))); -+ return (panel_lockdown_get_disable_log_out()); ++ !panel_logout_supports_shutdown_reboot); } /* Run Application +Index: gnome-panel/gnome-panel/panel-session.h +=================================================================== +--- gnome-panel/gnome-panel/panel-session.h (revision 10951) ++++ gnome-panel/gnome-panel/panel-session.h (working copy) +@@ -30,6 +30,7 @@ G_BEGIN_DECLS + void panel_session_init (void); + void panel_session_do_not_restart (void); + void panel_session_request_logout (void); ++void panel_session_request_save (void); + + G_END_DECLS + Index: gnome-panel/gnome-panel/Makefile.am =================================================================== ---- gnome-panel/gnome-panel/Makefile.am (revision 10754) +--- gnome-panel/gnome-panel/Makefile.am (revision 10951) +++ gnome-panel/gnome-panel/Makefile.am (working copy) @@ -16,6 +16,7 @@ INCLUDES = \ $(STANDARD_PROPERTIES_CFLAGS) \ @@ -900,17 +1108,17 @@ panel-power-manager.c \ + panel-consolekit.c \ panel-ditem-editor.c \ + panel-mount-operation.c \ $(NULL) - -@@ -147,6 +149,7 @@ panel_headers = \ +@@ -148,6 +150,7 @@ panel_headers = \ panel-logout.h \ panel-gdm.h \ panel-power-manager.h \ + panel-consolekit.h \ panel-ditem-editor.h \ panel-icon-names.h \ - $(NULL) -@@ -159,6 +162,7 @@ gnome_panel_SOURCES = \ + panel-mount-operation.h \ +@@ -161,6 +164,7 @@ gnome_panel_SOURCES = \ gnome_panel_LDADD = \ $(PANEL_LIBS) \ Index: gnome-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- gnome-panel.spec 9 Mar 2008 21:25:43 -0000 1.274 +++ gnome-panel.spec 11 Mar 2008 01:53:38 -0000 1.275 @@ -21,10 +21,10 @@ Summary: GNOME panel Name: gnome-panel -Version: 2.21.92 +Version: 2.22.0 Release: 6%{?dist} URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2 Source3: redhat-panel-default-setup.entries Source4: gnome-compiler-flags.m4 @@ -107,11 +107,9 @@ # add a hard dependency on e.g. tomboy Patch11: applet-error.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=511881 Patch14: gnome-panel-2.21.5-ck-shutdown.patch -Patch22: polkit-fix.patch -Patch23: sunrise.patch - # http://bugzilla.gnome.org/show_bug.cgi?id=520111 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch @@ -164,8 +162,6 @@ %patch10 -p1 -b .preferred-apps %patch11 -p1 -b .applet-error %patch14 -p1 -b .ck-shutdown -%patch22 -p1 -b .polkit-fix -%patch23 -p1 -b .sunrise %patch24 -p1 -b .allow-spurious-view-done-signals %patch25 -p1 -b .current %patch26 -p1 -b .expose @@ -353,6 +349,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 10 2008 Jon McCann - 2.22.0-1 +- Update to 2.22.0 + * Sat Mar 8 2008 Will Woods - 2.21.92-6 - Add "About This Computer" item to System menu if it exists Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 26 Feb 2008 17:36:45 -0000 1.74 +++ sources 11 Mar 2008 01:53:38 -0000 1.75 @@ -1 +1 @@ -46544232bc0148ff61790f9141a6904b gnome-panel-2.21.92.tar.bz2 +fe10c920c1f182a2bd5dba98863c786c gnome-panel-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 01:56:36 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 11 Mar 2008 01:56:36 GMT Subject: rpms/gnome-panel/devel gnome-panel.spec,1.275,1.276 Message-ID: <200803110156.m2B1uaa9017750@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17704 Modified Files: gnome-panel.spec Log Message: Fix release num Index: gnome-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.275 retrieving revision 1.276 diff -u -r1.275 -r1.276 --- gnome-panel.spec 11 Mar 2008 01:53:38 -0000 1.275 +++ gnome-panel.spec 11 Mar 2008 01:55:39 -0000 1.276 @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.22.0 -Release: 6%{?dist} +Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 01:59:49 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 01:59:49 GMT Subject: rpms/gnome-devel-docs/devel .cvsignore, 1.3, 1.4 gnome-devel-docs.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200803110159.m2B1xnrM017857@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-devel-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17818 Modified Files: .cvsignore gnome-devel-docs.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2008 04:43:45 -0000 1.3 +++ .cvsignore 11 Mar 2008 01:59:13 -0000 1.4 @@ -1 +1 @@ -gnome-devel-docs-2.21.1.tar.bz2 +gnome-devel-docs-2.22.0.tar.bz2 Index: gnome-devel-docs.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/gnome-devel-docs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-devel-docs.spec 14 Feb 2008 04:43:45 -0000 1.3 +++ gnome-devel-docs.spec 11 Mar 2008 01:59:13 -0000 1.4 @@ -1,11 +1,11 @@ Summary: GNOME developer documentation Name: gnome-devel-docs -Version: 2.21.1 +Version: 2.22.0 Release: 1%{?dist} License: GFDL Group: System Environment/Libraries URL: http://library.gnome.org -Source: http://download.gnome.org/sources/gnome-devel-docs/2.21/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-devel-docs/2.22/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gnome-doc-utils @@ -49,6 +49,9 @@ %{_datadir}/omf/platform-overview %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Wed Feb 13 2008 Matthias Clasen - 2.21.1-1 - Update to 2.21.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-devel-docs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2008 04:43:45 -0000 1.3 +++ sources 11 Mar 2008 01:59:13 -0000 1.4 @@ -1 +1 @@ -cc7a62870b52be366875b2a9def12ee8 gnome-devel-docs-2.21.1.tar.bz2 +fde987f35c495fa16b9af1de9a6aed7b gnome-devel-docs-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 02:00:43 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 11 Mar 2008 02:00:43 GMT Subject: rpms/xulrunner/devel .cvsignore, 1.36, 1.37 sources, 1.37, 1.38 xulrunner.spec, 1.89, 1.90 Message-ID: <200803110200.m2B20hMK017919@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17849 Modified Files: .cvsignore sources xulrunner.spec Log Message: * Mon Mar 10 2008 Christopher Aillon 1.0-0.38 - Update to latest trunk (2008-03-10) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 9 Mar 2008 22:03:49 -0000 1.36 +++ .cvsignore 11 Mar 2008 01:59:49 -0000 1.37 @@ -1 +1 @@ -mozilla-20080309.tar.bz2 +mozilla-20080310.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 9 Mar 2008 22:03:49 -0000 1.37 +++ sources 11 Mar 2008 01:59:49 -0000 1.38 @@ -1 +1 @@ -bcb090a222651dd712fd79f4b3058daf mozilla-20080309.tar.bz2 +686eec8eec8900cdf2ed27e7a2098e5b mozilla-20080310.tar.bz2 Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- xulrunner.spec 9 Mar 2008 22:03:49 -0000 1.89 +++ xulrunner.spec 11 Mar 2008 01:59:49 -0000 1.90 @@ -7,14 +7,14 @@ %define version_internal 1.9pre %if ! %{official_branding} -%define cvsdate 20080309 +%define cvsdate 20080310 %define nightly .cvs%{cvsdate} %endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.37%{?nightly}%{?dist} +Release: 0.38%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -400,6 +400,9 @@ #--------------------------------------------------------------------- %changelog +* Mon Mar 10 2008 Christopher Aillon 1.0-0.38 +- Update to latest trunk (2008-03-10) + * Sun Mar 9 2008 Christopher Aillon 1.0-0.37 - Update to latest trunk (2008-03-09) From fedora-extras-commits at redhat.com Tue Mar 11 02:01:41 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 11 Mar 2008 02:01:41 GMT Subject: rpms/firefox/devel .cvsignore, 1.66, 1.67 firefox.spec, 1.272, 1.273 sources, 1.77, 1.78 Message-ID: <200803110201.m2B21fEZ025184@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19117 Modified Files: .cvsignore firefox.spec sources Log Message: * Mon Mar 10 2008 Christopher Aillon 3.0-0.38 - Update to latest trunk (2008-03-10) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- .cvsignore 9 Mar 2008 22:04:20 -0000 1.66 +++ .cvsignore 11 Mar 2008 02:01:06 -0000 1.67 @@ -1 +1 @@ -mozilla-20080309.tar.bz2 +mozilla-20080310.tar.bz2 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- firefox.spec 10 Mar 2008 04:58:11 -0000 1.272 +++ firefox.spec 11 Mar 2008 02:01:06 -0000 1.273 @@ -12,14 +12,14 @@ %define build_langpacks 0 %if ! %{official_branding} -%define cvsdate 20080309 +%define cvsdate 20080310 %define nightly .cvs%{cvsdate} %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.37%{?nightly}%{?dist} +Release: 0.38%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -314,6 +314,9 @@ #--------------------------------------------------------------------- %changelog +* Mon Mar 10 2008 Christopher Aillon 3.0-0.38 +- Update to latest trunk (2008-03-10) + * Sun Mar 9 2008 Christopher Aillon 3.0-0.37 - Update to latest trunk (2008-03-09) Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/sources,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- sources 9 Mar 2008 22:04:20 -0000 1.77 +++ sources 11 Mar 2008 02:01:06 -0000 1.78 @@ -1 +1 @@ -bcb090a222651dd712fd79f4b3058daf mozilla-20080309.tar.bz2 +686eec8eec8900cdf2ed27e7a2098e5b mozilla-20080310.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 02:03:44 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 02:03:44 GMT Subject: rpms/vte/devel .cvsignore, 1.65, 1.66 sources, 1.65, 1.66 vte.spec, 1.126, 1.127 Message-ID: <200803110203.m2B23iEv025294@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/vte/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25258 Modified Files: .cvsignore sources vte.spec Log Message: 0.16.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/vte/devel/.cvsignore,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- .cvsignore 8 Jan 2008 18:12:01 -0000 1.65 +++ .cvsignore 11 Mar 2008 02:02:57 -0000 1.66 @@ -1 +1 @@ -vte-0.16.12.tar.bz2 +vte-0.16.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/vte/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 8 Jan 2008 18:12:01 -0000 1.65 +++ sources 11 Mar 2008 02:02:57 -0000 1.66 @@ -1 +1 @@ -9816c35be2ff1b0cf57bd831e1344d1d vte-0.16.12.tar.bz2 +40480f20f6b7664f3d364e4f2ed27889 vte-0.16.13.tar.bz2 Index: vte.spec =================================================================== RCS file: /cvs/extras/rpms/vte/devel/vte.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- vte.spec 18 Feb 2008 21:09:20 -0000 1.126 +++ vte.spec 11 Mar 2008 02:02:57 -0000 1.127 @@ -1,11 +1,11 @@ Name: vte -Version: 0.16.12 -Release: 2%{?dist} +Version: 0.16.13 +Release: 1%{?dist} Summary: A terminal emulator License: LGPLv2+ Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source: ftp://ftp.gnome.org/pub/GNOME/sources/vte/0.16/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/vte/0.16/%{name}-%{version}.tar.bz2 BuildRequires: gtk2-devel, pygtk2-devel, python-devel, ncurses-devel BuildRequires: gettext @@ -104,6 +104,9 @@ %doc %{_datadir}/gtk-doc/html/%{name} %changelog +* Mon Mar 10 2008 Matthias Clasen - 0.16.13-1 +- Update to 0.16.13 + * Mon Feb 18 2008 Fedora Release Engineering - 0.16.12-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 02:08:45 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 02:08:45 GMT Subject: rpms/gnome-menus/devel .cvsignore, 1.38, 1.39 gnome-menus.spec, 1.77, 1.78 sources, 1.38, 1.39 Message-ID: <200803110208.m2B28jgU025452@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-menus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25417 Modified Files: .cvsignore gnome-menus.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-menus/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 26 Feb 2008 17:46:04 -0000 1.38 +++ .cvsignore 11 Mar 2008 02:07:42 -0000 1.39 @@ -1 +1 @@ -gnome-menus-2.21.92.tar.bz2 +gnome-menus-2.22.0.tar.bz2 Index: gnome-menus.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-menus/devel/gnome-menus.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- gnome-menus.spec 26 Feb 2008 17:46:04 -0000 1.77 +++ gnome-menus.spec 11 Mar 2008 02:07:42 -0000 1.78 @@ -5,12 +5,12 @@ Summary: A menu system for the GNOME project Name: gnome-menus -Version: 2.21.92 +Version: 2.22.0 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/gnome-menus/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-menus/2.22/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: redhat-menus >= 7.8.9-2 BuildRequires: gamin-devel @@ -98,6 +98,9 @@ %{_includedir}/gnome-menus %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Tue Feb 26 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-menus/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 26 Feb 2008 17:46:04 -0000 1.38 +++ sources 11 Mar 2008 02:07:42 -0000 1.39 @@ -1 +1 @@ -8535a0051b1369cb08d70e54730d51e9 gnome-menus-2.21.92.tar.bz2 +b504e4ea92fcf5b1c2817d682ac5f61c gnome-menus-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 02:14:54 2008 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 11 Mar 2008 02:14:54 GMT Subject: rpms/gnome-scan/F-8 .cvsignore, 1.3, 1.4 gnome-scan.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200803110214.m2B2Es4m025635@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/pkgs/rpms/gnome-scan/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25589 Modified Files: .cvsignore gnome-scan.spec sources Log Message: * Mon Mar 10 2008 Deji Akingunola - 0.6-1 - New release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-scan/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Mar 2008 15:12:45 -0000 1.3 +++ .cvsignore 11 Mar 2008 02:14:20 -0000 1.4 @@ -1 +1 @@ -gnome-scan-0.5.93.tar.bz2 +gnome-scan-0.6.tar.bz2 Index: gnome-scan.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-scan/F-8/gnome-scan.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-scan.spec 8 Mar 2008 15:12:45 -0000 1.2 +++ gnome-scan.spec 11 Mar 2008 02:14:20 -0000 1.3 @@ -1,11 +1,11 @@ Summary: Gnome solution for scanning in the desktop on top of libsane Name: gnome-scan -Version: 0.5.93 +Version: 0.6 Release: 1%{?dist} Group: Applications/System License: LGPLv2+ URL: http://home.gna.org/gnomescan/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libgnomeui-devel sane-backends-devel BuildRequires: gegl-devel gimp-devel @@ -96,21 +96,21 @@ %{_datadir}/gnome-scan/ %files libs -%defattr(-,root,root,-) -%dir %{_libdir}/gnome-scan-1.0 +%defattr(-,root,root,-) %{_libdir}/libgnomescan.so.* -%{_libdir}/gnome-scan-1.0/*.so.* -%{_datadir}/gtk-doc/html/gnome-scan*/ +%{_libdir}/gnome-scan-1.0/ %files devel %defattr(-,root,root,-) %{_includedir}/gnome-scan-1.0/ %{_libdir}/libgnomescan.so -%{_libdir}/gnome-scan-1.0/*.so %{_libdir}/pkgconfig/gnome-scan.pc %doc %{_datadir}/gtk-doc/html/gnome-scan*/ %changelog +* Mon Mar 10 2008 Deji Akingunola - 0.6-1 +- New release + * Sat Mar 08 2008 Deji Akingunola - 0.5.93-1 - New release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-scan/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Mar 2008 15:12:45 -0000 1.3 +++ sources 11 Mar 2008 02:14:20 -0000 1.4 @@ -1 +1 @@ -1e08cf7ea0358bc4078bdc21b32792c7 gnome-scan-0.5.93.tar.bz2 +4bdf2d0ce27893aa802743d24b853afd gnome-scan-0.6.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 02:15:23 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 02:15:23 GMT Subject: rpms/control-center/devel .cvsignore, 1.71, 1.72 control-center.spec, 1.346, 1.347 sources, 1.74, 1.75 Message-ID: <200803110215.m2B2FNY6025694@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/control-center/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25565 Modified Files: .cvsignore control-center.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- .cvsignore 28 Feb 2008 04:14:30 -0000 1.71 +++ .cvsignore 11 Mar 2008 02:14:26 -0000 1.72 @@ -1 +1 @@ -po.tar.gz +gnome-control-center-2.22.0.tar.bz2 Index: control-center.spec =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v retrieving revision 1.346 retrieving revision 1.347 diff -u -r1.346 -r1.347 --- control-center.spec 2 Mar 2008 22:32:01 -0000 1.346 +++ control-center.spec 11 Mar 2008 02:14:26 -0000 1.347 @@ -21,13 +21,12 @@ Summary: GNOME Control Center Name: control-center -Version: 2.21.92 -Release: 3%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops -Source: http://download.gnome.org/sources/gnome-control-center/2.21/gnome-control-center-%{version}.tar.bz2 -Source1: po.tar.gz +Source: http://download.gnome.org/sources/gnome-control-center/2.22/gnome-control-center-%{version}.tar.bz2 Patch2: control-center-2.20.0-enable-sound-by-default.patch Patch3: control-center-2.19.3-no-gnome-common.patch @@ -37,9 +36,6 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=439398 Patch6: gnome-control-center-2.19.90-no-warnings.patch -# sent to gnome-i18n at gnome.org -Patch7: broken-schema-translations.patch - # call the Fedora/RHEL graphical passwd changing apps Patch95: control-center-2.21.92-passwd.patch Patch96: gnome-control-center-2.21.92-gecos.patch @@ -160,7 +156,6 @@ %prep %setup -q -n gnome-control-center-%{version} -tar xzf %{SOURCE1} %patch2 -p0 -b .enable-sound %patch3 -p1 -b .no-gnome-common @@ -168,7 +163,6 @@ pushd libslab %patch6 -p0 -b .warnings popd -%patch7 -p1 -b .broken-schema-translations # vendor configuration patches %patch95 -p1 -b .passwd @@ -353,6 +347,9 @@ %dir %{_datadir}/gnome-control-center/keybindings %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Sun Mar 2 2008 Soren Sandmann - 2.21.92-3 - Update randr Index: sources =================================================================== RCS file: /cvs/extras/rpms/control-center/devel/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 28 Feb 2008 04:14:30 -0000 1.74 +++ sources 11 Mar 2008 02:14:26 -0000 1.75 @@ -1,2 +1 @@ -f383f2686d397d528841ce8a892cdd44 po.tar.gz -90039cb743f080d03ffd06e46796f4c5 gnome-control-center-2.21.92.tar.bz2 +e6730ac4ee8b14a577978dee6c1cb88f gnome-control-center-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 02:15:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 02:15:55 GMT Subject: rpms/egd/devel egd.spec,1.1,1.2 Message-ID: <200803110215.m2B2Ftdm025720@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/egd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25683 Modified Files: egd.spec Log Message: disable tests on f9 due to builder weirdness Index: egd.spec =================================================================== RCS file: /cvs/pkgs/rpms/egd/devel/egd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- egd.spec 10 Mar 2008 19:42:44 -0000 1.1 +++ egd.spec 11 Mar 2008 02:15:21 -0000 1.2 @@ -1,7 +1,7 @@ Name: egd Summary: Entropy Gathering Daemon Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ or MIT Group: Applications/System Source0: http://download.sourceforge.net/egd/%{name}-%{version}.tar.gz @@ -37,7 +37,8 @@ chmod -R u+w $RPM_BUILD_ROOT/* %check -make test +# Test doesn't work on F-9 builder. No idea why. Works fine locally. +# make test %clean rm -rf $RPM_BUILD_ROOT @@ -48,5 +49,8 @@ %{_bindir}/egd.pl %changelog +* Mon Mar 10 2008 Tom "spot" Callaway 0.9-2 +- disable tests on f9 due to builder weirdness + * Wed Feb 27 2008 Tom "spot" Callaway 0.9-1 - Initial package for Fedora From fedora-extras-commits at redhat.com Tue Mar 11 02:21:31 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 02:21:31 GMT Subject: rpms/nautilus/devel .cvsignore, 1.68, 1.69 nautilus.spec, 1.186, 1.187 sources, 1.72, 1.73 Message-ID: <200803110221.m2B2LVLZ025971@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/nautilus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25911 Modified Files: .cvsignore nautilus.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- .cvsignore 26 Feb 2008 11:17:59 -0000 1.68 +++ .cvsignore 11 Mar 2008 02:20:47 -0000 1.69 @@ -1 +1 @@ -nautilus-2.21.92.tar.bz2 +nautilus-2.22.0.tar.bz2 Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- nautilus.spec 26 Feb 2008 12:50:22 -0000 1.186 +++ nautilus.spec 11 Mar 2008 02:20:47 -0000 1.187 @@ -18,11 +18,11 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME -Version: 2.21.92 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops -Source: http://download.gnome.org/sources/%{name}/2.21/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org/projects/nautilus/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -225,6 +225,9 @@ %{_libdir}/*.so %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Tue Feb 26 2008 Tomas Bzatek - 2.21.92-2 - Change libbeagle .so name for libbeagle-0.3.0 in nautilus-2.21.1-dynamic-search-r2.patch (#434722) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/sources,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- sources 26 Feb 2008 11:17:59 -0000 1.72 +++ sources 11 Mar 2008 02:20:47 -0000 1.73 @@ -1 +1 @@ -2578ba7bc1d008debcad5e721aa8eab8 nautilus-2.21.92.tar.bz2 +0fcc02e92cfad239af27e0b47438c44c nautilus-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 02:22:22 2008 From: fedora-extras-commits at redhat.com (William Jon McCann (mccann)) Date: Tue, 11 Mar 2008 02:22:22 GMT Subject: rpms/gdm/devel gdm-null-user.patch,NONE,1.1 gdm.spec,1.343,1.344 Message-ID: <200803110222.m2B2MMfr026091@cvs-int.fedora.redhat.com> Author: mccann Update of /cvs/pkgs/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25967 Modified Files: gdm.spec Added Files: gdm-null-user.patch Log Message: - Fix case where we can't lookup a user. gdm-null-user.patch: --- NEW FILE gdm-null-user.patch --- Index: gui/user-switch-applet/applet.c =================================================================== --- gui/user-switch-applet/applet.c (revision 5994) +++ gui/user-switch-applet/applet.c (revision 5995) @@ -1082,14 +1082,23 @@ fill_applet (PanelApplet *applet) gtk_widget_show (hbox); { - GdmUser *user; + GdmUser *user; + const char *name; user = gdm_user_manager_get_user_by_uid (adata->manager, getuid ()); - adata->imglabel = gtk_label_new (gdm_user_get_real_name (user)); - adata->user_notify_id = g_signal_connect (user, - "notify::display-name", - G_CALLBACK (user_notify_display_name_cb), - adata->imglabel); + if (user != NULL) { + name = gdm_user_get_real_name (user); + } else { + name = _("Unknown"); + } + + adata->imglabel = gtk_label_new (name); + if (user != NULL) { + adata->user_notify_id = g_signal_connect (user, + "notify::display-name", + G_CALLBACK (user_notify_display_name_cb), + adata->imglabel); + } gtk_box_pack_start (GTK_BOX (hbox), adata->imglabel, TRUE, TRUE, 0); gtk_widget_show (adata->imglabel); } Index: gui/simple-greeter/gdm-user-manager.c =================================================================== --- gui/simple-greeter/gdm-user-manager.c (revision 5994) +++ gui/simple-greeter/gdm-user-manager.c (revision 5995) @@ -1115,6 +1115,11 @@ process_ck_history_line (GdmUserManager } user = gdm_user_manager_get_user (manager, username); + if (user == NULL) { + g_debug ("GdmUserManager: unable to lookup user '%s'", username); + return; + } + g_object_set (user, "login-frequency", frequency, NULL); g_signal_emit (manager, signals [USER_LOGIN_FREQUENCY_CHANGED], 0, user); } Index: ChangeLog =================================================================== --- ChangeLog (revision 5994) +++ ChangeLog (revision 5995) @@ -1,5 +1,12 @@ 2008-03-10 William Jon McCann + * gui/simple-greeter/gdm-user-manager.c: (process_ck_history_line): + * gui/user-switch-applet/applet.c: (fill_applet): + Handle case where we can't lookup a GdmUser (for whatever reason). + Could be gone, excluded, etc... + +2008-03-10 William Jon McCann + * configure.ac: Post release version bump ==== 2.21.9 ==== Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.343 retrieving revision 1.344 diff -u -r1.343 -r1.344 --- gdm.spec 11 Mar 2008 00:32:27 -0000 1.343 +++ gdm.spec 11 Mar 2008 02:21:33 -0000 1.344 @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.21.9 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -77,6 +77,7 @@ Requires: audit-libs >= %{libauditver} +Patch1: gdm-null-user.patch Patch99: gdm-2.21.8-fedora-logo.patch %package user-switch-applet @@ -97,6 +98,7 @@ %prep %setup -q +%patch1 -p0 -b .null-user %patch99 -p1 -b .fedora-logo %build @@ -290,6 +292,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Mon Mar 10 2008 Jon McCann - 1:2.21.9-2 +- Fix case where we can't lookup a user. + * Mon Mar 10 2008 Jon McCann - 1:2.21.9-1 - Update to 2.21.9 From fedora-extras-commits at redhat.com Tue Mar 11 02:22:37 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 11 Mar 2008 02:22:37 GMT Subject: rpms/z88dk/F-7 z88dk-1.8-makefile-fixes.patch, NONE, 1.1 z88dk-1.8-makefile-usr-share.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 z88dk.spec, 1.7, 1.8 z88dk-1.7-makefile-fixes.patch, 1.1, NONE z88make.patch, 1.1, NONE Message-ID: <200803110222.m2B2Mb2w026144@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/z88dk/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25988/F-7 Modified Files: .cvsignore sources z88dk.spec Added Files: z88dk-1.8-makefile-fixes.patch z88dk-1.8-makefile-usr-share.patch Removed Files: z88dk-1.7-makefile-fixes.patch z88make.patch Log Message: Sync from devel: * Mon Mar 10 2008 Kevin Kofler - 1.8-1 - update to 1.8 - update makefile-fixes patch (most issues fixed upstream, only one left) - update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch - remove redundant sed (already covered by above patch) - use DESTDIR instead of makeinstall macro (fixes buildroot in .cfg files) z88dk-1.8-makefile-fixes.patch: --- NEW FILE z88dk-1.8-makefile-fixes.patch --- diff -ur z88dk/libsrc/time/Makefile z88dk-makefile-fixes/libsrc/time/Makefile --- z88dk/libsrc/time/Makefile 2006-06-18 19:59:40.000000000 +0200 +++ z88dk-makefile-fixes/libsrc/time/Makefile 2007-12-06 08:52:10.000000000 +0100 @@ -11,6 +11,8 @@ lzx: spectrum_time +lnewbrain: time newbrain_time + time: gmtime.o localtime.o mktime.o .c.o: @@ -25,6 +27,9 @@ spectrum_time: cd spectrum ; $(MAKE) ; cd .. +newbrain_time: + cd newbrain ; $(MAKE) ; cd .. + clean: $(RM) *.o* *.i *.sym *.map zcc_opt.def $(RM) zx81/*.o* z88dk-1.8-makefile-usr-share.patch: --- NEW FILE z88dk-1.8-makefile-usr-share.patch --- diff -ur z88dk/Makefile z88dk-makefile-usr-share/Makefile --- z88dk/Makefile 2008-03-01 16:06:51.000000000 +0100 +++ z88dk-makefile-usr-share/Makefile 2008-03-11 01:27:29.000000000 +0100 @@ -7,7 +7,7 @@ # ---> Configurable parameters are below his point -prefix = /usr/local +prefix = /usr prefix_share = $(prefix)/share # The default machine, the lib/config/DEFAULT.cfg file is copied to zcc.cfg @@ -51,7 +51,7 @@ setup: - echo '#define PREFIX "${prefix}$"/lib/z88dk"' > src/config.h + echo '#define PREFIX "'$(prefix_share)'/z88dk"' > src/config.h echo '#define UNIX 1' >> src/config.h appmake: @@ -87,9 +87,9 @@ cd libsrc ; $(MAKE) install install-libs: - mkdir -p $(prefix)/lib/z88dk/lib/clibs - cp -R lib/clibs/* $(prefix)/lib/z88dk/lib/clibs/ - find $(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644 + mkdir -p $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs + cp -R lib/clibs/* $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs/ + find $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs -type f | xargs chmod 644 install: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/F-7/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Dec 2007 08:24:42 -0000 1.3 +++ .cvsignore 11 Mar 2008 02:21:47 -0000 1.4 @@ -1 +1 @@ -z88dk-src-1.7.tgz +z88dk-src-1.8.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/F-7/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Dec 2007 08:24:42 -0000 1.3 +++ sources 11 Mar 2008 02:21:47 -0000 1.4 @@ -1 +1 @@ -cbb910bcb8beb0b15b101a4420d3fb25 z88dk-src-1.7.tgz +f3a762cb6263430f76163e3e85fa1102 z88dk-src-1.8.tgz Index: z88dk.spec =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/F-7/z88dk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- z88dk.spec 7 Dec 2007 14:48:46 -0000 1.7 +++ z88dk.spec 11 Mar 2008 02:21:47 -0000 1.8 @@ -1,12 +1,12 @@ Summary: A Z80 cross compiler Name: z88dk -Version: 1.7 -Release: 2%{?dist} +Version: 1.8 +Release: 1%{?dist} License: Artistic clarified Group: Development/Tools Source: http://downloads.sourceforge.net/z88dk/z88dk-src-%{version}.tgz -Patch0: z88make.patch -Patch1: z88dk-1.7-makefile-fixes.patch +Patch0: z88dk-1.8-makefile-usr-share.patch +Patch1: z88dk-1.8-makefile-fixes.patch Patch2: z88dk-1.7-64bit.patch URL: http://z88dk.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,7 +18,9 @@ %prep %setup -q -n z88dk -%patch0 -p0 +# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk +# Also support DESTDIR in install-libs +%patch0 -p1 # Lots of buggy makefiles there %patch1 -p1 # 64-bit fixes @@ -27,9 +29,6 @@ # Separate manpages from other docs and fix their permissions %{__mv} doc/netman . %{__chmod} 644 netman/man3z/* -# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk -%{__sed} -i -e 's@[$][(]prefix[)]/lib/z88dk@$(datadir)/z88dk at g' \ - -e 's@[$][{]prefix[}][$]/lib/z88dk@%{_datadir}/z88dk at g' Makefile # Fix files with wrong line endings and bad permissions /usr/bin/find doc examples src -type f -exec %{__sed} -i -e 's/\r*$//' {} \; /usr/bin/find doc examples src -type f -exec %{__chmod} 644 {} \; @@ -53,7 +52,7 @@ export ZCCCFG=%{_datadir}/z88dk-%{version}/lib/config/ %{__rm} -rf %{buildroot} %{__mkdir} %{buildroot} -%{makeinstall} install-libs +%{__make} install install-libs DESTDIR=%{buildroot} %{__mkdir_p} %{buildroot}%{_mandir}/man3z %{__cp} -p netman/man3z/* %{buildroot}%{_mandir}/man3z @@ -78,6 +77,16 @@ %{_mandir}/man3z/ %changelog +* Mon Mar 10 2008 Kevin Kofler - 1.8-1 +- update to 1.8 +- update makefile-fixes patch (most issues fixed upstream, only one left) +- update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch +- remove redundant sed (already covered by above patch) +- use DESTDIR instead of makeinstall macro (fixes buildroot in .cfg files) + +* Sat Feb 9 2008 Kevin Kofler - 1.7-3 +- rebuild for GCC 4.3 + * Fri Dec 7 2007 Kevin Kofler - 1.7-2 - patch for 64-bit issues (#185511) - drop ExcludeArch for 64-bit architectures (#185511) --- z88dk-1.7-makefile-fixes.patch DELETED --- --- z88make.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 02:22:44 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 11 Mar 2008 02:22:44 GMT Subject: rpms/z88dk/F-8 z88dk-1.8-makefile-fixes.patch, NONE, 1.1 z88dk-1.8-makefile-usr-share.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 z88dk.spec, 1.8, 1.9 z88dk-1.7-makefile-fixes.patch, 1.1, NONE z88make.patch, 1.1, NONE Message-ID: <200803110222.m2B2Mi27026149@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/z88dk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25988/F-8 Modified Files: .cvsignore sources z88dk.spec Added Files: z88dk-1.8-makefile-fixes.patch z88dk-1.8-makefile-usr-share.patch Removed Files: z88dk-1.7-makefile-fixes.patch z88make.patch Log Message: Sync from devel: * Mon Mar 10 2008 Kevin Kofler - 1.8-1 - update to 1.8 - update makefile-fixes patch (most issues fixed upstream, only one left) - update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch - remove redundant sed (already covered by above patch) - use DESTDIR instead of makeinstall macro (fixes buildroot in .cfg files) z88dk-1.8-makefile-fixes.patch: --- NEW FILE z88dk-1.8-makefile-fixes.patch --- diff -ur z88dk/libsrc/time/Makefile z88dk-makefile-fixes/libsrc/time/Makefile --- z88dk/libsrc/time/Makefile 2006-06-18 19:59:40.000000000 +0200 +++ z88dk-makefile-fixes/libsrc/time/Makefile 2007-12-06 08:52:10.000000000 +0100 @@ -11,6 +11,8 @@ lzx: spectrum_time +lnewbrain: time newbrain_time + time: gmtime.o localtime.o mktime.o .c.o: @@ -25,6 +27,9 @@ spectrum_time: cd spectrum ; $(MAKE) ; cd .. +newbrain_time: + cd newbrain ; $(MAKE) ; cd .. + clean: $(RM) *.o* *.i *.sym *.map zcc_opt.def $(RM) zx81/*.o* z88dk-1.8-makefile-usr-share.patch: --- NEW FILE z88dk-1.8-makefile-usr-share.patch --- diff -ur z88dk/Makefile z88dk-makefile-usr-share/Makefile --- z88dk/Makefile 2008-03-01 16:06:51.000000000 +0100 +++ z88dk-makefile-usr-share/Makefile 2008-03-11 01:27:29.000000000 +0100 @@ -7,7 +7,7 @@ # ---> Configurable parameters are below his point -prefix = /usr/local +prefix = /usr prefix_share = $(prefix)/share # The default machine, the lib/config/DEFAULT.cfg file is copied to zcc.cfg @@ -51,7 +51,7 @@ setup: - echo '#define PREFIX "${prefix}$"/lib/z88dk"' > src/config.h + echo '#define PREFIX "'$(prefix_share)'/z88dk"' > src/config.h echo '#define UNIX 1' >> src/config.h appmake: @@ -87,9 +87,9 @@ cd libsrc ; $(MAKE) install install-libs: - mkdir -p $(prefix)/lib/z88dk/lib/clibs - cp -R lib/clibs/* $(prefix)/lib/z88dk/lib/clibs/ - find $(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644 + mkdir -p $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs + cp -R lib/clibs/* $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs/ + find $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs -type f | xargs chmod 644 install: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Dec 2007 08:23:40 -0000 1.3 +++ .cvsignore 11 Mar 2008 02:22:07 -0000 1.4 @@ -1 +1 @@ -z88dk-src-1.7.tgz +z88dk-src-1.8.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Dec 2007 08:23:40 -0000 1.3 +++ sources 11 Mar 2008 02:22:07 -0000 1.4 @@ -1 +1 @@ -cbb910bcb8beb0b15b101a4420d3fb25 z88dk-src-1.7.tgz +f3a762cb6263430f76163e3e85fa1102 z88dk-src-1.8.tgz Index: z88dk.spec =================================================================== RCS file: /cvs/pkgs/rpms/z88dk/F-8/z88dk.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- z88dk.spec 7 Dec 2007 14:47:44 -0000 1.8 +++ z88dk.spec 11 Mar 2008 02:22:07 -0000 1.9 @@ -1,12 +1,12 @@ Summary: A Z80 cross compiler Name: z88dk -Version: 1.7 -Release: 2%{?dist} +Version: 1.8 +Release: 1%{?dist} License: Artistic clarified Group: Development/Tools Source: http://downloads.sourceforge.net/z88dk/z88dk-src-%{version}.tgz -Patch0: z88make.patch -Patch1: z88dk-1.7-makefile-fixes.patch +Patch0: z88dk-1.8-makefile-usr-share.patch +Patch1: z88dk-1.8-makefile-fixes.patch Patch2: z88dk-1.7-64bit.patch URL: http://z88dk.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,7 +18,9 @@ %prep %setup -q -n z88dk -%patch0 -p0 +# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk +# Also support DESTDIR in install-libs +%patch0 -p1 # Lots of buggy makefiles there %patch1 -p1 # 64-bit fixes @@ -27,9 +29,6 @@ # Separate manpages from other docs and fix their permissions %{__mv} doc/netman . %{__chmod} 644 netman/man3z/* -# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk -%{__sed} -i -e 's@[$][(]prefix[)]/lib/z88dk@$(datadir)/z88dk at g' \ - -e 's@[$][{]prefix[}][$]/lib/z88dk@%{_datadir}/z88dk at g' Makefile # Fix files with wrong line endings and bad permissions /usr/bin/find doc examples src -type f -exec %{__sed} -i -e 's/\r*$//' {} \; /usr/bin/find doc examples src -type f -exec %{__chmod} 644 {} \; @@ -53,7 +52,7 @@ export ZCCCFG=%{_datadir}/z88dk-%{version}/lib/config/ %{__rm} -rf %{buildroot} %{__mkdir} %{buildroot} -%{makeinstall} install-libs +%{__make} install install-libs DESTDIR=%{buildroot} %{__mkdir_p} %{buildroot}%{_mandir}/man3z %{__cp} -p netman/man3z/* %{buildroot}%{_mandir}/man3z @@ -78,6 +77,16 @@ %{_mandir}/man3z/ %changelog +* Mon Mar 10 2008 Kevin Kofler - 1.8-1 +- update to 1.8 +- update makefile-fixes patch (most issues fixed upstream, only one left) +- update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch +- remove redundant sed (already covered by above patch) +- use DESTDIR instead of makeinstall macro (fixes buildroot in .cfg files) + +* Sat Feb 9 2008 Kevin Kofler - 1.7-3 +- rebuild for GCC 4.3 + * Fri Dec 7 2007 Kevin Kofler - 1.7-2 - patch for 64-bit issues (#185511) - drop ExcludeArch for 64-bit architectures (#185511) --- z88dk-1.7-makefile-fixes.patch DELETED --- --- z88make.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 02:28:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 02:28:36 GMT Subject: rpms/udunits/devel udunits.spec,1.15,1.16 Message-ID: <200803110228.m2B2SaR3026397@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/udunits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26362 Modified Files: udunits.spec Log Message: ia64 doesnt need lib64 hack Index: udunits.spec =================================================================== RCS file: /cvs/pkgs/rpms/udunits/devel/udunits.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- udunits.spec 7 Mar 2008 02:22:54 -0000 1.15 +++ udunits.spec 11 Mar 2008 02:27:40 -0000 1.16 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A library for manipulating units of physical quantities License: MIT Group: System Environment/Libraries @@ -56,7 +56,7 @@ %setup -q %patch0 -p1 # Yes, this is a dirty hack. -%ifarch x86_64 ppc64 sparc64 ia64 +%ifarch x86_64 ppc64 sparc64 %patch1 -p1 %endif @@ -127,8 +127,11 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Mon Mar 10 2008 Tom "spot" Callaway - 1.12.4-15 +- ia64 doesn't need lib64 hack + * Thu Mar 06 2008 Tom "spot" Callaway - 1.12.4-14 -Rebuild for new perl +- Rebuild for new perl * Tue Feb 19 2008 Fedora Release Engineering - 1.12.4-13 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 02:37:10 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 02:37:10 GMT Subject: rpms/glib2/devel .cvsignore, 1.84, 1.85 glib2.spec, 1.159, 1.160 sources, 1.86, 1.87 Message-ID: <200803110237.m2B2bAOd026621@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/glib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26570 Modified Files: .cvsignore glib2.spec sources Log Message: 2.16.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/.cvsignore,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- .cvsignore 10 Mar 2008 20:47:46 -0000 1.84 +++ .cvsignore 11 Mar 2008 02:36:34 -0000 1.85 @@ -1 +1 @@ -glib-2.16.0.tar.bz2 +glib-2.16.1.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- glib2.spec 10 Mar 2008 20:47:46 -0000 1.159 +++ glib2.spec 11 Mar 2008 02:36:34 -0000 1.160 @@ -2,7 +2,7 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.16.0 +Version: 2.16.1 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -123,6 +123,9 @@ %{_libdir}/lib*.a %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.16.1-1 +- Update to 2.16.1 + * Mon Mar 10 2008 Matthias Clasen - 2.16.0-1 - Update to 2.16.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/glib2/devel/sources,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- sources 10 Mar 2008 20:47:46 -0000 1.86 +++ sources 11 Mar 2008 02:36:34 -0000 1.87 @@ -1 +1 @@ -9b1e503956265050bc0bfd9feb2cc2d2 glib-2.16.0.tar.bz2 +9852daf0605f827bfd7199ffe4f5b22d glib-2.16.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 02:45:08 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 02:45:08 GMT Subject: rpms/srecord/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 srecord.spec, 1.16, 1.17 Message-ID: <200803110245.m2B2j8CC026795@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/srecord/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26765 Modified Files: .cvsignore sources srecord.spec Log Message: update to 1.39 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/srecord/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 11 Aug 2007 19:16:35 -0000 1.14 +++ .cvsignore 11 Mar 2008 02:44:29 -0000 1.15 @@ -1 +1 @@ -srecord-1.36.tar.gz +srecord-1.39.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/srecord/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 11 Aug 2007 19:16:35 -0000 1.14 +++ sources 11 Mar 2008 02:44:29 -0000 1.15 @@ -1 +1 @@ -8fce124d47f23b4aa187c3b8eebc9fd7 srecord-1.36.tar.gz +1d8a8a62cdb7d1c1b3ca0fe05f407290 srecord-1.39.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/pkgs/rpms/srecord/devel/srecord.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- srecord.spec 20 Feb 2008 01:51:13 -0000 1.16 +++ srecord.spec 11 Mar 2008 02:44:29 -0000 1.17 @@ -1,6 +1,6 @@ Name: srecord -Version: 1.36 -Release: 2%{?dist} +Version: 1.39 +Release: 1%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools @@ -15,15 +15,15 @@ The SRecord package is a collection of powerful tools for manipulating EPROM load files. -* The SRecord package understands a number of file formats: Motorola +- The SRecord package understands a number of file formats: Motorola S-Record, Intel, Tektronix, Binary. These file formats may be read and written. Also C array definitions, for output only. -* The SRecord package has a number of tools: srec_cat for copying and +- The SRecord package has a number of tools: srec_cat for copying and and converting files, srec_cmp for comparing files and srec_info for printing summaries. -* The SRecord package has a number for filters: checksum to add checksums +- The SRecord package has a number for filters: checksum to add checksums to the data, crop to keep address ranges, exclude to remove address ranges, fill to plug holes in the data, length to insert the data length, maximum to insert the data address maximum, minimum to insert @@ -45,7 +45,8 @@ %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +# srecord is too smart. It uses DESTDIR and RPM_BUILD_ROOT here. +make install %check # Test scripts requirements: cmp, diff, uudecode @@ -64,6 +65,9 @@ %changelog +* Mon Mar 10 2008 Tom "spot" Callaway - 1.39-1 +- update to 1.39 + * Tue Feb 19 2008 Fedora Release Engineering - 1.36-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 02:48:10 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 02:48:10 GMT Subject: rpms/gnome-session/devel .cvsignore, 1.51, 1.52 gnome-session.spec, 1.153, 1.154 sources, 1.51, 1.52 Message-ID: <200803110248.m2B2mAoS026935@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26908 Modified Files: .cvsignore gnome-session.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 6 Mar 2008 15:03:53 -0000 1.51 +++ .cvsignore 11 Mar 2008 02:47:35 -0000 1.52 @@ -1 +1 @@ -gnome-session-2.21.93.tar.bz2 +gnome-session-2.22.0.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- gnome-session.spec 6 Mar 2008 15:06:13 -0000 1.153 +++ gnome-session.spec 11 Mar 2008 02:47:35 -0000 1.154 @@ -11,10 +11,10 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.21.93 +Version: 2.22.0 Release: 1%{?dist} URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-session/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-session/2.22/%{name}-%{version}.tar.bz2 Source1: redhat-default-session Source2: gnome.desktop License: GPLv2+ @@ -182,6 +182,9 @@ %doc %{_mandir}/man*/* %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Thu Mar 06 2008 - Bastien Nocera - 2.21.93-1 - Update to 2.21.93, drop esound dependencies and patches Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-session/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 6 Mar 2008 15:03:53 -0000 1.51 +++ sources 11 Mar 2008 02:47:35 -0000 1.52 @@ -1 +1 @@ -d54c519c87f20130d9b52ffd631840c9 gnome-session-2.21.93.tar.bz2 +5f9531565c5ec08104c3518c72c79f42 gnome-session-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 02:51:55 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Tue, 11 Mar 2008 02:51:55 GMT Subject: rpms/empathy/devel .cvsignore, 1.11, 1.12 empathy.spec, 1.19, 1.20 sources, 1.11, 1.12 Message-ID: <200803110251.m2B2pttG027072@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/empathy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27029 Modified Files: .cvsignore empathy.spec sources Log Message: Update to 0.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 9 Mar 2008 19:41:59 -0000 1.11 +++ .cvsignore 11 Mar 2008 02:51:15 -0000 1.12 @@ -1 +1 @@ -empathy-0.21.91.tar.bz2 +empathy-0.22.0.tar.bz2 Index: empathy.spec =================================================================== RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- empathy.spec 9 Mar 2008 20:02:17 -0000 1.19 +++ empathy.spec 11 Mar 2008 02:51:15 -0000 1.20 @@ -5,19 +5,19 @@ ## respectively. %global gtk2_min_version 2.12 %global glib2_min_version 2.14 -%global tp_mc_min_version 4.37 +%global tp_mc_min_version 4.53 %global libtp_min_version 0.3.1 -%global tp_glib_min_version 0.7.0 +%global tp_glib_min_version 0.7.3 Name: empathy -Version: 0.21.91 +Version: 0.22.0 Release: 1%{?dist} Summary: GNOME Instant Messaging Client Group: Applications/Communications License: GPLv2+ URL: http://live.gnome.org/Empathy -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.21/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.22/%{name}-%{version}.tar.bz2 Source1: %{name}-README.ConnectionManagers BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -227,6 +227,9 @@ %changelog +* Mon Mar 10 2008 Peter Gordon - 0.22.0-1 +- Update to new upstream release (0.22.0) + * Sun Mar 09 2008 Peter Gordon - 0.21.91-1 - Update to new upstream release (0.21.91) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 9 Mar 2008 19:41:59 -0000 1.11 +++ sources 11 Mar 2008 02:51:15 -0000 1.12 @@ -1 +1 @@ -e25d4bfd0c91b53bff498c6bbfd1bfc1 empathy-0.21.91.tar.bz2 +79807f44a3710a6cd07437e9371bfc62 empathy-0.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 02:52:41 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 02:52:41 GMT Subject: rpms/gnome-desktop/devel .cvsignore, 1.60, 1.61 gnome-desktop.spec, 1.132, 1.133 sources, 1.60, 1.61 Message-ID: <200803110252.m2B2qfiu027110@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-desktop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27064 Modified Files: .cvsignore gnome-desktop.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-desktop/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 26 Feb 2008 18:11:25 -0000 1.60 +++ .cvsignore 11 Mar 2008 02:51:55 -0000 1.61 @@ -1 +1 @@ -gnome-desktop-2.21.92.tar.bz2 +gnome-desktop-2.22.0.tar.bz2 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- gnome-desktop.spec 2 Mar 2008 22:18:51 -0000 1.132 +++ gnome-desktop.spec 11 Mar 2008 02:51:55 -0000 1.133 @@ -11,10 +11,10 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop -Version: 2.21.92 -Release: 3%{?dist} +Version: 2.22.0 +Release: 1%{?dist} URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-desktop/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-desktop/2.22/%{name}-%{version}.tar.bz2 License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -121,6 +121,9 @@ %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Sun Mar 2 2008 Soren Sandmann - 2.21.92-3 - Update randr code with more display manufacturers. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-desktop/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 26 Feb 2008 18:11:25 -0000 1.60 +++ sources 11 Mar 2008 02:51:55 -0000 1.61 @@ -1 +1 @@ -e1c96ac395d228b3c244e8e402e7c3a6 gnome-desktop-2.21.92.tar.bz2 +452d4ee91b3c54aac4282f3f1e3b68f0 gnome-desktop-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 03:06:49 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 03:06:49 GMT Subject: rpms/seahorse/devel .cvsignore, 1.11, 1.12 seahorse.spec, 1.40, 1.41 sources, 1.13, 1.14 Message-ID: <200803110306.m2B36n2P002096@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/seahorse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2064 Modified Files: .cvsignore seahorse.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 Feb 2008 23:31:39 -0000 1.11 +++ .cvsignore 11 Mar 2008 03:06:15 -0000 1.12 @@ -1 +1 @@ -seahorse-2.21.92.tar.bz2 +seahorse-2.22.0.tar.bz2 Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- seahorse.spec 26 Feb 2008 23:34:28 -0000 1.40 +++ seahorse.spec 11 Mar 2008 03:06:15 -0000 1.41 @@ -1,5 +1,5 @@ Name: seahorse -Version: 2.21.92 +Version: 2.22.0 Release: 1%{?dist} Summary: GNOME2 interface for gnupg Group: User Interface/Desktops @@ -7,7 +7,7 @@ # libcryptui is LGPLv2+ License: GPLv2+ and LGPLv2+ URL: http://seahorse.sourceforge.net/ -Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.21/%{name}-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.22/%{name}-%{version}.tar.bz2 Source1: seahorse-agent.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -168,6 +168,9 @@ %changelog +* Mon Mar 10 2008 Matthias Clasen 2.22.0-1 +- Update to 2.22.0 + * Tue Feb 26 2008 Matthias Clasen 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 26 Feb 2008 23:31:39 -0000 1.13 +++ sources 11 Mar 2008 03:06:15 -0000 1.14 @@ -1 +1 @@ -5c5a31a4f8d13866bb0ff92880b5ce03 seahorse-2.21.92.tar.bz2 +5dd87139d872c51c17de55ab4779a52a seahorse-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 03:11:50 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 11 Mar 2008 03:11:50 GMT Subject: devel/rhpxl rhpxl-0.49-no-more-input.patch, NONE, 1.1 rhpxl.spec, 1.66, 1.67 Message-ID: <200803110311.m2B3BoTI002256@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/rhpxl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2211 Modified Files: rhpxl.spec Added Files: rhpxl-0.49-no-more-input.patch Log Message: * Mon Mar 10 2008 Jeremy Katz - 0.49-5 - Don't write out input sections in xorg.conf -- input hotplug should take care of them all rhpxl-0.49-no-more-input.patch: --- NEW FILE rhpxl-0.49-no-more-input.patch --- diff --git a/rhpxl/xhwstate.py b/rhpxl/xhwstate.py index ed331f7..97a32fe 100644 --- a/rhpxl/xhwstate.py +++ b/rhpxl/xhwstate.py @@ -628,7 +628,7 @@ class XF86HardwareState: # # given a hardware state and a mouse and kbd spec, return X config file # - def generate_xconfig(self, mouse, keyboard): + def generate_xconfig(self, mouse = None, keyboard = None): xconfig = xf86config.createTemplate() self.merge_into(xconfig) @@ -642,26 +642,27 @@ class XF86HardwareState: device.options.insert(option) return option - corekb = xf86config.getCoreKeyboard(xconfig) - - try: - #Let's assume we know what kind of keyboard this is - get_option(corekb, "XkbModel").val = keyboard["model"] - get_option(corekb, "XkbLayout").val = keyboard["layout"] - except: - #Ok, the keyboard from /etc/sysconfig/keyboard isn't in rhpl's list, so let's assume US keyboard - #Maybe this isn't the best thing to do, but it will work for most people - keyboard.set("us") - get_option(corekb, "XkbModel").val = keyboard["model"] - get_option(corekb, "XkbLayout").val = keyboard["layout"] - - if keyboard["options"] != "": - get_option(corekb, "XkbOptions").val = keyboard["options"] - if keyboard["variant"] != "": - get_option(corekb, "XkbVariant").val = keyboard["variant"] + if False: #keyboard is not None: + corekb = xf86config.getCoreKeyboard(xconfig) + + try: + #Let's assume we know what kind of keyboard this is + get_option(corekb, "XkbModel").val = keyboard["model"] + get_option(corekb, "XkbLayout").val = keyboard["layout"] + except: + #Ok, the keyboard from /etc/sysconfig/keyboard isn't in rhpl's list, so let's assume US keyboard + #Maybe this isn't the best thing to do, but it will work for most people + keyboard.set("us") + get_option(corekb, "XkbModel").val = keyboard["model"] + get_option(corekb, "XkbLayout").val = keyboard["layout"] + + if keyboard["options"] != "": + get_option(corekb, "XkbOptions").val = keyboard["options"] + if keyboard["variant"] != "": + get_option(corekb, "XkbVariant").val = keyboard["variant"] # if no mouse defined then skip - if mouse.getDevice() is not None: + if mouse is not None and mouse.getDevice() is not None: #Synaptics support baseArch = rhpl.getArch() if baseArch in ("x86_64", "ppc64", "s390x", "sparc64"): @@ -731,20 +732,4 @@ class XF86HardwareState: get_option(xconfig.flags, "AllowMouseOpenFail").val = "yes" - ## Check for IBM RSA I device and if it exist add the stanza - ibmasmhw = ibmasm.ibmasmCheck() - if ibmasmhw.isDevicePresent(): - ibmasm_conf = xf86config.XF86ConfInput() - xconfig.input.insert(ibmasm_conf) - ibmasm_conf.identifier = "ibmasm_remote" - ibmasm_conf.driver = "ibmasm" - get_option(ibmasm_conf, "Device").val = "" - (w, h) = resolution_from_string(self.resolution) - get_option(ibmasm_conf, "XScale").val = str(w) - get_option(ibmasm_conf, "YScale").val = str(h) - get_option(ibmasm_conf, "SendCoreEvents").val = "True" - inputs = xconfig.layout[0].inputs - ibmasm_ref = xf86config.XF86ConfInputref("ibmasm_remote", "") - inputs.insert(ibmasm_ref) - return xconfig diff --git a/rhpxl/xserver.py b/rhpxl/xserver.py index f3daee6..6d11eaa 100644 --- a/rhpxl/xserver.py +++ b/rhpxl/xserver.py @@ -60,7 +60,7 @@ class XServer: if self.hwstate.videocard == None: return - self.config = self.hwstate.generate_xconfig(self.mousehw, self.keyboard) + self.config = self.hwstate.generate_xconfig() def addExtraScreen(self, identifier): screen = xf86config.XF86ConfScreen() @@ -98,7 +98,6 @@ class XServer: logFunc(cardstr) self.monitorhw = monitor.MonitorInfo() - self.mousehw = mouse.Mouse(skipProbe=skipMouseProbe) def startX(self, xStartedCB=None, useFB=False): if not os.access("/usr/bin/Xorg", os.X_OK): Index: rhpxl.spec =================================================================== RCS file: /cvs/pkgs/devel/rhpxl/rhpxl.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- rhpxl.spec 12 Feb 2008 21:21:47 -0000 1.66 +++ rhpxl.spec 11 Mar 2008 03:11:11 -0000 1.67 @@ -4,7 +4,7 @@ Name: rhpxl URL: http://fedoraproject.org/wiki/rhpxl Version: 0.49 -Release: 4%{?dist} +Release: 5%{?dist} Source0: http://ajax.fedoraproject.org/%{name}/%{name}-%{version}.tar.gz License: GPLv2 Group: System Environment/Libraries @@ -16,6 +16,7 @@ Patch0: rhpxl-0.49-pseries-hatred.patch Patch1: rhpxl-0.49-ibmasm.patch +Patch2: rhpxl-0.49-no-more-input.patch %description The rhpxl (pronounced 'rapunzel') package contains a Python library for @@ -25,6 +26,7 @@ %setup -q %patch0 -p1 -b .pseries %patch1 -p1 -b .ibmasm +%patch2 -p1 -b .input %build make %{?_smp_mflags} @@ -47,6 +49,10 @@ %{_sbindir}/ddcprobe %changelog +* Mon Mar 10 2008 Jeremy Katz - 0.49-5 +- Don't write out input sections in xorg.conf -- input hotplug should + take care of them all + * Tue Feb 12 2008 Adam Jackson 0.49-4 - rhpxl-0.49-ibmasm.patch: Fix string handling in ibmasm setup. (#353021) From fedora-extras-commits at redhat.com Tue Mar 11 03:14:43 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 11 Mar 2008 03:14:43 GMT Subject: rpms/NetworkManager/devel .cvsignore, 1.61, 1.62 NetworkManager.spec, 1.197, 1.198 sources, 1.89, 1.90 Message-ID: <200803110314.m2B3Eh6Y002371@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2330 Modified Files: .cvsignore NetworkManager.spec sources Log Message: * Mon Mar 10 2008 Dan Williams - 1:0.7.0-0.8.svn3417 - Honor DHCP rebinds - Multiple active device support - Better error handling of mobile broadband connection failures - Allow use of interface-specific dhclient config files - Recognize system settings which have no TYPE item Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 14 Feb 2008 20:00:03 -0000 1.61 +++ .cvsignore 11 Mar 2008 03:14:08 -0000 1.62 @@ -71,3 +71,5 @@ nm-applet-0.7.0.svn468.tar.gz NetworkManager-0.7.0.svn3319.tar.gz nm-applet-0.7.0.svn526.tar.gz +NetworkManager-0.7.0.svn3417.tar.gz +nm-applet-0.7.0.svn585.tar.gz Index: NetworkManager.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- NetworkManager.spec 3 Mar 2008 01:38:56 -0000 1.197 +++ NetworkManager.spec 11 Mar 2008 03:14:08 -0000 1.198 @@ -8,8 +8,8 @@ %define wireless_tools_version 1:28-0pre9 %define libnl_version 1.0-0.15.pre8.git20071218 -%define snapshot svn3370 -%define applet_snapshot svn571 +%define snapshot svn3417 +%define applet_snapshot svn585 Name: NetworkManager Summary: Network connection manager and user applications @@ -279,6 +279,13 @@ %changelog +* Mon Mar 10 2008 Dan Williams - 1:0.7.0-0.8.svn3417 +- Honor DHCP rebinds +- Multiple active device support +- Better error handling of mobile broadband connection failures +- Allow use of interface-specific dhclient config files +- Recognize system settings which have no TYPE item + * Sun Mar 2 2008 Dan Williams - 1:0.7.0-0.8.svn3370 - Fix crash of nm-system-settings on malformed ifcfg files (rh #434919) - Require gnome-icon-theme to pick up lock.png (rh #435344) Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- sources 3 Mar 2008 01:38:56 -0000 1.89 +++ sources 11 Mar 2008 03:14:08 -0000 1.90 @@ -1,2 +1,2 @@ -d23d10962547ac273926dfb5cc0615e0 NetworkManager-0.7.0.svn3370.tar.gz -9dbb6db9709a8f094dbd5f5e27e15044 nm-applet-0.7.0.svn571.tar.gz +89f7ed354a672f12cc6d85aa53c78ddd NetworkManager-0.7.0.svn3417.tar.gz +ae040d6fe8b0d8a8e84a9be9a7eeb0cd nm-applet-0.7.0.svn585.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 03:15:20 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 03:15:20 GMT Subject: rpms/gnome-media/devel .cvsignore, 1.40, 1.41 gnome-media.spec, 1.124, 1.125 sources, 1.39, 1.40 Message-ID: <200803110315.m2B3FKtO002437@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-media/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2359 Modified Files: .cvsignore gnome-media.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-media/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 19 Sep 2007 10:10:05 -0000 1.40 +++ .cvsignore 11 Mar 2008 03:14:34 -0000 1.41 @@ -1 +1 @@ -gnome-media-2.20.1.tar.gz +gnome-media-2.22.0.tar.bz2 Index: gnome-media.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- gnome-media.spec 7 Mar 2008 03:05:42 -0000 1.124 +++ gnome-media.spec 11 Mar 2008 03:14:34 -0000 1.125 @@ -11,11 +11,11 @@ Summary: GNOME media programs Name: gnome-media -Version: 2.20.1 -Release: 9%{?dist} +Version: 2.22.0 +Release: 1%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Multimedia -Source: http://download.gnome.org/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz +Source: http://download.gnome.org/sources/gnome-media/2.22/gnome-media-%{version}.tar.gz Patch0: gnome-media-2.13.5-hide-help-button.patch # https://bugzilla.redhat.com/show_bug.cgi?id=186791 Patch1: gnome-volume-control-gconf-fixes.patch @@ -207,6 +207,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Thu Mar 6 2008 Matthias Clasen - 2.20.1-9 - Use desktop-file-install for all desktop files Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-media/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 19 Sep 2007 10:10:05 -0000 1.39 +++ sources 11 Mar 2008 03:14:34 -0000 1.40 @@ -1 +1 @@ -e123bc1d79f0e2f926677663ab5745c7 gnome-media-2.20.1.tar.gz +e3fabb87abd2731d7f345d724b40333a gnome-media-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 03:21:40 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 03:21:40 GMT Subject: rpms/gnome-terminal/devel .cvsignore, 1.45, 1.46 gnome-terminal.spec, 1.93, 1.94 sources, 1.46, 1.47 Message-ID: <200803110321.m2B3Leif002584@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2558 Modified Files: .cvsignore gnome-terminal.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-terminal/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 26 Feb 2008 18:50:28 -0000 1.45 +++ .cvsignore 11 Mar 2008 03:21:06 -0000 1.46 @@ -1 +1 @@ -gnome-terminal-2.21.92.tar.bz2 +gnome-terminal-2.22.0.tar.bz2 Index: gnome-terminal.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- gnome-terminal.spec 26 Feb 2008 18:50:28 -0000 1.93 +++ gnome-terminal.spec 11 Mar 2008 03:21:06 -0000 1.94 @@ -10,10 +10,10 @@ Summary: GNOME Terminal Name: gnome-terminal -Version: 2.21.92 +Version: 2.22.0 Release: 1%{?dist} URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/gnome-terminal/2.21/gnome-terminal-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-terminal/2.22/gnome-terminal-%{version}.tar.bz2 # Fix gnome.org Bug 338913 ??? Terminal resized when switching tabs Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch License: GPLv2+ and GFDL+ @@ -121,6 +121,9 @@ %{_libdir}/bonobo/servers/gnome-terminal.server %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Tue Feb 26 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-terminal/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 26 Feb 2008 18:50:28 -0000 1.46 +++ sources 11 Mar 2008 03:21:06 -0000 1.47 @@ -1 +1 @@ -05dabcd06bb4f5de3398e65b374f3387 gnome-terminal-2.21.92.tar.bz2 +e91f000b8157c668940a297d7cfbc9f8 gnome-terminal-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 03:24:49 2008 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 11 Mar 2008 03:24:49 GMT Subject: rpms/twitux/F-8 twitux-0.60-wordwrap.patch, NONE, 1.1 twitux.spec, 1.1, 1.2 Message-ID: <200803110324.m2B3OnwV002766@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/pkgs/rpms/twitux/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2743 Modified Files: twitux.spec Added Files: twitux-0.60-wordwrap.patch Log Message: * Mon Mar 10 2008 Brian Pepple - 0.60-3 - Backport patch to fix listview wordwrap. - Drop BR on openssl-devel. - Update url & source url. twitux-0.60-wordwrap.patch: --- NEW FILE twitux-0.60-wordwrap.patch --- diff -ur twitux-0.60.OLD/data/main.glade twitux-0.60/data/main.glade --- twitux-0.60.OLD/data/main.glade 2007-12-29 16:51:44.000000000 -0500 +++ twitux-0.60/data/main.glade 2008-03-10 22:36:51.000000000 -0400 @@ -287,6 +287,7 @@ True True + GTK_POLICY_NEVER GTK_SHADOW_IN diff -ur twitux-0.60.OLD/src/twitux-tweet-list.c twitux-0.60/src/twitux-tweet-list.c --- twitux-0.60.OLD/src/twitux-tweet-list.c 2007-12-29 16:51:43.000000000 -0500 +++ twitux-0.60/src/twitux-tweet-list.c 2008-03-10 22:35:57.000000000 -0400 @@ -160,6 +160,8 @@ "markup", STRING_TEXT, NULL); + gtk_tree_view_column_set_sizing (tweet_column, GTK_TREE_VIEW_COLUMN_FIXED); + g_object_set (renderer, "ypad", 0, "xpad", 5, @@ -224,7 +226,7 @@ w = gtk_tree_view_column_get_width (priv->text_column); g_object_set (priv->text_renderer, - "wrap-width", w, + "wrap-width", w-10, NULL); } Index: twitux.spec =================================================================== RCS file: /cvs/pkgs/rpms/twitux/F-8/twitux.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- twitux.spec 22 Jan 2008 18:54:26 -0000 1.1 +++ twitux.spec 11 Mar 2008 03:24:16 -0000 1.2 @@ -1,19 +1,30 @@ Name: twitux Version: 0.60 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Twitux is a Twitter client for the Gnome desktop Group: Applications/Internet License: GPLv2+ -URL: http://live.gnome.org/DanielMorales/Twitux -Source0: http://suruware.com/twitux/twitux-%{version}.tar.bz2 +URL: http://sourceforge.net/projects/twitux/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-wordwrap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl-XML-Parser, libsexy-devel, aspell-devel, iso-codes-devel -BuildRequires: openssl-devel, GConf2-devel, libsoup-devel, libnotify-devel -BuildRequires: gettext, desktop-file-utils, libglade2-devel, libgnomeui-devel +BuildRequires: libglade2-devel +BuildRequires: libgnomeui-devel +BuildRequires: libsexy-devel +BuildRequires: GConf2-devel +BuildRequires: libsoup-devel +BuildRequires: libnotify-devel +BuildRequires: aspell-devel +BuildRequires: iso-codes-devel +BuildRequires: gettext +BuildRequires: perl-XML-Parser +BuildRequires: desktop-file-utils + Requires(pre): GConf2 -Requires(post): GConf2, desktop-file-utils +Requires(post): GConf2 +Requires(post): desktop-file-utils Requires(preun):GConf2 Requires(postun): desktop-file-utils @@ -24,6 +35,7 @@ %prep %setup -q +%patch0 -p1 -b .wordwrap %build @@ -83,14 +95,18 @@ %files -f Twitux.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO -%{_sysconfdir}/gconf/schemas/twitux.schemas -%{_bindir}/* -%{_datadir}/twitux -%{_datadir}/applications/* -%{_datadir}/icons/hicolor/*/apps/twitux.* - +%{_bindir}/%{name} +%{_datadir}/%{name}/ +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_sysconfdir}/gconf/schemas/%{name}.schemas %changelog +* Mon Mar 10 2008 Brian Pepple - 0.60-3 +- Backport patch to fix listview wordwrap. +- Drop BR on openssl-devel. +- Update url & source url. + * Sun Jan 13 2008 Konstantin Ryabitsev - 0.60-2 - Clean up BRs - Don't run update-desktop-database in scripts From fedora-extras-commits at redhat.com Tue Mar 11 03:26:34 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 03:26:34 GMT Subject: rpms/bug-buddy/devel .cvsignore, 1.39, 1.40 bug-buddy.spec, 1.93, 1.94 sources, 1.39, 1.40 Message-ID: <200803110326.m2B3QYi8002853@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/bug-buddy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2782 Modified Files: .cvsignore bug-buddy.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bug-buddy/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 31 Jan 2008 04:12:42 -0000 1.39 +++ .cvsignore 11 Mar 2008 03:25:43 -0000 1.40 @@ -1 +1 @@ -bug-buddy-2.21.90.tar.bz2 +bug-buddy-2.22.0.tar.bz2 Index: bug-buddy.spec =================================================================== RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- bug-buddy.spec 14 Feb 2008 21:29:57 -0000 1.93 +++ bug-buddy.spec 11 Mar 2008 03:25:43 -0000 1.94 @@ -5,16 +5,14 @@ %define gconf_version 2.14 Name: bug-buddy -Version: 2.21.90 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Epoch: 1 Summary: A bug reporting utility for GNOME License: GPLv2 and BSD Group: Applications/System URL: http://www.gnome.org -Source: http://download.gnome.org/sources/bug-buddy/2.20/%{name}-%{version}.tar.bz2 -# http://bugzilla.gnome.org/show_bug.cgi?id=513578 -Patch0: c++.patch +Source: http://download.gnome.org/sources/bug-buddy/2.22/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,7 +60,6 @@ %prep %setup -q -%patch0 -p1 -b .c++ autoreconf @@ -136,6 +133,9 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Mon Mar 10 2008 Matthias Clasen - 1:2.22.0-1 +- Update to 2.22.0 + * Thu Feb 14 2008 Matthias Clasen - 1:2.21.90-2 - Rebuild for new libsoup Index: sources =================================================================== RCS file: /cvs/extras/rpms/bug-buddy/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 31 Jan 2008 04:12:42 -0000 1.39 +++ sources 11 Mar 2008 03:25:43 -0000 1.40 @@ -1 +1 @@ -9aafadf36d64c4794d1422d26980af05 bug-buddy-2.21.90.tar.bz2 +092e1f91d0be4ca133cd0650622a6b06 bug-buddy-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 03:27:50 2008 From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim)) Date: Tue, 11 Mar 2008 03:27:50 GMT Subject: comps comps-f9.xml.in,1.301,1.302 Message-ID: <200803110327.m2B3RoIW002887@cvs-int.fedora.redhat.com> Author: fitzsim Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2859 Modified Files: comps-f9.xml.in Log Message: - Replace references to java-1.7.0-icedtea with java-1.6.0-openjdk. Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.301 retrieving revision 1.302 diff -u -r1.301 -r1.302 --- comps-f9.xml.in 10 Mar 2008 20:53:37 -0000 1.301 +++ comps-f9.xml.in 11 Mar 2008 03:27:20 -0000 1.302 @@ -2341,8 +2341,8 @@ java-1.5.0-gcj libgcj - java-1.7.0-icedtea - java-1.7.0-icedtea-plugin + java-1.6.0-openjdk + java-1.6.0-openjdk-plugin @@ -2424,10 +2424,10 @@ jakarta-taglibs-standard-javadoc java-1.5.0-gcj-javadoc java-1.5.0-gcj-src - java-1.7.0-icedtea-demo - java-1.7.0-icedtea-devel - java-1.7.0-icedtea-javadoc - java-1.7.0-icedtea-src + java-1.6.0-openjdk-demo + java-1.6.0-openjdk-devel + java-1.6.0-openjdk-javadoc + java-1.6.0-openjdk-src java_cup java_cup-javadoc java_cup-manual From fedora-extras-commits at redhat.com Tue Mar 11 03:34:02 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 03:34:02 GMT Subject: rpms/gnome-media/devel gnome-media.spec,1.125,1.126 Message-ID: <200803110334.m2B3Y2I8003050@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-media/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3028 Modified Files: gnome-media.spec Log Message: Fix spec Index: gnome-media.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- gnome-media.spec 11 Mar 2008 03:14:34 -0000 1.125 +++ gnome-media.spec 11 Mar 2008 03:33:29 -0000 1.126 @@ -15,7 +15,7 @@ Release: 1%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Multimedia -Source: http://download.gnome.org/sources/gnome-media/2.22/gnome-media-%{version}.tar.gz +Source: http://download.gnome.org/sources/gnome-media/2.22/gnome-media-%{version}.tar.bz2 Patch0: gnome-media-2.13.5-hide-help-button.patch # https://bugzilla.redhat.com/show_bug.cgi?id=186791 Patch1: gnome-volume-control-gconf-fixes.patch From fedora-extras-commits at redhat.com Tue Mar 11 03:35:38 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 11 Mar 2008 03:35:38 GMT Subject: rpms/NetworkManager/devel NetworkManager.spec,1.198,1.199 Message-ID: <200803110335.m2B3ZcbH003178@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3090 Modified Files: NetworkManager.spec Log Message: * Mon Mar 10 2008 Dan Williams - 1:0.7.0-0.9.1.svn3417 - Fix gnome-icon-theme Requires, should be on gnome subpackage Index: NetworkManager.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- NetworkManager.spec 11 Mar 2008 03:14:08 -0000 1.198 +++ NetworkManager.spec 11 Mar 2008 03:34:43 -0000 1.199 @@ -15,7 +15,7 @@ Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0 -Release: 0.8.%{snapshot}%{?dist} +Release: 0.9.1.%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -60,7 +60,6 @@ BuildRequires: ppp >= 2.4.4 BuildRequires: gnome-common BuildRequires: nss-devel >= 3.11.7 -Requires: gnome-icon-theme %description NetworkManager attempts to keep an active network connection available at all @@ -84,6 +83,7 @@ PreReq: gtk2 >= %{gtk2_version} Requires: gnome-keyring Requires: nss >= 3.11.7 +Requires: gnome-icon-theme %description gnome This package contains GNOME utilities and applications for use with @@ -279,6 +279,9 @@ %changelog +* Mon Mar 10 2008 Dan Williams - 1:0.7.0-0.9.1.svn3417 +- Fix gnome-icon-theme Requires, should be on gnome subpackage + * Mon Mar 10 2008 Dan Williams - 1:0.7.0-0.8.svn3417 - Honor DHCP rebinds - Multiple active device support From fedora-extras-commits at redhat.com Tue Mar 11 03:36:01 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 03:36:01 GMT Subject: rpms/alacarte/devel .cvsignore, 1.10, 1.11 alacarte.spec, 1.39, 1.40 sources, 1.10, 1.11 Message-ID: <200803110336.m2B3a1wg003228@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/alacarte/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3118 Modified Files: .cvsignore alacarte.spec sources Log Message: 0.11.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/alacarte/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 21 Feb 2008 20:01:38 -0000 1.10 +++ .cvsignore 11 Mar 2008 03:35:24 -0000 1.11 @@ -1 +1 @@ -alacarte-0.11.4.tar.bz2 +alacarte-0.11.5.tar.bz2 Index: alacarte.spec =================================================================== RCS file: /cvs/extras/rpms/alacarte/devel/alacarte.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- alacarte.spec 21 Feb 2008 20:32:40 -0000 1.39 +++ alacarte.spec 11 Mar 2008 03:35:24 -0000 1.40 @@ -1,14 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: alacarte -Version: 0.11.4 +Version: 0.11.5 Release: 1%{?dist} Summary: Simple menu editor for GNOME Group: Applications/System License: LGPLv2+ URL: http://www.gnome.org -Source0: http://ftp.gnome.org/pub/gnome/sources/alacarte/0.11/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/alacarte/0.11/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -64,6 +64,9 @@ %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg %changelog +* Mon Mar 10 2008 Matthias Clasen - 0.11.5-1 +- Update to 0.11.5 + * Thu Feb 21 2008 Matthias Clasen - 0.11.4-1 - Update to 0.11.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/alacarte/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 21 Feb 2008 20:01:38 -0000 1.10 +++ sources 11 Mar 2008 03:35:24 -0000 1.11 @@ -1 +1 @@ -11f688e8ff5e0001c117c3f4181139ee alacarte-0.11.4.tar.bz2 +e4dc193d36c76b974e66e517e9c7ea33 alacarte-0.11.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 03:38:15 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 11 Mar 2008 03:38:15 GMT Subject: rpms/initscripts/devel .cvsignore, 1.134, 1.135 initscripts.spec, 1.158, 1.159 sources, 1.149, 1.150 Message-ID: <200803110338.m2B3cFjU003546@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/initscripts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3459 Modified Files: .cvsignore initscripts.spec sources Log Message: 8.65-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- .cvsignore 26 Feb 2008 06:54:07 -0000 1.134 +++ .cvsignore 11 Mar 2008 03:37:35 -0000 1.135 @@ -1 +1 @@ -initscripts-8.64.tar.bz2 +initscripts-8.65.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- initscripts.spec 26 Feb 2008 06:54:07 -0000 1.158 +++ initscripts.spec 11 Mar 2008 03:37:35 -0000 1.159 @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.64 +Version: 8.65 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -156,6 +156,7 @@ %dir /etc/rwtab.d /etc/statetab %dir /etc/statetab.d +%config(noreplace) /etc/event.d/* /etc/udev/rules.d/* %config /etc/X11/prefdm %config(noreplace) /etc/inittab @@ -188,6 +189,7 @@ /sbin/initlog /lib/udev/rename_device /lib/udev/console_init +/lib/udev/console_check %ifarch s390 s390x /lib/udev/ccw_init %endif @@ -214,6 +216,14 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Mon Mar 10 2008 Bill Nottingham - 8.65-1 +- Add a serial console udev/upstart handler (#434764, indirectly) +- Add some upstart notification for sysv scripts (modified from , #431231) +- Handle _rnetdev correctly (#435358, ) +- various minor speedups () +- translation updates: el, fr +- disable network by default, in favor of NetworkManager + * Tue Feb 26 2008 Bill Nottingham - 8.64-1 - Add a console_init udev helper to do console initialization - add /sbin/pidof requirement (#434863) Index: sources =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/sources,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- sources 26 Feb 2008 06:54:07 -0000 1.149 +++ sources 11 Mar 2008 03:37:35 -0000 1.150 @@ -1 +1 @@ -0cd8e1fd5597f3a1427aa3da50eb0570 initscripts-8.64.tar.bz2 +407af0ad2f8d837b4b15bf6685624b15 initscripts-8.65.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 03:43:08 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 03:43:08 GMT Subject: rpms/gconf-editor/devel .cvsignore, 1.25, 1.26 gconf-editor.spec, 1.50, 1.51 sources, 1.25, 1.26 Message-ID: <200803110343.m2B3h8bg003868@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gconf-editor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3833 Modified Files: .cvsignore gconf-editor.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gconf-editor/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 18 Sep 2007 04:09:50 -0000 1.25 +++ .cvsignore 11 Mar 2008 03:42:34 -0000 1.26 @@ -1 +1 @@ -gconf-editor-2.20.0.tar.bz2 +gconf-editor-2.22.0.tar.bz2 Index: gconf-editor.spec =================================================================== RCS file: /cvs/extras/rpms/gconf-editor/devel/gconf-editor.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gconf-editor.spec 19 Feb 2008 22:37:32 -0000 1.50 +++ gconf-editor.spec 11 Mar 2008 03:42:34 -0000 1.51 @@ -7,10 +7,10 @@ Summary: Editor/admin tool for GConf Name: gconf-editor -Version: 2.20.0 -Release: 3%{?dist} +Version: 2.22.0 +Release: 1%{?dist} URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gconf-editor/2.20/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gconf-editor/2.22/%{name}-%{version}.tar.bz2 License: GPLv2+ and GFDL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -103,6 +103,9 @@ %dir %{_datadir}/omf/gconf-editor %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Tue Feb 19 2008 Fedora Release Engineering - 2.20.0-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gconf-editor/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 18 Sep 2007 04:09:50 -0000 1.25 +++ sources 11 Mar 2008 03:42:34 -0000 1.26 @@ -1 +1 @@ -b686677878b5754ffa8d0a2cc1129988 gconf-editor-2.20.0.tar.bz2 +7ca99aec214dd855b5de7dacc8937055 gconf-editor-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 03:44:00 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 03:44:00 GMT Subject: rpms/gnome-games/devel .cvsignore, 1.75, 1.76 gnome-games.spec, 1.164, 1.165 sources, 1.80, 1.81 Message-ID: <200803110344.m2B3i0Bl003912@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3878 Modified Files: .cvsignore gnome-games.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-games/devel/.cvsignore,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- .cvsignore 26 Feb 2008 05:57:54 -0000 1.75 +++ .cvsignore 11 Mar 2008 03:43:26 -0000 1.76 @@ -1 +1 @@ -gnome-games-2.21.92.tar.bz2 +gnome-games-2.22.0.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- gnome-games.spec 7 Mar 2008 04:16:04 -0000 1.164 +++ gnome-games.spec 11 Mar 2008 03:43:26 -0000 1.165 @@ -43,12 +43,12 @@ Summary: GNOME games Name: gnome-games -Version: 2.21.92 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL+ Group: Amusements/Games -Source: http://download.gnome.org/sources/gnome-games/2.21/gnome-games-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-games/2.22/gnome-games-%{version}.tar.bz2 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch # http://bugzilla.gnome.org/show_bug.cgi?id=516616 Patch2: gcc43.patch @@ -329,6 +329,9 @@ %changelog +* Mon Mar 10 2008 Matthias Clasen - 1:2.22.0-1 +- Update to 2.22.0 + * Thu Mar 6 2008 Matthias Clasen - 1:2.21.92-2 - Drop OnlyShowIn=GNOME Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-games/devel/sources,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- sources 26 Feb 2008 05:57:54 -0000 1.80 +++ sources 11 Mar 2008 03:43:26 -0000 1.81 @@ -1 +1 @@ -f915ff024343820409371bf50f134420 gnome-games-2.21.92.tar.bz2 +c26ba479a4bb0d4226100944d9ae77db gnome-games-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 03:51:21 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 03:51:21 GMT Subject: rpms/gnome-panel/devel gnome-panel.spec, 1.276, 1.277 async-timezone.patch, 1.1, NONE clock-timezones.patch, 1.1, NONE dst-offset.patch, 1.1, NONE glue.patch, 1.1, NONE gnome-panel-2.16.1-allow-spurious-view-done-signals.patch, 1.1, NONE less-resizing.patch, 1.2, NONE localtime.patch, 1.3, NONE logout-focus.patch, 1.1, NONE more-sharp-icons.patch, 1.1, NONE open-drawer.patch, 1.1, NONE panel-weather.patch, 1.1, NONE pref-dialogs.patch, 1.1, NONE set-button.patch, 1.1, NONE Message-ID: <200803110351.m2B3pLg0004238@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-panel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4218 Modified Files: gnome-panel.spec Removed Files: async-timezone.patch clock-timezones.patch dst-offset.patch glue.patch gnome-panel-2.16.1-allow-spurious-view-done-signals.patch less-resizing.patch localtime.patch logout-focus.patch more-sharp-icons.patch open-drawer.patch panel-weather.patch pref-dialogs.patch set-button.patch Log Message: bump rev Index: gnome-panel.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- gnome-panel.spec 11 Mar 2008 01:55:39 -0000 1.276 +++ gnome-panel.spec 11 Mar 2008 03:50:34 -0000 1.277 @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.22.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2 @@ -349,6 +349,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-2 +- Bump revision + * Mon Mar 10 2008 Jon McCann - 2.22.0-1 - Update to 2.22.0 --- async-timezone.patch DELETED --- --- clock-timezones.patch DELETED --- --- dst-offset.patch DELETED --- --- glue.patch DELETED --- --- gnome-panel-2.16.1-allow-spurious-view-done-signals.patch DELETED --- --- less-resizing.patch DELETED --- --- localtime.patch DELETED --- --- logout-focus.patch DELETED --- --- more-sharp-icons.patch DELETED --- --- open-drawer.patch DELETED --- --- panel-weather.patch DELETED --- --- pref-dialogs.patch DELETED --- --- set-button.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 04:00:22 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 04:00:22 GMT Subject: rpms/gnome-media/devel gnome-media.spec,1.126,1.127 Message-ID: <200803110400.m2B40MA1004413@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-media/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4382 Modified Files: gnome-media.spec Log Message: drop upstreamed patches Index: gnome-media.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- gnome-media.spec 11 Mar 2008 03:33:29 -0000 1.126 +++ gnome-media.spec 11 Mar 2008 03:59:38 -0000 1.127 @@ -17,10 +17,6 @@ Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-media/2.22/gnome-media-%{version}.tar.bz2 Patch0: gnome-media-2.13.5-hide-help-button.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=186791 -Patch1: gnome-volume-control-gconf-fixes.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=335121 -Patch2: gnome-volume-control-add-front-track.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome @@ -83,10 +79,6 @@ %prep %setup -q %patch0 -p1 -b .hide-help-button -pushd gst-mixer/src -%patch1 -p0 -b .gconf-fixes -popd -%patch2 -p0 -b .front-track %build # try to work around a problem where gst-inspect does From fedora-extras-commits at redhat.com Tue Mar 11 04:04:39 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 04:04:39 GMT Subject: rpms/gnome-games/devel gnome-games.spec,1.165,1.166 Message-ID: <200803110404.m2B44d04012004@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11986 Modified Files: gnome-games.spec Log Message: Drop upstreamed patches Index: gnome-games.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- gnome-games.spec 11 Mar 2008 03:43:26 -0000 1.165 +++ gnome-games.spec 11 Mar 2008 04:03:50 -0000 1.166 @@ -50,8 +50,6 @@ Group: Amusements/Games Source: http://download.gnome.org/sources/gnome-games/2.22/gnome-games-%{version}.tar.bz2 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=516616 -Patch2: gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome-games-devel @@ -111,7 +109,6 @@ %setup -q # rebrand gnometris as some think the name is to similar to a trademark %patch1 -p1 -b .rebrand -%patch2 -p1 -b .gcc43 sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \ -e 's/GNOMEtris/GnomeFallingBlocks/g' \ From fedora-extras-commits at redhat.com Tue Mar 11 04:07:32 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 04:07:32 GMT Subject: rpms/gnome-nettool/devel .cvsignore, 1.12, 1.13 gnome-nettool.spec, 1.29, 1.30 sources, 1.13, 1.14 Message-ID: <200803110407.m2B47Ws9012162@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-nettool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12086 Modified Files: .cvsignore gnome-nettool.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-nettool/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 18 Sep 2007 04:54:31 -0000 1.12 +++ .cvsignore 11 Mar 2008 04:06:58 -0000 1.13 @@ -1 +1 @@ -gnome-nettool-2.20.0.tar.bz2 +gnome-nettool-2.22.0.tar.bz2 Index: gnome-nettool.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-nettool/devel/gnome-nettool.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gnome-nettool.spec 18 Feb 2008 04:16:49 -0000 1.29 +++ gnome-nettool.spec 11 Mar 2008 04:06:58 -0000 1.30 @@ -5,10 +5,10 @@ Summary: A GNOME interface for various networking tools Name: gnome-nettool -Version: 2.20.0 -Release: 3%{?dist} +Version: 2.22.0 +Release: 1%{?dist} URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-nettool/2.20/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-nettool/2.22/%{name}-%{version}.tar.bz2 License: GPLv2+ and GFDL+ Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,7 +46,6 @@ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-only-show-in GNOME \ --remove-category Network \ --add-category GNOME \ --add-category System \ @@ -88,6 +87,9 @@ %{_datadir}/applications/*.desktop %changelog +* Tue Mar 11 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Mon Feb 18 2008 Christopher Aillon - 2.20.0-3 - Rebuild to celebrate my birthday (and GCC 4.3) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-nettool/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Sep 2007 04:54:31 -0000 1.13 +++ sources 11 Mar 2008 04:06:58 -0000 1.14 @@ -1 +1 @@ -8f16e4207655ccf1e7af679fc0f58bbd gnome-nettool-2.20.0.tar.bz2 +290dd50a08a3859332afb6daf46dde25 gnome-nettool-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 04:12:24 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 11 Mar 2008 04:12:24 GMT Subject: rpms/perl-Calendar-Simple/devel .cvsignore, 1.4, 1.5 perl-Calendar-Simple.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200803110412.m2B4COoc012288@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Calendar-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12256 Modified Files: .cvsignore perl-Calendar-Simple.spec sources Log Message: * Tue Mar 11 2008 Ralf Cors??pius - 1.19-1 - Upstream update. - Reflect upstream having dropped "COPYING". Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Oct 2006 09:32:18 -0000 1.4 +++ .cvsignore 11 Mar 2008 04:11:51 -0000 1.5 @@ -1 +1 @@ -Calendar-Simple-1.17.tar.gz +Calendar-Simple-1.19.tar.gz Index: perl-Calendar-Simple.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/devel/perl-Calendar-Simple.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Calendar-Simple.spec 7 Mar 2008 01:55:35 -0000 1.8 +++ perl-Calendar-Simple.spec 11 Mar 2008 04:11:51 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Perl extension to create simple calendars Name: perl-Calendar-Simple -Version: 1.17 -Release: 3%{?dist} +Version: 1.19 +Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Calendar-Simple/ @@ -45,12 +45,16 @@ %files %defattr(-,root,root,-) -%doc Changes COPYING README +%doc Changes README %{_bindir}/pcal %{perl_vendorlib}/Calendar %{_mandir}/man3/* %changelog +* Tue Mar 11 2008 Ralf Cors??pius - 1.19-1 +- Upstream update. +- Reflect upstream having dropped "COPYING". + * Thu Mar 06 2008 Tom "spot" Callaway - 1.17-3 Rebuild for new perl Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Calendar-Simple/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Oct 2006 09:32:18 -0000 1.4 +++ sources 11 Mar 2008 04:11:51 -0000 1.5 @@ -1 +1 @@ -94acbe82b7b1f32293dfdb119b2cf765 Calendar-Simple-1.17.tar.gz +b4f974f74f615b8aadfdba43b3a646f1 Calendar-Simple-1.19.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 04:18:06 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 04:18:06 GMT Subject: rpms/file-roller/devel file-roller-gio.patch, NONE, 1.1 file-roller.spec, 1.114, 1.115 Message-ID: <200803110418.m2B4I6W3012435@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/file-roller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12397 Modified Files: file-roller.spec Added Files: file-roller-gio.patch Log Message: port nautilus extension to gio file-roller-gio.patch: --- NEW FILE file-roller-gio.patch --- Index: configure.in =================================================================== --- configure.in (revision 2182) +++ configure.in (working copy) @@ -18,13 +18,13 @@ dnl dnl ========================================================================== -GLIB_REQUIRED=2.12.0 +GLIB_REQUIRED=2.15.0 GTK_REQUIRED=2.10.0 LIBGNOME_REQUIRED=2.6.0 LIBGNOMEUI_REQUIRED=2.6.0 GNOME_VFS_REQUIRED=2.10.0 LIBGLADE_REQUIRED=2.4.0 -NAUTILUS_REQUIRED=2.10.0 +NAUTILUS_REQUIRED=2.21.0 AC_SUBST(GLIB_REQUIRED) AC_SUBST(GTK_REQUIRED) @@ -38,6 +38,7 @@ PKG_CHECK_MODULES(FR, \ glib-2.0 >= $GLIB_REQUIRED \ + gio-2.0 >= $GLIB_REQUIRED \ gthread-2.0 \ gtk+-2.0 >= $GTK_REQUIRED \ libgnome-2.0 >= $LIBGNOME_REQUIRED \ Index: nautilus/nautilus-fileroller.c =================================================================== --- nautilus/nautilus-fileroller.c (revision 2182) +++ nautilus/nautilus-fileroller.c (working copy) @@ -24,9 +24,7 @@ #include #include #include -#include -#include -#include +#include #include #include #include @@ -204,34 +202,31 @@ return NULL; for (scan = files; scan; scan = scan->next) { - NautilusFileInfo *file = scan->data; + NautilusFileInfo *file = scan->data; - if (all_archives && ! is_archive (file)) - all_archives = FALSE; + if ((all_archives = is_archive (file)) == FALSE) + break; + /* FIXME: Here we should get the parent of the current + * file and check if it is the same parent as for the + * other files and then check if the parent is writable + * + * We *MUST NOT* do that synchronous since this function + * gets called very often (every time a selection changed) + * and it could be a remote location. MUST NOT DO SYNC IO. + * + * Nautilus actually already has stat'ed the parent and + * knows if the parent is writable or not. The API is + * just missing. This is filed under bug #521612. Once that + * bug is fixed we can actually implement the funcionality. + * Until then we just set can_write to TRUE. If that is an + * lie we will find out once the user tries to really extract + * stuff. + * + * Christian Kellner + * */ + } - if (can_write) { - char *parent_uri; - GnomeVFSFileInfo *info; - GnomeVFSResult result; - - parent_uri = nautilus_file_info_get_parent_uri (file); - info = gnome_vfs_file_info_new (); - - result = gnome_vfs_get_file_info (parent_uri, - info, - (GNOME_VFS_FILE_INFO_FOLLOW_LINKS - | GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS)); - if ((result == GNOME_VFS_OK) && (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS)) - can_write = (info->permissions & GNOME_VFS_PERM_ACCESS_WRITABLE) || (info->permissions & GNOME_VFS_PERM_USER_WRITE); - - gnome_vfs_file_info_unref (info); - g_free (parent_uri); - } - } - - /**/ - one_item = (files != NULL) && (files->next == NULL); one_archive = one_item && all_archives; Index: file-roller.spec =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- file-roller.spec 7 Mar 2008 03:30:53 -0000 1.114 +++ file-roller.spec 11 Mar 2008 04:17:31 -0000 1.115 @@ -11,11 +11,13 @@ Summary: File Roller is a tool for viewing and creating archives Name: file-roller Version: 2.21.92 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://download.gnome.org/sources/file-roller/ Source: http://download.gnome.org/sources/file-roller/2.21/file-roller-%{version}.tar.bz2 +# http://bugzilla.gnome.org/show_bug.cgi?id=501542 +Patch0: file-roller-gio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -49,6 +51,7 @@ %prep %setup -q +%patch0 -p0 -b .gio %build %configure --disable-scrollkeeper --disable-static @@ -125,6 +128,9 @@ %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Tue Mar 11 2008 Matthias Clasen - 2.21.92-3 +- Port nautilus extension to gio + * Thu Mar 6 2008 Matthias Clasen - 2.21.92-2 - Don't OnlyShowIn=GNOME From fedora-extras-commits at redhat.com Tue Mar 11 04:29:43 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 04:29:43 GMT Subject: rpms/sound-juicer/devel sound-juicer.spec,1.93,1.94 Message-ID: <200803110429.m2B4Th1k012746@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/sound-juicer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12700 Modified Files: sound-juicer.spec Log Message: try again Index: sound-juicer.spec =================================================================== RCS file: /cvs/extras/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- sound-juicer.spec 10 Mar 2008 17:22:18 -0000 1.93 +++ sound-juicer.spec 11 Mar 2008 04:29:08 -0000 1.94 @@ -58,7 +58,7 @@ %build # work around a gstreamer problem where it # doesn't find plugins the first time around -/usr/bin/gst-inspect-0.10 --print-all +DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all %configure --enable-hal --disable-scrollkeeper make AM_CFLAGS=-export-dynamic From fedora-extras-commits at redhat.com Tue Mar 11 04:30:25 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 11 Mar 2008 04:30:25 GMT Subject: rpms/perl-Class-Inspector/devel .cvsignore, 1.8, 1.9 perl-Class-Inspector.spec, 1.17, 1.18 sources, 1.8, 1.9 Message-ID: <200803110430.m2B4UPEt012828@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-Inspector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12740 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Tue Mar 11 2008 Ralf Cors??pius - 1.22-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inspector/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Feb 2008 06:45:08 -0000 1.8 +++ .cvsignore 11 Mar 2008 04:29:41 -0000 1.9 @@ -1 +1 @@ -Class-Inspector-1.20.tar.gz +Class-Inspector-1.22.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Class-Inspector.spec 28 Feb 2008 13:00:07 -0000 1.17 +++ perl-Class-Inspector.spec 11 Mar 2008 04:29:41 -0000 1.18 @@ -1,6 +1,6 @@ Name: perl-Class-Inspector -Version: 1.20 -Release: 3%{?dist} +Version: 1.22 +Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL+ or Artistic Group: Development/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 11 2008 Ralf Cors??pius - 1.22-1 +- Upstream update. + * Thu Feb 28 2008 Tom "spot" Callaway - 1.20-3 - Rebuild normally, second pass Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inspector/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Feb 2008 06:45:08 -0000 1.8 +++ sources 11 Mar 2008 04:29:41 -0000 1.9 @@ -1 +1 @@ -4b21f5abd8fc0df983f6a5087c61aea7 Class-Inspector-1.20.tar.gz +74d1c6f817d859baab5999c53278887b Class-Inspector-1.22.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 04:35:17 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 04:35:17 GMT Subject: rpms/file-roller/devel file-roller.spec,1.115,1.116 Message-ID: <200803110435.m2B4ZH6M012974@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/file-roller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12922 Modified Files: file-roller.spec Log Message: try again Index: file-roller.spec =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- file-roller.spec 11 Mar 2008 04:17:31 -0000 1.115 +++ file-roller.spec 11 Mar 2008 04:34:40 -0000 1.116 @@ -32,6 +32,7 @@ BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: scrollkeeper BuildRequires: perl(XML::Parser) +BuildRequires: intltool Requires(post): scrollkeeper Requires(pre): GConf2 From fedora-extras-commits at redhat.com Tue Mar 11 05:04:18 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Tue, 11 Mar 2008 05:04:18 GMT Subject: rpms/telepathy-mission-control/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 telepathy-mission-control.spec, 1.9, 1.10 Message-ID: <200803110504.m2B54IrD020545@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/telepathy-mission-control/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20519 Modified Files: .cvsignore sources telepathy-mission-control.spec Log Message: Update to 4.63 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Jan 2008 07:17:17 -0000 1.7 +++ .cvsignore 11 Mar 2008 05:03:44 -0000 1.8 @@ -1 +1 @@ -telepathy-mission-control-4.55.tar.gz +telepathy-mission-control-4.63.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Jan 2008 07:17:17 -0000 1.7 +++ sources 11 Mar 2008 05:03:44 -0000 1.8 @@ -1 +1 @@ -83d8b7c3bc41ab0cd6280fbbf192fb53 telepathy-mission-control-4.55.tar.gz +14a3cdc1721f09db6399a7061a2049f7 telepathy-mission-control-4.63.tar.gz Index: telepathy-mission-control.spec =================================================================== RCS file: /cvs/pkgs/rpms/telepathy-mission-control/devel/telepathy-mission-control.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- telepathy-mission-control.spec 20 Feb 2008 00:26:52 -0000 1.9 +++ telepathy-mission-control.spec 11 Mar 2008 05:03:44 -0000 1.10 @@ -1,6 +1,6 @@ Name: telepathy-mission-control -Version: 4.55 -Release: 2%{?dist} +Version: 4.63 +Release: 1%{?dist} Summary: Central control for Telepathy connection manager Group: System Environment/Libraries @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtelepathy-devel, libxslt-devel, GConf2-devel +BuildRequires: telepathy-glib-devel %description Mission Control, or MC, is a Telepathy component providing a way for @@ -24,6 +25,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libtelepathy-devel, dbus-devel, dbus-glib-devel +Requires: telepathy-glib-devel %description devel The %{name}-devel package contains libraries and header @@ -32,7 +34,7 @@ %prep %setup -q -#%patch0 -p0 + %build %configure --disable-static @@ -75,6 +77,9 @@ %changelog +* Mon Mar 10 2008 Peter Gordon - 4.63-1 +- Update to new upstream release (4.63) + * Tue Feb 19 2008 Fedora Release Engineering - 4.55-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 05:15:10 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Tue, 11 Mar 2008 05:15:10 GMT Subject: rpms/kernel/devel kernel.spec, 1.489, 1.490 linux-2.6-drm-i915-modeset.patch, 1.2, 1.3 Message-ID: <200803110515.m2B5FAAb020784@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20746 Modified Files: kernel.spec linux-2.6-drm-i915-modeset.patch Log Message: * Tue Mar 11 2008 Dave Airlie - fix i965 cursor support in drm modesetting Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.489 retrieving revision 1.490 diff -u -r1.489 -r1.490 --- kernel.spec 11 Mar 2008 00:40:59 -0000 1.489 +++ kernel.spec 11 Mar 2008 05:14:35 -0000 1.490 @@ -1751,6 +1751,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Tue Mar 11 2008 Dave Airlie +- fix i965 cursor support in drm modesetting + * Mon Mar 10 2008 John W. Linville - Use correct "Dual BSD/GPL" license tag for iwlcore.ko linux-2.6-drm-i915-modeset.patch: Index: linux-2.6-drm-i915-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-drm-i915-modeset.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-drm-i915-modeset.patch 7 Mar 2008 07:03:34 -0000 1.2 +++ linux-2.6-drm-i915-modeset.patch 11 Mar 2008 05:14:35 -0000 1.3 @@ -7830,7 +7830,7 @@ } diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h -index 0ec2447..e7b27c5 100644 +index 0ec2447..9e4631a 100644 --- a/drivers/char/drm/i915_drv.h +++ b/drivers/char/drm/i915_drv.h @@ -60,7 +60,7 @@ @@ -7872,16 +7872,18 @@ void *hw_status_page; dma_addr_t dma_status_page; uint32_t counter; -@@ -120,6 +129,8 @@ typedef struct drm_i915_private { +@@ -120,6 +129,10 @@ typedef struct drm_i915_private { uint32_t irq_enable_reg; int irq_enabled; + struct workqueue_struct *wq; + ++ bool cursor_needs_physical; ++ uint32_t flush_sequence; uint32_t flush_flags; uint32_t flush_pending; -@@ -127,11 +138,17 @@ typedef struct drm_i915_private { +@@ -127,11 +140,17 @@ typedef struct drm_i915_private { void *agp_iomap; unsigned int max_validate_buffers; struct mutex cmdbuf_mutex; @@ -7899,7 +7901,7 @@ /* DRI2 sarea */ struct drm_buffer_object *sarea_bo; struct drm_bo_kmap_obj sarea_kmap; -@@ -222,16 +239,25 @@ typedef struct drm_i915_private { +@@ -222,16 +241,25 @@ typedef struct drm_i915_private { u8 saveDACMASK; u8 saveDACDATA[256*3]; /* 256 3-byte colors */ u8 saveCR[36]; @@ -7926,7 +7928,7 @@ extern void i915_driver_preclose(struct drm_device *dev, struct drm_file *file_priv); extern int i915_driver_device_is_agp(struct drm_device * dev); -@@ -240,8 +266,7 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, +@@ -240,8 +268,7 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, extern void i915_emit_breadcrumb(struct drm_device *dev); extern void i915_dispatch_flip(struct drm_device * dev, int pipes, int sync); extern int i915_emit_mi_flush(struct drm_device *dev, uint32_t flush); @@ -7936,7 +7938,7 @@ /* i915_irq.c */ extern int i915_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_priv); -@@ -259,11 +284,11 @@ extern int i915_vblank_pipe_set(struct drm_device *dev, void *data, +@@ -259,11 +286,11 @@ extern int i915_vblank_pipe_set(struct drm_device *dev, void *data, extern int i915_vblank_pipe_get(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int i915_emit_irq(struct drm_device *dev); @@ -7951,7 +7953,7 @@ /* i915_mem.c */ extern int i915_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv); -@@ -296,6 +321,10 @@ void i915_flush_ttm(struct drm_ttm *ttm); +@@ -296,6 +323,10 @@ void i915_flush_ttm(struct drm_ttm *ttm); extern void intel_init_chipset_flush_compat(struct drm_device *dev); extern void intel_fini_chipset_flush_compat(struct drm_device *dev); @@ -7962,7 +7964,7 @@ #define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, (reg)) #define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, (reg), (val)) #define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, (reg)) -@@ -332,8 +361,31 @@ extern void intel_fini_chipset_flush_compat(struct drm_device *dev); +@@ -332,8 +363,31 @@ extern void intel_fini_chipset_flush_compat(struct drm_device *dev); I915_WRITE(LP_RING + RING_TAIL, outring); \ } while(0) @@ -7994,7 +7996,7 @@ /* Extended config space */ #define LBB 0xf4 -@@ -400,6 +452,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); +@@ -400,6 +454,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define BB1_UNPROTECTED (0<<0) #define BB2_END_ADDR_MASK (~0x7) @@ -8003,7 +8005,7 @@ /* Framebuffer compression */ #define FBC_CFB_BASE 0x03200 /* 4k page aligned */ #define FBC_LL_BASE 0x03204 /* 4k page aligned */ -@@ -444,12 +498,102 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); +@@ -444,12 +500,102 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define I915REG_INT_ENABLE_R 0x020a0 #define I915REG_INSTPM 0x020c0 @@ -8106,7 +8108,7 @@ #define SRX_INDEX 0x3c4 #define SRX_DATA 0x3c5 #define SR01 1 -@@ -458,6 +602,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); +@@ -458,6 +604,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define PPCR 0x61204 #define PPCR_ON (1<<0) @@ -8115,7 +8117,7 @@ #define DVOB 0x61140 #define DVOB_ON (1<<31) #define DVOC 0x61160 -@@ -619,8 +765,14 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); +@@ -619,8 +767,14 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|4) #define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)|6) @@ -8130,7 +8132,7 @@ #define MI_BATCH_BUFFER ((0x30<<23)|1) #define MI_BATCH_BUFFER_START (0x31<<23) -@@ -739,6 +891,14 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); +@@ -739,6 +893,14 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define BCLRPAT_B 0x61020 #define VSYNCSHIFT_B 0x61028 @@ -8145,7 +8147,7 @@ #define PP_STATUS 0x61200 # define PP_ON (1 << 31) /** -@@ -1011,6 +1171,579 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); +@@ -1011,6 +1173,579 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); # define LVDS_B0B3_POWER_DOWN (0 << 2) # define LVDS_B0B3_POWER_UP (3 << 2) @@ -8725,7 +8727,7 @@ #define PIPEACONF 0x70008 #define PIPEACONF_ENABLE (1<<31) #define PIPEACONF_DISABLE 0 -@@ -1102,13 +1835,17 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); +@@ -1102,13 +1837,17 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); */ #define SWF0 0x71410 @@ -8780,10 +8782,10 @@ int ret; diff --git a/drivers/char/drm/i915_init.c b/drivers/char/drm/i915_init.c new file mode 100644 -index 0000000..b82a46b +index 0000000..c59067a --- /dev/null +++ b/drivers/char/drm/i915_init.c -@@ -0,0 +1,401 @@ +@@ -0,0 +1,409 @@ +/* + * Copyright (c) 2007 Intel Corporation + * Jesse Barnes @@ -8916,6 +8918,14 @@ + dev->types[8] = _DRM_STAT_SECONDARY; + dev->types[9] = _DRM_STAT_DMA; + ++ if (IS_MOBILE(dev) || IS_I9XX(dev)) ++ dev_priv->cursor_needs_physical = true; ++ else ++ dev_priv->cursor_needs_physical = false; ++ ++ if (IS_I965G(dev) || IS_G33(dev)) ++ dev_priv->cursor_needs_physical = false; ++ + if (IS_I9XX(dev)) { + pci_read_config_dword(dev->pdev, 0x5C, &dev_priv->stolen_base); + DRM_DEBUG("stolen base %p\n", (void*)dev_priv->stolen_base); @@ -9801,10 +9811,10 @@ +} diff --git a/drivers/char/drm/intel_display.c b/drivers/char/drm/intel_display.c new file mode 100644 -index 0000000..4b48a0b +index 0000000..fa2b9be --- /dev/null +++ b/drivers/char/drm/intel_display.c -@@ -0,0 +1,1366 @@ +@@ -0,0 +1,1370 @@ +/* + * Copyright ?? 2006-2007 Intel Corporation + * @@ -10814,7 +10824,7 @@ + uint32_t control = (pipe == 0) ? CURSOR_A_CONTROL : CURSOR_B_CONTROL; + uint32_t base = (pipe == 0) ? CURSOR_A_BASE : CURSOR_B_BASE; + uint32_t temp; -+ size_t adder; ++ size_t addr; + + DRM_DEBUG("\n"); + @@ -10846,17 +10856,21 @@ + return -ENOMEM; + } + -+ adder = dev_priv->stolen_base + bo->offset; -+ intel_crtc->cursor_adder = adder; ++ if (dev_priv->cursor_needs_physical) ++ addr = dev_priv->stolen_base + bo->offset; ++ else ++ addr = bo->offset; ++ ++ intel_crtc->cursor_addr = addr; + temp = 0; + /* set the pipe for the cursor */ + temp |= (pipe << 28); + temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE; + -+ DRM_DEBUG("cusror base %x\n", adder); ++ DRM_DEBUG("cusror base %x\n", addr); + + I915_WRITE(control, temp); -+ I915_WRITE(base, adder); ++ I915_WRITE(base, addr); + + return 0; +} @@ -10882,7 +10896,7 @@ + temp |= ((x & CURSOR_POS_MASK) << CURSOR_X_SHIFT); + temp |= ((y & CURSOR_POS_MASK) << CURSOR_Y_SHIFT); + -+ adder = intel_crtc->cursor_adder; ++ adder = intel_crtc->cursor_addr; + I915_WRITE((pipe == 0) ? CURSOR_A_POSITION : CURSOR_B_POSITION, temp); + I915_WRITE((pipe == 0) ? CURSOR_A_BASE : CURSOR_B_BASE, adder); + @@ -11048,7 +11062,7 @@ + intel_crtc->lut_b[i] = i; + } + -+ intel_crtc->cursor_adder = 0; ++ intel_crtc->cursor_addr = 0; + + crtc->driver_private = intel_crtc; +} @@ -11173,7 +11187,7 @@ +} diff --git a/drivers/char/drm/intel_drv.h b/drivers/char/drm/intel_drv.h new file mode 100644 -index 0000000..72ba01d +index 0000000..a36fd3f --- /dev/null +++ b/drivers/char/drm/intel_drv.h @@ -0,0 +1,89 @@ @@ -11235,7 +11249,7 @@ +struct intel_crtc { + int pipe; + int plane; -+ uint32_t cursor_adder; ++ uint32_t cursor_addr; + u8 lut_r[256], lut_g[256], lut_b[256]; +}; + From fedora-extras-commits at redhat.com Tue Mar 11 05:21:06 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 11 Mar 2008 05:21:06 GMT Subject: rpms/perl-Class-Inspector/F-8 .cvsignore, 1.8, 1.9 perl-Class-Inspector.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200803110521.m2B5L6Kf020959@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-Inspector/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20919/F-8 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Tue Mar 11 2008 Ralf Cors??pius - 1.22-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inspector/F-8/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Feb 2008 07:33:01 -0000 1.8 +++ .cvsignore 11 Mar 2008 05:20:32 -0000 1.9 @@ -1 +1 @@ -Class-Inspector-1.20.tar.gz +Class-Inspector-1.22.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inspector/F-8/perl-Class-Inspector.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Class-Inspector.spec 14 Feb 2008 07:33:01 -0000 1.13 +++ perl-Class-Inspector.spec 11 Mar 2008 05:20:32 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-Class-Inspector -Version: 1.20 +Version: 1.22 Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL+ or Artistic @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 11 2008 Ralf Cors??pius - 1.22-1 +- Upstream update. + * Thu Feb 14 2008 Ralf Cors??pius - 1.20-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inspector/F-8/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Feb 2008 07:33:01 -0000 1.8 +++ sources 11 Mar 2008 05:20:32 -0000 1.9 @@ -1 +1 @@ -4b21f5abd8fc0df983f6a5087c61aea7 Class-Inspector-1.20.tar.gz +74d1c6f817d859baab5999c53278887b Class-Inspector-1.22.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 05:21:11 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 11 Mar 2008 05:21:11 GMT Subject: rpms/perl-Class-Inspector/F-7 .cvsignore, 1.8, 1.9 perl-Class-Inspector.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200803110521.m2B5LBCU020964@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-Inspector/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20919/F-7 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Tue Mar 11 2008 Ralf Cors??pius - 1.22-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inspector/F-7/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Feb 2008 07:33:06 -0000 1.8 +++ .cvsignore 11 Mar 2008 05:20:36 -0000 1.9 @@ -1 +1 @@ -Class-Inspector-1.20.tar.gz +Class-Inspector-1.22.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inspector/F-7/perl-Class-Inspector.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Class-Inspector.spec 14 Feb 2008 07:33:06 -0000 1.13 +++ perl-Class-Inspector.spec 11 Mar 2008 05:20:37 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-Class-Inspector -Version: 1.20 +Version: 1.22 Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL+ or Artistic @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 11 2008 Ralf Cors??pius - 1.22-1 +- Upstream update. + * Thu Feb 14 2008 Ralf Cors??pius - 1.20-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Inspector/F-7/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Feb 2008 07:33:06 -0000 1.8 +++ sources 11 Mar 2008 05:20:37 -0000 1.9 @@ -1 +1 @@ -4b21f5abd8fc0df983f6a5087c61aea7 Class-Inspector-1.20.tar.gz +74d1c6f817d859baab5999c53278887b Class-Inspector-1.22.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 06:20:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 06:20:55 +0000 Subject: [pkgdb] vorbis-tools: jnovy has requested watchcommits Message-ID: <200803110623.m2B6NffR019882@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has requested the watchcommits acl on vorbis-tools (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vorbis-tools From fedora-extras-commits at redhat.com Tue Mar 11 06:20:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 06:20:58 +0000 Subject: [pkgdb] vorbis-tools: jnovy has requested commit Message-ID: <200803110623.m2B6NhXE019902@bastion.fedora.phx.redhat.com> Jindrich Novy (jnovy) has requested the commit acl on vorbis-tools (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vorbis-tools From fedora-extras-commits at redhat.com Tue Mar 11 06:30:54 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Tue, 11 Mar 2008 06:30:54 GMT Subject: rpms/scim-tables/devel scim-tables.spec,1.35,1.36 Message-ID: <200803110630.m2B6UsGw029183@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/scim-tables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29154 Modified Files: scim-tables.spec Log Message: Tue Mar 11 2008 Caius Chance - 0.5.7-5.fc9 - Resolves: rhbz#232860 (Unable to remove custom phrase for IMEs with auto select.) Index: scim-tables.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-tables/devel/scim-tables.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- scim-tables.spec 14 Feb 2008 06:43:04 -0000 1.35 +++ scim-tables.spec 11 Mar 2008 06:30:19 -0000 1.36 @@ -6,7 +6,7 @@ Name: scim-tables Version: 0.5.7 -Release: 4%{?dist} +Release: 5%{?dist}.testing Summary: SCIM Generic Table IMEngine License: GPL @@ -24,6 +24,7 @@ Patch1: tables-skip-ja-ko.patch Patch2: scim-tables-0.5.7-2.bz217639.patch Patch3: scim-tables-0.5.7-4.gcc.patch +Patch4: scim-tables-0.5.7-5.bz232860.patch %description This package contains the Generic Table IMEngine for SCIM. @@ -198,6 +199,7 @@ %patch1 -p1 -b -1.JK %patch2 -p1 -b .2-bz217639 %patch3 -p1 -b .3-gcc +%patch4 -p1 -b .4-bz232860 autoreconf %endif @@ -421,6 +423,10 @@ %changelog +* Tue Mar 11 2008 Caius Chance - 0.5.7-5.fc9 +- Resolves: rhbz#232860 + (Unable to remove custom phrase for IMEs with auto select.) + * Wed Feb 13 2008 Caius Chance - 0.5.7-4.fc9 - Rebuild for F9. From fedora-extras-commits at redhat.com Tue Mar 11 06:31:35 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Tue, 11 Mar 2008 06:31:35 GMT Subject: rpms/scim-tables/devel scim-tables-0.5.7-5.bz232860.patch,NONE,1.1 Message-ID: <200803110631.m2B6VZSj029215@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/scim-tables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29204 Added Files: scim-tables-0.5.7-5.bz232860.patch Log Message: Tue Mar 11 2008 Caius Chance - 0.5.7-5.fc9 - Resolves: rhbz#232860 (Unable to remove custom phrase for IMEs with auto select.) scim-tables-0.5.7-5.bz232860.patch: --- NEW FILE scim-tables-0.5.7-5.bz232860.patch --- diff -up scim-tables-0.5.7/src/scim_table_imengine.h.4-bz232860 scim-tables-0.5.7/src/scim_table_imengine.h --- scim-tables-0.5.7/src/scim_table_imengine.h.4-bz232860 2005-10-26 17:53:53.000000000 +1000 +++ scim-tables-0.5.7/src/scim_table_imengine.h 2008-03-14 23:59:47.000000000 +1000 @@ -140,6 +140,10 @@ class TableInstance : public IMEngineIns WideString m_last_committed; + bool m_last_auto_select; + uint32 m_last_auto_select_offset; + WideString m_last_auto_select_string; + public: TableInstance (TableFactory *factory, const String& encoding, diff -up scim-tables-0.5.7/src/scim_table_imengine.cpp.4-bz232860 scim-tables-0.5.7/src/scim_table_imengine.cpp --- scim-tables-0.5.7/src/scim_table_imengine.cpp.4-bz232860 2008-03-14 23:59:47.000000000 +1000 +++ scim-tables-0.5.7/src/scim_table_imengine.cpp 2008-03-15 00:05:09.000000000 +1000 @@ -1452,7 +1452,7 @@ TableInstance::post_process (char key) bool TableInstance::delete_phrase () { - if (m_lookup_table.number_of_candidates ()) { + if (m_lookup_table.number_of_candidates () && m_last_auto_select == false) { int pos = m_lookup_table.get_cursor_pos (); uint32 offset = m_lookup_table_indexes [pos]; @@ -1461,6 +1461,26 @@ TableInstance::delete_phrase () refresh_lookup_table (); } return true; + } else if (m_last_auto_select == true) { + if (m_factory->m_table.delete_phrase (m_last_auto_select_offset)) { + AttributeList attributes; + WideString prompt; + + prompt = utf8_mbstowcs (_("Custom phrase removed: ")) + m_last_auto_select_string; + attributes.push_back (Attribute (0, prompt.length (), SCIM_ATTR_FOREGROUND, SCIM_RGB_COLOR(255, 32, 32))); + + m_last_auto_select = false; + m_last_auto_select_offset = 0; + m_last_auto_select_string = WideString(); + + if (prompt.length ()) { + update_aux_string (prompt, attributes); + show_aux_string (); + } else { + hide_aux_string (); + } + } + return true; } return false; } @@ -1474,6 +1494,10 @@ TableInstance::lookup_to_converted (int uint32 offset = m_lookup_table_indexes [index]; WideString str = m_factory->m_table.get_phrase (offset); + m_last_auto_select = true; + m_last_auto_select_offset = offset; + m_last_auto_select_string = str; + m_converted_strings.push_back (str); m_converted_indexes.push_back (offset); From fedora-extras-commits at redhat.com Tue Mar 11 06:32:56 2008 From: fedora-extras-commits at redhat.com (Caius Chance (cchance)) Date: Tue, 11 Mar 2008 06:32:56 GMT Subject: rpms/scim-tables/devel scim-tables.spec,1.36,1.37 Message-ID: <200803110632.m2B6WuQ8029277@cvs-int.fedora.redhat.com> Author: cchance Update of /cvs/pkgs/rpms/scim-tables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29240 Modified Files: scim-tables.spec Log Message: Tue Mar 11 2008 Caius Chance - 0.5.7-5.fc9 - Resolves: rhbz#232860 (Unable to remove custom phrase for IMEs with auto select.) Index: scim-tables.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim-tables/devel/scim-tables.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- scim-tables.spec 11 Mar 2008 06:30:19 -0000 1.36 +++ scim-tables.spec 11 Mar 2008 06:32:23 -0000 1.37 @@ -6,7 +6,7 @@ Name: scim-tables Version: 0.5.7 -Release: 5%{?dist}.testing +Release: 5%{?dist} Summary: SCIM Generic Table IMEngine License: GPL From fedora-extras-commits at redhat.com Tue Mar 11 06:51:28 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Tue, 11 Mar 2008 06:51:28 GMT Subject: rpms/kernel/devel kernel.spec,1.490,1.491 Message-ID: <200803110651.m2B6pSde029625@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29591 Modified Files: kernel.spec Log Message: * Tue Mar 11 2008 Dave Airlie - make flicker a lot less on startup for X Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.490 retrieving revision 1.491 diff -u -r1.490 -r1.491 --- kernel.spec 11 Mar 2008 05:14:35 -0000 1.490 +++ kernel.spec 11 Mar 2008 06:50:39 -0000 1.491 @@ -1752,6 +1752,9 @@ %changelog * Tue Mar 11 2008 Dave Airlie +- make flicker a lot less on startup for X + +* Tue Mar 11 2008 Dave Airlie - fix i965 cursor support in drm modesetting * Mon Mar 10 2008 John W. Linville From fedora-extras-commits at redhat.com Tue Mar 11 06:52:22 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Tue, 11 Mar 2008 06:52:22 GMT Subject: rpms/kernel/devel linux-2.6-drm-i915-modeset.patch,1.3,1.4 Message-ID: <200803110652.m2B6qMAQ029665@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29642 Modified Files: linux-2.6-drm-i915-modeset.patch Log Message: actually include the patch change linux-2.6-drm-i915-modeset.patch: Index: linux-2.6-drm-i915-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-drm-i915-modeset.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-drm-i915-modeset.patch 11 Mar 2008 05:14:35 -0000 1.3 +++ linux-2.6-drm-i915-modeset.patch 11 Mar 2008 06:52:18 -0000 1.4 @@ -964,10 +964,10 @@ } diff --git a/drivers/char/drm/drm_crtc.c b/drivers/char/drm/drm_crtc.c new file mode 100644 -index 0000000..1a4624c +index 0000000..5d6a16a --- /dev/null +++ b/drivers/char/drm/drm_crtc.c -@@ -0,0 +1,2449 @@ +@@ -0,0 +1,2451 @@ +/* + * Copyright (c) 2006-2007 Intel Corporation + * Copyright (c) 2007 Dave Airlie @@ -2074,7 +2074,7 @@ + /* We should be able to check here if the fb has the same properties + * and then just flip_or_move it */ + if (crtc->fb != fb) -+ changed = true; ++ flip_or_move = true; + + if (crtc_info->x != crtc->x || crtc_info->y != crtc->y) + flip_or_move = true; @@ -2109,6 +2109,7 @@ + crtc->enabled = (new_mode != NULL); + if (new_mode != NULL) { + DRM_DEBUG("attempting to set mode from userspace\n"); ++ drm_mode_debug_printmodeline(dev, &crtc->mode); + drm_mode_debug_printmodeline(dev, new_mode); + if (!drm_crtc_set_mode(crtc, new_mode, crtc_info->x, + crtc_info->y)) { @@ -2125,6 +2126,7 @@ + } + drm_disable_unused_functions(dev); + } else if (flip_or_move) { ++ crtc->fb = fb; + crtc->funcs->mode_set_base(crtc, crtc_info->x, crtc_info->y); + } + @@ -5620,7 +5622,7 @@ EXPORT_SYMBOL(drm_i_have_hw_lock); diff --git a/drivers/char/drm/drm_modes.c b/drivers/char/drm/drm_modes.c new file mode 100644 -index 0000000..3763ca6 +index 0000000..8009cae --- /dev/null +++ b/drivers/char/drm/drm_modes.c @@ -0,0 +1,560 @@ @@ -5903,7 +5905,7 @@ + */ +bool drm_mode_equal(struct drm_display_mode *mode1, struct drm_display_mode *mode2) +{ -+ if (mode1->clock == mode2->clock && ++ if (/*mode1->clock == mode2->clock &&*/ + mode1->hdisplay == mode2->hdisplay && + mode1->hsync_start == mode2->hsync_start && + mode1->hsync_end == mode2->hsync_end && @@ -8782,10 +8784,10 @@ int ret; diff --git a/drivers/char/drm/i915_init.c b/drivers/char/drm/i915_init.c new file mode 100644 -index 0000000..c59067a +index 0000000..1234ac0 --- /dev/null +++ b/drivers/char/drm/i915_init.c -@@ -0,0 +1,409 @@ +@@ -0,0 +1,408 @@ +/* + * Copyright (c) 2007 Intel Corporation + * Jesse Barnes @@ -9073,7 +9075,6 @@ + if (dev_priv->sarea_kmap.virtual) { + drm_bo_kunmap(&dev_priv->sarea_kmap); + dev_priv->sarea_kmap.virtual = NULL; -+ dev->primary->master->lock.hw_lock = NULL; + dev->sigdata.lock = NULL; + } + @@ -11282,10 +11283,10 @@ +#endif /* __INTEL_DRV_H__ */ diff --git a/drivers/char/drm/intel_fb.c b/drivers/char/drm/intel_fb.c new file mode 100644 -index 0000000..d9743da +index 0000000..28cc324 --- /dev/null +++ b/drivers/char/drm/intel_fb.c -@@ -0,0 +1,752 @@ +@@ -0,0 +1,776 @@ +/* + * Copyright ?? 2007 David Airlie + * @@ -11516,6 +11517,8 @@ + struct drm_output *output = NULL; + struct fb_var_screeninfo *var = &info->var; + int found = 0; ++ int changed = 0; ++ int move_or_flip = 0; + + DRM_DEBUG("\n"); + @@ -11598,11 +11601,25 @@ + } + + /* re-attach fb */ -+ if (!par->crtc->fb) ++ if (par->crtc->fb != par->fb) { + par->crtc->fb = par->fb; ++ move_or_flip = 1; ++ } + -+ if (!drm_crtc_set_mode(par->crtc, drm_mode, var->xoffset, var->yoffset)) -+ return -EINVAL; ++ if (par->crtc->x != var->xoffset || par->crtc->y != var->yoffset) ++ move_or_flip = 1; ++ ++ if (!drm_mode_equal(drm_mode, &par->crtc->mode)) ++ changed = 1; ++ ++ if (changed) ++ if (!drm_crtc_set_mode(par->crtc, drm_mode, var->xoffset, var->yoffset)) ++ return -EINVAL; ++ ++ if (move_or_flip) { ++ par->crtc->funcs->mode_set_base(par->crtc, var->xoffset, var->yoffset); ++ } ++ + + return 0; +} @@ -11757,16 +11774,23 @@ +{ + struct intelfb_par *par = info->par; + struct drm_crtc *crtc = par->crtc; ++ int changed = 0; + + DRM_DEBUG("\n"); + + /* TODO add check size and pos*/ + + /* re-attach fb */ -+ if (!crtc->fb) ++ if (crtc->fb != par->fb) { + crtc->fb = par->fb; ++ changed = 1; ++ } ++ ++ if (par->crtc->x != var->xoffset || par->crtc->y != var->yoffset) ++ changed = 1; + -+ drm_crtc_set_mode(crtc, &crtc->mode, var->xoffset, var->yoffset); ++ if (changed) ++ drm_crtc_set_mode(crtc, &crtc->mode, var->xoffset, var->yoffset); + + info->var.xoffset = var->xoffset; + info->var.yoffset = var->yoffset; @@ -11825,6 +11849,7 @@ + info->var.pixclock = 10000000 / mode->htotal * 1000 / mode->vtotal * 100; + /* avoid overflow */ + info->var.pixclock = info->var.pixclock * 1000 / mode->vrefresh; ++ info->var.pixclock = KHZ2PICOS(mode->clock); + + return 0; +} From fedora-extras-commits at redhat.com Tue Mar 11 06:54:49 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 11 Mar 2008 06:54:49 GMT Subject: rpms/perl-Test-Script/devel .cvsignore, 1.2, 1.3 perl-Test-Script.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200803110654.m2B6snIs029829@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Test-Script/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29800 Modified Files: .cvsignore perl-Test-Script.spec sources Log Message: * Tue Mar 11 2008 Ralf Cors??pius - 1.03-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Sep 2007 04:06:50 -0000 1.2 +++ .cvsignore 11 Mar 2008 06:54:16 -0000 1.3 @@ -1 +1 @@ -Test-Script-1.02.tar.gz +Test-Script-1.03.tar.gz Index: perl-Test-Script.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/perl-Test-Script.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Test-Script.spec 27 Feb 2008 21:43:37 -0000 1.3 +++ perl-Test-Script.spec 11 Mar 2008 06:54:16 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Test-Script -Version: 1.02 -Release: 4%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Cross-platform basic tests for scripts License: GPL+ or Artistic Group: Development/Libraries @@ -21,8 +21,6 @@ %prep %setup -q -n Test-Script-%{version} -# Broken permissions in tarball -chmod -x Changes lib/Test/*pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -51,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 11 2008 Ralf Cors??pius - 1.03-1 +- Upstream update. + * Wed Feb 27 2008 Tom "spot" Callaway - 1.02-4 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Script/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Sep 2007 04:06:50 -0000 1.2 +++ sources 11 Mar 2008 06:54:16 -0000 1.3 @@ -1 +1 @@ -affeb47b8c7b9f1eb6ff346daa85784d Test-Script-1.02.tar.gz +fa3018d63bc54ebb8d4d244fb1dc4c35 Test-Script-1.03.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 07:21:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 11 Mar 2008 07:21:26 GMT Subject: rpms/perl-Test-Script/F-8 .cvsignore, 1.2, 1.3 perl-Test-Script.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803110721.m2B7LQ4e005165@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Test-Script/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5117/F-8 Modified Files: .cvsignore perl-Test-Script.spec sources Log Message: * Tue Mar 11 2008 Ralf Cors??pius - 1.03-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Sep 2007 04:06:50 -0000 1.2 +++ .cvsignore 11 Mar 2008 07:20:52 -0000 1.3 @@ -1 +1 @@ -Test-Script-1.02.tar.gz +Test-Script-1.03.tar.gz Index: perl-Test-Script.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-8/perl-Test-Script.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Script.spec 19 Sep 2007 04:06:50 -0000 1.1 +++ perl-Test-Script.spec 11 Mar 2008 07:20:52 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Script -Version: 1.02 -Release: 2%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Cross-platform basic tests for scripts License: GPL+ or Artistic Group: Development/Libraries @@ -21,8 +21,6 @@ %prep %setup -q -n Test-Script-%{version} -# Broken permissions in tarball -chmod -x Changes lib/Test/*pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -51,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 11 2008 Ralf Cors??pius - 1.03-1 +- Upstream update. + * Tue Sep 18 2007 Ralf Cors??pius - 1.02-2 - Reflect license tag changes. - BR: perl(Test::More). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Sep 2007 04:06:50 -0000 1.2 +++ sources 11 Mar 2008 07:20:52 -0000 1.3 @@ -1 +1 @@ -affeb47b8c7b9f1eb6ff346daa85784d Test-Script-1.02.tar.gz +fa3018d63bc54ebb8d4d244fb1dc4c35 Test-Script-1.03.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 07:21:40 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 11 Mar 2008 07:21:40 GMT Subject: rpms/perl-Test-Script/F-7 .cvsignore, 1.2, 1.3 perl-Test-Script.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803110721.m2B7LefO005170@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Test-Script/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5117/F-7 Modified Files: .cvsignore perl-Test-Script.spec sources Log Message: * Tue Mar 11 2008 Ralf Cors??pius - 1.03-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-7/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Sep 2007 04:09:26 -0000 1.2 +++ .cvsignore 11 Mar 2008 07:20:57 -0000 1.3 @@ -1 +1 @@ -Test-Script-1.02.tar.gz +Test-Script-1.03.tar.gz Index: perl-Test-Script.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-7/perl-Test-Script.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Script.spec 19 Sep 2007 04:09:26 -0000 1.1 +++ perl-Test-Script.spec 11 Mar 2008 07:20:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Script -Version: 1.02 -Release: 2%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Cross-platform basic tests for scripts License: GPL+ or Artistic Group: Development/Libraries @@ -21,8 +21,6 @@ %prep %setup -q -n Test-Script-%{version} -# Broken permissions in tarball -chmod -x Changes lib/Test/*pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -51,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 11 2008 Ralf Cors??pius - 1.03-1 +- Upstream update. + * Tue Sep 18 2007 Ralf Cors??pius - 1.02-2 - Reflect license tag changes. - BR: perl(Test::More). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Test-Script/F-7/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Sep 2007 04:09:26 -0000 1.2 +++ sources 11 Mar 2008 07:20:57 -0000 1.3 @@ -1 +1 @@ -affeb47b8c7b9f1eb6ff346daa85784d Test-Script-1.02.tar.gz +fa3018d63bc54ebb8d4d244fb1dc4c35 Test-Script-1.03.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 07:39:04 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 11 Mar 2008 07:39:04 GMT Subject: rpms/perl-Want/F-8 .cvsignore, 1.8, 1.9 perl-Want.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200803110739.m2B7d4dX005524@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Want/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5493 Modified Files: .cvsignore perl-Want.spec sources Log Message: * Wed Feb 06 2008 Ralf Cors??pius - 0.18-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Want/F-8/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 7 Jan 2008 05:18:01 -0000 1.8 +++ .cvsignore 11 Mar 2008 07:38:22 -0000 1.9 @@ -1 +1 @@ -Want-0.16.tar.gz +Want-0.18.tar.gz Index: perl-Want.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Want/F-8/perl-Want.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Want.spec 7 Jan 2008 05:18:01 -0000 1.11 +++ perl-Want.spec 11 Mar 2008 07:38:22 -0000 1.12 @@ -1,5 +1,5 @@ Name: perl-Want -Version: 0.16 +Version: 0.18 Release: 1%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL+ or Artistic @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 06 2008 Ralf Cors??pius - 0.18-1 +- Upstream update. + * Wed Jan 02 2008 Ralf Cors??pius - 0.16-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Want/F-8/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 7 Jan 2008 05:18:01 -0000 1.8 +++ sources 11 Mar 2008 07:38:22 -0000 1.9 @@ -1 +1 @@ -1671d949e044c21af1b760c18c420e85 Want-0.16.tar.gz +b83e2d189781b10250133b4eb9e6ca28 Want-0.18.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 07:53:51 2008 From: fedora-extras-commits at redhat.com (Tomas Smetana (tsmetana)) Date: Tue, 11 Mar 2008 07:53:51 GMT Subject: rpms/file/devel file-4.21-efi.patch,1.1,1.2 file.spec,1.70,1.71 Message-ID: <200803110753.m2B7rp0E005858@cvs-int.fedora.redhat.com> Author: tsmetana Update of /cvs/pkgs/rpms/file/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5834 Modified Files: file-4.21-efi.patch file.spec Log Message: * Tue Mar 11 2008 Tomas Smetana - 4.23-5 - fix EFI detection patch file-4.21-efi.patch: Index: file-4.21-efi.patch =================================================================== RCS file: /cvs/pkgs/rpms/file/devel/file-4.21-efi.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- file-4.21-efi.patch 24 Jan 2008 09:27:31 -0000 1.1 +++ file-4.21-efi.patch 11 Mar 2008 07:53:47 -0000 1.2 @@ -1,6 +1,6 @@ diff -up file-4.21/magic/Magdir/msdos.efi file-4.21/magic/Magdir/msdos ---- file-4.21/magic/Magdir/msdos.efi 2007-12-06 13:45:05.000000000 +0100 -+++ file-4.21/magic/Magdir/msdos 2007-12-06 13:48:18.000000000 +0100 +--- file-4.21/magic/Magdir/msdos.efi 2008-03-11 08:49:22.000000000 +0100 ++++ file-4.21/magic/Magdir/msdos 2008-03-11 08:50:05.000000000 +0100 @@ -49,7 +49,8 @@ # # many of the compressed formats were extraced from IDARC 1.23 source code @@ -66,3 +66,12 @@ >>>>(0x3c.l+0xf8) string UPX0 \b, UPX compressed >>>>(0x3c.l+0xf8) search/0x140 PEC2 \b, PECompact2 compressed +@@ -119,6 +128,8 @@ + >>>>&(0x3c.l+0xf8) search/0x100 SharedD \b, Microsoft Installer self-extracting archive + >>>>0x30 string Inno \b, InnoSetup self-extracting archive + ++>>(0x3c.l) string !PE\0\0 MS-DOS executable ++ + >>(0x3c.l) string NE \b, NE + >>>(0x3c.l+0x36) byte 0 (unknown OS) + >>>(0x3c.l+0x36) byte 1 for OS/2 1.x Index: file.spec =================================================================== RCS file: /cvs/pkgs/rpms/file/devel/file.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- file.spec 1 Feb 2008 11:18:38 -0000 1.70 +++ file.spec 11 Mar 2008 07:53:47 -0000 1.71 @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 4.23 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -161,6 +161,9 @@ %endif %changelog +* Tue Mar 11 2008 Tomas Smetana - 4.23-5 +- fix EFI detection patch + * Fri Feb 01 2008 Tomas Smetana - 4.23-4 - fix mismatching gzip files and text files as animations From fedora-extras-commits at redhat.com Tue Mar 11 08:01:23 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Tue, 11 Mar 2008 08:01:23 GMT Subject: rpms/perl-Want/F-7 .cvsignore, 1.8, 1.9 perl-Want.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200803110801.m2B81Nb6013298@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Want/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6129 Modified Files: .cvsignore perl-Want.spec sources Log Message: * Wed Feb 06 2008 Ralf Cors??pius - 0.18-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Want/F-7/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Jan 2008 15:57:05 -0000 1.8 +++ .cvsignore 11 Mar 2008 08:00:48 -0000 1.9 @@ -1 +1 @@ -Want-0.16.tar.gz +Want-0.18.tar.gz Index: perl-Want.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Want/F-7/perl-Want.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Want.spec 21 Jan 2008 15:57:05 -0000 1.11 +++ perl-Want.spec 11 Mar 2008 08:00:48 -0000 1.12 @@ -1,5 +1,5 @@ Name: perl-Want -Version: 0.16 +Version: 0.18 Release: 1%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL+ or Artistic @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Wed Feb 06 2008 Ralf Cors??pius - 0.18-1 +- Upstream update. + * Wed Jan 02 2008 Ralf Cors??pius - 0.16-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Want/F-7/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Jan 2008 15:57:05 -0000 1.8 +++ sources 11 Mar 2008 08:00:48 -0000 1.9 @@ -1 +1 @@ -1671d949e044c21af1b760c18c420e85 Want-0.16.tar.gz +b83e2d189781b10250133b4eb9e6ca28 Want-0.18.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 08:38:44 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 11 Mar 2008 08:38:44 GMT Subject: rpms/imlib2/devel imlib2.spec,1.30,1.31 Message-ID: <200803110838.m2B8ciK3013984@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/imlib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13962 Modified Files: imlib2.spec Log Message: * Tue Mar 11 2008 Hans de Goede 1.4.0-6 - Disable amd64 assembly optimization. (Kills idesk - #222998, #436924) Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- imlib2.spec 19 Feb 2008 08:39:06 -0000 1.30 +++ imlib2.spec 11 Mar 2008 08:38:10 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 Version: 1.4.0 -Release: 5%{?dist} +Release: 6%{?dist} License: Imlib2 Group: System Environment/Libraries URL: http://docs.enlightenment.org/api/imlib2/html/ @@ -72,13 +72,9 @@ %ifarch %{ix86} asmopts="--enable-mmx --disable-amd64" %endif -%ifarch x86_64 -asmopts="--disable-mmx --enable-amd64" -%endif # Note: --disable-static doesn't work as of 1.2.1. %configure --disable-dependency-tracking --with-pic $asmopts - make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool @@ -132,6 +128,9 @@ %{_libdir}/imlib2/loaders/id3.* %changelog +* Tue Mar 11 2008 Hans de Goede 1.4.0-6 +- Disable amd64 assembly optimization. (Kills idesk - #222998, #436924) + * Tue Feb 19 2008 Fedora Release Engineering - 1.4.0-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 08:51:19 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 08:51:19 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1445,1.1446 Message-ID: <200803110851.m2B8pJoK014322@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14263 Modified Files: openoffice.org.spec Log Message: clean up depends Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1445 retrieving revision 1.1446 diff -u -r1.1445 -r1.1446 --- openoffice.org.spec 10 Mar 2008 16:17:30 -0000 1.1445 +++ openoffice.org.spec 11 Mar 2008 08:50:43 -0000 1.1446 @@ -60,12 +60,12 @@ BuildRequires: binutils, %{java_devel}, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc BuildRequires: neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel -BuildRequires: libXt-devel, libICE-devel, libjpeg-devel, db4-devel, +BuildRequires: libXt-devel, libICE-devel, libjpeg-devel, db4-devel BuildRequires: xulrunner-devel, libwpd-devel, hunspell-devel, unixODBC-devel -BuildRequires: sane-backends-devel, libicu-devel, perl-Archive-Zip, +BuildRequires: sane-backends-devel, libicu-devel, perl-Archive-Zip BuildRequires: freetype-devel, gtk2-devel, gnome-vfs2-devel, desktop-file-utils BuildRequires: evolution-data-server-devel, libtextcat-devel, nss-devel -BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel, +BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel BuildRequires: openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh Patch0: openoffice.org-simple-crash_report.sh From fedora-extras-commits at redhat.com Tue Mar 11 08:54:31 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 08:54:31 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.12, 1.1440.2.13 Message-ID: <200803110854.m2B8sVjE014569@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14503 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org.spec Log Message: merge Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440.2.12 retrieving revision 1.1440.2.13 diff -u -r1.1440.2.12 -r1.1440.2.13 --- openoffice.org.spec 10 Mar 2008 19:57:24 -0000 1.1440.2.12 +++ openoffice.org.spec 11 Mar 2008 08:53:55 -0000 1.1440.2.13 @@ -60,13 +60,13 @@ BuildRequires: binutils, %{java_devel}, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc BuildRequires: neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel -BuildRequires: libXt-devel, libICE-devel, libjpeg-devel, db4-devel -BuildRequires: xulrunner-devel, libwpd-devel, hunspell-devel, unixODBC-devel -BuildRequires: sane-backends-devel, libicu-devel, perl-Archive-Zip, gperf +BuildRequires: libXt-devel, libICE-devel, libjpeg-devel, db4-devel, gperf +BuildRequires: gecko-devel, libwpd-devel, hunspell-devel, unixODBC-devel +BuildRequires: sane-backends-devel, libicu-devel, perl-Archive-Zip BuildRequires: freetype-devel, gtk2-devel, gnome-vfs2-devel, desktop-file-utils BuildRequires: evolution-data-server-devel, libtextcat-devel, nss-devel -BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel, -BuildRequires: openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh, lpsolve-devel +BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel +BuildRequires: openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh Patch0: openoffice.org-simple-crash_report.sh Patch1: openoffice.org-multiliblauncher.sh @@ -1105,7 +1105,7 @@ cd config_office autoconf export PATH=$PATH:/usr/sbin -%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" +%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" cd .. ./bootstrap source Linux*Env.Set.sh From fedora-extras-commits at redhat.com Tue Mar 11 09:19:06 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 09:19:06 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.13, 1.1440.2.14 Message-ID: <200803110919.m2B9J6VN022712@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22660 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org.spec Log Message: add lpsolve-devel Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440.2.13 retrieving revision 1.1440.2.14 diff -u -r1.1440.2.13 -r1.1440.2.14 --- openoffice.org.spec 11 Mar 2008 08:53:55 -0000 1.1440.2.13 +++ openoffice.org.spec 11 Mar 2008 09:18:25 -0000 1.1440.2.14 @@ -66,7 +66,7 @@ BuildRequires: freetype-devel, gtk2-devel, gnome-vfs2-devel, desktop-file-utils BuildRequires: evolution-data-server-devel, libtextcat-devel, nss-devel BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel -BuildRequires: openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh +BuildRequires: openssl-devel, lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh Patch0: openoffice.org-simple-crash_report.sh Patch1: openoffice.org-multiliblauncher.sh From fedora-extras-commits at redhat.com Tue Mar 11 09:31:49 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 09:31:49 GMT Subject: rpms/wine/F-7 .cvsignore, 1.51, 1.52 sources, 1.52, 1.53 wine.spec, 1.72, 1.73 Message-ID: <200803110931.m2B9VnWn023009@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22926/F-7 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-7/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 24 Feb 2008 07:45:37 -0000 1.51 +++ .cvsignore 11 Mar 2008 09:31:09 -0000 1.52 @@ -1 +1 @@ -wine-0.9.56-fe.tar.bz2 +wine-0.9.57-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-7/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 24 Feb 2008 07:45:37 -0000 1.52 +++ sources 11 Mar 2008 09:31:09 -0000 1.53 @@ -1 +1 @@ -7967c78aec5e3c3a2ba23e092c30bfa5 wine-0.9.56-fe.tar.bz2 +26fc25db994dc0563e7da12edd8596dc wine-0.9.57-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-7/wine.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- wine.spec 24 Feb 2008 07:45:37 -0000 1.72 +++ wine.spec 11 Mar 2008 09:31:09 -0000 1.73 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.56 +Version: 0.9.57 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -388,6 +388,7 @@ %{_libdir}/wine/regsvr32.exe.so %{_libdir}/wine/rpcss.exe.so %{_libdir}/wine/rundll32.exe.so +%{_libdir}/wine/secedit.exe.so %{_libdir}/wine/start.exe.so %{_libdir}/wine/wineboot.exe.so %{_libdir}/wine/winebrowser.exe.so @@ -682,6 +683,7 @@ %{_libdir}/wine/winspool.drv.so %{_libdir}/wine/wmi.dll.so %{_libdir}/wine/spoolss.dll.so +%{_libdir}/wine/winoldap.mod16 %{_libdir}/wine/winscard.dll.so %{_libdir}/wine/wintab.dll16 %{_libdir}/wine/wintab32.dll.so @@ -799,6 +801,10 @@ %{_libdir}/wine/*.def %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 0.9.57-1 +- version upgrade + * Sat Feb 23 2008 Andreas Bierfert - 0.9.56-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 09:32:00 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 09:32:00 GMT Subject: rpms/wine/F-8 .cvsignore, 1.51, 1.52 sources, 1.52, 1.53 wine.spec, 1.74, 1.75 Message-ID: <200803110932.m2B9W0id023014@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22926/F-8 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-8/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 23 Feb 2008 16:36:05 -0000 1.51 +++ .cvsignore 11 Mar 2008 09:31:19 -0000 1.52 @@ -1 +1 @@ -wine-0.9.56-fe.tar.bz2 +wine-0.9.57-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-8/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 23 Feb 2008 16:36:05 -0000 1.52 +++ sources 11 Mar 2008 09:31:19 -0000 1.53 @@ -1 +1 @@ -7967c78aec5e3c3a2ba23e092c30bfa5 wine-0.9.56-fe.tar.bz2 +26fc25db994dc0563e7da12edd8596dc wine-0.9.57-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine/F-8/wine.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- wine.spec 23 Feb 2008 16:36:05 -0000 1.74 +++ wine.spec 11 Mar 2008 09:31:19 -0000 1.75 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.56 +Version: 0.9.57 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -388,6 +388,7 @@ %{_libdir}/wine/regsvr32.exe.so %{_libdir}/wine/rpcss.exe.so %{_libdir}/wine/rundll32.exe.so +%{_libdir}/wine/secedit.exe.so %{_libdir}/wine/start.exe.so %{_libdir}/wine/wineboot.exe.so %{_libdir}/wine/winebrowser.exe.so @@ -682,6 +683,7 @@ %{_libdir}/wine/winspool.drv.so %{_libdir}/wine/wmi.dll.so %{_libdir}/wine/spoolss.dll.so +%{_libdir}/wine/winoldap.mod16 %{_libdir}/wine/winscard.dll.so %{_libdir}/wine/wintab.dll16 %{_libdir}/wine/wintab32.dll.so @@ -799,6 +801,10 @@ %{_libdir}/wine/*.def %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 0.9.57-1 +- version upgrade + * Sat Feb 23 2008 Andreas Bierfert - 0.9.56-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 09:32:11 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 09:32:11 GMT Subject: rpms/wine/devel .cvsignore, 1.51, 1.52 sources, 1.52, 1.53 wine.spec, 1.76, 1.77 Message-ID: <200803110932.m2B9WB3k023021@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22926/devel Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 24 Feb 2008 07:45:42 -0000 1.51 +++ .cvsignore 11 Mar 2008 09:31:31 -0000 1.52 @@ -1 +1 @@ -wine-0.9.56-fe.tar.bz2 +wine-0.9.57-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 24 Feb 2008 07:45:42 -0000 1.52 +++ sources 11 Mar 2008 09:31:31 -0000 1.53 @@ -1 +1 @@ -7967c78aec5e3c3a2ba23e092c30bfa5 wine-0.9.56-fe.tar.bz2 +26fc25db994dc0563e7da12edd8596dc wine-0.9.57-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- wine.spec 24 Feb 2008 07:45:42 -0000 1.76 +++ wine.spec 11 Mar 2008 09:31:31 -0000 1.77 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.56 +Version: 0.9.57 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -388,6 +388,7 @@ %{_libdir}/wine/regsvr32.exe.so %{_libdir}/wine/rpcss.exe.so %{_libdir}/wine/rundll32.exe.so +%{_libdir}/wine/secedit.exe.so %{_libdir}/wine/start.exe.so %{_libdir}/wine/wineboot.exe.so %{_libdir}/wine/winebrowser.exe.so @@ -682,6 +683,7 @@ %{_libdir}/wine/winspool.drv.so %{_libdir}/wine/wmi.dll.so %{_libdir}/wine/spoolss.dll.so +%{_libdir}/wine/winoldap.mod16 %{_libdir}/wine/winscard.dll.so %{_libdir}/wine/wintab.dll16 %{_libdir}/wine/wintab32.dll.so @@ -799,6 +801,10 @@ %{_libdir}/wine/*.def %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 0.9.57-1 +- version upgrade + * Sat Feb 23 2008 Andreas Bierfert - 0.9.56-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 09:43:46 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 11 Mar 2008 09:43:46 GMT Subject: rpms/imlib2/F-8 imlib2.spec,1.28,1.29 Message-ID: <200803110943.m2B9hk4Q023360@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/imlib2/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23340 Modified Files: imlib2.spec Log Message: * Tue Mar 11 2008 Hans de Goede 1.4.0-6 - Disable amd64 assembly optimization. (Kills idesk - #222998, #436924) Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/F-8/imlib2.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- imlib2.spec 6 Sep 2007 21:57:30 -0000 1.28 +++ imlib2.spec 11 Mar 2008 09:42:53 -0000 1.29 @@ -1,7 +1,7 @@ Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 Version: 1.4.0 -Release: 3%{?dist} +Release: 6%{?dist} License: Imlib2 Group: System Environment/Libraries URL: http://docs.enlightenment.org/api/imlib2/html/ @@ -69,16 +69,12 @@ %build asmopts="--disable-mmx --disable-amd64" -%ifarch %{ix86} ia64 +%ifarch %{ix86} asmopts="--enable-mmx --disable-amd64" %endif -%ifarch x86_64 -asmopts="--disable-mmx --enable-amd64" -%endif # Note: --disable-static doesn't work as of 1.2.1. %configure --disable-dependency-tracking --with-pic $asmopts - make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool @@ -132,6 +128,15 @@ %{_libdir}/imlib2/loaders/id3.* %changelog +* Tue Mar 11 2008 Hans de Goede 1.4.0-6 +- Disable amd64 assembly optimization. (Kills idesk - #222998, #436924) + +* Tue Feb 19 2008 Fedora Release Engineering - 1.4.0-5 +- Autorebuild for GCC 4.3 + +* Tue Oct 23 2007 Hans de Goede 1.4.0-4 +- Fix building on ia64 (bz 349171) + * Thu Sep 6 2007 Hans de Goede 1.4.0-3 - Update license tag From fedora-extras-commits at redhat.com Tue Mar 11 10:00:39 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 10:00:39 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch, 1.1, 1.2 Message-ID: <200803111000.m2BA0d0t023691@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23670 Modified Files: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch Log Message: update patch to upstream decision openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch: Index: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch 10 Mar 2008 15:44:25 -0000 1.1 +++ openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch 11 Mar 2008 10:00:26 -0000 1.2 @@ -1,97 +1,22 @@ -Index: unx/gtk/window/gtkframe.cxx +Index: salgeom.hxx =================================================================== -RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v -retrieving revision 1.72.8.2 -diff -u -r1.72.8.2 gtkframe.cxx ---- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 23 Jan 2008 17:17:10 -0000 1.72.8.2 -+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 10 Mar 2008 15:32:32 -0000 -@@ -1158,8 +1169,8 @@ +RCS file: /cvs/gsl/vcl/inc/vcl/salgeom.hxx,v +retrieving revision 1.2 +diff -u -r1.2 salgeom.hxx +--- openoffice.org.orig/vcl/inc/vcl/salgeom.hxx 11 Apr 2007 18:06:34 -0000 1.2 ++++ openoffice.org/vcl/inc/vcl/salgeom.hxx 11 Mar 2008 09:44:47 -0000 +@@ -38,11 +38,11 @@ - if( m_pParent ) - { -- nX = ((long)m_pParent->maGeometry.nWidth - (long)maGeometry.nWidth)/2; -- nY = ((long)m_pParent->maGeometry.nHeight - (long)maGeometry.nHeight)/2; -+ nX = ((int)m_pParent->maGeometry.nWidth - (int)maGeometry.nWidth)/2; -+ nY = ((int)m_pParent->maGeometry.nHeight - (int)maGeometry.nHeight)/2; - - } - else -@@ -1191,8 +1202,8 @@ - break; - } - } -- nX = nScreenX + (nScreenWidth - (long)maGeometry.nWidth)/2; -- nY = nScreenY + (nScreenHeight - (long)maGeometry.nHeight)/2; -+ nX = nScreenX + (nScreenWidth - (int)maGeometry.nWidth)/2; -+ nY = nScreenY + (nScreenHeight - (int)maGeometry.nHeight)/2; - } - SetPosSize( nX, nY, 0, 0, SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y ); - } -@@ -1426,25 +1438,25 @@ - Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen ); - if( ! (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) - { -- if( nX < (long)maGeometry.nLeftDecoration ) -+ if( nX < (int)maGeometry.nLeftDecoration ) - nX = maGeometry.nLeftDecoration; -- if( nY < (long)maGeometry.nTopDecoration ) -+ if( nY < (int)maGeometry.nTopDecoration ) - nY = maGeometry.nTopDecoration; -- if( (nX + (long)maGeometry.nWidth + (long)maGeometry.nRightDecoration) > (long)aScreenSize.Width() ) -+ if( (nX + (int)maGeometry.nWidth + (int)maGeometry.nRightDecoration) > aScreenSize.Width() ) - nX = aScreenSize.Width() - maGeometry.nWidth - maGeometry.nRightDecoration; -- if( (nY + (long)maGeometry.nHeight + (long)maGeometry.nBottomDecoration) > (long)aScreenSize.Height() ) -+ if( (nY + (int)maGeometry.nHeight + (int)maGeometry.nBottomDecoration) > aScreenSize.Height() ) - nY = aScreenSize.Height() - maGeometry.nHeight - maGeometry.nBottomDecoration; - } - else - { -- if( nX + (long)maGeometry.nWidth < 10 ) -- nX = 10 - (long)maGeometry.nWidth; -- if( nY + (long)maGeometry.nHeight < 10 ) -- nY = 10 - (long)maGeometry.nHeight; -- if( nX > (long)aScreenSize.Width() - 10 ) -- nX = (long)aScreenSize.Width() - 10; -- if( nY > (long)aScreenSize.Height() - 10 ) -- nY = (long)aScreenSize.Height() - 10; -+ if( nX + (int)maGeometry.nWidth < 10 ) -+ nX = 10 - (int)maGeometry.nWidth; -+ if( nY + (int)maGeometry.nHeight < 10 ) -+ nY = 10 - (int)maGeometry.nHeight; -+ if( nX > aScreenSize.Width() - 10 ) -+ nX = aScreenSize.Width() - 10; -+ if( nY > aScreenSize.Height() - 10 ) -+ nY = aScreenSize.Height() - 10; - } - - if( nX != maGeometry.nX || nY != maGeometry.nY ) -Index: unx/source/window/salframe.cxx -=================================================================== -RCS file: /cvs/gsl/vcl/unx/source/window/salframe.cxx,v -retrieving revision 1.219.110.3 -diff -u -r1.219.110.3 salframe.cxx ---- openoffice.org.orig/vcl/unx/source/window/salframe.cxx 25 Jan 2008 16:37:31 -0000 1.219.110.3 -+++ openoffice.org/unx/source/window/salframe.cxx 10 Mar 2008 15:32:43 -0000 -@@ -1714,14 +1714,14 @@ - } - - // adjust position so that frame fits onto screen -- if( aPosSize.Right()+(long)aGeom.nRightDecoration > aScreenSize.Width()-1 ) -- aPosSize.Move( (long)aScreenSize.Width() - (long)aPosSize.Right() - (long)aGeom.nRightDecoration, 0 ); -- if( aPosSize.Bottom()+(long)aGeom.nBottomDecoration > aScreenSize.Height()-1 ) -- aPosSize.Move( 0, (long)aScreenSize.Height() - (long)aPosSize.Bottom() - (long)aGeom.nBottomDecoration ); -- if( aPosSize.Left() < (long)aGeom.nLeftDecoration ) -- aPosSize.Move( (long)aGeom.nLeftDecoration - (long)aPosSize.Left(), 0 ); -- if( aPosSize.Top() < (long)aGeom.nTopDecoration ) -- aPosSize.Move( 0, (long)aGeom.nTopDecoration - (long)aPosSize.Top() ); -+ if( aPosSize.Right()+(int)aGeom.nRightDecoration > aScreenSize.Width()-1 ) -+ aPosSize.Move( aScreenSize.Width() - aPosSize.Right() - (int)aGeom.nRightDecoration, 0 ); -+ if( aPosSize.Bottom()+(int)aGeom.nBottomDecoration > aScreenSize.Height()-1 ) -+ aPosSize.Move( 0, aScreenSize.Height() - aPosSize.Bottom() - (int)aGeom.nBottomDecoration ); -+ if( aPosSize.Left() < (int)aGeom.nLeftDecoration ) -+ aPosSize.Move( (int)aGeom.nLeftDecoration - aPosSize.Left(), 0 ); -+ if( aPosSize.Top() < (int)aGeom.nTopDecoration ) -+ aPosSize.Move( 0, (int)aGeom.nTopDecoration - aPosSize.Top() ); - } - - // resize with new args + typedef struct _SalFrameGeometry { + // screen position of upper left corner of drawable area in pixel +- int nX, nY; ++ long nX, nY; + // dimensions of the drawable area in pixel +- unsigned int nWidth, nHeight; ++ unsigned long nWidth, nHeight; + // thickness of the decoration in pixel +- unsigned int nLeftDecoration, ++ unsigned long nLeftDecoration, + nTopDecoration, + nRightDecoration, + nBottomDecoration; From fedora-extras-commits at redhat.com Tue Mar 11 10:15:07 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:15:07 GMT Subject: rpms/wine/EL-4 .cvsignore, 1.32, 1.33 sources, 1.33, 1.34 wine.spec, 1.43, 1.44 Message-ID: <200803111015.m2BAF7Ya031145@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31082/EL-4 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine/EL-4/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 18 Nov 2007 22:45:28 -0000 1.32 +++ .cvsignore 11 Mar 2008 10:14:17 -0000 1.33 @@ -1 +1 @@ -wine-0.9.49-fe.tar.bz2 +wine-0.9.57-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine/EL-4/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 18 Nov 2007 22:45:28 -0000 1.33 +++ sources 11 Mar 2008 10:14:17 -0000 1.34 @@ -1 +1 @@ -918c7f23585e08824dc7e14786deb441 wine-0.9.49-fe.tar.bz2 +26fc25db994dc0563e7da12edd8596dc wine-0.9.57-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine/EL-4/wine.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- wine.spec 14 Oct 2007 07:25:41 -0000 1.43 +++ wine.spec 11 Mar 2008 10:14:17 -0000 1.44 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.47 +Version: 0.9.57 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -17,7 +17,7 @@ # Makefile.in: dlls/winemp3.acm/Makefile \ # Makefile.in:dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules # programs/winecfg/libraries.c: "winemp3.acm", -Source0: wine-0.9.47-fe.tar.bz2 +Source0: %{name}-%{version}-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -49,7 +49,7 @@ Patch1: wine-rpath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: %{ix86} +ExclusiveArch: i386 BuildRequires: bison BuildRequires: flex @@ -59,7 +59,7 @@ BuildRequires: freeglut-devel BuildRequires: lcms-devel BuildRequires: libieee1284-devel -BuildRequires: libjpeg-devel +BuildRequires: libjpeg-devel libpng-devel BuildRequires: libstdc++-devel BuildRequires: libusb-devel BuildRequires: libxml2-devel @@ -75,6 +75,7 @@ BuildRequires: gphoto2 gphoto2-devel BuildRequires: isdn4k-utils-devel BuildRequires: cups-devel +BuildRequires: unixODBC-devel Requires: wine-core = %{version}-%{release} Requires: wine-capi = %{version}-%{release} @@ -358,7 +359,9 @@ %{_libdir}/wine/regsvr32.exe.so %{_libdir}/wine/rpcss.exe.so %{_libdir}/wine/rundll32.exe.so +%{_libdir}/wine/secedit.exe.so %{_libdir}/wine/start.exe.so +%{_libdir}/wine/svchost.exe.so %{_libdir}/wine/wineboot.exe.so %{_libdir}/wine/winebrowser.exe.so %{_libdir}/wine/wineconsole.exe.so @@ -389,6 +392,7 @@ %dir %{_libdir}/wine %{_libdir}/wine/acledit.dll.so %{_libdir}/wine/activeds.dll.so +%{_libdir}/wine/actxprxy.dll.so %{_libdir}/wine/advapi32.dll.so %{_libdir}/wine/advpack.dll.so %{_libdir}/wine/amstream.dll.so @@ -410,16 +414,19 @@ %{_libdir}/wine/compobj.dll16 %{_libdir}/wine/compstui.dll.so %{_libdir}/wine/credui.dll.so -%{_libdir}/wine/cryptnet.dll.so %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so +%{_libdir}/wine/cryptdlg.dll.so %{_libdir}/wine/cryptdll.dll.so +%{_libdir}/wine/cryptnet.dll.so +%{_libdir}/wine/ctapi32.dll.so %{_libdir}/wine/ctl3d.dll16 %{_libdir}/wine/ctl3d32.dll.so %{_libdir}/wine/ctl3dv2.dll16 %{_libdir}/wine/d3dim.dll.so %{_libdir}/wine/d3drm.dll.so %{_libdir}/wine/d3dxof.dll.so +%{_libdir}/wine/d3dx9_*.dll.so %{_libdir}/wine/d3d10.dll.so %{_libdir}/wine/dbghelp.dll.so %{_libdir}/wine/dciman32.dll.so @@ -447,6 +454,7 @@ %{_libdir}/wine/dpnhpast.dll.so %{_libdir}/wine/dpnlobby.dll.so %{_libdir}/wine/dsound.dll.so +%{_libdir}/wine/dssenh.dll.so %{_libdir}/wine/dswave.dll.so %{_libdir}/wine/dwmapi.dll.so %{_libdir}/wine/dxdiagn.dll.so @@ -456,6 +464,7 @@ %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/gdiplus.dll.so %{_libdir}/wine/gphoto2.ds.so +%{_libdir}/wine/gpkcsp.dll.so %{_libdir}/wine/hal.dll.so %{_libdir}/wine/hid.dll.so %{_libdir}/wine/hh.exe.so @@ -466,12 +475,15 @@ %{_libdir}/wine/icinfo.exe.so %{_libdir}/wine/icmp.dll.so %{_libdir}/wine/ifsmgr.vxd.so +%{_libdir}/wine/inetcomm.dll.so %{_libdir}/wine/infosoft.dll.so +%{_libdir}/wine/initpki.dll.so %{_libdir}/wine/inkobj.dll.so %{_libdir}/wine/imaadp32.acm.so %{_libdir}/wine/imagehlp.dll.so %{_libdir}/wine/imm.dll16 %{_libdir}/wine/imm32.dll.so +%{_libdir}/wine/itircl.dll.so %{_libdir}/wine/inseng.dll.so %{_libdir}/wine/iphlpapi.dll.so %{_libdir}/wine/itss.dll.so @@ -492,6 +504,7 @@ %{_libdir}/wine/mmdevldr.vxd.so %{_libdir}/wine/mmsystem.dll16 %{_libdir}/wine/monodebg.vxd.so +%{_libdir}/wine/mountmgr.sys.so %{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so %{_libdir}/wine/mprapi.dll.so @@ -499,6 +512,7 @@ %{_libdir}/wine/msacm32.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so +%{_libdir}/wine/mscat32.dll.so %{_libdir}/wine/mscoree.dll.so %{_libdir}/wine/msdmo.dll.so %{_libdir}/wine/msftedit.dll.so @@ -507,9 +521,13 @@ %{_libdir}/wine/mshtml.tlb.so %{_libdir}/wine/msi.dll.so %{_libdir}/wine/msimg32.dll.so +%{_libdir}/wine/msimtf.dll.so %{_libdir}/wine/msisys.ocx.so %{_libdir}/wine/msnet32.dll.so %{_libdir}/wine/msrle32.dll.so +%{_libdir}/wine/mssip32.dll.so +%{_libdir}/wine/msvcirt.dll.so +%{_libdir}/wine/msvcr71.dll.so %{_libdir}/wine/msvcrt.dll.so %{_libdir}/wine/msvcrt20.dll.so %{_libdir}/wine/msvcrt40.dll.so @@ -549,7 +567,11 @@ %{_libdir}/wine/psapi.dll.so %{_libdir}/wine/pstorec.dll.so %{_libdir}/wine/printui.dll.so +%{_libdir}/wine/propsys.dll.so %{_libdir}/wine/qcap.dll.so +%{_libdir}/wine/qedit.dll.so +%{_libdir}/wine/qmgr.dll.so +%{_libdir}/wine/qmgrprxy.dll.so %{_libdir}/wine/quartz.dll.so %{_libdir}/wine/query.dll.so %{_libdir}/wine/rasapi16.dll16 @@ -560,6 +582,7 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so +%{_libdir}/wine/sccbase.dll.so %{_libdir}/wine/schannel.dll.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so @@ -573,7 +596,10 @@ %{_libdir}/wine/shell32.dll.so %{_libdir}/wine/shfolder.dll.so %{_libdir}/wine/shlwapi.dll.so +%{_libdir}/wine/slbcsp.dll.so +%{_libdir}/wine/slc.dll.so %{_libdir}/wine/snmpapi.dll.so +%{_libdir}/wine/softpub.dll.so %{_libdir}/wine/sound.drv16 %{_libdir}/wine/spoolsv.exe.so %{_libdir}/wine/stdole2.tlb.so @@ -623,13 +649,15 @@ %{_libdir}/wine/winmm.dll.so %{_libdir}/wine/winnls.dll16 %{_libdir}/wine/winnls32.dll.so +%{_libdir}/wine/winoldap.mod16 +%{_libdir}/wine/winscard.dll.so %{_libdir}/wine/winsock.dll16 %{_libdir}/wine/winspool.drv.so %{_libdir}/wine/spoolss.dll.so %{_libdir}/wine/wintab.dll16 %{_libdir}/wine/wintab32.dll.so %{_libdir}/wine/wintrust.dll.so -%{_libdir}/wine/winscard.dll.so +%{_libdir}/wine/wmi.dll.so %{_libdir}/wine/wnaspi32.dll.so %{_libdir}/wine/wow32.dll.so %{_libdir}/wine/wprocs.dll16 @@ -652,6 +680,9 @@ %{_libdir}/wine/dnsapi.dll.so %{_libdir}/wine/iexplore.exe.so %{_sysconfdir}/ld.so.conf.d/wine-32.conf +%lang(de) %{_mandir}/de.UTF-8/man1/* +%lang(fr) %{_mandir}/fr.UTF-8/man1/* + %files tools %defattr(-,root,root,-) @@ -742,6 +773,10 @@ %{_libdir}/wine/*.def %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 0.9.57-1 +- version upgrade + * Sun Oct 14 2007 Andreas Bierfert - 0.9.47-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:15:11 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:15:11 GMT Subject: rpms/wine/EL-5 .cvsignore, 1.43, 1.44 sources, 1.44, 1.45 wine.spec, 1.59, 1.60 Message-ID: <200803111015.m2BAFBHg031152@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31082/EL-5 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine/EL-5/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 29 Jan 2008 19:49:51 -0000 1.43 +++ .cvsignore 11 Mar 2008 10:14:37 -0000 1.44 @@ -1 +1 @@ -wine-0.9.54-fe.tar.bz2 +wine-0.9.57-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine/EL-5/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 29 Jan 2008 19:49:51 -0000 1.44 +++ sources 11 Mar 2008 10:14:37 -0000 1.45 @@ -1 +1 @@ -a2677aa04cc7e9a27e8de533b8166627 wine-0.9.54-fe.tar.bz2 +26fc25db994dc0563e7da12edd8596dc wine-0.9.57-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine/EL-5/wine.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- wine.spec 29 Jan 2008 19:49:51 -0000 1.59 +++ wine.spec 11 Mar 2008 10:14:37 -0000 1.60 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.54 +Version: 0.9.57 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -377,6 +377,7 @@ %{_libdir}/wine/regsvr32.exe.so %{_libdir}/wine/rpcss.exe.so %{_libdir}/wine/rundll32.exe.so +%{_libdir}/wine/secedit.exe.so %{_libdir}/wine/start.exe.so %{_libdir}/wine/wineboot.exe.so %{_libdir}/wine/winebrowser.exe.so @@ -434,6 +435,7 @@ %{_libdir}/wine/credui.dll.so %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so +%{_libdir}/wine/cryptdlg.dll.so %{_libdir}/wine/cryptdll.dll.so %{_libdir}/wine/cryptnet.dll.so %{_libdir}/wine/ctapi32.dll.so @@ -443,7 +445,7 @@ %{_libdir}/wine/d3d10.dll.so %{_libdir}/wine/d3dim.dll.so %{_libdir}/wine/d3drm.dll.so -%{_libdir}/wine/d3dx9_36.dll.so +%{_libdir}/wine/d3dx9_*.dll.so %{_libdir}/wine/d3dxof.dll.so %{_libdir}/wine/dbghelp.dll.so %{_libdir}/wine/dciman32.dll.so @@ -471,6 +473,7 @@ %{_libdir}/wine/dpnhpast.dll.so %{_libdir}/wine/dpnlobby.dll.so %{_libdir}/wine/dsound.dll.so +%{_libdir}/wine/dssenh.dll.so %{_libdir}/wine/dswave.dll.so %{_libdir}/wine/dwmapi.dll.so %{_libdir}/wine/dxdiagn.dll.so @@ -480,6 +483,7 @@ %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/gdiplus.dll.so %{_libdir}/wine/gphoto2.ds.so +%{_libdir}/wine/gpkcsp.dll.so %{_libdir}/wine/hal.dll.so %{_libdir}/wine/hid.dll.so %{_libdir}/wine/hh.exe.so @@ -496,9 +500,11 @@ %{_libdir}/wine/imm32.dll.so %{_libdir}/wine/inetcomm.dll.so %{_libdir}/wine/infosoft.dll.so +%{_libdir}/wine/initpki.dll.so %{_libdir}/wine/inkobj.dll.so %{_libdir}/wine/inseng.dll.so %{_libdir}/wine/iphlpapi.dll.so +%{_libdir}/wine/itircl.dll.so %{_libdir}/wine/itss.dll.so %{_libdir}/wine/kernel32.dll.so %{_libdir}/wine/keyboard.drv16 @@ -538,6 +544,7 @@ %{_libdir}/wine/msisys.ocx.so %{_libdir}/wine/msnet32.dll.so %{_libdir}/wine/msrle32.dll.so +%{_libdir}/wine/mssip32.dll.so %{_libdir}/wine/msvcirt.dll.so %{_libdir}/wine/msvcr71.dll.so %{_libdir}/wine/msvcrt.dll.so @@ -581,6 +588,7 @@ %{_libdir}/wine/psapi.dll.so %{_libdir}/wine/pstorec.dll.so %{_libdir}/wine/qcap.dll.so +%{_libdir}/wine/qedit.dll.so %{_libdir}/wine/qmgr.dll.so %{_libdir}/wine/qmgrprxy.dll.so %{_libdir}/wine/quartz.dll.so @@ -593,6 +601,7 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so +%{_libdir}/wine/sccbase.dll.so %{_libdir}/wine/schannel.dll.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so @@ -606,7 +615,10 @@ %{_libdir}/wine/shell32.dll.so %{_libdir}/wine/shfolder.dll.so %{_libdir}/wine/shlwapi.dll.so +%{_libdir}/wine/slbcsp.dll.so +%{_libdir}/wine/slc.dll.so %{_libdir}/wine/snmpapi.dll.so +%{_libdir}/wine/softpub.dll.so %{_libdir}/wine/sound.drv16 %{_libdir}/wine/spoolsv.exe.so %{_libdir}/wine/stdole2.tlb.so @@ -657,6 +669,7 @@ %{_libdir}/wine/winmm.dll.so %{_libdir}/wine/winnls.dll16 %{_libdir}/wine/winnls32.dll.so +%{_libdir}/wine/winoldap.mod16 %{_libdir}/wine/winsock.dll16 %{_libdir}/wine/winspool.drv.so %{_libdir}/wine/spoolss.dll.so @@ -777,6 +790,10 @@ %{_libdir}/wine/*.def %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 0.9.57-1 +- version upgrade + * Tue Jan 29 2008 Andreas Bierfert - 0.9.54-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:18:45 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 11 Mar 2008 10:18:45 GMT Subject: comps comps-f9.xml.in,1.302,1.303 Message-ID: <200803111018.m2BAIjMm031337@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31310 Modified Files: comps-f9.xml.in Log Message: update samyak-fonts to subpackages Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- comps-f9.xml.in 11 Mar 2008 03:27:20 -0000 1.302 +++ comps-f9.xml.in 11 Mar 2008 10:18:15 -0000 1.303 @@ -1354,7 +1354,11 @@ mathml-fonts mgopen-fonts nafees-web-naskh-fonts - samyak-fonts + samyak-fonts-devanagari + samyak-fonts-gujarati + samyak-fonts-malayalam + samyak-fonts-oriya + samyak-fonts-tamil sarai-fonts sazanami-fonts-gothic sazanami-fonts-mincho @@ -2102,7 +2106,7 @@ moodle-gu openoffice.org-langpack-gu_IN scim-lang-gujarati - samyak-fonts + samyak-fonts-gujarati @@ -2185,7 +2189,7 @@ moodle-hi openoffice.org-langpack-hi_IN scim-lang-hindi - samyak-fonts + samyak-fonts-devanagari sarai-fonts @@ -2859,7 +2863,7 @@ moodle-ml openoffice.org-langpack-ml_IN scim-lang-malayalam - samyak-fonts + samyak-fonts-malayalam @@ -2888,7 +2892,7 @@ gcompris-sound-mr openoffice.org-langpack-mr_IN scim-lang-marathi - samyak-fonts + samyak-fonts-devanagari @@ -3120,7 +3124,7 @@ aspell-or openoffice.org-langpack-or_IN scim-lang-oriya - samyak-fonts + samyak-fonts-oriya @@ -3815,7 +3819,7 @@ moodle-ta openoffice.org-langpack-ta_IN scim-lang-tamil - samyak-fonts + samyak-fonts-tamil From fedora-extras-commits at redhat.com Tue Mar 11 10:21:01 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 11 Mar 2008 10:21:01 GMT Subject: rpms/lua/F-8 lua-5.1.3-autotoolize.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 lua.spec, 1.22, 1.23 sources, 1.9, 1.10 Message-ID: <200803111021.m2BAL1p5031394@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lua/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31357 Modified Files: .cvsignore lua.spec sources Added Files: lua-5.1.3-autotoolize.patch Log Message: * Tue Feb 19 2008 Fedora Release Engineering - 5.1.3-2 - Autorebuild for GCC 4.3 lua-5.1.3-autotoolize.patch: --- NEW FILE lua-5.1.3-autotoolize.patch --- diff -up /dev/null lua-5.1.3/config.h.in --- /dev/null 2008-01-26 09:26:21.331005882 +0100 +++ lua-5.1.3/config.h.in 2008-01-26 11:16:57.000000000 +0100 @@ -0,0 +1,64 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `readline' library (-lreadline). */ +#undef HAVE_LIBREADLINE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_READLINE_HISTORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_READLINE_READLINE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION diff -up /dev/null lua-5.1.3/ltmain.sh --- /dev/null 2008-01-26 09:26:21.331005882 +0100 +++ lua-5.1.3/ltmain.sh 2008-01-26 11:16:57.000000000 +0100 @@ -0,0 +1,6971 @@ +# ltmain.sh - Provide generalized library-building support services. +# NOTE: Changing this file will not affect anything until you rerun configure. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# Originally by Gordon Matzigkeit , 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +basename="s,^.*/,,g" + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + +# define SED for historic ltconfig's generated by Libtool 1.3 +test -z "$SED" && SED=sed + +# The name of this program: +progname=`echo "$progpath" | $SED $basename` +modename="$progname" + +# Global variables: +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + +PROGRAM=ltmain.sh +PACKAGE=libtool +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" + +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes. +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi +# Same for EGREP, and just to be sure, do LTCC as well +if test "X$EGREP" = X ; then + EGREP=egrep +fi +if test "X$LTCC" = X ; then + LTCC=${CC-gcc} +fi + +# Check that we have a working $echo. +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then + # Yippee, $echo works! + : +else + # Restart under the correct shell, and then maybe $echo will work. + exec $SHELL "$progpath" --no-reexec ${1+"$@"} +fi + +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat < - 5.1.3-2 +- Autorebuild for GCC 4.3 + +* Sat Jan 26 2008 Hans de Goede 5.1.3-1 +- New upstream release 5.1.3 + +* Mon Nov 26 2007 Hans de Goede 5.1.2-4 +- Fix libdir in lua.pc being /usr/lib on x86_64 (bz 399101) + +* Sun Oct 21 2007 Hans de Goede 5.1.2-3 +- Also use lib64 instead of lib on ia64 and sparc64 + +* Sun Oct 21 2007 Hans de Goede 5.1.2-2 +- Fix multilib condlict in luaconf.h (bz 342561) + * Mon Apr 2 2007 Hans de Goede 5.1.2-1 - New upstream release 5.1.2 - Fix use of rpath on x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/F-8/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 2 Apr 2007 19:35:19 -0000 1.9 +++ sources 11 Mar 2008 10:20:21 -0000 1.10 @@ -1,2 +1 @@ -751d2dfd522941e82571195aa81abe4c lua-5.1.1-autotoolize.patch.gz -687ce4c2a1ddff18f1008490fdc4e5e0 lua-5.1.2.tar.gz +a70a8dfaa150e047866dc01a46272599 lua-5.1.3.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 10:28:28 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:28:28 GMT Subject: rpms/wine-docs/EL-4 .cvsignore, 1.22, 1.23 sources, 1.22, 1.23 wine-docs.spec, 1.25, 1.26 Message-ID: <200803111028.m2BASSjd031598@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine-docs/EL-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31471/EL-4 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/EL-4/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 25 Jan 2008 17:01:41 -0000 1.22 +++ .cvsignore 11 Mar 2008 10:27:49 -0000 1.23 @@ -1 +1 @@ -wine-docs-0.9.54.tar.bz2 +wine-docs-0.9.57.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/EL-4/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 25 Jan 2008 17:01:41 -0000 1.22 +++ sources 11 Mar 2008 10:27:49 -0000 1.23 @@ -1 +1 @@ -540a5892c30aa34bc63267b8c9faccf3 wine-docs-0.9.54.tar.bz2 +8e43d1dc4d615d0d7e0d91329a359e6d wine-docs-0.9.57.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/EL-4/wine-docs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- wine-docs.spec 25 Jan 2008 17:01:41 -0000 1.25 +++ wine-docs.spec 11 Mar 2008 10:27:49 -0000 1.26 @@ -1,6 +1,6 @@ %define debug_package %{nil} Name: wine-docs -Version: 0.9.54 +Version: 0.9.57 Release: 1%{?dist} Summary: Documentation for wine @@ -38,6 +38,14 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 0.9.57-1 +- version upgrade + +* Sun Feb 10 2008 Andreas Bierfert +- 0.9.55-1 +- version upgrade + * Fri Jan 25 2008 Andreas Bierfert - 0.9.54-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:28:32 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:28:32 GMT Subject: rpms/wine-docs/EL-5 .cvsignore, 1.36, 1.37 sources, 1.36, 1.37 wine-docs.spec, 1.36, 1.37 Message-ID: <200803111028.m2BASWne031608@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine-docs/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31471/EL-5 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/EL-5/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 25 Jan 2008 17:01:51 -0000 1.36 +++ .cvsignore 11 Mar 2008 10:27:58 -0000 1.37 @@ -1 +1 @@ -wine-docs-0.9.54.tar.bz2 +wine-docs-0.9.57.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/EL-5/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 25 Jan 2008 17:01:51 -0000 1.36 +++ sources 11 Mar 2008 10:27:58 -0000 1.37 @@ -1 +1 @@ -540a5892c30aa34bc63267b8c9faccf3 wine-docs-0.9.54.tar.bz2 +8e43d1dc4d615d0d7e0d91329a359e6d wine-docs-0.9.57.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/EL-5/wine-docs.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- wine-docs.spec 25 Jan 2008 17:01:51 -0000 1.36 +++ wine-docs.spec 11 Mar 2008 10:27:58 -0000 1.37 @@ -1,6 +1,6 @@ %define debug_package %{nil} Name: wine-docs -Version: 0.9.54 +Version: 0.9.57 Release: 1%{?dist} Summary: Documentation for wine @@ -38,6 +38,14 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 0.9.57-1 +- version upgrade + +* Sun Feb 10 2008 Andreas Bierfert +- 0.9.55-1 +- version upgrade + * Fri Jan 25 2008 Andreas Bierfert - 0.9.54-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:28:41 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:28:41 GMT Subject: rpms/wine-docs/F-7 .cvsignore, 1.39, 1.40 sources, 1.39, 1.40 wine-docs.spec, 1.39, 1.40 Message-ID: <200803111028.m2BASfg0031630@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine-docs/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31471/F-7 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/F-7/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 10 Feb 2008 20:10:38 -0000 1.39 +++ .cvsignore 11 Mar 2008 10:28:02 -0000 1.40 @@ -1 +1 @@ -wine-docs-0.9.55.tar.bz2 +wine-docs-0.9.57.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/F-7/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 10 Feb 2008 20:10:38 -0000 1.39 +++ sources 11 Mar 2008 10:28:02 -0000 1.40 @@ -1 +1 @@ -8ad50c53104c2914049c62f621fb31b0 wine-docs-0.9.55.tar.bz2 +8e43d1dc4d615d0d7e0d91329a359e6d wine-docs-0.9.57.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/F-7/wine-docs.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- wine-docs.spec 10 Feb 2008 20:10:38 -0000 1.39 +++ wine-docs.spec 11 Mar 2008 10:28:02 -0000 1.40 @@ -1,6 +1,6 @@ %define debug_package %{nil} Name: wine-docs -Version: 0.9.55 +Version: 0.9.57 Release: 1%{?dist} Summary: Documentation for wine @@ -38,6 +38,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 0.9.57-1 +- version upgrade + * Sun Feb 10 2008 Andreas Bierfert - 0.9.55-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:28:50 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:28:50 GMT Subject: rpms/wine-docs/F-8 .cvsignore, 1.39, 1.40 sources, 1.39, 1.40 wine-docs.spec, 1.40, 1.41 Message-ID: <200803111028.m2BASoTl031637@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine-docs/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31471/F-8 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/F-8/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 10 Feb 2008 20:10:46 -0000 1.39 +++ .cvsignore 11 Mar 2008 10:28:11 -0000 1.40 @@ -1 +1 @@ -wine-docs-0.9.55.tar.bz2 +wine-docs-0.9.57.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/F-8/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 10 Feb 2008 20:10:46 -0000 1.39 +++ sources 11 Mar 2008 10:28:11 -0000 1.40 @@ -1 +1 @@ -8ad50c53104c2914049c62f621fb31b0 wine-docs-0.9.55.tar.bz2 +8e43d1dc4d615d0d7e0d91329a359e6d wine-docs-0.9.57.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/F-8/wine-docs.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- wine-docs.spec 10 Feb 2008 20:10:46 -0000 1.40 +++ wine-docs.spec 11 Mar 2008 10:28:11 -0000 1.41 @@ -1,6 +1,6 @@ %define debug_package %{nil} Name: wine-docs -Version: 0.9.55 +Version: 0.9.57 Release: 1%{?dist} Summary: Documentation for wine @@ -38,6 +38,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 0.9.57-1 +- version upgrade + * Sun Feb 10 2008 Andreas Bierfert - 0.9.55-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:28:54 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:28:54 GMT Subject: rpms/wine-docs/devel .cvsignore, 1.39, 1.40 sources, 1.39, 1.40 wine-docs.spec, 1.40, 1.41 Message-ID: <200803111028.m2BASsPN031644@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31471/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 10 Feb 2008 20:10:56 -0000 1.39 +++ .cvsignore 11 Mar 2008 10:28:21 -0000 1.40 @@ -1 +1 @@ -wine-docs-0.9.55.tar.bz2 +wine-docs-0.9.57.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 10 Feb 2008 20:10:56 -0000 1.39 +++ sources 11 Mar 2008 10:28:21 -0000 1.40 @@ -1 +1 @@ -8ad50c53104c2914049c62f621fb31b0 wine-docs-0.9.55.tar.bz2 +8e43d1dc4d615d0d7e0d91329a359e6d wine-docs-0.9.57.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/pkgs/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- wine-docs.spec 10 Feb 2008 20:10:56 -0000 1.40 +++ wine-docs.spec 11 Mar 2008 10:28:21 -0000 1.41 @@ -1,6 +1,6 @@ %define debug_package %{nil} Name: wine-docs -Version: 0.9.55 +Version: 0.9.57 Release: 1%{?dist} Summary: Documentation for wine @@ -38,6 +38,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 0.9.57-1 +- version upgrade + * Sun Feb 10 2008 Andreas Bierfert - 0.9.55-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:29:03 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Tue, 11 Mar 2008 10:29:03 GMT Subject: rpms/libvirt/F-8 libvirt-0.4.1-daemon-startup.patch, NONE, 1.1 libvirt.spec, 1.73, 1.74 Message-ID: <200803111029.m2BAT3sP031647@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31534 Modified Files: libvirt.spec Added Files: libvirt-0.4.1-daemon-startup.patch Log Message: Fix from danpb to fix the iptables startup error, Daniel libvirt-0.4.1-daemon-startup.patch: --- NEW FILE libvirt-0.4.1-daemon-startup.patch --- diff -rup libvirt-0.4.1.orig/qemud/qemud.c libvirt-0.4.1.new/qemud/qemud.c --- libvirt-0.4.1.orig/qemud/qemud.c 2008-03-10 17:31:09.000000000 -0400 +++ libvirt-0.4.1.new/qemud/qemud.c 2008-03-10 17:31:36.000000000 -0400 @@ -393,7 +393,7 @@ static int qemudGoDaemon(void) { case -1: return -1; default: - return nextpid; + _exit(0); } cleanup: @@ -418,8 +418,7 @@ static int qemudGoDaemon(void) { status != 0) { return -1; } - - return pid; + _exit(0); } } } @@ -2116,16 +2115,12 @@ int main(int argc, char **argv) { goto error1; if (godaemon) { - int pid; openlog("libvirtd", 0, 0); - pid = qemudGoDaemon(); - if (pid < 0) { + if (qemudGoDaemon() < 0) { qemudLog(QEMUD_ERR, _("Failed to fork as daemon: %s"), strerror(errno)); goto error1; } - if (pid > 0) - goto out; /* Choose the name of the PID file. */ if (!pid_file) { @@ -2172,7 +2167,6 @@ int main(int argc, char **argv) { if (godaemon) closelog(); - out: ret = 0; error2: Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-8/libvirt.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- libvirt.spec 6 Mar 2008 10:17:31 -0000 1.73 +++ libvirt.spec 11 Mar 2008 10:28:30 -0000 1.74 @@ -27,6 +27,7 @@ Source: libvirt-%{version}.tar.gz Patch0: libvirt-0.4.1-qemud1.patch Patch1: libvirt-0.4.1-qemud2.patch +Patch2: libvirt-0.4.1-daemon-startup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://libvirt.org/ BuildRequires: python python-devel @@ -140,6 +141,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # Xen is available only on i386 x86_64 ia64 @@ -280,6 +282,9 @@ %doc docs/examples/python %changelog +* Tue Mar 11 2008 Daniel Veillard - 0.4.1-2.fc8 +- Fixed daemon startup when run with --daemon flag + * Thu Mar 6 2008 Daniel Veillard - 0.4.1-1.fc8 - Update to 0.4.1 - Storage APIs From fedora-extras-commits at redhat.com Tue Mar 11 10:30:27 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Tue, 11 Mar 2008 10:30:27 GMT Subject: rpms/libvirt/F-8 libvirt.spec,1.74,1.75 Message-ID: <200803111030.m2BAURPh031865@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/libvirt/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31738 Modified Files: libvirt.spec Log Message: Forgot to bump the release, daniel Index: libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvirt/F-8/libvirt.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- libvirt.spec 11 Mar 2008 10:28:30 -0000 1.74 +++ libvirt.spec 11 Mar 2008 10:29:48 -0000 1.75 @@ -21,7 +21,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.4.1 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 10:30:32 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 10:30:32 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1446,1.1447 Message-ID: <200803111030.m2BAUWE3031936@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31790 Modified Files: openoffice.org.spec Log Message: double spaces Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1446 retrieving revision 1.1447 diff -u -r1.1446 -r1.1447 --- openoffice.org.spec 11 Mar 2008 08:50:43 -0000 1.1446 +++ openoffice.org.spec 11 Mar 2008 10:29:59 -0000 1.1447 @@ -1572,7 +1572,7 @@ # rhbz#156067 don't version the icons sed -i -e s/$ICONPRODUCTVERSION//g $file # rhbz#156677 remove the version from Name= - sed -i -e s/$LONGICONPRODUCTVERSION//g $file + sed -i -e s/$LONGICONPRODUCTVERSION //g $file done echo "StartupNotify=true" >> base.desktop echo "TryExec=oobase" >> base.desktop From fedora-extras-commits at redhat.com Tue Mar 11 10:40:59 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:40:59 GMT Subject: rpms/claws-mail/EL-5 claws-mail.spec,1.12,1.13 Message-ID: <200803111041.m2BAexdw032202@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32131/EL-5 Modified Files: claws-mail.spec Log Message: - add nm support Index: claws-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail/EL-5/claws-mail.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- claws-mail.spec 23 Feb 2008 12:43:24 -0000 1.12 +++ claws-mail.spec 11 Mar 2008 10:40:26 -0000 1.13 @@ -1,6 +1,6 @@ Name: claws-mail Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPLv3+ @@ -27,6 +27,7 @@ BuildRequires: perl BuildRequires: libtool BuildRequires: libSM-devel +BuildRequires: NetworkManager-glib-devel # not available on RHEL ppc for some reason %ifnarch ppc ppc64 @@ -203,6 +204,10 @@ %{_libdir}/claws-mail/plugins/bogofilter.so %changelog +* Mon Feb 25 2008 Andreas Bierfert +- 3.3.1-2 +- build with NetworkManager support + * Sat Feb 23 2008 Andreas Bierfert - 3.3.1-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:41:11 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:41:11 GMT Subject: rpms/claws-mail/F-7 claws-mail.spec,1.27,1.28 Message-ID: <200803111041.m2BAfBaE032207@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32131/F-7 Modified Files: claws-mail.spec Log Message: - add nm support Index: claws-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail/F-7/claws-mail.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- claws-mail.spec 23 Feb 2008 12:22:41 -0000 1.27 +++ claws-mail.spec 11 Mar 2008 10:40:30 -0000 1.28 @@ -1,6 +1,6 @@ Name: claws-mail Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPLv3+ @@ -28,6 +28,7 @@ BuildRequires: perl BuildRequires: libtool BuildRequires: libSM-devel +BuildRequires: NetworkManager-glib-devel Obsoletes: sylpheed-claws <= 2.6.0 Provides: sylpheed-claws = %{version}-%{release} @@ -101,7 +102,8 @@ --enable-aspell \ --disable-dependency-tracking \ --disable-rpath \ - --enable-compface + --enable-compface \ + --enable-gnomeprint %{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool @@ -195,6 +197,10 @@ %{_libdir}/claws-mail/plugins/bogofilter.so %changelog +* Mon Feb 25 2008 Andreas Bierfert +- 3.3.1-2 +- build with NetworkManager support + * Sat Feb 23 2008 Andreas Bierfert - 3.3.1-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:41:14 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:41:14 GMT Subject: rpms/claws-mail/F-8 claws-mail.spec,1.27,1.28 Message-ID: <200803111041.m2BAfE8p032212@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32131/F-8 Modified Files: claws-mail.spec Log Message: - add nm support Index: claws-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail/F-8/claws-mail.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- claws-mail.spec 23 Feb 2008 12:22:50 -0000 1.27 +++ claws-mail.spec 11 Mar 2008 10:40:41 -0000 1.28 @@ -1,6 +1,6 @@ Name: claws-mail Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPLv3+ @@ -28,6 +28,7 @@ BuildRequires: perl BuildRequires: libtool BuildRequires: libSM-devel +BuildRequires: NetworkManager-glib-devel Obsoletes: sylpheed-claws <= 2.6.0 Provides: sylpheed-claws = %{version}-%{release} @@ -101,7 +102,8 @@ --enable-aspell \ --disable-dependency-tracking \ --disable-rpath \ - --enable-compface + --enable-compface \ + --enable-gnomeprint %{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool @@ -195,6 +197,10 @@ %{_libdir}/claws-mail/plugins/bogofilter.so %changelog +* Mon Feb 25 2008 Andreas Bierfert +- 3.3.1-2 +- build with NetworkManager support + * Sat Feb 23 2008 Andreas Bierfert - 3.3.1-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:41:24 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:41:24 GMT Subject: rpms/claws-mail/devel claws-mail.spec,1.29,1.30 Message-ID: <200803111041.m2BAfOx9032215@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32131/devel Modified Files: claws-mail.spec Log Message: - add nm support Index: claws-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail/devel/claws-mail.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- claws-mail.spec 23 Feb 2008 12:22:55 -0000 1.29 +++ claws-mail.spec 11 Mar 2008 10:40:45 -0000 1.30 @@ -1,6 +1,6 @@ Name: claws-mail Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPLv3+ @@ -28,6 +28,8 @@ BuildRequires: perl BuildRequires: libtool BuildRequires: libSM-devel +BuildRequires: NetworkManager-glib-devel + Obsoletes: sylpheed-claws <= 2.6.0 Provides: sylpheed-claws = %{version}-%{release} @@ -195,6 +197,10 @@ %{_libdir}/claws-mail/plugins/bogofilter.so %changelog +* Mon Feb 25 2008 Andreas Bierfert +- 3.3.1-2 +- build with NetworkManager support + * Sat Feb 23 2008 Andreas Bierfert - 3.3.1-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 10:43:12 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Tue, 11 Mar 2008 10:43:12 GMT Subject: rpms/rsyslog/devel rsyslog.spec,1.28,1.29 sources,1.18,1.19 Message-ID: <200803111043.m2BAhCBx032374@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/rsyslog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32287 Modified Files: rsyslog.spec sources Log Message: fix init script Index: rsyslog.spec =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- rsyslog.spec 7 Mar 2008 11:12:39 -0000 1.28 +++ rsyslog.spec 11 Mar 2008 10:42:39 -0000 1.29 @@ -3,7 +3,7 @@ Summary: Enhanced system logging and kernel message trapping daemons Name: rsyslog Version: 3.12.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -150,6 +150,9 @@ %{_libdir}/rsyslog/omgssapi.so %changelog +* Tue Mar 11 2008 Peter Vrabec 3.12.1-2 +- init script fixes (#436854) + * Thu Mar 06 2008 Peter Vrabec 3.12.1-1 - upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 7 Mar 2008 11:12:39 -0000 1.18 +++ sources 11 Mar 2008 10:42:39 -0000 1.19 @@ -1,4 +1,4 @@ 12c743b21a0984467bc4c05b6ee887e2 rsyslog-3.12.1.tar.gz 9730674162e08bcc88503a19e21ac2d4 rsyslog.conf -04ea4165e7289f009b189968e49b9c81 rsyslog.init 04f3868aa518d33809f5943d7bc2fc0b rsyslog.sysconfig +8121efe30193878a7315fe12c25cc292 rsyslog.init From fedora-extras-commits at redhat.com Tue Mar 11 10:52:24 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 10:52:24 GMT Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.27,1.28 Message-ID: <200803111052.m2BAqOvd032630@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32586/devel Modified Files: claws-mail-plugins.spec Log Message: - version upgrade Index: claws-mail-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- claws-mail-plugins.spec 24 Feb 2008 15:33:34 -0000 1.27 +++ claws-mail-plugins.spec 11 Mar 2008 10:51:51 -0000 1.28 @@ -4,7 +4,7 @@ %define attremover 1.0.7 %define cachesaver 0.10.6 %define fetchinfo 0.4.22 -%define gtkhtml2viewer 0.17.1 +%define gtkhtml2viewer 0.17.2 %define mailmbox 1.14 %define newmail 0.0.11 %define notification 0.15 @@ -18,8 +18,8 @@ %define vcalendar 1.101 Name: claws-mail-plugins -Version: 3.3.0 -Release: 3%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: Additional plugins for claws-mail Group: Applications/Internet @@ -40,7 +40,7 @@ BuildRequires: libidn-devel BuildRequires: libtool BuildRequires: gpgme-devel -BuildRequires: poppler-glib-devel +BuildRequires: poppler-devel BuildRequires: libytnef-devel BuildRequires: ghostscript @@ -85,7 +85,9 @@ Obsoletes: sylpheed-claws-plugins-acpi-notifier <= 2.6.0 %description acpi-notifier -%{summary} +Enables mail notification via LEDs on some laptops. Options can be found on +the 'Plugins/Acpi Notifier' page of the preferences. + %package attachwarner Summary: attachment warner plugin for claws-mail @@ -93,7 +95,9 @@ Requires: claws-mail >= %{version} %description attachwarner -%{summary} +Warns when the user composes a message mentioning an attachment in the message +body but without attaching any files to the message. + %package att-remover Summary: Attachments remover plugin for claws-mail @@ -103,7 +107,9 @@ Obsoletes: sylpheed-claws-plugins-att-remover <= 2.6.0 %description att-remover -%{summary} +Enables the removal of attachments from emails.When right-clicking a message, +choose 'Remove attachments' from the submenu. + %package cachesaver Summary: A cache saving plugin @@ -137,7 +143,10 @@ %description gtkhtml2-viewer -%{summary} +Renders HTML mail using the gtkhtml2 rendering widget. The option, 'Do not load +remote links in mails' can be found on the 'Plugins/GtkHtml2 Viewer' page of +the preferences. + %package mailmbox Summary: Support for mailboxes in mbox format @@ -201,7 +210,8 @@ Obsoletes: sylpheed-claws-plugins-rssyl <= 2.6.0 %description rssyl -%{summary} +Allows you to read your favorite RSS newsfeeds in Claws. RSS 1.0, +2.0 and Atom feeds are currently supported. %package smime Summary: S/MIME signed and/or encrypted @@ -251,7 +261,8 @@ %description vcalendar This plugin enables vCalendar message handling like that produced by -Evolution or Outlook. +Evolution or Outlook.Also supports subscribing to remote webCal feeds, and +exporting of your meetings or all your calendars. %prep %setup -q -n claws-mail-extra-plugins-%{version} @@ -363,6 +374,7 @@ cd ../cachesaver-%{cachesaver} %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/ + #fetchinfo-plugin cd ../fetchinfo-plugin-%{fetchinfo} %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/ @@ -666,19 +678,11 @@ %exclude %{_includedir}/ical.h %changelog -* Sun Feb 24 2008 Andreas Bierfert +* Sat Feb 23 2008 Andreas Bierfert - 3.3.1-1 - version upgrade -- remove clamav because upstream dropped it - -* Sun Feb 24 2008 Andreas Bierfert -- 3.3.0-3 -- fix clamav req to avoid upgrade problems to 3.3.1 where clamav has been - dropped - -* Fri Feb 15 2008 Andreas Bierfert -- 3.3.0-2 -- fix poppler BR +- clamav plugin has been dropped upstream +- improve descriptions * Fri Feb 08 2008 Andreas Bierfert - 3.3.0-1 From fedora-extras-commits at redhat.com Tue Mar 11 11:00:46 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 11 Mar 2008 11:00:46 GMT Subject: rpms/extremetuxracer/devel etracer.desktop, NONE, 1.1 extremetuxracer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803111100.m2BB0khO000500@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/extremetuxracer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv432/devel Modified Files: .cvsignore sources Added Files: etracer.desktop extremetuxracer.spec Log Message: initial commit --- NEW FILE etracer.desktop --- [Desktop Entry] Encoding=UTF-8 Categories=Game;ArcadeGame;3DGraphics;X-Fedora-Extra; X-Desktop-File-Install-Version=0.2 Name=Extreme Tuxracer GenericName=A 3D downhill racing game Comment=Race your penguin down an alpine slope Exec=etracer Terminal=false Type=Application Icon=etracericon --- NEW FILE extremetuxracer.spec --- %define desktop_file_utils_version 0.2.90 %define desktop_vendor fedora # Use --without modular_x to rebuild without modular X deps %define _modular_x 0%{!?_without_modular_x:1} %if %{?fedora}%{!?fedora:7} >= 7 %define _opengl_wrapper 1 %else %define _opengl_wrapper 0 %endif Summary: 3D racing game featuring Tux Name: extremetuxracer Version: 0.4 Release: 1%{?dist} License: GPLv2+ Group: Amusements/Games URL: http://extremetuxracer.com BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-%{version}.tar.gz Source1: etracer.desktop Obsoletes: tuxracer <= 0.61 Obsoletes: ppracer <= 0.3.1 %if %_modular_x BuildRequires: libICE-devel BuildRequires: libSM-devel BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libXext-devel BuildRequires: libXmu-devel BuildRequires: libXt-devel %else BuildRequires: xorg-x11-devel %endif BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: SDL-devel >= 1.2 BuildRequires: SDL_mixer-devel >= 1.2 BuildRequires: tcl-devel >= 8.4.9 #BuildRequires: autoconf BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: pkgconfig BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} %if %_opengl_wrapper Requires: opengl-games-utils %endif %description Extreme Tux Racer is an open-source downhill racing game starring Tux, the Linux mascot. %prep %setup -q %build %configure --with-tcl=%{_libdir} make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR="%{buildroot}" install mkdir -p %{buildroot}%{_datadir}/pixmaps/ install -m 0644 etracericon.svg %{buildroot}%{_datadir}/pixmaps/ %if %_opengl_wrapper ln -snf opengl-game-wrapper.sh %{buildroot}%{_bindir}/etracer-wrapper sed 's:^Exec=\(.*\)$:Exec=\1-wrapper:g' < %{SOURCE1} > etracer.desktop %else cp -dpf %{SOURCE1} etracer.desktop %endif mkdir -p %{buildroot}%{_datadir}/applications/ desktop-file-install --vendor %{desktop_vendor} --dir %{buildroot}%{_datadir}/applications \ etracer.desktop %clean rm -rf %{buildroot} %files %defattr (-, root, root, 755) %doc AUTHORS COPYING ChangeLog contrib %{_bindir}/etracer %if %_opengl_wrapper %{_bindir}/etracer-wrapper %endif %{_datadir}/etracer %{_datadir}/pixmaps/etracericon.svg %{_datadir}/applications/%{desktop_vendor}-etracer.desktop %changelog * Wed Mar 05 2008 Nils Philippsen 0.4-1 - Package Review (#436126): - remove BR: sed, zlib-devel - add BR: pkgconfig - use icon name without extension in desktop file * Wed Mar 05 2008 manuel wolfshant - add --with-tcl=... to %%configure line * Wed Mar 05 2008 Nils Philippsen 0.4-0 - version 0.4 - initial packaging based on ppracer Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/extremetuxracer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 17:58:08 -0000 1.1 +++ .cvsignore 11 Mar 2008 11:00:11 -0000 1.2 @@ -0,0 +1 @@ +extremetuxracer-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/extremetuxracer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 17:58:08 -0000 1.1 +++ sources 11 Mar 2008 11:00:11 -0000 1.2 @@ -0,0 +1 @@ +6830eb4e1ca7c5a541f286ded3853f9f extremetuxracer-0.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 11:03:46 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 11 Mar 2008 11:03:46 GMT Subject: rpms/extremetuxracer/F-8 etracer.desktop, NONE, 1.1 extremetuxracer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803111103.m2BB3kIl007954@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/extremetuxracer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7877 Modified Files: .cvsignore sources Added Files: etracer.desktop extremetuxracer.spec Log Message: initial commit --- NEW FILE etracer.desktop --- [Desktop Entry] Encoding=UTF-8 Categories=Game;ArcadeGame;3DGraphics;X-Fedora-Extra; X-Desktop-File-Install-Version=0.2 Name=Extreme Tuxracer GenericName=A 3D downhill racing game Comment=Race your penguin down an alpine slope Exec=etracer Terminal=false Type=Application Icon=etracericon --- NEW FILE extremetuxracer.spec --- %define desktop_file_utils_version 0.2.90 %define desktop_vendor fedora # Use --without modular_x to rebuild without modular X deps %define _modular_x 0%{!?_without_modular_x:1} %if %{?fedora}%{!?fedora:7} >= 7 %define _opengl_wrapper 1 %else %define _opengl_wrapper 0 %endif Summary: 3D racing game featuring Tux Name: extremetuxracer Version: 0.4 Release: 1%{?dist} License: GPLv2+ Group: Amusements/Games URL: http://extremetuxracer.com BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-%{version}.tar.gz Source1: etracer.desktop Obsoletes: tuxracer <= 0.61 Obsoletes: ppracer <= 0.3.1 %if %_modular_x BuildRequires: libICE-devel BuildRequires: libSM-devel BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libXext-devel BuildRequires: libXmu-devel BuildRequires: libXt-devel %else BuildRequires: xorg-x11-devel %endif BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: SDL-devel >= 1.2 BuildRequires: SDL_mixer-devel >= 1.2 BuildRequires: tcl-devel >= 8.4.9 #BuildRequires: autoconf BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: pkgconfig BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} %if %_opengl_wrapper Requires: opengl-games-utils %endif %description Extreme Tux Racer is an open-source downhill racing game starring Tux, the Linux mascot. %prep %setup -q %build %configure --with-tcl=%{_libdir} make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR="%{buildroot}" install mkdir -p %{buildroot}%{_datadir}/pixmaps/ install -m 0644 etracericon.svg %{buildroot}%{_datadir}/pixmaps/ %if %_opengl_wrapper ln -snf opengl-game-wrapper.sh %{buildroot}%{_bindir}/etracer-wrapper sed 's:^Exec=\(.*\)$:Exec=\1-wrapper:g' < %{SOURCE1} > etracer.desktop %else cp -dpf %{SOURCE1} etracer.desktop %endif mkdir -p %{buildroot}%{_datadir}/applications/ desktop-file-install --vendor %{desktop_vendor} --dir %{buildroot}%{_datadir}/applications \ etracer.desktop %clean rm -rf %{buildroot} %files %defattr (-, root, root, 755) %doc AUTHORS COPYING ChangeLog contrib %{_bindir}/etracer %if %_opengl_wrapper %{_bindir}/etracer-wrapper %endif %{_datadir}/etracer %{_datadir}/pixmaps/etracericon.svg %{_datadir}/applications/%{desktop_vendor}-etracer.desktop %changelog * Wed Mar 05 2008 Nils Philippsen 0.4-1 - Package Review (#436126): - remove BR: sed, zlib-devel - add BR: pkgconfig - use icon name without extension in desktop file * Wed Mar 05 2008 manuel wolfshant - add --with-tcl=... to %%configure line * Wed Mar 05 2008 Nils Philippsen 0.4-0 - version 0.4 - initial packaging based on ppracer Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/extremetuxracer/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 17:58:08 -0000 1.1 +++ .cvsignore 11 Mar 2008 11:03:09 -0000 1.2 @@ -0,0 +1 @@ +extremetuxracer-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/extremetuxracer/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 17:58:08 -0000 1.1 +++ sources 11 Mar 2008 11:03:09 -0000 1.2 @@ -0,0 +1 @@ +6830eb4e1ca7c5a541f286ded3853f9f extremetuxracer-0.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 11:03:57 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 11 Mar 2008 11:03:57 GMT Subject: rpms/extremetuxracer/F-7 etracer.desktop, NONE, 1.1 extremetuxracer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803111103.m2BB3vHV008004@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/extremetuxracer/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7912 Modified Files: .cvsignore sources Added Files: etracer.desktop extremetuxracer.spec Log Message: initial commit --- NEW FILE etracer.desktop --- [Desktop Entry] Encoding=UTF-8 Categories=Game;ArcadeGame;3DGraphics;X-Fedora-Extra; X-Desktop-File-Install-Version=0.2 Name=Extreme Tuxracer GenericName=A 3D downhill racing game Comment=Race your penguin down an alpine slope Exec=etracer Terminal=false Type=Application Icon=etracericon --- NEW FILE extremetuxracer.spec --- %define desktop_file_utils_version 0.2.90 %define desktop_vendor fedora # Use --without modular_x to rebuild without modular X deps %define _modular_x 0%{!?_without_modular_x:1} %if %{?fedora}%{!?fedora:7} >= 7 %define _opengl_wrapper 1 %else %define _opengl_wrapper 0 %endif Summary: 3D racing game featuring Tux Name: extremetuxracer Version: 0.4 Release: 1%{?dist} License: GPLv2+ Group: Amusements/Games URL: http://extremetuxracer.com BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-%{version}.tar.gz Source1: etracer.desktop Obsoletes: tuxracer <= 0.61 Obsoletes: ppracer <= 0.3.1 %if %_modular_x BuildRequires: libICE-devel BuildRequires: libSM-devel BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libXext-devel BuildRequires: libXmu-devel BuildRequires: libXt-devel %else BuildRequires: xorg-x11-devel %endif BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: SDL-devel >= 1.2 BuildRequires: SDL_mixer-devel >= 1.2 BuildRequires: tcl-devel >= 8.4.9 #BuildRequires: autoconf BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: pkgconfig BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} %if %_opengl_wrapper Requires: opengl-games-utils %endif %description Extreme Tux Racer is an open-source downhill racing game starring Tux, the Linux mascot. %prep %setup -q %build %configure --with-tcl=%{_libdir} make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR="%{buildroot}" install mkdir -p %{buildroot}%{_datadir}/pixmaps/ install -m 0644 etracericon.svg %{buildroot}%{_datadir}/pixmaps/ %if %_opengl_wrapper ln -snf opengl-game-wrapper.sh %{buildroot}%{_bindir}/etracer-wrapper sed 's:^Exec=\(.*\)$:Exec=\1-wrapper:g' < %{SOURCE1} > etracer.desktop %else cp -dpf %{SOURCE1} etracer.desktop %endif mkdir -p %{buildroot}%{_datadir}/applications/ desktop-file-install --vendor %{desktop_vendor} --dir %{buildroot}%{_datadir}/applications \ etracer.desktop %clean rm -rf %{buildroot} %files %defattr (-, root, root, 755) %doc AUTHORS COPYING ChangeLog contrib %{_bindir}/etracer %if %_opengl_wrapper %{_bindir}/etracer-wrapper %endif %{_datadir}/etracer %{_datadir}/pixmaps/etracericon.svg %{_datadir}/applications/%{desktop_vendor}-etracer.desktop %changelog * Wed Mar 05 2008 Nils Philippsen 0.4-1 - Package Review (#436126): - remove BR: sed, zlib-devel - add BR: pkgconfig - use icon name without extension in desktop file * Wed Mar 05 2008 manuel wolfshant - add --with-tcl=... to %%configure line * Wed Mar 05 2008 Nils Philippsen 0.4-0 - version 0.4 - initial packaging based on ppracer Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/extremetuxracer/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2008 17:58:08 -0000 1.1 +++ .cvsignore 11 Mar 2008 11:03:23 -0000 1.2 @@ -0,0 +1 @@ +extremetuxracer-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/extremetuxracer/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2008 17:58:08 -0000 1.1 +++ sources 11 Mar 2008 11:03:23 -0000 1.2 @@ -0,0 +1 @@ +6830eb4e1ca7c5a541f286ded3853f9f extremetuxracer-0.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 11:19:19 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 11:19:19 GMT Subject: rpms/srecord/devel srecord.spec,1.17,1.18 Message-ID: <200803111119.m2BBJJhE008412@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/srecord/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8388 Modified Files: srecord.spec Log Message: BR: boost-devel Index: srecord.spec =================================================================== RCS file: /cvs/pkgs/rpms/srecord/devel/srecord.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- srecord.spec 11 Mar 2008 02:44:29 -0000 1.17 +++ srecord.spec 11 Mar 2008 11:18:41 -0000 1.18 @@ -1,6 +1,6 @@ Name: srecord Version: 1.39 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools @@ -9,7 +9,7 @@ Source: http://downloads.sourceforge.net/srecord/srecord-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: diffutils, sharutils, groff +BuildRequires: diffutils, sharutils, groff, boost-devel %description The SRecord package is a collection of powerful tools for manipulating @@ -65,6 +65,9 @@ %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 1.39-2 +- BR: boost-devel + * Mon Mar 10 2008 Tom "spot" Callaway - 1.39-1 - update to 1.39 From fedora-extras-commits at redhat.com Tue Mar 11 11:20:52 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 11 Mar 2008 11:20:52 GMT Subject: rpms/libsigc++20/devel libsigc++.spec,1.16,1.17 Message-ID: <200803111120.m2BBKqnR008511@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/libsigc++20/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8484 Modified Files: libsigc++.spec Log Message: Update to 2.2.2 upstream Index: libsigc++.spec =================================================================== RCS file: /cvs/pkgs/rpms/libsigc++20/devel/libsigc++.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libsigc++.spec 24 Feb 2008 11:00:16 -0000 1.16 +++ libsigc++.spec 11 Mar 2008 11:20:18 -0000 1.17 @@ -1,5 +1,5 @@ Name: libsigc++20 -Version: 2.2.0 +Version: 2.2.2 Release: 1%{?dist} Summary: Typesafe signal framework for C++ @@ -81,6 +81,9 @@ %{_libdir}/*.so %changelog +* Tue Mar 11 2008 Denis Leroy - 2.2.2-1 +- Update to upstream 2.2.2 version + * Sun Feb 24 2008 Denis Leroy - 2.2.0-1 - Update to 2.2.0 - gcc 4.3 patch upstreamed From fedora-extras-commits at redhat.com Tue Mar 11 11:25:16 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 11 Mar 2008 11:25:16 GMT Subject: rpms/libsigc++20/devel .cvsignore,1.7,1.8 sources,1.8,1.9 Message-ID: <200803111125.m2BBPGsk008674@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libsigc++20/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8644 Modified Files: .cvsignore sources Log Message: Upstream 2.2.2 uploaded Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Feb 2008 11:00:16 -0000 1.7 +++ .cvsignore 11 Mar 2008 11:24:35 -0000 1.8 @@ -1 +1 @@ -libsigc++-2.2.0.tar.bz2 +libsigc++-2.2.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsigc++20/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 24 Feb 2008 11:00:16 -0000 1.8 +++ sources 11 Mar 2008 11:24:35 -0000 1.9 @@ -1 +1 @@ -23df320e9be95b62040dc4b4b761621a libsigc++-2.2.0.tar.bz2 +962493fd6b26425f21504c3416c4efa1 libsigc++-2.2.2.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 11:29:29 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Tue, 11 Mar 2008 11:29:29 GMT Subject: rpms/qt/devel 0076-fix-qprocess.diff, 1.2, 1.3 0081-format-string-fixes.diff, NONE, 1.1 0088-fix-xinput-clash.diff, NONE, 1.1 qt.spec, 1.158, 1.159 Message-ID: <200803111129.m2BBTTHn008876@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8836 Modified Files: qt.spec Added Files: 0076-fix-qprocess.diff 0081-format-string-fixes.diff 0088-fix-xinput-clash.diff Log Message: - 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h - 0076-fix-qprocess.diff, fix a regression in QProgress::writeToStdin() - 0081-format-string-fixes.diff, fix various format string errors on Qt 3.x code base 0076-fix-qprocess.diff: Index: 0076-fix-qprocess.diff =================================================================== RCS file: 0076-fix-qprocess.diff diff -N 0076-fix-qprocess.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ 0076-fix-qprocess.diff 11 Mar 2008 11:29:25 -0000 1.3 @@ -0,0 +1,19 @@ +qt-bugs@ issue : none +bugs.kde.org number : none +applied: yes +author: from trolltech + +Fixes a regression in QProgress::writeToStdin() + + +--- src/kernel/qprocess.cpp ++++ src/kernel/qprocess.cpp +@@ -727,7 +727,7 @@ void QProcess::closeStdinLaunch() + void QProcess::writeToStdin( const QString& buf ) + { + QByteArray tmp = buf.local8Bit(); +- tmp.resize( tmp.size() - 1 ); // drop the implicit \0 ++ tmp.resize( qstrlen( tmp.data() ) ); + writeToStdin( tmp ); + } + 0081-format-string-fixes.diff: --- NEW FILE 0081-format-string-fixes.diff --- qt-bugs@ issue : none bugs.kde.org number : none applied: yes author: Dirk Mueller/TT Fixes various, partially exploitable format string errors on Qt 3.x code base. --- src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007 +++ src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007 @@ -6349,7 +6349,7 @@ cur = tag->prev; if ( !cur ) { #ifdef QT_CHECK_RANGE - qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 ); + qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 ); #endif return; // something is wrong - give up } @@ -6372,7 +6372,7 @@ break; } else if ( !cur->leftTag ) { #ifdef QT_CHECK_RANGE - qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 ); + qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 ); #endif return; // something is amiss - give up } --- src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007 +++ src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007 @@ -1043,8 +1043,8 @@ return FALSE; if ( !sqlCursor()->canInsert() ) { #ifdef QT_CHECK_RANGE - qWarning("QDataTable::insertCurrent: insert not allowed for " + - sqlCursor()->name() ); + qWarning("QDataTable::insertCurrent: insert not allowed for %s", + sqlCursor()->name().latin1() ); #endif endInsert(); return FALSE; @@ -1117,16 +1117,16 @@ return FALSE; if ( sqlCursor()->primaryIndex().count() == 0 ) { #ifdef QT_CHECK_RANGE - qWarning("QDataTable::updateCurrent: no primary index for " + - sqlCursor()->name() ); + qWarning("QDataTable::updateCurrent: no primary index for %s", + sqlCursor()->name().latin1() ); #endif endUpdate(); return FALSE; } if ( !sqlCursor()->canUpdate() ) { #ifdef QT_CHECK_RANGE - qWarning("QDataTable::updateCurrent: updates not allowed for " + - sqlCursor()->name() ); + qWarning("QDataTable::updateCurrent: updates not allowed for %s", + sqlCursor()->name().latin1() ); #endif endUpdate(); return FALSE; @@ -1191,8 +1191,8 @@ return FALSE; if ( sqlCursor()->primaryIndex().count() == 0 ) { #ifdef QT_CHECK_RANGE - qWarning("QDataTable::deleteCurrent: no primary index " + - sqlCursor()->name() ); + qWarning("QDataTable::deleteCurrent: no primary index %s", + sqlCursor()->name().latin1() ); #endif return FALSE; } --- src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007 +++ src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007 @@ -234,7 +234,8 @@ db->open(); #ifdef QT_CHECK_RANGE if ( !db->isOpen() ) - qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() ); + qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s", + db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() ); #endif } return db; @@ -686,7 +687,7 @@ if ( !d->driver ) { #ifdef QT_CHECK_RANGE qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() ); - qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") ); + qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() ); #endif d->driver = new QNullDriver(); d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) ); --- src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007 +++ src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007 @@ -273,7 +273,7 @@ if ( field ) newSort.append( *field, desc ); else - qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" ); + qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1()); } return newSort; } --- src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007 +++ src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007 @@ -298,7 +298,7 @@ return i; } #ifdef QT_CHECK_RANGE - qWarning( "QSqlRecord::position: unable to find field " + name ); + qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() ); #endif return -1; } @@ -313,7 +313,7 @@ checkDetach(); if ( !sh->d->contains( i ) ) { #ifdef QT_CHECK_RANGE - qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) ); + qWarning( "QSqlRecord::field: index out of range: %d", i ); #endif return 0; } @@ -344,7 +344,7 @@ { if ( !sh->d->contains( i ) ) { #ifdef QT_CHECK_RANGE - qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) ); + qWarning( "QSqlRecord::field: index out of range: %d", i ); #endif // QT_CHECK_RANGE return 0; } --- src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007 +++ src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007 @@ -680,7 +680,7 @@ if ( code != -1 ) qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) ); else - qWarning( msg ); + qWarning( "%s", msg ); #endif #else Q_UNUSED( msg ); --- src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007 +++ src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007 @@ -978,7 +978,7 @@ // ### catch references to embedded .svg files QPixmap pix; if ( !pix.load( href ) ) { - qWarning( "QSvgDevice::play: Couldn't load image "+href ); + qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() ); break; } pt->drawPixmap( QRect( x1, y1, w, h ), pix ); @@ -1024,8 +1024,8 @@ break; } case InvalidElement: - qWarning( "QSvgDevice::play: unknown element type " + - node.nodeName() ); + qWarning( "QSvgDevice::play: unknown element type %s", + node.nodeName().latin1() ); break; }; @@ -1111,7 +1111,7 @@ { QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") ); if ( reg.search( str ) == -1 ) { - qWarning( "QSvgDevice::parseLen: couldn't parse " + str ); + qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() ); if ( ok ) *ok = FALSE; return 0.0; @@ -1140,7 +1140,7 @@ else if ( u == "pc" ) dbl *= m.logicalDpiX() / 6.0; else - qWarning( "QSvgDevice::parseLen: Unknown unit " + u ); + qWarning( "QSvgDevice::parseLen: Unknown unit %s", u.latin1() ); } if ( ok ) *ok = TRUE; 0088-fix-xinput-clash.diff: --- NEW FILE 0088-fix-xinput-clash.diff --- qt-bugs@ issue : bugs.kde.org number : applied: no author: Dirk Mueller fix compile errors with newer X.org --- include/private/qt_x11_p.h +++ include/private/qt_x11_p.h @@ -86,7 +86,7 @@ // the wacom tablet (currently just the IRIX version) -#if defined (QT_TABLET_SUPPORT) +#if defined (QT_TABLET_SUPPORT) && defined (QT_CLEAN_NAMESPACE) # include #if defined (Q_OS_IRIX) # include // wacom driver defines for IRIX (quite handy) --- src/kernel/qtaddons_x11.cpp +++ src/kernel/qtaddons_x11.cpp @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifndef QT_CLEAN_NAMESPACE +#define QT_CLEAN_NAMESPACE +#endif + #include "qt_x11_p.h" #if !defined(QT_NO_XFTFREETYPE) && !defined(QT_XFT2) --- src/kernel/qt_x11_p.h +++ src/kernel/qt_x11_p.h @@ -86,7 +86,7 @@ // the wacom tablet (currently just the IRIX version) -#if defined (QT_TABLET_SUPPORT) +#if defined (QT_TABLET_SUPPORT) && defined (QT_CLEAN_NAMESPACE) # include #if defined (Q_OS_IRIX) # include // wacom driver defines for IRIX (quite handy) --- src/kernel/qwidget_x11.cpp +++ src/kernel/qwidget_x11.cpp @@ -38,6 +38,10 @@ ** **********************************************************************/ +#ifndef QT_CLEAN_NAMESPACE +#define QT_CLEAN_NAMESPACE +#endif + #include "qapplication.h" #include "qapplication_p.h" #include "qnamespace.h" Index: qt.spec =================================================================== RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- qt.spec 7 Mar 2008 14:40:05 -0000 1.158 +++ qt.spec 11 Mar 2008 11:29:25 -0000 1.159 @@ -52,9 +52,12 @@ Patch102: 0048-qclipboard_hack_80072.patch Patch103: 0056-khotkeys_input_84434.patch patch105: 0073-xinerama-aware-qpopup.patch +patch106: 0076-fix-qprocess.diff Patch107: 0079-compositing-types.patch Patch108: 0080-net-wm-sync-request-2.patch +Patch109: 0081-format-string-fixes.diff Patch110: 0084-compositing-properties.patch +Patch111: 0088-fix-xinput-clash.diff # upstream patches Patch200: qt-x11-free-3.3.4-fullscreen.patch @@ -293,9 +296,12 @@ %patch102 -p0 -b .0048-qclipboard_hack_80072 %patch103 -p0 -b .0056-khotkeys_input_84434 %patch105 -p0 -b .0073-xinerama-aware-qpopup +%patch106 -p0 -b .0076-fix-qprocess.diff %patch107 -p0 -b .0079-compositing-types %patch108 -p0 -b .0080-net-wm-sync-request +%patch109 -p0 -b .0081-format-string-fixes %patch110 -p0 -b .0084-compositing-properties +%patch111 -p0 -b .0088-fix-xinput-clash # upstream patches %patch200 -p1 -b .fullscreen @@ -576,6 +582,9 @@ %changelog * Fri Mar 07 2008 Than Ngo 3.3.8b-6 - move qt.[c]sh in main package (#221000) +- 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h +- 0076-fix-qprocess.diff, fix a regression in QProgress::writeToStdin() +- 0081-format-string-fixes.diff, fix various format string errors on Qt 3.x code base * Mon Feb 18 2008 Kevin Kofler 3.3.8b-5 - fix buildkey for GCC 4.3 (#433235) From fedora-extras-commits at redhat.com Tue Mar 11 11:29:42 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Tue, 11 Mar 2008 11:29:42 GMT Subject: rpms/rsyslog/devel rsyslog-3.12.1-omfile.patch, NONE, 1.1 rsyslog.spec, 1.29, 1.30 Message-ID: <200803111129.m2BBTguj008879@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/rsyslog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8804 Modified Files: rsyslog.spec Added Files: rsyslog-3.12.1-omfile.patch Log Message: fix config file parsing rsyslog-3.12.1-omfile.patch: --- NEW FILE rsyslog-3.12.1-omfile.patch --- diff -up rsyslog-3.12.1/omfile.c.orig rsyslog-3.12.1/omfile.c --- rsyslog-3.12.1/omfile.c.orig 2008-03-11 11:20:02.000000000 +0100 +++ rsyslog-3.12.1/omfile.c 2008-03-11 11:23:46.000000000 +0100 @@ -356,7 +356,8 @@ static void dynaFileFreeCache(instanceDa dynaFileDelCacheEntry(pData->dynCache, i, 1); } - d_free(pData->dynCache); + if(pData->dynCache != NULL) + d_free(pData->dynCache); ENDfunc; } @@ -620,7 +621,7 @@ BEGINfreeInstance CODESTARTfreeInstance if(pData->bDynamicName) { dynaFileFreeCache(pData); - } else + } else if(pData->fd != -1) close(pData->fd); ENDfreeInstance diff -up rsyslog-3.12.1/conf.c.orig rsyslog-3.12.1/conf.c --- rsyslog-3.12.1/conf.c.orig 2008-03-11 11:13:00.000000000 +0100 +++ rsyslog-3.12.1/conf.c 2008-03-11 11:13:18.000000000 +0100 @@ -1024,6 +1024,7 @@ static rsRetVal cflineDoAction(uchar **p /* loop through all modules and see if one picks up the line */ pMod = module.GetNxtType(NULL, eMOD_OUT); while(pMod != NULL) { + pOMSR = NULL; iRet = pMod->mod.om.parseSelectorAct(p, &pModData, &pOMSR); dbgprintf("tried selector action for %s: %d\n", module.GetName(pMod), iRet); if(iRet == RS_RET_OK || iRet == RS_RET_SUSPENDED) { Index: rsyslog.spec =================================================================== RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- rsyslog.spec 11 Mar 2008 10:42:39 -0000 1.29 +++ rsyslog.spec 11 Mar 2008 11:29:05 -0000 1.30 @@ -12,6 +12,7 @@ Source2: rsyslog.conf Source3: rsyslog.sysconfig Patch1: rsyslog-3.11.4-undef.patch +Patch2: rsyslog-3.12.1-omfile.patch BuildRequires: zlib-devel BuildRequires: autoconf automake Requires: logrotate >= 3.5.2 @@ -67,6 +68,7 @@ %prep %setup -q %patch1 -p1 -b .undef +%patch2 -p1 -b .omfile %build %configure --sbindir=%{sbindir} --disable-static --enable-mysql --enable-pgsql --enable-gssapi-krb5 @@ -152,6 +154,7 @@ %changelog * Tue Mar 11 2008 Peter Vrabec 3.12.1-2 - init script fixes (#436854) +- fix config file parsing (#436722) * Thu Mar 06 2008 Peter Vrabec 3.12.1-1 - upgrade From fedora-extras-commits at redhat.com Tue Mar 11 11:35:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 11:35:45 +0000 Subject: [pkgdb] vorbis-tools had acl change status Message-ID: <200803111138.m2BBcYee028281@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has set the watchcommits acl on vorbis-tools (Fedora devel) to Approved for Jindrich Novy (jnovy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vorbis-tools From fedora-extras-commits at redhat.com Tue Mar 11 11:35:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 11:35:48 +0000 Subject: [pkgdb] vorbis-tools had acl change status Message-ID: <200803111138.m2BBcYeh028281@bastion.fedora.phx.redhat.com> Zdenek Prikryl (zprikryl) has set the commit acl on vorbis-tools (Fedora devel) to Approved for Jindrich Novy (jnovy) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/vorbis-tools From fedora-extras-commits at redhat.com Tue Mar 11 11:49:14 2008 From: fedora-extras-commits at redhat.com (Jeff Layton (jlayton)) Date: Tue, 11 Mar 2008 11:49:14 GMT Subject: rpms/ez-ipupdate/devel ez-ipupdate.init, 1.3, 1.4 ez-ipupdate.spec, 1.19, 1.20 Message-ID: <200803111149.m2BBnEgE009360@cvs-int.fedora.redhat.com> Author: jlayton Update of /cvs/extras/rpms/ez-ipupdate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9310 Modified Files: ez-ipupdate.init ez-ipupdate.spec Log Message: ez-ipupdate would be started a second time on runlevel changes (BZ#436616) Index: ez-ipupdate.init =================================================================== RCS file: /cvs/extras/rpms/ez-ipupdate/devel/ez-ipupdate.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ez-ipupdate.init 15 Jul 2007 11:31:25 -0000 1.3 +++ ez-ipupdate.init 11 Mar 2008 11:48:29 -0000 1.4 @@ -42,6 +42,11 @@ # Don't run configurations that run in foreground if grep -q '^ *foreground' ${ez_configfile}; then continue; fi ez_name=`basename $ez_configfile .conf` + if [ -f $ez_piddir/$ez_name.pid ]; then + if status -p $ez_piddir/$ez_name.pid; then + continue + fi + fi echo -n $"Starting $prog for $ez_name: " daemon $ez_bin --daemon --config-file $ez_configfile --pid-file $ez_piddir/$ez_name.pid [ $? -ne 0 ] && RETVAL=1 Index: ez-ipupdate.spec =================================================================== RCS file: /cvs/extras/rpms/ez-ipupdate/devel/ez-ipupdate.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ez-ipupdate.spec 19 Feb 2008 06:27:24 -0000 1.19 +++ ez-ipupdate.spec 11 Mar 2008 11:48:29 -0000 1.20 @@ -1,6 +1,6 @@ Name: ez-ipupdate Version: 3.0.11 -Release: 0.16.b8%{?dist} +Release: 0.17.b8%{?dist} Summary: Client for Dynamic DNS Services Group: Applications/Internet @@ -118,6 +118,9 @@ %ghost %attr(0640,root,ez-ipupd) %config(noreplace,missingok) %{_sysconfdir}/ez-ipupdate/default.conf %changelog +* Tue Mar 11 2008 Jeff Layton - 3.0.11-0.17.b8 +- ez-ipupdate would be started a second time on runlevel changes (BZ#436616) + * Tue Feb 19 2008 Fedora Release Engineering - 3.0.11-0.16.b8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 11:56:10 2008 From: fedora-extras-commits at redhat.com (Jeff Layton (jlayton)) Date: Tue, 11 Mar 2008 11:56:10 GMT Subject: rpms/ez-ipupdate/F-8 ez-ipupdate.init, 1.3, 1.4 ez-ipupdate.spec, 1.18, 1.19 Message-ID: <200803111156.m2BBuAnI009569@cvs-int.fedora.redhat.com> Author: jlayton Update of /cvs/extras/rpms/ez-ipupdate/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9539 Modified Files: ez-ipupdate.init ez-ipupdate.spec Log Message: ez-ipupdate would be started a second time on runlevel changes (BZ#436616) Index: ez-ipupdate.init =================================================================== RCS file: /cvs/extras/rpms/ez-ipupdate/F-8/ez-ipupdate.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ez-ipupdate.init 15 Jul 2007 11:31:25 -0000 1.3 +++ ez-ipupdate.init 11 Mar 2008 11:55:31 -0000 1.4 @@ -42,6 +42,11 @@ # Don't run configurations that run in foreground if grep -q '^ *foreground' ${ez_configfile}; then continue; fi ez_name=`basename $ez_configfile .conf` + if [ -f $ez_piddir/$ez_name.pid ]; then + if status -p $ez_piddir/$ez_name.pid; then + continue + fi + fi echo -n $"Starting $prog for $ez_name: " daemon $ez_bin --daemon --config-file $ez_configfile --pid-file $ez_piddir/$ez_name.pid [ $? -ne 0 ] && RETVAL=1 Index: ez-ipupdate.spec =================================================================== RCS file: /cvs/extras/rpms/ez-ipupdate/F-8/ez-ipupdate.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ez-ipupdate.spec 15 Jul 2007 11:31:25 -0000 1.18 +++ ez-ipupdate.spec 11 Mar 2008 11:55:31 -0000 1.19 @@ -1,6 +1,6 @@ Name: ez-ipupdate Version: 3.0.11 -Release: 0.15.b8%{?dist} +Release: 0.17.b8%{?dist} Summary: Client for Dynamic DNS Services Group: Applications/Internet @@ -118,6 +118,12 @@ %ghost %attr(0640,root,ez-ipupd) %config(noreplace,missingok) %{_sysconfdir}/ez-ipupdate/default.conf %changelog +* Tue Mar 11 2008 Jeff Layton - 3.0.11-0.17.b8 +- ez-ipupdate would be started a second time on runlevel changes (BZ#436616) + +* Tue Feb 19 2008 Fedora Release Engineering - 3.0.11-0.16.b8 +- Autorebuild for GCC 4.3 + * Sun Jul 15 2007 Jeff Layton - 3.0.11-0.15.b8 - initscript: add LSB header and fix return values - initscript: remove /var/lock/subsys references From fedora-extras-commits at redhat.com Tue Mar 11 12:10:07 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Tue, 11 Mar 2008 12:10:07 GMT Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xorg-x11-drv-nouveau.spec, 1.1, 1.2 Message-ID: <200803111210.m2BCA7Lh017036@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17004 Modified Files: .cvsignore sources xorg-x11-drv-nouveau.spec Log Message: * Tue Mar 11 2008 Dave Airlie 1:0.0.10-1.20080311git460cb26 - update to latest snapshot Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Feb 2008 05:11:05 -0000 1.2 +++ .cvsignore 11 Mar 2008 12:09:28 -0000 1.3 @@ -1 +1 @@ -xf86-video-nouveau-0.0.10-20080221.tar.bz2 +xf86-video-nouveau-0.0.10-20080311.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Feb 2008 05:11:05 -0000 1.2 +++ sources 11 Mar 2008 12:09:28 -0000 1.3 @@ -1 +1 @@ -0ffe85a623cba9cf7a36c2094a1dddbe xf86-video-nouveau-0.0.10-20080221.tar.bz2 +864e2562758c5d619db0e74b1204e669 xf86-video-nouveau-0.0.10-20080311.tar.bz2 Index: xorg-x11-drv-nouveau.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xorg-x11-drv-nouveau.spec 29 Feb 2008 05:12:25 -0000 1.1 +++ xorg-x11-drv-nouveau.spec 11 Mar 2008 12:09:28 -0000 1.2 @@ -7,8 +7,8 @@ # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2 -%define gitdate 20080221 -%define git_version 5db7920 +%define gitdate 20080311 +%define git_version 460cb26 %define tarfile %{tarball}-%{nouveau_version}-%{gitdate}.tar.bz2 @@ -70,5 +70,8 @@ %{_mandir}/man4/nouveau.4* %changelog +* Tue Mar 11 2008 Dave Airlie 1:0.0.10-1.20080311git460cb26 +- update to latest snapshot + * Fri Feb 29 2008 Dave Airlie 1:0.0.10-1.20080221git5db7920 - Initial package for nouveau driver. From fedora-extras-commits at redhat.com Tue Mar 11 12:26:12 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Tue, 11 Mar 2008 12:26:12 GMT Subject: rpms/vorbis-tools/devel vorbis-tools.spec, 1.32, 1.33 vorbis-tools-svn20070412-libcurl.patch, 1.1, NONE vorbis-tools-svn20070412-oggdec.patch, 1.1, NONE Message-ID: <200803111226.m2BCQCNu017346@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/vorbis-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17321 Modified Files: vorbis-tools.spec Removed Files: vorbis-tools-svn20070412-libcurl.patch vorbis-tools-svn20070412-oggdec.patch Log Message: * Tue Mar 11 2008 Jindrich Novy - 1:1.2.0-1 - update to 1.2.0 - remove libcurl and oggdec patches, applied upstream - drop unneeded autoconf BR - fix BuildRoot Index: vorbis-tools.spec =================================================================== RCS file: /cvs/extras/rpms/vorbis-tools/devel/vorbis-tools.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- vorbis-tools.spec 20 Feb 2008 08:54:50 -0000 1.32 +++ vorbis-tools.spec 11 Mar 2008 12:25:38 -0000 1.33 @@ -1,7 +1,7 @@ Summary: The Vorbis General Audio Compression Codec tools Name: vorbis-tools -Version: 1.1.1.svn20070412 -Release: 6%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Epoch: 1 Group: Applications/Multimedia License: GPLv2 @@ -9,9 +9,7 @@ Source: http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz Patch0: vorbis-tools-1.0-build.patch Patch1: vorbis-tools-1.0-curlconfig.patch -Patch2: vorbis-tools-svn20070412-libcurl.patch -Patch3: vorbis-tools-svn20070412-oggdec.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libogg >= 2:1.1 Requires: libvorbis >= 1:%{version} Requires: libao >= 0.8.4 @@ -23,9 +21,6 @@ BuildRequires: libtool BuildRequires: libogg-devel -# For vorbis-tools-svn20070412-libcurl.patch -BuildRequires: autoconf - Obsoletes: vorbis < %{epoch}:%{version}-%{release} Provides: vorbis = %{epoch}:%{version}-%{release} @@ -41,8 +36,6 @@ %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build autoconf @@ -70,6 +63,12 @@ [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Jindrich Novy - 1:1.2.0-1 +- update to 1.2.0 +- remove libcurl and oggdec patches, applied upstream +- drop unneeded autoconf BR +- fix BuildRoot + * Wed Feb 20 2008 Fedora Release Engineering - 1:1.1.1.svn20070412-6 - Autorebuild for GCC 4.3 --- vorbis-tools-svn20070412-libcurl.patch DELETED --- --- vorbis-tools-svn20070412-oggdec.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 12:26:57 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Tue, 11 Mar 2008 12:26:57 GMT Subject: rpms/coreutils/devel coreutils-dddoubleclose.patch, NONE, 1.1 coreutils.spec, 1.198, 1.199 Message-ID: <200803111226.m2BCQvgh017420@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17353 Modified Files: coreutils.spec Added Files: coreutils-dddoubleclose.patch Log Message: fixed harmless dd double close of stdout (#436368) coreutils-dddoubleclose.patch: --- NEW FILE coreutils-dddoubleclose.patch --- diff -urNp coreutils-6.10-orig/src/dd.c coreutils-6.10/src/dd.c --- coreutils-6.10-orig/src/dd.c 2007-12-06 14:22:42.000000000 +0100 +++ coreutils-6.10/src/dd.c 2008-03-11 12:48:12.000000000 +0100 @@ -391,6 +391,25 @@ static char const ebcdic_to_ascii[] = '\070', '\071', '\372', '\373', '\374', '\375', '\376', '\377' }; +/* True if we need to close the standard output *stream*. */ +static bool close_stdout_required = true; + +/* The only reason to close the standard output *stream* is if + parse_long_options fails (as it does for --help or --version). + In any other case, dd uses only the STDOUT_FILENO file descriptor, + and the "cleanup" function calls "close (STDOUT_FILENO)". + Closing the file descriptor and then letting the usual atexit-run + close_stdout function call "fclose (stdout)" would result in a + harmless failure of the close syscall (with errno EBADF). + This function serves solely to avoid the unnecessary close_stdout + call, once parse_long_options has succeeded. */ +static void +maybe_close_stdout (void) +{ + if (close_stdout_required) + close_stdout (); +} + void usage (int status) { @@ -1639,12 +1658,14 @@ main (int argc, char **argv) textdomain (PACKAGE); /* Arrange to close stdout if parse_long_options exits. */ - atexit (close_stdout); + atexit (maybe_close_stdout); page_size = getpagesize (); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); + close_stdout_required = false; + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- coreutils.spec 6 Mar 2008 12:21:32 -0000 1.198 +++ coreutils.spec 11 Mar 2008 12:26:21 -0000 1.199 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.10 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -19,6 +19,7 @@ # From upstream Patch1: coreutils-6.10-verbose.patch +Patch2: coreutils-dddoubleclose.patch # Our patches Patch100: coreutils-chgrp.patch @@ -97,6 +98,7 @@ # From upstream %patch1 -p1 -b .verbose +%patch2 -p1 -b .doubleclose # Our patches %patch100 -p1 -b .chgrp @@ -293,6 +295,9 @@ /sbin/runuser %changelog +* Tue Mar 11 2008 Ondrej Vasik - 6.10-12 +- fixed harmless double close of stdout in dd(#436368) + * Thu Mar 6 2008 Ondrej Vasik - 6.10-11 - fixed broken order of params in stat(#435669) From fedora-extras-commits at redhat.com Tue Mar 11 12:33:00 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Tue, 11 Mar 2008 12:33:00 GMT Subject: rpms/vorbis-tools/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200803111233.m2BCX0Lm017613@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/vorbis-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17581 Modified Files: .cvsignore sources Log Message: upload source tarball Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/vorbis-tools/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Apr 2007 13:37:53 -0000 1.6 +++ .cvsignore 11 Mar 2008 12:32:11 -0000 1.7 @@ -1 +1 @@ -vorbis-tools-1.1.1.svn20070412.tar.gz +vorbis-tools-1.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/vorbis-tools/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Apr 2007 13:37:54 -0000 1.6 +++ sources 11 Mar 2008 12:32:11 -0000 1.7 @@ -1 +1 @@ -2f5a369c3af63a1e62272ff2d40de9bb vorbis-tools-1.1.1.svn20070412.tar.gz +df976d24e51ef3d87cd462edf747bf9a vorbis-tools-1.2.0.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 12:45:13 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Tue, 11 Mar 2008 12:45:13 GMT Subject: rpms/Miro/devel Miro.spec,1.22,1.23 Miro-gcc43.patch,1.2,1.3 Message-ID: <200803111245.m2BCjDct017856@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/Miro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17821 Modified Files: Miro.spec Miro-gcc43.patch Log Message: * Tue Mar 11 2008 Alex Lancaster - 1.1.2-4 - Update GCC 4.3 patch by Christopher Aillon (#434480) Index: Miro.spec =================================================================== RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Miro.spec 20 Feb 2008 05:52:42 -0000 1.22 +++ Miro.spec 11 Mar 2008 12:44:29 -0000 1.23 @@ -5,7 +5,7 @@ Name: Miro Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Miro - Internet TV Player Group: Applications/Multimedia License: GPLv2+ @@ -79,6 +79,9 @@ %changelog +* Tue Mar 11 2008 Alex Lancaster - 1.1.2-4 +- Update GCC 4.3 patch by Christopher Aillon (#434480) + * Wed Feb 20 2008 Fedora Release Engineering - 1.1.2-3 - Autorebuild for GCC 4.3 Miro-gcc43.patch: Index: Miro-gcc43.patch =================================================================== RCS file: /cvs/extras/rpms/Miro/devel/Miro-gcc43.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Miro-gcc43.patch 15 Feb 2008 11:16:41 -0000 1.2 +++ Miro-gcc43.patch 11 Mar 2008 12:44:29 -0000 1.3 @@ -1,16 +1,17 @@ diff -up Miro-1.1.2/portable/libtorrent/include/libtorrent/peer_id.hpp.fix Miro-1.1.2/portable/libtorrent/include/libtorrent/peer_id.hpp ---- Miro-1.1.2/portable/libtorrent/include/libtorrent/peer_id.hpp.fix 2008-02-15 03:45:47.000000000 -0700 +--- Miro-1.1.2/portable/libtorrent/include/libtorrent/peer_id.hpp.gcc43 2008-02-15 03:45:47.000000000 -0700 +++ Miro-1.1.2/portable/libtorrent/include/libtorrent/peer_id.hpp 2008-02-15 03:46:00.000000000 -0700 -@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. +@@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE. + #include #include #include - #include +-#include +#include #include "libtorrent/config.hpp" #include "libtorrent/assert.hpp" -diff -up Miro-1.1.2/portable/libtorrent/src/file.cpp.fix Miro-1.1.2/portable/libtorrent/src/file.cpp ---- Miro-1.1.2/portable/libtorrent/src/file.cpp.fix 2008-02-15 04:12:42.000000000 -0700 +diff -up Miro-1.1.2/portable/libtorrent/src/file.cpp.gcc43 Miro-1.1.2/portable/libtorrent/src/file.cpp +--- Miro-1.1.2/portable/libtorrent/src/file.cpp.gcc43 2008-02-15 04:12:42.000000000 -0700 +++ Miro-1.1.2/portable/libtorrent/src/file.cpp 2008-02-15 04:15:19.000000000 -0700 @@ -57,6 +57,7 @@ typedef int mode_t; #include @@ -20,3 +21,29 @@ #include // make sure the _FILE_OFFSET_BITS define worked + +diff -up Miro-1.1.2/portable/libtorrent/src/entry.cpp.gcc43 Miro-1.1.2/portable/libtorrent/src/entry.cpp +--- Miro-1.1.2/portable/libtorrent/src/entry.cpp.gcc43 2008-02-07 21:30:04.000000000 -0500 ++++ Miro-1.1.2/portable/libtorrent/src/entry.cpp 2008-03-02 20:32:44.000000000 -0500 +@@ -32,6 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. + + #include "libtorrent/pch.hpp" + ++#include + #include + #include + #include "libtorrent/entry.hpp" +@@ -287,11 +288,11 @@ namespace libtorrent + void entry::print(std::ostream& os, int indent) const + { + TORRENT_ASSERT(indent >= 0); +- for (int i = 0; i < indent; ++i) os << " "; ++ for (int i = 0; i < indent; ++i) os << entry(" "); + switch (m_type) + { + case int_t: +- os << integer() << "\n"; ++ os << integer() << entry("\n"); + break; + case string_t: + { From fedora-extras-commits at redhat.com Tue Mar 11 12:48:59 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 11 Mar 2008 12:48:59 GMT Subject: rpms/ppracer/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE PPRacer-0.1.9-ia64.patch, 1.1, NONE ppracer-0.3.1-c++.patch, 1.1, NONE ppracer-0.3.1-lib64.patch, 1.1, NONE ppracer.desktop, 1.5, NONE ppracer.png, 1.1, NONE ppracer.spec, 1.24, NONE sources, 1.2, NONE tree.png, 1.1, NONE Message-ID: <200803111248.m2BCmxRK017978@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/ppracer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17959 Added Files: dead.package Removed Files: .cvsignore Makefile PPRacer-0.1.9-ia64.patch ppracer-0.3.1-c++.patch ppracer-0.3.1-lib64.patch ppracer.desktop ppracer.png ppracer.spec sources tree.png Log Message: Succeeded by extremetuxracer. --- NEW FILE dead.package --- Succeeded by extremetuxracer. --- .cvsignore DELETED --- --- Makefile DELETED --- --- PPRacer-0.1.9-ia64.patch DELETED --- --- ppracer-0.3.1-c++.patch DELETED --- --- ppracer-0.3.1-lib64.patch DELETED --- --- ppracer.desktop DELETED --- --- ppracer.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 12:50:38 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Tue, 11 Mar 2008 12:50:38 GMT Subject: devel/vim 7.1.270, NONE, 1.1 README.patches, 1.99, 1.100 vim.spec, 1.197, 1.198 vimrc, 1.17, 1.18 Message-ID: <200803111250.m2BCocOI018063@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18012 Modified Files: README.patches vim.spec vimrc Added Files: 7.1.270 Log Message: - patchlevel 270 - don't write swapfile on most common locations for USB-sticks (#436752) --- NEW FILE 7.1.270 --- To: vim-dev at vim.org Subject: Patch 7.1.270 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.270 Problem: ":?foo?" matches in current line since patch 7.1.025. (A.Politz) Solution: Remove the SEARCH_START flag. Files: src/ex_docmd.c, src/search.c *** ../vim-7.1.269/src/ex_docmd.c Tue Feb 26 21:29:06 2008 --- src/ex_docmd.c Sun Mar 2 20:50:43 2008 *************** *** 3932,3939 **** curwin->w_cursor.col = 0; searchcmdlen = 0; if (!do_search(NULL, c, cmd, 1L, ! SEARCH_HIS + SEARCH_MSG + SEARCH_START, ! NULL)) { curwin->w_cursor = pos; cmd = NULL; --- 3932,3938 ---- curwin->w_cursor.col = 0; searchcmdlen = 0; if (!do_search(NULL, c, cmd, 1L, ! SEARCH_HIS | SEARCH_MSG, NULL)) { curwin->w_cursor = pos; cmd = NULL; *************** *** 3980,3987 **** pos.col = 0; if (searchit(curwin, curbuf, &pos, *cmd == '?' ? BACKWARD : FORWARD, ! (char_u *)"", 1L, ! SEARCH_MSG + SEARCH_START, i, (linenr_T)0, NULL) != FAIL) lnum = pos.lnum; else --- 3979,3985 ---- pos.col = 0; if (searchit(curwin, curbuf, &pos, *cmd == '?' ? BACKWARD : FORWARD, ! (char_u *)"", 1L, SEARCH_MSG, i, (linenr_T)0, NULL) != FAIL) lnum = pos.lnum; else *** ../vim-7.1.269/src/search.c Wed Feb 20 13:41:14 2008 --- src/search.c Sun Mar 2 22:00:50 2008 *************** *** 538,544 **** return FAIL; } ! if (options & SEARCH_START) extra_col = 0; #ifdef FEAT_MBYTE /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */ --- 538,547 ---- return FAIL; } ! /* When not accepting a match at the start position set "extra_col" to a ! * non-zero value. Don't do that when starting at MAXCOL, since MAXCOL + ! * 1 is zero. */ ! if ((options & SEARCH_START) || pos->col == MAXCOL) extra_col = 0; #ifdef FEAT_MBYTE /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */ *** ../vim-7.1.269/src/version.c Sun Mar 9 16:45:16 2008 --- src/version.c Mon Mar 10 21:32:07 2008 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 270, /**/ -- hundred-and-one symptoms of being an internet addict: 102. When filling out your driver's license application, you give your IP address. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// Index: README.patches =================================================================== RCS file: /cvs/extras/devel/vim/README.patches,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- README.patches 10 Mar 2008 12:18:00 -0000 1.99 +++ README.patches 11 Mar 2008 12:49:59 -0000 1.100 @@ -301,3 +301,4 @@ 1957 7.1.267 when changing folds cursor may be positioned in a wrong place 1576 7.1.268 always shows "+" at end of screen line with 'cursurline' 6183 7.1.269 matchparen plugin has an arbitrary line number limit + 2861 7.1.270 ":?foo?" matches in current line since patch 7.1.025 Index: vim.spec =================================================================== RCS file: /cvs/extras/devel/vim/vim.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- vim.spec 10 Mar 2008 14:17:23 -0000 1.197 +++ vim.spec 11 Mar 2008 12:49:59 -0000 1.198 @@ -18,13 +18,13 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim71%{?beta} -%define patchlevel 269 +%define patchlevel 270 Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{beta}%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2 @@ -323,6 +323,7 @@ Patch267: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.267 Patch268: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.268 Patch269: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.269 +Patch270: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.270 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -728,6 +729,7 @@ %patch267 -p0 %patch268 -p0 %patch269 -p0 +%patch270 -p0 # install spell files @@ -1130,6 +1132,10 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Mar 11 2008 Karsten Hopp 7.1.270-1 +- patchlevel 270 +- don't write swapfile on most common locations for USB-sticks (#436752) + * Mon Mar 10 2008 Tom "spot" Callaway 7.1.269-2 - BR: ExtUtils::Embed to find perl headers Index: vimrc =================================================================== RCS file: /cvs/extras/devel/vim/vimrc,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- vimrc 25 Feb 2008 15:27:41 -0000 1.17 +++ vimrc 11 Mar 2008 12:49:59 -0000 1.18 @@ -20,6 +20,8 @@ \ if line("'\"") > 0 && line ("'\"") <= line("$") | \ exe "normal! g'\"" | \ endif + " don't write swapfile on most commonly used directories for NFS mounts or USB sticks + autocmd BufNewFile,BufReadPre /media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp endif if has("cscope") && filereadable("/usr/bin/cscope") From fedora-extras-commits at redhat.com Tue Mar 11 12:51:11 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Tue, 11 Mar 2008 12:51:11 GMT Subject: rpms/vnc/devel vnc-allocate.patch, NONE, 1.1 vnc-mieq.patch, NONE, 1.1 vnc-noxkb.patch, NONE, 1.1 vnc-paint.patch, NONE, 1.1 vnc-privates.patch, NONE, 1.1 vnc-selections.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 sources, 1.24, 1.25 vnc-autotools.patch, 1.2, 1.3 vnc-gcc43.patch, 1.1, 1.2 vnc-modular-xorg.patch, 1.12, 1.13 vnc.spec, 1.183, 1.184 Message-ID: <200803111251.m2BCpBRx018119@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18050 Modified Files: .cvsignore sources vnc-autotools.patch vnc-gcc43.patch vnc-modular-xorg.patch vnc.spec Added Files: vnc-allocate.patch vnc-mieq.patch vnc-noxkb.patch vnc-paint.patch vnc-privates.patch vnc-selections.patch Log Message: - BuildRequires and Requires cleanup - don't build java viewer (problems due new gcj) - use xorg codebase from xorg-x11-server-source package again - vnc-selection.patch - new xserver selection API/ABI - vnc-xkb.patch - disable XKEYBOARD extension - vnc-paint.patch - PaintWindow{Background,Border} hooks have been removed - vnc-privates.patch - update devPrivates handling - vnc-mieq.patch - use event queue to handle input events vnc-allocate.patch: --- NEW FILE vnc-allocate.patch --- diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc.allocate vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc --- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc.allocate 2008-02-25 16:38:37.000000000 +0100 +++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc 2008-02-25 16:54:48.000000000 +0100 @@ -536,9 +536,9 @@ static void vfbInstallColormap(ColormapP swapcopy32(pXWDHeader->bits_per_rgb, pVisual->bitsPerRGBValue); swapcopy32(pXWDHeader->colormap_entries, pVisual->ColormapEntries); - ppix = (Pixel *)ALLOCATE_LOCAL(entries * sizeof(Pixel)); - prgb = (xrgb *)ALLOCATE_LOCAL(entries * sizeof(xrgb)); - defs = (xColorItem *)ALLOCATE_LOCAL(entries * sizeof(xColorItem)); + ppix = (Pixel *)xalloc(entries * sizeof(Pixel)); + prgb = (xrgb *)xalloc(entries * sizeof(xrgb)); + defs = (xColorItem *)xalloc(entries * sizeof(xColorItem)); for (i = 0; i < entries; i++) ppix[i] = i; /* XXX truecolor */ @@ -553,9 +553,9 @@ static void vfbInstallColormap(ColormapP } (*pmap->pScreen->StoreColors)(pmap, entries, defs); - DEALLOCATE_LOCAL(ppix); - DEALLOCATE_LOCAL(prgb); - DEALLOCATE_LOCAL(defs); + xfree(ppix); + xfree(prgb); + xfree(defs); } } vnc-mieq.patch: --- NEW FILE vnc-mieq.patch --- diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc.mieq vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc --- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc.mieq 2006-05-15 18:56:20.000000000 +0200 +++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc 2008-03-05 12:25:06.000000000 +0100 @@ -50,12 +50,20 @@ extern char *display; #include "resource.h" #include "cursorstr.h" #include "windowstr.h" +#include "mi/mi.h" #define XK_CYRILLIC #include "keysym.h" #undef public #undef class } +static xEvent *eventq = NULL; +static DeviceIntPtr vncKeyboard = NULL; +static DeviceIntPtr vncMouse = NULL; + +static int vfbKeybdProc (DeviceIntPtr pDev, int onoff); +static int vfbMouseProc (DeviceIntPtr pDev, int onoff); + using namespace rfb; using namespace network; @@ -202,6 +210,21 @@ XserverDesktop::XserverDesktop(ScreenPtr if (httpListener) httpServer = new FileHTTPServer(this); + +// XXX Memory leak here, eventq is not free()-d because it has to exist till server exits + if (!eventq) + eventq = (xEvent *) xcalloc(sizeof(xEvent), GetMaximumEventsNum()); + if (!eventq) + FatalError("couldn't allocate room for events\n"); + + if (vncMouse == NULL) { + vncMouse = AddInputDevice(vfbMouseProc, TRUE); + RegisterPointerDevice (vncMouse); + } + if (vncKeyboard == NULL) { + vncKeyboard = AddInputDevice(vfbKeybdProc, TRUE); + RegisterKeyboardDevice (vncKeyboard); + } } XserverDesktop::~XserverDesktop() @@ -495,7 +518,7 @@ void XserverDesktop::positionCursor() { if (!cursorPos.equals(oldCursorPos)) { oldCursorPos = cursorPos; - (*pScreen->SetCursorPosition) (pScreen, cursorPos.x, cursorPos.y, FALSE); +// (*pScreen->SetCursorPosition) (pScreen, cursorPos.x, cursorPos.y, FALSE); server->setCursorPos(cursorPos); server->tryUpdate(); } @@ -660,8 +683,8 @@ void XserverDesktop::approveConnection(v void XserverDesktop::pointerEvent(const Point& pos, int buttonMask) { - xEvent ev; - DevicePtr dev = LookupPointerDevice(); + BYTE detail; + int i, j, n, valuators[2]; // SetCursorPosition seems to be very expensive (at least on XFree86 3.3.6 // for S3), so we delay calling it until positionCursor() is called at the @@ -670,14 +693,14 @@ void XserverDesktop::pointerEvent(const NewCurrentScreen(pScreen, pos.x, pos.y); - ev.u.u.type = MotionNotify; - ev.u.u.detail = 0; - ev.u.keyButtonPointer.rootX = pos.x; - ev.u.keyButtonPointer.rootY = pos.y; - ev.u.keyButtonPointer.time = GetTimeInMillis(); - - if (!pos.equals(cursorPos)) - (*dev->processInputProc)(&ev, (DeviceIntPtr)dev, 1); + if (!pos.equals(cursorPos)) { + valuators[0] = pos.x; + valuators[1] = pos.y; + n = GetPointerEvents (eventq, vncMouse, MotionNotify, 0, + POINTER_ABSOLUTE, 0, 2, valuators); + for (i = 0; i < n; i++) + mieqEnqueue (vncMouse, eventq + i); + } for (int i = 0; i < 5; i++) { if ((buttonMask ^ oldButtonMask) & (1<button->map[i + 1]; + detail = vncMouse->button->map[i + 1]; #else - ev.u.u.detail = i + 1; + detail = i + 1; #endif - ev.u.u.type = (buttonMask & (1<processInputProc)(&ev, (DeviceIntPtr)dev, 1); + n = GetPointerEvents (eventq, vncMouse, (buttonMask & (1<key; + KeyClassPtr keyc = vncKeyboard->key; if (!(keyc->state & (1<modifierKeyMap[modIndex * keyc->maxKeysPerModifier], true); @@ -789,7 +815,7 @@ public: } } void release() { - KeyClassPtr keyc = dev->key; + KeyClassPtr keyc = vncKeyboard->key; if (keyc->state & (1<maxKeysPerModifier; k++) { int keycode @@ -802,20 +828,19 @@ public: private: void tempKeyEvent(int keycode, bool down) { if (keycode) { - if (!keys) keys = new int[dev->key->maxKeysPerModifier]; + if (!keys) keys = new int[vncKeyboard->key->maxKeysPerModifier]; keys[nKeys++] = keycode; generateXKeyEvent(keycode, down); } } void generateXKeyEvent(int keycode, bool down) { - xEvent ev; - ev.u.u.type = down ? KeyPress : KeyRelease; - ev.u.u.detail = keycode; - ev.u.keyButtonPointer.time = GetTimeInMillis(); - (*dev->c_public.processInputProc)(&ev, dev, 1); + int i, n; + n = GetKeyboardEvents (eventq, vncKeyboard, + down ? KeyPress : KeyRelease, keycode); + for (i = 0; i < n; i++) + mieqEnqueue (vncKeyboard, eventq + i); vlog.debug("fake keycode %d %s", keycode, down ? "down" : "up"); } - DeviceIntPtr dev; int modIndex; int nKeys; int* keys; @@ -888,16 +913,16 @@ void XserverDesktop::keyEvent(rdr::U32 k vlog.debug("Ignoring caps lock"); return; } - DeviceIntPtr dev = (DeviceIntPtr)LookupKeyboardDevice(); - KeyClassPtr keyc = dev->key; + KeyClassPtr keyc = vncKeyboard->key; KeySymsPtr keymap = &keyc->curKeySyms; + int i, j, k, n; // find which modifier Mode_switch is on. int modeSwitchMapIndex = 0; - for (int i = 3; i < 8; i++) { - for (int k = 0; k < keyc->maxKeysPerModifier; k++) { + for (i = 3; i < 8; i++) { + for (k = 0; k < keyc->maxKeysPerModifier; k++) { int keycode = keyc->modifierKeyMap[i * keyc->maxKeysPerModifier + k]; - for (int j = 0; j < keymap->mapWidth; j++) { + for (j = 0; j < keymap->mapWidth; j++) { if (keycode != 0 && keymap->map[(keycode - keymap->minKeyCode) * keymap->mapWidth + j] == XK_Mode_switch) @@ -926,7 +951,7 @@ void XserverDesktop::keyEvent(rdr::U32 k if (kc == 0) { // Not a direct match in the local keyboard mapping. Check for alternative // keysyms with the same meaning. - for (int i = 0; i < sizeof(altKeysym) / sizeof(altKeysym_t); i++) { + for (i = 0; i < sizeof(altKeysym) / sizeof(altKeysym_t); i++) { if (keysym == altKeysym[i].a) kc = KeysymToKeycode(keymap, altKeysym[i].b, &col); else if (keysym == altKeysym[i].b) @@ -954,16 +979,16 @@ void XserverDesktop::keyEvent(rdr::U32 k // See if it's a modifier key. If so, then don't do any auto-repeat, because // the X server will translate each press into a release followed by a press. - for (int i = 0; i < 8; i++) { - for (int k = 0; k < keyc->maxKeysPerModifier; k++) { + for (i = 0; i < 8; i++) { + for (k = 0; k < keyc->maxKeysPerModifier; k++) { if (kc == keyc->modifierKeyMap[i * keyc->maxKeysPerModifier + k] && IS_PRESSED(keyc,kc) && down) return; } } - ModifierState shift(dev, ShiftMapIndex); - ModifierState modeSwitch(dev, modeSwitchMapIndex); + ModifierState shift(ShiftMapIndex); + ModifierState modeSwitch(modeSwitchMapIndex); if (down) { if (col & 1) shift.press(); @@ -977,11 +1002,10 @@ void XserverDesktop::keyEvent(rdr::U32 k } } vlog.debug("keycode %d %s", kc, down ? "down" : "up"); - xEvent ev; - ev.u.u.type = down ? KeyPress : KeyRelease; - ev.u.u.detail = kc; - ev.u.keyButtonPointer.time = GetTimeInMillis(); - (*dev->c_public.processInputProc)(&ev, dev, 1); + n = GetKeyboardEvents (eventq, vncKeyboard, down ? KeyPress : KeyRelease, + kc); + for (i = 0; i < n; i++) + mieqEnqueue (vncKeyboard, eventq + i); } @@ -1150,3 +1174,208 @@ static KeyCode KeysymToKeycode(KeySymsPt } return 0; } + +void vncRingBell(int percent, int pitch, int duration) +{ + if (percent > 0) + vncBell(); +} + +/* Fairly standard US PC Keyboard */ + +#define VFB_MIN_KEY 8 +#define VFB_MAX_KEY 255 +#define VFB_MAP_LEN (VFB_MAX_KEY - VFB_MIN_KEY + 1) +#define KEYSYMS_PER_KEY 2 +KeySym keyboardMap[VFB_MAP_LEN * KEYSYMS_PER_KEY] = { + NoSymbol, NoSymbol, + XK_Escape, NoSymbol, + XK_1, XK_exclam, + XK_2, XK_at, + XK_3, XK_numbersign, + XK_4, XK_dollar, + XK_5, XK_percent, + XK_6, XK_asciicircum, + XK_7, XK_ampersand, + XK_8, XK_asterisk, + XK_9, XK_parenleft, + XK_0, XK_parenright, + XK_minus, XK_underscore, + XK_equal, XK_plus, + XK_BackSpace, NoSymbol, + XK_Tab, NoSymbol, + XK_q, XK_Q, + XK_w, XK_W, + XK_e, XK_E, + XK_r, XK_R, + XK_t, XK_T, + XK_y, XK_Y, + XK_u, XK_U, + XK_i, XK_I, + XK_o, XK_O, + XK_p, XK_P, + XK_bracketleft, XK_braceleft, + XK_bracketright, XK_braceright, + XK_Return, NoSymbol, + XK_Control_L, NoSymbol, + XK_a, XK_A, + XK_s, XK_S, + XK_d, XK_D, + XK_f, XK_F, + XK_g, XK_G, + XK_h, XK_H, + XK_j, XK_J, + XK_k, XK_K, + XK_l, XK_L, + XK_semicolon, XK_colon, + XK_apostrophe, XK_quotedbl, + XK_grave, XK_asciitilde, + XK_Shift_L, NoSymbol, + XK_backslash, XK_bar, + XK_z, XK_Z, + XK_x, XK_X, + XK_c, XK_C, + XK_v, XK_V, + XK_b, XK_B, + XK_n, XK_N, + XK_m, XK_M, + XK_comma, XK_less, + XK_period, XK_greater, + XK_slash, XK_question, + XK_Shift_R, NoSymbol, + XK_KP_Multiply, NoSymbol, + XK_Alt_L, XK_Meta_L, + XK_space, NoSymbol, + /*XK_Caps_Lock*/ NoSymbol, NoSymbol, + XK_F1, NoSymbol, + XK_F2, NoSymbol, + XK_F3, NoSymbol, + XK_F4, NoSymbol, + XK_F5, NoSymbol, + XK_F6, NoSymbol, + XK_F7, NoSymbol, + XK_F8, NoSymbol, + XK_F9, NoSymbol, + XK_F10, NoSymbol, + XK_Num_Lock, XK_Pointer_EnableKeys, + XK_Scroll_Lock, NoSymbol, + XK_KP_Home, XK_KP_7, + XK_KP_Up, XK_KP_8, + XK_KP_Prior, XK_KP_9, + XK_KP_Subtract, NoSymbol, + XK_KP_Left, XK_KP_4, + XK_KP_Begin, XK_KP_5, + XK_KP_Right, XK_KP_6, + XK_KP_Add, NoSymbol, + XK_KP_End, XK_KP_1, + XK_KP_Down, XK_KP_2, + XK_KP_Next, XK_KP_3, + XK_KP_Insert, XK_KP_0, + XK_KP_Delete, XK_KP_Decimal, + NoSymbol, NoSymbol, + NoSymbol, NoSymbol, + NoSymbol, NoSymbol, + XK_F11, NoSymbol, + XK_F12, NoSymbol, + XK_Home, NoSymbol, + XK_Up, NoSymbol, + XK_Prior, NoSymbol, + XK_Left, NoSymbol, + NoSymbol, NoSymbol, + XK_Right, NoSymbol, + XK_End, NoSymbol, + XK_Down, NoSymbol, + XK_Next, NoSymbol, + XK_Insert, NoSymbol, + XK_Delete, NoSymbol, + XK_KP_Enter, NoSymbol, + XK_Control_R, NoSymbol, + XK_Pause, XK_Break, + XK_Print, XK_Execute, + XK_KP_Divide, NoSymbol, + XK_Alt_R, XK_Meta_R, +}; + +static Bool GetMappings(KeySymsPtr pKeySyms, CARD8 *pModMap) +{ + int i; + + for (i = 0; i < MAP_LENGTH; i++) + pModMap[i] = NoSymbol; + + for (i = 0; i < VFB_MAP_LEN; i++) { + if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Caps_Lock) + pModMap[i + VFB_MIN_KEY] = LockMask; + else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Shift_L || + keyboardMap[i * KEYSYMS_PER_KEY] == XK_Shift_R) + pModMap[i + VFB_MIN_KEY] = ShiftMask; + else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Control_L || + keyboardMap[i * KEYSYMS_PER_KEY] == XK_Control_R) { + pModMap[i + VFB_MIN_KEY] = ControlMask; + } + else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Alt_L || + keyboardMap[i * KEYSYMS_PER_KEY] == XK_Alt_R) + pModMap[i + VFB_MIN_KEY] = Mod1Mask; + } + + pKeySyms->minKeyCode = VFB_MIN_KEY; + pKeySyms->maxKeyCode = VFB_MAX_KEY; + pKeySyms->mapWidth = KEYSYMS_PER_KEY; + pKeySyms->map = keyboardMap; + + return TRUE; +} + +static int vfbKeybdProc(DeviceIntPtr pDev, int onoff) +{ + KeySymsRec keySyms; + CARD8 modMap[MAP_LENGTH]; + + switch (onoff) + { + case DEVICE_INIT: + GetMappings(&keySyms, modMap); + InitKeyboardDeviceStruct(&pDev->c_public, &keySyms, modMap, + (BellProcPtr)vncRingBell, (KbdCtrlProcPtr)NoopDDA); + break; + case DEVICE_ON: + pDev->c_public.on = TRUE; + break; + case DEVICE_OFF: + pDev->c_public.on = FALSE; + break; + case DEVICE_CLOSE: + break; + } + return Success; +} + +static int vfbMouseProc(DeviceIntPtr pDev, int onoff) +{ + BYTE map[6]; + + switch (onoff) + { + case DEVICE_INIT: + map[1] = 1; + map[2] = 2; + map[3] = 3; + map[4] = 4; + map[5] = 5; + InitPointerDeviceStruct(&pDev->c_public, map, 5, GetMotionHistory, + (PtrCtrlProcPtr)NoopDDA, GetMotionHistorySize(), 2); + break; + + case DEVICE_ON: + pDev->c_public.on = TRUE; + break; + + case DEVICE_OFF: + pDev->c_public.on = FALSE; + break; + + case DEVICE_CLOSE: + break; + } + return Success; +} diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc.mieq vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc --- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc.mieq 2008-03-04 12:08:05.000000000 +0100 +++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/xvnc.cc 2008-03-05 11:52:34.000000000 +0100 @@ -125,6 +125,8 @@ static bool displaySpecified = false; static bool wellKnownSocketsCreated = false; static char displayNumStr[16]; +extern void vncRingBell (int percent, int pitch, int duration); + #define swapcopy16(_dst, _src) \ if (needswap) { CARD16 _s = _src; cpswaps(_s, _dst); } \ else _dst = _src; @@ -925,7 +927,7 @@ void InitOutput(ScreenInfo *screenInfo, int SelectWaitTime = 10000; /* usec */ #endif -Bool LegalModifier(unsigned int key, DevicePtr pDev) +Bool LegalModifier(unsigned int key, DeviceIntPtr pDev) { return TRUE; } @@ -936,223 +938,14 @@ void ProcessInputEvents() miPointerUpdate(); } -/* Fairly standard US PC Keyboard */ - -#define VFB_MIN_KEY 8 -#define VFB_MAX_KEY 255 -#define VFB_MAP_LEN (VFB_MAX_KEY - VFB_MIN_KEY + 1) -#define KEYSYMS_PER_KEY 2 -KeySym keyboardMap[VFB_MAP_LEN * KEYSYMS_PER_KEY] = { - NoSymbol, NoSymbol, - XK_Escape, NoSymbol, - XK_1, XK_exclam, - XK_2, XK_at, - XK_3, XK_numbersign, - XK_4, XK_dollar, - XK_5, XK_percent, - XK_6, XK_asciicircum, - XK_7, XK_ampersand, - XK_8, XK_asterisk, - XK_9, XK_parenleft, - XK_0, XK_parenright, - XK_minus, XK_underscore, - XK_equal, XK_plus, - XK_BackSpace, NoSymbol, - XK_Tab, NoSymbol, - XK_q, XK_Q, - XK_w, XK_W, - XK_e, XK_E, - XK_r, XK_R, - XK_t, XK_T, - XK_y, XK_Y, - XK_u, XK_U, - XK_i, XK_I, - XK_o, XK_O, - XK_p, XK_P, - XK_bracketleft, XK_braceleft, - XK_bracketright, XK_braceright, - XK_Return, NoSymbol, - XK_Control_L, NoSymbol, - XK_a, XK_A, - XK_s, XK_S, - XK_d, XK_D, - XK_f, XK_F, - XK_g, XK_G, - XK_h, XK_H, - XK_j, XK_J, - XK_k, XK_K, - XK_l, XK_L, - XK_semicolon, XK_colon, - XK_apostrophe, XK_quotedbl, - XK_grave, XK_asciitilde, - XK_Shift_L, NoSymbol, - XK_backslash, XK_bar, - XK_z, XK_Z, - XK_x, XK_X, - XK_c, XK_C, - XK_v, XK_V, - XK_b, XK_B, - XK_n, XK_N, - XK_m, XK_M, - XK_comma, XK_less, - XK_period, XK_greater, - XK_slash, XK_question, - XK_Shift_R, NoSymbol, - XK_KP_Multiply, NoSymbol, - XK_Alt_L, XK_Meta_L, - XK_space, NoSymbol, - /*XK_Caps_Lock*/ NoSymbol, NoSymbol, - XK_F1, NoSymbol, - XK_F2, NoSymbol, - XK_F3, NoSymbol, - XK_F4, NoSymbol, - XK_F5, NoSymbol, - XK_F6, NoSymbol, - XK_F7, NoSymbol, - XK_F8, NoSymbol, - XK_F9, NoSymbol, - XK_F10, NoSymbol, - XK_Num_Lock, XK_Pointer_EnableKeys, - XK_Scroll_Lock, NoSymbol, - XK_KP_Home, XK_KP_7, - XK_KP_Up, XK_KP_8, - XK_KP_Prior, XK_KP_9, - XK_KP_Subtract, NoSymbol, - XK_KP_Left, XK_KP_4, - XK_KP_Begin, XK_KP_5, - XK_KP_Right, XK_KP_6, - XK_KP_Add, NoSymbol, - XK_KP_End, XK_KP_1, - XK_KP_Down, XK_KP_2, - XK_KP_Next, XK_KP_3, - XK_KP_Insert, XK_KP_0, - XK_KP_Delete, XK_KP_Decimal, - NoSymbol, NoSymbol, - NoSymbol, NoSymbol, - NoSymbol, NoSymbol, - XK_F11, NoSymbol, - XK_F12, NoSymbol, - XK_Home, NoSymbol, - XK_Up, NoSymbol, - XK_Prior, NoSymbol, - XK_Left, NoSymbol, - NoSymbol, NoSymbol, - XK_Right, NoSymbol, - XK_End, NoSymbol, - XK_Down, NoSymbol, - XK_Next, NoSymbol, - XK_Insert, NoSymbol, - XK_Delete, NoSymbol, - XK_KP_Enter, NoSymbol, - XK_Control_R, NoSymbol, - XK_Pause, XK_Break, - XK_Print, XK_Execute, - XK_KP_Divide, NoSymbol, - XK_Alt_R, XK_Meta_R, -}; - -static Bool GetMappings(KeySymsPtr pKeySyms, CARD8 *pModMap) -{ - int i; - - for (i = 0; i < MAP_LENGTH; i++) - pModMap[i] = NoSymbol; - - for (i = 0; i < VFB_MAP_LEN; i++) { - if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Caps_Lock) - pModMap[i + VFB_MIN_KEY] = LockMask; - else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Shift_L || - keyboardMap[i * KEYSYMS_PER_KEY] == XK_Shift_R) - pModMap[i + VFB_MIN_KEY] = ShiftMask; - else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Control_L || - keyboardMap[i * KEYSYMS_PER_KEY] == XK_Control_R) { - pModMap[i + VFB_MIN_KEY] = ControlMask; - } - else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Alt_L || - keyboardMap[i * KEYSYMS_PER_KEY] == XK_Alt_R) - pModMap[i + VFB_MIN_KEY] = Mod1Mask; - } - - pKeySyms->minKeyCode = VFB_MIN_KEY; - pKeySyms->maxKeyCode = VFB_MAX_KEY; - pKeySyms->mapWidth = KEYSYMS_PER_KEY; - pKeySyms->map = keyboardMap; - - return TRUE; -} - -static void vfbBell(int percent, DeviceIntPtr device, pointer ctrl, int class_) -{ - if (percent > 0) - vncBell(); -} - -static int vfbKeybdProc(DeviceIntPtr pDevice, int onoff) -{ - KeySymsRec keySyms; - CARD8 modMap[MAP_LENGTH]; - DevicePtr pDev = (DevicePtr)pDevice; - - switch (onoff) - { - case DEVICE_INIT: - GetMappings(&keySyms, modMap); - InitKeyboardDeviceStruct(pDev, &keySyms, modMap, - (BellProcPtr)vfbBell, (KbdCtrlProcPtr)NoopDDA); - break; - case DEVICE_ON: - pDev->on = TRUE; - break; - case DEVICE_OFF: - pDev->on = FALSE; - break; - case DEVICE_CLOSE: - break; - } - return Success; -} - -static int vfbMouseProc(DeviceIntPtr pDevice, int onoff) +void DDXRingBell(int percent, int pitch, int duration) { - BYTE map[6]; - DevicePtr pDev = (DevicePtr)pDevice; - - switch (onoff) - { - case DEVICE_INIT: - map[1] = 1; - map[2] = 2; - map[3] = 3; - map[4] = 4; - map[5] = 5; - InitPointerDeviceStruct(pDev, map, 5, miPointerGetMotionEvents, - (PtrCtrlProcPtr)NoopDDA, miPointerGetMotionBufferSize()); - break; - - case DEVICE_ON: - pDev->on = TRUE; - break; - - case DEVICE_OFF: - pDev->on = FALSE; - break; - - case DEVICE_CLOSE: - break; - } - return Success; + vncRingBell (percent, pitch, duration); } - // InitInput is called after InitExtensions, so we're guaranteed that // vncExtensionInit() has already been called. void InitInput(int argc, char *argv[]) { - DeviceIntPtr p, k; - p = AddInputDevice(vfbMouseProc, TRUE); - k = AddInputDevice(vfbKeybdProc, TRUE); - RegisterPointerDevice(p); - RegisterKeyboardDevice(k); - miRegisterPointerDevice(screenInfo.screens[0], p); - (void)mieqInit ((DevicePtr)k, (DevicePtr)p); + mieqInit (); } vnc-noxkb.patch: --- NEW FILE vnc-noxkb.patch --- diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.noxkb vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac --- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.noxkb 2008-03-05 13:02:23.000000000 +0100 +++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac 2008-03-05 13:02:41.000000000 +0100 @@ -1009,7 +1009,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten AC_DEFINE(XKB, 1, [Build XKB]) AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) -AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) +AC_DEFINE(XKB_DFLT_DISABLED, 1, [Disable XKB per default]) REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" XKB_LIB='$(top_builddir)/xkb/libxkb.la' XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' vnc-paint.patch: --- NEW FILE vnc-paint.patch --- diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncHooks.cc.paint vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncHooks.cc --- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncHooks.cc.paint 2008-03-06 14:54:52.000000000 +0100 +++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncHooks.cc 2008-03-06 14:56:54.000000000 +0100 @@ -72,8 +72,6 @@ typedef struct { CloseScreenProcPtr CloseScreen; CreateGCProcPtr CreateGC; - PaintWindowBackgroundProcPtr PaintWindowBackground; - PaintWindowBorderProcPtr PaintWindowBorder; CopyWindowProcPtr CopyWindow; ClearToBackgroundProcPtr ClearToBackground; RestoreAreasProcPtr RestoreAreas; @@ -106,10 +104,6 @@ static DevPrivateKey vncHooksGCPrivateKe static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen); static Bool vncHooksCreateGC(GCPtr pGC); -static void vncHooksPaintWindowBackground(WindowPtr pWin, RegionPtr pRegion, - int what); -static void vncHooksPaintWindowBorder(WindowPtr pWin, RegionPtr pRegion, - int what); static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr pOldRegion); static void vncHooksClearToBackground(WindowPtr pWin, int x, int y, int w, @@ -231,8 +225,6 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse vncHooksScreen->CloseScreen = pScreen->CloseScreen; vncHooksScreen->CreateGC = pScreen->CreateGC; - vncHooksScreen->PaintWindowBackground = pScreen->PaintWindowBackground; - vncHooksScreen->PaintWindowBorder = pScreen->PaintWindowBorder; vncHooksScreen->CopyWindow = pScreen->CopyWindow; vncHooksScreen->ClearToBackground = pScreen->ClearToBackground; vncHooksScreen->RestoreAreas = pScreen->RestoreAreas; @@ -253,8 +245,6 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse pScreen->CloseScreen = vncHooksCloseScreen; pScreen->CreateGC = vncHooksCreateGC; - pScreen->PaintWindowBackground = vncHooksPaintWindowBackground; - pScreen->PaintWindowBorder = vncHooksPaintWindowBorder; pScreen->CopyWindow = vncHooksCopyWindow; pScreen->ClearToBackground = vncHooksClearToBackground; pScreen->RestoreAreas = vncHooksRestoreAreas; @@ -297,8 +287,6 @@ static Bool vncHooksCloseScreen(int i, S SCREEN_UNWRAP(pScreen_, CloseScreen); pScreen->CreateGC = vncHooksScreen->CreateGC; - pScreen->PaintWindowBackground = vncHooksScreen->PaintWindowBackground; - pScreen->PaintWindowBorder = vncHooksScreen->PaintWindowBorder; pScreen->CopyWindow = vncHooksScreen->CopyWindow; pScreen->ClearToBackground = vncHooksScreen->ClearToBackground; pScreen->RestoreAreas = vncHooksScreen->RestoreAreas; @@ -333,38 +321,6 @@ static Bool vncHooksCreateGC(GCPtr pGC) return ret; } -// PaintWindowBackground - changed region is the given region - -static void vncHooksPaintWindowBackground(WindowPtr pWin, RegionPtr pRegion, - int what) -{ - SCREEN_UNWRAP(pWin->drawable.pScreen, PaintWindowBackground); - - RegionHelper changed(pScreen, pRegion); - - (*pScreen->PaintWindowBackground) (pWin, pRegion, what); - - vncHooksScreen->desktop->add_changed(changed.reg); - - SCREEN_REWRAP(PaintWindowBackground); -} - -// PaintWindowBorder - changed region is the given region - -static void vncHooksPaintWindowBorder(WindowPtr pWin, RegionPtr pRegion, - int what) -{ - SCREEN_UNWRAP(pWin->drawable.pScreen, PaintWindowBorder); - - RegionHelper changed(pScreen, pRegion); - - (*pScreen->PaintWindowBorder) (pWin, pRegion, what); - - vncHooksScreen->desktop->add_changed(changed.reg); - - SCREEN_REWRAP(PaintWindowBorder); -} - // CopyWindow - destination of the copy is the old region, clipped by // borderClip, translated by the delta. This call only does the copy - it // doesn't affect any other bits. @@ -534,16 +490,9 @@ static void vncHooksValidateGC(GCPtr pGC (*pGC->funcs->ValidateGC) (pGC, changes, pDrawable); u.vncHooksGC->wrappedOps = 0; - if (pDrawable->type == DRAWABLE_WINDOW && ((WindowPtr)pDrawable)->viewable) { - WindowPtr pWin = (WindowPtr)pDrawable; - RegionPtr pRegion = &pWin->clipList; - - if (pGC->subWindowMode == IncludeInferiors) - pRegion = &pWin->borderClip; - if (REGION_NOTEMPTY(pDrawable->pScreen, pRegion)) { - u.vncHooksGC->wrappedOps = pGC->ops; - DBGPRINT((stderr,"vncHooksValidateGC: wrapped GC ops\n")); - } + if (pDrawable->type == DRAWABLE_WINDOW || pDrawable->type == DRAWABLE_PIXMAP) { + u.vncHooksGC->wrappedOps = pGC->ops; + DBGPRINT((stderr,"vncHooksValidateGC: wrapped GC ops\n")); } } vnc-privates.patch: --- NEW FILE vnc-privates.patch --- --- a/bin/xorg/hw/vnc/vncHooks.cc Mon Jan 21 17:29:11 2008 +0100 +++ b/bin/xorg/hw/vnc/vncHooks.cc Thu Jan 24 09:50:48 2008 +0100 @@ -86,9 +86,15 @@ typedef struct { GCOps *wrappedOps; } vncHooksGCRec, *vncHooksGCPtr; -static int vncHooksScreenIndex; -static int vncHooksGCIndex; +static DevPrivateKey vncHooksScrPrivateKey = &vncHooksScrPrivateKey; +static DevPrivateKey vncHooksGCPrivateKey = &vncHooksGCPrivateKey; +#define vncHooksScreenPrivate(scrn) \ + (vncHooksScreenPtr) dixLookupPrivate (&(scrn)->devPrivates, \ + vncHooksScrPrivateKey) +#define vncHooksGCPrivate(pGC) \ + (vncHooksGCPtr) dixLookupPrivate (&(pGC)->devPrivates, \ + vncHooksGCPrivateKey) // screen functions @@ -209,26 +215,11 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse if (vncHooksGeneration != serverGeneration) { vncHooksGeneration = serverGeneration; - vncHooksScreenIndex = AllocateScreenPrivateIndex(); - if (vncHooksScreenIndex < 0) { - ErrorF("vncHooksInit: AllocateScreenPrivateIndex failed\n"); - return FALSE; - } - - vncHooksGCIndex = AllocateGCPrivateIndex(); - if (vncHooksGCIndex < 0) { - ErrorF("vncHooksInit: AllocateGCPrivateIndex failed\n"); - return FALSE; - } - } - - if (!AllocateGCPrivate(pScreen, vncHooksGCIndex, sizeof(vncHooksGCRec))) { - ErrorF("vncHooksInit: AllocateGCPrivate failed\n"); - return FALSE; + if (!dixRequestPrivate (vncHooksGCPrivateKey, sizeof (vncHooksGCRec))) + return FALSE; } vncHooksScreen = (vncHooksScreenPtr)xnfalloc(sizeof(vncHooksScreenRec)); - pScreen->devPrivates[vncHooksScreenIndex].ptr = (pointer)vncHooksScreen; vncHooksScreen->desktop = desktop; @@ -266,6 +257,8 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse pScreen->DisplayCursor = vncHooksDisplayCursor; pScreen->BlockHandler = vncHooksBlockHandler; + dixSetPrivate (&pScreen->devPrivates, vncHooksScrPrivateKey, vncHooksScreen); + return TRUE; } @@ -281,11 +274,10 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse // distinct type, so it would have to use templates, and it's not worth that // much pain. -#define SCREEN_UNWRAP(scrn,field) \ - ScreenPtr pScreen = scrn; \ - vncHooksScreenPtr vncHooksScreen \ - = ((vncHooksScreenPtr)pScreen->devPrivates[vncHooksScreenIndex].ptr); \ - pScreen->field = vncHooksScreen->field; \ +#define SCREEN_UNWRAP(scrn,field) \ + ScreenPtr pScreen = scrn; \ + vncHooksScreenPtr vncHooksScreen = vncHooksScreenPrivate (scrn); \ + pScreen->field = vncHooksScreen->field; \ DBGPRINT((stderr,"vncHooks" #field " called\n")); #define SCREEN_REWRAP(field) pScreen->field = vncHooks##field; @@ -322,8 +314,7 @@ static Bool vncHooksCreateGC(GCPtr pGC) { SCREEN_UNWRAP(pGC->pScreen, CreateGC); - vncHooksGCPtr vncHooksGC - = (vncHooksGCPtr)pGC->devPrivates[vncHooksGCIndex].ptr; + vncHooksGCPtr vncHooksGC = vncHooksGCPrivate (pGC); Bool ret = (*pScreen->CreateGC) (pGC); @@ -507,7 +498,7 @@ class GCFuncUnwrapper { class GCFuncUnwrapper { public: GCFuncUnwrapper(GCPtr pGC_) : pGC(pGC_) { - vncHooksGC = (vncHooksGCPtr)pGC->devPrivates[vncHooksGCIndex].ptr; + vncHooksGC = vncHooksGCPrivate (pGC); pGC->funcs = vncHooksGC->wrappedFuncs; if (vncHooksGC->wrappedOps) pGC->ops = vncHooksGC->wrappedOps; @@ -592,7 +583,7 @@ public: GCOpUnwrapper(DrawablePtr pDrawable, GCPtr pGC_) : pGC(pGC_), pScreen(pDrawable->pScreen) { - vncHooksGC = (vncHooksGCPtr)pGC->devPrivates[vncHooksGCIndex].ptr; + vncHooksGC = vncHooksGCPrivate (pGC); oldFuncs = pGC->funcs; pGC->funcs = vncHooksGC->wrappedFuncs; pGC->ops = vncHooksGC->wrappedOps; @@ -611,8 +602,7 @@ public: #define GC_OP_UNWRAPPER(pDrawable, pGC, name) \ GCOpUnwrapper u(pDrawable, pGC); \ ScreenPtr pScreen = (pDrawable)->pScreen; \ - vncHooksScreenPtr vncHooksScreen \ - = ((vncHooksScreenPtr)pScreen->devPrivates[vncHooksScreenIndex].ptr); \ + vncHooksScreenPtr vncHooksScreen = vncHooksScreenPrivate (pScreen); \ DBGPRINT((stderr,"vncHooks" #name " called\n")); @@ -1511,8 +1501,7 @@ static void vncHooksComposite(CARD8 op, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height) { ScreenPtr pScreen = pDst->pDrawable->pScreen; - vncHooksScreenPtr vncHooksScreen = \ - ((vncHooksScreenPtr)pScreen->devPrivates[vncHooksScreenIndex].ptr); + vncHooksScreenPtr vncHooksScreen = vncHooksScreenPrivate (pScreen); PictureScreenPtr ps = GetPictureScreen(pScreen); BoxRec box; @@ -1534,8 +1523,7 @@ static void vncHooksGlyphs(CARD8 op, Pic GlyphListPtr list, GlyphPtr *glyphs) { ScreenPtr pScreen = pDst->pDrawable->pScreen; - vncHooksScreenPtr vncHooksScreen = \ - ((vncHooksScreenPtr)pScreen->devPrivates[vncHooksScreenIndex].ptr); + vncHooksScreenPtr vncHooksScreen = vncHooksScreenPrivate (pScreen); PictureScreenPtr ps = GetPictureScreen(pScreen); int x, y; int n; vnc-selections.patch: --- NEW FILE vnc-selections.patch --- diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc.selections vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc --- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc.selections 2008-03-10 15:34:24.000000000 +0100 +++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/vncExtInit.cc 2008-03-11 10:55:44.000000000 +0100 @@ -62,11 +62,9 @@ extern "C" { static void SendSelectionChangeEvent(Atom selection); static int ProcVncExtDispatch(ClientPtr client); static int SProcVncExtDispatch(ClientPtr client); + static void vncSelectionCallback(CallbackListPtr *callbacks, pointer data, pointer args); extern char *display; - - extern Selection *CurrentSelections; - extern int NumCurrentSelections; } using namespace rfb; @@ -99,7 +97,6 @@ struct VncInputSelect { VncInputSelect* next; }; -static int nPrevSelections = 0; static TimeStamp* prevSelectionTimes = 0; static int vncErrorBase = 0; @@ -147,6 +144,10 @@ void vncExtensionInit() FatalError("AddCallback failed\n"); } + if (!AddCallback(&SelectionCallback, vncSelectionCallback, 0)) { + FatalError("Add selection callback failed\n"); + } + try { if (!initialised) { rfb::initStdIOLoggers(); @@ -212,6 +213,14 @@ static void vncResetProc(ExtensionEntry* { } +static void vncSelectionCallback(CallbackListPtr *callbacks, pointer data, pointer args) +{ + SelectionInfoRec *info = (SelectionInfoRec *) args; + Selection *selection = info->selection; + + SendSelectionChangeEvent(selection->selection); +} + // // vncBlockHandler - called just before the X server goes into select(). Call // on to the block handler for each desktop. Then check whether any of the @@ -227,27 +236,6 @@ static void vncBlockHandler(pointer data desktop[scr]->blockHandler(fds); } } - - if (nPrevSelections != NumCurrentSelections) { - prevSelectionTimes - = (TimeStamp*)xnfrealloc(prevSelectionTimes, - NumCurrentSelections * sizeof(TimeStamp)); - for (int i = nPrevSelections; i < NumCurrentSelections; i++) { - prevSelectionTimes[i].months = 0; - prevSelectionTimes[i].milliseconds = 0; - } - nPrevSelections = NumCurrentSelections; - } - for (int i = 0; i < NumCurrentSelections; i++) { - if (CurrentSelections[i].lastTimeChanged.months - != prevSelectionTimes[i].months || - CurrentSelections[i].lastTimeChanged.milliseconds - != prevSelectionTimes[i].milliseconds) - { - SendSelectionChangeEvent(CurrentSelections[i].selection); - prevSelectionTimes[i] = CurrentSelections[i].lastTimeChanged; - } - } } static void vncWakeupHandler(pointer data, int nfds, pointer readmask) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 22 Jan 2008 17:16:12 -0000 1.23 +++ .cvsignore 11 Mar 2008 12:50:34 -0000 1.24 @@ -1,3 +1 @@ vnc-4_1_2-unixsrc.tar.gz -vnc-4_1-javasrc.tar.gz -xserver-1.3.0.0-37.fc8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 22 Jan 2008 17:16:12 -0000 1.24 +++ sources 11 Mar 2008 12:50:34 -0000 1.25 @@ -1,3 +1 @@ cf9a6fe8f592286b5e0fdde686504ffb vnc-4_1_2-unixsrc.tar.gz -9407ce1f215aefca77bef12670745280 vnc-4_1-javasrc.tar.gz -db16d9f0e5b19a34ac5e6f353b79ec8d xserver-1.3.0.0-37.fc8.tar.bz2 vnc-autotools.patch: Index: vnc-autotools.patch =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc-autotools.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vnc-autotools.patch 2 Mar 2007 15:33:54 -0000 1.2 +++ vnc-autotools.patch 11 Mar 2008 12:50:34 -0000 1.3 @@ -366,32 +366,6 @@ + vncviewer/Makefile + x0vncserver/Makefile]) +AC_OUTPUT ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.autotools 2007-02-16 09:52:43.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am 2007-02-16 09:53:24.000000000 +0100 -@@ -42,10 +42,7 @@ - ../xfree86/common/libcommon.la \ - -lX11 \ - libvnccommon.la \ -- ../../../../common/rfb/librfb.a \ -- ../../../../common/rdr/librdr.a \ -- ../../../../common/network/libnetwork.a \ -- ../../../../common/Xregion/libXregion.a -+ ../../../../common/rfb/librfb.la - - Xvnc_CFLAGS = -DHAVE_DIX_CONFIG_H \ - -DNO_HW_ONLY_EXTS \ -@@ -68,10 +65,7 @@ - libvnc_la_SOURCES = xf86vncModule.cc - libvnc_la_LIBADD = \ - libvnccommon.la \ -- ../../../../common/rfb/librfb.a \ -- ../../../../common/rdr/librdr.a \ -- ../../../../common/network/libnetwork.a \ -- ../../../../common/Xregion/libXregion.a -+ ../../../../common/rfb/librfb.la - libvnc_la_CXXFLAGS = \ - -I../../../../common \ - -I$(top_srcdir)/hw/xfree86/common \ --- /dev/null 2007-02-16 09:39:42.585819347 +0100 +++ vnc-4_1_2-unixsrc/unix/vncviewer/Makefile.am 2007-02-16 09:51:11.000000000 +0100 @@ -0,0 +1,24 @@ vnc-gcc43.patch: Index: vnc-gcc43.patch =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vnc-gcc43.patch 22 Jan 2008 17:16:12 -0000 1.1 +++ vnc-gcc43.patch 11 Mar 2008 12:50:34 -0000 1.2 @@ -11,17 +11,6 @@ #include #include #include -diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/render/picturestr.h.gcc43 vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/render/picturestr.h ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/render/picturestr.h.gcc43 2008-01-09 14:57:58.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/render/picturestr.h 2008-01-09 14:58:08.000000000 +0100 -@@ -26,6 +26,7 @@ - #ifndef _PICTURESTR_H_ - #define _PICTURESTR_H_ - -+#include - #include "glyphstr.h" - #include "scrnintstr.h" - #include "resource.h" diff -up vnc-4_1_2-unixsrc/unix/tx/TXImage.cxx.gcc43 vnc-4_1_2-unixsrc/unix/tx/TXImage.cxx --- vnc-4_1_2-unixsrc/unix/tx/TXImage.cxx.gcc43 2006-05-15 18:56:20.000000000 +0200 +++ vnc-4_1_2-unixsrc/unix/tx/TXImage.cxx 2008-01-09 14:51:54.000000000 +0100 vnc-modular-xorg.patch: Index: vnc-modular-xorg.patch =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc-modular-xorg.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vnc-modular-xorg.patch 2 Mar 2007 15:33:54 -0000 1.12 +++ vnc-modular-xorg.patch 11 Mar 2008 12:50:34 -0000 1.13 @@ -1,142 +1,3 @@ ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.modular-xorg 2007-03-02 15:45:37.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c 2007-03-02 15:45:38.000000000 +0100 -@@ -283,6 +283,9 @@ - #ifdef MITMISC - extern void MITMiscExtensionInit(INITARGS); - #endif -+#ifdef VNCEXT -+extern void vncExtensionInit(INITARGS); -+#endif - #ifdef XIDLE - extern void XIdleExtensionInit(INITARGS); - #endif -@@ -561,6 +564,9 @@ - #ifdef MITMISC - if (!noMITMiscExtension) MITMiscExtensionInit(); - #endif -+#ifdef VNCEXT -+ vncExtensionInit(); -+#endif - #ifdef XIDLE - if (!noXIdleExtension) XIdleExtensionInit(); - #endif ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.modular-xorg 2007-03-02 15:45:38.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am 2007-03-02 15:47:10.000000000 +0100 -@@ -30,6 +30,8 @@ - XPRINT_SUBDIRS = xprint - endif - -+XVNC_SUBDIRS = vnc -+ - # need to add darwin support here - - SUBDIRS = \ -@@ -39,6 +41,7 @@ - $(XVFB_SUBDIRS) \ - $(XNEST_SUBDIRS) \ - $(DMX_SUBDIRS) \ -+ $(XVNC_SUBDIRS) \ - $(KDRIVE_SUBDIRS) \ - $(XPRINT_SUBDIRS) - ---- /dev/null 2007-03-01 10:25:08.783929433 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am 2007-03-02 15:45:38.000000000 +0100 -@@ -0,0 +1,85 @@ -+noinst_LTLIBRARIES = libvnccommon.la -+libvnccommon_la_SOURCES = \ -+ RegionHelper.h \ -+ vncExtInit.cc \ -+ vncExtInit.h \ -+ vncHooks.cc \ -+ vncHooks.h \ -+ XserverDesktop.cc \ -+ XserverDesktop.h -+ -+libvnccommon_la_CXXFLAGS = \ -+ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ -+ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \ -+ -DGC_HAS_COMPOSITE_CLIP \ -+ -DVNC_USE_FB \ -+ -I/usr/include/X11 \ -+ -I../../../../common \ -+ -I../../../vncconfig -+ -+bin_PROGRAMS = Xvnc -+ -+Xvnc_SOURCES = \ -+ xvnc.cc \ -+ $(top_srcdir)/Xext/dpmsstubs.c \ -+ $(top_srcdir)/Xi/stubs.c \ -+ $(top_srcdir)/mi/miinitext.c \ -+ $(top_srcdir)/fb/fbcmap.c -+ -+Xvnc_LDADD = $(XORG_CORE_LIBS) \ -+ $(XORG_LIBS) \ -+ $(XSERVER_LIBS) \ -+ ../../fb/libfb.la \ -+ ../../mi/libminimi.la \ -+ ../../render/librender.la \ -+ ../../xkb/libxkbstubs.la \ -+ ../../dbe/libdbe.la \ -+ ../../Xext/libXext.la \ -+ ../../XTrap/libxtrap.la \ -+ ../../record/librecord.la \ -+ ../xfree86/os-support/libxorgos.la \ -+ ../../os/libos.la \ -+ ../xfree86/common/libcommon.la \ -+ -lX11 \ -+ libvnccommon.la \ -+ ../../../../common/rfb/librfb.a \ -+ ../../../../common/rdr/librdr.a \ -+ ../../../../common/network/libnetwork.a \ -+ ../../../../common/Xregion/libXregion.a -+ -+Xvnc_CFLAGS = -DHAVE_DIX_CONFIG_H \ -+ -DNO_HW_ONLY_EXTS \ -+ -DNO_MODULE_EXTS \ -+ -DXFree86Server -DVNCEXT -+ -+Xvnc_CXXFLAGS = $(Xvnc_CFLAGS) \ -+ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ -+ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \ -+ -DVNC_USE_FB \ -+ -I../../../../common \ -+ -I../../../vncconfig \ -+ -I../../mi \ -+ -I ../../render \ -+ -I/usr/include/X11 -+ -+libvnc_la_LTLIBRARIES = libvnc.la -+libvnc_la_LDFLAGS = -module -avoid-version -+libvnc_ladir = $(moduledir)/extensions -+libvnc_la_SOURCES = xf86vncModule.cc -+libvnc_la_LIBADD = \ -+ libvnccommon.la \ -+ ../../../../common/rfb/librfb.a \ -+ ../../../../common/rdr/librdr.a \ -+ ../../../../common/network/libnetwork.a \ -+ ../../../../common/Xregion/libXregion.a -+libvnc_la_CXXFLAGS = \ -+ -I../../../../common \ -+ -I$(top_srcdir)/hw/xfree86/common \ -+ -I$(top_srcdir)/hw/xfree86/os-support \ -+ -I$(top_srcdir)/hw/xfree86/os-support/bus \ -+ -DXFree86Module -DXFree86LOADER -DIN_MODULE -+ -+AM_CXXFLAGS = $(CFLAGS) \ -+ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ -+ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -+ ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.modular-xorg 2007-03-02 15:45:38.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac 2007-03-02 15:45:38.000000000 +0100 -@@ -1793,6 +1793,7 @@ - hw/xnest/Makefile - hw/xwin/Makefile - hw/darwin/Makefile -+hw/vnc/Makefile - hw/kdrive/Makefile - hw/kdrive/ati/Makefile - hw/kdrive/chips/Makefile --- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.modular-xorg 2007-03-02 15:45:38.000000000 +0100 +++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-02 15:45:38.000000000 +0100 @@ -36,8 +36,6 @@ Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- vnc.spec 18 Feb 2008 20:08:25 -0000 1.183 +++ vnc.spec 11 Mar 2008 12:50:34 -0000 1.184 @@ -1,21 +1,16 @@ %define vnc_version 4_1_2 -%define java_vnc_version 4_1 Summary: A remote display system Name: vnc Version: 4.1.2 -Release: 25%{?dist} +Release: 25.3%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz -Source1: http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz Source2: vncserver.init Source3: vnc-16x16.png Source4: vnc-24x24.png Source5: vnc-48x48.png - -# XXX Temporary build with F8 xserver due new Input events handling in 1.4.99 -Source6: xserver-1.3.0.0-37.fc8.tar.bz2 - +Source1: Makefile.am Patch0: vnc-cookie.patch Patch1: vnc-gcc4.patch Patch2: vnc-use-fb.patch @@ -40,30 +35,33 @@ Patch33: vnc-always_use_fb.patch Patch34: vnc-vsnprintf.patch Patch36: vnc-24bit.patch -Patch37: vnc-noxorg.patch Patch38: vnc-gcc43.patch -Patch39: vnc-F9mesa.patch +Patch40: vnc-xorg.patch +Patch41: vnc-privates.patch +Patch42: vnc-mieq.patch +Patch43: vnc-allocate.patch +Patch44: vnc-noxkb.patch +Patch45: vnc-paint.patch +Patch46: vnc-selections.patch License: GPLv2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: perl BuildRequires: zlib-devel libjpeg-devel BuildRequires: desktop-file-utils >= 0.2.92 -BuildRequires: gcc-java BuildRequires: autoconf, automake, libtool, flex, bison, pkgconfig, patchutils BuildRequires: expat-devel, freetype-devel BuildRequires: libX11-devel, xorg-x11-xtrans-devel, libXau-devel BuildRequires: libXdmcp-devel, libxkbfile-devel, libXfont-devel BuildRequires: xorg-x11-proto-devel, libXext-devel, tcp_wrappers-devel BuildRequires: libXtst-devel, libfontenc-devel, xorg-x11-util-macros -BuildRequires: libXt-devel -BuildRequires: libstdc++-devel, gcc-c++, libselinux-devel -#BuildRequires: xorg-x11-server-source +BuildRequires: libXt-devel, libXv-devel, pixman-devel +BuildRequires: libselinux-devel +BuildRequires: xorg-x11-server-source BuildRequires: mesa-libGL-devel >= 6.5.2, mesa-source >= 6.5.2, libdrm-devel Requires: gtk2 >= 2.6 Requires: coreutils -Requires: vnc-libs %description Virtual Network Computing (VNC) is a remote display system which @@ -75,8 +73,7 @@ %package server Summary: A VNC server -Requires: bash >= 2.0, util-linux, xorg-x11-fonts-base, xorg-x11-xauth, chkconfig -Requires: vnc-libs +Requires: bash >= 2.0, util-linux, xorg-x11-xauth, chkconfig Group: User Interface/X %description server @@ -93,12 +90,9 @@ %prep %setup -q -n vnc-%{vnc_version}-unixsrc -a1 - -# XXX - new event handling in 1.4.99 xserver -#cp -r %{_datadir}/xorg-x11-server-source unix -pushd unix; mkdir xorg-x11-server-source; cd xorg-x11-server-source -tar xf %{SOURCE6} -popd +cp -r %{_datadir}/xorg-x11-server-source unix +mkdir -p unix/xorg-x11-server-source/hw/vnc +cp %{SOURCE1} unix/xorg-x11-server-source/hw/vnc/ %patch0 -p1 -b .cookie %patch1 -p1 -b .gcc4 @@ -109,6 +103,9 @@ %patch8 -p1 -b .restart %patch9 -p1 -b .vncpasswd %patch11 -p1 -b .modular-xorg +pushd unix/xorg-x11-server-source +%patch40 -p1 -b .vnc +popd %patch12 -p1 -b .nohttpd %patch15 -p1 -b .viewer-reparent %patch16 -p1 -b .64bit @@ -124,38 +121,42 @@ %patch33 -p1 -b .always_use_fb %patch34 -p1 -b .vsnprintf %patch36 -p1 -b .24bit -%patch37 -p1 -b .nomodule %patch38 -p1 -b .gcc43 -%patch39 -p1 -b .F9mesa cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \ unix/xc/programs/Xserver/Xvnc.man \ unix/xc/programs/Xserver/vnc/*.{h,cc} \ unix/xorg-x11-server-source/hw/vnc/ -cp -a unix/xorg-x11-server-source/{cfb/cfb.h,hw/vnc} -cp -a unix/xorg-x11-server-source/{fb/fb.h,hw/vnc} -cp -a unix/xorg-x11-server-source/{fb/fbrop.h,hw/vnc} -sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \ - unix/xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h + +pushd unix/xorg-x11-server-source/hw/vnc +%patch41 -p5 -b .privates +popd +%patch42 -p1 -b .mieq +%patch43 -p1 -b .alloc +%patch44 -p1 -b .noxkb +%patch45 -p1 -b .paint +%patch46 -p1 -b .selections %build -cd common +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0" +export CXXFLAGS="$CFLAGS" + +pushd common autoreconf -fiv %configure make %{?_smp_mflags} +popd -cd ../vnc-%{java_vnc_version}-javasrc/java -make JAVAC="gcj -C" JAR=fastjar %{?_smp_mflags} - -cd ../../unix +pushd unix autoreconf -fiv %configure make %{?_smp_mflags} +popd -cd xorg-x11-server-source -aclocal; automake -a; autoconf +pushd unix/xorg-x11-server-source +autoreconf -fiv %configure --disable-xorg \ - --disable-xnest --enable-xvfb \ + --disable-xnest --disable-xvfb \ --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ --with-pic \ --disable-xorgcfg \ @@ -174,9 +175,12 @@ --disable-xevie \ --disable-dri \ --enable-glx \ + --disable-config-dbus \ + --disable-config-hal \ --with-mesa-source=%{_datadir}/mesa/source make %{?_smp_mflags} +popd %install rm -rf $RPM_BUILD_ROOT @@ -201,9 +205,6 @@ make install DESTDIR=$RPM_BUILD_ROOT cd ../../../ -mkdir -p $RPM_BUILD_ROOT%{_datadir}/vnc/classes -cp -a ../vnc-%{java_vnc_version}-javasrc/java/{index.vnc,logo150x150.gif,vncviewer.jar} $RPM_BUILD_ROOT%{_datadir}/vnc/classes - mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d install -m755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vncserver @@ -258,7 +259,7 @@ --add-category Application \ vncviewer.desktop -# removing unwanted files +# remove unwanted files rm -f $RPM_BUILD_ROOT%{_libdir}/librfb.a rm -f $RPM_BUILD_ROOT%{_libdir}/librfb.la rm -f $RPM_BUILD_ROOT%{_libdir}/librfb.so @@ -313,7 +314,6 @@ %{_bindir}/vncconfig %{_bindir}/vncserver %{_bindir}/x0vncserver -%{_datadir}/vnc %{_mandir}/man1/Xvnc.1* %{_mandir}/man1/vncpasswd.1* %{_mandir}/man1/vncconfig.1* @@ -326,6 +326,16 @@ %{_libdir}/librfb.so.* %changelog +* Mon Mar 11 2008 Adam Tkac 4.1.2-25.3 +- BuildRequires and Requires cleanup +- don't build java viewer (problems due new gcj) +- use xorg codebase from xorg-x11-server-source package again + - vnc-selection.patch - new xserver selection API/ABI + - vnc-xkb.patch - disable XKEYBOARD extension + - vnc-paint.patch - PaintWindow{Background,Border} hooks have been removed + - vnc-privates.patch - update devPrivates handling + - vnc-mieq.patch - use event queue to handle input events + * Mon Feb 18 2008 Fedora Release Engineering - 4.1.2-25 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 12:54:17 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Tue, 11 Mar 2008 12:54:17 GMT Subject: rpms/vnc/devel Makefile.am,NONE,1.1 Message-ID: <200803111254.m2BCsHqc018184@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18164 Added Files: Makefile.am Log Message: - added Makefile.am for Xvnc --- NEW FILE Makefile.am --- # Define includes and libraries LIB_DIR=$(top_srcdir)/../../common BIN_DIR=$(top_srcdir)/.. RFB_LIBS=$(LIB_DIR)/rfb/librfb.la noinst_LTLIBRARIES = libvnccommon.la libvnccommon_la_SOURCES = \ vncExtInit.cc vncHooks.cc XserverDesktop.cc libvnccommon_la_CPPFLAGS = \ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \ -I/usr/include/X11 -Iinclude -I$(top_srcdir) \ -I$(LIB_DIR) -I$(BIN_DIR)/vncconfig \ -DGC_HAS_COMPOSITE_CLIP bin_PROGRAMS = Xvnc Xvnc_SOURCES = \ xvnc.cc $(top_srcdir)/Xext/dpmsstubs.c $(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/mi/miinitext.c $(top_srcdir)/fb/fbcmap_mi.c nodist_Xvnc_SOURCES = \ fbrop.h fb.h pixman.h Xvnc_CPPFLAGS = \ -DHAVE_DIX_CONFIG_H -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS -DXFree86Server \ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \ -I$(LIB_DIR) \ -I$(top_srcdir)/include -I/usr/include/X11 -I$(top_srcdir)/mi \ -I$(top_srcdir)/render -I$(top_srcdir)/Xext Xvnc_LDADD = \ $(top_srcdir)/Xext/libXext.la $(top_srcdir)/dix/libdix.la \ $(top_srcdir)/config/libconfig.a $(top_srcdir)/Xi/libXi.la \ $(top_srcdir)/xkb/libxkb.la $(top_srcdir)/xkb/libxkbstubs.la \ $(top_srcdir)/record/librecord.la $(top_srcdir)/GL/glx/libglx.la \ $(top_srcdir)/GL/mesa/libGLcore.la $(top_srcdir)/dbe/libdbe.la \ $(top_srcdir)/damageext/libdamageext.la $(top_srcdir)/fb/libfb.la \ $(top_srcdir)/miext/damage/libdamage.la $(top_srcdir)/mi/libmi.la \ $(top_srcdir)/xfixes/libxfixes.la $(top_srcdir)/XTrap/libxtrap.la \ $(top_srcdir)/randr/librandr.la $(top_srcdir)/render/librender.la \ $(top_srcdir)/os/libos.la libvnccommon.la $(RFB_LIBS) \ -lXfont -lX11 -lpixman-1 -lcrypto -lselinux libvnc_la_LTLIBRARIES = libvnc.la libvnc_ladir = $(moduledir)/extensions libvnc_la_SOURCES = \ xf86vncModule.cc libvnc_la_CPPFLAGS = \ $(RFB_INCS) \ -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support/bus \ -DXFree86Module -DXFree86LOADER -DIN_MODULE libvnc_la_CXXFLAGS = \ $(COMPILER_FLAGS) libvnc_la_LDFLAGS = \ -module -avoid-version libvnc_la_LIBADD = \ libvnccommon.la $(RFB_LIBS) # C++ hacks BUILT_SOURCES = \ $(nodist_Xvnc_SOURCES) fb.h: $(top_srcdir)/fb/fb.h cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h pixman.h: $(includedir)/pixman-1/pixman.h cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h fbrop.h: $(top_srcdir)/fb/fbrop.h cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h From fedora-extras-commits at redhat.com Tue Mar 11 12:55:07 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Tue, 11 Mar 2008 12:55:07 GMT Subject: rpms/vnc/devel vnc-xorg.patch,NONE,1.1 Message-ID: <200803111255.m2BCt7Yr018229@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18216 Added Files: vnc-xorg.patch Log Message: - added vnc-xorg.patch vnc-xorg.patch: --- NEW FILE vnc-xorg.patch --- diff -up xorg-x11-server-source/os/WaitFor.c.orig xorg/os/WaitFor.c --- xorg-x11-server-source/os/WaitFor.c.orig 2008-01-28 10:20:35.000000000 +0100 +++ xorg-x11-server-source/os/WaitFor.c 2008-01-28 10:21:08.000000000 +0100 @@ -332,13 +332,11 @@ WaitForSomething(int *pClientsReady) if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable)) break; -#ifdef WIN32 /* Windows keyboard and mouse events are added to the input queue in Block- and WakupHandlers. There is no device to check if data is ready. So check here if new input is available */ if (*checkForInput[0] != *checkForInput[1]) return 0; -#endif } } diff -up xorg-x11-server-source/mi/miinitext.c.orig xorg/mi/miinitext.c --- xorg-x11-server-source/mi/miinitext.c.orig 2008-01-28 10:18:46.000000000 +0100 +++ xorg-x11-server-source/mi/miinitext.c 2008-01-28 10:18:58.000000000 +0100 @@ -289,6 +289,7 @@ extern void BigReqExtensionInit(INITARGS #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); #endif +extern void vncExtensionInit(INITARGS); #ifdef XIDLE extern void XIdleExtensionInit(INITARGS); #endif @@ -560,6 +561,7 @@ InitExtensions(argc, argv) #ifdef MITMISC if (!noMITMiscExtension) MITMiscExtensionInit(); #endif + vncExtensionInit(); #ifdef XIDLE if (!noXIdleExtension) XIdleExtensionInit(); #endif diff -up xorg-x11-server-source/hw/Makefile.am.orig xorg/hw/Makefile.am --- xorg-x11-server-source/hw/Makefile.am.orig 2008-01-28 10:18:46.000000000 +0100 +++ xorg-x11-server-source/hw/Makefile.am 2008-01-28 10:18:58.000000000 +0100 @@ -43,7 +43,8 @@ SUBDIRS = \ $(DMX_SUBDIRS) \ $(KDRIVE_SUBDIRS) \ $(XQUARTZ_SUBDIRS) \ - $(XPRINT_SUBDIRS) + $(XPRINT_SUBDIRS) \ + vnc DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint diff -up xorg-x11-server-source/configure.ac.orig xorg/configure.ac --- xorg-x11-server-source/configure.ac.orig 2008-01-28 10:18:45.000000000 +0100 +++ xorg-x11-server-source/configure.ac 2008-01-28 10:18:58.000000000 +0100 @@ -29,7 +29,6 @@ AC_PREREQ(2.57) AC_INIT([xorg-server], 1.4.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) -AM_MAINTAINER_MODE dnl this gets generated by autoheader, and thus contains all the defines. we dnl don't ever actually use it, internally. @@ -2173,6 +2172,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile +hw/vnc/Makefile hw/xgl/Makefile hw/xgl/egl/Makefile hw/xgl/egl/module/Makefile From fedora-extras-commits at redhat.com Tue Mar 11 13:03:39 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Tue, 11 Mar 2008 13:03:39 GMT Subject: devel/vim template.spec, NONE, 1.1 vim.spec, 1.198, 1.199 vimrc, 1.18, 1.19 Message-ID: <200803111303.m2BD3dfH025556@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25527 Modified Files: vim.spec vimrc Added Files: template.spec Log Message: - add spec file template --- NEW FILE template.spec --- Name: Version: Release: 1%{?dist} Summary: Group: License: URL: Source0: BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: Requires: %description %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %changelog Index: vim.spec =================================================================== RCS file: /cvs/extras/devel/vim/vim.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- vim.spec 11 Mar 2008 12:49:59 -0000 1.198 +++ vim.spec 11 Mar 2008 13:03:02 -0000 1.199 @@ -42,6 +42,7 @@ %if %{withvimspell} Source13: vim-spell-files.tar.bz2 %endif +Source14: template.spec Patch2002: vim-7.0-fixkeys.patch Patch2003: vim-6.2-specsyntax.patch @@ -826,6 +827,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/after cp -f %{SOURCE11} . +cp -f %{SOURCE14} $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/ cp runtime/doc/uganda.txt LICENSE @@ -982,6 +984,7 @@ %dir %{_datadir}/%{name}/%{vimdir} %dir %{_datadir}/%{name}/vimfiles %dir %{_datadir}/%{name}/vimfiles/after +%{_datadir}/%{name}/vimfiles/template.spec %{_datadir}/%{name}/%{vimdir}/autoload %{_datadir}/%{name}/%{vimdir}/colors %{_datadir}/%{name}/%{vimdir}/compiler @@ -1135,6 +1138,7 @@ * Tue Mar 11 2008 Karsten Hopp 7.1.270-1 - patchlevel 270 - don't write swapfile on most common locations for USB-sticks (#436752) +- add spec file template * Mon Mar 10 2008 Tom "spot" Callaway 7.1.269-2 - BR: ExtUtils::Embed to find perl headers Index: vimrc =================================================================== RCS file: /cvs/extras/devel/vim/vimrc,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- vimrc 11 Mar 2008 12:49:59 -0000 1.18 +++ vimrc 11 Mar 2008 13:03:02 -0000 1.19 @@ -22,6 +22,8 @@ \ endif " don't write swapfile on most commonly used directories for NFS mounts or USB sticks autocmd BufNewFile,BufReadPre /media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp + " start with spec file template + autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec endif if has("cscope") && filereadable("/usr/bin/cscope") From fedora-extras-commits at redhat.com Tue Mar 11 13:06:36 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Tue, 11 Mar 2008 13:06:36 GMT Subject: devel/vim spec-template, NONE, 1.1 vim.spec, 1.199, 1.200 template.spec, 1.1, NONE Message-ID: <200803111306.m2BD6a6i025670@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25633 Modified Files: vim.spec Added Files: spec-template Removed Files: template.spec Log Message: - dumb makefile tries to parse every file with .spec suffix, rename it --- NEW FILE spec-template --- Name: Version: Release: 1%{?dist} Summary: Group: License: URL: Source0: BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: Requires: %description %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %changelog Index: vim.spec =================================================================== RCS file: /cvs/extras/devel/vim/vim.spec,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- vim.spec 11 Mar 2008 13:03:02 -0000 1.199 +++ vim.spec 11 Mar 2008 13:06:03 -0000 1.200 @@ -42,7 +42,7 @@ %if %{withvimspell} Source13: vim-spell-files.tar.bz2 %endif -Source14: template.spec +Source14: spec-template Patch2002: vim-7.0-fixkeys.patch Patch2003: vim-6.2-specsyntax.patch --- template.spec DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 13:05:50 2008 From: fedora-extras-commits at redhat.com (Ralf Corsepius (rc040203)) Date: Tue, 11 Mar 2008 14:05:50 +0100 Subject: rpms/perl-Net-Amazon-EC2/devel perl-Net-Amazon-EC2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <200803101704.m2AH4QVL001126@cvs-int.fedora.redhat.com> References: <200803101704.m2AH4QVL001126@cvs-int.fedora.redhat.com> Message-ID: <1205240750.3485.25.camel@beck.corsepiu.local> On Mon, 2008-03-10 at 17:04 +0000, Robert H. Rati wrote: > Author: rrati > > Update of /cvs/pkgs/rpms/perl-Net-Amazon-EC2/devel > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1100/devel > > Modified Files: > .cvsignore sources > Added Files: > perl-Net-Amazon-EC2.spec > Log Message: > Initial packaging. > > > > --- NEW FILE perl-Net-Amazon-EC2.spec --- > Summary: Perl interface to the Amazon Elastic Compute Cloud (EC2) > Name: perl-Net-Amazon-EC2 > Version: 0.06 > Release: 1%{?dist} > License: GPL+ or Artistic > Group: Development/Libraries > URL: http://search.cpan.org/~jkim/Net-Amazon-EC2/ > Source0: http://search.cpan.org/CPAN/authors/id/J/JK/JKIM/Net-Amazon-EC2-%{version}.tar.gz > BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) > > > BuildArch: noarch > BuildRequires: perl > BuildRequires: perl(Digest::HMAC_SHA1) >= 1.01 > BuildRequires: perl(XML::Simple) >= 2.18 > BuildRequires: perl(Moose) >= 0.33 > BuildRequires: perl(Test::More) > BuildRequires: perl(MIME::Base64) > BuildRequires: perl(LWP::UserAgent) > BuildRequires: perl(HTTP::Date) > BuildRequires: perl(URI) > BuildRequires: perl(Params::Validate) > > > Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) > > > %description > This module provides an interface to the Amazon Elastic Compute Cloud (EC2) > > > %prep > %setup -q -n Net-Amazon-EC2-%{version} > > > %build > %{__perl} Makefile.PL INSTALLDIRS=vendor > make %{?_smp_mflags} > > > %install > rm -rf %{buildroot} > make pure_install PERL_INSTALL_ROOT=%{buildroot} > find %{buildroot} -type f -name .packlist -exec rm -f {} ';' > chmod -R u+w %{buildroot}/* > > > %check > make test > > > %clean > rm -rf %{buildroot} > > > %files > %defattr(-,root,root,-) > %doc README > %{perl_vendorlib}/Net/Amazon/EC2.pm > %{perl_vendorlib}/Net/Amazon/EC2/ConfirmProductInstanceResponse.pm > %{perl_vendorlib}/Net/Amazon/EC2/ConsoleOutput.pm > %{perl_vendorlib}/Net/Amazon/EC2/DescribeImageAttribute.pm > %{perl_vendorlib}/Net/Amazon/EC2/DescribeImagesResponse.pm > %{perl_vendorlib}/Net/Amazon/EC2/DescribeKeyPairsResponse.pm > %{perl_vendorlib}/Net/Amazon/EC2/Error.pm > %{perl_vendorlib}/Net/Amazon/EC2/Errors.pm > %{perl_vendorlib}/Net/Amazon/EC2/GroupSet.pm > %{perl_vendorlib}/Net/Amazon/EC2/InstanceState.pm > %{perl_vendorlib}/Net/Amazon/EC2/IpPermission.pm > %{perl_vendorlib}/Net/Amazon/EC2/IpRange.pm > %{perl_vendorlib}/Net/Amazon/EC2/KeyPair.pm > %{perl_vendorlib}/Net/Amazon/EC2/LaunchPermission.pm > %{perl_vendorlib}/Net/Amazon/EC2/LaunchPermissionOperation.pm > %{perl_vendorlib}/Net/Amazon/EC2/ProductCode.pm > %{perl_vendorlib}/Net/Amazon/EC2/ProductInstanceResponse.pm > %{perl_vendorlib}/Net/Amazon/EC2/ReservationInfo.pm > %{perl_vendorlib}/Net/Amazon/EC2/RunInstance.pm > %{perl_vendorlib}/Net/Amazon/EC2/RunningInstances.pm > %{perl_vendorlib}/Net/Amazon/EC2/SecurityGroup.pm > %{perl_vendorlib}/Net/Amazon/EC2/TerminateInstancesResponse.pm > %{perl_vendorlib}/Net/Amazon/EC2/UserData.pm > %{perl_vendorlib}/Net/Amazon/EC2/UserIdGroupPair.pm > %{_mandir}/man3/Net::Amazon::EC2.3pm.gz This package is broken. It must own %{perl_vendorlib}/Net and all files + directories underneath Ralf From fedora-extras-commits at redhat.com Tue Mar 11 13:06:52 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 11 Mar 2008 13:06:52 GMT Subject: rpms/ppracer/F-8 dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE PPRacer-0.1.9-ia64.patch, 1.1, NONE branch, 1.1, NONE ppracer-0.3.1-c++.patch, 1.1, NONE ppracer-0.3.1-lib64.patch, 1.1, NONE ppracer.desktop, 1.5, NONE ppracer.png, 1.1, NONE ppracer.spec, 1.22, NONE sources, 1.2, NONE tree.png, 1.1, NONE Message-ID: <200803111306.m2BD6qth025715@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/ppracer/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25669 Added Files: dead.package Removed Files: .cvsignore Makefile PPRacer-0.1.9-ia64.patch branch ppracer-0.3.1-c++.patch ppracer-0.3.1-lib64.patch ppracer.desktop ppracer.png ppracer.spec sources tree.png Log Message: Succeeded by extremetuxracer. --- NEW FILE dead.package --- Succeeded by extremetuxracer. --- .cvsignore DELETED --- --- Makefile DELETED --- --- PPRacer-0.1.9-ia64.patch DELETED --- --- branch DELETED --- --- ppracer-0.3.1-c++.patch DELETED --- --- ppracer-0.3.1-lib64.patch DELETED --- --- ppracer.desktop DELETED --- --- ppracer.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 13:06:56 2008 From: fedora-extras-commits at redhat.com (Ralf Corsepius (rc040203)) Date: Tue, 11 Mar 2008 14:06:56 +0100 Subject: rpms/perl-LWP-UserAgent-Determined/devel perl-LWP-UserAgent-Determined.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <200803101804.m2AI4NFU010325@cvs-int.fedora.redhat.com> References: <200803101804.m2AI4NFU010325@cvs-int.fedora.redhat.com> Message-ID: <1205240816.3485.27.camel@beck.corsepiu.local> On Mon, 2008-03-10 at 18:04 +0000, Robert H. Rati wrote: > Author: rrati > > Update of /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10302/devel > > Modified Files: > .cvsignore sources > Added Files: > perl-LWP-UserAgent-Determined.spec > Log Message: > Initial Packaging > > > > --- NEW FILE perl-LWP-UserAgent-Determined.spec --- > Summary: A virtual browser that retries errors > Name: perl-LWP-UserAgent-Determined > Version: 1.03 > Release: 1%{?dist} > License: GPL+ or Artistic > Group: Development/Libraries > URL: http://search.cpan.org/dist/%{pkg_name}/ > Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/LWP-UserAgent-Determined-%{version}.tar.gz > BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) > > BuildArch: noarch > BuildRequires: perl(ExtUtils::MakeMaker) > BuildRequires: perl(LWP::UserAgent) > > > %description > This class works just like LWP::UserAgent (and is based on it, by being a > subclass of it), except that when you use it to get a web page but run into > a possibly-temporary error (like a DNS lookup timeout), it'll wait a few > seconds and retry a few times. > > > %prep > %setup -q -n LWP-UserAgent-Determined-%{version} > > > %build > %{__perl} Makefile.PL INSTALLDIRS=vendor > make %{?_smp_mflags} > > > %install > rm -rf %{buildroot} > make pure_install PERL_INSTALL_ROOT=%{buildroot} > find %{buildroot} -type f -name .packlist -exec rm -f {} ';' > chmod -R u+w %{buildroot}/* > > > %check > make test > > > %clean > rm -rf $RPM_BUILD_ROOT > > > %files > %defattr(-,root,root,-) > %doc ChangeLog README > %{perl_vendorlib}/LWP/UserAgent/Determined.pm > %{_mandir}/man3/LWP::UserAgent::Determined.3pm.gz Another broken package: This package must own %{perl_vendorlib}/LWP/ and all files+directories underneath Ralf From fedora-extras-commits at redhat.com Tue Mar 11 13:07:39 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 11 Mar 2008 13:07:39 GMT Subject: rpms/ppracer/F-7 dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE PPRacer-0.1.9-ia64.patch, 1.1, NONE branch, 1.1, NONE ppracer-0.3.1-c++.patch, 1.1, NONE ppracer-0.3.1-lib64.patch, 1.1, NONE ppracer.desktop, 1.5, NONE ppracer.png, 1.1, NONE ppracer.spec, 1.19, NONE sources, 1.2, NONE tree.png, 1.1, NONE Message-ID: <200803111307.m2BD7dOI025779@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/ppracer/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25770 Added Files: dead.package Removed Files: .cvsignore Makefile PPRacer-0.1.9-ia64.patch branch ppracer-0.3.1-c++.patch ppracer-0.3.1-lib64.patch ppracer.desktop ppracer.png ppracer.spec sources tree.png Log Message: Succeeded by extremetuxracer. --- NEW FILE dead.package --- Succeeded by extremetuxracer. --- .cvsignore DELETED --- --- Makefile DELETED --- --- PPRacer-0.1.9-ia64.patch DELETED --- --- branch DELETED --- --- ppracer-0.3.1-c++.patch DELETED --- --- ppracer-0.3.1-lib64.patch DELETED --- --- ppracer.desktop DELETED --- --- ppracer.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 13:08:34 2008 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 11 Mar 2008 13:08:34 GMT Subject: rpms/im-chooser/devel .cvsignore, 1.19, 1.20 im-chooser.spec, 1.32, 1.33 sources, 1.18, 1.19 Message-ID: <200803111308.m2BD8Y5w025879@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/im-chooser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25809 Modified Files: .cvsignore im-chooser.spec sources Log Message: * Tue Mar 11 2008 Akira TAGOH - 0.99.4-1 - New upstream release. - Compress im-chooser.png icon. (#330441) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 20 Feb 2008 05:19:00 -0000 1.19 +++ .cvsignore 11 Mar 2008 13:07:58 -0000 1.20 @@ -19,3 +19,4 @@ im-chooser-0.99.1.tar.gz im-chooser-0.99.2.tar.gz im-chooser-0.99.3.tar.gz +im-chooser-0.99.4.tar.gz Index: im-chooser.spec =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- im-chooser.spec 21 Feb 2008 01:54:40 -0000 1.32 +++ im-chooser.spec 11 Mar 2008 13:07:58 -0000 1.33 @@ -1,5 +1,5 @@ Name: im-chooser -Version: 0.99.3 +Version: 0.99.4 Release: 1%{?dist} License: GPLv2+ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,8 +32,6 @@ %package -n imsettings-libs Summary: Libraries for imsettings Group: Development/Libraries -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig %description -n imsettings-libs imsettings is a framework to deal with IM configuration through D-Bus. @@ -68,6 +66,8 @@ $RPM_BUILD_ROOT%{_datadir}/applications/im-chooser.desktop rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service +rm -f $RPM_BUILD_ROOT%{_libexecdir}/qt-im-settings-daemon %find_lang %{name} @@ -122,6 +122,10 @@ %{_libdir}/pkgconfig/imsettings.pc %changelog +* Tue Mar 11 2008 Akira TAGOH - 0.99.4-1 +- New upstream release. + - Compress im-chooser.png icon. (#330441) + * Thu Feb 21 2008 Akira TAGOH - Run ldconfig on scriptlet of imsettings-libs. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 20 Feb 2008 05:19:00 -0000 1.18 +++ sources 11 Mar 2008 13:07:58 -0000 1.19 @@ -1 +1 @@ -0ad69c3a8f324a2ce37e15069cb2f5a9 im-chooser-0.99.3.tar.gz +67b396d6c1470e7459ea26fabcd3c7cf im-chooser-0.99.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 13:09:00 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Tue, 11 Mar 2008 13:09:00 GMT Subject: rpms/rsyslog/F-8 rsyslog-2.0.2-omfile.patch, NONE, 1.1 rsyslog.spec, 1.25, 1.26 Message-ID: <200803111309.m2BD9002025923@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/rsyslog/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25843 Modified Files: rsyslog.spec Added Files: rsyslog-2.0.2-omfile.patch Log Message: fix config file parsing (#436722) rsyslog-2.0.2-omfile.patch: --- NEW FILE rsyslog-2.0.2-omfile.patch --- diff -up rsyslog-2.0.2/omfile.c.orig rsyslog-2.0.2/omfile.c --- rsyslog-2.0.2/omfile.c.orig 2008-03-10 16:51:01.000000000 +0100 +++ rsyslog-2.0.2/omfile.c 2008-03-10 18:16:24.000000000 +0100 @@ -344,7 +344,8 @@ static void dynaFileFreeCache(instanceDa dynaFileDelCacheEntry(pData->dynCache, i, 1); } - free(pData->dynCache); + if(pData->dynCache != NULL) + free(pData->dynCache); } @@ -605,7 +606,7 @@ BEGINfreeInstance CODESTARTfreeInstance if(pData->bDynamicName) { dynaFileFreeCache(pData); - } else + } else if(pData->fd != -1) close(pData->fd); ENDfreeInstance diff -up rsyslog-2.0.2/syslogd.c.orig rsyslog-2.0.2/syslogd.c --- rsyslog-2.0.2/syslogd.c.orig 2008-03-10 18:10:59.000000000 +0100 +++ rsyslog-2.0.2/syslogd.c 2008-03-10 18:11:11.000000000 +0100 @@ -5220,6 +5220,7 @@ static rsRetVal cflineDoAction(uchar **p /* loop through all modules and see if one picks up the line */ pMod = omodGetNxt(NULL); while(pMod != NULL) { + pOMSR = NULL; iRet = pMod->mod.om.parseSelectorAct(p, &pModData, &pOMSR); dbgprintf("tried selector action for %s: %d\n", modGetName(pMod), iRet); if(iRet == RS_RET_OK || iRet == RS_RET_SUSPENDED) { diff -up rsyslog-2.0.2/module-template.h.orig rsyslog-2.0.2/module-template.h --- rsyslog-2.0.2/module-template.h.orig 2008-03-10 18:39:45.000000000 +0100 +++ rsyslog-2.0.2/module-template.h 2008-03-10 18:45:24.000000000 +0100 @@ -260,7 +260,7 @@ finalize_it:\ *ppOMSR = NULL;\ }\ if(pData != NULL)\ - freeInstance(&pData);\ + freeInstance(pData);\ } #define ENDparseSelectorAct \ Index: rsyslog.spec =================================================================== RCS file: /cvs/extras/rpms/rsyslog/F-8/rsyslog.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- rsyslog.spec 18 Feb 2008 12:34:15 -0000 1.25 +++ rsyslog.spec 11 Mar 2008 13:08:23 -0000 1.26 @@ -3,13 +3,14 @@ Summary: Enhanced system logging and kernel message trapping daemons Name: rsyslog Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.rsyslog.com/ Source0: http://download.rsyslog.com/rsyslog/%{name}-%{version}.tar.gz Source1: rsyslog.init Source2: rsyslog.sysconfig +Patch1: rsyslog-2.0.2-omfile.patch BuildRequires: zlib-devel BuildRequires: autoconf automake libtool Requires: logrotate >= 3.5.2 @@ -54,6 +55,7 @@ %prep %setup -q +%patch1 -p1 -b .omfile %build %configure --sbindir=%{sbindir} --disable-static --enable-mysql --enable-pgsql @@ -131,6 +133,9 @@ %{_libdir}/rsyslog/ompgsql.so %changelog +* Tue Mar 11 2008 Peter Vrabec 2.0.2-3 +- fix config file parsing (#436722) + * Mon Feb 18 2008 Peter Vrabec 2.0.2-2 - include createDB.sql in PostgresSQL plugin From fedora-extras-commits at redhat.com Tue Mar 11 13:13:52 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 11 Mar 2008 13:13:52 GMT Subject: comps comps-f7.xml.in, 1.321, 1.322 comps-f8.xml.in, 1.234, 1.235 comps-f9.xml.in, 1.303, 1.304 Message-ID: <200803111313.m2BDDqj5026073@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26039 Modified Files: comps-f7.xml.in comps-f8.xml.in comps-f9.xml.in Log Message: PPRacer was succeeded by Extreme Tuxracer. Index: comps-f7.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f7.xml.in,v retrieving revision 1.321 retrieving revision 1.322 diff -u -r1.321 -r1.322 --- comps-f7.xml.in 8 Mar 2008 19:20:13 -0000 1.321 +++ comps-f7.xml.in 11 Mar 2008 13:13:22 -0000 1.322 @@ -1384,6 +1384,7 @@ egoboo enigma escape + extremetuxracer fbg fillets-ng flight-of-the-amazon-queen @@ -1464,7 +1465,6 @@ poker2d poker3d powermanga - ppracer prboom professor-is-missing pychess Index: comps-f8.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f8.xml.in,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- comps-f8.xml.in 8 Mar 2008 19:20:13 -0000 1.234 +++ comps-f8.xml.in 11 Mar 2008 13:13:22 -0000 1.235 @@ -1493,6 +1493,7 @@ egoboo enigma escape + extremetuxracer fbg fillets-ng flight-of-the-amazon-queen @@ -1578,7 +1579,6 @@ poker2d poker3d powermanga - ppracer prboom professor-is-missing pychess Index: comps-f9.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- comps-f9.xml.in 11 Mar 2008 10:18:15 -0000 1.303 +++ comps-f9.xml.in 11 Mar 2008 13:13:22 -0000 1.304 @@ -1504,6 +1504,7 @@ egoboo enigma escape + extremetuxracer fbg fillets-ng flight-of-the-amazon-queen @@ -1589,7 +1590,6 @@ poker2d poker3d powermanga - ppracer prboom professor-is-missing pychess From fedora-extras-commits at redhat.com Tue Mar 11 13:18:52 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Tue, 11 Mar 2008 13:18:52 GMT Subject: rpms/qt/devel qt.spec, 1.159, 1.160 0076-fix-qprocess.diff, 1.3, NONE 0081-format-string-fixes.diff, 1.1, NONE Message-ID: <200803111318.m2BDIqmd026187@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26144 Modified Files: qt.spec Removed Files: 0076-fix-qprocess.diff 0081-format-string-fixes.diff Log Message: - 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h - remove 0076-fix-qprocess.diff 0081-format-string-fixes.diff, both already included in new release Index: qt.spec =================================================================== RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- qt.spec 11 Mar 2008 11:29:25 -0000 1.159 +++ qt.spec 11 Mar 2008 13:18:15 -0000 1.160 @@ -1,7 +1,7 @@ Summary: The shared library for the Qt GUI toolkit. Name: qt Version: 3.3.8b -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries @@ -52,10 +52,8 @@ Patch102: 0048-qclipboard_hack_80072.patch Patch103: 0056-khotkeys_input_84434.patch patch105: 0073-xinerama-aware-qpopup.patch -patch106: 0076-fix-qprocess.diff Patch107: 0079-compositing-types.patch Patch108: 0080-net-wm-sync-request-2.patch -Patch109: 0081-format-string-fixes.diff Patch110: 0084-compositing-properties.patch Patch111: 0088-fix-xinput-clash.diff @@ -296,10 +294,8 @@ %patch102 -p0 -b .0048-qclipboard_hack_80072 %patch103 -p0 -b .0056-khotkeys_input_84434 %patch105 -p0 -b .0073-xinerama-aware-qpopup -%patch106 -p0 -b .0076-fix-qprocess.diff %patch107 -p0 -b .0079-compositing-types %patch108 -p0 -b .0080-net-wm-sync-request -%patch109 -p0 -b .0081-format-string-fixes %patch110 -p0 -b .0084-compositing-properties %patch111 -p0 -b .0088-fix-xinput-clash @@ -580,11 +576,11 @@ %changelog +* Tue Mar 11 2008 Than Ngo 3.3.8b-7 +- 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h + * Fri Mar 07 2008 Than Ngo 3.3.8b-6 - move qt.[c]sh in main package (#221000) -- 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h -- 0076-fix-qprocess.diff, fix a regression in QProgress::writeToStdin() -- 0081-format-string-fixes.diff, fix various format string errors on Qt 3.x code base * Mon Feb 18 2008 Kevin Kofler 3.3.8b-5 - fix buildkey for GCC 4.3 (#433235) --- 0076-fix-qprocess.diff DELETED --- --- 0081-format-string-fixes.diff DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 13:21:02 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 13:21:02 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch, NONE, 1.1 openoffice.org.spec, 1.1447, 1.1448 Message-ID: <200803111321.m2BDL2O3026283@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26255 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch Log Message: Resolves: rhbz#435590 add openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch: --- NEW FILE openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch --- Index: source/misc/imagemgr.cxx =================================================================== RCS file: /cvs/util/svtools/source/misc/imagemgr.cxx,v retrieving revision 1.49 diff -u -r1.49 imagemgr.cxx --- openoffice.org.orig/svtools/source/misc/imagemgr.cxx 18 Jul 2007 08:56:21 -0000 1.49 +++ openoffice.org/svtools/source/misc/imagemgr.cxx 11 Mar 2008 12:14:47 -0000 @@ -614,6 +614,17 @@ static ImageList* _pBigOfficeImgList = NULL; static ImageList* _pSmallHCOfficeImgList = NULL; static ImageList* _pBigHCOfficeImgList = NULL; + static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + + //If the style has been changed, throw away our cache of the older images + if (nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle()) + { + delete _pSmallOfficeImgList, _pSmallOfficeImgList = NULL; + delete _pBigOfficeImgList, _pBigOfficeImgList = NULL; + delete _pSmallHCOfficeImgList, _pSmallHCOfficeImgList = NULL; + delete _pBigHCOfficeImgList, _pBigHCOfficeImgList = NULL; + nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + } // #i21242# MT: For B&W we need the HC Image and must transform. // bHiContrast is TRUE for all dark backgrounds, but we need HC Images for HC White also, @@ -682,6 +693,18 @@ static ImageList* _pBigImageList = NULL; static ImageList* _pSmallHCImageList = NULL; static ImageList* _pBigHCImageList = NULL; + static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + + //If the style has been changed, throw away our cache of the older images + if (nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle()) + { + delete _pSmallImageList, _pSmallImageList = NULL; + delete _pBigImageList, _pBigImageList = NULL; + delete _pSmallHCImageList, _pSmallHCImageList = NULL; + delete _pBigHCImageList, _pBigHCImageList = NULL; + nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + } + if ( bBig ) { Index: inc/sfx2/mnuitem.hxx =================================================================== RCS file: /cvs/framework/sfx2/inc/sfx2/mnuitem.hxx,v retrieving revision 1.2 diff -u -r1.2 mnuitem.hxx --- openoffice.org.orig/sfx2/inc/sfx2/mnuitem.hxx 11 Apr 2007 21:23:52 -0000 1.2 +++ openoffice.org/sfx2/inc/sfx2/mnuitem.hxx 11 Mar 2008 13:05:47 -0000 @@ -172,6 +172,7 @@ { PopupMenu* pMenu; BOOL m_bWasHiContrastMode; + ULONG m_nSymbolsStyle; BOOL m_bShowMenuImages; protected: Index: inc/sfx2/tbxctrl.hxx =================================================================== RCS file: /cvs/framework/sfx2/inc/sfx2/tbxctrl.hxx,v retrieving revision 1.2 diff -u -r1.2 tbxctrl.hxx --- openoffice.org.orig/sfx2/inc/sfx2/tbxctrl.hxx 11 Apr 2007 21:31:02 -0000 1.2 +++ openoffice.org/sfx2/inc/sfx2/tbxctrl.hxx 11 Mar 2008 13:05:47 -0000 @@ -419,6 +419,7 @@ BOOL bBigImages; PopupMenu* pMenu; BOOL m_bWasHiContrastMode; + ULONG m_nSymbolsStyle; BOOL m_bShowMenuImages; }; Index: source/menu/mnuitem.cxx =================================================================== RCS file: /cvs/framework/sfx2/source/menu/mnuitem.cxx,v retrieving revision 1.20 diff -u -r1.20 mnuitem.cxx --- openoffice.org.orig/sfx2/source/menu/mnuitem.cxx 27 Jun 2007 23:31:17 -0000 1.20 +++ openoffice.org/sfx2/source/menu/mnuitem.cxx 11 Mar 2008 13:05:48 -0000 @@ -512,6 +512,7 @@ const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); m_bWasHiContrastMode = bIsHiContrastMode; + m_nSymbolsStyle = rSettings.GetSymbolsStyle(); m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); Reference aXMultiServiceFactory(::comphelper::getProcessServiceFactory()); @@ -538,11 +539,14 @@ BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); + BOOL nSymbolsStyle = rSettings.GetSymbolsStyle(); if (( bIsHiContrastMode != m_bWasHiContrastMode ) || - ( bShowMenuImages != m_bShowMenuImages ) ) + ( nSymbolsStyle != m_nSymbolsStyle ) || + ( bShowMenuImages != m_bShowMenuImages )) { m_bWasHiContrastMode = bIsHiContrastMode; + m_nSymbolsStyle = nSymbolsStyle; m_bShowMenuImages = bShowMenuImages; USHORT nCount = pActMenu->GetItemCount(); Index: source/toolbox/tbxitem.cxx =================================================================== RCS file: /cvs/framework/sfx2/source/toolbox/tbxitem.cxx,v retrieving revision 1.67 diff -u -r1.67 tbxitem.cxx --- openoffice.org.orig/sfx2/source/toolbox/tbxitem.cxx 6 Jul 2007 10:17:09 -0000 1.67 +++ openoffice.org/sfx2/source/toolbox/tbxitem.cxx 11 Mar 2008 13:05:49 -0000 @@ -1556,6 +1556,7 @@ // Determine the current background color of the menus const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bWasHiContrastMode = rSettings.GetMenuColor().IsDark(); + m_nSymbolsStyle = rSettings.GetSymbolsStyle(); m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); SetImage( String() ); @@ -1831,12 +1832,15 @@ { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); + ULONG nSymbolsStyle = rSettings.GetSymbolsStyle(); BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); if (( bIsHiContrastMode != m_bWasHiContrastMode ) || - ( bShowMenuImages != m_bShowMenuImages ) ) + ( nSymbolsStyle != m_nSymbolsStyle ) || + ( bShowMenuImages != m_bShowMenuImages)) { m_bWasHiContrastMode = bIsHiContrastMode; + m_nSymbolsStyle = nSymbolsStyle; m_bShowMenuImages = bShowMenuImages; USHORT nCount = pActMenu->GetItemCount(); Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1447 retrieving revision 1.1448 diff -u -r1.1447 -r1.1448 --- openoffice.org.spec 11 Mar 2008 10:29:59 -0000 1.1447 +++ openoffice.org.spec 11 Mar 2008 13:20:11 -0000 1.1448 @@ -145,6 +145,7 @@ Patch72: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch Patch73: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch Patch74: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch +Patch75: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch %define instdir %{_libdir}/openoffice.org @@ -1104,6 +1105,7 @@ %patch72 -p1 -b .oooXXXXX.psprint.debugcups.patch %patch73 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch %patch74 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch +%patch75 -p1 -b .ooo86924.sfx2.iconchanges.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2874,8 +2876,9 @@ %changelog -* Mon Mar 10 2008 Caolan McNamara - 1:2.4.0-10.2 +* Tue Mar 11 2008 Caolan McNamara - 1:2.4.0-10.2 - Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch +- Resolves: rhbz#435590 add openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch * Sun Mar 09 2008 Caolan McNamara - 1:2.4.0-10.1 - next release candidate From fedora-extras-commits at redhat.com Tue Mar 11 13:23:38 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 13:23:38 GMT Subject: rpms/openoffice.org/F-8 openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch, NONE, 1.1 openoffice.org.spec, 1.1350, 1.1351 Message-ID: <200803111323.m2BDNchF026450@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26425 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch Log Message: Resolves: rhbz#435590 add openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch: --- NEW FILE openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch --- Index: source/misc/imagemgr.cxx =================================================================== RCS file: /cvs/util/svtools/source/misc/imagemgr.cxx,v retrieving revision 1.49 diff -u -r1.49 imagemgr.cxx --- openoffice.org.orig/svtools/source/misc/imagemgr.cxx 18 Jul 2007 08:56:21 -0000 1.49 +++ openoffice.org/svtools/source/misc/imagemgr.cxx 11 Mar 2008 12:14:47 -0000 @@ -614,6 +614,17 @@ static ImageList* _pBigOfficeImgList = NULL; static ImageList* _pSmallHCOfficeImgList = NULL; static ImageList* _pBigHCOfficeImgList = NULL; + static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + + //If the style has been changed, throw away our cache of the older images + if (nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle()) + { + delete _pSmallOfficeImgList, _pSmallOfficeImgList = NULL; + delete _pBigOfficeImgList, _pBigOfficeImgList = NULL; + delete _pSmallHCOfficeImgList, _pSmallHCOfficeImgList = NULL; + delete _pBigHCOfficeImgList, _pBigHCOfficeImgList = NULL; + nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + } // #i21242# MT: For B&W we need the HC Image and must transform. // bHiContrast is TRUE for all dark backgrounds, but we need HC Images for HC White also, @@ -682,6 +693,18 @@ static ImageList* _pBigImageList = NULL; static ImageList* _pSmallHCImageList = NULL; static ImageList* _pBigHCImageList = NULL; + static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + + //If the style has been changed, throw away our cache of the older images + if (nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle()) + { + delete _pSmallImageList, _pSmallImageList = NULL; + delete _pBigImageList, _pBigImageList = NULL; + delete _pSmallHCImageList, _pSmallHCImageList = NULL; + delete _pBigHCImageList, _pBigHCImageList = NULL; + nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + } + if ( bBig ) { Index: inc/sfx2/mnuitem.hxx =================================================================== RCS file: /cvs/framework/sfx2/inc/sfx2/mnuitem.hxx,v retrieving revision 1.2 diff -u -r1.2 mnuitem.hxx --- openoffice.org.orig/sfx2/inc/sfx2/mnuitem.hxx 11 Apr 2007 21:23:52 -0000 1.2 +++ openoffice.org/sfx2/inc/sfx2/mnuitem.hxx 11 Mar 2008 13:05:47 -0000 @@ -172,6 +172,7 @@ { PopupMenu* pMenu; BOOL m_bWasHiContrastMode; + ULONG m_nSymbolsStyle; BOOL m_bShowMenuImages; protected: Index: inc/sfx2/tbxctrl.hxx =================================================================== RCS file: /cvs/framework/sfx2/inc/sfx2/tbxctrl.hxx,v retrieving revision 1.2 diff -u -r1.2 tbxctrl.hxx --- openoffice.org.orig/sfx2/inc/sfx2/tbxctrl.hxx 11 Apr 2007 21:31:02 -0000 1.2 +++ openoffice.org/sfx2/inc/sfx2/tbxctrl.hxx 11 Mar 2008 13:05:47 -0000 @@ -419,6 +419,7 @@ BOOL bBigImages; PopupMenu* pMenu; BOOL m_bWasHiContrastMode; + ULONG m_nSymbolsStyle; BOOL m_bShowMenuImages; }; Index: source/menu/mnuitem.cxx =================================================================== RCS file: /cvs/framework/sfx2/source/menu/mnuitem.cxx,v retrieving revision 1.20 diff -u -r1.20 mnuitem.cxx --- openoffice.org.orig/sfx2/source/menu/mnuitem.cxx 27 Jun 2007 23:31:17 -0000 1.20 +++ openoffice.org/sfx2/source/menu/mnuitem.cxx 11 Mar 2008 13:05:48 -0000 @@ -512,6 +512,7 @@ const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); m_bWasHiContrastMode = bIsHiContrastMode; + m_nSymbolsStyle = rSettings.GetSymbolsStyle(); m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); Reference aXMultiServiceFactory(::comphelper::getProcessServiceFactory()); @@ -538,11 +539,14 @@ BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); + BOOL nSymbolsStyle = rSettings.GetSymbolsStyle(); if (( bIsHiContrastMode != m_bWasHiContrastMode ) || - ( bShowMenuImages != m_bShowMenuImages ) ) + ( nSymbolsStyle != m_nSymbolsStyle ) || + ( bShowMenuImages != m_bShowMenuImages )) { m_bWasHiContrastMode = bIsHiContrastMode; + m_nSymbolsStyle = nSymbolsStyle; m_bShowMenuImages = bShowMenuImages; USHORT nCount = pActMenu->GetItemCount(); Index: source/toolbox/tbxitem.cxx =================================================================== RCS file: /cvs/framework/sfx2/source/toolbox/tbxitem.cxx,v retrieving revision 1.67 diff -u -r1.67 tbxitem.cxx --- openoffice.org.orig/sfx2/source/toolbox/tbxitem.cxx 6 Jul 2007 10:17:09 -0000 1.67 +++ openoffice.org/sfx2/source/toolbox/tbxitem.cxx 11 Mar 2008 13:05:49 -0000 @@ -1556,6 +1556,7 @@ // Determine the current background color of the menus const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bWasHiContrastMode = rSettings.GetMenuColor().IsDark(); + m_nSymbolsStyle = rSettings.GetSymbolsStyle(); m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); SetImage( String() ); @@ -1831,12 +1832,15 @@ { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); + ULONG nSymbolsStyle = rSettings.GetSymbolsStyle(); BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); if (( bIsHiContrastMode != m_bWasHiContrastMode ) || - ( bShowMenuImages != m_bShowMenuImages ) ) + ( nSymbolsStyle != m_nSymbolsStyle ) || + ( bShowMenuImages != m_bShowMenuImages)) { m_bWasHiContrastMode = bIsHiContrastMode; + m_nSymbolsStyle = nSymbolsStyle; m_bShowMenuImages = bShowMenuImages; USHORT nCount = pActMenu->GetItemCount(); Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v retrieving revision 1.1350 retrieving revision 1.1351 diff -u -r1.1350 -r1.1351 --- openoffice.org.spec 10 Mar 2008 15:46:33 -0000 1.1350 +++ openoffice.org.spec 11 Mar 2008 13:23:05 -0000 1.1351 @@ -169,6 +169,7 @@ Patch87: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch Patch88: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch Patch89: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch +Patch90: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch %define instdir %{_libdir}/openoffice.org @@ -1133,6 +1134,7 @@ %patch87 -p1 -b .ooo83878.unopkg.enablelinking.patch %patch88 -p1 -b .ooo86080.unopkg.bodge.patch %patch89 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch +%patch90 -p1 -b .ooo86924.sfx2.iconchanges.patch %if %{linkopt} chmod a+x solenv/bin/mklinkscript.pl @@ -2855,6 +2857,7 @@ - Resolves: rhbz#431606 require jre not java - Resolves: rhbz#431805 openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch - Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch +- Resolves: rhbz#435590 add openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch - add openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch - add openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch From fedora-extras-commits at redhat.com Tue Mar 11 13:26:00 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Tue, 11 Mar 2008 13:26:00 GMT Subject: rpms/vnc/devel Makefile.am,1.1,1.2 vnc.spec,1.184,1.185 Message-ID: <200803111326.m2BDQ0Tk026518@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26489 Modified Files: Makefile.am vnc.spec Log Message: - fixed building issues (typo in Makefile.am and BuildRequires) Index: Makefile.am =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.am 11 Mar 2008 12:54:15 -0000 1.1 +++ Makefile.am 11 Mar 2008 13:25:25 -0000 1.2 @@ -53,7 +53,7 @@ xf86vncModule.cc libvnc_la_CPPFLAGS = \ - $(RFB_INCS) \ + -I$(LIB_DIR) \ -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support/bus \ Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- vnc.spec 11 Mar 2008 12:50:34 -0000 1.184 +++ vnc.spec 11 Mar 2008 13:25:25 -0000 1.185 @@ -6,11 +6,11 @@ Release: 25.3%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz +Source1: Makefile.am Source2: vncserver.init Source3: vnc-16x16.png Source4: vnc-24x24.png Source5: vnc-48x48.png -Source1: Makefile.am Patch0: vnc-cookie.patch Patch1: vnc-gcc4.patch Patch2: vnc-use-fb.patch @@ -46,7 +46,7 @@ License: GPLv2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: perl +BuildRequires: perl, openssl-devel, libpciaccess-devel BuildRequires: zlib-devel libjpeg-devel BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: autoconf, automake, libtool, flex, bison, pkgconfig, patchutils @@ -89,7 +89,7 @@ Remote framebuffer library which is used by vncviewer and vncserver %prep -%setup -q -n vnc-%{vnc_version}-unixsrc -a1 +%setup -q -n vnc-%{vnc_version}-unixsrc cp -r %{_datadir}/xorg-x11-server-source unix mkdir -p unix/xorg-x11-server-source/hw/vnc cp %{SOURCE1} unix/xorg-x11-server-source/hw/vnc/ From fedora-extras-commits at redhat.com Tue Mar 11 13:28:11 2008 From: fedora-extras-commits at redhat.com (Robert Rati (rrati)) Date: Tue, 11 Mar 2008 08:28:11 -0500 Subject: rpms/perl-LWP-UserAgent-Determined/devel perl-LWP-UserAgent-Determined.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <1205240816.3485.27.camel@beck.corsepiu.local> References: <200803101804.m2AI4NFU010325@cvs-int.fedora.redhat.com> <1205240816.3485.27.camel@beck.corsepiu.local> Message-ID: <47D688EB.5090608@redhat.com> Ralf Corsepius wrote: > On Mon, 2008-03-10 at 18:04 +0000, Robert H. Rati wrote: >> Author: rrati >> >> Update of /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel >> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10302/devel >> >> Modified Files: >> .cvsignore sources >> Added Files: >> perl-LWP-UserAgent-Determined.spec >> Log Message: >> Initial Packaging >> >> >> >> --- NEW FILE perl-LWP-UserAgent-Determined.spec --- >> Summary: A virtual browser that retries errors >> Name: perl-LWP-UserAgent-Determined >> Version: 1.03 >> Release: 1%{?dist} >> License: GPL+ or Artistic >> Group: Development/Libraries >> URL: http://search.cpan.org/dist/%{pkg_name}/ >> Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/LWP-UserAgent-Determined-%{version}.tar.gz >> BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) >> >> BuildArch: noarch >> BuildRequires: perl(ExtUtils::MakeMaker) >> BuildRequires: perl(LWP::UserAgent) >> >> >> %description >> This class works just like LWP::UserAgent (and is based on it, by being a >> subclass of it), except that when you use it to get a web page but run into >> a possibly-temporary error (like a DNS lookup timeout), it'll wait a few >> seconds and retry a few times. >> >> >> %prep >> %setup -q -n LWP-UserAgent-Determined-%{version} >> >> >> %build >> %{__perl} Makefile.PL INSTALLDIRS=vendor >> make %{?_smp_mflags} >> >> >> %install >> rm -rf %{buildroot} >> make pure_install PERL_INSTALL_ROOT=%{buildroot} >> find %{buildroot} -type f -name .packlist -exec rm -f {} ';' >> chmod -R u+w %{buildroot}/* >> >> >> %check >> make test >> >> >> %clean >> rm -rf $RPM_BUILD_ROOT >> >> >> %files >> %defattr(-,root,root,-) >> %doc ChangeLog README >> %{perl_vendorlib}/LWP/UserAgent/Determined.pm >> %{_mandir}/man3/LWP::UserAgent::Determined.3pm.gz > > Another broken package: This package must own > %{perl_vendorlib}/LWP/ and all files+directories underneath > > Ralf The %{perl_vendorlib}/LWP/ directory is already owned by the perl-libwww-perl package. Having this package own that directory and all files below would cause a conflict with the perl-libwww-perl package wouldn't it? Rob From fedora-extras-commits at redhat.com Tue Mar 11 13:28:36 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 13:28:36 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch, NONE, 1.1.2.1 openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch, 1.1.2.1, 1.1.2.2 openoffice.org.spec, 1.1440.2.14, 1.1440.2.15 Message-ID: <200803111328.m2BDSawj026619@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26582 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch openoffice.org.spec Added Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch Log Message: merge openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch: --- NEW FILE openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch --- Index: source/misc/imagemgr.cxx =================================================================== RCS file: /cvs/util/svtools/source/misc/imagemgr.cxx,v retrieving revision 1.49 diff -u -r1.49 imagemgr.cxx --- openoffice.org.orig/svtools/source/misc/imagemgr.cxx 18 Jul 2007 08:56:21 -0000 1.49 +++ openoffice.org/svtools/source/misc/imagemgr.cxx 11 Mar 2008 12:14:47 -0000 @@ -614,6 +614,17 @@ static ImageList* _pBigOfficeImgList = NULL; static ImageList* _pSmallHCOfficeImgList = NULL; static ImageList* _pBigHCOfficeImgList = NULL; + static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + + //If the style has been changed, throw away our cache of the older images + if (nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle()) + { + delete _pSmallOfficeImgList, _pSmallOfficeImgList = NULL; + delete _pBigOfficeImgList, _pBigOfficeImgList = NULL; + delete _pSmallHCOfficeImgList, _pSmallHCOfficeImgList = NULL; + delete _pBigHCOfficeImgList, _pBigHCOfficeImgList = NULL; + nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + } // #i21242# MT: For B&W we need the HC Image and must transform. // bHiContrast is TRUE for all dark backgrounds, but we need HC Images for HC White also, @@ -682,6 +693,18 @@ static ImageList* _pBigImageList = NULL; static ImageList* _pSmallHCImageList = NULL; static ImageList* _pBigHCImageList = NULL; + static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + + //If the style has been changed, throw away our cache of the older images + if (nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle()) + { + delete _pSmallImageList, _pSmallImageList = NULL; + delete _pBigImageList, _pBigImageList = NULL; + delete _pSmallHCImageList, _pSmallHCImageList = NULL; + delete _pBigHCImageList, _pBigHCImageList = NULL; + nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + } + if ( bBig ) { Index: inc/sfx2/mnuitem.hxx =================================================================== RCS file: /cvs/framework/sfx2/inc/sfx2/mnuitem.hxx,v retrieving revision 1.2 diff -u -r1.2 mnuitem.hxx --- openoffice.org.orig/sfx2/inc/sfx2/mnuitem.hxx 11 Apr 2007 21:23:52 -0000 1.2 +++ openoffice.org/sfx2/inc/sfx2/mnuitem.hxx 11 Mar 2008 13:05:47 -0000 @@ -172,6 +172,7 @@ { PopupMenu* pMenu; BOOL m_bWasHiContrastMode; + ULONG m_nSymbolsStyle; BOOL m_bShowMenuImages; protected: Index: inc/sfx2/tbxctrl.hxx =================================================================== RCS file: /cvs/framework/sfx2/inc/sfx2/tbxctrl.hxx,v retrieving revision 1.2 diff -u -r1.2 tbxctrl.hxx --- openoffice.org.orig/sfx2/inc/sfx2/tbxctrl.hxx 11 Apr 2007 21:31:02 -0000 1.2 +++ openoffice.org/sfx2/inc/sfx2/tbxctrl.hxx 11 Mar 2008 13:05:47 -0000 @@ -419,6 +419,7 @@ BOOL bBigImages; PopupMenu* pMenu; BOOL m_bWasHiContrastMode; + ULONG m_nSymbolsStyle; BOOL m_bShowMenuImages; }; Index: source/menu/mnuitem.cxx =================================================================== RCS file: /cvs/framework/sfx2/source/menu/mnuitem.cxx,v retrieving revision 1.20 diff -u -r1.20 mnuitem.cxx --- openoffice.org.orig/sfx2/source/menu/mnuitem.cxx 27 Jun 2007 23:31:17 -0000 1.20 +++ openoffice.org/sfx2/source/menu/mnuitem.cxx 11 Mar 2008 13:05:48 -0000 @@ -512,6 +512,7 @@ const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); m_bWasHiContrastMode = bIsHiContrastMode; + m_nSymbolsStyle = rSettings.GetSymbolsStyle(); m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); Reference aXMultiServiceFactory(::comphelper::getProcessServiceFactory()); @@ -538,11 +539,14 @@ BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); + BOOL nSymbolsStyle = rSettings.GetSymbolsStyle(); if (( bIsHiContrastMode != m_bWasHiContrastMode ) || - ( bShowMenuImages != m_bShowMenuImages ) ) + ( nSymbolsStyle != m_nSymbolsStyle ) || + ( bShowMenuImages != m_bShowMenuImages )) { m_bWasHiContrastMode = bIsHiContrastMode; + m_nSymbolsStyle = nSymbolsStyle; m_bShowMenuImages = bShowMenuImages; USHORT nCount = pActMenu->GetItemCount(); Index: source/toolbox/tbxitem.cxx =================================================================== RCS file: /cvs/framework/sfx2/source/toolbox/tbxitem.cxx,v retrieving revision 1.67 diff -u -r1.67 tbxitem.cxx --- openoffice.org.orig/sfx2/source/toolbox/tbxitem.cxx 6 Jul 2007 10:17:09 -0000 1.67 +++ openoffice.org/sfx2/source/toolbox/tbxitem.cxx 11 Mar 2008 13:05:49 -0000 @@ -1556,6 +1556,7 @@ // Determine the current background color of the menus const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bWasHiContrastMode = rSettings.GetMenuColor().IsDark(); + m_nSymbolsStyle = rSettings.GetSymbolsStyle(); m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); SetImage( String() ); @@ -1831,12 +1832,15 @@ { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); + ULONG nSymbolsStyle = rSettings.GetSymbolsStyle(); BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); if (( bIsHiContrastMode != m_bWasHiContrastMode ) || - ( bShowMenuImages != m_bShowMenuImages ) ) + ( nSymbolsStyle != m_nSymbolsStyle ) || + ( bShowMenuImages != m_bShowMenuImages)) { m_bWasHiContrastMode = bIsHiContrastMode; + m_nSymbolsStyle = nSymbolsStyle; m_bShowMenuImages = bShowMenuImages; USHORT nCount = pActMenu->GetItemCount(); openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch: Index: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch 10 Mar 2008 16:00:23 -0000 1.1.2.1 +++ openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch 11 Mar 2008 13:28:15 -0000 1.1.2.2 @@ -1,97 +1,22 @@ -Index: unx/gtk/window/gtkframe.cxx +Index: salgeom.hxx =================================================================== -RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v -retrieving revision 1.72.8.2 -diff -u -r1.72.8.2 gtkframe.cxx ---- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 23 Jan 2008 17:17:10 -0000 1.72.8.2 -+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 10 Mar 2008 15:32:32 -0000 -@@ -1158,8 +1169,8 @@ +RCS file: /cvs/gsl/vcl/inc/vcl/salgeom.hxx,v +retrieving revision 1.2 +diff -u -r1.2 salgeom.hxx +--- openoffice.org.orig/vcl/inc/vcl/salgeom.hxx 11 Apr 2007 18:06:34 -0000 1.2 ++++ openoffice.org/vcl/inc/vcl/salgeom.hxx 11 Mar 2008 09:44:47 -0000 +@@ -38,11 +38,11 @@ - if( m_pParent ) - { -- nX = ((long)m_pParent->maGeometry.nWidth - (long)maGeometry.nWidth)/2; -- nY = ((long)m_pParent->maGeometry.nHeight - (long)maGeometry.nHeight)/2; -+ nX = ((int)m_pParent->maGeometry.nWidth - (int)maGeometry.nWidth)/2; -+ nY = ((int)m_pParent->maGeometry.nHeight - (int)maGeometry.nHeight)/2; - - } - else -@@ -1191,8 +1202,8 @@ - break; - } - } -- nX = nScreenX + (nScreenWidth - (long)maGeometry.nWidth)/2; -- nY = nScreenY + (nScreenHeight - (long)maGeometry.nHeight)/2; -+ nX = nScreenX + (nScreenWidth - (int)maGeometry.nWidth)/2; -+ nY = nScreenY + (nScreenHeight - (int)maGeometry.nHeight)/2; - } - SetPosSize( nX, nY, 0, 0, SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y ); - } -@@ -1426,25 +1438,25 @@ - Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen ); - if( ! (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) - { -- if( nX < (long)maGeometry.nLeftDecoration ) -+ if( nX < (int)maGeometry.nLeftDecoration ) - nX = maGeometry.nLeftDecoration; -- if( nY < (long)maGeometry.nTopDecoration ) -+ if( nY < (int)maGeometry.nTopDecoration ) - nY = maGeometry.nTopDecoration; -- if( (nX + (long)maGeometry.nWidth + (long)maGeometry.nRightDecoration) > (long)aScreenSize.Width() ) -+ if( (nX + (int)maGeometry.nWidth + (int)maGeometry.nRightDecoration) > aScreenSize.Width() ) - nX = aScreenSize.Width() - maGeometry.nWidth - maGeometry.nRightDecoration; -- if( (nY + (long)maGeometry.nHeight + (long)maGeometry.nBottomDecoration) > (long)aScreenSize.Height() ) -+ if( (nY + (int)maGeometry.nHeight + (int)maGeometry.nBottomDecoration) > aScreenSize.Height() ) - nY = aScreenSize.Height() - maGeometry.nHeight - maGeometry.nBottomDecoration; - } - else - { -- if( nX + (long)maGeometry.nWidth < 10 ) -- nX = 10 - (long)maGeometry.nWidth; -- if( nY + (long)maGeometry.nHeight < 10 ) -- nY = 10 - (long)maGeometry.nHeight; -- if( nX > (long)aScreenSize.Width() - 10 ) -- nX = (long)aScreenSize.Width() - 10; -- if( nY > (long)aScreenSize.Height() - 10 ) -- nY = (long)aScreenSize.Height() - 10; -+ if( nX + (int)maGeometry.nWidth < 10 ) -+ nX = 10 - (int)maGeometry.nWidth; -+ if( nY + (int)maGeometry.nHeight < 10 ) -+ nY = 10 - (int)maGeometry.nHeight; -+ if( nX > aScreenSize.Width() - 10 ) -+ nX = aScreenSize.Width() - 10; -+ if( nY > aScreenSize.Height() - 10 ) -+ nY = aScreenSize.Height() - 10; - } - - if( nX != maGeometry.nX || nY != maGeometry.nY ) -Index: unx/source/window/salframe.cxx -=================================================================== -RCS file: /cvs/gsl/vcl/unx/source/window/salframe.cxx,v -retrieving revision 1.219.110.3 -diff -u -r1.219.110.3 salframe.cxx ---- openoffice.org.orig/vcl/unx/source/window/salframe.cxx 25 Jan 2008 16:37:31 -0000 1.219.110.3 -+++ openoffice.org/unx/source/window/salframe.cxx 10 Mar 2008 15:32:43 -0000 -@@ -1714,14 +1714,14 @@ - } - - // adjust position so that frame fits onto screen -- if( aPosSize.Right()+(long)aGeom.nRightDecoration > aScreenSize.Width()-1 ) -- aPosSize.Move( (long)aScreenSize.Width() - (long)aPosSize.Right() - (long)aGeom.nRightDecoration, 0 ); -- if( aPosSize.Bottom()+(long)aGeom.nBottomDecoration > aScreenSize.Height()-1 ) -- aPosSize.Move( 0, (long)aScreenSize.Height() - (long)aPosSize.Bottom() - (long)aGeom.nBottomDecoration ); -- if( aPosSize.Left() < (long)aGeom.nLeftDecoration ) -- aPosSize.Move( (long)aGeom.nLeftDecoration - (long)aPosSize.Left(), 0 ); -- if( aPosSize.Top() < (long)aGeom.nTopDecoration ) -- aPosSize.Move( 0, (long)aGeom.nTopDecoration - (long)aPosSize.Top() ); -+ if( aPosSize.Right()+(int)aGeom.nRightDecoration > aScreenSize.Width()-1 ) -+ aPosSize.Move( aScreenSize.Width() - aPosSize.Right() - (int)aGeom.nRightDecoration, 0 ); -+ if( aPosSize.Bottom()+(int)aGeom.nBottomDecoration > aScreenSize.Height()-1 ) -+ aPosSize.Move( 0, aScreenSize.Height() - aPosSize.Bottom() - (int)aGeom.nBottomDecoration ); -+ if( aPosSize.Left() < (int)aGeom.nLeftDecoration ) -+ aPosSize.Move( (int)aGeom.nLeftDecoration - aPosSize.Left(), 0 ); -+ if( aPosSize.Top() < (int)aGeom.nTopDecoration ) -+ aPosSize.Move( 0, (int)aGeom.nTopDecoration - aPosSize.Top() ); - } - - // resize with new args + typedef struct _SalFrameGeometry { + // screen position of upper left corner of drawable area in pixel +- int nX, nY; ++ long nX, nY; + // dimensions of the drawable area in pixel +- unsigned int nWidth, nHeight; ++ unsigned long nWidth, nHeight; + // thickness of the decoration in pixel +- unsigned int nLeftDecoration, ++ unsigned long nLeftDecoration, + nTopDecoration, + nRightDecoration, + nBottomDecoration; Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440.2.14 retrieving revision 1.1440.2.15 diff -u -r1.1440.2.14 -r1.1440.2.15 --- openoffice.org.spec 11 Mar 2008 09:18:25 -0000 1.1440.2.14 +++ openoffice.org.spec 11 Mar 2008 13:28:15 -0000 1.1440.2.15 @@ -140,6 +140,7 @@ Patch67: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch Patch68: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch Patch69: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch +Patch70: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch %define instdir %{_libdir}/openoffice.org %define OFFICEUPD 300 @@ -1097,6 +1098,7 @@ %patch67 -p1 -b .ooo86588.sw.buildfix.patch %patch68 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch %patch69 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch +%patch70 -p1 -b .ooo86924.sfx2.iconchanges.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -1565,7 +1567,7 @@ # rhbz#156067 don't version the icons sed -i -e s/$ICONPRODUCTVERSION//g $file # rhbz#156677 remove the version from Name= - sed -i -e s/$LONGICONPRODUCTVERSION//g $file + sed -i -e s/$LONGICONPRODUCTVERSION //g $file done echo "StartupNotify=true" >> base.desktop echo "TryExec=oobase" >> base.desktop @@ -2866,7 +2868,7 @@ %{python_py_sitearch}/unohelper.py* %changelog -* Mon Mar 10 2008 Caolan McNamara - 1:3.0.0-0.1.1 +* Tue Mar 11 2008 Caolan McNamara - 1:3.0.0-0.1.1 - extend selinux bodge to ia64 - drop integrated workspace.notes2.patch - drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch @@ -2878,14 +2880,9 @@ - add workspace.cmcfixes43.patch - add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch -* Mon Mar 10 2008 Caolan McNamara - 1:2.4.0-10.2 +* Tue Mar 11 2008 Caolan McNamara - 1:2.4.0-10.2 - Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch - -* Sun Mar 09 2008 Caolan McNamara - 1:2.4.0-10.1 -- next release candidate -- rhbz#293791 Restore draw back to the menus and revert to upstream app names -- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch -- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch +- Resolves: rhbz#435590 add openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch * Sun Mar 09 2008 Caolan McNamara - 1:2.4.0-10.1 - next release candidate From fedora-extras-commits at redhat.com Tue Mar 11 13:29:03 2008 From: fedora-extras-commits at redhat.com (Robert Rati (rrati)) Date: Tue, 11 Mar 2008 08:29:03 -0500 Subject: rpms/perl-Net-Amazon-EC2/devel perl-Net-Amazon-EC2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <1205240750.3485.25.camel@beck.corsepiu.local> References: <200803101704.m2AH4QVL001126@cvs-int.fedora.redhat.com> <1205240750.3485.25.camel@beck.corsepiu.local> Message-ID: <47D6891F.5040101@redhat.com> Ralf Corsepius wrote: > On Mon, 2008-03-10 at 17:04 +0000, Robert H. Rati wrote: >> Author: rrati >> >> Update of /cvs/pkgs/rpms/perl-Net-Amazon-EC2/devel >> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1100/devel >> >> Modified Files: >> .cvsignore sources >> Added Files: >> perl-Net-Amazon-EC2.spec >> Log Message: >> Initial packaging. >> >> >> >> --- NEW FILE perl-Net-Amazon-EC2.spec --- >> Summary: Perl interface to the Amazon Elastic Compute Cloud (EC2) >> Name: perl-Net-Amazon-EC2 >> Version: 0.06 >> Release: 1%{?dist} >> License: GPL+ or Artistic >> Group: Development/Libraries >> URL: http://search.cpan.org/~jkim/Net-Amazon-EC2/ >> Source0: http://search.cpan.org/CPAN/authors/id/J/JK/JKIM/Net-Amazon-EC2-%{version}.tar.gz >> BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) >> >> >> BuildArch: noarch >> BuildRequires: perl >> BuildRequires: perl(Digest::HMAC_SHA1) >= 1.01 >> BuildRequires: perl(XML::Simple) >= 2.18 >> BuildRequires: perl(Moose) >= 0.33 >> BuildRequires: perl(Test::More) >> BuildRequires: perl(MIME::Base64) >> BuildRequires: perl(LWP::UserAgent) >> BuildRequires: perl(HTTP::Date) >> BuildRequires: perl(URI) >> BuildRequires: perl(Params::Validate) >> >> >> Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) >> >> >> %description >> This module provides an interface to the Amazon Elastic Compute Cloud (EC2) >> >> >> %prep >> %setup -q -n Net-Amazon-EC2-%{version} >> >> >> %build >> %{__perl} Makefile.PL INSTALLDIRS=vendor >> make %{?_smp_mflags} >> >> >> %install >> rm -rf %{buildroot} >> make pure_install PERL_INSTALL_ROOT=%{buildroot} >> find %{buildroot} -type f -name .packlist -exec rm -f {} ';' >> chmod -R u+w %{buildroot}/* >> >> >> %check >> make test >> >> >> %clean >> rm -rf %{buildroot} >> >> >> %files >> %defattr(-,root,root,-) >> %doc README >> %{perl_vendorlib}/Net/Amazon/EC2.pm >> %{perl_vendorlib}/Net/Amazon/EC2/ConfirmProductInstanceResponse.pm >> %{perl_vendorlib}/Net/Amazon/EC2/ConsoleOutput.pm >> %{perl_vendorlib}/Net/Amazon/EC2/DescribeImageAttribute.pm >> %{perl_vendorlib}/Net/Amazon/EC2/DescribeImagesResponse.pm >> %{perl_vendorlib}/Net/Amazon/EC2/DescribeKeyPairsResponse.pm >> %{perl_vendorlib}/Net/Amazon/EC2/Error.pm >> %{perl_vendorlib}/Net/Amazon/EC2/Errors.pm >> %{perl_vendorlib}/Net/Amazon/EC2/GroupSet.pm >> %{perl_vendorlib}/Net/Amazon/EC2/InstanceState.pm >> %{perl_vendorlib}/Net/Amazon/EC2/IpPermission.pm >> %{perl_vendorlib}/Net/Amazon/EC2/IpRange.pm >> %{perl_vendorlib}/Net/Amazon/EC2/KeyPair.pm >> %{perl_vendorlib}/Net/Amazon/EC2/LaunchPermission.pm >> %{perl_vendorlib}/Net/Amazon/EC2/LaunchPermissionOperation.pm >> %{perl_vendorlib}/Net/Amazon/EC2/ProductCode.pm >> %{perl_vendorlib}/Net/Amazon/EC2/ProductInstanceResponse.pm >> %{perl_vendorlib}/Net/Amazon/EC2/ReservationInfo.pm >> %{perl_vendorlib}/Net/Amazon/EC2/RunInstance.pm >> %{perl_vendorlib}/Net/Amazon/EC2/RunningInstances.pm >> %{perl_vendorlib}/Net/Amazon/EC2/SecurityGroup.pm >> %{perl_vendorlib}/Net/Amazon/EC2/TerminateInstancesResponse.pm >> %{perl_vendorlib}/Net/Amazon/EC2/UserData.pm >> %{perl_vendorlib}/Net/Amazon/EC2/UserIdGroupPair.pm >> %{_mandir}/man3/Net::Amazon::EC2.3pm.gz > > This package is broken. It must own %{perl_vendorlib}/Net and all files > + directories underneath > > Ralf Same question as the previous one. The %{perl_vendorlib}/Net/ directory is already owned by the perl-libwww-perl package. Having this package own that directory and all files below would cause a conflict with the perl-libwww-perl package wouldn't it? Rob From fedora-extras-commits at redhat.com Tue Mar 11 13:33:02 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 13:33:02 GMT Subject: rpms/file-roller/devel .cvsignore, 1.66, 1.67 file-roller.spec, 1.116, 1.117 sources, 1.67, 1.68 Message-ID: <200803111333.m2BDX2X7026909@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/file-roller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26702 Modified Files: .cvsignore file-roller.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/.cvsignore,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- .cvsignore 26 Feb 2008 04:10:14 -0000 1.66 +++ .cvsignore 11 Mar 2008 13:31:59 -0000 1.67 @@ -1 +1 @@ -file-roller-2.21.92.tar.bz2 +file-roller-2.22.0.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- file-roller.spec 11 Mar 2008 04:34:40 -0000 1.116 +++ file-roller.spec 11 Mar 2008 13:31:59 -0000 1.117 @@ -10,12 +10,12 @@ Summary: File Roller is a tool for viewing and creating archives Name: file-roller -Version: 2.21.92 -Release: 3%{?dist} +Version: 2.22.0 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://download.gnome.org/sources/file-roller/ -Source: http://download.gnome.org/sources/file-roller/2.21/file-roller-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/file-roller/2.22/file-roller-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=501542 Patch0: file-roller-gio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -129,6 +129,9 @@ %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Tue Mar 11 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Tue Mar 11 2008 Matthias Clasen - 2.21.92-3 - Port nautilus extension to gio Index: sources =================================================================== RCS file: /cvs/extras/rpms/file-roller/devel/sources,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- sources 26 Feb 2008 04:10:14 -0000 1.67 +++ sources 11 Mar 2008 13:31:59 -0000 1.68 @@ -1 +1 @@ -eba1426e09923576da3599ae21e1b2ba file-roller-2.21.92.tar.bz2 +81836da5b75575c45154ad851da699cb file-roller-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 13:36:44 2008 From: fedora-extras-commits at redhat.com (Robert 'Bob' Jensen (bjensen)) Date: Tue, 11 Mar 2008 13:36:44 GMT Subject: rpms/dxcc/devel dxcc.spec,1.1,1.2 Message-ID: <200803111336.m2BDaim0027226@cvs-int.fedora.redhat.com> Author: bjensen Update of /cvs/pkgs/rpms/dxcc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27205 Modified Files: dxcc.spec Log Message: * Tue Feb 26 2008 Robert 'Bob' Jensen - 20080225-4 - Rawhide rebuild Index: dxcc.spec =================================================================== RCS file: /cvs/pkgs/rpms/dxcc/devel/dxcc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dxcc.spec 29 Feb 2008 17:36:20 -0000 1.1 +++ dxcc.spec 11 Mar 2008 13:36:07 -0000 1.2 @@ -1,6 +1,6 @@ Name: dxcc Version: 20080225 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Small utility which determines the ARRL DXCC entity of a ham radio callsign Group: Applications/Communications @@ -78,6 +78,9 @@ %changelog +* Tue Feb 26 2008 Robert 'Bob' Jensen - 20080225-4 +- Rawhide rebuild + * Tue Feb 26 2008 Robert 'Bob' Jensen - 20080225-3 - Submit for review From fedora-extras-commits at redhat.com Tue Mar 11 13:39:41 2008 From: fedora-extras-commits at redhat.com (Ralf Corsepius (rc040203)) Date: Tue, 11 Mar 2008 14:39:41 +0100 Subject: rpms/perl-LWP-UserAgent-Determined/devel perl-LWP-UserAgent-Determined.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <47D688EB.5090608@redhat.com> References: <200803101804.m2AI4NFU010325@cvs-int.fedora.redhat.com> <1205240816.3485.27.camel@beck.corsepiu.local> <47D688EB.5090608@redhat.com> Message-ID: <1205242781.3485.41.camel@beck.corsepiu.local> On Tue, 2008-03-11 at 08:28 -0500, Robert Rati wrote: > Ralf Corsepius wrote: > > On Mon, 2008-03-10 at 18:04 +0000, Robert H. Rati wrote: > >> Author: rrati > >> > >> Update of /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel > >> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10302/devel > >> > >> Modified Files: > >> .cvsignore sources > >> Added Files: > >> perl-LWP-UserAgent-Determined.spec > >> Log Message: > >> Initial Packaging > >> > >> > >> > >> --- NEW FILE perl-LWP-UserAgent-Determined.spec --- > >> Summary: A virtual browser that retries errors > >> Name: perl-LWP-UserAgent-Determined > >> Version: 1.03 > >> Release: 1%{?dist} > >> License: GPL+ or Artistic > >> Group: Development/Libraries > >> URL: http://search.cpan.org/dist/%{pkg_name}/ > >> Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/LWP-UserAgent-Determined-%{version}.tar.gz > >> BuildRoot: %(mktemp -ud %{_tmppath}/ > Rich. > -- > Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones > virt-p2v converts physical machines to virtual machines. Boot with a > live CD or over the network (PXE) and turn machines into Xen guests. > http://et.redhat.com/~rjones/virt-p2v > %{name}-%{version}-%{release}-XXXXXX) > >> > >> BuildArch: noarch > >> BuildRequires: perl(ExtUtils::MakeMaker) > >> BuildRequires: perl(LWP::UserAgent) > >> > >> > >> %description > >> This class works just like LWP::UserAgent (and is based on it, by being a > >> subclass of it), except that when you use it to get a web page but run into > >> a possibly-temporary error (like a DNS lookup timeout), it'll wait a few > >> seconds and retry a few times. > >> > >> > >> %prep > >> %setup -q -n LWP-UserAgent-Determined-%{version} > >> > >> > >> %build > >> %{__perl} Makefile.PL INSTALLDIRS=vendor > >> make %{?_smp_mflags} > >> > >> > >> %install > >> rm -rf %{buildroot} > >> make pure_install PERL_INSTALL_ROOT=%{buildroot} > >> find %{buildroot} -type f -name .packlist -exec rm -f {} ';' > >> chmod -R u+w %{buildroot}/* > >> > >> > >> %check > >> make test > >> > Rich. > -- > Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones > virt-p2v converts physical machines to virtual machines. Boot with a > live CD or over the network (PXE) and turn machines into Xen guests. > http://et.redhat.com/~rjones/virt-p2v > > >> > >> %clean > >> rm -rf $RPM_BUILD_ROOT > >> > >> > >> %files > >> %defattr(-,root,root,-) > >> %doc ChangeLog README > >> %{perl_vendorlib}/LWP/UserAgent/Determined.pm > >> %{_mandir}/man3/LWP::UserAgent::Determined.3pm.gz > > > > Another broken package: This package must own > > %{perl_vendorlib}/LWP/ and all files+directories underneath > > > > Ralf > > The %{perl_vendorlib}/LWP/ directory is already owned by the > perl-libwww-perl package. Having this package own that directory and > all files below would cause a conflict with the perl-libwww-perl package > wouldn't it? No it would not. These packages would share these directories. Without sharing them, 1. In many cases perl packages would not deinstall properly and would leave unowned directories behind after deinstallation. 2. There is no strict hierarchy between perl modules. As a consequence of this sharing ownership on directories has been common standard in all perl-packages in Fedora for many years. Ralf From fedora-extras-commits at redhat.com Tue Mar 11 13:42:35 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 13:42:35 GMT Subject: rpms/claws-mail/F-7 claws-mail.spec,1.28,1.29 Message-ID: <200803111342.m2BDgZfc027474@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27394/F-7 Modified Files: claws-mail.spec Log Message: - add obsoletes for c-m-p-clamav Index: claws-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail/F-7/claws-mail.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- claws-mail.spec 11 Mar 2008 10:40:30 -0000 1.28 +++ claws-mail.spec 11 Mar 2008 13:41:57 -0000 1.29 @@ -1,6 +1,6 @@ Name: claws-mail Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPLv3+ @@ -32,6 +32,8 @@ Obsoletes: sylpheed-claws <= 2.6.0 Provides: sylpheed-claws = %{version}-%{release} +Obsoletes: claws-mail-plugins-clamav <= 3.3.1 + %description Claws Mail is an email client (and news reader), based on GTK+, featuring quick response, graceful and sophisticated interface, easy configuration, @@ -197,6 +199,10 @@ %{_libdir}/claws-mail/plugins/bogofilter.so %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 3.3.1-3 +- add obsoletes for deprecated clamav plugin + * Mon Feb 25 2008 Andreas Bierfert - 3.3.1-2 - build with NetworkManager support From fedora-extras-commits at redhat.com Tue Mar 11 13:42:43 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 13:42:43 GMT Subject: rpms/claws-mail/F-8 claws-mail.spec,1.28,1.29 Message-ID: <200803111342.m2BDghMb027483@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27394/F-8 Modified Files: claws-mail.spec Log Message: - add obsoletes for c-m-p-clamav Index: claws-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail/F-8/claws-mail.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- claws-mail.spec 11 Mar 2008 10:40:41 -0000 1.28 +++ claws-mail.spec 11 Mar 2008 13:42:06 -0000 1.29 @@ -1,6 +1,6 @@ Name: claws-mail Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPLv3+ @@ -32,6 +32,8 @@ Obsoletes: sylpheed-claws <= 2.6.0 Provides: sylpheed-claws = %{version}-%{release} +Obsoletes: claws-mail-plugins-clamav <= 3.3.1 + %description Claws Mail is an email client (and news reader), based on GTK+, featuring quick response, graceful and sophisticated interface, easy configuration, @@ -197,6 +199,10 @@ %{_libdir}/claws-mail/plugins/bogofilter.so %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 3.3.1-3 +- add obsoletes for deprecated clamav plugin + * Mon Feb 25 2008 Andreas Bierfert - 3.3.1-2 - build with NetworkManager support From fedora-extras-commits at redhat.com Tue Mar 11 13:42:46 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 13:42:46 GMT Subject: rpms/claws-mail/devel claws-mail.spec,1.30,1.31 Message-ID: <200803111342.m2BDgkIG027488@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27394/devel Modified Files: claws-mail.spec Log Message: - add obsoletes for c-m-p-clamav Index: claws-mail.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail/devel/claws-mail.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- claws-mail.spec 11 Mar 2008 10:40:45 -0000 1.30 +++ claws-mail.spec 11 Mar 2008 13:42:13 -0000 1.31 @@ -1,6 +1,6 @@ Name: claws-mail Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPLv3+ @@ -33,6 +33,8 @@ Obsoletes: sylpheed-claws <= 2.6.0 Provides: sylpheed-claws = %{version}-%{release} +Obsoletes: claws-mail-plugins-clamav <= 3.3.1 + %description Claws Mail is an email client (and news reader), based on GTK+, featuring quick response, graceful and sophisticated interface, easy configuration, @@ -197,6 +199,10 @@ %{_libdir}/claws-mail/plugins/bogofilter.so %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 3.3.1-3 +- add obsoletes for deprecated clamav plugin + * Mon Feb 25 2008 Andreas Bierfert - 3.3.1-2 - build with NetworkManager support From fedora-extras-commits at redhat.com Tue Mar 11 13:46:01 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 13:46:01 GMT Subject: rpms/libgweather/devel .cvsignore, 1.3, 1.4 libgweather.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200803111346.m2BDk1xo027605@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/libgweather/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27579 Modified Files: .cvsignore libgweather.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgweather/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Feb 2008 18:56:33 -0000 1.3 +++ .cvsignore 11 Mar 2008 13:45:28 -0000 1.4 @@ -1 +1 @@ -libgweather-2.21.92.tar.bz2 +libgweather-2.22.0.tar.bz2 Index: libgweather.spec =================================================================== RCS file: /cvs/extras/rpms/libgweather/devel/libgweather.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libgweather.spec 26 Feb 2008 18:56:33 -0000 1.6 +++ libgweather.spec 11 Mar 2008 13:45:28 -0000 1.7 @@ -1,12 +1,12 @@ Name: libgweather -Version: 2.21.92 +Version: 2.22.0 Release: 1%{?dist} Summary: A library for weather information Group: System Environment/Libraries License: GPLv2+ URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/libgweather/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/libgweather/2.22/%{name}-%{version}.tar.bz2 Source1: copy.xsl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -101,7 +101,10 @@ %changelog -* Tue Feb 26 2008 Matthias Clasen 2.21.92-1 +* Tue Mar 11 2008 Matthias Clasen 2.22.0-1 +- Update to 2.22.0 + +* Tue Feb 26 2008 Matthias Clasen 2.21.92-1 - Update to 2.21.92 * Mon Feb 11 2008 Matthias Clasen 2.21.2-6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgweather/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Feb 2008 18:56:33 -0000 1.3 +++ sources 11 Mar 2008 13:45:28 -0000 1.4 @@ -1 +1 @@ -ce603722f9b427d89fe97b7a4f8cf9e8 libgweather-2.21.92.tar.bz2 +f25d3dada7416bf2d5edb5c7fd7ffce0 libgweather-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 13:47:13 2008 From: fedora-extras-commits at redhat.com (Adam Tkac (atkac)) Date: Tue, 11 Mar 2008 13:47:13 GMT Subject: rpms/vnc/devel vnc.spec,1.185,1.186 Message-ID: <200803111347.m2BDlDf9027675@cvs-int.fedora.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/vnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27613 Modified Files: vnc.spec Log Message: - bump release to 26 - first build against 1.5 xserver Index: vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- vnc.spec 11 Mar 2008 13:25:25 -0000 1.185 +++ vnc.spec 11 Mar 2008 13:46:35 -0000 1.186 @@ -3,7 +3,7 @@ Summary: A remote display system Name: vnc Version: 4.1.2 -Release: 25.3%{?dist} +Release: 26%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source1: Makefile.am @@ -326,7 +326,7 @@ %{_libdir}/librfb.so.* %changelog -* Mon Mar 11 2008 Adam Tkac 4.1.2-25.3 +* Mon Mar 11 2008 Adam Tkac 4.1.2-26 - BuildRequires and Requires cleanup - don't build java viewer (problems due new gcj) - use xorg codebase from xorg-x11-server-source package again From fedora-extras-commits at redhat.com Tue Mar 11 13:47:38 2008 From: fedora-extras-commits at redhat.com (Martin Stransky (stransky)) Date: Tue, 11 Mar 2008 13:47:38 GMT Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec,1.45,1.46 Message-ID: <200803111347.m2BDlch8027685@cvs-int.fedora.redhat.com> Author: stransky Update of /cvs/pkgs/rpms/nspluginwrapper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27652 Modified Files: nspluginwrapper.spec Log Message: * Tue Mar 11 2008 Martin Stransky 0.9.91.5-26 - /etc/sysconfig/nspluginwrapper marked as config file - exclude some player plugins Index: nspluginwrapper.spec =================================================================== RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- nspluginwrapper.spec 10 Mar 2008 12:05:30 -0000 1.45 +++ nspluginwrapper.spec 11 Mar 2008 13:47:04 -0000 1.46 @@ -14,7 +14,7 @@ %define plugin_config_binary plugin-config # Excluded plugins (separated by ':') -%define exclude_list "libtotem*:libjavaplugin*" +%define exclude_list "libtotem*:libjavaplugin*:gecko-mediaplayer*:mplayerplug-in*" # Target defines %if "%{_target_cpu}" == "i386" @@ -70,7 +70,7 @@ Summary: A compatibility layer for Netscape 4 plugins Name: nspluginwrapper Version: 0.9.91.5 -Release: 25%{?dist} +Release: 26%{?dist} Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2 Source1: %{plugin_config_name}.tar.gz Source2: plugin-config.sh.in @@ -236,9 +236,13 @@ %{pkgdir}/npviewer %{plugindir}/npwrapper.so %{_bindir}/mozilla-plugin-config -%{_sysconfdir}/sysconfig/%{name} +%config %{_sysconfdir}/sysconfig/%{name} %changelog +* Tue Mar 11 2008 Martin Stransky 0.9.91.5-26 +- /etc/sysconfig/nspluginwrapper marked as config file +- exclude some player plugins + * Mon Mar 10 2008 Martin Stransky 0.9.91.5-25 - updated the sleep patch From fedora-extras-commits at redhat.com Tue Mar 11 13:52:28 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 11 Mar 2008 13:52:28 GMT Subject: rpms/kde-settings/devel .cvsignore, 1.26, 1.27 kde-settings.spec, 1.36, 1.37 sources, 1.24, 1.25 Message-ID: <200803111352.m2BDqSHK027986@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-settings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27932 Modified Files: .cvsignore kde-settings.spec sources Log Message: * Tue Mar 11 2008 Rex Dieter 4.0-14 - kde4rc: omit userProfileMapFile key Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 10 Mar 2008 15:27:42 -0000 1.26 +++ .cvsignore 11 Mar 2008 13:51:55 -0000 1.27 @@ -1 +1 @@ -kde-settings-4.0-13.tar.bz2 +kde-settings-4.0-14.tar.bz2 Index: kde-settings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- kde-settings.spec 10 Mar 2008 15:27:42 -0000 1.36 +++ kde-settings.spec 11 Mar 2008 13:51:55 -0000 1.37 @@ -2,12 +2,12 @@ # THIS SPECFILE IS FOR F9+ ONLY! # Sorry, it is just too different for conditionals to be worth it. -%define rel 13 +%define rel 14 Summary: Config files for kde Name: kde-settings Version: 4.0 -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist} Group: System Environment/Base License: Public Domain @@ -69,7 +69,6 @@ rm -rf %{buildroot}%{_datadir}/config/kdm ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm -ln -s kderc %{buildroot}%{_sysconfdir}/kde4rc %clean rm -rf %{buildroot} @@ -129,6 +128,9 @@ %changelog +* Tue Mar 11 2008 Rex Dieter 4.0-14 +- kde4rc: omit userProfileMapFile key + * Mon Mar 10 2008 Than Ngo 4.0-13.1 - make oxygen the default windows manager Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 10 Mar 2008 15:27:42 -0000 1.24 +++ sources 11 Mar 2008 13:51:55 -0000 1.25 @@ -1 +1 @@ -418819af35bf5467b793b32094bd0aff kde-settings-4.0-13.tar.bz2 +8d3eb398773bdda25e914f8ad6aadb16 kde-settings-4.0-14.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 13:52:44 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Tue, 11 Mar 2008 13:52:44 GMT Subject: rpms/gdm/devel gdm-2.21.9-remove-duplicate-signal-verification.patch, NONE, 1.1 gdm.spec, 1.344, 1.345 Message-ID: <200803111352.m2BDqiuf028032@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/gdm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27961 Modified Files: gdm.spec Added Files: gdm-2.21.9-remove-duplicate-signal-verification.patch Log Message: - remove duplication signal definition from bad patch merge which led to crash for "Other" user gdm-2.21.9-remove-duplicate-signal-verification.patch: --- NEW FILE gdm-2.21.9-remove-duplicate-signal-verification.patch --- Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.344 retrieving revision 1.345 diff -u -r1.344 -r1.345 --- gdm.spec 11 Mar 2008 02:21:33 -0000 1.344 +++ gdm.spec 11 Mar 2008 13:52:06 -0000 1.345 @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.21.9 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -78,6 +78,7 @@ Requires: audit-libs >= %{libauditver} Patch1: gdm-null-user.patch +Patch2: gdm-2.21.9-remove-duplicate-signal-verification.patch Patch99: gdm-2.21.8-fedora-logo.patch %package user-switch-applet @@ -99,6 +100,7 @@ %setup -q %patch1 -p0 -b .null-user +%patch2 -p1 -b .remove-duplicate-signal-verification %patch99 -p1 -b .fedora-logo %build @@ -292,6 +294,10 @@ %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Tue Mar 11 2008 Ray Strode - 1:2.21.9-3 +- remove duplication signal definition from bad patch merge + which led to crash for "Other" user + * Mon Mar 10 2008 Jon McCann - 1:2.21.9-2 - Fix case where we can't lookup a user. From fedora-extras-commits at redhat.com Tue Mar 11 14:05:40 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 11 Mar 2008 14:05:40 GMT Subject: rpms/kde-settings/F-8 .cvsignore, 1.16, 1.17 kde-settings.spec, 1.23, 1.24 sources, 1.16, 1.17 gpg-agent-shutdown.sh, 1.1, NONE gpg-agent-startup.sh, 1.1, NONE pulseaudio.sh, 1.1, NONE Message-ID: <200803111405.m2BE5e0u003115@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-settings/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3069 Modified Files: .cvsignore kde-settings.spec sources Removed Files: gpg-agent-shutdown.sh gpg-agent-startup.sh pulseaudio.sh Log Message: * Tue Mar 11 2008 Rex Dieter 3.5-38 - kde4rc: omit userProfileMapFile key Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/F-8/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 19 Feb 2008 13:43:47 -0000 1.16 +++ .cvsignore 11 Mar 2008 14:04:52 -0000 1.17 @@ -1,4 +1 @@ -etc/ -usr/ -kde-settings-3.5-36.tar.bz2 -kde-settings-3.5-37.tar.bz2 +kde-settings-3.5-38.tar.bz2 Index: kde-settings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/F-8/kde-settings.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- kde-settings.spec 9 Mar 2008 19:58:44 -0000 1.23 +++ kde-settings.spec 11 Mar 2008 14:04:52 -0000 1.24 @@ -1,10 +1,10 @@ -%define rel 37 +%define rel 38 Summary: Config files for kde Name: kde-settings Version: 3.5 -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist} Group: System Environment/Base License: Public Domain @@ -71,8 +71,6 @@ rm -rf %{buildroot}%{_datadir}/config/kdm ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm -ln -s kderc %{buildroot}%{_sysconfdir}/kde4rc - %clean rm -rf %{buildroot} @@ -129,6 +127,9 @@ %changelog +* Tue Mar 11 2008 Rex Dieter 3.5-38 +- kde4rc: omit userProfileMapFile key + * Sun Mar 09 2008 Kevin Kofler 3.5-37.1 - symlink /etc/kderc to /etc/kde4rc Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/F-8/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 19 Feb 2008 13:43:47 -0000 1.16 +++ sources 11 Mar 2008 14:04:52 -0000 1.17 @@ -1 +1 @@ -cb3bcf9124e374c52e9cdefdc081c357 kde-settings-3.5-37.tar.bz2 +13e00ffbd514e86bb2d17540f0df4f62 kde-settings-3.5-38.tar.bz2 --- gpg-agent-shutdown.sh DELETED --- --- gpg-agent-startup.sh DELETED --- --- pulseaudio.sh DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 14:11:10 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 11 Mar 2008 14:11:10 GMT Subject: rpms/kde-settings/F-7 kde4rc,NONE,1.1 kde-settings.spec,1.16,1.17 Message-ID: <200803111411.m2BEBAFL003367@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-settings/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3329 Modified Files: kde-settings.spec Added Files: kde4rc Log Message: * Tue Mar 11 2008 Rex Dieter 3.5-30.5 - kde4rc: omit userProfileMapFile key --- NEW FILE kde4rc --- [Directories] kioskAdmin=root: profileDirsPrefix=/usr/share/kde-settings/kde-profile/ ## a non-emtpy userProfileMapFile induces errors in kde4 apps atm #userProfileMapFile=/etc/kde-user-profile [Directories-default] prefixes=/usr/share/kde-settings/kde-profile/default/ Index: kde-settings.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-settings/F-7/kde-settings.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- kde-settings.spec 10 Mar 2008 00:48:05 -0000 1.16 +++ kde-settings.spec 11 Mar 2008 14:10:10 -0000 1.17 @@ -4,7 +4,7 @@ Summary: Config files for kde Name: kde-settings Version: 3.5 -Release: %{rel}%{?dist}.4 +Release: %{rel}%{?dist}.5 Group: System Environment/Base License: Public Domain @@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +Source1: kde4rc + Source10: gpg-agent-startup.sh Source11: gpg-agent-shutdown.sh # sed/kill used in gpg-agent-(startup/shutdown).sh @@ -62,7 +64,7 @@ install -p -m0755 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/kde/env/gpg-agent-startup.sh install -p -m0755 -D %{SOURCE11} %{buildroot}%{_sysconfdir}/kde/shutdown/gpg-agent-shutdown.sh -ln -s kderc %{buildroot}%{_sysconfdir}/kde4rc +install -p -m0644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde4rc %clean @@ -116,6 +118,9 @@ %changelog +* Tue Mar 11 2008 Rex Dieter 3.5-30.5 +- kde4rc: omit userProfileMapFile key + * Mon Mar 10 2008 Kevin Kofler 3.5-30.4 - revert #431398 fix (only a bandaid, doesn't fix underlying problem) From fedora-extras-commits at redhat.com Tue Mar 11 14:12:20 2008 From: fedora-extras-commits at redhat.com (Robert H. Rati (rrati)) Date: Tue, 11 Mar 2008 14:12:20 GMT Subject: rpms/perl-LWP-UserAgent-Determined/devel perl-LWP-UserAgent-Determined.spec, 1.3, 1.4 Message-ID: <200803111412.m2BECK1j003462@cvs-int.fedora.redhat.com> Author: rrati Update of /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3414 Modified Files: perl-LWP-UserAgent-Determined.spec Log Message: Properly claim files/directories Index: perl-LWP-UserAgent-Determined.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel/perl-LWP-UserAgent-Determined.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-LWP-UserAgent-Determined.spec 10 Mar 2008 19:09:23 -0000 1.3 +++ perl-LWP-UserAgent-Determined.spec 11 Mar 2008 14:11:30 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A virtual browser that retries errors Name: perl-LWP-UserAgent-Determined Version: 1.03 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/%{pkg_name}/ @@ -47,13 +47,20 @@ %files %defattr(-,root,root,-) %doc ChangeLog README +%dir %{perl_vendorlib}/LWP +%dir %{perl_vendorlib}/LWP/UserAgent %{perl_vendorlib}/LWP/UserAgent/Determined.pm %{_mandir}/man3/LWP::UserAgent::Determined.3pm.gz %changelog +* Tue Mar 11 2008 Robert Rati - 1.03-3 +- Package now owns all files/directories from LWP on down to + conform with packaging standards + * Fri Mar 7 2008 Robert Rati - 1.03-2 - Removed the %check tag because the tests attempt to access the internet + * Fri Mar 7 2008 Robert Rati - 1.03-1 - Initial release From fedora-extras-commits at redhat.com Tue Mar 11 14:18:26 2008 From: fedora-extras-commits at redhat.com (Robert Rati (rrati)) Date: Tue, 11 Mar 2008 09:18:26 -0500 Subject: rpms/perl-LWP-UserAgent-Determined/devel perl-LWP-UserAgent-Determined.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <1205242781.3485.41.camel@beck.corsepiu.local> References: <200803101804.m2AI4NFU010325@cvs-int.fedora.redhat.com> <1205240816.3485.27.camel@beck.corsepiu.local> <47D688EB.5090608@redhat.com> <1205242781.3485.41.camel@beck.corsepiu.local> Message-ID: <47D694B2.1010109@redhat.com> Ralf Corsepius wrote: > On Tue, 2008-03-11 at 08:28 -0500, Robert Rati wrote: >> Ralf Corsepius wrote: >>> On Mon, 2008-03-10 at 18:04 +0000, Robert H. Rati wrote: >>>> Author: rrati >>>> >>>> Update of /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel >>>> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10302/devel >>>> >>>> Modified Files: >>>> .cvsignore sources >>>> Added Files: >>>> perl-LWP-UserAgent-Determined.spec >>>> Log Message: >>>> Initial Packaging >>>> >>>> >>>> >>>> --- NEW FILE perl-LWP-UserAgent-Determined.spec --- >>>> Summary: A virtual browser that retries errors >>>> Name: perl-LWP-UserAgent-Determined >>>> Version: 1.03 >>>> Release: 1%{?dist} >>>> License: GPL+ or Artistic >>>> Group: Development/Libraries >>>> URL: http://search.cpan.org/dist/%{pkg_name}/ >>>> Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/LWP-UserAgent-Determined-%{version}.tar.gz >>>> BuildRoot: %(mktemp -ud %{_tmppath}/ >> Rich. > >> -- >> Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones >> virt-p2v converts physical machines to virtual machines. Boot with a >> live CD or over the network (PXE) and turn machines into Xen guests. >> http://et.redhat.com/~rjones/virt-p2v >> %{name}-%{version}-%{release}-XXXXXX) >>>> BuildArch: noarch >>>> BuildRequires: perl(ExtUtils::MakeMaker) >>>> BuildRequires: perl(LWP::UserAgent) >>>> >>>> >>>> %description >>>> This class works just like LWP::UserAgent (and is based on it, by being a >>>> subclass of it), except that when you use it to get a web page but run into >>>> a possibly-temporary error (like a DNS lookup timeout), it'll wait a few >>>> seconds and retry a few times. >>>> >>>> >>>> %prep >>>> %setup -q -n LWP-UserAgent-Determined-%{version} >>>> >>>> >>>> %build >>>> %{__perl} Makefile.PL INSTALLDIRS=vendor >>>> make %{?_smp_mflags} >>>> >>>> >>>> %install >>>> rm -rf %{buildroot} >>>> make pure_install PERL_INSTALL_ROOT=%{buildroot} >>>> find %{buildroot} -type f -name .packlist -exec rm -f {} ';' >>>> chmod -R u+w %{buildroot}/* >>>> >>>> >>>> %check >>>> make test >>>> >> Rich. > >> -- >> Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones >> virt-p2v converts physical machines to virtual machines. Boot with a >> live CD or over the network (PXE) and turn machines into Xen guests. >> http://et.redhat.com/~rjones/virt-p2v >> >>>> %clean >>>> rm -rf $RPM_BUILD_ROOT >>>> >>>> >>>> %files >>>> %defattr(-,root,root,-) >>>> %doc ChangeLog README >>>> %{perl_vendorlib}/LWP/UserAgent/Determined.pm >>>> %{_mandir}/man3/LWP::UserAgent::Determined.3pm.gz >>> Another broken package: This package must own >>> %{perl_vendorlib}/LWP/ and all files+directories underneath >>> >>> Ralf >> The %{perl_vendorlib}/LWP/ directory is already owned by the >> perl-libwww-perl package. Having this package own that directory and >> all files below would cause a conflict with the perl-libwww-perl package >> wouldn't it? > > No it would not. These packages would share these directories. > > Without sharing them, > 1. In many cases perl packages would not deinstall properly and would > leave unowned directories behind after deinstallation. > 2. There is no strict hierarchy between perl modules. > > As a consequence of this sharing ownership on directories has been > common standard in all perl-packages in Fedora for many years. > > > Ralf Did you log a bugzilla on this? I've fixed all the packages I submitted and am building new packages now. Just want to close the loop if there's a BZ I'm not seeing. Rob From fedora-extras-commits at redhat.com Tue Mar 11 14:25:14 2008 From: fedora-extras-commits at redhat.com (Robert H. Rati (rrati)) Date: Tue, 11 Mar 2008 14:25:14 GMT Subject: rpms/perl-Net-Amazon-EC2/devel perl-Net-Amazon-EC2.spec,1.1,1.2 Message-ID: <200803111425.m2BEPEis003798@cvs-int.fedora.redhat.com> Author: rrati Update of /cvs/pkgs/rpms/perl-Net-Amazon-EC2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3752 Modified Files: perl-Net-Amazon-EC2.spec Log Message: Properly claim all files/directories Index: perl-Net-Amazon-EC2.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Amazon-EC2/devel/perl-Net-Amazon-EC2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-Amazon-EC2.spec 10 Mar 2008 17:03:51 -0000 1.1 +++ perl-Net-Amazon-EC2.spec 11 Mar 2008 14:24:42 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Perl interface to the Amazon Elastic Compute Cloud (EC2) Name: perl-Net-Amazon-EC2 Version: 0.06 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/~jkim/Net-Amazon-EC2/ @@ -56,6 +56,9 @@ %files %defattr(-,root,root,-) %doc README +%dir %{perl_vendorlib}/Net +%dir %{perl_vendorlib}/Net/Amazon +%dir %{perl_vendorlib}/Net/Amazon/EC2 %{perl_vendorlib}/Net/Amazon/EC2.pm %{perl_vendorlib}/Net/Amazon/EC2/ConfirmProductInstanceResponse.pm %{perl_vendorlib}/Net/Amazon/EC2/ConsoleOutput.pm @@ -83,5 +86,9 @@ %{_mandir}/man3/Net::Amazon::EC2.3pm.gz %changelog +* Tue Mar 11 2008 Robert Rati - 0.06-2 +- Package now owns all files/directories from Net on down + to conform to packaging standards + * Thu Mar 6 2008 Robert Rati - 0.06-1 - Initial release From fedora-extras-commits at redhat.com Tue Mar 11 14:29:39 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 11 Mar 2008 14:29:39 GMT Subject: rpms/epiphany-extensions/devel .cvsignore, 1.24, 1.25 epiphany-extensions.spec, 1.43, 1.44 sources, 1.24, 1.25 Message-ID: <200803111429.m2BETdrN004135@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4064 Modified Files: .cvsignore epiphany-extensions.spec sources Log Message: * Tue Mar 11 2008 Christopher Aillon - 2.22.0-1 - Update to 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 26 Feb 2008 20:33:58 -0000 1.24 +++ .cvsignore 11 Mar 2008 14:29:01 -0000 1.25 @@ -1 +1 @@ -epiphany-extensions-2.21.92.tar.bz2 +epiphany-extensions-2.22.0.tar.bz2 Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- epiphany-extensions.spec 26 Feb 2008 22:59:19 -0000 1.43 +++ epiphany-extensions.spec 11 Mar 2008 14:29:01 -0000 1.44 @@ -1,9 +1,9 @@ -%global ephy_major 2.21 +%global ephy_major 2.22 %global ephy_min_version %{ephy_major}.0 %global gecko_version 1.9 Name: epiphany-extensions -Version: %{ephy_major}.92 +Version: %{ephy_major}.0 Release: 1%{?dist} Summary: Extensions for Epiphany, the GNOME web browser @@ -118,6 +118,9 @@ %changelog +* Tue Mar 11 2008 Christopher Aillon - 2.22.0-1 +- Update to 2.22.0 + * Tue Feb 26 2008 Christopher Aillon - 2.21.92-1 - Update to 2.91.92 - Build against xulrunner 4realz, yo Index: sources =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 26 Feb 2008 20:33:58 -0000 1.24 +++ sources 11 Mar 2008 14:29:01 -0000 1.25 @@ -1 +1 @@ -b0cdac60b964c5dc00926e654923ed95 epiphany-extensions-2.21.92.tar.bz2 +05b131995c532f2689150c731b2f37c1 epiphany-extensions-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 14:36:06 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 11 Mar 2008 14:36:06 GMT Subject: rpms/liboil/devel liboil-0.3.13-better-altivec-detect.patch, NONE, 1.1 liboil.spec, 1.29, 1.30 liboil-0.3.13-disable-altivec.patch, 1.1, NONE Message-ID: <200803111436.m2BEa65d004551@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4495 Modified Files: liboil.spec Added Files: liboil-0.3.13-better-altivec-detect.patch Removed Files: liboil-0.3.13-disable-altivec.patch Log Message: * Tue Mar 11 2008 - Bastien Nocera - 0.3.13-5 - Detect Altivec using /proc instead of causing a SIGILL fault liboil-0.3.13-better-altivec-detect.patch: --- NEW FILE liboil-0.3.13-better-altivec-detect.patch --- Index: liboil/liboilcpu-powerpc.c =================================================================== RCS file: /cvs/liboil/liboil/liboil/liboilcpu-powerpc.c,v retrieving revision 1.1 diff -u -p -u -p -r1.1 liboilcpu-powerpc.c --- liboil/liboilcpu-powerpc.c 14 Nov 2007 09:30:20 -0000 1.1 +++ liboil/liboilcpu-powerpc.c 11 Mar 2008 14:29:22 -0000 @@ -44,6 +44,15 @@ //#include //#include +#if defined(__linux__) +#include +#include +#include +#include +#include +#include +#endif + #if defined(__FreeBSD__) #include #include @@ -67,7 +76,7 @@ test_altivec (void * ignored) } #if defined(__FreeBSD__) -void +static void oil_check_altivec_sysctl (void) { int ret, av; @@ -81,6 +90,58 @@ oil_check_altivec_sysctl (void) } #endif +#if defined(__linux__) +static void +oil_check_altivec_proc (void) +{ + static int available = -1; + int new_avail = 0; + char fname[64]; + unsigned long buf[64]; + ssize_t count; + pid_t pid; + int fd, i; + + if (available != -1) { + return available; + } + + pid = getpid(); + snprintf(fname, sizeof(fname)-1, "/proc/%d/auxv", pid); + + fd = open(fname, O_RDONLY); + if (fd < 0) { + goto out; + } + +more: + count = read(fd, buf, sizeof(buf)); + if (count < 0) { + goto out_close; + } + + for (i=0; i < (count / sizeof(unsigned long)); i += 2) { + if (buf[i] == AT_HWCAP) { + new_avail = !!(buf[i+1] & PPC_FEATURE_HAS_ALTIVEC); + goto out_close; + } else if (buf[i] == AT_NULL) { + goto out_close; + } + } + + if (count == sizeof(buf)) { + goto more; + } + +out_close: + close(fd); + +out: + available = new_avail; + return available; +} +#endif + void oil_check_altivec_fault (void) { @@ -97,6 +158,8 @@ oil_cpu_detect_arch(void) { #if defined(__FreeBSD__) oil_check_altivec_sysctl(); +#elif defined(#ifdef __linux__) + oil_check_altivec_proc(); #else oil_check_altivec_fault(); #endif @@ -104,5 +167,3 @@ oil_cpu_detect_arch(void) _oil_profile_stamp = oil_profile_stamp_tb; } - - Index: liboil.spec =================================================================== RCS file: /cvs/pkgs/rpms/liboil/devel/liboil.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- liboil.spec 10 Mar 2008 09:55:22 -0000 1.29 +++ liboil.spec 11 Mar 2008 14:35:30 -0000 1.30 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil Version: 0.3.13 -Release: 4%{?dist} +Release: 5%{?dist} # See COPYING which details everything, various BSD licenses apply License: BSD Group: System Environment/Libraries @@ -9,7 +9,7 @@ Source: http://liboil.freedesktop.org/download/liboil-%{version}.tar.gz Patch1: liboil-0.3.13-s390.patch -Patch2: liboil-0.3.13-disable-altivec.patch +Patch2: liboil-0.3.13-better-altivec-detect.patch # from upstream git Patch3: clobber-ecx.patch @@ -41,13 +41,13 @@ %prep %setup -q %patch1 -p1 -b .s390 -%patch2 -p1 -b .disable-altivec +%patch2 -p0 -b .better-altivec-detect %patch3 -p1 -b .clobber-ecx # Disable Altivec, so that liboil doesn't SIGILL on non-Altivec PPCs # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c15 -sed -i 's/CFLAGS="$CFLAGS "-maltivec""/CFLAGS="$CFLAGS "-fno-tree-vectorize -Wa,-maltivec""/' configure -sed -i 's/LIBOIL_CFLAGS -maltivec/LIBOIL_CFLAGS -fno-tree-vectorize -Wa,-maltivec/' configure +#sed -i 's/CFLAGS="$CFLAGS "-maltivec""/CFLAGS="$CFLAGS "-fno-tree-vectorize -Wa,-maltivec""/' configure +#sed -i 's/LIBOIL_CFLAGS -maltivec/LIBOIL_CFLAGS -fno-tree-vectorize -Wa,-maltivec/' configure %build %configure @@ -90,6 +90,9 @@ %changelog +* Tue Mar 11 2008 - Bastien Nocera - 0.3.13-5 +- Detect Altivec using /proc instead of causing a SIGILL fault + * Mon Mar 10 2008 - Bastien Nocera - 0.3.13-4 - Try disabling Altivec for now --- liboil-0.3.13-disable-altivec.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 14:37:42 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Tue, 11 Mar 2008 14:37:42 GMT Subject: rpms/Miro/F-8 sources, 1.6, 1.7 Miro.spec, 1.10, 1.11 .cvsignore, 1.6, 1.7 Message-ID: <200803111437.m2BEbgZX004698@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/Miro/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4645 Modified Files: sources Miro.spec .cvsignore Log Message: * Tue Mar 11 2008 Alex Lancaster - 1.1.2-1 - Update to upstream 1.1.2 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/Miro/F-8/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Jan 2008 03:06:35 -0000 1.6 +++ sources 11 Mar 2008 14:37:04 -0000 1.7 @@ -1 +1 @@ -250b37ced7a4753c5717fb65bd2ad6d3 Miro-1.1.tar.gz +747dc21841ba1ce21b6eb7cd41d57afb Miro-1.1.2.tar.gz Index: Miro.spec =================================================================== RCS file: /cvs/extras/rpms/Miro/F-8/Miro.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Miro.spec 8 Feb 2008 18:31:56 -0000 1.10 +++ Miro.spec 11 Mar 2008 14:37:04 -0000 1.11 @@ -4,8 +4,8 @@ %define gecko_ver 1.8.1.12 Name: Miro -Version: 1.1 -Release: 3%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Miro - Internet TV Player Group: Applications/Multimedia License: GPLv2+ @@ -75,6 +75,9 @@ %changelog +* Tue Mar 11 2008 Alex Lancaster - 1.1.2-1 +- Update to upstream 1.1.2 release + * Fri Feb 8 2008 Christopher Aillon 1.1-3 - Rebuild against newer gecko Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Miro/F-8/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Jan 2008 03:06:35 -0000 1.6 +++ .cvsignore 11 Mar 2008 14:37:04 -0000 1.7 @@ -1 +1 @@ -Miro-1.1.tar.gz +Miro-1.1.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 14:38:35 2008 From: fedora-extras-commits at redhat.com (Robert H. Rati (rrati)) Date: Tue, 11 Mar 2008 14:38:35 GMT Subject: rpms/perl-Net-Amazon-S3/devel perl-Net-Amazon-S3.spec,1.1,1.2 Message-ID: <200803111438.m2BEcZ2Y004788@cvs-int.fedora.redhat.com> Author: rrati Update of /cvs/pkgs/rpms/perl-Net-Amazon-S3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4684 Modified Files: perl-Net-Amazon-S3.spec Log Message: Properly claim directories/files Index: perl-Net-Amazon-S3.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Net-Amazon-S3/devel/perl-Net-Amazon-S3.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-Amazon-S3.spec 10 Mar 2008 17:43:06 -0000 1.1 +++ perl-Net-Amazon-S3.spec 11 Mar 2008 14:38:00 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Use the Amazon Simple Storage Service (S3) Name: perl-Net-Amazon-S3 Version: 0.43 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-Amazon-S3/ @@ -66,6 +66,9 @@ %files %defattr(-,root,root,-) %doc CHANGES README +%dir %{perl_vendorlib}/Net +%dir %{perl_vendorlib}/Net/Amazon +%dir %{perl_vendorlib}/Net/Amazon/S3 %{perl_vendorlib}/Net/Amazon/S3.pm %{perl_vendorlib}/Net/Amazon/S3/Bucket.pm %{_mandir}/man3/Net::Amazon::S3.3pm.gz @@ -73,5 +76,9 @@ %changelog +* Thu Mar 6 2008 Robert Rati - 0.43-2 +- Package now owns all files/directories from Net on down + to conform to packaging standards + * Thu Mar 6 2008 Robert Rati - 0.43-1 - Initial release From fedora-extras-commits at redhat.com Tue Mar 11 14:39:06 2008 From: fedora-extras-commits at redhat.com (Joel Andres Granados Moreno (jgranado)) Date: Tue, 11 Mar 2008 14:39:06 GMT Subject: rpms/firstaidkit/devel firstaidkit-0.1.1-syntax-error.patch, NONE, 1.1 firstaidkit.spec, 1.2, 1.3 Message-ID: <200803111439.m2BEd6fA004832@cvs-int.fedora.redhat.com> Author: jgranado Update of /cvs/pkgs/rpms/firstaidkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4680 Modified Files: firstaidkit.spec Added Files: firstaidkit-0.1.1-syntax-error.patch Log Message: Lets wait until the pyparted stuff from the undel plugin is in pyparted. fix some syntax error witha patch. firstaidkit-0.1.1-syntax-error.patch: --- NEW FILE firstaidkit-0.1.1-syntax-error.patch --- diff --git a/pyfirstaidkit/configuration.py b/pyfirstaidkit/configuration.py index 0ed741a..ddd299b 100644 --- pyfirstaidkit/configuration.py +++ pyfirstaidkit/configuration.py @@ -41,7 +41,7 @@ def createDefaultConfig(config): # Setup a sane default root directory. if os.path.isdir("/mnt/sysimage"): config.system.root = "/mnt/sysimage" - else + else: config.system.root = "/" # Index: firstaidkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- firstaidkit.spec 10 Mar 2008 20:33:53 -0000 1.2 +++ firstaidkit.spec 11 Mar 2008 14:38:30 -0000 1.3 @@ -4,13 +4,14 @@ Name: firstaidkit Version: 0.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: System Rescue Tool Group: Applications/System License: GPLv2+ URL: http://fedorahosted.org/firstaidkit Source0: %{name}-%{version}.tar.bz2 +patch0: %{name}-%{version}-syntax-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -46,16 +47,6 @@ needed firstaidkit plugins. -%package plugin-undelete-partitions -Group: Applications/System -Summary: FirstAidKit plugin to recover erased partitions -BuildRequires: python-devel, parted-devel, pkgconfig -Requires: parted - -%description plugin-undelete-partitions -This FirstAidKit plugin automates the recovery of erased partitions. - - %package plugin-passwd Group: Applications/System Summary: FirstAidKit plugin to manipulate passwd system @@ -67,11 +58,11 @@ %prep %setup -q +%patch0 -p0 %build %{__python} setup.py build -%{__make} subdirs %install @@ -87,8 +78,7 @@ %{__install} -p etc/firstaidkit.conf $RPM_BUILD_ROOT%{_sysconfdir} #plugins -%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions -%{__cp} -f plugins/plugin_undelete_partitions/{*.py,_undelpart.so} $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions/ +%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins %{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/ @@ -112,16 +102,16 @@ %files plugin-all -%files plugin-undelete-partitions -%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions/*.py -%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions/*.so - %files plugin-passwd %{_libdir}/firstaidkit-plugins/passwd.py %Changelog +* Tue Mar 11 2008 Joel Granados 0.1.1-2 +- Fix dependency problem for ppc64 +- Patch a syntax error + * Mon Mar 10 2008 Joel Granados 0.1.1-1 -- new version +- New version * Wed Jan 09 2008 Joel Granados 0.1.0-6 - Put examples under the firstaidkit-plugins dir From fedora-extras-commits at redhat.com Tue Mar 11 14:41:58 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 11 Mar 2008 14:41:58 GMT Subject: rpms/totem/devel totem.spec,1.176,1.177 Message-ID: <200803111441.m2BEfwiM005007@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4961 Modified Files: totem.spec Log Message: Update liboil req Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- totem.spec 10 Mar 2008 11:04:12 -0000 1.176 +++ totem.spec 11 Mar 2008 14:41:23 -0000 1.177 @@ -82,7 +82,7 @@ BuildRequires: gstreamer-devel >= %gstreamer_version BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version -BuildRequires: liboil >= 0.3.13-4 +BuildRequires: liboil >= 0.3.13-5 %description gstreamer This package provides the gstreamer backend for the Totem media player. From fedora-extras-commits at redhat.com Tue Mar 11 14:50:20 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Tue, 11 Mar 2008 14:50:20 GMT Subject: devel/vim vim.spec,1.200,1.201 Message-ID: <200803111450.m2BEoKlA005362@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5318 Modified Files: vim.spec Log Message: - fix filename Index: vim.spec =================================================================== RCS file: /cvs/extras/devel/vim/vim.spec,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- vim.spec 11 Mar 2008 13:06:03 -0000 1.200 +++ vim.spec 11 Mar 2008 14:49:46 -0000 1.201 @@ -827,7 +827,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/after cp -f %{SOURCE11} . -cp -f %{SOURCE14} $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/ +cp -f %{SOURCE14} $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/template.spec cp runtime/doc/uganda.txt LICENSE From fedora-extras-commits at redhat.com Tue Mar 11 14:51:24 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Tue, 11 Mar 2008 14:51:24 GMT Subject: rpms/taskjuggler/devel taskjuggler.spec,1.13,1.14 Message-ID: <200803111451.m2BEpOPM005471@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/taskjuggler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5393 Modified Files: taskjuggler.spec Log Message: separate libs subpackage (#343251, multiarch conflicts) Index: taskjuggler.spec =================================================================== RCS file: /cvs/extras/rpms/taskjuggler/devel/taskjuggler.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- taskjuggler.spec 13 Feb 2008 12:47:18 -0000 1.13 +++ taskjuggler.spec 11 Mar 2008 14:50:46 -0000 1.14 @@ -1,6 +1,6 @@ Name: taskjuggler Version: 2.4.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Project management tool Group: Applications/Productivity @@ -12,6 +12,7 @@ BuildRequires: kdepim-devel # need gettext for untranslated .po files Buildrequires: gettext +Requires: %{name}-libs = %{version}-%{release} Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -29,6 +30,13 @@ scoping, resource assignment, cost and revenue planning, and risk and communication management. +%package libs +Summary: Libraries for %{name} +Group: System Environment/Libraries +Obsoletes: %{name} < %{version}-{%release} + +%description libs +Libraries for TaskJuggler package. %prep %setup -q @@ -91,11 +99,10 @@ %files -f %{name}.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_bindir}/TaskJugglerUI %{_bindir}/taskjuggler -%{_libdir}/libtaskjuggler* %{_datadir}/applications/fedora-taskjuggler.desktop %{_datadir}/applications/kde %{_datadir}/apps/* @@ -105,8 +112,14 @@ %{_datadir}/icons/* %{_datadir}/mimelnk/application/*.desktop +%files libs +%defattr(-,root,root,-) +%{_libdir}/libtaskjuggler* %changelog +* Thu Mar 6 2008 Ondrej Vasik - 2.4.0-7 +- separate libs subpackage (#343251, multiarch conflicts) + * Wed Feb 13 2008 Ondrej Vasik - 2.4.0-6 - gcc43 rebuild + resolving issues From fedora-extras-commits at redhat.com Tue Mar 11 14:51:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 14:51:43 GMT Subject: rpms/wlassistant/devel wlassistant.spec,1.13,1.14 Message-ID: <200803111451.m2BEphQj005541@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/wlassistant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5431 Modified Files: wlassistant.spec Log Message: fix kde3 buildrequires Index: wlassistant.spec =================================================================== RCS file: /cvs/extras/rpms/wlassistant/devel/wlassistant.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wlassistant.spec 20 Feb 2008 01:54:07 -0000 1.13 +++ wlassistant.spec 11 Mar 2008 14:51:09 -0000 1.14 @@ -1,6 +1,6 @@ Name: wlassistant Version: 0.5.7 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/System Summary: Wireless network management tool @@ -10,7 +10,7 @@ Source2: wlassistant.pamd Source3: wlassistant.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools-devel, scons +BuildRequires: kdelibs3-devel, desktop-file-utils, wireless-tools-devel, scons BuildRequires: qt-devel, gettext Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -87,6 +87,9 @@ %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Tue Mar 11 2008 Tom "spot" Callaway 0.5.7-7 +- fix BuildRequires for kdelibs3-devel + * Tue Feb 19 2008 Fedora Release Engineering - 0.5.7-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 14:51:31 2008 From: fedora-extras-commits at redhat.com (Ralf Corsepius (rc040203)) Date: Tue, 11 Mar 2008 15:51:31 +0100 Subject: rpms/perl-LWP-UserAgent-Determined/devel perl-LWP-UserAgent-Determined.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <47D694B2.1010109@redhat.com> References: <200803101804.m2AI4NFU010325@cvs-int.fedora.redhat.com> <1205240816.3485.27.camel@beck.corsepiu.local> <47D688EB.5090608@redhat.com> <1205242781.3485.41.camel@beck.corsepiu.local> <47D694B2.1010109@redhat.com> Message-ID: <1205247091.3485.84.camel@beck.corsepiu.local> On Tue, 2008-03-11 at 09:18 -0500, Robert Rati wrote: > Ralf Corsepius wrote: > > On Tue, 2008-03-11 at 08:28 -0500, Robert Rati wrote: > >> Ralf Corsepius wrote: > >>> On Mon, 2008-03-10 at 18:04 +0000, Robert H. Rati wrote: > >>>> Author: rrati > >>>> > >>>> Update of /cvs/pkgs/rpms/perl-LWP-UserAgent-Determined/devel > >>>> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10302/devel > >>>> > >>>> Modified Files: > >>>> .cvsignore sources > >>>> Added Files: > >>>> perl-LWP-UserAgent-Determined.spec > >>>> Log Message: > >>>> Initial Packaging > >>>> > >>>> > >>>> > >>>> --- NEW FILE perl-LWP-UserAgent-Determined.spec --- > >>>> Summary: A virtual browser that retries errors > >>>> Name: perl-LWP-UserAgent-Determined > >>>> Version: 1.03 > >>>> Release: 1%{?dist} > >>>> License: GPL+ or Artistic > >>>> Group: Development/Libraries > >>>> URL: http://search.cpan.org/dist/%{pkg_name}/ > >>>> Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/LWP-UserAgent-Determined-%{version}.tar.gz > >>>> BuildRoot: %(mktemp -ud %{_tmppath}/ > >> Rich. > > > >> -- > >> Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones > >> virt-p2v converts physical machines to virtual machines. Boot with a > >> live CD or over the network (PXE) and turn machines into Xen guests. > >> http://et.redhat.com/~rjones/virt-p2v > >> %{name}-%{version}-%{release}-XXXXXX) > >>>> BuildArch: noarch > >>>> BuildRequires: perl(ExtUtils::MakeMaker) > >>>> BuildRequires: perl(LWP::UserAgent) > >>>> > >>>> > >>>> %description > >>>> This class works just like LWP::UserAgent (and is based on it, by being a > >>>> subclass of it), except that when you use it to get a web page but run into > >>>> a possibly-temporary error (like a DNS lookup timeout), it'll wait a few > >>>> seconds and retry a few times. > >>>> > >>>> > >>>> %prep > >>>> %setup -q -n LWP-UserAgent-Determined-%{version} > >>>> > >>>> > >>>> %build > >>>> %{__perl} Makefile.PL INSTALLDIRS=vendor > >>>> make %{?_smp_mflags} > >>>> > >>>> > >>>> %install > >>>> rm -rf %{buildroot} > >>>> make pure_install PERL_INSTALL_ROOT=%{buildroot} > >>>> find %{buildroot} -type f -name .packlist -exec rm -f {} ';' > >>>> chmod -R u+w %{buildroot}/* > >>>> > >>>> > >>>> %check > >>>> make test > >>>> > >> Rich. > > > >> -- > >> Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones > >> virt-p2v converts physical machines to virtual machines. Boot with a > >> live CD or over the network (PXE) and turn machines into Xen guests. > >> http://et.redhat.com/~rjones/virt-p2v > >> > >>>> %clean > >>>> rm -rf $RPM_BUILD_ROOT > >>>> > >>>> > >>>> %files > >>>> %defattr(-,root,root,-) > >>>> %doc ChangeLog README > >>>> %{perl_vendorlib}/LWP/UserAgent/Determined.pm > >>>> %{_mandir}/man3/LWP::UserAgent::Determined.3pm.gz > >>> Another broken package: This package must own > >>> %{perl_vendorlib}/LWP/ and all files+directories underneath > >>> > >>> Ralf > >> The %{perl_vendorlib}/LWP/ directory is already owned by the > >> perl-libwww-perl package. Having this package own that directory and > >> all files below would cause a conflict with the perl-libwww-perl package > >> wouldn't it? > > > > No it would not. These packages would share these directories. > > > > Without sharing them, > > 1. In many cases perl packages would not deinstall properly and would > > leave unowned directories behind after deinstallation. > > 2. There is no strict hierarchy between perl modules. > > > > As a consequence of this sharing ownership on directories has been > > common standard in all perl-packages in Fedora for many years. > > > > > > Ralf > > Did you log a bugzilla on this? Nope. I just noticed your postings on fedora-perl-devel-list and replied to them to inform you about this. > I've fixed all the packages I submitted > and am building new packages now. Just want to close the loop if > there's a BZ I'm not seeing. Thanks for your promptly response. Ralf From fedora-extras-commits at redhat.com Tue Mar 11 14:59:44 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 11 Mar 2008 14:59:44 GMT Subject: rpms/liboil/devel liboil-0.3.13-better-altivec-detect.patch, 1.1, 1.2 Message-ID: <200803111459.m2BExiYP005828@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5800 Modified Files: liboil-0.3.13-better-altivec-detect.patch Log Message: Updated patch that should actually compile liboil-0.3.13-better-altivec-detect.patch: Index: liboil-0.3.13-better-altivec-detect.patch =================================================================== RCS file: /cvs/pkgs/rpms/liboil/devel/liboil-0.3.13-better-altivec-detect.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liboil-0.3.13-better-altivec-detect.patch 11 Mar 2008 14:35:30 -0000 1.1 +++ liboil-0.3.13-better-altivec-detect.patch 11 Mar 2008 14:59:39 -0000 1.2 @@ -4,8 +4,8 @@ retrieving revision 1.1 diff -u -p -u -p -r1.1 liboilcpu-powerpc.c --- liboil/liboilcpu-powerpc.c 14 Nov 2007 09:30:20 -0000 1.1 -+++ liboil/liboilcpu-powerpc.c 11 Mar 2008 14:29:22 -0000 -@@ -44,6 +44,15 @@ ++++ liboil/liboilcpu-powerpc.c 11 Mar 2008 14:55:19 -0000 +@@ -44,6 +44,21 @@ //#include //#include @@ -16,12 +16,18 @@ +#include +#include +#include ++ ++#ifndef PPC_FEATURE_HAS_ALTIVEC ++/* From linux-2.6/include/asm-powerpc/cputable.h */ ++#define PPC_FEATURE_HAS_ALTIVEC 0x10000000 ++#endif ++ +#endif + #if defined(__FreeBSD__) #include #include -@@ -67,7 +76,7 @@ test_altivec (void * ignored) +@@ -67,7 +82,7 @@ test_altivec (void * ignored) } #if defined(__FreeBSD__) @@ -30,7 +36,7 @@ oil_check_altivec_sysctl (void) { int ret, av; -@@ -81,6 +90,58 @@ oil_check_altivec_sysctl (void) +@@ -81,6 +96,61 @@ oil_check_altivec_sysctl (void) } #endif @@ -46,8 +52,9 @@ + pid_t pid; + int fd, i; + ++ /* Flags already set */ + if (available != -1) { -+ return available; ++ return; + } + + pid = getpid(); @@ -82,14 +89,16 @@ + +out: + available = new_avail; -+ return available; ++ if (available) { ++ oil_cpu_flags |= OIL_IMPL_FLAG_ALTIVEC; ++ } +} +#endif + void oil_check_altivec_fault (void) { -@@ -97,6 +158,8 @@ oil_cpu_detect_arch(void) +@@ -97,6 +167,8 @@ oil_cpu_detect_arch(void) { #if defined(__FreeBSD__) oil_check_altivec_sysctl(); @@ -98,7 +107,7 @@ #else oil_check_altivec_fault(); #endif -@@ -104,5 +167,3 @@ oil_cpu_detect_arch(void) +@@ -104,5 +176,3 @@ oil_cpu_detect_arch(void) _oil_profile_stamp = oil_profile_stamp_tb; } From fedora-extras-commits at redhat.com Tue Mar 11 15:00:31 2008 From: fedora-extras-commits at redhat.com (Joel Andres Granados Moreno (jgranado)) Date: Tue, 11 Mar 2008 15:00:31 GMT Subject: rpms/firstaidkit/devel firstaidkit.spec,1.3,1.4 Message-ID: <200803111500.m2BF0VIh005873@cvs-int.fedora.redhat.com> Author: jgranado Update of /cvs/pkgs/rpms/firstaidkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5799 Modified Files: firstaidkit.spec Log Message: Require the passwd package in the all plugin package. Index: firstaidkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- firstaidkit.spec 11 Mar 2008 14:38:30 -0000 1.3 +++ firstaidkit.spec 11 Mar 2008 14:59:55 -0000 1.4 @@ -40,6 +40,7 @@ Group: Applications/System Summary: All firstaidkit plugins Requires: %{name} = %{version}-%{release} +Requires: plugin-passwd %description plugin-all This package provides all the necessary firstaidkit plugins. It From fedora-extras-commits at redhat.com Tue Mar 11 15:01:25 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 15:01:25 GMT Subject: rpms/perl-Mail-IMAPClient/devel .cvsignore, 1.2, 1.3 perl-Mail-IMAPClient.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200803111501.m2BF1Pa1013099@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Mail-IMAPClient/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5888 Modified Files: .cvsignore perl-Mail-IMAPClient.spec sources Log Message: update to 3.05 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Apr 2007 19:41:52 -0000 1.2 +++ .cvsignore 11 Mar 2008 15:00:51 -0000 1.3 @@ -1 +1 @@ -Mail-IMAPClient-2.2.9.tar.gz +Mail-IMAPClient-3.05.tar.gz Index: perl-Mail-IMAPClient.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/devel/perl-Mail-IMAPClient.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Mail-IMAPClient.spec 2 Mar 2008 15:55:22 -0000 1.4 +++ perl-Mail-IMAPClient.spec 11 Mar 2008 15:00:51 -0000 1.5 @@ -1,11 +1,11 @@ Name: perl-Mail-IMAPClient -Version: 2.2.9 -Release: 6%{?dist} +Version: 3.05 +Release: 1%{?dist} Summary: An IMAP Client API Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Mail-IMAPClient/ -Source0: http://search.cpan.org/CPAN/authors/id/D/DJ/DJKERNEN/Mail-IMAPClient-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/Mail-IMAPClient-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker), perl(IO::Socket), perl(constant), perl(Socket) BuildRequires: perl(IO::File), perl(IO::Select), perl(Fcntl), perl(Errno), perl(Carp) @@ -42,11 +42,14 @@ %files %defattr(-,root,root,-) -%doc docs/ examples/ +%doc Changes COPYRIGHT README examples/ %{perl_vendorlib}/Mail/ %{_mandir}/man3/*.3* %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 3.05-1 +- 3.05 + * Wed Feb 27 2008 Tom "spot" Callaway - 2.2.9-6 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-IMAPClient/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Apr 2007 19:41:52 -0000 1.2 +++ sources 11 Mar 2008 15:00:51 -0000 1.3 @@ -1 +1 @@ -21c1901d55a2d57f73840cad478c665d Mail-IMAPClient-2.2.9.tar.gz +d1ee4d5b44aa3fb677c8676b45f70d3a Mail-IMAPClient-3.05.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 15:06:03 2008 From: fedora-extras-commits at redhat.com (Alex Lancaster (alexlan)) Date: Tue, 11 Mar 2008 15:06:03 GMT Subject: rpms/Miro/F-7 .cvsignore, 1.6, 1.7 Miro.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200803111506.m2BF634S013296@cvs-int.fedora.redhat.com> Author: alexlan Update of /cvs/extras/rpms/Miro/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13244 Modified Files: .cvsignore Miro.spec sources Log Message: - Update to upstream 1.1.2 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Miro/F-7/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Jan 2008 03:28:12 -0000 1.6 +++ .cvsignore 11 Mar 2008 15:05:27 -0000 1.7 @@ -1 +1 @@ -Miro-1.1.tar.gz +Miro-1.1.2.tar.gz Index: Miro.spec =================================================================== RCS file: /cvs/extras/rpms/Miro/F-7/Miro.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Miro.spec 8 Feb 2008 18:20:38 -0000 1.12 +++ Miro.spec 11 Mar 2008 15:05:27 -0000 1.13 @@ -4,8 +4,8 @@ %define gecko_ver 1.8.1.12 Name: Miro -Version: 1.1 -Release: 3%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Miro - Internet TV Player Group: Applications/Multimedia License: GPLv2+ @@ -75,6 +75,9 @@ %changelog +* Tue Mar 11 2008 Alex Lancaster - 1.1.2-1 +- Update to upstream 1.1.2 release + * Fri Feb 8 2008 Christopher Aillon 1.1-3 - Rebuild against newer gecko Index: sources =================================================================== RCS file: /cvs/extras/rpms/Miro/F-7/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Jan 2008 03:28:12 -0000 1.6 +++ sources 11 Mar 2008 15:05:27 -0000 1.7 @@ -1 +1 @@ -250b37ced7a4753c5717fb65bd2ad6d3 Miro-1.1.tar.gz +747dc21841ba1ce21b6eb7cd41d57afb Miro-1.1.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 15:07:49 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 11 Mar 2008 15:07:49 GMT Subject: rpms/liboil/devel liboil-0.3.13-better-altivec-detect.patch, 1.2, 1.3 Message-ID: <200803111507.m2BF7nRL013404@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13377 Modified Files: liboil-0.3.13-better-altivec-detect.patch Log Message: Another patch update liboil-0.3.13-better-altivec-detect.patch: Index: liboil-0.3.13-better-altivec-detect.patch =================================================================== RCS file: /cvs/pkgs/rpms/liboil/devel/liboil-0.3.13-better-altivec-detect.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- liboil-0.3.13-better-altivec-detect.patch 11 Mar 2008 14:59:39 -0000 1.2 +++ liboil-0.3.13-better-altivec-detect.patch 11 Mar 2008 15:07:43 -0000 1.3 @@ -4,7 +4,7 @@ retrieving revision 1.1 diff -u -p -u -p -r1.1 liboilcpu-powerpc.c --- liboil/liboilcpu-powerpc.c 14 Nov 2007 09:30:20 -0000 1.1 -+++ liboil/liboilcpu-powerpc.c 11 Mar 2008 14:55:19 -0000 ++++ liboil/liboilcpu-powerpc.c 11 Mar 2008 15:07:22 -0000 @@ -44,6 +44,21 @@ //#include //#include @@ -102,7 +102,7 @@ { #if defined(__FreeBSD__) oil_check_altivec_sysctl(); -+#elif defined(#ifdef __linux__) ++#elif defined(__linux__) + oil_check_altivec_proc(); #else oil_check_altivec_fault(); From fedora-extras-commits at redhat.com Tue Mar 11 15:28:11 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Tue, 11 Mar 2008 15:28:11 GMT Subject: rpms/perl-DBD-Pg/F-8 perl-DBD-1.49-segfault.patch, NONE, 1.1 perl-DBD-Pg.spec, 1.37, 1.38 Message-ID: <200803111528.m2BFSB0H013933@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBD-Pg/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13891 Modified Files: perl-DBD-Pg.spec Added Files: perl-DBD-1.49-segfault.patch Log Message: - #229065: double ?? in prepare causes seg fault on execute perl-DBD-1.49-segfault.patch: --- NEW FILE perl-DBD-1.49-segfault.patch --- diff -up DBD-Pg-1.49/dbdimp.c.bleble DBD-Pg-1.49/dbdimp.c --- DBD-Pg-1.49/dbdimp.c.bleble 2006-05-04 04:11:14.000000000 +0200 +++ DBD-Pg-1.49/dbdimp.c 2008-03-11 16:21:18.000000000 +0100 @@ -1542,6 +1542,7 @@ static int dbd_st_prepare_statement (sth } /* Construct the statement, with proper placeholders */ for (currseg=imp_sth->seg; NULL != currseg; currseg=currseg->nextseg) { + if (currseg->segment != NULL) strcat(statement, currseg->segment); if (currseg->placeholder) { sprintf(strchr(statement, '\0'), "$%d", currseg->placeholder); Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/F-8/perl-DBD-Pg.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- perl-DBD-Pg.spec 15 Oct 2007 19:30:49 -0000 1.37 +++ perl-DBD-Pg.spec 11 Mar 2008 15:27:35 -0000 1.38 @@ -1,13 +1,14 @@ Name: perl-DBD-Pg Version: 1.49 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 Summary: A PostgreSQL interface for perl Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/DBD-Pg/ Source0: http://www.cpan.org/authors/id/D/DB/DBDPG/DBD-Pg-%{version}.tar.gz -Patch: perl-DBD-1.31-fixver.patch +Patch0: perl-DBD-1.31-fixver.patch +Patch1: perl-DBD-1.49-segfault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -23,6 +24,7 @@ %prep %setup -q -n DBD-Pg-%{version} %patch0 -p1 +%patch1 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" @@ -57,6 +59,9 @@ %changelog +* Tue Mar 10 2008 Marcela Maslanova - 1.49-5.2 +- #229065: double ?? in prepare causes seg fault on execute + * Mon Oct 15 2007 Tom "spot" Callaway - 1.49-5.1 - add BR: perl(ExtUtils::MakeMaker) From fedora-extras-commits at redhat.com Tue Mar 11 15:30:49 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 15:30:49 GMT Subject: rpms/claws-mail-plugins/F-7 claws-mail-plugins.spec,1.23,1.24 Message-ID: <200803111530.m2BFUnSR014101@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail-plugins/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14009/F-7 Modified Files: claws-mail-plugins.spec Log Message: - fix BR Index: claws-mail-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-7/claws-mail-plugins.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- claws-mail-plugins.spec 24 Feb 2008 15:33:20 -0000 1.23 +++ claws-mail-plugins.spec 11 Mar 2008 15:30:12 -0000 1.24 @@ -19,7 +19,7 @@ Name: claws-mail-plugins Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for claws-mail Group: Applications/Internet @@ -40,7 +40,7 @@ BuildRequires: libidn-devel BuildRequires: libtool BuildRequires: gpgme-devel -BuildRequires: poppler-devel +BuildRequires: poppler-devel poppler-glib-devel BuildRequires: libytnef-devel BuildRequires: ghostscript @@ -678,6 +678,10 @@ %exclude %{_includedir}/ical.h %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 3.3.1-2 +- correct BR + * Sat Feb 23 2008 Andreas Bierfert - 3.3.1-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 15:30:58 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 15:30:58 GMT Subject: rpms/claws-mail-plugins/F-8 claws-mail-plugins.spec,1.26,1.27 Message-ID: <200803111530.m2BFUwf5014118@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail-plugins/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14009/F-8 Modified Files: claws-mail-plugins.spec Log Message: - fix BR Index: claws-mail-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-8/claws-mail-plugins.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- claws-mail-plugins.spec 24 Feb 2008 15:33:24 -0000 1.26 +++ claws-mail-plugins.spec 11 Mar 2008 15:30:19 -0000 1.27 @@ -19,7 +19,7 @@ Name: claws-mail-plugins Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for claws-mail Group: Applications/Internet @@ -40,7 +40,7 @@ BuildRequires: libidn-devel BuildRequires: libtool BuildRequires: gpgme-devel -BuildRequires: poppler-devel +BuildRequires: poppler-devel poppler-glib-devel BuildRequires: libytnef-devel BuildRequires: ghostscript @@ -678,6 +678,10 @@ %exclude %{_includedir}/ical.h %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 3.3.1-2 +- correct BR + * Sat Feb 23 2008 Andreas Bierfert - 3.3.1-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 15:31:03 2008 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 11 Mar 2008 15:31:03 GMT Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.28,1.29 Message-ID: <200803111531.m2BFV3I6014129@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/pkgs/rpms/claws-mail-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14009/devel Modified Files: claws-mail-plugins.spec Log Message: - fix BR Index: claws-mail-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- claws-mail-plugins.spec 11 Mar 2008 10:51:51 -0000 1.28 +++ claws-mail-plugins.spec 11 Mar 2008 15:30:28 -0000 1.29 @@ -19,7 +19,7 @@ Name: claws-mail-plugins Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for claws-mail Group: Applications/Internet @@ -40,7 +40,7 @@ BuildRequires: libidn-devel BuildRequires: libtool BuildRequires: gpgme-devel -BuildRequires: poppler-devel +BuildRequires: poppler-devel poppler-glib-devel BuildRequires: libytnef-devel BuildRequires: ghostscript @@ -678,6 +678,10 @@ %exclude %{_includedir}/ical.h %changelog +* Tue Mar 11 2008 Andreas Bierfert +- 3.3.1-2 +- correct BR + * Sat Feb 23 2008 Andreas Bierfert - 3.3.1-1 - version upgrade From fedora-extras-commits at redhat.com Tue Mar 11 15:31:19 2008 From: fedora-extras-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 11 Mar 2008 15:31:19 GMT Subject: rpms/perl-Mozilla-LDAP/devel perl-Mozilla-LDAP.spec,1.7,1.8 Message-ID: <200803111531.m2BFVJuT014188@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/extras/rpms/perl-Mozilla-LDAP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14093 Modified Files: perl-Mozilla-LDAP.spec Log Message: rebuild for perl 5.10 Index: perl-Mozilla-LDAP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mozilla-LDAP/devel/perl-Mozilla-LDAP.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Mozilla-LDAP.spec 19 Feb 2008 21:47:07 -0000 1.7 +++ perl-Mozilla-LDAP.spec 11 Mar 2008 15:30:45 -0000 1.8 @@ -5,7 +5,7 @@ Summary: LDAP Perl module that wraps the Mozilla C SDK Name: perl-Mozilla-LDAP Version: 1.5.2 -Release: 3%{?dist}.1 +Release: 4%{?dist}.1 License: GPLv2+ and LGPLv2+ and MPLv1.1 Group: Development/Libraries URL: http://www.mozilla.org/directory/perldap.html @@ -87,6 +87,9 @@ %doc CREDITS ChangeLog README MPL-1.1.txt %changelog +* Tue Mar 11 2008 Rich Megginson - 1.5.2-4.1 +- rebuild for perl 5.10 + * Tue Feb 19 2008 Fedora Release Engineering - 1.5.2-3.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 15:32:27 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 11 Mar 2008 15:32:27 GMT Subject: rpms/python-sqlobject/devel .cvsignore, 1.10, 1.11 python-sqlobject.spec, 1.17, 1.18 sources, 1.10, 1.11 python-sqlobject-0.9.4-setup.patch, 1.1, NONE Message-ID: <200803111532.m2BFWRMl014328@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-sqlobject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14259 Modified Files: .cvsignore python-sqlobject.spec sources Removed Files: python-sqlobject-0.9.4-setup.patch Log Message: Update to 0.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlobject/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Mar 2008 20:37:56 -0000 1.10 +++ .cvsignore 11 Mar 2008 15:31:52 -0000 1.11 @@ -1 +1 @@ -SQLObject-0.9.4.tar.gz +SQLObject-0.10.0.tar.gz Index: python-sqlobject.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlobject/devel/python-sqlobject.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- python-sqlobject.spec 6 Mar 2008 20:37:56 -0000 1.17 +++ python-sqlobject.spec 11 Mar 2008 15:31:52 -0000 1.18 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-sqlobject -Version: 0.9.4 +Version: 0.10.0 Release: 1%{?dist} Summary: SQLObject -Object-Relational Manager, aka database wrapper @@ -52,6 +52,9 @@ %{_bindir}/* %changelog +* Tue Mar 11 2008 Luke Macken 0.10.0-1 +- Update to 0.10.0 + * Thu Mar 6 2008 Luke Macken 0.9.4-1 - Update to 0.9.4 - Add python-sqlobject-0.9.4-setup.patch to prevent it from trying to download Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-sqlobject/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Mar 2008 20:37:56 -0000 1.10 +++ sources 11 Mar 2008 15:31:52 -0000 1.11 @@ -1 +1 @@ -087955cc701aec971d85b7ce63fa58aa SQLObject-0.9.4.tar.gz +b061d68ae709b54d18d09307b0ec2667 SQLObject-0.10.0.tar.gz --- python-sqlobject-0.9.4-setup.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 15:35:32 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 11 Mar 2008 15:35:32 GMT Subject: rpms/python-sqlobject/devel python-sqlobject-0.10.0-setup.patch, NONE, 1.1 Message-ID: <200803111535.m2BFZWIC014470@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/python-sqlobject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14459 Added Files: python-sqlobject-0.10.0-setup.patch Log Message: Add python-sqlobject-0.10.0-setup.patch python-sqlobject-0.10.0-setup.patch: --- NEW FILE python-sqlobject-0.10.0-setup.patch --- --- setup.py.orig 2008-03-06 15:27:50.000000000 -0500 +++ setup.py 2008-03-06 15:27:57.000000000 -0500 @@ -1,8 +1,6 @@ # ez_setup doesn't work with Python 2.2, so we use distutils # in that case: try: - from ez_setup import use_setuptools - use_setuptools() from setuptools import setup is_setuptools = True except ImportError: From fedora-extras-commits at redhat.com Tue Mar 11 15:37:49 2008 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 11 Mar 2008 15:37:49 GMT Subject: rpms/perl-MIME-tools/devel .cvsignore, 1.6, 1.7 perl-MIME-tools.spec, 1.19, 1.20 sources, 1.6, 1.7 Message-ID: <200803111537.m2BFbncE014606@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-MIME-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14565 Modified Files: .cvsignore perl-MIME-tools.spec sources Log Message: - Update to 5.425 - Add note about File::Temp requirement - New upstream maintainer -> updated URL for source - Given that this package will not build on old distributions, don't cater for handling old versions of MIME::QuotedPrint in %check and buildreq perl(MIME::Base64) >= 3.03 - Buildreq perl(File::Path) >= 1, perl(File::Spec) >= 0.6, and perl(IO::Stringy) >= 2.110 - Only include README as %%doc, not README* - Dispense with provides filter, no longer needed Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-tools/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Apr 2006 14:14:08 -0000 1.6 +++ .cvsignore 11 Mar 2008 15:37:12 -0000 1.7 @@ -1 +1 @@ -MIME-tools-5.420.tar.gz +MIME-tools-5.425.tar.gz Index: perl-MIME-tools.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- perl-MIME-tools.spec 28 Feb 2008 13:06:57 -0000 1.19 +++ perl-MIME-tools.spec 11 Mar 2008 15:37:12 -0000 1.20 @@ -1,16 +1,22 @@ +# Note: MIME::tools > 5.420 require File::Temp >= 0.17, which is not available +# in Fedora prior to Fedora 9 (it's a core module) + Name: perl-MIME-tools -Version: 5.420 -Release: 6%{?dist} +Version: 5.425 +Release: 1%{?dist} Summary: Modules for parsing and creating MIME entities in Perl Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/MIME-tools/ -Source0: http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DONEILL/MIME-tools-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(IO::Stringy) >= 1.211 -BuildRequires: perl(MIME::Base64) >= 2.20 +BuildRequires: perl(File::Path) >= 1 +BuildRequires: perl(File::Spec) >= 0.6 +BuildRequires: perl(File::Temp) >= 0.17 +BuildRequires: perl(IO::Stringy) >= 2.110 +BuildRequires: perl(MIME::Base64) >= 3.03 BuildRequires: perl-MailTools >= 1.50 BuildRequires: perl(MIME::QuotedPrint) BuildRequires: perl(Test::More) @@ -29,10 +35,6 @@ /usr/bin/iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf8 %{__mv} ChangeLog.utf8 ChangeLog -# Remove redundant provides -%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(main)'" -%define __perl_provides %{provfilt} - # The more useful examples will go in %{_bindir} %{__mkdir} useful-examples %{__mv} examples/mime{dump,encode,explode,postcard,send} useful-examples @@ -60,19 +62,14 @@ cd - %check -if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null; then - %{__make} test -else - # Expected failures: 4, 5 and 7-11 of t/Misc.t - %{__make} test || : -fi +%{__make} test %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) -%doc README* COPYING ChangeLog +%doc README COPYING ChangeLog # Adding examples introduces additional deps, but these are all satisfied by # perl, perl-MIME-tools, and perl-MailTools, which are all deps anyway. %doc examples @@ -82,6 +79,18 @@ %{_mandir}/man3/MIME::*.3pm* %changelog +* Tue Mar 11 2008 Paul Howarth 5.425-1 +- Update to 5.425 +- Add note about File::Temp requirement +- New upstream maintainer -> updated URL for source +- Given that this package will not build on old distributions, don't cater + for handling old versions of MIME::QuotedPrint in %%check and buildreq + perl(MIME::Base64) >= 3.03 +- Buildreq perl(File::Path) >= 1, perl(File::Spec) >= 0.6, and + perl(IO::Stringy) >= 2.110 +- Only include README as %%doc, not README* +- Dispense with provides filter, no longer needed + * Wed Feb 27 2008 Tom "spot" Callaway - 5.420-6 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-MIME-tools/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Apr 2006 14:14:08 -0000 1.6 +++ sources 11 Mar 2008 15:37:12 -0000 1.7 @@ -1 +1 @@ -4db6505cc0132c80c5a9cc54f443a21a MIME-tools-5.420.tar.gz +35821ae976e2884f4350dc25d4734655 MIME-tools-5.425.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 15:39:30 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Tue, 11 Mar 2008 15:39:30 GMT Subject: rpms/perl-DBD-Pg/F-7 perl-DBD-1.49-segfault.patch, NONE, 1.1 perl-DBD-Pg.spec, 1.34, 1.35 Message-ID: <200803111539.m2BFdUob014764@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBD-Pg/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14687 Modified Files: perl-DBD-Pg.spec Added Files: perl-DBD-1.49-segfault.patch Log Message: - #229065: double ?? in prepare causes seg fault on execute perl-DBD-1.49-segfault.patch: --- NEW FILE perl-DBD-1.49-segfault.patch --- diff -up DBD-Pg-1.49/dbdimp.c.bleble DBD-Pg-1.49/dbdimp.c --- DBD-Pg-1.49/dbdimp.c.bleble 2006-05-04 04:11:14.000000000 +0200 +++ DBD-Pg-1.49/dbdimp.c 2008-03-11 16:21:18.000000000 +0100 @@ -1542,6 +1542,7 @@ static int dbd_st_prepare_statement (sth } /* Construct the statement, with proper placeholders */ for (currseg=imp_sth->seg; NULL != currseg; currseg=currseg->nextseg) { + if (currseg->segment != NULL) strcat(statement, currseg->segment); if (currseg->placeholder) { sprintf(strchr(statement, '\0'), "$%d", currseg->placeholder); Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/F-7/perl-DBD-Pg.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- perl-DBD-Pg.spec 5 Dec 2006 19:37:58 -0000 1.34 +++ perl-DBD-Pg.spec 11 Mar 2008 15:38:55 -0000 1.35 @@ -1,13 +1,14 @@ Name: perl-DBD-Pg Version: 1.49 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A PostgresSQL interface for perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-Pg/ Source0: http://www.cpan.org/authors/id/D/DB/DBDPG/DBD-Pg-%{version}.tar.gz -Patch: perl-DBD-1.31-fixver.patch +Patch0: perl-DBD-1.31-fixver.patch +Patch1: perl-DBD-1.49-segfault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -23,6 +24,7 @@ %prep %setup -q -n DBD-Pg-%{version} %patch0 -p1 +%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -55,6 +57,9 @@ %changelog +* Tue Mar 10 2008 Marcela Maslanova - 1.49-4 +- #229065: double ?? in prepare causes seg fault on execute + * Tue Dec 06 2006 Robin Norwood - 1.49-3 - rebuild for new version of postgres. From fedora-extras-commits at redhat.com Tue Mar 11 15:40:17 2008 From: fedora-extras-commits at redhat.com (Joel Andres Granados Moreno (jgranado)) Date: Tue, 11 Mar 2008 15:40:17 GMT Subject: rpms/firstaidkit/devel firstaidkit-0.1.1-syntax-error1.patch, NONE, 1.1 firstaidkit.spec, 1.4, 1.5 Message-ID: <200803111540.m2BFeHGg014842@cvs-int.fedora.redhat.com> Author: jgranado Update of /cvs/pkgs/rpms/firstaidkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14770 Modified Files: firstaidkit.spec Added Files: firstaidkit-0.1.1-syntax-error1.patch Log Message: Correct another syntax error firstaidkit-0.1.1-syntax-error1.patch: --- NEW FILE firstaidkit-0.1.1-syntax-error1.patch --- diff --git a/plugins/passwd.py b/plugins/passwd.py index 87603f1..ce434c4 100644 --- plugins/passwd.py +++ plugins/passwd.py @@ -55,7 +55,7 @@ class PasswdPlugin(Plugin): newpasswd.append(rng.choice(charlist)) print spawnvch(executable = "/usr/bin/passwd", args = ["/usr/bin/passwd", "root"], - chroot = Config.system.root).communicate(input = "%s\n%s\n"%(newpasswd,newpasswd) + chroot = Config.system.root).communicate(input = "%s\n%s\n"%(newpasswd,newpasswd)) self._reporting.info("Root password was reset to '%s'" % (newpasswd,), level = PLUGIN, origin = self) Index: firstaidkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- firstaidkit.spec 11 Mar 2008 14:59:55 -0000 1.4 +++ firstaidkit.spec 11 Mar 2008 15:39:43 -0000 1.5 @@ -12,6 +12,7 @@ URL: http://fedorahosted.org/firstaidkit Source0: %{name}-%{version}.tar.bz2 patch0: %{name}-%{version}-syntax-error.patch +patch1: %{name}-%{version}-syntax-error1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -60,6 +61,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p0 %build From fedora-extras-commits at redhat.com Tue Mar 11 15:43:50 2008 From: fedora-extras-commits at redhat.com (Joel Andres Granados Moreno (jgranado)) Date: Tue, 11 Mar 2008 15:43:50 GMT Subject: rpms/firstaidkit/devel firstaidkit.spec,1.5,1.6 Message-ID: <200803111543.m2BFhorA014962@cvs-int.fedora.redhat.com> Author: jgranado Update of /cvs/pkgs/rpms/firstaidkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14940 Modified Files: firstaidkit.spec Log Message: bump the build Index: firstaidkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- firstaidkit.spec 11 Mar 2008 15:39:43 -0000 1.5 +++ firstaidkit.spec 11 Mar 2008 15:43:16 -0000 1.6 @@ -4,7 +4,7 @@ Name: firstaidkit Version: 0.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: System Rescue Tool Group: Applications/System @@ -109,6 +109,9 @@ %{_libdir}/firstaidkit-plugins/passwd.py %Changelog +* Tue Mar 11 2008 Joel Granados 0.1.1-3 +- Rebuild + * Tue Mar 11 2008 Joel Granados 0.1.1-2 - Fix dependency problem for ppc64 - Patch a syntax error From fedora-extras-commits at redhat.com Tue Mar 11 16:01:54 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Tue, 11 Mar 2008 16:01:54 GMT Subject: rpms/perl-DBD-Pg/F-7 perl-DBD-Pg.spec,1.35,1.36 Message-ID: <200803111601.m2BG1sCg022508@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-DBD-Pg/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15331 Modified Files: perl-DBD-Pg.spec Log Message: Add BR: perl(ExtUtils::MakeMaker) Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-DBD-Pg/F-7/perl-DBD-Pg.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- perl-DBD-Pg.spec 11 Mar 2008 15:38:55 -0000 1.35 +++ perl-DBD-Pg.spec 11 Mar 2008 16:01:03 -0000 1.36 @@ -15,6 +15,7 @@ BuildRequires: perl-DBI >= 1.38, postgresql-devel >= 7.2 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl-DBI >= 1.38 +BuildRequires: perl(ExtUtils::MakeMaker) Provides: perl(DBD::Pg) = %{version} %description From fedora-extras-commits at redhat.com Tue Mar 11 16:04:48 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 11 Mar 2008 16:04:48 GMT Subject: rpms/libvisual/devel libvisual-0.4.0-better-altivec-detection.patch, NONE, 1.1 libvisual.spec, 1.17, 1.18 Message-ID: <200803111604.m2BG4mUc022567@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/libvisual/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22534 Modified Files: libvisual.spec Added Files: libvisual-0.4.0-better-altivec-detection.patch Log Message: * Tue Mar 11 2008 - Bastien Nocera - 0.4.0-6 - Better Altivec detection, code from David Woodhouse libvisual-0.4.0-better-altivec-detection.patch: --- NEW FILE libvisual-0.4.0-better-altivec-detection.patch --- --- libvisual-0.4.0/libvisual/lv_cpu.c.orig 2006-01-22 13:23:37.000000000 +0000 +++ libvisual-0.4.0/libvisual/lv_cpu.c 2008-03-11 16:00:56.000000000 +0000 @@ -50,8 +50,19 @@ #endif #if defined(VISUAL_OS_LINUX) +#if defined(VISUAL_ARCH_POWERPC) +#include +#include +#include +#include +#include + +#include +#include +#else /* VISUAL_ARCH_POWERPC */ #include #endif +#endif #if defined(VISUAL_OS_WIN32) #include @@ -154,6 +165,46 @@ static void check_os_altivec_support( vo if (err == 0) if (has_vu != 0) __lv_cpu_caps.hasAltiVec = 1; +#elif defined (VISUAL_OS_LINUX) + static int available = -1; + int new_avail = 0; + char fname[64]; + unsigned long buf[64]; + ssize_t count; + pid_t pid; + int fd, i; + + if (available != -1) + return; + + pid = getpid(); + snprintf(fname, sizeof(fname)-1, "/proc/%d/auxv", pid); + + fd = open(fname, O_RDONLY); + if (fd < 0) + goto out; +more: + count = read(fd, buf, sizeof(buf)); + if (count < 0) + goto out_close; + + for (i=0; i < (count / sizeof(unsigned long)); i += 2) { + if (buf[i] == AT_HWCAP) { + new_avail = !!(buf[i+1] & PPC_FEATURE_HAS_ALTIVEC); + goto out_close; + } else if (buf[i] == AT_NULL) { + goto out_close; + } + } + + if (count == sizeof(buf)) + goto more; +out_close: + close(fd); +out: + available = new_avail; + if (available) + __lv_cpu_caps.hasAltiVec = 1; #else /* !VISUAL_OS_DARWIN */ /* no Darwin, do it the brute-force way */ /* this is borrowed from the libmpeg2 library */ Index: libvisual.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvisual/devel/libvisual.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libvisual.spec 18 Feb 2008 18:20:25 -0000 1.17 +++ libvisual.spec 11 Mar 2008 16:04:13 -0000 1.18 @@ -12,6 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-proto-devel +# https://bugzilla.redhat.com/show_bug.cgi?id=435771 +Patch0: libvisual-0.4.0-better-altivec-detection.patch + %description Libvisual is an abstraction library that comes between applications and @@ -39,6 +42,7 @@ %prep %setup -q +%patch0 -p1 -b .altivec-detection %build %ifarch i386 @@ -80,6 +84,9 @@ %changelog +* Tue Mar 11 2008 - Bastien Nocera - 0.4.0-6 +- Better Altivec detection, code from David Woodhouse + * Mon Feb 18 2008 Fedora Release Engineering - 0.4.0-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 16:05:54 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 11 Mar 2008 16:05:54 GMT Subject: rpms/libvisual/devel libvisual.spec,1.18,1.19 Message-ID: <200803111605.m2BG5smj022651@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/libvisual/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22622 Modified Files: libvisual.spec Log Message: Update release Index: libvisual.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvisual/devel/libvisual.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libvisual.spec 11 Mar 2008 16:04:13 -0000 1.18 +++ libvisual.spec 11 Mar 2008 16:05:18 -0000 1.19 @@ -2,7 +2,7 @@ Name: libvisual Version: 0.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Abstraction library for audio visualisation plugins Group: Applications/Multimedia From fedora-extras-commits at redhat.com Tue Mar 11 16:49:27 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Tue, 11 Mar 2008 16:49:27 GMT Subject: rpms/coreutils/F-7 coreutils-dddoubleclose.patch, NONE, 1.1 coreutils-colorls.csh, 1.4, 1.5 coreutils-colorls.sh, 1.4, 1.5 coreutils.spec, 1.177, 1.178 Message-ID: <200803111649.m2BGnRXm023460@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23410 Modified Files: coreutils-colorls.csh coreutils-colorls.sh coreutils.spec Added Files: coreutils-dddoubleclose.patch Log Message: dd doubleclose + other way to keep user defined LS_COLORS coreutils-dddoubleclose.patch: --- NEW FILE coreutils-dddoubleclose.patch --- diff -urNp coreutils-6.9-orig/src/dd.c coreutils-6.9/src/dd.c --- coreutils-6.9-orig/src/dd.c +++ coreutils-6.9/src/dd.c @@ -391,6 +391,25 @@ static char const ebcdic_to_ascii[] = '\070', '\071', '\372', '\373', '\374', '\375', '\376', '\377' }; +/* True if we need to close the standard output *stream*. */ +static bool close_stdout_required = true; + +/* The only reason to close the standard output *stream* is if + parse_long_options fails (as it does for --help or --version). + In any other case, dd uses only the STDOUT_FILENO file descriptor, + and the "cleanup" function calls "close (STDOUT_FILENO)". + Closing the file descriptor and then letting the usual atexit-run + close_stdout function call "fclose (stdout)" would result in a + harmless failure of the close syscall (with errno EBADF). + This function serves solely to avoid the unnecessary close_stdout + call, once parse_long_options has succeeded. */ +static void +maybe_close_stdout (void) +{ + if (close_stdout_required) + close_stdout (); +} + void usage (int status) { @@ -1639,12 +1658,14 @@ main (int argc, char **argv) textdomain (PACKAGE); /* Arrange to close stdout if parse_long_options exits. */ - atexit (close_stdout); + atexit (maybe_close_stdout); page_size = getpagesize (); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); + close_stdout_required = false; + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); Index: coreutils-colorls.csh =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-7/coreutils-colorls.csh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- coreutils-colorls.csh 4 Mar 2008 13:41:39 -0000 1.4 +++ coreutils-colorls.csh 11 Mar 2008 16:48:56 -0000 1.5 @@ -1,7 +1,7 @@ # color-ls initialization -if ( $?LS_COLORS ) then - if ( "$LS_COLORS" != "" ) then - #do not override user specified LS_COLORS and use them +if ( $?USER_LS_COLORS ) then + if ( "$USER_LS_COLORS" != "" ) then + #When USER_LS_COLORS set, do not override user specified LS_COLORS but use them goto finish endif endif Index: coreutils-colorls.sh =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-7/coreutils-colorls.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- coreutils-colorls.sh 4 Mar 2008 13:41:39 -0000 1.4 +++ coreutils-colorls.sh 11 Mar 2008 16:48:56 -0000 1.5 @@ -1,7 +1,7 @@ # color-ls initialization -#do not override user LS_COLORS, but use them. -if [ -z "$LS_COLORS" ]; then +#do not override user LS_COLORS, but use them when USER_LS_COLORS is set. +if [ -z "$USER_LS_COLORS" ]; then alias ll='ls -l' 2>/dev/null alias l.='ls -d .*' 2>/dev/null Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-7/coreutils.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- coreutils.spec 4 Mar 2008 13:41:39 -0000 1.177 +++ coreutils.spec 11 Mar 2008 16:48:56 -0000 1.178 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.9 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -21,6 +21,7 @@ Patch2: coreutils-ls-x.patch Patch3: coreutils-6.9-cp-i-u.patch Patch4: coreutils-6.9-du-ls-upstream.patch +Patch5: coreutils-dddoubleclose.patch # Our patches Patch100: coreutils-chgrp.patch @@ -95,6 +96,7 @@ %patch2 -p1 -b .ls-x %patch3 -p1 -b .cp-i-u %patch4 -p1 -b .du-ls +%patch5 -p1 -b .doubleclose # Our patches %patch100 -p1 -b .chgrp @@ -285,6 +287,10 @@ /sbin/runuser %changelog +* Tue Mar 11 2008 Ondrej Vasik 6.9-8 +- other way to keep user defined LS_COLORS(#430827) +- fixed harmless double close stdout in dd(#436368) + * Tue Mar 04 2008 Ondrej Vasik 6.9-7 - su-l/runuser-l pam file usage a bit documented(#368721) - added several missing colored TERMS(#239266) From fedora-extras-commits at redhat.com Tue Mar 11 16:50:46 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Tue, 11 Mar 2008 16:50:46 GMT Subject: rpms/rhgb/devel .cvsignore, 1.28, 1.29 rhgb.spec, 1.88, 1.89 sources, 1.30, 1.31 Message-ID: <200803111650.m2BGokbi023541@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/rhgb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23468 Modified Files: .cvsignore rhgb.spec sources Log Message: Add upstart event Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rhgb/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 16 Oct 2007 17:05:29 -0000 1.28 +++ .cvsignore 11 Mar 2008 16:50:14 -0000 1.29 @@ -1 +1,2 @@ -rhgb-8.0.1.tar.gz +rhgb-0.17.7.tar.gz +rhgb.upstart-job Index: rhgb.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhgb/devel/rhgb.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- rhgb.spec 19 Feb 2008 22:43:49 -0000 1.88 +++ rhgb.spec 11 Mar 2008 16:50:14 -0000 1.89 @@ -3,10 +3,11 @@ Summary: Red Hat Graphical Boot Name: rhgb Version: 0.17.7 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz +Source1: rhgb.upstart-job License: GPLv2 Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -15,10 +16,12 @@ BuildRequires: vte-devel BuildRequires: gettext BuildRequires: libxf86config-devel >= 1.1.1-7 +Requires: upstart Requires: initscripts >= 7.22-1 Requires: system-logos Patch0: rhgb-0.17.7-strict-exit.patch Patch1: rhgb-0.17.7-dri.patch +Patch2: rhgb-0.17.7-nodaemon-option.patch %description Red Hat Graphical Boot provides a clean and simple interface to the boot process @@ -27,6 +30,7 @@ %setup -q %patch0 -p1 -b .strict-exit %patch1 -p1 -b .dri +%patch2 -p1 -b .nodaemon-option %build %configure @@ -38,7 +42,8 @@ %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT \ +make install DESTDIR=$RPM_BUILD_ROOT +cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/event.d/rhgb %find_lang %{gettext_package} Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rhgb/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 12 Nov 2007 16:33:37 -0000 1.30 +++ sources 11 Mar 2008 16:50:14 -0000 1.31 @@ -1 +1,2 @@ d4ca6badf78b32aa342a5036de4650ff rhgb-0.17.7.tar.gz +78e3ea773465ee4b50bd53c7c7023546 rhgb.upstart-job From fedora-extras-commits at redhat.com Tue Mar 11 16:52:22 2008 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Tue, 11 Mar 2008 16:52:22 GMT Subject: rpms/knetworkmanager/devel dead.package,NONE,1.1 Message-ID: <200803111652.m2BGqMiR023582@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/knetworkmanager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23567 Added Files: dead.package Log Message: knetworkmanager is dead --- NEW FILE dead.package --- knetworkmanager's upstream is next to nonexistant and at the moment not likely to be an option anytime in the foreseeable future From fedora-extras-commits at redhat.com Tue Mar 11 16:52:52 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Tue, 11 Mar 2008 16:52:52 GMT Subject: rpms/rhgb/devel rhgb.spec,1.89,1.90 Message-ID: <200803111652.m2BGqqIu023614@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/rhgb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23563 Modified Files: rhgb.spec Log Message: Changelog entry for previous commit Index: rhgb.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhgb/devel/rhgb.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- rhgb.spec 11 Mar 2008 16:50:14 -0000 1.89 +++ rhgb.spec 11 Mar 2008 16:52:20 -0000 1.90 @@ -61,6 +61,9 @@ %dir %{_sysconfdir}/rhgb/temp %changelog +* Tue Mar 12 2008 Casey Dahlin - 1:0.17.7-6 +- Add an upstart event to start rhgb + * Tue Feb 19 2008 Fedora Release Engineering - 1:0.17.7-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 16:56:39 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Tue, 11 Mar 2008 16:56:39 GMT Subject: rpms/rhgb/devel rhgb-0.17.7-nodaemon-option.patch,NONE,1.1 Message-ID: <200803111656.m2BGudeC023725@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/rhgb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23711 Added Files: rhgb-0.17.7-nodaemon-option.patch Log Message: Add missing nodaemon patch rhgb-0.17.7-nodaemon-option.patch: --- NEW FILE rhgb-0.17.7-nodaemon-option.patch --- diff -urN rhgb-0.17.7/src/main.c rhgb-0.17.7-new/src/main.c --- rhgb-0.17.7/src/main.c 2007-10-01 10:00:38.000000000 -0400 +++ rhgb-0.17.7-new/src/main.c 2008-03-02 23:07:51.000000000 -0500 @@ -108,6 +108,7 @@ static gint current_interval = -1; static gboolean force_arg = 0; static gboolean debug = 0; +static gboolean nodaemon = 0; static gboolean force_debug = 0; static gboolean debug_interface = 0; static char *use_existing_server = NULL; @@ -982,6 +983,8 @@ POPT_AUTOHELP { "force", 'f', POPT_ARG_NONE, &force_arg, 1, N_("Force the graphical boot to start"), NULL }, + { "no-daemon", 'n', POPT_ARG_NONE, &nodaemon, 0, + N_("Do not fork"), NULL }, { "debug", 'd', POPT_ARG_NONE, &debug, 0, N_("Leave debugging information up"), NULL }, { "use-existing-server", 'u', POPT_ARG_STRING, &use_existing_server, 0, @@ -1033,17 +1036,19 @@ if (setup_ramfs () != 0) setup_failed (); - DEBUG_MESSAGE("forking\n"); - pid = fork (); - if (pid < 0) - setup_failed (); - else if (pid > 0) - { - char *buf[5]; - close (pipe_fds[1]); - read (pipe_fds[0], buf, 4); - exit (0); - } + if (!nodaemon) { + DEBUG_MESSAGE("forking\n"); + pid = fork (); + if (pid < 0) + setup_failed (); + else if (pid > 0) + { + char *buf[5]; + close (pipe_fds[1]); + read (pipe_fds[0], buf, 4); + exit (0); + } + } /* Set ourselves up as a daemon */ close (pipe_fds[0]); From fedora-extras-commits at redhat.com Tue Mar 11 17:12:19 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Tue, 11 Mar 2008 17:12:19 GMT Subject: rpms/rhgb/devel rhgb.spec,1.90,1.91 Message-ID: <200803111712.m2BHCJ8T031259@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/rhgb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31228 Modified Files: rhgb.spec Log Message: Fix installation for upstart job Index: rhgb.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhgb/devel/rhgb.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- rhgb.spec 11 Mar 2008 16:52:20 -0000 1.90 +++ rhgb.spec 11 Mar 2008 17:11:33 -0000 1.91 @@ -3,7 +3,7 @@ Summary: Red Hat Graphical Boot Name: rhgb Version: 0.17.7 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz @@ -16,7 +16,6 @@ BuildRequires: vte-devel BuildRequires: gettext BuildRequires: libxf86config-devel >= 1.1.1-7 -Requires: upstart Requires: initscripts >= 7.22-1 Requires: system-logos Patch0: rhgb-0.17.7-strict-exit.patch @@ -43,6 +42,7 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/event.d/ cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/event.d/rhgb %find_lang %{gettext_package} @@ -58,9 +58,13 @@ %{_datadir}/rhgb %dir %{_sysconfdir}/rhgb %{_sysconfdir}/rhgb/* +%{_sysconfdir}/event.d/rhgb %dir %{_sysconfdir}/rhgb/temp %changelog +* Tue Mar 12 2008 Casey Dahlin - 1:0.17.7-7 +- Fix upstart job install + * Tue Mar 12 2008 Casey Dahlin - 1:0.17.7-6 - Add an upstart event to start rhgb From fedora-extras-commits at redhat.com Tue Mar 11 17:17:48 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Tue, 11 Mar 2008 17:17:48 GMT Subject: rpms/coreutils/F-8 coreutils-dddoubleclose.patch, NONE, 1.1 coreutils-colorls.csh, 1.5, 1.6 coreutils-colorls.sh, 1.4, 1.5 coreutils.spec, 1.185, 1.186 Message-ID: <200803111717.m2BHHmWn031445@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/coreutils/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31382 Modified Files: coreutils-colorls.csh coreutils-colorls.sh coreutils.spec Added Files: coreutils-dddoubleclose.patch Log Message: fixed harmless double close stdout in dd, other way to keep user defined LS_COLORS coreutils-dddoubleclose.patch: --- NEW FILE coreutils-dddoubleclose.patch --- diff -urNp coreutils-6.9-orig/src/dd.c coreutils-6.9/src/dd.c --- coreutils-6.9-orig/src/dd.c +++ coreutils-6.9/src/dd.c @@ -391,6 +391,25 @@ static char const ebcdic_to_ascii[] = '\070', '\071', '\372', '\373', '\374', '\375', '\376', '\377' }; +/* True if we need to close the standard output *stream*. */ +static bool close_stdout_required = true; + +/* The only reason to close the standard output *stream* is if + parse_long_options fails (as it does for --help or --version). + In any other case, dd uses only the STDOUT_FILENO file descriptor, + and the "cleanup" function calls "close (STDOUT_FILENO)". + Closing the file descriptor and then letting the usual atexit-run + close_stdout function call "fclose (stdout)" would result in a + harmless failure of the close syscall (with errno EBADF). + This function serves solely to avoid the unnecessary close_stdout + call, once parse_long_options has succeeded. */ +static void +maybe_close_stdout (void) +{ + if (close_stdout_required) + close_stdout (); +} + void usage (int status) { @@ -1639,12 +1658,14 @@ main (int argc, char **argv) textdomain (PACKAGE); /* Arrange to close stdout if parse_long_options exits. */ - atexit (close_stdout); + atexit (maybe_close_stdout); page_size = getpagesize (); parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); + close_stdout_required = false; + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); Index: coreutils-colorls.csh =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils-colorls.csh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- coreutils-colorls.csh 4 Mar 2008 12:54:13 -0000 1.5 +++ coreutils-colorls.csh 11 Mar 2008 17:17:17 -0000 1.6 @@ -1,7 +1,8 @@ # color-ls initialization -if ( $?LS_COLORS ) then - if ( "$LS_COLORS" != "" ) then - #do not override user specified LS_COLORS and use them +if ( $?USER_LS_COLORS ) then + if ( "$USER_LS_COLORS" != "" ) then + #when USER_LS_COLORS defined do not override user + #specified LS_COLORS and use them goto finish endif endif Index: coreutils-colorls.sh =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils-colorls.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- coreutils-colorls.sh 19 Feb 2008 12:34:54 -0000 1.4 +++ coreutils-colorls.sh 11 Mar 2008 17:17:18 -0000 1.5 @@ -1,7 +1,7 @@ # color-ls initialization -#do not override user LS_COLORS, but use them. -if [ -z "$LS_COLORS" ]; then +#when USER_LS_COLORS defined do not override user LS_COLORS, but use them. +if [ -z "$USER_LS_COLORS" ]; then alias ll='ls -l' 2>/dev/null alias l.='ls -d .*' 2>/dev/null @@ -26,7 +26,7 @@ # Existence of $COLORS already checked above. [ -n "$COLORS" ] || return - eval `dircolors --sh "$COLORS" 2>/dev/null` + eval "`dircolors --sh "$COLORS" 2>/dev/null`" [ -z "$LS_COLORS" ] && return egrep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return fi Index: coreutils.spec =================================================================== RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils.spec,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- coreutils.spec 6 Mar 2008 12:46:01 -0000 1.185 +++ coreutils.spec 11 Mar 2008 17:17:18 -0000 1.186 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.9 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -21,6 +21,7 @@ Patch2: coreutils-ls-x.patch Patch3: coreutils-6.9-cp-i-u.patch Patch4: coreutils-6.9-du-ls-upstream.patch +Patch5: coreutils-dddoubleclose.patch # Our patches Patch100: coreutils-chgrp.patch @@ -94,6 +95,7 @@ %patch2 -p1 -b .ls-x %patch3 -p1 -b .cp-i-u %patch4 -p1 -b .du-ls +%patch5 -p1 -b .doubleclose # Our patches %patch100 -p1 -b .chgrp @@ -293,6 +295,10 @@ /sbin/runuser %changelog +* Tue Mar 11 2008 Ondrej Vasik 6.9-16 +- other way to keep user defined LS_COLORS(#430827) +- fixed harmless double close stdout in dd(#436368) + * Thu Mar 6 2008 Ondrej Vasik - 6.9-15 - rebuild / unspotted 6.9-14 build failure on ppc64 From fedora-extras-commits at redhat.com Tue Mar 11 17:17:51 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 11 Mar 2008 17:17:51 GMT Subject: rpms/qt/devel qt.spec,1.160,1.161 Message-ID: <200803111717.m2BHHp4A031450@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31374/devel Modified Files: qt.spec Log Message: * Tue Mar 11 2008 Kevin Kofler 3.3.8b-8 - prepare for rename to qt3 on Fedora >= 9 (not enabled yet) - add Provides and Obsoletes everywhere - update summaries and descriptions - remove dots at end of Summary tags - fix non-UTF-8 characters Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- qt.spec 11 Mar 2008 13:18:15 -0000 1.160 +++ qt.spec 11 Mar 2008 17:17:16 -0000 1.161 @@ -1,8 +1,17 @@ -Summary: The shared library for the Qt GUI toolkit. +Summary: The shared library for the Qt 3 GUI toolkit +%if 0 +#if 0%{?fedora} > 8 +Name: qt3 +Obsoletes: qt < 1:%{version}-%{release} +Provides: qt = 1:%{version}-%{release} +%else Name: qt -Version: 3.3.8b -Release: 7%{?dist} Epoch: 1 +Obsoletes: qt3 < %{version}-%{release} +Provides: qt3 = %{version}-%{release} +%endif +Version: 3.3.8b +Release: 8%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -93,8 +102,6 @@ Requires: /etc/ld.so.conf.d Requires: pkgconfig -Provides: qt3 = %version-%release - BuildRequires: desktop-file-utils BuildRequires: libmng-devel BuildRequires: glibc-devel @@ -130,16 +137,25 @@ BuildRequires: unixODBC-devel BuildRequires: sqlite-devel + %package config -Summary: Graphical configuration tool for programs using Qt +Summary: Graphical configuration tool for programs using Qt 3 Group: User Interface/Desktops -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} + +%if "%{name}" == "qt" +Obsoletes: qt3-config < %{version}-%{release} +Provides: qt3-config = %{version}-%{release} +%else +Obsoletes: qt-config < 1:%{version}-%{release} +Provides: qt-config = 1:%{version}-%{release} +%endif %package devel -Summary: Development files for the Qt GUI toolkit. +Summary: Development files for the Qt 3 GUI toolkit Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} Requires: freetype-devel Requires: fontconfig-devel Requires: libXrender-devel @@ -159,42 +175,97 @@ Requires: mesa-libGL-devel Requires: mesa-libGLU-devel -Provides: qt3-devel = %version-%release +%if "%{name}" == "qt" +Obsoletes: qt3-devel < %{version}-%{release} +Provides: qt3-devel = %{version}-%{release} +%else +Obsoletes: qt-devel < 1:%{version}-%{release} +Provides: qt-devel = 1:%{version}-%{release} +%endif + %package devel-docs -Summary: Documentation for the Qt GUI toolkit. +Summary: Documentation for the Qt 3 GUI toolkit Group: Development/Libraries -Requires: %{name}-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-devel = %{?epoch:%{epoch}:}:%{version}-%{release} + +%if "%{name}" == "qt" +Obsoletes: qt3-devel-docs < %{version}-%{release} +Provides: qt3-devel-docs = %{version}-%{release} +%else +Obsoletes: qt-devel-docs < 1:%{version}-%{release} +Provides: qt-devel-docs = 1:%{version}-%{release} +%endif %package ODBC -Summary: ODBC drivers for Qt's SQL classes. +Summary: ODBC drivers for Qt 3's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} + +%if "%{name}" == "qt" +Obsoletes: qt3-ODBC < %{version}-%{release} +Provides: qt3-ODBC = %{version}-%{release} +%else +Obsoletes: qt-ODBC < 1:%{version}-%{release} +Provides: qt-ODBC = 1:%{version}-%{release} +%endif %package MySQL -Summary: MySQL drivers for Qt's SQL classes. +Summary: MySQL drivers for Qt 3's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} + +%if "%{name}" == "qt" +Obsoletes: qt3-MySQL < %{version}-%{release} +Provides: qt3-MySQL = %{version}-%{release} +%else +Obsoletes: qt-MySQL < 1:%{version}-%{release} +Provides: qt-MySQL = 1:%{version}-%{release} +%endif %package PostgreSQL -Summary: PostgreSQL drivers for Qt's SQL classes. +Summary: PostgreSQL drivers for Qt 3's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} + +%if "%{name}" == "qt" +Obsoletes: qt3-PostgreSQL < %{version}-%{release} +Provides: qt3-PostgreSQL = %{version}-%{release} +%else +Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} +Provides: qt-PostgreSQL = 1:%{version}-%{release} +%endif %package sqlite -Summary: sqlite drivers for Qt's SQL classes. +Summary: sqlite drivers for Qt 3's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} + +%if "%{name}" == "qt" +Obsoletes: qt3-sqlite < %{version}-%{release} +Provides: qt3-sqlite = %{version}-%{release} +%else +Obsoletes: qt-sqlite < 1:%{version}-%{release} +Provides: qt-sqlite = 1:%{version}-%{release} +%endif %package designer -Summary: Interface designer (IDE) for the Qt toolkit +Summary: Interface designer (IDE) for the Qt 3 toolkit Group: Development/Tools -Requires: %{name}-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-devel = %{?epoch:%{epoch}:}:%{version}-%{release} + +%if "%{name}" == "qt" +Obsoletes: qt3-designer < %{version}-%{release} +Provides: qt3-designer = %{version}-%{release} +%else +Obsoletes: qt-designer < 1:%{version}-%{release} +Provides: qt-designer = 1:%{version}-%{release} +%endif %description @@ -204,8 +275,8 @@ Qt is written in C++ and is fully object-oriented. -This package contains the shared library needed to run qt -applications, as well as the README files for qt. +This package contains the shared library needed to run Qt 3 +applications, as well as the README files for Qt 3. %description config @@ -215,46 +286,46 @@ Qt is written in C++ and is fully object-oriented. -This package contains a graphical configuration tool for programs using Qt. +This package contains a graphical configuration tool for programs using Qt 3. %description devel -The qt-devel package contains the files necessary to develop +The %{name}-devel package contains the files necessary to develop applications using the Qt GUI toolkit: the header files, the Qt meta object compiler. -Install qt-devel if you want to develop GUI applications using the Qt +Install %{name}-devel if you want to develop GUI applications using the Qt 3 toolkit. %description devel-docs -The qt-devel-docs package contains the man pages, the HTML documentation and -example programs. +The %{name}-devel-docs package contains the man pages, the HTML documentation and +example programs for Qt 3. %description ODBC -ODBC driver for Qt's SQL classes (QSQL) +ODBC driver for Qt 3's SQL classes (QSQL) %description MySQL -MySQL driver for Qt's SQL classes (QSQL) +MySQL driver for Qt 3's SQL classes (QSQL) %description PostgreSQL -PostgreSQL driver for Qt's SQL classes (QSQL) +PostgreSQL driver for Qt 3's SQL classes (QSQL) %description sqlite -sqlite driver for Qt's SQL classes (QSQL) +sqlite driver for Qt 3's SQL classes (QSQL) %description designer -The qt-designer package contains an User Interface designer tool -for the Qt toolkit. +The %{name}-designer package contains an User Interface designer tool +for the Qt 3 toolkit. %prep -%setup -q -n %{name}-x11-free-%{version} +%setup -q -n qt-x11-free-%{version} %patch1 -p1 -b .cjk %patch2 -p1 -b .ndebug %patch3 -p1 -b .makefile @@ -460,7 +531,7 @@ mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ - --vendor="%{name}" \ + --vendor="qt" \ %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} # Patch qmake to use qt-mt unconditionally @@ -576,6 +647,13 @@ %changelog +* Tue Mar 11 2008 Kevin Kofler 3.3.8b-8 +- prepare for rename to qt3 on Fedora >= 9 (not enabled yet) +- add Provides and Obsoletes everywhere +- update summaries and descriptions +- remove dots at end of Summary tags +- fix non-UTF-8 characters + * Tue Mar 11 2008 Than Ngo 3.3.8b-7 - 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h @@ -1622,7 +1700,7 @@ * Fri Mar 3 2000 Bill Nottingham - fix %postun script -* Fri Feb 18 2000 Bernhard Rosenkr???zer +* Fri Feb 18 2000 Bernhard Rosenkr??nzer - beta1 - get rid of qt-ImageIO, the functionality is now in the main Qt library - remove qt-Network, the functionality is now in the main Qt library @@ -1648,7 +1726,7 @@ * Thu Jan 13 2000 Bernhard Rosenkraenzer - switch from glxMesa to Mesa for the GL addon -* Wed Jan 5 2000 Bernhard Rosenkr???zer +* Wed Jan 5 2000 Bernhard Rosenkr??nzer - Fix up dependencies - new snapshot From fedora-extras-commits at redhat.com Tue Mar 11 17:18:40 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 11 Mar 2008 17:18:40 GMT Subject: rpms/TurboGears/devel TurboGears-1.0.4.4-cherrypyreq.patch, NONE, 1.1 TurboGears.spec, 1.36, 1.37 Message-ID: <200803111718.m2BHIeg6031539@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/TurboGears/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31433 Modified Files: TurboGears.spec Added Files: TurboGears-1.0.4.4-cherrypyreq.patch Log Message: - Add TurboGears-1.0.4.4-cherrypyreq.patch to explicitly require the appropriate version of CherryPy when necessary. TurboGears-1.0.4.4-cherrypyreq.patch: --- NEW FILE TurboGears-1.0.4.4-cherrypyreq.patch --- --- turbogears/config.py.orig 2008-03-11 11:50:04.000000000 -0400 +++ turbogears/config.py 2008-03-11 11:50:22.000000000 -0400 @@ -1,8 +1,8 @@ import sys, os, glob, re - +import pkg_resources +pkg_resources.require("CherryPy<3.0") from cherrypy import config from configobj import ConfigObj -import pkg_resources import logging import logging.handlers Index: TurboGears.spec =================================================================== RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- TurboGears.spec 8 Mar 2008 01:03:35 -0000 1.36 +++ TurboGears.spec 11 Mar 2008 17:18:08 -0000 1.37 @@ -3,13 +3,15 @@ Name: TurboGears Version: 1.0.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Back-to-front web development in Python Group: Development/Languages License: MIT URL: http://www.turbogears.org Source0: http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-cherrypyreq.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -63,6 +65,7 @@ %prep %setup -q +%patch0 -b .cherrypyreq %build @@ -84,6 +87,10 @@ %{python_sitelib}/turbogears/ %changelog +* Tue Mar 11 2008 Luke Macken 1.0.4.4-2 +- Add TurboGears-1.0.4.4-cherrypyreq.patch to explicitly require the + appropriate version of CherryPy when necessary. + * Fri Mar 7 2008 Luke Macken 1.0.4.4-1 - Update to 1.0.4.4 - Remove the setuptools and sqlalchemy-backport patches From fedora-extras-commits at redhat.com Tue Mar 11 17:37:11 2008 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 11 Mar 2008 17:37:11 GMT Subject: rpms/deskbar-applet/devel .cvsignore, 1.36, 1.37 deskbar-applet.spec, 1.64, 1.65 sources, 1.36, 1.37 Message-ID: <200803111737.m2BHbBgn032015@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/pkgs/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31985 Modified Files: .cvsignore deskbar-applet.spec sources Log Message: Update to 2.22.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 29 Feb 2008 04:43:48 -0000 1.36 +++ .cvsignore 11 Mar 2008 17:36:40 -0000 1.37 @@ -1 +1 @@ -deskbar-applet-2.21.92.tar.bz2 +deskbar-applet-2.22.0.1.tar.bz2 Index: deskbar-applet.spec =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- deskbar-applet.spec 29 Feb 2008 04:43:48 -0000 1.64 +++ deskbar-applet.spec 11 Mar 2008 17:36:40 -0000 1.65 @@ -2,7 +2,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: deskbar-applet -Version: 2.21.92 +Version: 2.22.0.1 Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines @@ -102,6 +102,9 @@ %changelog +* Tue Mar 11 2008 Luke Macken - 2.22.0.1-1 +- Update to 2.22.0.1 + * Thu Feb 28 2008 Luke Macken - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 29 Feb 2008 04:43:48 -0000 1.36 +++ sources 11 Mar 2008 17:36:40 -0000 1.37 @@ -1 +1 @@ -79894e4968a72b500c311ff49dbb5a39 deskbar-applet-2.21.92.tar.bz2 +ec335345998e5ca6c71b058904a264e4 deskbar-applet-2.22.0.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 18:06:12 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 11 Mar 2008 18:06:12 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.2,1.3 Message-ID: <200803111806.m2BI6CMP007334@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7286 Modified Files: java-1.6.0-openjdk.spec Log Message: * Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 - Added Provides and Obsoletes. This package replaces java-1.7.0-icedtea. Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- java-1.6.0-openjdk.spec 10 Mar 2008 15:11:44 -0000 1.2 +++ java-1.6.0-openjdk.spec 11 Mar 2008 18:05:41 -0000 1.3 @@ -101,7 +101,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.1.%{openjdkver}%{?dist} +Release: 0.2.%{openjdkver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -191,6 +191,10 @@ # Postun requires alternatives to uninstall tool alternatives. Requires(postun): %{_sbindir}/alternatives +# java-1.6.0-openjdk replaces java-1.7.0-icedtea +Provides: java-1.7.0-icedtea = 0:1.7.0-0.999 +Obsoletes: java-1.7.0-icedtea < 0:1.7.0-0.999 + # Standard JPackage base provides. Provides: jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release} Provides: jre-%{origin} = %{epoch}:%{version}-%{release} @@ -754,6 +758,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 +- Added Provides and Obsoletes. This package replaces java-1.7.0-icedtea. + * Fri Feb 15 2008 Lillian Angel - 1:1.6.0.0-0.1.b06 - Adapted for java-1.6.0-openjdk. From fedora-extras-commits at redhat.com Tue Mar 11 18:06:28 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 11 Mar 2008 18:06:28 GMT Subject: rpms/kernel/devel patch-2.6.25-rc5-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.778, 1.779 config-generic, 1.82, 1.83 kernel.spec, 1.491, 1.492 sources, 1.738, 1.739 upstream, 1.660, 1.661 Message-ID: <200803111806.m2BI6Smc007349@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7282 Modified Files: .cvsignore config-generic kernel.spec sources upstream Added Files: patch-2.6.25-rc5-git1.bz2.sign Log Message: * Tue Mar 11 2008 Dave Jones - 2.6.25-rc5-git1 --- NEW FILE patch-2.6.25-rc5-git1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBH1i6qyGugalF9Dw4RApnEAJsHeeifR7girTI9xEhlEz8uSdaJMwCeOyYJ C5AEI2nYOBnLFjW2pk2rk4Q= =n0Ch -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.778 retrieving revision 1.779 diff -u -r1.778 -r1.779 --- .cvsignore 10 Mar 2008 15:06:49 -0000 1.778 +++ .cvsignore 11 Mar 2008 18:05:41 -0000 1.779 @@ -6,3 +6,4 @@ linux-2.6.24.tar.bz2 patch-2.6.25-rc5.bz2 patch-2.6.25-rc4-git3.bz2 +patch-2.6.25-rc5-git1.bz2 Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- config-generic 10 Mar 2008 20:04:14 -0000 1.82 +++ config-generic 11 Mar 2008 18:05:41 -0000 1.83 @@ -643,6 +643,7 @@ CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # # IEEE 1394 (FireWire) support @@ -3458,9 +3459,8 @@ # CONFIG_BLK_DEV_XIP is not set CONFIG_MEMSTICK=m CONFIG_MEMSTICK_DEBUG=y - # CONFIG_MEMSTICK_UNSAFE_RESUME is not set CONFIG_MSPRO_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.491 retrieving revision 1.492 diff -u -r1.491 -r1.492 --- kernel.spec 11 Mar 2008 06:50:39 -0000 1.491 +++ kernel.spec 11 Mar 2008 18:05:41 -0000 1.492 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 5 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1751,6 +1751,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Tue Mar 11 2008 Dave Jones +- 2.6.25-rc5-git1 + * Tue Mar 11 2008 Dave Airlie - make flicker a lot less on startup for X Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.738 retrieving revision 1.739 diff -u -r1.738 -r1.739 --- sources 10 Mar 2008 15:06:49 -0000 1.738 +++ sources 11 Mar 2008 18:05:41 -0000 1.739 @@ -1,2 +1,3 @@ 3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2 6f5fbe9f3655e53c561c4fea9bf2f525 patch-2.6.25-rc5.bz2 +49ffc51eb29fe8e8c870dfdbb165c933 patch-2.6.25-rc5-git1.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.660 retrieving revision 1.661 diff -u -r1.660 -r1.661 --- upstream 10 Mar 2008 15:06:49 -0000 1.660 +++ upstream 11 Mar 2008 18:05:41 -0000 1.661 @@ -1,2 +1,3 @@ linux-2.6.24.tar.bz2 patch-2.6.25-rc5.bz2 +patch-2.6.25-rc5-git1.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 18:12:03 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Tue, 11 Mar 2008 18:12:03 GMT Subject: rpms/system-switch-mail/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 system-switch-mail.spec, 1.18, 1.19 Message-ID: <200803111812.m2BIC3ox007566@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/system-switch-mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7540 Modified Files: .cvsignore sources system-switch-mail.spec Log Message: - fix permission of po files (bz#436888) - update po files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/system-switch-mail/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Mar 2008 20:04:26 -0000 1.14 +++ .cvsignore 11 Mar 2008 18:11:29 -0000 1.15 @@ -9,3 +9,4 @@ system-switch-mail-0.5.25-10.tar.bz2 system-switch-mail-0.5.25-13.tar.bz2 system-switch-mail-0.5.26-1.tar.bz2 +system-switch-mail-0.5.26-2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/system-switch-mail/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 7 Mar 2008 20:04:26 -0000 1.14 +++ sources 11 Mar 2008 18:11:29 -0000 1.15 @@ -1 +1 @@ -3f544e0232c3aca626abdccec5e408c0 system-switch-mail-0.5.26-1.tar.bz2 +f0f03778a50a29ea679b6c53ea2fe257 system-switch-mail-0.5.26-2.tar.bz2 Index: system-switch-mail.spec =================================================================== RCS file: /cvs/extras/rpms/system-switch-mail/devel/system-switch-mail.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- system-switch-mail.spec 7 Mar 2008 20:36:06 -0000 1.18 +++ system-switch-mail.spec 11 Mar 2008 18:11:29 -0000 1.19 @@ -1,7 +1,7 @@ Summary: The Mail Transport Agent Switcher Name: system-switch-mail Version: 0.5.26 -Release: 1 +Release: 2 Source0: %{name}-%{version}-%{release}.tar.bz2 License: GPL Group: Applications/System @@ -78,6 +78,10 @@ %{_datadir}/%{name}/switchmail.glade %changelog +* Tue Mar 11 2008 Than Ngo 0.5.26-2 +- fix permission of po files (bz#436888) +- update po files + * Fri Mar 07 2008 Than Ngo 0.5.26-1 - 0.5.26 release - use chkconfig to configure selected MTA to start automatically (#436359) From fedora-extras-commits at redhat.com Tue Mar 11 18:22:23 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Tue, 11 Mar 2008 18:22:23 GMT Subject: rpms/python-fedora/devel .cvsignore, 1.7, 1.8 python-fedora.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200803111822.m2BIMNkw007783@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-fedora/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7751 Modified Files: .cvsignore python-fedora.spec sources Log Message: * Tue Mar 11 2008 Toshio Kuratomi - 0.2.99.3-1 - Fix a bug in BaseClient. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 Mar 2008 17:44:37 -0000 1.7 +++ .cvsignore 11 Mar 2008 18:21:44 -0000 1.8 @@ -1 +1 @@ -python-fedora-0.2.99.2.tar.gz +python-fedora-0.2.99.3.tar.gz Index: python-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-fedora.spec 7 Mar 2008 17:44:37 -0000 1.9 +++ python-fedora.spec 11 Mar 2008 18:21:44 -0000 1.10 @@ -2,8 +2,8 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: python-fedora -Version: 0.2.99.2 -Release: 2%{?dist} +Version: 0.2.99.3 +Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services Group: Development/Languages @@ -73,6 +73,9 @@ %{python_sitelib}/fedora/tg/json.py* %changelog +* Tue Mar 11 2008 Toshio Kuratomi - 0.2.99.3-1 +- Fix a bug in BaseClient. + * Fri Mar 7 2008 Toshio Kuratomi - 0.2.99.2-2 - Small updates to description of -infrastructure as we're no longer tied to Fedora Infrastructure boxes. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Mar 2008 17:44:37 -0000 1.7 +++ sources 11 Mar 2008 18:21:44 -0000 1.8 @@ -1 +1 @@ -76d1ad63b86b35dddf8360230986dc6c python-fedora-0.2.99.2.tar.gz +c74683a1ba6f7ccdcacff7d3d5fa732c python-fedora-0.2.99.3.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 18:23:55 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 11 Mar 2008 18:23:55 GMT Subject: rpms/kernel/devel linux-2.6-input-macbook-appletouch.patch, NONE, 1.1 kernel.spec, 1.492, 1.493 Message-ID: <200803111823.m2BINtJE007834@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7800 Modified Files: kernel.spec Added Files: linux-2.6-input-macbook-appletouch.patch Log Message: - Recognise Appletouch trackpad in Macbook 3.1 linux-2.6-input-macbook-appletouch.patch: --- NEW FILE linux-2.6-input-macbook-appletouch.patch --- https://bugzilla.redhat.com/show_bug.cgi?id=426574 Based on patch from ubuntu at https://bugs.edge.launchpad.net/ubuntu/+source/linux-meta/+bug/162090 --- vanilla-2.6.25-rc5/drivers/input/mouse/appletouch.c 2008-01-24 17:58:37.000000000 -0500 +++ linux-2.6.24.noarch/drivers/input/mouse/appletouch.c 2008-03-11 13:42:59.000000000 -0400 @@ -62,6 +62,11 @@ #define GEYSER4_ISO_PRODUCT_ID 0x021B #define GEYSER4_JIS_PRODUCT_ID 0x021C +/* Codes in updated driver for macbook3,1 support (and others?) */ +#define GEYSER4_HF_ANSI_PRODUCT_ID 0x0229 +#define GEYSER4_HF_ISO_PRODUCT_ID 0x022a +#define GEYSER4_HF_JIS_PRODUCT_ID 0x021b + #define ATP_DEVICE(prod) \ .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \ USB_DEVICE_ID_MATCH_INT_CLASS | \ @@ -93,6 +98,11 @@ static struct usb_device_id atp_table [] { ATP_DEVICE(GEYSER4_ISO_PRODUCT_ID) }, { ATP_DEVICE(GEYSER4_JIS_PRODUCT_ID) }, + /* Core2 Duo MacBook3,1 */ + { ATP_DEVICE(GEYSER4_HF_ANSI_PRODUCT_ID) }, + { ATP_DEVICE(GEYSER4_HF_ISO_PRODUCT_ID) }, + { ATP_DEVICE(GEYSER4_HF_JIS_PRODUCT_ID) }, + /* Terminating entry */ { } }; @@ -217,7 +227,10 @@ static inline int atp_is_geyser_3(struct (productId == GEYSER3_JIS_PRODUCT_ID) || (productId == GEYSER4_ANSI_PRODUCT_ID) || (productId == GEYSER4_ISO_PRODUCT_ID) || - (productId == GEYSER4_JIS_PRODUCT_ID); + (productId == GEYSER4_JIS_PRODUCT_ID) || + (productId == GEYSER4_HF_ANSI_PRODUCT_ID) || + (productId == GEYSER4_HF_ISO_PRODUCT_ID) || + (productId == GEYSER4_HF_JIS_PRODUCT_ID); } /* Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.492 retrieving revision 1.493 diff -u -r1.492 -r1.493 --- kernel.spec 11 Mar 2008 18:05:41 -0000 1.492 +++ kernel.spec 11 Mar 2008 18:23:09 -0000 1.493 @@ -602,6 +602,7 @@ Patch420: linux-2.6-squashfs.patch Patch430: linux-2.6-net-silence-noisy-printks.patch Patch450: linux-2.6-input-kill-stupid-messages.patch +Patch451: linux-2.6-input-macbook-appletouch.patch Patch460: linux-2.6-serial-460800.patch Patch510: linux-2.6-silence-noise.patch Patch570: linux-2.6-selinux-mprotect-checks.patch @@ -1091,6 +1092,8 @@ # Misc fixes # The input layer spews crap no-one cares about. ApplyPatch linux-2.6-input-kill-stupid-messages.patch +ApplyPatch linux-2.6-input-macbook-appletouch.patch + # Allow to use 480600 baud on 16C950 UARTs ApplyPatch linux-2.6-serial-460800.patch # Silence some useless messages that still get printed with 'quiet' @@ -1752,6 +1755,9 @@ %changelog * Tue Mar 11 2008 Dave Jones +- Recognise Appletouch trackpad in Macbook 3.1 + +* Tue Mar 11 2008 Dave Jones - 2.6.25-rc5-git1 * Tue Mar 11 2008 Dave Airlie From fedora-extras-commits at redhat.com Tue Mar 11 18:27:20 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 11 Mar 2008 18:27:20 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.3,1.4 Message-ID: <200803111827.m2BIRKGR007971@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7936 Modified Files: java-1.6.0-openjdk.spec Log Message: * Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 - Added Provides and Obsoletes for all subpackages. All sub-packages replaces java-1.7.0-icedtea. - Updated Release. - Changed BuildRequires from java-1.7.0-icedtea to java-1.6.0-openjdk. - Added TRADEMARK file to docs. Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- java-1.6.0-openjdk.spec 11 Mar 2008 18:05:41 -0000 1.3 +++ java-1.6.0-openjdk.spec 11 Mar 2008 18:26:47 -0000 1.4 @@ -1,6 +1,6 @@ # If gcjbootstrap is 1 IcedTea is bootstrapped against # java-1.5.0-gcj-devel. If gcjbootstrap is 0 IcedTea is built against -# java-1.7.0-icedtea-devel. +# java-1.6.0-openjdk-devel. %define gcjbootstrap 0 %define icedteaver 1.0 @@ -155,7 +155,7 @@ %if %{gcjbootstrap} BuildRequires: java-1.5.0-gcj-devel %else -BuildRequires: java-1.7.0-icedtea-devel +BuildRequires: java-1.6.0-openjdk-devel %endif # Mauve build requirements. BuildRequires: xorg-x11-server-Xvfb @@ -229,7 +229,11 @@ # Postun requires alternatives to uninstall tool alternatives. Requires(postun): %{_sbindir}/alternatives -#i Standard JPackage devel provides. +# java-1.6.0-openjdk-devel replaces java-1.7.0-icedtea-devel +Provides: java-1.7.0-icedtea-devel = 0:1.7.0-0.999 +Obsoletes: java-1.7.0-icedtea-devel < 0:1.7.0-0.999 + +# Standard JPackage devel provides. Provides: java-sdk-%{javaver}-%{origin} = %{epoch}:%{version} Provides: java-sdk-%{javaver} = %{epoch}:%{version} Provides: java-sdk-%{origin} = %{epoch}:%{version} @@ -247,6 +251,10 @@ Requires: %{name} = %{epoch}:%{version}-%{release} +# java-1.6.0-openjdk-demo replaces java-1.7.0-icedtea-demo +Provides: java-1.7.0-icedtea-demo = 0:1.7.0-0.999 +Obsoletes: java-1.7.0-icedtea-demo < 0:1.7.0-0.999 + %description demo The OpenJDK demos. @@ -256,6 +264,10 @@ Requires: %{name} = %{epoch}:%{version}-%{release} +# java-1.6.0-openjdk-src replaces java-1.7.0-icedtea-src +Provides: java-1.7.0-icedtea-src = 0:1.7.0-0.999 +Obsoletes: java-1.7.0-icedtea-src < 0:1.7.0-0.999 + %description src The OpenJDK source bundle. @@ -268,6 +280,10 @@ # Postun requires alternatives to uninstall javadoc alternative. Requires(postun): %{_sbindir}/alternatives +# java-1.6.0-openjdk-javadoc replaces java-1.7.0-icedtea-javadoc +Provides: java-1.7.0-icedtea-javadoc = 0:1.7.0-0.999 +Obsoletes: java-1.7.0-icedtea-javadoc < 0:1.7.0-0.999 + # Standard JPackage javadoc provides. Provides: java-javadoc = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-javadoc = %{epoch}:%{version}-%{release} @@ -286,6 +302,10 @@ # Postun requires alternatives to uninstall plugin alternative. Requires(postun): %{_sbindir}/alternatives +# java-1.6.0-openjdk-plugin replaces java-1.7.0-icedtea-plugin +Provides: java-1.7.0-icedtea-plugin = 0:1.7.0-0.999 +Obsoletes: java-1.7.0-icedtea-plugin < 0:1.7.0-0.999 + # Standard JPackage plugin provides. Provides: java-plugin = %{javaver} Provides: java-%{javaver}-plugin = %{epoch}:%{version} @@ -667,6 +687,8 @@ %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE %doc %{buildoutputdir}/j2sdk-image/jre/README.html %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README +# FIXME: The TRADEMARK file should be in j2sdk-image. +%doc openjdk/TRADEMARK %doc AUTHORS %doc COPYING %doc ChangeLog @@ -701,6 +723,8 @@ %doc %{buildoutputdir}/j2sdk-image/LICENSE %doc %{buildoutputdir}/j2sdk-image/README.html %doc %{buildoutputdir}/j2sdk-image/THIRD_PARTY_README +# FIXME: The TRADEMARK file should be in j2sdk-image. +%doc openjdk/TRADEMARK %dir %{_jvmdir}/%{sdkdir}/bin %dir %{_jvmdir}/%{sdkdir}/include %dir %{_jvmdir}/%{sdkdir}/lib @@ -759,6 +783,13 @@ %changelog * Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 +- Added Provides and Obsoletes for all subpackages. All sub-packages +replaces java-1.7.0-icedtea. +- Updated Release. +- Changed BuildRequires from java-1.7.0-icedtea to java-1.6.0-openjdk. +- Added TRADEMARK file to docs. + +* Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 - Added Provides and Obsoletes. This package replaces java-1.7.0-icedtea. * Fri Feb 15 2008 Lillian Angel - 1:1.6.0.0-0.1.b06 From fedora-extras-commits at redhat.com Tue Mar 11 18:44:43 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 11 Mar 2008 18:44:43 GMT Subject: rpms/totem/devel totem.spec,1.177,1.178 Message-ID: <200803111844.m2BIihnG008303@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8279 Modified Files: totem.spec Log Message: Mo' debug Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- totem.spec 11 Mar 2008 14:41:23 -0000 1.177 +++ totem.spec 11 Mar 2008 18:43:55 -0000 1.178 @@ -207,7 +207,8 @@ pushd gstreamer # try to work around a problem where gst-inspect does # not find playbin the first time around -DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null +#DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null +GST_DEBUG_NO_COLOR=1 GST_DEBUG=*:5 DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins %configure \ --enable-gstreamer \ From fedora-extras-commits at redhat.com Tue Mar 11 18:52:55 2008 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Tue, 11 Mar 2008 18:52:55 GMT Subject: rpms/pungi/devel .cvsignore, 1.41, 1.42 pungi.spec, 1.44, 1.45 sources, 1.42, 1.43 Message-ID: <200803111852.m2BIqtqC008537@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/pungi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8420/devel Modified Files: .cvsignore pungi.spec sources Log Message: New release for s/netinst/boot/.iso Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 6 Mar 2008 03:30:59 -0000 1.41 +++ .cvsignore 11 Mar 2008 18:52:21 -0000 1.42 @@ -1 +1 @@ -pungi-1.2.9.tar.bz2 +pungi-1.2.10.tar.bz2 Index: pungi.spec =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/pungi.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- pungi.spec 6 Mar 2008 03:30:59 -0000 1.44 +++ pungi.spec 11 Mar 2008 18:52:21 -0000 1.45 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi -Version: 1.2.9 +Version: 1.2.10 Release: 1%{?dist} Summary: Distribution compose tool @@ -55,6 +55,9 @@ %changelog +* Tue Mar 11 2008 Jesse Keating - 1.2.10-1 +- Handle netinst.iso being renamed to boot.iso + * Wed Mar 05 2008 Jesse Keating - 1.2.9-1 - Fix ppc split iso generation - Exclude repoview from isos Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pungi/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 6 Mar 2008 03:30:59 -0000 1.42 +++ sources 11 Mar 2008 18:52:21 -0000 1.43 @@ -1 +1 @@ -21959f0996e34c003d28558b8e521b3f pungi-1.2.9.tar.bz2 +e5e82a15c2d63e89bb7d1c5af926673e pungi-1.2.10.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 19:00:58 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 11 Mar 2008 19:00:58 GMT Subject: rpms/kernel/devel kernel.spec,1.493,1.494 Message-ID: <200803111900.m2BJ0wau008686@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8650 Modified Files: kernel.spec Log Message: - Print values when we overflow resource allocation. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.493 retrieving revision 1.494 diff -u -r1.493 -r1.494 --- kernel.spec 11 Mar 2008 18:23:09 -0000 1.493 +++ kernel.spec 11 Mar 2008 19:00:11 -0000 1.494 @@ -590,6 +590,7 @@ Patch144: linux-2.6-vio-modalias.patch Patch160: linux-2.6-execshield.patch +Patch240: linux-2.6-debug-resource-overflow.patch Patch250: linux-2.6-debug-sizeof-structs.patch Patch260: linux-2.6-debug-nmi-timeout.patch Patch270: linux-2.6-debug-taint-vm.patch @@ -1052,6 +1053,7 @@ ApplyPatch linux-2.6-acpi-eeepc-hotkey.patch # Various low-impact patches to aid debugging. +ApplyPatch linux-2.6-debug-resource-overflow.patch ApplyPatch linux-2.6-debug-sizeof-structs.patch ApplyPatch linux-2.6-debug-nmi-timeout.patch ApplyPatch linux-2.6-debug-taint-vm.patch @@ -1755,6 +1757,9 @@ %changelog * Tue Mar 11 2008 Dave Jones +- Print values when we overflow resource allocation. + +* Tue Mar 11 2008 Dave Jones - Recognise Appletouch trackpad in Macbook 3.1 * Tue Mar 11 2008 Dave Jones From fedora-extras-commits at redhat.com Tue Mar 11 19:01:07 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 11 Mar 2008 19:01:07 GMT Subject: rpms/kernel/devel linux-2.6-debug-resource-overflow.patch,NONE,1.1 Message-ID: <200803111901.m2BJ17AA014981@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11653 Added Files: linux-2.6-debug-resource-overflow.patch Log Message: - Print values when we overflow resource allocation. linux-2.6-debug-resource-overflow.patch: --- NEW FILE linux-2.6-debug-resource-overflow.patch --- diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 6aa231e..0c22e41 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c @@ -86,7 +86,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, i++; if (i >= PNP_MAX_IRQ && !warned) { printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ " - "resources: %d \n", PNP_MAX_IRQ); + "resources. Max:%d Found:%d\n", PNP_MAX_IRQ, i); warned = 1; return; } @@ -188,7 +188,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, res->dma_resource[i].end = dma; } else if (!warned) { printk(KERN_ERR "pnpacpi: exceeded the max number of DMA " - "resources: %d \n", PNP_MAX_DMA); + "resources. Max:%d Found:%d\n", PNP_MAX_DMA, i); warned = 1; } } @@ -214,7 +214,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res, res->port_resource[i].end = io + len - 1; } else if (!warned) { printk(KERN_ERR "pnpacpi: exceeded the max number of IO " - "resources: %d \n", PNP_MAX_PORT); + "resources. Max:%d Found:%d\n", PNP_MAX_PORT, i); warned = 1; } } @@ -242,7 +242,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res, res->mem_resource[i].end = mem + len - 1; } else if (!warned) { printk(KERN_ERR "pnpacpi: exceeded the max number of mem " - "resources: %d\n", PNP_MAX_MEM); + "resources. Max:%d Found:%d\n", PNP_MAX_MEM, i); warned = 1; } } From fedora-extras-commits at redhat.com Tue Mar 11 19:03:52 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Tue, 11 Mar 2008 19:03:52 GMT Subject: rpms/kernel/F-8 kernel.spec,1.376,1.377 Message-ID: <200803111903.m2BJ3qDo015917@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15895 Modified Files: kernel.spec Log Message: - Print values when we overflow resource allocation. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.376 retrieving revision 1.377 diff -u -r1.376 -r1.377 --- kernel.spec 11 Mar 2008 00:46:09 -0000 1.376 +++ kernel.spec 11 Mar 2008 19:03:21 -0000 1.377 @@ -619,6 +619,7 @@ Patch210: linux-2.6-modsign-ksign.patch Patch220: linux-2.6-modsign-core.patch Patch230: linux-2.6-modsign-script.patch +Patch240: linux-2.6-debug-resource-overflow.patch Patch250: linux-2.6-debug-sizeof-structs.patch Patch260: linux-2.6-debug-nmi-timeout.patch Patch270: linux-2.6-debug-taint-vm.patch @@ -1121,6 +1122,7 @@ # pc speaker autoload # Various low-impact patches to aid debugging. +ApplyPatch linux-2.6-debug-resource-overflow.patch ApplyPatch linux-2.6-debug-sizeof-structs.patch ApplyPatch linux-2.6-debug-nmi-timeout.patch ApplyPatch linux-2.6-debug-taint-vm.patch @@ -1910,6 +1912,9 @@ %changelog +* Tue Mar 11 2008 Dave Jones +- Print values when we overflow resource allocation. + * Mon Mar 10 2008 John W. Linville 2.6.24.3-30 - Learn to read preceding changelogs... From fedora-extras-commits at redhat.com Tue Mar 11 19:07:39 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Tue, 11 Mar 2008 19:07:39 GMT Subject: rpms/totem/devel totem.spec,1.178,1.179 Message-ID: <200803111907.m2BJ7d6Y016049@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/totem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16010 Modified Files: totem.spec Log Message: More more debug Index: totem.spec =================================================================== RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- totem.spec 11 Mar 2008 18:43:55 -0000 1.178 +++ totem.spec 11 Mar 2008 19:07:06 -0000 1.179 @@ -208,7 +208,7 @@ # try to work around a problem where gst-inspect does # not find playbin the first time around #DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null -GST_DEBUG_NO_COLOR=1 GST_DEBUG=*:5 DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all +GST_DEBUG_NO_COLOR=1 GST_DEBUG=*:5 DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all --gst-disable-registry-fork export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins %configure \ --enable-gstreamer \ From fedora-extras-commits at redhat.com Tue Mar 11 19:10:30 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 19:10:30 GMT Subject: rpms/openoffice.org/F-7 openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.1, 1.2 Message-ID: <200803111910.m2BJAUkK016177@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16156 Modified Files: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch Log Message: fix bodge openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch: Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 18 Feb 2008 09:41:29 -0000 1.1 +++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 11 Mar 2008 19:10:28 -0000 1.2 @@ -17,7 +17,7 @@ + set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + fi + echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA -+ if [ $? -ne 0 ]; then ++ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then + set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml' + fi + echo $@ | grep -q env:UserInstallation From fedora-extras-commits at redhat.com Tue Mar 11 19:11:10 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 19:11:10 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.2, 1.3 Message-ID: <200803111911.m2BJBAqA016216@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16195 Modified Files: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch Log Message: fix bodge openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch: Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 6 Mar 2008 19:01:45 -0000 1.2 +++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 11 Mar 2008 19:11:07 -0000 1.3 @@ -17,7 +17,7 @@ + set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + fi + echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA -+ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; ++ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then + set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml' + fi + echo $@ | grep -q env:UserInstallation From fedora-extras-commits at redhat.com Tue Mar 11 19:11:18 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Tue, 11 Mar 2008 19:11:18 GMT Subject: rpms/openoffice.org/F-8 openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.1, 1.2 Message-ID: <200803111911.m2BJBIak016245@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16224 Modified Files: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch Log Message: fix bodge openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch: Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 18 Feb 2008 09:38:59 -0000 1.1 +++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 11 Mar 2008 19:11:15 -0000 1.2 @@ -17,7 +17,7 @@ + set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + fi + echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA -+ if [ $? -ne 0 ]; then ++ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then + set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml' + fi + echo $@ | grep -q env:UserInstallation From fedora-extras-commits at redhat.com Tue Mar 11 19:16:06 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 11 Mar 2008 19:16:06 GMT Subject: devel/rhpxl .cvsignore, 1.50, 1.51 rhpxl.spec, 1.67, 1.68 sources, 1.57, 1.58 rhpxl-0.49-ibmasm.patch, 1.1, NONE rhpxl-0.49-no-more-input.patch, 1.1, NONE rhpxl-0.49-pseries-hatred.patch, 1.2, NONE Message-ID: <200803111916.m2BJG6Gd016379@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/rhpxl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16345 Modified Files: .cvsignore rhpxl.spec sources Removed Files: rhpxl-0.49-ibmasm.patch rhpxl-0.49-no-more-input.patch rhpxl-0.49-pseries-hatred.patch Log Message: * Tue Mar 11 2008 Jeremy Katz - 0.51-1 - Few more input fixes, roll a new tarball and remove obsolete patches which are in upstream Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/rhpxl/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 6 Sep 2007 21:00:08 -0000 1.50 +++ .cvsignore 11 Mar 2008 19:15:35 -0000 1.51 @@ -1 +1 @@ -rhpxl-0.49.tar.gz +rhpxl-0.51.tar.gz Index: rhpxl.spec =================================================================== RCS file: /cvs/pkgs/devel/rhpxl/rhpxl.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- rhpxl.spec 11 Mar 2008 03:11:11 -0000 1.67 +++ rhpxl.spec 11 Mar 2008 19:15:35 -0000 1.68 @@ -3,8 +3,8 @@ Summary: Python library for configuring and running X Name: rhpxl URL: http://fedoraproject.org/wiki/rhpxl -Version: 0.49 -Release: 5%{?dist} +Version: 0.51 +Release: 1%{?dist} Source0: http://ajax.fedoraproject.org/%{name}/%{name}-%{version}.tar.gz License: GPLv2 Group: System Environment/Libraries @@ -14,19 +14,12 @@ Requires: python, rhpl, kudzu >= 1.2.75, newt, hwdata >= 0.169 Requires: pyxf86config >= 0.3.31, xorg-x11-server-Xorg >= 1.0.1-6 -Patch0: rhpxl-0.49-pseries-hatred.patch -Patch1: rhpxl-0.49-ibmasm.patch -Patch2: rhpxl-0.49-no-more-input.patch - %description The rhpxl (pronounced 'rapunzel') package contains a Python library for configuring and running X. %prep %setup -q -%patch0 -p1 -b .pseries -%patch1 -p1 -b .ibmasm -%patch2 -p1 -b .input %build make %{?_smp_mflags} @@ -49,6 +42,10 @@ %{_sbindir}/ddcprobe %changelog +* Tue Mar 11 2008 Jeremy Katz - 0.51-1 +- Few more input fixes, roll a new tarball and remove obsolete patches which + are in upstream + * Mon Mar 10 2008 Jeremy Katz - 0.49-5 - Don't write out input sections in xorg.conf -- input hotplug should take care of them all Index: sources =================================================================== RCS file: /cvs/pkgs/devel/rhpxl/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 6 Sep 2007 21:00:08 -0000 1.57 +++ sources 11 Mar 2008 19:15:35 -0000 1.58 @@ -1 +1 @@ -ad8a3151b455d435c4928611f421fc0a rhpxl-0.49.tar.gz +164c7743477608c839df92fe88d0d120 rhpxl-0.51.tar.gz --- rhpxl-0.49-ibmasm.patch DELETED --- --- rhpxl-0.49-no-more-input.patch DELETED --- --- rhpxl-0.49-pseries-hatred.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 19:21:25 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 11 Mar 2008 19:21:25 GMT Subject: devel/pyxf86config .cvsignore, 1.24, 1.25 pyxf86config.spec, 1.46, 1.47 sources, 1.24, 1.25 Message-ID: <200803111921.m2BJLP3S016573@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/pyxf86config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16516 Modified Files: .cvsignore pyxf86config.spec sources Log Message: * Tue Mar 11 2008 Jeremy Katz - 0.3.35-1 - Don't include keyboard in the template Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/pyxf86config/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 26 Sep 2007 20:23:18 -0000 1.24 +++ .cvsignore 11 Mar 2008 19:20:54 -0000 1.25 @@ -1 +1 @@ -pyxf86config-0.3.34.tar.bz2 +pyxf86config-0.3.35.tar.bz2 Index: pyxf86config.spec =================================================================== RCS file: /cvs/pkgs/devel/pyxf86config/pyxf86config.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- pyxf86config.spec 18 Feb 2008 19:04:06 -0000 1.46 +++ pyxf86config.spec 11 Mar 2008 19:20:54 -0000 1.47 @@ -1,7 +1,7 @@ Summary: Python wrappers for libxf86config Name: pyxf86config -Version: 0.3.34 -Release: 2%{?dist} +Version: 0.3.35 +Release: 1%{?dist} URL: http://fedoraproject.org/wiki/pyxf86config Source0: http://ajax.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2 License: GPLv2 @@ -43,6 +43,9 @@ %changelog +* Tue Mar 11 2008 Jeremy Katz - 0.3.35-1 +- Don't include keyboard in the template + * Mon Feb 18 2008 Fedora Release Engineering - 0.3.34-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/devel/pyxf86config/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 26 Sep 2007 20:23:18 -0000 1.24 +++ sources 11 Mar 2008 19:20:54 -0000 1.25 @@ -1 +1 @@ -9299e5e91f457f036139a1f6c35a8bf2 pyxf86config-0.3.34.tar.bz2 +a43a29725e0b294d9ea92452d5cbadcf pyxf86config-0.3.35.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 19:21:45 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 11 Mar 2008 19:21:45 GMT Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.4, 1.5 java-1.6.0-openjdk.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200803111921.m2BJLjw0016614@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16549 Modified Files: .cvsignore java-1.6.0-openjdk.spec sources Log Message: * Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 - Updated snapshot. - Changed icedteaopt to use --with-openjdk instead of --with-icedtea. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Mar 2008 15:46:50 -0000 1.4 +++ .cvsignore 11 Mar 2008 19:21:15 -0000 1.5 @@ -3,3 +3,4 @@ openjdk-6-src-b06-28_feb_2008-fedora.tar.gz mauve_tests icedtea6-1.0-e96715b7deaa5bdf2c756248b3d0f8e901ae208c.tar.gz +icedtea6-1.0-ac9c79a4b244d459e7661cbdbd6d0a5fc91a270a.tar.gz Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- java-1.6.0-openjdk.spec 11 Mar 2008 18:26:47 -0000 1.4 +++ java-1.6.0-openjdk.spec 11 Mar 2008 19:21:15 -0000 1.5 @@ -4,7 +4,7 @@ %define gcjbootstrap 0 %define icedteaver 1.0 -%define icedteasnapshot -e96715b7deaa5bdf2c756248b3d0f8e901ae208c +%define icedteasnapshot -ac9c79a4b244d459e7661cbdbd6d0a5fc91a270a %define openjdkver b06 %define openjdkdate 28_feb_2008 @@ -44,7 +44,7 @@ %if %{gcjbootstrap} %define icedteaopt %{nil} %else -%define icedteaopt --with-icedtea +%define icedteaopt --with-openjdk %endif # Convert an absolute path to a relative path. Each symbolic link is @@ -783,6 +783,10 @@ %changelog * Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 +- Updated snapshot. +- Changed icedteaopt to use --with-openjdk instead of --with-icedtea. + +* Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 - Added Provides and Obsoletes for all subpackages. All sub-packages replaces java-1.7.0-icedtea. - Updated Release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Mar 2008 15:11:44 -0000 1.3 +++ sources 11 Mar 2008 19:21:15 -0000 1.4 @@ -3,3 +3,4 @@ 7a0c160c03012cd40957a7a112e25038 mauve_tests e24e99eeae81f32fa7d958fc75757b83 openjdk-6-src-b06-28_feb_2008-fedora.tar.gz 68625e8f2997dde7f33174cae5ffecad icedtea6-1.0-e96715b7deaa5bdf2c756248b3d0f8e901ae208c.tar.gz +0efc11a9e2437c5ab833252c679dc047 icedtea6-1.0-ac9c79a4b244d459e7661cbdbd6d0a5fc91a270a.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 19:22:37 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 11 Mar 2008 19:22:37 GMT Subject: rpms/java-1.6.0-openjdk/devel .cvsignore,1.5,1.6 sources,1.4,1.5 Message-ID: <200803111922.m2BJMb3b016646@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16621 Modified Files: .cvsignore sources Log Message: Updated sources and .cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Mar 2008 19:21:15 -0000 1.5 +++ .cvsignore 11 Mar 2008 19:22:04 -0000 1.6 @@ -2,5 +2,4 @@ mauve-2007-09-12.tar.gz openjdk-6-src-b06-28_feb_2008-fedora.tar.gz mauve_tests -icedtea6-1.0-e96715b7deaa5bdf2c756248b3d0f8e901ae208c.tar.gz icedtea6-1.0-ac9c79a4b244d459e7661cbdbd6d0a5fc91a270a.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Mar 2008 19:21:15 -0000 1.4 +++ sources 11 Mar 2008 19:22:04 -0000 1.5 @@ -2,5 +2,4 @@ abee6aad1525bee3d45a13d0adf859c9 mauve-2007-09-12.tar.gz 7a0c160c03012cd40957a7a112e25038 mauve_tests e24e99eeae81f32fa7d958fc75757b83 openjdk-6-src-b06-28_feb_2008-fedora.tar.gz -68625e8f2997dde7f33174cae5ffecad icedtea6-1.0-e96715b7deaa5bdf2c756248b3d0f8e901ae208c.tar.gz 0efc11a9e2437c5ab833252c679dc047 icedtea6-1.0-ac9c79a4b244d459e7661cbdbd6d0a5fc91a270a.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 19:30:20 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 11 Mar 2008 19:30:20 GMT Subject: rpms/initscripts/devel .cvsignore, 1.135, 1.136 initscripts.spec, 1.159, 1.160 sources, 1.150, 1.151 Message-ID: <200803111930.m2BJUKcq016916@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/initscripts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16881 Modified Files: .cvsignore initscripts.spec sources Log Message: 8.66-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- .cvsignore 11 Mar 2008 03:37:35 -0000 1.135 +++ .cvsignore 11 Mar 2008 19:29:49 -0000 1.136 @@ -1 +1 @@ -initscripts-8.65.tar.bz2 +initscripts-8.66.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- initscripts.spec 11 Mar 2008 03:37:35 -0000 1.159 +++ initscripts.spec 11 Mar 2008 19:29:49 -0000 1.160 @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.65 +Version: 8.66 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -28,6 +28,7 @@ Conflicts: alsa-utils < 1.0.14-0.5.rc2.fc7 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 +Conflicts: rhgb < 0.17.7-7 Obsoletes: rhsound sapinit Obsoletes: hotplug Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, coreutils @@ -216,6 +217,9 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 11 2008 Bill Nottingham - 8.66-1 +- use upstart to start rhgb (#433156, ) + * Mon Mar 10 2008 Bill Nottingham - 8.65-1 - Add a serial console udev/upstart handler (#434764, indirectly) - Add some upstart notification for sysv scripts (modified from , #431231) Index: sources =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/sources,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- sources 11 Mar 2008 03:37:35 -0000 1.150 +++ sources 11 Mar 2008 19:29:49 -0000 1.151 @@ -1 +1 @@ -407af0ad2f8d837b4b15bf6685624b15 initscripts-8.65.tar.bz2 +f34d2229b3e3b01bfbb8ad77a8292691 initscripts-8.66.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 19:31:10 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Tue, 11 Mar 2008 19:31:10 GMT Subject: rpms/kernel/F-8 linux-2.6-debug-resource-overflow.patch, NONE, 1.1 kernel.spec, 1.377, 1.378 Message-ID: <200803111931.m2BJVA3N016998@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16961 Modified Files: kernel.spec Added Files: linux-2.6-debug-resource-overflow.patch Log Message: * Tue Mar 11 2008 Chuck Ebbert 2.6.24.3-32 - Add missing debug patch. - Remove the fix for stray GPEs because it breaks ACPI (#436959) linux-2.6-debug-resource-overflow.patch: --- NEW FILE linux-2.6-debug-resource-overflow.patch --- diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 6aa231e..0c22e41 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c @@ -86,7 +86,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, i++; if (i >= PNP_MAX_IRQ && !warned) { printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ " - "resources: %d \n", PNP_MAX_IRQ); + "resources. Max:%d Found:%d\n", PNP_MAX_IRQ, i); warned = 1; return; } @@ -188,7 +188,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, res->dma_resource[i].end = dma; } else if (!warned) { printk(KERN_ERR "pnpacpi: exceeded the max number of DMA " - "resources: %d \n", PNP_MAX_DMA); + "resources. Max:%d Found:%d\n", PNP_MAX_DMA, i); warned = 1; } } @@ -214,7 +214,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res, res->port_resource[i].end = io + len - 1; } else if (!warned) { printk(KERN_ERR "pnpacpi: exceeded the max number of IO " - "resources: %d \n", PNP_MAX_PORT); + "resources. Max:%d Found:%d\n", PNP_MAX_PORT, i); warned = 1; } } @@ -242,7 +242,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res, res->mem_resource[i].end = mem + len - 1; } else if (!warned) { printk(KERN_ERR "pnpacpi: exceeded the max number of mem " - "resources: %d\n", PNP_MAX_MEM); + "resources. Max:%d Found:%d\n", PNP_MAX_MEM, i); warned = 1; } } Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- kernel.spec 11 Mar 2008 19:03:21 -0000 1.377 +++ kernel.spec 11 Mar 2008 19:30:38 -0000 1.378 @@ -677,7 +677,7 @@ #Patch780: linux-2.6-clockevents-fix-resume-logic.patch Patch761: linux-2.6-acpi-video-backlight-rationalize.patch Patch763: linux-2.6-acpi-video-fix-multiple-busses.patch -Patch766: linux-2.6-acpi-disable-gpe-fix.patch +#Patch766: linux-2.6-acpi-disable-gpe-fix.patch Patch784: linux-2.6-acpi-eeepc-hotkey.patch Patch820: linux-2.6-compile-fixes.patch @@ -1257,7 +1257,8 @@ ApplyPatch linux-2.6-acpi-video-backlight-rationalize.patch ApplyPatch linux-2.6-acpi-video-fix-multiple-busses.patch # disable stray gpe properly -ApplyPatch linux-2.6-acpi-disable-gpe-fix.patch +# need to find out why this is broken +#ApplyPatch linux-2.6-acpi-disable-gpe-fix.patch # Eeepc hotkey driver ApplyPatch linux-2.6-acpi-eeepc-hotkey.patch @@ -1912,6 +1913,10 @@ %changelog +* Tue Mar 11 2008 Chuck Ebbert 2.6.24.3-32 +- Add missing debug patch. +- Remove the fix for stray GPEs because it breaks ACPI (#436959) + * Tue Mar 11 2008 Dave Jones - Print values when we overflow resource allocation. From fedora-extras-commits at redhat.com Tue Mar 11 19:37:56 2008 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Tue, 11 Mar 2008 19:37:56 GMT Subject: rpms/gg2/devel gg2.spec,1.8,1.9 Message-ID: <200803111937.m2BJbuCj017175@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/pkgs/rpms/gg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17153 Modified Files: gg2.spec Log Message: - rebuild against new perl Index: gg2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gg2/devel/gg2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gg2.spec 19 Feb 2008 20:39:17 -0000 1.8 +++ gg2.spec 11 Mar 2008 19:37:21 -0000 1.9 @@ -1,6 +1,6 @@ Name: gg2 Version: 2.3.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GNU Gadu 2 - free talking Summary(es): GNU Gadu 2 - charlar libremente Summary(pl): GNU Gadu 2 - wolne gadanie @@ -359,6 +359,9 @@ %{_libdir}/pkgconfig/gg2_core.pc %changelog +* Tue Mar 11 2008 Dominik Mierzejewski 2.3.0-8 +- rebuild against new perl + * Tue Feb 19 2008 Fedora Release Engineering - 2.3.0-7 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 19:38:28 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 11 Mar 2008 19:38:28 GMT Subject: devel/pyxf86config .cvsignore, 1.25, 1.26 pyxf86config.spec, 1.47, 1.48 sources, 1.25, 1.26 Message-ID: <200803111938.m2BJcS57017214@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/pyxf86config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17179 Modified Files: .cvsignore pyxf86config.spec sources Log Message: * Tue Mar 11 2008 Jeremy Katz - 0.3.36-1 - Fix build with current X Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/pyxf86config/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 11 Mar 2008 19:20:54 -0000 1.25 +++ .cvsignore 11 Mar 2008 19:37:57 -0000 1.26 @@ -1 +1 @@ -pyxf86config-0.3.35.tar.bz2 +pyxf86config-0.3.36.tar.bz2 Index: pyxf86config.spec =================================================================== RCS file: /cvs/pkgs/devel/pyxf86config/pyxf86config.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- pyxf86config.spec 11 Mar 2008 19:20:54 -0000 1.47 +++ pyxf86config.spec 11 Mar 2008 19:37:57 -0000 1.48 @@ -1,6 +1,6 @@ Summary: Python wrappers for libxf86config Name: pyxf86config -Version: 0.3.35 +Version: 0.3.36 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/pyxf86config Source0: http://ajax.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2 @@ -43,6 +43,9 @@ %changelog +* Tue Mar 11 2008 Jeremy Katz - 0.3.36-1 +- Fix build with current X + * Tue Mar 11 2008 Jeremy Katz - 0.3.35-1 - Don't include keyboard in the template Index: sources =================================================================== RCS file: /cvs/pkgs/devel/pyxf86config/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 11 Mar 2008 19:20:54 -0000 1.25 +++ sources 11 Mar 2008 19:37:57 -0000 1.26 @@ -1 +1 @@ -a43a29725e0b294d9ea92452d5cbadcf pyxf86config-0.3.35.tar.bz2 +8bb266027ef1a7f0513c00b7e0a1c003 pyxf86config-0.3.36.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 19:44:46 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 11 Mar 2008 19:44:46 GMT Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.6, 1.7 java-1.6.0-openjdk.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200803111944.m2BJikVU017430@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17390 Modified Files: .cvsignore java-1.6.0-openjdk.spec sources Log Message: * Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 - Updated snapshot. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 11 Mar 2008 19:22:04 -0000 1.6 +++ .cvsignore 11 Mar 2008 19:44:13 -0000 1.7 @@ -2,4 +2,4 @@ mauve-2007-09-12.tar.gz openjdk-6-src-b06-28_feb_2008-fedora.tar.gz mauve_tests -icedtea6-1.0-ac9c79a4b244d459e7661cbdbd6d0a5fc91a270a.tar.gz +icedtea6-1.0-e2afb5651f8196082034ec0bc729b89bb77440af.tar.gz Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- java-1.6.0-openjdk.spec 11 Mar 2008 19:21:15 -0000 1.5 +++ java-1.6.0-openjdk.spec 11 Mar 2008 19:44:13 -0000 1.6 @@ -4,7 +4,7 @@ %define gcjbootstrap 0 %define icedteaver 1.0 -%define icedteasnapshot -ac9c79a4b244d459e7661cbdbd6d0a5fc91a270a +%define icedteasnapshot -e2afb5651f8196082034ec0bc729b89bb77440af %define openjdkver b06 %define openjdkdate 28_feb_2008 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Mar 2008 19:22:04 -0000 1.5 +++ sources 11 Mar 2008 19:44:13 -0000 1.6 @@ -2,4 +2,4 @@ abee6aad1525bee3d45a13d0adf859c9 mauve-2007-09-12.tar.gz 7a0c160c03012cd40957a7a112e25038 mauve_tests e24e99eeae81f32fa7d958fc75757b83 openjdk-6-src-b06-28_feb_2008-fedora.tar.gz -0efc11a9e2437c5ab833252c679dc047 icedtea6-1.0-ac9c79a4b244d459e7661cbdbd6d0a5fc91a270a.tar.gz +e75c6c03f22e198483ecdd87477838ad icedtea6-1.0-e2afb5651f8196082034ec0bc729b89bb77440af.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 19:53:39 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 19:53:39 GMT Subject: rpms/logjam/F-7 logjam-4.5.3-default-spelllang-en-US.patch, NONE, 1.1 logjam-4.5.3-tags.patch, NONE, 1.1 logjam-title.patch, NONE, 1.1 logjam.spec, 1.32, 1.33 Message-ID: <200803111953.m2BJrdfk017680@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17601/F-7 Modified Files: logjam.spec Added Files: logjam-4.5.3-default-spelllang-en-US.patch logjam-4.5.3-tags.patch logjam-title.patch Log Message: tags, title, default lang fix, crash fix logjam-4.5.3-default-spelllang-en-US.patch: --- NEW FILE logjam-4.5.3-default-spelllang-en-US.patch --- diff -up logjam-4.5.3/src/conf_xml.c.BAD logjam-4.5.3/src/conf_xml.c --- logjam-4.5.3/src/conf_xml.c.BAD 2008-03-11 15:41:21.000000000 -0400 +++ logjam-4.5.3/src/conf_xml.c 2008-03-11 15:41:25.000000000 -0400 @@ -266,7 +266,7 @@ parseconf(xmlDocPtr doc, xmlNodePtr node #ifdef HAVE_GTKSPELL if (!c->spell_language || strlen(c->spell_language) < 2) { g_free(c->spell_language); - c->spell_language = g_strdup("en"); + c->spell_language = g_strdup("en_US"); } #endif /* HAVE_GTKSPELL */ hostspath = g_build_filename(app.conf_dir, "servers", NULL); logjam-4.5.3-tags.patch: --- NEW FILE logjam-4.5.3-tags.patch --- diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,18 @@ +/* liblivejournal - a client library for LiveJournal. + * Copyright (C) 2003 Evan Martin + * + * vim: tabstop=4 shiftwidth=4 noexpandtab : + */ + +#ifndef __LIVEJOURNAL_TAGS_H__ +#define __LIVEJOURNAL_TAGS_H__ + +typedef struct _LJTag { + char *tag; + guint32 count; +} LJTag; + +LJTag *lj_tag_new(void); +void lj_tag_free(LJTag *t); + +#endif /* __LIVEJOURNAL_TAGS_H__ */ diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c --- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags 2005-10-23 21:29:32.000000000 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 15:09:55.000000000 -0400 @@ -14,6 +14,7 @@ #include "entry.h" #include "friends.h" +#include "tags.h" #include "types.h" char* @@ -75,6 +76,18 @@ lj_friend_compare_username(gconstpointer return strcmp(fa->username, fb->username); } +LJTag* +lj_tag_new(void) { + LJTag *t = g_new0(LJTag, 1); + return t; +} + +void +lj_tag_free(LJTag *t) { + g_free(t->tag); + g_free(t); +} + void lj_security_append_to_request(LJSecurity *security, LJRequest *request) { char *text = NULL; diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am --- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags 2005-08-24 22:42:14.000000000 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 15:09:55.000000000 -0400 @@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ liblivejournal_la_SOURCES = \ md5.c md5.h \ protocol.c protocol.h \ - friends.h \ + friends.h tags.h \ serveruser.c serveruser.h \ entry.c entry.h \ types.c types.h \ @@ -21,6 +21,7 @@ liblivejournal_la_SOURCES = \ getchallenge.c getchallenge.h \ getevents.c getevents.h \ getfriends.c getfriends.h \ + gettags.c gettags.h \ syncitems.c syncitems.h \ sync.c sync.h \ livejournal.h diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h --- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags 2005-02-21 12:46:10.000000000 -0500 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 15:09:55.000000000 -0400 @@ -16,5 +16,6 @@ #include #include #include +#include #endif /* __LIVEJOURNAL_H__ */ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,16 @@ + +#ifndef __LIVEJOURNAL_GETTAGS_H__ +#define __LIVEJOURNAL_GETTAGS_H__ + +#include + +typedef struct { + LJVerb verb; + GHashTable *tags; +} LJGetTags; + +LJGetTags* lj_gettags_new(LJUser *user, const gchar *journal); +void lj_gettags_free(LJGetTags *gettags, gboolean includetags); + +#endif /* __LIVEJOURNAL_GETTAGS_H__ */ + diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,65 @@ + +#include + +#include + +#include "tags.h" +#include "gettags.h" + +static void +read_tags(LJResult *result, GHashTable *tags) { + LJTag *t; + int i, count; + guint32 mask; + char *value; + + count = lj_result_get_int(result, "tag_count"); + for (i = 1; i <= count; i++) { + t = lj_tag_new(); + t->tag = g_strdup(lj_result_getf(result, "tag_%d_name", i)); + + value = lj_result_getf(result, "tag_%d_uses", i); + if (value) t->count = lj_color_to_int(value); + + g_hash_table_insert(tags, t->tag, t); + } +} + +static void +parse_result(LJVerb *verb) { + GHashTable *tags; + + tags = g_hash_table_new(g_str_hash, g_str_equal); + + read_tags(verb->result, tags); + ((LJGetTags*)verb)->tags = tags; +} + +LJGetTags* +lj_gettags_new(LJUser *user, const gchar *journal) { + LJGetTags *gettags = g_new0(LJGetTags, 1); + LJVerb *verb = (LJVerb*)gettags; + + lj_verb_init(verb, user, "getusertags", FALSE, parse_result); + if (journal) + lj_request_add(verb->request, "usejournal", journal); + + return gettags; +} + +static void +hash_tag_free_cb(gpointer key, LJTag *t, gpointer data) { + lj_tag_free(t); +} + +void +lj_gettags_free(LJGetTags *gettags, gboolean includetags) { + if (gettags->tags) { + if (includetags) + g_hash_table_foreach(gettags->tags, + (GHFunc)hash_tag_free_cb, NULL); + g_hash_table_destroy(gettags->tags); + } + g_free(gettags); +} + diff -up /dev/null logjam-4.5.3/src/tags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/src/tags.c 2008-03-11 15:16:52.000000000 -0400 @@ -0,0 +1,181 @@ + +#include "gtk-all.h" + +#include +#include + +#include "account.h" +#include "tags.h" + +static void +tags_hash_list_cb (gpointer key, LJTag *t, GSList **list) +{ + *list = g_slist_append(*list, t); +} + +static gboolean +load_tags (GtkWindow *parent, JamAccountLJ *acc, gchar *journal, GSList **l) +{ + LJGetTags *gettags; + NetContext *ctx; + + ctx = net_ctx_gtk_new (parent, _("Loading Tags")); + gettags = lj_gettags_new (jam_account_lj_get_user (acc), journal); + if (!net_run_verb_ctx ((LJVerb*) gettags, ctx, NULL)) + { + lj_gettags_free (gettags, TRUE); + net_ctx_gtk_free (ctx); + return FALSE; + } + + g_hash_table_foreach (gettags->tags, (GHFunc) tags_hash_list_cb, l); + + lj_gettags_free (gettags, FALSE); + net_ctx_gtk_free (ctx); + + return TRUE; +} + +static void +tag_toggled (GtkCellRendererToggle *cell, + gchar *path_str, + gpointer data) +{ + GtkTreeModel *model = (GtkTreeModel *)data; + GtkTreeIter iter; + GtkTreePath *path = gtk_tree_path_new_from_string (path_str); + gboolean tag; + + gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_model_get (model, &iter, 0, &tag, -1); + + tag ^= 1; + + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, tag, -1); + + gtk_tree_path_free (path); +} + +gboolean +create_tag_string (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + gchar *tag; + gboolean is_sel; + gchar **tagstr = (gchar **) data; + + gtk_tree_model_get (model, iter, 0, &is_sel, -1); + if (is_sel) + { + gchar *buf = *tagstr; + gtk_tree_model_get (model, iter, 1, &tag, -1); + *tagstr = g_strconcat (buf, tag, ", ", NULL); + g_free (buf); + } + + return FALSE; +} + +GtkWidget* +taglist_create (GSList *l) +{ + GtkWidget *treeview; + GtkListStore *store; + GtkTreeIter iter; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + guint i; + + /* create model */ + store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING); + for (i = 0; i < g_slist_length (l); i++) + { + LJTag *t = (LJTag *) g_slist_nth_data (l, i); + + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + 0, FALSE, + 1, t->tag, + -1); + } + + /* create treeview */ + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE); + gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview), 1); + + /* add columns */ + renderer = gtk_cell_renderer_toggle_new (); + g_signal_connect (renderer, "toggled", + G_CALLBACK (tag_toggled), + GTK_TREE_MODEL (store)); + column = gtk_tree_view_column_new_with_attributes ("#", + renderer, "active", 0, + NULL); + gtk_tree_view_append_column (treeview, column); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Tag name"), + renderer, "text", 1, + NULL); + gtk_tree_view_column_set_sort_column_id (column, 1); + gtk_tree_view_append_column (treeview, column); + + g_object_unref (store); + + return treeview; +} + +gchar* +tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal) +{ + GtkWidget *dlg, *sw, *tv; + GSList *list = NULL; + gchar *taglist = NULL; + + if (acc == NULL) return NULL; + + load_tags (GTK_WINDOW (win), acc, journal, &list); + + dlg = gtk_dialog_new_with_buttons (_("Select tags"), + GTK_WINDOW (win), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, + GTK_RESPONSE_OK, + GTK_STOCK_CLOSE, + GTK_RESPONSE_CLOSE, + NULL); + + sw = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), + GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0); + + tv = taglist_create (list); + gtk_container_add (GTK_CONTAINER (sw), tv); + + gtk_window_resize(dlg, 60, 210); + gtk_widget_show_all (sw); + + if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK) + { + taglist = g_strdup (""); + gtk_tree_model_foreach (gtk_tree_view_get_model (tv), + create_tag_string, + &taglist); + if (g_ascii_strcasecmp (taglist, "") == 0) + { + g_free (taglist); + taglist = NULL; + } + } + + gtk_widget_destroy (dlg); + + return taglist; +} diff -up /dev/null logjam-4.5.3/src/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/src/tags.h 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef _TAGS_H_ +#define _TAGS_H_ + +gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal); + +#endif /* _TAGS_H_ */ diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am --- logjam-4.5.3/src/Makefile.am.tags 2005-10-23 21:16:08.000000000 -0400 +++ logjam-4.5.3/src/Makefile.am 2008-03-11 15:09:55.000000000 -0400 @@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. undo.c undo.h \ userlabel.c userlabel.h \ get_cmd_out.c get_cmd_out.h \ + tags.c tags.h \ $(HTML_MARKUP) src_preview = $(PREVIEW) diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c --- logjam-4.5.3/src/jamview.c.tags 2005-06-19 14:05:40.000000000 -0400 +++ logjam-4.5.3/src/jamview.c 2008-03-11 15:09:55.000000000 -0400 @@ -408,11 +408,34 @@ music_store(JamView *view) { jam_doc_set_music(view->doc, music); } +static void tags_store(JamView *view); + +static void +tags_select_cb(JamView *view) { + gchar *tags; + GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(view)); + + tags = tags_dialog(toplevel, + JAM_ACCOUNT_LJ(view->account), + jam_doc_get_usejournal(view->doc)); + + if (tags) { + gtk_entry_set_text(GTK_ENTRY(view->tags), tags); + tags_store(view); + } +} + static void tags_add(JamView *view) { + GtkWidget *tagbutton; view->tags = gtk_entry_new(); view->tagsbar = labelled_box_new_sg(_("_Tags:"), view->tags, view->sizegroup); gtk_box_pack_start(GTK_BOX(view), view->tagsbar, FALSE, FALSE, 0); + tagbutton = gtk_button_new_with_label("..."); + g_signal_connect_swapped(G_OBJECT(tagbutton), "clicked", + G_CALLBACK(tags_select_cb), view); + gtk_box_pack_start(GTK_BOX(view->tagsbar), + tagbutton, FALSE, FALSE, 0); gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1); gtk_widget_show_all(view->tagsbar); } logjam-title.patch: --- NEW FILE logjam-title.patch --- diff --git logjam-4.5.3/src/html_markup.c logjam-4.5.3/src/html_markup.c index 36ec4e7..9c5a796 100644 --- logjam-4.5.3/src/html_markup.c +++ logjam-4.5.3/src/html_markup.c @@ -74,3 +74,8 @@ void html_mark_monospaced(JamDoc *doc) { html_mark_tag(doc, "tt"); } + +void +html_mark_blockquote(JamDoc *doc) { + html_mark_tag(doc, "blockquote"); +} diff --git logjam-4.5.3/src/imagelink.c logjam-4.5.3/src/imagelink.c index a9f296d..3048714 100644 --- logjam-4.5.3/src/imagelink.c +++ logjam-4.5.3/src/imagelink.c @@ -13,7 +13,7 @@ typedef struct { GtkWidget *dlg; - GtkWidget *url, *get, *width, *height; + GtkWidget *url, *get, *width, *height, *tit, *anchor; } ImageDlg; static void @@ -87,7 +87,17 @@ make_dialog(ImageDlg *idlg, GtkWindow *win) { gtk_box_pack_start(GTK_BOX(vbox), labelled_box_new_sg(_("_URL:"), idlg->url, sg), FALSE, FALSE, 0); - + + //malwk + idlg->tit = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(vbox), + labelled_box_new_sg(_("Title:"), idlg->tit, sg), + FALSE, FALSE, 0); + idlg->anchor = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(vbox), + labelled_box_new_sg(_("Link:"), idlg->anchor, sg), + FALSE, FALSE, 0); + //malwk end hbox = gtk_hbox_new(FALSE, 6); dimbox = gtk_vbox_new(FALSE, 6); @@ -131,7 +141,7 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) { STACK(ImageDlg, idlg); GtkTextBuffer *buffer; GtkTextIter start, end; - char *sel = NULL, *url = NULL; + char *sel = NULL, *url = NULL, *tit = NULL, *anch= NULL; const char *data; int width = -1, height = -1; @@ -158,14 +168,20 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) { else gtk_text_buffer_get_iter_at_mark(buffer, &start, gtk_text_buffer_get_insert(buffer)); - + url = g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->url))); xml_escape(&url); - gtk_text_buffer_insert(buffer, &start, "width)); width = atoi(data); @@ -182,7 +198,20 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) { gtk_text_buffer_insert(buffer, &start, data, -1); g_free(data); } + + tit=g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->tit))); + if (*tit!=NULL) { + gtk_text_buffer_insert(buffer, &start, " title=\"", -1); + gtk_text_buffer_insert(buffer, &start, tit, -1); + gtk_text_buffer_insert(buffer, &start, "\"", -1); + } + g_free(tit); + gtk_text_buffer_insert(buffer, &start, " />", -1); + if (*anch!=NULL){ + gtk_text_buffer_insert(buffer, &start, "", -1); + } + g_free(anch); } g_free(sel); diff --git logjam-4.5.3/src/link.c logjam-4.5.3/src/link.c index 0be2e98..a8dd465 100644 --- logjam-4.5.3/src/link.c +++ logjam-4.5.3/src/link.c @@ -17,6 +17,7 @@ typedef struct { GtkWidget *dlg; GtkWidget *etext, *ruser, *euser, *rurl, *eurl; + GtkWidget *titl; JamDoc *doc; gint sel_type, clip_type; gchar *sel_input, *clip_input; @@ -98,7 +99,7 @@ link_magic(LinkRequest *lr) { static void make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) { GtkWidget *vbox; - GtkWidget *subbox; + GtkWidget *subbox, *hhr; GSList *rgroup; ld->dlg = gtk_dialog_new_with_buttons(_("Make Link"), @@ -114,7 +115,10 @@ make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) { gtk_entry_set_activates_default(GTK_ENTRY(ld->etext), TRUE); subbox = labelled_box_new(_("Link _Text:"), ld->etext); gtk_box_pack_start(GTK_BOX(vbox), subbox, FALSE, FALSE, 0); - + ld->titl = gtk_entry_new(); + hhr = labelled_box_new(_("Link Title:"), ld->titl); + gtk_box_pack_start(GTK_BOX(vbox), hhr, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), radio_option(NULL, &ld->rurl, &ld->eurl, _("_URL:"), NULL, ""), FALSE, FALSE, 0); @@ -178,7 +182,7 @@ prepopulate_fields(LinkDialog *ld, char *bufsel) { static char* get_link(LinkDialog *ld, JamAccount *acc) { - char *url, *user, *text; + char *url, *user, *text, *title=NULL; char *link = NULL; url = gtk_editable_get_chars(GTK_EDITABLE(ld->eurl), 0, -1); @@ -187,10 +191,16 @@ get_link(LinkDialog *ld, JamAccount *acc) { xml_escape(&user); text = gtk_editable_get_chars(GTK_EDITABLE(ld->etext), 0, -1); xml_escape(&text); + title = gtk_editable_get_chars(GTK_EDITABLE(ld->titl), 0, -1); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->rurl))) { /* build a "url" link. */ + if (*title!=NULL){ + link = g_strdup_printf("%s", url, title, text); + } + else { link = g_strdup_printf("%s", url, text); + } } else if (ld->ruser && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->ruser))) { /* build a "friends" link. */ @@ -204,6 +214,7 @@ get_link(LinkDialog *ld, JamAccount *acc) { g_free(url); g_free(user); g_free(text); + g_free(title); return link; } diff --git logjam-4.5.3/src/menu.c logjam-4.5.3/src/menu.c index 53d1275..384ccce 100644 --- logjam-4.5.3/src/menu.c +++ logjam-4.5.3/src/menu.c @@ -315,6 +315,10 @@ static void menu_html_mark_monospaced(JamWin *jw) { html_mark_monospaced(jw->doc); } +static void +menu_html_mark_blockquote(JamWin *jw) { + html_mark_blockquote(jw->doc); +} void manager_dialog(GtkWidget *parent); @@ -428,6 +432,7 @@ static GtkItemFactoryEntry menu_items[] = { { N_("/HTML/_Strikeout"), "S", menu_html_mark_strikeout }, { N_("/HTML/_Monospaced"), "M", menu_html_mark_monospaced }, { N_("/HTML/_Underline"), "U", menu_html_mark_underline }, +{ N_("/HTML/_Blockquote"), "Q", menu_html_mark_blockquote }, { N_("/_Journal"), NULL, NULL, ACTION_JOURNAL, "" }, { N_("/Journal/_Use Journal"), NULL, NULL, ACTION_JOURNAL_USE, NULL }, Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-7/logjam.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- logjam.spec 23 Aug 2007 23:13:13 -0000 1.32 +++ logjam.spec 11 Mar 2008 19:53:07 -0000 1.33 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 9%{?dist}.1 +Release: 13%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -28,6 +28,10 @@ Patch8: logjam-4.5.3-gtkspell.patch Patch9: http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff Patch10: logjam-4.5.3-rhythmbox-fix.patch +Patch12: logjam-4.5.3-disable-threads.patch +Patch13: logjam-title.patch +Patch14: logjam-4.5.3-tags.patch +Patch15: logjam-4.5.3-default-spelllang-en-US.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -55,6 +59,10 @@ %patch8 -p1 -b .bz186906 %patch9 -p1 -b .docklet-context-menu %patch10 -p1 -b .rhythmboxfix +%patch12 -p1 -b .disablethreads +%patch13 -p1 -b .title +%patch14 -p1 -b .tags +%patch15 -p1 -b .default-spelllang-en-US %build autoconf @@ -94,6 +102,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-13 +- disable unused threading on linux, resolves bz 435124 +- enable tags support (bz 434754) +- add support for titles to links and images and links for images (bz 434754) +- set default spellcheck lang to en_US (en was the old default, but didn't work) + +* Thu Aug 23 2007 Tom "spot" Callaway 1:4.5.3-9.2 +- rebuild for BuildID, license fix (GPLv2+) + * Mon Mar 19 2007 Tom "spot" Callaway 1:4.5.3-9.1 - rebuild for new gtkhtml, new patch to detect it From fedora-extras-commits at redhat.com Tue Mar 11 19:53:41 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 19:53:41 GMT Subject: rpms/logjam/F-8 logjam-4.5.3-default-spelllang-en-US.patch, NONE, 1.1 logjam-4.5.3-tags.patch, NONE, 1.1 logjam-title.patch, NONE, 1.1 logjam.spec, 1.32, 1.33 Message-ID: <200803111953.m2BJrf22017686@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17601/F-8 Modified Files: logjam.spec Added Files: logjam-4.5.3-default-spelllang-en-US.patch logjam-4.5.3-tags.patch logjam-title.patch Log Message: tags, title, default lang fix, crash fix logjam-4.5.3-default-spelllang-en-US.patch: --- NEW FILE logjam-4.5.3-default-spelllang-en-US.patch --- diff -up logjam-4.5.3/src/conf_xml.c.BAD logjam-4.5.3/src/conf_xml.c --- logjam-4.5.3/src/conf_xml.c.BAD 2008-03-11 15:41:21.000000000 -0400 +++ logjam-4.5.3/src/conf_xml.c 2008-03-11 15:41:25.000000000 -0400 @@ -266,7 +266,7 @@ parseconf(xmlDocPtr doc, xmlNodePtr node #ifdef HAVE_GTKSPELL if (!c->spell_language || strlen(c->spell_language) < 2) { g_free(c->spell_language); - c->spell_language = g_strdup("en"); + c->spell_language = g_strdup("en_US"); } #endif /* HAVE_GTKSPELL */ hostspath = g_build_filename(app.conf_dir, "servers", NULL); logjam-4.5.3-tags.patch: --- NEW FILE logjam-4.5.3-tags.patch --- diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,18 @@ +/* liblivejournal - a client library for LiveJournal. + * Copyright (C) 2003 Evan Martin + * + * vim: tabstop=4 shiftwidth=4 noexpandtab : + */ + +#ifndef __LIVEJOURNAL_TAGS_H__ +#define __LIVEJOURNAL_TAGS_H__ + +typedef struct _LJTag { + char *tag; + guint32 count; +} LJTag; + +LJTag *lj_tag_new(void); +void lj_tag_free(LJTag *t); + +#endif /* __LIVEJOURNAL_TAGS_H__ */ diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c --- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags 2005-10-23 21:29:32.000000000 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 15:09:55.000000000 -0400 @@ -14,6 +14,7 @@ #include "entry.h" #include "friends.h" +#include "tags.h" #include "types.h" char* @@ -75,6 +76,18 @@ lj_friend_compare_username(gconstpointer return strcmp(fa->username, fb->username); } +LJTag* +lj_tag_new(void) { + LJTag *t = g_new0(LJTag, 1); + return t; +} + +void +lj_tag_free(LJTag *t) { + g_free(t->tag); + g_free(t); +} + void lj_security_append_to_request(LJSecurity *security, LJRequest *request) { char *text = NULL; diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am --- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags 2005-08-24 22:42:14.000000000 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 15:09:55.000000000 -0400 @@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ liblivejournal_la_SOURCES = \ md5.c md5.h \ protocol.c protocol.h \ - friends.h \ + friends.h tags.h \ serveruser.c serveruser.h \ entry.c entry.h \ types.c types.h \ @@ -21,6 +21,7 @@ liblivejournal_la_SOURCES = \ getchallenge.c getchallenge.h \ getevents.c getevents.h \ getfriends.c getfriends.h \ + gettags.c gettags.h \ syncitems.c syncitems.h \ sync.c sync.h \ livejournal.h diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h --- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags 2005-02-21 12:46:10.000000000 -0500 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 15:09:55.000000000 -0400 @@ -16,5 +16,6 @@ #include #include #include +#include #endif /* __LIVEJOURNAL_H__ */ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,16 @@ + +#ifndef __LIVEJOURNAL_GETTAGS_H__ +#define __LIVEJOURNAL_GETTAGS_H__ + +#include + +typedef struct { + LJVerb verb; + GHashTable *tags; +} LJGetTags; + +LJGetTags* lj_gettags_new(LJUser *user, const gchar *journal); +void lj_gettags_free(LJGetTags *gettags, gboolean includetags); + +#endif /* __LIVEJOURNAL_GETTAGS_H__ */ + diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,65 @@ + +#include + +#include + +#include "tags.h" +#include "gettags.h" + +static void +read_tags(LJResult *result, GHashTable *tags) { + LJTag *t; + int i, count; + guint32 mask; + char *value; + + count = lj_result_get_int(result, "tag_count"); + for (i = 1; i <= count; i++) { + t = lj_tag_new(); + t->tag = g_strdup(lj_result_getf(result, "tag_%d_name", i)); + + value = lj_result_getf(result, "tag_%d_uses", i); + if (value) t->count = lj_color_to_int(value); + + g_hash_table_insert(tags, t->tag, t); + } +} + +static void +parse_result(LJVerb *verb) { + GHashTable *tags; + + tags = g_hash_table_new(g_str_hash, g_str_equal); + + read_tags(verb->result, tags); + ((LJGetTags*)verb)->tags = tags; +} + +LJGetTags* +lj_gettags_new(LJUser *user, const gchar *journal) { + LJGetTags *gettags = g_new0(LJGetTags, 1); + LJVerb *verb = (LJVerb*)gettags; + + lj_verb_init(verb, user, "getusertags", FALSE, parse_result); + if (journal) + lj_request_add(verb->request, "usejournal", journal); + + return gettags; +} + +static void +hash_tag_free_cb(gpointer key, LJTag *t, gpointer data) { + lj_tag_free(t); +} + +void +lj_gettags_free(LJGetTags *gettags, gboolean includetags) { + if (gettags->tags) { + if (includetags) + g_hash_table_foreach(gettags->tags, + (GHFunc)hash_tag_free_cb, NULL); + g_hash_table_destroy(gettags->tags); + } + g_free(gettags); +} + diff -up /dev/null logjam-4.5.3/src/tags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/src/tags.c 2008-03-11 15:16:52.000000000 -0400 @@ -0,0 +1,181 @@ + +#include "gtk-all.h" + +#include +#include + +#include "account.h" +#include "tags.h" + +static void +tags_hash_list_cb (gpointer key, LJTag *t, GSList **list) +{ + *list = g_slist_append(*list, t); +} + +static gboolean +load_tags (GtkWindow *parent, JamAccountLJ *acc, gchar *journal, GSList **l) +{ + LJGetTags *gettags; + NetContext *ctx; + + ctx = net_ctx_gtk_new (parent, _("Loading Tags")); + gettags = lj_gettags_new (jam_account_lj_get_user (acc), journal); + if (!net_run_verb_ctx ((LJVerb*) gettags, ctx, NULL)) + { + lj_gettags_free (gettags, TRUE); + net_ctx_gtk_free (ctx); + return FALSE; + } + + g_hash_table_foreach (gettags->tags, (GHFunc) tags_hash_list_cb, l); + + lj_gettags_free (gettags, FALSE); + net_ctx_gtk_free (ctx); + + return TRUE; +} + +static void +tag_toggled (GtkCellRendererToggle *cell, + gchar *path_str, + gpointer data) +{ + GtkTreeModel *model = (GtkTreeModel *)data; + GtkTreeIter iter; + GtkTreePath *path = gtk_tree_path_new_from_string (path_str); + gboolean tag; + + gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_model_get (model, &iter, 0, &tag, -1); + + tag ^= 1; + + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, tag, -1); + + gtk_tree_path_free (path); +} + +gboolean +create_tag_string (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + gchar *tag; + gboolean is_sel; + gchar **tagstr = (gchar **) data; + + gtk_tree_model_get (model, iter, 0, &is_sel, -1); + if (is_sel) + { + gchar *buf = *tagstr; + gtk_tree_model_get (model, iter, 1, &tag, -1); + *tagstr = g_strconcat (buf, tag, ", ", NULL); + g_free (buf); + } + + return FALSE; +} + +GtkWidget* +taglist_create (GSList *l) +{ + GtkWidget *treeview; + GtkListStore *store; + GtkTreeIter iter; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + guint i; + + /* create model */ + store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING); + for (i = 0; i < g_slist_length (l); i++) + { + LJTag *t = (LJTag *) g_slist_nth_data (l, i); + + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + 0, FALSE, + 1, t->tag, + -1); + } + + /* create treeview */ + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE); + gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview), 1); + + /* add columns */ + renderer = gtk_cell_renderer_toggle_new (); + g_signal_connect (renderer, "toggled", + G_CALLBACK (tag_toggled), + GTK_TREE_MODEL (store)); + column = gtk_tree_view_column_new_with_attributes ("#", + renderer, "active", 0, + NULL); + gtk_tree_view_append_column (treeview, column); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Tag name"), + renderer, "text", 1, + NULL); + gtk_tree_view_column_set_sort_column_id (column, 1); + gtk_tree_view_append_column (treeview, column); + + g_object_unref (store); + + return treeview; +} + +gchar* +tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal) +{ + GtkWidget *dlg, *sw, *tv; + GSList *list = NULL; + gchar *taglist = NULL; + + if (acc == NULL) return NULL; + + load_tags (GTK_WINDOW (win), acc, journal, &list); + + dlg = gtk_dialog_new_with_buttons (_("Select tags"), + GTK_WINDOW (win), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, + GTK_RESPONSE_OK, + GTK_STOCK_CLOSE, + GTK_RESPONSE_CLOSE, + NULL); + + sw = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), + GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0); + + tv = taglist_create (list); + gtk_container_add (GTK_CONTAINER (sw), tv); + + gtk_window_resize(dlg, 60, 210); + gtk_widget_show_all (sw); + + if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK) + { + taglist = g_strdup (""); + gtk_tree_model_foreach (gtk_tree_view_get_model (tv), + create_tag_string, + &taglist); + if (g_ascii_strcasecmp (taglist, "") == 0) + { + g_free (taglist); + taglist = NULL; + } + } + + gtk_widget_destroy (dlg); + + return taglist; +} diff -up /dev/null logjam-4.5.3/src/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/src/tags.h 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef _TAGS_H_ +#define _TAGS_H_ + +gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal); + +#endif /* _TAGS_H_ */ diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am --- logjam-4.5.3/src/Makefile.am.tags 2005-10-23 21:16:08.000000000 -0400 +++ logjam-4.5.3/src/Makefile.am 2008-03-11 15:09:55.000000000 -0400 @@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. undo.c undo.h \ userlabel.c userlabel.h \ get_cmd_out.c get_cmd_out.h \ + tags.c tags.h \ $(HTML_MARKUP) src_preview = $(PREVIEW) diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c --- logjam-4.5.3/src/jamview.c.tags 2005-06-19 14:05:40.000000000 -0400 +++ logjam-4.5.3/src/jamview.c 2008-03-11 15:09:55.000000000 -0400 @@ -408,11 +408,34 @@ music_store(JamView *view) { jam_doc_set_music(view->doc, music); } +static void tags_store(JamView *view); + +static void +tags_select_cb(JamView *view) { + gchar *tags; + GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(view)); + + tags = tags_dialog(toplevel, + JAM_ACCOUNT_LJ(view->account), + jam_doc_get_usejournal(view->doc)); + + if (tags) { + gtk_entry_set_text(GTK_ENTRY(view->tags), tags); + tags_store(view); + } +} + static void tags_add(JamView *view) { + GtkWidget *tagbutton; view->tags = gtk_entry_new(); view->tagsbar = labelled_box_new_sg(_("_Tags:"), view->tags, view->sizegroup); gtk_box_pack_start(GTK_BOX(view), view->tagsbar, FALSE, FALSE, 0); + tagbutton = gtk_button_new_with_label("..."); + g_signal_connect_swapped(G_OBJECT(tagbutton), "clicked", + G_CALLBACK(tags_select_cb), view); + gtk_box_pack_start(GTK_BOX(view->tagsbar), + tagbutton, FALSE, FALSE, 0); gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1); gtk_widget_show_all(view->tagsbar); } logjam-title.patch: --- NEW FILE logjam-title.patch --- diff --git logjam-4.5.3/src/html_markup.c logjam-4.5.3/src/html_markup.c index 36ec4e7..9c5a796 100644 --- logjam-4.5.3/src/html_markup.c +++ logjam-4.5.3/src/html_markup.c @@ -74,3 +74,8 @@ void html_mark_monospaced(JamDoc *doc) { html_mark_tag(doc, "tt"); } + +void +html_mark_blockquote(JamDoc *doc) { + html_mark_tag(doc, "blockquote"); +} diff --git logjam-4.5.3/src/imagelink.c logjam-4.5.3/src/imagelink.c index a9f296d..3048714 100644 --- logjam-4.5.3/src/imagelink.c +++ logjam-4.5.3/src/imagelink.c @@ -13,7 +13,7 @@ typedef struct { GtkWidget *dlg; - GtkWidget *url, *get, *width, *height; + GtkWidget *url, *get, *width, *height, *tit, *anchor; } ImageDlg; static void @@ -87,7 +87,17 @@ make_dialog(ImageDlg *idlg, GtkWindow *win) { gtk_box_pack_start(GTK_BOX(vbox), labelled_box_new_sg(_("_URL:"), idlg->url, sg), FALSE, FALSE, 0); - + + //malwk + idlg->tit = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(vbox), + labelled_box_new_sg(_("Title:"), idlg->tit, sg), + FALSE, FALSE, 0); + idlg->anchor = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(vbox), + labelled_box_new_sg(_("Link:"), idlg->anchor, sg), + FALSE, FALSE, 0); + //malwk end hbox = gtk_hbox_new(FALSE, 6); dimbox = gtk_vbox_new(FALSE, 6); @@ -131,7 +141,7 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) { STACK(ImageDlg, idlg); GtkTextBuffer *buffer; GtkTextIter start, end; - char *sel = NULL, *url = NULL; + char *sel = NULL, *url = NULL, *tit = NULL, *anch= NULL; const char *data; int width = -1, height = -1; @@ -158,14 +168,20 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) { else gtk_text_buffer_get_iter_at_mark(buffer, &start, gtk_text_buffer_get_insert(buffer)); - + url = g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->url))); xml_escape(&url); - gtk_text_buffer_insert(buffer, &start, "width)); width = atoi(data); @@ -182,7 +198,20 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) { gtk_text_buffer_insert(buffer, &start, data, -1); g_free(data); } + + tit=g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->tit))); + if (*tit!=NULL) { + gtk_text_buffer_insert(buffer, &start, " title=\"", -1); + gtk_text_buffer_insert(buffer, &start, tit, -1); + gtk_text_buffer_insert(buffer, &start, "\"", -1); + } + g_free(tit); + gtk_text_buffer_insert(buffer, &start, " />", -1); + if (*anch!=NULL){ + gtk_text_buffer_insert(buffer, &start, "", -1); + } + g_free(anch); } g_free(sel); diff --git logjam-4.5.3/src/link.c logjam-4.5.3/src/link.c index 0be2e98..a8dd465 100644 --- logjam-4.5.3/src/link.c +++ logjam-4.5.3/src/link.c @@ -17,6 +17,7 @@ typedef struct { GtkWidget *dlg; GtkWidget *etext, *ruser, *euser, *rurl, *eurl; + GtkWidget *titl; JamDoc *doc; gint sel_type, clip_type; gchar *sel_input, *clip_input; @@ -98,7 +99,7 @@ link_magic(LinkRequest *lr) { static void make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) { GtkWidget *vbox; - GtkWidget *subbox; + GtkWidget *subbox, *hhr; GSList *rgroup; ld->dlg = gtk_dialog_new_with_buttons(_("Make Link"), @@ -114,7 +115,10 @@ make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) { gtk_entry_set_activates_default(GTK_ENTRY(ld->etext), TRUE); subbox = labelled_box_new(_("Link _Text:"), ld->etext); gtk_box_pack_start(GTK_BOX(vbox), subbox, FALSE, FALSE, 0); - + ld->titl = gtk_entry_new(); + hhr = labelled_box_new(_("Link Title:"), ld->titl); + gtk_box_pack_start(GTK_BOX(vbox), hhr, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), radio_option(NULL, &ld->rurl, &ld->eurl, _("_URL:"), NULL, ""), FALSE, FALSE, 0); @@ -178,7 +182,7 @@ prepopulate_fields(LinkDialog *ld, char *bufsel) { static char* get_link(LinkDialog *ld, JamAccount *acc) { - char *url, *user, *text; + char *url, *user, *text, *title=NULL; char *link = NULL; url = gtk_editable_get_chars(GTK_EDITABLE(ld->eurl), 0, -1); @@ -187,10 +191,16 @@ get_link(LinkDialog *ld, JamAccount *acc) { xml_escape(&user); text = gtk_editable_get_chars(GTK_EDITABLE(ld->etext), 0, -1); xml_escape(&text); + title = gtk_editable_get_chars(GTK_EDITABLE(ld->titl), 0, -1); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->rurl))) { /* build a "url" link. */ + if (*title!=NULL){ + link = g_strdup_printf("%s", url, title, text); + } + else { link = g_strdup_printf("%s", url, text); + } } else if (ld->ruser && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->ruser))) { /* build a "friends" link. */ @@ -204,6 +214,7 @@ get_link(LinkDialog *ld, JamAccount *acc) { g_free(url); g_free(user); g_free(text); + g_free(title); return link; } diff --git logjam-4.5.3/src/menu.c logjam-4.5.3/src/menu.c index 53d1275..384ccce 100644 --- logjam-4.5.3/src/menu.c +++ logjam-4.5.3/src/menu.c @@ -315,6 +315,10 @@ static void menu_html_mark_monospaced(JamWin *jw) { html_mark_monospaced(jw->doc); } +static void +menu_html_mark_blockquote(JamWin *jw) { + html_mark_blockquote(jw->doc); +} void manager_dialog(GtkWidget *parent); @@ -428,6 +432,7 @@ static GtkItemFactoryEntry menu_items[] = { { N_("/HTML/_Strikeout"), "S", menu_html_mark_strikeout }, { N_("/HTML/_Monospaced"), "M", menu_html_mark_monospaced }, { N_("/HTML/_Underline"), "U", menu_html_mark_underline }, +{ N_("/HTML/_Blockquote"), "Q", menu_html_mark_blockquote }, { N_("/_Journal"), NULL, NULL, ACTION_JOURNAL, "" }, { N_("/Journal/_Use Journal"), NULL, NULL, ACTION_JOURNAL_USE, NULL }, Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- logjam.spec 23 Aug 2007 23:13:19 -0000 1.32 +++ logjam.spec 11 Mar 2008 19:53:10 -0000 1.33 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 9%{?dist}.3 +Release: 13%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -28,6 +28,10 @@ Patch8: logjam-4.5.3-gtkspell.patch Patch9: http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff Patch10: logjam-4.5.3-rhythmbox-fix.patch +Patch12: logjam-4.5.3-disable-threads.patch +Patch13: logjam-title.patch +Patch14: logjam-4.5.3-tags.patch +Patch15: logjam-4.5.3-default-spelllang-en-US.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -52,9 +56,13 @@ %patch5 -p1 -b .manfix %patch6 -p1 -b .gtkhtml314 %patch7 -p1 -b .ru.po -#patch8 -p1 -b .bz186906 +%patch8 -p1 -b .bz186906 %patch9 -p1 -b .docklet-context-menu %patch10 -p1 -b .rhythmboxfix +%patch12 -p1 -b .disablethreads +%patch13 -p1 -b .title +%patch14 -p1 -b .tags +%patch15 -p1 -b .default-spelllang-en-US %build autoconf @@ -94,6 +102,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-13 +- disable unused threading on linux, resolves bz 435124 +- enable tags support (bz 434754) +- add support for titles to links and images and links for images (bz 434754) +- set default spellcheck lang to en_US (en was the old default, but didn't work) + * Thu Aug 23 2007 Tom "spot" Callaway 1:4.5.3-9.2 - rebuild for BuildID, license fix (GPLv2+) From fedora-extras-commits at redhat.com Tue Mar 11 19:53:43 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 19:53:43 GMT Subject: rpms/logjam/devel logjam-4.5.3-default-spelllang-en-US.patch, NONE, 1.1 logjam-4.5.3-tags.patch, NONE, 1.1 logjam-title.patch, NONE, 1.1 logjam.spec, 1.35, 1.36 Message-ID: <200803111953.m2BJrh26017689@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17601/devel Modified Files: logjam.spec Added Files: logjam-4.5.3-default-spelllang-en-US.patch logjam-4.5.3-tags.patch logjam-title.patch Log Message: tags, title, default lang fix, crash fix logjam-4.5.3-default-spelllang-en-US.patch: --- NEW FILE logjam-4.5.3-default-spelllang-en-US.patch --- diff -up logjam-4.5.3/src/conf_xml.c.BAD logjam-4.5.3/src/conf_xml.c --- logjam-4.5.3/src/conf_xml.c.BAD 2008-03-11 15:41:21.000000000 -0400 +++ logjam-4.5.3/src/conf_xml.c 2008-03-11 15:41:25.000000000 -0400 @@ -266,7 +266,7 @@ parseconf(xmlDocPtr doc, xmlNodePtr node #ifdef HAVE_GTKSPELL if (!c->spell_language || strlen(c->spell_language) < 2) { g_free(c->spell_language); - c->spell_language = g_strdup("en"); + c->spell_language = g_strdup("en_US"); } #endif /* HAVE_GTKSPELL */ hostspath = g_build_filename(app.conf_dir, "servers", NULL); logjam-4.5.3-tags.patch: --- NEW FILE logjam-4.5.3-tags.patch --- diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,18 @@ +/* liblivejournal - a client library for LiveJournal. + * Copyright (C) 2003 Evan Martin + * + * vim: tabstop=4 shiftwidth=4 noexpandtab : + */ + +#ifndef __LIVEJOURNAL_TAGS_H__ +#define __LIVEJOURNAL_TAGS_H__ + +typedef struct _LJTag { + char *tag; + guint32 count; +} LJTag; + +LJTag *lj_tag_new(void); +void lj_tag_free(LJTag *t); + +#endif /* __LIVEJOURNAL_TAGS_H__ */ diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c --- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags 2005-10-23 21:29:32.000000000 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 15:09:55.000000000 -0400 @@ -14,6 +14,7 @@ #include "entry.h" #include "friends.h" +#include "tags.h" #include "types.h" char* @@ -75,6 +76,18 @@ lj_friend_compare_username(gconstpointer return strcmp(fa->username, fb->username); } +LJTag* +lj_tag_new(void) { + LJTag *t = g_new0(LJTag, 1); + return t; +} + +void +lj_tag_free(LJTag *t) { + g_free(t->tag); + g_free(t); +} + void lj_security_append_to_request(LJSecurity *security, LJRequest *request) { char *text = NULL; diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am --- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags 2005-08-24 22:42:14.000000000 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 15:09:55.000000000 -0400 @@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ liblivejournal_la_SOURCES = \ md5.c md5.h \ protocol.c protocol.h \ - friends.h \ + friends.h tags.h \ serveruser.c serveruser.h \ entry.c entry.h \ types.c types.h \ @@ -21,6 +21,7 @@ liblivejournal_la_SOURCES = \ getchallenge.c getchallenge.h \ getevents.c getevents.h \ getfriends.c getfriends.h \ + gettags.c gettags.h \ syncitems.c syncitems.h \ sync.c sync.h \ livejournal.h diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h --- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags 2005-02-21 12:46:10.000000000 -0500 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 15:09:55.000000000 -0400 @@ -16,5 +16,6 @@ #include #include #include +#include #endif /* __LIVEJOURNAL_H__ */ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,16 @@ + +#ifndef __LIVEJOURNAL_GETTAGS_H__ +#define __LIVEJOURNAL_GETTAGS_H__ + +#include + +typedef struct { + LJVerb verb; + GHashTable *tags; +} LJGetTags; + +LJGetTags* lj_gettags_new(LJUser *user, const gchar *journal); +void lj_gettags_free(LJGetTags *gettags, gboolean includetags); + +#endif /* __LIVEJOURNAL_GETTAGS_H__ */ + diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,65 @@ + +#include + +#include + +#include "tags.h" +#include "gettags.h" + +static void +read_tags(LJResult *result, GHashTable *tags) { + LJTag *t; + int i, count; + guint32 mask; + char *value; + + count = lj_result_get_int(result, "tag_count"); + for (i = 1; i <= count; i++) { + t = lj_tag_new(); + t->tag = g_strdup(lj_result_getf(result, "tag_%d_name", i)); + + value = lj_result_getf(result, "tag_%d_uses", i); + if (value) t->count = lj_color_to_int(value); + + g_hash_table_insert(tags, t->tag, t); + } +} + +static void +parse_result(LJVerb *verb) { + GHashTable *tags; + + tags = g_hash_table_new(g_str_hash, g_str_equal); + + read_tags(verb->result, tags); + ((LJGetTags*)verb)->tags = tags; +} + +LJGetTags* +lj_gettags_new(LJUser *user, const gchar *journal) { + LJGetTags *gettags = g_new0(LJGetTags, 1); + LJVerb *verb = (LJVerb*)gettags; + + lj_verb_init(verb, user, "getusertags", FALSE, parse_result); + if (journal) + lj_request_add(verb->request, "usejournal", journal); + + return gettags; +} + +static void +hash_tag_free_cb(gpointer key, LJTag *t, gpointer data) { + lj_tag_free(t); +} + +void +lj_gettags_free(LJGetTags *gettags, gboolean includetags) { + if (gettags->tags) { + if (includetags) + g_hash_table_foreach(gettags->tags, + (GHFunc)hash_tag_free_cb, NULL); + g_hash_table_destroy(gettags->tags); + } + g_free(gettags); +} + diff -up /dev/null logjam-4.5.3/src/tags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/src/tags.c 2008-03-11 15:16:52.000000000 -0400 @@ -0,0 +1,181 @@ + +#include "gtk-all.h" + +#include +#include + +#include "account.h" +#include "tags.h" + +static void +tags_hash_list_cb (gpointer key, LJTag *t, GSList **list) +{ + *list = g_slist_append(*list, t); +} + +static gboolean +load_tags (GtkWindow *parent, JamAccountLJ *acc, gchar *journal, GSList **l) +{ + LJGetTags *gettags; + NetContext *ctx; + + ctx = net_ctx_gtk_new (parent, _("Loading Tags")); + gettags = lj_gettags_new (jam_account_lj_get_user (acc), journal); + if (!net_run_verb_ctx ((LJVerb*) gettags, ctx, NULL)) + { + lj_gettags_free (gettags, TRUE); + net_ctx_gtk_free (ctx); + return FALSE; + } + + g_hash_table_foreach (gettags->tags, (GHFunc) tags_hash_list_cb, l); + + lj_gettags_free (gettags, FALSE); + net_ctx_gtk_free (ctx); + + return TRUE; +} + +static void +tag_toggled (GtkCellRendererToggle *cell, + gchar *path_str, + gpointer data) +{ + GtkTreeModel *model = (GtkTreeModel *)data; + GtkTreeIter iter; + GtkTreePath *path = gtk_tree_path_new_from_string (path_str); + gboolean tag; + + gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_model_get (model, &iter, 0, &tag, -1); + + tag ^= 1; + + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, tag, -1); + + gtk_tree_path_free (path); +} + +gboolean +create_tag_string (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + gchar *tag; + gboolean is_sel; + gchar **tagstr = (gchar **) data; + + gtk_tree_model_get (model, iter, 0, &is_sel, -1); + if (is_sel) + { + gchar *buf = *tagstr; + gtk_tree_model_get (model, iter, 1, &tag, -1); + *tagstr = g_strconcat (buf, tag, ", ", NULL); + g_free (buf); + } + + return FALSE; +} + +GtkWidget* +taglist_create (GSList *l) +{ + GtkWidget *treeview; + GtkListStore *store; + GtkTreeIter iter; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + guint i; + + /* create model */ + store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING); + for (i = 0; i < g_slist_length (l); i++) + { + LJTag *t = (LJTag *) g_slist_nth_data (l, i); + + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + 0, FALSE, + 1, t->tag, + -1); + } + + /* create treeview */ + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE); + gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview), 1); + + /* add columns */ + renderer = gtk_cell_renderer_toggle_new (); + g_signal_connect (renderer, "toggled", + G_CALLBACK (tag_toggled), + GTK_TREE_MODEL (store)); + column = gtk_tree_view_column_new_with_attributes ("#", + renderer, "active", 0, + NULL); + gtk_tree_view_append_column (treeview, column); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Tag name"), + renderer, "text", 1, + NULL); + gtk_tree_view_column_set_sort_column_id (column, 1); + gtk_tree_view_append_column (treeview, column); + + g_object_unref (store); + + return treeview; +} + +gchar* +tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal) +{ + GtkWidget *dlg, *sw, *tv; + GSList *list = NULL; + gchar *taglist = NULL; + + if (acc == NULL) return NULL; + + load_tags (GTK_WINDOW (win), acc, journal, &list); + + dlg = gtk_dialog_new_with_buttons (_("Select tags"), + GTK_WINDOW (win), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, + GTK_RESPONSE_OK, + GTK_STOCK_CLOSE, + GTK_RESPONSE_CLOSE, + NULL); + + sw = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), + GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sw, TRUE, TRUE, 0); + + tv = taglist_create (list); + gtk_container_add (GTK_CONTAINER (sw), tv); + + gtk_window_resize(dlg, 60, 210); + gtk_widget_show_all (sw); + + if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK) + { + taglist = g_strdup (""); + gtk_tree_model_foreach (gtk_tree_view_get_model (tv), + create_tag_string, + &taglist); + if (g_ascii_strcasecmp (taglist, "") == 0) + { + g_free (taglist); + taglist = NULL; + } + } + + gtk_widget_destroy (dlg); + + return taglist; +} diff -up /dev/null logjam-4.5.3/src/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 +++ logjam-4.5.3/src/tags.h 2008-03-11 15:09:55.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef _TAGS_H_ +#define _TAGS_H_ + +gchar* tags_dialog (GtkWidget *win, JamAccountLJ *acc, gchar *journal); + +#endif /* _TAGS_H_ */ diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am --- logjam-4.5.3/src/Makefile.am.tags 2005-10-23 21:16:08.000000000 -0400 +++ logjam-4.5.3/src/Makefile.am 2008-03-11 15:09:55.000000000 -0400 @@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. undo.c undo.h \ userlabel.c userlabel.h \ get_cmd_out.c get_cmd_out.h \ + tags.c tags.h \ $(HTML_MARKUP) src_preview = $(PREVIEW) diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c --- logjam-4.5.3/src/jamview.c.tags 2005-06-19 14:05:40.000000000 -0400 +++ logjam-4.5.3/src/jamview.c 2008-03-11 15:09:55.000000000 -0400 @@ -408,11 +408,34 @@ music_store(JamView *view) { jam_doc_set_music(view->doc, music); } +static void tags_store(JamView *view); + +static void +tags_select_cb(JamView *view) { + gchar *tags; + GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(view)); + + tags = tags_dialog(toplevel, + JAM_ACCOUNT_LJ(view->account), + jam_doc_get_usejournal(view->doc)); + + if (tags) { + gtk_entry_set_text(GTK_ENTRY(view->tags), tags); + tags_store(view); + } +} + static void tags_add(JamView *view) { + GtkWidget *tagbutton; view->tags = gtk_entry_new(); view->tagsbar = labelled_box_new_sg(_("_Tags:"), view->tags, view->sizegroup); gtk_box_pack_start(GTK_BOX(view), view->tagsbar, FALSE, FALSE, 0); + tagbutton = gtk_button_new_with_label("..."); + g_signal_connect_swapped(G_OBJECT(tagbutton), "clicked", + G_CALLBACK(tags_select_cb), view); + gtk_box_pack_start(GTK_BOX(view->tagsbar), + tagbutton, FALSE, FALSE, 0); gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1); gtk_widget_show_all(view->tagsbar); } logjam-title.patch: --- NEW FILE logjam-title.patch --- diff --git logjam-4.5.3/src/html_markup.c logjam-4.5.3/src/html_markup.c index 36ec4e7..9c5a796 100644 --- logjam-4.5.3/src/html_markup.c +++ logjam-4.5.3/src/html_markup.c @@ -74,3 +74,8 @@ void html_mark_monospaced(JamDoc *doc) { html_mark_tag(doc, "tt"); } + +void +html_mark_blockquote(JamDoc *doc) { + html_mark_tag(doc, "blockquote"); +} diff --git logjam-4.5.3/src/imagelink.c logjam-4.5.3/src/imagelink.c index a9f296d..3048714 100644 --- logjam-4.5.3/src/imagelink.c +++ logjam-4.5.3/src/imagelink.c @@ -13,7 +13,7 @@ typedef struct { GtkWidget *dlg; - GtkWidget *url, *get, *width, *height; + GtkWidget *url, *get, *width, *height, *tit, *anchor; } ImageDlg; static void @@ -87,7 +87,17 @@ make_dialog(ImageDlg *idlg, GtkWindow *win) { gtk_box_pack_start(GTK_BOX(vbox), labelled_box_new_sg(_("_URL:"), idlg->url, sg), FALSE, FALSE, 0); - + + //malwk + idlg->tit = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(vbox), + labelled_box_new_sg(_("Title:"), idlg->tit, sg), + FALSE, FALSE, 0); + idlg->anchor = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(vbox), + labelled_box_new_sg(_("Link:"), idlg->anchor, sg), + FALSE, FALSE, 0); + //malwk end hbox = gtk_hbox_new(FALSE, 6); dimbox = gtk_vbox_new(FALSE, 6); @@ -131,7 +141,7 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) { STACK(ImageDlg, idlg); GtkTextBuffer *buffer; GtkTextIter start, end; - char *sel = NULL, *url = NULL; + char *sel = NULL, *url = NULL, *tit = NULL, *anch= NULL; const char *data; int width = -1, height = -1; @@ -158,14 +168,20 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) { else gtk_text_buffer_get_iter_at_mark(buffer, &start, gtk_text_buffer_get_insert(buffer)); - + url = g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->url))); xml_escape(&url); - gtk_text_buffer_insert(buffer, &start, "width)); width = atoi(data); @@ -182,7 +198,20 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) { gtk_text_buffer_insert(buffer, &start, data, -1); g_free(data); } + + tit=g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->tit))); + if (*tit!=NULL) { + gtk_text_buffer_insert(buffer, &start, " title=\"", -1); + gtk_text_buffer_insert(buffer, &start, tit, -1); + gtk_text_buffer_insert(buffer, &start, "\"", -1); + } + g_free(tit); + gtk_text_buffer_insert(buffer, &start, " />", -1); + if (*anch!=NULL){ + gtk_text_buffer_insert(buffer, &start, "", -1); + } + g_free(anch); } g_free(sel); diff --git logjam-4.5.3/src/link.c logjam-4.5.3/src/link.c index 0be2e98..a8dd465 100644 --- logjam-4.5.3/src/link.c +++ logjam-4.5.3/src/link.c @@ -17,6 +17,7 @@ typedef struct { GtkWidget *dlg; GtkWidget *etext, *ruser, *euser, *rurl, *eurl; + GtkWidget *titl; JamDoc *doc; gint sel_type, clip_type; gchar *sel_input, *clip_input; @@ -98,7 +99,7 @@ link_magic(LinkRequest *lr) { static void make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) { GtkWidget *vbox; - GtkWidget *subbox; + GtkWidget *subbox, *hhr; GSList *rgroup; ld->dlg = gtk_dialog_new_with_buttons(_("Make Link"), @@ -114,7 +115,10 @@ make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) { gtk_entry_set_activates_default(GTK_ENTRY(ld->etext), TRUE); subbox = labelled_box_new(_("Link _Text:"), ld->etext); gtk_box_pack_start(GTK_BOX(vbox), subbox, FALSE, FALSE, 0); - + ld->titl = gtk_entry_new(); + hhr = labelled_box_new(_("Link Title:"), ld->titl); + gtk_box_pack_start(GTK_BOX(vbox), hhr, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), radio_option(NULL, &ld->rurl, &ld->eurl, _("_URL:"), NULL, ""), FALSE, FALSE, 0); @@ -178,7 +182,7 @@ prepopulate_fields(LinkDialog *ld, char *bufsel) { static char* get_link(LinkDialog *ld, JamAccount *acc) { - char *url, *user, *text; + char *url, *user, *text, *title=NULL; char *link = NULL; url = gtk_editable_get_chars(GTK_EDITABLE(ld->eurl), 0, -1); @@ -187,10 +191,16 @@ get_link(LinkDialog *ld, JamAccount *acc) { xml_escape(&user); text = gtk_editable_get_chars(GTK_EDITABLE(ld->etext), 0, -1); xml_escape(&text); + title = gtk_editable_get_chars(GTK_EDITABLE(ld->titl), 0, -1); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->rurl))) { /* build a "url" link. */ + if (*title!=NULL){ + link = g_strdup_printf("%s", url, title, text); + } + else { link = g_strdup_printf("%s", url, text); + } } else if (ld->ruser && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->ruser))) { /* build a "friends" link. */ @@ -204,6 +214,7 @@ get_link(LinkDialog *ld, JamAccount *acc) { g_free(url); g_free(user); g_free(text); + g_free(title); return link; } diff --git logjam-4.5.3/src/menu.c logjam-4.5.3/src/menu.c index 53d1275..384ccce 100644 --- logjam-4.5.3/src/menu.c +++ logjam-4.5.3/src/menu.c @@ -315,6 +315,10 @@ static void menu_html_mark_monospaced(JamWin *jw) { html_mark_monospaced(jw->doc); } +static void +menu_html_mark_blockquote(JamWin *jw) { + html_mark_blockquote(jw->doc); +} void manager_dialog(GtkWidget *parent); @@ -428,6 +432,7 @@ static GtkItemFactoryEntry menu_items[] = { { N_("/HTML/_Strikeout"), "S", menu_html_mark_strikeout }, { N_("/HTML/_Monospaced"), "M", menu_html_mark_monospaced }, { N_("/HTML/_Underline"), "U", menu_html_mark_underline }, +{ N_("/HTML/_Blockquote"), "Q", menu_html_mark_blockquote }, { N_("/_Journal"), NULL, NULL, ACTION_JOURNAL, "" }, { N_("/Journal/_Use Journal"), NULL, NULL, ACTION_JOURNAL_USE, NULL }, Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- logjam.spec 16 Feb 2008 15:59:01 -0000 1.35 +++ logjam.spec 11 Mar 2008 19:53:11 -0000 1.36 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -29,6 +29,10 @@ Patch9: http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff Patch10: logjam-4.5.3-rhythmbox-fix.patch Patch11: logjam-libsoup24.diff +Patch12: logjam-4.5.3-disable-threads.patch +Patch13: logjam-title.patch +Patch14: logjam-4.5.3-tags.patch +Patch15: logjam-4.5.3-default-spelllang-en-US.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -53,10 +57,14 @@ %patch5 -p1 -b .manfix %patch6 -p1 -b .gtkhtml314 %patch7 -p1 -b .ru.po -#patch8 -p1 -b .bz186906 +%patch8 -p1 -b .bz186906 %patch9 -p1 -b .docklet-context-menu %patch10 -p1 -b .rhythmboxfix %patch11 -p1 -b .libsoup +%patch12 -p1 -b .disablethreads +%patch13 -p1 -b .title +%patch14 -p1 -b .tags +%patch15 -p1 -b .default-spelllang-en-US %build autoconf @@ -96,6 +104,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-13 +- disable unused threading on linux, resolves bz 435124 +- enable tags support (bz 434754) +- add support for titles to links and images and links for images (bz 434754) +- set default spellcheck lang to en_US (en was the old default, but didn't work) + * Sat Feb 16 2008 Jesse Keating - 4.5.3-12 - Rebuild for new libsoup From fedora-extras-commits at redhat.com Tue Mar 11 19:57:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 19:57:44 +0000 Subject: [pkgdb] mpfr: rdieter has requested watchbugzilla Message-ID: <200803112000.m2BK0cvc018999@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the watchbugzilla acl on mpfr (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpfr From fedora-extras-commits at redhat.com Tue Mar 11 19:57:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 19:57:44 +0000 Subject: [pkgdb] mpfr: rdieter has requested commit Message-ID: <200803112000.m2BK0cMC019011@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the commit acl on mpfr (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpfr From fedora-extras-commits at redhat.com Tue Mar 11 19:57:47 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 19:57:47 +0000 Subject: [pkgdb] mpfr: rdieter has requested watchcommits Message-ID: <200803112000.m2BK0cMF019011@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the watchcommits acl on mpfr (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpfr From fedora-extras-commits at redhat.com Tue Mar 11 19:57:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 19:57:53 +0000 Subject: [pkgdb] mpfr: rdieter has requested watchcommits Message-ID: <200803112000.m2BK0cvf018999@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the watchcommits acl on mpfr (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpfr From fedora-extras-commits at redhat.com Tue Mar 11 19:57:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 19:57:53 +0000 Subject: [pkgdb] mpfr: rdieter has requested watchbugzilla Message-ID: <200803112000.m2BK0lNV019056@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the watchbugzilla acl on mpfr (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpfr From fedora-extras-commits at redhat.com Tue Mar 11 19:57:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Tue, 11 Mar 2008 19:57:56 +0000 Subject: [pkgdb] mpfr: rdieter has requested commit Message-ID: <200803112000.m2BK0lNY019056@bastion.fedora.phx.redhat.com> Rex Dieter (rdieter) has requested the commit acl on mpfr (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpfr From fedora-extras-commits at redhat.com Tue Mar 11 20:00:30 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 20:00:30 GMT Subject: rpms/logjam/F-7 logjam-4.5.3-disable-threads.patch, NONE, 1.1 logjam.spec, 1.33, 1.34 Message-ID: <200803112000.m2BK0Us0017991@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17915/F-7 Modified Files: logjam.spec Added Files: logjam-4.5.3-disable-threads.patch Log Message: missed one patch logjam-4.5.3-disable-threads.patch: --- NEW FILE logjam-4.5.3-disable-threads.patch --- diff -up logjam-4.5.3/src/init.c.BAD logjam-4.5.3/src/init.c --- logjam-4.5.3/src/init.c.BAD 2008-03-11 14:48:18.000000000 -0400 +++ logjam-4.5.3/src/init.c 2008-03-11 14:49:35.000000000 -0400 @@ -177,13 +177,13 @@ setup_locales() { static void setup_glibgdk() { -#ifdef HAVE_GTK +#if defined (HAVE_GTK) && defined (G_OS_WIN32) /* calls to these thread inits must happen before any other * g* calls. */ if (!g_thread_supported()) g_thread_init(NULL); gdk_threads_init(); gdk_threads_enter(); -#endif /* HAVE_GTK */ +#endif /* HAVE_GTK && G_OS_WIN32 */ g_type_init(); Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-7/logjam.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- logjam.spec 11 Mar 2008 19:53:07 -0000 1.33 +++ logjam.spec 11 Mar 2008 19:59:59 -0000 1.34 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-14 +- missed one patch + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-13 - disable unused threading on linux, resolves bz 435124 - enable tags support (bz 434754) From fedora-extras-commits at redhat.com Tue Mar 11 20:00:34 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 20:00:34 GMT Subject: rpms/logjam/F-8 logjam-4.5.3-disable-threads.patch, NONE, 1.1 logjam.spec, 1.33, 1.34 Message-ID: <200803112000.m2BK0YCc017994@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17915/F-8 Modified Files: logjam.spec Added Files: logjam-4.5.3-disable-threads.patch Log Message: missed one patch logjam-4.5.3-disable-threads.patch: --- NEW FILE logjam-4.5.3-disable-threads.patch --- diff -up logjam-4.5.3/src/init.c.BAD logjam-4.5.3/src/init.c --- logjam-4.5.3/src/init.c.BAD 2008-03-11 14:48:18.000000000 -0400 +++ logjam-4.5.3/src/init.c 2008-03-11 14:49:35.000000000 -0400 @@ -177,13 +177,13 @@ setup_locales() { static void setup_glibgdk() { -#ifdef HAVE_GTK +#if defined (HAVE_GTK) && defined (G_OS_WIN32) /* calls to these thread inits must happen before any other * g* calls. */ if (!g_thread_supported()) g_thread_init(NULL); gdk_threads_init(); gdk_threads_enter(); -#endif /* HAVE_GTK */ +#endif /* HAVE_GTK && G_OS_WIN32 */ g_type_init(); Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- logjam.spec 11 Mar 2008 19:53:10 -0000 1.33 +++ logjam.spec 11 Mar 2008 20:00:01 -0000 1.34 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-14 +- missed one patch + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-13 - disable unused threading on linux, resolves bz 435124 - enable tags support (bz 434754) From fedora-extras-commits at redhat.com Tue Mar 11 20:00:36 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 20:00:36 GMT Subject: rpms/logjam/devel logjam-4.5.3-disable-threads.patch, NONE, 1.1 logjam.spec, 1.36, 1.37 Message-ID: <200803112000.m2BK0a8S017997@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17915/devel Modified Files: logjam.spec Added Files: logjam-4.5.3-disable-threads.patch Log Message: missed one patch logjam-4.5.3-disable-threads.patch: --- NEW FILE logjam-4.5.3-disable-threads.patch --- diff -up logjam-4.5.3/src/init.c.BAD logjam-4.5.3/src/init.c --- logjam-4.5.3/src/init.c.BAD 2008-03-11 14:48:18.000000000 -0400 +++ logjam-4.5.3/src/init.c 2008-03-11 14:49:35.000000000 -0400 @@ -177,13 +177,13 @@ setup_locales() { static void setup_glibgdk() { -#ifdef HAVE_GTK +#if defined (HAVE_GTK) && defined (G_OS_WIN32) /* calls to these thread inits must happen before any other * g* calls. */ if (!g_thread_supported()) g_thread_init(NULL); gdk_threads_init(); gdk_threads_enter(); -#endif /* HAVE_GTK */ +#endif /* HAVE_GTK && G_OS_WIN32 */ g_type_init(); Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- logjam.spec 11 Mar 2008 19:53:11 -0000 1.36 +++ logjam.spec 11 Mar 2008 20:00:04 -0000 1.37 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-14 +- missed one patch + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-13 - disable unused threading on linux, resolves bz 435124 - enable tags support (bz 434754) From fedora-extras-commits at redhat.com Tue Mar 11 20:09:14 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Tue, 11 Mar 2008 20:09:14 GMT Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.7, 1.8 java-1.6.0-openjdk.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200803112009.m2BK9EiD025478@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25414 Modified Files: .cvsignore java-1.6.0-openjdk.spec sources Log Message: * Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 - Updated snapshot. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Mar 2008 19:44:13 -0000 1.7 +++ .cvsignore 11 Mar 2008 20:08:44 -0000 1.8 @@ -2,4 +2,4 @@ mauve-2007-09-12.tar.gz openjdk-6-src-b06-28_feb_2008-fedora.tar.gz mauve_tests -icedtea6-1.0-e2afb5651f8196082034ec0bc729b89bb77440af.tar.gz +icedtea6-1.0-20557399a0f6beca21efc8747145b7a9d48ad7f5.tar.gz Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- java-1.6.0-openjdk.spec 11 Mar 2008 19:44:13 -0000 1.6 +++ java-1.6.0-openjdk.spec 11 Mar 2008 20:08:44 -0000 1.7 @@ -4,7 +4,7 @@ %define gcjbootstrap 0 %define icedteaver 1.0 -%define icedteasnapshot -e2afb5651f8196082034ec0bc729b89bb77440af +%define icedteasnapshot -20557399a0f6beca21efc8747145b7a9d48ad7f5 %define openjdkver b06 %define openjdkdate 28_feb_2008 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 Mar 2008 19:44:13 -0000 1.6 +++ sources 11 Mar 2008 20:08:44 -0000 1.7 @@ -2,4 +2,4 @@ abee6aad1525bee3d45a13d0adf859c9 mauve-2007-09-12.tar.gz 7a0c160c03012cd40957a7a112e25038 mauve_tests e24e99eeae81f32fa7d958fc75757b83 openjdk-6-src-b06-28_feb_2008-fedora.tar.gz -e75c6c03f22e198483ecdd87477838ad icedtea6-1.0-e2afb5651f8196082034ec0bc729b89bb77440af.tar.gz +bf20d624be29975824331e523484cbeb icedtea6-1.0-20557399a0f6beca21efc8747145b7a9d48ad7f5.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 20:09:52 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 11 Mar 2008 20:09:52 GMT Subject: rpms/rhgb/devel rhgb.upstart-job, NONE, 1.1 rhgb.spec, 1.91, 1.92 sources, 1.31, 1.32 Message-ID: <200803112009.m2BK9qiH025560@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/rhgb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25482 Modified Files: rhgb.spec sources Added Files: rhgb.upstart-job Log Message: fix upstart job to work with selinux --- NEW FILE rhgb.upstart-job --- # rhgb - Red Hat Graphical Boot # # Boots in a shiny X server service pre-start script [ -x /usr/bin/rhgb ] end script post-start script if [ ! -e /dev/pts/0 ]; then /usr/bin/inotifywait -t 5 /dev/pts 2> /dev/null | grep -m 1 "CREATE" > /dev/null fi /sbin/initctl push-tty /dev/pts/0 end script script . /etc/sysconfig/i18n exec /usr/bin/rhgb --no-daemon end script post-stop script /sbin/initctl pop-tty end script Index: rhgb.spec =================================================================== RCS file: /cvs/extras/rpms/rhgb/devel/rhgb.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- rhgb.spec 11 Mar 2008 17:11:33 -0000 1.91 +++ rhgb.spec 11 Mar 2008 20:09:19 -0000 1.92 @@ -3,7 +3,7 @@ Summary: Red Hat Graphical Boot Name: rhgb Version: 0.17.7 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz @@ -18,6 +18,7 @@ BuildRequires: libxf86config-devel >= 1.1.1-7 Requires: initscripts >= 7.22-1 Requires: system-logos +Requires: inotify-tools Patch0: rhgb-0.17.7-strict-exit.patch Patch1: rhgb-0.17.7-dri.patch Patch2: rhgb-0.17.7-nodaemon-option.patch @@ -62,10 +63,13 @@ %dir %{_sysconfdir}/rhgb/temp %changelog -* Tue Mar 12 2008 Casey Dahlin - 1:0.17.7-7 +* Tue Mar 11 2008 Bill Nottingham - 1:0.17.7-8 +- fix upstart job to work with selinux + +* Tue Mar 11 2008 Casey Dahlin - 1:0.17.7-7 - Fix upstart job install -* Tue Mar 12 2008 Casey Dahlin - 1:0.17.7-6 +* Tue Mar 11 2008 Casey Dahlin - 1:0.17.7-6 - Add an upstart event to start rhgb * Tue Feb 19 2008 Fedora Release Engineering - 1:0.17.7-5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rhgb/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 11 Mar 2008 16:50:14 -0000 1.31 +++ sources 11 Mar 2008 20:09:19 -0000 1.32 @@ -1,2 +1 @@ d4ca6badf78b32aa342a5036de4650ff rhgb-0.17.7.tar.gz -78e3ea773465ee4b50bd53c7c7023546 rhgb.upstart-job From fedora-extras-commits at redhat.com Tue Mar 11 20:10:43 2008 From: fedora-extras-commits at redhat.com (sami wagiaalla (swagiaal)) Date: Tue, 11 Mar 2008 20:10:43 GMT Subject: rpms/frysk/devel frysk-0.0.1.2008.02.29.rh1-asm-includes.patch, NONE, 1.1 frysk-0.0.1.2008.02.29.rh1-jboolean-array.patch, NONE, 1.1 frysk.spec, 1.125, 1.126 Message-ID: <200803112010.m2BKAhDm025663@cvs-int.fedora.redhat.com> Author: swagiaal Update of /cvs/pkgs/rpms/frysk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25418 Modified Files: frysk.spec Added Files: frysk-0.0.1.2008.02.29.rh1-asm-includes.patch frysk-0.0.1.2008.02.29.rh1-jboolean-array.patch Log Message: * Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.02.29.rh1-2 - Update releease number - added frysk-0.0.1.2008.02.29.rh1-asm-includes.patch - added frysk-0.0.1.2008.02.29.rh1-jboolean-array.patch frysk-0.0.1.2008.02.29.rh1-asm-includes.patch: --- NEW FILE frysk-0.0.1.2008.02.29.rh1-asm-includes.patch --- diff --git a/frysk-sys/lib/dwfl/cni/ElfPrstatus.cxx b/frysk-sys/lib/dwfl/cni/ElfPrstatus.cxx index 3afe03f..a900f10 100644 --- a/frysk-sys/lib/dwfl/cni/ElfPrstatus.cxx +++ b/frysk-sys/lib/dwfl/cni/ElfPrstatus.cxx @@ -53,8 +53,8 @@ typedef __u32 u32; #include "libelf.h" #include "gelf.h" -#include "asm/elf.h" -#include "asm/user.h" +#include "sys/user.h" + #include "lib/dwfl/ElfPrstatus.h" #include "lib/dwfl/ElfData.h" #include "lib/dwfl/ElfException.h" frysk-0.0.1.2008.02.29.rh1-jboolean-array.patch: --- NEW FILE frysk-0.0.1.2008.02.29.rh1-jboolean-array.patch --- diff --git a/frysk-sys/frysk/rsl/Log.java b/frysk-sys/frysk/rsl/Log.java index 905c88a..3211bdb 100644 --- a/frysk-sys/frysk/rsl/Log.java +++ b/frysk-sys/frysk/rsl/Log.java @@ -262,15 +262,15 @@ public final class Log { private void dump(boolean b) { out.print(b); } - private void dump(boolean[] a) { - out.print('['); - for (int i = 0; i < a.length; i++) { - if (i > 0) - out.print(','); - dump(a[i]); - } - out.print(']'); - } +// private void dump(boolean[] a) { +// out.print('['); +// for (int i = 0; i < a.length; i++) { +// if (i > 0) +// out.print(','); +// dump(a[i]); +// } +// out.print(']'); +// } /** * Chars are printed in quotes. Index: frysk.spec =================================================================== RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- frysk.spec 29 Feb 2008 22:23:06 -0000 1.125 +++ frysk.spec 11 Mar 2008 20:10:12 -0000 1.126 @@ -1,7 +1,7 @@ Summary: Frysk execution analysis and debugging tools Name: frysk Version: 0.0.1.2008.02.29.rh1 -Release: 1%{?dist} +Release: 2%{?dist} # antlrv2 is Public Domain; antlrv3 is BSD. # cdtparser is EPL # getopt is GPLv2 with exception @@ -22,6 +22,8 @@ Source: %{name}-%{version}.tar.bz2 Patch6: frysk-0.0.1.2008.01.18.rh1-elfutils-werror.patch +Patch7: frysk-0.0.1.2008.02.29.rh1-jboolean-array.patch +Patch8: frysk-0.0.1.2008.02.29.rh1-asm-includes.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -111,6 +113,8 @@ %setup -q -n %{name}-%{version} pwd %patch6 -p1 -b .elfutils-werror +%patch7 -p1 -b .jboolean-array +%patch8 -p1 -b .asm-includes ./bootstrap.sh %build @@ -254,6 +258,11 @@ %{_datadir}/gnome/help/%{name}/* %changelog +* Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.02.29.rh1-2 +- Update releease number +- added frysk-0.0.1.2008.02.29.rh1-asm-includes.patch +- added frysk-0.0.1.2008.02.29.rh1-jboolean-array.patch + * Fri Feb 29 2008 Sami Wagiaalla - 0.0.1.2008.02.29.rh1-1 - Import frysk-0.0.1.2008.02.29.rh1 (148d1359cf791171d7f346d4fca35c1fc36aca8c) - Remove BuildRequires: libgconf-java-devel From fedora-extras-commits at redhat.com Tue Mar 11 20:12:02 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 11 Mar 2008 20:12:02 GMT Subject: rpms/xorg-x11-drv-ati/devel r500-dual-link-love.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.84, 1.85 Message-ID: <200803112012.m2BKC2HK025752@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25689 Modified Files: xorg-x11-drv-ati.spec Added Files: r500-dual-link-love.patch Log Message: * Tue Mar 11 2008 Adam Jackson 6.8.0-4 - r500-dual-link-love.patch: Make R300+ max CRTC size guess big enough for a 30" monitor. r500-dual-link-love.patch: --- NEW FILE r500-dual-link-love.patch --- diff -up xf86-video-ati-6.7.196/src/radeon_driver.c.jx xf86-video-ati-6.7.196/src/radeon_driver.c --- xf86-video-ati-6.7.196/src/radeon_driver.c.jx 2008-01-15 17:11:38.000000000 -0500 +++ xf86-video-ati-6.7.196/src/radeon_driver.c 2008-01-15 17:11:53.000000000 -0500 @@ -2903,8 +2903,9 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr crtc_max_Y = 1200; } else { if (IS_R300_VARIANT || IS_AVIVO_VARIANT) { - crtc_max_X = 2560; - crtc_max_Y = 1200; + /* not the max, just egregiously large */ + crtc_max_X = 2560; + crtc_max_Y = 1600; } else { crtc_max_X = 2048; crtc_max_Y = 1200; Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- xorg-x11-drv-ati.spec 2 Mar 2008 23:27:17 -0000 1.84 +++ xorg-x11-drv-ati.spec 11 Mar 2008 20:11:30 -0000 1.85 @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.8.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -19,6 +19,7 @@ # Radeon patches (0-99) Patch1: radeon-git-upstream-fixes.patch Patch4: radeon-6.7.196-faster-ddc.patch +Patch5: r500-dual-link-love.patch # Rage 128 patches (100-199) @@ -45,6 +46,7 @@ %patch1 -p1 -b .git %patch4 -p1 -b .ddc +%patch5 -p1 -b .duallink %build aclocal ; automake -a ; autoconf @@ -84,6 +86,10 @@ %{_mandir}/man4/radeon.4* %changelog +* Tue Mar 11 2008 Adam Jackson 6.8.0-4 +- r500-dual-link-love.patch: Make R300+ max CRTC size guess big enough + for a 30" monitor. + * Mon Mar 03 2008 Dave Airlie 6.8.0-3 - rebuild for upstream ABI breakage From fedora-extras-commits at redhat.com Tue Mar 11 20:13:25 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Tue, 11 Mar 2008 20:13:25 GMT Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.51, 1.52 gnome-icon-theme.spec, 1.78, 1.79 sources, 1.54, 1.55 Message-ID: <200803112013.m2BKDPgO025858@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gnome-icon-theme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25819 Modified Files: .cvsignore gnome-icon-theme.spec sources Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 25 Feb 2008 05:19:42 -0000 1.51 +++ .cvsignore 11 Mar 2008 20:12:54 -0000 1.52 @@ -1 +1 @@ -gnome-icon-theme-2.21.92.tar.bz2 +gnome-icon-theme-2.22.0.tar.bz2 Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- gnome-icon-theme.spec 25 Feb 2008 05:19:42 -0000 1.78 +++ gnome-icon-theme.spec 11 Mar 2008 20:12:54 -0000 1.79 @@ -1,8 +1,8 @@ Summary: Base gnome icons Name: gnome-icon-theme -Version: 2.21.92 +Version: 2.22.0 Release: 1%{?dist} -Source0: http://download.gnome.org/sources/gnome-icon-theme/2.21/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-icon-theme/2.22/%{name}-%{version}.tar.bz2 License: GPL+ BuildArch: noarch Group: User Interface/Desktops @@ -84,6 +84,9 @@ %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog +* Tue Mar 11 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Mon Feb 25 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-icon-theme/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 25 Feb 2008 05:19:42 -0000 1.54 +++ sources 11 Mar 2008 20:12:54 -0000 1.55 @@ -1 +1 @@ -940bd8d263355c3011f58819e4156da7 gnome-icon-theme-2.21.92.tar.bz2 +a4c03092da28ad53ed3867aef83f29d9 gnome-icon-theme-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 20:21:44 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 20:21:44 GMT Subject: rpms/logjam/devel logjam-4.5.3-tags.patch, 1.1, 1.2 logjam.spec, 1.37, 1.38 Message-ID: <200803112021.m2BKLip5026220@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26155/devel Modified Files: logjam-4.5.3-tags.patch logjam.spec Log Message: fix tags patch logjam-4.5.3-tags.patch: Index: logjam-4.5.3-tags.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam-4.5.3-tags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-tags.patch 11 Mar 2008 19:53:11 -0000 1.1 +++ logjam-4.5.3-tags.patch 11 Mar 2008 20:21:42 -0000 1.2 @@ -1,6 +1,6 @@ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,18 @@ +/* liblivejournal - a client library for LiveJournal. + * Copyright (C) 2003 Evan Martin @@ -22,7 +22,7 @@ +#endif /* __LIVEJOURNAL_TAGS_H__ */ diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c --- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags 2005-10-23 21:29:32.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 16:17:54.000000000 -0400 @@ -14,6 +14,7 @@ #include "entry.h" @@ -52,7 +52,7 @@ char *text = NULL; diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am --- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags 2005-08-24 22:42:14.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 16:17:54.000000000 -0400 @@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ liblivejournal_la_SOURCES = \ md5.c md5.h \ @@ -72,7 +72,7 @@ livejournal.h diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h --- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags 2005-02-21 12:46:10.000000000 -0500 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 16:17:54.000000000 -0400 @@ -16,5 +16,6 @@ #include #include @@ -82,7 +82,7 @@ #endif /* __LIVEJOURNAL_H__ */ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,16 @@ + +#ifndef __LIVEJOURNAL_GETTAGS_H__ @@ -102,7 +102,7 @@ + diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,65 @@ + +#include @@ -171,7 +171,7 @@ + diff -up /dev/null logjam-4.5.3/src/tags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.c 2008-03-11 15:16:52.000000000 -0400 ++++ logjam-4.5.3/src/tags.c 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,181 @@ + +#include "gtk-all.h" @@ -356,7 +356,7 @@ +} diff -up /dev/null logjam-4.5.3/src/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/src/tags.h 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef _TAGS_H_ +#define _TAGS_H_ @@ -366,7 +366,7 @@ +#endif /* _TAGS_H_ */ diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am --- logjam-4.5.3/src/Makefile.am.tags 2005-10-23 21:16:08.000000000 -0400 -+++ logjam-4.5.3/src/Makefile.am 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/src/Makefile.am 2008-03-11 16:17:54.000000000 -0400 @@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. undo.c undo.h \ userlabel.c userlabel.h \ @@ -376,9 +376,17 @@ src_preview = $(PREVIEW) diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c ---- logjam-4.5.3/src/jamview.c.tags 2005-06-19 14:05:40.000000000 -0400 -+++ logjam-4.5.3/src/jamview.c 2008-03-11 15:09:55.000000000 -0400 -@@ -408,11 +408,34 @@ music_store(JamView *view) { +--- logjam-4.5.3/src/jamview.c.tags 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/jamview.c 2008-03-11 16:18:24.000000000 -0400 +@@ -19,6 +19,7 @@ + #include "security.h" + #include "marshalers.h" + #include "datesel.h" ++#include "tags.h" + + #define KEY_PICTUREKEYWORD "logjam-picturekeyword" + +@@ -408,11 +409,34 @@ music_store(JamView *view) { jam_doc_set_music(view->doc, music); } Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- logjam.spec 11 Mar 2008 20:00:04 -0000 1.37 +++ logjam.spec 11 Mar 2008 20:21:42 -0000 1.38 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -64,7 +64,7 @@ %patch12 -p1 -b .disablethreads %patch13 -p1 -b .title %patch14 -p1 -b .tags -%patch15 -p1 -b .default-spelllang-en-US +# %patch15 -p1 -b .default-spelllang-en-US %build autoconf @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-15 +- fix tags patch + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-14 - missed one patch From fedora-extras-commits at redhat.com Tue Mar 11 20:22:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 20:22:06 GMT Subject: rpms/logjam/F-7 logjam-4.5.3-tags.patch, 1.1, 1.2 logjam.spec, 1.34, 1.35 Message-ID: <200803112022.m2BKM6SS026224@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26155/F-7 Modified Files: logjam-4.5.3-tags.patch logjam.spec Log Message: fix tags patch logjam-4.5.3-tags.patch: Index: logjam-4.5.3-tags.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-7/logjam-4.5.3-tags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-tags.patch 11 Mar 2008 19:53:07 -0000 1.1 +++ logjam-4.5.3-tags.patch 11 Mar 2008 20:21:31 -0000 1.2 @@ -1,6 +1,6 @@ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,18 @@ +/* liblivejournal - a client library for LiveJournal. + * Copyright (C) 2003 Evan Martin @@ -22,7 +22,7 @@ +#endif /* __LIVEJOURNAL_TAGS_H__ */ diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c --- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags 2005-10-23 21:29:32.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 16:17:54.000000000 -0400 @@ -14,6 +14,7 @@ #include "entry.h" @@ -52,7 +52,7 @@ char *text = NULL; diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am --- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags 2005-08-24 22:42:14.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 16:17:54.000000000 -0400 @@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ liblivejournal_la_SOURCES = \ md5.c md5.h \ @@ -72,7 +72,7 @@ livejournal.h diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h --- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags 2005-02-21 12:46:10.000000000 -0500 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 16:17:54.000000000 -0400 @@ -16,5 +16,6 @@ #include #include @@ -82,7 +82,7 @@ #endif /* __LIVEJOURNAL_H__ */ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,16 @@ + +#ifndef __LIVEJOURNAL_GETTAGS_H__ @@ -102,7 +102,7 @@ + diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,65 @@ + +#include @@ -171,7 +171,7 @@ + diff -up /dev/null logjam-4.5.3/src/tags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.c 2008-03-11 15:16:52.000000000 -0400 ++++ logjam-4.5.3/src/tags.c 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,181 @@ + +#include "gtk-all.h" @@ -356,7 +356,7 @@ +} diff -up /dev/null logjam-4.5.3/src/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/src/tags.h 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef _TAGS_H_ +#define _TAGS_H_ @@ -366,7 +366,7 @@ +#endif /* _TAGS_H_ */ diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am --- logjam-4.5.3/src/Makefile.am.tags 2005-10-23 21:16:08.000000000 -0400 -+++ logjam-4.5.3/src/Makefile.am 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/src/Makefile.am 2008-03-11 16:17:54.000000000 -0400 @@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. undo.c undo.h \ userlabel.c userlabel.h \ @@ -376,9 +376,17 @@ src_preview = $(PREVIEW) diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c ---- logjam-4.5.3/src/jamview.c.tags 2005-06-19 14:05:40.000000000 -0400 -+++ logjam-4.5.3/src/jamview.c 2008-03-11 15:09:55.000000000 -0400 -@@ -408,11 +408,34 @@ music_store(JamView *view) { +--- logjam-4.5.3/src/jamview.c.tags 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/jamview.c 2008-03-11 16:18:24.000000000 -0400 +@@ -19,6 +19,7 @@ + #include "security.h" + #include "marshalers.h" + #include "datesel.h" ++#include "tags.h" + + #define KEY_PICTUREKEYWORD "logjam-picturekeyword" + +@@ -408,11 +409,34 @@ music_store(JamView *view) { jam_doc_set_music(view->doc, music); } Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-7/logjam.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- logjam.spec 11 Mar 2008 19:59:59 -0000 1.34 +++ logjam.spec 11 Mar 2008 20:21:31 -0000 1.35 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-15 +- fix tags patch + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-14 - missed one patch From fedora-extras-commits at redhat.com Tue Mar 11 20:22:13 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 20:22:13 GMT Subject: rpms/logjam/F-8 logjam-4.5.3-tags.patch, 1.1, 1.2 logjam.spec, 1.34, 1.35 Message-ID: <200803112022.m2BKMDwK026235@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26155/F-8 Modified Files: logjam-4.5.3-tags.patch logjam.spec Log Message: fix tags patch logjam-4.5.3-tags.patch: Index: logjam-4.5.3-tags.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam-4.5.3-tags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logjam-4.5.3-tags.patch 11 Mar 2008 19:53:09 -0000 1.1 +++ logjam-4.5.3-tags.patch 11 Mar 2008 20:21:35 -0000 1.2 @@ -1,6 +1,6 @@ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,18 @@ +/* liblivejournal - a client library for LiveJournal. + * Copyright (C) 2003 Evan Martin @@ -22,7 +22,7 @@ +#endif /* __LIVEJOURNAL_TAGS_H__ */ diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c --- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags 2005-10-23 21:29:32.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 16:17:54.000000000 -0400 @@ -14,6 +14,7 @@ #include "entry.h" @@ -52,7 +52,7 @@ char *text = NULL; diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am --- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags 2005-08-24 22:42:14.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 16:17:54.000000000 -0400 @@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ liblivejournal_la_SOURCES = \ md5.c md5.h \ @@ -72,7 +72,7 @@ livejournal.h diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h --- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags 2005-02-21 12:46:10.000000000 -0500 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 16:17:54.000000000 -0400 @@ -16,5 +16,6 @@ #include #include @@ -82,7 +82,7 @@ #endif /* __LIVEJOURNAL_H__ */ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,16 @@ + +#ifndef __LIVEJOURNAL_GETTAGS_H__ @@ -102,7 +102,7 @@ + diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,65 @@ + +#include @@ -171,7 +171,7 @@ + diff -up /dev/null logjam-4.5.3/src/tags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.c 2008-03-11 15:16:52.000000000 -0400 ++++ logjam-4.5.3/src/tags.c 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,181 @@ + +#include "gtk-all.h" @@ -356,7 +356,7 @@ +} diff -up /dev/null logjam-4.5.3/src/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.h 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/src/tags.h 2008-03-11 16:17:54.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef _TAGS_H_ +#define _TAGS_H_ @@ -366,7 +366,7 @@ +#endif /* _TAGS_H_ */ diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am --- logjam-4.5.3/src/Makefile.am.tags 2005-10-23 21:16:08.000000000 -0400 -+++ logjam-4.5.3/src/Makefile.am 2008-03-11 15:09:55.000000000 -0400 ++++ logjam-4.5.3/src/Makefile.am 2008-03-11 16:17:54.000000000 -0400 @@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. undo.c undo.h \ userlabel.c userlabel.h \ @@ -376,9 +376,17 @@ src_preview = $(PREVIEW) diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c ---- logjam-4.5.3/src/jamview.c.tags 2005-06-19 14:05:40.000000000 -0400 -+++ logjam-4.5.3/src/jamview.c 2008-03-11 15:09:55.000000000 -0400 -@@ -408,11 +408,34 @@ music_store(JamView *view) { +--- logjam-4.5.3/src/jamview.c.tags 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/jamview.c 2008-03-11 16:18:24.000000000 -0400 +@@ -19,6 +19,7 @@ + #include "security.h" + #include "marshalers.h" + #include "datesel.h" ++#include "tags.h" + + #define KEY_PICTUREKEYWORD "logjam-picturekeyword" + +@@ -408,11 +409,34 @@ music_store(JamView *view) { jam_doc_set_music(view->doc, music); } Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- logjam.spec 11 Mar 2008 20:00:01 -0000 1.34 +++ logjam.spec 11 Mar 2008 20:21:35 -0000 1.35 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-15 +- fix tags patch + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-14 - missed one patch From fedora-extras-commits at redhat.com Tue Mar 11 20:25:13 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 11 Mar 2008 20:25:13 GMT Subject: rpms/xbase/devel xbase-2.0.0-gcc43.patch, 1.1, 1.2 xbase.spec, 1.9, 1.10 Message-ID: <200803112025.m2BKPDpQ026430@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26407 Modified Files: xbase-2.0.0-gcc43.patch xbase.spec Log Message: * Tue Mar 11 2008 Hans de Goede 2.0.0-11 - Fix gcc4.3 patch to not polute global header namespace with "using namespace std;" xbase-2.0.0-gcc43.patch: Index: xbase-2.0.0-gcc43.patch =================================================================== RCS file: /cvs/extras/rpms/xbase/devel/xbase-2.0.0-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbase-2.0.0-gcc43.patch 25 Jan 2008 15:56:03 -0000 1.1 +++ xbase-2.0.0-gcc43.patch 11 Mar 2008 20:25:10 -0000 1.2 @@ -1,54 +1,573 @@ -diff -up xbase-2.0.0/xbase/xbstring.h~ xbase-2.0.0/xbase/xbstring.h ---- xbase-2.0.0/xbase/xbstring.h~ 2008-01-25 16:33:53.000000000 +0100 -+++ xbase-2.0.0/xbase/xbstring.h 2008-01-25 16:33:53.000000000 +0100 -@@ -56,7 +56,9 @@ +diff -up xbase-2.0.0/xbase/xbstring.h.gcc43 xbase-2.0.0/xbase/xbstring.h +--- xbase-2.0.0/xbase/xbstring.h.gcc43 2001-01-27 06:00:32.000000000 +0100 ++++ xbase-2.0.0/xbase/xbstring.h 2008-03-11 20:21:20.000000000 +0100 +@@ -56,7 +56,7 @@ #endif #include -#include +#include -+ -+using namespace std; /*! \file xbstring.h */ -diff -up xbase-2.0.0/xbase/ndx.cpp~ xbase-2.0.0/xbase/ndx.cpp ---- xbase-2.0.0/xbase/ndx.cpp~ 2008-01-25 16:35:11.000000000 +0100 -+++ xbase-2.0.0/xbase/ndx.cpp 2008-01-25 16:35:11.000000000 +0100 -@@ -66,7 +66,8 @@ +@@ -119,7 +119,7 @@ public: + bool operator <= ( const xbString& ) const; + bool operator >= ( const xbString& ) const; + +- friend ostream& operator << ( ostream&, const xbString& ); ++ friend std::ostream& operator << ( std::ostream&, const xbString& ); + + xbString &remove(size_t pos = 0, int n = npos); + xbString mid(size_t pos = 0, int n = npos) const; +diff -up xbase-2.0.0/xbase/dbf.cpp.gcc43 xbase-2.0.0/xbase/dbf.cpp +--- xbase-2.0.0/xbase/dbf.cpp.gcc43 2008-03-11 20:24:01.000000000 +0100 ++++ xbase-2.0.0/xbase/dbf.cpp 2008-03-11 20:25:01.000000000 +0100 +@@ -79,6 +79,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + /*! \file dbf.cpp + */ + +diff -up xbase-2.0.0/xbase/xbstring.cpp.gcc43 xbase-2.0.0/xbase/xbstring.cpp +--- xbase-2.0.0/xbase/xbstring.cpp.gcc43 2008-03-11 20:33:00.000000000 +0100 ++++ xbase-2.0.0/xbase/xbstring.cpp 2008-03-11 20:33:00.000000000 +0100 +@@ -582,7 +582,7 @@ bool xbString::operator>=( const xbStrin + //! Short description. + /*! + */ +-XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) { ++XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) { + return os << xbs.data; + } + +diff -up xbase-2.0.0/xbase/exp.cpp.gcc43 xbase-2.0.0/xbase/exp.cpp +--- xbase-2.0.0/xbase/exp.cpp.gcc43 2008-03-11 20:23:54.000000000 +0100 ++++ xbase-2.0.0/xbase/exp.cpp 2008-03-11 20:24:30.000000000 +0100 +@@ -64,6 +64,8 @@ + + #include + ++using std::cout; ++ + /*! \file exp.cpp + */ + +diff -up xbase-2.0.0/xbase/html.cpp.gcc43 xbase-2.0.0/xbase/html.cpp +--- xbase-2.0.0/xbase/html.cpp.gcc43 2008-03-11 20:27:18.000000000 +0100 ++++ xbase-2.0.0/xbase/html.cpp 2008-03-11 20:28:56.000000000 +0100 +@@ -68,6 +68,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + /*! \file html.cpp + */ + +diff -up xbase-2.0.0/xbase/ntx.cpp.gcc43 xbase-2.0.0/xbase/ntx.cpp +--- xbase-2.0.0/xbase/ntx.cpp.gcc43 2008-03-11 20:33:48.000000000 +0100 ++++ xbase-2.0.0/xbase/ntx.cpp 2008-03-11 20:33:59.000000000 +0100 +@@ -75,6 +75,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + /*! \file ntx.cpp + */ + +diff -up xbase-2.0.0/xbase/xbase.cpp.gcc43 xbase-2.0.0/xbase/xbase.cpp +--- xbase-2.0.0/xbase/xbase.cpp.gcc43 2008-03-11 20:32:08.000000000 +0100 ++++ xbase-2.0.0/xbase/xbase.cpp 2008-03-11 20:32:08.000000000 +0100 +@@ -62,6 +62,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + /*! \file xbase.cpp + */ + +diff -up xbase-2.0.0/xbase/stack.cpp.gcc43 xbase-2.0.0/xbase/stack.cpp +--- xbase-2.0.0/xbase/stack.cpp.gcc43 2000-11-10 20:04:17.000000000 +0100 ++++ xbase-2.0.0/xbase/stack.cpp 2008-03-11 20:31:16.000000000 +0100 +@@ -59,10 +59,12 @@ + + #include + #include +-#include ++#include + + #include + ++using std::cout; ++ + /*! \file stack.cpp + */ + +diff -up xbase-2.0.0/xbase/ndx.cpp.gcc43 xbase-2.0.0/xbase/ndx.cpp +--- xbase-2.0.0/xbase/ndx.cpp.gcc43 2001-03-21 01:28:53.000000000 +0100 ++++ xbase-2.0.0/xbase/ndx.cpp 2008-03-11 20:21:20.000000000 +0100 +@@ -66,7 +66,9 @@ #endif #include -#include +#include -+using namespace std; ++ ++using std::cout; #ifdef XB_INDEX_NDX -diff -up xbase-2.0.0/xbase/dbf.h~ xbase-2.0.0/xbase/dbf.h ---- xbase-2.0.0/xbase/dbf.h~ 2008-01-25 16:34:15.000000000 +0100 -+++ xbase-2.0.0/xbase/dbf.h 2008-01-25 16:34:15.000000000 +0100 -@@ -65,7 +65,9 @@ +diff -up xbase-2.0.0/xbase/expfunc.cpp.gcc43 xbase-2.0.0/xbase/expfunc.cpp +--- xbase-2.0.0/xbase/expfunc.cpp.gcc43 2008-03-11 20:26:54.000000000 +0100 ++++ xbase-2.0.0/xbase/expfunc.cpp 2008-03-11 20:26:54.000000000 +0100 +@@ -64,6 +64,7 @@ + #include + #include + ++using std::cout; + + /*! \file expfunc.cpp + */ +diff -up xbase-2.0.0/xbase/memo.cpp.gcc43 xbase-2.0.0/xbase/memo.cpp +--- xbase-2.0.0/xbase/memo.cpp.gcc43 2008-03-11 20:30:29.000000000 +0100 ++++ xbase-2.0.0/xbase/memo.cpp 2008-03-11 20:30:40.000000000 +0100 +@@ -59,6 +59,8 @@ + #include + #include + ++using std::cout; ++ + /*! \file memo.cpp + */ + +diff -up xbase-2.0.0/xbase/xbfilter.cpp.gcc43 xbase-2.0.0/xbase/xbfilter.cpp +--- xbase-2.0.0/xbase/xbfilter.cpp.gcc43 2008-03-11 20:34:21.000000000 +0100 ++++ xbase-2.0.0/xbase/xbfilter.cpp 2008-03-11 20:34:25.000000000 +0100 +@@ -60,6 +60,9 @@ + #include + #include + ++using std::cout; ++using std::endl; ++ + /*! \file xbfilter.cpp + */ + +diff -up xbase-2.0.0/xbase/html.h.gcc43 xbase-2.0.0/xbase/html.h +--- xbase-2.0.0/xbase/html.h.gcc43 2008-03-11 20:25:52.000000000 +0100 ++++ xbase-2.0.0/xbase/html.h 2008-03-11 20:26:22.000000000 +0100 +@@ -66,6 +66,8 @@ + #include - #include --#include +#include -+using namespace std; + + /*! \file html.h + */ + +@@ -92,28 +94,28 @@ public: + //! Short description. + /*! + */ +- void BoldOff( void ) { cout << "\n"; }; ++ void BoldOff( void ) { std::cout << "\n"; }; + //! Short description. + /*! + */ +- void BoldOn( void ) { cout << ""; }; ++ void BoldOn( void ) { std::cout << ""; }; + //! Short description. + /*! + */ +- void Bullet( void ) { cout << "
  • "; }; ++ void Bullet( void ) { std::cout << "
  • "; }; + void DumpArray( void ); + //! Short description. + /*! + */ +- void EmphasizeOff( void ) { cout << "\n"; }; ++ void EmphasizeOff( void ) { std::cout << "\n"; }; + //! Short description. + /*! + */ +- void EmphasizeOn( void ) { cout << ""; }; ++ void EmphasizeOn( void ) { std::cout << ""; }; + //! Short description. + /*! + */ +- void EndHtmlPage( void ) { cout << "\n\n"; } ++ void EndHtmlPage( void ) { std::cout << "\n\n"; } + xbShort GenFormFields(xbDbf *d, xbShort Option,const char * Title,xbFieldList *fl); + xbShort GetArrayNo( const char * FieldName ); + const char * GetCookie( const char *CookieName ); +@@ -124,47 +126,47 @@ public: + //! Short description. + /*! + */ +- void HeaderOff( xbShort i ){ cout << "\n"; }; ++ void HeaderOff( xbShort i ){ std::cout << "\n"; }; + //! Short description. + /*! + */ +- void HeaderOn( xbShort i ){ cout << "\n"; }; ++ void HeaderOn( xbShort i ){ std::cout << "\n"; }; + //! Short description. + /*! + */ +- void ItalicOff( void ) { cout << "\n"; }; ++ void ItalicOff( void ) { std::cout << "\n"; }; + //! Short description. + /*! + */ +- void ItalicOn( void ) { cout << ""; }; ++ void ItalicOn( void ) { std::cout << ""; }; + //! Short description. + /*! + */ +- void NewLine( void ) { cout << "
    "; } ++ void NewLine( void ) { std::cout << "
    "; } + xbShort PostMethod( void ); + void PrintEncodedChar( char ); + void PrintEncodedString( const char *s ); + //! Short description. + /*! + */ +- void PrintHtml( char * s ) { cout << s; }; ++ void PrintHtml( char * s ) { std::cout << s; }; + //! Short description. + /*! + */ +- void PrintHtml( xbLong l ) { cout << l; }; ++ void PrintHtml( xbLong l ) { std::cout << l; }; + //! Short description. + /*! + */ +- void PrintHtml( xbShort i ) { cout << i; }; ++ void PrintHtml( xbShort i ) { std::cout << i; }; + //! Short description. + /*! + */ +- void PrintHtml( int i ) { cout << i; }; ++ void PrintHtml( int i ) { std::cout << i; }; + void StartHtmlPage( const char *Title ); + //! Short description. + /*! + */ +- void StartTextPage( void ) { cout << "Content-type: text/plain\n\n"; } ++ void StartTextPage( void ) { std::cout << "Content-type: text/plain\n\n"; } + void TextOut( const char *String ); + xbLong Tally( const char *FileName ); + xbShort SetCookie(const char *Name, const char *Value, const char *ExpDate, +diff -up xbase-2.0.0/xbase/dbf.h.gcc43 xbase-2.0.0/xbase/dbf.h +--- xbase-2.0.0/xbase/dbf.h.gcc43 2001-01-13 21:20:53.000000000 +0100 ++++ xbase-2.0.0/xbase/dbf.h 2008-03-11 20:21:20.000000000 +0100 +@@ -65,7 +65,6 @@ + #include + #include + +-#include #include /*! \file dbf.h -diff -up xbase-2.0.0/xbase/stack.cpp~ xbase-2.0.0/xbase/stack.cpp ---- xbase-2.0.0/xbase/stack.cpp~ 2008-01-25 16:35:47.000000000 +0100 -+++ xbase-2.0.0/xbase/stack.cpp 2008-01-25 16:35:47.000000000 +0100 -@@ -59,7 +59,8 @@ +diff -up xbase-2.0.0/examples/sample1.cpp.gcc43 xbase-2.0.0/examples/sample1.cpp +--- xbase-2.0.0/examples/sample1.cpp.gcc43 2008-03-11 20:35:01.000000000 +0100 ++++ xbase-2.0.0/examples/sample1.cpp 2008-03-11 20:36:40.000000000 +0100 +@@ -47,6 +47,8 @@ - #include + #include + ++using std::cout; ++ + /* set the stack large for dos compiles */ + #ifdef __XBDOS + #include +diff -up xbase-2.0.0/examples/sample2.cpp.gcc43 xbase-2.0.0/examples/sample2.cpp +--- xbase-2.0.0/examples/sample2.cpp.gcc43 2008-03-11 20:36:03.000000000 +0100 ++++ xbase-2.0.0/examples/sample2.cpp 2008-03-11 20:36:41.000000000 +0100 +@@ -53,6 +53,8 @@ + + #include + ++using std::cout; ++ + /* set the stack large for dos compiles */ + #ifdef __XBDOS + #include +diff -up xbase-2.0.0/examples/sample5.cpp.gcc43 xbase-2.0.0/examples/sample5.cpp +--- xbase-2.0.0/examples/sample5.cpp.gcc43 2008-03-11 20:36:36.000000000 +0100 ++++ xbase-2.0.0/examples/sample5.cpp 2008-03-11 20:36:40.000000000 +0100 +@@ -45,6 +45,8 @@ + + #include + ++using std::cout; ++ + /* set the stack large for dos compiles */ + #ifdef __XBDOS + #include +diff -up xbase-2.0.0/examples/sample4.cpp.gcc43 xbase-2.0.0/examples/sample4.cpp +--- xbase-2.0.0/examples/sample4.cpp.gcc43 2008-03-11 20:36:25.000000000 +0100 ++++ xbase-2.0.0/examples/sample4.cpp 2008-03-11 20:36:47.000000000 +0100 +@@ -51,6 +51,8 @@ + + #include + ++using std::cout; ++ + #ifdef __XBDOS + #include + extern unsigned _stklen = 100000; +diff -up xbase-2.0.0/examples/exfilter.cpp.gcc43 xbase-2.0.0/examples/exfilter.cpp +--- xbase-2.0.0/examples/exfilter.cpp.gcc43 2008-03-11 20:37:14.000000000 +0100 ++++ xbase-2.0.0/examples/exfilter.cpp 2008-03-11 20:37:28.000000000 +0100 +@@ -50,6 +50,8 @@ + + #include + ++using std::cout; ++using std::endl; + + int main() + { +diff -up xbase-2.0.0/examples/sample3.cpp.gcc43 xbase-2.0.0/examples/sample3.cpp +--- xbase-2.0.0/examples/sample3.cpp.gcc43 2008-03-11 20:36:10.000000000 +0100 ++++ xbase-2.0.0/examples/sample3.cpp 2008-03-11 20:36:46.000000000 +0100 +@@ -54,6 +54,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + /* set the stack large for dos compiles */ + #ifdef __XBDOS + #include +diff -up xbase-2.0.0/bin/undelall.cpp.gcc43 xbase-2.0.0/bin/undelall.cpp +--- xbase-2.0.0/bin/undelall.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/undelall.cpp 2008-03-11 20:40:33.000000000 +0100 +@@ -45,6 +45,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + int main(int ac,char** av) + { + if (ac <= 1) { +diff -up xbase-2.0.0/bin/checkndx.cpp.gcc43 xbase-2.0.0/bin/checkndx.cpp +--- xbase-2.0.0/bin/checkndx.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/checkndx.cpp 2008-03-11 20:40:29.000000000 +0100 +@@ -45,6 +45,8 @@ + + #include "xbase/xbase.h" + ++using std::cout; ++ + int main(int ac,char** av) + { + #ifdef XBASE_DEBUG +diff -up xbase-2.0.0/bin/packdbf.cpp.gcc43 xbase-2.0.0/bin/packdbf.cpp +--- xbase-2.0.0/bin/packdbf.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/packdbf.cpp 2008-03-11 20:40:32.000000000 +0100 +@@ -46,6 +46,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + int main(int ac,char** av) + { + if (ac <= 1) { +diff -up xbase-2.0.0/bin/zap.cpp.gcc43 xbase-2.0.0/bin/zap.cpp +--- xbase-2.0.0/bin/zap.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/zap.cpp 2008-03-11 20:40:33.000000000 +0100 +@@ -45,6 +45,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + int main(int ac,char** av) + { + if (ac <= 1) { +diff -up xbase-2.0.0/bin/reindex.cpp.gcc43 xbase-2.0.0/bin/reindex.cpp +--- xbase-2.0.0/bin/reindex.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/reindex.cpp 2008-03-11 20:40:32.000000000 +0100 +@@ -47,6 +47,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + static void + showStatus(xbLong itemNum, xbLong numItems) + { +diff -up xbase-2.0.0/bin/copydbf.cpp.gcc43 xbase-2.0.0/bin/copydbf.cpp +--- xbase-2.0.0/bin/copydbf.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/copydbf.cpp 2008-03-11 20:40:29.000000000 +0100 +@@ -44,6 +44,8 @@ + + #include + ++using std::cout; ++ + int main(int ac,char** av) + { + if (3 != ac) { +diff -up xbase-2.0.0/bin/deletall.cpp.gcc43 xbase-2.0.0/bin/deletall.cpp +--- xbase-2.0.0/bin/deletall.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/deletall.cpp 2008-03-11 20:40:30.000000000 +0100 +@@ -45,6 +45,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + int main(int ac,char** av) + { + if (ac <= 1) { +diff -up xbase-2.0.0/bin/dumphdr.cpp.gcc43 xbase-2.0.0/bin/dumphdr.cpp +--- xbase-2.0.0/bin/dumphdr.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/dumphdr.cpp 2008-03-11 20:40:31.000000000 +0100 +@@ -47,6 +47,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + int main( int ac, char ** av ) + { + #ifdef XBASE_DEBUG +diff -up xbase-2.0.0/bin/dumprecs.cpp.gcc43 xbase-2.0.0/bin/dumprecs.cpp +--- xbase-2.0.0/bin/dumprecs.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/dumprecs.cpp 2008-03-11 20:40:31.000000000 +0100 +@@ -52,6 +52,9 @@ + #include + #endif + ++using std::cout; ++using std::endl; ++ + int main(int ac,char** av) + { + if (ac <= 1) { +diff -up xbase-2.0.0/bin/dumpdbt.cpp.gcc43 xbase-2.0.0/bin/dumpdbt.cpp +--- xbase-2.0.0/bin/dumpdbt.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/dumpdbt.cpp 2008-03-11 20:40:31.000000000 +0100 +@@ -47,6 +47,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + int main( int ac, char **av ) + { + #ifdef XB_MEMO_FIELDS +diff -up xbase-2.0.0/bin/dbfxtrct.cpp.gcc43 xbase-2.0.0/bin/dbfxtrct.cpp +--- xbase-2.0.0/bin/dbfxtrct.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/dbfxtrct.cpp 2008-03-11 20:40:30.000000000 +0100 +@@ -47,6 +47,9 @@ + + #include "xbase/xbase.h" + ++using std::cout; ++using std::endl; ++ + /*************************************************************************/ + void Usage(); + void Usage() +diff -up xbase-2.0.0/bin/dbfutil1.cpp.gcc43 xbase-2.0.0/bin/dbfutil1.cpp +--- xbase-2.0.0/bin/dbfutil1.cpp.gcc43 2008-03-11 20:39:22.000000000 +0100 ++++ xbase-2.0.0/bin/dbfutil1.cpp 2008-03-11 20:41:22.000000000 +0100 +@@ -42,6 +42,10 @@ + + #include + ++using std::cout; ++using std::cin; ++using std::endl; ++ + xbXBase x; + xbDbf d( &x ); + xbIndex *ix; +diff -up xbase-2.0.0/libtest/indextst.cpp.gcc43 xbase-2.0.0/libtest/indextst.cpp +--- xbase-2.0.0/libtest/indextst.cpp.gcc43 2008-03-11 20:41:46.000000000 +0100 ++++ xbase-2.0.0/libtest/indextst.cpp 2008-03-11 20:42:30.000000000 +0100 +@@ -31,6 +31,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + /* set the stack large for dos compiles */ + #ifdef __XBDOS + #include +diff -up xbase-2.0.0/libtest/exptest.cpp.gcc43 xbase-2.0.0/libtest/exptest.cpp +--- xbase-2.0.0/libtest/exptest.cpp.gcc43 2008-03-11 20:41:46.000000000 +0100 ++++ xbase-2.0.0/libtest/exptest.cpp 2008-03-11 20:42:30.000000000 +0100 +@@ -27,6 +27,9 @@ + + #include "xbase/xbase.h" + ++using std::cout; ++using std::endl; ++ + class ExpTestor{ + public: + ExpTestor( xbDbf * ); +diff -up xbase-2.0.0/libtest/locktest.cpp.gcc43 xbase-2.0.0/libtest/locktest.cpp +--- xbase-2.0.0/libtest/locktest.cpp.gcc43 2008-03-11 20:41:46.000000000 +0100 ++++ xbase-2.0.0/libtest/locktest.cpp 2008-03-11 20:42:31.000000000 +0100 +@@ -7,6 +7,9 @@ #include --#include -+#include -+using namespace std; + #include - #include ++using std::cout; ++using std::endl; ++ + int main(int, char**) + { + #if 0 // FIXME - seriously +diff -up xbase-2.0.0/libtest/testdate.cpp.gcc43 xbase-2.0.0/libtest/testdate.cpp +--- xbase-2.0.0/libtest/testdate.cpp.gcc43 2008-03-11 20:41:46.000000000 +0100 ++++ xbase-2.0.0/libtest/testdate.cpp 2008-03-11 20:42:32.000000000 +0100 +@@ -56,6 +56,9 @@ + #include + ++using std::cout; ++using std::endl; ++ + int main() + { + xbString StringDate( "19601007" ); /* oct 7 1960 */ +diff -up xbase-2.0.0/libtest/testhtml.cpp.gcc43 xbase-2.0.0/libtest/testhtml.cpp +--- xbase-2.0.0/libtest/testhtml.cpp.gcc43 2008-03-11 20:41:46.000000000 +0100 ++++ xbase-2.0.0/libtest/testhtml.cpp 2008-03-11 20:42:33.000000000 +0100 +@@ -48,6 +48,9 @@ + + #include + ++using std::cout; ++using std::endl; ++ + int main() + { + #ifdef XB_HTML Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/devel/xbase.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xbase.spec 20 Feb 2008 01:55:01 -0000 1.9 +++ xbase.spec 11 Mar 2008 20:25:10 -0000 1.10 @@ -1,7 +1,7 @@ Name: xbase Summary: XBase compatible database library Version: 2.0.0 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://linux.techass.com/projects/xdb/ @@ -99,6 +99,10 @@ %{_bindir}/dbfutil1 %changelog +* Tue Mar 11 2008 Hans de Goede 2.0.0-11 +- Fix gcc4.3 patch to not polute global header namespace with + "using namespace std;" + * Tue Feb 19 2008 Fedora Release Engineering - 2.0.0-10 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 20:26:44 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 11 Mar 2008 20:26:44 GMT Subject: rpms/xbsql/devel xbsql.spec,1.7,1.8 Message-ID: <200803112026.m2BKQi44026514@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xbsql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26481 Modified Files: xbsql.spec Log Message: * Tue Mar 11 2008 Hans de Goede 0.11-11 - Rebuild against fixed (for gcc-4.3 compat) xbase Index: xbsql.spec =================================================================== RCS file: /cvs/extras/rpms/xbsql/devel/xbsql.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xbsql.spec 20 Feb 2008 01:56:42 -0000 1.7 +++ xbsql.spec 11 Mar 2008 20:26:07 -0000 1.8 @@ -1,7 +1,7 @@ Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 -Release: 10%{?dist} +Release: 11%{?dist} Group: Development/Libraries License: LGPLv2+ URL: http://www.quaking.demon.co.uk/xbsql/ @@ -56,6 +56,9 @@ %{_libdir}/*.a %changelog +* Tue Mar 11 2008 Hans de Goede 0.11-11 +- Rebuild against fixed (for gcc-4.3 compat) xbase + * Tue Feb 19 2008 Fedora Release Engineering - 0.11-10 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 20:44:28 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Tue, 11 Mar 2008 20:44:28 GMT Subject: rpms/kernel/devel kernel.spec, 1.494, 1.495 linux-2.6-wireless.patch, 1.26, 1.27 Message-ID: <200803112044.m2BKiSLn027370@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27335 Modified Files: kernel.spec linux-2.6-wireless.patch Log Message: wireless fixes from 2008-03-11 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.494 retrieving revision 1.495 diff -u -r1.494 -r1.495 --- kernel.spec 11 Mar 2008 19:00:11 -0000 1.494 +++ kernel.spec 11 Mar 2008 20:43:54 -0000 1.495 @@ -1114,7 +1114,7 @@ ApplyPatch linux-2.6-ata-quirk.patch # wireless patches headed for 2.6.25 -#ApplyPatch linux-2.6-wireless.patch +ApplyPatch linux-2.6-wireless.patch # wireless patches headed for 2.6.26 ApplyPatch linux-2.6-wireless-pending.patch ApplyPatch linux-2.6-wireless-fixups.patch @@ -1756,6 +1756,12 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Tue Mar 11 2008 John W. Linville +- rt2x00: never disable multicast because it disables broadcast too +- rt2x00: Add new D-Link USB ID +- drivers/net/Kconfig: fix whitespace for GELIC_WIRELESS entry +- libertas: fix the 'compare command with itself' properly + * Tue Mar 11 2008 Dave Jones - Print values when we overflow resource allocation. linux-2.6-wireless.patch: Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless.patch,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- linux-2.6-wireless.patch 5 Mar 2008 01:09:02 -0000 1.26 +++ linux-2.6-wireless.patch 11 Mar 2008 20:43:54 -0000 1.27 @@ -1,391 +1,122 @@ -commit c256e05b7b30fab484deacb4f8cff59ce649c75e -Author: Michael Buesch -Date: Tue Mar 4 20:31:13 2008 +0100 +commit 445815d7ea4f59baf103f28b45f7dd45f21ff75d +Author: Ivo van Doorn +Date: Sun Mar 9 22:42:32 2008 +0100 - b43legacy: Fix module init message + rt2x00: Add new D-Link USB ID - This fixes the module init message to tell that the legacy - driver loaded. This makes it less confusing, in case both drivers are loaded. - - Signed-off-by: Michael Buesch + Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville -commit cdb2a9fe63575dd1eb82b724bbd0aa5e0dd89fa0 -Author: Jussi Kivilinna -Date: Tue Mar 4 20:05:27 2008 +0200 +commit fbb0a27a8ad56f822f479ee85446d9c29483a3d1 +Author: Adam Baker +Date: Sun Mar 9 22:40:40 2008 +0100 - rndis_wlan: fix broken data copy + rt2x00: never disable multicast because it disables broadcast too - Replace broken code that attempted to copy 6 byte array to 64-bit - integer. Due to missing cast to 64-bit integer, left shift operation - were 32-bit and lead to bytes been copied over each other. New code - uses simple memcpy, for greater readability and efficiency. + On rt73 and rt61 disabling reception of multicast packets also disables + broadcast traffic which we never want to do. Therefore we should never + disable multicast. - Signed-off-by: Jussi Kivilinna + Signed-off-by: Adam Baker + Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville -commit 8a96df80b3ddb2410045a26ea19eeccb5f2d2d11 +commit 5f0547c2813d4677908fa6de02f9911d25996515 Author: Sebastian Siewior -Date: Tue Mar 4 18:22:27 2008 +0100 - - libertas: compare the current command with response - - instead of with itself. - - Signed-off-by: Sebastian Siewior - Signed-off-by: John W. Linville - -commit 6305f498604df6c66bdb4cc533ce6332fa5ab61f -Author: David Woodhouse -Date: Mon Mar 3 12:20:12 2008 +0100 +Date: Thu Mar 6 10:30:21 2008 +0100 - libertas: fix sanity check on sequence number in command response + libertas: fix the 'compare command with itself' properly - Slightly more useful if we compare it against the sequence number of the - command we have outstanding, rather than comparing the reply with itself. + |libertas: Invalid CMD_RESP 8012 to command 50! - Doh. Pointed out by Sebastian Siewior + The special case got mixed up in 8a96df80b3. - Signed-off-by: David Woodhouse - Acked-by: Dan Williams - Signed-off-by: John W. Linville - -commit c2f2d3a06f8b628d444cf4f396d6c6ddd47e1d1f -Author: Johannes Berg -Date: Fri Feb 29 23:28:25 2008 +0100 - - p54: fix eeprom parser length sanity checks - - When I called p54_parse_eeprom() on a hand-coded structure - I managed to make a small mistake with wrap->len which caused - a segfault a few lines down when trying to read entry->len. - This patch changes the validation code to avoid such problems. - - Signed-off-by: Johannes Berg - Tested-by: Florian Fainelli - Signed-off-by: John W. Linville - -commit 8c28293f5514f64ba064bac7946aebeda4a663c6 -Author: Johannes Berg -Date: Fri Feb 29 13:56:33 2008 +0100 - - p54: fix EEPROM structure endianness - - Since the EEPROM structure is read from hardware, it is - always little endian, annotate that in the struct and - make sure to convert where applicable. - - Signed-off-by: Johannes Berg - Cc: Michael Wu - Tested-by: Florian Fainelli - Signed-off-by: John W. Linville - -commit dc63644b0ee3b447e879ef8e124657b40e9ea81c -Author: Yoichi Yuasa -Date: Fri Feb 29 11:09:31 2008 +0100 - - ssb: Add pcibios_enable_device() return value check - - This patch has added pcibios_enable_device() return value check. - - Signed-off-by: Yoichi Yuasa - Signed-off-by: Michael Buesch + Signed-off-by: Sebastian Siewior Signed-off-by: John W. Linville -commit 1d60ab0574fae362b1cca0ef52181ef75fd46832 -Author: Stefano Brivio -Date: Sun Mar 2 11:33:10 2008 +0100 - - rc80211-pid: fix rate adjustment - - Merge rate_control_pid_shift_adjust() to rate_control_pid_adjust_rate() - in order to make the learning algorithm aware of constraints on rates. Also - add some comments and rename variables. - - This fixes a bug which prevented 802.11b/g non-AP STAs from working with - 802.11b only AP STAs. - - This patch was originally destined for 2.6.26, and is being backported - to fix a user reported problem in post-2.6.24 kernels. +commit 97ed83905e5f8547a94a8066441351c6920728a1 +Author: John W. Linville +Date: Thu Mar 6 13:08:09 2008 -0500 + + drivers/net/Kconfig: fix whitespace for GELIC_WIRELESS entry - Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville -diff -up linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c ---- linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-03-04 19:28:35.000000000 -0500 -+++ linux-2.6.24.noarch/net/mac80211/rc80211_pid_algo.c 2008-03-04 19:30:56.000000000 -0500 -@@ -2,7 +2,7 @@ - * Copyright 2002-2005, Instant802 Networks, Inc. - * Copyright 2005, Devicescape Software, Inc. - * Copyright 2007, Mattias Nissler -- * Copyright 2007, Stefano Brivio -+ * Copyright 2007-2008, Stefano Brivio - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as -@@ -63,72 +63,66 @@ - * RC_PID_ARITH_SHIFT. - */ - -- --/* Shift the adjustment so that we won't switch to a lower rate if it exhibited -- * a worse failed frames behaviour and we'll choose the highest rate whose -- * failed frames behaviour is not worse than the one of the original rate -- * target. While at it, check that the adjustment is within the ranges. Then, -- * provide the new rate index. */ --static int rate_control_pid_shift_adjust(struct rc_pid_rateinfo *r, -- int adj, int cur, int l) --{ -- int i, j, k, tmp; -- -- j = r[cur].rev_index; -- i = j + adj; -- -- if (i < 0) -- return r[0].index; -- if (i >= l - 1) -- return r[l - 1].index; -- -- tmp = i; -- -- if (adj < 0) { -- for (k = j; k >= i; k--) -- if (r[k].diff <= r[j].diff) -- tmp = k; -- } else { -- for (k = i + 1; k + i < l; k++) -- if (r[k].diff <= r[i].diff) -- tmp = k; -- } -- -- return r[tmp].index; --} -- -+/* Adjust the rate while ensuring that we won't switch to a lower rate if it -+ * exhibited a worse failed frames behaviour and we'll choose the highest rate -+ * whose failed frames behaviour is not worse than the one of the original rate -+ * target. While at it, check that the new rate is valid. */ - static void rate_control_pid_adjust_rate(struct ieee80211_local *local, - struct sta_info *sta, int adj, - struct rc_pid_rateinfo *rinfo) - { - struct ieee80211_sub_if_data *sdata; - struct ieee80211_hw_mode *mode; -- int newidx; -- int maxrate; -- int back = (adj > 0) ? 1 : -1; -+ int cur_sorted, new_sorted, probe, tmp, n_bitrates; -+ int cur = sta->txrate; - - sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); - - mode = local->oper_hw_mode; -- maxrate = sdata->bss ? sdata->bss->max_ratectrl_rateidx : -1; -+ n_bitrates = mode->num_rates; - -- newidx = rate_control_pid_shift_adjust(rinfo, adj, sta->txrate, -- mode->num_rates); -+ /* Map passed arguments to sorted values. */ -+ cur_sorted = rinfo[cur].rev_index; -+ new_sorted = cur_sorted + adj; -+ -+ /* Check limits. */ -+ if (new_sorted < 0) -+ new_sorted = rinfo[0].rev_index; -+ else if (new_sorted >= n_bitrates) -+ new_sorted = rinfo[n_bitrates - 1].rev_index; - -- while (newidx != sta->txrate) { -- if (rate_supported(sta, mode, newidx) && -- (maxrate < 0 || newidx <= maxrate)) { -- sta->txrate = newidx; -- break; -- } -+ tmp = new_sorted; - -- newidx += back; -+ if (adj < 0) { -+ /* Ensure that the rate decrease isn't disadvantageous. */ -+ for (probe = cur_sorted; probe >= new_sorted; probe--) -+ if (rinfo[probe].diff <= rinfo[cur_sorted].diff && -+ rate_supported(sta, mode, rinfo[probe].index)) -+ tmp = probe; -+ } else { -+ /* Look for rate increase with zero (or below) cost. */ -+ for (probe = new_sorted + 1; probe < n_bitrates; probe++) -+ if (rinfo[probe].diff <= rinfo[new_sorted].diff && -+ rate_supported(sta, mode, rinfo[probe].index)) -+ tmp = probe; - } - -+ /* Fit the rate found to the nearest supported rate. */ -+ do { -+ if (rate_supported(sta, mode, rinfo[tmp].index)) { -+ sta->txrate = rinfo[tmp].index; -+ break; -+ } -+ if (adj < 0) -+ tmp--; -+ else -+ tmp++; -+ } while (tmp < n_bitrates && tmp >= 0); -+ - #ifdef CONFIG_MAC80211_DEBUGFS - rate_control_pid_event_rate_change( - &((struct rc_pid_sta_info *)sta->rate_ctrl_priv)->events, -- newidx, mode->rates[newidx].rate); -+ cur, mode->rates[cur].rate); - #endif - } - -diff -up linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig linux-2.6.24.noarch/drivers/net/wireless/p54common.h ---- linux-2.6.24.noarch/drivers/net/wireless/p54common.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/p54common.h 2008-03-04 19:30:56.000000000 -0500 -@@ -53,10 +53,10 @@ struct pda_entry { - } __attribute__ ((packed)); - - struct eeprom_pda_wrap { -- u32 magic; -- u16 pad; -- u16 len; -- u32 arm_opcode; -+ __le32 magic; -+ __le16 pad; -+ __le16 len; -+ __le32 arm_opcode; - u8 data[0]; - } __attribute__ ((packed)); - -diff -up linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig linux-2.6.24.noarch/drivers/net/wireless/p54common.c ---- linux-2.6.24.noarch/drivers/net/wireless/p54common.c.orig 2008-03-04 19:28:31.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/p54common.c 2008-03-04 19:30:56.000000000 -0500 -@@ -166,18 +166,23 @@ int p54_parse_eeprom(struct ieee80211_hw - struct p54_common *priv = dev->priv; - struct eeprom_pda_wrap *wrap = NULL; - struct pda_entry *entry; -- int i = 0; - unsigned int data_len, entry_len; - void *tmp; - int err; -+ u8 *end = (u8 *)eeprom + len; - - wrap = (struct eeprom_pda_wrap *) eeprom; -- entry = (void *)wrap->data + wrap->len; -- i += 2; -- i += le16_to_cpu(entry->len)*2; -- while (i < len) { -+ entry = (void *)wrap->data + le16_to_cpu(wrap->len); -+ -+ /* verify that at least the entry length/code fits */ -+ while ((u8 *)entry <= end - sizeof(*entry)) { - entry_len = le16_to_cpu(entry->len); - data_len = ((entry_len - 1) << 1); -+ -+ /* abort if entry exceeds whole structure */ -+ if ((u8 *)entry + sizeof(*entry) + data_len > end) -+ break; -+ - switch (le16_to_cpu(entry->code)) { - case PDR_MAC_ADDRESS: - SET_IEEE80211_PERM_ADDR(dev, entry->data); -@@ -249,13 +254,12 @@ int p54_parse_eeprom(struct ieee80211_hw - priv->version = *(u8 *)(entry->data + 1); - break; - case PDR_END: -- i = len; -+ /* make it overrun */ -+ entry_len = len; - break; - } - - entry = (void *)entry + (entry_len + 1)*2; -- i += 2; -- i += entry_len*2; - } - - if (!priv->iq_autocal || !priv->output_limit || !priv->curve_data) { -diff -up linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c ---- linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-03-04 19:28:31.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/b43legacy/main.c 2008-03-04 19:30:56.000000000 -0500 -@@ -3829,7 +3829,7 @@ static void b43legacy_print_driverinfo(v - #ifdef CONFIG_B43LEGACY_DMA - feat_dma = "D"; - #endif -- printk(KERN_INFO "Broadcom 43xx driver loaded " -+ printk(KERN_INFO "Broadcom 43xx-legacy driver loaded " - "[ Features: %s%s%s%s%s, Firmware-ID: " - B43legacy_SUPPORTED_FIRMWARE_ID " ]\n", - feat_pci, feat_leds, feat_rfkill, feat_pio, feat_dma); -diff -up linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c ---- linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c.orig 2008-03-04 19:28:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/rndis_wlan.c 2008-03-04 19:30:56.000000000 -0500 -@@ -260,7 +260,7 @@ struct NDIS_802_11_KEY { - __le32 KeyLength; - u8 Bssid[6]; - u8 Padding[6]; -- __le64 KeyRSC; -+ u8 KeyRSC[8]; - u8 KeyMaterial[32]; - } __attribute__((packed)); - -@@ -1508,7 +1508,7 @@ static int rndis_iw_set_encode_ext(struc - struct usbnet *usbdev = dev->priv; - struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev); - struct NDIS_802_11_KEY ndis_key; -- int i, keyidx, ret; -+ int keyidx, ret; - u8 *addr; - - keyidx = wrqu->encoding.flags & IW_ENCODE_INDEX; -@@ -1543,9 +1543,7 @@ static int rndis_iw_set_encode_ext(struc - ndis_key.KeyIndex = cpu_to_le32(keyidx); - - if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) { -- for (i = 0; i < 6; i++) -- ndis_key.KeyRSC |= -- cpu_to_le64(ext->rx_seq[i] << (i * 8)); -+ memcpy(ndis_key.KeyRSC, ext->rx_seq, 6); - ndis_key.KeyIndex |= cpu_to_le32(1 << 29); - } +diff -up linux-2.6.24.noarch/drivers/net/Kconfig.orig linux-2.6.24.noarch/drivers/net/Kconfig +--- linux-2.6.24.noarch/drivers/net/Kconfig.orig 2008-03-11 16:02:59.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/Kconfig 2008-03-11 16:33:00.000000000 -0400 +@@ -2377,15 +2377,15 @@ config GELIC_NET + module will be called ps3_gelic. + + config GELIC_WIRELESS +- bool "PS3 Wireless support" +- depends on GELIC_NET +- select WIRELESS_EXT +- help +- This option adds the support for the wireless feature of PS3. +- If you have the wireless-less model of PS3 or have no plan to +- use wireless feature, disabling this option saves memory. As +- the driver automatically distinguishes the models, you can +- safely enable this option even if you have a wireless-less model. ++ bool "PS3 Wireless support" ++ depends on GELIC_NET ++ select WIRELESS_EXT ++ help ++ This option adds the support for the wireless feature of PS3. ++ If you have the wireless-less model of PS3 or have no plan to ++ use wireless feature, disabling this option saves memory. As ++ the driver automatically distinguishes the models, you can ++ safely enable this option even if you have a wireless-less model. + config GIANFAR + tristate "Gianfar Ethernet" diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-04 19:28:31.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-04 19:30:56.000000000 -0500 -@@ -562,9 +562,7 @@ int lbs_process_rx_command(struct lbs_pr +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-11 16:02:34.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-11 16:33:00.000000000 -0400 +@@ -578,7 +578,7 @@ int lbs_process_rx_command(struct lbs_pr + goto done; } - - resp = (void *)priv->upld_buf; -- -- curcmd = le16_to_cpu(resp->command); -- -+ curcmd = le16_to_cpu(priv->cur_cmd->cmdbuf->command); - respcmd = le16_to_cpu(resp->command); - result = le16_to_cpu(resp->result); - -@@ -572,9 +570,9 @@ int lbs_process_rx_command(struct lbs_pr - respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies); - lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len); - -- if (resp->seqnum != resp->seqnum) { -+ if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) { - lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n", -- le16_to_cpu(resp->seqnum), le16_to_cpu(resp->seqnum)); -+ le16_to_cpu(resp->seqnum), le16_to_cpu(priv->cur_cmd->cmdbuf->seqnum)); + if (respcmd != CMD_RET(curcmd) && +- respcmd != CMD_802_11_ASSOCIATE && curcmd != CMD_RET_802_11_ASSOCIATE) { ++ respcmd != CMD_RET_802_11_ASSOCIATE && curcmd != CMD_802_11_ASSOCIATE) { + lbs_pr_info("Invalid CMD_RESP %x to command %x!\n", respcmd, curcmd); spin_unlock_irqrestore(&priv->driver_lock, flags); ret = -1; - goto done; -diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c ---- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-03-04 19:28:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-04 19:30:56.000000000 -0500 -@@ -111,7 +111,10 @@ static void __init ssb_fixup_pcibridge(s - - /* Enable PCI bridge bus mastering and memory space */ - pci_set_master(dev); -- pcibios_enable_device(dev, ~0); -+ if (pcibios_enable_device(dev, ~0) < 0) { -+ ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n"); -+ return; -+ } - - /* Enable PCI bridge BAR1 prefetch and burst */ - pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3); +diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-03-11 16:02:35.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-03-11 16:33:00.000000000 -0400 +@@ -2302,9 +2302,9 @@ static void rt61pci_configure_filter(str + * Apply some rules to the filters: + * - Some filters imply different filters to be set. + * - Some things we can't filter out at all. ++ * - Multicast filter seems to kill broadcast traffic so never use it. + */ +- if (mc_count) +- *total_flags |= FIF_ALLMULTI; ++ *total_flags |= FIF_ALLMULTI; + if (*total_flags & FIF_OTHER_BSS || + *total_flags & FIF_PROMISC_IN_BSS) + *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS; +diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-03-11 16:02:35.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-03-11 16:33:00.000000000 -0400 +@@ -1869,9 +1869,9 @@ static void rt73usb_configure_filter(str + * Apply some rules to the filters: + * - Some filters imply different filters to be set. + * - Some things we can't filter out at all. ++ * - Multicast filter seems to kill broadcast traffic so never use it. + */ +- if (mc_count) +- *total_flags |= FIF_ALLMULTI; ++ *total_flags |= FIF_ALLMULTI; + if (*total_flags & FIF_OTHER_BSS || + *total_flags & FIF_PROMISC_IN_BSS) + *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS; +@@ -2098,6 +2098,7 @@ static struct usb_device_id rt73usb_devi + /* D-Link */ + { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, + { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, ++ { USB_DEVICE(0x07d1, 0x3c07), USB_DEVICE_DATA(&rt73usb_ops) }, + /* Gemtek */ + { USB_DEVICE(0x15a9, 0x0004), USB_DEVICE_DATA(&rt73usb_ops) }, + /* Gigabyte */ From fedora-extras-commits at redhat.com Tue Mar 11 20:47:43 2008 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Tue, 11 Mar 2008 20:47:43 GMT Subject: rpms/authconfig/devel .cvsignore, 1.66, 1.67 authconfig.spec, 1.94, 1.95 sources, 1.74, 1.75 Message-ID: <200803112047.m2BKlhb7027520@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/authconfig/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27476 Modified Files: .cvsignore authconfig.spec sources Log Message: * Tue Mar 11 2008 Tomas Mraz - 5.4.1-1 - fixed backup directory in Makefile and spec (#437040) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- .cvsignore 10 Mar 2008 15:08:40 -0000 1.66 +++ .cvsignore 11 Mar 2008 20:47:13 -0000 1.67 @@ -1 +1 @@ -authconfig-5.4.0.tar.bz2 +authconfig-5.4.1.tar.bz2 Index: authconfig.spec =================================================================== RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- authconfig.spec 10 Mar 2008 15:08:40 -0000 1.94 +++ authconfig.spec 11 Mar 2008 20:47:13 -0000 1.95 @@ -1,6 +1,6 @@ Summary: Command line tool for setting up authentication from network services Name: authconfig -Version: 5.4.0 +Version: 5.4.1 Release: 1%{?dist} License: GPLv2+ ExclusiveOS: Linux @@ -77,7 +77,7 @@ %config(noreplace) %{_sysconfdir}/pam.d/authconfig-tui %config(noreplace) %{_sysconfdir}/security/console.apps/authconfig %config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-tui -%attr(700,root,root) %dir %{_localstatedir}/%{name} +%attr(700,root,root) %dir %{_localstatedir}/lib/%{name} %files gtk %defattr(-,root,root,-) @@ -95,6 +95,9 @@ %{_datadir}/pixmaps/* %changelog +* Tue Mar 11 2008 Tomas Mraz - 5.4.1-1 +- fixed backup directory in Makefile and spec (#437040) + * Mon Mar 10 2008 Tomas Mraz - 5.4.0-1 - include config-util in console.apps files - add support for saving/restoring backups of configuration Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 10 Mar 2008 15:08:40 -0000 1.74 +++ sources 11 Mar 2008 20:47:13 -0000 1.75 @@ -1 +1 @@ -0acddc0eabcd5fc6bb4c471b8058f0de authconfig-5.4.0.tar.bz2 +79edac1aeb46e871733a2f074821c3da authconfig-5.4.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 20:49:10 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 11 Mar 2008 20:49:10 GMT Subject: rpms/suck/devel suck.spec,1.16,1.17 Message-ID: <200803112049.m2BKnAaJ027665@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/suck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27623 Modified Files: suck.spec Log Message: Rebuild for new perl release Index: suck.spec =================================================================== RCS file: /cvs/extras/rpms/suck/devel/suck.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- suck.spec 10 Feb 2008 21:44:10 -0000 1.16 +++ suck.spec 11 Mar 2008 20:48:38 -0000 1.17 @@ -1,7 +1,7 @@ Name: suck Summary: Download news from remote NNTP server Version: 4.3.2 -Release: 20%{?dist} +Release: 21%{?dist} Source: http://www.sucknews.org/%{name}-%{version}.tar.gz Source1: active-ignore Source2: suck-4.3.2.site @@ -16,7 +16,7 @@ License: Public Domain Group: System Environment/Daemons -BuildRequires: inn-devel >= 2.3, perl-devel >= 3:5.8 +BuildRequires: inn-devel >= 2.3, perl-devel >= 3:5.8 perl(ExtUtils::Embed) BuildRequires: openssl-devel, autoconf Requires: inn >= 2.3 Conflicts: leafnode @@ -88,6 +88,9 @@ %dir %{_sysconfdir}/news/suck.d/ %changelog +* Tue Mar 11 2008 Jochen Schmitt 4.3.2-21 +- Rebuild for perl 5.10 (#436955) + * Sun Feb 10 2008 Jochen Schmitt 4.3.2-20 - Rebuild for gcc-4.3 From fedora-extras-commits at redhat.com Tue Mar 11 21:03:49 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Tue, 11 Mar 2008 21:03:49 GMT Subject: rpms/ksshaskpass/devel ksshaskpass.spec,1.3,1.4 Message-ID: <200803112103.m2BL3nHG003144@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/ksshaskpass/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3116/devel Modified Files: ksshaskpass.spec Log Message: * Tue Mar 11 2008 Kevin Kofler 0.3-5 - BR kdelibs3-devel instead of kdelibs-devel (#433963) Index: ksshaskpass.spec =================================================================== RCS file: /cvs/pkgs/rpms/ksshaskpass/devel/ksshaskpass.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ksshaskpass.spec 18 Feb 2008 18:16:46 -0000 1.3 +++ ksshaskpass.spec 11 Mar 2008 21:03:18 -0000 1.4 @@ -1,6 +1,6 @@ Name: ksshaskpass Version: 0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A KDE version of ssh-askpass with KWallet support Group: Applications/Internet @@ -10,7 +10,7 @@ Source1: ksshaskpass-README.Fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel +BuildRequires: kdelibs3-devel #Requires: openssh-clients %description @@ -85,6 +85,9 @@ %changelog +* Tue Mar 11 2008 Kevin Kofler 0.3-5 +- BR kdelibs3-devel instead of kdelibs-devel (#433963) + * Mon Feb 18 2008 Fedora Release Engineering - 0.3-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Tue Mar 11 21:06:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 21:06:23 GMT Subject: rpms/logjam/devel logjam-4.5.3-tags.patch, 1.2, 1.3 logjam.spec, 1.38, 1.39 Message-ID: <200803112106.m2BL6Ne3003319@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3249/devel Modified Files: logjam-4.5.3-tags.patch logjam.spec Log Message: Add Makefile.in bits to tags patch logjam-4.5.3-tags.patch: Index: logjam-4.5.3-tags.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam-4.5.3-tags.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- logjam-4.5.3-tags.patch 11 Mar 2008 20:21:42 -0000 1.2 +++ logjam-4.5.3-tags.patch 11 Mar 2008 21:06:22 -0000 1.3 @@ -421,3 +421,43 @@ gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1); gtk_widget_show_all(view->tagsbar); } +diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in +--- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD 2008-03-11 17:02:35.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in 2008-03-11 17:03:49.000000000 -0400 +@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ + liblivejournal_la_SOURCES = \ + md5.c md5.h \ + protocol.c protocol.h \ +- friends.h \ ++ friends.h tags.h \ + serveruser.c serveruser.h \ + entry.c entry.h \ + types.c types.h \ +@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \ + getchallenge.c getchallenge.h \ + getevents.c getevents.h \ + getfriends.c getfriends.h \ ++ gettags.c gettags.h \ + syncitems.c syncitems.h \ + sync.c sync.h \ + livejournal.h +diff -up logjam-4.5.3/src/Makefile.in.BAD logjam-4.5.3/src/Makefile.in +--- logjam-4.5.3/src/Makefile.in.BAD 2008-03-11 17:01:21.000000000 -0400 ++++ logjam-4.5.3/src/Makefile.in 2008-03-11 17:01:52.000000000 -0400 +@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. + undo.c undo.h \ + userlabel.c userlabel.h \ + get_cmd_out.c get_cmd_out.h \ ++ tags.c tags.h \ + $(HTML_MARKUP) + + +@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini + login.c login.h manager.c spawn.c spawn.h icons.c icons.h \ + music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \ + pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \ +- userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \ ++ userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \ + html_markup.h network-win32.c network-fork.c network-soup.c \ + network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \ + docklet.c preview.c preview.h journalstore-sqlite.c \ Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- logjam.spec 11 Mar 2008 20:21:42 -0000 1.38 +++ logjam.spec 11 Mar 2008 21:06:22 -0000 1.39 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -64,7 +64,7 @@ %patch12 -p1 -b .disablethreads %patch13 -p1 -b .title %patch14 -p1 -b .tags -# %patch15 -p1 -b .default-spelllang-en-US +%patch15 -p1 -b .default-spelllang-en-US %build autoconf @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-16 +- add Makefile.in bits to tags patch + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-15 - fix tags patch From fedora-extras-commits at redhat.com Tue Mar 11 21:06:48 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 21:06:48 GMT Subject: rpms/logjam/F-7 logjam-4.5.3-tags.patch, 1.2, 1.3 logjam.spec, 1.35, 1.36 Message-ID: <200803112106.m2BL6mN3003325@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3249/F-7 Modified Files: logjam-4.5.3-tags.patch logjam.spec Log Message: Add Makefile.in bits to tags patch logjam-4.5.3-tags.patch: Index: logjam-4.5.3-tags.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-7/logjam-4.5.3-tags.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- logjam-4.5.3-tags.patch 11 Mar 2008 20:21:31 -0000 1.2 +++ logjam-4.5.3-tags.patch 11 Mar 2008 21:06:10 -0000 1.3 @@ -421,3 +421,43 @@ gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1); gtk_widget_show_all(view->tagsbar); } +diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in +--- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD 2008-03-11 17:02:35.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in 2008-03-11 17:03:49.000000000 -0400 +@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ + liblivejournal_la_SOURCES = \ + md5.c md5.h \ + protocol.c protocol.h \ +- friends.h \ ++ friends.h tags.h \ + serveruser.c serveruser.h \ + entry.c entry.h \ + types.c types.h \ +@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \ + getchallenge.c getchallenge.h \ + getevents.c getevents.h \ + getfriends.c getfriends.h \ ++ gettags.c gettags.h \ + syncitems.c syncitems.h \ + sync.c sync.h \ + livejournal.h +diff -up logjam-4.5.3/src/Makefile.in.BAD logjam-4.5.3/src/Makefile.in +--- logjam-4.5.3/src/Makefile.in.BAD 2008-03-11 17:01:21.000000000 -0400 ++++ logjam-4.5.3/src/Makefile.in 2008-03-11 17:01:52.000000000 -0400 +@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. + undo.c undo.h \ + userlabel.c userlabel.h \ + get_cmd_out.c get_cmd_out.h \ ++ tags.c tags.h \ + $(HTML_MARKUP) + + +@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini + login.c login.h manager.c spawn.c spawn.h icons.c icons.h \ + music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \ + pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \ +- userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \ ++ userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \ + html_markup.h network-win32.c network-fork.c network-soup.c \ + network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \ + docklet.c preview.c preview.h journalstore-sqlite.c \ Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-7/logjam.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- logjam.spec 11 Mar 2008 20:21:31 -0000 1.35 +++ logjam.spec 11 Mar 2008 21:06:10 -0000 1.36 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-16 +- add Makefile.in bits to tags patch + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-15 - fix tags patch From fedora-extras-commits at redhat.com Tue Mar 11 21:06:52 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 21:06:52 GMT Subject: rpms/logjam/F-8 logjam-4.5.3-tags.patch, 1.2, 1.3 logjam.spec, 1.35, 1.36 Message-ID: <200803112106.m2BL6qfM003329@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3249/F-8 Modified Files: logjam-4.5.3-tags.patch logjam.spec Log Message: Add Makefile.in bits to tags patch logjam-4.5.3-tags.patch: Index: logjam-4.5.3-tags.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam-4.5.3-tags.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- logjam-4.5.3-tags.patch 11 Mar 2008 20:21:35 -0000 1.2 +++ logjam-4.5.3-tags.patch 11 Mar 2008 21:06:17 -0000 1.3 @@ -421,3 +421,43 @@ gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1); gtk_widget_show_all(view->tagsbar); } +diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in +--- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD 2008-03-11 17:02:35.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in 2008-03-11 17:03:49.000000000 -0400 +@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ + liblivejournal_la_SOURCES = \ + md5.c md5.h \ + protocol.c protocol.h \ +- friends.h \ ++ friends.h tags.h \ + serveruser.c serveruser.h \ + entry.c entry.h \ + types.c types.h \ +@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \ + getchallenge.c getchallenge.h \ + getevents.c getevents.h \ + getfriends.c getfriends.h \ ++ gettags.c gettags.h \ + syncitems.c syncitems.h \ + sync.c sync.h \ + livejournal.h +diff -up logjam-4.5.3/src/Makefile.in.BAD logjam-4.5.3/src/Makefile.in +--- logjam-4.5.3/src/Makefile.in.BAD 2008-03-11 17:01:21.000000000 -0400 ++++ logjam-4.5.3/src/Makefile.in 2008-03-11 17:01:52.000000000 -0400 +@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. + undo.c undo.h \ + userlabel.c userlabel.h \ + get_cmd_out.c get_cmd_out.h \ ++ tags.c tags.h \ + $(HTML_MARKUP) + + +@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini + login.c login.h manager.c spawn.c spawn.h icons.c icons.h \ + music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \ + pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \ +- userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \ ++ userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \ + html_markup.h network-win32.c network-fork.c network-soup.c \ + network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \ + docklet.c preview.c preview.h journalstore-sqlite.c \ Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- logjam.spec 11 Mar 2008 20:21:35 -0000 1.35 +++ logjam.spec 11 Mar 2008 21:06:17 -0000 1.36 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-16 +- add Makefile.in bits to tags patch + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-15 - fix tags patch From fedora-extras-commits at redhat.com Tue Mar 11 21:30:23 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 21:30:23 GMT Subject: rpms/logjam/F-7 logjam.spec,1.36,1.37 Message-ID: <200803112130.m2BLUNRR004081@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4008/F-7 Modified Files: logjam.spec Log Message: properly autotool things Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-7/logjam.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- logjam.spec 11 Mar 2008 21:06:10 -0000 1.36 +++ logjam.spec 11 Mar 2008 21:29:46 -0000 1.37 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -16,7 +16,7 @@ BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel BuildRequires: libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel -BuildRequires: autoconf, intltool +BuildRequires: autoconf, automake, intltool Obsoletes: loserjabber, logjam-gnome BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch2: logjam-4.4.1-backdated.patch @@ -65,7 +65,10 @@ %patch15 -p1 -b .default-spelllang-en-US %build +touch NEWS README AUTHORS +aclocal autoconf +automake --add-missing %configure --with-sqlite3 \ %if %{use_xmms} --with-xmms @@ -102,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-17 +- properly autotool + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-16 - add Makefile.in bits to tags patch From fedora-extras-commits at redhat.com Tue Mar 11 21:30:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 21:30:24 GMT Subject: rpms/logjam/F-8 logjam.spec,1.36,1.37 Message-ID: <200803112130.m2BLUORX004084@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4008/F-8 Modified Files: logjam.spec Log Message: properly autotool things Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- logjam.spec 11 Mar 2008 21:06:17 -0000 1.36 +++ logjam.spec 11 Mar 2008 21:29:53 -0000 1.37 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -16,7 +16,7 @@ BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel BuildRequires: libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel -BuildRequires: autoconf, intltool +BuildRequires: autoconf, automake, intltool Obsoletes: loserjabber, logjam-gnome BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch2: logjam-4.4.1-backdated.patch @@ -65,7 +65,10 @@ %patch15 -p1 -b .default-spelllang-en-US %build +touch NEWS README AUTHORS +aclocal autoconf +automake --add-missing %configure --with-sqlite3 \ %if %{use_xmms} --with-xmms @@ -102,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-17 +- properly autotool + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-16 - add Makefile.in bits to tags patch From fedora-extras-commits at redhat.com Tue Mar 11 21:30:26 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 21:30:26 GMT Subject: rpms/logjam/devel logjam.spec,1.39,1.40 Message-ID: <200803112130.m2BLUQlJ004088@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4008/devel Modified Files: logjam.spec Log Message: properly autotool things Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- logjam.spec 11 Mar 2008 21:06:22 -0000 1.39 +++ logjam.spec 11 Mar 2008 21:29:55 -0000 1.40 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -16,7 +16,7 @@ BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel BuildRequires: libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel -BuildRequires: autoconf, intltool, popt-devel +BuildRequires: autoconf, automake, intltool, popt-devel Obsoletes: loserjabber, logjam-gnome BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch2: logjam-4.4.1-backdated.patch @@ -67,7 +67,10 @@ %patch15 -p1 -b .default-spelllang-en-US %build +touch NEWS README AUTHORS +aclocal autoconf +automake --add-missing %configure --with-sqlite3 \ %if %{use_xmms} --with-xmms @@ -104,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-17 +- properly autotool + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-16 - add Makefile.in bits to tags patch From fedora-extras-commits at redhat.com Tue Mar 11 21:32:34 2008 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Tue, 11 Mar 2008 21:32:34 GMT Subject: rpms/centerim/devel .cvsignore, 1.6, 1.7 centerim.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200803112132.m2BLWYm1004240@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/centerim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4142/devel Modified Files: .cvsignore centerim.spec sources Log Message: 4.22.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/centerim/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Dec 2007 16:20:00 -0000 1.6 +++ .cvsignore 11 Mar 2008 21:31:59 -0000 1.7 @@ -1 +1 @@ -centerim-4.22.2.tar.gz +centerim-4.22.3.tar.gz Index: centerim.spec =================================================================== RCS file: /cvs/pkgs/rpms/centerim/devel/centerim.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- centerim.spec 19 Feb 2008 11:20:19 -0000 1.12 +++ centerim.spec 11 Mar 2008 21:31:59 -0000 1.13 @@ -1,6 +1,6 @@ Name: centerim -Version: 4.22.2 -Release: 4%{?dist} +Version: 4.22.3 +Release: 1%{?dist} Epoch: 1 Summary: Text mode menu- and window-driven IM @@ -36,9 +36,6 @@ %build -# Temporary hack due to bad timestamps to avoid -# regeneration of autoconf stuff when doing 'make' -find . |xargs touch -r README %configure \ --with-ssl \ --disable-rpath \ @@ -82,6 +79,9 @@ %changelog +* Tue Mar 11 2008 Lubomir Kundrak - 1:4.22.3-1 +- New upstream release + * Tue Feb 19 2008 Fedora Release Engineering - 1:4.22.2-4 - Autorebuild for GCC 4.3 @@ -92,7 +92,7 @@ - Replace centericq * Sat Dec 08 2007 Lubomir Kundrak - 1:4.22.2-1 -- New upstream relese +- New upstream release * Wed Nov 28 2007 Lubomir Kundrak - 1:4.22.1.20071124-2 - Synchronized with GIT to fix the ICQ client side contacts problems (#402301) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/centerim/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Dec 2007 16:20:00 -0000 1.6 +++ sources 11 Mar 2008 21:31:59 -0000 1.7 @@ -1 +1 @@ -dcced736e2f261e08e667403c42dc78f centerim-4.22.2.tar.gz +7736e64950ce0dde5a2cc29945eb1b71 centerim-4.22.3.tar.gz From fedora-extras-commits at redhat.com Tue Mar 11 21:39:05 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 11 Mar 2008 21:39:05 GMT Subject: rpms/sysvinit/devel change_console, NONE, 1.1 sysvinit.spec, 1.66, 1.67 Message-ID: <200803112139.m2BLd5D3004507@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/sysvinit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4476 Modified Files: sysvinit.spec Added Files: change_console Log Message: replace change_console with a shell script that calls initctl push-tty... --- NEW FILE change_console --- #!/bin/sh if [ "$1" = "-r" ]; then /sbin/initctl pop-tty exit 0 fi SHOULD_BLOCK=0 if [ "$1" = "-f" ]; then SHOULD_BLOCK=1 shift fi if [ $# -ge 1 ]; then TTY="$1" else TTY="$(/usr/bin/tty)" fi /sbin/initctl push-tty $TTY if [ $SHOULD_BLOCK -ne 0 ]; then while read; do sleep 1; done fi Index: sysvinit.spec =================================================================== RCS file: /cvs/extras/rpms/sysvinit/devel/sysvinit.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- sysvinit.spec 7 Mar 2008 18:23:11 -0000 1.66 +++ sysvinit.spec 11 Mar 2008 21:38:35 -0000 1.67 @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes Name: sysvinit Version: 2.86 -Release: 23 +Release: 24 License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz @@ -28,7 +28,7 @@ Patch20: sysvinit-selinux.patch Patch21: sysvinit-no-abort.patch Patch22: 81_killall_avoid_init.dpatch -Source1: change_console.c +Source1: change_console Source2: change_console.8 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pam >= 0.66-5 @@ -105,8 +105,6 @@ %build make %{?_smp_mflags} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" -C src -%{__cc} $RPM_OPT_FLAGS -o change_console -I./src %{SOURCE1} - %install rm -rf $RPM_BUILD_ROOT for I in bin sbin usr/{bin,include} %{_mandir}/man{1,3,5,8} etc var/run dev; do @@ -119,7 +117,7 @@ chmod 755 $RPM_BUILD_ROOT/usr/bin/utmpdump -install -m 755 change_console $RPM_BUILD_ROOT/sbin/change_console +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/change_console install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8/change_console.8 rm -f $RPM_BUILD_ROOT/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} @@ -178,6 +176,8 @@ %{_mandir}/man8/sulogin* %changelog +* Tue Mar 11 2008 Bill Nottingham - 2.86-24 +- * Fri Mar 7 2008 Bill Nottingham - 2.86-23 - move mountpoint to -tools subpackage - don't build sysvinit package itself From fedora-extras-commits at redhat.com Tue Mar 11 21:43:11 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 11 Mar 2008 21:43:11 GMT Subject: rpms/sysvinit/devel change_console,1.1,1.2 Message-ID: <200803112143.m2BLhBJl004682@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/sysvinit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4647 Modified Files: change_console Log Message: silence! Index: change_console =================================================================== RCS file: /cvs/extras/rpms/sysvinit/devel/change_console,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- change_console 11 Mar 2008 21:38:35 -0000 1.1 +++ change_console 11 Mar 2008 21:42:41 -0000 1.2 @@ -1,7 +1,7 @@ #!/bin/sh if [ "$1" = "-r" ]; then - /sbin/initctl pop-tty + /sbin/initctl pop-tty >/dev/null 2>&1 exit 0 fi @@ -17,7 +17,7 @@ TTY="$(/usr/bin/tty)" fi -/sbin/initctl push-tty $TTY +/sbin/initctl push-tty $TTY >/dev/null 2>&1 if [ $SHOULD_BLOCK -ne 0 ]; then while read; do sleep 1; done From fedora-extras-commits at redhat.com Tue Mar 11 21:45:33 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 21:45:33 GMT Subject: rpms/logjam/F-7 logjam.spec,1.37,1.38 Message-ID: <200803112145.m2BLjXoJ004817@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4746/F-7 Modified Files: logjam.spec Log Message: added libtool BR Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-7/logjam.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- logjam.spec 11 Mar 2008 21:29:46 -0000 1.37 +++ logjam.spec 11 Mar 2008 21:44:56 -0000 1.38 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -16,7 +16,7 @@ BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel BuildRequires: libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel -BuildRequires: autoconf, automake, intltool +BuildRequires: autoconf, automake, intltool, libtool Obsoletes: loserjabber, logjam-gnome BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch2: logjam-4.4.1-backdated.patch @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-18 +- seriously, this is getting old now. added libtool to BR. + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-17 - properly autotool From fedora-extras-commits at redhat.com Tue Mar 11 21:45:40 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 21:45:40 GMT Subject: rpms/logjam/F-8 logjam.spec,1.37,1.38 Message-ID: <200803112145.m2BLjeMS004831@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4746/F-8 Modified Files: logjam.spec Log Message: added libtool BR Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- logjam.spec 11 Mar 2008 21:29:53 -0000 1.37 +++ logjam.spec 11 Mar 2008 21:45:03 -0000 1.38 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -16,7 +16,7 @@ BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel BuildRequires: libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel -BuildRequires: autoconf, automake, intltool +BuildRequires: autoconf, automake, intltool, libtool Obsoletes: loserjabber, logjam-gnome BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch2: logjam-4.4.1-backdated.patch @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-18 +- seriously, this is getting old now. added libtool to BR. + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-17 - properly autotool From fedora-extras-commits at redhat.com Tue Mar 11 21:45:47 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 21:45:47 GMT Subject: rpms/logjam/devel logjam.spec,1.40,1.41 Message-ID: <200803112145.m2BLjlvl004834@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4746/devel Modified Files: logjam.spec Log Message: added libtool BR Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- logjam.spec 11 Mar 2008 21:29:55 -0000 1.40 +++ logjam.spec 11 Mar 2008 21:45:11 -0000 1.41 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -16,7 +16,7 @@ BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel BuildRequires: libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel -BuildRequires: autoconf, automake, intltool, popt-devel +BuildRequires: autoconf, automake, libtool, intltool, popt-devel Obsoletes: loserjabber, logjam-gnome BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch2: logjam-4.4.1-backdated.patch @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-18 +- seriously, this is getting old now. added libtool to BR. + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-17 - properly autotool From fedora-extras-commits at redhat.com Tue Mar 11 21:46:47 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Tue, 11 Mar 2008 21:46:47 GMT Subject: rpms/kernel/F-8 kernel.spec, 1.378, 1.379 linux-2.6-ps3_gelic_wireless.patch, 1.1, 1.2 linux-2.6-wireless.patch, 1.27, 1.28 linux-2.6-ps3-gelic-wireless.patch, 1.4, NONE Message-ID: <200803112146.m2BLklGZ005021@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4825 Modified Files: kernel.spec linux-2.6-ps3_gelic_wireless.patch linux-2.6-wireless.patch Removed Files: linux-2.6-ps3-gelic-wireless.patch Log Message: wireless fixes from 2008-03-11 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.378 retrieving revision 1.379 diff -u -r1.378 -r1.379 --- kernel.spec 11 Mar 2008 19:30:38 -0000 1.378 +++ kernel.spec 11 Mar 2008 21:45:58 -0000 1.379 @@ -1913,11 +1913,17 @@ %changelog +* Tue Mar 11 2008 John W. Linville 2.6.24.3-33 +- rt2x00: never disable multicast because it disables broadcast too +- rt2x00: Add new D-Link USB ID +- drivers/net/Kconfig: fix whitespace for GELIC_WIRELESS entry +- libertas: fix the 'compare command with itself' properly + * Tue Mar 11 2008 Chuck Ebbert 2.6.24.3-32 - Add missing debug patch. - Remove the fix for stray GPEs because it breaks ACPI (#436959) -* Tue Mar 11 2008 Dave Jones +* Tue Mar 11 2008 Dave Jones 2.6.24.3-31 - Print values when we overflow resource allocation. * Mon Mar 10 2008 John W. Linville 2.6.24.3-30 linux-2.6-ps3_gelic_wireless.patch: Index: linux-2.6-ps3_gelic_wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-ps3_gelic_wireless.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-ps3_gelic_wireless.patch 6 Mar 2008 16:22:39 -0000 1.1 +++ linux-2.6-ps3_gelic_wireless.patch 11 Mar 2008 21:45:58 -0000 1.2 @@ -1,3 +1,11 @@ +commit 97ed83905e5f8547a94a8066441351c6920728a1 +Author: John W. Linville +Date: Thu Mar 6 13:08:09 2008 -0500 + + drivers/net/Kconfig: fix whitespace for GELIC_WIRELESS entry + + Signed-off-by: John W. Linville + commit 4b74850dc3fb8a0941dde0f1bf7686803d1250cd Author: Masakazu Mokuno Date: Fri Feb 22 16:45:26 2008 +0900 @@ -13,6 +21,7 @@ Signed-off-by: Masakazu Mokuno Acked-by: Dan Williams Signed-off-by: John W. Linville + commit 09dde54c6a69d4f9ea1213923b93aeae7020f8b6 Author: Masakazu Mokuno Date: Thu Feb 7 19:58:57 2008 +0900 @@ -121,8 +130,8 @@ Signed-off-by: Jeff Garzik diff -up linux-2.6.24.noarch/drivers/net/Makefile.orig linux-2.6.24.noarch/drivers/net/Makefile ---- linux-2.6.24.noarch/drivers/net/Makefile.orig 2008-03-06 11:12:01.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/Makefile 2008-03-06 11:13:12.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/Makefile.orig 2008-03-11 17:20:03.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/Makefile 2008-03-11 17:21:47.000000000 -0400 @@ -67,7 +67,8 @@ obj-$(CONFIG_BNX2) += bnx2.o spidernet-y += spider_net.o spider_net_ethtool.o obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o @@ -134,8 +143,8 @@ obj-$(CONFIG_SKGE) += skge.o obj-$(CONFIG_SKY2) += sky2.o diff -up /dev/null linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c ---- /dev/null 2008-03-05 20:34:43.806375470 -0500 -+++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c 2008-03-06 11:13:20.000000000 -0500 +--- /dev/null 2008-03-11 08:47:01.722073547 -0400 ++++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c 2008-03-11 17:21:47.000000000 -0400 @@ -0,0 +1,2754 @@ +/* + * PS3 gelic network driver. @@ -2893,7 +2902,7 @@ +} diff -up linux-2.6.24.noarch/drivers/net/ps3_gelic_net.c.orig linux-2.6.24.noarch/drivers/net/ps3_gelic_net.c --- linux-2.6.24.noarch/drivers/net/ps3_gelic_net.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/ps3_gelic_net.c 2008-03-06 11:13:12.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/ps3_gelic_net.c 2008-03-11 17:21:47.000000000 -0400 @@ -46,29 +46,25 @@ #include @@ -4928,7 +4937,7 @@ diff -up linux-2.6.24.noarch/drivers/net/ps3_gelic_net.h.orig linux-2.6.24.noarch/drivers/net/ps3_gelic_net.h --- linux-2.6.24.noarch/drivers/net/ps3_gelic_net.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/ps3_gelic_net.h 2008-03-06 11:13:12.000000000 -0500 ++++ linux-2.6.24.noarch/drivers/net/ps3_gelic_net.h 2008-03-11 17:21:47.000000000 -0400 @@ -35,198 +35,323 @@ #define GELIC_NET_MAX_MTU VLAN_ETH_FRAME_LEN #define GELIC_NET_MIN_MTU VLAN_ETH_ZLEN @@ -5398,28 +5407,29 @@ #endif /* _GELIC_NET_H */ diff -up linux-2.6.24.noarch/drivers/net/Kconfig.orig linux-2.6.24.noarch/drivers/net/Kconfig ---- linux-2.6.24.noarch/drivers/net/Kconfig.orig 2008-03-06 11:12:01.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/Kconfig 2008-03-06 11:13:12.000000000 -0500 -@@ -2310,6 +2310,16 @@ config GELIC_NET +--- linux-2.6.24.noarch/drivers/net/Kconfig.orig 2008-03-11 17:20:03.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/Kconfig 2008-03-11 17:23:36.000000000 -0400 +@@ -2310,6 +2310,17 @@ config GELIC_NET To compile this driver as a module, choose M here: the module will be called ps3_gelic. +config GELIC_WIRELESS -+ bool "PS3 Wireless support" -+ depends on GELIC_NET -+ help -+ This option adds the support for the wireless feature of PS3. -+ If you have the wireless-less model of PS3 or have no plan to -+ use wireless feature, disabling this option saves memory. As -+ the driver automatically distinguishes the models, you can -+ safely enable this option even if you have a wireless-less model. ++ bool "PS3 Wireless support" ++ depends on GELIC_NET ++ select WIRELESS_EXT ++ help ++ This option adds the support for the wireless feature of PS3. ++ If you have the wireless-less model of PS3 or have no plan to ++ use wireless feature, disabling this option saves memory. As ++ the driver automatically distinguishes the models, you can ++ safely enable this option even if you have a wireless-less model. + config GIANFAR tristate "Gianfar Ethernet" depends on 85xx || 83xx || PPC_86xx diff -up /dev/null linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.h ---- /dev/null 2008-03-05 20:34:43.806375470 -0500 -+++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.h 2008-03-06 11:13:12.000000000 -0500 +--- /dev/null 2008-03-11 08:47:01.722073547 -0400 ++++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.h 2008-03-11 17:21:47.000000000 -0400 @@ -0,0 +1,329 @@ +/* + * PS3 gelic network driver. linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.27 -r 1.28 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless.patch,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- linux-2.6-wireless.patch 5 Mar 2008 01:41:45 -0000 1.27 +++ linux-2.6-wireless.patch 11 Mar 2008 21:45:58 -0000 1.28 @@ -1,3 +1,39 @@ +commit 445815d7ea4f59baf103f28b45f7dd45f21ff75d +Author: Ivo van Doorn +Date: Sun Mar 9 22:42:32 2008 +0100 + + rt2x00: Add new D-Link USB ID + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit fbb0a27a8ad56f822f479ee85446d9c29483a3d1 +Author: Adam Baker +Date: Sun Mar 9 22:40:40 2008 +0100 + + rt2x00: never disable multicast because it disables broadcast too + + On rt73 and rt61 disabling reception of multicast packets also disables + broadcast traffic which we never want to do. Therefore we should never + disable multicast. + + Signed-off-by: Adam Baker + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 5f0547c2813d4677908fa6de02f9911d25996515 +Author: Sebastian Siewior +Date: Thu Mar 6 10:30:21 2008 +0100 + + libertas: fix the 'compare command with itself' properly + + |libertas: Invalid CMD_RESP 8012 to command 50! + + The special case got mixed up in 8a96df80b3. + + Signed-off-by: Sebastian Siewior + Signed-off-by: John W. Linville + commit c256e05b7b30fab484deacb4f8cff59ce649c75e Author: Michael Buesch Date: Tue Mar 4 20:31:13 2008 +0100 @@ -8220,8 +8256,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.24.noarch/include/linux/nl80211.h.orig linux-2.6.24.noarch/include/linux/nl80211.h ---- linux-2.6.24.noarch/include/linux/nl80211.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/nl80211.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/nl80211.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/nl80211.h 2008-03-11 17:07:48.000000000 -0400 @@ -7,6 +7,18 @@ */ @@ -8423,8 +8459,8 @@ + #endif /* __LINUX_NL80211_H */ diff -up linux-2.6.24.noarch/include/linux/wireless.h.orig linux-2.6.24.noarch/include/linux/wireless.h ---- linux-2.6.24.noarch/include/linux/wireless.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/wireless.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/wireless.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/wireless.h 2008-03-11 17:07:48.000000000 -0400 @@ -541,6 +541,16 @@ /* Maximum size of returned data */ #define IW_SCAN_MAX_DATA 4096 /* In bytes */ @@ -8453,8 +8489,8 @@ __u32 event_capa[6]; diff -up linux-2.6.24.noarch/include/linux/input.h.orig linux-2.6.24.noarch/include/linux/input.h ---- linux-2.6.24.noarch/include/linux/input.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/input.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/input.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/input.h 2008-03-11 17:07:48.000000000 -0400 @@ -371,6 +371,8 @@ struct input_absinfo { #define KEY_BRIGHTNESS_ZERO 244 /* brightness off, use ambient */ #define KEY_DISPLAY_OFF 245 /* display device to off state */ @@ -8465,8 +8501,8 @@ #define BTN_0 0x100 #define BTN_1 0x101 diff -up linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig linux-2.6.24.noarch/include/linux/mod_devicetable.h ---- linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/mod_devicetable.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/mod_devicetable.h 2008-03-11 17:07:48.000000000 -0400 @@ -350,7 +350,13 @@ struct sdio_device_id { struct ssb_device_id { __u16 vendor; @@ -8483,8 +8519,8 @@ #define SSB_DEVICE(_vendor, _coreid, _revision) \ { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } diff -up linux-2.6.24.noarch/include/linux/pci_ids.h.orig linux-2.6.24.noarch/include/linux/pci_ids.h ---- linux-2.6.24.noarch/include/linux/pci_ids.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/pci_ids.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/pci_ids.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/pci_ids.h 2008-03-11 17:07:48.000000000 -0400 @@ -2078,6 +2078,9 @@ #define PCI_DEVICE_ID_ALTIMA_AC9100 0x03ea #define PCI_DEVICE_ID_ALTIMA_AC1003 0x03eb @@ -8496,8 +8532,8 @@ #define PCI_VENDOR_ID_ARECA 0x17d3 diff -up linux-2.6.24.noarch/include/linux/ieee80211.h.orig linux-2.6.24.noarch/include/linux/ieee80211.h ---- linux-2.6.24.noarch/include/linux/ieee80211.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/ieee80211.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/ieee80211.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ieee80211.h 2008-03-11 17:07:48.000000000 -0400 @@ -54,6 +54,8 @@ #define IEEE80211_STYPE_ACTION 0x00D0 @@ -8728,8 +8764,8 @@ #define WLAN_CIPHER_SUITE_USE_GROUP 0x000FAC00 #define WLAN_CIPHER_SUITE_WEP40 0x000FAC01 diff -up linux-2.6.24.noarch/include/linux/rfkill.h.orig linux-2.6.24.noarch/include/linux/rfkill.h ---- linux-2.6.24.noarch/include/linux/rfkill.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/rfkill.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/rfkill.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/rfkill.h 2008-03-11 17:07:48.000000000 -0400 @@ -33,11 +33,13 @@ * RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device. * RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device. @@ -8745,8 +8781,8 @@ }; diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-03-11 17:07:48.000000000 -0400 @@ -51,9 +51,12 @@ #define SSB_CHIPCO_CAP_JTAGM 0x00400000 /* JTAG master present */ #define SSB_CHIPCO_CAP_BROM 0x00800000 /* Internal boot ROM active */ @@ -8791,8 +8827,8 @@ #ifdef CONFIG_SSB_SERIAL extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc, diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h 2008-03-11 17:07:48.000000000 -0400 @@ -171,11 +171,15 @@ extern void ssb_extif_get_clockcontrol(s extern void ssb_extif_timing_init(struct ssb_extif *extif, unsigned long ns); @@ -8826,8 +8862,8 @@ #endif /* CONFIG_SSB_DRIVER_EXTIF */ #endif /* LINUX_SSB_EXTIFCORE_H_ */ diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h 2008-03-11 17:07:48.000000000 -0400 @@ -147,6 +147,10 @@ #define SSB_IDLOW_SSBREV 0xF0000000 /* Sonics Backplane Revision code */ #define SSB_IDLOW_SSBREV_22 0x00000000 /* <= 2.2 */ @@ -8959,8 +8995,8 @@ enum { SSB_SPROM1CCODE_WORLD = 0, diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h 2008-03-11 17:07:48.000000000 -0400 @@ -51,6 +51,11 @@ #define SSB_PCICORE_SBTOPCI1_MASK 0xFC000000 #define SSB_PCICORE_SBTOPCI2 0x0108 /* Backplane to PCI translation 2 (sbtopci2) */ @@ -8974,8 +9010,8 @@ /* SBtoPCIx */ #define SSB_PCICORE_SBTOPCI_MEM 0x00000000 diff -up linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb.h 2008-03-11 17:07:48.000000000 -0400 @@ -15,22 +15,19 @@ struct pcmcia_device; struct ssb_bus; struct ssb_driver; @@ -9155,8 +9191,8 @@ diff -up /dev/null linux-2.6.24.noarch/include/linux/ssb/ssb_embedded.h ---- /dev/null 2008-03-04 08:34:47.546307750 -0500 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_embedded.h 2008-03-04 20:16:04.000000000 -0500 +--- /dev/null 2008-03-11 08:47:01.722073547 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_embedded.h 2008-03-11 17:07:48.000000000 -0400 @@ -0,0 +1,18 @@ +#ifndef LINUX_SSB_EMBEDDED_H_ +#define LINUX_SSB_EMBEDDED_H_ @@ -9177,8 +9213,8 @@ + +#endif /* LINUX_SSB_EMBEDDED_H_ */ diff -up linux-2.6.24.noarch/include/net/cfg80211.h.orig linux-2.6.24.noarch/include/net/cfg80211.h ---- linux-2.6.24.noarch/include/net/cfg80211.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/include/net/cfg80211.h 2008-03-04 20:16:04.000000000 -0500 +--- linux-2.6.24.noarch/include/net/cfg80211.h.orig 2008-03-11 17:07:29.000000000 -0400 ++++ linux-2.6.24.noarch/include/net/cfg80211.h 2008-03-11 17:07:48.000000000 -0400 @@ -49,6 +49,120 @@ extern int ieee80211_radiotap_iterator_n [...2911 lines suppressed...] #ifdef PRISM2_PCI @@ -129034,8 +129082,8 @@ local->hw_downloading = 1; diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-03-11 17:07:49.000000000 -0400 @@ -845,15 +845,13 @@ static struct pcmcia_device_id hostap_cs 0x4b801a17), PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", @@ -129073,8 +129121,8 @@ }; MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids); diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-03-11 17:07:49.000000000 -0400 @@ -1075,7 +1075,7 @@ static int prism2_setup_rids(struct net_ { struct hostap_interface *iface; @@ -129161,8 +129209,8 @@ goto out; } diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-03-11 17:07:49.000000000 -0400 @@ -296,7 +296,7 @@ int hostap_tx_callback_unregister(local_ int hostap_set_word(struct net_device *dev, int rid, u16 val) { @@ -129191,8 +129239,8 @@ wireless_send_event(local->dev, SIOCGIWAP, &wrqu, NULL); return ret; diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c 2008-03-11 17:07:49.000000000 -0400 @@ -303,7 +303,7 @@ static void prism2_info_hostscanresults( int i, result_size, copy_len, new_count; struct hfa384x_hostscan_result *results, *prev; @@ -129231,8 +129279,8 @@ for (i = 0; i < (left < 100 ? left : 100); i++) PDEBUG2(DEBUG_EXTRA, " %02x", buf[i]); diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h 2008-03-11 17:07:49.000000000 -0400 @@ -5,52 +5,52 @@ #include @@ -129316,8 +129364,8 @@ enum { PRISM2_RX_MONITOR, PRISM2_RX_MGMT, PRISM2_RX_NON_ASSOC, diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-03-11 17:07:49.000000000 -0400 @@ -84,7 +84,7 @@ static int prism2_get_datarates(struct n if (len < 2) return 0; @@ -129582,8 +129630,8 @@ reason = cpu_to_le16(param->u.mlme.reason_code); switch (param->u.mlme.cmd) { diff -up linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c.orig linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c ---- linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c 2008-03-11 17:07:49.000000000 -0400 @@ -27,6 +27,8 @@ static const struct pci_device_id b43_pc { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) }, @@ -129594,8 +129642,8 @@ }; MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl); diff -up linux-2.6.24.noarch/drivers/ssb/Makefile.orig linux-2.6.24.noarch/drivers/ssb/Makefile ---- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-03-11 17:07:49.000000000 -0400 @@ -1,5 +1,6 @@ # core ssb-y += main.o scan.o @@ -129612,8 +129660,8 @@ obj-$(CONFIG_SSB) += ssb.o diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c ---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-11 17:07:49.000000000 -0400 @@ -94,7 +94,6 @@ int ssb_pcmcia_switch_core(struct ssb_bu struct ssb_device *dev) { @@ -129764,8 +129812,8 @@ } diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c ---- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-11 17:07:49.000000000 -0400 @@ -557,6 +557,7 @@ static int ssb_fetch_invariants(struct s goto out; memcpy(&bus->boardinfo, &iv.boardinfo, sizeof(iv.boardinfo)); @@ -129809,8 +129857,8 @@ } return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23); diff -up linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig linux-2.6.24.noarch/drivers/ssb/ssb_private.h ---- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-03-11 17:07:49.000000000 -0400 @@ -120,10 +120,10 @@ extern int ssb_devices_thaw(struct ssb_b extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev); @@ -129825,8 +129873,8 @@ { return 0; diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c ---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-11 17:07:49.000000000 -0400 @@ -212,29 +212,29 @@ static inline u8 ssb_crc8(u8 crc, u8 dat return t[crc ^ data]; } @@ -130272,8 +130320,8 @@ err = -EINVAL; goto out_kfree; diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c ---- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-11 17:07:49.000000000 -0400 @@ -39,12 +39,14 @@ static inline void chipco_write32(struct ssb_write32(cc->dev, offset, value); } @@ -130395,8 +130443,8 @@ else uart_regs += (i * 256); diff -up linux-2.6.24.noarch/drivers/ssb/Kconfig.orig linux-2.6.24.noarch/drivers/ssb/Kconfig ---- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-03-11 17:07:49.000000000 -0400 @@ -35,6 +35,11 @@ config SSB_PCIHOST If unsure, say Y @@ -130423,8 +130471,8 @@ bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)" depends on SSB_DRIVER_MIPS && EXPERIMENTAL diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/embedded.c ---- /dev/null 2008-03-04 08:34:47.546307750 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/embedded.c 2008-03-04 20:16:08.000000000 -0500 +--- /dev/null 2008-03-11 08:47:01.722073547 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/embedded.c 2008-03-11 17:07:49.000000000 -0400 @@ -0,0 +1,132 @@ +/* + * Sonics Silicon Backplane @@ -130559,8 +130607,8 @@ +} +EXPORT_SYMBOL(ssb_gpio_polarity); diff -up linux-2.6.24.noarch/drivers/ssb/driver_extif.c.orig linux-2.6.24.noarch/drivers/ssb/driver_extif.c ---- linux-2.6.24.noarch/drivers/ssb/driver_extif.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/driver_extif.c 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/driver_extif.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/driver_extif.c 2008-03-11 17:07:49.000000000 -0400 @@ -27,12 +27,14 @@ static inline void extif_write32(struct ssb_write32(extif->dev, offset, value); } @@ -130617,8 +130665,8 @@ + return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value); +} diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c ---- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-04 20:16:58.000000000 -0500 +--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-11 17:07:49.000000000 -0400 @@ -11,6 +11,7 @@ #include #include @@ -130744,8 +130792,8 @@ * values. Not waiting at this point causes crashes of the machine. */ mdelay(10); diff -up linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt ---- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-03-04 20:16:08.000000000 -0500 +--- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-03-11 17:07:30.000000000 -0400 ++++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-03-11 17:07:49.000000000 -0400 @@ -332,4 +332,36 @@ Why: This driver has been marked obsolet 2.4 or later kernels, provides richer features and is more robust. Who: Stephen Hemminger --- linux-2.6-ps3-gelic-wireless.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 21:50:17 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 11 Mar 2008 21:50:17 GMT Subject: rpms/initscripts/devel .cvsignore, 1.136, 1.137 initscripts.spec, 1.160, 1.161 sources, 1.151, 1.152 Message-ID: <200803112150.m2BLoH83005273@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/initscripts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5210 Modified Files: .cvsignore initscripts.spec sources Log Message: 8.67-1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- .cvsignore 11 Mar 2008 19:29:49 -0000 1.136 +++ .cvsignore 11 Mar 2008 21:49:40 -0000 1.137 @@ -1 +1 @@ -initscripts-8.66.tar.bz2 +initscripts-8.67.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- initscripts.spec 11 Mar 2008 19:29:49 -0000 1.160 +++ initscripts.spec 11 Mar 2008 21:49:40 -0000 1.161 @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.66 +Version: 8.67 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -28,7 +28,6 @@ Conflicts: alsa-utils < 1.0.14-0.5.rc2.fc7 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 -Conflicts: rhgb < 0.17.7-7 Obsoletes: rhsound sapinit Obsoletes: hotplug Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, coreutils @@ -217,6 +216,9 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 11 2008 Bill Nottingham - 8.67-1 +- actually, don't + * Tue Mar 11 2008 Bill Nottingham - 8.66-1 - use upstart to start rhgb (#433156, ) Index: sources =================================================================== RCS file: /cvs/extras/rpms/initscripts/devel/sources,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- sources 11 Mar 2008 19:29:49 -0000 1.151 +++ sources 11 Mar 2008 21:49:40 -0000 1.152 @@ -1 +1 @@ -f34d2229b3e3b01bfbb8ad77a8292691 initscripts-8.66.tar.bz2 +dec2a843e785d3712436b3abfc490b7a initscripts-8.67.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 21:50:44 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Tue, 11 Mar 2008 21:50:44 GMT Subject: rpms/rhgb/devel rhgb.spec, 1.92, 1.93 rhgb-0.17.7-nodaemon-option.patch, 1.1, NONE rhgb.upstart-job, 1.1, NONE Message-ID: <200803112150.m2BLoiON005283@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/rhgb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5166 Modified Files: rhgb.spec Removed Files: rhgb-0.17.7-nodaemon-option.patch rhgb.upstart-job Log Message: - undo the last two changes for now. We're going to make upstart emulate the old init environment instead of fix rhgb Index: rhgb.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhgb/devel/rhgb.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- rhgb.spec 11 Mar 2008 20:09:19 -0000 1.92 +++ rhgb.spec 11 Mar 2008 21:50:12 -0000 1.93 @@ -3,11 +3,10 @@ Summary: Red Hat Graphical Boot Name: rhgb Version: 0.17.7 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz -Source1: rhgb.upstart-job License: GPLv2 Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,7 +20,6 @@ Requires: inotify-tools Patch0: rhgb-0.17.7-strict-exit.patch Patch1: rhgb-0.17.7-dri.patch -Patch2: rhgb-0.17.7-nodaemon-option.patch %description Red Hat Graphical Boot provides a clean and simple interface to the boot process @@ -30,7 +28,6 @@ %setup -q %patch0 -p1 -b .strict-exit %patch1 -p1 -b .dri -%patch2 -p1 -b .nodaemon-option %build %configure @@ -43,8 +40,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/event.d/ -cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/event.d/rhgb %find_lang %{gettext_package} @@ -63,6 +58,10 @@ %dir %{_sysconfdir}/rhgb/temp %changelog +* Tue Mar 11 2008 Ray Strode - 1:0.17.7-9 +- undo the last two changes for now. We're going to make upstart + emulate the old init environment instead of fix rhgb + * Tue Mar 11 2008 Bill Nottingham - 1:0.17.7-8 - fix upstart job to work with selinux --- rhgb-0.17.7-nodaemon-option.patch DELETED --- --- rhgb.upstart-job DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 21:59:06 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 21:59:06 GMT Subject: rpms/logjam/devel logjam-4.5.3-tags.patch, 1.3, 1.4 logjam.spec, 1.41, 1.42 Message-ID: <200803112159.m2BLx6tR005624@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5596 Modified Files: logjam-4.5.3-tags.patch logjam.spec Log Message: one more autoconf change logjam-4.5.3-tags.patch: Index: logjam-4.5.3-tags.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam-4.5.3-tags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- logjam-4.5.3-tags.patch 11 Mar 2008 21:06:22 -0000 1.3 +++ logjam-4.5.3-tags.patch 11 Mar 2008 21:58:59 -0000 1.4 @@ -1,6 +1,6 @@ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,18 @@ +/* liblivejournal - a client library for LiveJournal. + * Copyright (C) 2003 Evan Martin @@ -22,7 +22,7 @@ +#endif /* __LIVEJOURNAL_TAGS_H__ */ diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c --- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags 2005-10-23 21:29:32.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 17:53:46.000000000 -0400 @@ -14,6 +14,7 @@ #include "entry.h" @@ -52,7 +52,7 @@ char *text = NULL; diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am --- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags 2005-08-24 22:42:14.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 17:53:46.000000000 -0400 @@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ liblivejournal_la_SOURCES = \ md5.c md5.h \ @@ -72,7 +72,7 @@ livejournal.h diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h --- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags 2005-02-21 12:46:10.000000000 -0500 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 17:53:46.000000000 -0400 @@ -16,5 +16,6 @@ #include #include @@ -82,7 +82,7 @@ #endif /* __LIVEJOURNAL_H__ */ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,16 @@ + +#ifndef __LIVEJOURNAL_GETTAGS_H__ @@ -102,7 +102,7 @@ + diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,65 @@ + +#include @@ -169,9 +169,55 @@ + g_free(gettags); +} + +diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in +--- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags 2006-01-19 03:18:52.000000000 -0500 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in 2008-03-11 17:57:21.000000000 -0400 +@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ + liblivejournal_la_SOURCES = \ + md5.c md5.h \ + protocol.c protocol.h \ +- friends.h \ ++ friends.h tags.h \ + serveruser.c serveruser.h \ + entry.c entry.h \ + types.c types.h \ +@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \ + getchallenge.c getchallenge.h \ + getevents.c getevents.h \ + getfriends.c getfriends.h \ ++ gettags.c gettags.h \ + syncitems.c syncitems.h \ + sync.c sync.h \ + livejournal.h +@@ -182,7 +183,7 @@ liblivejournal_la_DEPENDENCIES = + am_liblivejournal_la_OBJECTS = md5.lo protocol.lo serveruser.lo entry.lo \ + types.lo verb.lo login.lo checkfriends.lo consolecommand.lo \ + editfriends.lo editfriendgroups.lo editpostevent.lo \ +- getchallenge.lo getevents.lo getfriends.lo syncitems.lo sync.lo ++ getchallenge.lo getevents.lo getfriends.lo gettags.lo syncitems.lo sync.lo + liblivejournal_la_OBJECTS = $(am_liblivejournal_la_OBJECTS) + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -194,7 +195,7 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@ ./$(DEPDIR)/editfriends.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/editpostevent.Plo ./$(DEPDIR)/entry.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/getchallenge.Plo \ +- at AMDEP_TRUE@ ./$(DEPDIR)/getevents.Plo \ ++ at AMDEP_TRUE@ ./$(DEPDIR)/getevents.Plo ./$(DEPDIR)/gettags.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/getfriends.Plo ./$(DEPDIR)/login.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/md5.Plo ./$(DEPDIR)/protocol.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/serveruser.Plo ./$(DEPDIR)/sync.Plo \ +@@ -247,6 +248,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getchallenge.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getevents.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getfriends.Plo at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gettags.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/login.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/protocol.Plo at am__quote@ diff -up /dev/null logjam-4.5.3/src/tags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.c 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/tags.c 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,181 @@ + +#include "gtk-all.h" @@ -356,7 +402,7 @@ +} diff -up /dev/null logjam-4.5.3/src/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/tags.h 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef _TAGS_H_ +#define _TAGS_H_ @@ -366,7 +412,7 @@ +#endif /* _TAGS_H_ */ diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am --- logjam-4.5.3/src/Makefile.am.tags 2005-10-23 21:16:08.000000000 -0400 -+++ logjam-4.5.3/src/Makefile.am 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/Makefile.am 2008-03-11 17:53:46.000000000 -0400 @@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. undo.c undo.h \ userlabel.c userlabel.h \ @@ -375,9 +421,29 @@ $(HTML_MARKUP) src_preview = $(PREVIEW) +diff -up logjam-4.5.3/src/Makefile.in.tags logjam-4.5.3/src/Makefile.in +--- logjam-4.5.3/src/Makefile.in.tags 2006-01-19 03:18:44.000000000 -0500 ++++ logjam-4.5.3/src/Makefile.in 2008-03-11 17:53:46.000000000 -0400 +@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. + undo.c undo.h \ + userlabel.c userlabel.h \ + get_cmd_out.c get_cmd_out.h \ ++ tags.c tags.h \ + $(HTML_MARKUP) + + +@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini + login.c login.h manager.c spawn.c spawn.h icons.c icons.h \ + music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \ + pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \ +- userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \ ++ userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \ + html_markup.h network-win32.c network-fork.c network-soup.c \ + network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \ + docklet.c preview.c preview.h journalstore-sqlite.c \ diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c ---- logjam-4.5.3/src/jamview.c.tags 2008-03-11 16:17:54.000000000 -0400 -+++ logjam-4.5.3/src/jamview.c 2008-03-11 16:18:24.000000000 -0400 +--- logjam-4.5.3/src/jamview.c.tags 2008-03-11 17:53:46.000000000 -0400 ++++ logjam-4.5.3/src/jamview.c 2008-03-11 17:53:46.000000000 -0400 @@ -19,6 +19,7 @@ #include "security.h" #include "marshalers.h" @@ -421,43 +487,3 @@ gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1); gtk_widget_show_all(view->tagsbar); } -diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in ---- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD 2008-03-11 17:02:35.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in 2008-03-11 17:03:49.000000000 -0400 -@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ - liblivejournal_la_SOURCES = \ - md5.c md5.h \ - protocol.c protocol.h \ -- friends.h \ -+ friends.h tags.h \ - serveruser.c serveruser.h \ - entry.c entry.h \ - types.c types.h \ -@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \ - getchallenge.c getchallenge.h \ - getevents.c getevents.h \ - getfriends.c getfriends.h \ -+ gettags.c gettags.h \ - syncitems.c syncitems.h \ - sync.c sync.h \ - livejournal.h -diff -up logjam-4.5.3/src/Makefile.in.BAD logjam-4.5.3/src/Makefile.in ---- logjam-4.5.3/src/Makefile.in.BAD 2008-03-11 17:01:21.000000000 -0400 -+++ logjam-4.5.3/src/Makefile.in 2008-03-11 17:01:52.000000000 -0400 -@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. - undo.c undo.h \ - userlabel.c userlabel.h \ - get_cmd_out.c get_cmd_out.h \ -+ tags.c tags.h \ - $(HTML_MARKUP) - - -@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini - login.c login.h manager.c spawn.c spawn.h icons.c icons.h \ - music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \ - pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \ -- userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \ -+ userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \ - html_markup.h network-win32.c network-fork.c network-soup.c \ - network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \ - docklet.c preview.c preview.h journalstore-sqlite.c \ Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- logjam.spec 11 Mar 2008 21:45:11 -0000 1.41 +++ logjam.spec 11 Mar 2008 21:58:59 -0000 1.42 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-19 +- i'm going to beat autoconf + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-18 - seriously, this is getting old now. added libtool to BR. From fedora-extras-commits at redhat.com Tue Mar 11 22:16:56 2008 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Tue, 11 Mar 2008 22:16:56 GMT Subject: rpms/php-pear/devel install-pear.php, 1.1, 1.2 macros.pear, 1.3, 1.4 php-pear.spec, 1.31, 1.32 Message-ID: <200803112216.m2BMGumh013285@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/pkgs/rpms/php-pear/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13199 Modified Files: install-pear.php macros.pear php-pear.spec Log Message: Set cfg_dir to be %{_sysconfdir}/pear (and own it) Update install-pear.php script Add %%pear_cfgdir and %%pear_wwwdir macros Index: install-pear.php =================================================================== RCS file: /cvs/pkgs/rpms/php-pear/devel/install-pear.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- install-pear.php 19 Jul 2007 18:31:05 -0000 1.1 +++ install-pear.php 11 Mar 2008 22:16:25 -0000 1.2 @@ -46,6 +46,9 @@ } elseif ($arg == '-b') { $bin_dir = $argv[$i+1]; $i++; + } elseif ($arg == '-c') { + $cfg_dir = $argv[$i+1]; + $i++; } elseif ($arg == '-p') { $php_bin = $argv[$i+1]; $i++; @@ -58,6 +61,11 @@ $config = PEAR_Config::singleton(); +if (PEAR::isError($config)) { + $locs = PEAR_Config::getDefaultConfigFiles(); + die("ERROR: One of $locs[user] or $locs[system] is corrupt, please remove them and try again"); +} + // make sure we use only default values $config_layers = $config->getLayers(); foreach ($config_layers as $layer) { @@ -74,6 +82,12 @@ if (!empty($bin_dir)) { $config->set('bin_dir', $bin_dir, 'default'); } + +// Config files +if (!empty($cfg_dir)) { + $config->set('cfg_dir', $cfg_dir, 'default'); +} + // User supplied a dir prefix if (!empty($with_dir)) { $ds = DIRECTORY_SEPARATOR; Index: macros.pear =================================================================== RCS file: /cvs/pkgs/rpms/php-pear/devel/macros.pear,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- macros.pear 16 Jul 2007 17:00:49 -0000 1.3 +++ macros.pear 11 Mar 2008 22:16:25 -0000 1.4 @@ -11,6 +11,8 @@ %pear_docdir %(%{__pear} config-get doc_dir 2> /dev/null || echo undefined) %pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined) %pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined) +%pear_cfgdir %(%{__pear} config-get cfg_dir 2> /dev/null || echo undefined) +%pear_wwwdir %(%{__pear} config-get www_dir 2> /dev/null || echo undefined) # # Define PECL directories used in php-pecl-* spec files: Index: php-pear.spec =================================================================== RCS file: /cvs/pkgs/rpms/php-pear/devel/php-pear.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- php-pear.spec 3 Feb 2008 17:45:23 -0000 1.31 +++ php-pear.spec 11 Mar 2008 22:16:25 -0000 1.32 @@ -9,13 +9,13 @@ Summary: PHP Extension and Application Repository framework Name: php-pear Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: PHP Group: Development/Languages URL: http://pear.php.net/package/PEAR Source0: http://download.pear.php.net/package/PEAR-%{version}.tgz -# wget http://cvs.php.net/viewvc.cgi/pear-core/install-pear.php?revision=1.30 -O install-pear.php +# wget http://cvs.php.net/viewvc.cgi/pear-core/install-pear.php?revision=1.31 -O install-pear.php Source1: install-pear.php Source2: relocate.php Source3: strip.php @@ -75,13 +75,15 @@ install -d $RPM_BUILD_ROOT%{peardir} \ $RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear \ $RPM_BUILD_ROOT%{peardir}/.pkgxml \ - $RPM_BUILD_ROOT%{_sysconfdir}/rpm + $RPM_BUILD_ROOT%{_sysconfdir}/rpm \ + $RPM_BUILD_ROOT%{_sysconfdir}/pear export INSTALL_ROOT=$RPM_BUILD_ROOT %{_bindir}/php -n -dmemory_limit=32M -dshort_open_tag=0 -dsafe_mode=0 \ -derror_reporting=E_ALL -ddetect_unicode=0 \ %{SOURCE1} -d %{peardir} \ + -c %{_sysconfdir}/pear \ -b %{_bindir} \ %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE20} @@ -130,9 +132,15 @@ %config(noreplace) %{_sysconfdir}/pear.conf %config %{_sysconfdir}/rpm/macros.pear %dir %{_localstatedir}/cache/php-pear +%dir %{_sysconfdir}/pear %doc LICENSE README %changelog +* Tue Mar 11 2008 Tim Jackson 1:1.7.1-2 +- Set cfg_dir to be %{_sysconfdir}/pear (and own it) +- Update install-pear.php script +- Add %%pear_cfgdir and %%pear_wwwdir macros + * Sun Feb 3 2008 Remi Collet 1:1.7.1-1 - update to 1.7.1 From fedora-extras-commits at redhat.com Tue Mar 11 22:18:35 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 11 Mar 2008 22:18:35 GMT Subject: rpms/sysvinit/devel sysvinit.spec,1.67,1.68 Message-ID: <200803112218.m2BMIZYu013347@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/sysvinit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13315 Modified Files: sysvinit.spec Log Message: where did that changelog go? Index: sysvinit.spec =================================================================== RCS file: /cvs/extras/rpms/sysvinit/devel/sysvinit.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- sysvinit.spec 11 Mar 2008 21:38:35 -0000 1.67 +++ sysvinit.spec 11 Mar 2008 22:18:02 -0000 1.68 @@ -177,7 +177,9 @@ %changelog * Tue Mar 11 2008 Bill Nottingham - 2.86-24 -- +- replace change_console with a script that does the proper upstart + machinations + * Fri Mar 7 2008 Bill Nottingham - 2.86-23 - move mountpoint to -tools subpackage - don't build sysvinit package itself From fedora-extras-commits at redhat.com Tue Mar 11 22:26:14 2008 From: fedora-extras-commits at redhat.com (sami wagiaalla (swagiaal)) Date: Tue, 11 Mar 2008 22:26:14 GMT Subject: rpms/frysk/devel .cvsignore,1.50,1.51 sources,1.50,1.51 Message-ID: <200803112226.m2BMQEAd013563@cvs-int.fedora.redhat.com> Author: swagiaal Update of /cvs/pkgs/rpms/frysk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13524 Modified Files: .cvsignore sources Log Message: Update source. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/frysk/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 29 Feb 2008 22:23:06 -0000 1.50 +++ .cvsignore 11 Mar 2008 22:25:42 -0000 1.51 @@ -1 +1 @@ -frysk-0.0.1.2008.02.29.rh1.tar.bz2 +frysk-0.0.1.2008.03.11.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/frysk/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 29 Feb 2008 22:23:06 -0000 1.50 +++ sources 11 Mar 2008 22:25:42 -0000 1.51 @@ -1 +1 @@ -cd09c4476bb491dd9b32e48e6db7be41 frysk-0.0.1.2008.02.29.rh1.tar.bz2 +02eef864289cf4c8ca30e8cdcab868c7 frysk-0.0.1.2008.03.11.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 22:45:38 2008 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 11 Mar 2008 22:45:38 GMT Subject: rpms/nant/devel nant-app.patch, 1.4, 1.5 nant.spec, 1.14, 1.15 nant-0.86-app-libdir.patch, 1.1, NONE Message-ID: <200803112245.m2BMjcXx014150@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/pkgs/rpms/nant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14118/devel Modified Files: nant.spec Added Files: nant-app.patch Removed Files: nant-0.86-app-libdir.patch Log Message: Nant now works! nant-app.patch: Index: nant-app.patch =================================================================== RCS file: nant-app.patch diff -N nant-app.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nant-app.patch 11 Mar 2008 22:45:37 -0000 1.5 @@ -0,0 +1,419 @@ +--- nant-0.86-beta1/src/NAnt.Console/App.config 2007-12-08 10:30:44.000000000 +0000 ++++ nant-0.86-beta1/src/NAnt.Console/App.config-new 2008-03-06 23:42:35.000000000 +0000 +@@ -776,8 +776,8 @@ + > + + +- +- ++ ++ + + + +@@ -976,8 +976,8 @@ + > + + +- +- ++ ++ + + + +@@ -1141,153 +1141,7 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- true +- +- +- gmcs +- true +- linq +- true +- true +- true +- true +- true +- true +- true +- +- +- mjs +- strict +- +- +- vbnc +- true +- +- +- true +- true +- +- +- sn +- true +- +- +- false +- +- +- true +- +- +- ++ + + + +- ++ + + + +@@ -1479,13 +1333,13 @@ + description="Mono 1.0 Profile" + sdkdirectory="${toolDirectory}" + frameworkdirectory="${toolDirectory}" +- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/1.0')}" ++ frameworkassemblydirectory="${path::combine(prefix, '@LIB@///mono/1.0')}" + clrversion="1.1.4322" + > + + +- +- ++ ++ + + + +@@ -1500,7 +1354,7 @@ + + + +- ++ + + + +@@ -1525,7 +1379,7 @@ + + + +- ++ + + + +@@ -1535,7 +1389,7 @@ + true + + +- ${path::combine(prefix, 'lib/mono/1.0/mcs.exe')} ++ ${path::combine(prefix, '@LIB@///mono/1.0/mcs.exe')} + true + true + true +@@ -1550,7 +1404,7 @@ + true + + +- ${path::combine(prefix, 'lib/mono/1.0/mbas.exe')} ++ ${path::combine(prefix, '@LIB@///mono/1.0/mbas.exe')} + true + + +@@ -1576,13 +1430,13 @@ + description="Mono 2.0 Profile" + sdkdirectory="${toolDirectory}" + frameworkdirectory="${toolDirectory}" +- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}" ++ frameworkassemblydirectory="${path::combine(prefix, '@LIB@///mono/2.0')}" + clrversion="2.0.50727" + > + + +- +- ++ ++ + + + +@@ -1597,7 +1451,7 @@ + + + +- ++ + + + +@@ -1610,7 +1464,7 @@ + + + +- ++ + + + +@@ -1624,7 +1478,7 @@ + + + +- ++ + + + +@@ -1673,104 +1527,7 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. +- +- +- +- +- +- +- +- true +- +- +- gmcs +- true +- linq +- true +- true +- true +- true +- true +- true +- true +- +- +- mjs +- strict +- +- +- vbnc +- true +- +- +- true +- true +- +- +- sn +- true +- +- +- false +- +- +- true +- +- +- ++ + + + +- ++ + + + +@@ -1814,15 +1571,15 @@ + + + +- +- ++ ++ + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + +- ++ + + + Index: nant.spec =================================================================== RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- nant.spec 24 Feb 2008 22:00:52 -0000 1.14 +++ nant.spec 11 Mar 2008 22:45:37 -0000 1.15 @@ -1,15 +1,14 @@ %define debug_package %{nil} - %define monodir %{_libdir} %define mlib %{_lib} Summary: NAnt is a build tool for Mono and .NET Name: nant -Version: 0.86 -Release: 2%{?dist} +Version: 0.86 +Release: 5%{?dist} Source0: http://download.sourceforge.net/nant/%{name}-%{version}-beta1-src.tar.gz Patch0: nant-build.patch -Patch1: nant-0.86-app-libdir.patch +Patch1: nant-app.patch License: GPL Group: Development/Tools Url: http://nant.sourceforge.net/ @@ -17,7 +16,7 @@ BuildRequires: mono-devel Requires(post): scrollkeeper Requires(postun): scrollkeeper -ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc +ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha %description NAnt is a free .NET build tool. In theory it is kind of like make @@ -29,13 +28,13 @@ Requires: %{name} = %{version}-%{release} %description docs -Documentation of nant +Documentation for nant %prep %setup -q -n %{name}-%{version}-beta1 -sed -i -e "s/@LIBDIR@/%{mlib}/" %{PATCH1} +sed -i -e 's!@LIB@!%{_lib}!' %{PATCH1} %patch1 -p1 -b .orig -sed -i -e "s/%{mlib}/@LIBDIR@/" %{PATCH1} +sed -i -e 's!%{_lib}!@LIB@/!' %{PATCH1} %patch0 -p1 -b .orig sed -i -e "s/@LIB@/%{_lib}/" NAnt.build sed -i -e "s!@BUILDROOT@!%{buildroot}/usr!" NAnt.build @@ -77,15 +76,8 @@ %doc examples/* doc/help/* %changelog -* Sun Feb 24 2008 David Nielsen - 0.86-2 -- forgot, no mono-devel on ppc64 - -* Sun Feb 24 2008 David Nielsen - 0.86-1 -- enable ppc/ppc64 -- bump to 0.86-beta1 - -* Tue Feb 19 2008 Fedora Release Engineering - 0.85-18 -- Autorebuild for GCC 4.3 +* Thu Mar 06 2008 Paul F. Johnson 0.86-5 +- bump to beta 1 * Mon Nov 12 2007 Paul F. Johnson 0.85-17 - removed excludearch in favour of exclusivearch --- nant-0.86-app-libdir.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 11 22:46:02 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 11 Mar 2008 22:46:02 GMT Subject: rpms/selinux-policy/devel policy-init.patch, NONE, 1.1 policy-20071130.patch, 1.94, 1.95 selinux-policy.spec, 1.628, 1.629 Message-ID: <200803112246.m2BMk2MG014233@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14116 Modified Files: policy-20071130.patch selinux-policy.spec Added Files: policy-init.patch Log Message: fixes for init, rhgb. also, fix the build policy-init.patch: --- NEW FILE policy-init.patch --- diff -up serefpolicy-3.3.1/policy/modules/services/rhgb.te.foo serefpolicy-3.3.1/policy/modules/services/rhgb.te --- serefpolicy-3.3.1/policy/modules/services/rhgb.te.foo 2008-03-11 17:50:18.000000000 -0400 +++ serefpolicy-3.3.1/policy/modules/services/rhgb.te 2008-03-11 17:50:18.000000000 -0400 @@ -92,6 +92,7 @@ term_use_ptmx(rhgb_t) term_getattr_pty_fs(rhgb_t) init_write_initctl(rhgb_t) +init_chat(rhgb_t) libs_use_ld_so(rhgb_t) libs_use_shared_libs(rhgb_t) policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- policy-20071130.patch 10 Mar 2008 20:58:06 -0000 1.94 +++ policy-20071130.patch 11 Mar 2008 22:46:00 -0000 1.95 @@ -23847,7 +23847,7 @@ # for when /tmp/.X11-unix is created by the system allow $2 xdm_t:fd use; -@@ -542,25 +540,541 @@ +@@ -542,25 +540,542 @@ allow $2 xdm_tmp_t:sock_file { read write }; dontaudit $2 xdm_t:tcp_socket { read write }; @@ -23974,6 +23974,7 @@ + type screensaver_xext_t, unknown_xext_t, x_rootscreen_t; + type disallowed_xext_t; + type output_xext_t; ++ type accelgraphics_xext_t, xdm_xserver_t; + + attribute x_server_domain, x_domain; + attribute xproperty_type; @@ -25943,7 +25944,7 @@ ') ') -@@ -463,11 +470,12 @@ +@@ -463,11 +470,13 @@ interface(`init_telinit',` gen_require(` type initctl_t; @@ -25954,6 +25955,7 @@ allow $1 initctl_t:fifo_file rw_fifo_file_perms; - + allow $1 init_t:unix_dgram_socket sendto; ++ allow init_t $1:unix_dgram_socket sendto; init_exec($1) ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.628 retrieving revision 1.629 diff -u -r1.628 -r1.629 --- selinux-policy.spec 10 Mar 2008 20:16:22 -0000 1.628 +++ selinux-policy.spec 11 Mar 2008 22:46:00 -0000 1.629 @@ -17,11 +17,12 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz patch: policy-20071130.patch +Patch2: policy-init.patch Source1: modules-targeted.conf Source2: booleans-targeted.conf Source3: Makefile.devel @@ -179,6 +180,7 @@ %prep %setup -n serefpolicy-%{version} -q %patch -p1 +%patch2 -p1 %install # Build targeted policy @@ -388,6 +390,10 @@ %endif %changelog +* Tue Mar 11 2008 Bill Nottingham 3.3.1-14 +- fixes for init policy (#436988) +- fix build + * Mon Mar 10 2008 Dan Walsh 3.3.1-13 - Additional changes for MLS policy From fedora-extras-commits at redhat.com Tue Mar 11 22:53:56 2008 From: fedora-extras-commits at redhat.com (sami wagiaalla (swagiaal)) Date: Tue, 11 Mar 2008 22:53:56 GMT Subject: rpms/frysk/F-8 .cvsignore,1.50,1.51 sources,1.50,1.51 Message-ID: <200803112253.m2BMruUJ014642@cvs-int.fedora.redhat.com> Author: swagiaal Update of /cvs/pkgs/rpms/frysk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14593 Modified Files: .cvsignore sources Log Message: Updated sources. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/frysk/F-8/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 29 Feb 2008 22:15:24 -0000 1.50 +++ .cvsignore 11 Mar 2008 22:53:20 -0000 1.51 @@ -1 +1 @@ -frysk-0.0.1.2008.02.29.rh1.tar.bz2 +frysk-0.0.1.2008.03.11.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/frysk/F-8/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 29 Feb 2008 22:15:24 -0000 1.50 +++ sources 11 Mar 2008 22:53:20 -0000 1.51 @@ -1 +1 @@ -cd09c4476bb491dd9b32e48e6db7be41 frysk-0.0.1.2008.02.29.rh1.tar.bz2 +02eef864289cf4c8ca30e8cdcab868c7 frysk-0.0.1.2008.03.11.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 11 23:13:52 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 11 Mar 2008 23:13:52 GMT Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xorg-x11-drv-evdev.spec, 1.23, 1.24 Message-ID: <200803112313.m2BNDqpf022825@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22758/devel Modified Files: .cvsignore sources xorg-x11-drv-evdev.spec Log Message: button swap fix Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 Mar 2008 21:20:28 -0000 1.11 +++ .cvsignore 11 Mar 2008 23:13:02 -0000 1.12 @@ -1 +1 @@ -xf86-input-evdev-20080310.tar.bz2 +xf86-input-evdev-20080311.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 Mar 2008 21:20:28 -0000 1.11 +++ sources 11 Mar 2008 23:13:02 -0000 1.12 @@ -1 +1 @@ -453cfa9b39dc1067068c9b35ea8820f7 xf86-input-evdev-20080310.tar.bz2 +7808f84c482f4cbdc752226217e2e185 xf86-input-evdev-20080311.tar.bz2 Index: xorg-x11-drv-evdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xorg-x11-drv-evdev.spec 10 Mar 2008 21:20:28 -0000 1.23 +++ xorg-x11-drv-evdev.spec 11 Mar 2008 23:13:03 -0000 1.24 @@ -4,16 +4,16 @@ %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/input -%define gitdate 20080310 +%define gitdate 20080311 -Summary: Xorg X11 evdev input driver -Name: xorg-x11-drv-evdev -Version: 1.99.1 -Release: 0.2%{?dist} -URL: http://www.x.org -License: MIT -Group: User Interface/X Hardware Support -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Summary: Xorg X11 evdev input driver +Name: xorg-x11-drv-evdev +Version: 1.99.1 +Release: 0.3%{?dist} +URL: http://www.x.org +License: MIT +Group: User Interface/X Hardware Support +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 Source0: %{tarball}-%{gitdate}.tar.bz2 @@ -55,6 +55,9 @@ %{_mandir}/man4/evdev.4* %changelog +* Tue Mar 11 2008 Adam Jackson 1.99.1-0.3 +- Today's snapshot. Fixes right/middle button swap hilarity. + * Mon Mar 10 2008 Adam Jackson 1.99.1-0.2 - Updated snapshot, minor bug fixes. From fedora-extras-commits at redhat.com Tue Mar 11 23:37:26 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 11 Mar 2008 23:37:26 GMT Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.303, 1.304 xserver-1.5.0-x86emu.patch, 1.1, 1.2 Message-ID: <200803112337.m2BNbQnN023490@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23441/devel Modified Files: xorg-x11-server.spec xserver-1.5.0-x86emu.patch Log Message: oh snap! Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- xorg-x11-server.spec 11 Mar 2008 01:18:22 -0000 1.303 +++ xorg-x11-server.spec 11 Mar 2008 23:36:33 -0000 1.304 @@ -509,6 +509,10 @@ %changelog +* Tue Mar 11 2008 Adam Jackson 1.4.99.901-2.20080310 +- New 1.5 snapshot. +- xserver-1.5-x86emy.patch: Fix an x86emu quirk. + * Fri Mar 07 2008 Adam Jackson 1.4.99.901-1.20080307 - Today's 1.5 snapshot. xserver-1.5.0-x86emu.patch: Index: xserver-1.5.0-x86emu.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.0-x86emu.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xserver-1.5.0-x86emu.patch 11 Mar 2008 01:18:22 -0000 1.1 +++ xserver-1.5.0-x86emu.patch 11 Mar 2008 23:36:33 -0000 1.2 @@ -1,17 +1,25 @@ -From 3820624b395ce6073bc86fcc93d4dd44c2cb07e4 Mon Sep 17 00:00:00 2001 +From 332b9c7d0f499360f7750e6e85cc905703b6ad4a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 10 Mar 2008 19:39:21 -0400 Subject: [PATCH] test x86emu fix --- - hw/xfree86/int10/helper_exec.c | 55 ++++++++++++++++++++++++++++++++++----- - 1 files changed, 48 insertions(+), 7 deletions(-) + hw/xfree86/int10/helper_exec.c | 57 +++++++++++++++++++++++++++++++++++----- + 1 files changed, 50 insertions(+), 7 deletions(-) diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c -index de6fde5..da7a38a 100644 +index de6fde5..9daff22 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c -@@ -459,7 +459,42 @@ Mem_wl(CARD32 addr, CARD32 val) +@@ -33,6 +33,7 @@ + #ifdef _X86EMU + #include "x86emu/x86emui.h" + #endif ++#include + + static int pciCfg1in(CARD16 addr, CARD32 *val); + static int pciCfg1out(CARD16 addr, CARD32 val); +@@ -459,7 +460,43 @@ Mem_wl(CARD32 addr, CARD32 val) static CARD32 PciCfg1Addr = 0; @@ -19,7 +27,7 @@ +#define PCI_OFFSET(x) ((x) & 0x000000ff) +#define PCI_TAG(x) ((x) & 0xffffff00) + -+static pci_device* ++static struct pci_device* +pci_device_for_cfg_address (CARD32 addr) +{ + struct pci_device *dev = NULL; @@ -32,7 +40,8 @@ + .match_data = 0 + }; + -+ iter = pci_slot_match_iterator_create (&slot_match); ++ struct pci_device_iterator *iter = ++ pci_slot_match_iterator_create (&slot_match); + if (iter) + dev = pci_device_next(iter); + if (!dev) { @@ -55,7 +64,7 @@ static int pciCfg1in(CARD16 addr, CARD32 *val) -@@ -469,7 +504,8 @@ pciCfg1in(CARD16 addr, CARD32 *val) +@@ -469,7 +506,8 @@ pciCfg1in(CARD16 addr, CARD32 *val) return 1; } if (addr == 0xCFC) { @@ -65,7 +74,7 @@ if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_inl(%#x) = %8.8x\n", PciCfg1Addr, *val); return 1; -@@ -487,7 +523,8 @@ pciCfg1out(CARD16 addr, CARD32 val) +@@ -487,7 +525,8 @@ pciCfg1out(CARD16 addr, CARD32 val) if (addr == 0xCFC) { if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_outl(%#x, %8.8x)\n", PciCfg1Addr, val); @@ -75,7 +84,7 @@ return 1; } return 0; -@@ -506,7 +543,8 @@ pciCfg1inw(CARD16 addr, CARD16 *val) +@@ -506,7 +545,8 @@ pciCfg1inw(CARD16 addr, CARD16 *val) if ((addr >= 0xCFC) && (addr <= 0xCFF)) { const unsigned offset = addr - 0xCFC; @@ -85,7 +94,7 @@ if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_inw(%#x) = %4.4x\n", PciCfg1Addr + offset, *val); return 1; -@@ -530,7 +568,8 @@ pciCfg1outw(CARD16 addr, CARD16 val) +@@ -530,7 +570,8 @@ pciCfg1outw(CARD16 addr, CARD16 val) if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_outw(%#x, %4.4x)\n", PciCfg1Addr + offset, val); @@ -95,7 +104,7 @@ return 1; } return 0; -@@ -549,7 +588,8 @@ pciCfg1inb(CARD16 addr, CARD8 *val) +@@ -549,7 +590,8 @@ pciCfg1inb(CARD16 addr, CARD8 *val) if ((addr >= 0xCFC) && (addr <= 0xCFF)) { const unsigned offset = addr - 0xCFC; @@ -105,7 +114,7 @@ if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_inb(%#x) = %2.2x\n", PciCfg1Addr + offset, *val); return 1; -@@ -573,7 +613,8 @@ pciCfg1outb(CARD16 addr, CARD8 val) +@@ -573,7 +615,8 @@ pciCfg1outb(CARD16 addr, CARD8 val) if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_outb(%#x, %2.2x)\n", PciCfg1Addr + offset, val); @@ -116,5 +125,5 @@ } return 0; -- -1.5.3.8 +1.5.4.3 From fedora-extras-commits at redhat.com Tue Mar 11 23:39:51 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Tue, 11 Mar 2008 23:39:51 GMT Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.304,1.305 Message-ID: <200803112339.m2BNdpDo023600@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23569 Modified Files: xorg-x11-server.spec Log Message: * Tue Mar 11 2008 Adam Jackson 1.4.99.901-3.20080310 - New 1.5 snapshot. - xserver-1.5-x86emy.patch: Fix an x86emu quirk. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- xorg-x11-server.spec 11 Mar 2008 23:36:33 -0000 1.304 +++ xorg-x11-server.spec 11 Mar 2008 23:39:19 -0000 1.305 @@ -20,7 +20,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.901 -Release: 2.%{gitdate}%{?dist} +Release: 3.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -509,7 +509,7 @@ %changelog -* Tue Mar 11 2008 Adam Jackson 1.4.99.901-2.20080310 +* Tue Mar 11 2008 Adam Jackson 1.4.99.901-3.20080310 - New 1.5 snapshot. - xserver-1.5-x86emy.patch: Fix an x86emu quirk. From fedora-extras-commits at redhat.com Tue Mar 11 23:56:24 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 23:56:24 GMT Subject: rpms/logjam/F-8 logjam-4.5.3-tags.patch, 1.3, 1.4 logjam.spec, 1.38, 1.39 Message-ID: <200803112356.m2BNuOqV024054@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24006/F-8 Modified Files: logjam-4.5.3-tags.patch logjam.spec Log Message: please autoconf, give me this. i need it. logjam-4.5.3-tags.patch: Index: logjam-4.5.3-tags.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam-4.5.3-tags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- logjam-4.5.3-tags.patch 11 Mar 2008 21:06:17 -0000 1.3 +++ logjam-4.5.3-tags.patch 11 Mar 2008 23:56:21 -0000 1.4 @@ -1,6 +1,6 @@ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,18 @@ +/* liblivejournal - a client library for LiveJournal. + * Copyright (C) 2003 Evan Martin @@ -22,7 +22,7 @@ +#endif /* __LIVEJOURNAL_TAGS_H__ */ diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c --- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags 2005-10-23 21:29:32.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 17:53:46.000000000 -0400 @@ -14,6 +14,7 @@ #include "entry.h" @@ -52,7 +52,7 @@ char *text = NULL; diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am --- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags 2005-08-24 22:42:14.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 17:53:46.000000000 -0400 @@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ liblivejournal_la_SOURCES = \ md5.c md5.h \ @@ -72,7 +72,7 @@ livejournal.h diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h --- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags 2005-02-21 12:46:10.000000000 -0500 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 17:53:46.000000000 -0400 @@ -16,5 +16,6 @@ #include #include @@ -82,7 +82,7 @@ #endif /* __LIVEJOURNAL_H__ */ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,16 @@ + +#ifndef __LIVEJOURNAL_GETTAGS_H__ @@ -102,7 +102,7 @@ + diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,65 @@ + +#include @@ -169,9 +169,55 @@ + g_free(gettags); +} + +diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in +--- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags 2006-01-19 03:18:52.000000000 -0500 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in 2008-03-11 17:57:21.000000000 -0400 +@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ + liblivejournal_la_SOURCES = \ + md5.c md5.h \ + protocol.c protocol.h \ +- friends.h \ ++ friends.h tags.h \ + serveruser.c serveruser.h \ + entry.c entry.h \ + types.c types.h \ +@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \ + getchallenge.c getchallenge.h \ + getevents.c getevents.h \ + getfriends.c getfriends.h \ ++ gettags.c gettags.h \ + syncitems.c syncitems.h \ + sync.c sync.h \ + livejournal.h +@@ -182,7 +183,7 @@ liblivejournal_la_DEPENDENCIES = + am_liblivejournal_la_OBJECTS = md5.lo protocol.lo serveruser.lo entry.lo \ + types.lo verb.lo login.lo checkfriends.lo consolecommand.lo \ + editfriends.lo editfriendgroups.lo editpostevent.lo \ +- getchallenge.lo getevents.lo getfriends.lo syncitems.lo sync.lo ++ getchallenge.lo getevents.lo getfriends.lo gettags.lo syncitems.lo sync.lo + liblivejournal_la_OBJECTS = $(am_liblivejournal_la_OBJECTS) + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -194,7 +195,7 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@ ./$(DEPDIR)/editfriends.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/editpostevent.Plo ./$(DEPDIR)/entry.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/getchallenge.Plo \ +- at AMDEP_TRUE@ ./$(DEPDIR)/getevents.Plo \ ++ at AMDEP_TRUE@ ./$(DEPDIR)/getevents.Plo ./$(DEPDIR)/gettags.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/getfriends.Plo ./$(DEPDIR)/login.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/md5.Plo ./$(DEPDIR)/protocol.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/serveruser.Plo ./$(DEPDIR)/sync.Plo \ +@@ -247,6 +248,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getchallenge.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getevents.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getfriends.Plo at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gettags.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/login.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/protocol.Plo at am__quote@ diff -up /dev/null logjam-4.5.3/src/tags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.c 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/tags.c 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,181 @@ + +#include "gtk-all.h" @@ -356,7 +402,7 @@ +} diff -up /dev/null logjam-4.5.3/src/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/tags.h 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef _TAGS_H_ +#define _TAGS_H_ @@ -366,7 +412,7 @@ +#endif /* _TAGS_H_ */ diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am --- logjam-4.5.3/src/Makefile.am.tags 2005-10-23 21:16:08.000000000 -0400 -+++ logjam-4.5.3/src/Makefile.am 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/Makefile.am 2008-03-11 17:53:46.000000000 -0400 @@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. undo.c undo.h \ userlabel.c userlabel.h \ @@ -375,9 +421,29 @@ $(HTML_MARKUP) src_preview = $(PREVIEW) +diff -up logjam-4.5.3/src/Makefile.in.tags logjam-4.5.3/src/Makefile.in +--- logjam-4.5.3/src/Makefile.in.tags 2006-01-19 03:18:44.000000000 -0500 ++++ logjam-4.5.3/src/Makefile.in 2008-03-11 17:53:46.000000000 -0400 +@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. + undo.c undo.h \ + userlabel.c userlabel.h \ + get_cmd_out.c get_cmd_out.h \ ++ tags.c tags.h \ + $(HTML_MARKUP) + + +@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini + login.c login.h manager.c spawn.c spawn.h icons.c icons.h \ + music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \ + pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \ +- userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \ ++ userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \ + html_markup.h network-win32.c network-fork.c network-soup.c \ + network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \ + docklet.c preview.c preview.h journalstore-sqlite.c \ diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c ---- logjam-4.5.3/src/jamview.c.tags 2008-03-11 16:17:54.000000000 -0400 -+++ logjam-4.5.3/src/jamview.c 2008-03-11 16:18:24.000000000 -0400 +--- logjam-4.5.3/src/jamview.c.tags 2008-03-11 17:53:46.000000000 -0400 ++++ logjam-4.5.3/src/jamview.c 2008-03-11 17:53:46.000000000 -0400 @@ -19,6 +19,7 @@ #include "security.h" #include "marshalers.h" @@ -421,43 +487,3 @@ gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1); gtk_widget_show_all(view->tagsbar); } -diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in ---- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD 2008-03-11 17:02:35.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in 2008-03-11 17:03:49.000000000 -0400 -@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ - liblivejournal_la_SOURCES = \ - md5.c md5.h \ - protocol.c protocol.h \ -- friends.h \ -+ friends.h tags.h \ - serveruser.c serveruser.h \ - entry.c entry.h \ - types.c types.h \ -@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \ - getchallenge.c getchallenge.h \ - getevents.c getevents.h \ - getfriends.c getfriends.h \ -+ gettags.c gettags.h \ - syncitems.c syncitems.h \ - sync.c sync.h \ - livejournal.h -diff -up logjam-4.5.3/src/Makefile.in.BAD logjam-4.5.3/src/Makefile.in ---- logjam-4.5.3/src/Makefile.in.BAD 2008-03-11 17:01:21.000000000 -0400 -+++ logjam-4.5.3/src/Makefile.in 2008-03-11 17:01:52.000000000 -0400 -@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. - undo.c undo.h \ - userlabel.c userlabel.h \ - get_cmd_out.c get_cmd_out.h \ -+ tags.c tags.h \ - $(HTML_MARKUP) - - -@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini - login.c login.h manager.c spawn.c spawn.h icons.c icons.h \ - music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \ - pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \ -- userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \ -+ userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \ - html_markup.h network-win32.c network-fork.c network-soup.c \ - network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \ - docklet.c preview.c preview.h journalstore-sqlite.c \ Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- logjam.spec 11 Mar 2008 21:45:03 -0000 1.38 +++ logjam.spec 11 Mar 2008 23:56:21 -0000 1.39 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-19 +- i'm going to beat autoconf + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-18 - seriously, this is getting old now. added libtool to BR. From fedora-extras-commits at redhat.com Tue Mar 11 23:56:52 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 11 Mar 2008 23:56:52 GMT Subject: rpms/logjam/F-7 logjam-4.5.3-tags.patch, 1.3, 1.4 logjam.spec, 1.38, 1.39 Message-ID: <200803112356.m2BNuqoF024080@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24006/F-7 Modified Files: logjam-4.5.3-tags.patch logjam.spec Log Message: please autoconf, give me this. i need it. logjam-4.5.3-tags.patch: Index: logjam-4.5.3-tags.patch =================================================================== RCS file: /cvs/extras/rpms/logjam/F-7/logjam-4.5.3-tags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- logjam-4.5.3-tags.patch 11 Mar 2008 21:06:10 -0000 1.3 +++ logjam-4.5.3-tags.patch 11 Mar 2008 23:56:20 -0000 1.4 @@ -1,6 +1,6 @@ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,18 @@ +/* liblivejournal - a client library for LiveJournal. + * Copyright (C) 2003 Evan Martin @@ -22,7 +22,7 @@ +#endif /* __LIVEJOURNAL_TAGS_H__ */ diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c --- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags 2005-10-23 21:29:32.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 17:53:46.000000000 -0400 @@ -14,6 +14,7 @@ #include "entry.h" @@ -52,7 +52,7 @@ char *text = NULL; diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am --- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags 2005-08-24 22:42:14.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 17:53:46.000000000 -0400 @@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ liblivejournal_la_SOURCES = \ md5.c md5.h \ @@ -72,7 +72,7 @@ livejournal.h diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h --- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags 2005-02-21 12:46:10.000000000 -0500 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 17:53:46.000000000 -0400 @@ -16,5 +16,6 @@ #include #include @@ -82,7 +82,7 @@ #endif /* __LIVEJOURNAL_H__ */ diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,16 @@ + +#ifndef __LIVEJOURNAL_GETTAGS_H__ @@ -102,7 +102,7 @@ + diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,65 @@ + +#include @@ -169,9 +169,55 @@ + g_free(gettags); +} + +diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in +--- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags 2006-01-19 03:18:52.000000000 -0500 ++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in 2008-03-11 17:57:21.000000000 -0400 +@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ + liblivejournal_la_SOURCES = \ + md5.c md5.h \ + protocol.c protocol.h \ +- friends.h \ ++ friends.h tags.h \ + serveruser.c serveruser.h \ + entry.c entry.h \ + types.c types.h \ +@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \ + getchallenge.c getchallenge.h \ + getevents.c getevents.h \ + getfriends.c getfriends.h \ ++ gettags.c gettags.h \ + syncitems.c syncitems.h \ + sync.c sync.h \ + livejournal.h +@@ -182,7 +183,7 @@ liblivejournal_la_DEPENDENCIES = + am_liblivejournal_la_OBJECTS = md5.lo protocol.lo serveruser.lo entry.lo \ + types.lo verb.lo login.lo checkfriends.lo consolecommand.lo \ + editfriends.lo editfriendgroups.lo editpostevent.lo \ +- getchallenge.lo getevents.lo getfriends.lo syncitems.lo sync.lo ++ getchallenge.lo getevents.lo getfriends.lo gettags.lo syncitems.lo sync.lo + liblivejournal_la_OBJECTS = $(am_liblivejournal_la_OBJECTS) + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -194,7 +195,7 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@ ./$(DEPDIR)/editfriends.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/editpostevent.Plo ./$(DEPDIR)/entry.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/getchallenge.Plo \ +- at AMDEP_TRUE@ ./$(DEPDIR)/getevents.Plo \ ++ at AMDEP_TRUE@ ./$(DEPDIR)/getevents.Plo ./$(DEPDIR)/gettags.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/getfriends.Plo ./$(DEPDIR)/login.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/md5.Plo ./$(DEPDIR)/protocol.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/serveruser.Plo ./$(DEPDIR)/sync.Plo \ +@@ -247,6 +248,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getchallenge.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getevents.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getfriends.Plo at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gettags.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/login.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Plo at am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/protocol.Plo at am__quote@ diff -up /dev/null logjam-4.5.3/src/tags.c --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.c 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/tags.c 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,181 @@ + +#include "gtk-all.h" @@ -356,7 +402,7 @@ +} diff -up /dev/null logjam-4.5.3/src/tags.h --- /dev/null 2008-03-11 09:22:57.310023055 -0400 -+++ logjam-4.5.3/src/tags.h 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/tags.h 2008-03-11 17:53:46.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef _TAGS_H_ +#define _TAGS_H_ @@ -366,7 +412,7 @@ +#endif /* _TAGS_H_ */ diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am --- logjam-4.5.3/src/Makefile.am.tags 2005-10-23 21:16:08.000000000 -0400 -+++ logjam-4.5.3/src/Makefile.am 2008-03-11 16:17:54.000000000 -0400 ++++ logjam-4.5.3/src/Makefile.am 2008-03-11 17:53:46.000000000 -0400 @@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. undo.c undo.h \ userlabel.c userlabel.h \ @@ -375,9 +421,29 @@ $(HTML_MARKUP) src_preview = $(PREVIEW) +diff -up logjam-4.5.3/src/Makefile.in.tags logjam-4.5.3/src/Makefile.in +--- logjam-4.5.3/src/Makefile.in.tags 2006-01-19 03:18:44.000000000 -0500 ++++ logjam-4.5.3/src/Makefile.in 2008-03-11 17:53:46.000000000 -0400 +@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. + undo.c undo.h \ + userlabel.c userlabel.h \ + get_cmd_out.c get_cmd_out.h \ ++ tags.c tags.h \ + $(HTML_MARKUP) + + +@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini + login.c login.h manager.c spawn.c spawn.h icons.c icons.h \ + music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \ + pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \ +- userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \ ++ userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \ + html_markup.h network-win32.c network-fork.c network-soup.c \ + network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \ + docklet.c preview.c preview.h journalstore-sqlite.c \ diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c ---- logjam-4.5.3/src/jamview.c.tags 2008-03-11 16:17:54.000000000 -0400 -+++ logjam-4.5.3/src/jamview.c 2008-03-11 16:18:24.000000000 -0400 +--- logjam-4.5.3/src/jamview.c.tags 2008-03-11 17:53:46.000000000 -0400 ++++ logjam-4.5.3/src/jamview.c 2008-03-11 17:53:46.000000000 -0400 @@ -19,6 +19,7 @@ #include "security.h" #include "marshalers.h" @@ -421,43 +487,3 @@ gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1); gtk_widget_show_all(view->tagsbar); } -diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in ---- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD 2008-03-11 17:02:35.000000000 -0400 -+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in 2008-03-11 17:03:49.000000000 -0400 -@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_ - liblivejournal_la_SOURCES = \ - md5.c md5.h \ - protocol.c protocol.h \ -- friends.h \ -+ friends.h tags.h \ - serveruser.c serveruser.h \ - entry.c entry.h \ - types.c types.h \ -@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \ - getchallenge.c getchallenge.h \ - getevents.c getevents.h \ - getfriends.c getfriends.h \ -+ gettags.c gettags.h \ - syncitems.c syncitems.h \ - sync.c sync.h \ - livejournal.h -diff -up logjam-4.5.3/src/Makefile.in.BAD logjam-4.5.3/src/Makefile.in ---- logjam-4.5.3/src/Makefile.in.BAD 2008-03-11 17:01:21.000000000 -0400 -+++ logjam-4.5.3/src/Makefile.in 2008-03-11 17:01:52.000000000 -0400 -@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk. - undo.c undo.h \ - userlabel.c userlabel.h \ - get_cmd_out.c get_cmd_out.h \ -+ tags.c tags.h \ - $(HTML_MARKUP) - - -@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini - login.c login.h manager.c spawn.c spawn.h icons.c icons.h \ - music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \ - pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \ -- userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \ -+ userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \ - html_markup.h network-win32.c network-fork.c network-soup.c \ - network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \ - docklet.c preview.c preview.h journalstore-sqlite.c \ Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/F-7/logjam.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- logjam.spec 11 Mar 2008 21:44:56 -0000 1.38 +++ logjam.spec 11 Mar 2008 23:56:20 -0000 1.39 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPLv2+ @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-19 +- i'm going to beat autoconf + * Tue Mar 11 2008 Tom "spot" Callaway - 4.5.3-18 - seriously, this is getting old now. added libtool to BR. From fedora-extras-commits at redhat.com Wed Mar 12 00:04:31 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 12 Mar 2008 00:04:31 GMT Subject: rpms/selinux-policy/F-8 policy-20070703.patch, 1.192, 1.193 selinux-policy.spec, 1.618, 1.619 Message-ID: <200803120004.m2C04VKS030433@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30410 Modified Files: policy-20070703.patch selinux-policy.spec Log Message: * Tue Mar 11 2008 Dan Walsh 3.0.8-93 - Allow syslog to connect to mysql - Allow lvm to manage its own fifo_files - Allow bugzilla to use ldap policy-20070703.patch: Index: policy-20070703.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- policy-20070703.patch 6 Mar 2008 21:55:53 -0000 1.192 +++ policy-20070703.patch 12 Mar 2008 00:04:26 -0000 1.193 @@ -3070,7 +3070,7 @@ +/usr/bin/octave-[^/]* -- gen_context(system_u:object_r:java_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.8/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/apps/java.if 2008-03-06 11:16:06.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/apps/java.if 2008-03-11 20:02:09.000000000 -0400 @@ -32,7 +32,7 @@ ## ## @@ -3148,7 +3148,7 @@ libs_use_ld_so($1_javaplugin_t) libs_use_shared_libs($1_javaplugin_t) -@@ -134,6 +141,10 @@ +@@ -134,9 +141,13 @@ sysnet_read_config($1_javaplugin_t) @@ -3158,7 +3158,11 @@ + userdom_read_user_tmpfs_files($1,$1_javaplugin_t) userdom_dontaudit_use_user_terminals($1,$1_javaplugin_t) userdom_dontaudit_setattr_user_home_content_files($1,$1_javaplugin_t) - userdom_dontaudit_exec_user_home_content_files($1,$1_javaplugin_t) +- userdom_dontaudit_exec_user_home_content_files($1,$1_javaplugin_t) ++ userdom_exec_user_home_content_files($1,$1_javaplugin_t) + userdom_manage_user_home_content_dirs($1,$1_javaplugin_t) + userdom_manage_user_home_content_files($1,$1_javaplugin_t) + userdom_manage_user_home_content_symlinks($1,$1_javaplugin_t) @@ -147,8 +158,6 @@ tunable_policy(`allow_java_execstack',` allow $1_javaplugin_t self:process execstack; @@ -3168,7 +3172,7 @@ libs_legacy_use_shared_libs($1_javaplugin_t) libs_legacy_use_ld_so($1_javaplugin_t) -@@ -166,6 +175,62 @@ +@@ -166,6 +175,63 @@ optional_policy(` xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t) ') @@ -3215,6 +3219,7 @@ + domain_interactive_fd($1_java_t) + + userdom_unpriv_usertype($1, $1_java_t) ++ userdom_exec_user_home_content_files($1,$1_java_t) + + allow $1_java_t self:process { getsched sigkill execheap execmem execstack }; + @@ -3231,7 +3236,7 @@ ') ######################################## -@@ -219,3 +284,66 @@ +@@ -219,3 +285,66 @@ corecmd_search_bin($1) domtrans_pattern($1, java_exec_t, java_t) ') @@ -6844,7 +6849,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.0.8/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2007-10-22 13:21:39.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/services/apache.te 2008-01-31 14:31:52.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/services/apache.te 2008-03-11 19:28:41.000000000 -0400 @@ -1,5 +1,5 @@ -policy_module(apache,1.7.1) @@ -7250,11 +7255,12 @@ allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms; read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t) -@@ -686,15 +766,62 @@ +@@ -686,15 +766,63 @@ # Should we add a boolean? apache_domtrans_rotatelogs(httpd_sys_script_t) +sysnet_read_config(httpd_sys_script_t) ++sysnet_use_ldap(httpd_bugzilla_script_t) + ifdef(`distro_redhat',` allow httpd_sys_script_t httpd_log_t:file { getattr append }; @@ -7314,7 +7320,7 @@ tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` fs_read_cifs_files(httpd_sys_script_t) fs_read_cifs_symlinks(httpd_sys_script_t) -@@ -707,6 +834,7 @@ +@@ -707,6 +835,7 @@ optional_policy(` mysql_stream_connect(httpd_sys_script_t) mysql_rw_db_sockets(httpd_sys_script_t) @@ -7322,7 +7328,7 @@ ') ######################################## -@@ -728,3 +856,46 @@ +@@ -728,3 +857,46 @@ logging_search_logs(httpd_rotatelogs_t) miscfiles_read_localization(httpd_rotatelogs_t) @@ -19899,7 +19905,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.0.8/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/logging.te 2008-02-15 15:38:47.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/system/logging.te 2008-03-11 19:41:54.000000000 -0400 @@ -1,5 +1,5 @@ -policy_module(logging,1.7.3) @@ -20068,15 +20074,24 @@ allow syslogd_t syslogd_var_run_t:file manage_file_perms; files_pid_filetrans(syslogd_t,syslogd_var_run_t,file) -@@ -312,6 +357,7 @@ +@@ -300,6 +345,7 @@ + # Allow users to define additional syslog ports to connect to + corenet_tcp_bind_syslogd_port(syslogd_t) + corenet_tcp_connect_syslogd_port(syslogd_t) ++corenet_tcp_connect_mysql_port(syslogd_t) + + # syslog-ng can send or receive logs + corenet_sendrecv_syslogd_client_packets(syslogd_t) +@@ -312,6 +358,8 @@ domain_use_interactive_fds(syslogd_t) files_read_etc_files(syslogd_t) ++files_read_usr_files(syslogd_t) +files_read_var_files(syslogd_t) files_read_etc_runtime_files(syslogd_t) # /initrd is not umounted before minilog starts files_dontaudit_search_isid_type_dirs(syslogd_t) -@@ -341,6 +387,12 @@ +@@ -341,6 +389,12 @@ files_var_lib_filetrans(syslogd_t,devlog_t,sock_file) ') @@ -20089,7 +20104,7 @@ optional_policy(` inn_manage_log(syslogd_t) ') -@@ -365,3 +417,40 @@ +@@ -365,3 +419,40 @@ # log to the xconsole xserver_rw_console(syslogd_t) ') @@ -20143,7 +20158,7 @@ /etc/lvm/lock(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.8/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/lvm.te 2008-02-27 23:24:15.000000000 -0500 ++++ serefpolicy-3.0.8/policy/modules/system/lvm.te 2008-03-11 19:07:04.000000000 -0400 @@ -44,9 +44,9 @@ # Cluster LVM daemon local policy # @@ -20229,7 +20244,7 @@ ') optional_policy(` -@@ -150,7 +163,8 @@ +@@ -150,17 +163,19 @@ # DAC overrides and mknod for modifying /dev entries (vgmknodes) # rawio needed for dmraid @@ -20239,7 +20254,10 @@ dontaudit lvm_t self:capability sys_tty_config; allow lvm_t self:process { sigchld sigkill sigstop signull signal }; # LVM will complain a lot if it cannot set its priority. -@@ -160,7 +174,8 @@ + allow lvm_t self:process setsched; + allow lvm_t self:file rw_file_perms; +-allow lvm_t self:fifo_file rw_file_perms; ++allow lvm_t self:fifo_file manage_fifo_file_perms; allow lvm_t self:unix_dgram_socket create_socket_perms; allow lvm_t self:netlink_kobject_uevent_socket create_socket_perms; Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/selinux-policy.spec,v retrieving revision 1.618 retrieving revision 1.619 diff -u -r1.618 -r1.619 --- selinux-policy.spec 6 Mar 2008 21:55:53 -0000 1.618 +++ selinux-policy.spec 12 Mar 2008 00:04:26 -0000 1.619 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.0.8 -Release: 92%{?dist} +Release: 93%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -381,6 +381,14 @@ %endif %changelog +* Tue Mar 11 2008 Dan Walsh 3.0.8-93 +- Allow syslog to connect to mysql +- Allow lvm to manage its own fifo_files +- Allow bugzilla to use ldap + +* Thu Mar 4 2008 Dan Walsh 3.0.8-92 +- Fix openoffice policy to allow it to run from firefox on xguest + * Thu Mar 4 2008 Dan Walsh 3.0.8-92 - Fix openoffice policy to allow it to run from firefox on xguest From fedora-extras-commits at redhat.com Wed Mar 12 00:04:35 2008 From: fedora-extras-commits at redhat.com (Dave Jones (davej)) Date: Wed, 12 Mar 2008 00:04:35 GMT Subject: rpms/kernel/devel patch-2.6.25-rc5-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.779, 1.780 kernel.spec, 1.495, 1.496 sources, 1.739, 1.740 upstream, 1.661, 1.662 linux-2.6-ia32-syscall-restart.patch, 1.1, NONE patch-2.6.25-rc5-git1.bz2.sign, 1.1, NONE Message-ID: <200803120004.m2C04ZGk030445@cvs-int.fedora.redhat.com> Author: davej Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30371 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.25-rc5-git2.bz2.sign Removed Files: linux-2.6-ia32-syscall-restart.patch patch-2.6.25-rc5-git1.bz2.sign Log Message: - 2.6.25-rc5-git2 --- NEW FILE patch-2.6.25-rc5-git2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBH1tdoyGugalF9Dw4RAuGLAJ9m44uyEmGRTfTMAaUY4w/mCcCbbQCdEGGQ qZLxkrgvWk7Ni0PS0g5yFTE= =lc+j -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.779 retrieving revision 1.780 diff -u -r1.779 -r1.780 --- .cvsignore 11 Mar 2008 18:05:41 -0000 1.779 +++ .cvsignore 12 Mar 2008 00:03:48 -0000 1.780 @@ -6,4 +6,4 @@ linux-2.6.24.tar.bz2 patch-2.6.25-rc5.bz2 patch-2.6.25-rc4-git3.bz2 -patch-2.6.25-rc5-git1.bz2 +patch-2.6.25-rc5-git2.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.495 retrieving revision 1.496 diff -u -r1.495 -r1.496 --- kernel.spec 11 Mar 2008 20:43:54 -0000 1.495 +++ kernel.spec 12 Mar 2008 00:03:48 -0000 1.496 @@ -45,7 +45,7 @@ # The rc snapshot level %define rcrev 5 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -580,8 +580,6 @@ Patch42: linux-2.6-x86-tune-generic.patch Patch75: linux-2.6-x86-debug-boot.patch -Patch80: linux-2.6-ia32-syscall-restart.patch - Patch123: linux-2.6-ppc-rtc.patch Patch140: linux-2.6-ps3-ehci-iso.patch Patch141: linux-2.6-ps3-storage-alias.patch @@ -1014,8 +1012,6 @@ # Compile 686 kernels tuned for Pentium4. ApplyPatch linux-2.6-x86-tune-generic.patch -ApplyPatch linux-2.6-ia32-syscall-restart.patch - # # PowerPC # @@ -1756,6 +1752,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Tue Mar 11 2008 Dave Jones +- 2.6.25-rc5-git2 + * Tue Mar 11 2008 John W. Linville - rt2x00: never disable multicast because it disables broadcast too - rt2x00: Add new D-Link USB ID Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.739 retrieving revision 1.740 diff -u -r1.739 -r1.740 --- sources 11 Mar 2008 18:05:41 -0000 1.739 +++ sources 12 Mar 2008 00:03:48 -0000 1.740 @@ -1,3 +1,3 @@ 3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2 6f5fbe9f3655e53c561c4fea9bf2f525 patch-2.6.25-rc5.bz2 -49ffc51eb29fe8e8c870dfdbb165c933 patch-2.6.25-rc5-git1.bz2 +c6d67eed3a378d720642c90b2a3a6c43 patch-2.6.25-rc5-git2.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.661 retrieving revision 1.662 diff -u -r1.661 -r1.662 --- upstream 11 Mar 2008 18:05:41 -0000 1.661 +++ upstream 12 Mar 2008 00:03:48 -0000 1.662 @@ -1,3 +1,3 @@ linux-2.6.24.tar.bz2 patch-2.6.25-rc5.bz2 -patch-2.6.25-rc5-git1.bz2 +patch-2.6.25-rc5-git2.bz2 --- linux-2.6-ia32-syscall-restart.patch DELETED --- --- patch-2.6.25-rc5-git1.bz2.sign DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 00:08:54 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Wed, 12 Mar 2008 00:08:54 GMT Subject: rpms/mesa/devel .cvsignore, 1.22, 1.23 mesa.spec, 1.172, 1.173 sources, 1.21, 1.22 Message-ID: <200803120008.m2C08sZf030650@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/mesa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30601 Modified Files: .cvsignore mesa.spec sources Log Message: * Tue Mar 11 2008 Kristian H??gsberg - 7.1-0.20 - Looks like the TexOffset extension does not work, disable for now. - Bump to 20080311 snapshot to get DRI2 tfp fixes. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 4 Mar 2008 01:15:35 -0000 1.22 +++ .cvsignore 12 Mar 2008 00:08:22 -0000 1.23 @@ -1,2 +1,2 @@ gl-manpages-1.0.1.tar.bz2 -mesa-20080303.tar.bz2 +mesa-20080311.tar.bz2 Index: mesa.spec =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- mesa.spec 4 Mar 2008 01:49:32 -0000 1.172 +++ mesa.spec 12 Mar 2008 00:08:22 -0000 1.173 @@ -10,12 +10,12 @@ %endif %define manpages gl-manpages-1.0.1 -%define gitdate 20080303 +%define gitdate 20080311 Summary: Mesa graphics libraries Name: mesa Version: 7.1 -Release: 0.19%{?dist} +Release: 0.20%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -30,6 +30,9 @@ Patch0: mesa-7.1pre-osmesa-version.patch Patch2: mesa-7.1pre-nukeglthread-debug.patch +# This doesn't work, disable for now. +Patch3: disable-tex-offset.patch + BuildRequires: pkgconfig autoconf automake %if %{with_dri} BuildRequires: libdrm-devel >= 2.4.0-0.5 @@ -151,6 +154,7 @@ %setup -q -n mesa-%{gitdate} -b2 %patch0 -p1 -b .osmesa %patch2 -p1 -b .intel-glthread +%patch3 -p1 -b .disable-tex-offset # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT # license and are not open source/free software, so we remove them. @@ -393,6 +397,10 @@ %{_libdir}/mesa-demos-data %changelog +* Tue Mar 11 2008 Kristian H??gsberg - 7.1-0.20 +- Looks like the TexOffset extension does not work, disable for now. +- Bump to 20080311 snapshot to get DRI2 tfp fixes. + * Mon Mar 3 2008 Kristian H??gsberg - 7.1-0.19 - Bump to latest git snapshot. - Drop mesa-7.1-dri-drivers.patch, it's upstream. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 4 Mar 2008 01:15:35 -0000 1.21 +++ sources 12 Mar 2008 00:08:22 -0000 1.22 @@ -1,2 +1,2 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -2b1a09d87cd56f4601265993ac747db3 mesa-20080303.tar.bz2 +35148aa4ae18e67e69d0fea04ab07e83 mesa-20080311.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 00:11:14 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 12 Mar 2008 00:11:14 GMT Subject: rpms/gnome-theme-curvylooks/devel .cvsignore, 1.2, 1.3 gnome-theme-curvylooks.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803120011.m2C0BEpG030798@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/gnome-theme-curvylooks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30763 Modified Files: .cvsignore gnome-theme-curvylooks.spec sources Log Message: Update to 0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-theme-curvylooks/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Nov 2007 05:12:45 -0000 1.2 +++ .cvsignore 12 Mar 2008 00:10:41 -0000 1.3 @@ -1 +1 @@ -curvylooks-0.2.tbz2 +curvylooks-0.3.gtp Index: gnome-theme-curvylooks.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-theme-curvylooks/devel/gnome-theme-curvylooks.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-theme-curvylooks.spec 18 Nov 2007 05:07:33 -0000 1.1 +++ gnome-theme-curvylooks.spec 12 Mar 2008 00:10:41 -0000 1.2 @@ -1,14 +1,13 @@ Name: gnome-theme-curvylooks -Version: 0.2 +Version: 0.3 Release: 1%{?dist} Summary: A modern Clearlooks theme using a Bluecurve-like color scheme Group: User Interface/Desktops License: GPL+ -## TODO: Setup a proper, if minimal, website for this. :) -URL: http://codergeek42.livejournal.com/tag/curvylooks +URL: http://projects.thecodergeek.com/curvylooks/ -Source0: http://projects.thecodergeek.com/curvylooks/curvylooks-%{version}.tbz2 +Source0: http://projects.thecodergeek.com/curvylooks/downloads/curvylooks-%{version}.gtp BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -16,6 +15,13 @@ ## Requires 2.12 or later due to use of newer Clearlooks features such as the ## so-called "Gummy" style. Requires: gtk2-engines >= 2.12 +## Metacity pulls in many deps and is already installed on GNOME-based systems, +## since it is marked as "mandatory" in comps. However, the Tango icon set +## has minimal dependencies and, in the opinion of the author, adds a great +## deal of usability to the theme. Both are optional, so the Metacity one is +## not hard-coded. +Requires: tango-icon-theme + %description CurvyLooks, inspired by and based heavily on the work of Billy Cantrell's @@ -26,11 +32,11 @@ %prep -%setup -q -c +%setup -q -c %build -# Nothing to build. It's a data-only package... +## Nothing to build. It's a data-only package... %install @@ -45,12 +51,18 @@ %files %defattr(-,root,root,-) %doc ChangeLog COPYING README TODO -%{_datadir}/themes/CurvyLooks +%{_datadir}/themes/CurvyLooks/ %changelog +* Mon Mar 10 2008 Peter Gordon - 0.3-1 +- Update to new upstream release (0.3), which adds better GNOME Theme + integration (Metacity and Tango icon theme defaults). +- Update website and Source0 URLs. +- Other minor, aesthetic-only spec file fixes. + * Mon Nov 05 2007 Peter Gordon - 0.2-1 - Update to new upstream release (0.2), which fixes tooltips' shading. * Mon Oct 29 2007 Peter Gordon - 0.1-1 -- Initial Fedora packaging. \ No newline at end of file +- Initial Fedora packaging. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-theme-curvylooks/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Nov 2007 05:12:45 -0000 1.2 +++ sources 12 Mar 2008 00:10:41 -0000 1.3 @@ -1 +1 @@ -0434afee90a221d4a5aa3d722906b401 curvylooks-0.2.tbz2 +9a4942cd1a25c880febf6667a74c250a curvylooks-0.3.gtp From fedora-extras-commits at redhat.com Wed Mar 12 00:11:38 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Wed, 12 Mar 2008 00:11:38 GMT Subject: rpms/mesa/devel disable-tex-offset.patch,NONE,1.1 Message-ID: <200803120011.m2C0Bct1030823@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/mesa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30806 Added Files: disable-tex-offset.patch Log Message: Oops, forgot patch. disable-tex-offset.patch: --- NEW FILE disable-tex-offset.patch --- diff -up mesa-20080311/src/mesa/drivers/dri/intel/intel_screen.c.disable-tex-offset mesa-20080311/src/mesa/drivers/dri/intel/intel_screen.c --- mesa-20080311/src/mesa/drivers/dri/intel/intel_screen.c.disable-tex-offset 2008-03-11 20:05:30.000000000 -0400 +++ mesa-20080311/src/mesa/drivers/dri/intel/intel_screen.c 2008-03-11 20:04:08.000000000 -0400 @@ -384,10 +384,12 @@ intelHandleBufferAttach(__DRIdrawablePri intel_renderbuffer_set_region(rb, region); } +#if 0 static const __DRItexOffsetExtension intelTexOffsetExtension = { { __DRI_TEX_OFFSET }, intelSetTexOffset, }; +#endif static const __DRItexBufferExtension intelTexBufferExtension = { { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION }, @@ -400,7 +402,9 @@ static const __DRIextension *intelExtens &driSwapControlExtension.base, &driFrameTrackingExtension.base, &driMediaStreamCounterExtension.base, +#if 0 &intelTexOffsetExtension.base, +#endif &intelTexBufferExtension.base, NULL }; From fedora-extras-commits at redhat.com Wed Mar 12 00:23:08 2008 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 12 Mar 2008 00:23:08 GMT Subject: rpms/gnome-theme-curvylooks/F-8 .cvsignore, 1.2, 1.3 gnome-theme-curvylooks.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803120023.m2C0N8vn031151@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/pkgs/rpms/gnome-theme-curvylooks/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31121/F-8 Modified Files: .cvsignore gnome-theme-curvylooks.spec sources Log Message: Update to 0.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-theme-curvylooks/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Nov 2007 05:14:43 -0000 1.2 +++ .cvsignore 12 Mar 2008 00:22:35 -0000 1.3 @@ -1 +1 @@ -curvylooks-0.2.tbz2 +curvylooks-0.3.gtp Index: gnome-theme-curvylooks.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-theme-curvylooks/F-8/gnome-theme-curvylooks.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-theme-curvylooks.spec 18 Nov 2007 05:09:07 -0000 1.1 +++ gnome-theme-curvylooks.spec 12 Mar 2008 00:22:35 -0000 1.2 @@ -1,14 +1,13 @@ Name: gnome-theme-curvylooks -Version: 0.2 +Version: 0.3 Release: 1%{?dist} Summary: A modern Clearlooks theme using a Bluecurve-like color scheme Group: User Interface/Desktops License: GPL+ -## TODO: Setup a proper, if minimal, website for this. :) -URL: http://codergeek42.livejournal.com/tag/curvylooks +URL: http://projects.thecodergeek.com/curvylooks/ -Source0: http://projects.thecodergeek.com/curvylooks/curvylooks-%{version}.tbz2 +Source0: http://projects.thecodergeek.com/curvylooks/downloads/curvylooks-%{version}.gtp BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -16,6 +15,13 @@ ## Requires 2.12 or later due to use of newer Clearlooks features such as the ## so-called "Gummy" style. Requires: gtk2-engines >= 2.12 +## Metacity pulls in many deps and is already installed on GNOME-based systems, +## since it is marked as "mandatory" in comps. However, the Tango icon set +## has minimal dependencies and, in the opinion of the author, adds a great +## deal of usability to the theme. Both are optional, so the Metacity one is +## not hard-coded. +Requires: tango-icon-theme + %description CurvyLooks, inspired by and based heavily on the work of Billy Cantrell's @@ -26,11 +32,11 @@ %prep -%setup -q -c +%setup -q -c %build -# Nothing to build. It's a data-only package... +## Nothing to build. It's a data-only package... %install @@ -45,12 +51,18 @@ %files %defattr(-,root,root,-) %doc ChangeLog COPYING README TODO -%{_datadir}/themes/CurvyLooks +%{_datadir}/themes/CurvyLooks/ %changelog +* Mon Mar 10 2008 Peter Gordon - 0.3-1 +- Update to new upstream release (0.3), which adds better GNOME Theme + integration (Metacity and Tango icon theme defaults). +- Update website and Source0 URLs. +- Other minor, aesthetic-only spec file fixes. + * Mon Nov 05 2007 Peter Gordon - 0.2-1 - Update to new upstream release (0.2), which fixes tooltips' shading. * Mon Oct 29 2007 Peter Gordon - 0.1-1 -- Initial Fedora packaging. \ No newline at end of file +- Initial Fedora packaging. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-theme-curvylooks/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Nov 2007 05:14:43 -0000 1.2 +++ sources 12 Mar 2008 00:22:35 -0000 1.3 @@ -1 +1 @@ -0434afee90a221d4a5aa3d722906b401 curvylooks-0.2.tbz2 +9a4942cd1a25c880febf6667a74c250a curvylooks-0.3.gtp From fedora-extras-commits at redhat.com Wed Mar 12 00:23:34 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 12 Mar 2008 00:23:34 GMT Subject: rpms/selinux-policy/F-8 policy-20070703.patch,1.193,1.194 Message-ID: <200803120023.m2C0NYRp031183@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31162 Modified Files: policy-20070703.patch Log Message: * Tue Mar 11 2008 Dan Walsh 3.0.8-93 - Allow syslog to connect to mysql - Allow lvm to manage its own fifo_files - Allow bugzilla to use ldap policy-20070703.patch: Index: policy-20070703.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-8/policy-20070703.patch,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- policy-20070703.patch 12 Mar 2008 00:04:26 -0000 1.193 +++ policy-20070703.patch 12 Mar 2008 00:23:31 -0000 1.194 @@ -19905,7 +19905,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.0.8/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2007-10-22 13:21:40.000000000 -0400 -+++ serefpolicy-3.0.8/policy/modules/system/logging.te 2008-03-11 19:41:54.000000000 -0400 ++++ serefpolicy-3.0.8/policy/modules/system/logging.te 2008-03-11 20:23:03.000000000 -0400 @@ -1,5 +1,5 @@ -policy_module(logging,1.7.3) @@ -20078,7 +20078,7 @@ # Allow users to define additional syslog ports to connect to corenet_tcp_bind_syslogd_port(syslogd_t) corenet_tcp_connect_syslogd_port(syslogd_t) -+corenet_tcp_connect_mysql_port(syslogd_t) ++corenet_tcp_connect_mysqld_port(syslogd_t) # syslog-ng can send or receive logs corenet_sendrecv_syslogd_client_packets(syslogd_t) From fedora-extras-commits at redhat.com Wed Mar 12 01:00:45 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 12 Mar 2008 01:00:45 GMT Subject: rpms/selinux-policy/devel booleans-mls.conf, 1.8, 1.9 policy-20071130.patch, 1.95, 1.96 selinux-policy.spec, 1.629, 1.630 Message-ID: <200803120100.m2C10jA4031981@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31942 Modified Files: booleans-mls.conf policy-20071130.patch selinux-policy.spec Log Message: * Tue Mar 11 2008 Dan Walsh 3.3.1-15 - Allow init to transition to initrc_t on shell exec. - Fix init to be able to sendto init_t. - Allow syslog to connect to mysql - Allow lvm to manage its own fifo_files - Allow bugzilla to use ldap - More mls fixes Index: booleans-mls.conf =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/booleans-mls.conf,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- booleans-mls.conf 19 Nov 2007 20:09:32 -0000 1.8 +++ booleans-mls.conf 12 Mar 2008 01:00:13 -0000 1.9 @@ -223,3 +223,7 @@ # Allow samba to act as the domain controller # samba_domain_controller = false + +# Run the xserver as an object manager +# +xserver_object_manager = true policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- policy-20071130.patch 11 Mar 2008 22:46:00 -0000 1.95 +++ policy-20071130.patch 12 Mar 2008 01:00:13 -0000 1.96 @@ -8483,7 +8483,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.3.1/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/apache.te 2008-02-29 13:36:51.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/apache.te 2008-03-11 19:28:21.000000000 -0400 @@ -20,6 +20,8 @@ # Declarations # @@ -8975,7 +8975,7 @@ ') ######################################## -@@ -724,3 +859,46 @@ +@@ -724,3 +859,47 @@ logging_search_logs(httpd_rotatelogs_t) miscfiles_read_localization(httpd_rotatelogs_t) @@ -9013,6 +9013,7 @@ +mta_send_mail(httpd_bugzilla_script_t) + +sysnet_read_config(httpd_bugzilla_script_t) ++sysnet_use_ldap(httpd_bugzilla_script_t) + +optional_policy(` + mysql_search_db(httpd_bugzilla_script_t) @@ -19545,6 +19546,17 @@ userdom_use_unpriv_users_fds(remote_login_t) userdom_search_all_users_home_content(remote_login_t) # Only permit unprivileged user domains to be entered via rlogin, +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-3.3.1/policy/modules/services/rhgb.te +--- nsaserefpolicy/policy/modules/services/rhgb.te 2007-12-19 05:32:17.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/rhgb.te 2008-03-11 20:07:53.000000000 -0400 +@@ -92,6 +92,7 @@ + term_getattr_pty_fs(rhgb_t) + + init_write_initctl(rhgb_t) ++init_chat(rhgb_t) + + libs_use_ld_so(rhgb_t) + libs_use_shared_libs(rhgb_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-3.3.1/policy/modules/services/ricci.if --- nsaserefpolicy/policy/modules/services/ricci.if 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/services/ricci.if 2008-02-26 08:29:22.000000000 -0500 @@ -20154,8 +20166,34 @@ +/etc/rc.d/init.d/smb -- gen_context(system_u:object_r:samba_script_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.3.1/policy/modules/services/samba.if --- nsaserefpolicy/policy/modules/services/samba.if 2007-10-12 08:56:07.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/services/samba.if 2008-02-26 21:19:09.000000000 -0500 -@@ -63,6 +63,25 @@ ++++ serefpolicy-3.3.1/policy/modules/services/samba.if 2008-03-11 17:56:00.000000000 -0400 +@@ -52,6 +52,25 @@ + ## + ## + # ++interface(`samba_domtrans_smb',` ++ gen_require(` ++ type smbd_t, smbd_exec_t; ++ ') ++ ++ corecmd_search_bin($1) ++ domtrans_pattern($1,smbd_exec_t,smbd_t) ++') ++ ++######################################## ++## ++## Execute samba net in the samba_net domain. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# + interface(`samba_domtrans_net',` + gen_require(` + type samba_net_t, samba_net_exec_t; +@@ -63,6 +82,25 @@ ######################################## ## @@ -20181,7 +20219,7 @@ ## Execute samba net in the samba_net domain, and ## allow the specified role the samba_net domain. ## -@@ -95,6 +114,38 @@ +@@ -95,6 +133,38 @@ ######################################## ## @@ -20220,7 +20258,7 @@ ## Execute smbmount in the smbmount domain. ## ## -@@ -331,6 +382,25 @@ +@@ -331,6 +401,25 @@ ######################################## ## @@ -20246,7 +20284,7 @@ ## Allow the specified domain to ## read and write samba /var files. ## -@@ -348,6 +418,7 @@ +@@ -348,6 +437,7 @@ files_search_var($1) files_search_var_lib($1) manage_files_pattern($1,samba_var_t,samba_var_t) @@ -20254,7 +20292,7 @@ ') ######################################## -@@ -492,3 +563,221 @@ +@@ -492,3 +582,221 @@ allow $1 samba_var_t:dir search_dir_perms; stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t) ') @@ -21371,7 +21409,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.3.1/policy/modules/services/smartmon.te --- nsaserefpolicy/policy/modules/services/smartmon.te 2008-02-15 09:52:56.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/smartmon.te 2008-02-26 08:29:22.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/services/smartmon.te 2008-03-11 18:55:46.000000000 -0400 @@ -16,6 +16,9 @@ type fsdaemon_tmp_t; files_tmp_file(fsdaemon_tmp_t) @@ -21382,6 +21420,14 @@ ######################################## # # Local policy +@@ -62,6 +65,7 @@ + fs_search_auto_mountpoints(fsdaemon_t) + + mls_file_read_all_levels(fsdaemon_t) ++mls_file_write_all_levels(fsdaemon_t) + + storage_raw_read_fixed_disk(fsdaemon_t) + storage_raw_write_fixed_disk(fsdaemon_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.3.1/policy/modules/services/snmp.fc --- nsaserefpolicy/policy/modules/services/snmp.fc 2007-06-19 16:23:06.000000000 -0400 +++ serefpolicy-3.3.1/policy/modules/services/snmp.fc 2008-02-26 08:29:22.000000000 -0500 @@ -23383,7 +23429,7 @@ /var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.3.1/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-12-04 11:02:50.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-10 16:54:19.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-11 19:56:07.000000000 -0400 @@ -12,9 +12,15 @@ ## ## @@ -23468,7 +23514,7 @@ files_read_etc_files($1_xserver_t) files_read_etc_runtime_files($1_xserver_t) -@@ -140,12 +159,16 @@ +@@ -140,26 +159,37 @@ fs_getattr_xattr_fs($1_xserver_t) fs_search_nfs($1_xserver_t) fs_search_auto_mountpoints($1_xserver_t) @@ -23486,7 +23532,10 @@ term_setattr_unallocated_ttys($1_xserver_t) term_use_unallocated_ttys($1_xserver_t) -@@ -153,13 +176,17 @@ ++ mls_file_read_to_clearance($1_xserver_t) ++ mls_file_write_to_clearance($1_xserver_t) ++ + libs_use_ld_so($1_xserver_t) libs_use_shared_libs($1_xserver_t) logging_send_syslog_msg($1_xserver_t) @@ -23505,7 +23554,7 @@ ifndef(`distro_redhat',` allow $1_xserver_t self:process { execmem execheap execstack }; -@@ -169,6 +196,46 @@ +@@ -169,6 +199,46 @@ allow $1_xserver_t self:process { execmem execheap execstack }; ') @@ -23552,7 +23601,7 @@ optional_policy(` apm_stream_connect($1_xserver_t) ') -@@ -223,8 +290,10 @@ +@@ -223,8 +293,10 @@ template(`xserver_per_role_template',` gen_require(` @@ -23565,7 +23614,7 @@ ') ############################## -@@ -232,189 +301,119 @@ +@@ -232,189 +304,119 @@ # Declarations # @@ -23704,15 +23753,15 @@ - allow $1_xauth_t self:process signal; - allow $1_xauth_t self:unix_stream_socket create_stream_socket_perms; -+ domtrans_pattern($2, xauth_exec_t, xauth_t) - +- - allow $1_xauth_t $1_xauth_home_t:file manage_file_perms; - userdom_user_home_dir_filetrans($1,$1_xauth_t,$1_xauth_home_t,file) - - manage_dirs_pattern($1_xauth_t,$1_xauth_tmp_t,$1_xauth_tmp_t) - manage_files_pattern($1_xauth_t,$1_xauth_tmp_t,$1_xauth_tmp_t) - files_tmp_filetrans($1_xauth_t, $1_xauth_tmp_t, { file dir }) -- ++ domtrans_pattern($2, xauth_exec_t, xauth_t) + - domtrans_pattern($2, xauth_exec_t, $1_xauth_t) - - allow $2 $1_xauth_t:process signal; @@ -23726,10 +23775,10 @@ - - allow xdm_t $1_xauth_home_t:file manage_file_perms; - userdom_user_home_dir_filetrans($1,xdm_t,$1_xauth_home_t,file) -- -- domain_use_interactive_fds($1_xauth_t) + ps_process_pattern($2,xauth_t) +- domain_use_interactive_fds($1_xauth_t) +- - files_read_etc_files($1_xauth_t) - files_search_pids($1_xauth_t) - @@ -23779,47 +23828,47 @@ # allow ps to show iceauth - ps_process_pattern($2,$1_iceauth_t) + ps_process_pattern($2,iceauth_t) -+ -+ allow $2 user_iceauth_home_t:file manage_file_perms; -+ allow $2 user_iceauth_home_t:file { relabelfrom relabelto }; - allow $2 $1_iceauth_home_t:file manage_file_perms; - allow $2 $1_iceauth_home_t:file { relabelfrom relabelto }; -+ userdom_use_user_terminals($1,iceauth_t) ++ allow $2 user_iceauth_home_t:file manage_file_perms; ++ allow $2 user_iceauth_home_t:file { relabelfrom relabelto }; - allow xdm_t $1_iceauth_home_t:file read_file_perms; ++ userdom_use_user_terminals($1,iceauth_t) + +- fs_search_auto_mountpoints($1_iceauth_t) + optional_policy(` + xserver_read_user_iceauth($1, $2) + ') -- fs_search_auto_mountpoints($1_iceauth_t) +- libs_use_ld_so($1_iceauth_t) +- libs_use_shared_libs($1_iceauth_t) + ############################## + # + # User X object manager local policy + # -- libs_use_ld_so($1_iceauth_t) -- libs_use_shared_libs($1_iceauth_t) +- userdom_use_user_terminals($1,$1_iceauth_t) + # Device rules + allow xdm_x_domain $2:x_device { getattr setattr setfocus grab bell }; -- userdom_use_user_terminals($1,$1_iceauth_t) -+ allow $2 { input_xevent_t }:x_event send; -+ allow $2 { x_rootwindow_t xdm_x_domain }:x_drawable send; - - tunable_policy(`use_nfs_home_dirs',` - fs_manage_nfs_files($1_iceauth_t) - ') -+ mls_xwin_read_to_clearance($2) ++ allow $2 { input_xevent_t }:x_event send; ++ allow $2 { x_rootwindow_t xdm_x_domain }:x_drawable send; - tunable_policy(`use_samba_home_dirs',` - fs_manage_cifs_files($1_iceauth_t) - ') ++ mls_xwin_read_to_clearance($2) ++ + xserver_user_x_domain_template($1,$1_t,$1_t,$1_tmpfs_t) ') ####################################### -@@ -521,19 +520,18 @@ +@@ -521,19 +523,18 @@ ## # template(`xserver_user_client_template',` @@ -23847,7 +23896,7 @@ # for when /tmp/.X11-unix is created by the system allow $2 xdm_t:fd use; -@@ -542,25 +540,542 @@ +@@ -542,25 +543,541 @@ allow $2 xdm_tmp_t:sock_file { read write }; dontaudit $2 xdm_t:tcp_socket { read write }; @@ -23974,7 +24023,6 @@ + type screensaver_xext_t, unknown_xext_t, x_rootscreen_t; + type disallowed_xext_t; + type output_xext_t; -+ type accelgraphics_xext_t, xdm_xserver_t; + + attribute x_server_domain, x_domain; + attribute xproperty_type; @@ -24009,7 +24057,6 @@ + allow $1 std_xext_t:x_extension query; + allow $1 x_rootwindow_t:x_drawable { get_property getattr }; + -+ + # Hacks + # everyone can get the input focus of everyone else + # this is a fundamental brokenness in the X protocol @@ -24083,10 +24130,11 @@ + + # X Input + # can receive own events -+ allow $1 input_xevent_t:{ x_event x_synthetic_event } receive; ++ allow $1 input_xevent_t:{ x_event x_synthetic_event } { send receive }; + allow $1 $1:{ x_event x_synthetic_event } { send receive }; + allow $1 default_xevent_t:x_event receive; -+ allow $1 default_xevent_t:x_synthetic_event send; ++ allow $1 default_xevent_t:x_synthetic_event { receive send }; ++ + + # can receive certain root window events + allow $1 focus_xevent_t:x_event receive; @@ -24396,7 +24444,7 @@ ') ') -@@ -593,26 +1107,44 @@ +@@ -593,26 +1110,44 @@ # template(`xserver_use_user_fonts',` gen_require(` @@ -24448,14 +24496,15 @@ ## Transition to a user Xauthority domain. ## ## -@@ -638,10 +1170,77 @@ +@@ -638,10 +1173,77 @@ # template(`xserver_domtrans_user_xauth',` gen_require(` - type $1_xauth_t, xauth_exec_t; + type xauth_exec_t, xauth_t; -+ ') -+ + ') + +- domtrans_pattern($2, xauth_exec_t, $1_xauth_t) + domtrans_pattern($2, xauth_exec_t, xauth_t) +') + @@ -24520,15 +24569,14 @@ +template(`xserver_read_user_iceauth',` + gen_require(` + type user_iceauth_home_t; - ') - -- domtrans_pattern($2, xauth_exec_t, $1_xauth_t) ++ ') ++ + # Read .Iceauthority file + allow $2 user_iceauth_home_t:file { getattr read }; ') ######################################## -@@ -671,10 +1270,10 @@ +@@ -671,10 +1273,10 @@ # template(`xserver_user_home_dir_filetrans_user_xauth',` gen_require(` @@ -24541,7 +24589,7 @@ ') ######################################## -@@ -760,7 +1359,7 @@ +@@ -760,7 +1362,7 @@ type xconsole_device_t; ') @@ -24550,7 +24598,7 @@ ') ######################################## -@@ -860,6 +1459,25 @@ +@@ -860,6 +1462,25 @@ ######################################## ## @@ -24576,7 +24624,7 @@ ## Read xdm-writable configuration files. ## ## -@@ -914,6 +1532,7 @@ +@@ -914,6 +1535,7 @@ files_search_tmp($1) allow $1 xdm_tmp_t:dir list_dir_perms; create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t) @@ -24584,7 +24632,7 @@ ') ######################################## -@@ -955,6 +1574,24 @@ +@@ -955,6 +1577,24 @@ ######################################## ## @@ -24609,7 +24657,7 @@ ## Execute the X server in the XDM X server domain. ## ## -@@ -965,15 +1602,47 @@ +@@ -965,15 +1605,47 @@ # interface(`xserver_domtrans_xdm_xserver',` gen_require(` @@ -24658,7 +24706,7 @@ ## Make an X session script an entrypoint for the specified domain. ## ## -@@ -1123,7 +1792,7 @@ +@@ -1123,7 +1795,7 @@ type xdm_xserver_tmp_t; ') @@ -24667,7 +24715,7 @@ ') ######################################## -@@ -1312,3 +1981,83 @@ +@@ -1312,3 +1984,83 @@ files_search_tmp($1) stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t) ') @@ -24753,7 +24801,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.3.1/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.te 2008-03-10 14:23:28.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.te 2008-03-11 19:35:25.000000000 -0400 @@ -8,6 +8,14 @@ ## @@ -24896,7 +24944,19 @@ init_system_domain(xdm_xserver_t,xserver_exec_t) ifdef(`enable_mcs',` -@@ -95,8 +191,9 @@ +@@ -86,6 +182,11 @@ + init_ranged_daemon_domain(xdm_t,xdm_exec_t,s0 - mcs_systemhigh) + ') + ++ifdef(`enable_mls',` ++ init_ranged_domain(xdm_t,xdm_exec_t,s0 - mls_systemhigh) ++ init_ranged_daemon_domain(xdm_t,xdm_exec_t,s0 - mls_systemhigh) ++') ++ + optional_policy(` + prelink_object_file(xkb_var_lib_t) + ') +@@ -95,8 +196,9 @@ # XDM Local policy # @@ -24908,7 +24968,7 @@ allow xdm_t self:fifo_file rw_fifo_file_perms; allow xdm_t self:shm create_shm_perms; allow xdm_t self:sem create_sem_perms; -@@ -109,6 +206,8 @@ +@@ -109,6 +211,8 @@ allow xdm_t self:key { search link write }; allow xdm_t xconsole_device_t:fifo_file { getattr setattr }; @@ -24917,7 +24977,7 @@ # Allow gdm to run gdm-binary can_exec(xdm_t, xdm_exec_t) -@@ -131,15 +230,22 @@ +@@ -131,15 +235,22 @@ manage_fifo_files_pattern(xdm_t,xdm_tmpfs_t,xdm_tmpfs_t) manage_sock_files_pattern(xdm_t,xdm_tmpfs_t,xdm_tmpfs_t) fs_tmpfs_filetrans(xdm_t,xdm_tmpfs_t,{ dir file lnk_file sock_file fifo_file }) @@ -24941,7 +25001,7 @@ allow xdm_t xdm_xserver_t:process signal; allow xdm_t xdm_xserver_t:unix_stream_socket connectto; -@@ -153,6 +259,7 @@ +@@ -153,6 +264,7 @@ allow xdm_t xdm_xserver_t:process { noatsecure siginh rlimitinh signal sigkill }; allow xdm_t xdm_xserver_t:shm rw_shm_perms; @@ -24949,7 +25009,7 @@ # connect to xdm xserver over stream socket stream_connect_pattern(xdm_t,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t) -@@ -173,6 +280,8 @@ +@@ -173,6 +285,8 @@ corecmd_exec_shell(xdm_t) corecmd_exec_bin(xdm_t) @@ -24958,7 +25018,7 @@ corenet_all_recvfrom_unlabeled(xdm_t) corenet_all_recvfrom_netlabel(xdm_t) -@@ -184,6 +293,7 @@ +@@ -184,6 +298,7 @@ corenet_udp_sendrecv_all_ports(xdm_t) corenet_tcp_bind_all_nodes(xdm_t) corenet_udp_bind_all_nodes(xdm_t) @@ -24966,7 +25026,7 @@ corenet_tcp_connect_all_ports(xdm_t) corenet_sendrecv_all_client_packets(xdm_t) # xdm tries to bind to biff_port_t -@@ -196,6 +306,7 @@ +@@ -196,6 +311,7 @@ dev_getattr_mouse_dev(xdm_t) dev_setattr_mouse_dev(xdm_t) dev_rw_apm_bios(xdm_t) @@ -24974,7 +25034,7 @@ dev_setattr_apm_bios_dev(xdm_t) dev_rw_dri(xdm_t) dev_rw_agp(xdm_t) -@@ -208,8 +319,8 @@ +@@ -208,8 +324,8 @@ dev_setattr_video_dev(xdm_t) dev_getattr_scanner_dev(xdm_t) dev_setattr_scanner_dev(xdm_t) @@ -24985,7 +25045,7 @@ dev_getattr_power_mgmt_dev(xdm_t) dev_setattr_power_mgmt_dev(xdm_t) -@@ -226,6 +337,7 @@ +@@ -226,6 +342,7 @@ files_read_usr_files(xdm_t) # Poweroff wants to create the /poweroff file when run from xdm files_create_boot_flag(xdm_t) @@ -24993,7 +25053,7 @@ fs_getattr_all_fs(xdm_t) fs_search_auto_mountpoints(xdm_t) -@@ -237,6 +349,7 @@ +@@ -237,6 +354,7 @@ storage_dontaudit_raw_write_removable_device(xdm_t) storage_dontaudit_setattr_removable_dev(xdm_t) storage_dontaudit_rw_scsi_generic(xdm_t) @@ -25001,7 +25061,7 @@ term_setattr_console(xdm_t) term_use_unallocated_ttys(xdm_t) -@@ -245,6 +358,7 @@ +@@ -245,6 +363,7 @@ auth_domtrans_pam_console(xdm_t) auth_manage_pam_pid(xdm_t) auth_manage_pam_console_data(xdm_t) @@ -25009,7 +25069,7 @@ auth_rw_faillog(xdm_t) auth_write_login_records(xdm_t) -@@ -256,12 +370,11 @@ +@@ -256,12 +375,11 @@ libs_exec_lib_files(xdm_t) logging_read_generic_logs(xdm_t) @@ -25023,7 +25083,7 @@ userdom_dontaudit_use_unpriv_user_fds(xdm_t) userdom_dontaudit_search_sysadm_home_dirs(xdm_t) userdom_create_all_users_keys(xdm_t) -@@ -270,8 +383,13 @@ +@@ -270,8 +388,13 @@ # Search /proc for any user domain processes. userdom_read_all_users_state(xdm_t) userdom_signal_all_users(xdm_t) @@ -25037,7 +25097,7 @@ tunable_policy(`use_nfs_home_dirs',` fs_manage_nfs_dirs(xdm_t) -@@ -304,7 +422,11 @@ +@@ -304,7 +427,11 @@ ') optional_policy(` @@ -25050,7 +25110,7 @@ ') optional_policy(` -@@ -312,6 +434,23 @@ +@@ -312,6 +439,23 @@ ') optional_policy(` @@ -25074,7 +25134,7 @@ # Talk to the console mouse server. gpm_stream_connect(xdm_t) gpm_setattr_gpmctl(xdm_t) -@@ -322,6 +461,10 @@ +@@ -322,6 +466,10 @@ ') optional_policy(` @@ -25085,7 +25145,7 @@ loadkeys_exec(xdm_t) ') -@@ -335,6 +478,11 @@ +@@ -335,6 +483,11 @@ ') optional_policy(` @@ -25097,7 +25157,7 @@ seutil_sigchld_newrole(xdm_t) ') -@@ -343,8 +491,8 @@ +@@ -343,8 +496,8 @@ ') optional_policy(` @@ -25107,7 +25167,7 @@ ifndef(`distro_redhat',` allow xdm_t self:process { execheap execmem }; -@@ -380,7 +528,7 @@ +@@ -380,7 +533,7 @@ allow xdm_xserver_t xdm_var_lib_t:file { getattr read }; dontaudit xdm_xserver_t xdm_var_lib_t:dir search; @@ -25116,7 +25176,7 @@ # Label pid and temporary files with derived types. manage_files_pattern(xdm_xserver_t,xdm_tmp_t,xdm_tmp_t) -@@ -392,6 +540,15 @@ +@@ -392,6 +545,15 @@ can_exec(xdm_xserver_t, xkb_var_lib_t) files_search_var_lib(xdm_xserver_t) @@ -25132,7 +25192,7 @@ # VNC v4 module in X server corenet_tcp_bind_vnc_port(xdm_xserver_t) -@@ -404,9 +561,17 @@ +@@ -404,9 +566,17 @@ # to read ROLE_home_t - examine this in more detail # (xauth?) userdom_read_unpriv_users_home_content_files(xdm_xserver_t) @@ -25150,7 +25210,7 @@ tunable_policy(`use_nfs_home_dirs',` fs_manage_nfs_dirs(xdm_xserver_t) fs_manage_nfs_files(xdm_xserver_t) -@@ -420,6 +585,22 @@ +@@ -420,6 +590,22 @@ ') optional_policy(` @@ -25173,7 +25233,7 @@ resmgr_stream_connect(xdm_t) ') -@@ -429,47 +610,139 @@ +@@ -429,47 +615,139 @@ ') optional_policy(` @@ -25223,21 +25283,22 @@ + +tunable_policy(`allow_xserver_execmem', ` + allow xdm_xserver_t self:process { execheap execmem execstack }; - ') - ++') ++ +ifndef(`distro_redhat',` + allow xdm_xserver_t self:process { execheap execmem }; +') + +ifdef(`distro_rhel4',` + allow xdm_xserver_t self:process { execheap execmem }; -+') -+ + ') + +############################## # -# Wants to delete .xsession-errors file +# xauth_t Local policy -+# + # +-allow xdm_t user_home_type:file unlink; +domtrans_pattern(xdm_xserver_t, xauth_exec_t, xauth_t) + +userdom_user_home_dir_filetrans(user,xauth_t,user_xauth_home_t,file) @@ -25284,10 +25345,11 @@ + +############################## # --allow xdm_t user_home_type:file unlink; +-# Should fix exec of pam_timestamp_check is not closing xdm file descriptor +# iceauth_t Local policy # --# Should fix exec of pam_timestamp_check is not closing xdm file descriptor +-allow pam_t xdm_t:fifo_file { getattr ioctl write }; +-') dnl end TODO + +allow iceauth_t user_iceauth_home_t:file manage_file_perms; +userdom_user_home_dir_filetrans($1,iceauth_t,user_iceauth_home_t,file) @@ -25311,9 +25373,7 @@ +userdom_sysadm_home_dir_filetrans(xauth_t, admin_xauth_home_t, file) + +######################################## - # --allow pam_t xdm_t:fifo_file { getattr ioctl write }; --') dnl end TODO ++# +# Rules for unconfined access to this module +# + @@ -25744,7 +25804,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.3.1/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2008-02-19 17:24:26.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/authlogin.te 2008-03-05 15:46:36.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/authlogin.te 2008-03-11 17:52:13.000000000 -0400 @@ -59,6 +59,9 @@ type utempter_exec_t; application_domain(utempter_t,utempter_exec_t) @@ -25944,7 +26004,7 @@ ') ') -@@ -463,11 +470,13 @@ +@@ -463,11 +470,12 @@ interface(`init_telinit',` gen_require(` type initctl_t; @@ -25955,7 +26015,6 @@ allow $1 initctl_t:fifo_file rw_fifo_file_perms; - + allow $1 init_t:unix_dgram_socket sendto; -+ allow init_t $1:unix_dgram_socket sendto; init_exec($1) ') @@ -26270,7 +26329,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.3.1/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2008-02-26 08:17:43.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/init.te 2008-03-07 16:07:39.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/init.te 2008-03-11 18:57:27.000000000 -0400 @@ -10,6 +10,20 @@ # Declarations # @@ -26333,6 +26392,15 @@ # is ~sys_module really needed? observed: # sys_boot # sys_tty_config +@@ -86,7 +112,7 @@ + # Re-exec itself + can_exec(init_t,init_exec_t) + +-allow init_t initrc_t:unix_stream_socket connectto; ++allow init_t initrc_t:unix_stream_socket { connectto rw_stream_socket_perms }; + + # For /var/run/shutdown.pid. + allow init_t init_var_run_t:file manage_file_perms; @@ -102,8 +128,11 @@ kernel_read_system_state(init_t) kernel_share_state(init_t) @@ -26354,7 +26422,7 @@ ifdef(`distro_gentoo',` allow init_t self:process { getcap setcap }; ') -@@ -163,22 +194,31 @@ +@@ -163,22 +194,25 @@ fs_tmpfs_filetrans(init_t,initctl_t,fifo_file) ') @@ -26382,18 +26450,12 @@ -optional_policy(` - unconfined_domain(init_t) +ifndef(`distro_ubuntu',` -+# Run the shell in the unconfined_t or sysadm_t domain for single-user mode. -+ifdef(`enable_mls',` -+ userdom_shell_domtrans_sysadm(init_t) -+',` -+ optional_policy(` -+ unconfined_shell_domtrans(init_t) -+ ') -+') ++ corecmd_shell_domtrans(init_t,initrc_t) ++ corecmd_shell_entry_type(initrc_t) ') ######################################## -@@ -187,7 +227,7 @@ +@@ -187,7 +221,7 @@ # allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched }; @@ -26402,7 +26464,7 @@ dontaudit initrc_t self:capability sys_module; # sysctl is triggering this allow initrc_t self:passwd rootok; -@@ -201,10 +241,9 @@ +@@ -201,10 +235,9 @@ allow initrc_t initrc_devpts_t:chr_file rw_term_perms; term_create_pty(initrc_t,initrc_devpts_t) @@ -26415,7 +26477,16 @@ manage_dirs_pattern(initrc_t,initrc_state_t,initrc_state_t) manage_files_pattern(initrc_t,initrc_state_t,initrc_state_t) -@@ -283,7 +322,6 @@ +@@ -257,7 +290,7 @@ + dev_read_sound_mixer(initrc_t) + dev_write_sound_mixer(initrc_t) + dev_setattr_all_chr_files(initrc_t) +-dev_read_lvm_control(initrc_t) ++dev_rw_lvm_control(initrc_t) + dev_delete_lvm_control_dev(initrc_t) + dev_manage_generic_symlinks(initrc_t) + dev_manage_generic_files(initrc_t) +@@ -283,7 +316,6 @@ mls_process_read_up(initrc_t) mls_process_write_down(initrc_t) mls_rangetrans_source(initrc_t) @@ -26423,7 +26494,7 @@ selinux_get_enforce_mode(initrc_t) -@@ -496,6 +534,31 @@ +@@ -496,6 +528,31 @@ ') ') @@ -26455,7 +26526,7 @@ optional_policy(` amavis_search_lib(initrc_t) amavis_setattr_pid_files(initrc_t) -@@ -559,14 +622,6 @@ +@@ -559,14 +616,6 @@ ') optional_policy(` @@ -26470,7 +26541,7 @@ ftp_read_config(initrc_t) ') -@@ -639,12 +694,6 @@ +@@ -639,12 +688,6 @@ mta_read_config(initrc_t) mta_dontaudit_read_spool_symlinks(initrc_t) ') @@ -26483,7 +26554,7 @@ optional_policy(` ifdef(`distro_redhat',` -@@ -705,6 +754,9 @@ +@@ -705,6 +748,9 @@ # why is this needed: rpm_manage_db(initrc_t) @@ -26493,7 +26564,7 @@ ') optional_policy(` -@@ -717,9 +769,11 @@ +@@ -717,9 +763,11 @@ squid_manage_logs(initrc_t) ') @@ -26508,7 +26579,7 @@ ') optional_policy(` -@@ -738,6 +792,11 @@ +@@ -738,6 +786,11 @@ uml_setattr_util_sockets(initrc_t) ') @@ -26520,7 +26591,7 @@ optional_policy(` unconfined_domain(initrc_t) -@@ -752,6 +811,10 @@ +@@ -752,6 +805,10 @@ ') optional_policy(` @@ -26531,7 +26602,7 @@ vmware_read_system_config(initrc_t) vmware_append_system_config(initrc_t) ') -@@ -774,3 +837,4 @@ +@@ -774,3 +831,4 @@ optional_policy(` zebra_read_config(initrc_t) ') @@ -26927,7 +26998,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.3.1/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2008-02-26 08:17:43.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/logging.te 2008-03-10 12:22:41.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/logging.te 2008-03-11 20:22:56.000000000 -0400 @@ -61,10 +61,24 @@ logging_log_file(var_log_t) files_mountpoint(var_log_t) @@ -27007,15 +27078,22 @@ # manage temporary files manage_dirs_pattern(syslogd_t,syslogd_tmp_t,syslogd_tmp_t) manage_files_pattern(syslogd_t,syslogd_tmp_t,syslogd_tmp_t) -@@ -327,6 +349,7 @@ +@@ -327,6 +349,8 @@ # Allow users to define additional syslog ports to connect to corenet_tcp_bind_syslogd_port(syslogd_t) corenet_tcp_connect_syslogd_port(syslogd_t) +corenet_tcp_connect_postgresql_port(syslogd_t) ++corenet_tcp_connect_mysqld_port(syslogd_t) # syslog-ng can send or receive logs corenet_sendrecv_syslogd_client_packets(syslogd_t) -@@ -344,14 +367,14 @@ +@@ -339,19 +363,20 @@ + domain_use_interactive_fds(syslogd_t) + + files_read_etc_files(syslogd_t) ++files_read_usr_files(syslogd_t) + files_read_var_files(syslogd_t) + files_read_etc_runtime_files(syslogd_t) # /initrd is not umounted before minilog starts files_dontaudit_search_isid_type_dirs(syslogd_t) @@ -27032,7 +27110,7 @@ miscfiles_read_localization(syslogd_t) userdom_dontaudit_use_unpriv_user_fds(syslogd_t) -@@ -380,15 +403,11 @@ +@@ -380,15 +405,11 @@ ') optional_policy(` @@ -27050,7 +27128,7 @@ ') optional_policy(` -@@ -399,3 +418,37 @@ +@@ -399,3 +420,37 @@ # log to the xconsole xserver_rw_console(syslogd_t) ') @@ -27088,9 +27166,20 @@ +logging_domtrans_audisp(auditd_t) +logging_audisp_signal(auditd_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.3.1/policy/modules/system/lvm.fc +--- nsaserefpolicy/policy/modules/system/lvm.fc 2007-12-12 11:35:28.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/lvm.fc 2008-03-11 18:59:24.000000000 -0400 +@@ -55,6 +55,7 @@ + /sbin/lvs -- gen_context(system_u:object_r:lvm_exec_t,s0) + /sbin/lvscan -- gen_context(system_u:object_r:lvm_exec_t,s0) + /sbin/multipathd -- gen_context(system_u:object_r:lvm_exec_t,s0) ++/sbin/multipath\.static -- gen_context(system_u:object_r:lvm_exec_t,s0) + /sbin/pvchange -- gen_context(system_u:object_r:lvm_exec_t,s0) + /sbin/pvcreate -- gen_context(system_u:object_r:lvm_exec_t,s0) + /sbin/pvdata -- gen_context(system_u:object_r:lvm_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.3.1/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/lvm.te 2008-02-27 23:23:39.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/lvm.te 2008-03-11 19:04:42.000000000 -0400 @@ -44,9 +44,9 @@ # Cluster LVM daemon local policy # @@ -27151,7 +27240,7 @@ userdom_dontaudit_use_unpriv_user_fds(clvmd_t) userdom_dontaudit_search_sysadm_home_dirs(clvmd_t) -@@ -146,7 +159,8 @@ +@@ -146,17 +159,19 @@ # DAC overrides and mknod for modifying /dev entries (vgmknodes) # rawio needed for dmraid @@ -27161,7 +27250,10 @@ dontaudit lvm_t self:capability sys_tty_config; allow lvm_t self:process { sigchld sigkill sigstop signull signal }; # LVM will complain a lot if it cannot set its priority. -@@ -156,7 +170,8 @@ + allow lvm_t self:process setsched; + allow lvm_t self:file rw_file_perms; +-allow lvm_t self:fifo_file rw_file_perms; ++allow lvm_t self:fifo_file manage_fifo_file_perms; allow lvm_t self:unix_dgram_socket create_socket_perms; allow lvm_t self:netlink_kobject_uevent_socket create_socket_perms; @@ -27634,8 +27726,8 @@ +/usr/bin/qemu-kvm -- gen_context(system_u:object_r:qemu_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/qemu.if serefpolicy-3.3.1/policy/modules/system/qemu.if --- nsaserefpolicy/policy/modules/system/qemu.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/qemu.if 2008-03-10 10:10:04.000000000 -0400 -@@ -0,0 +1,294 @@ ++++ serefpolicy-3.3.1/policy/modules/system/qemu.if 2008-03-11 17:53:51.000000000 -0400 +@@ -0,0 +1,303 @@ + +## policy for qemu + @@ -27885,6 +27977,10 @@ + allow $1_t self:unix_stream_socket create_stream_socket_perms; + allow $1_t self:shm create_shm_perms; + ++ allow $1_t $1_tmp_t:dir manage_dir_perms; ++ allow $1_t $1_tmp_t:file manage_file_perms; ++ files_tmp_filetrans($1_t, $1_tmp_t, { file dir }) ++ + corenet_all_recvfrom_unlabeled($1_t) + corenet_all_recvfrom_netlabel($1_t) + corenet_tcp_sendrecv_all_if($1_t) @@ -27903,6 +27999,7 @@ + files_read_var_files($1_t) + files_search_all($1_t) + ++ fs_list_inotify($1_t) + fs_rw_anon_inodefs_files($1_t) + fs_rw_tmpfs_files($1_t) + @@ -27924,6 +28021,10 @@ + virt_read_config($1_t) + + optional_policy(` ++ samba_domtrans_smb($1_t) ++ ') ++ ++ optional_policy(` + xserver_stream_connect_xdm_xserver($1_t) + xserver_read_xdm_tmp_files($1_t) + xserver_xdm_rw_shm($1_t) @@ -28585,7 +28686,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.3.1/policy/modules/system/sysnetwork.if --- nsaserefpolicy/policy/modules/system/sysnetwork.if 2007-07-16 14:09:49.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.if 2008-03-06 11:55:26.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.if 2008-03-11 19:26:26.000000000 -0400 @@ -145,6 +145,25 @@ ######################################## Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.629 retrieving revision 1.630 diff -u -r1.629 -r1.630 --- selinux-policy.spec 11 Mar 2008 22:46:00 -0000 1.629 +++ selinux-policy.spec 12 Mar 2008 01:00:13 -0000 1.630 @@ -17,12 +17,11 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz patch: policy-20071130.patch -Patch2: policy-init.patch Source1: modules-targeted.conf Source2: booleans-targeted.conf Source3: Makefile.devel @@ -180,7 +179,6 @@ %prep %setup -n serefpolicy-%{version} -q %patch -p1 -%patch2 -p1 %install # Build targeted policy @@ -390,6 +388,14 @@ %endif %changelog +* Tue Mar 11 2008 Dan Walsh 3.3.1-15 +- Allow init to transition to initrc_t on shell exec. +- Fix init to be able to sendto init_t. +- Allow syslog to connect to mysql +- Allow lvm to manage its own fifo_files +- Allow bugzilla to use ldap +- More mls fixes + * Tue Mar 11 2008 Bill Nottingham 3.3.1-14 - fixes for init policy (#436988) - fix build From fedora-extras-commits at redhat.com Wed Mar 12 01:10:46 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 12 Mar 2008 01:10:46 GMT Subject: rpms/selinux-policy/devel policy-20071130.patch,1.96,1.97 Message-ID: <200803120110.m2C1AkVf005914@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5891 Modified Files: policy-20071130.patch Log Message: * Tue Mar 11 2008 Dan Walsh 3.3.1-15 - Allow init to transition to initrc_t on shell exec. - Fix init to be able to sendto init_t. - Allow syslog to connect to mysql - Allow lvm to manage its own fifo_files - Allow bugzilla to use ldap - More mls fixes policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- policy-20071130.patch 12 Mar 2008 01:00:13 -0000 1.96 +++ policy-20071130.patch 12 Mar 2008 01:10:44 -0000 1.97 @@ -27726,7 +27726,7 @@ +/usr/bin/qemu-kvm -- gen_context(system_u:object_r:qemu_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/qemu.if serefpolicy-3.3.1/policy/modules/system/qemu.if --- nsaserefpolicy/policy/modules/system/qemu.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/qemu.if 2008-03-11 17:53:51.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/qemu.if 2008-03-11 21:09:37.000000000 -0400 @@ -0,0 +1,303 @@ + +## policy for qemu @@ -27999,7 +27999,7 @@ + files_read_var_files($1_t) + files_search_all($1_t) + -+ fs_list_inotify($1_t) ++ fs_list_inotifyfs($1_t) + fs_rw_anon_inodefs_files($1_t) + fs_rw_tmpfs_files($1_t) + From fedora-extras-commits at redhat.com Wed Mar 12 01:12:12 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 12 Mar 2008 01:12:12 GMT Subject: rpms/sabayon/devel .cvsignore, 1.18, 1.19 sabayon.spec, 1.49, 1.50 selinux.patch, 1.1, 1.2 sources, 1.18, 1.19 sabayon-nosu.patch, 1.1, NONE Message-ID: <200803120112.m2C1CCA4006005@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/sabayon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5971 Modified Files: .cvsignore sabayon.spec selinux.patch sources Removed Files: sabayon-nosu.patch Log Message: 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 20 Jan 2008 20:41:10 -0000 1.18 +++ .cvsignore 12 Mar 2008 01:11:35 -0000 1.19 @@ -1 +1 @@ -sabayon-2.21.0.tar.bz2 +sabayon-2.22.0.tar.bz2 Index: sabayon.spec =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sabayon.spec 22 Feb 2008 16:26:57 -0000 1.49 +++ sabayon.spec 12 Mar 2008 01:11:35 -0000 1.50 @@ -7,14 +7,14 @@ %define sabayon_user_uid 86 Name: sabayon -Version: 2.21.0 -Release: 3%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Summary: Tool to maintain user profiles in a GNOME desktop Group: Applications/System License: GPLv2+ URL: http://www.gnome.org/projects/sabayon -Source: http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.20/sabayon-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.22/sabayon-%{version}.tar.bz2 Source2: sabayon.pam BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,8 +23,6 @@ Patch1: sabayon-2.12.3-xnestbug.patch # http://bugzilla.gnome.org/show_bug.cgi?id=486218 Patch3: selinux.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=479771 -Patch4: sabayon-nosu.patch Requires: %{name}-apply = %{version}-%{release} Requires: libxml2-python @@ -95,7 +93,6 @@ %patch1 -p1 -b .xnestbug %patch3 -p1 -b .selinux -%patch4 -p1 -b .nosu %build @@ -284,6 +281,9 @@ %ghost %{python_sitearch}/%{name}/lockdown/*.pyo %changelog +* Tue Mar 11 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + * Fri Feb 22 2008 Tomas Bzatek - 2.21.0-3 - sabayon-apply requires libxml2-python (#428351) and gnome-python2 stuff selinux.patch: Index: selinux.patch =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/selinux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- selinux.patch 13 Oct 2007 02:57:18 -0000 1.1 +++ selinux.patch 12 Mar 2008 01:11:35 -0000 1.2 @@ -1,31 +1,6 @@ -diff -up sabayon-2.20.1/lib/userdb.py.selinux sabayon-2.20.1/lib/userdb.py ---- sabayon-2.20.1/lib/userdb.py.selinux 2007-09-19 20:21:09.000000000 -0400 -+++ sabayon-2.20.1/lib/userdb.py 2007-10-12 15:43:14.000000000 -0400 -@@ -28,6 +28,7 @@ import random - import ldap - import socket - import debuglog -+import selinux - - defaultConf=""" - -@@ -353,7 +354,12 @@ class UserDatabase: - - raise UserDatabaseException( - _("Failed to save UserDatabase to %s") % filename) -- -+ -+ if selinux.is_selinux_enabled() > 0: -+ rc, con = selinux.matchpathcon(filename, 0) -+ if rc == 0: -+ selinux.setfilecon(filename, con) -+ - self.modified = 0 - - def set_default_profile (self, profile): -diff -up sabayon-2.20.1/admin-tool/profilesdialog.py.selinux sabayon-2.20.1/admin-tool/profilesdialog.py ---- sabayon-2.20.1/admin-tool/profilesdialog.py.selinux 2007-09-19 20:19:27.000000000 -0400 -+++ sabayon-2.20.1/admin-tool/profilesdialog.py 2007-10-12 15:43:14.000000000 -0400 +diff -up sabayon-2.22.0/admin-tool/profilesdialog.py.selinux sabayon-2.22.0/admin-tool/profilesdialog.py +--- sabayon-2.22.0/admin-tool/profilesdialog.py.selinux 2008-03-11 16:41:44.000000000 -0400 ++++ sabayon-2.22.0/admin-tool/profilesdialog.py 2008-03-11 20:45:59.000000000 -0400 @@ -34,6 +34,7 @@ import protosession import debuglog import errors @@ -46,3 +21,26 @@ dprint ("Moved %s back from %s", user_path, profile_path) @errors.checked_callback (debuglog.DEBUG_LOG_DOMAIN_ADMIN_TOOL) +diff -up sabayon-2.22.0/lib/userdb.py.selinux sabayon-2.22.0/lib/userdb.py +--- sabayon-2.22.0/lib/userdb.py.selinux 2008-03-11 16:41:44.000000000 -0400 ++++ sabayon-2.22.0/lib/userdb.py 2008-03-11 20:49:35.000000000 -0400 +@@ -28,6 +28,7 @@ import random + import ldap + import socket + import debuglog ++import selinux + + defaultConf=""" + +@@ -354,6 +355,11 @@ class UserDatabase: + raise UserDatabaseException( + _("Failed to save UserDatabase to %s") % filename) + ++ if selinux.is_selinux_enabled() > 0: ++ rc, con = selinux.matchpathcon(filename, 0) ++ if rc == 0: ++ selinux.setfilecon(filename, con) ++ + self.modified = 0 + + def set_default_profile (self, profile): Index: sources =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 20 Jan 2008 20:41:10 -0000 1.18 +++ sources 12 Mar 2008 01:11:35 -0000 1.19 @@ -1 +1 @@ -ea5bd1e1bb0407d4f383d7617958adf2 sabayon-2.21.0.tar.bz2 +39159282db60bfdfcd8569ecb5a992f5 sabayon-2.22.0.tar.bz2 --- sabayon-nosu.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 01:53:34 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Wed, 12 Mar 2008 01:53:34 GMT Subject: rpms/kernel/devel kernel.spec, 1.496, 1.497 linux-2.6-wireless-pending.patch, 1.34, 1.35 linux-2.6-wireless.patch, 1.27, 1.28 Message-ID: <200803120153.m2C1rYaF007423@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7379 Modified Files: kernel.spec linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Log Message: another round of wireless bits Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.496 retrieving revision 1.497 diff -u -r1.496 -r1.497 --- kernel.spec 12 Mar 2008 00:03:48 -0000 1.496 +++ kernel.spec 12 Mar 2008 01:52:59 -0000 1.497 @@ -1752,6 +1752,53 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Tue Mar 11 2008 John W. Linville +- rt2x00:correct rx packet length for USB devices +- make b43_mac_{enable,suspend}() static +- the scheduled bcm43xx removal +- the scheduled ieee80211 softmac removal +- the scheduled rc80211-simple.c removal +- iwlwifi: Use eeprom form iwlcore +- tkip: remove unused function, other cleanups +- mac80211: remove Hi16, Lo16 helpers +- mac80211: remove Hi8/Lo8 helpers, add initialization vector helpers +- b43: pull out helpers for writing noise table +- libertas: implement SSID scanning for SIOCSIWSCAN +- rt2x00: Align RX descriptor to 4 bytes +- rt2x00: Don't use uninitialized desc_len +- rt2x00: Use skbdesc fields for descriptor initialization +- rt2x00: Only disable beaconing just before beacon update +- rt2x00: Upgrade queue->lock to use irqsave +- rt2x00: Move firmware checksumming to driver +- rt2x00: Start bugging when rt2x00lib doesn't filter SW diversity +- rt2x00: Check IEEE80211_TXCTL_SEND_AFTER_DTIM flag +- rt2x00: Rename config_preamble() to config_erp() +- rt2x00: Add suspend/resume handlers to rt2x00rfkill +- rt2x00: Make rt2x00leds_register return void +- rt2x00: Always enable TSF ticking +- rt2x00: Fix basic rate initialization +- rt2x00: Fix compile error when rfkill is disabled +- rt2x00: Fix RX DMA ring initialization +- rt2x00: Fix rt2400pci signal +- rt2x00: Release rt2x00 2.1.4 +- rt2x00: Only strip preamble bit in rt2400pci +- prism54: support for 124a:4025 - another version of IOGear GWU513 802.11g +- drivers/net/wireless/ath5k - convert == (true|false) to simple logical tests +- include/net/ieee80211.h - remove duplicate include +- rndis_wlan: cleanup, rename and reorder enums and structures +- rndis_wlan: cleanup, rename structure members +- rt2x00: Fix trivial log message +- PS3: gelic: ignore scan info from zero SSID beacons +- rt2x00: Initialize TX control field in data entries +- rt2x00: Use the correct size when copying the control info in txdone +- rt2x00: Don't use unitialized rxdesc->size +- ssb: Add SPROM/invariants support for PCMCIA devices +- iwlwifi: update copyright year +- iwlwifi: fix bug to show hidden APs during scan +- iwlwifi: Use sta_bcast_id variable instead of BROADCAST_ID constant +- iwlwifi: Fix endianity in debug print +- iwlwifi: change rate number to a constant + * Tue Mar 11 2008 Dave Jones - 2.6.25-rc5-git2 linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.34 -r 1.35 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- linux-2.6-wireless-pending.patch 10 Mar 2008 20:04:14 -0000 1.34 +++ linux-2.6-wireless-pending.patch 12 Mar 2008 01:52:59 -0000 1.35 @@ -1,3 +1,667 @@ +commit 2cd41eac2a895b01bd0824ba098f78b870136be2 +Author: Reinette Chatre +Date: Tue Mar 11 16:17:15 2008 -0700 + + iwlwifi: fix bug to show hidden APs during scan + + Indirect scanning ('iwlist scan') should report information about + hidden APs. When an AP is hidden it does not respond to active scanning, + we thus have to use passive scanning to locate these APs. + + This fixes http://bughost.org/bugzilla/show_bug.cgi?id=1499 + + Signed-off-by: Reinette Chatre + Tested-by: Bill Moss + Signed-off-by: John W. Linville + +commit 3352880fca5d5564d0c9f23948b7e05d16519759 +Author: Tomas Winkler +Date: Tue Mar 11 16:17:20 2008 -0700 + + iwlwifi: change rate number to a constant + + This patch moves a number to an understandable define + + Signed-off-by: Tomas Winkler + Signed-off-by: Ron Rindjunsky + Signed-off-by: John W. Linville + +commit c794c989cab1369ae9e667ed5b77e6f813f9e2b3 +Author: Tomas Winkler +Date: Tue Mar 11 16:17:19 2008 -0700 + + iwlwifi: Fix endianity in debug print + + This patch fix debug print out endianity issue for bitmap + Since u64 and le64 variables are casted to unsigned long long, + after patch 'wireless: correct warnings from using '%llx' for type 'u64' + also bitmaps need to be converted to native endianity + + Signed-off-by: Tomas Winkler + Signed-off-by: Reinette Chatre + Signed-off-by: John W. Linville + +commit 42ff182a205f7a36771f54b93d8fa04a86aec166 +Author: Assaf Krauss +Date: Tue Mar 11 16:17:18 2008 -0700 + + iwlwifi: Use eeprom form iwlcore + + This patch puts in use eeprom from iwlcore module + + Signed-off-by: Assaf Krauss + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 4707ca7feed461a8cbc3dd19cde5bc1451296f11 +Author: Reinette Chatre +Date: Tue Mar 11 16:17:17 2008 -0700 + + iwlwifi: update copyright year + + Also fix a copy and paste error in header of iwl-core.c. This file + is not dual licensed. + + Signed-off-by: Reinette Chatre + Signed-off-by: John W. Linville + +commit 8535c56523a1c999a381009ea794e47e04070432 +Author: Tomas Winkler +Date: Tue Mar 11 16:17:16 2008 -0700 + + iwlwifi: Use sta_bcast_id variable instead of BROADCAST_ID constant + + This patch removes iwlYYY_BROADCAST_ID from run time usage. + hw_setting.sta_bcast_id is used instead. + + Signed-off-by: Tomas Winkler + Signed-off-by: Reinette Chatre + Signed-off-by: John W. Linville + +commit 068764eebb1711399bafac301eebe3da0d15f154 +Author: Masakazu Mokuno +Date: Tue Mar 11 13:15:44 2008 +0900 + + PS3: gelic: ignore scan info from zero SSID beacons + + Some implementations of the hidden SSID APs emit beacons which have the zero + length SSID information element instead of SSID padded by null (\0) characters. + If the firmware of the PS3 wireless hardware meets these beacons, it abandons parsing + IEs. Thus guest OSes get the invalid scan information for the AP. + + To work around this, ignore these scan informations from the list. + + Signed-off-by: Masakazu Mokuno + Signed-off-by: John W. Linville + +commit a968fa909c2a245ed4c4175de704fc184dbc6ba8 +Author: Michael Buesch +Date: Mon Mar 10 17:26:32 2008 +0100 + + ssb: Add SPROM/invariants support for PCMCIA devices + + This adds support for reading/writing the SPROM invariants + for PCMCIA based devices. + + Signed-off-by: Michael Buesch + Signed-off-by: John W. Linville + +commit bfc6c4d9238c3ee8324b35e0bf5a8ad565f2501a +Author: Joe Perches +Date: Sun Mar 9 16:55:10 2008 -0700 + + include/net/ieee80211.h - remove duplicate include + + Signed-off-by: Joe Perches + Signed-off-by: John W. Linville + +commit f6b32dc11fb7ac50baba66e0446f0d18a2b831e1 +Author: Ivo van Doorn +Date: Mon Mar 10 00:30:44 2008 +0100 + + rt2x00: Only strip preamble bit in rt2400pci + + Only rt2400pci can have the preamble bit set in the PLCP value, + for all other drivers it should not be cleared since that will + conflict with the plcp values for OFDM rates. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 17e0212fe66d07ffc2df8b034e35a12a187ffd19 +Author: Ivo van Doorn +Date: Sun Mar 9 22:49:21 2008 +0100 + + rt2x00: Release rt2x00 2.1.4 + + Version bump to 2.1.4 + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 54e19697da963c5dd36f2827fe6936052854ccc8 +Author: Ivo van Doorn +Date: Sun Mar 9 22:49:04 2008 +0100 + + rt2x00: Fix rt2400pci signal + + After sampling hundreds of RX frame descriptors, + the results were conclusive: + - The Ralink documentation regarding the SIGNAL and RSSI are wrong. + + It turns out that of the 5 BBR registers, we should not use BBR0 and BBR1 + for SIGNAL and RSSI respectively, but actually BBR1 and BBR2. + BBR0 does show values, but the exact meaning remains unclear, + but they cannot be translated into a SIGNAL or RSSI field. + BBR3, BBR4 and BBR5 are always 0, so their meaning is unknown. + + As it turns out, the reported SIGNAL is the PLCP value, this + in contradiction to what was expected looking at rt2500pci which + only reported the PLCP values for OFDM rates and bitrate values + for CCK rates. + + This means we should let the driver raise the flag about the contents + of the SIGNAL field so rt2x00lib can always do the right thing based + on what the driver reports. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit d187f182a14f4d0b36f3595c416127e6a2290884 +Author: Ivo van Doorn +Date: Sun Mar 9 22:48:46 2008 +0100 + + rt2x00: Fix RX DMA ring initialization + + Due to a terrible typo the RX DMA base address + was initialized to the beacon base address. + Obviously bad things happen with bugs like that.... + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit cc7de4a3067b706c06ec48bf47a8f432042dd997 +Author: Ivo van Doorn +Date: Sun Mar 9 22:48:28 2008 +0100 + + rt2x00: Fix compile error when rfkill is disabled + + Fix obvious error that prevented compilation while rfkill + was disabled. + [...77895 lines suppressed...] ++ err = sprom_check_crc(sprom, sprom_size_words); ++ if (err) { ++ err = -EINVAL; ++ goto out_kfree; ++ } ++ ++ /* Use interruptible locking, as the SPROM write might ++ * be holding the lock for several seconds. So allow userspace ++ * to cancel operation. */ ++ err = -ERESTARTSYS; ++ if (mutex_lock_interruptible(&bus->sprom_mutex)) ++ goto out_kfree; ++ err = ssb_devices_freeze(bus); ++ if (err == -EOPNOTSUPP) { ++ ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. " ++ "No suspend support. Is CONFIG_PM enabled?\n"); ++ goto out_unlock; ++ } ++ if (err) { ++ ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n"); ++ goto out_unlock; ++ } ++ res = sprom_write(bus, sprom); ++ err = ssb_devices_thaw(bus); ++ if (err) ++ ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n"); ++out_unlock: ++ mutex_unlock(&bus->sprom_mutex); ++out_kfree: ++ kfree(sprom); ++out: ++ if (res) ++ return res; ++ return err ? err : count; ++} +diff -up linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt +--- linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt.orig 2008-03-11 21:11:57.000000000 -0400 ++++ linux-2.6.24.noarch/Documentation/laptops/acer-wmi.txt 2008-03-11 21:19:41.000000000 -0400 +@@ -80,7 +80,7 @@ once you enable the radio, will depend o + e.g. With the BCM4318 on the Acer Aspire 5020 series: + + ndiswrapper: Light blinks on when transmitting +-bcm43xx/b43: Solid light, blinks off when transmitting ++b43: Solid light, blinks off when transmitting + + Wireless radio control is unconditionally enabled - all Acer laptops that support + acer-wmi come with built-in wireless. However, should you feel so inclined to +diff -up linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt +--- linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt 2008-03-11 21:21:56.000000000 -0400 +@@ -1,89 +0,0 @@ +- +- BCM43xx Linux Driver Project +- ============================ +- +-Introduction +------------- +- +-Many of the wireless devices found in modern notebook computers are +-based on the wireless chips produced by Broadcom. These devices have +-been a problem for Linux users as there is no open-source driver +-available. In addition, Broadcom has not released specifications +-for the device, and driver availability has been limited to the +-binary-only form used in the GPL versions of AP hardware such as the +-Linksys WRT54G, and the Windows and OS X drivers. Before this project +-began, the only way to use these devices were to use the Windows or +-OS X drivers with either the Linuxant or ndiswrapper modules. There +-is a strong penalty if this method is used as loading the binary-only +-module "taints" the kernel, and no kernel developer will help diagnose +-any kernel problems. +- +-Development +------------ +- +-This driver has been developed using +-a clean-room technique that is described at +-http://bcm-specs.sipsolutions.net/ReverseEngineeringProcess. For legal +-reasons, none of the clean-room crew works on the on the Linux driver, +-and none of the Linux developers sees anything but the specifications, +-which are the ultimate product of the reverse-engineering group. +- +-Software +--------- +- +-Since the release of the 2.6.17 kernel, the bcm43xx driver has been +-distributed with the kernel source, and is prebuilt in most, if not +-all, distributions. There is, however, additional software that is +-required. The firmware used by the chip is the intellectual property +-of Broadcom and they have not given the bcm43xx team redistribution +-rights to this firmware. Since we cannot legally redistribute +-the firmware we cannot include it with the driver. Furthermore, it +-cannot be placed in the downloadable archives of any distributing +-organization; therefore, the user is responsible for obtaining the +-firmware and placing it in the appropriate location so that the driver +-can find it when initializing. +- +-To help with this process, the bcm43xx developers provide a separate +-program named bcm43xx-fwcutter to "cut" the firmware out of a +-Windows or OS X driver and write the extracted files to the proper +-location. This program is usually provided with the distribution; +-however, it may be downloaded from +- +-http://developer.berlios.de/project/showfiles.php?group_id=4547 +- +-The firmware is available in two versions. V3 firmware is used with +-the in-kernel bcm43xx driver that uses a software MAC layer called +-SoftMAC, and will have a microcode revision of 0x127 or smaller. The +-V4 firmware is used by an out-of-kernel driver employing a variation of +-the Devicescape MAC layer known as d80211. Once bcm43xx-d80211 reaches +-a satisfactory level of development, it will replace bcm43xx-softmac +-in the kernel as it is much more flexible and powerful. +- +-A source for the latest V3 firmware is +- +-http://downloads.openwrt.org/sources/wl_apsta-3.130.20.0.o +- +-Once this file is downloaded, the command +-'bcm43xx-fwcutter -w ' +-will extract the microcode and write it to directory +-. The correct directory will depend on your distribution; +-however, most use '/lib/firmware'. Once this step is completed, +-the bcm3xx driver should load when the system is booted. To see +-any messages relating to the driver, issue the command 'dmesg | +-grep bcm43xx' from a terminal window. If there are any problems, +-please send that output to Bcm43xx-dev at lists.berlios.de. +- +-Although the driver has been in-kernel since 2.6.17, the earliest +-version is quite limited in its capability. Patches that include +-all features of later versions are available for the stable kernel +-versions from 2.6.18. These will be needed if you use a BCM4318, +-or a PCI Express version (BCM4311 and BCM4312). In addition, if you +-have an early BCM4306 and more than 1 GB RAM, your kernel will need +-to be patched. These patches, which are being updated regularly, +-are available at ftp://lwfinger.dynalias.org/patches. Look for +-combined_2.6.YY.patch. Of course you will need kernel source downloaded +-from kernel.org, or the source from your distribution. +- +-If you build your own kernel, please enable CONFIG_BCM43XX_DEBUG +-and CONFIG_IEEE80211_SOFTMAC_DEBUG. The log information provided is +-essential for solving any problems. diff -up /dev/null linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl ---- /dev/null 2008-03-10 08:31:57.721924924 -0400 -+++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl 2008-03-10 15:20:34.000000000 -0400 +--- /dev/null 2008-03-11 08:47:01.722073547 -0400 ++++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl 2008-03-11 21:18:18.000000000 -0400 @@ -0,0 +1,335 @@ + + + diff -up linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig linux-2.6.24.noarch/Documentation/DocBook/Makefile ---- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig 2008-03-10 14:49:12.000000000 -0400 -+++ linux-2.6.24.noarch/Documentation/DocBook/Makefile 2008-03-10 15:20:34.000000000 -0400 +--- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig 2008-03-11 21:11:53.000000000 -0400 ++++ linux-2.6.24.noarch/Documentation/DocBook/Makefile 2008-03-11 21:18:18.000000000 -0400 @@ -11,7 +11,8 @@ DOCBOOKS := wanbook.xml z8530book.xml mc procfs-guide.xml writing_usb_driver.xml networking.xml \ kernel-api.xml filesystems.xml lsm.xml usb.xml \ @@ -54494,3 +80719,40 @@ ### # The build process is as follows (targets): +diff -up linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt +--- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-03-11 21:11:55.000000000 -0400 ++++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-03-11 21:19:41.000000000 -0400 +@@ -240,33 +240,6 @@ Who: Jean Delvare + + --------------------------- + +-What: bcm43xx wireless network driver +-When: 2.6.26 +-Files: drivers/net/wireless/bcm43xx +-Why: This driver's functionality has been replaced by the +- mac80211-based b43 and b43legacy drivers. +-Who: John W. Linville +- +---------------------------- +- +-What: ieee80211 softmac wireless networking component +-When: 2.6.26 (or after removal of bcm43xx and port of zd1211rw to mac80211) +-Files: net/ieee80211/softmac +-Why: No in-kernel drivers will depend on it any longer. +-Who: John W. Linville +- +---------------------------- +- +-What: rc80211-simple rate control algorithm for mac80211 +-When: 2.6.26 +-Files: net/mac80211/rc80211-simple.c +-Why: This algorithm was provided for reference but always exhibited bad +- responsiveness and performance and has some serious flaws. It has been +- replaced by rc80211-pid. +-Who: Stefano Brivio +- +---------------------------- +- + What (Why): + - include/linux/netfilter_ipv4/ipt_TOS.h ipt_tos.h header files + (superseded by xt_TOS/xt_tos target & match) linux-2.6-wireless.patch: Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless.patch,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- linux-2.6-wireless.patch 11 Mar 2008 20:43:54 -0000 1.27 +++ linux-2.6-wireless.patch 12 Mar 2008 01:52:59 -0000 1.28 @@ -1,3 +1,17 @@ +commit e1a2c8702f9126bd1eaa2b0f3967931b116a735f +Author: Jan Slupski +Date: Mon Mar 10 22:41:18 2008 -0700 + + prism54: support for 124a:4025 - another version of IOGear GWU513 802.11g + + Add support to p54usb driver for apparently another version of IOGear GWU513 + 802.11g USB network card that uses GW3887IK chipset and is recognized as + "124a:4025 AirVast" by lsusb. + + Cc: Michael Wu + Signed-off-by: Andrew Morton + Signed-off-by: John W. Linville + commit 445815d7ea4f59baf103f28b45f7dd45f21ff75d Author: Ivo van Doorn Date: Sun Mar 9 22:42:32 2008 +0100 @@ -43,8 +57,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.24.noarch/drivers/net/Kconfig.orig linux-2.6.24.noarch/drivers/net/Kconfig ---- linux-2.6.24.noarch/drivers/net/Kconfig.orig 2008-03-11 16:02:59.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/Kconfig 2008-03-11 16:33:00.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/Kconfig.orig 2008-03-11 21:35:53.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/Kconfig 2008-03-11 21:39:02.000000000 -0400 @@ -2377,15 +2377,15 @@ config GELIC_NET module will be called ps3_gelic. @@ -71,8 +85,8 @@ config GIANFAR tristate "Gianfar Ethernet" diff -up linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c ---- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-11 16:02:34.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-11 16:33:00.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c.orig 2008-03-11 21:35:09.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/libertas/cmdresp.c 2008-03-11 21:39:02.000000000 -0400 @@ -578,7 +578,7 @@ int lbs_process_rx_command(struct lbs_pr goto done; } @@ -82,9 +96,20 @@ lbs_pr_info("Invalid CMD_RESP %x to command %x!\n", respcmd, curcmd); spin_unlock_irqrestore(&priv->driver_lock, flags); ret = -1; +diff -up linux-2.6.24.noarch/drivers/net/wireless/p54usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/p54usb.c +--- linux-2.6.24.noarch/drivers/net/wireless/p54usb.c.orig 2008-03-11 21:35:10.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/p54usb.c 2008-03-11 21:40:16.000000000 -0400 +@@ -63,6 +63,7 @@ static struct usb_device_id p54u_table[] + {USB_DEVICE(0x0cde, 0x0008)}, /* Sagem XG703A */ + {USB_DEVICE(0x0d8e, 0x3762)}, /* DLink DWL-G120 Cohiba */ + {USB_DEVICE(0x09aa, 0x1000)}, /* Spinnaker Proto board */ ++ {USB_DEVICE(0x124a, 0x4025)}, /* IOGear GWU513 (GW3887IK chip) */ + {USB_DEVICE(0x13b1, 0x000a)}, /* Linksys WUSB54G ver 2 */ + {USB_DEVICE(0x13B1, 0x000C)}, /* Linksys WUSB54AG */ + {USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */ diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-03-11 16:02:35.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-03-11 16:33:00.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-03-11 21:35:11.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-03-11 21:39:02.000000000 -0400 @@ -2302,9 +2302,9 @@ static void rt61pci_configure_filter(str * Apply some rules to the filters: * - Some filters imply different filters to be set. @@ -98,8 +123,8 @@ *total_flags & FIF_PROMISC_IN_BSS) *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS; diff -up linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c ---- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-03-11 16:02:35.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-03-11 16:33:00.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-03-11 21:35:11.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-03-11 21:39:02.000000000 -0400 @@ -1869,9 +1869,9 @@ static void rt73usb_configure_filter(str * Apply some rules to the filters: * - Some filters imply different filters to be set. From fedora-extras-commits at redhat.com Wed Mar 12 02:21:21 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 12 Mar 2008 02:21:21 GMT Subject: rpms/selinux-policy/devel policy-20071130.patch,1.97,1.98 Message-ID: <200803120221.m2C2LLgZ014205@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14181 Modified Files: policy-20071130.patch Log Message: * Tue Mar 11 2008 Dan Walsh 3.3.1-15 - Allow init to transition to initrc_t on shell exec. - Fix init to be able to sendto init_t. - Allow syslog to connect to mysql - Allow lvm to manage its own fifo_files - Allow bugzilla to use ldap - More mls fixes policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- policy-20071130.patch 12 Mar 2008 01:10:44 -0000 1.97 +++ policy-20071130.patch 12 Mar 2008 02:21:18 -0000 1.98 @@ -23429,7 +23429,7 @@ /var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.3.1/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-12-04 11:02:50.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-11 19:56:07.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-11 22:20:09.000000000 -0400 @@ -12,9 +12,15 @@ ## ## @@ -23896,7 +23896,7 @@ # for when /tmp/.X11-unix is created by the system allow $2 xdm_t:fd use; -@@ -542,25 +543,541 @@ +@@ -542,25 +543,533 @@ allow $2 xdm_tmp_t:sock_file { read write }; dontaudit $2 xdm_t:tcp_socket { read write }; @@ -24023,6 +24023,7 @@ + type screensaver_xext_t, unknown_xext_t, x_rootscreen_t; + type disallowed_xext_t; + type output_xext_t; ++ type accelgraphics_xext_t; + + attribute x_server_domain, x_domain; + attribute xproperty_type; @@ -24069,12 +24070,6 @@ + allow $1 { x_domain x_server_domain }:x_device read; + ') + -+ # everyone can grab the server -+ # everyone does it, it is basically a free DOS attack -+ allow $1 x_server_domain:x_server grab; -+ # everyone can get the font path, etc. -+ # this could leak out sensitive information -+ allow $1 x_server_domain:x_server { getattr manage }; + # everyone can do override-redirect windows. + # this could be used to spoof labels + allow $1 $1:x_drawable override; @@ -24082,24 +24077,28 @@ + # allows to know when new windows appear, among other things + allow $1 manage_xevent_t:x_event receive; + -+ allow $1 accelgraphics_xext_t:x_extension use; ++ allow $1 xextension_type:x_extension use; + + # X Server + # can read server-owned resources + allow $1 x_server_domain:x_resource read; ++ # everyone can grab the server ++ # everyone does it, it is basically a free DOS attack ++ allow $1 x_server_domain:x_server grab; ++ # everyone can get the font path, etc. ++ # this could leak out sensitive information ++ allow $1 x_server_domain:x_server { getattr manage }; ++ + # can mess with own clients + allow $1 $1:x_client { manage destroy }; + + # X Protocol Extensions -+ allow $1 std_xext_t:x_extension { use }; -+ allow $1 shmem_xext_t:x_extension { use }; + allow $1 xextension_type:x_extension query; + + # X Properties + # can read and write client properties + allow $1 $1:x_property { create destroy read write }; + allow $1 default_xproperty_t:x_property { read write destroy create }; -+ allow $1 output_xext_t:x_extension { use }; + allow $1 output_xext_t:x_property read; + allow $1 xserver_unconfined_type:x_property read; + @@ -24163,16 +24162,9 @@ + # can read and write own objects + allow $1 $1:x_resource { read write }; + -+ allow $1 screensaver_xext_t:x_extension { use }; -+ allow $1 unknown_xext_t:x_extension { use }; -+ + allow $1 x_rootscreen_t:x_screen { saver_setattr saver_getattr getattr setattr }; + -+ allow $1 disallowed_xext_t:x_extension { use }; + -+ allow $1 xdm_xserver_t:x_device { getattr getfocus use setattr }; -+ allow $1 xdm_xserver_t:x_resource read; -+ allow $1 xdm_xserver_t:x_server grab; +') + +####################################### @@ -24444,7 +24436,7 @@ ') ') -@@ -593,26 +1110,44 @@ +@@ -593,26 +1102,44 @@ # template(`xserver_use_user_fonts',` gen_require(` @@ -24496,7 +24488,7 @@ ## Transition to a user Xauthority domain. ## ## -@@ -638,10 +1173,77 @@ +@@ -638,10 +1165,77 @@ # template(`xserver_domtrans_user_xauth',` gen_require(` @@ -24576,7 +24568,7 @@ ') ######################################## -@@ -671,10 +1273,10 @@ +@@ -671,10 +1265,10 @@ # template(`xserver_user_home_dir_filetrans_user_xauth',` gen_require(` @@ -24589,7 +24581,7 @@ ') ######################################## -@@ -760,7 +1362,7 @@ +@@ -760,7 +1354,7 @@ type xconsole_device_t; ') @@ -24598,7 +24590,7 @@ ') ######################################## -@@ -860,6 +1462,25 @@ +@@ -860,6 +1454,25 @@ ######################################## ## @@ -24624,7 +24616,7 @@ ## Read xdm-writable configuration files. ## ## -@@ -914,6 +1535,7 @@ +@@ -914,6 +1527,7 @@ files_search_tmp($1) allow $1 xdm_tmp_t:dir list_dir_perms; create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t) @@ -24632,7 +24624,7 @@ ') ######################################## -@@ -955,6 +1577,24 @@ +@@ -955,6 +1569,24 @@ ######################################## ## @@ -24657,7 +24649,7 @@ ## Execute the X server in the XDM X server domain. ## ## -@@ -965,15 +1605,47 @@ +@@ -965,15 +1597,47 @@ # interface(`xserver_domtrans_xdm_xserver',` gen_require(` @@ -24706,7 +24698,7 @@ ## Make an X session script an entrypoint for the specified domain. ## ## -@@ -1123,7 +1795,7 @@ +@@ -1123,7 +1787,7 @@ type xdm_xserver_tmp_t; ') @@ -24715,7 +24707,7 @@ ') ######################################## -@@ -1312,3 +1984,83 @@ +@@ -1312,3 +1976,83 @@ files_search_tmp($1) stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t) ') From fedora-extras-commits at redhat.com Wed Mar 12 02:44:11 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Kristian_H=C3=B8gsberg?= (krh)) Date: Wed, 12 Mar 2008 02:44:11 GMT Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.305,1.306 Message-ID: <200803120244.m2C2iBCh014766@cvs-int.fedora.redhat.com> Author: krh Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14735 Modified Files: xorg-x11-server.spec Log Message: * Tue Mar 11 2008 Kristian H??gsberg 1.4.99.901-4.20080310 - Checkout the tip of the git snapshot so we get the most recent DRI2 texture from pixmap changes in the build. Bump mesa build requires. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- xorg-x11-server.spec 11 Mar 2008 23:39:19 -0000 1.305 +++ xorg-x11-server.spec 12 Mar 2008 02:43:37 -0000 1.306 @@ -20,7 +20,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.901 -Release: 3.%{gitdate}%{?dist} +Release: 4.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -110,8 +110,8 @@ # openssl? really? BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex -BuildRequires: mesa-libGL-devel >= 7.1-0.19 -BuildRequires: mesa-source >= 7.1-0.19 +BuildRequires: mesa-libGL-devel >= 7.1-0.20 +BuildRequires: mesa-source >= 7.1-0.20 # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 %if %{with_hw_servers} @@ -271,7 +271,7 @@ %if 0%{gitdate} # XXX hack -git checkout -b fedora 921cbc58036491eab491b4c7b07111f04aa58d40 +git checkout -b fedora # make it something you can push to. sed -i 's/git/&+ssh/' .git/config %else @@ -509,6 +509,10 @@ %changelog +* Tue Mar 11 2008 Kristian H??gsberg 1.4.99.901-4.20080310 +- Checkout the tip of the git snapshot so we get the most recent DRI2 + texture from pixmap changes in the build. Bump mesa build requires. + * Tue Mar 11 2008 Adam Jackson 1.4.99.901-3.20080310 - New 1.5 snapshot. - xserver-1.5-x86emy.patch: Fix an x86emu quirk. From fedora-extras-commits at redhat.com Wed Mar 12 03:06:56 2008 From: fedora-extras-commits at redhat.com (Robin Norwood (rnorwood)) Date: Wed, 12 Mar 2008 03:06:56 GMT Subject: rpms/gnome-packagekit/devel gnome-packagekit.spec,1.12,1.13 Message-ID: <200803120306.m2C36ubN021432@cvs-int.fedora.redhat.com> Author: rnorwood Update of /cvs/pkgs/rpms/gnome-packagekit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21391 Modified Files: gnome-packagekit.spec Log Message: Enable KDE support. Index: gnome-packagekit.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnome-packagekit.spec 5 Mar 2008 19:05:58 -0000 1.12 +++ gnome-packagekit.spec 12 Mar 2008 03:06:23 -0000 1.13 @@ -4,12 +4,13 @@ Summary: GNOME PackageKit Client Name: gnome-packagekit Version: %{packagekit_version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.packagekit.org Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: gnome-packagekit-enable-kde.patch Requires: gtk2 >= 2.12.0 Requires: gnome-icon-theme Requires: libnotify >= 0.4.3 @@ -46,6 +47,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --disable-scrollkeeper --disable-schemas-install @@ -118,6 +120,9 @@ %{_datadir}/applications/pk-*.desktop %changelog +* Tue Mar 11 2008 Robin Norwood - 0.1.9-2 +- Apply patch to enable gnome-packagekit in KDE + * Wed Mar 5 2008 Robin Norwood - 0.1.9-1 - Update to latest upstream version: 0.1.8 From fedora-extras-commits at redhat.com Wed Mar 12 03:08:57 2008 From: fedora-extras-commits at redhat.com (Robin Norwood (rnorwood)) Date: Wed, 12 Mar 2008 03:08:57 GMT Subject: rpms/gnome-packagekit/devel gnome-packagekit-enable-kde.patch, NONE, 1.1 Message-ID: <200803120308.m2C38vlM021506@cvs-int.fedora.redhat.com> Author: rnorwood Update of /cvs/pkgs/rpms/gnome-packagekit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21497 Added Files: gnome-packagekit-enable-kde.patch Log Message: Include patch. gnome-packagekit-enable-kde.patch: --- NEW FILE gnome-packagekit-enable-kde.patch --- --- gnome-packagekit-0.1.9/data/pk-application.desktop.in Mon Mar 3 16:01:21 2008 +++ gnome-packagekit-0.1.9/data/pk-application.desktop.in Tue Mar 11 22:29:50 2008 @@ -8,6 +8,5 @@ Terminal=false Type=Application Categories=GNOME;GTK;System;Settings; -NotShowIn=KDE; StartupNotify=true --- gnome-packagekit-0.1.9/data/pk-update-viewer.desktop.in Fri Feb 29 10:49:03 2008 +++ gnome-packagekit-0.1.9/data/pk-update-viewer.desktop.in Tue Mar 11 22:28:21 2008 @@ -8,6 +8,5 @@ Terminal=false Type=Application Categories=GNOME;GTK;Settings;System;PackageManager; -NotShowIn=KDE StartupNotify=true --- gnome-packagekit-0.1.9/data/pk-repo.desktop.in Fri Feb 29 10:49:03 2008 +++ gnome-packagekit-0.1.9/data/pk-repo.desktop.in Tue Mar 11 22:29:24 2008 @@ -8,6 +8,5 @@ Terminal=false Type=Application Categories=GNOME;GTK;System;Settings; -NotShowIn=KDE; StartupNotify=true --- gnome-packagekit-0.1.9/data/pk-update-icon.desktop.in Fri Feb 29 10:49:03 2008 +++ gnome-packagekit-0.1.9/data/pk-update-icon.desktop.in Tue Mar 11 22:28:27 2008 @@ -8,5 +8,4 @@ Terminal=false Type=Application Categories= -NotShowIn=KDE;XFCE; --- gnome-packagekit-0.1.9/data/pk-prefs.desktop.in Fri Feb 29 10:49:04 2008 +++ gnome-packagekit-0.1.9/data/pk-prefs.desktop.in Tue Mar 11 22:29:39 2008 @@ -8,6 +8,5 @@ Terminal=false Type=Application Categories=Settings;X-GNOME-SystemSettings; -NotShowIn=KDE; StartupNotify=true From fedora-extras-commits at redhat.com Wed Mar 12 03:34:58 2008 From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme)) Date: Wed, 12 Mar 2008 03:34:58 GMT Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.37,1.38 Message-ID: <200803120334.m2C3Ywk2022201@cvs-int.fedora.redhat.com> Author: meme Update of /cvs/extras/rpms/nethack-vultures/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22072/devel Modified Files: nethack-vultures.spec Log Message: Added SDL-static to reqs. Index: nethack-vultures.spec =================================================================== RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- nethack-vultures.spec 19 Feb 2008 13:23:24 -0000 1.37 +++ nethack-vultures.spec 12 Mar 2008 03:34:22 -0000 1.38 @@ -1,6 +1,6 @@ Name: nethack-vultures Version: 2.1.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: NetHack - Vulture's Eye and Vulture's Claw Group: Amusements/Games @@ -17,6 +17,7 @@ BuildRequires: SDL_mixer-devel >= 1.2.6 BuildRequires: SDL_image-devel BuildRequires: SDL_ttf-devel +BuildRequires: SDL-static BuildRequires: libpng-devel BuildRequires: ncurses-devel BuildRequires: byacc @@ -180,6 +181,9 @@ %changelog +* Tue Mar 11 2008 Karen Pease - 2.1.0-12 +- Added SDL-static requirement. + * Tue Feb 19 2008 Fedora Release Engineering - 2.1.0-11 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 12 03:35:32 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 12 Mar 2008 03:35:32 GMT Subject: devel/anaconda .cvsignore, 1.506, 1.507 anaconda.spec, 1.646, 1.647 sources, 1.638, 1.639 Message-ID: <200803120335.m2C3ZWWE022232@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/anaconda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22193 Modified Files: .cvsignore anaconda.spec sources Log Message: * Tue Mar 11 2008 Jeremy Katz - 11.4.0.50-1 - Focus root password entry box (#436885). (dcantrell) - Make sure default is SHA-512 for libuser.conf. (dcantrell) - Fix detection of ISO images on a hard drive partition. (clumens) - Devices names aren't prefixed with /dev/. (clumens) - Filter out /dev/ram* devices from the list of hdiso partitions. (clumens) - But make sure that we've activated the keymap now that X follows its defaults (katzj) - Don't set a keyboard in the X config, we should just do this at runtime (katzj) - Writing out the nfs method line is a lot simpler now. (clumens) - Use /mnt/sysimage/tmp/cache for the yum cache, instead of the ramdisk. (clumens) - Translation updates (nl, gu, ml, mr, pa) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v retrieving revision 1.506 retrieving revision 1.507 diff -u -r1.506 -r1.507 --- .cvsignore 10 Mar 2008 23:20:10 -0000 1.506 +++ .cvsignore 12 Mar 2008 03:34:57 -0000 1.507 @@ -1,2 +1 @@ -anaconda-11.4.0.48.tar.bz2 -anaconda-11.4.0.49.tar.bz2 +anaconda-11.4.0.50.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v retrieving revision 1.646 retrieving revision 1.647 diff -u -r1.646 -r1.647 --- anaconda.spec 10 Mar 2008 23:20:10 -0000 1.646 +++ anaconda.spec 12 Mar 2008 03:34:57 -0000 1.647 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.49 +Version: 11.4.0.50 Release: 1 License: GPLv2+ Group: Applications/System @@ -204,6 +204,21 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Mar 11 2008 Jeremy Katz - 11.4.0.50-1 +- Focus root password entry box (#436885). (dcantrell) +- Make sure default is SHA-512 for libuser.conf. (dcantrell) +- Fix detection of ISO images on a hard drive partition. (clumens) +- Devices names aren't prefixed with /dev/. (clumens) +- Filter out /dev/ram* devices from the list of hdiso partitions. (clumens) +- But make sure that we've activated the keymap now that X + follows its defaults (katzj) +- Don't set a keyboard in the X config, we should just do this + at runtime (katzj) +- Writing out the nfs method line is a lot simpler now. (clumens) +- Use /mnt/sysimage/tmp/cache for the yum cache, instead of the + ramdisk. (clumens) +- Translation updates (nl, gu, ml, mr, pa) + * Mon Mar 10 2008 Chris Lumens - 11.4.0.49-1 - Use the full path to the .discinfo file (#436855). (clumens) - List netinst.iso/boot.iso in .treeinfo (#436089) (katzj) Index: sources =================================================================== RCS file: /cvs/pkgs/devel/anaconda/sources,v retrieving revision 1.638 retrieving revision 1.639 diff -u -r1.638 -r1.639 --- sources 10 Mar 2008 23:20:10 -0000 1.638 +++ sources 12 Mar 2008 03:34:57 -0000 1.639 @@ -1 +1 @@ -28907f39eea29349233594e55799f45f anaconda-11.4.0.49.tar.bz2 +f09ffd8187704aff26e3eda990a91b8d anaconda-11.4.0.50.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 03:36:22 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 12 Mar 2008 03:36:22 GMT Subject: rpms/xulrunner/devel .cvsignore, 1.37, 1.38 sources, 1.38, 1.39 xulrunner.spec, 1.90, 1.91 Message-ID: <200803120336.m2C3aMUp022342@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22275 Modified Files: .cvsignore sources xulrunner.spec Log Message: * Tue Mar 11 2008 Christopher Aillon 1.0-0.39 - Update to latest trunk (2008-03-11) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 11 Mar 2008 01:59:49 -0000 1.37 +++ .cvsignore 12 Mar 2008 03:35:51 -0000 1.38 @@ -1 +1 @@ -mozilla-20080310.tar.bz2 +mozilla-20080311.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 11 Mar 2008 01:59:49 -0000 1.38 +++ sources 12 Mar 2008 03:35:51 -0000 1.39 @@ -1 +1 @@ -686eec8eec8900cdf2ed27e7a2098e5b mozilla-20080310.tar.bz2 +633fc3b7ff7d1f4a0884159932ef2976 mozilla-20080311.tar.bz2 Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- xulrunner.spec 11 Mar 2008 01:59:49 -0000 1.90 +++ xulrunner.spec 12 Mar 2008 03:35:51 -0000 1.91 @@ -7,14 +7,14 @@ %define version_internal 1.9pre %if ! %{official_branding} -%define cvsdate 20080310 +%define cvsdate 20080311 %define nightly .cvs%{cvsdate} %endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.38%{?nightly}%{?dist} +Release: 0.39%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -400,6 +400,9 @@ #--------------------------------------------------------------------- %changelog +* Tue Mar 11 2008 Christopher Aillon 1.0-0.39 +- Update to latest trunk (2008-03-11) + * Mon Mar 10 2008 Christopher Aillon 1.0-0.38 - Update to latest trunk (2008-03-10) From fedora-extras-commits at redhat.com Wed Mar 12 03:39:28 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 12 Mar 2008 03:39:28 GMT Subject: rpms/firefox/devel .cvsignore, 1.67, 1.68 firefox.spec, 1.273, 1.274 sources, 1.78, 1.79 Message-ID: <200803120339.m2C3dSUb022445@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22410 Modified Files: .cvsignore firefox.spec sources Log Message: * Tue Mar 11 2008 Christopher Aillon 3.0-0.39 - Update to latest trunk (2008-03-11) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- .cvsignore 11 Mar 2008 02:01:06 -0000 1.67 +++ .cvsignore 12 Mar 2008 03:38:20 -0000 1.68 @@ -1 +1 @@ -mozilla-20080310.tar.bz2 +mozilla-20080311.tar.bz2 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- firefox.spec 11 Mar 2008 02:01:06 -0000 1.273 +++ firefox.spec 12 Mar 2008 03:38:20 -0000 1.274 @@ -12,14 +12,14 @@ %define build_langpacks 0 %if ! %{official_branding} -%define cvsdate 20080310 +%define cvsdate 20080311 %define nightly .cvs%{cvsdate} %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.38%{?nightly}%{?dist} +Release: 0.39%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -314,6 +314,9 @@ #--------------------------------------------------------------------- %changelog +* Tue Mar 11 2008 Christopher Aillon 3.0-0.39 +- Update to latest trunk (2008-03-11) + * Mon Mar 10 2008 Christopher Aillon 3.0-0.38 - Update to latest trunk (2008-03-10) Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/sources,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- sources 11 Mar 2008 02:01:06 -0000 1.78 +++ sources 12 Mar 2008 03:38:20 -0000 1.79 @@ -1 +1 @@ -686eec8eec8900cdf2ed27e7a2098e5b mozilla-20080310.tar.bz2 +633fc3b7ff7d1f4a0884159932ef2976 mozilla-20080311.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 03:53:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 12 Mar 2008 03:53:12 GMT Subject: rpms/perl-Tk/devel perl-Tk-seg.patch, 1.1, 1.2 perl-Tk.spec, 1.14, 1.15 Message-ID: <200803120353.m2C3rC6S022761@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Tk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22738 Modified Files: perl-Tk-seg.patch perl-Tk.spec Log Message: rework Tk-seg patch perl-Tk-seg.patch: Index: perl-Tk-seg.patch =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tk/devel/perl-Tk-seg.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Tk-seg.patch 4 Jan 2008 23:24:38 -0000 1.1 +++ perl-Tk-seg.patch 12 Mar 2008 03:53:03 -0000 1.2 @@ -1,14 +1,13 @@ ---- pTk/mTk/generic/tkConfig.c.orig 2008-01-04 18:50:58.000000000 +0100 -+++ pTk/mTk/generic/tkConfig.c 2008-01-05 00:15:15.000000000 +0100 -@@ -1210,11 +1210,12 @@ +diff -up Tk-804.028/pTk/mTk/generic/tkConfig.c.seg Tk-804.028/pTk/mTk/generic/tkConfig.c +--- Tk-804.028/pTk/mTk/generic/tkConfig.c.seg 2008-03-11 23:29:39.000000000 -0400 ++++ Tk-804.028/pTk/mTk/generic/tkConfig.c 2008-03-11 23:28:09.000000000 -0400 +@@ -1210,11 +1210,11 @@ GetOptionFromObj(interp, objPtr, tablePt * First, check to see if the object already has the answer cached. */ - if (objPtr->typePtr == &tkOptionObjType) { -- if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) { +/* if (objPtr->typePtr == &tkOptionObjType) { -+ if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr -+ && objPtr->internalRep.twoPtrValue.ptr2 != NULL) { + if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) { return (Option *) objPtr->internalRep.twoPtrValue.ptr2; } - } @@ -16,7 +15,7 @@ /* * The answer isn't cached. -@@ -2277,9 +2278,19 @@ +@@ -2277,9 +2277,15 @@ Tk_GetOptionValue(interp, recordPtr, opt if (optionPtr == NULL) { return NULL; } @@ -25,10 +24,6 @@ + return NULL; + } + -+ if (!optionPtr->specPtr->type) { -+ return NULL; -+ } -+ if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) { optionPtr = optionPtr->extra.synonymPtr; } @@ -36,13 +31,3 @@ if (optionPtr->specPtr->objOffset >= 0) { resultPtr = *((Tcl_Obj **) (recordPtr + optionPtr->specPtr->objOffset)); if (resultPtr == NULL) { ---- pTk/mTk/generic/tkFrame.c.orig 2008-01-04 22:52:12.000000000 +0100 -+++ pTk/mTk/generic/tkFrame.c 2008-01-04 23:51:20.000000000 +0100 -@@ -769,6 +769,7 @@ - result = TCL_ERROR; - goto done; - } -+ - objPtr = Tk_GetOptionValue(interp, (char *) framePtr, - framePtr->optionTable, objv[2], framePtr->tkwin); - if (objPtr == NULL) { Index: perl-Tk.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Tk/devel/perl-Tk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Tk.spec 6 Feb 2008 02:37:56 -0000 1.14 +++ perl-Tk.spec 12 Mar 2008 03:53:03 -0000 1.15 @@ -3,7 +3,7 @@ Name: perl-Tk Version: 804.028 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Perl Graphical User Interface ToolKit Group: Development/Libraries @@ -56,7 +56,7 @@ # debian patch %patch1 -p1 # patch to fix #235666 ... seems like caching code is broken -%patch2 +%patch2 -p1 -b .seg %patch100 %build @@ -65,8 +65,8 @@ make %{?_smp_mflags} # disable because they need an x screen -#%check -#make test +%check +# make test %install rm -rf $RPM_BUILD_ROOT @@ -102,6 +102,9 @@ %exclude %{perl_vendorarch}/Tk/reindex.pl %changelog +* Tue Mar 11 2008 Tom "spot" Callaway 804.028-5 +- rework patch2 to fix menu and test case failures (bz 431330, upstream 33880) + * Tue Feb 05 2008 Tom "spot" Callaway - 804.028-4 - rebuild for new perl From fedora-extras-commits at redhat.com Wed Mar 12 03:54:39 2008 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 12 Mar 2008 03:54:39 GMT Subject: comps comps-f9.xml.in,1.304,1.305 Message-ID: <200803120354.m2C3sdkc022844@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22806 Modified Files: comps-f9.xml.in Log Message: [development-tools] add sigscheme Index: comps-f9.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f9.xml.in,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- comps-f9.xml.in 11 Mar 2008 13:13:22 -0000 1.304 +++ comps-f9.xml.in 12 Mar 2008 03:54:09 -0000 1.305 @@ -916,6 +916,7 @@ sbcl scanmem scons + sigscheme smarteiffel splint Sprog From fedora-extras-commits at redhat.com Wed Mar 12 04:11:36 2008 From: fedora-extras-commits at redhat.com (Matthew Barnes (mbarnes)) Date: Wed, 12 Mar 2008 04:11:36 GMT Subject: rpms/evolution-data-server/devel evolution-data-server-2.22.0-e2k-global-catalog.patch, NONE, 1.1 evolution-data-server.spec, 1.210, 1.211 Message-ID: <200803120411.m2C4Bat9029699@cvs-int.fedora.redhat.com> Author: mbarnes Update of /cvs/pkgs/rpms/evolution-data-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29670 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-2.22.0-e2k-global-catalog.patch Log Message: * Tue Mar 11 2008 Matthew Barnes - 2.22.0-2.fc9 - Add patch for RH bug #296671 (GC servers may not support NTLM). evolution-data-server-2.22.0-e2k-global-catalog.patch: --- NEW FILE evolution-data-server-2.22.0-e2k-global-catalog.patch --- diff -up evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c.e2k-global-catalog evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c --- evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c.e2k-global-catalog 2007-11-29 07:53:45.000000000 -0500 +++ evolution-data-server-2.22.0/servers/exchange/lib/e2k-global-catalog.c 2008-03-11 23:41:22.000000000 -0400 @@ -307,17 +307,19 @@ static int connect_ldap (E2kGlobalCatalog *gc, E2kOperation *op, LDAP *ldap) { int ldap_error; -#ifndef HAVE_LDAP_NTLM_BIND char *nt_name; #ifdef G_OS_WIN32 SEC_WINNT_AUTH_IDENTITY_W auth; #endif -#endif /* authenticate */ #ifdef HAVE_LDAP_NTLM_BIND - ldap_error = ntlm_bind (gc, op, ldap); -#else + if (ntlm_bind (gc, op, ldap) == LDAP_SUCCESS) { + E2K_GC_DEBUG_MSG(("GC: connected via NTLM\n\n")); + return LDAP_SUCCESS; + } +#endif + nt_name = gc->priv->nt_domain ? g_strdup_printf ("%s\\%s", gc->priv->nt_domain, gc->priv->user) : g_strdup (gc->priv->user); @@ -339,7 +341,7 @@ connect_ldap (E2kGlobalCatalog *gc, E2kO g_free (auth.User); #endif g_free (nt_name); -#endif + if (ldap_error != LDAP_SUCCESS) g_warning ("LDAP authentication failed (0x%02x)", ldap_error); else Index: evolution-data-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- evolution-data-server.spec 10 Mar 2008 17:14:08 -0000 1.210 +++ evolution-data-server.spec 12 Mar 2008 04:11:03 -0000 1.211 @@ -28,7 +28,7 @@ Name: evolution-data-server Version: 2.22.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -55,6 +55,9 @@ Patch15: evolution-data-server-2.22.0-implicit-function-declaration.patch +# RH bug #296671 / GNOME bug #500389 +Patch16: evolution-data-server-2.22.0-e2k-global-catalog.patch + ### Build Dependencies ### BuildRequires: GConf2-devel @@ -134,6 +137,7 @@ %patch13 -p1 -b .camel-folder-summary-crash %patch14 -p1 -b .fix-64bit-acinclude %patch15 -p1 -b .implicit-function-declaration +%patch16 -p1 -b .e2k-global-catalog mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -376,6 +380,9 @@ %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Tue Mar 11 2008 Matthew Barnes - 2.22.0-2.fc9 +- Add patch for RH bug #296671 (GC servers may not support NTLM). + * Mon Mar 10 2008 Matthew Barnes - 2.22.0-1.fc9 - Update to 2.22.0 From fedora-extras-commits at redhat.com Wed Mar 12 04:50:53 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Wed, 12 Mar 2008 04:50:53 GMT Subject: rpms/qosmic/devel .cvsignore, 1.3, 1.4 qosmic.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200803120450.m2C4orpG030738@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/qosmic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30712/devel Modified Files: .cvsignore qosmic.spec sources Log Message: update to 1.3.1-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2008 05:07:03 -0000 1.3 +++ .cvsignore 12 Mar 2008 04:50:22 -0000 1.4 @@ -1 +1 @@ -qosmic-1.3.tar.bz2 +qosmic-1.3.1.tar.bz2 Index: qosmic.spec =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/devel/qosmic.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qosmic.spec 2 Mar 2008 05:53:18 -0000 1.4 +++ qosmic.spec 12 Mar 2008 04:50:22 -0000 1.5 @@ -1,6 +1,6 @@ Name: qosmic -Version: 1.3 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: A cosmic recursive fractal flame editor written in Qt4 Group: Applications/Multimedia @@ -63,6 +63,9 @@ %changelog +* Tue Mar 11 2008 Ian Weller 1.3.1-1 +- Updated upstream + * Sat Mar 01 2008 Ian Weller 1.3-2 - Once again qosmic failed to start because it couldn't find the palettes, hopefully fixed for good this time Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2008 05:07:03 -0000 1.3 +++ sources 12 Mar 2008 04:50:22 -0000 1.4 @@ -1 +1 @@ -fe0312c1c51a63ba272021c5f6a1cde4 qosmic-1.3.tar.bz2 +d1749a8e7edf3b4df4c0df4690f37d6e qosmic-1.3.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 05:01:28 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Wed, 12 Mar 2008 05:01:28 GMT Subject: rpms/qosmic/F-8 .cvsignore, 1.3, 1.4 qosmic.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200803120501.m2C51Scc004663@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/qosmic/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31013/F-8 Modified Files: .cvsignore qosmic.spec sources Log Message: update to 1.3.1-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2008 05:13:16 -0000 1.3 +++ .cvsignore 12 Mar 2008 05:00:54 -0000 1.4 @@ -1 +1 @@ -qosmic-1.3.tar.bz2 +qosmic-1.3.1.tar.bz2 Index: qosmic.spec =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-8/qosmic.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qosmic.spec 2 Mar 2008 05:54:51 -0000 1.4 +++ qosmic.spec 12 Mar 2008 05:00:54 -0000 1.5 @@ -1,6 +1,6 @@ Name: qosmic -Version: 1.3 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: A cosmic recursive fractal flame editor written in Qt4 Group: Applications/Multimedia @@ -63,6 +63,9 @@ %changelog +* Tue Mar 11 2008 Ian Weller 1.3.1-1 +- Updated upstream + * Sat Mar 01 2008 Ian Weller 1.3-2 - Once again qosmic failed to start because it couldn't find the palettes, hopefully fixed for good this time Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2008 05:13:16 -0000 1.3 +++ sources 12 Mar 2008 05:00:54 -0000 1.4 @@ -1 +1 @@ -fe0312c1c51a63ba272021c5f6a1cde4 qosmic-1.3.tar.bz2 +d1749a8e7edf3b4df4c0df4690f37d6e qosmic-1.3.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 05:02:47 2008 From: fedora-extras-commits at redhat.com (sami wagiaalla (swagiaal)) Date: Wed, 12 Mar 2008 05:02:47 GMT Subject: rpms/frysk/devel frysk.spec,1.126,1.127 Message-ID: <200803120502.m2C52leN004788@cvs-int.fedora.redhat.com> Author: swagiaal Update of /cvs/pkgs/rpms/frysk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30990 Modified Files: frysk.spec Log Message: * Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.03.11 - Import 0.0.1.2008.03.11 (84bcf09e5a329252d81e853e49f0cf1449f937c2) Index: frysk.spec =================================================================== RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- frysk.spec 11 Mar 2008 20:10:12 -0000 1.126 +++ frysk.spec 12 Mar 2008 05:02:12 -0000 1.127 @@ -1,7 +1,7 @@ Summary: Frysk execution analysis and debugging tools Name: frysk -Version: 0.0.1.2008.02.29.rh1 -Release: 2%{?dist} +Version: 0.0.1.2008.03.11 +Release: 1%{?dist} # antlrv2 is Public Domain; antlrv3 is BSD. # cdtparser is EPL # getopt is GPLv2 with exception @@ -258,6 +258,9 @@ %{_datadir}/gnome/help/%{name}/* %changelog +* Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.03.11 +- Import 0.0.1.2008.03.11 (84bcf09e5a329252d81e853e49f0cf1449f937c2) + * Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.02.29.rh1-2 - Update releease number - added frysk-0.0.1.2008.02.29.rh1-asm-includes.patch From fedora-extras-commits at redhat.com Wed Mar 12 05:03:03 2008 From: fedora-extras-commits at redhat.com (sami wagiaalla (swagiaal)) Date: Wed, 12 Mar 2008 05:03:03 GMT Subject: rpms/frysk/F-8 frysk.spec,1.124,1.125 Message-ID: <200803120503.m2C533Cb004843@cvs-int.fedora.redhat.com> Author: swagiaal Update of /cvs/pkgs/rpms/frysk/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30969 Modified Files: frysk.spec Log Message: * Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.03.11 - Import 0.0.1.2008.03.11 (84bcf09e5a329252d81e853e49f0cf1449f937c2) Index: frysk.spec =================================================================== RCS file: /cvs/pkgs/rpms/frysk/F-8/frysk.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- frysk.spec 29 Feb 2008 22:15:24 -0000 1.124 +++ frysk.spec 12 Mar 2008 05:02:27 -0000 1.125 @@ -1,6 +1,6 @@ Summary: Frysk execution analysis and debugging tools Name: frysk -Version: 0.0.1.2008.02.29.rh1 +Version: 0.0.1.2008.03.11 Release: 1%{?dist} # antlrv2 is Public Domain; antlrv3 is BSD. # cdtparser is EPL @@ -254,6 +254,9 @@ %{_datadir}/gnome/help/%{name}/* %changelog +* Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.03.11 +- Import 0.0.1.2008.03.11 (84bcf09e5a329252d81e853e49f0cf1449f937c2) + * Fri Feb 29 2008 Sami Wagiaalla - 0.0.1.2008.02.29.rh1-1 - Import frysk-0.0.1.2008.02.29.rh1 (148d1359cf791171d7f346d4fca35c1fc36aca8c) - Remove BuildRequires: libgconf-java-devel From fedora-extras-commits at redhat.com Wed Mar 12 05:03:19 2008 From: fedora-extras-commits at redhat.com (Ian Weller (ianweller)) Date: Wed, 12 Mar 2008 05:03:19 GMT Subject: rpms/qosmic/F-7 .cvsignore, 1.3, 1.4 qosmic.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200803120503.m2C53Jk5004853@cvs-int.fedora.redhat.com> Author: ianweller Update of /cvs/pkgs/rpms/qosmic/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4782/F-7 Modified Files: .cvsignore qosmic.spec sources Log Message: update to 1.3.1-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-7/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2008 05:15:47 -0000 1.3 +++ .cvsignore 12 Mar 2008 05:02:45 -0000 1.4 @@ -1 +1 @@ -qosmic-1.3.tar.bz2 +qosmic-1.3.1.tar.bz2 Index: qosmic.spec =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-7/qosmic.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qosmic.spec 2 Mar 2008 05:56:10 -0000 1.4 +++ qosmic.spec 12 Mar 2008 05:02:45 -0000 1.5 @@ -1,6 +1,6 @@ Name: qosmic -Version: 1.3 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: A cosmic recursive fractal flame editor written in Qt4 Group: Applications/Multimedia @@ -63,6 +63,9 @@ %changelog +* Tue Mar 11 2008 Ian Weller 1.3.1-1 +- Updated upstream + * Sat Mar 01 2008 Ian Weller 1.3-2 - Once again qosmic failed to start because it couldn't find the palettes, hopefully fixed for good this time Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qosmic/F-7/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2008 05:15:47 -0000 1.3 +++ sources 12 Mar 2008 05:02:45 -0000 1.4 @@ -1 +1 @@ -fe0312c1c51a63ba272021c5f6a1cde4 qosmic-1.3.tar.bz2 +d1749a8e7edf3b4df4c0df4690f37d6e qosmic-1.3.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 05:09:54 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Wed, 12 Mar 2008 05:09:54 GMT Subject: rpms/kernel/devel kernel.spec, 1.497, 1.498 linux-2.6-drm-i915-modeset.patch, 1.4, 1.5 Message-ID: <200803120509.m2C59sl3005223@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5186 Modified Files: kernel.spec linux-2.6-drm-i915-modeset.patch Log Message: * Wed Mar 12 2008 Dave Airlie - drm: fix oops on i915 driver when X crashes Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.497 retrieving revision 1.498 diff -u -r1.497 -r1.498 --- kernel.spec 12 Mar 2008 01:52:59 -0000 1.497 +++ kernel.spec 12 Mar 2008 05:09:07 -0000 1.498 @@ -1752,6 +1752,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Wed Mar 12 2008 Dave Airlie +- drm: fix oops on i915 driver when X crashes + * Tue Mar 11 2008 John W. Linville - rt2x00:correct rx packet length for USB devices - make b43_mac_{enable,suspend}() static linux-2.6-drm-i915-modeset.patch: Index: linux-2.6-drm-i915-modeset.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-drm-i915-modeset.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-drm-i915-modeset.patch 11 Mar 2008 06:52:18 -0000 1.4 +++ linux-2.6-drm-i915-modeset.patch 12 Mar 2008 05:09:07 -0000 1.5 @@ -5036,7 +5036,7 @@ struct drm_fence_object *fence; diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c -index a5920dc..ed80748 100644 +index a5920dc..c09e4a4 100644 --- a/drivers/char/drm/drm_fops.c +++ b/drivers/char/drm/drm_fops.c @@ -43,10 +43,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp, @@ -5093,13 +5093,13 @@ int retcode = 0; - if (!((minor >= 0) && (minor < drm_cards_limit))) -- return -ENODEV; -- -- if (!drm_heads[minor]) + minor = idr_find(&drm_minors_idr, minor_id); + if (!minor) return -ENODEV; +- if (!drm_heads[minor]) +- return -ENODEV; +- - if (!(dev = drm_heads[minor]->dev)) + if (!(dev = minor->dev)) return -ENODEV; @@ -5126,13 +5126,13 @@ DRM_DEBUG("\n"); - if (!((minor >= 0) && (minor < drm_cards_limit))) +- return -ENODEV; +- +- if (!drm_heads[minor]) + minor = idr_find(&drm_minors_idr, minor_id); + if (!minor) return -ENODEV; - -- if (!drm_heads[minor]) -- return -ENODEV; -- - if (!(dev = drm_heads[minor]->dev)) + + if (!(dev = minor->dev)) @@ -5192,7 +5192,7 @@ + ret = -ENOMEM; + goto out_free; + } -+ + + priv->is_master = 1; + priv->master = priv->minor->master; + @@ -5210,7 +5210,7 @@ + priv->master = priv->minor->master; + mutex_unlock(&dev->struct_mutex); + } - ++ + mutex_lock(&dev->struct_mutex); list_add(&priv->lhead, &dev->filelist); mutex_unlock(&dev->struct_mutex); @@ -5238,7 +5238,7 @@ int retcode = 0; lock_kernel(); -@@ -387,27 +397,26 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -387,63 +397,65 @@ int drm_release(struct inode *inode, struct file *filp) */ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n", @@ -5248,64 +5248,109 @@ dev->open_count); - if (dev->driver->reclaim_buffers_locked && dev->lock.hw_lock) { -+ if (dev->driver->reclaim_buffers_locked && file_priv->master->lock.hw_lock) { - if (drm_i_have_hw_lock(dev, file_priv)) { - dev->driver->reclaim_buffers_locked(dev, file_priv); - } else { - unsigned long _end = jiffies + 3*DRM_HZ; - int locked = 0; - +- if (drm_i_have_hw_lock(dev, file_priv)) { +- dev->driver->reclaim_buffers_locked(dev, file_priv); +- } else { +- unsigned long _end = jiffies + 3*DRM_HZ; +- int locked = 0; +- - drm_idlelock_take(&dev->lock); -+ drm_idlelock_take(&file_priv->master->lock); - - /* - * Wait for a while. - */ - +- +- /* +- * Wait for a while. +- */ +- - do { - spin_lock(&dev->lock.spinlock); - locked = dev->lock.idle_has_lock; - spin_unlock(&dev->lock.spinlock); -+ do{ -+ spin_lock(&file_priv->master->lock.spinlock); -+ locked = file_priv->master->lock.idle_has_lock; -+ spin_unlock(&file_priv->master->lock.spinlock); - if (locked) - break; - schedule(); -@@ -420,24 +429,24 @@ int drm_release(struct inode *inode, struct file *filp) +- if (locked) +- break; +- schedule(); +- } while (!time_after_eq(jiffies, _end)); +- +- if (!locked) { +- DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n" +- "\tdriver to use reclaim_buffers_idlelocked() instead.\n" +- "\tI will go on reclaiming the buffers anyway.\n"); ++ /* if the master has gone away we can't do anything with the lock */ ++ if (file_priv->minor->master) { ++ if (dev->driver->reclaim_buffers_locked && file_priv->master->lock.hw_lock) { ++ if (drm_i_have_hw_lock(dev, file_priv)) { ++ dev->driver->reclaim_buffers_locked(dev, file_priv); ++ } else { ++ unsigned long _end = jiffies + 3*DRM_HZ; ++ int locked = 0; ++ ++ drm_idlelock_take(&file_priv->master->lock); ++ ++ /* ++ * Wait for a while. ++ */ ++ ++ do{ ++ spin_lock(&file_priv->master->lock.spinlock); ++ locked = file_priv->master->lock.idle_has_lock; ++ spin_unlock(&file_priv->master->lock.spinlock); ++ if (locked) ++ break; ++ schedule(); ++ } while (!time_after_eq(jiffies, _end)); ++ ++ if (!locked) { ++ DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n" ++ "\tdriver to use reclaim_buffers_idlelocked() instead.\n" ++ "\tI will go on reclaiming the buffers anyway.\n"); ++ } ++ ++ dev->driver->reclaim_buffers_locked(dev, file_priv); ++ drm_idlelock_release(&file_priv->master->lock); } - - dev->driver->reclaim_buffers_locked(dev, file_priv); +- +- dev->driver->reclaim_buffers_locked(dev, file_priv); - drm_idlelock_release(&dev->lock); -+ drm_idlelock_release(&file_priv->master->lock); } - } +- } - if (dev->driver->reclaim_buffers_idlelocked && dev->lock.hw_lock) { -+ if (dev->driver->reclaim_buffers_idlelocked && file_priv->master->lock.hw_lock) { ++ if (dev->driver->reclaim_buffers_idlelocked && file_priv->master->lock.hw_lock) { - drm_idlelock_take(&dev->lock); -+ drm_idlelock_take(&file_priv->master->lock); - dev->driver->reclaim_buffers_idlelocked(dev, file_priv); +- dev->driver->reclaim_buffers_idlelocked(dev, file_priv); - drm_idlelock_release(&dev->lock); -+ drm_idlelock_release(&file_priv->master->lock); ++ drm_idlelock_take(&file_priv->master->lock); ++ dev->driver->reclaim_buffers_idlelocked(dev, file_priv); ++ drm_idlelock_release(&file_priv->master->lock); - } +- } ++ } - if (drm_i_have_hw_lock(dev, file_priv)) { - DRM_DEBUG("File %p released, freeing lock for context %d\n", +- if (drm_i_have_hw_lock(dev, file_priv)) { +- DRM_DEBUG("File %p released, freeing lock for context %d\n", - filp, _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock)); -+ filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); ++ if (drm_i_have_hw_lock(dev, file_priv)) { ++ DRM_DEBUG("File %p released, freeing lock for context %d\n", ++ filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); - drm_lock_free(&dev->lock, - _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock)); -+ drm_lock_free(&file_priv->master->lock, -+ _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); - } +- } ++ drm_lock_free(&file_priv->master->lock, ++ _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); ++ } + +- if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) && +- !dev->driver->reclaim_buffers_locked) { +- dev->driver->reclaim_buffers(dev, file_priv); ++ if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) && ++ !dev->driver->reclaim_buffers_locked) { ++ dev->driver->reclaim_buffers(dev, file_priv); ++ } + } -@@ -469,6 +478,16 @@ int drm_release(struct inode *inode, struct file *filp) + drm_fasync(-1, filp, 0); +@@ -469,6 +481,16 @@ int drm_release(struct inode *inode, struct file *filp) } mutex_unlock(&dev->ctxlist_mutex); @@ -5322,7 +5367,7 @@ mutex_lock(&dev->struct_mutex); drm_object_release(filp); if (file_priv->remove_auth_on_close == 1) { -@@ -491,9 +510,9 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -491,9 +513,9 @@ int drm_release(struct inode *inode, struct file *filp) atomic_inc(&dev->counts[_DRM_STAT_CLOSES]); spin_lock(&dev->count_lock); if (!--dev->open_count) { From fedora-extras-commits at redhat.com Wed Mar 12 05:10:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 05:10:14 +0000 Subject: [pkgdb] ivtv-firmware (Fedora, devel) updated by kevin Message-ID: <200803120513.m2C5DEAJ003640@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) changed owner of ivtv-firmware in Fedora devel to athimm Kevin Fenzi (kevin) approved watchbugzilla on ivtv-firmware (Fedora devel) for jwilson Kevin Fenzi (kevin) approved watchcommits on ivtv-firmware (Fedora devel) for jwilson Kevin Fenzi (kevin) approved watchbugzilla on ivtv-firmware (Fedora devel) for kwizart Kevin Fenzi (kevin) approved watchcommits on ivtv-firmware (Fedora devel) for kwizart To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ivtv-firmware From fedora-extras-commits at redhat.com Wed Mar 12 05:10:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 05:10:14 +0000 Subject: [pkgdb] ivtv-firmware (Fedora, 8) updated by kevin Message-ID: <200803120513.m2C5DEAM003640@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) changed owner of ivtv-firmware in Fedora 8 to athimm Kevin Fenzi (kevin) approved watchbugzilla on ivtv-firmware (Fedora 8) for jwilson Kevin Fenzi (kevin) approved watchcommits on ivtv-firmware (Fedora 8) for jwilson Kevin Fenzi (kevin) approved watchbugzilla on ivtv-firmware (Fedora 8) for kwizart Kevin Fenzi (kevin) approved watchcommits on ivtv-firmware (Fedora 8) for kwizart To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ivtv-firmware From fedora-extras-commits at redhat.com Wed Mar 12 05:10:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 05:10:14 +0000 Subject: [pkgdb] ivtv-firmware (Fedora, 7) updated by kevin Message-ID: <200803120513.m2C5DEAP003640@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) changed owner of ivtv-firmware in Fedora 7 to athimm Kevin Fenzi (kevin) approved watchbugzilla on ivtv-firmware (Fedora 7) for jwilson Kevin Fenzi (kevin) approved watchcommits on ivtv-firmware (Fedora 7) for jwilson Kevin Fenzi (kevin) approved watchbugzilla on ivtv-firmware (Fedora 7) for kwizart Kevin Fenzi (kevin) approved watchcommits on ivtv-firmware (Fedora 7) for kwizart To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/ivtv-firmware From fedora-extras-commits at redhat.com Wed Mar 12 05:13:53 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 05:13:53 +0000 Subject: [pkgdb] xyz-gallery was added for jkubin Message-ID: <200803120516.m2C5Grpr003784@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xyz-gallery with summary a web gallery image generator with embedded JavaScript viewer Kevin Fenzi (kevin) has approved Package xyz-gallery Kevin Fenzi (kevin) has added a Fedora devel branch for xyz-gallery with an owner of jkubin Kevin Fenzi (kevin) has approved xyz-gallery in Fedora devel Kevin Fenzi (kevin) has approved Package xyz-gallery Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xyz-gallery (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xyz-gallery (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xyz-gallery (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xyz-gallery From fedora-extras-commits at redhat.com Wed Mar 12 05:14:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 05:14:03 +0000 Subject: [pkgdb] xyz-gallery (Fedora, 8) updated by kevin Message-ID: <200803120517.m2C5H3eY003805@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xyz-gallery Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xyz-gallery (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xyz-gallery (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xyz-gallery (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on xyz-gallery (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xyz-gallery From fedora-extras-commits at redhat.com Wed Mar 12 05:14:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 05:14:03 +0000 Subject: [pkgdb] xyz-gallery (Fedora, 7) updated by kevin Message-ID: <200803120517.m2C5H3eb003805@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for xyz-gallery Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xyz-gallery (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xyz-gallery (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xyz-gallery (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on xyz-gallery (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xyz-gallery From fedora-extras-commits at redhat.com Wed Mar 12 05:14:03 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 05:14:03 +0000 Subject: [pkgdb] xyz-gallery (Fedora, devel) updated by kevin Message-ID: <200803120517.m2C5H3ee003805@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on xyz-gallery (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xyz-gallery From fedora-extras-commits at redhat.com Wed Mar 12 06:02:42 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Wed, 12 Mar 2008 06:02:42 GMT Subject: rpms/xyz-gallery/devel - New directory Message-ID: <200803120602.m2C62gr4012859@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/xyz-gallery/devel In directory cvs-int.fedora.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsp12812/rpms/xyz-gallery/devel Log Message: Directory /cvs/extras/rpms/xyz-gallery/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 06:02:46 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Wed, 12 Mar 2008 06:02:46 GMT Subject: rpms/xyz-gallery Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803120602.m2C62kq6012884@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/xyz-gallery In directory cvs-int.fedora.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsp12812/rpms/xyz-gallery Added Files: Makefile import.log Log Message: Setup of module xyz-gallery --- NEW FILE Makefile --- # Top level Makefile for module xyz-gallery all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 12 06:02:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Wed, 12 Mar 2008 06:02:41 GMT Subject: rpms/xyz-gallery - New directory Message-ID: <200803120602.m2C62fYA012845@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/xyz-gallery In directory cvs-int.fedora.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsp12812/rpms/xyz-gallery Log Message: Directory /cvs/extras/rpms/xyz-gallery added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 06:27:26 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?= (toshio)) Date: Wed, 12 Mar 2008 06:27:26 GMT Subject: rpms/xyz-gallery/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803120627.m2C6RQi4013293@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/xyz-gallery/devel In directory cvs-int.fedora.redhat.com:/home/fedora/toshio/CVSROOT/admin/tmpcvsp12812/rpms/xyz-gallery/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xyz-gallery --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xyz-gallery # $Id: Makefile,v 1.1 2008/03/12 06:02:46 toshio Exp $ NAME := xyz-gallery SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Mar 12 06:28:30 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 06:28:30 GMT Subject: rpms/glibmm24/devel .cvsignore, 1.25, 1.26 glibmm.spec, 1.34, 1.35 sources, 1.26, 1.27 Message-ID: <200803120628.m2C6SUON013372@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13328 Modified Files: .cvsignore glibmm.spec sources Log Message: Update to upstream 2.16.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 12 Feb 2008 20:31:09 -0000 1.25 +++ .cvsignore 12 Mar 2008 06:27:59 -0000 1.26 @@ -1 +1 @@ -glibmm-2.15.5.tar.bz2 +glibmm-2.16.0.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- glibmm.spec 12 Feb 2008 22:32:53 -0000 1.34 +++ glibmm.spec 12 Mar 2008 06:27:59 -0000 1.35 @@ -1,16 +1,17 @@ Name: glibmm24 -Version: 2.15.5 +Version: 2.16.0 Release: 1%{?dist} Summary: C++ interface for GTK2 (a GUI library for X) Group: System Environment/Libraries License: LGPLv2+ URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/glibmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.16/glibmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsigc++20-devel >= 2.0.0 -BuildRequires: glib2-devel >= 2.15.5 +BuildRequires: glib2-devel >= 2.16.0 + %description gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2. @@ -81,6 +82,9 @@ %changelog +* Wed Mar 12 2008 Denis Leroy - 2.16.0-1 +- Update to upstream 2.16.0 + * Tue Feb 12 2008 Denis Leroy - 2.15.5-1 - Update to 2.15.5, skipping borked 2.15.4, CHANGES file gone Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 12 Feb 2008 20:31:09 -0000 1.26 +++ sources 12 Mar 2008 06:27:59 -0000 1.27 @@ -1 +1 @@ -c7f0f61c42e874c4dff82d5f89072e6e glibmm-2.15.5.tar.bz2 +0a2442b754b97c67d0ccb4a9a2bebcb2 glibmm-2.16.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 06:43:54 2008 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 12 Mar 2008 06:43:54 GMT Subject: rpms/uim/F-8 .cvsignore, 1.19, 1.20 sources, 1.18, 1.19 uim.spec, 1.48, 1.49 xinput.d-uim, 1.3, 1.4 uim-1.4.1-m17n-not-list-nil-im.patch, 1.1, NONE Message-ID: <200803120643.m2C6hs32013688@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/uim/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13657 Modified Files: .cvsignore sources uim.spec xinput.d-uim Removed Files: uim-1.4.1-m17n-not-list-nil-im.patch Log Message: * Wed Mar 12 2008 Akira TAGOH - 1.4.2-1 - New upstream release. - Fix a memory corruption, causing a crash on Firefox 3 say. - uim-1.4.1-m17n-not-list-nil-im.patch: no longer needed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/uim/F-8/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 19 Mar 2007 09:46:03 -0000 1.19 +++ .cvsignore 12 Mar 2008 06:43:23 -0000 1.20 @@ -19,3 +19,4 @@ uim-1.3.0.tar.bz2 uim-1.4.0.tar.bz2 uim-1.4.1.tar.bz2 +uim-1.4.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/uim/F-8/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 19 Mar 2007 09:46:03 -0000 1.18 +++ sources 12 Mar 2008 06:43:23 -0000 1.19 @@ -1 +1 @@ -f2d0da38626e0d96116e7bd72a0bc596 uim-1.4.1.tar.bz2 +f5ac910cfa668343c73ca93e314d80ba uim-1.4.2.tar.bz2 Index: uim.spec =================================================================== RCS file: /cvs/pkgs/rpms/uim/F-8/uim.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- uim.spec 28 Sep 2007 09:07:38 -0000 1.48 +++ uim.spec 12 Mar 2008 06:43:23 -0000 1.49 @@ -2,14 +2,14 @@ %define uninst_xinput alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf Name: uim -Version: 1.4.1 -Release: 9%{?dist} +Version: 1.4.2 +Release: 1%{?dist} # uim itself is licensed under BSD # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h} # and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+ # pixmaps/*.{svg,png} is licensed under BSD or LGPLv2 License: BSD and LGPLv2+ and (BSD or LGPLv2) -URL: http://uim.freedesktop.org/ +URL: http://code.google.com/p/uim/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel BuildRequires: gtk2-devel gnome-panel-devel qt-devel ncurses-devel @@ -23,10 +23,9 @@ BuildRequires: m17n-db-sinhala m17n-db-slovak m17n-db-swedish m17n-db-syriac m17n-db-tamil BuildRequires: m17n-db-telugu m17n-db-thai m17n-db-tibetan m17n-db-vietnamese BuildRequires: emacs -Source0: http://uim.freedesktop.org/release/%{name}-%{version}.tar.bz2 +Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: xinput.d-uim Source2: uim-init.el -Patch0: uim-1.4.1-m17n-not-list-nil-im.patch Summary: A multilingual input method library @@ -169,7 +168,6 @@ %prep %setup -q -n %{name}-%{version} -%patch -p1 -b .m17n-nil %build @@ -385,6 +383,11 @@ %dir %{_datadir}/uim %changelog +* Wed Mar 12 2008 Akira TAGOH - 1.4.2-1 +- New upstream release. + - Fix a memory corruption, causing a crash on Firefox 3 say. +- uim-1.4.1-m17n-not-list-nil-im.patch: no longer needed. + * Fri Sep 28 2007 Akira TAGOH - 1.4.1-9 - Add Requires: uim-gtk2 in uim-gnome. Index: xinput.d-uim =================================================================== RCS file: /cvs/pkgs/rpms/uim/F-8/xinput.d-uim,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xinput.d-uim 10 Sep 2007 07:18:14 -0000 1.3 +++ xinput.d-uim 12 Mar 2008 06:43:23 -0000 1.4 @@ -1,5 +1,5 @@ XIM=uim -XIM_PROGRAM=uim-xim +XIM_PROGRAM=/usr/bin/uim-xim GTK_IM_MODULE=uim QT_IM_MODULE=uim SHORT_DESC=UIM --- uim-1.4.1-m17n-not-list-nil-im.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 07:02:56 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Wed, 12 Mar 2008 07:02:56 GMT Subject: rpms/xorg-x11-drv-i810/devel intel-2.1.1-disable-ttm.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.84, 1.85 Message-ID: <200803120702.m2C72uL2020022@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19990 Modified Files: xorg-x11-drv-i810.spec Added Files: intel-2.1.1-disable-ttm.patch Log Message: * Wed Mar 12 2008 Dave Airlie 2.2.1-11 - fall intel master driver back to non-TTM mode avoids compiz fail intel-2.1.1-disable-ttm.patch: --- NEW FILE intel-2.1.1-disable-ttm.patch --- diff -up xf86-video-intel-2.2.1/src/i830_memory.c.disablettm xf86-video-intel-2.2.1/src/i830_memory.c --- xf86-video-intel-2.2.1/src/i830_memory.c.disablettm 2008-03-12 16:45:55.000000000 +1000 +++ xf86-video-intel-2.2.1/src/i830_memory.c 2008-03-12 16:46:22.000000000 +1000 @@ -441,8 +441,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, u * 5.4 or newer so we can rely on the lock being held after DRIScreenInit, * rather than after DRIFinishScreenInit. */ - if (pI830->directRenderingEnabled && pI830->drmMinor >= 7 && - (dri_major > 5 || (dri_major == 5 && dri_minor >= 4))) + if (0) //pI830->directRenderingEnabled && pI830->drmMinor >= 7 && +// (dri_major > 5 || (dri_major == 5 && dri_minor >= 4))) { int mmsize; Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- xorg-x11-drv-i810.spec 10 Mar 2008 04:44:53 -0000 1.84 +++ xorg-x11-drv-i810.spec 12 Mar 2008 07:02:08 -0000 1.85 @@ -5,7 +5,7 @@ Summary: Xorg X11 Intel video driver(s) Name: xorg-x11-drv-i810 Version: 2.2.1 -Release: 10%{?dist} +Release: 11%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -25,6 +25,7 @@ Patch5: intel-2.1.1-efi.patch Patch6: intel-2.1.1-pciaccess-version.patch Patch7: intel-quirk-dvo.patch +Patch8: intel-2.1.1-disable-ttm.patch Patch100: intel-master.patch Patch101: intel-batchbuffer.patch @@ -67,6 +68,7 @@ %patch5 -p1 -b .efi %patch6 -p1 -b .pciaccessvers %patch7 -p1 -b .quirk +%patch8 -p1 -b .disablettm %patch100 -p1 -b .intel-master cd ../xf86-video-intel-%{batchbuffer_version} @@ -137,6 +139,9 @@ %{_libdir}/libI810XvMC.so %changelog +* Wed Mar 12 2008 Dave Airlie 2.2.1-11 +- fall intel master driver back to non-TTM mode avoids compiz fail + * Mon Mar 10 2008 Dave Airlie 2.2.1-10 - quirk Motion Computing M1200 From fedora-extras-commits at redhat.com Wed Mar 12 07:10:53 2008 From: fedora-extras-commits at redhat.com (Panu Matilainen (pmatilai)) Date: Wed, 12 Mar 2008 07:10:53 GMT Subject: rpms/rpm/devel rpm-4.4.2.3-no-order-rescan-limit.patch, NONE, 1.1 rpm.spec, 1.278, 1.279 Message-ID: <200803120710.m2C7Ar25020182@cvs-int.fedora.redhat.com> Author: pmatilai Update of /cvs/pkgs/rpms/rpm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20150 Modified Files: rpm.spec Added Files: rpm-4.4.2.3-no-order-rescan-limit.patch Log Message: - Continue ordering loop elimination as long as progress is made (#437041) rpm-4.4.2.3-no-order-rescan-limit.patch: --- NEW FILE rpm-4.4.2.3-no-order-rescan-limit.patch --- diff -up rpm-4.4.2.3-rc1/lib/depends.c.no-limit rpm-4.4.2.3-rc1/lib/depends.c --- rpm-4.4.2.3-rc1/lib/depends.c.no-limit 2008-03-12 08:40:08.000000000 +0200 +++ rpm-4.4.2.3-rc1/lib/depends.c 2008-03-12 08:58:15.000000000 +0200 @@ -1229,7 +1229,7 @@ int rpmtsOrder(rpmts ts) int numOrderList; int npeer = 128; /* XXX more than deep enough for now. */ int * peer = memset(alloca(npeer*sizeof(*peer)), 0, (npeer*sizeof(*peer))); - int nrescans = 10; + int nrescans = 0; int _printed = 0; char deptypechar; size_t tsbytes; @@ -1563,8 +1563,10 @@ rescan: /* If a relation was eliminated, then continue sorting. */ /* XXX TODO: add control bit. */ - if (nzaps && nrescans-- > 0) { - rpmMessage(RPMMESS_DEBUG, _("========== continuing tsort ...\n")); + if (nzaps > 0) { + rpmMessage(RPMMESS_DEBUG, + _("========== continuing tsort ... (rescan %d)\n"), + ++nrescans); goto rescan; } Index: rpm.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- rpm.spec 19 Feb 2008 20:03:05 -0000 1.278 +++ rpm.spec 12 Mar 2008 07:10:17 -0000 1.279 @@ -6,7 +6,7 @@ Summary: The RPM package management system Name: rpm Version: 4.4.2.3 -Release: 0.2.rc1 +Release: 0.3.rc1 Group: System Environment/Base Url: http://www.rpm.org/ Source: http://rpm.org/releases/rpm-4.4.x/%{name}-%{version}-rc1.tar.gz @@ -21,6 +21,7 @@ Patch9: rpm-4.4.2.2-autofoo.patch Patch10: rpm-4.4.2.2-pkgconfig-path.patch Patch11: rpm-4.4.2.3-queryformat-arch.patch +Patch12: rpm-4.4.2.3-no-order-rescan-limit.patch Patch50: rpm-4.4.2.3-geode-instplat.patch @@ -145,6 +146,7 @@ %patch9 -p1 -b .autofoo %patch10 -p1 -b .pkgconfig-path %patch11 -p1 -b .qfmt-arch +%patch12 -p1 -b .no-order-limit %patch50 -p1 -b .geode-instplat @@ -399,6 +401,9 @@ %endif %changelog +* Wed Mar 12 2008 Panu Matilainen 4.4.2.3-0.3.rc1 +- Continue ordering loop elimination as long as progress is made (#437041) + * Tue Feb 19 2008 Fedora Release Engineering - 4.4.2.3-0.2.rc1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 12 07:21:04 2008 From: fedora-extras-commits at redhat.com (Trond Danielsen (trondd)) Date: Wed, 12 Mar 2008 07:21:04 GMT Subject: rpms/gedit-plugins/F-8 .cvsignore, 1.2, 1.3 gedit-plugins.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803120721.m2C7L4mA020408@cvs-int.fedora.redhat.com> Author: trondd Update of /cvs/pkgs/rpms/gedit-plugins/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20370 Modified Files: .cvsignore gedit-plugins.spec sources Log Message: * Wed Mar 12 2008 Trond Danielsen - 2.20.0-1 - Updated. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gedit-plugins/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2007 08:11:41 -0000 1.2 +++ .cvsignore 12 Mar 2008 07:20:33 -0000 1.3 @@ -1 +1 @@ -gedit-plugins-2.18.0.tar.gz +gedit-plugins-2.20.0.tar.gz Index: gedit-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/gedit-plugins/F-8/gedit-plugins.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gedit-plugins.spec 6 May 2007 08:11:41 -0000 1.1 +++ gedit-plugins.spec 12 Mar 2008 07:20:33 -0000 1.2 @@ -1,12 +1,12 @@ Name: gedit-plugins -Version: 2.18.0 -Release: 2%{?dist} +Version: 2.20.0 +Release: 1%{?dist} Summary: Plugins for gedit Group: Applications/Editors -License: GPL +License: GPLv2+ URL: http://live.gnome.org/GeditPlugins -Source0: ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.18/%{name}-%{version}.tar.gz +Source0: ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.20/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gedit-devel @@ -16,7 +16,15 @@ BuildRequires: libgnomeui-devel BuildRequires: gettext BuildRequires: vte-devel +BuildRequires: cairo-devel +BuildRequires: atk-devel +BuildRequires: pygtk2-devel +BuildRequires: pygtksourceview-devel +BuildRequires: pygobject2-devel Requires: gedit +Requires: pygtk2 +Requires: pygtksourceview +Requires: pygobject2 Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 @@ -32,8 +40,8 @@ -i "s!import vte!import imp; imp.find_module('vte')!" configure %build -%configure --disable-schemas-install \ ---with-plugins=bracketcompletion,charmap,codecomment,colorpicker,drawspaces,joinlines,showtabbar,smartspaces,terminal +%configure --disable-schemas-install --enable-python +#--with-plugins=bracketcompletion,charmap,codecomment,colorpicker,drawspaces,joinlines,showtabbar,smartspaces,terminal make %{?_smp_mflags} @@ -83,6 +91,9 @@ %changelog +* Wed Mar 12 2008 Trond Danielsen - 2.20.0-1 +- Updated. + * Mon Apr 30 2007 Trond Danielsen - 2.18.0-2 - Disable buggy session saver plugin. - Removed static libraries. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gedit-plugins/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2007 08:11:41 -0000 1.2 +++ sources 12 Mar 2008 07:20:33 -0000 1.3 @@ -1 +1 @@ -998845dced8481e4843d3b75569365a7 gedit-plugins-2.18.0.tar.gz +a93dbd184733434f6c7ce7f1ef3df53e gedit-plugins-2.20.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 08:02:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 08:02:23 +0000 Subject: [pkgdb] mpfr had acl change status Message-ID: <200803120805.m2C85PGp008434@bastion.fedora.phx.redhat.com> Ivana Varekova (varekova) has set the watchcommits acl on mpfr (Fedora devel) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpfr From fedora-extras-commits at redhat.com Wed Mar 12 08:02:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 08:02:32 +0000 Subject: [pkgdb] mpfr had acl change status Message-ID: <200803120805.m2C85Yun008492@bastion.fedora.phx.redhat.com> Ivana Varekova (varekova) has set the watchcommits acl on mpfr (Fedora 8) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpfr From fedora-extras-commits at redhat.com Wed Mar 12 08:02:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 08:02:29 +0000 Subject: [pkgdb] mpfr had acl change status Message-ID: <200803120805.m2C85PGs008434@bastion.fedora.phx.redhat.com> Ivana Varekova (varekova) has set the watchbugzilla acl on mpfr (Fedora 8) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpfr From fedora-extras-commits at redhat.com Wed Mar 12 08:02:26 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 08:02:26 +0000 Subject: [pkgdb] mpfr had acl change status Message-ID: <200803120805.m2C85RZM008454@bastion.fedora.phx.redhat.com> Ivana Varekova (varekova) has set the watchbugzilla acl on mpfr (Fedora devel) to Approved for Rex Dieter (rdieter) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/mpfr From fedora-extras-commits at redhat.com Wed Mar 12 08:38:45 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 12 Mar 2008 08:38:45 GMT Subject: rpms/clamav/devel clamav.spec,1.68,1.69 Message-ID: <200803120838.m2C8cjL5027574@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27536 Modified Files: clamav.spec Log Message: - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail subpackage (reported by Bruce Jerrick) Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- clamav.spec 5 Mar 2008 07:30:58 -0000 1.68 +++ clamav.spec 12 Mar 2008 08:38:02 -0000 1.69 @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.93 -Release: %release_func 0.0%{?snapshot:.%snapshot} +Release: %release_func 0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -146,6 +146,8 @@ Source300: README.fedora Requires: sendmail Requires: clamav-milter-core = %version-%release +Requires(pre): user(%milteruser) +Requires(pre): group(%milteruser) Provides: milter(clamav) = sendmail Conflicts: milter(clamav) < sendmail Conflicts: milter(clamav) > sendmail @@ -410,19 +412,19 @@ %__chown root:%username %freshclamlog } -%pre milter +%pre milter-core %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : -%post milter +%post milter-core test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%postun milter +%postun milter-core %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : @@ -553,6 +555,11 @@ %changelog +* Wed Mar 12 2008 Enrico Scholz +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + * Tue Mar 4 2008 Enrico Scholz - 0.93-0.0.rc1 - updated to 0.93rc1 - fixed rpath issues From fedora-extras-commits at redhat.com Wed Mar 12 08:40:45 2008 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 12 Mar 2008 08:40:45 GMT Subject: rpms/clamav/devel clamav.spec,1.69,1.70 Message-ID: <200803120840.m2C8ejCW027632@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27610 Modified Files: clamav.spec Log Message: added missing version to %changelog Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- clamav.spec 12 Mar 2008 08:38:02 -0000 1.69 +++ clamav.spec 12 Mar 2008 08:40:04 -0000 1.70 @@ -555,7 +555,7 @@ %changelog -* Wed Mar 12 2008 Enrico Scholz +* Wed Mar 12 2008 Enrico Scholz - 0.93-0.1.rc1 - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail subpackage (reported by Bruce Jerrick) From fedora-extras-commits at redhat.com Wed Mar 12 08:57:09 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Wed, 12 Mar 2008 08:57:09 GMT Subject: rpms/ppp/devel ppp-2.4.4-closelog.patch, NONE, 1.1 ppp-2.4.4-response_len.patch, NONE, 1.1 ppp.spec, 1.43, 1.44 Message-ID: <200803120857.m2C8v9WZ027857@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/ppp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27826 Modified Files: ppp.spec Added Files: ppp-2.4.4-closelog.patch ppp-2.4.4-response_len.patch Log Message: * Thu Mar 06 2008 Martin Nagy 2.4.4-6 - call closelog earlier (#222295) - fix ChapMS2 (#217076) - moving header files to new -devel package (#203542) ppp-2.4.4-closelog.patch: --- NEW FILE ppp-2.4.4-closelog.patch --- diff -up ppp-2.4.4/pppd/main.c.closelog ppp-2.4.4/pppd/main.c --- ppp-2.4.4/pppd/main.c.closelog 2008-03-06 22:54:19.000000000 +0100 +++ ppp-2.4.4/pppd/main.c 2008-03-06 22:54:31.000000000 +0100 @@ -1567,6 +1567,8 @@ safe_fork(int infd, int outfd, int errfd if (errfd == 0 || errfd == 1) errfd = dup(errfd); + closelog(); + /* dup the in, out, err fds to 0, 1, 2 */ if (infd != 0) dup2(infd, 0); @@ -1575,7 +1577,6 @@ safe_fork(int infd, int outfd, int errfd if (errfd != 2) dup2(errfd, 2); - closelog(); if (log_to_fd > 2) close(log_to_fd); if (the_channel->close) ppp-2.4.4-response_len.patch: --- NEW FILE ppp-2.4.4-response_len.patch --- diff -up ppp-2.4.4/pppd/chap_ms.c.response_len ppp-2.4.4/pppd/chap_ms.c --- ppp-2.4.4/pppd/chap_ms.c.response_len 2008-03-06 23:07:18.000000000 +0100 +++ ppp-2.4.4/pppd/chap_ms.c 2008-03-06 23:07:49.000000000 +0100 @@ -852,7 +852,7 @@ ChapMS2(u_char *rchallenge, u_char *Peer u_char *p = &response[MS_CHAP2_PEER_CHALLENGE]; int i; - BZERO(response, sizeof(*response)); + BZERO(response, MS_CHAP2_RESPONSE_LEN); /* Generate the Peer-Challenge if requested, or copy it if supplied. */ if (!PeerChallenge) Index: ppp.spec =================================================================== RCS file: /cvs/extras/rpms/ppp/devel/ppp.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- ppp.spec 3 Mar 2008 14:55:40 -0000 1.43 +++ ppp.spec 12 Mar 2008 08:56:38 -0000 1.44 @@ -1,7 +1,7 @@ Summary: The PPP (Point-to-Point Protocol) daemon. Name: ppp Version: 2.4.4 -Release: 5%{?dist} +Release: 6%{?dist} License: distributable Group: System Environment/Daemons Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz @@ -24,6 +24,8 @@ Patch21: ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch Patch22: ppp-2.4.4-cbcp.patch Patch23: ppp-2.4.2-dontwriteetc.patch +Patch24: ppp-2.4.4-closelog.patch +Patch25: ppp-2.4.4-response_len.patch BuildRoot: %{_tmppath}/%{name}-root BuildPrereq: pam-devel, libpcap-devel @@ -36,6 +38,13 @@ usually used to dial in to an ISP (Internet Service Provider) or other organization over a modem and phone line. +%package devel +Summary: Headers for ppp plugin development +Group: Development/Libraries + +%description devel +This package contains the header files for building plugins for ppp. + %prep %setup -q %patch0 -p1 -b .make @@ -57,6 +66,8 @@ %patch21 -p1 -b .usepeerdns-var_run_ppp_resolv %patch22 -p1 -b .cbcp %patch23 -p1 -b .dontwriteetc +%patch24 -p1 -b .closelog +%patch25 -p1 -b .response_len rm -f scripts/*.local rm -f scripts/*.change_resolv_conf @@ -104,7 +115,6 @@ %{_mandir}/man8/pppd-radattr.8* %{_mandir}/man8/pppd-radius.8* %{_mandir}/man8/pppstats.8* -%{_includedir}/pppd %{_libdir}/pppd %dir /etc/ppp %dir /var/run/ppp @@ -114,10 +124,19 @@ %config /etc/ppp/pap-secrets %config /etc/pam.d/ppp %config /etc/logrotate.d/ppp -%doc FAQ PLUGINS README README.cbcp README.linux README.MPPE README.MSCHAP80 README.MSCHAP81 README.pwfd README.pppoe scripts sample +%doc FAQ README README.cbcp README.linux README.MPPE README.MSCHAP80 README.MSCHAP81 README.pwfd README.pppoe scripts sample +%files devel +%defattr(-,root,root) +%{_includedir}/pppd +%doc PLUGINS %changelog +* Thu Mar 06 2008 Martin Nagy 2.4.4-6 +- call closelog earlier (#222295) +- fix ChapMS2 (#217076) +- moving header files to new -devel package (#203542) + * Mon Mar 03 2008 Martin Nagy 2.4.4-5 - put logs into /var/log/ppp (#118837) From fedora-extras-commits at redhat.com Wed Mar 12 09:02:51 2008 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 12 Mar 2008 09:02:51 GMT Subject: rpms/uim/F-7 uim.spec,1.39,1.40 Message-ID: <200803120902.m2C92phK001525@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/uim/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1500 Modified Files: uim.spec Log Message: * Wed Mar 12 2008 Akira TAGOH - 1.4.2-1 - New upstream release. - Fix a memory corruption, causing a crash on Firefox 3 say. - Add Requires: uim-gtk2 in uim-gnome. - Update License tag. Index: uim.spec =================================================================== RCS file: /cvs/pkgs/rpms/uim/F-7/uim.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- uim.spec 7 Jun 2007 06:10:26 -0000 1.39 +++ uim.spec 12 Mar 2008 09:02:20 -0000 1.40 @@ -2,10 +2,14 @@ %define uninst_xinput alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf Name: uim -Version: 1.4.1 -Release: 4%{?dist} -License: GPL/BSD -URL: http://uim.freedesktop.org/ +Version: 1.4.2 +Release: 1%{?dist} +# uim itself is licensed under BSD +# scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h} +# and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+ +# pixmaps/*.{svg,png} is licensed under BSD or LGPLv2 +License: BSD and LGPLv2+ and (BSD or LGPLv2) +URL: http://code.google.com/p/uim/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel BuildRequires: gtk2-devel gnome-panel-devel qt-devel ncurses-devel @@ -19,7 +23,7 @@ BuildRequires: m17n-db-sinhala m17n-db-slovak m17n-db-swedish m17n-db-syriac m17n-db-tamil BuildRequires: m17n-db-telugu m17n-db-thai m17n-db-tibetan m17n-db-vietnamese m17n-db-urdu BuildRequires: emacs -Source0: http://uim.freedesktop.org/release/%{name}-%{version}.tar.bz2 +Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: xinput.d-uim Source2: uim-init.el @@ -50,6 +54,7 @@ Requires: uim = %{version}-%{release} Requires(post): %{_sbindir}/bonobo-activation-sysconf Requires(postun): %{_sbindir}/bonobo-activation-sysconf +Requires: uim-gtk2 %package qt Summary: Qt support for Uim @@ -191,9 +196,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d -install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf +install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d -install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/ +install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/ install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/uim touch $RPM_BUILD_ROOT%{_localstatedir}/lib/uim/{installed-modules,loader}.scm @@ -286,6 +291,7 @@ %exclude %{_datadir}/uim/canna*.scm %exclude %{_datadir}/uim/skk*.scm %exclude %{_datadir}/uim/m17nlib.scm +## pixmaps are licensed under BSD or LGPLv2 %exclude %{_datadir}/uim/pixmaps/anthy.png %exclude %{_datadir}/uim/pixmaps/canna.png %exclude %{_datadir}/uim/pixmaps/m17n*png @@ -305,8 +311,11 @@ %files gtk2 %defattr (-, root, root) +# BSD %{_bindir}/uim-toolbar-gtk +# BSD and LGPLv2+ %{_bindir}/uim-toolbar-gtk-systray +# BSD %{_bindir}/uim-pref-gtk %{_bindir}/uim-im-switcher-gtk %{_bindir}/uim-input-pad-ja @@ -320,9 +329,13 @@ %files -f uim-chardict-qt.lang qt %defattr (-, root, root) +# BSD and LGPLv2+ %{_bindir}/uim-chardict-qt +# BSD %{_bindir}/uim-im-switcher-qt +# BSD and LGPLv2+ %{_bindir}/uim-pref-qt +# BSD %{_bindir}/uim-toolbar-qt %{_libdir}/qt-3.*/plugins/inputmethods %{_libexecdir}/uim-candwin-qt @@ -343,6 +356,7 @@ %defattr (-, root, root) %{_libdir}/uim/plugin/libuim-anthy.so %{_datadir}/uim/anthy*.scm +# BSD or LGPLv2 %{_datadir}/uim/pixmaps/anthy.png %dir %{_datadir}/uim @@ -350,6 +364,7 @@ %defattr (-, root, root) %{_libdir}/uim/plugin/libuim-canna.so %{_datadir}/uim/canna*.scm +# BSD or LGPLv2 %{_datadir}/uim/pixmaps/canna.png %dir %{_datadir}/uim @@ -363,10 +378,17 @@ %defattr (-, root, root) %{_libdir}/uim/plugin/libuim-m17nlib.so %{_datadir}/uim/m17nlib.scm -%{_datadir}/uim//pixmaps/m17n*png +# BSD or LGPLv2 +%{_datadir}/uim/pixmaps/m17n*png %dir %{_datadir}/uim %changelog +* Wed Mar 12 2008 Akira TAGOH - 1.4.2-1 +- New upstream release. + - Fix a memory corruption, causing a crash on Firefox 3 say. +- Add Requires: uim-gtk2 in uim-gnome. +- Update License tag. + * Tue May 29 2007 Akira TAGOH - 1.4.1-4 - Remove uim.desktop file. (#240706) From fedora-extras-commits at redhat.com Wed Mar 12 09:04:29 2008 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 12 Mar 2008 09:04:29 GMT Subject: rpms/uim/F-7 .cvsignore,1.19,1.20 sources,1.18,1.19 Message-ID: <200803120904.m2C94TRO001572@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/uim/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1552 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/uim/F-7/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 19 Mar 2007 09:46:03 -0000 1.19 +++ .cvsignore 12 Mar 2008 09:03:57 -0000 1.20 @@ -19,3 +19,4 @@ uim-1.3.0.tar.bz2 uim-1.4.0.tar.bz2 uim-1.4.1.tar.bz2 +uim-1.4.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/uim/F-7/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 19 Mar 2007 09:46:03 -0000 1.18 +++ sources 12 Mar 2008 09:03:57 -0000 1.19 @@ -1 +1 @@ -f2d0da38626e0d96116e7bd72a0bc596 uim-1.4.1.tar.bz2 +f5ac910cfa668343c73ca93e314d80ba uim-1.4.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 09:23:59 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Wed, 12 Mar 2008 09:23:59 GMT Subject: rpms/lftp/devel .cvsignore, 1.33, 1.34 lftp.spec, 1.69, 1.70 sources, 1.33, 1.34 Message-ID: <200803120923.m2C9NxsT002100@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/lftp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2047 Modified Files: .cvsignore lftp.spec sources Log Message: Just some minor cleanups Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lftp/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 25 Feb 2008 09:40:18 -0000 1.33 +++ .cvsignore 12 Mar 2008 09:23:17 -0000 1.34 @@ -1,2 +1 @@ -lftp-3.6.1.tar.gz lftp-3.6.3.tar.gz Index: lftp.spec =================================================================== RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- lftp.spec 3 Mar 2008 13:25:47 -0000 1.69 +++ lftp.spec 12 Mar 2008 09:23:17 -0000 1.70 @@ -34,17 +34,17 @@ rm -rf $RPM_BUILD_ROOT export tagname=CC make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install -rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.la chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/* chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.so iconv -f ISO88591 -t UTF8 NEWS -o NEWS.tmp touch -r NEWS NEWS.tmp -mv -f NEWS.tmp NEWS +mv NEWS.tmp NEWS # Remove files from $RPM_BUILD_ROOT that we aren't shipping. -rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.*a -rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.*a -rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-*.so +#rm $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.la +rm $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.la +rm $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.la +rm $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.so +rm $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.so %find_lang %{name} @@ -75,8 +75,8 @@ %{_libdir}/lftp/%{version}/proto-http.so %{_libdir}/lftp/%{version}/proto-sftp.so %{_libdir}/lftp/%{version}/liblftp-getdate.so -%{_libdir}/liblftp-jobs* -%{_libdir}/liblftp-tasks* +%{_libdir}/liblftp-jobs.so.* +%{_libdir}/liblftp-tasks.so.* %changelog * Thu Feb 28 2008 Martin Nagy - 3.6.3-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lftp/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 25 Feb 2008 09:40:18 -0000 1.33 +++ sources 12 Mar 2008 09:23:17 -0000 1.34 @@ -1,2 +1 @@ -cb074387f2516efe6abe5664af5504f9 lftp-3.6.1.tar.gz 79cf8e02a8994160b1aed6b12c39e5c0 lftp-3.6.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 09:44:28 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 12 Mar 2008 09:44:28 GMT Subject: rpms/lighttpd/devel .cvsignore, 1.22, 1.23 lighttpd.spec, 1.43, 1.44 sources, 1.22, 1.23 lighttpd-1.4.18-Fix-372-and-1562.patch, 1.1, NONE lighttpd-1.4.18-mod_cgi-fix.patch, 1.1, NONE Message-ID: <200803120944.m2C9iSxv002417@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2383 Modified Files: .cvsignore lighttpd.spec sources Removed Files: lighttpd-1.4.18-Fix-372-and-1562.patch lighttpd-1.4.18-mod_cgi-fix.patch Log Message: Update to 1.4.19, which includes all previous security fixes + bugfixes. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 10 Sep 2007 15:45:45 -0000 1.22 +++ .cvsignore 12 Mar 2008 09:43:57 -0000 1.23 @@ -1 +1 @@ -lighttpd-1.4.18.tar.bz2 +lighttpd-1.4.19.tar.bz2 Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- lighttpd.spec 4 Mar 2008 10:22:05 -0000 1.43 +++ lighttpd.spec 12 Mar 2008 09:43:57 -0000 1.44 @@ -2,8 +2,8 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.4.18 -Release: 6%{?dist} +Version: 1.4.19 +Release: 1%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -18,9 +18,6 @@ Source101: lighttpd-mod_geoip.txt Patch0: lighttpd-1.4.17-defaultconf.patch Patch1: lighttpd-1.4.18-mod_geoip.patch -# Security fixes -Patch10: lighttpd-1.4.18-Fix-372-and-1562.patch -Patch11: lighttpd-1.4.18-mod_cgi-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: system-logos >= 7.92.1 Requires(pre): /usr/sbin/useradd @@ -89,8 +86,6 @@ %setup -q %patch0 -p1 -b .defaultconf %patch1 -p1 -b .mod_geoip -%patch10 -p1 -b .Fix-372-and-1562 -%patch11 -p1 -b .mod_cgi-fix %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt @@ -215,6 +210,9 @@ %changelog +* Wed Mar 12 2008 Matthias Saou 1.4.19-1 +- Update to 1.4.19, which includes all previous security fixes + bugfixes. + * Tue Mar 4 2008 Matthias Saou 1.4.18-6 - Include patch for CVE-2008-0983 (crash when low on file descriptors). - Include patch for CVE-2008-1111 (cgi source disclosure). Index: sources =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 10 Sep 2007 15:45:45 -0000 1.22 +++ sources 12 Mar 2008 09:43:57 -0000 1.23 @@ -1 +1 @@ -26f98dddf9d8c0775221b800986003ee lighttpd-1.4.18.tar.bz2 +d787374e4e4aaa09d5cfa9ab9d23ad40 lighttpd-1.4.19.tar.bz2 --- lighttpd-1.4.18-Fix-372-and-1562.patch DELETED --- --- lighttpd-1.4.18-mod_cgi-fix.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 10:28:59 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 10:28:59 GMT Subject: rpms/sugar/OLPC-2 .cvsignore, 1.99, 1.100 sources, 1.108, 1.109 sugar-0.65-jabberserver.patch, 1.4, 1.5 sugar.spec, 1.126, 1.127 Message-ID: <200803121028.m2CASxjm009185@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/sugar/OLPC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9136 Modified Files: .cvsignore sources sugar-0.65-jabberserver.patch sugar.spec Log Message: * Wed Mar 12 2008 Marco Pesenti Gritti - 0.75.14-1 - Fix #6671 #5933 #6405 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar/OLPC-2/.cvsignore,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- .cvsignore 12 Feb 2008 19:23:22 -0000 1.99 +++ .cvsignore 12 Mar 2008 10:28:15 -0000 1.100 @@ -1 +1 @@ -sugar-0.75.13.tar.bz2 +sugar-0.75.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar/OLPC-2/sources,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- sources 12 Feb 2008 19:23:22 -0000 1.108 +++ sources 12 Mar 2008 10:28:15 -0000 1.109 @@ -1 +1 @@ -0eb7d56675a6e8c62d4d335f13b24008 sugar-0.75.13.tar.bz2 +9cb12011ed47c3e6715416b54fce13a6 sugar-0.75.14.tar.bz2 sugar-0.65-jabberserver.patch: Index: sugar-0.65-jabberserver.patch =================================================================== RCS file: /cvs/pkgs/rpms/sugar/OLPC-2/sugar-0.65-jabberserver.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sugar-0.65-jabberserver.patch 29 Nov 2007 19:34:49 -0000 1.4 +++ sugar-0.65-jabberserver.patch 12 Mar 2008 10:28:15 -0000 1.5 @@ -5,7 +5,7 @@ from sugar.graphics.xocolor import XoColor -DEFAULT_JABBER_SERVER = 'olpc.collabora.co.uk' -+DEFAULT_JABBER_SERVER = 'ship2.jabber.laptop.org' ++DEFAULT_JABBER_SERVER = 'update1.jabber.laptop.org' DEFAULT_VOLUME = 81 _profile = None Index: sugar.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar/OLPC-2/sugar.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- sugar.spec 12 Feb 2008 19:23:22 -0000 1.126 +++ sugar.spec 12 Mar 2008 10:28:15 -0000 1.127 @@ -2,7 +2,7 @@ Summary: OLPC desktop environment Name: sugar -Version: 0.75.13 +Version: 0.75.14 Release: 1%{?dist} URL: http://dev.laptop.org Source0: http://dev.laptop.org/pub/sugar/release/%{name}-%{version}.tar.bz2 @@ -90,6 +90,9 @@ %{_datadir}/mime/packages/sugar.xml %changelog +* Wed Mar 12 2008 Marco Pesenti Gritti - 0.75.14-1 +- Fix #6671 #5933 #6405 + * Tue Feb 12 2008 Marco Pesenti Gritti - 0.75.13-1 - Updated translations From fedora-extras-commits at redhat.com Wed Mar 12 10:45:21 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 12 Mar 2008 10:45:21 GMT Subject: rpms/ocaml-perl4caml/devel ocaml-perl4caml.spec,1.2,1.3 Message-ID: <200803121045.m2CAjLiG009545@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-perl4caml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9527 Modified Files: ocaml-perl4caml.spec Log Message: * Wed Mar 12 2008 Richard W.M. Jones - 0.9.5-3 - Fix %check rule (#436785). - Use rpath for dllperl4caml.so as per this thread: https://www.redhat.com/archives/fedora-packaging/2008-March/thread.html#00070 (#436807). - Require rpath. Index: ocaml-perl4caml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-perl4caml/devel/ocaml-perl4caml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ocaml-perl4caml.spec 4 Mar 2008 09:17:08 -0000 1.2 +++ ocaml-perl4caml.spec 12 Mar 2008 10:44:50 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-perl4caml Version: 0.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for calling Perl libraries and code Group: Development/Libraries @@ -16,7 +16,6 @@ BuildRequires: ocaml-ocamldoc BuildRequires: perl >= 5.8 BuildRequires: perl-ExtUtils-Embed -BuildRequires: chrpath # Perl4caml provides type-safe wrappers for these Perl modules: #Requires: perl-Date-Calc @@ -31,6 +30,16 @@ #Requires: perl-URI #Requires: perl-WWW-Mechanize +# Because we're embedding an rpath into the library, we need to +# depend on that path. See: +# https://www.redhat.com/archives/fedora-packaging/2008-March/thread.html#00070 +# https://www.redhat.com/archives/fedora-devel-list/2008-March/msg00922.html +%global libperldir %(perl -MExtUtils::Embed -e ldopts 2> /dev/null | egrep -o '/[^[:space:]]*CORE' | head -1) +%if "%{?libperldir}" != "%{nil}" +Requires: %{?libperldir}/libperl.so +%endif + + %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh @@ -64,15 +73,9 @@ %check -# This fails if perl4caml is installed. The bytecode programs -# load dllperl4caml.so from OCaml's stublibs, instead of the -# one we just built. Since dllperl4caml.so in stublibs -# (wrongly) lacks an rpath for libperl.so, it won't find -# libperl.so in the obscure directory where it resides. -# Monkeying around with LD_LIBRARY_PATH doesn't help because -# ocamlrun uses $libdir/ocaml/ld.conf to find directories -# containing the stublibs. -make test ||: +# Set the library path used by ocamlrun so it uses the library +# we just built in the current directory. +CAML_LD_LIBRARY_PATH=`pwd` make test %install @@ -84,10 +87,10 @@ make install strip $DESTDIR/%{_libdir}/ocaml/stublibs/dll*.so -# Deleting the rpath in this shared library is wrong because -# it means it can't find libperl.so, but Fedora policy requires -# us to do it ... -chrpath --delete $DESTDIR/%{_libdir}/ocaml/stublibs/dll*.so + +# Don't delete rpath! See: +# https://www.redhat.com/archives/fedora-packaging/2008-March/thread.html#00070 + %clean rm -rf $RPM_BUILD_ROOT @@ -118,6 +121,13 @@ %changelog +* Wed Mar 12 2008 Richard W.M. Jones - 0.9.5-3 +- Fix %check rule (#436785). +- Use rpath for dllperl4caml.so as per this thread: + https://www.redhat.com/archives/fedora-packaging/2008-March/thread.html#00070 + (#436807). +- Require rpath. + * Tue Mar 4 2008 Richard W.M. Jones - 0.9.5-2 - Rebuild for ppc64. From fedora-extras-commits at redhat.com Wed Mar 12 11:10:41 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:10:41 +0000 Subject: [pkgdb] qt4: kkofler has requested watchbugzilla Message-ID: <200803121113.m2CBDjLq015181@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on qt4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:10:43 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:10:43 +0000 Subject: [pkgdb] qt4: kkofler has requested watchcommits Message-ID: <200803121113.m2CBDkQb015186@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on qt4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:10:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:10:50 +0000 Subject: [pkgdb] qt4: kkofler has requested commit Message-ID: <200803121113.m2CBDsw7015225@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on qt4 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:11:10 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:11:10 +0000 Subject: [pkgdb] qt4: kkofler has requested watchbugzilla Message-ID: <200803121114.m2CBDkQf015186@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on qt4 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:11:13 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:11:13 +0000 Subject: [pkgdb] qt4: kkofler has requested watchcommits Message-ID: <200803121114.m2CBEHsx015289@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on qt4 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:11:15 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:11:15 +0000 Subject: [pkgdb] qt4: kkofler has requested commit Message-ID: <200803121114.m2CBEHt3015289@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on qt4 (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:11:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:11:30 +0000 Subject: [pkgdb] qt4: kkofler has requested watchbugzilla Message-ID: <200803121114.m2CBDswB015225@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchbugzilla acl on qt4 (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:11:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:11:34 +0000 Subject: [pkgdb] qt4: kkofler has requested watchcommits Message-ID: <200803121114.m2CBDjLu015181@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the watchcommits acl on qt4 (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:11:36 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:11:36 +0000 Subject: [pkgdb] qt4: kkofler has requested commit Message-ID: <200803121114.m2CBEemR015383@bastion.fedora.phx.redhat.com> Kevin Kofler (kkofler) has requested the commit acl on qt4 (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:15:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:15:58 +0000 Subject: [pkgdb] qt4 had acl change status Message-ID: <200803121119.m2CBJ16p015539@bastion.fedora.phx.redhat.com> Than Ngo (than) has set the watchbugzilla acl on qt4 (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:15:58 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:15:58 +0000 Subject: [pkgdb] qt4 had acl change status Message-ID: <200803121119.m2CBJ16t015539@bastion.fedora.phx.redhat.com> Than Ngo (than) has set the watchcommits acl on qt4 (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:16:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:16:01 +0000 Subject: [pkgdb] qt4 had acl change status Message-ID: <200803121119.m2CBJ5x6015580@bastion.fedora.phx.redhat.com> Than Ngo (than) has set the commit acl on qt4 (Fedora devel) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:16:14 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:16:14 +0000 Subject: [pkgdb] qt4 had acl change status Message-ID: <200803121119.m2CBJIC9015621@bastion.fedora.phx.redhat.com> Than Ngo (than) has set the watchbugzilla acl on qt4 (Fedora 7) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:16:16 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:16:16 +0000 Subject: [pkgdb] qt4 had acl change status Message-ID: <200803121119.m2CBJICD015621@bastion.fedora.phx.redhat.com> Than Ngo (than) has set the watchcommits acl on qt4 (Fedora 7) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:16:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:16:17 +0000 Subject: [pkgdb] qt4 had acl change status Message-ID: <200803121119.m2CBJOjv015674@bastion.fedora.phx.redhat.com> Than Ngo (than) has set the commit acl on qt4 (Fedora 7) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:16:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:16:31 +0000 Subject: [pkgdb] qt4 had acl change status Message-ID: <200803121119.m2CBJZkv015707@bastion.fedora.phx.redhat.com> Than Ngo (than) has set the commit acl on qt4 (Fedora 8) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:16:31 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:16:31 +0000 Subject: [pkgdb] qt4 had acl change status Message-ID: <200803121119.m2CBJ5xA015580@bastion.fedora.phx.redhat.com> Than Ngo (than) has set the watchbugzilla acl on qt4 (Fedora 8) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:16:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 11:16:32 +0000 Subject: [pkgdb] qt4 had acl change status Message-ID: <200803121119.m2CBJb2A015748@bastion.fedora.phx.redhat.com> Than Ngo (than) has set the watchcommits acl on qt4 (Fedora 8) to Approved for Kevin Kofler (kkofler) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt4 From fedora-extras-commits at redhat.com Wed Mar 12 11:57:44 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Wed, 12 Mar 2008 11:57:44 GMT Subject: rpms/eject/devel eject-2.1.5-umount.patch, NONE, 1.1 eject.spec, 1.32, 1.33 Message-ID: <200803121157.m2CBvivv016934@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/eject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16900 Modified Files: eject.spec Added Files: eject-2.1.5-umount.patch Log Message: Added check for a removable flag Resolves: #432187 eject-2.1.5-umount.patch: --- NEW FILE eject-2.1.5-umount.patch --- --- eject/eject.c.umount 2008-03-12 11:25:55.000000000 +0100 +++ eject/eject.c 2008-03-12 11:47:24.000000000 +0100 @@ -30,6 +30,8 @@ * */ +#define _ATFILE_SOURCE + #include "i18n.h" #ifndef DEFAULTDEVICE @@ -42,6 +44,7 @@ #include #include #include +#include #ifdef GETOPTLONG #include @@ -1127,6 +1130,69 @@ static char *MultiplePartitions(const ch return 0; } +/* + * Find device name with the given major and minor number. Returns NULL if not + * found. The returned pointer must be free()'d. + */ +static char* FindDeviceMajorMinor(int maj, int min) +{ + DIR *dir = opendir("/dev"); + struct dirent *d; + int dfd = dirfd(dir); + struct stat st; + char *device; + + if (!dir || dfd == -1) { + perror("/dev"); + return NULL; + } + while ((d = readdir(dir)) != NULL) { + if (d->d_type == DT_DIR || d->d_type == DT_UNKNOWN || d->d_type == DT_LNK) + continue; + if (fstatat(dfd, d->d_name, &st, O_RDONLY) != 0) + continue; + if (major(st.st_rdev) == maj && minor(st.st_rdev) == min) { + device = strdup(d->d_name); + closedir(dir); + return device; + } + } + closedir(dir); + return NULL; +} + +/* + * Check content of /sys/block//removable. Returns 1 if the file + * contains '1' otherwise returns 0. + */ +static int CheckRemovable(const char* deviceName) +{ + FILE *fp; + int removable = 0; + char *device; + char path[PATH_MAX]; + int maj, min; + + GetMajorMinor(deviceName, &maj, &min); + if ((device = FindDeviceMajorMinor(maj, 0)) == NULL) { + fprintf(stderr, + _("%s: did not find a device with %d-0 major-minor numbers\n"), + programName, maj); + exit(1); + } + snprintf(path, sizeof(path), "/sys/block/%s/removable", device); + free(device); + if((fp = fopen(path, "r")) == NULL) { + perror(path); + exit(1); + } + + if (fgetc(fp) == '1') + removable = 1; + + fclose(fp); + return removable; +} /* handle -x option */ static void HandleXOption(char *deviceName) @@ -1270,6 +1336,15 @@ int main(int argc, char **argv) exit(0); } + /* Check if device has removable flag*/ + if (v_option) + printf(_("%s: checking if device \"%s\" has a removable flag\n"), programName, deviceName); + if (!CheckRemovable(deviceName)) + { + fprintf(stderr, _("%s: device \"%s\" doesn't have a removable flag\n"), programName, deviceName); + exit(1); + } + /* handle -i option */ if (i_option) { fd = OpenDevice(deviceName); Index: eject.spec =================================================================== RCS file: /cvs/extras/rpms/eject/devel/eject.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- eject.spec 28 Feb 2008 12:33:47 -0000 1.32 +++ eject.spec 12 Mar 2008 11:57:01 -0000 1.33 @@ -1,7 +1,7 @@ Summary: A program that ejects removable media using software control. Name: eject Version: 2.1.5 -Release: 7 +Release: 8 License: GPL Group: System Environment/Base Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Patch3: eject-2.1.5-opendevice.patch Patch4: eject-2.1.5-spaces.patch Patch5: eject-2.1.5-lock.patch +Patch6: eject-2.1.5-umount.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot URL: http://www.pobox.com/~tranter ExcludeArch: s390 s390x @@ -35,6 +36,7 @@ %patch3 -p0 -b .opendevice %patch4 -p0 -b .spaces %patch5 -p0 -b .lock +%patch6 -p1 -b .umount %build %configure @@ -74,6 +76,10 @@ %{_mandir}/man1/* %changelog +* Wed Mar 12 2008 Zdenek Prikryl 2.1.5-8 +- Added check for a removable flag +- Resolves: #432187 + * Thu Feb 28 2008 Zdenek Prikryl 2.1.5-7 - Added lock functionality, patch from upstream. - Resolves: #145843 From fedora-extras-commits at redhat.com Wed Mar 12 12:05:50 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 12 Mar 2008 12:05:50 GMT Subject: rpms/pigment/F-8 .cvsignore, 1.4, 1.5 pigment.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200803121205.m2CC5oPh023177@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/pigment/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23140 Modified Files: .cvsignore pigment.spec sources Log Message: Backport 0.3.5 update from devel, which currently doesn't rebuild on ppc. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pigment/F-8/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Oct 2007 12:05:59 -0000 1.4 +++ .cvsignore 12 Mar 2008 12:05:06 -0000 1.5 @@ -1 +1 @@ -pigment-0.3.2.tar.gz +pigment-0.3.5.tar.gz Index: pigment.spec =================================================================== RCS file: /cvs/extras/rpms/pigment/F-8/pigment.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pigment.spec 9 Oct 2007 12:05:59 -0000 1.4 +++ pigment.spec 12 Mar 2008 12:05:06 -0000 1.5 @@ -1,9 +1,6 @@ -%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") - Summary: Media Center Toolkit Name: pigment -Version: 0.3.2 +Version: 0.3.5 Release: 1%{?dist} License: LGPLv2+ Group: Applications/Multimedia @@ -13,15 +10,12 @@ BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: cairo-devel -BuildRequires: python-devel -BuildRequires: pygobject2-devel +BuildRequires: libglade2-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: mesa-libGLU-devel Buildrequires: check BuildRequires: gtk-doc -# For make check (disabled...) -#BuildRequires: gstreamer-python, pygtk2 %description Pigment is a toolkit for writing Media Center software. @@ -31,9 +25,13 @@ Summary: Development libraries and include files for Pigment Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: glib2-devel Requires: pkgconfig Requires: gtk-doc +# From pigment.pc +Requires: glib2-devel +Requires: gstreamer-devel +# From pigment-gtk.pc +Requires: gtk2-devel %description devel Pigment is a toolkit for writing Media Center software. @@ -47,12 +45,14 @@ %build -%configure -# Get rid of the /usr/lib64 RPATH on 64bit (still as of 0.3.2) -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -# Parallel make fails (still as of 0.3.2), so remove %{?_smp_mflags} -%{__make} +%configure \ + --enable-gtk-doc \ + --disable-static +# Get rid of the /usr/lib64 RPATH on 64bit (still as of 0.3.4) ...NOT! +# When removed, the "make check" fails. +#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%{__make} %{?_smp_mflags} %install @@ -62,10 +62,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} \; -#check -# It would be useful to run this, unfortunately the python checks try to -# "import gtk.gdk" and fail because of "RuntimeError: could not open display" -#{__make} check +%check +%{__make} check %clean @@ -82,19 +80,34 @@ %doc AUTHORS ChangeLog COPYING README TODO %{_libdir}/*.so.* %{_libdir}/pigment-0.3/ -%{python_sitelib}/pgm/ -%{python_sitelib}/pypgmtools/ -%{python_sitearch}/*.so %files devel %defattr(-,root,root,-) %{_includedir}/pigment-0.3/ %{_libdir}/*.so %{_libdir}/pkgconfig/pigment-0.3.pc +%{_libdir}/pkgconfig/pigment-gtk-0.3.pc %doc %{_datadir}/gtk-doc/html/pigment/ %changelog +* Tue Mar 4 2008 Matthias Saou 0.3.5-1 +- Update to 0.3.5. + +* Fri Feb 8 2008 Matthias Saou 0.3.4-1 +- Update to 0.3.4. + +* Thu Jan 17 2008 Matthias Saou 0.3.3-1 +- Update to 0.3.3. +- Remove all of the python stuff, in a separate source tarball now. +- Add new libglade2-devel build requirement. +- Include new pigment-gtk-0.3.pc file. +- Disable static libraries since they are now built by default. +- No longer remove harmless /usr/lib64 rpath, since "make check" fails... +- Re-enable parallel make, it seems to work again. +- Remove +x bit from some sources files installes in the devel package. +- Enable documentation build explicitly, since it's disabled by default. + * Tue Oct 9 2007 Matthias Saou 0.3.2-1 - Update to 0.3.2. - Re-enable gtk-doc stuff, it works again. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pigment/F-8/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Oct 2007 12:05:59 -0000 1.4 +++ sources 12 Mar 2008 12:05:06 -0000 1.5 @@ -1 +1 @@ -c7c5cac44fba8610726eec8888264943 pigment-0.3.2.tar.gz +d63d4e59741af7aa6b5cf8e032643342 pigment-0.3.5.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 12:16:04 2008 From: fedora-extras-commits at redhat.com (Thomas Woerner (twoerner)) Date: Wed, 12 Mar 2008 12:16:04 GMT Subject: rpms/postfix/devel postfix.spec,1.64,1.65 Message-ID: <200803121216.m2CCG4Ve023423@cvs-int.fedora.redhat.com> Author: twoerner Update of /cvs/pkgs/rpms/postfix/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23386 Modified Files: postfix.spec Log Message: - fixed fix for enabling IPv6 support (rhbz#437024) - added new postfix data directory (rhbz#437042) Index: postfix.spec =================================================================== RCS file: /cvs/pkgs/rpms/postfix/devel/postfix.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- postfix.spec 21 Feb 2008 18:46:06 -0000 1.64 +++ postfix.spec 12 Mar 2008 12:15:12 -0000 1.65 @@ -32,6 +32,7 @@ %define postfix_daemon_dir %{_libexecdir}/postfix %define postfix_command_dir %{_sbindir} %define postfix_queue_dir %{_var}/spool/postfix +%define postfix_data_dir %{_var}/lib/postfix %define postfix_doc_dir %{_docdir}/%{name}-%{version} %define postfix_sample_dir %{postfix_doc_dir}/samples %define postfix_readme_dir %{postfix_doc_dir}/README_FILES @@ -39,7 +40,7 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 Group: System Environment/Daemons URL: http://www.postfix.org @@ -241,6 +242,7 @@ daemon_directory=%{postfix_daemon_dir} \ command_directory=%{postfix_command_dir} \ queue_directory=%{postfix_queue_dir} \ + data_directory=%{postfix_data_dir} \ sendmail_path=%{postfix_command_dir}/sendmail.postfix \ newaliases_path=%{_bindir}/newaliases.postfix \ mailq_path=%{_bindir}/mailq.postfix \ @@ -316,11 +318,8 @@ # enable all protocols cat >> $RPM_BUILD_ROOT%{postfix_config_dir}/main.cf < 2:2.5.1-2 +- fixed fix for enabling IPv6 support (rhbz#437024) +- added new postfix data directory (rhbz#437042) + * Thu Feb 21 2008 Thomas Woerner 2:2.5.1-1 - new verison 2.5.1 From fedora-extras-commits at redhat.com Wed Mar 12 12:16:43 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Wed, 12 Mar 2008 12:16:43 GMT Subject: rpms/eject/F-8 eject-2.1.5-umount.patch, NONE, 1.1 eject.spec, 1.29, 1.30 Message-ID: <200803121216.m2CCGhUe023488@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/eject/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23417 Modified Files: eject.spec Added Files: eject-2.1.5-umount.patch Log Message: Added check for a removable flag Resolves: #432187 eject-2.1.5-umount.patch: --- NEW FILE eject-2.1.5-umount.patch --- --- eject/eject.c.umount 2008-03-12 11:25:55.000000000 +0100 +++ eject/eject.c 2008-03-12 11:47:24.000000000 +0100 @@ -30,6 +30,8 @@ * */ +#define _ATFILE_SOURCE + #include "i18n.h" #ifndef DEFAULTDEVICE @@ -42,6 +44,7 @@ #include #include #include +#include #ifdef GETOPTLONG #include @@ -1127,6 +1130,69 @@ static char *MultiplePartitions(const ch return 0; } +/* + * Find device name with the given major and minor number. Returns NULL if not + * found. The returned pointer must be free()'d. + */ +static char* FindDeviceMajorMinor(int maj, int min) +{ + DIR *dir = opendir("/dev"); + struct dirent *d; + int dfd = dirfd(dir); + struct stat st; + char *device; + + if (!dir || dfd == -1) { + perror("/dev"); + return NULL; + } + while ((d = readdir(dir)) != NULL) { + if (d->d_type == DT_DIR || d->d_type == DT_UNKNOWN || d->d_type == DT_LNK) + continue; + if (fstatat(dfd, d->d_name, &st, O_RDONLY) != 0) + continue; + if (major(st.st_rdev) == maj && minor(st.st_rdev) == min) { + device = strdup(d->d_name); + closedir(dir); + return device; + } + } + closedir(dir); + return NULL; +} + +/* + * Check content of /sys/block//removable. Returns 1 if the file + * contains '1' otherwise returns 0. + */ +static int CheckRemovable(const char* deviceName) +{ + FILE *fp; + int removable = 0; + char *device; + char path[PATH_MAX]; + int maj, min; + + GetMajorMinor(deviceName, &maj, &min); + if ((device = FindDeviceMajorMinor(maj, 0)) == NULL) { + fprintf(stderr, + _("%s: did not find a device with %d-0 major-minor numbers\n"), + programName, maj); + exit(1); + } + snprintf(path, sizeof(path), "/sys/block/%s/removable", device); + free(device); + if((fp = fopen(path, "r")) == NULL) { + perror(path); + exit(1); + } + + if (fgetc(fp) == '1') + removable = 1; + + fclose(fp); + return removable; +} /* handle -x option */ static void HandleXOption(char *deviceName) @@ -1270,6 +1336,15 @@ int main(int argc, char **argv) exit(0); } + /* Check if device has removable flag*/ + if (v_option) + printf(_("%s: checking if device \"%s\" has a removable flag\n"), programName, deviceName); + if (!CheckRemovable(deviceName)) + { + fprintf(stderr, _("%s: device \"%s\" doesn't have a removable flag\n"), programName, deviceName); + exit(1); + } + /* handle -a option */ if (a_option) { if (v_option) { Index: eject.spec =================================================================== RCS file: /cvs/extras/rpms/eject/F-8/eject.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- eject.spec 30 Oct 2006 14:53:46 -0000 1.29 +++ eject.spec 12 Mar 2008 12:16:00 -0000 1.30 @@ -1,7 +1,7 @@ Summary: A program that ejects removable media using software control. Name: eject Version: 2.1.5 -Release: 5 +Release: 6 License: GPL Group: System Environment/Base Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz @@ -10,6 +10,7 @@ Patch2: eject-timeout.patch Patch3: eject-2.1.5-opendevice.patch Patch4: eject-2.1.5-spaces.patch +Patch5: eject-2.1.5-umount.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot URL: http://www.pobox.com/~tranter ExcludeArch: s390 s390x @@ -33,6 +34,7 @@ %patch2 -p1 -b .timeout %patch3 -p0 -b .opendevice %patch4 -p0 -b .spaces +%patch5 -p1 -b .umount %build %configure @@ -72,6 +74,10 @@ %{_mandir}/man1/* %changelog +* Wed Mar 12 2008 Zdenek Prikryl 2.1.5-6 +- Added check for a removable flag +- Resolves: #432187 + * Mon Oct 30 2006 Than Ngo 2.1.5-5 - apply upstream patch to fix #212467 From fedora-extras-commits at redhat.com Wed Mar 12 12:18:05 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Wed, 12 Mar 2008 12:18:05 GMT Subject: comps/po ta.po,1.5,1.6 Message-ID: <200803121218.m2CCI5ku023542@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23518/po Modified Files: ta.po Log Message: 2008-03-12 I. Felix (via ifelix at fedoraproject.org) * po/ta.po: Tamil translation updated View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 ta.po Index: ta.po =================================================================== RCS file: /cvs/pkgs/comps/po/ta.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ta.po 17 Sep 2007 19:22:12 -0000 1.5 +++ ta.po 12 Mar 2008 12:17:35 -0000 1.6 @@ -1,5 +1,5 @@ +# translation of comps.HEAD.ta.po to Tamil # translation of ta.po to -# translation of ta.po to Tamil # Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the comps-po package. # @@ -8,19 +8,20 @@ # Jayaradha N , 2004, 2006. # Felix , 2006. # I felix , 2007. +# I. Felix , 2008. msgid "" msgstr "" -"Project-Id-Version: ta\n" +"Project-Id-Version: comps.HEAD.ta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-17 15:18-0400\n" -"PO-Revision-Date: 2007-04-17 16:29+0530\n" -"Last-Translator: I felix \n" +"POT-Creation-Date: 2008-02-28 17:56-0700\n" +"PO-Revision-Date: 2008-03-10 23:39+0530\n" +"Last-Translator: I. Felix \n" "Language-Team: Tamil \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n\n\n" "\n" "\n" "\n" @@ -29,583 +30,164 @@ "\n" "\n" -#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1 -#: ../comps-f8.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." msgstr "" "????????? lightweight ????????????????????? ??????????????? ????????????????????? ?????????????????????????????? ??????????????? ?????????????????????????????? ?????????????????? " "??????????????????????????????????????????." -#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2 -#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 +#: ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "????????????????????? ????????????????????????" -#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5 -#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +msgid "Afrikaans Support" +msgstr "???????????????????????? ????????????" + +#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +msgid "Albanian Support" +msgstr "??????????????????????????? ????????????" + +#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 +#: ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "?????????????????????????????????" -#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3 -#: ../comps-el5.xml.in.h:3 -msgid "Applications for a variety of tasks" -msgstr "????????????????????? ????????????????????????????????? ?????????????????????????????????" +#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +msgid "Applications to perform a variety of tasks" +msgstr "????????????????????? ?????????????????? ??????????????? ?????????????????????????????????" -#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7 -#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 +#: ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "?????????????????? ????????????" -#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8 -#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 +#: ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "?????????????????????????????? ????????????" -#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10 -#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 -msgid "Authoring and Publishing" -msgstr "??????????????????????????? ????????????????????? ????????????????????????" - -#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12 -#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 -msgid "Base System" -msgstr "???????????????????????? ?????????????????????" - -#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31 -#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 -msgid "Desktop Environments" -msgstr "????????????????????? ????????????????????????" - -#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32 -#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 -msgid "Desktop environments" -msgstr "????????????????????? ????????????????????????" - -#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33 -#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 -msgid "Development" -msgstr "??????????????????????????????" - -#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35 -#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 -msgid "Development Tools" -msgstr "?????????????????????????????? ????????????????????????" - -#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12 -#: ../comps-el5.xml.in.h:13 -msgid "Dialup Networking Support" -msgstr "????????????????????? ??????????????? ????????????" - -#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39 -#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 -msgid "Editors" -msgstr "??????????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40 -#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 -msgid "Educational Software" -msgstr "??????????????? ??????????????????????????????" - -#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41 -#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 -msgid "Educational software for learning" -msgstr "???????????? ??????????????? ??????????????????????????????" - -#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42 -#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 -msgid "Engineering and Scientific" -msgstr "??????????????????????????? ????????????????????? ????????????????????????" - -#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46 -#: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 -msgid "FTP Server" -msgstr "FTP ????????????????????????" - -#: ../comps-fe5.xml.in.h:19 ../comps-fe6.xml.in.h:20 ../comps-f7.xml.in.h:51 -#: ../comps-f8.xml.in.h:54 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 -msgid "" -"From CD recording to playing audio CDs and multimedia files, this package " -"group allows you to work with sound and video on the system." -msgstr "" -"??????????????????????????? ??????????????????????????????????????? ???????????????????????? ?????????????????????????????????????????? ????????????????????? ????????????????????? ??????????????????????????? ???????????????, ???????????? " -"???????????????????????? ???????????? ?????????????????? ??????????????????????????? ????????? ????????????????????? ??????????????????????????????????????? ????????? ??????????????? ???????????????????????????????????????." - -#: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52 -#: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 -msgid "GNOME Desktop Environment" -msgstr "GNOME ????????????????????? ???????????????" - -#: ../comps-fe5.xml.in.h:21 ../comps-fe6.xml.in.h:22 ../comps-f7.xml.in.h:53 -#: ../comps-f8.xml.in.h:56 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 -msgid "GNOME Software Development" -msgstr "GNOME ?????????????????????????????? ??????????????????????????????" - -#: ../comps-fe5.xml.in.h:22 ../comps-fe6.xml.in.h:23 ../comps-el4.xml.in.h:21 -#: ../comps-el5.xml.in.h:22 -msgid "" -"GNOME is a powerful, graphical user interface which includes a panel, " -"desktop, system icons, and a graphical file manager." -msgstr "" -"GNOME ?????????????????? ???????????????, ?????????????????????, ??????????????? ?????????????????????????????? ????????????????????? ?????????????????? ?????????????????? ????????????????????? ??????????????????????????? " -"?????????????????????????????? ????????? ???????????????????????? ?????????????????? ??????????????? ????????????????????????????????????." - -#: ../comps-fe5.xml.in.h:23 ../comps-fe6.xml.in.h:24 ../comps-f7.xml.in.h:57 -#: ../comps-f8.xml.in.h:60 ../comps-el5.xml.in.h:23 -msgid "Games and Entertainment" -msgstr "??????????????????????????????????????? ????????????????????? ????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:24 ../comps-fe6.xml.in.h:25 ../comps-f7.xml.in.h:60 -#: ../comps-f8.xml.in.h:63 ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24 -msgid "Graphical Internet" -msgstr "?????????????????? ??????????????????" - -#: ../comps-fe5.xml.in.h:25 ../comps-fe6.xml.in.h:26 ../comps-f7.xml.in.h:61 -#: ../comps-f8.xml.in.h:64 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 -msgid "Graphics" -msgstr "???????????????????????????" - [...1632 lines suppressed...] -#~ msgstr "??????????????????????????????" - -#~ msgid "Korean" -#~ msgstr "?????????????????????" - -#~ msgid "Simplified Chinese" -#~ msgstr "???????????? ???????????????" - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Japanese language." -#~ msgstr "" -#~ "???????????? ???????????? Red Hat Enterprise Linux ???????????????????????????????????? ???????????????????????? ???????????????????????? ?????????????????????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Korean language." -#~ msgstr "" -#~ "???????????? ???????????? Red Hat Enterprise Linux ???????????????????????????????????? ??????????????? ???????????????????????? ?????????????????????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Simplified Chinese language." -#~ msgstr "" -#~ "???????????? ???????????? Red Hat Enterprise Linux ???????????????????????????????????? ???????????? ????????? ???????????????????????? ?????????????????????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Traditional Chinese language." -#~ msgstr "" -#~ "???????????? ???????????? Red Hat Enterprise Linux ???????????????????????????????????? ??????????????????????????? ????????? ???????????????????????? ?????????????????????????????????." - -#~ msgid "Traditional Chinese" -#~ msgstr "???????????? ???????????????" - -#~ msgid "ppc64 Compatibility Arch Development Support" -#~ msgstr "ppc64 ??????????????? ??????????????? ???????????????????????? ????????????" - -#~ msgid "Bengali" -#~ msgstr "????????????????????????" - -#~ msgid "Gujarati" -#~ msgstr "???????????????????????????" - -#~ msgid "Hindi" -#~ msgstr "??????????????????" - -#~ msgid "Punjabi" -#~ msgstr "?????????????????????" - -#~ msgid "Red Hat Enterprise Linux 4 Documentation" -#~ msgstr "Red Hat Enterprise Linux 4 ??????????????????????????????" - -#~ msgid "Tamil" -#~ msgstr "???????????????" - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Bengali language." -#~ msgstr "" -#~ "???????????? ???????????????????????? Red Hat Enterprise Linux ?????????????????????????????? ???????????????????????? ???????????????????????? ??????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Gujarati language." -#~ msgstr "" -#~ "???????????? ???????????????????????? Red Hat Enterprise Linux ?????????????????????????????? ??????????????????????????? ???????????????????????? ??????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Hindi language." -#~ msgstr "???????????? ???????????????????????? Red Hat Enterprise Linux ?????????????????????????????? ??????????????? ???????????????????????? ??????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Punjabi language." -#~ msgstr "???????????? ???????????????????????? Red Hat Enterprise Linux ?????????????????????????????? ????????????????????? ???????????????????????? ??????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Tamil language." -#~ msgstr "???????????? ???????????????????????? Red Hat Enterprise Linux ?????????????????????????????? ??????????????? ???????????????????????? ??????????????????." - -#~ msgid "Cluster Storage" -#~ msgstr "??????????????????????????? ??????????????????????????????" - -#~ msgid "Clustering Support." -#~ msgstr "??????????????????????????? ????????????." - -#~ msgid "Packages which provide support for cluster storage." -#~ msgstr "??????????????????????????? ???????????????????????????????????????????????? ???????????? ?????????????????????????????? ?????????????????????????????????." - -#~ msgid "Packages which provide support for single-node GFS." -#~ msgstr "??????????????? ???????????? GFS???????????? ???????????????????????? ?????????????????????????????? ?????????????????????????????????." - -#~ msgid "Single Node GFS Support" -#~ msgstr "??????????????? ???????????? GFS ????????????" - -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "???????????? ????????????????????????????????? ????????????????????? ????????????????????????????????????????????? ??????????????? ?????????????????? ????????????????????????????????????????????????." - -#~ msgid "Java Runtime Environments and Development Kits" -#~ msgstr "???????????? ??????????????? ????????? ???????????????????????? ????????????????????? ???????????????????????? ????????????????????????" +#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +msgid "Applications for a variety of tasks" +msgstr "????????????????????? ????????????????????????????????? ?????????????????????????????????" -#~ msgid "Misc" -#~ msgstr "??????????????????" +#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +msgid "Dialup Networking Support" +msgstr "????????????????????? ??????????????? ????????????" -#~ msgid "Misc packages" -#~ msgstr "????????? ?????????????????????????????????" +#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 +msgid "" +"GNOME is a powerful, graphical user interface which includes a panel, " +"desktop, system icons, and a graphical file manager." +msgstr "" +"GNOME ?????????????????? ???????????????, ?????????????????????, ??????????????? ?????????????????????????????? ????????????????????? ?????????????????? ?????????????????? ????????????????????? ??????????????????????????? " +"?????????????????????????????? ????????? ???????????????????????? ?????????????????? ??????????????? ????????????????????????????????????." -#~ msgid "Multimedia" -#~ msgstr "???????????????????????????" +#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 +msgid "" +"KDE is a powerful, graphical user interface which includes a panel, desktop, " +"system icons, and a graphical file manager." +msgstr "" +"?????????????????? ?????????????????? ????????? ????????????, ????????????, ?????????????????????????????? ??????????????????????????????????????? ????????????????????? ????????? ???????????????????????? ?????????????????? " +"????????????????????? ??????????????? ??????????????? ????????? ???????????????????????? ???????????????????????? ??????????????? ?????????????????????????????????." -#~ msgid "Multimedia applications" -#~ msgstr "????????????????????? ?????????????????????????????????" +#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 +msgid "" +"Sometimes called text editors, these are programs that allow you to create " +"and edit files. These include Emacs and Vi." +msgstr "" +"????????? ?????????????????????????????? ????????? ????????????????????????????????? ??????????????? ??????????????????????????????????????? ???????????? ???????????????????????? ??????????????????????????? ???????????????????????? ????????????????????? " +"????????????????????? ??????????????????. ??????????????? ????????????????????? Vi ??????????????? ????????????????????????." -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "Red Hat Enterprise Linux???????????? ????????????????????? ????????????????????? ?????????????????????????????? ?????????????????????????????????." +#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +msgid "The XEmacs text editor." +msgstr "X??????????????? ????????? ??????????????????????????????" -#~ msgid "Red Hat Enterprise Linux Extras" -#~ msgstr "Red Hat Enterprise Linux ??????????????????????????????" +#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 +msgid "" +"These tools allow you to create documentation in the DocBook format and " +"convert them to HTML, PDF, Postscript, and text." +msgstr "" +"???????????? ???????????????????????? ???????????????????????? ?????????????????????????????? ???????????????????????? ????????????????????????????????????, ?????????????????? HTML, PDF, ???????????????????????????????????????????????? " +"????????????????????? ?????????????????? ??????????????????????????? ??????????????????." -#~ msgid "Workstation" -#~ msgstr "????????? ?????????????????????" +#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +msgid "This group is a collection of network servers for specific purposes" +msgstr "?????????????????? ???????????? ????????????????????????????????? ?????????????????????????????????????????? ??????????????? ????????????????????????????????? ?????????????????? ????????????????????????????????????" -#~ msgid "Workstation applications and utilities." -#~ msgstr "????????? ????????????????????? ????????????????????????????????? ????????????????????? ?????????????????????." +#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 +msgid "This group is a collection of tools and resources of Arabic environments." +msgstr "?????????????????? ???????????? ???????????????????????? ????????????????????? ?????????????????? ???????????????????????? ?????????????????? ????????????????????????????????????." -#~ msgid "Virtualization Support." -#~ msgstr "???????????????????????????????????? ????????????." +#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 +msgid "This group is a collection of tools and resources of Hebrew environments." +msgstr "?????????????????? ???????????? ???????????????????????? ????????????????????? ?????????????????? ???????????????????????? ?????????????????? ????????????????????????????????????." -#~ msgid "Compatibility Arch" -#~ msgstr "??????????????? ???????????????" +#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 +msgid "This group is a collection of tools and resources of Japanese environments." +msgstr "?????????????????? ???????????? ???????????????????????? ????????????????????? ???????????????????????? ???????????????????????? ?????????????????? ????????????????????????????????????." -#~ msgid "Compatibility Arch Libraries" -#~ msgstr "??????????????? ??????????????? ???????????????????????????" +#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +msgid "XEmacs" +msgstr "X?????????????????????" -#~ msgid "Multilib library packages" -#~ msgstr "Multilib ???????????? ?????????????????????????????????" +#: ../comps-el5.xml.in.h:65 +msgid "This group is a collection of tools and resources of Czech environments." +msgstr "?????????????????? ???????????? ???????????????????????? ????????????????????? ???????????? ???????????????????????? ?????????????????? ????????????????????????????????????." -#~ msgid "" -#~ "Packages which provide functionality for the compatibility architecture." -#~ msgstr "??????????????? ?????????????????????????????????????????? ???????????????????????????????????? ?????????????????????????????? ?????????????????????????????????." From fedora-extras-commits at redhat.com Wed Mar 12 12:30:52 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Wed, 12 Mar 2008 12:30:52 GMT Subject: rpms/eject/F-8 eject.spec,1.30,1.31 Message-ID: <200803121230.m2CCUqiR023919@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/eject/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23895 Modified Files: eject.spec Log Message: Added dist tag Index: eject.spec =================================================================== RCS file: /cvs/extras/rpms/eject/F-8/eject.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- eject.spec 12 Mar 2008 12:16:00 -0000 1.30 +++ eject.spec 12 Mar 2008 12:30:21 -0000 1.31 @@ -1,7 +1,7 @@ Summary: A program that ejects removable media using software control. Name: eject Version: 2.1.5 -Release: 6 +Release: 6%{dist} License: GPL Group: System Environment/Base Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz @@ -76,6 +76,7 @@ %changelog * Wed Mar 12 2008 Zdenek Prikryl 2.1.5-6 - Added check for a removable flag +- Added dist tag - Resolves: #432187 * Mon Oct 30 2006 Than Ngo 2.1.5-5 From fedora-extras-commits at redhat.com Wed Mar 12 12:34:33 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Wed, 12 Mar 2008 12:34:33 GMT Subject: rpms/eject/devel eject.spec,1.33,1.34 Message-ID: <200803121234.m2CCYXkP024059@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/eject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24023 Modified Files: eject.spec Log Message: Added dist tag Index: eject.spec =================================================================== RCS file: /cvs/extras/rpms/eject/devel/eject.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- eject.spec 12 Mar 2008 11:57:01 -0000 1.33 +++ eject.spec 12 Mar 2008 12:33:57 -0000 1.34 @@ -1,7 +1,7 @@ Summary: A program that ejects removable media using software control. Name: eject Version: 2.1.5 -Release: 8 +Release: 8.1%{dist} License: GPL Group: System Environment/Base Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz @@ -76,6 +76,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 12 2008 Zdenek Prikryl 2.1.5-8.1 +- Added dist tag + * Wed Mar 12 2008 Zdenek Prikryl 2.1.5-8 - Added check for a removable flag - Resolves: #432187 From fedora-extras-commits at redhat.com Wed Mar 12 12:35:28 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 12 Mar 2008 12:35:28 GMT Subject: rpms/selinux-policy/devel policy-20071130.patch, 1.98, 1.99 selinux-policy.spec, 1.630, 1.631 Message-ID: <200803121235.m2CCZS9O024142@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24113 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Wed Mar 12 2008 Dan Walsh 3.3.1-16 - Change init_t to an unconfined_domain policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- policy-20071130.patch 12 Mar 2008 02:21:18 -0000 1.98 +++ policy-20071130.patch 12 Mar 2008 12:35:06 -0000 1.99 @@ -3316,7 +3316,7 @@ +/usr/lib(64)?/gnupg/gpgkeys.* -- gen_context(system_u:object_r:gpg_helper_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-3.3.1/policy/modules/apps/gpg.if --- nsaserefpolicy/policy/modules/apps/gpg.if 2007-07-23 10:20:12.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/apps/gpg.if 2008-02-29 17:00:38.000000000 -0500 ++++ serefpolicy-3.3.1/policy/modules/apps/gpg.if 2008-03-12 08:31:43.000000000 -0400 @@ -38,6 +38,10 @@ gen_require(` type gpg_exec_t, gpg_helper_exec_t; @@ -3328,7 +3328,7 @@ ') ######################################## -@@ -45,275 +49,59 @@ +@@ -45,275 +49,61 @@ # Declarations # @@ -3519,6 +3519,8 @@ + dontaudit gpg_t $2:udp_socket rw_socket_perms; + dontaudit gpg_helper_t $2:tcp_socket rw_socket_perms; + dontaudit gpg_helper_t $2:udp_socket rw_socket_perms; ++ #Leaked File Descriptors ++ dontaudit gpg_helper_t $2:unix_stream_socket rw_socket_perms; - # allow gpg to connect to the gpg agent - stream_connect_pattern($1_gpg_t,$1_gpg_agent_tmp_t,$1_gpg_agent_tmp_t,$1_gpg_agent_t) @@ -5076,8 +5078,8 @@ +HOME_DIR/\.macromedia(/.*)? gen_context(system_u:object_r:user_nsplugin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.3.1/policy/modules/apps/nsplugin.if --- nsaserefpolicy/policy/modules/apps/nsplugin.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.if 2008-03-10 14:36:14.000000000 -0400 -@@ -0,0 +1,344 @@ ++++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.if 2008-03-12 08:30:42.000000000 -0400 +@@ -0,0 +1,347 @@ + +## policy for nsplugin + @@ -5239,10 +5241,13 @@ + read_lnk_files_pattern($2, nsplugin_rw_t, nsplugin_rw_t) + can_exec($2, nsplugin_rw_t) + -+ allow nsplugin_t $2:udp_socket { read write }; -+ allow nsplugin_t $2:tcp_socket { read write }; ++ #Leaked File Descriptors ++ dontaudit nsplugin_t $2:tcp_socket rw_socket_perms; ++ dontaudit nsplugin_t $2:udp_socket rw_socket_perms; ++ dontaudit nsplugin_t $2:unix_stream_socket rw_socket_perms; + allow nsplugin_t $2:unix_stream_socket connectto; + dontaudit nsplugin_t $2:process ptrace; ++ + allow nsplugin_t $1_tmpfs_t:file { read getattr }; + + allow $2 nsplugin_t:process { getattr ptrace signal_perms }; @@ -26321,7 +26326,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.3.1/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2008-02-26 08:17:43.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/init.te 2008-03-11 18:57:27.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/init.te 2008-03-12 08:33:31.000000000 -0400 @@ -10,6 +10,20 @@ # Declarations # @@ -26414,7 +26419,7 @@ ifdef(`distro_gentoo',` allow init_t self:process { getcap setcap }; ') -@@ -163,22 +194,25 @@ +@@ -163,14 +194,16 @@ fs_tmpfs_filetrans(init_t,initctl_t,fifo_file) ') @@ -26436,18 +26441,18 @@ ') optional_policy(` - nscd_socket_use(init_t) +@@ -181,13 +214,18 @@ + unconfined_domain(init_t) ') --optional_policy(` -- unconfined_domain(init_t) +ifndef(`distro_ubuntu',` + corecmd_shell_domtrans(init_t,initrc_t) + corecmd_shell_entry_type(initrc_t) - ') - ++') ++ ######################################## -@@ -187,7 +221,7 @@ + # + # Init script local policy # allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched }; @@ -26456,7 +26461,7 @@ dontaudit initrc_t self:capability sys_module; # sysctl is triggering this allow initrc_t self:passwd rootok; -@@ -201,10 +235,9 @@ +@@ -201,10 +239,9 @@ allow initrc_t initrc_devpts_t:chr_file rw_term_perms; term_create_pty(initrc_t,initrc_devpts_t) @@ -26469,7 +26474,7 @@ manage_dirs_pattern(initrc_t,initrc_state_t,initrc_state_t) manage_files_pattern(initrc_t,initrc_state_t,initrc_state_t) -@@ -257,7 +290,7 @@ +@@ -257,7 +294,7 @@ dev_read_sound_mixer(initrc_t) dev_write_sound_mixer(initrc_t) dev_setattr_all_chr_files(initrc_t) @@ -26478,7 +26483,7 @@ dev_delete_lvm_control_dev(initrc_t) dev_manage_generic_symlinks(initrc_t) dev_manage_generic_files(initrc_t) -@@ -283,7 +316,6 @@ +@@ -283,7 +320,6 @@ mls_process_read_up(initrc_t) mls_process_write_down(initrc_t) mls_rangetrans_source(initrc_t) @@ -26486,7 +26491,7 @@ selinux_get_enforce_mode(initrc_t) -@@ -496,6 +528,31 @@ +@@ -496,6 +532,31 @@ ') ') @@ -26518,7 +26523,7 @@ optional_policy(` amavis_search_lib(initrc_t) amavis_setattr_pid_files(initrc_t) -@@ -559,14 +616,6 @@ +@@ -559,14 +620,6 @@ ') optional_policy(` @@ -26533,7 +26538,7 @@ ftp_read_config(initrc_t) ') -@@ -639,12 +688,6 @@ +@@ -639,12 +692,6 @@ mta_read_config(initrc_t) mta_dontaudit_read_spool_symlinks(initrc_t) ') @@ -26546,7 +26551,7 @@ optional_policy(` ifdef(`distro_redhat',` -@@ -705,6 +748,9 @@ +@@ -705,6 +752,9 @@ # why is this needed: rpm_manage_db(initrc_t) @@ -26556,7 +26561,7 @@ ') optional_policy(` -@@ -717,9 +763,11 @@ +@@ -717,9 +767,11 @@ squid_manage_logs(initrc_t) ') @@ -26571,7 +26576,7 @@ ') optional_policy(` -@@ -738,6 +786,11 @@ +@@ -738,6 +790,11 @@ uml_setattr_util_sockets(initrc_t) ') @@ -26583,7 +26588,7 @@ optional_policy(` unconfined_domain(initrc_t) -@@ -752,6 +805,10 @@ +@@ -752,6 +809,10 @@ ') optional_policy(` @@ -26594,7 +26599,7 @@ vmware_read_system_config(initrc_t) vmware_append_system_config(initrc_t) ') -@@ -774,3 +831,4 @@ +@@ -774,3 +835,4 @@ optional_policy(` zebra_read_config(initrc_t) ') @@ -27160,7 +27165,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.3.1/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2007-12-12 11:35:28.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/lvm.fc 2008-03-11 18:59:24.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/lvm.fc 2008-03-12 07:01:13.000000000 -0400 @@ -55,6 +55,7 @@ /sbin/lvs -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/lvscan -- gen_context(system_u:object_r:lvm_exec_t,s0) @@ -27169,6 +27174,11 @@ /sbin/pvchange -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/pvcreate -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/pvdata -- gen_context(system_u:object_r:lvm_exec_t,s0) +@@ -97,3 +98,4 @@ + /var/lock/lvm(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0) + /var/run/multipathd\.sock -s gen_context(system_u:object_r:lvm_var_run_t,s0) + /var/lib/multipath(/.*)? gen_context(system_u:object_r:lvm_var_lib_t,s0) ++/var/run/dmevent.* gen_context(system_u:object_r:lvm_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.3.1/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-12-19 05:32:17.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/system/lvm.te 2008-03-11 19:04:42.000000000 -0400 @@ -29611,7 +29621,7 @@ +/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.3.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-02-15 09:52:56.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-03-09 08:38:37.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-03-12 08:26:37.000000000 -0400 @@ -29,9 +29,14 @@ ') @@ -31962,7 +31972,7 @@ ## Send a dbus message to all user domains. ## ## -@@ -5704,3 +6074,368 @@ +@@ -5704,3 +6074,370 @@ interface(`userdom_unconfined',` refpolicywarn(`$0($*) has been deprecated.') ') @@ -32331,6 +32341,8 @@ + netutils_run_traceroute_cond($1_t,$1_r,{ $1_tty_device_t $1_devpts_t }) + ') +') ++ ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.3.1/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2007-12-19 05:32:17.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/system/userdomain.te 2008-02-26 08:29:22.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.630 retrieving revision 1.631 diff -u -r1.630 -r1.631 --- selinux-policy.spec 12 Mar 2008 01:00:13 -0000 1.630 +++ selinux-policy.spec 12 Mar 2008 12:35:06 -0000 1.631 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -388,6 +388,9 @@ %endif %changelog +* Wed Mar 12 2008 Dan Walsh 3.3.1-16 +- Change init_t to an unconfined_domain + * Tue Mar 11 2008 Dan Walsh 3.3.1-15 - Allow init to transition to initrc_t on shell exec. - Fix init to be able to sendto init_t. From fedora-extras-commits at redhat.com Wed Mar 12 12:37:38 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 12 Mar 2008 12:37:38 GMT Subject: rpms/ocaml-libvirt/EL-5 .cvsignore, 1.8, 1.9 ocaml-libvirt.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200803121237.m2CCbcDJ024308@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-libvirt/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24245/EL-5 Modified Files: .cvsignore ocaml-libvirt.spec sources Log Message: * Wed Mar 12 2008 Richard W.M. Jones - 0.4.1.0-1 - New upstream release 0.4.1.0. - New upstream URL and source location. - Upstream renamed mlvirtmanager to virt-ctrl. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/EL-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 19 Oct 2007 15:22:32 -0000 1.8 +++ .cvsignore 12 Mar 2008 12:37:04 -0000 1.9 @@ -1 +1 @@ -ocaml-libvirt-0.3.3.0.tar.gz +ocaml-libvirt-0.4.1.0.tar.gz Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/EL-5/ocaml-libvirt.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ocaml-libvirt.spec 12 Dec 2007 16:08:14 -0000 1.13 +++ ocaml-libvirt.spec 12 Mar 2008 12:37:04 -0000 1.14 @@ -3,47 +3,50 @@ # Select what subpackages to build. %define build_mlvirsh 1 -%define build_mlvirtmanager 0 +%define build_virt_ctrl 0 %define build_virt_top 1 %define build_virt_df 0 %define build_full_featured_virt_top 1 Name: ocaml-libvirt -Version: 0.3.3.0 -Release: 6%{?dist} +Version: 0.4.1.0 +Release: 1%{?dist} Summary: OCaml binding for libvirt Group: Development/Libraries License: LGPLv2+ -URL: http://et.redhat.com/~rjones/ocaml-libvirt/ -Source0: http://et.redhat.com/~rjones/ocaml-libvirt/%{name}-%{version}.tar.gz +URL: http://libvirt.org/ocaml/ +Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc -ExcludeArch: ppc64 -# Note for people building from this spec file: -# These BR's can be found in Fedora development, or here: -# http://www.annexia.org/tmp/ocaml/ BuildRequires: ocaml >= 3.09.3 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel -BuildRequires: ocaml-extlib-devel -%if %build_mlvirtmanager -BuildRequires: ocaml-lablgtk-devel + +%if %build_virt_ctrl +BuildRequires: ocaml-lablgtk-devel >= 2.10.0 +BuildRequires: gtk2-devel +BuildRequires: gnome-icon-theme +BuildRequires: ocaml-dbus-devel >= 0.06 +BuildRequires: dbus-devel %endif + %if %build_virt_top BuildRequires: ocaml-curses-devel +BuildRequires: ocaml-extlib-devel %if %build_full_featured_virt_top BuildRequires: ocaml-xml-light-devel BuildRequires: ocaml-csv-devel BuildRequires: ocaml-calendar-devel %endif %endif + BuildRequires: libvirt-devel >= 0.2.1 BuildRequires: perl BuildRequires: gawk BuildRequires: ncurses-devel + %description OCaml binding for libvirt. @@ -71,14 +74,14 @@ %endif -%if %build_mlvirtmanager -%package -n mlvirtmanager +%if %build_virt_ctrl +%package -n virt-ctrl Summary: OCaml virtualization graphical utility Group: Applications/Emulators License: GPLv2+ -%description -n mlvirtmanager +%description -n virt-ctrl OCaml virtualization graphical utility. %endif @@ -128,14 +131,14 @@ %if %build_mlvirsh strip mlvirsh/mlvirsh.opt %endif -%if %build_mlvirtmanager -strip mlvirtmanager/mlvirtmanager.opt +%if %build_virt_ctrl +strip virt-ctrl/virt-ctrl.opt %endif %if %build_virt_top strip virt-top/virt-top.opt %endif %if %build_virt_df -strip virt-top/virt-df.opt +strip virt-df/virt-df.opt %endif %endif @@ -156,11 +159,18 @@ gzip $RPM_BUILD_ROOT%{_mandir}/man1/virt-top.1 %endif +%if %build_virt_df +# Install virt-df manpage by hand for now. +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0644 virt-df/virt-df.1 $RPM_BUILD_ROOT%{_mandir}/man1 +gzip $RPM_BUILD_ROOT%{_mandir}/man1/virt-df.1 +%endif + %if !%build_mlvirsh rm -f $RPM_BUILD_ROOT%{_bindir}/mlvirsh %endif -%if !%build_mlvirtmanager -rm -f $RPM_BUILD_ROOT%{_bindir}/mlvirtmanager +%if !%build_virt_ctrl +rm -f $RPM_BUILD_ROOT%{_bindir}/virt-ctrl %endif %if !%build_virt_top rm -f $RPM_BUILD_ROOT%{_bindir}/virt-top @@ -207,11 +217,11 @@ %endif -%if %build_mlvirtmanager -%files -n mlvirtmanager +%if %build_virt_ctrl +%files -n virt-ctrl %defattr(-,root,root,-) %doc COPYING README ChangeLog -%{_bindir}/mlvirtmanager +%{_bindir}/virt-ctrl %endif @@ -220,7 +230,7 @@ %defattr(-,root,root,-) %doc COPYING README TODO.virt-top ChangeLog %{_bindir}/virt-top -%{_mandir}/man1/*.1.gz +%{_mandir}/man1/virt-top.1.gz %endif @@ -229,10 +239,16 @@ %defattr(-,root,root,-) %doc COPYING README ChangeLog %{_bindir}/virt-df +%{_mandir}/man1/virt-df.1.gz %endif %changelog +* Wed Mar 12 2008 Richard W.M. Jones - 0.4.1.0-1 +- New upstream release 0.4.1.0. +- New upstream URL and source location. +- Upstream renamed mlvirtmanager to virt-ctrl. + * Wed Dec 12 2007 Richard W.M. Jones - 0.3.3.0-6 - BuildRequires ncurses-devel on RHEL. - ExcludeArch ppc. libvirt is missing from RHEL on ppc. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/EL-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 19 Oct 2007 15:22:32 -0000 1.8 +++ sources 12 Mar 2008 12:37:04 -0000 1.9 @@ -1 +1 @@ -8787a13f315c62a650170e4d888ebccb ocaml-libvirt-0.3.3.0.tar.gz +d0798559af74524a58d98b523d36744e ocaml-libvirt-0.4.1.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 12:37:40 2008 From: fedora-extras-commits at redhat.com (Zdenek Prikryl (zprikryl)) Date: Wed, 12 Mar 2008 12:37:40 GMT Subject: rpms/eject/F-7 eject-2.1.5-umount.patch, NONE, 1.1 eject.spec, 1.29, 1.30 Message-ID: <200803121237.m2CCbeXZ024319@cvs-int.fedora.redhat.com> Author: zprikryl Update of /cvs/extras/rpms/eject/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24236 Modified Files: eject.spec Added Files: eject-2.1.5-umount.patch Log Message: Added check for a removable flag Added dist tag Resolves: #432187 eject-2.1.5-umount.patch: --- NEW FILE eject-2.1.5-umount.patch --- --- eject/eject.c.umount 2008-03-12 11:25:55.000000000 +0100 +++ eject/eject.c 2008-03-12 11:47:24.000000000 +0100 @@ -30,6 +30,8 @@ * */ +#define _ATFILE_SOURCE + #include "i18n.h" #ifndef DEFAULTDEVICE @@ -42,6 +44,7 @@ #include #include #include +#include #ifdef GETOPTLONG #include @@ -1127,6 +1130,69 @@ static char *MultiplePartitions(const ch return 0; } +/* + * Find device name with the given major and minor number. Returns NULL if not + * found. The returned pointer must be free()'d. + */ +static char* FindDeviceMajorMinor(int maj, int min) +{ + DIR *dir = opendir("/dev"); + struct dirent *d; + int dfd = dirfd(dir); + struct stat st; + char *device; + + if (!dir || dfd == -1) { + perror("/dev"); + return NULL; + } + while ((d = readdir(dir)) != NULL) { + if (d->d_type == DT_DIR || d->d_type == DT_UNKNOWN || d->d_type == DT_LNK) + continue; + if (fstatat(dfd, d->d_name, &st, O_RDONLY) != 0) + continue; + if (major(st.st_rdev) == maj && minor(st.st_rdev) == min) { + device = strdup(d->d_name); + closedir(dir); + return device; + } + } + closedir(dir); + return NULL; +} + +/* + * Check content of /sys/block//removable. Returns 1 if the file + * contains '1' otherwise returns 0. + */ +static int CheckRemovable(const char* deviceName) +{ + FILE *fp; + int removable = 0; + char *device; + char path[PATH_MAX]; + int maj, min; + + GetMajorMinor(deviceName, &maj, &min); + if ((device = FindDeviceMajorMinor(maj, 0)) == NULL) { + fprintf(stderr, + _("%s: did not find a device with %d-0 major-minor numbers\n"), + programName, maj); + exit(1); + } + snprintf(path, sizeof(path), "/sys/block/%s/removable", device); + free(device); + if((fp = fopen(path, "r")) == NULL) { + perror(path); + exit(1); + } + + if (fgetc(fp) == '1') + removable = 1; + + fclose(fp); + return removable; +} /* handle -x option */ static void HandleXOption(char *deviceName) @@ -1270,6 +1336,15 @@ int main(int argc, char **argv) exit(0); } + /* Check if device has removable flag*/ + if (v_option) + printf(_("%s: checking if device \"%s\" has a removable flag\n"), programName, deviceName); + if (!CheckRemovable(deviceName)) + { + fprintf(stderr, _("%s: device \"%s\" doesn't have a removable flag\n"), programName, deviceName); + exit(1); + } + /* handle -a option */ if (a_option) { if (v_option) { Index: eject.spec =================================================================== RCS file: /cvs/extras/rpms/eject/F-7/eject.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- eject.spec 30 Oct 2006 14:53:46 -0000 1.29 +++ eject.spec 12 Mar 2008 12:37:09 -0000 1.30 @@ -1,7 +1,7 @@ Summary: A program that ejects removable media using software control. Name: eject Version: 2.1.5 -Release: 5 +Release: 6%{dist} License: GPL Group: System Environment/Base Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz @@ -10,6 +10,7 @@ Patch2: eject-timeout.patch Patch3: eject-2.1.5-opendevice.patch Patch4: eject-2.1.5-spaces.patch +Patch5: eject-2.1.5-umount.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot URL: http://www.pobox.com/~tranter ExcludeArch: s390 s390x @@ -33,6 +34,7 @@ %patch2 -p1 -b .timeout %patch3 -p0 -b .opendevice %patch4 -p0 -b .spaces +%patch5 -p1 -b .umount %build %configure @@ -72,6 +74,11 @@ %{_mandir}/man1/* %changelog +* Wed Mar 12 2008 Zdenek Prikryl 2.1.5-6 +- Added check for a removable flag +- Added dist tag +- Resolves: #432187 + * Mon Oct 30 2006 Than Ngo 2.1.5-5 - apply upstream patch to fix #212467 From fedora-extras-commits at redhat.com Wed Mar 12 12:38:03 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Wed, 12 Mar 2008 12:38:03 GMT Subject: devel/vim 7.1.271,NONE,1.1 Message-ID: <200803121238.m2CCc3TP024420@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24413 Added Files: 7.1.271 Log Message: - patchlevel 271 --- NEW FILE 7.1.271 --- To: vim-dev at vim.org Subject: Patch 7.1.271 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.271 Problem: In a Vim build without autocommands, checking a file that was changed externally causes the current buffer to be changed unexpectedly. (Karsten Hopp) Solution: Store "curbuf" instead of "buf". Files: src/fileio.c *** ../vim-7.1.270/src/fileio.c Wed Feb 20 18:14:25 2008 --- src/fileio.c Tue Mar 11 21:35:05 2008 *************** *** 9239,9245 **** aco_save_T *aco; /* structure to save values in */ buf_T *buf; /* new curbuf */ { ! aco->save_buf = buf; curbuf = buf; curwin->w_buffer = buf; } --- 9248,9254 ---- aco_save_T *aco; /* structure to save values in */ buf_T *buf; /* new curbuf */ { ! aco->save_buf = curbuf; curbuf = buf; curwin->w_buffer = buf; } *** ../vim-7.1.270/src/version.c Mon Mar 10 21:33:52 2008 --- src/version.c Tue Mar 11 21:57:30 2008 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 271, /**/ -- In a world without walls and borders, who needs windows and gates? /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Wed Mar 12 12:38:10 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Wed, 12 Mar 2008 12:38:10 GMT Subject: devel/vim 7.1.272,NONE,1.1 Message-ID: <200803121238.m2CCcAtL024453@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24439 Added Files: 7.1.272 Log Message: - patchlevel 272 --- NEW FILE 7.1.272 --- To: vim-dev at vim.org Subject: Patch 7.1.272 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.272 Problem: The special buffer name [Location List] is not used for a buffer displayed in another tab page. Solution: Use FOR_ALL_TAB_WINDOWS instead of FOR_ALL_WINDOWS. (Hiroaki Nishihara) Files: src/buffer.c *** ../vim-7.1.271/src/buffer.c Wed Oct 3 14:30:54 2007 --- src/buffer.c Wed Mar 5 21:55:44 2008 *************** *** 4912,4918 **** return retval; } ! #ifdef FEAT_VIMINFO int read_viminfo_bufferlist(virp, writing) vir_T *virp; --- 4912,4918 ---- return retval; } ! #if defined(FEAT_VIMINFO) || defined(PROTO) int read_viminfo_bufferlist(virp, writing) vir_T *virp; *************** *** 5033,5045 **** #if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS) if (bt_quickfix(buf)) { ! win_T *win; /* * For location list window, w_llist_ref points to the location list. * For quickfix window, w_llist_ref is NULL. */ ! FOR_ALL_WINDOWS(win) if (win->w_buffer == buf) break; if (win != NULL && win->w_llist_ref != NULL) --- 5033,5046 ---- #if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS) if (bt_quickfix(buf)) { ! win_T *win; ! tabpage_T *tp; /* * For location list window, w_llist_ref points to the location list. * For quickfix window, w_llist_ref is NULL. */ ! FOR_ALL_TAB_WINDOWS(tp, win) if (win->w_buffer == buf) break; if (win != NULL && win->w_llist_ref != NULL) *** ../vim-7.1.271/src/version.c Tue Mar 11 22:01:16 2008 --- src/version.c Wed Mar 12 12:21:13 2008 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 272, /**/ -- hundred-and-one symptoms of being an internet addict: 113. You are asked about a bus schedule, you wonder if it is 16 or 32 bits. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-extras-commits at redhat.com Wed Mar 12 12:39:18 2008 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Wed, 12 Mar 2008 12:39:18 GMT Subject: devel/vim 7.1.273, NONE, 1.1 README.patches, 1.100, 1.101 vim.spec, 1.201, 1.202 Message-ID: <200803121239.m2CCdIB4024548@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/vim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24480 Modified Files: README.patches vim.spec Added Files: 7.1.273 Log Message: - patchlevel 273 --- NEW FILE 7.1.273 --- To: vim-dev at vim.org Subject: Patch 7.1.273 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.1.273 Problem: When profiling on Linux Vim exits early. (Liu Yubao) Solution: When profiling don't exit on SIGPROF. Files: src/Makefile, src/os_unix.c *** ../vim-7.1.272/src/Makefile Wed Mar 12 12:23:18 2008 --- src/Makefile Wed Mar 12 13:11:07 2008 *************** *** 545,551 **** # For unknown reasons adding "-lc" fixes a linking problem with GCC. That's # probably a bug in the "-pg" implementation. # Need to recompile everything after changing this: "make clean" "make". ! #PROFILE_CFLAGS = -pg -g #PROFILE_LIBS = -pg #PROFILE_LIBS = -pg -lc --- 545,551 ---- # For unknown reasons adding "-lc" fixes a linking problem with GCC. That's # probably a bug in the "-pg" implementation. # Need to recompile everything after changing this: "make clean" "make". ! #PROFILE_CFLAGS = -pg -g -DWE_ARE_PROFILING #PROFILE_LIBS = -pg #PROFILE_LIBS = -pg -lc *** ../vim-7.1.272/src/os_unix.c Sun Feb 10 22:25:12 2008 --- src/os_unix.c Wed Mar 5 22:15:41 2008 *************** *** 269,276 **** #ifdef SIGVTALRM {SIGVTALRM, "VTALRM", TRUE}, #endif ! #if defined(SIGPROF) && !defined(FEAT_MZSCHEME) ! /* MzScheme uses SIGPROF for its own needs */ {SIGPROF, "PROF", TRUE}, #endif #ifdef SIGXCPU --- 269,277 ---- #ifdef SIGVTALRM {SIGVTALRM, "VTALRM", TRUE}, #endif ! #if defined(SIGPROF) && !defined(FEAT_MZSCHEME) && !defined(WE_ARE_PROFILING) ! /* MzScheme uses SIGPROF for its own needs; On Linux with profiling ! * this makes Vim exit. WE_ARE_PROFILING is defined in Makefile. */ {SIGPROF, "PROF", TRUE}, #endif #ifdef SIGXCPU *** ../vim-7.1.272/src/version.c Wed Mar 12 12:22:56 2008 --- src/version.c Wed Mar 12 13:08:59 2008 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 273, /**/ -- hundred-and-one symptoms of being an internet addict: 114. You are counting items, you go "0,1,2,3,4,5,6,7,8,9,A,B,C,D...". /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// Index: README.patches =================================================================== RCS file: /cvs/extras/devel/vim/README.patches,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- README.patches 11 Mar 2008 12:49:59 -0000 1.100 +++ README.patches 12 Mar 2008 12:38:47 -0000 1.101 @@ -302,3 +302,6 @@ 1576 7.1.268 always shows "+" at end of screen line with 'cursurline' 6183 7.1.269 matchparen plugin has an arbitrary line number limit 2861 7.1.270 ":?foo?" matches in current line since patch 7.1.025 + 1582 7.1.271 in tiny version ":!touch %" causes curbuf to be wrong + 2334 7.1.272 buffer name [Location List] not used for buffer in other tab + 2504 7.1.273 when profiling on Linux Vim exits early Index: vim.spec =================================================================== RCS file: /cvs/extras/devel/vim/vim.spec,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- vim.spec 11 Mar 2008 14:49:46 -0000 1.201 +++ vim.spec 12 Mar 2008 12:38:47 -0000 1.202 @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim71%{?beta} -%define patchlevel 270 +%define patchlevel 273 Summary: The VIM editor URL: http://www.vim.org/ @@ -325,6 +325,9 @@ Patch268: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.268 Patch269: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.269 Patch270: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.270 +Patch271: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.271 +Patch272: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.272 +Patch273: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.273 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -731,6 +734,9 @@ %patch268 -p0 %patch269 -p0 %patch270 -p0 +%patch271 -p0 +%patch272 -p0 +%patch273 -p0 # install spell files @@ -1135,6 +1141,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Mar 12 2008 Karsten Hopp 7.1.273-1 +- update to patchlevel 273, this fixes #436902 + * Tue Mar 11 2008 Karsten Hopp 7.1.270-1 - patchlevel 270 - don't write swapfile on most common locations for USB-sticks (#436752) From fedora-extras-commits at redhat.com Wed Mar 12 12:39:49 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Wed, 12 Mar 2008 12:39:49 GMT Subject: rpms/selinux-policy/devel policy-20071130.patch,1.99,1.100 Message-ID: <200803121239.m2CCdnhq024605@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24582 Modified Files: policy-20071130.patch Log Message: * Wed Mar 12 2008 Dan Walsh 3.3.1-16 - Change init_t to an unconfined_domain policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- policy-20071130.patch 12 Mar 2008 12:35:06 -0000 1.99 +++ policy-20071130.patch 12 Mar 2008 12:39:48 -0000 1.100 @@ -26326,7 +26326,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.3.1/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2008-02-26 08:17:43.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/init.te 2008-03-12 08:33:31.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/init.te 2008-03-12 08:37:59.000000000 -0400 @@ -10,6 +10,20 @@ # Declarations # @@ -26461,20 +26461,26 @@ dontaudit initrc_t self:capability sys_module; # sysctl is triggering this allow initrc_t self:passwd rootok; -@@ -201,10 +239,9 @@ - allow initrc_t initrc_devpts_t:chr_file rw_term_perms; +@@ -198,13 +236,14 @@ + allow initrc_t self:udp_socket create_socket_perms; + allow initrc_t self:fifo_file rw_file_perms; + +-allow initrc_t initrc_devpts_t:chr_file rw_term_perms; ++allow init_t initrc_t:unix_dgram_socket sendto; ++ term_create_pty(initrc_t,initrc_devpts_t) -# Going to single user mode -init_exec(initrc_t) +init_telinit(initrc_t) ++init_chat(initrc_t) -can_exec(initrc_t,initrc_exec_t) +can_exec(initrc_t,initscript) manage_dirs_pattern(initrc_t,initrc_state_t,initrc_state_t) manage_files_pattern(initrc_t,initrc_state_t,initrc_state_t) -@@ -257,7 +294,7 @@ +@@ -257,7 +296,7 @@ dev_read_sound_mixer(initrc_t) dev_write_sound_mixer(initrc_t) dev_setattr_all_chr_files(initrc_t) @@ -26483,7 +26489,7 @@ dev_delete_lvm_control_dev(initrc_t) dev_manage_generic_symlinks(initrc_t) dev_manage_generic_files(initrc_t) -@@ -283,7 +320,6 @@ +@@ -283,7 +322,6 @@ mls_process_read_up(initrc_t) mls_process_write_down(initrc_t) mls_rangetrans_source(initrc_t) @@ -26491,7 +26497,7 @@ selinux_get_enforce_mode(initrc_t) -@@ -496,6 +532,31 @@ +@@ -496,6 +534,31 @@ ') ') @@ -26523,7 +26529,7 @@ optional_policy(` amavis_search_lib(initrc_t) amavis_setattr_pid_files(initrc_t) -@@ -559,14 +620,6 @@ +@@ -559,14 +622,6 @@ ') optional_policy(` @@ -26538,7 +26544,7 @@ ftp_read_config(initrc_t) ') -@@ -639,12 +692,6 @@ +@@ -639,12 +694,6 @@ mta_read_config(initrc_t) mta_dontaudit_read_spool_symlinks(initrc_t) ') @@ -26551,7 +26557,7 @@ optional_policy(` ifdef(`distro_redhat',` -@@ -705,6 +752,9 @@ +@@ -705,6 +754,9 @@ # why is this needed: rpm_manage_db(initrc_t) @@ -26561,7 +26567,7 @@ ') optional_policy(` -@@ -717,9 +767,11 @@ +@@ -717,9 +769,11 @@ squid_manage_logs(initrc_t) ') @@ -26576,7 +26582,7 @@ ') optional_policy(` -@@ -738,6 +790,11 @@ +@@ -738,6 +792,11 @@ uml_setattr_util_sockets(initrc_t) ') @@ -26588,7 +26594,7 @@ optional_policy(` unconfined_domain(initrc_t) -@@ -752,6 +809,10 @@ +@@ -752,6 +811,10 @@ ') optional_policy(` @@ -26599,7 +26605,7 @@ vmware_read_system_config(initrc_t) vmware_append_system_config(initrc_t) ') -@@ -774,3 +835,4 @@ +@@ -774,3 +837,4 @@ optional_policy(` zebra_read_config(initrc_t) ') From fedora-extras-commits at redhat.com Wed Mar 12 12:47:46 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 12 Mar 2008 12:47:46 GMT Subject: rpms/arts/devel arts.spec,1.85,1.86 Message-ID: <200803121247.m2CClkub024884@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/arts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24845 Modified Files: arts.spec Log Message: * Wed Mar 12 2008 Rex Dieter 8:1.5.9-2 - s/qt-devel/qt3-devel/ Index: arts.spec =================================================================== RCS file: /cvs/pkgs/rpms/arts/devel/arts.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- arts.spec 14 Feb 2008 13:33:28 -0000 1.85 +++ arts.spec 12 Mar 2008 12:47:15 -0000 1.86 @@ -10,7 +10,7 @@ Group: System Environment/Daemons Epoch: 8 Version: 1.5.9 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Url: http://www.kde.org @@ -32,10 +32,10 @@ # used in artsdsp Requires: which -BuildRequires: qt-devel +BuildRequires: qt3-devel ## Shouldn't be necessary, but some folks won't upgrade, unless we stiff-arm them. (-; -#global qt_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo %{qt_version}) -#Requires: qt >= 1:%{qt_ver} +#global qt3_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo %{qt_version}) +#Requires: qt3 >= 1:%{qt3_ver} BuildRequires: alsa-lib-devel BuildRequires: glib2-devel BuildRequires: libvorbis-devel @@ -67,17 +67,9 @@ Group: Development/Libraries Summary: Development files for the aRts sound server Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: qt-devel +Requires: qt3-devel Requires: pkgconfig Requires: glib2-devel -## those below can/should be omitted from future(f8?) builds -- Rex -%if 0 -Requires: esound-devel -Requires: libvorbis-devel -Requires: audiofile-devel -Requires: alsa-lib-devel -%endif - %description devel Install arts-devel if you intend to write applications using arts (such as KDE applications using sound). @@ -196,6 +188,9 @@ %changelog +* Wed Mar 12 2008 Rex Dieter 8:1.5.9-2 +- s/qt-devel/qt3-devel/ + * Tue Feb 14 2008 Rex Dieter 8:1.5.9-1 - kde-3.5.9 From fedora-extras-commits at redhat.com Wed Mar 12 12:53:35 2008 From: fedora-extras-commits at redhat.com (Ondrej Vasik (ovasik)) Date: Wed, 12 Mar 2008 12:53:35 GMT Subject: rpms/quota/devel quota.spec,1.40,1.41 Message-ID: <200803121253.m2CCrZ9T025039@cvs-int.fedora.redhat.com> Author: ovasik Update of /cvs/extras/rpms/quota/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019 Modified Files: quota.spec Log Message: removed unnecessary(and errorneus) with-ext2direct=no option, enabled ldapmail support(used try, nonmandatory) Index: quota.spec =================================================================== RCS file: /cvs/extras/rpms/quota/devel/quota.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- quota.spec 6 Mar 2008 07:12:32 -0000 1.40 +++ quota.spec 12 Mar 2008 12:53:04 -0000 1.41 @@ -5,7 +5,7 @@ Summary: System administration tools for monitoring users' disk usage Epoch: 1 Version: 3.15 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD and GPLv2+ URL: http://sourceforge.net/projects/linuxquota/ Group: System Environment/Base @@ -41,7 +41,7 @@ %build %configure \ - --with-ext2direct=no \ + --enable-ldapmail=try \ %if %{rpcsetquota} --enable-rpcsetquota=yes \ %endif @@ -89,6 +89,12 @@ %changelog +* Wed Mar 12 2008 Ondrej Vasik 3.15-6 +- added enable-ldapmail=try option(wonder how #133207 + got closed by FC-4 without it or warnquota.conf change) +- dropped with-ext2direct=no option - this option is + invalid and original bug was fixed in 3.07 + * Thu Mar 6 2008 Ondrej Vasik 3.15-5 - added symbolic link for quotaoff man page(#436110) - don't ship xqmstats.8 man page as we don't ship those From fedora-extras-commits at redhat.com Wed Mar 12 12:59:00 2008 From: fedora-extras-commits at redhat.com (Richard W.M. Jones (rjones)) Date: Wed, 12 Mar 2008 12:59:00 GMT Subject: rpms/ocaml-libvirt/EL-5 ocaml-libvirt.spec,1.14,1.15 Message-ID: <200803121259.m2CCx00L025209@cvs-int.fedora.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-libvirt/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25167 Modified Files: ocaml-libvirt.spec Log Message: * Wed Mar 12 2008 Richard W.M. Jones - 0.4.1.0-2 - ExcludeArch ppc since it lacks libvirt. Index: ocaml-libvirt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-libvirt/EL-5/ocaml-libvirt.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ocaml-libvirt.spec 12 Mar 2008 12:37:04 -0000 1.14 +++ ocaml-libvirt.spec 12 Mar 2008 12:58:29 -0000 1.15 @@ -10,7 +10,7 @@ Name: ocaml-libvirt Version: 0.4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml binding for libvirt Group: Development/Libraries @@ -18,6 +18,7 @@ URL: http://libvirt.org/ocaml/ Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: ppc BuildRequires: ocaml >= 3.09.3 BuildRequires: ocaml-ocamldoc @@ -244,6 +245,9 @@ %changelog +* Wed Mar 12 2008 Richard W.M. Jones - 0.4.1.0-2 +- ExcludeArch ppc since it lacks libvirt. + * Wed Mar 12 2008 Richard W.M. Jones - 0.4.1.0-1 - New upstream release 0.4.1.0. - New upstream URL and source location. From fedora-extras-commits at redhat.com Wed Mar 12 13:20:58 2008 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Wed, 12 Mar 2008 13:20:58 GMT Subject: rpms/inkscape/devel .cvsignore, 1.14, 1.15 inkscape-0.46pre2-icons.patch, 1.1, 1.2 inkscape.spec, 1.48, 1.49 sources, 1.14, 1.15 Message-ID: <200803121320.m2CDKwAx032002@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31965/devel Modified Files: .cvsignore inkscape-0.46pre2-icons.patch inkscape.spec sources Log Message: 0.46pre3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 21 Feb 2008 22:39:11 -0000 1.14 +++ .cvsignore 12 Mar 2008 13:20:16 -0000 1.15 @@ -1 +1 @@ -inkscape-0.45+0.46pre2.tar.bz2 +inkscape-0.45+0.46pre3.tar.bz2 inkscape-0.46pre2-icons.patch: Index: inkscape-0.46pre2-icons.patch =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape-0.46pre2-icons.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- inkscape-0.46pre2-icons.patch 22 Feb 2008 08:39:23 -0000 1.1 +++ inkscape-0.46pre2-icons.patch 12 Mar 2008 13:20:16 -0000 1.2 @@ -1,246 +1,5 @@ -Small icons (r17417 and r17378). Default to small icons and Sans font. -diff -urp inkscape-0.45+0.46pre2.orig/src/dialogs/eek-preview.cpp inkscape-0.45+0.46pre2/src/dialogs/eek-preview.cpp ---- inkscape-0.45+0.46pre2.orig/src/dialogs/eek-preview.cpp 2008-02-17 05:24:01.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/dialogs/eek-preview.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -44,6 +44,9 @@ - - #define FOCUS_PROP_ID 1 - -+/* Keep in sycn with last value in eek-preview.h */ -+#define PREVIEW_SIZE_LAST PREVIEW_SIZE_HUGE -+#define PREVIEW_SIZE_NEXTFREE (PREVIEW_SIZE_HUGE + 1) - - - static void eek_preview_class_init( EekPreviewClass *klass ); -@@ -90,9 +93,41 @@ GType eek_preview_get_type(void) - return preview_type; - } - --GtkWidget* eek_preview_area_new(void) -+static gboolean setupDone = FALSE; -+static GtkRequisition sizeThings[PREVIEW_SIZE_NEXTFREE]; -+ -+void eek_preview_set_size_mappings( guint count, GtkIconSize const* sizes ) - { -- return NULL; -+ gint width = 0; -+ gint height = 0; -+ gint smallest = 512; -+ gint largest = 0; -+ guint i = 0; -+ guint delta = 0; -+ -+ for ( i = 0; i < count; ++i ) { -+ gboolean worked = gtk_icon_size_lookup( sizes[i], &width, &height ); -+ if ( worked ) { -+ if ( width < smallest ) { -+ smallest = width; -+ } -+ if ( width > largest ) { -+ largest = width; -+ } -+ } -+ } -+ -+ smallest = (smallest * 3) / 4; -+ -+ delta = largest - smallest; -+ -+ for ( i = 0; i < G_N_ELEMENTS(sizeThings); ++i ) { -+ guint val = smallest + ( (i * delta) / (G_N_ELEMENTS(sizeThings) - 1) ); -+ sizeThings[i].width = val; -+ sizeThings[i].height = val; -+ } -+ -+ setupDone = TRUE; - } - - static void eek_preview_size_request( GtkWidget* widget, GtkRequisition* req ) -@@ -100,14 +135,25 @@ static void eek_preview_size_request( Gt - gint width = 0; - gint height = 0; - EekPreview* preview = EEK_PREVIEW(widget); -- gboolean worked = gtk_icon_size_lookup( preview->_size, &width, &height ); -- if ( !worked ) { -- width = 16; -- height = 16; -+ -+ if ( !setupDone ) { -+ GtkIconSize sizes[] = { -+ GTK_ICON_SIZE_MENU, -+ GTK_ICON_SIZE_SMALL_TOOLBAR, -+ GTK_ICON_SIZE_LARGE_TOOLBAR, -+ GTK_ICON_SIZE_BUTTON, -+ GTK_ICON_SIZE_DIALOG -+ }; -+ eek_preview_set_size_mappings( G_N_ELEMENTS(sizes), sizes ); - } -+ -+ width = sizeThings[preview->_size].width; -+ height = sizeThings[preview->_size].height; -+ - if ( preview->_view == VIEW_TYPE_LIST ) { - width *= 3; - } -+ - req->width = width; - req->height = height; - } -@@ -536,10 +582,14 @@ void eek_preview_set_focus_on_click( Eek - } - } - --void eek_preview_set_details( EekPreview* preview, PreviewStyle prevstyle, ViewType view, GtkIconSize size ) -+void eek_preview_set_details( EekPreview* preview, PreviewStyle prevstyle, ViewType view, PreviewSize size ) - { - preview->_prevstyle = prevstyle; - preview->_view = view; -+ -+ if ( size > PREVIEW_SIZE_LAST ) { -+ size = PREVIEW_SIZE_LAST; -+ } - preview->_size = size; - - gtk_widget_queue_draw(GTK_WIDGET(preview)); -@@ -573,7 +623,7 @@ static void eek_preview_init( EekPreview - - preview->_prevstyle = PREVIEW_STYLE_ICON; - preview->_view = VIEW_TYPE_LIST; -- preview->_size = GTK_ICON_SIZE_BUTTON; -+ preview->_size = PREVIEW_SIZE_SMALL; - - /* - GdkColor color = {0}; -diff -urp inkscape-0.45+0.46pre2.orig/src/dialogs/eek-preview.h inkscape-0.45+0.46pre2/src/dialogs/eek-preview.h ---- inkscape-0.45+0.46pre2.orig/src/dialogs/eek-preview.h 2008-02-17 05:24:00.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/dialogs/eek-preview.h 2008-02-22 08:53:42.000000000 +0100 -@@ -20,7 +20,7 @@ - * - * The Initial Developer of the Original Code is - * Jon A. Cruz. -- * Portions created by the Initial Developer are Copyright (C) 2005 -+ * Portions created by the Initial Developer are Copyright (C) 2005-2008 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -@@ -68,6 +68,15 @@ typedef enum { - } ViewType; - - typedef enum { -+ PREVIEW_SIZE_TINY = 0, -+ PREVIEW_SIZE_SMALL, -+ PREVIEW_SIZE_MEDIUM, -+ PREVIEW_SIZE_BIG, -+ PREVIEW_SIZE_BIGGER, -+ PREVIEW_SIZE_HUGE -+} PreviewSize; -+ -+typedef enum { - PREVIEW_LINK_NONE = 0, - PREVIEW_LINK_IN = 1, - PREVIEW_LINK_OUT = 2, -@@ -93,7 +102,7 @@ struct _EekPreview - - PreviewStyle _prevstyle; - ViewType _view; -- GtkIconSize _size; -+ PreviewSize _size; - guint _linked; - }; - -@@ -108,7 +117,7 @@ struct _EekPreviewClass - GType eek_preview_get_type(void) G_GNUC_CONST; - GtkWidget* eek_preview_new(void); - --void eek_preview_set_details( EekPreview* splat, PreviewStyle prevstyle, ViewType view, GtkIconSize size ); -+void eek_preview_set_details( EekPreview* splat, PreviewStyle prevstyle, ViewType view, PreviewSize size ); - void eek_preview_set_color( EekPreview* splat, int r, int g, int b ); - - void eek_preview_set_linked( EekPreview* splat, LinkType link ); -@@ -117,6 +126,8 @@ LinkType eek_preview_get_linked( EekPrev - gboolean eek_preview_get_focus_on_click( EekPreview* preview ); - void eek_preview_set_focus_on_click( EekPreview* preview, gboolean focus_on_click ); - -+void eek_preview_set_size_mappings( guint count, GtkIconSize const* sizes ); -+ - G_END_DECLS - - -diff -urp inkscape-0.45+0.46pre2.orig/src/dialogs/swatches.cpp inkscape-0.45+0.46pre2/src/dialogs/swatches.cpp ---- inkscape-0.45+0.46pre2.orig/src/dialogs/swatches.cpp 2008-02-17 05:24:00.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/dialogs/swatches.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -503,7 +503,7 @@ void ColorItem::_colorDefChanged(void* d - } - - --Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Inkscape::IconSize size) -+Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewSize size) - { - Gtk::Widget* widget = 0; - if ( style == PREVIEW_STYLE_BLURB ) { -@@ -511,10 +511,10 @@ Gtk::Widget* ColorItem::getPreview(Previ - lbl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER); - widget = lbl; - } else { -- Glib::ustring blank(" "); -- if ( size == Inkscape::ICON_SIZE_MENU || size == Inkscape::ICON_SIZE_DECORATION ) { -- blank = " "; -- } -+// Glib::ustring blank(" "); -+// if ( size == Inkscape::ICON_SIZE_MENU || size == Inkscape::ICON_SIZE_DECORATION ) { -+// blank = " "; -+// } - - GtkWidget* eekWidget = eek_preview_new(); - EekPreview * preview = EEK_PREVIEW(eekWidget); -@@ -522,7 +522,7 @@ Gtk::Widget* ColorItem::getPreview(Previ - - eek_preview_set_color( preview, (def.getR() << 8) | def.getR(), (def.getG() << 8) | def.getG(), (def.getB() << 8) | def.getB()); - -- eek_preview_set_details( preview, (::PreviewStyle)style, (::ViewType)view, (::GtkIconSize)size ); -+ eek_preview_set_details( preview, (::PreviewStyle)style, (::ViewType)view, (::PreviewSize)size ); - eek_preview_set_linked( preview, (LinkType)((_linkSrc ? PREVIEW_LINK_IN:0) - | (_listeners.empty() ? 0:PREVIEW_LINK_OUT) - | (_isLive ? PREVIEW_LINK_OTHER:0)) ); -diff -urp inkscape-0.45+0.46pre2.orig/src/dialogs/swatches.h inkscape-0.45+0.46pre2/src/dialogs/swatches.h ---- inkscape-0.45+0.46pre2.orig/src/dialogs/swatches.h 2008-02-17 05:24:01.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/dialogs/swatches.h 2008-02-22 08:53:42.000000000 +0100 -@@ -43,7 +43,7 @@ public: - virtual ColorItem &operator=(ColorItem const &other); - virtual Gtk::Widget* getPreview(PreviewStyle style, - ViewType view, -- Inkscape::IconSize size); -+ ::PreviewSize size); - void buttonClicked(bool secondary = false); - - ColorDef def; -diff -urp inkscape-0.45+0.46pre2.orig/src/inkscape-stock.cpp inkscape-0.45+0.46pre2/src/inkscape-stock.cpp ---- inkscape-0.45+0.46pre2.orig/src/inkscape-stock.cpp 2008-02-17 05:23:47.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/inkscape-stock.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -23,6 +23,8 @@ - - #include "gtk/gtkiconfactory.h" - -+#include "widgets/icon.h" -+#include "ui/widget/panel.h" - - void - inkscape_gtk_stock_init() { -@@ -31,6 +33,12 @@ inkscape_gtk_stock_init() { - if (stock_initialized) - return; - -+ // Ensure icon internal sizes get set up: -+ sp_icon_get_phys_size(GTK_ICON_SIZE_MENU); -+ -+ // And also prepare the swatches. -+ Inkscape::UI::Widget::Panel::prep(); -+ - GtkIconFactory *icon_factory = gtk_icon_factory_new(); - /* todo: Should we simply remove this file now that we're no longer - * calling gtk_icon_factory_add here? */ diff -urp inkscape-0.45+0.46pre2.orig/src/preferences-skeleton.h inkscape-0.45+0.46pre2/src/preferences-skeleton.h --- inkscape-0.45+0.46pre2.orig/src/preferences-skeleton.h 2008-02-17 05:24:14.000000000 +0100 +++ inkscape-0.45+0.46pre2/src/preferences-skeleton.h 2008-02-22 09:34:12.000000000 +0100 @@ -262,287 +21,3 @@ " \n" "\n" " --#include "icon-size.h" -+#include "../dialogs/eek-preview.h" - - namespace Inkscape { - namespace UI { -@@ -40,7 +40,7 @@ class Previewable - public: - // TODO need to add some nice parameters - virtual ~Previewable() {} -- virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, Inkscape::IconSize size ) = 0; -+ virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, ::PreviewSize size ) = 0; - }; - - -diff -urp inkscape-0.45+0.46pre2.orig/src/ui/previewfillable.h inkscape-0.45+0.46pre2/src/ui/previewfillable.h ---- inkscape-0.45+0.46pre2.orig/src/ui/previewfillable.h 2008-02-17 05:24:52.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/ui/previewfillable.h 2008-02-22 08:53:42.000000000 +0100 -@@ -14,7 +14,7 @@ - - - #include "previewable.h" --#include "../icon-size.h" -+#include "../dialogs/eek-preview.h" - - namespace Inkscape { - namespace UI { -@@ -27,9 +27,9 @@ public: - virtual void addPreview( Previewable* preview ) = 0; - virtual void freezeUpdates() = 0; - virtual void thawUpdates() = 0; -- virtual void setStyle( Inkscape::IconSize size, ViewType type) = 0; -+ virtual void setStyle( ::PreviewSize size, ViewType type) = 0; - virtual void setOrientation( Gtk::AnchorType how ) = 0; -- virtual Inkscape::IconSize getPreviewSize() const = 0; -+ virtual ::PreviewSize getPreviewSize() const = 0; - virtual ViewType getPreviewType() const = 0; - virtual void setWrap( bool b ) = 0; - virtual bool getWrap() const = 0; -diff -urp inkscape-0.45+0.46pre2.orig/src/ui/previewholder.cpp inkscape-0.45+0.46pre2/src/ui/previewholder.cpp ---- inkscape-0.45+0.46pre2.orig/src/ui/previewholder.cpp 2008-02-17 05:24:52.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/ui/previewholder.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -35,7 +35,7 @@ PreviewHolder::PreviewHolder() : - _prefCols(0), - _updatesFrozen(false), - _anchor(Gtk::ANCHOR_CENTER), -- _baseSize(Inkscape::ICON_SIZE_MENU), -+ _baseSize(PREVIEW_SIZE_SMALL), - _view(VIEW_TYPE_LIST), - _wrap(false) - { -@@ -124,7 +124,7 @@ void PreviewHolder::thawUpdates() - rebuildUI(); - } - --void PreviewHolder::setStyle( Inkscape::IconSize size, ViewType view ) -+void PreviewHolder::setStyle( ::PreviewSize size, ViewType view ) - { - if ( size != _baseSize || view != _view ) { - _baseSize = size; -@@ -238,7 +238,7 @@ void PreviewHolder::calcGridSize( const - width = w2; - } - } else { -- width = (_baseSize == Inkscape::ICON_SIZE_MENU || _baseSize == Inkscape::ICON_SIZE_DECORATION) ? COLUMNS_FOR_SMALL : COLUMNS_FOR_LARGE; -+ width = (_baseSize == PREVIEW_SIZE_SMALL || _baseSize == PREVIEW_SIZE_TINY) ? COLUMNS_FOR_SMALL : COLUMNS_FOR_LARGE; - if ( _prefCols > 0 ) { - width = _prefCols; - } -diff -urp inkscape-0.45+0.46pre2.orig/src/ui/previewholder.h inkscape-0.45+0.46pre2/src/ui/previewholder.h ---- inkscape-0.45+0.46pre2.orig/src/ui/previewholder.h 2008-02-17 05:24:52.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/ui/previewholder.h 2008-02-22 08:53:42.000000000 +0100 -@@ -17,7 +17,7 @@ - #include - #include - #include "previewfillable.h" --#include "../icon-size.h" -+#include "../dialogs/eek-preview.h" - - namespace Inkscape { - namespace UI { -@@ -32,11 +32,11 @@ public: - virtual void addPreview( Previewable* preview ); - virtual void freezeUpdates(); - virtual void thawUpdates(); -- virtual void setStyle( Inkscape::IconSize size, ViewType view ); -+ virtual void setStyle( ::PreviewSize size, ViewType view ); - virtual void setOrientation( Gtk::AnchorType how ); - virtual int getColumnPref() const { return _prefCols; } - virtual void setColumnPref( int cols ); -- virtual Inkscape::IconSize getPreviewSize() const { return _baseSize; } -+ virtual ::PreviewSize getPreviewSize() const { return _baseSize; } - virtual ViewType getPreviewType() const { return _view; } - virtual void setWrap( bool b ); - virtual bool getWrap() const { return _wrap; } -@@ -56,7 +56,7 @@ private: - int _prefCols; - bool _updatesFrozen; - Gtk::AnchorType _anchor; -- Inkscape::IconSize _baseSize; -+ ::PreviewSize _baseSize; - ViewType _view; - bool _wrap; - }; -diff -urp inkscape-0.45+0.46pre2.orig/src/ui/widget/panel.cpp inkscape-0.45+0.46pre2/src/ui/widget/panel.cpp ---- inkscape-0.45+0.46pre2.orig/src/ui/widget/panel.cpp 2008-02-17 05:24:46.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/ui/widget/panel.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -27,6 +27,7 @@ - #include "prefs-utils.h" - #include "desktop-handles.h" - #include "inkscape.h" -+#include "dialogs/eek-preview.h" - - namespace Inkscape { - namespace UI { -@@ -37,6 +38,19 @@ static const int PANEL_SETTING_MODE = 1; - static const int PANEL_SETTING_WRAP = 2; - static const int PANEL_SETTING_NEXTFREE = 3; - -+ -+void Panel::prep() { -+ GtkIconSize sizes[] = { -+ static_cast(Inkscape::ICON_SIZE_DECORATION), -+ GTK_ICON_SIZE_MENU, -+ GTK_ICON_SIZE_SMALL_TOOLBAR, -+ GTK_ICON_SIZE_BUTTON, -+ GTK_ICON_SIZE_DND, // Not used by options, but included to make the last size larger -+ GTK_ICON_SIZE_DIALOG -+ }; -+ eek_preview_set_size_mappings( G_N_ELEMENTS(sizes), sizes ); -+} -+ - /** - * Construct a Panel - */ -@@ -79,7 +93,7 @@ void Panel::_init() - - guint panel_size = 0; - if (_prefs_path) { -- panel_size = prefs_get_int_attribute_limited( _prefs_path, "panel_size", 1, 0, 10 ); -+ panel_size = prefs_get_int_attribute_limited( _prefs_path, "panel_size", 1, 0, static_cast(PREVIEW_SIZE_HUGE) ); - } - - guint panel_mode = 0; -@@ -257,7 +271,7 @@ void Panel::restorePanelPrefs() - { - guint panel_size = 0; - if (_prefs_path) { -- panel_size = prefs_get_int_attribute_limited(_prefs_path, "panel_size", 1, 0, 10); -+ panel_size = prefs_get_int_attribute_limited(_prefs_path, "panel_size", 1, 0, static_cast(PREVIEW_SIZE_HUGE)); - } - guint panel_mode = 0; - if (_prefs_path) { -@@ -297,27 +311,27 @@ void Panel::_bounceCall(int i, int j) - switch (j) { - case 0: - { -- _fillable->setStyle(Inkscape::ICON_SIZE_DECORATION, curr_type); -+ _fillable->setStyle(::PREVIEW_SIZE_TINY, curr_type); - } - break; - case 1: - { -- _fillable->setStyle(Inkscape::ICON_SIZE_MENU, curr_type); -+ _fillable->setStyle(::PREVIEW_SIZE_SMALL, curr_type); - } - break; - case 2: - { -- _fillable->setStyle(Inkscape::ICON_SIZE_SMALL_TOOLBAR, curr_type); -+ _fillable->setStyle(::PREVIEW_SIZE_MEDIUM, curr_type); - } - break; - case 3: - { -- _fillable->setStyle(Inkscape::ICON_SIZE_BUTTON, curr_type); -+ _fillable->setStyle(::PREVIEW_SIZE_BIG, curr_type); - } - break; - case 4: - { -- _fillable->setStyle(Inkscape::ICON_SIZE_DIALOG, curr_type); -+ _fillable->setStyle(::PREVIEW_SIZE_HUGE, curr_type); - } - break; - default: -@@ -330,7 +344,7 @@ void Panel::_bounceCall(int i, int j) - prefs_set_int_attribute (_prefs_path, "panel_mode", j); - } - if (_fillable) { -- Inkscape::IconSize curr_size = _fillable->getPreviewSize(); -+ ::PreviewSize curr_size = _fillable->getPreviewSize(); - switch (j) { - case 0: - { -diff -urp inkscape-0.45+0.46pre2.orig/src/ui/widget/panel.h inkscape-0.45+0.46pre2/src/ui/widget/panel.h ---- inkscape-0.45+0.46pre2.orig/src/ui/widget/panel.h 2008-02-17 05:24:48.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/ui/widget/panel.h 2008-02-22 08:53:42.000000000 +0100 -@@ -38,8 +38,10 @@ namespace Widget { - class Panel : public Gtk::VBox { - - public: -+ static void prep(); -+ - virtual ~Panel(); -- Panel(Glib::ustring const &label = "", gchar const *prefs_path = 0, -+ Panel(Glib::ustring const &label = "", gchar const *prefs_path = 0, - int verb_num = 0, Glib::ustring const &apply_label = "", - bool menu_desired = false); - -@@ -57,7 +59,7 @@ public: - - virtual void setDesktop(SPDesktop *desktop); - SPDesktop *getDesktop() { return _desktop; } -- -+ - /** Signal accessors */ - virtual sigc::signal &signalResponse(); - virtual sigc::signal &signalPresent(); -diff -urp inkscape-0.45+0.46pre2.orig/src/widgets/icon.cpp inkscape-0.45+0.46pre2/src/widgets/icon.cpp ---- inkscape-0.45+0.46pre2.orig/src/widgets/icon.cpp 2008-02-17 05:24:21.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/widgets/icon.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -59,8 +59,6 @@ static guchar *sp_icon_image_load_svg(gc - - static guchar *sp_icon_image_load(SPIcon *icon, gchar const *name); - --static int sp_icon_get_phys_size(int size); -- - static void sp_icon_overlay_pixels( guchar *px, int width, int height, int stride, - unsigned r, unsigned g, unsigned b ); - -@@ -397,7 +395,7 @@ static void injectCustomSize() - - } - --static int sp_icon_get_phys_size(int size) -+int sp_icon_get_phys_size(int size) - { - static bool init = false; - static int lastSys[Inkscape::ICON_SIZE_DECORATION + 1]; -@@ -542,7 +540,7 @@ static void sp_icon_paint(SPIcon *icon, - } - - static guchar * --sp_icon_image_load_pixmap(gchar const *name, unsigned lsize, unsigned psize) -+sp_icon_image_load_pixmap(gchar const *name, unsigned /*lsize*/, unsigned psize) - { - gchar *path; - guchar *px; -@@ -762,7 +760,7 @@ static guchar *get_cached_pixels(Glib::u - } - - static guchar *load_svg_pixels(gchar const *name, -- unsigned lsize, unsigned psize) -+ unsigned /*lsize*/, unsigned psize) - { - SPDocument *doc = NULL; - NRArenaItem *root = NULL; -@@ -949,7 +947,7 @@ static void addPreRender( Inkscape::Icon - pendingRenders.push(preRenderItem(lsize, name)); - } - --gboolean icon_prerender_task(gpointer data) { -+gboolean icon_prerender_task(gpointer /*data*/) { - if (!pendingRenders.empty()) { - preRenderItem single=pendingRenders.front(); - pendingRenders.pop(); -diff -urp inkscape-0.45+0.46pre2.orig/src/widgets/icon.h inkscape-0.45+0.46pre2/src/widgets/icon.h ---- inkscape-0.45+0.46pre2.orig/src/widgets/icon.h 2008-02-17 05:24:22.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/widgets/icon.h 2008-02-22 08:53:42.000000000 +0100 -@@ -48,5 +48,7 @@ GtkWidget *sp_icon_new( Inkscape::IconSi - Gtk::Widget *sp_icon_get_icon( const Glib::ustring &oid, Inkscape::IconSize size = Inkscape::ICON_SIZE_BUTTON ); - - void sp_icon_fetch_pixbuf( SPIcon *icon ); -+int sp_icon_get_phys_size(int size); -+ - - #endif // SEEN_SP_ICON_H Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- inkscape.spec 22 Feb 2008 08:39:23 -0000 1.48 +++ inkscape.spec 12 Mar 2008 13:20:16 -0000 1.49 @@ -1,12 +1,12 @@ Name: inkscape Version: 0.46 -Release: 0.2.pre2%{?dist} +Release: 0.2.pre3%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ -Source0: http://download.sourceforge.net/inkscape/inkscape-0.45+0.46pre2.tar.bz2 +Source0: http://download.sourceforge.net/inkscape/inkscape-0.45+0.46pre3.tar.bz2 Patch0: inkscape-16571-cxxinclude.patch Patch1: inkscape-0.45.1-desktop.patch Patch2: inkscape-0.46pre2-icons.patch @@ -61,7 +61,7 @@ %prep -%setup -q -n %{name}-0.45+0.46pre2 +%setup -q -n %{name}-0.45+0.46pre3 %patch0 -p1 -b .cxxinclude %patch1 -p1 -b .desktop %patch2 -p1 -b .icons @@ -124,6 +124,9 @@ %changelog +* Wed Mar 12 2008 Lubomir Kundrak - 0.46-0.2.pre3 +- Probably last prerelease? + * Fri Feb 22 2008 Lubomir Kundrak - 0.46-0.2.pre2 - Panel icon sizes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 21 Feb 2008 22:39:11 -0000 1.14 +++ sources 12 Mar 2008 13:20:16 -0000 1.15 @@ -1 +1 @@ -b08fd4821c9f44fdab1b2d7ca4e9531d inkscape-0.45+0.46pre2.tar.bz2 +0daed93fbf24da295499d844b54be621 inkscape-0.45+0.46pre3.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 13:23:04 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 12 Mar 2008 13:23:04 GMT Subject: rpms/kbackup/devel kbackup.spec,1.14,1.15 Message-ID: <200803121323.m2CDN4A6032105@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/kbackup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32079/devel Modified Files: kbackup.spec Log Message: * Wed Mar 12 2008 Kevin Kofler 0.5.3-3 - BR kdelibs3-devel instead of kdelibs-devel (#434062) Index: kbackup.spec =================================================================== RCS file: /cvs/pkgs/rpms/kbackup/devel/kbackup.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kbackup.spec 19 Feb 2008 01:39:27 -0000 1.14 +++ kbackup.spec 12 Mar 2008 13:22:30 -0000 1.15 @@ -1,6 +1,6 @@ Name: kbackup Version: 0.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Back up your data in a simple, user friendly way Summary(fr): Sauvegarder vos donn??es de mani??re simple et conviviale @@ -11,7 +11,7 @@ Patch0: %{name}-0.5.3.desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, gettext, kdelibs-devel +BuildRequires: desktop-file-utils, gettext, kdelibs3-devel %description KBackup is a program that lets you back up any directories or files, @@ -100,6 +100,9 @@ %{_datadir}/mimelnk/text/x-kbp.desktop %changelog +* Wed Mar 12 2008 Kevin Kofler 0.5.3-3 +- BR kdelibs3-devel instead of kdelibs-devel (#434062) + * Mon Feb 18 2008 Fedora Release Engineering - 0.5.3-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 12 13:25:34 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 12 Mar 2008 13:25:34 GMT Subject: rpms/pikdev/devel pikdev.spec,1.10,1.11 Message-ID: <200803121325.m2CDPYMG032220@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/pikdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32192/devel Modified Files: pikdev.spec Log Message: * Wed Mar 12 2008 Kevin Kofler 0.9.2-5 - BR kdelibs3-devel instead of kdelibs-devel (#434063) Index: pikdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/pikdev/devel/pikdev.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- pikdev.spec 19 Feb 2008 01:41:23 -0000 1.10 +++ pikdev.spec 12 Mar 2008 13:25:03 -0000 1.11 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.9.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -13,7 +13,7 @@ Source3: LISEZMOI.Fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, kdelibs-devel +BuildRequires: desktop-file-utils, kdelibs3-devel Requires: gputils @@ -103,6 +103,9 @@ %{_datadir}/icons/* %changelog +* Wed Mar 12 2008 Kevin Kofler 0.9.2-5 +- BR kdelibs3-devel instead of kdelibs-devel (#434063) + * Mon Feb 18 2008 Fedora Release Engineering - 0.9.2-4 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 12 13:27:56 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 12 Mar 2008 13:27:56 GMT Subject: rpms/pikloops/devel pikloops.spec,1.9,1.10 Message-ID: <200803121327.m2CDRu32032349@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/pikloops/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32322/devel Modified Files: pikloops.spec Log Message: * Wed Mar 12 2008 Kevin Kofler 0.2.5-3 - BR kdelibs3-devel instead of kdelibs-devel (#434064) Index: pikloops.spec =================================================================== RCS file: /cvs/pkgs/rpms/pikloops/devel/pikloops.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pikloops.spec 19 Feb 2008 01:42:19 -0000 1.9 +++ pikloops.spec 12 Mar 2008 13:27:25 -0000 1.10 @@ -1,6 +1,6 @@ Name: pikloops Version: 0.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Code generator for PIC delays Summary(fr): G??n??rateur de code de temporisation pour PIC @@ -10,7 +10,7 @@ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, gettext, kdelibs-devel +BuildRequires: desktop-file-utils, gettext, kdelibs3-devel %description PiKLoop generate for you code to create delays for Microchip PIC @@ -81,6 +81,9 @@ %{_datadir}/icons/crystalsvg/*/apps/%{name}.png %changelog +* Wed Mar 12 2008 Kevin Kofler 0.2.5-3 +- BR kdelibs3-devel instead of kdelibs-devel (#434064) + * Mon Feb 18 2008 Fedora Release Engineering - 0.2.5-2 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 12 13:35:41 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Wed, 12 Mar 2008 13:35:41 GMT Subject: rpms/perl-PDL/F-7 perl-PDL-2.4.3-test_hdf.patch, NONE, 1.1 perl-PDL.spec, 1.32, 1.33 Message-ID: <200803121335.m2CDZfFC032574@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl-PDL/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32536 Modified Files: perl-PDL.spec Added Files: perl-PDL-2.4.3-test_hdf.patch Log Message: - add patch for switching off two test. - #398571 miss one file, rebuild fixed it. perl-PDL-2.4.3-test_hdf.patch: --- NEW FILE perl-PDL-2.4.3-test_hdf.patch --- diff -up PDL-2.4.3/t/hdf_sd.t.try PDL-2.4.3/t/hdf_sd.t --- PDL-2.4.3/t/hdf_sd.t.try 2006-08-09 00:05:37.000000000 +0200 +++ PDL-2.4.3/t/hdf_sd.t 2008-02-26 09:12:37.000000000 +0100 @@ -20,7 +20,7 @@ BEGIN } else { - plan tests => 32; + plan tests => 30; } } @@ -247,14 +247,14 @@ SKIP: { } # TEST 30 & 31: -my $dataset3d_test = $hdf->SDget( "CHUNK_3D" ); -$good = $dataset3d_test->nelem() > 0; -ok( $good ); -$do_skip = $good ? '' : 'Skip if failed previous test!'; -SKIP: { - skip( "Previous test failed!", 1 ) if $do_skip; - ok( tapprox( $dataset3d, $dataset3d_test ) ); -} +#my $dataset3d_test = $hdf->SDget( "CHUNK_3D" ); +#$good = $dataset3d_test->nelem() > 0; +#ok( $good ); +#$do_skip = $good ? '' : 'Skip if failed previous test!'; +#SKIP: { +# skip( "Previous test failed!", 1 ) if $do_skip; +# ok( tapprox( $dataset3d, $dataset3d_test ) ); +#} $hdf->close(); undef($hdf); @@ -294,8 +294,17 @@ foreach my $dataset ( $$H{SD}->SDgetvari print "\t\t\t$dataset:$locattr = $curattr\n"; } } - -print ">>VData :\n"; + +# TEST 32: +$H->close(); +ok( 1 ); + +# Remove the testfile: +unlink( $testfile ); + +exit(0); + +=print ">>VData :\n"; foreach my $Vname ( $$H{VS}->VSgetnames() ) { if( !$$H{VS}->VSisattr($Vname) ) Index: perl-PDL.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-PDL/F-7/perl-PDL.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- perl-PDL.spec 18 Feb 2008 22:26:03 -0000 1.32 +++ perl-PDL.spec 12 Mar 2008 13:34:50 -0000 1.33 @@ -1,6 +1,6 @@ Name: perl-PDL Version: 2.4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Perl Data Language Group: Development/Libraries @@ -15,6 +15,7 @@ Patch5: perl-PDL-2.4.3-hdf.patch Patch6: perl-PDL-2.4.3-Xext.patch Patch7: perl-PDL-2.4.3-fortran.patch +Patch8: perl-PDL-2.4.3-test_hdf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -57,6 +58,7 @@ %patch5 -p1 -b .hdf %patch6 -p1 -b .Xext %patch7 -p1 -b .fortran +%patch8 -p1 -b .test_hdf # Provides: explicitly filter perl(Inline) cat <<__EOF__ > %{name}-findperlprovides @@ -137,6 +139,10 @@ %changelog +* Wed Mar 12 2008 Marcela Maslanova - 2.4.3-5 +- add patch for switching off two test. +- #398571 miss one file, rebuild fixed it. + * Wed Aug 15 2007 Robin Norwood - 2.4-3-4 - Updated perl-PDL-2.4.3-test.patch from Orion to fix ppc and ppc64 - Fixed license string From fedora-extras-commits at redhat.com Wed Mar 12 13:52:36 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 12 Mar 2008 13:52:36 GMT Subject: rpms/pigment-python/F-8 .cvsignore, 1.2, 1.3 pigment-python.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200803121352.m2CDqavf000698@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/pigment-python/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv665 Modified Files: .cvsignore pigment-python.spec sources Log Message: Update to 0.3.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pigment-python/F-8/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Feb 2008 23:31:44 -0000 1.2 +++ .cvsignore 12 Mar 2008 13:52:05 -0000 1.3 @@ -1 +1 @@ -pigment-python-0.3.2.tar.gz +pigment-python-0.3.3.tar.gz Index: pigment-python.spec =================================================================== RCS file: /cvs/extras/rpms/pigment-python/F-8/pigment-python.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pigment-python.spec 23 Feb 2008 23:31:44 -0000 1.1 +++ pigment-python.spec 12 Mar 2008 13:52:05 -0000 1.2 @@ -3,8 +3,8 @@ Summary: Python bindings to the Pigment Media Center Toolkit Name: pigment-python -Version: 0.3.2 -Release: 2%{?dist} +Version: 0.3.3 +Release: 1%{?dist} License: LGPLv2+ Group: Applications/Multimedia URL: http://elisa.fluendo.com/ @@ -12,9 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gstreamer-python Requires: pygtk2 -Requires: pigment >= 0.3.4 +Requires: pigment >= 0.3.5 BuildRequires: glib2-devel -BuildRequires: pigment-devel >= 0.3.4 +BuildRequires: pigment-devel >= 0.3.5 BuildRequires: python-devel BuildRequires: pygtk2-devel BuildRequires: gstreamer-devel @@ -62,9 +62,13 @@ %doc AUTHORS ChangeLog COPYING README TODO _tmp/examples/ %{python_sitelib}/pgm/ %{python_sitearch}/_pgm*.so +%{_datadir}/pigment-python/ %changelog +* Tue Mar 4 2008 Matthias Saou 0.3.3-1 +- Update to 0.3.3. + * Wed Feb 13 2008 Matthias Saou 0.3.2-2 - Add INSTALL="install -p" to the make install line, to preserve timestamps. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pigment-python/F-8/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Feb 2008 23:31:44 -0000 1.2 +++ sources 12 Mar 2008 13:52:05 -0000 1.3 @@ -1 +1 @@ -9d19b1a9c7055e551df5a0bd7cc0421c pigment-python-0.3.2.tar.gz +bfbc1976812f07436b57200574369926 pigment-python-0.3.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 13:52:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:52:44 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121355.m2CDtnQN020817@bastion.fedora.phx.redhat.com> Jesse Keating (jkeating) has set the approveacls acl on Miro (Fedora devel) to Approved for Alex Lancaster (alexlan) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:52:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:52:46 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121355.m2CDtqd9020842@bastion.fedora.phx.redhat.com> Jesse Keating (jkeating) has set the approveacls acl on Miro (Fedora 7) to Approved for Alex Lancaster (alexlan) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:52:49 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:52:49 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121355.m2CDtqdD020842@bastion.fedora.phx.redhat.com> Jesse Keating (jkeating) has set the approveacls acl on Miro (Fedora 8) to Approved for Alex Lancaster (alexlan) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:54:25 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Wed, 12 Mar 2008 13:54:25 GMT Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.8, 1.9 java-1.6.0-openjdk.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200803121354.m2CDsPQa000787@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv757 Modified Files: .cvsignore java-1.6.0-openjdk.spec sources Log Message: * Wed Mar 12 2008 Lillian Angel - 1:1.6.0.0-0.3.b06 - Updated release. - Updated mauvedate to 2008-03-11. - Updated accessmajorver to 1.22. - Updated accessminorver to 0. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Mar 2008 20:08:44 -0000 1.8 +++ .cvsignore 12 Mar 2008 13:53:55 -0000 1.9 @@ -1,5 +1,5 @@ -java-access-bridge-1.19.2.tar.gz -mauve-2007-09-12.tar.gz openjdk-6-src-b06-28_feb_2008-fedora.tar.gz mauve_tests icedtea6-1.0-20557399a0f6beca21efc8747145b7a9d48ad7f5.tar.gz +java-access-bridge-1.22.0.tar.gz +mauve-2008-03-11.tar.gz Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- java-1.6.0-openjdk.spec 11 Mar 2008 20:08:44 -0000 1.7 +++ java-1.6.0-openjdk.spec 12 Mar 2008 13:53:55 -0000 1.8 @@ -10,8 +10,8 @@ %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ -%define accessmajorver 1.19 -%define accessminorver 2 +%define accessmajorver 1.22 +%define accessminorver 0 %define accessver %{accessmajorver}.%{accessminorver} %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/ @@ -19,7 +19,7 @@ %define openjdkurl %{openjdkurlbase}%{openjdkver}/ %define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz -%define mauvedate 2007-09-12 +%define mauvedate 2008-03-11 %ifarch x86_64 %define archbuild amd64 @@ -101,7 +101,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.2.%{openjdkver}%{?dist} +Release: 0.3.%{openjdkver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -782,6 +782,12 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Wed Mar 12 2008 Lillian Angel - 1:1.6.0.0-0.3.b06 +- Updated release. +- Updated mauvedate to 2008-03-11. +- Updated accessmajorver to 1.22. +- Updated accessminorver to 0. + * Tue Mar 11 2008 Lillian Angel - 1:1.6.0.0-0.2.b06 - Updated snapshot. - Changed icedteaopt to use --with-openjdk instead of --with-icedtea. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Mar 2008 20:08:44 -0000 1.7 +++ sources 12 Mar 2008 13:53:55 -0000 1.8 @@ -1,5 +1,5 @@ -ce13ee63357a699ad327d362230cc2f5 java-access-bridge-1.19.2.tar.gz -abee6aad1525bee3d45a13d0adf859c9 mauve-2007-09-12.tar.gz 7a0c160c03012cd40957a7a112e25038 mauve_tests e24e99eeae81f32fa7d958fc75757b83 openjdk-6-src-b06-28_feb_2008-fedora.tar.gz bf20d624be29975824331e523484cbeb icedtea6-1.0-20557399a0f6beca21efc8747145b7a9d48ad7f5.tar.gz +11d8e6129f27792cc1b0e1a7de2ec127 java-access-bridge-1.22.0.tar.gz +079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 13:58:48 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:58:48 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121401.m2CE1smb021141@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchbugzilla acl on Miro (Fedora devel) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:58:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:58:51 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121401.m2CE1u86021162@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchcommits acl on Miro (Fedora devel) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:58:56 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:58:56 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121402.m2CE1smf021141@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the commit acl on Miro (Fedora devel) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:59:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:59:01 +0000 Subject: [pkgdb] Miro had groupAcl changed Message-ID: <200803121402.m2CE1smi021141@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the commit acl on Miro (Fedora devel) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:59:05 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:59:05 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121402.m2CE1u8A021162@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchbugzilla acl on Miro (Fedora 7) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:59:07 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:59:07 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121402.m2CE2Dco021261@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchcommits acl on Miro (Fedora 7) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:59:11 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:59:11 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121402.m2CE2HSA021283@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the commit acl on Miro (Fedora 7) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:59:17 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:59:17 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121402.m2CE27ZT021211@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchbugzilla acl on Miro (Fedora 8) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:59:19 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:59:19 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121402.m2CE27ZY021211@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the watchcommits acl on Miro (Fedora 8) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:59:21 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:59:21 +0000 Subject: [pkgdb] Miro had acl change status Message-ID: <200803121402.m2CE2Dcs021261@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the commit acl on Miro (Fedora 8) to Approved for Michel Alexandre Salim (salimma) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 13:59:23 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 13:59:23 +0000 Subject: [pkgdb] Miro had groupAcl changed Message-ID: <200803121402.m2CE2Dcw021261@bastion.fedora.phx.redhat.com> Alex Lancaster (alexlan) has set the commit acl on Miro (Fedora 8) to Approved for cvsextras To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/Miro From fedora-extras-commits at redhat.com Wed Mar 12 14:07:28 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 12 Mar 2008 14:07:28 GMT Subject: rpms/pigment-python/devel pigment-python.spec,1.2,1.3 Message-ID: <200803121407.m2CE7SnR007210@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/pigment-python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7171 Modified Files: pigment-python.spec Log Message: Add python build requirement (not included by default). Index: pigment-python.spec =================================================================== RCS file: /cvs/extras/rpms/pigment-python/devel/pigment-python.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pigment-python.spec 4 Mar 2008 15:16:02 -0000 1.2 +++ pigment-python.spec 12 Mar 2008 14:06:57 -0000 1.3 @@ -15,7 +15,7 @@ Requires: pigment >= 0.3.5 BuildRequires: glib2-devel BuildRequires: pigment-devel >= 0.3.5 -BuildRequires: python-devel +BuildRequires: python, python-devel BuildRequires: pygtk2-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel @@ -68,6 +68,7 @@ %changelog * Tue Mar 4 2008 Matthias Saou 0.3.3-1 - Update to 0.3.3. +- Add python build requirement (not included by default). * Wed Feb 13 2008 Matthias Saou 0.3.2-2 - Add INSTALL="install -p" to the make install line, to preserve timestamps. From fedora-extras-commits at redhat.com Wed Mar 12 14:11:57 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 12 Mar 2008 14:11:57 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1448,1.1449 Message-ID: <200803121411.m2CEBvLg007368@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7348 Modified Files: openoffice.org.spec Log Message: quote it up Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1448 retrieving revision 1.1449 diff -u -r1.1448 -r1.1449 --- openoffice.org.spec 11 Mar 2008 13:20:11 -0000 1.1448 +++ openoffice.org.spec 12 Mar 2008 14:11:23 -0000 1.1449 @@ -1572,9 +1572,9 @@ chmod u+w *.desktop for file in *.desktop; do # rhbz#156067 don't version the icons - sed -i -e s/$ICONPRODUCTVERSION//g $file + sed -i -e "s/$ICONPRODUCTVERSION//g" $file # rhbz#156677 remove the version from Name= - sed -i -e s/$LONGICONPRODUCTVERSION //g $file + sed -i -e "s/$LONGICONPRODUCTVERSION //g" $file done echo "StartupNotify=true" >> base.desktop echo "TryExec=oobase" >> base.desktop From fedora-extras-commits at redhat.com Wed Mar 12 14:14:22 2008 From: fedora-extras-commits at redhat.com (Josef Kubin (jkubin)) Date: Wed, 12 Mar 2008 14:14:22 GMT Subject: rpms/xyz-gallery/devel xyz-gallery.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803121414.m2CEEMJT007450@cvs-int.fedora.redhat.com> Author: jkubin Update of /cvs/pkgs/rpms/xyz-gallery/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7421/devel Modified Files: .cvsignore sources Added Files: xyz-gallery.spec Log Message: Initial import --- NEW FILE xyz-gallery.spec --- Name: xyz-gallery Version: 0.1 Release: 1%{?dist} Summary: A simple Perl script for creation image galleries with JavaScript viewer Group: Applications/Publishing License: GPLv3 URL: http://people.redhat.com/jkubin/xyz Source0: http://people.redhat.com/jkubin/xyz/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description This package provides a tool for processing images from digital cameras. %prep %setup -q -n %{name}-%{version} %build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} cp xyz $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} cp files/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ cp xyz.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_datadir}/%{name}-%{version} %{_bindir}/* %{_mandir}/man1/xyz.1* %doc COPYING %changelog * Tue Mar 11 2008 Josef Kubin 0.1-1 - Released * Tue Feb 12 2008 Lubomir Kundrak 0-9 - Major specfile tidyup * Fri Oct 12 2007 Josef Kubin 0-8 - Prerelease version - fixing bugs * Mon Aug 20 2007 Josef Kubin 0-7 - Third preliminary version - fixing bugs * Mon Aug 20 2007 Josef Kubin 0-6 - Second preliminary version * Sat Jul 14 2007 Josef Kubin 0-5 - Preliminary version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xyz-gallery/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 06:02:46 -0000 1.1 +++ .cvsignore 12 Mar 2008 14:13:51 -0000 1.2 @@ -0,0 +1 @@ +xyz-gallery-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xyz-gallery/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 06:02:46 -0000 1.1 +++ sources 12 Mar 2008 14:13:51 -0000 1.2 @@ -0,0 +1 @@ +5ab411d00a85253662a0757bcfd6840b xyz-gallery-0.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 14:19:20 2008 From: fedora-extras-commits at redhat.com (Adam Goode (agoode)) Date: Wed, 12 Mar 2008 14:19:20 GMT Subject: rpms/nip2/devel .cvsignore, 1.8, 1.9 nip2.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200803121419.m2CEJKTe007666@cvs-int.fedora.redhat.com> Author: agoode Update of /cvs/extras/rpms/nip2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7627 Modified Files: .cvsignore nip2.spec sources Log Message: * Mon Mar 10 2008 Adam Goode - 7.14.0-1 - New release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nip2/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Sep 2007 03:25:28 -0000 1.8 +++ .cvsignore 12 Mar 2008 14:18:45 -0000 1.9 @@ -1 +1 @@ -nip2-7.12.5.tar.gz +nip2-7.14.0.tar.gz Index: nip2.spec =================================================================== RCS file: /cvs/extras/rpms/nip2/devel/nip2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nip2.spec 9 Feb 2008 08:27:41 -0000 1.13 +++ nip2.spec 12 Mar 2008 14:18:45 -0000 1.14 @@ -1,12 +1,12 @@ Name: nip2 -Version: 7.12.5 -Release: 4%{?dist} +Version: 7.14.0 +Release: 1%{?dist} Summary: Interactive tool for working with large images Group: Applications/Multimedia License: GPLv2+ URL: http://www.vips.ecs.soton.ac.uk/ -Source0: http://www.vips.ecs.soton.ac.uk/vips-7.12/%{name}-%{version}.tar.gz +Source0: http://www.vips.ecs.soton.ac.uk/vips-7.13/%{name}-%{version}.tar.gz Source1: nip2.desktop Patch1: nip2-7.12.0-guidedir.patch @@ -125,6 +125,9 @@ %changelog +* Mon Mar 10 2008 Adam Goode - 7.14.0-1 +- New release + * Sat Feb 9 2008 Adam Goode - 7.12.5-4 - GCC 4.3 mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/nip2/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Sep 2007 03:25:28 -0000 1.8 +++ sources 12 Mar 2008 14:18:45 -0000 1.9 @@ -1 +1 @@ -3b00b507e993ef1bd99a73111acc660b nip2-7.12.5.tar.gz +5a050267a21fb375b478383681bfcb4a nip2-7.14.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 14:28:49 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 12 Mar 2008 14:28:49 GMT Subject: rpms/ytalk/devel ytalk.spec,1.12,1.13 Message-ID: <200803121428.m2CESnFB008030@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7975 Modified Files: ytalk.spec Log Message: Testing commit access Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ytalk.spec 29 Feb 2008 07:32:05 -0000 1.12 +++ ytalk.spec 12 Mar 2008 14:28:17 -0000 1.13 @@ -1,5 +1,4 @@ Summary: A chat program for multiple users - Name: ytalk Version: 3.3.0 Release: 12%{?dist} From fedora-extras-commits at redhat.com Wed Mar 12 14:30:20 2008 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 12 Mar 2008 14:30:20 GMT Subject: rpms/pigment-python/F-8 pigment-python.spec,1.2,1.3 Message-ID: <200803121430.m2CEUKcn008128@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/pigment-python/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8103 Modified Files: pigment-python.spec Log Message: Add python build requirement (not included by default). Index: pigment-python.spec =================================================================== RCS file: /cvs/extras/rpms/pigment-python/F-8/pigment-python.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pigment-python.spec 12 Mar 2008 13:52:05 -0000 1.2 +++ pigment-python.spec 12 Mar 2008 14:29:49 -0000 1.3 @@ -15,7 +15,7 @@ Requires: pigment >= 0.3.5 BuildRequires: glib2-devel BuildRequires: pigment-devel >= 0.3.5 -BuildRequires: python-devel +BuildRequires: python, python-devel BuildRequires: pygtk2-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel @@ -68,6 +68,7 @@ %changelog * Tue Mar 4 2008 Matthias Saou 0.3.3-1 - Update to 0.3.3. +- Add python build requirement (not included by default). * Wed Feb 13 2008 Matthias Saou 0.3.2-2 - Add INSTALL="install -p" to the make install line, to preserve timestamps. From fedora-extras-commits at redhat.com Wed Mar 12 14:35:27 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 14:35:27 GMT Subject: rpms/glibmm24/devel glibmm.spec,1.35,1.36 Message-ID: <200803121435.m2CEZR07008390@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8364 Modified Files: glibmm.spec Log Message: Removed devhelp book for now, is linked from gtkmm page anyways. disabled fulldocs Index: glibmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- glibmm.spec 12 Mar 2008 06:27:59 -0000 1.35 +++ glibmm.spec 12 Mar 2008 14:34:49 -0000 1.36 @@ -36,7 +36,7 @@ %build -%configure %{!?_with_static: --disable-static} +%configure --disable-fulldocs %{!?_with_static: --disable-static} make %{?_smp_mflags} @@ -50,6 +50,7 @@ # Fix documentation installation, put everything under gtk-doc mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4 %{__mv} ${RPM_BUILD_ROOT}%{_docdir}/glibmm-2.4/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/ +rm -fr $RPM_BUILD_ROOT%{_datadir}/devhelp/books/glibmm-2.4 %clean @@ -78,12 +79,13 @@ %{_libdir}/giomm-2.4 %{_libdir}/pkgconfig/*.pc %{_datadir}/aclocal/*.m4 +%doc %{_datadir}/devhelp/books/glibmm-2.4 %doc %{_datadir}/gtk-doc/html/glibmm-2.4 %changelog * Wed Mar 12 2008 Denis Leroy - 2.16.0-1 -- Update to upstream 2.16.0 +- Update to upstream 2.16.0, added --disable-fulldocs * Tue Feb 12 2008 Denis Leroy - 2.15.5-1 - Update to 2.15.5, skipping borked 2.15.4, CHANGES file gone From fedora-extras-commits at redhat.com Wed Mar 12 14:40:10 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 12 Mar 2008 14:40:10 GMT Subject: rpms/ytalk/devel ytalk.spec,1.13,1.14 Message-ID: <200803121440.m2CEeAa8008595@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8553 Modified Files: ytalk.spec Log Message: Another getnotify test Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ytalk.spec 12 Mar 2008 14:28:17 -0000 1.13 +++ ytalk.spec 12 Mar 2008 14:39:27 -0000 1.14 @@ -1,4 +1,5 @@ Summary: A chat program for multiple users + Name: ytalk Version: 3.3.0 Release: 12%{?dist} From fedora-extras-commits at redhat.com Wed Mar 12 14:52:18 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 14:52:18 GMT Subject: rpms/glibmm24/devel glibmm.spec,1.36,1.37 Message-ID: <200803121452.m2CEqIOn008991@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8968 Modified Files: glibmm.spec Log Message: devhelp fix Index: glibmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- glibmm.spec 12 Mar 2008 14:34:49 -0000 1.36 +++ glibmm.spec 12 Mar 2008 14:51:39 -0000 1.37 @@ -79,7 +79,6 @@ %{_libdir}/giomm-2.4 %{_libdir}/pkgconfig/*.pc %{_datadir}/aclocal/*.m4 -%doc %{_datadir}/devhelp/books/glibmm-2.4 %doc %{_datadir}/gtk-doc/html/glibmm-2.4 From fedora-extras-commits at redhat.com Wed Mar 12 15:06:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 12 Mar 2008 15:06:53 GMT Subject: rpms/R-RScaLAPACK/devel R-RScaLAPACK.spec,1.22,1.23 Message-ID: <200803121506.m2CF6rkT015482@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15443 Modified Files: R-RScaLAPACK.spec Log Message: try another pass to see wtf is happening Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- R-RScaLAPACK.spec 20 Feb 2008 00:57:47 -0000 1.22 +++ R-RScaLAPACK.spec 12 Mar 2008 15:06:13 -0000 1.23 @@ -9,14 +9,14 @@ Name: R-%{packname} Version: 0.5.1 -Release: 11%{?dist}.1 +Release: 11%{?dist}.2 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: MIT URL: http://cran.r-project.org/contrib Group: Applications/Engineering Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK BuildRequires: lam-libs, lam-devel, R-devel, tetex-latex, lapack-devel -BuildRequires: gcc-gfortran, blacs-devel, scalapack-devel, autoconf +BuildRequires: gcc-gfortran, blacs-devel, scalapack-devel, autoconf, automake Requires: R, scalapack, lam-libs Requires(post): R Requires(postun): R @@ -44,8 +44,13 @@ %patch3 -p1 %patch4 -p1 +# Just to see what is in the buildroot +/sbin/ldconfig -p |grep libmpi +/sbin/ldconfig -p |grep liblam + %build cd RScaLAPACK +aclocal autoconf %install @@ -74,6 +79,9 @@ %{_libdir}/R/library/%{packname}/ %changelog +* Wed Mar 12 2008 Tom "spot" Callaway - 0.5.1-11.2 +- debugging build pass + * Tue Feb 19 2008 Fedora Release Engineering - 0.5.1-11.1 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 12 15:11:04 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Wed, 12 Mar 2008 15:11:04 GMT Subject: rpms/perl/devel perl.spec,1.158,1.159 Message-ID: <200803121511.m2CFB4sM015656@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15586 Modified Files: perl.spec Log Message: - xsubpp now lives in perl-devel instead of perl. Index: perl.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- perl.spec 9 Mar 2008 01:42:40 -0000 1.158 +++ perl.spec 12 Mar 2008 15:10:25 -0000 1.159 @@ -16,7 +16,7 @@ Name: perl Version: %{perl_version} -Release: 14%{?dist} +Release: 15%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -1022,6 +1022,8 @@ %exclude %{_bindir}/perlivp %exclude %{_mandir}/man1/perlivp* %exclude %{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/*.h +%exclude %{_bindir}/xsubpp +%exclude %{_mandir}/man1/xsubpp* # suidperl %exclude %{_bindir}/suidperl @@ -1290,6 +1292,8 @@ %{_bindir}/perlivp %{_mandir}/man1/perlivp* %{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/*.h +%{_bindir}/xsubpp +%{_mandir}/man1/xsubpp* %files suidperl %defattr(-,root,root,-) @@ -1586,6 +1590,9 @@ # Old changelog entries are preserved in CVS. %changelog +* Wed Mar 12 2008 Marcela Maslanova 4:5.10.0-15 +- xsubpp now lives in perl-devel instead of perl. + * Sat Mar 8 2008 Tom "spot" Callaway 4:5.10.0-14 - back out Archive::Extract patch, causing odd test failure From fedora-extras-commits at redhat.com Wed Mar 12 15:27:16 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 15:27:16 GMT Subject: rpms/gtkmm24/devel .cvsignore, 1.21, 1.22 gtkmm.spec, 1.34, 1.35 sources, 1.23, 1.24 Message-ID: <200803121527.m2CFRGHr016209@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/gtkmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16180 Modified Files: .cvsignore gtkmm.spec sources Log Message: Update to upstream 2.12.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 29 Jan 2008 11:25:01 -0000 1.21 +++ .cvsignore 12 Mar 2008 15:26:39 -0000 1.22 @@ -1 +1 @@ -gtkmm-2.12.4.tar.bz2 +gtkmm-2.12.5.tar.bz2 Index: gtkmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gtkmm.spec 19 Feb 2008 01:14:34 -0000 1.34 +++ gtkmm.spec 12 Mar 2008 15:26:39 -0000 1.35 @@ -1,6 +1,6 @@ Name: gtkmm24 -Version: 2.12.4 -Release: 2%{?dist} +Version: 2.12.5 +Release: 1%{?dist} Summary: C++ interface for GTK2 (a GUI library for X) @@ -110,6 +110,9 @@ %changelog +* Wed Mar 12 2008 Denis Leroy - 2.12.5-1 +- Update to upstream 2.12.5 + * Mon Feb 18 2008 Fedora Release Engineering - 2.12.4-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 29 Jan 2008 11:25:02 -0000 1.23 +++ sources 12 Mar 2008 15:26:39 -0000 1.24 @@ -1 +1 @@ -a3c338218c9f10d309192ac61f025dee gtkmm-2.12.4.tar.bz2 +ca21c054d7f7bbd9c737f22e14bccf82 gtkmm-2.12.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 15:31:18 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Wed, 12 Mar 2008 15:31:18 GMT Subject: rpms/indent/devel indent-2.2.9-cdw.patch, 1.1, 1.2 indent-2.2.9-explicits.patch, 1.1, 1.2 indent-2.2.9-lcall.patch, 1.1, 1.2 indent-2.2.9-man.patch, 1.1, 1.2 indent.spec, 1.31, 1.32 indent-2.2.9-fix.patch, 1.1, NONE indent-2.2.9-gcc4.patch, 1.1, NONE indent-2.2.9-zh_TW.patch, 1.1, NONE Message-ID: <200803121531.m2CFVI6W016330@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/indent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16280 Modified Files: indent-2.2.9-cdw.patch indent-2.2.9-explicits.patch indent-2.2.9-lcall.patch indent-2.2.9-man.patch indent.spec Removed Files: indent-2.2.9-fix.patch indent-2.2.9-gcc4.patch indent-2.2.9-zh_TW.patch Log Message: - Rebase to 2.2.10 - Dropped three patches - Fix Source and URL - Clean up spec indent-2.2.9-cdw.patch: Index: indent-2.2.9-cdw.patch =================================================================== RCS file: /cvs/pkgs/rpms/indent/devel/indent-2.2.9-cdw.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- indent-2.2.9-cdw.patch 27 Jan 2006 16:42:29 -0000 1.1 +++ indent-2.2.9-cdw.patch 12 Mar 2008 15:31:03 -0000 1.2 @@ -38,15 +38,15 @@ --- indent-2.2.9/src/indent.h 2006-01-18 18:22:36.000000000 +0100 +++ indent-2.2.9-cdw/src/indent.h 2006-01-27 17:20:14.000000000 +0100 @@ -357,6 +357,9 @@ typedef struct parser_state - BOOLEAN in_decl; /* set to true when we are in a declaration + BOOLEAN in_decl; /*!< set to true when we are in a declaration * statement. The processing of braces is then * slightly different */ -+ BOOLEAN in_closing_br_while; /* set to true when we are parsing ++ BOOLEAN in_closing_br_while; /*!< set to true when we are parsing + * closing while of do {} while + * statement*/ - int in_stmt; /* set to 1 while in a stmt */ + int in_stmt; /*!< set to 1 while in a stmt */ int in_parameter_declaration; - int ind_level; /* the current indentation level in spaces */ + int ind_level; /*!< the current indentation level in spaces */ diff -burp indent-2.2.9/src/parse.c indent-2.2.9-cdw/src/parse.c --- indent-2.2.9/src/parse.c 2002-08-04 19:08:41.000000000 +0200 +++ indent-2.2.9-cdw/src/parse.c 2006-01-27 17:18:52.000000000 +0100 indent-2.2.9-explicits.patch: Index: indent-2.2.9-explicits.patch =================================================================== RCS file: /cvs/pkgs/rpms/indent/devel/indent-2.2.9-explicits.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- indent-2.2.9-explicits.patch 18 Jan 2006 17:35:44 -0000 1.1 +++ indent-2.2.9-explicits.patch 12 Mar 2008 15:31:03 -0000 1.2 @@ -9,65 +9,3 @@ process_texi (FILE * in) { char buf[1024]; -diff -Burp indent-2.2.9/src/indent.c indent-2.2.9-explicits/src/indent.c ---- indent-2.2.9/src/indent.c 2006-01-18 18:17:57.000000000 +0100 -+++ indent-2.2.9-explicits/src/indent.c 2006-01-18 18:16:50.000000000 +0100 -@@ -373,8 +373,6 @@ static void handle_token_lparen( - BOOLEAN * sp_sw, - int * dec_ind) - { -- char lparen = *token; -- - /* Braces in initializer lists should be put on new lines. This is - * necessary so that -gnu does not cause things like char - * *this_is_a_string_array[] = { "foo", "this_string_does_not_fit", -@@ -3058,7 +3056,6 @@ int main ( - int argc, - char ** argv) - { -- int i; - char *profile_pathname = 0; - BOOLEAN using_stdin = false; - exit_values_ty exit_status; -diff -Burp indent-2.2.9/src/io.h indent-2.2.9-explicits/src/io.h ---- indent-2.2.9/src/io.h 2002-08-04 19:08:41.000000000 +0200 -+++ indent-2.2.9-explicits/src/io.h 2006-01-18 18:12:56.000000000 +0100 -@@ -73,5 +73,6 @@ extern void fill_buffer (void); - extern int compute_code_target (int paren_targ); - extern int compute_label_target (void); - extern void skip_buffered_space(void); -+extern void dump_line (int force_nl, int *paren_targ); - - #endif /* INDENT_IO_H */ -diff -Burp indent-2.2.9/src/output.c indent-2.2.9-explicits/src/output.c ---- indent-2.2.9/src/output.c 2006-01-18 18:18:00.000000000 +0100 -+++ indent-2.2.9-explicits/src/output.c 2006-01-18 18:14:02.000000000 +0100 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - - #include "indent.h" -@@ -1207,7 +1208,7 @@ extern void close_output( - } - } - --extern inhibit_indenting( -+extern void inhibit_indenting( - BOOLEAN flag) - { - inhibited = flag; -diff -Burp indent-2.2.9/src/output.h indent-2.2.9-explicits/src/output.h ---- indent-2.2.9/src/output.h 2002-08-04 19:08:41.000000000 +0200 -+++ indent-2.2.9-explicits/src/output.h 2006-01-18 17:55:07.000000000 +0100 -@@ -47,7 +47,7 @@ extern void close_output( - struct stat * file_stats, - const char * filename); - --extern inhibit_indenting( -+extern void inhibit_indenting( - BOOLEAN flag); - - indent-2.2.9-lcall.patch: Index: indent-2.2.9-lcall.patch =================================================================== RCS file: /cvs/pkgs/rpms/indent/devel/indent-2.2.9-lcall.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- indent-2.2.9-lcall.patch 1 Feb 2006 13:25:16 -0000 1.1 +++ indent-2.2.9-lcall.patch 12 Mar 2008 15:31:03 -0000 1.2 @@ -4,9 +4,9 @@ @@ -3070,7 +3070,7 @@ int main ( exit_values_ty exit_status; - #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) -- setlocale (LC_MESSAGES, ""); -+ setlocale (LC_ALL, ""); + #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES) +- setlocale(LC_MESSAGES, ""); ++ setlocale(LC_ALL, ""); #endif - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); indent-2.2.9-man.patch: Index: indent-2.2.9-man.patch =================================================================== RCS file: /cvs/pkgs/rpms/indent/devel/indent-2.2.9-man.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- indent-2.2.9-man.patch 16 Jul 2006 12:04:09 -0000 1.1 +++ indent-2.2.9-man.patch 12 Mar 2008 15:31:03 -0000 1.2 @@ -35,23 +35,17 @@ @item -prs @itemx --space-after-parentheses Put a space after every '(' and before every ')'.@* -@@ -1979,8 +1989,10 @@ the corresponding short option. - \line{ --original \leaderfill -orig} - \line{ --parameter-indentation \leaderfill -ip at var{n}\ } - \line{ --paren-indentation \leaderfill -pi at var{n}\ } -+\line{ --preprocessor-indentation at var{n} \leaderfill -ppi at var{n}\ } +@@ -1979,6 +1989,7 @@ the corresponding short option. + \line{ --preprocessor-indentation \leaderfill -ppi at var{n}\ } \line{ --preserve-mtime \leaderfill -pmt\ } \line{ --procnames-start-lines \leaderfill -psl\ } +\line{ --remove-preprocessor-space \leaderfill -nlps\ } \line{ --space-after-cast \leaderfill -cs\ \ } \line{ --space-after-for \leaderfill -saf\ } \line{ --space-after-if \leaderfill -sai\ } -@@ -2063,8 +2075,10 @@ the corresponding short option. - --original -orig - --parameter-indentation -ip at var{n} - --paren-indentation -pi at var{n} -+--preprocessor-indentation at var{n} -ppi at var{n} +@@ -2063,6 +2075,7 @@ the corresponding short option. --preserve-mtime -pmt + --preprocessor-indentation -ppi at var{n} --procnames-start-lines -psl +--remove-preprocessor-space -nlps --space-after-cast -cs Index: indent.spec =================================================================== RCS file: /cvs/pkgs/rpms/indent/devel/indent.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- indent.spec 19 Feb 2008 19:57:27 -0000 1.31 +++ indent.spec 12 Mar 2008 15:31:03 -0000 1.32 @@ -1,21 +1,18 @@ # -*- coding: utf-8 -*- Summary: A GNU program for formatting C code Name: indent -Version: 2.2.9 -Release: 19%{?dist} -License: GPLv2+ +Version: 2.2.10 +Release: 1%{?dist} +License: GPLv3+ Group: Applications/Text -URL: http://www.gnu.org/software/indent/ -Source: ftp://ftp.gnu.org/pub/gnu/indent/indent-%{version}.tar.gz -Patch: indent-2.2.9-fix.patch -Patch2: indent-2.2.9-gcc4.patch +URL: http://indent.isidore-it.eu/beautify.html +Source: http://indent.isidore-it.eu/%{name}-%{version}.tar.gz Patch3: indent-2.2.9-explicits.patch Patch4: indent-2.2.9-cdw.patch Patch5: indent-2.2.9-lcall.patch -Patch6: indent-2.2.9-zh_TW.patch Patch7: indent-2.2.9-man.patch BuildRequires: gettext texinfo -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -30,22 +27,19 @@ %prep %setup -q -%patch -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %build %configure -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT/%{_infodir}/dir $RPM_BUILD_ROOT/usr/bin/texinfo2man \ +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir $RPM_BUILD_ROOT/%{_bindir}/texinfo2man \ $RPM_BUILD_ROOT/usr/doc/indent/indent.html %find_lang %name @@ -67,13 +61,20 @@ fi %files -f %{name}.lang +%doc AUTHORS COPYING NEWS README %defattr(-,root,root) -/usr/bin/indent -%{_mandir}/*/* -%{_infodir}/* +%{_bindir}/indent +%{_mandir}/man1/indent.* +%{_infodir}/indent.info* %changelog +* Wed Mar 12 2008 Petr Machata - 2.2.10-1 +- Rebase to 2.2.10 + - Dropped three patches + - Fix Source and URL + - Clean up spec + * Tue Feb 19 2008 Fedora Release Engineering - 2.2.9-19 - Autorebuild for GCC 4.3 --- indent-2.2.9-fix.patch DELETED --- --- indent-2.2.9-gcc4.patch DELETED --- --- indent-2.2.9-zh_TW.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 15:32:51 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Wed, 12 Mar 2008 15:32:51 GMT Subject: rpms/indent/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200803121532.m2CFWpb0016438@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/indent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16370 Modified Files: .cvsignore sources Log Message: ... and commit new files Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/indent/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Sep 2004 06:14:45 -0000 1.6 +++ .cvsignore 12 Mar 2008 15:32:13 -0000 1.7 @@ -1 +1 @@ -indent-2.2.9.tar.gz +indent-2.2.10.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/indent/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Sep 2004 06:14:45 -0000 1.6 +++ sources 12 Mar 2008 15:32:13 -0000 1.7 @@ -1 +1 @@ -dcdbb163bef928306dee2a0cfc581c89 indent-2.2.9.tar.gz +be35ea62705733859fbf8caf816d8959 indent-2.2.10.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 15:45:32 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 12 Mar 2008 15:45:32 GMT Subject: rpms/blender/devel blender.spec,1.71,1.72 Message-ID: <200803121545.m2CFjWTj016865@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/blender/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16831 Modified Files: blender.spec Log Message: Clarification of restrictions caused by legal issues Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- blender.spec 4 Mar 2008 20:23:06 -0000 1.71 +++ blender.spec 12 Mar 2008 15:44:38 -0000 1.72 @@ -3,7 +3,7 @@ Name: blender Version: 2.45 -Release: 9%{?dist} +Release: 10%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -67,6 +67,9 @@ Professionals and novices can easily and inexpensively publish stand-alone, secure, multi-platform content to the web, CD-ROMs, and other media. +This version doesn't contains ffmpeg support, so that any features may be not +available. + %prep %setup -q %patch1 -p1 -b .org @@ -179,6 +182,9 @@ %{_datadir}/mime/packages/blender.xml %changelog +* Wed Mar 12 2008 Jochen Schmitt 2.45-10 +- Clarification of restrictions caused by legal issues + * Tue Mar 4 2008 Jochen Schmitt 2.45-9 - Apply yafray patch only on 64-bit systems From fedora-extras-commits at redhat.com Wed Mar 12 15:48:12 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 12 Mar 2008 15:48:12 GMT Subject: rpms/ethtool/devel .cvsignore, 1.9, 1.10 ethtool.spec, 1.18, 1.19 sources, 1.9, 1.10 Message-ID: <200803121548.m2CFmC9n017004@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/ethtool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16945 Modified Files: .cvsignore ethtool.spec sources Log Message: 6 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ethtool/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 Dec 2006 20:39:44 -0000 1.9 +++ .cvsignore 12 Mar 2008 15:47:32 -0000 1.10 @@ -1 +1 @@ -ethtool-5.tar.gz +ethtool-6.tar.gz Index: ethtool.spec =================================================================== RCS file: /cvs/pkgs/rpms/ethtool/devel/ethtool.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ethtool.spec 19 Feb 2008 06:14:09 -0000 1.18 +++ ethtool.spec 12 Mar 2008 15:47:32 -0000 1.19 @@ -1,8 +1,8 @@ Summary: Ethernet settings tool for PCI ethernet cards Name: ethtool -Version: 5 -Release: 2%{?dist} -License: GPL +Version: 6 +Release: 1%{?dist} +License: GPL+ Group: Applications/System URL: http://sourceforge.net/projects/gkernel/ Source0: http://download.sourceforge.net/gkernel/%{name}-%{version}.tar.gz @@ -39,6 +39,9 @@ %{_mandir}/man8/ethtool.* %changelog +* Wed Mar 12 2008 Tom "spot" Callaway 6-1 +- Upgrade to ethtool version 6 + * Tue Feb 19 2008 Fedora Release Engineering - 5-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ethtool/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Dec 2006 20:39:44 -0000 1.9 +++ sources 12 Mar 2008 15:47:32 -0000 1.10 @@ -1 +1 @@ -5df7f165974e096e2de890e099f87a12 ethtool-5.tar.gz +3b721ec27f17ebf320ba8c505cf66d9c ethtool-6.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 15:48:31 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 12 Mar 2008 15:48:31 GMT Subject: rpms/blender/F-8 blender.spec,1.69,1.70 Message-ID: <200803121548.m2CFmVMM017056@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/blender/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16978 Modified Files: blender.spec Log Message: Clarification of restrictions caused by legal issues Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/F-8/blender.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- blender.spec 4 Mar 2008 20:42:01 -0000 1.69 +++ blender.spec 12 Mar 2008 15:47:48 -0000 1.70 @@ -3,7 +3,7 @@ Name: blender Version: 2.45 -Release: 9%{?dist} +Release: 10%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -66,6 +66,9 @@ Professionals and novices can easily and inexpensively publish stand-alone, secure, multi-platform content to the web, CD-ROMs, and other media. +This version doesn't contains ffmpeg support, so that any features may be not +available. + %prep %setup -q %patch1 -p1 -b .org @@ -177,6 +180,9 @@ %{_datadir}/mime/packages/blender.xml %changelog +* Wed Mar 12 2008 Jochen Schmitt 2.45-10 +- Clarification of restrictions caused by legal issues + * Tue Mar 4 2008 Jochen Schmitt 2.45-9 - Enable yafray patch only on 64-bit systems From fedora-extras-commits at redhat.com Wed Mar 12 15:51:38 2008 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 12 Mar 2008 15:51:38 GMT Subject: rpms/blender/F-7 blender.spec,1.64,1.65 Message-ID: <200803121551.m2CFpcGs017193@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/blender/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17156 Modified Files: blender.spec Log Message: Clarification of restrictions caused by legal issues Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/F-7/blender.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- blender.spec 4 Mar 2008 20:43:41 -0000 1.64 +++ blender.spec 12 Mar 2008 15:50:52 -0000 1.65 @@ -3,7 +3,7 @@ Name: blender Version: 2.45 -Release: 9%{?dist} +Release: 10%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -65,6 +65,9 @@ Professionals and novices can easily and inexpensively publish stand-alone, secure, multi-platform content to the web, CD-ROMs, and other media. +This version doesn't contains ffmpeg support, so that any features may be not +available. + %prep %setup -q %patch1 -p1 -b .org @@ -175,6 +178,9 @@ %{_datadir}/mime/packages/blender.xml %changelog +* Wed Mar 12 2008 Jochen Schmitt 2.45-10 +- Clarification of restrictions caused by legal issues + * Tue Mar 4 2008 Jochen Schmitt 2.45-9 - Enable yafray patch only for 64 bit systems From fedora-extras-commits at redhat.com Wed Mar 12 15:54:34 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Wed, 12 Mar 2008 15:54:34 GMT Subject: rpms/indent/devel indent.spec,1.32,1.33 Message-ID: <200803121554.m2CFsYNs017304@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/indent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17268 Modified Files: indent.spec Log Message: add BR Index: indent.spec =================================================================== RCS file: /cvs/pkgs/rpms/indent/devel/indent.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- indent.spec 12 Mar 2008 15:31:03 -0000 1.32 +++ indent.spec 12 Mar 2008 15:53:57 -0000 1.33 @@ -11,7 +11,7 @@ Patch4: indent-2.2.9-cdw.patch Patch5: indent-2.2.9-lcall.patch Patch7: indent-2.2.9-man.patch -BuildRequires: gettext texinfo +BuildRequires: gettext texinfo texi2html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info From fedora-extras-commits at redhat.com Wed Mar 12 15:58:44 2008 From: fedora-extras-commits at redhat.com (Peter Jones (pjones)) Date: Wed, 12 Mar 2008 15:58:44 GMT Subject: rpms/mkinitrd/devel .cvsignore, 1.174, 1.175 mkinitrd.spec, 1.252, 1.253 sources, 1.216, 1.217 Message-ID: <200803121558.m2CFwiZn017442@cvs-int.fedora.redhat.com> Author: pjones Update of /cvs/extras/rpms/mkinitrd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17408 Modified Files: .cvsignore mkinitrd.spec sources Log Message: * Wed Mar 12 2008 Peter Jones - 6.0.35-1 - Resolve label/uuid to a device earlier (#435228) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- .cvsignore 7 Mar 2008 00:21:31 -0000 1.174 +++ .cvsignore 12 Mar 2008 15:58:02 -0000 1.175 @@ -1 +1 @@ -mkinitrd-6.0.34.tar.bz2 +mkinitrd-6.0.35.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- mkinitrd.spec 7 Mar 2008 00:21:31 -0000 1.252 +++ mkinitrd.spec 12 Mar 2008 15:58:02 -0000 1.253 @@ -2,7 +2,7 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 6.0.34 +Version: 6.0.35 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -115,6 +115,9 @@ %{_libdir}/libbdevid.so.* %changelog +* Wed Mar 12 2008 Peter Jones - 6.0.35-1 +- Resolve label/uuid to a device earlier (#435228) + * Thu Mar 6 2008 Jeremy Katz - 6.0.34-1 - Fix scsi_wait_scan stuff up (#429937) - Add support for --without (wtogami, #436248) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- sources 7 Mar 2008 00:21:31 -0000 1.216 +++ sources 12 Mar 2008 15:58:02 -0000 1.217 @@ -1 +1 @@ -79aaf00feb3f7ece584fc43118f73dda mkinitrd-6.0.34.tar.bz2 +26e30943096bfdb307ed5a995c74a1a6 mkinitrd-6.0.35.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 16:03:16 2008 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Wed, 12 Mar 2008 16:03:16 GMT Subject: rpms/blitz/devel blitz.spec,1.4,1.5 Message-ID: <200803121603.m2CG3Gjc023631@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/blitz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23579 Modified Files: blitz.spec Log Message: * Mon Mar 03 2008 Sergio Pascual 0.9-7 - Patch to build with gcc4.3 Index: blitz.spec =================================================================== RCS file: /cvs/pkgs/rpms/blitz/devel/blitz.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- blitz.spec 19 Feb 2008 23:35:33 -0000 1.4 +++ blitz.spec 12 Mar 2008 16:02:40 -0000 1.5 @@ -1,13 +1,14 @@ Name: blitz Version: 0.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ class library for matrix scientific computing Group: Development/Libraries License: GPLv2 URL: http://www.oonumerics.org/blitz Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: blitz-gcc43.patch +Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: doxygen graphviz @@ -37,6 +38,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --enable-shared --disable-static --disable-fortran @@ -58,8 +60,10 @@ %{__rm} -rf examples/.deps %{__rm} -rf examples/Makefile* -%check -%{__make} %{?_smp_mflags} check-testsuite +# Check fails with gcc 4.3 and ppc +# Removed for the moment +#%check +#%{__make} %{?_smp_mflags} check-testsuite %clean %{__rm} -fr %{buildroot} @@ -101,6 +105,9 @@ %changelog +* Mon Mar 03 2008 Sergio Pascual 0.9-7 +- Patch to build with gcc4.3 + * Tue Feb 19 2008 Fedora Release Engineering - 0.9-6 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Wed Mar 12 16:03:43 2008 From: fedora-extras-commits at redhat.com (Petr Machata (pmachata)) Date: Wed, 12 Mar 2008 16:03:43 GMT Subject: rpms/indent/devel indent.spec,1.33,1.34 Message-ID: <200803121603.m2CG3hHp023641@cvs-int.fedora.redhat.com> Author: pmachata Update of /cvs/pkgs/rpms/indent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23611 Modified Files: indent.spec Log Message: Turn off parallel make Index: indent.spec =================================================================== RCS file: /cvs/pkgs/rpms/indent/devel/indent.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- indent.spec 12 Mar 2008 15:53:57 -0000 1.33 +++ indent.spec 12 Mar 2008 16:03:07 -0000 1.34 @@ -34,7 +34,8 @@ %build %configure -make %{?_smp_mflags} +# Parallel make doesn't work +make %install rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Wed Mar 12 16:16:00 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 12 Mar 2008 16:16:00 GMT Subject: rpms/icu/F-7 icu.icuXXXX.malayalam.bysyllable.patch, 1.1, 1.2 icu.spec, 1.50, 1.51 Message-ID: <200803121616.m2CGG0W9024011@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/icu/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23983 Modified Files: icu.icuXXXX.malayalam.bysyllable.patch icu.spec Log Message: Resolves: rhbz#437106/ooo#83991 Malayalam Kartika font fix icu.icuXXXX.malayalam.bysyllable.patch: Index: icu.icuXXXX.malayalam.bysyllable.patch =================================================================== RCS file: /cvs/pkgs/rpms/icu/F-7/icu.icuXXXX.malayalam.bysyllable.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icu.icuXXXX.malayalam.bysyllable.patch 30 Apr 2007 09:37:13 -0000 1.1 +++ icu.icuXXXX.malayalam.bysyllable.patch 12 Mar 2008 16:15:17 -0000 1.2 @@ -76,7 +76,7 @@ diff -ruN icu.orig/source/layout/MalayalamLayoutEngine.cpp icu/source/layout/MalayalamLayoutEngine.cpp --- icu.orig/source/layout/MalayalamLayoutEngine.cpp 1970-01-01 01:00:00.000000000 +0100 +++ icu/source/layout/MalayalamLayoutEngine.cpp 2007-04-27 10:44:26.000000000 +0100 -@@ -0,0 +1,121 @@ +@@ -0,0 +1,126 @@ + +/* + * @@ -109,6 +109,11 @@ +{ + if (fInsertionList) applyInsertions(); + if (from.fInsertionList) from.applyInsertions(); ++ if ((!fInsertionList) && (from.fInsertionList)) ++ { ++ fInsertionList = from.fInsertionList; ++ from.fInsertionList = NULL; ++ } + + if (!from.fGlyphCount) + return; Index: icu.spec =================================================================== RCS file: /cvs/pkgs/rpms/icu/F-7/icu.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- icu.spec 25 Jan 2008 13:14:11 -0000 1.50 +++ icu.spec 12 Mar 2008 16:15:17 -0000 1.51 @@ -1,6 +1,6 @@ Name: icu Version: 3.6 -Release: 20%{?dist} +Release: 21%{?dist} Summary: International Components for Unicode Group: System Environment/Libraries License: MIT @@ -153,6 +153,9 @@ %doc source/__docs/%{name}/html/* %changelog +* Wed Mar 12 2008 Caolan McNamara - 3.6-21 +- Resolves: rhbz#437106/ooo#83991 Malayalam "Kartika" font fix + * Thu Jan 24 2008 Caolan McNamara - 3.6-20 - CVE-2007-4770 CVE-2007-4771 add icu.regexp.patch From fedora-extras-commits at redhat.com Wed Mar 12 16:35:41 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Wed, 12 Mar 2008 16:35:41 GMT Subject: rpms/gtk2/devel .cvsignore, 1.82, 1.83 gtk2.spec, 1.283, 1.284 sources, 1.90, 1.91 Message-ID: <200803121635.m2CGZf19024606@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24469 Modified Files: .cvsignore gtk2.spec sources Log Message: 2.12.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- .cvsignore 13 Feb 2008 00:59:01 -0000 1.82 +++ .cvsignore 12 Mar 2008 16:33:11 -0000 1.83 @@ -1 +1 @@ -gtk+-2.12.8.tar.bz2 +gtk+-2.12.9.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.283 retrieving revision 1.284 diff -u -r1.283 -r1.284 --- gtk2.spec 5 Mar 2008 03:55:09 -0000 1.283 +++ gtk2.spec 12 Mar 2008 16:33:11 -0000 1.284 @@ -10,13 +10,13 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.12.8 +%define base_version 2.12.9 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 3%{?dist} +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2 @@ -37,12 +37,6 @@ # backport from svn trunk Patch4: im-setting.patch -# fixed upstream -Patch5: libbeagle.patch - -# fixed in upstream svn -Patch6: lpoptions.patch - BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -122,8 +116,6 @@ %patch2 -p1 -b .workaround %patch3 -p1 -b .system-log-crash %patch4 -p1 -b .im-setting -%patch5 -p1 -b .libbeagle -%patch6 -p1 -b .lpoptions for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -306,6 +298,9 @@ %{_datadir}/gtk-2.0 %changelog +* Wed Mar 12 2008 Matthias Clasen - 2.12.9-1 +- Update to 2.12.9 + * Tue Mar 4 2008 Matthias Clasen - 2.12.8-3 - Honor cups user default options from ~/.cups/lpoptions Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk2/devel/sources,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- sources 13 Feb 2008 00:59:01 -0000 1.90 +++ sources 12 Mar 2008 16:33:11 -0000 1.91 @@ -1 +1 @@ -1e0d7db0bfa210881743e1d42ee91a24 gtk+-2.12.8.tar.bz2 +33499772fdc3bea569c6d5673e5831b4 gtk+-2.12.9.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 16:41:02 2008 From: fedora-extras-commits at redhat.com (sami wagiaalla (swagiaal)) Date: Wed, 12 Mar 2008 16:41:02 GMT Subject: rpms/frysk/devel frysk.spec,1.127,1.128 Message-ID: <200803121641.m2CGf2Aq024760@cvs-int.fedora.redhat.com> Author: swagiaal Update of /cvs/pkgs/rpms/frysk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24717 Modified Files: frysk.spec Log Message: * Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.03.11-2 - Added statements to check for xmlto. Index: frysk.spec =================================================================== RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- frysk.spec 12 Mar 2008 05:02:12 -0000 1.127 +++ frysk.spec 12 Mar 2008 16:40:31 -0000 1.128 @@ -1,7 +1,7 @@ Summary: Frysk execution analysis and debugging tools Name: frysk Version: 0.0.1.2008.03.11 -Release: 1%{?dist} +Release: 2%{?dist} # antlrv2 is Public Domain; antlrv3 is BSD. # cdtparser is EPL # getopt is GPLv2 with exception @@ -125,6 +125,9 @@ mkdir -p build cd build +# double check xmlto +rpm -ql xmlto || : +ls -l /usr/bin/xmlto || : # Capture the configure line rm -f configure echo '#!/bin/sh -x' >> configure @@ -258,7 +261,10 @@ %{_datadir}/gnome/help/%{name}/* %changelog -* Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.03.11 +* Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.03.11-2 +- Added statements to check for xmlto. + +* Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.03.11-1 - Import 0.0.1.2008.03.11 (84bcf09e5a329252d81e853e49f0cf1449f937c2) * Fri Mar 11 2008 Sami Wagiaalla - 0.0.1.2008.02.29.rh1-2 From fedora-extras-commits at redhat.com Wed Mar 12 16:41:52 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 12 Mar 2008 16:41:52 GMT Subject: rpms/openoffice.org/devel .cvsignore, 1.150.2.2, 1.150.2.3 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.7, 1.7.2.1 openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.1.2.1, 1.1.2.2 openoffice.org.spec, 1.1440.2.15, 1.1440.2.16 sources, 1.273.2.1, 1.273.2.2 workspace.unifysound01.patch, 1.11, NONE Message-ID: <200803121641.m2CGfqKf024839@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24749 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 .cvsignore openoffice.org-2.2.0.ooo68717.gstreamer.video.patch openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch openoffice.org.spec sources Removed Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 workspace.unifysound01.patch Log Message: m2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.150.2.2 retrieving revision 1.150.2.3 diff -u -r1.150.2.2 -r1.150.2.3 --- .cvsignore 9 Mar 2008 18:12:22 -0000 1.150.2.2 +++ .cvsignore 12 Mar 2008 16:40:53 -0000 1.150.2.3 @@ -4,4 +4,4 @@ Tigert-templates.tar.gz unowinreg.dll bengali.sdf -DEV300_m1.tar.bz2 +DEV300_m2.tar.bz2 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch: Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 5 Feb 2008 16:25:54 -0000 1.7 +++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 12 Mar 2008 16:40:53 -0000 1.7.2.1 @@ -324,97 +324,9 @@ gid_File_Lib_BaseGfx, gid_File_Lib_Sysdtrans, gid_File_Lib_Sw, -diff -rup sd-orig/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/animations/CustomAnimationDialog.cxx ---- sd-orig/source/ui/animations/CustomAnimationDialog.cxx 2006-08-17 15:48:52.000000000 +0200 -+++ sd/source/ui/animations/CustomAnimationDialog.cxx 2006-08-17 15:50:37.000000000 +0200 -@@ -1943,6 +1943,9 @@ - // TODO(Q3): This breaks encapsulation. Either export - // these strings from avmedia, or provide an XManager - // factory there -+#ifdef GSTREAMER -+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer" -+#else - #ifdef WNT - # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX" - #elif defined QUARTZ -@@ -1950,6 +1953,7 @@ - #else - # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java" - #endif -+#endif - - void CustomAnimationEffectTabPage::onSoundPreview() - { -diff -rup sd-orig/source/ui/slideshow/slideshowimpl.cxx sd/source/ui/slideshow/slideshowimpl.cxx ---- sd-orig/source/ui/slideshow/slideshowimpl.cxx 2006-08-17 15:48:52.000000000 +0200 -+++ sd/source/ui/slideshow/slideshowimpl.cxx 2006-08-17 15:54:35.000000000 +0200 -@@ -121,6 +121,9 @@ - // TODO(Q3): This breaks encapsulation. Either export - // these strings from avmedia, or provide an XManager - // factory there -+#ifdef GSTREAMER -+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer" -+#else - #ifdef WNT - # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX" - #elif defined QUARTZ -@@ -128,6 +131,7 @@ - #else - # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java" - #endif -+#endif - - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; -diff -rup slideshow-orig/source/engine/soundplayer.cxx slideshow/source/engine/soundplayer.cxx ---- slideshow-orig/source/engine/soundplayer.cxx 2006-08-17 16:15:39.000000000 +0200 -+++ slideshow/source/engine/soundplayer.cxx 2006-08-17 16:17:17.000000000 +0200 -@@ -58,6 +58,9 @@ - // TODO(Q3): This breaks encapsulation. Either export - // these strings from avmedia, or provide an XManager - // factory there -+#ifdef GSTREAMER -+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer" -+#else - #ifdef WNT - # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX" - #elif defined QUARTZ -@@ -65,6 +68,7 @@ - #else - # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java" - #endif -+#endif - - - namespace slideshow diff -rup slideshow-orig/source/engine/viewmediashape.cxx slideshow/source/engine/viewmediashape.cxx --- slideshow-orig/source/engine/shapes/viewmediashape.cxx 2006-08-17 16:15:39.000000000 +0200 +++ slideshow/source/engine/shapes/viewmediashape.cxx 2006-08-17 17:26:09.000000000 +0200 -@@ -75,6 +75,16 @@ - #include "mediashape.hxx" - #include "tools.hxx" - -+#ifdef GSTREAMER -+#ifndef _SV_SYSDATA_HXX -+#include -+#endif -+ -+// TODO(Q3): This breaks encapsulation. Either export -+// these strings from avmedia, or provide an XManager -+// factory there -+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer" -+#else - #ifdef WNT - #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX" - #elif defined QUARTZ -@@ -82,6 +92,7 @@ - #else - #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java" - #endif -+#endif - - using namespace ::com::sun::star; - @@ -159,7 +170,11 @@ mxPlayerWindow.clear(); } @@ -3289,3 +3201,88 @@ } public String getLanguageString(String MSID) { +diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.cxx source/gstreamer/gstplayer.cxx +--- avmedia.orig/source/gstreamer/gstplayer.cxx 2007-08-07 19:50:02.000000000 +0100 ++++ avmedia/source/gstreamer/gstplayer.cxx 2007-08-07 17:14:52.000000000 +0100 +@@ -67,6 +67,7 @@ + mpPlaybin( NULL ), + mbFakeVideo (sal_False ), + mnUnmutedVolume( 0 ), ++ mbPlayPending ( false ), + mbMuted( false ), + mbLooping( false ), + mbInitialized( false ), +@@ -140,6 +141,7 @@ + case GST_MESSAGE_EOS: + //DBG( "EOS, reset state to NULL" ); + gst_element_set_state( mpPlaybin, GST_STATE_READY ); ++ mbPlayPending = false; + break; + case GST_MESSAGE_STATE_CHANGED: + if( message->src == GST_OBJECT( mpPlaybin ) ) { +@@ -151,6 +153,9 @@ + pendingstate == GST_STATE_VOID_PENDING && + mpXOverlay ) + gst_x_overlay_expose( mpXOverlay ); ++ ++ if (mbPlayPending) ++ mbPlayPending = ((newstate == GST_STATE_READY) || (newstate == GST_STATE_PAUSED)); + } + default: + break; +@@ -250,6 +255,7 @@ + + if( mpPlaybin != NULL ) { + gst_element_set_state( mpPlaybin, GST_STATE_NULL ); ++ mbPlayPending = false; + g_object_unref( mpPlaybin ); + } + +@@ -281,6 +287,7 @@ + preparePlaybin( rURL, true ); + + gst_element_set_state( mpPlaybin, GST_STATE_PAUSED ); ++ mbPlayPending = false; + + bRet = true; + } +@@ -305,6 +312,7 @@ + if( mbInitialized && NULL != mpPlaybin ) + { + gst_element_set_state( mpPlaybin, GST_STATE_PLAYING ); ++ mbPlayPending = true; + } + } + +@@ -317,6 +325,7 @@ + if( mpPlaybin ) + gst_element_set_state( mpPlaybin, GST_STATE_PAUSED ); + ++ mbPlayPending = false; + DBG( "stop %p", mpPlaybin ); + } + +@@ -325,10 +334,10 @@ + sal_Bool SAL_CALL Player::isPlaying() + throw (uno::RuntimeException) + { +- bool bRet = false; ++ bool bRet = mbPlayPending; + + // return whether the pipeline is in PLAYING STATE or not +- if( mbInitialized && mpPlaybin ) ++ if( !mbPlayPending && mbInitialized && mpPlaybin ) + { + bRet = GST_STATE_PLAYING == GST_STATE( mpPlaybin ); + } +diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.hxx source/gstreamer/gstplayer.hxx +--- avmedia.orig/source/gstreamer/gstplayer.hxx 2007-08-07 19:50:02.000000000 +0100 ++++ avmedia/source/gstreamer/gstplayer.hxx 2007-08-07 10:30:45.000000000 +0100 +@@ -101,6 +101,7 @@ + sal_Bool mbFakeVideo; + + gdouble mnUnmutedVolume; ++ sal_Bool mbPlayPending; + sal_Bool mbMuted; + sal_Bool mbLooping; + sal_Bool mbInitialized; openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch: Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 6 Mar 2008 19:06:15 -0000 1.1.2.1 +++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 12 Mar 2008 16:40:53 -0000 1.1.2.2 @@ -17,7 +17,7 @@ + set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + fi + echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA -+ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; ++ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then + set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml' + fi + echo $@ | grep -q env:UserInstallation Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440.2.15 retrieving revision 1.1440.2.16 diff -u -r1.1440.2.15 -r1.1440.2.16 --- openoffice.org.spec 11 Mar 2008 13:28:15 -0000 1.1440.2.15 +++ openoffice.org.spec 12 Mar 2008 16:40:53 -0000 1.1440.2.16 @@ -1,5 +1,5 @@ %define oootag DEV300 -%define ooomilestone 1 +%define ooomilestone 2 %define rh_rpm_release 1 # undef to get english only and no-langpacks for a faster smoketest build @@ -116,31 +116,30 @@ Patch43: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz -Patch46: workspace.unifysound01.patch -Patch47: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch -Patch48: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch -Patch49: openoffice.org-2.3.0.ooo76649.httpencoding.patch -Patch50: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch -Patch51: openoffice.org-2.3.1.ooo81307.sw.word2.patch -Patch52: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch -Patch53: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch -Patch54: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch -Patch55: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch -Patch56: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch -Patch57: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch -Patch58: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch -Patch59: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch -Patch60: openoffice.org-2.4.0.ooo85448.emptyrpath.patch -Patch61: workspace.cairotext01.patch -Patch62: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch -Patch63: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch -Patch64: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch -Patch65: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch -Patch66: workspace.cmcfixes43.patch -Patch67: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch -Patch68: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch -Patch69: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch -Patch70: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch +Patch46: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch +Patch47: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch +Patch48: openoffice.org-2.3.0.ooo76649.httpencoding.patch +Patch49: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch +Patch50: openoffice.org-2.3.1.ooo81307.sw.word2.patch +Patch51: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch +Patch52: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch +Patch53: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch +Patch54: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch +Patch55: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch +Patch56: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch +Patch57: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch +Patch58: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch +Patch59: openoffice.org-2.4.0.ooo85448.emptyrpath.patch +Patch60: workspace.cairotext01.patch +Patch61: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch +Patch62: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch +Patch63: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch +Patch64: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch +Patch65: workspace.cmcfixes43.patch +Patch66: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch +Patch67: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch +Patch68: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch +Patch69: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch %define instdir %{_libdir}/openoffice.org %define OFFICEUPD 300 @@ -1074,31 +1073,30 @@ %patch43 -p1 -b .ooo79481.sw.rowordcount.patch %patch44 -p1 -b .ooo80257.sd.textonlystyle.patch tar xzf %{PATCH45} -%patch46 -p1 -b .workspace.unifysound01.patch -%patch47 -p1 -b .gccXXXXX.solenv.javaregistration.patch -%patch48 -p1 -b .ooo81321.cppu.silencewarnings.patch -%patch49 -p1 -b .ooo76649.httpencoding.patc -%patch50 -p1 -b .ooo82966.svx.missing3d.patch -%patch51 -p1 -b .ooo81307.sw.word2.patch -%patch52 -p1 -b .ooo83878.unopkg.enablelinking.patch -%patch53 -p1 -b .ooo84676.ucb.davprotocol.patch -%patch54 -p1 -b .ooo84621.sw.insertexcel.patch -%patch55 -p1 -b .ooo85054.stlport.noorigs.patch -%patch56 -p1 -b .ooo85097.desktop.pagein.patch -%patch57 -p1 -%patch58 -p1 -b .rh133741.alwaysgtk.vcl.patch -%patch59 -p1 -b .ooo85429.sw.a11ycrash.patch -%patch60 -p1 -b .ooo85448.emptyrpath.patch -%patch61 -p1 -b .workspace.cairotext01.patch -%patch62 -p1 -b .ooo85854.sw.graphicsaveas.patch -%patch63 -p1 -b .ooo85921.sd.editmasterundermouse.patch -%patch64 -p1 -b .ooo86080.unopkg.bodge.patch -%patch65 -p1 -b .oooXXXXX.psprint.debugcups.patch -%patch66 -p1 -b .workspace.cmcfixes43.patch -%patch67 -p1 -b .ooo86588.sw.buildfix.patch -%patch68 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch -%patch69 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch -%patch70 -p1 -b .ooo86924.sfx2.iconchanges.patch +%patch46 -p1 -b .gccXXXXX.solenv.javaregistration.patch +%patch47 -p1 -b .ooo81321.cppu.silencewarnings.patch +%patch48 -p1 -b .ooo76649.httpencoding.patc +%patch49 -p1 -b .ooo82966.svx.missing3d.patch +%patch50 -p1 -b .ooo81307.sw.word2.patch +%patch51 -p1 -b .ooo83878.unopkg.enablelinking.patch +%patch52 -p1 -b .ooo84676.ucb.davprotocol.patch +%patch53 -p1 -b .ooo84621.sw.insertexcel.patch +%patch54 -p1 -b .ooo85054.stlport.noorigs.patch +%patch55 -p1 -b .ooo85097.desktop.pagein.patch +%patch56 -p1 +%patch57 -p1 -b .rh133741.alwaysgtk.vcl.patch +%patch58 -p1 -b .ooo85429.sw.a11ycrash.patch +%patch59 -p1 -b .ooo85448.emptyrpath.patch +%patch60 -p1 -b .workspace.cairotext01.patch +%patch61 -p1 -b .ooo85854.sw.graphicsaveas.patch +%patch62 -p1 -b .ooo85921.sd.editmasterundermouse.patch +%patch63 -p1 -b .ooo86080.unopkg.bodge.patch +%patch64 -p1 -b .oooXXXXX.psprint.debugcups.patch +%patch65 -p1 -b .workspace.cmcfixes43.patch +%patch66 -p1 -b .ooo86588.sw.buildfix.patch +%patch67 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch +%patch68 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch +%patch69 -p1 -b .ooo86924.sfx2.iconchanges.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -1565,9 +1563,9 @@ chmod u+w *.desktop for file in *.desktop; do # rhbz#156067 don't version the icons - sed -i -e s/$ICONPRODUCTVERSION//g $file + sed -i -e "s/$ICONPRODUCTVERSION//g" $file # rhbz#156677 remove the version from Name= - sed -i -e s/$LONGICONPRODUCTVERSION //g $file + sed -i -e "s/$LONGICONPRODUCTVERSION //g" $file done echo "StartupNotify=true" >> base.desktop echo "TryExec=oobase" >> base.desktop @@ -2868,7 +2866,7 @@ %{python_py_sitearch}/unohelper.py* %changelog -* Tue Mar 11 2008 Caolan McNamara - 1:3.0.0-0.1.1 +* Wed Mar 12 2008 Caolan McNamara - 1:3.0.0-0.2.1 - extend selinux bodge to ia64 - drop integrated workspace.notes2.patch - drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch @@ -2877,6 +2875,7 @@ - drop integrated openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch - drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch - drop subsumed openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch +- drop integrated workspace.unifysound01.patch - add workspace.cmcfixes43.patch - add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.273.2.1 retrieving revision 1.273.2.2 diff -u -r1.273.2.1 -r1.273.2.2 --- sources 7 Mar 2008 14:32:38 -0000 1.273.2.1 +++ sources 12 Mar 2008 16:40:53 -0000 1.273.2.2 @@ -4,4 +4,4 @@ e3a0b76dcd876f3d721ee7183729153d unowinreg.dll f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz 0c0e868b34329d90a7c9a92f1704775c bengali.sdf -46342c036e072477b43dcb25b743b88e DEV300_m1.tar.bz2 +5311182b27647f0de8b5ab86e72e75b4 DEV300_m2.tar.bz2 --- workspace.unifysound01.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 16:45:29 2008 From: fedora-extras-commits at redhat.com (Ray Strode (rstrode)) Date: Wed, 12 Mar 2008 16:45:29 GMT Subject: rpms/xorg-x11-xinit/devel xinit-compat.desktop, NONE, 1.1 xorg-x11-xinit.spec, 1.55, 1.56 Message-ID: <200803121645.m2CGjT6d025026@cvs-int.fedora.redhat.com> Author: rstrode Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991 Modified Files: xorg-x11-xinit.spec Added Files: xinit-compat.desktop Log Message: - Add a new subpackage to add ~/.xsessions and ~/.Xclients to session list --- NEW FILE xinit-compat.desktop --- [Desktop Entry] Name=User script Comment=This session runs ~/.xsession or ~/.Xclients if available Exec=sh -c "exec ~/.xsession || exec ~/.Xclients || exec /etc/X11/xinit/Xclients" Index: xorg-x11-xinit.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- xorg-x11-xinit.spec 11 Feb 2008 19:24:01 -0000 1.55 +++ xorg-x11-xinit.spec 12 Mar 2008 16:44:39 -0000 1.56 @@ -3,7 +3,7 @@ Summary: X.Org X11 X Window System xinit startup scripts Name: xorg-x11-%{pkgname} Version: 1.0.7 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -19,6 +19,7 @@ # here instead of the xdm package. Source16: Xsession Source17: localuser.sh +Source18: xinit-compat.desktop Source100: ck-xinit-session.c Patch1: xinit-1.0.2-client-session.patch @@ -51,9 +52,16 @@ # startup. Conflicts: dbus < 1.1.4-3.fc9 +%package session +Summary: Display manager support for ~/.xsession and ~/.Xclients +Group: User Interface/X + %description X.Org X11 X Window System xinit startup scripts +%description session +Allows legacy ~/.xsession and ~/.Xclients files to be used from display managers + %prep %setup -q -n %{pkgname}-%{version} %patch1 -p1 -b .client-session @@ -77,6 +85,7 @@ # Makefile.am and submit it in a bug report or check into CVS. %makeinstall XINITDIR=$RPM_BUILD_ROOT/etc/X11/xinit install -m755 ck-xinit-session $RPM_BUILD_ROOT/%{_bindir} +install -m644 -D $RPM_SOURCE_DIR/xinit-compat.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compat.desktop # Install Red Hat custom xinitrc, etc. { @@ -117,7 +126,15 @@ %{_mandir}/man1/startx.1* %{_mandir}/man1/xinit.1* +%files session +%defattr(-, root, root) +%{_datadir}/xsessions/xinit-compat.desktop + %changelog +* Wed Mar 12 2008 Ray Strode 1.0.7-6 +- Add a new subpackage to add ~/.xsessions and ~/.Xclients + to session list + * Mon Feb 11 2008 Adam Jackson 1.0.7-5 - Xresources: s/don't/do not/, cpp is dumb. (#431704) From fedora-extras-commits at redhat.com Wed Mar 12 17:00:19 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Wed, 12 Mar 2008 17:00:19 GMT Subject: rpms/upstart/devel upstart-rpm.patch, NONE, 1.1 upstart.spec, 1.9, 1.10 Message-ID: <200803121700.m2CH0J2j025387@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25357 Modified Files: upstart.spec Added Files: upstart-rpm.patch Log Message: patch for .rpm{save,new} files upstart-rpm.patch: --- NEW FILE upstart-rpm.patch --- diff -up upstart-0.3.9/nih/file.c.foo upstart-0.3.9/nih/file.c --- upstart-0.3.9/nih/file.c.foo 2008-03-12 12:03:50.000000000 -0400 +++ upstart-0.3.9/nih/file.c 2008-03-12 12:05:39.000000000 -0400 @@ -374,7 +374,10 @@ nih_file_is_packaging (const char *path) ptr = strrchr (path, '.'); if (ptr && (! strncmp (ptr, ".dpkg-", 6))) return TRUE; - + if (ptr && (! strncmp (ptr, ".rpmsave",8))) + return TRUE; + if (ptr && (! strncmp (ptr, ".rpmnew",7))) + return TRUE; return FALSE; } Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- upstart.spec 2 Mar 2008 23:29:26 -0000 1.9 +++ upstart.spec 12 Mar 2008 16:59:43 -0000 1.10 @@ -1,6 +1,6 @@ Name: upstart Version: 0.3.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An event-driven init system Group: System Environment/Base @@ -10,6 +10,7 @@ Patch0: upstart-gcc43.patch Patch1: upstart-force-on-shutdown-reboot.patch Patch2: upstart-tty-stack.patch +Patch3: upstart-rpm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -24,6 +25,7 @@ %patch0 -p1 %patch1 -p1 %patch2 +%patch3 -p1 %build %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib} @@ -85,6 +87,9 @@ %{_mandir}/man8/telinit.8.gz %changelog +* Wed Mar 13 2008 Casey Dahlin - 0.3.9-10 +- Add patch to ignore .rpm{new,save} files + * Sun Mar 03 2008 Casey Dahlin - 0.3.9-9 - Remove automake dependency, build Makefile.in changes into patch From fedora-extras-commits at redhat.com Wed Mar 12 17:01:51 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 12 Mar 2008 17:01:51 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.2-wallpaper-desktop.patch, NONE, 1.1 kdebase-workspace.spec, 1.49, 1.50 Message-ID: <200803121701.m2CH1pKj031510@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26397 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.2-wallpaper-desktop.patch Log Message: - apply upstream patch to fix changing wallpaper causes desktop to go white kdebase-workspace-4.0.2-wallpaper-desktop.patch: --- NEW FILE kdebase-workspace-4.0.2-wallpaper-desktop.patch --- Index: workspace/plasma/containments/desktop/desktop.cpp =================================================================== --- workspace/plasma/containments/desktop/desktop.cpp (Revision 783863) +++ workspace/plasma/containments/desktop/desktop.cpp (Revision 783864) @@ -64,9 +64,7 @@ m_logoutAction(0), m_configDialog(0), m_wallpaperPath(0), - m_renderer(resolution(), 1.0), - m_fadeOutAnimId(0), - m_fadeInAnimId(0) + m_renderer(resolution(), 1.0) { qRegisterMetaType("QImage"); qRegisterMetaType("QPersistentModelIndex"); @@ -276,19 +274,7 @@ void DefaultDesktop::updateBackground(int token, const QImage &img) { if (m_current_renderer_token == token) { - QPixmap oldBitmapBackground; - if (!m_bitmapBackground.isNull()) { - oldBitmapBackground = m_bitmapBackground; - } m_bitmapBackground = QPixmap::fromImage(img); - - if (!oldBitmapBackground.isNull()) { - m_fadeOutAnimId = Plasma::Phase::self()->animateElement(this, Plasma::Phase::ElementDisappear); - Plasma::Phase::self()->setAnimationPixmap(m_fadeOutAnimId, oldBitmapBackground); - m_fadeInAnimId = Plasma::Phase::self()->animateElement(this, Plasma::Phase::ElementAppear); - Plasma::Phase::self()->setAnimationPixmap(m_fadeInAnimId, m_bitmapBackground); - } - update(); } } @@ -431,22 +417,13 @@ painter->resetTransform(); } - if (m_fadeOutAnimId || m_fadeInAnimId) { - if (m_fadeOutAnimId) { - painter->drawPixmap(option->exposedRect, Plasma::Phase::self()->animationResult(m_fadeOutAnimId), option->exposedRect); - } - if (m_fadeInAnimId) { - painter->drawPixmap(option->exposedRect, Plasma::Phase::self()->animationResult(m_fadeInAnimId), option->exposedRect); - } - } else if (!m_bitmapBackground.isNull()) { - // blit the background (saves all the per-pixel-products that blending does) - painter->setCompositionMode(QPainter::CompositionMode_Source); + // blit the background (saves all the per-pixel-products that blending does) + painter->setCompositionMode(QPainter::CompositionMode_Source); - // for pixmaps we draw only the exposed part (untransformed since the - // bitmapBackground already has the size of the viewport) - painter->drawPixmap(option->exposedRect, m_bitmapBackground, option->exposedRect); - //kDebug() << "draw pixmap of background to" << option->exposedRect; - } + // for pixmaps we draw only the exposed part (untransformed since the + // bitmapBackground already has the size of the viewport) + painter->drawPixmap(option->exposedRect, m_bitmapBackground, option->exposedRect); + //kDebug() << "draw pixmap of background to" << option->exposedRect; // restore transformation and composition mode painter->restore(); Index: workspace/plasma/containments/desktop/desktop.h =================================================================== --- workspace/plasma/containments/desktop/desktop.h (Revision 783863) +++ workspace/plasma/containments/desktop/desktop.h (Revision 783864) @@ -128,9 +128,6 @@ //Desktop icons static IconLoader *s_icons; - - Plasma::Phase::AnimId m_fadeOutAnimId; - Plasma::Phase::AnimId m_fadeInAnimId; }; #endif // PLASMA_PANEL_H Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- kdebase-workspace.spec 10 Mar 2008 14:52:15 -0000 1.49 +++ kdebase-workspace.spec 12 Mar 2008 17:01:11 -0000 1.50 @@ -6,7 +6,7 @@ Name: kdebase-workspace Version: 4.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2 License: GPLv2 Group: User Interface/Desktops @@ -22,6 +22,7 @@ Patch100: kdebase-workspace-4.0.2-kde#155362.patch # upstream patch Patch101: kdebase-workspace-4.0.x-kcontrol-crash.patch +Patch102: kdebase-workspace-4.0.2-wallpaper-desktop.patch # upgrade path for former kde-redhat'ers Obsoletes: kdebase-kdm < 6:%{version}-%{release} @@ -113,6 +114,7 @@ # upstream patches %patch100 -p1 -b .kde#155362 %patch101 -p1 -b .kcontrol-crash +%patch102 -p1 -b .wallpaper-desktop %build @@ -225,6 +227,9 @@ %changelog +* Wed Mar 12 2008 Than Ngo 4.0.2-7 +- apply upstream patch to fix changing wallpaper causes desktop to go white + * Mon Mar 10 2008 Than Ngo 4.0.2-6 - add gestures=false in kde-settings, remove kdebase-workspace-4.0.2-Gestures.patch From fedora-extras-commits at redhat.com Wed Mar 12 17:08:02 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 12 Mar 2008 17:08:02 GMT Subject: rpms/texlive/devel texlive-fedora_paths.patch, 1.1, 1.2 texlive.spec, 1.32, 1.33 Message-ID: <200803121708.m2CH82Mg031697@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/texlive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31658 Modified Files: texlive-fedora_paths.patch texlive.spec Log Message: * Wed Mar 12 2008 Jindrich Novy - 2007-25 - fix fmtutil to not to hang in infinite loop, thanks to Stepan Kasal (#437008) - fix search paths in texmf.cnf, thanks to Patrice Dumas (#436949) texlive-fedora_paths.patch: Index: texlive-fedora_paths.patch =================================================================== RCS file: /cvs/extras/rpms/texlive/devel/texlive-fedora_paths.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texlive-fedora_paths.patch 2 Dec 2007 08:03:19 -0000 1.1 +++ texlive-fedora_paths.patch 12 Mar 2008 17:07:20 -0000 1.2 @@ -60,7 +60,7 @@ % For security reasons, it is better not to have . part of the path. % -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};/.$TETEXDIR;$TEXMF/web2c;@web2c@ -+TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};@sysconfdir@/texmf;/usr/local/share/texmf/web2c;$TEXMF/web2c;@web2c@ ++TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf-local/web2c};@sysconfdir@/texmf/web2c;/usr/local/share/texmf/web2c;$TEXMF/web2c;@web2c@ # $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To # avoid empty expansions from binaries linked against an earlier Index: texlive.spec =================================================================== RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- texlive.spec 10 Mar 2008 16:37:49 -0000 1.32 +++ texlive.spec 12 Mar 2008 17:07:20 -0000 1.33 @@ -27,7 +27,7 @@ Name: texlive Version: %{texlive_ver} -Release: 24%{?dist} +Release: 25%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -73,6 +73,7 @@ Patch11: texlive-2007-makej.patch Patch12: texlive-2007-badscript.patch Patch17: texlive-2007-tmpcleanup.patch +Patch18: texlive-fmtutil-infloop.patch Patch19: texlive-2007-kpse-extensions.patch Patch20: texlive-CVE-2007-4033.patch Patch25: texlive-dvipsoverflow.patch @@ -441,6 +442,8 @@ # Always cleanup temporary directories for texconfig, updmap, fmtutil # (RH #172534) %patch17 -p1 -b .tmpcleanup +# fmtutil won't hang in infinite loop (#437008) +%patch18 -p1 -b .infloop %patch19 -p0 -b .kpse-extensions %patch20 -p1 -b .CVE-2007-4033 %patch21 -p1 -b .more_paths @@ -622,10 +625,16 @@ export LD_LIBRARY_PATH=`pwd`/texk/kpathsea/.libs +# a temporary placeholder for texmf.cnf +mkdir -p %{buildroot}%{_datadir}/texmf-local/web2c +cp -a texk/kpathsea/texmf.cnf %{buildroot}%{_datadir}/texmf-local/web2c + %makeinstall \ texmf=%{buildroot}%{_texmf_main} \ texmfmain=%{buildroot}%{_texmf_main} +rm -rf %{buildroot}%{_datadir}/texmf-local/ + # remove all .la files rm -f %{buildroot}%{_infodir}/dir find %{buildroot} | grep -e "\\.la$" | xargs rm -f @@ -1240,6 +1249,11 @@ %{_mandir}/man1/texutil.1* %changelog +* Wed Mar 12 2008 Jindrich Novy - 2007-25 +- fix fmtutil to not to hang in infinite loop, thanks to + Stepan Kasal (#437008) +- fix search paths in texmf.cnf, thanks to Patrice Dumas (#436949) + * Sat Mar 08 2008 Jindrich Novy - 2007-24 - put back dvipdfmx requires for xelatex (#433225) - don't compile unpackaged stuff From fedora-extras-commits at redhat.com Wed Mar 12 17:10:04 2008 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 12 Mar 2008 17:10:04 GMT Subject: rpms/texlive/devel texlive-fmtutil-infloop.patch,NONE,1.1 Message-ID: <200803121710.m2CHA4Op031760@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/texlive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31745 Added Files: texlive-fmtutil-infloop.patch Log Message: add fmtutil patch texlive-fmtutil-infloop.patch: --- NEW FILE texlive-fmtutil-infloop.patch --- diff -up texlive-2007/texk/tetex/fmtutil.infloop texlive-2007/texk/tetex/fmtutil --- texlive-2007/texk/tetex/fmtutil.infloop 2008-03-12 10:51:14.000000000 +0100 +++ texlive-2007/texk/tetex/fmtutil 2008-03-12 16:53:05.000000000 +0100 @@ -680,6 +680,15 @@ esac rm -f $fmtfile + + # Check for infinite recursion before running the iniTeX: + case :$mktexfmt_loop: in + *:"$format":*) + abort "Infinite recursion detected, giving up!" ;; + esac + mktexfmt_loop=$mktexfmt_loop:$format + export mktexfmt_loop + verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..." # run in a subshell to get a local effect of TEXPOOL manipulation: From fedora-extras-commits at redhat.com Wed Mar 12 17:17:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:17:52 +0000 Subject: [pkgdb] lure (Fedora, 8) updated by kevin Message-ID: <200803121721.m2CHL060011753@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for lure Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lure (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lure (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lure (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on lure (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lure From fedora-extras-commits at redhat.com Wed Mar 12 17:17:46 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:17:46 +0000 Subject: [pkgdb] lure was added for jwrdegoede Message-ID: <200803121720.m2CHKslE011712@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package lure with summary Lure of the Temptress - Adventure Game Kevin Fenzi (kevin) has approved Package lure Kevin Fenzi (kevin) has added a Fedora devel branch for lure with an owner of jwrdegoede Kevin Fenzi (kevin) has approved lure in Fedora devel Kevin Fenzi (kevin) has approved Package lure Kevin Fenzi (kevin) has set commit to Approved for cvsextras on lure (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on lure (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on lure (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lure From fedora-extras-commits at redhat.com Wed Mar 12 17:17:52 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:17:52 +0000 Subject: [pkgdb] lure (Fedora, devel) updated by kevin Message-ID: <200803121721.m2CHL063011753@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on lure (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/lure From fedora-extras-commits at redhat.com Wed Mar 12 17:18:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:18:46 GMT Subject: rpms/lure - New directory Message-ID: <200803121718.m2CHIkGq032177@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lure In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd32142/rpms/lure Log Message: Directory /cvs/extras/rpms/lure added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:18:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:18:53 GMT Subject: rpms/lure/devel - New directory Message-ID: <200803121718.m2CHIrR9032196@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lure/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd32142/rpms/lure/devel Log Message: Directory /cvs/extras/rpms/lure/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:19:01 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:19:01 GMT Subject: rpms/lure Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803121719.m2CHJ1YY032226@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lure In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd32142/rpms/lure Added Files: Makefile import.log Log Message: Setup of module lure --- NEW FILE Makefile --- # Top level Makefile for module lure all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 12 17:19:06 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:19:06 GMT Subject: rpms/lure/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803121719.m2CHJ6Ek032242@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/lure/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd32142/rpms/lure/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lure --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: lure # $Id: Makefile,v 1.1 2008/03/12 17:19:01 kevin Exp $ NAME := lure SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Mar 12 17:19:30 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:19:30 +0000 Subject: [pkgdb] xmltoman was added for lkundrak Message-ID: <200803121722.m2CHMcjm012501@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xmltoman with summary Scripts for converting XML to roff or HTML Kevin Fenzi (kevin) has approved Package xmltoman Kevin Fenzi (kevin) has added a Fedora devel branch for xmltoman with an owner of lkundrak Kevin Fenzi (kevin) has approved xmltoman in Fedora devel Kevin Fenzi (kevin) has approved Package xmltoman Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xmltoman (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xmltoman (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xmltoman (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xmltoman From fedora-extras-commits at redhat.com Wed Mar 12 17:19:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:19:32 +0000 Subject: [pkgdb] xmltoman (Fedora, devel) updated by kevin Message-ID: <200803121722.m2CHMdxj012509@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on xmltoman (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xmltoman From fedora-extras-commits at redhat.com Wed Mar 12 17:20:34 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:20:34 GMT Subject: rpms/xmltoman - New directory Message-ID: <200803121720.m2CHKYRw032407@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xmltoman In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE32367/rpms/xmltoman Log Message: Directory /cvs/extras/rpms/xmltoman added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:20:40 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:20:40 GMT Subject: rpms/xmltoman/devel - New directory Message-ID: <200803121720.m2CHKePr032428@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xmltoman/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE32367/rpms/xmltoman/devel Log Message: Directory /cvs/extras/rpms/xmltoman/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:20:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:20:46 GMT Subject: rpms/xmltoman Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803121720.m2CHKkHq032452@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xmltoman In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE32367/rpms/xmltoman Added Files: Makefile import.log Log Message: Setup of module xmltoman --- NEW FILE Makefile --- # Top level Makefile for module xmltoman all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 12 17:20:53 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:20:53 GMT Subject: rpms/xmltoman/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803121720.m2CHKrpT032468@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xmltoman/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE32367/rpms/xmltoman/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xmltoman --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xmltoman # $Id: Makefile,v 1.1 2008/03/12 17:20:46 kevin Exp $ NAME := xmltoman SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Mar 12 17:21:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:21:44 +0000 Subject: [pkgdb] python-tgcaptcha was added for lmacken Message-ID: <200803121724.m2CHOpse013445@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package python-tgcaptcha with summary A TurboGears CAPTCHA widget for forms Kevin Fenzi (kevin) has approved Package python-tgcaptcha Kevin Fenzi (kevin) has added a Fedora devel branch for python-tgcaptcha with an owner of lmacken Kevin Fenzi (kevin) has approved python-tgcaptcha in Fedora devel Kevin Fenzi (kevin) has approved Package python-tgcaptcha Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-tgcaptcha (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-tgcaptcha (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-tgcaptcha (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgcaptcha From fedora-extras-commits at redhat.com Wed Mar 12 17:22:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:22:01 +0000 Subject: [pkgdb] python-tgcaptcha (Fedora, 8) updated by kevin Message-ID: <200803121725.m2CHP9ai013539@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for python-tgcaptcha Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-tgcaptcha (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-tgcaptcha (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-tgcaptcha (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-tgcaptcha (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgcaptcha From fedora-extras-commits at redhat.com Wed Mar 12 17:22:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:22:01 +0000 Subject: [pkgdb] python-tgcaptcha (Fedora, 7) updated by kevin Message-ID: <200803121725.m2CHP9cP013540@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for python-tgcaptcha Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-tgcaptcha (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-tgcaptcha (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-tgcaptcha (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-tgcaptcha (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgcaptcha From fedora-extras-commits at redhat.com Wed Mar 12 17:22:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:22:01 +0000 Subject: [pkgdb] python-tgcaptcha (Fedora EPEL, 5) updated by kevin Message-ID: <200803121725.m2CHP9al013539@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora EPEL 5 branch for python-tgcaptcha Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-tgcaptcha (Fedora EPEL 5) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-tgcaptcha (Fedora EPEL 5) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-tgcaptcha (Fedora EPEL 5) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-tgcaptcha (Fedora EPEL 5) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgcaptcha From fedora-extras-commits at redhat.com Wed Mar 12 17:22:01 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:22:01 +0000 Subject: [pkgdb] python-tgcaptcha (Fedora, devel) updated by kevin Message-ID: <200803121725.m2CHP9cS013540@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on python-tgcaptcha (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-tgcaptcha From fedora-extras-commits at redhat.com Wed Mar 12 17:22:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:22:46 GMT Subject: rpms/python-tgcaptcha - New directory Message-ID: <200803121722.m2CHMkwe032571@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-tgcaptcha In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg32529/rpms/python-tgcaptcha Log Message: Directory /cvs/extras/rpms/python-tgcaptcha added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:22:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:22:55 GMT Subject: rpms/python-tgcaptcha/devel - New directory Message-ID: <200803121722.m2CHMtsG032593@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-tgcaptcha/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg32529/rpms/python-tgcaptcha/devel Log Message: Directory /cvs/extras/rpms/python-tgcaptcha/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:23:01 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:23:01 GMT Subject: rpms/python-tgcaptcha Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803121723.m2CHN1Mp032625@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-tgcaptcha In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg32529/rpms/python-tgcaptcha Added Files: Makefile import.log Log Message: Setup of module python-tgcaptcha --- NEW FILE Makefile --- # Top level Makefile for module python-tgcaptcha all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 12 17:23:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:23:07 GMT Subject: rpms/python-tgcaptcha/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803121723.m2CHN7g7032649@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-tgcaptcha/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg32529/rpms/python-tgcaptcha/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-tgcaptcha --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: python-tgcaptcha # $Id: Makefile,v 1.1 2008/03/12 17:23:01 kevin Exp $ NAME := python-tgcaptcha SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Mar 12 17:25:24 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:25:24 +0000 Subject: [pkgdb] xdvik (Fedora, 8) updated by kevin Message-ID: <200803121728.m2CHSWR9014436@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xdvik Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xdvik (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xdvik (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xdvik (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xdvik From fedora-extras-commits at redhat.com Wed Mar 12 17:27:02 2008 From: fedora-extras-commits at redhat.com (Aristeu Sergio Rozanski Filho (arozansk)) Date: Wed, 12 Mar 2008 17:27:02 GMT Subject: rpms/wdaemon/devel wdaemon-add_abs_z.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wdaemon.spec, 1.3, 1.4 wdaemon-0.13-add_missing_entries_to_udev_rules.patch, 1.1, NONE Message-ID: <200803121727.m2CHR2cx000630@cvs-int.fedora.redhat.com> Author: arozansk Update of /cvs/pkgs/rpms/wdaemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv499 Modified Files: .cvsignore sources wdaemon.spec Added Files: wdaemon-add_abs_z.patch Removed Files: wdaemon-0.13-add_missing_entries_to_udev_rules.patch Log Message: * updating to version 0.14 to support more tablets wdaemon-add_abs_z.patch: --- NEW FILE wdaemon-add_abs_z.patch --- --- a/wacom.c (revision 102) +++ b/wacom.c (revision 103) @@ -201,6 +201,7 @@ set_event(info, UI_SET_KEYBIT, BTN_1); set_event(info, UI_SET_KEYBIT, BTN_2); set_event(info, UI_SET_KEYBIT, BTN_3); + set_event(info, UI_SET_ABSBIT, ABS_Z); /* fall thru */ case INTUOS: set_event(info, UI_SET_EVBIT, EV_MSC); @@ -318,6 +319,7 @@ case GRAPHIRE: break; + case BEE: case INTUOS3: case INTUOS3L: case CINTIQ: @@ -325,6 +327,8 @@ /* fall through */ case INTUOS3S: dev->absmax[ABS_RX] = 4096; + dev->absmax[ABS_Z] = 899; + dev->absmin[ABS_Z] = -900; /* fall through */ case INTUOS: dev->absmax[ABS_WHEEL] = 1023; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/wdaemon/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Feb 2008 20:54:38 -0000 1.4 +++ .cvsignore 12 Mar 2008 17:26:26 -0000 1.5 @@ -1 +1 @@ -wdaemon-0.13.tar.bz2 +wdaemon-0.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/wdaemon/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Feb 2008 20:54:38 -0000 1.4 +++ sources 12 Mar 2008 17:26:27 -0000 1.5 @@ -1 +1 @@ -4061282edd35cc80291323c4225e4e93 wdaemon-0.13.tar.bz2 +121b74766daa0c58e05090758e796c35 wdaemon-0.14.tar.bz2 Index: wdaemon.spec =================================================================== RCS file: /cvs/pkgs/rpms/wdaemon/devel/wdaemon.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wdaemon.spec 6 Feb 2008 20:54:38 -0000 1.3 +++ wdaemon.spec 12 Mar 2008 17:26:27 -0000 1.4 @@ -1,5 +1,5 @@ Name: wdaemon -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Hotplug helper for Wacom X.org driver @@ -7,7 +7,7 @@ License: GPL URL: http://jake.ruivo.org/~aris/wdaemon/ Source0: http://jake.ruivo.org/~aris/wdaemon/wdaemon-%{version}.tar.bz2 -Patch: wdaemon-0.13-add_missing_entries_to_udev_rules.patch +Patch: wdaemon-add_abs_z.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRequires: glibc-devel @@ -65,6 +65,10 @@ %{_sysconfdir}/udev/scripts/is_uinput.sh %changelog +* Wed Mar 12 2008 Aristeu Rozanski 0.14-1 +- Updated to version 0.14 +- Added fix for Z axis on newer tablets + * Wed Feb 06 2008 Aristeu Rozanski 0.13-1 - Updated to version 0.13 - Added missing entries in udev rules (Bamboo and Intuos3 4x6") --- wdaemon-0.13-add_missing_entries_to_udev_rules.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 17:28:55 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:28:55 +0000 Subject: [pkgdb] qt3 was added for than Message-ID: <200803121732.m2CHW3ki015056@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package qt3 with summary Qt 3 GUI toolkit Kevin Fenzi (kevin) has approved Package qt3 Kevin Fenzi (kevin) has added a Fedora devel branch for qt3 with an owner of than Kevin Fenzi (kevin) has approved qt3 in Fedora devel Kevin Fenzi (kevin) has approved Package qt3 Kevin Fenzi (kevin) has set commit to Approved for cvsextras on qt3 (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on qt3 (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on qt3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt3 From fedora-extras-commits at redhat.com Wed Mar 12 17:28:57 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:28:57 +0000 Subject: [pkgdb] qt3 (Fedora, devel) updated by kevin Message-ID: <200803121732.m2CHW5rQ015083@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on qt3 (Fedora devel) for rdieter Kevin Fenzi (kevin) approved watchcommits on qt3 (Fedora devel) for rdieter Kevin Fenzi (kevin) approved commit on qt3 (Fedora devel) for rdieter Kevin Fenzi (kevin) approved build on qt3 (Fedora devel) for rdieter Kevin Fenzi (kevin) approved approveacls on qt3 (Fedora devel) for rdieter Kevin Fenzi (kevin) approved watchbugzilla on qt3 (Fedora devel) for kkofler Kevin Fenzi (kevin) approved watchcommits on qt3 (Fedora devel) for kkofler Kevin Fenzi (kevin) approved commit on qt3 (Fedora devel) for kkofler Kevin Fenzi (kevin) approved build on qt3 (Fedora devel) for kkofler Kevin Fenzi (kevin) approved approveacls on qt3 (Fedora devel) for kkofler Kevin Fenzi (kevin) Denied cvsextras for commit access on qt3 (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/qt3 From fedora-extras-commits at redhat.com Wed Mar 12 17:29:50 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 12 Mar 2008 17:29:50 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.16, 1.1440.2.17 Message-ID: <200803121729.m2CHTovC000777@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv711 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org.spec Log Message: add new files to file list Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440.2.16 retrieving revision 1.1440.2.17 diff -u -r1.1440.2.16 -r1.1440.2.17 --- openoffice.org.spec 12 Mar 2008 16:40:53 -0000 1.1440.2.16 +++ openoffice.org.spec 12 Mar 2008 17:29:14 -0000 1.1440.2.17 @@ -1770,6 +1770,7 @@ %{instdir}/program/deployment%{SOPOST}.uno.so %{instdir}/program/deploymentgui%{SOPOST}.uno.so %{instdir}/program/dlgprov%{SOPOST}.uno.so +%{instdir}/program/fastsax.uno.so %{instdir}/program/fpicker.uno.so %{instdir}/program/fps_gnome.uno.so %{instdir}/program/fps_office.uno.so @@ -1894,6 +1895,7 @@ %{instdir}/program/libodbc2.so %{instdir}/program/libodbcbase2.so %{instdir}/program/liboffacc%{SOPOST}.so +%{instdir}/program/liboox%{SOPOST}.so %{instdir}/program/libpcr%{SOPOST}.so %{instdir}/program/libpdffilter%{SOPOST}.so %{instdir}/program/libpl%{SOPOST}.so @@ -1911,6 +1913,7 @@ %{instdir}/program/libsalhelper3gcc3.so %{instdir}/program/libsalhelpergcc3.so %{instdir}/program/libsalhelpergcc3.so.3 +%{instdir}/program/libsax%{SOPOST}.so %{instdir}/program/libscn%{SOPOST}.so %{instdir}/program/libscriptframe.so %{instdir}/program/libsd%{SOPOST}.so @@ -2397,8 +2400,10 @@ %defattr(-,root,root,-) %{instdir}/help/en/sdatabase.* %{instdir}/program/sbase +%{instdir}/program/libadabas*%{SOPOST}.so %{instdir}/program/librpt*%{SOPOST}.so %dir %{instdir}/program/resource +%{instdir}/program/resource/adabasui%{UPD}en-US.res %{instdir}/program/resource/cnr%{UPD}en-US.res %{instdir}/program/resource/rpt%{UPD}en-US.res %{instdir}/program/resource/rptui%{UPD}en-US.res @@ -2574,6 +2579,7 @@ %{instdir}/program/libswd%{SOPOST}.so %{instdir}/program/libswui%{SOPOST}.so %{instdir}/program/libwpft%{SOPOST}.so +%{instdir}/program/libwriterfilter%{SOPOST}.so %{instdir}/program/swriter %{instdir}/program/swriter.bin %dir %{instdir}/share From fedora-extras-commits at redhat.com Wed Mar 12 17:30:00 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:30:00 GMT Subject: rpms/qt3/devel - New directory Message-ID: <200803121730.m2CHU0gG000800@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/qt3/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdNl747/rpms/qt3/devel Log Message: Directory /cvs/extras/rpms/qt3/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:29:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:29:51 GMT Subject: rpms/qt3 - New directory Message-ID: <200803121729.m2CHTpbf000779@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/qt3 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdNl747/rpms/qt3 Log Message: Directory /cvs/extras/rpms/qt3 added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:30:07 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:30:07 GMT Subject: rpms/qt3 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803121730.m2CHU70i000833@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/qt3 In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdNl747/rpms/qt3 Added Files: Makefile import.log Log Message: Setup of module qt3 --- NEW FILE Makefile --- # Top level Makefile for module qt3 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 12 17:30:13 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:30:13 GMT Subject: rpms/qt3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803121730.m2CHUDF6000851@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/qt3/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsdNl747/rpms/qt3/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qt3 --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: qt3 # $Id: Makefile,v 1.1 2008/03/12 17:30:08 kevin Exp $ NAME := qt3 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Mar 12 17:30:32 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:30:32 +0000 Subject: [pkgdb] perl-JSON-Any was added for cweyl Message-ID: <200803121733.m2CHXeoS015374@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package perl-JSON-Any with summary A meta-module to make working with JSON easier Kevin Fenzi (kevin) has approved Package perl-JSON-Any Kevin Fenzi (kevin) has added a Fedora devel branch for perl-JSON-Any with an owner of cweyl Kevin Fenzi (kevin) has approved perl-JSON-Any in Fedora devel Kevin Fenzi (kevin) has approved Package perl-JSON-Any Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-JSON-Any (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-JSON-Any (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-JSON-Any (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-Any From fedora-extras-commits at redhat.com Wed Mar 12 17:30:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:30:50 +0000 Subject: [pkgdb] perl-JSON-Any (Fedora, 8) updated by kevin Message-ID: <200803121733.m2CHXwp9015423@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for perl-JSON-Any Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-JSON-Any (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-JSON-Any (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-JSON-Any (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on perl-JSON-Any (Fedora 8) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-JSON-Any (Fedora 8) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-JSON-Any (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-Any From fedora-extras-commits at redhat.com Wed Mar 12 17:30:50 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:30:50 +0000 Subject: [pkgdb] perl-JSON-Any (Fedora, 7) updated by kevin Message-ID: <200803121733.m2CHXwpC015423@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for perl-JSON-Any Kevin Fenzi (kevin) has set commit to Approved for cvsextras on perl-JSON-Any (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on perl-JSON-Any (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on perl-JSON-Any (Fedora 7) Kevin Fenzi (kevin) approved watchbugzilla on perl-JSON-Any (Fedora 7) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-JSON-Any (Fedora 7) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-JSON-Any (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-Any From fedora-extras-commits at redhat.com Wed Mar 12 17:30:51 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:30:51 +0000 Subject: [pkgdb] perl-JSON-Any (Fedora, devel) updated by kevin Message-ID: <200803121734.m2CHXwpF015423@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on perl-JSON-Any (Fedora devel) for perl-sig Kevin Fenzi (kevin) approved watchcommits on perl-JSON-Any (Fedora devel) for perl-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on perl-JSON-Any (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/perl-JSON-Any From fedora-extras-commits at redhat.com Wed Mar 12 17:31:31 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:31:31 GMT Subject: rpms/perl-JSON-Any - New directory Message-ID: <200803121731.m2CHVVCV000949@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-JSON-Any In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSbO909/rpms/perl-JSON-Any Log Message: Directory /cvs/extras/rpms/perl-JSON-Any added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:31:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:31:44 GMT Subject: rpms/perl-JSON-Any/devel - New directory Message-ID: <200803121731.m2CHVile000968@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-JSON-Any/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSbO909/rpms/perl-JSON-Any/devel Log Message: Directory /cvs/extras/rpms/perl-JSON-Any/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:31:50 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:31:50 GMT Subject: rpms/perl-JSON-Any Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803121731.m2CHVoOY000995@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-JSON-Any In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSbO909/rpms/perl-JSON-Any Added Files: Makefile import.log Log Message: Setup of module perl-JSON-Any --- NEW FILE Makefile --- # Top level Makefile for module perl-JSON-Any all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 12 17:31:59 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:31:59 GMT Subject: rpms/perl-JSON-Any/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803121731.m2CHVxGX001070@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/perl-JSON-Any/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSbO909/rpms/perl-JSON-Any/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-JSON-Any --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: perl-JSON-Any # $Id: Makefile,v 1.1 2008/03/12 17:31:50 kevin Exp $ NAME := perl-JSON-Any SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Mar 12 17:32:29 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:32:29 +0000 Subject: [pkgdb] python-jinja was added for thm Message-ID: <200803121735.m2CHZbtG015753@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package python-jinja with summary Sandboxed template engine Kevin Fenzi (kevin) has approved Package python-jinja Kevin Fenzi (kevin) has added a Fedora devel branch for python-jinja with an owner of thm Kevin Fenzi (kevin) has approved python-jinja in Fedora devel Kevin Fenzi (kevin) has approved Package python-jinja Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-jinja (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-jinja (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-jinja (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-jinja From fedora-extras-commits at redhat.com Wed Mar 12 17:32:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:32:44 +0000 Subject: [pkgdb] python-jinja (Fedora, 8) updated by kevin Message-ID: <200803121735.m2CHZq8j015798@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for python-jinja Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-jinja (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-jinja (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-jinja (Fedora 8) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-jinja (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-jinja From fedora-extras-commits at redhat.com Wed Mar 12 17:32:44 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:32:44 +0000 Subject: [pkgdb] python-jinja (Fedora, 7) updated by kevin Message-ID: <200803121735.m2CHZq8m015798@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 7 branch for python-jinja Kevin Fenzi (kevin) has set commit to Approved for cvsextras on python-jinja (Fedora 7) Kevin Fenzi (kevin) has set build to Approved for cvsextras on python-jinja (Fedora 7) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on python-jinja (Fedora 7) Kevin Fenzi (kevin) Approved cvsextras for commit access on python-jinja (Fedora 7) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-jinja From fedora-extras-commits at redhat.com Wed Mar 12 17:32:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 17:32:45 +0000 Subject: [pkgdb] python-jinja (Fedora, devel) updated by kevin Message-ID: <200803121735.m2CHZq8p015798@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) Approved cvsextras for commit access on python-jinja (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/python-jinja From fedora-extras-commits at redhat.com Wed Mar 12 17:33:27 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 17:33:27 GMT Subject: rpms/gconfmm26/devel .cvsignore, 1.10, 1.11 gconfmm.spec, 1.18, 1.19 sources, 1.10, 1.11 Message-ID: <200803121733.m2CHXRft001309@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gconfmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1280 Modified Files: .cvsignore gconfmm.spec sources Log Message: Update to upstream 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Sep 2007 21:44:34 -0000 1.10 +++ .cvsignore 12 Mar 2008 17:32:56 -0000 1.11 @@ -1 +1 @@ -gconfmm-2.20.0.tar.bz2 +gconfmm-2.22.0.tar.bz2 Index: gconfmm.spec =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/gconfmm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gconfmm.spec 19 Feb 2008 01:09:54 -0000 1.18 +++ gconfmm.spec 12 Mar 2008 17:32:56 -0000 1.19 @@ -1,6 +1,6 @@ Name: gconfmm26 -Version: 2.20.0 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Summary: C++ wrapper for GConf2 @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Mar 12 2008 Denis Leroy - 2.22.0-1 +- Update to upstream 2.22.0 + * Mon Feb 18 2008 Fedora Release Engineering - 2.20.0-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Sep 2007 21:44:34 -0000 1.10 +++ sources 12 Mar 2008 17:32:56 -0000 1.11 @@ -1 +1 @@ -24d7e01104394229f28e32a1dc17c819 gconfmm-2.20.0.tar.bz2 +4090b7333a928c6baeff583a9a0b2b55 gconfmm-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 17:33:44 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:33:44 GMT Subject: rpms/python-jinja - New directory Message-ID: <200803121733.m2CHXiP0001346@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-jinja In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBw1315/rpms/python-jinja Log Message: Directory /cvs/extras/rpms/python-jinja added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:33:51 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:33:51 GMT Subject: rpms/python-jinja/devel - New directory Message-ID: <200803121733.m2CHXpAp001365@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-jinja/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBw1315/rpms/python-jinja/devel Log Message: Directory /cvs/extras/rpms/python-jinja/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 17:33:52 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 17:33:52 GMT Subject: rpms/python-jinja Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803121733.m2CHXqS6001389@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-jinja In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBw1315/rpms/python-jinja Added Files: Makefile import.log Log Message: Setup of module python-jinja --- NEW FILE Makefile --- # Top level Makefile for module python-jinja all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 12 17:34:29 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 12 Mar 2008 17:34:29 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.7.2.1, 1.7.2.2 Message-ID: <200803121734.m2CHYTgh001439@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1410 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch Log Message: bump id openoffice.org-2.2.0.ooo68717.gstreamer.video.patch: Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -u -r1.7.2.1 -r1.7.2.2 --- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 12 Mar 2008 16:40:53 -0000 1.7.2.1 +++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 12 Mar 2008 17:34:13 -0000 1.7.2.2 @@ -3196,8 +3196,8 @@ public LocaleCodes (XMultiServiceFactory xmsf) { super(xmsf, UNIT_NAME, MODULE_NAME); -- allLanguageStrings = getStringList(16298); // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools -+ allLanguageStrings = getStringList(16300); // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools +- allLanguageStrings = getStringList(16299); // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools ++ allLanguageStrings = getStringList(16301); // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools } public String getLanguageString(String MSID) { From fedora-extras-commits at redhat.com Wed Mar 12 17:40:28 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 12 Mar 2008 17:40:28 GMT Subject: rpms/amarok/devel amarok.spec,1.103,1.104 Message-ID: <200803121740.m2CHeSBw001695@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1649 Modified Files: amarok.spec Log Message: * Wed Mar 12 2008 Rex Dieter - 1.4.8-5 - -konqueror: drop Obsoletes: %name < 1.4.8-4 , which breaks multilib upgrades (#436578) Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- amarok.spec 22 Feb 2008 04:47:19 -0000 1.103 +++ amarok.spec 12 Mar 2008 17:39:56 -0000 1.104 @@ -14,7 +14,7 @@ Name: amarok Summary: Media player Version: 1.4.8 -Release: 4%{?dist}.1 +Release: 5%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -109,8 +109,6 @@ Summary: Amarok konqueror (service menus, sidebar) support Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -# Upgrade path for previous users, where this subpkg didn't yet exist -- Rex -Obsoletes: %{name} < 1.4.8-4 %description konqueror %{summary}. @@ -287,6 +285,10 @@ %changelog +* Wed Mar 12 2008 Rex Dieter - 1.4.8-5 +- -konqueror: drop Obsoletes: %%name < 1.4.8-4 , which breaks + multilib upgrades (#436578) + * Thu Feb 21 2008 Rex Dieter - 1.4.8-4 - -konqueror subpkg (#426803) - fix multiarch conflicts (#340641) From fedora-extras-commits at redhat.com Wed Mar 12 17:40:35 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 12 Mar 2008 17:40:35 GMT Subject: rpms/perl-Mail-GnuPG/devel perl-Mail-GnuPG.spec,1.7,1.8 Message-ID: <200803121740.m2CHeZLb001741@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1673 Modified Files: perl-Mail-GnuPG.spec Log Message: * Wed Mar 12 2008 Ralf Cors??pius - 0.15-1 - Upstream update. - Correct license tag: GPLv2 or Artistic-v1.0. - Convert README to utf8. Index: perl-Mail-GnuPG.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/perl-Mail-GnuPG.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Mail-GnuPG.spec 7 Mar 2008 02:09:11 -0000 1.7 +++ perl-Mail-GnuPG.spec 12 Mar 2008 17:40:03 -0000 1.8 @@ -1,8 +1,8 @@ Name: perl-Mail-GnuPG Summary: Process email with GPG Version: 0.10 -Release: 2%{?dist} -License: GPL+ or Artistic +Release: 1%{?dist} +License: GPLv2 or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-GnuPG/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,6 +29,8 @@ %prep %setup -q -n Mail-GnuPG-%{version} +iconv -f iso-8859-1 -t utf-8 README > README~ +mv README~ README %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -54,6 +56,11 @@ %{_mandir}/man3/* %changelog +* Wed Mar 12 2008 Ralf Cors??pius - 0.15-1 +- Upstream update. +- Correct license tag: GPLv2 or Artistic-v1.0. +- Convert README to utf8. + * Thu Mar 06 2008 Tom "spot" Callaway - 0.10-2 Rebuild for new perl From fedora-extras-commits at redhat.com Wed Mar 12 17:41:33 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 12 Mar 2008 17:41:33 GMT Subject: rpms/perl-Mail-GnuPG/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200803121741.m2CHfXkx001849@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1818 Modified Files: .cvsignore sources Log Message: * Wed Mar 12 2008 Ralf Cors??pius - 0.15-1 - Upstream update. - Correct license tag: GPLv2 or Artistic-v1.0. - Convert README to utf8. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Sep 2007 09:19:28 -0000 1.3 +++ .cvsignore 12 Mar 2008 17:41:02 -0000 1.4 @@ -1 +1 @@ -Mail-GnuPG-0.10.tar.gz +Mail-GnuPG-0.15.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Sep 2007 09:19:28 -0000 1.3 +++ sources 12 Mar 2008 17:41:02 -0000 1.4 @@ -1 +1 @@ -12a24de59a383d803f99dd579db83c57 Mail-GnuPG-0.10.tar.gz +7f18a7af0d8998a3f362e8e12abe16a2 Mail-GnuPG-0.15.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 17:43:28 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 12 Mar 2008 17:43:28 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.7.2.2, 1.7.2.3 Message-ID: <200803121743.m2CHhSFG001933@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1908 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch Log Message: sneaky openoffice.org-2.2.0.ooo68717.gstreamer.video.patch: Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -u -r1.7.2.2 -r1.7.2.3 --- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 12 Mar 2008 17:34:13 -0000 1.7.2.2 +++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 12 Mar 2008 17:43:25 -0000 1.7.2.3 @@ -3196,8 +3196,8 @@ public LocaleCodes (XMultiServiceFactory xmsf) { super(xmsf, UNIT_NAME, MODULE_NAME); -- allLanguageStrings = getStringList(16299); // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools -+ allLanguageStrings = getStringList(16301); // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools +- allLanguageStrings = getStringList(16299); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src ++ allLanguageStrings = getStringList(16301); // STR_ARR_SVT_LANGUAGE_TABLE part of SvtLanguageTable from svtools } public String getLanguageString(String MSID) { From fedora-extras-commits at redhat.com Wed Mar 12 17:44:59 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 12 Mar 2008 17:44:59 GMT Subject: rpms/liboil/devel liboil-0.3.13-disable-ppc64-opts.patch, NONE, 1.1 liboil.spec, 1.30, 1.31 Message-ID: <200803121744.m2CHixWu002049@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1951 Modified Files: liboil.spec Added Files: liboil-0.3.13-disable-ppc64-opts.patch Log Message: * Wed Mar 12 2008 - Bastien Nocera - 0.3.13-6 - Disable PPC64 optimisations as rgb2bgr_ppc() crashes on 64-bit liboil-0.3.13-disable-ppc64-opts.patch: --- NEW FILE liboil-0.3.13-disable-ppc64-opts.patch --- --- configure.old 2008-03-12 17:30:29.000000000 +0000 +++ configure 2008-03-12 17:34:06.000000000 +0000 @@ -10534,7 +10534,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF ;; - xpowerpc|xppc|xpowerpc64|xppc64) + xpowerpc|xppc) HAVE_POWERPC=yes cat >>confdefs.h <<\_ACEOF @@ -10631,7 +10631,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - flag_ok=yes + flag_ok=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10641,7 +10641,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "X$flag_ok" = Xyes ; then + if test "X$flag_ok" = Xyes -a "X$HAVE_POWERPC" = "Xyes" ; then HAVE_GCC_ASM_POWERPC_FPU=yes true else Index: liboil.spec =================================================================== RCS file: /cvs/pkgs/rpms/liboil/devel/liboil.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- liboil.spec 11 Mar 2008 14:35:30 -0000 1.30 +++ liboil.spec 12 Mar 2008 17:43:58 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil Version: 0.3.13 -Release: 5%{?dist} +Release: 6%{?dist} # See COPYING which details everything, various BSD licenses apply License: BSD Group: System Environment/Libraries @@ -12,6 +12,8 @@ Patch2: liboil-0.3.13-better-altivec-detect.patch # from upstream git Patch3: clobber-ecx.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=435771 +Patch4: liboil-0.3.13-disable-ppc64-opts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel @@ -43,6 +45,7 @@ %patch1 -p1 -b .s390 %patch2 -p0 -b .better-altivec-detect %patch3 -p1 -b .clobber-ecx +%patch4 -p0 -b .disable-ppc64-opts # Disable Altivec, so that liboil doesn't SIGILL on non-Altivec PPCs # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c15 @@ -90,6 +93,9 @@ %changelog +* Wed Mar 12 2008 - Bastien Nocera - 0.3.13-6 +- Disable PPC64 optimisations as rgb2bgr_ppc() crashes on 64-bit + * Tue Mar 11 2008 - Bastien Nocera - 0.3.13-5 - Detect Altivec using /proc instead of causing a SIGILL fault From fedora-extras-commits at redhat.com Wed Mar 12 17:50:17 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 12 Mar 2008 17:50:17 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch, 1.1.2.1, 1.1.2.2 Message-ID: <200803121750.m2CHoHFS002241@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2220 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch Log Message: oh, Sun's template gets in for 3.0, but not our one, fascinating openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch: Index: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 10 Mar 2008 16:00:23 -0000 1.1.2.1 +++ openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 12 Mar 2008 17:50:15 -0000 1.1.2.2 @@ -88,14 +88,14 @@ diff -ruN sd.orig/source/ui/inc/strings.hrc sd/source/ui/inc/strings.hrc --- openoffice.org.orig/sd/source/ui/inc/strings.hrc 2006-07-05 23:53:36.000000000 +0200 +++ openoffice.org/sd/source/ui/inc/strings.hrc 2007-07-27 15:13:52.000000000 +0200 -@@ -295,6 +295,7 @@ - #define STR_AUTOLAYOUT_HANDOUT4 (RID_APP_START+234) +@@ -202,6 +202,7 @@ #define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235) #define STR_AUTOLAYOUT_NOTES (RID_APP_START+236) -+#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+237) - + #define STR_AUTOLAYOUT_HANDOUT9 (RID_APP_START+237) ++#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+238) #define STR_TRANSFORM (RID_APP_START+240) + diff -ruN sd.orig/source/ui/toolpanel/LayoutMenu.cxx sd/source/ui/toolpanel/LayoutMenu.cxx --- openoffice.org.orig/sd/source/ui/toolpanel/LayoutMenu.cxx 2006-12-12 19:40:07.000000000 +0100 +++ openoffice.org/sd/source/ui/toolpanel/LayoutMenu.cxx 2007-07-27 15:13:02.000000000 +0200 From fedora-extras-commits at redhat.com Wed Mar 12 17:52:22 2008 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Wed, 12 Mar 2008 17:52:22 GMT Subject: rpms/xmltoman/devel xmltoman-0.3-timestamps.patch, NONE, 1.1 xmltoman.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803121752.m2CHqMMJ002462@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/xmltoman/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2377/devel Modified Files: .cvsignore sources Added Files: xmltoman-0.3-timestamps.patch xmltoman.spec Log Message: initial import xmltoman-0.3-timestamps.patch: --- NEW FILE xmltoman-0.3-timestamps.patch --- Preserve timestamps, thanks Parag. https://bugzilla.redhat.com/show_bug.cgi?id=xmltoman-review#c2 diff -urp xmltoman-0.3.orig/Makefile xmltoman-0.3/Makefile --- xmltoman-0.3.orig/Makefile 2003-10-03 15:43:17.000000000 +0200 +++ xmltoman-0.3/Makefile 2008-03-12 13:16:56.000000000 +0100 @@ -12,12 +12,12 @@ xmltoman.1: xml/xmltoman.1.xml xmlmantohtml.1: xml/xmlmantohtml.1.xml ./xmltoman $< > $@ -install: - install -D xmltoman $(DESTDIR)/$(PREFIX)/bin/xmltoman - install -D xmlmantohtml $(DESTDIR)/$(PREFIX)/bin/xmlmantohtml - install -D -m 0644 xmltoman.dtd $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.dtd - install -D -m 0644 xmltoman.css $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.css - install -D -m 0644 xmltoman.xsl $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.xsl +install -p: + install -p -D xmltoman $(DESTDIR)/$(PREFIX)/bin/xmltoman + install -p -D xmlmantohtml $(DESTDIR)/$(PREFIX)/bin/xmlmantohtml + install -p -D -m 0644 xmltoman.dtd $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.dtd + install -p -D -m 0644 xmltoman.css $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.css + install -p -D -m 0644 xmltoman.xsl $(DESTDIR)/$(PREFIX)/share/xmltoman/xmltoman.xsl dist: [ -d $(DISTNAME) ] && rm -rf $(DISTNAME) || true --- NEW FILE xmltoman.spec --- Name: xmltoman Version: 0.3 Release: 2%{?dist} Summary: Scripts for converting XML to roff or HTML Group: Applications/Publishing License: GPLv2+ URL: http://sourceforge.net/projects/xmltoman/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: xmltoman-0.3-timestamps.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(XML::Parser) BuildArch: noarch %description This package provides xmltoman and xmlmantohtml scripts, to compile the xml representation of manual page to either roff source, or HTML (while providing the CSS stylesheet for eye-candy look). XSL stylesheet for doing rougly the same job is provided. %prep %setup -q %patch0 -p1 -b .timestamps %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/xmltoman %{_bindir}/xmlmantohtml %{_datadir}/xmltoman %doc COPYING README %changelog * Wed Mar 12 2008 Lubomir Kundrak - 0.3-2 - Preserve timestamps, sanitize requires (thanks to Parag AN) * Sun Mar 09 2008 Lubomir Kundrak - 0.3-1 - Initial packaging attempt Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xmltoman/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 17:20:46 -0000 1.1 +++ .cvsignore 12 Mar 2008 17:51:49 -0000 1.2 @@ -0,0 +1 @@ +xmltoman-0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xmltoman/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 17:20:46 -0000 1.1 +++ sources 12 Mar 2008 17:51:49 -0000 1.2 @@ -0,0 +1 @@ +30272d184b99f5920994bda9abe4baf7 xmltoman-0.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 17:52:32 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Wed, 12 Mar 2008 17:52:32 GMT Subject: rpms/perl-Mail-GnuPG/devel perl-Mail-GnuPG.spec,1.8,1.9 Message-ID: <200803121752.m2CHqWI2002506@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-Mail-GnuPG/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2385 Modified Files: perl-Mail-GnuPG.spec Log Message: Update to 0.15. Index: perl-Mail-GnuPG.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Mail-GnuPG/devel/perl-Mail-GnuPG.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Mail-GnuPG.spec 12 Mar 2008 17:40:03 -0000 1.8 +++ perl-Mail-GnuPG.spec 12 Mar 2008 17:51:52 -0000 1.9 @@ -1,6 +1,6 @@ Name: perl-Mail-GnuPG Summary: Process email with GPG -Version: 0.10 +Version: 0.15 Release: 1%{?dist} License: GPLv2 or Artistic Group: Development/Libraries From fedora-extras-commits at redhat.com Wed Mar 12 17:57:28 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 12 Mar 2008 17:57:28 GMT Subject: rpms/amarok/F-8 amarok.spec,1.93,1.94 Message-ID: <200803121757.m2CHvS14002684@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/amarok/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2650 Modified Files: amarok.spec Log Message: * Wed Mar 12 2008 Rex Dieter - 1.4.8-5 - -konqueror: drop Obsoletes: %name < 1.4.8-4 , which breaks multilib upgrades (#436578) Index: amarok.spec =================================================================== RCS file: /cvs/pkgs/rpms/amarok/F-8/amarok.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- amarok.spec 22 Feb 2008 04:03:30 -0000 1.93 +++ amarok.spec 12 Mar 2008 17:56:57 -0000 1.94 @@ -14,7 +14,7 @@ Name: amarok Summary: Media player Version: 1.4.8 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -41,6 +41,8 @@ BuildRequires: kdelibs3-devel %if 0%{?konq} BuildRequires: kdebase3-devel +%else +Obsoletes: %{name}-konqueror < %{version}-%{release} %endif BuildRequires: taglib-devel BuildRequires: libifp-devel @@ -107,8 +109,6 @@ Summary: Amarok konqueror (service menus, sidebar) support Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -# Upgrade path for previous users, where this subpkg didn't yet exist -- Rex -Obsoletes: %{name} < 1.4.8-4 %description konqueror %{summary}. @@ -285,6 +285,10 @@ %changelog +* Wed Mar 12 2008 Rex Dieter - 1.4.8-5 +- -konqueror: drop Obsoletes: %%name < 1.4.8-4 , which breaks + multilib upgrades (#436578) + * Thu Feb 21 2008 Rex Dieter - 1.4.8-4 - -konqueror subpkg (#426803) - fix multiarch conflicts (#340641) From fedora-extras-commits at redhat.com Wed Mar 12 17:57:52 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 12 Mar 2008 17:57:52 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch, 1.2, 1.2.2.1 Message-ID: <200803121757.m2CHvqPM002764@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2741 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch Log Message: update fix openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch: Index: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch 20 Dec 2007 16:13:58 -0000 1.2 +++ openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch 12 Mar 2008 17:57:50 -0000 1.2.2.1 @@ -5,16 +5,16 @@ diff -u -r1.105.2.2 paintfrm.cxx --- openoffice.org.orig/sw/source/core/layout/paintfrm.cxx 24 Aug 2007 11:52:41 -0000 1.105.2.2 +++ openoffice.org/sw/source/core/layout/paintfrm.cxx 16 Dec 2007 13:38:26 -0000 -@@ -2979,7 +2979,11 @@ - // OD 20.12.2002 #94627# - no paint of page border and shadow, if - // writer is in place mode. - if( pSh->GetWin() && -- !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() ) -+ ( -+ !pSh->GetDoc()->GetDocShell() || -+ !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() -+ ) -+ ) - { - // OD 12.02.2003 #i9719#, #105645# - use new method - // . +@@ -3006,7 +3006,11 @@ + // OD 20.12.2002 #94627# - no paint of page border and shadow, if + // writer is in place mode. + if( pSh->GetWin() && +- !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() ) ++ ( ++ !pSh->GetDoc()->GetDocShell() || ++ !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() ++ ) ++ ) + { + // OD 12.02.2003 #i9719#, #105645# - use new method + // . From fedora-extras-commits at redhat.com Wed Mar 12 18:02:05 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 18:02:05 GMT Subject: rpms/libgnomecanvasmm26/devel .cvsignore, 1.7, 1.8 libgnomecanvasmm.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200803121802.m2CI25RV009166@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomecanvasmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9090 Modified Files: .cvsignore libgnomecanvasmm.spec sources Log Message: Update to upstream 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Sep 2007 12:00:04 -0000 1.7 +++ .cvsignore 12 Mar 2008 18:01:32 -0000 1.8 @@ -1 +1 @@ -libgnomecanvasmm-2.20.0.tar.bz2 +libgnomecanvasmm-2.22.0.tar.bz2 Index: libgnomecanvasmm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libgnomecanvasmm.spec 19 Feb 2008 01:15:44 -0000 1.16 +++ libgnomecanvasmm.spec 12 Mar 2008 18:01:32 -0000 1.17 @@ -1,13 +1,13 @@ Name: libgnomecanvasmm26 -Version: 2.20.0 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Summary: C++ interface for Gnome libs (a GUI library for X) Group: System Environment/Libraries License: LGPLv2+ URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvasmm/2.12/libgnomecanvasmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvasmm/2.22/libgnomecanvasmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -74,6 +74,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Mar 12 2008 Denis Leroy - 2.22.0-1 +- Update to upstream 2.22.0 + * Mon Feb 18 2008 Fedora Release Engineering - 2.20.0-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Sep 2007 12:00:04 -0000 1.7 +++ sources 12 Mar 2008 18:01:32 -0000 1.8 @@ -1 +1 @@ -2a7cdcfd093db49c41e455e7b744e1c2 libgnomecanvasmm-2.20.0.tar.bz2 +d5b08af567fe1df9752fbdae980bf23c libgnomecanvasmm-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 18:02:08 2008 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Wed, 12 Mar 2008 18:02:08 GMT Subject: rpms/pulseaudio/devel pulseaudio.spec,1.33,1.34 Message-ID: <200803121802.m2CI28mP009170@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/pulseaudio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9118 Modified Files: pulseaudio.spec Log Message: xmltoman is now in Fedora, use it Index: pulseaudio.spec =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- pulseaudio.spec 29 Feb 2008 16:42:40 -0000 1.33 +++ pulseaudio.spec 12 Mar 2008 18:01:37 -0000 1.34 @@ -3,7 +3,7 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 0.9.8 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz @@ -13,8 +13,8 @@ BuildRequires: liboil-devel, m4, libcap-devel, libtool-ltdl-devel, pkgconfig BuildRequires: alsa-lib-devel, glib2-devel, avahi-devel, GConf2-devel BuildRequires: lirc-devel, doxygen, jack-audio-connection-kit-devel -#jack-audio-connection-kit-devel BuildRequires: hal-devel, libatomic_ops-devel, PolicyKit-devel bluez-libs-devel +BuildRequires: xmltoman # Libtool is dragging in rpaths. Fedora's libtool should get rid of the # unneccessary ones. BuildRequires: libtool @@ -394,6 +394,9 @@ %{_mandir}/man1/pax11publish.1.gz %changelog +* Wed Mar 12 2008 Lubomir Kundrak 0.9.8-10 +- Build the manual pages with xmltoman + * Fri Feb 29 2008 Lubomir Kundrak 0.9.8-9 - Fix the fix. From fedora-extras-commits at redhat.com Wed Mar 12 18:03:47 2008 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 12 Mar 2008 18:03:47 GMT Subject: rpms/ytalk/devel ytalk.spec,1.14,1.15 Message-ID: <200803121803.m2CI3lrC009275@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9244 Modified Files: ytalk.spec Log Message: ugh, test Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ytalk.spec 12 Mar 2008 14:39:27 -0000 1.14 +++ ytalk.spec 12 Mar 2008 18:03:15 -0000 1.15 @@ -1,5 +1,4 @@ Summary: A chat program for multiple users - Name: ytalk Version: 3.3.0 Release: 12%{?dist} From fedora-extras-commits at redhat.com Wed Mar 12 18:05:26 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 12 Mar 2008 18:05:26 GMT Subject: rpms/openoffice.org/devel workspace.cmcfixes43.patch, 1.1.2.5, 1.1.2.6 Message-ID: <200803121805.m2CI5Q8a009361@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9330 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 workspace.cmcfixes43.patch Log Message: update fix workspace.cmcfixes43.patch: Index: workspace.cmcfixes43.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/Attic/workspace.cmcfixes43.patch,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- workspace.cmcfixes43.patch 10 Mar 2008 19:57:24 -0000 1.1.2.5 +++ workspace.cmcfixes43.patch 12 Mar 2008 18:05:08 -0000 1.1.2.6 @@ -986,19 +986,6 @@ #ifdef GCC namespace std -Index: tools/solenv/config/sdev300.ini -diff -u tools/solenv/config/sdev300.ini:1.2 tools/solenv/config/sdev300.ini:1.2.10.1 ---- tools/solenv/config/sdev300.ini:1.2 Mon Feb 25 08:39:12 2008 -+++ tools/solenv/config/sdev300.ini Mon Mar 10 05:19:44 2008 -@@ -86,7 +86,7 @@ - { - BIG_SVX TRUE - BMP_WRITES_FLAG TRUE -- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT REPORTDESIGN SDEXT -+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT LPSOLVE XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT REPORTDESIGN SDEXT - RES_ENUS TRUE - RES_GER TRUE - NO_REC_RES TRUE Index: tools/solenv/inc/libs.mk diff -u tools/solenv/inc/libs.mk:1.126 tools/solenv/inc/libs.mk:1.126.10.1 --- tools/solenv/inc/libs.mk:1.126 Mon Feb 25 08:42:00 2008 From fedora-extras-commits at redhat.com Wed Mar 12 18:07:48 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 18:07:48 GMT Subject: rpms/gnome-vfsmm26/devel .cvsignore, 1.8, 1.9 gnome-vfsmm.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200803121807.m2CI7mGV009548@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gnome-vfsmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9497 Modified Files: .cvsignore gnome-vfsmm.spec sources Log Message: Update to upstream 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Sep 2007 08:35:33 -0000 1.8 +++ .cvsignore 12 Mar 2008 18:07:10 -0000 1.9 @@ -1 +1 @@ -gnome-vfsmm-2.20.0.tar.bz2 +gnome-vfsmm-2.22.0.tar.bz2 Index: gnome-vfsmm.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnome-vfsmm.spec 19 Feb 2008 01:11:50 -0000 1.16 +++ gnome-vfsmm.spec 12 Mar 2008 18:07:10 -0000 1.17 @@ -1,6 +1,6 @@ Name: gnome-vfsmm26 -Version: 2.20.0 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Summary: C++ wrapper for gnome-vfs @@ -71,6 +71,9 @@ %changelog +* Wed Mar 12 2008 Denis Leroy - 2.22.0-1 +- Update to upstream 2.22.0 + * Mon Feb 18 2008 Fedora Release Engineering - 2.20.0-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Sep 2007 08:35:33 -0000 1.9 +++ sources 12 Mar 2008 18:07:10 -0000 1.10 @@ -1 +1 @@ -3da9908850655031a383998d0cda1f85 gnome-vfsmm-2.20.0.tar.bz2 +80b86e6f88ee0bd3a1babb686d0be03a gnome-vfsmm-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 18:08:40 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 12 Mar 2008 18:08:40 GMT Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xorg-x11-drv-evdev.spec, 1.24, 1.25 Message-ID: <200803121808.m2CI8e4M009616@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9545/devel Modified Files: .cvsignore sources xorg-x11-drv-evdev.spec Log Message: mighty mouse! Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 11 Mar 2008 23:13:02 -0000 1.12 +++ .cvsignore 12 Mar 2008 18:07:53 -0000 1.13 @@ -1 +1 @@ -xf86-input-evdev-20080311.tar.bz2 +xf86-input-evdev-20080312.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 11 Mar 2008 23:13:02 -0000 1.12 +++ sources 12 Mar 2008 18:07:53 -0000 1.13 @@ -1 +1 @@ -7808f84c482f4cbdc752226217e2e185 xf86-input-evdev-20080311.tar.bz2 +a42b2b4c23c6158bb64168a2c47d5b49 xf86-input-evdev-20080312.tar.bz2 Index: xorg-x11-drv-evdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xorg-x11-drv-evdev.spec 11 Mar 2008 23:13:03 -0000 1.24 +++ xorg-x11-drv-evdev.spec 12 Mar 2008 18:07:53 -0000 1.25 @@ -1,15 +1,13 @@ -# Note to self: don't update to 1.1.5 until we have an input-hotplug server. - %define tarball xf86-input-evdev %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/input -%define gitdate 20080311 +%define gitdate 20080312 Summary: Xorg X11 evdev input driver Name: xorg-x11-drv-evdev Version: 1.99.1 -Release: 0.3%{?dist} +Release: 0.4%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -55,6 +53,10 @@ %{_mandir}/man4/evdev.4* %changelog +* Wed Mar 12 2008 Adam Jackson 1.99.1-0.4 +- Today's snapshot. Fixes mouse button repeat bug, and therefore Apple + Mighty Mice are usable. Props to jkeating for the hardware. + * Tue Mar 11 2008 Adam Jackson 1.99.1-0.3 - Today's snapshot. Fixes right/middle button swap hilarity. From fedora-extras-commits at redhat.com Wed Mar 12 18:13:16 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 18:13:16 GMT Subject: rpms/libgnomemm26/devel .cvsignore, 1.10, 1.11 libgnomemm.spec, 1.18, 1.19 sources, 1.11, 1.12 Message-ID: <200803121813.m2CIDG3m009771@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomemm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9725 Modified Files: .cvsignore libgnomemm.spec sources Log Message: Update to upstream 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Sep 2007 08:40:55 -0000 1.10 +++ .cvsignore 12 Mar 2008 18:12:40 -0000 1.11 @@ -1 +1 @@ -libgnomemm-2.20.0.tar.bz2 +libgnomemm-2.22.0.tar.bz2 Index: libgnomemm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libgnomemm.spec 19 Feb 2008 01:17:38 -0000 1.18 +++ libgnomemm.spec 12 Mar 2008 18:12:40 -0000 1.19 @@ -1,13 +1,13 @@ Name: libgnomemm26 -Version: 2.20.0 -Release: 2 +Version: 2.22.0 +Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) Group: System Environment/Libraries License: LGPLv2+ URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.18/libgnomemm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomemm/2.22/libgnomemm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Mar 12 2008 Denis Leroy - 2.22.0-1 +- Update to upstream 2.22.0 + * Mon Feb 18 2008 Fedora Release Engineering - 2.20.0-2 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 20 Sep 2007 08:40:55 -0000 1.11 +++ sources 12 Mar 2008 18:12:40 -0000 1.12 @@ -1 +1 @@ -6263d15a96c34a73964be37c4e9a261f libgnomemm-2.20.0.tar.bz2 +a07209b2cfbc630f8c4d46b6a6f1db32 libgnomemm-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 18:23:27 2008 From: fedora-extras-commits at redhat.com (Daniel P. Berrange (berrange)) Date: Wed, 12 Mar 2008 18:23:27 GMT Subject: rpms/xenner/devel xenner-keymap.patch, NONE, 1.1 xenner-tap-ifname.patch, NONE, 1.1 xenner.spec, 1.9, 1.10 xenner-mac.patch, 1.1, NONE Message-ID: <200803121823.m2CINRHg010114@cvs-int.fedora.redhat.com> Author: berrange Update of /cvs/pkgs/rpms/xenner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10088 Modified Files: xenner.spec Added Files: xenner-keymap.patch xenner-tap-ifname.patch Removed Files: xenner-mac.patch Log Message: Use ifname= arg for TAP device name. Ignore -k option to QEMU xenner-keymap.patch: --- NEW FILE xenner-keymap.patch --- diff -rup xenner-0.25.orig/xenner.c xenner-0.25.new/xenner.c --- xenner-0.25.orig/xenner.c 2008-03-12 13:07:04.000000000 -0400 +++ xenner-0.25.new/xenner.c 2008-03-12 13:06:53.000000000 -0400 @@ -628,6 +628,10 @@ int main(int argc, char *argv[]) } else if (0 == strcmp(argv[opt], "-M")) { opt++; continue; + } else if (0 == strcmp(argv[opt], "-k")) { + /* XXX we should handle keyboard layout */ + opt++; continue; + } else if (0 == strcmp(argv[opt], "-hda") || 0 == strcmp(argv[opt], "-hdb") || 0 == strcmp(argv[opt], "-hdc") || xenner-tap-ifname.patch: --- NEW FILE xenner-tap-ifname.patch --- diff -rup xenner-0.25.orig/xenner.c xenner-0.25.new/xenner.c --- xenner-0.25.orig/xenner.c 2008-03-12 12:43:42.000000000 -0400 +++ xenner-0.25.new/xenner.c 2008-03-12 12:53:09.000000000 -0400 @@ -190,54 +190,6 @@ static int qemu_monitor_setup(struct xen /* ------------------------------------------------------------------ */ -static int tap_fd_to_name(int fd, char *buf, int len) -{ - /* try to figure interface name from file handle */ - struct ifreq tun, sys; - int sock = -1, ifn, match = 0; - - /* get tun dev mac address */ - memset(&tun, 0, sizeof(tun)); - if (-1 == ioctl(fd, SIOCGIFHWADDR, &tun)) - goto out; - - /* - * Loop over interfaces to find the interface name with the - * given mac address. Uses last match, to skip bridge interfaces - * which might have the same mac address. - */ - sock = socket(PF_INET, SOCK_STREAM, 0); - if (sock < 0) - goto out; - for (ifn = 0; ifn < 65536; ifn++) { - memset(&sys, 0, sizeof(sys)); - sys.ifr_ifindex = ifn; - if (ioctl(sock, SIOCGIFNAME, &sys) < 0) { - if (ENODEV == errno) - continue; - goto out; - } - if (ioctl(sock, SIOCGIFHWADDR, &sys) < 0) - goto out; - if (0 != memcmp(tun.ifr_hwaddr.sa_data, sys.ifr_hwaddr.sa_data, 6)) continue; - /* matched */ - strncpy(buf, sys.ifr_name, len); - match++; - } - - if (match) { - /* make persist and close, so netbackd can open it by name */ - ioctl(fd, TUNSETPERSIST, 1); - close(fd); - goto out; - } - -out: - if (-1 != sock) - close(sock); - return match; -} - static int qemu_parse_string(char *arg, char *tag, char *buf, int len) { char *pos; @@ -294,8 +246,7 @@ static int qemu_net_config(struct xenvm qemu_parse_string(arg, "ifname=", xen->nics[vlan].ifname, sizeof(xen->nics[vlan].ifname)); if (-1 != fd) - tap_fd_to_name(fd, xen->nics[vlan].ifname, - sizeof(xen->nics[vlan].ifname)); + ioctl(fd, TUNSETPERSIST, 1); d1printf("%s: %d: if=\"%s\"\n", __FUNCTION__, vlan, xen->nics[vlan].ifname); /* ignored ... */ Index: xenner.spec =================================================================== RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xenner.spec 27 Feb 2008 21:25:42 -0000 1.9 +++ xenner.spec 12 Mar 2008 18:22:48 -0000 1.10 @@ -1,15 +1,16 @@ Name: xenner License: GPLv2+ Version: 0.25 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Xen emulator for kvm Group: Applications/Emulators Source: %{name}-%{version}.tar.gz Patch01: %{name}-memset.diff -Patch02: %{name}-mac.patch +Patch02: %{name}-tap-ifname.patch Patch03: %{name}-log-stderr.patch Patch04: %{name}-map-foreign-pages.patch Patch05: %{name}-ld-library-path.patch +Patch06: %{name}-keymap.patch URL: http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz Requires: xen-runtime Provides: xen-hypervisor-abi = 3.2 @@ -33,6 +34,7 @@ %patch03 -p1 %patch04 -p1 %patch05 -p1 +%patch06 -p1 %build export CFLAGS="%{optflags}" @@ -64,7 +66,11 @@ rm -rf %{buildroot} %changelog -* Wed Feb 27 2008 Daniel P. Berrange 0.25-4.fc9 +* Wed Mar 12 2008 Daniel P. Berrange - 0.25-5.fc9 +- Use ifname= arg to get TAP device name +- Detect and ignore the -k option & its arg + +* Wed Feb 27 2008 Daniel P. Berrange - 0.25-4.fc9 - Fix TUN device detection (rhbz #435131) - Don't capture stderr to hardcoded logfile (rhbz #435137) - Workaround for missing xc_map_foreign_pages API (rhbz #435158) --- xenner-mac.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 18:24:40 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 12 Mar 2008 18:24:40 GMT Subject: rpms/Macaulay2/devel Macaulay2-1.1-DESTDIR.patch, NONE, 1.1 Macaulay2-1.1-gcc43.patch, NONE, 1.1 Macaulay2-1.1-optflags.patch, NONE, 1.1 Macaulay2-1.1-prefix.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 Macaulay2.spec, 1.38, 1.39 sources, 1.8, 1.9 Macaulay2-0.9.10-cout.patch, 1.1, NONE Macaulay2-0.9.10-gcc41.patch, 1.2, NONE Macaulay2-0.9.8-optflags.patch, 1.1, NONE Macaulay2-0.9.95-DESTDIR.patch, 1.1, NONE Macaulay2-0.9.95-cflags.patch, 1.1, NONE Message-ID: <200803121824.m2CIOeQp010209@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/Macaulay2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10126 Modified Files: .cvsignore Macaulay2.spec sources Added Files: Macaulay2-1.1-DESTDIR.patch Macaulay2-1.1-gcc43.patch Macaulay2-1.1-optflags.patch Macaulay2-1.1-prefix.patch Removed Files: Macaulay2-0.9.10-cout.patch Macaulay2-0.9.10-gcc41.patch Macaulay2-0.9.8-optflags.patch Macaulay2-0.9.95-DESTDIR.patch Macaulay2-0.9.95-cflags.patch Log Message: first try at Macaulay2-1.1 Macaulay2-1.1-DESTDIR.patch: --- NEW FILE Macaulay2-1.1-DESTDIR.patch --- diff -up Macaulay2-1.1/libraries/Makefile.in.DESTDIR Macaulay2-1.1/libraries/Makefile.in --- Macaulay2-1.1/libraries/Makefile.in.DESTDIR 2007-08-29 22:37:59.000000000 -0500 +++ Macaulay2-1.1/libraries/Makefile.in 2008-03-12 12:49:09.000000000 -0500 @@ -6,8 +6,8 @@ distclean :: clean distclean clean :: Makefile.library @ set -e ; for p in @LIBLIST@ libtool ; do (set -ex ; $(MAKE) -C $$p $@) || false ; done install : - @INSTALL@ -d @encapdir@/@librariesdirtail@/lib - tar cf - --exclude="*.a" --exclude="*.old" -C final at FINALPREFIX@/@librariesdirtail@/lib . | tar xf - -C @encapdir@/@librariesdirtail@/lib +# @INSTALL@ -d @encapdir@/@librariesdirtail@/lib +# tar cf - --exclude="*.a" --exclude="*.old" -C final at FINALPREFIX@/@librariesdirtail@/lib . | tar xf - -C @encapdir@/@librariesdirtail@/lib Makefile : Makefile.in ; cd .. && ./config.status libraries/Makefile Makefile.library : Makefile.library.in ; cd .. && ./config.status libraries/Makefile.library clean :: ; rm -rf final diff -up Macaulay2-1.1/libraries/Makefile.library.in.DESTDIR Macaulay2-1.1/libraries/Makefile.library.in --- Macaulay2-1.1/libraries/Makefile.library.in.DESTDIR 2008-02-07 23:00:00.000000000 -0600 +++ Macaulay2-1.1/libraries/Makefile.library.in 2008-03-12 12:45:47.000000000 -0500 @@ -9,7 +9,7 @@ LIBNAME = $(shell basename `pwd`) TARDIR ?= $(LIBNAME)-$(VERSION) TARFILE ?= $(LIBNAME)-$(VERSION).tar.gz -LIBRARIESDIR = $(PREFIX)/@librariesdirtail@ +LIBRARIESDIR = $(DESTDIR)$(PREFIX)/@librariesdirtail@ FINALLIBRARIESDIR = @FINALPREFIX@/@librariesdirtail@ CPPFLAGS := -I$(LIBRARIESDIR)/include $(CPPFLAGS) diff -up Macaulay2-1.1/include/config.Makefile.in.DESTDIR Macaulay2-1.1/include/config.Makefile.in --- Macaulay2-1.1/include/config.Makefile.in.DESTDIR 2008-02-07 23:00:00.000000000 -0600 +++ Macaulay2-1.1/include/config.Makefile.in 2008-03-12 12:42:17.000000000 -0500 @@ -34,11 +34,11 @@ LDFLAGS = @LDFLAGS@ ### Here we set the make-variables that configure uses as make-variables inside configure-variables. # The user should override only this one: -prefix = @prefix@ +prefix = $(DESTDIR)@prefix@ # We assume relative positions of files within the tree are known to the configure script. # Thus the user should not override these on the "make" command line, but may # override them on the "configure" command line instead: -exec_prefix = @exec_prefix@ +exec_prefix = $(DESTDIR)@exec_prefix@ datarootdir = @datarootdir@ docdir = @docdir@ INSTALL = @INSTALL@ Macaulay2-1.1-gcc43.patch: --- NEW FILE Macaulay2-1.1-gcc43.patch --- diff -up Macaulay2-1.1/Macaulay2/e/overflow-test.cpp.gcc43 Macaulay2-1.1/Macaulay2/e/overflow-test.cpp --- Macaulay2-1.1/Macaulay2/e/overflow-test.cpp.gcc43 2007-01-10 14:51:12.000000000 -0600 +++ Macaulay2-1.1/Macaulay2/e/overflow-test.cpp 2008-03-12 12:24:13.000000000 -0500 @@ -2,6 +2,8 @@ #define inner 5000 #include +#include +#include #include "overflow.hpp" #include "assert.h" Macaulay2-1.1-optflags.patch: --- NEW FILE Macaulay2-1.1-optflags.patch --- diff -up Macaulay2-1.1/configure.ac.optflags Macaulay2-1.1/configure.ac --- Macaulay2-1.1/configure.ac.optflags 2008-03-11 15:02:14.000000000 -0500 +++ Macaulay2-1.1/configure.ac 2008-03-11 15:05:03.000000000 -0500 @@ -806,8 +806,8 @@ else M2_CPPFLAGS="$M2_CPPFLAGS -DNDEBUG" fi if test "$OPTIMIZE" = yes -then CFLAGS="$CFLAGS -O3" - CXXFLAGS="$CXXFLAGS -O3" +then CFLAGS="-O3 $CFLAGS" + CXXFLAGS="-O3 $CXXFLAGS" else CFLAGS="$CFLAGS -O0 -fno-inline" CXXFLAGS="$CXXFLAGS -O0 -fno-inline" fi Macaulay2-1.1-prefix.patch: --- NEW FILE Macaulay2-1.1-prefix.patch --- diff -up Macaulay2-1.1/configure.ac.prefix Macaulay2-1.1/configure.ac --- Macaulay2-1.1/configure.ac.prefix 2008-02-15 09:18:15.000000000 -0600 +++ Macaulay2-1.1/configure.ac 2008-03-11 14:51:08.000000000 -0500 @@ -892,7 +892,7 @@ do eval w=\$$i ; eval v="$w" ; eval v="$ case $v in "$prefix" | "$prefix"/) eval ${i}tail="$prefix" ;; "$prefix"/*) eval ${i}tail=`echo $v | sed "s,^$prefix/,,"` ;; # let's just hope $prefix contains no comma - *) AC_MSG_ERROR(expected "$i" value "$w" to start with "prefix" value "$prefix") ;; + *) AC_MSG_NOTICE(expected "$i" value "$w" to start with "prefix" value "$prefix") ;; esac done Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/Macaulay2/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 19 Dec 2007 03:08:42 -0000 1.8 +++ .cvsignore 12 Mar 2008 18:23:58 -0000 1.9 @@ -2,3 +2,4 @@ Macaulay2.png Macaulay2-0.9.20-20060808svn.tar.bz2 Macaulay2-0.9.95-src.tar.gz +Macaulay2-1.1-src.tar.gz Index: Macaulay2.spec =================================================================== RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- Macaulay2.spec 19 Feb 2008 21:07:43 -0000 1.38 +++ Macaulay2.spec 12 Mar 2008 18:23:58 -0000 1.39 @@ -6,13 +6,13 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 -Version: 0.9.95 -Release: 10%{?dist} +Version: 1.1 +Release: 1%{?dist} License: GPLv2 Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ -Source0: http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}-src.tar.gz +Source0: http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%{version}-src.tar.gz #Source0: Macaulay2-%{version}-%{beta}.tar.bz2 Source1: Macaulay2-svn_checkout.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,15 +23,15 @@ Source11: Macaulay2.desktop Source20: etags.sh -Patch0: Macaulay2-0.9.8-optflags.patch +Patch0: Macaulay2-1.1-optflags.patch Patch1: Macaulay2-0.9.95-xdg_open.patch -Patch2: Macaulay2-0.9.10-cout.patch -Patch3: Macaulay2-0.9.95-DESTDIR.patch -Patch4: Macaulay2-0.9.10-gcc41.patch +Patch3: Macaulay2-1.1-DESTDIR.patch +Patch4: Macaulay2-1.1-gcc43.patch Patch5: Macaulay2-0.9.95-gc7.patch -Patch6: Macaulay2-0.9.95-cflags.patch +Patch7: Macaulay2-1.1-prefix.patch Patch201739: Macaulay2-0.9.95-bz201739.patch + BuildRequires: byacc BuildRequires: desktop-file-utils # etags @@ -40,17 +40,18 @@ BuildRequires: gc-devel BuildRequires: gdbm-devel BuildRequires: info -BuildRequires: ntl-devel +BuildRequires: ntl-devel >= 5.4.1 BuildRequires: factory-devel BuildRequires: libfac-devel -BuildRequires: lapack +BuildRequires: blas lapack %if 0%{?fedora} > 3 || 0%{?rhel} > 4 -BuildRequires: lapack-devel +BuildRequires: blas-devel lapack-devel %endif +BuildRequires: mpfr-devel BuildRequires: readline-devel ncurses-devel BuildRequires: time -BuildRequires: automake pkgconfig +BuildRequires: autoconf Obsoletes: Macaulay2-doc < %{version}-%{release} Provides: Macaulay2-doc = %{version}-%{release} @@ -77,16 +78,11 @@ %patch0 -p1 -b .optflags %patch1 -p1 -b .xdg_open -%patch2 -p1 -b .cout %patch3 -p1 -b .DESTDIR -%patch4 -p1 -b .gcc41 -%patch5 -p1 -b .gc7 -%patch6 -p1 -b .cflags +%patch4 -p1 -b .gcc43 +%patch7 -p1 -b .prefix %patch201739 -p1 -b .bz201739 -aclocal -autoconf - [ -f configure -a -f include/config.h ] || make @@ -101,10 +97,10 @@ %configure \ --disable-encap \ --disable-dumpdata \ - --disable-optimize \ --disable-static \ - --disable-strip \ - --with-lapacklibs="-llapack" + --disable-strip + +# --with-lapacklibs="-llapack" # Not smp-safe make @@ -182,7 +178,6 @@ %{_datadir}/Macaulay2/ %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/*/* -# FIXME %{_docdir}/Macaulay2/ %{_infodir}/* %{_mandir}/man1/* @@ -191,6 +186,9 @@ %changelog +* Tue Mar 11 2008 Rex Dieter 1.1-1 +- Macaulay2-1.1 + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.95-10 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/Macaulay2/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 19 Dec 2007 03:08:42 -0000 1.8 +++ sources 12 Mar 2008 18:23:58 -0000 1.9 @@ -1,2 +1,2 @@ cbd99341ddfbed3f87dfd062e4673937 Macaulay2.png -dbe13387812577b0abfdfa6c54eccecc Macaulay2-0.9.95-src.tar.gz +2e68a1514a84a04e6cc848285fc76479 Macaulay2-1.1-src.tar.gz --- Macaulay2-0.9.10-cout.patch DELETED --- --- Macaulay2-0.9.10-gcc41.patch DELETED --- --- Macaulay2-0.9.8-optflags.patch DELETED --- --- Macaulay2-0.9.95-DESTDIR.patch DELETED --- --- Macaulay2-0.9.95-cflags.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 18:27:03 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 18:27:03 GMT Subject: rpms/metacity/devel metacity.spec,1.148,1.149 Message-ID: <200803121827.m2CIR3hS010278@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/metacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10238 Modified Files: metacity.spec Log Message: * Wed Mar 12 2008 Marco Pesenti Gritti - 2.22.0-2 - Add patch to fix focus of keep-above windows http://bugzilla.gnome.org/show_bug.cgi?id=519188 Index: metacity.spec =================================================================== RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- metacity.spec 10 Mar 2008 04:12:54 -0000 1.148 +++ metacity.spec 12 Mar 2008 18:26:13 -0000 1.149 @@ -1,7 +1,7 @@ Summary: Metacity window manager Name: metacity Version: 2.22.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://download.gnome.org/sources/metacity/ Source0: http://download.gnome.org/sources/metacity/2.22/metacity-%{version}.tar.bz2 Patch0: default-theme.patch @@ -9,6 +9,8 @@ Patch2: skip-taskbar-tab.patch # http://bugzilla.gnome.org/show_bug.cgi?id=482354 Patch3: metacity-2.21.13-dont-move-windows.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=519188 +Patch4: metacity-2.22.0-keepabove.patch License: GPLv2+ Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +67,7 @@ %patch0 -p1 -b .default-theme %patch2 -p1 -b .skip-taskbar-tab %patch3 -p0 -b .dont-move-windows +%patch4 -p0 -b .keepabove %build rm -rf $RPM_BUILD_ROOT @@ -151,6 +154,10 @@ %{_mandir}/man1/metacity-window-demo.1.gz %changelog +* Wed Mar 12 2008 Marco Pesenti Gritti - 2.22.0-2 +- Add patch to fix focus of keep-above windows + http://bugzilla.gnome.org/show_bug.cgi?id=519188 + * Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 - Update to 2.22.0 From fedora-extras-commits at redhat.com Wed Mar 12 18:27:58 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 18:27:58 GMT Subject: rpms/metacity/devel metacity-2.22.0-keepabove.patch,NONE,1.1 Message-ID: <200803121827.m2CIRwG1010352@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/metacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10343 Added Files: metacity-2.22.0-keepabove.patch Log Message: actually add the keepabove patch metacity-2.22.0-keepabove.patch: --- NEW FILE metacity-2.22.0-keepabove.patch --- Index: src/core/window.c =================================================================== --- src/core/window.c (revision 3649) +++ src/core/window.c (working copy) @@ -2009,7 +2009,7 @@ { MetaWindow *w = tmp->data; - if (w->wm_state_above) + if (w->wm_state_above && w != newbie) { /* We have found a window that is "above". Perhaps it overlaps. */ if (windows_overlap (w, newbie)) From fedora-extras-commits at redhat.com Wed Mar 12 18:35:00 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Wed, 12 Mar 2008 18:35:00 GMT Subject: rpms/kernel/F-8 linux-2.6-usb-serial-fix-recursive-lock.patch, 1.1, 1.2 Message-ID: <200803121835.m2CIZ05w010567@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10536 Modified Files: linux-2.6-usb-serial-fix-recursive-lock.patch Log Message: use official commit linux-2.6-usb-serial-fix-recursive-lock.patch: Index: linux-2.6-usb-serial-fix-recursive-lock.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-usb-serial-fix-recursive-lock.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-usb-serial-fix-recursive-lock.patch 10 Mar 2008 22:27:36 -0000 1.1 +++ linux-2.6-usb-serial-fix-recursive-lock.patch 12 Mar 2008 18:34:38 -0000 1.2 @@ -1,31 +1,33 @@ -From zaitcev at redhat.com Wed Mar 5 11:39:23 2008 -From: Pete Zaitcev -Date: Tue, 4 Mar 2008 23:28:42 -0800 -Subject: USB: fix usb-serial generic recursive lock -To: greg at kroah.com -Cc: zaitcev at redhat.com, linux-usb at vger.kernel.org -Message-ID: <20080304232842.c783d383.zaitcev at redhat.com> - - -Nobody should be using the generic usb-serial for anything other than -testing. Still, it's not a good thing that it's easy to lock up. There -is a traceback from NMI oopser here: - https://bugzilla.redhat.com/show_bug.cgi?id=431379 - -But in short, if a line discipline has a chance to echo anything, input -can loop back a write method. So, don't call tty_flip_buffer_push from -under a lock taken on write path. - -Signed-off-by: Pete Zaitcev -Signed-off-by: Greg Kroah-Hartman - +Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b507cc9710d8b6e3013468b40522e235342fc84a +Commit: b507cc9710d8b6e3013468b40522e235342fc84a +Parent: cdeeeae056a429e729ae9e914fa8142ee45bee93 +Author: Pete Zaitcev +AuthorDate: Tue Mar 4 23:28:42 2008 -0800 +Committer: Greg Kroah-Hartman +CommitDate: Mon Mar 10 16:42:25 2008 -0700 + + USB: fix usb-serial generic recursive lock + + Nobody should be using the generic usb-serial for anything other than + testing. Still, it's not a good thing that it's easy to lock up. There + is a traceback from NMI oopser here: + https://bugzilla.redhat.com/show_bug.cgi?id=431379 + + But in short, if a line discipline has a chance to echo anything, input + can loop back a write method. So, don't call tty_flip_buffer_push from + under a lock taken on write path. + + Signed-off-by: Pete Zaitcev + Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/generic.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) + 1 files changed, 6 insertions(+), 4 deletions(-) +diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c +index 97fa3c4..7cfce9d 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c -@@ -323,7 +323,7 @@ static void flush_and_resubmit_read_urb +@@ -323,7 +323,7 @@ static void flush_and_resubmit_read_urb (struct usb_serial_port *port) room = tty_buffer_request_room(tty, urb->actual_length); if (room) { tty_insert_flip_string(tty, urb->transfer_buffer, room); @@ -34,7 +36,7 @@ } } -@@ -349,10 +349,12 @@ void usb_serial_generic_read_bulk_callba +@@ -349,10 +349,12 @@ void usb_serial_generic_read_bulk_callback (struct urb *urb) /* Throttle the device if requested by tty */ spin_lock_irqsave(&port->lock, flags); From fedora-extras-commits at redhat.com Wed Mar 12 18:50:45 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 12 Mar 2008 18:50:45 GMT Subject: rpms/qt3/devel 0038-dragobject-dont-prefer-unknown.patch, NONE, 1.1 0047-fix-kmenu-width.diff, NONE, 1.1 0048-qclipboard_hack_80072.patch, NONE, 1.1 0056-khotkeys_input_84434.patch, NONE, 1.1 0073-xinerama-aware-qpopup.patch, NONE, 1.1 0077-utf8-decoder-fixes.diff, NONE, 1.1 0079-compositing-types.patch, NONE, 1.1 0080-net-wm-sync-request-2.patch, NONE, 1.1 0084-compositing-properties.patch, NONE, 1.1 0088-fix-xinput-clash.diff, NONE, 1.1 assistant3.desktop, NONE, 1.1 designer3.desktop, NONE, 1.1 linguist3.desktop, NONE, 1.1 qt-3.0.5-nodebug.patch, NONE, 1.1 qt-3.1.0-makefile.patch, NONE, 1.1 qt-3.3.3-gtkstyle.patch, NONE, 1.1 qt-3.3.4-print-CJK.patch, NONE, 1.1 qt-3.3.6-fontrendering-214371.patch, NONE, 1.1 qt-3.3.6-fontrendering-bn_IN-209975.patch, NONE, 1.1 qt-3.3.6-fontrendering-gu-228452.patch, NONE, 1.1 qt-3.3.6-fontrendering-ml_IN-209097.patch, NONE, 1.1 qt-3.3.6-fontrendering-ml_IN-209974.patch, NONE, 1.1 qt-3.3.6-fontrendering-ml_IN-217657.patch, NONE, 1.1 qt-3.3.6-fontrendering-te_IN-211259.patch, NONE, 1.1 qt-3.3.8-fontrendering-#214570.patch, NONE, 1.1 qt-3.3.8-fontrendering-as_IN-209972.patch, NONE, 1.1 qt-uic-nostdlib.patch, NONE, 1.1 qt-x11-free-3.3.2-quiet.patch, NONE, 1.1 qt-x11-free-3.3.3-gl.patch, NONE, 1.1 qt-x11-free-3.3.3-qembed.patch, NONE, 1.1 qt-x11-free-3.3.4-fullscreen.patch, NONE, 1.1 qt-x11-free-3.3.5-uic.patch, NONE, 1.1 qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff, NONE, 1.1 qt-x11-free-3.3.6-qfontdatabase_x11.patch, NONE, 1.1 qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch, NONE, 1.1 qt-x11-free-3.3.6-strip.patch, NONE, 1.1 qt-x11-free-3.3.7-umask.patch, NONE, 1.1 qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch, NONE, 1.1 qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch, NONE, 1.1 qt-x11-free-3.3.8b-gcc4-buildkey.patch, NONE, 1.1 qt-x11-free-3.3.8b-gcc43.patch, NONE, 1.1 qt-x11-free-3.3.8b-uic-multilib.patch, NONE, 1.1 qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch, NONE, 1.1 qt.csh, NONE, 1.1 qt.sh, NONE, 1.1 qt3.spec, NONE, 1.1 qtconfig3.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803121850.m2CIojTW011177@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10971/devel Modified Files: .cvsignore sources Added Files: 0038-dragobject-dont-prefer-unknown.patch 0047-fix-kmenu-width.diff 0048-qclipboard_hack_80072.patch 0056-khotkeys_input_84434.patch 0073-xinerama-aware-qpopup.patch 0077-utf8-decoder-fixes.diff 0079-compositing-types.patch 0080-net-wm-sync-request-2.patch 0084-compositing-properties.patch 0088-fix-xinput-clash.diff assistant3.desktop designer3.desktop linguist3.desktop qt-3.0.5-nodebug.patch qt-3.1.0-makefile.patch qt-3.3.3-gtkstyle.patch qt-3.3.4-print-CJK.patch qt-3.3.6-fontrendering-214371.patch qt-3.3.6-fontrendering-bn_IN-209975.patch qt-3.3.6-fontrendering-gu-228452.patch qt-3.3.6-fontrendering-ml_IN-209097.patch qt-3.3.6-fontrendering-ml_IN-209974.patch qt-3.3.6-fontrendering-ml_IN-217657.patch qt-3.3.6-fontrendering-te_IN-211259.patch qt-3.3.8-fontrendering-#214570.patch qt-3.3.8-fontrendering-as_IN-209972.patch qt-uic-nostdlib.patch qt-x11-free-3.3.2-quiet.patch qt-x11-free-3.3.3-gl.patch qt-x11-free-3.3.3-qembed.patch qt-x11-free-3.3.4-fullscreen.patch qt-x11-free-3.3.5-uic.patch qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff qt-x11-free-3.3.6-qfontdatabase_x11.patch qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch qt-x11-free-3.3.6-strip.patch qt-x11-free-3.3.7-umask.patch qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch qt-x11-free-3.3.8b-gcc4-buildkey.patch qt-x11-free-3.3.8b-gcc43.patch qt-x11-free-3.3.8b-uic-multilib.patch qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch qt.csh qt.sh qt3.spec qtconfig3.desktop Log Message: Copy Qt 3 from qt/devel. Flip the switch: * Wed Mar 12 2008 Kevin Kofler 3.3.8b-9 - rename to qt3 on Fedora >= 9 0038-dragobject-dont-prefer-unknown.patch: --- NEW FILE 0038-dragobject-dont-prefer-unknown.patch --- qt-bugs@ issue : 38642 bugs.kde.org number : 71084 applied: no author: Lubos Lunak Hello, start Mozilla, go e.g. to http://kde.org, start KWrite (or basically any Qt app that accepts text drops), select 'Conquer your Desktop!', and try to drag&drop it onto KWrite. The only text pasted should be 'm'. I don't know much the related mimetype and encoding stuff, so I'm unsure whose fault this actually is. The text drag is provided as a lot of text/something targets, to list some text/_moz_htmlinfo, text/x-moz-url, text/unicode and similar. The problem is, Kate uses QTextDrag::decode() with no subtype specified, probably with the intention that as Kate is a text editor, it can accept any text pasted. And since the first target provided by mozilla is text/x-moz-url, (which moreover seems to be encoded as 16bit unicode), the text dropped is completely wrong. You can easily see all targets provided by Mozilla with see_mime.patch applied. Solution #1: Say that Kate (any pretty much everybody else expecting text) should say "plain" as the subtype. In such case, I suggest you drop the QTextDrag::decode() variant with no subtype specified, and stress more the fact that not specifying a subtype can result in a lot of rubbish. It's simply too tempting to leave the subtype empty and try to accept anything. Solution #2: When trying to accept anything, try to get useful data. Which means either sorting the subtypes available somehow, checking only the ones Qt knows. To me, #1 seems to be a better choice, or possibly at least something like the attached QTextDrag patch, which simply always tries first "plain" subtype if none is specified. With this patch, Mozilla even works (that's irony, of course, Mozilla still pastes the text/plain text as HTML, but at least now it pastes something where it's easy to point at the offender). --- src/kernel/qdragobject.cpp.sav 2004-01-06 19:24:35.000000000 +0100 +++ src/kernel/qdragobject.cpp 2004-01-06 19:47:01.000000000 +0100 @@ -844,6 +844,16 @@ bool QTextDrag::decode( const QMimeSourc { if(!e) return FALSE; + + // when subtype is not specified, try text/plain first, otherwise this may read + // things like text/x-moz-url even though better targets are available + if( subtype.isNull()) { + QCString subtmp = "plain"; + if( decode( e, str, subtmp )) { + subtype = subtmp; + return true; + } + } if ( e->cacheType == QMimeSource::Text ) { str = *e->cache.txt.str; 0047-fix-kmenu-width.diff: --- NEW FILE 0047-fix-kmenu-width.diff --- qt-bugs@ issue: N46882 bugs.kde.org number: 77545 applied: no author: Stephan Binner Fix wrong K menu width for the case of enabled side pixmap and a menu title (like "Recently Used Applications") being longer than every other entry. Solution: Respect PanelKMenu::setMaximumSize() as up to Qt 3.2.3 Index: src/widgets/qpopupmenu.cpp =================================================================== RCS file: /home/kde/qt-copy/src/widgets/qpopupmenu.cpp,v retrieving revision 1.60 diff -u -3 -p -b -r1.60 qpopupmenu.cpp --- src/widgets/qpopupmenu.cpp 29 Apr 2004 22:31:28 -0000 1.60 +++ src/widgets/qpopupmenu.cpp 30 Apr 2004 01:11:59 -0000 @@ -2531,7 +2531,7 @@ QSize QPopupMenu::sizeHint() const QPopupMenu* that = (QPopupMenu*) this; //We do not need a resize here, just the sizeHint.. - return that->updateSize(FALSE, FALSE).expandedTo( QApplication::globalStrut() ); + return that->updateSize(FALSE).expandedTo( QApplication::globalStrut() ); } 0048-qclipboard_hack_80072.patch: --- NEW FILE 0048-qclipboard_hack_80072.patch --- qt-bugs@ issue : none, probably even won't be bugs.kde.org number : 80072 applied: no author: Lubos Lunak A crude hack for KDE #80072. No good idea how to fix it properly yet :(. --- src/kernel/qclipboard_x11.cpp.sav 2004-04-30 12:00:06.000000000 +0200 +++ src/kernel/qclipboard_x11.cpp 2004-05-09 21:18:10.269264304 +0200 @@ -109,6 +109,7 @@ static int pending_timer_id = 0; static bool pending_clipboard_changed = FALSE; static bool pending_selection_changed = FALSE; +Q_EXPORT bool qt_qclipboard_bailout_hack = false; // event capture mechanism for qt_xclb_wait_for_event static bool waiting_for_data = FALSE; @@ -453,6 +454,15 @@ static int qt_xclb_event_filter(XEvent * return 0; } +static bool selection_request_pending = false; + +static Bool check_selection_request_pending( Display*, XEvent* e, XPointer ) + { + if( e->type == SelectionRequest && e->xselectionrequest.owner == owner->winId()) + selection_request_pending = true; + return False; + } + bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, int timeout ) { @@ -504,6 +514,14 @@ bool qt_xclb_wait_for_event( Display *dp do { if ( XCheckTypedWindowEvent(dpy,win,type,event) ) return TRUE; + if( qt_qclipboard_bailout_hack ) { + XEvent dummy; + selection_request_pending = false; + if ( owner != NULL ) + XCheckIfEvent(dpy,&dummy,check_selection_request_pending,NULL); + if( selection_request_pending ) + return TRUE; + } now = QTime::currentTime(); if ( started > now ) // crossed midnight 0056-khotkeys_input_84434.patch: --- NEW FILE 0056-khotkeys_input_84434.patch --- qt-bugs@ issue : 58251 bugs.kde.org number : 84434 applied: no author: Lubos Lunak Fixes keyboard input action in KHotKeys (see bug #84434). --- src/kernel/qapplication_x11.cpp.sav 2004-10-07 15:38:05.000000000 +0200 +++ src/kernel/qapplication_x11.cpp 2004-10-12 11:46:32.513137808 +0200 @@ -5294,8 +5294,10 @@ static Bool qt_keypress_scanner(Display qt_auto_repeat_data *d = (qt_auto_repeat_data *) arg; if (d->error || event->xkey.window != d->window || - event->xkey.keycode != d->keycode) + event->xkey.keycode != d->keycode) { + d->error = TRUE; return FALSE; + } if (event->type == XKeyPress) { d->error = (! d->release || event->xkey.time - d->timestamp > 10); 0073-xinerama-aware-qpopup.patch: --- NEW FILE 0073-xinerama-aware-qpopup.patch --- qt-bugs@ issue : none bugs.kde.org number : none applied: no author: Lubos Lunak Makes QPopupMenu aware of Xinerama (see e.g. https://bugzilla.novell.com/show_bug.cgi?id=216235). --- src/widgets/qpopupmenu.cpp +++ src/widgets/qpopupmenu.cpp @@ -454,6 +454,15 @@ void QPopupMenu::frameChanged() menuContentsChanged(); } +QRect QPopupMenu::screenRect( const QPoint& pos ) +{ + int screen_num = QApplication::desktop()->screenNumber( pos ); +#ifdef Q_WS_MAC + return QApplication::desktop()->availableGeometry( screen_num ); +#else + return QApplication::desktop()->screenGeometry( screen_num ); +#endif +} /*! Displays the popup menu so that the item number \a indexAtPoint will be at the specified \e global position \a pos. To translate a @@ -498,6 +507,15 @@ void QPopupMenu::popup( const QPoint &po // point. #endif + QRect screen = screenRect( geometry().center()); + QRect screen2 = screenRect( QApplication::reverseLayout() + ? pos+QPoint(width(),0) : pos ); + // if the widget is not in the screen given by the position, move it + // there, so that updateSize() uses the right size of the screen + if( screen != screen2 ) { + screen = screen2; + move( screen.x(), screen.y()); + } if(d->scroll.scrollable) { d->scroll.scrollable = QPopupMenuPrivate::Scroll::ScrollNone; d->scroll.topScrollableIndex = d->scroll.scrollableSize = 0; @@ -517,18 +535,6 @@ void QPopupMenu::popup( const QPoint &po updateSize(TRUE); } - int screen_num; - if (QApplication::desktop()->isVirtualDesktop()) - screen_num = - QApplication::desktop()->screenNumber( QApplication::reverseLayout() ? - pos+QPoint(width(),0) : pos ); - else - screen_num = QApplication::desktop()->screenNumber( this ); -#ifdef Q_WS_MAC - QRect screen = QApplication::desktop()->availableGeometry( screen_num ); -#else - QRect screen = QApplication::desktop()->screenGeometry( screen_num ); -#endif int sw = screen.width(); // screen width int sh = screen.height(); // screen height int sx = screen.x(); // screen pos @@ -1056,7 +1062,7 @@ QSize QPopupMenu::updateSize(bool force_ mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 4 ); } - int dh = QApplication::desktop()->height(); + int dh = screenRect( geometry().center()).height(); ncols = 1; for ( QMenuItemListIt it2( *mitems ); it2.current(); ++it2 ) { @@ -2297,9 +2303,9 @@ void QPopupMenu::subMenuTimer() { bool right = FALSE; if ( ( parentMenu && parentMenu->isPopupMenu && ((QPopupMenu*)parentMenu)->geometry().x() < geometry().x() ) || - p.x() < 0 ) + p.x() < screenRect( p ).left()) right = TRUE; - if ( right && (ps.width() > QApplication::desktop()->width() - mapToGlobal( r.topRight() ).x() ) ) + if ( right && (ps.width() > screenRect( p ).right() - mapToGlobal( r.topRight() ).x() ) ) right = FALSE; if ( right ) p.setX( mapToGlobal( r.topRight() ).x() ); @@ -2310,7 +2316,7 @@ void QPopupMenu::subMenuTimer() { bool left = FALSE; if ( ( parentMenu && parentMenu->isPopupMenu && ((QPopupMenu*)parentMenu)->geometry().x() > geometry().x() ) || - p.x() + ps.width() > QApplication::desktop()->width() ) + p.x() + ps.width() > screenRect( p ).right() ) left = TRUE; if ( left && (ps.width() > mapToGlobal( r.topLeft() ).x() ) ) left = FALSE; @@ -2318,8 +2324,8 @@ void QPopupMenu::subMenuTimer() { p.setX( mapToGlobal( r.topLeft() ).x() - ps.width() ); } QRect pr = popup->itemGeometry(popup->count() - 1); - if (p.y() + ps.height() > QApplication::desktop()->height() && - p.y() - ps.height() + (QCOORD) pr.height() >= 0) + if (p.y() + ps.height() > screenRect( p ).bottom() && + p.y() - ps.height() + (QCOORD) pr.height() >= screenRect( p ).top()) p.setY( p.y() - ps.height() + (QCOORD) pr.height()); if ( style().styleHint(QStyle::SH_PopupMenu_SloppySubMenus, this )) { Index: src/widgets/qpopupmenu.h =================================================================== --- src/widgets/qpopupmenu.h (revision 636368) +++ src/widgets/qpopupmenu.h (working copy) @@ -152,6 +152,7 @@ private: QSize updateSize(bool force_recalc=FALSE, bool do_resize=TRUE); void updateRow( int row ); + QRect screenRect(const QPoint& pos); #ifndef QT_NO_ACCEL void updateAccel( QWidget * ); void enableAccel( bool ); 0077-utf8-decoder-fixes.diff: --- NEW FILE 0077-utf8-decoder-fixes.diff --- qt-bugs@ issue : N154454 bugs.kde.org number : none applied: no author: Dirk Mueller This patch makes the utf8 decoders in Qt reject overlong sequences, like required. --- src/codecs/qutfcodec.cpp +++ src/codecs/qutfcodec.cpp @@ -154,6 +154,7 @@ class QUtf8Decoder : public QTextDecoder { uint uc; + uint min_uc; int need; bool headerDone; public: @@ -167,8 +168,9 @@ result.setLength( len ); // worst case QChar *qch = (QChar *)result.unicode(); uchar ch; + int error = -1; for (int i=0; i= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { + *qch++ = QChar::replacement; } else { if (headerDone || QChar(uc) != QChar::byteOrderMark) *qch++ = uc; @@ -190,6 +194,7 @@ } } else { // error + i = error; *qch++ = QChar::replacement; need = 0; } @@ -200,12 +205,21 @@ } else if ((ch & 0xe0) == 0xc0) { uc = ch & 0x1f; need = 1; + error = i; + min_uc = 0x80; } else if ((ch & 0xf0) == 0xe0) { uc = ch & 0x0f; need = 2; + error = i; + min_uc = 0x800; } else if ((ch&0xf8) == 0xf0) { uc = ch & 0x07; need = 3; + error = i; + min_uc = 0x10000; + } else { + // error + *qch++ = QChar::replacement; } } } --- src/tools/qstring.cpp +++ src/tools/qstring.cpp @@ -5805,6 +5805,7 @@ result.setLength( len ); // worst case QChar *qch = (QChar *)result.unicode(); uint uc = 0; + uint min_uc = 0; int need = 0; int error = -1; uchar ch; @@ -5822,6 +5823,12 @@ unsigned short low = uc%0x400 + 0xdc00; *qch++ = QChar(high); *qch++ = QChar(low); + } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { + // overlong seqence, UTF16 surrogate or BOM + i = error; + qch = addOne(qch, result); + *qch++ = QChar(0xdbff); + *qch++ = QChar(0xde00+((uchar)utf8[i])); } else { *qch++ = uc; } @@ -5844,14 +5851,17 @@ uc = ch & 0x1f; need = 1; error = i; + min_uc = 0x80; } else if ((ch & 0xf0) == 0xe0) { uc = ch & 0x0f; need = 2; error = i; + min_uc = 0x800; } else if ((ch&0xf8) == 0xf0) { uc = ch & 0x07; need = 3; error = i; + min_uc = 0x10000; } else { // Error qch = addOne(qch, result); 0079-compositing-types.patch: --- NEW FILE 0079-compositing-types.patch --- qt-bugs@ issue : none bugs.kde.org number : none applied: no author: Lubos Lunak This patch adds support for window types used for compositing (popup menu, dropdown menu, tooltip, combobox, dnd). --- src/kernel/qdnd_x11.cpp.sav 2007-05-25 18:56:23.000000000 +0200 +++ src/kernel/qdnd_x11.cpp 2007-05-31 10:30:58.000000000 +0200 @@ -261,6 +261,7 @@ public: QWidget(QApplication::desktop()->screen( screen ), 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), oldpmser( 0 ), oldbmser( 0 ) { + x11SetWindowType( X11WindowTypeDND ); } void setPixmap(QPixmap pm, QPoint hot) @@ -1221,6 +1222,7 @@ void QDragManager::move( const QPoint & // recreate the pixmap on the new screen... delete qt_xdnd_deco; qt_xdnd_deco = new QShapedPixmapWidget( screen ); + qt_xdnd_deco->x11SetWindowTransient( dragSource->topLevelWidget()); if (!QWidget::mouseGrabber()) { updatePixmap(); qt_xdnd_deco->grabMouse(); @@ -1774,6 +1776,7 @@ bool QDragManager::drag( QDragObject * o dragSource = (QWidget *)(object->parent()); + qt_xdnd_deco->x11SetWindowTransient( dragSource->topLevelWidget()); qApp->installEventFilter( this ); qt_xdnd_source_current_time = qt_x_time; XSetSelectionOwner( QPaintDevice::x11AppDisplay(), qt_xdnd_selection, --- src/kernel/qapplication_x11.cpp.sav 2007-05-29 16:24:58.000000000 +0200 +++ src/kernel/qapplication_x11.cpp 2007-05-31 10:30:58.000000000 +0200 @@ -268,6 +268,11 @@ Atom qt_net_wm_window_type_menu = 0; Atom qt_net_wm_window_type_utility = 0; Atom qt_net_wm_window_type_splash = 0; Atom qt_net_wm_window_type_override = 0; // KDE extension +Atom qt_net_wm_window_type_dropdown_menu = 0; +Atom qt_net_wm_window_type_popup_menu = 0; +Atom qt_net_wm_window_type_tooltip = 0; +Atom qt_net_wm_window_type_combo = 0; +Atom qt_net_wm_window_type_dnd = 0; Atom qt_net_wm_frame_strut = 0; // KDE extension Atom qt_net_wm_state_stays_on_top = 0; // KDE extension Atom qt_net_wm_pid = 0; @@ -1920,6 +1925,11 @@ void qt_init_internal( int *argcptr, cha qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_UTILITY", &qt_net_wm_window_type_utility ); qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_SPLASH", &qt_net_wm_window_type_splash ); qt_x11_intern_atom( "_KDE_NET_WM_WINDOW_TYPE_OVERRIDE", &qt_net_wm_window_type_override ); + qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU", &qt_net_wm_window_type_dropdown_menu ); + qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_POPUP_MENU", &qt_net_wm_window_type_popup_menu ); + qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_TOOLTIP", &qt_net_wm_window_type_tooltip ); + qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_COMBO", &qt_net_wm_window_type_combo ); + qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_DND", &qt_net_wm_window_type_dnd ); qt_x11_intern_atom( "_KDE_NET_WM_FRAME_STRUT", &qt_net_wm_frame_strut ); qt_x11_intern_atom( "_NET_WM_STATE_STAYS_ON_TOP", &qt_net_wm_state_stays_on_top ); --- src/kernel/qwidget_x11.cpp.sav 2007-05-25 18:56:23.000000000 +0200 +++ src/kernel/qwidget_x11.cpp 2007-05-31 10:30:58.000000000 +0200 @@ -125,6 +125,11 @@ extern Atom qt_net_wm_window_type_menu; extern Atom qt_net_wm_window_type_utility; extern Atom qt_net_wm_window_type_splash; extern Atom qt_net_wm_window_type_override; +extern Atom qt_net_wm_window_type_dropdown_menu; +extern Atom qt_net_wm_window_type_popup_menu; +extern Atom qt_net_wm_window_type_combo; +extern Atom qt_net_wm_window_type_dnd; +extern Atom qt_net_wm_window_type_tooltip; extern Atom qt_net_wm_pid; extern Atom qt_net_wm_user_time; extern Atom qt_enlightenment_desktop; @@ -448,10 +453,6 @@ void QWidget::create( WId window, bool i x11Colormap() ); #endif // QT_NO_XFTFREETYPE - // NET window types - long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 }; - int curr_wintype = 0; - // NET window states long net_winstates[6] = { 0, 0, 0, 0, 0, 0 }; int curr_winstate = 0; @@ -473,7 +474,6 @@ void QWidget::create( WId window, bool i if ( testWFlags(WStyle_Splash) ) { if (qt_net_supports(qt_net_wm_window_type_splash)) { clearWFlags( WX11BypassWM ); - net_wintypes[curr_wintype++] = qt_net_wm_window_type_splash; } else { setWFlags( WX11BypassWM | WStyle_Tool | WStyle_NoBorder ); } @@ -482,27 +482,22 @@ void QWidget::create( WId window, bool i mwmhints.decorations = 0L; mwmhints.flags |= (1L << 1); // MWM_HINTS_DECORATIONS - if ( testWFlags( WStyle_NoBorder ) ) { - // override netwm type - quick and easy for KDE noborder - net_wintypes[curr_wintype++] = qt_net_wm_window_type_override; - } else { - if ( testWFlags( WStyle_NormalBorder | WStyle_DialogBorder ) ) { - mwmhints.decorations |= (1L << 1); // MWM_DECOR_BORDER - mwmhints.decorations |= (1L << 2); // MWM_DECOR_RESIZEH - } + if ( testWFlags( WStyle_NormalBorder | WStyle_DialogBorder ) ) { + mwmhints.decorations |= (1L << 1); // MWM_DECOR_BORDER + mwmhints.decorations |= (1L << 2); // MWM_DECOR_RESIZEH + } - if ( testWFlags( WStyle_Title ) ) - mwmhints.decorations |= (1L << 3); // MWM_DECOR_TITLE + if ( testWFlags( WStyle_Title ) ) + mwmhints.decorations |= (1L << 3); // MWM_DECOR_TITLE - if ( testWFlags( WStyle_SysMenu ) ) - mwmhints.decorations |= (1L << 4); // MWM_DECOR_MENU + if ( testWFlags( WStyle_SysMenu ) ) + mwmhints.decorations |= (1L << 4); // MWM_DECOR_MENU - if ( testWFlags( WStyle_Minimize ) ) - mwmhints.decorations |= (1L << 5); // MWM_DECOR_MINIMIZE + if ( testWFlags( WStyle_Minimize ) ) + mwmhints.decorations |= (1L << 5); // MWM_DECOR_MINIMIZE - if ( testWFlags( WStyle_Maximize ) ) - mwmhints.decorations |= (1L << 6); // MWM_DECOR_MAXIMIZE - } + if ( testWFlags( WStyle_Maximize ) ) + mwmhints.decorations |= (1L << 6); // MWM_DECOR_MAXIMIZE if (testWFlags(WStyle_Tool)) { wsa.save_under = True; @@ -522,23 +517,6 @@ void QWidget::create( WId window, bool i } } - // ### need a better way to do this - if (inherits("QPopupMenu")) { - // menu netwm type - net_wintypes[curr_wintype++] = qt_net_wm_window_type_menu; - } else if (inherits("QToolBar")) { - // toolbar netwm type - net_wintypes[curr_wintype++] = qt_net_wm_window_type_toolbar; - } else if (testWFlags(WStyle_Customize) && testWFlags(WStyle_Tool)) { - // utility netwm type - net_wintypes[curr_wintype++] = qt_net_wm_window_type_utility; - } - - if (dialog) // dialog netwm type - net_wintypes[curr_wintype++] = qt_net_wm_window_type_dialog; - // normal netwm type - default - net_wintypes[curr_wintype++] = qt_net_wm_window_type_normal; - // stays on top if (testWFlags(WStyle_StaysOnTop)) { net_winstates[curr_winstate++] = qt_net_wm_state_above; @@ -573,6 +551,7 @@ void QWidget::create( WId window, bool i wsa.save_under = True; XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder, &wsa ); + x11SetWindowType(); } else if ( topLevel && !desktop ) { // top-level widget QWidget *p = parentWidget(); // real parent if (p) @@ -632,12 +611,7 @@ void QWidget::create( WId window, bool i else XDeleteProperty(dpy, id, qt_xa_motif_wm_hints); - // set _NET_WM_WINDOW_TYPE - if (curr_wintype > 0) - XChangeProperty(dpy, id, qt_net_wm_window_type, XA_ATOM, 32, PropModeReplace, - (unsigned char *) net_wintypes, curr_wintype); - else - XDeleteProperty(dpy, id, qt_net_wm_window_type); + x11SetWindowType(); // set _NET_WM_WINDOW_STATE if (curr_winstate > 0) @@ -896,6 +870,64 @@ void QWidget::reparentSys( QWidget *pare setMouseTracking(mouse_tracking); } +// Sets the EWMH (netwm) window type. Needed as a separate function +// because create() may be too soon in some cases. +void QWidget::x11SetWindowType( X11WindowType type ) +{ + // NET window types + long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 }; + int curr_wintype = 0; + if( testWFlags(WType_Desktop)) + return; + if( type == X11WindowTypeSelect ) { + if ( testWFlags(WStyle_Splash)) { + if (qt_net_supports(qt_net_wm_window_type_splash)) { + net_wintypes[curr_wintype++] = qt_net_wm_window_type_splash; + } + } else if (inherits("QToolBar")) { + // toolbar netwm type + net_wintypes[curr_wintype++] = qt_net_wm_window_type_toolbar; + } else if (testWFlags(WStyle_Customize) && testWFlags(WStyle_Tool)) { + // utility netwm type + net_wintypes[curr_wintype++] = qt_net_wm_window_type_utility; + } else if (testWFlags(WType_Dialog)) { + // dialog netwm type + net_wintypes[curr_wintype++] = qt_net_wm_window_type_dialog; + } + } else if( type == X11WindowTypeCombo ) { + // combo netwm type + net_wintypes[curr_wintype++] = qt_net_wm_window_type_combo; + } else if( type == X11WindowTypeDND ) { + // dnd netwm type + net_wintypes[curr_wintype++] = qt_net_wm_window_type_dnd; + } else if( type == X11WindowTypeDropdown ) { + // dropdown netwm type + net_wintypes[curr_wintype++] = qt_net_wm_window_type_dropdown_menu; + } else if( type == X11WindowTypePopup ) { + // popup netwm type + net_wintypes[curr_wintype++] = qt_net_wm_window_type_popup_menu; + } else if( type == X11WindowTypeMenu ) { + // menu netwm type + net_wintypes[curr_wintype++] = qt_net_wm_window_type_menu; + } else if( type == X11WindowTypeTooltip ) { + // tooltip netwm type + net_wintypes[curr_wintype++] = qt_net_wm_window_type_tooltip; + } + + // normal netwm type - default + net_wintypes[curr_wintype++] = qt_net_wm_window_type_normal; + // set _NET_WM_WINDOW_TYPE + if (curr_wintype > 0) + XChangeProperty(x11Display(), winId(), qt_net_wm_window_type, XA_ATOM, 32, PropModeReplace, + (unsigned char *) net_wintypes, curr_wintype); + else + XDeleteProperty(x11Display(), winId(), qt_net_wm_window_type); +} + +void QWidget::x11SetWindowTransient( QWidget* parent ) +{ + XSetTransientForHint( x11Display(), winId(), parent->winId()); +} /*! Translates the widget coordinate \a pos to global screen --- src/kernel/qwidget.h.sav 2007-05-25 18:56:23.000000000 +0200 +++ src/kernel/qwidget.h 2007-05-31 10:30:58.000000000 +0200 @@ -464,7 +464,19 @@ public: CGContextRef macCGContext(bool clipped=TRUE) const; #endif #endif - +#if defined(Q_WS_X11) + enum X11WindowType { + X11WindowTypeSelect, + X11WindowTypeCombo, + X11WindowTypeDND, + X11WindowTypeTooltip, + X11WindowTypeMenu, // torn-off + X11WindowTypeDropdown, + X11WindowTypePopup + }; + void x11SetWindowType( X11WindowType type = X11WindowTypeSelect ); + void x11SetWindowTransient( QWidget* parent ); +#endif void setWindowOpacity(double level); double windowOpacity() const; --- src/dialogs/qdialog.cpp.sav 2007-05-25 18:56:23.000000000 +0200 +++ src/dialogs/qdialog.cpp 2007-05-31 10:30:58.000000000 +0200 @@ -668,10 +668,6 @@ bool QDialog::event( QEvent *e ) Geometry management. *****************************************************************************/ -#if defined(Q_WS_X11) -extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); } -#endif // Q_WS_X11 - /*! Shows the dialog as a \link #modeless modeless \endlink dialog. Control returns immediately to the calling code. @@ -705,7 +701,7 @@ void QDialog::show() && qApp->mainWidget() && qApp->mainWidget()->isVisible() && !qApp->mainWidget()->isMinimized()) { // make sure the transient for hint is set properly for modal dialogs - XSetTransientForHint( x11Display(), winId(), qApp->mainWidget()->winId() ); + x11SetWindowTransient( qApp->mainWidget()); } #endif // Q_WS_X11 --- src/widgets/qtooltip.cpp.sav 2007-05-25 18:56:23.000000000 +0200 +++ src/widgets/qtooltip.cpp 2007-05-31 10:30:58.000000000 +0200 @@ -72,6 +72,7 @@ public: polish(); setText(text); adjustSize(); + x11SetWindowType( X11WindowTypeTooltip ); } void setWidth( int w ) { resize( sizeForWidth( w ) ); } }; @@ -528,6 +529,10 @@ void QTipManager::showTip() if (!widget) return; +#ifdef Q_WS_X11 + label->x11SetWindowTransient( widget->topLevelWidget()); +#endif + #ifdef Q_WS_MAC QRect screen = QApplication::desktop()->availableGeometry( scr ); #else --- src/widgets/qcombobox.cpp.sav 2007-05-25 18:56:23.000000000 +0200 +++ src/widgets/qcombobox.cpp 2007-05-31 10:49:13.000000000 +0200 @@ -389,12 +389,8 @@ public: inline QListBox * listBox() { return lBox; } inline QComboBoxPopup * popup() { return pop; } void updateLinedGeometry(); - - void setListBox( QListBox *l ) { lBox = l ; usingLBox = TRUE; - l->setMouseTracking( TRUE );} - - void setPopupMenu( QComboBoxPopup * pm, bool isPopup=TRUE ) - { pop = pm; if(isPopup) usingLBox = FALSE; } + void setListBox( QListBox *l ); + void setPopupMenu( QComboBoxPopup * pm, bool isPopup=TRUE ); int current; int maxCount; @@ -440,6 +436,30 @@ void QComboBoxData::updateLinedGeometry( ed->setGeometry( r ); } +void QComboBoxData::setListBox( QListBox *l ) +{ + lBox = l; + usingLBox = TRUE; + l->setMouseTracking( TRUE ); +#ifdef Q_WS_X11 + l->x11SetWindowType( QWidget::X11WindowTypeCombo ); + l->x11SetWindowTransient( combo->topLevelWidget()); +#endif +} + +void QComboBoxData::setPopupMenu( QComboBoxPopup * pm, bool isPopup ) +{ + pop = pm; + if(isPopup) + usingLBox = FALSE; +#ifdef Q_WS_X11 + if( pm ) { + pm->x11SetWindowType( QWidget::X11WindowTypeCombo ); + pm->x11SetWindowTransient( combo->topLevelWidget()); + } +#endif +} + static inline bool checkInsertIndex( const char *method, const char * name, int count, int *index) { --- src/widgets/qpopupmenu.cpp.sav 2007-05-25 18:56:23.000000000 +0200 +++ src/widgets/qpopupmenu.cpp 2007-05-31 11:09:22.000000000 +0200 @@ -298,6 +298,9 @@ QPopupMenu::QPopupMenu( QWidget *parent, connectModalRecursionSafety = 0; setFocusPolicy( StrongFocus ); +#ifdef Q_WS_X11 + x11SetWindowType( X11WindowTypePopup ); +#endif } /*! @@ -537,6 +540,29 @@ void QPopupMenu::popup( const QPoint &po emit aboutToShow(); updateSize(TRUE); } +#ifdef Q_WS_X11 +#ifndef QT_NO_MENUBAR + QMenuData *top = this; // find top level + while ( top->parentMenu ) + top = top->parentMenu; + if( top->isMenuBar ) + x11SetWindowType( X11WindowTypeDropdown ); + if( parentMenu && parentMenu->isMenuBar ) + x11SetWindowTransient( static_cast< QMenuBar* >( parentMenu )->topLevelWidget()); +#endif + if( parentMenu && !parentMenu->isMenuBar ) + x11SetWindowTransient( static_cast< QPopupMenu* >( parentMenu )); + if( !parentMenu ) { + // hackish ... try to find the main window related to this popup + QWidget* parent = parentWidget() ? parentWidget()->topLevelWidget() : NULL; + if( parent == NULL ) + parent = QApplication::widgetAt( pos ); + if( parent == NULL ) + parent = qApp->activeWindow(); + if( parent != NULL ) + x11SetWindowTransient( parent ); + } +#endif int sw = screen.width(); // screen width int sh = screen.height(); // screen height @@ -1390,6 +1416,13 @@ void QPopupMenu::hide() #if defined(QT_ACCESSIBILITY_SUPPORT) QAccessible::updateAccessibility( this, 0, QAccessible::PopupMenuEnd ); #endif +#ifndef QT_NO_MENUBAR + QMenuData *top = this; // find top level + while ( top->parentMenu ) + top = top->parentMenu; + if( top->isMenuBar ) + x11SetWindowType( X11WindowTypePopup ); // reset +#endif parentMenu = 0; hidePopups(); QWidget::hide(); @@ -2713,6 +2746,9 @@ void QPopupMenu::toggleTearOff() geometry().topLeft(), FALSE ); p->mitems->setAutoDelete( FALSE ); p->tornOff = TRUE; +#ifdef Q_WS_X11 + p->x11SetWindowType( X11WindowTypeMenu ); +#endif for ( QMenuItemListIt it( *mitems ); it.current(); ++it ) { if ( it.current()->id() != QMenuData::d->aInt && !it.current()->widget() ) p->mitems->append( it.current() ); 0080-net-wm-sync-request-2.patch: --- NEW FILE 0080-net-wm-sync-request-2.patch --- qt-bugs@ issue : none bugs.kde.org number : none applied: no author: Lubos Lunak Support for _NET_WM_SYNC_REQUEST - allows the WM to find out when the app finished one redraw - less flicker during resize and with compositing also when opening a window. --- src/kernel/qwidget.h.sav 2007-06-22 14:14:05.000000000 +0200 +++ src/kernel/qwidget.h 2007-06-23 11:53:39.000000000 +0200 @@ -586,6 +586,14 @@ private: void destroyInputContext(); void focusInputContext(); void checkChildrenDnd(); + +#ifndef QT_NO_XSYNC + void createSyncCounter(); + void destroySyncCounter(); + void incrementSyncCounter(); + void handleSyncRequest( void* ev ); +#endif + #elif defined(Q_WS_MAC) uint own_id : 1, macDropEnabled : 1; EventHandlerRef window_event; @@ -962,8 +970,12 @@ struct Q_EXPORT QTLWExtra { uint uspos : 1; // User defined position uint ussize : 1; // User defined size #if defined(QT_NO_IM_EXTENSIONS) void *xic; // Input Context #endif +#ifndef QT_NO_XSYNC + ulong syncCounter; + uint syncRequestValue[2]; +#endif #endif #if defined(Q_WS_MAC) WindowGroupRef group; --- src/kernel/qt_x11_p.h.sav 2007-02-23 14:01:18.000000000 +0100 +++ src/kernel/qt_x11_p.h 2007-06-23 11:53:39.000000000 +0200 @@ -174,6 +174,11 @@ extern "C" { #endif // QT_NO_XRENDER +#ifndef QT_NO_XSYNC +# include +#endif // QT_NO_XSYNC + + #ifndef QT_NO_XKB # include #endif // QT_NO_XKB --- src/kernel/qwidget_x11.cpp.sav 2007-04-16 13:47:26.000000000 +0200 +++ src/kernel/qwidget_x11.cpp 2007-06-23 19:48:44.000000000 +0200 @@ -87,6 +87,12 @@ static QWidget *keyboardGrb = 0; extern Time qt_x_time; extern Time qt_x_user_time; +#ifndef QT_NO_XSYNC +extern Atom qt_net_wm_sync_request_counter; +extern Atom qt_net_wm_sync_request; +extern bool qt_use_xsync; +#endif + // defined in qfont_x11.cpp extern bool qt_has_xft; @@ -595,11 +601,14 @@ void QWidget::create( WId window, bool i XResizeWindow( dpy, id, crect.width(), crect.height() ); XStoreName( dpy, id, qAppName() ); - Atom protocols[4]; + Atom protocols[5]; int n = 0; protocols[n++] = qt_wm_delete_window; // support del window protocol protocols[n++] = qt_wm_take_focus; // support take focus window protocol protocols[n++] = qt_net_wm_ping; // support _NET_WM_PING protocol +#ifndef QT_NO_XSYNC + protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_REQUEST protocol +#endif if ( testWFlags( WStyle_ContextHelp ) ) protocols[n++] = qt_net_wm_context_help; XSetWMProtocols( dpy, id, protocols, n ); @@ -625,6 +634,14 @@ void QWidget::create( WId window, bool i XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &curr_pid, 1); +#ifndef QT_NO_XSYNC + // set _NET_WM_SYNC_COUNTER + createSyncCounter(); + long counterVal = topData()->syncCounter; + XChangeProperty( dpy, id, qt_net_wm_sync_request_counter, XA_CARDINAL, 32, PropModeReplace, + (unsigned char*) &counterVal, 1); +#endif + // when we create a toplevel widget, the frame strut should be dirty fstrut_dirty = 1; @@ -720,6 +737,9 @@ void QWidget::destroy( bool destroyWindo if ( destroyWindow ) qt_XDestroyWindow( this, x11Display(), winid ); } +#ifndef QT_NO_XSYNC + destroySyncCounter(); +#endif setWinId( 0 ); extern void qPRCleanup( QWidget *widget ); // from qapplication_x11.cpp @@ -769,6 +789,10 @@ void QWidget::reparentSys( QWidget *pare destroyInputContext(); } +#ifndef QT_NO_XSYNC + destroySyncCounter(); +#endif + if ( isTopLevel() || !parent ) // we are toplevel, or reparenting to toplevel topData()->parentWinId = 0; @@ -2456,8 +2480,13 @@ void QWidget::createTLSysExtra() { #if defined(QT_NO_IM_EXTENSIONS) // created lazily extra->topextra->xic = 0; #endif +#ifndef QT_NO_XSYNC + extra->topextra->syncCounter = 0; + extra->topextra->syncRequestValue[0] = 0; + extra->topextra->syncRequestValue[1] = 0; +#endif } void QWidget::deleteTLSysExtra() @@ -2501,6 +2530,51 @@ void QWidget::checkChildrenDnd() } } + +#ifndef QT_NO_XSYNC +// create a window's XSyncCounter +void QWidget::createSyncCounter() +{ + if( !qt_use_xsync || !isTopLevel() || topData()->syncCounter ) + return; + XSyncValue zero; + XSyncIntToValue( &zero, 0 ); + topData()->syncCounter = XSyncCreateCounter( x11Display(), zero ); +} + +// destroy a window's XSyncCounter +void QWidget::destroySyncCounter() +{ + if( !qt_use_xsync || !extra || !extra->topextra + || !extra->topextra->syncCounter ) + return; + XSyncDestroyCounter( x11Display(), extra->topextra->syncCounter ); + extra->topextra->syncCounter = 0; +} + +// increment a window's XSyncCounter +void QWidget::incrementSyncCounter() +{ + if( qt_use_xsync && topData()->syncCounter && + !(topData()->syncRequestValue[0] == 0 && + topData()->syncRequestValue[1] == 0) ) { + XSyncValue val; + XSyncIntsToValue( &val, topData()->syncRequestValue[ 0 ], topData()->syncRequestValue[ 1 ] ); + XSyncSetCounter( x11Display(), topData()->syncCounter, val ); + topData()->syncRequestValue[0] = topData()->syncRequestValue[1] = 0; + } +} + +// handle _NET_WM_SYNC_REQUEST +void QWidget::handleSyncRequest( void* ev ) +{ + XEvent* xev = (XEvent*)ev; + topData()->syncRequestValue[ 0 ] = xev->xclient.data.l[ 2 ]; + topData()->syncRequestValue[ 1 ] = xev->xclient.data.l[ 3 ]; +} +#endif // QT_NO_XSYNC + + /*! \property QWidget::acceptDrops \brief whether drop events are enabled for this widget --- src/kernel/qapplication_x11.cpp.sav 2007-04-16 13:47:26.000000000 +0200 +++ src/kernel/qapplication_x11.cpp 2007-06-23 19:49:15.000000000 +0200 @@ -285,6 +285,11 @@ Atom *qt_net_supported_list = 0; Window *qt_net_virtual_root_list = 0; +// X11 SYNC support +#ifndef QT_NO_XSYNC +Atom qt_net_wm_sync_request_counter = 0; +Atom qt_net_wm_sync_request = 0; +#endif // client leader window Window qt_x11_wm_client_leader = 0; @@ -309,6 +314,13 @@ static int xrandr_eventbase; // Display Q_EXPORT bool qt_use_xrender = FALSE; +#ifndef QT_NO_XSYNC +// True if SYNC extension exists on the connected display +bool qt_use_xsync = FALSE; +static int xsync_eventbase; +static int xsync_errorbase; +#endif + // modifier masks for alt/meta - detected when the application starts static long qt_alt_mask = 0; static long qt_meta_mask = 0; @@ -1938,6 +1950,11 @@ void qt_init_internal( int *argcptr, cha qt_x11_intern_atom( "UTF8_STRING", &qt_utf8_string ); qt_x11_intern_atom( "_SGI_DESKS_MANAGER", &qt_sgi_desks_manager ); +#ifndef QT_NO_XSYNC + qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST_COUNTER", &qt_net_wm_sync_request_counter ); + qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST", &qt_net_wm_sync_request ); +#endif + qt_xdnd_setup(); qt_x11_motifdnd_init(); @@ -1974,6 +1991,15 @@ void qt_init_internal( int *argcptr, cha } #endif // QT_NO_XRENDER +#ifndef QT_NO_XSYNC + // Try to initialize SYNC extension on the connected display + int xsync_major, xsync_minor; + if ( XSyncQueryExtension( appDpy, &xsync_eventbase, &xsync_errorbase ) && + XSyncInitialize( appDpy, &xsync_major, &xsync_minor ) ) { + qt_use_xsync = TRUE; + } +#endif + #ifndef QT_NO_XKB // If XKB is detected, set the GrabsUseXKBState option so input method // compositions continue to work (ie. deadkeys) @@ -3141,6 +3167,10 @@ int QApplication::x11ClientMessage(QWidg XSendEvent( event->xclient.display, event->xclient.window, False, SubstructureNotifyMask|SubstructureRedirectMask, event ); } +#ifndef QT_NO_XSYNC + } else if (a == qt_net_wm_sync_request ) { + widget->handleSyncRequest( event ); +#endif } } else if ( event->xclient.message_type == qt_qt_scrolldone ) { widget->translateScrollDoneEvent(event); @@ -5681,6 +5711,21 @@ bool QETWidget::translateScrollDoneEvent return FALSE; } +#if defined(Q_C_CALLBACKS) +extern "C" { +#endif +#ifndef QT_NO_XSYNC +static Bool qt_net_wm_sync_request_scanner(Display*, XEvent* event, XPointer arg) +{ + return (event->type == ClientMessage && event->xclient.window == *(Window*)arg + && event->xclient.message_type == qt_wm_protocols + && event->xclient.data.l[ 0 ] == qt_net_wm_sync_request ); +} +#endif + +#if defined(Q_C_CALLBACKS) +} +#endif // // ConfigureNotify (window move and resize) event translation @@ -5712,6 +5757,7 @@ bool QETWidget::translateConfigEvent( co if (! extra || extra->compress_events) { // ConfigureNotify compression for faster opaque resizing XEvent otherEvent; + int compressed_configs = 0; while ( XCheckTypedWindowEvent( x11Display(), winId(), ConfigureNotify, &otherEvent ) ) { if ( qt_x11EventFilter( &otherEvent ) ) @@ -5732,7 +5778,18 @@ bool QETWidget::translateConfigEvent( co newCPos.ry() = otherEvent.xconfigure.y + otherEvent.xconfigure.border_width; } + ++compressed_configs; + } +#ifndef QT_NO_XSYNC + // _NET_WM_SYNC_REQUEST compression + Window wid = winId(); + while ( compressed_configs && + XCheckIfEvent( x11Display(), &otherEvent, + qt_net_wm_sync_request_scanner, (XPointer)&wid ) ) { + handleSyncRequest( (void*)&otherEvent ); + --compressed_configs; } +#endif } QRect cr ( geometry() ); @@ -5786,6 +5843,8 @@ bool QETWidget::translateConfigEvent( co repaint( !testWFlags(WResizeNoErase) || transbg ); } + incrementSyncCounter(); + return TRUE; } 0084-compositing-properties.patch: --- NEW FILE 0084-compositing-properties.patch --- qt-bugs@ issue : none bugs.kde.org number : none applied: no author: Lubos Lunak This patch makes override-redirect windows (popup menu, dropdown menu, tooltip, combobox, etc.) also have more window properties like WM_CLASS, so they can be used when compositing. --- src/kernel/qwidget_x11.cpp.sav 2007-06-25 10:36:42.000000000 +0200 +++ src/kernel/qwidget_x11.cpp 2007-10-02 15:30:13.000000000 +0200 @@ -557,7 +557,10 @@ void QWidget::create( WId window, bool i wsa.save_under = True; XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder, &wsa ); - x11SetWindowType(); + XClassHint class_hint; + class_hint.res_name = (char *) qAppName(); // application name + class_hint.res_class = (char *) qAppClass(); // application class + XSetClassHint( dpy, id, &class_hint ); } else if ( topLevel && !desktop ) { // top-level widget QWidget *p = parentWidget(); // real parent if (p) @@ -620,8 +623,6 @@ void QWidget::create( WId window, bool i else XDeleteProperty(dpy, id, qt_xa_motif_wm_hints); - x11SetWindowType(); - // set _NET_WM_WINDOW_STATE if (curr_winstate > 0) XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace, @@ -629,11 +630,6 @@ void QWidget::create( WId window, bool i else XDeleteProperty(dpy, id, qt_net_wm_state); - // set _NET_WM_PID - long curr_pid = getpid(); - XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, - (unsigned char *) &curr_pid, 1); - #ifndef QT_NO_XSYNC // set _NET_WM_SYNC_COUNTER createSyncCounter(); @@ -645,19 +641,31 @@ void QWidget::create( WId window, bool i // when we create a toplevel widget, the frame strut should be dirty fstrut_dirty = 1; + } else { + // non-toplevel widgets don't have a frame, so no need to + // update the strut + fstrut_dirty = 0; + } + + if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows + x11SetWindowType(); + + // set _NET_WM_PID + long curr_pid = getpid(); + XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, + (unsigned char *) &curr_pid, 1); + // declare the widget's object name as window role XChangeProperty( dpy, id, qt_window_role, XA_STRING, 8, PropModeReplace, (unsigned char *)name(), qstrlen( name() ) ); // set client leader property + if ( !qt_x11_wm_client_leader ) + qt_x11_create_wm_client_leader(); XChangeProperty( dpy, id, qt_wm_client_leader, XA_WINDOW, 32, PropModeReplace, (unsigned char *)&qt_x11_wm_client_leader, 1 ); - } else { - // non-toplevel widgets don't have a frame, so no need to - // update the strut - fstrut_dirty = 0; } if ( initializeWindow ) { 0088-fix-xinput-clash.diff: --- NEW FILE 0088-fix-xinput-clash.diff --- qt-bugs@ issue : bugs.kde.org number : applied: no author: Dirk Mueller fix compile errors with newer X.org --- include/private/qt_x11_p.h +++ include/private/qt_x11_p.h @@ -86,7 +86,7 @@ // the wacom tablet (currently just the IRIX version) -#if defined (QT_TABLET_SUPPORT) +#if defined (QT_TABLET_SUPPORT) && defined (QT_CLEAN_NAMESPACE) # include #if defined (Q_OS_IRIX) # include // wacom driver defines for IRIX (quite handy) --- src/kernel/qtaddons_x11.cpp +++ src/kernel/qtaddons_x11.cpp @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifndef QT_CLEAN_NAMESPACE +#define QT_CLEAN_NAMESPACE +#endif + #include "qt_x11_p.h" #if !defined(QT_NO_XFTFREETYPE) && !defined(QT_XFT2) --- src/kernel/qt_x11_p.h +++ src/kernel/qt_x11_p.h @@ -86,7 +86,7 @@ // the wacom tablet (currently just the IRIX version) -#if defined (QT_TABLET_SUPPORT) +#if defined (QT_TABLET_SUPPORT) && defined (QT_CLEAN_NAMESPACE) # include #if defined (Q_OS_IRIX) # include // wacom driver defines for IRIX (quite handy) --- src/kernel/qwidget_x11.cpp +++ src/kernel/qwidget_x11.cpp @@ -38,6 +38,10 @@ ** **********************************************************************/ +#ifndef QT_CLEAN_NAMESPACE +#define QT_CLEAN_NAMESPACE +#endif + #include "qapplication.h" #include "qapplication_p.h" #include "qnamespace.h" --- NEW FILE assistant3.desktop --- [Desktop Entry] Name=Qt3 Assistant Comment=Add translations to Qt3 applications Exec=assistant Icon=assistant3 Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Development; --- NEW FILE designer3.desktop --- [Desktop Entry] Name=Qt3 Designer GenericName=Interface Designer Comment=Design GUIs for Qt3 applications Exec=designer Icon=designer3 MimeType=application/x-designer; Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Development; --- NEW FILE linguist3.desktop --- [Desktop Entry] Name=Qt3 Linguist Comment=Add translations to Qt3 applications Exec=linguist Icon=linguist3 MimeType=application/x-linguist; Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Development; qt-3.0.5-nodebug.patch: --- NEW FILE qt-3.0.5-nodebug.patch --- --- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200 +++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200 @@ -501,10 +501,10 @@ (*f).latin1(), (const char*) QFile::encodeName( old->library() ) ); } else { - qWarning("%s: Feature %s already defined in %s!", +/* qWarning("%s: Feature %s already defined in %s!", (const char*) QFile::encodeName( old->library() ), (*f).latin1(), - (const char*) QFile::encodeName( plugin->library() ) ); + (const char*) QFile::encodeName( plugin->library() ) ); */ } } } qt-3.1.0-makefile.patch: --- NEW FILE qt-3.1.0-makefile.patch --- --- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100 +++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100 @@ -11,7 +11,7 @@ install: FORCE @$(MAKE) qt.install -all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples +all: symlinks src-qmake src-moc sub-src sub-tools @echo @echo "The Qt library is now built in ./lib" @echo "The Qt examples are built in the directories in ./examples" qt-3.3.3-gtkstyle.patch: --- NEW FILE qt-3.3.3-gtkstyle.patch --- --- qt-x11-free-3.3.3.orig/src/widgets/qmenubar.cpp 2004-08-05 16:42:21.000000000 +0200 +++ qt-x11-free-3.3.3/src/widgets/qmenubar.cpp 2004-12-03 17:26:43.000000000 +0100 @@ -228,6 +228,10 @@ static const int motifItemHMargin = 5; // menu item hor text margin static const int motifItemVMargin = 4; // menu item ver text margin +// The others are 0 +static const int gtkItemHMargin = 8; +static const int gtkItemVMargin = 8; + /* +----------------------------- @@ -292,7 +296,14 @@ setFrameStyle( QFrame::MenuBarPanel | QFrame::Raised ); QFontMetrics fm = fontMetrics(); - int h = 2*motifBarVMargin + fm.height() + motifItemVMargin + 2*frameWidth() + 2*motifItemFrame; + + int h; + int gs = style().styleHint(QStyle::SH_GUIStyle); + if (gs == GtkStyle) { + h = fm.height() + gtkItemVMargin; + } else { + h = 2*motifBarVMargin + fm.height() + motifItemVMargin + 2*frameWidth() + 2*motifItemFrame; + } setGeometry( 0, 0, width(), h ); @@ -944,12 +955,19 @@ h = QMAX( mi->pixmap()->height() + 4, QApplication::globalStrut().height() ); } else if ( !mi->text().isNull() ) { // text item QString s = mi->text(); - w = fm.boundingRect( s ).width() - + 2*motifItemHMargin; + if ( gs == GtkStyle ) { + w = fm.boundingRect( s ).width() + 2*gtkItemHMargin; + } else { + w = fm.boundingRect( s ).width() + 2*motifItemHMargin; + } w -= s.contains('&')*fm.width('&'); w += s.contains("&&")*fm.width('&'); w = QMAX( w, QApplication::globalStrut().width() ); - h = QMAX( fm.height() + motifItemVMargin, QApplication::globalStrut().height() ); + if (gs == GtkStyle ) { + h = QMAX( fm.height() + gtkItemVMargin, QApplication::globalStrut().height() ); + } else { + h = QMAX( fm.height() + motifItemVMargin, QApplication::globalStrut().height() ); + } } else if ( mi->isSeparator() ) { // separator item if ( style().styleHint(QStyle::SH_GUIStyle) == MotifStyle ) separator = i; //### only motif? --- qt-x11-free-3.3.3.orig/src/widgets/qpopupmenu.cpp 2004-08-05 16:42:21.000000000 +0200 +++ qt-x11-free-3.3.3/src/widgets/qpopupmenu.cpp 2004-12-03 17:43:50.000000000 +0100 @@ -65,6 +65,8 @@ static const int motifArrowHMargin = 6; // arrow horizontal margin static const int motifArrowVMargin = 2; // arrow vertical margin +static const int gtkArrowHMargin = 0; // arrow horizontal margin +static const int gtkArrowVMargin = 0; // arrow vertical margin /* @@ -2289,8 +2291,18 @@ QRect r( itemGeometry( actItem ) ); QPoint p; QSize ps = popup->sizeHint(); + // GUI Style + int gs = style().styleHint(QStyle::SH_GUIStyle); + int arrowHMargin, arrowVMargin; + if (gs == GtkStyle) { + arrowHMargin = gtkArrowHMargin; + arrowVMargin = gtkArrowVMargin; + } else { + arrowHMargin = motifArrowHMargin; + arrowVMargin = motifArrowVMargin; + } if( QApplication::reverseLayout() ) { - p = QPoint( r.left() + motifArrowHMargin - ps.width(), r.top() + motifArrowVMargin ); + p = QPoint( r.left() + arrowHMargin - ps.width(), r.top() + arrowVMargin ); p = mapToGlobal( p ); bool right = FALSE; @@ -2303,7 +2315,7 @@ if ( right ) p.setX( mapToGlobal( r.topRight() ).x() ); } else { - p = QPoint( r.right() - motifArrowHMargin, r.top() + motifArrowVMargin ); + p = QPoint( r.right() - arrowHMargin, r.top() + arrowVMargin ); p = mapToGlobal( p ); bool left = FALSE; --- qt-x11-free-3.3.3.orig/src/kernel/qnamespace.h 2004-08-05 16:42:10.000000000 +0200 +++ qt-x11-free-3.3.3/src/kernel/qnamespace.h 2004-11-29 22:22:26.000000000 +0100 @@ -294,7 +294,8 @@ #ifdef QT_NO_COMPAT enum GUIStyle { WindowsStyle = 1, // ### Qt 4.0: either remove the obsolete enums or clean up compat vs. - MotifStyle = 4 // ### QT_NO_COMPAT by reordering or combination into one enum. + MotifStyle = 4, // ### QT_NO_COMPAT by reordering or combination into one enum. + GtkStyle = 6 // Gtk compability mode }; #else enum GUIStyle { @@ -302,7 +303,8 @@ WindowsStyle, Win3Style, // OBSOLETE PMStyle, // OBSOLETE - MotifStyle + MotifStyle, + GtkStyle = 6 // Gtk compability mode }; #endif qt-3.3.4-print-CJK.patch: --- NEW FILE qt-3.3.4-print-CJK.patch --- --- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100 +++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100 @@ -4748,10 +4748,11 @@ // GB18030 fonts on Turbolinux static const psfont SongGBK2K [] = { - { "MSung-Light-GBK2K-H", 0, 100. }, - { "MSung-Italic-GBK2K-H", 0, 100. }, - { "MSung-Bold-GBK2K-H", 0, 100. }, - { "MSung-BoldItalic-GBK2K-H", 0, 100. }, + { "MSungGBK-Light-GBK2K-H", 0, 100. }, + { "MSungGBK-Light-GBK2K-H", 0, 100. }, + { "MSungGBK-Light-GBK2K-H", 0, 100. }, + { "MSungGBK-Light-GBK2K-H", 0, 100. }, + }; static const psfont KaiGBK2K [] = { { "MKai-Medium-GBK2K-H", 0, 100. }, qt-3.3.6-fontrendering-214371.patch: --- NEW FILE qt-3.3.6-fontrendering-214371.patch --- diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp --- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 +++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 @@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy toPos += 2; if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { if (matra_position == Post || matra_position == Split) { - toPos = matra+1; + if (matra_position == Post ) + toPos = matra; + else + toPos = matra+1; matra -= 2; } } else if (script == QFont::Kannada) { qt-3.3.6-fontrendering-bn_IN-209975.patch: --- NEW FILE qt-3.3.6-fontrendering-bn_IN-209975.patch --- --- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.308589840 +0800 +++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-18 17:57:45.284006296 +0800 @@ -164,7 +164,7 @@ Matra, Matra, Matra, Matra, Matra, Invalid, Invalid, Matra, Matra, Invalid, Invalid, Matra, - Matra, Halant, Unknown, Unknown, + Matra, Halant, Consonant, Unknown, Invalid, Invalid, Invalid, Invalid, Invalid, Invalid, Invalid, VowelMark, qt-3.3.6-fontrendering-gu-228452.patch: --- NEW FILE qt-3.3.6-fontrendering-gu-228452.patch --- diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp --- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2007-02-13 14:41:25.000000000 +0530 +++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2007-02-13 14:40:02.000000000 +0530 @@ -253,7 +253,7 @@ static const unsigned char indicForms[0x Unknown, Unknown, Unknown, Unknown, Unknown, Unknown, Unknown, Unknown, - Other, Other, Other, Other, + Other, Other, VowelMark, VowelMark, Other, Other, Other, Other, Other, Other, Other, Other, Other, Other, Other, Other, qt-3.3.6-fontrendering-ml_IN-209097.patch: --- NEW FILE qt-3.3.6-fontrendering-ml_IN-209097.patch --- --- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800 +++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800 @@ -868,7 +868,7 @@ None, None, None, None, None, None, None, Post, - Post, None, Below, None, + None, None, None, None, None, Post, None, None, None, None, None, None, None, None, Post, Post, @@ -1271,6 +1271,16 @@ int base = 0; int reph = -1; + //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam + bool is_special_conjuction_malayalam = false; + + if ((len == 3) && + ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && + (reordered[1] == 0x0d4d) && + ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { + is_special_conjuction_malayalam = true; + } + #ifdef INDIC_DEBUG IDEBUG("original:"); for (i = 0; i < len; i++) { @@ -1547,6 +1557,15 @@ reph = i; } + //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam + if (is_special_conjuction_malayalam) { + unsigned short temp; + + temp = reordered[0]; + reordered[0] = reordered[2]; + reordered[2] = temp; + } + if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances, &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError) return FALSE; @@ -1658,6 +1677,15 @@ // halant always applies + //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam + if (is_special_conjuction_malayalam) { + unsigned int temp; + + temp = properties[0]; + properties[0] = ~PreSubstProperty; + properties[2] = temp; + } + #ifdef INDIC_DEBUG { IDEBUG("OT properties:"); qt-3.3.6-fontrendering-ml_IN-209974.patch: --- NEW FILE qt-3.3.6-fontrendering-ml_IN-209974.patch --- --- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100 +++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100 @@ -864,7 +864,7 @@ None, None, None, Post, None, None, None, None, - None, Post, None, None, + None, None, None, None, None, None, None, None, None, None, Post, Post, qt-3.3.6-fontrendering-ml_IN-217657.patch: --- NEW FILE qt-3.3.6-fontrendering-ml_IN-217657.patch --- diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp --- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530 +++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530 @@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri if ( script >= QFont::Arabic && script <= QFont::Khmer ) { // complex script shaping. Have to do some hard work int from = QMAX( 0, pos - 8 ); - int to = QMIN( (int)str.length(), pos + 8 ); + int to = str.length(); QConstString cstr( str.unicode()+from, to-from); QTextEngine layout( cstr.string(), d ); layout.itemize( QTextEngine::WidthOnly ); qt-3.3.6-fontrendering-te_IN-211259.patch: --- NEW FILE qt-3.3.6-fontrendering-te_IN-211259.patch --- --- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800 +++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800 @@ -786,7 +786,7 @@ Below, None, Below, Below, Below, Below, Below, Below, - Below, None, Below, Below, + Below, Below, Below, Below, None, Below, Below, Below, Below, Below, None, None, None, None, Post, Above, qt-3.3.8-fontrendering-#214570.patch: --- NEW FILE qt-3.3.8-fontrendering-#214570.patch --- --- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 +++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 @@ -1240,7 +1240,7 @@ int script = item->script; Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala); const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari); - const unsigned short ra = script_base + 0x30; + unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification const unsigned short halant = script_base + 0x4d; const unsigned short nukta = script_base + 0x3c; @@ -1278,6 +1278,11 @@ } #endif + unsigned short *chkAssamese=reordered.data(); + if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra + { + ra = script_base + 0x70; + } if (len != 1) { unsigned short *uc = reordered.data(); bool beginsWithRa = FALSE; qt-3.3.8-fontrendering-as_IN-209972.patch: --- NEW FILE qt-3.3.8-fontrendering-as_IN-209972.patch --- --- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 +++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 @@ -601,7 +601,7 @@ None, None, None, None, None, None, None, None, - None, None, None, None, + Below, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, qt-uic-nostdlib.patch: --- NEW FILE qt-uic-nostdlib.patch --- --- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 +++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 @@ -149,6 +149,9 @@ } else { trmacro = &opt[1]; } + } else if ( opt == "nostdlib") { + QStringList x; + QApplication::setLibraryPaths(x); } else if ( opt == "L" ) { if ( !(n < argc-1) ) { error = "Missing plugin path."; qt-x11-free-3.3.2-quiet.patch: --- NEW FILE qt-x11-free-3.3.2-quiet.patch --- --- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200 +++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200 @@ -288,8 +288,9 @@ { #if defined(QT_CHECK_STATE) if ( qApp->type() == QApplication::Tty ) { - qWarning( "QPixmap: Cannot create a QPixmap when no GUI " - "is being used" ); +// qWarning( "QPixmap: Cannot create a QPixmap when no GUI " +// "is being used" ); + ; } #endif qt-x11-free-3.3.3-gl.patch: --- NEW FILE qt-x11-free-3.3.3-gl.patch --- --- qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp.orig 2004-08-18 14:55:20.629068213 +0200 +++ qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp 2004-08-18 15:00:43.090260739 +0200 @@ -125,7 +125,7 @@ if (gl_syms_resolved) return TRUE; - QLibrary gl("GL"); + QLibrary gl("GL.so.1"); gl.setAutoUnload(FALSE); qt_glCallLists = (_glCallLists) gl.resolve("glCallLists"); @@ -283,7 +283,7 @@ typedef Status (*_XmuLookupStandardColormap)( Display *dpy, int screen, VisualID visualid, unsigned int depth, Atom property, Bool replace, Bool retain ); _XmuLookupStandardColormap qt_XmuLookupStandardColormap; - qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu", "XmuLookupStandardColormap"); + qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu.so.6", "XmuLookupStandardColormap"); if (!qt_XmuLookupStandardColormap) qFatal("Unable to resolve Xmu symbols - please check your Xmu library installation."); #define XmuLookupStandardColormap qt_XmuLookupStandardColormap --- qt-x11-free-3.3.3/src/tools/qlibrary.cpp.orig 2004-08-18 14:56:00.322185890 +0200 +++ qt-x11-free-3.3.3/src/tools/qlibrary.cpp 2004-08-18 14:57:51.939637946 +0200 @@ -425,6 +425,7 @@ } else { tmpfilename = QString( "lib%1" ).arg( filename ); } + if ( !filename.contains(".so") ) tmpfilename += filter; if(QFile::exists(tmpfilename) || it == filters.end()) { filename = tmpfilename; qt-x11-free-3.3.3-qembed.patch: --- NEW FILE qt-x11-free-3.3.3-qembed.patch --- --- qt-x11-free-3.3.3/tools/tools.pro.qembed 2004-06-08 10:05:03.000000000 +0200 +++ qt-x11-free-3.3.3/tools/tools.pro 2004-08-11 15:47:35.393118498 +0200 @@ -5,6 +5,7 @@ SUBDIRS = assistant/lib \ designer \ assistant \ + qembed \ linguist unix:SUBDIRS += qtconfig } --- qt-x11-free-3.3.3/tools/qembed/qembed.pro.qembed 2004-06-08 10:08:40.000000000 +0200 +++ qt-x11-free-3.3.3/tools/qembed/qembed.pro 2004-08-11 15:51:12.008859486 +0200 @@ -2,3 +2,7 @@ SOURCES = qembed.cpp TARGET = qembed REQUIRES=full-config nocrosscompiler +DESTDIR = ../../bin +target.path=$$bins.path +INSTALLS += target + qt-x11-free-3.3.4-fullscreen.patch: --- NEW FILE qt-x11-free-3.3.4-fullscreen.patch --- --- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100 +++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100 @@ -1412,7 +1412,7 @@ False, XA_ATOM, &type, &format, &nitems, &after, &data); if (type == XA_ATOM && format == 32) { - ts.writeBlock((const char *) data, nitems * 4); + ts.writeBlock((const char *) data, nitems * sizeof(long)); offset += nitems; } else after = 0; qt-x11-free-3.3.5-uic.patch: --- NEW FILE qt-x11-free-3.3.5-uic.patch --- Index: tools/designer/uic/form.cpp =================================================================== --- qt/tools/designer/uic/form.cpp (revision 460038) +++ qt/tools/designer/uic/form.cpp (working copy) @@ -731,6 +731,13 @@ while ( !n2.isNull() ) { if ( n2.tagName() == "includehint" ) { QString file = n2.firstChild().toText().data(); + int colons = file.find("::"); + + if (colons != -1) + { + file = file.right(file.length() - colons - 2); + } + localIncludes += file; } n2 = n2.nextSibling().toElement(); qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff: --- NEW FILE qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff --- --- qt-x11-free-3.3.6/src/kernel/qapplication_x11.cpp.orig 2006-06-20 15:45:44.000000000 +0200 +++ qt-x11-free-3.3.6/src/kernel/qapplication_x11.cpp 2006-06-20 15:51:13.000000000 +0200 @@ -3294,11 +3294,7 @@ // filtering opportunity first to ensure all input methods work // properly regardless of application design. -#ifndef QT_NO_IM_EXTENSIONS if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) { -#else - if( keywidget && keywidget->isEnabled() ) { -#endif if( ( event->type==XKeyPress || event->type==XKeyRelease ) && sm_blockUserInput ) // block user interaction during session management return TRUE; @@ -5220,11 +5216,12 @@ } else { key = (int)(long)keyDict->find( keycode ); if ( key ) - if( !willRepeat ) // Take out key of dictionary only if this call. + if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call. keyDict->take( keycode ); long s = (long)textDict->find( keycode ); if ( s ) { - textDict->take( keycode ); + if( statefulTranslation ) + textDict->take( keycode ); ascii = (char)(s-256); } } --- qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp.orig 2006-06-20 15:46:49.000000000 +0200 +++ qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp 2006-06-20 15:48:14.000000000 +0200 @@ -2699,11 +2699,10 @@ { QInputContext *qic = 0; -#if !defined(QT_NO_IM_EXTENSIONS) if ( isInputMethodEnabled() ) { +#if !defined(QT_NO_IM_EXTENSIONS) qic = icHolderWidget()->ic; #else - { // icHolderWidget is always topLevelWidget QTLWExtra *topdata = icHolderWidget()->topData(); qic = (QInputContext *)topdata->xic; @@ -2754,10 +2753,8 @@ */ void QWidget::createInputContext() { -#if !defined(QT_NO_IM_EXTENSIONS) if( !isInputMethodEnabled() || QApplication::closingDown() ) return; -#endif QWidget *icWidget = icHolderWidget(); #ifndef QT_NO_IM qt-x11-free-3.3.6-qfontdatabase_x11.patch: --- NEW FILE qt-x11-free-3.3.6-qfontdatabase_x11.patch --- --- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200 +++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200 @@ -975,7 +981,7 @@ }; const XftDefaultFont defaults[] = { { "Serif", "serif", FALSE }, - { "Sans Serif", "sans-serif", FALSE }, + { "Sans", "sans-serif", FALSE }, { "Monospace", "monospace", TRUE }, { 0, 0, FALSE } }; qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch: --- NEW FILE qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch --- --- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit 2006-06-28 17:18:08.000000000 +0200 +++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2006-06-28 17:20:09.000000000 +0200 @@ -1906,9 +1906,6 @@ void QTextEdit::removeSelectedText( int selNum ) { - if(selNum != 0) - resetInputContext(); - QTextCursor c1 = doc->selectionStartCursor( selNum ); c1.restoreState(); QTextCursor c2 = doc->selectionEndCursor( selNum ); @@ -3171,7 +3168,6 @@ return; } #endif - resetInputContext(); QTextParagraph *p = doc->paragAt( para ); if ( !p ) return; @@ -3198,7 +3194,6 @@ return; } #endif - resetInputContext(); for ( int i = 0; i < (int)doc->numSelections(); ++i ) doc->removeSelection( i ); @@ -3240,7 +3235,6 @@ if ( d->optimMode ) return; #endif - resetInputContext(); QTextParagraph *p = doc->paragAt( para ); if ( !p ) return; @@ -3285,7 +3279,6 @@ if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) return; - resetInputContext(); for ( int i = 0; i < (int)doc->numSelections(); ++i ) doc->removeSelection( i ); @@ -3336,7 +3329,6 @@ if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) return; - resetInputContext(); for ( int i = 0; i < (int)doc->numSelections(); ++i ) doc->removeSelection( i ); @@ -3450,7 +3442,6 @@ { if ( isReadOnly() ) return; - resetInputContext(); normalCopy(); removeSelectedText(); updateMicroFocusHint(); @@ -3938,7 +3929,6 @@ return; } #endif - resetInputContext(); if ( !isModified() && isReadOnly() && this->context() == context && this->text() == text ) return; @@ -4112,7 +4102,6 @@ if ( !p ) return; - resetInputContext(); if ( index > p->length() - 1 ) index = p->length() - 1; @@ -4169,7 +4158,6 @@ return; } #endif - resetInputContext(); if ( doc->hasSelection( selNum ) ) { doc->removeSelection( selNum ); repaintChanged(); @@ -5072,7 +5060,6 @@ { if ( dc == doc ) return; - resetInputContext(); doc = dc; delete cursor; cursor = new QTextCursor( doc ); qt-x11-free-3.3.6-strip.patch: --- NEW FILE qt-x11-free-3.3.6-strip.patch --- --- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200 +++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200 @@ -84,7 +84,7 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir -QMAKE_STRIP = strip -QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_STRIP = +QMAKE_STRIPFLAGS_LIB += QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p --- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200 +++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200 @@ -84,7 +84,7 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir -QMAKE_STRIP = strip -QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_STRIP = +QMAKE_STRIPFLAGS_LIB += QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p --- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200 +++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200 @@ -87,7 +87,7 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir -QMAKE_STRIP = strip -QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_STRIP = +QMAKE_STRIPFLAGS_LIB += QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p qt-x11-free-3.3.7-umask.patch: --- NEW FILE qt-x11-free-3.3.7-umask.patch --- --- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100 +++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100 @@ -994,7 +994,10 @@ #endif QFile file( filename + ".tmp" ); - if (! file.open(IO_WriteOnly)) { + mode_t old_umask = umask(0022); + bool f = file.open(IO_WriteOnly); + umask(old_umask); + if (! f) { #ifdef QT_CHECK_STATE qWarning("QSettings::sync: failed to open '%s' for writing", qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch: --- NEW FILE qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch --- --- qt-x11-free-3.3.8/src/widgets/qtextedit.cpp.im 2007-03-19 10:19:10.000000000 +0100 +++ qt-x11-free-3.3.8/src/widgets/qtextedit.cpp 2007-03-19 10:19:47.000000000 +0100 @@ -5059,6 +5059,10 @@ void QTextEdit::setDocument( QTextDocument *dc ) { + if ( dc == 0 ) { + qWarning( "Q3TextEdit::setDocument() called with null Q3TextDocument pointer" ); + return; + } if ( dc == doc ) return; resetInputContext(); --- qt-x11-free-3.3.8/src/widgets/qlineedit.cpp.im 2007-03-19 10:20:03.000000000 +0100 +++ qt-x11-free-3.3.8/src/widgets/qlineedit.cpp 2007-03-19 10:22:11.000000000 +0100 @@ -457,10 +457,10 @@ \property QLineEdit::text \brief the line edit's text - Setting this property clears the selection, clears the undo/redo - history, moves the cursor to the end of the line and resets the - \c modified property to FALSE. The text is not validated when - inserted with setText(). + Note that setting this property clears the selection, clears the + undo/redo history, moves the cursor to the end of the line and + resets the \c modified property to FALSE. The text is not + validated when inserted with setText(). The text is truncated to maxLength() length. @@ -1014,6 +1014,9 @@ /*! Selects text from position \a start and for \a length characters. + Note that this function sets the cursor's position to the end of + the selection regardless of its current position. + \sa deselect() selectAll() getSelection() cursorForward() cursorBackward() */ qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch: --- NEW FILE qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch --- --- qt-x11-free-3.3.8/src/kernel/qwidget_x11.cpp 2007-02-02 15:01:13.000000000 +0100 +++ qt-x11-free-3.3.7/src/kernel/qwidget_x11.cpp 2006-10-19 16:25:16.000000000 +0200 @@ -1442,7 +1442,16 @@ QWidget *tlw = topLevelWidget(); if ( tlw->isVisible() && !tlw->topData()->embedded && !qt_deferred_map_contains(tlw) ) { XSetInputFocus( x11Display(), tlw->winId(), RevertToNone, qt_x_time); - focusInputContext(); + +#ifndef QT_NO_XIM + // trigger input context creation if it hasn't happened already + createInputContext(); + + if (tlw->topData()->xic) { + QInputContext *qic = (QInputContext *) tlw->topData()->xic; + qic->setFocus(); + } +#endif } } @@ -2717,16 +2726,14 @@ { #ifndef QT_NO_XIM QWidget *tlw = topLevelWidget(); - if (!tlw->isPopup() || isInputMethodEnabled()) { - QTLWExtra *topdata = tlw->topData(); + QTLWExtra *topdata = tlw->topData(); - // trigger input context creation if it hasn't happened already - createInputContext(); + // trigger input context creation if it hasn't happened already + createInputContext(); - if (topdata->xic) { - QInputContext *qic = (QInputContext *) topdata->xic; - qic->setFocus(); - } + if (topdata->xic) { + QInputContext *qic = (QInputContext *) topdata->xic; + qic->setFocus(); } #endif // QT_NO_XIM } --- qt-x11-free-3.3.8/src/widgets/qtextedit.cpp 2007-02-02 15:01:23.000000000 +0100 +++ qt-x11-free-3.3.7/src/widgets/qtextedit.cpp 2006-10-19 16:25:34.000000000 +0200 @@ -4972,10 +4972,6 @@ void QTextEdit::setDocument( QTextDocument *dc ) { - if ( dc == 0 ) { - qWarning( "Q3TextEdit::setDocument() called with null Q3TextDocument pointer" ); - return; - } if ( dc == doc ) return; resetInputContext(); --- qt-x11-free-3.3.8/src/widgets/qlineedit.cpp 2007-02-02 15:01:24.000000000 +0100 +++ qt-x11-free-3.3.7/src/widgets/qlineedit.cpp 2006-10-19 16:25:36.000000000 +0200 @@ -446,10 +446,10 @@ \property QLineEdit::text \brief the line edit's text - Note that setting this property clears the selection, clears the - undo/redo history, moves the cursor to the end of the line and - resets the \c modified property to FALSE. The text is not - validated when inserted with setText(). + Setting this property clears the selection, clears the undo/redo + history, moves the cursor to the end of the line and resets the + \c modified property to FALSE. The text is not validated when + inserted with setText(). The text is truncated to maxLength() length. @@ -1002,9 +1002,6 @@ /*! Selects text from position \a start and for \a length characters. - Note that this function sets the cursor's position to the end of - the selection regardless of its current position. - \sa deselect() selectAll() getSelection() cursorForward() cursorBackward() */ qt-x11-free-3.3.8b-gcc4-buildkey.patch: --- NEW FILE qt-x11-free-3.3.8b-gcc4-buildkey.patch --- diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-gcc4-buildkey/configure --- qt-x11-free-3.3.8b/configure 2008-01-15 20:09:15.000000000 +0100 +++ qt-x11-free-3.3.8b-gcc4-buildkey/configure 2008-02-18 02:41:01.000000000 +0100 @@ -3081,16 +3081,16 @@ g++*) # GNU C++ QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` - COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null` + COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null | sed 's,^[^0-9]*,,g'` case "$COMPILER_VERSION" in - *2.95.*) + 2.95.*) COMPILER_VERSION="2.95.*" ;; - *3.*) + 3.*) COMPILER_VERSION="3.*" ;; - *4.*) - COMPILER_VERSION="4" + 4.*) + COMPILER_VERSION="4.*" ;; *) ;; qt-x11-free-3.3.8b-gcc43.patch: --- NEW FILE qt-x11-free-3.3.8b-gcc43.patch --- diff -up qt-x11-free-3.3.8b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp.gcc43 qt-x11-free-3.3.8b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp --- qt-x11-free-3.3.8b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp.gcc43 2008-02-15 23:51:58.000000000 +0100 +++ qt-x11-free-3.3.8b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp 2008-02-16 00:42:09.000000000 +0100 @@ -44,7 +44,7 @@ #include "qnoneinputcontextplugin.h" #include #include - +#include QNoneInputContextPlugin::QNoneInputContextPlugin() { diff -up qt-x11-free-3.3.8b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp.gcc43 qt-x11-free-3.3.8b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp --- qt-x11-free-3.3.8b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp.gcc43 2008-02-15 23:54:26.000000000 +0100 +++ qt-x11-free-3.3.8b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2008-02-16 00:33:49.000000000 +0100 @@ -45,6 +45,7 @@ #include #include #include +#include static const int ignoreKeys[] = { Qt::Key_Shift, qt-x11-free-3.3.8b-uic-multilib.patch: --- NEW FILE qt-x11-free-3.3.8b-uic-multilib.patch --- diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp --- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100 +++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100 @@ -320,7 +320,7 @@ int main( int argc, char * argv[] ) out << "/****************************************************************************" << endl; out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl; out << "**" << endl; - out << "** Created: " << QDateTime::currentDateTime().toString() << endl; + out << "** Created by User Interface Compiler" << endl; out << "**" << endl; out << "** WARNING! All changes made in this file will be lost!" << endl; out << "****************************************************************************/" << endl << endl; diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp --- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100 +++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100 @@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const for ( it = images.begin(); it != images.end(); ++it ) out << "** " << *it << "\n"; out << "**\n"; - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; + out << "** Created by The User Interface Compiler" << "\n"; out << "**\n"; out << "** WARNING! All changes made in this file will be lost!\n"; out << "****************************************************************************/\n"; qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch: --- NEW FILE qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch --- diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp --- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2005-10-13 16:09:36.000000000 +0200 +++ qt-x11-free-3.3.5/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 @@ -306,8 +306,8 @@ currentIMKey = key; - qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", - imIndex, (const char *)_slave->identifierName() ); + /* qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", + imIndex, (const char *)_slave->identifierName() ); */ } } diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp --- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2005-10-13 16:09:36.000000000 +0200 +++ qt-x11-free-3.3.5/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 @@ -140,7 +140,7 @@ // only one character. See description of // QInputContext::filterEvent() about key compression. val = text[0].unicode(); - qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); + // qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); } // Store value @@ -164,14 +164,14 @@ void QSimpleInputContext::setFocus() { - qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", - this, focusWidget() ); + /* qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", + this, focusWidget() ); */ } void QSimpleInputContext::unsetFocus() { - qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", - this, focusWidget() ); + /* qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", + this, focusWidget() ); */ reset(); } @@ -188,8 +188,8 @@ case QEvent::MouseButtonRelease: case QEvent::MouseButtonDblClick: case QEvent::MouseMove: - qDebug( "QSimpleInputContext::mouseHandler: " - "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); + /* qDebug( "QSimpleInputContext::mouseHandler: " + "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); */ break; default: break; @@ -240,7 +240,7 @@ // no entries were found if ( p == composeTable->data + composeTable->size ) { - qDebug( "no match" ); + // qDebug( "no match" ); clearComposeBuffer(); return FALSE; } @@ -250,18 +250,18 @@ // check if partial match if ( composeBuffer[i] == 0 && p->keys[i] ) { - qDebug("partial match"); + // qDebug("partial match"); return TRUE; } if ( composeBuffer[i] != p->keys[i] ) { - qDebug("different entry"); + // qDebug("different entry"); clearComposeBuffer(); return i!=0; } } - qDebug("match exactly"); + // qDebug("match exactly"); // match exactly commitChar( p->value ); diff -Nur qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp --- qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp 2005-10-13 16:09:37.000000000 +0200 +++ qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 @@ -526,17 +526,17 @@ return; if ( type == QEvent::IMStart ) { - qDebug( "sending IMStart with %d chars to %p", - text.length(), receiver ); + /* qDebug( "sending IMStart with %d chars to %p", + text.length(), receiver ); */ event = new QIMEvent( type, text, cursorPosition ); } else if ( type == QEvent::IMEnd ) { - qDebug( "sending IMEnd with %d chars to %p, text=%s", - text.length(), receiver, (const char*)text.local8Bit() ); + /* qDebug( "sending IMEnd with %d chars to %p, text=%s", + text.length(), receiver, (const char*)text.local8Bit() ); */ event = new QIMEvent( type, text, cursorPosition ); } else if ( type == QEvent::IMCompose ) { - qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", + /* qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", receiver, text.length(), cursorPosition, selLength, - (const char*)text.local8Bit() ); + (const char*)text.local8Bit() ); */ event = new QIMComposeEvent( type, text, cursorPosition, selLength ); } --- qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp.quiet 2005-10-13 19:00:56.000000000 +0200 +++ qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp 2005-10-25 15:36:43.000000000 +0200 @@ -356,7 +356,7 @@ #if !defined(QT_NO_XIM) fontsetRefCount++; if (! qt_xim) { - qWarning("QInputContext: no input method context available"); + // qWarning("QInputContext: no input method context available"); return; } @@ -742,7 +742,7 @@ void QXIMInputContext::close( const QString &errMsg ) { - qDebug( errMsg ); + // qDebug( errMsg ); emit deletionRequested(); } --- NEW FILE qt.csh --- # Qt initialization script (csh) set qt_prefix = `/usr/bin/pkg-config --variable=prefix qt-mt` if ( "${path}" !~ *$qt_prefix/bin* ) then set path = ( $qt_prefix/bin $path ) endif if ( $?QTDIR ) then exit endif setenv QTDIR $qt_prefix setenv QTINC $qt_prefix/include setenv QTLIB $qt_prefix/lib --- NEW FILE qt.sh --- # Qt initialization script (sh) qt_prefix=`/usr/bin/pkg-config --variable=prefix qt-mt` if ! echo ${PATH} | /bin/grep -q $qt_prefix/bin ; then PATH=$qt_prefix/bin:${PATH} fi if [ -z "$QTDIR" ] ; then QTDIR="$qt_prefix" QTINC="$qt_prefix/include" QTLIB="$qt_prefix/lib" fi export QTDIR QTINC QTLIB PATH --- NEW FILE qt3.spec --- Summary: The shared library for the Qt 3 GUI toolkit %if 0%{?fedora} > 8 Name: qt3 Obsoletes: qt < 1:%{version}-%{release} Provides: qt = 1:%{version}-%{release} %else Name: qt Epoch: 1 Obsoletes: qt3 < %{version}-%{release} Provides: qt3 = %{version}-%{release} %endif Version: 3.3.8b Release: 9%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Url: http://www.troll.no Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.gz Source2: qt.sh Source3: qt.csh Source4: designer3.desktop Source5: assistant3.desktop Source6: linguist3.desktop Source7: qtconfig3.desktop Patch1: qt-3.3.4-print-CJK.patch Patch2: qt-3.0.5-nodebug.patch Patch3: qt-3.1.0-makefile.patch Patch4: qt-x11-free-3.3.7-umask.patch Patch5: qt-x11-free-3.3.6-strip.patch Patch7: qt-x11-free-3.3.2-quiet.patch Patch8: qt-x11-free-3.3.3-qembed.patch Patch12: qt-uic-nostdlib.patch Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch Patch14: qt-x11-free-3.3.3-gl.patch Patch19: qt-3.3.3-gtkstyle.patch Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch Patch24: qt-x11-free-3.3.5-uic.patch Patch25: qt-x11-free-3.3.8b-uic-multilib.patch Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch Patch32: qt-3.3.6-fontrendering-214371.patch Patch33: qt-3.3.8-fontrendering-#214570.patch Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch Patch37: qt-3.3.6-fontrendering-gu-228452.patch # immodule patches Patch50: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch Patch51: qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2 Patch52: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch Patch54: qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff Patch55: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch # qt-copy patches Patch100: 0038-dragobject-dont-prefer-unknown.patch Patch101: 0047-fix-kmenu-width.diff Patch102: 0048-qclipboard_hack_80072.patch Patch103: 0056-khotkeys_input_84434.patch patch105: 0073-xinerama-aware-qpopup.patch Patch107: 0079-compositing-types.patch Patch108: 0080-net-wm-sync-request-2.patch Patch110: 0084-compositing-properties.patch Patch111: 0088-fix-xinput-clash.diff # upstream patches Patch200: qt-x11-free-3.3.4-fullscreen.patch Patch201: qt-x11-free-3.3.8b-gcc43.patch %define qt_dirname qt-3.3 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/qt-devel-%{version} %define smp 1 %define immodule 1 %define debug 0 # MySQL plugins %define plugin_mysql -plugin-sql-mysql %define mysql_include_dir %{_includedir}/mysql %define mysql_lib_dir %{_libdir}/mysql # Postgres plugins %define plugin_psql -plugin-sql-psql # ODBC plugins %define plugin_odbc -plugin-sql-odbc # sqlite plugins %define plugin_sqlite -plugin-sql-sqlite %define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng %define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: fileutils Requires: fontconfig >= 2.0 Requires: /etc/ld.so.conf.d Requires: pkgconfig BuildRequires: desktop-file-utils BuildRequires: libmng-devel BuildRequires: glibc-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: zlib-devel BuildRequires: giflib-devel BuildRequires: perl BuildRequires: sed BuildRequires: findutils BuildRequires: cups-devel BuildRequires: tar BuildRequires: freetype-devel BuildRequires: fontconfig-devel BuildRequires: libXrender-devel BuildRequires: libXrandr-devel BuildRequires: libXcursor-devel BuildRequires: libXinerama-devel BuildRequires: libXft-devel BuildRequires: libXext-devel BuildRequires: libX11-devel BuildRequires: libSM-devel BuildRequires: libICE-devel BuildRequires: libXt-devel BuildRequires: libXmu-devel BuildRequires: libXi-devel BuildRequires: xorg-x11-proto-devel BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: desktop-file-utils BuildRequires: mysql-devel BuildRequires: postgresql-devel BuildRequires: unixODBC-devel BuildRequires: sqlite-devel %package config Summary: Graphical configuration tool for programs using Qt 3 Group: User Interface/Desktops Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-config < %{version}-%{release} Provides: qt3-config = %{version}-%{release} %else Obsoletes: qt-config < 1:%{version}-%{release} Provides: qt-config = 1:%{version}-%{release} %endif %package devel Summary: Development files for the Qt 3 GUI toolkit Group: Development/Libraries Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} Requires: freetype-devel Requires: fontconfig-devel Requires: libXrender-devel Requires: libXrandr-devel Requires: libXcursor-devel Requires: libXinerama-devel Requires: libXft-devel Requires: libXext-devel Requires: libX11-devel Requires: libSM-devel Requires: libICE-devel Requires: libXt-devel Requires: xorg-x11-proto-devel Requires: libpng-devel Requires: libjpeg-devel Requires: libmng-devel Requires: mesa-libGL-devel Requires: mesa-libGLU-devel %if "%{name}" == "qt" Obsoletes: qt3-devel < %{version}-%{release} Provides: qt3-devel = %{version}-%{release} %else Obsoletes: qt-devel < 1:%{version}-%{release} Provides: qt-devel = 1:%{version}-%{release} %endif %package devel-docs Summary: Documentation for the Qt 3 GUI toolkit Group: Development/Libraries Requires: %{name}-devel = %{?epoch:%{epoch}:}:%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-devel-docs < %{version}-%{release} Provides: qt3-devel-docs = %{version}-%{release} %else Obsoletes: qt-devel-docs < 1:%{version}-%{release} Provides: qt-devel-docs = 1:%{version}-%{release} %endif %package ODBC Summary: ODBC drivers for Qt 3's SQL classes Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-ODBC < %{version}-%{release} Provides: qt3-ODBC = %{version}-%{release} %else Obsoletes: qt-ODBC < 1:%{version}-%{release} Provides: qt-ODBC = 1:%{version}-%{release} %endif %package MySQL Summary: MySQL drivers for Qt 3's SQL classes Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-MySQL < %{version}-%{release} Provides: qt3-MySQL = %{version}-%{release} %else Obsoletes: qt-MySQL < 1:%{version}-%{release} Provides: qt-MySQL = 1:%{version}-%{release} %endif %package PostgreSQL Summary: PostgreSQL drivers for Qt 3's SQL classes Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-PostgreSQL < %{version}-%{release} Provides: qt3-PostgreSQL = %{version}-%{release} %else Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} Provides: qt-PostgreSQL = 1:%{version}-%{release} %endif %package sqlite Summary: sqlite drivers for Qt 3's SQL classes Group: System Environment/Libraries Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-sqlite < %{version}-%{release} Provides: qt3-sqlite = %{version}-%{release} %else Obsoletes: qt-sqlite < 1:%{version}-%{release} Provides: qt-sqlite = 1:%{version}-%{release} %endif %package designer Summary: Interface designer (IDE) for the Qt 3 toolkit Group: Development/Tools Requires: %{name}-devel = %{?epoch:%{epoch}:}:%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-designer < %{version}-%{release} Provides: qt3-designer = %{version}-%{release} %else Obsoletes: qt-designer < 1:%{version}-%{release} Provides: qt-designer = 1:%{version}-%{release} %endif %description Qt is a GUI software toolkit which simplifies the task of writing and maintaining GUI (Graphical User Interface) applications for the X Window System. Qt is written in C++ and is fully object-oriented. This package contains the shared library needed to run Qt 3 applications, as well as the README files for Qt 3. %description config Qt is a GUI software toolkit which simplifies the task of writing and maintaining GUI (Graphical User Interface) applications for the X Window System. Qt is written in C++ and is fully object-oriented. This package contains a graphical configuration tool for programs using Qt 3. %description devel The %{name}-devel package contains the files necessary to develop applications using the Qt GUI toolkit: the header files, the Qt meta object compiler. Install %{name}-devel if you want to develop GUI applications using the Qt 3 toolkit. %description devel-docs The %{name}-devel-docs package contains the man pages, the HTML documentation and example programs for Qt 3. %description ODBC ODBC driver for Qt 3's SQL classes (QSQL) %description MySQL MySQL driver for Qt 3's SQL classes (QSQL) %description PostgreSQL PostgreSQL driver for Qt 3's SQL classes (QSQL) %description sqlite sqlite driver for Qt 3's SQL classes (QSQL) %description designer The %{name}-designer package contains an User Interface designer tool for the Qt 3 toolkit. %prep %setup -q -n qt-x11-free-%{version} %patch1 -p1 -b .cjk %patch2 -p1 -b .ndebug %patch3 -p1 -b .makefile %patch4 -p1 -b .umask %patch5 -p1 %patch7 -p1 -b .quiet %patch8 -p1 -b .qembed %patch12 -p1 -b .nostdlib %patch13 -p1 -b .fonts %patch14 -p1 -b .gl %patch19 -p1 -b .gtk %patch20 -p1 -b .gcc4-buildkey %patch24 -p1 -b .uic %patch25 -p1 -b .uic-multilib %patch27 -p1 -b .fontrendering-ml_IN-bz#209097 %patch29 -p1 -b .fontrendering-as_IN-bz#209972 %patch31 -p1 -b .fontrendering-te_IN-bz#211259 %patch32 -p1 -b .fontrendering-bz#214371 %patch33 -p1 -b .fontrendering-#214570 %patch34 -p1 -b .fontrendering-#209974 %patch35 -p1 -b .fontrendering-ml_IN-217657 %patch37 -p1 -b .fontrendering-gu-228452 # immodule patches %if %{immodule} %patch50 -p1 -b .pre %patch51 -p1 %patch52 -p1 -b .post %patch53 -p1 -b .quiet %patch54 -p1 -b .fix-key-release-event-with-imm %patch55 -p1 -b .resetinputcontext %endif # qt-copy patches %patch100 -p0 -b .0038-dragobject-dont-prefer-unknown %patch101 -p0 -b .0047-fix-kmenu-width %patch102 -p0 -b .0048-qclipboard_hack_80072 %patch103 -p0 -b .0056-khotkeys_input_84434 %patch105 -p0 -b .0073-xinerama-aware-qpopup %patch107 -p0 -b .0079-compositing-types %patch108 -p0 -b .0080-net-wm-sync-request %patch110 -p0 -b .0084-compositing-properties %patch111 -p0 -b .0088-fix-xinput-clash # upstream patches %patch200 -p1 -b .fullscreen %patch201 -p1 -b .gcc34 # convert to UTF-8 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt %build export QTDIR=`/bin/pwd` export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" export PATH="$QTDIR/bin:$PATH" export QTDEST=%{qtdir} %if %{smp} export SMP_MFLAGS="%{?_smp_mflags}" %endif %if %{immodule} sh ./make-symlinks.sh %endif # set correct X11 prefix perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf # don't use rpath perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf perl -pi -e "s|-O2|$INCLUDES %{optflags}|g" mkspecs/*/qmake.conf # set correct lib path if [ "%{_lib}" == "lib64" ] ; then perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test fi # build shared, threaded (default) libraries echo yes | ./configure \ -prefix $QTDEST \ -docdir %{qt_docdir} \ %if %{_lib} == lib64 -platform linux-g++-64 \ %else -platform linux-g++ \ %endif %if %{debug} -debug \ %else -release \ %endif -shared \ -largefile \ -qt-gif \ -system-zlib \ -system-libpng \ -system-libmng \ -system-libjpeg \ -no-exceptions \ -enable-styles \ -enable-tools \ -enable-kernel \ -enable-widgets \ -enable-dialogs \ -enable-iconview \ -enable-workspace \ -enable-network \ -enable-canvas \ -enable-table \ -enable-xml \ -enable-opengl \ -enable-sql \ -qt-style-motif \ %{plugins} \ -stl \ -thread \ -cups \ -sm \ -xinerama \ -xrender \ -xkb \ -ipv6 \ -dlopen-opengl \ -xft \ -tablet make $SMP_MFLAGS src-qmake # build sqlite plugin pushd plugins/src/sqldrivers/sqlite qmake -o Makefile sqlite.pro popd # build psql plugin pushd plugins/src/sqldrivers/psql qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro popd # build mysql plugin pushd plugins/src/sqldrivers/mysql qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro popd # build odbc plugin pushd plugins/src/sqldrivers/odbc qmake -o Makefile "LIBS+=-lodbc" odbc.pro popd make $SMP_MFLAGS src-moc make $SMP_MFLAGS sub-src make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" %install rm -rf %{buildroot} export QTDIR=`/bin/pwd` export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" export PATH="$QTDIR/bin:$PATH" export QTDEST=%{qtdir} make install INSTALL_ROOT=%{buildroot} for i in findtr qt20fix qtrename140 lrelease lupdate ; do install bin/$i %{buildroot}%{qtdir}/bin/ done mkdir -p %{buildroot}%{_libdir}/pkgconfig/ mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ # install man pages mkdir -p %{buildroot}%{_mandir} cp -fR doc/man/* %{buildroot}%{_mandir}/ # clean up make -C tutorial clean make -C examples clean # Make sure the examples can be built outside the source tree. # Our binaries fulfill all requirements, so... perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` # don't include Makefiles of qt examples/tutorials find examples -name "Makefile" | xargs rm -f find examples -name "*.obj" | xargs rm -rf find examples -name "*.moc" | xargs rm -rf find tutorial -name "Makefile" | xargs rm -f for a in */*/Makefile ; do sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 mv -v ${a}.2 $a done mkdir -p %{buildroot}/etc/profile.d install -m 755 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/ # Add desktop files mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ --vendor="qt" \ %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} # Patch qmake to use qt-mt unconditionally perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf # remove broken links rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* rm -f %{buildroot}%{qtdir}/lib/*.la mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf # install icons mkdir %{buildroot}%{_datadir}/pixmaps install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png # own style directory mkdir -p %{buildroot}%{qtdir}/plugins/styles %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc FAQ LICENSE* README* changes* %dir %{qtdir} %dir %{qtdir}/bin %dir %{qtdir}/lib %dir %{qtdir}/plugins %dir %{qtdir}/plugins/styles %if %{immodule} %{qtdir}/plugins/inputmethods %endif %attr(0755,root,root) %config /etc/profile.d/* /etc/ld.so.conf.d/* %{qtdir}/lib/libqui.so.* %{qtdir}/lib/libqt*.so.* %files config %defattr(-,root,root,-) %{qtdir}/bin/qtconfig %{_datadir}/applications/*qtconfig*.desktop %{_datadir}/pixmaps/qtconfig3.png %files devel %defattr(-,root,root,-) %{qtdir}/bin/moc %{qtdir}/bin/uic %{qtdir}/bin/findtr %{qtdir}/bin/qt20fix %{qtdir}/bin/qtrename140 %{qtdir}/bin/assistant %{qtdir}/bin/qm2ts %{qtdir}/bin/qmake %{qtdir}/bin/qembed %{qtdir}/bin/linguist %{qtdir}/bin/lupdate %{qtdir}/bin/lrelease %{qtdir}/include %{qtdir}/mkspecs %{qtdir}/lib/libqt*.so %{qtdir}/lib/libqui.so %{qtdir}/lib/libeditor.a %{qtdir}/lib/libdesigner*.a %{qtdir}/lib/libqassistantclient.a %{qtdir}/lib/*.prl %{qtdir}/translations %{qtdir}/phrasebooks %{_libdir}/pkgconfig/* %{_datadir}/applications/*linguist*.desktop %{_datadir}/applications/*assistant*.desktop %{_datadir}/pixmaps/linguist3.png %{_datadir}/pixmaps/assistant3.png %doc %{qt_docdir}/html %files devel-docs %defattr(-,root,root,-) %doc examples %doc tutorial %{_mandir}/*/* %files sqlite %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlite.so %files ODBC %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlodbc.so %files PostgreSQL %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlpsql.so %files MySQL %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlmysql.so %files designer %defattr(-,root,root,-) %dir %{qtdir}/plugins/designer %{qtdir}/templates %{qtdir}/plugins/designer/* %{qtdir}/bin/designer %{_datadir}/applications/*designer*.desktop %{_datadir}/pixmaps/designer3.png %changelog * Wed Mar 12 2008 Kevin Kofler 3.3.8b-9 - rename to qt3 on Fedora >= 9 * Tue Mar 11 2008 Kevin Kofler 3.3.8b-8 - prepare for rename to qt3 on Fedora >= 9 (not enabled yet) - add Provides and Obsoletes everywhere - update summaries and descriptions - remove dots at end of Summary tags - fix non-UTF-8 characters * Tue Mar 11 2008 Than Ngo 3.3.8b-7 - 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h * Fri Mar 07 2008 Than Ngo 3.3.8b-6 - move qt.[c]sh in main package (#221000) * Mon Feb 18 2008 Kevin Kofler 3.3.8b-5 - fix buildkey for GCC 4.3 (#433235) * Mon Feb 11 2008 Than Ngo 3.3.8b-4 - rebuild for GCC 4.3 * Thu Jan 24 2008 Than Ngo 3.3.8b-3 - add LICENSE.GPL2/GPL3 * Thu Jan 24 2008 Than Ngo 3.3.8b-2 - License: GPLv2 or GPLv3 - merged in 3.3.8b -> drop following patches: * qt-3.3.6-fontrendering-punjabi-209970.patch * qt-3.3.6-fontrendering-or_IN-209098.patch * qt-3.3.6-fontrendering-gu-228451.patch * qt-font-default-subst.diff * 0076-fix-qprocess.diff * 0082-fix-qdatetime-fromstring.diff * qt-x11-free-3.3.8-bz#243722-mysql.patch * qt3-CVE-2007-3388.patch * utf8-bug-qt3-CVE-2007-0242.diff * qt-3.3.6-bz#292941-CVE-2007-4137.patch * Wed Jan 23 2008 Than Ngo 3.3.8b-1 - update to 3.3.8b, fix License * Mon Nov 26 2007 Than Ngo 3.3.8-11 - add Provides: qt3 = %%version-%%release * Wed Nov 7 2007 Stepan Kasal - 3.3.8-10 - rh#239216, fix a typo in qt-config description * Thu Oct 04 2007 Than Ngo - 3.3.8-9 - rh#309091, qt should provide %%{qtdir}/plugins/styles - rh#276521, qt-copy patches 0079, 0080, 0082 and 0084 * Mon Sep 17 2007 Than Ngo - 3.3.8-8 - CVE-2007-4137 * Wed Aug 29 2007 Than Ngo - 1:3.3.8-7.fc7.1 - CVE-2007-0242 * Tue Aug 28 2007 Than Ngo - 1:3.3.8-7 - CVE-2007-3388 qt3 format string flaw - backport to fix #bz243722, bz#244148, Applications using qt-mysql crash if database is removed before QApplication is destroyed - cleanup desktop files * Mon Apr 23 2007 Than Ngo - 1:3.3.8-5.fc7 - apply patch to fix fontrendering problem in gu_IN #228451,#228452 * Wed Apr 11 2007 Than Ngo - 1:3.3.8-4.fc7 - adjust qt-3.3.8-fontrendering-as_IN-209972.patch and qt-3.3.8-fontrendering-#214570.patch for qt-3.3.8 * Mon Apr 02 2007 Than Ngo - 1:3.3.8-3.fc7 - apply patches to fix Qt UTF-8 overlong sequence decoding vulnerability QPopupMenu aware of Xinerama a regression in QProgress::writeToStdin() * Tue Mar 27 2007 Than Ngo 1:3.3.8-2.fc7 - enable tablet support * Mon Mar 19 2007 Than Ngo 1:3.3.8-1.fc7 - update to 3.3.8 * Wed Dec 06 2006 Than Ngo - 1:3.3.7-2.fc7 - Resolves: bz#214371, bn_IN font rendering - Resolves: bz#217657, ml_IN issue with cursor position - Resolves: bz#217638, regression bug in qt - Resolves: bz#209974, Vowel position set properly - Resolves: bz#214570, Rendering is not fine for 'RA' 09B0 * Thu Nov 09 2006 Than Ngo 1:3.3.7-1.fc6 - update to 3.3.7 - fix #209097, ml_IN font rendering - fix #209970, pa font rendering - fix #209098, or_IN font rendering - fix #209972, as_IN font rendering - fix #209975, bn_IN font rendering - fix #211259, te_IN font rendering - fix #211436, as_IN font rendering thanks Sachin Tawniya, LingNing Zhang for the fixes - move html files to devel - add sqlite plugin - fix #189012, qt settings should be readable for other * Thu Aug 31 2006 Than Ngo 1:3.3.6-13 - add missing desktop files * Mon Jul 17 2006 Than Ngo 1:3.3.6-12 - rebuild * Wed Jul 12 2006 Jesse Keating - 1:3.3.6-11.1 - rebuild * Mon Jul 10 2006 Than Ngo 1:3.3.6-11 - apply upstream patches, fix arabic fonts issue, and problems with missing minimum size when richtext labels are used * Thu Jun 29 2006 Than Ngo 1:3.3.6-10 - apply patch from Lars, fixes Qt 3.3.6 for Arabic fonts * Wed Jun 28 2006 Than Ngo 1:3.3.6-9 - fix #183302, IM preedit issue in kbabel * Mon Jun 26 2006 Than Ngo 1:3.3.6-8 - rebuilt * Thu Jun 08 2006 Than Ngo 1:3.3.6-7 - fix utf8 issue in changelog - fix #195410, don't strip binaries/libraries - fix #156572, keyReleaseEvent issue * Mon Jun 05 2006 Than Ngo 1:3.3.6-6 - qt-devel requires on mesa-libGLU-devel mesa-libGU-devel * Tue May 16 2006 Than Ngo 1:3.3.6-5 - fix #191895, BR libXmu-devel - disable warnings if debug is off * Mon May 15 2006 Than Ngo 1:3.3.6-4 - fix multilib issue * Tue May 09 2006 Than Ngo 1:3.3.6-3 - add subpackage qt-devel-docs #191099 * Thu Apr 13 2006 Than Ngo 1:3.3.6-2 - fix xorg prefix #188510 * Mon Mar 20 2006 Than Ngo 1:3.3.6-1 - update to 3.3.6 - adapt qt-x11-immodule-unified-qt3.3.5-20060318 to qt-3.3.6 - remove set of fixes for the immodule patch, included in qt-x11-immodule-unified-qt3.3.5-20060318 - remove 0051-qtoolbar_77047.patch, qt-x11-free-3.3.4-assistant_de.patch, qt-x11-free-3.3.5-warning.patch, included in new upstream * Mon Feb 27 2006 Than Ngo 1:3.3.5-13 - add set of fixes for the immodule patch, thanks to Dirk M??ller * Fri Feb 10 2006 Jesse Keating - 1:3.3.5-12.2 - bump again for double-long bug on ppc(64) * Tue Feb 07 2006 Jesse Keating - 1:3.3.5-12.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Tue Jan 17 2006 Than Ngo 1:3.3.5-12 - add BuildRequires on mesa-libGL-devel * Wed Dec 21 2005 Than Ngo 1:3.3.5-11 - BuildRequires on libXt-devel/xorg-x11-proto-devel * Fri Dec 09 2005 Jesse Keating - rebuilt * Sun Nov 13 2005 Than Ngo 1:3.3.5-10 - workaround for keyboard input action in KHotKeys * Tue Nov 08 2005 Than Ngo 1:3.3.5-9 - fix for modular X * Tue Nov 08 2005 Than Ngo 1:3.3.5-8 - get rid of xorg-x11-devel, fix for modular X * Tue Oct 25 2005 Than Ngo 1:3.3.5-7 - update qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch * Mon Oct 24 2005 Than Ngo 1:3.3.5-6 - update qt-x11-immodule-unified-qt3.3.5-20051018.diff - remove unneeded qt-x11-immodule-unified-qt3.3.5-20051012-build.patch * Thu Oct 13 2005 Than Ngo 1:3.3.5-5 - update qt-x11-immodule-unified-qt3.3.5-20051012 - disable some debug messages - apply patch to fix build problem with the new immodule patch * Tue Sep 27 2005 Than Ngo 1:3.3.5-4 - apply patch to fix gcc warnings * Mon Sep 26 2005 Than Ngo 1:3.3.5-3 - export QTINC/QTLIB, thanks to Rex Dieter (#169132) * Tue Sep 20 2005 Than Ngo 1:3.3.5-2 - German translation of the Qt Assistent #161558 - add uic workaround * Sun Sep 11 2005 Than Ngo 1:3.3.5-1 - update to 3.3.5 * Mon Aug 22 2005 Than Ngo 1:3.3.4-22 - apply upstream patch to fix kmail folder selector #166430 * Mon Aug 15 2005 Than Ngo 1:3.3.4-21 - fix gcc4 build problem * Wed Aug 10 2005 Than Ngo 1:3.3.4-20 - apply missing patches * Wed Aug 10 2005 Than Ngo 1:3.3.4-19 - apply patch to fix wrong K menu width, #165510 * Mon Aug 01 2005 Than Ngo 1:3.3.4-18 - add visibility patch * Wed Jul 20 2005 Than Ngo 1:3.3.4-17 - fix German translation of the Qt Assistent #161558 * Mon Jun 27 2005 Than Ngo 1:3.3.4-16 - apply patch to fix Rendering for Punjabii, thanks to Trolltech #156504 * Tue May 24 2005 Than Ngo 1:3.3.4-15 - add better fix for #156977, thanks to trolltech - apply patch to fix keyReleaseEvent problem #156572 * Wed May 18 2005 Than Ngo 1:3.3.4-14 - apply patch to use ecvt, fcvt (thanks to Jakub) - fix a bug in printing of postscript #156977 * Wed May 18 2005 Than Ngo 1:3.3.4-13 - rebuild * Thu Apr 14 2005 Than Ngo 1:3.3.4-12 - fix bad symlink #154086 * Wed Apr 13 2005 Than Ngo 1:3.3.4-11 - remove bad symlink #154086 - built with PostgresSQL 8.0.2 * Wed Mar 23 2005 Than Ngo 1:3.3.4-10 - add GtkStyle patch from Peter Backlund #141125 * Fri Mar 04 2005 Than Ngo 1:3.3.4-9 - fix buildkey issue with gcc-4 * Fri Mar 04 2005 Than Ngo 1:3.3.4-8 - rebuilt against gcc-4.0.0-0.31 * Tue Mar 01 2005 Than Ngo 1:3.3.4-7 - fix build problem with gcc4 * Mon Feb 28 2005 Than Ngo 1:3.3.4-6 - rebuilt against gcc-4 * Tue Feb 22 2005 Than Ngo 1:3.3.4-5 - fix application crash when input methode not available (bug #140658) - remove .moc/.obj - add qt-copy patch to fix KDE #80072 * Fri Feb 11 2005 Than Ngo 1:3.3.4-4 - update qt-x11-immodule-unified patch * Thu Feb 10 2005 Than Ngo 1:3.3.4-3 - fix rpm file conflict * Wed Feb 02 2005 Than Ngo 1:3.3.4-2 - remove useless doc files #143949 - fix build problem if installman is disable #146311 - add missing html/examples/tutorial symlinks * Fri Jan 28 2005 Than Ngo 1:3.3.4-1 - update to 3.3.4 - adapt many patches to qt-3.3.4 - drop qt-x11-free-3.3.0-freetype, qt-x11-free-3.3.3-qmake, qt-x11-free-3.3.1-lib64 qt-x11-free-3.3.3-qimage, which are included in new upstream * Tue Nov 30 2004 Than Ngo 1:3.3.3-16 - add sql macro * Mon Nov 29 2004 Than Ngo 1:3.3.3-15 - convert qdial.3qt to UTF-8 bug #140946 * Tue Nov 23 2004 Than Ngo 1:3.3.3-14 - add missing lupdate and lrelease #140230 * Fri Nov 19 2004 Than Ngo 1:3.3.3-13 - apply patch to fix qinputcontext * Thu Nov 11 2004 Than Ngo 1:3.3.3-12 - link against MySQL 3 - fix rpm conflict * Wed Nov 10 2004 Than Ngo 1:3.3.3-11 - apply patch to fix fullscreen problem - remove html documents duplicate #135696 * Tue Nov 02 2004 Than Ngo 1:3.3.3-10 - rebuilt * Tue Nov 02 2004 Than Ngo 1:3.3.3-9 - remove unused patch - set XIMInputStyle=On The Spot - require xorg-x11-devel instead XFree86-devel * Thu Oct 14 2004 Than Ngo 1:3.3.3-8 - don't compress examples/tutorial * Thu Oct 07 2004 Than Ngo 1:3.3.3-7 - fix build problem without qt immodule #134918 * Tue Sep 28 2004 Than Ngo 1:3.3.3-6 - fix font problem, bz #133578 * Tue Sep 14 2004 Than Ngo 1:3.3.3-4 - update new immodule patch - fix multilib problem #132516 * Wed Aug 18 2004 Than Ngo 1:3.3.3-3 - add patch to fix dlopen issue (#126422) - add image handling fix * Thu Aug 12 2004 Than Ngo 1:3.3.3-2 - fix qmake broken link (#129723) * Wed Aug 11 2004 Than Ngo 1:3.3.3-1 - update to 3.3.3 release * Thu Jul 01 2004 Than Ngo 1:3.3.2-10 - add immodule for Qt * Tue Jun 29 2004 Than Ngo 1:3.3.2-9 - add sub package config, allow multi lib installation (#126643) * Thu Jun 24 2004 Than Ngo 1:3.3.2-8 - add fontconfig fix for qfontdatabase, #123868 - fix some buildrequires problem, #125289 - fix dangling symlink, #125351 - get rid of backup files * Tue Jun 15 2004 Elliot Lee 1:3.3.2-7 - rebuilt * Tue May 25 2004 Than Ngo 1:3.3.2-5 - add missing qembed tool #124052, #124052 - get rid of unused trigger - add qt.conf in ld.so.conf.d -> don't change ld.so.conf #124080 * Wed May 12 2004 Than Ngo 1:3.3.2-4 - backport some qt patches, Symbol font works again * Mon May 10 2004 Than Ngo 1:3.3.2-3 - fixed annoying warning * Tue May 04 2004 Than Ngo 1:3.3.2-2 - fix broken symlink at qt document, bug #121652 * Thu Apr 29 2004 Than Ngo 3.3.2-1 - update to 3.3.2 * Thu Apr 22 2004 Than Ngo 3.3.1-1 - add cvs backport - fix lib64 issue, #121052 - fix CJK font display, bug #121017, #120542, thanks to Leon Ho - compress tutorial/examples * Fri Mar 26 2004 Than Ngo 3.3.1-0.8 - fixed symlinks issue, #117572 * Thu Mar 25 2004 Than Ngo 3.3.1-0.7 - add Trolltech patch, fix dpi setting issue * Tue Mar 23 2004 Than Ngo 3.3.1-0.6 - add 0034-qclipboard_recursion_fix.patch from CVS, #118368 - add better qt-x11-free-3.3.1-fontdatabase.patch * Sun Mar 07 2004 Than Ngo 1:3.3.1-0.5 - disable smpflags * Fri Mar 05 2004 Than Ngo 1:3.3.1-0.4 - fix font alias * Thu Mar 04 2004 Than Ngo 1:3.3.1-0.3 - add fontdatabase fix from Trolltech * Thu Mar 04 2004 Than Ngo 1:3.3.1-0.2 - fix wrong symlink #117451 * Tue Mar 02 2004 Elliot Lee - rebuilt * Mon Mar 01 2004 Than Ngo 3.3.1-0.1 - update to 3.3.1 * Mon Feb 23 2004 Than Ngo 3.3.0-0.4 - add fix for building with freetype 2.1.7 or newer * Tue Feb 17 2004 Than Ngo 3.3.0-0.3 - enable IPv6 support - use dlopen, instead of linking with OpenGL libraries directly - don't install backup files * Thu Feb 05 2004 Than Ngo 1:3.3.0-0.2 - fix fontdatabase - don't use strip in install script - fix qt default setting * Wed Feb 04 2004 Than Ngo 1:3.3.0-0.1 - 3.3.0 * Fri Jan 30 2004 Than Ngo 1:3.2.3-0.4 - add mouse patch from CVS, bug #114647 * Tue Jan 20 2004 Than Ngo 1:3.2.3-0.3 - rebuild * Tue Dec 2 2003 Than Ngo 1:3.2.3-0.2 - Added missing prl files, (report from trolltech) - Fixed description - include requires XFree86-devel on qt-devel * Fri Nov 14 2003 Than Ngo 1:3.2.3-0.1 - 3.2.3 release * Thu Oct 30 2003 Than Ngo 1:3.2.2-0.4 - fix encoding problem * Sat Oct 18 2003 Than Ngo 1:3.2.2-0.3 - fix encoding problem * Fri Oct 17 2003 Than Ngo 1:3.2.2-0.2 - add font alias patch file, thanks to Leon Ho - clean up monospace.patch from Leon Ho - remove some unneeded patch files * Thu Oct 16 2003 Than Ngo 1:3.2.2-0.1 - 3.2.2 release - remove a patch file, which is included in 3.2.2 * Tue Oct 14 2003 Than Ngo 1:3.2.1-1.3 - remove some unneeded patch files - don't load XLFDs if XFT2 is used * Mon Sep 08 2003 Than Ngo 1:3.2.1-1.2 - fixed rpm file list * Tue Sep 02 2003 Than Ngo 1:3.2.1-1.1 - fix for the khtml form lineedit bug from CVS * Wed Aug 27 2003 Than Ngo 1:3.2.1-1 - 3.2.1 release * Wed Jul 23 2003 Than Ngo 1:3.2.0-1 - 3.2.0 release * Mon Jun 23 2003 Than Ngo 3.2.0b2-0.1 - 3.2.0b2 - add missing templates for designer * Wed Jun 18 2003 Than Ngo 3.2.0b1-0.2 - clean up specfile * Wed Jun 18 2003 Than Ngo 3.2.0b1-0.1 - 3.2.0b1 * Tue Jun 17 2003 Than Ngo 3.1.2-12 - rebuilt * Tue Jun 17 2003 Than Ngo 3.1.2-10 - add missing translations * Wed Jun 11 2003 Elliot Lee - rebuilt * Wed Jun 04 2003 Elliot Lee - rebuilt * Mon May 19 2003 Than Ngo 3.1.2-7 - add some patches from KDE CVS qt-copy, thanks to Alexei Podtelezhnikov * Mon May 5 2003 Than Ngo 3.1.2-5.1 - set correct permission config scripts * Tue Apr 29 2003 Than Ngo 3.1.2-4 - fix typo bug in font loader * Wed Apr 9 2003 Than Ngo 3.1.2-2 - add xrandr extension * Mon Mar 3 2003 Than Ngo 3.1.2-1 - 3.1.2 release * Mon Feb 17 2003 Elliot Lee 3.1.1-7 - ppc64 support * Wed Jan 29 2003 Than Ngo 3.1.1-6 - add missing Categories section in qt designer #82920 * Wed Jan 22 2003 Tim Powers - rebuilt * Mon Dec 30 2002 Florian La Roche - Change qmlined.h to not include an attic header that is also not shipped with Red Hat Linux. This also fixes building unixODBC, that includes this header (apparently also without needing it). * Thu Dec 19 2002 Than Ngo 3.1.1-3 - add monospace patch file from Leon Ho (bug #79949) - add small patch file from Sysoltsev Slawa (bug #79731) * Tue Dec 17 2002 Than Ngo 3.1.1-2 - don't require XFree86, it's not needed * Tue Dec 17 2002 Than Ngo 3.1.1-1 - update to 3.1.1 * Thu Nov 28 2002 Than Ngo 3.1.0-1.3 - don't write Date into created moc files * Mon Nov 18 2002 Than Ngo 3.1.0-1.2 - add missing libs - remove workaround for ppc * Sun Nov 17 2002 Than Ngo 3.1.0-1.1 - adjust qfontdatabase_x11 for 3.1.0 - fix lib64 issue - add workaround to build on ppc * Wed Nov 13 2002 Than Ngo 3.1.0-1 - update to 3.1.0 - adjust some patch files for 3.1.0 - clean up specfile - remove some Xft2 patch files, which are now in 3.1.0 - add qwidget_x11.cpp.diff from Trolltech - install qt in %%{_libdir}/qt-3.1 (bug #77706) - don't use rpath - enable large file support - use system Xinerama - remove unneeded cups patch file - fix to build against new XFree86 * Tue Nov 5 2002 Than Ngo 3.0.5-19 - examples misconfigured (bug #76083) - don't include pkg-config (bug #74621) - fix build problem with new XFree86 * Tue Sep 17 2002 Than Ngo 3.0.5-18 - Fixed binaries symlinks * Mon Sep 9 2002 Than Ngo 3.0.5-17hammer - clean up spec file for 64bit machine * Thu Aug 29 2002 Than Ngo 3.0.5-17 - Fixed rpath issue (bug #69692, #69575) - Removed dlopen patch - Added monospace alias patch from Leon Ho (bug #72811) - Added man pages * Sun Aug 25 2002 Than Ngo 3.0.5-16 - Added missing catagory in qt designer - Added small gb18030 patch file from Leon Ho * Thu Aug 22 2002 Bernhard Rosenkraenzer 3.0.5-15 - Prereq fileutils (#71500) * Tue Aug 20 2002 Bernhard Rosenkraenzer 3.0.5-14 - Don't link to libstdc++, it isn't used - Work around s390 compiler bug (fpic/fPIC coexistance) - Do away with the "Feature Bluecurve already defined" warning message - Remove qmake cache files from the package * Wed Aug 14 2002 Than Ngo 3.0.5-13 - Added fix to use VT100 graphic characters (bug #71364) - Added fontdatabase fix from llch at redhat.com (bug #68353) * Mon Aug 12 2002 Bernhard Rosenkraenzer [not built] - Fix default qtrc * Mon Aug 12 2002 Bernhard Rosenkraenzer 3.0.5-12 - Fix CJK Printing (#71123) * Sun Aug 11 2002 Bernhard Rosenkraenzer 3.0.5-11 - Move qtconfig from qt-devel to qt, it's generally useful - Use -fno-use-cxa-atexit - Some tweaks to allow building Qt/Embedded with the same spec file - Apply the GB18030 patch even if xft2 isn't set * Fri Aug 9 2002 Than Ngo 3.0.5-10 - Added XIM patch from llch at redhat.com (bug #70411) * Sun Aug 4 2002 Than Ngo 3.0.5-9 - add a missing patch file (closelock/openlock) * Thu Aug 1 2002 Bernhard Rosenkraenzer 3.0.5-8 - Define QT_INSTALL_PREFIX in qmake * Thu Aug 1 2002 Bernhard Rosenkraenzer 3.0.5-7 - Find correct location of qmake mkspecs even if QTDIR isn't set * Thu Jul 25 2002 Than Ngo 3.0.5-6 - Check file descriptor before closelock * Thu Jul 25 2002 Than Ngo 3.0.5-5 - Fixed a bug in openlock * Wed Jul 24 2002 Than Ngo 3.0.5-4 - Tiny tweaks to qt3 patch * Tue Jul 23 2002 Owen Taylor - Tiny fix to qt3.diff to not add '0' as a test character (#68964) * Mon Jul 22 2002 Tim Powers 3.0.5-2 - rebuild using gcc-3.2-0.1 * Mon Jul 22 2002 Than Ngo 3.0.5-1 - 3.0.5 - Fixed dependencies issue * Thu Jul 18 2002 Than Ngo 3.0.4-12 - Added qt-clipfix from Harald Hoyer (bug #67648) * Tue Jul 16 2002 Than Ngo 3.0.4-11 - get rid of qt resource, it's now in redhat-artworks - add some define to build for 7.3 * Thu Jul 11 2002 Than Ngo 3.0.4-10 - add missing Buildprequires desktop-file-utils - add patches for GB18030 (llch at redhat.com) bug #68430 * Tue Jul 09 2002 Than Ngo 3.0.4-9 - add new desktop file for qt designer * Fri Jul 5 2002 Jakub Jelinek 3.0.4-8 - compile libXinerama.a with -fpic in Qt until XFree86 is fixed - make %%xft2 work even if old Xft headers aren't installed * Fri Jun 21 2002 Tim Powers - automated rebuild * Tue Jun 18 2002 Bernhard Rosenkraenzer 3.0.4-6 - Re-enable Xft2 now that fontconfig is fixed - Require a version of fontconfig that works - Use -fPIC rather than -fpic on alpha * Tue Jun 18 2002 Bernhard Rosenkraenzer 3.0.4-5 - Revert to Xft1 for now, Xft2 is too unstable - Exclude alpha for now to work around binutils bugs * Tue Jun 11 2002 Bernhard Rosenkraenzer 3.0.4-4 - Add (and fix up) fontconfig patch * Mon Jun 3 2002 Bernhard Rosenkraenzer 3.0.4-3 - Remove the glweak patch, it isn't needed after dropping XFree86 3.x * Thu May 23 2002 Tim Powers - automated rebuild * Sun May 5 2002 Bernhard Rosenkraenzer 3.0.4-1 - 3.0.4 - Make SQL plugins optional (buildtime) - Register with pkgconfig * Thu May 02 2002 Than Ngo 3.0.3-12 - qtdir /usr/lib/qt3 - build against gcc-3.1-0.26 - add qt-3.0.3-glweak.patch * Wed Apr 17 2002 Bernhard Rosenkraenzer 3.0.3-11 - qt3-gcc2.96 should be in qt, not qt-devel * Mon Apr 15 2002 Bernhard Rosenkraenzer 3.0.3-10 - Tweaks to allow parallel installations of Qt 3.x (gcc 2.96) and Qt 3.x (gcc 3.1) - Fix up debug spewage at Qt designer startup * Wed Apr 10 2002 Bernhard Rosenkraenzer 3.0.3-9 - Spec file fixes * Wed Apr 10 2002 Bernhard Rosenkraenzer 3.0.3-8 - Get rid of non-threaded version, dlopen()'ing threaded code (like plugins) from non-threaded code is dangerous - Add some fixes from qt-copy, fixing the ksplash crash some people have noticed on a first login - Add translation fixes from CVS - Patch example .pro files to build outside the Qt source tree (#63023) - Fix various bugs * Thu Apr 04 2002 Leon Ho 3.0.3-7 - fixes for CJK - qpsprinter - fixes for CJK - gb18030 * Fri Mar 29 2002 Bernhard Rosenkraenzer 3.0.3-6 - Make sure it builds with both gcc 2.96 and 3.1 * Wed Mar 28 2002 Leon Ho 3.0.3-5 - fixes for CJK - qpsprinter * Wed Mar 27 2002 Bernhard Rosenkraenzer 3.0.3-4 - Add CJK patches * Tue Mar 26 2002 Than Ngo 3.0.3-3 - fix loading kde styles * Tue Mar 19 2002 Bernhard Rosenkraenzer 3.0.3-1 - Update to 3.0.3 final * Thu Mar 14 2002 Bernhard Rosenkraenzer 3.0.3-0.cvs20020314.1 - Update to 3.0.3-pre, required for KDE3 - force -fPIC usage - Remove conflict with qt2 < 2.3.2-1, the new qt2 2.3.1 is fixed and qt 2.3.2 is broken - Ship the qmake config files (so qmake works for building any 3rd party stuff, e.g. aethera) * Wed Mar 6 2002 Bernhard Rosenkraenzer 3.0.2-2 - Add some fixes from KDE's qt-copy CVS - Pluginize image formats * Mon Feb 25 2002 Bernhard Rosenkraenzer 3.0.2-1 - 3.0.2 final * Tue Feb 19 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.3 - Add GB18030 codec patch, #60034 - Force-build jpeg support, fixing #59775 and #59795 * Sat Jan 26 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.2 - Build with CUPS support * Fri Jan 18 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.1 - Fix up /usr/bin/moc links, they should point to qt3 * Mon Jan 14 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020114.1 - Build styles directly into the main library for now, there's too much broken code out there depending on this ATM. * Wed Jan 9 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020109.1 - Stop excluding alpha, gcc has been fixed * Tue Jan 8 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020108.1 - Add fixes from CVS; this fixes the "Alt + F1, arrow up, arrow up doesn't work in KDE" bug * Mon Dec 17 2001 Bernhard Rosenkraenzer 3.0.1-2 - Fix up settings search path - Add default qtrc allowing to use KDE 3.x Qt plugins - Make sure QLibrary uses RTLD_GLOBAL when dlopen()ing libraries * Thu Dec 13 2001 Bernhard Rosenkraenzer 3.1.0-1 - Work around gcc bug #57467 * Wed Dec 12 2001 Bernhard Rosenkraenzer - 3.0.1 final * Mon Dec 10 2001 Bernhard Rosenkraenzer 3.0.1-0.cvs20011210.1 - Update to current (needed by KDE 3.x) - Rebuild with current libstdc++ - Temporarily disable building on alpha - Fix build with PostgreSQL 7.2 * Mon Nov 26 2001 Bernhard Rosenkraenzer 3.0.0-5 - Fix up glweak * Mon Nov 5 2001 Bernhard Rosenkraenzer 3.0.0-4 - Give designer, uic, moc, etc. their real names - the qt2 versions have been renamed in qt2-2.3.2-1. Conflict with qt2 < 2.3.2-1. * Thu Oct 25 2001 Bernhard Rosenkraenzer 3.0.0-3 - Add symlink /usr/lib/qt-3.0.0 -> /usr/lib/qt3 and set QTDIR to the symlink, allowing to update to 3.0.1 without breaking rpath'ed binaries * Tue Oct 16 2001 Bernhard Rosenkraenzer 3.0.0-1 - 3.0.0 final - fix some minor specfile bugs - Modularize some more (image format plugins) - Build codecs * Tue Sep 18 2001 Bernhard Rosenkraenzer 3.0.0-0.beta5.1 - beta5 - Share more code between qt-x11 and qt-embedded builds * Wed Aug 29 2001 Bernhard Rosenkraenzer 3.0.0-0.beta4.1 - beta4 - build the Motif style directly into Qt rather than as a plugin - Qt should always have at least one style... - replace the designer3 symlink with a shell script that sets QTDIR correctly before launching designer - Add desktop file for designer * Mon Aug 6 2001 Tim Powers 3.0.0-0.beta3.4 - explicitly include qm2ts, qmake, qtconfig in the devel package file list to avoid dangling symlinks * Thu Aug 2 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.3 - Try yet another workaround for buildsystem breakages * Tue Jul 31 2001 Bernhard Rosenkraenzer - Add another ugly workaround for build system problems, this should finally get rid of the dangling symlinks * Tue Jul 31 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.2 - Rephrase parts of the spec file, hopefully pleasing the build system * Sun Jul 29 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.1 - beta3 - Fix dangling symlinks * Sun Jun 24 2001 Bernhard Rosenkraenzer 3.0.0-0.beta1.2 - Fix up QSQL Postgres classes for Postgres 7.1.x - Fix various bugs: - QtMultilineEdit and QtTableView should actually compile - Link libqsqlpsql with libpq - Don't link the base library with libmysqlclient, linking the MySQL module with it is sufficient - Add missing const qualifier - move the SQL drivers to separate packages to avoid dependencies - build and install designer plugins - converting glade files to Qt is fun. ;) - handle RPM_OPT_FLAGS * Tue May 22 2001 Bernhard Rosenkraenzer 3.0.0-0.beta1.1 - 3.0 beta 1 * Wed May 16 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20010516.1 - Update, remove conflicts with Qt 2.x * Mon May 14 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20010514.1 - Initial build of 3.0 branch * Fri Apr 27 2001 Bernhard Rosenkraenzer 2.3.0-6 - Fix crashes on ia64, Patch from Bill Nottingham - Allow building qt-nox * Fri Apr 20 2001 Bernhard Rosenkraenzer 2.3.0-5 - Make sure uic and designer use the libqui from the source tree, not a previously installed one. Linking uic-x11 against libqui-embedded is definitely not a feature. ;) - The qclipboard fix is needed for qt-x11 only, don't apply it if we're building qt-embedded * Sat Apr 14 2001 Bernhard Rosenkraenzer - Handle LPRng specific constructs in printcap, Bug #35937 * Sun Mar 25 2001 Florian La Roche - add qfont patch from Trolltech * Tue Mar 13 2001 Harald Hoyer - added patch for '@euro' language settings * Tue Mar 6 2001 Bernhard Rosenkraenzer - 2.3.0 final - BuildRequires XFree86-devel >= 4.0.2 (#30486) * Mon Feb 26 2001 Than Ngo - fix check_env function, so that qt does not crash if QT_XFT is not set - fix symlinks * Mon Feb 26 2001 Bernhard Rosenkraenzer - 2.3.0b1 - Add a patch to qpsprinter that handles TrueType fonts even if they come from xfs * Tue Feb 13 2001 Preston Brown - japanese input and clipboard fixes applied. Changes have been sent upstream by patch authors. * Fri Feb 9 2001 Bernhard Rosenkraenzer - Rebuild with new Mesa to get rid of pthreads linkage - Add Xft fix from KDE CVS * Wed Feb 7 2001 Bernhard Rosenkraenzer - Add printing bugfix patch from Trolltech * Sat Feb 3 2001 Bernhard Rosenkraenzer - 2.2.4 - Qt Embedded: Add QVfb and VNC support * Tue Jan 16 2001 Bernhard Rosenkraenzer - Don't segfault when running Qt/Embedded applications as root - Improve the Qt/Embedded sparc patch so we don't need the specfile hacks anymore - Fix a bug in QPrintDialog (causing KDE Bug #18608) * Thu Jan 11 2001 Bernhard Rosenkraenzer - bzip2 source to save space - Qt/Embedded 2.2.3 - Fix qte build on sparc * Wed Dec 20 2000 Bernhard Rosenkraenzer - Run ldconfig in %%post and %%postun for qt-Xt * Sun Dec 17 2000 Bernhard Rosenkraenzer - Build with the Xrender extension (Patch from Keith Packard ) * Wed Dec 13 2000 Bernhard Rosenkraenzer - 2.2.3 * Tue Dec 12 2000 Bernhard Rosenkraenzer - Rebuild to fix permissions on doc dir - Don't exclude ia64 anymore * Fri Nov 17 2000 Bernhard Rosenkraenzer - Fix up uic (Patch from trolltech) * Wed Nov 15 2000 Bernhard Rosenkraenzer - Build qt-embedded changes to base: fix build, fix ISO C99 compliance, fix 64bit support * Mon Nov 13 2000 Bernhard Rosenkraenzer - 2.2.2 * Tue Oct 24 2000 Than Ngo - call ldconfig for updating (Bug #19687) - added patch from Trolltech, thanks to Rainer * Wed Oct 18 2000 Bernhard Rosenkraenzer - Add missing msg2qm, msgmerge, qconfig tools (Bug #18997), introduced by broken Makefiles in base - fix up %%install so it works both with old-style and new-style fileutils (fileutils <= 4.0z don't know about -L) * Fri Oct 13 2000 Bernhard Rosenkraenzer - Disable exception handling; this speeds up KDE 2.x and reduces its memory footprint by 20 MB. * Tue Oct 10 2000 Bernhard Rosenkraenzer - dereference symlinks in include * Sun Oct 8 2000 Bernhard Rosenkraenzer - fix -devel - update to the new version of 2.2.1 on trolltech.com; the initial tarball contained broken docs * Thu Oct 5 2000 Bernhard Rosenkraenzer - 2.2.1 * Mon Sep 25 2000 Bernhard Rosenkraenzer - Add missing uic * Thu Sep 21 2000 Bernhard Rosenkraenzer - Move Qt designer to a different source RPM to get rid of a circular dependency (kdelibs2->qt, qt->kdelibs2) - Enable MNG support - Don't compile (just include) examples and tutorials - move the static libraries to a separate package (qt-static). They're HUGE, and most people won't ever need them. - clean up spec file - fix up dependencies (-devel requires base, -static requires devel, Xt requires base) - add BuildRequires line * Tue Sep 12 2000 Than Ngo - update release 2.2.0 - changed copyright to GPL - added missing static libraries - made symbolic link for designer to load the help files correct - made designer and designer-kde2 as sub packages - added missing templates for designer - remove jakub patch, since the release 2.2.0 already contains this patch. - fixed qt again to compile with gcc-2.96 - use make -j for building * Wed Aug 23 2000 Bernhard Rosenkraenzer - Work around compiler bugs (Patch from Jakub) - Use relative symlinks (Bug #16750) * Mon Aug 21 2000 Bernhard Rosenkraenzer - beta2 * Mon Aug 14 2000 Bernhard Rosenkraenzer - new qt-copy from KDE2 CVS * Wed Aug 9 2000 Bernhard Rosenkraenzer - official beta 1 * Thu Aug 3 2000 Than Ngo - rebuilt against the libpng-1.0.8 * Thu Jul 27 2000 Bernhard Rosenkraenzer - rebuild (so we have it on all arches) * Tue Jul 25 2000 Bernhard Rosenkraenzer - move man pages to a more reasonable place (this fixes Bug #14126) - exclude ia64 for now (compiler problems!!!) * Mon Jul 24 2000 Harald Hoyer - modified connect patch to fit qt 2.2.0 beta. * Thu Jul 20 2000 Bernhard Rosenkraenzer - update to current qt-copy; this is now a qt 2.2.0 beta. * Mon Jul 17 2000 Bernhard Rosenkraenzer - update to current qt-copy in kde CVS, required * Wed Jul 12 2000 Prospector - automatic rebuild * Sun Jul 11 2000 Harald Hoyer - made patch smaller and binary compatible when recompiled with 6.2 - modified connect and moc to cope with the new g++ class layout * Sun Jul 09 2000 Than Ngo - rebuilt qt with gcc-2.96-34 * Fri Jul 07 2000 Than Ngo - rebuilt qt with c++ 2.96 * Mon Jul 3 2000 Bernhard Rosenkraenzer - Fix dependancies * Sun Jul 2 2000 Bernhard Rosenkraenzer - Use egcs++ for now ** FIXME * Wed Jun 28 2000 Preston Brown - fix up qt.sh * Sun Jun 25 2000 Bernhard Rosenkraenzer - Build in jpeg and threading support - Fix a bug in clipboard pasting code * Wed Jun 07 2000 Preston Brown - fix qt.{sh,csh} - use new rpm macro paths - package man pages * Fri Jun 2 2000 Bill Nottingham - build without optimization on ia64 * Mon May 29 2000 Bernhard Rosenkraenzer - 2.1.1 * Thu May 18 2000 Florian La Roche - recompile with correct libstdc++ * Thu Apr 13 2000 Bernhard Rosenkraenzer - 2.1.0 final * Wed Apr 5 2000 Bernhard Rosenkraenzer - beta4 - depend on libGL.so.1 rather than Mesa - XFree86 4.0 provides that lib, too * Wed Mar 22 2000 Bernhard Rosenkraenzer - beta3 * Tue Mar 7 2000 Bernhard Rosenkraenzer - beta2 - fix compilation of the NSPlugin add-on * Fri Mar 3 2000 Bill Nottingham - fix %postun script * Fri Feb 18 2000 Bernhard Rosenkr??nzer - beta1 - get rid of qt-ImageIO, the functionality is now in the main Qt library - remove qt-Network, the functionality is now in the main Qt library - add changes-2.1.0 to %doc * Thu Feb 17 2000 Preston Brown - no refcount check on postun script, we want it to happen even on upgrades * Thu Feb 10 2000 Bernhard Rosenkraenzer - new snapshot, should fix QWhatsThisButton - remove executable permissions from *.pro files * Mon Feb 07 2000 Preston Brown - strip binaries in examples, tutorial * Mon Jan 31 2000 Bernhard Rosenkraenzer - new snapshot - should fix the hotkey bug - Fix up the Makefiles so it compiles * Tue Jan 18 2000 Bernhard Rosenkraenzer - new snapshot - we need those QVariant fixes * Thu Jan 13 2000 Bernhard Rosenkraenzer - switch from glxMesa to Mesa for the GL addon * Wed Jan 5 2000 Bernhard Rosenkr??nzer - Fix up dependencies - new snapshot * Mon Jan 3 2000 Ngo Than - new snapshot for Red Hat Linux 6.2 - increase version number * Mon Dec 20 1999 Bernhard Rosenkraenzer - new snapshot - handle RPM_OPT_FLAGS * Mon Dec 13 1999 Bernhard Rosenkraenzer - new snapshot - -GL requires libGL.so.1 instead of Mesa (might as well be glxMesa or some commercial OpenGL) - -GL BuildPrereqs /usr/X11R6/include/GL/gl.h instead of Mesa-devel (might as well be glxMesa or some commercial OpenGL) * Sun Dec 05 1999 Bernhard Rosenkraenzer - update to current RSYNC version - remove compilation patch - it finally works out of the box * Wed Oct 27 1999 Bernhard Rosenkraenzer - update to current CVS snapshot - build extensions - add patch to fix QNetwork compilation * Sun Oct 24 1999 Bernhard Rosenkraenzer - current CVS snapshot - fix compilation with gcc 2.95.x - use install -c rather than just install to make BSD install happy * Mon Oct 11 1999 Bernhard Rosenkraenzer - 2.1.0 snapshot (for KDE2) - Fix typo in spec * Thu Sep 23 1999 Preston Brown - don't ship tutorial or example binaries * Tue Sep 21 1999 Preston Brown - substitution in tutorial and examples so that dependencies are correct and they can be successfully rebuilt. - switched to completely using QTDIR. trying to coexist with links into /usr/{include,lib} and still compile with qt 1.x is very hard for configure scripts to cope with. * Thu Aug 19 1999 Preston Brown - implemented QTDIR compatibility. * Tue Jul 20 1999 Preston Brown - qt 2.0.1 packaged. * Wed Jul 14 1999 Preston Brown - Qt 2.00 packaged. - examples, html documentation, tutorial moved to /usr/doc * Sat Apr 17 1999 Preston Brown - static library supplied in dev package. * Wed Apr 07 1999 Preston Brown - turn on internal GIF reading support * Tue Apr 06 1999 Preston Brown - strip binaries * Mon Mar 15 1999 Preston Brown - upgrade to qt 1.44. * Wed Feb 24 1999 Preston Brown - Injected new description and group. * Tue Jan 19 1999 Preston Brown - moved includes to /usr/include/qt * Mon Jan 04 1999 Preston Brown - made setup phase silent. * Fri Dec 04 1998 Preston Brown - upgraded to qt 1.42, released today. * Tue Dec 01 1998 Preston Brown - took Arnts RPM and made some minor changes for Red Hat. --- NEW FILE qtconfig3.desktop --- [Desktop Entry] Name=Qt3 Config Comment=Configure Qt3 behavior, styles, fonts Exec=qtconfig Icon=qtconfig3 Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Settings; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qt3/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 17:30:08 -0000 1.1 +++ .cvsignore 12 Mar 2008 18:50:07 -0000 1.2 @@ -0,0 +1,2 @@ +qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2 +qt-x11-free-3.3.8b.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qt3/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 17:30:08 -0000 1.1 +++ sources 12 Mar 2008 18:50:07 -0000 1.2 @@ -0,0 +1,2 @@ +91adfea39f17a64b86497bce32782cf3 qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2 +9f05b4125cfe477cc52c9742c3c09009 qt-x11-free-3.3.8b.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 18:56:24 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 12 Mar 2008 18:56:24 GMT Subject: rpms/NetworkManager/devel .cvsignore, 1.62, 1.63 NetworkManager.spec, 1.199, 1.200 sources, 1.90, 1.91 Message-ID: <200803121856.m2CIuO8Y011329@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11287 Modified Files: .cvsignore NetworkManager.spec sources Log Message: * Wed Mar 12 2008 Dan Williams - 1:0.7.0-0.9.1.svn3432 - Fix DHCP rebind behavior - Preliminary PPPoE support Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 11 Mar 2008 03:14:08 -0000 1.62 +++ .cvsignore 12 Mar 2008 18:55:26 -0000 1.63 @@ -73,3 +73,5 @@ nm-applet-0.7.0.svn526.tar.gz NetworkManager-0.7.0.svn3417.tar.gz nm-applet-0.7.0.svn585.tar.gz +NetworkManager-0.7.0.svn3437.tar.gz +nm-applet-0.7.0.svn591.tar.gz Index: NetworkManager.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- NetworkManager.spec 11 Mar 2008 03:34:43 -0000 1.199 +++ NetworkManager.spec 12 Mar 2008 18:55:26 -0000 1.200 @@ -8,8 +8,8 @@ %define wireless_tools_version 1:28-0pre9 %define libnl_version 1.0-0.15.pre8.git20071218 -%define snapshot svn3417 -%define applet_snapshot svn585 +%define snapshot svn3437 +%define applet_snapshot svn591 Name: NetworkManager Summary: Network connection manager and user applications @@ -58,7 +58,6 @@ BuildRequires: perl(XML::Parser) BuildRequires: automake autoconf intltool libtool BuildRequires: ppp >= 2.4.4 -BuildRequires: gnome-common BuildRequires: nss-devel >= 3.11.7 %description @@ -279,6 +278,10 @@ %changelog +* Wed Mar 12 2008 Dan Williams - 1:0.7.0-0.9.1.svn3432 +- Fix DHCP rebind behavior +- Preliminary PPPoE support + * Mon Mar 10 2008 Dan Williams - 1:0.7.0-0.9.1.svn3417 - Fix gnome-icon-theme Requires, should be on gnome subpackage Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- sources 11 Mar 2008 03:14:08 -0000 1.90 +++ sources 12 Mar 2008 18:55:26 -0000 1.91 @@ -1,2 +1,2 @@ -89f7ed354a672f12cc6d85aa53c78ddd NetworkManager-0.7.0.svn3417.tar.gz -ae040d6fe8b0d8a8e84a9be9a7eeb0cd nm-applet-0.7.0.svn585.tar.gz +0f6a156bd86433c992498c3c2016d654 NetworkManager-0.7.0.svn3437.tar.gz +be8d64cf73d74d9e13cbd37912a4c0e7 nm-applet-0.7.0.svn591.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 18:57:10 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 12 Mar 2008 18:57:10 GMT Subject: rpms/lure/devel lure.desktop, NONE, 1.1 lure.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803121857.m2CIvAqY011401@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lure/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11326/devel Modified Files: .cvsignore sources Added Files: lure.desktop lure.spec Log Message: initial lure import --- NEW FILE lure.desktop --- [Desktop Entry] Name=Lure of the Temptress Comment=Adventure Game Exec=scummvm -f -p /usr/share/lure lure Icon=scummvm Terminal=false Type=Application Categories=Game;AdventureGame; StartupNotify=false --- NEW FILE lure.spec --- Name: lure Version: 1.1 Release: 1%{?dist} Summary: Lure of the Temptress - Adventure Game Group: Amusements/Games # For further discussion on distribution rights see: # http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html License: Freely redistributable without restriction URL: http://www.revolution.co.uk/_display.php?id=10 Source0: http://downloads.sourceforge.net/scummvm/%{name}-%{version}.zip Source1: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-11-1/dists/engine-data/lure.dat Source2: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildArch: noarch Requires: scummvm >= 0.11.1-2 %description Lure of the Temptress was Revolution's very first adventure game and work began on it in 1989, even before Revolution's inception as an actual games development company. From the start our aim was to consider the contemporary adventures of the day and then bring something new to the genre. From this came the Virtual Theatre engine. VT allowed in-game characters to wander around the gameworld indepently of each other, living their own lives and doing their own thing. Another feature allowed the player to give direct orders to Helper characters - in this case Ratpouch - who would then go off to perform the task. The result is a quirky and entertaining adventure game that kicked off Revolution's fondness for characterisation and in-game humour. %prep %setup -q -n %{name} sed -i 's/\r//g' notes.txt README %build # Nothing to build data only %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} install -p -m 644 *.vga *.ega %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc *.txt Manual.pdf PROTECT.PDF README %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %changelog * Sat Mar 1 2008 Hans de Goede 1.1-1 - Initial FE package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lure/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 17:19:01 -0000 1.1 +++ .cvsignore 12 Mar 2008 18:56:35 -0000 1.2 @@ -0,0 +1,2 @@ +lure-1.1.zip +lure.dat Index: sources =================================================================== RCS file: /cvs/extras/rpms/lure/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 17:19:01 -0000 1.1 +++ sources 12 Mar 2008 18:56:35 -0000 1.2 @@ -0,0 +1,2 @@ +d1300cef563bb4b6b1f88a2f1cee7832 lure-1.1.zip +d92372e7eead8d6e64f40cce381ec6ea lure.dat From fedora-extras-commits at redhat.com Wed Mar 12 19:04:10 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 12 Mar 2008 19:04:10 GMT Subject: rpms/perl-JSON-Any/devel perl-JSON-Any.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803121904.m2CJ4Asb017591@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-JSON-Any/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17557/devel Modified Files: .cvsignore sources Added Files: perl-JSON-Any.spec Log Message: initial import --- NEW FILE perl-JSON-Any.spec --- Name: perl-JSON-Any Version: 1.16 Release: 1%{?dist} Summary: A meta-module to make working with JSON easier License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JSON-Any/ Source0: http://www.cpan.org/authors/id/P/PE/PERIGRIN/JSON-Any-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # JSON::XS is fastest, so we require it Requires: perl(JSON::XS) # core BuildRequires: perl(Carp) BuildRequires: perl(ExtUtils::MakeMaker) # testing BuildRequires: perl(Test::More) >= 0.62 BuildRequires: perl(JSON::XS) >= 1.52 # optional tests -- JSON::Any can handle any of the following to actually do # the JSON parsing. We use JSON::XS above, as it's both already in Fedora and # the fastest of the following. As other JSON modules are added to Fedora, # we'll uncomment the tests below. BuildRequires: perl(JSON) #BuildRequires: perl(JSON::DWIM) #BuildRequires: perl(JSON::PC) BuildRequires: perl(JSON::Syck) %description JSON::Any provides a coherent API to bring together the various JSON modules currently on CPAN. %prep %setup -q -n JSON-Any-%{version} find . -type f -exec chmod -c -x {} + find t/ -type f -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} + cat Changes | iconv -f ISO-8859-1 -t UTF-8 > Changes.foo mv Changes.foo Changes %build %{__perl} Makefile.PL INSTALLDIRS=vendor --default make %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sun Mar 09 2008 Chris Weyl 1.16-1 - Specfile autogenerated by cpanspec 1.74. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-JSON-Any/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 17:31:50 -0000 1.1 +++ .cvsignore 12 Mar 2008 19:03:34 -0000 1.2 @@ -0,0 +1 @@ +JSON-Any-1.16.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-JSON-Any/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 17:31:50 -0000 1.1 +++ sources 12 Mar 2008 19:03:34 -0000 1.2 @@ -0,0 +1 @@ +37325d39aa62b291d05b9e90d2df12a0 JSON-Any-1.16.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 19:07:20 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 12 Mar 2008 19:07:20 GMT Subject: rpms/perl-JSON-Any/devel perl-JSON-Any.spec,1.1,1.2 Message-ID: <200803121907.m2CJ7KSd017708@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-JSON-Any/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17673 Modified Files: perl-JSON-Any.spec Log Message: release bump Index: perl-JSON-Any.spec =================================================================== RCS file: /cvs/extras/rpms/perl-JSON-Any/devel/perl-JSON-Any.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-JSON-Any.spec 12 Mar 2008 19:03:34 -0000 1.1 +++ perl-JSON-Any.spec 12 Mar 2008 19:06:41 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-JSON-Any Version: 1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A meta-module to make working with JSON easier License: GPL+ or Artistic Group: Development/Libraries @@ -69,5 +69,8 @@ %{_mandir}/man3/* %changelog +* Wed Mar 12 2008 Chris Weyl 1.16-2 +- bump + * Sun Mar 09 2008 Chris Weyl 1.16-1 - Specfile autogenerated by cpanspec 1.74. From fedora-extras-commits at redhat.com Wed Mar 12 19:12:05 2008 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Wed, 12 Mar 2008 19:12:05 GMT Subject: rpms/perl-JSON-Any/F-7 perl-JSON-Any.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <200803121912.m2CJC5nc017873@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-JSON-Any/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17851 Modified Files: sources Added Files: perl-JSON-Any.spec Log Message: pseudo-branch of perl-JSON-Any to F-7 --- NEW FILE perl-JSON-Any.spec --- Name: perl-JSON-Any Version: 1.16 Release: 2%{?dist} Summary: A meta-module to make working with JSON easier License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/JSON-Any/ Source0: http://www.cpan.org/authors/id/P/PE/PERIGRIN/JSON-Any-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # JSON::XS is fastest, so we require it Requires: perl(JSON::XS) # core BuildRequires: perl(Carp) BuildRequires: perl(ExtUtils::MakeMaker) # testing BuildRequires: perl(Test::More) >= 0.62 BuildRequires: perl(JSON::XS) >= 1.52 # optional tests -- JSON::Any can handle any of the following to actually do # the JSON parsing. We use JSON::XS above, as it's both already in Fedora and # the fastest of the following. As other JSON modules are added to Fedora, # we'll uncomment the tests below. BuildRequires: perl(JSON) #BuildRequires: perl(JSON::DWIM) #BuildRequires: perl(JSON::PC) BuildRequires: perl(JSON::Syck) %description JSON::Any provides a coherent API to bring together the various JSON modules currently on CPAN. %prep %setup -q -n JSON-Any-%{version} find . -type f -exec chmod -c -x {} + find t/ -type f -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} + cat Changes | iconv -f ISO-8859-1 -t UTF-8 > Changes.foo mv Changes.foo Changes %build %{__perl} Makefile.PL INSTALLDIRS=vendor --default make %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README t/ %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Wed Mar 12 2008 Chris Weyl 1.16-2 - bump * Sun Mar 09 2008 Chris Weyl 1.16-1 - Specfile autogenerated by cpanspec 1.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-JSON-Any/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 17:31:50 -0000 1.1 +++ sources 12 Mar 2008 19:11:30 -0000 1.2 @@ -0,0 +1 @@ +37325d39aa62b291d05b9e90d2df12a0 JSON-Any-1.16.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 19:17:43 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 12 Mar 2008 19:17:43 GMT Subject: rpms/lure/F-8 lure.desktop, NONE, 1.1 lure.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803121917.m2CJHhZx018038@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lure/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18014 Modified Files: .cvsignore sources Added Files: lure.desktop lure.spec Log Message: * Sat Mar 1 2008 Hans de Goede 1.1-1 - Initial FE package --- NEW FILE lure.desktop --- [Desktop Entry] Name=Lure of the Temptress Comment=Adventure Game Exec=scummvm -f -p /usr/share/lure lure Icon=scummvm Terminal=false Type=Application Categories=Game;AdventureGame; StartupNotify=false --- NEW FILE lure.spec --- Name: lure Version: 1.1 Release: 1%{?dist} Summary: Lure of the Temptress - Adventure Game Group: Amusements/Games # For further discussion on distribution rights see: # http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html License: Freely redistributable without restriction URL: http://www.revolution.co.uk/_display.php?id=10 Source0: http://downloads.sourceforge.net/scummvm/%{name}-%{version}.zip Source1: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-11-1/dists/engine-data/lure.dat Source2: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildArch: noarch Requires: scummvm >= 0.11.1-2 %description Lure of the Temptress was Revolution's very first adventure game and work began on it in 1989, even before Revolution's inception as an actual games development company. From the start our aim was to consider the contemporary adventures of the day and then bring something new to the genre. From this came the Virtual Theatre engine. VT allowed in-game characters to wander around the gameworld indepently of each other, living their own lives and doing their own thing. Another feature allowed the player to give direct orders to Helper characters - in this case Ratpouch - who would then go off to perform the task. The result is a quirky and entertaining adventure game that kicked off Revolution's fondness for characterisation and in-game humour. %prep %setup -q -n %{name} sed -i 's/\r//g' notes.txt README %build # Nothing to build data only %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} install -p -m 644 *.vga *.ega %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc *.txt Manual.pdf PROTECT.PDF README %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %changelog * Sat Mar 1 2008 Hans de Goede 1.1-1 - Initial FE package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lure/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 17:19:01 -0000 1.1 +++ .cvsignore 12 Mar 2008 19:17:08 -0000 1.2 @@ -0,0 +1,2 @@ +lure-1.1.zip +lure.dat Index: sources =================================================================== RCS file: /cvs/extras/rpms/lure/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 17:19:01 -0000 1.1 +++ sources 12 Mar 2008 19:17:08 -0000 1.2 @@ -0,0 +1,2 @@ +d1300cef563bb4b6b1f88a2f1cee7832 lure-1.1.zip +d92372e7eead8d6e64f40cce381ec6ea lure.dat From fedora-extras-commits at redhat.com Wed Mar 12 19:19:12 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Wed, 12 Mar 2008 19:19:12 GMT Subject: rpms/kernel/devel linux-2.6-alsa-kill-annoying-messages.patch, NONE, 1.1 kernel.spec, 1.498, 1.499 Message-ID: <200803121919.m2CJJCjX018158@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18108 Modified Files: kernel.spec Added Files: linux-2.6-alsa-kill-annoying-messages.patch Log Message: * Wed Mar 12 2008 Chuck Ebbert - Kill annoying ALSA debug messages linux-2.6-alsa-kill-annoying-messages.patch: --- NEW FILE linux-2.6-alsa-kill-annoying-messages.patch --- From: Adel Gadllah snd-hda-intel: don't print using snd_printdd on device open When CONFIG_SND_DEBUG_DETECT is set the hda-intel driver prints verbose info like this: ALSA sound/pci/hda/hda_intel.c:1259: azx_pcm_prepare: bufsize=0x4400, fragsize=0x1100, format=0x11 ALSA sound/pci/hda/hda_codec.c:682: hda_codec_setup_stream: NID=0x7, stream=0x5, channel=0, format=0x11 ALSA sound/pci/hda/hda_codec.c:682: hda_codec_setup_stream: NID=0x3, stream=0x5, channel=0, format=0x11 ALSA sound/pci/hda/hda_codec.c:682: hda_codec_setup_stream: NID=0x3, stream=0x0, channel=0, format=0x0 ALSA sound/pci/hda/hda_codec.c:682: hda_codec_setup_stream: NID=0x7, stream=0x0, channel=0, format=0x0 ALSA sound/pci/hda/hda_codec.c:682: hda_codec_setup_stream: NID=0x3, stream=0x0, channel=0, format=0x0 Don't print anything in functions that get called when the device gets opened/prepared for output. Signed-off-by: Adel Gadllah Signed-off-by: Chuck Ebbert CC: Takashi Iwai --- Orignal patch was mangled by sender's mail software. diff -upNr linux-2.6.24.2.orign/sound/pci/hda/hda_codec.c linux-2.6.24.2/sound/pci/hda/hda_codec.c --- linux-2.6.24.2.orign/sound/pci/hda/hda_codec.c 2008-02-11 06:51:11.000000000 +0100 +++ linux-2.6.24.2/sound/pci/hda/hda_codec.c 2008-02-17 11:08:58.000000000 +0100 @@ -677,9 +677,6 @@ void snd_hda_codec_setup_stream(struct h if (!nid) return; - snd_printdd("hda_codec_setup_stream: " - "NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n", - nid, stream_tag, channel_id, format); snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID, (stream_tag << 4) | channel_id); msleep(1); diff -upNr linux-2.6.24.2.orign/sound/pci/hda/hda_intel.c linux-2.6.24.2/sound/pci/hda/hda_intel.c --- linux-2.6.24.2.orign/sound/pci/hda/hda_intel.c 2008-02-11 06:51:11.000000000 +0100 +++ linux-2.6.24.2/sound/pci/hda/hda_intel.c 2008-02-17 11:10:16.000000000 +0100 @@ -1249,9 +1249,6 @@ static int azx_pcm_prepare(struct snd_pc return -EINVAL; } - snd_printdd("azx_pcm_prepare: bufsize=0x%x, fragsize=0x%x, " - "format=0x%x\n", - azx_dev->bufsize, azx_dev->fragsize, azx_dev->format_val); azx_setup_periods(azx_dev); azx_setup_controller(chip, azx_dev); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.498 retrieving revision 1.499 diff -u -r1.498 -r1.499 --- kernel.spec 12 Mar 2008 05:09:07 -0000 1.498 +++ kernel.spec 12 Mar 2008 19:18:33 -0000 1.499 @@ -598,6 +598,7 @@ Patch370: linux-2.6-crash-driver.patch Patch400: linux-2.6-scsi-cpqarray-set-master.patch Patch402: linux-2.6-scsi-mpt-vmware-fix.patch +Patch410: linux-2.6-alsa-kill-annoying-messages.patch Patch420: linux-2.6-squashfs.patch Patch430: linux-2.6-net-silence-noisy-printks.patch Patch450: linux-2.6-input-kill-stupid-messages.patch @@ -1078,6 +1079,7 @@ # ALSA # +ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch # Filesystem patches. # Squashfs @@ -1752,6 +1754,9 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Wed Mar 12 2008 Chuck Ebbert +- Kill annoying ALSA debug messages + * Wed Mar 12 2008 Dave Airlie - drm: fix oops on i915 driver when X crashes From fedora-extras-commits at redhat.com Wed Mar 12 19:23:28 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 12 Mar 2008 19:23:28 GMT Subject: rpms/Macaulay2/devel Macaulay2.spec,1.39,1.40 Message-ID: <200803121923.m2CJNSHD018287@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/Macaulay2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18234 Modified Files: Macaulay2.spec Log Message: update BR's, --disable-building Index: Macaulay2.spec =================================================================== RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- Macaulay2.spec 12 Mar 2008 18:23:58 -0000 1.39 +++ Macaulay2.spec 12 Mar 2008 19:22:51 -0000 1.40 @@ -41,8 +41,8 @@ BuildRequires: gdbm-devel BuildRequires: info BuildRequires: ntl-devel >= 5.4.1 -BuildRequires: factory-devel -BuildRequires: libfac-devel +BuildRequires: factory-devel >= 3.0.3 +BuildRequires: libfac-devel >= 3.0.1 BuildRequires: blas lapack %if 0%{?fedora} > 3 || 0%{?rhel} > 4 BuildRequires: blas-devel lapack-devel @@ -98,9 +98,8 @@ --disable-encap \ --disable-dumpdata \ --disable-static \ - --disable-strip - -# --with-lapacklibs="-llapack" + --disable-strip \ + --disable-building # Not smp-safe make From fedora-extras-commits at redhat.com Wed Mar 12 19:25:55 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 12 Mar 2008 19:25:55 GMT Subject: rpms/R/F-7 R.spec,1.38,1.39 Message-ID: <200803121925.m2CJPtaR018372@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18334/F-7 Modified Files: R.spec Log Message: work around koji drain bamage Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/F-7/R.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- R.spec 8 Feb 2008 19:27:40 -0000 1.38 +++ R.spec 12 Mar 2008 19:25:19 -0000 1.39 @@ -1,6 +1,6 @@ Name: R Version: 2.6.2 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -268,6 +268,9 @@ /sbin/ldconfig %changelog +* Wed Mar 12 2008 Tom "spot" Callaway 2.6.2-1.1 +- Work around koji drain bamage. + * Fri Feb 8 2008 Tom "spot" Callaway 2.6.2-1 - properly version the items in the VR bundle - 2.6.2 From fedora-extras-commits at redhat.com Wed Mar 12 19:26:07 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 12 Mar 2008 19:26:07 GMT Subject: rpms/R/F-8 R.spec,1.37,1.38 Message-ID: <200803121926.m2CJQ7MK018378@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/R/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18334/F-8 Modified Files: R.spec Log Message: work around koji drain bamage Index: R.spec =================================================================== RCS file: /cvs/pkgs/rpms/R/F-8/R.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- R.spec 8 Feb 2008 19:27:45 -0000 1.37 +++ R.spec 12 Mar 2008 19:25:25 -0000 1.38 @@ -1,6 +1,6 @@ Name: R Version: 2.6.2 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -268,6 +268,9 @@ /sbin/ldconfig %changelog +* Wed Mar 12 2008 Tom "spot" Callaway 2.6.2-1.1 +- Work around koji drain bamage. + * Fri Feb 8 2008 Tom "spot" Callaway 2.6.2-1 - properly version the items in the VR bundle - 2.6.2 From fedora-extras-commits at redhat.com Wed Mar 12 19:27:17 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 19:27:17 GMT Subject: rpms/gnome-vfsmm26/devel gnome-vfsmm.spec,1.17,1.18 Message-ID: <200803121927.m2CJRHU6018502@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/gnome-vfsmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18426 Modified Files: gnome-vfsmm.spec Log Message: Was missing doxygen BR Index: gnome-vfsmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnome-vfsmm.spec 12 Mar 2008 18:07:10 -0000 1.17 +++ gnome-vfsmm.spec 12 Mar 2008 19:26:41 -0000 1.18 @@ -14,11 +14,14 @@ Requires(postun): /sbin/ldconfig BuildRequires: glibmm24-devel >= 2.4.0 BuildRequires: gnome-vfs2-devel >= 2.8.1 +BuildRequires: doxygen + %description This package is part of the gnomemm project and provides a C++ interface for gnome-vfs. + %package devel Summary: Headers for developing programs that will use %{name} Group: Development/Libraries @@ -26,6 +29,7 @@ Requires: glibmm24-devel Requires: gnome-vfs2-devel + %description devel This package contains the static libraries and header files needed for developing applications with %{name}. From fedora-extras-commits at redhat.com Wed Mar 12 19:28:41 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 12 Mar 2008 19:28:41 GMT Subject: rpms/scummvm/F-8 scummvm-0.11.0-nostrip.patch, NONE, 1.1 scummvm-0.11.1-lure-sound-bug-fixes.patch, NONE, 1.1 scummvm-0.11.1-lure-sound-channel-alloc.patch, NONE, 1.1 scummvm-0.11.1-lure-volume-fixes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 scummvm.spec, 1.6, 1.7 sources, 1.3, 1.4 scummvm-0.9.0-nostrip.patch, 1.1, NONE Message-ID: <200803121928.m2CJSfFV018603@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18527 Modified Files: .cvsignore scummvm.spec sources Added Files: scummvm-0.11.0-nostrip.patch scummvm-0.11.1-lure-sound-bug-fixes.patch scummvm-0.11.1-lure-sound-channel-alloc.patch scummvm-0.11.1-lure-volume-fixes.patch Removed Files: scummvm-0.9.0-nostrip.patch Log Message: * Sat Mar 8 2008 Hans de Goede 0.11.1-2 - Various bugfixes to lure sound support - Enable libfluidsynth support scummvm-0.11.0-nostrip.patch: --- NEW FILE scummvm-0.11.0-nostrip.patch --- diff -up scummvm-0.11.0/ports.mk~ scummvm-0.11.0/ports.mk --- scummvm-0.11.0/ports.mk~ 2008-01-17 10:08:37.000000000 +0100 +++ scummvm-0.11.0/ports.mk 2008-01-17 10:08:37.000000000 +0100 @@ -7,7 +7,7 @@ # install: all $(INSTALL) -d "$(DESTDIR)$(BINDIR)" - $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" + $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/" $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/" scummvm-0.11.1-lure-sound-bug-fixes.patch: --- NEW FILE scummvm-0.11.1-lure-sound-bug-fixes.patch --- diff -up scummvm-0.11.1/engines/lure/sound.cpp.fix scummvm-0.11.1/engines/lure/sound.cpp --- scummvm-0.11.1/engines/lure/sound.cpp.fix 2008-03-08 09:47:40.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.cpp 2008-03-08 09:47:50.000000000 +0100 @@ -52,7 +52,7 @@ SoundManager::SoundManager() { _isRoland = midiDriver != MD_ADLIB; _nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")); - Common::set_to(_channelsInUse, _channelsInUse+NUM_CHANNELS_OUTER, false); + Common::set_to(_channelsInUse, _channelsInUse+NUM_CHANNELS, false); _driver = MidiDriver::createMidi(midiDriver); int statusCode = _driver->open(); @@ -64,7 +64,7 @@ SoundManager::SoundManager() { if (_nativeMT32) _driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); - for (index = 0; index < NUM_CHANNELS_INNER; ++index) { + for (index = 0; index < NUM_CHANNELS; ++index) { _channelsInner[index].midiChannel = _driver->allocateChannel(); _channelsInner[index].isMusic = false; _channelsInner[index].volume = game.sfxVolume(); @@ -174,7 +174,7 @@ void SoundManager::killSounds() { // Clear the active sounds _activeSounds.clear(); - Common::set_to(_channelsInUse, _channelsInUse+NUM_CHANNELS_OUTER, false); + Common::set_to(_channelsInUse, _channelsInUse+NUM_CHANNELS, false); } void SoundManager::addSound(uint8 soundIndex, bool tidyFlag) { @@ -189,28 +189,16 @@ void SoundManager::addSound(uint8 soundI return; SoundDescResource &rec = soundDescs()[soundIndex]; - int numChannels = 2; //(rec.numChannels >> 2) & 3; + int numChannels = 4; //(rec.numChannels >> 2) & 3; - int channelCtr = 0; - while (channelCtr <= (NUM_CHANNELS_OUTER - numChannels)) { + int channelCtr; + for (channelCtr = 0; channelCtr < NUM_CHANNELS; channelCtr += 4) { if (!_channelsInUse[channelCtr]) { - bool foundSpace = true; - - int channelCtr2 = 1; - while (channelCtr2 < numChannels) { - foundSpace = !_channelsInUse[channelCtr + channelCtr2]; - if (!foundSpace) break; - ++channelCtr2; - } - - if (foundSpace) - break; + break; } - - ++channelCtr; } - if (channelCtr > NUM_CHANNELS_OUTER - numChannels) { + if (channelCtr >= NUM_CHANNELS) { // No channels free debugC(ERROR_BASIC, kLureDebugSounds, "SoundManager::addSound - no channels free"); return; @@ -226,21 +214,20 @@ void SoundManager::addSound(uint8 soundI newEntry->flags = rec.flags; newEntry->volume = rec.volume; _activeSounds.push_back(newEntry); - - // Map each two channels to four of the 16 available channels - byte innerChannel = (channelCtr / 2) * 4; - musicInterface_Play(rec.soundNumber, innerChannel); - setVolume(rec.soundNumber, rec.volume); + + musicInterface_Play(rec.soundNumber, channelCtr); + musicInterface_SetVolume(channelCtr, rec.volume); } void SoundManager::addSound2(uint8 soundIndex) { debugC(ERROR_BASIC, kLureDebugSounds, "SoundManager::addSound2 index=%d", soundIndex); tidySounds(); - if (soundIndex == 6) + if (soundIndex == 6) { // Chinese torture - addSound(6); - else { + stopSound(6); // sometimes its still playing when restarted + addSound(6, false); + } else { SoundDescResource &descEntry = soundDescs()[soundIndex]; SoundDescResource *rec = findSound(descEntry.soundNumber); if (rec == NULL) @@ -274,7 +261,7 @@ void SoundManager::setVolume(uint8 sound void SoundManager::setVolume(uint8 volume) { debugC(ERROR_BASIC, kLureDebugSounds, "SoundManager::setVolume volume=%d", volume); - for (int index = 0; index < NUM_CHANNELS_INNER; ++index) { + for (int index = 0; index < NUM_CHANNELS; ++index) { _channelsInner[index].midiChannel->volume(volume); _channelsInner[index].volume = volume; } @@ -316,7 +303,7 @@ void SoundManager::tidySounds() { while (i != _activeSounds.end()) { SoundDescResource *rec = *i; - if (musicInterface_CheckPlaying(rec->soundNumber & 0x7f)) + if (musicInterface_CheckPlaying(rec->soundNumber)) // Still playing, so move to next entry ++i; else { @@ -355,7 +342,7 @@ void SoundManager::restoreSounds() { Common::set_to(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, true); musicInterface_Play(rec->soundNumber, rec->channel); - musicInterface_SetVolume(rec->soundNumber, rec->volume); + musicInterface_SetVolume(rec->channel, rec->volume); } ++i; @@ -423,7 +410,7 @@ void SoundManager::musicInterface_Play(u uint8 *soundStart = _soundData->data() + dataOfs; uint32 dataSize; - if (soundNumber == _soundsTotal - 1) + if (soundNum == _soundsTotal - 1) dataSize = _soundData->size() - dataOfs; else { uint32 nextDataOfs = READ_LE_UINT32(_soundData->data() + (soundNum + 1) * 4 + 2); @@ -431,7 +418,7 @@ void SoundManager::musicInterface_Play(u } g_system->lockMutex(_soundMutex); - MidiMusic *sound = new MidiMusic(_driver, _channelsInner, channelNumber, soundNumber, + MidiMusic *sound = new MidiMusic(_driver, _channelsInner, channelNumber, soundNum, isMusic, soundStart, dataSize); sound->setVolume(volume); _playingSounds.push_back(sound); @@ -574,7 +561,7 @@ void SoundManager::doTimer() { /*------------------------------------------------------------------------*/ -MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS_INNER], +MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], uint8 channelNum, uint8 soundNum, bool isMusic, void *soundData, uint32 size) { Game &game = Game::getReference(); _driver = driver; @@ -684,7 +671,7 @@ void MidiMusic::send(uint32 b) { byte channel = _channelNumber + ((byte)(b & 0x0F) % _numChannels); #endif - if ((channel >= NUM_CHANNELS_INNER) || (_channels[channel].midiChannel == NULL)) + if ((channel >= NUM_CHANNELS) || (_channels[channel].midiChannel == NULL)) return; if ((b & 0xFFF0) == 0x07B0) { diff -up scummvm-0.11.1/engines/lure/sound.h.fix scummvm-0.11.1/engines/lure/sound.h --- scummvm-0.11.1/engines/lure/sound.h.fix 2008-03-08 09:47:40.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.h 2008-03-08 09:47:50.000000000 +0100 @@ -35,8 +35,7 @@ class MidiParser; namespace Lure { -#define NUM_CHANNELS_OUTER 8 -#define NUM_CHANNELS_INNER 16 +#define NUM_CHANNELS 16 struct ChannelEntry { MidiChannel *midiChannel; @@ -66,7 +65,7 @@ private: bool _passThrough; public: - MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS_INNER], + MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], uint8 channelNum, uint8 soundNum, bool isMusic, void *soundData, uint32 size); ~MidiMusic(); void setVolume(int volume); @@ -112,8 +111,8 @@ private: MidiDriver *_driver; ManagedList _activeSounds; ManagedList _playingSounds; - ChannelEntry _channelsInner[NUM_CHANNELS_INNER]; - bool _channelsInUse[NUM_CHANNELS_OUTER]; + ChannelEntry _channelsInner[NUM_CHANNELS]; + bool _channelsInUse[NUM_CHANNELS]; bool _isPlaying; bool _nativeMT32; bool _isRoland; scummvm-0.11.1-lure-sound-channel-alloc.patch: --- NEW FILE scummvm-0.11.1-lure-sound-channel-alloc.patch --- diff -up scummvm-0.11.1/engines/lure/sound.h.alloc scummvm-0.11.1/engines/lure/sound.h --- scummvm-0.11.1/engines/lure/sound.h.alloc 2008-03-08 21:13:28.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.h 2008-03-08 21:13:37.000000000 +0100 @@ -66,7 +66,7 @@ private: public: MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], - uint8 channelNum, uint8 soundNum, bool isMusic, void *soundData, uint32 size); + uint8 channelNum, uint8 soundNum, bool isMusic, uint8 numChannels, void *soundData, uint32 size); ~MidiMusic(); void setVolume(int volume); int getVolume() { return _volume; } @@ -152,7 +152,7 @@ public: // The following methods implement the external sound player module void musicInterface_Initialise(); - void musicInterface_Play(uint8 soundNumber, uint8 channelNumber); + void musicInterface_Play(uint8 soundNumber, uint8 channelNumber, uint8 numChannels=4); void musicInterface_Stop(uint8 soundNumber); bool musicInterface_CheckPlaying(uint8 soundNumber); void musicInterface_SetVolume(uint8 channelNum, uint8 volume); diff -up scummvm-0.11.1/engines/lure/sound.cpp.alloc scummvm-0.11.1/engines/lure/sound.cpp --- scummvm-0.11.1/engines/lure/sound.cpp.alloc 2008-03-08 21:13:28.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.cpp 2008-03-08 21:13:37.000000000 +0100 @@ -189,16 +189,24 @@ void SoundManager::addSound(uint8 soundI return; SoundDescResource &rec = soundDescs()[soundIndex]; - int numChannels = 4; //(rec.numChannels >> 2) & 3; + int numChannels; - int channelCtr; - for (channelCtr = 0; channelCtr < NUM_CHANNELS; channelCtr += 4) { - if (!_channelsInUse[channelCtr]) { + if (_isRoland) + numChannels = (rec.numChannels & 3) + 1; + else + numChannels = ((rec.numChannels >> 2) & 3) + 1; + + int channelCtr, channelCtr2; + for (channelCtr = 0; channelCtr <= (NUM_CHANNELS-numChannels); channelCtr ++) { + for (channelCtr2 = 0; channelCtr2 < numChannels; channelCtr2++) + if (_channelsInUse[channelCtr+channelCtr2]) + break; + + if (channelCtr2 == numChannels) break; - } } - if (channelCtr >= NUM_CHANNELS) { + if (channelCtr > (NUM_CHANNELS-numChannels)) { // No channels free debugC(ERROR_BASIC, kLureDebugSounds, "SoundManager::addSound - no channels free"); return; @@ -218,7 +226,7 @@ void SoundManager::addSound(uint8 soundI newEntry->volume = 240; /* 255 causes clipping with adlib */ _activeSounds.push_back(newEntry); - musicInterface_Play(rec.soundNumber, channelCtr); + musicInterface_Play(rec.soundNumber, channelCtr, numChannels); musicInterface_SetVolume(channelCtr, newEntry->volume); } @@ -335,7 +343,7 @@ void SoundManager::restoreSounds() { if ((rec->numChannels != 0) && ((rec->flags & SF_RESTORE) != 0)) { Common::set_to(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, true); - musicInterface_Play(rec->soundNumber, rec->channel); + musicInterface_Play(rec->soundNumber, rec->channel, rec->numChannels); musicInterface_SetVolume(rec->channel, rec->volume); } @@ -377,7 +385,7 @@ void SoundManager::fadeOut() { // musicInterface_Play // Play the specified sound -void SoundManager::musicInterface_Play(uint8 soundNumber, uint8 channelNumber) { +void SoundManager::musicInterface_Play(uint8 soundNumber, uint8 channelNumber, uint8 numChannels) { debugC(ERROR_INTERMEDIATE, kLureDebugSounds, "musicInterface_Play soundNumber=%d, channel=%d", soundNumber, channelNumber); Game &game = Game::getReference(); @@ -413,7 +421,7 @@ void SoundManager::musicInterface_Play(u g_system->lockMutex(_soundMutex); MidiMusic *sound = new MidiMusic(_driver, _channelsInner, channelNumber, soundNum, - isMusic, soundStart, dataSize); + isMusic, numChannels, soundStart, dataSize); _playingSounds.push_back(sound); g_system->unlockMutex(_soundMutex); } @@ -555,14 +563,14 @@ void SoundManager::doTimer() { /*------------------------------------------------------------------------*/ MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], - uint8 channelNum, uint8 soundNum, bool isMusic, void *soundData, uint32 size) { + uint8 channelNum, uint8 soundNum, bool isMusic, uint8 numChannels, void *soundData, uint32 size) { _driver = driver; _channels = channels; _soundNumber = soundNum; _channelNumber = channelNum; _isMusic = isMusic; - _numChannels = 4; + _numChannels = numChannels; _volume = 0; for (int i = 0; i < _numChannels; ++i) { /* 90 is power on default for midi compliant devices */ scummvm-0.11.1-lure-volume-fixes.patch: --- NEW FILE scummvm-0.11.1-lure-volume-fixes.patch --- diff -up scummvm-0.11.1/engines/lure/sound.cpp.volume scummvm-0.11.1/engines/lure/sound.cpp --- scummvm-0.11.1/engines/lure/sound.cpp.volume 2008-03-08 19:34:23.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.cpp 2008-03-08 21:10:03.000000000 +0100 @@ -66,8 +66,8 @@ SoundManager::SoundManager() { for (index = 0; index < NUM_CHANNELS; ++index) { _channelsInner[index].midiChannel = _driver->allocateChannel(); - _channelsInner[index].isMusic = false; - _channelsInner[index].volume = game.sfxVolume(); + /* 90 is power on default for midi compliant devices */ + _channelsInner[index].volume = 90; } } } @@ -212,11 +212,14 @@ void SoundManager::addSound(uint8 soundI newEntry->channel = channelCtr; newEntry->numChannels = numChannels; newEntry->flags = rec.flags; - newEntry->volume = rec.volume; + if (_isRoland) + newEntry->volume = rec.volume; + else /* resource volumes do not seem to work well with our adlib emu */ + newEntry->volume = 240; /* 255 causes clipping with adlib */ _activeSounds.push_back(newEntry); musicInterface_Play(rec.soundNumber, channelCtr); - musicInterface_SetVolume(channelCtr, rec.volume); + musicInterface_SetVolume(channelCtr, newEntry->volume); } void SoundManager::addSound2(uint8 soundIndex) { @@ -258,15 +261,6 @@ void SoundManager::setVolume(uint8 sound musicInterface_SetVolume(entry->channel, volume); } -void SoundManager::setVolume(uint8 volume) { - debugC(ERROR_BASIC, kLureDebugSounds, "SoundManager::setVolume volume=%d", volume); - - for (int index = 0; index < NUM_CHANNELS; ++index) { - _channelsInner[index].midiChannel->volume(volume); - _channelsInner[index].volume = volume; - } -} - uint8 SoundManager::descIndexOf(uint8 soundNumber) { SoundDescResource *rec = soundDescs(); @@ -420,7 +414,6 @@ void SoundManager::musicInterface_Play(u g_system->lockMutex(_soundMutex); MidiMusic *sound = new MidiMusic(_driver, _channelsInner, channelNumber, soundNum, isMusic, soundStart, dataSize); - sound->setVolume(volume); _playingSounds.push_back(sound); g_system->unlockMutex(_soundMutex); } @@ -563,19 +556,19 @@ void SoundManager::doTimer() { MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], uint8 channelNum, uint8 soundNum, bool isMusic, void *soundData, uint32 size) { - Game &game = Game::getReference(); _driver = driver; _channels = channels; _soundNumber = soundNum; _channelNumber = channelNum; + _isMusic = isMusic; _numChannels = 4; _volume = 0; for (int i = 0; i < _numChannels; ++i) { - _channels[_channelNumber + i].isMusic = isMusic; - _channels[_channelNumber + i].volume = isMusic ? game.musicVolume() : game.sfxVolume(); + /* 90 is power on default for midi compliant devices */ + _channels[_channelNumber + i].volume = 90; } - setVolume(0xff); + setVolume(240); /* 255 causes clipping with mastervol 192 and adlib */ _passThrough = false; @@ -633,10 +626,14 @@ void MidiMusic::setVolume(int volume) { _volume = volume; + Game &game = Game::getReference(); + volume *= _isMusic ? game.musicVolume() : game.sfxVolume(); + for (int i = 0; i < _numChannels; ++i) { if (_channels[_channelNumber + i].midiChannel != NULL) _channels[_channelNumber + i].midiChannel->volume( - _channels[_channelNumber + i].volume * _volume / 255); + _channels[_channelNumber + i].volume * + volume / 65025); } } @@ -675,10 +672,12 @@ void MidiMusic::send(uint32 b) { return; if ((b & 0xFFF0) == 0x07B0) { - // Adjust volume changes by master volume + // Adjust volume changes by song and master volume byte volume = (byte)((b >> 16) & 0x7F); _channels[channel].volume = volume; - volume = volume * _volume / 255; + Game &game = Game::getReference(); + int master_volume = _isMusic ? game.musicVolume() : game.sfxVolume(); + volume = volume * _volume * master_volume / 65025; b = (b & 0xFF00FFFF) | (volume << 16); } else if ((b & 0xF0) == 0xC0) { if (Sound.isRoland() && !Sound.hasNativeMT32()) { diff -up scummvm-0.11.1/engines/lure/sound.h.volume scummvm-0.11.1/engines/lure/sound.h --- scummvm-0.11.1/engines/lure/sound.h.volume 2008-03-08 19:34:28.000000000 +0100 +++ scummvm-0.11.1/engines/lure/sound.h 2008-03-08 20:37:45.000000000 +0100 @@ -39,7 +39,6 @@ namespace Lure { struct ChannelEntry { MidiChannel *midiChannel; - bool isMusic; uint8 volume; }; @@ -55,6 +54,7 @@ private: MidiDriver *_driver; MidiParser *_parser; ChannelEntry *_channels; + bool _isMusic; bool _isPlaying; void queueUpdatePos(); @@ -138,7 +138,6 @@ public: void stopSound(uint8 soundIndex); void killSound(uint8 soundNumber); void setVolume(uint8 soundNumber, uint8 volume); - void setVolume(uint8 volume); void tidySounds(); uint8 descIndexOf(uint8 soundNumber); SoundDescResource *findSound(uint8 soundNumber); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scummvm/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Jun 2007 08:54:10 -0000 1.3 +++ .cvsignore 12 Mar 2008 19:28:06 -0000 1.4 @@ -1,2 +1,2 @@ -scummvm-0.10.0.tar.bz2 +scummvm-0.11.1.tar.bz2 scummvm-icons.tar.gz Index: scummvm.spec =================================================================== RCS file: /cvs/extras/rpms/scummvm/F-8/scummvm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scummvm.spec 15 Aug 2007 09:43:16 -0000 1.6 +++ scummvm.spec 12 Mar 2008 19:28:06 -0000 1.7 @@ -1,5 +1,5 @@ Name: scummvm -Version: 0.10.0 +Version: 0.11.1 Release: 2%{?dist} Summary: Interpreter for several adventure games Group: Applications/Emulators @@ -8,11 +8,14 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 ####### Icons extracted from icons/scummvm.ico with the gimp Source1: scummvm-icons.tar.gz -Patch0: scummvm-0.9.0-nostrip.patch +Patch0: scummvm-0.11.0-nostrip.patch Patch1: scummvm-0.9.1-no-execstack.patch +Patch2: scummvm-0.11.1-lure-sound-bug-fixes.patch +Patch3: scummvm-0.11.1-lure-volume-fixes.patch +Patch4: scummvm-0.11.1-lure-sound-channel-alloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel libvorbis-devel flac-devel zlib-devel -BuildRequires: desktop-file-utils +BuildRequires: fluidsynth-devel desktop-file-utils %ifarch %{ix86} BuildRequires: nasm %endif @@ -33,6 +36,9 @@ %setup -q -a 1 %patch0 -p1 -b .nostrip %patch1 -p1 -b .execstack +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \ dists/%{name}.desktop @@ -45,7 +51,7 @@ # The disables are so that these don't accidently get build in when rebuilding # on a system with the necesarry deps installed ./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \ - --datadir=%{_datadir} --disable-mpeg2 --disable-mad --disable-fluidsynth + --datadir=%{_datadir} --disable-mpeg2 --disable-mad make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" @@ -104,6 +110,23 @@ %changelog +* Sat Mar 8 2008 Hans de Goede 0.11.1-2 +- Various bugfixes to lure sound support +- Enable libfluidsynth support + +* Sat Mar 1 2008 Hans de Goede 0.11.1-1 +- New upstream version 0.11.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 0.11.0-2 +- Autorebuild for GCC 4.3 + +* Wed Jan 16 2008 Hans de Goede 0.11.0-1 +- New upstream version 0.11.0 +- Drop no longer needed gcc 4.3 patch + +* Sat Jan 12 2008 Hans de Goede 0.10.0-3 +- Fix compilation with gcc 4.3 + * Wed Aug 15 2007 Hans de Goede 0.10.0-2 - Update License tag for new Licensing Guidelines compliance Index: sources =================================================================== RCS file: /cvs/extras/rpms/scummvm/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Jun 2007 08:54:10 -0000 1.3 +++ sources 12 Mar 2008 19:28:06 -0000 1.4 @@ -1,2 +1,2 @@ -398bbd5616a54aae8dbe7d9e6c55f064 scummvm-0.10.0.tar.bz2 +8dc9eb9d18574a7ecfa6586892e0de4e scummvm-0.11.1.tar.bz2 b20d750de2c88e8aefea364afae1776c scummvm-icons.tar.gz --- scummvm-0.9.0-nostrip.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 19:34:35 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 12 Mar 2008 19:34:35 GMT Subject: rpms/lm_sensors/F-8 lm_sensors-2.10.6-lsb-retcodes.patch, NONE, 1.1 lm_sensors-2.10.6-service-default-off.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 lm_sensors.spec, 1.55, 1.56 sources, 1.19, 1.20 lm_sensors-2.10.4-service-default-off.patch, 1.2, NONE Message-ID: <200803121934.m2CJYZ0s018860@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lm_sensors/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18820 Modified Files: .cvsignore lm_sensors.spec sources Added Files: lm_sensors-2.10.6-lsb-retcodes.patch lm_sensors-2.10.6-service-default-off.patch Removed Files: lm_sensors-2.10.4-service-default-off.patch Log Message: * Wed Mar 12 2008 Hans de Goede - 2.10.6-1 - New upstream bugfix release 2.10.6 (fixes bz 436767) - Add a patch to make the initscript returncodes LSB compliant (bug 431884) lm_sensors-2.10.6-lsb-retcodes.patch: --- NEW FILE lm_sensors-2.10.6-lsb-retcodes.patch --- --- lm_sensors-3.0.1/prog/init/lm_sensors.init 2008-02-26 14:37:51.000000000 +0100 +++ lm_sensors-3.0.1.new/prog/init/lm_sensors.init 2008-02-26 14:25:13.000000000 +0100 @@ -28,31 +28,6 @@ # in order as normal shell variables with the special names: # MODULE_1, MODULE_2, MODULE_3, etc. -if grep -q sysfs /proc/mounts; then - WITHSYS=1 -else - WITHSYS=0 -fi - -if [ $WITHSYS == "0" ]; then - # If sensors isn't supported by the kernel, try loading the module... - [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc >/dev/null 2>&1 - - # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have - # support for sensors. - [ -e /proc/sys/dev/sensors ] || exit 0 - - # If sensors was not already running, unload the module... - [ -e /var/lock/subsys/lm_sensors ] || /sbin/modprobe -r i2c-proc >/dev/null 2>&1 -fi - -CONFIG=/etc/sysconfig/lm_sensors -[ -r "$CONFIG" ] || exit 0 -grep '^MODULE_' $CONFIG >/dev/null 2>&1 || exit 0 - -# Load config file -. "$CONFIG" - PSENSORS=/usr/local/bin/sensors if [ ! -x $PSENSORS ]; then @@ -65,7 +40,47 @@ RETVAL=0 prog="lm_sensors" +# This functions checks if sensor support is compiled into the kernel, if +# sensors are configured, and loads the config file +check_sensors() { + if grep -q sysfs /proc/mounts; then + WITHSYS=1 + else + WITHSYS=0 + fi + + if [ $WITHSYS == "0" ]; then + # If sensors isn't supported by the kernel, try loading the module... + [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc >/dev/null 2>&1 + + # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have + # support for sensors. + if ! [ -e /proc/sys/dev/sensors ]; then + echo -n "$1 $prog: kernel does not have sensors support" + echo_failure + echo + exit 5 + fi + + # If sensors was not already running, unload the module... + [ -e /var/lock/subsys/lm_sensors ] || /sbin/modprobe -r i2c-proc >/dev/null 2>&1 + fi + + CONFIG=/etc/sysconfig/lm_sensors + if ! [ -r "$CONFIG" ] || ! grep '^MODULE_' $CONFIG >/dev/null 2>&1; then + echo -n "$1 $prog: not configured, run sensors-detect" + echo_warning + echo + exit 6 + fi + + # Load config file + . "$CONFIG" +} + start() { + check_sensors "Starting" + echo -n "Starting $prog: loading module " modules=`grep \^MODULE_ $CONFIG | wc -l | tr -d ' '` @@ -89,6 +104,8 @@ } stop() { + check_sensors "Stopping" + echo -n "Stopping $prog: " modules=`grep \^MODULE_ $CONFIG | wc -l | tr -d ' '` @@ -116,12 +133,14 @@ dostatus() { $PSENSORS RETVAL=$? + if [ $RETVAL -ne 0 ]; then + RETVAL=3 + fi } restart() { stop start - RETVAL=$? } condrestart() { @@ -147,7 +166,7 @@ ;; *) echo "Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 1 + exit 3 esac exit $RETVAL lm_sensors-2.10.6-service-default-off.patch: --- NEW FILE lm_sensors-2.10.6-service-default-off.patch --- --- lm_sensors-3.0.1/prog/init/lm_sensors.init.default-off 2007-04-27 14:34:17.000000000 +0200 +++ lm_sensors-3.0.1/prog/init/lm_sensors.init 2008-02-26 14:55:58.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh # -# chkconfig: 2345 26 74 +# chkconfig: - 26 74 # description: sensors is used for monitoring motherboard sensor values. # config: /etc/sysconfig/lm_sensors # --- lm_sensors-3.0.1/prog/detect/sensors-detect.default-off 2008-01-22 13:22:47.000000000 +0100 +++ lm_sensors-3.0.1/prog/detect/sensors-detect 2008-02-26 15:00:07.000000000 +0100 @@ -5673,6 +5673,11 @@ sub main exit -1; } + if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" && + -f "/var/lock/subsys/lm_sensors") { + system("/sbin/service", "lm_sensors", "stop"); + } + initialize_kernel_version(); initialize_conf; initialize_proc_pci; @@ -5943,6 +5948,11 @@ EOT if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") { system("/sbin/insserv", "/etc/init.d/lm_sensors"); + } elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") { + system("/sbin/chkconfig", "lm_sensors", "on"); + if (-x "/sbin/service") { + system("/sbin/service", "lm_sensors", "start"); + } } else { print "You should now start the lm_sensors service to load the required\n". "kernel modules.\n\n"; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/F-8/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 15 Nov 2007 13:27:44 -0000 1.19 +++ .cvsignore 12 Mar 2008 19:33:52 -0000 1.20 @@ -1 +1 @@ -lm_sensors-2.10.5.tar.gz +lm_sensors-2.10.6.tar.gz Index: lm_sensors.spec =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/F-8/lm_sensors.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- lm_sensors.spec 15 Nov 2007 13:27:44 -0000 1.55 +++ lm_sensors.spec 12 Mar 2008 19:33:52 -0000 1.56 @@ -1,5 +1,5 @@ Name: lm_sensors -Version: 2.10.5 +Version: 2.10.6 Release: 1%{?dist} URL: http://www.lm-sensors.org/ Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.gz @@ -7,8 +7,8 @@ # these 2 were taken from PLD-linux, Thanks! Source2: sensord.sysconfig Source3: sensord.init -Patch0: lm_sensors-2.10.4-service-default-off.patch -Patch1: lm_sensors-2.10.5-fschrc.patch +Patch0: lm_sensors-2.10.6-service-default-off.patch +Patch1: lm_sensors-2.10.6-lsb-retcodes.patch Summary: Hardware monitoring tools Group: Applications/System License: GPLv2+ @@ -164,6 +164,10 @@ %changelog +* Wed Mar 12 2008 Hans de Goede - 2.10.6-1 +- New upstream bugfix release 2.10.6 (fixes bz 436767) +- Add a patch to make the initscript returncodes LSB compliant (bug 431884) + * Thu Nov 15 2007 Hans de Goede - 2.10.5-1 - New upstream bugfix release 2.10.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/F-8/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 15 Nov 2007 13:27:44 -0000 1.19 +++ sources 12 Mar 2008 19:33:52 -0000 1.20 @@ -1 +1 @@ -77f96bc8a7773e95b2990d756e4925d6 lm_sensors-2.10.5.tar.gz +b75189e15b9fea569cda493923b161bb lm_sensors-2.10.6.tar.gz --- lm_sensors-2.10.4-service-default-off.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 19:47:55 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Wed, 12 Mar 2008 19:47:55 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.17, 1.1440.2.18 openoffice.org-3.0.0.ooo86588.sw.buildfix.patch, 1.1.2.1, NONE Message-ID: <200803121947.m2CJlt1h019147@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19116 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org.spec Removed Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-3.0.0.ooo86588.sw.buildfix.patch Log Message: drop integrated openoffice.org-3.0.0.ooo86588.sw.buildfix.patch Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440.2.17 retrieving revision 1.1440.2.18 diff -u -r1.1440.2.17 -r1.1440.2.18 --- openoffice.org.spec 12 Mar 2008 17:29:14 -0000 1.1440.2.17 +++ openoffice.org.spec 12 Mar 2008 19:47:05 -0000 1.1440.2.18 @@ -136,10 +136,9 @@ Patch63: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch Patch64: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch Patch65: workspace.cmcfixes43.patch -Patch66: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch -Patch67: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch -Patch68: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch -Patch69: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch +Patch66: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch +Patch67: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch +Patch68: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch %define instdir %{_libdir}/openoffice.org %define OFFICEUPD 300 @@ -1093,10 +1092,9 @@ %patch63 -p1 -b .ooo86080.unopkg.bodge.patch %patch64 -p1 -b .oooXXXXX.psprint.debugcups.patch %patch65 -p1 -b .workspace.cmcfixes43.patch -%patch66 -p1 -b .ooo86588.sw.buildfix.patch -%patch67 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch -%patch68 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch -%patch69 -p1 -b .ooo86924.sfx2.iconchanges.patch +%patch66 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch +%patch67 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch +%patch68 -p1 -b .ooo86924.sfx2.iconchanges.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2883,7 +2881,6 @@ - drop subsumed openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch - drop integrated workspace.unifysound01.patch - add workspace.cmcfixes43.patch -- add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch * Tue Mar 11 2008 Caolan McNamara - 1:2.4.0-10.2 - Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch --- openoffice.org-3.0.0.ooo86588.sw.buildfix.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 19:51:06 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 12 Mar 2008 19:51:06 GMT Subject: rpms/Macaulay2/devel Macaulay2.spec,1.40,1.41 Message-ID: <200803121951.m2CJp69a019235@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/Macaulay2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19213 Modified Files: Macaulay2.spec Log Message: BR: bison flex gcc-gfortran Index: Macaulay2.spec =================================================================== RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- Macaulay2.spec 12 Mar 2008 19:22:51 -0000 1.40 +++ Macaulay2.spec 12 Mar 2008 19:50:31 -0000 1.41 @@ -32,21 +32,20 @@ Patch201739: Macaulay2-0.9.95-bz201739.patch -BuildRequires: byacc +BuildRequires: bison BuildRequires: desktop-file-utils # etags BuildRequires: emacs-common +BuildRequires: flex BuildRequires: gawk BuildRequires: gc-devel +BuildRequires: gcc-gfortran BuildRequires: gdbm-devel BuildRequires: info BuildRequires: ntl-devel >= 5.4.1 BuildRequires: factory-devel >= 3.0.3 BuildRequires: libfac-devel >= 3.0.1 -BuildRequires: blas lapack -%if 0%{?fedora} > 3 || 0%{?rhel} > 4 BuildRequires: blas-devel lapack-devel -%endif BuildRequires: mpfr-devel BuildRequires: readline-devel ncurses-devel BuildRequires: time From fedora-extras-commits at redhat.com Wed Mar 12 19:52:49 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 12 Mar 2008 19:52:49 GMT Subject: rpms/sound-juicer/devel sound-juicer.spec,1.94,1.95 Message-ID: <200803121952.m2CJqnEd019319@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/sound-juicer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19264 Modified Files: sound-juicer.spec Log Message: * Wed Mar 12 2008 - Bastien Nocera - 2.22.0-2 - Remove the ExcludeArch Index: sound-juicer.spec =================================================================== RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- sound-juicer.spec 11 Mar 2008 04:29:08 -0000 1.94 +++ sound-juicer.spec 12 Mar 2008 19:52:11 -0000 1.95 @@ -13,7 +13,7 @@ Name: sound-juicer Summary: Clean and lean CD ripper Version: 2.22.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia Source: http://download.gnome.org/sources/sound-juicer/2.22/%{name}-%{version}.tar.bz2 @@ -46,8 +46,7 @@ BuildRequires: gettext BuildRequires: perl(XML::Parser) -# ppc and ppc64 added for https://bugzilla.redhat.com/show_bug.cgi?id=435771 -ExcludeArch: s390 s390x ppc ppc64 +ExcludeArch: s390 s390x %description GStreamer-based CD ripping tool. Saves audio CDs to Ogg/vorbis. @@ -122,6 +121,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 12 2008 - Bastien Nocera - 2.22.0-2 +- Remove the ExcludeArch + * Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 - Update to 2.22.0 From fedora-extras-commits at redhat.com Wed Mar 12 20:01:32 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 12 Mar 2008 20:01:32 GMT Subject: rpms/rhythmbox/devel rhythmbox.spec,1.173,1.174 Message-ID: <200803122001.m2CK1W13025685@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/rhythmbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19635 Modified Files: rhythmbox.spec Log Message: * Wed Mar 12 2008 - Bastien Nocera - 0.11.4-12 - Remove ExcludeArch for ppc/ppc64 Index: rhythmbox.spec =================================================================== RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- rhythmbox.spec 4 Mar 2008 17:18:31 -0000 1.173 +++ rhythmbox.spec 12 Mar 2008 20:00:40 -0000 1.174 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.11.4 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Multimedia URL: http://www.gnome.org/projects/rhythmbox/ @@ -49,8 +49,7 @@ # For the libsoup 2.4 patch BuildRequires: intltool autoconf automake17 libtool gettext check-devel -# Added ppc and ppc64 for https://bugzilla.redhat.com/show_bug.cgi?id=435771 -ExcludeArch: s390 s390x ppc ppc64 +ExcludeArch: s390 s390x # https://bugzilla.redhat.com/show_bug.cgi?id=428034 Patch0: rb-disable-power-plugin-by-default.patch @@ -223,6 +222,9 @@ %{_libdir}/rhythmbox/plugins/upnp_coherence %changelog +* Wed Mar 12 2008 - Bastien Nocera - 0.11.4-12 +- Remove ExcludeArch for ppc/ppc64 + * Tue Mar 04 2008 - Bastien Nocera - 0.11.4-11 - Add patch to save the album artwork onto the iPod (#435952) From fedora-extras-commits at redhat.com Wed Mar 12 20:06:10 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 20:06:10 GMT Subject: rpms/libgnomeuimm26/devel .cvsignore, 1.10, 1.11 libgnomeuimm.spec, 1.18, 1.19 sources, 1.11, 1.12 Message-ID: <200803122006.m2CK6Avf025924@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomeuimm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25841 Modified Files: .cvsignore libgnomeuimm.spec sources Log Message: Update to 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 11 Feb 2008 10:40:41 -0000 1.10 +++ .cvsignore 12 Mar 2008 20:04:51 -0000 1.11 @@ -1 +1 @@ -libgnomeuimm-2.20.2.tar.bz2 +libgnomeuimm-2.22.0.tar.bz2 Index: libgnomeuimm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libgnomeuimm.spec 11 Feb 2008 10:40:41 -0000 1.18 +++ libgnomeuimm.spec 12 Mar 2008 20:04:51 -0000 1.19 @@ -1,5 +1,5 @@ Name: libgnomeuimm26 -Version: 2.20.2 +Version: 2.22.0 Release: 1%{?dist} Summary: C++ interface for Gnome libs (a GUI library for X) @@ -82,6 +82,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Mar 12 2008 Denis Leroy - 2.22.0-1 +- Update to 2.22.0 + * Mon Feb 11 2008 Denis Leroy - 2.20.2-1 - Update to 2.20.2, more gcc 4.3 fixes Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 11 Feb 2008 10:40:41 -0000 1.11 +++ sources 12 Mar 2008 20:04:51 -0000 1.12 @@ -1 +1 @@ -e32381ac847deb6d6215caae8130d04f libgnomeuimm-2.20.2.tar.bz2 +74b22fd00133e683ffa23b060d1862e7 libgnomeuimm-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 20:06:19 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 20:06:19 GMT Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec, 1.10, 1.11 xulrunner19.patch, 1.1, 1.2 Message-ID: <200803122006.m2CK6JZH025963@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/gnome-web-photo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25852 Modified Files: gnome-web-photo.spec xulrunner19.patch Log Message: * Wed Mar 12 2008 Marco Pesenti Gritti - 0.3-11 - Better xulrunner-1.9 patch which also works with very long pages Index: gnome-web-photo.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gnome-web-photo.spec 7 Mar 2008 20:18:59 -0000 1.10 +++ gnome-web-photo.spec 12 Mar 2008 20:05:08 -0000 1.11 @@ -3,7 +3,7 @@ Summary: HTML pages thumbnailer Name: gnome-web-photo Version: 0.3 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ Group: Applications/Internet URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/ @@ -81,6 +81,9 @@ %{_datadir}/gnome-web-photo %changelog +* Wed Mar 12 2008 Marco Pesenti Gritti - 0.3-11 +- Better xulrunner-1.9 patch which also works with very long pages + * Fri Mar 7 2008 Marco Pesenti Gritti - 0.3-10 - Add patch to make it work with xulrunner 1.9 xulrunner19.patch: Index: xulrunner19.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/xulrunner19.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xulrunner19.patch 7 Mar 2008 17:58:06 -0000 1.1 +++ xulrunner19.patch 12 Mar 2008 20:05:08 -0000 1.2 @@ -1,74 +1,6 @@ -diff -u -r gnome-web-photo-0.3-orig/configure.ac gnome-web-photo-0.3/configure.ac ---- gnome-web-photo-0.3-orig/configure.ac 2008-03-07 18:41:35.000000000 +0100 -+++ gnome-web-photo-0.3/configure.ac 2008-03-07 18:42:24.000000000 +0100 -@@ -132,57 +132,12 @@ - - AM_GCONF_SOURCE_2 - -+# ********* -+# Xulrunner -+# ********* - --# ******* --# Mozilla --# ******* -- --GECKO_INIT([GECKO]) -- --AC_SUBST([GECKO]) --AC_SUBST([GECKO_FLAVOUR]) --AC_SUBST([GECKO_INCLUDE_ROOT]) --AC_SUBST([GECKO_HOME]) --AC_SUBST([GECKO_PREFIX]) -- --case "$GECKO" in --seamonkey) min_version=1.0 ;; --*firefox) min_version=1.4 ;; --xulrunner) min_version=1.8 ;; --esac -- --PKG_CHECK_MODULES([GECKO], [${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_extra_pkg_dependencies}]) --AC_SUBST([GECKO_CFLAGS]) --AC_SUBST([GECKO_LIBS]) -- --# In xulrunner, gkgfx is in libxul; for all others we need to --# explicitly link against it -- --if test "$GECKO" != "xulrunner"; then -- GECKO_EXTRA_LIBS="$GECKO_EXTRA_LIBS -lgkgfx" --fi -- --AC_SUBST([GECKO_EXTRA_LIBS]) -- --# Check for PSM headers -- --AC_MSG_CHECKING([for mozilla security compoment]) --GECKO_COMPILE_IFELSE([pipnss], -- [AC_LANG_PROGRAM( -- [[#include ]], -- [[nsIX509Cert *c; -- c->GetIssuer (nsnull);]] -- )], -- [AC_DEFINE([HAVE_PSM], [1],[Define if you have the mozilla NSS headers installed]) have_psm=yes], -- [have_psm=no]) --AC_MSG_RESULT([$have_psm]) -- --AM_CONDITIONAL([HAVE_PSM],[test "x$have_psm" = "xyes"]) -- --# Needed since 1.8b2 --# Define this down here so it doesn't affect the API checks above -- --AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define for access to internal mozilla API]) -+LIBXUL_INIT -+LIBXUL_DEFINES - - # ****************** - # Portability checks -Only in gnome-web-photo-0.3: configure.ac.rej -Only in gnome-web-photo-0.3/m4: libxul.m4 -diff -u -r gnome-web-photo-0.3-orig/src/Components.cpp gnome-web-photo-0.3/src/Components.cpp ---- gnome-web-photo-0.3-orig/src/Components.cpp 2008-03-07 18:41:35.000000000 +0100 -+++ gnome-web-photo-0.3/src/Components.cpp 2008-03-07 18:41:44.000000000 +0100 +diff -u -r gnome-web-photo-0.3/src/Components.cpp gnome-web-photo-0.3-new/src/Components.cpp +--- gnome-web-photo-0.3/src/Components.cpp 2006-12-31 22:48:52.000000000 +0100 ++++ gnome-web-photo-0.3-new/src/Components.cpp 2008-03-12 20:09:02.000000000 +0100 @@ -137,80 +137,15 @@ return NS_OK; } @@ -167,9 +99,9 @@ }; PRBool -diff -u -r gnome-web-photo-0.3-orig/src/Listener.h gnome-web-photo-0.3/src/Listener.h ---- gnome-web-photo-0.3-orig/src/Listener.h 2008-03-07 18:41:35.000000000 +0100 -+++ gnome-web-photo-0.3/src/Listener.h 2008-03-07 18:41:44.000000000 +0100 +diff -u -r gnome-web-photo-0.3/src/Listener.h gnome-web-photo-0.3-new/src/Listener.h +--- gnome-web-photo-0.3/src/Listener.h 2006-12-31 22:48:52.000000000 +0100 ++++ gnome-web-photo-0.3-new/src/Listener.h 2008-03-12 20:09:02.000000000 +0100 @@ -23,7 +23,7 @@ #include @@ -179,9 +111,9 @@ #include class Listener : public nsIDOMLoadListener -diff -u -r gnome-web-photo-0.3-orig/src/main.cpp gnome-web-photo-0.3/src/main.cpp ---- gnome-web-photo-0.3-orig/src/main.cpp 2008-03-07 18:41:35.000000000 +0100 -+++ gnome-web-photo-0.3/src/main.cpp 2008-03-07 18:41:46.000000000 +0100 +diff -u -r gnome-web-photo-0.3/src/main.cpp gnome-web-photo-0.3-new/src/main.cpp +--- gnome-web-photo-0.3/src/main.cpp 2007-01-29 19:53:02.000000000 +0100 ++++ gnome-web-photo-0.3-new/src/main.cpp 2008-03-12 20:09:02.000000000 +0100 @@ -25,6 +25,7 @@ #include #include @@ -297,9 +229,9 @@ #else gtk_widget_show_all (window); #endif -diff -u -r gnome-web-photo-0.3-orig/src/Makefile.am gnome-web-photo-0.3/src/Makefile.am ---- gnome-web-photo-0.3-orig/src/Makefile.am 2008-03-07 18:41:35.000000000 +0100 -+++ gnome-web-photo-0.3/src/Makefile.am 2008-03-07 18:41:44.000000000 +0100 +diff -u -r gnome-web-photo-0.3/src/Makefile.am gnome-web-photo-0.3-new/src/Makefile.am +--- gnome-web-photo-0.3/src/Makefile.am 2007-01-29 19:16:18.000000000 +0100 ++++ gnome-web-photo-0.3-new/src/Makefile.am 2008-03-12 20:09:02.000000000 +0100 @@ -36,28 +36,31 @@ main.cpp @@ -337,9 +269,9 @@ install-exec-hook: gnome-web-photo cd $(DESTDIR)$(bindir) && \ -diff -u -r gnome-web-photo-0.3-orig/src/Prefs.cpp gnome-web-photo-0.3/src/Prefs.cpp ---- gnome-web-photo-0.3-orig/src/Prefs.cpp 2008-03-07 18:41:35.000000000 +0100 -+++ gnome-web-photo-0.3/src/Prefs.cpp 2008-03-07 18:41:44.000000000 +0100 +diff -u -r gnome-web-photo-0.3/src/Prefs.cpp gnome-web-photo-0.3-new/src/Prefs.cpp +--- gnome-web-photo-0.3/src/Prefs.cpp 2006-12-31 22:48:52.000000000 +0100 ++++ gnome-web-photo-0.3-new/src/Prefs.cpp 2008-03-12 20:09:02.000000000 +0100 @@ -26,9 +26,9 @@ #include #include @@ -352,9 +284,9 @@ #include #include -diff -u -r gnome-web-photo-0.3-orig/src/Printer.cpp gnome-web-photo-0.3/src/Printer.cpp ---- gnome-web-photo-0.3-orig/src/Printer.cpp 2008-03-07 18:41:35.000000000 +0100 -+++ gnome-web-photo-0.3/src/Printer.cpp 2008-03-07 18:41:44.000000000 +0100 +diff -u -r gnome-web-photo-0.3/src/Printer.cpp gnome-web-photo-0.3-new/src/Printer.cpp +--- gnome-web-photo-0.3/src/Printer.cpp 2006-12-31 22:48:52.000000000 +0100 ++++ gnome-web-photo-0.3-new/src/Printer.cpp 2008-03-12 20:09:02.000000000 +0100 @@ -27,6 +27,7 @@ #include #include @@ -384,9 +316,9 @@ aSettings->SetPaperSizeUnit (nsIPrintSettings::kPaperSizeMillimeters); aSettings->SetPaperWidth (210.0); aSettings->SetPaperHeight (297.0); -diff -u -r gnome-web-photo-0.3-orig/src/Printer.h gnome-web-photo-0.3/src/Printer.h ---- gnome-web-photo-0.3-orig/src/Printer.h 2008-03-07 18:41:35.000000000 +0100 -+++ gnome-web-photo-0.3/src/Printer.h 2008-03-07 18:41:44.000000000 +0100 +diff -u -r gnome-web-photo-0.3/src/Printer.h gnome-web-photo-0.3-new/src/Printer.h +--- gnome-web-photo-0.3/src/Printer.h 2006-12-31 22:48:52.000000000 +0100 ++++ gnome-web-photo-0.3-new/src/Printer.h 2008-03-12 20:09:02.000000000 +0100 @@ -27,7 +27,7 @@ #include #include @@ -396,9 +328,9 @@ #include class nsIPrintSettings; -diff -u -r gnome-web-photo-0.3-orig/src/Writer.cpp gnome-web-photo-0.3/src/Writer.cpp ---- gnome-web-photo-0.3-orig/src/Writer.cpp 2008-03-07 18:41:35.000000000 +0100 -+++ gnome-web-photo-0.3/src/Writer.cpp 2008-03-07 18:41:44.000000000 +0100 +diff -u -r gnome-web-photo-0.3/src/Writer.cpp gnome-web-photo-0.3-new/src/Writer.cpp +--- gnome-web-photo-0.3/src/Writer.cpp 2007-01-29 19:53:02.000000000 +0100 ++++ gnome-web-photo-0.3-new/src/Writer.cpp 2008-03-12 20:09:02.000000000 +0100 @@ -37,13 +37,13 @@ #include #include @@ -486,79 +418,90 @@ nsIScrollableView* scrollableView = nsnull; viewManager->GetRootScrollableView (&scrollableView); nsIView* view; -@@ -132,15 +127,11 @@ +@@ -132,13 +127,11 @@ viewManager->GetRootView(view); } - /* Get conversion factors */ - float p2t = presContext->PixelsToTwips(); - float t2p = presContext->TwipsToPixels(); -+ nsRect r = view->GetBounds() - view->GetPosition(); ++ PRInt32 p2a = dc->AppUnitsPerDevPixel(); /* Limit the bitmap size */ - nscoord twipLimitW = NSIntPixelsToTwips(mWidth, p2t); - nscoord twipLimitH = NSIntPixelsToTwips(mHeight, p2t); -- -- nsRect r = view->GetBounds() - view->GetPosition(); -+ nscoord twipLimitW = NSIntPixelsToAppUnits(mWidth, dc->AppUnitsPerDevPixel ()); -+ nscoord twipLimitH = NSIntPixelsToAppUnits(mHeight, dc->AppUnitsPerDevPixel ()); - - if (r.height > twipLimitH) { - r.height = twipLimitH; -@@ -149,89 +140,37 @@ - r.width = twipLimitW; - } ++ nscoord twipLimitW = NSIntPixelsToAppUnits(mWidth, p2a); ++ nscoord twipLimitH = NSIntPixelsToAppUnits(mHeight, p2a); + + nsRect r = view->GetBounds() - view->GetPosition(); -- /* sanity check */ -- if (r.IsEmpty()) { -- LOG ("Rect is empty!\n"); -- return PR_FALSE; -- } -+ mWidth = NSAppUnitsToIntPixels(r.width, dc->AppUnitsPerDevPixel ()); -+ mHeight = NSAppUnitsToIntPixels(r.height, dc->AppUnitsPerDevPixel ()); +@@ -155,11 +148,11 @@ + return PR_FALSE; + } - mWidth = NSTwipsToIntPixels(r.width, t2p); - mHeight = NSTwipsToIntPixels(r.height, t2p); ++ mWidth = NSAppUnitsToIntPixels(r.width, p2a); ++ mHeight = NSAppUnitsToIntPixels(r.height, p2a); + + PRUint32 stripe = (2 << 20) / mWidth; +- nscoord twipStripe = NSIntPixelsToTwips(stripe, p2t); ++ nscoord twipStripe = NSIntPixelsToAppUnits(stripe, p2a); + + nsRect cutout(r); + cutout.SizeTo(r.width, PR_MIN(r.height, twipStripe)); +@@ -167,71 +160,62 @@ + PRUint32 roundCount = 0; + const char* status = ""; + ++ PRUint32 width = NSAppUnitsToIntPixels(cutout.width, p2a); ++ PRUint32 height = NSAppUnitsToIntPixels(cutout.height, p2a); ++ + nsRefPtr imgSurface = -+ new gfxImageSurface(gfxIntSize(mWidth, mHeight), ++ new gfxImageSurface(gfxIntSize(width, height), + gfxImageSurface::ImageFormatRGB24); + NS_ENSURE_TRUE(imgSurface, PR_FALSE); - -- PRUint32 stripe = (2 << 20) / mWidth; -- nscoord twipStripe = NSIntPixelsToTwips(stripe, p2t); ++ + nsRefPtr imgContext = new gfxContext(imgSurface); - -- nsRect cutout(r); -- cutout.SizeTo(r.width, PR_MIN(r.height, twipStripe)); ++ + nsRefPtr surface = + gfxPlatform::GetPlatform()-> -+ CreateOffscreenSurface(gfxIntSize(mWidth, mHeight), ++ CreateOffscreenSurface(gfxIntSize(width, height), + gfxASurface::ImageFormatRGB24); + NS_ENSURE_TRUE(surface, PR_FALSE); - -- PRUint32 roundCount = 0; -- const char* status = ""; ++ + nsRefPtr context = new gfxContext(surface); + NS_ENSURE_TRUE(context, PR_FALSE); ++ + if (r.IsEmpty()) { + status = "EMPTY"; ++ } else if (!Prepare(imgSurface)) { ++ status = "PNGPREPAREFAILED"; + } else { + PRBool failed = PR_FALSE; ++ + while (!cutout.IsEmpty() && !mHadError && !failed) { + ++roundCount; -- if (r.IsEmpty()) { -- status = "EMPTY"; -- } else { -- PRBool failed = PR_FALSE; -- while (!cutout.IsEmpty() && !mHadError && !failed) { -- ++roundCount; -- - PRUint32 width = NSTwipsToIntPixels(cutout.width, t2p); - PRUint32 height = NSTwipsToIntPixels(cutout.height, t2p); -- ++ width = NSAppUnitsToIntPixels(cutout.width, p2a); ++ height = NSAppUnitsToIntPixels(cutout.height, p2a); ++ ++ rv = presShell->RenderDocument(cutout, PR_FALSE, PR_TRUE, ++ NS_RGB(255, 255, 255), context); ++ if (NS_SUCCEEDED(rv)) { ++ imgContext->DrawSurface(surface, gfxSize(width, height)); ++ } + - nsCOMPtr context; - rv = viewManager->RenderOffscreen (view, cutout, - PR_FALSE, PR_TRUE, NS_RGB(255, 255, 255), - getter_AddRefs(context)); -- if (NS_FAILED(rv)) { -- failed = PR_TRUE; -- status = "FAILEDRENDER"; -- } else { + if (NS_FAILED(rv)) { + failed = PR_TRUE; + status = "FAILEDRENDER"; + } else { - nsIDrawingSurface* surface; - context->GetDrawingSurface(&surface); - if (!surface) { @@ -593,32 +536,28 @@ - } - } - context->DestroyDrawingSurface(surface); -- } -- cutout.MoveBy(0, twipStripe); ++ WriteSurface(imgSurface, width, height); + } + cutout.MoveBy(0, twipStripe); - cutout.IntersectRect(r, cutout); -- } -+ rv = presShell->RenderDocument(r, PR_FALSE, PR_TRUE, -+ NS_RGB(255, 255, 0), context); -+ NS_ENSURE_SUCCESS(rv, PR_FALSE); ++ cutout.height = PR_MIN(cutout.height, r.y + r.height - cutout.y); + } - retval = Finish(); - status = retval ? "OK" : status[0] != '\0' ? status : "FAILED"; -- LOG ("\n"); -- } -+ imgContext->DrawSurface(surface, gfxSize(mWidth, mHeight)); - -- LOG ("%d round(s) of height %d, result: %s\n", roundCount, stripe, status); -+ if (Prepare(imgSurface)) { -+ WriteSurface(imgSurface, mWidth, mHeight); -+ return Finish(); -+ } ++ rv = Finish(); ++ status = rv ? "OK" : status[0] != '\0' ? status : "FAILED"; + LOG ("\n"); + } + + LOG ("%d round(s) of height %d, result: %s\n", roundCount, stripe, status); - return retval; -+ return PR_FALSE; ++ return rv; } /* PNG Writer */ -@@ -267,7 +206,7 @@ +@@ -267,7 +251,7 @@ }; PRBool @@ -627,7 +566,7 @@ { if (mInitialised) return PR_TRUE; -@@ -337,10 +276,6 @@ +@@ -337,10 +321,6 @@ // PNG_RESOLUTION_METER); // 1000 * 72 / 25.4 = 2834 @@ -638,7 +577,7 @@ /* FIXME: do I need 8, or the format.m[R|G|B]Count here? */ png_set_IHDR (mPNG, mInfo, mWidth, mHeight, 8 /* bits per sample */ /* FIXME? */, PNG_COLOR_TYPE_RGB /* FIXME: alpha? */, PNG_INTERLACE_NONE, -@@ -348,10 +283,10 @@ +@@ -348,10 +328,10 @@ if (mHadError) return PR_FALSE; png_color_8 sig_bit; @@ -653,7 +592,7 @@ png_set_sBIT (mPNG, mInfo, &sig_bit); if (mHadError) return PR_FALSE; -@@ -370,43 +305,28 @@ +@@ -370,43 +350,27 @@ } void @@ -708,14 +647,13 @@ + dest[2] = (*cairoPixel >> 0) & 0xFF; + dest += 3; } -+ + png_write_row (mPNG, mRow); + if (mHadError) break; + } } PRBool -@@ -464,7 +384,7 @@ +@@ -464,7 +428,7 @@ }; PRBool @@ -724,7 +662,7 @@ { if (mInitialised) return PR_TRUE; -@@ -482,45 +402,30 @@ +@@ -482,45 +446,30 @@ } void @@ -790,7 +728,7 @@ } PRBool -@@ -553,7 +458,7 @@ +@@ -553,7 +502,7 @@ } PRBool @@ -799,7 +737,7 @@ { if (!mInitialised) { void *buf = malloc (sizeof (GdkPixdata) + 3 * THUMBNAIL_WIDTH * THUMBNAIL_HEIGHT); -@@ -576,38 +481,25 @@ +@@ -576,38 +525,25 @@ } void @@ -853,7 +791,7 @@ } PRBool -@@ -670,7 +562,7 @@ +@@ -670,7 +606,7 @@ }; PRBool @@ -862,7 +800,7 @@ { if (mInitialised) return PR_TRUE; -@@ -713,44 +605,29 @@ +@@ -713,44 +649,29 @@ } void @@ -926,10 +864,10 @@ } PRBool -Only in gnome-web-photo-0.3/src: Writer.cpp.orig -diff -u -r gnome-web-photo-0.3-orig/src/Writer.h gnome-web-photo-0.3/src/Writer.h ---- gnome-web-photo-0.3-orig/src/Writer.h 2008-03-07 18:41:35.000000000 +0100 -+++ gnome-web-photo-0.3/src/Writer.h 2008-03-07 18:41:44.000000000 +0100 +Only in gnome-web-photo-0.3-new/src: Writer.cpp.orig +diff -u -r gnome-web-photo-0.3/src/Writer.h gnome-web-photo-0.3-new/src/Writer.h +--- gnome-web-photo-0.3/src/Writer.h 2007-01-29 19:53:02.000000000 +0100 ++++ gnome-web-photo-0.3-new/src/Writer.h 2008-03-12 20:09:02.000000000 +0100 @@ -21,7 +21,8 @@ #ifndef WRITER_H #define WRITER_H @@ -1012,8 +950,8 @@ private: PRUint16 mQuality; ---- /dev/null 2008-03-07 10:07:23.927002592 +0100 -+++ gnome-web-photo-0.3/m4/libxul.m4 2008-03-07 18:41:46.000000000 +0100 +--- /dev/null 2008-03-12 18:51:03.904002981 +0100 ++++ gnome-web-photo-0.3-new/m4/libxul.m4 2008-03-12 20:09:24.000000000 +0100 @@ -0,0 +1,566 @@ +# Copyright ?? 2000-2004 Marco Pesenti Gritti +# Copyright ?? 2003, 2004, 2005, 2006, 2007 Christian Persch @@ -1581,3 +1519,68 @@ +fi + +]) +--- gnome-web-photo-0.3/configure.ac 2007-01-29 20:07:02.000000000 +0100 ++++ gnome-web-photo-0.3-new/configure.ac 2008-03-12 20:26:47.000000000 +0100 +@@ -132,57 +132,12 @@ + + AM_GCONF_SOURCE_2 + ++# ********* ++# Xulrunner ++# ********* + +-# ******* +-# Mozilla +-# ******* +- +-GECKO_INIT([GECKO]) +- +-AC_SUBST([GECKO]) +-AC_SUBST([GECKO_FLAVOUR]) +-AC_SUBST([GECKO_INCLUDE_ROOT]) +-AC_SUBST([GECKO_HOME]) +-AC_SUBST([GECKO_PREFIX]) +- +-case "$GECKO" in +-seamonkey) min_version=1.0 ;; +-*firefox) min_version=1.4 ;; +-xulrunner) min_version=1.8 ;; +-esac +- +-PKG_CHECK_MODULES([GECKO], [${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_extra_pkg_dependencies}]) +-AC_SUBST([GECKO_CFLAGS]) +-AC_SUBST([GECKO_LIBS]) +- +-# In xulrunner, gkgfx is in libxul; for all others we need to +-# explicitly link against it +- +-if test "$GECKO" != "xulrunner"; then +- GECKO_EXTRA_LIBS="$GECKO_EXTRA_LIBS -lgkgfx" +-fi +- +-AC_SUBST([GECKO_EXTRA_LIBS]) +- +-# Check for PSM headers +- +-AC_MSG_CHECKING([for mozilla security compoment]) +-GECKO_COMPILE_IFELSE([pipnss], +- [AC_LANG_PROGRAM( +- [[#include ]], +- [[nsIX509Cert *c; +- c->GetIssuer (nsnull);]] +- )], +- [AC_DEFINE([HAVE_PSM], [1],[Define if you have the mozilla NSS headers installed]) have_psm=yes], +- [have_psm=no]) +-AC_MSG_RESULT([$have_psm]) +- +-AM_CONDITIONAL([HAVE_PSM],[test "x$have_psm" = "xyes"]) +- +-# Needed since 1.8b2 +-# Define this down here so it doesn't affect the API checks above +- +-AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define for access to internal mozilla API]) ++LIBXUL_INIT ++LIBXUL_DEFINES + + # ****************** + # Portability checks From fedora-extras-commits at redhat.com Wed Mar 12 20:07:44 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Wed, 12 Mar 2008 20:07:44 GMT Subject: rpms/glade3/F-7 glade3-3.4.3-desktop.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 glade3.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200803122007.m2CK7iBi026073@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25992 Modified Files: .cvsignore glade3.spec sources Added Files: glade3-3.4.3-desktop.patch Log Message: * Wed Mar 12 2008 Debarshi Ray - 3.4.3-1 - Version bump to 3.4.3. glade3-3.4.3-desktop.patch: --- NEW FILE glade3-3.4.3-desktop.patch --- diff -urNp glade3-3.4.3.orig/data/glade-3.desktop.in.in glade3-3.4.3/data/glade-3.desktop.in.in --- glade3-3.4.3.orig/data/glade-3.desktop.in.in 2008-03-09 23:35:57.000000000 +0530 +++ glade3-3.4.3/data/glade-3.desktop.in.in 2008-03-12 21:57:19.000000000 +0530 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Glade Interface Designer +_Name=Glade-3 Interface Designer _GenericName=User Interface Designer _Comment=Create or open user interface designs for GTK+ applications Exec=glade-3 %F Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-7/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Dec 2007 18:19:49 -0000 1.3 +++ .cvsignore 12 Mar 2008 20:06:44 -0000 1.4 @@ -1 +1 @@ -glade3-3.4.1.tar.gz +glade3-3.4.3.tar.gz Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-7/glade3.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- glade3.spec 2 Mar 2008 19:45:09 -0000 1.11 +++ glade3.spec 12 Mar 2008 20:06:44 -0000 1.12 @@ -5,8 +5,8 @@ Summary: User Interface Designer for GTK+ and GNOME Name: glade3 -Version: 3.4.1 -Release: 5%{?dist} +Version: 3.4.3 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://glade.gnome.org/ @@ -190,6 +190,9 @@ %{_includedir}/libgladeui-1.0/gladeui/* %changelog +* Wed Mar 12 2008 Debarshi Ray - 3.4.3-1 +- Version bump to 3.4.3. + * Sun Mar 02 2008 Debarshi Ray - 3.4.1-5 - Removed 'BuildRequires: gtk-doc' from all distributions, except Fedora 7. - Added 'Requires: gtk-doc' for glade3-libgladeui-devel. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-7/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Dec 2007 18:19:49 -0000 1.3 +++ sources 12 Mar 2008 20:06:44 -0000 1.4 @@ -1 +1 @@ -099b85a22c64e59983bcd6afda46149c glade3-3.4.1.tar.gz +18653c56cc5d618e2f790c4b8124efa2 glade3-3.4.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 20:10:34 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Wed, 12 Mar 2008 20:10:34 GMT Subject: rpms/glade3/F-8 glade3-3.4.3-desktop.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 glade3.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200803122010.m2CKAYSb026215@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26173 Modified Files: .cvsignore glade3.spec sources Added Files: glade3-3.4.3-desktop.patch Log Message: * Wed Mar 12 2008 Debarshi Ray - 3.4.3-1 - Version bump to 3.4.3. glade3-3.4.3-desktop.patch: --- NEW FILE glade3-3.4.3-desktop.patch --- diff -urNp glade3-3.4.3.orig/data/glade-3.desktop.in.in glade3-3.4.3/data/glade-3.desktop.in.in --- glade3-3.4.3.orig/data/glade-3.desktop.in.in 2008-03-09 23:35:57.000000000 +0530 +++ glade3-3.4.3/data/glade-3.desktop.in.in 2008-03-12 21:57:19.000000000 +0530 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Glade Interface Designer +_Name=Glade-3 Interface Designer _GenericName=User Interface Designer _Comment=Create or open user interface designs for GTK+ applications Exec=glade-3 %F Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-8/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Dec 2007 18:24:15 -0000 1.3 +++ .cvsignore 12 Mar 2008 20:09:44 -0000 1.4 @@ -1 +1 @@ -glade3-3.4.1.tar.gz +glade3-3.4.3.tar.gz Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-8/glade3.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- glade3.spec 2 Mar 2008 19:42:42 -0000 1.9 +++ glade3.spec 12 Mar 2008 20:09:44 -0000 1.10 @@ -5,8 +5,8 @@ Summary: User Interface Designer for GTK+ and GNOME Name: glade3 -Version: 3.4.1 -Release: 5%{?dist} +Version: 3.4.3 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://glade.gnome.org/ @@ -190,6 +190,9 @@ %{_includedir}/libgladeui-1.0/gladeui/* %changelog +* Wed Mar 12 2008 Debarshi Ray - 3.4.3-1 +- Version bump to 3.4.3. + * Sun Mar 02 2008 Debarshi Ray - 3.4.1-5 - Removed 'BuildRequires: gtk-doc' from all distributions, except Fedora 7. - Added 'Requires: gtk-doc' for glade3-libgladeui-devel. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-8/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Dec 2007 18:24:15 -0000 1.3 +++ sources 12 Mar 2008 20:09:44 -0000 1.4 @@ -1 +1 @@ -099b85a22c64e59983bcd6afda46149c glade3-3.4.1.tar.gz +18653c56cc5d618e2f790c4b8124efa2 glade3-3.4.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 20:13:10 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Wed, 12 Mar 2008 20:13:10 GMT Subject: rpms/glade3/devel glade3-3.4.3-desktop.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 glade3.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200803122013.m2CKDAbA026336@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26307 Modified Files: .cvsignore glade3.spec sources Added Files: glade3-3.4.3-desktop.patch Log Message: * Wed Mar 12 2008 Debarshi Ray - 3.4.3-1 - Version bump to 3.4.3. glade3-3.4.3-desktop.patch: --- NEW FILE glade3-3.4.3-desktop.patch --- diff -urNp glade3-3.4.3.orig/data/glade-3.desktop.in.in glade3-3.4.3/data/glade-3.desktop.in.in --- glade3-3.4.3.orig/data/glade-3.desktop.in.in 2008-03-09 23:35:57.000000000 +0530 +++ glade3-3.4.3/data/glade-3.desktop.in.in 2008-03-12 21:57:19.000000000 +0530 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Glade Interface Designer +_Name=Glade-3 Interface Designer _GenericName=User Interface Designer _Comment=Create or open user interface designs for GTK+ applications Exec=glade-3 %F Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glade3/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Dec 2007 18:30:29 -0000 1.3 +++ .cvsignore 12 Mar 2008 20:12:35 -0000 1.4 @@ -1 +1 @@ -glade3-3.4.1.tar.gz +glade3-3.4.3.tar.gz Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- glade3.spec 2 Mar 2008 19:40:31 -0000 1.10 +++ glade3.spec 12 Mar 2008 20:12:35 -0000 1.11 @@ -5,8 +5,8 @@ Summary: User Interface Designer for GTK+ and GNOME Name: glade3 -Version: 3.4.1 -Release: 5%{?dist} +Version: 3.4.3 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://glade.gnome.org/ @@ -190,6 +190,9 @@ %{_includedir}/libgladeui-1.0/gladeui/* %changelog +* Wed Mar 12 2008 Debarshi Ray - 3.4.3-1 +- Version bump to 3.4.3. + * Sun Mar 02 2008 Debarshi Ray - 3.4.1-5 - Removed 'BuildRequires: gtk-doc' from all distributions, except Fedora 7. - Added 'Requires: gtk-doc' for glade3-libgladeui-devel. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glade3/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Dec 2007 18:30:29 -0000 1.3 +++ sources 12 Mar 2008 20:12:35 -0000 1.4 @@ -1 +1 @@ -099b85a22c64e59983bcd6afda46149c glade3-3.4.1.tar.gz +18653c56cc5d618e2f790c4b8124efa2 glade3-3.4.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 20:14:20 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 12 Mar 2008 20:14:20 GMT Subject: rpms/NetworkManager/devel .cvsignore, 1.63, 1.64 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.14, 1.15 NetworkManager.spec, 1.200, 1.201 sources, 1.91, 1.92 Message-ID: <200803122014.m2CKEKru026426@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26386 Modified Files: .cvsignore NetworkManager-0.6.5-fixup-internal-applet-build.patch NetworkManager.spec sources Log Message: Really don't require gnome-common Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 12 Mar 2008 18:55:26 -0000 1.63 +++ .cvsignore 12 Mar 2008 20:13:43 -0000 1.64 @@ -75,3 +75,5 @@ nm-applet-0.7.0.svn585.tar.gz NetworkManager-0.7.0.svn3437.tar.gz nm-applet-0.7.0.svn591.tar.gz +NetworkManager-0.7.0.svn3440.tar.gz +nm-applet-0.7.0.svn592.tar.gz NetworkManager-0.6.5-fixup-internal-applet-build.patch: Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- NetworkManager-0.6.5-fixup-internal-applet-build.patch 14 Feb 2008 20:00:03 -0000 1.14 +++ NetworkManager-0.6.5-fixup-internal-applet-build.patch 12 Mar 2008 20:13:43 -0000 1.15 @@ -1,21 +1,6 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac --- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-11-13 09:53:39.000000000 -0500 +++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-11-13 15:14:13.000000000 -0500 -@@ -18,10 +18,10 @@ dnl - dnl This doesn't depend on gnome support, only on gnome-common, autogen already - dnl uses gnome-autogen - dnl --GNOME_COMMON_INIT --GNOME_DEBUG_CHECK --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -+dnl GNOME_COMMON_INIT -+dnl GNOME_DEBUG_CHECK -+dnl GNOME_COMPILE_WARNINGS([maximum]) -+dnl GNOME_MAINTAINER_MODE_DEFINES - - dnl - dnl Required headers @@ -60,9 +60,6 @@ AC_C_BIGENDIAN PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 Index: NetworkManager.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- NetworkManager.spec 12 Mar 2008 18:55:26 -0000 1.200 +++ NetworkManager.spec 12 Mar 2008 20:13:43 -0000 1.201 @@ -8,8 +8,8 @@ %define wireless_tools_version 1:28-0pre9 %define libnl_version 1.0-0.15.pre8.git20071218 -%define snapshot svn3437 -%define applet_snapshot svn591 +%define snapshot svn3440 +%define applet_snapshot svn592 Name: NetworkManager Summary: Network connection manager and user applications @@ -278,7 +278,7 @@ %changelog -* Wed Mar 12 2008 Dan Williams - 1:0.7.0-0.9.1.svn3432 +* Wed Mar 12 2008 Dan Williams - 1:0.7.0-0.9.1.svn3440 - Fix DHCP rebind behavior - Preliminary PPPoE support Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- sources 12 Mar 2008 18:55:26 -0000 1.91 +++ sources 12 Mar 2008 20:13:43 -0000 1.92 @@ -1,2 +1,2 @@ -0f6a156bd86433c992498c3c2016d654 NetworkManager-0.7.0.svn3437.tar.gz -be8d64cf73d74d9e13cbd37912a4c0e7 nm-applet-0.7.0.svn591.tar.gz +be28c35b9dedeacb5b8ce02a2058933a NetworkManager-0.7.0.svn3440.tar.gz +f85ea0e7b7620ff8306cac7069b24b55 nm-applet-0.7.0.svn592.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 20:17:42 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 20:17:42 GMT Subject: rpms/python-jinja/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803122017.m2CKHgcm026509@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/python-jinja/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBw1315/rpms/python-jinja/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-jinja ***** Error reading new file: [Errno 2] No such file or directory: '.cvsignore' ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' ***** Error reading new file: [Errno 2] No such file or directory: 'sources' From fedora-extras-commits at redhat.com Wed Mar 12 20:25:49 2008 From: fedora-extras-commits at redhat.com (John W. Linville (linville)) Date: Wed, 12 Mar 2008 20:25:49 GMT Subject: rpms/kernel/F-8 config-generic, 1.52, 1.53 kernel.spec, 1.379, 1.380 linux-2.6-ps3_gelic_wireless.patch, 1.2, 1.3 linux-2.6-wireless-pending.patch, 1.33, 1.34 linux-2.6-wireless.patch, 1.28, 1.29 Message-ID: <200803122025.m2CKPn7n026852@cvs-int.fedora.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26779 Modified Files: config-generic kernel.spec linux-2.6-ps3_gelic_wireless.patch linux-2.6-wireless-pending.patch linux-2.6-wireless.patch Log Message: another round of wireless updates Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- config-generic 10 Mar 2008 21:43:49 -0000 1.52 +++ config-generic 12 Mar 2008 20:25:04 -0000 1.53 @@ -1223,10 +1223,8 @@ CONFIG_MAC80211=m CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set CONFIG_MAC80211_RC_DEFAULT="pid" CONFIG_MAC80211_RC_PID=y -CONFIG_MAC80211_RC_SIMPLE=y CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y CONFIG_MAC80211_DEBUGFS=y @@ -1237,8 +1235,6 @@ CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m -CONFIG_IEEE80211_SOFTMAC=m -CONFIG_IEEE80211_SOFTMAC_DEBUG=y CONFIG_CFG80211=m CONFIG_NL80211=y @@ -1248,7 +1244,6 @@ CONFIG_AIRO=m CONFIG_AIRO_CS=m CONFIG_ATMEL=m -# CONFIG_BCM43XX is not set CONFIG_B43=m CONFIG_B43_PCMCIA=y CONFIG_B43_DEBUG=y Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- kernel.spec 11 Mar 2008 21:45:58 -0000 1.379 +++ kernel.spec 12 Mar 2008 20:25:04 -0000 1.380 @@ -1913,6 +1913,53 @@ %changelog +* Tue Mar 11 2008 John W. Linville 2.6.24.3-34 +- rt2x00:correct rx packet length for USB devices +- make b43_mac_{enable,suspend}() static +- the scheduled bcm43xx removal +- the scheduled ieee80211 softmac removal +- the scheduled rc80211-simple.c removal +- iwlwifi: Use eeprom form iwlcore +- tkip: remove unused function, other cleanups +- mac80211: remove Hi16, Lo16 helpers +- mac80211: remove Hi8/Lo8 helpers, add initialization vector helpers +- b43: pull out helpers for writing noise table +- libertas: implement SSID scanning for SIOCSIWSCAN +- rt2x00: Align RX descriptor to 4 bytes +- rt2x00: Don't use uninitialized desc_len +- rt2x00: Use skbdesc fields for descriptor initialization +- rt2x00: Only disable beaconing just before beacon update +- rt2x00: Upgrade queue->lock to use irqsave +- rt2x00: Move firmware checksumming to driver +- rt2x00: Start bugging when rt2x00lib doesn't filter SW diversity +- rt2x00: Check IEEE80211_TXCTL_SEND_AFTER_DTIM flag +- rt2x00: Rename config_preamble() to config_erp() +- rt2x00: Add suspend/resume handlers to rt2x00rfkill +- rt2x00: Make rt2x00leds_register return void +- rt2x00: Always enable TSF ticking +- rt2x00: Fix basic rate initialization +- rt2x00: Fix compile error when rfkill is disabled +- rt2x00: Fix RX DMA ring initialization +- rt2x00: Fix rt2400pci signal +- rt2x00: Release rt2x00 2.1.4 +- rt2x00: Only strip preamble bit in rt2400pci +- prism54: support for 124a:4025 - another version of IOGear GWU513 802.11g +- drivers/net/wireless/ath5k - convert == (true|false) to simple logical tests +- include/net/ieee80211.h - remove duplicate include +- rndis_wlan: cleanup, rename and reorder enums and structures +- rndis_wlan: cleanup, rename structure members +- rt2x00: Fix trivial log message +- PS3: gelic: ignore scan info from zero SSID beacons +- rt2x00: Initialize TX control field in data entries +- rt2x00: Use the correct size when copying the control info in txdone +- rt2x00: Don't use unitialized rxdesc->size +- ssb: Add SPROM/invariants support for PCMCIA devices +- iwlwifi: update copyright year +- iwlwifi: fix bug to show hidden APs during scan +- iwlwifi: Use sta_bcast_id variable instead of BROADCAST_ID constant +- iwlwifi: Fix endianity in debug print +- iwlwifi: change rate number to a constant + * Tue Mar 11 2008 John W. Linville 2.6.24.3-33 - rt2x00: never disable multicast because it disables broadcast too - rt2x00: Add new D-Link USB ID linux-2.6-ps3_gelic_wireless.patch: Index: linux-2.6-ps3_gelic_wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-ps3_gelic_wireless.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-ps3_gelic_wireless.patch 11 Mar 2008 21:45:58 -0000 1.2 +++ linux-2.6-ps3_gelic_wireless.patch 12 Mar 2008 20:25:04 -0000 1.3 @@ -1,3 +1,19 @@ +commit 068764eebb1711399bafac301eebe3da0d15f154 +Author: Masakazu Mokuno +Date: Tue Mar 11 13:15:44 2008 +0900 + + PS3: gelic: ignore scan info from zero SSID beacons + + Some implementations of the hidden SSID APs emit beacons which have the zero + length SSID information element instead of SSID padded by null (\0) characters. + If the firmware of the PS3 wireless hardware meets these beacons, it abandons parsing + IEs. Thus guest OSes get the invalid scan information for the AP. + + To work around this, ignore these scan informations from the list. + + Signed-off-by: Masakazu Mokuno + Signed-off-by: John W. Linville + commit 97ed83905e5f8547a94a8066441351c6920728a1 Author: John W. Linville Date: Thu Mar 6 13:08:09 2008 -0500 @@ -130,8 +146,8 @@ Signed-off-by: Jeff Garzik diff -up linux-2.6.24.noarch/drivers/net/Makefile.orig linux-2.6.24.noarch/drivers/net/Makefile ---- linux-2.6.24.noarch/drivers/net/Makefile.orig 2008-03-11 17:20:03.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/Makefile 2008-03-11 17:21:47.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/Makefile.orig 2008-03-12 16:09:28.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/Makefile 2008-03-12 16:10:16.000000000 -0400 @@ -67,7 +67,8 @@ obj-$(CONFIG_BNX2) += bnx2.o spidernet-y += spider_net.o spider_net_ethtool.o obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o @@ -143,9 +159,9 @@ obj-$(CONFIG_SKGE) += skge.o obj-$(CONFIG_SKY2) += sky2.o diff -up /dev/null linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c ---- /dev/null 2008-03-11 08:47:01.722073547 -0400 -+++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c 2008-03-11 17:21:47.000000000 -0400 -@@ -0,0 +1,2754 @@ +--- /dev/null 2008-03-12 09:37:56.232602959 -0400 ++++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.c 2008-03-12 16:10:56.000000000 -0400 +@@ -0,0 +1,2757 @@ +/* + * PS3 gelic network driver. + * @@ -1792,13 +1808,24 @@ + } + + /* put them in the newtork_list */ -+ scan_info = wl->buf; -+ scan_info_size = 0; -+ i = 0; -+ while (scan_info_size < data_len) { ++ for (i = 0, scan_info_size = 0, scan_info = wl->buf; ++ scan_info_size < data_len; ++ i++, scan_info_size += be16_to_cpu(scan_info->size), ++ scan_info = (void *)scan_info + be16_to_cpu(scan_info->size)) { + pr_debug("%s:size=%d bssid=%s scan_info=%p\n", __func__, + be16_to_cpu(scan_info->size), + print_mac(mac, &scan_info->bssid[2]), scan_info); ++ ++ /* ++ * The wireless firmware may return invalid channel 0 and/or ++ * invalid rate if the AP emits zero length SSID ie. As this ++ * scan information is useless, ignore it ++ */ ++ if (!be16_to_cpu(scan_info->channel) || !scan_info->rate[0]) { ++ pr_debug("%s: invalid scan info\n", __func__); ++ continue; ++ } ++ + found = 0; + oldest = NULL; + list_for_each_entry(target, &wl->network_list, list) { @@ -1835,10 +1862,6 @@ + GFP_KERNEL); + if (!target->hwinfo) { + pr_info("%s: kzalloc failed\n", __func__); -+ i++; -+ scan_info_size += be16_to_cpu(scan_info->size); -+ scan_info = (void *)scan_info + -+ be16_to_cpu(scan_info->size); + continue; + } + /* copy hw scan info */ @@ -1857,10 +1880,6 @@ + if (scan_info->ext_rate[r]) + target->rate_ext_len++; + list_move_tail(&target->list, &wl->network_list); -+ /* bump pointer */ -+ i++; -+ scan_info_size += be16_to_cpu(scan_info->size); -+ scan_info = (void *)scan_info + be16_to_cpu(scan_info->size); + } + memset(&data, 0, sizeof(data)); + wireless_send_event(port_to_netdev(wl_port(wl)), SIOCGIWSCAN, &data, @@ -2902,7 +2921,7 @@ +} diff -up linux-2.6.24.noarch/drivers/net/ps3_gelic_net.c.orig linux-2.6.24.noarch/drivers/net/ps3_gelic_net.c --- linux-2.6.24.noarch/drivers/net/ps3_gelic_net.c.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/ps3_gelic_net.c 2008-03-11 17:21:47.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/ps3_gelic_net.c 2008-03-12 16:10:16.000000000 -0400 @@ -46,29 +46,25 @@ #include @@ -4937,7 +4956,7 @@ diff -up linux-2.6.24.noarch/drivers/net/ps3_gelic_net.h.orig linux-2.6.24.noarch/drivers/net/ps3_gelic_net.h --- linux-2.6.24.noarch/drivers/net/ps3_gelic_net.h.orig 2008-01-24 17:58:37.000000000 -0500 -+++ linux-2.6.24.noarch/drivers/net/ps3_gelic_net.h 2008-03-11 17:21:47.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/ps3_gelic_net.h 2008-03-12 16:10:16.000000000 -0400 @@ -35,198 +35,323 @@ #define GELIC_NET_MAX_MTU VLAN_ETH_FRAME_LEN #define GELIC_NET_MIN_MTU VLAN_ETH_ZLEN @@ -5407,8 +5426,8 @@ #endif /* _GELIC_NET_H */ diff -up linux-2.6.24.noarch/drivers/net/Kconfig.orig linux-2.6.24.noarch/drivers/net/Kconfig ---- linux-2.6.24.noarch/drivers/net/Kconfig.orig 2008-03-11 17:20:03.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/Kconfig 2008-03-11 17:23:36.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/Kconfig.orig 2008-03-12 16:09:28.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/Kconfig 2008-03-12 16:10:16.000000000 -0400 @@ -2310,6 +2310,17 @@ config GELIC_NET To compile this driver as a module, choose M here: the module will be called ps3_gelic. @@ -5428,8 +5447,8 @@ tristate "Gianfar Ethernet" depends on 85xx || 83xx || PPC_86xx diff -up /dev/null linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.h ---- /dev/null 2008-03-11 08:47:01.722073547 -0400 -+++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.h 2008-03-11 17:21:47.000000000 -0400 +--- /dev/null 2008-03-12 09:37:56.232602959 -0400 ++++ linux-2.6.24.noarch/drivers/net/ps3_gelic_wireless.h 2008-03-12 16:10:16.000000000 -0400 @@ -0,0 +1,329 @@ +/* + * PS3 gelic network driver. linux-2.6-wireless-pending.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.33 -r 1.34 linux-2.6-wireless-pending.patch Index: linux-2.6-wireless-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending.patch,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- linux-2.6-wireless-pending.patch 10 Mar 2008 23:34:04 -0000 1.33 +++ linux-2.6-wireless-pending.patch 12 Mar 2008 20:25:04 -0000 1.34 @@ -1,3 +1,627 @@ +commit 2cd41eac2a895b01bd0824ba098f78b870136be2 +Author: Reinette Chatre +Date: Tue Mar 11 16:17:15 2008 -0700 + + iwlwifi: fix bug to show hidden APs during scan + + Indirect scanning ('iwlist scan') should report information about + hidden APs. When an AP is hidden it does not respond to active scanning, + we thus have to use passive scanning to locate these APs. + + This fixes http://bughost.org/bugzilla/show_bug.cgi?id=1499 + + Signed-off-by: Reinette Chatre + Tested-by: Bill Moss + Signed-off-by: John W. Linville + +commit 3352880fca5d5564d0c9f23948b7e05d16519759 +Author: Tomas Winkler +Date: Tue Mar 11 16:17:20 2008 -0700 + + iwlwifi: change rate number to a constant + + This patch moves a number to an understandable define + + Signed-off-by: Tomas Winkler + Signed-off-by: Ron Rindjunsky + Signed-off-by: John W. Linville + +commit c794c989cab1369ae9e667ed5b77e6f813f9e2b3 +Author: Tomas Winkler +Date: Tue Mar 11 16:17:19 2008 -0700 + + iwlwifi: Fix endianity in debug print + + This patch fix debug print out endianity issue for bitmap + Since u64 and le64 variables are casted to unsigned long long, + after patch 'wireless: correct warnings from using '%llx' for type 'u64' + also bitmaps need to be converted to native endianity + + Signed-off-by: Tomas Winkler + Signed-off-by: Reinette Chatre + Signed-off-by: John W. Linville + +commit 42ff182a205f7a36771f54b93d8fa04a86aec166 +Author: Assaf Krauss +Date: Tue Mar 11 16:17:18 2008 -0700 + + iwlwifi: Use eeprom form iwlcore + + This patch puts in use eeprom from iwlcore module + + Signed-off-by: Assaf Krauss + Signed-off-by: Tomas Winkler + Signed-off-by: John W. Linville + +commit 4707ca7feed461a8cbc3dd19cde5bc1451296f11 +Author: Reinette Chatre +Date: Tue Mar 11 16:17:17 2008 -0700 + + iwlwifi: update copyright year + + Also fix a copy and paste error in header of iwl-core.c. This file + is not dual licensed. + + Signed-off-by: Reinette Chatre + Signed-off-by: John W. Linville + +commit 8535c56523a1c999a381009ea794e47e04070432 +Author: Tomas Winkler +Date: Tue Mar 11 16:17:16 2008 -0700 + + iwlwifi: Use sta_bcast_id variable instead of BROADCAST_ID constant + + This patch removes iwlYYY_BROADCAST_ID from run time usage. + hw_setting.sta_bcast_id is used instead. + + Signed-off-by: Tomas Winkler + Signed-off-by: Reinette Chatre + Signed-off-by: John W. Linville + +commit a968fa909c2a245ed4c4175de704fc184dbc6ba8 +Author: Michael Buesch +Date: Mon Mar 10 17:26:32 2008 +0100 + + ssb: Add SPROM/invariants support for PCMCIA devices + + This adds support for reading/writing the SPROM invariants + for PCMCIA based devices. + + Signed-off-by: Michael Buesch + Signed-off-by: John W. Linville + +commit bfc6c4d9238c3ee8324b35e0bf5a8ad565f2501a +Author: Joe Perches +Date: Sun Mar 9 16:55:10 2008 -0700 + + include/net/ieee80211.h - remove duplicate include + + Signed-off-by: Joe Perches + Signed-off-by: John W. Linville + +commit f6b32dc11fb7ac50baba66e0446f0d18a2b831e1 +Author: Ivo van Doorn +Date: Mon Mar 10 00:30:44 2008 +0100 + + rt2x00: Only strip preamble bit in rt2400pci + + Only rt2400pci can have the preamble bit set in the PLCP value, + for all other drivers it should not be cleared since that will + conflict with the plcp values for OFDM rates. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 17e0212fe66d07ffc2df8b034e35a12a187ffd19 +Author: Ivo van Doorn +Date: Sun Mar 9 22:49:21 2008 +0100 + + rt2x00: Release rt2x00 2.1.4 + + Version bump to 2.1.4 + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 54e19697da963c5dd36f2827fe6936052854ccc8 +Author: Ivo van Doorn +Date: Sun Mar 9 22:49:04 2008 +0100 + + rt2x00: Fix rt2400pci signal + + After sampling hundreds of RX frame descriptors, + the results were conclusive: + - The Ralink documentation regarding the SIGNAL and RSSI are wrong. + + It turns out that of the 5 BBR registers, we should not use BBR0 and BBR1 + for SIGNAL and RSSI respectively, but actually BBR1 and BBR2. + BBR0 does show values, but the exact meaning remains unclear, + but they cannot be translated into a SIGNAL or RSSI field. + BBR3, BBR4 and BBR5 are always 0, so their meaning is unknown. + + As it turns out, the reported SIGNAL is the PLCP value, this + in contradiction to what was expected looking at rt2500pci which + only reported the PLCP values for OFDM rates and bitrate values + for CCK rates. + + This means we should let the driver raise the flag about the contents + of the SIGNAL field so rt2x00lib can always do the right thing based + on what the driver reports. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit d187f182a14f4d0b36f3595c416127e6a2290884 +Author: Ivo van Doorn +Date: Sun Mar 9 22:48:46 2008 +0100 + + rt2x00: Fix RX DMA ring initialization + + Due to a terrible typo the RX DMA base address + was initialized to the beacon base address. + Obviously bad things happen with bugs like that.... + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit cc7de4a3067b706c06ec48bf47a8f432042dd997 +Author: Ivo van Doorn +Date: Sun Mar 9 22:48:28 2008 +0100 + + rt2x00: Fix compile error when rfkill is disabled + + Fix obvious error that prevented compilation while rfkill + was disabled. + + Signed-off-by: Ivo van Doorn + Signed-off-by: John W. Linville + +commit 8d4e8648eb868e2c37797060953c4e3fbdc2d7bf +Author: Ivo van Doorn +Date: Sun Mar 9 22:48:08 2008 +0100 + + rt2x00: Fix basic rate initialization + + The basic rate which is configured in the register + should not match all supported rates, but only the _basic_ rates. + + Fix this by adding a new flag to the rt2x00_rate structure + and whenever the mode is changed, loop over all available rates + for that band to get the basic rate mask. + [...76910 lines suppressed...] ++ int (*sprom_write)(struct ssb_bus *bus, const u16 *sprom)) ++{ ++ u16 *sprom; ++ int res = 0, err = -ENOMEM; ++ size_t sprom_size_words = bus->sprom_size; ++ ++ sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL); ++ if (!sprom) ++ goto out; ++ err = hex2sprom(sprom, buf, count, sprom_size_words); ++ if (err) { ++ err = -EINVAL; ++ goto out_kfree; ++ } ++ err = sprom_check_crc(sprom, sprom_size_words); ++ if (err) { ++ err = -EINVAL; ++ goto out_kfree; ++ } ++ ++ /* Use interruptible locking, as the SPROM write might ++ * be holding the lock for several seconds. So allow userspace ++ * to cancel operation. */ ++ err = -ERESTARTSYS; ++ if (mutex_lock_interruptible(&bus->sprom_mutex)) ++ goto out_kfree; ++ err = ssb_devices_freeze(bus); ++ if (err == -EOPNOTSUPP) { ++ ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. " ++ "No suspend support. Is CONFIG_PM enabled?\n"); ++ goto out_unlock; ++ } ++ if (err) { ++ ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n"); ++ goto out_unlock; ++ } ++ res = sprom_write(bus, sprom); ++ err = ssb_devices_thaw(bus); ++ if (err) ++ ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n"); ++out_unlock: ++ mutex_unlock(&bus->sprom_mutex); ++out_kfree: ++ kfree(sprom); ++out: ++ if (res) ++ return res; ++ return err ? err : count; ++} +diff -up linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt +--- linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt.orig 2008-01-24 17:58:37.000000000 -0500 ++++ linux-2.6.24.noarch/Documentation/networking/bcm43xx.txt 2008-03-12 15:58:32.000000000 -0400 +@@ -1,89 +0,0 @@ +- +- BCM43xx Linux Driver Project +- ============================ +- +-Introduction +------------- +- +-Many of the wireless devices found in modern notebook computers are +-based on the wireless chips produced by Broadcom. These devices have +-been a problem for Linux users as there is no open-source driver +-available. In addition, Broadcom has not released specifications +-for the device, and driver availability has been limited to the +-binary-only form used in the GPL versions of AP hardware such as the +-Linksys WRT54G, and the Windows and OS X drivers. Before this project +-began, the only way to use these devices were to use the Windows or +-OS X drivers with either the Linuxant or ndiswrapper modules. There +-is a strong penalty if this method is used as loading the binary-only +-module "taints" the kernel, and no kernel developer will help diagnose +-any kernel problems. +- +-Development +------------ +- +-This driver has been developed using +-a clean-room technique that is described at +-http://bcm-specs.sipsolutions.net/ReverseEngineeringProcess. For legal +-reasons, none of the clean-room crew works on the on the Linux driver, +-and none of the Linux developers sees anything but the specifications, +-which are the ultimate product of the reverse-engineering group. +- +-Software +--------- +- +-Since the release of the 2.6.17 kernel, the bcm43xx driver has been +-distributed with the kernel source, and is prebuilt in most, if not +-all, distributions. There is, however, additional software that is +-required. The firmware used by the chip is the intellectual property +-of Broadcom and they have not given the bcm43xx team redistribution +-rights to this firmware. Since we cannot legally redistribute +-the firmware we cannot include it with the driver. Furthermore, it +-cannot be placed in the downloadable archives of any distributing +-organization; therefore, the user is responsible for obtaining the +-firmware and placing it in the appropriate location so that the driver +-can find it when initializing. +- +-To help with this process, the bcm43xx developers provide a separate +-program named bcm43xx-fwcutter to "cut" the firmware out of a +-Windows or OS X driver and write the extracted files to the proper +-location. This program is usually provided with the distribution; +-however, it may be downloaded from +- +-http://developer.berlios.de/project/showfiles.php?group_id=4547 +- +-The firmware is available in two versions. V3 firmware is used with +-the in-kernel bcm43xx driver that uses a software MAC layer called +-SoftMAC, and will have a microcode revision of 0x127 or smaller. The +-V4 firmware is used by an out-of-kernel driver employing a variation of +-the Devicescape MAC layer known as d80211. Once bcm43xx-d80211 reaches +-a satisfactory level of development, it will replace bcm43xx-softmac +-in the kernel as it is much more flexible and powerful. +- +-A source for the latest V3 firmware is +- +-http://downloads.openwrt.org/sources/wl_apsta-3.130.20.0.o +- +-Once this file is downloaded, the command +-'bcm43xx-fwcutter -w ' +-will extract the microcode and write it to directory +-. The correct directory will depend on your distribution; +-however, most use '/lib/firmware'. Once this step is completed, +-the bcm3xx driver should load when the system is booted. To see +-any messages relating to the driver, issue the command 'dmesg | +-grep bcm43xx' from a terminal window. If there are any problems, +-please send that output to Bcm43xx-dev at lists.berlios.de. +- +-Although the driver has been in-kernel since 2.6.17, the earliest +-version is quite limited in its capability. Patches that include +-all features of later versions are available for the stable kernel +-versions from 2.6.18. These will be needed if you use a BCM4318, +-or a PCI Express version (BCM4311 and BCM4312). In addition, if you +-have an early BCM4306 and more than 1 GB RAM, your kernel will need +-to be patched. These patches, which are being updated regularly, +-are available at ftp://lwfinger.dynalias.org/patches. Look for +-combined_2.6.YY.patch. Of course you will need kernel source downloaded +-from kernel.org, or the source from your distribution. +- +-If you build your own kernel, please enable CONFIG_BCM43XX_DEBUG +-and CONFIG_IEEE80211_SOFTMAC_DEBUG. The log information provided is +-essential for solving any problems. diff -up /dev/null linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl ---- /dev/null 2008-03-10 08:31:57.721924924 -0400 -+++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl 2008-03-10 16:46:15.000000000 -0400 +--- /dev/null 2008-03-12 09:37:56.232602959 -0400 ++++ linux-2.6.24.noarch/Documentation/DocBook/mac80211.tmpl 2008-03-12 15:52:22.000000000 -0400 @@ -0,0 +1,335 @@ + + + diff -up linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig linux-2.6.24.noarch/Documentation/DocBook/Makefile ---- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig 2008-03-10 16:32:23.000000000 -0400 -+++ linux-2.6.24.noarch/Documentation/DocBook/Makefile 2008-03-10 16:53:16.000000000 -0400 +--- linux-2.6.24.noarch/Documentation/DocBook/Makefile.orig 2008-03-12 15:39:20.000000000 -0400 ++++ linux-2.6.24.noarch/Documentation/DocBook/Makefile 2008-03-12 15:52:22.000000000 -0400 @@ -11,7 +11,8 @@ DOCBOOKS := wanbook.xml z8530book.xml mc procfs-guide.xml writing_usb_driver.xml \ kernel-api.xml filesystems.xml lsm.xml utrace.xml usb.xml \ @@ -54494,3 +79766,38 @@ ### # The build process is as follows (targets): +diff -up linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt +--- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-03-12 15:39:21.000000000 -0400 ++++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-03-12 15:55:14.000000000 -0400 +@@ -332,31 +332,6 @@ Why: This driver has been marked obsolet + 2.4 or later kernels, provides richer features and is more robust. + Who: Stephen Hemminger + +-What: bcm43xx wireless network driver +-When: 2.6.26 +-Files: drivers/net/wireless/bcm43xx +-Why: This driver's functionality has been replaced by the +- mac80211-based b43 and b43legacy drivers. +-Who: John W. Linville +- +---------------------------- +- +-What: ieee80211 softmac wireless networking component +-When: 2.6.26 (or after removal of bcm43xx and port of zd1211rw to mac80211) +-Files: net/ieee80211/softmac +-Why: No in-kernel drivers will depend on it any longer. +-Who: John W. Linville +- +---------------------------- +- +-What: rc80211-simple rate control algorithm for mac80211 +-When: 2.6.26 +-Files: net/mac80211/rc80211-simple.c +-Why: This algorithm was provided for reference but always exhibited bad +- responsiveness and performance and has some serious flaws. It has been +- replaced by rc80211-pid. +-Who: Stefano Brivio +- + --------------------------- + + What: b43 support for firmware revision < 410 linux-2.6-wireless.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.28 -r 1.29 linux-2.6-wireless.patch Index: linux-2.6-wireless.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless.patch,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- linux-2.6-wireless.patch 11 Mar 2008 21:45:58 -0000 1.28 +++ linux-2.6-wireless.patch 12 Mar 2008 20:25:05 -0000 1.29 @@ -1,3 +1,17 @@ +commit e1a2c8702f9126bd1eaa2b0f3967931b116a735f +Author: Jan Slupski +Date: Mon Mar 10 22:41:18 2008 -0700 + + prism54: support for 124a:4025 - another version of IOGear GWU513 802.11g + + Add support to p54usb driver for apparently another version of IOGear GWU513 + 802.11g USB network card that uses GW3887IK chipset and is recognized as + "124a:4025 AirVast" by lsusb. + + Cc: Michael Wu + Signed-off-by: Andrew Morton + Signed-off-by: John W. Linville + commit 445815d7ea4f59baf103f28b45f7dd45f21ff75d Author: Ivo van Doorn Date: Sun Mar 9 22:42:32 2008 +0100 @@ -8256,8 +8270,8 @@ Signed-off-by: John W. Linville diff -up linux-2.6.24.noarch/include/linux/nl80211.h.orig linux-2.6.24.noarch/include/linux/nl80211.h ---- linux-2.6.24.noarch/include/linux/nl80211.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/nl80211.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/nl80211.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/nl80211.h 2008-03-12 15:36:36.000000000 -0400 @@ -7,6 +7,18 @@ */ @@ -8459,8 +8473,8 @@ + #endif /* __LINUX_NL80211_H */ diff -up linux-2.6.24.noarch/include/linux/wireless.h.orig linux-2.6.24.noarch/include/linux/wireless.h ---- linux-2.6.24.noarch/include/linux/wireless.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/wireless.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/wireless.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/wireless.h 2008-03-12 15:36:36.000000000 -0400 @@ -541,6 +541,16 @@ /* Maximum size of returned data */ #define IW_SCAN_MAX_DATA 4096 /* In bytes */ @@ -8489,8 +8503,8 @@ __u32 event_capa[6]; diff -up linux-2.6.24.noarch/include/linux/input.h.orig linux-2.6.24.noarch/include/linux/input.h ---- linux-2.6.24.noarch/include/linux/input.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/input.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/input.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/input.h 2008-03-12 15:36:36.000000000 -0400 @@ -371,6 +371,8 @@ struct input_absinfo { #define KEY_BRIGHTNESS_ZERO 244 /* brightness off, use ambient */ #define KEY_DISPLAY_OFF 245 /* display device to off state */ @@ -8501,8 +8515,8 @@ #define BTN_0 0x100 #define BTN_1 0x101 diff -up linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig linux-2.6.24.noarch/include/linux/mod_devicetable.h ---- linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/mod_devicetable.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/mod_devicetable.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/mod_devicetable.h 2008-03-12 15:36:36.000000000 -0400 @@ -350,7 +350,13 @@ struct sdio_device_id { struct ssb_device_id { __u16 vendor; @@ -8519,8 +8533,8 @@ #define SSB_DEVICE(_vendor, _coreid, _revision) \ { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } diff -up linux-2.6.24.noarch/include/linux/pci_ids.h.orig linux-2.6.24.noarch/include/linux/pci_ids.h ---- linux-2.6.24.noarch/include/linux/pci_ids.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/pci_ids.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/pci_ids.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/pci_ids.h 2008-03-12 15:36:36.000000000 -0400 @@ -2078,6 +2078,9 @@ #define PCI_DEVICE_ID_ALTIMA_AC9100 0x03ea #define PCI_DEVICE_ID_ALTIMA_AC1003 0x03eb @@ -8532,8 +8546,8 @@ #define PCI_VENDOR_ID_ARECA 0x17d3 diff -up linux-2.6.24.noarch/include/linux/ieee80211.h.orig linux-2.6.24.noarch/include/linux/ieee80211.h ---- linux-2.6.24.noarch/include/linux/ieee80211.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/ieee80211.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/ieee80211.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ieee80211.h 2008-03-12 15:36:36.000000000 -0400 @@ -54,6 +54,8 @@ #define IEEE80211_STYPE_ACTION 0x00D0 @@ -8764,8 +8778,8 @@ #define WLAN_CIPHER_SUITE_USE_GROUP 0x000FAC00 #define WLAN_CIPHER_SUITE_WEP40 0x000FAC01 diff -up linux-2.6.24.noarch/include/linux/rfkill.h.orig linux-2.6.24.noarch/include/linux/rfkill.h ---- linux-2.6.24.noarch/include/linux/rfkill.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/rfkill.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/rfkill.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/rfkill.h 2008-03-12 15:36:36.000000000 -0400 @@ -33,11 +33,13 @@ * RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device. * RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device. @@ -8781,8 +8795,8 @@ }; diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-03-12 15:36:36.000000000 -0400 @@ -51,9 +51,12 @@ #define SSB_CHIPCO_CAP_JTAGM 0x00400000 /* JTAG master present */ #define SSB_CHIPCO_CAP_BROM 0x00800000 /* Internal boot ROM active */ @@ -8827,8 +8841,8 @@ #ifdef CONFIG_SSB_SERIAL extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc, diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_extif.h 2008-03-12 15:36:36.000000000 -0400 @@ -171,11 +171,15 @@ extern void ssb_extif_get_clockcontrol(s extern void ssb_extif_timing_init(struct ssb_extif *extif, unsigned long ns); @@ -8862,8 +8876,8 @@ #endif /* CONFIG_SSB_DRIVER_EXTIF */ #endif /* LINUX_SSB_EXTIFCORE_H_ */ diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_regs.h 2008-03-12 15:36:36.000000000 -0400 @@ -147,6 +147,10 @@ #define SSB_IDLOW_SSBREV 0xF0000000 /* Sonics Backplane Revision code */ #define SSB_IDLOW_SSBREV_22 0x00000000 /* <= 2.2 */ @@ -8995,8 +9009,8 @@ enum { SSB_SPROM1CCODE_WORLD = 0, diff -up linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_driver_pci.h 2008-03-12 15:36:36.000000000 -0400 @@ -51,6 +51,11 @@ #define SSB_PCICORE_SBTOPCI1_MASK 0xFC000000 #define SSB_PCICORE_SBTOPCI2 0x0108 /* Backplane to PCI translation 2 (sbtopci2) */ @@ -9010,8 +9024,8 @@ /* SBtoPCIx */ #define SSB_PCICORE_SBTOPCI_MEM 0x00000000 diff -up linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig linux-2.6.24.noarch/include/linux/ssb/ssb.h ---- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/linux/ssb/ssb.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb.h 2008-03-12 15:36:36.000000000 -0400 @@ -15,22 +15,19 @@ struct pcmcia_device; struct ssb_bus; struct ssb_driver; @@ -9191,8 +9205,8 @@ diff -up /dev/null linux-2.6.24.noarch/include/linux/ssb/ssb_embedded.h ---- /dev/null 2008-03-11 08:47:01.722073547 -0400 -+++ linux-2.6.24.noarch/include/linux/ssb/ssb_embedded.h 2008-03-11 17:07:48.000000000 -0400 +--- /dev/null 2008-03-12 09:37:56.232602959 -0400 ++++ linux-2.6.24.noarch/include/linux/ssb/ssb_embedded.h 2008-03-12 15:36:36.000000000 -0400 @@ -0,0 +1,18 @@ +#ifndef LINUX_SSB_EMBEDDED_H_ +#define LINUX_SSB_EMBEDDED_H_ @@ -9213,8 +9227,8 @@ + +#endif /* LINUX_SSB_EMBEDDED_H_ */ diff -up linux-2.6.24.noarch/include/net/cfg80211.h.orig linux-2.6.24.noarch/include/net/cfg80211.h ---- linux-2.6.24.noarch/include/net/cfg80211.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/net/cfg80211.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/net/cfg80211.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/net/cfg80211.h 2008-03-12 15:36:36.000000000 -0400 @@ -49,6 +49,120 @@ extern int ieee80211_radiotap_iterator_n struct ieee80211_radiotap_iterator *iterator); @@ -9404,8 +9418,8 @@ #endif /* __NET_CFG80211_H */ diff -up linux-2.6.24.noarch/include/net/ieee80211.h.orig linux-2.6.24.noarch/include/net/ieee80211.h ---- linux-2.6.24.noarch/include/net/ieee80211.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/net/ieee80211.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/net/ieee80211.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/net/ieee80211.h 2008-03-12 15:36:36.000000000 -0400 @@ -677,7 +677,7 @@ struct ieee80211_probe_request { struct ieee80211_probe_response { @@ -9427,8 +9441,8 @@ }; diff -up linux-2.6.24.noarch/include/net/mac80211.h.orig linux-2.6.24.noarch/include/net/mac80211.h ---- linux-2.6.24.noarch/include/net/mac80211.h.orig 2008-03-11 17:07:29.000000000 -0400 -+++ linux-2.6.24.noarch/include/net/mac80211.h 2008-03-11 17:07:48.000000000 -0400 +--- linux-2.6.24.noarch/include/net/mac80211.h.orig 2008-03-12 15:36:28.000000000 -0400 ++++ linux-2.6.24.noarch/include/net/mac80211.h 2008-03-12 15:36:36.000000000 -0400 @@ -139,17 +139,54 @@ enum ieee80211_phymode { [...2846 lines suppressed...] #ifdef PRISM2_PCI @@ -129082,8 +129097,8 @@ local->hw_downloading = 1; diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-03-12 15:36:37.000000000 -0400 @@ -845,15 +845,13 @@ static struct pcmcia_device_id hostap_cs 0x4b801a17), PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", @@ -129121,8 +129136,8 @@ }; MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids); diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-03-12 15:36:37.000000000 -0400 @@ -1075,7 +1075,7 @@ static int prism2_setup_rids(struct net_ { struct hostap_interface *iface; @@ -129209,8 +129224,8 @@ goto out; } diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-03-12 15:36:37.000000000 -0400 @@ -296,7 +296,7 @@ int hostap_tx_callback_unregister(local_ int hostap_set_word(struct net_device *dev, int rid, u16 val) { @@ -129239,8 +129254,8 @@ wireless_send_event(local->dev, SIOCGIWAP, &wrqu, NULL); return ret; diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_info.c 2008-03-12 15:36:37.000000000 -0400 @@ -303,7 +303,7 @@ static void prism2_info_hostscanresults( int i, result_size, copy_len, new_count; struct hfa384x_hostscan_result *results, *prev; @@ -129279,8 +129294,8 @@ for (i = 0; i < (left < 100 ? left : 100); i++) PDEBUG2(DEBUG_EXTRA, " %02x", buf[i]); diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_80211.h 2008-03-12 15:36:37.000000000 -0400 @@ -5,52 +5,52 @@ #include @@ -129364,8 +129379,8 @@ enum { PRISM2_RX_MONITOR, PRISM2_RX_MGMT, PRISM2_RX_NON_ASSOC, diff -up linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c ---- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-03-12 15:36:37.000000000 -0400 @@ -84,7 +84,7 @@ static int prism2_get_datarates(struct n if (len < 2) return 0; @@ -129630,8 +129645,8 @@ reason = cpu_to_le16(param->u.mlme.reason_code); switch (param->u.mlme.cmd) { diff -up linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c.orig linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c ---- linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/b43_pci_bridge.c 2008-03-12 15:36:37.000000000 -0400 @@ -27,6 +27,8 @@ static const struct pci_device_id b43_pc { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) }, @@ -129642,8 +129657,8 @@ }; MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl); diff -up linux-2.6.24.noarch/drivers/ssb/Makefile.orig linux-2.6.24.noarch/drivers/ssb/Makefile ---- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/ssb/Makefile.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/Makefile 2008-03-12 15:36:37.000000000 -0400 @@ -1,5 +1,6 @@ # core ssb-y += main.o scan.o @@ -129660,8 +129675,8 @@ obj-$(CONFIG_SSB) += ssb.o diff -up linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.24.noarch/drivers/ssb/pcmcia.c ---- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/ssb/pcmcia.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/pcmcia.c 2008-03-12 15:36:37.000000000 -0400 @@ -94,7 +94,6 @@ int ssb_pcmcia_switch_core(struct ssb_bu struct ssb_device *dev) { @@ -129812,8 +129827,8 @@ } diff -up linux-2.6.24.noarch/drivers/ssb/main.c.orig linux-2.6.24.noarch/drivers/ssb/main.c ---- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/ssb/main.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/main.c 2008-03-12 15:36:37.000000000 -0400 @@ -557,6 +557,7 @@ static int ssb_fetch_invariants(struct s goto out; memcpy(&bus->boardinfo, &iv.boardinfo, sizeof(iv.boardinfo)); @@ -129857,8 +129872,8 @@ } return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23); diff -up linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig linux-2.6.24.noarch/drivers/ssb/ssb_private.h ---- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/ssb/ssb_private.h.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/ssb_private.h 2008-03-12 15:36:37.000000000 -0400 @@ -120,10 +120,10 @@ extern int ssb_devices_thaw(struct ssb_b extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev); @@ -129873,8 +129888,8 @@ { return 0; diff -up linux-2.6.24.noarch/drivers/ssb/pci.c.orig linux-2.6.24.noarch/drivers/ssb/pci.c ---- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/ssb/pci.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/pci.c 2008-03-12 15:36:37.000000000 -0400 @@ -212,29 +212,29 @@ static inline u8 ssb_crc8(u8 crc, u8 dat return t[crc ^ data]; } @@ -130320,8 +130335,8 @@ err = -EINVAL; goto out_kfree; diff -up linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c ---- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/driver_chipcommon.c 2008-03-12 15:36:37.000000000 -0400 @@ -39,12 +39,14 @@ static inline void chipco_write32(struct ssb_write32(cc->dev, offset, value); } @@ -130443,8 +130458,8 @@ else uart_regs += (i * 256); diff -up linux-2.6.24.noarch/drivers/ssb/Kconfig.orig linux-2.6.24.noarch/drivers/ssb/Kconfig ---- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/ssb/Kconfig.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/Kconfig 2008-03-12 15:36:37.000000000 -0400 @@ -35,6 +35,11 @@ config SSB_PCIHOST If unsure, say Y @@ -130471,8 +130486,8 @@ bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)" depends on SSB_DRIVER_MIPS && EXPERIMENTAL diff -up /dev/null linux-2.6.24.noarch/drivers/ssb/embedded.c ---- /dev/null 2008-03-11 08:47:01.722073547 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/embedded.c 2008-03-11 17:07:49.000000000 -0400 +--- /dev/null 2008-03-12 09:37:56.232602959 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/embedded.c 2008-03-12 15:36:37.000000000 -0400 @@ -0,0 +1,132 @@ +/* + * Sonics Silicon Backplane @@ -130607,8 +130622,8 @@ +} +EXPORT_SYMBOL(ssb_gpio_polarity); diff -up linux-2.6.24.noarch/drivers/ssb/driver_extif.c.orig linux-2.6.24.noarch/drivers/ssb/driver_extif.c ---- linux-2.6.24.noarch/drivers/ssb/driver_extif.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/driver_extif.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/ssb/driver_extif.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/driver_extif.c 2008-03-12 15:36:37.000000000 -0400 @@ -27,12 +27,14 @@ static inline void extif_write32(struct ssb_write32(extif->dev, offset, value); } @@ -130665,8 +130680,8 @@ + return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value); +} diff -up linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c ---- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/drivers/ssb/driver_pcicore.c 2008-03-12 15:36:37.000000000 -0400 @@ -11,6 +11,7 @@ #include #include @@ -130792,8 +130807,8 @@ * values. Not waiting at this point causes crashes of the machine. */ mdelay(10); diff -up linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt ---- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-03-11 17:07:30.000000000 -0400 -+++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-03-11 17:07:49.000000000 -0400 +--- linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt.orig 2008-03-12 15:36:29.000000000 -0400 ++++ linux-2.6.24.noarch/Documentation/feature-removal-schedule.txt 2008-03-12 15:36:37.000000000 -0400 @@ -332,4 +332,36 @@ Why: This driver has been marked obsolet 2.4 or later kernels, provides richer features and is more robust. Who: Stephen Hemminger From fedora-extras-commits at redhat.com Wed Mar 12 20:26:24 2008 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Wed, 12 Mar 2008 20:26:24 GMT Subject: rpms/inkscape/F-8 .cvsignore, 1.14, 1.15 inkscape-0.46pre2-icons.patch, 1.1, 1.2 inkscape.spec, 1.44, 1.45 sources, 1.14, 1.15 Message-ID: <200803122026.m2CKQOsB026928@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26842/F-8 Modified Files: .cvsignore inkscape-0.46pre2-icons.patch inkscape.spec sources Log Message: Merge from devel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-8/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 21 Feb 2008 23:37:30 -0000 1.14 +++ .cvsignore 12 Mar 2008 20:25:47 -0000 1.15 @@ -1 +1 @@ -inkscape-0.45+0.46pre2.tar.bz2 +inkscape-0.45+0.46pre3.tar.bz2 inkscape-0.46pre2-icons.patch: Index: inkscape-0.46pre2-icons.patch =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-8/inkscape-0.46pre2-icons.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- inkscape-0.46pre2-icons.patch 22 Feb 2008 08:41:48 -0000 1.1 +++ inkscape-0.46pre2-icons.patch 12 Mar 2008 20:25:47 -0000 1.2 @@ -1,246 +1,5 @@ -Small icons (r17417 and r17378). Default to small icons and Sans font. -diff -urp inkscape-0.45+0.46pre2.orig/src/dialogs/eek-preview.cpp inkscape-0.45+0.46pre2/src/dialogs/eek-preview.cpp ---- inkscape-0.45+0.46pre2.orig/src/dialogs/eek-preview.cpp 2008-02-17 05:24:01.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/dialogs/eek-preview.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -44,6 +44,9 @@ - - #define FOCUS_PROP_ID 1 - -+/* Keep in sycn with last value in eek-preview.h */ -+#define PREVIEW_SIZE_LAST PREVIEW_SIZE_HUGE -+#define PREVIEW_SIZE_NEXTFREE (PREVIEW_SIZE_HUGE + 1) - - - static void eek_preview_class_init( EekPreviewClass *klass ); -@@ -90,9 +93,41 @@ GType eek_preview_get_type(void) - return preview_type; - } - --GtkWidget* eek_preview_area_new(void) -+static gboolean setupDone = FALSE; -+static GtkRequisition sizeThings[PREVIEW_SIZE_NEXTFREE]; -+ -+void eek_preview_set_size_mappings( guint count, GtkIconSize const* sizes ) - { -- return NULL; -+ gint width = 0; -+ gint height = 0; -+ gint smallest = 512; -+ gint largest = 0; -+ guint i = 0; -+ guint delta = 0; -+ -+ for ( i = 0; i < count; ++i ) { -+ gboolean worked = gtk_icon_size_lookup( sizes[i], &width, &height ); -+ if ( worked ) { -+ if ( width < smallest ) { -+ smallest = width; -+ } -+ if ( width > largest ) { -+ largest = width; -+ } -+ } -+ } -+ -+ smallest = (smallest * 3) / 4; -+ -+ delta = largest - smallest; -+ -+ for ( i = 0; i < G_N_ELEMENTS(sizeThings); ++i ) { -+ guint val = smallest + ( (i * delta) / (G_N_ELEMENTS(sizeThings) - 1) ); -+ sizeThings[i].width = val; -+ sizeThings[i].height = val; -+ } -+ -+ setupDone = TRUE; - } - - static void eek_preview_size_request( GtkWidget* widget, GtkRequisition* req ) -@@ -100,14 +135,25 @@ static void eek_preview_size_request( Gt - gint width = 0; - gint height = 0; - EekPreview* preview = EEK_PREVIEW(widget); -- gboolean worked = gtk_icon_size_lookup( preview->_size, &width, &height ); -- if ( !worked ) { -- width = 16; -- height = 16; -+ -+ if ( !setupDone ) { -+ GtkIconSize sizes[] = { -+ GTK_ICON_SIZE_MENU, -+ GTK_ICON_SIZE_SMALL_TOOLBAR, -+ GTK_ICON_SIZE_LARGE_TOOLBAR, -+ GTK_ICON_SIZE_BUTTON, -+ GTK_ICON_SIZE_DIALOG -+ }; -+ eek_preview_set_size_mappings( G_N_ELEMENTS(sizes), sizes ); - } -+ -+ width = sizeThings[preview->_size].width; -+ height = sizeThings[preview->_size].height; -+ - if ( preview->_view == VIEW_TYPE_LIST ) { - width *= 3; - } -+ - req->width = width; - req->height = height; - } -@@ -536,10 +582,14 @@ void eek_preview_set_focus_on_click( Eek - } - } - --void eek_preview_set_details( EekPreview* preview, PreviewStyle prevstyle, ViewType view, GtkIconSize size ) -+void eek_preview_set_details( EekPreview* preview, PreviewStyle prevstyle, ViewType view, PreviewSize size ) - { - preview->_prevstyle = prevstyle; - preview->_view = view; -+ -+ if ( size > PREVIEW_SIZE_LAST ) { -+ size = PREVIEW_SIZE_LAST; -+ } - preview->_size = size; - - gtk_widget_queue_draw(GTK_WIDGET(preview)); -@@ -573,7 +623,7 @@ static void eek_preview_init( EekPreview - - preview->_prevstyle = PREVIEW_STYLE_ICON; - preview->_view = VIEW_TYPE_LIST; -- preview->_size = GTK_ICON_SIZE_BUTTON; -+ preview->_size = PREVIEW_SIZE_SMALL; - - /* - GdkColor color = {0}; -diff -urp inkscape-0.45+0.46pre2.orig/src/dialogs/eek-preview.h inkscape-0.45+0.46pre2/src/dialogs/eek-preview.h ---- inkscape-0.45+0.46pre2.orig/src/dialogs/eek-preview.h 2008-02-17 05:24:00.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/dialogs/eek-preview.h 2008-02-22 08:53:42.000000000 +0100 -@@ -20,7 +20,7 @@ - * - * The Initial Developer of the Original Code is - * Jon A. Cruz. -- * Portions created by the Initial Developer are Copyright (C) 2005 -+ * Portions created by the Initial Developer are Copyright (C) 2005-2008 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -@@ -68,6 +68,15 @@ typedef enum { - } ViewType; - - typedef enum { -+ PREVIEW_SIZE_TINY = 0, -+ PREVIEW_SIZE_SMALL, -+ PREVIEW_SIZE_MEDIUM, -+ PREVIEW_SIZE_BIG, -+ PREVIEW_SIZE_BIGGER, -+ PREVIEW_SIZE_HUGE -+} PreviewSize; -+ -+typedef enum { - PREVIEW_LINK_NONE = 0, - PREVIEW_LINK_IN = 1, - PREVIEW_LINK_OUT = 2, -@@ -93,7 +102,7 @@ struct _EekPreview - - PreviewStyle _prevstyle; - ViewType _view; -- GtkIconSize _size; -+ PreviewSize _size; - guint _linked; - }; - -@@ -108,7 +117,7 @@ struct _EekPreviewClass - GType eek_preview_get_type(void) G_GNUC_CONST; - GtkWidget* eek_preview_new(void); - --void eek_preview_set_details( EekPreview* splat, PreviewStyle prevstyle, ViewType view, GtkIconSize size ); -+void eek_preview_set_details( EekPreview* splat, PreviewStyle prevstyle, ViewType view, PreviewSize size ); - void eek_preview_set_color( EekPreview* splat, int r, int g, int b ); - - void eek_preview_set_linked( EekPreview* splat, LinkType link ); -@@ -117,6 +126,8 @@ LinkType eek_preview_get_linked( EekPrev - gboolean eek_preview_get_focus_on_click( EekPreview* preview ); - void eek_preview_set_focus_on_click( EekPreview* preview, gboolean focus_on_click ); - -+void eek_preview_set_size_mappings( guint count, GtkIconSize const* sizes ); -+ - G_END_DECLS - - -diff -urp inkscape-0.45+0.46pre2.orig/src/dialogs/swatches.cpp inkscape-0.45+0.46pre2/src/dialogs/swatches.cpp ---- inkscape-0.45+0.46pre2.orig/src/dialogs/swatches.cpp 2008-02-17 05:24:00.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/dialogs/swatches.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -503,7 +503,7 @@ void ColorItem::_colorDefChanged(void* d - } - - --Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Inkscape::IconSize size) -+Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewSize size) - { - Gtk::Widget* widget = 0; - if ( style == PREVIEW_STYLE_BLURB ) { -@@ -511,10 +511,10 @@ Gtk::Widget* ColorItem::getPreview(Previ - lbl->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER); - widget = lbl; - } else { -- Glib::ustring blank(" "); -- if ( size == Inkscape::ICON_SIZE_MENU || size == Inkscape::ICON_SIZE_DECORATION ) { -- blank = " "; -- } -+// Glib::ustring blank(" "); -+// if ( size == Inkscape::ICON_SIZE_MENU || size == Inkscape::ICON_SIZE_DECORATION ) { -+// blank = " "; -+// } - - GtkWidget* eekWidget = eek_preview_new(); - EekPreview * preview = EEK_PREVIEW(eekWidget); -@@ -522,7 +522,7 @@ Gtk::Widget* ColorItem::getPreview(Previ - - eek_preview_set_color( preview, (def.getR() << 8) | def.getR(), (def.getG() << 8) | def.getG(), (def.getB() << 8) | def.getB()); - -- eek_preview_set_details( preview, (::PreviewStyle)style, (::ViewType)view, (::GtkIconSize)size ); -+ eek_preview_set_details( preview, (::PreviewStyle)style, (::ViewType)view, (::PreviewSize)size ); - eek_preview_set_linked( preview, (LinkType)((_linkSrc ? PREVIEW_LINK_IN:0) - | (_listeners.empty() ? 0:PREVIEW_LINK_OUT) - | (_isLive ? PREVIEW_LINK_OTHER:0)) ); -diff -urp inkscape-0.45+0.46pre2.orig/src/dialogs/swatches.h inkscape-0.45+0.46pre2/src/dialogs/swatches.h ---- inkscape-0.45+0.46pre2.orig/src/dialogs/swatches.h 2008-02-17 05:24:01.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/dialogs/swatches.h 2008-02-22 08:53:42.000000000 +0100 -@@ -43,7 +43,7 @@ public: - virtual ColorItem &operator=(ColorItem const &other); - virtual Gtk::Widget* getPreview(PreviewStyle style, - ViewType view, -- Inkscape::IconSize size); -+ ::PreviewSize size); - void buttonClicked(bool secondary = false); - - ColorDef def; -diff -urp inkscape-0.45+0.46pre2.orig/src/inkscape-stock.cpp inkscape-0.45+0.46pre2/src/inkscape-stock.cpp ---- inkscape-0.45+0.46pre2.orig/src/inkscape-stock.cpp 2008-02-17 05:23:47.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/inkscape-stock.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -23,6 +23,8 @@ - - #include "gtk/gtkiconfactory.h" - -+#include "widgets/icon.h" -+#include "ui/widget/panel.h" - - void - inkscape_gtk_stock_init() { -@@ -31,6 +33,12 @@ inkscape_gtk_stock_init() { - if (stock_initialized) - return; - -+ // Ensure icon internal sizes get set up: -+ sp_icon_get_phys_size(GTK_ICON_SIZE_MENU); -+ -+ // And also prepare the swatches. -+ Inkscape::UI::Widget::Panel::prep(); -+ - GtkIconFactory *icon_factory = gtk_icon_factory_new(); - /* todo: Should we simply remove this file now that we're no longer - * calling gtk_icon_factory_add here? */ diff -urp inkscape-0.45+0.46pre2.orig/src/preferences-skeleton.h inkscape-0.45+0.46pre2/src/preferences-skeleton.h --- inkscape-0.45+0.46pre2.orig/src/preferences-skeleton.h 2008-02-17 05:24:14.000000000 +0100 +++ inkscape-0.45+0.46pre2/src/preferences-skeleton.h 2008-02-22 09:34:12.000000000 +0100 @@ -262,287 +21,3 @@ " \n" "\n" " --#include "icon-size.h" -+#include "../dialogs/eek-preview.h" - - namespace Inkscape { - namespace UI { -@@ -40,7 +40,7 @@ class Previewable - public: - // TODO need to add some nice parameters - virtual ~Previewable() {} -- virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, Inkscape::IconSize size ) = 0; -+ virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, ::PreviewSize size ) = 0; - }; - - -diff -urp inkscape-0.45+0.46pre2.orig/src/ui/previewfillable.h inkscape-0.45+0.46pre2/src/ui/previewfillable.h ---- inkscape-0.45+0.46pre2.orig/src/ui/previewfillable.h 2008-02-17 05:24:52.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/ui/previewfillable.h 2008-02-22 08:53:42.000000000 +0100 -@@ -14,7 +14,7 @@ - - - #include "previewable.h" --#include "../icon-size.h" -+#include "../dialogs/eek-preview.h" - - namespace Inkscape { - namespace UI { -@@ -27,9 +27,9 @@ public: - virtual void addPreview( Previewable* preview ) = 0; - virtual void freezeUpdates() = 0; - virtual void thawUpdates() = 0; -- virtual void setStyle( Inkscape::IconSize size, ViewType type) = 0; -+ virtual void setStyle( ::PreviewSize size, ViewType type) = 0; - virtual void setOrientation( Gtk::AnchorType how ) = 0; -- virtual Inkscape::IconSize getPreviewSize() const = 0; -+ virtual ::PreviewSize getPreviewSize() const = 0; - virtual ViewType getPreviewType() const = 0; - virtual void setWrap( bool b ) = 0; - virtual bool getWrap() const = 0; -diff -urp inkscape-0.45+0.46pre2.orig/src/ui/previewholder.cpp inkscape-0.45+0.46pre2/src/ui/previewholder.cpp ---- inkscape-0.45+0.46pre2.orig/src/ui/previewholder.cpp 2008-02-17 05:24:52.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/ui/previewholder.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -35,7 +35,7 @@ PreviewHolder::PreviewHolder() : - _prefCols(0), - _updatesFrozen(false), - _anchor(Gtk::ANCHOR_CENTER), -- _baseSize(Inkscape::ICON_SIZE_MENU), -+ _baseSize(PREVIEW_SIZE_SMALL), - _view(VIEW_TYPE_LIST), - _wrap(false) - { -@@ -124,7 +124,7 @@ void PreviewHolder::thawUpdates() - rebuildUI(); - } - --void PreviewHolder::setStyle( Inkscape::IconSize size, ViewType view ) -+void PreviewHolder::setStyle( ::PreviewSize size, ViewType view ) - { - if ( size != _baseSize || view != _view ) { - _baseSize = size; -@@ -238,7 +238,7 @@ void PreviewHolder::calcGridSize( const - width = w2; - } - } else { -- width = (_baseSize == Inkscape::ICON_SIZE_MENU || _baseSize == Inkscape::ICON_SIZE_DECORATION) ? COLUMNS_FOR_SMALL : COLUMNS_FOR_LARGE; -+ width = (_baseSize == PREVIEW_SIZE_SMALL || _baseSize == PREVIEW_SIZE_TINY) ? COLUMNS_FOR_SMALL : COLUMNS_FOR_LARGE; - if ( _prefCols > 0 ) { - width = _prefCols; - } -diff -urp inkscape-0.45+0.46pre2.orig/src/ui/previewholder.h inkscape-0.45+0.46pre2/src/ui/previewholder.h ---- inkscape-0.45+0.46pre2.orig/src/ui/previewholder.h 2008-02-17 05:24:52.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/ui/previewholder.h 2008-02-22 08:53:42.000000000 +0100 -@@ -17,7 +17,7 @@ - #include - #include - #include "previewfillable.h" --#include "../icon-size.h" -+#include "../dialogs/eek-preview.h" - - namespace Inkscape { - namespace UI { -@@ -32,11 +32,11 @@ public: - virtual void addPreview( Previewable* preview ); - virtual void freezeUpdates(); - virtual void thawUpdates(); -- virtual void setStyle( Inkscape::IconSize size, ViewType view ); -+ virtual void setStyle( ::PreviewSize size, ViewType view ); - virtual void setOrientation( Gtk::AnchorType how ); - virtual int getColumnPref() const { return _prefCols; } - virtual void setColumnPref( int cols ); -- virtual Inkscape::IconSize getPreviewSize() const { return _baseSize; } -+ virtual ::PreviewSize getPreviewSize() const { return _baseSize; } - virtual ViewType getPreviewType() const { return _view; } - virtual void setWrap( bool b ); - virtual bool getWrap() const { return _wrap; } -@@ -56,7 +56,7 @@ private: - int _prefCols; - bool _updatesFrozen; - Gtk::AnchorType _anchor; -- Inkscape::IconSize _baseSize; -+ ::PreviewSize _baseSize; - ViewType _view; - bool _wrap; - }; -diff -urp inkscape-0.45+0.46pre2.orig/src/ui/widget/panel.cpp inkscape-0.45+0.46pre2/src/ui/widget/panel.cpp ---- inkscape-0.45+0.46pre2.orig/src/ui/widget/panel.cpp 2008-02-17 05:24:46.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/ui/widget/panel.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -27,6 +27,7 @@ - #include "prefs-utils.h" - #include "desktop-handles.h" - #include "inkscape.h" -+#include "dialogs/eek-preview.h" - - namespace Inkscape { - namespace UI { -@@ -37,6 +38,19 @@ static const int PANEL_SETTING_MODE = 1; - static const int PANEL_SETTING_WRAP = 2; - static const int PANEL_SETTING_NEXTFREE = 3; - -+ -+void Panel::prep() { -+ GtkIconSize sizes[] = { -+ static_cast(Inkscape::ICON_SIZE_DECORATION), -+ GTK_ICON_SIZE_MENU, -+ GTK_ICON_SIZE_SMALL_TOOLBAR, -+ GTK_ICON_SIZE_BUTTON, -+ GTK_ICON_SIZE_DND, // Not used by options, but included to make the last size larger -+ GTK_ICON_SIZE_DIALOG -+ }; -+ eek_preview_set_size_mappings( G_N_ELEMENTS(sizes), sizes ); -+} -+ - /** - * Construct a Panel - */ -@@ -79,7 +93,7 @@ void Panel::_init() - - guint panel_size = 0; - if (_prefs_path) { -- panel_size = prefs_get_int_attribute_limited( _prefs_path, "panel_size", 1, 0, 10 ); -+ panel_size = prefs_get_int_attribute_limited( _prefs_path, "panel_size", 1, 0, static_cast(PREVIEW_SIZE_HUGE) ); - } - - guint panel_mode = 0; -@@ -257,7 +271,7 @@ void Panel::restorePanelPrefs() - { - guint panel_size = 0; - if (_prefs_path) { -- panel_size = prefs_get_int_attribute_limited(_prefs_path, "panel_size", 1, 0, 10); -+ panel_size = prefs_get_int_attribute_limited(_prefs_path, "panel_size", 1, 0, static_cast(PREVIEW_SIZE_HUGE)); - } - guint panel_mode = 0; - if (_prefs_path) { -@@ -297,27 +311,27 @@ void Panel::_bounceCall(int i, int j) - switch (j) { - case 0: - { -- _fillable->setStyle(Inkscape::ICON_SIZE_DECORATION, curr_type); -+ _fillable->setStyle(::PREVIEW_SIZE_TINY, curr_type); - } - break; - case 1: - { -- _fillable->setStyle(Inkscape::ICON_SIZE_MENU, curr_type); -+ _fillable->setStyle(::PREVIEW_SIZE_SMALL, curr_type); - } - break; - case 2: - { -- _fillable->setStyle(Inkscape::ICON_SIZE_SMALL_TOOLBAR, curr_type); -+ _fillable->setStyle(::PREVIEW_SIZE_MEDIUM, curr_type); - } - break; - case 3: - { -- _fillable->setStyle(Inkscape::ICON_SIZE_BUTTON, curr_type); -+ _fillable->setStyle(::PREVIEW_SIZE_BIG, curr_type); - } - break; - case 4: - { -- _fillable->setStyle(Inkscape::ICON_SIZE_DIALOG, curr_type); -+ _fillable->setStyle(::PREVIEW_SIZE_HUGE, curr_type); - } - break; - default: -@@ -330,7 +344,7 @@ void Panel::_bounceCall(int i, int j) - prefs_set_int_attribute (_prefs_path, "panel_mode", j); - } - if (_fillable) { -- Inkscape::IconSize curr_size = _fillable->getPreviewSize(); -+ ::PreviewSize curr_size = _fillable->getPreviewSize(); - switch (j) { - case 0: - { -diff -urp inkscape-0.45+0.46pre2.orig/src/ui/widget/panel.h inkscape-0.45+0.46pre2/src/ui/widget/panel.h ---- inkscape-0.45+0.46pre2.orig/src/ui/widget/panel.h 2008-02-17 05:24:48.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/ui/widget/panel.h 2008-02-22 08:53:42.000000000 +0100 -@@ -38,8 +38,10 @@ namespace Widget { - class Panel : public Gtk::VBox { - - public: -+ static void prep(); -+ - virtual ~Panel(); -- Panel(Glib::ustring const &label = "", gchar const *prefs_path = 0, -+ Panel(Glib::ustring const &label = "", gchar const *prefs_path = 0, - int verb_num = 0, Glib::ustring const &apply_label = "", - bool menu_desired = false); - -@@ -57,7 +59,7 @@ public: - - virtual void setDesktop(SPDesktop *desktop); - SPDesktop *getDesktop() { return _desktop; } -- -+ - /** Signal accessors */ - virtual sigc::signal &signalResponse(); - virtual sigc::signal &signalPresent(); -diff -urp inkscape-0.45+0.46pre2.orig/src/widgets/icon.cpp inkscape-0.45+0.46pre2/src/widgets/icon.cpp ---- inkscape-0.45+0.46pre2.orig/src/widgets/icon.cpp 2008-02-17 05:24:21.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/widgets/icon.cpp 2008-02-22 08:53:42.000000000 +0100 -@@ -59,8 +59,6 @@ static guchar *sp_icon_image_load_svg(gc - - static guchar *sp_icon_image_load(SPIcon *icon, gchar const *name); - --static int sp_icon_get_phys_size(int size); -- - static void sp_icon_overlay_pixels( guchar *px, int width, int height, int stride, - unsigned r, unsigned g, unsigned b ); - -@@ -397,7 +395,7 @@ static void injectCustomSize() - - } - --static int sp_icon_get_phys_size(int size) -+int sp_icon_get_phys_size(int size) - { - static bool init = false; - static int lastSys[Inkscape::ICON_SIZE_DECORATION + 1]; -@@ -542,7 +540,7 @@ static void sp_icon_paint(SPIcon *icon, - } - - static guchar * --sp_icon_image_load_pixmap(gchar const *name, unsigned lsize, unsigned psize) -+sp_icon_image_load_pixmap(gchar const *name, unsigned /*lsize*/, unsigned psize) - { - gchar *path; - guchar *px; -@@ -762,7 +760,7 @@ static guchar *get_cached_pixels(Glib::u - } - - static guchar *load_svg_pixels(gchar const *name, -- unsigned lsize, unsigned psize) -+ unsigned /*lsize*/, unsigned psize) - { - SPDocument *doc = NULL; - NRArenaItem *root = NULL; -@@ -949,7 +947,7 @@ static void addPreRender( Inkscape::Icon - pendingRenders.push(preRenderItem(lsize, name)); - } - --gboolean icon_prerender_task(gpointer data) { -+gboolean icon_prerender_task(gpointer /*data*/) { - if (!pendingRenders.empty()) { - preRenderItem single=pendingRenders.front(); - pendingRenders.pop(); -diff -urp inkscape-0.45+0.46pre2.orig/src/widgets/icon.h inkscape-0.45+0.46pre2/src/widgets/icon.h ---- inkscape-0.45+0.46pre2.orig/src/widgets/icon.h 2008-02-17 05:24:22.000000000 +0100 -+++ inkscape-0.45+0.46pre2/src/widgets/icon.h 2008-02-22 08:53:42.000000000 +0100 -@@ -48,5 +48,7 @@ GtkWidget *sp_icon_new( Inkscape::IconSi - Gtk::Widget *sp_icon_get_icon( const Glib::ustring &oid, Inkscape::IconSize size = Inkscape::ICON_SIZE_BUTTON ); - - void sp_icon_fetch_pixbuf( SPIcon *icon ); -+int sp_icon_get_phys_size(int size); -+ - - #endif // SEEN_SP_ICON_H Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-8/inkscape.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- inkscape.spec 22 Feb 2008 08:41:48 -0000 1.44 +++ inkscape.spec 12 Mar 2008 20:25:47 -0000 1.45 @@ -1,12 +1,12 @@ Name: inkscape Version: 0.46 -Release: 0.2.pre2%{?dist} +Release: 0.2.pre3%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ -Source0: http://download.sourceforge.net/inkscape/inkscape-0.45+0.46pre2.tar.bz2 +Source0: http://download.sourceforge.net/inkscape/inkscape-0.45+0.46pre3.tar.bz2 Patch0: inkscape-16571-cxxinclude.patch Patch1: inkscape-0.45.1-desktop.patch Patch2: inkscape-0.46pre2-icons.patch @@ -61,7 +61,7 @@ %prep -%setup -q -n %{name}-0.45+0.46pre2 +%setup -q -n %{name}-0.45+0.46pre3 %patch0 -p1 -b .cxxinclude %patch1 -p1 -b .desktop %patch2 -p1 -b .icons @@ -124,6 +124,9 @@ %changelog +* Wed Mar 12 2008 Lubomir Kundrak - 0.46-0.2.pre3 +- Probably last prerelease? + * Fri Feb 22 2008 Lubomir Kundrak - 0.46-0.2.pre2 - Panel icon sizes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-8/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 21 Feb 2008 23:37:30 -0000 1.14 +++ sources 12 Mar 2008 20:25:47 -0000 1.15 @@ -1 +1 @@ -b08fd4821c9f44fdab1b2d7ca4e9531d inkscape-0.45+0.46pre2.tar.bz2 +0daed93fbf24da295499d844b54be621 inkscape-0.45+0.46pre3.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 20:30:19 2008 From: fedora-extras-commits at redhat.com (Casey Dahlin (sadmac)) Date: Wed, 12 Mar 2008 20:30:19 GMT Subject: rpms/upstart/devel upstart.spec,1.10,1.11 Message-ID: <200803122030.m2CKUJBx027148@cvs-int.fedora.redhat.com> Author: sadmac Update of /cvs/pkgs/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27109 Modified Files: upstart.spec Log Message: add noreplace to logd job Index: upstart.spec =================================================================== RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- upstart.spec 12 Mar 2008 16:59:43 -0000 1.10 +++ upstart.spec 12 Mar 2008 20:29:44 -0000 1.11 @@ -1,6 +1,6 @@ Name: upstart Version: 0.3.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: An event-driven init system Group: System Environment/Base @@ -60,7 +60,7 @@ %doc TODO %doc HACKING %{_sysconfdir}/event.d/ -%{_sysconfdir}/event.d/logd +%config(noreplace) %{_sysconfdir}/event.d/logd /sbin/halt /sbin/init /sbin/initctl @@ -87,6 +87,9 @@ %{_mandir}/man8/telinit.8.gz %changelog +* Wed Mar 13 2008 Casey Dahlin - 0.3.9-11 +- Make logd a noreplace + * Wed Mar 13 2008 Casey Dahlin - 0.3.9-10 - Add patch to ignore .rpm{new,save} files From fedora-extras-commits at redhat.com Wed Mar 12 20:31:57 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Wed, 12 Mar 2008 20:31:57 GMT Subject: rpms/glade3/F-7 .cvsignore, 1.4, 1.5 glade3.spec, 1.12, 1.13 sources, 1.4, 1.5 glade3-3.4.3-desktop.patch, 1.1, NONE Message-ID: <200803122031.m2CKVvGJ027273@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27160 Modified Files: .cvsignore glade3.spec sources Removed Files: glade3-3.4.3-desktop.patch Log Message: Reverted to 3.4.1-5 in F-7. No more updates for F-7. Modified Files: .cvsignore glade3.spec sources Removed Files: glade3-3.4.3-desktop.patch Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-7/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Mar 2008 20:06:44 -0000 1.4 +++ .cvsignore 12 Mar 2008 20:31:21 -0000 1.5 @@ -1 +1 @@ -glade3-3.4.3.tar.gz +glade3-3.4.1.tar.gz Index: glade3.spec =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-7/glade3.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- glade3.spec 12 Mar 2008 20:06:44 -0000 1.12 +++ glade3.spec 12 Mar 2008 20:31:21 -0000 1.13 @@ -5,8 +5,8 @@ Summary: User Interface Designer for GTK+ and GNOME Name: glade3 -Version: 3.4.3 -Release: 1%{?dist} +Version: 3.4.1 +Release: 5%{?dist} License: GPLv2+ Group: Development/Tools URL: http://glade.gnome.org/ @@ -190,9 +190,6 @@ %{_includedir}/libgladeui-1.0/gladeui/* %changelog -* Wed Mar 12 2008 Debarshi Ray - 3.4.3-1 -- Version bump to 3.4.3. - * Sun Mar 02 2008 Debarshi Ray - 3.4.1-5 - Removed 'BuildRequires: gtk-doc' from all distributions, except Fedora 7. - Added 'Requires: gtk-doc' for glade3-libgladeui-devel. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glade3/F-7/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Mar 2008 20:06:44 -0000 1.4 +++ sources 12 Mar 2008 20:31:21 -0000 1.5 @@ -1 +1 @@ -18653c56cc5d618e2f790c4b8124efa2 glade3-3.4.3.tar.gz +099b85a22c64e59983bcd6afda46149c glade3-3.4.1.tar.gz --- glade3-3.4.3-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 20:32:10 2008 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 12 Mar 2008 20:32:10 GMT Subject: rpms/NetworkManager/devel NetworkManager.spec,1.201,1.202 Message-ID: <200803122032.m2CKWAV2027278@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27245 Modified Files: NetworkManager.spec Log Message: Update for split ppp-devel package Index: NetworkManager.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- NetworkManager.spec 12 Mar 2008 20:13:43 -0000 1.201 +++ NetworkManager.spec 12 Mar 2008 20:31:34 -0000 1.202 @@ -37,6 +37,7 @@ Requires: wpa_supplicant >= 0.5.7-21 Requires: libnl >= %{libnl_version} Requires: %{name}-glib = %{epoch}:%{version}-%{release} +Requires: ppp >= 2.4.4 Obsoletes: dhcdbd BuildRequires: dbus-devel >= %{dbus_version} @@ -57,7 +58,7 @@ BuildRequires: libnotify-devel >= 0.3 BuildRequires: perl(XML::Parser) BuildRequires: automake autoconf intltool libtool -BuildRequires: ppp >= 2.4.4 +BuildRequires: ppp-devel >= 2.4.4 BuildRequires: nss-devel >= 3.11.7 %description From fedora-extras-commits at redhat.com Wed Mar 12 20:35:14 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Wed, 12 Mar 2008 20:35:14 GMT Subject: rpms/glade3/F-8 glade3-3.4.1-desktop.patch,1.1,NONE Message-ID: <200803122035.m2CKZEfI027369@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27360 Removed Files: glade3-3.4.1-desktop.patch Log Message: Removed unused patch from F-8. Removed Files: glade3-3.4.1-desktop.patch --- glade3-3.4.1-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 20:36:03 2008 From: fedora-extras-commits at redhat.com (Debarshi Ray (rishi)) Date: Wed, 12 Mar 2008 20:36:03 GMT Subject: rpms/glade3/devel glade3-3.4.1-desktop.patch,1.1,NONE Message-ID: <200803122036.m2CKa3iX027404@cvs-int.fedora.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/glade3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27391 Removed Files: glade3-3.4.1-desktop.patch Log Message: Removed unused patch from devel. Removed Files: glade3-3.4.1-desktop.patch --- glade3-3.4.1-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 20:48:45 2008 From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess)) Date: Wed, 12 Mar 2008 20:48:45 GMT Subject: rpms/gnome-media/devel gnome-media.spec,1.127,1.128 Message-ID: <200803122048.m2CKmjpn027640@cvs-int.fedora.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-media/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27612 Modified Files: gnome-media.spec Log Message: * Wed Mar 12 2008 - Bastien Nocera - 2.22.0-2 - Remove ExcludeArch for ppc/ppc64 Index: gnome-media.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- gnome-media.spec 11 Mar 2008 03:59:38 -0000 1.127 +++ gnome-media.spec 12 Mar 2008 20:48:09 -0000 1.128 @@ -12,7 +12,7 @@ Summary: GNOME media programs Name: gnome-media Version: 2.22.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and GFDL+ Group: Applications/Multimedia Source: http://download.gnome.org/sources/gnome-media/2.22/gnome-media-%{version}.tar.bz2 @@ -23,9 +23,6 @@ URL: http://www.gnome.org ExcludeArch: s390 s390x -# See bug 435771 -ExcludeArch: ppc ppc64 - Requires(post): scrollkeeper >= 0.1.4 Requires(postun): scrollkeeper >= 0.1.4 Requires(post): GConf2 >= 2.14 @@ -199,6 +196,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Mar 12 2008 - Bastien Nocera - 2.22.0-2 +- Remove ExcludeArch for ppc/ppc64 + * Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 - Update to 2.22.0 From fedora-extras-commits at redhat.com Wed Mar 12 20:52:44 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 12 Mar 2008 20:52:44 GMT Subject: rpms/lm_sensors/devel lm_sensors-3.0.1-lsb-retcodes.patch, 1.1, 1.2 lm_sensors.spec, 1.62, 1.63 Message-ID: <200803122052.m2CKqiGT027821@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lm_sensors/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27796 Modified Files: lm_sensors-3.0.1-lsb-retcodes.patch lm_sensors.spec Log Message: * Wed Mar 12 2008 Hans de Goede 3.0.1-4 - One (last) minor cosmetical fix to the initscript lm_sensors-3.0.1-lsb-retcodes.patch: Index: lm_sensors-3.0.1-lsb-retcodes.patch =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors-3.0.1-lsb-retcodes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lm_sensors-3.0.1-lsb-retcodes.patch 26 Feb 2008 14:09:27 -0000 1.1 +++ lm_sensors-3.0.1-lsb-retcodes.patch 12 Mar 2008 20:52:38 -0000 1.2 @@ -52,7 +52,7 @@ + # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have + # support for sensors. + if ! [ -e /proc/sys/dev/sensors ]; then -+ echo -n "Starting $prog: kernel does not have sensors support" ++ echo -n "$1 $prog: kernel does not have sensors support" + echo_failure + echo + exit 5 @@ -64,7 +64,7 @@ + + CONFIG=/etc/sysconfig/lm_sensors + if ! [ -r "$CONFIG" ] || ! grep '^MODULE_' $CONFIG >/dev/null 2>&1; then -+ echo -n "Starting $prog: not configured, run sensors-detect" ++ echo -n "$1 $prog: not configured, run sensors-detect" + echo_warning + echo + exit 6 @@ -75,7 +75,7 @@ +} + start() { -+ check_sensors ++ check_sensors "Starting" + echo -n "Starting $prog: loading module " @@ -84,7 +84,7 @@ } stop() { -+ check_sensors ++ check_sensors "Stopping" + echo -n "Stopping $prog: " Index: lm_sensors.spec =================================================================== RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- lm_sensors.spec 26 Feb 2008 14:09:27 -0000 1.62 +++ lm_sensors.spec 12 Mar 2008 20:52:38 -0000 1.63 @@ -1,6 +1,6 @@ Name: lm_sensors Version: 3.0.1 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.lm-sensors.org/ Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2 Source1: lm_sensors.sysconfig @@ -167,6 +167,9 @@ %changelog +* Wed Mar 12 2008 Hans de Goede 3.0.1-4 +- One (last) minor cosmetical fix to the initscript + * Tue Feb 26 2008 Hans de Goede 3.0.1-3 - Some improvements to the lsb-retcodes and service-default-off patches from a review by upstream From fedora-extras-commits at redhat.com Wed Mar 12 21:16:43 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 21:16:43 GMT Subject: rpms/sugar-toolkit/devel sugar-toolkit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803122116.m2CLGhSv001998@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/sugar-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1936/devel Modified Files: .cvsignore sources Added Files: sugar-toolkit.spec Log Message: Import from F-8 branch --- NEW FILE sugar-toolkit.spec --- %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Summary: Sugar toolkit Name: sugar-toolkit Version: 0.79.0 Release: 2%{?dist} URL: http://wiki.laptop.org/go/Sugar Source0: http://dev.laptop.org/pub/sugar/source/%{name}/%{name}-%{version}.tar.bz2 License: LGPLv2 Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig BuildRequires: pygtk2-devel BuildRequires: gettext BuildRequires: gtk2-devel BuildRequires: perl-XML-Parser Requires: gnome-python2-rsvg Requires: dbus-python Requires: pygtk2 Requires: hippo-canvas-python Requires: sugar-datastore Requires: sugar-base Requires: sugar-presence-service %description Sugar is the core of the OLPC Human Interface. The toolkit provides a set of widgets to build HIG compliant applications and interfaces to interact with system services like presence and the datastore. %prep %setup -q %build %configure make %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING README %{python_sitelib}/* %changelog * Fri Feb 8 2008 Marco Pesenti Gritti - 0.79.0-2 - Fix source reference * Wed Feb 6 2008 Marco Pesenti Gritti - 0.79.0-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Feb 2008 18:21:41 -0000 1.1 +++ .cvsignore 12 Mar 2008 21:16:07 -0000 1.2 @@ -0,0 +1 @@ +sugar-toolkit-0.79.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Feb 2008 18:21:41 -0000 1.1 +++ sources 12 Mar 2008 21:16:07 -0000 1.2 @@ -0,0 +1 @@ +73bdb8353e5c1d3c0e167f5044f67c11 sugar-toolkit-0.79.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 21:17:53 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 12 Mar 2008 21:17:53 GMT Subject: rpms/rpy/F-7 rpy-0.4.6-FHSinclude.patch, NONE, 1.1 rpy.spec, 1.25, 1.26 Message-ID: <200803122117.m2CLHrtM002150@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/rpy/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2040/F-7 Modified Files: rpy.spec Added Files: rpy-0.4.6-FHSinclude.patch Log Message: updates for R 2.6.2 rebuild rpy-0.4.6-FHSinclude.patch: --- NEW FILE rpy-0.4.6-FHSinclude.patch --- diff -up rpy-0.4.6/setup.py.BAD rpy-0.4.6/setup.py --- rpy-0.4.6/setup.py.BAD 2008-03-12 17:13:08.000000000 -0400 +++ rpy-0.4.6/setup.py 2008-03-12 17:13:35.000000000 -0400 @@ -123,7 +123,7 @@ for RHOME in RHOMES: source_files = source_files + ["src/setenv.c"] else: # unix-like systems, this is known to work for Linux and Solaris include_dirs = [ os.path.join(RHOME.strip(), 'include'), - 'src' ] + 'src', '/usr/share/R/include', "/usr/include/R/" ] libraries=['R','Rlapack'] library_dirs = r_libs runtime_libs = r_libs Index: rpy.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpy/F-7/rpy.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- rpy.spec 8 Jan 2008 00:26:31 -0000 1.25 +++ rpy.spec 12 Mar 2008 21:17:16 -0000 1.26 @@ -3,19 +3,20 @@ Name: rpy Summary: Python interface to the R language Version: 0.4.6 -Release: 23%{?dist} +Release: 24%{?dist} Url: http://rpy.sourceforge.net Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz Patch1: rpy-install-info.patch Patch2: rpy-rversion.patch +Patch3: rpy-0.4.6-FHSinclude.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: R-devel = 2.6.1, python-numeric, python-devel, texinfo, tetex +BuildRequires: R-devel = 2.6.2, python-numeric, python-devel, texinfo, tetex Requires: python-numeric -Requires: R = 2.6.1 +Requires: R = 2.6.2 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -29,6 +30,7 @@ %setup %patch1 -p1 -b .install-info %patch2 -p1 +%patch3 -p1 %build env CFLAGS="$RPM_OPT_FLAGS" python setup.py build @@ -67,6 +69,9 @@ %changelog +* Wed Mar 12 2008 Tom "spot" Callaway 0.4.6-24 +- rebuild against R 2.6.2 (new includes path) + * Mon Jan 7 2008 Alex Lancaster - 0.4.6-23 - BuildRequires: R-devel rather than just R From fedora-extras-commits at redhat.com Wed Mar 12 21:18:04 2008 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 12 Mar 2008 21:18:04 GMT Subject: rpms/rpy/F-8 rpy.spec,1.25,1.26 Message-ID: <200803122118.m2CLI42g002157@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/pkgs/rpms/rpy/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2040/F-8 Modified Files: rpy.spec Log Message: updates for R 2.6.2 rebuild Index: rpy.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpy/F-8/rpy.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- rpy.spec 4 Feb 2008 15:41:57 -0000 1.25 +++ rpy.spec 12 Mar 2008 21:17:23 -0000 1.26 @@ -1,10 +1,10 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define rver 2.6.1 +%define rver 2.6.2 Name: rpy Summary: Python interface to the R language Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Url: http://rpy.sourceforge.net Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.gz License: GPLv2+ @@ -68,6 +68,9 @@ %changelog +* Wed Mar 10 2008 Tom "spot" Callaway - 1.0.1-3 +- rebuild for R-2.6.2 + * Mon Feb 4 2008 Jos?? Matos - 1.0.1-2 - Sometimes _patch_'s guesses are not good enough. Redo patch to setup.py. From fedora-extras-commits at redhat.com Wed Mar 12 21:23:28 2008 From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim)) Date: Wed, 12 Mar 2008 21:23:28 GMT Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.8,1.9 Message-ID: <200803122123.m2CLNSxn002334@cvs-int.fedora.redhat.com> Author: fitzsim Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2286 Modified Files: java-1.6.0-openjdk.spec Log Message: * Wed Mar 12 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.4.b06 - Add FIXME about versionless SONAMEs. Index: java-1.6.0-openjdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- java-1.6.0-openjdk.spec 12 Mar 2008 13:53:55 -0000 1.8 +++ java-1.6.0-openjdk.spec 12 Mar 2008 21:22:52 -0000 1.9 @@ -101,7 +101,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.3.%{openjdkver}%{?dist} +Release: 0.4.%{openjdkver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -443,7 +443,6 @@ iconv -f ISO_8859-1 -t UTF8 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/THIRD_PARTY_README \ -o $RPM_BUILD_ROOT%{_javadocdir}/%{name}/THIRD_PARTY_README - # Find JRE directories. find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \ | grep -v jre/lib/security \ @@ -460,6 +459,10 @@ $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample -type d \ | sed 's|'$RPM_BUILD_ROOT'|%dir |' \ > %{name}-demo.files + +# FIXME: remove SONAME entries from demo DSOs. See +# https://bugzilla.redhat.com/show_bug.cgi?id=436497 + # Find non-documentation demo files. find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \ $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample \ @@ -782,6 +785,9 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Wed Mar 12 2008 Thomas Fitzsimmons - 1:1.6.0.0-0.4.b06 +- Add FIXME about versionless SONAMEs. + * Wed Mar 12 2008 Lillian Angel - 1:1.6.0.0-0.3.b06 - Updated release. - Updated mauvedate to 2008-03-11. From fedora-extras-commits at redhat.com Wed Mar 12 21:23:49 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 21:23:49 GMT Subject: rpms/sugar-datastore/devel sugar-datastore.spec,1.3,1.4 Message-ID: <200803122123.m2CLNnlW002341@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/sugar-datastore/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2314/devel Modified Files: sugar-datastore.spec Log Message: Resync with F-8 Index: sugar-datastore.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sugar-datastore.spec 14 Dec 2007 01:23:18 -0000 1.3 +++ sugar-datastore.spec 12 Mar 2008 21:23:13 -0000 1.4 @@ -2,7 +2,7 @@ Name: sugar-datastore Version: 0.6.0 -Release: 1 +Release: 1%{?dist} Summary: Sugar Datastore Group: Development/Libraries From fedora-extras-commits at redhat.com Wed Mar 12 21:29:05 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 21:29:05 GMT Subject: rpms/sugar-artwork/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sugar-artwork.spec, 1.3, 1.4 Message-ID: <200803122129.m2CLT5IZ002552@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/sugar-artwork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2521/devel Modified Files: .cvsignore sources sugar-artwork.spec Log Message: Resync with F-8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Dec 2007 01:14:36 -0000 1.2 +++ .cvsignore 12 Mar 2008 21:28:27 -0000 1.3 @@ -1 +1 @@ -sugar-artwork-0.34-git0763fefc48.tar.bz2 +sugar-artwork-0.79.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Dec 2007 01:14:36 -0000 1.2 +++ sources 12 Mar 2008 21:28:27 -0000 1.3 @@ -1 +1 @@ -4c50f644654e421fa9fcc3556296d528 sugar-artwork-0.34-git0763fefc48.tar.bz2 +7b8f1d3ae8e1acffadfecbd5181ea7ce sugar-artwork-0.79.0.tar.bz2 Index: sugar-artwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sugar-artwork.spec 19 Feb 2008 15:20:11 -0000 1.3 +++ sugar-artwork.spec 12 Mar 2008 21:28:27 -0000 1.4 @@ -1,15 +1,9 @@ -%define alphatag 20071102git -%define commitid 0763fefc48 - Summary: Artwork for Sugar look-and-feel Name: sugar-artwork -Version: 0.34 -Release: 0.34.%{alphatag}.%{commitid}%{?dist} +Version: 0.79.0 +Release: 1 URL: http://dev.laptop.org -# git clone git://dev.laptop.org/artwork -# cd artwork -# git-checkout %{alphatag} -Source0: %{name}-%{version}-git%{commitid}.tar.bz2 +Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 Group: User Interface/Desktops License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,8 +53,8 @@ %{_libdir}/gtk-2.0/*/engines/*.so %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 0.34-0.34.20071102git.0763fefc48 -- Autorebuild for GCC 4.3 +* Sat Feb 9 2008 Marco Pesenti Gritti - 0.79.0-1 +- Update to 0.79.0 * Fri Nov 02 2007 Marco Pesenti Gritti - 0.34-0.33.20071102git0763fefc48 - #4610 Prevent a division by zero while making icons insensitive. (benzea) From fedora-extras-commits at redhat.com Wed Mar 12 21:31:00 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 21:31:00 GMT Subject: rpms/sugar-artwork/devel sugar-artwork.spec,1.4,1.5 Message-ID: <200803122131.m2CLV0u1002644@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/sugar-artwork/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2619 Modified Files: sugar-artwork.spec Log Message: Add dist tag Index: sugar-artwork.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sugar-artwork.spec 12 Mar 2008 21:28:27 -0000 1.4 +++ sugar-artwork.spec 12 Mar 2008 21:30:25 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Artwork for Sugar look-and-feel Name: sugar-artwork Version: 0.79.0 -Release: 1 +Release: 1%{?dist} URL: http://dev.laptop.org Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 Group: User Interface/Desktops From fedora-extras-commits at redhat.com Wed Mar 12 21:34:06 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 21:34:06 GMT Subject: rpms/sugar-base/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sugar-base.spec, 1.3, 1.4 Message-ID: <200803122134.m2CLY69v002781@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/sugar-base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2757/devel Modified Files: .cvsignore sources sugar-base.spec Log Message: Resync with F-8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Dec 2007 23:39:02 -0000 1.2 +++ .cvsignore 12 Mar 2008 21:33:28 -0000 1.3 @@ -1 +1 @@ -sugar-base-0.1.1.tar.bz2 +sugar-base-0.79.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Dec 2007 23:39:02 -0000 1.2 +++ sources 12 Mar 2008 21:33:28 -0000 1.3 @@ -1 +1 @@ -53052b63391d427cb2d2b61f080849dc sugar-base-0.1.1.tar.bz2 +fc2872efdd7591dcc0cb3cfade82615a sugar-base-0.79.0.tar.bz2 Index: sugar-base.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sugar-base.spec 19 Feb 2008 15:21:12 -0000 1.3 +++ sugar-base.spec 12 Mar 2008 21:33:28 -0000 1.4 @@ -2,8 +2,8 @@ Summary: Base Sugar library Name: sugar-base -Version: 0.1.1 -Release: 2%{?dist} +Version: 0.79.0 +Release: 1%{?dist} URL: http://dev.laptop.org/ Source0: http://dev.laptop.org/pub/sugar/release/%{name}-%{version}.tar.bz2 License: LGPLv2 @@ -40,10 +40,10 @@ %{python_sitelib}/* %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 0.1.1-2 -- Autorebuild for GCC 4.3 +* Sat Feb 9 2008 Marco Pesenti Gritti - 0.79.0-1 +- Update to 0.79.0 -* Sun Nov 25 2007 Marco Pesenti Gritti - 0.1.1-1 +* Sun Nov 25 2007 Marco Pesenti Gritti - 0.1.1-1 - Update to 0.1.1 * Tue Nov 13 2007 Marco Pesenti Gritti - 0.1-0.6.20071113git1a04bb7c71 From fedora-extras-commits at redhat.com Wed Mar 12 21:40:26 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 21:40:26 GMT Subject: rpms/sugar-presence-service/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sugar-presence-service.spec, 1.1, 1.2 Message-ID: <200803122140.m2CLeQIG003047@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/sugar-presence-service/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3008/devel Modified Files: .cvsignore sources sugar-presence-service.spec Log Message: Resync with F-8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Dec 2007 23:20:08 -0000 1.2 +++ .cvsignore 12 Mar 2008 21:39:46 -0000 1.3 @@ -1 +1 @@ -sugar-presence-service-0.65-git150051a3a9.tar.bz2 +sugar-presence-service-0.79.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Dec 2007 23:20:08 -0000 1.2 +++ sources 12 Mar 2008 21:39:46 -0000 1.3 @@ -1 +1 @@ -a417ad6af238e3e0abb51a20cbd91965 sugar-presence-service-0.65-git150051a3a9.tar.bz2 +2009186ccd0ee1100e5089b30623c823 sugar-presence-service-0.79.0.tar.bz2 Index: sugar-presence-service.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sugar-presence-service.spec 5 Dec 2007 23:21:51 -0000 1.1 +++ sugar-presence-service.spec 12 Mar 2008 21:39:46 -0000 1.2 @@ -1,9 +1,9 @@ -%define alphatag 20071127git -%define commitid 150051a3a9 +%define alphatag 20080103git +%define commitid 76984f3f28 Name: sugar-presence-service -Version: 0.65 -Release: 0.29.%{alphatag}%{commitid}%{?dist} +Version: 0.79.0 +Release: 1 Summary: The Sugar presence service Group: System Environment/Libraries @@ -12,7 +12,7 @@ # git clone git://dev.laptop.org/projects/presence-service # cd presence-service # git-checkout %{alphatag} -Source0: sugar-presence-service-%{version}-git%{commitid}.tar.bz2 +Source0: sugar-presence-service-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -46,6 +46,19 @@ %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service %changelog +* Mon Feb 11 2008 Marco Pesenti Gritti - 0.79.0-1 +- Update to 0.79.0 + +* Wed Jan 30 2008 Morgan Collett - 0.70.0 +- dev.laptop.org #6142: Don't update buddy properties without a key + +* Thu Jan 03 2008 Dafydd Harries - 0.65-0.31.20080103git76984f3f28 +- dev.laptop.org #5368: Delay setting a buddy's current activity (morgs) + +* Mon Dec 10 2007 Dafydd Harries - 0.65-0.30.20071127git5650e153bd +- #4965: Add SyncFriends method as temporary measure for synchronising friends + list to roster group on Jabber server (Guillaume Desmottes). + * Tue Nov 27 2007 Simon McVittie - 0.65-0.29.20071127git150051a3a9 - #4920: harden _add_buddies to cope with no handle when calling BuddyHandleJoined (morgs) From fedora-extras-commits at redhat.com Wed Mar 12 21:42:03 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 21:42:03 GMT Subject: rpms/sugar-presence-service/devel sugar-presence-service.spec, 1.2, 1.3 Message-ID: <200803122142.m2CLg3l0003163@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/sugar-presence-service/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3126 Modified Files: sugar-presence-service.spec Log Message: add dist tag Index: sugar-presence-service.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sugar-presence-service.spec 12 Mar 2008 21:39:46 -0000 1.2 +++ sugar-presence-service.spec 12 Mar 2008 21:41:28 -0000 1.3 @@ -3,7 +3,7 @@ Name: sugar-presence-service Version: 0.79.0 -Release: 1 +Release: 1%{?dist} Summary: The Sugar presence service Group: System Environment/Libraries From fedora-extras-commits at redhat.com Wed Mar 12 21:43:33 2008 From: fedora-extras-commits at redhat.com (Marco Pesenti Gritti (mpg)) Date: Wed, 12 Mar 2008 21:43:33 GMT Subject: rpms/sugar/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 sugar.spec, 1.5, 1.6 sugar-0.65-jabberserver.patch, 1.1, NONE Message-ID: <200803122143.m2CLhX5q003303@cvs-int.fedora.redhat.com> Author: mpg Update of /cvs/pkgs/rpms/sugar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3259/devel Modified Files: .cvsignore sources sugar.spec Removed Files: sugar-0.65-jabberserver.patch Log Message: Update to F-8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Mar 2008 23:47:57 -0000 1.4 +++ .cvsignore 12 Mar 2008 21:42:58 -0000 1.5 @@ -1 +1 @@ -sugar-0.75.13.tar.bz2 +sugar-0.79.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Mar 2008 23:47:57 -0000 1.4 +++ sources 12 Mar 2008 21:42:58 -0000 1.5 @@ -1 +1 @@ -0eb7d56675a6e8c62d4d335f13b24008 sugar-0.75.13.tar.bz2 +e10b794279af18fc4fd0d7de04c76bc8 sugar-0.79.0.tar.bz2 Index: sugar.spec =================================================================== RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sugar.spec 10 Mar 2008 23:47:57 -0000 1.5 +++ sugar.spec 12 Mar 2008 21:42:58 -0000 1.6 @@ -1,8 +1,6 @@ -%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - Summary: OLPC desktop environment Name: sugar -Version: 0.75.13 +Version: 0.79.0 Release: 2%{?dist} URL: http://dev.laptop.org Source0: http://dev.laptop.org/pub/sugar/release/%{name}-%{version}.tar.bz2 @@ -10,35 +8,17 @@ Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: sugar-0.65-jabberserver.patch - BuildRequires: pkgconfig -BuildRequires: pygtk2-devel BuildRequires: perl-XML-Parser BuildRequires: gettext -BuildRequires: gstreamer-devel -BuildRequires: gtk2-devel -BuildRequires: dbus-devel BuildRequires: python +BuildRequires: pygtk2-devel +BuildRequires: gtk2-devel -Requires: gnome-python2-rsvg +Requires: sugar-artwork +Requires: sugar-toolkit Requires: gnome-python2-libwnck -Requires: pygtk2 -Requires: dbus-python -Requires: dbus -Requires: libxml2-python -Requires: avahi-tools -Requires: hippo-canvas-python Requires: matchbox-window-manager -Requires: vte -Requires: sugar-artwork -Requires: sugar-datastore -Requires: sugar-base -Requires: sugar-presence-service -Requires: python-telepathy -Requires: telepathy-gabble -Requires: telepathy-glib -Requires: numpy %description @@ -49,8 +29,6 @@ %prep %setup -q -%patch1 -p1 -b .jabberserver - %build %configure make @@ -75,12 +53,10 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc COPYING COPYING.LIB README +%doc COPYING README %config %{_sysconfdir}/dbus-1/system.d/NetworkManagerInfo.conf -%{python_sitelib}/* - %dir %{_datadir}/sugar %{_datadir}/sugar/* @@ -91,14 +67,14 @@ %{_datadir}/mime/packages/sugar.xml %changelog -* Mon Mar 10 2008 Dennis Gilmore - 0.75.13-2 -- Requires numpy +* Mon Feb 11 2008 Marco Pesenti Gritti - 0.79.0-2 +- Require sugar-artwork -* Tue Feb 12 2008 Marco Pesenti Gritti - 0.75.13-1 -- Updated translations +* Fri Feb 8 2008 Marco Pesenti Gritti - 0.79.0-1 +- Update to 0.79.0, rework dependencies because of the toolkit split -* Sat Feb 9 2008 Marco Pesenti Gritti - 0.75.12-1 -- Revert fix for #5904 (not approved). Fix #6332. +* Sat Feb 2 2008 Marco Pesenti Gritti - 0.75.11-2 +- Rebuild * Tue Jan 29 2008 Marco Pesenti Gritti - 0.75.11-1 - Fix #5904 --- sugar-0.65-jabberserver.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 21:46:49 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Wed, 12 Mar 2008 21:46:49 GMT Subject: rpms/python-jinja/devel python-jinja-docs.patch, NONE, 1.1 python-jinja.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803122146.m2CLknl7003457@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/python-jinja/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3418/devel Modified Files: .cvsignore sources Added Files: python-jinja-docs.patch python-jinja.spec Log Message: Initial import. python-jinja-docs.patch: --- NEW FILE python-jinja-docs.patch --- --- setup.py~ 2007-11-17 18:13:24.000000000 +0100 +++ setup.py 2008-03-11 00:12:00.000000000 +0100 @@ -78,10 +78,10 @@ ], keywords=['python.templating.engines'], packages=['jinja', 'jinja.translators'], - data_files=[ - ('docs/html', list(list_files('docs/html'))), - ('docs/txt', list(list_files('docs/src'))) - ], + #data_files=[ + # ('docs/html', list(list_files('docs/html'))), + # ('docs/txt', list(list_files('docs/src'))) + #], entry_points=''' [python.templating.engines] jinja = jinja.plugin:BuffetPlugin --- NEW FILE python-jinja.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-jinja Version: 1.2 Release: 1%{?dist} Summary: Sandboxed template engine Group: Development/Languages License: BSD URL: http://jinja.pocoo.org/ Source0: http://pypi.python.org/packages/source/J/Jinja/Jinja-%{version}.tar.gz Patch0: %{name}-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel %if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel %else BuildRequires: python-setuptools %endif %description Jinja is a sandboxed template engine written in pure Python. It provides a Django-like non-XML syntax and compiles templates into executable python code. It's basically a combination of Django templates and python code. %prep %setup -q -n Jinja-%{version} %patch0 -p0 -b .docs %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT # fix EOL sed -i 's|\r$||g' LICENSE %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE TODO docs/html %{python_sitearch}/* %changelog * Tue Mar 11 2008 Thomas Moschny - 1.2-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 17:33:52 -0000 1.1 +++ .cvsignore 12 Mar 2008 21:46:14 -0000 1.2 @@ -0,0 +1 @@ +Jinja-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 17:33:52 -0000 1.1 +++ sources 12 Mar 2008 21:46:14 -0000 1.2 @@ -0,0 +1 @@ +1235a005ade00b213800ff1e798c0241 Jinja-1.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 21:49:13 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Wed, 12 Mar 2008 21:49:13 GMT Subject: rpms/kernel/devel kernel.spec, 1.499, 1.500 linux-2.6-firewire-git-pending.patch, 1.15, 1.16 Message-ID: <200803122149.m2CLnDdT003610@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3578 Modified Files: kernel.spec linux-2.6-firewire-git-pending.patch Log Message: * Wed Mar 12 2008 Jarod Wilson - firewire: fix DMA coherency on x86_64 systems w/memory mapped over the 4GB boundary (may fix #434830) - firewire: sync DMA for device, resolves at least one cause of panics in handle_at_packet() (bz.kernel.org #9617) Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.499 retrieving revision 1.500 diff -u -r1.499 -r1.500 --- kernel.spec 12 Mar 2008 19:18:33 -0000 1.499 +++ kernel.spec 12 Mar 2008 21:48:36 -0000 1.500 @@ -1754,6 +1754,12 @@ %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen %changelog +* Wed Mar 12 2008 Jarod Wilson +- firewire: fix DMA coherency on x86_64 systems w/memory + mapped over the 4GB boundary (may fix #434830) +- firewire: sync DMA for device, resolves at least one cause + of panics in handle_at_packet() (bz.kernel.org #9617) + * Wed Mar 12 2008 Chuck Ebbert - Kill annoying ALSA debug messages linux-2.6-firewire-git-pending.patch: Index: linux-2.6-firewire-git-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- linux-2.6-firewire-git-pending.patch 10 Mar 2008 14:12:04 -0000 1.15 +++ linux-2.6-firewire-git-pending.patch 12 Mar 2008 21:48:36 -0000 1.16 @@ -789,3 +789,115 @@ http://arcgraph.de/sr/ +Currently, we do nothing to guarantee we have a consistent DMA buffer for +asynchronous receive packets. Rather than doing several sync's following a +dma_map_single() to get consistent buffers, just switch to using +dma_alloc_coherent(). + +Resolves constant buffer failures on my own x86_64 laptop w/4GB of RAM and +likely to fix a number of other failures witnessed on x86_64 systems with +4GB of RAM or more. + +Signed-off-by: Jarod Wilson + +--- + + drivers/firewire/fw-ohci.c | 18 +++++------------- + 1 files changed, 5 insertions(+), 13 deletions(-) + +diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c +index 28ea78c..081a434 100644 +--- a/drivers/firewire/fw-ohci.c ++++ b/drivers/firewire/fw-ohci.c +@@ -284,16 +284,10 @@ static int ar_context_add_page(struct ar_context *ctx) + dma_addr_t ab_bus; + size_t offset; + +- ab = (struct ar_buffer *) __get_free_page(GFP_ATOMIC); ++ ab = dma_alloc_coherent(dev, PAGE_SIZE, &ab_bus, GFP_ATOMIC); + if (ab == NULL) + return -ENOMEM; + +- ab_bus = dma_map_single(dev, ab, PAGE_SIZE, DMA_BIDIRECTIONAL); +- if (dma_mapping_error(ab_bus)) { +- free_page((unsigned long) ab); +- return -ENOMEM; +- } +- + memset(&ab->descriptor, 0, sizeof(ab->descriptor)); + ab->descriptor.control = cpu_to_le16(DESCRIPTOR_INPUT_MORE | + DESCRIPTOR_STATUS | +@@ -304,8 +298,6 @@ static int ar_context_add_page(struct ar_context *ctx) + ab->descriptor.res_count = cpu_to_le16(PAGE_SIZE - offset); + ab->descriptor.branch_address = 0; + +- dma_sync_single_for_device(dev, ab_bus, PAGE_SIZE, DMA_BIDIRECTIONAL); +- + ctx->last_buffer->descriptor.branch_address = cpu_to_le32(ab_bus | 1); + ctx->last_buffer->next = ab; + ctx->last_buffer = ab; +@@ -409,6 +401,7 @@ static void ar_context_tasklet(unsigned long data) + + if (d->res_count == 0) { + size_t size, rest, offset; ++ dma_addr_t buffer_bus; + + /* + * This descriptor is finished and we may have a +@@ -417,9 +410,7 @@ static void ar_context_tasklet(unsigned long data) + */ + + offset = offsetof(struct ar_buffer, data); +- dma_unmap_single(ohci->card.device, +- le32_to_cpu(ab->descriptor.data_address) - offset, +- PAGE_SIZE, DMA_BIDIRECTIONAL); ++ buffer_bus = le32_to_cpu(ab->descriptor.data_address) - offset; + + buffer = ab; + ab = ab->next; +@@ -435,7 +426,8 @@ static void ar_context_tasklet(unsigned long data) + while (buffer < end) + buffer = handle_ar_packet(ctx, buffer); + +- free_page((unsigned long)buffer); ++ dma_free_coherent(ohci->card.device, PAGE_SIZE, ++ buffer, buffer_bus); + ar_context_add_page(ctx); + } else { + buffer = ctx->pointer; + + + +Per DMA API docs, when using dma_map_single(), DMA_TO_DEVICE synchronization +must be done after the last modification of the memory region by software +before it can be handed off to the device and safely read. Such a sync is +currently missing from firewire_ohci:at_context_queue_packet(). + +At least on my setup, where I could within seconds reliably reproduce a panic +in handle_at_packet() by simply dd'ing from two drives on different controllers, +the panic is gone. + +See http://bugzilla.kernel.org/show_bug.cgi?id=9617 + +Signed-off-by: Jarod Wilson + +--- + + drivers/firewire/fw-ohci.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c +index 081a434..fc45868 100644 +--- a/drivers/firewire/fw-ohci.c ++++ b/drivers/firewire/fw-ohci.c +@@ -780,6 +780,10 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet) + + context_append(ctx, d, z, 4 - z); + ++ /* Sync the DMA buffer up for the device to read from */ ++ dma_sync_single_for_device(ohci->card.device, payload_bus, ++ packet->payload_length, DMA_TO_DEVICE); ++ + /* If the context isn't already running, start it up. */ + reg = reg_read(ctx->ohci, CONTROL_SET(ctx->regs)); + if ((reg & CONTEXT_RUN) == 0) From fedora-extras-commits at redhat.com Wed Mar 12 21:58:32 2008 From: fedora-extras-commits at redhat.com (Thomas Fitzsimmons (fitzsim)) Date: Wed, 12 Mar 2008 21:58:32 GMT Subject: rpms/java-1.7.0-icedtea/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE README.plugin, 1.1, NONE README.src, 1.1, NONE generate-fedora-zip.sh, 1.4, NONE java-1.7.0-icedtea-jhat.patch, 1.8, NONE java-1.7.0-icedtea-win32.patch, 1.3, NONE java-1.7.0-icedtea.spec, 1.58, NONE sources, 1.41, NONE Message-ID: <200803122158.m2CLwWoR003810@cvs-int.fedora.redhat.com> Author: fitzsim Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3785 Added Files: dead.package Removed Files: Makefile README.plugin README.src generate-fedora-zip.sh java-1.7.0-icedtea-jhat.patch java-1.7.0-icedtea-win32.patch java-1.7.0-icedtea.spec sources Log Message: - Remove java-1.7.0-icedtea from devel branch. --- NEW FILE dead.package --- java-1.7.0-icedtea was replaced by java-1.6.0-openjdk. --- Makefile DELETED --- --- README.plugin DELETED --- --- README.src DELETED --- --- generate-fedora-zip.sh DELETED --- --- java-1.7.0-icedtea-jhat.patch DELETED --- --- java-1.7.0-icedtea-win32.patch DELETED --- --- java-1.7.0-icedtea.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 22:16:24 2008 From: fedora-extras-commits at redhat.com (Chuck Ebbert (cebbert)) Date: Wed, 12 Mar 2008 22:16:24 GMT Subject: rpms/kernel/F-8 linux-2.6-acpi_ec_early_init_fix.patch, 1.2, 1.3 kernel.spec, 1.380, 1.381 linux-2.6-acpi-disable-gpe-fix.patch, 1.1, NONE Message-ID: <200803122216.m2CMGOPb010161@cvs-int.fedora.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10121 Modified Files: kernel.spec Added Files: linux-2.6-acpi_ec_early_init_fix.patch Removed Files: linux-2.6-acpi-disable-gpe-fix.patch Log Message: * Wed Mar 12 2008 Chuck Ebbert 2.6.24.3-35 - Revert 2.6.24 ACPI change that broke some notebooks. (#432477) linux-2.6-acpi_ec_early_init_fix.patch: Index: linux-2.6-acpi_ec_early_init_fix.patch =================================================================== RCS file: linux-2.6-acpi_ec_early_init_fix.patch diff -N linux-2.6-acpi_ec_early_init_fix.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-acpi_ec_early_init_fix.patch 12 Mar 2008 22:14:19 -0000 1.3 @@ -0,0 +1,81 @@ +Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c04209a7948b95e8c52084e8595e74e9428653d3 +Commit: c04209a7948b95e8c52084e8595e74e9428653d3 +Parent: e697789d64f8748cb219d7f5c413c512953802cc +Author: Alexey Starikovskiy +AuthorDate: Tue Jan 1 14:12:55 2008 -0500 +Committer: Len Brown +CommitDate: Tue Jan 1 14:12:55 2008 -0500 + + ACPI: EC: Enable boot EC before bus_scan + + Some _STA methods called during bus_scan() might require EC region handler, + which might be enabled later in the scan. + Enable it explicitly before scan to avoid errors. + + Reference: http://bugzilla.kernel.org/show_bug.cgi?id=9627 + + Signed-off-by: Alexey Starikovskiy + Signed-off-by: Len Brown +--- + drivers/acpi/ec.c | 14 +++++++++++++- + drivers/acpi/scan.c | 6 ++++++ + 2 files changed, 19 insertions(+), 1 deletions(-) + +diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c +index d411017..97dc161 100644 +--- a/drivers/acpi/ec.c ++++ b/drivers/acpi/ec.c +@@ -892,6 +892,17 @@ static int acpi_ec_stop(struct acpi_device *device, int type) + return 0; + } + ++int __init acpi_boot_ec_enable(void) ++{ ++ if (!boot_ec || boot_ec->handlers_installed) ++ return 0; ++ if (!ec_install_handlers(boot_ec)) { ++ first_ec = boot_ec; ++ return 0; ++ } ++ return -EFAULT; ++} ++ + int __init acpi_ec_ecdt_probe(void) + { + int ret; +@@ -924,9 +935,10 @@ int __init acpi_ec_ecdt_probe(void) + goto error; + /* We really need to limit this workaround, the only ASUS, + * which needs it, has fake EC._INI method, so use it as flag. ++ * Keep boot_ec struct as it will be needed soon. + */ + if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x))) +- goto error; ++ return -ENODEV; + } + + ret = ec_install_handlers(boot_ec); +diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c +index 5b4d462..cbfe9ae 100644 +--- a/drivers/acpi/scan.c ++++ b/drivers/acpi/scan.c +@@ -1449,6 +1449,8 @@ static int acpi_bus_scan_fixed(struct acpi_device *root) + return result; + } + ++int __init acpi_boot_ec_enable(void); ++ + static int __init acpi_scan_init(void) + { + int result; +@@ -1480,6 +1482,10 @@ static int __init acpi_scan_init(void) + * Enumerate devices in the ACPI namespace. + */ + result = acpi_bus_scan_fixed(acpi_root); ++ ++ /* EC region might be needed at bus_scan, so enable it now */ ++ acpi_boot_ec_enable(); ++ + if (!result) + result = acpi_bus_scan(acpi_root, &ops); + Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v retrieving revision 1.380 retrieving revision 1.381 diff -u -r1.380 -r1.381 --- kernel.spec 12 Mar 2008 20:25:04 -0000 1.380 +++ kernel.spec 12 Mar 2008 22:14:19 -0000 1.381 @@ -677,7 +677,7 @@ #Patch780: linux-2.6-clockevents-fix-resume-logic.patch Patch761: linux-2.6-acpi-video-backlight-rationalize.patch Patch763: linux-2.6-acpi-video-fix-multiple-busses.patch -#Patch766: linux-2.6-acpi-disable-gpe-fix.patch +Patch767: linux-2.6-acpi_ec_early_init_fix.patch Patch784: linux-2.6-acpi-eeepc-hotkey.patch Patch820: linux-2.6-compile-fixes.patch @@ -1256,9 +1256,8 @@ # fix multiple ACPI brightness problems (#427518) ApplyPatch linux-2.6-acpi-video-backlight-rationalize.patch ApplyPatch linux-2.6-acpi-video-fix-multiple-busses.patch -# disable stray gpe properly -# need to find out why this is broken -#ApplyPatch linux-2.6-acpi-disable-gpe-fix.patch +# revert EC change in 2.6.24 that broke some notebooks (#432477) +ApplyPatch linux-2.6-acpi_ec_early_init_fix.patch -R # Eeepc hotkey driver ApplyPatch linux-2.6-acpi-eeepc-hotkey.patch @@ -1913,6 +1912,9 @@ %changelog +* Wed Mar 12 2008 Chuck Ebbert 2.6.24.3-35 +- Revert 2.6.24 ACPI change that broke some notebooks. (#432477) + * Tue Mar 11 2008 John W. Linville 2.6.24.3-34 - rt2x00:correct rx packet length for USB devices - make b43_mac_{enable,suspend}() static --- linux-2.6-acpi-disable-gpe-fix.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 22:21:03 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Wed, 12 Mar 2008 22:21:03 GMT Subject: rpms/python-jinja/F-8 python-jinja-docs.patch, NONE, 1.1 python-jinja.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803122221.m2CML3ah010429@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/python-jinja/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10357/F-8 Modified Files: .cvsignore sources Added Files: python-jinja-docs.patch python-jinja.spec Log Message: Initial import for F-8. python-jinja-docs.patch: --- NEW FILE python-jinja-docs.patch --- --- setup.py~ 2007-11-17 18:13:24.000000000 +0100 +++ setup.py 2008-03-11 00:12:00.000000000 +0100 @@ -78,10 +78,10 @@ ], keywords=['python.templating.engines'], packages=['jinja', 'jinja.translators'], - data_files=[ - ('docs/html', list(list_files('docs/html'))), - ('docs/txt', list(list_files('docs/src'))) - ], + #data_files=[ + # ('docs/html', list(list_files('docs/html'))), + # ('docs/txt', list(list_files('docs/src'))) + #], entry_points=''' [python.templating.engines] jinja = jinja.plugin:BuffetPlugin --- NEW FILE python-jinja.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-jinja Version: 1.2 Release: 1%{?dist} Summary: Sandboxed template engine Group: Development/Languages License: BSD URL: http://jinja.pocoo.org/ Source0: http://pypi.python.org/packages/source/J/Jinja/Jinja-%{version}.tar.gz Patch0: %{name}-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel %if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel %else BuildRequires: python-setuptools %endif %description Jinja is a sandboxed template engine written in pure Python. It provides a Django-like non-XML syntax and compiles templates into executable python code. It's basically a combination of Django templates and python code. %prep %setup -q -n Jinja-%{version} %patch0 -p0 -b .docs %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT # fix EOL sed -i 's|\r$||g' LICENSE %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE TODO docs/html %{python_sitearch}/* %changelog * Tue Mar 11 2008 Thomas Moschny - 1.2-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 17:33:52 -0000 1.1 +++ .cvsignore 12 Mar 2008 22:19:51 -0000 1.2 @@ -0,0 +1 @@ +Jinja-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 17:33:52 -0000 1.1 +++ sources 12 Mar 2008 22:19:51 -0000 1.2 @@ -0,0 +1 @@ +1235a005ade00b213800ff1e798c0241 Jinja-1.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 22:21:24 2008 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Wed, 12 Mar 2008 22:21:24 GMT Subject: rpms/upstart/devel upstart-rpm.patch, 1.1, 1.2 upstart.spec, 1.11, 1.12 Message-ID: <200803122221.m2CMLOYm010485@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/upstart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10415 Modified Files: upstart-rpm.patch upstart.spec Log Message: oh yeah, that too. #@#&#@ rpm upstart-rpm.patch: Index: upstart-rpm.patch =================================================================== RCS file: /cvs/extras/rpms/upstart/devel/upstart-rpm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- upstart-rpm.patch 12 Mar 2008 16:59:43 -0000 1.1 +++ upstart-rpm.patch 12 Mar 2008 22:20:50 -0000 1.2 @@ -1,13 +1,15 @@ diff -up upstart-0.3.9/nih/file.c.foo upstart-0.3.9/nih/file.c --- upstart-0.3.9/nih/file.c.foo 2008-03-12 12:03:50.000000000 -0400 +++ upstart-0.3.9/nih/file.c 2008-03-12 12:05:39.000000000 -0400 -@@ -374,7 +374,10 @@ nih_file_is_packaging (const char *path) +@@ -374,7 +374,12 @@ nih_file_is_packaging (const char *path) ptr = strrchr (path, '.'); if (ptr && (! strncmp (ptr, ".dpkg-", 6))) return TRUE; - + if (ptr && (! strncmp (ptr, ".rpmsave",8))) + return TRUE; ++ if (ptr && (! strncmp (ptr, ".rpmorig",8))) ++ return TRUE; + if (ptr && (! strncmp (ptr, ".rpmnew",7))) + return TRUE; Index: upstart.spec =================================================================== RCS file: /cvs/extras/rpms/upstart/devel/upstart.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- upstart.spec 12 Mar 2008 20:29:44 -0000 1.11 +++ upstart.spec 12 Mar 2008 22:20:50 -0000 1.12 @@ -1,6 +1,6 @@ Name: upstart Version: 0.3.9 -Release: 11%{?dist} +Release: 12%{?dist} Summary: An event-driven init system Group: System Environment/Base @@ -87,6 +87,9 @@ %{_mandir}/man8/telinit.8.gz %changelog +* Wed Mar 13 2008 Bill Nottingham - 0.3.9-12 +- forgot about rpmorig too (ugh) + * Wed Mar 13 2008 Casey Dahlin - 0.3.9-11 - Make logd a noreplace From fedora-extras-commits at redhat.com Wed Mar 12 22:48:41 2008 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 12 Mar 2008 22:48:41 GMT Subject: rpms/ClanLib/devel ClanLib-0.8.1-abi-compat.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 ClanLib-0.8.0-gcc43.patch, 1.1, 1.2 ClanLib.spec, 1.16, 1.17 sources, 1.4, 1.5 ClanLib-0.8.0-alsa.patch, 1.1, NONE ClanLib-0.8.0-fullscreen.patch, 1.1, NONE ClanLib-0.8.0-memset.patch, 1.1, NONE ClanLib-0.8.0-tex-format.patch, 1.1, NONE Message-ID: <200803122248.m2CMmfOF011114@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/ClanLib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11076 Modified Files: .cvsignore ClanLib-0.8.0-gcc43.patch ClanLib.spec sources Added Files: ClanLib-0.8.1-abi-compat.patch Removed Files: ClanLib-0.8.0-alsa.patch ClanLib-0.8.0-fullscreen.patch ClanLib-0.8.0-memset.patch ClanLib-0.8.0-tex-format.patch Log Message: * Wed Mar 12 2008 Hans de Goede 0.8.1-1 - New upstream release - Drop all patches (all upstreamed) - Add patch to keep libclanDisplay-0.8 abi compatible with 0.8.0 - Warning, this release changes the ABI of the GUIStyleSilver input_box widget - Warning, some small API changes, CL_KEY_ADD -> CL_KEY_NUMPAD_ADD, etc. ClanLib-0.8.1-abi-compat.patch: --- NEW FILE ClanLib-0.8.1-abi-compat.patch --- diff -up ClanLib-0.8.1/Sources/API/Display/sprite.h~ ClanLib-0.8.1/Sources/API/Display/sprite.h --- ClanLib-0.8.1/Sources/API/Display/sprite.h~ 2008-03-12 22:09:46.000000000 +0100 +++ ClanLib-0.8.1/Sources/API/Display/sprite.h 2008-03-12 22:17:37.000000000 +0100 @@ -86,7 +86,9 @@ public: const std::string &resource_id, CL_ResourceManager *manager); - CL_Sprite(const CL_SpriteDescription &sprite_description, bool pack_texture = true, unsigned int min_width = 16, unsigned int min_height = 16); + CL_Sprite(const CL_SpriteDescription &sprite_description, bool pack_texture = true); + + CL_Sprite(const CL_SpriteDescription &sprite_description, bool pack_texture, unsigned int min_width, unsigned int min_height); CL_Sprite(const CL_Sprite &sprite); @@ -337,6 +339,8 @@ public: private: CL_Sprite_Generic *impl; + + void createFromDescription(const CL_SpriteDescription &spritedescription, bool pack_texture, unsigned int min_width, unsigned int min_height); }; #endif diff -up ClanLib-0.8.1/Sources/Display/sprite.cpp~ ClanLib-0.8.1/Sources/Display/sprite.cpp --- ClanLib-0.8.1/Sources/Display/sprite.cpp~ 2008-03-12 22:17:59.000000000 +0100 +++ ClanLib-0.8.1/Sources/Display/sprite.cpp 2008-03-12 22:17:59.000000000 +0100 @@ -71,9 +71,10 @@ CL_Sprite::CL_Sprite(const std::string & } } -CL_Sprite::CL_Sprite(const CL_SpriteDescription &spritedescription, bool pack_texture, unsigned int min_width, unsigned int min_height) -: impl(new CL_Sprite_Generic) +void CL_Sprite::createFromDescription(const CL_SpriteDescription &spritedescription, bool pack_texture, unsigned int min_width, unsigned int min_height) { + impl = new CL_Sprite_Generic; + if (pack_texture && CL_DisplayTarget::current()->enable_packer()) { // Fetch max texture size @@ -303,6 +304,16 @@ CL_Sprite::CL_Sprite(const CL_SpriteDesc restart(); } +CL_Sprite::CL_Sprite(const CL_SpriteDescription &spritedescription, bool pack_texture, unsigned int min_width, unsigned int min_height) +{ + createFromDescription(spritedescription, pack_texture, min_width, min_height); +} + +CL_Sprite::CL_Sprite(const CL_SpriteDescription &spritedescription, bool pack_texture) +{ + createFromDescription(spritedescription, pack_texture, 16, 16); +} + CL_Sprite::CL_Sprite(const CL_Sprite &sprite) : impl(0) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ClanLib/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Oct 2007 11:37:37 -0000 1.4 +++ .cvsignore 12 Mar 2008 22:48:05 -0000 1.5 @@ -1,2 +1,2 @@ -ClanLib-0.8.0.tgz -ClanLib-0.8.0-generated-docs.tar.gz +ClanLib-0.8.1.tgz +ClanLib-0.8.1-generated-docs.tar.gz ClanLib-0.8.0-gcc43.patch: Index: ClanLib-0.8.0-gcc43.patch =================================================================== RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib-0.8.0-gcc43.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ClanLib-0.8.0-gcc43.patch 4 Jan 2008 21:58:40 -0000 1.1 +++ ClanLib-0.8.0-gcc43.patch 12 Mar 2008 22:48:05 -0000 1.2 @@ -1,266 +1,11 @@ -diff -up ClanLib-0.8.0/Sources/Sound/precomp.h~ ClanLib-0.8.0/Sources/Sound/precomp.h ---- ClanLib-0.8.0/Sources/Sound/precomp.h~ 2008-01-04 22:14:27.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Sound/precomp.h 2008-01-04 22:14:27.000000000 +0100 -@@ -47,6 +47,8 @@ - #include - #endif - -+#include -+ - #include "API/signals.h" - #include "API/Core/System/error.h" - -diff -up ClanLib-0.8.0/Sources/Core/precomp.h~ ClanLib-0.8.0/Sources/Core/precomp.h ---- ClanLib-0.8.0/Sources/Core/precomp.h~ 2008-01-04 22:15:04.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Core/precomp.h 2008-01-04 22:15:04.000000000 +0100 -@@ -47,6 +47,8 @@ - #include "API/Core/System/error.h" - #include "API/Core/System/clanstring.h" - -+#include -+ - #ifdef __BORLANDC__ - #define BAD_MATH - #endif -diff -up ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp~ ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp ---- ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp~ 2008-01-04 22:05:44.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp 2008-01-04 22:05:44.000000000 +0100 +diff -up ClanLib-0.8.1/Sources/GL/opengl.cpp~ ClanLib-0.8.1/Sources/GL/opengl.cpp +--- ClanLib-0.8.1/Sources/GL/opengl.cpp~ 2008-03-12 10:39:16.000000000 +0100 ++++ ClanLib-0.8.1/Sources/GL/opengl.cpp 2008-03-12 10:39:16.000000000 +0100 @@ -33,6 +33,7 @@ - #endif - #include - #include -+#include - #include "directory_scanner_unix.h" - - CL_DirectoryScanner_Unix::CL_DirectoryScanner_Unix () -diff -up ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp~ ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp ---- ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp~ 2008-01-04 22:41:21.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp 2008-01-04 22:41:21.000000000 +0100 -@@ -29,6 +29,7 @@ - - #ifdef USE_GETADDR - -+#include - #include "ip_address_getaddr.h" - #include "API/Core/System/error.h" - #include "API/Core/System/mutex.h" -diff -up ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp~ ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp ---- ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp~ 2008-01-04 22:42:11.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp 2008-01-04 22:42:11.000000000 +0100 -@@ -38,6 +38,7 @@ - - #include "socket_generic.h" - #include -+#include - #include "API/Core/System/clanstring.h" - - ///////////////////////////////////////////////////////////////////////////// -diff -up ClanLib-0.8.0/Sources/Network/Socket/socket.cpp~ ClanLib-0.8.0/Sources/Network/Socket/socket.cpp ---- ClanLib-0.8.0/Sources/Network/Socket/socket.cpp~ 2008-01-04 22:41:45.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Network/Socket/socket.cpp 2008-01-04 22:41:45.000000000 +0100 -@@ -42,6 +42,7 @@ - #define INVALID_SOCKET -1 - #endif - -+#include - #include "socket_generic.h" - #include "API/Core/System/error.h" - #include "API/Core/System/log.h" -diff -up ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h~ ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h ---- ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h~ 2008-01-04 22:43:16.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h 2008-01-04 22:43:16.000000000 +0100 -@@ -35,6 +35,7 @@ - #endif - - #include -+#include - #include "API/Core/IOData/inputsource.h" - #include "API/Core/IOData/outputsource.h" - -diff -up ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp ---- ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp~ 2008-01-04 22:39:20.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp 2008-01-04 22:39:20.000000000 +0100 -@@ -27,6 +27,7 @@ - ** (if your name is missing here, please add it) - */ - -+#include - #include "API/Network/NetSession/netstream.h" - #include "API/Network/NetSession/netsession.h" - #include "netstream_generic.h" -diff -up ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp ---- ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp~ 2008-01-04 22:40:28.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp 2008-01-04 22:40:28.000000000 +0100 -@@ -27,6 +27,7 @@ - ** (if your name is missing here, please add it) - */ - -+#include - #include "netcomputer_generic.h" - #include "netstream_generic.h" - #include "netsession_generic.h" -diff -up ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp ---- ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp~ 2008-01-04 22:40:01.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp 2008-01-04 22:40:01.000000000 +0100 -@@ -27,6 +27,7 @@ - ** (if your name is missing here, please add it) - */ - -+#include - #include "API/Network/NetSession/outputsource_netpacket.h" - #include "API/Network/NetSession/netpacket.h" - #include "outputsource_netpacket_generic.h" -diff -up ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp ---- ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp~ 2008-01-04 22:26:18.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp 2008-01-04 22:26:18.000000000 +0100 -@@ -27,6 +27,7 @@ - ** (if your name is missing here, please add it) - */ - -+#include - #include "API/Core/System/cl_assert.h" - #include "API/Network/NetSession/inputsource_netpacket.h" - #include "API/Network/NetSession/netpacket.h" -diff -up ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp~ ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp ---- ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp~ 2008-01-04 22:25:14.000000000 +0100 -+++ ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp 2008-01-04 22:25:14.000000000 +0100 -@@ -27,6 +27,7 @@ - ** (if your name is missing here, please add it) - */ - -+#include - #include "API/Display/font.h" - #include "API/Display/display.h" - #include "API/Core/System/system.h" -diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp ---- ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp~ 2008-01-04 22:22:25.000000000 +0100 -+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp 2008-01-04 22:22:25.000000000 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include "API/Core/System/error.h" - #include "API/Display/keys.h" -diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp ---- ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp~ 2008-01-04 22:23:19.000000000 +0100 -+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp 2008-01-04 22:23:19.000000000 +0100 -@@ -28,6 +28,7 @@ - */ - - #include -+#include - #include "API/Core/System/log.h" - #include "API/Display/input_device.h" - #include "API/Display/input_event.h" -diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp ---- ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp~ 2008-01-04 22:22:51.000000000 +0100 -+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp 2008-01-04 22:22:51.000000000 +0100 -@@ -28,6 +28,7 @@ - */ - - #include -+#include - #include "API/Display/input_device.h" - #include "API/Display/input_event.h" - #include "API/Display/keys.h" -diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp ---- ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp~ 2008-01-04 22:18:55.000000000 +0100 -+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp 2008-01-04 22:18:55.000000000 +0100 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include "API/Core/System/error.h" - #include "API/Core/System/clanstring.h" -diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp ---- ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp~ 2008-01-04 22:18:00.000000000 +0100 -+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp 2008-01-04 22:18:00.000000000 +0100 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include "API/Core/Math/point.h" - #include "API/Core/System/clanstring.h" -diff -up ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h~ ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h ---- ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h~ 2008-01-04 22:07:15.000000000 +0100 -+++ ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h 2008-01-04 22:07:15.000000000 +0100 -@@ -2530,7 +2530,7 @@ public: - typedef CLuint (CL_GLFUNC *ptr_glCreateShaderObjectARB )(CLenum shaderType); - typedef CLvoid (CL_GLFUNC *ptr_glShaderSourceARB)(CLuint shaderObj, CLsizei count, const CLchar* *string, const CLint *length); - typedef CLvoid (CL_GLFUNC *ptr_glCompileShaderARB)(CLuint shaderObj); -- typedef CLuint (CL_GLFUNC *ptr_glCreateProgramObjectARB)(CLvoid); -+ typedef CLuint (CL_GLFUNC *ptr_glCreateProgramObjectARB)(void); - typedef CLvoid (CL_GLFUNC *ptr_glAttachObjectARB)(CLuint containerObj, CLuint attachedObj); - typedef CLvoid (CL_GLFUNC *ptr_glLinkProgramARB)(CLuint programObj); - typedef CLvoid (CL_GLFUNC *ptr_glUseProgramObjectARB)(CLuint programObj); -diff -up ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h~ ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h ---- ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h~ 2008-01-04 22:12:09.000000000 +0100 -+++ ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h 2008-01-04 22:12:09.000000000 +0100 -@@ -48,6 +48,7 @@ - #pragma once - #endif - -+#include - #include "outline_provider.h" - - class CL_OutlineProviderFile_Generic; -diff -up ClanLib-0.8.0/Sources/Display/display_precomp.h~ ClanLib-0.8.0/Sources/Display/display_precomp.h ---- ClanLib-0.8.0/Sources/Display/display_precomp.h~ 2008-01-04 22:09:47.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Display/display_precomp.h 2008-01-04 22:09:47.000000000 +0100 -@@ -33,5 +33,7 @@ - #include - #endif - -+#include -+ - #include "API/Core/System/cl_assert.h" - -diff -up ClanLib-0.8.0/Sources/GUI/precomp.h~ ClanLib-0.8.0/Sources/GUI/precomp.h ---- ClanLib-0.8.0/Sources/GUI/precomp.h~ 2008-01-04 22:16:06.000000000 +0100 -+++ ClanLib-0.8.0/Sources/GUI/precomp.h 2008-01-04 22:16:06.000000000 +0100 -@@ -37,6 +37,8 @@ - #ifdef _MSC_VER - #pragma warning (disable:4786) - -+#include -+ + #include "API/Core/IOData/cl_endian.h" #include "API/core.h" - #include "API/display.h" - -diff -up ClanLib-0.8.0/Examples/CTalk/precomp.h~ ClanLib-0.8.0/Examples/CTalk/precomp.h ---- ClanLib-0.8.0/Examples/CTalk/precomp.h~ 2008-01-04 22:15:50.000000000 +0100 -+++ ClanLib-0.8.0/Examples/CTalk/precomp.h 2008-01-04 22:15:50.000000000 +0100 -@@ -10,4 +10,6 @@ - #include - #include - -+#include -+ - #endif -diff -up ClanLib-0.8.0/Utilities/GUIEditor/precomp.h~ ClanLib-0.8.0/Utilities/GUIEditor/precomp.h ---- ClanLib-0.8.0/Utilities/GUIEditor/precomp.h~ 2008-01-04 22:16:07.000000000 +0100 -+++ ClanLib-0.8.0/Utilities/GUIEditor/precomp.h 2008-01-04 22:16:07.000000000 +0100 -@@ -9,4 +9,6 @@ - #include - #include - -+#include -+ - #endif -diff -up ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp~ ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp ---- ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp~ 2008-01-04 21:54:35.000000000 +0100 -+++ ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp 2008-01-04 21:54:35.000000000 +0100 -@@ -53,6 +53,7 @@ - - #include - #include -+#include // for PATH_MAX ++#include - ///////////////////////////////////////////////////////////////////////////// - // Operations + #ifdef __APPLE__ + #include Index: ClanLib.spec =================================================================== RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ClanLib.spec 8 Mar 2008 15:17:15 -0000 1.16 +++ ClanLib.spec 12 Mar 2008 22:48:05 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Cross platform C++ game library Name: ClanLib -Version: 0.8.0 -Release: 11%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Group: System Environment/Libraries License: zlib URL: http://www.clanlib.org/ @@ -11,11 +11,8 @@ # mv $RPM_BUILD_ROOT%{_datadir}/doc/clanlib html # tar cvfz ClanLib-%{version}-generated-docs.tar.gz html Source1: ClanLib-%{version}-generated-docs.tar.gz -Patch0: ClanLib-0.8.0-fullscreen.patch -Patch1: ClanLib-0.8.0-tex-format.patch -Patch2: ClanLib-0.8.0-gcc43.patch -Patch3: ClanLib-0.8.0-alsa.patch -Patch4: ClanLib-0.8.0-memset.patch +Patch0: ClanLib-0.8.0-gcc43.patch +Patch1: ClanLib-0.8.1-abi-compat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel BuildRequires: libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel @@ -40,11 +37,8 @@ %prep %setup -q -a 1 -%patch0 -p1 -z .fs -%patch1 -p1 -z .texfmt -%patch2 -p1 -z .gcc43 -%patch3 -p1 -z .alsa -%patch4 -p1 -z .memset +%patch0 -p1 +%patch1 -p1 # fixup pc files sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in sed -i 's|Libs: -L${libdir}|Libs: -L${libdir}/%{name}-0.8|' \ @@ -94,6 +88,13 @@ %changelog +* Wed Mar 12 2008 Hans de Goede 0.8.1-1 +- New upstream release +- Drop all patches (all upstreamed) +- Add patch to keep libclanDisplay-0.8 abi compatible with 0.8.0 +- Warning, this release changes the ABI of the GUIStyleSilver input_box widget +- Warning, some small API changes, CL_KEY_ADD -> CL_KEY_NUMPAD_ADD, etc. + * Sat Mar 8 2008 Hans de Goede 0.8.0-11 - Add a patch from Dave Jones fixing various wrong invocations of memset Index: sources =================================================================== RCS file: /cvs/extras/rpms/ClanLib/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Oct 2007 11:37:37 -0000 1.4 +++ sources 12 Mar 2008 22:48:05 -0000 1.5 @@ -1,2 +1,2 @@ -3e183a801a31f646b012db2d82f97ff3 ClanLib-0.8.0.tgz -e552916511247b59b1f220421dd68539 ClanLib-0.8.0-generated-docs.tar.gz +24e86202eb6d702f788ff16a2718aa97 ClanLib-0.8.1.tgz +9958807c66c9deee64c2047208d3542e ClanLib-0.8.1-generated-docs.tar.gz --- ClanLib-0.8.0-alsa.patch DELETED --- --- ClanLib-0.8.0-fullscreen.patch DELETED --- --- ClanLib-0.8.0-memset.patch DELETED --- --- ClanLib-0.8.0-tex-format.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 22:59:19 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 12 Mar 2008 22:59:19 GMT Subject: rpms/pulseaudio/devel pulseaudio-0.9.8-disable-realtime.patch, NONE, 1.1 pulseaudio.spec, 1.34, 1.35 Message-ID: <200803122259.m2CMxJQa011303@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/pulseaudio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11270 Modified Files: pulseaudio.spec Added Files: pulseaudio-0.9.8-disable-realtime.patch Log Message: * Wed Mar 12 2008 Adam Jackson 0.9.8-11 - pulseaudio-0.9.8-disable-realtime.patch: Don't ask PolicyKit for increased scheduling mojo for now. It's not clear that it's a win; and if it is, the policy should just be fixed to always allow it. pulseaudio-0.9.8-disable-realtime.patch: --- NEW FILE pulseaudio-0.9.8-disable-realtime.patch --- diff -up pulseaudio-0.9.8/src/daemon/main.c.jx pulseaudio-0.9.8/src/daemon/main.c --- pulseaudio-0.9.8/src/daemon/main.c.jx 2008-03-12 16:06:03.000000000 -0400 +++ pulseaudio-0.9.8/src/daemon/main.c 2008-03-12 16:17:59.000000000 -0400 @@ -416,7 +416,7 @@ int main(int argc, char *argv[]) { #ifdef HAVE_POLKIT if (conf->high_priority) { - if (pa_polkit_check("org.pulseaudio.acquire-high-priority") > 0) { + if (0 && pa_polkit_check("org.pulseaudio.acquire-high-priority") > 0) { pa_log_info("PolicyKit grants us acquire-high-priority privilige."); allow_high_priority = TRUE; } else @@ -424,7 +424,7 @@ int main(int argc, char *argv[]) { } if (conf->realtime_scheduling) { - if (pa_polkit_check("org.pulseaudio.acquire-real-time") > 0) { + if (0 && pa_polkit_check("org.pulseaudio.acquire-real-time") > 0) { pa_log_info("PolicyKit grants us acquire-real-time privilige."); allow_realtime = TRUE; } else Index: pulseaudio.spec =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- pulseaudio.spec 12 Mar 2008 18:01:37 -0000 1.34 +++ pulseaudio.spec 12 Mar 2008 22:58:43 -0000 1.35 @@ -3,7 +3,7 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 0.9.8 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz @@ -28,6 +28,7 @@ Patch5: pulseaudio-0.9.8-droproot.patch Patch6: pulseaudio-0.9.8-multilib.patch Patch7: pulseaudio-0.9.8-ltdl-assert.patch +Patch8: pulseaudio-0.9.8-disable-realtime.patch %description PulseAudio is a sound server for Linux and other Unix like operating @@ -170,6 +171,7 @@ %patch5 -p0 -b .droproot %patch6 -p1 -b .multilib %patch7 -p0 -b .ltdl-assert +%patch8 -p1 -b .realtime %build %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access @@ -394,6 +396,11 @@ %{_mandir}/man1/pax11publish.1.gz %changelog +* Wed Mar 12 2008 Adam Jackson 0.9.8-11 +- pulseaudio-0.9.8-disable-realtime.patch: Don't ask PolicyKit for increased + scheduling mojo for now. It's not clear that it's a win; and if it is, + the policy should just be fixed to always allow it. + * Wed Mar 12 2008 Lubomir Kundrak 0.9.8-10 - Build the manual pages with xmltoman From fedora-extras-commits at redhat.com Wed Mar 12 23:05:42 2008 From: fedora-extras-commits at redhat.com (Adam Jackson (ajax)) Date: Wed, 12 Mar 2008 23:05:42 GMT Subject: rpms/xorg-x11-server/devel xserver-1.5.0-ia64.patch, NONE, 1.1 xserver-1.5.0-unselinux.patch, NONE, 1.1 xserver-1.5.0-wfs.patch, NONE, 1.1 xorg-x11-server.spec, 1.306, 1.307 Message-ID: <200803122305.m2CN5gmP017477@cvs-int.fedora.redhat.com> Author: ajax Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17431 Modified Files: xorg-x11-server.spec Added Files: xserver-1.5.0-ia64.patch xserver-1.5.0-unselinux.patch xserver-1.5.0-wfs.patch Log Message: * Wed Mar 12 2008 Adam Jackson 1.4.99.901-5.20080310 - xserver-1.5.0-unselinux.patch: Disable selinux extension for now. - xserver-1.5.0-ia64.patch: Fix ia64 PCI support. (#429878) xserver-1.5.0-ia64.patch: --- NEW FILE xserver-1.5.0-ia64.patch --- >From 9053cba9d766be78d150226aa4adf61e5a6717d2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 12 Mar 2008 19:52:50 -0400 Subject: [PATCH] Fix ia64 PCI support. --- hw/xfree86/os-support/bus/Makefile.am | 12 ------- hw/xfree86/os-support/bus/Pci.h | 3 +- hw/xfree86/os-support/linux/Makefile.am | 2 +- hw/xfree86/os-support/shared/ia64Pci.c | 55 ------------------------------- 4 files changed, 2 insertions(+), 70 deletions(-) diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am index 381b992..5a15430 100644 --- a/hw/xfree86/os-support/bus/Makefile.am +++ b/hw/xfree86/os-support/bus/Makefile.am @@ -27,18 +27,6 @@ if LINUX_ALPHA PCI_SOURCES += axpPci.c endif -if LINUX_IA64 -PLATFORM_PCI_SOURCES = \ - 460gxPCI.c \ - 460gxPCI.h \ - altixPCI.c \ - altixPCI.h \ - e8870PCI.c \ - e8870PCI.h \ - zx1PCI.c \ - zx1PCI.h -endif - if XORG_BUS_SPARC PLATFORM_SOURCES = Sbus.c sdk_HEADERS += xf86Sbus.h diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 0abb34f..ebac090 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -207,9 +207,8 @@ # endif #elif defined(__ia64__) # if defined(linux) -# define ARCH_PCI_INIT ia64linuxPciInit +# define ARCH_PCI_INIT linuxPciInit # endif -# define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper #elif defined(__i386__) || defined(__i386) # if defined(linux) # define ARCH_PCI_INIT linuxPciInit diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index 5a52ffd..beaae3d 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = liblinux.la if LINUX_IA64 -PLATFORM_PCI_SUPPORT = $(srcdir)/lnx_ia64.c $(srcdir)/../shared/ia64Pci.c +PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c PLATFORM_DEFINES = -DOS_PROBE_PCI_CHIPSET=lnxProbePciChipset PLATFORM_INCLUDES = -I$(srcdir)/../shared endif diff --git a/hw/xfree86/os-support/shared/ia64Pci.c b/hw/xfree86/os-support/shared/ia64Pci.c index 45522e9..6f6924b 100644 --- a/hw/xfree86/os-support/shared/ia64Pci.c +++ b/hw/xfree86/os-support/shared/ia64Pci.c @@ -42,12 +42,7 @@ #include #include "compiler.h" -#include "460gxPCI.h" -#include "e8870PCI.h" -#include "zx1PCI.h" -#include "altixPCI.h" #include "Pci.h" -#include "ia64Pci.h" /* * We use special in/out routines here since Altix platforms require the @@ -191,53 +186,3 @@ _X_EXPORT unsigned int inl(unsigned long port) return val; } -void -ia64ScanPCIWrapper(scanpciWrapperOpt flags) -{ - static IA64Chipset chipset = NONE_CHIPSET; - - if (flags == SCANPCI_INIT) { - - /* PCI configuration space probes should be done first */ - if (xorgProbe460GX(flags)) { - chipset = I460GX_CHIPSET; - xf86PreScan460GX(); - return; - } else if (xorgProbeE8870(flags)) { - chipset = E8870_CHIPSET; - xf86PreScanE8870(); - return; - } -#ifdef OS_PROBE_PCI_CHIPSET - chipset = OS_PROBE_PCI_CHIPSET(flags); - switch (chipset) { - case ZX1_CHIPSET: - xf86PreScanZX1(); - return; - case ALTIX_CHIPSET: - xf86PreScanAltix(); - return; - default: - return; - } -#endif - } else /* if (flags == SCANPCI_TERM) */ { - - switch (chipset) { - case I460GX_CHIPSET: - xf86PostScan460GX(); - return; - case E8870_CHIPSET: - xf86PostScanE8870(); - return; - case ZX1_CHIPSET: - xf86PostScanZX1(); - return; - case ALTIX_CHIPSET: - xf86PostScanAltix(); - return; - default: - return; - } - } -} -- 1.5.4.3 xserver-1.5.0-unselinux.patch: --- NEW FILE xserver-1.5.0-unselinux.patch --- >From 39ac27c473816c66faa43ae00b4fd34b6688ff12 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 12 Mar 2008 19:33:37 -0400 Subject: [PATCH] Disable the selinux extension for now. We'll still build the infrastructure but not turn on the extension. This wants a better solution, please don't ship me like this. --- hw/xfree86/dixmods/extmod/modinit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index d0d892a..5fa5456 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -38,7 +38,7 @@ static MODULESETUPPROTO(extmodSetup); * Array describing extensions to be initialized */ static ExtensionModule extensionModules[] = { -#ifdef XSELINUX +#if 0 { SELinuxExtensionInit, SELINUX_EXTENSION_NAME, -- 1.5.4.3 xserver-1.5.0-wfs.patch: --- NEW FILE xserver-1.5.0-wfs.patch --- >From 2939645164d6825f571c83c419e3ec61a7dc6279 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 12 Mar 2008 19:21:08 -0400 Subject: [PATCH] Additional input readiness check in WaitForSomething. --- os/WaitFor.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/os/WaitFor.c b/os/WaitFor.c index 36e01ca..0203d6e 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -332,13 +332,11 @@ WaitForSomething(int *pClientsReady) if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable)) break; -#ifdef WIN32 /* Windows keyboard and mouse events are added to the input queue in Block- and WakupHandlers. There is no device to check if data is ready. So check here if new input is available */ if (*checkForInput[0] != *checkForInput[1]) return 0; -#endif } } -- 1.5.4.3 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- xorg-x11-server.spec 12 Mar 2008 02:43:37 -0000 1.306 +++ xorg-x11-server.spec 12 Mar 2008 23:04:38 -0000 1.307 @@ -20,7 +20,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.901 -Release: 4.%{gitdate}%{?dist} +Release: 5.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -61,6 +61,9 @@ Patch5002: xserver-1.4.99-ssh-isnt-local.patch Patch5003: xserver-1.5.0-x86emu.patch +Patch5004: xserver-1.5.0-wfs.patch +Patch5005: xserver-1.5.0-unselinux.patch +Patch5006: xserver-1.5.0-ia64.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -509,6 +512,10 @@ %changelog +* Wed Mar 12 2008 Adam Jackson 1.4.99.901-5.20080310 +- xserver-1.5.0-unselinux.patch: Disable selinux extension for now. +- xserver-1.5.0-ia64.patch: Fix ia64 PCI support. (#429878) + * Tue Mar 11 2008 Kristian H??gsberg 1.4.99.901-4.20080310 - Checkout the tip of the git snapshot so we get the most recent DRI2 texture from pixmap changes in the build. Bump mesa build requires. From fedora-extras-commits at redhat.com Wed Mar 12 23:15:04 2008 From: fedora-extras-commits at redhat.com (Thomas Moschny (thm)) Date: Wed, 12 Mar 2008 23:15:04 GMT Subject: rpms/python-jinja/F-7 python-jinja-docs.patch, NONE, 1.1 python-jinja.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803122315.m2CNF4WL017781@cvs-int.fedora.redhat.com> Author: thm Update of /cvs/pkgs/rpms/python-jinja/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17749/F-7 Modified Files: .cvsignore sources Added Files: python-jinja-docs.patch python-jinja.spec Log Message: Initial import for F-7. python-jinja-docs.patch: --- NEW FILE python-jinja-docs.patch --- --- setup.py~ 2007-11-17 18:13:24.000000000 +0100 +++ setup.py 2008-03-11 00:12:00.000000000 +0100 @@ -78,10 +78,10 @@ ], keywords=['python.templating.engines'], packages=['jinja', 'jinja.translators'], - data_files=[ - ('docs/html', list(list_files('docs/html'))), - ('docs/txt', list(list_files('docs/src'))) - ], + #data_files=[ + # ('docs/html', list(list_files('docs/html'))), + # ('docs/txt', list(list_files('docs/src'))) + #], entry_points=''' [python.templating.engines] jinja = jinja.plugin:BuffetPlugin --- NEW FILE python-jinja.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-jinja Version: 1.2 Release: 1%{?dist} Summary: Sandboxed template engine Group: Development/Languages License: BSD URL: http://jinja.pocoo.org/ Source0: http://pypi.python.org/packages/source/J/Jinja/Jinja-%{version}.tar.gz Patch0: %{name}-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel %if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel %else BuildRequires: python-setuptools %endif %description Jinja is a sandboxed template engine written in pure Python. It provides a Django-like non-XML syntax and compiles templates into executable python code. It's basically a combination of Django templates and python code. %prep %setup -q -n Jinja-%{version} %patch0 -p0 -b .docs %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT # fix EOL sed -i 's|\r$||g' LICENSE %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE TODO docs/html %{python_sitearch}/* %changelog * Tue Mar 11 2008 Thomas Moschny - 1.2-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja/F-7/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 17:33:52 -0000 1.1 +++ .cvsignore 12 Mar 2008 23:14:28 -0000 1.2 @@ -0,0 +1 @@ +Jinja-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-jinja/F-7/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 17:33:52 -0000 1.1 +++ sources 12 Mar 2008 23:14:28 -0000 1.2 @@ -0,0 +1 @@ +1235a005ade00b213800ff1e798c0241 Jinja-1.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 12 23:35:28 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 12 Mar 2008 23:35:28 GMT Subject: rpms/xulrunner/devel xulrunner-mozconfig, 1.15, 1.16 xulrunner.spec, 1.91, 1.92 Message-ID: <200803122335.m2CNZSJh018155@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18109 Modified Files: xulrunner-mozconfig xulrunner.spec Log Message: Build with system bzip2 and system lcms Reduces RPM size by about 250k Index: xulrunner-mozconfig =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-mozconfig,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xulrunner-mozconfig 9 Mar 2008 17:06:50 -0000 1.15 +++ xulrunner-mozconfig 12 Mar 2008 23:34:45 -0000 1.16 @@ -6,7 +6,9 @@ ac_add_options --with-system-nss ac_add_options --with-system-jpeg ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 #ac_add_options --with-system-png +ac_add_options --enable-system-lcms ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --with-pthreads Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- xulrunner.spec 12 Mar 2008 03:35:51 -0000 1.91 +++ xulrunner.spec 12 Mar 2008 23:34:45 -0000 1.92 @@ -63,8 +63,11 @@ BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nss-devel >= %{nss_version} BuildRequires: cairo-devel >= %{cairo_version} -BuildRequires: libpng-devel, libjpeg-devel -BuildRequires: zlib-devel, zip +BuildRequires: libpng-devel +BuildRequires: libjpeg-devel +BuildRequires: bzip2-devel +BuildRequires: zlib-devel +BuildRequires: lcms-devel BuildRequires: libIDL-devel BuildRequires: gtk2-devel BuildRequires: gnome-vfs2-devel From fedora-extras-commits at redhat.com Wed Mar 12 23:38:04 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 12 Mar 2008 23:38:04 GMT Subject: rpms/xulrunner/devel xulrunner.spec,1.92,1.93 Message-ID: <200803122338.m2CNc4Qm018227@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18196 Modified Files: xulrunner.spec Log Message: Use the buildroot du jour Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- xulrunner.spec 12 Mar 2008 23:34:45 -0000 1.92 +++ xulrunner.spec 12 Mar 2008 23:37:24 -0000 1.93 @@ -59,7 +59,7 @@ # --------------------------------------------------- -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nss-devel >= %{nss_version} BuildRequires: cairo-devel >= %{cairo_version} From fedora-extras-commits at redhat.com Wed Mar 12 23:38:55 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Wed, 12 Mar 2008 23:38:55 GMT Subject: rpms/qt/devel Trolltech.conf, NONE, 1.1 assistant.desktop, NONE, 1.1 designer.desktop, NONE, 1.1 linguist.desktop, NONE, 1.1 qconfig-multilib.h, NONE, 1.1 qt-43-aliasing.diff, NONE, 1.1 qt-copy-patches-svn_checkout.sh, NONE, 1.1 qt-x11-opensource-src-4.2.2-multilib.patch, NONE, 1.1 qt-x11-opensource-src-4.3.0-qassistant-qt4.patch, NONE, 1.1 qt-x11-opensource-src-4.3.4-aliasing.patch, NONE, 1.1 qt4-wrapper.sh, NONE, 1.1 qt4.csh, NONE, 1.1 qt4.sh, NONE, 1.1 qtconfig.desktop, NONE, 1.1 qtdemo.desktop, NONE, 1.1 .cvsignore, 1.27, 1.28 qt.spec, 1.161, 1.162 sources, 1.28, 1.29 0038-dragobject-dont-prefer-unknown.patch, 1.1, NONE 0047-fix-kmenu-width.diff, 1.1, NONE 0048-qclipboard_hack_80072.patch, 1.1, NONE 0056-khotkeys_input_84434.patch, 1.1, NONE 0073-xinerama-aware-qpopup.patch, 1.1, NONE 0077-utf8-decoder-fixes.diff, 1.1, NONE 0079-compositing-types.patch, 1.1, NONE 0080-net-wm-sync-request-2.patch, 1.1, NONE 0084-compositing-properties.patch, 1.1, NONE 0088-fix-xinput-clash.diff, 1.1, NONE assistant3.desktop, 1.2, NONE designer3.desktop, 1.3, NONE linguist3.desktop, 1.2, NONE qt-3.0.5-nodebug.patch, 1.1, NONE qt-3.1.0-makefile.patch, 1.1, NONE qt-3.3.3-gtkstyle.patch, 1.1, NONE qt-3.3.4-print-CJK.patch, 1.1, NONE qt-3.3.6-fontrendering-214371.patch, 1.1, NONE qt-3.3.6-fontrendering-bn_IN-209975.patch, 1.1, NONE qt-3.3.6-fontrendering-gu-228452.patch, 1.1, NONE qt-3.3.6-fontrendering-ml_IN-209097.patch, 1.1, NONE qt-3.3.6-fontrendering-ml_IN-209974.patch, 1.1, NONE qt-3.3.6-fontrendering-ml_IN-217657.patch, 1.1, NONE qt-3.3.6-fontrendering-te_IN-211259.patch, 1.1, NONE qt-3.3.8-fontrendering-#214570.patch, 1.1, NONE qt-3.3.8-fontrendering-as_IN-209972.patch, 1.1, NONE qt-uic-nostdlib.patch, 1.1, NONE qt-x11-free-3.3.2-quiet.patch, 1.1, NONE qt-x11-free-3.3.3-gl.patch, 1.1, NONE qt-x11-free-3.3.3-qembed.patch, 1.1, NONE qt-x11-free-3.3.4-fullscreen.patch, 1.1, NONE qt-x11-free-3.3.5-uic.patch, 1.1, NONE qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff, 1.1, NONE qt-x11-free-3.3.6-qfontdatabase_x11.patch, 1.1, NONE qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch, 1.1, NONE qt-x11-free-3.3.6-strip.patch, 1.1, NONE qt-x11-free-3.3.7-umask.patch, 1.1, NONE qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch, 1.1, NONE qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch, 1.1, NONE qt-x11-free-3.3.8b-gcc4-buildkey.patch, 1.1, NONE qt-x11-free-3.3.8b-gcc43.patch, 1.1, NONE qt-x11-free-3.3.8b-uic-multilib.patch, 1.1, NONE qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch, 1.2, NONE qt.csh, 1.1, NONE qt.sh, 1.1, NONE qtconfig3.desktop, 1.2, NONE Message-ID: <200803122338.m2CNctSg018285@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18233/devel Modified Files: .cvsignore qt.spec sources Added Files: Trolltech.conf assistant.desktop designer.desktop linguist.desktop qconfig-multilib.h qt-43-aliasing.diff qt-copy-patches-svn_checkout.sh qt-x11-opensource-src-4.2.2-multilib.patch qt-x11-opensource-src-4.3.0-qassistant-qt4.patch qt-x11-opensource-src-4.3.4-aliasing.patch qt4-wrapper.sh qt4.csh qt4.sh qtconfig.desktop qtdemo.desktop Removed Files: 0038-dragobject-dont-prefer-unknown.patch 0047-fix-kmenu-width.diff 0048-qclipboard_hack_80072.patch 0056-khotkeys_input_84434.patch 0073-xinerama-aware-qpopup.patch 0077-utf8-decoder-fixes.diff 0079-compositing-types.patch 0080-net-wm-sync-request-2.patch 0084-compositing-properties.patch 0088-fix-xinput-clash.diff assistant3.desktop designer3.desktop linguist3.desktop qt-3.0.5-nodebug.patch qt-3.1.0-makefile.patch qt-3.3.3-gtkstyle.patch qt-3.3.4-print-CJK.patch qt-3.3.6-fontrendering-214371.patch qt-3.3.6-fontrendering-bn_IN-209975.patch qt-3.3.6-fontrendering-gu-228452.patch qt-3.3.6-fontrendering-ml_IN-209097.patch qt-3.3.6-fontrendering-ml_IN-209974.patch qt-3.3.6-fontrendering-ml_IN-217657.patch qt-3.3.6-fontrendering-te_IN-211259.patch qt-3.3.8-fontrendering-#214570.patch qt-3.3.8-fontrendering-as_IN-209972.patch qt-uic-nostdlib.patch qt-x11-free-3.3.2-quiet.patch qt-x11-free-3.3.3-gl.patch qt-x11-free-3.3.3-qembed.patch qt-x11-free-3.3.4-fullscreen.patch qt-x11-free-3.3.5-uic.patch qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff qt-x11-free-3.3.6-qfontdatabase_x11.patch qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch qt-x11-free-3.3.6-strip.patch qt-x11-free-3.3.7-umask.patch qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch qt-x11-free-3.3.8b-gcc4-buildkey.patch qt-x11-free-3.3.8b-gcc43.patch qt-x11-free-3.3.8b-uic-multilib.patch qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch qt.csh qt.sh qtconfig3.desktop Log Message: Upgrade to Qt 4: * remove Qt 3 files * copy Qt 4 from qt4/devel * Wed Mar 12 2008 Kevin Kofler 4.3.4-6 - rename to qt on Fedora >= 9 --- NEW FILE Trolltech.conf --- [Qt] font="Sans Serif,10,-1,5,50,0,0,0,0,0" --- NEW FILE assistant.desktop --- [Desktop Entry] Name=Qt4 Assistant Comment=Shows Qt4 documentation and examples Exec=assistant-qt4 Icon=assistant Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Development;Documentation; --- NEW FILE designer.desktop --- [Desktop Entry] Name=Qt4 Designer GenericName=Interface Designer Comment=Design GUIs for Qt4 applications Exec=designer-qt4 Icon=designer MimeType=application/x-designer; Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Development; --- NEW FILE linguist.desktop --- [Desktop Entry] Name=Qt4 Linguist Comment=Add translations to Qt4 applications Exec=linguist-qt4 Icon=linguist4 MimeType=application/x-linguist; Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Development; --- NEW FILE qconfig-multilib.h --- /* qconfig.h */ /* This file is here to prevent a file conflict on multiarch systems. A * conflict will occur because qconfig.h has arch-specific definitions. * * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */ #if defined(__x86_64__) # include #elif defined(__i386__) # include #elif defined(__powerpc64__) # include #elif defined(__powerpc__) # include #elif defined(__s390x__) # include #elif defined(__s390__) # include #elif defined(__sparc64__) # include #elif defined(__sparc__) # include #else /* Should never reach this point, if so see bugzilla.redhat.com/223663 */ #error "This qt4-devel package does not work your architecture?" #endif qt-43-aliasing.diff: --- NEW FILE qt-43-aliasing.diff --- --- src/corelib/tools/qmap.h +++ src/corelib/tools/qmap.h @@ -185,6 +185,7 @@ public: class iterator { + friend class const_iterator; QMapData::Node *i; public: @@ -240,9 +241,9 @@ public: public: #endif inline bool operator==(const const_iterator &o) const - { return i == reinterpret_cast(o).i; } + { return i == o.i; } inline bool operator!=(const const_iterator &o) const - { return i != reinterpret_cast(o).i; } + { return i != o.i; } private: // ### Qt 5: remove @@ -252,6 +253,7 @@ public: class const_iterator { + friend class iterator; QMapData::Node *i; public: @@ -270,7 +272,7 @@ public: #else inline const_iterator(const iterator &o) #endif - { i = reinterpret_cast(o).i; } + { i = o.i; } inline const Key &key() const { return concrete(i)->key; } inline const T &value() const { return concrete(i)->value; } --- src/corelib/tools/qset.h +++ src/corelib/tools/qset.h @@ -84,6 +84,7 @@ public: { typedef QHash Hash; typename Hash::iterator i; + friend class const_iterator; public: typedef std::bidirectional_iterator_tag iterator_category; @@ -101,9 +102,9 @@ public: inline bool operator==(const iterator &o) const { return i == o.i; } inline bool operator!=(const iterator &o) const { return i != o.i; } inline bool operator==(const const_iterator &o) const - { return i == reinterpret_cast(o).i; } + { return i == o.i; } inline bool operator!=(const const_iterator &o) const - { return i != reinterpret_cast(o).i; } + { return i != o.i; } inline iterator &operator++() { ++i; return *this; } inline iterator operator++(int) { iterator r = *this; ++i; return r; } inline iterator &operator--() { --i; return *this; } @@ -118,6 +119,7 @@ public: { typedef QHash Hash; typename Hash::const_iterator i; + friend class iterator; public: typedef std::bidirectional_iterator_tag iterator_category; @@ -130,7 +132,7 @@ public: inline const_iterator(typename Hash::const_iterator o) : i(o) {} inline const_iterator(const const_iterator &o) : i(o.i) {} inline const_iterator(const iterator &o) - : i(reinterpret_cast(o).i) {} + : i(o.i) {} inline const_iterator &operator=(const const_iterator &o) { i = o.i; return *this; } inline const T &operator*() const { return i.key(); } inline const T *operator->() const { return &i.key(); } --- src/corelib/tools/qhash.h +++ src/corelib/tools/qhash.h @@ -291,6 +291,7 @@ public: class iterator { + friend class const_iterator; QHashData::Node *i; public: @@ -343,9 +344,9 @@ public: public: #endif inline bool operator==(const const_iterator &o) const - { return i == reinterpret_cast(o).i; } + { return i == o.i; } inline bool operator!=(const const_iterator &o) const - { return i != reinterpret_cast(o).i; } + { return i != o.i; } private: // ### Qt 5: remove @@ -355,6 +356,7 @@ public: class const_iterator { + friend class iterator; QHashData::Node *i; public: @@ -374,7 +376,7 @@ public: #else inline const_iterator(const iterator &o) #endif - { i = reinterpret_cast(o).i; } + { i = o.i; } inline const Key &key() const { return concrete(i)->key; } inline const T &value() const { return concrete(i)->value; } --- src/corelib/tools/qlist.h +++ src/corelib/tools/qlist.h @@ -162,17 +162,17 @@ public: inline bool operator>=(const iterator& other) const { return i >= other.i; } #ifndef QT_STRICT_ITERATORS inline bool operator==(const const_iterator &o) const - { return i == reinterpret_cast(o).i; } + { return i == o.i; } inline bool operator!=(const const_iterator &o) const - { return i != reinterpret_cast(o).i; } + { return i != o.i; } inline bool operator<(const const_iterator& other) const - { return i < reinterpret_cast(other).i; } + { return i < other.i; } inline bool operator<=(const const_iterator& other) const - { return i <= reinterpret_cast(other).i; } + { return i <= other.i; } inline bool operator>(const const_iterator& other) const - { return i > reinterpret_cast(other).i; } + { return i > other.i; } inline bool operator>=(const const_iterator& other) const - { return i >= reinterpret_cast(other).i; } + { return i >= other.i; } #endif inline iterator &operator++() { ++i; return *this; } inline iterator operator++(int) { Node *n = i; ++i; return n; } --- src/corelib/tools/qlinkedlist.h +++ src/corelib/tools/qlinkedlist.h @@ -119,9 +119,9 @@ public: inline bool operator==(const iterator &o) const { return i == o.i; } inline bool operator!=(const iterator &o) const { return i != o.i; } inline bool operator==(const const_iterator &o) const - { return i == reinterpret_cast(o).i; } + { return i == o.i; } inline bool operator!=(const const_iterator &o) const - { return i != reinterpret_cast(o).i; } + { return i != o.i; } inline iterator &operator++() { i = i->n; return *this; } inline iterator operator++(int) { Node *n = i; i = i->n; return n; } inline iterator &operator--() { i = i->p; return *this; } --- NEW FILE qt-copy-patches-svn_checkout.sh --- #!/bin/bash DATE=$(date +%Y%m%d) EXPORT_DIR=qt-copy set -x rm -rf $EXPORT_DIR # app svn export --non-recursive svn://anonsvn.kde.org/home/kde/branches/qt/4.3 $EXPORT_DIR/ svn export svn://anonsvn.kde.org/home/kde/branches/qt/4.3/patches $EXPORT_DIR/patches pushd $EXPORT_DIR rm -f ../qt-copy-patches-${DATE}svn.tar.bz2 tar cjf ../qt-copy-patches-${DATE}svn.tar.bz2 \ .applied_patches apply_patches README.qt-copy patches/ popd # cleanup rm -rf $EXPORT_DIR qt-x11-opensource-src-4.2.2-multilib.patch: --- NEW FILE qt-x11-opensource-src-4.2.2-multilib.patch --- --- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 +++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf 2007-02-26 15:01:02.000000000 -0600 @@ -14,6 +14,8 @@ QMAKE_CFLAGS = -m64 QMAKE_LFLAGS = -m64 +QMAKE_CFLAGS_RELEASE += -O2 + include(../common/g++.conf) include(../common/linux.conf) --- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 +++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf 2007-02-26 15:01:34.000000000 -0600 @@ -11,6 +11,8 @@ QMAKE_CFLAGS = -m32 QMAKE_LFLAGS = -m32 +QMAKE_CFLAGS_RELEASE += -O2 + include(../common/g++.conf) include(../common/linux.conf) load(qt_config) --- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 +++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf 2007-02-26 15:01:26.000000000 -0600 @@ -8,6 +8,8 @@ QT += core gui QMAKE_INCREMENTAL_STYLE = sublib +QMAKE_CFLAGS_RELEASE += -O2 + include(../common/g++.conf) include(../common/linux.conf) load(qt_config) --- qt-x11-opensource-src-4.2.2/qmake/project.cpp.QMAKEPATH 2006-11-27 11:26:03.000000000 -0600 +++ qt-x11-opensource-src-4.2.2/qmake/project.cpp 2007-02-26 13:45:39.000000000 -0600 @@ -498,6 +498,7 @@ ret << ((*it) + concat); } ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat; + ret << QLibraryInfo::location(QLibraryInfo::PrefixPath) + concat; return ret; } qt-x11-opensource-src-4.3.0-qassistant-qt4.patch: --- NEW FILE qt-x11-opensource-src-4.3.0-qassistant-qt4.patch --- --- qt-x11-opensource-src-4.3.0beta/tools/assistant/lib/qassistantclient.cpp.assistant4 2007-03-19 15:15:06.000000000 -0500 +++ qt-x11-opensource-src-4.3.0beta/tools/assistant/lib/qassistantclient.cpp 2007-03-21 14:02:59.000000000 -0500 @@ -172,7 +172,7 @@ : QObject( parent ), host ( QLatin1String("localhost") ) { if ( path.isEmpty() ) - assistantCommand = QLatin1String("assistant"); + assistantCommand = QLatin1String("assistant-qt4"); else { QFileInfo fi( path ); if ( fi.isDir() ) qt-x11-opensource-src-4.3.4-aliasing.patch: --- NEW FILE qt-x11-opensource-src-4.3.4-aliasing.patch --- diff -up qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h.me qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h --- qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h.me 2008-02-29 16:32:54.000000000 +0100 +++ qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h 2008-02-29 17:05:03.000000000 +0100 @@ -178,8 +178,13 @@ struct QBasicAtomicPointer #endif // Q_SPECIALIZED_QATOMIC template +#if defined(QT_MOC) || defined(QT_BUILD_QMAKE) || defined(QT_UIC) +inline T qAtomicSetPtr(T *ptr, T newval) +{ T ret = *ptr; *ptr = newval; return ret; } +#else inline T qAtomicSetPtr(volatile T *ptr, T newval) { return static_cast(q_atomic_set_ptr(ptr, newval)); } +#endif // High-level atomic integer operations class QAtomic : public QBasicAtomic --- NEW FILE qt4-wrapper.sh --- #!/bin/bash if [ -z "$QT4DIR" ] ; then # rpm is more correct multilib-wise, provided /etc/rpm/platform doesn't get in the way. QT4DIR="$(/bin/rpm --eval "%{_libdir}/qt4" 2>/dev/null || /usr/bin/pkg-config --variable=prefix QtCore )" export QT4DIR fi if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then PATH=${QT4DIR}/bin:${PATH} export PATH fi exec $QT4DIR/bin/`basename $0` ${1+"$@"} --- NEW FILE qt4.csh --- # Qt4 initialization script (csh) if ( $?QMAKESPEC ) then exit endif setenv QMAKESPEC @@QMAKESPEC@@ --- NEW FILE qt4.sh --- # Qt4 initialization script (sh) if [ -z "$QMAKESPEC" ] ; then QMAKESPEC=@@QMAKESPEC@@ export QMAKESPEC fi --- NEW FILE qtconfig.desktop --- [Desktop Entry] Name=Qt4 Config Comment=Configure Qt4 behavior, styles, fonts Exec=qtconfig-qt4 Icon=qt4-logo Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Settings; --- NEW FILE qtdemo.desktop --- [Desktop Entry] Name=Qt4 Demo Comment=Show Qt4 demos and programming examples Exec=qtdemo-qt4 Icon=qt4-logo Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Development; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 23 Jan 2008 15:58:17 -0000 1.27 +++ .cvsignore 12 Mar 2008 23:38:15 -0000 1.28 @@ -1,10 +1,4 @@ -qt-x11-free-3.3.3.tar.bz2 -qt-x11-immodule-unified-qt3.3.3-20040910.diff.bz2 -qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 -qt-x11-free-3.3.4.tar.bz2 -qt-x11-free-3.3.5.tar.bz2 -qt-x11-immodule-unified-qt3.3.5-20051012.diff.bz2 -qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 -qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2 -qt-x11-free-3.3.8.tar.bz2 -qt-x11-free-3.3.8b.tar.gz +hi128-app-qt4-logo.png +hi48-app-qt4-logo.png +qt-copy-patches-20080305svn.tar.bz2 +qt-x11-opensource-src-4.3.4.tar.gz View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.161 -r 1.162 qt.spec Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- qt.spec 11 Mar 2008 17:17:16 -0000 1.161 +++ qt.spec 12 Mar 2008 23:38:15 -0000 1.162 @@ -1,1811 +1,1107 @@ -Summary: The shared library for the Qt 3 GUI toolkit -%if 0 -#if 0%{?fedora} > 8 -Name: qt3 -Obsoletes: qt < 1:%{version}-%{release} -Provides: qt = 1:%{version}-%{release} + +# Fedora Review: http://bugzilla.redhat.com/188180 + +Summary: Qt toolkit +%if 0%{?fedora} > 8 +Name: qt %else -Name: qt -Epoch: 1 -Obsoletes: qt3 < %{version}-%{release} -Provides: qt3 = %{version}-%{release} +Name: qt4 %endif -Version: 3.3.8b -Release: 8%{?dist} -License: QPL or GPLv2 or GPLv3 +Version: 4.3.4 +Release: 6%{?dist} + +# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) +License: GPLv3 or GPLv2 with exceptions or QPL Group: System Environment/Libraries +Url: http://www.trolltech.com/products/qt/ +Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Url: http://www.troll.no -Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.gz -Source2: qt.sh -Source3: qt.csh -Source4: designer3.desktop -Source5: assistant3.desktop -Source6: linguist3.desktop -Source7: qtconfig3.desktop - -Patch1: qt-3.3.4-print-CJK.patch -Patch2: qt-3.0.5-nodebug.patch -Patch3: qt-3.1.0-makefile.patch -Patch4: qt-x11-free-3.3.7-umask.patch -Patch5: qt-x11-free-3.3.6-strip.patch -Patch7: qt-x11-free-3.3.2-quiet.patch -Patch8: qt-x11-free-3.3.3-qembed.patch -Patch12: qt-uic-nostdlib.patch -Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch -Patch14: qt-x11-free-3.3.3-gl.patch -Patch19: qt-3.3.3-gtkstyle.patch -Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch -Patch24: qt-x11-free-3.3.5-uic.patch -Patch25: qt-x11-free-3.3.8b-uic-multilib.patch -Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch -Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch -Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch -Patch32: qt-3.3.6-fontrendering-214371.patch -Patch33: qt-3.3.8-fontrendering-#214570.patch -Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch -Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch -Patch37: qt-3.3.6-fontrendering-gu-228452.patch - -# immodule patches -Patch50: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch -Patch51: qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2 -Patch52: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch -Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch -Patch54: qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff -Patch55: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch - -# qt-copy patches -Patch100: 0038-dragobject-dont-prefer-unknown.patch -Patch101: 0047-fix-kmenu-width.diff -Patch102: 0048-qclipboard_hack_80072.patch -Patch103: 0056-khotkeys_input_84434.patch -patch105: 0073-xinerama-aware-qpopup.patch -Patch107: 0079-compositing-types.patch -Patch108: 0080-net-wm-sync-request-2.patch -Patch110: 0084-compositing-properties.patch -Patch111: 0088-fix-xinput-clash.diff - -# upstream patches -Patch200: qt-x11-free-3.3.4-fullscreen.patch -Patch201: qt-x11-free-3.3.8b-gcc43.patch - -%define qt_dirname qt-3.3 -%define qtdir %{_libdir}/%{qt_dirname} -%define qt_docdir %{_docdir}/qt-devel-%{version} - -%define smp 1 -%define immodule 1 -%define debug 0 - -# MySQL plugins -%define plugin_mysql -plugin-sql-mysql -%define mysql_include_dir %{_includedir}/mysql -%define mysql_lib_dir %{_libdir}/mysql - -# Postgres plugins -%define plugin_psql -plugin-sql-psql - -# ODBC plugins -%define plugin_odbc -plugin-sql-odbc - -# sqlite plugins -%define plugin_sqlite -plugin-sql-sqlite - -%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng -%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires: fileutils -Requires: fontconfig >= 2.0 -Requires: /etc/ld.so.conf.d -Requires: pkgconfig +%if "%{name}" != "qt4" +Epoch: 1 +Obsoletes: qt4 < %{version}-%{release} +Provides: qt4 = %{version}-%{release} +%endif + +Source4: Trolltech.conf + +# See http://bugzilla.redhat.com/223663 +%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc +Source5: qconfig-multilib.h + +# search for assistant-qt4 instead of (qt3's) assistant in $PATH +Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch +# multilib hacks +Patch2: qt-x11-opensource-src-4.2.2-multilib.patch +# strict aliasing violations in tool classes +Patch3: qt-43-aliasing.diff +Patch4: qt-x11-opensource-src-4.3.4-aliasing.patch + +## qt-copy patches +%define qt_copy 20080305 +Source1: qt-copy-patches-svn_checkout.sh +Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2 +%{?qt_copy:Provides: qt-copy = %{qt_copy}} +%{?qt_copy:Provides: qt4-copy = %{qt_copy}} + +Source10: qt4-wrapper.sh +Source11: qt4.sh +Source12: qt4.csh + +Source20: assistant.desktop +Source21: designer.desktop +Source22: linguist.desktop +Source23: qtdemo.desktop +Source24: qtconfig.desktop + +# upstream qt4-logo, http://trolltech.com/images/products/qt/qt4-logo +Source30: hi128-app-qt4-logo.png +Source31: hi48-app-qt4-logo.png + +## optional plugin bits +# set to -no-sql- to disable +# set to -qt-sql- to enable *in* qt library +%define mysql -plugin-sql-mysql +%define odbc -plugin-sql-odbc +%define psql -plugin-sql-psql +%define sqlite -plugin-sql-sqlite + +# undefine to disable these +%define nas -system-nas-sound +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 +%define qdbus -qdbus +BuildRequires: dbus-devel >= 0.62 +%endif + +# See http://bugzilla.redhat.com/196901 +%define _qt4_prefix %{_libdir}/qt4 +%define _qt4_bindir %{_qt4_prefix}/bin +# _qt4_datadir is not multilib clean, and hacks to workaround that breaks stuff. +#define _qt4_datadir %{_datadir}/qt4 +%define _qt4_datadir %{_qt4_prefix} +%define _qt4_demosdir %{_qt4_prefix}/demos +%define _qt4_docdir %{_docdir}/qt4 +%define _qt4_examplesdir %{_qt4_prefix}/examples +%define _qt4_headerdir %{_includedir} +%define _qt4_libdir %{_libdir} +%define _qt4_plugindir %{_qt4_prefix}/plugins +%define _qt4_sysconfdir %{_sysconfdir} +%define _qt4_translationdir %{_datadir}/qt4/translations + +%if "%{_qt4_libdir}" != "%{_libdir}" +Prereq: /etc/ld.so.conf.d [...2405 lines suppressed...] +- - ./configure -xfixes, BR: libXfixes-devel + +* Mon Aug 07 2006 Rex Dieter 4.2.0-0.5.tp1 +- fix empty -debuginfo +- use $RPM_OPT_FLAGS + +* Thu Jul 20 2006 Rex Dieter 4.2.0-0.4.tp1 +- strip -laudio, -ldbus-1, -lglib-2.0 from .pc files + +* Thu Jul 20 2006 Rex Dieter 4.2.0-0.3.tp1 +- -no-reduce-exports (for now) +- -fno-strict-aliasing (fc5+) + +* Fri Jul 07 2006 Rex Dieter 4.2.0-0.2.tp1 +- -system-nas-sound, BR: nas-devel (bug # 197937) +- -qdbus (fc6+, BR: dbus-devel >= 0.62) +- -glib (BR: glib2-devel) + +* Fri Jun 30 2006 Rex Dieter 4.2.0-0.1.tp1 +- 4.2.0-tp1 (technology preview 1) + +* Thu Jun 29 2006 Rex Dieter 4.1.4-5 +- make FHS-friendly (bug #196901) +- cleanup %%_bindir symlinks, (consistently) use qt4 postfix + +* Wed Jun 28 2006 Rex Dieter 4.1.4-4 +- x11: split-out gui(x11) from non-gui bits (bug #196899) + +* Mon Jun 26 2006 Rex Dieter 4.1.4-3 +- -debug: drop, adds nothing over -debuginfo, make lib..._debug + symlinks instead (bug #196513) +- assistant.desktop: fix tooltip (bug #197039) + +* Mon Jun 26 2006 Rex Dieter 4.1.4-2 +- -devel: include -debug libs (bug #196513) +- -devel: move libQtDesigner here +- -config: mash into main pkg, should be multilib friendly now + +* Fri Jun 23 2006 Rex Dieter 4.1.4-1 +- 4.1.4 + +* Tue Jun 20 2006 Rex Dieter 4.1.3-9 +- make each sql plugin optional + +* Fri Jun 09 2006 Rex Dieter 4.1.3-8 +- qmake.conf: undefine QMAKE_STRIP to get useful -debuginfo (bug #193602) +- move (not symlink) .pc files into %%_libdir/pkgconfig + +* Thu Jun 08 2006 Rex Dieter 4.1.3-7 +- *really* fix qt4-wrapper.sh for good this time. + +* Mon May 29 2006 Rex Dieter 4.1.3-6 +- make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't + installed (#193369) + +* Fri May 26 2006 Rex Dieter 4.1.3-5 +- strip -lXi from .pc files (#193258) +- simplify sql plugin builds via %%buildSQL macro +- -libdir %%qt_libdir + +* Wed May 24 2006 Rex Dieter 4.1.3-4 +- move (most) %%dir ownership (back) to main pkg + +* Sun May 21 2006 Rex Dieter 4.1.3-3 +- fix %%mysql_libs macro + +* Sat May 20 2006 Rex Dieter 4.1.3-2 +- -mysql: use mysql_config for setting cflags/ldflags. +- -mysql: BR: mysql-devel > 4.0 + +* Sat May 20 2006 Laurent Rineau +- Fix the last reference to %{qtdir}/lib: use %{_lib} instead of "lib". +- Fix the ownership of subpackages: they need to own parents of directories they install files in. + +* Fri May 19 2006 Rex Dieter 4.1.3-1 +- 4.1.3 +- %%qtdir/lib/*.pc -> %%qtdir/%%_lib/*.pc + (hopefully, the last hardcoded reference to %%qtdir/lib) + +* Fri May 19 2006 Rex Dieter 4.1.2-20 +- fix some unowned dirs +- try harder to purge %%builddir from .pc,.prl files +- -docdir %%_docdir/%%name-doc-%%version, since we use %%doc macro in main pkg +- -doc: own %%qt_docdir +- use qt4-wrapper.sh to ensure launch of qt4 versions of apps that + (may) overlap with those from qt3 +- use %%qtdir/%%_lib in ld.so.conf.d/*.conf files too + +* Tue May 16 2006 Rex Dieter 4.1.2-19 +- drop libQtAssistantClient,libQtUiTools shlib patches + +* Tue May 16 2006 Rex Dieter 4.1.2-18 +- %%_bindir symlinks: qtconfig4 -> qt4config, qtdemo4 -> qt4demo +- -libdir %%qtdir/%%_lib, simplifies %%_lib != lib case +- -docdir %%_docdir/%%name-%%version +- build shared versions of libQtAssistantClient,libQtUiTools too +- strip extraneous -L paths, libs from *.prl files too + +* Tue May 16 2006 Rex Dieter 4.1.2-17 +- .desktop: Qt -> Qt4, and Comment= (where missing) +- -devel: include -designer here, Obsoletes/Provides: %%name-designer. + It's small, simplifies things... one less subpkg to worry about. +- -doc: include %%qtdir/doc symlink here +- -docdir %%_docdir/%%name-doc-%%version + +* Mon May 15 2006 Rex Dieter 4.1.2-16 +- set/use RPM_OPT_FLAGS only for our platform +- (really) don't give %%_bindir symlink for qt3to4 another "4" suffix +- don't add 4 suffix to uic3, rcc (they don't conflict with qt(3)-devel) +- -devel: add linguist.desktop +- -doc: move assistant here, Provides: %%{name}-assistant, add assistant.desktop +- -doc: add qtdemo.desktop +- -doc: Requires qt4 (instead of qt4-devel) +- assistant4.patch: search for assistant4 instead of (qt3's) assistant in $PATH +- -qtconfig: add qtconfig.desktop +- updated %%sumaries to mention where (some) tools are, including assistant, linguist, + qtdemo + +* Mon May 15 2006 Laurent Rineau - 4.1.2-15 +- Rename -docs to -doc. +- Files in the -doc subpackage are no longer in %%doc. +- Move qtdemo to the subpackage -doc. +- Fix symlinks in %%{_bindir}. +- Only modify mkspecs/linux-g++*/qmake.conf, instead of all mkspecs/*/qmake.conf. + +* Sun May 14 2006 Rex Dieter 4.1.2-14 +- remove MapNotify from .desktop file(s). +- install -m644 LICENSE.* +- -docs: don't mark examples as %doc +- drop unused %%debug macro + +* Sat May 13 2006 Rex Dieter 4.1.2-13 +- include unpackaged pkgconfig files + +* Sat May 13 2006 Rex Dieter 4.1.2-12 +- fix typos so it actually builds. + +* Sat May 13 2006 Rex Dieter 4.1.2-11 +- drop optional ld.so.conf.d usage, make mandatory +- make %%_bindir symlinks to all %%qtdir/bin stuff (even qt3to4) +- pkgconfig files: hardlinks -> relative symlinks, strip -L%{_libdir}/mysql + and -L%%{_builddir}/qt-x11-opensource-src-%%version/lib +- cleanup/simplify Summary/%%description entries +- $RPM_BUILD_ROOT -> %%buildroot, $RPM_BUILD_DIR -> %%_builddir + +* Sat May 13 2006 Rex Dieter 4.1.2-10 +- cleanup/simplify license bits, include LICENSE.QPL +- drop unused -styles/-Xt subpkg reference +- drop unused motif extention bits +- drop initialpreference from .desktop files + +* Fri May 12 2006 Rex Dieter 4.1.2-9 +- drop reference to non-existent config.test/unix/checkavail + +* Fri May 12 2006 Rex Dieter 4.1.2-8 +- simplify build* macros +- lower-case all subpkgs (ie, -MySQL -> -mysql ) +- drop BR: perl, sed + +* Thu May 11 2006 Rex Dieter 4.1.2-7 +- rework %%post/%%postun, mostly to placate rpmlint +- drop Prefix: +- drop use of qt4.(sh|csh), they're empty atm anyway +- use Source'd designer.desktop (instead of inline cat/echo) +- symlinks to %%_bindir: qmake4, designer4, qtconfig4 +- drop qtrc, qt4 doesn't use it. +- -docs subpkg for API html docs, demos, examples. +- BR: libXcursor-devel libXi-devel (fc5+) + +* Thu Apr 27 2006 Rex Dieter 4.1.2-6 +- devel: Requires: pkgconfig + +* Sat Apr 15 2006 Simon Perreault 4.1.2-5 +- Disable C++ exceptions. + +* Mon Apr 10 2006 Rex Dieter 4.1.2-4 +- qt4.(sh|csh): place-holders only, don't define QTDIR (and QTLIB) + as that (potentially) conflicts with qt-3.x. + +* Thu Apr 06 2006 Rex Dieter 4.1.2-2 +- -devel: Drop (artificial) Conflicts: qt-devel +- fix %%ld_so_conf_d usage +- %%qtdir/%%_lib symlink + +* Wed Apr 05 2006 Rex Dieter 4.1.2-1 +- drop Epoch +- cleanup (a lot!) -* Mon Jan 04 1999 Preston Brown -- made setup phase silent. +* Tue Dec 20 2005 Than Ngo 1:4.1.0-0.1 +- update to 4.1.0 -* Fri Dec 04 1998 Preston Brown -- upgraded to qt 1.42, released today. +* Fri Sep 09 2005 Than Ngo 1:4.0.1-0.1 +- update to 4.0.1 -* Tue Dec 01 1998 Preston Brown -- took Arnts RPM and made some minor changes for Red Hat. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 23 Jan 2008 15:58:17 -0000 1.28 +++ sources 12 Mar 2008 23:38:15 -0000 1.29 @@ -1,2 +1,4 @@ -91adfea39f17a64b86497bce32782cf3 qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2 -9f05b4125cfe477cc52c9742c3c09009 qt-x11-free-3.3.8b.tar.gz +d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png +6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png +e07759e773b8ec38ce222b6fd5e9f0c5 qt-copy-patches-20080305svn.tar.bz2 +9499101ec54eb7b0de195b3c5e3ffa93 qt-x11-opensource-src-4.3.4.tar.gz --- 0038-dragobject-dont-prefer-unknown.patch DELETED --- --- 0047-fix-kmenu-width.diff DELETED --- --- 0048-qclipboard_hack_80072.patch DELETED --- --- 0056-khotkeys_input_84434.patch DELETED --- --- 0073-xinerama-aware-qpopup.patch DELETED --- --- 0077-utf8-decoder-fixes.diff DELETED --- --- 0079-compositing-types.patch DELETED --- --- 0080-net-wm-sync-request-2.patch DELETED --- --- 0084-compositing-properties.patch DELETED --- --- 0088-fix-xinput-clash.diff DELETED --- --- assistant3.desktop DELETED --- --- designer3.desktop DELETED --- --- linguist3.desktop DELETED --- --- qt-3.0.5-nodebug.patch DELETED --- --- qt-3.1.0-makefile.patch DELETED --- --- qt-3.3.3-gtkstyle.patch DELETED --- --- qt-3.3.4-print-CJK.patch DELETED --- --- qt-3.3.6-fontrendering-214371.patch DELETED --- --- qt-3.3.6-fontrendering-bn_IN-209975.patch DELETED --- --- qt-3.3.6-fontrendering-gu-228452.patch DELETED --- --- qt-3.3.6-fontrendering-ml_IN-209097.patch DELETED --- --- qt-3.3.6-fontrendering-ml_IN-209974.patch DELETED --- --- qt-3.3.6-fontrendering-ml_IN-217657.patch DELETED --- --- qt-3.3.6-fontrendering-te_IN-211259.patch DELETED --- --- qt-3.3.8-fontrendering-#214570.patch DELETED --- --- qt-3.3.8-fontrendering-as_IN-209972.patch DELETED --- --- qt-uic-nostdlib.patch DELETED --- --- qt-x11-free-3.3.2-quiet.patch DELETED --- --- qt-x11-free-3.3.3-gl.patch DELETED --- --- qt-x11-free-3.3.3-qembed.patch DELETED --- --- qt-x11-free-3.3.4-fullscreen.patch DELETED --- --- qt-x11-free-3.3.5-uic.patch DELETED --- --- qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff DELETED --- --- qt-x11-free-3.3.6-qfontdatabase_x11.patch DELETED --- --- qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch DELETED --- --- qt-x11-free-3.3.6-strip.patch DELETED --- --- qt-x11-free-3.3.7-umask.patch DELETED --- --- qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch DELETED --- --- qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch DELETED --- --- qt-x11-free-3.3.8b-gcc4-buildkey.patch DELETED --- --- qt-x11-free-3.3.8b-gcc43.patch DELETED --- --- qt-x11-free-3.3.8b-uic-multilib.patch DELETED --- --- qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch DELETED --- --- qt.csh DELETED --- --- qt.sh DELETED --- --- qtconfig3.desktop DELETED --- From fedora-extras-commits at redhat.com Wed Mar 12 23:51:14 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 12 Mar 2008 23:51:14 GMT Subject: rpms/libpanelappletmm/devel .cvsignore, 1.2, 1.3 libpanelappletmm.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200803122351.m2CNpE2f018565@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/libpanelappletmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18534 Modified Files: .cvsignore libpanelappletmm.spec sources Log Message: Update to upstream 2.22.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libpanelappletmm/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Aug 2007 21:37:28 -0000 1.2 +++ .cvsignore 12 Mar 2008 23:50:35 -0000 1.3 @@ -1 +1 @@ -libpanelappletmm-2.6.0.tar.bz2 +libpanelappletmm-2.22.0.tar.bz2 Index: libpanelappletmm.spec =================================================================== RCS file: /cvs/pkgs/rpms/libpanelappletmm/devel/libpanelappletmm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libpanelappletmm.spec 19 Feb 2008 01:18:41 -0000 1.2 +++ libpanelappletmm.spec 12 Mar 2008 23:50:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: libpanelappletmm -Version: 2.6.0 -Release: 3%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Summary: C++ interface for Gnome panel applets Group: System Environment/Libraries @@ -11,7 +11,7 @@ BuildRequires: gconfmm26-devel >= 2.6.0 BuildRequires: libgnomemm26-devel >= 2.6.0 -BuildRequires: gnome-panel-devel >= 2.6.0 +BuildRequires: gnome-panel-devel >= 2.14.0 BuildRequires: doxygen, graphviz @@ -82,6 +82,9 @@ %changelog +* Thu Mar 13 2008 Denis Leroy - 2.22.0-1 +- Update to upstream 2.22.0 + * Mon Feb 18 2008 Fedora Release Engineering - 2.6.0-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libpanelappletmm/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Aug 2007 21:37:28 -0000 1.2 +++ sources 12 Mar 2008 23:50:35 -0000 1.3 @@ -1 +1 @@ -74368673013ca6fe470d2b3f4a06b1df libpanelappletmm-2.6.0.tar.bz2 +9209dd219a3f4542753743f3c8666e79 libpanelappletmm-2.22.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 12 23:56:34 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 23:56:34 +0000 Subject: [pkgdb] xgridfit was added for nim Message-ID: <200803122359.m2CNxkkW004970@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) has added Package xgridfit with summary Font hinting tool Kevin Fenzi (kevin) has approved Package xgridfit Kevin Fenzi (kevin) has added a Fedora devel branch for xgridfit with an owner of nim Kevin Fenzi (kevin) has approved xgridfit in Fedora devel Kevin Fenzi (kevin) has approved Package xgridfit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xgridfit (Fedora devel) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xgridfit (Fedora devel) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xgridfit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xgridfit From fedora-extras-commits at redhat.com Wed Mar 12 23:56:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 23:56:45 +0000 Subject: [pkgdb] xgridfit (Fedora, 8) updated by kevin Message-ID: <200803122359.m2CNxvwD004999@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) added a Fedora 8 branch for xgridfit Kevin Fenzi (kevin) has set commit to Approved for cvsextras on xgridfit (Fedora 8) Kevin Fenzi (kevin) has set build to Approved for cvsextras on xgridfit (Fedora 8) Kevin Fenzi (kevin) has set checkout to Approved for cvsextras on xgridfit (Fedora 8) Kevin Fenzi (kevin) approved watchbugzilla on xgridfit (Fedora 8) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on xgridfit (Fedora 8) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on xgridfit (Fedora 8) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xgridfit From fedora-extras-commits at redhat.com Wed Mar 12 23:56:45 2008 From: fedora-extras-commits at redhat.com (Fedora PackageDB (pkgdb)) Date: Wed, 12 Mar 2008 23:56:45 +0000 Subject: [pkgdb] xgridfit (Fedora, devel) updated by kevin Message-ID: <200803122359.m2CNxvwG004999@bastion.fedora.phx.redhat.com> Kevin Fenzi (kevin) approved watchbugzilla on xgridfit (Fedora devel) for fonts-sig Kevin Fenzi (kevin) approved watchcommits on xgridfit (Fedora devel) for fonts-sig Kevin Fenzi (kevin) Approved cvsextras for commit access on xgridfit (Fedora devel) To make changes to this package see: https://admin.fedoraproject.org/pkgdb/packages/name/xgridfit From fedora-extras-commits at redhat.com Wed Mar 12 23:57:33 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 23:57:33 GMT Subject: rpms/xgridfit - New directory Message-ID: <200803122357.m2CNvXQ9018719@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xgridfit In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18684/rpms/xgridfit Log Message: Directory /cvs/extras/rpms/xgridfit added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 23:57:41 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 23:57:41 GMT Subject: rpms/xgridfit/devel - New directory Message-ID: <200803122357.m2CNvfnf018735@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xgridfit/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18684/rpms/xgridfit/devel Log Message: Directory /cvs/extras/rpms/xgridfit/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 12 23:57:46 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 23:57:46 GMT Subject: rpms/xgridfit Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200803122357.m2CNvkoj018761@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xgridfit In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18684/rpms/xgridfit Added Files: Makefile import.log Log Message: Setup of module xgridfit --- NEW FILE Makefile --- # Top level Makefile for module xgridfit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Mar 12 23:57:55 2008 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 12 Mar 2008 23:57:55 GMT Subject: rpms/xgridfit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200803122357.m2CNvtjB018782@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xgridfit/devel In directory cvs-int.fedora.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR18684/rpms/xgridfit/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xgridfit --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: xgridfit # $Id: Makefile,v 1.1 2008/03/12 23:57:47 kevin Exp $ NAME := xgridfit SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Mar 13 00:09:56 2008 From: fedora-extras-commits at redhat.com (Michal Schmidt (michich)) Date: Thu, 13 Mar 2008 00:09:56 GMT Subject: rpms/icecream/devel icecream.spec,1.8,1.9 icecream.te,1.3,1.4 Message-ID: <200803130009.m2D09uKB025153@cvs-int.fedora.redhat.com> Author: michich Update of /cvs/pkgs/rpms/icecream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25113 Modified Files: icecream.spec icecream.te Log Message: * Thu Mar 13 2008 Michal Schmidt - 0.8.0-11.20080117svn - Minor SELinux policy fix. Index: icecream.spec =================================================================== RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- icecream.spec 10 Feb 2008 22:27:13 -0000 1.8 +++ icecream.spec 13 Mar 2008 00:09:06 -0000 1.9 @@ -13,7 +13,7 @@ Name: icecream Version: 0.8.0 -Release: 10.20080117svn%{?dist} +Release: 11.20080117svn%{?dist} Summary: Distributed compiler Group: Development/Tools @@ -182,8 +182,8 @@ %{_datadir}/selinux/${selinuxvariant}/icecream.pp 2>/dev/null ||: done fixfiles -R %{name} restore ||: -restorecon -R %{_localstatedir}/cache/icecream ||: -restorecon %{_localstatedir}/log/iceccd ||: +restorecon -R %{_localstatedir}/cache/icecream 2>/dev/null ||: +restorecon %{_localstatedir}/log/iceccd 2>/dev/null ||: semanage port -a -t iceccd_port_t -p tcp 10245 2>/dev/null ||: semanage port -a -t icecc_scheduler_port_t -p tcp 8765 2>/dev/null ||: semanage port -a -t icecc_scheduler_port_t -p udp 8765 2>/dev/null ||: @@ -250,6 +250,9 @@ %{_libdir}/pkgconfig/icecc.pc %changelog +* Thu Mar 13 2008 Michal Schmidt - 0.8.0-11.20080117svn +- Minor SELinux policy fix. + * Sun Feb 10 2008 Michal Schmidt - 0.8.0-10.20080117svn - Compile fix (added missing #includes). - Conditional building of SELinux policy and documentation. Index: icecream.te =================================================================== RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.te,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- icecream.te 10 Feb 2008 22:27:13 -0000 1.3 +++ icecream.te 13 Mar 2008 00:09:06 -0000 1.4 @@ -65,7 +65,7 @@ allow iceccd_t self:capability { setgid setuid }; allow iceccd_t self:capability { sys_chroot }; -allow iceccd_t iceccd_untrusted_t:process { siginh rlimitinh noatsecure }; +allow iceccd_t iceccd_untrusted_t:process { siginh rlimitinh noatsecure signal }; allow iceccd_helper_t iceccd_t:process { sigchld }; allow iceccd_helper_t iceccd_log_t:file { append }; @@ -75,10 +75,11 @@ # rly needed? allow iceccd_helper_t iceccd_t:udp_socket { read write }; +allow iceccd_untrusted_t self:fifo_file { read write getattr }; +allow iceccd_untrusted_t self:process { signal }; allow iceccd_untrusted_t iceccd_t:process { sigchld }; allow iceccd_untrusted_t iceccd_t:fifo_file { write }; allow iceccd_untrusted_t iceccd_t:unix_stream_socket { read write getattr }; -allow iceccd_untrusted_t self:fifo_file { read write getattr }; allow iceccd_untrusted_t iceccd_cache_t:dir { search getattr write add_name remove_name }; allow iceccd_untrusted_t iceccd_cache_t:file { execute_no_trans write unlink create }; From fedora-extras-commits at redhat.com Thu Mar 13 00:20:49 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 13 Mar 2008 00:20:49 GMT Subject: rpms/xulrunner/devel .cvsignore, 1.38, 1.39 sources, 1.39, 1.40 xulrunner.spec, 1.93, 1.94 Message-ID: <200803130020.m2D0KnXb026869@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/xulrunner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26381 Modified Files: .cvsignore sources xulrunner.spec Log Message: * Wed Mar 12 2008 Christopher Aillon 1.9-0.40 - Update to latest trunk (2008-03-12) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 12 Mar 2008 03:35:51 -0000 1.38 +++ .cvsignore 13 Mar 2008 00:20:11 -0000 1.39 @@ -1 +1 @@ -mozilla-20080311.tar.bz2 +mozilla-20080312.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 12 Mar 2008 03:35:51 -0000 1.39 +++ sources 13 Mar 2008 00:20:11 -0000 1.40 @@ -1 +1 @@ -633fc3b7ff7d1f4a0884159932ef2976 mozilla-20080311.tar.bz2 +b8c8e2371a29a6056a84924e55f96987 mozilla-20080312.tar.bz2 Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- xulrunner.spec 12 Mar 2008 23:37:24 -0000 1.93 +++ xulrunner.spec 13 Mar 2008 00:20:11 -0000 1.94 @@ -7,14 +7,14 @@ %define version_internal 1.9pre %if ! %{official_branding} -%define cvsdate 20080311 +%define cvsdate 20080312 %define nightly .cvs%{cvsdate} %endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.39%{?nightly}%{?dist} +Release: 0.40%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -403,13 +403,16 @@ #--------------------------------------------------------------------- %changelog -* Tue Mar 11 2008 Christopher Aillon 1.0-0.39 +* Wed Mar 12 2008 Christopher Aillon 1.9-0.40 +- Update to latest trunk (2008-03-12) + +* Tue Mar 11 2008 Christopher Aillon 1.9-0.39 - Update to latest trunk (2008-03-11) -* Mon Mar 10 2008 Christopher Aillon 1.0-0.38 +* Mon Mar 10 2008 Christopher Aillon 1.9-0.38 - Update to latest trunk (2008-03-10) -* Sun Mar 9 2008 Christopher Aillon 1.0-0.37 +* Sun Mar 9 2008 Christopher Aillon 1.9-0.37 - Update to latest trunk (2008-03-09) * Fri Mar 7 2008 Christopher Aillon 1.9-0.beta4.36 From fedora-extras-commits at redhat.com Thu Mar 13 00:21:37 2008 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 13 Mar 2008 00:21:37 GMT Subject: rpms/firefox/devel .cvsignore, 1.68, 1.69 firefox.spec, 1.274, 1.275 sources, 1.79, 1.80 Message-ID: <200803130021.m2D0LbXW027502@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/firefox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26572 Modified Files: .cvsignore firefox.spec sources Log Message: * Wed Mar 12 2008 Christopher Aillon 3.0-0.40 - Update to latest trunk (2008-03-12) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- .cvsignore 12 Mar 2008 03:38:20 -0000 1.68 +++ .cvsignore 13 Mar 2008 00:20:25 -0000 1.69 @@ -1 +1 @@ -mozilla-20080311.tar.bz2 +mozilla-20080312.tar.bz2 Index: firefox.spec =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- firefox.spec 12 Mar 2008 03:38:20 -0000 1.274 +++ firefox.spec 13 Mar 2008 00:20:25 -0000 1.275 @@ -12,14 +12,14 @@ %define build_langpacks 0 %if ! %{official_branding} -%define cvsdate 20080311 +%define cvsdate 20080312 %define nightly .cvs%{cvsdate} %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.39%{?nightly}%{?dist} +Release: 0.40%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -314,6 +314,9 @@ #--------------------------------------------------------------------- %changelog +* Wed Mar 12 2008 Christopher Aillon 3.0-0.40 +- Update to latest trunk (2008-03-12) + * Tue Mar 11 2008 Christopher Aillon 3.0-0.39 - Update to latest trunk (2008-03-11) Index: sources =================================================================== RCS file: /cvs/extras/rpms/firefox/devel/sources,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- sources 12 Mar 2008 03:38:20 -0000 1.79 +++ sources 13 Mar 2008 00:20:25 -0000 1.80 @@ -1 +1 @@ -633fc3b7ff7d1f4a0884159932ef2976 mozilla-20080311.tar.bz2 +b8c8e2371a29a6056a84924e55f96987 mozilla-20080312.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 13 00:32:31 2008 From: fedora-extras-commits at redhat.com (Matthias Clasen (mclasen)) Date: Thu, 13 Mar 2008 00:32:31 GMT Subject: rpms/poppler/devel .cvsignore, 1.23, 1.24 fix-qt4-build.patch, 1.3, 1.4 poppler-ObjStream.patch, 1.4, 1.5 poppler.spec, 1.64, 1.65 sources, 1.23, 1.24 Message-ID: <200803130032.m2D0WVTr001684@cvs-int.fedora.redhat.com> Author: mclasen Update of /cvs/extras/rpms/poppler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1634 Modified Files: .cvsignore fix-qt4-build.patch poppler-ObjStream.patch poppler.spec sources Log Message: 0.7.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poppler/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 29 Feb 2008 03:01:12 -0000 1.23 +++ .cvsignore 13 Mar 2008 00:31:52 -0000 1.24 @@ -1 +1 @@ -poppler-0.7.1.tar.gz +poppler-0.7.2.tar.gz fix-qt4-build.patch: Index: fix-qt4-build.patch =================================================================== RCS file: /cvs/extras/rpms/poppler/devel/fix-qt4-build.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fix-qt4-build.patch 29 Feb 2008 04:46:20 -0000 1.3 +++ fix-qt4-build.patch 13 Mar 2008 00:31:52 -0000 1.4 @@ -1,6 +1,6 @@ -diff -up poppler-0.7.1/poppler-0.7.1/qt4/Makefile.in.fix-qt4-build poppler-0.7.1/poppler-0.7.1/qt4/Makefile.in ---- poppler-0.7.1/poppler-0.7.1/qt4/Makefile.in.fix-qt4-build 2008-02-21 10:29:14.000000000 -0500 -+++ poppler-0.7.0/poppler-0.7.1/qt4/Makefile.in 2008-02-21 10:29:22.000000000 -0500 +diff -up poppler-0.7.2/poppler-0.7.2/qt4/Makefile.in.fix-qt4-build poppler-0.7.2/poppler-0.7.2/qt4/Makefile.in +--- poppler-0.7.2/poppler-0.7.2/qt4/Makefile.in.fix-qt4-build 2008-02-21 10:29:14.000000000 -0500 ++++ poppler-0.7.2/poppler-0.7.2/qt4/Makefile.in 2008-02-21 10:29:22.000000000 -0500 @@ -223,7 +223,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -10,9 +10,9 @@ all: all-recursive .SUFFIXES: -diff -up poppler-0.7.1/poppler-0.7.1/qt4/src/Makefile.in.qt4 poppler-0.7.1/poppler-0.7.1/qt4/src/Makefile.in ---- poppler-0.7.1/poppler-0.7.1/qt4/src/Makefile.in.qt4 2008-02-28 23:28:27.000000000 -0500 -+++ poppler-0.7.1/poppler-0.7.1/qt4/src/Makefile.in 2008-02-28 23:28:46.000000000 -0500 +diff -up poppler-0.7.2/poppler-0.7.2/qt4/src/Makefile.in.qt4 poppler-0.7.2/poppler-0.7.2/qt4/src/Makefile.in +--- poppler-0.7.2/poppler-0.7.2/qt4/src/Makefile.in.qt4 2008-02-28 23:28:27.000000000 -0500 ++++ poppler-0.7.2/poppler-0.7.2/qt4/src/Makefile.in 2008-02-28 23:28:46.000000000 -0500 @@ -635,7 +635,7 @@ SUFFIXES: .moc # This rule lets GNU make create any *.moc from the equivalent *.h poppler-ObjStream.patch: Index: poppler-ObjStream.patch =================================================================== RCS file: /cvs/extras/rpms/poppler/devel/poppler-ObjStream.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- poppler-ObjStream.patch 29 Feb 2008 03:11:31 -0000 1.4 +++ poppler-ObjStream.patch 13 Mar 2008 00:31:52 -0000 1.5 @@ -1,6 +1,6 @@ -diff -up poppler-0.7.1/poppler-0.7.1/poppler/XRef.h.objstream poppler-0.7.1/poppler-0.7.1/poppler/XRef.h ---- poppler-0.7.1/poppler-0.7.1/poppler/XRef.h.objstream 2008-01-21 21:00:59.000000000 +0100 -+++ poppler-0.7.1/poppler-0.7.1/poppler/XRef.h 2008-02-18 17:18:47.000000000 +0100 +diff -up poppler-0.7.2/poppler-0.7.2/poppler/XRef.h.objstream poppler-0.7.2/poppler-0.7.2/poppler/XRef.h +--- poppler-0.7.2/poppler-0.7.2/poppler/XRef.h.objstream 2008-01-21 21:00:59.000000000 +0100 ++++ poppler-0.7.2/poppler-0.7.2/poppler/XRef.h 2008-02-18 17:18:47.000000000 +0100 @@ -19,7 +19,36 @@ class Dict; class Stream; @@ -47,9 +47,9 @@ // Write access void setModifiedObject(Object* o, Ref r); -diff -up poppler-0.7.1/poppler-0.7.1/poppler/XRef.cc.objstream poppler-0.7.1/poppler-0.7.1/poppler/XRef.cc ---- poppler-0.7.1/poppler-0.7.1/poppler/XRef.cc.objstream 2008-01-21 21:00:59.000000000 +0100 -+++ poppler-0.7.1/poppler-0.7.1/poppler/XRef.cc 2008-02-18 17:18:47.000000000 +0100 +diff -up poppler-0.7.2/poppler-0.7.2/poppler/XRef.cc.objstream poppler-0.7.2/poppler-0.7.2/poppler/XRef.cc +--- poppler-0.7.2/poppler-0.7.2/poppler/XRef.cc.objstream 2008-01-21 21:00:59.000000000 +0100 ++++ poppler-0.7.2/poppler-0.7.2/poppler/XRef.cc 2008-02-18 17:18:47.000000000 +0100 @@ -50,34 +50,9 @@ // ObjectStream //------------------------------------------------------------------------ Index: poppler.spec =================================================================== RCS file: /cvs/extras/rpms/poppler/devel/poppler.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- poppler.spec 29 Feb 2008 03:44:26 -0000 1.64 +++ poppler.spec 13 Mar 2008 00:31:52 -0000 1.65 @@ -2,7 +2,7 @@ Summary: PDF rendering library Name: poppler -Version: 0.7.1 +Version: 0.7.2 Release: 1%{?dist} License: GPLv2 and Redistributable, no modification permitted # the code is GPLv2 @@ -197,6 +197,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 12 2008 Matthias Clasen - 0.7.2-1 +- Update to 0.7.2 + * Thu Feb 28 2008 Matthias Clasen - 0.7.1-1 - Update to 0.7.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/poppler/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 29 Feb 2008 03:01:12 -0000 1.23 +++ sources 13 Mar 2008 00:31:52 -0000 1.24 @@ -1,2 +1,2 @@ -8b64cb74e0247c2fcf0c883313cb9aa0 poppler-0.7.1.tar.gz +766e7f9b866a87971717c54b529e081c poppler-0.7.2.tar.gz b7f98e84a4d2a2c794271d746ec7ee0b poppler-data-0.2.0.tar.gz From fedora-extras-commits at redhat.com Thu Mar 13 00:42:54 2008 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 13 Mar 2008 00:42:54 GMT Subject: devel/anaconda .cvsignore, 1.507, 1.508 anaconda.spec, 1.647, 1.648 sources, 1.639, 1.640 Message-ID: <200803130042.m2D0gsu9001939@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/pkgs/devel/anaconda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1874 Modified Files: .cvsignore anaconda.spec sources Log Message: * Wed Mar 12 2008 Jeremy Katz - 11.4.0.51-1 - yum.remove removes installed packages, not to be installed packages (#436226) (katzj) - Make the /tmp/updates vs RHupdates code at least a little readable. (pjones) - Allow vfat update images. (pjones) - Fix syntax error (pjones) - Add a progress bar for when we're downloading headers (#186789). (clumens) - mount will set up the loopback device if we let it. (clumens) - Fix mounting problems with NFSISO images. (clumens) - Simplify the logic for the upgrade arch check (katzj) - Add a fallback method for determining the architecture of installed system during an upgrade (#430115) (msivak) - Avoid a traceback (#436826) (katzj) - Make sure host lookups work for manual net config (#435574). (dcantrell) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/devel/anaconda/.cvsignore,v retrieving revision 1.507 retrieving revision 1.508 diff -u -r1.507 -r1.508 --- .cvsignore 12 Mar 2008 03:34:57 -0000 1.507 +++ .cvsignore 13 Mar 2008 00:42:18 -0000 1.508 @@ -1 +1 @@ -anaconda-11.4.0.50.tar.bz2 +anaconda-11.4.0.51.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/pkgs/devel/anaconda/anaconda.spec,v retrieving revision 1.647 retrieving revision 1.648 diff -u -r1.647 -r1.648 --- anaconda.spec 12 Mar 2008 03:34:57 -0000 1.647 +++ anaconda.spec 13 Mar 2008 00:42:18 -0000 1.648 @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.0.50 +Version: 11.4.0.51 Release: 1 License: GPLv2+ Group: Applications/System @@ -204,6 +204,21 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Mar 12 2008 Jeremy Katz - 11.4.0.51-1 +- yum.remove removes installed packages, not to be installed + packages (#436226) (katzj) +- Make the /tmp/updates vs RHupdates code at least a little readable. (pjones) +- Allow vfat update images. (pjones) +- Fix syntax error (pjones) +- Add a progress bar for when we're downloading headers (#186789). (clumens) +- mount will set up the loopback device if we let it. (clumens) +- Fix mounting problems with NFSISO images. (clumens) +- Simplify the logic for the upgrade arch check (katzj) +- Add a fallback method for determining the architecture of installed + system during an upgrade (#430115) (msivak) +- Avoid a traceback (#436826) (katzj) +- Make sure host lookups work for manual net config (#435574). (dcantrell) + * Tue Mar 11 2008 Jeremy Katz - 11.4.0.50-1 - Focus root password entry box (#436885). (dcantrell) - Make sure default is SHA-512 for libuser.conf. (dcantrell) Index: sources =================================================================== RCS file: /cvs/pkgs/devel/anaconda/sources,v retrieving revision 1.639 retrieving revision 1.640 diff -u -r1.639 -r1.640 --- sources 12 Mar 2008 03:34:57 -0000 1.639 +++ sources 13 Mar 2008 00:42:18 -0000 1.640 @@ -1 +1 @@ -f09ffd8187704aff26e3eda990a91b8d anaconda-11.4.0.50.tar.bz2 +da74c2ba1f6f4005fb803a2e1b468eff anaconda-11.4.0.51.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 13 01:06:28 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 13 Mar 2008 01:06:28 GMT Subject: rpms/qt4/devel dead.package, NONE, 1.1 .cvsignore, 1.27, NONE Trolltech.conf, 1.2, NONE assistant.desktop, 1.4, NONE designer.desktop, 1.3, NONE linguist.desktop, 1.4, NONE qconfig-multilib.h, 1.4, NONE qt-43-aliasing.diff, 1.1, NONE qt-copy-patches-svn_checkout.sh, 1.2, NONE qt-x11-opensource-src-4.2.2-multilib.patch, 1.1, NONE qt-x11-opensource-src-4.3.0-qassistant-qt4.patch, 1.3, NONE qt-x11-opensource-src-4.3.4-aliasing.patch, 1.1, NONE qt4-wrapper.sh, 1.4, NONE qt4.csh, 1.1, NONE qt4.sh, 1.1, NONE qt4.spec, 1.94, NONE qtconfig.desktop, 1.5, NONE qtdemo.desktop, 1.4, NONE sources, 1.23, NONE Message-ID: <200803130106.m2D16SNj008364@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8352/devel Added Files: dead.package Removed Files: .cvsignore Trolltech.conf assistant.desktop designer.desktop linguist.desktop qconfig-multilib.h qt-43-aliasing.diff qt-copy-patches-svn_checkout.sh qt-x11-opensource-src-4.2.2-multilib.patch qt-x11-opensource-src-4.3.0-qassistant-qt4.patch qt-x11-opensource-src-4.3.4-aliasing.patch qt4-wrapper.sh qt4.csh qt4.sh qt4.spec qtconfig.desktop qtdemo.desktop sources Log Message: Obsolete for F9+: renamed to qt because Qt 4 is now the default Qt version. --- NEW FILE dead.package --- Renamed to qt because Qt 4 is now the default Qt version. --- .cvsignore DELETED --- --- Trolltech.conf DELETED --- --- assistant.desktop DELETED --- --- designer.desktop DELETED --- --- linguist.desktop DELETED --- --- qconfig-multilib.h DELETED --- --- qt-43-aliasing.diff DELETED --- --- qt-copy-patches-svn_checkout.sh DELETED --- --- qt-x11-opensource-src-4.2.2-multilib.patch DELETED --- --- qt-x11-opensource-src-4.3.0-qassistant-qt4.patch DELETED --- --- qt-x11-opensource-src-4.3.4-aliasing.patch DELETED --- --- qt4-wrapper.sh DELETED --- --- qt4.csh DELETED --- --- qt4.sh DELETED --- --- qt4.spec DELETED --- --- qtconfig.desktop DELETED --- --- qtdemo.desktop DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Mar 13 01:17:30 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 13 Mar 2008 01:17:30 GMT Subject: rpms/kernel/devel linux-2.6-firewire-git-pending.patch,1.16,1.17 Message-ID: <200803130117.m2D1HU0J008572@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/kernel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8547 Modified Files: linux-2.6-firewire-git-pending.patch Log Message: Slightly better version of sync tweak (although it seems this really shouldn't be needed, and only accidentally fixes the panic on my box, but hey, that's better than a panic for now...) linux-2.6-firewire-git-pending.patch: Index: linux-2.6-firewire-git-pending.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- linux-2.6-firewire-git-pending.patch 12 Mar 2008 21:48:36 -0000 1.16 +++ linux-2.6-firewire-git-pending.patch 13 Mar 2008 01:17:17 -0000 1.17 @@ -887,17 +887,17 @@ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c -index 081a434..fc45868 100644 +index 081a434..c60abb8 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c -@@ -780,6 +780,10 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet) - - context_append(ctx, d, z, 4 - z); +@@ -778,6 +778,10 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet) + return -1; + } + /* Sync the DMA buffer up for the device to read from */ + dma_sync_single_for_device(ohci->card.device, payload_bus, + packet->payload_length, DMA_TO_DEVICE); + + context_append(ctx, d, z, 4 - z); + /* If the context isn't already running, start it up. */ - reg = reg_read(ctx->ohci, CONTROL_SET(ctx->regs)); - if ((reg & CONTEXT_RUN) == 0) From fedora-extras-commits at redhat.com Thu Mar 13 02:11:09 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 13 Mar 2008 02:11:09 GMT Subject: rpms/cpuspeed/devel cpuspeed.init, 1.38, 1.39 cpuspeed.spec, 1.63, 1.64 Message-ID: <200803130211.m2D2B9TV015567@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/cpuspeed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15517 Modified Files: cpuspeed.init cpuspeed.spec Log Message: * Wed Mar 12 2008 Jarod Wilson 1.2.1-6 - Minor formatting and redirection fixups Index: cpuspeed.init =================================================================== RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.init,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- cpuspeed.init 26 Feb 2008 14:55:18 -0000 1.38 +++ cpuspeed.init 13 Mar 2008 02:10:30 -0000 1.39 @@ -37,7 +37,7 @@ governor_is_module() { # Check to see if the requested cpufreq governor # is provided as a kernel module or not - module_info=`/sbin/modinfo cpufreq-${governor} 2>&1 > /dev/null` + module_info=`/sbin/modinfo cpufreq-${governor}` return $? } @@ -111,9 +111,9 @@ start() { if [ ! -f $lockfile ] && [ ! -d "$xendir" ]; then + cpu_vendor=$(awk '/vendor_id/{print $3}' /proc/cpuinfo | tail -n 1) + cpu_family=$(awk '/cpu family/{print $4}' /proc/cpuinfo | tail -n 1) if ! some_file_exist $testpat ; then - cpu_vendor=$(awk '/vendor_id/{print $3}' /proc/cpuinfo | tail -n 1) - cpu_family=$(awk '/cpu family/{print $4}' /proc/cpuinfo | tail -n 1) # Attempt to load scaling_driver if not loaded # but it is configured if [ -n "$DRIVER" ]; then @@ -121,7 +121,7 @@ elif [ "$cpu_vendor" == AuthenticAMD ] && [ "$cpu_family" -ge 7 ]; then # Try loading powernow-k8 if this is an AMD processor, # family 7 or greater (Athlon XP/MP was family 6) - pk8m=$(/sbin/modinfo powernow-k8 2>&1 > /dev/null) + pk8m=$(/sbin/modinfo powernow-k8 > /dev/null 2>&1) if [ "$?" -eq 0 ]; then /sbin/modprobe powernow-k8 2> /dev/null [ -d ${cpu0freqd} ] || /sbin/modprobe -r powernow-k8 2> /dev/null Index: cpuspeed.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- cpuspeed.spec 14 Feb 2008 22:37:58 -0000 1.63 +++ cpuspeed.spec 13 Mar 2008 02:10:30 -0000 1.64 @@ -1,7 +1,7 @@ Summary: CPU frequency adjusting daemon Name: cpuspeed Version: 1.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Group: System Environment/Base License: GPL @@ -89,6 +89,9 @@ exit 0 %changelog +* Wed Mar 12 2008 Jarod Wilson 1.2.1-6 +- Minor formatting and redirection fixups + * Thu Feb 14 2008 Jarod Wilson 1.2.1-5 - Support for powernow-k8 as a kernel module From fedora-extras-commits at redhat.com Thu Mar 13 02:11:38 2008 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Thu, 13 Mar 2008 02:11:38 GMT Subject: rpms/pulseaudio/devel pulseaudio.spec,1.35,1.36 Message-ID: <200803130211.m2D2BcXV015570@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/pulseaudio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15546 Modified Files: pulseaudio.spec Log Message: * Thu Mar 13 2008 Lubomir Kundrak 0.9.8-12 - Own /usr/libexec/pulse (#437228) Index: pulseaudio.spec =================================================================== RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- pulseaudio.spec 12 Mar 2008 22:58:43 -0000 1.35 +++ pulseaudio.spec 13 Mar 2008 02:11:02 -0000 1.36 @@ -3,7 +3,7 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 0.9.8 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz @@ -302,6 +302,7 @@ %{_mandir}/man5/default.pa.5.gz %{_mandir}/man5/pulse-client.conf.5.gz %{_mandir}/man5/pulse-daemon.conf.5.gz +%dir %{_libexecdir}/pulse %files esound-compat %defattr(-,root,root) @@ -396,6 +397,9 @@ %{_mandir}/man1/pax11publish.1.gz %changelog +* Thu Mar 13 2008 Lubomir Kundrak 0.9.8-12 +- Own /usr/libexec/pulse (#437228) + * Wed Mar 12 2008 Adam Jackson 0.9.8-11 - pulseaudio-0.9.8-disable-realtime.patch: Don't ask PolicyKit for increased scheduling mojo for now. It's not clear that it's a win; and if it is, From fedora-extras-commits at redhat.com Thu Mar 13 02:14:59 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 13 Mar 2008 02:14:59 GMT Subject: rpms/cpuspeed/F-8 cpuspeed.init,1.36,1.37 cpuspeed.spec,1.62,1.63 Message-ID: <200803130214.m2D2Exfm015812@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/cpuspeed/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15755 Modified Files: cpuspeed.init cpuspeed.spec Log Message: * Wed Mar 12 2008 Jarod Wilson 1.2.1-6 - Minor formatting and redirection fixups Index: cpuspeed.init =================================================================== RCS file: /cvs/pkgs/rpms/cpuspeed/F-8/cpuspeed.init,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- cpuspeed.init 14 Feb 2008 22:43:24 -0000 1.36 +++ cpuspeed.init 13 Mar 2008 02:14:21 -0000 1.37 @@ -37,7 +37,7 @@ governor_is_module() { # Check to see if the requested cpufreq governor # is provided as a kernel module or not - module_info=`/sbin/modinfo cpufreq-${governor} 2>&1 > /dev/null` + module_info=`/sbin/modinfo cpufreq-${governor}` return $? } @@ -111,9 +111,9 @@ start() { if [ ! -f $lockfile ] && [ ! -d "$xendir" ]; then + cpu_vendor=$(awk '/vendor_id/{print $3}' /proc/cpuinfo | tail -n 1) + cpu_family=$(awk '/cpu family/{print $4}' /proc/cpuinfo | tail -n 1) if ! some_file_exist $testpat ; then - cpu_vendor=$(grep vendor_id /proc/cpuinfo | awk '{print $3}' | tail -n 1) - cpu_family=$(grep "cpu family" /proc/cpuinfo | awk '{print $4}' | tail -n 1) # Attempt to load scaling_driver if not loaded # but it is configured if [ -n "$DRIVER" ]; then @@ -121,11 +121,11 @@ elif [ "$cpu_vendor" == AuthenticAMD ] && [ "$cpu_family" -ge 7 ]; then # Try loading powernow-k8 if this is an AMD processor, # family 7 or greater (Athlon XP/MP was family 6) - pk8m=$(/sbin/modinfo powernow-k8 2>&1 > /dev/null) - if [ "$?" -eq 0 ]; then + pk8m=$(/sbin/modinfo powernow-k8 > /dev/null 2>&1) + if [ "$?" -eq 0 ]; then /sbin/modprobe powernow-k8 2> /dev/null [ -d ${cpu0freqd} ] || /sbin/modprobe -r powernow-k8 2> /dev/null - fi + fi else if [ -d /proc/acpi ]; then # use ACPI as a fallback Index: cpuspeed.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpuspeed/F-8/cpuspeed.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- cpuspeed.spec 14 Feb 2008 22:43:24 -0000 1.62 +++ cpuspeed.spec 13 Mar 2008 02:14:21 -0000 1.63 @@ -1,7 +1,7 @@ Summary: CPU frequency adjusting daemon Name: cpuspeed Version: 1.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Group: System Environment/Base License: GPL @@ -89,6 +89,9 @@ exit 0 %changelog +* Wed Mar 12 2008 Jarod Wilson 1.2.1-6 +- Minor formatting and redirection fixups + * Thu Feb 14 2008 Jarod Wilson 1.2.1-5 - Support for powernow-k8 as a kernel module From fedora-extras-commits at redhat.com Thu Mar 13 02:17:34 2008 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Thu, 13 Mar 2008 02:17:34 GMT Subject: rpms/cpuspeed/F-7 cpuspeed.init,1.36,1.37 cpuspeed.spec,1.61,1.62 Message-ID: <200803130217.m2D2HYJG015880@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/pkgs/rpms/cpuspeed/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15853 Modified Files: cpuspeed.init cpuspeed.spec Log Message: * Wed Mar 12 2008 Jarod Wilson 1.2.1-6 - Minor formatting and redirection fixups Index: cpuspeed.init =================================================================== RCS file: /cvs/pkgs/rpms/cpuspeed/F-7/cpuspeed.init,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- cpuspeed.init 14 Feb 2008 22:44:44 -0000 1.36 +++ cpuspeed.init 13 Mar 2008 02:16:59 -0000 1.37 @@ -37,7 +37,7 @@ governor_is_module() { # Check to see if the requested cpufreq governor # is provided as a kernel module or not - module_info=`/sbin/modinfo cpufreq-${governor} 2>&1 > /dev/null` + module_info=`/sbin/modinfo cpufreq-${governor}` return $? } @@ -111,9 +111,9 @@ start() { if [ ! -f $lockfile ] && [ ! -d "$xendir" ]; then + cpu_vendor=$(awk '/vendor_id/{print $3}' /proc/cpuinfo | tail -n 1) + cpu_family=$(awk '/cpu family/{print $4}' /proc/cpuinfo | tail -n 1) if ! some_file_exist $testpat ; then - cpu_vendor=$(grep vendor_id /proc/cpuinfo | awk '{print $3}' | tail -n 1) - cpu_family=$(grep "cpu family" /proc/cpuinfo | awk '{print $4}' | tail -n 1) # Attempt to load scaling_driver if not loaded # but it is configured if [ -n "$DRIVER" ]; then @@ -121,11 +121,11 @@ elif [ "$cpu_vendor" == AuthenticAMD ] && [ "$cpu_family" -ge 7 ]; then # Try loading powernow-k8 if this is an AMD processor, # family 7 or greater (Athlon XP/MP was family 6) - pk8m=$(/sbin/modinfo powernow-k8 2>&1 > /dev/null) - if [ "$?" -eq 0 ]; then + pk8m=$(/sbin/modinfo powernow-k8 > /dev/null 2>&1) + if [ "$?" -eq 0 ]; then /sbin/modprobe powernow-k8 2> /dev/null [ -d ${cpu0freqd} ] || /sbin/modprobe -r powernow-k8 2> /dev/null - fi + fi else if [ -d /proc/acpi ]; then # use ACPI as a fallback Index: cpuspeed.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpuspeed/F-7/cpuspeed.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- cpuspeed.spec 14 Feb 2008 22:44:44 -0000 1.61 +++ cpuspeed.spec 13 Mar 2008 02:16:59 -0000 1.62 @@ -1,7 +1,7 @@ Summary: CPU frequency adjusting daemon Name: cpuspeed Version: 1.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Group: System Environment/Base License: GPL @@ -89,6 +89,9 @@ exit 0 %changelog +* Wed Mar 12 2008 Jarod Wilson 1.2.1-6 +- Minor formatting and redirection fixups + * Thu Feb 14 2008 Jarod Wilson 1.2.1-5 - Support for powernow-k8 as a kernel module From fedora-extras-commits at redhat.com Thu Mar 13 02:18:50 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 13 Mar 2008 02:18:50 GMT Subject: rpms/ntl/devel .cvsignore,1.3,1.4 ntl.spec,1.8,1.9 sources,1.3,1.4 Message-ID: <200803130218.m2D2IoJX015937@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/ntl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15900 Modified Files: .cvsignore ntl.spec sources Log Message: * Tue Mar 11 2008 Rex Dieter 5.4.2-1 - ntl-5.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ntl/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Dec 2007 03:04:35 -0000 1.3 +++ .cvsignore 13 Mar 2008 02:18:13 -0000 1.4 @@ -1,2 +1 @@ -ntl-5.4.tar.gz -ntl-5.4.1.tar.gz +ntl-5.4.2.tar.gz Index: ntl.spec =================================================================== RCS file: /cvs/pkgs/rpms/ntl/devel/ntl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ntl.spec 8 Feb 2008 21:30:41 -0000 1.8 +++ ntl.spec 13 Mar 2008 02:18:13 -0000 1.9 @@ -1,8 +1,8 @@ Summary: High-performance algorithms for vectors, matrices, and polynomials Name: ntl -Version: 5.4.1 -Release: 2%{?dist} +Version: 5.4.2 +Release: 1%{?dist} License: GPLv2+ URL: http://shoup.net/ntl/ @@ -110,6 +110,9 @@ %changelog +* Tue Mar 11 2008 Rex Dieter 5.4.2-1 +- ntl-5.4.2 + * Fri Feb 08 2008 Rex Dieter 5.4.1-2 - respin (gcc43) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ntl/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Dec 2007 03:04:35 -0000 1.3 +++ sources 13 Mar 2008 02:18:13 -0000 1.4 @@ -1 +1 @@ -db002ba17e7803770f702f08e14b9409 ntl-5.4.1.tar.gz +0aac5c680eee09a19732e1601b237a0b ntl-5.4.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 13 02:37:22 2008 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Thu, 13 Mar 2008 02:37:22 GMT Subject: rpms/jigdo/devel jigdo-0.7.3-gcc43.patch, NONE, 1.1 jigdo.spec, 1.7, 1.8 Message-ID: <200803130237.m2D2bMfW016287@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16257 Modified Files: jigdo.spec Added Files: jigdo-0.7.3-gcc43.patch Log Message: Add patch for gcc 4.3 support jigdo-0.7.3-gcc43.patch: --- NEW FILE jigdo-0.7.3-gcc43.patch --- diff -ur jigdo-0.7.3.orig/src/compat.hh jigdo-0.7.3/src/compat.hh --- jigdo-0.7.3.orig/src/compat.hh 2005-07-02 10:21:35.000000000 -0700 +++ jigdo-0.7.3/src/compat.hh 2008-03-11 23:01:45.000000000 -0700 @@ -20,6 +20,7 @@ #include #include +#include #include #include #include diff -ur jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc jigdo-0.7.3/src/gtk/gtk-single-url.cc --- jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc 2005-10-15 14:27:39.000000000 -0700 +++ jigdo-0.7.3/src/gtk/gtk-single-url.cc 2008-03-11 23:05:48.000000000 -0700 @@ -15,6 +15,7 @@ #include #include +#include #include #include diff -ur jigdo-0.7.3.orig/src/gtk/jigdo.cc jigdo-0.7.3/src/gtk/jigdo.cc --- jigdo-0.7.3.orig/src/gtk/jigdo.cc 2005-07-09 15:21:04.000000000 -0700 +++ jigdo-0.7.3/src/gtk/jigdo.cc 2008-03-11 23:06:26.000000000 -0700 @@ -16,6 +16,8 @@ # include #endif +#include + #include #include #include diff -ur jigdo-0.7.3.orig/src/recursedir.cc jigdo-0.7.3/src/recursedir.cc --- jigdo-0.7.3.orig/src/recursedir.cc 2006-05-14 11:23:31.000000000 -0700 +++ jigdo-0.7.3/src/recursedir.cc 2008-03-11 23:04:21.000000000 -0700 @@ -32,6 +32,7 @@ #include #include +#include #include #include #include diff -ur jigdo-0.7.3.orig/src/util/configfile.cc jigdo-0.7.3/src/util/configfile.cc --- jigdo-0.7.3.orig/src/util/configfile.cc 2003-09-27 14:31:04.000000000 -0700 +++ jigdo-0.7.3/src/util/configfile.cc 2008-03-11 23:05:00.000000000 -0700 @@ -19,6 +19,8 @@ #include #include +#include + #include #include //______________________________________________________________________ diff -ur jigdo-0.7.3.orig/src/util/md5sum.hh jigdo-0.7.3/src/util/md5sum.hh --- jigdo-0.7.3.orig/src/util/md5sum.hh 2005-04-09 16:09:52.000000000 -0700 +++ jigdo-0.7.3/src/util/md5sum.hh 2008-03-11 23:07:04.000000000 -0700 @@ -28,6 +28,8 @@ #include +#include + #include #include #include diff -ur jigdo-0.7.3.orig/src/util/string-utf.cc jigdo-0.7.3/src/util/string-utf.cc --- jigdo-0.7.3.orig/src/util/string-utf.cc 2004-09-11 16:26:30.000000000 -0700 +++ jigdo-0.7.3/src/util/string-utf.cc 2008-03-11 23:07:43.000000000 -0700 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include Index: jigdo.spec =================================================================== RCS file: /cvs/extras/rpms/jigdo/devel/jigdo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jigdo.spec 19 Feb 2008 05:02:16 -0000 1.7 +++ jigdo.spec 13 Mar 2008 02:36:34 -0000 1.8 @@ -1,6 +1,6 @@ Name: jigdo Version: 0.7.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ease distribution of large files over the Internet Group: Applications/Internet @@ -9,6 +9,7 @@ Source0: http://atterer.net/jigdo/%{name}-%{version}.tar.bz2 Source1: jigdo.desktop Patch1: jigdo-0.7.1-debug.patch +Patch2: jigdo-0.7.3-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel, bzip2-devel, curl-devel, /bin/awk, gettext BuildRequires: desktop-file-utils, gtk2-devel >= 0:2.0.6 @@ -28,6 +29,7 @@ %prep %setup -q %patch1 -p1 -b .debug +%patch2 -p1 -b .gcc43 %build %configure @@ -65,6 +67,9 @@ %attr(0644,root,root) %{_mandir}/man[^3]/* %changelog +* Tue Mar 11 2008 Ian Burrell - 0.7.3-6 +- Add patch for gcc 4.3 support + * Tue Feb 19 2008 Fedora Release Engineering - 0.7.3-5 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 13 02:47:30 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Thu, 13 Mar 2008 02:47:30 GMT Subject: rpms/xorg-x11-drv-cirrus/devel cirrus-fix-24bpp.patch, NONE, 1.1 xorg-x11-drv-cirrus.spec, 1.20, 1.21 Message-ID: <200803130247.m2D2lU4v016535@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16503 Modified Files: xorg-x11-drv-cirrus.spec Added Files: cirrus-fix-24bpp.patch Log Message: * Thu Mar 13 2008 Dave Airlie 1.1.0-9 - fix cirrus with no xorg.conf in qemu cirrus-fix-24bpp.patch: --- NEW FILE cirrus-fix-24bpp.patch --- >From bc4e7dc5dae54c09b3eb0aca3b2cc93304f97f17 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 13 Mar 2008 12:39:51 +1000 Subject: [PATCH] cirrus: set default depth to 24bpp this fixes autoconfiguation and it shouldn't override anything else. --- src/alp_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/alp_driver.c b/src/alp_driver.c index a282c21..cf41080 100644 --- a/src/alp_driver.c +++ b/src/alp_driver.c @@ -602,7 +602,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) * The first thing we should figure out is the depth, bpp, etc. * We support both 24bpp and 32bpp layouts, so indicate that. */ - if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb | + if (!xf86SetDepthBpp(pScrn, 0, 0, 24, Support24bppFb | Support32bppFb | SupportConvert32to24 | PreferConvert32to24)) { return FALSE; } else { -- 1.5.3.8 Index: xorg-x11-drv-cirrus.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel/xorg-x11-drv-cirrus.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xorg-x11-drv-cirrus.spec 20 Feb 2008 07:12:20 -0000 1.20 +++ xorg-x11-drv-cirrus.spec 13 Mar 2008 02:46:43 -0000 1.21 @@ -5,7 +5,7 @@ Summary: Xorg X11 cirrus video driver Name: xorg-x11-drv-cirrus Version: 1.1.0 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -17,6 +17,7 @@ Source1: cirrus.xinf Patch0: cirrus-pciaccess.patch +Patch1: cirrus-fix-24bpp.patch BuildRequires: xorg-x11-server-sdk >= 1.4.99.1 BuildRequires: automake autoconf libtool pkgconfig @@ -31,6 +32,7 @@ %prep %setup -q -n %{tarball}-%{version} %patch0 -p1 -b .pciaccess +%patch1 -p1 -b .24bpp %build aclocal ; automake -a ; autoconf @@ -61,6 +63,9 @@ %{_mandir}/man4/cirrus.4* %changelog +* Thu Mar 13 2008 Dave Airlie 1.1.0-9 +- fix cirrus with no xorg.conf in qemu + * Wed Feb 20 2008 Fedora Release Engineering - 1.1.0-8 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 13 03:32:14 2008 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 13 Mar 2008 03:32:14 GMT Subject: rpms/Macaulay2/devel Macaulay2.spec,1.41,1.42 Message-ID: <200803130332.m2D3WEH7023253@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/Macaulay2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23226 Modified Files: Macaulay2.spec Log Message: final 1.1 fixes Index: Macaulay2.spec =================================================================== RCS file: /cvs/pkgs/rpms/Macaulay2/devel/Macaulay2.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Macaulay2.spec 12 Mar 2008 19:50:31 -0000 1.41 +++ Macaulay2.spec 13 Mar 2008 03:31:28 -0000 1.42 @@ -52,6 +52,8 @@ BuildRequires: autoconf +Obsoletes: Macaulay2-common < %{version}-%{release} +Provides: Macaulay2-common = %{version}-%{release} Obsoletes: Macaulay2-doc < %{version}-%{release} Provides: Macaulay2-doc = %{version}-%{release} Obsoletes: Macaulay2-emacs < %{version}-%{release} @@ -105,8 +107,7 @@ %check -# util/screen dies on fc5/buildsystem (could not open pty) -#make -k check ||: +make -k check ||: %install @@ -144,9 +145,17 @@ %post xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +for info_file in Benchmark Browse ChainComplexExtras Classic Depth Dmodules Elimination FirstPackage FourierMotzkin GenericInitialIdeal HyperplaneArrangements IntegralClosure InvolutiveBases LexIdeals LLLBases Macaulay2Doc Markov NoetherNormalization PackageTemplate Parsing Points PrimaryDecomposition ReesAlgebra Regularity Schubert2 SchurRings SimplicialComplexes Style TangentCone ; do + /sbin/install-info --quiet %{_infodir}/${info_file}.info %{_infodir}/dir ||: +done %postun xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +if [ $1 -eq 0 ]; then + for info_file in Benchmark Browse ChainComplexExtras Classic Depth Dmodules Elimination FirstPackage FourierMotzkin GenericInitialIdeal HyperplaneArrangements IntegralClosure InvolutiveBases LexIdeals LLLBases Macaulay2Doc Markov NoetherNormalization PackageTemplate Parsing Points PrimaryDecomposition ReesAlgebra Regularity Schubert2 SchurRings SimplicialComplexes Style TangentCone ; do + /sbin/install-info --delete --quiet %{_infodir}/${info_file}.info %{_infodir}/dir ||: + done +fi %triggerin -- emacs-common if [ -d %{emacs_sitelisp} ]; then @@ -171,13 +180,14 @@ %files %defattr(-,root,root,-) -%doc Macaulay2/CHANGES Macaulay2/COPYING +%doc Macaulay2/COPYING Macaulay2/README %{_bindir}/* -%{_datadir}/Macaulay2/ %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/*/* +%{_datadir}/Macaulay2/ %{_docdir}/Macaulay2/ %{_infodir}/* +%{_libdir}/Macaulay2/ %{_mandir}/man1/* %ghost %{emacs_sitelisp} %ghost %{xemacs_sitelisp} @@ -186,6 +196,7 @@ %changelog * Tue Mar 11 2008 Rex Dieter 1.1-1 - Macaulay2-1.1 +- Obsoletes/Provides: Macaulay2-common (upstream compatibility) * Tue Feb 19 2008 Fedora Release Engineering - 0.9.95-10 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 13 04:15:37 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 13 Mar 2008 04:15:37 GMT Subject: comps/po mr.po,1.5,1.6 Message-ID: <200803130415.m2D4FbvG030279@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30258/po Modified Files: mr.po Log Message: 2008-03-13 Sandeep Sheshrao Shedmake (via sandeeps at fedoraproject.org) * po/mr.po: Updated Marathi Translations View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 mr.po Index: mr.po =================================================================== RCS file: /cvs/pkgs/comps/po/mr.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mr.po 17 Sep 2007 19:22:12 -0000 1.5 +++ mr.po 13 Mar 2008 04:15:07 -0000 1.6 @@ -1,638 +1,265 @@ -# translation of mr.po to Marathi -# Marathi translations for PACKAGE package. -# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER +# translation of comps.HEAD.po to marathi +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2004. +# # Rahul Bhalerao , 2006. # Rahul Bhalerao , 2006. -# +# Sandeep Shedmake , 2008. msgid "" msgstr "" -"Project-Id-Version: mr\n" +"Project-Id-Version: comps.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-17 15:18-0400\n" -"PO-Revision-Date: 2006-12-08 14:48+0530\n" -"Last-Translator: Rahul Bhalerao \n" -"Language-Team: Marathi\n" +"POT-Creation-Date: 2008-02-28 17:42-0700\n" +"PO-Revision-Date: 2008-03-12 12:54+0530\n" +"Last-Translator: Sandeep Shedmake \n" +"Language-Team: marathi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1 -#: ../comps-f8.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." -msgstr "" +msgstr "?????? ???????????? ???????????????????????? ????????????????????? ?????? ????????? ???????????????????????? ?????????????????????????????? ???????????????????????? ????????????????????? ????????? ????????????." -#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2 -#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 +#: ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "????????????????????? ??????????????????" -#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5 -#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +msgid "Afrikaans Support" +msgstr "????????????????????? ??????????????????" + +#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +msgid "Albanian Support" +msgstr "???????????????????????? ??????????????????" + +#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 +#: ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "???????????????????????????" -#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3 -#: ../comps-el5.xml.in.h:3 -msgid "Applications for a variety of tasks" -msgstr "??????????????? ??????????????????????????? ???????????????????????????" +#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +msgid "Applications to perform a variety of tasks" +msgstr "??????????????? ???????????? ????????? ????????????????????????????????? ???????????????????????????" -#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7 -#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 +#: ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "???????????? ??????????????????" -#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8 -#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 -#, fuzzy +#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 +#: ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 msgid "Armenian Support" -msgstr "???????????????????????? ??????????????????" - -#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10 -#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 -msgid "Authoring and Publishing" -msgstr "???????????? ????????? ?????????????????????" - -#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12 -#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 -msgid "Base System" -msgstr "???????????? ?????????????????????" - -#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31 -#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 -msgid "Desktop Environments" -msgstr "??????????????????????????? ????????????????????????" - -#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32 -#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 -msgid "Desktop environments" -msgstr "??????????????????????????? ????????????????????????" - -#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33 -#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 -msgid "Development" -msgstr "???????????????" - -#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35 -#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 -msgid "Development Tools" -msgstr "??????????????? ??????????????????" - -#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12 -#: ../comps-el5.xml.in.h:13 -msgid "Dialup Networking Support" -msgstr "?????????????????? ?????????????????? ??????????????????" - -#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39 -#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 -msgid "Editors" -msgstr "??????????????????" - -#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40 -#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 -msgid "Educational Software" -msgstr "" - -#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41 -#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 -msgid "Educational software for learning" -msgstr "" - -#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42 -#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 -msgid "Engineering and Scientific" -msgstr "???????????????????????????????????? ????????? ???????????????????????????" - -#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46 -#: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 -msgid "FTP Server" -msgstr "FTP ????????????" - -#: ../comps-fe5.xml.in.h:19 ../comps-fe6.xml.in.h:20 ../comps-f7.xml.in.h:51 -#: ../comps-f8.xml.in.h:54 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 -msgid "" -"From CD recording to playing audio CDs and multimedia files, this package " -"group allows you to work with sound and video on the system." -msgstr "" -"???????????? ????????????????????????????????????????????? ???????????? ???????????? ????????? ????????? ????????????????????????????????? ???????????? ??????????????????????????????????????????, ?????? ??????????????? ????????? " -"????????????????????? ????????????????????? ????????????????????????????????? ??????????????? ????????? ????????????????????????????????? ????????? ????????????????????? ????????? ????????????." - -#: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52 -#: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 -msgid "GNOME Desktop Environment" -msgstr "GNOME ???????????????????????????????????? ?????????????????????" - -#: ../comps-fe5.xml.in.h:21 ../comps-fe6.xml.in.h:22 ../comps-f7.xml.in.h:53 -#: ../comps-f8.xml.in.h:56 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 -msgid "GNOME Software Development" -msgstr "GNOME ??????????????????????????? ???????????????" - -#: ../comps-fe5.xml.in.h:22 ../comps-fe6.xml.in.h:23 ../comps-el4.xml.in.h:21 -#: ../comps-el5.xml.in.h:22 -msgid "" -"GNOME is a powerful, graphical user interface which includes a panel, " -"desktop, system icons, and a graphical file manager." -msgstr "" -"GNOME ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ????????? ??????????????????????????? ???????????????, ???????????????????????????????????? , ????????????????????? " -"????????????????????? ????????? ?????????????????? ???????????? ?????????????????????????????? ??????????????? ?????????????????? ?????????." - -#: ../comps-fe5.xml.in.h:23 ../comps-fe6.xml.in.h:24 ../comps-f7.xml.in.h:57 -#: ../comps-f8.xml.in.h:60 ../comps-el5.xml.in.h:23 -msgid "Games and Entertainment" -msgstr "????????? ????????? ?????????????????????" - -#: ../comps-fe5.xml.in.h:24 ../comps-fe6.xml.in.h:25 ../comps-f7.xml.in.h:60 -#: ../comps-f8.xml.in.h:63 ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24 -msgid "Graphical Internet" -msgstr "?????????????????? ?????????????????????" - -#: ../comps-fe5.xml.in.h:25 ../comps-fe6.xml.in.h:26 ../comps-f7.xml.in.h:61 -#: ../comps-f8.xml.in.h:64 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 -msgid "Graphics" -msgstr "???????????????" - -#: ../comps-fe5.xml.in.h:26 ../comps-fe6.xml.in.h:27 ../comps-f7.xml.in.h:64 -#: ../comps-f8.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26 -#, fuzzy [...1632 lines suppressed...] -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Japanese language." -#~ msgstr "?????? ??????????????? Red Hat Enterprise Linux ?????? ?????????????????? ????????????????????? ????????????????????????????????? ?????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Korean language." -#~ msgstr "?????? ??????????????? Red Hat Enterprise Linux ?????? ?????????????????? ????????????????????? ????????????????????????????????? ?????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Simplified Chinese language." -#~ msgstr "" -#~ "?????? ??????????????? Red Hat Enterprise Linux ?????? ????????????????????? ???????????? ????????????????????? ????????????????????????????????? ?????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Traditional Chinese language." -#~ msgstr "" -#~ "?????? ??????????????? Red Hat Enterprise Linux ?????? ??????????????????????????? ???????????? ????????????????????? ????????????????????????????????? ?????????." - -#~ msgid "Traditional Chinese" -#~ msgstr "??????????????????????????? ????????????" - -#~ msgid "ppc64 Compatibility Arch Development Support" -#~ msgstr "ppc64 ???????????????????????? ???????????? ??????????????? ??????????????????" - -#~ msgid "Bengali" -#~ msgstr "??????????????????" - -#~ msgid "Gujarati" -#~ msgstr "?????????????????????" - -#~ msgid "Hindi" -#~ msgstr "??????????????????" - -#~ msgid "Punjabi" -#~ msgstr "??????????????????" - -#~ msgid "Red Hat Enterprise Linux 4 Documentation" -#~ msgstr "Red Hat Enterprise Linux 4 ?????????????????????????????????" - -#~ msgid "Tamil" -#~ msgstr "????????????" - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Bengali language." -#~ msgstr " ??????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Gujarati language." -#~ msgstr "?????? ??????????????? Red Hat Enterprise Linux ?????? ????????????????????? ????????????????????? ????????????????????????????????? ?????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Hindi language." -#~ msgstr "?????? ??????????????? Red Hat Enterprise Linux ?????? ?????????????????? ????????????????????? ????????????????????????????????? ?????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Punjabi language." -#~ msgstr "?????? ??????????????? Red Hat Enterprise Linux ?????? ?????????????????? ????????????????????? ????????????????????????????????? ?????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Tamil language." -#~ msgstr "?????? ??????????????? Red Hat Enterprise Linux ?????? ???????????? ????????????????????? ????????????????????????????????? ?????????." - -#~ msgid "Cluster Storage" -#~ msgstr "????????????????????? ??????????????????" - -#~ msgid "Clustering Support." -#~ msgstr "?????????????????????????????? ??????????????????." - -#~ msgid "Packages which provide support for cluster storage." -#~ msgstr "?????????????????? ?????? ????????????????????? ??????????????????????????? ?????????????????? ?????????????????????." - -#~ msgid "Packages which provide support for single-node GFS." -#~ msgstr "?????????????????? ?????? ???????????????-????????? GFS ?????? ?????????????????? ?????????????????????." - -#~ msgid "Single Node GFS Support" -#~ msgstr "??????????????? ????????? GFS ??????????????????" - -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "?????? ?????????????????? ?????????????????????????????? ????????????????????????????????? ???????????????????????? ?????????????????? ?????????????????????." - -#~ msgid "Java Runtime Environments and Development Kits" -#~ msgstr "Java Runtime Environments ????????? ??????????????? ???????????????" - -#~ msgid "Misc" -#~ msgstr "?????????????????????" - -#~ msgid "Misc packages" -#~ msgstr "????????????????????? ??????????????????" - -#~ msgid "Multimedia" -#~ msgstr "??????????????????????????????(?????????????????????????????????) " - -#~ msgid "Multimedia applications" -#~ msgstr "??????????????????????????????(?????????????????????????????????) ???????????????????????????" +#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +msgid "Applications for a variety of tasks" +msgstr "??????????????? ??????????????????????????? ???????????????????????????" -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "?????????????????? ?????? Red Hat Enterprise Linux ???????????? ???????????????????????? ????????????????????????????????? ?????????????????????." +#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +msgid "Dialup Networking Support" +msgstr "?????????????????? ?????????????????? ??????????????????" -#~ msgid "Red Hat Enterprise Linux Extras" -#~ msgstr "Red Hat Enterprise Linux Extras" +#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 +msgid "" +"GNOME is a powerful, graphical user interface which includes a panel, " +"desktop, system icons, and a graphical file manager." +msgstr "" +"GNOME ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ????????? ??????????????????????????? ???????????????, ???????????????????????????????????? , ????????????????????? " +"????????????????????? ????????? ?????????????????? ???????????? ?????????????????????????????? ??????????????? ?????????????????? ?????????." -#~ msgid "Workstation" -#~ msgstr "????????????????????????????????? " +#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 +msgid "" +"KDE is a powerful, graphical user interface which includes a panel, desktop, " +"system icons, and a graphical file manager." +msgstr "" +"KDE ?????? ???????????????????????????, ?????????????????? ???????????????????????? ????????????????????? ????????? ??????????????????????????? ???????????????, ???????????????????????????????????? , ????????????????????? ????????????????????? " +"????????? ?????????????????? ???????????? ?????????????????????????????? ??????????????? ?????????????????? ?????????." -#~ msgid "Workstation applications and utilities." -#~ msgstr "????????????????????????????????? ??????????????????????????? ????????? ???????????????????????????." +#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 +msgid "" +"Sometimes called text editors, these are programs that allow you to create " +"and edit files. These include Emacs and Vi." +msgstr "" +"?????????????????? ????????? ?????????????????? ????????????????????? ??????????????????, ?????? ??????????????????????????? ??????????????? ?????? ????????????????????? ?????????????????? ????????????????????? ????????? ?????????????????? " +"????????? ???????????????. ???????????????????????? Emacs ????????? Vi ??????????????? ?????????????????? ?????????." -#~ msgid "Virtualization Support." -#~ msgstr "???????????????????????? ??????????????????" +#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +msgid "The XEmacs text editor." +msgstr "XEmacs ????????? ??????????????????." -#~ msgid "Compatibility Arch" -#~ msgstr "???????????????????????? ????????????" +#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 +msgid "" +"These tools allow you to create documentation in the DocBook format and " +"convert them to HTML, PDF, Postscript, and text." +msgstr "" +"?????? ?????????????????? ????????????????????? DocBook ???????????????????????? ???????????????????????? ??????????????? ????????? ????????????????????? HTML, PDF, ??????????????????????????????????????????, " +"????????? ????????? ???????????????????????? ??????????????????????????? ????????????????????? ????????? ???????????????." -#~ msgid "Compatibility Arch Libraries" -#~ msgstr "???????????????????????? ???????????? ??????????????????????????????" +#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +msgid "This group is a collection of network servers for specific purposes" +msgstr "?????? ???????????? ????????????????????? ??????????????????????????? ??????????????? ????????????????????? ?????? ?????????" -#~ msgid "Multilib library packages" -#~ msgstr "???????????????????????? ???????????????????????? ??????????????????" +#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 +msgid "This group is a collection of tools and resources of Arabic environments." +msgstr "?????? ???????????? ?????????????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????." -#~ msgid "" -#~ "Packages which provide functionality for the compatibility architecture." -#~ msgstr "?????????????????? ?????? ???????????????????????? ????????????????????????????????????????????? ????????????????????????????????? ?????????????????????." +#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 +msgid "This group is a collection of tools and resources of Hebrew environments." +msgstr "?????? ???????????? ?????????????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????." -#~ msgid "IBM eServer iSeries/pSeries Provided Software" -#~ msgstr "IBM eServer iSeries/pSeries ?????????????????? ???????????????????????? ???????????????????????????" +#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 +msgid "This group is a collection of tools and resources of Japanese environments." +msgstr "?????? ???????????? ?????????????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????." -#~ msgid "Software provided by IBM for eServer iSeries and pSeries machines" -#~ msgstr "eServer iSeries ????????? pSeries ?????????????????????????????? IBM ?????? ???????????????????????? ???????????????????????????" +#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +msgid "XEmacs" +msgstr "XEmacs" -#~ msgid "HPC" -#~ msgstr "HPC" +#: ../comps-el5.xml.in.h:65 +msgid "This group is a collection of tools and resources of Czech environments." +msgstr "?????? ???????????? ????????? ??????????????????????????????????????? ???????????? ??? ????????????????????????????????? ?????? ?????????." -#~ msgid "High Performance Computing Support" -#~ msgstr "???????????? ??????????????????????????? ??????????????? ??????????????????" From fedora-extras-commits at redhat.com Thu Mar 13 04:28:43 2008 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 13 Mar 2008 04:28:43 GMT Subject: rpms/namazu/devel .cvsignore, 1.5, 1.6 namazu.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200803130428.m2D4Shf5030450@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/pkgs/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30421 Modified Files: .cvsignore namazu.spec sources Log Message: * Thu Mar 13 2008 Akira TAGOH - 2.0.18-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/namazu/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Aug 2007 10:56:20 -0000 1.5 +++ .cvsignore 13 Mar 2008 04:28:03 -0000 1.6 @@ -5,3 +5,4 @@ namazu-2.0.15.tar.gz namazu-2.0.16.tar.gz namazu-2.0.17.tar.gz +namazu-2.0.18.tar.gz Index: namazu.spec =================================================================== RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- namazu.spec 12 Feb 2008 09:49:33 -0000 1.14 +++ namazu.spec 13 Mar 2008 04:28:03 -0000 1.15 @@ -3,8 +3,8 @@ %define nmz_libexecdir %{_libdir}/namazu Name: namazu -Version: 2.0.17 -Release: 7%{?dist} +Version: 2.0.18 +Release: 1%{?dist} License: GPLv2+ URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00 @@ -161,6 +161,9 @@ %changelog +* Thu Mar 13 2008 Akira TAGOH - 2.0.18-1 +- New upstream release. + * Tue Feb 12 2008 Akira TAGOH - 2.0.17-7 - Rebuild for gcc-4.3. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/namazu/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Aug 2007 10:56:20 -0000 1.5 +++ sources 13 Mar 2008 04:28:04 -0000 1.6 @@ -1 +1 @@ -83a62ae5f8a915dcc2745de1950e4a96 namazu-2.0.17.tar.gz +340c6a4d2571b042c2fc3e5a5f9c5f5b namazu-2.0.18.tar.gz From fedora-extras-commits at redhat.com Thu Mar 13 04:56:03 2008 From: fedora-extras-commits at redhat.com (Lubomir Kundrak (lkundrak)) Date: Thu, 13 Mar 2008 04:56:03 GMT Subject: rpms/minicom/devel minicom.spec,1.30,1.31 Message-ID: <200803130456.m2D4u3Js030934@cvs-int.fedora.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/minicom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30883 Modified Files: minicom.spec Log Message: * Thu Mar 13 2008 Lubomir Kundrak 2.3-2 - Add ChangeLog to %doc Index: minicom.spec =================================================================== RCS file: /cvs/pkgs/rpms/minicom/devel/minicom.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- minicom.spec 24 Feb 2008 20:34:38 -0000 1.30 +++ minicom.spec 13 Mar 2008 04:55:27 -0000 1.31 @@ -1,7 +1,7 @@ Summary: A text-based modem control and terminal emulation program Name: minicom Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://alioth.debian.org/projects/minicom/ License: GPLv2+ Group: Applications/Communications @@ -57,7 +57,7 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS NEWS TODO doc/* +%doc ChangeLog AUTHORS NEWS TODO doc/* %config(noreplace) %{_sysconfdir}/minicom.users # DO NOT MAKE minicom SUID/SGID anything. %{_bindir}/minicom @@ -67,6 +67,9 @@ %{_mandir}/man1/* %changelog +* Thu Mar 13 2008 Lubomir Kundrak 2.3-2 +- Add ChangeLog to %doc + * Sun Feb 24 2008 Lubomir Kundrak 2.3-1 - 2.3 From fedora-extras-commits at redhat.com Thu Mar 13 04:56:26 2008 From: fedora-extras-commits at redhat.com (Marc Bradshaw (deebs)) Date: Thu, 13 Mar 2008 04:56:26 GMT Subject: rpms/GREYCstoration/devel GREYCstoration-2.8-fixmakefile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 GREYCstoration.spec, 1.4, 1.5 sources, 1.4, 1.5 GREYCstoration-2.5.2-fixmakefile.patch, 1.1, NONE Message-ID: <200803130456.m2D4uQme030981@cvs-int.fedora.redhat.com> Author: deebs Update of /cvs/pkgs/rpms/GREYCstoration/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30907/devel Modified Files: .cvsignore GREYCstoration.spec sources Added Files: GREYCstoration-2.8-fixmakefile.patch Removed Files: GREYCstoration-2.5.2-fixmakefile.patch Log Message: new upstream version GREYCstoration-2.8-fixmakefile.patch: --- NEW FILE GREYCstoration-2.8-fixmakefile.patch --- --- GREYCstoration-2.8.orig/src/Makefile 2008-03-10 20:31:56.000000000 +1100 +++ GREYCstoration-2.8/src/Makefile 2008-03-13 15:24:32.000000000 +1100 @@ -36,21 +36,22 @@ CIMG_XRANDR_FLAGS = -Dcimg_use_xrandr -lXrandr # Uncomment to enable native support for PNG image files, using the PNG library. -#CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz +CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz # Uncomment to enable native support for JPEG image files, using the JPEG library. -#CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg +CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg # Uncomment to enable native support for TIFF image files, using the TIFF library. -#CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff +CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff # Uncomment to enable native support of most classical image file formats, using the Magick++ library. #CIMG_MAGICK_FLAGS = -Dcimg_use_magick `Magick++-config --cppflags` `Magick++-config --cxxflags` `Magick++-config --ldflags` `Magick++-config --libs` # Uncomment to enable faster Discrete Fourier Transform computation, using the FFTW3 library -#CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3 +CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3 EXTRA_FLAGS = $(CIMG_X11_FLAGS) $(CIMG_STRICT_FLAGS) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS) +ARCHFLAGS = $(CIMG_X11_FLAGS) $(CIMG_STRICT_FLAGS) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS) # Compilation rules .cpp: @@ -58,7 +59,6 @@ @echo "** Compiling '$* ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | grep version`'" @echo $(CC) -o $* $< $(CFLAGS) $(LDFLAGS) $(ARCHFLAGS) - strip $* menu: @echo @echo "CImg Library $(CIMG_VERSION) : Examples" @@ -93,7 +93,6 @@ @echo "** Compiling 'greycstoration4gimp ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | grep version`'" @echo $(CC) -o greycstoration4gimp greycstoration4gimp.cpp `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread -O3 $(CFLAGS) - strip greycstoration4gimp # Linux/Mac OSX targets linux: make "ARCHFLAGS=$(EXTRA_FLAGS)" all Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/GREYCstoration/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jan 2008 04:54:25 -0000 1.3 +++ .cvsignore 13 Mar 2008 04:55:50 -0000 1.4 @@ -1 +1 @@ -GREYCstoration-2.6.zip +GREYCstoration-2.8.zip Index: GREYCstoration.spec =================================================================== RCS file: /cvs/pkgs/rpms/GREYCstoration/devel/GREYCstoration.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- GREYCstoration.spec 19 Feb 2008 01:03:38 -0000 1.4 +++ GREYCstoration.spec 13 Mar 2008 04:55:51 -0000 1.5 @@ -1,13 +1,13 @@ Name: GREYCstoration -Version: 2.6 -Release: 3%{?dist} +Version: 2.8 +Release: 1%{?dist} Summary: An image denoising and interpolation tool Group: Applications/Multimedia License: CeCILL URL: http://www.greyc.ensicaen.fr/~dtschump/greycstoration/index.html -Source0: http://www.greyc.ensicaen.fr/~dtschump/greycstoration/data/%{name}-%{version}.zip +Source0: http://dl.sf.net/cimg/%{name}-%{version}.zip Source1: %{name}.png -Patch0: GREYCstoration-2.5.2-fixmakefile.patch +Patch0: GREYCstoration-2.8-fixmakefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gimp-devel gimp BuildRequires: desktop-file-utils @@ -136,6 +136,9 @@ %{_bindir}/%{name}_gui.tcl %changelog +* Thu Mar 13 2008 Marc Bradshaw 2.8-1 +- New upstream version + * Mon Feb 18 2008 Fedora Release Engineering - 2.6-3 - Autorebuild for GCC 4.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/GREYCstoration/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jan 2008 11:03:40 -0000 1.4 +++ sources 13 Mar 2008 04:55:51 -0000 1.5 @@ -1 +1 @@ -e7814b47a1dcf7fc7b8f694d9d1bbd72 GREYCstoration-2.6.zip +66b5e1467ab6f0d61b142e4604f6a231 GREYCstoration-2.8.zip --- GREYCstoration-2.5.2-fixmakefile.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 13 05:15:31 2008 From: fedora-extras-commits at redhat.com (Huang Peng (phuang)) Date: Thu, 13 Mar 2008 05:15:31 GMT Subject: rpms/scim/devel scim.spec,1.111,1.112 Message-ID: <200803130515.m2D5FVOQ004895@cvs-int.fedora.redhat.com> Author: phuang Update of /cvs/pkgs/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4869 Modified Files: scim.spec Log Message: Replace scim-pinyin to scim-python-pinyin for scim-lang-chinese. Index: scim.spec =================================================================== RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- scim.spec 10 Mar 2008 07:39:11 -0000 1.111 +++ scim.spec 13 Mar 2008 05:14:46 -0000 1.112 @@ -3,7 +3,7 @@ Name: scim Version: 1.4.7 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Smart Common Input Method platform License: LGPLv2+ @@ -121,7 +121,7 @@ %lang_meta_pkg assamese scim-m17n m17n-db-assamese m17n-contrib-assamese %lang_meta_pkg bengali scim-m17n m17n-db-bengali m17n-contrib-bengali -%lang_meta_pkg chinese scim-chewing scim-pinyin scim-tables-chinese +%lang_meta_pkg chinese scim-chewing scim-python-pinyin scim-tables-chinese %lang_meta_pkg dhivehi scim-m17n m17n-db-dhivehi %lang_meta_pkg farsi scim-m17n m17n-db-farsi %lang_meta_pkg gujarati scim-m17n m17n-db-gujarati m17n-contrib-gujarati @@ -301,6 +301,9 @@ %changelog +* Thu Mar 13 2008 Huang Peng - 1.4.7-18 +- Replace scim-pinyin to scim-python-pinyin for scim-lang-chinese + * Mon Mar 10 2008 Jens Petersen - 1.4.7-17 - remove the frame around the help text in the help dialog From fedora-extras-commits at redhat.com Thu Mar 13 05:38:27 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 13 Mar 2008 05:38:27 GMT Subject: comps/po ml.po,1.5,1.6 Message-ID: <200803130538.m2D5cR6F005280@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5249/po Modified Files: ml.po Log Message: 2008-03-13 Ani Peter (via anipeter at fedoraproject.org) * po/ml.po: Updated Malayalam Translation View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 ml.po Index: ml.po =================================================================== RCS file: /cvs/pkgs/comps/po/ml.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ml.po 17 Sep 2007 19:22:12 -0000 1.5 +++ ml.po 13 Mar 2008 05:37:57 -0000 1.6 @@ -1,4 +1,4 @@ -# translation of ml.po to Malayalam +# translation of ml.po to # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: ml\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-17 15:18-0400\n" -"PO-Revision-Date: 2007-03-02 11:47+0530\n" -"Last-Translator: Ani Peter \n" -"Language-Team: Malayalam \n" +"POT-Creation-Date: 2008-02-28 17:42-0700\n" +"PO-Revision-Date: 2008-03-12 11:56+0530\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,626 +23,247 @@ "\n" "\n" -#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1 -#: ../comps-f8.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." msgstr "?????? ?????????????????? ????????????????????????????????? ????????????????????? ?????????????????????????????????????????????????????? ?????????????????? ???????????????????????? ????????????????????????????????? ??????????????????????????????????????????????????????." -#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2 -#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 +#: ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "??????????????????????????????????????????????????? ?????????????????????????????????" -#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5 -#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +msgid "Afrikaans Support" +msgstr "??????????????????????????????????????? ?????????????????????" + +#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +msgid "Albanian Support" +msgstr "???????????????????????????????????? ?????????????????????" + +#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 +#: ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "????????????????????????????????????" -#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3 -#: ../comps-el5.xml.in.h:3 -msgid "Applications for a variety of tasks" -msgstr "??????????????? ????????????????????????????????????????????????????????????????????? ????????????????????????????????????" +#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +msgid "Applications to perform a variety of tasks" +msgstr "??????????????? ??????????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????????" -#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7 -#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 +#: ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 msgid "Arabic Support" -msgstr "???????????????????????? ???????????????????????????????????? " +msgstr "???????????????????????? ?????????????????????" -#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8 -#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 +#: ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 msgid "Armenian Support" -msgstr "???????????????????????????????????? ????????????????????????????????????" +msgstr "???????????????????????????????????? ?????????????????????" + +#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 +msgid "Assamese Support" +msgstr "??????????????????????????? ?????????????????????" -#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10 -#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 +#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 +#: ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "??????????????????????????? ?????????????????????????????????????????????" -#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12 -#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 -msgid "Base System" -msgstr "?????????????????? ????????????????????????" - -#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31 -#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 -msgid "Desktop Environments" -msgstr "???????????????-?????????????????? ??????????????????????????????????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32 -#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 -msgid "Desktop environments" -msgstr "???????????????-?????????????????? ??????????????????????????????????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33 -#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 -msgid "Development" -msgstr "?????????????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35 -#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 -msgid "Development Tools" -msgstr "????????????????????????????????????????????? ?????????????????????????????????" - -#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12 -#: ../comps-el5.xml.in.h:13 -msgid "Dialup Networking Support" -msgstr "????????????????????? ??????????????????????????????????????????????????? ????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39 -#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 -msgid "Editors" -msgstr "????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40 -#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 -msgid "Educational Software" -msgstr "????????????????????????????????????????????????????????? ?????????????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41 -#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 -msgid "Educational software for learning" -msgstr "??????????????????????????? ???????????????????????????????????? ?????????????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42 -#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 -msgid "Engineering and Scientific" -msgstr "???????????????????????????????????? ????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46 -#: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 -msgid "FTP Server" -msgstr "FTP ????????????????????????" - -#: ../comps-fe5.xml.in.h:19 ../comps-fe6.xml.in.h:20 ../comps-f7.xml.in.h:51 -#: ../comps-f8.xml.in.h:54 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 -msgid "" -"From CD recording to playing audio CDs and multimedia files, this package " -"group allows you to work with sound and video on the system." -msgstr "" -"??? ???????????????????????? ????????????????????? ????????????????????????????????????????????? ?????????????????? ?????????????????? ?????????????????? ???????????????????????? ??????????????????????????????,CD ???????????????????????????????????? ?????????????????? " -"??????????????? CD????????? ??????????????????????????????????????? ??????????????????????????? ???????????????????????????????????? ????????? ????????????????????????????????? ???????????????????????????????????????." - -#: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52 -#: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 -msgid "GNOME Desktop Environment" -msgstr "GNOME ???????????????????????????????????? ??????????????????????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:21 ../comps-fe6.xml.in.h:22 ../comps-f7.xml.in.h:53 -#: ../comps-f8.xml.in.h:56 ../comps-el4.xml.in.h:20 ../comps-el5.xml.in.h:21 -msgid "GNOME Software Development" -msgstr "GNOME ???????????????????????????????????? ?????????????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:22 ../comps-fe6.xml.in.h:23 ../comps-el4.xml.in.h:21 -#: ../comps-el5.xml.in.h:22 -msgid "" -"GNOME is a powerful, graphical user interface which includes a panel, " -"desktop, system icons, and a graphical file manager." -msgstr "" -"??????????????????, ???????????????????????????????????????, ???????????????????????? ??????????????????????????????, ???????????????????????????????????? ???????????????????????? ??????????????????????????????????????? ????????????????????????????????? ????????? ????????????????????? " -"???????????????????????????????????? ?????????????????? ?????????????????????????????????????????? ????????? GNOME. " - -#: ../comps-fe5.xml.in.h:23 ../comps-fe6.xml.in.h:24 ../comps-f7.xml.in.h:57 -#: ../comps-f8.xml.in.h:60 ../comps-el5.xml.in.h:23 -msgid "Games and Entertainment" -msgstr "????????????????????? ?????????????????????????????????" - -#: ../comps-fe5.xml.in.h:24 ../comps-fe6.xml.in.h:25 ../comps-f7.xml.in.h:60 -#: ../comps-f8.xml.in.h:63 ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:24 -msgid "Graphical Internet" -msgstr "???????????????????????????????????? ??????????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:25 ../comps-fe6.xml.in.h:26 ../comps-f7.xml.in.h:61 -#: ../comps-f8.xml.in.h:64 ../comps-el4.xml.in.h:23 ../comps-el5.xml.in.h:25 -msgid "Graphics" -msgstr "????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:26 ../comps-fe6.xml.in.h:27 ../comps-f7.xml.in.h:64 -#: ../comps-f8.xml.in.h:67 ../comps-el4.xml.in.h:24 ../comps-el5.xml.in.h:26 -msgid "Hardware Support" -msgstr "?????????????????????????????????????????? ????????????????????????????????????" - -#: ../comps-fe5.xml.in.h:27 ../comps-fe6.xml.in.h:28 ../comps-f7.xml.in.h:65 [...1702 lines suppressed...] -#~ "Red Hat Enterprise Linux ?????? ?????????????????????????????? ??????????????? ?????????????????????????????? (??????????????????????????????????????????????????????) ??????????????? " -#~ "???????????????????????? ??????????????? ????????????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Korean language." -#~ msgstr "" -#~ "Red Hat Enterprise Linux ?????? ?????????????????????????????? ??????????????? ?????????????????????????????? (??????????????????????????????????????????????????????) ??????????????? " -#~ "???????????????????????? ??????????????? ????????????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Simplified Chinese language." -#~ msgstr "" -#~ "Red Hat Enterprise Linux ?????? ?????????????????????????????? ??????????????? ?????????????????????????????? (??????????????????????????????????????????????????????) ??????????????? " -#~ "???????????????????????? ??????????????? ????????????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Traditional Chinese language." -#~ msgstr "" -#~ "Red Hat Enterprise Linux ?????? ?????????????????????????????? ??????????????? ?????????????????????????????? (??????????????????????????????????????????????????????) ??????????????? " -#~ "???????????????????????? ??????????????? ????????????????????????." - -#~ msgid "Traditional Chinese" -#~ msgstr "??????????????????(??????????????????????????????) ??????????????????" - -#~ msgid "ppc64 Compatibility Arch Development Support" -#~ msgstr "ppc64 ???????????????????????????????????????????????? ???????????????????????? ????????????????????????????????????????????? ????????????????????????????????????" - -#~ msgid "Bengali" -#~ msgstr "??????????????????" - -#~ msgid "Gujarati" -#~ msgstr "???????????????????????????" - -#~ msgid "Hindi" -#~ msgstr "??????????????????" - -#~ msgid "Punjabi" -#~ msgstr "?????????????????????" - -#~ msgid "Red Hat Enterprise Linux 4 Documentation" -#~ msgstr "Red Hat Enterprise Linux 4 ??????????????????????????????????????????????????????" - -#~ msgid "Tamil" -#~ msgstr "???????????????" - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Bengali language." -#~ msgstr "" -#~ "Red Hat Enterprise Linux ?????? ?????????????????????????????? ??????????????? ?????????????????????????????? (??????????????????????????????????????????????????????) ?????????????????? " -#~ "???????????????????????? ??????????????? ????????????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Gujarati language." -#~ msgstr "" -#~ "Red Hat Enterprise Linux ?????? ?????????????????????????????? ??????????????? ?????????????????????????????? (??????????????????????????????????????????????????????) ??????????????????????????? " -#~ "???????????????????????? ??????????????? ????????????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Hindi language." -#~ msgstr "" -#~ "Red Hat Enterprise Linux ?????? ?????????????????????????????? ??????????????? ?????????????????????????????? (??????????????????????????????????????????????????????) ?????????????????? " -#~ "???????????????????????? ??????????????? ????????????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Punjabi language." -#~ msgstr "" -#~ "Red Hat Enterprise Linux ?????? ?????????????????????????????? ??????????????? ?????????????????????????????? (??????????????????????????????????????????????????????) ????????????????????? " -#~ "???????????????????????? ??????????????? ????????????????????????." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Tamil language." -#~ msgstr "" -#~ "Red Hat Enterprise Linux ?????? ?????????????????????????????? ??????????????? ?????????????????????????????? (??????????????????????????????????????????????????????) ??????????????? " -#~ "???????????????????????? ??????????????? ????????????????????????." - -#~ msgid "Cluster Storage" -#~ msgstr "????????????????????????????????? ??????????????????" - -#~ msgid "Clustering Support." -#~ msgstr "???????????????????????????????????? ????????????????????????????????????. " - -#~ msgid "Packages which provide support for cluster storage." -#~ msgstr "????????????????????????????????? ????????????????????????????????? ???????????????????????????????????????????????? ????????????????????????????????????." - -#~ msgid "Packages which provide support for single-node GFS." -#~ msgstr "????????? ???????????????????????? GFS-?????? ???????????????????????????????????????????????? ????????????????????????????????????." - -#~ msgid "Single Node GFS Support" -#~ msgstr "????????? ???????????????????????? GFS ????????????????????????????????????" - -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "??????????????? ?????????????????????????????????????????? ??? ???????????????????????????????????? ??????????????????????????????????????????????????? ???????????????????????????????????? ??????????????????????????????." - -#~ msgid "Java Runtime Environments and Development Kits" -#~ msgstr "???????????? ????????????????????? ?????????????????????????????????????????????????????????????????? ???????????????????????????????????? ??????????????????????????????" +#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +msgid "Applications for a variety of tasks" +msgstr "??????????????? ????????????????????????????????????????????????????????????????????? ????????????????????????????????????" -#~ msgid "Misc" -#~ msgstr "????????????" +#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +msgid "Dialup Networking Support" +msgstr "????????????????????? ??????????????????????????????????????????????????? ?????????????????????" -#~ msgid "Misc packages" -#~ msgstr "???????????? ????????????????????????????????????" +#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 +msgid "" +"GNOME is a powerful, graphical user interface which includes a panel, " +"desktop, system icons, and a graphical file manager." +msgstr "" +"??????????????????, ???????????????????????????????????????, ???????????????????????? ??????????????????????????????, ???????????????????????????????????? ???????????????????????? ??????????????????????????????????????? ????????????????????????????????? ????????? ????????????????????? " +"???????????????????????????????????? ?????????????????? ?????????????????????????????????????????? ????????? GNOME. " -#~ msgid "Multimedia" -#~ msgstr "???????????????????????? ??????????????????" +#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 +msgid "" +"KDE is a powerful, graphical user interface which includes a panel, desktop, " +"system icons, and a graphical file manager." +msgstr "" +"??????????????????, ???????????????????????????????????????, ???????????????????????? ??????????????????????????????, ???????????????????????????????????? ???????????????????????? ??????????????????????????????????????? ????????????????????????????????? ????????? ????????????????????? " +"???????????????????????????????????? ?????????????????? ?????????????????????????????????????????? ????????? KDE. " -#~ msgid "Multimedia applications" -#~ msgstr "???????????????????????? ?????????????????? ????????????????????????????????????" +#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 +msgid "" +"Sometimes called text editors, these are programs that allow you to create " +"and edit files. These include Emacs and Vi." +msgstr "" +"???????????????????????? ??????????????????????????????????????????????????? ????????????????????? ?????????????????????????????????????????? ?????????????????????????????????????????????????????? ??????????????????????????????????????? ??? ??????????????????????????????????????????, " +"?????????????????????????????? ???????????????????????????????????? ?????????????????? ???????????????????????????????????????????????????. Emacs?????? Vi????????? ????????????????????? ??????????????????????????????????????????." -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "Red Hat Enterprise Linux-?????? ??????????????????????????? ???????????????????????? ????????????????????????????????????????????????????????????????????? ????????????????????????????????????" +#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +msgid "The XEmacs text editor." +msgstr "XEmacs ?????????????????????????????? ???????????????????????????." -#~ msgid "Red Hat Enterprise Linux Extras" -#~ msgstr "Red Hat Enterprise Linux ?????????????????????????????????" +#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 +msgid "" +"These tools allow you to create documentation in the DocBook format and " +"convert them to HTML, PDF, Postscript, and text." +msgstr "" +"DocBook format????????? ??????????????????????????????????????????????????? ??????????????????????????????????????????, ???????????? HTML, PDF, Postscript, text " +"?????????????????????????????????????????? ??????????????????????????????????????? ????????????????????????????????????????????? ??? ????????????????????????????????? ??????????????????????????????????????????." -#~ msgid "Workstation" -#~ msgstr "?????????????????? ??????????????????????????????" +#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +msgid "This group is a collection of network servers for specific purposes" +msgstr "???????????????????????? ???????????????????????????????????????????????????????????????????????? ????????????????????????????????????????????? ???????????????????????????????????? ????????? ???????????????????????? ??? ??????????????????." -#~ msgid "Workstation applications and utilities." -#~ msgstr "???????????????????????? ?????????????????????????????? ???????????????????????????????????? ?????????????????????????????????." +#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 +msgid "This group is a collection of tools and resources of Arabic environments." +msgstr "?????????????????? ?????????????????????????????????????????????????????????????????? ???????????????????????????????????? ????????????????????????????????? ???????????? ????????? ???????????????????????? ??? ??????????????????." -#~ msgid "Virtualization Support." -#~ msgstr "?????????????????????????????????????????????????????? ????????????????????????????????????." +#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 +msgid "This group is a collection of tools and resources of Hebrew environments." +msgstr "?????????????????? ?????????????????????????????????????????????????????????????????? ???????????????????????????????????? ????????????????????????????????? ???????????? ????????? ???????????????????????? ??? ??????????????????." -#~ msgid "Compatibility Arch" -#~ msgstr "???????????????????????????????????????????????? ????????????????????????" +#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 +msgid "This group is a collection of tools and resources of Japanese environments." +msgstr "??????????????????????????? ?????????????????????????????????????????????????????????????????? ???????????????????????????????????? ????????????????????????????????? ???????????? ????????? ???????????????????????? ??? ??????????????????." -#~ msgid "Compatibility Arch Libraries" -#~ msgstr "???????????????????????????????????????????????? ???????????????????????? ?????????????????????????????????" +#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +msgid "XEmacs" +msgstr "XEmacs" -#~ msgid "Multilib library packages" -#~ msgstr "Multilib ???????????????????????????????????? ????????????????????????????????????" +#: ../comps-el5.xml.in.h:65 +msgid "This group is a collection of tools and resources of Czech environments." +msgstr "?????????????????? ?????????????????????????????????????????????????????????????????? ???????????????????????????????????? ????????????????????????????????? ???????????? ????????? ???????????????????????? ??? ??????????????????." -#~ msgid "" -#~ "Packages which provide functionality for the compatibility architecture." -#~ msgstr "??????????????????????????????????????????????????? ??????????????????????????????????????????????????????????????? ???????????????????????????????????? ??????????????????????????????????????? ????????????????????????????????????" From fedora-extras-commits at redhat.com Thu Mar 13 06:38:46 2008 From: fedora-extras-commits at redhat.com (Dave Airlie (airlied)) Date: Thu, 13 Mar 2008 06:38:46 GMT Subject: rpms/xorg-x11-server/devel xserver-1.5.0-bad-fbdev-thats-mine.patch, NONE, 1.1 xorg-x11-server.spec, 1.307, 1.308 Message-ID: <200803130638.m2D6ckAe012046@cvs-int.fedora.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/xorg-x11-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12012 Modified Files: xorg-x11-server.spec Added Files: xserver-1.5.0-bad-fbdev-thats-mine.patch Log Message: * Thu Mar 13 2008 Dave Airlie 1.4.99.901-6.20080310 - fix fbdev probing with no hardware to not load fbdev if pci slot claimed xserver-1.5.0-bad-fbdev-thats-mine.patch: --- NEW FILE xserver-1.5.0-bad-fbdev-thats-mine.patch --- >From 656ca314bb97341a07d4bbd7fcfe7af9a3689761 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 13 Mar 2008 16:16:46 +1000 Subject: [PATCH] fbdev: make entity fail if PCI claimed already. bad kitty fbdev. --- hw/xfree86/common/xf86Bus.c | 3 +++ hw/xfree86/common/xf86fbBus.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index f7ffac8..9f4e0ca 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -458,6 +458,9 @@ xf86GetEntityInfo(int entityIndex) EntityInfoPtr pEnt; int i; + if (entityIndex == -1) + return NULL; + if (entityIndex >= xf86NumEntities) return NULL; diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index 102f6b1..48e101b 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -58,6 +58,9 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) { EntityPtr p; int num; + + if (pciSlotClaimed) + return -1; num = xf86AllocateEntity(); p = xf86Entities[num]; -- 1.5.4.3 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- xorg-x11-server.spec 12 Mar 2008 23:04:38 -0000 1.307 +++ xorg-x11-server.spec 13 Mar 2008 06:37:36 -0000 1.308 @@ -20,7 +20,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.901 -Release: 5.%{gitdate}%{?dist} +Release: 6.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -64,6 +64,7 @@ Patch5004: xserver-1.5.0-wfs.patch Patch5005: xserver-1.5.0-unselinux.patch Patch5006: xserver-1.5.0-ia64.patch +Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -512,6 +513,9 @@ %changelog +* Thu Mar 13 2008 Dave Airlie 1.4.99.901-6.20080310 +- fix fbdev probing with no hardware to not load fbdev if pci slot claimed + * Wed Mar 12 2008 Adam Jackson 1.4.99.901-5.20080310 - xserver-1.5.0-unselinux.patch: Disable selinux extension for now. - xserver-1.5.0-ia64.patch: Fix ia64 PCI support. (#429878) From fedora-extras-commits at redhat.com Thu Mar 13 06:46:44 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Thu, 13 Mar 2008 06:46:44 GMT Subject: rpms/xgridfit/devel xgridfit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803130646.m2D6ki1G012258@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/xgridfit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12217/devel Modified Files: .cvsignore sources Added Files: xgridfit.spec Log Message: initial import --- NEW FILE xgridfit.spec --- %define archivever 1-5 Name: xgridfit Version: 1.5 Release: 1%{?dist} Summary: Font hinting tool # This is where we drop fontforge Group: Applications/Publishing License: LGPLv2 URL: http://%{name}.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{archivever}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch Requires: %{_bindir}/xsltproc %description Xgridfit is a high-level, XML-based language for gridfitting, or "hinting", fonts. The Xgridfit program compiles an XML source file into tables and instructions that relate to the gridfitting of glyphs. Xgridfit does not insert these elements into a font itself, but rather relies on FontForge, the Open-Source font editor, to do so. %package doc Group: Documentation Summary: Font hinting tool use documentation # Does not really make sense without the tool itself Requires: %{name} = %{version}-%{release} %description doc Xgridfit font hinting tool user documentation. %prep %setup -q -n %{name} %build # Nothing to do %install rm -fr %{buildroot} install -d -m 0755 %{buildroot}/%{_bindir} sed 's+^XSLT_DIR=\(.*\)$+XSLT_DIR=%{_datadir}/xml/%{name}/lib+g' \ bin/xgridfit > %{buildroot}/%{_bindir}/xgridfit sed 's+^XSLT_DIR=\(.*\)$+XSLT_DIR=%{_datadir}/xml/%{name}/utils+g' \ bin/xgfupdate > %{buildroot}/%{_bindir}/xgfupdate sed 's+^XSLT_DIR=\(.*\)$+XSLT_DIR=%{_datadir}/xml/%{name}/utils+g' \ bin/ttx2xgf > %{buildroot}/%{_bindir}/ttx2xgf install -d -m 0755 %{buildroot}/%{_datadir}/xml/%{name}/{lib,utils,schemas} for dir in lib schemas utils ; do install -p -m 0644 $dir/* %{buildroot}/%{_datadir}/xml/%{name}/$dir done install -d -m 0755 %{buildroot}/%{_mandir}/man1 install -p -m 0644 man/*.1 %{buildroot}/%{_mandir}/man1 %clean rm -fr %{buildroot} %files %defattr(0644,root,root,0755) %doc COPYING ChangeLog %{_datadir}/xml/%{name} %{_mandir}/man1/* %defattr(0755,root,root,0755) %{_bindir}/* %files doc %defattr(0644,root,root,0755) %doc docs/* %changelog * Tue Mar 11 2008 - 1.5-1 ??? Initial Fedora packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xgridfit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 23:57:47 -0000 1.1 +++ .cvsignore 13 Mar 2008 06:46:08 -0000 1.2 @@ -0,0 +1 @@ +xgridfit-1-5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xgridfit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 23:57:47 -0000 1.1 +++ sources 13 Mar 2008 06:46:08 -0000 1.2 @@ -0,0 +1 @@ +78a322021939e81cb3e2a04a306ed60b xgridfit-1-5.tar.gz From fedora-extras-commits at redhat.com Thu Mar 13 06:47:26 2008 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Thu, 13 Mar 2008 06:47:26 GMT Subject: rpms/xgridfit/F-8 xgridfit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200803130647.m2D6lQ2A012335@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/xgridfit/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12296/F-8 Modified Files: .cvsignore sources Added Files: xgridfit.spec Log Message: initial import --- NEW FILE xgridfit.spec --- %define archivever 1-5 Name: xgridfit Version: 1.5 Release: 1%{?dist} Summary: Font hinting tool # This is where we drop fontforge Group: Applications/Publishing License: LGPLv2 URL: http://%{name}.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{archivever}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch Requires: %{_bindir}/xsltproc %description Xgridfit is a high-level, XML-based language for gridfitting, or "hinting", fonts. The Xgridfit program compiles an XML source file into tables and instructions that relate to the gridfitting of glyphs. Xgridfit does not insert these elements into a font itself, but rather relies on FontForge, the Open-Source font editor, to do so. %package doc Group: Documentation Summary: Font hinting tool use documentation # Does not really make sense without the tool itself Requires: %{name} = %{version}-%{release} %description doc Xgridfit font hinting tool user documentation. %prep %setup -q -n %{name} %build # Nothing to do %install rm -fr %{buildroot} install -d -m 0755 %{buildroot}/%{_bindir} sed 's+^XSLT_DIR=\(.*\)$+XSLT_DIR=%{_datadir}/xml/%{name}/lib+g' \ bin/xgridfit > %{buildroot}/%{_bindir}/xgridfit sed 's+^XSLT_DIR=\(.*\)$+XSLT_DIR=%{_datadir}/xml/%{name}/utils+g' \ bin/xgfupdate > %{buildroot}/%{_bindir}/xgfupdate sed 's+^XSLT_DIR=\(.*\)$+XSLT_DIR=%{_datadir}/xml/%{name}/utils+g' \ bin/ttx2xgf > %{buildroot}/%{_bindir}/ttx2xgf install -d -m 0755 %{buildroot}/%{_datadir}/xml/%{name}/{lib,utils,schemas} for dir in lib schemas utils ; do install -p -m 0644 $dir/* %{buildroot}/%{_datadir}/xml/%{name}/$dir done install -d -m 0755 %{buildroot}/%{_mandir}/man1 install -p -m 0644 man/*.1 %{buildroot}/%{_mandir}/man1 %clean rm -fr %{buildroot} %files %defattr(0644,root,root,0755) %doc COPYING ChangeLog %{_datadir}/xml/%{name} %{_mandir}/man1/* %defattr(0755,root,root,0755) %{_bindir}/* %files doc %defattr(0644,root,root,0755) %doc docs/* %changelog * Tue Mar 11 2008 - 1.5-1 ??? Initial Fedora packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xgridfit/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Mar 2008 23:57:47 -0000 1.1 +++ .cvsignore 13 Mar 2008 06:46:49 -0000 1.2 @@ -0,0 +1 @@ +xgridfit-1-5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xgridfit/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Mar 2008 23:57:47 -0000 1.1 +++ sources 13 Mar 2008 06:46:49 -0000 1.2 @@ -0,0 +1 @@ +78a322021939e81cb3e2a04a306ed60b xgridfit-1-5.tar.gz From fedora-extras-commits at redhat.com Thu Mar 13 07:27:13 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 13 Mar 2008 07:27:13 GMT Subject: comps/po bn_IN.po,1.5,1.6 Message-ID: <200803130727.m2D7RDxX019170@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19151/po Modified Files: bn_IN.po Log Message: 2008-03-13 Runa Bhattacharjee (via runab at fedoraproject.org) * po/bn_IN.po: Updated Bengali India Translation View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 bn_IN.po Index: bn_IN.po =================================================================== RCS file: /cvs/pkgs/comps/po/bn_IN.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bn_IN.po 17 Sep 2007 19:22:12 -0000 1.5 +++ bn_IN.po 13 Mar 2008 07:26:43 -0000 1.6 @@ -1,45 +1,24 @@ -# translation of bn_IN.po to Bengali India -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) -# translation of bn_IN.po to Bangla (INDIA) +# translation of comps.HEAD.po to Bengali INDIA # Bangla INDIA Translation of Comps.po # Copyright (C) 2003, 2004, Red Hat, Inc. # This file is distributed under the same license as the COMPS package. +# # Deepayan Sarkar , 2003, 2004. # Progga , 2004. # Runa Bhattacharjee , 2004, 2005, 2006, 2007. -# +# Runa Bhattacharjee , 2008. msgid "" msgstr "" -"Project-Id-Version: bn_IN\n" +"Project-Id-Version: comps.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-17 15:18-0400\n" -"PO-Revision-Date: 2007-03-05 11:43+0530\n" -"Last-Translator: Runa Bhattacharjee \n" -"Language-Team: Bengali India\n" +"POT-Creation-Date: 2008-02-28 17:42-0700\n" +"PO-Revision-Date: 2008-03-13 09:51+0530\n" +"Last-Translator: Runa Bhattacharjee \n" +"Language-Team: Bengali INDIA \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "\n" "\n" @@ -49,613 +28,178 @@ "\n" "\n" -#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1 -#: ../comps-f8.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." msgstr "??????????????? ??????????????????????????????????????? ?????????????????? ???????????? ???????????????????????????????????? ?????????????????????????????? ????????????????????? ?????????????????????" # modified for RHEL -#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2 -#: ../comps-f8.xml.in.h:2 ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 +#: ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "??????????????????????????? ?????????????????????" +#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +msgid "Afrikaans Support" +msgstr "???????????????????????? ???????????? ??????????????????????????? ??????????????????" + +#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +msgid "Albanian Support" +msgstr "??????????????????????????? ???????????? ??????????????????????????? ??????????????????" + # modified for RHEL -#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:5 -#: ../comps-f8.xml.in.h:5 ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 +#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 +#: ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "????????????????????????????????????" -#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4 ../comps-el4.xml.in.h:3 -#: ../comps-el5.xml.in.h:3 -msgid "Applications for a variety of tasks" +#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +msgid "Applications to perform a variety of tasks" msgstr "??????????????? ??????????????? ????????????????????? ????????????????????????????????????" -#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:7 -#: ../comps-f8.xml.in.h:7 ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 +#: ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "???????????? ???????????? ??????????????????????????? ??????????????????" -#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:8 -#: ../comps-f8.xml.in.h:8 ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 +#: ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "?????????????????????????????? ???????????? ??????????????????????????? ??????????????????" # modified for RHEL -#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:10 -#: ../comps-f8.xml.in.h:10 ../comps-el4.xml.in.h:6 ../comps-el5.xml.in.h:6 -msgid "Authoring and Publishing" -msgstr "???????????? ??? ????????????????????????" - -#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:12 -#: ../comps-f8.xml.in.h:12 ../comps-el4.xml.in.h:7 ../comps-el5.xml.in.h:7 -msgid "Base System" -msgstr "??????????????? ?????????????????????" - -#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:31 -#: ../comps-f8.xml.in.h:32 ../comps-el4.xml.in.h:8 ../comps-el5.xml.in.h:9 -msgid "Desktop Environments" -msgstr "????????????????????? ??????????????????" - -#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:32 -#: ../comps-f8.xml.in.h:33 ../comps-el4.xml.in.h:9 ../comps-el5.xml.in.h:10 -msgid "Desktop environments" -msgstr "????????????????????? ??????????????????" - -# modified for RHEL -#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:33 -#: ../comps-f8.xml.in.h:34 ../comps-el4.xml.in.h:10 ../comps-el5.xml.in.h:11 -msgid "Development" -msgstr "?????????????????????????????? ?????????????????????" - -# modified for RHEL -#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:35 -#: ../comps-f8.xml.in.h:36 ../comps-el4.xml.in.h:11 ../comps-el5.xml.in.h:12 -msgid "Development Tools" -msgstr "?????????????????????????????? ??????????????????????????? ???????????? ??????????????????????????? ?????????" - -# modified for RHEL -#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14 ../comps-el4.xml.in.h:12 -#: ../comps-el5.xml.in.h:13 -msgid "Dialup Networking Support" -msgstr "???????????????-?????? ????????????????????????????????? ????????????????????????" - -# modified for RHEL -#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:39 -#: ../comps-f8.xml.in.h:39 ../comps-el4.xml.in.h:13 ../comps-el5.xml.in.h:14 -msgid "Editors" -msgstr "?????????????????? ???????????????" - -#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:40 -#: ../comps-f8.xml.in.h:40 ../comps-el4.xml.in.h:14 ../comps-el5.xml.in.h:15 -msgid "Educational Software" -msgstr "?????????????????????????????? ??????????????????????????????" - -#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:41 -#: ../comps-f8.xml.in.h:41 ../comps-el4.xml.in.h:15 ../comps-el5.xml.in.h:16 -msgid "Educational software for learning" -msgstr "?????????????????????????????? ??????????????????????????????" - -# modified for RHEL -#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:42 -#: ../comps-f8.xml.in.h:42 ../comps-el4.xml.in.h:16 ../comps-el5.xml.in.h:17 -msgid "Engineering and Scientific" -msgstr "???????????????????????????????????? ????????? ??????????????????????????? ?????????????????????" - -# modified for RHEL -#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:46 -#: ../comps-f8.xml.in.h:46 ../comps-el4.xml.in.h:17 ../comps-el5.xml.in.h:18 -msgid "FTP Server" -msgstr "FTP ?????????????????????" - -#: ../comps-fe5.xml.in.h:19 ../comps-fe6.xml.in.h:20 ../comps-f7.xml.in.h:51 -#: ../comps-f8.xml.in.h:54 ../comps-el4.xml.in.h:18 ../comps-el5.xml.in.h:19 -msgid "" -"From CD recording to playing audio CDs and multimedia files, this package " -"group allows you to work with sound and video on the system." -msgstr "" -"?????? ????????????????????? ???????????????????????????????????? ???????????????????????? ???????????? ???????????? ????????? ??????????????? ???????????? ????????? ???????????? ??????????????????, ???????????? " -"CD ?????????????????? ????????? ?????? ???????????? CD ????????? ???????????????????????????????????? ???????????? ??????????????????" - -#: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:52 -#: ../comps-f8.xml.in.h:55 ../comps-el4.xml.in.h:19 ../comps-el5.xml.in.h:20 -msgid "GNOME Desktop Environment" -msgstr "GNOME ????????????????????? ??????????????????" - -#: ../comps-fe5.xml.in.h:21 ../comps-fe6.xml.in.h:22 ../comps-f7.xml.in.h:53 [...1782 lines suppressed...] -#~ msgstr "" -#~ "?????? ????????????????????? ??????????????? ??????????????????????????? ???????????? ??????????????? Red Hat Enterprise Linux'??? ????????????????????? " -#~ "????????????????????? ??????????????????" - -#~ msgid "Traditional Chinese" -#~ msgstr "??????????????????????????? ????????????" - -# FIXME -# modified for RHEL -#~ msgid "ppc64 Compatibility Arch Development Support" -#~ msgstr "ppc64 ??????????????????????????????????????? ???????????? ?????????????????? ?????????????????????????????? ??????????????????????????? ??????????????????" +msgstr "?????????????????? ???????????????????????? ??? ?????????????????? ???????????? ?????????????????????" -# modified for RHEL -#~ msgid "Bengali" -#~ msgstr "???????????????" - -# modified for RHEL -#~ msgid "Gujarati" -#~ msgstr "?????????????????????" - -# modified for RHEL -#~ msgid "Hindi" -#~ msgstr "??????????????????" - -# modified for RHEL -#~ msgid "Punjabi" -#~ msgstr "????????????????????????" - -# modified for RHEL -#~ msgid "Red Hat Enterprise Linux 4 Documentation" -#~ msgstr "Red Hat Enterprise Linux 4'??? ?????????????????????" - -# modified for RHEL -#~ msgid "Tamil" -#~ msgstr "???????????????" - -# modified for RHEL -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Bengali language." -#~ msgstr "" -#~ "?????? ????????????????????? ??????????????? ??????????????? ??????????????? Red Hat Enterprise Linux'??? ????????????????????? ????????????????????? " -#~ "??????????????????" - -# modified for RHEL -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Gujarati language." -#~ msgstr "" -#~ "?????? ????????????????????? ??????????????? ????????????????????? ??????????????? Red Hat Enterprise Linux'??? ????????????????????? ????????????????????? " -#~ "??????????????????" - -# modified for RHEL -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Hindi language." -#~ msgstr "" -#~ "?????? ????????????????????? ??????????????? ?????????????????? ??????????????? Red Hat Enterprise Linux'??? ????????????????????? ????????????????????? " -#~ "??????????????????" - -# modified for RHEL -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Punjabi language." -#~ msgstr "" -#~ "?????? ????????????????????? ??????????????? ???????????????????????? ??????????????? Red Hat Enterprise Linux'??? ????????????????????? ????????????????????? " -#~ "??????????????????" - -# modified for RHEL -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Tamil language." -#~ msgstr "" -#~ "?????? ????????????????????? ??????????????? ??????????????? ??????????????? Red Hat Enterprise Linux'??? ????????????????????? ????????????????????? " -#~ "??????????????????" - -#~ msgid "Cluster Storage" -#~ msgstr "??????????????????????????? ??????????????????????????????" - -#~ msgid "Clustering Support." -#~ msgstr "??????????????????????????? ??????????????????????????? ?????????????????????" - -#~ msgid "Packages which provide support for cluster storage." -#~ msgstr "??????????????????????????? ?????????????????????????????? ?????????????????? ?????????????????????????????? ????????????????????????" - -#~ msgid "Packages which provide support for single-node GFS." -#~ msgstr "?????????-????????? ????????????????????? GFS'??? ???????????? ?????????????????? ?????????????????????????????? ????????????????????????" +#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +msgid "Applications for a variety of tasks" +msgstr "??????????????? ??????????????? ????????????????????? ????????????????????????????????????" # modified for RHEL -#~ msgid "Single Node GFS Support" -#~ msgstr "?????????-????????? ????????????????????? GFS ??????????????????" - -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "?????? ????????????????????????????????? ?????????????????????????????? ??????????????????????????? ???????????? ?????????????????? ???????????? ???????????? ??????????????????" - -#~ msgid "Java Runtime Environments and Development Kits" -#~ msgstr "Java Runtime Environments ??? Development Kits" - -#~ msgid "Misc" -#~ msgstr "???????????????" +#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +msgid "Dialup Networking Support" +msgstr "???????????????-?????? ????????????????????????????????? ????????????????????????" -#~ msgid "Misc packages" -#~ msgstr "??????????????? ?????????????????????" +#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 +msgid "" +"GNOME is a powerful, graphical user interface which includes a panel, " +"desktop, system icons, and a graphical file manager." +msgstr "" +"GNOME ???????????? ?????????????????? ??????????????????????????? ??????????????????????????? ????????? ??????????????? ????????????????????????????????? ??????????????? ???????????? ?????????????????????, " +"?????????????????????, ????????????????????? ????????????????????? ???????????? ????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ???????????????????????????" -#~ msgid "Multimedia" -#~ msgstr "??????????????????-??????????????????" +#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 +msgid "" +"KDE is a powerful, graphical user interface which includes a panel, desktop, " +"system icons, and a graphical file manager." +msgstr "" +"KDE ???????????? ?????????????????? ??????????????????????????? ??????????????????????????? ????????? ??????????????? ????????????????????????????????? ??????????????? ???????????? ?????????????????????, ?????????????????????, " +"????????????????????? ????????????????????? ???????????? ????????? ???????????? ??????????????????????????? ???????????? ????????????????????? ???????????????????????????" -# modified for RHEL -#~ msgid "Multimedia applications" -#~ msgstr "??????????????????-?????????????????? ????????????????????????????????????" +#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 +msgid "" +"Sometimes called text editors, these are programs that allow you to create " +"and edit files. These include Emacs and Vi." +msgstr "" +"?????? ?????????????????????????????????????????? ???????????????????????? ???????????? ?????????????????? ???????????? ???????????? ????????? ???????????????????????? ???????????? ????????????????????? " +"????????????????????? ??????????????? ?????????????????? ??????????????? ???????????? ????????????????????? ?????? ??????????????? ??????????????? Emacs ????????? Vi???" -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "" -#~ "Red Hat Enterprise Linux-??? ???????????????????????? ???????????????????????? ????????????????????????????????? ?????????????????????????????? ?????????????????????" +#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +msgid "The XEmacs text editor." +msgstr "XEmacs ?????????????????? ??????????????????" -# modified for RHEL -#~ msgid "Red Hat Enterprise Linux Extras" -#~ msgstr "Red Hat Enterprise Linux Extras" +#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 +msgid "" +"These tools allow you to create documentation in the DocBook format and " +"convert them to HTML, PDF, Postscript, and text." +msgstr "" +"?????? ?????????????????????????????????????????? ???????????????????????? ???????????? DocBook ???????????????????????? ????????????????????? ????????????????????? ????????? ?????? HTML, PDF, " +"Postscript ????????? ?????????????????? ???????????? ???????????????????????? ???????????? ?????????????????????" -#~ msgid "Workstation" -#~ msgstr "??????????????????-??????????????????" +#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +msgid "This group is a collection of network servers for specific purposes" +msgstr "????????????????????????????????? ??????????????? ???????????? ???????????????????????????????????? ????????????????????? ??????????????????????????? ??????????????????????????? ?????? ????????????????????? ??????????????? ????????????????????? ???????????????" -#~ msgid "Workstation applications and utilities." -#~ msgstr "??????????????????-????????????????????? ???????????????????????????????????? ???????????????????????????????????? ??? ????????????????????????" +#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 +msgid "This group is a collection of tools and resources of Arabic environments." +msgstr "???????????? ??????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????? ?????? ????????????????????? ??????????????? ????????????????????? ??????????????????" -#~ msgid "Virtualization Support." -#~ msgstr "????????????????????????????????????????????? ?????????????????????" +#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 +msgid "This group is a collection of tools and resources of Hebrew environments." +msgstr "?????????????????? ??????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????? ?????? ????????????????????? ??????????????? ????????????????????? ??????????????????" -# FIXME -#~ msgid "Compatibility Arch" -#~ msgstr "????????????????????? ??????????????????????????????????????? ??????????????? ?????????????????????" +#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 +msgid "This group is a collection of tools and resources of Japanese environments." +msgstr "?????????????????? ??????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????? ?????? ????????????????????? ??????????????? ????????????????????? ??????????????????" -# FIXME -#~ msgid "Compatibility Arch Libraries" -#~ msgstr "????????????????????? ??????????????????????????????????????? ??????????????? ???????????????????????? ???????????????????????????" +#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +msgid "XEmacs" +msgstr "XEmacs" -#~ msgid "Multilib library packages" -#~ msgstr "Multilib ??????????????????????????? ?????????????????????" +#: ../comps-el5.xml.in.h:65 +msgid "This group is a collection of tools and resources of Czech environments." +msgstr "????????? ??????????????? ????????????????????? ???????????????????????????????????? ????????????????????? ??? ????????????????????? ????????????????????? ?????? ????????????????????? ??????????????? ????????????????????? ??????????????????" -#~ msgid "" -#~ "Packages which provide functionality for the compatibility architecture." -#~ msgstr "????????????????????? ??????????????????????????????????????? ??????????????? ????????????????????????????????????????????? ?????????????????????????????? ????????????????????????" From fedora-extras-commits at redhat.com Thu Mar 13 07:41:58 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 13 Mar 2008 07:41:58 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.43, 1.43.2.1 Message-ID: <200803130741.m2D7fwh8019356@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19328 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch Log Message: fix up printing openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.43 retrieving revision 1.43.2.1 diff -u -r1.43 -r1.43.2.1 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 29 Jan 2008 11:59:58 -0000 1.43 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 13 Mar 2008 07:41:18 -0000 1.43.2.1 @@ -109,34 +109,7 @@ diff -u -r1.40 printerjob.cxx --- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 24 Oct 2006 15:06:47 -0000 1.40 +++ openoffice.org/psprint/source/printergfx/printerjob.cxx 9 Nov 2006 10:40:31 -0000 -@@ -412,6 +412,7 @@ - { - m_bQuickJob = bIsQuickJob; - mnMaxWidthPt = mnMaxHeightPt = 0; -+ mnLandscapes = mnPortraits = 0; - m_pGraphics = pGraphics; - InitPaperSize (rSetupData); - -@@ -504,6 +505,7 @@ - // Other - WritePS (mpJobHeader, "%%DocumentData: Clean7Bit\n"); - WritePS (mpJobHeader, "%%Pages: (atend)\n"); -+ WritePS (mpJobHeader, "%%Orientation: (atend)\n"); - WritePS (mpJobHeader, "%%PageOrder: Ascend\n"); - WritePS (mpJobHeader, "%%EndComments\n"); - -@@ -535,6 +537,10 @@ - aTrailer.append( (sal_Int32)mnMaxWidthPt ); - aTrailer.append( " " ); - aTrailer.append( (sal_Int32)mnMaxHeightPt ); -+ if( mnLandscapes > mnPortraits ) -+ aTrailer.append("\n%%Orientation: Landscape"); -+ else -+ aTrailer.append("\n%%Orientation: Portrait"); - aTrailer.append( "\n%%Pages: " ); - aTrailer.append( (sal_Int32)maPageList.size() ); - aTrailer.append( "\n%%EOF\n" ); -@@ -663,6 +669,17 @@ +@@ -669,6 +669,17 @@ mnResolution = nRes; @@ -154,27 +127,18 @@ mnWidthPt = nWidth; mnHeightPt = nHeight; -@@ -715,6 +732,19 @@ +@@ -721,7 +732,9 @@ WritePS (pPageHeader, aPageNo); WritePS (pPageHeader, "\n"); +- if( rJobSetup.m_eOrientation == orientation::Landscape ) + orientation::type eOrientation = rJobSetup.m_bNumberUpJob ? orientation::Portrait : rJobSetup.m_eOrientation; + + if( eOrientation == orientation::Landscape ) -+ { -+ WritePS (pPageHeader, "%%PageOrientation: Landscape\n"); -+ mnLandscapes++; -+ } -+ else -+ { -+ WritePS (pPageHeader, "%%PageOrientation: Portrait\n"); -+ mnPortraits++; -+ } -+ - sal_Char pBBox [256]; - sal_Int32 nChar = 0; - -@@ -886,7 +916,8 @@ + { + WritePS (pPageHeader, "%%PageOrientation: Landscape\n"); + mnLandscapes++; +@@ -903,7 +916,8 @@ sal_Char pTranslate [128]; sal_Int32 nChar = 0; @@ -184,7 +148,7 @@ { nChar = psp::appendStr ("gsave\n[", pTranslate); nChar += psp::getValueOfDouble ( pTranslate + nChar, mfXScale, 5); -@@ -1197,7 +1228,7 @@ +@@ -1214,7 +1228,7 @@ WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" ); } @@ -1565,11 +1529,11 @@ #endif // _SV_PRINT_H --- openoffice.org.orig/sfx2/source/view/viewprn.cxx 2007-05-01 13:18:31.000000000 +0100 +++ openoffice.org/sfx2/source/view/viewprn.cxx 2007-05-01 13:18:44.000000000 +0100 -@@ -175,6 +175,7 @@ - - // Dialog ausf"uhren - SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( _pParent, _pViewSh, _pOptions ); -+ pDlg->SetNativeParent(_pParent ? _pParent->GetNativeHandle() : 0); +@@ -203,6 +203,7 @@ + SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( _pPrintParent ? static_cast(_pPrintParent) + : static_cast(_pSetupParent), + _pViewSh, _pOptions ); ++ pDlg->SetNativeParent(_pPrintParent ? _pPrintParent->GetNativeHandle() : 0); if ( _bHelpDisabled ) pDlg->DisableHelp(); if ( pDlg->Execute() == RET_OK ) @@ -1673,20 +1637,3 @@ }; -Index: inc/psprint/printerjob.hxx -=================================================================== -RCS file: /cvs/gsl/psprint/inc/psprint/printerjob.hxx,v -retrieving revision 1.10 -diff -u -r1.10 printerjob.hxx ---- openoffice.org.orig/psprint/inc/psprint/printerjob.hxx 12 Dec 2007 14:55:42 -0000 1.10 -+++ openoffice.org/psprint/inc/psprint/printerjob.hxx 28 Jan 2008 15:20:51 -0000 -@@ -81,6 +81,9 @@ - sal_uInt32 mnMaxWidthPt; - sal_uInt32 mnMaxHeightPt; - -+ int mnLandscapes; -+ int mnPortraits; -+ - sal_uInt32 mnLMarginPt; - sal_uInt32 mnRMarginPt; - sal_uInt32 mnTMarginPt; From fedora-extras-commits at redhat.com Thu Mar 13 08:34:08 2008 From: fedora-extras-commits at redhat.com (Transifex System User (transif)) Date: Thu, 13 Mar 2008 08:34:08 GMT Subject: comps/po cs.po,1.6,1.7 Message-ID: <200803130834.m2D8Y8nQ026141@cvs-int.fedora.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26120/po Modified Files: cs.po Log Message: 2008-03-13 Adam Pribyl (via covex at fedoraproject.org) * po/cs.po: czech update Index: cs.po =================================================================== RCS file: /cvs/pkgs/comps/po/cs.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cs.po 5 Mar 2008 00:17:50 -0000 1.6 +++ cs.po 13 Mar 2008 08:33:38 -0000 1.7 @@ -1,21 +1,24 @@ +# translation of comps.HEAD.po to Czech # translation of comps-po to Czech language # # Copyright (C) 2002, FSF +# # Miloslav Trma?? , 2002 - 2005, 2008. # Nikola ??tohanzl , 2006. # Milan Ker??l??ger , 2007. -# +# Adam Pribyl , 2008. msgid "" msgstr "" -"Project-Id-Version: comps VERSION\n" +"Project-Id-Version: comps.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-28 17:42-0700\n" -"PO-Revision-Date: 2008-03-03 06:05+0100\n" -"Last-Translator: Miloslav Trma?? \n" -"Language-Team: Czech\n" +"POT-Creation-Date: 2008-02-28 17:56-0700\n" +"PO-Revision-Date: 2008-03-13 09:23+0100\n" +"Last-Translator: Adam Pribyl \n" +"Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" #: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." @@ -92,9 +95,8 @@ msgstr "Beng??l??tina (Indie)" #: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 -#, fuzzy msgid "Bhutanese Support" -msgstr "????n??tina" +msgstr "Bhut??n??tina" #: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18 msgid "Bosnian Support" @@ -235,9 +237,8 @@ # CS OK #: ../comps-f7.xml.in.h:49 ../comps-f8.xml.in.h:50 ../comps-f9.xml.in.h:50 -#, fuzzy msgid "Filipino Support" -msgstr "Galicij??tina (??pan??lsko)" +msgstr "Filip??n??tina" #: ../comps-f7.xml.in.h:50 ../comps-f8.xml.in.h:51 ../comps-f9.xml.in.h:51 msgid "Finnish Support" @@ -364,25 +365,22 @@ msgstr "Bal????ky pro v??voj grafick??ch aplikac?? pro QT a KDE." #: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:77 -msgid "" -"Install these tools to enable the system to print or act as a print server." +msgid "Install these tools to enable the system to print or act as a print server." msgstr "" "Nainstalov??n??m t??chto n??stroj?? umo??n??te va??emu po????ta??i tisknout nebo " "vystupovat jako tiskov?? server." #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:78 #: ../comps-el4.xml.in.h:29 ../comps-el5.xml.in.h:31 -msgid "" -"Install this group of packages to use the base graphical (X) user interface." +msgid "Install this group of packages to use the base graphical (X) user interface." msgstr "" "Tuto skupinu bal????k?? nainstalujte pro pou??it?? grafick??ho (X) u??ivatelsk??ho " "prost??ed??." # FIXME #: ../comps-f7.xml.in.h:76 ../comps-f8.xml.in.h:80 ../comps-f9.xml.in.h:80 -#, fuzzy msgid "Inuktitut Support" -msgstr "Zulu (ji??n?? Afrika)" +msgstr "Inuktitut" #: ../comps-f7.xml.in.h:77 ../comps-f8.xml.in.h:81 ../comps-f9.xml.in.h:81 msgid "Irish Support" @@ -430,9 +428,8 @@ msgstr "Kannada (Indie)" #: ../comps-f7.xml.in.h:86 ../comps-f8.xml.in.h:90 ../comps-f9.xml.in.h:90 -#, fuzzy msgid "Khmer Support" -msgstr "Hebrej??tina (Izrael)" +msgstr "Khmer??tina" #: ../comps-f7.xml.in.h:87 ../comps-f8.xml.in.h:91 ../comps-f9.xml.in.h:91 msgid "Korean Support" @@ -444,14 +441,12 @@ # FIXME #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:93 -#, fuzzy msgid "Lao Support" -msgstr "Thaj??tina" +msgstr "Laoi??tina" #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:94 -#, fuzzy msgid "Latvian Support" -msgstr "Chorvat??tina" +msgstr "Litev??tina" #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:96 msgid "Legacy Network Server" @@ -485,9 +480,8 @@ # FIXME #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:104 -#, fuzzy msgid "Maori Support" -msgstr "Marathi (Indie)" +msgstr "Moarii??tina" # FIXME #: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:105 @@ -535,9 +529,8 @@ msgstr "Bal????ky poskytuj??c?? funkcionalitu pro v??voj a sestavov??n?? aplikac??" #: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:117 -#, fuzzy msgid "Persian Support" -msgstr "Srb??tina" +msgstr "Per??tina" #: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:118 msgid "Polish Support" @@ -573,9 +566,8 @@ msgstr "Ru??tina" #: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:126 -#, fuzzy msgid "Samoan Support" -msgstr "N??m??ina" +msgstr "Samoan" #: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:127 msgid "Serbian Support" @@ -592,10 +584,8 @@ #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:130 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42 -msgid "" -"Simple window managers that aren't part of a larger desktop environment." -msgstr "" -"Jednodu???? spr??vci oken, kte???? nejsou sou????st?? velk??ch desktopov??ch prost??ed??." +msgid "Simple window managers that aren't part of a larger desktop environment." +msgstr "Jednodu???? spr??vci oken, kte???? nejsou sou????st?? velk??ch desktopov??ch prost??ed??." # FIXME #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:131 @@ -678,9 +668,8 @@ # FIXME #: ../comps-f7.xml.in.h:138 ../comps-f8.xml.in.h:147 ../comps-f9.xml.in.h:147 -#, fuzzy msgid "Tagalog Support" -msgstr "Tamil (ji??n?? Asie)" +msgstr "Tagalog" # FIXME #: ../comps-f7.xml.in.h:139 ../comps-f8.xml.in.h:148 ../comps-f9.xml.in.h:148 @@ -712,10 +701,8 @@ msgstr "Aplikace zahrnuj?? kancel????sk?? bal??ky, prohl????e??e PDF atd." #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:153 -msgid "" -"The packages in this group are core libraries needed to develop applications." -msgstr "" -"Bal????ky v t??to skupin?? jsou z??kladn?? knihovny pot??ebn?? pro v??voj aplikac??." +msgid "The packages in this group are core libraries needed to develop applications." +msgstr "Bal????ky v t??to skupin?? jsou z??kladn?? knihovny pot??ebn?? pro v??voj aplikac??." #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:154 #: ../comps-el4.xml.in.h:52 ../comps-el5.xml.in.h:50 @@ -723,19 +710,16 @@ msgstr "Bal????ky pro provoz po??tovn??ho serveru (SMTP, IMAP, POP3)." #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:155 -msgid "" -"These packages allow you to develop applications for the X Window System." +msgid "These packages allow you to develop applications for the X Window System." msgstr "Bal????ky pro v??voj aplikac?? pro grafick?? prost??ed?? X Window System." #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:156 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51 -msgid "" -"These packages are helpful when developing web applications or web pages." +msgid "These packages are helpful when developing web applications or web pages." msgstr "Bal????ky pro podporu WWW str??nek a Webov??ch aplikac??." #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:157 -msgid "" -"These packages include network-based servers such as DHCP, Kerberos and NIS." +msgid "These packages include network-based servers such as DHCP, Kerberos and NIS." msgstr "Bal????ky se s????ov??mi servery - nap??. DHCP, Kerberos a NIS." #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:158 @@ -849,16 +833,13 @@ #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:174 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64 -msgid "" -"This group is a collection of tools and resources of Armenian environments." +msgid "This group is a collection of tools and resources of Armenian environments." msgstr "Skupina n??stroj?? a aplikac?? pro podporu Arm??n??tiny." #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:175 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68 -msgid "" -"This group is a collection of tools for various hardware specific utilities." -msgstr "" -"Skupina n??stroj?? a aplikac?? pro podporu nejr??zn??j????ho hardware (za????zen??)." +msgid "This group is a collection of tools for various hardware specific utilities." +msgstr "Skupina n??stroj?? a aplikac?? pro podporu nejr??zn??j????ho hardware (za????zen??)." #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:176 #: ../comps-el4.xml.in.h:70 ../comps-el5.xml.in.h:69 @@ -870,8 +851,7 @@ "p??ipojen?? ke svazk??m SMB a n??stroje pro sledov??n?? s????ov??ho provozu." #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:177 -msgid "" -"This package group allows you to run a DNS name server (BIND) on the system." +msgid "This package group allows you to run a DNS name server (BIND) on the system." msgstr "" "Tato skupina bal????k?? v??m umo??n?? na po????ta??i provozovat jmenn?? server DNS " "(BIND)." @@ -897,9 +877,8 @@ msgstr "Tibet??tina" #: ../comps-f7.xml.in.h:174 ../comps-f8.xml.in.h:182 ../comps-f9.xml.in.h:182 -#, fuzzy msgid "Tonga Support" -msgstr "Tsonga" +msgstr "Tonga" #: ../comps-f7.xml.in.h:175 ../comps-f8.xml.in.h:183 ../comps-f9.xml.in.h:183 #: ../comps-el4.xml.in.h:71 ../comps-el5.xml.in.h:70 @@ -924,9 +903,8 @@ # FIXME #: ../comps-f7.xml.in.h:180 ../comps-f8.xml.in.h:188 ../comps-f9.xml.in.h:188 -#, fuzzy msgid "Urdu Support" -msgstr "Zulu (ji??n?? Afrika)" +msgstr "Urdu" #: ../comps-f7.xml.in.h:181 ../comps-f8.xml.in.h:189 ../comps-f9.xml.in.h:189 #: ../comps-el4.xml.in.h:72 ../comps-el5.xml.in.h:71 @@ -1027,9 +1005,8 @@ # FIXME #: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:100 -#, fuzzy msgid "Low Saxon Support" -msgstr "Thaj??tina" +msgstr "Low Saxon" #: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:106 msgid "Mongolian Support" @@ -1092,18 +1069,15 @@ msgstr "Tato skupina je soubor s????ov??ch server?? pro konkr??tn?? ????ely." #: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 -msgid "" -"This group is a collection of tools and resources of Arabic environments." +msgid "This group is a collection of tools and resources of Arabic environments." msgstr "Tato skupina je soubor n??stroj?? a zdroj?? pro arabsk?? prost??ed??." #: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 -msgid "" -"This group is a collection of tools and resources of Hebrew environments." +msgid "This group is a collection of tools and resources of Hebrew environments." msgstr "Tato skupina je soubor n??stroj?? a zdroj?? pro hebrejsk?? prost??ed??." #: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 -msgid "" -"This group is a collection of tools and resources of Japanese environments." +msgid "This group is a collection of tools and resources of Japanese environments." msgstr "Tato skupina je soubor n??stroj?? a zdroj?? pro japonsk?? prost??ed??." #: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 @@ -1111,308 +1085,6 @@ msgstr "XEmacs" #: ../comps-el5.xml.in.h:65 -msgid "" -"This group is a collection of tools and resources of Czech environments." +msgid "This group is a collection of tools and resources of Czech environments." msgstr "Tato skupina je soubor n??stroj?? a zdroj?? pro ??esk?? prost??ed??." -#~ msgid "The GNU Emacs text editor." -#~ msgstr "Textov?? editor GNU Emacs." - -#~ msgid "Brazilian Support" -#~ msgstr "Braz??lie" - -#~ msgid "British Support" -#~ msgstr "Angli??tina (britsk??)" - -#~ msgid "Canadian Support" -#~ msgstr "Kanada" - -#~ msgid "Compatibility Arch Development Support" -#~ msgstr "Star???? aplikace - v??voj" - -#~ msgid "Compatibility Arch Mozilla Support" -#~ msgstr "Podpora aplikac?? zalo??en??ch na star????ch verz??ch Mozilly" - -#~ msgid "Compatibility Arch Support" -#~ msgstr "Podpora star????ch aplikac??" - -#~ msgid "Cyrillic Support" -#~ msgstr "Azbuka" - -#~ msgid "Desktops" -#~ msgstr "Grafick?? u??ivatelsk?? prost??ed??" - -#~ msgid "Install these packages to recompile the kernel." -#~ msgstr "Bal????ky pro kompilaci j??dra opera??n??ho syst??mu Linux." - -#~ msgid "Kernel Development" -#~ msgstr "J??dro - v??voj" - -#~ msgid "Miscellaneous Included Packages" -#~ msgstr "R??zn?? bal????ky" - -#~ msgid "Mozilla packages for the x86 platform" -#~ msgstr "Bal????ky Mozilly pro platformu x86" - -#~ msgid "Multilib support packages" -#~ msgstr "Bal????ky podpory multilib" - -#~ msgid "SQL Database" -#~ msgstr "SQL datab??ze" - -#~ msgid "Server" -#~ msgstr "Server" - -#~ msgid "Support for developing packages for the non-primary architecture" -#~ msgstr "v??voj bal????k?? pro jinou ne?? prim??rn?? architekturu" - -#~ msgid "Syriac Support" -#~ msgstr "Syr??tina" - -#~ msgid "System" -#~ msgstr "Syst??m" - -#~ msgid "" -#~ "These packages allow you to configure an IMAP or Postfix mail server." -#~ msgstr "Bal????ky pro konfiguraci po??tovn??ho serveru IMAP nebo Postfix." - -#~ msgid "" -#~ "These packages provide compatibility support for previous releases of Red " -#~ "Hat Enterprise Linux." -#~ msgstr "" -#~ "Bal????ky s podporu pro spou??t??n?? aplikac?? ur??en??ch pro p??edchoz?? verze Red " -#~ "Hat Enterprise Linuxu." - -#~ msgid "Unsupported Development Libraries" -#~ msgstr "Ji?? nepodporovan?? knihovny pro v??voj" - -#~ msgid "Workstation Common" -#~ msgstr "Pracovn?? stanice" - -#~ msgid "ppc64 Compatibility Arch Support" -#~ msgstr "Podpora pro architekturu ppc64" - -#~ msgid "x86 Compatibility Arch Development Support" -#~ msgstr "Podpora pro v??voj pro architekturu x86" - -#~ msgid "x86 Compatibility Arch Support" -#~ msgstr "Podpora pro architekturu x86" - -#~ msgid "Brazilian Portuguese" -#~ msgstr "Brazilsk?? portugal??tina" - -#~ msgid "English" -#~ msgstr "Angli??tina" - -#~ msgid "French" -#~ msgstr "Francouz??tina" - -#~ msgid "German" -#~ msgstr "N??m??ina" - -#~ msgid "Italian" -#~ msgstr "Ital??tina" - -#~ msgid "Red Hat Enterprise Linux 3 Documentation" -#~ msgstr "Dokumentace Red Hat Enterprise Linux 3" - -#~ msgid "Spanish" -#~ msgstr "??pan??l??tina" - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Brazilian Portuguese language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v brazilsk?? " -#~ "portugal??tin??." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "English language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v angli??tin??." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "French language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu ve " -#~ "francouz??tin??." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "German language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v n??m??in??." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Italian language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v ital??tin??." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Spanish language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu ve " -#~ "??pan??l??tin??." - -#~ msgid "Japanese" -#~ msgstr "Japon??tina" - -#~ msgid "Korean" -#~ msgstr "Korej??tina" - -#~ msgid "Simplified Chinese" -#~ msgstr "????n??tina - zjednodu??en??" - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Japanese language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v japon??tin??." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Korean language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v korej??tin??." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Simplified Chinese language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu ve " -#~ "zjednodu??en?? ????n??tin??." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Traditional Chinese language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v tradi??n?? " -#~ "????n??tin??." - -#~ msgid "Traditional Chinese" -#~ msgstr "????n??tina - tradi??n??" - -#~ msgid "ppc64 Compatibility Arch Development Support" -#~ msgstr "Podpora v??voje pro architekturu ppc64" - -# CS OK -#~ msgid "Bengali" -#~ msgstr "Beng??l??tina (ji??n?? Asie)" - -# CS OK -#~ msgid "Gujarati" -#~ msgstr "Gud??ar??t??tina (Indie)" - -# CS OK -#~ msgid "Hindi" -#~ msgstr "Hind??tina (Indie)" - -# FIXME -#~ msgid "Punjabi" -#~ msgstr "Punjabi (Indie, P??kist??n)" - -#~ msgid "Red Hat Enterprise Linux 4 Documentation" -#~ msgstr "Dokumentace Red Hat Enterprise Linux 4" - -# FIXME -#~ msgid "Tamil" -#~ msgstr "Tamil (ji??n?? Asie)" - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Bengali language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v beng??l??tin??." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Gujarati language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v gujarati." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Hindi language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v hindi." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Punjabi language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu ve punjabi." - -#~ msgid "" -#~ "This group contains the Red Hat Enterprise Linux documentation in the " -#~ "Tamil language." -#~ msgstr "" -#~ "Tato skupina obsahuje dokumentaci Red Hat Enterprise Linuxu v tamil??tin??." - -#~ msgid "Cluster Storage" -#~ msgstr "Ukl??d??n?? dat v clusterech" - -#~ msgid "Clustering Support." -#~ msgstr "Podpora cluster??" - -#~ msgid "Packages which provide support for cluster storage." -#~ msgstr "Bal????ky poskytuj??c?? podporu pro ukl??d??n?? dat pomoc?? cluster??." - -#~ msgid "Packages which provide support for single-node GFS." -#~ msgstr "Bal????ky poskytuj??c?? podporu pro single-node GFS." - -#~ msgid "Single Node GFS Support" -#~ msgstr "GFS pro jeden po????ta??" - -#~ msgid "These packages provide compatibility support with previous releases." -#~ msgstr "" -#~ "Bal????ky poskytuj??c?? mo??nost b??hu aplikac?? ur??en??ch pro p??edchoz?? star???? " -#~ "verze syst??mu." - -#~ msgid "Java Runtime Environments and Development Kits" -#~ msgstr "Runtime prost??ed?? (JRE) a sada v??vojov??ch n??stroj?? (JDK) pro Javu" - -#~ msgid "Misc" -#~ msgstr "R??zn??" - -#~ msgid "Misc packages" -#~ msgstr "R??zn?? bal????ky" - -#~ msgid "Multimedia" -#~ msgstr "Multimedia" - -#~ msgid "Multimedia applications" -#~ msgstr "Multimedi??ln?? aplikace" - -#~ msgid "" -#~ "Packages which provide additional functionality for Red Hat Enterprise " -#~ "Linux" -#~ msgstr "" -#~ "Bal????ky poskytuj??c?? dopl??kovou funkcionalitu pro Red Hat Enterprise Linux." - -#~ msgid "Red Hat Enterprise Linux Extras" -#~ msgstr "Red Hat Enterprise Linux Extras" - -#~ msgid "Workstation" -#~ msgstr "Pracovn?? stanice" - -#~ msgid "Workstation applications and utilities." -#~ msgstr "Aplikace a n??stroje pro pracovn?? stanici." - -#~ msgid "Virtualization Support." -#~ msgstr "Podpora virtualizace." - -#~ msgid "Compatibility Arch Libraries" -#~ msgstr "Knihovny pro p??edchoz?? verze" - -#~ msgid "Multilib library packages" -#~ msgstr "Knihovna multilib" - -#~ msgid "" -#~ "Packages which provide functionality for the compatibility architecture." -#~ msgstr "" -#~ "Bal????ky poskytuj??c?? mo??nost b??hu aplikac?? ur??en??ch pro p??edchoz?? sta???? " -#~ "verze syst??mu." From fedora-extras-commits at redhat.com Thu Mar 13 08:51:01 2008 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Thu, 13 Mar 2008 08:51:01 GMT Subject: rpms/sudo/devel sudo.spec,1.62,1.63 Message-ID: <200803130851.m2D8p1b0026423@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/sudo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26401 Modified Files: sudo.spec Log Message: include [sudo] in password prompt Index: sudo.spec =================================================================== RCS file: /cvs/extras/rpms/sudo/devel/sudo.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sudo.spec 4 Mar 2008 10:28:10 -0000 1.62 +++ sudo.spec 13 Mar 2008 08:50:25 -0000 1.63 @@ -1,7 +1,7 @@ Summary: Allows restricted root access for specified users Name: sudo Version: 1.6.9p13 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/System URL: http://www.courtesan.com/sudo/ @@ -71,7 +71,8 @@ --with-ignore-dot \ --with-tty-tickets \ --with-ldap \ - --with-selinux + --with-selinux \ + --with-passprompt="[sudo] password for %p: " # --without-kerb5 \ # --without-kerb4 make @@ -129,6 +130,9 @@ /bin/chmod 0440 /etc/sudoers || : %changelog +* Thu Mar 13 2008 Peter Vrabec 1.6.9p13-3 +- include [sudo] in password prompt (#437092) + * Tue Mar 04 2008 Peter Vrabec 1.6.9p13-2 - audit support improvement From fedora-extras-commits at redhat.com Thu Mar 13 09:24:05 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 13 Mar 2008 09:24:05 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.7.2.3, 1.7.2.4 Message-ID: <200803130924.m2D9O5hp000592@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv566 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch Log Message: need to add a header openoffice.org-2.2.0.ooo68717.gstreamer.video.patch: Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -u -r1.7.2.3 -r1.7.2.4 --- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 12 Mar 2008 17:43:25 -0000 1.7.2.3 +++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 13 Mar 2008 09:23:33 -0000 1.7.2.4 @@ -327,7 +327,15 @@ diff -rup slideshow-orig/source/engine/viewmediashape.cxx slideshow/source/engine/viewmediashape.cxx --- slideshow-orig/source/engine/shapes/viewmediashape.cxx 2006-08-17 16:15:39.000000000 +0200 +++ slideshow/source/engine/shapes/viewmediashape.cxx 2006-08-17 17:26:09.000000000 +0200 -@@ -159,7 +170,11 @@ +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -152,7 +153,11 @@ mxPlayerWindow.clear(); } @@ -339,7 +347,7 @@ // shutdown player if( mxPlayer.is() ) -@@ -294,7 +309,8 @@ +@@ -287,7 +292,8 @@ aDeviceParams[ 0 ] >>= aImplName; if( aImplName.endsWithIgnoreAsciiCaseAsciiL( @@ -349,7 +357,7 @@ { implInitializeVCLBasedPlayerWindow( rBounds, aDeviceParams ); } -@@ -416,6 +432,7 @@ +@@ -393,6 +399,7 @@ bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds, const uno::Sequence< uno::Any >& rVCLDeviceParams) { @@ -357,7 +365,7 @@ if( !mpMediaWindow.get() && !rBounds.isEmpty() ) { try -@@ -437,28 +454,50 @@ +@@ -414,28 +421,50 @@ if( !rRangePix.isEmpty() ) { @@ -3197,7 +3205,7 @@ public LocaleCodes (XMultiServiceFactory xmsf) { super(xmsf, UNIT_NAME, MODULE_NAME); - allLanguageStrings = getStringList(16299); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src -+ allLanguageStrings = getStringList(16301); // STR_ARR_SVT_LANGUAGE_TABLE part of SvtLanguageTable from svtools ++ allLanguageStrings = getStringList(16301); // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools } public String getLanguageString(String MSID) { From fedora-extras-commits at redhat.com Thu Mar 13 09:40:48 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Thu, 13 Mar 2008 09:40:48 GMT Subject: rpms/glom/devel .cvsignore,1.18,1.19 sources,1.18,1.19 Message-ID: <200803130940.m2D9emu8001008@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/glom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv984 Modified Files: .cvsignore sources Log Message: Update to upstraem 1.6.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 12 Feb 2008 08:58:50 -0000 1.18 +++ .cvsignore 13 Mar 2008 09:40:06 -0000 1.19 @@ -1 +1 @@ -glom-1.6.8.tar.bz2 +glom-1.6.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/glom/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 12 Feb 2008 08:58:50 -0000 1.18 +++ sources 13 Mar 2008 09:40:06 -0000 1.19 @@ -1 +1 @@ -00a3e374fca88d40a4225ef0a343a438 glom-1.6.8.tar.bz2 +7f89fd49ebaa17abdb7f949c5d61edde glom-1.6.9.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 13 09:46:05 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 13 Mar 2008 09:46:05 GMT Subject: rpms/hunspell-sv/devel hunspell-sv.spec,1.6,1.7 sources,1.5,1.6 Message-ID: <200803130946.m2D9k5nu001144@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/hunspell-sv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1116 Modified Files: hunspell-sv.spec sources Log Message: latest version Index: hunspell-sv.spec =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sv/devel/hunspell-sv.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hunspell-sv.spec 5 Mar 2008 14:29:08 -0000 1.6 +++ hunspell-sv.spec 13 Mar 2008 09:45:24 -0000 1.7 @@ -1,6 +1,6 @@ Name: hunspell-sv Summary: Swedish hunspell dictionaries -Version: 1.23 +Version: 1.25 Release: 1%{?dist} Source: http://hem.bredband.net/dsso1/sv_SE.zip Group: Applications/Text @@ -42,6 +42,9 @@ %{_datadir}/myspell/* %changelog +* Thu Mar 13 2008 Caolan McNamara - 1.25-1 +- latest version + * Wed Mar 05 2008 Caolan McNamara - 1.23-1 - latest version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/hunspell-sv/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Mar 2008 14:29:08 -0000 1.5 +++ sources 13 Mar 2008 09:45:24 -0000 1.6 @@ -1 +1 @@ -e951a9d4a55d137fb821bf007ee63105 sv_SE.zip +97cc5b224b7e1cb25fb57083981fc349 sv_SE.zip From fedora-extras-commits at redhat.com Thu Mar 13 09:54:33 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 13 Mar 2008 09:54:33 GMT Subject: rpms/qt3/devel qt3.spec,1.1,1.2 Message-ID: <200803130954.m2D9sXKQ001358@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1330/devel Modified Files: qt3.spec Log Message: * Thu Mar 13 2008 Kevin Kofler 3.3.8b-10 - fix %{?epoch:%{epoch}:} idiom not to add a ':' after it Index: qt3.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt3/devel/qt3.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt3.spec 12 Mar 2008 18:50:07 -0000 1.1 +++ qt3.spec 13 Mar 2008 09:53:47 -0000 1.2 @@ -10,7 +10,7 @@ Provides: qt3 = %{version}-%{release} %endif Version: 3.3.8b -Release: 9%{?dist} +Release: 10%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -140,7 +140,7 @@ %package config Summary: Graphical configuration tool for programs using Qt 3 Group: User Interface/Desktops -Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-config < %{version}-%{release} @@ -154,7 +154,7 @@ %package devel Summary: Development files for the Qt 3 GUI toolkit Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: freetype-devel Requires: fontconfig-devel Requires: libXrender-devel @@ -186,7 +186,7 @@ %package devel-docs Summary: Documentation for the Qt 3 GUI toolkit Group: Development/Libraries -Requires: %{name}-devel = %{?epoch:%{epoch}:}:%{version}-%{release} +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-devel-docs < %{version}-%{release} @@ -200,7 +200,7 @@ %package ODBC Summary: ODBC drivers for Qt 3's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-ODBC < %{version}-%{release} @@ -214,7 +214,7 @@ %package MySQL Summary: MySQL drivers for Qt 3's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-MySQL < %{version}-%{release} @@ -228,7 +228,7 @@ %package PostgreSQL Summary: PostgreSQL drivers for Qt 3's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-PostgreSQL < %{version}-%{release} @@ -242,7 +242,7 @@ %package sqlite Summary: sqlite drivers for Qt 3's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-sqlite < %{version}-%{release} @@ -256,7 +256,7 @@ %package designer Summary: Interface designer (IDE) for the Qt 3 toolkit Group: Development/Tools -Requires: %{name}-devel = %{?epoch:%{epoch}:}:%{version}-%{release} +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{name}" == "qt" Obsoletes: qt3-designer < %{version}-%{release} @@ -646,6 +646,9 @@ %changelog +* Thu Mar 13 2008 Kevin Kofler 3.3.8b-10 +- fix %{?epoch:%{epoch}:} idiom not to add a ':' after it + * Wed Mar 12 2008 Kevin Kofler 3.3.8b-9 - rename to qt3 on Fedora >= 9 From fedora-extras-commits at redhat.com Thu Mar 13 09:57:39 2008 From: fedora-extras-commits at redhat.com (Kevin Kofler (kkofler)) Date: Thu, 13 Mar 2008 09:57:39 GMT Subject: rpms/qt/devel qt.spec,1.162,1.163 Message-ID: <200803130957.m2D9vd83001484@cvs-int.fedora.redhat.com> Author: kkofler Update of /cvs/pkgs/rpms/qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1459/devel Modified Files: qt.spec Log Message: * Thu Mar 13 2008 Kevin Kofler 4.3.4-7 - fix Requires of main package to include Epoch (thanks to Christopher Aillon) Index: qt.spec =================================================================== RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- qt.spec 12 Mar 2008 23:38:15 -0000 1.162 +++ qt.spec 13 Mar 2008 09:57:02 -0000 1.163 @@ -8,7 +8,7 @@ Name: qt4 %endif Version: 4.3.4 -Release: 6%{?dist} +Release: 7%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -153,7 +153,7 @@ %package devel Summary: Development files for the Qt toolkit Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-x11 Requires: %{x_deps} Requires: libpng-devel @@ -174,7 +174,7 @@ %package doc Summary: API documentation, demos and example programs for %{name} Group: Documentation -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-assistant %if "%{name}" != "qt4" Obsoletes: qt4-doc < %{version}-%{release} @@ -188,7 +188,7 @@ %package odbc Summary: ODBC driver for Qt's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: qt4-ODBC < %{version}-%{release} Provides: qt4-ODBC = %{version}-%{release} %if "%{name}" != "qt4" @@ -202,7 +202,7 @@ %package mysql Summary: MySQL driver for Qt's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: qt4-MySQL < %{version}-%{release} Provides: qt4-MySQL = %{version}-%{release} %if "%{name}" != "qt4" @@ -216,7 +216,7 @@ %package postgresql Summary: PostgreSQL driver for Qt's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: qt4-PostgreSQL < %{version}-%{release} Provides: qt4-PostgreSQL = %{version}-%{release} %if "%{name}" != "qt4" @@ -230,7 +230,7 @@ %package sqlite Summary: SQLite driver for Qt's SQL classes Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: qt4-SQLite < %{version}-%{release} Provides: qt4-SQLite = %{version}-%{release} %if "%{name}" != "qt4" @@ -245,7 +245,7 @@ Summary: Qt GUI-related libraries Group: System Environment/Libraries Provides: %{name}-assistant = %{version}-%{release} -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: redhat-rpm-config rpm %if "%{name}" != "qt4" Obsoletes: qt4-x11 < %{version}-%{release} @@ -693,6 +693,9 @@ %changelog +* Thu Mar 13 2008 Kevin Kofler 4.3.4-7 +- fix Requires of main package to include Epoch (thanks to Christopher Aillon) + * Wed Mar 12 2008 Kevin Kofler 4.3.4-6 - rename to qt on Fedora >= 9 From fedora-extras-commits at redhat.com Thu Mar 13 09:59:54 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Thu, 13 Mar 2008 09:59:54 GMT Subject: rpms/libtirpc/devel libtirpc-0.1.7-man-install.patch, NONE, 1.1 libtirpc.spec, 1.24, 1.25 Message-ID: <200803130959.m2D9xsaG001546@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/libtirpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1512 Modified Files: libtirpc.spec Added Files: libtirpc-0.1.7-man-install.patch Log Message: Install man pages libtirpc-0.1.7-man-install.patch: --- NEW FILE libtirpc-0.1.7-man-install.patch --- diff -up /dev/null libtirpc-0.1.7/man/Makefile.am --- /dev/null 2008-03-07 09:39:09.380146390 -0500 +++ libtirpc-0.1.7/man/Makefile.am 2008-03-12 14:44:01.000000000 -0400 @@ -0,0 +1,9 @@ + +man5_MANS = netconfig.5 +man_MANS = bindresvport.3t des_crypt.3t getnetconfig.3t getnetpath.3t \ + getrpcent.3t getrpcport.3t rpc.3t rpc_clnt_auth.3t rpc_clnt_calls.3t \ + rpc_clnt_create.3t rpc_secure.3t rpc_soc.3t rpc_svc_calls.3t \ + rpc_svc_create.3t rpc_svc_err.3t rpc_svc_reg.3t rpc_xdr.3t rtime.3t + +EXTRA_DIST = $(man5t_MANS) $(man3t_MANS) + diff -up libtirpc-0.1.7/configure.in.orig libtirpc-0.1.7/configure.in --- libtirpc-0.1.7/configure.in.orig 2008-03-12 14:42:30.000000000 -0400 +++ libtirpc-0.1.7/configure.in 2008-03-12 14:43:15.000000000 -0400 @@ -26,5 +26,5 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h li AC_CHECK_LIB([pthread], [pthread_create]) -AC_CONFIG_FILES([Makefile src/Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) AC_OUTPUT(libtirpc.pc) diff -up libtirpc-0.1.7/Makefile.am.orig libtirpc-0.1.7/Makefile.am --- libtirpc-0.1.7/Makefile.am.orig 2008-03-12 14:42:30.000000000 -0400 +++ libtirpc-0.1.7/Makefile.am 2008-03-12 14:43:15.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = src +SUBDIRS = src man nobase_include_HEADERS = tirpc/un-namespace.h \ tirpc/spinlock.h \ Index: libtirpc.spec =================================================================== RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libtirpc.spec 20 Feb 2008 03:17:18 -0000 1.24 +++ libtirpc.spec 13 Mar 2008 09:59:17 -0000 1.25 @@ -1,6 +1,6 @@ Name: libtirpc Version: 0.1.7 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Transport Independent RPC Library Group: System Environment/Libraries License: GPL @@ -28,7 +28,7 @@ Summary: Development files for the libtirpc library Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: pkgconfig +Requires(devel): pkgconfig man Patch1: libtirpc-0.1.7-netconfig.patch Patch2: libtirpc-0.1.7-gssglue.patch @@ -46,6 +46,7 @@ Patch14: libtirpc-0.1.7-arm.patch Patch15: libtirpc-0.1.7-bufoverflow.patch Patch16: libtirpc-0.1.7-libtirpc-pc.patch +Patch17: libtirpc-0.1.7-man-install.patch Patch100: libtirpc-0.1.7-compile.patch @@ -72,6 +73,7 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %patch100 -p1 @@ -81,6 +83,10 @@ %build autoreconf -fisv %configure --enable-gss +for i in man/*.3; do + mv $i "$i"t +done +exit make all %install @@ -90,10 +96,24 @@ # Don't package .a or .la files rm -f %{buildroot}%{_libdir}/*.{a,la} +# Creat the man diretory +mv %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/man3t + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post devel +# Register the new man section +#if [ "$1" -eq 1 ]; then +# makewhatis -s 3t +#fi + +%postun devel +# Remove the existance of the man section +#makewhatis -s 3 + + %clean rm -rf %{buildroot} @@ -153,8 +173,12 @@ %{_includedir}/tirpc/rpcsvc/crypt.x %{_includedir}/tirpc/spinlock.h %{_includedir}/tirpc/un-namespace.h +%{_mandir}/*/* %changelog +* Wed Mar 12 2008 Steve Dickson 0.1.7-18 +- Install man pages + * Tue Feb 19 2008 Fedora Release Engineering - 0.1.7-17 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 13 10:01:19 2008 From: fedora-extras-commits at redhat.com (Steve Dickson (steved)) Date: Thu, 13 Mar 2008 10:01:19 GMT Subject: rpms/libtirpc/devel libtirpc.spec,1.25,1.26 Message-ID: <200803131001.m2DA1J8o007648@cvs-int.fedora.redhat.com> Author: steved Update of /cvs/pkgs/rpms/libtirpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1560 Modified Files: libtirpc.spec Log Message: updated changelog Index: libtirpc.spec =================================================================== RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libtirpc.spec 13 Mar 2008 09:59:17 -0000 1.25 +++ libtirpc.spec 13 Mar 2008 10:00:41 -0000 1.26 @@ -177,7 +177,7 @@ %changelog * Wed Mar 12 2008 Steve Dickson 0.1.7-18 -- Install man pages +- Install man pages in the 3t section * Tue Feb 19 2008 Fedora Release Engineering - 0.1.7-17 - Autorebuild for GCC 4.3 From fedora-extras-commits at redhat.com Thu Mar 13 10:15:05 2008 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Thu, 13 Mar 2008 10:15:05 GMT Subject: rpms/libxml++/devel .cvsignore, 1.8, 1.9 libxml++.spec, 1.20, 1.21 sources, 1.8, 1.9 libxml++-2.20.0-gcc43.patch, 1.1, NONE Message-ID: <200803131015.m2DAF5SW008002@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/pkgs/rpms/libxml++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7960 Modified Files: .cvsignore libxml++.spec sources Removed Files: libxml++-2.20.0-gcc43.patch Log Message: Update to upstream 2.22.0, GCC 4.3 patch upstreamed Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libxml++/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Sep 2007 10:43:45 -0000 1.8 +++ .cvsignore 13 Mar 2008 10:13:58 -0000 1.9 @@ -1 +1 @@ -libxml++-2.20.0.tar.bz2 +libxml++-2.22.0.tar.bz2 Index: libxml++.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxml++/devel/libxml++.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libxml++.spec 17 Feb 2008 10:38:56 -0000 1.20 +++ libxml++.spec 13 Mar 2008 10:13:58 -0000 1.21 @@ -1,13 +1,12 @@ Name: libxml++ -Version: 2.20.0 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Summary: C++ wrapper for the libxml2 XML parser library Group: System Environment/Libraries License: LGPLv2+ URL: http://libxmlplusplus.sourceforge.net/ Source: http://ftp.gnome.org/pub/GNOME/sources/libxml++/%{version}/libxml++-%{version}.tar.bz2 -Patch0: libxml++-2.20.0-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0 @@ -30,7 +29,6 @@ %prep %setup -q -%patch0 -p1 -b .gcc43 %build @@ -81,6 +79,10 @@ %changelog +* Thu Mar 13 2008 Denis Leroy - 2.22.0-1 +- Update to upstream 2.22.0 +- GCC 4.3 patch upstreamed + * Sun Feb 17 2008 Denis Leroy - 2.20.0-2 - Added patch for gcc 4.3 rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libxml++/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Sep 2007 10:43:45 -0000 1.8 +++ sources 13 Mar 2008 10:13:58 -0000 1.9 @@ -1 +1 @@ -4fe6ae1344e523ea4756733be71f9af3 libxml++-2.20.0.tar.bz2 +9a9b3ba876fe212df3a73c5a97e9235a libxml++-2.22.0.tar.bz2 --- libxml++-2.20.0-gcc43.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 13 10:20:58 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 13 Mar 2008 10:20:58 GMT Subject: rpms/openoffice.org/devel .cvsignore, 1.151, 1.152 sources, 1.274, 1.275 Message-ID: <200803131020.m2DAKwaa008206@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8170 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- .cvsignore 9 Mar 2008 18:07:37 -0000 1.151 +++ .cvsignore 13 Mar 2008 10:19:57 -0000 1.152 @@ -4,4 +4,4 @@ Tigert-templates.tar.gz unowinreg.dll bengali.sdf -OOH680_m10.tar.bz2 +OOH680_m11.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- sources 9 Mar 2008 18:07:37 -0000 1.274 +++ sources 13 Mar 2008 10:19:57 -0000 1.275 @@ -4,4 +4,4 @@ e3a0b76dcd876f3d721ee7183729153d unowinreg.dll f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz 0c0e868b34329d90a7c9a92f1704775c bengali.sdf -7a5f2700ed20c0016be3c58ce81960a0 OOH680_m10.tar.bz2 +7e5158d69684fc5b28e2574f58b35500 OOH680_m11.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 13 10:23:19 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 13 Mar 2008 10:23:19 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1449,1.1450 Message-ID: <200803131023.m2DANJU2008273@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8244 Modified Files: openoffice.org.spec Log Message: next release candidate Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1449 retrieving revision 1.1450 diff -u -r1.1449 -r1.1450 --- openoffice.org.spec 12 Mar 2008 14:11:23 -0000 1.1449 +++ openoffice.org.spec 13 Mar 2008 10:22:26 -0000 1.1450 @@ -1,6 +1,6 @@ %define oootag OOH680 -%define ooomilestone 10 -%define rh_rpm_release 2 +%define ooomilestone 11 +%define rh_rpm_release 1 # undef to get english only and no-langpacks for a faster smoketest build %define langpacks 1 @@ -2876,7 +2876,8 @@ %changelog -* Tue Mar 11 2008 Caolan McNamara - 1:2.4.0-10.2 +* Thu Mar 13 2008 Caolan McNamara - 1:2.4.0-11.1 +- next release candidate - Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch - Resolves: rhbz#435590 add openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch From fedora-extras-commits at redhat.com Thu Mar 13 10:32:12 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 13 Mar 2008 10:32:12 GMT Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.18, 1.1440.2.19 openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch, 1.2, NONE Message-ID: <200803131032.m2DAWCdL008503@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8474 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org.spec Removed Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch Log Message: try and drop openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1440.2.18 retrieving revision 1.1440.2.19 diff -u -r1.1440.2.18 -r1.1440.2.19 --- openoffice.org.spec 12 Mar 2008 19:47:05 -0000 1.1440.2.18 +++ openoffice.org.spec 13 Mar 2008 10:31:32 -0000 1.1440.2.19 @@ -117,28 +117,27 @@ Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz Patch46: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch -Patch47: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch -Patch48: openoffice.org-2.3.0.ooo76649.httpencoding.patch -Patch49: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch -Patch50: openoffice.org-2.3.1.ooo81307.sw.word2.patch -Patch51: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch -Patch52: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch -Patch53: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch -Patch54: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch -Patch55: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch -Patch56: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch -Patch57: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch -Patch58: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch -Patch59: openoffice.org-2.4.0.ooo85448.emptyrpath.patch -Patch60: workspace.cairotext01.patch -Patch61: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch -Patch62: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch -Patch63: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch -Patch64: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch -Patch65: workspace.cmcfixes43.patch -Patch66: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch -Patch67: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch -Patch68: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch +Patch47: openoffice.org-2.3.0.ooo76649.httpencoding.patch +Patch48: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch +Patch49: openoffice.org-2.3.1.ooo81307.sw.word2.patch +Patch50: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch +Patch51: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch +Patch52: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch +Patch53: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch +Patch54: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch +Patch55: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch +Patch56: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch +Patch57: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch +Patch58: openoffice.org-2.4.0.ooo85448.emptyrpath.patch +Patch59: workspace.cairotext01.patch +Patch60: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch +Patch61: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch +Patch62: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch +Patch63: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch +Patch64: workspace.cmcfixes43.patch +Patch65: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch +Patch66: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch +Patch67: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch %define instdir %{_libdir}/openoffice.org %define OFFICEUPD 300 @@ -1073,28 +1072,27 @@ %patch44 -p1 -b .ooo80257.sd.textonlystyle.patch tar xzf %{PATCH45} %patch46 -p1 -b .gccXXXXX.solenv.javaregistration.patch -%patch47 -p1 -b .ooo81321.cppu.silencewarnings.patch -%patch48 -p1 -b .ooo76649.httpencoding.patc -%patch49 -p1 -b .ooo82966.svx.missing3d.patch -%patch50 -p1 -b .ooo81307.sw.word2.patch -%patch51 -p1 -b .ooo83878.unopkg.enablelinking.patch -%patch52 -p1 -b .ooo84676.ucb.davprotocol.patch -%patch53 -p1 -b .ooo84621.sw.insertexcel.patch -%patch54 -p1 -b .ooo85054.stlport.noorigs.patch -%patch55 -p1 -b .ooo85097.desktop.pagein.patch -%patch56 -p1 -%patch57 -p1 -b .rh133741.alwaysgtk.vcl.patch -%patch58 -p1 -b .ooo85429.sw.a11ycrash.patch -%patch59 -p1 -b .ooo85448.emptyrpath.patch -%patch60 -p1 -b .workspace.cairotext01.patch -%patch61 -p1 -b .ooo85854.sw.graphicsaveas.patch -%patch62 -p1 -b .ooo85921.sd.editmasterundermouse.patch -%patch63 -p1 -b .ooo86080.unopkg.bodge.patch -%patch64 -p1 -b .oooXXXXX.psprint.debugcups.patch -%patch65 -p1 -b .workspace.cmcfixes43.patch -%patch66 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch -%patch67 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch -%patch68 -p1 -b .ooo86924.sfx2.iconchanges.patch +%patch47 -p1 -b .ooo76649.httpencoding.patc +%patch48 -p1 -b .ooo82966.svx.missing3d.patch +%patch49 -p1 -b .ooo81307.sw.word2.patch +%patch50 -p1 -b .ooo83878.unopkg.enablelinking.patch +%patch51 -p1 -b .ooo84676.ucb.davprotocol.patch +%patch52 -p1 -b .ooo84621.sw.insertexcel.patch +%patch53 -p1 -b .ooo85054.stlport.noorigs.patch +%patch54 -p1 -b .ooo85097.desktop.pagein.patch +%patch55 -p1 +%patch56 -p1 -b .rh133741.alwaysgtk.vcl.patch +%patch57 -p1 -b .ooo85429.sw.a11ycrash.patch +%patch58 -p1 -b .ooo85448.emptyrpath.patch +%patch59 -p1 -b .workspace.cairotext01.patch +%patch60 -p1 -b .ooo85854.sw.graphicsaveas.patch +%patch61 -p1 -b .ooo85921.sd.editmasterundermouse.patch +%patch62 -p1 -b .ooo86080.unopkg.bodge.patch +%patch63 -p1 -b .oooXXXXX.psprint.debugcups.patch +%patch64 -p1 -b .workspace.cmcfixes43.patch +%patch65 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch +%patch66 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch +%patch67 -p1 -b .ooo86924.sfx2.iconchanges.patch %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -2870,7 +2868,7 @@ %{python_py_sitearch}/unohelper.py* %changelog -* Wed Mar 12 2008 Caolan McNamara - 1:3.0.0-0.2.1 +* Thu Mar 13 2008 Caolan McNamara - 1:3.0.0-0.2.1 - extend selinux bodge to ia64 - drop integrated workspace.notes2.patch - drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch @@ -2880,9 +2878,11 @@ - drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch - drop subsumed openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch - drop integrated workspace.unifysound01.patch +- drop openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch - add workspace.cmcfixes43.patch -* Tue Mar 11 2008 Caolan McNamara - 1:2.4.0-10.2 +* Thu Mar 13 2008 Caolan McNamara - 1:2.4.0-11.1 +- next release candidate - Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch - Resolves: rhbz#435590 add openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch --- openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 13 11:16:46 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 13 Mar 2008 11:16:46 GMT Subject: rpms/mktemp/devel dead.package, NONE, 1.1 mktemp-1.5-build.patch, 1.1, NONE mktemp-1.5-nostrip.patch, 1.1, NONE mktemp.spec, 1.26, NONE sources, 1.4, NONE Message-ID: <200803131116.m2DBGkg4015193@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/mktemp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15175 Added Files: dead.package Removed Files: mktemp-1.5-build.patch mktemp-1.5-nostrip.patch mktemp.spec sources Log Message: Obsolete package --- NEW FILE dead.package --- Obsolete package --- mktemp-1.5-build.patch DELETED --- --- mktemp-1.5-nostrip.patch DELETED --- --- mktemp.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Mar 13 11:31:08 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 13 Mar 2008 11:31:08 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch, 1.1.2.2, 1.1.2.3 Message-ID: <200803131131.m2DBV8ox015513@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15485 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch Log Message: bitmap id needs to be moved openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch: Index: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 12 Mar 2008 17:50:15 -0000 1.1.2.2 +++ openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 13 Mar 2008 11:30:58 -0000 1.1.2.3 @@ -81,7 +81,7 @@ #define BMP_FOIL_22_H RID_SD_START+204 #define BMP_FOIL_23_H RID_SD_START+205 #define BMP_FOIL_24_H RID_SD_START+206 -+#define BMP_FOIL_25_H RID_SD_START+333 ++#define BMP_FOIL_25_H RID_SD_START+334 #define BMP_FOILH_01_H RID_SD_START+207 #define BMP_FOILH_02_H RID_SD_START+208 #define BMP_FOILH_03_H RID_SD_START+209 From fedora-extras-commits at redhat.com Thu Mar 13 12:33:10 2008 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 13 Mar 2008 12:33:10 GMT Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.0.2-systemtray.patch, NONE, 1.1 kdebase-workspace.spec, 1.50, 1.51 Message-ID: <200803131233.m2DCXAEH022353@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/kdebase-workspace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22316 Modified Files: kdebase-workspace.spec Added Files: kdebase-workspace-4.0.2-systemtray.patch Log Message: - apply upstream patch to fix changing wallpaper causes desktop to go white - apply upstream patch to check whether the to-be-embedded window has been destroyed, (bz#437058) kdebase-workspace-4.0.2-systemtray.patch: --- NEW FILE kdebase-workspace-4.0.2-systemtray.patch --- Index: workspace/plasma/applets/systemtray/systemtraycontainer.cpp =================================================================== --- workspace/plasma/applets/systemtray/systemtraycontainer.cpp (Revision 785140) +++ workspace/plasma/applets/systemtray/systemtraycontainer.cpp (Revision 785141) @@ -35,7 +35,10 @@ SystemTrayContainer::SystemTrayContainer(WId clientId, QWidget *parent) : QX11EmbedContainer(parent) { - prepareFor(clientId); // temporary hack, until QX11EmbedContainer gets fixed + if( !prepareFor(clientId)) { // temporary hack, until QX11EmbedContainer gets fixed + deleteLater(); + return; + } connect(this, SIGNAL(clientClosed()), SLOT(deleteLater())); connect(this, SIGNAL(error(QX11EmbedContainer::Error)), SLOT(handleError(QX11EmbedContainer::Error))); @@ -76,12 +79,13 @@ // Temporary hack to change X window used by QX11EmbedContainer so that it matches // the window embedded into it (#153193). -void SystemTrayContainer::prepareFor(WId w) +bool SystemTrayContainer::prepareFor(WId w) { Display* dpy = QX11Info::display(); XWindowAttributes ga; - XGetWindowAttributes(dpy, w, &ga); + if( !XGetWindowAttributes(dpy, w, &ga)) + return false; XSetWindowAttributes sa; sa.background_pixel = WhitePixel(dpy, DefaultScreen(dpy)); @@ -110,4 +114,5 @@ StructureNotifyMask | SubstructureNotifyMask); XFlush(dpy); + return true; } Index: workspace/plasma/applets/systemtray/systemtraycontainer.h =================================================================== --- workspace/plasma/applets/systemtray/systemtraycontainer.h (Revision 785140) +++ workspace/plasma/applets/systemtray/systemtraycontainer.h (Revision 785141) @@ -33,7 +33,7 @@ SystemTrayContainer(WId client, QWidget *parent); private: - void prepareFor( WId id ); + bool prepareFor( WId id ); private slots: void handleError(QX11EmbedContainer::Error error); Index: kdebase-workspace.spec =================================================================== RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- kdebase-workspace.spec 12 Mar 2008 17:01:11 -0000 1.50 +++ kdebase-workspace.spec 13 Mar 2008 12:32:32 -0000 1.51 @@ -23,6 +23,7 @@ # upstream patch Patch101: kdebase-workspace-4.0.x-kcontrol-crash.patch Patch102: kdebase-workspace-4.0.2-wallpaper-desktop.patch +Patch103: kdebase-workspace-4.0.2-systemtray.patch # upgrade path for former kde-redhat'ers Obsoletes: kdebase-kdm < 6:%{version}-%{release} @@ -115,6 +116,7 @@ %patch100 -p1 -b .kde#155362 %patch101 -p1 -b .kcontrol-crash %patch102 -p1 -b .wallpaper-desktop +%patch103 -p1 -b .systemtray %build @@ -229,6 +231,7 @@ %changelog * Wed Mar 12 2008 Than Ngo 4.0.2-7 - apply upstream patch to fix changing wallpaper causes desktop to go white +- apply upstream patch to check whether the to-be-embedded window has been destroyed, (bz#437058) * Mon Mar 10 2008 Than Ngo 4.0.2-6 - add gestures=false in kde-settings, remove kdebase-workspace-4.0.2-Gestures.patch From fedora-extras-commits at redhat.com Thu Mar 13 12:43:51 2008 From: fedora-extras-commits at redhat.com (Daniel Veillard (veillard)) Date: Thu, 13 Mar 2008 12:43:51 GMT Subject: rpms/ekiga/devel .cvsignore, 1.11, 1.12 ekiga.spec, 1.45, 1.46 sources, 1.13, 1.14 Message-ID: <200803131243.m2DChpoa022729@cvs-int.fedora.redhat.com> Author: veillard Update of /cvs/pkgs/rpms/ekiga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22618 Modified Files: .cvsignore ekiga.spec sources Log Message: Update to upstream 2.0.12, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 18 Sep 2007 16:21:36 -0000 1.11 +++ .cvsignore 13 Mar 2008 12:43:12 -0000 1.12 @@ -4,3 +4,4 @@ ekiga-2.0.7.tar.gz ekiga-2.0.9.tar.gz ekiga-2.0.11.tar.gz +ekiga-2.0.12.tar.gz Index: ekiga.spec =================================================================== RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ekiga.spec 28 Feb 2008 15:06:44 -0000 1.45 +++ ekiga.spec 13 Mar 2008 12:43:12 -0000 1.46 @@ -1,7 +1,7 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga -Version: 2.0.11 -Release: 4%{?dist} +Version: 2.0.12 +Release: 1%{?dist} URL: http://www.ekiga.org/ Source0: http://download.gnome.org/sources/ekiga/2.0/%{name}-%{version}.tar.gz License: GPLv2+ @@ -98,6 +98,9 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Thu Mar 13 2008 Daniel Veillard - 2.0.12-1.fc9 +- Upgrade to ekiga-2.0.12 + * Thu Feb 28 2008 Daniel Veillard - 2.0.11-4 - rebuild after applying some fo the cleanups of #160727 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Sep 2007 16:21:36 -0000 1.13 +++ sources 13 Mar 2008 12:43:12 -0000 1.14 @@ -1 +1 @@ -684865225d77898e10e960f3a286b894 ekiga-2.0.11.tar.gz +4df27d7715233984013fb9728db15ce8 ekiga-2.0.12.tar.gz From fedora-extras-commits at redhat.com Thu Mar 13 12:44:07 2008 From: fedora-extras-commits at redhat.com (Kjartan Maraas (kmaraas)) Date: Thu, 13 Mar 2008 12:44:07 GMT Subject: comps/po nb.po,1.7,1.8 Message-ID: <200803131244.m2DCi7Ek022769@cvs-int.fedora.redhat.com> Author: kmaraas Update of /cvs/pkgs/comps/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22706 Modified Files: nb.po Log Message: Updated translation View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 nb.po Index: nb.po =================================================================== RCS file: /cvs/pkgs/comps/po/nb.po,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nb.po 31 Jan 2008 09:32:39 -0000 1.7 +++ nb.po 13 Mar 2008 12:43:37 -0000 1.8 @@ -9,835 +9,171 @@ msgstr "" "Project-Id-Version: comps-po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-17 15:18-0400\n" -"PO-Revision-Date: 2008-01-31 10:32+0100\n" -"Last-Translator: Espen Stefansen \n" +"POT-Creation-Date: 2008-02-28 17:42-0700\n" +"PO-Revision-Date: 2008-03-13 13:21+0100\n" +"Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian/Bokmaal \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../comps-fe5.xml.in.h:1 -#: ../comps-fe6.xml.in.h:1 -#: ../comps-f7.xml.in.h:1 -#: ../comps-f8.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." -msgstr "Et lettvektig skrivebordsmilj?? som fungerer bra p?? eldre og tregere maskiner." +msgstr "" +"Et lettvektig skrivebordsmilj?? som fungerer bra p?? eldre og tregere maskiner." -#: ../comps-fe5.xml.in.h:2 -#: ../comps-fe6.xml.in.h:2 -#: ../comps-f7.xml.in.h:2 -#: ../comps-f8.xml.in.h:2 -#: ../comps-el4.xml.in.h:1 -#: ../comps-el5.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 +#: ../comps-el4.xml.in.h:1 ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "Administrasjonsverkt??y" -#: ../comps-fe5.xml.in.h:3 -#: ../comps-fe6.xml.in.h:3 -#: ../comps-f7.xml.in.h:5 -#: ../comps-f8.xml.in.h:5 -#: ../comps-el4.xml.in.h:2 -#: ../comps-el5.xml.in.h:2 +#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 +msgid "Afrikaans Support" +msgstr "St??tte for Afrikaans" + +#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 +msgid "Albanian Support" +msgstr "St??tte for albansk" + +#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 +#: ../comps-el4.xml.in.h:2 ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "Programmer" -#: ../comps-fe5.xml.in.h:4 -#: ../comps-fe6.xml.in.h:4 -#: ../comps-el4.xml.in.h:3 -#: ../comps-el5.xml.in.h:3 -msgid "Applications for a variety of tasks" -msgstr "Programmer for en rekke forsskjellige oppgaver" +#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 +msgid "Applications to perform a variety of tasks" +msgstr "Programmer for en rekke forskjellige oppgaver" -#: ../comps-fe5.xml.in.h:5 -#: ../comps-fe6.xml.in.h:5 -#: ../comps-f7.xml.in.h:7 -#: ../comps-f8.xml.in.h:7 -#: ../comps-el4.xml.in.h:4 -#: ../comps-el5.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 +#: ../comps-el4.xml.in.h:4 ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "St??tte for arabisk" -#: ../comps-fe5.xml.in.h:6 -#: ../comps-fe6.xml.in.h:6 -#: ../comps-f7.xml.in.h:8 -#: ../comps-f8.xml.in.h:8 -#: ../comps-el4.xml.in.h:5 -#: ../comps-el5.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 +#: ../comps-el4.xml.in.h:5 ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "St??tte for armensk" -#: ../comps-fe5.xml.in.h:7 -#: ../comps-fe6.xml.in.h:7 -#: ../comps-f7.xml.in.h:10 -#: ../comps-f8.xml.in.h:10 -#: ../comps-el4.xml.in.h:6 -#: ../comps-el5.xml.in.h:6 -msgid "Authoring and Publishing" -msgstr "Tekstpublisering" - -#: ../comps-fe5.xml.in.h:8 -#: ../comps-fe6.xml.in.h:8 -#: ../comps-f7.xml.in.h:12 -#: ../comps-f8.xml.in.h:12 -#: ../comps-el4.xml.in.h:7 -#: ../comps-el5.xml.in.h:7 -msgid "Base System" -msgstr "Basissystem" - -#: ../comps-fe5.xml.in.h:9 -#: ../comps-fe6.xml.in.h:10 -#: ../comps-f7.xml.in.h:31 -#: ../comps-f8.xml.in.h:32 -#: ../comps-el4.xml.in.h:8 -#: ../comps-el5.xml.in.h:9 -msgid "Desktop Environments" -msgstr "Skrivebordsmilj??er" - -#: ../comps-fe5.xml.in.h:10 -#: ../comps-fe6.xml.in.h:11 -#: ../comps-f7.xml.in.h:32 -#: ../comps-f8.xml.in.h:33 -#: ../comps-el4.xml.in.h:9 -#: ../comps-el5.xml.in.h:10 -msgid "Desktop environments" -msgstr "Skrivebordsmilj??er" - -#: ../comps-fe5.xml.in.h:11 -#: ../comps-fe6.xml.in.h:12 -#: ../comps-f7.xml.in.h:33 -#: ../comps-f8.xml.in.h:34 -#: ../comps-el4.xml.in.h:10 -#: ../comps-el5.xml.in.h:11 -msgid "Development" -msgstr "Utviklingsverkt??y" - -#: ../comps-fe5.xml.in.h:12 -#: ../comps-fe6.xml.in.h:13 -#: ../comps-f7.xml.in.h:35 -#: ../comps-f8.xml.in.h:36 -#: ../comps-el4.xml.in.h:11 -#: ../comps-el5.xml.in.h:12 -msgid "Development Tools" -msgstr "Utviklingsverkt??y" - -#: ../comps-fe5.xml.in.h:13 -#: ../comps-fe6.xml.in.h:14 -#: ../comps-el4.xml.in.h:12 -#: ../comps-el5.xml.in.h:13 -msgid "Dialup Networking Support" -msgstr "St??tte for oppringt nettverk" - -#: ../comps-fe5.xml.in.h:14 -#: ../comps-fe6.xml.in.h:15 -#: ../comps-f7.xml.in.h:39 -#: ../comps-f8.xml.in.h:39 -#: ../comps-el4.xml.in.h:13 -#: ../comps-el5.xml.in.h:14 -msgid "Editors" -msgstr "Editorer" - -#: ../comps-fe5.xml.in.h:15 -#: ../comps-fe6.xml.in.h:16 -#: ../comps-f7.xml.in.h:40 -#: ../comps-f8.xml.in.h:40 -#: ../comps-el4.xml.in.h:14 -#: ../comps-el5.xml.in.h:15 -msgid "Educational Software" -msgstr "Utdanningsprogrammer" - -#: ../comps-fe5.xml.in.h:16 -#: ../comps-fe6.xml.in.h:17 -#: ../comps-f7.xml.in.h:41 -#: ../comps-f8.xml.in.h:41 -#: ../comps-el4.xml.in.h:15 -#: ../comps-el5.xml.in.h:16 -msgid "Educational software for learning" -msgstr "Utdanningsprogrammer for l??ring" - -#: ../comps-fe5.xml.in.h:17 -#: ../comps-fe6.xml.in.h:18 -#: ../comps-f7.xml.in.h:42 -#: ../comps-f8.xml.in.h:42 -#: ../comps-el4.xml.in.h:16 -#: ../comps-el5.xml.in.h:17 -msgid "Engineering and Scientific" -msgstr "Vitenskapelige programmer" - -#: ../comps-fe5.xml.in.h:18 -#: ../comps-fe6.xml.in.h:19 -#: ../comps-f7.xml.in.h:46 -#: ../comps-f8.xml.in.h:46 -#: ../comps-el4.xml.in.h:17 -#: ../comps-el5.xml.in.h:18 -msgid "FTP Server" -msgstr "FTP-tjener" [...1654 lines suppressed...] + +#: ../comps-f7.xml.in.h:183 ../comps-f8.xml.in.h:191 ../comps-f9.xml.in.h:191 msgid "Venda Support" msgstr "St??tte for Venda" -#: ../comps-f7.xml.in.h:182 -#: ../comps-f8.xml.in.h:190 +#: ../comps-f7.xml.in.h:184 ../comps-f8.xml.in.h:192 ../comps-f9.xml.in.h:192 msgid "Vietnamese Support" msgstr "St??tte for vietnamesisk" -#: ../comps-f7.xml.in.h:183 -#: ../comps-f8.xml.in.h:191 +#: ../comps-f7.xml.in.h:185 ../comps-f8.xml.in.h:193 ../comps-f9.xml.in.h:193 msgid "Virtualization" msgstr "Virtualisering" -#: ../comps-f7.xml.in.h:186 -#: ../comps-f8.xml.in.h:194 +#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:194 +#: ../comps-el4.xml.in.h:73 ../comps-el5.xml.in.h:73 +msgid "Web Development" +msgstr "Web-utvikling" + +#: ../comps-f7.xml.in.h:187 ../comps-f8.xml.in.h:195 ../comps-f9.xml.in.h:195 +#: ../comps-el4.xml.in.h:74 ../comps-el5.xml.in.h:74 +msgid "Web Server" +msgstr "Webtjener" + +#: ../comps-f7.xml.in.h:188 ../comps-f8.xml.in.h:196 ../comps-f9.xml.in.h:196 msgid "Welsh Support" msgstr "St??tte for walisisk" -#: ../comps-f7.xml.in.h:188 -#: ../comps-f8.xml.in.h:196 +#: ../comps-f7.xml.in.h:189 ../comps-f8.xml.in.h:197 ../comps-f9.xml.in.h:197 +#: ../comps-el4.xml.in.h:75 ../comps-el5.xml.in.h:75 +msgid "Window Managers" +msgstr "Vindusbehandlere" + +#: ../comps-f7.xml.in.h:190 ../comps-f8.xml.in.h:198 ../comps-f9.xml.in.h:198 msgid "Windows File Server" msgstr "Filtjener for Windows" -#: ../comps-f7.xml.in.h:189 -#: ../comps-f8.xml.in.h:197 +#: ../comps-f7.xml.in.h:191 ../comps-f8.xml.in.h:199 ../comps-f9.xml.in.h:199 msgid "X Software Development" msgstr "Programvareutvikling for X" -#: ../comps-f7.xml.in.h:193 -#: ../comps-f8.xml.in.h:201 +#: ../comps-f7.xml.in.h:192 ../comps-f8.xml.in.h:200 ../comps-f9.xml.in.h:200 +#: ../comps-el4.xml.in.h:76 ../comps-el5.xml.in.h:76 +msgid "X Window System" +msgstr "X-vindussystemet" + +#: ../comps-f7.xml.in.h:193 ../comps-f8.xml.in.h:201 ../comps-f9.xml.in.h:201 +msgid "XFCE" +msgstr "XFCE" + +#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:202 +msgid "XFCE Software Development" +msgstr "Programvareutvikling for XFCE" + +#: ../comps-f7.xml.in.h:195 ../comps-f8.xml.in.h:203 ../comps-f9.xml.in.h:203 msgid "Xhosa Support" msgstr "St??tte for Xhosa" -#: ../comps-f7.xml.in.h:194 -#: ../comps-f8.xml.in.h:202 +#: ../comps-f7.xml.in.h:196 ../comps-f8.xml.in.h:204 ../comps-f9.xml.in.h:204 msgid "Zulu Support" msgstr "St??tte for Zulu" -#: ../comps-f8.xml.in.h:21 +#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 msgid "Buildsystem building group" msgstr "Byggegruppe for byggsystem" -#: ../comps-f8.xml.in.h:48 +#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:48 msgid "Fedora Eclipse" msgstr "Fedora Eclipse" -#: ../comps-f8.xml.in.h:51 +#: ../comps-f8.xml.in.h:52 ../comps-f9.xml.in.h:52 msgid "Fonts" msgstr "Skrifter" -#: ../comps-f8.xml.in.h:52 +#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:53 msgid "Fonts packages for rendering text on the desktop." msgstr "Skriftpakker for ?? vise tekst p?? skrivebordet." -#: ../comps-f8.xml.in.h:78 +#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:79 msgid "Integrated Development Environments based on Eclipse." msgstr "Integrerte utviklingsmilj??er basert p?? Eclipse." -#: ../comps-f8.xml.in.h:94 +#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:95 msgid "Legacy Fonts" msgstr "Foreldede skrifter" -#: ../comps-f8.xml.in.h:99 +#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:100 msgid "Low Saxon Support" msgstr "St??tte for lavsaksisk" -#: ../comps-f8.xml.in.h:105 +#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:106 msgid "Mongolian Support" msgstr "St??tte for mongolsk" -#: ../comps-f8.xml.in.h:107 +#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:108 msgid "Nepali Support" msgstr "St??tte for nepalsk" -#: ../comps-f8.xml.in.h:113 +#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:114 msgid "Older bitmap and vector fonts packages" msgstr "Eldre pakker med bitkart og vektorskrifter" +#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +msgid "Applications for a variety of tasks" +msgstr "Programmer for en rekke forsskjellige oppgaver" + +#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +msgid "Dialup Networking Support" +msgstr "St??tte for oppringt nettverk" + +#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 +msgid "" +"GNOME is a powerful, graphical user interface which includes a panel, " +"desktop, system icons, and a graphical file manager." +msgstr "" +"GNOME er et kraftig, grafisk brukergrensesnitt som inkluderer et panel, " +"skrivebord, systemikoner og en grafisk filh??ndterer" + +#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 +msgid "" +"KDE is a powerful, graphical user interface which includes a panel, desktop, " +"system icons, and a graphical file manager." +msgstr "" +"KDE er et kraftig, grafisk brukergrensesnitt som inkluderer et panel, " +"skrivebord, systemikoner og en grafisk filh??ndterer." + +#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 +msgid "" +"Sometimes called text editors, these are programs that allow you to create " +"and edit files. These include Emacs and Vi." +msgstr "" +"Disse programmene, ofte kalt teksteditorer, lar deg lage og redigere filer. " +"Emacs og Vi er inkludert her." + +#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +msgid "The XEmacs text editor." +msgstr "Teksteditoren XEmacs." + +#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 +msgid "" +"These tools allow you to create documentation in the DocBook format and " +"convert them to HTML, PDF, Postscript, and text." +msgstr "" +"Disse verkt??yene lar deg lage dokumentasjon i DocBook-formatet og konvertere " +"dem til HTML, PDF, Postscript og tekst." + +#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +msgid "This group is a collection of network servers for specific purposes" +msgstr "Denne gruppen er en samling av nettverkstjenere for spesifikke form??l" + +#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 +msgid "" +"This group is a collection of tools and resources of Arabic environments." +msgstr "" +"Denne gruppen er en samling av verkt??y og ressurser for arabiske milj??er." + +#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 +msgid "" +"This group is a collection of tools and resources of Hebrew environments." +msgstr "" +"Denne gruppen er en samling av verkt??y og ressurser for arabiske milj??er." + +#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 +msgid "" +"This group is a collection of tools and resources of Japanese environments." +msgstr "" +"Denne gruppen er en samling av verkt??y og ressurser for japanske milj??er." + +#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +msgid "XEmacs" +msgstr "XEmacs" + +#: ../comps-el5.xml.in.h:65 +msgid "" +"This group is a collection of tools and resources of Czech environments." +msgstr "" +"Denne gruppen er en samling av verkt??y og ressurser for tsjekkiske milj??er." From fedora-extras-commits at redhat.com Thu Mar 13 12:58:33 2008 From: fedora-extras-commits at redhat.com (Daniel J Walsh (dwalsh)) Date: Thu, 13 Mar 2008 12:58:33 GMT Subject: rpms/selinux-policy/devel policy-20071130.patch, 1.100, 1.101 selinux-policy.spec, 1.631, 1.632 Message-ID: <200803131258.m2DCwXJF023263@cvs-int.fedora.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23240 Modified Files: policy-20071130.patch selinux-policy.spec Log Message: * Thu Mar 13 2008 Dan Walsh 3.3.1-17 - prewika needs to contact mysql - Allow syslog to read system_map files policy-20071130.patch: Index: policy-20071130.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- policy-20071130.patch 12 Mar 2008 12:39:48 -0000 1.100 +++ policy-20071130.patch 13 Mar 2008 12:58:24 -0000 1.101 @@ -3316,7 +3316,7 @@ +/usr/lib(64)?/gnupg/gpgkeys.* -- gen_context(system_u:object_r:gpg_helper_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-3.3.1/policy/modules/apps/gpg.if --- nsaserefpolicy/policy/modules/apps/gpg.if 2007-07-23 10:20:12.000000000 -0400 -+++ serefpolicy-3.3.1/policy/modules/apps/gpg.if 2008-03-12 08:31:43.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/apps/gpg.if 2008-03-12 13:45:36.000000000 -0400 @@ -38,6 +38,10 @@ gen_require(` type gpg_exec_t, gpg_helper_exec_t; @@ -3328,7 +3328,7 @@ ') ######################################## -@@ -45,275 +49,61 @@ +@@ -45,275 +49,62 @@ # Declarations # @@ -3521,6 +3521,7 @@ + dontaudit gpg_helper_t $2:udp_socket rw_socket_perms; + #Leaked File Descriptors + dontaudit gpg_helper_t $2:unix_stream_socket rw_socket_perms; ++ dontaudit gpg_t $2:unix_stream_socket rw_socket_perms; - # allow gpg to connect to the gpg agent - stream_connect_pattern($1_gpg_t,$1_gpg_agent_tmp_t,$1_gpg_agent_tmp_t,$1_gpg_agent_t) @@ -18656,8 +18657,8 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.3.1/policy/modules/services/prelude.te --- nsaserefpolicy/policy/modules/services/prelude.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/prelude.te 2008-02-26 08:29:22.000000000 -0500 -@@ -0,0 +1,152 @@ ++++ serefpolicy-3.3.1/policy/modules/services/prelude.te 2008-03-12 13:16:04.000000000 -0400 +@@ -0,0 +1,162 @@ +policy_module(prelude,1.0.0) + +######################################## @@ -18803,13 +18804,23 @@ + +######################################## +# -+# apcupsd_cgi Declarations ++# prewikka_cgi Declarations +# + +optional_policy(` + apache_content_template(prewikka) + files_read_etc_files(httpd_prewikka_script_t) ++ ++ optional_policy(` ++ mysql_search_db(httpd_prewikka_script_t) ++ mysql_stream_connect(httpd_prewikka_script_t) ++ ') ++ ++ optional_policy(` ++ postgresql_stream_connect(httpd_prewikka_script_t) ++ ') +') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.fc serefpolicy-3.3.1/policy/modules/services/privoxy.fc --- nsaserefpolicy/policy/modules/services/privoxy.fc 2006-11-16 17:15:21.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/services/privoxy.fc 2008-02-26 08:29:22.000000000 -0500 @@ -19553,7 +19564,7 @@ # Only permit unprivileged user domains to be entered via rlogin, diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-3.3.1/policy/modules/services/rhgb.te --- nsaserefpolicy/policy/modules/services/rhgb.te 2007-12-19 05:32:17.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/rhgb.te 2008-03-11 20:07:53.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/rhgb.te 2008-03-12 13:47:40.000000000 -0400 @@ -92,6 +92,7 @@ term_getattr_pty_fs(rhgb_t) @@ -19562,6 +19573,14 @@ libs_use_ld_so(rhgb_t) libs_use_shared_libs(rhgb_t) +@@ -122,6 +123,7 @@ + xserver_signal_xdm_xserver(rhgb_t) + xserver_read_xdm_tmp_files(rhgb_t) + xserver_stream_connect_xdm_xserver(rhgb_t) ++xserver_common_app_template(rhgb_t) + + optional_policy(` + consoletype_exec(rhgb_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.if serefpolicy-3.3.1/policy/modules/services/ricci.if --- nsaserefpolicy/policy/modules/services/ricci.if 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/services/ricci.if 2008-02-26 08:29:22.000000000 -0500 @@ -23434,7 +23453,7 @@ /var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.3.1/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-12-04 11:02:50.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-11 22:20:09.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-03-12 13:48:02.000000000 -0400 @@ -12,9 +12,15 @@ ## ## @@ -23901,7 +23920,7 @@ # for when /tmp/.X11-unix is created by the system allow $2 xdm_t:fd use; -@@ -542,25 +543,533 @@ +@@ -542,25 +543,532 @@ allow $2 xdm_tmp_t:sock_file { read write }; dontaudit $2 xdm_t:tcp_socket { read write }; @@ -24107,7 +24126,6 @@ + allow $1 output_xext_t:x_property read; + allow $1 xserver_unconfined_type:x_property read; + -+# type_transition $2_t default_xproperty_t:x_property $2_t; + # can read and write cut buffers + allow $1 clipboard_xproperty_t:x_property { create read write }; + # can read/write info properties @@ -24441,7 +24459,7 @@ ') ') -@@ -593,26 +1102,44 @@ +@@ -593,26 +1101,44 @@ # template(`xserver_use_user_fonts',` gen_require(` @@ -24493,7 +24511,7 @@ ## Transition to a user Xauthority domain. ## ## -@@ -638,10 +1165,77 @@ +@@ -638,10 +1164,77 @@ # template(`xserver_domtrans_user_xauth',` gen_require(` @@ -24573,7 +24591,7 @@ ') ######################################## -@@ -671,10 +1265,10 @@ +@@ -671,10 +1264,10 @@ # template(`xserver_user_home_dir_filetrans_user_xauth',` gen_require(` @@ -24586,7 +24604,7 @@ ') ######################################## -@@ -760,7 +1354,7 @@ +@@ -760,7 +1353,7 @@ type xconsole_device_t; ') @@ -24595,7 +24613,7 @@ ') ######################################## -@@ -860,6 +1454,25 @@ +@@ -860,6 +1453,25 @@ ######################################## ## @@ -24621,7 +24639,7 @@ ## Read xdm-writable configuration files. ## ## -@@ -914,6 +1527,7 @@ +@@ -914,6 +1526,7 @@ files_search_tmp($1) allow $1 xdm_tmp_t:dir list_dir_perms; create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t) @@ -24629,7 +24647,7 @@ ') ######################################## -@@ -955,6 +1569,24 @@ +@@ -955,6 +1568,24 @@ ######################################## ## @@ -24654,7 +24672,7 @@ ## Execute the X server in the XDM X server domain. ## ## -@@ -965,15 +1597,47 @@ +@@ -965,15 +1596,47 @@ # interface(`xserver_domtrans_xdm_xserver',` gen_require(` @@ -24703,7 +24721,7 @@ ## Make an X session script an entrypoint for the specified domain. ## ## -@@ -1123,7 +1787,7 @@ +@@ -1123,7 +1786,7 @@ type xdm_xserver_tmp_t; ') @@ -24712,7 +24730,7 @@ ') ######################################## -@@ -1312,3 +1976,83 @@ +@@ -1312,3 +1975,83 @@ files_search_tmp($1) stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t) ') @@ -27001,7 +27019,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.3.1/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2008-02-26 08:17:43.000000000 -0500 -+++ serefpolicy-3.3.1/policy/modules/system/logging.te 2008-03-11 20:22:56.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/logging.te 2008-03-12 15:39:04.000000000 -0400 @@ -61,10 +61,24 @@ logging_log_file(var_log_t) files_mountpoint(var_log_t) @@ -27027,7 +27045,15 @@ ######################################## # # Auditctl local policy -@@ -158,6 +172,7 @@ +@@ -84,6 +98,7 @@ + kernel_read_kernel_sysctls(auditctl_t) + kernel_read_proc_symlinks(auditctl_t) + ++ + domain_read_all_domains_state(auditctl_t) + domain_use_interactive_fds(auditctl_t) + +@@ -158,6 +173,7 @@ mls_file_read_all_levels(auditd_t) mls_file_write_all_levels(auditd_t) # Need to be able to write to /var/run/ directory @@ -27035,7 +27061,7 @@ seutil_dontaudit_read_config(auditd_t) -@@ -171,6 +186,10 @@ +@@ -171,6 +187,10 @@ ') optional_policy(` @@ -27046,7 +27072,7 @@ seutil_sigchld_newrole(auditd_t) ') -@@ -208,6 +227,7 @@ +@@ -208,6 +228,7 @@ fs_getattr_all_fs(klogd_t) fs_search_auto_mountpoints(klogd_t) @@ -27054,7 +27080,7 @@ domain_use_interactive_fds(klogd_t) -@@ -252,7 +272,6 @@ +@@ -252,7 +273,6 @@ dontaudit syslogd_t self:capability sys_tty_config; # setpgid for metalog allow syslogd_t self:process { signal_perms setpgid }; @@ -27062,7 +27088,7 @@ # receive messages to be logged allow syslogd_t self:unix_dgram_socket create_socket_perms; allow syslogd_t self:unix_stream_socket create_stream_socket_perms; -@@ -262,7 +281,7 @@ +@@ -262,7 +282,7 @@ allow syslogd_t self:tcp_socket create_stream_socket_perms; allow syslogd_t syslog_conf_t:file read_file_perms; @@ -27071,7 +27097,7 @@ # Create and bind to /dev/log or /var/run/log. allow syslogd_t devlog_t:sock_file manage_sock_file_perms; files_pid_filetrans(syslogd_t,devlog_t,sock_file) -@@ -274,6 +293,9 @@ +@@ -274,6 +294,9 @@ # Allow access for syslog-ng allow syslogd_t var_log_t:dir { create setattr }; @@ -27081,7 +27107,15 @@ # manage temporary files manage_dirs_pattern(syslogd_t,syslogd_tmp_t,syslogd_tmp_t) manage_files_pattern(syslogd_t,syslogd_tmp_t,syslogd_tmp_t) -@@ -327,6 +349,8 @@ +@@ -295,6 +318,7 @@ + kernel_read_messages(syslogd_t) + kernel_clear_ring_buffer(syslogd_t) + kernel_change_ring_buffer_level(syslogd_t) ++files_read_kernel_symbol_table(syslogd_t) + + dev_filetrans(syslogd_t,devlog_t,sock_file) + dev_read_sysfs(syslogd_t) +@@ -327,6 +351,8 @@ # Allow users to define additional syslog ports to connect to corenet_tcp_bind_syslogd_port(syslogd_t) corenet_tcp_connect_syslogd_port(syslogd_t) @@ -27090,7 +27124,7 @@ # syslog-ng can send or receive logs corenet_sendrecv_syslogd_client_packets(syslogd_t) -@@ -339,19 +363,20 @@ +@@ -339,19 +365,20 @@ domain_use_interactive_fds(syslogd_t) files_read_etc_files(syslogd_t) @@ -27113,7 +27147,7 @@ miscfiles_read_localization(syslogd_t) userdom_dontaudit_use_unpriv_user_fds(syslogd_t) -@@ -380,15 +405,11 @@ +@@ -380,15 +407,11 @@ ') optional_policy(` @@ -27131,7 +27165,7 @@ ') optional_policy(` -@@ -399,3 +420,37 @@ +@@ -399,3 +422,37 @@ # log to the xconsole xserver_rw_console(syslogd_t) ') @@ -27580,6 +27614,20 @@ +/sbin/umount.* -- gen_context(system_u:object_r:mount_exec_t,s0) +/bin/fusermount -- gen_context(system_u:object_r:mount_exec_t,s0) +/usr/bin/fusermount -- gen_context(system_u:object_r:mount_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.3.1/policy/modules/system/mount.if +--- nsaserefpolicy/policy/modules/system/mount.if 2007-10-12 08:56:08.000000000 -0400 ++++ serefpolicy-3.3.1/policy/modules/system/mount.if 2008-03-12 13:52:56.000000000 -0400 +@@ -48,7 +48,9 @@ + + mount_domtrans($1) + role $2 types mount_t; +- allow mount_t $3:chr_file rw_file_perms; ++ allow mount_t $1:chr_file rw_file_perms; ++ #Leaked File Descriptors ++ dontaudit mount_t $1:unix_stream_socket rw_socket_perms; + + optional_policy(` + samba_run_smbmount($1, $2, $3) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.3.1/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2008-02-06 10:33:22.000000000 -0500 +++ serefpolicy-3.3.1/policy/modules/system/mount.te 2008-03-04 08:35:40.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.631 retrieving revision 1.632 diff -u -r1.631 -r1.632 --- selinux-policy.spec 12 Mar 2008 12:35:06 -0000 1.631 +++ selinux-policy.spec 13 Mar 2008 12:58:25 -0000 1.632 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.3.1 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -388,6 +388,10 @@ %endif %changelog +* Thu Mar 13 2008 Dan Walsh 3.3.1-17 +- prewika needs to contact mysql +- Allow syslog to read system_map files + * Wed Mar 12 2008 Dan Walsh 3.3.1-16 - Change init_t to an unconfined_domain From fedora-extras-commits at redhat.com Thu Mar 13 13:00:48 2008 From: fedora-extras-commits at redhat.com (Harald Hoyer (harald)) Date: Thu, 13 Mar 2008 13:00:48 GMT Subject: rpms/udev/devel start_udev, 1.67, 1.68 udev-post.init, 1.2, 1.3 udev.spec, 1.234, 1.235 Message-ID: <200803131300.m2DD0mdm023366@cvs-int.fedora.redhat.com> Author: harald Update of /cvs/pkgs/rpms/udev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23342 Modified Files: start_udev udev-post.init udev.spec Log Message: * Thu Mar 13 2008 Harald Hoyer 118-6 - moved all generated files to /var/lib/udev (also 70-persistent-cd.rules 70-persistent-net.rules) - added a caching mechanism for MAKEDEV (saves some seconds on startup) - added trigger for selinux-policy and MAKEDEV to remove the udev cache files Index: start_udev =================================================================== RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- start_udev 20 Feb 2008 11:07:27 -0000 1.67 +++ start_udev 13 Mar 2008 13:00:09 -0000 1.68 @@ -81,14 +81,34 @@ [ -d $udev_root/shm ] || mkdir -m 0755 $udev_root/shm [ -a /dev/MAKEDEV ] || ln -s $MAKEDEV /dev/MAKEDEV; - if [ -x $MAKEDEV ]; then + [ -d /dev/.udev/makedev.d ] || mkdir -p /dev/.udev/makedev.d + USE_MD5="false" + [ -x /usr/bin/md5sum ] && USE_MD5="true" + if [ -x "$MAKEDEV" ]; then for i in /etc/udev/makedev.d/*.nodes; do - if [ -f "$i" ]; then - ( sed -e 's,#.*,,g' "$i" | \ - xargs_simple -n 100 $MAKEDEV -x ) + if [ -f "$i" ]; then + # use a little caching to speedup things + if [ "$USE_MD5" == "true" ]; then + md5=$(/usr/bin/md5sum "$i"|(read a b; echo $a)) + if [ -f "/var/lib/udev/makedev.d/${md5}.sh" ];then + md5file="/var/lib/udev/makedev.d/${md5}.sh" + else + md5file="/dev/.udev/makedev.d/${md5}.sh" + fi + if [ ! -f "$md5file" ]; then + ( sed -e 's,#.*,,g' "$i" | \ + xargs_simple -n 100 $MAKEDEV -x -a -S ) \ + > "$md5file" + fi + . "$md5file" >/dev/null 2>&1 + else + ( sed -e 's,#.*,,g' "$i" | \ + xargs_simple -n 100 $MAKEDEV -x ) + fi fi done fi + for devdir in /etc/udev/devices /lib/udev/devices; do [ -d "$devdir" ] || continue pushd $devdir &> "$udev_root/null" @@ -185,6 +205,14 @@ if [ -f "/sys/class/tty/console/uevent" ]; then # trigger the sorted events echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug + + mkdir -p /dev/.udev/rules.d/ + for i in /var/lib/udev/rules.d/*.rules; do + if [ -f "$i" ]; then + cp "$i" /dev/.udev/rules.d/ >/dev/null 2>&1 + fi + done + /sbin/udevd -d ret=$[$ret + $?] Index: udev-post.init =================================================================== RCS file: /cvs/pkgs/rpms/udev/devel/udev-post.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- udev-post.init 20 Feb 2008 11:26:02 -0000 1.2 +++ udev-post.init 13 Mar 2008 13:00:10 -0000 1.3 @@ -4,11 +4,12 @@ # # Authors: Harald Hoyer # -# chkconfig: 345 26 75 +# chkconfig: 12345 26 75 # description: Moves the generated persistent udev rules to /etc/udev/rules.d # ### BEGIN INIT INFO -# Default-Start: 345 +# Default-Start: 12345 +# Default-Stop: 0 6 # Required-Start: $local_fs # Short-Description: Moves the generated persistent udev rules to /etc/udev/rules.d # Description: Moves the generated persistent udev rules to /etc/udev/rules.d @@ -20,15 +21,32 @@ # See how we were called. case "$1" in start|reload) - STRING=$"Adding udev persistent rules" - + STRING=$"Adding udev makedev cache file" + # copy the MAKEDEV shell scripts generated before / was mounted read-write + for file in /dev/.udev/makedev.d/*; do + if [ -f "$file" ]; then + echo -n $STRING + cp "$file" /var/lib/udev/makedev.d/ + rc=$? + rm -f "$file" + if [ "$rc" -eq "0" ]; then + success "$STRING" + echo + elif [ "$rc" -eq "1" ]; then + failure "$STRING" + echo + fi + fi + done + + STRING=$"Adding udev persistent rule" # copy the rules generated before / was mounted read-write for file in /dev/.udev/tmp-rules--*; do dest=${file##*tmp-rules--} # check, if anything is todo - [ "$dest" = '*' ] && exit 0 + [ "$dest" = '*' ] && break echo -n $STRING - cat $file >> /etc/udev/rules.d/$dest + cat $file >> /var/lib/udev/rules.d/$dest && cp /var/lib/udev/rules.d/$dest /dev/.udev/rules.d/ rc=$? rm -f $file if [ "$rc" -eq "0" ]; then @@ -43,13 +61,41 @@ exit 0 ;; stop) + STRING=$"Generating udev makedev cache file" + MAKEDEV="/sbin/MAKEDEV" + USE_MD5="false" + [ -x /usr/bin/md5sum ] && USE_MD5="true" + if [ "$USE_MD5" == "true" -a -x "$MAKEDEV" ]; then + for i in /etc/udev/makedev.d/*.nodes; do + if [ -f "$i" ]; then + # use a little caching to speedup things + md5=$(/usr/bin/md5sum "$i"|(read a b; echo $a)) + md5file="/var/lib/udev/makedev.d/${md5}.sh" + if [ ! -f "$md5file" ]; then + echo -n $STRING + ( sed -e 's,#.*,,g' "$i" | \ + xargs $MAKEDEV -x -a -S ) \ + > "$md5file" + rc=$? + if [ "$rc" -eq "0" ]; then + success "$STRING" + echo + elif [ "$rc" -eq "1" ]; then + failure "$STRING" + echo + fi + fi + fi + done + fi + rm -f /var/lock/subsys/udev-post exit 0 ;; status) exit 0 ;; *) - echo $"Usage: $0 {start}" + echo $"Usage: $0 {start|stop|reload}" exit 1 esac exit 0 Index: udev.spec =================================================================== RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- udev.spec 20 Feb 2008 17:33:26 -0000 1.234 +++ udev.spec 13 Mar 2008 13:00:10 -0000 1.235 @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 118 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -241,6 +241,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post +mkdir -p $RPM_BUILD_ROOT/var/lib/udev/ +mkdir -p $RPM_BUILD_ROOT/var/lib/udev/makedev.d +mkdir -p $RPM_BUILD_ROOT/var/lib/udev/rules.d + %preun if [ "$1" = 0 -a -f %{_initrddir}/udev ]; then if [ -x /sbin/pidof ]; then @@ -264,6 +268,12 @@ /sbin/udevd -d fi fi + +for i in 70-persistent-cd.rules 70-persistent-net.rules; do + [ -f "/etc/udev/rules.d/$i" ] && ( mv /etc/udev/rules.d/$i /var/lib/udev/rules.d >/dev/null 2>&1 ) +done + +/sbin/chkconfig --del udev-post >/dev/null 2>&1 || : /sbin/chkconfig --add udev-post exit 0 @@ -281,6 +291,12 @@ fi exit 0 +%triggerin -- selinux-policy +rm -f /var/lib/udev/makenode.d/* >/dev/null 2>&1 || : + +%triggerin -- MAKEDEV +rm -f /var/lib/udev/makenode.d/* >/dev/null 2>&1 || : + %post -n libvolume_id -p /sbin/ldconfig %postun -n libvolume_id -p /sbin/ldconfig @@ -341,6 +357,10 @@ %attr(0644,root,root) %{_mandir}/man8/cdrom_id*.8* %attr(0644,root,root) %{_mandir}/man8/create_floppy_devices*.8* +%dir %attr(0755,root,root) /var/lib/udev +%dir %attr(0755,root,root) /var/lib/udev/makedev.d +%dir %attr(0755,root,root) /var/lib/udev/rules.d + # Deprecated, but keep the ownership %ghost %dir %{_sysconfdir}/udev/scripts/ %ghost %dir %{_sysconfdir}/udev/devices/ @@ -372,6 +392,12 @@ %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Thu Mar 13 2008 Harald Hoyer 118-6 +- moved all generated files to /var/lib/udev + (also 70-persistent-cd.rules 70-persistent-net.rules) +- added a caching mechanism for MAKEDEV (saves some seconds on startup) +- added trigger for selinux-policy and MAKEDEV to remove the udev cache files + * Wed Feb 20 2008 Harald Hoyer 118-4 - made symlinks relative (rhbz#432878) - removed the backgrounding of node creation (rhbz#381461) From fedora-extras-commits at redhat.com Thu Mar 13 13:24:00 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Thu, 13 Mar 2008 13:24:00 GMT Subject: rpms/squid/devel .cvsignore, 1.30, 1.31 sources, 1.32, 1.33 squid-3.0.STABLE1-location.patch, 1.1, 1.2 squid.init, 1.10, 1.11 squid.spec, 1.94, 1.95 Message-ID: <200803131324.m2DDO087030436@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/squid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30397 Modified Files: .cvsignore sources squid-3.0.STABLE1-location.patch squid.init squid.spec Log Message: * Tue Mar 13 2008 Martin Nagy - 7:3.0.STABLE2-1 - upgrade to latest upstream 3.0.STABLE2 - check config file before starting (#428998) - whitespace unification of init script - some minor path changes in the QUICKSTART file - configure with the --with-filedescriptors=16384 option Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/squid/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 23 Jan 2008 14:07:15 -0000 1.30 +++ .cvsignore 13 Mar 2008 13:23:15 -0000 1.31 @@ -1 +1 @@ -squid-3.0.STABLE1.tar.bz2 +squid-3.0.STABLE2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/squid/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 23 Jan 2008 14:07:15 -0000 1.32 +++ sources 13 Mar 2008 13:23:15 -0000 1.33 @@ -1 +1 @@ -ec7458b00a68341854d91e7f6ece56ba squid-3.0.STABLE1.tar.bz2 +33c89b22aaf27d12b818b5f120aa0322 squid-3.0.STABLE2.tar.bz2 squid-3.0.STABLE1-location.patch: Index: squid-3.0.STABLE1-location.patch =================================================================== RCS file: /cvs/extras/rpms/squid/devel/squid-3.0.STABLE1-location.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squid-3.0.STABLE1-location.patch 23 Jan 2008 14:07:15 -0000 1.1 +++ squid-3.0.STABLE1-location.patch 13 Mar 2008 13:23:15 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up squid-3.0.STABLE1/QUICKSTART.location squid-3.0.STABLE1/QUICKSTART ---- squid-3.0.STABLE1/QUICKSTART.location 2003-07-18 13:10:32.000000000 +0200 -+++ squid-3.0.STABLE1/QUICKSTART 2008-01-23 12:07:50.000000000 +0100 +diff -up squid-3.0.STABLE2/QUICKSTART.location squid-3.0.STABLE2/QUICKSTART +--- squid-3.0.STABLE2/QUICKSTART.location 2008-02-10 12:04:32.000000000 +0100 ++++ squid-3.0.STABLE2/QUICKSTART 2008-03-11 15:53:36.000000000 +0100 @@ -12,10 +12,9 @@ After you retrieved, compiled and instal INSTALL in the same directory), you have to configure the squid.conf file. This is the list of the values you *need* to change, because no @@ -18,12 +18,12 @@ always ask permission before adding a parent cache. See also the never_direct/always_direct directives. --cache_dir /usr/local/squid/var/cache 100 16 256 -+cache_dir /var/spool/squid 100 16 256 +-cache_dir ufs /usr/local/squid/var/cache 100 16 256 ++cache_dir ufs /var/spool/squid 100 16 256 Add here (first number, here 100) the amount of hard disk space (in megabytes) to devote to caching. -@@ -69,8 +68,8 @@ visible_hostname +@@ -69,10 +68,10 @@ visible_hostname After editing squid.conf to your liking, run Squid from the command line TWICE: @@ -32,5 +32,8 @@ + % /usr/sbin/squid -z + % /usr/sbin/squid - Check in the cache.log (/usr/local/squid/var/logs/cache.log) that +-Check in the cache.log (/usr/local/squid/var/logs/cache.log) that ++Check in the cache.log (/var/log/squid/cache.log) that everything is all right. + + Once Squid created all its files (it can take several minutes on some Index: squid.init =================================================================== RCS file: /cvs/extras/rpms/squid/devel/squid.init,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- squid.init 23 Jan 2008 14:07:15 -0000 1.10 +++ squid.init 13 Mar 2008 13:23:15 -0000 1.11 @@ -6,11 +6,11 @@ # config: /etc/squid/squid.conf # Short-Description: starting and stopping Squid Internet Object Cache # Description: Squid - Internet Object Cache. Internet object caching is \ -# a way to store requested Internet objects (i.e., data available \ -# via the HTTP, FTP, and gopher protocols) on a system closer to the \ -# requesting site than to the source. Web browsers can then use the \ -# local Squid cache as a proxy HTTP server, reducing access time as \ -# well as bandwidth consumption. +# a way to store requested Internet objects (i.e., data available \ +# via the HTTP, FTP, and gopher protocols) on a system closer to the \ +# requesting site than to the source. Web browsers can then use the \ +# local Squid cache as a proxy HTTP server, reducing access time as \ +# well as bandwidth consumption. ### END INIT INFO @@ -24,10 +24,10 @@ . /etc/sysconfig/network if [ -f /etc/sysconfig/squid ]; then - . /etc/sysconfig/squid + . /etc/sysconfig/squid fi -# don't raise an error if the config file is incomplete +# don't raise an error if the config file is incomplete # set defaults instead: SQUID_OPTS=${SQUID_OPTS:-"-D"} SQUID_PIDFILE_TIMEOUT=${SQUID_PIDFILE_TIMEOUT:-20} @@ -38,7 +38,7 @@ if [ "$1" == "status" ]; then [ -z "$SQUID" ] && exit 4 -else +else [ -z "$SQUID" ] && exit 1 fi @@ -46,7 +46,7 @@ # determine which one is the cache_swap directory CACHE_SWAP=`sed -e 's/#.*//g' /etc/squid/squid.conf | \ - grep cache_dir | awk '{ print $3 }'` + grep cache_dir | awk '{ print $3 }'` [ -z "$CACHE_SWAP" ] && CACHE_SWAP=/var/spool/squid RETVAL=0 @@ -57,116 +57,124 @@ # check if the squid conf file is present [ -f /etc/squid/squid.conf ] || exit 6 -} +} start() { probe - for adir in $CACHE_SWAP; do - if [ ! -d $adir/00 ]; then - echo -n "init_cache_dir $adir... " - $SQUID -z -F -D >> /var/log/squid/squid.out 2>&1 + $SQUID -k parse + RETVAL=$? + if [ $RETVAL -ne 0 ]; then + echo -n $"Starting $prog: " + echo_failure + echo + return 1 + fi + for adir in $CACHE_SWAP; do + if [ ! -d $adir/00 ]; then + echo -n "init_cache_dir $adir... " + $SQUID -z -F -D >> /var/log/squid/squid.out 2>&1 fi - done - echo -n $"Starting $prog: " - $SQUID $SQUID_OPTS >> /var/log/squid/squid.out 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - timeout=0; - while : ; do - [ ! -f /var/run/squid.pid ] || break - if [ $timeout -ge $SQUID_PIDFILE_TIMEOUT ]; then - RETVAL=1 - break - fi - sleep 1 && echo -n "." - timeout=$((timeout+1)) - done - fi - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SQUID - [ $RETVAL -eq 0 ] && echo_success - [ $RETVAL -ne 0 ] && echo_failure - echo - return $RETVAL + done + echo -n $"Starting $prog: " + $SQUID $SQUID_OPTS >> /var/log/squid/squid.out 2>&1 + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + timeout=0; + while : ; do + [ ! -f /var/run/squid.pid ] || break + if [ $timeout -ge $SQUID_PIDFILE_TIMEOUT ]; then + RETVAL=1 + break + fi + sleep 1 && echo -n "." + timeout=$((timeout+1)) + done + fi + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SQUID + [ $RETVAL -eq 0 ] && echo_success + [ $RETVAL -ne 0 ] && echo_failure + echo + return $RETVAL } stop() { - echo -n $"Stopping $prog: " - $SQUID -k check >> /var/log/squid/squid.out 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - $SQUID -k shutdown & - rm -f /var/lock/subsys/$SQUID - timeout=0 - while : ; do - [ -f /var/run/squid.pid ] || break - if [ $timeout -ge $SQUID_SHUTDOWN_TIMEOUT ]; then - echo - return 1 - fi - sleep 2 && echo -n "." - timeout=$((timeout+2)) - done - echo_success - echo - else - echo_failure - echo - fi - return $RETVAL -} + echo -n $"Stopping $prog: " + $SQUID -k check >> /var/log/squid/squid.out 2>&1 + RETVAL=$? + if [ $RETVAL -eq 0 ] ; then + $SQUID -k shutdown & + rm -f /var/lock/subsys/$SQUID + timeout=0 + while : ; do + [ -f /var/run/squid.pid ] || break + if [ $timeout -ge $SQUID_SHUTDOWN_TIMEOUT ]; then + echo + return 1 + fi + sleep 2 && echo -n "." + timeout=$((timeout+2)) + done + echo_success + echo + else + echo_failure + echo + fi + return $RETVAL +} reload() { - $SQUID $SQUID_OPTS -k reconfigure + $SQUID $SQUID_OPTS -k reconfigure } restart() { - stop - start -} + stop + start +} condrestart() { - [ -e /var/lock/subsys/squid ] && restart || : + [ -e /var/lock/subsys/squid ] && restart || : } -rhstatus() { - status $SQUID && $SQUID -k check +rhstatus() { + status $SQUID && $SQUID -k check } case "$1" in start) - start - ;; + start + ;; stop) - stop - ;; + stop + ;; reload) - reload - ;; + reload + ;; restart) - restart - ;; + restart + ;; condrestart) - condrestart - ;; + condrestart + ;; status) - rhstatus - ;; + rhstatus + ;; probe) - probe - return 0 - ;; + probe + return 0 + ;; *) - echo $"Usage: $0 {start|stop|status|reload|restart|condrestart|probe}" - exit 2 + echo $"Usage: $0 {start|stop|status|reload|restart|condrestart|probe}" + exit 2 esac exit $? Index: squid.spec =================================================================== RCS file: /cvs/extras/rpms/squid/devel/squid.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- squid.spec 26 Feb 2008 08:41:19 -0000 1.94 +++ squid.spec 13 Mar 2008 13:23:15 -0000 1.95 @@ -3,11 +3,11 @@ ## % define __find_requires %{SOURCE99} Name: squid -Version: 3.0.STABLE1 -Release: 3%{?dist} +Version: 3.0.STABLE2 +Release: 1%{?dist} Summary: The Squid proxy caching server Epoch: 7 -License: GPLv2 +License: GPLv2+ Group: System Environment/Daemons URL: http://www.squid-cache.org Source: http://www.squid-cache.org/Squid/Versions/v3/3.0/squid-%{version}.tar.bz2 @@ -32,7 +32,7 @@ Patch204: squid-3.0.STABLE1-perlpath.patch Patch205: squid-3.0.STABLE1-smb-path.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: bash >= 2.0 Requires(pre): shadow-utils Requires(post): /sbin/chkconfig @@ -97,9 +97,10 @@ --enable-wccpv2 \ --with-aio \ --with-default-user="squid" \ + --with-filedescriptors=16384 \ --with-dl \ --with-openssl=/usr/kerberos \ - --with-pthreads \ + --with-pthreads # following options are no longer supported # --with-winbind-auth-challenge \ @@ -330,6 +331,13 @@ chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Tue Mar 13 2008 Martin Nagy - 7:3.0.STABLE2-1 +- upgrade to latest upstream 3.0.STABLE2 +- check config file before starting (#428998) +- whitespace unification of init script +- some minor path changes in the QUICKSTART file +- configure with the --with-filedescriptors=16384 option + * Tue Feb 26 2008 Martin Nagy - 7:3.0.STABLE1-3 - change the cache_effective_group default back to none From fedora-extras-commits at redhat.com Thu Mar 13 13:26:17 2008 From: fedora-extras-commits at redhat.com (Martin Nagy (mnagy)) Date: Thu, 13 Mar 2008 13:26:17 GMT Subject: rpms/squid/F-8 squid-2.6.STABLE16-config.patch, 1.1, 1.2 squid.spec, 1.91, 1.92 Message-ID: <200803131326.m2DDQHTE030573@cvs-int.fedora.redhat.com> Author: mnagy Update of /cvs/extras/rpms/squid/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30546 Modified Files: squid-2.6.STABLE16-config.patch squid.spec Log Message: * Tue Mar 11 2008 Martin Nagy - 2.6.STABLE17-2 - set default of cache_effective_group to none (#252197) squid-2.6.STABLE16-config.patch: Index: squid-2.6.STABLE16-config.patch =================================================================== RCS file: /cvs/extras/rpms/squid/F-8/squid-2.6.STABLE16-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squid-2.6.STABLE16-config.patch 14 Sep 2007 06:18:59 -0000 1.1 +++ squid-2.6.STABLE16-config.patch 13 Mar 2008 13:26:09 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.data.pre ---- squid-2.6.STABLE16/src/cf.data.pre.config 2007-09-05 23:50:15.000000000 +0200 -+++ squid-2.6.STABLE16/src/cf.data.pre 2007-09-07 15:11:59.000000000 +0200 +diff -up squid-2.6.STABLE17/src/cf.data.pre.config squid-2.6.STABLE17/src/cf.data.pre +--- squid-2.6.STABLE17/src/cf.data.pre.config 2007-11-26 12:03:45.000000000 +0100 ++++ squid-2.6.STABLE17/src/cf.data.pre 2008-03-11 11:39:23.000000000 +0100 @@ -692,6 +692,7 @@ http_access deny CONNECT !SSL_ports #http_access allow our_networks @@ -9,7 +9,7 @@ http_access deny all NOCOMMENT_END DOC_END -@@ -2250,7 +2251,7 @@ DOC_END +@@ -2225,7 +2226,7 @@ DOC_END NAME: logfile_rotate TYPE: int @@ -18,7 +18,7 @@ LOC: Config.Log.rotateNumber DOC_START Specifies the number of logfile rotations to make when you -@@ -2266,6 +2267,8 @@ DOC_START +@@ -2241,6 +2242,8 @@ DOC_START purposes, so -k rotate uses another signal. It is best to get in the habit of using 'squid -k rotate' instead of 'kill -USR1 '. @@ -27,7 +27,7 @@ DOC_END NAME: emulate_httpd_log -@@ -3342,11 +3345,11 @@ COMMENT_END +@@ -3356,11 +3359,11 @@ COMMENT_END NAME: cache_mgr TYPE: string @@ -41,7 +41,7 @@ DOC_END NAME: mail_from -@@ -3374,21 +3377,22 @@ DOC_END +@@ -3389,12 +3392,12 @@ DOC_END NAME: cache_effective_user TYPE: string @@ -56,26 +56,7 @@ cache_effective_group, Squid sets the GID to the effective user's default group ID (taken from the password file) and supplementary group list from the from groups membership of - cache_effective_user. -+cache_effective_user squid - DOC_END - - NAME: cache_effective_group - TYPE: string --DEFAULT: none -+DEFAULT: squid - LOC: Config.effectiveGroup - DOC_START - If you want Squid to run with a specific GID regardless of -@@ -3398,6 +3402,7 @@ DOC_START - and only this GID is effective. If Squid is not started as - root the user starting Squid must be member of the specified - group. -+cache_effective_group squid - DOC_END - - NAME: httpd_suppress_version_string -@@ -4018,12 +4023,12 @@ COMMENT_END +@@ -4031,12 +4034,12 @@ COMMENT_END NAME: snmp_port TYPE: ushort LOC: Config.Port.snmp @@ -91,7 +72,7 @@ DOC_END NAME: snmp_access -@@ -4402,15 +4407,22 @@ TYPE: string +@@ -4430,15 +4433,22 @@ TYPE: string LOC: Config.errorDirectory DEFAULT: @DEFAULT_ERROR_DIR@ DOC_START Index: squid.spec =================================================================== RCS file: /cvs/extras/rpms/squid/F-8/squid.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- squid.spec 6 Dec 2007 08:34:44 -0000 1.91 +++ squid.spec 13 Mar 2008 13:26:09 -0000 1.92 @@ -5,7 +5,7 @@ Summary: The Squid proxy caching server Name: squid Version: 2.6.STABLE17 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 7 License: GPL Group: System Environment/Daemons @@ -34,7 +34,7 @@ #Patch206: squid-2.6.STABLE5-fd-config.patch Patch206: squid-2.6.STABLE16-fd.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Prereq: /sbin/chkconfig logrotate shadow-utils Requires: bash >= 2.0 Requires(pre): shadow-utils @@ -328,6 +328,9 @@ chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Tue Mar 11 2008 Martin Nagy - 2.6.STABLE17-2 +- set default of cache_effective_group to none (#252197) + * Tue Dec 06 2007 Martin Nagy - 2.6.STABLE17-1 - upgrade to latest upstream 2.6.STABLE17 From fedora-extras-commits at redhat.com Thu Mar 13 13:46:59 2008 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 13 Mar 2008 13:46:59 GMT Subject: rpms/system-config-services/devel .cvsignore, 1.54, 1.55 sources, 1.66, 1.67 system-config-services.spec, 1.65, 1.66 Message-ID: <200803131346.m2DDkxaG031097@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/pkgs/rpms/system-config-services/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31068 Modified Files: .cvsignore sources system-config-services.spec Log Message: fix traceback when setting GUI elements (in)sensitive (#437289) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 7 Mar 2008 16:09:26 -0000 1.54 +++ .cvsignore 13 Mar 2008 13:46:20 -0000 1.55 @@ -1 +1 @@ -system-config-services-0.99.8.tar.bz2 +system-config-services-0.99.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- sources 7 Mar 2008 16:09:26 -0000 1.66 +++ sources 13 Mar 2008 13:46:20 -0000 1.67 @@ -1 +1 @@ -be087bfd8be1d6a92e7d49d3a2a1d368 system-config-services-0.99.8.tar.bz2 +f2c5d501641a857463ae95f4e4805a04 system-config-services-0.99.9.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- system-config-services.spec 7 Mar 2008 16:09:26 -0000 1.65 +++ system-config-services.spec 13 Mar 2008 13:46:20 -0000 1.66 @@ -16,7 +16,7 @@ Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.99.8 +Version: 0.99.9 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -107,6 +107,9 @@ %{_mandir}/*/system-config-services.8* %changelog +* Thu Mar 13 2008 Nils Philippsen - 0.99.9-1 +- fix traceback when setting GUI elements (in)sensitive (#437289) + * Fri Mar 07 2008 Nils Philippsen - 0.99.8-1 - don't warn about xinetd not installed/running with disabled xinetd services in the list From fedora-extras-commits at redhat.com Thu Mar 13 13:55:01 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 13 Mar 2008 13:55:01 GMT Subject: rpms/perl-File-Remove/devel .cvsignore, 1.9, 1.10 perl-File-Remove.spec, 1.22, 1.23 sources, 1.9, 1.10 Message-ID: <200803131355.m2DDt14V031489@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-File-Remove/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31446 Modified Files: .cvsignore perl-File-Remove.spec sources Log Message: * Thu Mar 13 2008 Ralf Corsepius - 1.40-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Remove/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Nov 2007 04:32:35 -0000 1.9 +++ .cvsignore 13 Mar 2008 13:54:24 -0000 1.10 @@ -1 +1 @@ -File-Remove-0.39.tar.gz +File-Remove-1.40.tar.gz Index: perl-File-Remove.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- perl-File-Remove.spec 28 Feb 2008 13:00:21 -0000 1.22 +++ perl-File-Remove.spec 13 Mar 2008 13:54:24 -0000 1.23 @@ -1,6 +1,6 @@ Name: perl-File-Remove -Version: 0.39 -Release: 7%{?dist} +Version: 1.40 +Release: 1%{?dist} Summary: Convenience module for removing files and directories License: GPL+ or Artistic Group: Development/Libraries @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 13 2008 Ralf Corsepius - 1.40-1 +- Upstream update. + * Thu Feb 28 2008 Tom "spot" Callaway - 0.39-7 - Rebuild normally, second pass Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Remove/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2007 04:32:35 -0000 1.9 +++ sources 13 Mar 2008 13:54:24 -0000 1.10 @@ -1 +1 @@ -8a25d37cc652e67654b9cb4b0fbc87c6 File-Remove-0.39.tar.gz +1f3baab00b0d260d3efa28da4ac146fc File-Remove-1.40.tar.gz From fedora-extras-commits at redhat.com Thu Mar 13 14:01:03 2008 From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm)) Date: Thu, 13 Mar 2008 14:01:03 GMT Subject: rpms/openoffice.org/devel openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch, 1.6, 1.6.2.1 Message-ID: <200803131401.m2DE13j6000848@cvs-int.fedora.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31625 Modified Files: Tag: openoffice_org-2_4_0-9_1_999_fc9 openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch Log Message: GetAttr -> GetCurAttr openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch: Index: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch 8 Jan 2008 14:51:51 -0000 1.6 +++ openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch 13 Mar 2008 14:00:39 -0000 1.6.2.1 @@ -818,7 +818,7 @@ + { + bool bRet = false; + SfxItemSet aSet( pSh->GetAttrPool(), RES_PAGEDESC, RES_PAGEDESC ); -+ if (pSh->GetAttr( aSet )) ++ if (pSh->GetCurAttr( aSet )) + { + const SfxPoolItem* pItem(0); + if (SFX_ITEM_SET == aSet.GetItemState( RES_PAGEDESC, TRUE, &pItem ) && pItem) From fedora-extras-commits at redhat.com Thu Mar 13 14:06:04 2008 From: fedora-extras-commits at redhat.com (Tim Waugh (twaugh)) Date: Thu, 13 Mar 2008 14:06:04 GMT Subject: rpms/foomatic/devel foomatic-clean-up-on-cancel.patch, NONE, 1.1 foomatic.spec, 1.182, 1.183 Message-ID: <200803131406.m2DE647k005403@cvs-int.fedora.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/foomatic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5349 Modified Files: foomatic.spec Added Files: foomatic-clean-up-on-cancel.patch Log Message: * Thu Mar 13 2008 Tim Waugh 3.0.2-58 - Applied patch from upstream to make foomatic-rip clean up correctly when a job is cancelled. foomatic-clean-up-on-cancel.patch: --- NEW FILE foomatic-clean-up-on-cancel.patch --- diff -up foomatic-filters-3.0-20080211/foomatic-rip.in.clean-up-on-cancel foomatic-filters-3.0-20080211/foomatic-rip.in --- foomatic-filters-3.0-20080211/foomatic-rip.in.clean-up-on-cancel 2008-02-11 21:16:36.000000000 +0000 +++ foomatic-filters-3.0-20080211/foomatic-rip.in 2008-03-13 11:42:35.000000000 +0000 @@ -155,19 +155,19 @@ my $EXIT_PRNERR_NORETRY = 2; # printer my $EXIT_JOBERR = 3; # job is defective my $EXIT_SIGNAL = 4; # terminated after catching signal my $EXIT_ENGAGED = 5; # printer is otherwise engaged (connection - # refused) + # refused) my $EXIT_STARVED = 6; # starved for system resources my $EXIT_PRNERR_NORETRY_ACCESS_DENIED = 7; # bad password? bad port - # permissions? + # permissions? my $EXIT_PRNERR_NOT_RESPONDING = 8; # just doesn't answer at all - # (turned off?) + # (turned off?) my $EXIT_PRNERR_NORETRY_BAD_SETTINGS = 9; # interface settings are invalid my $EXIT_PRNERR_NO_SUCH_ADDRESS = 10; # address lookup failed, may be - # transient + # transient my $EXIT_PRNERR_NORETRY_NO_SUCH_ADDRESS = 11; # address lookup failed, not - # transient + # transient my $EXIT_INCAPABLE = 50; # printer wants (lacks) features - # or resources + # or resources # Standard Unix signal names #my SIGHUP = 1; #my SIGINT = 2; @@ -181,6 +181,21 @@ my $EXIT_INCAPABLE = 50; my $ESPIPE = 29; # the errno value when seeking a pipe or socket +# The modern_shell() function will register the PIDs of all shell calls, +# so that rip_die() can kill these processes +my %pids; + +# $kidgeneration stays 0 for the main process, child processes of the +# main process get $kidgeneration = 1, their children 2, ... +my $kidgeneration = 0; + +# Catch signals +my $retval = $EXIT_PRINTED; +use sigtrap qw(handler set_exit_canceled normal-signals + handler set_exit_error error-signals + handler set_exit_prnerr USR1 + handler set_exit_prnerr_noretry USR2 + handler set_exit_engaged TTIN); ## Some important variables @@ -2153,7 +2168,7 @@ if ($debug) { } - + ## From here on we have to repeat all the rest of the program for ## every file to print @@ -3538,13 +3553,8 @@ sub getrendererhandle { print $logh "${added_lf}Starting renderer\n"; - # Catch signals + # Reset return value of the renderer $retval = $EXIT_PRINTED; - use sigtrap qw(handler set_exit_prnerr USR1 - handler set_exit_prnerr_noretry USR2 - handler set_exit_engaged TTIN); - - # Variables for the kid processes reporting their state # Set up a pipe for the kids to pass their exit stat to the main process pipe KID_MESSAGE, KID_MESSAGE_IN; @@ -3585,6 +3595,8 @@ sub getrendererhandle { return ( *KID3, $kid3 ); } else { + $kidgeneration += 1; + close KID3; pipe KID4_IN, KID4; @@ -3774,6 +3786,8 @@ sub getrendererhandle { print $logh "KID3 finished\n"; exit $EXIT_PRINTED; } else { + $kidgeneration += 1; + # child, trailing task on the pipe; we write jcl stuff close KID4; close KID3_IN; @@ -4112,6 +4126,8 @@ sub getfileconverterhandle { return ( *KID1_IN, $kid1 ); } else { + $kidgeneration += 1; + # We go on reading the job data and stuff it into the file # converter close KID1_IN; @@ -4253,6 +4269,8 @@ sub getfileconverterhandle { print $logh "KID1 finished\n"; exit $EXIT_PRINTED; } else { + $kidgeneration += 1; + # child, first part of the pipe, reading in the data from # standard input and stuffing it into the file converter # after putting in the already read data (in $alreadyread) @@ -4580,6 +4598,8 @@ sub getdocgeneratorhandle { return ( *KID0_IN, $kid0 ); } + $kidgeneration += 1; + # we are the kid; we generate the documentation page close KID0_IN; @@ -4867,66 +4887,100 @@ sub rip_die { my $errmsg = "$!"; my $errcod = $! + 0; - # Close the documentation page generator (if it was used) - if ($docgeneratorpid) { - if ($kid0) { - print $logh "Killing process $kid0 (KID0)\n"; - kill(9, $kid0); + # Log that we are dying ... + print $logh "Process dying with \"$message\", exit stat: $exitstat\n\terror: $errmsg ($errcod)\n"; + + print $logh "Cleaning up ...\n"; + foreach my $killsignal (15, 9) { + + # Kill all registered subshells + foreach my $pid (keys %pids) { + print $logh "Killing process $pid ($pids{$pid}) and its subprocesses with signal $killsignal\n"; + # This call kills the process group with group ID $pid, the + # group which was formed from the initial process $pid which + # contains $pid and all its subprocesses + kill(-$killsignal, $pid); + # If the system does not support process groups and therefore + # the call above does not kill anything, kill at least $pid + kill($killsignal, $pid); } - $docgeneratorpid = 0; - } - # Close the file converter (if it was used) - if ($fileconverterpid) { + # Close the documentation page generator (if it was used) + if ($kid0) { + print $logh "Killing process $kid0 (KID0) with signal $killsignal\n"; + kill($killsignal, $kid0); + } + + # Close the file converter (if it was used) if ($kid2) { - print $logh "Killing process $kid2 (KID2)\n"; - kill(9, $kid2); + print $logh "Killing process $kid2 (KID2) with signal $killsignal\n"; + kill($killsignal, $kid2); } if ($kid1) { - print $logh "Killing process $kid1 (KID1)\n"; - kill(9, $kid1); + print $logh "Killing process $kid1 (KID1) with signal $killsignal\n"; + kill($killsignal, $kid1); } - $fileconverterpid = 0; - } - # Close the renderer - if ($rendererpid) { + # Close the renderer if ($kid4) { - print $logh "Killing process $kid4 (KID4)\n"; - kill(9, $kid4); + print $logh "Killing process $kid4 (KID4) with signal $killsignal\n"; + kill($killsignal, $kid4); } if ($kid3) { - print $logh "Killing process $kid3 (KID3)\n"; - kill(9, $kid3); + print $logh "Killing process $kid3 (KID3) with signal $killsignal\n"; + kill($killsignal, $kid3); } - $rendererpid = 0; + + # Wait some time for the processes to close + sleep(5 - $kidgeneration) if $killsignal != 9; } - print $logh "Process dying with \"$message\", exit stat: $exitstat\n\terror: $errmsg ($errcod)\n"; - if ($spooler eq 'ppr_int') { - # Special error handling for PPR intefaces - $message =~ s/\\/\\\\/; - $message =~ s/\"/\\\"/; - my @messagelines = split("\n", $message); - my $firstline = "TRUE"; - for my $line (@messagelines) { - modern_system("lib/alert $printer $firstline \"$line\""); - $firstline = "FALSE"; + # Do the debug dump and the PPR error handling only from the main process + if ($kidgeneration == 0) { # We are the main process + + if ($spooler eq 'ppr_int') { + # Special error handling for PPR intefaces + $message =~ s/\\/\\\\/; + $message =~ s/\"/\\\"/; + my @messagelines = split("\n", $message); + my $firstline = "TRUE"; + for my $line (@messagelines) { + modern_system("lib/alert $printer $firstline \"$line\""); + $firstline = "FALSE"; + } + } else { + print STDERR $message . "\n"; + } + if ($debug) { + use Data::Dumper; + local $Data::Dumper::Purity=1; + local $Data::Dumper::Indent=1; + print $logh Dumper($dat); } - } else { - print STDERR $message . "\n"; - } - if ($debug) { - use Data::Dumper; - local $Data::Dumper::Purity=1; - local $Data::Dumper::Indent=1; - print $logh Dumper($dat); } + + ## The End + print $logh "${added_lf}Closing foomatic-rip.\n"; + close $logh; + exit $exitstat; } # Signal handling routines +sub do_nothing { +} + +sub set_exit_canceled { + $retval = $EXIT_PRINTED; + rip_die ("Caught termination signal: Job canceled", $retval); +} + +sub set_exit_error { + $retval = $EXIT_SIGNAL; + rip_die ("Caught error signal: Error in renderer, driver, or foomatic-rip", $retval); +} + sub set_exit_prnerr { $retval = $EXIT_PRNERR; } @@ -6592,20 +6646,36 @@ sub read_attribute_file { sub modern_system { my (@list) = @_; - if (($modern_shell =~ /.+/) && ($modern_shell ne '/bin/sh')) { - # a "modern" shell other than the default shell was specified - my $pid = fork(); - - ($pid < 0) && die "failed to fork()"; - - if ($pid == 0) { # child, execute the commands under a modern shell - exec($modern_shell, "-c", @list); - die "exec($modern_shell, \"-c\", @list);"; - } else { # parent, wait for the child - waitpid($pid, 0); - } - } else { # the system shell is "modern" enough. - system(@list); + if ($modern_shell |~ /.+/) { + # No "modern" shell other than the default shell was specified + $modern_shell = '/bin/sh'; + } + + my $pid = fork(); + ($pid < 0) && die "failed to fork()"; + + if ($pid == 0) { # child, execute the commands under a modern shell + # If the system supports process groups, we create a process + # group of this subshell process. All the children of this + # process (calls of external filters, renderers, or drivers) + # will be members of this process group and so by killing this + # process group we can kill all subprocesses and so we can + # cleanly cancel print jobs + eval("setpgrp()"); + # Stop catching signals + #use sigtrap qw(die normal-signals error-signals + # handler do_nothing USR1 USR2 TTIN); + exec($modern_shell, "-c", @list); + rip_die("exec($modern_shell, \"-c\", @list);", + $EXIT_PRNERR_NORETRY_BAD_SETTINGS); + } else { # parent, register child's PID, wait for the child, and + # unregister the PID + $pids{$pid} = substr(join(" ", @list), 0, 100) . + (length(join(" ", @list)) > 100 ? "..." : ""); + print $logh "Starting process $pid: \"$pids{$pid}\"\n"; + waitpid($pid, 0); + print $logh "Process $pid ending: \"$pids{$pid}\"\n"; + delete $pids{$pid}; } } Index: foomatic.spec =================================================================== RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- foomatic.spec 3 Mar 2008 20:38:10 -0000 1.182 +++ foomatic.spec 13 Mar 2008 14:05:11 -0000 1.183 @@ -6,7 +6,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 57%{?dist} +Release: 58%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -39,9 +39,12 @@ # Handle non-UTF-8 encodings in imported PPD files. Patch15: foomatic-bad-utf8.patch + # Missing IEEE 1284 IDs. Patch16: foomatic-ieee1284.patch +Patch17: foomatic-clean-up-on-cancel.patch + Url: http://www.linuxprinting.org BuildRequires: perl >= 3:5.8.1 BuildRequires: perl(ExtUtils::MakeMaker) @@ -85,6 +88,7 @@ pushd foomatic-filters-3.0-%{filtersver} %patch1 -p1 -b .libdir %patch5 -p1 -b .fontpath +%patch17 -p1 -b .clean-up-on-cancel ./make_configure popd @@ -243,6 +247,10 @@ %{_var}/cache/foomatic %changelog +* Thu Mar 13 2008 Tim Waugh 3.0.2-58 +- Applied patch from upstream to make foomatic-rip clean up correctly when + a job is cancelled. + * Mon Mar 3 2008 Tom "spot" Callaway 3.0.2-57 - rebuild for new perl (again) From fedora-extras-commits at redhat.com Thu Mar 13 14:06:43 2008 From: fedora-extras-commits at redhat.com (Lillian Angel (langel)) Date: Thu, 13 Mar 2008 14:06:43 GMT Subject: rpms/azureus/devel azureus.script,1.19,1.20 azureus.spec,1.60,1.61 Message-ID: <200803131406.m2DE6h8d005482@cvs-int.fedora.redhat.com> Author: langel Update of /cvs/pkgs/rpms/azureus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5402 Modified Files: azureus.script azureus.spec Log Message: * Thu Mar 13 2008 Lillian Angel - 3.0.4.2-11 - Updated release. - Updated JAVA_HOME in azureus.script. - Changed java-1.7.0-icedtea requirements to java-1.6.0-openjdk. Index: azureus.script =================================================================== RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.script,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- azureus.script 21 Feb 2008 09:53:10 -0000 1.19 +++ azureus.script 13 Mar 2008 14:06:06 -0000 1.20 @@ -18,4 +18,4 @@ popd > /dev/null 2>&1 eval grep '^GRE_PATH=' /etc/gre.d/gre.conf -MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-icedtea LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:/usr/lib/eclipse/plugins/:/usr/lib/eclipse/:/usr/lib/ CLASSPATH=/usr/lib/eclipse/swt.jar:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@" +MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:/usr/lib/eclipse/plugins/:/usr/lib/eclipse/:/usr/lib/ CLASSPATH=/usr/lib/eclipse/swt.jar:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@" Index: azureus.spec =================================================================== RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- azureus.spec 21 Feb 2008 09:56:54 -0000 1.60 +++ azureus.spec 13 Mar 2008 14:06:06 -0000 1.61 @@ -1,6 +1,6 @@ Name: azureus Version: 3.0.4.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A BitTorrent Client Group: Applications/Internet @@ -51,8 +51,8 @@ Requires: bouncycastle >= 1.33-3 Requires: libgcj >= 4.1.0-0.15 BuildRequires: java-1.5.0-gcj-devel -BuildRequires: java-1.7.0-icedtea-devel -Requires: java-1.7.0-icedtea +BuildRequires: java-1.6.0-openjdk-devel +Requires: java-1.6.0openjdkk Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 BuildRequires: desktop-file-utils @@ -197,6 +197,11 @@ %{_libdir}/gcj/* %changelog +* Thu Mar 13 2008 Lillian Angel - 3.0.4.2-11 +- Updated release. +- Updated JAVA_HOME in azureus.script. +- Changed java-1.7.0-icedtea requirements to java-1.6.0-openjdk. + * Thu Feb 21 2008 Lillian Angel - 3.0.4.2-10 - Updated release. - Updated azureus.script From fedora-extras-commits at redhat.com Thu Mar 13 14:07:38 2008 From: fedora-extras-commits at redhat.com (Joel Andres Granados Moreno (jgranado)) Date: Thu, 13 Mar 2008 14:07:38 GMT Subject: rpms/firstaidkit/devel firstaidkit.spec,1.6,1.7 Message-ID: <200803131407.m2DE7c9O005541@cvs-int.fedora.redhat.com> Author: jgranado Update of /cvs/pkgs/rpms/firstaidkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5480 Modified Files: firstaidkit.spec Log Message: fix the name in the dep of firstaidkit-all Index: firstaidkit.spec =================================================================== RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- firstaidkit.spec 11 Mar 2008 15:43:16 -0000 1.6 +++ firstaidkit.spec 13 Mar 2008 14:06:58 -0000 1.7 @@ -4,7 +4,7 @@ Name: firstaidkit Version: 0.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: System Rescue Tool Group: Applications/System @@ -41,7 +41,7 @@ Group: Applications/System Summary: All firstaidkit plugins Requires: %{name} = %{version}-%{release} -Requires: plugin-passwd +Requires: %{name}-plugin-passwd %description plugin-all This package provides all the necessary firstaidkit plugins. It @@ -109,6 +109,9 @@ %{_libdir}/firstaidkit-plugins/passwd.py %Changelog +* Thu Mar 13 2008 Joel Granados 0.1.1-4 +- Fix dependency with passwd plugin + * Tue Mar 11 2008 Joel Granados 0.1.1-3 - Rebuild From fedora-extras-commits at redhat.com Thu Mar 13 14:15:06 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 13 Mar 2008 14:15:06 GMT Subject: rpms/perl-File-Remove/F-8 .cvsignore, 1.9, 1.10 perl-File-Remove.spec, 1.17, 1.18 sources, 1.9, 1.10 Message-ID: <200803131415.m2DEF6wj005803@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-File-Remove/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5775 Modified Files: .cvsignore perl-File-Remove.spec sources Log Message: * Thu Mar 13 2008 Ralf Corsepius - 1.40-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-8/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Nov 2007 04:36:02 -0000 1.9 +++ .cvsignore 13 Mar 2008 14:14:20 -0000 1.10 @@ -1 +1 @@ -File-Remove-0.39.tar.gz +File-Remove-1.40.tar.gz Index: perl-File-Remove.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-8/perl-File-Remove.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-File-Remove.spec 25 Nov 2007 15:30:28 -0000 1.17 +++ perl-File-Remove.spec 13 Mar 2008 14:14:20 -0000 1.18 @@ -1,6 +1,6 @@ Name: perl-File-Remove -Version: 0.39 -Release: 3%{?dist} +Version: 1.40 +Release: 1%{?dist} Summary: Convenience module for removing files and directories License: GPL+ or Artistic Group: Development/Libraries @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 13 2008 Ralf Corsepius - 1.40-1 +- Upstream update. + * Sun Nov 25 2007 Ralf Cors??pius - 0.39-3 - Really BR: perl(Test::MinimumVersion). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-8/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2007 04:36:02 -0000 1.9 +++ sources 13 Mar 2008 14:14:20 -0000 1.10 @@ -1 +1 @@ -8a25d37cc652e67654b9cb4b0fbc87c6 File-Remove-0.39.tar.gz +1f3baab00b0d260d3efa28da4ac146fc File-Remove-1.40.tar.gz From fedora-extras-commits at redhat.com Thu Mar 13 14:17:04 2008 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 13 Mar 2008 14:17:04 GMT Subject: rpms/perl-File-Remove/F-7 .cvsignore, 1.9, 1.10 perl-File-Remove.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200803131417.m2DEH4Ub005916@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/pkgs/rpms/perl-File-Remove/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5883 Modified Files: .cvsignore perl-File-Remove.spec sources Log Message: * Thu Mar 13 2008 Ralf Corsepius - 1.40-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-7/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Nov 2007 04:36:05 -0000 1.9 +++ .cvsignore 13 Mar 2008 14:16:26 -0000 1.10 @@ -1 +1 @@ -File-Remove-0.39.tar.gz +File-Remove-1.40.tar.gz Index: perl-File-Remove.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-7/perl-File-Remove.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-File-Remove.spec 25 Nov 2007 15:30:32 -0000 1.15 +++ perl-File-Remove.spec 13 Mar 2008 14:16:26 -0000 1.16 @@ -1,6 +1,6 @@ Name: perl-File-Remove -Version: 0.39 -Release: 3%{?dist} +Version: 1.40 +Release: 1%{?dist} Summary: Convenience module for removing files and directories License: GPL+ or Artistic Group: Development/Libraries @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Thu Mar 13 2008 Ralf Corsepius - 1.40-1 +- Upstream update. + * Sun Nov 25 2007 Ralf Cors??pius - 0.39-3 - Really BR: perl(Test::MinimumVersion). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-File-Remove/F-7/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2007 04:36:05 -0000 1.9 +++ sources 13 Mar 2008 14:16:26 -0000 1.10 @@ -1 +1 @@ -8a25d37cc652e67654b9cb4b0fbc87c6 File-Remove-0.39.tar.gz +1f3baab00b0d260d3efa28da4ac146fc File-Remove-1.40.tar.gz From fedora-extras-commits at redhat.com Thu Mar 13 14:21:38 2008 From: fedora-extras-commits at redhat.com (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?= (mmaslano)) Date: Thu, 13 Mar 2008 14:21:38 GMT Subject: rpms/perl/F-8 perl-5.8.8-CGI-3.29.patch, NONE, 1.1 perl.spec, 1.148, 1.149 Message-ID: <200803131421.m2DELc79006170@cvs-int.fedora.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/perl/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6136 Modified Files: perl.spec Added Files: perl-5.8.8-CGI-3.29.patch Log Message: Update CGI on 3.29. perl-5.8.8-CGI-3.29.patch: --- NEW FILE perl-5.8.8-CGI-3.29.patch --- diff -up perl-5.8.8/lib/CGI.pm.old perl-5.8.8/lib/CGI.pm --- perl-5.8.8/lib/CGI.pm.old 2008-03-13 14:42:33.000000000 +0100 +++ perl-5.8.8/lib/CGI.pm 2007-12-18 11:47:07.000000000 +0100 @@ -18,8 +18,8 @@ use Carp 'croak'; # The most recent version and complete docs are available at: # http://stein.cshl.org/WWW/software/CGI/ -$CGI::revision = '$Id: CGI.pm,v 1.194 2005/12/06 22:12:56 lstein Exp $'; -$CGI::VERSION='3.15'; +$CGI::revision = '$Id: CGI.pm,v 1.234 2007/04/16 16:58:46 lstein Exp $'; +$CGI::VERSION='3.29'; # HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES. # UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING. @@ -40,6 +40,7 @@ use constant XHTML_DTD => ['-//W3C//DTD $MOD_PERL = 0; # no mod_perl by default @SAVED_SYMBOLS = (); + # >>>>> Here are some globals that you might want to adjust <<<<<< sub initialize_globals { # Set this to 1 to enable copious autoloader debugging messages @@ -118,6 +119,7 @@ sub initialize_globals { undef %EXPORT; undef $QUERY_CHARSET; undef %QUERY_FIELDNAMES; + undef %QUERY_TMPFILES; # prevent complaints by mod_perl 1; @@ -329,6 +331,10 @@ sub new { my $self = {}; bless $self,ref $class || $class || $DefaultClass; + + # always use a tempfile + $self->{'use_tempfile'} = 1; + if (ref($initializer[0]) && (UNIVERSAL::isa($initializer[0],'Apache') || @@ -339,6 +345,7 @@ sub new { if (ref($initializer[0]) && (UNIVERSAL::isa($initializer[0],'CODE'))) { $self->upload_hook(shift @initializer, shift @initializer); + $self->{'use_tempfile'} = shift @initializer if (@initializer > 0); } if ($MOD_PERL) { if ($MOD_PERL == 1) { @@ -392,9 +399,10 @@ sub upload_hook { } else { $self = shift; } - my ($hook,$data) = @_; + my ($hook,$data,$use_tempfile) = @_; $self->{'.upload_hook'} = $hook; $self->{'.upload_data'} = $data; + $self->{'use_tempfile'} = $use_tempfile if defined $use_tempfile; } #### Method: param @@ -427,7 +435,7 @@ sub param { } } # If values is provided, then we set it. - if (@values) { + if (@values or defined $value) { $self->add_parameter($name); $self->{$name}=[@values]; } @@ -436,7 +444,16 @@ sub param { } return unless defined($name) && $self->{$name}; - return wantarray ? @{$self->{$name}} : $self->{$name}->[0]; + + my $charset = $self->charset || ''; + my $utf8 = $charset eq 'utf-8'; + if ($utf8) { + eval "require Encode; 1;" if $utf8 && !Encode->can('decode'); # bring in these functions + return wantarray ? map {Encode::decode(utf8=>$_) } @{$self->{$name}} + : Encode::decode(utf8=>$self->{$name}->[0]); + } else { + return wantarray ? @{$self->{$name}} : $self->{$name}->[0]; + } } sub self_or_default { @@ -478,6 +495,8 @@ sub init { my $self = shift; my($query_string,$meth,$content_length,$fh, at lines) = ('','','',''); + my $is_xforms; + my $initializer = shift; # for backward compatibility local($/) = "\n"; @@ -488,12 +507,20 @@ sub init { # ourselves from the original query (which may be gone # if it was read from STDIN originally.) if (defined(@QUERY_PARAM) && !defined($initializer)) { - foreach (@QUERY_PARAM) { - $self->param('-name'=>$_,'-value'=>$QUERY_PARAM{$_}); - } - $self->charset($QUERY_CHARSET); - $self->{'.fieldnames'} = {%QUERY_FIELDNAMES}; - return; + for my $name (@QUERY_PARAM) { + my $val = $QUERY_PARAM{$name}; # always an arrayref; + $self->param('-name'=>$name,'-value'=> $val); + if (defined $val and ref $val eq 'ARRAY') { + for my $fh (grep {defined(fileno($_))} @$val) { + seek($fh,0,0); # reset the filehandle. + } + + } + } + $self->charset($QUERY_CHARSET); + $self->{'.fieldnames'} = {%QUERY_FIELDNAMES}; + $self->{'.tmpfiles'} = {%QUERY_TMPFILES}; + return; } $meth=$ENV{'REQUEST_METHOD'} if defined($ENV{'REQUEST_METHOD'}); @@ -508,17 +535,10 @@ sub init { # avoid unreasonably large postings if (($POST_MAX > 0) && ($content_length > $POST_MAX)) { - # quietly read and discard the post - my $buffer; - my $tmplength = $content_length; - while($tmplength > 0) { - my $maxbuffer = ($tmplength < 10000)?$tmplength:10000; - my $bytesread = $MOD_PERL ? $self->r->read($buffer,$maxbuffer) : read(STDIN,$buffer,$maxbuffer); - $tmplength -= $bytesread; - } - $self->cgi_error("413 Request entity too large"); - last METHOD; - } + #discard the post, unread + $self->cgi_error("413 Request entity too large"); + last METHOD; + } # Process multipart postings, but only if the initializer is # not defined. @@ -532,9 +552,50 @@ sub init { last METHOD; } + # Process XForms postings. We know that we have XForms in the + # following cases: + # method eq 'POST' && content-type eq 'application/xml' + # method eq 'POST' && content-type =~ /multipart\/related.+start=/ + # There are more cases, actually, but for now, we don't support other + # methods for XForm posts. + # In a XForm POST, the QUERY_STRING is parsed normally. + # If the content-type is 'application/xml', we just set the param + # XForms:Model (referring to the xml syntax) param containing the + # unparsed XML data. + # In the case of multipart/related we set XForms:Model as above, but + # the other parts are available as uploads with the Content-ID as the + # the key. + # See the URL below for XForms specs on this issue. + # http://www.w3.org/TR/2006/REC-xforms-20060314/slice11.html#submit-options + if ($meth eq 'POST' && defined($ENV{'CONTENT_TYPE'})) { + if ($ENV{'CONTENT_TYPE'} eq 'application/xml') { + my($param) = 'XForms:Model'; + my($value) = ''; + $self->add_parameter($param); + $self->read_from_client(\$value,$content_length,0) + if $content_length > 0; + push (@{$self->{$param}},$value); + $is_xforms = 1; + } elsif ($ENV{'CONTENT_TYPE'} =~ /multipart\/related.+boundary=\"?([^\";,]+)\"?.+start=\"?\]+)\>?\"?/) { + my($boundary,$start) = ($1,$2); + my($param) = 'XForms:Model'; + $self->add_parameter($param); + my($value) = $self->read_multipart_related($start,$boundary,$content_length,0); + push (@{$self->{$param}},$value); + if ($MOD_PERL) { + $query_string = $self->r->args; + } else { + $query_string = $ENV{'QUERY_STRING'} if defined $ENV{'QUERY_STRING'}; + $query_string ||= $ENV{'REDIRECT_QUERY_STRING'} if defined $ENV{'REDIRECT_QUERY_STRING'}; + } + $is_xforms = 1; + } + } + + # If initializer is defined, then read parameters # from it. - if (defined($initializer)) { + if (!$is_xforms && defined($initializer)) { if (UNIVERSAL::isa($initializer,'CGI')) { $query_string = $initializer->query_string; last METHOD; @@ -545,21 +606,6 @@ sub init { } last METHOD; } - - if (defined($fh) && ($fh ne '')) { - while (<$fh>) { - chomp; - last if /^=/; - push(@lines,$_); - } - # massage back into standard format - if ("@lines" =~ /=/) { - $query_string=join("&", at lines); - } else { - $query_string=join("+", at lines); - } - last METHOD; - } if (defined($fh) && ($fh ne '')) { while (<$fh>) { @@ -585,7 +631,7 @@ sub init { # If method is GET or HEAD, fetch the query from # the environment. - if ($meth=~/^(GET|HEAD)$/) { + if ($is_xforms || $meth=~/^(GET|HEAD)$/) { if ($MOD_PERL) { $query_string = $self->r->args; } else { @@ -621,7 +667,7 @@ sub init { } # YL: Begin Change for XML handler 10/19/2001 - if ($meth eq 'POST' + if (!$is_xforms && $meth eq 'POST' && defined($ENV{'CONTENT_TYPE'}) && $ENV{'CONTENT_TYPE'} !~ m|^application/x-www-form-urlencoded| && $ENV{'CONTENT_TYPE'} !~ m|^multipart/form-data| ) { @@ -710,6 +756,7 @@ sub save_request { } $QUERY_CHARSET = $self->charset; %QUERY_FIELDNAMES = %{$self->{'.fieldnames'}}; + %QUERY_TMPFILES = %{ $self->{'.tmpfiles'} || {} }; } sub parse_params { @@ -1418,11 +1465,15 @@ sub header { 'ATTACHMENT','P3P'], at p); $nph ||= $NPH; + + $type ||= 'text/html' unless defined($type); + if (defined $charset) { $self->charset($charset); } else { - $charset = $self->charset; + $charset = $self->charset if $type =~ /^text\//; } + $charset ||= ''; # rearrange() was designed for the HTML portion, so we # need to fix it up a little. @@ -1432,8 +1483,11 @@ sub header { ($_ = $header) =~ s/^(\w)(.*)/"\u$1\L$2" . ': '.$self->unescapeHTML($value)/e; } - $type ||= 'text/html' unless defined($type); - $type .= "; charset=$charset" if $type ne '' and $type =~ m!^text/! and $type !~ /\bcharset\b/ and $charset ne ''; + $type .= "; charset=$charset" + if $type ne '' + and $type !~ /\bcharset\b/ + and defined $charset + and $charset ne ''; # Maybe future compatibility. Maybe not. my $protocol = $ENV{SERVER_PROTOCOL} || 'HTTP/1.0'; @@ -1499,7 +1553,7 @@ sub redirect { my($self, at p) = self_or_default(@_); my($url,$target,$status,$cookie,$nph, at other) = rearrange([[LOCATION,URI,URL],TARGET,STATUS,['COOKIE','COOKIES'],NPH], at p); - $status = '302 Moved' unless defined $status; + $status = '302 Found' unless defined $status; $url ||= $self->self_url; my(@o); foreach (@other) { tr/\"//d; push(@o,split("=",$_,2)); } @@ -1546,7 +1600,7 @@ sub start_html { $self->element_id(0); $self->element_tab(0); - $encoding = 'iso-8859-1' unless defined $encoding; + $encoding = lc($self->charset) unless defined $encoding; # Need to sort out the DTD before it's okay to call escapeHTML(). my(@result,$xml_dtd); @@ -1636,7 +1690,10 @@ END_OF_FUNC sub _style { my ($self,$style) = @_; my (@result); + my $type = 'text/css'; + my $rel = 'stylesheet'; + my $cdata_start = $XHTML ? "\n\n" : " -->\n"; @@ -1645,25 +1702,26 @@ sub _style { for my $s (@s) { if (ref($s)) { - my($src,$code,$verbatim,$stype,$foo, at other) = - rearrange([qw(SRC CODE VERBATIM TYPE FOO)], + my($src,$code,$verbatim,$stype,$alternate,$foo, at other) = + rearrange([qw(SRC CODE VERBATIM TYPE ALTERNATE FOO)], ('-foo'=>'bar', ref($s) eq 'ARRAY' ? @$s : %$s)); - $type = $stype if $stype; + my $type = defined $stype ? $stype : 'text/css'; + my $rel = $alternate ? 'alternate stylesheet' : 'stylesheet'; my $other = @other ? join ' ', at other : ''; if (ref($src) eq "ARRAY") # Check to see if the $src variable is an array reference { # If it is, push a LINK tag for each one foreach $src (@$src) { - push(@result,$XHTML ? qq() - : qq()) if $src; + push(@result,$XHTML ? qq() + : qq()) if $src; } } else { # Otherwise, push the single -src, if it exists. - push(@result,$XHTML ? qq() - : qq() + push(@result,$XHTML ? qq() + : qq() ) if $src; } if ($verbatim) { @@ -1675,8 +1733,8 @@ sub _style { } else { my $src = $s; - push(@result,$XHTML ? qq() - : qq()); + push(@result,$XHTML ? qq() + : qq()); } } @result; @@ -1692,19 +1750,17 @@ sub _script { foreach $script (@scripts) { my($src,$code,$language); if (ref($script)) { # script is a hash - ($src,$code,$language, $type) = - rearrange([SRC,CODE,LANGUAGE,TYPE], + ($src,$code,$type) = + rearrange(['SRC','CODE',['LANGUAGE','TYPE']], '-foo'=>'bar', # a trick to allow the '-' to be omitted ref($script) eq 'ARRAY' ? @$script : %$script); - # User may not have specified language - $language ||= 'JavaScript'; - unless (defined $type) { - $type = lc $language; - # strip '1.2' from 'javascript1.2' - $type =~ s/^(\D+).*$/text\/$1/; + $type ||= 'text/javascript'; + unless ($type =~ m!\w+/\w+!) { + $type =~ s/[\d.]+$//; + $type = "text/$type"; } } else { - ($src,$code,$language, $type) = ('',$script,'JavaScript', 'text/javascript'); + ($src,$code,$type) = ('',$script, 'text/javascript'); } my $comment = '//'; # javascript by default @@ -1722,7 +1778,6 @@ sub _script { } my(@satts); push(@satts,'src'=>$src) if $src; - push(@satts,'language'=>$language) unless defined $type; push(@satts,'type'=>$type); $code = $cdata_start . $code . $cdata_end if defined $code; push(@result,$self->script({@satts},$code || '')); @@ -1782,7 +1837,7 @@ sub startform { $action = $self->escapeHTML($action); } else { - $action = $self->escapeHTML($self->request_uri); + $action = $self->escapeHTML($self->request_uri || $self->self_url); } $action = qq(action="$action"); my($other) = @other ? " @other" : ''; @@ -1812,9 +1867,7 @@ END_OF_FUNC sub start_multipart_form { my($self, at p) = self_or_default(@_); if (defined($p[0]) && substr($p[0],0,1) eq '-') { - my(%p) = @p; - $p{'-enctype'}=&MULTIPART; - return $self->startform(%p); + return $self->startform(-enctype=>&MULTIPART, at p); } else { my($method,$action, at other) = rearrange([METHOD,ACTION], at p); @@ -2276,15 +2329,14 @@ sub _box_group { my($name,$values,$defaults,$linebreak,$labels,$attributes, $rows,$columns,$rowheaders,$colheaders, - $override,$nolabels,$tabindex, at other) = + $override,$nolabels,$tabindex,$disabled, at other) = rearrange([ NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LINEBREAK,LABELS,ATTRIBUTES, - ROWS,[COLUMNS,COLS],ROWHEADERS,COLHEADERS, - [OVERRIDE,FORCE],NOLABELS,TABINDEX + ROWS,[COLUMNS,COLS],[ROWHEADERS,ROWHEADER],[COLHEADERS,COLHEADER], + [OVERRIDE,FORCE],NOLABELS,TABINDEX,DISABLED ], at _); - my($result,$checked); + my($result,$checked, at elements, at values); - my(@elements, at values); @values = $self->_set_values_and_labels($values,\$labels,$name); my %checked = $self->previous_or_default($name,$defaults,$override); @@ -2304,10 +2356,21 @@ sub _box_group { } } %tabs = map {$_=>$self->element_tab} @values unless %tabs; - my $other = @other ? "@other " : ''; my $radio_checked; + + # for disabling groups of radio/checkbox buttons + my %disabled; + foreach (@{$disabled}) { + $disabled{$_}=1; + } + foreach (@values) { + my $disable=""; + if ($disabled{$_}) { + $disable="disabled='1'"; + } + my $checkit = $self->_checked($box_type eq 'radio' ? ($checked{$_} && !$radio_checked++) : $checked{$_}); my($break); @@ -2322,16 +2385,18 @@ sub _box_group { $label = $_; $label = $labels->{$_} if defined($labels) && defined($labels->{$_}); $label = $self->escapeHTML($label,1); + $label = "$label" if $disabled{$_}; } my $attribs = $self->_set_attributes($_, $attributes); my $tab = $tabs{$_}; $_=$self->escapeHTML($_); + if ($XHTML) { push @elements, CGI::label( - qq($label)).${break}; + qq($label)).${break}; } else { - push(@elements,qq/${label}${break}/); + push(@elements,qq/${label}${break}/); } } $self->register_parameter($name); @@ -2386,13 +2451,13 @@ sub popup_menu { } } else { - my $attribs = $self->_set_attributes($_, $attributes); - my($selectit) = defined($selected) ? $self->_selected($selected eq $_) : ''; - my($label) = $_; - $label = $labels->{$_} if defined($labels) && defined($labels->{$_}); - my($value) = $self->escapeHTML($_); - $label=$self->escapeHTML($label,1); - $result .= "\n"; + my $attribs = $self->_set_attributes($_, $attributes); + my($selectit) = defined($selected) ? $self->_selected($selected eq $_) : ''; + my($label) = $_; + $label = $labels->{$_} if defined($labels) && defined($labels->{$_}); + my($value) = $self->escapeHTML($_); + $label=$self->escapeHTML($label,1); + $result .= "$label\n"; } } @@ -2577,7 +2642,7 @@ sub image_button { my($name,$src,$alignment, at other) = rearrange([NAME,SRC,ALIGN], at p); - my($align) = $alignment ? " align=\U\"$alignment\"" : ''; + my($align) = $alignment ? " align=\L\"$alignment\"" : ''; my($other) = @other ? " @other" : ''; $name=$self->escapeHTML($name); return $XHTML ? qq() @@ -2624,7 +2689,7 @@ sub url { my $path = $self->path_info; my $script_name = $self->script_name; - my $request_uri = $self->request_uri || ''; + my $request_uri = unescape($self->request_uri) || ''; my $query_str = $self->query_string; my $rewrite_in_use = $request_uri && $request_uri !~ /^$script_name/; @@ -2632,21 +2697,22 @@ sub url { my $uri = $rewrite && $request_uri ? $request_uri : $script_name; $uri =~ s/\?.*$//; # remove query string - $uri =~ s/$path$// if defined $path; # remove path + $uri =~ s/\Q$path\E$// if defined $path; # remove path if ($full) { my $protocol = $self->protocol(); $url = "$protocol://"; - my $vh = http('x_forwarded_host') || http('host'); + my $vh = http('x_forwarded_host') || http('host') || ''; + $vh =~ s/\:\d+$//; # some clients add the port number (incorrectly). Get rid of it. if ($vh) { $url .= $vh; } else { $url .= server_name(); - my $port = $self->server_port; - $url .= ":" . $port - unless (lc($protocol) eq 'http' && $port == 80) - || (lc($protocol) eq 'https' && $port == 443); } + my $port = $self->server_port; + $url .= ":" . $port + unless (lc($protocol) eq 'http' && $port == 80) + || (lc($protocol) eq 'https' && $port == 443); return $url if $base; $url .= $uri; } elsif ($relative) { @@ -2678,8 +2744,8 @@ END_OF_FUNC 'cookie' => <<'END_OF_FUNC', sub cookie { my($self, at p) = self_or_default(@_); - my($name,$value,$path,$domain,$secure,$expires) = - rearrange([NAME,[VALUE,VALUES],PATH,DOMAIN,SECURE,EXPIRES], at p); + my($name,$value,$path,$domain,$secure,$expires,$httponly) = + rearrange([NAME,[VALUE,VALUES],PATH,DOMAIN,SECURE,EXPIRES,HTTPONLY], at p); require CGI::Cookie; @@ -2707,6 +2773,7 @@ sub cookie { push(@param,'-path'=>$path) if $path; push(@param,'-expires'=>$expires) if $expires; push(@param,'-secure'=>$secure) if $secure; + push(@param,'-httponly'=>$httponly) if $httponly; return new CGI::Cookie(@param); } @@ -2752,9 +2819,6 @@ sub path_info { } elsif (! defined($self->{'.path_info'}) ) { my (undef,$path_info) = $self->_name_and_path_from_env; $self->{'.path_info'} = $path_info || ''; - # hack to fix broken path info in IIS - $self->{'.path_info'} =~ s/^\Q$ENV{'SCRIPT_NAME'}\E// if $IIS; - } return $self->{'.path_info'}; } @@ -2766,11 +2830,10 @@ sub _name_and_path_from_env { my $self = shift; my $raw_script_name = $ENV{SCRIPT_NAME} || ''; my $raw_path_info = $ENV{PATH_INFO} || ''; - my $uri = $ENV{REQUEST_URI} || ''; + my $uri = unescape($self->request_uri) || ''; - if ($raw_script_name =~ m/$raw_path_info$/) { - $raw_script_name =~ s/$raw_path_info$//; - } + my $protected = quotemeta($raw_path_info); + $raw_script_name =~ s/$protected$//; my @uri_double_slashes = $uri =~ m^(/{2,}?)^g; my @path_double_slashes = "$raw_script_name $raw_path_info" =~ m^(/{2,}?)^g; @@ -2778,10 +2841,7 @@ sub _name_and_path_from_env { my $apache_bug = @uri_double_slashes != @path_double_slashes; return ($raw_script_name,$raw_path_info) unless $apache_bug; - my $path_info_search = $raw_path_info; - # these characters will not (necessarily) be escaped - $path_info_search =~ s/([^a-zA-Z0-9$()':_.,+*\/;?=&-])/uc sprintf("%%%02x",ord($1))/eg; - $path_info_search = quotemeta($path_info_search); + my $path_info_search = quotemeta($raw_path_info); $path_info_search =~ s!/!/+!g; if ($uri =~ m/^(.+)($path_info_search)/) { return ($1,$2); @@ -2988,7 +3048,7 @@ END_OF_FUNC sub script_name { my ($self, at p) = self_or_default(@_); if (@p) { - $self->{'.script_name'} = shift; + $self->{'.script_name'} = shift @p; } elsif (!exists $self->{'.script_name'}) { my ($script_name,$path_info) = $self->_name_and_path_from_env(); $self->{'.script_name'} = $script_name; @@ -3308,11 +3368,11 @@ sub read_multipart { return; } - my($param)= $header{'Content-Disposition'}=~/ name="([^;]*)"/; + my($param)= $header{'Content-Disposition'}=~/ name="([^"]*)"/; $param .= $TAINTED; # Bug: Netscape doesn't escape quotation marks in file names!!! - my($filename) = $header{'Content-Disposition'}=~/ filename="([^;]*)"/; + my($filename) = $header{'Content-Disposition'}=~/ filename="([^"]*)"/; # Test for Opera's multiple upload feature my($multipart) = ( defined( $header{'Content-Type'} ) && $header{'Content-Type'} =~ /multipart\/mixed/ ) ? @@ -3378,7 +3438,109 @@ sub read_multipart { $totalbytes += length($data); &{$self->{'.upload_hook'}}($filename ,$data, $totalbytes, $self->{'.upload_data'}); } - print $filehandle $data; + print $filehandle $data if ($self->{'use_tempfile'}); + } + + # back up to beginning of file + seek($filehandle,0,0); + + ## Close the filehandle if requested this allows a multipart MIME + ## upload to contain many files, and we won't die due to too many + ## open file handles. The user can access the files using the hash + ## below. + close $filehandle if $CLOSE_UPLOAD_FILES; + $CGI::DefaultClass->binmode($filehandle) if $CGI::needs_binmode; + + # Save some information about the uploaded file where we can get + # at it later. + # Use the typeglob as the key, as this is guaranteed to be + # unique for each filehandle. Don't use the file descriptor as + # this will be re-used for each filehandle if the + # close_upload_files feature is used. + $self->{'.tmpfiles'}->{$$filehandle}= { + hndl => $filehandle, + name => $tmpfile, + info => {%header}, + }; + push(@{$self->{$param}},$filehandle); + } + } +} +END_OF_FUNC + +##### +# subroutine: read_multipart_related +# +# Read multipart/related data and store it into our parameters. The +# first parameter sets the start of the data. The part identified by +# this Content-ID will not be stored as a file upload, but will be +# returned by this method. All other parts will be available as file +# uploads accessible by their Content-ID +##### +'read_multipart_related' => <<'END_OF_FUNC', +sub read_multipart_related { + my($self,$start,$boundary,$length) = @_; + my($buffer) = $self->new_MultipartBuffer($boundary,$length); + return unless $buffer; + my(%header,$body); + my $filenumber = 0; + my $returnvalue; + while (!$buffer->eof) { + %header = $buffer->readHeader; + + unless (%header) { + $self->cgi_error("400 Bad request (malformed multipart POST)"); + return; + } + + my($param) = $header{'Content-ID'}=~/\<([^\>]*)\>/; + $param .= $TAINTED; + + # If this is the start part, then just read the data and assign it + # to our return variable. + if ( $param eq $start ) { + $returnvalue = $buffer->readBody; + $returnvalue .= $TAINTED; + next; + } + + # add this parameter to our list + $self->add_parameter($param); + + my ($tmpfile,$tmp,$filehandle); + UPLOADS: { + # If we get here, then we are dealing with a potentially large + # uploaded form. Save the data to a temporary file, then open + # the file for reading. + + # skip the file if uploads disabled + if ($DISABLE_UPLOADS) { + while (defined($data = $buffer->read)) { } + last UPLOADS; + } + + # choose a relatively unpredictable tmpfile sequence number + my $seqno = unpack("%16C*",join('',localtime,grep {defined $_} values %ENV)); + for (my $cnt=10;$cnt>0;$cnt--) { + next unless $tmpfile = new CGITempFile($seqno); + $tmp = $tmpfile->as_string; + last if defined($filehandle = Fh->new($param,$tmp,$PRIVATE_TEMPFILES)); + $seqno += int rand(100); + } + die "CGI open of tmpfile: $!\n" unless defined $filehandle; + $CGI::DefaultClass->binmode($filehandle) if $CGI::needs_binmode + && defined fileno($filehandle); + + my ($data); + local($\) = ''; + my $totalbytes; + while (defined($data = $buffer->read)) { + if (defined $self->{'.upload_hook'}) + { + $totalbytes += length($data); + &{$self->{'.upload_hook'}}($param ,$data, $totalbytes, $self->{'.upload_data'}); + } + print $filehandle $data if ($self->{'use_tempfile'}); } # back up to beginning of file @@ -3405,13 +3567,15 @@ sub read_multipart { push(@{$self->{$param}},$filehandle); } } + return $returnvalue; } END_OF_FUNC + 'upload' =><<'END_OF_FUNC', sub upload { my($self,$param_name) = self_or_default(@_); - my @param = grep(ref && defined(fileno($_)), $self->param($param_name)); + my @param = grep {ref($_) && defined(fileno($_))} $self->param($param_name); return unless @param; return wantarray ? @param : $param[0]; } @@ -4129,7 +4293,10 @@ HTML "standards". $query = new CGI; This will parse the input (from both POST and GET methods) and store -it into a perl5 object called $query. +it into a perl5 object called $query. + +Any filehandles from file uploads will have their position reset to +the beginning of the file. =head2 CREATING A NEW QUERY OBJECT FROM AN INPUT FILE @@ -4590,7 +4757,7 @@ all. This causes the indicated autoloaded methods to be compiled up front, rather than deferred to later. This is useful for scripts that run for an extended period of time under FastCGI or mod_perl, and for -those destined to be crunched by Malcom Beattie's Perl compiler. Use +those destined to be crunched by Malcolm Beattie's Perl compiler. Use it in conjunction with the methods or method families you plan to use. use CGI qw(-compile :standard :html3); @@ -5063,20 +5230,20 @@ Use the B<-noScript> parameter to pass s browsers that do not have JavaScript (or browsers where JavaScript is turned off). -Netscape 3.0 recognizes several attributes of the

    • Personal Toolbar Folder

    Fedora Astronomy

    Astrophotograpy

    Astronomy Picture of the Day

    Bibliography

    Astrophysics preprints
    The Smithsonian/NASA Astrophysics Data System

    Databases

    The CDS Service for astronomical Catalogues
    NASA/IPAC Extragalactic Database - NED
    SIMBAD Astronomical Database
    The STScI Digitized Sky Survey
    VizieR Service
    GALEX search

    Discussions

    Couldy Night forum

    Observation

    Sky map
    Google Mars
    Google Moon
    Welcome to Heavens-Above

    Meteo

    Aurora Chasers